From 39e4396ea76897143e440a1ecd3b4fedc0320bc2 Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender <knairda@t-online.de>
Date: Mon, 11 Feb 2019 22:40:14 +0100
Subject: [PATCH 0001/2254] rocs: init at 18.12.0

---
 maintainers/maintainer-list.nix   |  6 +++++-
 pkgs/applications/kde/default.nix |  1 +
 pkgs/applications/kde/rocs.nix    | 25 +++++++++++++++++++++++++
 3 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/kde/rocs.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index cc121c15ac8..0e4e22e3791 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2434,7 +2434,11 @@
     name = "Karl Meakin";
     github = "Kmeakin";
   };
-
+  knairda = {
+    email = "adrian@kummerlaender.eu";
+    name = "Adrian Kummerlaender";
+    github = "KnairdA";
+  };
   knedlsepp = {
     email = "josef.kemetmueller@gmail.com";
     github = "knedlsepp";
diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 0822e65c7c0..5ca7bbc276e 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -166,6 +166,7 @@ let
       pim-data-exporter = callPackage ./pim-data-exporter.nix {};
       pim-sieve-editor = callPackage ./pim-sieve-editor.nix {};
       print-manager = callPackage ./print-manager.nix {};
+      rocs = callPackage ./rocs.nix {};
       spectacle = callPackage ./spectacle.nix {};
       # Okteta was removed from kde applications and will now be released independently
       # Lets keep an alias for compatibility reasons
diff --git a/pkgs/applications/kde/rocs.nix b/pkgs/applications/kde/rocs.nix
new file mode 100644
index 00000000000..45bc39fbb1c
--- /dev/null
+++ b/pkgs/applications/kde/rocs.nix
@@ -0,0 +1,25 @@
+{
+  stdenv, mkDerivation, makeWrapper, lib,
+  extra-cmake-modules, boost,
+  qtbase, qtscript, qtquickcontrols, qtwebkit, qtxmlpatterns, grantlee,
+  kdoctools, karchive, kxmlgui, kcrash, kdeclarative, ktexteditor, kguiaddons
+}:
+
+mkDerivation {
+  name = "rocs";
+  nativeBuildInputs = [ extra-cmake-modules makeWrapper kdoctools ];
+  buildInputs = [
+    boost
+    qtbase qtscript qtquickcontrols qtwebkit qtxmlpatterns grantlee
+    kxmlgui kcrash kdeclarative karchive ktexteditor kguiaddons
+  ];
+  postInstall = ''
+    wrapProgram $out/bin/rocs --prefix QT_PLUGIN_PATH ":" "${qtbase.bin}/${qtbase.qtPluginPrefix}:$out/${qtbase.qtPluginPrefix}"
+  '';
+  meta = with lib; {
+    homepage = http://www.kde.org;
+    license = with licenses; [ gpl2 lgpl21 fdl12 ];
+    platforms = lib.platforms.linux;
+    maintainers = with maintainers; [ knairda ];
+  };
+}
-- 
GitLab


From bd7bcb55767bf6060b595b40f26b76bbdb76fd80 Mon Sep 17 00:00:00 2001
From: Michael Eden <themichaeleden@gmail.com>
Date: Wed, 20 Mar 2019 22:13:03 -0400
Subject: [PATCH 0002/2254] sdImage: use findmnt to get root device when
 resizing

---
 nixos/modules/installer/cd-dvd/sd-image.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/installer/cd-dvd/sd-image.nix b/nixos/modules/installer/cd-dvd/sd-image.nix
index 69746a8e979..6ac7c9489c8 100644
--- a/nixos/modules/installer/cd-dvd/sd-image.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image.nix
@@ -144,8 +144,10 @@ in
     boot.postBootCommands = ''
       # On the first boot do some maintenance tasks
       if [ -f /nix-path-registration ]; then
+        set -euo pipefail
+        set -x
         # Figure out device names for the boot device and root filesystem.
-        rootPart=$(readlink -f /dev/disk/by-label/NIXOS_SD)
+        rootPart=$(${pkgs.utillinux}/bin/findmnt -n -o SOURCE /)
         bootDevice=$(lsblk -npo PKNAME $rootPart)
 
         # Resize the root partition and the filesystem to fit the disk
-- 
GitLab


From 532360dd179a5a102ffce588f20b9d6ed6b4791e Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Tue, 26 Mar 2019 19:35:31 +0100
Subject: [PATCH 0003/2254] cnijfilter2: 5.30 -> 5.70

Newly supported series in version 5.40:

    MB2100, MB2700, iB4100, MB5100, MB5400, TS9000, TS8000, TS6000,
    TS5000, MG3000, E470, G4000

Newly supported series in version 5.50:

    E200, E300, E3100, TR7500, TR7530, TR8500, TR8530, TR8580, TS200,
    TS300, TS3100, TS5100, TS6100, TS6130, TS6180, TS8100, TS8180,
    TS9100, TS9180, TS8130, XK70, XK50

Newly supported series in version 5.60:

    G3010, G4010

Newly supported series in version 5.70:

    TS8200, XK80, TS8230, TS8280, TS6200, TS6230, TS6280, TS9500,
    TR9530, TS9580, TR4500, E4200

Signed-off-by: aszlig <aszlig@nix.build>
---
 pkgs/misc/cups/drivers/cnijfilter2/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/cups/drivers/cnijfilter2/default.nix b/pkgs/misc/cups/drivers/cnijfilter2/default.nix
index 2634b712871..576db809ecd 100644
--- a/pkgs/misc/cups/drivers/cnijfilter2/default.nix
+++ b/pkgs/misc/cups/drivers/cnijfilter2/default.nix
@@ -4,11 +4,11 @@
 stdenv.mkDerivation rec {
   name = "cnijfilter2-${version}";
 
-  version = "5.30";
+  version = "5.70";
 
   src = fetchzip {
-    url = "http://gdlp01.c-wss.com/gds/9/0100007129/01/cnijfilter2-source-5.30-1.tar.gz";
-    sha256 = "0gnl9arwmkblljsczspcgggx85a19vcmhmbjfyv1bq236yqixv5c";
+    url = "http://gdlp01.c-wss.com/gds/0/0100009930/01/cnijfilter2-source-5.70-1.tar.gz";
+    sha256 = "045zjsmaidn1m44ki6m1018gjzbj77gm234n5i2lshxpbzpyh0is";
   };
 
   buildInputs = [
-- 
GitLab


From 23576f225cd76fc4de2d688c8815a75e74e67691 Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Thu, 28 Mar 2019 03:20:20 +0000
Subject: [PATCH 0004/2254] qemu-utils: init

---
 pkgs/applications/virtualization/qemu/utils.nix | 16 ++++++++++++++++
 pkgs/top-level/all-packages.nix                 |  2 ++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/applications/virtualization/qemu/utils.nix

diff --git a/pkgs/applications/virtualization/qemu/utils.nix b/pkgs/applications/virtualization/qemu/utils.nix
new file mode 100644
index 00000000000..430d7122179
--- /dev/null
+++ b/pkgs/applications/virtualization/qemu/utils.nix
@@ -0,0 +1,16 @@
+{ stdenv, qemu }:
+
+stdenv.mkDerivation rec {
+  name = "qemu-utils-${version}";
+  version = qemu.version;
+
+  buildInputs = [ qemu ];
+  unpackPhase = "true";
+
+  installPhase = ''
+    mkdir -p "$out/bin"
+    cp "${qemu}/bin/qemu-img" "$out/bin/qemu-img"
+    cp "${qemu}/bin/qemu-io"  "$out/bin/qemu-io"
+    cp "${qemu}/bin/qemu-nbd" "$out/bin/qemu-nbd"
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 28665941d61..8f34c542ace 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19128,6 +19128,8 @@ in
     inherit (darwin.stubs) rez setfile;
   };
 
+  qemu-utils = callPackage ../applications/virtualization/qemu/utils.nix {};
+
   qgis-unwrapped = libsForQt5.callPackage ../applications/gis/qgis/unwrapped.nix {
       withGrass = false;
   };
-- 
GitLab


From 4c0837bffbf33abdfa93466764ef439c3cf41249 Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Thu, 28 Mar 2019 03:20:33 +0000
Subject: [PATCH 0005/2254] cloud-utils: s/qemu/qemu-utils/g

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

diff --git a/pkgs/tools/misc/cloud-utils/default.nix b/pkgs/tools/misc/cloud-utils/default.nix
index bda8ebcf3b0..f11db32fca6 100644
--- a/pkgs/tools/misc/cloud-utils/default.nix
+++ b/pkgs/tools/misc/cloud-utils/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, makeWrapper
 , gawk, gnused, utillinux, file
-, wget, python3, qemu, euca2ools
+, wget, python3, qemu-utils, euca2ools
 , e2fsprogs, cdrkit }:
 
 stdenv.mkDerivation rec {
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   # according to https://packages.ubuntu.com/source/zesty/cloud-utils
   binDeps = [
-    wget e2fsprogs file gnused gawk utillinux qemu euca2ools cdrkit
+    wget e2fsprogs file gnused gawk utillinux qemu-utils euca2ools cdrkit
   ];
 
   postFixup = ''
-- 
GitLab


From e4bdc0737bd1c242bed2f26cef9437dd3589c81f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 14 Apr 2019 22:47:29 -0700
Subject: [PATCH 0006/2254] libtermkey: 0.20 -> 0.22

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libtermkey/versions
---
 pkgs/development/libraries/libtermkey/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libtermkey/default.nix b/pkgs/development/libraries/libtermkey/default.nix
index 7261fb7b6b7..75df3477ba5 100644
--- a/pkgs/development/libraries/libtermkey/default.nix
+++ b/pkgs/development/libraries/libtermkey/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
   name = "libtermkey-${version}";
 
-  version = "0.20";
+  version = "0.22";
 
   src = fetchzip {
     url = "http://www.leonerd.org.uk/code/libtermkey/libtermkey-${version}.tar.gz";
-    sha256 = "1i5a2zangq61ba1vdkag34ig5g4gzccldccdbcmqmk93saa6lkbx";
+    sha256 = "02dks6bj7n23lj005yq41azf95wh3hapmgc2lzyh12vigkjh67rg";
   };
 
   makeFlags = [ "PREFIX=$(out)" ]
-- 
GitLab


From 52184a7a624c3720a02661bbb12fbde208bc3cdb Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Sun, 9 Jun 2019 19:05:30 +0200
Subject: [PATCH 0007/2254] nixos/tests: add a test for os-prober

---
 nixos/tests/os-prober.nix         | 125 ++++++++++++++++++++++++++++++
 pkgs/build-support/vm/default.nix |   4 +-
 2 files changed, 127 insertions(+), 2 deletions(-)
 create mode 100644 nixos/tests/os-prober.nix

diff --git a/nixos/tests/os-prober.nix b/nixos/tests/os-prober.nix
new file mode 100644
index 00000000000..29a6fa7676c
--- /dev/null
+++ b/nixos/tests/os-prober.nix
@@ -0,0 +1,125 @@
+import ./make-test.nix ({pkgs, lib}:
+let
+  # A filesystem image with a (presumably) bootable debian
+  debianImage = pkgs.vmTools.diskImageFuns.debian9i386 {
+    # os-prober cannot detect systems installed on disks without a partition table
+    # so we create the disk ourselves
+    createRootFS = with pkgs; ''
+      ${parted}/bin/parted --script /dev/vda mklabel msdos
+      ${parted}/sbin/parted --script /dev/vda -- mkpart primary ext2 1M -1s
+      mkdir /mnt
+      ${e2fsprogs}/bin/mkfs.ext4 /dev/vda1
+      ${utillinux}/bin/mount -t ext4 /dev/vda1 /mnt
+
+      if test -e /mnt/.debug; then
+        exec ${bash}/bin/sh
+      fi
+      touch /mnt/.debug
+
+      mkdir /mnt/proc /mnt/dev /mnt/sys
+    '';
+    extraPackages = [
+      # /etc/os-release
+      "base-files"
+      # make the disk bootable-looking
+      "grub2" "linux-image-686"
+    ];
+    # install grub
+    postInstall = ''
+      ln -sf /proc/self/mounts > /etc/mtab
+      PATH=/usr/bin:/bin:/usr/sbin:/sbin $chroot /mnt \
+        grub-install /dev/vda --force
+      PATH=/usr/bin:/bin:/usr/sbin:/sbin $chroot /mnt \
+        update-grub
+    '';
+  };
+
+  # options to add the disk to the test vim
+  QEMU_OPTS = "-drive index=2,file=${debianImage}/disk-image.qcow2,read-only,if=virtio";
+
+  # a part of the configuration of the test vm
+  simpleConfig = {
+    boot.loader.grub = {
+      enable = true;
+      useOSProber = true;
+      device = "/dev/vda";
+      # vda is a filesystem without partition table
+      forceInstall = true;
+    };
+    fileSystems."/mnt" = {
+      device = "/dev/vdb1";
+      options = [ "ro" ];
+    };
+    nix.binaryCaches = lib.mkForce [ ];
+    nix.extraOptions =
+      ''
+      hashed-mirrors =
+      connect-timeout = 1
+      '';
+      services.udisks2.enable = lib.mkForce false;
+  };
+  # /etc/nixos/configuration.nix for the vm
+  configFile = pkgs.writeText "configuration.nix"  ''
+    {config, pkgs, ...}: ({
+    imports = 
+          [ ./hardware-configuration.nix
+            <nixpkgs/nixos/modules/testing/test-instrumentation.nix>
+          ];
+    }// (builtins.fromJSON (builtins.readFile ${
+      pkgs.writeText "simpleConfig.json" 
+      (builtins.toJSON simpleConfig)
+    })))
+  '';
+in {
+  name = "os-prober";
+
+  machine = { config, pkgs, ... }: (simpleConfig // {
+    imports = [ ../modules/profiles/installation-device.nix
+                ../modules/profiles/base.nix ];
+      virtualisation.memorySize = 1024;
+      # The test cannot access the network, so any packages
+      # nixos-rebuild needs must be included in the VM.
+      system.extraDependencies = with pkgs;
+        [ sudo
+          libxml2.bin
+          libxslt.bin
+          desktop-file-utils
+          docbook5
+          docbook_xsl_ns
+          unionfs-fuse
+          ntp
+          nixos-artwork.wallpapers.simple-dark-gray-bottom
+          perlPackages.XMLLibXML
+          perlPackages.ListCompare
+          shared-mime-info
+          texinfo
+          xorg.lndir
+          grub2
+
+          # add curl so that rather than seeing the test attempt to download
+          # curl's tarball, we see what it's trying to download
+          curl
+        ];
+  });
+
+  testScript = ''
+    # hack to add the secondary disk
+    $machine->{startCommand} = "QEMU_OPTS=\"\$QEMU_OPTS \"${lib.escapeShellArg QEMU_OPTS} ".$machine->{startCommand};
+
+    $machine->start;
+    $machine->succeed("udevadm settle");
+    $machine->waitForUnit("multi-user.target");
+
+    # check that os-prober works standalone
+    $machine->succeed("${pkgs.os-prober}/bin/os-prober | grep /dev/vdb1");
+
+    # rebuild and test that debian is available in the grub menu
+    $machine->succeed("nixos-generate-config");
+    $machine->copyFileFromHost(
+        "${configFile}",
+        "/etc/nixos/configuration.nix");
+    $machine->succeed("nixos-rebuild boot >&2");
+
+    $machine->succeed("egrep 'menuentry.*debian' /boot/grub/grub.cfg");
+  '';
+})
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 5d04302591e..10367957915 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -719,7 +719,7 @@ rec {
     { name, fullName, size ? 4096, urlPrefix
     , packagesList ? "", packagesLists ? [packagesList]
     , packages, extraPackages ? [], postInstall ? ""
-    , extraDebs ? []
+    , extraDebs ? [], createRootFS ? defaultCreateRootFS
     , QEMU_OPTS ? "", memSize ? 512 }:
 
     let
@@ -729,7 +729,7 @@ rec {
       };
     in
       (fillDiskWithDebs {
-        inherit name fullName size postInstall QEMU_OPTS memSize;
+        inherit name fullName size postInstall createRootFS QEMU_OPTS memSize;
         debs = import expr {inherit fetchurl;} ++ extraDebs;
       }) // {inherit expr;};
 
-- 
GitLab


From 5c9634099d697eb78ef40f3825c875a09904fef1 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Sun, 9 Jun 2019 20:02:40 +0200
Subject: [PATCH 0008/2254] os-prober: 1.76 -> 1.77

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

diff --git a/pkgs/tools/misc/os-prober/default.nix b/pkgs/tools/misc/os-prober/default.nix
index 59a60e356b8..21c434bb5a3 100644
--- a/pkgs/tools/misc/os-prober/default.nix
+++ b/pkgs/tools/misc/os-prober/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper,
+{ stdenv, fetchFromGitLab, makeWrapper,
 # optional dependencies, the command(s) they provide
 coreutils,  # mktemp
 grub2,      # grub-mount and grub-probe
@@ -9,11 +9,14 @@ ntfs3g      # ntfs3g
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.76";
-  name = "os-prober-${version}";
-  src = fetchurl {
-    url = "https://salsa.debian.org/philh/os-prober/-/archive/${version}/os-prober-${version}.tar.bz2";
-    sha256 = "07rw3092pckh21vx6y4hzqcn3wn4cqmwxaaiq100lncnhmszg11g";
+  version = "1.77";
+  pname = "os-prober";
+  src = fetchFromGitLab {
+    domain = "salsa.debian.org";
+    owner = "installer-team";
+    repo = pname;
+    rev = version;
+    sha256 = "05sji756xdl67pp2sf7rk0ih9h6f6kgk9nvxlyv1bzbmcizlh2d2";
   };
 
   buildInputs = [ makeWrapper ];
-- 
GitLab


From 9e06a61cf09ce94404fae78fc62b773ddf6448ee Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Sun, 9 Jun 2019 20:26:05 +0200
Subject: [PATCH 0009/2254] mention the os-prober test in
 pkgs.os-prober.passthru.tests

---
 nixos/tests/all-tests.nix             | 1 +
 nixos/tests/os-prober.nix             | 2 +-
 pkgs/tools/misc/os-prober/default.nix | 5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 9bce49c9e30..20736d030e8 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -183,6 +183,7 @@ in
   # openstack-image-userdata doesn't work in a sandbox as the simulated openstack instance needs network access
   #openstack-image-userdata = (handleTestOn ["x86_64-linux"] ./openstack-image.nix {}).userdata or {};
   openstack-image-metadata = (handleTestOn ["x86_64-linux"] ./openstack-image.nix {}).metadata or {};
+  os-prober = handleTestOn ["x86_64-linux"] ./os-prober.nix {};
   osquery = handleTest ./osquery.nix {};
   osrm-backend = handleTest ./osrm-backend.nix {};
   ostree = handleTest ./ostree.nix {};
diff --git a/nixos/tests/os-prober.nix b/nixos/tests/os-prober.nix
index 29a6fa7676c..d166bfc8113 100644
--- a/nixos/tests/os-prober.nix
+++ b/nixos/tests/os-prober.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({pkgs, lib}:
+import ./make-test.nix ({pkgs, lib, ...}:
 let
   # A filesystem image with a (presumably) bootable debian
   debianImage = pkgs.vmTools.diskImageFuns.debian9i386 {
diff --git a/pkgs/tools/misc/os-prober/default.nix b/pkgs/tools/misc/os-prober/default.nix
index 21c434bb5a3..d68ed9c5cd3 100644
--- a/pkgs/tools/misc/os-prober/default.nix
+++ b/pkgs/tools/misc/os-prober/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitLab, makeWrapper,
+{ stdenv, fetchFromGitLab, makeWrapper, nixosTests,
 # optional dependencies, the command(s) they provide
 coreutils,  # mktemp
 grub2,      # grub-mount and grub-probe
@@ -59,6 +59,9 @@ stdenv.mkDerivation rec {
     done;
   '';
 
+  passthru.tests = {
+    os-prober = nixosTests.os-prober;
+  };
   meta = with stdenv.lib; {
     description = "Utility to detect other OSs on a set of drives";
     homepage = http://packages.debian.org/source/sid/os-prober;
-- 
GitLab


From f452d640f03de5246c2a0316c842b17ebac84472 Mon Sep 17 00:00:00 2001
From: symphorien <symphorien@users.noreply.github.com>
Date: Sun, 9 Jun 2019 19:11:47 +0000
Subject: [PATCH 0010/2254] nixos/tests/os-prober.nix: apply review suggestions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Léo Gaspard <github@leo.gaspard.ninja>
---
 nixos/tests/os-prober.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/os-prober.nix b/nixos/tests/os-prober.nix
index d166bfc8113..b6acc499173 100644
--- a/nixos/tests/os-prober.nix
+++ b/nixos/tests/os-prober.nix
@@ -56,7 +56,7 @@ let
       hashed-mirrors =
       connect-timeout = 1
       '';
-      services.udisks2.enable = lib.mkForce false;
+    services.udisks2.enable = lib.mkForce false;
   };
   # /etc/nixos/configuration.nix for the vm
   configFile = pkgs.writeText "configuration.nix"  ''
-- 
GitLab


From 04c9866b6e29428ca3710523e04b420a72eea192 Mon Sep 17 00:00:00 2001
From: symphorien <symphorien@users.noreply.github.com>
Date: Sun, 9 Jun 2019 19:12:07 +0000
Subject: [PATCH 0011/2254] nixos/tests/os-prober.nix: apply review suggestions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Léo Gaspard <github@leo.gaspard.ninja>
---
 nixos/tests/os-prober.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/os-prober.nix b/nixos/tests/os-prober.nix
index b6acc499173..2cfb3f5f690 100644
--- a/nixos/tests/os-prober.nix
+++ b/nixos/tests/os-prober.nix
@@ -65,7 +65,7 @@ let
           [ ./hardware-configuration.nix
             <nixpkgs/nixos/modules/testing/test-instrumentation.nix>
           ];
-    }// (builtins.fromJSON (builtins.readFile ${
+    } // (builtins.fromJSON (builtins.readFile ${
       pkgs.writeText "simpleConfig.json" 
       (builtins.toJSON simpleConfig)
     })))
-- 
GitLab


From 9a69fab1e315f05975a2cc0c573f1ee55258cde4 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Sun, 9 Jun 2019 21:16:53 +0200
Subject: [PATCH 0012/2254] nixos/tests/os-prober.nix: apply review suggestions

---
 nixos/tests/os-prober.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/nixos/tests/os-prober.nix b/nixos/tests/os-prober.nix
index 2cfb3f5f690..eb62dd76312 100644
--- a/nixos/tests/os-prober.nix
+++ b/nixos/tests/os-prober.nix
@@ -51,11 +51,10 @@ let
       options = [ "ro" ];
     };
     nix.binaryCaches = lib.mkForce [ ];
-    nix.extraOptions =
-      ''
+    nix.extraOptions = ''
       hashed-mirrors =
       connect-timeout = 1
-      '';
+    '';
     services.udisks2.enable = lib.mkForce false;
   };
   # /etc/nixos/configuration.nix for the vm
@@ -66,16 +65,15 @@ let
             <nixpkgs/nixos/modules/testing/test-instrumentation.nix>
           ];
     } // (builtins.fromJSON (builtins.readFile ${
-      pkgs.writeText "simpleConfig.json" 
-      (builtins.toJSON simpleConfig)
+      pkgs.writeText "simpleConfig.json" (builtins.toJSON simpleConfig)
     })))
   '';
 in {
   name = "os-prober";
 
   machine = { config, pkgs, ... }: (simpleConfig // {
-    imports = [ ../modules/profiles/installation-device.nix
-                ../modules/profiles/base.nix ];
+      imports = [ ../modules/profiles/installation-device.nix
+                  ../modules/profiles/base.nix ];
       virtualisation.memorySize = 1024;
       # The test cannot access the network, so any packages
       # nixos-rebuild needs must be included in the VM.
-- 
GitLab


From d1ac443ccaf2d5ee9bd4bc0a7155290bd8bba99f Mon Sep 17 00:00:00 2001
From: symphorien <symphorien@users.noreply.github.com>
Date: Sun, 9 Jun 2019 19:18:30 +0000
Subject: [PATCH 0013/2254] nixos/tests/os-prober.nix: fix typo
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Léo Gaspard <github@leo.gaspard.ninja>
---
 nixos/tests/os-prober.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/os-prober.nix b/nixos/tests/os-prober.nix
index eb62dd76312..a386a5d43bc 100644
--- a/nixos/tests/os-prober.nix
+++ b/nixos/tests/os-prober.nix
@@ -34,7 +34,7 @@ let
     '';
   };
 
-  # options to add the disk to the test vim
+  # options to add the disk to the test vm
   QEMU_OPTS = "-drive index=2,file=${debianImage}/disk-image.qcow2,read-only,if=virtio";
 
   # a part of the configuration of the test vm
-- 
GitLab


From 425b2bb52090bfc1e76a512d134747225c2b495e Mon Sep 17 00:00:00 2001
From: Ding Xiang Fei <dingxiangfei2009@gmail.com>
Date: Fri, 21 Jun 2019 15:44:38 +0800
Subject: [PATCH 0014/2254] cni-plugins: add version pin

---
 .../networking/cluster/cni/plugins-deps.nix   | 210 ++++++++++++++++++
 .../networking/cluster/cni/plugins.nix        |  44 ++--
 2 files changed, 233 insertions(+), 21 deletions(-)
 create mode 100644 pkgs/applications/networking/cluster/cni/plugins-deps.nix

diff --git a/pkgs/applications/networking/cluster/cni/plugins-deps.nix b/pkgs/applications/networking/cluster/cni/plugins-deps.nix
new file mode 100644
index 00000000000..a6bbd333be4
--- /dev/null
+++ b/pkgs/applications/networking/cluster/cni/plugins-deps.nix
@@ -0,0 +1,210 @@
+# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
+[
+  {
+    goPackagePath = "github.com/Microsoft/go-winio";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Microsoft/go-winio";
+      rev = "v0.4.11";
+      sha256 = "14y1gryr3pb3zy09v2g8dh89m363rfd9sch0wgbabh531hfx72vn";
+    };
+  }
+  {
+    goPackagePath = "github.com/Microsoft/hcsshim";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Microsoft/hcsshim";
+      rev = "v0.7.4";
+      sha256 = "0hky9p6xvkkx2jfkd4fy2d6iaikvlzalyw67gypyqyxygf2hsshg";
+    };
+  }
+  {
+    goPackagePath = "github.com/alexflint/go-filemutex";
+    fetch = {
+      type = "git";
+      url = "https://github.com/alexflint/go-filemutex";
+      rev = "72bdc8eae2ae";
+      sha256 = "082y6y9zv40q3kaqvsv6fyaw2fc42j0sn9z0dl9rbiz4szixj3c4";
+    };
+  }
+  {
+    goPackagePath = "github.com/buger/jsonparser";
+    fetch = {
+      type = "git";
+      url = "https://github.com/buger/jsonparser";
+      rev = "f4dd9f5a6b44";
+      sha256 = "12qa2n33s7yz88ywpr3k9kg3b4gm6rqgnv28iyikyxw8h5jascz5";
+    };
+  }
+  {
+    goPackagePath = "github.com/containernetworking/cni";
+    fetch = {
+      type = "git";
+      url = "https://github.com/containernetworking/cni";
+      rev = "v0.7.0";
+      sha256 = "15ad323dw44k82bfx9r8w5q2kn7jix60p9v4ciyzx2p5pip36wp8";
+    };
+  }
+  {
+    goPackagePath = "github.com/coreos/go-iptables";
+    fetch = {
+      type = "git";
+      url = "https://github.com/coreos/go-iptables";
+      rev = "v0.4.1";
+      sha256 = "0id1npqw3rd5rrkslf6i9yy6lpmd7l5qcglln38g85ylq7inysyi";
+    };
+  }
+  {
+    goPackagePath = "github.com/coreos/go-systemd";
+    fetch = {
+      type = "git";
+      url = "https://github.com/coreos/go-systemd";
+      rev = "39ca1b05acc7";
+      sha256 = "1kzqrrzqspa5qm7kwslxl3m16lqzns23c24rv474ajzwmj3ixmx1";
+    };
+  }
+  {
+    goPackagePath = "github.com/d2g/dhcp4";
+    fetch = {
+      type = "git";
+      url = "https://github.com/d2g/dhcp4";
+      rev = "f0e4d29ff023";
+      sha256 = "07gn9bjvnlfz2jv9wdq3gxxxm9lpwgrwk8z65072jdrz9rs9izpr";
+    };
+  }
+  {
+    goPackagePath = "github.com/d2g/dhcp4client";
+    fetch = {
+      type = "git";
+      url = "https://github.com/d2g/dhcp4client";
+      rev = "bed07e1bc5b8";
+      sha256 = "0kyjalv1kah7sk3i96abg71cgy5s9kzpff2zc7mwj69vicbj7mi3";
+    };
+  }
+  {
+    goPackagePath = "github.com/d2g/dhcp4server";
+    fetch = {
+      type = "git";
+      url = "https://github.com/d2g/dhcp4server";
+      rev = "477b11cea4dc";
+      sha256 = "010dpw6cxrsm6dm49w1q6qpz5xz3lbi5viz6wywxk49fxvnzmx9l";
+    };
+  }
+  {
+    goPackagePath = "github.com/godbus/dbus";
+    fetch = {
+      type = "git";
+      url = "https://github.com/godbus/dbus";
+      rev = "885f9cc04c9c";
+      sha256 = "0wjpaj4vr5lvpnwc5faf3qizd7zd2v9yq0fm0558wap1hiyqb8x8";
+    };
+  }
+  {
+    goPackagePath = "github.com/j-keck/arping";
+    fetch = {
+      type = "git";
+      url = "https://github.com/j-keck/arping";
+      rev = "2cf9dc699c56";
+      sha256 = "1bid8mpx3j4546ni0a6q5xyz7hb854g95qnxqmg5jzs9vrcird3c";
+    };
+  }
+  {
+    goPackagePath = "github.com/juju/errors";
+    fetch = {
+      type = "git";
+      url = "https://github.com/juju/errors";
+      rev = "22422dad46e1";
+      sha256 = "1766ys24y9qgngaqbx0g84lmh54b3369v8hk5fa1k8si2d34fxas";
+    };
+  }
+  {
+    goPackagePath = "github.com/mattn/go-shellwords";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-shellwords";
+      rev = "v1.0.3";
+      sha256 = "1pg7pl25wvpl2dbpyrv9p1r7prnqimxlf6136vn0dfm54j2x4mnr";
+    };
+  }
+  {
+    goPackagePath = "github.com/onsi/ginkgo";
+    fetch = {
+      type = "git";
+      url = "https://github.com/onsi/ginkgo";
+      rev = "7f8ab55aaf3b";
+      sha256 = "0nas6wqdym4jx42kw9wj80b58r69k9qhnvglz009lj34g5gba7rw";
+    };
+  }
+  {
+    goPackagePath = "github.com/onsi/gomega";
+    fetch = {
+      type = "git";
+      url = "https://github.com/onsi/gomega";
+      rev = "2152b45fa28a";
+      sha256 = "0amjlkawp84mmdqjgdamf93p1546cla6h4wwrx7hf5r862r2qcw2";
+    };
+  }
+  {
+    goPackagePath = "github.com/safchain/ethtool";
+    fetch = {
+      type = "git";
+      url = "https://github.com/safchain/ethtool";
+      rev = "42ed695e3de8";
+      sha256 = "0n5hkrzc1bh46nidcssx4539kvcmgj501v3kzh2pljpg27509daj";
+    };
+  }
+  {
+    goPackagePath = "github.com/sirupsen/logrus";
+    fetch = {
+      type = "git";
+      url = "https://github.com/sirupsen/logrus";
+      rev = "v1.0.6";
+      sha256 = "029irw2lsbqi944gdrbkwdw0m2794sqni4g21gsnmz142hbzds8c";
+    };
+  }
+  {
+    goPackagePath = "github.com/vishvananda/netlink";
+    fetch = {
+      type = "git";
+      url = "https://github.com/vishvananda/netlink";
+      rev = "023a6dafdcdf";
+      sha256 = "1i5q8r8rg7lxzvq2vhbf25lrkzdlgficfv0bxg9rf7cgg6z819sn";
+    };
+  }
+  {
+    goPackagePath = "github.com/vishvananda/netns";
+    fetch = {
+      type = "git";
+      url = "https://github.com/vishvananda/netns";
+      rev = "13995c7128cc";
+      sha256 = "1zk6w8158qi4niva5rijchbv9ixgmijsgqshh54wdaav4xrhjshn";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/crypto";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/crypto";
+      rev = "7c1a557ab941";
+      sha256 = "1f1q9mby8m7ws3gbj90v0prhnf4g2sgf74azmw31kzwd6azlar3m";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/net";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/net";
+      rev = "49bb7cea24b1";
+      sha256 = "111q4qm3hcjvzvyv9y5rz8ydnyg48rckcygxqy6gv63q618wz6gn";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev = "66b7b1311ac8";
+      sha256 = "00ny4r2bbj6rz939iy9g699acqydq7rfi6r6awn25w9i2dld9m13";
+    };
+  }
+]
diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix
index fb36d3729c0..82ee365e44a 100644
--- a/pkgs/applications/networking/cluster/cni/plugins.nix
+++ b/pkgs/applications/networking/cluster/cni/plugins.nix
@@ -1,6 +1,5 @@
-{ stdenv, lib, fetchFromGitHub, go, removeReferencesTo }:
-
-stdenv.mkDerivation rec {
+{ stdenv, lib, fetchFromGitHub, go, removeReferencesTo, buildGoPackage }:
+buildGoPackage rec {
   pname = "cni-plugins";
   version = "0.8.1";
 
@@ -11,28 +10,31 @@ stdenv.mkDerivation rec {
     sha256 = "07d8knnabfjipzvcqbq7h8gd940lln934xp57nf5x31d3hpmvzws";
   };
 
-  buildInputs = [ removeReferencesTo go ];
-
-  buildPhase = ''
-    patchShebangs build_linux.sh
-    export "GOCACHE=$TMPDIR/go-cache"
-    ./build_linux.sh
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin
-    mv bin/* $out/bin
-  '';
-
-  preFixup = ''
-    find $out/bin -type f -exec remove-references-to -t ${go} '{}' +
-  '';
-
+  goDeps = ./plugins-deps.nix;
+  goPackagePath = "github.com/containernetworking/plugins";
+  subPackages = [
+    "plugins/meta/bandwidth"
+    "plugins/meta/firewall"
+    "plugins/meta/flannel"
+    "plugins/meta/portmap"
+    "plugins/meta/sbr"
+    "plugins/meta/tuning"
+    "plugins/main/bridge"
+    "plugins/main/host-device"
+    "plugins/main/ipvlan"
+    "plugins/main/loopback"
+    "plugins/main/macvlan"
+    "plugins/main/ptp"
+    "plugins/main/vlan"
+    "plugins/ipam/dhcp"
+    "plugins/ipam/host-local"
+    "plugins/ipam/static"
+  ];
   meta = with lib; {
     description = "Some standard networking plugins, maintained by the CNI team";
     homepage = https://github.com/containernetworking/plugins;
     license = licenses.asl20;
-    platforms = [ "x86_64-linux" ];
+    platforms = platforms.linux;
     maintainers = with maintainers; [ cstrahan ];
   };
 }
-- 
GitLab


From 924c321e8aca912733e7b6f7af1e65d73667c560 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Tue, 2 Jul 2019 22:03:53 +0200
Subject: [PATCH 0015/2254] sage: 8.8 -> 8.9.beta0

---
 .../sphinx-docbuild-subprocesses.patch        | 13 ++--
 .../math/sage/patches/threejs-offline.patch   | 64 -------------------
 .../science/math/sage/sage-src.nix            |  8 +--
 3 files changed, 9 insertions(+), 76 deletions(-)
 delete mode 100644 pkgs/applications/science/math/sage/patches/threejs-offline.patch

diff --git a/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch b/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch
index 933344aa559..56f09279622 100644
--- a/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch
+++ b/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch
@@ -1,8 +1,8 @@
 diff --git a/src/sage_setup/docbuild/__init__.py b/src/sage_setup/docbuild/__init__.py
-index 0f2700168a..60f71357d2 100644
+index 73a078e619..059125c59f 100644
 --- a/src/sage_setup/docbuild/__init__.py
 +++ b/src/sage_setup/docbuild/__init__.py
-@@ -86,26 +86,6 @@ def builder_helper(type):
+@@ -86,27 +86,6 @@ def builder_helper(type):
      """
      Returns a function which builds the documentation for
      output type ``type``.
@@ -19,7 +19,8 @@ index 0f2700168a..60f71357d2 100644
 -        ....:     raise BaseException("abort pool operation")
 -        sage: original_runsphinx, sage_setup.docbuild.sphinxbuild.runsphinx = sage_setup.docbuild.sphinxbuild.runsphinx, raiseBaseException
 -
--        sage: from sage_setup.docbuild import builder_helper, build_many, build_ref_doc
+-        sage: from sage_setup.docbuild import builder_helper, build_ref_doc
+-        sage: from sage_setup.docbuild import _build_many as build_many
 -        sage: helper = builder_helper("html")
 -        sage: try:
 -        ....:     build_many(build_ref_doc, [("docname", "en", "html", {})])
@@ -29,7 +30,7 @@ index 0f2700168a..60f71357d2 100644
      """
      def f(self, *args, **kwds):
          output_dir = self._output_dir(type)
-@@ -127,10 +107,9 @@ def builder_helper(type):
+@@ -128,10 +107,9 @@ def builder_helper(type):
          logger.debug(build_command)
  
          # Run Sphinx with Sage's special logger
@@ -43,10 +44,10 @@ index 0f2700168a..60f71357d2 100644
              if ABORT_ON_ERROR:
                  raise
 diff --git a/src/sage_setup/docbuild/sphinxbuild.py b/src/sage_setup/docbuild/sphinxbuild.py
-index 9a2fba79bc..77c8ed3592 100644
+index fe7eba43b2..463790965c 100644
 --- a/src/sage_setup/docbuild/sphinxbuild.py
 +++ b/src/sage_setup/docbuild/sphinxbuild.py
-@@ -318,3 +318,8 @@ def runsphinx():
+@@ -321,3 +321,8 @@ def runsphinx():
          sys.stderr = saved_stderr
          sys.stdout.flush()
          sys.stderr.flush()
diff --git a/pkgs/applications/science/math/sage/patches/threejs-offline.patch b/pkgs/applications/science/math/sage/patches/threejs-offline.patch
deleted file mode 100644
index 62b2f114bd6..00000000000
--- a/pkgs/applications/science/math/sage/patches/threejs-offline.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff --git a/build/pkgs/threejs/spkg-src b/build/pkgs/threejs/spkg-src
-index 91780d813c..254b850a24 100755
---- a/build/pkgs/threejs/spkg-src
-+++ b/build/pkgs/threejs/spkg-src
-@@ -20,9 +20,17 @@ URL3="https://raw.githubusercontent.com/mrdoob/three.js/${GIT_VERSION}/LICENSE"
- echo "Downloading $URL3"
- curl -OL "$URL3"
- 
-+# Set up directory structure
-+
-+mkdir build
-+mv three.min.js build
-+
-+mkdir -p examples/js/controls
-+mv OrbitControls.js examples/js/controls
-+
- # Package
--tar czf "$SAGE_ROOT/upstream/threejs-${GIT_VERSION}.tar.gz" 'three.min.js' 'OrbitControls.js' 'LICENSE'
--rm -rf 'three.min.js' 'OrbitControls.js' 'LICENSE'
-+tar czf "$SAGE_ROOT/upstream/threejs-${GIT_VERSION}.tar.gz" build examples 'LICENSE'
-+rm -rf 'build' 'examples' 'LICENSE'
- 
- # Update package info
- echo "${GIT_VERSION}" > 'package-version.txt'
-diff --git a/src/sage/repl/rich_output/backend_ipython.py b/src/sage/repl/rich_output/backend_ipython.py
-index 7c27d48a21..8bf4861a35 100644
---- a/src/sage/repl/rich_output/backend_ipython.py
-+++ b/src/sage/repl/rich_output/backend_ipython.py
-@@ -411,10 +411,15 @@ class BackendIPythonCommandline(BackendIPython):
-             sage: backend.threejs_offline_scripts()
-             '...<script ...</script>...'
-         """
--        from sage.env import SAGE_SHARE
-+        from sage.env import THREEJS_DIR
- 
--        scripts = [os.path.join(SAGE_SHARE, 'threejs', script)
--                   for script in ['three.min.js', 'OrbitControls.js']]
-+        scripts = [
-+            os.path.join(THREEJS_DIR, script)
-+            for script in [
-+                'build/three.min.js',
-+                'examples/js/controls/OrbitControls.js',
-+            ]
-+        ]
- 
-         if sys.platform == 'cygwin':
-             import cygwin
-@@ -594,13 +599,13 @@ class BackendIPythonNotebook(BackendIPython):
-             sage: from sage.repl.rich_output.backend_ipython import BackendIPythonNotebook
-             sage: backend = BackendIPythonNotebook()
-             sage: backend.threejs_offline_scripts()
--            '...<script src="/nbextensions/threejs/three.min...<\\/script>...'
-+            '...<script src="/nbextensions/threejs/build/three.min...<\\/script>...'
-         """
-         from sage.repl.rich_output import get_display_manager
-         CDN_scripts = get_display_manager().threejs_scripts(online=True)
-         return """
--<script src="/nbextensions/threejs/three.min.js"></script>
--<script src="/nbextensions/threejs/OrbitControls.js"></script>
-+<script src="/nbextensions/threejs/build/three.min.js"></script>
-+<script src="/nbextensions/threejs/examples/js/controls/OrbitControls.js"></script>
- <script>
-   if ( !window.THREE ) document.write('{}');
- </script>
diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix
index 51460154c5d..2cb7649500a 100644
--- a/pkgs/applications/science/math/sage/sage-src.nix
+++ b/pkgs/applications/science/math/sage/sage-src.nix
@@ -10,14 +10,14 @@
 # all get the same sources with the same patches applied.
 
 stdenv.mkDerivation rec {
-  version = "8.8";
+  version = "8.9.beta0";
   pname = "sage-src";
 
   src = fetchFromGitHub {
     owner = "sagemath";
     repo = "sage";
     rev = version;
-    sha256 = "0jm7zdkz8wfgrmf6620jfr8kgvprrz3qfl8gzx6rl5z5cm734b6x";
+    sha256 = "1bp6sdfk6h966y9jcpqnsrjfs0f5xgc1xmjw75h2y18hdgiadiy6";
   };
 
   # Patches needed because of particularities of nix or the way this is packaged.
@@ -49,10 +49,6 @@ stdenv.mkDerivation rec {
     # https://trac.sagemath.org/ticket/27660#ticket
     ./patches/do-not-test-find-library.patch
 
-
-    # https://trac.sagemath.org/ticket/28007
-    ./patches/threejs-offline.patch
-
     # Parallelize docubuild using subprocesses, fixing an isolation issue. See
     # https://groups.google.com/forum/#!topic/sage-packaging/YGOm8tkADrE
     ./patches/sphinx-docbuild-subprocesses.patch
-- 
GitLab


From 897834f0159fd3180430cfa88ebd70a772238ceb Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 1 Jul 2019 18:05:57 +0800
Subject: [PATCH 0016/2254] nixos/nix-optimise: be smarter about when we run
 the store optimiser

We might be inside a NixOS container on a non-NixOS host, so instead of not
running at all inside a container, check if the nix-daemon socket is writable as
it will tell us if the store is managed from here or outside.

Fixes #63578
---
 nixos/modules/services/misc/nix-optimise.nix      | 4 ++--
 nixos/modules/virtualisation/container-config.nix | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/misc/nix-optimise.nix b/nixos/modules/services/misc/nix-optimise.nix
index 416529f690e..e02026d5f76 100644
--- a/nixos/modules/services/misc/nix-optimise.nix
+++ b/nixos/modules/services/misc/nix-optimise.nix
@@ -40,8 +40,8 @@ in
 
     systemd.services.nix-optimise =
       { description = "Nix Store Optimiser";
-        # No point running it inside a nixos-container. It should be on the host instead.
-        unitConfig.ConditionVirtualization = "!container";
+        # No point this if the nix daemon (and thus the nix store) is outside
+        unitConfig.ConditionPathIsReadWrite = "/nix/var/nix/daemon-socket";
         serviceConfig.ExecStart = "${config.nix.package}/bin/nix-store --optimise";
         startAt = optionals cfg.automatic cfg.dates;
       };
diff --git a/nixos/modules/virtualisation/container-config.nix b/nixos/modules/virtualisation/container-config.nix
index 604fb8a7593..f7a37d8c9f3 100644
--- a/nixos/modules/virtualisation/container-config.nix
+++ b/nixos/modules/virtualisation/container-config.nix
@@ -7,6 +7,7 @@ with lib;
   config = mkIf config.boot.isContainer {
 
     # Disable some features that are not useful in a container.
+    nix.optimise.automatic = mkDefault false; # the store is host managed
     services.udisks2.enable = mkDefault false;
     powerManagement.enable = mkDefault false;
 
-- 
GitLab


From 56bd506e4291a921c023e7d6d602ce109747283f Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Thu, 11 Jul 2019 19:42:01 +0200
Subject: [PATCH 0017/2254] sage: 8.9.beta0 -> 8.9.beta2

---
 pkgs/applications/science/math/sage/sage-src.nix | 4 ++--
 pkgs/applications/science/math/sage/sagelib.nix  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix
index 2cb7649500a..e2e1e1d0647 100644
--- a/pkgs/applications/science/math/sage/sage-src.nix
+++ b/pkgs/applications/science/math/sage/sage-src.nix
@@ -10,14 +10,14 @@
 # all get the same sources with the same patches applied.
 
 stdenv.mkDerivation rec {
-  version = "8.9.beta0";
+  version = "8.9.beta2";
   pname = "sage-src";
 
   src = fetchFromGitHub {
     owner = "sagemath";
     repo = "sage";
     rev = version;
-    sha256 = "1bp6sdfk6h966y9jcpqnsrjfs0f5xgc1xmjw75h2y18hdgiadiy6";
+    sha256 = "1cyfdkam9inai7ps1jblagb9kl9wd8kk06m4vhbjmfymvk36q4jf";
   };
 
   # Patches needed because of particularities of nix or the way this is packaged.
diff --git a/pkgs/applications/science/math/sage/sagelib.nix b/pkgs/applications/science/math/sage/sagelib.nix
index 1040d6d4ba1..bf0ab30c7e4 100644
--- a/pkgs/applications/science/math/sage/sagelib.nix
+++ b/pkgs/applications/science/math/sage/sagelib.nix
@@ -138,8 +138,8 @@ buildPythonPackage rec {
     mkdir -p "$SAGE_SHARE/sage/ext/notebook-ipython"
     mkdir -p "var/lib/sage/installed"
 
+    source build/bin/sage-dist-helpers
     cd src
-    source bin/sage-dist-helpers
 
     ${python.interpreter} -u setup.py --no-user-cfg build
   '';
-- 
GitLab


From 765cd8c2edb8c3406b49f772bb37eaa271c4b2b2 Mon Sep 17 00:00:00 2001
From: Benjamin Esham <benjamin@esham.io>
Date: Fri, 19 Jul 2019 13:16:11 -0400
Subject: [PATCH 0018/2254] handbrake: fix Darwin build by turning off GUI
 support

This involved several pieces:

- Always disable GTK GUI support under Darwin. The gtk3 package depends
  transitively on dbus, which depends transitively on systemd, which is
  not currently supported on Darwin. (I gather that it may be possible
  to work around this in the future.)
- Also disable the native GUI support under Darwin (using the
  --disable-xcode flag). Building this GUI would require using the Xcode
  build system, which I was not able to figure out how to do; for now,
  all builds on Darwin are command-line-only.
- Add the lzma package as a dependency on all platforms.
- Add dependencies on the AudioToolbox, Foundation, libobjc, and
  VideoToolbox packages on Darwin.
---
 pkgs/applications/video/handbrake/default.nix | 52 +++++++++++++------
 pkgs/top-level/all-packages.nix               |  5 +-
 2 files changed, 41 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix
index aa2407134f3..7155d63b8dc 100644
--- a/pkgs/applications/video/handbrake/default.nix
+++ b/pkgs/applications/video/handbrake/default.nix
@@ -2,10 +2,14 @@
 #
 # Derivation patches HandBrake to use Nix closure dependencies.
 #
+# NOTE: 2019-07-19: This derivation does not currently support the native macOS
+# GUI--it produces the "HandbrakeCLI" CLI version only. In the future it would
+# be nice to add the native GUI (and/or the GTK GUI) as an option too, but that
+# requires invoking the Xcode build system, which is non-trivial for now.
 
 { stdenv, lib, fetchurl,
   # Main build tools
-  python2, pkgconfig, autoconf, automake, cmake, nasm, libtool, m4,
+  python2, pkgconfig, autoconf, automake, cmake, nasm, libtool, m4, lzma,
   # Processing, video codecs, containers
   ffmpeg-full, nv-codec-headers, libogg, x264, x265, libvpx, libtheora,
   # Codecs, audio
@@ -14,20 +18,34 @@
   libiconv, fribidi, fontconfig, freetype, libass, jansson, libxml2, harfbuzz,
   # Optical media
   libdvdread, libdvdnav, libdvdcss, libbluray,
-  useGtk ? true, wrapGAppsHook ? null,
-                 intltool ? null,
-                 glib ? null,
-                 gtk3 ? null,
-                 libappindicator-gtk3 ? null,
-                 libnotify ? null,
-                 gst_all_1 ? null,
-                 dbus-glib ? null,
-                 udev ? null,
-                 libgudev ? null,
-                 hicolor-icon-theme ? null,
+  # Darwin-specific
+  AudioToolbox ? null,
+  Foundation ? null,
+  libobjc ? null,
+  VideoToolbox ? null,
+  # GTK
+  # NOTE: 2019-07-19: The gtk3 package has a transitive dependency on dbus,
+  # which in turn depends on systemd. systemd is not supported on Darwin, so
+  # for now we disable GTK GUI support on Darwin. (It may be possible to remove
+  # this restriction later.)
+  useGtk ? !stdenv.isDarwin, wrapGAppsHook ? null,
+                             intltool ? null,
+                             glib ? null,
+                             gtk3 ? null,
+                             libappindicator-gtk3 ? null,
+                             libnotify ? null,
+                             gst_all_1 ? null,
+                             dbus-glib ? null,
+                             udev ? null,
+                             libgudev ? null,
+                             hicolor-icon-theme ? null,
+  # FDK
   useFdk ? false, fdk_aac ? null
 }:
 
+assert stdenv.isDarwin -> AudioToolbox != null && Foundation != null
+  && libobjc != null && VideoToolbox != null;
+
 stdenv.mkDerivation rec {
   pname = "handbrake";
   version = "1.2.2";
@@ -45,12 +63,13 @@ stdenv.mkDerivation rec {
     ffmpeg-full libogg libtheora x264 x265 libvpx
     libopus lame libvorbis a52dec speex libsamplerate
     libiconv fribidi fontconfig freetype libass jansson libxml2 harfbuzz
-    libdvdread libdvdnav libdvdcss libbluray
+    libdvdread libdvdnav libdvdcss libbluray lzma
   ] ++ lib.optionals useGtk [
     glib gtk3 libappindicator-gtk3 libnotify
     gst_all_1.gstreamer gst_all_1.gst-plugins-base dbus-glib udev
     libgudev hicolor-icon-theme
   ] ++ lib.optional useFdk fdk_aac
+    ++ lib.optionals stdenv.isDarwin [ AudioToolbox Foundation libobjc VideoToolbox ]
   # NOTE: 2018-12-27: Handbrake supports nv-codec-headers for Linux only,
   # look at ./make/configure.py search "enable_nvenc"
     ++ lib.optional stdenv.isLinux nv-codec-headers;
@@ -66,6 +85,8 @@ stdenv.mkDerivation rec {
 
     substituteInPlace libhb/module.defs \
       --replace /usr/include/libxml2 ${libxml2.dev}/include/libxml2
+    substituteInPlace libhb/module.defs \
+      --replace '$(CONTRIB.build/)include/libxml2' ${libxml2.dev}/include/libxml2
 
     # Force using nixpkgs dependencies
     sed -i '/MODULES += contrib/d' make/include/main.defs
@@ -75,8 +96,9 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--disable-df-fetch"
     "--disable-df-verify"
-    (if useGtk then "--disable-gtk-update-checks" else "--disable-gtk")
-    (if useFdk then "--enable-fdk-aac"            else "")
+    (if useGtk          then "--disable-gtk-update-checks" else "--disable-gtk")
+    (if useFdk          then "--enable-fdk-aac"            else "")
+    (if stdenv.isDarwin then "--disable-xcode"             else "")
   ];
 
   # NOTE: 2018-12-27: Check NixOS HandBrake test if changing
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 03ae106c481..ff67f8ca79d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18990,7 +18990,10 @@ in
 
   lxdvdrip = callPackage ../applications/video/lxdvdrip { };
 
-  handbrake = callPackage ../applications/video/handbrake { };
+  handbrake = callPackage ../applications/video/handbrake {
+    inherit (darwin.apple_sdk.frameworks) AudioToolbox Foundation VideoToolbox;
+    inherit (darwin) libobjc;
+  };
 
   lilyterm = callPackage ../applications/misc/lilyterm {
     inherit (gnome2) vte;
-- 
GitLab


From 4cab05598c731b718513ae4e0a73026c42063e8a Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Sun, 21 Jul 2019 15:13:48 +0200
Subject: [PATCH 0019/2254] os-prober.tests: make the test stricter

os-prober should be able to probe unmounted filesystems
---
 nixos/tests/os-prober.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/nixos/tests/os-prober.nix b/nixos/tests/os-prober.nix
index a386a5d43bc..9cd9f4ecd15 100644
--- a/nixos/tests/os-prober.nix
+++ b/nixos/tests/os-prober.nix
@@ -46,10 +46,6 @@ let
       # vda is a filesystem without partition table
       forceInstall = true;
     };
-    fileSystems."/mnt" = {
-      device = "/dev/vdb1";
-      options = [ "ro" ];
-    };
     nix.binaryCaches = lib.mkForce [ ];
     nix.extraOptions = ''
       hashed-mirrors =
-- 
GitLab


From b884552c35f872c9b4d4ff64327fd7fdd28cfc78 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Fri, 2 Aug 2019 01:03:33 +0200
Subject: [PATCH 0020/2254] sage: 8.9.beta2 -> 8.9.beta3

---
 pkgs/applications/science/math/sage/sage-src.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix
index e2e1e1d0647..3fd1601fe5e 100644
--- a/pkgs/applications/science/math/sage/sage-src.nix
+++ b/pkgs/applications/science/math/sage/sage-src.nix
@@ -10,14 +10,14 @@
 # all get the same sources with the same patches applied.
 
 stdenv.mkDerivation rec {
-  version = "8.9.beta2";
+  version = "8.9.beta3";
   pname = "sage-src";
 
   src = fetchFromGitHub {
     owner = "sagemath";
     repo = "sage";
     rev = version;
-    sha256 = "1cyfdkam9inai7ps1jblagb9kl9wd8kk06m4vhbjmfymvk36q4jf";
+    sha256 = "035nzyhiibfxhvxp0s6pijfy1612ah64qgli5p4pwqfdc76f7rnj";
   };
 
   # Patches needed because of particularities of nix or the way this is packaged.
-- 
GitLab


From d1139e340d11d544786b9637698fa5cda3b60be0 Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Fri, 2 Aug 2019 16:28:20 -0400
Subject: [PATCH 0021/2254] build-support: Add p11_kit to appimage dependency
 set

This was in the upstream list but missing from nixpkgs' list.
---
 pkgs/build-support/appimage/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix
index 990f1ce2e3e..cd6c8520856 100644
--- a/pkgs/build-support/appimage/default.nix
+++ b/pkgs/build-support/appimage/default.nix
@@ -185,6 +185,7 @@ rec {
       keyutils.lib
       libjack2
       fribidi
+      p11_kit
 
       # libraries not on the upstream include list, but nevertheless expected
       # by at least one appimage
-- 
GitLab


From f6a1fe64ebcc4d534f1736a572601d43ab04f924 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Fri, 2 Aug 2019 23:50:45 +0200
Subject: [PATCH 0022/2254] sage: 8.9.beta3 -> 8.9.beta4

---
 pkgs/applications/science/math/sage/sage-src.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix
index 3fd1601fe5e..26ca0dd3e00 100644
--- a/pkgs/applications/science/math/sage/sage-src.nix
+++ b/pkgs/applications/science/math/sage/sage-src.nix
@@ -10,14 +10,14 @@
 # all get the same sources with the same patches applied.
 
 stdenv.mkDerivation rec {
-  version = "8.9.beta3";
+  version = "8.9.beta4";
   pname = "sage-src";
 
   src = fetchFromGitHub {
     owner = "sagemath";
     repo = "sage";
     rev = version;
-    sha256 = "035nzyhiibfxhvxp0s6pijfy1612ah64qgli5p4pwqfdc76f7rnj";
+    sha256 = "0vvvip5xx0f7h7w0nv82dfkm7jgs79cibb8x2yx7azdc0v7zws69";
   };
 
   # Patches needed because of particularities of nix or the way this is packaged.
@@ -57,7 +57,14 @@ stdenv.mkDerivation rec {
   # Since sage unfortunately does not release bugfix releases, packagers must
   # fix those bugs themselves. This is for critical bugfixes, where "critical"
   # == "causes (transient) doctest failures / somebody complained".
-  bugfixPatches = [ ];
+  bugfixPatches = [
+    (fetchpatch {
+      name = "no-qqbar-timeout-check.patch";
+      url = "https://git.sagemath.org/sage.git/patch?id=d5105b625060d4b2a9cfe9cee4316d8b7c96ea46";
+      revert = true;
+      sha256 = "10dm0yjxdydf1wch5b7gkkkzrc8c8d5hlyascvb9r5pkyr0ak947";
+    })
+  ];
 
   # Patches needed because of package updates. We could just pin the versions of
   # dependencies, but that would lead to rebuilds, confusion and the burdons of
-- 
GitLab


From ddd3faf08ef3a3857ae22e89058e5979cbf67e71 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Wed, 7 Aug 2019 15:33:15 +0200
Subject: [PATCH 0023/2254] sage: 8.9.beta4 -> 8.9.beta5

---
 .../science/math/sage/sage-src.nix            | 21 +++----------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix
index 26ca0dd3e00..99c415974d9 100644
--- a/pkgs/applications/science/math/sage/sage-src.nix
+++ b/pkgs/applications/science/math/sage/sage-src.nix
@@ -10,14 +10,14 @@
 # all get the same sources with the same patches applied.
 
 stdenv.mkDerivation rec {
-  version = "8.9.beta4";
+  version = "8.9.beta5";
   pname = "sage-src";
 
   src = fetchFromGitHub {
     owner = "sagemath";
     repo = "sage";
     rev = version;
-    sha256 = "0vvvip5xx0f7h7w0nv82dfkm7jgs79cibb8x2yx7azdc0v7zws69";
+    sha256 = "1nysal4h108clrf08l8wax25q3agh74l4l327vwm93z9k9c2i6i8";
   };
 
   # Patches needed because of particularities of nix or the way this is packaged.
@@ -57,14 +57,7 @@ stdenv.mkDerivation rec {
   # Since sage unfortunately does not release bugfix releases, packagers must
   # fix those bugs themselves. This is for critical bugfixes, where "critical"
   # == "causes (transient) doctest failures / somebody complained".
-  bugfixPatches = [
-    (fetchpatch {
-      name = "no-qqbar-timeout-check.patch";
-      url = "https://git.sagemath.org/sage.git/patch?id=d5105b625060d4b2a9cfe9cee4316d8b7c96ea46";
-      revert = true;
-      sha256 = "10dm0yjxdydf1wch5b7gkkkzrc8c8d5hlyascvb9r5pkyr0ak947";
-    })
-  ];
+  bugfixPatches = [ ];
 
   # Patches needed because of package updates. We could just pin the versions of
   # dependencies, but that would lead to rebuilds, confusion and the burdons of
@@ -95,14 +88,6 @@ stdenv.mkDerivation rec {
       sha256 = "0b9293v73wb4x13wv5zwyjgclc01zn16msccfzzi6znswklgvddp";
       stripLen = 1;
     })
-
-    # https://trac.sagemath.org/ticket/26932
-    (fetchSageDiff {
-      name = "givaro-4.1.0_fflas-ffpack-2.4.0_linbox-1.6.0.patch";
-      base = "8.8.beta4";
-      rev = "c11d9cfa23ff9f77681a8f12742f68143eed4504";
-      sha256 = "0xzra7mbgqvahk9v45bjwir2mqz73hrhhy314jq5nxrb35ysdxyi";
-    })
   ];
 
   patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;
-- 
GitLab


From e8436f5e23dfdfc157736db937ef8633a2e0a3ca Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Sun, 18 Aug 2019 21:52:27 +0200
Subject: [PATCH 0024/2254] sage: 8.9.beta5 -> 8.9.beta6

---
 pkgs/applications/science/math/sage/sage-src.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix
index 99c415974d9..f7c1e50386b 100644
--- a/pkgs/applications/science/math/sage/sage-src.nix
+++ b/pkgs/applications/science/math/sage/sage-src.nix
@@ -10,14 +10,14 @@
 # all get the same sources with the same patches applied.
 
 stdenv.mkDerivation rec {
-  version = "8.9.beta5";
+  version = "8.9.beta6";
   pname = "sage-src";
 
   src = fetchFromGitHub {
     owner = "sagemath";
     repo = "sage";
     rev = version;
-    sha256 = "1nysal4h108clrf08l8wax25q3agh74l4l327vwm93z9k9c2i6i8";
+    sha256 = "0zk3wb9nlb6mrspgabiqdh3rjmcj3y70fg02dmpvhjssdblpkiqi";
   };
 
   # Patches needed because of particularities of nix or the way this is packaged.
-- 
GitLab


From 071a4db33e46766f8d7dd9243f44cc33256ab04f Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Mon, 19 Aug 2019 00:16:06 +0200
Subject: [PATCH 0025/2254] sage: 8.9.beta6 -> 8.9.beta7

---
 pkgs/applications/science/math/sage/sage-src.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix
index f7c1e50386b..ce8cf026db8 100644
--- a/pkgs/applications/science/math/sage/sage-src.nix
+++ b/pkgs/applications/science/math/sage/sage-src.nix
@@ -10,14 +10,14 @@
 # all get the same sources with the same patches applied.
 
 stdenv.mkDerivation rec {
-  version = "8.9.beta6";
+  version = "8.9.beta7";
   pname = "sage-src";
 
   src = fetchFromGitHub {
     owner = "sagemath";
     repo = "sage";
     rev = version;
-    sha256 = "0zk3wb9nlb6mrspgabiqdh3rjmcj3y70fg02dmpvhjssdblpkiqi";
+    sha256 = "1craag7kf8kl4s52y2ba52pci0amc0kz0gf67d8spxlawjx78dff";
   };
 
   # Patches needed because of particularities of nix or the way this is packaged.
-- 
GitLab


From 299e6f07d2fde9f01bd9d8fa22c464739b769ee1 Mon Sep 17 00:00:00 2001
From: Michael Peyton Jones <me@michaelpj.com>
Date: Thu, 22 Aug 2019 11:23:37 +0100
Subject: [PATCH 0026/2254] kernel: set POWERCAP and INTEL_RAPL

These enable some power management settings. They are needed for [s-tui
to show power readings](https://github.com/amanusk/s-tui/issues/105).

The values chosen here match what Arch Linux has. In particular
the Intel specific code is loadable as a module rather than compiled in.
---
 pkgs/os-specific/linux/kernel/common-config.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index b392dc853d3..730636350ed 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -52,6 +52,9 @@ let
       CPU_FREQ_DEFAULT_GOV_PERFORMANCE = yes;
       CPU_FREQ_GOV_SCHEDUTIL           = whenAtLeast "4.9" yes;
       PM_WAKELOCKS                     = yes;
+      # Power-capping framework and support for INTEL RAPL
+      POWERCAP                         = yes;
+      INTEL_RAPL                       = module;
     };
 
     external-firmware = {
-- 
GitLab


From 66e93cb96e145d22da1d1582ba6dd12db08e47fe Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 21 Aug 2019 21:04:37 -0500
Subject: [PATCH 0027/2254] libcbor: 2019-02-23 -> 2019-07-25

git bump, including removal of stray printf
---
 pkgs/development/libraries/libcbor/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libcbor/default.nix b/pkgs/development/libraries/libcbor/default.nix
index fe2f0eadeeb..105b1f43aec 100644
--- a/pkgs/development/libraries/libcbor/default.nix
+++ b/pkgs/development/libraries/libcbor/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libcbor";
-  version = "2019-02-23";
+  version = "2019-07-25";
 
   src = fetchFromGitHub {
     owner = "PJK";
     repo = pname;
-    rev = "87f977e732ca216682a8583a0e43803eb6b9c028";
-    sha256 = "17p1ahdcpf5d4r472lhciscaqjq4pyxy9xjhqqx8mv646xmyripm";
+    rev = "82512d851205fbc7f65d96a0b4a8e1bad2e4f3c6";
+    sha256 = "01hy7n21gxz4gp3gdwm2ywz822p415bj2k9ccxgwz3plvncs4xa1";
   };
 
   nativeBuildInputs = [ cmake ];
-- 
GitLab


From 7cb100b6833e020d4a4b25c3766cfde507e763e6 Mon Sep 17 00:00:00 2001
From: Nikita Uvarov <uv.nikita@gmail.com>
Date: Fri, 23 Aug 2019 12:12:17 +0200
Subject: [PATCH 0028/2254] nixos-container: use systemd-run instead of nsenter

This is the first step for unprivileged nixos containers support.
Fixes #30019. See also #18825, #57083, and #67130.
---
 .../virtualization/nixos-container/nixos-container.pl     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/virtualization/nixos-container/nixos-container.pl b/pkgs/tools/virtualization/nixos-container/nixos-container.pl
index b5ceb522e23..2a9625501b6 100755
--- a/pkgs/tools/virtualization/nixos-container/nixos-container.pl
+++ b/pkgs/tools/virtualization/nixos-container/nixos-container.pl
@@ -9,7 +9,6 @@ use Getopt::Long qw(:config gnu_getopt);
 use Cwd 'abs_path';
 use Time::HiRes;
 
-my $nsenter = "@utillinux@/bin/nsenter";
 my $su = "@su@";
 
 # Ensure a consistent umask.
@@ -270,9 +269,10 @@ sub restartContainer {
 # Run a command in the container.
 sub runInContainer {
     my @args = @_;
-    my $leader = getLeader;
-    exec($nsenter, "-t", $leader, "-m", "-u", "-i", "-n", "-p", "--", @args);
-    die "cannot run ‘nsenter’: $!\n";
+
+    exec("systemd-run", "--machine", $containerName, "--pty", "--quiet", "--", @args);
+
+    die "cannot run ‘systemd-run’: $!\n";
 }
 
 # Remove a directory while recursively unmounting all mounted filesystems within
-- 
GitLab


From bf7d135608f853b61ba1afe169afe7fdba4f8dcb Mon Sep 17 00:00:00 2001
From: Paul Reimer <paul@p-rimes.net>
Date: Sat, 24 Aug 2019 00:23:13 -0700
Subject: [PATCH 0029/2254] vimPlugins.float-preview.nvim: init at 2019-04-07

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

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 4dcfbeecb76..ca57dd738a0 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -1089,6 +1089,17 @@ let
     };
   };
 
+  float-preview-nvim = buildVimPluginFrom2Nix {
+    pname = "float-preview-nvim";
+    version = "2019-04-07";
+    src = fetchFromGitHub {
+      owner = "ncm2";
+      repo = "float-preview.nvim";
+      rev = "c5431b6d9bd4a8002f1a3eec42e9458ef4453ff3";
+      sha256 = "0ylrp0pmg822m7zp7dhyhmb05zbiy4gbq40l4whs249v0v4s9vyd";
+    };
+  };
+
   floobits-neovim = buildVimPluginFrom2Nix {
     pname = "floobits-neovim";
     version = "2018-08-01";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 681f91f6648..2c44aef711e 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -233,6 +233,7 @@ nathanaelkane/vim-indent-guides
 nathangrigg/vim-beancount
 navicore/vissort.vim
 nbouscal/vim-stylish-haskell
+ncm2/float-preview.nvim
 ncm2/ncm2
 ncm2/ncm2-bufword
 ncm2/ncm2-jedi
-- 
GitLab


From 76ad2796be28c5fbe8f8fe2b9bada12c3e1360e2 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Tue, 19 Feb 2019 11:43:55 +0800
Subject: [PATCH 0030/2254] qscintilla: 2.9.4 -> 2.11.2

We strip the library suffix as we don't need it and it confuses various
downstream consumers.

Also replace calls to sed with substituteInPlace as the latter will complain in
case it doesn't perform a substitution.
---
 .../libraries/qscintilla/default.nix          | 58 ++++++++++---------
 1 file changed, 31 insertions(+), 27 deletions(-)

diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix
index 43f0e431bb1..c75f324bf26 100644
--- a/pkgs/development/libraries/qscintilla/default.nix
+++ b/pkgs/development/libraries/qscintilla/default.nix
@@ -4,22 +4,26 @@
 , fixDarwinDylibNames
 }:
 
-# Fix Xcode 8 compilation problem
-let xcodePatch =
-  fetchurl { url = "https://raw.githubusercontent.com/Homebrew/formula-patches/a651d71/qscintilla2/xcode-8.patch";
-             sha256 = "1a88309fdfd421f4458550b710a562c622d72d6e6fdd697107e4a43161d69bc9"; };
-in
-stdenv.mkDerivation rec {
-  pname = "qscintilla";
-  version = "2.9.4";
+let
+  # Fix Xcode 8 compilation problem
+  xcodePatch = fetchurl {
+    url = "https://raw.githubusercontent.com/Homebrew/formula-patches/a651d71/qscintilla2/xcode-8.patch";
+    sha256 = "1a88309fdfd421f4458550b710a562c622d72d6e6fdd697107e4a43161d69bc9";
+  };
+
+  pname = "qscintilla-qt${if withQt5 then "5" else "4"}";
+  version = "2.11.2";
 
-  name = "${pname}-${if withQt5 then "qt5" else "qt4"}-${version}";
+in stdenv.mkDerivation rec {
+  inherit pname version;
 
   src = fetchurl {
-    url = "mirror://sourceforge/pyqt/QScintilla2/QScintilla-${version}/QScintilla_gpl-${version}.zip";
-    sha256 = "04678skipydx68zf52vznsfmll2v9aahr66g50lcqbr6xsmgr1yi";
+    url = "https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla_gpl-${version}.tar.gz";
+    sha256 = "18glb2v07mwfz6p8qmwhzcaaczyc36x3gn9wx8ndm7q6d93xr6q2";
   };
 
+  sourceRoot = "QScintilla_gpl-${version}/Qt4Qt5";
+
   buildInputs = [ (if withQt5 then qtbase else qt4) ];
 
   propagatedBuildInputs = lib.optional (withQt5 && stdenv.isDarwin) qtmacextras;
@@ -28,24 +32,23 @@ stdenv.mkDerivation rec {
     ++ (if withQt5 then [ qmake ] else [ qmake4Hook ])
     ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
-
   patches = lib.optional (stdenv.isDarwin && withQt5) [ xcodePatch ];
 
   enableParallelBuilding = true;
 
-  preConfigure = ''
-    cd Qt4Qt5
-    sed -i qscintilla.pro \
-      -e "s,\$\$\\[QT_INSTALL_LIBS\\],$out/lib," \
-      -e "s,\$\$\\[QT_INSTALL_HEADERS\\],$out/include/," \
-      -e "s,\$\$\\[QT_INSTALL_TRANSLATIONS\\],$out/translations," \
-    ${if withQt5 then ''
-      -e "s,\$\$\\[QT_HOST_DATA\\]/mkspecs,$out/mkspecs," \
-      -e "s,\$\$\\[QT_INSTALL_DATA\\]/mkspecs,$out/mkspecs," \
-      -e "s,\$\$\\[QT_INSTALL_DATA\\],$out/share,"
-    '' else ''
-      -e "s,\$\$\\[QT_INSTALL_DATA\\],$out/share/qt,"
-    ''}
+  # By default qscintilla will name the library with a qt version suffix which
+  # confuses the crap out of sqlitebrowser and possibly others so we simply
+  # strip the suffix as we don't need it and the various FindQScintilla.cmake
+  # files floating around *should* look for the un-suffixed version.
+  postPatch = ''
+    substituteInPlace qscintilla.pro \
+      --replace '_qt$''${QT_MAJOR_VERSION}'   "" \
+      --replace '$$[QT_INSTALL_LIBS]'         $out/lib \
+      --replace '$$[QT_INSTALL_HEADERS]'      $out/include \
+      --replace '$$[QT_INSTALL_TRANSLATIONS]' $out/translations \
+      --replace '$$[QT_HOST_DATA]/mkspecs'    $out/mkspecs \
+      --replace '$$[QT_INSTALL_DATA]/mkspecs' $out/mkspecs \
+      --replace '$$[QT_INSTALL_DATA]'         $out/share${lib.optionalString (! withQt5) "/qt"}
   '';
 
   meta = with stdenv.lib; {
@@ -64,9 +67,10 @@ stdenv.mkDerivation rec {
       proportional fonts, bold and italics, multiple foreground and
       background colours and multiple fonts.
     '';
-    homepage = http://www.riverbankcomputing.com/software/qscintilla/intro;
+    homepage = https://www.riverbankcomputing.com/software/qscintilla/intro;
     license = with licenses; [ gpl2 gpl3 ]; # and commercial
-    platforms = platforms.unix;
     maintainers = with maintainers; [ peterhoeg ];
+    platforms = platforms.unix;
+    broken = !withQt5;
   };
 }
-- 
GitLab


From 96f5d7941a3c96c0b6e36b2a314c087dfe015afd Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 26 Aug 2019 19:03:42 +0800
Subject: [PATCH 0031/2254] sqlitebrowser: do not use vendored qscintilla

---
 .../tools/database/sqlitebrowser/default.nix      | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/development/tools/database/sqlitebrowser/default.nix
index 7813eba0436..fe2db3ff79f 100644
--- a/pkgs/development/tools/database/sqlitebrowser/default.nix
+++ b/pkgs/development/tools/database/sqlitebrowser/default.nix
@@ -1,25 +1,20 @@
 { mkDerivation, lib, fetchFromGitHub, cmake, antlr
-, qtbase, qttools, sqlite }:
+, qtbase, qttools, qscintilla, sqlite }:
 
 mkDerivation rec {
-  version = "3.11.2";
   pname = "sqlitebrowser";
+  version = "3.11.2";
 
   src = fetchFromGitHub {
-    repo   = pname;
     owner  = pname;
+    repo   = pname;
     rev    = "v${version}";
     sha256 = "0ydd5fg76d5d23byac1f7f8mzx3brmd0cnnkd58qpmlzi7p9hcvx";
   };
 
-  buildInputs = [ qtbase sqlite ];
-
-  nativeBuildInputs = [ cmake antlr qttools ];
+  buildInputs = [ antlr qtbase qscintilla sqlite ];
 
-  # Use internal `qscintilla` rather than our package to fix the build
-  # (https://github.com/sqlitebrowser/sqlitebrowser/issues/1348#issuecomment-374170936).
-  # This can probably be removed when https://github.com/NixOS/nixpkgs/pull/56034 is merged.
-  cmakeFlags = [ "-DFORCE_INTERNAL_QSCINTILLA=ON" ];
+  nativeBuildInputs = [ cmake qttools ];
 
   NIX_LDFLAGS = [
     "-lQt5PrintSupport"
-- 
GitLab


From ffbf1db5c26f5f48e534c678ef28c42491a6663a Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 26 Aug 2019 19:20:59 +0800
Subject: [PATCH 0032/2254] sqlitebrowser: build on darwin too

---
 pkgs/development/tools/database/sqlitebrowser/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/development/tools/database/sqlitebrowser/default.nix
index fe2db3ff79f..aa29277281d 100644
--- a/pkgs/development/tools/database/sqlitebrowser/default.nix
+++ b/pkgs/development/tools/database/sqlitebrowser/default.nix
@@ -27,6 +27,6 @@ mkDerivation rec {
     homepage = http://sqlitebrowser.org/;
     license = licenses.gpl3;
     maintainers = with maintainers; [ ma27 ];
-    platforms = platforms.linux; # can only test on linux
+    platforms = platforms.unix;
   };
 }
-- 
GitLab


From 7f2b73d9488736d59d27c021a62ff816e5b9ec15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D1=83=D1=85=D0=B0=D1=80=D0=B8=D0=BA?=
 <suhr@i2pmail.org>
Date: Wed, 28 Aug 2019 20:01:35 +0300
Subject: [PATCH 0033/2254] i2p: 0.9.41 -> 0.9.42

---
 pkgs/tools/networking/i2p/default.nix | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix
index 7d709df75b6..681d5d0e7a9 100644
--- a/pkgs/tools/networking/i2p/default.nix
+++ b/pkgs/tools/networking/i2p/default.nix
@@ -1,13 +1,16 @@
 { stdenv, ps, coreutils, fetchurl, jdk, jre, ant, gettext, which }:
 
 let wrapper = stdenv.mkDerivation rec {
-  name = "wrapper-${version}";
+  pname = "wrapper";
   version = "3.5.35";
+
   src = fetchurl {
     url = "https://wrapper.tanukisoftware.com/download/${version}/wrapper_${version}_src.tar.gz";
     sha256 = "0mjyw9ays9v6lnj21pmfd3qdvd9b6rwxfmw3pg6z0kyf2jadixw2";
   };
+
   buildInputs = [ jdk ];
+
   buildPhase = ''
     export ANT_HOME=${ant}
     export JAVA_HOME=${jdk}/lib/openjdk/jre/
@@ -16,6 +19,7 @@ let wrapper = stdenv.mkDerivation rec {
     sed 's/ testsuite$//' -i src/c/Makefile-linux-x86-64.make
     ${if stdenv.isi686 then "./build32.sh" else "./build64.sh"}
   '';
+
   installPhase = ''
     mkdir -p $out/{bin,lib}
     cp bin/wrapper $out/bin/wrapper
@@ -27,17 +31,22 @@ let wrapper = stdenv.mkDerivation rec {
 in
 
 stdenv.mkDerivation rec {
-  name = "i2p-0.9.41";
+  pname = "i2p";
+  version = "0.9.42";
+
   src = fetchurl {
-    url = "https://github.com/i2p/i2p.i2p/archive/${name}.tar.gz";
-    sha256 = "0adrj56i3pcc9ainj22akjrrvy73carz5jk29qa1h2b9q03di73b";
+    url = "https://download.i2p2.de/releases/${version}/i2psource_${version}.tar.bz2";
+    sha256 = "04y71hzkdpjzbac569rhyg1zfx37j0alggbl9gnkaqfbprb2nj1h";
   };
+
   buildInputs = [ jdk ant gettext which ];
   patches = [ ./i2p.patch ];
+
   buildPhase = ''
     export JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8"
     ant preppkg-linux-only
-    '';
+  '';
+
   installPhase = ''
     set -B
     mkdir -p $out/{bin,share}
@@ -61,13 +70,13 @@ stdenv.mkDerivation rec {
     mv $out/man $out/share/
     chmod +x $out/bin/* $out/i2psvc
     rm $out/{osid,postinstall.sh,INSTALL-headless.txt}
-    '';
+  '';
 
   meta = with stdenv.lib; {
-    homepage = https://geti2p.net;
     description = "Applications and router for I2P, anonymity over the Internet";
-    maintainers = [ maintainers.joelmo ];
+    homepage = "https://geti2p.net";
     license = licenses.gpl2;
     platforms = [ "x86_64-linux" "i686-linux" ];
+    maintainers = [ maintainers.joelmo ];
   };
 }
-- 
GitLab


From b047ec51734cd1a0761f82138ef30adb5e4724ae Mon Sep 17 00:00:00 2001
From: dawidsowa <dawid_sowa@posteo.net>
Date: Thu, 29 Aug 2019 02:23:31 +0200
Subject: [PATCH 0034/2254] kcc: init at 5.5.1

---
 pkgs/applications/graphics/kcc/default.nix | 38 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/applications/graphics/kcc/default.nix

diff --git a/pkgs/applications/graphics/kcc/default.nix b/pkgs/applications/graphics/kcc/default.nix
new file mode 100644
index 00000000000..da358918972
--- /dev/null
+++ b/pkgs/applications/graphics/kcc/default.nix
@@ -0,0 +1,38 @@
+{ lib
+, mkDerivationWith
+, python3Packages
+, p7zip
+, archiveSupport ? true
+}:
+
+mkDerivationWith python3Packages.buildPythonApplication rec {
+  pname = "kcc";
+  version = "5.5.1";
+
+  src = python3Packages.fetchPypi {
+    inherit version;
+    pname = "KindleComicConverter";
+    sha256 = "5dbee5dc5ee06a07316ae5ebaf21ffa1970094dbae5985ad735e2807ef112644";
+  };
+  
+  propagatedBuildInputs = with python3Packages ; [
+    pillow
+    pyqt5
+    psutil
+    python-slugify
+    raven
+  ];
+
+  qtWrapperArgs = lib.optional archiveSupport [ "--prefix" "PATH" ":" "${ lib.makeBinPath [ p7zip ] }" ];
+
+  postFixup =  ''
+    wrapProgram $out/bin/kcc "''${qtWrapperArgs[@]}"
+  '';
+
+  meta = with lib; {
+    description = "Python app to convert comic/manga files or folders to EPUB, Panel View MOBI or E-Ink optimized CBZ";
+    homepage = "https://kcc.iosphe.re";
+    license = licenses.isc;
+    maintainers = with maintainers; [ dawidsowa ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bbe2e49bc8f..5d257bb6d85 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9692,6 +9692,8 @@ in
 
   kati = callPackage ../development/tools/build-managers/kati { };
 
+  kcc = libsForQt5.callPackage ../applications/graphics/kcc { };
+
   kconfig-frontends = callPackage ../development/tools/misc/kconfig-frontends {
     gperf = gperf_3_0;
   };
-- 
GitLab


From 2dc3bf1d1b031f534754243aa5a998d5fce7f813 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Thu, 29 Aug 2019 20:15:11 +0200
Subject: [PATCH 0035/2254] pythonPackages.blis: 0.2.4 -> 0.4.0

Major changes:

- Update vendored blis to 0.5.1
- Change license to BSD
- Support for read-only numpy arrays
---
 pkgs/development/python-modules/blis/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/blis/default.nix b/pkgs/development/python-modules/blis/default.nix
index e038e07507a..6afbe0e2f5d 100644
--- a/pkgs/development/python-modules/blis/default.nix
+++ b/pkgs/development/python-modules/blis/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "blis";
-  version = "0.2.4";
+  version = "0.4.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0c5hd0bim9134sk8wb31cqzvi9c380rbl5zwjiwrq8nnix8a2k1d";
+    sha256 = "1khh02z6wryrnrxlx2wrxzhaqsg5hlgypy0643rvi4zcqanvdpym";
   };
 
   nativeBuildInputs = [
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   meta = with stdenv.lib; {
     description = "BLAS-like linear algebra library";
     homepage = https://github.com/explosion/cython-blis;
-    license = licenses.mit;
+    license = licenses.bsd3;
     maintainers = with maintainers; [ danieldk ];
-    };
+  };
 }
-- 
GitLab


From 8cf73ee2bf536c1940ad2d957c1ce191fbd4bd42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Thu, 29 Aug 2019 20:26:36 +0200
Subject: [PATCH 0036/2254] pythonPackages.thinc: 7.0.8 -> 7.1.0

Major change: support read-only numpy arrays
---
 pkgs/development/python-modules/thinc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix
index ac8ab3fd864..44e70cceb0e 100644
--- a/pkgs/development/python-modules/thinc/default.nix
+++ b/pkgs/development/python-modules/thinc/default.nix
@@ -28,11 +28,11 @@
 
 buildPythonPackage rec {
   pname = "thinc";
-  version = "7.0.8";
+  version = "7.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "191admjvhqsbxpqn73q42i0i8kvlblj0k6p0z9p7n3pcxzl75nsw";
+    sha256 = "0j2nfzz154j9331gzwa5rmc2f5ljjan728rhgsx6c7jwg323mmsa";
   };
 
   buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
-- 
GitLab


From 0cca8578aecd2010a675c6078ddadbddbfdb4c34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Thu, 29 Aug 2019 20:27:43 +0200
Subject: [PATCH 0037/2254] python3Packages.spacy: remove blis/thinc upper
 bounds

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

diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix
index cdef1b2a9bd..408063b9c4f 100644
--- a/pkgs/development/python-modules/spacy/default.nix
+++ b/pkgs/development/python-modules/spacy/default.nix
@@ -34,7 +34,9 @@ buildPythonPackage rec {
 
   prePatch = ''
     substituteInPlace setup.py \
-      --replace "plac<1.0.0,>=0.9.6" "plac>=0.9.6"
+      --replace "plac<1.0.0,>=0.9.6" "plac>=0.9.6" \
+      --replace "thinc>=7.0.8,<7.1.0" "thinc>=7.0.8" \
+      --replace "blis>=0.2.2,<0.3.0" "blis>=0.2.2"
   '';
 
   propagatedBuildInputs = [
-- 
GitLab


From 11ec70c0ff305520ec2ba83bd852e138f4cf4ccf Mon Sep 17 00:00:00 2001
From: tobias pflug <tobias.pflug@gmail.com>
Date: Thu, 29 Aug 2019 11:52:31 +0200
Subject: [PATCH 0038/2254] hydra-cli: init at 0.2.0

---
 .../tools/misc/hydra-cli/default.nix          | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/tools/misc/hydra-cli/default.nix

diff --git a/pkgs/development/tools/misc/hydra-cli/default.nix b/pkgs/development/tools/misc/hydra-cli/default.nix
new file mode 100644
index 00000000000..24ca98118bd
--- /dev/null
+++ b/pkgs/development/tools/misc/hydra-cli/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, lib, pkgconfig, openssl, fetchFromGitHub, rustPlatform, darwin }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "hydra-cli";
+  version = "0.2.0";
+
+  src = fetchFromGitHub {
+    owner = "nlewo";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1jdlmc45hwblcxs6hvy3gi2dr7qyzs1sg5zr26jrpxrbvqqzrdhc";
+  };
+
+  cargoSha256 = "0dqj2pdqfbgg8r3h2s07p3m9zgl9xl4vislbqs6a0f1ahrczlda5";
+
+  buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
+
+  nativeBuildInputs = [
+    pkgconfig
+    openssl
+  ];
+
+  meta = with stdenv.lib; {
+    description = "A client for the Hydra CI";
+    homepage = "https://github.com/nlewo/hydra-cli";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ gilligan lewo ];
+    platforms = platforms.all;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d04329080ed..6e78e9b5a83 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11299,6 +11299,8 @@ in
 
   hydra = callPackage ../development/tools/misc/hydra { };
 
+  hydra-cli = callPackage ../development/tools/misc/hydra-cli { };
+
   hydraAntLogger = callPackage ../development/libraries/java/hydra-ant-logger { };
 
   hyena = callPackage ../development/libraries/hyena { };
-- 
GitLab


From 74bfecb7ee35a9eedb200ec8c6ae9f6f737d6b0c Mon Sep 17 00:00:00 2001
From: Eric Wolf <eric@boese-wolf.eu>
Date: Sun, 25 Aug 2019 01:24:15 +0200
Subject: [PATCH 0039/2254] yubico-pam: unstable-2019-03-19 ->
 unstable-2019-07-01

Co-Authored-By: Marek Mahut <marek.mahut@gmail.com>
---
 pkgs/development/libraries/yubico-pam/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/yubico-pam/default.nix b/pkgs/development/libraries/yubico-pam/default.nix
index 5d7d0e664c6..e6a3fa9fbe1 100644
--- a/pkgs/development/libraries/yubico-pam/default.nix
+++ b/pkgs/development/libraries/yubico-pam/default.nix
@@ -4,12 +4,12 @@
 
 stdenv.mkDerivation rec {
   pname = "yubico-pam";
-  version = "unstable-2019-03-19";
+  version = "unstable-2019-07-01";
   src = fetchFromGitHub {
     owner = "Yubico";
     repo = pname;
-    rev = "1c6fa66825e77b3ad8df46513d0125bed9bde704";
-    sha256 = "1g41wdwa1wbp391w1crbis4hwz60m3y06rd6j59m003zx40sk9s4";
+    rev = "b5bd00db81e0e0e0ecced65c684080bb56ddc35b";
+    sha256 = "10dq8dqi3jldllj6p8r9hldx9sank9n82c44w8akxrs1vli6nj3m";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig asciidoc libxslt docbook_xsl ];
-- 
GitLab


From edf538f7b9da60b318a0b1881881e90cf7884d67 Mon Sep 17 00:00:00 2001
From: Eric Wolf <ericwolf42@gmail.com>
Date: Fri, 30 Aug 2019 19:33:08 +0200
Subject: [PATCH 0040/2254] yubico-pam: make local authentication possible

using challenge response

see https://developers.yubico.com/yubico-pam/Authentication_Using_Challenge-Response.html
---
 nixos/modules/security/pam.nix | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index 89e71c5136e..d6622cb1e2f 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -351,7 +351,7 @@ let
           ${let oath = config.security.pam.oath; in optionalString cfg.oathAuth
               "auth requisite ${pkgs.oathToolkit}/lib/security/pam_oath.so window=${toString oath.window} usersfile=${toString oath.usersFile} digits=${toString oath.digits}"}
           ${let yubi = config.security.pam.yubico; in optionalString cfg.yubicoAuth
-              "auth ${yubi.control} ${pkgs.yubico-pam}/lib/security/pam_yubico.so id=${toString yubi.id} ${optionalString yubi.debug "debug"}"}
+              "auth ${yubi.control} ${pkgs.yubico-pam}/lib/security/pam_yubico.so mode=${toString yubi.mode} ${optionalString (yubi.mode == "client") "id=${toString yubi.id}"} ${optionalString yubi.debug "debug"}"}
         '' +
           # Modules in this block require having the password set in PAM_AUTHTOK.
           # pam_unix is marked as 'sufficient' on NixOS which means nothing will run
@@ -696,6 +696,23 @@ in
           Debug output to stderr.
         '';
       };
+      mode = mkOption {
+        default = "client";
+        type = types.enum [ "client" "challenge-response" ];
+        description = ''
+          Mode of operation.
+
+          Use "client" for online validation with a YubiKey validation service such as
+          the YubiCloud.
+
+          Use "challenge-response" for offline validation using YubiKeys with HMAC-SHA-1
+          Challenge-Response configurations. See the man-page ykpamcfg(1) for further
+          details on how to configure offline Challenge-Response validation. 
+
+          More information can be found <link
+          xlink:href="https://developers.yubico.com/yubico-pam/Authentication_Using_Challenge-Response.html">here</link>.
+        '';
+      };
     };
 
     security.pam.enableEcryptfs = mkOption {
-- 
GitLab


From d7fb15024fd2afffbd03b525937103f9d9e526f8 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar@redhat.com>
Date: Thu, 28 Mar 2019 21:30:13 -0700
Subject: [PATCH 0041/2254] Bump patchelf to 0.10

This release contains three years of bug fixes and improvements.
---
 pkgs/development/tools/misc/patchelf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/patchelf/default.nix b/pkgs/development/tools/misc/patchelf/default.nix
index 77d03f299f4..355d3979822 100644
--- a/pkgs/development/tools/misc/patchelf/default.nix
+++ b/pkgs/development/tools/misc/patchelf/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "patchelf-0.9";
+  name = "patchelf-0.10";
 
   src = fetchurl {
     url = "https://nixos.org/releases/patchelf/${name}/${name}.tar.bz2";
-    sha256 = "a0f65c1ba148890e9f2f7823f4bedf7ecad5417772f64f994004f59a39014f83";
+    sha256 = "1wzwvnlyf853hw9zgqq5522bvf8gqadk8icgqa41a5n7593csw7n";
   };
 
   setupHook = [ ./setup-hook.sh ];
-- 
GitLab


From f345dc1dadfc28119080f43f215ecb7ac80d26d4 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar@redhat.com>
Date: Mon, 1 Apr 2019 07:26:03 -0700
Subject: [PATCH 0042/2254] Bump patchelfUnstable to 0.10

This is to reflect the bump for regular version. We are leaving
patchelfUnstable b/c in the future we may need it to get the very latest
patches to patchelf again.
---
 pkgs/development/tools/misc/patchelf/unstable.nix | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix
index c673bd26109..401380b8301 100644
--- a/pkgs/development/tools/misc/patchelf/unstable.nix
+++ b/pkgs/development/tools/misc/patchelf/unstable.nix
@@ -1,14 +1,12 @@
-{ stdenv, fetchFromGitHub, autoreconfHook }:
+{ stdenv, fetchurl, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  pname = "patchelf";
-  version = "0.10-pre-20190328";
+  name = "patchelf-${version}";
+  version = "0.10";
 
-  src = fetchFromGitHub {
-    owner = "NixOS";
-    repo = "patchelf";
-    rev = "e1e39f3639e39360ceebb2f7ed533cede4623070";
-    sha256 = "09q1b1yqfzg1ih51v7qjh55vxfdbd8x5anycl8sfz6qy107wr02k";
+  src = fetchurl {
+    url = "https://nixos.org/releases/patchelf/${name}/${name}.tar.bz2";
+    sha256 = "1wzwvnlyf853hw9zgqq5522bvf8gqadk8icgqa41a5n7593csw7n";
   };
 
   # Drop test that fails on musl (?)
-- 
GitLab


From 0611b32e9250fd47c0fb8ef59645381d4c9a6f2a Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar@redhat.com>
Date: Mon, 1 Apr 2019 09:28:55 -0700
Subject: [PATCH 0043/2254] patchelf: fixed tests for musl

The recipe is copied from patchelfUnstable.
---
 .../development/tools/misc/patchelf/default.nix | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/patchelf/default.nix b/pkgs/development/tools/misc/patchelf/default.nix
index 355d3979822..db8bb4f4243 100644
--- a/pkgs/development/tools/misc/patchelf/default.nix
+++ b/pkgs/development/tools/misc/patchelf/default.nix
@@ -1,16 +1,27 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "patchelf-0.10";
+  name = "patchelf-${version}";
+  version = "0.10";
 
   src = fetchurl {
     url = "https://nixos.org/releases/patchelf/${name}/${name}.tar.bz2";
     sha256 = "1wzwvnlyf853hw9zgqq5522bvf8gqadk8icgqa41a5n7593csw7n";
   };
 
+  # Drop test that fails on musl (?)
+  postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+    substituteInPlace tests/Makefile.am \
+      --replace "set-rpath-library.sh" ""
+  '';
+
   setupHook = [ ./setup-hook.sh ];
 
-  doCheck = false; # fails 8 out of 24 tests, problems when loading libc.so.6
+  nativeBuildInputs = [ autoreconfHook ];
+  buildInputs = [ ];
+
+  # if not Musl, fails 8 out of 25 tests, problems when loading libc.so.6
+  doCheck = stdenv.hostPlatform.isMusl;
 
   meta = with stdenv.lib; {
     homepage = https://nixos.org/patchelf.html;
-- 
GitLab


From 59bed0a7b3248b8cf5a174097508fdf35988a4ef Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar@redhat.com>
Date: Mon, 1 Apr 2019 13:44:47 -0700
Subject: [PATCH 0044/2254] Adjust patchelfUnstable to patchelf derivation
 layout

---
 pkgs/development/tools/misc/patchelf/unstable.nix | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix
index 401380b8301..f5ff1c74bcc 100644
--- a/pkgs/development/tools/misc/patchelf/unstable.nix
+++ b/pkgs/development/tools/misc/patchelf/unstable.nix
@@ -13,10 +13,6 @@ stdenv.mkDerivation rec {
   postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
     substituteInPlace tests/Makefile.am \
       --replace "set-rpath-library.sh" ""
-  '' +
-  # extend version identifier to more informative than "0.10".
-  ''
-    echo -n ${version} > version
   '';
 
   setupHook = [ ./setup-hook.sh ];
@@ -26,11 +22,11 @@ stdenv.mkDerivation rec {
 
   doCheck = !stdenv.isDarwin;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://nixos.org/patchelf.html;
-    license = "GPL";
+    license = licenses.gpl3;
     description = "A small utility to modify the dynamic linker and RPATH of ELF executables";
-    maintainers = [ stdenv.lib.maintainers.eelco ];
-    platforms = stdenv.lib.platforms.all;
+    maintainers = [ maintainers.eelco ];
+    platforms = platforms.all;
   };
 }
-- 
GitLab


From 925abd008b0d577768d2b4890928bc3eb1e01cd8 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Thu, 29 Aug 2019 15:13:44 -0400
Subject: [PATCH 0045/2254] jetbrains.jdk: 164 -> 451

---
 pkgs/applications/editors/jetbrains/default.nix      | 2 +-
 pkgs/development/compilers/jetbrains-jdk/default.nix | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 92355552fce..de1f4232f10 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -240,7 +240,7 @@ let
       patchPhase = (attrs.patchPhase or "") + optionalString (stdenv.isLinux) ''
         # Webstorm tries to use bundled jre if available.
         # Lets prevent this for the moment
-        rm -r jre64
+        rm -r jbr
       '';
     });
 in
diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix
index 1349b7f0ddd..24bbb59c700 100644
--- a/pkgs/development/compilers/jetbrains-jdk/default.nix
+++ b/pkgs/development/compilers/jetbrains-jdk/default.nix
@@ -7,12 +7,12 @@
 
 let drv = stdenv.mkDerivation rec {
   pname = "jetbrainsjdk";
-  version = "164";
+  version = "451";
 
   src = if stdenv.hostPlatform.system == "x86_64-linux" then
     fetchurl {
-      url = "https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrsdk-11_0_2-linux-x64-b${version}.tar.gz";
-      sha256 = "121yzgvkfx7lq0k9s8wjnhz09a564br5y7zlkxgh191sbm2i7zdi";
+      url = "https://bintray.com/jetbrains/intellij-jbr/download_file?file_path=jbrsdk-11_0_4-linux-x64-b${version}.tar.gz";
+      sha256 = "05khf817i8lywfdp68a6lniv8hgi20rmnxqp3963k6vw41ar9qba";
     }
   else
     throw "unsupported system: ${stdenv.hostPlatform.system}";
@@ -24,8 +24,7 @@ let drv = stdenv.mkDerivation rec {
   installPhase = ''
     cd ..
 
-    mv $sourceRoot $out
-    jrePath=$out/jre
+    mv $sourceRoot/jbrsdk $out
   '';
 
   postFixup = ''
-- 
GitLab


From 0b3e7a212aa943209e22401f80bbc396ed55b61d Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Thu, 29 Aug 2019 15:14:06 -0400
Subject: [PATCH 0046/2254] jetbrains.datagrip: 2019.2.2 -> 2019.2.3

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index de1f4232f10..e12ed39cade 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -263,12 +263,12 @@ in
 
   datagrip = buildDataGrip rec {
     name = "datagrip-${version}";
-    version = "2019.2.2"; /* updated by script */
+    version = "2019.2.3"; /* updated by script */
     description = "Your Swiss Army Knife for Databases and SQL";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/datagrip/${name}.tar.gz";
-      sha256 = "1babydzmgaas1rxjv11yhgbp0l5scsdwy17l9927qwlbgccf24mb"; /* updated by script */
+      sha256 = "04zhasf22wb3nd6p5zrwa84vbcnbrr40sjlm8djsabhskmy7f6pc"; /* updated by script */
     };
     wmClass = "jetbrains-datagrip";
     update-channel = "DataGrip RELEASE";
-- 
GitLab


From 308a8d3f85d967c0fb81d62b9e280371bec1c3fc Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Thu, 29 Aug 2019 15:14:18 -0400
Subject: [PATCH 0047/2254] jetbrains.webstorm: 2019.1.3 -> 2019.2.1

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index e12ed39cade..47d431c4edf 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -380,12 +380,12 @@ in
 
   webstorm = buildWebStorm rec {
     name = "webstorm-${version}";
-    version = "2019.1.3"; /* updated by script */
+    version = "2019.2.1"; /* updated by script */
     description = "Professional IDE for Web and JavaScript development";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz";
-      sha256 = "1bhx2p40r15zvfr6q10bj5y8jaa3i9x9adchczp0irkd3w2jgvy3"; /* updated by script */
+      sha256 = "1wwy32xq332vwx70v7haa5mvrq1wq8mk5icdpgp5l6pqkzy5xayn"; /* updated by script */
     };
     wmClass = "jetbrains-webstorm";
     update-channel = "WebStorm RELEASE";
-- 
GitLab


From 0e04dfdccb50c3e0a8f43429a638a2239a1e494d Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 1 Sep 2019 16:20:00 -0500
Subject: [PATCH 0048/2254] pgformatter: init at 4.0

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

diff --git a/pkgs/development/tools/pgformatter/default.nix b/pkgs/development/tools/pgformatter/default.nix
new file mode 100644
index 00000000000..5d8376acdb3
--- /dev/null
+++ b/pkgs/development/tools/pgformatter/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, perlPackages, fetchFromGitHub, shortenPerlShebang }:
+
+perlPackages.buildPerlPackage rec {
+  pname = "pgformatter";
+  version = "4.0";
+
+  src = fetchFromGitHub {
+    owner = "darold";
+    repo = "pgFormatter";
+    rev = "v${version}";
+    sha256 = "09p242s406mf469p66zp1jmp9pxcim2vk1v6qsxnrbzicchsn5i2";
+  };
+
+  outputs = [ "out" ];
+
+  makeMakerFlags = [ "INSTALLDIRS=vendor" ];
+
+  # Makefile.PL only accepts DESTDIR and INSTALLDIRS, but we need to set more to make this work for NixOS.
+  patchPhase = ''
+    substituteInPlace pg_format \
+      --replace "#!/usr/bin/env perl" "#!/usr/bin/perl"
+    substituteInPlace Makefile.PL \
+      --replace "'DESTDIR'      => \$DESTDIR," "'DESTDIR'      => '$out/'," \
+      --replace "'INSTALLDIRS'  => \$INSTALLDIRS," "'INSTALLDIRS'  => \$INSTALLDIRS, 'INSTALLVENDORLIB' => 'bin/lib', 'INSTALLVENDORBIN' => 'bin', 'INSTALLVENDORSCRIPT' => 'bin', 'INSTALLVENDORMAN1DIR' => 'share/man/man1', 'INSTALLVENDORMAN3DIR' => 'share/man/man3',"
+  '';
+
+  nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang;
+  postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+    shortenPerlShebang $out/bin/pg_format
+  '';
+
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "A PostgreSQL SQL syntax beautifier that can work as a console program or as a CGI";
+    homepage = "https://github.com/darold/pgFormatter";
+    maintainers = [ maintainers.marsam ];
+    license = [ licenses.postgresql licenses.artistic2 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 96862f9ece8..83f779d2eb5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3701,6 +3701,8 @@ in
 
   pgf_graphics = callPackage ../tools/graphics/pgf { };
 
+  pgformatter = callPackage ../development/tools/pgformatter { };
+
   pgloader = callPackage ../development/tools/pgloader { };
 
   pigz = callPackage ../tools/compression/pigz { };
-- 
GitLab


From 84578046aad4168af3d7f738864c578c2cefba41 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Tue, 3 Sep 2019 15:34:28 +0200
Subject: [PATCH 0049/2254] sage: 8.9.beta7 -> 8.9.beta8

---
 pkgs/applications/science/math/sage/sage-src.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix
index ce8cf026db8..e4f38265c41 100644
--- a/pkgs/applications/science/math/sage/sage-src.nix
+++ b/pkgs/applications/science/math/sage/sage-src.nix
@@ -10,14 +10,14 @@
 # all get the same sources with the same patches applied.
 
 stdenv.mkDerivation rec {
-  version = "8.9.beta7";
+  version = "8.9.beta8";
   pname = "sage-src";
 
   src = fetchFromGitHub {
     owner = "sagemath";
     repo = "sage";
     rev = version;
-    sha256 = "1craag7kf8kl4s52y2ba52pci0amc0kz0gf67d8spxlawjx78dff";
+    sha256 = "0aw19qx4z23vfqp5dyqsff5ng968ipjxsw1j45i9va3cpabm6j49";
   };
 
   # Patches needed because of particularities of nix or the way this is packaged.
-- 
GitLab


From 4c5e263e545c4a743337ebdfc47a02112413e281 Mon Sep 17 00:00:00 2001
From: Pamplemousse <xav.maso@gmail.com>
Date: Sun, 14 Jul 2019 16:58:49 -0700
Subject: [PATCH 0050/2254] Add Pamplemousse to the maintainers list

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index ff88c717c25..06a641a9ac5 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4762,6 +4762,12 @@
     githubId = 11016164;
     name = "Fedor Pakhomov";
   };
+  pamplemousse = {
+    email = "xav.maso@gmail.com";
+    github = "Pamplemousse";
+    githubId = 2647236;
+    name = "Xavier Maso";
+  };
   panaeon = {
     email = "vitalii.voloshyn@gmail.com";
     github = "panaeon";
-- 
GitLab


From 063b61933825f4839a8b16f6ec16ee4f48654f25 Mon Sep 17 00:00:00 2001
From: Will Dietz <github@wdtz.org>
Date: Tue, 3 Sep 2019 18:24:45 -0500
Subject: [PATCH 0051/2254] libcbor: prepend version with 'unstable-' per
 policy

Per reviewer suggestion, thanks!

Co-Authored-By: Jon <jonringer@users.noreply.github.com>
---
 pkgs/development/libraries/libcbor/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libcbor/default.nix b/pkgs/development/libraries/libcbor/default.nix
index 105b1f43aec..4d56c0f1403 100644
--- a/pkgs/development/libraries/libcbor/default.nix
+++ b/pkgs/development/libraries/libcbor/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   pname = "libcbor";
-  version = "2019-07-25";
+  version = "unstable-2019-07-25";
 
   src = fetchFromGitHub {
     owner = "PJK";
-- 
GitLab


From f0779e4497842b7a0306c7ae1e63d84d5ddbae75 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 3 Sep 2019 19:37:37 -0500
Subject: [PATCH 0052/2254] ell: 0.21 -> 0.22

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

diff --git a/pkgs/os-specific/linux/ell/default.nix b/pkgs/os-specific/linux/ell/default.nix
index b10d45d8a4b..223a9b7bf79 100644
--- a/pkgs/os-specific/linux/ell/default.nix
+++ b/pkgs/os-specific/linux/ell/default.nix
@@ -7,14 +7,14 @@
 
 stdenv.mkDerivation rec {
   pname = "ell";
-  version = "0.21";
+  version = "0.22";
 
   outputs = [ "out" "dev" ];
 
   src = fetchgit {
      url = "https://git.kernel.org/pub/scm/libs/${pname}/${pname}.git";
      rev = version;
-     sha256 = "0m7fk2xgzsz7am0wjw98sqa42zpw3cz3hz399niw5rj8dbqh0zpy";
+     sha256 = "0dk4j1b8sy4j6w91cq5ga99f3hln9fgh79ayi9kvn8xgzksmhjdp";
   };
 
   patches = [
-- 
GitLab


From 545d58a1ef8abb5a493654a84b9d6a3ca87a7909 Mon Sep 17 00:00:00 2001
From: Julien Langlois <yourstruly@julienlanglois.me>
Date: Mon, 22 Apr 2019 21:47:19 -0400
Subject: [PATCH 0053/2254] chromium: fix widevine

This change allows widevine to work in chromium (it was previously
broken due to a segfault). Newer versions of chromium do not use the
libwidevinecdmadapter.so. Instead, libwidevinecdm.so should be installed
in the chromium libExec directory.
---
 .../networking/browsers/chromium/browser.nix  | 50 +++++++++++++---
 .../networking/browsers/chromium/default.nix  | 12 +---
 .../browsers/chromium/patches/widevine.patch  | 34 ++++++-----
 .../networking/browsers/chromium/plugins.nix  | 58 +------------------
 4 files changed, 68 insertions(+), 86 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix
index 8bdb33ed5d2..e41c3b777f8 100644
--- a/pkgs/applications/networking/browsers/chromium/browser.nix
+++ b/pkgs/applications/networking/browsers/chromium/browser.nix
@@ -1,8 +1,47 @@
-{ stdenv, mkChromiumDerivation, channel }:
+{ stdenv, mkChromiumDerivation, channel, upstream-info, gcc, glib, nspr, nss, patchelfUnstable, enableWideVine }:
 
 with stdenv.lib;
 
-mkChromiumDerivation (base: rec {
+let
+  mkrpath = p: "${makeSearchPathOutput "lib" "lib64" p}:${makeLibraryPath p}";
+  widevine = stdenv.mkDerivation {
+    name = "chromium-binary-plugin-widevine";
+
+    src = upstream-info.binary;
+
+    nativeBuildInputs = [ patchelfUnstable ];
+
+    phases = [ "unpackPhase" "patchPhase" "installPhase" "checkPhase" ];
+
+    unpackCmd = let
+      chan = if upstream-info.channel == "dev"    then "chrome-unstable"
+        else if upstream-info.channel == "stable" then "chrome"
+        else "chrome-${upstream-info.channel}";
+    in ''
+      mkdir -p plugins
+      ar p "$src" data.tar.xz | tar xJ -C plugins --strip-components=4 \
+        ./opt/google/${chan}/libwidevinecdm.so
+    '';
+
+    doCheck = true;
+    checkPhase = ''
+      ! find -iname '*.so' -exec ldd {} + | grep 'not found'
+    '';
+
+    PATCH_RPATH = mkrpath [ gcc.cc glib nspr nss ];
+
+    patchPhase = ''
+      patchelf --set-rpath "$PATCH_RPATH" libwidevinecdm.so
+    '';
+
+    installPhase = ''
+      install -vD libwidevinecdm.so \
+        "$out/lib/libwidevinecdm.so"
+    '';
+
+    meta.platforms = platforms.x86_64;
+  };
+in mkChromiumDerivation (base: rec {
   name = "chromium-browser";
   packageName = "chromium";
   buildTargets = [ "mksnapshot" "chrome_sandbox" "chrome" ];
@@ -18,11 +57,6 @@ mkChromiumDerivation (base: rec {
     cp -vLR "$buildPath/locales" "$buildPath/resources" "$libExecPath/"
     cp -v "$buildPath/chrome" "$libExecPath/$packageName"
 
-    if [ -e "$buildPath/libwidevinecdmadapter.so" ]; then
-      cp -v "$buildPath/libwidevinecdmadapter.so" \
-            "$libExecPath/libwidevinecdmadapter.so"
-    fi
-
     mkdir -p "$sandbox/bin"
     cp -v "$buildPath/chrome_sandbox" "$sandbox/bin/${sandboxExecutableName}"
 
@@ -57,6 +91,8 @@ mkChromiumDerivation (base: rec {
       -e '/\[Desktop Entry\]/a\' \
       -e 'StartupWMClass=chromium-browser' \
       $out/share/applications/chromium-browser.desktop
+
+    ${optionalString enableWideVine "ln -s ${widevine}/lib/libwidevinecdm.so \"$libExecPath/libwidevinecdm.so\""}
   '';
 
   passthru = { inherit sandboxExecutableName; };
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 3178e2595fc..b88772bbd31 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -38,10 +38,10 @@ in let
               enableWideVine;
     };
 
-    browser = callPackage ./browser.nix { inherit channel; };
+    browser = callPackage ./browser.nix { inherit channel enableWideVine; };
 
     plugins = callPackage ./plugins.nix {
-      inherit enablePepperFlash enableWideVine;
+      inherit enablePepperFlash;
     };
   };
 
@@ -113,13 +113,7 @@ in stdenv.mkDerivation {
   '';
 
   inherit (chromium.browser) packageName;
-  meta = chromium.browser.meta // {
-    broken = if enableWideVine then
-          builtins.trace "WARNING: WideVine is not functional, please only use for testing"
-             true
-        else false;
-  };
-
+  meta = chromium.browser.meta;
   passthru = {
     inherit (chromium) upstream-info browser;
     mkDerivation = chromium.mkChromiumDerivation;
diff --git a/pkgs/applications/networking/browsers/chromium/patches/widevine.patch b/pkgs/applications/networking/browsers/chromium/patches/widevine.patch
index 90a13928e3b..2de6024141d 100644
--- a/pkgs/applications/networking/browsers/chromium/patches/widevine.patch
+++ b/pkgs/applications/networking/browsers/chromium/patches/widevine.patch
@@ -1,16 +1,24 @@
-Minimal WideVine patch from Gentoo:
+Description: enable widevine and set its version string to "undefined"
+Author: Michael Gilbert <mgilbert@debian.org>
+Author: Olivier Tilloy <olivier.tilloy@canonical.com>
 
-https://gitweb.gentoo.org/repo/gentoo.git/tree/www-client/chromium/files/chromium-widevine-r1.patch
-
-BTS: https://bugs.gentoo.org/show_bug.cgi?id=547630
-
---- a/third_party/widevine/cdm/stub/widevine_cdm_version.h
-+++ b/third_party/widevine/cdm/stub/widevine_cdm_version.h
-@@ -10,6 +10,7 @@
- 
- #include "third_party/widevine/cdm/widevine_cdm_common.h"
- 
-+#define WIDEVINE_CDM_VERSION_STRING "unknown"
- #define WIDEVINE_CDM_AVAILABLE
+--- a/third_party/widevine/cdm/widevine_cdm_version.h
++++ b/third_party/widevine/cdm/widevine_cdm_version.h
+@@ -11,5 +11,6 @@
+ // If the Widevine CDM is available define the following:
+ //  - WIDEVINE_CDM_VERSION_STRING (with the version of the CDM that's available
+ //    as a string, e.g., "1.0.123.456").
++#define WIDEVINE_CDM_VERSION_STRING "undefined"
  
  #endif  // WIDEVINE_CDM_VERSION_H_
+--- a/chrome/common/chrome_content_client.cc
++++ b/chrome/common/chrome_content_client.cc
+@@ -99,7 +99,7 @@
+ // Registers Widevine CDM if Widevine is enabled, the Widevine CDM is
+ // bundled and not a component. When the Widevine CDM is a component, it is
+ // registered in widevine_cdm_component_installer.cc.
+-#if BUILDFLAG(BUNDLE_WIDEVINE_CDM) && !BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT)
++#if !BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT)
+ #define REGISTER_BUNDLED_WIDEVINE_CDM
+ #include "third_party/widevine/cdm/widevine_cdm_common.h"  // nogncheck
+ // TODO(crbug.com/663554): Needed for WIDEVINE_CDM_VERSION_STRING. Support
diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix
index a0ea67133c6..9cf264151af 100644
--- a/pkgs/applications/networking/browsers/chromium/plugins.nix
+++ b/pkgs/applications/networking/browsers/chromium/plugins.nix
@@ -6,7 +6,6 @@
 , fetchzip
 , patchelfUnstable
 , enablePepperFlash ? false
-, enableWideVine ? false
 
 , upstream-info
 }:
@@ -44,60 +43,6 @@ let
     echo ${toString quoted} > "''$${output}/nix-support/wrapper-flags"
   '';
 
-  widevine = stdenv.mkDerivation {
-    name = "chromium-binary-plugin-widevine";
-
-    src = upstream-info.binary;
-
-    nativeBuildInputs = [ patchelfUnstable ];
-
-    phases = [ "unpackPhase" "patchPhase" "installPhase" "checkPhase" ];
-
-    unpackCmd = let
-      chan = if upstream-info.channel == "dev"    then "chrome-unstable"
-        else if upstream-info.channel == "stable" then "chrome"
-        else "chrome-${upstream-info.channel}";
-    in ''
-      mkdir -p plugins
-      ar p "$src" data.tar.xz | tar xJ -C plugins --strip-components=4 \
-        ./opt/google/${chan}/libwidevinecdm.so \
-        ./opt/google/${chan}/libwidevinecdmadapter.so
-    '';
-
-    doCheck = true;
-    checkPhase = ''
-      ! find -iname '*.so' -exec ldd {} + | grep 'not found'
-    '';
-
-    PATCH_RPATH = mkrpath [ gcc.cc glib nspr nss ];
-
-    patchPhase = ''
-      chmod +x libwidevinecdm.so libwidevinecdmadapter.so
-      patchelf --set-rpath "$PATCH_RPATH" libwidevinecdm.so
-      patchelf --set-rpath "$out/lib:$PATCH_RPATH" libwidevinecdmadapter.so
-    '';
-
-    installPhase = let
-      wvName = "Widevine Content Decryption Module";
-      wvDescription = "Playback of encrypted HTML audio/video content";
-      wvMimeTypes = "application/x-ppapi-widevine-cdm";
-      wvModule = "@out@/lib/libwidevinecdmadapter.so";
-      wvInfo = "#${wvName}#${wvDescription};${wvMimeTypes}";
-    in ''
-      install -vD libwidevinecdm.so \
-        "$out/lib/libwidevinecdm.so"
-      install -vD libwidevinecdmadapter.so \
-        "$out/lib/libwidevinecdmadapter.so"
-
-      ${mkPluginInfo {
-        flags = [ "--register-pepper-plugins=${wvModule}${wvInfo}" ];
-        envVars.NIX_CHROMIUM_PLUGIN_PATH_WIDEVINE = "@out@/lib";
-      }}
-    '';
-
-    meta.platforms = platforms.x86_64;
-  };
-
   flash = stdenv.mkDerivation rec {
     pname = "flashplayer-ppapi";
     version = "32.0.0.238";
@@ -140,6 +85,5 @@ let
   };
 
 in {
-  enabled = optional enableWideVine widevine
-         ++ optional enablePepperFlash flash;
+  enabled = optional enablePepperFlash flash;
 }
-- 
GitLab


From aeeb67bfcb3f3d8ad0d5e22cf0c7a5c4acfa17ae Mon Sep 17 00:00:00 2001
From: Julien Langlois <yourstruly@julienlanglois.me>
Date: Sat, 10 Aug 2019 19:09:55 -0400
Subject: [PATCH 0054/2254] Rework to avoid a full rebuild for widevine.

---
 .../networking/browsers/chromium/browser.nix  | 45 +-------------
 .../networking/browsers/chromium/common.nix   |  6 +-
 .../networking/browsers/chromium/default.nix  | 58 +++++++++++++++++--
 3 files changed, 59 insertions(+), 50 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix
index e41c3b777f8..29fdb117733 100644
--- a/pkgs/applications/networking/browsers/chromium/browser.nix
+++ b/pkgs/applications/networking/browsers/chromium/browser.nix
@@ -1,47 +1,8 @@
-{ stdenv, mkChromiumDerivation, channel, upstream-info, gcc, glib, nspr, nss, patchelfUnstable, enableWideVine }:
+{ stdenv, mkChromiumDerivation, channel }:
 
 with stdenv.lib;
 
-let
-  mkrpath = p: "${makeSearchPathOutput "lib" "lib64" p}:${makeLibraryPath p}";
-  widevine = stdenv.mkDerivation {
-    name = "chromium-binary-plugin-widevine";
-
-    src = upstream-info.binary;
-
-    nativeBuildInputs = [ patchelfUnstable ];
-
-    phases = [ "unpackPhase" "patchPhase" "installPhase" "checkPhase" ];
-
-    unpackCmd = let
-      chan = if upstream-info.channel == "dev"    then "chrome-unstable"
-        else if upstream-info.channel == "stable" then "chrome"
-        else "chrome-${upstream-info.channel}";
-    in ''
-      mkdir -p plugins
-      ar p "$src" data.tar.xz | tar xJ -C plugins --strip-components=4 \
-        ./opt/google/${chan}/libwidevinecdm.so
-    '';
-
-    doCheck = true;
-    checkPhase = ''
-      ! find -iname '*.so' -exec ldd {} + | grep 'not found'
-    '';
-
-    PATCH_RPATH = mkrpath [ gcc.cc glib nspr nss ];
-
-    patchPhase = ''
-      patchelf --set-rpath "$PATCH_RPATH" libwidevinecdm.so
-    '';
-
-    installPhase = ''
-      install -vD libwidevinecdm.so \
-        "$out/lib/libwidevinecdm.so"
-    '';
-
-    meta.platforms = platforms.x86_64;
-  };
-in mkChromiumDerivation (base: rec {
+mkChromiumDerivation (base: rec {
   name = "chromium-browser";
   packageName = "chromium";
   buildTargets = [ "mksnapshot" "chrome_sandbox" "chrome" ];
@@ -91,8 +52,6 @@ in mkChromiumDerivation (base: rec {
       -e '/\[Desktop Entry\]/a\' \
       -e 'StartupWMClass=chromium-browser' \
       $out/share/applications/chromium-browser.desktop
-
-    ${optionalString enableWideVine "ln -s ${widevine}/lib/libwidevinecdm.so \"$libExecPath/libwidevinecdm.so\""}
   '';
 
   passthru = { inherit sandboxExecutableName; };
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 45c12598512..552d3fa65f4 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -24,7 +24,6 @@
 
 # package customization
 , enableNaCl ? false
-, enableWideVine ? false
 , useVaapi ? false
 , gnomeSupport ? false, gnome ? null
 , gnomeKeyringSupport ? false, libgnome-keyring3 ? null
@@ -133,11 +132,12 @@ let
       ++ optional pulseSupport libpulseaudio
       ++ optional (versionAtLeast version "72") jdk.jre;
 
-    patches = optional enableWideVine ./patches/widevine.patch ++ [
+    patches = [
       ./patches/nix_plugin_paths_68.patch
       ./patches/remove-webp-include-69.patch
       ./patches/jumbo-sorted.patch
       ./patches/no-build-timestamps.patch
+      ./patches/widevine.patch
 
       # Unfortunately, chromium regularly breaks on major updates and
       # then needs various patches backported in order to be compiled with GCC.
@@ -245,7 +245,7 @@ let
       use_gnome_keyring = gnomeKeyringSupport;
       use_gio = gnomeSupport;
       enable_nacl = enableNaCl;
-      enable_widevine = enableWideVine;
+      enable_widevine = true;
       use_cups = cupsSupport;
 
       treat_warnings_as_errors = false;
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index b88772bbd31..0296021f74c 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -2,6 +2,8 @@
 , makeWrapper, ed
 , glib, gtk3, gnome3, gsettings-desktop-schemas
 , libva ? null
+, gcc, nspr, nss, patchelfUnstable, runCommand
+, lib
 
 # package customization
 , channel ? "stable"
@@ -34,23 +36,71 @@ in let
     mkChromiumDerivation = callPackage ./common.nix {
       inherit enableNaCl gnomeSupport gnome
               gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport
-              useVaapi
-              enableWideVine;
+              useVaapi;
     };
 
-    browser = callPackage ./browser.nix { inherit channel enableWideVine; };
+    browser = callPackage ./browser.nix { inherit channel; };
 
     plugins = callPackage ./plugins.nix {
       inherit enablePepperFlash;
     };
   };
 
+  mkrpath = p: "${lib.makeSearchPathOutput "lib" "lib64" p}:${lib.makeLibraryPath p}";
+  widevine = let upstream-info = chromium.upstream-info; in stdenv.mkDerivation {
+    name = "chromium-binary-plugin-widevine";
+
+    src = upstream-info.binary;
+
+    nativeBuildInputs = [ patchelfUnstable ];
+
+    phases = [ "unpackPhase" "patchPhase" "installPhase" "checkPhase" ];
+
+    unpackCmd = let
+      chan = if upstream-info.channel == "dev"    then "chrome-unstable"
+        else if upstream-info.channel == "stable" then "chrome"
+        else "chrome-${upstream-info.channel}";
+    in ''
+      mkdir -p plugins
+      ar p "$src" data.tar.xz | tar xJ -C plugins --strip-components=4 \
+        ./opt/google/${chan}/libwidevinecdm.so
+    '';
+
+    doCheck = true;
+    checkPhase = ''
+      ! find -iname '*.so' -exec ldd {} + | grep 'not found'
+    '';
+
+    PATCH_RPATH = mkrpath [ gcc.cc glib nspr nss ];
+
+    patchPhase = ''
+      patchelf --set-rpath "$PATCH_RPATH" libwidevinecdm.so
+    '';
+
+    installPhase = ''
+      install -vD libwidevinecdm.so \
+        "$out/lib/libwidevinecdm.so"
+    '';
+
+    meta.platforms = lib.platforms.x86_64;
+  };
+
   suffix = if channel != "stable" then "-" + channel else "";
 
   sandboxExecutableName = chromium.browser.passthru.sandboxExecutableName;
 
   version = chromium.browser.version;
 
+  chromiumWV = let browser = chromium.browser; in if enableWideVine then
+    runCommand (browser.name + "-wv") { version = browser.version; }
+      ''
+        mkdir -p $out
+        cp -R ${browser}/* $out/
+        chmod u+w $out/libexec/chromium*
+        cp ${widevine}/lib/libwidevinecdm.so $out/libexec/chromium/
+        # patchelf?
+      ''
+    else browser;
 in stdenv.mkDerivation {
   name = "chromium${suffix}-${version}";
   inherit version;
@@ -68,7 +118,7 @@ in stdenv.mkDerivation {
   outputs = ["out" "sandbox"];
 
   buildCommand = let
-    browserBinary = "${chromium.browser}/libexec/chromium/chromium";
+    browserBinary = "${chromiumWV}/libexec/chromium/chromium";
     getWrapperFlags = plugin: "$(< \"${plugin}/nix-support/wrapper-flags\")";
     libPath = stdenv.lib.makeLibraryPath ([]
       ++ stdenv.lib.optional useVaapi libva
-- 
GitLab


From c28eb26100e212e65440ca133373eba9fc330adf Mon Sep 17 00:00:00 2001
From: Julien Langlois <yourstruly@julienlanglois.me>
Date: Thu, 5 Sep 2019 17:27:04 -0400
Subject: [PATCH 0055/2254] Set package to unfree when widevine is enabled.

---
 pkgs/applications/networking/browsers/chromium/browser.nix | 4 ++--
 pkgs/applications/networking/browsers/chromium/default.nix | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix
index 29fdb117733..ad7fa78527c 100644
--- a/pkgs/applications/networking/browsers/chromium/browser.nix
+++ b/pkgs/applications/networking/browsers/chromium/browser.nix
@@ -1,4 +1,4 @@
-{ stdenv, mkChromiumDerivation, channel }:
+{ stdenv, mkChromiumDerivation, channel, enableWideVine }:
 
 with stdenv.lib;
 
@@ -62,7 +62,7 @@ mkChromiumDerivation (base: rec {
     description = "An open source web browser from Google";
     homepage = http://www.chromium.org/;
     maintainers = with maintainers; [ bendlas ivan ];
-    license = licenses.bsd3;
+    license = if enableWideVine then licenses.unfree else licenses.bsd3;
     platforms = platforms.linux;
     hydraPlatforms = if channel == "stable" then ["aarch64-linux" "x86_64-linux"] else [];
     timeout = 172800; # 48 hours
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 0296021f74c..6270d4c8dc1 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -39,7 +39,7 @@ in let
               useVaapi;
     };
 
-    browser = callPackage ./browser.nix { inherit channel; };
+    browser = callPackage ./browser.nix { inherit channel enableWideVine; };
 
     plugins = callPackage ./plugins.nix {
       inherit enablePepperFlash;
-- 
GitLab


From ea7c012e4bdd8e7a105960c92a0380fb812e84c0 Mon Sep 17 00:00:00 2001
From: Julien Langlois <yourstruly@julienlanglois.me>
Date: Thu, 5 Sep 2019 17:43:58 -0400
Subject: [PATCH 0056/2254] Explicitly check for channels in widevine plugin
 unpack command.

---
 pkgs/applications/networking/browsers/chromium/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 6270d4c8dc1..a5baa69bcfa 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -59,7 +59,8 @@ in let
     unpackCmd = let
       chan = if upstream-info.channel == "dev"    then "chrome-unstable"
         else if upstream-info.channel == "stable" then "chrome"
-        else "chrome-${upstream-info.channel}";
+        else if upstream-info.channel == "beta" then "chrome-beta"
+        else throw "Unknown chromium channel.";
     in ''
       mkdir -p plugins
       ar p "$src" data.tar.xz | tar xJ -C plugins --strip-components=4 \
-- 
GitLab


From 8376cd42a4d5ad1a0c569da174564e9554678773 Mon Sep 17 00:00:00 2001
From: Utku Demir <me@utdemir.com>
Date: Fri, 6 Sep 2019 12:16:16 +1200
Subject: [PATCH 0057/2254] shunit2: init at 2019-08-10

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

diff --git a/pkgs/tools/misc/shunit2/default.nix b/pkgs/tools/misc/shunit2/default.nix
new file mode 100644
index 00000000000..acfbd48c606
--- /dev/null
+++ b/pkgs/tools/misc/shunit2/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation {
+  pname = "shunit2";
+  version = "2019-08-10";
+
+  src = fetchFromGitHub {
+    owner = "kward";
+    repo = "shunit2";
+    rev = "ba130d69bbff304c0c6a9c5e8ab549ae140d6225";
+    sha256 = "1bsn8dhxbjfmh01lq80yhnld3w3fw1flh7nwx12csrp58zsvlmgk";
+  };
+
+  installPhase = ''
+    mkdir -p $out/bin/
+    cp ./shunit2 $out/bin/shunit2
+    chmod +x $out/bin/shunit2
+  '';
+
+  doInstallCheck = true;
+  installCheckPhase = ''
+    $out/bin/shunit2
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/kward/shunit2;
+    description = "A xUnit based unit test framework for Bourne based shell scripts.";
+    maintainers = with maintainers; [ cdepillabout utdemir ];
+    license = licenses.asl20;
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d290cb592e1..bbb7bc95cdb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6088,6 +6088,8 @@ in
 
   shrikhand = callPackage ../data/fonts/shrikhand { };
 
+  shunit2 = callPackage ../tools/misc/shunit2 { };
+
   sic = callPackage ../applications/networking/irc/sic { };
 
   siege = callPackage ../tools/networking/siege {};
-- 
GitLab


From 97390d648dbfedb28269e6db1255a2b03ad19440 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Fri, 30 Aug 2019 17:37:58 +0200
Subject: [PATCH 0058/2254] softmaker-office: init at 970

---
 .../office/softmaker/desktop_items.nix        | 42 ++++++++
 .../applications/office/softmaker/generic.nix | 95 +++++++++++++++++++
 .../office/softmaker/softmaker_office.nix     | 15 +++
 pkgs/top-level/all-packages.nix               |  2 +
 4 files changed, 154 insertions(+)
 create mode 100644 pkgs/applications/office/softmaker/desktop_items.nix
 create mode 100644 pkgs/applications/office/softmaker/generic.nix
 create mode 100644 pkgs/applications/office/softmaker/softmaker_office.nix

diff --git a/pkgs/applications/office/softmaker/desktop_items.nix b/pkgs/applications/office/softmaker/desktop_items.nix
new file mode 100644
index 00000000000..6975da06456
--- /dev/null
+++ b/pkgs/applications/office/softmaker/desktop_items.nix
@@ -0,0 +1,42 @@
+{ makeDesktopItem, pname, suiteName }:
+
+{
+  planmaker = makeDesktopItem {
+    name = "${pname}-planmaker";
+    desktopName = "${suiteName} PlanMaker";
+    icon = "${pname}-pml.png";
+    categories = "Application;Office;SpreadSheet;";
+    exec = "${pname}-planmaker %F";
+    mimeType = "application/x-pmd;application/x-pmdx;application/x-pmv;application/excel;application/x-excel;application/x-ms-excel;application/x-msexcel;application/x-sylk;application/x-xls;application/xls;application/vnd.ms-excel;application/vnd.stardivision.calc;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroEnabled.12;application/x-dif;text/spreadsheet;text/csv;application/x-prn;application/vnd.ms-excel.sheet.binary.macroenabled.12;";
+    extraEntries = ''
+      TryExec=${pname}-planmaker
+      StartupWMClass=pm
+    '';
+  };
+
+  presentations = makeDesktopItem {
+    name = "${pname}-presentations";
+    desktopName = "${suiteName} Presentations";
+    icon = "${pname}-prl.png";
+    categories = "Application;Office;Presentation;";
+    exec = "${pname}-presentations %F";
+    mimeType = "application/x-prdx;application/x-prvx;application/x-prsx;application/x-prd;application/x-prv;application/x-prs;application/ppt;application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroEnabled.12;application/vnd.ms-powerpoint.slideshow.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.slideshow;";
+    extraEntries = ''
+      TryExec=${pname}-presentations
+      StartupWMClass=pr
+    '';
+  };
+
+  textmaker = makeDesktopItem {
+    name = "${pname}-textmaker";
+    desktopName = "${suiteName} TextMaker";
+    icon = "${pname}-tml.png";
+    categories = "Application;Office;WordProcessor;";
+    exec = "${pname}-textmaker %F";
+    mimeType = "application/x-tmdx;application/x-tmvx;application/x-tmd;application/x-tmv;application/msword;application/vnd.ms-word;application/x-doc;text/rtf;application/rtf;application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.stardivision.writer;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12;application/x-pocket-word;application/x-dbf;application/msword-template;";
+    extraEntries = ''
+      TryExec=${pname}-textmaker
+      StartupWMClass=tm
+    '';
+  };
+}
diff --git a/pkgs/applications/office/softmaker/generic.nix b/pkgs/applications/office/softmaker/generic.nix
new file mode 100644
index 00000000000..9505271db14
--- /dev/null
+++ b/pkgs/applications/office/softmaker/generic.nix
@@ -0,0 +1,95 @@
+{ stdenv, fetchurl, autoPatchelfHook, makeDesktopItem, makeWrapper
+
+  # Dynamic Libraries
+, curl, libGL, libX11, libXext, libXmu, libXrandr, libXrender
+
+, pname, version, edition, suiteName, src, archive
+
+, ...
+}:
+
+let
+  desktopItems = import ./desktop_items.nix {
+    inherit makeDesktopItem pname suiteName;
+  };
+  shortEdition = builtins.substring 2 2 edition;
+in stdenv.mkDerivation rec {
+  inherit pname version edition shortEdition src;
+  nativeBuildInputs = [
+    autoPatchelfHook
+    makeWrapper
+  ];
+
+  buildInputs = [
+    curl
+    libGL
+    libX11
+    libXext
+    libXmu
+    libXrandr
+    libXrender
+    stdenv.cc.cc.lib
+  ];
+
+  dontBuild = true;
+  dontConfigure = true;
+
+  unpackPhase = ''
+    runHook preUnpack
+
+    mkdir installer
+    tar -C installer -xf ${src}
+    mkdir ${pname}
+    tar -C ${pname} -xf installer/${archive}
+
+    runHook postUnpack
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/share
+    cp -r ${pname} $out/share/${pname}${edition}
+
+    # Wrap rather than symlinking, so that the programs can determine
+    # their resource path.
+    mkdir -p $out/bin
+    makeWrapper $out/share/${pname}${edition}/planmaker $out/bin/${pname}-planmaker
+    makeWrapper $out/share/${pname}${edition}/presentations $out/bin/${pname}-presentations
+    makeWrapper $out/share/${pname}${edition}/textmaker $out/bin/${pname}-textmaker
+
+    for size in 16 32 48 64 96 128 256 512 1024; do
+      mkdir -p $out/share/icons/hicolor/''${size}x''${size}/apps
+
+      for app in pml prl tml; do
+        ln -s $out/share/${pname}${edition}/icons/''${app}_''${size}.png \
+          $out/share/icons/hicolor/''${size}x''${size}/apps/${pname}-''${app}.png
+      done
+
+      mkdir -p $out/share/icons/hicolor/''${size}x''${size}/mimetypes
+
+      for mimetype in pmd prd tmd; do
+        ln -s $out/share/${pname}${edition}/icons/''${mimetype}_''${size}.png \
+          $out/share/icons/hicolor/''${size}x''${size}/mimetypes/application-x-''${mimetype}.png
+      done
+    done
+
+    # Add desktop items
+    ${desktopItems.planmaker.buildCommand}
+    ${desktopItems.presentations.buildCommand}
+    ${desktopItems.textmaker.buildCommand}
+
+    # Add mime types
+    install -D -t $out/share/mime/packages ${pname}/mime/softmaker-*office*${shortEdition}.xml
+
+    runHook postInstall
+  '';
+
+  meta = with stdenv.lib; {
+    description = "An office suite with a word processor, spreadsheet and presentation program";
+    homepage = "https://www.softmaker.com/";
+    license = licenses.unfree;
+    maintainers = with maintainers; [ danieldk ];
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/applications/office/softmaker/softmaker_office.nix b/pkgs/applications/office/softmaker/softmaker_office.nix
new file mode 100644
index 00000000000..26fe420d6a3
--- /dev/null
+++ b/pkgs/applications/office/softmaker/softmaker_office.nix
@@ -0,0 +1,15 @@
+{ callPackage, fetchurl, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  pname = "softmaker-office";
+  version = "970";
+  edition = "2018";
+  suiteName = "SoftMaker Office";
+
+  src = fetchurl {
+    url = "https://www.softmaker.net/down/softmaker-office-${edition}-${version}-amd64.tgz";
+    sha256 = "14f94p1jms41s2iz5sa770rcyfp4mv01r6jjjis9amx37zrc8yid";
+  };
+
+  archive = "office${edition}.tar.lzma";
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5d6b8037de7..c8fa38358f0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19686,6 +19686,8 @@ in
 
   smtube = libsForQt5.callPackage ../applications/video/smtube {};
 
+  softmaker-office = callPackage ../applications/office/softmaker/softmaker_office.nix {};
+
   stride = callPackage ../applications/networking/instant-messengers/stride { };
 
   sudolikeaboss = callPackage ../tools/security/sudolikeaboss { };
-- 
GitLab


From 11184dee46a4dfe99aeff8015f24b1ba571bd471 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Fri, 30 Aug 2019 17:41:27 +0200
Subject: [PATCH 0059/2254] freeoffice: init at 966

---
 pkgs/applications/office/softmaker/freeoffice.nix | 15 +++++++++++++++
 pkgs/top-level/all-packages.nix                   |  2 ++
 2 files changed, 17 insertions(+)
 create mode 100644 pkgs/applications/office/softmaker/freeoffice.nix

diff --git a/pkgs/applications/office/softmaker/freeoffice.nix b/pkgs/applications/office/softmaker/freeoffice.nix
new file mode 100644
index 00000000000..d0e6c73e353
--- /dev/null
+++ b/pkgs/applications/office/softmaker/freeoffice.nix
@@ -0,0 +1,15 @@
+{ callPackage, fetchurl, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  pname = "freeoffice";
+  version = "966";
+  edition = "2018";
+  suiteName = "FreeOffice";
+
+  src = fetchurl {
+    url = "https://www.softmaker.net/down/softmaker-freeoffice-${version}-amd64.tgz";
+    sha256 = "18s92d2pmhmd56sb9c1zirwxzfgpqd8wh11bl0zi6g6skn68zhx4";
+  };
+
+  archive = "freeoffice${edition}.tar.lzma";
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c8fa38358f0..3e6f7b30928 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18423,6 +18423,8 @@ in
 
   freenet = callPackage ../applications/networking/p2p/freenet { };
 
+  freeoffice = callPackage ../applications/office/softmaker/freeoffice.nix {};
+
   freepv = callPackage ../applications/graphics/freepv { };
 
   xfontsel = callPackage ../applications/misc/xfontsel { };
-- 
GitLab


From accc62a98c8b1728af748057c8ac97b02edef8b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Fri, 6 Sep 2019 16:33:02 +0200
Subject: [PATCH 0060/2254] freeoffice: 966 -> 970

Changes:

- Adds support for saving documents to the DOC, XLS, and PPT formats.
- TextMaker adds support for saving to the OpenDocument format.
- Adds a dark mode.
---
 pkgs/applications/office/softmaker/freeoffice.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/softmaker/freeoffice.nix b/pkgs/applications/office/softmaker/freeoffice.nix
index d0e6c73e353..f3e37943bb6 100644
--- a/pkgs/applications/office/softmaker/freeoffice.nix
+++ b/pkgs/applications/office/softmaker/freeoffice.nix
@@ -2,13 +2,13 @@
 
 callPackage ./generic.nix (args // rec {
   pname = "freeoffice";
-  version = "966";
+  version = "970";
   edition = "2018";
   suiteName = "FreeOffice";
 
   src = fetchurl {
     url = "https://www.softmaker.net/down/softmaker-freeoffice-${version}-amd64.tgz";
-    sha256 = "18s92d2pmhmd56sb9c1zirwxzfgpqd8wh11bl0zi6g6skn68zhx4";
+    sha256 = "1maibr4x8mksb32ixvyy2rjn4x9f51191p5fcdj5qwz32pf8h2dr";
   };
 
   archive = "freeoffice${edition}.tar.lzma";
-- 
GitLab


From 11e62297da422a3ab8ee3971e329a2fb707e06a3 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Fri, 6 Sep 2019 11:39:38 -0700
Subject: [PATCH 0061/2254] radeontool: 1.5 -> 1.6.3

---
 .../os-specific/linux/radeontools/default.nix | 42 ++++++++-----------
 1 file changed, 17 insertions(+), 25 deletions(-)

diff --git a/pkgs/os-specific/linux/radeontools/default.nix b/pkgs/os-specific/linux/radeontools/default.nix
index 81e5a2af9cd..d2c3c11c939 100644
--- a/pkgs/os-specific/linux/radeontools/default.nix
+++ b/pkgs/os-specific/linux/radeontools/default.nix
@@ -1,33 +1,25 @@
-{ stdenv, fetchurl, pciutils }:
+{ stdenv, fetchurl
+, autoreconfHook
+, pciutils
+, pkgconfig
+, xorg
+}:
 
-stdenv.mkDerivation {
-  name = "radeontool-1.5";
-
-  inherit pciutils;
-
-  # Don't know wether it's a good idea to hardcode the lspci path..
-  # But it will work on nix..
-  postUnpack = ''
-    cd $sourceRoot
-    sed -i "s%lspci%$pciutils/sbin/lspci%g" radeontool.c
-    cd ..
-  '';
+stdenv.mkDerivation rec {
+  pname = "radeontool";
+  version = "1.6.3";
 
   src = fetchurl {
-    url = http://fdd.com/software/radeon/radeontool-1.5.tar.gz;
-    sha256 = "0qbkawhhq0y0gqbbql7q04y0v0hims5c4jkjsbc1y03rf9kr10ar";
+    url = "https://people.freedesktop.org/~airlied/radeontool/${pname}-${version}.tar.gz";
+    sha256 = "0mjk9wr9rsb17yy92j6yi16hfpa6v5r1dbyiy60zp4r125wr63za";
   };
 
-  installPhase = ''
-    mkdir -p $out/bin
-    chmod +x lightwatch.pl
-    cp radeontool lightwatch.pl $out/bin
-  '';
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  buildInputs = [ xorg.libpciaccess ];
 
-  meta = {
-    description = "Control the backlight and external video output of ATI Radeon Mobility graphics cards";
-    homepage = http://fdd.com/software/radeon/;
-    license = stdenv.lib.licenses.zlib;
-    broken = true;
+  meta = with stdenv.lib; {
+    description = "Lowlevel tools to tweak register and dump state on radeon GPUs";
+    homepage = "https://airlied.livejournal.com/";
+    license = licenses.zlib;
   };
 }
-- 
GitLab


From 7d9578819bcdb18216ce2ed66a4176592bbbb0bd Mon Sep 17 00:00:00 2001
From: Julien Langlois <yourstruly@julienlanglois.me>
Date: Fri, 6 Sep 2019 15:19:49 -0400
Subject: [PATCH 0062/2254] Comment about handling widevine in default.nix.

---
 pkgs/applications/networking/browsers/chromium/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index a5baa69bcfa..f099ddbff73 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -92,6 +92,10 @@ in let
 
   version = chromium.browser.version;
 
+  # This is here because we want to add the widevine shared object at the last
+  # minute in order to avoid a full rebuild of chromium. Additionally, this
+  # isn't in `browser.nix` so we can avoid having to re-expose attributes of
+  # the chromium derivation (see above: we introspect `sandboxExecutableName`).
   chromiumWV = let browser = chromium.browser; in if enableWideVine then
     runCommand (browser.name + "-wv") { version = browser.version; }
       ''
-- 
GitLab


From efccc442d97d9e6df8c1bb2b28ddcb39f45c808f Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 6 Sep 2019 21:13:28 +0000
Subject: [PATCH 0063/2254] network-interfaces.nix: escape '.' in interface
 names passed to sysctl

---
 nixos/modules/tasks/network-interfaces.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 5bf7b0d227f..43a1c0fe902 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -967,9 +967,9 @@ in
       "net.ipv6.conf.default.disable_ipv6" = mkDefault (!cfg.enableIPv6);
       "net.ipv6.conf.all.forwarding" = mkDefault (any (i: i.proxyARP) interfaces);
     } // listToAttrs (flip concatMap (filter (i: i.proxyARP) interfaces)
-        (i: forEach [ "4" "6" ] (v: nameValuePair "net.ipv${v}.conf.${i.name}.proxy_arp" true)))
+        (i: forEach [ "4" "6" ] (v: nameValuePair "net.ipv${v}.conf.${replaceChars ["."] ["/"] i.name}.proxy_arp" true)))
       // listToAttrs (forEach (filter (i: i.preferTempAddress) interfaces)
-        (i: nameValuePair "net.ipv6.conf.${i.name}.use_tempaddr" 2));
+        (i: nameValuePair "net.ipv6.conf.${replaceChars ["."] ["/"] i.name}.use_tempaddr" 2));
 
     # Capabilities won't work unless we have at-least a 4.3 Linux
     # kernel because we need the ambient capability
@@ -1092,7 +1092,7 @@ in
         destination = "/etc/udev/rules.d/98-${name}";
         text = ''
           # enable and prefer IPv6 privacy addresses by default
-          ACTION=="add", SUBSYSTEM=="net", RUN+="${pkgs.procps}/bin/sysctl net.ipv6.conf.%k.use_tempaddr=2"
+          ACTION=="add", SUBSYSTEM=="net", RUN+="echo 2 > /proc/sys/net/ipv6/conf/%k/use_tempaddr"
         '';
       })
       (pkgs.writeTextFile rec {
@@ -1100,7 +1100,7 @@ in
         destination = "/etc/udev/rules.d/99-${name}";
         text = concatMapStrings (i: ''
           # enable IPv6 privacy addresses but prefer EUI-64 addresses for ${i.name}
-          ACTION=="add", SUBSYSTEM=="net", RUN+="${pkgs.procps}/bin/sysctl net.ipv6.conf.${i.name}.use_tempaddr=1"
+          ACTION=="add", SUBSYSTEM=="net", RUN+="${pkgs.procps}/bin/sysctl net.ipv6.conf.${replaceChars ["."] ["/"] i.name}.use_tempaddr=1"
         '') (filter (i: !i.preferTempAddress) interfaces);
       })
     ] ++ lib.optional (cfg.wlanInterfaces != {})
-- 
GitLab


From 8b93e5c8a4b57431b76f2f634cda11ceffc0f107 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 6 Sep 2019 21:27:10 +0000
Subject: [PATCH 0064/2254] 'udev' needs absolute path to 'echo'

---
 nixos/modules/tasks/network-interfaces.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 43a1c0fe902..7351f8b6b7e 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -1092,7 +1092,7 @@ in
         destination = "/etc/udev/rules.d/98-${name}";
         text = ''
           # enable and prefer IPv6 privacy addresses by default
-          ACTION=="add", SUBSYSTEM=="net", RUN+="echo 2 > /proc/sys/net/ipv6/conf/%k/use_tempaddr"
+          ACTION=="add", SUBSYSTEM=="net", RUN+="${pkgs.coreutils}/bin/echo 2 > /proc/sys/net/ipv6/conf/%k/use_tempaddr"
         '';
       })
       (pkgs.writeTextFile rec {
-- 
GitLab


From a803e915af0b4ac22868853539b7ab1a806ea42a Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Fri, 6 Sep 2019 17:42:06 -0400
Subject: [PATCH 0065/2254] jetbrains.idea-community: 2019.2.1 -> 2019.2.2

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 47d431c4edf..24500745636 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -289,12 +289,12 @@ in
 
   idea-community = buildIdea rec {
     name = "idea-community-${version}";
-    version = "2019.2.1"; /* updated by script */
+    version = "2019.2.2"; /* updated by script */
     description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
-      sha256 = "1pbqnyqly09m7lw6356dydbvppq4i94rsk7c3y40mrc285qzj413"; /* updated by script */
+      sha256 = "1bqzfg2yk12wq523nw4s8zxjzcbl9hrdlk2jd9vywjbaa4ll4bgs"; /* updated by script */
     };
     wmClass = "jetbrains-idea-ce";
     update-channel = "IntelliJ IDEA RELEASE";
-- 
GitLab


From eaf2a81554d3fca21424079bcdafceb6681c2ccf Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Fri, 6 Sep 2019 17:42:27 -0400
Subject: [PATCH 0066/2254] jetbrains.idea-ultimate: 2019.2.1 -> 2019.2.2

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 24500745636..ffd3c2603a0 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -302,12 +302,12 @@ in
 
   idea-ultimate = buildIdea rec {
     name = "idea-ultimate-${version}";
-    version = "2019.2.1"; /* updated by script */
+    version = "2019.2.2"; /* updated by script */
     description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz";
-      sha256 = "0mslmhakjjgwj76hbfw9dcidic6zprjfjryggic7dqywl7vjwc95"; /* updated by script */
+      sha256 = "139im0w34wy9d1lplq1k2k6gmlav4n6nxdchxm3zqhx2isq4qx2f"; /* updated by script */
     };
     wmClass = "jetbrains-idea";
     update-channel = "IntelliJ IDEA RELEASE";
-- 
GitLab


From 092f8227bda96a0871f3c7b7bf0838d9d652640d Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Fri, 6 Sep 2019 17:42:43 -0400
Subject: [PATCH 0067/2254] jetbrains.rider: 2019.2.1 -> 2019.2.2

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index ffd3c2603a0..95cf627c2f6 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -354,12 +354,12 @@ in
 
   rider = buildRider rec {
     name = "rider-${version}";
-    version = "2019.2.1"; /* updated by script */
+    version = "2019.2.2"; /* updated by script */
     description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz";
-      sha256 = "1p0mlch7qvkvgxjscx6rl65v6h8g6fwk8rcb8s27qkcjm0d78ic8"; /* updated by script */
+      sha256 = "1wv5vhiv3w1dwyklx1pr5javp4psqyiv4naq37cvxxp9zh7hk8rc"; /* updated by script */
     };
     wmClass = "jetbrains-rider";
     update-channel = "Rider RELEASE";
-- 
GitLab


From da8019bfce214af78ac17a0251ada10de838d73a Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Thu, 22 Aug 2019 23:10:03 +0100
Subject: [PATCH 0068/2254] iso-image: Enable nouveau by default

This is a much more sensible default for modern hardware.
---
 nixos/modules/installer/cd-dvd/iso-image.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix
index d5c92cfc1d9..93c8ebaa249 100644
--- a/nixos/modules/installer/cd-dvd/iso-image.nix
+++ b/nixos/modules/installer/cd-dvd/iso-image.nix
@@ -165,8 +165,8 @@ let
     else
       "# No refind for ${targetArch}"
   ;
-  
-  grubPkgs = if config.boot.loader.grub.forcei686 then pkgs.pkgsi686Linux else pkgs; 
+
+  grubPkgs = if config.boot.loader.grub.forcei686 then pkgs.pkgsi686Linux else pkgs;
 
   grubMenuCfg = ''
     #
@@ -562,8 +562,6 @@ in
 
     boot.initrd.availableKernelModules = [ "squashfs" "iso9660" "uas" ];
 
-    boot.blacklistedKernelModules = [ "nouveau" ];
-
     boot.initrd.kernelModules = [ "loop" ];
 
     # Closures to be copied to the Nix store on the CD, namely the init
-- 
GitLab


From 04bd834d691a64a3fb4bb07ec0d4d28d00f48edb Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Fri, 6 Sep 2019 19:27:36 -0400
Subject: [PATCH 0069/2254] iso-image-kde: link new nixos-manual desktop item
 to desktop

---
 .../installer/cd-dvd/installation-cd-graphical-kde.nix | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix
index 559899b0a3b..1dc7920ff64 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix
@@ -22,14 +22,8 @@ with lib;
 
   system.activationScripts.installerDesktop = let
 
-    manualDesktopFile = pkgs.writeScript "nixos-manual.desktop" ''
-      [Desktop Entry]
-      Version=1.0
-      Type=Application
-      Name=NixOS Manual
-      Exec=firefox ${config.system.build.manual.manual}/share/doc/nixos/index.html
-      Icon=text-html
-    '';
+    # Comes from documentation.nix when xserver and nixos.enable are true.
+    manualDesktopFile = "/run/current-system/sw/share/applications/nixos-manual.desktop";
 
     homeDir = "/home/nixos/";
     desktopDir = homeDir + "Desktop/";
-- 
GitLab


From 44fe29b1bb41140eae04d6279991a10315e5adcc Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Sat, 7 Sep 2019 01:51:29 -0700
Subject: [PATCH 0070/2254] gcsfuse: 0.23.0 -> 0.28.1

---
 pkgs/tools/filesystems/gcsfuse/default.nix | 32 ++++++++++------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/pkgs/tools/filesystems/gcsfuse/default.nix b/pkgs/tools/filesystems/gcsfuse/default.nix
index fe46fccf271..8ce87375b26 100644
--- a/pkgs/tools/filesystems/gcsfuse/default.nix
+++ b/pkgs/tools/filesystems/gcsfuse/default.nix
@@ -1,25 +1,23 @@
-# This file was generated by go2nix.
-{ lib, buildGoPackage, fetchgit }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
-buildGoPackage rec {
+buildGoModule rec {
   pname = "gcsfuse";
-  version = "0.23.0";
-  rev = "v${version}";
+  version = "0.28.1";
 
-  goPackagePath = "github.com/googlecloudplatform/gcsfuse";
-
-  src = fetchgit {
-    inherit rev;
-    url = "https://github.com/googlecloudplatform/gcsfuse";
-    sha256 = "1qxbpsmz22l5w4b7wbgfdq4v85cfc9ka9i8h4c56nals1x5lcsnx";
+  src = fetchFromGitHub {
+    owner = "googlecloudplatform";
+    repo = "gcsfuse";
+    rev = "v${version}";
+    sha256 = "0dh01qvsjlzji2mwznykc2nghg4f1raylvgnp6sbxv9x1kpnwx71";
   };
 
-  meta = {
-    license = lib.licenses.asl20;
-    platforms = lib.platforms.unix;
+  modSha256 = "0i86xs3lq2mj22yv7jmhmb34k7lz348bakqz020xpyccllkkszy4";
+
+  meta = with lib;{
+    description = "A user-space file system for interacting with Google Cloud Storage";
+    homepage = "https://cloud.google.com/storage/docs/gcs-fuse";
+    license = licenses.asl20;
+    platforms = platforms.unix;
     maintainers = [];
-    homepage = https://cloud.google.com/storage/docs/gcs-fuse;
-    description =
-      "A user-space file system for interacting with Google Cloud Storage";
   };
 }
-- 
GitLab


From 442cf4f7834077c38320fa7c8aee6ff6d576bfde Mon Sep 17 00:00:00 2001
From: Ruud van Asseldonk <dev@veniogames.com>
Date: Sat, 7 Sep 2019 16:12:07 +0200
Subject: [PATCH 0071/2254] squashfsTools: 4.4dev_20180612 -> 4.4

A new release has been made upstream. Reproducibility issues were fixed
in that release, so we no longer need those patches. For a full overview
of the changes, see the 4.4-specific readme at [1].

The alignment patch no longer applies cleanly; I disabled it for now,
and I will try to restore it in a follow-up commit.

[1]: https://github.com/plougher/squashfs-tools/blob/52eb4c279cd283ed9802dd1ceb686560b22ffb67/README-4.4
---
 ...POCH-is-set-override-timestamps-with.patch |  90 -------
 ...POCH-is-set-also-clamp-content-times.patch |  83 -------
 .../0003-remove-frag-deflator-thread.patch    | 220 ------------------
 pkgs/tools/filesystems/squashfs/default.nix   |  17 +-
 4 files changed, 6 insertions(+), 404 deletions(-)
 delete mode 100644 pkgs/tools/filesystems/squashfs/0001-If-SOURCE_DATE_EPOCH-is-set-override-timestamps-with.patch
 delete mode 100644 pkgs/tools/filesystems/squashfs/0002-If-SOURCE_DATE_EPOCH-is-set-also-clamp-content-times.patch
 delete mode 100644 pkgs/tools/filesystems/squashfs/0003-remove-frag-deflator-thread.patch

diff --git a/pkgs/tools/filesystems/squashfs/0001-If-SOURCE_DATE_EPOCH-is-set-override-timestamps-with.patch b/pkgs/tools/filesystems/squashfs/0001-If-SOURCE_DATE_EPOCH-is-set-override-timestamps-with.patch
deleted file mode 100644
index 5626800e723..00000000000
--- a/pkgs/tools/filesystems/squashfs/0001-If-SOURCE_DATE_EPOCH-is-set-override-timestamps-with.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From 0ab12a8585373be2de5129e14d979c62e7a90d82 Mon Sep 17 00:00:00 2001
-From: Chris Lamb <lamby@debian.org>
-Date: Mon, 21 Nov 2016 09:33:05 +0100
-Subject: [PATCH] If SOURCE_DATE_EPOCH is set, override timestamps with that
- value.
-
-See https://reproducible-builds.org/specs/source-date-epoch/ for more
-information about this environment variable.
-
-Based on a patch by Alexander Couzens <lynxis@fe...> posted on
-https://sourceforge.net/p/squashfs/mailman/message/34673610/
-
-Signed-off-by: Chris Lamb <lamby@debian.org>
----
- squashfs-tools/mksquashfs.c | 38 ++++++++++++++++++++++++++++++++++++-
- 1 file changed, 37 insertions(+), 1 deletion(-)
-
-diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c
-index c2098bd..b49e956 100644
---- a/squashfs-tools/mksquashfs.c
-+++ b/squashfs-tools/mksquashfs.c
-@@ -137,6 +137,9 @@ unsigned int cache_bytes = 0, cache_size = 0, inode_count = 0;
- /* inode lookup table */
- squashfs_inode *inode_lookup_table = NULL;
- 
-+/* override filesystem creation time */
-+time_t mkfs_fixed_time = -1;
-+
- /* in memory directory data */
- #define I_COUNT_SIZE		128
- #define DIR_ENTRIES		32
-@@ -5104,6 +5107,9 @@ int main(int argc, char *argv[])
- 	int total_mem = get_default_phys_mem();
- 	int progress = TRUE;
- 	int force_progress = FALSE;
-+	char *source_date_epoch, *endptr;
-+	unsigned long long epoch;
-+
- 	struct file_buffer **fragment = NULL;
- 
- 	if(argc > 1 && strcmp(argv[1], "-version") == 0) {
-@@ -5641,6 +5647,36 @@ printOptions:
- 		}
- 	}
- 
-+	/* if SOURCE_DATE_EPOCH is set, use that timestamp for the mkfs time */
-+	source_date_epoch = getenv("SOURCE_DATE_EPOCH");
-+	if(source_date_epoch) {
-+		errno = 0;
-+		epoch = strtoull(source_date_epoch, &endptr, 10);
-+		if((errno == ERANGE && (epoch == ULLONG_MAX || epoch == 0))
-+				|| (errno != 0 && epoch == 0)) {
-+			ERROR("Environment variable $SOURCE_DATE_EPOCH: "
-+				"strtoull: %s\n", strerror(errno));
-+			EXIT_MKSQUASHFS();
-+		}
-+		if(endptr == source_date_epoch) {
-+			ERROR("Environment variable $SOURCE_DATE_EPOCH: "
-+				"No digits were found: %s\n", endptr);
-+			EXIT_MKSQUASHFS();
-+		}
-+		if(*endptr != '\0') {
-+			ERROR("Environment variable $SOURCE_DATE_EPOCH: "
-+				"Trailing garbage: %s\n", endptr);
-+			EXIT_MKSQUASHFS();
-+		}
-+		if(epoch > ULONG_MAX) {
-+			ERROR("Environment variable $SOURCE_DATE_EPOCH: "
-+				"value must be smaller than or equal to "
-+				"%lu but was found to be: %llu \n", ULONG_MAX, epoch);
-+			EXIT_MKSQUASHFS();
-+		}
-+		mkfs_fixed_time = (time_t)epoch;
-+	}
-+
- 	/*
- 	 * Some compressors may need the options to be checked for validity
- 	 * once all the options have been processed
-@@ -5993,7 +6029,7 @@ printOptions:
-	sBlk.flags = SQUASHFS_MKFLAGS(noI, noD, noF, noX, no_fragments,
-		always_use_fragments, duplicate_checking, exportable,
-		no_xattrs, comp_opts);
--	sBlk.mkfs_time = time(NULL);
-+	sBlk.mkfs_time = mkfs_fixed_time != -1 ? mkfs_fixed_time : time(NULL);
- 
- 	disable_info();
- 
--- 
-2.17.0
-
diff --git a/pkgs/tools/filesystems/squashfs/0002-If-SOURCE_DATE_EPOCH-is-set-also-clamp-content-times.patch b/pkgs/tools/filesystems/squashfs/0002-If-SOURCE_DATE_EPOCH-is-set-also-clamp-content-times.patch
deleted file mode 100644
index 5002375887f..00000000000
--- a/pkgs/tools/filesystems/squashfs/0002-If-SOURCE_DATE_EPOCH-is-set-also-clamp-content-times.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From 32a07d4156a281084c90a4b78affc8b0b32a26fc Mon Sep 17 00:00:00 2001
-From: intrigeri <intrigeri@boum.org>
-Date: Mon, 21 Nov 2016 11:41:28 +0000
-Subject: [PATCH] If SOURCE_DATE_EPOCH is set, also clamp content timestamps
- with that value.
-
-Based on a patch by Alexander Couzens <lynxis@fe...> posted on
-https://sourceforge.net/p/squashfs/mailman/message/34673610/
----
- squashfs-tools/mksquashfs.c | 15 ++++++++++++---
- 1 file changed, 12 insertions(+), 3 deletions(-)
-
-diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c
-index b49e956..9f020bf 100644
---- a/squashfs-tools/mksquashfs.c
-+++ b/squashfs-tools/mksquashfs.c
-@@ -137,6 +137,9 @@ unsigned int cache_bytes = 0, cache_size = 0, inode_count = 0;
- /* inode lookup table */
- squashfs_inode *inode_lookup_table = NULL;
- 
-+/* clamp all timestamps to SOURCE_DATE_EPOCH */
-+time_t content_clamp_time = -1;
-+
- /* override filesystem creation time */
- time_t mkfs_fixed_time = -1;
- 
-@@ -2246,6 +2249,8 @@ restat:
- 			  pathname_reader(dir_ent), strerror(errno));
- 		goto read_err;
- 	}
-+	if(content_clamp_time != -1 && buf2.st_mtime >= content_clamp_time)
-+		buf2.st_mtime = content_clamp_time;
- 
- 	if(read_size != buf2.st_size) {
- 		close(file);
-@@ -3101,7 +3106,7 @@ void dir_scan(squashfs_inode *inode, char *pathname,
- 		buf.st_mode = S_IRWXU | S_IRWXG | S_IRWXO | S_IFDIR;
- 		buf.st_uid = getuid();
- 		buf.st_gid = getgid();
--		buf.st_mtime = time(NULL);
-+		buf.st_mtime = content_clamp_time != -1 ? content_clamp_time : time(NULL);
- 		buf.st_dev = 0;
- 		buf.st_ino = 0;
- 		dir_ent->inode = lookup_inode2(&buf, PSEUDO_FILE_OTHER, 0);
-@@ -3127,6 +3115,8 @@ void dir_scan(squashfs_inode *inode, char *pathname,
-			/* source directory has disappeared? */
-			BAD_ERROR("Cannot stat source directory %s because %s\n",
-				pathname, strerror(errno));
-+		if(content_clamp_time != -1 && buf.st_mtime >= content_clamp_time)
-+			buf.st_mtime = content_clamp_time;
- 		dir_ent->inode = lookup_inode(&buf);
- 	}
- 
-@@ -3365,6 +3372,8 @@ struct dir_info *dir_scan1(char *filename, char *subpath,
- 			free_dir_entry(dir_ent);
- 			continue;
- 		}
-+		if(content_clamp_time != -1 && buf.st_mtime >= content_clamp_time)
-+			buf.st_mtime = content_clamp_time;
- 
- 		if((buf.st_mode & S_IFMT) != S_IFREG &&
- 				(buf.st_mode & S_IFMT) != S_IFDIR &&
-@@ -3544,7 +3553,7 @@ void dir_scan2(struct dir_info *dir, struct pseudo *pseudo)
-		buf.st_gid = pseudo_ent->dev->gid;
-		buf.st_rdev = makedev(pseudo_ent->dev->major,
-			pseudo_ent->dev->minor);
--		buf.st_mtime = time(NULL);
-+		buf.st_mtime = content_clamp_time != -1 ? content_clamp_time : time(NULL);
- 		buf.st_ino = pseudo_ino ++;
- 
- 		if(pseudo_ent->dev->type == 'd') {
-@@ -5674,7 +5683,7 @@ printOptions:
- 				"%lu but was found to be: %llu \n", ULONG_MAX, epoch);
- 			EXIT_MKSQUASHFS();
- 		}
--		mkfs_fixed_time = (time_t)epoch;
-+		mkfs_fixed_time = content_clamp_time = (time_t)epoch;
- 	}
- 
- 	/*
--- 
-2.17.0
-
diff --git a/pkgs/tools/filesystems/squashfs/0003-remove-frag-deflator-thread.patch b/pkgs/tools/filesystems/squashfs/0003-remove-frag-deflator-thread.patch
deleted file mode 100644
index 4be4b96369a..00000000000
--- a/pkgs/tools/filesystems/squashfs/0003-remove-frag-deflator-thread.patch
+++ /dev/null
@@ -1,220 +0,0 @@
-From afc0c76a170bd17cbd29bbec6ae6d2227e398570 Mon Sep 17 00:00:00 2001
-From: Alexander Couzens <lynxis@fe80.eu>
-Date: Fri, 13 Jan 2017 22:00:37 +0100
-Subject: [PATCH] remove frag_deflator_thread
-
-frag_deflator_thread compress fragments.
-Replace the deflator_thread with a function and
-use the function instead of the to_frag queue.
----
- squashfs-tools/info.c       |  5 ---
- squashfs-tools/mksquashfs.c | 76 +++++++++++++------------------------
- squashfs-tools/mksquashfs.h |  2 +-
- squashfs-tools/restore.c    | 15 +-------
- 4 files changed, 30 insertions(+), 68 deletions(-)
-
-diff --git a/squashfs-tools/info.c b/squashfs-tools/info.c
-index 7968c77..028d578 100644
---- a/squashfs-tools/info.c
-+++ b/squashfs-tools/info.c
-@@ -96,11 +96,6 @@ void dump_state()
- 	printf("compressed block queue (deflate thread(s) -> main thread)\n");
- 	dump_seq_queue(to_main, 0);
- 
--	printf("uncompressed packed fragment queue (main thread -> fragment"
--						" deflate thread(s))\n");
--	dump_queue(to_frag);
--
--
- 	printf("locked frag queue (compressed frags waiting while multi-block"
- 						" file is written)\n");
- 	dump_queue(locked_fragment);
-diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c
-index cf48e40..cacf14c 100644
---- a/squashfs-tools/mksquashfs.c
-+++ b/squashfs-tools/mksquashfs.c
-@@ -270,10 +270,10 @@ unsigned int sid_count = 0, suid_count = 0, sguid_count = 0;
- struct cache *reader_buffer, *fragment_buffer, *reserve_cache;
- struct cache *bwriter_buffer, *fwriter_buffer;
- struct queue *to_reader, *to_deflate, *to_writer, *from_writer,
--	*to_frag, *locked_fragment, *to_process_frag;
-+	*locked_fragment, *to_process_frag;
- struct seq_queue *to_main;
- pthread_t reader_thread, writer_thread, main_thread;
--pthread_t *deflator_thread, *frag_deflator_thread, *frag_thread;
-+pthread_t *deflator_thread, *frag_thread;
- pthread_t *restore_thread = NULL;
- pthread_mutex_t	fragment_mutex = PTHREAD_MUTEX_INITIALIZER;
- pthread_mutex_t	pos_mutex = PTHREAD_MUTEX_INITIALIZER;
-@@ -323,7 +323,7 @@ struct dir_info *scan1_opendir(char *pathname, char *subpath, int depth);
- void write_filesystem_tables(struct squashfs_super_block *sBlk, int nopad);
- unsigned short get_checksum_mem(char *buff, int bytes);
- void check_usable_phys_mem(int total_mem);
--
-+void frag_deflator(struct file_buffer *file_buffer);
- 
- void prep_exit()
- {
-@@ -1540,7 +1540,7 @@ void write_fragment(struct file_buffer *fragment)
- 	pthread_mutex_lock(&fragment_mutex);
- 	fragment_table[fragment->block].unused = 0;
- 	fragments_outstanding ++;
--	queue_put(to_frag, fragment);
-+	frag_deflator(fragment);
- 	pthread_cleanup_pop(1);
- }
- 
-@@ -2412,51 +2412,34 @@ void *deflator(void *arg)
- }
- 
- 
--void *frag_deflator(void *arg)
-+void frag_deflator(struct file_buffer *file_buffer)
- {
--	void *stream = NULL;
--	int res;
- 
--	res = compressor_init(comp, &stream, block_size, 1);
--	if(res)
--		BAD_ERROR("frag_deflator:: compressor_init failed\n");
--
--	pthread_cleanup_push((void *) pthread_mutex_unlock, &fragment_mutex);
--
--	while(1) {
--		int c_byte, compressed_size;
--		struct file_buffer *file_buffer = queue_get(to_frag);
--		struct file_buffer *write_buffer =
-+	int c_byte, compressed_size;
-+	struct file_buffer *write_buffer =
- 			cache_get(fwriter_buffer, file_buffer->block);
- 
--		c_byte = mangle2(stream, write_buffer->data, file_buffer->data,
--			file_buffer->size, block_size, noF, 1);
--		compressed_size = SQUASHFS_COMPRESSED_SIZE_BLOCK(c_byte);
--		write_buffer->size = compressed_size;
--		pthread_mutex_lock(&fragment_mutex);
--		if(fragments_locked == FALSE) {
--			fragment_table[file_buffer->block].size = c_byte;
--			fragment_table[file_buffer->block].start_block = bytes;
--			write_buffer->block = bytes;
--			bytes += compressed_size;
--			fragments_outstanding --;
--			queue_put(to_writer, write_buffer);
--			pthread_mutex_unlock(&fragment_mutex);
--			TRACE("Writing fragment %lld, uncompressed size %d, "
--				"compressed size %d\n", file_buffer->block,
--				file_buffer->size, compressed_size);
--		} else {
--				add_pending_fragment(write_buffer, c_byte,
--					file_buffer->block);
--				pthread_mutex_unlock(&fragment_mutex);
--		}
--		cache_block_put(file_buffer);
-+	c_byte = mangle2(stream, write_buffer->data, file_buffer->data,
-+			 file_buffer->size, block_size, noF, 1);
-+	compressed_size = SQUASHFS_COMPRESSED_SIZE_BLOCK(c_byte);
-+	write_buffer->size = compressed_size;
-+	if(fragments_locked == FALSE) {
-+		fragment_table[file_buffer->block].size = c_byte;
-+		fragment_table[file_buffer->block].start_block = bytes;
-+		write_buffer->block = bytes;
-+		bytes += compressed_size;
-+		fragments_outstanding --;
-+		queue_put(to_writer, write_buffer);
-+		TRACE("Writing fragment %lld, uncompressed size %d, "
-+		      "compressed size %d\n", file_buffer->block,
-+		      file_buffer->size, compressed_size);
-+	} else {
-+		add_pending_fragment(write_buffer, c_byte,
-+				     file_buffer->block);
- 	}
--
--	pthread_cleanup_pop(0);
-+	cache_block_put(file_buffer);
- }
- 
--
- struct file_buffer *get_file_buffer()
- {
- 	struct file_buffer *file_buffer = seq_queue_get(to_main);
-@@ -4257,19 +4240,17 @@ void initialise_threads(int readq, int fragq, int bwriteq, int fwriteq,
- 			multiply_overflow(processors * 3, sizeof(pthread_t)))
- 		BAD_ERROR("Processors too large\n");
- 
--	deflator_thread = malloc(processors * 3 * sizeof(pthread_t));
-+	deflator_thread = malloc(processors * 2 * sizeof(pthread_t));
- 	if(deflator_thread == NULL)
- 		MEM_ERROR();
- 
--	frag_deflator_thread = &deflator_thread[processors];
--	frag_thread = &frag_deflator_thread[processors];
-+	frag_thread = &deflator_thread[processors];
- 
- 	to_reader = queue_init(1);
- 	to_deflate = queue_init(reader_size);
- 	to_process_frag = queue_init(reader_size);
- 	to_writer = queue_init(bwriter_size + fwriter_size);
- 	from_writer = queue_init(1);
--	to_frag = queue_init(fragment_size);
- 	locked_fragment = queue_init(fragment_size);
- 	to_main = seq_queue_init();
- 	reader_buffer = cache_init(block_size, reader_size, 0, 0);
-@@ -4285,9 +4266,6 @@ void initialise_threads(int readq, int fragq, int bwriteq, int fwriteq,
- 	for(i = 0; i < processors; i++) {
- 		if(pthread_create(&deflator_thread[i], NULL, deflator, NULL))
- 			BAD_ERROR("Failed to create thread\n");
--		if(pthread_create(&frag_deflator_thread[i], NULL, frag_deflator,
--				NULL) != 0)
--			BAD_ERROR("Failed to create thread\n");
- 		if(pthread_create(&frag_thread[i], NULL, frag_thrd,
- 				(void *) destination_file) != 0)
- 			BAD_ERROR("Failed to create thread\n");
-diff --git a/squashfs-tools/mksquashfs.h b/squashfs-tools/mksquashfs.h
-index 55708a3..dc5bde4 100644
---- a/squashfs-tools/mksquashfs.h
-+++ b/squashfs-tools/mksquashfs.h
-@@ -135,7 +135,7 @@ struct append_file {
- extern struct cache *reader_buffer, *fragment_buffer, *reserve_cache;
- struct cache *bwriter_buffer, *fwriter_buffer;
- extern struct queue *to_reader, *to_deflate, *to_writer, *from_writer,
--	*to_frag, *locked_fragment, *to_process_frag;
-+	*locked_fragment, *to_process_frag;
- extern struct append_file **file_mapping;
- extern struct seq_queue *to_main;
- extern pthread_mutex_t fragment_mutex, dup_mutex;
-diff --git a/squashfs-tools/restore.c b/squashfs-tools/restore.c
-index 5e336b3..a7aaf2e 100644
---- a/squashfs-tools/restore.c
-+++ b/squashfs-tools/restore.c
-@@ -47,8 +47,8 @@
- #define TRUE 1
- 
- extern pthread_t reader_thread, writer_thread, main_thread;
--extern pthread_t *deflator_thread, *frag_deflator_thread, *frag_thread;
--extern struct queue *to_deflate, *to_writer, *to_frag, *to_process_frag;
-+extern pthread_t *deflator_thread, *frag_thread;
-+extern struct queue *to_deflate, *to_writer, *to_process_frag;
- extern struct seq_queue *to_main;
- extern void restorefs();
- extern int processors;
-@@ -120,17 +120,6 @@ void *restore_thrd(void *arg)
- 		pthread_cancel(main_thread);
- 		pthread_join(main_thread, NULL);
- 
--		/* then flush the main thread to fragment deflator thread(s)
--		 * queue.  The fragment deflator thread(s) will idle
--		 */
--		queue_flush(to_frag);
--
--		/* now kill the fragment deflator thread(s) */
--		for(i = 0; i < processors; i++)
--			pthread_cancel(frag_deflator_thread[i]);
--		for(i = 0; i < processors; i++)
--			pthread_join(frag_deflator_thread[i], NULL);
--
- 		/*
- 		 * then flush the main thread/fragment deflator thread(s)
- 		 * to writer thread queue.  The writer thread will idle
--- 
-2.17.0
-
diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix
index 5bd3b27eded..19a56a9466f 100644
--- a/pkgs/tools/filesystems/squashfs/default.nix
+++ b/pkgs/tools/filesystems/squashfs/default.nix
@@ -8,26 +8,21 @@ assert lz4Support -> (lz4 != null);
 
 stdenv.mkDerivation {
   pname = "squashfs";
-  version = "4.4dev_20180612";
+  version = "4.4";
 
   src = fetchFromGitHub {
     owner = "plougher";
     repo = "squashfs-tools";
-    sha256 = "1y53z8dkph3khdyhkmkmy0sg9p1n8czv3vj4l324nj8kxyih3l2c";
-    rev = "6e242dc95485ada8d1d0b3dd9346c5243d4a517f";
+    sha256 = "0697fv8n6739mcyn57jclzwwbbqwpvjdfkv1qh9s56lvyqnplwaw";
+    # Tag "4.4" points to this commit.
+    rev = "52eb4c279cd283ed9802dd1ceb686560b22ffb67";
   };
 
   patches = [
-    # These patches ensures that mksquashfs output is reproducible.
-    # See also https://reproducible-builds.org/docs/system-images/
-    # and https://github.com/NixOS/nixpkgs/issues/40144.
-    ./0001-If-SOURCE_DATE_EPOCH-is-set-override-timestamps-with.patch
-    ./0002-If-SOURCE_DATE_EPOCH-is-set-also-clamp-content-times.patch
-    ./0003-remove-frag-deflator-thread.patch
-
     # This patch adds an option to pad filesystems (increasing size) in
     # exchange for better chunking / binary diff calculation.
-    ./squashfs-tools-4.4-4k-align.patch
+    # TODO(ruuda): make this patch apply to the proper 4.4 release.
+    # ./squashfs-tools-4.4-4k-align.patch
   ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin.patch;
 
   buildInputs = [ zlib xz zstd ]
-- 
GitLab


From a60ee9a74c8f9305469e2b8962aef05f33f64afc Mon Sep 17 00:00:00 2001
From: Ruud van Asseldonk <dev@veniogames.com>
Date: Sat, 7 Sep 2019 18:58:31 +0200
Subject: [PATCH 0072/2254] squashfsTools: make alignment patch apply to 4.4

I took the patch, and applied it on top of the previous squashfs-tools
commit that we packaged (which required editing one line in the patch,
as it assumed to be applied on top of the reproducibility patches). Then
I rebased that on top of master, resolved one conflict, and I formatted
a new patch for this.
---
 ...ools-4.4-4k-align.patch => 4k-align.patch} | 51 +++++++++++--------
 pkgs/tools/filesystems/squashfs/default.nix   |  3 +-
 2 files changed, 32 insertions(+), 22 deletions(-)
 rename pkgs/tools/filesystems/squashfs/{squashfs-tools-4.4-4k-align.patch => 4k-align.patch} (67%)

diff --git a/pkgs/tools/filesystems/squashfs/squashfs-tools-4.4-4k-align.patch b/pkgs/tools/filesystems/squashfs/4k-align.patch
similarity index 67%
rename from pkgs/tools/filesystems/squashfs/squashfs-tools-4.4-4k-align.patch
rename to pkgs/tools/filesystems/squashfs/4k-align.patch
index c9c3dd3d760..e73c0678875 100644
--- a/pkgs/tools/filesystems/squashfs/squashfs-tools-4.4-4k-align.patch
+++ b/pkgs/tools/filesystems/squashfs/4k-align.patch
@@ -1,3 +1,7 @@
+This patch has been edited to apply to squashfs 4.4, commit
+52eb4c279cd283ed9802dd1ceb686560b22ffb67. Below is the original
+message body of the patch.
+
 From 7bda7c75748f36b0a50f93e46144d5a4de4974ad Mon Sep 17 00:00:00 2001
 From: Amin Hassani <ahassani@google.com>
 Date: Thu, 15 Dec 2016 10:43:15 -0800
@@ -16,20 +20,24 @@ increased_size = (number_of_unfragmented_files_in_image + number of fragments) *
 
 The 4k alignment can be enabled by flag '-4k-align'
 ---
-diff -u a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c
---- a/squashfs-tools/mksquashfs.c	2019-07-06 15:50:22.214873176 +0000
-+++ b/squashfs-tools/mksquashfs.c	2019-07-06 15:51:22.244802582 +0000
-@@ -100,7 +100,9 @@
+ squashfs-tools/mksquashfs.c | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c
+index a45b77f..07b1c06 100644
+--- a/squashfs-tools/mksquashfs.c
++++ b/squashfs-tools/mksquashfs.c
+@@ -102,7 +102,9 @@ int old_exclude = TRUE;
  int use_regex = FALSE;
  int nopad = FALSE;
  int exit_on_error = FALSE;
 +int do_4k_align = FALSE;
- static off_t squashfs_start_offset = 0;
+ long long start_offset = 0;
 +#define ALIGN_UP(bytes, size) (bytes = (bytes + size - 1) & ~(size - 1))
  
  long long global_uid = -1, global_gid = -1;
  
-@@ -1495,6 +1497,9 @@
+@@ -1546,6 +1548,9 @@ void unlock_fragments()
  	 * queue at this time.
  	 */
  	while(!queue_empty(locked_fragment)) {
@@ -39,17 +47,17 @@ diff -u a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c
  		write_buffer = queue_get(locked_fragment);
  		frg = write_buffer->block;	
  		size = SQUASHFS_COMPRESSED_SIZE_BLOCK(fragment_table[frg].size);
-@@ -2414,6 +2419,9 @@
- 	compressed_size = SQUASHFS_COMPRESSED_SIZE_BLOCK(c_byte);
- 	write_buffer->size = compressed_size;
- 	if(fragments_locked == FALSE) {
-+		// 4k align the start of each fragment.
-+		if(do_4k_align)
-+			ALIGN_UP(bytes, 4096);
- 		fragment_table[file_buffer->block].size = c_byte;
- 		fragment_table[file_buffer->block].start_block = bytes;
- 		write_buffer->block = bytes;
-@@ -2728,6 +2736,10 @@
+@@ -2478,6 +2483,9 @@ void *frag_deflator(void *arg)
+ 		write_buffer->size = compressed_size;
+ 		pthread_mutex_lock(&fragment_mutex);
+ 		if(fragments_locked == FALSE) {
++			// 4k align the start of each fragment.
++			if(do_4k_align)
++				ALIGN_UP(bytes, 4096);
+ 			fragment_table[file_buffer->block].size = c_byte;
+ 			fragment_table[file_buffer->block].start_block = bytes;
+ 			write_buffer->block = bytes;
+@@ -2877,6 +2885,10 @@ int write_file_blocks(squashfs_inode *inode, struct dir_ent *dir_ent,
  	long long sparse = 0;
  	struct file_buffer *fragment_buffer = NULL;
  
@@ -60,7 +68,7 @@ diff -u a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c
  	if(pre_duplicate(read_size))
  		return write_file_blocks_dup(inode, dir_ent, read_buffer, dup);
  
-@@ -4808,6 +4820,7 @@
+@@ -4972,6 +4984,7 @@ void write_filesystem_tables(struct squashfs_super_block *sBlk, int nopad)
  		"compressed", no_fragments ? "no" : noF ? "uncompressed" :
  		"compressed", no_xattrs ? "no" : noX ? "uncompressed" :
  		"compressed", noI || noId ? "uncompressed" : "compressed");
@@ -68,7 +76,7 @@ diff -u a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c
  	printf("\tduplicates are %sremoved\n", duplicate_checking ? "" :
  		"not ");
  	printf("Filesystem size %.2f Kbytes (%.2f Mbytes)\n", bytes / 1024.0,
-@@ -5570,6 +5583,8 @@
+@@ -5853,6 +5866,8 @@ print_compressor_options:
  			root_name = argv[i];
  		} else if(strcmp(argv[i], "-version") == 0) {
  			VERSION();
@@ -77,7 +85,7 @@ diff -u a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c
  		} else {
  			ERROR("%s: invalid option\n\n", argv[0]);
  printOptions:
-@@ -5613,6 +5628,7 @@
+@@ -5904,6 +5919,7 @@ printOptions:
  			ERROR("\t\t\tdirectory containing that directory, "
  				"rather than the\n");
  			ERROR("\t\t\tcontents of the directory\n");
@@ -85,3 +93,6 @@ diff -u a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c
  			ERROR("\nFilesystem filter options:\n");
  			ERROR("-p <pseudo-definition>\tAdd pseudo file "
  				"definition\n");
+-- 
+2.23.0
+
diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix
index 19a56a9466f..15a535eed3b 100644
--- a/pkgs/tools/filesystems/squashfs/default.nix
+++ b/pkgs/tools/filesystems/squashfs/default.nix
@@ -21,8 +21,7 @@ stdenv.mkDerivation {
   patches = [
     # This patch adds an option to pad filesystems (increasing size) in
     # exchange for better chunking / binary diff calculation.
-    # TODO(ruuda): make this patch apply to the proper 4.4 release.
-    # ./squashfs-tools-4.4-4k-align.patch
+    ./4k-align.patch
   ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin.patch;
 
   buildInputs = [ zlib xz zstd ]
-- 
GitLab


From 14d2c3669faa5d0703610b8fc3d6f5d5bfbc6332 Mon Sep 17 00:00:00 2001
From: Ruud van Asseldonk <dev@veniogames.com>
Date: Sat, 7 Sep 2019 19:16:57 +0200
Subject: [PATCH 0073/2254] squashfsTools: make Darwin patch apply to 4.4

I took the patch, and applied it on top of the previous squashfs-tools
commit that we packaged. It applied cleanly. Then I rebased that on top
of master, and resolved the conflicts. I'm not sure I resolved them
correctly though, I don't have access to Darwin. Somebody needs to
review this.
---
 pkgs/tools/filesystems/squashfs/darwin.patch | 141 ++++---------------
 1 file changed, 31 insertions(+), 110 deletions(-)

diff --git a/pkgs/tools/filesystems/squashfs/darwin.patch b/pkgs/tools/filesystems/squashfs/darwin.patch
index 6022e65be47..28d70cdf03d 100644
--- a/pkgs/tools/filesystems/squashfs/darwin.patch
+++ b/pkgs/tools/filesystems/squashfs/darwin.patch
@@ -28,10 +28,10 @@ index 4b06ccb..26365e7 100644
  
  /*
 diff --git a/squashfs-tools/info.c b/squashfs-tools/info.c
-index 7968c77..c8e4c52 100644
+index fe23d78..8efefe6 100644
 --- a/squashfs-tools/info.c
 +++ b/squashfs-tools/info.c
-@@ -134,31 +134,22 @@ void dump_state()
+@@ -144,31 +144,22 @@ void dump_state()
  void *info_thrd(void *arg)
  {
  	sigset_t sigmask;
@@ -68,7 +68,7 @@ index 7968c77..c8e4c52 100644
  					"because %s\n", strerror(errno));
  			}
  		}
-@@ -169,8 +160,12 @@ void *info_thrd(void *arg)
+@@ -179,8 +170,12 @@ void *info_thrd(void *arg)
  			/* set one second interval period, if ^\ received
  			   within then, dump queue and cache status */
  			waiting = 1;
@@ -83,12 +83,12 @@ index 7968c77..c8e4c52 100644
  }
  
 diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c
-index d696a51..c86d1b3 100644
+index a45b77f..6d186ea 100644
 --- a/squashfs-tools/mksquashfs.c
 +++ b/squashfs-tools/mksquashfs.c
-@@ -50,6 +50,10 @@
- #include <limits.h>
+@@ -52,6 +52,10 @@
  #include <ctype.h>
+ #include <sys/sysinfo.h>
  
 +#ifndef FNM_EXTMATCH /* glibc extension */
 +    #define FNM_EXTMATCH 0
@@ -97,101 +97,15 @@ index d696a51..c86d1b3 100644
  #ifndef linux
  #define __BYTE_ORDER BYTE_ORDER
  #define __BIG_ENDIAN BIG_ENDIAN
-@@ -831,13 +835,13 @@ char *subpathname(struct dir_ent *dir_ent)
- }
- 
- 
--inline unsigned int get_inode_no(struct inode_info *inode)
-+static inline unsigned int get_inode_no(struct inode_info *inode)
- {
- 	return inode->inode_number;
- }
- 
- 
--inline unsigned int get_parent_no(struct dir_info *dir)
-+static inline unsigned int get_parent_no(struct dir_info *dir)
- {
- 	return dir->depth ? get_inode_no(dir->dir_ent->inode) : inode_no;
- }
-@@ -2030,7 +2034,7 @@ struct file_info *duplicate(long long file_size, long long bytes,
- }
- 
- 
--inline int is_fragment(struct inode_info *inode)
-+static inline int is_fragment(struct inode_info *inode)
- {
- 	off_t file_size = inode->buf.st_size;
- 
-@@ -2999,13 +3003,13 @@ struct inode_info *lookup_inode2(struct stat *buf, int pseudo, int id)
- }
- 
- 
--inline struct inode_info *lookup_inode(struct stat *buf)
-+static inline struct inode_info *lookup_inode(struct stat *buf)
- {
- 	return lookup_inode2(buf, 0, 0);
- }
- 
- 
--inline void alloc_inode_no(struct inode_info *inode, unsigned int use_this)
-+static inline void alloc_inode_no(struct inode_info *inode, unsigned int use_this)
- {
- 	if (inode->inode_number == 0) {
- 		inode->inode_number = use_this ? : inode_no ++;
-@@ -3016,7 +3020,7 @@ inline void alloc_inode_no(struct inode_info *inode, unsigned int use_this)
- }
- 
- 
--inline struct dir_ent *create_dir_entry(char *name, char *source_name,
-+static inline struct dir_ent *create_dir_entry(char *name, char *source_name,
- 	char *nonstandard_pathname, struct dir_info *dir)
- {
- 	struct dir_ent *dir_ent = malloc(sizeof(struct dir_ent));
-@@ -3034,7 +3038,7 @@ inline struct dir_ent *create_dir_entry(char *name, char *source_name,
- }
- 
- 
--inline void add_dir_entry(struct dir_ent *dir_ent, struct dir_info *sub_dir,
-+static inline void add_dir_entry(struct dir_ent *dir_ent, struct dir_info *sub_dir,
- 	struct inode_info *inode_info)
- {
- 	struct dir_info *dir = dir_ent->our_dir;
-@@ -3050,7 +3054,7 @@ inline void add_dir_entry(struct dir_ent *dir_ent, struct dir_info *sub_dir,
- }
- 
- 
--inline void add_dir_entry2(char *name, char *source_name,
-+static inline void add_dir_entry2(char *name, char *source_name,
- 	char *nonstandard_pathname, struct dir_info *sub_dir,
- 	struct inode_info *inode_info, struct dir_info *dir)
- {
-@@ -3062,7 +3066,7 @@ inline void add_dir_entry2(char *name, char *source_name,
- }
- 
- 
--inline void free_dir_entry(struct dir_ent *dir_ent)
-+static inline void free_dir_entry(struct dir_ent *dir_ent)
- {
- 	if(dir_ent->name)
- 		free(dir_ent->name);
-@@ -3083,7 +3087,7 @@ inline void free_dir_entry(struct dir_ent *dir_ent)
- }
- 
- 
--inline void add_excluded(struct dir_info *dir)
-+static inline void add_excluded(struct dir_info *dir)
- {
- 	dir->excluded ++;
- }
-@@ -4200,6 +4204,7 @@ void initialise_threads(int readq, int fragq, int bwriteq, int fwriteq,
+@@ -4348,6 +4352,7 @@ void initialise_threads(int readq, int fragq, int bwriteq, int fwriteq,
  	sigemptyset(&sigmask);
  	sigaddset(&sigmask, SIGQUIT);
  	sigaddset(&sigmask, SIGHUP);
 +	sigaddset(&sigmask, SIGALRM);
- 	if(pthread_sigmask(SIG_BLOCK, &sigmask, NULL) == -1)
+ 	if(pthread_sigmask(SIG_BLOCK, &sigmask, NULL) != 0)
  		BAD_ERROR("Failed to set signal mask in intialise_threads\n");
  
-@@ -4987,6 +4992,36 @@ int parse_num(char *arg, int *res)
+@@ -5184,6 +5189,36 @@ int parse_mode(char *arg, mode_t *res)
  
  int get_physical_memory()
  {
@@ -228,21 +142,24 @@ index d696a51..c86d1b3 100644
  	/*
  	 * Long longs are used here because with PAE, a 32-bit
  	 * machine can have more than 4GB of physical memory
-@@ -4996,10 +5031,11 @@ int get_physical_memory()
+@@ -5193,7 +5228,6 @@ int get_physical_memory()
  	 */
  	long long num_pages = sysconf(_SC_PHYS_PAGES);
  	long long page_size = sysconf(_SC_PAGESIZE);
--	int phys_mem = num_pages * page_size >> 20;
-+	phys_mem = num_pages * page_size >> 20;
+-	int phys_mem;
+ 
+ 	if(num_pages == -1 || page_size == -1) {
+ 		struct sysinfo sys;
+@@ -5207,6 +5241,7 @@ int get_physical_memory()
+ 	}
  
- 	if(num_pages == -1 || page_size == -1)
- 		return 0;
+ 	phys_mem = num_pages * page_size >> 20;
 +#endif
  
  	if(phys_mem < SQUASHFS_LOWMEM)
  		BAD_ERROR("Mksquashfs requires more physical memory than is "
 diff --git a/squashfs-tools/mksquashfs.h b/squashfs-tools/mksquashfs.h
-index 55708a3..d44d1fd 100644
+index 1beefef..88d0b5c 100644
 --- a/squashfs-tools/mksquashfs.h
 +++ b/squashfs-tools/mksquashfs.h
 @@ -24,6 +24,7 @@
@@ -254,7 +171,7 @@ index 55708a3..d44d1fd 100644
  struct dir_info {
  	char			*pathname;
 diff --git a/squashfs-tools/pseudo.c b/squashfs-tools/pseudo.c
-index cb74cf6..fe2b4bc 100644
+index 48e6b27..f8fd529 100644
 --- a/squashfs-tools/pseudo.c
 +++ b/squashfs-tools/pseudo.c
 @@ -30,6 +30,7 @@
@@ -266,7 +183,7 @@ index cb74cf6..fe2b4bc 100644
  #include <sys/wait.h>
  #include <sys/stat.h>
 diff --git a/squashfs-tools/read_xattrs.c b/squashfs-tools/read_xattrs.c
-index 42106f5..837d3fb 100644
+index 4debedf..3257c30 100644
 --- a/squashfs-tools/read_xattrs.c
 +++ b/squashfs-tools/read_xattrs.c
 @@ -39,13 +39,13 @@
@@ -286,10 +203,10 @@ index 42106f5..837d3fb 100644
  extern int read_block(int, long long, long long *, int, void *);
  
 diff --git a/squashfs-tools/unsquashfs.c b/squashfs-tools/unsquashfs.c
-index f190e96..927e441 100644
+index 727f1d5..00615ce 100644
 --- a/squashfs-tools/unsquashfs.c
 +++ b/squashfs-tools/unsquashfs.c
-@@ -32,7 +32,12 @@
+@@ -32,8 +32,13 @@
  #include "stdarg.h"
  #include "fnmatch_compat.h"
  
@@ -297,21 +214,22 @@ index f190e96..927e441 100644
 +#include <sys/sysctl.h>
 +#else
  #include <sys/sysinfo.h>
+ #include <sys/sysmacros.h>
 +#endif
 +
  #include <sys/types.h>
  #include <sys/time.h>
  #include <sys/resource.h>
-@@ -2185,6 +2190,7 @@ void initialise_threads(int fragment_buffer_size, int data_buffer_size)
+@@ -2235,6 +2240,7 @@ void initialise_threads(int fragment_buffer_size, int data_buffer_size)
  	sigemptyset(&sigmask);
  	sigaddset(&sigmask, SIGQUIT);
  	sigaddset(&sigmask, SIGHUP);
 +	sigaddset(&sigmask, SIGALRM);
- 	if(pthread_sigmask(SIG_BLOCK, &sigmask, NULL) == -1)
+ 	if(pthread_sigmask(SIG_BLOCK, &sigmask, NULL) != 0)
  		EXIT_UNSQUASH("Failed to set signal mask in initialise_threads"
  			"\n");
 diff --git a/squashfs-tools/unsquashfs.h b/squashfs-tools/unsquashfs.h
-index 0edbd25..cea9caa 100644
+index 934618b..329eb9e 100644
 --- a/squashfs-tools/unsquashfs.h
 +++ b/squashfs-tools/unsquashfs.h
 @@ -46,6 +46,10 @@
@@ -381,7 +299,7 @@ index c8e2b9b..7d4f7af 100644
  }
  
 diff --git a/squashfs-tools/unsquashfs_xattr.c b/squashfs-tools/unsquashfs_xattr.c
-index 59f4aae..13f0e35 100644
+index 7742dfe..26ccd39 100644
 --- a/squashfs-tools/unsquashfs_xattr.c
 +++ b/squashfs-tools/unsquashfs_xattr.c
 @@ -27,6 +27,11 @@
@@ -397,7 +315,7 @@ index 59f4aae..13f0e35 100644
  
  extern int root_process;
 diff --git a/squashfs-tools/xattr.c b/squashfs-tools/xattr.c
-index b46550c..5b32eca 100644
+index 64dfd82..9c4532d 100644
 --- a/squashfs-tools/xattr.c
 +++ b/squashfs-tools/xattr.c
 @@ -22,6 +22,14 @@
@@ -429,3 +347,6 @@ index b46550c..5b32eca 100644
  #include "squashfs_fs.h"
  #include "squashfs_swap.h"
  #include "mksquashfs.h"
+-- 
+2.23.0
+
-- 
GitLab


From c4ae600ae370dfe8bc08b2467cc648dd0ac10fd5 Mon Sep 17 00:00:00 2001
From: LightDiscord <root@arnaud.sh>
Date: Sat, 7 Sep 2019 19:19:07 +0200
Subject: [PATCH 0074/2254] protonmail-bridge: 1.1.6-1 -> 1.2.2-1

---
 pkgs/applications/networking/protonmail-bridge/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/protonmail-bridge/default.nix b/pkgs/applications/networking/protonmail-bridge/default.nix
index 60ea01ae451..861cff3fbfd 100644
--- a/pkgs/applications/networking/protonmail-bridge/default.nix
+++ b/pkgs/applications/networking/protonmail-bridge/default.nix
@@ -2,7 +2,7 @@
 , libsecret, libGL, libpulseaudio, glib, wrapQtAppsHook, makeDesktopItem, mkDerivation }:
 
 let
-  version = "1.1.6-1";
+  version = "1.2.2-1";
 
   description = ''
     An application that runs on your computer in the background and seamlessly encrypts
@@ -27,7 +27,7 @@ in mkDerivation {
 
   src = fetchurl {
     url = "https://protonmail.com/download/protonmail-bridge_${version}_amd64.deb";
-    sha256 = "108dql9q5znsqjkrs41pc6psjbg5bz09rdmjl036xxbvsdvq4a8r";
+    sha256 = "16hfa07wdqcns79395wjdglg2cjyblqgz1hx8rl15qm7n5f24ckl";
   };
 
   sourceRoot = ".";
-- 
GitLab


From 45a33da8873bdc4023e2aa15e3a1519b76e9bead Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sat, 7 Sep 2019 20:54:40 +0300
Subject: [PATCH 0075/2254] syncthingtray: 0.9.1 -> 0.10.0

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

diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix
index 0dc8f3bf38e..70aa684da04 100644
--- a/pkgs/applications/misc/syncthingtray/default.nix
+++ b/pkgs/applications/misc/syncthingtray/default.nix
@@ -20,14 +20,14 @@
 }:
 
 mkDerivation rec {
-  version = "0.9.1";
+  version = "0.10.0";
   pname = "syncthingtray";
 
   src = fetchFromGitHub {
     owner = "Martchus";
     repo = "syncthingtray";
     rev = "v${version}";
-    sha256 = "0ijwpwlwwbfh9fdfbwz6dgi6hpmaav2jm56mzxm6as50iwnb59fx";
+    sha256 = "18h6z6baaiyr0wr7kyz6ysg45zb12550m63j3vqiap4hfrrwhly5";
   };
 
   buildInputs = [ qtbase cpp-utilities qtutilities ]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 793d1485bc1..232b3990661 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20645,7 +20645,7 @@ in
   syncthing-tray = callPackage ../applications/misc/syncthing-tray { };
 
   syncthingtray = libsForQt5.callPackage ../applications/misc/syncthingtray { };
-  syncthingtray-minumal = libsForQt5.callPackage ../applications/misc/syncthingtray {
+  syncthingtray-minimal = libsForQt5.callPackage ../applications/misc/syncthingtray {
     webviewSupport = false;
     jsSupport = false;
     kioPluginSupport = false;
-- 
GitLab


From b898c262c1ac38d9b19c22cc07a4f6f9267cfd20 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 8 Sep 2019 01:25:25 +0200
Subject: [PATCH 0076/2254] hydra: 2019-05-06 -> 2019-08-30

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

diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix
index 0d50c772bde..4a65d088834 100644
--- a/pkgs/development/tools/misc/hydra/default.nix
+++ b/pkgs/development/tools/misc/hydra/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, nix, perlPackages, buildEnv, releaseTools, fetchFromGitHub
+{ stdenv, nix, perlPackages, buildEnv, fetchFromGitHub
 , makeWrapper, autoconf, automake, libtool, unzip, pkgconfig, sqlite, libpqxx
 , gitAndTools, mercurial, darcs, subversion, bazaar, openssl, bzip2, libxslt
 , guile, perl, postgresql, nukeReferences, git, boehmgc, nlohmann_json
 , docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar
-, rpm, dpkg, cdrkit, pixz, lib, fetchpatch, boost, autoreconfHook
+, rpm, dpkg, cdrkit, pixz, lib, boost, autoreconfHook
 }:
 
 with stdenv;
@@ -67,17 +67,17 @@ let
         boehmgc
       ];
   };
-in releaseTools.nixBuild rec {
+in stdenv.mkDerivation rec {
   pname = "hydra";
-  version = "2019-05-06";
+  version = "2019-08-30";
 
   inherit stdenv;
 
   src = fetchFromGitHub {
     owner = "NixOS";
     repo = pname;
-    rev = "ff64583d07f046e378a6be596ec0ce7a9e2b7472";
-    sha256 = "0w88q0saz7si22z3ryim6vdrv9qkwn6l25xfmiapvh5qrnrrdcb9";
+    rev = "242b8b7a314759ed33f69205d26a1b7c337511e0";
+    sha256 = "167ijcf9qdm10kjvqax3hcvs5mpa4mx2y2i9idwwc6xfvn8fhs84";
   };
 
   buildInputs =
@@ -97,13 +97,6 @@ in releaseTools.nixBuild rec {
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
 
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/NixOS/hydra/pull/648/commits/4171ab4c4fd576c516dc03ba64d1c7945f769af0.patch";
-      sha256 = "1fxa2459kdws6qc419dv4084c1ssmys7kqg4ic7n643kybamsgrx";
-    })
-  ];
-
   configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ];
 
   NIX_CFLAGS_COMPILE = [ "-pthread" ];
-- 
GitLab


From 56625d224f366ea76b279162f46404b7ec5a9f50 Mon Sep 17 00:00:00 2001
From: LightDiscord <root@arnaud.sh>
Date: Sun, 8 Sep 2019 11:50:05 +0200
Subject: [PATCH 0077/2254] protonmail-bridge: use archive desktop file

---
 .../networking/protonmail-bridge/default.nix  | 23 ++++++-------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/networking/protonmail-bridge/default.nix b/pkgs/applications/networking/protonmail-bridge/default.nix
index 861cff3fbfd..a585e7f948b 100644
--- a/pkgs/applications/networking/protonmail-bridge/default.nix
+++ b/pkgs/applications/networking/protonmail-bridge/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, lib, qtbase, qtmultimedia, qtsvg, qtdeclarative, qttools, qtgraphicaleffects, qtquickcontrols2, full
-, libsecret, libGL, libpulseaudio, glib, wrapQtAppsHook, makeDesktopItem, mkDerivation }:
+, libsecret, libGL, libpulseaudio, glib, wrapQtAppsHook, mkDerivation }:
 
 let
   version = "1.2.2-1";
@@ -10,17 +10,6 @@ let
 
     To work, gnome-keyring service must be enabled.
   '';
-
-  desktopItem = makeDesktopItem {
-    name = "protonmail-bridge";
-    exec = "protonmail-bridge";
-    icon = "protonmail-bridge";
-    comment = stdenv.lib.replaceStrings ["\n"] [" "] description;
-    desktopName = "ProtonMail Bridge";
-    genericName = "ProtonMail Bridge for Linux";
-    categories = "Utility;Security;Network;Email";
-  };
-
 in mkDerivation {
   pname = "protonmail-bridge";
   inherit version;
@@ -37,12 +26,10 @@ in mkDerivation {
   '';
 
   installPhase = ''
-    mkdir -p $out/{bin,lib,share/applications}
-    mkdir -p $out/share/{applications,icons/hicolor/scalable/apps}
+    mkdir -p $out/{bin,lib,share}
 
     cp -r usr/lib/protonmail/bridge/protonmail-bridge $out/lib
-    cp usr/share/icons/protonmail/ProtonMail_Bridge.svg $out/share/icons/hicolor/scalable/apps/protonmail-bridge.svg
-    cp ${desktopItem}/share/applications/* $out/share/applications
+    cp -r usr/share $out
 
     ln -s $out/lib/protonmail-bridge $out/bin/protonmail-bridge
   '';
@@ -67,6 +54,10 @@ in mkDerivation {
       --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
       --set-rpath "${rpath}" \
       $out/lib/protonmail-bridge
+
+    substituteInPlace $out/share/applications/ProtonMail_Bridge.desktop \
+      --replace "/usr/" "$out/" \
+      --replace "Exec=protonmail-bridge" "Exec=$out/bin/protonmail-bridge"
   '';
 
   buildInputs = [ qtbase qtquickcontrols2 qtmultimedia qtgraphicaleffects qtdeclarative ];
-- 
GitLab


From ad9efdce071e63f90ee5e949d75f16eeef599a08 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@gmail.com>
Date: Mon, 9 Sep 2019 00:57:57 +0300
Subject: [PATCH 0078/2254] gpscorrelate: enable NLS

---
 .../misc/gpscorrelate/default.nix             | 12 ++++++---
 .../misc/gpscorrelate/fix-localedir.diff      | 27 +++++++++++++++++++
 2 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/applications/misc/gpscorrelate/fix-localedir.diff

diff --git a/pkgs/applications/misc/gpscorrelate/default.nix b/pkgs/applications/misc/gpscorrelate/default.nix
index d10507b1044..bf7bec38afb 100644
--- a/pkgs/applications/misc/gpscorrelate/default.nix
+++ b/pkgs/applications/misc/gpscorrelate/default.nix
@@ -3,15 +3,17 @@
 
 stdenv.mkDerivation rec {
   pname = "gpscorrelate";
-  version = "unstable-2019-06-05";
+  version = "unstable-2019-09-03";
 
   src = fetchFromGitHub {
     owner = "dfandrich";
     repo = pname;
-    rev = "80b14fe7c10c1cc8f62c13f517c062577ce88c85";
-    sha256 = "1gaan0nd7ai0bwilfnkza7lg5mz87804mvlygj0gjc672izr37r6";
+    rev = "e1dd44a34f67b1ab7201440e60a840258ee448d2";
+    sha256 = "0gjwwdqh9dprzylmmnk3gm41khka9arkij3i9amd8y7d49pm9rlv";
   };
 
+  patches = [ ./fix-localedir.diff ];
+
   nativeBuildInputs = [
     desktop-file-utils
     docbook_xml_dtd_42
@@ -31,11 +33,12 @@ stdenv.mkDerivation rec {
     "GTK=3"
     "CC=cc"
     "CXX=c++"
+    "CFLAGS=-DENABLE_NLS"
   ];
 
   doCheck = true;
 
-  installTargets = [ "install" "install-desktop-file" ];
+  installTargets = [ "install" "install-po" "install-desktop-file" ];
 
   meta = with stdenv.lib; {
     description = "A GPS photo correlation tool, to add EXIF geotags";
@@ -59,5 +62,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2Plus;
     homepage = "https://github.com/dfandrich/gpscorrelate";
     platforms = platforms.linux;
+    maintainers = with maintainers; [ sikmir ];
   };
 }
diff --git a/pkgs/applications/misc/gpscorrelate/fix-localedir.diff b/pkgs/applications/misc/gpscorrelate/fix-localedir.diff
new file mode 100644
index 00000000000..5f9cb296ecd
--- /dev/null
+++ b/pkgs/applications/misc/gpscorrelate/fix-localedir.diff
@@ -0,0 +1,27 @@
+diff --git i/Makefile w/Makefile
+index 47919ca..408fd68 100644
+--- i/Makefile
++++ w/Makefile
+@@ -33,8 +33,9 @@ datadir  = $(prefix)/share
+ mandir   = $(datadir)/man
+ docdir   = $(datadir)/doc/gpscorrelate
+ applicationsdir = $(datadir)/applications
++localedir = ${datadir}/locale
+ 
+-DEFS = -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\"
++DEFS = -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\" -DPACKAGE_LOCALE_DIR=\"$(localedir)\"
+ 
+ TARGETS = gpscorrelate-gui$(EXEEXT) gpscorrelate$(EXEEXT) doc/gpscorrelate.1 doc/gpscorrelate.html
+ 
+diff --git i/main-gui.c w/main-gui.c
+index fdace6f..8a6197b 100644
+--- i/main-gui.c
++++ w/main-gui.c
+@@ -40,6 +40,7 @@
+ int main(int argc, char* argv[])
+ {
+ 	/* Initialize gettext (gtk_init initializes the locale) */
++	(void) bindtextdomain(TEXTDOMAIN, PACKAGE_LOCALE_DIR);
+ 	(void) textdomain(TEXTDOMAIN);
+ 	(void) bind_textdomain_codeset(TEXTDOMAIN, "UTF-8");
+ 
-- 
GitLab


From d046ab888c0779f4ff209f0d5635e094cffbd235 Mon Sep 17 00:00:00 2001
From: Lily Ballard <lily@sb.org>
Date: Wed, 14 Aug 2019 16:23:15 -0700
Subject: [PATCH 0079/2254] perl: Update detected platform version

Instead of hardcoding the version as 10.10, we should just detect it as
being MACOSX_DEPLOYMENT_TARGET.
---
 pkgs/development/interpreters/perl/sw_vers.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/perl/sw_vers.patch b/pkgs/development/interpreters/perl/sw_vers.patch
index 9d4cd75486e..2e30dba9292 100644
--- a/pkgs/development/interpreters/perl/sw_vers.patch
+++ b/pkgs/development/interpreters/perl/sw_vers.patch
@@ -7,7 +7,7 @@ index afadf53..80b7533 100644
      # "ProductVersion:    10.10.5"   "10.10"
      # "ProductVersion:    10.11"     "10.11"
 -        prodvers=`sw_vers|awk '/^ProductVersion:/{print $2}'|awk -F. '{print $1"."$2}'`
-+        prodvers="10.10"
++        prodvers="${MACOSX_DEPLOYMENT_TARGET:-10.12}"
      case "$prodvers" in
      10.*)
        add_macosx_version_min ccflags $prodvers
-- 
GitLab


From 28367c64fdb0c572d7d1977894877787710d02a3 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Mon, 9 Sep 2019 10:35:26 +0200
Subject: [PATCH 0080/2254] pythonPackages.pyopenssl: add missing six
 dependency

It might have been there as a transitive dependency but better be
explicity about it.
---
 pkgs/development/python-modules/pyopenssl/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix
index ec17b77ba20..018463ead54 100644
--- a/pkgs/development/python-modules/pyopenssl/default.nix
+++ b/pkgs/development/python-modules/pyopenssl/default.nix
@@ -9,6 +9,7 @@
 , pretend
 , flaky
 , glibcLocales
+, six
 }:
 
 with stdenv.lib;
@@ -84,7 +85,7 @@ buildPythonPackage rec {
   doCheck = !stdenv.isDarwin;
 
   nativeBuildInputs = [ openssl ];
-  propagatedBuildInputs = [ cryptography pyasn1 idna ];
+  propagatedBuildInputs = [ cryptography pyasn1 idna six ];
 
   checkInputs = [ pytest pretend flaky glibcLocales ];
 }
-- 
GitLab


From be098bacad7859717f9e9ba752c184f7545e7801 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 9 Sep 2019 13:18:07 +0100
Subject: [PATCH 0081/2254] python.pkgs.MySQL_python: remove

Reasons:

- No release since 2014
- deprecated by upstream
- no longer compatible with newer libmysql versions

(cherry picked from commit 4a53284bc0bdf041e2be66ff860ab34ca2a63c01)
---
 .../python-modules/mysql_python/default.nix   | 33 -------------------
 pkgs/top-level/python-packages.nix            |  2 --
 2 files changed, 35 deletions(-)
 delete mode 100644 pkgs/development/python-modules/mysql_python/default.nix

diff --git a/pkgs/development/python-modules/mysql_python/default.nix b/pkgs/development/python-modules/mysql_python/default.nix
deleted file mode 100644
index 0ab11521cc8..00000000000
--- a/pkgs/development/python-modules/mysql_python/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv
-, buildPythonPackage
-, isPy3k
-, fetchPypi
-, nose
-, pkgs
-}:
-
-buildPythonPackage rec {
-  pname = "MySQL-python";
-  version = "1.2.5";
-  disabled = isPy3k;
-
-  src = fetchPypi {
-    inherit pname version;
-    extension = "zip";
-    sha256 = "0x0c2jg0bb3pp84njaqiic050qkyd7ymwhfvhipnimg58yv40441";
-  };
-
-  checkInputs = [ nose ];
-  nativeBuildInputs = [ pkgs.mysql.connector-c ];
-  buildInputs = [ pkgs.mysql.connector-c ];
-
-  # plenty of failing tests
-  doCheck = false;
-
-  meta = with stdenv.lib; {
-    description = "MySQL database binding for Python";
-    homepage = https://sourceforge.net/projects/mysql-python;
-    license = licenses.gpl3;
-  };
-
-}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6e936afd5ea..c010555d28c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3873,8 +3873,6 @@ in {
 
   monotonic = callPackage ../development/python-modules/monotonic { };
 
-  MySQL_python = callPackage ../development/python-modules/mysql_python { };
-
   mysql-connector = callPackage ../development/python-modules/mysql-connector { };
 
   namebench = callPackage ../development/python-modules/namebench { };
-- 
GitLab


From cfb909229dd4c82441ddbf6d904def2057b62678 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Sat, 17 Aug 2019 21:15:45 +0300
Subject: [PATCH 0082/2254] mariadb-connector-c: move to external package

---
 pkgs/servers/sql/mariadb/connector-c/2_3.nix  |  6 +++
 .../sql/mariadb/connector-c/default.nix       | 49 +++++++++++++++++++
 pkgs/servers/sql/mariadb/default.nix          | 42 ----------------
 pkgs/top-level/all-packages.nix               |  3 ++
 4 files changed, 58 insertions(+), 42 deletions(-)
 create mode 100644 pkgs/servers/sql/mariadb/connector-c/2_3.nix
 create mode 100644 pkgs/servers/sql/mariadb/connector-c/default.nix

diff --git a/pkgs/servers/sql/mariadb/connector-c/2_3.nix b/pkgs/servers/sql/mariadb/connector-c/2_3.nix
new file mode 100644
index 00000000000..5a256887cba
--- /dev/null
+++ b/pkgs/servers/sql/mariadb/connector-c/2_3.nix
@@ -0,0 +1,6 @@
+{ callPackage, ... } @ args:
+
+callPackage ./. (args // {
+  version = "2.3.7";
+  sha256 = "13izi35vvxhiwl2dsnqrz75ciisy2s2k30giv7hrm01qlwnmiycl";
+})
diff --git a/pkgs/servers/sql/mariadb/connector-c/default.nix b/pkgs/servers/sql/mariadb/connector-c/default.nix
new file mode 100644
index 00000000000..ed49d40180f
--- /dev/null
+++ b/pkgs/servers/sql/mariadb/connector-c/default.nix
@@ -0,0 +1,49 @@
+{ stdenv, fetchurl, cmake
+, openssl, zlib
+, libiconv
+, version, sha256, ...
+}:
+
+with stdenv.lib;
+
+stdenv.mkDerivation {
+  pname = "mariadb-connector-c";
+  inherit version;
+
+  src = fetchurl {
+    urls = [
+      "https://downloads.mariadb.org/f/connector-c-${version}/mariadb-connector-c-${version}-src.tar.gz"
+      "https://downloads.mariadb.com/Connectors/c/connector-c-${version}/mariadb-connector-c-${version}-src.tar.gz"
+    ];
+    inherit sha256;
+  };
+
+  cmakeFlags = [
+    "-DWITH_EXTERNAL_ZLIB=ON"
+    "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock"
+  ];
+
+  # The cmake setup-hook uses $out/lib by default, this is not the case here.
+  preConfigure = optionalString stdenv.isDarwin ''
+    cmakeFlagsArray+=("-DCMAKE_INSTALL_NAME_DIR=$out/lib/mariadb")
+  '';
+
+  nativeBuildInputs = [ cmake ];
+  propagatedBuildInputs = [ openssl zlib ];
+  buildInputs = [ libiconv ];
+
+  enableParallelBuilding = true;
+
+  postFixup = ''
+    ln -sv mariadb_config $out/bin/mysql_config
+    ln -sv mariadb $out/lib/mysql
+    ln -sv mariadb $out/include/mysql
+  '';
+
+  meta = {
+    description = "Client library that can be used to connect to MySQL or MariaDB";
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ globin ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index ac14015c4cf..2e5e117bc0d 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -18,7 +18,6 @@ mytopEnv = perl.withPackages (p: with p; [ DataDumper DBDmysql DBI TermReadKey ]
 mariadb = server // {
   inherit client; # MariaDB Client
   server = server; # MariaDB Server
-  inherit connector-c; # libmysqlclient.so
   inherit galera;
 };
 
@@ -217,47 +216,6 @@ server = stdenv.mkDerivation (common // {
   CXXFLAGS = optionalString stdenv.isi686 "-fpermissive";
 });
 
-connector-c = stdenv.mkDerivation rec {
-  pname = "mariadb-connector-c";
-  version = "2.3.7";
-
-  src = fetchurl {
-    url = "https://downloads.mariadb.org/interstitial/connector-c-${version}/mariadb-connector-c-${version}-src.tar.gz/from/http%3A//nyc2.mirrors.digitalocean.com/mariadb/";
-    sha256 = "13izi35vvxhiwl2dsnqrz75ciisy2s2k30giv7hrm01qlwnmiycl";
-    name   = "mariadb-connector-c-${version}-src.tar.gz";
-  };
-
-  # outputs = [ "dev" "out" ]; FIXME: cmake variables don't allow that < 3.0
-  cmakeFlags = [
-    "-DWITH_EXTERNAL_ZLIB=ON"
-    "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock"
-  ];
-
-  # The cmake setup-hook uses $out/lib by default, this is not the case here.
-  preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
-    cmakeFlagsArray+=("-DCMAKE_INSTALL_NAME_DIR=$out/lib/mariadb")
-  '';
-
-  nativeBuildInputs = [ cmake ];
-  propagatedBuildInputs = [ openssl zlib ];
-  buildInputs = [ libiconv ];
-
-  enableParallelBuilding = true;
-
-  postFixup = ''
-    ln -sv mariadb_config $out/bin/mysql_config
-    ln -sv mariadb $out/lib/mysql
-    ln -sv mariadb $out/include/mysql
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Client library that can be used to connect to MySQL or MariaDB";
-    license = licenses.lgpl21;
-    maintainers = with maintainers; [ globin ];
-    platforms = platforms.all;
-  };
-};
-
 galera = stdenv.mkDerivation rec {
   pname = "mariadb-galera";
   version = "25.3.26";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2021ec720a7..560ee97e946 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14886,6 +14886,9 @@ in
 
   rpcbind = callPackage ../servers/rpcbind { };
 
+  mariadb-connector-c = mariadb-connector-c_2_3;
+  mariadb-connector-c_2_3 = callPackage ../servers/sql/mariadb/connector-c/2_3.nix { };
+
   mariadb = callPackage ../servers/sql/mariadb {
     asio = asio_1_10;
     # As per mariadb's cmake, "static jemalloc_pic.a can only be used up to jemalloc 4".
-- 
GitLab


From 329a88efa78126ae7413807ce58000eab49e82d9 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Sat, 17 Aug 2019 21:24:29 +0300
Subject: [PATCH 0083/2254] treewide: replace mysql.connector-c to
 libmysqlclient

---
 pkgs/applications/gis/grass/default.nix              |  8 ++++----
 pkgs/applications/office/kexi/default.nix            |  4 ++--
 pkgs/applications/office/libreoffice/default.nix     |  4 ++--
 pkgs/applications/office/libreoffice/still.nix       |  4 ++--
 pkgs/applications/science/math/glsurf/default.nix    |  4 ++--
 pkgs/applications/video/kodi/default.nix             |  4 ++--
 pkgs/development/compilers/gerbil/build.nix          |  8 ++++----
 pkgs/development/compilers/hhvm/default.nix          |  4 ++--
 pkgs/development/compilers/neko/default.nix          |  4 ++--
 pkgs/development/compilers/urweb/default.nix         |  8 ++++----
 .../haskell-modules/configuration-nix.nix            |  2 +-
 pkgs/development/interpreters/php/default.nix        |  8 ++++----
 pkgs/development/libraries/cppdb/default.nix         |  6 +++---
 pkgs/development/libraries/gdal/2.4.0.nix            |  4 ++--
 pkgs/development/libraries/gdal/default.nix          |  4 ++--
 pkgs/development/libraries/kdb/default.nix           |  4 ++--
 pkgs/development/libraries/libagar/default.nix       |  6 +++---
 .../development/libraries/libdbi-drivers/default.nix | 10 +++++-----
 pkgs/development/libraries/libgda/default.nix        |  6 +++---
 pkgs/development/libraries/librdf/redland.nix        |  4 ++--
 pkgs/development/libraries/opendbx/default.nix       |  8 ++++----
 pkgs/development/libraries/poco/default.nix          |  6 +++---
 pkgs/development/libraries/qt-3/default.nix          |  6 +++---
 pkgs/development/libraries/qt-4.x/4.8/default.nix    |  6 +++---
 pkgs/development/libraries/qt-5/modules/qtbase.nix   | 12 ++++++------
 pkgs/development/libraries/tntdb/default.nix         |  4 ++--
 .../libraries/unixODBCDrivers/default.nix            |  6 +++---
 pkgs/development/libraries/wt/default.nix            |  6 +++---
 .../lisp-modules/quicklisp-to-nix-overrides.nix      |  8 ++++----
 pkgs/development/lisp-modules/shell.nix              |  4 ++--
 pkgs/development/lua-modules/overrides.nix           |  6 +++---
 pkgs/development/ocaml-modules/mysql/default.nix     |  4 ++--
 pkgs/development/perl-modules/DBD-mysql/default.nix  |  4 ++--
 pkgs/development/pure-modules/glpk/default.nix       |  6 +++---
 .../python-modules/mysqlclient/default.nix           |  6 +++---
 pkgs/development/r-modules/default.nix               |  4 ++--
 pkgs/development/ruby-modules/gem-config/default.nix |  6 +++---
 pkgs/development/tools/misc/sysbench/default.nix     |  4 ++--
 pkgs/development/tools/tora/default.nix              |  6 +++---
 pkgs/games/zod/default.nix                           |  6 +++---
 pkgs/servers/clickhouse/default.nix                  |  4 ++--
 pkgs/servers/computing/slurm/default.nix             |  4 ++--
 pkgs/servers/freeradius/default.nix                  |  6 +++---
 pkgs/servers/http/lighttpd/default.nix               |  6 +++---
 pkgs/servers/mail/dovecot/default.nix                |  4 ++--
 pkgs/servers/mail/exim/default.nix                   | 12 ++++++------
 pkgs/servers/mail/opensmtpd/extras.nix               |  6 +++---
 pkgs/servers/mail/postfix/default.nix                |  6 +++---
 pkgs/servers/monitoring/plugins/default.nix          |  4 ++--
 pkgs/servers/monitoring/zabbix/proxy.nix             |  4 ++--
 pkgs/servers/monitoring/zabbix/server.nix            |  4 ++--
 pkgs/servers/uwsgi/default.nix                       |  4 ++--
 pkgs/tools/backup/bareos/default.nix                 |  8 ++++----
 pkgs/tools/backup/mydumper/default.nix               |  4 ++--
 pkgs/tools/networking/kea/default.nix                |  6 +++---
 pkgs/tools/networking/mailutils/default.nix          |  8 ++++----
 pkgs/tools/networking/maxscale/default.nix           |  6 +++---
 pkgs/tools/security/thc-hydra/default.nix            |  4 ++--
 pkgs/tools/system/collectd/default.nix               |  4 ++--
 pkgs/tools/system/rsyslog/default.nix                |  6 +++---
 pkgs/top-level/aliases.nix                           |  2 +-
 pkgs/top-level/all-packages.nix                      |  9 +++++----
 62 files changed, 173 insertions(+), 172 deletions(-)

diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix
index 360d94d1b82..562a5e616a3 100644
--- a/pkgs/applications/gis/grass/default.nix
+++ b/pkgs/applications/gis/grass/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, flex, bison, pkgconfig, zlib, libtiff, libpng, fftw
 , cairo, readline, ffmpeg, makeWrapper, wxGTK30, netcdf, blas
-, proj, gdal, geos, sqlite, postgresql, mysql, python2Packages, libLAS, proj-datumgrid
+, proj, gdal, geos, sqlite, postgresql, libmysqlclient, python2Packages, libLAS, proj-datumgrid
 }:
 
 stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite cairo proj
-  readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql mysql.connector-c blas
+  readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql libmysqlclient blas
   libLAS proj-datumgrid ]
     ++ (with python2Packages; [ python dateutil wxPython30 numpy ]);
 
@@ -37,8 +37,8 @@ stdenv.mkDerivation rec {
     "--with-postgres-libs=${postgresql.lib}/lib/"
     # it complains about missing libmysqld but doesn't really seem to need it
     "--with-mysql"
-    "--with-mysql-includes=${mysql.connector-c}/include/mysql"
-    "--with-mysql-libs=${mysql.connector-c}/lib/mysql"
+    "--with-mysql-includes=${libmysqlclient}/include/mysql"
+    "--with-mysql-libs=${libmysqlclient}/lib/mysql"
     "--with-blas"
     "--with-liblas=${libLAS}/bin/liblas-config"
   ];
diff --git a/pkgs/applications/office/kexi/default.nix b/pkgs/applications/office/kexi/default.nix
index adad5c8680f..a4d8318d49a 100644
--- a/pkgs/applications/office/kexi/default.nix
+++ b/pkgs/applications/office/kexi/default.nix
@@ -4,7 +4,7 @@
   breeze-icons, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets, kcoreaddons,
   kcrash, kguiaddons, ki18n, kiconthemes, kitemviews, kio, ktexteditor, ktextwidgets,
   kwidgetsaddons, kxmlgui,
-  kdb, kproperty, kreport, lcms2, mysql, marble, postgresql
+  kdb, kproperty, kreport, lcms2, libmysqlclient, marble, postgresql
 }:
 
 mkDerivation rec {
@@ -23,7 +23,7 @@ mkDerivation rec {
     breeze-icons karchive kcodecs kcompletion kconfig kconfigwidgets kcoreaddons
     kcrash kguiaddons ki18n kiconthemes kitemviews kio ktexteditor ktextwidgets
     kwidgetsaddons kxmlgui
-    kdb kproperty kreport lcms2 mysql.connector-c marble postgresql
+    kdb kproperty kreport lcms2 libmysqlclient marble postgresql
   ];
 
   propagatedUserEnvPkgs = [ kproperty ];
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index f5f53e10496..a459302177b 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -4,7 +4,7 @@
 , bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which
 , icu, boost, jdk, ant, cups, xorg, libcmis, fontforge
 , openssl, gperf, cppunit, GConf, ORBit2, poppler, utillinux
-, librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw, mysql
+, librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw, libmysqlclient
 , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
 , libwpg, dbus-glib, qt4, clucene_core, libcdr, lcms, vigra
 , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio
@@ -361,7 +361,7 @@ in stdenv.mkDerivation rec {
       libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11
       libXaw libXext libXi libXinerama libxml2 libxslt libXtst
       libXdmcp libpthreadstubs libGLU_combined mythes gst_all_1.gstreamer
-      gst_all_1.gst-plugins-base glib mysql.connector-c
+      gst_all_1.gst-plugins-base glib libmysqlclient
       neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler
       python3 sablotron sane-backends unzip vigra which zip zlib
       mdds bluez5 libcmis libwps libabw libzmf
diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix
index eb774a30941..4739d526558 100644
--- a/pkgs/applications/office/libreoffice/still.nix
+++ b/pkgs/applications/office/libreoffice/still.nix
@@ -4,7 +4,7 @@
 , bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which
 , icu, boost, jdk, ant, cups, xorg, libcmis, fontforge
 , openssl, gperf, cppunit, GConf, ORBit2, poppler, utillinux
-, librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw, mysql
+, librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw, libmysqlclient
 , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
 , libwpg, dbus-glib, qt4, clucene_core, libcdr, lcms, vigra
 , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio
@@ -358,7 +358,7 @@ in stdenv.mkDerivation rec {
       libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11
       libXaw libXext libXi libXinerama libxml2 libxslt libXtst
       libXdmcp libpthreadstubs libGLU_combined mythes gst_all_1.gstreamer
-      gst_all_1.gst-plugins-base glib mysql.connector-c
+      gst_all_1.gst-plugins-base glib libmysqlclient
       neon nspr nss openldap openssl ORBit2 pam perl poppler
       python3 sablotron sane-backends unzip vigra which zip zlib
       mdds bluez5 libcmis libwps libabw libzmf
diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix
index 4de683cdce9..1cd5e364208 100644
--- a/pkgs/applications/science/math/glsurf/default.nix
+++ b/pkgs/applications/science/math/glsurf/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, ocamlPackages, libGLU_combined, freeglut
-, mysql, mpfr, gmp, libtiff, libjpeg, libpng, giflib
+, libmysqlclient, mpfr, gmp, libtiff, libjpeg, libpng, giflib
 }:
 
 stdenv.mkDerivation {
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
     sha256 = "0w8xxfnw2snflz8wdr2ca9f5g91w5vbyp1hwlx1v7vg83d4bwqs7";
   };
 
-  buildInputs = [ freeglut libGLU_combined mysql.connector-c mpfr gmp
+  buildInputs = [ freeglut libGLU_combined libmysqlclient mpfr gmp
     libtiff libjpeg libpng giflib ]
   ++ (with ocamlPackages; [
     ocaml findlib ocaml_mysql lablgl camlimages_4_0 mlgmpidl
diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index 773c63b0036..7953cde2413 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -13,7 +13,7 @@
 , libmpeg2, libsamplerate, libmad
 , libogg, libvorbis, flac, libxslt
 , lzo, libcdio, libmodplug, libass, libbluray
-, sqlite, mysql, nasm, gnutls, libva, libdrm
+, sqlite, libmysqlclient, nasm, gnutls, libva, libdrm
 , curl, bzip2, zip, unzip, glxinfo, xdpyinfo
 , libcec, libcec_platform, dcadec, libuuid
 , libcrossguid, libmicrohttpd
@@ -161,7 +161,7 @@ in stdenv.mkDerivation {
       libmpeg2 libsamplerate libmad
       libogg libvorbis flac libxslt systemd
       lzo libcdio libmodplug libass libbluray
-      sqlite mysql.connector-c avahi lame
+      sqlite libmysqlclient avahi lame
       curl bzip2 zip unzip glxinfo xdpyinfo
       libcec libcec_platform dcadec libuuid
       libgcrypt libgpgerror libunistring
diff --git a/pkgs/development/compilers/gerbil/build.nix b/pkgs/development/compilers/gerbil/build.nix
index 9ef650c330f..b5ccbca6f7e 100644
--- a/pkgs/development/compilers/gerbil/build.nix
+++ b/pkgs/development/compilers/gerbil/build.nix
@@ -1,6 +1,6 @@
 { stdenv, makeStaticLibraries,
   coreutils, rsync, bash,
-  openssl, zlib, sqlite, libxml2, libyaml, mysql, lmdb, leveldb, postgresql,
+  openssl, zlib, sqlite, libxml2, libyaml, libmysqlclient, lmdb, leveldb, postgresql,
   version, git-version, gambit, src }:
 
 # TODO: distinct packages for gerbil-release and gerbil-devel
@@ -12,13 +12,13 @@ stdenv.mkDerivation rec {
   inherit src;
 
   # Use makeStaticLibraries to enable creation of statically linked binaries
-  buildInputs_libraries = [ openssl zlib sqlite libxml2 libyaml mysql.connector-c lmdb leveldb postgresql ];
+  buildInputs_libraries = [ openssl zlib sqlite libxml2 libyaml libmysqlclient lmdb leveldb postgresql ];
   buildInputs_staticLibraries = map makeStaticLibraries buildInputs_libraries;
 
   buildInputs = [ gambit rsync bash ]
     ++ buildInputs_libraries ++ buildInputs_staticLibraries;
 
-  NIX_CFLAGS_COMPILE = [ "-I${mysql.connector-c}/include/mysql" "-L${mysql.connector-c}/lib/mysql" ];
+  NIX_CFLAGS_COMPILE = [ "-I${libmysqlclient}/include/mysql" "-L${libmysqlclient}/lib/mysql" ];
 
   postPatch = ''
     echo '(define (gerbil-version-string) "v${git-version}")' > src/gerbil/runtime/gx-version.scm
@@ -40,7 +40,7 @@ ZLIB=${makeStaticLibraries zlib}/lib/libz.a
 # SQLITE=${makeStaticLibraries sqlite}/lib/sqlite.a # MISSING!
 # LIBXML2=${makeStaticLibraries libxml2}/lib/libxml2.a # MISSING!
 # YAML=${makeStaticLibraries libyaml}/lib/libyaml.a # MISSING!
-MYSQL=${makeStaticLibraries mysql.connector-c}/lib/mariadb/libmariadb.a
+MYSQL=${makeStaticLibraries libmysqlclient}/lib/mariadb/libmariadb.a
 # LMDB=${makeStaticLibraries lmdb}/lib/mysql/libmysqlclient_r.a # MISSING!
 LEVELDB=${makeStaticLibraries lmdb}/lib/libleveldb.a
 EOF
diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix
index 24e88f9ee2e..7066744bb54 100644
--- a/pkgs/development/compilers/hhvm/default.nix
+++ b/pkgs/development/compilers/hhvm/default.nix
@@ -2,7 +2,7 @@
 , pcre, libevent, gd, curl, libxml2, icu, flex, bison, openssl, zlib, php
 , expat, libcap, oniguruma, libdwarf, libmcrypt, tbb, gperftools, glog, libkrb5
 , bzip2, openldap, readline, libelf, uwimap, binutils, cyrus_sasl, pam, libpng
-, libxslt, freetype, gdb, git, perl, mysql, gmp, libyaml, libedit
+, libxslt, freetype, gdb, git, perl, libmysqlclient, gmp, libyaml, libedit
 , libvpx, imagemagick, fribidi, gperf, which, ocamlPackages
 }:
 
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs =
-    [ cmake pkgconfig boost libunwind mysql.connector-c libmemcached pcre gdb git perl
+    [ cmake pkgconfig boost libunwind libmysqlclient libmemcached pcre gdb git perl
       libevent gd curl libxml2 icu flex bison openssl zlib php expat libcap
       oniguruma libdwarf libmcrypt tbb gperftools bzip2 openldap readline
       libelf uwimap binutils cyrus_sasl pam glog libpng libxslt libkrb5
diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/development/compilers/neko/default.nix
index 74ccaac388f..79c4aacbed5 100644
--- a/pkgs/development/compilers/neko/default.nix
+++ b/pkgs/development/compilers/neko/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, boehmgc, zlib, sqlite, pcre, cmake, pkgconfig
-, git, apacheHttpd, apr, aprutil, mysql, mbedtls, openssl, pkgs, gtk2, libpthreadstubs
+, git, apacheHttpd, apr, aprutil, libmysqlclient, mbedtls, openssl, pkgs, gtk2, libpthreadstubs
 }:
 
 stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake pkgconfig git ];
   buildInputs =
     [ boehmgc zlib sqlite pcre apacheHttpd apr aprutil
-      mysql.connector-c mbedtls openssl libpthreadstubs ]
+      libmysqlclient mbedtls openssl libpthreadstubs ]
       ++ stdenv.lib.optional stdenv.isLinux gtk2
       ++ stdenv.lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.Security
                                                 pkgs.darwin.apple_sdk.frameworks.Carbon];
diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix
index 01d4972a55d..31381aac741 100644
--- a/pkgs/development/compilers/urweb/default.nix
+++ b/pkgs/development/compilers/urweb/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, file, openssl, mlton
-, mysql, postgresql, sqlite, gcc, icu
+, libmysqlclient, postgresql, sqlite, gcc, icu
 }:
 
 stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "1cl0x0sy7w1lazszc8q06q3wx0x0rczxh27vimrsw54s6s9y096s";
   };
 
-  buildInputs = [ openssl mlton mysql.connector-c postgresql sqlite icu ];
+  buildInputs = [ openssl mlton libmysqlclient postgresql sqlite icu ];
 
   prePatch = ''
     sed -e 's@/usr/bin/file@${file}/bin/file@g' -i configure
@@ -21,13 +21,13 @@ stdenv.mkDerivation rec {
 
   preConfigure = ''
     export PGHEADER="${postgresql}/include/libpq-fe.h";
-    export MSHEADER="${mysql.connector-c}/include/mysql/mysql.h";
+    export MSHEADER="${libmysqlclient}/include/mysql/mysql.h";
     export SQHEADER="${sqlite.dev}/include/sqlite3.h";
 
     export CC="${gcc}/bin/gcc";
     export CCARGS="-I$out/include \
                    -L${openssl.out}/lib \
-                   -L${mysql.connector-c}/lib \
+                   -L${libmysqlclient}/lib \
                    -L${postgresql.lib}/lib \
                    -L${sqlite.out}/lib";
   '';
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 29483b56a7d..6a78286fc10 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -53,7 +53,7 @@ self: super: builtins.intersectAttrs super {
 
   # Use the default version of mysql to build this package (which is actually mariadb).
   # test phase requires networking
-  mysql = dontCheck (super.mysql.override { mysql = pkgs.mysql.connector-c; });
+  mysql = dontCheck (super.mysql.override { mysql = pkgs.libmysqlclient; });
 
   # CUDA needs help finding the SDK headers and libraries.
   cuda = overrideCabal super.cuda (drv: {
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 9a82868b7b3..508339d0da6 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -1,6 +1,6 @@
 # pcre functionality is tested in nixos/tests/php-pcre.nix
 { lib, stdenv, fetchurl, autoconf, bison, libtool, pkgconfig, re2c
-, mysql, libxml2, readline, zlib, curl, postgresql, gettext
+, libmysqlclient, libxml2, readline, zlib, curl, postgresql, gettext
 , openssl, pcre, pcre2, sqlite, config, libjpeg, libpng, freetype
 , libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, unixODBC
 , uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium, html-tidy, libargon2
@@ -64,7 +64,7 @@ let
   }:
 
     let
-      mysqlBuildInputs = optional (!mysqlndSupport) mysql.connector-c;
+      mysqlBuildInputs = optional (!mysqlndSupport) libmysqlclient;
       libmcrypt' = libmcrypt.override { disablePosixThreads = true; };
     in stdenv.mkDerivation {
 
@@ -149,9 +149,9 @@ let
       ++ optional postgresqlSupport "--with-pgsql=${postgresql}"
       ++ optional pdo_odbcSupport "--with-pdo-odbc=unixODBC,${unixODBC}"
       ++ optional pdo_pgsqlSupport "--with-pdo-pgsql=${postgresql}"
-      ++ optional pdo_mysqlSupport "--with-pdo-mysql=${if mysqlndSupport then "mysqlnd" else mysql.connector-c}"
+      ++ optional pdo_mysqlSupport "--with-pdo-mysql=${if mysqlndSupport then "mysqlnd" else libmysqlclient}"
       ++ optionals mysqliSupport [
-        "--with-mysqli=${if mysqlndSupport then "mysqlnd" else "${mysql.connector-c}/bin/mysql_config"}"
+        "--with-mysqli=${if mysqlndSupport then "mysqlnd" else "${libmysqlclient}/bin/mysql_config"}"
       ]
       ++ optional ( pdo_mysqlSupport || mysqliSupport ) "--with-mysql-sock=/run/mysqld/mysqld.sock"
       ++ optional bcmathSupport "--enable-bcmath"
diff --git a/pkgs/development/libraries/cppdb/default.nix b/pkgs/development/libraries/cppdb/default.nix
index 737122c57bf..a21b3cc93fa 100644
--- a/pkgs/development/libraries/cppdb/default.nix
+++ b/pkgs/development/libraries/cppdb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, sqlite, mysql, postgresql, unixODBC }:
+{ stdenv, fetchurl, cmake, sqlite, libmysqlclient, postgresql, unixODBC }:
 
 stdenv.mkDerivation rec {
   pname = "cppdb";
@@ -11,10 +11,10 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  buildInputs = [ cmake sqlite mysql.connector-c postgresql unixODBC ];
+  buildInputs = [ cmake sqlite libmysqlclient postgresql unixODBC ];
 
   cmakeFlags = [ "--no-warn-unused-cli" ];
-  NIX_CFLAGS_COMPILE = [ "-I${mysql.connector-c}/include/mysql" "-L${mysql.connector-c}/lib/mysql" ];
+  NIX_CFLAGS_COMPILE = [ "-I${libmysqlclient}/include/mysql" "-L${libmysqlclient}/lib/mysql" ];
 
   meta = with stdenv.lib; {
     homepage = http://cppcms.com/sql/cppdb/;
diff --git a/pkgs/development/libraries/gdal/2.4.0.nix b/pkgs/development/libraries/gdal/2.4.0.nix
index baf847d4e0a..d41b4c55f86 100644
--- a/pkgs/development/libraries/gdal/2.4.0.nix
+++ b/pkgs/development/libraries/gdal/2.4.0.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchpatch, unzip, libjpeg, libtiff, zlib
-, postgresql, mysql, libgeotiff, pythonPackages, proj, geos, openssl
+, postgresql, libmysqlclient, libgeotiff, pythonPackages, proj, geos, openssl
 , libpng, sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat
 , libiconv, libxml2
 , netcdfSupport ? true, netcdf, hdf5, curl
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     "--with-poppler=${poppler.dev}" # optional
     "--with-libz=${zlib.dev}"       # optional
     "--with-pg=${postgresql}/bin/pg_config"
-    "--with-mysql=${mysql.connector-c or mysql}/bin/mysql_config"
+    "--with-mysql=${libmysqlclient}/bin/mysql_config"
     "--with-geotiff=${libgeotiff.dev}"
     "--with-sqlite3=${sqlite.dev}"
     "--with-spatialite=${libspatialite}"
diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix
index 413d4e19dde..bb53277075f 100644
--- a/pkgs/development/libraries/gdal/default.nix
+++ b/pkgs/development/libraries/gdal/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, fetchpatch, unzip, libjpeg, libtiff, zlib
-, postgresql, mysql, libgeotiff, pythonPackages, proj, geos, openssl
+, postgresql, libmysqlclient, libgeotiff, pythonPackages, proj, geos, openssl
 , libpng, sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat
 , libiconv, libxml2, autoreconfHook
 , netcdfSupport ? true, netcdf, hdf5, curl
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     "--with-poppler=${poppler.dev}" # optional
     "--with-libz=${zlib.dev}"       # optional
     "--with-pg=${postgresql}/bin/pg_config"
-    "--with-mysql=${mysql.connector-c or mysql}/bin/mysql_config"
+    "--with-mysql=${libmysqlclient}/bin/mysql_config"
     "--with-geotiff=${libgeotiff}"
     "--with-sqlite3=${sqlite.dev}"
     "--with-spatialite=${libspatialite}"
diff --git a/pkgs/development/libraries/kdb/default.nix b/pkgs/development/libraries/kdb/default.nix
index 4a403a19964..03eabc6447b 100644
--- a/pkgs/development/libraries/kdb/default.nix
+++ b/pkgs/development/libraries/kdb/default.nix
@@ -1,7 +1,7 @@
 {
   mkDerivation, lib, fetchurl,
   extra-cmake-modules,
-  qtbase, qttranslations, kcoreaddons, python2, sqlite, postgresql, mysql
+  qtbase, qttranslations, kcoreaddons, python2, sqlite, postgresql, libmysqlclient
 }:
 
 mkDerivation rec {
@@ -15,7 +15,7 @@ mkDerivation rec {
 
   nativeBuildInputs = [ extra-cmake-modules ];
 
-  buildInputs = [ qttranslations kcoreaddons python2 sqlite postgresql mysql.connector-c ];
+  buildInputs = [ qttranslations kcoreaddons python2 sqlite postgresql libmysqlclient ];
 
   propagatedBuildInputs = [ qtbase ];
 
diff --git a/pkgs/development/libraries/libagar/default.nix b/pkgs/development/libraries/libagar/default.nix
index 48fb0f1153e..630b1712158 100644
--- a/pkgs/development/libraries/libagar/default.nix
+++ b/pkgs/development/libraries/libagar/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, libtool, perl, bsdbuild, gettext, mandoc
 , libpng, libjpeg, xlibsWrapper, libXinerama, freetype, SDL, libGLU_combined
-, libsndfile, portaudio, mysql, fontconfig
+, libsndfile, portaudio, libmysqlclient, fontconfig
 }:
 
 let srcs = import ./srcs.nix { inherit fetchurl; }; in
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
     "--with-gettext=${gettext}"
     "--with-jpeg=${libjpeg.dev}"
     "--with-gl=${libGLU_combined}"
-    "--with-mysql=${mysql.connector-c}"
+    "--with-mysql=${libmysqlclient}"
     "--with-manpages=yes"
   ];
 
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ pkgconfig libtool gettext ];
 
   buildInputs = [
-    bsdbuild perl xlibsWrapper libXinerama SDL libGLU_combined mysql.connector-c mandoc
+    bsdbuild perl xlibsWrapper libXinerama SDL libGLU_combined libmysqlclient mandoc
     freetype.dev libpng libjpeg.dev fontconfig portaudio libsndfile
   ];
 
diff --git a/pkgs/development/libraries/libdbi-drivers/default.nix b/pkgs/development/libraries/libdbi-drivers/default.nix
index 99cd636b03b..52b8a32fab4 100644
--- a/pkgs/development/libraries/libdbi-drivers/default.nix
+++ b/pkgs/development/libraries/libdbi-drivers/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, libdbi
-, mysql ? null
+, libmysqlclient ? null
 , sqlite ? null
 , postgresql ? null
 }:
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "0m680h8cc4428xin4p733azysamzgzcmv4psjvraykrsaz6ymlj3";
   };
 
-  buildInputs = [ libdbi sqlite postgresql ] ++ optional (mysql != null) mysql.connector-c;
+  buildInputs = [ libdbi sqlite postgresql ] ++ optional (libmysqlclient != null) libmysqlclient;
 
   postPatch = ''
     sed -i '/SQLITE3_LIBS/ s/-lsqlite/-lsqlite3/' configure;
@@ -26,10 +26,10 @@ stdenv.mkDerivation rec {
     "--enable-libdbi"
     "--with-dbi-incdir=${libdbi}/include"
     "--with-dbi-libdir=${libdbi}/lib"
-  ] ++ optionals (mysql != null) [
+  ] ++ optionals (libmysqlclient != null) [
     "--with-mysql"
-    "--with-mysql-incdir=${mysql.connector-c}/include/mysql"
-    "--with-mysql-libdir=${mysql.connector-c}/lib/mysql"
+    "--with-mysql-incdir=${libmysqlclient}/include/mysql"
+    "--with-mysql-libdir=${libmysqlclient}/lib/mysql"
   ] ++ optionals (sqlite != null) [
     "--with-sqlite3"
     "--with-sqlite3-incdir=${sqlite.dev}/include/sqlite"
diff --git a/pkgs/development/libraries/libgda/default.nix b/pkgs/development/libraries/libgda/default.nix
index bb6402dc428..27032607996 100644
--- a/pkgs/development/libraries/libgda/default.nix
+++ b/pkgs/development/libraries/libgda/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl, gnome3, gobject-introspection, vala, libgee
 , overrideCC, gcc6
-, mysqlSupport ? false, mysql ? null
+, mysqlSupport ? false, libmysqlclient ? null
 , postgresSupport ? false, postgresql ? null
 }:
 
-assert mysqlSupport -> mysql != null;
+assert mysqlSupport -> libmysqlclient != null;
 assert postgresSupport -> postgresql != null;
 
 (if stdenv.isAarch64 then overrideCC stdenv gcc6 else stdenv).mkDerivation rec {
@@ -25,7 +25,7 @@ assert postgresSupport -> postgresql != null;
 
   nativeBuildInputs = [ pkgconfig intltool itstool libxml2 gobject-introspection vala ];
   buildInputs = with stdenv.lib; [ gtk3 openssl libgee ]
-    ++ optional (mysqlSupport) mysql.connector-c
+    ++ optional (mysqlSupport) libmysqlclient
     ++ optional (postgresSupport) postgresql;
 
   passthru = {
diff --git a/pkgs/development/libraries/librdf/redland.nix b/pkgs/development/libraries/librdf/redland.nix
index 30d8d8a94e9..8835490187d 100644
--- a/pkgs/development/libraries/librdf/redland.nix
+++ b/pkgs/development/libraries/librdf/redland.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, openssl, libxslt, perl
 , curl, pcre, libxml2, librdf_rasqal, gmp
-, mysql, withMysql ? false
+, libmysqlclient, withMysql ? false
 , postgresql, withPostgresql ? false
 , sqlite, withSqlite ? true
 , db, withBdb ? false
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ perl pkgconfig ];
 
   buildInputs = [ openssl libxslt curl pcre libxml2 gmp ]
-    ++ stdenv.lib.optional withMysql mysql.connector-c
+    ++ stdenv.lib.optional withMysql libmysqlclient
     ++ stdenv.lib.optional withSqlite sqlite
     ++ stdenv.lib.optional withPostgresql postgresql
     ++ stdenv.lib.optional withBdb db;
diff --git a/pkgs/development/libraries/opendbx/default.nix b/pkgs/development/libraries/opendbx/default.nix
index f954aaf7245..16ec6a5c110 100644
--- a/pkgs/development/libraries/opendbx/default.nix
+++ b/pkgs/development/libraries/opendbx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, readline, mysql, postgresql, sqlite }:
+{ stdenv, fetchurl, readline, libmysqlclient, postgresql, sqlite }:
 
 stdenv.mkDerivation rec {
   name = "opendbx-1.4.6";
@@ -9,12 +9,12 @@ stdenv.mkDerivation rec {
   };
 
   preConfigure = ''
-    export CPPFLAGS="-I${mysql.connector-c}/include/mysql"
-    export LDFLAGS="-L${mysql.connector-c}/lib/mysql -L${postgresql}/lib"
+    export CPPFLAGS="-I${libmysqlclient}/include/mysql"
+    export LDFLAGS="-L${libmysqlclient}/lib/mysql -L${postgresql}/lib"
     configureFlagsArray=(--with-backends="mysql pgsql sqlite3")
   '';
 
-  buildInputs = [ readline mysql.connector-c postgresql sqlite ];
+  buildInputs = [ readline libmysqlclient postgresql sqlite ];
 
   meta = with stdenv.lib; {
     description = "Extremely lightweight but extensible database access library written in C";
diff --git a/pkgs/development/libraries/poco/default.nix b/pkgs/development/libraries/poco/default.nix
index c19e343f19a..e69ed0236f4 100644
--- a/pkgs/development/libraries/poco/default.nix
+++ b/pkgs/development/libraries/poco/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, pkgconfig, zlib, pcre, expat, sqlite, openssl, unixODBC, mysql }:
+{ stdenv, fetchurl, cmake, pkgconfig, zlib, pcre, expat, sqlite, openssl, unixODBC, libmysqlclient }:
 
 stdenv.mkDerivation rec {
   pname = "poco";
@@ -12,9 +12,9 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake pkgconfig ];
 
-  buildInputs = [ zlib pcre expat sqlite openssl unixODBC mysql.connector-c ];
+  buildInputs = [ zlib pcre expat sqlite openssl unixODBC libmysqlclient ];
 
-  MYSQL_DIR = mysql.connector-c;
+  MYSQL_DIR = libmysqlclient;
   MYSQL_INCLUDE_DIR = "${MYSQL_DIR}/include/mysql";
 
   cmakeFlags = [
diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix
index 3b3f406485c..a46dcec0312 100644
--- a/pkgs/development/libraries/qt-3/default.nix
+++ b/pkgs/development/libraries/qt-3/default.nix
@@ -5,7 +5,7 @@
 , xineramaSupport ? true, libXinerama ? null
 , cursorSupport ? true, libXcursor ? null
 , threadSupport ? true
-, mysqlSupport ? false, mysql ? null
+, mysqlSupport ? false, libmysqlclient ? null
 , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
 , openglSupport ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
 , libGLU_combined ? null, libXmu ? null
@@ -16,7 +16,7 @@ assert xftSupport -> libXft != null;
 assert xrenderSupport -> xftSupport && libXrender != null;
 assert xrandrSupport -> libXrandr != null;
 assert cursorSupport -> libXcursor != null;
-assert mysqlSupport -> mysql != null;
+assert mysqlSupport -> libmysqlclient != null;
 assert openglSupport -> libGLU_combined != null && libXmu != null;
 
 stdenv.mkDerivation {
@@ -62,7 +62,7 @@ stdenv.mkDerivation {
   ] ++ stdenv.lib.optionals cursorSupport [
     "-L${libXcursor.out}/lib -I${libXcursor.dev}/include"
   ] ++ stdenv.lib.optionals mysqlSupport [
-    "-qt-sql-mysql" "-L${mysql.connector-c}/lib/mysql" "-I${mysql.connector-c}/include/mysql"
+    "-qt-sql-mysql" "-L${libmysqlclient}/lib/mysql" "-I${libmysqlclient}/include/mysql"
   ] ++ stdenv.lib.optionals xftSupport [
     "-L${libXft.out}/lib" "-I${libXft.dev}/include"
     "-L${libXft.freetype.out}/lib" "-I${libXft.freetype.dev}/include"
diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix
index b5a10e8f11a..7c7f8f51de7 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -2,7 +2,7 @@
 , libXrender, libXinerama, libXcursor, libXv, libXext
 , libXfixes, libXrandr, libSM, freetype, fontconfig, zlib, libjpeg, libpng
 , libmng, which, libGLU, openssl, dbus, cups, pkgconfig
-, libtiff, glib, icu, mysql, postgresql, sqlite, perl, coreutils, libXi
+, libtiff, glib, icu, libmysqlclient, postgresql, sqlite, perl, coreutils, libXi
 , buildMultimedia ? stdenv.isLinux, alsaLib, gstreamer, gst-plugins-base
 , buildWebkit ? (stdenv.isLinux || stdenv.isDarwin)
 , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
@@ -166,7 +166,7 @@ stdenv.mkDerivation rec {
     (mk (!stdenv.isFreeBSD) "opengl") "-xrender" "-xrandr" "-xinerama" "-xcursor" "-xinput" "-xfixes" "-fontconfig"
     "-qdbus" (mk (cups != null) "cups") "-glib" "-dbus-linked" "-openssl-linked"
 
-    "-${if mysql != null then "plugin" else "no"}-sql-mysql" "-system-sqlite"
+    "-${if libmysqlclient != null then "plugin" else "no"}-sql-mysql" "-system-sqlite"
 
     "-exceptions" "-xmlpatterns"
 
@@ -192,7 +192,7 @@ stdenv.mkDerivation rec {
   buildInputs =
     [ cups # Qt dlopen's libcups instead of linking to it
       postgresql sqlite libjpeg libmng libtiff icu ]
-    ++ lib.optionals (mysql != null) [ mysql.connector-c ]
+    ++ lib.optionals (libmysqlclient != null) [ libmysqlclient ]
     ++ lib.optionals gtkStyle [ gtk2 gdk-pixbuf ]
     ++ lib.optionals stdenv.isDarwin [ ApplicationServices OpenGL Cocoa AGL libcxx libobjc ];
 
diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix
index e2c71a77062..8119513618b 100644
--- a/pkgs/development/libraries/qt-5/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix
@@ -14,7 +14,7 @@
   zlib,
 
   # optional dependencies
-  cups ? null, mysql ? null, postgresql ? null,
+  cups ? null, libmysqlclient ? null, postgresql ? null,
   withGtk3 ? false, dconf ? null, gtk3 ? null,
 
   # options
@@ -80,7 +80,7 @@ stdenv.mkDerivation {
     )
     ++ lib.optional developerBuild gdb
     ++ lib.optional (cups != null) cups
-    ++ lib.optional (mysql != null) mysql.connector-c
+    ++ lib.optional (libmysqlclient != null) libmysqlclient
     ++ lib.optional (postgresql != null) postgresql;
 
   nativeBuildInputs =
@@ -285,7 +285,7 @@ stdenv.mkDerivation {
       "-L" "${openssl.out}/lib"
       "-I" "${openssl.dev}/include"
       "-system-sqlite"
-      ''-${if mysql != null then "plugin" else "no"}-sql-mysql''
+      ''-${if libmysqlclient != null then "plugin" else "no"}-sql-mysql''
       ''-${if postgresql != null then "plugin" else "no"}-sql-psql''
 
       "-make libs"
@@ -349,9 +349,9 @@ stdenv.mkDerivation {
           "-L" "${cups.lib}/lib"
           "-I" "${cups.dev}/include"
         ]
-        ++ lib.optionals (mysql != null) [
-          "-L" "${mysql.out}/lib"
-          "-I" "${mysql.out}/include"
+        ++ lib.optionals (libmysqlclient != null) [
+          "-L" "${libmysqlclient}/lib"
+          "-I" "${libmysqlclient}/include"
         ]
     );
 
diff --git a/pkgs/development/libraries/tntdb/default.nix b/pkgs/development/libraries/tntdb/default.nix
index 13b4e6b97a9..2d6ae3f18ca 100644
--- a/pkgs/development/libraries/tntdb/default.nix
+++ b/pkgs/development/libraries/tntdb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cxxtools, postgresql, mysql, sqlite, zlib, openssl }:
+{ stdenv, fetchurl, cxxtools, postgresql, libmysqlclient, sqlite, zlib, openssl }:
 
 stdenv.mkDerivation rec {
   pname = "tntdb";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0js79dbvkic30bzw1pf26m64vs2ssw2sbj55w1dc0sy69dlv4fh9";
   };
 
-  buildInputs = [ cxxtools postgresql mysql.connector-c sqlite zlib openssl ];
+  buildInputs = [ cxxtools postgresql libmysqlclient sqlite zlib openssl ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix
index b9aa1696d48..cbb8293db11 100644
--- a/pkgs/development/libraries/unixODBCDrivers/default.nix
+++ b/pkgs/development/libraries/unixODBCDrivers/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, unixODBC, cmake, postgresql, mysql, mariadb, sqlite, zlib, libxml2, dpkg, lib, kerberos, curl, libuuid, autoPatchelfHook }:
+{ fetchurl, stdenv, unixODBC, cmake, postgresql, mysql, libmysqlclient, sqlite, zlib, libxml2, dpkg, lib, kerberos, curl, libuuid, autoPatchelfHook }:
 
 # I haven't done any parameter tweaking.. So the defaults provided here might be bad
 
@@ -37,10 +37,10 @@
     };
 
     nativeBuildInputs = [ cmake ];
-    buildInputs = [ unixODBC mariadb.connector-c ];
+    buildInputs = [ unixODBC libmysqlclient ];
 
     cmakeFlags = [
-      "-DMARIADB_INCLUDE_DIR=${mariadb.connector-c}/include/mariadb"
+      "-DMARIADB_INCLUDE_DIR=${libmysqlclient}/include/mariadb"
     ];
 
     passthru = {
diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix
index 958257ffe76..46df656e7bf 100644
--- a/pkgs/development/libraries/wt/default.nix
+++ b/pkgs/development/libraries/wt/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, cmake, boost, pkgconfig, doxygen, qt48Full, libharu
-, pango, fcgi, firebird, mysql, postgresql, graphicsmagick, glew, openssl
+, pango, fcgi, firebird, libmysqlclient, postgresql, graphicsmagick, glew, openssl
 , pcre
 }:
 
@@ -22,7 +22,7 @@ let
       nativeBuildInputs = [ pkgconfig ];
       buildInputs = [
         cmake boost doxygen qt48Full libharu
-        pango fcgi firebird mysql.connector-c postgresql graphicsmagick glew
+        pango fcgi firebird libmysqlclient postgresql graphicsmagick glew
         openssl pcre
       ];
 
@@ -30,7 +30,7 @@ let
         "-DWT_WRASTERIMAGE_IMPLEMENTATION=GraphicsMagick"
         "-DWT_CPP_11_MODE=-std=c++11"
         "-DGM_PREFIX=${graphicsmagick}"
-        "-DMYSQL_PREFIX=${mysql.connector-c}"
+        "-DMYSQL_PREFIX=${libmysqlclient}"
         "--no-warn-unused-cli"
       ];
 
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
index 052bfb11949..acc98215af0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
@@ -53,11 +53,11 @@ in
   cl-async-ssl = addNativeLibs [pkgs.openssl (import ./openssl-lib-marked.nix)];
   cl-async-test = addNativeLibs [pkgs.openssl];
   clsql = x: {
-    propagatedBuildInputs = with pkgs; [mysql.connector-c postgresql sqlite zlib];
+    propagatedBuildInputs = with pkgs; [libmysqlclient postgresql sqlite zlib];
     overrides = y: (x.overrides y) // {
       preConfigure = ((x.overrides y).preConfigure or "") + ''
-        export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.mysql.connector-c}/include/mysql"
-        export NIX_LDFLAGS="$NIX_LDFLAGS -L${pkgs.mysql.connector-c}/lib/mysql"
+        export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.libmysqlclient}/include/mysql"
+        export NIX_LDFLAGS="$NIX_LDFLAGS -L${pkgs.libmysqlclient}/lib/mysql"
       '';
     };
   };
@@ -77,7 +77,7 @@ $out/lib/common-lisp/query-fs"
     };
   };
   cffi = addNativeLibs [pkgs.libffi];
-  cl-mysql = addNativeLibs [pkgs.mysql];
+  cl-mysql = addNativeLibs [pkgs.libmysqlclient];
   cl-ppcre-template = x: {
     overrides = y: (x.overrides y) // {
       postPatch = ''
diff --git a/pkgs/development/lisp-modules/shell.nix b/pkgs/development/lisp-modules/shell.nix
index b3d50b2fb07..4a1f9ded56c 100644
--- a/pkgs/development/lisp-modules/shell.nix
+++ b/pkgs/development/lisp-modules/shell.nix
@@ -6,11 +6,11 @@ self = rec {
   env = buildEnv { name = name; paths = buildInputs; };
   buildInputs = [
     gcc stdenv
-    openssl fuse libuv mysql.connector-c libfixposix libev sqlite
+    openssl fuse libuv libmysqlclient libfixposix libev sqlite
     freetds
     lispPackages.quicklisp-to-nix lispPackages.quicklisp-to-nix-system-info
   ];
   CPATH = "${libfixposix}/include";
-  LD_LIBRARY_PATH = "${openssl.out}/lib:${fuse}/lib:${libuv}/lib:${libev}/lib:${mysql.connector-c}/lib:${mysql.connector-c}/lib/mysql:${postgresql.lib}/lib:${sqlite.out}/lib:${libfixposix}/lib:${freetds}/lib:${openssl_lib_marked}/lib";
+  LD_LIBRARY_PATH = "${openssl.out}/lib:${fuse}/lib:${libuv}/lib:${libev}/lib:${libmysqlclient}/lib:${libmysqlclient}/lib/mysql:${postgresql.lib}/lib:${sqlite.out}/lib:${libfixposix}/lib:${freetds}/lib:${openssl_lib_marked}/lib";
 };
 in stdenv.mkDerivation self
diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix
index 233503c2eca..41dae8347ee 100644
--- a/pkgs/development/lua-modules/overrides.nix
+++ b/pkgs/development/lua-modules/overrides.nix
@@ -154,12 +154,12 @@ with super;
   luadbi-mysql = super.luadbi-mysql.override({
     extraVariables = ''
       -- Can't just be /include and /lib, unfortunately needs the trailing 'mysql'
-      MYSQL_INCDIR='${pkgs.mysql.connector-c}/include/mysql';
-      MYSQL_LIBDIR='${pkgs.mysql.connector-c}/lib/mysql';
+      MYSQL_INCDIR='${pkgs.libmysqlclient}/include/mysql';
+      MYSQL_LIBDIR='${pkgs.libmysqlclient}/lib/mysql';
     '';
     buildInputs = [
       pkgs.mysql.client
-      pkgs.mysql.connector-c
+      pkgs.libmysqlclient
     ];
   });
 
diff --git a/pkgs/development/ocaml-modules/mysql/default.nix b/pkgs/development/ocaml-modules/mysql/default.nix
index 1986f7e48f6..9be5ebf8a7b 100644
--- a/pkgs/development/ocaml-modules/mysql/default.nix
+++ b/pkgs/development/ocaml-modules/mysql/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, ocaml, findlib, mysql }:
+{ stdenv, fetchurl, fetchpatch, ocaml, findlib, libmysqlclient }:
 
 # TODO: la versione stabile da' un errore di compilazione dovuto a
 # qualche cambiamento negli header .h
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   createFindlibDestdir = true;
 
-  propagatedBuildInputs = [ mysql.connector-c ];
+  propagatedBuildInputs = [ libmysqlclient ];
 
   patches = [
     (fetchpatch {
diff --git a/pkgs/development/perl-modules/DBD-mysql/default.nix b/pkgs/development/perl-modules/DBD-mysql/default.nix
index 6eed57c4e7c..eb539339603 100644
--- a/pkgs/development/perl-modules/DBD-mysql/default.nix
+++ b/pkgs/development/perl-modules/DBD-mysql/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, buildPerlPackage, DBI, DevelChecklib, mysql }:
+{ fetchurl, buildPerlPackage, DBI, DevelChecklib, libmysqlclient }:
 
 buildPerlPackage {
   pname = "DBD-mysql";
@@ -9,7 +9,7 @@ buildPerlPackage {
     sha256 = "0y4djb048i09dk19av7mzfb3khr72vw11p3ayw2p82jsy4gm8j2g";
   };
 
-  buildInputs = [ mysql.connector-c DevelChecklib ] ;
+  buildInputs = [ libmysqlclient DevelChecklib ] ;
   propagatedBuildInputs = [ DBI ];
 
   doCheck = false;
diff --git a/pkgs/development/pure-modules/glpk/default.nix b/pkgs/development/pure-modules/glpk/default.nix
index 7b615928da9..34d12f1471f 100644
--- a/pkgs/development/pure-modules/glpk/default.nix
+++ b/pkgs/development/pure-modules/glpk/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchurl,
-  pkgconfig, pure, glpk, gmp, libtool, mysql, libiodbc }:
+  pkgconfig, pure, glpk, gmp, libtool, libmysqlclient, libiodbc }:
 
 stdenv.mkDerivation rec {
   baseName = "glpk";
@@ -12,13 +12,13 @@ stdenv.mkDerivation rec {
   };
 
   glpkWithExtras = lib.overrideDerivation glpk (attrs: {
-    propagatedBuildInputs = [ gmp libtool mysql.connector-c libiodbc ];
+    propagatedBuildInputs = [ gmp libtool libmysqlclient libiodbc ];
 
     CPPFLAGS = "-I${gmp.dev}/include";
 
     preConfigure = ''
       substituteInPlace configure \
-        --replace /usr/include/mysql ${mysql.connector-c}/include/mysql
+        --replace /usr/include/mysql ${libmysqlclient}/include/mysql
     '';
     configureFlags = [ "--enable-dl"
                        "--enable-odbc"
diff --git a/pkgs/development/python-modules/mysqlclient/default.nix b/pkgs/development/python-modules/mysqlclient/default.nix
index 488f6f9a7bb..b37f191286e 100644
--- a/pkgs/development/python-modules/mysqlclient/default.nix
+++ b/pkgs/development/python-modules/mysqlclient/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, buildPythonPackage, fetchPypi, mysql }:
+{ stdenv, buildPythonPackage, fetchPypi, libmysqlclient }:
 
 buildPythonPackage rec {
   pname = "mysqlclient";
   version = "1.4.4";
 
   nativeBuildInputs = [
-    mysql.connector-c
+    libmysqlclient
   ];
 
   buildInputs = [
-    mysql.connector-c
+    libmysqlclient
   ];
 
   # Tests need a MySQL database
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 1616eacffc6..cef7f0aecf2 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -325,7 +325,7 @@ let
     rmatio = [ pkgs.zlib.dev ];
     Rmpfr = [ pkgs.gmp pkgs.mpfr.dev ];
     Rmpi = [ pkgs.openmpi ];
-    RMySQL = [ pkgs.zlib pkgs.mysql.connector-c pkgs.openssl.dev ];
+    RMySQL = [ pkgs.zlib pkgs.libmysqlclient pkgs.openssl.dev ];
     RNetCDF = [ pkgs.netcdf pkgs.udunits ];
     RODBCext = [ pkgs.libiodbc ];
     RODBC = [ pkgs.libiodbc ];
@@ -810,7 +810,7 @@ let
     });
 
     RMySQL = old.RMySQL.overrideDerivation (attrs: {
-      MYSQL_DIR=pkgs.mysql.connector-c;
+      MYSQL_DIR="${pkgs.libmysqlclient}";
       preConfigure = ''
         patchShebangs configure
       '';
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index 4e910ae9a24..06dabcdfcf9 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -20,7 +20,7 @@
 { lib, fetchurl, writeScript, ruby, kerberos, libxml2, libxslt, python, stdenv, which
 , libiconv, postgresql, v8_3_16_14, clang, sqlite, zlib, imagemagick
 , pkgconfig , ncurses, xapian, gpgme, utillinux, fetchpatch, tzdata, icu, libffi
-, cmake, libssh2, openssl, mysql, darwin, git, perl, pcre, gecode_3, curl
+, cmake, libssh2, openssl, libmysqlclient, darwin, git, perl, pcre, gecode_3, curl
 , msgpack, qt59, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem
 , cairo, re2, rake, gobject-introspection, gdk-pixbuf, zeromq, czmq, graphicsmagick, libcxx
 , file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz
@@ -348,11 +348,11 @@ in
   };
 
   mysql = attrs: {
-    buildInputs = [ mysql.connector-c zlib openssl ];
+    buildInputs = [ libmysqlclient zlib openssl ];
   };
 
   mysql2 = attrs: {
-    buildInputs = [ mysql.connector-c zlib openssl ];
+    buildInputs = [ libmysqlclient zlib openssl ];
   };
 
   ncursesw = attrs: {
diff --git a/pkgs/development/tools/misc/sysbench/default.nix b/pkgs/development/tools/misc/sysbench/default.nix
index e2d507ab801..8076925f29b 100644
--- a/pkgs/development/tools/misc/sysbench/default.nix
+++ b/pkgs/development/tools/misc/sysbench/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, vim, mysql
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, vim, libmysqlclient
 , libaio }:
 
 stdenv.mkDerivation {
   name = "sysbench-1.0.17";
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
-  buildInputs = [ vim mysql.connector-c libaio ];
+  buildInputs = [ vim libmysqlclient libaio ];
 
   src = fetchFromGitHub {
     owner = "akopytov";
diff --git a/pkgs/development/tools/tora/default.nix b/pkgs/development/tools/tora/default.nix
index 74f1f22426f..931c00ecce5 100644
--- a/pkgs/development/tools/tora/default.nix
+++ b/pkgs/development/tools/tora/default.nix
@@ -1,5 +1,5 @@
 { mkDerivation, lib, fetchFromGitHub, cmake, extra-cmake-modules, makeWrapper
-, boost, doxygen, openssl, mysql, postgresql, graphviz, loki
+, boost, doxygen, openssl, libmysqlclient, postgresql, graphviz, loki
 , qscintilla, qtbase, qttools }:
 
 mkDerivation {
@@ -16,7 +16,7 @@ mkDerivation {
   nativeBuildInputs = [ cmake extra-cmake-modules makeWrapper qttools ];
 
   buildInputs = [
-    boost doxygen graphviz loki mysql.connector-c openssl postgresql qscintilla qtbase
+    boost doxygen graphviz loki libmysqlclient openssl postgresql qscintilla qtbase
   ];
 
   preConfigure = ''
@@ -47,7 +47,7 @@ mkDerivation {
     "-lssl"
   ];
 
-  NIX_CFLAGS_COMPILE = [ "-L${mysql.connector-c}/lib/mysql" "-I${mysql.connector-c}/include/mysql" ];
+  NIX_CFLAGS_COMPILE = [ "-L${libmysqlclient}/lib/mysql" "-I${libmysqlclient}/include/mysql" ];
 
   qtWrapperArgs = [
     ''--prefix PATH : ${lib.getBin graphviz}/bin''
diff --git a/pkgs/games/zod/default.nix b/pkgs/games/zod/default.nix
index c14eda2968e..888b7bd3d6a 100644
--- a/pkgs/games/zod/default.nix
+++ b/pkgs/games/zod/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, unrar, unzip, SDL, SDL_image, SDL_ttf, SDL_mixer
-, mysql, makeWrapper }:
+, libmysqlclient, makeWrapper }:
 
 stdenv.mkDerivation {
   name = "zod-engine-2011-03-18";
@@ -24,9 +24,9 @@ stdenv.mkDerivation {
     sourceRoot=`pwd`/src
   '';
 
-  buildInputs = [ unrar unzip SDL SDL_image SDL_ttf SDL_mixer mysql.connector-c makeWrapper ];
+  buildInputs = [ unrar unzip SDL SDL_image SDL_ttf SDL_mixer libmysqlclient makeWrapper ];
 
-  NIX_LDFLAGS = "-L${mysql.connector-c}/lib/mysql";
+  NIX_LDFLAGS = "-L${libmysqlclient}/lib/mysql";
 
   installPhase = ''
     mkdir -p $out/bin $out/share/zod
diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix
index e48dec7d20c..ab2d44577c0 100644
--- a/pkgs/servers/clickhouse/default.nix
+++ b/pkgs/servers/clickhouse/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, cmake, libtool
 , boost, capnproto, cctz, clang-unwrapped, double-conversion, gperftools, icu
-, libcpuid, libxml2, lld, llvm, lz4 , mysql, openssl, poco, re2, rdkafka
+, libcpuid, libxml2, lld, llvm, lz4 , libmysqlclient, openssl, poco, re2, rdkafka
 , readline, sparsehash, unixODBC, zstd, ninja, jemalloc, brotli, protobuf, xxHash
 }:
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake libtool ninja ];
   buildInputs = [
     boost capnproto cctz clang-unwrapped double-conversion gperftools icu
-    libcpuid libxml2 lld llvm lz4 mysql.connector-c openssl poco re2 rdkafka
+    libcpuid libxml2 lld llvm lz4 libmysqlclient openssl poco re2 rdkafka
     readline sparsehash unixODBC zstd jemalloc brotli protobuf xxHash
   ];
 
diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix
index c448e4936f6..93e1a31abb1 100644
--- a/pkgs/servers/computing/slurm/default.nix
+++ b/pkgs/servers/computing/slurm/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, pkgconfig, libtool, curl
 , python, munge, perl, pam, openssl, zlib
-, ncurses, mysql, gtk2, lua, hwloc, numactl
+, ncurses, libmysqlclient, gtk2, lua, hwloc, numactl
 , readline, freeipmi, libssh2, xorg, lz4
 # enable internal X11 support via libssh2
 , enableX11 ? true
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig libtool ];
   buildInputs = [
     curl python munge perl pam openssl zlib
-      mysql.connector-c ncurses gtk2 lz4
+      libmysqlclient ncurses gtk2 lz4
       lua hwloc numactl readline freeipmi
   ] ++ stdenv.lib.optionals enableX11 [ libssh2 xorg.xauth ];
 
diff --git a/pkgs/servers/freeradius/default.nix b/pkgs/servers/freeradius/default.nix
index 6c6eb2b0c09..eeea3298ecd 100644
--- a/pkgs/servers/freeradius/default.nix
+++ b/pkgs/servers/freeradius/default.nix
@@ -13,7 +13,7 @@
 , withMemcached ? false
 , hiredis
 , withRedis ? false
-, mysql
+, libmysqlclient
 , withMysql ? false
 , json_c
 , withJson ? false
@@ -31,7 +31,7 @@ assert withPcap -> libpcap != null;
 assert withCap -> libcap != null;
 assert withMemcached -> libmemcached != null;
 assert withRedis -> hiredis != null;
-assert withMysql -> mysql != null;
+assert withMysql -> libmysqlclient != null;
 assert withYubikey -> libyubikey != null;
 assert withCollectd -> collectd != null;
 assert withRest -> curl != null && withJson;
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
     ++ optional withCap libcap
     ++ optional withMemcached libmemcached
     ++ optional withRedis hiredis
-    ++ optional withMysql mysql.connector-c
+    ++ optional withMysql libmysqlclient
     ++ optional withJson json_c
     ++ optional withYubikey libyubikey
     ++ optional withCollectd collectd
diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix
index 7dacb997d47..f67bc5b0045 100644
--- a/pkgs/servers/http/lighttpd/default.nix
+++ b/pkgs/servers/http/lighttpd/default.nix
@@ -1,6 +1,6 @@
 { stdenv, buildPackages, fetchurl, pkgconfig, pcre, libxml2, zlib, bzip2, which, file
 , openssl, enableMagnet ? false, lua5_1 ? null
-, enableMysql ? false, mysql ? null
+, enableMysql ? false, libmysqlclient ? null
 , enableLdap ? false, openldap ? null
 , enableWebDAV ? false, sqlite ? null, libuuid ? null
 , enableExtendedAttrs ? false, attr ? null
@@ -8,7 +8,7 @@
 }:
 
 assert enableMagnet -> lua5_1 != null;
-assert enableMysql -> mysql != null;
+assert enableMysql -> libmysqlclient != null;
 assert enableLdap -> openldap != null;
 assert enableWebDAV -> sqlite != null;
 assert enableWebDAV -> libuuid != null;
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ pcre pcre.dev libxml2 zlib bzip2 which file openssl ]
              ++ stdenv.lib.optional enableMagnet lua5_1
-             ++ stdenv.lib.optional enableMysql mysql.connector-c
+             ++ stdenv.lib.optional enableMysql libmysqlclient
              ++ stdenv.lib.optional enableLdap openldap
              ++ stdenv.lib.optional enableWebDAV sqlite
              ++ stdenv.lib.optional enableWebDAV libuuid;
diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix
index e3afd1f9879..4104b0443ff 100644
--- a/pkgs/servers/mail/dovecot/default.nix
+++ b/pkgs/servers/mail/dovecot/default.nix
@@ -3,7 +3,7 @@
 , clucene_core_2, icu, openldap, libsodium, libstemmer, cyrus_sasl
 , nixosTests
 # Auth modules
-, withMySQL ? false, mysql
+, withMySQL ? false, libmysqlclient
 , withPgSQL ? false, postgresql
 , withSQLite ? true, sqlite
 }:
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   buildInputs =
     [ openssl bzip2 zlib lz4 clucene_core_2 icu openldap libsodium libstemmer cyrus_sasl.dev ]
     ++ lib.optionals (stdenv.isLinux) [ systemd pam libcap inotify-tools ]
-    ++ lib.optional withMySQL mysql.connector-c
+    ++ lib.optional withMySQL libmysqlclient
     ++ lib.optional withPgSQL postgresql
     ++ lib.optional withSQLite sqlite;
 
diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix
index fcafd5817d4..96c8ad4a383 100644
--- a/pkgs/servers/mail/exim/default.nix
+++ b/pkgs/servers/mail/exim/default.nix
@@ -1,6 +1,6 @@
 { coreutils, db, fetchurl, openssl, pcre, perl, pkgconfig, stdenv
 , enableLDAP ? false, openldap
-, enableMySQL ? false, mysql, zlib
+, enableMySQL ? false, libmysqlclient, zlib
 , enableAuthDovecot ? false, dovecot
 , enablePAM ? false, pam
 , enableSPF ? true, libspf2
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ coreutils db openssl perl pcre ]
     ++ stdenv.lib.optional enableLDAP openldap
-    ++ stdenv.lib.optionals enableMySQL [ mysql.connector-c zlib ]
+    ++ stdenv.lib.optionals enableMySQL [ libmysqlclient zlib ]
     ++ stdenv.lib.optional enableAuthDovecot dovecot
     ++ stdenv.lib.optional enablePAM pam
     ++ stdenv.lib.optional enableSPF libspf2;
@@ -53,10 +53,10 @@ stdenv.mkDerivation rec {
       ''}
       ${stdenv.lib.optionalString enableMySQL ''
         s:^# \(LOOKUP_MYSQL=yes\)$:\1:
-        s:^# \(LOOKUP_MYSQL_PC=mysql.connector-c\)$:\1:
-        s:^\(LOOKUP_LIBS\)=\(.*\):\1=\2 -lmysqlclient -L${mysql.connector-c}/lib/mysql -lssl -ldl -lm -lpthread -lz:
-        s:^# \(LOOKUP_LIBS\)=.*:\1=-lmysqlclient -L${mysql.connector-c}/lib/mysql -lssl -ldl -lm -lpthread -lz:
-        s:^# \(LOOKUP_INCLUDE\)=.*:\1=-I${mysql.connector-c}/include/mysql/:
+        s:^# \(LOOKUP_MYSQL_PC=libmysqlclient\)$:\1:
+        s:^\(LOOKUP_LIBS\)=\(.*\):\1=\2 -lmysqlclient -L${libmysqlclient}/lib/mysql -lssl -ldl -lm -lpthread -lz:
+        s:^# \(LOOKUP_LIBS\)=.*:\1=-lmysqlclient -L${libmysqlclient}/lib/mysql -lssl -ldl -lm -lpthread -lz:
+        s:^# \(LOOKUP_INCLUDE\)=.*:\1=-I${libmysqlclient}/include/mysql/:
       ''}
       ${stdenv.lib.optionalString enableAuthDovecot ''
         s:^# \(AUTH_DOVECOT\)=.*:\1=yes:
diff --git a/pkgs/servers/mail/opensmtpd/extras.nix b/pkgs/servers/mail/opensmtpd/extras.nix
index 71b27facbab..f7ed6382a7b 100644
--- a/pkgs/servers/mail/opensmtpd/extras.nix
+++ b/pkgs/servers/mail/opensmtpd/extras.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, openssl, libevent, libasr,
-  python2, pkgconfig, lua5, perl, mysql, postgresql, sqlite, hiredis,
+  python2, pkgconfig, lua5, perl, libmysqlclient, postgresql, sqlite, hiredis,
   enablePython ? true,
   enableLua ? true,
   enablePerl ? true,
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ openssl libevent
-    libasr python2 lua5 perl mysql.connector-c postgresql sqlite hiredis ];
+    libasr python2 lua5 perl libmysqlclient postgresql sqlite hiredis ];
 
   configureFlags = [
     "--sysconfdir=/etc"
@@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
     stdenv.lib.optional enableRedis
       "-I${hiredis}/include/hiredis -lhiredis"
     ++ stdenv.lib.optional enableMysql
-      "-L${mysql.connector-c}/lib/mysql";
+      "-L${libmysqlclient}/lib/mysql";
 
   meta = with stdenv.lib; {
     homepage = https://www.opensmtpd.org/;
diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix
index 39845f12f03..b299d212a18 100644
--- a/pkgs/servers/mail/postfix/default.nix
+++ b/pkgs/servers/mail/postfix/default.nix
@@ -3,7 +3,7 @@
 , buildPackages
 , withLDAP ? true, openldap
 , withPgSQL ? false, postgresql
-, withMySQL ? false, mysql
+, withMySQL ? false, libmysqlclient
 , withSQLite ? false, sqlite
 }:
 
@@ -12,7 +12,7 @@ let
     "-DUSE_TLS" "-DUSE_SASL_AUTH" "-DUSE_CYRUS_SASL" "-I${cyrus_sasl.dev}/include/sasl"
     "-DHAS_DB_BYPASS_MAKEDEFS_CHECK"
    ] ++ lib.optional withPgSQL "-DHAS_PGSQL"
-     ++ lib.optionals withMySQL [ "-DHAS_MYSQL" "-I${mysql.connector-c}/include/mysql" "-L${mysql.connector-c}/lib/mysql" ]
+     ++ lib.optionals withMySQL [ "-DHAS_MYSQL" "-I${libmysqlclient}/include/mysql" "-L${libmysqlclient}/lib/mysql" ]
      ++ lib.optional withSQLite "-DHAS_SQLITE"
      ++ lib.optionals withLDAP ["-DHAS_LDAP" "-DUSE_LDAP_SASL"]);
    auxlibs = lib.concatStringsSep " " ([
@@ -36,7 +36,7 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = [ makeWrapper m4 ];
   buildInputs = [ db openssl cyrus_sasl icu libnsl pcre ]
                 ++ lib.optional withPgSQL postgresql
-                ++ lib.optional withMySQL mysql.connector-c
+                ++ lib.optional withMySQL libmysqlclient
                 ++ lib.optional withSQLite sqlite
                 ++ lib.optional withLDAP openldap;
 
diff --git a/pkgs/servers/monitoring/plugins/default.nix b/pkgs/servers/monitoring/plugins/default.nix
index 9f23cc3e54c..62f40b59d37 100644
--- a/pkgs/servers/monitoring/plugins/default.nix
+++ b/pkgs/servers/monitoring/plugins/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, fetchpatch, autoreconfHook
 , coreutils, gnugrep, gnused, lm_sensors, net_snmp, openssh, openssl, perl
-, dnsutils, libdbi, mysql, zlib, openldap, procps
+, dnsutils, libdbi, libmysqlclient, zlib, openldap, procps
 , runtimeShell }:
 
 with stdenv.lib;
@@ -48,7 +48,7 @@ in stdenv.mkDerivation {
   '';
 
   # !!! make openssh a runtime dependency only
-  buildInputs = [ dnsutils libdbi mysql net_snmp openldap openssh openssl perl procps zlib ];
+  buildInputs = [ dnsutils libdbi libmysqlclient net_snmp openldap openssh openssl perl procps zlib ];
 
   nativeBuildInputs = [ autoreconfHook ];
 
diff --git a/pkgs/servers/monitoring/zabbix/proxy.nix b/pkgs/servers/monitoring/zabbix/proxy.nix
index 48b72dc0590..53932af6a18 100644
--- a/pkgs/servers/monitoring/zabbix/proxy.nix
+++ b/pkgs/servers/monitoring/zabbix/proxy.nix
@@ -3,7 +3,7 @@
 , snmpSupport ? true, net_snmp
 , sshSupport ? true, libssh2
 , sqliteSupport ? false, sqlite
-, mysqlSupport ? false, mysql
+, mysqlSupport ? false, libmysqlclient
 , postgresqlSupport ? false, postgresql
 }:
 
@@ -37,7 +37,7 @@ in
       ++ optional snmpSupport net_snmp
       ++ optional sqliteSupport sqlite
       ++ optional sshSupport libssh2
-      ++ optional mysqlSupport mysql.connector-c
+      ++ optional mysqlSupport libmysqlclient
       ++ optional postgresqlSupport postgresql;
 
       configureFlags = [
diff --git a/pkgs/servers/monitoring/zabbix/server.nix b/pkgs/servers/monitoring/zabbix/server.nix
index 51ca38e8cfc..ac5dcca901d 100644
--- a/pkgs/servers/monitoring/zabbix/server.nix
+++ b/pkgs/servers/monitoring/zabbix/server.nix
@@ -4,7 +4,7 @@
 , odbcSupport ? true, unixODBC
 , snmpSupport ? true, net_snmp
 , sshSupport ? true, libssh2
-, mysqlSupport ? false, mysql
+, mysqlSupport ? false, libmysqlclient
 , postgresqlSupport ? false, postgresql
 }:
 
@@ -40,7 +40,7 @@ in
       ++ optional ldapSupport openldap
       ++ optional snmpSupport net_snmp
       ++ optional sshSupport libssh2
-      ++ optional mysqlSupport mysql.connector-c
+      ++ optional mysqlSupport libmysqlclient
       ++ optional postgresqlSupport postgresql;
 
       configureFlags = [
diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix
index 85fa6cd8006..556c44b61a7 100644
--- a/pkgs/servers/uwsgi/default.nix
+++ b/pkgs/servers/uwsgi/default.nix
@@ -4,7 +4,7 @@
 , pam, withPAM ? stdenv.isLinux
 , systemd, withSystemd ? stdenv.isLinux
 , python2, python3, ncurses
-, ruby, php-embed, mysql
+, ruby, php-embed, libmysqlclient
 }:
 
 let pythonPlugin = pkg : lib.nameValuePair "python${if pkg.isPy2 then "2" else "3"}" {
@@ -34,7 +34,7 @@ let pythonPlugin = pkg : lib.nameValuePair "python${if pkg.isPy2 then "2" else "
                     # usage: https://uwsgi-docs.readthedocs.io/en/latest/PHP.html#running-php-apps-with-nginx
                     path = "plugins/php";
                     inputs = [ php-embed ] ++ php-embed.buildInputs;
-                    NIX_CFLAGS_LINK = [ "-L${mysql.connector-c}/lib/mysql" ];
+                    NIX_CFLAGS_LINK = [ "-L${libmysqlclient}/lib/mysql" ];
                   })
                 ];
 
diff --git a/pkgs/tools/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix
index ce77ebe8c1a..cb8bf0346a2 100644
--- a/pkgs/tools/backup/bareos/default.nix
+++ b/pkgs/tools/backup/bareos/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchFromGitHub, pkgconfig, nettools, gettext, flex
 , readline ? null, openssl ? null, python2 ? null, ncurses ? null, rocksdb
-, sqlite ? null, postgresql ? null, mysql ? null, zlib ? null, lzo ? null
+, sqlite ? null, postgresql ? null, libmysqlclient ? null, zlib ? null, lzo ? null
 , jansson ? null, acl ? null, glusterfs ? null, libceph ? null, libcap ? null
 }:
 
-assert sqlite != null || postgresql != null || mysql != null;
+assert sqlite != null || postgresql != null || libmysqlclient != null;
 
 with stdenv.lib;
 let
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
     nettools gettext readline openssl python2 flex ncurses sqlite postgresql
-    mysql.connector-c zlib lzo jansson acl glusterfs libceph libcap rocksdb
+    libmysqlclient zlib lzo jansson acl glusterfs libceph libcap rocksdb
   ];
 
   postPatch = ''
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
     ++ optional (openssl != null) "--with-openssl=${openssl.dev}"
     ++ optional (sqlite != null) "--with-sqlite3=${sqlite.dev}"
     ++ optional (postgresql != null) "--with-postgresql=${postgresql}"
-    ++ optional (mysql != null) "--with-mysql=${mysql.connector-c}"
+    ++ optional (libmysqlclient != null) "--with-mysql=${libmysqlclient}"
     ++ optional (zlib != null) "--with-zlib=${zlib.dev}"
     ++ optional (lzo != null) "--with-lzo=${lzo}"
     ++ optional (jansson != null) "--with-jansson=${jansson}"
diff --git a/pkgs/tools/backup/mydumper/default.nix b/pkgs/tools/backup/mydumper/default.nix
index 5538b45c5f1..7160e7f1950 100644
--- a/pkgs/tools/backup/mydumper/default.nix
+++ b/pkgs/tools/backup/mydumper/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, cmake, pkgconfig
-, glib, zlib, pcre, mysql, libressl }:
+, glib, zlib, pcre, libmysqlclient, libressl }:
 
 stdenv.mkDerivation rec {
   version = "0.9.5";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake pkgconfig ];
 
-  buildInputs = [ glib zlib pcre mysql.connector-c libressl ];
+  buildInputs = [ glib zlib pcre libmysqlclient libressl ];
 
   meta = with stdenv.lib; {
     description = ''High-perfomance MySQL backup tool'';
diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix
index bc35a25cfde..3986cadd08a 100644
--- a/pkgs/tools/networking/kea/default.nix
+++ b/pkgs/tools/networking/kea/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, autoreconfHook, pkgconfig, openssl, botan2, log4cplus
-, boost, python3, postgresql, mysql, gmp, bzip2 }:
+, boost, python3, postgresql, libmysqlclient, gmp, bzip2 }:
 
 stdenv.mkDerivation rec {
   pname = "kea";
@@ -20,12 +20,12 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--localstatedir=/var"
     "--with-pgsql=${postgresql}/bin/pg_config"
-    "--with-mysql=${mysql.connector-c}/bin/mysql_config"
+    "--with-mysql=${libmysqlclient}/bin/mysql_config"
   ];
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
   buildInputs = [
-    openssl log4cplus boost python3 mysql.connector-c
+    openssl log4cplus boost python3 libmysqlclient
     botan2 gmp bzip2
   ];
 
diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix
index f507e4dc287..40eeed7f050 100644
--- a/pkgs/tools/networking/mailutils/default.nix
+++ b/pkgs/tools/networking/mailutils/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, fetchpatch, autoreconfHook, dejagnu, gettext, pkgconfig
 , gdbm, pam, readline, ncurses, gnutls, guile, texinfo, gnum4, sasl, fribidi, nettools
-, python, gss, mysql, system-sendmail }:
+, python, gss, libmysqlclient, system-sendmail }:
 
 stdenv.mkDerivation rec {
   name = "${project}-${version}";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     sed -i -e '/chown root:mail/d' \
            -e 's/chmod [24]755/chmod 0755/' \
       */Makefile{.in,.am}
-    sed -i 's:/usr/lib/mysql:${mysql.connector-c}/lib/mysql:' configure.ac
+    sed -i 's:/usr/lib/mysql:${libmysqlclient}/lib/mysql:' configure.ac
     sed -i 's/0\.18/0.19/' configure.ac
     sed -i -e 's:mysql/mysql.h:mysql.h:' \
            -e 's:mysql/errmsg.h:errmsg.h:' \
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     gdbm pam readline ncurses gnutls guile texinfo gnum4 sasl fribidi nettools
-    gss mysql.connector-c python
+    gss libmysqlclient python
   ];
 
   patches = [
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
     (fetchurl { url = "${p}/weed.at"; sha256 = "1101xakhc99f5gb9cs3mmydn43ayli7b270pzbvh7f9rbvh0d0nh"; })
   ];
 
-  NIX_CFLAGS_COMPILE = "-L${mysql.connector-c}/lib/mysql -I${mysql.connector-c}/include/mysql";
+  NIX_CFLAGS_COMPILE = "-L${libmysqlclient}/lib/mysql -I${libmysqlclient}/include/mysql";
 
   checkInputs = [ dejagnu ];
   doCheck = false; # fails 1 out of a bunch of tests, looks like a bug
diff --git a/pkgs/tools/networking/maxscale/default.nix b/pkgs/tools/networking/maxscale/default.nix
index 32f6b11d77c..d047646fa71 100644
--- a/pkgs/tools/networking/maxscale/default.nix
+++ b/pkgs/tools/networking/maxscale/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, cmake, pkgconfig, glibc
-, bison2, curl, flex, gperftools, jansson, jemalloc, kerberos, lua, mariadb
+, bison2, curl, flex, gperftools, jansson, jemalloc, kerberos, lua, libmysqlclient
 , ncurses, openssl, pcre, pcre2, perl, rabbitmq-c, sqlite, tcl
 , libaio, libedit, libtool, libui, libuuid, zlib
 }:
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake pkgconfig ];
 
   buildInputs = [
-    bison2 curl flex gperftools jansson jemalloc kerberos lua mariadb.connector-c
+    bison2 curl flex gperftools jansson jemalloc kerberos lua libmysqlclient
     ncurses openssl pcre pcre2 perl rabbitmq-c sqlite tcl
     libaio libedit libtool libui libuuid zlib
   ];
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
   postInstall = ''
     find $out/bin -type f -perm -0100 | while read f1; do
       patchelf \
-        --set-rpath "$(patchelf --print-rpath $f1):${mariadb.connector-c}/lib/mariadb:$out/lib/maxscale" \
+        --set-rpath "$(patchelf --print-rpath $f1):${libmysqlclient}/lib/mariadb:$out/lib/maxscale" \
         --set-interpreter "$(cat ${stdenv.cc}/nix-support/dynamic-linker)" $f1 \
         && patchelf --shrink-rpath $f1
     done
diff --git a/pkgs/tools/security/thc-hydra/default.nix b/pkgs/tools/security/thc-hydra/default.nix
index 252d73b479b..57deaaf0498 100644
--- a/pkgs/tools/security/thc-hydra/default.nix
+++ b/pkgs/tools/security/thc-hydra/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, zlib, openssl, ncurses, libidn, pcre, libssh, mysql, postgresql
+{ stdenv, lib, fetchurl, zlib, openssl, ncurses, libidn, pcre, libssh, libmysqlclient, postgresql
 , withGUI ? false, makeWrapper, pkgconfig, gtk2 }:
 
 let
@@ -23,7 +23,7 @@ in stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = lib.optionals withGUI [ pkgconfig makeWrapper ];
-  buildInputs = [ zlib openssl ncurses libidn pcre libssh mysql.connector-c postgresql ]
+  buildInputs = [ zlib openssl ncurses libidn pcre libssh libmysqlclient postgresql ]
                 ++ lib.optional withGUI gtk2;
 
   postInstall = lib.optionalString withGUI ''
diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix
index 1df73e08d1e..3e7e4e5969a 100644
--- a/pkgs/tools/system/collectd/default.nix
+++ b/pkgs/tools/system/collectd/default.nix
@@ -22,7 +22,7 @@
 , libtool
 , lm_sensors
 , lvm2
-, mysql
+, libmysqlclient
 , numactl
 , postgresql
 , protobufc
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
     libxml2 postgresql protobufc rrdtool
     varnish yajl jdk libtool python hiredis libmicrohttpd
     riemann_c_client mosquitto rdkafka mongoc
-  ] ++ stdenv.lib.optionals (mysql != null) [ mysql.connector-c
+  ] ++ stdenv.lib.optionals (libmysqlclient != null) [ libmysqlclient
   ] ++ stdenv.lib.optionals stdenv.isLinux [
     iptables libatasmart libcredis libmodbus libsigrok
     lm_sensors lvm2 rabbitmq-c udev net_snmp libmnl
diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix
index 2899837f3f8..34b7b7d908a 100644
--- a/pkgs/tools/system/rsyslog/default.nix
+++ b/pkgs/tools/system/rsyslog/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, autoreconfHook, libestr, json_c, zlib, pythonPackages, fastJson
-, libkrb5 ? null, systemd ? null, jemalloc ? null, mysql ? null, postgresql ? null
+, libkrb5 ? null, systemd ? null, jemalloc ? null, libmysqlclient ? null, postgresql ? null
 , libdbi ? null, net_snmp ? null, libuuid ? null, curl ? null, gnutls ? null
 , libgcrypt ? null, liblognorm ? null, openssl ? null, librelp ? null, libksi ? null
 , libgt ? null, liblogging ? null, libnet ? null, hadoop ? null, rdkafka ? null
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     postgresql libdbi net_snmp libuuid curl gnutls libgcrypt liblognorm openssl
     librelp libgt libksi liblogging libnet hadoop rdkafka libmongo-client czmq
     rabbitmq-c hiredis mongoc
-  ] ++ stdenv.lib.optional (mysql != null) mysql.connector-c
+  ] ++ stdenv.lib.optional (libmysqlclient != null) libmysqlclient
     ++ stdenv.lib.optional stdenv.isLinux systemd;
 
   hardeningDisable = [ "format" ];
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
     (mkFlag false                     "valgrind")
     (mkFlag false                     "diagtools")
     (mkFlag true                      "usertools")
-    (mkFlag (mysql != null)           "mysql")
+    (mkFlag (libmysqlclient != null)  "mysql")
     (mkFlag (postgresql != null)      "pgsql")
     (mkFlag (libdbi != null)          "libdbi")
     (mkFlag (net_snmp != null)        "snmp")
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 046c6bc9acc..015c37dca2a 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -187,7 +187,7 @@ mapAliases ({
   libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux || stdenv.hostPlatform.libc != "glibc") gettext; # added 2018-03-14
   libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28
   liblapackWithoutAtlas = liblapack; # added 2018-11-05
-  libmysql = mysql.connector-c; # added # 2017-12-28, this was a misnomer refering to libmysqlclient
+  libmysql = mariadb-connector-c; # added # 2017-12-28, this was a misnomer refering to libmysqlclient
   libqrencode = qrencode;  # added 2019-01-01
   librecad2 = librecad;  # backwards compatibility alias, added 2015-10
   libsysfs = sysfsutils; # added 2018-04-25
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 560ee97e946..2cdb0043052 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1961,7 +1961,7 @@ in
     libkrb5 = null;
     systemd = null;
     jemalloc = null;
-    mysql = null;
+    libmysqlclient = null;
     postgresql = null;
     libdbi = null;
     net_snmp = null;
@@ -11703,7 +11703,7 @@ in
   libdbi = callPackage ../development/libraries/libdbi { };
 
   libdbiDriversBase = libdbiDrivers.override {
-    mysql = null;
+    libmysqlclient = null;
     sqlite = null;
   };
 
@@ -13128,7 +13128,7 @@ in
     cups = if stdenv.isLinux then cups else null;
 
     # XXX: mariadb doesn't built on fbsd as of nov 2015
-    mysql = if (!stdenv.isFreeBSD) then mysql else null;
+    libmysqlclient = if (!stdenv.isFreeBSD) then libmysqlclient else null;
 
     inherit (pkgs.darwin) libobjc;
     inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices OpenGL Cocoa AGL;
@@ -14886,6 +14886,7 @@ in
 
   rpcbind = callPackage ../servers/rpcbind { };
 
+  libmysqlclient = mariadb-connector-c;
   mariadb-connector-c = mariadb-connector-c_2_3;
   mariadb-connector-c_2_3 = callPackage ../servers/sql/mariadb/connector-c/2_3.nix { };
 
@@ -24129,7 +24130,7 @@ in
   mnemonicode = callPackage ../misc/mnemonicode { };
 
   mysql-workbench = callPackage ../applications/misc/mysql-workbench (let mysql = mysql57; in {
-    gdal = gdal.override {mysql = mysql // {lib = {dev = mysql;};};};
+    gdal = gdal.override {libmysqlclient = mysql // {lib = {dev = mysql;};};};
     mysql = mysql;
     pcre = pcre-cpp;
   });
-- 
GitLab


From 3def2b4b6a550ca02c36f2f2eefc899921dc5e9b Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Sat, 17 Aug 2019 21:25:12 +0300
Subject: [PATCH 0084/2254] mariadb-connector-c: init at 3.1.2

---
 pkgs/servers/sql/mariadb/connector-c/3_1.nix    |  6 ++++++
 .../servers/sql/mariadb/connector-c/default.nix | 17 +++++++++++++----
 pkgs/top-level/all-packages.nix                 |  1 +
 3 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/servers/sql/mariadb/connector-c/3_1.nix

diff --git a/pkgs/servers/sql/mariadb/connector-c/3_1.nix b/pkgs/servers/sql/mariadb/connector-c/3_1.nix
new file mode 100644
index 00000000000..c8bc4858f71
--- /dev/null
+++ b/pkgs/servers/sql/mariadb/connector-c/3_1.nix
@@ -0,0 +1,6 @@
+{ callPackage, ... } @ args:
+
+callPackage ./. (args // {
+  version = "3.1.2";
+  sha256 = "0pgz8m8d39mvj9wnjll6c83xvdl2h24273b3dkx0g5pxj7ga4shm";
+})
diff --git a/pkgs/servers/sql/mariadb/connector-c/default.nix b/pkgs/servers/sql/mariadb/connector-c/default.nix
index ed49d40180f..e8430b01eb6 100644
--- a/pkgs/servers/sql/mariadb/connector-c/default.nix
+++ b/pkgs/servers/sql/mariadb/connector-c/default.nix
@@ -1,12 +1,15 @@
 { stdenv, fetchurl, cmake
-, openssl, zlib
+, curl, openssl, zlib
 , libiconv
 , version, sha256, ...
 }:
 
 with stdenv.lib;
 
-stdenv.mkDerivation {
+let
+  isVer3 = versionAtLeast version "3.0";
+
+in stdenv.mkDerivation {
   pname = "mariadb-connector-c";
   inherit version;
 
@@ -21,7 +24,7 @@ stdenv.mkDerivation {
   cmakeFlags = [
     "-DWITH_EXTERNAL_ZLIB=ON"
     "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock"
-  ];
+  ] ++ optional isVer3 "-DWITH_CURL=ON";
 
   # The cmake setup-hook uses $out/lib by default, this is not the case here.
   preConfigure = optionalString stdenv.isDarwin ''
@@ -29,7 +32,7 @@ stdenv.mkDerivation {
   '';
 
   nativeBuildInputs = [ cmake ];
-  propagatedBuildInputs = [ openssl zlib ];
+  propagatedBuildInputs = [ openssl zlib ] ++ optional isVer3 curl;
   buildInputs = [ libiconv ];
 
   enableParallelBuilding = true;
@@ -38,6 +41,12 @@ stdenv.mkDerivation {
     ln -sv mariadb_config $out/bin/mysql_config
     ln -sv mariadb $out/lib/mysql
     ln -sv mariadb $out/include/mysql
+    ${optionalString isVer3 ''
+      ln -sv libmariadbclient.a $out/lib/mariadb/libmysqlclient.a
+      ln -sv libmariadbclient.a $out/lib/mariadb/libmysqlclient_r.a
+      ln -sv libmariadb.so $out/lib/mariadb/libmysqlclient.so
+      ln -sv libmariadb.so $out/lib/mariadb/libmysqlclient_r.so
+    ''}
   '';
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2cdb0043052..12c54998321 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14889,6 +14889,7 @@ in
   libmysqlclient = mariadb-connector-c;
   mariadb-connector-c = mariadb-connector-c_2_3;
   mariadb-connector-c_2_3 = callPackage ../servers/sql/mariadb/connector-c/2_3.nix { };
+  mariadb-connector-c_3_1 = callPackage ../servers/sql/mariadb/connector-c/3_1.nix { };
 
   mariadb = callPackage ../servers/sql/mariadb {
     asio = asio_1_10;
-- 
GitLab


From e2bd6558228dd64d2c22ef9dcf7c89d8c58bf4bf Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Sat, 17 Aug 2019 21:29:28 +0300
Subject: [PATCH 0085/2254] mariadb-galera: move to external package

---
 pkgs/servers/sql/mariadb/default.nix        | 56 ------------------
 pkgs/servers/sql/mariadb/galera/25.nix      |  6 ++
 pkgs/servers/sql/mariadb/galera/default.nix | 63 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  6 +-
 4 files changed, 74 insertions(+), 57 deletions(-)
 create mode 100644 pkgs/servers/sql/mariadb/galera/25.nix
 create mode 100644 pkgs/servers/sql/mariadb/galera/default.nix

diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index 2e5e117bc0d..dc25b4263e7 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -18,12 +18,6 @@ mytopEnv = perl.withPackages (p: with p; [ DataDumper DBDmysql DBI TermReadKey ]
 mariadb = server // {
   inherit client; # MariaDB Client
   server = server; # MariaDB Server
-  inherit galera;
-};
-
-galeraLibs = buildEnv {
-  name = "galera-lib-inputs-united";
-  paths = [ openssl.out boost check ];
 };
 
 common = rec { # attributes common to both builds
@@ -215,54 +209,4 @@ server = stdenv.mkDerivation (common // {
 
   CXXFLAGS = optionalString stdenv.isi686 "-fpermissive";
 });
-
-galera = stdenv.mkDerivation rec {
-  pname = "mariadb-galera";
-  version = "25.3.26";
-
-  src = fetchFromGitHub {
-    owner = "codership";
-    repo = "galera";
-    rev = "release_${version}";
-    sha256 = "0fs0c1px9lknf1a5wwb12z1hj7j7b6hsfjddggikvkdkrnr2xs1f";
-    fetchSubmodules = true;
-  };
-
-  buildInputs = [ asio boost check openssl scons ];
-
-  postPatch = ''
-    substituteInPlace SConstruct \
-      --replace "boost_library_path = '''" "boost_library_path = '${boost}/lib'"
-  '';
-
-  preConfigure = ''
-    export CPPFLAGS="-I${asio}/include -I${boost.dev}/include -I${check}/include -I${openssl.dev}/include"
-    export LIBPATH="${galeraLibs}/lib"
-  '';
-
-  sconsFlags = "ssl=1 system_asio=0 strict_build_flags=0";
-
-  installPhase = ''
-    # copied with modifications from scripts/packages/freebsd.sh
-    GALERA_LICENSE_DIR="$share/licenses/${pname}-${version}"
-    install -d $out/{bin,lib/galera,share/doc/galera,$GALERA_LICENSE_DIR}
-    install -m 555 "garb/garbd"                       "$out/bin/garbd"
-    install -m 444 "libgalera_smm.so"                 "$out/lib/galera/libgalera_smm.so"
-    install -m 444 "scripts/packages/README"          "$out/share/doc/galera/"
-    install -m 444 "scripts/packages/README-MySQL"    "$out/share/doc/galera/"
-    install -m 444 "scripts/packages/freebsd/LICENSE" "$out/$GALERA_LICENSE_DIR"
-    install -m 444 "LICENSE"                          "$out/$GALERA_LICENSE_DIR/GPLv2"
-    install -m 444 "asio/LICENSE_1_0.txt"             "$out/$GALERA_LICENSE_DIR/LICENSE.asio"
-    install -m 444 "www.evanjones.ca/LICENSE"         "$out/$GALERA_LICENSE_DIR/LICENSE.crc32c"
-    install -m 444 "chromium/LICENSE"                 "$out/$GALERA_LICENSE_DIR/LICENSE.chromium"
-  '';
-
-  meta = {
-    description = "Galera 3 wsrep provider library";
-    homepage = http://galeracluster.com/;
-    license = licenses.lgpl2;
-    maintainers = with maintainers; [ izorkin ];
-    platforms = platforms.all;
-  };
-};
 in mariadb
diff --git a/pkgs/servers/sql/mariadb/galera/25.nix b/pkgs/servers/sql/mariadb/galera/25.nix
new file mode 100644
index 00000000000..3aed6a47e1c
--- /dev/null
+++ b/pkgs/servers/sql/mariadb/galera/25.nix
@@ -0,0 +1,6 @@
+{ callPackage, ... } @ args:
+
+callPackage ./. (args // {
+  version = "25.3.26";
+  sha256 = "0fs0c1px9lknf1a5wwb12z1hj7j7b6hsfjddggikvkdkrnr2xs1f";
+})
diff --git a/pkgs/servers/sql/mariadb/galera/default.nix b/pkgs/servers/sql/mariadb/galera/default.nix
new file mode 100644
index 00000000000..263a21983e2
--- /dev/null
+++ b/pkgs/servers/sql/mariadb/galera/default.nix
@@ -0,0 +1,63 @@
+{ stdenv, fetchFromGitHub, buildEnv
+, asio, boost, check, openssl, scons
+, version, sha256, ...
+}:
+
+let
+  pname = "mariadb-galera";
+  galeraLibs = buildEnv {
+    name = "galera-lib-inputs-united";
+    paths = [ openssl.out boost check ];
+  };
+
+in stdenv.mkDerivation {
+  inherit pname;
+  inherit version;
+
+  src = fetchFromGitHub {
+    owner = "codership";
+    repo = "galera";
+    rev = "release_${version}";
+    inherit sha256;
+    fetchSubmodules = true;
+  };
+
+  buildInputs = [ asio boost check openssl scons ];
+
+  postPatch = ''
+    substituteInPlace SConstruct \
+      --replace "boost_library_path = '''" "boost_library_path = '${boost}/lib'"
+  '';
+
+  preConfigure = ''
+    export CPPFLAGS="-I${asio}/include -I${boost.dev}/include -I${check}/include -I${openssl.dev}/include"
+    export LIBPATH="${galeraLibs}/lib"
+  '';
+
+  sconsFlags = "ssl=1 system_asio=1 strict_build_flags=0";
+
+  enableParallelBuilding = true;
+
+  installPhase = ''
+    # copied with modifications from scripts/packages/freebsd.sh
+    GALERA_LICENSE_DIR="$share/licenses/${pname}"
+    install -d $out/{bin,lib/galera,share/doc/galera,$GALERA_LICENSE_DIR}
+    install -m 555 "garb/garbd"                       "$out/bin/garbd"
+    install -m 444 "libgalera_smm.so"                 "$out/lib/galera/libgalera_smm.so"
+    install -m 444 "scripts/packages/README"          "$out/share/doc/galera/"
+    install -m 444 "scripts/packages/README-MySQL"    "$out/share/doc/galera/"
+    install -m 444 "scripts/packages/freebsd/LICENSE" "$out/$GALERA_LICENSE_DIR"
+    install -m 444 "LICENSE"                          "$out/$GALERA_LICENSE_DIR/GPLv2"
+    install -m 444 "asio/LICENSE_1_0.txt"             "$out/$GALERA_LICENSE_DIR/LICENSE.asio"
+    install -m 444 "www.evanjones.ca/LICENSE"         "$out/$GALERA_LICENSE_DIR/LICENSE.crc32c"
+    install -m 444 "chromium/LICENSE"                 "$out/$GALERA_LICENSE_DIR/LICENSE.chromium"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Galera 3 wsrep provider library";
+    homepage = http://galeracluster.com/;
+    license = licenses.lgpl2;
+    maintainers = with maintainers; [ izorkin ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 12c54998321..1c51a19e6e0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14891,8 +14891,12 @@ in
   mariadb-connector-c_2_3 = callPackage ../servers/sql/mariadb/connector-c/2_3.nix { };
   mariadb-connector-c_3_1 = callPackage ../servers/sql/mariadb/connector-c/3_1.nix { };
 
-  mariadb = callPackage ../servers/sql/mariadb {
+  mariadb-galera = mariadb-galera_25;
+  mariadb-galera_25 = callPackage ../servers/sql/mariadb/galera/25.nix {
     asio = asio_1_10;
+  };
+
+  mariadb = callPackage ../servers/sql/mariadb {
     # As per mariadb's cmake, "static jemalloc_pic.a can only be used up to jemalloc 4".
     # https://jira.mariadb.org/browse/MDEV-15034
     jemalloc = jemalloc450.override ({ disableInitExecTls = true; });
-- 
GitLab


From 50fbe46ae735e155c4e70dead0ddab7f085fc653 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Sat, 17 Aug 2019 21:29:50 +0300
Subject: [PATCH 0086/2254] mariadb-galera: 25.3.26 -> 25.3.27

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

diff --git a/pkgs/servers/sql/mariadb/galera/25.nix b/pkgs/servers/sql/mariadb/galera/25.nix
index 3aed6a47e1c..2772d60e398 100644
--- a/pkgs/servers/sql/mariadb/galera/25.nix
+++ b/pkgs/servers/sql/mariadb/galera/25.nix
@@ -1,6 +1,6 @@
 { callPackage, ... } @ args:
 
 callPackage ./. (args // {
-  version = "25.3.26";
-  sha256 = "0fs0c1px9lknf1a5wwb12z1hj7j7b6hsfjddggikvkdkrnr2xs1f";
+  version = "25.3.27";
+  sha256 = "143kzj0fmak1gdww4qkqmmliw8klxm6mwk5531748swlwm6gqr5q";
 })
-- 
GitLab


From 9f8c046849890ccc445f69b643f53874fa60b606 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Sat, 17 Aug 2019 21:30:38 +0300
Subject: [PATCH 0087/2254] mariadb-connector-c: enable default v3.1

---
 pkgs/top-level/all-packages.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1c51a19e6e0..06ca60b316e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13893,7 +13893,9 @@ in
 
   unixODBC = callPackage ../development/libraries/unixODBC { };
 
-  unixODBCDrivers = recurseIntoAttrs (callPackages ../development/libraries/unixODBCDrivers {});
+  unixODBCDrivers = recurseIntoAttrs (callPackages ../development/libraries/unixODBCDrivers {
+    libmysqlclient = libmysqlclient_2_3;
+  });
 
   ustr = callPackage ../development/libraries/ustr { };
 
@@ -14886,8 +14888,10 @@ in
 
   rpcbind = callPackage ../servers/rpcbind { };
 
-  libmysqlclient = mariadb-connector-c;
-  mariadb-connector-c = mariadb-connector-c_2_3;
+  libmysqlclient = libmysqlclient_3_1;
+  libmysqlclient_2_3 = mariadb-connector-c_2_3;
+  libmysqlclient_3_1 = mariadb-connector-c_3_1;
+  mariadb-connector-c = mariadb-connector-c_3_1;
   mariadb-connector-c_2_3 = callPackage ../servers/sql/mariadb/connector-c/2_3.nix { };
   mariadb-connector-c_3_1 = callPackage ../servers/sql/mariadb/connector-c/3_1.nix { };
 
-- 
GitLab


From 02812860c83a9ad52af4bcf731f3f3276f45c068 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Sat, 17 Aug 2019 21:33:43 +0300
Subject: [PATCH 0088/2254] unixODBCDrivers.mariadb: 2.0.10 -> 3.1.2

---
 .../libraries/unixODBCDrivers/default.nix       | 17 +++++++++++------
 pkgs/top-level/all-packages.nix                 |  4 +---
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix
index cbb8293db11..44e7ed17f0c 100644
--- a/pkgs/development/libraries/unixODBCDrivers/default.nix
+++ b/pkgs/development/libraries/unixODBCDrivers/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, unixODBC, cmake, postgresql, mysql, libmysqlclient, sqlite, zlib, libxml2, dpkg, lib, kerberos, curl, libuuid, autoPatchelfHook }:
+{ fetchurl, stdenv, unixODBC, cmake, postgresql, mysql, libmysqlclient, sqlite, zlib, libxml2, dpkg, lib, openssl, kerberos, curl, libuuid, autoPatchelfHook }:
 
 # I haven't done any parameter tweaking.. So the defaults provided here might be bad
 
@@ -29,18 +29,23 @@
 
   mariadb = stdenv.mkDerivation rec {
     pname = "mariadb-connector-odbc";
-    version = "2.0.10";
+    version = "3.1.2";
 
     src = fetchurl {
-      url = "https://downloads.mariadb.org/interstitial/connector-odbc-${version}/src/${pname}-${version}-ga-src.tar.gz";
-      sha256 = "0b6ximy0dg0xhqbrm1l7pn8hjapgpmddi67kh54h6i9cq9hqfdvz";
+      url = "https://downloads.mariadb.org/interstitial/connector-odbc-${version}/${pname}-${version}-ga-src.tar.gz";
+      sha256 = "0iibly2mbqijqyq4pzpb6dh40clqhvqrhgnj8knm4bw3nlksd0d5";
     };
 
     nativeBuildInputs = [ cmake ];
-    buildInputs = [ unixODBC libmysqlclient ];
+    buildInputs = [ unixODBC libmysqlclient openssl ];
 
     cmakeFlags = [
-      "-DMARIADB_INCLUDE_DIR=${libmysqlclient}/include/mariadb"
+      "-DWITH_OPENSSL=ON"
+    ];
+
+   NIX_CFLAGS_COMPILE = [
+     "-I${libmysqlclient}/include/mysql"
+     "-L${libmysqlclient}/lib/mysql"
     ];
 
     passthru = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 06ca60b316e..c93eb92deb1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13893,9 +13893,7 @@ in
 
   unixODBC = callPackage ../development/libraries/unixODBC { };
 
-  unixODBCDrivers = recurseIntoAttrs (callPackages ../development/libraries/unixODBCDrivers {
-    libmysqlclient = libmysqlclient_2_3;
-  });
+  unixODBCDrivers = recurseIntoAttrs (callPackages ../development/libraries/unixODBCDrivers { });
 
   ustr = callPackage ../development/libraries/ustr { };
 
-- 
GitLab


From c13c90393437a6d4375de5b23722e6222fe7404d Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Sat, 31 Aug 2019 14:07:03 +0300
Subject: [PATCH 0089/2254] mariadb-connector-c: remove libmysql alias

---
 pkgs/top-level/aliases.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 015c37dca2a..32d5e0fdf2a 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -187,7 +187,6 @@ mapAliases ({
   libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux || stdenv.hostPlatform.libc != "glibc") gettext; # added 2018-03-14
   libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28
   liblapackWithoutAtlas = liblapack; # added 2018-11-05
-  libmysql = mariadb-connector-c; # added # 2017-12-28, this was a misnomer refering to libmysqlclient
   libqrencode = qrencode;  # added 2019-01-01
   librecad2 = librecad;  # backwards compatibility alias, added 2015-10
   libsysfs = sysfsutils; # added 2018-04-25
-- 
GitLab


From edf389d92b06633ebdb9b12fa5b83746bad9e001 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Mon, 9 Sep 2019 16:05:01 +0300
Subject: [PATCH 0090/2254] mariadb-connector-c: drop v2.3

---
 pkgs/servers/sql/mariadb/connector-c/2_3.nix  |  6 ------
 .../sql/mariadb/connector-c/default.nix       | 20 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  2 --
 3 files changed, 8 insertions(+), 20 deletions(-)
 delete mode 100644 pkgs/servers/sql/mariadb/connector-c/2_3.nix

diff --git a/pkgs/servers/sql/mariadb/connector-c/2_3.nix b/pkgs/servers/sql/mariadb/connector-c/2_3.nix
deleted file mode 100644
index 5a256887cba..00000000000
--- a/pkgs/servers/sql/mariadb/connector-c/2_3.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ callPackage, ... } @ args:
-
-callPackage ./. (args // {
-  version = "2.3.7";
-  sha256 = "13izi35vvxhiwl2dsnqrz75ciisy2s2k30giv7hrm01qlwnmiycl";
-})
diff --git a/pkgs/servers/sql/mariadb/connector-c/default.nix b/pkgs/servers/sql/mariadb/connector-c/default.nix
index e8430b01eb6..0e030268540 100644
--- a/pkgs/servers/sql/mariadb/connector-c/default.nix
+++ b/pkgs/servers/sql/mariadb/connector-c/default.nix
@@ -6,10 +6,7 @@
 
 with stdenv.lib;
 
-let
-  isVer3 = versionAtLeast version "3.0";
-
-in stdenv.mkDerivation {
+stdenv.mkDerivation {
   pname = "mariadb-connector-c";
   inherit version;
 
@@ -24,7 +21,8 @@ in stdenv.mkDerivation {
   cmakeFlags = [
     "-DWITH_EXTERNAL_ZLIB=ON"
     "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock"
-  ] ++ optional isVer3 "-DWITH_CURL=ON";
+    "-DWITH_CURL=ON"
+  ];
 
   # The cmake setup-hook uses $out/lib by default, this is not the case here.
   preConfigure = optionalString stdenv.isDarwin ''
@@ -32,7 +30,7 @@ in stdenv.mkDerivation {
   '';
 
   nativeBuildInputs = [ cmake ];
-  propagatedBuildInputs = [ openssl zlib ] ++ optional isVer3 curl;
+  propagatedBuildInputs = [ curl openssl zlib ];
   buildInputs = [ libiconv ];
 
   enableParallelBuilding = true;
@@ -41,12 +39,10 @@ in stdenv.mkDerivation {
     ln -sv mariadb_config $out/bin/mysql_config
     ln -sv mariadb $out/lib/mysql
     ln -sv mariadb $out/include/mysql
-    ${optionalString isVer3 ''
-      ln -sv libmariadbclient.a $out/lib/mariadb/libmysqlclient.a
-      ln -sv libmariadbclient.a $out/lib/mariadb/libmysqlclient_r.a
-      ln -sv libmariadb.so $out/lib/mariadb/libmysqlclient.so
-      ln -sv libmariadb.so $out/lib/mariadb/libmysqlclient_r.so
-    ''}
+    ln -sv libmariadbclient.a $out/lib/mariadb/libmysqlclient.a
+    ln -sv libmariadbclient.a $out/lib/mariadb/libmysqlclient_r.a
+    ln -sv libmariadb.so $out/lib/mariadb/libmysqlclient.so
+    ln -sv libmariadb.so $out/lib/mariadb/libmysqlclient_r.so
   '';
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c93eb92deb1..720580ce272 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14887,10 +14887,8 @@ in
   rpcbind = callPackage ../servers/rpcbind { };
 
   libmysqlclient = libmysqlclient_3_1;
-  libmysqlclient_2_3 = mariadb-connector-c_2_3;
   libmysqlclient_3_1 = mariadb-connector-c_3_1;
   mariadb-connector-c = mariadb-connector-c_3_1;
-  mariadb-connector-c_2_3 = callPackage ../servers/sql/mariadb/connector-c/2_3.nix { };
   mariadb-connector-c_3_1 = callPackage ../servers/sql/mariadb/connector-c/3_1.nix { };
 
   mariadb-galera = mariadb-galera_25;
-- 
GitLab


From b984c90f48dc6ddb1a282b8b68e5fe60b340bade Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Mon, 9 Sep 2019 16:31:57 +0200
Subject: [PATCH 0091/2254] ddgr: 1.6 -> 1.7

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

diff --git a/pkgs/applications/misc/ddgr/default.nix b/pkgs/applications/misc/ddgr/default.nix
index 3cbb091a4e2..9b877c2594b 100644
--- a/pkgs/applications/misc/ddgr/default.nix
+++ b/pkgs/applications/misc/ddgr/default.nix
@@ -1,20 +1,26 @@
 {stdenv, fetchFromGitHub, python3}:
 
 stdenv.mkDerivation rec {
-  version = "1.6";
+  version = "1.7";
   pname = "ddgr";
 
   src = fetchFromGitHub {
     owner = "jarun";
     repo = "ddgr";
     rev = "v${version}";
-    sha256 = "04ybbjsf9hpn2p5cjjm15cwvv0mwrmdi19iifrym6ps3rmll0p3c";
+    sha256 = "0kcl8z9w8iwn3pxay1pfahhw6vs2l1dp60yfv3i19in4ac9va7m0";
   };
 
   buildInputs = [ python3 ];
 
   makeFlags = "PREFIX=$(out)";
 
+  preBuild = ''
+    # Version 1.7 was released as 1.6
+    # https://github.com/jarun/ddgr/pull/95
+    sed -i "s/_VERSION_ = '1.6'/_VERSION_ = '1.7'/" ddgr
+  '';
+
   postInstall = ''
     mkdir -p "$out/share/bash-completion/completions/"
     cp "auto-completion/bash/ddgr-completion.bash" "$out/share/bash-completion/completions/"
-- 
GitLab


From 8d0af1fd000cc43e5f572c2cd0efb7cf6aded5bd Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Mon, 9 Sep 2019 23:59:41 +0200
Subject: [PATCH 0092/2254] kmail: add akonadi to propagated user env

Kmail will not work if akonadi is not in the PATH
---
 pkgs/applications/kde/kmail.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/kde/kmail.nix b/pkgs/applications/kde/kmail.nix
index a58b3b8c45d..ab24f15a14b 100644
--- a/pkgs/applications/kde/kmail.nix
+++ b/pkgs/applications/kde/kmail.nix
@@ -7,7 +7,7 @@
   kmail-account-wizard, kmailtransport, knotifications, knotifyconfig,
   kontactinterface, kparts, kpty, kservice, ktextwidgets, ktnef, kwallet,
   kwidgetsaddons, kwindowsystem, kxmlgui, libgravatar, libksieve, mailcommon,
-  messagelib, pim-sieve-editor, qtscript, qtwebengine,
+  messagelib, pim-sieve-editor, qtscript, qtwebengine, akonadi
 }:
 
 mkDerivation {
@@ -25,6 +25,6 @@ mkDerivation {
     ktextwidgets ktnef kwidgetsaddons kwindowsystem kxmlgui libgravatar
     libksieve mailcommon messagelib pim-sieve-editor qtscript qtwebengine
   ];
-  propagatedUserEnvPkgs = [ kdepim-runtime kwallet ];
+  propagatedUserEnvPkgs = [ kdepim-runtime kwallet akonadi ];
   patches = [ ./kmail.patch ];
 }
-- 
GitLab


From cdddddd7cc772b297cc6fa688847efa0a2db66f2 Mon Sep 17 00:00:00 2001
From: Michiel Leenaars <ml.software@leenaa.rs>
Date: Tue, 10 Sep 2019 00:36:50 +0200
Subject: [PATCH 0093/2254] pythonPackages.msrplib: 0.19 -> 0.19.2

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

diff --git a/pkgs/development/python-modules/msrplib/default.nix b/pkgs/development/python-modules/msrplib/default.nix
index 32a759a6a49..bba72ea62bb 100644
--- a/pkgs/development/python-modules/msrplib/default.nix
+++ b/pkgs/development/python-modules/msrplib/default.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "python-msrplib";
-  version = "0.19";
+  version = "0.19.2";
 
   src = fetchdarcs {
     url = "http://devel.ag-projects.com/repositories/${pname}";
     rev = "release-${version}";
-    sha256 = "0jqvvssbwzq7bwqn3wrjfnpj8zb558mynn2visnlrcma6b57yhwd";
+    sha256 = "0d0krwv4hhspjgppnvh0iz51bvdbz23cjasgrppip7x8b00514gz";
   };
 
   propagatedBuildInputs = [ eventlib application gnutls ];
-- 
GitLab


From df25be6d7bc0df496cf0a611740791daf1361045 Mon Sep 17 00:00:00 2001
From: Michiel Leenaars <ml.software@leenaa.rs>
Date: Tue, 10 Sep 2019 00:37:32 +0200
Subject: [PATCH 0094/2254] pythonPackages.xcaplib: 1.2.0 -> 1.2.1

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

diff --git a/pkgs/development/python-modules/xcaplib/default.nix b/pkgs/development/python-modules/xcaplib/default.nix
index 7dc67072046..7002c43cf2b 100644
--- a/pkgs/development/python-modules/xcaplib/default.nix
+++ b/pkgs/development/python-modules/xcaplib/default.nix
@@ -8,13 +8,13 @@
 
 buildPythonPackage rec {
   pname = "python-xcaplib";
-  version = "1.2.0";
+  version = "1.2.1";
   disabled = isPy3k;
 
   src = fetchdarcs {
     url = "http://devel.ag-projects.com/repositories/${pname}";
     rev = "release-${version}";
-    sha256 = "0vna5r4ihv7z1yx6r93954jqskcxky77znzy1m9dg9vna1dgwfdn";
+    sha256 = "15ww8f0a9zh37mypw5s4q1qk44cwf7jlhc9q1z4vjlpvnzimg54v";
   };
 
   propagatedBuildInputs = [ eventlib application ];
-- 
GitLab


From dc051dfdef1ec4c9bdd90b228764b6c24372597e Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Mon, 9 Sep 2019 16:43:26 -0400
Subject: [PATCH 0095/2254] kexectools: fix build on i686

https://hydra.nixos.org/build/99957229
See: https://src.fedoraproject.org/rpms/kexec-tools/c/cb1e5463b5298b064e9b6c86ad6fe3505fec9298
---
 pkgs/os-specific/linux/kexectools/default.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kexectools/default.nix b/pkgs/os-specific/linux/kexectools/default.nix
index 3d3215e6b4b..4e9007c7362 100644
--- a/pkgs/os-specific/linux/kexectools/default.nix
+++ b/pkgs/os-specific/linux/kexectools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPackages, fetchurl, zlib }:
+{ stdenv, buildPackages, fetchurl, zlib, fetchpatch }:
 
 stdenv.mkDerivation rec {
   pname = "kexec-tools";
@@ -18,6 +18,16 @@ stdenv.mkDerivation rec {
   depsBuildBuild = [ buildPackages.stdenv.cc ];
   buildInputs = [ zlib ];
 
+  patches = [
+    # fix build on i686
+    # See: https://src.fedoraproject.org/rpms/kexec-tools/c/cb1e5463b5298b064e9b6c86ad6fe3505fec9298
+    (fetchpatch {
+      name = "kexec-tools-2.0.20-fix-broken-multiboot2-buliding-for-i386.patch";
+      url = "https://src.fedoraproject.org/rpms/kexec-tools/raw/cb1e5463b5298b064e9b6c86ad6fe3505fec9298/f/kexec-tools-2.0.20-fix-broken-multiboot2-buliding-for-i386.patch";
+      sha256 = "1kzmcsbhwfdgxlc5s88ir0n494phww1j16yk0z42x09qlkxxkg0l";
+    })
+  ];
+
   meta = with stdenv.lib; {
     homepage = http://horms.net/projects/kexec/kexec-tools;
     description = "Tools related to the kexec Linux feature";
-- 
GitLab


From 7b4132f99e2977bb33fc5b085bd18320e886be77 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Thu, 5 Sep 2019 23:59:20 -0400
Subject: [PATCH 0096/2254] aws-adfs: 1.12.3 -> 1.17.0

This commit also adds it as an application in all-packages.nix, since it's
typically used as just a stand-alone cmdline tool.
---
 pkgs/development/python-modules/aws-adfs/default.nix | 10 +++++-----
 pkgs/top-level/all-packages.nix                      |  2 ++
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/aws-adfs/default.nix b/pkgs/development/python-modules/aws-adfs/default.nix
index 9e761b3698d..4912e8f9994 100644
--- a/pkgs/development/python-modules/aws-adfs/default.nix
+++ b/pkgs/development/python-modules/aws-adfs/default.nix
@@ -2,12 +2,12 @@
 , pytest, pytestrunner, pytestcov, mock, glibcLocales, lxml, boto3, requests, click, configparser }:
 
 buildPythonPackage rec {
-  version = "1.12.3";
   pname = "aws-adfs";
+  version = "1.17.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b7df3fbe0572eb12294b2e072327ca97fd94d435b39cc10612e460cde914b831";
+    sha256 = "0wnsmwjpfhxilmvrqvwilcf3h9p5m5ixi5gn9bgkr3gwd2laxf54";
   };
 
   # Relax version constraint
@@ -24,10 +24,10 @@ buildPythonPackage rec {
   checkInputs = [ glibcLocales pytest pytestrunner pytestcov mock ];
   propagatedBuildInputs = [ lxml boto3 requests click configparser ];
 
-  meta = {
+  meta = with lib; {
     description = "Command line tool to ease aws cli authentication against ADFS";
     homepage = https://github.com/venth/aws-adfs;
-    license = lib.licenses.psfl;
-    maintainers = [ lib.maintainers.bhipple ];
+    license = licenses.psfl;
+    maintainers = [ maintainers.bhipple ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eee4ab70538..c2be4160a3f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9156,6 +9156,8 @@ in
 
   awf = callPackage ../development/tools/misc/awf { };
 
+  aws-adfs = with python3Packages; toPythonApplication aws-adfs;
+
   electron_6 = callPackage ../development/tools/electron/6.x.nix { };
 
   electron_5 = callPackage ../development/tools/electron/5.x.nix { };
-- 
GitLab


From 6cdbc4de22d34fb28e9bb3110d6ff9702c400f89 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 9 Sep 2019 22:42:03 -0400
Subject: [PATCH 0097/2254] static: disable python on macOS

We get an infinite recursion otherwise due to some issue in darwin
bootstrapping.

Fixes #68393
---
 pkgs/top-level/static.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix
index eac84cfc1a8..bc6c3525f77 100644
--- a/pkgs/top-level/static.nix
+++ b/pkgs/top-level/static.nix
@@ -14,7 +14,7 @@ self: super: let
   inherit (super.stdenvAdapters) makeStaticBinaries
                                  makeStaticLibraries
                                  propagateBuildInputs;
-  inherit (super.lib) foldl optional flip id composeExtensions;
+  inherit (super.lib) foldl optional flip id composeExtensions optionalAttrs;
   inherit (super) makeSetupHook;
 
   # Best effort static binaries. Will still be linked to libSystem,
@@ -72,10 +72,12 @@ in {
   ncurses = super.ncurses.override {
     enableStatic = true;
   };
-  libxml2 = super.libxml2.override {
+  libxml2 = super.libxml2.override ({
     enableShared = false;
     enableStatic = true;
-  };
+  } // optionalAttrs super.stdenv.hostPlatform.isDarwin {
+    pythonSupport = false;
+  });
   zlib = super.zlib.override {
     static = true;
     shared = false;
-- 
GitLab


From 88610926bbbf735c6c3c65667de02c9d3e45bef2 Mon Sep 17 00:00:00 2001
From: Michiel Leenaars <ml.software@leenaa.rs>
Date: Tue, 10 Sep 2019 07:58:38 +0200
Subject: [PATCH 0098/2254] pythonPackages.eventlib: 0.2.2 -> 0.2.4

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

diff --git a/pkgs/development/python-modules/eventlib/default.nix b/pkgs/development/python-modules/eventlib/default.nix
index 147e18d45f4..837ffa0d86d 100644
--- a/pkgs/development/python-modules/eventlib/default.nix
+++ b/pkgs/development/python-modules/eventlib/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "python-eventlib";
-  version = "0.2.2";
+  version = "0.2.4";
   # Judging from SyntaxError
   disabled = isPy3k;
 
   src = fetchdarcs {
     url = "http://devel.ag-projects.com/repositories/${pname}";
     rev = "release-${version}";
-    sha256 = "1zxhpq8i4jwsk7wmfncqfm211hqikj3hp38cfv509924bi76wak8";
+    sha256 = "1w1axsm6w9bl2smzxmyk4in1lsm8gk8ma6y183m83cpj66aqxg4z";
   };
 
   propagatedBuildInputs = [ greenlet ];
-- 
GitLab


From f075f52177da9a3b92834cf47abc8f46ed7b34a5 Mon Sep 17 00:00:00 2001
From: Michiel Leenaars <ml.software@leenaa.rs>
Date: Tue, 10 Sep 2019 07:59:25 +0200
Subject: [PATCH 0099/2254] pythonPackages.python-application: 2.0.2 -> 2.7.0

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

diff --git a/pkgs/development/python-modules/application/default.nix b/pkgs/development/python-modules/application/default.nix
index 520e01723e6..654567cc23f 100644
--- a/pkgs/development/python-modules/application/default.nix
+++ b/pkgs/development/python-modules/application/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "python-application";
-  version = "2.0.2";
+  version = "2.7.0";
   disabled = isPy3k;
 
   src = fetchdarcs {
     url = "http://devel.ag-projects.com/repositories/${pname}";
     rev = "release-${version}";
-    sha256 = "19dszv44py8qrq0jcjdycxpa7z2p8hi3ijq9gnqdsazbbjzf9svn";
+    sha256 = "1xpyk2v3naxkjhpyris58dxg1lxbraxgjd6f7w1sah5j0sk7psla";
   };
 
   buildInputs = [ zope_interface ];
-- 
GitLab


From 733f3d28c203251397c22b4e960b9b7f13b7bc99 Mon Sep 17 00:00:00 2001
From: Okinan <okinan@chiru.no>
Date: Tue, 10 Sep 2019 01:30:40 -0500
Subject: [PATCH 0100/2254] pythonPackages: merkletools: init at 1.0.3

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

diff --git a/pkgs/development/python-modules/merkletools/default.nix b/pkgs/development/python-modules/merkletools/default.nix
new file mode 100644
index 00000000000..92acdaf58ed
--- /dev/null
+++ b/pkgs/development/python-modules/merkletools/default.nix
@@ -0,0 +1,20 @@
+{ lib, buildPythonPackage, fetchPypi, pysha3 }:
+
+buildPythonPackage rec {
+  pname = "merkletools";
+  version = "1.0.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0pdik5sil0xcrwdcgdfy86c5qcfrz24r0gfc8m8bxa0i7h7x2v9l";
+  };
+
+  propagatedBuildInputs = [ pysha3 ];
+
+  meta = with lib; {
+    description = "Python tools for creating Merkle trees, generating Merkle proofs, and verification of Merkle proofs";
+    homepage = "https://github.com/Tierion/pymerkletools";
+    license = licenses.mit;
+    maintainers = with maintainers; [ chiiruno ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index aa4d6521c00..df7e1cc4024 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3875,6 +3875,8 @@ in {
 
   pymysqlsa = callPackage ../development/python-modules/pymysqlsa { };
 
+  merkletools = callPackage ../development/python-modules/merkletools { };
+
   monosat = disabledIf (!isPy3k) (pkgs.monosat.python { inherit buildPythonPackage; inherit (self) cython; });
 
   monotonic = callPackage ../development/python-modules/monotonic { };
-- 
GitLab


From c4451da8f8844b4ed32f50c7a6dc4c8f10da68b8 Mon Sep 17 00:00:00 2001
From: Okinan <okinan@chiru.no>
Date: Tue, 10 Sep 2019 01:30:44 -0500
Subject: [PATCH 0101/2254] zeronet: 0.6.5 -> 0.7.1

---
 .../networking/p2p/zeronet/default.nix        | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/p2p/zeronet/default.nix b/pkgs/applications/networking/p2p/zeronet/default.nix
index 88f07f0a8a5..ce5a99b1e5f 100644
--- a/pkgs/applications/networking/p2p/zeronet/default.nix
+++ b/pkgs/applications/networking/p2p/zeronet/default.nix
@@ -1,19 +1,25 @@
-{ stdenv, fetchFromGitHub, python2Packages }:
+{ stdenv, fetchFromGitHub, python3Packages }:
 
-python2Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "zeronet";
-  version = "0.6.5";
+  version = "0.7.1";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "HelloZeroNet";
     repo = "ZeroNet";
     rev = "v${version}";
-    sha256 = "1b9jg525jq40czyw9xh9ck90fl9rzrdmzl2mzhqqhz23idb60j4a";
+    sha256 = "04prgicm0yjh2klcxdgwx1mvlsxxi2bdkzfcvysvixbgq20wjvdk";
   };
 
-  propagatedBuildInputs = with python2Packages; [ msgpack gevent ];
-  buildPhase = "${python2Packages.python.interpreter} -O -m compileall .";
+  propagatedBuildInputs = with python3Packages; [
+    gevent msgpack base58 merkletools rsa pysocks pyasn1 websocket_client
+    gevent-websocket rencode bitcoinlib maxminddb pyopenssl
+  ];
+
+  buildPhase = ''
+    ${python3Packages.python.interpreter} -O -m compileall .
+  '';
 
   installPhase = ''
     mkdir -p $out/share
@@ -23,7 +29,7 @@ python2Packages.buildPythonApplication rec {
   postFixup = ''
     makeWrapper "$out/share/zeronet.py" "$out/bin/zeronet" \
       --set PYTHONPATH "$PYTHONPATH" \
-      --set PATH ${python2Packages.python}/bin
+      --set PATH ${python3Packages.python}/bin
   '';
 
   meta = with stdenv.lib; {
-- 
GitLab


From 14bb6f07dfcab8b623aeeb1487f6491f90e39c7c Mon Sep 17 00:00:00 2001
From: Michiel Leenaars <ml.software@leenaa.rs>
Date: Tue, 10 Sep 2019 10:00:11 +0200
Subject: [PATCH 0102/2254] datefudge: 1.22 -> 1.23

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

diff --git a/pkgs/tools/system/datefudge/default.nix b/pkgs/tools/system/datefudge/default.nix
index 6927c64bf48..63aa563bfa0 100644
--- a/pkgs/tools/system/datefudge/default.nix
+++ b/pkgs/tools/system/datefudge/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation {
   pname = "datefudge";
-  version = "1.22";
+  version = "1.23";
 
   src = fetchgit {
     url = "https://salsa.debian.org/debian/datefudge.git";
-    rev = "fe27db47a0f250fb56164114fff8ae8d5af47ab6";
-    sha256 = "1fmd05r00wx4zc90lbi804jl7xwdl11jq2a1kp5lqimk3yyvfw4c";
+    rev = "090d3aace17640478f7f5119518b2f4196f62617";
+    sha256 = "0r9g8v9xnv60hq3j20wqy34kyig3sc2pisjxl4irn7jjx85f1spv";
   };
 
   patchPhase = ''
-- 
GitLab


From 90608a38924e014148f40be3a5d88b8ebc6ccb66 Mon Sep 17 00:00:00 2001
From: Enno Lohmeier <enno@nerdworks.de>
Date: Sat, 7 Sep 2019 17:55:45 +0200
Subject: [PATCH 0103/2254] drone: 0.8.6 -> 1.3.1

---
 .../continuous-integration/drone/default.nix  | 21 ++++------
 .../continuous-integration/drone/deps.nix     | 38 -------------------
 2 files changed, 8 insertions(+), 51 deletions(-)
 delete mode 100644 pkgs/development/tools/continuous-integration/drone/deps.nix

diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix
index 53ad6f4c2f6..12386ab2c08 100644
--- a/pkgs/development/tools/continuous-integration/drone/default.nix
+++ b/pkgs/development/tools/continuous-integration/drone/default.nix
@@ -1,26 +1,21 @@
-{ stdenv, fetchFromGitHub, buildGoPackage, go-bindata, go-bindata-assetfs }:
+{ stdenv, fetchFromGitHub, buildGoModule }:
 
-buildGoPackage rec {
-  pname = "drone.io";
-  version = "0.8.6-20180727-${stdenv.lib.strings.substring 0 7 revision}";
-  revision = "c48150767c2700d35dcc29b110a81c8b5969175e";
+buildGoModule rec {
+  name = "drone.io-${version}";
+  version = "1.3.1";
   goPackagePath = "github.com/drone/drone";
 
-  # These dependencies pulled (in `drone` buildprocess) via Makefile,
-  # so I extracted them here, all revisions pinned by same date, as ${version}
-  goDeps= ./deps.nix;
-
-  nativeBuildInputs = [ go-bindata go-bindata-assetfs ];
+  modSha256 = "128nnn8axnr30y3r46d11g8qznbsg82z2qw9qbxkq3bja6nz8fn2";
 
   src = fetchFromGitHub {
     owner = "drone";
     repo = "drone";
-    rev = revision;
-    sha256 = "0miq2012nivvr1ysi3aa2xrr5ak3mf0l3drybyc83iycy0kp4bda";
+    rev = "v${version}";
+    sha256 = "0vp86k1z3r79sx0ln3vndzx8ycf0dbiv7jk56ncmk390iiz2a4g4";
   };
 
   meta = with stdenv.lib; {
-    maintainers = with maintainers; [ avnik vdemeester ];
+    maintainers = with maintainers; [ elohmeier vdemeester ];
     license = licenses.asl20;
     description = "Continuous Integration platform built on container technology";
   };
diff --git a/pkgs/development/tools/continuous-integration/drone/deps.nix b/pkgs/development/tools/continuous-integration/drone/deps.nix
deleted file mode 100644
index 86059fba28d..00000000000
--- a/pkgs/development/tools/continuous-integration/drone/deps.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-[
-  {
-    goPackagePath = "github.com/drone/drone-ui";
-    fetch = {
-      type = "git";
-      url = "https://github.com/drone/drone-ui";
-      rev = "5a497bd6cd5c3c17c53b00d40bcda1bf6f68f475";
-      sha256 = "1666xlz3dg468izfwprg17sgb3f4ppn5sj5klds3wgdfrjjm4v57";
-    };
-  }
-  {
-    goPackagePath = "github.com/drone/mq";
-    fetch = {
-      type = "git";
-      url = "https://github.com/drone/mq";
-      rev = "280af2a3b9c7d9ce90d625150dfff972c6c190b8";
-      sha256 = "10a24yq3ya8mvs7j6m7lqhyws7jd923rnih75ciq1g327qxf743s";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/net";
-    fetch = {
-      type = "git";
-      url = "https://github.com/golang/net";
-      rev = "dfa909b99c79129e1100513e5cd36307665e5723";
-      sha256 = "0nsansy1yqy1kzh5wpv3zi85s0chxfq0ha8knhgnfa0wj0k8q0il";
-    };
-  }
-  {
-    goPackagePath = "github.com/golang/protobuf";
-    fetch = {
-      type = "git";
-      url = "https://github.com/golang/protobuf";
-      rev = "b4deda0973fb4c70b50d226b1af49f3da59f5265";
-      sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq";
-    };
-  }
-]
-- 
GitLab


From 3c1563f49da173948f5150619233a97277a267e0 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 10 Sep 2019 07:11:53 +0200
Subject: [PATCH 0104/2254] wrapGAppsHook: add wrapGApp helper

---
 doc/languages-frameworks/gnome.xml                | 10 ++++++++++
 pkgs/build-support/setup-hooks/wrap-gapps-hook.sh | 10 ++++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/doc/languages-frameworks/gnome.xml b/doc/languages-frameworks/gnome.xml
index 9e0f21a6c74..e9310d7c1ae 100644
--- a/doc/languages-frameworks/gnome.xml
+++ b/doc/languages-frameworks/gnome.xml
@@ -258,6 +258,16 @@ mkDerivation {
      </para>
     </listitem>
    </varlistentry>
+   <varlistentry xml:id="ssec-gnome-common-issues-weird-location">
+    <term>
+     I need to wrap a binary outside <filename>bin</filename> and <filename>libexec</filename> directories.
+    </term>
+    <listitem>
+     <para>
+      You can manually trigger the wrapping with <function>wrapGApp</function> in <literal>preFixup</literal> phase. It takes a path to a program as a first argument; the remaining arguments are passed directly to <function xlink:href="#fun-wrapProgram">wrapProgram</function> function.
+     </para>
+    </listitem>
+   </varlistentry>
   </variablelist>
  </section>
 </section>
diff --git a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
index 906b1db9d10..26a1107b85f 100644
--- a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
+++ b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
@@ -8,6 +8,12 @@ find_gio_modules() {
 
 addEnvHooks "$targetOffset" find_gio_modules
 
+wrapGApp() {
+    local program="$1"
+    shift 1
+    wrapProgram "$program" "${gappsWrapperArgs[@]}" "$@"
+}
+
 # Note: $gappsWrapperArgs still gets defined even if $dontWrapGApps is set.
 wrapGAppsHook() {
   # guard against running multiple times (e.g. due to propagation)
@@ -52,7 +58,7 @@ wrapGAppsHook() {
         find "${targetDir}" -type f -executable -print0 \
           | while IFS= read -r -d '' file; do
           echo "Wrapping program '${file}'"
-          wrapProgram "${file}" "${gappsWrapperArgs[@]}"
+          wrapGApp "${file}"
         done
       fi
     done
@@ -71,7 +77,7 @@ wrapGAppsHook() {
           fi
         done
         echo "Wrapping link: '$linkPath'"
-        wrapProgram "${linkPath}" "${gappsWrapperArgs[@]}"
+        wrapGApp "${linkPath}"
       done
     fi
   fi
-- 
GitLab


From c54ba9aec997005fd41305a4b44b8cd35fea20ce Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 10 Sep 2019 07:12:31 +0200
Subject: [PATCH 0105/2254] wrapGAppsHook: simplify taking env vars

using indirect variable access must be better than eval
---
 pkgs/build-support/setup-hooks/wrap-gapps-hook.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
index 26a1107b85f..98e2ec9c2e5 100644
--- a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
+++ b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
@@ -41,8 +41,7 @@ wrapGAppsHook() {
   fi
 
   for v in $wrapPrefixVariables GST_PLUGIN_SYSTEM_PATH_1_0 GI_TYPELIB_PATH GRL_PLUGIN_PATH; do
-    eval local dummy="\$$v"
-    gappsWrapperArgs+=(--prefix $v : "$dummy")
+    gappsWrapperArgs+=(--prefix $v : "${!v}")
   done
 
   if [[ -z "$dontWrapGApps" ]]; then
-- 
GitLab


From f2718dbbc028dfcf323b61ea321badb30e972a0b Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 10 Sep 2019 07:15:37 +0200
Subject: [PATCH 0106/2254] wrapGAppsHook: address some shellcheck suggestions

These should not cause issues in practice but it is good idea to handle them.

* prefix and targetOffset are mandatory, as they are always set by the generic builder.
* wrapPrefixVariables and dontWrapGApps are now defaulting to empty value, as they are not mandatory.
---
 pkgs/build-support/setup-hooks/wrap-gapps-hook.sh | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
index 98e2ec9c2e5..717740f1f20 100644
--- a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
+++ b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
@@ -1,12 +1,13 @@
+# shellcheck shell=bash
 gappsWrapperArgs=()
 
 find_gio_modules() {
-    if [ -d "$1"/lib/gio/modules ] && [ -n "$(ls -A $1/lib/gio/modules)" ] ; then
+    if [ -d "$1/lib/gio/modules" ] && [ -n "$(ls -A "$1/lib/gio/modules")" ] ; then
         gappsWrapperArgs+=(--prefix GIO_EXTRA_MODULES : "$1/lib/gio/modules")
     fi
 }
 
-addEnvHooks "$targetOffset" find_gio_modules
+addEnvHooks "${targetOffset:?}" find_gio_modules
 
 wrapGApp() {
     local program="$1"
@@ -32,19 +33,19 @@ wrapGAppsHook() {
     gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH")
   fi
 
-  if [ -d "$prefix/share" ]; then
+  if [ -d "${prefix:?}/share" ]; then
     gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$prefix/share")
   fi
 
-  if [ -d "$prefix/lib/gio/modules" ] && [ -n "$(ls -A $prefix/lib/gio/modules)" ] ; then
+  if [ -d "$prefix/lib/gio/modules" ] && [ -n "$(ls -A "$prefix/lib/gio/modules")" ] ; then
     gappsWrapperArgs+=(--prefix GIO_EXTRA_MODULES : "$prefix/lib/gio/modules")
   fi
 
-  for v in $wrapPrefixVariables GST_PLUGIN_SYSTEM_PATH_1_0 GI_TYPELIB_PATH GRL_PLUGIN_PATH; do
-    gappsWrapperArgs+=(--prefix $v : "${!v}")
+  for v in ${wrapPrefixVariables:-} GST_PLUGIN_SYSTEM_PATH_1_0 GI_TYPELIB_PATH GRL_PLUGIN_PATH; do
+    gappsWrapperArgs+=(--prefix "$v" : "${!v}")
   done
 
-  if [[ -z "$dontWrapGApps" ]]; then
+  if [[ -z "${dontWrapGApps:-}" ]]; then
     targetDirsThatExist=()
     targetDirsRealPath=()
 
-- 
GitLab


From 9d152886ab7276d1c229133c15be170486f78cdd Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 10 Sep 2019 07:47:11 +0200
Subject: [PATCH 0107/2254] nixos/doc/gnome: fix example

---
 doc/languages-frameworks/gnome.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/languages-frameworks/gnome.xml b/doc/languages-frameworks/gnome.xml
index e9310d7c1ae..8b3151d5bf9 100644
--- a/doc/languages-frameworks/gnome.xml
+++ b/doc/languages-frameworks/gnome.xml
@@ -210,7 +210,7 @@ mkDerivation {
   dontWrapGApps = true;
 
   # Arguments to be passed to `makeWrapper`, only used by qt5’s mkDerivation
-  qtWrapperArgs [
+  qtWrapperArgs = [
     "\${gappsWrapperArgs[@]}"
   ];
 }
-- 
GitLab


From 9b6789de7386edd9e7d199a8e15cb1c3c1f026b3 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 10 Sep 2019 08:13:10 +0200
Subject: [PATCH 0108/2254] tree-wide: replace wrapProgram with wrapGApp

where appropriate
---
 pkgs/applications/graphics/gnome-photos/default.nix     | 2 +-
 pkgs/applications/misc/mysql-workbench/default.nix      | 4 ++--
 pkgs/applications/science/electronics/kicad/default.nix | 2 +-
 pkgs/desktops/deepin/dde-daemon/default.nix             | 2 +-
 pkgs/desktops/gnome-3/apps/gnome-characters/default.nix | 2 +-
 pkgs/desktops/gnome-3/extensions/gsconnect/default.nix  | 4 ++--
 pkgs/os-specific/linux/firmware/fwupd/default.nix       | 6 +++---
 pkgs/tools/graphics/zbar/default.nix                    | 4 +++-
 8 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/graphics/gnome-photos/default.nix b/pkgs/applications/graphics/gnome-photos/default.nix
index f591dd5a60d..ea4cf986f39 100644
--- a/pkgs/applications/graphics/gnome-photos/default.nix
+++ b/pkgs/applications/graphics/gnome-photos/default.nix
@@ -102,7 +102,7 @@ stdenv.mkDerivation rec {
   '';
 
   postFixup = ''
-    wrapProgram "${placeholder "installedTests"}/libexec/installed-tests/gnome-photos/basic.py" "''${gappsWrapperArgs[@]}"
+    wrapGApp "${placeholder "installedTests"}/libexec/installed-tests/gnome-photos/basic.py"
   '';
 
   passthru = {
diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix
index 172f999223a..135745feec3 100644
--- a/pkgs/applications/misc/mysql-workbench/default.nix
+++ b/pkgs/applications/misc/mysql-workbench/default.nix
@@ -85,8 +85,8 @@ in stdenv.mkDerivation rec {
     find -L "$out/bin" -type f -executable -print0 \
       | while IFS= read -r -d ''' file; do
       if [[ "''${file}" != *-bin ]]; then
-        echo "Wrapping program ''${file}"
-        wrapProgram "''${file}" "''${gappsWrapperArgs[@]}"
+        echo "Wrapping program $file"
+        wrapGApp "$file"
       fi
     done
   '';
diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix
index 3d169f50104..ac9362990a8 100644
--- a/pkgs/applications/science/electronics/kicad/default.nix
+++ b/pkgs/applications/science/electronics/kicad/default.nix
@@ -107,7 +107,7 @@ in stdenv.mkDerivation rec {
     buildPythonPath "$out $pythonPath"
     gappsWrapperArgs+=(--set PYTHONPATH "$program_PYTHONPATH")
 
-    wrapProgram "$out/bin/kicad" "''${gappsWrapperArgs[@]}"
+    wrapGApp "$out/bin/kicad"
   '';
 
   meta = {
diff --git a/pkgs/desktops/deepin/dde-daemon/default.nix b/pkgs/desktops/deepin/dde-daemon/default.nix
index 19089a6b050..da217186e27 100644
--- a/pkgs/desktops/deepin/dde-daemon/default.nix
+++ b/pkgs/desktops/deepin/dde-daemon/default.nix
@@ -115,7 +115,7 @@ buildGoPackage rec {
   postFixup = ''
     # wrapGAppsHook does not work with binaries outside of $out/bin or $out/libexec
     for binary in $out/lib/deepin-daemon/*; do
-      wrapProgram $binary "''${gappsWrapperArgs[@]}"
+      wrapGApp "$binary"
     done
 
     searchHardCodedPaths $out  # debugging
diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
index ac1e9ee85c0..9e44573d2e3 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
       sed -e $"2iimports.package._findEffectiveEntryPointName = () => \'$(basename $file)\' " \
         -i $file
 
-      wrapProgram $file "''${gappsWrapperArgs[@]}"
+      wrapGApp "$file"
     done
   '';
 
diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
index cff0db665bb..cef00513df1 100644
--- a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
@@ -76,8 +76,8 @@ stdenv.mkDerivation rec {
   postFixup = ''
     # Let’s wrap the daemons
     for file in $out/share/gnome-shell/extensions/gsconnect@andyholmes.github.io/service/{{daemon,nativeMessagingHost}.js,components/folks.py}; do
-      echo "Wrapping program ''${file}"
-      wrapProgram "''${file}" "''${gappsWrapperArgs[@]}"
+      echo "Wrapping program $file"
+      wrapGApp "$file"
     done
   '';
 
diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix
index 9fdf9ca0bc1..75144799d01 100644
--- a/pkgs/os-specific/linux/firmware/fwupd/default.nix
+++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix
@@ -237,9 +237,9 @@ stdenv.mkDerivation rec {
   postFixup = ''
     find -L "$out/bin" "$out/libexec" -type f -executable -print0 \
       | while IFS= read -r -d ''' file; do
-      if [[ "''${file}" != *.efi ]]; then
-        echo "Wrapping program ''${file}"
-        wrapProgram "''${file}" "''${gappsWrapperArgs[@]}"
+      if [[ "$file" != *.efi ]]; then
+        echo "Wrapping program $file"
+        wrapGApp "$file"
       fi
     done
   '';
diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix
index cb5ea25211c..e2b9f534ae5 100644
--- a/pkgs/tools/graphics/zbar/default.nix
+++ b/pkgs/tools/graphics/zbar/default.nix
@@ -8,6 +8,7 @@
 , qtbase
 , qtx11extras
 , wrapQtAppsHook
+, wrapGAppsHook
 , gtk3
 , xmlto
 , docbook_xsl
@@ -36,6 +37,7 @@ stdenv.mkDerivation rec {
     autoreconfHook
     docbook_xsl
     wrapQtAppsHook
+    wrapGAppsHook
   ];
 
   buildInputs = [
@@ -68,7 +70,7 @@ stdenv.mkDerivation rec {
   dontWrapGApps = true;
 
   postFixup = lib.optionalString enableVideo ''
-    wrapProgram "$out/bin/zbarcam-gtk" "''${gappsWrapperArgs[@]}"
+    wrapGApp "$out/bin/zbarcam-gtk"
     wrapQtApp "$out/bin/zbarcam-qt"
   '';
 
-- 
GitLab


From f6e8ee75338e2322513f5bd05b73f2e8f06eaf55 Mon Sep 17 00:00:00 2001
From: Ruud van Asseldonk <dev@veniogames.com>
Date: Tue, 10 Sep 2019 21:02:51 +0200
Subject: [PATCH 0109/2254] squashfsTools: use updated Darwin patch

This new patch is the patch between 4.4, and commit [1], a pull request
at [2] to upsteam Mac and BSD compatibility. That pull request is
itself a rebase of an older pull request for an earlier version of
squashfs-tools. I squashed all commits between 4.4 and [1], apart from
the BSD-specific ones, and exported the new patch from that. Attached
below is the git diff --ignore-space-change between squashfs-tools 4.4
with the previous patch applied, and with the new patch applied.

[1]: 7d31beec53e6245d3405d6ef2b96e9811ae07044
[2]: https://github.com/plougher/squashfs-tools/pull/69

---

diff --git a/squashfs-tools/info.c b/squashfs-tools/info.c
index 8efefe6..5c2f835 100644
--- a/squashfs-tools/info.c
+++ b/squashfs-tools/info.c
@@ -159,7 +159,7 @@ void *info_thrd(void *arg)
 			case EINTR:
 				continue;
 			default:
-				BAD_ERROR("sigwaitfailed "
+				BAD_ERROR("sigwait failed "
 					"because %s\n", strerror(errno));
 			}
 		}
diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c
index 67d86a5..3607448 100644
--- a/squashfs-tools/mksquashfs.c
+++ b/squashfs-tools/mksquashfs.c
@@ -35,7 +35,10 @@
 #include <stddef.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#ifdef linux
+#ifndef linux
+#include <sys/sysctl.h>
+#else
+#include <sys/sysinfo.h>
 #include <sys/sysmacros.h>
 #endif
 #include <fcntl.h>
@@ -52,7 +55,6 @@
 #include <sys/wait.h>
 #include <limits.h>
 #include <ctype.h>
-#include <sys/sysinfo.h>

 #ifndef FNM_EXTMATCH /* glibc extension */
 	#define FNM_EXTMATCH 0
@@ -5191,7 +5193,17 @@ int parse_mode(char *arg, mode_t *res)

 int get_physical_memory()
 {
+	/*
+	 * Long longs are used here because with PAE, a 32-bit
+	 * machine can have more than 4GB of physical memory
+	 *
+	 * sysconf(_SC_PHYS_PAGES) relies on /proc being mounted.
+	 * If it fails use sysinfo, if that fails return 0
+	 */
+	long long num_pages = sysconf(_SC_PHYS_PAGES);
+	long long page_size = sysconf(_SC_PAGESIZE);
 	int phys_mem;
+
 #ifndef linux
 	#ifdef HW_MEMSIZE
 		#define SYSCTL_PHYSMEM HW_MEMSIZE
@@ -5221,16 +5233,6 @@ int get_physical_memory()
 	}
   #undef SYSCTL_PHYSMEM
 #else
-	/*
-	 * Long longs are used here because with PAE, a 32-bit
-	 * machine can have more than 4GB of physical memory
-	 *
-	 * sysconf(_SC_PHYS_PAGES) relies on /proc being mounted.
-	 * If it fails use sysinfo, if that fails return 0
-	 */
-	long long num_pages = sysconf(_SC_PHYS_PAGES);
-	long long page_size = sysconf(_SC_PAGESIZE);
-
 	if(num_pages == -1 || page_size == -1) {
 		struct sysinfo sys;
 		int res = sysinfo(&sys);
diff --git a/squashfs-tools/mksquashfs.h b/squashfs-tools/mksquashfs.h
index 88d0b5c..1beefef 100644
--- a/squashfs-tools/mksquashfs.h
+++ b/squashfs-tools/mksquashfs.h
@@ -24,7 +24,6 @@
  * mksquashfs.h
  *
  */
-#include <pthread.h>

 struct dir_info {
 	char			*pathname;
diff --git a/squashfs-tools/pseudo.c b/squashfs-tools/pseudo.c
index f8fd529..48e6b27 100644
--- a/squashfs-tools/pseudo.c
+++ b/squashfs-tools/pseudo.c
@@ -30,7 +30,6 @@
 #include <errno.h>
 #include <string.h>
 #include <stdlib.h>
-#include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
diff --git a/squashfs-tools/unsquashfs.c b/squashfs-tools/unsquashfs.c
index 00615ce..c1a6183 100644
--- a/squashfs-tools/unsquashfs.c
+++ b/squashfs-tools/unsquashfs.c
@@ -38,7 +38,6 @@
 #include <sys/sysinfo.h>
 #include <sys/sysmacros.h>
 #endif
-
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/resource.h>
@@ -1085,7 +1084,7 @@ int create_inode(char *pathname, struct inode *i)
 			break;
 		case SQUASHFS_SYMLINK_TYPE:
 		case SQUASHFS_LSYMLINK_TYPE: {
-			struct timespec times[2] = {
+			struct timeval times[2] = {
 				{ i->time, 0 },
 				{ i->time, 0 }
 			};
@@ -1104,8 +1103,7 @@ int create_inode(char *pathname, struct inode *i)
 				goto failed;
 			}

-			res = utimensat(AT_FDCWD, pathname, times,
-					AT_SYMLINK_NOFOLLOW);
+			res = lutimes(pathname, times);
 			if(res == -1) {
 				EXIT_UNSQUASH_STRICT("create_inode: failed to set time on "
 					"%s, because %s\n", pathname,
---
 pkgs/tools/filesystems/squashfs/darwin.patch | 139 ++++++++++---------
 1 file changed, 72 insertions(+), 67 deletions(-)

diff --git a/pkgs/tools/filesystems/squashfs/darwin.patch b/pkgs/tools/filesystems/squashfs/darwin.patch
index 28d70cdf03d..eb2dc24ec1a 100644
--- a/pkgs/tools/filesystems/squashfs/darwin.patch
+++ b/pkgs/tools/filesystems/squashfs/darwin.patch
@@ -1,5 +1,11 @@
+Patch based on commits by Dave Vasilevsky <dave@vasilevsky.ca> and
+Blake Riley <blake.riley@gmail.com>, squashed into a single patch,
+with BSD-specific changes omitted.
+
+See also https://github.com/plougher/squashfs-tools/pull/69.
+
 diff --git a/squashfs-tools/action.c b/squashfs-tools/action.c
-index 4b06ccb..26365e7 100644
+index 4b06ccb..3cad2ab 100644
 --- a/squashfs-tools/action.c
 +++ b/squashfs-tools/action.c
 @@ -38,6 +38,10 @@
@@ -7,7 +13,7 @@ index 4b06ccb..26365e7 100644
  #include <errno.h>
  
 +#ifndef FNM_EXTMATCH /* glibc extension */
-+ #define FNM_EXTMATCH 0
++	#define FNM_EXTMATCH 0
 +#endif
 +
  #include "squashfs_fs.h"
@@ -28,7 +34,7 @@ index 4b06ccb..26365e7 100644
  
  /*
 diff --git a/squashfs-tools/info.c b/squashfs-tools/info.c
-index fe23d78..8efefe6 100644
+index fe23d78..5c2f835 100644
 --- a/squashfs-tools/info.c
 +++ b/squashfs-tools/info.c
 @@ -144,31 +144,22 @@ void dump_state()
@@ -37,12 +43,12 @@ index fe23d78..8efefe6 100644
  	sigset_t sigmask;
 -	struct timespec timespec = { .tv_sec = 1, .tv_nsec = 0 };
 -	int sig, waiting = 0;
-+    int sig, err, waiting = 0;
++	int sig, err, waiting = 0;
  
  	sigemptyset(&sigmask);
  	sigaddset(&sigmask, SIGQUIT);
  	sigaddset(&sigmask, SIGHUP);
-+    sigaddset(&sigmask, SIGALRM);
++	sigaddset(&sigmask, SIGALRM);
  
  	while(1) {
 -		if(waiting)
@@ -64,7 +70,7 @@ index fe23d78..8efefe6 100644
  				continue;
  			default:
 -				BAD_ERROR("sigtimedwait/sigwaitinfo failed "
-+				BAD_ERROR("sigwaitfailed "
++				BAD_ERROR("sigwait failed "
  					"because %s\n", strerror(errno));
  			}
  		}
@@ -83,21 +89,35 @@ index fe23d78..8efefe6 100644
  }
  
 diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c
-index a45b77f..6d186ea 100644
+index a45b77f..3607448 100644
 --- a/squashfs-tools/mksquashfs.c
 +++ b/squashfs-tools/mksquashfs.c
-@@ -52,6 +52,10 @@
+@@ -35,7 +35,12 @@
+ #include <stddef.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#ifndef linux
++#include <sys/sysctl.h>
++#else
++#include <sys/sysinfo.h>
+ #include <sys/sysmacros.h>
++#endif
+ #include <fcntl.h>
+ #include <errno.h>
+ #include <dirent.h>
+@@ -50,7 +55,10 @@
+ #include <sys/wait.h>
+ #include <limits.h>
  #include <ctype.h>
- #include <sys/sysinfo.h>
- 
+-#include <sys/sysinfo.h>
++
 +#ifndef FNM_EXTMATCH /* glibc extension */
-+    #define FNM_EXTMATCH 0
++	#define FNM_EXTMATCH 0
 +#endif
-+
+ 
  #ifndef linux
  #define __BYTE_ORDER BYTE_ORDER
- #define __BIG_ENDIAN BIG_ENDIAN
-@@ -4348,6 +4352,7 @@ void initialise_threads(int readq, int fragq, int bwriteq, int fwriteq,
+@@ -4348,6 +4356,7 @@ void initialise_threads(int readq, int fragq, int bwriteq, int fwriteq,
  	sigemptyset(&sigmask);
  	sigaddset(&sigmask, SIGQUIT);
  	sigaddset(&sigmask, SIGHUP);
@@ -105,11 +125,10 @@ index a45b77f..6d186ea 100644
  	if(pthread_sigmask(SIG_BLOCK, &sigmask, NULL) != 0)
  		BAD_ERROR("Failed to set signal mask in intialise_threads\n");
  
-@@ -5184,6 +5189,36 @@ int parse_mode(char *arg, mode_t *res)
+@@ -5195,6 +5204,35 @@ int get_physical_memory()
+ 	long long page_size = sysconf(_SC_PAGESIZE);
+ 	int phys_mem;
  
- int get_physical_memory()
- {
-+	int phys_mem;
 +#ifndef linux
 +	#ifdef HW_MEMSIZE
 +		#define SYSCTL_PHYSMEM HW_MEMSIZE
@@ -137,20 +156,12 @@ index a45b77f..6d186ea 100644
 +		ERROR_EXIT("  Defaulting to least viable amount\n");
 +		phys_mem = SQUASHFS_LOWMEM;
 +	}
-+	#undef SYSCTL_PHYSMEM
++  #undef SYSCTL_PHYSMEM
 +#else
- 	/*
- 	 * Long longs are used here because with PAE, a 32-bit
- 	 * machine can have more than 4GB of physical memory
-@@ -5193,7 +5228,6 @@ int get_physical_memory()
- 	 */
- 	long long num_pages = sysconf(_SC_PHYS_PAGES);
- 	long long page_size = sysconf(_SC_PAGESIZE);
--	int phys_mem;
- 
  	if(num_pages == -1 || page_size == -1) {
  		struct sysinfo sys;
-@@ -5207,6 +5241,7 @@ int get_physical_memory()
+ 		int res = sysinfo(&sys);
+@@ -5207,6 +5245,7 @@ int get_physical_memory()
  	}
  
  	phys_mem = num_pages * page_size >> 20;
@@ -158,30 +169,6 @@ index a45b77f..6d186ea 100644
  
  	if(phys_mem < SQUASHFS_LOWMEM)
  		BAD_ERROR("Mksquashfs requires more physical memory than is "
-diff --git a/squashfs-tools/mksquashfs.h b/squashfs-tools/mksquashfs.h
-index 1beefef..88d0b5c 100644
---- a/squashfs-tools/mksquashfs.h
-+++ b/squashfs-tools/mksquashfs.h
-@@ -24,6 +24,7 @@
-  * mksquashfs.h
-  *
-  */
-+#include <pthread.h>
- 
- struct dir_info {
- 	char			*pathname;
-diff --git a/squashfs-tools/pseudo.c b/squashfs-tools/pseudo.c
-index 48e6b27..f8fd529 100644
---- a/squashfs-tools/pseudo.c
-+++ b/squashfs-tools/pseudo.c
-@@ -30,6 +30,7 @@
- #include <errno.h>
- #include <string.h>
- #include <stdlib.h>
-+#include <sys/stat.h>
- #include <sys/types.h>
- #include <sys/wait.h>
- #include <sys/stat.h>
 diff --git a/squashfs-tools/read_xattrs.c b/squashfs-tools/read_xattrs.c
 index 4debedf..3257c30 100644
 --- a/squashfs-tools/read_xattrs.c
@@ -203,10 +190,10 @@ index 4debedf..3257c30 100644
  extern int read_block(int, long long, long long *, int, void *);
  
 diff --git a/squashfs-tools/unsquashfs.c b/squashfs-tools/unsquashfs.c
-index 727f1d5..00615ce 100644
+index 727f1d5..c1a6183 100644
 --- a/squashfs-tools/unsquashfs.c
 +++ b/squashfs-tools/unsquashfs.c
-@@ -32,8 +32,13 @@
+@@ -32,8 +32,12 @@
  #include "stdarg.h"
  #include "fnmatch_compat.h"
  
@@ -216,11 +203,29 @@ index 727f1d5..00615ce 100644
  #include <sys/sysinfo.h>
  #include <sys/sysmacros.h>
 +#endif
-+
  #include <sys/types.h>
  #include <sys/time.h>
  #include <sys/resource.h>
-@@ -2235,6 +2240,7 @@ void initialise_threads(int fragment_buffer_size, int data_buffer_size)
+@@ -1080,7 +1084,7 @@ int create_inode(char *pathname, struct inode *i)
+ 			break;
+ 		case SQUASHFS_SYMLINK_TYPE:
+ 		case SQUASHFS_LSYMLINK_TYPE: {
+-			struct timespec times[2] = {
++			struct timeval times[2] = {
+ 				{ i->time, 0 },
+ 				{ i->time, 0 }
+ 			};
+@@ -1099,8 +1103,7 @@ int create_inode(char *pathname, struct inode *i)
+ 				goto failed;
+ 			}
+ 
+-			res = utimensat(AT_FDCWD, pathname, times,
+-					AT_SYMLINK_NOFOLLOW);
++			res = lutimes(pathname, times);
+ 			if(res == -1) {
+ 				EXIT_UNSQUASH_STRICT("create_inode: failed to set time on "
+ 					"%s, because %s\n", pathname,
+@@ -2235,6 +2238,7 @@ void initialise_threads(int fragment_buffer_size, int data_buffer_size)
  	sigemptyset(&sigmask);
  	sigaddset(&sigmask, SIGQUIT);
  	sigaddset(&sigmask, SIGHUP);
@@ -229,7 +234,7 @@ index 727f1d5..00615ce 100644
  		EXIT_UNSQUASH("Failed to set signal mask in initialise_threads"
  			"\n");
 diff --git a/squashfs-tools/unsquashfs.h b/squashfs-tools/unsquashfs.h
-index 934618b..329eb9e 100644
+index 934618b..0e680ab 100644
 --- a/squashfs-tools/unsquashfs.h
 +++ b/squashfs-tools/unsquashfs.h
 @@ -46,6 +46,10 @@
@@ -237,7 +242,7 @@ index 934618b..329eb9e 100644
  #include <sys/time.h>
  
 +#ifndef FNM_EXTMATCH /* glibc extension */
-+    #define FNM_EXTMATCH 0
++	#define FNM_EXTMATCH 0
 +#endif
 +
  #ifndef linux
@@ -299,7 +304,7 @@ index c8e2b9b..7d4f7af 100644
  }
  
 diff --git a/squashfs-tools/unsquashfs_xattr.c b/squashfs-tools/unsquashfs_xattr.c
-index 7742dfe..26ccd39 100644
+index 7742dfe..f8cd3b6 100644
 --- a/squashfs-tools/unsquashfs_xattr.c
 +++ b/squashfs-tools/unsquashfs_xattr.c
 @@ -27,6 +27,11 @@
@@ -307,15 +312,15 @@ index 7742dfe..26ccd39 100644
  #include <sys/xattr.h>
  
 +#ifdef XATTR_NOFOLLOW /* Apple's xattrs */
-+    #define lsetxattr(path_, name_, val_, sz_, flags_) \
-+        setxattr(path_, name_, val_, sz_, 0, flags_ | XATTR_NOFOLLOW)
++	#define lsetxattr(path_, name_, val_, sz_, flags_) \
++		setxattr(path_, name_, val_, sz_, 0, flags_ | XATTR_NOFOLLOW)
 +#endif
 +
  #define NOSPACE_MAX 10
  
  extern int root_process;
 diff --git a/squashfs-tools/xattr.c b/squashfs-tools/xattr.c
-index 64dfd82..9c4532d 100644
+index 64dfd82..d82d186 100644
 --- a/squashfs-tools/xattr.c
 +++ b/squashfs-tools/xattr.c
 @@ -22,6 +22,14 @@
@@ -338,10 +343,10 @@ index 64dfd82..9c4532d 100644
  #include <sys/xattr.h>
  
 +#ifdef XATTR_NOFOLLOW /* Apple's xattrs */
-+    #define llistxattr(path_, buf_, sz_) \
-+        listxattr(path_, buf_, sz_, XATTR_NOFOLLOW)
-+    #define lgetxattr(path_, name_, val_, sz_) \
-+        getxattr(path_, name_, val_, sz_, 0, XATTR_NOFOLLOW)
++	#define llistxattr(path_, buf_, sz_) \
++		listxattr(path_, buf_, sz_, XATTR_NOFOLLOW)
++	#define lgetxattr(path_, name_, val_, sz_) \
++		getxattr(path_, name_, val_, sz_, 0, XATTR_NOFOLLOW)
 +#endif
 +
  #include "squashfs_fs.h"
-- 
GitLab


From 5d5cd70516001e79516d2ade8bcf31df208a4ef3 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Tue, 10 Sep 2019 21:17:51 +0200
Subject: [PATCH 0110/2254] openssl_1_0_2: 1.0.2s -> 1.0.2t

(cherry picked from commit aa6327c29c2de41a61db5aef8444385c531d4cc2)
---
 pkgs/development/libraries/openssl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 03082eab091..267c0d7e0f3 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -127,8 +127,8 @@ let
 in {
 
   openssl_1_0_2 = common {
-    version = "1.0.2s";
-    sha256 = "15mbmg8hf7s12vr3v2bdc0pi9y4pdbnsxhzk4fyyap42jaa5rgfa";
+    version = "1.0.2t";
+    sha256 = "15mbmg9hf7s12vr3v2bdc0pi9y4pdbnsxhzk4fyyap42jaa5rgfa";
     patches = [
       ./1.0.2/nix-ssl-cert-file.patch
 
-- 
GitLab


From d49fb86b1bd55bd9a0dcb4f80ca5aec95d7258e7 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Tue, 10 Sep 2019 21:19:48 +0200
Subject: [PATCH 0111/2254] openssl: 1.1.1c -> 1.1.1d

(cherry picked from commit 76d54c72acaaa32e2c1f8b13002f0ceac3b7b06f)
---
 pkgs/development/libraries/openssl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 267c0d7e0f3..a96bd6ade6a 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -139,8 +139,8 @@ in {
   };
 
   openssl_1_1 = common {
-    version = "1.1.1c";
-    sha256 = "142c7zdlz06hjrrvinb9f276czc78bnkyhd9xma621qmmmwk1yzn";
+    version = "1.1.1d";
+    sha256 = "1whinyw402z3b9xlb3qaxv4b9sk4w1bgh9k0y8df1z4x3yy92fhy";
     patches = [
       ./1.1/nix-ssl-cert-file.patch
 
-- 
GitLab


From 9630cb4b8dbeaa11a94f2a88a529e9ff1666f304 Mon Sep 17 00:00:00 2001
From: Roman Volosatovs <rvolosatovs@riseup.net>
Date: Tue, 10 Sep 2019 22:54:37 +0200
Subject: [PATCH 0112/2254] git-lfs: 2.7.2 -> 2.8.0, ensure go 1.13
 compatibility

---
 .../version-management/git-lfs/default.nix    | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix
index d9b5e170497..261ae3317f2 100644
--- a/pkgs/applications/version-management/git-lfs/default.nix
+++ b/pkgs/applications/version-management/git-lfs/default.nix
@@ -1,26 +1,32 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, fetchpatch }:
 
-buildGoPackage rec {
+buildGoModule rec {
   pname = "git-lfs";
-  version = "2.7.2";
-
-  goPackagePath = "github.com/git-lfs/git-lfs";
+  version = "2.8.0";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "git-lfs";
     repo = "git-lfs";
-    sha256 = "1nf40rbdz901vsahg5cm09pznpina6wimmxl0lmh8pn0mi51yzvc";
+    sha256 = "17x9q4g1acf51bxr9lfmd2ym7w740n4ghdi0ncmma77kwabw9d3x";
   };
 
+  modSha256 = "1rjscc52rh8kxa64canw3baljllp1c639nsn89hs5b86c8v1jav7";
+
+  patches = [
+    (fetchpatch {
+      # Build fails on v2.8.0 with go 1.13 due to invalid dependency version:
+      #   go: github.com/git-lfs/go-ntlm@v0.0.0-20190307203151-c5056e7fa066: invalid pseudo-version: does not match version-control timestamp (2019-04-01T17:57:52Z)
+      # TODO: Remove once https://github.com/git-lfs/git-lfs/commit/cd83f4224ce02398bdbf8b05830d92220d9b8e01 lands in a release.
+      url = "https://github.com/git-lfs/git-lfs/commit/cd83f4224ce02398bdbf8b05830d92220d9b8e01.patch";
+      sha256 = "17nmnlkknglqhzrky5caskbscrjp7kp9b5mfqznh1jx2hbxzlpbj";
+    })
+  ];
+
+  subPackages = [ "." ];
+
   preBuild = ''
-    pushd go/src/github.com/git-lfs/git-lfs
     go generate ./commands
-    popd
-  '';
-
-  postInstall = ''
-    rm -v $bin/bin/{man,script,cmd}
   '';
 
   meta = with stdenv.lib; {
-- 
GitLab


From 7810dcbd7b3c96aed45803de27dc17e71e400c42 Mon Sep 17 00:00:00 2001
From: Anthony Cowley <acowley@gmail.com>
Date: Tue, 10 Sep 2019 23:42:40 -0400
Subject: [PATCH 0113/2254] kdenlive: Avoid exposing configurable paths to melt

kdenlive's configuration stores two paths to the `mlt` package. These
may be set in the GUI under `Settings -> Configure Kdenlive ->
Environment`, and are persisted in $XDG_CONFIG_HOME/.kdenliverc

A problem I encountered was `kdenlive` holding on to old `mlt` paths
in these settings after a nixpkgs update, causing video rendering to fail.

The C++ class kdenlive uses for these settings is automatically
generated, so what this patch does is edit the declaration of the
relevant settings to provide default values with the absolute path of
`mlt` known at build time, and mark those settings as hidden.

In testing, I've found that changing `mlt` and rebuilding `kdenlive`
causes updated paths to appear in the GUI, and no entries to be added
to the kdenliverc file.

A shortcoming of this patch is that existing users will already have paths
stored in their `kdenliverc` files that can cause trouble. The hope is
that an approach like the one taken here will reduce this sort
of breakage moving forward.
---
 pkgs/applications/kde/kdenlive.nix   |  3 +++
 pkgs/applications/kde/mlt-path.patch | 22 ++++++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/applications/kde/mlt-path.patch

diff --git a/pkgs/applications/kde/kdenlive.nix b/pkgs/applications/kde/kdenlive.nix
index fa75dd1eb97..b7c691e9594 100644
--- a/pkgs/applications/kde/kdenlive.nix
+++ b/pkgs/applications/kde/kdenlive.nix
@@ -70,10 +70,13 @@ mkDerivation {
     kpurpose
     kdeclarative
   ];
+  patches = [ ./mlt-path.patch ];
+  inherit mlt;
   postPatch =
     # Module Qt5::Concurrent must be included in `find_package` before it is used.
     ''
       sed -i CMakeLists.txt -e '/find_package(Qt5 REQUIRED/ s|)| Concurrent)|'
+      substituteAllInPlace src/kdenlivesettings.kcfg
     '';
   meta = {
     license = with lib.licenses; [ gpl2Plus ];
diff --git a/pkgs/applications/kde/mlt-path.patch b/pkgs/applications/kde/mlt-path.patch
new file mode 100644
index 00000000000..9bfb66c1a83
--- /dev/null
+++ b/pkgs/applications/kde/mlt-path.patch
@@ -0,0 +1,22 @@
+diff -ruN old/src/kdenlivesettings.kcfg new/src/kdenlivesettings.kcfg
+--- old/src/kdenlivesettings.kcfg	2019-09-10 23:20:27.555392353 -0400
++++ new/src/kdenlivesettings.kcfg	2019-09-10 23:25:47.533964155 -0400
+@@ -378,14 +378,14 @@
+ </group>
+ 
+   <group name="env">
+-    <entry name="mltpath" type="Path">
++    <entry name="mltpath" type="Path" hidden="true">
+       <label>Mlt framework install path.</label>
+-      <default></default>
++      <default>@mlt@/share/mlt/profiles</default>
+     </entry>
+ 
+-    <entry name="rendererpath" type="Path">
++    <entry name="rendererpath" type="Path" hidden="true">
+       <label>Mlt melt renderer install path.</label>
+-      <default></default>
++      <default>@mlt@/bin/melt</default>
+     </entry>
+ 
+     <entry name="ffmpegpath" type="Path">
-- 
GitLab


From b8ab4451b53e3f8282ff3cbd8dde763e8b5e1d28 Mon Sep 17 00:00:00 2001
From: Uri Baghin <uri@canva.com>
Date: Wed, 11 Sep 2019 15:17:07 +1000
Subject: [PATCH 0114/2254] bazel-buildtools: 0.28.0 -> 0.29.0

---
 .../build-managers/bazel/buildtools/default.nix      |  6 +++---
 .../tools/build-managers/bazel/buildtools/deps.nix   | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix
index b606e547036..fc5f98a8ccb 100644
--- a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix
@@ -2,15 +2,15 @@
 
 buildGoPackage rec {
   pname = "bazel-buildtools";
-  version = "0.28.0";
-  rev = "d7ccc5507c6c16e04f5e362e558d70b8b179b052";
+  version = "0.29.0";
+  rev = "5bcc31df55ec1de770cb52887f2e989e7068301f";
 
   goPackagePath = "github.com/bazelbuild/buildtools";
 
   src = fetchgit {
     inherit rev;
     url = "https://github.com/bazelbuild/buildtools";
-    sha256 = "1d8zjgbg77sk27cz9pjz1h6ajwxqmvdzqgwa2jbh6iykibhpadq0";
+    sha256 = "0p2kgyawh3l46h7dzglqh9c7i16zr5mhmqlhy7qvr4skwif1l089";
   };
 
   goDeps = ./deps.nix;
diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/deps.nix b/pkgs/development/tools/build-managers/bazel/buildtools/deps.nix
index 5bae5b40653..4aaa37aa9a7 100644
--- a/pkgs/development/tools/build-managers/bazel/buildtools/deps.nix
+++ b/pkgs/development/tools/build-managers/bazel/buildtools/deps.nix
@@ -5,17 +5,17 @@
     fetch = {
       type = "git";
       url = "https://github.com/golang/protobuf";
-      rev = "6c65a5562fc06764971b7c5d05c76c75e84bdbf7";
-      sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym";
+      rev = "4c88cc3f1a34ffade77b79abc53335d1e511f25b";
+      sha256 = "0chbdc4q55z7myiwnbvhryc5ihf6cxh8p4w3c1imy2gyzjn9sf4r";
     };
   }
   {
-    goPackagePath = "github.com/google/skylark";
+    goPackagePath = "go.starlark.net";
     fetch = {
       type = "git";
-      url = "https://github.com/google/skylark";
-      rev = "a5f7082aabed29c0e429c722292c66ec8ecf9591";
-      sha256 = "16vsa6ngsby27n6indj441r1glcdfgipjcwcb0rs6zl2dqlqr286";
+      url = "https://github.com/google/starlark-go";
+      rev = "988906f77f657477aa7ebf4d8fb5f12d6c50b767";
+      sha256 = "0ivmbcq3avaxj8ixbc60h706d6wk9wi2mnsid6a483ia4yn7w9k8";
     };
   }
 ]
-- 
GitLab


From 5c62f526d5b32af06553ab90deb6d638eb4024fd Mon Sep 17 00:00:00 2001
From: Michiel Leenaars <ml.software@leenaa.rs>
Date: Tue, 10 Sep 2019 08:00:20 +0200
Subject: [PATCH 0115/2254] blink: 3.0.3 -> 3.2.0

---
 .../instant-messengers/blink/default.nix      | 33 ++++++++++++++-----
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/blink/default.nix b/pkgs/applications/networking/instant-messengers/blink/default.nix
index 001eadbb01d..62d0d738b50 100644
--- a/pkgs/applications/networking/instant-messengers/blink/default.nix
+++ b/pkgs/applications/networking/instant-messengers/blink/default.nix
@@ -1,14 +1,15 @@
 { stdenv, fetchdarcs, pythonPackages, libvncserver, zlib
-, gnutls, libvpx, makeDesktopItem }:
+, gnutls, libvpx, makeDesktopItem, mkDerivationWith }:
+
+mkDerivationWith pythonPackages.buildPythonApplication rec {
 
-pythonPackages.buildPythonApplication rec {
   pname = "blink";
-  version = "3.0.3";
+  version = "3.2.0";
 
   src = fetchdarcs {
     url = http://devel.ag-projects.com/repositories/blink-qt;
     rev = "release-${version}";
-    sha256 = "1vj6zzfvxygz0fzr8bhymcw6j4v8xmr0kba53d6qg285j7hj1bdi";
+    sha256 = "19rcwr5scw48qnj79q1pysw95fz9h98nyc3161qy2kph5g7dwkc3";
   };
 
   patches = [ ./pythonpath.patch ];
@@ -16,9 +17,20 @@ pythonPackages.buildPythonApplication rec {
     sed -i 's|@out@|'"''${out}"'|g' blink/resources.py
   '';
 
-  propagatedBuildInputs = with pythonPackages; [ pyqt5_with_qtwebkit cjson sipsimple twisted google_api_python_client ];
+  propagatedBuildInputs = with pythonPackages; [
+    pyqt5_with_qtwebkit
+    cjson
+    sipsimple
+    twisted
+    google_api_python_client
+  ];
 
-  buildInputs = [ pythonPackages.cython zlib libvncserver libvpx ];
+  buildInputs = [
+    pythonPackages.cython
+    zlib
+    libvncserver
+    libvpx
+  ];
 
   desktopItem = makeDesktopItem {
     name = "Blink";
@@ -30,9 +42,14 @@ pythonPackages.buildPythonApplication rec {
     categories = "Application;Internet;";
   };
 
+  dontWrapQtApps = true;
+
+  makeWrapperArgs = [
+    "\${qtWrapperArgs[@]}"
+    "--prefix LD_LIBRARY_PATH: ${gnutls.out}/lib"
+  ];
+
   postInstall = ''
-    wrapProgram $out/bin/blink \
-      --prefix LD_LIBRARY_PATH ":" ${gnutls.out}/lib
     mkdir -p "$out/share/applications"
     mkdir -p "$out/share/pixmaps"
     cp "$desktopItem"/share/applications/* "$out/share/applications"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fd2c3cbe3e4..787d7bc9538 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1100,7 +1100,7 @@ in
 
   bitbucket-cli = python2Packages.bitbucket-cli;
 
-  blink = callPackage ../applications/networking/instant-messengers/blink { };
+  blink = libsForQt5.callPackage ../applications/networking/instant-messengers/blink { };
 
   blockbook = callPackage ../servers/blockbook { };
 
-- 
GitLab


From 70ca8dab45d03967fa5a9d0ca0f6541f4200f025 Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Tue, 10 Sep 2019 21:40:15 +0200
Subject: [PATCH 0116/2254] lispPackages.iolib: patch lisp files to use the
 libfixposix library

---
 .../development/lisp-modules/quicklisp-to-nix-overrides.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
index 052bfb11949..fbc889342a4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
@@ -43,6 +43,12 @@ in
     propagatedBuildInputs = (x.propagatedBuildInputs or [])
      ++ (with pkgs; [libfixposix gcc])
      ;
+    overrides = y: (x.overrides y) // {
+      prePatch = ''
+        sed 's|default \"libfixposix\"|default \"${pkgs.libfixposix}/lib/libfixposix\"|' -i src/syscalls/ffi-functions-unix.lisp
+      '';
+    };
+
   };
   cxml = skipBuildPhase;
   wookie = addNativeLibs (with pkgs; [libuv openssl]);
-- 
GitLab


From 6309561d397076b0cabd8ef5ae8045c9e29b2241 Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Tue, 10 Sep 2019 21:47:20 +0200
Subject: [PATCH 0117/2254] lispPackages: add 11 packages

The following packages has been added:
- cl-css
- dbus
- log4cl
- mk-string-metrics
- prove-asdf
- sqlite
- str
- swank
- trivia
- trivial-clipboard
- unix-opts
---
 .../quicklisp-to-nix-output/alexandria.nix    |  14 +-
 .../quicklisp-to-nix-output/array-utils.nix   |  14 +-
 .../asdf-package-system.nix                   |  25 +
 .../quicklisp-to-nix-output/chunga.nix        |   4 +-
 .../quicklisp-to-nix-output/cl-css.nix        |  24 +
 .../quicklisp-to-nix-output/cl-dbi.nix        |   4 +-
 .../quicklisp-to-nix-output/cl-test-more.nix  |   4 +-
 .../quicklisp-to-nix-output/cl-utilities.nix  |   4 +-
 .../quicklisp-to-nix-output/cl-xmlspam.nix    |  34 +
 .../quicklisp-to-nix-output/clack-socket.nix  |   4 +-
 .../clack-v1-compat.nix                       |   4 +-
 .../quicklisp-to-nix-output/closure-html.nix  |   4 +-
 .../quicklisp-to-nix-output/css-lite.nix      |   4 +-
 .../quicklisp-to-nix-output/dbus.nix          |  34 +
 .../external-program.nix                      |   4 +-
 .../introspect-environment.nix                |  26 +
 .../lack-component.nix                        |   4 +-
 .../lack-middleware-backtrace.nix             |   6 +-
 .../quicklisp-to-nix-output/lack-util.nix     |   4 +-
 .../quicklisp-to-nix-output/log4cl.nix        |  30 +
 .../misc-extensions.nix                       |   4 +-
 .../mk-string-metrics.nix                     |  26 +
 .../quicklisp-to-nix-output/pcall.nix         |   4 +-
 .../quicklisp-to-nix-output/prove-asdf.nix    |  25 +
 .../quicklisp-to-nix-output/prove.nix         |   4 +-
 .../quicklisp-to-nix-output/simple-date.nix   |   4 +-
 .../quicklisp-to-nix-output/str.nix           |  26 +
 .../quicklisp-to-nix-output/trivia.nix        |  44 ++
 .../trivia_dot_balland2006.nix                |  43 ++
 .../trivia_dot_level0.nix                     |  29 +
 .../trivia_dot_level1.nix                     |  31 +
 .../trivia_dot_level2.nix                     |  38 +
 .../trivia_dot_trivial.nix                    |  43 ++
 .../trivial-clipboard.nix                     |  26 +
 .../quicklisp-to-nix-output/trivial-cltl2.nix |  26 +
 .../quicklisp-to-nix-output/trivial-utf-8.nix |   4 +-
 .../quicklisp-to-nix-output/type-i.nix        |  37 +
 .../quicklisp-to-nix-output/unix-opts.nix     |  25 +
 .../quicklisp-to-nix-output/xmls.nix          |   4 +-
 .../quicklisp-to-nix-overrides.nix            |  18 +-
 .../lisp-modules/quicklisp-to-nix-systems.txt |  37 +-
 .../lisp-modules/quicklisp-to-nix.nix         | 688 ++++++++++++------
 42 files changed, 1138 insertions(+), 299 deletions(-)
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-package-system.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-css.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-xmlspam.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/dbus.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/introspect-environment.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/log4cl.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/mk-string-metrics.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/prove-asdf.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/str.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_balland2006.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level0.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level1.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level2.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_trivial.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-clipboard.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-cltl2.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/type-i.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-opts.nix

diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
index 586502945ba..15b907e341e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 {
   baseName = ''alexandria'';
-  version = ''20181210-git'';
+  version = ''20190710-git'';
 
   description = ''Alexandria is a collection of portable public domain utilities.'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/alexandria/2018-12-10/alexandria-20181210-git.tgz'';
-    sha256 = ''0dg0gr7cgrrl70sq0sbz8i1zcli54bqg4x532wscz3156xrl2588'';
+    url = ''http://beta.quicklisp.org/archive/alexandria/2019-07-10/alexandria-20190710-git.tgz'';
+    sha256 = ''0127d5yyq46dpffvr4hla6d3ryiml48mxd2r6cgbg3mgz3b2nr70'';
   };
 
   packageName = "alexandria";
@@ -19,8 +19,8 @@ args @ { fetchurl, ... }:
 }
 /* (SYSTEM alexandria DESCRIPTION
     Alexandria is a collection of portable public domain utilities. SHA256
-    0dg0gr7cgrrl70sq0sbz8i1zcli54bqg4x532wscz3156xrl2588 URL
-    http://beta.quicklisp.org/archive/alexandria/2018-12-10/alexandria-20181210-git.tgz
-    MD5 2a7530a412cd94a56b6d4e5864fb8819 NAME alexandria FILENAME alexandria
-    DEPS NIL DEPENDENCIES NIL VERSION 20181210-git SIBLINGS (alexandria-tests)
+    0127d5yyq46dpffvr4hla6d3ryiml48mxd2r6cgbg3mgz3b2nr70 URL
+    http://beta.quicklisp.org/archive/alexandria/2019-07-10/alexandria-20190710-git.tgz
+    MD5 2b5abc0a266aeafe9029bf26db90b292 NAME alexandria FILENAME alexandria
+    DEPS NIL DEPENDENCIES NIL VERSION 20190710-git SIBLINGS (alexandria-tests)
     PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
index 1d64784a0a6..988b247482b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 {
   baseName = ''array-utils'';
-  version = ''20181018-git'';
+  version = ''20190710-git'';
 
   description = ''A few utilities for working with arrays.'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/array-utils/2018-10-18/array-utils-20181018-git.tgz'';
-    sha256 = ''1w13zwdhms4xbsnp9p6j71a4ppzglhxm81savyq0spf3zlm2l5yn'';
+    url = ''http://beta.quicklisp.org/archive/array-utils/2019-07-10/array-utils-20190710-git.tgz'';
+    sha256 = ''1fzsg3lqa79yrkad6fx924vai7i6m92i2rq8lyq37wrbwkhm7grh'';
   };
 
   packageName = "array-utils";
@@ -18,8 +18,8 @@ args @ { fetchurl, ... }:
   overrides = x: x;
 }
 /* (SYSTEM array-utils DESCRIPTION A few utilities for working with arrays.
-    SHA256 1w13zwdhms4xbsnp9p6j71a4ppzglhxm81savyq0spf3zlm2l5yn URL
-    http://beta.quicklisp.org/archive/array-utils/2018-10-18/array-utils-20181018-git.tgz
-    MD5 e32cc0474cf299ad1f5666e2864aa3d8 NAME array-utils FILENAME array-utils
-    DEPS NIL DEPENDENCIES NIL VERSION 20181018-git SIBLINGS (array-utils-test)
+    SHA256 1fzsg3lqa79yrkad6fx924vai7i6m92i2rq8lyq37wrbwkhm7grh URL
+    http://beta.quicklisp.org/archive/array-utils/2019-07-10/array-utils-20190710-git.tgz
+    MD5 58c39c2ba3d2c8cd8a695fb867b72c33 NAME array-utils FILENAME array-utils
+    DEPS NIL DEPENDENCIES NIL VERSION 20190710-git SIBLINGS (array-utils-test)
     PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-package-system.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-package-system.nix
new file mode 100644
index 00000000000..1a56676f036
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-package-system.nix
@@ -0,0 +1,25 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''asdf-package-system'';
+  version = ''20150608-git'';
+
+  description = ''System lacks description'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/asdf-package-system/2015-06-08/asdf-package-system-20150608-git.tgz'';
+    sha256 = ''17lfwfc15hcag8a2jsaxkx42wmz2mwkvxf6vb2h9cim7dwsnyy29'';
+  };
+
+  packageName = "asdf-package-system";
+
+  asdFilesToKeep = ["asdf-package-system.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM asdf-package-system DESCRIPTION System lacks description SHA256
+    17lfwfc15hcag8a2jsaxkx42wmz2mwkvxf6vb2h9cim7dwsnyy29 URL
+    http://beta.quicklisp.org/archive/asdf-package-system/2015-06-08/asdf-package-system-20150608-git.tgz
+    MD5 9eee9d811aec4894843ac1d8ae6cbccd NAME asdf-package-system FILENAME
+    asdf-package-system DEPS NIL DEPENDENCIES NIL VERSION 20150608-git SIBLINGS
+    NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix
index 3209735adb5..365ae1d6ef6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix
@@ -3,7 +3,7 @@ args @ { fetchurl, ... }:
   baseName = ''chunga'';
   version = ''20180131-git'';
 
-  description = '''';
+  description = ''System lacks description'';
 
   deps = [ args."trivial-gray-streams" ];
 
@@ -17,7 +17,7 @@ args @ { fetchurl, ... }:
   asdFilesToKeep = ["chunga.asd"];
   overrides = x: x;
 }
-/* (SYSTEM chunga DESCRIPTION NIL SHA256
+/* (SYSTEM chunga DESCRIPTION System lacks description SHA256
     0crlv6n6al7j9b40dpfjd13870ih5hzwra29xxfg3zg2zy2kdnrq URL
     http://beta.quicklisp.org/archive/chunga/2018-01-31/chunga-20180131-git.tgz
     MD5 044b684535b11b1eee1cf939bec6e14a NAME chunga FILENAME chunga DEPS
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-css.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-css.nix
new file mode 100644
index 00000000000..ba295b6e43a
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-css.nix
@@ -0,0 +1,24 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-css'';
+  version = ''20140914-git'';
+
+  description = ''Simple inline CSS generator'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-css/2014-09-14/cl-css-20140914-git.tgz'';
+    sha256 = ''16zjm10qqyv5v0ysvicbiscplrwlfr0assbf01gp73j1m108rn7n'';
+  };
+
+  packageName = "cl-css";
+
+  asdFilesToKeep = ["cl-css.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM cl-css DESCRIPTION Simple inline CSS generator SHA256
+    16zjm10qqyv5v0ysvicbiscplrwlfr0assbf01gp73j1m108rn7n URL
+    http://beta.quicklisp.org/archive/cl-css/2014-09-14/cl-css-20140914-git.tgz
+    MD5 a91f5a5d6a751af31d5c4fd8170f6ece NAME cl-css FILENAME cl-css DEPS NIL
+    DEPENDENCIES NIL VERSION 20140914-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
index 7a1b7d9f863..f495d7b4c82 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
@@ -3,7 +3,7 @@ args @ { fetchurl, ... }:
   baseName = ''cl-dbi'';
   version = ''20190521-git'';
 
-  description = '''';
+  description = ''System lacks description'';
 
   deps = [ args."alexandria" args."bordeaux-threads" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."named-readtables" args."split-sequence" args."trivial-types" ];
 
@@ -17,7 +17,7 @@ args @ { fetchurl, ... }:
   asdFilesToKeep = ["cl-dbi.asd"];
   overrides = x: x;
 }
-/* (SYSTEM cl-dbi DESCRIPTION NIL SHA256
+/* (SYSTEM cl-dbi DESCRIPTION System lacks description SHA256
     1q0hhgxnd91v020zh9ivlmzhzz5ald6q1bm5i5cawzh0xfyfhhvg URL
     http://beta.quicklisp.org/archive/cl-dbi/2019-05-21/cl-dbi-20190521-git.tgz
     MD5 ba77d3a955991b406f56cc1a09e71dc2 NAME cl-dbi FILENAME cl-dbi DEPS
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix
index b04a6cd8344..81b9153fff0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix
@@ -3,7 +3,7 @@ args @ { fetchurl, ... }:
   baseName = ''cl-test-more'';
   version = ''prove-20171130-git'';
 
-  description = '''';
+  description = ''System lacks description'';
 
   deps = [ args."alexandria" args."anaphora" args."cl-ansi-text" args."cl-colors" args."cl-ppcre" args."let-plus" args."prove" ];
 
@@ -17,7 +17,7 @@ args @ { fetchurl, ... }:
   asdFilesToKeep = ["cl-test-more.asd"];
   overrides = x: x;
 }
-/* (SYSTEM cl-test-more DESCRIPTION NIL SHA256
+/* (SYSTEM cl-test-more DESCRIPTION System lacks description SHA256
     13dmnnlk3r9fxxcvk6sqq8m0ifv9y80zgp1wg63nv1ykwdi7kyar URL
     http://beta.quicklisp.org/archive/prove/2017-11-30/prove-20171130-git.tgz
     MD5 630df4367537f799570be40242f8ed52 NAME cl-test-more FILENAME
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
index 4999da6d0b6..4ccd82f2ccc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
@@ -3,7 +3,7 @@ args @ { fetchurl, ... }:
   baseName = ''cl-utilities'';
   version = ''1.2.4'';
 
-  description = '''';
+  description = ''System lacks description'';
 
   deps = [ ];
 
@@ -17,7 +17,7 @@ args @ { fetchurl, ... }:
   asdFilesToKeep = ["cl-utilities.asd"];
   overrides = x: x;
 }
-/* (SYSTEM cl-utilities DESCRIPTION NIL SHA256
+/* (SYSTEM cl-utilities DESCRIPTION System lacks description SHA256
     1z2ippnv2wgyxpz15zpif7j7sp1r20fkjhm4n6am2fyp6a3k3a87 URL
     http://beta.quicklisp.org/archive/cl-utilities/2010-10-06/cl-utilities-1.2.4.tgz
     MD5 c3a4ba38b627448d3ed40ce888048940 NAME cl-utilities FILENAME
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-xmlspam.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-xmlspam.nix
new file mode 100644
index 00000000000..223c50f4716
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-xmlspam.nix
@@ -0,0 +1,34 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-xmlspam'';
+  version = ''20101006-http'';
+
+  description = ''Streaming pattern matching for XML'';
+
+  deps = [ args."alexandria" args."babel" args."cl-ppcre" args."closure-common" args."cxml" args."puri" args."trivial-features" args."trivial-gray-streams" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-xmlspam/2010-10-06/cl-xmlspam-20101006-http.tgz'';
+    sha256 = ''1mx1a6ab4irncrx5pamh7zng35m4c5wh0pw68avaz7fbz81s953h'';
+  };
+
+  packageName = "cl-xmlspam";
+
+  asdFilesToKeep = ["cl-xmlspam.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM cl-xmlspam DESCRIPTION Streaming pattern matching for XML SHA256
+    1mx1a6ab4irncrx5pamh7zng35m4c5wh0pw68avaz7fbz81s953h URL
+    http://beta.quicklisp.org/archive/cl-xmlspam/2010-10-06/cl-xmlspam-20101006-http.tgz
+    MD5 6e3a0944e96e17916b1445f4207babb8 NAME cl-xmlspam FILENAME cl-xmlspam
+    DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
+     (NAME cl-ppcre FILENAME cl-ppcre)
+     (NAME closure-common FILENAME closure-common) (NAME cxml FILENAME cxml)
+     (NAME puri FILENAME puri)
+     (NAME trivial-features FILENAME trivial-features)
+     (NAME trivial-gray-streams FILENAME trivial-gray-streams))
+    DEPENDENCIES
+    (alexandria babel cl-ppcre closure-common cxml puri trivial-features
+     trivial-gray-streams)
+    VERSION 20101006-http SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix
index 5f4a96dbcc4..4dcda09baea 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix
@@ -3,7 +3,7 @@ args @ { fetchurl, ... }:
   baseName = ''clack-socket'';
   version = ''clack-20190710-git'';
 
-  description = '''';
+  description = ''System lacks description'';
 
   deps = [ ];
 
@@ -17,7 +17,7 @@ args @ { fetchurl, ... }:
   asdFilesToKeep = ["clack-socket.asd"];
   overrides = x: x;
 }
-/* (SYSTEM clack-socket DESCRIPTION NIL SHA256
+/* (SYSTEM clack-socket DESCRIPTION System lacks description SHA256
     1642myknfaajcyqllnhn9s17yb6dbj1yh9wmg1kbplwq9c3yjs7k URL
     http://beta.quicklisp.org/archive/clack/2019-07-10/clack-20190710-git.tgz
     MD5 9d8869ca599652d68dd759c8a6adcd3d NAME clack-socket FILENAME
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
index 0234f764498..8f2a19519ac 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
@@ -3,7 +3,7 @@ args @ { fetchurl, ... }:
   baseName = ''clack-v1-compat'';
   version = ''clack-20190710-git'';
 
-  description = '''';
+  description = ''System lacks description'';
 
   deps = [ args."alexandria" args."anaphora" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."circular-streams" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."clack-test" args."dexador" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."let-plus" args."local-time" args."marshal" args."md5" args."named-readtables" args."nibbles" args."proc-parse" args."prove" args."quri" args."rfc2388" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."uiop" args."usocket" args."xsubseq" ];
 
@@ -17,7 +17,7 @@ args @ { fetchurl, ... }:
   asdFilesToKeep = ["clack-v1-compat.asd"];
   overrides = x: x;
 }
-/* (SYSTEM clack-v1-compat DESCRIPTION NIL SHA256
+/* (SYSTEM clack-v1-compat DESCRIPTION System lacks description SHA256
     1642myknfaajcyqllnhn9s17yb6dbj1yh9wmg1kbplwq9c3yjs7k URL
     http://beta.quicklisp.org/archive/clack/2019-07-10/clack-20190710-git.tgz
     MD5 9d8869ca599652d68dd759c8a6adcd3d NAME clack-v1-compat FILENAME
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix
index 2746ccff6c9..7df1e251ece 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix
@@ -3,7 +3,7 @@ args @ { fetchurl, ... }:
   baseName = ''closure-html'';
   version = ''20180711-git'';
 
-  description = '''';
+  description = ''System lacks description'';
 
   deps = [ args."alexandria" args."babel" args."closure-common" args."flexi-streams" args."trivial-features" args."trivial-gray-streams" ];
 
@@ -17,7 +17,7 @@ args @ { fetchurl, ... }:
   asdFilesToKeep = ["closure-html.asd"];
   overrides = x: x;
 }
-/* (SYSTEM closure-html DESCRIPTION NIL SHA256
+/* (SYSTEM closure-html DESCRIPTION System lacks description SHA256
     0ljcrz1wix77h1ywp0bixm3pb5ncmr1vdiwh8m1qzkygwpfjr8aq URL
     http://beta.quicklisp.org/archive/closure-html/2018-07-11/closure-html-20180711-git.tgz
     MD5 461dc8caa65385da5f2d1cd8dd4f965f NAME closure-html FILENAME
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix
index 0dd93c46fb2..c1c209093d0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix
@@ -3,7 +3,7 @@ args @ { fetchurl, ... }:
   baseName = ''css-lite'';
   version = ''20120407-git'';
 
-  description = '''';
+  description = ''System lacks description'';
 
   deps = [ ];
 
@@ -17,7 +17,7 @@ args @ { fetchurl, ... }:
   asdFilesToKeep = ["css-lite.asd"];
   overrides = x: x;
 }
-/* (SYSTEM css-lite DESCRIPTION NIL SHA256
+/* (SYSTEM css-lite DESCRIPTION System lacks description SHA256
     1gf1qqaxhly6ixh9ykqhg9b52s8p5wlwi46vp2k29qy7gmx4f1qg URL
     http://beta.quicklisp.org/archive/css-lite/2012-04-07/css-lite-20120407-git.tgz
     MD5 9b25afb0d2c3f0c32d2303ab1d3f570d NAME css-lite FILENAME css-lite DEPS
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbus.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbus.nix
new file mode 100644
index 00000000000..5043ff2e261
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbus.nix
@@ -0,0 +1,34 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''dbus'';
+  version = ''20190521-git'';
+
+  description = ''A D-BUS client library for Common Lisp'';
+
+  deps = [ args."alexandria" args."asdf-package-system" args."babel" args."cl-xmlspam" args."flexi-streams" args."ieee-floats" args."iolib" args."ironclad" args."trivial-garbage" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/dbus/2019-05-21/dbus-20190521-git.tgz'';
+    sha256 = ''0g4hsygy52rylhi19kxxhv9dbbirl6hdisgqw89whdxb9py6ifqq'';
+  };
+
+  packageName = "dbus";
+
+  asdFilesToKeep = ["dbus.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM dbus DESCRIPTION A D-BUS client library for Common Lisp SHA256
+    0g4hsygy52rylhi19kxxhv9dbbirl6hdisgqw89whdxb9py6ifqq URL
+    http://beta.quicklisp.org/archive/dbus/2019-05-21/dbus-20190521-git.tgz MD5
+    59e7ab92086503e4185273ec3f3ba3fc NAME dbus FILENAME dbus DEPS
+    ((NAME alexandria FILENAME alexandria)
+     (NAME asdf-package-system FILENAME asdf-package-system)
+     (NAME babel FILENAME babel) (NAME cl-xmlspam FILENAME cl-xmlspam)
+     (NAME flexi-streams FILENAME flexi-streams)
+     (NAME ieee-floats FILENAME ieee-floats) (NAME iolib FILENAME iolib)
+     (NAME ironclad FILENAME ironclad)
+     (NAME trivial-garbage FILENAME trivial-garbage))
+    DEPENDENCIES
+    (alexandria asdf-package-system babel cl-xmlspam flexi-streams ieee-floats
+     iolib ironclad trivial-garbage)
+    VERSION 20190521-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix
index b247ea27298..adecbd142d3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix
@@ -5,7 +5,7 @@ args @ { fetchurl, ... }:
 
   parasites = [ "external-program-test" ];
 
-  description = '''';
+  description = ''System lacks description'';
 
   deps = [ args."fiveam" args."trivial-features" ];
 
@@ -19,7 +19,7 @@ args @ { fetchurl, ... }:
   asdFilesToKeep = ["external-program.asd"];
   overrides = x: x;
 }
-/* (SYSTEM external-program DESCRIPTION NIL SHA256
+/* (SYSTEM external-program DESCRIPTION System lacks description SHA256
     1nl3mngh7vp2l9mfbdhni4nc164zznafnl74p1kv9j07n5fcpnyz URL
     http://beta.quicklisp.org/archive/external-program/2019-03-07/external-program-20190307-git.tgz
     MD5 b30fe104c34059506fd4c493fa79fe1a NAME external-program FILENAME
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/introspect-environment.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/introspect-environment.nix
new file mode 100644
index 00000000000..1677e5adcde
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/introspect-environment.nix
@@ -0,0 +1,26 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''introspect-environment'';
+  version = ''20151031-git'';
+
+  description = ''Small interface to portable but nonstandard introspection of CL environments.'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/introspect-environment/2015-10-31/introspect-environment-20151031-git.tgz'';
+    sha256 = ''0npydsmksbm3nisy9whnivmmhgdira74plmncmaklp7yhqsvwc30'';
+  };
+
+  packageName = "introspect-environment";
+
+  asdFilesToKeep = ["introspect-environment.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM introspect-environment DESCRIPTION
+    Small interface to portable but nonstandard introspection of CL environments.
+    SHA256 0npydsmksbm3nisy9whnivmmhgdira74plmncmaklp7yhqsvwc30 URL
+    http://beta.quicklisp.org/archive/introspect-environment/2015-10-31/introspect-environment-20151031-git.tgz
+    MD5 3c61088583f11791530edb2e18f5d6f0 NAME introspect-environment FILENAME
+    introspect-environment DEPS NIL DEPENDENCIES NIL VERSION 20151031-git
+    SIBLINGS (introspect-environment-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix
index cdac924b439..c94277bb211 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix
@@ -3,7 +3,7 @@ args @ { fetchurl, ... }:
   baseName = ''lack-component'';
   version = ''lack-20190521-git'';
 
-  description = '''';
+  description = ''System lacks description'';
 
   deps = [ ];
 
@@ -17,7 +17,7 @@ args @ { fetchurl, ... }:
   asdFilesToKeep = ["lack-component.asd"];
   overrides = x: x;
 }
-/* (SYSTEM lack-component DESCRIPTION NIL SHA256
+/* (SYSTEM lack-component DESCRIPTION System lacks description SHA256
     0ng1k5jq7icfi8c8r3wqj3qrqkh2lyav5ab6mf3l5y4bfwbil593 URL
     http://beta.quicklisp.org/archive/lack/2019-05-21/lack-20190521-git.tgz MD5
     7d7321550f0795e998c7afe4498e7a40 NAME lack-component FILENAME
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
index 68604485c77..3fc76c73576 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
@@ -3,7 +3,7 @@ args @ { fetchurl, ... }:
   baseName = ''lack-middleware-backtrace'';
   version = ''lack-20190521-git'';
 
-  description = '''';
+  description = ''System lacks description'';
 
   deps = [ args."uiop" ];
 
@@ -17,8 +17,8 @@ args @ { fetchurl, ... }:
   asdFilesToKeep = ["lack-middleware-backtrace.asd"];
   overrides = x: x;
 }
-/* (SYSTEM lack-middleware-backtrace DESCRIPTION NIL SHA256
-    0ng1k5jq7icfi8c8r3wqj3qrqkh2lyav5ab6mf3l5y4bfwbil593 URL
+/* (SYSTEM lack-middleware-backtrace DESCRIPTION System lacks description
+    SHA256 0ng1k5jq7icfi8c8r3wqj3qrqkh2lyav5ab6mf3l5y4bfwbil593 URL
     http://beta.quicklisp.org/archive/lack/2019-05-21/lack-20190521-git.tgz MD5
     7d7321550f0795e998c7afe4498e7a40 NAME lack-middleware-backtrace FILENAME
     lack-middleware-backtrace DEPS ((NAME uiop FILENAME uiop)) DEPENDENCIES
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
index cda7716151a..221ac216cf8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
@@ -3,7 +3,7 @@ args @ { fetchurl, ... }:
   baseName = ''lack-util'';
   version = ''lack-20190521-git'';
 
-  description = '''';
+  description = ''System lacks description'';
 
   deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" args."nibbles" ];
 
@@ -17,7 +17,7 @@ args @ { fetchurl, ... }:
   asdFilesToKeep = ["lack-util.asd"];
   overrides = x: x;
 }
-/* (SYSTEM lack-util DESCRIPTION NIL SHA256
+/* (SYSTEM lack-util DESCRIPTION System lacks description SHA256
     0ng1k5jq7icfi8c8r3wqj3qrqkh2lyav5ab6mf3l5y4bfwbil593 URL
     http://beta.quicklisp.org/archive/lack/2019-05-21/lack-20190521-git.tgz MD5
     7d7321550f0795e998c7afe4498e7a40 NAME lack-util FILENAME lack-util DEPS
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/log4cl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/log4cl.nix
new file mode 100644
index 00000000000..aeb37b15a49
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/log4cl.nix
@@ -0,0 +1,30 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''log4cl'';
+  version = ''20190107-git'';
+
+  parasites = [ "log4cl/syslog" "log4cl/test" ];
+
+  description = ''System lacks description'';
+
+  deps = [ args."alexandria" args."bordeaux-threads" args."stefil" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/log4cl/2019-01-07/log4cl-20190107-git.tgz'';
+    sha256 = ''0c5gsmz69jby5hmcl4igf1sh6xkwh8bx2jz6kd2gcnqjwq37h46p'';
+  };
+
+  packageName = "log4cl";
+
+  asdFilesToKeep = ["log4cl.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM log4cl DESCRIPTION System lacks description SHA256
+    0c5gsmz69jby5hmcl4igf1sh6xkwh8bx2jz6kd2gcnqjwq37h46p URL
+    http://beta.quicklisp.org/archive/log4cl/2019-01-07/log4cl-20190107-git.tgz
+    MD5 ecfa1f67902c776f46d192acd55f628c NAME log4cl FILENAME log4cl DEPS
+    ((NAME alexandria FILENAME alexandria)
+     (NAME bordeaux-threads FILENAME bordeaux-threads)
+     (NAME stefil FILENAME stefil))
+    DEPENDENCIES (alexandria bordeaux-threads stefil) VERSION 20190107-git
+    SIBLINGS (log4cl-examples log4slime) PARASITES (log4cl/syslog log4cl/test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix
index ef0da68cfe4..13d0b971d44 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix
@@ -3,7 +3,7 @@ args @ { fetchurl, ... }:
   baseName = ''misc-extensions'';
   version = ''20150608-git'';
 
-  description = '''';
+  description = ''System lacks description'';
 
   deps = [ ];
 
@@ -17,7 +17,7 @@ args @ { fetchurl, ... }:
   asdFilesToKeep = ["misc-extensions.asd"];
   overrides = x: x;
 }
-/* (SYSTEM misc-extensions DESCRIPTION NIL SHA256
+/* (SYSTEM misc-extensions DESCRIPTION System lacks description SHA256
     0pkvi1l5djwpvm0p8m0bcdjm61gxvzy0vgn415gngdixvbbchdqj URL
     http://beta.quicklisp.org/archive/misc-extensions/2015-06-08/misc-extensions-20150608-git.tgz
     MD5 ef8a05dd4382bb9d1e3960aeb77e332e NAME misc-extensions FILENAME
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mk-string-metrics.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mk-string-metrics.nix
new file mode 100644
index 00000000000..dc63474679a
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mk-string-metrics.nix
@@ -0,0 +1,26 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''mk-string-metrics'';
+  version = ''20180131-git'';
+
+  description = ''efficient implementations of various string metric algorithms'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/mk-string-metrics/2018-01-31/mk-string-metrics-20180131-git.tgz'';
+    sha256 = ''10xb9n6568nh019nq3phijbc7l6hkv69yllfiqvc1zzsprxpkwc4'';
+  };
+
+  packageName = "mk-string-metrics";
+
+  asdFilesToKeep = ["mk-string-metrics.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM mk-string-metrics DESCRIPTION
+    efficient implementations of various string metric algorithms SHA256
+    10xb9n6568nh019nq3phijbc7l6hkv69yllfiqvc1zzsprxpkwc4 URL
+    http://beta.quicklisp.org/archive/mk-string-metrics/2018-01-31/mk-string-metrics-20180131-git.tgz
+    MD5 40f23794a7d841cb178f5951d3992886 NAME mk-string-metrics FILENAME
+    mk-string-metrics DEPS NIL DEPENDENCIES NIL VERSION 20180131-git SIBLINGS
+    (mk-string-metrics-tests) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix
index 60385ab5939..c041d1778fa 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix
@@ -5,7 +5,7 @@ args @ { fetchurl, ... }:
 
   parasites = [ "pcall-tests" ];
 
-  description = '''';
+  description = ''System lacks description'';
 
   deps = [ args."alexandria" args."bordeaux-threads" args."fiveam" args."pcall-queue" ];
 
@@ -19,7 +19,7 @@ args @ { fetchurl, ... }:
   asdFilesToKeep = ["pcall.asd"];
   overrides = x: x;
 }
-/* (SYSTEM pcall DESCRIPTION NIL SHA256
+/* (SYSTEM pcall DESCRIPTION System lacks description SHA256
     02idx1wnv9770fl2nh179sb8njw801g70b5mf8jqhqm2gwsb731y URL
     http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz MD5
     019d85dfd1d5d0ee8d4ee475411caf6b NAME pcall FILENAME pcall DEPS
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove-asdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove-asdf.nix
new file mode 100644
index 00000000000..583b30f9769
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove-asdf.nix
@@ -0,0 +1,25 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''prove-asdf'';
+  version = ''prove-20171130-git'';
+
+  description = ''System lacks description'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/prove/2017-11-30/prove-20171130-git.tgz'';
+    sha256 = ''13dmnnlk3r9fxxcvk6sqq8m0ifv9y80zgp1wg63nv1ykwdi7kyar'';
+  };
+
+  packageName = "prove-asdf";
+
+  asdFilesToKeep = ["prove-asdf.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM prove-asdf DESCRIPTION System lacks description SHA256
+    13dmnnlk3r9fxxcvk6sqq8m0ifv9y80zgp1wg63nv1ykwdi7kyar URL
+    http://beta.quicklisp.org/archive/prove/2017-11-30/prove-20171130-git.tgz
+    MD5 630df4367537f799570be40242f8ed52 NAME prove-asdf FILENAME prove-asdf
+    DEPS NIL DEPENDENCIES NIL VERSION prove-20171130-git SIBLINGS
+    (cl-test-more prove-test prove) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix
index 9bbc47275f8..92ac9e33d49 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix
@@ -3,7 +3,7 @@ args @ { fetchurl, ... }:
   baseName = ''prove'';
   version = ''20171130-git'';
 
-  description = '''';
+  description = ''System lacks description'';
 
   deps = [ args."alexandria" args."anaphora" args."cl-ansi-text" args."cl-colors" args."cl-ppcre" args."let-plus" args."uiop" ];
 
@@ -17,7 +17,7 @@ args @ { fetchurl, ... }:
   asdFilesToKeep = ["prove.asd"];
   overrides = x: x;
 }
-/* (SYSTEM prove DESCRIPTION NIL SHA256
+/* (SYSTEM prove DESCRIPTION System lacks description SHA256
     13dmnnlk3r9fxxcvk6sqq8m0ifv9y80zgp1wg63nv1ykwdi7kyar URL
     http://beta.quicklisp.org/archive/prove/2017-11-30/prove-20171130-git.tgz
     MD5 630df4367537f799570be40242f8ed52 NAME prove FILENAME prove DEPS
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix
index f3c1dade821..7b5f33e7bc2 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix
@@ -5,7 +5,7 @@ args @ { fetchurl, ... }:
 
   parasites = [ "simple-date/postgres-glue" "simple-date/tests" ];
 
-  description = '''';
+  description = ''System lacks description'';
 
   deps = [ args."cl-postgres" args."fiveam" args."md5" args."usocket" ];
 
@@ -19,7 +19,7 @@ args @ { fetchurl, ... }:
   asdFilesToKeep = ["simple-date.asd"];
   overrides = x: x;
 }
-/* (SYSTEM simple-date DESCRIPTION NIL SHA256
+/* (SYSTEM simple-date DESCRIPTION System lacks description SHA256
     1vphrizbhbs3r5rq4b8dh4149bz11h5xxilragwf4l2i619k3cp5 URL
     http://beta.quicklisp.org/archive/postmodern/2019-05-21/postmodern-20190521-git.tgz
     MD5 102567f386757cd52aca500c0c348d90 NAME simple-date FILENAME simple-date
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/str.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/str.nix
new file mode 100644
index 00000000000..d4004f3f8b5
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/str.nix
@@ -0,0 +1,26 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''str'';
+  version = ''cl-20190710-git'';
+
+  description = ''Modern, consistent and terse Common Lisp string manipulation library.'';
+
+  deps = [ args."cl-ppcre" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-str/2019-07-10/cl-str-20190710-git.tgz'';
+    sha256 = ''1mlnrj9g1d7zbpq6c4vhyw0idhvbm55zpzrbc8iiyv0dzijk70l9'';
+  };
+
+  packageName = "str";
+
+  asdFilesToKeep = ["str.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM str DESCRIPTION
+    Modern, consistent and terse Common Lisp string manipulation library.
+    SHA256 1mlnrj9g1d7zbpq6c4vhyw0idhvbm55zpzrbc8iiyv0dzijk70l9 URL
+    http://beta.quicklisp.org/archive/cl-str/2019-07-10/cl-str-20190710-git.tgz
+    MD5 d3c72394ea33291347d8c825c153c143 NAME str FILENAME str DEPS
+    ((NAME cl-ppcre FILENAME cl-ppcre)) DEPENDENCIES (cl-ppcre) VERSION
+    cl-20190710-git SIBLINGS (str.test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia.nix
new file mode 100644
index 00000000000..74c84f0520f
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia.nix
@@ -0,0 +1,44 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''trivia'';
+  version = ''20190710-git'';
+
+  description = ''NON-optimized pattern matcher compatible with OPTIMA, with extensible optimizer interface and clean codebase'';
+
+  deps = [ args."alexandria" args."closer-mop" args."introspect-environment" args."iterate" args."lisp-namespace" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz'';
+    sha256 = ''0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic'';
+  };
+
+  packageName = "trivia";
+
+  asdFilesToKeep = ["trivia.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM trivia DESCRIPTION
+    NON-optimized pattern matcher compatible with OPTIMA, with extensible optimizer interface and clean codebase
+    SHA256 0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic URL
+    http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz
+    MD5 f17ca476901eaff8d3e5d32de23b7447 NAME trivia FILENAME trivia DEPS
+    ((NAME alexandria FILENAME alexandria)
+     (NAME closer-mop FILENAME closer-mop)
+     (NAME introspect-environment FILENAME introspect-environment)
+     (NAME iterate FILENAME iterate)
+     (NAME lisp-namespace FILENAME lisp-namespace)
+     (NAME trivia.balland2006 FILENAME trivia_dot_balland2006)
+     (NAME trivia.level0 FILENAME trivia_dot_level0)
+     (NAME trivia.level1 FILENAME trivia_dot_level1)
+     (NAME trivia.level2 FILENAME trivia_dot_level2)
+     (NAME trivia.trivial FILENAME trivia_dot_trivial)
+     (NAME trivial-cltl2 FILENAME trivial-cltl2) (NAME type-i FILENAME type-i))
+    DEPENDENCIES
+    (alexandria closer-mop introspect-environment iterate lisp-namespace
+     trivia.balland2006 trivia.level0 trivia.level1 trivia.level2
+     trivia.trivial trivial-cltl2 type-i)
+    VERSION 20190710-git SIBLINGS
+    (trivia.balland2006 trivia.benchmark trivia.cffi trivia.level0
+     trivia.level1 trivia.level2 trivia.ppcre trivia.quasiquote trivia.test
+     trivia.trivial)
+    PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_balland2006.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_balland2006.nix
new file mode 100644
index 00000000000..d1237b5ac26
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_balland2006.nix
@@ -0,0 +1,43 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''trivia_dot_balland2006'';
+  version = ''trivia-20190710-git'';
+
+  description = ''Optimizer for Trivia based on (Balland 2006)'';
+
+  deps = [ args."alexandria" args."closer-mop" args."introspect-environment" args."iterate" args."lisp-namespace" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz'';
+    sha256 = ''0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic'';
+  };
+
+  packageName = "trivia.balland2006";
+
+  asdFilesToKeep = ["trivia.balland2006.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM trivia.balland2006 DESCRIPTION
+    Optimizer for Trivia based on (Balland 2006) SHA256
+    0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic URL
+    http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz
+    MD5 f17ca476901eaff8d3e5d32de23b7447 NAME trivia.balland2006 FILENAME
+    trivia_dot_balland2006 DEPS
+    ((NAME alexandria FILENAME alexandria)
+     (NAME closer-mop FILENAME closer-mop)
+     (NAME introspect-environment FILENAME introspect-environment)
+     (NAME iterate FILENAME iterate)
+     (NAME lisp-namespace FILENAME lisp-namespace)
+     (NAME trivia.level0 FILENAME trivia_dot_level0)
+     (NAME trivia.level1 FILENAME trivia_dot_level1)
+     (NAME trivia.level2 FILENAME trivia_dot_level2)
+     (NAME trivia.trivial FILENAME trivia_dot_trivial)
+     (NAME trivial-cltl2 FILENAME trivial-cltl2) (NAME type-i FILENAME type-i))
+    DEPENDENCIES
+    (alexandria closer-mop introspect-environment iterate lisp-namespace
+     trivia.level0 trivia.level1 trivia.level2 trivia.trivial trivial-cltl2
+     type-i)
+    VERSION trivia-20190710-git SIBLINGS
+    (trivia trivia.benchmark trivia.cffi trivia.level0 trivia.level1
+     trivia.level2 trivia.ppcre trivia.quasiquote trivia.test trivia.trivial)
+    PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level0.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level0.nix
new file mode 100644
index 00000000000..30f82362537
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level0.nix
@@ -0,0 +1,29 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''trivia_dot_level0'';
+  version = ''trivia-20190710-git'';
+
+  description = ''Bootstrapping Pattern Matching Library for implementing Trivia'';
+
+  deps = [ args."alexandria" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz'';
+    sha256 = ''0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic'';
+  };
+
+  packageName = "trivia.level0";
+
+  asdFilesToKeep = ["trivia.level0.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM trivia.level0 DESCRIPTION
+    Bootstrapping Pattern Matching Library for implementing Trivia SHA256
+    0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic URL
+    http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz
+    MD5 f17ca476901eaff8d3e5d32de23b7447 NAME trivia.level0 FILENAME
+    trivia_dot_level0 DEPS ((NAME alexandria FILENAME alexandria)) DEPENDENCIES
+    (alexandria) VERSION trivia-20190710-git SIBLINGS
+    (trivia trivia.balland2006 trivia.benchmark trivia.cffi trivia.level1
+     trivia.level2 trivia.ppcre trivia.quasiquote trivia.test trivia.trivial)
+    PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level1.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level1.nix
new file mode 100644
index 00000000000..13680b8706c
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level1.nix
@@ -0,0 +1,31 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''trivia_dot_level1'';
+  version = ''trivia-20190710-git'';
+
+  description = ''Core patterns of Trivia'';
+
+  deps = [ args."alexandria" args."trivia_dot_level0" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz'';
+    sha256 = ''0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic'';
+  };
+
+  packageName = "trivia.level1";
+
+  asdFilesToKeep = ["trivia.level1.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM trivia.level1 DESCRIPTION Core patterns of Trivia SHA256
+    0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic URL
+    http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz
+    MD5 f17ca476901eaff8d3e5d32de23b7447 NAME trivia.level1 FILENAME
+    trivia_dot_level1 DEPS
+    ((NAME alexandria FILENAME alexandria)
+     (NAME trivia.level0 FILENAME trivia_dot_level0))
+    DEPENDENCIES (alexandria trivia.level0) VERSION trivia-20190710-git
+    SIBLINGS
+    (trivia trivia.balland2006 trivia.benchmark trivia.cffi trivia.level0
+     trivia.level2 trivia.ppcre trivia.quasiquote trivia.test trivia.trivial)
+    PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level2.nix
new file mode 100644
index 00000000000..acbcd0b31ec
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level2.nix
@@ -0,0 +1,38 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''trivia_dot_level2'';
+  version = ''trivia-20190710-git'';
+
+  description = ''NON-optimized pattern matcher compatible with OPTIMA, with extensible optimizer interface and clean codebase'';
+
+  deps = [ args."alexandria" args."closer-mop" args."lisp-namespace" args."trivia_dot_level0" args."trivia_dot_level1" args."trivial-cltl2" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz'';
+    sha256 = ''0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic'';
+  };
+
+  packageName = "trivia.level2";
+
+  asdFilesToKeep = ["trivia.level2.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM trivia.level2 DESCRIPTION
+    NON-optimized pattern matcher compatible with OPTIMA, with extensible optimizer interface and clean codebase
+    SHA256 0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic URL
+    http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz
+    MD5 f17ca476901eaff8d3e5d32de23b7447 NAME trivia.level2 FILENAME
+    trivia_dot_level2 DEPS
+    ((NAME alexandria FILENAME alexandria)
+     (NAME closer-mop FILENAME closer-mop)
+     (NAME lisp-namespace FILENAME lisp-namespace)
+     (NAME trivia.level0 FILENAME trivia_dot_level0)
+     (NAME trivia.level1 FILENAME trivia_dot_level1)
+     (NAME trivial-cltl2 FILENAME trivial-cltl2))
+    DEPENDENCIES
+    (alexandria closer-mop lisp-namespace trivia.level0 trivia.level1
+     trivial-cltl2)
+    VERSION trivia-20190710-git SIBLINGS
+    (trivia trivia.balland2006 trivia.benchmark trivia.cffi trivia.level0
+     trivia.level1 trivia.ppcre trivia.quasiquote trivia.test trivia.trivial)
+    PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_trivial.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_trivial.nix
new file mode 100644
index 00000000000..b82f6089b06
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_trivial.nix
@@ -0,0 +1,43 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''trivia_dot_trivial'';
+  version = ''trivia-20190710-git'';
+
+  description = ''Base level system of Trivia with a trivial optimizer.
+ Systems that intend to enhance Trivia should depend on this package, not the TRIVIA system,
+ in order to avoid the circular dependency.'';
+
+  deps = [ args."alexandria" args."closer-mop" args."lisp-namespace" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivial-cltl2" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz'';
+    sha256 = ''0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic'';
+  };
+
+  packageName = "trivia.trivial";
+
+  asdFilesToKeep = ["trivia.trivial.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM trivia.trivial DESCRIPTION
+    Base level system of Trivia with a trivial optimizer.
+ Systems that intend to enhance Trivia should depend on this package, not the TRIVIA system,
+ in order to avoid the circular dependency.
+    SHA256 0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic URL
+    http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz
+    MD5 f17ca476901eaff8d3e5d32de23b7447 NAME trivia.trivial FILENAME
+    trivia_dot_trivial DEPS
+    ((NAME alexandria FILENAME alexandria)
+     (NAME closer-mop FILENAME closer-mop)
+     (NAME lisp-namespace FILENAME lisp-namespace)
+     (NAME trivia.level0 FILENAME trivia_dot_level0)
+     (NAME trivia.level1 FILENAME trivia_dot_level1)
+     (NAME trivia.level2 FILENAME trivia_dot_level2)
+     (NAME trivial-cltl2 FILENAME trivial-cltl2))
+    DEPENDENCIES
+    (alexandria closer-mop lisp-namespace trivia.level0 trivia.level1
+     trivia.level2 trivial-cltl2)
+    VERSION trivia-20190710-git SIBLINGS
+    (trivia trivia.balland2006 trivia.benchmark trivia.cffi trivia.level0
+     trivia.level1 trivia.level2 trivia.ppcre trivia.quasiquote trivia.test)
+    PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-clipboard.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-clipboard.nix
new file mode 100644
index 00000000000..16d265d465a
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-clipboard.nix
@@ -0,0 +1,26 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''trivial-clipboard'';
+  version = ''20190202-git'';
+
+  description = ''trivial-clipboard let access system clipboard.'';
+
+  deps = [ args."uiop" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/trivial-clipboard/2019-02-02/trivial-clipboard-20190202-git.tgz'';
+    sha256 = ''06ic4lqampxnycz5s0frn7f8fqjpp8mlrnsnlh77gldxlh02pwq1'';
+  };
+
+  packageName = "trivial-clipboard";
+
+  asdFilesToKeep = ["trivial-clipboard.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM trivial-clipboard DESCRIPTION
+    trivial-clipboard let access system clipboard. SHA256
+    06ic4lqampxnycz5s0frn7f8fqjpp8mlrnsnlh77gldxlh02pwq1 URL
+    http://beta.quicklisp.org/archive/trivial-clipboard/2019-02-02/trivial-clipboard-20190202-git.tgz
+    MD5 d9b9ee3754e10888ce243172681a0db2 NAME trivial-clipboard FILENAME
+    trivial-clipboard DEPS ((NAME uiop FILENAME uiop)) DEPENDENCIES (uiop)
+    VERSION 20190202-git SIBLINGS (trivial-clipboard-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-cltl2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-cltl2.nix
new file mode 100644
index 00000000000..a5242030473
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-cltl2.nix
@@ -0,0 +1,26 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''trivial-cltl2'';
+  version = ''20190710-git'';
+
+  description = ''Compatibility package exporting CLtL2 functionality'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/trivial-cltl2/2019-07-10/trivial-cltl2-20190710-git.tgz'';
+    sha256 = ''1qaxwgws8ji6dyh30ff608zpdrplifgkhfdhfnn0367d3rvy11jb'';
+  };
+
+  packageName = "trivial-cltl2";
+
+  asdFilesToKeep = ["trivial-cltl2.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM trivial-cltl2 DESCRIPTION
+    Compatibility package exporting CLtL2 functionality SHA256
+    1qaxwgws8ji6dyh30ff608zpdrplifgkhfdhfnn0367d3rvy11jb URL
+    http://beta.quicklisp.org/archive/trivial-cltl2/2019-07-10/trivial-cltl2-20190710-git.tgz
+    MD5 8114f96b9770a9f0e0a94933918dc171 NAME trivial-cltl2 FILENAME
+    trivial-cltl2 DEPS NIL DEPENDENCIES NIL VERSION 20190710-git SIBLINGS NIL
+    PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
index 0ac57089e50..b4282ec33ce 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
@@ -5,7 +5,7 @@ args @ { fetchurl, ... }:
 
   parasites = [ "trivial-utf-8-tests" ];
 
-  description = '''';
+  description = ''System lacks description'';
 
   deps = [ ];
 
@@ -19,7 +19,7 @@ args @ { fetchurl, ... }:
   asdFilesToKeep = ["trivial-utf-8.asd"];
   overrides = x: x;
 }
-/* (SYSTEM trivial-utf-8 DESCRIPTION NIL SHA256
+/* (SYSTEM trivial-utf-8 DESCRIPTION System lacks description SHA256
     1lmg185s6w3rzsz3xa41k5w9xw32bi288ifhrxincy8iv92w65wb URL
     http://beta.quicklisp.org/archive/trivial-utf-8/2011-10-01/trivial-utf-8-20111001-darcs.tgz
     MD5 0206c4ba7a6c0b9b23762f244aca6614 NAME trivial-utf-8 FILENAME
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/type-i.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/type-i.nix
new file mode 100644
index 00000000000..40e718cc10b
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/type-i.nix
@@ -0,0 +1,37 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''type-i'';
+  version = ''20190521-git'';
+
+  description = ''Type Inference Utility on Fundamentally 1-arg Predicates'';
+
+  deps = [ args."alexandria" args."closer-mop" args."introspect-environment" args."lisp-namespace" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/type-i/2019-05-21/type-i-20190521-git.tgz'';
+    sha256 = ''1d79g3vd8s387rqagrkf1nmxax6kq32j1ddjrnx7ly08ib6aca99'';
+  };
+
+  packageName = "type-i";
+
+  asdFilesToKeep = ["type-i.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM type-i DESCRIPTION
+    Type Inference Utility on Fundamentally 1-arg Predicates SHA256
+    1d79g3vd8s387rqagrkf1nmxax6kq32j1ddjrnx7ly08ib6aca99 URL
+    http://beta.quicklisp.org/archive/type-i/2019-05-21/type-i-20190521-git.tgz
+    MD5 9906855a0650f93186f37e162429e58b NAME type-i FILENAME type-i DEPS
+    ((NAME alexandria FILENAME alexandria)
+     (NAME closer-mop FILENAME closer-mop)
+     (NAME introspect-environment FILENAME introspect-environment)
+     (NAME lisp-namespace FILENAME lisp-namespace)
+     (NAME trivia.level0 FILENAME trivia_dot_level0)
+     (NAME trivia.level1 FILENAME trivia_dot_level1)
+     (NAME trivia.level2 FILENAME trivia_dot_level2)
+     (NAME trivia.trivial FILENAME trivia_dot_trivial)
+     (NAME trivial-cltl2 FILENAME trivial-cltl2))
+    DEPENDENCIES
+    (alexandria closer-mop introspect-environment lisp-namespace trivia.level0
+     trivia.level1 trivia.level2 trivia.trivial trivial-cltl2)
+    VERSION 20190521-git SIBLINGS (type-i.test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-opts.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-opts.nix
new file mode 100644
index 00000000000..4af27c449a3
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-opts.nix
@@ -0,0 +1,25 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''unix-opts'';
+  version = ''20180430-git'';
+
+  description = ''minimalistic parser of command line arguments'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/unix-opts/2018-04-30/unix-opts-20180430-git.tgz'';
+    sha256 = ''05glzp47kn022jkbbvhnygaibrqnpr44q19lwhm20h4nkpkj3968'';
+  };
+
+  packageName = "unix-opts";
+
+  asdFilesToKeep = ["unix-opts.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM unix-opts DESCRIPTION minimalistic parser of command line arguments
+    SHA256 05glzp47kn022jkbbvhnygaibrqnpr44q19lwhm20h4nkpkj3968 URL
+    http://beta.quicklisp.org/archive/unix-opts/2018-04-30/unix-opts-20180430-git.tgz
+    MD5 2875ea0a1f5c49ef2697bb1046c4c4e5 NAME unix-opts FILENAME unix-opts DEPS
+    NIL DEPENDENCIES NIL VERSION 20180430-git SIBLINGS (unix-opts-tests)
+    PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix
index ea08214cb6f..a9a1cfc7ec0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix
@@ -5,7 +5,7 @@ args @ { fetchurl, ... }:
 
   parasites = [ "xmls/octets" "xmls/test" "xmls/unit-test" ];
 
-  description = '''';
+  description = ''System lacks description'';
 
   deps = [ args."cl-ppcre" args."fiveam" args."flexi-streams" ];
 
@@ -19,7 +19,7 @@ args @ { fetchurl, ... }:
   asdFilesToKeep = ["xmls.asd"];
   overrides = x: x;
 }
-/* (SYSTEM xmls DESCRIPTION NIL SHA256
+/* (SYSTEM xmls DESCRIPTION System lacks description SHA256
     1r7mvw62zjcg45j3hm8jlbiisad2b415pghn6qcmhl03dmgp7kgi URL
     http://beta.quicklisp.org/archive/xmls/2018-04-30/xmls-3.0.2.tgz MD5
     2462bab4a5d74e87ef7bdef41cd06dc8 NAME xmls FILENAME xmls DEPS
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
index fbc889342a4..1ff76e3ec4c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
@@ -53,7 +53,14 @@ in
   cxml = skipBuildPhase;
   wookie = addNativeLibs (with pkgs; [libuv openssl]);
   lev = addNativeLibs [pkgs.libev];
-  cl_plus_ssl = addNativeLibs [pkgs.openssl];
+  cl_plus_ssl = x: rec {
+    propagatedBuildInputs = [pkgs.openssl];
+    overrides = y: (x.overrides y) // {
+      prePatch = ''
+        sed 's|libssl.so|${pkgs.openssl.out}/lib/libssl.so|' -i src/reload.lisp
+      '';
+    };
+  };
   cl-colors = skipBuildPhase;
   cl-libuv = addNativeLibs [pkgs.libuv];
   cl-async-ssl = addNativeLibs [pkgs.openssl (import ./openssl-lib-marked.nix)];
@@ -91,7 +98,14 @@ $out/lib/common-lisp/query-fs"
       '';
     };
   };
-  sqlite = addNativeLibs [pkgs.sqlite];
+  sqlite = x: {
+    propagatedBuildInputs = [pkgs.sqlite];
+    overrides = y: (x.overrides y) // {
+      prePatch = ((x.overrides y).preConfigure or "") + ''
+        sed 's|libsqlite3|${pkgs.sqlite.out}/lib/libsqlite3|' -i sqlite-ffi.lisp
+      '';
+    };
+  };
   swank = x: {
     overrides = y: (x.overrides y) // {
       postPatch = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
index 5c56ddfa2a2..a4dee0bce57 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
@@ -10,8 +10,7 @@ cffi
 cffi-grovel
 chipz
 circular-streams
-clack
-clack-v1-compat
+cl+ssl
 cl-ansi-text
 cl-async
 cl-async-base
@@ -21,6 +20,7 @@ cl-base64
 cl-cli
 cl-colors
 cl-cookie
+cl-css
 cl-csv
 cl-dbi
 cl-emb
@@ -33,8 +33,6 @@ cl-json
 cl-l10n
 cl-libuv
 cl-mysql
-closer-mop
-closure-html
 cl-pdf
 cl-ppcre
 cl-ppcre-template
@@ -42,12 +40,6 @@ cl-ppcre-unicode
 cl-protobufs
 cl-reexport
 cl-smtp
-clsql
-clsql-postgresql
-clsql-postgresql-socket
-clsql-sqlite3
-clss
-cl+ssl
 cl-syntax-annot
 cl-syntax-anonfun
 cl-syntax-markup
@@ -58,9 +50,17 @@ cl-unification
 cl-utilities
 cl-vectors
 cl-who
+clack
+clack-v1-compat
+closer-mop
+closure-html
+clsql
+clsql-postgresql
+clsql-postgresql-socket
+clsql-sqlite3
+clss
 clx
 clx-truetype
-xembed
 command-line-arguments
 css-lite
 css-selectors
@@ -70,6 +70,7 @@ cxml
 dbd-mysql
 dbd-postgres
 dbd-sqlite3
+dbus
 dexador
 documentation-utils
 drakma
@@ -93,15 +94,17 @@ iterate
 lack
 let-plus
 lev
-lisp-namespace
-local-time
 lfarm-client
 lfarm-server
 lfarm-ssl
+lisp-namespace
+local-time
+log4cl
 lparallel
 lquery
 marshal
 misc-extensions
+mk-string-metrics
 mt19937
 nibbles
 optima
@@ -111,24 +114,32 @@ plump
 proc-parse
 prove
 prove
+prove-asdf
 query-fs
 quri
 salza2
 simple-date
 smart-buffer
 split-sequence
+sqlite
 static-vectors
+str
 stumpwm
+swank
 swap-bytes
+trivia
 trivial-backtrace
+trivial-clipboard
 trivial-indent
 trivial-mimes
 trivial-types
 trivial-utf-8
 uffi
+unix-opts
 usocket
 woo
 wookie
+xembed
 xkeyboard
 xmls
 xsubseq
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
index 2e71e0174f6..d430f72353a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
@@ -20,18 +20,103 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "lfarm-common" = buildLispPackage
+  "type-i" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."lfarm-common" or (x: {}))
-       (import ./quicklisp-to-nix-output/lfarm-common.nix {
+       (qlOverrides."type-i" or (x: {}))
+       (import ./quicklisp-to-nix-output/type-i.nix {
          inherit fetchurl;
            "alexandria" = quicklisp-to-nix-packages."alexandria";
-           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
-           "cl-store" = quicklisp-to-nix-packages."cl-store";
-           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
-           "split-sequence" = quicklisp-to-nix-packages."split-sequence";
-           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
-           "usocket" = quicklisp-to-nix-packages."usocket";
+           "closer-mop" = quicklisp-to-nix-packages."closer-mop";
+           "introspect-environment" = quicklisp-to-nix-packages."introspect-environment";
+           "lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace";
+           "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0";
+           "trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1";
+           "trivia_dot_level2" = quicklisp-to-nix-packages."trivia_dot_level2";
+           "trivia_dot_trivial" = quicklisp-to-nix-packages."trivia_dot_trivial";
+           "trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2";
+       }));
+
+
+  "trivial-cltl2" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."trivial-cltl2" or (x: {}))
+       (import ./quicklisp-to-nix-output/trivial-cltl2.nix {
+         inherit fetchurl;
+       }));
+
+
+  "trivia_dot_trivial" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."trivia_dot_trivial" or (x: {}))
+       (import ./quicklisp-to-nix-output/trivia_dot_trivial.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "closer-mop" = quicklisp-to-nix-packages."closer-mop";
+           "lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace";
+           "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0";
+           "trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1";
+           "trivia_dot_level2" = quicklisp-to-nix-packages."trivia_dot_level2";
+           "trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2";
+       }));
+
+
+  "trivia_dot_level2" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."trivia_dot_level2" or (x: {}))
+       (import ./quicklisp-to-nix-output/trivia_dot_level2.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "closer-mop" = quicklisp-to-nix-packages."closer-mop";
+           "lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace";
+           "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0";
+           "trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1";
+           "trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2";
+       }));
+
+
+  "trivia_dot_level1" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."trivia_dot_level1" or (x: {}))
+       (import ./quicklisp-to-nix-output/trivia_dot_level1.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0";
+       }));
+
+
+  "trivia_dot_level0" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."trivia_dot_level0" or (x: {}))
+       (import ./quicklisp-to-nix-output/trivia_dot_level0.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+       }));
+
+
+  "trivia_dot_balland2006" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."trivia_dot_balland2006" or (x: {}))
+       (import ./quicklisp-to-nix-output/trivia_dot_balland2006.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "closer-mop" = quicklisp-to-nix-packages."closer-mop";
+           "introspect-environment" = quicklisp-to-nix-packages."introspect-environment";
+           "iterate" = quicklisp-to-nix-packages."iterate";
+           "lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace";
+           "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0";
+           "trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1";
+           "trivia_dot_level2" = quicklisp-to-nix-packages."trivia_dot_level2";
+           "trivia_dot_trivial" = quicklisp-to-nix-packages."trivia_dot_trivial";
+           "trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2";
+           "type-i" = quicklisp-to-nix-packages."type-i";
+       }));
+
+
+  "introspect-environment" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."introspect-environment" or (x: {}))
+       (import ./quicklisp-to-nix-output/introspect-environment.nix {
+         inherit fetchurl;
        }));
 
 
@@ -47,6 +132,21 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "lfarm-common" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."lfarm-common" or (x: {}))
+       (import ./quicklisp-to-nix-output/lfarm-common.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "cl-store" = quicklisp-to-nix-packages."cl-store";
+           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+           "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+           "usocket" = quicklisp-to-nix-packages."usocket";
+       }));
+
+
   "rt" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."rt" or (x: {}))
@@ -124,16 +224,27 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "sqlite" = buildLispPackage
+  "cl-xmlspam" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."sqlite" or (x: {}))
-       (import ./quicklisp-to-nix-output/sqlite.nix {
+       (qlOverrides."cl-xmlspam" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-xmlspam.nix {
          inherit fetchurl;
            "alexandria" = quicklisp-to-nix-packages."alexandria";
            "babel" = quicklisp-to-nix-packages."babel";
-           "cffi" = quicklisp-to-nix-packages."cffi";
-           "iterate" = quicklisp-to-nix-packages."iterate";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "closure-common" = quicklisp-to-nix-packages."closure-common";
+           "cxml" = quicklisp-to-nix-packages."cxml";
+           "puri" = quicklisp-to-nix-packages."puri";
            "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+       }));
+
+
+  "asdf-package-system" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."asdf-package-system" or (x: {}))
+       (import ./quicklisp-to-nix-output/asdf-package-system.nix {
+         inherit fetchurl;
        }));
 
 
@@ -207,14 +318,6 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "swank" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."swank" or (x: {}))
-       (import ./quicklisp-to-nix-output/swank.nix {
-         inherit fetchurl;
-       }));
-
-
   "collectors" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."collectors" or (x: {}))
@@ -314,6 +417,16 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "clsql-uffi" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."clsql-uffi" or (x: {}))
+       (import ./quicklisp-to-nix-output/clsql-uffi.nix {
+         inherit fetchurl;
+           "clsql" = quicklisp-to-nix-packages."clsql";
+           "uffi" = quicklisp-to-nix-packages."uffi";
+       }));
+
+
   "cl-paths" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."cl-paths" or (x: {}))
@@ -346,16 +459,6 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "clsql-uffi" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."clsql-uffi" or (x: {}))
-       (import ./quicklisp-to-nix-output/clsql-uffi.nix {
-         inherit fetchurl;
-           "clsql" = quicklisp-to-nix-packages."clsql";
-           "uffi" = quicklisp-to-nix-packages."uffi";
-       }));
-
-
   "cl-ppcre-test" = quicklisp-to-nix-packages."cl-ppcre";
 
 
@@ -884,6 +987,15 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "xembed" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."xembed" or (x: {}))
+       (import ./quicklisp-to-nix-output/xembed.nix {
+         inherit fetchurl;
+           "clx" = quicklisp-to-nix-packages."clx";
+       }));
+
+
   "wookie" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."wookie" or (x: {}))
@@ -961,6 +1073,14 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "unix-opts" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."unix-opts" or (x: {}))
+       (import ./quicklisp-to-nix-output/unix-opts.nix {
+         inherit fetchurl;
+       }));
+
+
   "uffi" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."uffi" or (x: {}))
@@ -1001,6 +1121,15 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "trivial-clipboard" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."trivial-clipboard" or (x: {}))
+       (import ./quicklisp-to-nix-output/trivial-clipboard.nix {
+         inherit fetchurl;
+           "uiop" = quicklisp-to-nix-packages."uiop";
+       }));
+
+
   "trivial-backtrace" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."trivial-backtrace" or (x: {}))
@@ -1009,6 +1138,26 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "trivia" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."trivia" or (x: {}))
+       (import ./quicklisp-to-nix-output/trivia.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "closer-mop" = quicklisp-to-nix-packages."closer-mop";
+           "introspect-environment" = quicklisp-to-nix-packages."introspect-environment";
+           "iterate" = quicklisp-to-nix-packages."iterate";
+           "lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace";
+           "trivia_dot_balland2006" = quicklisp-to-nix-packages."trivia_dot_balland2006";
+           "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0";
+           "trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1";
+           "trivia_dot_level2" = quicklisp-to-nix-packages."trivia_dot_level2";
+           "trivia_dot_trivial" = quicklisp-to-nix-packages."trivia_dot_trivial";
+           "trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2";
+           "type-i" = quicklisp-to-nix-packages."type-i";
+       }));
+
+
   "swap-bytes" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."swap-bytes" or (x: {}))
@@ -1019,6 +1168,14 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "swank" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."swank" or (x: {}))
+       (import ./quicklisp-to-nix-output/swank.nix {
+         inherit fetchurl;
+       }));
+
+
   "stumpwm" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."stumpwm" or (x: {}))
@@ -1030,6 +1187,15 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "str" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."str" or (x: {}))
+       (import ./quicklisp-to-nix-output/str.nix {
+         inherit fetchurl;
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+       }));
+
+
   "static-vectors" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."static-vectors" or (x: {}))
@@ -1045,6 +1211,19 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "sqlite" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."sqlite" or (x: {}))
+       (import ./quicklisp-to-nix-output/sqlite.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "babel" = quicklisp-to-nix-packages."babel";
+           "cffi" = quicklisp-to-nix-packages."cffi";
+           "iterate" = quicklisp-to-nix-packages."iterate";
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+       }));
+
+
   "split-sequence" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."split-sequence" or (x: {}))
@@ -1124,6 +1303,14 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "prove-asdf" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."prove-asdf" or (x: {}))
+       (import ./quicklisp-to-nix-output/prove-asdf.nix {
+         inherit fetchurl;
+       }));
+
+
   "prove" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."prove" or (x: {}))
@@ -1211,6 +1398,14 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "mk-string-metrics" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."mk-string-metrics" or (x: {}))
+       (import ./quicklisp-to-nix-output/mk-string-metrics.nix {
+         inherit fetchurl;
+       }));
+
+
   "misc-extensions" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."misc-extensions" or (x: {}))
@@ -1251,6 +1446,38 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "log4cl" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."log4cl" or (x: {}))
+       (import ./quicklisp-to-nix-output/log4cl.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "stefil" = quicklisp-to-nix-packages."stefil";
+       }));
+
+
+  "local-time" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."local-time" or (x: {}))
+       (import ./quicklisp-to-nix-output/local-time.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "cl-fad" = quicklisp-to-nix-packages."cl-fad";
+           "stefil" = quicklisp-to-nix-packages."stefil";
+       }));
+
+
+  "lisp-namespace" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."lisp-namespace" or (x: {}))
+       (import ./quicklisp-to-nix-output/lisp-namespace.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+       }));
+
+
   "lfarm-ssl" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."lfarm-ssl" or (x: {}))
@@ -1305,27 +1532,6 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "local-time" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."local-time" or (x: {}))
-       (import ./quicklisp-to-nix-output/local-time.nix {
-         inherit fetchurl;
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
-           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
-           "cl-fad" = quicklisp-to-nix-packages."cl-fad";
-           "stefil" = quicklisp-to-nix-packages."stefil";
-       }));
-
-
-  "lisp-namespace" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."lisp-namespace" or (x: {}))
-       (import ./quicklisp-to-nix-output/lisp-namespace.nix {
-         inherit fetchurl;
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
-       }));
-
-
   "lev" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."lev" or (x: {}))
@@ -1670,6 +1876,23 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "dbus" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."dbus" or (x: {}))
+       (import ./quicklisp-to-nix-output/dbus.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "asdf-package-system" = quicklisp-to-nix-packages."asdf-package-system";
+           "babel" = quicklisp-to-nix-packages."babel";
+           "cl-xmlspam" = quicklisp-to-nix-packages."cl-xmlspam";
+           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+           "ieee-floats" = quicklisp-to-nix-packages."ieee-floats";
+           "iolib" = quicklisp-to-nix-packages."iolib";
+           "ironclad" = quicklisp-to-nix-packages."ironclad";
+           "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage";
+       }));
+
+
   "dbd-sqlite3" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."dbd-sqlite3" or (x: {}))
@@ -1865,15 +2088,6 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "xembed" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."xembed" or (x: {}))
-       (import ./quicklisp-to-nix-output/xembed.nix {
-         inherit fetchurl;
-           "clx" = quicklisp-to-nix-packages."clx";
-       }));
-
-
   "clx-truetype" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."clx-truetype" or (x: {}))
@@ -1902,15 +2116,176 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "cl-who" = buildLispPackage
+  "clss" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."cl-who" or (x: {}))
-       (import ./quicklisp-to-nix-output/cl-who.nix {
+       (qlOverrides."clss" or (x: {}))
+       (import ./quicklisp-to-nix-output/clss.nix {
          inherit fetchurl;
-           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
-       }));
-
-
+           "array-utils" = quicklisp-to-nix-packages."array-utils";
+           "documentation-utils" = quicklisp-to-nix-packages."documentation-utils";
+           "plump" = quicklisp-to-nix-packages."plump";
+           "trivial-indent" = quicklisp-to-nix-packages."trivial-indent";
+       }));
+
+
+  "clsql-sqlite3" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."clsql-sqlite3" or (x: {}))
+       (import ./quicklisp-to-nix-output/clsql-sqlite3.nix {
+         inherit fetchurl;
+           "clsql" = quicklisp-to-nix-packages."clsql";
+           "clsql-uffi" = quicklisp-to-nix-packages."clsql-uffi";
+           "uffi" = quicklisp-to-nix-packages."uffi";
+       }));
+
+
+  "clsql-postgresql-socket" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."clsql-postgresql-socket" or (x: {}))
+       (import ./quicklisp-to-nix-output/clsql-postgresql-socket.nix {
+         inherit fetchurl;
+           "clsql" = quicklisp-to-nix-packages."clsql";
+           "md5" = quicklisp-to-nix-packages."md5";
+           "uffi" = quicklisp-to-nix-packages."uffi";
+       }));
+
+
+  "clsql-postgresql" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."clsql-postgresql" or (x: {}))
+       (import ./quicklisp-to-nix-output/clsql-postgresql.nix {
+         inherit fetchurl;
+           "clsql" = quicklisp-to-nix-packages."clsql";
+           "clsql-uffi" = quicklisp-to-nix-packages."clsql-uffi";
+           "uffi" = quicklisp-to-nix-packages."uffi";
+       }));
+
+
+  "clsql" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."clsql" or (x: {}))
+       (import ./quicklisp-to-nix-output/clsql.nix {
+         inherit fetchurl;
+           "uffi" = quicklisp-to-nix-packages."uffi";
+       }));
+
+
+  "closure-html" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."closure-html" or (x: {}))
+       (import ./quicklisp-to-nix-output/closure-html.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "babel" = quicklisp-to-nix-packages."babel";
+           "closure-common" = quicklisp-to-nix-packages."closure-common";
+           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+       }));
+
+
+  "closer-mop" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."closer-mop" or (x: {}))
+       (import ./quicklisp-to-nix-output/closer-mop.nix {
+         inherit fetchurl;
+       }));
+
+
+  "clack-v1-compat" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."clack-v1-compat" or (x: {}))
+       (import ./quicklisp-to-nix-output/clack-v1-compat.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "anaphora" = quicklisp-to-nix-packages."anaphora";
+           "babel" = quicklisp-to-nix-packages."babel";
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "cffi" = quicklisp-to-nix-packages."cffi";
+           "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel";
+           "cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain";
+           "chipz" = quicklisp-to-nix-packages."chipz";
+           "chunga" = quicklisp-to-nix-packages."chunga";
+           "circular-streams" = quicklisp-to-nix-packages."circular-streams";
+           "cl_plus_ssl" = quicklisp-to-nix-packages."cl_plus_ssl";
+           "cl-annot" = quicklisp-to-nix-packages."cl-annot";
+           "cl-ansi-text" = quicklisp-to-nix-packages."cl-ansi-text";
+           "cl-base64" = quicklisp-to-nix-packages."cl-base64";
+           "cl-colors" = quicklisp-to-nix-packages."cl-colors";
+           "cl-cookie" = quicklisp-to-nix-packages."cl-cookie";
+           "cl-fad" = quicklisp-to-nix-packages."cl-fad";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "cl-reexport" = quicklisp-to-nix-packages."cl-reexport";
+           "cl-syntax" = quicklisp-to-nix-packages."cl-syntax";
+           "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot";
+           "cl-utilities" = quicklisp-to-nix-packages."cl-utilities";
+           "clack" = quicklisp-to-nix-packages."clack";
+           "clack-handler-hunchentoot" = quicklisp-to-nix-packages."clack-handler-hunchentoot";
+           "clack-socket" = quicklisp-to-nix-packages."clack-socket";
+           "clack-test" = quicklisp-to-nix-packages."clack-test";
+           "dexador" = quicklisp-to-nix-packages."dexador";
+           "fast-http" = quicklisp-to-nix-packages."fast-http";
+           "fast-io" = quicklisp-to-nix-packages."fast-io";
+           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+           "http-body" = quicklisp-to-nix-packages."http-body";
+           "hunchentoot" = quicklisp-to-nix-packages."hunchentoot";
+           "ironclad" = quicklisp-to-nix-packages."ironclad";
+           "jonathan" = quicklisp-to-nix-packages."jonathan";
+           "lack" = quicklisp-to-nix-packages."lack";
+           "lack-component" = quicklisp-to-nix-packages."lack-component";
+           "lack-middleware-backtrace" = quicklisp-to-nix-packages."lack-middleware-backtrace";
+           "lack-util" = quicklisp-to-nix-packages."lack-util";
+           "let-plus" = quicklisp-to-nix-packages."let-plus";
+           "local-time" = quicklisp-to-nix-packages."local-time";
+           "marshal" = quicklisp-to-nix-packages."marshal";
+           "md5" = quicklisp-to-nix-packages."md5";
+           "named-readtables" = quicklisp-to-nix-packages."named-readtables";
+           "nibbles" = quicklisp-to-nix-packages."nibbles";
+           "proc-parse" = quicklisp-to-nix-packages."proc-parse";
+           "prove" = quicklisp-to-nix-packages."prove";
+           "quri" = quicklisp-to-nix-packages."quri";
+           "rfc2388" = quicklisp-to-nix-packages."rfc2388";
+           "smart-buffer" = quicklisp-to-nix-packages."smart-buffer";
+           "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+           "static-vectors" = quicklisp-to-nix-packages."static-vectors";
+           "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace";
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+           "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage";
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+           "trivial-mimes" = quicklisp-to-nix-packages."trivial-mimes";
+           "trivial-types" = quicklisp-to-nix-packages."trivial-types";
+           "uiop" = quicklisp-to-nix-packages."uiop";
+           "usocket" = quicklisp-to-nix-packages."usocket";
+           "xsubseq" = quicklisp-to-nix-packages."xsubseq";
+       }));
+
+
+  "clack" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."clack" or (x: {}))
+       (import ./quicklisp-to-nix-output/clack.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "ironclad" = quicklisp-to-nix-packages."ironclad";
+           "lack" = quicklisp-to-nix-packages."lack";
+           "lack-component" = quicklisp-to-nix-packages."lack-component";
+           "lack-middleware-backtrace" = quicklisp-to-nix-packages."lack-middleware-backtrace";
+           "lack-util" = quicklisp-to-nix-packages."lack-util";
+           "nibbles" = quicklisp-to-nix-packages."nibbles";
+           "uiop" = quicklisp-to-nix-packages."uiop";
+       }));
+
+
+  "cl-who" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-who" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-who.nix {
+         inherit fetchurl;
+           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+       }));
+
+
   "cl-vectors" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."cl-vectors" or (x: {}))
@@ -2010,77 +2385,6 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "cl_plus_ssl" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."cl_plus_ssl" or (x: {}))
-       (import ./quicklisp-to-nix-output/cl_plus_ssl.nix {
-         inherit fetchurl;
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
-           "babel" = quicklisp-to-nix-packages."babel";
-           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
-           "cffi" = quicklisp-to-nix-packages."cffi";
-           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
-           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
-           "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage";
-           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
-           "uiop" = quicklisp-to-nix-packages."uiop";
-       }));
-
-
-  "clss" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."clss" or (x: {}))
-       (import ./quicklisp-to-nix-output/clss.nix {
-         inherit fetchurl;
-           "array-utils" = quicklisp-to-nix-packages."array-utils";
-           "documentation-utils" = quicklisp-to-nix-packages."documentation-utils";
-           "plump" = quicklisp-to-nix-packages."plump";
-           "trivial-indent" = quicklisp-to-nix-packages."trivial-indent";
-       }));
-
-
-  "clsql-sqlite3" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."clsql-sqlite3" or (x: {}))
-       (import ./quicklisp-to-nix-output/clsql-sqlite3.nix {
-         inherit fetchurl;
-           "clsql" = quicklisp-to-nix-packages."clsql";
-           "clsql-uffi" = quicklisp-to-nix-packages."clsql-uffi";
-           "uffi" = quicklisp-to-nix-packages."uffi";
-       }));
-
-
-  "clsql-postgresql-socket" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."clsql-postgresql-socket" or (x: {}))
-       (import ./quicklisp-to-nix-output/clsql-postgresql-socket.nix {
-         inherit fetchurl;
-           "clsql" = quicklisp-to-nix-packages."clsql";
-           "md5" = quicklisp-to-nix-packages."md5";
-           "uffi" = quicklisp-to-nix-packages."uffi";
-       }));
-
-
-  "clsql-postgresql" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."clsql-postgresql" or (x: {}))
-       (import ./quicklisp-to-nix-output/clsql-postgresql.nix {
-         inherit fetchurl;
-           "clsql" = quicklisp-to-nix-packages."clsql";
-           "clsql-uffi" = quicklisp-to-nix-packages."clsql-uffi";
-           "uffi" = quicklisp-to-nix-packages."uffi";
-       }));
-
-
-  "clsql" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."clsql" or (x: {}))
-       (import ./quicklisp-to-nix-output/clsql.nix {
-         inherit fetchurl;
-           "uffi" = quicklisp-to-nix-packages."uffi";
-       }));
-
-
   "cl-smtp" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."cl-smtp" or (x: {}))
@@ -2165,28 +2469,6 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "closure-html" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."closure-html" or (x: {}))
-       (import ./quicklisp-to-nix-output/closure-html.nix {
-         inherit fetchurl;
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
-           "babel" = quicklisp-to-nix-packages."babel";
-           "closure-common" = quicklisp-to-nix-packages."closure-common";
-           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
-           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
-           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
-       }));
-
-
-  "closer-mop" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."closer-mop" or (x: {}))
-       (import ./quicklisp-to-nix-output/closer-mop.nix {
-         inherit fetchurl;
-       }));
-
-
   "cl-mysql" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."cl-mysql" or (x: {}))
@@ -2360,6 +2642,14 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "cl-css" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-css" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-css.nix {
+         inherit fetchurl;
+       }));
+
+
   "cl-cookie" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."cl-cookie" or (x: {}))
@@ -2495,87 +2785,19 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "clack-v1-compat" = buildLispPackage
+  "cl_plus_ssl" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."clack-v1-compat" or (x: {}))
-       (import ./quicklisp-to-nix-output/clack-v1-compat.nix {
+       (qlOverrides."cl_plus_ssl" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl_plus_ssl.nix {
          inherit fetchurl;
            "alexandria" = quicklisp-to-nix-packages."alexandria";
-           "anaphora" = quicklisp-to-nix-packages."anaphora";
            "babel" = quicklisp-to-nix-packages."babel";
            "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
            "cffi" = quicklisp-to-nix-packages."cffi";
-           "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel";
-           "cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain";
-           "chipz" = quicklisp-to-nix-packages."chipz";
-           "chunga" = quicklisp-to-nix-packages."chunga";
-           "circular-streams" = quicklisp-to-nix-packages."circular-streams";
-           "cl_plus_ssl" = quicklisp-to-nix-packages."cl_plus_ssl";
-           "cl-annot" = quicklisp-to-nix-packages."cl-annot";
-           "cl-ansi-text" = quicklisp-to-nix-packages."cl-ansi-text";
-           "cl-base64" = quicklisp-to-nix-packages."cl-base64";
-           "cl-colors" = quicklisp-to-nix-packages."cl-colors";
-           "cl-cookie" = quicklisp-to-nix-packages."cl-cookie";
-           "cl-fad" = quicklisp-to-nix-packages."cl-fad";
-           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
-           "cl-reexport" = quicklisp-to-nix-packages."cl-reexport";
-           "cl-syntax" = quicklisp-to-nix-packages."cl-syntax";
-           "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot";
-           "cl-utilities" = quicklisp-to-nix-packages."cl-utilities";
-           "clack" = quicklisp-to-nix-packages."clack";
-           "clack-handler-hunchentoot" = quicklisp-to-nix-packages."clack-handler-hunchentoot";
-           "clack-socket" = quicklisp-to-nix-packages."clack-socket";
-           "clack-test" = quicklisp-to-nix-packages."clack-test";
-           "dexador" = quicklisp-to-nix-packages."dexador";
-           "fast-http" = quicklisp-to-nix-packages."fast-http";
-           "fast-io" = quicklisp-to-nix-packages."fast-io";
            "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
-           "http-body" = quicklisp-to-nix-packages."http-body";
-           "hunchentoot" = quicklisp-to-nix-packages."hunchentoot";
-           "ironclad" = quicklisp-to-nix-packages."ironclad";
-           "jonathan" = quicklisp-to-nix-packages."jonathan";
-           "lack" = quicklisp-to-nix-packages."lack";
-           "lack-component" = quicklisp-to-nix-packages."lack-component";
-           "lack-middleware-backtrace" = quicklisp-to-nix-packages."lack-middleware-backtrace";
-           "lack-util" = quicklisp-to-nix-packages."lack-util";
-           "let-plus" = quicklisp-to-nix-packages."let-plus";
-           "local-time" = quicklisp-to-nix-packages."local-time";
-           "marshal" = quicklisp-to-nix-packages."marshal";
-           "md5" = quicklisp-to-nix-packages."md5";
-           "named-readtables" = quicklisp-to-nix-packages."named-readtables";
-           "nibbles" = quicklisp-to-nix-packages."nibbles";
-           "proc-parse" = quicklisp-to-nix-packages."proc-parse";
-           "prove" = quicklisp-to-nix-packages."prove";
-           "quri" = quicklisp-to-nix-packages."quri";
-           "rfc2388" = quicklisp-to-nix-packages."rfc2388";
-           "smart-buffer" = quicklisp-to-nix-packages."smart-buffer";
-           "split-sequence" = quicklisp-to-nix-packages."split-sequence";
-           "static-vectors" = quicklisp-to-nix-packages."static-vectors";
-           "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace";
            "trivial-features" = quicklisp-to-nix-packages."trivial-features";
            "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage";
            "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
-           "trivial-mimes" = quicklisp-to-nix-packages."trivial-mimes";
-           "trivial-types" = quicklisp-to-nix-packages."trivial-types";
-           "uiop" = quicklisp-to-nix-packages."uiop";
-           "usocket" = quicklisp-to-nix-packages."usocket";
-           "xsubseq" = quicklisp-to-nix-packages."xsubseq";
-       }));
-
-
-  "clack" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."clack" or (x: {}))
-       (import ./quicklisp-to-nix-output/clack.nix {
-         inherit fetchurl;
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
-           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
-           "ironclad" = quicklisp-to-nix-packages."ironclad";
-           "lack" = quicklisp-to-nix-packages."lack";
-           "lack-component" = quicklisp-to-nix-packages."lack-component";
-           "lack-middleware-backtrace" = quicklisp-to-nix-packages."lack-middleware-backtrace";
-           "lack-util" = quicklisp-to-nix-packages."lack-util";
-           "nibbles" = quicklisp-to-nix-packages."nibbles";
            "uiop" = quicklisp-to-nix-packages."uiop";
        }));
 
-- 
GitLab


From 20c7a35429c4882227f1fb9788aeebc7c12726bf Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Wed, 11 Sep 2019 13:41:04 +0200
Subject: [PATCH 0118/2254] openssl_1_0_2: fixup sha256

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

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index a96bd6ade6a..0b026ae75f4 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -128,7 +128,7 @@ in {
 
   openssl_1_0_2 = common {
     version = "1.0.2t";
-    sha256 = "15mbmg9hf7s12vr3v2bdc0pi9y4pdbnsxhzk4fyyap42jaa5rgfa";
+    sha256 = "1g67ra0ph7gpz6fgvv1i96d792jmd6ymci5kk53vbikszr74djql";
     patches = [
       ./1.0.2/nix-ssl-cert-file.patch
 
-- 
GitLab


From 7f481e807f0c6dce9a1869ff6c54101340817d6a Mon Sep 17 00:00:00 2001
From: Lily Ballard <lily@sb.org>
Date: Wed, 11 Sep 2019 16:40:49 -0700
Subject: [PATCH 0119/2254] macvim: work around ibtool issue

It seems that /usr/bin/ibtool marks stdin/stdout/stderr as nonblocking,
which can cause the subsequent build phase to fail when it tries to
write to stdout. I don't know why this problem just started happening
for me, but preventing ibtool from inheriting fds fixes the problem.
---
 pkgs/applications/editors/vim/macvim.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix
index 6081bbc8b0c..3df964361cc 100644
--- a/pkgs/applications/editors/vim/macvim.nix
+++ b/pkgs/applications/editors/vim/macvim.nix
@@ -48,7 +48,11 @@ stdenv.mkDerivation {
   # The sparkle patch modified the nibs, so we have to recompile them
   postPatch = ''
     for nib in MainMenu Preferences; do
-      /usr/bin/ibtool --compile src/MacVim/English.lproj/$nib.nib/keyedobjects.nib src/MacVim/English.lproj/$nib.nib
+      # redirect stdin/stdout/stderr to /dev/null because ibtool marks them nonblocking
+      # and not redirecting screws with subsequent commands.
+      # redirecting stderr is unfortunate but I don't know of a reasonable way to remove O_NONBLOCK
+      # from the fds.
+      /usr/bin/ibtool --compile src/MacVim/English.lproj/$nib.nib/keyedobjects.nib src/MacVim/English.lproj/$nib.nib >/dev/null 2>/dev/null </dev/null
     done
   '';
 
-- 
GitLab


From f77b4c564e1d977acfd2e11365c971563860c751 Mon Sep 17 00:00:00 2001
From: Michael Hoang <enzime@users.noreply.github.com>
Date: Thu, 12 Sep 2019 11:43:56 +1000
Subject: [PATCH 0120/2254] brlaser: 4 -> 5

---
 pkgs/misc/cups/drivers/brlaser/default.nix | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/cups/drivers/brlaser/default.nix b/pkgs/misc/cups/drivers/brlaser/default.nix
index 948e5ed72ab..bf0f4ef8279 100644
--- a/pkgs/misc/cups/drivers/brlaser/default.nix
+++ b/pkgs/misc/cups/drivers/brlaser/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "brlaser";
-  version = "4";
+  version = "5";
 
   src = fetchFromGitHub {
     owner = "pdewacht";
     repo = "brlaser";
     rev = "v${version}";
-    sha256 = "1yy4mpf68c82h245srh2sd1yip29w6kx14gxk4hxkv496gf55lw5";
+    sha256 = "133fx49wkg1v8r4kcishd035hlsscv8kc2q4jnln5qmyhpyygjyy";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -25,13 +25,29 @@ stdenv.mkDerivation rec {
        This driver is known to work with these printers:
 
            Brother DCP-1510
+           Brother DCP-1602
            Brother DCP-7030
            Brother DCP-7040
            Brother DCP-7055
            Brother DCP-7055W
+           Brother DCP-7060D
            Brother DCP-7065DN
-           Brother HL-L2300D
+           Brother DCP-7080
+           Brother DCP-L2500D
+           Brother DCP-L2540DW
+           Brother HL-1110 series
+           Brother HL-1200 series
+           Brother HL-L2300D series
+           Brother HL-L2320D series
+           Brother HL-L2340D series
+           Brother HL-L2360D series
+           Brother MFC-1910W
+           Brother MFC-7240
            Brother MFC-7360N
+           Brother MFC-7365DN
+           Brother MFC-7840W
+           Brother MFC-L2710DW
+           Lenovo M7605D
       '';
     homepage = https://github.com/pdewacht/brlaser;
     license = licenses.gpl2;
-- 
GitLab


From 4563496375f2988578264b72c079da6999002e9a Mon Sep 17 00:00:00 2001
From: Lily Ballard <lily@sb.org>
Date: Wed, 11 Sep 2019 20:13:36 -0700
Subject: [PATCH 0121/2254] macvim: fix compatibility with Xcode 11

This fixes several Xcode 11 incompatibilities with MacVim, including an
issue where it wasn't inheriting the deployment target correctly to
begin with.
---
 pkgs/applications/editors/vim/macvim.nix   |  3 +++
 pkgs/applications/editors/vim/macvim.patch | 27 ++++++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix
index 6081bbc8b0c..7c89d07a7ec 100644
--- a/pkgs/applications/editors/vim/macvim.nix
+++ b/pkgs/applications/editors/vim/macvim.nix
@@ -102,6 +102,9 @@ stdenv.mkDerivation {
     substituteInPlace src/auto/config.mk --replace "PERL_CFLAGS	=" "PERL_CFLAGS	= -I${darwin.libutil}/include"
 
     substituteInPlace src/MacVim/vimrc --subst-var-by CSCOPE ${cscope}/bin/cscope
+
+    # Work around weird code-signing issue
+    substituteInPlace src/auto/config.mk --replace "XCODEFLAGS''\t=" "XCODEFLAGS''\t= CODE_SIGN_IDENTITY="
   '';
 
   postInstall = ''
diff --git a/pkgs/applications/editors/vim/macvim.patch b/pkgs/applications/editors/vim/macvim.patch
index 8cb96a9ebba..fd02e119902 100644
--- a/pkgs/applications/editors/vim/macvim.patch
+++ b/pkgs/applications/editors/vim/macvim.patch
@@ -18,6 +18,21 @@ index e519018de..556a4127d 100644
  				PRODUCT_BUNDLE_IDENTIFIER = org.vim.MacVim;
  				PRODUCT_NAME = MacVim;
  				VERSIONING_SYSTEM = "apple-generic";
+diff --git a/src/MacVim/PSMTabBarControl/source/PSMTabBarCell.m b/src/MacVim/PSMTabBarControl/source/PSMTabBarCell.m
+index 6f1a06e46..a12e2cea4 100644
+--- a/src/MacVim/PSMTabBarControl/source/PSMTabBarCell.m
++++ b/src/MacVim/PSMTabBarControl/source/PSMTabBarCell.m
+@@ -13,7 +13,9 @@
+ #import "PSMTabDragAssistant.h"
+ 
+ 
+-@implementation PSMTabBarCell
++@implementation PSMTabBarCell {
++    id _controlView;
++}
+ 
+ #pragma mark -
+ #pragma mark Creation/Destruction
 diff --git a/src/MacVim/vimrc b/src/MacVim/vimrc
 index 23a06bf37..dfb10fe94 100644
 --- a/src/MacVim/vimrc
@@ -77,6 +92,18 @@ diff --git a/src/auto/configure b/src/auto/configure
 index 9e6a82f4a..3c6d1a89b 100755
 --- a/src/auto/configure
 +++ b/src/auto/configure
+@@ -4705,10 +4705,8 @@ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
+   else
+-    if test -z "$MACOSX_DEPLOYMENT_TARGET"; then
+-      macosx_deployment_target=`/usr/bin/sw_vers -productVersion|/usr/bin/sed -e 's/^\([0-9]*\.[0-9]*\).*/\1/'`
++      macosx_deployment_target=${MACOSX_DEPLOYMENT_TARGET:-10.12}
+       XCODEFLAGS="$XCODEFLAGS MACOSX_DEPLOYMENT_TARGET=$macosx_deployment_target"
+-    fi
+   fi
+ 
+ 
 @@ -5829,10 +5829,7 @@ $as_echo "not found" >&6; }
  
      for path in "${vi_cv_path_mzscheme_pfx}/lib" "${SCHEME_LIB}"; do
-- 
GitLab


From 2c9bab7ec225b6fa4b18c1248beb224eaec4ad46 Mon Sep 17 00:00:00 2001
From: Craige McWhirter <craige@mcwhirter.io>
Date: Thu, 12 Sep 2019 16:03:48 +1000
Subject: [PATCH 0122/2254] zcash: Add libsnark to stop build failures

Wanted for #68361

zcash build fails due to missing `profiling.hpp` which is provided by
`libsnark`.
---
 pkgs/applications/blockchains/zcash/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/blockchains/zcash/default.nix b/pkgs/applications/blockchains/zcash/default.nix
index 6a8fba3c2bb..1852d72d326 100644
--- a/pkgs/applications/blockchains/zcash/default.nix
+++ b/pkgs/applications/blockchains/zcash/default.nix
@@ -1,6 +1,6 @@
 { stdenv, libsodium, fetchFromGitHub, wget, pkgconfig, autoreconfHook, openssl, db62, boost
 , zlib, gtest, gmock, callPackage, gmp, qt4, utillinux, protobuf, qrencode, libevent
-, withGui }:
+, libsnark, withGui }:
 
 let librustzcash = callPackage ./librustzcash {};
 in
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
   buildInputs = [ gtest gmock gmp openssl wget db62 boost zlib
-                  protobuf libevent libsodium librustzcash ]
+                  protobuf libevent libsodium librustzcash libsnark ]
                   ++ optionals stdenv.isLinux [ utillinux ]
                   ++ optionals withGui [ qt4 qrencode ];
 
-- 
GitLab


From 08b73c1d587305d471f8214ce63baf0f7b00233f Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@transumption.com>
Date: Wed, 14 Aug 2019 11:59:41 +0000
Subject: [PATCH 0123/2254] buildRustPackage: fix cross-compilation to
 aarch64-unknown-linux-musl

---
 pkgs/build-support/rust/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index 6afe93c7e4c..1eea6b95d34 100644
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@@ -86,6 +86,10 @@ in stdenv.mkDerivation (args // {
     ${stdenv.lib.optionalString (stdenv.buildPlatform.config != stdenv.hostPlatform.config) ''
     [target."${stdenv.hostPlatform.config}"]
     "linker" = "${ccForHost}"
+    ${# https://github.com/rust-lang/rust/issues/46651#issuecomment-433611633
+      stdenv.lib.optionalString (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isAarch64) ''
+    "rustflags" = [ "-C", "target-feature=+crt-static", "-C", "link-arg=-lgcc" ]
+    ''}
     ''}
     EOF
     cat .cargo/config
-- 
GitLab


From 56e5dddf7c7420891a89fe227868c4c418e8dc36 Mon Sep 17 00:00:00 2001
From: Averell Dalton <averell+nixpkgs@rxd4.com>
Date: Tue, 10 Sep 2019 19:33:00 +0200
Subject: [PATCH 0124/2254] nextcloud: fix deprecation warning

---
 nixos/modules/services/web-apps/nextcloud.nix | 33 +++++++++++++------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix
index 5f5469e4850..db5dc915c89 100644
--- a/nixos/modules/services/web-apps/nextcloud.nix
+++ b/nixos/modules/services/web-apps/nextcloud.nix
@@ -120,16 +120,24 @@ in {
       '';
     };
 
-    poolConfig = mkOption {
-      type = types.lines;
-      default = ''
-        pm = dynamic
-        pm.max_children = 32
-        pm.start_servers = 2
-        pm.min_spare_servers = 2
-        pm.max_spare_servers = 4
-        pm.max_requests = 500
+    poolSettings = mkOption {
+      type = with types; attrsOf (oneOf [ str int bool ]);
+      default = {
+        "pm" = "dynamic";
+        "pm.max_children" = "32";
+        "pm.start_servers" = "2";
+        "pm.min_spare_servers" = "2";
+        "pm.max_spare_servers" = "4";
+        "pm.max_requests" = "500";
+      };
+      description = ''
+        Options for nextcloud's PHP pool. See the documentation on <literal>php-fpm.conf</literal> for details on configuration directives.
       '';
+    };
+
+    poolConfig = mkOption {
+      type = types.nullOr types.lines;
+      default = null;
       description = ''
         Options for nextcloud's PHP pool. See the documentation on <literal>php-fpm.conf</literal> for details on configuration directives.
       '';
@@ -287,6 +295,11 @@ in {
           message = "Please specify exactly one of adminpass or adminpassFile";
         }
       ];
+
+      warnings = optional (cfg.poolConfig != null) ''
+        Using config.services.nextcloud.poolConfig is deprecated and will become unsupported in a future release.
+        Please migrate your configuration to config.services.nextcloud.poolSettings.
+      '';
     }
 
     { systemd.timers.nextcloud-cron = {
@@ -423,7 +436,7 @@ in {
           settings = mapAttrs (name: mkDefault) {
             "listen.owner" = "nginx";
             "listen.group" = "nginx";
-          };
+          } // cfg.poolSettings;
           extraConfig = cfg.poolConfig;
         };
       };
-- 
GitLab


From 35399ad14b1c814475b6a182e2077e3956324201 Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Thu, 12 Sep 2019 14:29:34 +0200
Subject: [PATCH 0125/2254] skopeo: 0.1.37 -> 0.1.39

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

diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix
index e7b21c40f17..e36f34bb10c 100644
--- a/pkgs/development/tools/skopeo/default.nix
+++ b/pkgs/development/tools/skopeo/default.nix
@@ -5,13 +5,13 @@
 with stdenv.lib;
 
 let
-  version = "0.1.37";
+  version = "0.1.39";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "containers";
     repo = "skopeo";
-    sha256 = "1ly5yq3aj4ciqn6hbhvxqp1im81pbas9smdhbbks7iwjvh944d62";
+    sha256 = "1jkxmvh079pd9j4aa39ilmclwafnjs0yqdiigwh8cj7yf97x4vsi";
   };
 
   defaultPolicyFile = runCommand "skopeo-default-policy.json" {} "cp ${src}/default-policy.json $out";
-- 
GitLab


From 88f4e09fdad0a30e3d1fba0de03f361612273e09 Mon Sep 17 00:00:00 2001
From: Claudio Bley <cbley@exa-online.de>
Date: Thu, 12 Sep 2019 16:21:08 +0200
Subject: [PATCH 0126/2254] wtf: Rename executable to `wtfutil`

The upstream project changed the name from `wtf` to `wtfutil` some time ago, see [1].

[1]: https://github.com/wtfutil/wtf/commit/b4e3b7e3a2352d58e255d117d0743253e88cf3f1
---
 pkgs/applications/misc/wtf/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix
index 60ff84ffe59..4131a3e2ade 100644
--- a/pkgs/applications/misc/wtf/default.nix
+++ b/pkgs/applications/misc/wtf/default.nix
@@ -27,7 +27,8 @@ buildGoModule rec {
   nativeBuildInputs = [ makeWrapper ];
 
   postInstall = ''
-    wrapProgram "$out/bin/wtf" --prefix PATH : "${ncurses.dev}/bin"
+    mv "$out/bin/wtf" "$out/bin/wtfutil"
+    wrapProgram "$out/bin/wtfutil" --prefix PATH : "${ncurses.dev}/bin"
   '';
 
   meta = with lib; {
-- 
GitLab


From d980ba53d6598147fc203352a2dcdfca2b0ac02a Mon Sep 17 00:00:00 2001
From: Claudio Bley <cbley@exa-online.de>
Date: Thu, 12 Sep 2019 16:21:32 +0200
Subject: [PATCH 0127/2254] wtf:0.21.0 -> 0.22.0

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

diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix
index 4131a3e2ade..fa865dcc16c 100644
--- a/pkgs/applications/misc/wtf/default.nix
+++ b/pkgs/applications/misc/wtf/default.nix
@@ -7,7 +7,7 @@
 
 buildGoModule rec {
   pname = "wtf";
-  version = "0.21.0";
+  version = "0.22.0";
 
   overrideModAttrs = _oldAttrs : _oldAttrs // {
     preBuild = ''export GOPROXY="https://gocenter.io"'';
@@ -17,10 +17,10 @@ buildGoModule rec {
     owner = "wtfutil";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0sd8vrx7nak0by4whdmd9jzr66zm48knv1w1aqi90709fv98brm9";
-  };
+    sha256 = "1d8lp94cw8rh9r9y64awxafhw9fmp33v3m761gzy500hrxal2rzb";
+   };
 
-  modSha256 = "0jgq9ql27x0kdp59l5drisl5v7v7sx2wy3zqjbr3bqyh3vdx19ic";
+  modSha256 = "0m180571j4564py5mzdcbyypk71fdlp2vkfdwi6q85nd2q94sx6h";
 
   buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
 
-- 
GitLab


From fadebf39edae13b4d592f657978e954226b99c38 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Thu, 12 Sep 2019 18:14:50 +0200
Subject: [PATCH 0128/2254] todoist: 0.13.1 -> 0.14.0

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

diff --git a/pkgs/applications/misc/todoist/default.nix b/pkgs/applications/misc/todoist/default.nix
index d9dcee762cf..cda756fe543 100644
--- a/pkgs/applications/misc/todoist/default.nix
+++ b/pkgs/applications/misc/todoist/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "todoist";
-  version = "0.13.1";
+  version = "0.14.0";
 
   src = fetchFromGitHub {
     owner = "sachaos";
     repo = "todoist";
     rev = "v${version}";
-    sha256 = "1kwvlsjr2a7wdhlwpxxpdh87wz8k9yjwl59vl2g7ya6m0rvhd3mc";
+    sha256 = "0qhmv65il14lns817yxhma784jw5bz629svzh2ykrmilx5f7dxqc";
   };
 
-  modSha256 = "09n6abyaqwz4zcdz8934rvpbxhp4v2nmm5v739kkcc98c3h93i64";
+  modSha256 = "01dqw4x9rbi1kqrfygais0jzmbqxgzx298xy7f52z0npschpigiv";
 
   meta = {
     homepage = https://github.com/sachaos/todoist;
-- 
GitLab


From c399d6d9bb6a8ad769546bd93a1d7a60fb2bbcac Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 12 Sep 2019 20:58:54 +0200
Subject: [PATCH 0129/2254] fscrypt: unstable-2019-08-29 -> 0.2.5

---
 pkgs/os-specific/linux/fscrypt/default.nix |  8 +--
 pkgs/os-specific/linux/fscrypt/deps.nix    | 66 ----------------------
 2 files changed, 3 insertions(+), 71 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/fscrypt/deps.nix

diff --git a/pkgs/os-specific/linux/fscrypt/default.nix b/pkgs/os-specific/linux/fscrypt/default.nix
index cdd42e98f06..92594ea99de 100644
--- a/pkgs/os-specific/linux/fscrypt/default.nix
+++ b/pkgs/os-specific/linux/fscrypt/default.nix
@@ -4,17 +4,15 @@
 
 buildGoPackage rec {
   pname = "fscrypt";
-  version = "unstable-2019-08-29";
+  version = "0.2.5";
 
   goPackagePath = "github.com/google/fscrypt";
 
-  goDeps = ./deps.nix;
-
   src = fetchFromGitHub {
     owner = "google";
     repo = "fscrypt";
-    rev = "8a3acda2011e9a080ee792c1e11646e6118a4930";
-    sha256 = "17h6r5lqiz0cw9vsixv48a1p78nd7bs1kncg6p4lfagl7kr5hpls";
+    rev = "v${version}";
+    sha256 = "1jf6363kc9id3ar93znlcglx3llgv01ccp3nlbamm98rm9dps4qk";
   };
 
   buildInputs = [ pam ];
diff --git a/pkgs/os-specific/linux/fscrypt/deps.nix b/pkgs/os-specific/linux/fscrypt/deps.nix
deleted file mode 100644
index 5d3e8a89a91..00000000000
--- a/pkgs/os-specific/linux/fscrypt/deps.nix
+++ /dev/null
@@ -1,66 +0,0 @@
-# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
-[
-  {
-    goPackagePath = "github.com/golang/protobuf";
-    fetch = {
-      type = "git";
-      url = "https://github.com/golang/protobuf";
-      rev = "v1.2.0";
-      sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab";
-    };
-  }
-  {
-    goPackagePath = "github.com/pkg/errors";
-    fetch = {
-      type = "git";
-      url = "https://github.com/pkg/errors";
-      rev = "v0.8.0";
-      sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
-    };
-  }
-  {
-    goPackagePath = "github.com/urfave/cli";
-    fetch = {
-      type = "git";
-      url = "https://github.com/urfave/cli";
-      rev = "v1.20.0";
-      sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/crypto";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/crypto";
-      rev = "614d502a4dac";
-      sha256 = "1rcyvsl8b8pk7h8lwl0fpiflrx8zs121wi5490ln0qnvkk8d4bwy";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/net";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/net";
-      rev = "8a410e7b638d";
-      sha256 = "0hp0l8f6fir5gmgrjq0mhh5ikc0rlrm72774228800kfwqjrxxny";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/sync";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/sync";
-      rev = "1d60e4601c6f";
-      sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/sys";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/sys";
-      rev = "d99a578cf41b";
-      sha256 = "10q9xx4pmnq92qn6ff4xp7n1hx766wvw2rf7pqcd6rx5plgwz8cm";
-    };
-  }
-]
-- 
GitLab


From 62195d460951342c8145929fbc1cb0773055b66c Mon Sep 17 00:00:00 2001
From: Evan Stoll <evanjsx@gmail.com>
Date: Thu, 12 Sep 2019 17:39:50 -0400
Subject: [PATCH 0130/2254] gitkraken: 6.1.4 -> 6.2.0

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

diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix
index fa93ff41a4a..0299d4ab48e 100644
--- a/pkgs/applications/version-management/gitkraken/default.nix
+++ b/pkgs/applications/version-management/gitkraken/default.nix
@@ -13,11 +13,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "gitkraken";
-  version = "6.1.4";
+  version = "6.2.0";
 
   src = fetchurl {
     url = "https://release.axocdn.com/linux/GitKraken-v${version}.deb";
-    sha256 = "10m6pwdwdxj6x64bc7mrvlvwkgqrd5prh9xx7xhvbz55q6gx4vdr";
+    sha256 = "1kvp0fbixpynb0wh8px1qm6gnxwc5ml2q0vwsll0pa8zrjdz4q3k";
   };
 
   libPath = makeLibraryPath [
-- 
GitLab


From 41f25ab57589b751ccbac1096d80e1e9be033d92 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Thu, 12 Sep 2019 20:41:56 -0400
Subject: [PATCH 0131/2254] valum: 0.3.15 -> 0.3.16

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

diff --git a/pkgs/development/web/valum/default.nix b/pkgs/development/web/valum/default.nix
index a625a815603..c48d16fcae9 100644
--- a/pkgs/development/web/valum/default.nix
+++ b/pkgs/development/web/valum/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "valum";
-  version = "0.3.15";
+  version = "0.3.16";
 
   src = fetchFromGitHub {
     owner = "valum-framework";
     repo = "valum";
     rev = "v${version}";
-    sha256 = "1wk23aq5lxsqns58s4g9jrwx6wrk7k9hq9rg8jcs42rxn2pckaxw";
+    sha256 = "15lnk91gykm60rv31x3r1swp2bhzl3gwp12mf39smzi4bmf7h38f";
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig ];
-- 
GitLab


From d25bf0495ccfca557c62672fef5e90b599a1dbdc Mon Sep 17 00:00:00 2001
From: Pamplemousse <xav.maso@gmail.com>
Date: Tue, 13 Aug 2019 18:16:32 -0700
Subject: [PATCH 0132/2254] sasquatch: init

---
 pkgs/tools/filesystems/sasquatch/default.nix | 53 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 +
 2 files changed, 55 insertions(+)
 create mode 100644 pkgs/tools/filesystems/sasquatch/default.nix

diff --git a/pkgs/tools/filesystems/sasquatch/default.nix b/pkgs/tools/filesystems/sasquatch/default.nix
new file mode 100644
index 00000000000..c393c65a720
--- /dev/null
+++ b/pkgs/tools/filesystems/sasquatch/default.nix
@@ -0,0 +1,53 @@
+{ fetchFromGitHub
+, fetchurl
+, lz4 ? null
+, lz4Support ? false
+, lzma
+, lzo
+, stdenv
+, xz
+, zlib
+}:
+
+assert lz4Support -> (lz4 != null);
+
+let
+  patch = fetchFromGitHub {
+    owner = "devttys0";
+    repo = "sasquatch";
+    rev = "3e0cc40fc6dbe32bd3a5e6c553b3320d5d91ceed";
+    sha256 = "19lhndjv7v9w6nmszry63zh5rqii9v7wvsbpc2n6q606hyz955g2";
+  } + "/patches/patch0.txt";
+in
+stdenv.mkDerivation rec {
+  pname = "sasquatch";
+  version = "4.3";
+
+  src = fetchurl {
+    url = mirror://sourceforge/squashfs/squashfs4.3.tar.gz;
+    sha256 = "1xpklm0y43nd9i6jw43y2xh5zvlmj9ar2rvknh0bh7kv8c95aq0d";
+  };
+
+  buildInputs = [ lzma lzo xz zlib ]
+    ++ stdenv.lib.optional lz4Support lz4;
+
+  patches = [ patch ];
+  patchFlags = [ "-p0" ];
+
+  postPatch = ''
+    cd squashfs-tools
+  '';
+
+  installFlags = "INSTALL_DIR=\${out}/bin";
+
+  makeFlags = [ "XZ_SUPPORT=1" ]
+    ++ stdenv.lib.optional lz4Support "LZ4_SUPPORT=1";
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/devttys0/sasquatch";
+    description = "Set of patches to the standard unsquashfs utility (part of squashfs-tools) that attempts to add support for as many hacked-up vendor-specific SquashFS implementations as possible";
+    license = licenses.gpl2Plus;
+    maintainers = [ maintainers.pamplemousse ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 26a322c72d3..7c807caf6e6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6008,6 +6008,8 @@ in
 
   samplicator = callPackage ../tools/networking/samplicator { };
 
+  sasquatch = callPackage ../tools/filesystems/sasquatch { };
+
   sasview = callPackage ../applications/science/misc/sasview {};
 
   scallion = callPackage ../tools/security/scallion { };
-- 
GitLab


From 0d65acf47c83debdf3089cb3f66aee045b3cdce1 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 12 Sep 2019 22:22:31 +0200
Subject: [PATCH 0133/2254] treewide: build some unfree packages locally

Unfree packages aren't distributed by our binary cache due to legal
reasons[1] and are usually a prebuilt binary that requires some patching.
When using distributed builds[2], those are uploaded to another build
machine as fixed-output derivations from `fetchurl` are built locally[3]
which takes a certain amount of time and resources with almost no gain
as the build process is trivial in contrast to the up/download to a
remote builder.

This is why I figured that at least some of the packages should be
explicitly built locally, I've done something simlar for
`citrix_workspace` already in the past[4].

The following packages are affected by this:

* `idea.*` (excluding free derivatives)
* `xmind`
* `teamviewer`

[1] https://nixos.wiki/wiki/FAQ/How_can_I_install_a_proprietary_or_unfree_package%3F#More_precision
[2] https://nixos.wiki/wiki/Distributed_build
[3] https://github.com/NixOS/nixpkgs/blob/267c8d6b2fea05bc811c8e2c2f4529b1436eeb9a/pkgs/build-support/fetchurl/default.nix#L95
[4] 87f818d9b21b16b067048a6ee0178b782886f0f0
---
 pkgs/applications/editors/jetbrains/common.nix             | 2 ++
 pkgs/applications/misc/xmind/default.nix                   | 2 ++
 pkgs/applications/networking/remote/teamviewer/default.nix | 1 +
 3 files changed, 5 insertions(+)

diff --git a/pkgs/applications/editors/jetbrains/common.nix b/pkgs/applications/editors/jetbrains/common.nix
index be20800cde2..f535d7bff47 100644
--- a/pkgs/applications/editors/jetbrains/common.nix
+++ b/pkgs/applications/editors/jetbrains/common.nix
@@ -77,4 +77,6 @@ with stdenv; lib.makeOverridable mkDerivation rec {
     ln -s "$item/share/applications" $out/share
   '';
 
+} // stdenv.lib.optionalAttrs (!(meta.license.free or true)) {
+  preferLocalBuild = true;
 }
diff --git a/pkgs/applications/misc/xmind/default.nix b/pkgs/applications/misc/xmind/default.nix
index c673002fb51..37398a56691 100644
--- a/pkgs/applications/misc/xmind/default.nix
+++ b/pkgs/applications/misc/xmind/default.nix
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
     sha256 = "0jxq2fiq69q9ly0m6hx2qfybqad22sl42ciw636071khpqgc885f";
   };
 
+  preferLocalBuild = true;
+
   patches = [ ./java-env-config-fixes.patch ];
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix
index f9b17b42bde..d9a3d4aefcd 100644
--- a/pkgs/applications/networking/remote/teamviewer/default.nix
+++ b/pkgs/applications/networking/remote/teamviewer/default.nix
@@ -54,6 +54,7 @@ mkDerivation rec {
   '';
 
   dontStrip = true;
+  preferLocalBuild = true;
 
   meta = with lib; {
     homepage = http://www.teamviewer.com;
-- 
GitLab


From 154c9a863dd82431f8ee345c74976f26c81a0414 Mon Sep 17 00:00:00 2001
From: Henrik Jonsson <me@hkjn.me>
Date: Fri, 13 Sep 2019 10:09:44 +0200
Subject: [PATCH 0134/2254] tor-browser-bundle-bin: Drop github mirror

The github.com mirror for tor-browser hasn't been updated since
8.0.2, released in Oct 2018 (~11 months ago; currently latest
released version is 8.5.6):

https://github.com/TheTorProject/gettorbrowser/releases/
---
 .../browsers/tor-browser-bundle-bin/default.nix        | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
index 739315917d4..563c0e751c8 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -95,18 +95,12 @@ let
 
   srcs = {
     x86_64-linux = fetchurl {
-      urls = [
-        "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
-        "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
-      ];
+      url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz";
       sha256 = "00r5k9bbfpv3s6shxqypl13psr1zz51xiyz3vmm4flhr2qa4ycsz";
     };
 
     i686-linux = fetchurl {
-      urls = [
-        "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
-        "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
-      ];
+      url = "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz";
       sha256 = "1nxvw5kiggfr4n5an436ass84cvwjviaa894kfm72yf2ls149f29";
     };
   };
-- 
GitLab


From 7fc606065c003e954d85af0ec4cb0841606188bc Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 13 Sep 2019 04:20:00 -0500
Subject: [PATCH 0135/2254] postgresqlPackages.pgrouting: 2.6.2 -> 2.6.3

Changelog: https://github.com/pgRouting/pgrouting/releases/tag/v2.6.3
---
 pkgs/servers/sql/postgresql/ext/pgrouting.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pgrouting.nix b/pkgs/servers/sql/postgresql/ext/pgrouting.nix
index 6e1c6e3a4fc..48c41a9ca02 100644
--- a/pkgs/servers/sql/postgresql/ext/pgrouting.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgrouting.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   pname = "pgrouting";
-  version = "2.6.2";
+  version = "2.6.3";
 
   nativeBuildInputs = [ cmake perl ];
   buildInputs = [ postgresql boost gmp cgal mpfr ];
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     owner  = "pgRouting";
     repo   = pname;
     rev    = "v${version}";
-    sha256 = "09xy5pmiwq0lxf2m8p4q5r892mfmn32vf8m75p84jnz4707z1l0j";
+    sha256 = "0jdjb8476vjgc7i26v2drcqjvhdbsk1wx243fddffg169nb664ml";
   };
 
   installPhase = ''
-- 
GitLab


From 9a2e336c8a1520542b368d6651faa473d6888c64 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 13 Sep 2019 04:20:00 -0500
Subject: [PATCH 0136/2254] tflint: 0.11.0 -> 0.11.1

Changelog: https://github.com/wata727/tflint/releases/tag/v0.11.1
---
 pkgs/development/tools/analysis/tflint/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix
index 7dca029d557..8c47a8bc069 100644
--- a/pkgs/development/tools/analysis/tflint/default.nix
+++ b/pkgs/development/tools/analysis/tflint/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "tflint";
-  version = "0.11.0";
+  version = "0.11.1";
 
   src = fetchFromGitHub {
     owner = "wata727";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0aff7ckl245cyjs2rbgczkqlp2x6g4g458p4li0k1agk3m9bbq35";
+    sha256 = "0aw39xv6jpnhy201gp9jhz6cbz47k7qgxgcwsffak8janbk6bj2a";
   };
 
   modSha256 = "1facqppgpmmz2j7j77fa3mnjv2nzjxz4ya6xvyvyy92ma0ybclgh";
-- 
GitLab


From 304aa6f6b6da266fd0ad54cca3e7ba776a7070ec Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 13 Sep 2019 04:20:00 -0500
Subject: [PATCH 0137/2254] sops: 3.3.1 -> 3.4.0

Changelog: https://github.com/mozilla/sops/releases/tag/3.4.0
---
 pkgs/tools/security/sops/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/security/sops/default.nix b/pkgs/tools/security/sops/default.nix
index fcc45542214..b132066fee5 100644
--- a/pkgs/tools/security/sops/default.nix
+++ b/pkgs/tools/security/sops/default.nix
@@ -1,20 +1,20 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 
-buildGoPackage rec {
+buildGoModule rec {
   pname = "sops";
-  version = "3.3.1";
-
-  goPackagePath = "go.mozilla.org/sops";
+  version = "3.4.0";
 
   src = fetchFromGitHub {
     rev = version;
     owner = "mozilla";
     repo = pname;
-    sha256 = "0jbrz3yz6cj08h8cx6y98m8r0lpclh9367cw5apy6w3v71i3svfi";
+    sha256 = "1mrqf9xgv88v919x7gz9l1x70xwvp6cfz3zp9ip1nj2pzn6ixz3d";
   };
 
+  modSha256 = "13ja8nxycmdjnrnsxdd1qs06x408aqr4im127a6y433pkx2dg7gc";
+
   meta = with stdenv.lib; {
-    inherit (src.meta) homepage;
+    homepage = "https://github.com/mozilla/sops";
     description = "Mozilla sops (Secrets OPerationS) is an editor of encrypted files";
     maintainers = [ maintainers.marsam ];
     license = licenses.mpl20;
-- 
GitLab


From 67425aa31e30b768b2679c40b5a2b3ea39d3e226 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 13 Sep 2019 04:20:00 -0500
Subject: [PATCH 0138/2254] netdata: 1.17.0 -> 1.17.1

Changelog: https://github.com/netdata/netdata/releases/tag/v1.17.1
---
 pkgs/tools/system/netdata/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix
index 30ebd4969dc..7526a55d7ef 100644
--- a/pkgs/tools/system/netdata/default.nix
+++ b/pkgs/tools/system/netdata/default.nix
@@ -12,12 +12,12 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "1.17.0";
+  version = "1.17.1";
   pname = "netdata";
 
   src = fetchurl {
     url = "https://github.com/netdata/netdata/releases/download/v${version}/netdata-v${version}.tar.gz";
-    sha256 = "099xvndf5lql4ipwqhm38lpc65yicmpmkk3a7c2j4m48l3vqw9y6";
+    sha256 = "0k49ms295b9icccvknyqyqlsy911h06c7h7aql5havcx5m5jxq7w";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
-- 
GitLab


From 7c046d2b92e0ee0a2ad9c0df0dffc178323afec9 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 13 Sep 2019 04:20:00 -0500
Subject: [PATCH 0139/2254] postgresql11Packages.pg_auto_failover: 1.0.3 ->
 1.0.4

---
 pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix
index ae72b164b84..05fd405dbe6 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pg_auto_failover";
-  version = "1.0.3";
+  version = "1.0.4";
 
   src = fetchFromGitHub {
     owner = "citusdata";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0mggf5h6gh2mck75dmz5w63gi7d10pqs58fdp2jdpv3am75picll";
+    sha256 = "0v4fj83zifcqhihc5myh0qv2396n5kw4sa8ix6jljmp6wh036z9j";
   };
 
   buildInputs = [ postgresql openssl zlib readline ];
-- 
GitLab


From 0398993a3242730708bc1f92104b03c6c9487735 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 13 Sep 2019 04:20:00 -0500
Subject: [PATCH 0140/2254] postgresqlPackages.timescaledb: 1.4.1 -> 1.4.2

Changelog: https://github.com/timescale/timescaledb/releases/tag/1.4.2
---
 pkgs/servers/sql/postgresql/ext/timescaledb.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix
index 5f995995820..ef3dc4894d7 100644
--- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix
+++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix
@@ -8,7 +8,7 @@
 
 stdenv.mkDerivation rec {
   pname = "timescaledb";
-  version = "1.4.1";
+  version = "1.4.2";
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [ postgresql openssl ];
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     owner  = "timescale";
     repo   = "timescaledb";
     rev    = "refs/tags/${version}";
-    sha256 = "1gbca0fyaxjkwijdp2ah4iykwq5xabz9kkf8ak76sif4lz64y54b";
+    sha256 = "06mchpfjh4kskxq5r8b84870gl37xcqdf14n96qjb4nbyw9l8xcc";
   };
 
   cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" ];
-- 
GitLab


From e4d2f259dba06a42710dc1995398ac2a335ae2ae Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Fri, 13 Sep 2019 08:02:02 -0400
Subject: [PATCH 0141/2254] vscode: 1.38.0 -> 1.38.1

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

diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix
index 40d16733db2..6f7e3ad0ba4 100644
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/pkgs/applications/editors/vscode/vscode.nix
@@ -11,13 +11,13 @@ let
   archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
 
   sha256 = {
-    x86_64-linux = "1iz36nhkg78346g5407df6jv4d1ydb22hhgs8hiaxql3hq5z7x3q";
-    x86_64-darwin = "1iijk0kx90rax39iradbbafyvd3vwnzsgvyb3s13asy42pbhhkky";
+    x86_64-linux = "1wxaxz2q4qizh6f23ipz8ihay6bpjdq0545vijqd84fqazcji6sq";
+    x86_64-darwin = "1gb9w3hvw3avn852an5v8m1ia64fkavnvaawjfc3455b248iiqvk";
   }.${system};
 in
   callPackage ./generic.nix rec {
 
-    version = "1.38.0";
+    version = "1.38.1";
     pname = "vscode";
 
     executableName = "code" + lib.optionalString isInsiders "-insiders";
-- 
GitLab


From 703471064bf00712d5642db6577aa4723672c55c Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Fri, 13 Sep 2019 08:02:16 -0400
Subject: [PATCH 0142/2254] vscodium: 1.38.0 -> 1.38.1

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

diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix
index 02d0396a94f..b526d8fe327 100644
--- a/pkgs/applications/editors/vscode/vscodium.nix
+++ b/pkgs/applications/editors/vscode/vscodium.nix
@@ -11,13 +11,13 @@ let
   archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
 
   sha256 = {
-    x86_64-linux = "09rq5jx7aicwp3qqi5pcv6bmyyp1rm5cfa96hvy3f4grhq1fi132";
-    x86_64-darwin = "1y1lbb3q5myaz7jg21x5sl0in8wr46brqj9zyrg3f16zahsagzr4";
+    x86_64-linux = "15m7mfb8gmx3pwydc37blj0rxwgmkrnqfj6y79rpqlr2dg92gwlb";
+    x86_64-darwin = "080k4fnfa5ylmmya6zprgci3gld9mrbqsfnk53hgcny91ykl5xj5";
   }.${system};
 in
   callPackage ./generic.nix rec {
 
-    version = "1.38.0";
+    version = "1.38.1";
     pname = "vscodium";
 
     executableName = "codium";
-- 
GitLab


From 11ac4397a56b98dede808b371552011c78b69be5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Fri, 13 Sep 2019 09:08:58 -0300
Subject: [PATCH 0143/2254] deepin.deepin-wm: use vala-0.42 to avoid
 compilation errors

---
 pkgs/desktops/deepin/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix
index 5d68396a498..869f08154bb 100644
--- a/pkgs/desktops/deepin/default.nix
+++ b/pkgs/desktops/deepin/default.nix
@@ -38,7 +38,9 @@ let
     };
     deepin-turbo = callPackage ./deepin-turbo { };
     deepin-wallpapers = callPackage ./deepin-wallpapers { };
-    deepin-wm = callPackage ./deepin-wm { };
+    deepin-wm = callPackage ./deepin-wm {
+      vala = pkgs.vala_0_42;
+    };
     dpa-ext-gnomekeyring = callPackage ./dpa-ext-gnomekeyring { };
     dtkcore = callPackage ./dtkcore { };
     dtkwidget = callPackage ./dtkwidget { };
-- 
GitLab


From f25e86411c57d8e364b6b22137224a7a9f4b6616 Mon Sep 17 00:00:00 2001
From: Daniel Schaefer <git@danielschaefer.me>
Date: Fri, 13 Sep 2019 14:30:58 +0200
Subject: [PATCH 0144/2254] chipsec: 1.4.0 -> 1.4.1

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

diff --git a/pkgs/tools/security/chipsec/default.nix b/pkgs/tools/security/chipsec/default.nix
index f403aaaf687..7b4c8cf68eb 100644
--- a/pkgs/tools/security/chipsec/default.nix
+++ b/pkgs/tools/security/chipsec/default.nix
@@ -2,13 +2,13 @@
 , kernel ? null, withDriver ? false }:
 pythonPackages.buildPythonApplication rec {
   name = "chipsec-${version}";
-  version = "1.4.0";
+  version = "1.4.1";
 
   src = fetchFromGitHub {
     owner = "chipsec";
     repo = "chipsec";
     rev = version;
-    sha256 = "09ipr0vls1l2wln4z3dc9vx0zp63ps3dxkwlpm9rqqbpg7qq6lrp";
+    sha256 = "043gf21zygvrzvvkwv5xxpcv3ryj5m8klkgyhq0lnh6k594qrg77";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From 9dc74f3c44fe6d22430e392629aa0e9473ceede0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Fri, 13 Sep 2019 09:39:56 -0300
Subject: [PATCH 0145/2254] mojave-gtk-theme: 2019-05-21 -> 2019-09-09

---
 pkgs/data/themes/mojave/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/themes/mojave/default.nix b/pkgs/data/themes/mojave/default.nix
index 1fc82e8aca2..714e026d32c 100644
--- a/pkgs/data/themes/mojave/default.nix
+++ b/pkgs/data/themes/mojave/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "mojave-gtk-theme";
-  version = "2019-05-21";
+  version = "2019-09-09";
 
   src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = pname;
-    rev = "f6167740b308715b38567ec660aa5241d964af1b";
-    sha256 = "1k57f5vimdrciskjgxqz7k0xybc7b8pwcsii0p6kc8klmyrjrr9c";
+    rev = version;
+    sha256 = "1qffh6jsvy61f29ymw1v9hpjnsvhqin19mp05cys1lnwc7y810zr";
   };
 
   buildInputs = [ gtk_engines ];
-- 
GitLab


From acf571eec4e70447bb7b8abcd1856c16b1af5772 Mon Sep 17 00:00:00 2001
From: Daniel Schaefer <git@danielschaefer.me>
Date: Fri, 13 Sep 2019 15:00:54 +0200
Subject: [PATCH 0146/2254] httplz: Fix build with openssl_1_0_2

The rust crate dependency that wraps OpenSSL doesn't support the Openssl
1.1.
---
 pkgs/tools/networking/httplz/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/httplz/default.nix b/pkgs/tools/networking/httplz/default.nix
index b7ee85da9d8..001041a0799 100644
--- a/pkgs/tools/networking/httplz/default.nix
+++ b/pkgs/tools/networking/httplz/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, rustPlatform, pkgs, darwin }:
+{ stdenv, lib, fetchFromGitHub, rustPlatform, openssl, pkgconfig, darwin, libiconv }:
 
 rustPlatform.buildRustPackage rec {
   pname = "httplz";
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0q9ng8vf01k65zmcm7bbkqyrkj5hs86zdxwrfj98f4xqxrm75rf6";
   };
 
-  buildInputs = with pkgs; [ openssl pkgconfig ] ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ];
+  buildInputs = [ openssl pkgconfig ] ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ];
 
   cargoBuildFlags = [ "--bin httplz" ];
   cargoPatches = [ ./cargo-lock.patch ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a315698ccd9..4f5726f9b30 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3855,7 +3855,7 @@ in
 
   httping = callPackage ../tools/networking/httping {};
 
-  httplz = callPackage ../tools/networking/httplz { };
+  httplz = callPackage ../tools/networking/httplz { openssl = openssl_1_0_2; };
 
   httpfs2 = callPackage ../tools/filesystems/httpfs { };
 
-- 
GitLab


From 32d0ee40f5c546d77e90b6eba5b304ab6ef6c319 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Fri, 13 Sep 2019 10:19:51 -0300
Subject: [PATCH 0147/2254] arc-theme: 20190330 -> 20190910

- Update version number
- Update repository owner
- Update home page
- Remove build time dependency on gnome3.gnome-shell: only gnome-shell
  version is needed
- Linking gnome-shell support for 3.30 to 3.32 is not needed anymore
- patchShebangs is not needed
---
 pkgs/misc/themes/arc/default.nix | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/pkgs/misc/themes/arc/default.nix b/pkgs/misc/themes/arc/default.nix
index da12255e91e..dc54c1499fb 100644
--- a/pkgs/misc/themes/arc/default.nix
+++ b/pkgs/misc/themes/arc/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "arc-theme";
-  version = "20190330";
+  version = "20190910";
 
   src = fetchFromGitHub {
-    owner  = "NicoHood";
+    owner  = "arc-design";
     repo   = pname;
     rev    = version;
-    sha256 = "16n5svgkpa8azxgyy64zwjjc04r57wfzkdq9igqvbvwkbvx8aa89";
+    sha256 = "161kx9ii5ij1503nvhgn3pyqfj7cj03l1di2yf8kwwfczbi4mq3j";
   };
 
   nativeBuildInputs = [
@@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
     optipng
     inkscape
     gtk3
-    gnome3.gnome-shell
   ];
 
   propagatedUserEnvPkgs = [
@@ -29,26 +28,23 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  postPatch = ''
-    patchShebangs .
-    # TODO: remove this after update
-    ln -s 3.30 common/gnome-shell/3.32
-  '';
-
   preBuild = ''
     # Shut up inkscape's warnings about creating profile directory
     export HOME="$NIX_BUILD_ROOT"
   '';
 
-  configureFlags = [ "--disable-unity" ];
+  configureFlags = [
+    "--with-gnome-shell=${stdenv.lib.versions.majorMinor gnome3.gnome-shell.version}"
+    "--disable-unity"
+  ];
 
   postInstall = ''
     install -Dm644 -t $out/share/doc/${pname} AUTHORS *.md
   '';
 
   meta = with stdenv.lib; {
-    description = "A flat theme with transparent elements for GTK 3, GTK 2 and Gnome-Shell";
-    homepage    = https://github.com/NicoHood/arc-theme;
+    description = "Flat theme with transparent elements for GTK 3, GTK 2 and Gnome Shell";
+    homepage    = https://github.com/arc-design/arc-theme;
     license     = licenses.gpl3;
     maintainers = with maintainers; [ simonvandel romildo ];
     platforms   = platforms.linux;
-- 
GitLab


From f93d1762ee27a29f2aa6412fe45f0886ba3e7554 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Fri, 13 Sep 2019 10:27:41 -0300
Subject: [PATCH 0148/2254] arc-theme: move to pkgs/data/themes

---
 pkgs/{misc => data}/themes/arc/default.nix | 0
 pkgs/top-level/all-packages.nix            | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename pkgs/{misc => data}/themes/arc/default.nix (100%)

diff --git a/pkgs/misc/themes/arc/default.nix b/pkgs/data/themes/arc/default.nix
similarity index 100%
rename from pkgs/misc/themes/arc/default.nix
rename to pkgs/data/themes/arc/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 406b42f498d..08c26bef360 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -966,8 +966,6 @@ in
     novacomd = callPackage ../development/mobile/webos/novacomd.nix { };
   };
 
-  arc-theme = callPackage ../misc/themes/arc { };
-
   arc-kde-theme = callPackage ../misc/themes/arc-kde { };
 
   adapta-gtk-theme = callPackage ../misc/themes/adapta { };
@@ -16549,6 +16547,8 @@ in
 
   arc-icon-theme = callPackage ../data/icons/arc-icon-theme { };
 
+  arc-theme = callPackage ../data/themes/arc { };
+
   arkpandora_ttf = callPackage ../data/fonts/arkpandora { };
 
   aurulent-sans = callPackage ../data/fonts/aurulent-sans { };
-- 
GitLab


From ec595e4270e9a49825e1a60b35bc351dfa101d9b Mon Sep 17 00:00:00 2001
From: 0x4A6F <0x4A6F@users.noreply.github.com>
Date: Fri, 13 Sep 2019 14:15:25 +0000
Subject: [PATCH 0149/2254] routinator: 0.6.0 -> 0.6.1

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

diff --git a/pkgs/servers/routinator/default.nix b/pkgs/servers/routinator/default.nix
index ed1362a0a52..440cd346522 100644
--- a/pkgs/servers/routinator/default.nix
+++ b/pkgs/servers/routinator/default.nix
@@ -2,13 +2,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "routinator";
-  version = "0.6.0";
+  version = "0.6.1";
 
   src = fetchFromGitHub {
     owner = "NLnetLabs";
     repo = pname;
     rev = "v${version}";
-    sha256 = "13xfnlaqjisi9fm1p7ydhgrh86ccbfwkxbnrv8abdx80jwb0lm15";
+    sha256 = "1knqgq8xrlvwfc3y2hki6p0zr4dblm7max37y01p3bf641gs748z";
   };
 
   cargoSha256 = "13sx7mbirhrd0is7gvnk0mir5qizbhrlvsn0v55ibf3bybjsb644";
-- 
GitLab


From 250a66789211b79a0234d81a79e4c341dfb3f638 Mon Sep 17 00:00:00 2001
From: pebblekite <pebblekite@noreply.users.github.com>
Date: Fri, 13 Sep 2019 17:43:01 +0300
Subject: [PATCH 0150/2254] cue: 0.0.3 -> 0.0.11

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

diff --git a/pkgs/development/tools/cue/default.nix b/pkgs/development/tools/cue/default.nix
index 4187d062950..754c014ee16 100644
--- a/pkgs/development/tools/cue/default.nix
+++ b/pkgs/development/tools/cue/default.nix
@@ -2,15 +2,15 @@
 
 buildGoModule rec {
   pname = "cue";
-  version = "0.0.3";
+  version = "0.0.11";
 
   src = fetchgit {
     url = "https://cue.googlesource.com/cue";
     rev = "v${version}";
-    sha256 = "1abvvgicr64ssiprkircih2nrbcr1yqxf1qkl21kh0ww1xfp0rw7";
+    sha256 = "146h3nxx72n3byxr854lnxj7m33ipbmg6j9dy6dlwvqpa7rndrmp";
   };
 
-  modSha256 = "0r5vbplcfq1rsp2jnixq6lfbpcv7grf0q38na76qy7pjb57zikb6";
+  modSha256 = "1q0fjm34mbijjxg089v5330vc820nrvwdkhm02zi45rk2fpdgdqd";
 
   subPackages = [ "cmd/cue" ];
 
-- 
GitLab


From 28853d8954199bc7944797c260d8116a68da2b46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6gler?= <ck3d@gmx.de>
Date: Thu, 22 Aug 2019 07:52:58 +0200
Subject: [PATCH 0151/2254] container config: better default in case of
 resolved

Avoid assertion in nixos/modules/system/boot/resolved.nix
if service systemd-resolved is enabled.
---
 nixos/modules/virtualisation/container-config.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/container-config.nix b/nixos/modules/virtualisation/container-config.nix
index 604fb8a7593..ca7f126c59f 100644
--- a/nixos/modules/virtualisation/container-config.nix
+++ b/nixos/modules/virtualisation/container-config.nix
@@ -10,7 +10,7 @@ with lib;
     services.udisks2.enable = mkDefault false;
     powerManagement.enable = mkDefault false;
 
-    networking.useHostResolvConf = mkDefault true;
+    networking.useHostResolvConf = mkDefault (!config.services.resolved.enable);
 
     # Containers should be light-weight, so start sshd on demand.
     services.openssh.startWhenNeeded = mkDefault true;
-- 
GitLab


From 65792923afe7b48708b59c57c380c0e35cb836af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6gler?= <ck3d@gmx.de>
Date: Thu, 22 Aug 2019 22:45:20 +0200
Subject: [PATCH 0152/2254] nixos: added machinectl test

---
 nixos/tests/all-tests.nix          |  1 +
 nixos/tests/nixos-install-simple   | 19 ++++++++++++
 nixos/tests/systemd-machinectl.nix | 49 ++++++++++++++++++++++++++++++
 3 files changed, 69 insertions(+)
 create mode 100755 nixos/tests/nixos-install-simple
 create mode 100644 nixos/tests/systemd-machinectl.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 60762de76d3..86aafd02685 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -260,6 +260,7 @@ in
   syncthing-relay = handleTest ./syncthing-relay.nix {};
   systemd = handleTest ./systemd.nix {};
   systemd-confinement = handleTest ./systemd-confinement.nix {};
+  systemd-machinectl = handleTest ./systemd-machinectl.nix {};
   systemd-timesyncd = handleTest ./systemd-timesyncd.nix {};
   systemd-networkd-wireguard = handleTest ./systemd-networkd-wireguard.nix {};
   pdns-recursor = handleTest ./pdns-recursor.nix {};
diff --git a/nixos/tests/nixos-install-simple b/nixos/tests/nixos-install-simple
new file mode 100755
index 00000000000..c6044eeffb1
--- /dev/null
+++ b/nixos/tests/nixos-install-simple
@@ -0,0 +1,19 @@
+#!/bin/sh -eux
+
+mkdir -p "$1"
+
+ROOT="$(readlink -f $1)"
+SYSTEM="$(readlink -f ${2:-./result})"
+
+# create root folders
+mkdir -p "$ROOT/etc" "$ROOT/boot"
+
+# install NixOS
+nix-env --store "$ROOT" \
+  --extra-substituters "auto?trusted=1" \
+  -p "$ROOT/nix/var/nix/profiles/system" --set "$SYSTEM"
+
+# activate NixOS
+touch "$ROOT/etc/NIXOS"
+nixos-enter --root "$ROOT" \
+  -- /run/current-system/bin/switch-to-configuration boot
diff --git a/nixos/tests/systemd-machinectl.nix b/nixos/tests/systemd-machinectl.nix
new file mode 100644
index 00000000000..f28941bca5a
--- /dev/null
+++ b/nixos/tests/systemd-machinectl.nix
@@ -0,0 +1,49 @@
+import ./make-test.nix (let
+
+  container = { ... }: {
+    boot.isContainer = true;
+
+    # use networkd to obtain systemd network setup
+    networking.useNetworkd = true;
+
+    # systemd-nspawn expects /sbin/init
+    boot.loader.initScript.enable = true;
+
+    imports = [ ../modules/profiles/minimal.nix ];
+  };
+
+  containerSystem = (import ../lib/eval-config.nix {
+    modules = [ container ];
+  }).config.system.build.toplevel;
+
+  containerName = "container";
+
+in {
+  name = "systemd-machinectl";
+
+  machine = { lib, ... }: {
+    # use networkd to obtain systemd network setup
+    networking.useNetworkd = true;
+
+    # open DHCP server on interface to container
+    networking.firewall.trustedInterfaces = [ "ve-+" ];
+
+    # do not try to access cache.nixos.org
+    nix.binaryCaches = lib.mkForce [];
+
+    virtualisation.pathsInNixDB = [ containerSystem ];
+  };
+
+  testScript = ''
+    startAll;
+
+    $machine->waitForUnit("default.target");
+    $machine->succeed("mkdir -p ${containerRoot}");
+    $machine->succeed("${./nixos-install-simple} /var/lib/machines/${containerName} ${containerSystem}");
+
+    $machine->succeed("machinectl start ${containerName}");
+    $machine->waitUntilSucceeds("systemctl -M ${containerName} is-active default.target");
+    $machine->succeed("ping -n -c 1 ${containerName}");
+    $machine->succeed("machinectl stop ${containerName}");
+  '';
+})
-- 
GitLab


From 930ac600d2b3f18fcfd41c387835332cfb480462 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6gler?= <ck3d@gmx.de>
Date: Fri, 23 Aug 2019 20:53:57 +0200
Subject: [PATCH 0153/2254] nixos-install: ensure activation script is always
 called

The activation script is needed to get the missing files in etc/ created.
Needed for container manager like systemd-nspawn.
---
 .../modules/installer/tools/nixos-install.sh  |  3 ++-
 nixos/tests/nixos-install-simple              | 19 -------------------
 nixos/tests/systemd-machinectl.nix            |  3 ++-
 3 files changed, 4 insertions(+), 21 deletions(-)
 delete mode 100755 nixos/tests/nixos-install-simple

diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh
index 8685cb345e1..be3b5c0687a 100644
--- a/nixos/modules/installer/tools/nixos-install.sh
+++ b/nixos/modules/installer/tools/nixos-install.sh
@@ -132,8 +132,9 @@ if [[ -z $noBootLoader ]]; then
     echo "installing the boot loader..."
     # Grub needs an mtab.
     ln -sfn /proc/mounts $mountPoint/etc/mtab
-    NIXOS_INSTALL_BOOTLOADER=1 nixos-enter --root "$mountPoint" -- /run/current-system/bin/switch-to-configuration boot
+    export NIXOS_INSTALL_BOOTLOADER=1
 fi
+nixos-enter --root "$mountPoint" -- /run/current-system/bin/switch-to-configuration boot
 
 # Ask the user to set a root password, but only if the passwd command
 # exists (i.e. when mutable user accounts are enabled).
diff --git a/nixos/tests/nixos-install-simple b/nixos/tests/nixos-install-simple
deleted file mode 100755
index c6044eeffb1..00000000000
--- a/nixos/tests/nixos-install-simple
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh -eux
-
-mkdir -p "$1"
-
-ROOT="$(readlink -f $1)"
-SYSTEM="$(readlink -f ${2:-./result})"
-
-# create root folders
-mkdir -p "$ROOT/etc" "$ROOT/boot"
-
-# install NixOS
-nix-env --store "$ROOT" \
-  --extra-substituters "auto?trusted=1" \
-  -p "$ROOT/nix/var/nix/profiles/system" --set "$SYSTEM"
-
-# activate NixOS
-touch "$ROOT/etc/NIXOS"
-nixos-enter --root "$ROOT" \
-  -- /run/current-system/bin/switch-to-configuration boot
diff --git a/nixos/tests/systemd-machinectl.nix b/nixos/tests/systemd-machinectl.nix
index f28941bca5a..3438722e321 100644
--- a/nixos/tests/systemd-machinectl.nix
+++ b/nixos/tests/systemd-machinectl.nix
@@ -17,6 +17,7 @@ import ./make-test.nix (let
   }).config.system.build.toplevel;
 
   containerName = "container";
+  containerRoot = "/var/lib/machines/${containerName}";
 
 in {
   name = "systemd-machinectl";
@@ -39,7 +40,7 @@ in {
 
     $machine->waitForUnit("default.target");
     $machine->succeed("mkdir -p ${containerRoot}");
-    $machine->succeed("${./nixos-install-simple} /var/lib/machines/${containerName} ${containerSystem}");
+    $machine->succeed("nixos-install --root ${containerRoot} --system ${containerSystem} --no-channel-copy --no-root-passwd --no-bootloader");
 
     $machine->succeed("machinectl start ${containerName}");
     $machine->waitUntilSucceeds("systemctl -M ${containerName} is-active default.target");
-- 
GitLab


From ba37b3c622da535a5b06ae5d05e37146b6f4143f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6gler?= <ck3d@gmx.de>
Date: Sat, 24 Aug 2019 08:49:44 +0200
Subject: [PATCH 0154/2254] nixos: added installation doc for nspawn container

---
 .../installing-nspawn-container.xml           | 37 +++++++++++++++++++
 nixos/doc/manual/installation/installing.xml  |  3 ++
 2 files changed, 40 insertions(+)
 create mode 100644 nixos/doc/manual/installation/installing-nspawn-container.xml

diff --git a/nixos/doc/manual/installation/installing-nspawn-container.xml b/nixos/doc/manual/installation/installing-nspawn-container.xml
new file mode 100644
index 00000000000..ae893c53c90
--- /dev/null
+++ b/nixos/doc/manual/installation/installing-nspawn-container.xml
@@ -0,0 +1,37 @@
+<section xmlns="http://docbook.org/ns/docbook"
+         version="5.0"
+         xml:id="sec-installing-nspawn-container">
+ <title>Installing into a nspawn container</title>
+
+ <para>
+  For installing a NixOS into a systemd nspawn container the NixOS installation tools are needed.
+  If you run another distribution than NixOS on your host,
+  please follow <xref linkend="sec-installing-from-other-distro"/> steps 1, 2, and 3.
+ </para>
+
+ <para>
+  Create a NixOS configuration file <filename>/var/lib/machines/my-container/etc/nixos/configuration.nix</filename>.
+  It is important that the container root file system is under <filename>/var/lib/machines</filename>.
+  This is the standard location where <command>machinectl</command> will look for containers.
+  If you choose place the root into another location you need to start the container directly with <command>systemd-nspawn</command>.
+  The file needs to have at least following options enabled:
+<programlisting>
+<xref linkend="opt-boot.isContainer"/> = true;
+<xref linkend="opt-boot.loader.initScript.enable"/> = true;
+</programlisting>
+  If your host uses <command>systemd-networkd</command> to configure the network,
+  you can also enable <xref linkend="opt-networking.useNetworkd"/> to use networkd default network configuration for your host and container.
+ </para>
+
+ <para>
+  Install the container by running following command:
+   <screen>nixos-install --root /var/lib/machines/my-container \
+     --no-channel-copy --no-root-passwd --no-bootloader</screen>
+ </para>
+
+ <para>
+  Start the container by running following command:
+  <screen>machinectl start my-container</screen>
+ </para>
+
+</section>
diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml
index f1e1568c034..270372022fa 100644
--- a/nixos/doc/manual/installation/installing.xml
+++ b/nixos/doc/manual/installation/installing.xml
@@ -563,5 +563,8 @@ Retype new UNIX password: ***</screen>
   <xi:include href="installing-from-other-distro.xml" />
 
   <xi:include href="installing-behind-a-proxy.xml" />
+
+  <xi:include href="installing-nspawn-container.xml" />
+
  </section>
 </chapter>
-- 
GitLab


From db9b5f5525225acf20f0f030e95532d192b3baac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6gler?= <ck3d@gmx.de>
Date: Sun, 1 Sep 2019 21:34:37 +0200
Subject: [PATCH 0155/2254] nixos: deactivate immutablity for /var/empty in
 container

---
 nixos/modules/system/activation/activation-script.nix | 7 +++++++
 nixos/tests/systemd-machinectl.nix                    | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix
index 74c150a848d..fe77094c52b 100644
--- a/nixos/modules/system/activation/activation-script.nix
+++ b/nixos/modules/system/activation/activation-script.nix
@@ -184,7 +184,14 @@ in
         find /var/empty -mindepth 1 -delete
         chmod 0555 /var/empty
         chown root:root /var/empty
+
+        ${ # reasons for not setting immutable flag:
+           # 1. flag is not changeable inside a container
+           # 2. systemd-nspawn can not perform chown in case of --private-users-chown
+           #    then the owner is nobody and ssh will not start
+          optionalString (!config.boot.isContainer) ''
         ${pkgs.e2fsprogs}/bin/chattr -f +i /var/empty || true
+          ''}
       '';
 
     system.activationScripts.usrbinenv = if config.environment.usrbinenv != null
diff --git a/nixos/tests/systemd-machinectl.nix b/nixos/tests/systemd-machinectl.nix
index 3438722e321..091f855d043 100644
--- a/nixos/tests/systemd-machinectl.nix
+++ b/nixos/tests/systemd-machinectl.nix
@@ -45,6 +45,8 @@ in {
     $machine->succeed("machinectl start ${containerName}");
     $machine->waitUntilSucceeds("systemctl -M ${containerName} is-active default.target");
     $machine->succeed("ping -n -c 1 ${containerName}");
+    $machine->succeed("test `stat ${containerRoot}/var/empty -c %u%g` != 00");
+
     $machine->succeed("machinectl stop ${containerName}");
   '';
 })
-- 
GitLab


From b9ce08f7f1220cb895f4c3a09da357bfb31146d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20M=C3=B6ller?= <fabianm88@gmail.com>
Date: Fri, 13 Sep 2019 17:43:21 +0200
Subject: [PATCH 0156/2254] pythonPackages.h11: fix darwin build

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

diff --git a/pkgs/development/python-modules/h11/default.nix b/pkgs/development/python-modules/h11/default.nix
index f77c267d792..361ac0c59d1 100644
--- a/pkgs/development/python-modules/h11/default.nix
+++ b/pkgs/development/python-modules/h11/default.nix
@@ -23,6 +23,9 @@ buildPythonPackage rec {
     py.test
   '';
 
+  # Some of the tests use localhost networking.
+  __darwinAllowLocalNetworking = true;
+
   meta = with lib; {
     description = "Pure-Python, bring-your-own-I/O implementation of HTTP/1.1";
     license = licenses.mit;
-- 
GitLab


From d38121a871aaed25570408f22b9f472b1d1e99a3 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Fri, 13 Sep 2019 17:37:51 +0200
Subject: [PATCH 0157/2254] jackett: 0.11.589 -> 0.11.687

Also migrate to standalone binary
---
 pkgs/servers/jackett/default.nix | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix
index 0299c028148..6aaae932906 100644
--- a/pkgs/servers/jackett/default.nix
+++ b/pkgs/servers/jackett/default.nix
@@ -1,30 +1,40 @@
-{ stdenv, fetchurl, mono, curl, makeWrapper }:
+{ lib, stdenv, fetchurl, makeWrapper, curl, icu60, openssl, zlib }:
 
 stdenv.mkDerivation rec {
   pname = "jackett";
-  version = "0.11.589";
+  version = "0.11.687";
 
   src = fetchurl {
-    url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
-    sha256 = "14lj33xmhf35pq781wvzyw983yff447mc253x0ppi3b5rwkrgkyz";
+    url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.LinuxAMDx64.tar.gz";
+    sha256 = "0wq6rc12dn5yxa6yyabv234xw5nrsbvlrpgfjppvw3i4vy2cfzh9";
   };
 
   buildInputs = [ makeWrapper ];
 
   installPhase = ''
-    mkdir -p $out/{bin,share/${pname}-${version}}
-    cp -r * $out/share/${pname}-${version}
+    mkdir -p $out/{bin,opt/${pname}-${version}}
+    cp -r * $out/opt/${pname}-${version}
 
-    makeWrapper "${mono}/bin/mono" $out/bin/Jackett \
-      --add-flags "$out/share/${pname}-${version}/JackettConsole.exe" \
-      --prefix LD_LIBRARY_PATH ':' "${curl.out}/lib"
+    makeWrapper "$out/opt/${pname}-${version}/jackett" $out/bin/Jackett \
+      --prefix LD_LIBRARY_PATH ':' "${curl.out}/lib:${icu60.out}/lib:${openssl.out}/lib:${zlib.out}/lib"
+  '';
+
+  preFixup = let
+    libPath = lib.makeLibraryPath [
+      stdenv.cc.cc.lib  # libstdc++.so.6
+    ];
+  in ''
+    patchelf \
+      --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+      --set-rpath "${libPath}" \
+      $out/opt/${pname}-${version}/jackett
   '';
 
   meta = with stdenv.lib; {
     description = "API Support for your favorite torrent trackers.";
     homepage = https://github.com/Jackett/Jackett/;
     license = licenses.gpl2;
-    maintainers = with maintainers; [ edwtjo ];
+    maintainers = with maintainers; [ edwtjo nyanloutre ];
     platforms = platforms.all;
   };
 }
-- 
GitLab


From 5d0c384fc12a73bbde1a7c49eb152d0ae3702964 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20M=C3=B6ller?= <fabianm88@gmail.com>
Date: Fri, 13 Sep 2019 18:30:42 +0200
Subject: [PATCH 0158/2254] mitmproxy: add pytest5 compatability

---
 pkgs/tools/networking/mitmproxy/default.nix   |  5 +--
 pkgs/tools/networking/mitmproxy/pytest5.patch | 31 +++++++++++++++++++
 2 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/tools/networking/mitmproxy/pytest5.patch

diff --git a/pkgs/tools/networking/mitmproxy/default.nix b/pkgs/tools/networking/mitmproxy/default.nix
index ee331648e75..a9758e5fd47 100644
--- a/pkgs/tools/networking/mitmproxy/default.nix
+++ b/pkgs/tools/networking/mitmproxy/default.nix
@@ -42,6 +42,7 @@ buildPythonPackage rec {
       # Irrelevant in nixpkgs
       excludes = [ "setup.py" "setup.cfg" "release/docker/*" ];
     })
+    ./pytest5.patch
   ];
 
   postPatch = ''
@@ -54,7 +55,7 @@ buildPythonPackage rec {
   checkPhase = ''
     export HOME=$(mktemp -d)
     export LC_CTYPE=en_US.UTF-8
-    pytest -k 'not test_find_unclaimed_URLs'
+    pytest -k 'not test_find_unclaimed_URLs and not test_tcp'
   '';
 
   propagatedBuildInputs = [
@@ -62,7 +63,7 @@ buildPythonPackage rec {
     h2 hyperframe kaitaistruct passlib
     pyasn1 pyopenssl pyparsing pyperclip
     ruamel_yaml tornado urwid brotlipy
-    sortedcontainers ldap3 wsproto
+    sortedcontainers ldap3 wsproto setuptools
   ];
 
   checkInputs = [
diff --git a/pkgs/tools/networking/mitmproxy/pytest5.patch b/pkgs/tools/networking/mitmproxy/pytest5.patch
new file mode 100644
index 00000000000..bfbf7253b9c
--- /dev/null
+++ b/pkgs/tools/networking/mitmproxy/pytest5.patch
@@ -0,0 +1,31 @@
+diff --git a/test/mitmproxy/net/test_tls.py b/test/mitmproxy/net/test_tls.py
+index 489bf89f..c78472e3 100644
+--- a/test/mitmproxy/net/test_tls.py
++++ b/test/mitmproxy/net/test_tls.py
+@@ -87,14 +87,16 @@ def test_get_client_hello():
+     rfile = io.BufferedReader(io.BytesIO(
+         FULL_CLIENT_HELLO_NO_EXTENSIONS[:30]
+     ))
+-    with pytest.raises(exceptions.TlsProtocolException, message="Unexpected EOF"):
++    with pytest.raises(exceptions.TlsProtocolException):
+         tls.get_client_hello(rfile)
++        pytest.fail("Unexpected EOF")
+ 
+     rfile = io.BufferedReader(io.BytesIO(
+         b"GET /"
+     ))
+-    with pytest.raises(exceptions.TlsProtocolException, message="Expected TLS record"):
++    with pytest.raises(exceptions.TlsProtocolException):
+         tls.get_client_hello(rfile)
++        pytest.fail("Expected TLS record")
+ 
+ 
+ class TestClientHello:
+@@ -153,5 +155,6 @@ class TestClientHello:
+             b"\x01\x00\x00\x03" +  # handshake header
+             b"foo"
+         ))
+-        with pytest.raises(exceptions.TlsProtocolException, message='Cannot parse Client Hello'):
++        with pytest.raises(exceptions.TlsProtocolException):
+             tls.ClientHello.from_file(rfile)
++            pytest.fail('Cannot parse Client Hello')
-- 
GitLab


From 5aa5fd4657bc41eea6917e551cddc830f277b09d Mon Sep 17 00:00:00 2001
From: danme <daniel@menke-online.com>
Date: Fri, 13 Sep 2019 18:59:45 +0200
Subject: [PATCH 0159/2254] gnuk: 1.0.4 -> 1.2.14

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

diff --git a/pkgs/misc/gnuk/default.nix b/pkgs/misc/gnuk/default.nix
index 4597fa40390..afef861c0dc 100644
--- a/pkgs/misc/gnuk/default.nix
+++ b/pkgs/misc/gnuk/default.nix
@@ -1,11 +1,11 @@
 { callPackage, fetchgit, ... } @ args:
 
 callPackage ./generic.nix (args // {
-  version = "1.0.4";
+  version = "1.2.14";
 
   src = fetchgit {
     url = "git://git.gniibe.org/gnuk/gnuk.git";
-    rev = "93867d0c8b90c485f9832c0047c3a2e17a029aca";
-    sha256 = "0ah2gc772kdq7gdwpqwdmfh5nzbx2wgpk5ljnhwc4i3mrkafdiih";
+    rev = "177ef67edfa2306c2a369a037362385c354083e1";
+    sha256 = "16wa3xsaq4r8caw6c24hnv4j78bklacix4in2y66j35h68ggr3j1";
   };
 })
-- 
GitLab


From cb86447ee278bb24833cc6155bf8062c168696ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20M=C3=B6ller?= <fabianm88@gmail.com>
Date: Fri, 13 Sep 2019 18:59:54 +0200
Subject: [PATCH 0160/2254] pythonPackages.trustme: fix darwin build

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

diff --git a/pkgs/development/python-modules/trustme/default.nix b/pkgs/development/python-modules/trustme/default.nix
index e2ba008d3a0..601e49759fd 100644
--- a/pkgs/development/python-modules/trustme/default.nix
+++ b/pkgs/development/python-modules/trustme/default.nix
@@ -36,6 +36,9 @@ buildPythonPackage rec {
     pytest
   '';
 
+  # Some of the tests use localhost networking.
+  __darwinAllowLocalNetworking = true;
+
   meta = {
     description = "High quality TLS certs while you wait, for the discerning tester";
     homepage = https://github.com/python-trio/trustme;
-- 
GitLab


From 586946829c7ed35be9566fd4e2a5ba3431f5d997 Mon Sep 17 00:00:00 2001
From: danme <daniel@menke-online.com>
Date: Fri, 13 Sep 2019 19:41:07 +0200
Subject: [PATCH 0161/2254] nix-du: 0.3.0 -> master

recent master fixes the build problem.
---
 pkgs/tools/package-management/nix-du/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nix-du/default.nix b/pkgs/tools/package-management/nix-du/default.nix
index 17d023f6daf..69f1c2e470a 100644
--- a/pkgs/tools/package-management/nix-du/default.nix
+++ b/pkgs/tools/package-management/nix-du/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub, rustPlatform, nix, boost, graphviz, darwin }:
 rustPlatform.buildRustPackage rec {
   pname = "nix-du";
-  version = "0.3.0";
+  version = "0.3.0-git-master";
 
   src = fetchFromGitHub {
     owner = "symphorien";
     repo = "nix-du";
-    rev = "v${version}";
-    sha256 = "1x6qpivxbn94034jfdxb97xi97fhcdv2z7llq2ccfc80mgd0gz8l";
+    rev = "e6e927c15e75f7c2e63f7f3c181dc6b257f6fd9e";
+    sha256 = "08jyp078h9jpb9qfqg5mdbq29rl8a006n94hqk3yk6gv1s57cfic";
   };
   cargoSha256 = "071gbhxbvnwi7n3zpy7bmlprzir0sl0f0pb191xg2ynw678prd7v";
 
-- 
GitLab


From 8b34d843c6f24168787cad90912e0fa20d11d6d5 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 13 Sep 2019 19:47:04 +0200
Subject: [PATCH 0162/2254] python.pkgs.cryptography: fix/ignore broken tests

Broken tests by openssl 1.1.1d, added patch and skipped one test

Issue for skipped test: https://github.com/pyca/cryptography/issues/4998
---
 .../python-modules/cryptography/default.nix           | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix
index 6b20b4b570a..2a5d4fa4757 100644
--- a/pkgs/development/python-modules/cryptography/default.nix
+++ b/pkgs/development/python-modules/cryptography/default.nix
@@ -1,6 +1,7 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
+, fetchpatch
 , openssl
 , cryptography_vectors
 , darwin
@@ -49,10 +50,18 @@ buildPythonPackage rec {
     pytz
   ];
 
+  # remove when https://github.com/pyca/cryptography/issues/4998 is fixed
   checkPhase = ''
-    py.test --disable-pytest-warnings tests
+    py.test --disable-pytest-warnings tests -k 'not load_ecdsa_no_named_curve'
   '';
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/pyca/cryptography/commit/e575e3d482f976c4a1f3203d63ea0f5007a49a2a.patch";
+      sha256 = "0vg9prqsizd6gzh5j7lscsfxzxlhz7pacvzhgqmj1vhdhjwbblcp";
+    })
+  ];
+
   # IOKit's dependencies are inconsistent between OSX versions, so this is the best we
   # can do until nix 1.11's release
   __impureHostDeps = [ "/usr/lib" ];
-- 
GitLab


From cc7c778bf143fd5651034d88bc5b9db7bba1e91b Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Fri, 13 Sep 2019 12:27:09 -0700
Subject: [PATCH 0163/2254] pythonPackage.pycurl2: fix build

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

diff --git a/pkgs/development/python-modules/pycurl2/default.nix b/pkgs/development/python-modules/pycurl2/default.nix
index 01428d41b7d..478f4451cf7 100644
--- a/pkgs/development/python-modules/pycurl2/default.nix
+++ b/pkgs/development/python-modules/pycurl2/default.nix
@@ -1,6 +1,4 @@
-{ stdenv
-, buildPythonPackage
-, fetchgit
+{ lib, buildPythonPackage, fetchFromGitHub
 , isPy3k
 , simplejson
 , unittest2
@@ -13,8 +11,9 @@ buildPythonPackage {
   version = "7.20.0";
   disabled = isPy3k;
 
-  src = fetchgit {
-    url = "https://github.com/Lispython/pycurl.git";
+  src = fetchFromGitHub {
+    owner = "Lispython";
+    repo = "pycurl";
     rev = "0f00109950b883d680bd85dc6e8a9c731a7d0d13";
     sha256 = "1qmw3cm93kxj94s71a8db9lwv2cxmr2wjv7kp1r8zildwdzhaw7j";
   };
@@ -22,9 +21,10 @@ buildPythonPackage {
   # error: (6, "Couldn't resolve host 'h.wrttn.me'")
   doCheck = false;
 
-  buildInputs = [ pkgs.curl simplejson unittest2 nose ];
+  nativeBuildInputs = [ pkgs.curl.dev ];
+  buildInputs = [ simplejson unittest2 nose ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = https://pypi.python.org/pypi/pycurl2;
     description = "A fork from original PycURL library that no maintained from 7.19.0";
     license = licenses.mit;
-- 
GitLab


From 2021578686790d2c733eb1fa9c2034826996b176 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 13 Sep 2019 15:34:50 -0400
Subject: [PATCH 0164/2254] =?UTF-8?q?ghc:=20don=E2=80=99t=20use=20dwarf=20?=
 =?UTF-8?q?on=20windows?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

elfutils don’t work on windows

https://hydra.nixos.org/eval/1541857#tabs-removed

/cc @domenkozar
---
 pkgs/development/compilers/ghc/8.2.2.nix | 3 ++-
 pkgs/development/compilers/ghc/8.4.4.nix | 3 ++-
 pkgs/development/compilers/ghc/8.6.4.nix | 3 ++-
 pkgs/development/compilers/ghc/8.6.5.nix | 3 ++-
 pkgs/development/compilers/ghc/8.8.1.nix | 3 ++-
 pkgs/development/compilers/ghc/head.nix  | 3 ++-
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix
index 7c13db74c4c..2e500db536c 100644
--- a/pkgs/development/compilers/ghc/8.2.2.nix
+++ b/pkgs/development/compilers/ghc/8.2.2.nix
@@ -8,7 +8,8 @@
 
 , libiconv ? null, ncurses
 
-, enableDwarf ? !stdenv.isDarwin, elfutils # for DWARF support
+, enableDwarf ? !stdenv.targetPlatform.isDarwin &&
+                !stdenv.targetPlatform.isWindows, elfutils # for DWARF support
 
 , useLLVM ? !stdenv.targetPlatform.isx86 || (stdenv.targetPlatform.isMusl && stdenv.hostPlatform != stdenv.targetPlatform)
 , # LLVM is conceptually a run-time-only depedendency, but for
diff --git a/pkgs/development/compilers/ghc/8.4.4.nix b/pkgs/development/compilers/ghc/8.4.4.nix
index 30353771ea6..2fbdff865ed 100644
--- a/pkgs/development/compilers/ghc/8.4.4.nix
+++ b/pkgs/development/compilers/ghc/8.4.4.nix
@@ -7,7 +7,8 @@
 
 , libiconv ? null, ncurses
 
-, enableDwarf ? !stdenv.isDarwin, elfutils # for DWARF support
+, enableDwarf ? !stdenv.targetPlatform.isDarwin &&
+                !stdenv.targetPlatform.isWindows, elfutils # for DWARF support
 
 , useLLVM ? !stdenv.targetPlatform.isx86 || (stdenv.targetPlatform.isMusl && stdenv.hostPlatform != stdenv.targetPlatform)
 , # LLVM is conceptually a run-time-only depedendency, but for
diff --git a/pkgs/development/compilers/ghc/8.6.4.nix b/pkgs/development/compilers/ghc/8.6.4.nix
index 7b6769df682..151e80198f4 100644
--- a/pkgs/development/compilers/ghc/8.6.4.nix
+++ b/pkgs/development/compilers/ghc/8.6.4.nix
@@ -7,7 +7,8 @@
 
 , libiconv ? null, ncurses
 
-, enableDwarf ? !stdenv.isDarwin, elfutils # for DWARF support
+, enableDwarf ? !stdenv.targetPlatform.isDarwin &&
+                !stdenv.targetPlatform.isWindows, elfutils # for DWARF support
 
 , # GHC can be built with system libffi or a bundled one.
   libffi ? null
diff --git a/pkgs/development/compilers/ghc/8.6.5.nix b/pkgs/development/compilers/ghc/8.6.5.nix
index acc97f93c63..0a218c29264 100644
--- a/pkgs/development/compilers/ghc/8.6.5.nix
+++ b/pkgs/development/compilers/ghc/8.6.5.nix
@@ -7,7 +7,8 @@
 
 , libiconv ? null, ncurses
 
-, enableDwarf ? !stdenv.isDarwin, elfutils # for DWARF support
+, enableDwarf ? !stdenv.targetPlatform.isDarwin &&
+                !stdenv.targetPlatform.isWindows, elfutils # for DWARF support
 
 , # GHC can be built with system libffi or a bundled one.
   libffi ? null
diff --git a/pkgs/development/compilers/ghc/8.8.1.nix b/pkgs/development/compilers/ghc/8.8.1.nix
index c80ccf72817..3783b97795a 100644
--- a/pkgs/development/compilers/ghc/8.8.1.nix
+++ b/pkgs/development/compilers/ghc/8.8.1.nix
@@ -7,7 +7,8 @@
 
 , libiconv ? null, ncurses
 
-, enableDwarf ? !stdenv.isDarwin, elfutils # for DWARF support
+, enableDwarf ? !stdenv.targetPlatform.isDarwin &&
+                !stdenv.targetPlatform.isWindows, elfutils # for DWARF support
 
 , # GHC can be built with system libffi or a bundled one.
   libffi ? null
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 240b55deb68..cbc404de862 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -7,7 +7,8 @@
 
 , libiconv ? null, ncurses
 
-, enableDwarf ? !stdenv.isDarwin, elfutils # for DWARF support
+, enableDwarf ? !stdenv.targetPlatform.isDarwin &&
+                !stdenv.targetPlatform.isWindows, elfutils # for DWARF support
 
 , useLLVM ? !stdenv.targetPlatform.isx86
 , # LLVM is conceptually a run-time-only depedendency, but for
-- 
GitLab


From 47a3a1127ffee9bc8c127301390ff95857492b88 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Fri, 13 Sep 2019 13:03:18 -0700
Subject: [PATCH 0165/2254] pythonPackage.celery: fix tests

---
 .../python-modules/celery/default.nix            | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix
index d499a937f50..19eaeaf8d82 100644
--- a/pkgs/development/python-modules/celery/default.nix
+++ b/pkgs/development/python-modules/celery/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, iana-etc, libredirect
+{ lib, buildPythonPackage, fetchPypi, libredirect
 , case, pytest, boto3, moto, kombu, billiard, pytz, anyjson, amqp, eventlet
 }:
 
@@ -17,19 +17,17 @@ buildPythonPackage rec {
       --replace "pytest>=4.3.1,<4.4.0" pytest
   '';
 
-  # make /etc/protocols accessible to fix socket.getprotobyname('tcp') in sandbox
-  preCheck = stdenv.lib.optionalString stdenv.isLinux ''
-    export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols \
-      LD_PRELOAD=${libredirect}/lib/libredirect.so
-  '';
-  postCheck = stdenv.lib.optionalString stdenv.isLinux ''
-    unset NIX_REDIRECTS LD_PRELOAD
+  # ignore test that's incompatible with pytest5
+  # test_eventlet touches network
+  checkPhase = ''
+    pytest -k 'not restore_current_app_fallback' \
+      --ignore=t/unit/concurrency/test_eventlet.py
   '';
 
   checkInputs = [ case pytest boto3 moto ];
   propagatedBuildInputs = [ kombu billiard pytz anyjson amqp eventlet ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = https://github.com/celery/celery/;
     description = "Distributed task queue";
     license = licenses.bsd3;
-- 
GitLab


From 69ee17f0602f9dee6203e0186a6934d6cebb7022 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20M=C3=B6ller?= <fabianm88@gmail.com>
Date: Fri, 13 Sep 2019 23:11:56 +0200
Subject: [PATCH 0166/2254] uvloop: fix darwin build

---
 .../uvloop/darwin_sandbox.patch               | 28 +++++++++++++++++++
 .../python-modules/uvloop/default.nix         |  5 ++++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/python-modules/uvloop/darwin_sandbox.patch

diff --git a/pkgs/development/python-modules/uvloop/darwin_sandbox.patch b/pkgs/development/python-modules/uvloop/darwin_sandbox.patch
new file mode 100644
index 00000000000..bd4e5e48b14
--- /dev/null
+++ b/pkgs/development/python-modules/uvloop/darwin_sandbox.patch
@@ -0,0 +1,28 @@
+diff --git a/tests/test_pipes.py b/tests/test_pipes.py
+index d883abf..2e74d7a 100644
+--- a/tests/test_pipes.py
++++ b/tests/test_pipes.py
+@@ -2,6 +2,7 @@ import asyncio
+ import io
+ import os
+ import socket
++import unittest
+ 
+ from uvloop import _testbase as tb
+ 
+@@ -96,6 +97,7 @@ class _BasePipeTest:
+         # extra info is available
+         self.assertIsNotNone(proto.transport.get_extra_info('pipe'))
+ 
++    @unittest.skip("darwin sandbox")
+     def test_read_pty_output(self):
+         proto = MyReadPipeProto(loop=self.loop)
+ 
+@@ -198,6 +200,7 @@ class _BasePipeTest:
+         self.loop.run_until_complete(proto.done)
+         self.assertEqual('CLOSED', proto.state)
+ 
++    @unittest.skip("darwin sandbox")
+     def test_write_pty(self):
+         master, slave = os.openpty()
+         os.set_blocking(master, False)
diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix
index 2093f4d7053..171f6d6ed32 100644
--- a/pkgs/development/python-modules/uvloop/default.nix
+++ b/pkgs/development/python-modules/uvloop/default.nix
@@ -20,6 +20,8 @@ buildPythonPackage rec {
     sha256 = "0blcnrd5vky2k1m1p1skx4516dr1jx76yyb0c6fi82si6mqd0b4l";
   };
 
+  patches = lib.optional stdenv.isDarwin ./darwin_sandbox.patch;
+
   buildInputs = [
     libuv
   ] ++ lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ];
@@ -31,6 +33,9 @@ buildPythonPackage rec {
 
   checkInputs = [ pyopenssl psutil ];
 
+  # Some of the tests use localhost networking.
+  __darwinAllowLocalNetworking = true;
+
   meta = with lib; {
     description = "Fast implementation of asyncio event loop on top of libuv";
     homepage = http://github.com/MagicStack/uvloop;
-- 
GitLab


From 155a0a07f4bfd570afff41495f55110c23387ecf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20M=C3=B6ller?= <fabianm88@gmail.com>
Date: Sat, 14 Sep 2019 00:19:46 +0200
Subject: [PATCH 0167/2254] pythonPackages.webtest: fix darwin build

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

diff --git a/pkgs/development/python-modules/webtest/default.nix b/pkgs/development/python-modules/webtest/default.nix
index d8482872bc3..f3d60253ae4 100644
--- a/pkgs/development/python-modules/webtest/default.nix
+++ b/pkgs/development/python-modules/webtest/default.nix
@@ -30,6 +30,9 @@ buildPythonPackage rec {
 
   checkInputs = [ nose mock PasteDeploy wsgiproxy2 pyquery ];
 
+  # Some of the tests use localhost networking.
+  __darwinAllowLocalNetworking = true;
+
   meta = with stdenv.lib; {
     description = "Helper to test WSGI applications";
     homepage = https://webtest.readthedocs.org/en/latest/;
-- 
GitLab


From 24b364e0b55209f2261d56cb7caf44060646c5b9 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Fri, 13 Sep 2019 15:27:51 -0700
Subject: [PATCH 0168/2254] pythonPackages.xapian: disable smoketests

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

diff --git a/pkgs/development/python-modules/xapian/default.nix b/pkgs/development/python-modules/xapian/default.nix
index c15f2682e63..05c7fed589e 100644
--- a/pkgs/development/python-modules/xapian/default.nix
+++ b/pkgs/development/python-modules/xapian/default.nix
@@ -30,7 +30,6 @@ buildPythonPackage rec {
   doCheck = true;
 
   checkPhase = ''
-    ${python.interpreter} python${pythonSuffix}/smoketest.py
     ${python.interpreter} python${pythonSuffix}/pythontest.py
   '';
 
-- 
GitLab


From b7f54d4ffac95e09f17bfa4a611091ebc023bf03 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Sat, 14 Sep 2019 00:56:19 +0200
Subject: [PATCH 0169/2254] radicale: Fix runtime

Needed pkg_resources module, which apparently comes from setuptools
according to https://stackoverflow.com/a/10538412/6605742
---
 pkgs/servers/radicale/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/radicale/default.nix b/pkgs/servers/radicale/default.nix
index 90e27b2907e..da55131773b 100644
--- a/pkgs/servers/radicale/default.nix
+++ b/pkgs/servers/radicale/default.nix
@@ -22,6 +22,7 @@ python3.pkgs.buildPythonApplication rec {
     vobject
     python-dateutil
     passlib
+    setuptools
   ];
 
   checkInputs = with python3.pkgs; [
-- 
GitLab


From eb8bd784b19d3bad1ba868e65897578149844c3e Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Fri, 13 Sep 2019 16:48:52 -0700
Subject: [PATCH 0170/2254] pythonPackages.lightgbm: fix build

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

diff --git a/pkgs/development/python-modules/lightgbm/default.nix b/pkgs/development/python-modules/lightgbm/default.nix
index 10dbcafd04b..f428e7dbfba 100644
--- a/pkgs/development/python-modules/lightgbm/default.nix
+++ b/pkgs/development/python-modules/lightgbm/default.nix
@@ -21,6 +21,8 @@ buildPythonPackage rec {
     cmake
   ];
 
+  dontUseCmakeConfigure = true;
+
   # we never actually explicitly call the install command so this is the only way
   # to inject these options to it - however, openmp-library doesn't appear to have
   # any effect, so we have to inject it into NIX_LDFLAGS manually below
-- 
GitLab


From a0440ad8b5af8ab192b0b05af9e23225fd9673d8 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Fri, 21 Jun 2019 03:52:45 -0700
Subject: [PATCH 0171/2254] nixops_1_6_1: pin azure-storage

---
 .../nixops/azure-storage/default.nix          | 35 +++++++++++++++++++
 .../nixops/nixops-v1_6_1.nix                  |  1 +
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/tools/package-management/nixops/azure-storage/default.nix

diff --git a/pkgs/tools/package-management/nixops/azure-storage/default.nix b/pkgs/tools/package-management/nixops/azure-storage/default.nix
new file mode 100644
index 00000000000..6693a7464d4
--- /dev/null
+++ b/pkgs/tools/package-management/nixops/azure-storage/default.nix
@@ -0,0 +1,35 @@
+{ pkgs
+, buildPythonPackage
+, fetchPypi
+, python
+, azure-common
+, futures
+, dateutil
+, requests
+, isPy3k
+}:
+
+buildPythonPackage rec {
+  version = "0.20.3";
+  pname = "azure-storage";
+
+  src = fetchPypi {
+    inherit pname version;
+    extension = "zip";
+    sha256 = "06bmw6k2000kln5jwk5r9bgcalqbyvqirmdh9gq4s6nb4fv3c0jb";
+  };
+
+  propagatedBuildInputs = [ azure-common dateutil requests ]
+                            ++ pkgs.lib.optionals (!isPy3k) [ futures ];
+
+  postInstall = ''
+    echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py
+  '';
+
+  meta = with pkgs.lib; {
+    description = "Microsoft Azure SDK for Python";
+    homepage = "https://azure.microsoft.com/en-us/develop/python/";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ olcai ];
+  };
+}
diff --git a/pkgs/tools/package-management/nixops/nixops-v1_6_1.nix b/pkgs/tools/package-management/nixops/nixops-v1_6_1.nix
index d9ba324dce7..e6e30b26240 100644
--- a/pkgs/tools/package-management/nixops/nixops-v1_6_1.nix
+++ b/pkgs/tools/package-management/nixops/nixops-v1_6_1.nix
@@ -26,6 +26,7 @@ callPackage ./generic.nix (rec {
       azure-mgmt-nspkg = callPackage ./azure-mgmt-nspkg { };
       azure-mgmt-resource = callPackage ./azure-mgmt-resource { };
       azure-mgmt-storage = callPackage ./azure-mgmt-storage { };
+      azure-storage = callPackage ./azure-storage { };
     });
   };
 })
-- 
GitLab


From 5f46805ec696ac9dee1da4ecb36f4966c7fc17de Mon Sep 17 00:00:00 2001
From: Alexandre Esteves <alexandre.fmp.esteves@gmail.com>
Date: Sat, 14 Sep 2019 01:01:17 +0100
Subject: [PATCH 0172/2254] Fix typo

---
 doc/stdenv.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index 16003fb4acf..f8c2aff9785 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -2411,7 +2411,7 @@ addEnvHooks "$hostOffset" myBashFunction
       <para>
        The Bintools Wrapper was only just recently split off from CC Wrapper,
        so the division of labor is still being worked out. For example, it
-       shouldn't care about about the C standard library, but just take a
+       shouldn't care about the C standard library, but just take a
        derivation with the dynamic loader (which happens to be the glibc on
        linux). Dependency finding however is a task both wrappers will continue
        to need to share, and probably the most important to understand. It is
-- 
GitLab


From fdd6245e53f6d1619515c5e2c539f5ce293ee2c6 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Fri, 13 Sep 2019 17:37:55 -0700
Subject: [PATCH 0173/2254] pythonPackages.azure-mgmt-common: fix namespace
 issue

---
 pkgs/development/python-modules/azure-mgmt-common/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/azure-mgmt-common/default.nix b/pkgs/development/python-modules/azure-mgmt-common/default.nix
index e948afd91cf..482c0d190bc 100644
--- a/pkgs/development/python-modules/azure-mgmt-common/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-common/default.nix
@@ -28,6 +28,7 @@ buildPythonPackage rec {
 
   postInstall = if isPy3k then "" else ''
     echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py
+    echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py
   '';
 
   doCheck = false;
-- 
GitLab


From aaf0ccfa4da6d1413de9886ec26565d635beda44 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 3 Sep 2019 19:38:17 -0500
Subject: [PATCH 0174/2254] iwd: 0.19 -> 0.20

* don't use deprecated dbus directory
* alphabetize
* drop Mic92 from maintainers
  https://github.com/NixOS/nixpkgs/pull/68063#discussion_r323113385
* enableParallelBuilding

Co-authored-by: worldofpeace <worldofpeace@protonmail.ch>
---
 pkgs/os-specific/linux/iwd/default.nix | 36 ++++++++++++++++----------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix
index a1bb98b8297..dcca5864b52 100644
--- a/pkgs/os-specific/linux/iwd/default.nix
+++ b/pkgs/os-specific/linux/iwd/default.nix
@@ -1,14 +1,22 @@
-{ stdenv, fetchgit, autoreconfHook, pkgconfig, ell, coreutils, readline, python3Packages }:
+{ stdenv
+, fetchgit
+, fetchpatch
+, autoreconfHook
+, pkgconfig
+, ell
+, coreutils
+, readline
+, python3Packages
+}:
 
 stdenv.mkDerivation rec {
   pname = "iwd";
-
-  version = "0.19";
+  version = "0.20";
 
   src = fetchgit {
     url = https://git.kernel.org/pub/scm/network/wireless/iwd.git;
     rev = version;
-    sha256 = "0848r06bnx5k6wlmy425hljc3f03x9xx0r83vdvf630jryc9llmz";
+    sha256 = "03ca47d4hn28vkf5fr6ck1gz5py4lm1pw3nw9s1ckw7cqxw961sf";
   };
 
   nativeBuildInputs = [
@@ -19,8 +27,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     ell
-    readline
     python3Packages.python
+    readline
   ];
 
   pythonPath = [
@@ -29,13 +37,13 @@ stdenv.mkDerivation rec {
   ];
 
   configureFlags = [
-    "--with-dbus-datadir=${placeholder "out"}/etc/"
+    "--enable-external-ell"
+    "--enable-wired"
+    "--localstatedir=/var/"
     "--with-dbus-busdir=${placeholder "out"}/share/dbus-1/system-services/"
-    "--with-systemd-unitdir=${placeholder "out"}/lib/systemd/system/"
+    "--with-dbus-datadir=${placeholder "out"}/share/"
     "--with-systemd-modloaddir=${placeholder "out"}/etc/modules-load.d/" # maybe
-    "--localstatedir=/var/"
-    "--enable-wired"
-    "--enable-external-ell"
+    "--with-systemd-unitdir=${placeholder "out"}/lib/systemd/system/"
   ];
 
   postUnpack = ''
@@ -55,16 +63,18 @@ stdenv.mkDerivation rec {
 
   postFixup = ''
     substituteInPlace $out/share/dbus-1/system-services/net.connman.ead.service \
-                      --replace /bin/false ${coreutils}/bin/false
+      --replace /bin/false ${coreutils}/bin/false
     substituteInPlace $out/share/dbus-1/system-services/net.connman.iwd.service \
-                      --replace /bin/false ${coreutils}/bin/false
+      --replace /bin/false ${coreutils}/bin/false
   '';
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     homepage = https://git.kernel.org/pub/scm/network/wireless/iwd.git;
     description = "Wireless daemon for Linux";
     license = licenses.lgpl21;
     platforms = platforms.linux;
-    maintainers = [ maintainers.mic92 ];
+    maintainers = with maintainers; [ dtzWill ];
   };
 }
-- 
GitLab


From 208fa6be8e92a7e7fb427a28e0afb92cf7af7c7c Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 15 Aug 2019 18:22:26 -0500
Subject: [PATCH 0175/2254] iwd: revert commit introducing attempt to create
 /var

Co-authored-by: worldofpeace <worldofpeace@protonmail.ch>
---
 pkgs/os-specific/linux/iwd/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix
index dcca5864b52..59d41412f55 100644
--- a/pkgs/os-specific/linux/iwd/default.nix
+++ b/pkgs/os-specific/linux/iwd/default.nix
@@ -19,6 +19,16 @@ stdenv.mkDerivation rec {
     sha256 = "03ca47d4hn28vkf5fr6ck1gz5py4lm1pw3nw9s1ckw7cqxw961sf";
   };
 
+  patches = [
+    # Undo creating ReadWritePaths as instalation target.
+    (fetchpatch {
+      name = "revert-create-dirs-on-install.patch";
+      url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git/patch/?id=5a96c11664eb553bc28a2142af382b190254edbb";
+      sha256 = "08gkz3ia1l5xsh3pbx4abimgf7m88wygfpfyg77yi6dwavjqm6cx";
+      revert = true;
+    })
+  ];
+
   nativeBuildInputs = [
     autoreconfHook
     pkgconfig
-- 
GitLab


From 4a172176966b873422bcddae6b20c3388ae33a37 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Fri, 13 Sep 2019 18:06:45 -0700
Subject: [PATCH 0176/2254] pythonPackages.azure-common: fix namespace lookup

---
 pkgs/development/python-modules/azure-common/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/azure-common/default.nix b/pkgs/development/python-modules/azure-common/default.nix
index 3b25ce6bcfb..b3c6f3fa1cc 100644
--- a/pkgs/development/python-modules/azure-common/default.nix
+++ b/pkgs/development/python-modules/azure-common/default.nix
@@ -1,8 +1,9 @@
-{ pkgs
+{ lib
 , buildPythonPackage
 , fetchPypi
 , azure-nspkg
 , isPyPy
+, setuptools
 , python
 , isPy3k
 }:
@@ -20,7 +21,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     azure-nspkg
-  ];
+  ] ++ lib.optionals (!isPy3k) [ setuptools ]; # need for namespace lookup
 
   postInstall = if isPy3k then "" else ''
     echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py
@@ -28,7 +29,7 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  meta = with pkgs.lib; {
+  meta = with lib; {
     description = "This is the Microsoft Azure common code";
     homepage = https://github.com/Azure/azure-sdk-for-python/tree/master/azure-common;
     license = licenses.mit;
-- 
GitLab


From 792f80d918db2409cef03f278a37638b4a251786 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Fri, 13 Sep 2019 21:10:11 -0400
Subject: [PATCH 0177/2254] tome4: fix broken build

---
 pkgs/games/tome4/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/games/tome4/default.nix b/pkgs/games/tome4/default.nix
index c04920d7aa2..c4d5dcb41e7 100644
--- a/pkgs/games/tome4/default.nix
+++ b/pkgs/games/tome4/default.nix
@@ -25,6 +25,11 @@ in stdenv.mkDerivation rec {
     sha256 = "0mc5dgh2x9nbili7gy6srjhb23ckalf08wqq2amyjr5rq392jvd7";
   };
 
+  prePatch = ''
+    # http://forums.te4.org/viewtopic.php?f=42&t=49478&view=next#p234354
+    sed -i 's|#include <GL/glext.h>||' src/tgl.h
+  '';
+
   nativeBuildInputs = [ makeWrapper unzip premake4 ];
 
   # tome4 vendors quite a few libraries so someone might want to look
-- 
GitLab


From 4e6b7a51a051c1bbc2ac12ef1af4a72b6af4ef42 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Fri, 13 Sep 2019 21:17:05 -0400
Subject: [PATCH 0178/2254] nut: fix broken build

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

diff --git a/pkgs/applications/misc/nut/default.nix b/pkgs/applications/misc/nut/default.nix
index 816918ca063..ec5ee031a5b 100644
--- a/pkgs/applications/misc/nut/default.nix
+++ b/pkgs/applications/misc/nut/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, neon, libusb, openssl, udev, avahi, freeipmi
-, libtool, makeWrapper }:
+, libtool, makeWrapper, nss }:
 
 stdenv.mkDerivation rec {
   name = "nut-2.7.4";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "19r5dm07sfz495ckcgbfy0pasx0zy3faa0q7bih69lsjij8q43lq";
   };
 
-  buildInputs = [ neon libusb openssl udev avahi freeipmi libtool ];
+  buildInputs = [ neon libusb openssl udev avahi freeipmi libtool nss ];
 
   nativeBuildInputs = [ pkgconfig makeWrapper ];
 
-- 
GitLab


From 27c8e8ec5c9859aa49bfe866a3a9b817cb2d0bf3 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Fri, 13 Sep 2019 18:16:34 -0700
Subject: [PATCH 0179/2254] pythonPackages.uamq: 1.1.0 -> 1.2.2

---
 .../python-modules/uamqp/default.nix            | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/uamqp/default.nix b/pkgs/development/python-modules/uamqp/default.nix
index ff0c61c5e07..fc6c2b77794 100644
--- a/pkgs/development/python-modules/uamqp/default.nix
+++ b/pkgs/development/python-modules/uamqp/default.nix
@@ -1,24 +1,21 @@
-{ CFNetwork
-, Security
-, buildPythonPackage
+{ lib, buildPythonPackage, fetchPypi, isPy3k
 , certifi
+, CFNetwork
 , cmake
 , enum34
-, fetchPypi
-, isPy3k
-, lib
 , openssl
-, stdenv
+, Security
 , six
+, stdenv
 }:
 
 buildPythonPackage rec {
   pname = "uamqp";
-  version = "1.1.0";
+  version = "1.2.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d3d4ff94bf290adb82fe8c19af709a21294bac9b27c821b9110165a34b922015";
+    sha256 = "0wmyw2l2pha5s6khih96lkfa90zyfy2mqsg8cx6vplmrmpx2s52i";
   };
 
   buildInputs = [
@@ -31,6 +28,8 @@ buildPythonPackage rec {
     CFNetwork Security
   ];
 
+  dontUseCmakeConfigure = true;
+
   nativeBuildInputs = [
     cmake
   ];
-- 
GitLab


From afc4110dac85dbdb1fb503aa956561e88b458054 Mon Sep 17 00:00:00 2001
From: Dima <dgoldin+github@protonmail.ch>
Date: Sat, 14 Sep 2019 02:34:35 +0200
Subject: [PATCH 0180/2254] setools: 4.2.0 -> 4.2.2 and fixing build

The build was broken because meanwhile setools requires cython
and no bison, swig and flex anymore.

Also, bumping version to newest release, which is not directly related
to the build breakage.
---
 pkgs/os-specific/linux/setools/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/setools/default.nix b/pkgs/os-specific/linux/setools/default.nix
index 1e82c492159..138b54b0224 100644
--- a/pkgs/os-specific/linux/setools/default.nix
+++ b/pkgs/os-specific/linux/setools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, bison, flex, python3 , swig
+{ stdenv, fetchFromGitHub, python3
 , libsepol, libselinux, checkpolicy
 , withGraphics ? false
 }:
@@ -8,16 +8,16 @@ with python3.pkgs;
 
 buildPythonApplication rec {
   pname = "setools";
-  version = "4.2.0";
+  version = "4.2.2";
 
   src = fetchFromGitHub {
     owner = "SELinuxProject";
     repo = pname;
     rev = version;
-    sha256 = "1bjwcvr6rjx79cdcvaxn68bdrnl4f2a8gnnqsngdxhkhwpddksjy";
+    sha256 = "18kklv26dwm2fdjjzfflvxsq83b2svnwf4g18xq7wsfsri121a90";
   };
 
-  nativeBuildInputs = [ bison flex swig ];
+  nativeBuildInputs = [ cython ];
   buildInputs = [ libsepol ];
   propagatedBuildInputs = [ enum34 libselinux networkx ]
     ++ optionals withGraphics [ pyqt5 ];
-- 
GitLab


From e5aba9c0075c3a27e7abbf24eb3de63f00e46d79 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Fri, 13 Sep 2019 18:25:45 -0700
Subject: [PATCH 0181/2254] pythonPackages.azure-servicebus: 0.50.0 -> 0.50.1

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

diff --git a/pkgs/development/python-modules/azure-servicebus/default.nix b/pkgs/development/python-modules/azure-servicebus/default.nix
index e8683a68e29..84ebf617bae 100644
--- a/pkgs/development/python-modules/azure-servicebus/default.nix
+++ b/pkgs/development/python-modules/azure-servicebus/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "azure-servicebus";
-  version = "0.50.0";
+  version = "0.50.1";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "c5864cfc69402e3e2897e61b3bd224ade28d9e33dad849e4bd6afad26a3d2786";
+    sha256 = "0i8ls5h2ny12h9gnqwyq13ysvxgdq7b1kxirj4n58dfy94a182gv";
   };
 
   buildInputs = [
-- 
GitLab


From 98470bb61063e8a8ee2568a8d99852f1b8d736ab Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Mon, 18 Mar 2019 08:39:16 -0400
Subject: [PATCH 0182/2254] pantheon.elementary-greeter: 3.3.1 -> 2019-09-10

https://github.com/elementary/greeter/releases/tag/5.0
---
 pkgs/desktops/pantheon/default.nix            |  4 +-
 .../desktop/elementary-greeter/default.nix    | 76 +++++++++++--------
 .../desktop/elementary-greeter/gsd.patch      | 13 ----
 .../elementary-greeter/hardcode-theme.patch   | 15 ----
 .../desktop/elementary-greeter/numlockx.patch | 13 ----
 ...install.patch => sysconfdir-install.patch} | 12 +--
 6 files changed, 52 insertions(+), 81 deletions(-)
 delete mode 100644 pkgs/desktops/pantheon/desktop/elementary-greeter/gsd.patch
 delete mode 100644 pkgs/desktops/pantheon/desktop/elementary-greeter/hardcode-theme.patch
 delete mode 100644 pkgs/desktops/pantheon/desktop/elementary-greeter/numlockx.patch
 rename pkgs/desktops/pantheon/desktop/elementary-greeter/{01-sysconfdir-install.patch => sysconfdir-install.patch} (68%)

diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix
index 039d75beb4f..aed08c35a80 100644
--- a/pkgs/desktops/pantheon/default.nix
+++ b/pkgs/desktops/pantheon/default.nix
@@ -90,9 +90,7 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   elementary-default-settings = callPackage ./desktop/elementary-default-settings { };
 
-  elementary-greeter = callPackage ./desktop/elementary-greeter {
-    inherit (gnome3) gnome-desktop;
-  };
+  elementary-greeter = callPackage ./desktop/elementary-greeter { };
 
   elementary-print-shim = callPackage ./desktop/elementary-print-shim { };
 
diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
index 8ef85b90a3b..2e6cc24b486 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
@@ -1,20 +1,39 @@
-{ stdenv, fetchFromGitHub, pantheon, pkgconfig, substituteAll, meson
-, ninja, vala, desktop-file-utils, gtk3, granite, libgee, elementary-settings-daemon
-, gnome-desktop, mutter, elementary-icon-theme, wingpanel-with-indicators
-, elementary-gtk-theme, nixos-artwork, lightdm, numlockx
-, clutter-gtk, libGL, dbus, wrapGAppsHook }:
+{ stdenv
+, fetchFromGitHub
+, pantheon
+, pkgconfig
+, meson
+, ninja
+, vala
+, desktop-file-utils
+, gtk3
+, granite
+, libgee
+, elementary-settings-daemon
+, mutter
+, elementary-icon-theme
+, wingpanel-with-indicators
+, elementary-gtk-theme
+, nixos-artwork
+, lightdm
+, gdk-pixbuf
+, clutter-gtk
+, dbus
+, accountsservice
+, wrapGAppsHook
+}:
 
 stdenv.mkDerivation rec {
   pname = "elementary-greeter";
-  version = "3.3.1";
+  version = "unstable-2019-09-10";
 
   repoName = "greeter";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = repoName;
-    rev = version;
-    sha256 = "1vkq4z0hrmvzv4sh2qkxjajdxcycd1zj97a3pc8n4yb858pqfyzc";
+    rev = "cad7d28d2b40ed04f6ce49ab44408297b5c69468";
+    sha256 = "0m8iq04wdwgg6arm7dzwi7a0snxvss62zpnw2knpr6lp77vd7hqr";
   };
 
   passthru = {
@@ -34,38 +53,32 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    clutter-gtk
-    elementary-icon-theme
+    accountsservice
+    clutter-gtk # else we get could not generate cargs for mutter-clutter-2
     elementary-gtk-theme
+    elementary-icon-theme
     elementary-settings-daemon
-    gnome-desktop
+    gdk-pixbuf
     granite
     gtk3
     libgee
-    libGL
     lightdm
     mutter
     wingpanel-with-indicators
   ];
 
-  patches = [
-    (substituteAll {
-      src = ./gsd.patch;
-      elementary_settings_daemon = "${elementary-settings-daemon}/libexec/";
-    })
-    (substituteAll {
-      src = ./numlockx.patch;
-      inherit numlockx;
-    })
-    ./01-sysconfdir-install.patch
-    ./hardcode-theme.patch
-  ];
-
   mesonFlags = [
     # A hook does this but after wrapGAppsHook so the files never get wrapped.
     "--sbindir=${placeholder "out"}/bin"
     # baked into the program for discovery of the greeter configuration
     "--sysconfdir=/etc"
+    # We use the patched gnome-settings-daemon
+    "-Dubuntu-patched-gsd=true"
+    "-Dgsd-dir=${elementary-settings-daemon}/libexec/" # trailing slash is needed
+  ];
+
+  patches = [
+    ./sysconfdir-install.patch
   ];
 
   preFixup = ''
@@ -76,18 +89,19 @@ stdenv.mkDerivation rec {
       # for `wingpanel -g`
       --prefix PATH : "${wingpanel-with-indicators}/bin"
 
-      # TODO: they should be using meson for this
-      # See: https://github.com/elementary/greeter/blob/19c0730fded4e9ddec5a491f0e78f83c7c04eb59/src/PantheonGreeter.vala#L451
+      # for the compositor
       --prefix PATH : "$out/bin"
     )
   '';
 
   postFixup = ''
-    substituteInPlace $out/share/xgreeters/io.elementary.greeter.desktop \
-      --replace  "Exec=io.elementary.greeter" "Exec=$out/bin/io.elementary.greeter"
-
+    # Use NixOS default wallpaper
     substituteInPlace $out/etc/lightdm/io.elementary.greeter.conf \
-      --replace "#default-wallpaper=/usr/share/backgrounds/elementaryos-default" "default-wallpaper=${nixos-artwork.wallpapers.simple-dark-gray}/share/artwork/gnome/nix-wallpaper-simple-dark-gray.png"
+      --replace "#default-wallpaper=/usr/share/backgrounds/elementaryos-default" \
+      "default-wallpaper=${nixos-artwork.wallpapers.simple-dark-gray}/share/artwork/gnome/nix-wallpaper-simple-dark-gray.png"
+
+    substituteInPlace $out/share/xgreeters/io.elementary.greeter.desktop \
+      --replace "Exec=io.elementary.greeter" "Exec=$out/bin/io.elementary.greeter"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/gsd.patch b/pkgs/desktops/pantheon/desktop/elementary-greeter/gsd.patch
deleted file mode 100644
index bcbf604c6a2..00000000000
--- a/pkgs/desktops/pantheon/desktop/elementary-greeter/gsd.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/meson.build b/src/meson.build
-index 2450c1a..a908d11 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -1,7 +1,7 @@
- conf_data = configuration_data()
- conf_data.set('CONF_DIR', join_paths(get_option('sysconfdir'), 'lightdm'))
- conf_data.set('GETTEXT_PACKAGE', meson.project_name())
--conf_data.set('GSD_DIR', '/usr/lib/gnome-settings-daemon/')
-+conf_data.set('GSD_DIR', '@elementary_settings_daemon@')
- conf_data.set('VERSION', meson.project_version())
- config_header = configure_file (
-     input: 'config.vala.in',
diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/hardcode-theme.patch b/pkgs/desktops/pantheon/desktop/elementary-greeter/hardcode-theme.patch
deleted file mode 100644
index e9263aab736..00000000000
--- a/pkgs/desktops/pantheon/desktop/elementary-greeter/hardcode-theme.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/PantheonGreeter.vala b/src/PantheonGreeter.vala
-index 11aa4c0..daf4a8a 100644
---- a/src/PantheonGreeter.vala
-+++ b/src/PantheonGreeter.vala
-@@ -474,6 +474,10 @@ public static int main (string [] args) {
-                                              Gdk.CursorType.LEFT_PTR);
-     Gdk.get_default_root_window ().set_cursor (cursor);
- 
-+    var settings = Gtk.Settings.get_default ();
-+    settings.gtk_icon_theme_name = "elementary";
-+    settings.gtk_theme_name = "elementary";
-+
-     var icon_theme = Gtk.IconTheme.get_default ();
-     icon_theme.add_resource_path ("/io/elementary/greeter/icons");
- 
diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/numlockx.patch b/pkgs/desktops/pantheon/desktop/elementary-greeter/numlockx.patch
deleted file mode 100644
index 2c7766b4284..00000000000
--- a/pkgs/desktops/pantheon/desktop/elementary-greeter/numlockx.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/PantheonGreeter.vala b/src/PantheonGreeter.vala
-index 11aa4c0..ae7bf7e 100644
---- a/src/PantheonGreeter.vala
-+++ b/src/PantheonGreeter.vala
-@@ -163,7 +163,7 @@ public class PantheonGreeter : Gtk.Window {
-             warning (e.message);
-         }
-         if (activate_numlock) {
--            Granite.Services.System.execute_command ("/usr/bin/numlockx on");
-+            Granite.Services.System.execute_command ("@numlockx@/bin/numlockx on");
-         }
- 
-         var screensaver_timeout = 60;
diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/01-sysconfdir-install.patch b/pkgs/desktops/pantheon/desktop/elementary-greeter/sysconfdir-install.patch
similarity index 68%
rename from pkgs/desktops/pantheon/desktop/elementary-greeter/01-sysconfdir-install.patch
rename to pkgs/desktops/pantheon/desktop/elementary-greeter/sysconfdir-install.patch
index 626e56ce596..9bacbcf4f98 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-greeter/01-sysconfdir-install.patch
+++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/sysconfdir-install.patch
@@ -1,14 +1,14 @@
-From 2384bee55a46eac44eb9d329be4c2a097e053ae1 Mon Sep 17 00:00:00 2001
+From 7bb0d507cbb0122f167127b9f6460bd53d8234de Mon Sep 17 00:00:00 2001
 From: worldofpeace <worldofpeace@users.noreply.github.com>
-Date: Tue, 17 Jul 2018 07:04:18 -0400
-Subject: [PATCH 1/1] 'sysconfdir' will be etc not /etc for install
+Date: Sat, 16 Mar 2019 16:07:24 -0400
+Subject: [PATCH] 'sysconfdir' will be etc not /etc for install
 
 ---
  data/meson.build | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/data/meson.build b/data/meson.build
-index 7621b03..7c08eaf 100644
+index fd54b75..b1120ae 100644
 --- a/data/meson.build
 +++ b/data/meson.build
 @@ -20,7 +20,7 @@ i18n.merge_file (
@@ -19,7 +19,7 @@ index 7621b03..7c08eaf 100644
 +    install_dir: join_paths(get_option('prefix'), 'etc', 'lightdm')
  )
  
- install_data(
+ test (
 -- 
-2.17.1
+2.19.2
 
-- 
GitLab


From 5b3fb23360cba3d462f6ad49897087a123b80502 Mon Sep 17 00:00:00 2001
From: Dima <dgoldin+github@protonmail.ch>
Date: Sat, 14 Sep 2019 03:20:17 +0200
Subject: [PATCH 0183/2254] networkx: fixing undeclared dependency

the current version of networkx implicitly depends on
pkg_resources from setuptools to check the version of
pydot (https://github.com/networkx/networkx/issues/3173).
---
 pkgs/development/python-modules/networkx/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/networkx/default.nix b/pkgs/development/python-modules/networkx/default.nix
index 85b53bd9df6..a4c66048953 100644
--- a/pkgs/development/python-modules/networkx/default.nix
+++ b/pkgs/development/python-modules/networkx/default.nix
@@ -3,6 +3,7 @@
 , fetchPypi
 , nose
 , decorator
+, setuptools
 }:
 
 buildPythonPackage rec {
@@ -17,7 +18,7 @@ buildPythonPackage rec {
   };
 
   checkInputs = [ nose ];
-  propagatedBuildInputs = [ decorator ];
+  propagatedBuildInputs = [ decorator setuptools ];
 
   meta = {
     homepage = "https://networkx.github.io/";
-- 
GitLab


From 4b2e250f9e7dc0344ffd54a1df7ff6d2a081bea9 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 3 Sep 2019 10:46:08 -0400
Subject: [PATCH 0184/2254] nixos/lightdm/pantheon: drop warning

This issue has been fixed in the latest release.
---
 .../x11/display-managers/lightdm-greeters/pantheon.nix     | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix
index bfba174144a..05011b999f2 100644
--- a/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix
@@ -33,13 +33,6 @@ in
 
   config = mkIf (ldmcfg.enable && cfg.enable) {
 
-    warnings = [
-      ''
-        The Pantheon greeter is suboptimal in NixOS and can possibly put you in
-        a situation where you cannot start a session when switching desktopManagers.
-      ''
-    ];
-
     services.xserver.displayManager.lightdm.greeters.gtk.enable = false;
 
     services.xserver.displayManager.lightdm.greeter = mkDefault {
-- 
GitLab


From d5766ef6b32698f9ce2890990b588e03e4b3b01e Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Fri, 13 Sep 2019 21:16:14 -0400
Subject: [PATCH 0185/2254] nixos/pantheon: use sessionVariables

---
 .../services/x11/desktop-managers/pantheon.nix       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix
index e313a194c34..24ce2a4492a 100644
--- a/nixos/modules/services/x11/desktop-managers/pantheon.nix
+++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix
@@ -98,10 +98,6 @@ in
               export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${p}/lib
             fi
           '') cfg.sessionPath}
-
-          # Settings from elementary-default-settings
-          export GTK_CSD=1
-          export GTK_MODULES=$GTK_MODULES:pantheon-filechooser-module
       fi
     '';
 
@@ -166,9 +162,13 @@ in
                               networkmanager-iodine networkmanager-l2tp; };
 
     # Override GSettings schemas
-    environment.variables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";
+    environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";
+
+    environment.sessionVariables.GNOME_SESSION_DEBUG = optionalString cfg.debug "1";
 
-    environment.variables.GNOME_SESSION_DEBUG = optionalString cfg.debug "1";
+    # Settings from elementary-default-settings
+    environment.sessionVariables.GTK_CSD = "1";
+    environment.sessionVariables.GTK_MODULES = "pantheon-filechooser-module";
 
     environment.pathsToLink = [
       # FIXME: modules should link subdirs of `/share` rather than relying on this
-- 
GitLab


From 4828df8ab73345fb6febd0d5d1529ad2618e75e8 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Fri, 13 Sep 2019 21:16:28 -0400
Subject: [PATCH 0186/2254] nixos/pantheon: add gtk settings.ini

---
 nixos/modules/services/x11/desktop-managers/pantheon.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix
index 24ce2a4492a..38440ccbd03 100644
--- a/nixos/modules/services/x11/desktop-managers/pantheon.nix
+++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix
@@ -169,6 +169,7 @@ in
     # Settings from elementary-default-settings
     environment.sessionVariables.GTK_CSD = "1";
     environment.sessionVariables.GTK_MODULES = "pantheon-filechooser-module";
+    environment.etc."gtk-3.0/settings.ini".source = "${pkgs.pantheon.elementary-default-settings}/etc/gtk-3.0/settings.ini";
 
     environment.pathsToLink = [
       # FIXME: modules should link subdirs of `/share` rather than relying on this
-- 
GitLab


From 2bc1a8f9e381e406411c442e91984721317e25ad Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Fri, 13 Sep 2019 21:17:02 -0400
Subject: [PATCH 0187/2254] pantheon.wingpanel: ensure themes are in
 XDG_DATA_DIRS

---
 pkgs/desktops/pantheon/desktop/wingpanel/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix
index b98c205d491..06f0fc23a39 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix
@@ -14,6 +14,8 @@
 , mutter
 , json-glib
 , python3
+, elementary-gtk-theme
+, elementary-icon-theme
 }:
 
 stdenv.mkDerivation rec {
@@ -44,6 +46,8 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
+    elementary-gtk-theme
+    elementary-icon-theme
     gala
     granite
     gtk3
-- 
GitLab


From a99ef0345d3395294f85d8f80fc0967c8ddc740a Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Fri, 13 Sep 2019 21:27:46 -0400
Subject: [PATCH 0188/2254] nixos/lightdm/pantheon: provide xgreeters in
 package

---
 .../x11/display-managers/lightdm-greeters/pantheon.nix     | 7 +------
 .../pantheon/desktop/elementary-greeter/default.nix        | 7 +++++++
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix
index 05011b999f2..29cb6ccbc06 100644
--- a/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix
@@ -8,11 +8,6 @@ let
   ldmcfg = dmcfg.lightdm;
   cfg = ldmcfg.greeters.pantheon;
 
-  xgreeters = pkgs.linkFarm "pantheon-greeter-xgreeters" [{
-    path = "${pkgs.pantheon.elementary-greeter}/share/xgreeters/io.elementary.greeter.desktop";
-    name = "io.elementary.greeter.desktop";
-  }];
-
 in
 {
   options = {
@@ -36,7 +31,7 @@ in
     services.xserver.displayManager.lightdm.greeters.gtk.enable = false;
 
     services.xserver.displayManager.lightdm.greeter = mkDefault {
-      package = xgreeters;
+      package = pkgs.pantheon.elementary-greeter.xgreeters;
       name = "io.elementary.greeter";
     };
 
diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
index 2e6cc24b486..a72e0b6c223 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
@@ -1,5 +1,7 @@
 { stdenv
 , fetchFromGitHub
+, linkFarm
+, elementary-greeter
 , pantheon
 , pkgconfig
 , meson
@@ -41,6 +43,11 @@ stdenv.mkDerivation rec {
       inherit repoName;
       attrPath = pname;
     };
+
+    xgreeters = linkFarm "pantheon-greeter-xgreeters" [{
+      path = "${elementary-greeter}/share/xgreeters/io.elementary.greeter.desktop";
+      name = "io.elementary.greeter.desktop";
+    }];
   };
 
   nativeBuildInputs = [
-- 
GitLab


From 5e936cab202fc356bf727d1d6f188bcf876a4c07 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Fri, 13 Sep 2019 21:36:23 -0400
Subject: [PATCH 0189/2254] nixos/pantheon: use Pantheon's greeter

I now consider this usable in NixOS without reflecting
negatively on NixOS as a whole. For example this greeter
is immune to issues like #60651.
---
 nixos/modules/services/x11/desktop-managers/pantheon.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix
index 38440ccbd03..d80ea9a53e8 100644
--- a/nixos/modules/services/x11/desktop-managers/pantheon.nix
+++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix
@@ -79,8 +79,7 @@ in
         Using Pantheon without LightDM as a displayManager will break screenlocking from the UI.
       '';
 
-    services.xserver.displayManager.lightdm.enable = mkDefault true;
-    services.xserver.displayManager.lightdm.greeters.gtk.enable = mkDefault true;
+    services.xserver.displayManager.lightdm.greeters.pantheon.enable = mkDefault true;
 
     # If not set manually Pantheon session cannot be started
     # Known issue of https://github.com/NixOS/nixpkgs/pull/43992
-- 
GitLab


From f99bdb2b615da434e0f2814a5924a2aa6a7a1f66 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 13 Sep 2019 11:11:53 -0500
Subject: [PATCH 0190/2254] networkmanager,modemmanager: fix service symlinks
 for systemd v243

Fixes problems such as:

systemd[1]: Failed to put bus name to hashmap: File exists
systemd[1]: dbus-org.freedesktop.nm-dispatcher.service: Two services allocated for the same bus name org.freedesktop.nm_dispatcher, refusing operation.

Problem is that systemd treats symlinks to files outside the service
path differently, causing our old workaround to look like two separate services.

These symlinks are intended to be a means for manually emulating
the behavior of the `Alias=` directive in these services.
Unfortunately even making these symlinks relative isn't enough,
since they don't make it to where it matters--
that only makes the links in /etc/static/systemd/system/*
relative, with systemd still being shown non-relative links
in /etc/systemd/system/*.

To fix this, drop all of this at the package level
and instead simply specify the aliases in the NixOS modules.

Also handle the same for modemmanager,
since the networkmanager NixOS module also handles that.
---
 nixos/modules/services/networking/networkmanager.nix | 5 +++++
 pkgs/tools/networking/modem-manager/default.nix      | 7 -------
 pkgs/tools/networking/network-manager/default.nix    | 5 -----
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index db4d0e328e2..db047e6d0b8 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -468,12 +468,16 @@ in {
         mkdir -m 700 -p /etc/ipsec.d
         mkdir -m 755 -p ${stateDirs}
       '';
+
+      aliases = [ "dbus-org.freedesktop.NetworkManager.service" ];
     };
 
     systemd.services.NetworkManager-wait-online = {
       wantedBy = [ "network-online.target" ];
     };
 
+    systemd.services.ModemManager.aliases = [ "dbus-org.freedesktop.ModemManager1.service" ];
+
     systemd.services.nm-setup-hostsdirs = mkIf dynamicHostsEnabled {
       wantedBy = [ "NetworkManager.service" ];
       before = [ "NetworkManager.service" ];
@@ -495,6 +499,7 @@ in {
 
       # useful binaries for user-specified hooks
       path = [ pkgs.iproute pkgs.utillinux pkgs.coreutils ];
+      aliases = [ "dbus-org.freedesktop.nm-dispatcher.service" ];
     };
 
     # Turn off NixOS' network management when networking is managed entirely by NetworkManager
diff --git a/pkgs/tools/networking/modem-manager/default.nix b/pkgs/tools/networking/modem-manager/default.nix
index b2644d0c2a4..fedc8d4b71d 100644
--- a/pkgs/tools/networking/modem-manager/default.nix
+++ b/pkgs/tools/networking/modem-manager/default.nix
@@ -32,13 +32,6 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  postInstall = ''
-    # systemd in NixOS doesn't use `systemctl enable`, so we need to establish
-    # aliases ourselves.
-    ln -s $out/etc/systemd/system/ModemManager.service \
-      $out/etc/systemd/system/dbus-org.freedesktop.ModemManager1.service
-  '';
-
   meta = with stdenv.lib; {
     description = "WWAN modem manager, part of NetworkManager";
     homepage = https://www.freedesktop.org/wiki/Software/ModemManager/;
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index 5bc915caea6..490ebd0fa6b 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -97,11 +97,6 @@ in stdenv.mkDerivation rec {
   '';
 
   postInstall = ''
-    # systemd in NixOS doesn't use `systemctl enable`, so we need to establish
-    # aliases ourselves.
-    ln -s $out/etc/systemd/system/NetworkManager-dispatcher.service $out/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service
-    ln -s $out/etc/systemd/system/NetworkManager.service $out/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service
-
     # Add the legacy service name from before #51382 to prevent NetworkManager
     # from not starting back up:
     # TODO: remove this once 19.10 is released
-- 
GitLab


From c21ae92d94c38ef79a978e363a8a1669fb7a5639 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 13 Sep 2019 21:45:45 -0500
Subject: [PATCH 0191/2254] spleen: 1.0.5 -> 1.3.0

Install psfu files for console use.
---
 pkgs/data/fonts/spleen/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/data/fonts/spleen/default.nix b/pkgs/data/fonts/spleen/default.nix
index 2964b8692dc..f8830bbd211 100644
--- a/pkgs/data/fonts/spleen/default.nix
+++ b/pkgs/data/fonts/spleen/default.nix
@@ -2,7 +2,7 @@
 
 let
   pname = "spleen";
-  version = "1.0.5";
+  version = "1.3.0";
 in fetchurl {
   name = "${pname}-${version}";
   url = "https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz";
@@ -10,14 +10,13 @@ in fetchurl {
   downloadToTemp = true;
   recursiveHash = true;
   postFetch = ''
-    tar xf $downloadedFile --strip=1
+    tar xvf $downloadedFile --strip=1
     d="$out/share/fonts/X11/misc/spleen"
     gzip -n9 *.pcf
-    install -Dm644 *.pcf.gz  -t $d
-    install -Dm644 *.bdf -t $d
+    install -Dm644 *.{pcf.gz,psfu,bdf} -t $d
     install -m644 fonts.alias-spleen $d/fonts.alias
   '';
-  sha256 = "0144a0lkkl5qx0a8sapymcayj5lp5cs9nfgpbmg3427n41pkqfbb";
+  sha256 = "1l1ksl8xnz1yh7jl8h2g25a7wfm9xgj3lay8ddqzlxzydkkm110q";
 
   meta = with lib; {
     description = "Monospaced bitmap fonts";
-- 
GitLab


From 7ff42e439e2995467a8b5b4ee1739943f8e59b46 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 11 Sep 2019 15:12:22 -0500
Subject: [PATCH 0192/2254] sarasa-gothic: 0.8.0 -> 0.8.2

https://github.com/be5invis/Sarasa-Gothic/releases/tag/v0.8.2
---
 pkgs/data/fonts/sarasa-gothic/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/sarasa-gothic/default.nix b/pkgs/data/fonts/sarasa-gothic/default.nix
index 2d9fbfdae05..7e073bf56d3 100644
--- a/pkgs/data/fonts/sarasa-gothic/default.nix
+++ b/pkgs/data/fonts/sarasa-gothic/default.nix
@@ -1,12 +1,12 @@
 { lib, fetchurl, p7zip }:
 
 let
-  version = "0.8.0";
+  version = "0.8.2";
 in fetchurl {
   name = "sarasa-gothic-${version}";
 
   url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z";
-  sha256 = "0zafvzrh4180hmz351f1rvs29n8mfxf0qv6mdl7psf1f066dizs6";
+  sha256 = "17xkpklb6spi10132lq658fwvrms3fs7ksb9j098z9vaqad1k51q";
 
   recursiveHash = true;
   downloadToTemp = true;
-- 
GitLab


From 9a6327326749a2743914fcd7477e0252677e41c8 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 11 Sep 2019 11:47:16 -0500
Subject: [PATCH 0193/2254] txr: 224 -> 225

http://www.kylheku.com/cgit/txr/tree/RELNOTES?id=txr-225
---
 pkgs/tools/misc/txr/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/txr/default.nix b/pkgs/tools/misc/txr/default.nix
index a71666b7acd..c47fe77fb76 100644
--- a/pkgs/tools/misc/txr/default.nix
+++ b/pkgs/tools/misc/txr/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "txr";
-  version = "224";
+  version = "225";
 
   src = fetchurl {
     url = "http://www.kylheku.com/cgit/txr/snapshot/${pname}-${version}.tar.bz2";
-    sha256 = "10xz140i4sam9r7r8rz5mz5jbwal7xvaimzrb7lmisqsvby2qcw7";
+    sha256 = "07vh0rmvjr2sir15l3ppp2pnp2d849dg17rzykkzqyk3d5rwfxyj";
   };
 
   nativeBuildInputs = [ bison flex ];
-- 
GitLab


From ecdc1ecd9c8d502ad3ef9cfe8d48645319120bac Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 13 Sep 2019 22:00:00 -0500
Subject: [PATCH 0194/2254] chez: fix build on darwin

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

diff --git a/pkgs/development/compilers/chez/default.nix b/pkgs/development/compilers/chez/default.nix
index 12d68f0265c..a0fc30c8586 100644
--- a/pkgs/development/compilers/chez/default.nix
+++ b/pkgs/development/compilers/chez/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  NIX_CFLAGS_COMPILE = "-Wno-error=format-truncation";
+  NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.cc.isGNU "-Wno-error=format-truncation";
 
   /*
   ** We patch out a very annoying 'feature' in ./configure, which
-- 
GitLab


From dc25f13c5afe31dbaf596ae5546a0f93df9a0de5 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 10 Sep 2019 21:25:41 -0500
Subject: [PATCH 0195/2254] krita: 4.2.5 -> 4.2.6, gz -> xz

https://krita.org/en/item/krita-4-2-6-released/
---
 pkgs/applications/graphics/krita/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix
index 83489e1a24c..30f7739167c 100644
--- a/pkgs/applications/graphics/krita/default.nix
+++ b/pkgs/applications/graphics/krita/default.nix
@@ -10,11 +10,11 @@
 
 mkDerivation rec {
   pname = "krita";
-  version = "4.2.5";
+  version = "4.2.6";
 
   src = fetchurl {
-    url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.gz";
-    sha256 = "1f14r2mrqasl6nr3sss0xy2h8xlxd5wdcjcd64m9nz2gwlm39r7w";
+    url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.xz";
+    sha256 = "0qdaw8xx3h91v8iw6nw2h276ka8hflaq4r4qwz5mqfd3h254jzym";
   };
 
   nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip makeWrapper ];
-- 
GitLab


From 5f269cd4f9ab95cf5e5bca6a1055e0fc1623ed6b Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 13 Sep 2019 22:01:48 -0500
Subject: [PATCH 0196/2254] systemd: cleanup unused variable and containing
 'let' (NFCI)

This seems to be inlined directly later, FWIW.
---
 pkgs/os-specific/linux/systemd/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 90b33e183ce..aa28b79d1d6 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -15,10 +15,7 @@
 , withKexectools ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) kexectools.meta.platforms, kexectools
 }:
 
-let
-  pythonLxmlEnv = buildPackages.python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ]);
-
-in stdenv.mkDerivation {
+stdenv.mkDerivation {
   version = "243";
   pname = "systemd";
 
-- 
GitLab


From 9fbb606cd002345cdb8a15d27d802edd40f83a37 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 13 Sep 2019 22:05:38 -0500
Subject: [PATCH 0197/2254] agave: 10 -> 14

https://github.com/agarick/agave/releases/tag/v14
https://github.com/agarick/agave/releases/tag/v13
https://github.com/agarick/agave/releases/tag/v12
https://github.com/agarick/agave/releases/tag/v11
---
 pkgs/data/fonts/agave/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/data/fonts/agave/default.nix b/pkgs/data/fonts/agave/default.nix
index e9f4fbd4867..1fffbd9dcb1 100644
--- a/pkgs/data/fonts/agave/default.nix
+++ b/pkgs/data/fonts/agave/default.nix
@@ -2,18 +2,18 @@
 
 let
   pname = "agave";
-  version = "10";
+  version = "14";
 in fetchurl {
   name = "${pname}-${version}";
-  url = "https://github.com/agarick/agave/releases/download/v${version}/agave-r.ttf";
+  url = "https://github.com/agarick/agave/releases/download/v${version}/Agave-Regular.ttf";
 
   downloadToTemp = true;
   recursiveHash = true;
   postFetch = ''
-    install -D $downloadedFile $out/share/fonts/truetype/agave-r.ttf
+    install -D $downloadedFile $out/share/fonts/truetype/Agave-Regular.ttf
   '';
 
-  sha256 = "1mfj6a9sp00mjz7420yyrbbs5bqks3fz2slwgcppklxnz0890r9f";
+  sha256 = "14hr6cdn5xbfpszj4qyfqbwmjyrkmi83yl0g9j3y3jw561jwy27j";
 
   meta = with lib; {
     description = "truetype monospaced typeface designed for X environments";
-- 
GitLab


From 5273de656896b8b947012afe51f72d93d8f33372 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 13 Sep 2019 22:19:33 -0500
Subject: [PATCH 0198/2254] joplin-desktop: 1.0.158 -> 1.0.167

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

diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix
index 410b04d5dcb..ff0332e1e5f 100644
--- a/pkgs/applications/misc/joplin-desktop/default.nix
+++ b/pkgs/applications/misc/joplin-desktop/default.nix
@@ -2,12 +2,12 @@
 
 let
   pname = "joplin-desktop";
-  version = "1.0.158";
+  version = "1.0.167";
 in appimageTools.wrapType2 rec {
   name = "${pname}-${version}";
   src = fetchurl {
     url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}-x86_64.AppImage";
-    sha256 = "1xaamwcasihja3agwb0nnfnzc1wmmr0d2ng73qmfil9nhf9v3j6q";
+    sha256 = "062f2av60490ffrml0q8zv68yir6zaqif0g3d32c985gcvmgn9lw";
   };
 
 
-- 
GitLab


From 15cafa9e1090bdbc31159fa5d30555005ac8182d Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 9 Sep 2019 16:59:21 -0500
Subject: [PATCH 0199/2254] todoman: 3.5.0 -> 3.6.0

https://github.com/pimutils/todoman/releases/tag/v3.6.0
---
 pkgs/applications/office/todoman/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix
index 450ee34262b..7c5c8f72440 100644
--- a/pkgs/applications/office/todoman/default.nix
+++ b/pkgs/applications/office/todoman/default.nix
@@ -5,11 +5,11 @@ let
 in
 buildPythonApplication rec {
   pname = "todoman";
-  version = "3.5.0";
+  version = "3.6.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "051qjdpwif06x7qspnb4pfwdhb8nnmz99yqcp4kla5hv0n3jh0w9";
+    sha256 = "1c0jh9bi2xfjc7w4kka68mygl00zkp2qxhffnipmfvvykfjmlhk0";
   };
 
     LOCALE_ARCHIVE = stdenv.lib.optionalString stdenv.isLinux
@@ -19,7 +19,7 @@ buildPythonApplication rec {
 
   buildInputs = [ glibcLocales ];
   propagatedBuildInputs = with python3.pkgs;
-    [ atomicwrites click click-log configobj humanize icalendar parsedatetime
+    [ atomicwrites click click-log click-repl configobj humanize icalendar parsedatetime
       python-dateutil pyxdg tabulate urwid ];
 
   checkInputs = with python3.pkgs;
-- 
GitLab


From 3b9995ca8e0d42f3d0f043962f0b354ee4d02739 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 9 Sep 2019 12:43:35 -0500
Subject: [PATCH 0200/2254] lollypop: 1.1.4.14 -> 1.1.4.16

https://gitlab.gnome.org/World/lollypop/-/tags/1.1.4.16
---
 pkgs/applications/audio/lollypop/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix
index e4d508b2a1f..73d8d350f38 100644
--- a/pkgs/applications/audio/lollypop/default.nix
+++ b/pkgs/applications/audio/lollypop/default.nix
@@ -20,7 +20,7 @@
 
 python3.pkgs.buildPythonApplication rec  {
   pname = "lollypop";
-  version = "1.1.4.14";
+  version = "1.1.4.16";
 
   format = "other";
   doCheck = false;
@@ -29,7 +29,7 @@ python3.pkgs.buildPythonApplication rec  {
     url = "https://gitlab.gnome.org/World/lollypop";
     rev = "refs/tags/${version}";
     fetchSubmodules = true;
-    sha256 = "004cwbnxss6vmdsc6i0y83h3xbc2bzc0ra4z99pkizkky2mz6swj";
+    sha256 = "1azfxc1vc1j4ph0zrfsgz2gac1vwmbj65j6wjlxx3nr8kia4mccl";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From a209776db94d52c6bb95f53652d4bec95c2e3139 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 9 Sep 2019 12:03:02 -0500
Subject: [PATCH 0201/2254] firefox-60-esr: 60.8.0esr -> 60.9.0esr

---
 pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index e1d4014c83b..3e8cf4d66b9 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -70,11 +70,11 @@ rec {
 
   firefox-esr-60 = common rec {
     pname = "firefox-esr";
-    ffversion = "60.8.0esr";
+    ffversion = "60.9.0esr";
 
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
-      sha512 = "0332b6049b97e488e55a3b9540baad3bd159e297084e9a625b8492497c73f86eb3e144219dabc5e9f2c2e4a27630d83d243c919cd4f86b7f59f47133ed3afc54";
+      sha512 = "4baea5c9c4eff257834bbaee6d7786f69f7e6bacd24ca13c2705226f4a0d88315ab38c650b2c5e9c76b698f2debc7cea1e5a99cb4dc24e03c48a24df5143a3cf";
     };
 
     patches = [
-- 
GitLab


From 11fc56348ee4b5efc6f44d9f91a286ade4609371 Mon Sep 17 00:00:00 2001
From: Samuel Leathers <samuel.leathers@iohk.io>
Date: Fri, 13 Sep 2019 23:33:38 -0400
Subject: [PATCH 0202/2254] maintainer scripts: fix hydra-eval-failures script

---
 maintainers/scripts/hydra-eval-failures.py | 36 ++++++++++++++--------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/maintainers/scripts/hydra-eval-failures.py b/maintainers/scripts/hydra-eval-failures.py
index 23669502e46..6e7ec2dbc00 100755
--- a/maintainers/scripts/hydra-eval-failures.py
+++ b/maintainers/scripts/hydra-eval-failures.py
@@ -11,13 +11,15 @@ import click
 import requests
 from pyquery import PyQuery as pq
 
+def map_dict (f, d):
+    for k,v in d.items():
+        d[k] = f(v)
 
 maintainers_json = subprocess.check_output([
-    'nix-instantiate', '-E', 'import ./maintainers/maintainer-list.nix {}', '--eval', '--json'
+    'nix-instantiate', '-A', 'lib.maintainers', '--eval', '--strict', '--json'
 ])
 maintainers = json.loads(maintainers_json)
-MAINTAINERS = {v: k for k, v in maintainers.items()}
-
+MAINTAINERS = map_dict(lambda v: v.get('github', None), maintainers)
 
 def get_response_text(url):
     return pq(requests.get(url).text)  # IO
@@ -38,30 +40,39 @@ def get_maintainers(attr_name):
             '-A',
             '.'.join(nixname[1:]) + '.meta',
             EVAL_FILE[nixname[0]],
+            '--arg',
+            'nixpkgs',
+            './.',
             '--json'])
         meta = json.loads(meta_json)
-        if meta.get('maintainers'):
-            return [MAINTAINERS[name] for name in meta['maintainers'] if MAINTAINERS.get(name)]
+        return meta.get('maintainers', [])
     except:
        return []
 
+def filter_github_users(maintainers):
+    github_only = []
+    for i in maintainers:
+        if i.get('github'):
+            github_only.append(i)
+    return github_only
+
 def print_build(table_row):
     a = pq(table_row)('a')[1]
     print("- [ ] [{}]({})".format(a.text, a.get('href')), flush=True)
-    
-    maintainers = get_maintainers(a.text)
-    if maintainers:
-        print("  - maintainers: {}".format(", ".join(map(lambda u: '@' + u, maintainers))))
+
+    job_maintainers = filter_github_users(get_maintainers(a.text))
+    if job_maintainers:
+        print("  - maintainers: {}".format(" ".join(map(lambda u: '@' + u.get('github'), job_maintainers))))
     # TODO: print last three persons that touched this file
     # TODO: pinpoint the diff that broke this build, or maybe it's transient or maybe it never worked?
-    
+
     sys.stdout.flush()
 
 @click.command()
 @click.option(
     '--jobset',
-    default="nixos/release-17.09",
-    help='Hydra project like nixos/release-17.09')
+    default="nixos/release-19.09",
+    help='Hydra project like nixos/release-19.09')
 def cli(jobset):
     """
     Given a Hydra project, inspect latest evaluation
@@ -93,6 +104,7 @@ def cli(jobset):
         print_build(tr)
 
 
+
 if __name__ == "__main__":
     try:
         cli()
-- 
GitLab


From 5ae1d36521395885206cc49275f47c3c17903955 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 9 Sep 2019 11:42:52 -0500
Subject: [PATCH 0203/2254] noice: 0.6 -> 0.8

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

diff --git a/pkgs/applications/misc/noice/default.nix b/pkgs/applications/misc/noice/default.nix
index db8139122ba..6cc5dc9066d 100644
--- a/pkgs/applications/misc/noice/default.nix
+++ b/pkgs/applications/misc/noice/default.nix
@@ -4,12 +4,12 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "noice";
-  version = "0.6";
+  version = "0.8";
 
   src = fetchgit {
     url = "git://git.2f30.org/noice.git";
     rev = "refs/tags/v${version}";
-    sha256 = "03rwglcy47fh6rb630vws10m95bxpcfv47nxrlws2li2ljam8prw";
+    sha256 = "0975j4m93s9a21pazwdzn4gqhkngwq7q6ghp0q8a75r6c4fb7aar";
   };
 
   configFile = optionalString (conf!=null) (builtins.toFile "config.def.h" conf);
-- 
GitLab


From 82c4218fe95c9dc34295cc0b09e3e08ff679b4d0 Mon Sep 17 00:00:00 2001
From: Robert Djubek <envy1988@gmail.com>
Date: Fri, 13 Sep 2019 18:16:51 +0000
Subject: [PATCH 0204/2254] ocrmypdf: 8.2.3 -> 9.0.3

Version bump and bug fix
Fixes runtime dependencies ( #67497 ) and the version bump fixed other issues
---
 pkgs/tools/text/ocrmypdf/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/text/ocrmypdf/default.nix b/pkgs/tools/text/ocrmypdf/default.nix
index 514f3f67539..820d98408fb 100644
--- a/pkgs/tools/text/ocrmypdf/default.nix
+++ b/pkgs/tools/text/ocrmypdf/default.nix
@@ -28,14 +28,14 @@ let
 
 in buildPythonApplication rec {
   pname = "ocrmypdf";
-  version = "8.2.3";
+  version = "9.0.3";
   disabled = ! python3Packages.isPy3k;
 
   src = fetchFromGitHub {
     owner = "jbarlow83";
     repo = "OCRmyPDF";
     rev = "v${version}";
-    sha256 = "1ldlyhxkav34y9d7g2kx3d4p26c2b82vnwi0ywnfynb16sav36d5";
+    sha256 = "1qnjdcbwkxxqfahylzl0wj1gk51yi9m8akd4d1rrq37vg2vwdkjy";
   };
 
   nativeBuildInputs = with python3Packages; [
@@ -51,12 +51,14 @@ in buildPythonApplication rec {
     img2pdf
     pdfminer
     pikepdf
+    pillow
     reportlab
     ruffus
+    setuptools
+    tqdm
   ];
 
   checkInputs = with python3Packages; [
-    hocr-tools
     pypdf2
     pytest
     pytest-helpers-namespace
@@ -67,7 +69,6 @@ in buildPythonApplication rec {
     setuptools
   ] ++ runtimeDeps;
 
-
   postPatch = ''
     substituteInPlace src/ocrmypdf/leptonica.py \
       --replace "ffi.dlopen(find_library('lept'))" \
@@ -93,6 +94,8 @@ in buildPythonApplication rec {
     and not test_old_unpaper'
   '';
 
+  makeWrapperArgs = [ "--prefix PATH : ${stdenv.lib.makeBinPath [ ghostscript jbig2enc pngquant qpdf tesseract4 unpaper ]}" ];
+
   meta = with stdenv.lib; {
     homepage = "https://github.com/jbarlow83/OCRmyPDF";
     description = "Adds an OCR text layer to scanned PDF files, allowing them to be searched";
-- 
GitLab


From 1859afb731893f273ae6e016fa8eda4650c6ecb9 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 9 Sep 2019 03:30:32 -0500
Subject: [PATCH 0205/2254] libmicrodns: 0.0.10 -> 0.1.0

https://github.com/videolabs/libmicrodns/releases/tag/0.1.0
---
 pkgs/development/libraries/libmicrodns/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libmicrodns/default.nix b/pkgs/development/libraries/libmicrodns/default.nix
index 3c55a6b036c..41d81f1f176 100644
--- a/pkgs/development/libraries/libmicrodns/default.nix
+++ b/pkgs/development/libraries/libmicrodns/default.nix
@@ -5,14 +5,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "0.0.10";
+  version = "0.1.0";
   pname = "libmicrodns";
 
   src = fetchFromGitHub {
     owner = "videolabs";
     repo = pname;
     rev = version;
-    sha256 = "1xvl9k49ng35wbsqmnjnyqvkyjf8dcq2ywsq3jp3wh0rgmxhq2fh";
+    sha256 = "1pmf461zn35spbpbls1ih68ki7f8g8xjwhzr2csy63nnyq2k9jji";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From 108d019e59b270018e1966471ea725a41851f4be Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sun, 8 Sep 2019 22:25:24 -0500
Subject: [PATCH 0206/2254] uhubctl: unstable-2019-07-31 -> 2.1.0

---
 pkgs/tools/misc/uhubctl/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/misc/uhubctl/default.nix b/pkgs/tools/misc/uhubctl/default.nix
index f2c0f43cca9..a6fe1853ae5 100644
--- a/pkgs/tools/misc/uhubctl/default.nix
+++ b/pkgs/tools/misc/uhubctl/default.nix
@@ -3,21 +3,20 @@
 , libusb
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "uhubctl";
-  version = "unstable-2019-07-31";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "mvp";
     repo = "uhubctl";
-    rev = "1961aa02e9924a54a6219d16c61a0beb0d626e46";
-    sha256 = "15mvqp1xh079nqp0mynh3l1wmw4maa320pn4jr8bz7nh3knmk0n1";
+    rev = "refs/tags/v${version}";
+    sha256 = "1cgmwsf68g49k6q4jvz073bpjhg5p73kk1a4kbgkxmvx01gmbcmq";
   };
 
   buildInputs = [ libusb ];
 
-  installFlags = [ "prefix=$(out)" ];
-
+  installFlags = [ "prefix=${placeholder "out"}" ];
   meta = with stdenv.lib; {
     homepage = "https://github.com/mvp/uhubctl";
     description = "Utility to control USB power per-port on smart USB hubs";
-- 
GitLab


From b5b92e015ca4c13d008c435b3739a55a3ab66176 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sun, 8 Sep 2019 22:14:01 -0500
Subject: [PATCH 0207/2254] samba: 4.10.6 -> 4.10.8 (security!)

https://www.samba.org/samba/history/samba-4.10.8.html
https://www.samba.org/samba/history/samba-4.10.7.html
---
 pkgs/servers/samba/4.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index 63ac8c53317..044acbe1720 100644
--- a/pkgs/servers/samba/4.x.nix
+++ b/pkgs/servers/samba/4.x.nix
@@ -20,11 +20,11 @@ with lib;
 
 stdenv.mkDerivation rec {
   pname = "samba";
-  version = "4.10.6";
+  version = "4.10.8";
 
   src = fetchurl {
     url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz";
-    sha256 = "0hpgdqlyczj98pkh2ldglvvnkrb1q541r3qikdvxq0qjvd9fpywy";
+    sha256 = "1x0hlhb674fndfkmimjicnzs543n3i8465a5ifcmjwvzavxha7y4";
   };
 
   outputs = [ "out" "dev" "man" ];
-- 
GitLab


From 6eee7ae50f3fa861a3954b6de8dcd021c79c81ae Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 4 Jun 2019 19:03:39 -0500
Subject: [PATCH 0208/2254] minder: init at 1.3.1

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

diff --git a/pkgs/applications/misc/minder/default.nix b/pkgs/applications/misc/minder/default.nix
new file mode 100644
index 00000000000..5da101d53e8
--- /dev/null
+++ b/pkgs/applications/misc/minder/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub
+, pkgconfig, meson, ninja, python3
+, wrapGAppsHook, vala, shared-mime-info
+, cairo, pantheon, glib, gtk3, libxml2, libgee, libarchive
+}:
+
+stdenv.mkDerivation rec {
+  pname = "minder";
+  version = "1.3.1";
+
+  src = fetchFromGitHub {
+    owner = "phase1geo";
+    repo = pname;
+    rev = version;
+    sha256 = "0b9acrdi712f7g08gj6wd9mvdrf11vfgp0rdzlwinl19bsr0zwpm";
+  };
+
+  nativeBuildInputs = [ pkgconfig meson ninja python3 wrapGAppsHook vala shared-mime-info ];
+  buildInputs = [ cairo pantheon.granite glib gtk3 libxml2 libgee libarchive ];
+
+  postPatch = ''
+    chmod +x meson/post_install.py
+    patchShebangs meson/post_install.py
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Mind-mapping application for Elementary OS";
+    homepage = "https://github.com/phase1geo/Minder";
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ dtzWill ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bd67fe85526..1b16a425300 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8707,6 +8707,8 @@ in
 
   metamath = callPackage ../development/interpreters/metamath { };
 
+  minder = callPackage ../applications/misc/minder { };
+
   mujs = callPackage ../development/interpreters/mujs { };
 
   nix-exec = callPackage ../development/interpreters/nix-exec {
-- 
GitLab


From 23a4315fcceedcf5c8f396392246b622991c39da Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 13 Sep 2019 22:49:03 -0500
Subject: [PATCH 0209/2254] minder: 1.3.1 -> 1.5.0, fixups

---
 pkgs/applications/misc/minder/default.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/minder/default.nix b/pkgs/applications/misc/minder/default.nix
index 5da101d53e8..4b92a43451a 100644
--- a/pkgs/applications/misc/minder/default.nix
+++ b/pkgs/applications/misc/minder/default.nix
@@ -2,27 +2,34 @@
 , pkgconfig, meson, ninja, python3
 , wrapGAppsHook, vala, shared-mime-info
 , cairo, pantheon, glib, gtk3, libxml2, libgee, libarchive
+, hicolor-icon-theme # for setup-hook
 }:
 
 stdenv.mkDerivation rec {
   pname = "minder";
-  version = "1.3.1";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "phase1geo";
     repo = pname;
     rev = version;
-    sha256 = "0b9acrdi712f7g08gj6wd9mvdrf11vfgp0rdzlwinl19bsr0zwpm";
+    sha256 = "0lhmv3z2jifv4cksxa27jigdfj9n81myjsxg38xp28fx5x3h8bzc";
   };
 
   nativeBuildInputs = [ pkgconfig meson ninja python3 wrapGAppsHook vala shared-mime-info ];
-  buildInputs = [ cairo pantheon.granite glib gtk3 libxml2 libgee libarchive ];
+  buildInputs = [ cairo pantheon.granite glib gtk3 libxml2 libgee libarchive hicolor-icon-theme ];
 
   postPatch = ''
     chmod +x meson/post_install.py
     patchShebangs meson/post_install.py
   '';
 
+  postFixup = ''
+    for x in $out/bin/*; do
+      ln -vrs $x "$out/bin/''${x##*.}"
+    done
+  '';
+
   meta = with stdenv.lib; {
     description = "Mind-mapping application for Elementary OS";
     homepage = "https://github.com/phase1geo/Minder";
-- 
GitLab


From 3491d523b35f4b131ecc60f6881e24d30ddd8422 Mon Sep 17 00:00:00 2001
From: Samuel Leathers <samuel.leathers@iohk.io>
Date: Fri, 13 Sep 2019 23:51:56 -0400
Subject: [PATCH 0210/2254] pythonPackages.twisted: add setuptools dependency

* required for buildbot test to pass
---
 pkgs/development/python-modules/twisted/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix
index 10b25460cef..249ddb4be86 100644
--- a/pkgs/development/python-modules/twisted/default.nix
+++ b/pkgs/development/python-modules/twisted/default.nix
@@ -11,6 +11,7 @@
 , attrs
 , pyopenssl
 , service-identity
+, setuptools
 , idna
 }:
 buildPythonPackage rec {
@@ -23,7 +24,7 @@ buildPythonPackage rec {
     sha256 = "294be2c6bf84ae776df2fc98e7af7d6537e1c5e60a46d33c3ce2a197677da395";
   };
 
-  propagatedBuildInputs = [ zope_interface incremental automat constantly hyperlink pyhamcrest attrs ];
+  propagatedBuildInputs = [ zope_interface incremental automat constantly hyperlink pyhamcrest attrs setuptools ];
 
   passthru.extras.tls = [ pyopenssl service-identity idna ];
 
-- 
GitLab


From f1df175f8dfbdb9c989287baf7b12cc21d1a8f5a Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 13 Sep 2019 22:54:15 -0500
Subject: [PATCH 0211/2254] inter: 3.7 -> 3.10

https://github.com/rsms/inter/releases/tag/v3.10
https://github.com/rsms/inter/releases/tag/v3.9
https://github.com/rsms/inter/releases/tag/v3.8
---
 pkgs/data/fonts/inter/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/inter/default.nix b/pkgs/data/fonts/inter/default.nix
index 589acbcee5c..33e7283147a 100644
--- a/pkgs/data/fonts/inter/default.nix
+++ b/pkgs/data/fonts/inter/default.nix
@@ -1,7 +1,7 @@
 { lib, fetchzip }:
 
 let
-  version = "3.7";
+  version = "3.10";
 in fetchzip {
   name = "inter-${version}";
 
@@ -12,7 +12,7 @@ in fetchzip {
     unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
   '';
 
-  sha256 = "1ja1v3605vp09azpabgmk710kic85zxwi4kksmqj9z805fmxddp6";
+  sha256 = "029fjpgdml8qx2cqn4rnh2xm3z4cnh74jlzjb8pbfm2azsnvi6r1";
 
   meta = with lib; {
     homepage = https://rsms.me/inter/;
-- 
GitLab


From 6654b52c8b5a885f748eb3541bd5b2defb8cd992 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 7 Aug 2019 08:39:27 -0500
Subject: [PATCH 0212/2254] networkmanager-openconnect: 1.2.4 -> 1.2.6

---
 .../network-manager/openconnect/default.nix           | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/network-manager/openconnect/default.nix b/pkgs/tools/networking/network-manager/openconnect/default.nix
index 1fb50686d0d..4236c9e1818 100644
--- a/pkgs/tools/networking/network-manager/openconnect/default.nix
+++ b/pkgs/tools/networking/network-manager/openconnect/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchurl, substituteAll, openconnect, intltool, pkgconfig, networkmanager, libsecret
+{ stdenv, fetchurl, substituteAll, openconnect, intltool, pkgconfig, autoreconfHook, networkmanager, gcr, libsecret, file
 , gtk3, withGnome ? true, gnome3, kmod }:
 
 let
   pname   = "NetworkManager-openconnect";
-  version = "1.2.4";
+  version = "1.2.6";
 in stdenv.mkDerivation {
   name    = "${pname}${if withGnome then "-gnome" else ""}-${version}";
 
   src = fetchurl {
     url    = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "15j98wwspv6mcmy91w30as5qc1bzsnhlk060xhjy4qrvd37y0xx1";
+    sha256 = "0nlp290nkawc4wqm978n4vhzg3xdqi8kpjjx19l855vab41rh44m";
   };
 
   patches = [
@@ -20,13 +20,14 @@ in stdenv.mkDerivation {
   ];
 
   buildInputs = [ openconnect networkmanager ]
-    ++ stdenv.lib.optionals withGnome [ gtk3 libsecret ];
+    ++ stdenv.lib.optionals withGnome [ gtk3 gcr libsecret ];
 
-  nativeBuildInputs = [ intltool pkgconfig ];
+  nativeBuildInputs = [ intltool pkgconfig file ];
 
   configureFlags = [
     "--with-gnome=${if withGnome then "yes" else "no"}"
     "--enable-absolute-paths"
+    "--without-libnm-glib"
   ];
 
   passthru = {
-- 
GitLab


From 5a5a87cd002ab6875789f48a2ee697bc3b237f95 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 6 Sep 2019 16:01:51 +0000
Subject: [PATCH 0213/2254] ocamlPackages.mtime: disable jsoo support for OCaml
 < 4.03

---
 pkgs/development/ocaml-modules/mtime/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/ocaml-modules/mtime/default.nix b/pkgs/development/ocaml-modules/mtime/default.nix
index f4e3586b43c..f86909cc10b 100644
--- a/pkgs/development/ocaml-modules/mtime/default.nix
+++ b/pkgs/development/ocaml-modules/mtime/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, js_of_ocaml
-, jsooSupport ? true
+, jsooSupport ? lib.versionAtLeast ocaml.version "4.03"
 }:
 
 with lib;
-- 
GitLab


From 912f03d0d45d5bc9321733496e7d3b9322840938 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 6 Sep 2019 16:01:55 +0000
Subject: [PATCH 0214/2254] =?UTF-8?q?ocamlPackages.xtmpl:=20fix=20for=20js?=
 =?UTF-8?q?oo=20=E2=89=A5=203.4.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocaml-modules/xtmpl/default.nix           |  2 ++
 .../ocaml-modules/xtmpl/jsoo.patch            | 26 +++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/xtmpl/jsoo.patch

diff --git a/pkgs/development/ocaml-modules/xtmpl/default.nix b/pkgs/development/ocaml-modules/xtmpl/default.nix
index 4c5d1edcb09..2c4cf4928db 100644
--- a/pkgs/development/ocaml-modules/xtmpl/default.nix
+++ b/pkgs/development/ocaml-modules/xtmpl/default.nix
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
     sha256 = "1hq6y4rhz958q40145k4av8hx8jyvspg78xf741samd7vc3jd221";
   };
 
+  patches = [ ./jsoo.patch ];
+
   buildInputs = [ ocaml findlib ppx_tools js_of_ocaml js_of_ocaml-ppx ];
   propagatedBuildInputs = [ iri re ];
 
diff --git a/pkgs/development/ocaml-modules/xtmpl/jsoo.patch b/pkgs/development/ocaml-modules/xtmpl/jsoo.patch
new file mode 100644
index 00000000000..7546dbca924
--- /dev/null
+++ b/pkgs/development/ocaml-modules/xtmpl/jsoo.patch
@@ -0,0 +1,26 @@
+diff --git a/xtmpl_js.ml b/xtmpl_js.ml
+index e0d3894..991d1b3 100644
+--- a/xtmpl_js.ml
++++ b/xtmpl_js.ml
+@@ -25,6 +25,8 @@
+ 
+ (** *)
+ 
++open Js_of_ocaml
++
+ let log s = Firebug.console##log (Js.string s);;
+ 
+ module X = Xtmpl_rewrite
+diff --git a/xtmpl_js.mli b/xtmpl_js.mli
+index d709896..5ed471c 100644
+--- a/xtmpl_js.mli
++++ b/xtmpl_js.mli
+@@ -25,6 +25,8 @@
+ 
+ (** Convenient functions to use in JS code *)
+ 
++open Js_of_ocaml
++
+ (** Create a new tree of DOM nodes from a given XML tree.
+   Errors are logged to the firebug console.
+   @param doc Default is [Dom_html.document].
-- 
GitLab


From 5fed98e8626d937bb9caf6a8f23f967d69d3372a Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 6 Sep 2019 16:02:00 +0000
Subject: [PATCH 0215/2254] ocamlPackages.js_of_ocaml*: 3.3.0 -> 3.4.0

Ensures compatibility with OCaml 4.08
---
 .../tools/ocaml/js_of_ocaml/compiler.nix      | 23 ++++++-------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
index c1526892312..c449c0f9002 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
@@ -1,35 +1,26 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, dune
+{ lib, fetchFromGitHub, buildDunePackage
 , cmdliner, cppo, yojson
 }:
 
-if !stdenv.lib.versionAtLeast ocaml.version "4.02"
-then throw "js_of_ocaml-compiler is not available for OCaml ${ocaml.version}"
-else
-
-stdenv.mkDerivation rec {
+buildDunePackage rec {
 	pname = "js_of_ocaml-compiler";
-	version = "3.3.0";
+	version = "3.4.0";
 
 	src = fetchFromGitHub {
 		owner = "ocsigen";
 		repo = "js_of_ocaml";
 		rev = version;
-		sha256 = "0bg8x2s3f24c8ia2g293ikd5yg0yjw3hkdgdql59c8k2amqin8f8";
+		sha256 = "0c537say0f3197zn8d83nrihabrxyn28xc6d7c9c3l0vvrv6qvfj";
 	};
 
-	buildInputs = [ ocaml findlib dune cmdliner cppo ];
+	buildInputs = [ cmdliner cppo ];
 
 	propagatedBuildInputs = [ yojson ];
 
-	buildPhase = "dune build -p js_of_ocaml-compiler";
-
-	inherit (dune) installPhase;
-
 	meta = {
 		description = "Compiler from OCaml bytecode to Javascript";
-		license = stdenv.lib.licenses.gpl2;
-		maintainers = [ stdenv.lib.maintainers.vbgl ];
+		license = lib.licenses.gpl2;
+		maintainers = [ lib.maintainers.vbgl ];
 		inherit (src.meta) homepage;
-		inherit (ocaml.meta) platforms;
 	};
 }
-- 
GitLab


From 40b760e07cf4f05eb5af0271e54d82b07677fab4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miguel=20Madrid=20Menc=C3=ADa?=
 <miguel.madrid.mencia@gmail.com>
Date: Sat, 14 Sep 2019 10:52:46 +0200
Subject: [PATCH 0216/2254] cytoscape: 3.7.1 -> 3.7.2

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

diff --git a/pkgs/applications/science/misc/cytoscape/default.nix b/pkgs/applications/science/misc/cytoscape/default.nix
index 2e19012af87..c8824c3ee63 100644
--- a/pkgs/applications/science/misc/cytoscape/default.nix
+++ b/pkgs/applications/science/misc/cytoscape/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "cytoscape";
-  version = "3.7.1";
+  version = "3.7.2";
 
   src = fetchurl {
     url = "https://github.com/cytoscape/cytoscape/releases/download/${version}/${pname}-${version}.tar.gz";
-    sha256 = "1mhsngbwbgdwl70wj7850zg94534lasihwv2ryifardm35mkh48k";
+    sha256 = "125vgr8vqbmy2nsm1yl0h0q8p49lxxqfw5cmxzbx1caklcn4rryc";
   };
 
   buildInputs = [jre makeWrapper];
-- 
GitLab


From e3da1377084265f9c0f8c6d9392310fcfbce4cb4 Mon Sep 17 00:00:00 2001
From: Tadeo Kondrak <me@tadeo.ca>
Date: Sat, 14 Sep 2019 03:04:17 -0600
Subject: [PATCH 0217/2254] winetricks: 20190615 -> 20190912

---
 pkgs/misc/emulators/wine/sources.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index 023e48fc991..501d2bde04c 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -56,8 +56,8 @@ in rec {
 
   winetricks = fetchFromGitHub rec {
     # https://github.com/Winetricks/winetricks/releases
-    version = "20190615";
-    sha256 = "1bdvj363yjn7agqq1fxdfz31j1rrs2wc02v874jjx5sw1bfq5qsa";
+    version = "20190912";
+    sha256 = "08my9crgpj5ai77bm64v99x4kmdb9dl8fw14581n69id449v7gzv";
     owner = "Winetricks";
     repo = "winetricks";
     rev = version;
-- 
GitLab


From 82428b32b99ebef0acb072b385627bc5dd61eb5e Mon Sep 17 00:00:00 2001
From: Tadeo Kondrak <me@tadeo.ca>
Date: Sat, 14 Sep 2019 03:04:52 -0600
Subject: [PATCH 0218/2254] wine{Unstable,Staging}: 4.14 -> 4.16

---
 pkgs/misc/emulators/wine/sources.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index 501d2bde04c..7b26bf44cdc 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -39,16 +39,16 @@ in rec {
 
   unstable = fetchurl rec {
     # NOTE: Don't forget to change the SHA256 for staging as well.
-    version = "4.14";
+    version = "4.16";
     url = "https://dl.winehq.org/wine/source/4.x/wine-${version}.tar.xz";
-    sha256 = "1rl1a3k5sr0hyxc61d68kwandhxcnxwv6b77vh7x2rkl1h4nxmfs";
+    sha256 = "17qxbddv23ibbayw1ai984m0dlq63cgplms2jhsc09incjhafywd";
     inherit (stable) mono gecko32 gecko64;
   };
 
   staging = fetchFromGitHub rec {
     # https://github.com/wine-staging/wine-staging/releases
     inherit (unstable) version;
-    sha256 = "1s17hcrp1aa0v99y5iav2s0lxdx2rzgm7z0c4zhxyydqxj399f5j";
+    sha256 = "0zkvwl6rxr6xcqk4a3h43cak67w6bcyqqnajz6azif07ir3z1c61";
     owner = "wine-staging";
     repo = "wine-staging";
     rev = "v${version}";
-- 
GitLab


From 80e0666515c32c8f3b116b96f3f1adb921842e33 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Sat, 14 Sep 2019 18:26:15 +0900
Subject: [PATCH 0219/2254] thunderbird-bin: 68.0 -> 68.1.0

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

diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
index d8f5e58d9fe..2de09fc73f4 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
@@ -1,615 +1,615 @@
 {
-  version = "68.0";
+  version = "68.1.0";
   sources = [
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/ar/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/ar/thunderbird-68.1.0.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "4fad3c7c4099f70253bfee450bcefe458bec61430720fcadde1fe8a1cbb2e62a18d9c55943f850c57f8d788c973774e24590823086cfacbbb2ccd8a99ce4faae";
+      sha512 = "b9bb22bdbe013358c03e804e3c51ad387dca503b9e0074db70494eb3f331d72bd8679db929972e75b39f2464d384753bcab9947d1a843a69167d7b3706952c35";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/ast/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/ast/thunderbird-68.1.0.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "aac850773381d7fdb4d50fafe670449301f073f7388f92a1ca38d9b7256ffcd244b63e9fc0ff2f8ef5ccd853b97016b7e05eb751be1bdc8df9623481f15d55e6";
+      sha512 = "e00382241343bbd8a86e31dfcf5bbb060b46e5db6211cfa54c7192361353e2c4fe3d0ad3f4e0319ec1a0dc1f4590b7bc0271e5658bc468986d8e27a64d9924da";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/be/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/be/thunderbird-68.1.0.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "6521d818984bbfba195e847735c1228ff637d3079cff1f5a461ac20a079d325adfc1d7b2eca54f63e584a5cbd2007cef42a625597276a1810158931335f09cd9";
+      sha512 = "f043c8aa5dac0d5e2f9da628d6659f654cc39726677424e4b5e5005e97bf202575f569ebdee346d37cc8d4d59da188e6cfe1bd6bf7df1acafe26b489242b4a9f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/bg/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/bg/thunderbird-68.1.0.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "a0a738b6877225a5b98691d53a8f4a4bf575472a0d5feb8b77a67cd1fc9951772f1ab507b7ba460c0b62b87ab476c5c94130cbe7275692e3a99e5d2ef0bd89bd";
+      sha512 = "61fcf864145fb4fd4a05bff47bd23a7be8444f9d067eec246399c3a7ce48db8744ba4a9cb42e28a215a5bb1b336a57c51d1a32e6564f42c8b9fd4dba5f629d9f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/br/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/br/thunderbird-68.1.0.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "58d21d9e55abed644eb16ba98a5fb3277e0a31b935d279b09745262952895c2c2aed31817e6157410137ff82fc5d242b64268f646c3b7b691c55c5f3ea36e0e6";
+      sha512 = "1cdc9b2a8ee82bb087a51ac013644ff3da5f1e161fca23fb24feae8076cef6c5aff5316f83a8ecfa4f08c3a8642501a333d3ef95b46b8f899ce78b79d027af4c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/ca/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/ca/thunderbird-68.1.0.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "cd401259f2cc4ec71ff9d936a1f2f64a064afafed2e305bb359f79eddf1159cd6a7c84ce54cde6be94f6acd295dbedf54017d9f4592ee3637eea00496c7cfbf1";
+      sha512 = "1b73ca87f3067ec2a84990c7c58060b11286dd653f4b8b4c18a44f5540ea195d25f995539de39b6e1de6cbbe54c890bf30f6d88157e000e30c69f4d32a4ae8f0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/cak/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/cak/thunderbird-68.1.0.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "45ea4af30ff93500d1671c6a0eeda993692b7204a7504a91ad30bfd5155add5af902205240fd62f80abe339224e686473f2d13f466ba96269347207ed3f628b5";
+      sha512 = "1b2ec85786a842c7554f52b1ff72c4e5611a76bca94c4b8e9a79604d6b85d7f2deba906bbeca355dfd0c5a6c241d9bd397f4e0dfebd802cdb0c35162a02fd879";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/cs/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/cs/thunderbird-68.1.0.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "9f81f92a3b1710d006cda79f1b92923c1ea637a24654bd622af9be1f53a0024c5daa77619443514c9e607cb62f96403f5b7f426b3692227c0b56d1b14f51ca97";
+      sha512 = "69df6542c5037815d3a80be764eaa809dd351f75417e4362a258df5e17e36aef6d8f8653429f4218f196ff096252e0304c2cca1cccbf8693d119bc05f1072067";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/cy/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/cy/thunderbird-68.1.0.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "c90467a78bc82667d974b1e94227b7d4185878654188967d97c11e419ec7a03e4e5e3636466a0b6d35beaa98b717a26341e3a652c3b21083ad8ad0b23f063ed1";
+      sha512 = "5dc63d2746475f0045f7749e45bbc3f755b187521b0ca877ffab9386bb1bbe9b4fd66f9cc6bdac516ba591e71d71f02a75b5c965a610a3efbee3b59815d8deda";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/da/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/da/thunderbird-68.1.0.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "f49bd5689d2a4dd311b22a23da9f26559685f1c4663eb1e482b45b79544ab4401a17701f33b6ad083e7a8983185fcb16fca4c8026138f24be495c6cbb6401488";
+      sha512 = "89427a2b66dbd71cdfbb299a14ce7ed61ab4836e473854ea8b2ec522de64870f8886f6ae86428c9b1c86733aaa4ac7c732a708fccdd70d3e112d2f651c0dc762";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/de/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/de/thunderbird-68.1.0.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "579d979cfa0bbe50fd0bbf0d15b38d90579bc065b488a2e9d4e3f18f505e71c50225d92185559578146097110760ed3807e1aefad4862d99e247447478d6bc42";
+      sha512 = "34130ec994f6ee6a407313ccc61d43b0375046f59f75d4fb619776d5c880993802c16a3b8ec28dc7053b4ae89f91f1c2046da7d884d150aa7c3b65edd1650b21";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/dsb/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/dsb/thunderbird-68.1.0.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "8d16bf47d368a670cadb6a2655933d5b49a796272f7dafd948cac95a2ae541561a38fa418cd4ed0c4aa79ef63a441ee769eeb2a071734abf2cc1ba243d4f3ba5";
+      sha512 = "0b9c02a1e31f8f3120fb9ed520c53505dc247440ba2e189cbc58569be5ce6e0c33de220ebda17754338aa680cf5c8aac3ad7f5da14e0cbefc29f32db2446618a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/el/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/el/thunderbird-68.1.0.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "579b9114af9fda86e79e6812946da858945e2034ed2f00e4244724ecdd680b7db5601a4d573b530dc15207caac9245f6883343684eb43f3ae2abb64853c0b54f";
+      sha512 = "1d8e2efc2c9a7375a2ce0f2137165756800a680209d18612420581963f13774fc7780ac0ccda24a485996531d1e82e027b42a671f1c8fce5e8ccf0887f72ac6f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/en-GB/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/en-GB/thunderbird-68.1.0.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "f7caed8c3b49714e4449ef971ed1a21e40f28625c84e9342f63e5f73743689ee2c0e9ed4845f6667bd22732c62bd707db425f22a5c074dff8622cc4536ba9c29";
+      sha512 = "79684a833afe5d1025088d6f91e023c81832e9df83751926c5d9bc05fecb7f53d6efd096f55d65d45fa07309497cf5bed2e3b00cc4a80cc1e4ed2a0fe44d02a8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/en-US/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/en-US/thunderbird-68.1.0.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "257528761f0eca38528ded4b31329886093418f562aa2fac73b3a5bedda51fe80b34758c10afae1735cf37b37a86413dcf08642aecb1e8bea1fb6b0b94ade5c7";
+      sha512 = "7a29cf0a238e44a2051b53e5476bc8f622dffd088251b66d951ad6874fba5fba180f440c80c7d5ae154c688d3e29fcc6c889f0031d81a018b7fd1dfd53f112a5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/es-AR/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/es-AR/thunderbird-68.1.0.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "70a10e329b1031a2fd2ffb2b60459f0238ff3f5e5d80533f4be6cb22ae77692ec079ca3e146bd9a59edd09c266cec92d922a18ba45f8626a4bd44e290d3c0927";
+      sha512 = "d9d62f94af40ba69240b792b3ef2d93efef20b01b4289e992f7d1192147029574f86fa21aed5ad54489d1e5ec1f3b80cd9601e71e2ba9c903582ccd7aed278a8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/es-ES/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/es-ES/thunderbird-68.1.0.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "a03098ad7d83b86cd316c56b69589370fb8bad041b93f90f61514b04e3d0e78385f779ed715c6e22e45597d1bf03676046cbc1eae7896bb2a309af3683c8bd1e";
+      sha512 = "d720320494b2c8431004e0d1ac24ff8fef83bc0977f44653d0fdab99fbc9a1aee6d5aecd7cbf6002e3746d04156f47aeb57367f2b30f4690efba36c3297fbeb0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/et/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/et/thunderbird-68.1.0.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "44efeaf030580dd7b55770627678808e34d689e85191852c2e5fcb223a0fdd0e5386f21f03524d0983aeded7f8ed99382ff2c372c8c5a1fdfe218bd5b10ccd80";
+      sha512 = "8d9ba13604fab4eb9a3dec8894b04d52f9677d5f82695512680ff03740a66e96786f69476071741c8086a09070fd03786e8fae7f94bb3bec9075331fe4dc144b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/eu/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/eu/thunderbird-68.1.0.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "c670be5932d7e8bea28cffda7c119cfdfd5823f76b2c97251ec23ec16e420a8b7feb5f2251d89750b956d3bf3baff5d17393c05d8c265d0a98cc3faea8f85735";
+      sha512 = "e40110a94b3d7fb42707287dc695ea09b082fa3262d05b39a0c09002c32722630711f1b0131441c919b23130ed133338239060726cfc9d6c0b49822558081313";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/fi/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/fi/thunderbird-68.1.0.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "36aa0b47e9b5d91fbc812a3d63503924a8ca227d7b7084c1159419092b17da9c1b6e89fa046c636dbcff7776f9a1d8465e660b47f1753505f0d2eb85da9c3a7a";
+      sha512 = "d8778ddba26f544a4721b9118ce5726b04fdf09758272b35ca16c14aea61d0b8271888344e742feb4d4e758182e97b01758acd53ad622a66117e3eb0d4a6d336";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/fr/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/fr/thunderbird-68.1.0.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "b1e7d345d3dd38725227b5e09c4f3cfcf29ed3a98b0580fbf6ae1ecab4414d09e307423495b75769a8d2ee3ab4700cd6eba3d95ce05612e1d8290d3f5a3ba988";
+      sha512 = "2cd546d40bedf09b58703b0b11a5c9349d702540ae714942e0152a19cbecee51f37c7e217fadfc719ecfebf914f9ffad6b3070bb6471d395e8f5ff8ada754551";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/fy-NL/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/fy-NL/thunderbird-68.1.0.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "4065a083f49006dacf64f084c1bf26c4c1b8d53bca7eba7a56d66bb035eaae2c4528687c5c1e2213f92adbba17ff92eb54f897d3b0ef6d27b8effbee66ca555b";
+      sha512 = "03f52224f145917f64e8962b68bcf3810543b5bf0508dca7965c5a385c4f87bc7d236dac217594fdd2a10afe31da8aadc674eaf7b226e189b598011a8b9e223a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/ga-IE/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/ga-IE/thunderbird-68.1.0.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "2ae9a0860513e90d1742e5c17220b2367e61273eba04738cd29e9ab497b86f9a1d78b38b21da84b1f214f3368ee114d376b05eabe0aac9a1ec07ca6a4b399070";
+      sha512 = "931257466ce7134b9852c2627f34efebc031b3dfc9fb7b5e344665da7fa52ac1fcd12a8848fd9a264a900e98ee3383d3ee6c251de58c1432127a8ce8f1c100e1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/gd/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/gd/thunderbird-68.1.0.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "d2315aca9d8e5bb35b21cab46a48e51f09200b056da2682201c32eb4fd3d0379a24a6926ebcf11e9c70d70fd20152fc24d5197a78cdb3c8ea3cc2399d784b463";
+      sha512 = "ee3573fe9af5fae39aa053061ef82207ae6669e6764637f6ddef5f8ee3cebf362dfecf5cf5e9e208392f3fe79a0c1a56aba28f372e2e279b33a1f1e3a58851f3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/gl/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/gl/thunderbird-68.1.0.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "52d9210e857c1b6cb665a2ffa71cfa5e67c3718b210e2b4b42839d8f25987170f1603fa55d324003a4be821ba74093ff92d632e688e44b87ebf51dafd02f69a2";
+      sha512 = "73ba3965d522aac8f9d5af87856a7e2f71cb7ed850f240be56eab9426f91e5356810a12da7cb91bc223cb14eeae3ecb89a2afeca48641ce4debefdaed05aeed6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/he/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/he/thunderbird-68.1.0.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "e7b5a16950be233fe8a49152184270a901bdb4bcc14769401d4b5a21fd2a3ab9d395ed8f6b61081330386723725252fceff09bf9fdde3a71135a98d8ae45089b";
+      sha512 = "abd4f47d571037c4340dd3118a517f3421a3e3597efa1ad7ab14cf537d4b4e226144beb0a6c54a45ec272ab428ee8ed95083d31554ef2aa0022712dd832a1585";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/hr/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/hr/thunderbird-68.1.0.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "1ed224dc0864009edc6389f9b3b063f56b15be982c2e2915f1a2f773bfc78e6b81ec0ab02e03f7ade08f47260be597003f8119116576f4fe5dd490e85cd3d4ab";
+      sha512 = "32a18d8666fc2b7566807a010d94bf5503b375c5330687aa58efc2bc6464e4f910947ea513a6ebb6b7eadef0e552138a5349583e6894b3166ef6f8d53d5cf67b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/hsb/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/hsb/thunderbird-68.1.0.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "f4bcd8a199bafd544687b1e890694dac2b598d4fd79818ab19441ae9be579a9928fd8c7fbae43e322fced15ff39314fbc88be94ce2fe12b5d2ec2ba003a219a3";
+      sha512 = "58794aecdb5f3824e94f2bde4e4080d4922648bac632cfdffbc5304329af64f9e5ef01fc587c4e19e88f206004cc4254503513d7bfddecdb6778de89e4ca6bc5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/hu/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/hu/thunderbird-68.1.0.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "28223aec237fce2f07b0c3b454a8339bbd2f195d6e263c5a5723e04bd5df1128d58a6bc6c7275cdbeefd5161a405a2d6340303faa79d9330abd0e70de9facbfb";
+      sha512 = "c7881770fc75a6b1eecc5c481e2de134a241b7a497e19ff2abf08aaecf65006f054090a53b028202becf7776d3939742fa71156e6761f981ff7a00ca0d1d7d3f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/hy-AM/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/hy-AM/thunderbird-68.1.0.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "d7dea23905f8bc8dfde92082f90278b76477eb3036c7fc4abe656e37af9d389d37f3b166492df210eeab03750d85cbcaf1340aaa26ab723ca1b70299b4a64ab6";
+      sha512 = "80f5fd19da8e07a6d40c19c645eb8fd6964f9904cd14df36374170c4d395146d168728953d1619965f04b3f2295df3d379650e97f8320587816ee088e2f17a9e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/id/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/id/thunderbird-68.1.0.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "f55ad81a1dc80838a9ab045899e0f16bb077d05d73119705f820f6fe8c8c7a550e05cc68cb7ca0aa8861cbd70bc9f061ba51a4749db6c37d90e7e7bda5dcccdf";
+      sha512 = "efffdd32086ca57e93b1ebcb40484a3c2243d6b088c70d7b20bcdb38925e7fb64be4446c98980a53738f54dadb54a2d17016adc69bd2a47a9719bb7bb982f729";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/is/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/is/thunderbird-68.1.0.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "503c236102a15428e41a21b458ecc29986abff4e434f4e26ec9741b2facf39a8fc2ae9dff5aeb32fe3c9ca0dcb6e914a2acf229ae9caecdc4f064380f126ecf7";
+      sha512 = "277d1137675c6304b28f43273c5a3fbcdf0d2188cbaa38911d784df98b3429eb6d2667b818a292e4c3bd4019b2b682463c2d01faa0a034cb4fc1dd49ba8aab33";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/it/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/it/thunderbird-68.1.0.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "51a736932baa5c810a29de46eba64b0fcd2703da38ba9449b6b06a9412562e80853367416c5b4d6c6834eb7a2186f434e426099ede56d9342860e4f3561455eb";
+      sha512 = "6932697d769f98dcd32f3dcda57dfa154314e29bfd2c1b11a2b9a8aeb8395f00fdb0d1c71b8e9d405d1540cde21547a910a55024b799e270759d8638a3d11512";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/ja/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/ja/thunderbird-68.1.0.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "7a00080835155d301f65a35684d81f8e3a3be23d927d939da84a2a887057bca0b75d5b580a004b4f797af504a6812f71951bc3c75ccb24dad60b6cca770cc7a1";
+      sha512 = "034021e89c471429367807f04d79dbe877d0ebc94f584fa6c0bec3a29f279f1d6dfc85f709b26e9d11c8ebcc1f42adb9a458137c032a73ae2b69f7238d31ce76";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/ka/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/ka/thunderbird-68.1.0.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "eaf67c64275495fcb08aca63953406cd7815ec356ee0a1edca8a5e8dacd924a9c11e35dbe4ad17a1617199a5f66489bb553a7a5177eb629223b49a9adccff803";
+      sha512 = "7af1caeda9babac2a4c9b456233e86be32bcd14b6dd81cc18a1874dafe86c5b80099d0ce388a70fe6e74bb7b0d00d3b7ce810ffcbae143eadf6d8c4367567c27";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/kab/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/kab/thunderbird-68.1.0.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "9432bbba0965b6da04495b79ef4db3bdbe69476b20650b4d6407d921cf07d09950368f0c13211ea6743b621d486bf71dce0e60d8ceefd82b48a8f2581a3fd7ee";
+      sha512 = "d8e7e7d423f36d40ce05cf1378278c47049fca0ba415466028dd821b12970fb78fbadfbb7b7390ec446aede490f07f979b94ef890a43a710e3a1f66a0c68937a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/kk/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/kk/thunderbird-68.1.0.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "9bfb99694bcf1227162607e2b674abb00343e4da3876999430d6014cbd4f4aa6c6e9ddca7c7f3b144d101c1a5a6d38772e3750f5feb41d1f304b89a8c1e6ec15";
+      sha512 = "339c8e86693a34c8a2da5e47924e545f0fa55d5314db73c6bb23df3eabed29dd6cf47662a8c4e43c381ede5098aba72887739993b4e71db75e41de3d1d777c3a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/ko/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/ko/thunderbird-68.1.0.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "fd260740ccd74afae7af664775954acfd176b47176f48b5300f11bd77bc31205d0bbc2d06a701486e9742ffb38ad4aa2b253041b9d9518a4b9c7dbbe41aca264";
+      sha512 = "ba80df01778f8fa95dd32bf0af55afe7fa828a489c4682e6a8891636281031170b9fff77ae4f2e4bbaae9124946b0429e55bbed741973d80da868d94e29991e8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/lt/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/lt/thunderbird-68.1.0.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "fb7a7b6d0c7d58d13b3ec20c8176ee793cac5c53bf849e3b3c4aaeff0f3e897cc35e61a9dfa4055c691fd56f280f7b31e04999922c29ecc89294ea6eeac16cd3";
+      sha512 = "32e93ec3203b70c2dced59a376bf7379879b5361f55a396d533e1f10727482b357344c9890864279eff9aa6d75feb1b36a67f2293c51d3a3222183f62c51e477";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/ms/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/ms/thunderbird-68.1.0.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "7490a8169079569143c63f85e7da299d28ea423fb95265e2e86ec724ff0da641e24a2e9ea612d180d523973522f40c250bfd56e66ee39b28cb9acf57f6be6831";
+      sha512 = "29190352e1bbfe30b1e98d2a7fa20268488d82aefbdb4de1f8c2e197ed9f196be8256050f48d71ec6475b707d93d0570002fb175cd88fac89aca5e7140a7cbfe";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/nb-NO/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/nb-NO/thunderbird-68.1.0.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "7256820ea97851319e51616f6eb45617983e76e74b46ae62a02e22d13e2dd6abd590fd265aa6c88ac14b2f0276219580b6b9fbd956f1eaa38e6a93329b9c9621";
+      sha512 = "8e076d0967b0b79ac2cc9ade63e1bea4d27db1c050f792f1d1da01758a576fad884fdda32a02d58d45cf4c615f38c44bebc80c6e864ee076212f280398602892";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/nl/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/nl/thunderbird-68.1.0.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "00f32145c861abd8f151d7840d0f01eb9d4190df65e5a179f999f3149477f2de7f796782eb7ef912fcbec005d65c76974185d1c0105dea862cbc22c821bc906d";
+      sha512 = "7bee338542f949d86700d9b67d26c059232ba96cba991e491e6380f1ef914e7ee2747c9c73907e393bcc83c7f05ec6e656d869980c2c03ba0a548ae120793030";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/nn-NO/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/nn-NO/thunderbird-68.1.0.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "3ac255b5bb4b352833fd56d5aceaba6d0ada571630a993729970ae99d5067f05ba22e6ef50fa7dd099c0eb5874f11aeed32718c56a80538e28b401ee6b7900a2";
+      sha512 = "33b67ce4100a61461a238189e06b623a067e5f1b550fe5f20b5686f597408f3d7eaf45c92bbf5ffe58ff96c99fac9b9e282b024e40829d4d9d4422e54cb7293b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/pl/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/pl/thunderbird-68.1.0.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "19ab4bde9314dbed1bca7565698a7b1231767ef9cc792a49e7e9d679453ae8209e6f68c63ea0a24bd9e3a97328dceeedd109bfe28038108b52b9dad366f28787";
+      sha512 = "860c606fffb3ae85193b4c919783c94ea1a84c2579316cef98adc247d7d595b01dc6c2e84662641c7285dfc65097f710d7d2605efd960847739ab4acfc296836";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/pt-BR/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/pt-BR/thunderbird-68.1.0.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "68e28b657b885e7823dca0d091f2609556d560a50b5e6c285cdf467ae2b09743406baa2e544f17997519c219e0d4e8911115d30e7b0c35f09b956e28b311f8d8";
+      sha512 = "3093207072a79d9556c4e1ca2fa75d990a3952d583f0a4fe8c850a4911b1af19e3ac08a357d239d66b22c397f6722b8625fee03ca1f2b6a8f21dc61fca348541";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/pt-PT/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/pt-PT/thunderbird-68.1.0.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "41623568d2e78b821a89480836f8d8c739f6983b80ce26017d12fd9363016158fa6c629e030f63aba6e730e554b7717fd2ee58e0246aa82b46fe55d5d6be9933";
+      sha512 = "5d29ed9a8e8c768a3749801dc191b27aecf7994a4afa02e70de823ed1eabe4e936bd7686830359aa48321681396aff29ead762ab28c7bda6f8aec36117e8cadc";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/rm/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/rm/thunderbird-68.1.0.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "a2cabac0ff5e3bb4a8dde4e884ba4647792e0935ef0a61b56470c67d3ba9c2310a07c2d2da51f7b4cb5fc3e841dd385a2c64ff29d263333a91e2044a4ad3190e";
+      sha512 = "cf342acfbb9ab92b7bf483ad3227730dc3923ee107ae42a0fb05c6070256e43a4d3c1647c1fa2c4dec7adbc8c018a185bd3d91e598d09eac43ec679d3c25063b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/ro/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/ro/thunderbird-68.1.0.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "2e9da10d1f88352687175fa48fb70f8a73cf3ab1d84958a79c4a46526b3640e264d98611806bb234f579d616fe7d1dbb2d4c6ba55a389363034f85a97283bb64";
+      sha512 = "ae13fc229198a5c5327dd4d9d948f1a5eaf699877c48c1c961ca084e79075f479f4b270fed1c9ce22f420fecd4332a30594d4d2dc87bb114d1e3518e3a4a7071";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/ru/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/ru/thunderbird-68.1.0.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "5f4bd3d3657479446ff070cfdb33e16a527c6f1615f37fb4c4e32c12b89c62d5649fa5c3d826723be47fa9795575bd33ccf37c2aebb555c218aba8f9d68ec3a9";
+      sha512 = "f51b1f99c16af5f24702f0bfd433c71c7ae899ded5f101aea2dcdc16f1cc9e1b7b18f26a4fd0ca9296c5e9007067e35bd9cc322bddfe07f58795147547fc0c56";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/si/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/si/thunderbird-68.1.0.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "b47d2aea81327089445c9f57a1508406c534907c7b574006886828846e6deaab04e35de2781d55d882f05c0a89f65fa7c386547d6581064af4fc3bf4e879e379";
+      sha512 = "26bc664b1623523d644ee231666a4489421ba31d1f0b52b5f4a4164343672333070c3781c577e370e7d97d42b61783077c74d1f38d37565776c752a2310c3a1c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/sk/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/sk/thunderbird-68.1.0.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "4295204bb89789704da6830d33e92a77df165737c291c74a94fa532309c89505fb796151e0855b4e0bad8658fecaadc9978580ac72e2a2f24a4022909bb64aa2";
+      sha512 = "46470afe078d1ef2e48b3732fdc02ff3c9104a727b4d94cae1b9c54f6d2b4771e5784cfb3e6350ab8a205f8ba010a82a2b2fe92313eb351496a19a99df75179a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/sl/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/sl/thunderbird-68.1.0.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "598fe5bd04e04a73db04eb630e02dd7cc7af34d0381e6877626c8885bc4b879e1f35362afb8cfeb1bbafffc5b7ea14c8efe9b35b5e30056d04fa0126b8663679";
+      sha512 = "9bb5b0c979fede4dfdaf8f4965bfed1ad78d14168efb797fc216ac2527434047c3e6b65eb9dd1e607f55b22f6f28e49b0ff58c272c0708cf5ae1f9ce96b2c796";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/sq/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/sq/thunderbird-68.1.0.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "0b657daedc98db51179cebf547d5f278d2d632bdb552878b4af29427ab8fad62f8d6c1ab2c3a38cbd8e67b670d6d613bdb1d4f535a0c69d0d1ca607d0b10bd43";
+      sha512 = "440870b75e47aa277c5453bd997709d2f9e59e0aa86e2fa7f5aa95ad39b139d8e9b7b8a7dd44765d8f8d5ec18c5ce6a284ab40d4aca01b251bcd9e2183be4976";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/sr/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/sr/thunderbird-68.1.0.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "10efa11b9c9ba56142c8a321a25a7e875f3d02fd17f73bd3061ffc71823aeb1269f9a864aae88a4fc434d1c4a01d227c0be605ffa7f4ef6421db98c0141c839e";
+      sha512 = "bced610dbc95e7cab982f40376fb7cce8e672f8533a66816f01667ba69d73dfcb00e95a80b42273c1ec7ada9cef8c14af1c426cda2f8425e3f77a3a0e393a611";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/sv-SE/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/sv-SE/thunderbird-68.1.0.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "c77d10b35edef7e59f4e6c48cd4352c4fb7d05b0140aba12be42b3e3a3df609ebc86f2f5a3993fa172ec0ac118726314bc9042335101241637481a2e1a4d1c00";
+      sha512 = "af139912f563710b05c274d1b89012e27a3997b582d379e3561011fed7c77994447c3054433e0fd4b5db8417d5b43b63e840d313cef1fc7a8aa7baf0655982e1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/tr/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/tr/thunderbird-68.1.0.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "3d52693efb05379802d62fb9e40c4b1856b45ee948032634d4c4bde7bbae67327f963e0f1096fd5d7a15d4341af1ecf3d9ee96eed45146859d8e8e5d403d660a";
+      sha512 = "50693e4638f8fea5a7f609924ef65c8d7ea4f4ffff79320651481e1a7f5cdf69edc2fd987137a0d655077959cbd8f32218d2f78fd55790084e2d46d3ecd70cf6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/uk/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/uk/thunderbird-68.1.0.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "c09734ab8e6428c6ed270887a0add934a7058d5e9c895864b1128e0fd39d57e13789bab38cafaf7cdbac1a71c8884407698c4bdfcf48aeec6604a457ed57c48d";
+      sha512 = "c24943567c110ce8cff6da066d0bd0081621d8c397e6569c57b63eef3098963a55215083aa655fa9c98adf9babfcedecfd72204c1a68604c851e1a5c1a1b0102";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/uz/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/uz/thunderbird-68.1.0.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "083a83ae3c6083934fbe49f1e65ceadc5b5459f0f29ae0df9901b6d9b29d0a105cbde94357c1ee0a9677ec923fd1d419c618db0e843cdf320c087108990b89ec";
+      sha512 = "e02a86c848a013a84824246db3e29e889e1f5cc1b743a3a9b567b914a46100a808779fc13b897b04e8c698e14cf474fcea907e25e937e5c8b4ccb997f06d8e85";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/vi/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/vi/thunderbird-68.1.0.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "6ba1573c9a170d1d827b6d17941c25e3852f7b66be2eaf7a3e9ab02278f19a38b801d7b9b0c266dc4f38f1190f9c83990eaa51f4734ddb38f43ea3e1bd23b72b";
+      sha512 = "de6d6794796f5b60cfffa9eee92906237fd692b21ffc3925c7866ea9660d26366f5fd3c847b2dfecc418b631c6241dad4e509e58e391c414a37587c6185c2655";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/zh-CN/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/zh-CN/thunderbird-68.1.0.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "74ee429901cb520d07361a4b621c9be06253cf93300f0f91e3633d3b375e4e9a6a58823d4bbfed60519734ca5705f2cd0da4bdc7db0f578ec300f1d705e9b7b1";
+      sha512 = "d5835538fe615544a07e93a2088b65eae6c3c36b75ca2b9f6605974d929a36dd226d848e2394611809538106f56c1703ebedb5c0776593e998935bd322a4e27d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/zh-TW/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/zh-TW/thunderbird-68.1.0.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "d720029e0720fa972d694712a85bdae94b1ff51213c4e56b84dff6d293a2a9831f5cd4efeb44070010eba1486b9358929f64546ce7ebb7cee29a7bcd4a1cd650";
+      sha512 = "9dfaa7dc83725fa795cf1b2e45e7af760dc6c38999b05a0968e46d4b5676a4b9f705ebb63ff400ec6600d83a6be26eb4c2638671a539b59b6ea37002ea9b97ac";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/ar/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/ar/thunderbird-68.1.0.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "823b3cf50f8d23d1d0ba8583d2b10146e2eb0ff4a9401527557fae8e8db997ecc66d0bf5a091323bbd37dd6222bacb73fb9818de8740963b929a8893e4ec9391";
+      sha512 = "17733249e5c2c33899fde89a5b2dea2592fe0414419c235f4d853917990a05664d52a05f1f1a290ece4bdb3646008b0aa0af1e495e5b8af0c08f5b9962bed5aa";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/ast/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/ast/thunderbird-68.1.0.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "f0087ab3189e8fd194d2ef6d5d2f9c3e14d592d5217a8fea19ba5189e806f9d484332f9d342a15549651a75bcfa673f21cd7666265fc185ec58c814814902ec4";
+      sha512 = "95b40d08b988146db7175232c9d9be92175cc3fdd73ba5e205e6543dbdb9e6e33579edeec73b6961a7ace574d3466c162d0665ffbd3705de15b7ea4cf6d7b77d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/be/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/be/thunderbird-68.1.0.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "edb358214e93142d73c92ab3dcf6240cd08614c2d0e9ea506492023be46d7b7f6273dc767ae034762c052db3b0a093dd027187afb272b2a55fc3126b06ffb78a";
+      sha512 = "d2f4ad38d81306c1637ae8612221bb462409373b3cfa70a08d0f2872aceccd8087835eccc014f4009680e9e36b6cfecc9bcb95328dcb8f6c9ef11c432e2d3c6f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/bg/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/bg/thunderbird-68.1.0.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "f3268fced7a81b5046332f975906ac79b8ab5ac888dc1c81085dd7cd1b1a414988208d426bd305f67cbd913c58de857c844809ae6e6ab5a2a520d7d6b149b731";
+      sha512 = "f2c74a0609eff929202d13719fce167577b2ae0e1a0c98b75b359bfcddcb531907a466e184ece24d904bd592ab41654f2dcc2500defece0aede3be3826dcc8eb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/br/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/br/thunderbird-68.1.0.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "c1be2ec4d4e64a2a9b32b974eecd182ad9d1fa23b775769e8535e742479ed6be2a222272d7c5b141393f0c752d4af704758912bbac1c17f445b3bf277c12eb9a";
+      sha512 = "1f1ff89743c398443a18230ec0eadeb51a8d57633bb7c242f7003e472b0ea206dde50a9d20880ddfbc9ee36a3ca28135662ed21d6e8cb779627120c70f0aedea";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/ca/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/ca/thunderbird-68.1.0.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "ac0c2508b89812ba63d0bb770adc2292127243fe31bf140a4ab88c953750fc2f699c5ed2afb9a400cec48dc14d927b08dc96d5b110e2f2d90e81d1532ba9d916";
+      sha512 = "608232b5bc7a93cd786d84662e59e3b186bb1de51cbe0f720cf4e80e65a93e09a24f06abfba63785c0cdba997a6fa871497998f1953f57a98ea6b9e224235ffe";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/cak/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/cak/thunderbird-68.1.0.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "4d73beb37469131b7e7747c85a73027e1eaf008100eee21e27d36b4736ffdb4cc3ca3606726e36033de64504f058ec9d4193797a09c2a591675636a5c00fc890";
+      sha512 = "5e77fc07093e5b2cbb345f21b48415a5c7d987ab0a82540f398ef33c7051f1917fb448fe23401ec3683c87379aeecb287be5ffcf6a124df9a464401f242d1e3c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/cs/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/cs/thunderbird-68.1.0.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "635ec13ec9fd688ccb9c690ccb4d64228f1f47755ce24c4806f5f47655af1279b9ee758fe15c0fcbd43c830edf66383bfa3d84d35137209a4af41aa59565f554";
+      sha512 = "036304985db3ecccbe50a9b3d8c19dcc269f7c6987c1101c9443ea5fb2d14e71390ccdf6f0000c972af631863398a02cba1c05566c6be4ab3e79396c049e0e16";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/cy/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/cy/thunderbird-68.1.0.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "afb546562f92c93639a407598d9c6654b64776cb68db7ddb07c0d17f83d122d9e7bb974238ee5cdb90876bca3ea30356cc5eef28b11ccf082ef72c0343dc42d0";
+      sha512 = "4de3a065234e921f9ae7250409ba24bc54230af61b4993c3686a77e1e165874995f7c60b45ab136c6b3f3047461e86c19207952b870019df06dd164054b65dc2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/da/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/da/thunderbird-68.1.0.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "f7b7d183312d11d02200890afe4e81c793b658729119d9f81ac2ca58714244ece9d64d1b9d9f34c79f1d00b574e24192ce066debf873c4b740c35208cfaec16e";
+      sha512 = "69e190f9263438c88b445821b56b93c052613fd67a1f1918b135c719e4358bea46d3a79bc135d50b254fa686d8cba013daf89d40ccc5212062cb177bdab4d667";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/de/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/de/thunderbird-68.1.0.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "e6b3ba227c8e84273e6dadcb59d6691187512666efcb63244740a56273c5b765c65d21607e4f07a508e5e63ed0812162ad767fcb1140b89b2c155da945586179";
+      sha512 = "ce4cf8c1e11f4813ce173bd08ceed9ef26b2117771ca87ef16c001e1a49f5385a6a3ecf4bf7561d48aa6c7e63d307c2fbde77ef8a51fa0aa9b66f4f98386bff3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/dsb/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/dsb/thunderbird-68.1.0.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "84d39965568de9c87c280beb43330aec4ba6cdebf59a9c4f566b6bc01fbe15cc3987e87d9c24a9e746283cc54ec1ebaaff99952de7ff0aa9b6f05f36b1295d09";
+      sha512 = "9007c92825220ff9685c599b1c6e39fe3e96888621ce5dd15f5ef9d812c09a29ef72a6eb2f68cd8eab78b5519b6c26cc957ed04f3c9798ea0305fa4f5c8bb962";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/el/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/el/thunderbird-68.1.0.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "0942b5c8c7ee792d264824c6837d5857679feae9073fd2451b92dc0f31290360a24f7cd708e550955e798d2decb9f0c3a21dc8ba7bb5f226ba8ba9f502ef870f";
+      sha512 = "e619576813260ec68a26226a83a540c58aea7e87d3b0ca35f6ae7bd9e0dcaaf54ab12f57cebf669060191e3affc42df1585a3ce4aa18f82f6afe469b85de495c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/en-GB/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/en-GB/thunderbird-68.1.0.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "12fb5086fd012d85f35a41125b7e5ebf37ec34e9215db9b2a4c67f924d3bfa738698ba15bfa2e51f8cbe0d81cdfe5de4bfecd54b0fe6cc7163c753444e56bb9e";
+      sha512 = "0810f25326d8a08628aa55d5c15e6144f833454019087fa20f2c128bbaa4380f9f2a07714b0d8ac0f3fabb5b6065e7b2efe6e80975e5e47e81749da9f4e6be94";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/en-US/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/en-US/thunderbird-68.1.0.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "6004186b0b27165a4d54191a9c2daef34b580c2d97b1e0472e8d8d863e3df51ed56ef17abb7c6944f4da214772780b5c69785b9ad22ca26ba1a8f0390beedc19";
+      sha512 = "adc1dddf36116435b3948810cd9d647febfc97d62443032100b0f2d722913aa051d44244f057c29cb8c6cf494fc67b3044b83ebfd5eacbc36b6cd9c88361078e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/es-AR/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/es-AR/thunderbird-68.1.0.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "6a547a1d0450de1089df18baae81100d3fb9934c963459ec83ae81504e7a1ec7abf595766c84fe8d321f901150a68b7e172888028f3b992b4b6b74ba98ca4efe";
+      sha512 = "a9433a5de45477f432c6906b640909880650443e5e3a65a839e9c055d887befedc8c22c76675700886dc128ad190fa0ecdbbf2c5f18e650219b33a78105eac63";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/es-ES/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/es-ES/thunderbird-68.1.0.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "e1256da3c8938776b11444790f20a68f056f7407f444f0884dfa1c52260309d4adfc64fe95168dd8263e4aea650362ab9fa08930559c7f0e97b3489c172c81fd";
+      sha512 = "a128e46d7d2cce449a261f857a221232d2d89a7d999bc074ad5d1aec741f766516f3882cc2603d6284458208c2ed36dcb81e214039222c9c15450e96e73d0283";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/et/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/et/thunderbird-68.1.0.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "a5d7cd5e3171d44dbf91f067231301940e8a622a6729333512b49bc037022bc2058fa548c044a40b7ebea5d3199402276a34eeec5cb21b2070d7cfd96737def1";
+      sha512 = "521d004b432fd27ed6b167263253b3a3c89aa22ee5e06a4a434da6948a8c2af4fe27e17a1ef962e7caedf7d15ab27b98384545069abfaaf41871cd5878fdbf72";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/eu/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/eu/thunderbird-68.1.0.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "08047c83e28397d265712dbd5a533799b2bba97d90f83b93be8377a544226ea0dff22f5b5e2cd5314c24608825048f3e59c6fc348959d63e1acb81d10d687f46";
+      sha512 = "df8afc11cddf0c06d05bee455833bc5d786789a709baeade7b64e8f815c42f399fca1442a8b64271fea7e45fed4408ee923293cec953e0406b093f0b94120861";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/fi/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/fi/thunderbird-68.1.0.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "ae407ee0dde2be8a8f89979b5dcacebd13fcfa42fddce48773e8f26ffbb503acc6b17a90170a0d72d550400397c17a725f9bf6f65d842f0f281fc58eaf9dbc53";
+      sha512 = "51e05f21e01dfa0fc3c5d0463d80e87a38e50dff612a7632f9a5cd440f037a438a555e3640cdddd794ebe04eb2cc15c549db7ac829c91ac488b73b66808496a9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/fr/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/fr/thunderbird-68.1.0.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "a776215a9ba91de0500cc7fda245afa19a49b51b60089c55444aa452c5aca06cf3b95e66448147cdbc3df063348c28bbde3f3c2a6e19deed26e1b33dec565b25";
+      sha512 = "9448860f48fd93383a24fead6af1102af855270749e817f720e2afac152949e47fcc9ce6fd0d2c60d3dd958c855af47a54a38e85975acf05496a7f67d2af72fa";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/fy-NL/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/fy-NL/thunderbird-68.1.0.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "5302a5709fc4485eff607fd0b5e75f15bb600a14d20661cc4f7280b0bf5c156a40a51045182ff0d31c89d4009c5a516015843ec9fef1fb1134cfa80c511c05ad";
+      sha512 = "e9a27da8b86e2ec3593056a19001dd656b8bde07edc918ec18f266de377c697eb0ea3a10fedb223e58db53ae5970d2b9753b46fa87db938e5568283ba136bd2b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/ga-IE/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/ga-IE/thunderbird-68.1.0.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "4b9cfa317f8ae5accb2c96731bd7fcbaf2eebaaee76bc7383d247cac9db6708b7c4c03d2faf3a6e7e6620b3eb696e9bb3fd18c3dfd1f3ce12e4bc65bb86955ed";
+      sha512 = "b346fe3863ab7944ac33a8204eea7a458a0131c879eae26be66928bed930aa29ba74a5b0e39aa939f0320fb8e5fb0a5e31599235daed526f920b92240763633f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/gd/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/gd/thunderbird-68.1.0.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "8738b93fd18972456158c28d4146ec8548e97339d7b4ff044ace814213d27940b02f9b889b5809525d5bba46a5b3ff4a570c14b3b9a5fe276b4aec515b62055b";
+      sha512 = "e921a3c2720aad333febe7e1d69579eeda4f641fe32c1b6235fb6c01480ab7c87bcb47020b0dc2e4225746b277d8c6b288aaec86125ad48da9fbe3452f30e01a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/gl/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/gl/thunderbird-68.1.0.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "c556343f99d39f6ff41f0b05af606ada89e6b95938886f8d0b1ccd7b77f336ae40a8debb003d2bfc865548c5e9e055859d6d353e169a4f2ee7ada7cb8687cc47";
+      sha512 = "dd581aab660e96d7b0283bacab74d5635610301fbf40e95bc85edb5e177492f2a9c786a4fa722024fd57e2f2158fa339c161fba605ae428b5c03fa983b70d176";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/he/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/he/thunderbird-68.1.0.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "b6eed03bdebfc334c8852a15989c024883b99f600b9aa58f8344976b63f1f9590aa9b78a2a27b081a1e5256443801f01c1f638f1e4f8c0c2a78e695a5e2f590a";
+      sha512 = "2ab68acb57eadab585bedaef3f79369cd7a0c08030d24bc3361a0e08ff796f28f345cae15fbd78bd1fe2c275f8d4fb7058194ef44dcddd3e8f92b69f92482321";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/hr/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/hr/thunderbird-68.1.0.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "aa4527614db13978d03cf07444109dbc63b7788a2cff924b5566c98d9316031f1c0fb74839b5be78030959f85147c1c1e50edca5605b5cbe2ad3bbbb257c24ad";
+      sha512 = "975be725774e200f39b77cbb16ad364fb5d901ef46a85da9f297b61140e5be61cbf48de9f2ea0236d4580a27be97e87c195b92d9286133ac5aac2a35b1b7e5f7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/hsb/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/hsb/thunderbird-68.1.0.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "92b1e17c825a60da17bc9942b689337246f301843637fe420284fe89aad4ab2f30101201330d5319a7e6a2bd87567bf7aa7b35bfbc13b1399ed54973afacf4ec";
+      sha512 = "5d501e9b7a39a518da0a82c1a89f398adaa449753b4dadc6ff8fa610bfc152016e6f70c1a944cc85e72fcaea5aba21a04d5abea2f2e045ca1c9212a37d31c461";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/hu/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/hu/thunderbird-68.1.0.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "5e0c03de66a9098e290fb93545cb46be41d7e91c865cb3fcff9dee7d141fa113cf7bfc14cbbf1e8f9e3979e6602116081958c22a83ea043015cc5adfb738e5ea";
+      sha512 = "4cf2c82e4d965c3ff51e40823f876811834cf7602d9cca30011346c2bdb6e222b7d37f28db79b6507350cd833db312aaf30c13ae245c93a6b1118d9abb132571";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/hy-AM/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/hy-AM/thunderbird-68.1.0.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "3df1da5c3d18ee3705e5d5013a752920863fdcee8a1c021bfde28603862a7c56e60a65b46b98af5d66fc5066c1580ab5484d86dd278d64d5d800b3840361b812";
+      sha512 = "d13d91b889903bdbbae1e12b96f07bfc6f5a6cb734a45fb87402ac44df9fcca703e067b1d1554a41c9b7e2e31703021eeeedd3ecd8b27536b548a3b2d89a1f27";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/id/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/id/thunderbird-68.1.0.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "786a5839f311df656fd4a0687819a47589f5a6ebac6f76e1f643136286d43b2f27744dfcc116341a8905b5e1da4ec0ad1f1eb4998e188d2e87ea487c6826fb32";
+      sha512 = "7c199788cead727742dfebbcdf6ddfe4491be31a3f4dcc7ae05d25413101036cad7fae399f6b390002f55f60214ea66399d5bfdc515557351b309d174b83fa55";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/is/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/is/thunderbird-68.1.0.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "53e4f76d41e1f8af240ecec249bd3ef3c787c6ff69320694bc682a876a76be22ed59abf0bc83691c7ea96d1e16f5a4c859e2b62528c99261f562012dbd035a9f";
+      sha512 = "33ac7dae65efc4792f92fed4eb0062302ef601f6bceef4d1eaa6b4a7fd75427607e8ebd7f6df70073bcbcc89f057b0689e365cea960428b5e57f9f1e810d6e48";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/it/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/it/thunderbird-68.1.0.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "8ecb5594e5252be84f97a55b37f5089220a3e5c1565686fe02f00d94a1418a9460e4c1f25724243c82b3c9442eb8cfbff3c3c9470971921469f2fd71aec66860";
+      sha512 = "231acc8648e2e377a8ca6d22c273957506fd1c21f226ddd681fd3a91940cb151df4f0eb05885ec0325629bb0cfdd3ed500af6047970b43b898a37586e4612502";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/ja/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/ja/thunderbird-68.1.0.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "7f9ed4fbdc0549c6ab704f80676218980a4b2609086437f57e22e9750e5a34d7506c1ee43ec48031a28322cdf4dcde6bd14c05fd032244acf33310fb6aa8e9a2";
+      sha512 = "90b8ca0d72fef8fbeae34027c95e3391452d72b53b40ecd59b1d2d2b07c6ef2e4d787bb2e927bf3d4b7837ea4cf2f10a0d3ccb0a6c98992e6fd857717c8ab04a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/ka/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/ka/thunderbird-68.1.0.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "bab15aa28fc92850d374f76ae9898c9408176db9b9e19cbdb49f7b586172c20eed0cb358f3cd4b5fcc2a4740188c0f041cf617a63743a42648c7e33dd0fb79e8";
+      sha512 = "271415dafa136d326b89ea3a58b852e2526c86f45d63f383fa250ace14f71b1b915dac3810a04507d9ca4437c640065520f9f3d9d032cb7eb84aad1f7b3517ba";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/kab/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/kab/thunderbird-68.1.0.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "26b1055333e508666dd24706da824c5cf9d5f87d1d1cb1c4d42894b836412205a7cc7ff73f764d8f2a1852138923bb02a6b2a2c3c92d1fe9307529533b6360e9";
+      sha512 = "c0b4fe65e9937bf897e7512ff6f267993c324c772232317e1314ce035a282f313b8385eee8c13e7b131eb0fabaa1b62345fbcd6289a5172d78aa3abf7f716bb2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/kk/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/kk/thunderbird-68.1.0.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "d946c82a8c35d82147812ef16e4573ae559dbfe65f4a6e5fc7dd107fb57fc6ba2a47f8a3655344e9e6172628692ad7815045830ee27bb10aab0d71483936d6ac";
+      sha512 = "b8c7ddd098540ef8354eda1f2a3a06987d11cb7e0c4af4e170d507ec540e743a7d2527188c18e045df99576ed44990a800e7f7ce212042eb03b02339be9f86af";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/ko/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/ko/thunderbird-68.1.0.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "3b9d9e70c097a1b7958c6854bc2da121f44921962d873e7f90fee85ce2214725223482aebcd503205e32501648c774199eced7ff34effb428dbc738f1ba4b963";
+      sha512 = "a33dbf6ef3aef69644261ea1c1cf3986fcda5c9d0b28996c46e3d8e53d3d7f8e9e6b62f1b03f2816267b483a84295ad99e888cf76c5c192e9a9dbadd78ce7d8b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/lt/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/lt/thunderbird-68.1.0.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "0cf99a6aec58d2f56f6a52fc5fee17b9e1d5abd0ece53073cc392c71452e1415c94ad0af003dd0a97fc5c6744a1a2243aef69dc44b831be51108b769e5bff87d";
+      sha512 = "3bf1cd599707a2728fbf46beadb7d8d1832c0c271e98647ac7d2de1be78b8c1b5d0af4ac246af01eaf4b2a57154f6068065fbbb2019346b663cafeb40edd5b71";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/ms/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/ms/thunderbird-68.1.0.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "8b4697a312aafdd88a5ecdf898a796bddb91e80b4c8c9c342fce765ee0f4dd494114324a51d6379468756a44bc71cb6f46b8fabc7ca733d9d85d08069f18526d";
+      sha512 = "563c413b21e2fda6f412a1826b1191097d4df1ade8d12e031522e122bedea6ae23a2d3b047e870030c9b4901a5869c9439107d8a7ebc6380c758bd741e0b4128";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/nb-NO/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/nb-NO/thunderbird-68.1.0.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "ad6275f8343dd36ed039524875b41ab9c8bafd2a1e54291b98c16b0ab35f9bea1bfee3fce86070317fad2f25d46d0aa9ef0824e4ad88e0879a33ae753c61ab2d";
+      sha512 = "c9062949faf5cbfe8bde2b0f330f76b438e1606360364a90f0e35026fd52952d6aff7c6925fd1ce569b24f41409d0b63540dbeb0ae82260604d5faaee723bc2e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/nl/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/nl/thunderbird-68.1.0.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "49f586a62969e6ea5638eb95f812e7d4a891ef55f381633792ed0820ad098cc527dc9490c3a1ce52246526f0a8cf00eb16666c6a7f932a68c6d440e151b452cd";
+      sha512 = "b8b385db8fd2385a88d12c1ba23bf812592beca14e44d9c33456ebad16a40db8e7d886779565a4d617fc56f7a6d651dc8da171b1c727481895d05777bc0eb3c1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/nn-NO/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/nn-NO/thunderbird-68.1.0.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "1f04f2bf7a60472eff1b546608cfb26e41f31a273d1037e0d73530029a757dfcd95e2c1b85a6990b6f7eec28138835fe096266a00dd094b4db74007cd59ef00d";
+      sha512 = "3c88ea8dffc71524402416d9222c859dafc5bd5799651a948bb318a7d2f91ca2c00fa4158e6019949f9a1d72a2d85a0c9d2a3c9a8caf052e8743fcb5dd0dccb6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/pl/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/pl/thunderbird-68.1.0.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "f232e4b6cfcea81ed70e56e9812b8e0783205f49b846d29338ad09457db9a18e4fbb35738bf5e9abce42855c13c1839605aa343cb7d33d0110b68d634183e697";
+      sha512 = "c6ba1f98ebc44af63d8cd8052fd306d3a8920c33eb5b3be563c0fe203d5d07806bc5db7ff88847c3ee2d82c62d0811a086fa91e8253eec3a3977091569f40a20";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/pt-BR/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/pt-BR/thunderbird-68.1.0.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "2527ec08fc23d01712574e3c8419273ac82111c5f2b4b6040cd8f3292aeadb36021029b01bc319d8ca52177db39f1a446acd5537a6e8f42800eb22c3e2d7cb30";
+      sha512 = "cbd4c0f1b14cb04b98ef6f2e4ce53d655b58ae9a11047eeb1959ac1c4ef4370507194dd1149372fd1dad4ceedf91c39f3bde4fdf07b5d925f27dc8eb5041be67";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/pt-PT/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/pt-PT/thunderbird-68.1.0.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "c91d9d0becade1508a3212693f5fcdeb917fe5df5d63b54de125b76786dc3787a7f5f220eb48add1dd1eee95f7eb120b1c1dc85dc0bd91688c883be9219f3d7d";
+      sha512 = "ec08c628708a7bbcb00df2122e5fc463e1b0e1c031e9130369ddfee12db3cfe9219f7939756fc47abab8514c6cea642bb653ee420818ad625a33caada7005993";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/rm/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/rm/thunderbird-68.1.0.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "45a4f608eb5e64f24ee385328a3a568aa2ad3284169019423c8b414790779cd079c2d73b290716f18227210ab5eff50625bd6688498bc027228b8fff51fda5b6";
+      sha512 = "4520dfb1529220e40cf2e1aca44cbc2af750fcceee3639d7ef334e9488034b18bc6e73b5b7a37204346da53a44da099f4f7f65d5b3dbdeac6d6934918c02cca3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/ro/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/ro/thunderbird-68.1.0.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "e344d838e2f79dd8ff79cf2e7ff2a1d8f6c7e64f29cf870d8a6fad9b3dee31de6c0a80d3007dd498dffb816c00dc8429150bc6b49a5b6eb10b633a4e942ca725";
+      sha512 = "49e54dd1cca8038ab6c34e9980b6b36117aa157b6555ba440f0d7c8c4d909253989b9a50d25c7c18529136fa26d0ff94474d17e43156afba171948c9c05e16a6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/ru/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/ru/thunderbird-68.1.0.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "8dbfd4f8969703623388a55e790b722933f2c1faf702ff5c7fdfe3cdab8f62fc4ea69f9303edf94a41a71be1b8c5a2ddfa5509d4c8abe260c91b7075349afe64";
+      sha512 = "6d297592bcf0c9b97c40f1053a95385e6c2510aa0ddfafd25085bc6a954fb5460f59f18f65477d8c93af829cd2a053b389b5dcec35a7ac7766d72c29064e5687";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/si/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/si/thunderbird-68.1.0.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "f1808e9648caa00afab0609dac1cb564dbf6e5bef75446071997cc9913da8470e54cb254282fc6e8b839e88b003ef18426609a97cd1affb93659fcb519913a5c";
+      sha512 = "f602557748517324943b5ff276f4efdeca1c5083662bc9f0b0bdba8c10510cee834b3883870a98d51d406f58e338a09d0589b3bc0891bfbd88b895cca02fd360";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/sk/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/sk/thunderbird-68.1.0.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "7d5b480a44dae0d2f5348261ecad04348ebb7943a757fe83c0fb154da251b423ba21840c5d1fbf8d7979dd30c2d5e7b18e90d0ad033a1e96d6f6587407a24cc9";
+      sha512 = "7b6980d2b5131bd9a43a29efa2f1e97c60e15410a63224d839548d777fd8b4c4d65ccfc7756227cf900f7420b12231c3d48f062133cb6f21bbdcdcdb179f2e47";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/sl/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/sl/thunderbird-68.1.0.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "f76e1f01b8da8a2ba344dd3bedfa4301df03fabf9848fa189d522995cd48d81f8d00f11e01722868acb1993d4e79977122e04e3d208629b2e398c715777194e1";
+      sha512 = "ecc38fb4fde66b7b213b1cfeb8ab170b3e685d0a28c7e071e19a85509ec74e79fb6eb61104c47f0eef1a77e1e1a52b292469a364747eeccc701c522452c58351";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/sq/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/sq/thunderbird-68.1.0.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "cff32ee84324724dea5612e5b48b22adc63d8b9428c5937f84c94da83bcf5f2aadda6ab81c5f9bced6d693689bc38bf15c764d4ab4809cacec3bb54cd82745f7";
+      sha512 = "3ff668c6ed28bdb2f3d388ab8ecb1bf3b2b38bb29046b8559f7b9f9c6fa32db226c4620f472ba5a982b473e3e3f4aee04aa3746e57738b512dcb37fdfd5ecfc5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/sr/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/sr/thunderbird-68.1.0.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "96d25f7d952e204751cd601932713418cd495d11364430a37ecfa36333113a6132209b8e8f0ec337799ed02b71b388f43e22a53fa168f17e4d15e7594170299a";
+      sha512 = "4c71511375333802f903cb632963933054a969c02a3fb23f4416e0cb3c21e18147bbffb28572f8ac90aa5bc3c4138b25590c42610c20a14b5e8eddb1edf28c28";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/sv-SE/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/sv-SE/thunderbird-68.1.0.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "8bc790d7951469e2dfa2499622464cf55427a6bc93dec50b18f014ac079ec0579b91a11680e4104f7d6a38f60d467e9fb3c9ee7ab83b64f8dae2c1e979150bd3";
+      sha512 = "5d7d569f4eb9ed738f54139a90e9a01e9e771a553af193357d45765bd54815a096ddc31ac69620d6f14516e8f41f1c0fb8f16a848e13273d0c18b9c047d85fb4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/tr/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/tr/thunderbird-68.1.0.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "2c40fa3e6ecfb68507897e669bed229ed98e1b4a3998b55b59523d3cec1fc5553cfacbd9be3d55f7a32b612ee662dfda7c8a21a4c26c750d48b87d31368a9942";
+      sha512 = "fc8892f85032d9fcce76c3fa971531f4039b8bb9e1812776bb3e7c5b68474543b5db4007f79e81abc1685c74f0574201236aab8a2df05ac10fcaade7c57ca3c2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/uk/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/uk/thunderbird-68.1.0.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "5eee26a500c1d4bf71222987523cc3e5f144aca02c17c88a01d4b68f9ac5e1298407460c69504d0a7b1e5727755cb32e2ae523cd97766419848c1b6dc0a30bf0";
+      sha512 = "80335f326bde31f4b1e269cd756b4b41ff3a632023f09447abf6d1964381f8f9657a4f47ed6af63a3eb0cd4e84e5bced595eec07cc0a9e30ad8d3cf3d08026df";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/uz/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/uz/thunderbird-68.1.0.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "51a0fc8dc30cc82f7d3b222167aaa8ea0225b4136ebacee38687cdc1235c0720da14cd2a3e1875a4c4bfa3bb8fd9045541ca6df736115312ac49a2db2ef83639";
+      sha512 = "2434a8a063b0d1019220579bc83160217d5c269b24ad83a9ed0969425a1fc9d9ed8b190c291d87c34379928aa6c2329d3b5ad287b44177dd61f680081cd7caf9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/vi/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/vi/thunderbird-68.1.0.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "bb02dd69a8c8d514666fedb9d7de520f6ea89740956ddcd9d7f90175bca6f7bcf79b573c6e5ecd6fdfcdd15aa2a35881e8877074fbb795019eccff52cb943a91";
+      sha512 = "0e33f1a2f8cd67bdb523180af0b8afa5fbbb3628b0b9407f2a4ae609c7155b33fd85a1f23d9b74097fefb045fd0b437f58971cc4c4d5f391398d6ea7429b921e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/zh-CN/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/zh-CN/thunderbird-68.1.0.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "408599229da40b2ce1a23ec1e5b12c7f4a24fb63524d792d50764cdfbcc6774dd7f651ba2dce46bccd94937e24b4b08d8bf37b6fb839c61540dfbf36f6d3e6b2";
+      sha512 = "27d1d9b3c30ab1dd863362139f91b79ffb7e36e87ff1f7f07162ea3e86a58962136e43cca3212e4263908f63dfe3a3c53bb3db3085e5b4bf07e0ff88408822d8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/zh-TW/thunderbird-68.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/zh-TW/thunderbird-68.1.0.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "d75c9bfc6234fa0ddc56b7c1dace76b789e29c0cb03ff17395eeba020a82431e457271e95117731963f2666295b94746d0370bf0e85f9c3646836830684bca45";
+      sha512 = "2141f0ad5d11daf3a94f3a737801ec0234a7f2d869320d4859d771ab92a6e59bf13139b4048a7239640635051a9228e6cbf55746402ed35cb398d93a3d129439";
     }
     ];
 }
-- 
GitLab


From bab6e6eb043ea3f1e4be130b807a94d24d19b2e0 Mon Sep 17 00:00:00 2001
From: schneefux <schneefux+commit@schneefux.xyz>
Date: Sat, 14 Sep 2019 11:26:22 +0200
Subject: [PATCH 0220/2254] nixos/gitlab: Remove todo about mysql support

GitLab has ended MySQL support.
https://about.gitlab.com/2019/06/27/removing-mysql-support/
---
 nixos/modules/services/misc/gitlab.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index bcf0603c6f3..66da6864fca 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -1,7 +1,5 @@
 { config, lib, pkgs, utils, ... }:
 
-# TODO: support non-postgresql
-
 with lib;
 
 let
-- 
GitLab


From 76538e570187c3d1a5fa038b9e81d7c0d09b5edb Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Sat, 14 Sep 2019 18:26:26 +0900
Subject: [PATCH 0221/2254] thunderbird: 68.0 -> 68.1.0

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

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index f2b4cfb4bef..1617ccd7dd1 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -25,11 +25,11 @@ let
   gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
 in stdenv.mkDerivation rec {
   pname = "thunderbird";
-  version = "68.0";
+  version = "68.1.0";
 
   src = fetchurl {
     url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
-    sha512 = "2cz583rwfpj4z5cwg2vfy4ha0pz4xs9g7li078rmk6x19haiv8s9fwijd82xgxax0afn8wk80bq5kd8yz38l9432f6bar8xnwb21y4i";
+    sha512 = "06036nawpm987q33567nhz55qybbcl55h5rdhjbhck5qmyj1qi383xqac5niwyk7c0gaq4ygwc5a24pysf85crjdway2zmqyjxp2apb";
   };
 
   # from firefox, but without sound libraries
-- 
GitLab


From 7f136b5a5607059c3dca1967ffaca126e3d1fe29 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 14 Sep 2019 01:45:39 +0200
Subject: [PATCH 0222/2254] nixos/hydra: fix test

We ship `https://cache.nixos.org` as binary cache by default which
automatically substitutes the test derivation used inside the Hydra
test. However it needs to be built locally to confirm that
`hydra-queue-runner` works properly.

Also inherited the platform name for the test derivation from `system`
to ensure that the build can be tested on each supported platform.

ZHF #68361
---
 nixos/tests/hydra/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/hydra/default.nix b/nixos/tests/hydra/default.nix
index f99b367ac9b..76000450921 100644
--- a/nixos/tests/hydra/default.nix
+++ b/nixos/tests/hydra/default.nix
@@ -8,8 +8,10 @@ let
   trivialJob = pkgs.writeTextDir "trivial.nix" ''
    { trivial = builtins.derivation {
        name = "trivial";
-       system = "x86_64-linux";
+       system = "${system}";
        builder = "/bin/sh";
+       allowSubstitutes = false;
+       preferLocalBuild = true;
        args = ["-c" "echo success > $out; exit 0"];
      };
    }
@@ -57,7 +59,7 @@ let
             nix = {
               buildMachines = [{
                 hostName = "localhost";
-                systems = [ "x86_64-linux" ];
+                systems = [ system ];
               }];
 
               binaryCaches = [];
-- 
GitLab


From c659b70e863aceffed616a0b0fe1a06c492896ea Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 13 Sep 2019 21:34:13 -0500
Subject: [PATCH 0223/2254] z-lua: 1.7.2 -> 1.7.3, lua-filesystem so
 _ZL_USE_LFS can be used

https://github.com/skywind3000/z.lua/releases/tag/v1.7.3
---
 pkgs/tools/misc/z-lua/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/z-lua/default.nix b/pkgs/tools/misc/z-lua/default.nix
index aed902044f9..adce403f35d 100644
--- a/pkgs/tools/misc/z-lua/default.nix
+++ b/pkgs/tools/misc/z-lua/default.nix
@@ -2,18 +2,18 @@
 
 stdenv.mkDerivation rec {
   pname = "z-lua";
-  version = "1.7.2";
+  version = "1.7.3";
 
   src = fetchFromGitHub {
     owner = "skywind3000";
     repo = "z.lua";
     rev = "v${version}";
-    sha256 = "17klcw2iv7d636mp7fb80kjvqd3xqkzqhwz41ri1l029dxji4zzh";
+    sha256 = "13cfdghkprkaxgrbwsjndbza2mjxm2x774lnq7q4gfyc48mzwi70";
   };
 
   dontBuild = true;
 
-  buildInputs = [ lua ];
+  buildInputs = [ (lua.withPackages (p: with p; [ luafilesystem ])) ];
 
   installPhase = ''
     install -Dm755 z.lua $out/bin/z
-- 
GitLab


From aaf514d32251b075d987488345226d55e2f5bc94 Mon Sep 17 00:00:00 2001
From: geistesk <github.jyf300hj@0x21.biz>
Date: Sat, 14 Sep 2019 10:12:05 +0200
Subject: [PATCH 0224/2254] spaceship-prompt: 3.7.1 -> 3.11.2

---
 pkgs/shells/zsh/spaceship-prompt/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/shells/zsh/spaceship-prompt/default.nix b/pkgs/shells/zsh/spaceship-prompt/default.nix
index ad7b46a907e..0e7536b4fa1 100644
--- a/pkgs/shells/zsh/spaceship-prompt/default.nix
+++ b/pkgs/shells/zsh/spaceship-prompt/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "spaceship-prompt";
-  version = "3.7.1";
+  version = "3.11.2";
 
   src = fetchFromGitHub {
     owner = "denysdovhan";
     repo = "spaceship-prompt";
-    sha256 = "0laihax18bs254rm2sww5wkjbmkp4m5c8aicgqpi4diz7difxk6z";
-    rev = "aaa34aeab9ba0a99416788f627ec9aeffba392f0";
+    sha256 = "1q7m9mmg82n4fddfz01y95d5n34xnzhrnn1lli0vih39sgmzim9b";
+    rev = "v${version}";
   };
 
   installPhase = ''
-- 
GitLab


From 91bb6cf407a55f67214311459e986be509e7fd1d Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Sat, 14 Sep 2019 11:57:14 +0200
Subject: [PATCH 0225/2254] httplz: 1.5.2 -> 1.6.0, add openssl to PATH

---
 pkgs/tools/networking/httplz/cargo-lock.patch | 677 ++++++------------
 pkgs/tools/networking/httplz/default.nix      |  23 +-
 pkgs/top-level/all-packages.nix               |   2 +-
 3 files changed, 250 insertions(+), 452 deletions(-)

diff --git a/pkgs/tools/networking/httplz/cargo-lock.patch b/pkgs/tools/networking/httplz/cargo-lock.patch
index f88998902c5..1d1632a0e82 100644
--- a/pkgs/tools/networking/httplz/cargo-lock.patch
+++ b/pkgs/tools/networking/httplz/cargo-lock.patch
@@ -1,9 +1,9 @@
 diff --git a/Cargo.lock b/Cargo.lock
 new file mode 100644
-index 0000000..731829e
+index 0000000..fe230f5
 --- /dev/null
 +++ b/Cargo.lock
-@@ -0,0 +1,1403 @@
+@@ -0,0 +1,1190 @@
 +# This file is automatically @generated by Cargo.
 +# It is not intended for manual editing.
 +[[package]]
@@ -12,20 +12,11 @@ index 0000000..731829e
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +
 +[[package]]
-+name = "advapi32-sys"
-+version = "0.2.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
 +name = "aho-corasick"
-+version = "0.6.9"
++version = "0.7.6"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "memchr 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
@@ -33,7 +24,7 @@ index 0000000..731829e
 +version = "0.11.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
@@ -43,17 +34,16 @@ index 0000000..731829e
 +
 +[[package]]
 +name = "atty"
-+version = "0.2.11"
++version = "0.2.13"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
 + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
 +name = "autocfg"
-+version = "0.1.2"
++version = "0.1.6"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +
 +[[package]]
@@ -61,8 +51,8 @@ index 0000000..731829e
 +version = "0.9.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "safemem 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "safemem 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
@@ -70,17 +60,12 @@ index 0000000..731829e
 +version = "0.10.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
 +name = "bitflags"
-+version = "0.9.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "bitflags"
-+version = "1.0.4"
++version = "1.1.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +
 +[[package]]
@@ -88,7 +73,7 @@ index 0000000..731829e
 +version = "0.3.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)",
 + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
@@ -102,13 +87,8 @@ index 0000000..731829e
 +]
 +
 +[[package]]
-+name = "build_const"
-+version = "0.2.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
 +name = "byteorder"
-+version = "1.3.1"
++version = "1.3.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +
 +[[package]]
@@ -125,7 +105,7 @@ index 0000000..731829e
 +version = "0.1.7"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)",
 + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
@@ -134,31 +114,31 @@ index 0000000..731829e
 +version = "0.2.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 + "ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
 +name = "cc"
-+version = "1.0.28"
++version = "1.0.45"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +
 +[[package]]
 +name = "cfg-if"
-+version = "0.1.6"
++version = "0.1.9"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +
 +[[package]]
 +name = "clap"
-+version = "2.32.0"
++version = "2.33.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
 + "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "textwrap 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
++ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
 + "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
@@ -167,16 +147,7 @@ index 0000000..731829e
 +version = "0.0.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "core-foundation"
-+version = "0.2.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "core-foundation-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
@@ -190,64 +161,49 @@ index 0000000..731829e
 +
 +[[package]]
 +name = "core-foundation-sys"
-+version = "0.2.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "core-foundation-sys"
 +version = "0.6.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +
 +[[package]]
-+name = "crc"
-+version = "1.8.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "build_const 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
 +name = "crc32fast"
-+version = "1.1.2"
++version = "1.2.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
 +name = "ctrlc"
-+version = "3.1.1"
++version = "3.1.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "nix 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "nix 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
 +name = "dtoa"
-+version = "0.4.3"
++version = "0.4.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +
 +[[package]]
 +name = "embed-resource"
-+version = "1.1.4"
++version = "1.3.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "winreg 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "vswhom 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winreg 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
 +name = "flate2"
-+version = "1.0.6"
++version = "1.0.11"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "crc32fast 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "miniz-sys 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "miniz_oxide_c_api 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "miniz-sys 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
++ "miniz_oxide 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
@@ -265,7 +221,7 @@ index 0000000..731829e
 +
 +[[package]]
 +name = "fuchsia-cprng"
-+version = "0.1.0"
++version = "0.1.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +
 +[[package]]
@@ -275,60 +231,61 @@ index 0000000..731829e
 +
 +[[package]]
 +name = "getrandom"
-+version = "0.1.10"
++version = "0.1.12"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
 + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasi 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
 +name = "httparse"
-+version = "1.3.3"
++version = "1.3.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +
 +[[package]]
 +name = "https"
-+version = "1.5.2"
++version = "1.6.0"
 +dependencies = [
 + "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 + "brotli2 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
 + "bzip2 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "ctrlc 3.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "embed-resource 1.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "flate2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)",
++ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "ctrlc 3.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "embed-resource 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "flate2 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
 + "hyper-native-tls 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "iron 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "iron 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 + "lazysort 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
 + "md6 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "mime_guess 1.8.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "mime_guess 1.8.7 (registry+https://github.com/rust-lang/crates.io-index)",
++ "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 + "rfsapi 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 + "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
 + "serde_json 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tabwriter 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 + "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
 + "trivial_colours 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "unicase 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicase 2.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
 +name = "hyper"
-+version = "0.10.15"
++version = "0.10.16"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
 + "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "httparse 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
 + "language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 + "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
 + "mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 + "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
 + "traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 + "typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -338,21 +295,11 @@ index 0000000..731829e
 +
 +[[package]]
 +name = "hyper-native-tls"
-+version = "0.2.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "antidote 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "hyper 0.10.15 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "native-tls 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "hyper-native-tls"
 +version = "0.3.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
 + "antidote 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "hyper 0.10.15 (registry+https://github.com/rust-lang/crates.io-index)",
++ "hyper 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)",
 + "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
@@ -368,15 +315,15 @@ index 0000000..731829e
 +
 +[[package]]
 +name = "iron"
-+version = "0.6.0"
++version = "0.6.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "hyper 0.10.15 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "hyper-native-tls 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "hyper 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)",
++ "hyper-native-tls 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 + "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "mime_guess 1.8.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "mime_guess 1.8.7 (registry+https://github.com/rust-lang/crates.io-index)",
 + "modifier 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 + "plugin 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
 + "typemap 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
 + "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -388,27 +335,13 @@ index 0000000..731829e
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +
 +[[package]]
-+name = "kernel32-sys"
-+version = "0.2.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
 +name = "language-tags"
 +version = "0.2.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +
 +[[package]]
 +name = "lazy_static"
-+version = "0.2.11"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "lazy_static"
-+version = "1.2.0"
++version = "1.4.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +
 +[[package]]
@@ -426,15 +359,15 @@ index 0000000..731829e
 +version = "0.3.9"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
 +name = "log"
-+version = "0.4.6"
++version = "0.4.8"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
@@ -453,12 +386,8 @@ index 0000000..731829e
 +
 +[[package]]
 +name = "memchr"
-+version = "2.1.3"
++version = "2.2.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
 +
 +[[package]]
 +name = "mime"
@@ -470,7 +399,7 @@ index 0000000..731829e
 +
 +[[package]]
 +name = "mime_guess"
-+version = "1.8.6"
++version = "1.8.7"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
 + "mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -481,63 +410,38 @@ index 0000000..731829e
 +
 +[[package]]
 +name = "miniz-sys"
-+version = "0.1.11"
++version = "0.1.12"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)",
 + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
 +name = "miniz_oxide"
-+version = "0.2.1"
++version = "0.3.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
 + "adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
-+name = "miniz_oxide_c_api"
-+version = "0.2.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "miniz_oxide 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
 +name = "modifier"
 +version = "0.1.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +
 +[[package]]
 +name = "native-tls"
-+version = "0.1.5"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "openssl 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "schannel 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "security-framework 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "security-framework-sys 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "native-tls"
 +version = "0.2.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
 + "openssl 0.10.24 (registry+https://github.com/rust-lang/crates.io-index)",
 + "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 + "openssl-sys 0.9.49 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "schannel 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
++ "schannel 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
 + "security-framework 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 + "security-framework-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 + "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -545,12 +449,12 @@ index 0000000..731829e
 +
 +[[package]]
 +name = "nix"
-+version = "0.11.0"
++version = "0.14.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
 + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
 + "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
@@ -560,32 +464,23 @@ index 0000000..731829e
 +version = "0.1.43"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
 +name = "num-traits"
-+version = "0.2.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "num_cpus"
-+version = "1.9.0"
++version = "0.2.8"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
-+name = "openssl"
-+version = "0.9.24"
++name = "num_cpus"
++version = "1.10.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "openssl-sys 0.9.49 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
@@ -593,10 +488,10 @@ index 0000000..731829e
 +version = "0.10.24"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
 + "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
 + "openssl-sys 0.9.49 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
@@ -611,11 +506,11 @@ index 0000000..731829e
 +version = "0.9.49"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
++ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)",
 + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "vcpkg 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "pkg-config 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
++ "vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
@@ -624,6 +519,11 @@ index 0000000..731829e
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +
 +[[package]]
++name = "percent-encoding"
++version = "2.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
 +name = "phf"
 +version = "0.7.24"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -660,7 +560,7 @@ index 0000000..731829e
 +
 +[[package]]
 +name = "pkg-config"
-+version = "0.3.14"
++version = "0.3.16"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +
 +[[package]]
@@ -683,43 +583,31 @@ index 0000000..731829e
 +
 +[[package]]
 +name = "rand"
-+version = "0.4.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "fuchsia-cprng 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "rand"
 +version = "0.6.5"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
 + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
 + "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
 + "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 + "rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand_jitter 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand_os 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand_pcg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 + "rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
 +name = "rand"
-+version = "0.7.0"
++version = "0.7.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "getrandom 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
 + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
 + "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 + "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
@@ -728,7 +616,7 @@ index 0000000..731829e
 +version = "0.1.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
 + "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
@@ -738,7 +626,7 @@ index 0000000..731829e
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
 + "c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
@@ -746,20 +634,20 @@ index 0000000..731829e
 +version = "0.3.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
 +name = "rand_core"
-+version = "0.4.0"
++version = "0.4.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +
 +[[package]]
 +name = "rand_core"
-+version = "0.5.0"
++version = "0.5.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "getrandom 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
@@ -775,7 +663,7 @@ index 0000000..731829e
 +version = "0.2.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
@@ -788,34 +676,34 @@ index 0000000..731829e
 +
 +[[package]]
 +name = "rand_jitter"
-+version = "0.1.2"
++version = "0.1.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
 + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
 +name = "rand_os"
-+version = "0.1.2"
++version = "0.1.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
 + "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "fuchsia-cprng 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
 + "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
 +name = "rand_pcg"
-+version = "0.1.1"
++version = "0.1.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
@@ -836,43 +724,31 @@ index 0000000..731829e
 +
 +[[package]]
 +name = "redox_syscall"
-+version = "0.1.51"
++version = "0.1.56"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +
 +[[package]]
-+name = "redox_termios"
-+version = "0.1.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "redox_syscall 0.1.51 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
 +name = "regex"
-+version = "1.1.0"
++version = "1.3.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "aho-corasick 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "memchr 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "regex-syntax 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
 + "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
 +name = "regex-syntax"
-+version = "0.6.5"
++version = "0.6.12"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
 +
 +[[package]]
 +name = "remove_dir_all"
-+version = "0.5.1"
++version = "0.5.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
@@ -880,7 +756,7 @@ index 0000000..731829e
 +version = "0.1.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "hyper 0.10.15 (registry+https://github.com/rust-lang/crates.io-index)",
++ "hyper 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)",
 + "mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
 + "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
 + "serde_derive 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -888,36 +764,17 @@ index 0000000..731829e
 +]
 +
 +[[package]]
-+name = "rustc_version"
-+version = "0.2.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
 +name = "safemem"
-+version = "0.3.0"
++version = "0.3.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +
 +[[package]]
 +name = "schannel"
-+version = "0.1.14"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "security-framework"
-+version = "0.1.16"
++version = "0.1.15"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "core-foundation 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "core-foundation-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "security-framework-sys 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
@@ -933,15 +790,6 @@ index 0000000..731829e
 +
 +[[package]]
 +name = "security-framework-sys"
-+version = "0.1.16"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "core-foundation-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "security-framework-sys"
 +version = "0.3.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
@@ -949,19 +797,6 @@ index 0000000..731829e
 +]
 +
 +[[package]]
-+name = "semver"
-+version = "0.9.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "semver-parser"
-+version = "0.7.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
 +name = "serde"
 +version = "0.9.15"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -989,7 +824,7 @@ index 0000000..731829e
 +version = "0.9.10"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "dtoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
 + "itoa 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
 + "num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)",
 + "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1002,15 +837,12 @@ index 0000000..731829e
 +
 +[[package]]
 +name = "smallvec"
-+version = "0.6.8"
++version = "0.6.10"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
 +
 +[[package]]
 +name = "strsim"
-+version = "0.7.0"
++version = "0.8.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +
 +[[package]]
@@ -1032,12 +864,11 @@ index 0000000..731829e
 +]
 +
 +[[package]]
-+name = "tempdir"
-+version = "0.3.7"
++name = "tabwriter"
++version = "1.1.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
@@ -1045,30 +876,20 @@ index 0000000..731829e
 +version = "3.1.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "redox_syscall 0.1.51 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "termion"
-+version = "1.5.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
 + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "redox_syscall 0.1.51 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
++ "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
 +name = "textwrap"
-+version = "0.10.0"
++version = "0.11.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
@@ -1076,7 +897,7 @@ index 0000000..731829e
 +version = "0.3.6"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
@@ -1085,8 +906,8 @@ index 0000000..731829e
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
 + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "redox_syscall 0.1.51 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
@@ -1113,11 +934,6 @@ index 0000000..731829e
 +]
 +
 +[[package]]
-+name = "ucd-util"
-+version = "0.1.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
 +name = "unicase"
 +version = "1.4.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1127,7 +943,7 @@ index 0000000..731829e
 +
 +[[package]]
 +name = "unicase"
-+version = "2.2.0"
++version = "2.5.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
 + "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1146,12 +962,12 @@ index 0000000..731829e
 +version = "0.1.8"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "smallvec 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
 +name = "unicode-width"
-+version = "0.1.5"
++version = "0.1.6"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +
 +[[package]]
@@ -1160,14 +976,6 @@ index 0000000..731829e
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +
 +[[package]]
-+name = "unreachable"
-+version = "1.0.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
 +name = "unsafe-any"
 +version = "0.4.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1186,13 +994,8 @@ index 0000000..731829e
 +]
 +
 +[[package]]
-+name = "utf8-ranges"
-+version = "1.0.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
 +name = "vcpkg"
-+version = "0.2.6"
++version = "0.2.7"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +
 +[[package]]
@@ -1211,18 +1014,31 @@ index 0000000..731829e
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +
 +[[package]]
-+name = "wasi"
-+version = "0.5.0"
++name = "vswhom"
++version = "0.1.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "vswhom-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
 +
 +[[package]]
-+name = "winapi"
-+version = "0.2.8"
++name = "vswhom-sys"
++version = "0.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "wasi"
++version = "0.7.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +
 +[[package]]
 +name = "winapi"
-+version = "0.3.6"
++version = "0.3.8"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
 + "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1230,11 +1046,6 @@ index 0000000..731829e
 +]
 +
 +[[package]]
-+name = "winapi-build"
-+version = "0.1.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
 +name = "winapi-i686-pc-windows-gnu"
 +version = "0.4.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1246,164 +1057,140 @@ index 0000000..731829e
 +
 +[[package]]
 +name = "winreg"
-+version = "0.4.0"
++version = "0.5.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "advapi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[metadata]
 +"checksum adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7e522997b529f05601e05166c07ed17789691f562762c7f3b987263d2dedee5c"
-+"checksum advapi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e06588080cb19d0acb6739808aafa5f26bfb2ca015b2b6370028b44cf7cb8a9a"
-+"checksum aho-corasick 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1e9a933f4e58658d7b12defcf96dc5c720f20832deebe3e0a19efd3b6aaeeb9e"
++"checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d"
 +"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
 +"checksum antidote 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "34fde25430d87a9388dadbe6e34d7f72a462c8b43ac8d309b42b0a8505d7e2a5"
-+"checksum atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652"
-+"checksum autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a6d640bee2da49f60a4068a7fae53acde8982514ab7bae8b8cea9e88cbcfd799"
++"checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90"
++"checksum autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "b671c8fb71b457dd4ae18c4ba1e59aa81793daacc361d82fcd410cef0d491875"
 +"checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e"
 +"checksum base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643"
-+"checksum bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5"
-+"checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
++"checksum bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3d155346769a6855b86399e9bc3814ab343cd3d62c7e985113d46a0ec3c281fd"
 +"checksum brotli-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4445dea95f4c2b41cde57cc9fee236ae4dbae88d8fcbdb4750fc1bb5d86aaecd"
 +"checksum brotli2 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0cb036c3eade309815c15ddbacec5b22c4d1f3983a774ab2eac2e3e9ea85568e"
-+"checksum build_const 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "39092a32794787acd8525ee150305ff051b0aa6cc2abaf193924f5ab05425f39"
-+"checksum byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a019b10a2a7cdeb292db131fc8113e57ea2a908f6e7894b0c3c671893b65dbeb"
++"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5"
 +"checksum bzip2 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "42b7c3cbf0fa9c1b82308d57191728ca0256cb821220f4e2fd410a72ade26e3b"
 +"checksum bzip2-sys 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6584aa36f5ad4c9247f5323b0a42f37802b37a836f0ad87084d7a33961abe25f"
 +"checksum c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7d64d04786e0f528460fc884753cf8dddcc466be308f6026f8e355c41a0e4101"
-+"checksum cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4a8b715cb4597106ea87c7c84b2f1d452c7492033765df7f32651e66fcf749"
-+"checksum cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "082bb9b28e00d3c9d39cc03e64ce4cea0f1bb9b3fde493f0cbc008472d22bdf4"
-+"checksum clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b957d88f4b6a63b9d70d5f454ac8011819c6efa7727858f458ab71c756ce2d3e"
++"checksum cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)" = "4fc9a35e1f4290eb9e5fc54ba6cf40671ed2a2514c3eeb2b2a908dda2ea5a1be"
++"checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33"
++"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
 +"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
-+"checksum core-foundation 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "25bfd746d203017f7d5cbd31ee5d8e17f94b6521c7af77ece6c9e4b2d4b16c67"
 +"checksum core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d"
-+"checksum core-foundation-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "065a5d7ffdcbc8fa145d6f0746f3555025b9097a9e9cda59f7467abae670c78d"
 +"checksum core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b"
-+"checksum crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d663548de7f5cca343f1e0a48d14dcfb0e9eb4e079ec58883b7251539fa10aeb"
-+"checksum crc32fast 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e91d5240c6975ef33aeb5f148f35275c25eda8e8a5f95abe421978b05b8bf192"
-+"checksum ctrlc 3.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "630391922b1b893692c6334369ff528dcc3a9d8061ccf4c803aa8f83cb13db5e"
-+"checksum dtoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6d301140eb411af13d3115f9a562c85cc6b541ade9dfa314132244aaee7489dd"
-+"checksum embed-resource 1.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "59edbe56442f96505f79c9116006f2e26c7f5655cccdc2c1546b2528c63bd612"
-+"checksum flate2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2291c165c8e703ee54ef3055ad6188e3d51108e2ded18e9f2476e774fc5ad3d4"
++"checksum crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1"
++"checksum ctrlc 3.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c7dfd2d8b4c82121dfdff120f818e09fc4380b0b7e17a742081a89b94853e87f"
++"checksum dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ea57b42383d091c85abcc2706240b94ab2a8fa1fc81c10ff23c4de06e2a90b5e"
++"checksum embed-resource 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e1419cfb011b3f11cbe865738cc2a36cc574437de4e3f2a1a57f118b230aa4f3"
++"checksum flate2 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)" = "2adaffba6388640136149e18ed080b77a78611c1e1d6de75aedcdf78df5d4682"
 +"checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
 +"checksum foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
-+"checksum fuchsia-cprng 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "81f7f8eb465745ea9b02e2704612a9946a59fa40572086c6fd49d6ddcf30bf31"
++"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
 +"checksum gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)" = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2"
-+"checksum getrandom 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "6171a6cc63fbabbe27c2b5ee268e8b7fe5dc1eb0dd2dfad537c1dfed6f69117e"
-+"checksum httparse 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e8734b0cfd3bc3e101ec59100e101c2eecd19282202e87808b3037b442777a83"
-+"checksum hyper 0.10.15 (registry+https://github.com/rust-lang/crates.io-index)" = "df0caae6b71d266b91b4a83111a61d2b94ed2e2bea024c532b933dcff867e58c"
-+"checksum hyper-native-tls 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "72332e4a35d3059583623b50e98e491b78f8b96c5521fcb3f428167955aa56e8"
++"checksum getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "473a1265acc8ff1e808cd0a1af8cee3c2ee5200916058a2ca113c29f2d903571"
++"checksum httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9"
++"checksum hyper 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)" = "0a0652d9a2609a968c14be1a9ea00bf4b1d64e2e1f53a1b51b6fff3a6e829273"
 +"checksum hyper-native-tls 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6d375598f442742b0e66208ee12501391f1c7ac0bafb90b4fe53018f81f06068"
 +"checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
-+"checksum iron 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d8e17268922834707e1c29e8badbf9c712c9c43378e1b6a3388946baff10be2"
++"checksum iron 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c6d308ca2d884650a8bf9ed2ff4cb13fbb2207b71f64cda11dc9b892067295e8"
 +"checksum itoa 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8324a32baf01e2ae060e9de58ed0bc2320c9a2833491ee36cd3b4c414de4db8c"
-+"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
 +"checksum language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a"
-+"checksum lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73"
-+"checksum lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a374c89b9db55895453a74c1e38861d9deec0b01b405a82516e9d5de4820dea1"
++"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 +"checksum lazysort 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e22ff43b231e0e2f87d74984e53ebc73b90ae13397e041214fb07efc64168f"
 +"checksum libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)" = "34fcd2c08d2f832f376f4173a231990fa5aef4e99fb569867318a227ef4c06ba"
 +"checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
-+"checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6"
++"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
 +"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
 +"checksum md6 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "54e5826684849cecd3fa05a6a5052c50a3542f163a9917ff0b91379426a2e45d"
-+"checksum memchr 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e1dd4eaac298c32ce07eb6ed9242eda7d82955b9170b7d6db59b2e02cc63fcb8"
++"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e"
 +"checksum mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ba626b8a6de5da682e1caa06bdb42a335aee5a84db8e5046a3e8ab17ba0a3ae0"
-+"checksum mime_guess 1.8.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2d4c0961143b8efdcfa29c3ae63281601b446a4a668165454b6c90f8024954c5"
-+"checksum miniz-sys 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "0300eafb20369952951699b68243ab4334f4b10a88f411c221d444b36c40e649"
-+"checksum miniz_oxide 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c468f2369f07d651a5d0bb2c9079f8488a66d5466efe42d0c5c6466edcb7f71e"
-+"checksum miniz_oxide_c_api 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b7fe927a42e3807ef71defb191dc87d4e24479b221e67015fe38ae2b7b447bab"
++"checksum mime_guess 1.8.7 (registry+https://github.com/rust-lang/crates.io-index)" = "0d977de9ee851a0b16e932979515c0f3da82403183879811bc97d50bd9cc50f7"
++"checksum miniz-sys 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "1e9e3ae51cea1576ceba0dde3d484d30e6e5b86dee0b2d412fe3a16a15c98202"
++"checksum miniz_oxide 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7108aff85b876d06f22503dcce091e29f76733b2bfdd91eebce81f5e68203a10"
 +"checksum modifier 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "41f5c9112cb662acd3b204077e0de5bc66305fa8df65c8019d5adb10e9ab6e58"
-+"checksum native-tls 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f74dbadc8b43df7864539cedb7bc91345e532fdd913cfdc23ad94f4d2d40fbc0"
 +"checksum native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4b2df1a4c22fd44a62147fd8f13dd0f95c9d8ca7b2610299b2a2f9cf8964274e"
-+"checksum nix 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d37e713a259ff641624b6cb20e3b12b2952313ba36b6823c0f16e6cfd9e5de17"
++"checksum nix 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6c722bee1037d430d0f8e687bbdbf222f27cc6e4e68d5caf630857bb2b6dbdce"
 +"checksum num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31"
-+"checksum num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3a5d7cc97d6d30d8b9bc8fa19bf45349ffe46241e8816f50f62f6d6aaabee1"
-+"checksum num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5a69d464bdc213aaaff628444e99578ede64e9c854025aa43b9796530afa9238"
++"checksum num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32"
++"checksum num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bcef43580c035376c0705c42792c294b66974abbfd2789b511784023f71f3273"
 +"checksum openssl 0.10.24 (registry+https://github.com/rust-lang/crates.io-index)" = "8152bb5a9b5b721538462336e3bef9a539f892715e5037fda0f984577311af15"
-+"checksum openssl 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)" = "a3605c298474a3aa69de92d21139fb5e2a81688d308262359d85cdd0d12a7985"
 +"checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
 +"checksum openssl-sys 0.9.49 (registry+https://github.com/rust-lang/crates.io-index)" = "f4fad9e54bd23bd4cbbe48fdc08a1b8091707ac869ef8508edea2fec77dcc884"
 +"checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
++"checksum percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
 +"checksum phf 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18"
 +"checksum phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e"
 +"checksum phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662"
 +"checksum phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0"
-+"checksum pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "676e8eb2b1b4c9043511a9b7bea0915320d7e502b0a079fb03f9635a5252b18c"
++"checksum pkg-config 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)" = "72d5370d90f49f70bd033c3d75e87fc529fbfff9d6f7cccef07d6170079d91ea"
 +"checksum plugin 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "1a6a0dc3910bc8db877ffed8e457763b317cf880df4ae19109b9f77d277cf6e0"
 +"checksum ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e3cbf9f658cdb5000fcf6f362b8ea2ba154b9f146a61c7a20d647034c6b6561b"
 +"checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a"
-+"checksum rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293"
 +"checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
-+"checksum rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d47eab0e83d9693d40f825f86948aa16eff6750ead4bdffc4ab95b8b3a7f052c"
++"checksum rand 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "59cea0d944b32347a1863e95942fd6ebdb486afb4f038119494f2860380c1d51"
 +"checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
 +"checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853"
 +"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
-+"checksum rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e7a549d590831370895ab7ba4ea0c1b6b011d106b5ff2da6eee112615e6dc0"
-+"checksum rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "615e683324e75af5d43d8f7a39ffe3ee4a9dc42c5c701167a71dc59c3a493aca"
++"checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
++"checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
 +"checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4"
 +"checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
 +"checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08"
-+"checksum rand_jitter 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "080723c6145e37503a2224f801f252e14ac5531cb450f4502698542d188cb3c0"
-+"checksum rand_os 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b7c690732391ae0abafced5015ffb53656abfaec61b342290e5eb56b286a679d"
-+"checksum rand_pcg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "086bd09a33c7044e56bb44d5bdde5a60e7f119a9e95b0775f545de759a32fe05"
++"checksum rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b"
++"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
++"checksum rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44"
 +"checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
 +"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
-+"checksum redox_syscall 0.1.51 (registry+https://github.com/rust-lang/crates.io-index)" = "423e376fffca3dfa06c9e9790a9ccd282fafb3cc6e6397d01dbf64f9bacc6b85"
-+"checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76"
-+"checksum regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "37e7cbbd370869ce2e8dff25c7018702d10b21a20ef7135316f8daecd6c25b7f"
-+"checksum regex-syntax 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "8c2f35eedad5295fdf00a63d7d4b238135723f92b434ec06774dad15c7ab0861"
-+"checksum remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3488ba1b9a2084d38645c4c08276a1752dcbf2c7130d74f1569681ad5d2799c5"
++"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
++"checksum regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dc220bd33bdce8f093101afe22a037b8eb0e5af33592e6a9caafff0d4cb81cbd"
++"checksum regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716"
++"checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e"
 +"checksum rfsapi 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1b6fbc119d00459f80252adb96e554766d75de071ed5d3c49f46a000d137cd49"
-+"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
-+"checksum safemem 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8dca453248a96cb0749e36ccdfe2b0b4e54a61bfef89fb97ec621eb8e0a93dd9"
-+"checksum schannel 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "0e1a231dc10abf6749cfa5d7767f25888d484201accbd919b66ab5413c502d56"
-+"checksum security-framework 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "dfa44ee9c54ce5eecc9de7d5acbad112ee58755239381f687e564004ba4a2332"
++"checksum safemem 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d2b08423011dae9a5ca23f07cf57dac3857f5c885d352b76f6d95f4aea9434d0"
++"checksum schannel 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "f2f6abf258d99c3c1c5c2131d99d064e94b7b3dd5f416483057f308fea253339"
 +"checksum security-framework 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "eee63d0f4a9ec776eeb30e220f0bc1e092c3ad744b2a379e3993070364d3adc2"
-+"checksum security-framework-sys 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "5421621e836278a0b139268f36eee0dc7e389b784dc3f79d8f11aabadf41bead"
 +"checksum security-framework-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9636f8989cbf61385ae4824b98c1aaa54c994d7d8b41f11c601ed799f0549a56"
-+"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
-+"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 +"checksum serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)" = "34b623917345a631dc9608d5194cc206b3fe6c3554cd1c75b937e55e285254af"
 +"checksum serde_codegen_internals 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bc888bd283bd2420b16ad0d860e35ad8acb21941180a83a189bb2046f9d00400"
 +"checksum serde_derive 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)" = "978fd866f4d4872084a81ccc35e275158351d3b9fe620074e7d7504b816b74ba"
 +"checksum serde_json 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ad8bcf487be7d2e15d3d543f04312de991d631cfe1b43ea0ade69e6a8a5b16a1"
 +"checksum siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac"
-+"checksum smallvec 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)" = "88aea073965ab29f6edb5493faf96ad662fb18aa9eeb186a3b7057951605ed15"
-+"checksum strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550"
++"checksum smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ab606a9c5e214920bb66c458cd7be8ef094f813f20fe77a54cc7dbfff220d4b7"
++"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
 +"checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad"
 +"checksum synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6"
-+"checksum tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8"
++"checksum tabwriter 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9128e3a9149e51494cad59712a286e149fcb74e443d2298d69bd6eaa42cc4ebb"
 +"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
-+"checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096"
-+"checksum textwrap 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "307686869c93e71f94da64286f9a9524c0f308a9e1c87a583de8e9c9039ad3f6"
++"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
 +"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
 +"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
 +"checksum traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079"
 +"checksum trivial_colours 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7153365ea16c5a0ce2eebc4da1b33339a6b21d90c49f670e82130639656bb458"
 +"checksum typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1410f6f91f21d1612654e7cc69193b0334f909dcf2c790c4826254fbb86f8887"
 +"checksum typemap 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "653be63c80a3296da5551e1bfd2cca35227e13cdd08c6668903ae2f4f77aa1f6"
-+"checksum ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "535c204ee4d8434478593480b8f86ab45ec9aae0e83c568ca81abf0fd0e88f86"
 +"checksum unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33"
-+"checksum unicase 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9d3218ea14b4edcaccfa0df0a64a3792a2c32cc706f1b336e48867f9d3147f90"
++"checksum unicase 2.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2e2e6bd1e59e56598518beb94fd6db628ded570326f0a98c679a304bd9f00150"
 +"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
 +"checksum unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "141339a08b982d942be2ca06ff8b076563cbe223d1befd5450716790d44e2426"
-+"checksum unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526"
++"checksum unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7007dbd421b92cc6e28410fe7362e2e0a2503394908f417b68ec8d1c364c4e20"
 +"checksum unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc"
-+"checksum unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56"
 +"checksum unsafe-any 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f30360d7979f5e9c6e6cea48af192ea8fab4afb3cf72597154b8f08935bc9c7f"
 +"checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a"
-+"checksum utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "796f7e48bef87609f7ade7e06495a87d5cd06c7866e6a5cbfceffc558a243737"
-+"checksum vcpkg 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "def296d3eb3b12371b2c7d0e83bfe1403e4db2d7a0bba324a12b21c4ee13143d"
++"checksum vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "33dd455d0f96e90a75803cfeb7f948768c08d70a6de9a8d2362461935698bf95"
 +"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
 +"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
 +"checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
-+"checksum wasi 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fd5442abcac6525a045cc8c795aedb60da7a2e5e89c7bf18a0d5357849bb23c7"
-+"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
-+"checksum winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "92c1eb33641e276cfa214a0522acad57be5c56b10cb348b3c5117db75f3ac4b0"
-+"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
++"checksum vswhom 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b"
++"checksum vswhom-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc2f5402d3d0e79a069714f7b48e3ecc60be7775a2c049cb839457457a239532"
++"checksum wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d"
++"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
 +"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 +"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-+"checksum winreg 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf285379f20d7f26abd990d9a566be9d31ab7a9d335299baaa1f0604f5f96af"
++"checksum winreg 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a27a759395c1195c4cc5cda607ef6f8f6498f64e78f7900f5de0a127a424704a"
diff --git a/pkgs/tools/networking/httplz/default.nix b/pkgs/tools/networking/httplz/default.nix
index 001041a0799..6c84ac8da70 100644
--- a/pkgs/tools/networking/httplz/default.nix
+++ b/pkgs/tools/networking/httplz/default.nix
@@ -1,25 +1,36 @@
-{ stdenv, lib, fetchFromGitHub, rustPlatform, openssl, pkgconfig, darwin, libiconv }:
+{ stdenv, lib, fetchFromGitHub, makeWrapper, rustPlatform
+, openssl, pkgconfig, darwin, libiconv }:
 
 rustPlatform.buildRustPackage rec {
   pname = "httplz";
-  version = "1.5.2";
+  version = "1.6.0";
 
   src = fetchFromGitHub {
     owner = "thecoshman";
     repo = "http";
     rev = "v${version}";
-    sha256 = "0q9ng8vf01k65zmcm7bbkqyrkj5hs86zdxwrfj98f4xqxrm75rf6";
+    sha256 = "1y9mlbympb19i3iw7s7jm7lvkpcl4w0sig6jnd4w3ykhkdhzh6di";
   };
 
-  buildInputs = [ openssl pkgconfig ] ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ];
+  nativeBuildInputs = [ makeWrapper ];
+  buildInputs = [
+    openssl pkgconfig
+  ] ++ lib.optionals stdenv.isDarwin [
+    libiconv darwin.apple_sdk.frameworks.Security
+  ];
 
   cargoBuildFlags = [ "--bin httplz" ];
   cargoPatches = [ ./cargo-lock.patch ];
-  cargoSha256 = "18qr3sy4zj4lwbzrz98d82kwagfbzkmrxk5sxl7w9vhdzy2diskw";
+  cargoSha256 = "1bxh7p2a04lpghqms8cx1f1cq5nbcx6cxh5ac7i72d5vzy4v07nl";
+
+  postInstall = ''
+    wrapProgram $out/bin/httplz \
+      --prefix PATH : "${openssl}/bin"
+  '';
 
   meta = with stdenv.lib; {
     description = "A basic http server for hosting a folder fast and simply";
-    homepage = https://github.com/thecoshman/http;
+    homepage = "https://github.com/thecoshman/http";
     license = licenses.mit;
     maintainers = with maintainers; [ bbigras ];
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 77510a4d65d..bd67fe85526 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3855,7 +3855,7 @@ in
 
   httping = callPackage ../tools/networking/httping {};
 
-  httplz = callPackage ../tools/networking/httplz { openssl = openssl_1_0_2; };
+  httplz = callPackage ../tools/networking/httplz { };
 
   httpfs2 = callPackage ../tools/filesystems/httpfs { };
 
-- 
GitLab


From 2f4fffd9c9cb13a5860a02fdf807db54e11d0fb6 Mon Sep 17 00:00:00 2001
From: Vladyslav M <dywedir@gra.red>
Date: Sat, 14 Sep 2019 13:01:48 +0300
Subject: [PATCH 0226/2254] broot: 0.9.0 -> 0.9.4

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

diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix
index b183df701a7..93084640e76 100644
--- a/pkgs/tools/misc/broot/default.nix
+++ b/pkgs/tools/misc/broot/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "broot";
-  version = "0.9.0";
+  version = "0.9.4";
 
   src = fetchFromGitHub {
     owner = "Canop";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0i6ayp295xnppq92lc1fsfyrjkxrkvsva07yby45qa0l92nihqpy";
+    sha256 = "1im04vlhmjdwzp19pizk4bmzvybgjg40ig833qx5lbisfs74xyxw";
   };
 
-  cargoSha256 = "1qdi1l0k0v00r9mfxgf09dzkvgxn07rcsl2yyyrhvcn731ak302y";
+  cargoSha256 = "0675995zh9nn690kdha3zfsa157173rxwcqz0kasbl9byjczi6sm";
 
   meta = with stdenv.lib; {
     description = "An interactive tree view, a fuzzy search, a balanced BFS descent and customizable commands";
-- 
GitLab


From e5e6b514f5d4ec28a29e8a8489cb5c55101b4654 Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Sat, 14 Sep 2019 11:11:30 +0100
Subject: [PATCH 0227/2254] citrix-receiver: decomission in favor of
 citrix-workspace.

Already documented in #64645
---
 doc/package-specific-user-notes.xml           |   6 +-
 nixos/doc/manual/release-notes/rl-1909.xml    |   6 +
 .../remote/citrix-receiver/default.nix        | 215 ------------------
 .../remote/citrix-receiver/wrapper.nix        |  19 --
 pkgs/top-level/all-packages.nix               |  27 +--
 5 files changed, 15 insertions(+), 258 deletions(-)
 delete mode 100644 pkgs/applications/networking/remote/citrix-receiver/default.nix
 delete mode 100644 pkgs/applications/networking/remote/citrix-receiver/wrapper.nix

diff --git a/doc/package-specific-user-notes.xml b/doc/package-specific-user-notes.xml
index a176f4d1395..ef23b022c88 100644
--- a/doc/package-specific-user-notes.xml
+++ b/doc/package-specific-user-notes.xml
@@ -416,7 +416,7 @@ overrides = self: super: rec {
     <para>
      Please note that the <literal>citrix_receiver</literal> package has been deprecated since its
      development was <link xlink:href="https://docs.citrix.com/en-us/citrix-workspace-app.html">discontinued by upstream</link>
-     and will be replaced by <link xlink:href="https://www.citrix.com/products/workspace-app/">the citrix workspace app</link>.
+     and has been replaced by <link xlink:href="https://www.citrix.com/products/workspace-app/">the citrix workspace app</link>.
     </para>
    </note>
    <link xlink:href="https://www.citrix.com/products/receiver/">Citrix Receiver</link> and
@@ -458,7 +458,7 @@ overrides = self: super: rec {
    <title>Custom certificates</title>
 
    <para>
-    The <literal>Citrix Receiver</literal> and <literal>Citrix Workspace App</literal>
+    The <literal>Citrix Workspace App</literal>
     in <literal>nixpkgs</literal> trust several certificates
     <link xlink:href="https://curl.haxx.se/docs/caextract.html">from the
     Mozilla database</link> by default. However several companies using Citrix
@@ -472,7 +472,7 @@ overrides = self: super: rec {
 <programlisting>
 <![CDATA[with import <nixpkgs> { config.allowUnfree = true; };
 let extraCerts = [ ./custom-cert-1.pem ./custom-cert-2.pem /* ... */ ]; in
-citrix_workspace.override { # the same applies for `citrix_receiver` if used.
+citrix_workspace.override {
   inherit extraCerts;
 }]]>
 </programlisting>
diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
index f9cea242c15..58ab7207f53 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -478,6 +478,12 @@
      Prometheus 2 is now configured with <literal>services.prometheus</literal>.
     </para>
    </listitem>
+   <listitem>
+     <para>
+       Citrix Receiver (<literal>citrix_receiver</literal>) has been dropped in favor of Citrix Workspace
+       (<literal>citrix_workspace</literal>).
+     </para>
+   </listitem>
   </itemizedlist>
  </section>
 
diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix
deleted file mode 100644
index 8d21f64765d..00000000000
--- a/pkgs/applications/networking/remote/citrix-receiver/default.nix
+++ /dev/null
@@ -1,215 +0,0 @@
-{ stdenv
-, lib
-, fetchurl
-, requireFile
-, makeWrapper
-, libredirect
-, busybox
-, file
-, makeDesktopItem
-, tzdata
-, cacert
-, glib
-, gtk2
-, atk
-, gdk-pixbuf
-, cairo
-, pango
-, gnome3
-, xorg
-, libpng12
-, freetype
-, fontconfig
-, gtk_engines
-, alsaLib
-, libidn
-, zlib
-, version ? "13.10.0"
-}:
-
-let
-  # In 56e1bdc7f9c (libidn: 1.34 -> 1.35), libidn.so.11 became libidn.so.12.
-  # Citrix looks for the former so we build version 1.34 to please the binary
-  libidn_134 = libidn.overrideDerivation (_: rec {
-    name = "libidn-1.34";
-    src = fetchurl {
-      url = "mirror://gnu/libidn/${name}.tar.gz";
-      sha256 = "0g3fzypp0xjcgr90c5cyj57apx1cmy0c6y9lvw2qdcigbyby469p";
-    };
-  });
-
-  versionInfo = let
-    supportedVersions = {
-      "13.10.0" = {
-        major     = "13";
-        minor     = "10";
-        patch     = "0";
-        x64hash   = "7025688C7891374CDA11C92FC0BA2FA8151AEB4C4D31589AD18747FAE943F6EA";
-        x86hash   = "2DCA3C8EDED11C5D824D579BC3A6B7D531EAEDDCBFB16E91B5702C72CAE9DEE4";
-        x64suffix = "20";
-        x86suffix = "20";
-        homepage  = https://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-latest.html;
-      };
-    };
-
-    # break an evaluation for old Citrix versions rather than exiting with
-    # an "attribute name not found" error to avoid confusion.
-    deprecatedVersions = let
-      versions = [ "13.8.0" "13.9.0" "13.9.1" ];
-    in
-      lib.listToAttrs
-        (lib.forEach versions
-          (v: lib.nameValuePair v (throw "Unsupported citrix_receiver version: ${v}")));
-  in
-    deprecatedVersions // supportedVersions;
-
-  citrixReceiverForVersion = { major, minor, patch, x86hash, x64hash, x86suffix, x64suffix, homepage }:
-    stdenv.mkDerivation rec {
-      pname = "citrix-receiver";
-      version  = "${major}.${minor}.${patch}";
-      inherit homepage;
-
-      prefixWithBitness = if stdenv.is64bit then "linuxx64" else "linuxx86";
-
-      src = requireFile rec {
-        name    = if stdenv.is64bit then "${prefixWithBitness}-${version}.${x64suffix}.tar.gz" else "${prefixWithBitness}-${version}.${x86suffix}.tar.gz";
-        sha256  = if stdenv.is64bit then x64hash else x86hash;
-        message = ''
-          In order to use Citrix Receiver, you need to comply with the Citrix EULA and download
-          the ${if stdenv.is64bit then "64-bit" else "32-bit"} binaries, .tar.gz from:
-
-          ${homepage}
-
-          (if you do not find version ${version} there, try at
-          https://www.citrix.com/downloads/citrix-receiver/legacy-receiver-for-linux/
-          or at https://www.citrix.com/downloads/citrix-receiver/ under "Earlier Versions of Receiver for Linux")
-
-          Once you have downloaded the file, please use the following command and re-run the
-          installation:
-
-          nix-prefetch-url file://\$PWD/${name}
-        '';
-      };
-
-      dontBuild = true;
-
-      sourceRoot = ".";
-
-      buildInputs = [
-        makeWrapper
-        busybox
-        file
-        gtk2
-        gdk-pixbuf
-      ];
-
-      libPath = stdenv.lib.makeLibraryPath [
-        glib
-        gtk2
-        atk
-        gdk-pixbuf
-        cairo
-        pango
-        gnome3.dconf
-        xorg.libX11
-        xorg.libXext
-        xorg.libXrender
-        xorg.libXinerama
-        xorg.libXfixes
-        libpng12
-        libidn_134
-        zlib
-        gtk_engines
-        freetype
-        fontconfig
-        alsaLib
-        stdenv.cc.cc # Fixes: Can not load [..]/opt/citrix-icaclient/lib/ctxh264_fb.so:(null)
-      ];
-
-      desktopItem = makeDesktopItem {
-        name        = "wfica";
-        desktopName = "Citrix Receiver";
-        genericName = "Citrix Receiver";
-        exec        = "wfica";
-        icon        = "wfica";
-        comment     = "Connect to remote Citrix server";
-        categories  = "GTK;GNOME;X-GNOME-NetworkSettings;Network;";
-        mimeType    = "application/x-ica";
-      };
-
-      installPhase = ''
-        runHook preInstall
-
-        export ICAInstDir="$out/opt/citrix-icaclient"
-
-        sed -i \
-          -e 's,^main_install_menu$,install_ICA_client,g' \
-          -e 's,^integrate_ICA_client(),alias integrate_ICA_client=true\nintegrate_ICA_client_old(),g' \
-          -e 's,^ANSWER=""$,ANSWER="$INSTALLER_YES",' \
-          -e 's,/bin/true,true,g' \
-          ./${prefixWithBitness}/hinst
-
-        # Run the installer...
-        bash ./${prefixWithBitness}/hinst CDROM "`pwd`"
-
-        echo "Deleting broken links..."
-        for link in `find $ICAInstDir -type l `
-        do
-          [ -f "$link" ] || rm -v "$link"
-        done
-
-        echo "Expanding certificates..."
-        # As explained in https://wiki.archlinux.org/index.php/Citrix#Security_Certificates
-        pushd "$ICAInstDir/keystore/cacerts"
-        awk 'BEGIN {c=0;} /BEGIN CERT/{c++} { print > "cert." c ".pem"}' < ${cacert}/etc/ssl/certs/ca-bundle.crt
-        popd
-
-        echo "Patching executables..."
-        find $ICAInstDir -type f -exec file {} \; |
-          grep 'ELF.*executable' |
-          cut -f 1 -d : |
-          grep -vi '\(.dll\|.so\)$' | # added as a workaround to https://github.com/NixOS/nixpkgs/issues/41729
-          while read f
-          do
-            echo "Patching ELF intrepreter and rpath for $f"
-            chmod u+w "$f"
-            patchelf \
-              --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
-              --set-rpath "$ICAInstDir:$libPath" "$f"
-          done
-
-        echo "Wrapping wfica..."
-        mkdir "$out/bin"
-
-        makeWrapper "$ICAInstDir/wfica" "$out/bin/wfica" \
-          --add-flags "-icaroot $ICAInstDir" \
-          --set ICAROOT "$ICAInstDir" \
-          --set GTK_PATH "${gtk2.out}/lib/gtk-2.0:${gnome3.gnome-themes-extra}/lib/gtk-2.0" \
-          --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-          --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
-          --set LD_LIBRARY_PATH "$libPath" \
-          --set NIX_REDIRECTS "/usr/share/zoneinfo=${tzdata}/share/zoneinfo:/etc/zoneinfo=${tzdata}/share/zoneinfo:/etc/timezone=$ICAInstDir/timezone"
-
-        echo "We arbitrarily set the timezone to UTC. No known consequences at this point."
-        echo UTC > "$ICAInstDir/timezone"
-
-        echo "Installing desktop item..."
-        mkdir -p $out/share/applications
-        cp ${desktopItem}/share/applications/* $out/share/applications
-
-        # We introduce a dependency on the source file so that it need not be redownloaded everytime
-        echo $src >> "$out/share/nix_dependencies.pin"
-
-        runHook postInstall
-      '';
-
-      meta = with stdenv.lib; {
-        license     = stdenv.lib.licenses.unfree;
-        inherit homepage;
-        description = "Citrix Receiver";
-        maintainers = with maintainers; [ obadz a1russell ma27 ];
-        platforms   = platforms.linux;
-      };
-    };
-
-in citrixReceiverForVersion (lib.getAttr version versionInfo)
diff --git a/pkgs/applications/networking/remote/citrix-receiver/wrapper.nix b/pkgs/applications/networking/remote/citrix-receiver/wrapper.nix
deleted file mode 100644
index 63587030b38..00000000000
--- a/pkgs/applications/networking/remote/citrix-receiver/wrapper.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ citrix_receiver, extraCerts ? [], symlinkJoin }:
-
-let
-
-  mkCertCopy = certPath:
-    "cp ${certPath} $out/opt/citrix-icaclient/keystore/cacerts/";
-
-in
-
-if builtins.length extraCerts == 0 then citrix_receiver else symlinkJoin {
-  name = "citrix-with-extra-certs-${citrix_receiver.version}";
-  paths = [ citrix_receiver ];
-
-  postBuild = ''
-    ${builtins.concatStringsSep "\n" (map mkCertCopy extraCerts)}
-
-    sed -i -E "s,-icaroot (.+citrix-icaclient),-icaroot $out/opt/citrix-icaclient," $out/bin/wfica
-  '';
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 77510a4d65d..1ce8eede202 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2220,27 +2220,12 @@ in
 
   circleci-cli = callPackage ../development/tools/misc/circleci-cli { };
 
-  citrix_receiver_unwrapped = callPackage ../applications/networking/remote/citrix-receiver { };
-  citrix_receiver_unwrapped_13_10_0 = citrix_receiver_unwrapped.override { version = "13.10.0"; };
-  citrix_receiver_unwrapped_13_9_1  = citrix_receiver_unwrapped.override { version = "13.9.1";  };
-  citrix_receiver_unwrapped_13_9_0  = citrix_receiver_unwrapped.override { version = "13.9.0";  };
-  citrix_receiver_unwrapped_13_8_0  = citrix_receiver_unwrapped.override { version = "13.8.0";  };
-
-  citrix_receiver = callPackage ../applications/networking/remote/citrix-receiver/wrapper.nix {
-    citrix_receiver = citrix_receiver_unwrapped;
-  };
-  citrix_receiver_13_10_0 = callPackage ../applications/networking/remote/citrix-receiver/wrapper.nix {
-    citrix_receiver = citrix_receiver_unwrapped_13_10_0;
-  };
-  citrix_receiver_13_9_1 = callPackage ../applications/networking/remote/citrix-receiver/wrapper.nix {
-    citrix_receiver = citrix_receiver_unwrapped_13_9_1;
-  };
-  citrix_receiver_13_9_0 = callPackage ../applications/networking/remote/citrix-receiver/wrapper.nix {
-    citrix_receiver = citrix_receiver_unwrapped_13_9_0;
-  };
-  citrix_receiver_13_8_0 = callPackage ../applications/networking/remote/citrix-receiver/wrapper.nix {
-    citrix_receiver = citrix_receiver_unwrapped_13_8_0;
-  };
+  # Cleanup before 20.03:
+  citrix_receiver = throw "citrix_receiver has been discontinued by Citrix (https://docs.citrix.com/en-us/citrix-workspace-app.html). Please use citrix_workspace.";
+  citrix_receiver_13_10_0 = citrix_receiver;
+  citrix_receiver_13_9_1  = citrix_receiver;
+  citrix_receiver_13_9_0  = citrix_receiver;
+  citrix_receiver_13_8_0  = citrix_receiver;
 
   citrix_workspace_unwrapped = callPackage ../applications/networking/remote/citrix-workspace { };
   citrix_workspace_unwrapped_19_8_0 = citrix_workspace_unwrapped.override { version = "19.8.0"; };
-- 
GitLab


From 148c82e07e91222b82fe5fc448cbe6a11d695fe3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miguel=20Madrid=20Menc=C3=ADa?=
 <miguel.madrid.mencia@gmail.com>
Date: Sat, 14 Sep 2019 12:15:46 +0200
Subject: [PATCH 0228/2254] maintainer: mimadrid: update github username and
 personal data

---
 maintainers/maintainer-list.nix                        | 10 +++++-----
 pkgs/applications/graphics/gthumb/default.nix          |  2 +-
 pkgs/applications/science/biology/bcftools/default.nix |  2 +-
 pkgs/applications/science/biology/igv/default.nix      |  2 +-
 pkgs/applications/science/biology/samtools/default.nix |  2 +-
 pkgs/applications/science/math/weka/default.nix        |  2 +-
 pkgs/applications/science/misc/cytoscape/default.nix   |  2 +-
 pkgs/applications/version-management/meld/default.nix  |  2 +-
 pkgs/data/misc/shared-mime-info/default.nix            |  2 +-
 .../libraries/science/biology/htslib/default.nix       |  2 +-
 .../development/tools/misc/universal-ctags/default.nix |  2 +-
 pkgs/games/klavaro/default.nix                         |  2 +-
 12 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index f28161573dd..3a761915d8a 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4156,11 +4156,11 @@
     email = "miltador@yandex.ua";
     name = "Vasiliy Solovey";
   };
-  mimadrid = {
-    email = "mimadrid@ucm.es";
-    github = "mimadrid";
+  mimame = {
+    email = "miguel.madrid.mencia@gmail.com";
+    github = "mimame";
     githubId = 3269878;
-    name = "Miguel Madrid";
+    name = "Miguel Madrid Mencía";
   };
   minijackson = {
     email = "minijackson@riseup.net";
@@ -6649,7 +6649,7 @@
     githubId = 1525767;
     name = "Vaibhav Sagar";
   };
-  valebes = {  
+  valebes = {
     email = "valebes@gmail.com";
     github = "valebes";
     githubid = 10956211;
diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix
index 6bcee18651b..f24d57786ef 100644
--- a/pkgs/applications/graphics/gthumb/default.nix
+++ b/pkgs/applications/graphics/gthumb/default.nix
@@ -103,6 +103,6 @@ stdenv.mkDerivation rec {
     description = "Image browser and viewer for GNOME";
     platforms = platforms.linux;
     license = licenses.gpl2Plus;
-    maintainers = [ maintainers.mimadrid ];
+    maintainers = [ maintainers.mimame ];
   };
 }
diff --git a/pkgs/applications/science/biology/bcftools/default.nix b/pkgs/applications/science/biology/bcftools/default.nix
index d8ffbb74e6b..33e4de0d95a 100644
--- a/pkgs/applications/science/biology/bcftools/default.nix
+++ b/pkgs/applications/science/biology/bcftools/default.nix
@@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
     license = licenses.mit;
     homepage = http://www.htslib.org/;
     platforms = platforms.unix;
-    maintainers = [ maintainers.mimadrid ];
+    maintainers = [ maintainers.mimame ];
   };
 }
diff --git a/pkgs/applications/science/biology/igv/default.nix b/pkgs/applications/science/biology/igv/default.nix
index 412b55f5916..04699a84b69 100644
--- a/pkgs/applications/science/biology/igv/default.nix
+++ b/pkgs/applications/science/biology/igv/default.nix
@@ -28,6 +28,6 @@ stdenv.mkDerivation rec {
     description = "A visualization tool for interactive exploration of genomic datasets";
     license = licenses.lgpl21;
     platforms = platforms.unix;
-    maintainers = [ maintainers.mimadrid ];
+    maintainers = [ maintainers.mimame ];
   };
 }
diff --git a/pkgs/applications/science/biology/samtools/default.nix b/pkgs/applications/science/biology/samtools/default.nix
index dd1a53472db..daa2925de7c 100644
--- a/pkgs/applications/science/biology/samtools/default.nix
+++ b/pkgs/applications/science/biology/samtools/default.nix
@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
     license = licenses.mit;
     homepage = http://www.htslib.org/;
     platforms = platforms.unix;
-    maintainers = [ maintainers.mimadrid ];
+    maintainers = [ maintainers.mimame ];
   };
 }
diff --git a/pkgs/applications/science/math/weka/default.nix b/pkgs/applications/science/math/weka/default.nix
index 90278a744f1..ec9ea0b8533 100644
--- a/pkgs/applications/science/math/weka/default.nix
+++ b/pkgs/applications/science/math/weka/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.cs.waikato.ac.nz/ml/weka/;
     description = "Collection of machine learning algorithms for data mining tasks";
     license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = [ stdenv.lib.maintainers.mimadrid ];
+    maintainers = [ stdenv.lib.maintainers.mimame ];
     platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/applications/science/misc/cytoscape/default.nix b/pkgs/applications/science/misc/cytoscape/default.nix
index 2e19012af87..8c8c09d25a0 100644
--- a/pkgs/applications/science/misc/cytoscape/default.nix
+++ b/pkgs/applications/science/misc/cytoscape/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.cytoscape.org;
     description = "A general platform for complex network analysis and visualization";
     license = stdenv.lib.licenses.lgpl21;
-    maintainers = [stdenv.lib.maintainers.mimadrid];
+    maintainers = [stdenv.lib.maintainers.mimame];
     platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix
index 168827c3548..5342a0697ab 100644
--- a/pkgs/applications/version-management/meld/default.nix
+++ b/pkgs/applications/version-management/meld/default.nix
@@ -60,6 +60,6 @@ python3.pkgs.buildPythonApplication rec {
     homepage = http://meldmerge.org/;
     license = licenses.gpl2;
     platforms = platforms.linux ++ platforms.darwin;
-    maintainers = with maintainers; [ jtojnar mimadrid ];
+    maintainers = with maintainers; [ jtojnar mimame ];
   };
 }
diff --git a/pkgs/data/misc/shared-mime-info/default.nix b/pkgs/data/misc/shared-mime-info/default.nix
index 6952d2da6ba..6569efa2cde 100644
--- a/pkgs/data/misc/shared-mime-info/default.nix
+++ b/pkgs/data/misc/shared-mime-info/default.nix
@@ -20,6 +20,6 @@ stdenv.mkDerivation {
     homepage = http://freedesktop.org/wiki/Software/shared-mime-info;
     license = licenses.gpl2Plus;
     platforms = platforms.unix;
-    maintainers = [ maintainers.mimadrid ];
+    maintainers = [ maintainers.mimame ];
   };
 }
diff --git a/pkgs/development/libraries/science/biology/htslib/default.nix b/pkgs/development/libraries/science/biology/htslib/default.nix
index 367fc635c8b..0b13696ad5f 100644
--- a/pkgs/development/libraries/science/biology/htslib/default.nix
+++ b/pkgs/development/libraries/science/biology/htslib/default.nix
@@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
     license = licenses.mit;
     homepage = http://www.htslib.org/;
     platforms = platforms.unix;
-    maintainers = [ maintainers.mimadrid ];
+    maintainers = [ maintainers.mimame ];
   };
 }
diff --git a/pkgs/development/tools/misc/universal-ctags/default.nix b/pkgs/development/tools/misc/universal-ctags/default.nix
index bad3ecd9241..47aa4917814 100644
--- a/pkgs/development/tools/misc/universal-ctags/default.nix
+++ b/pkgs/development/tools/misc/universal-ctags/default.nix
@@ -42,6 +42,6 @@ stdenv.mkDerivation {
     platforms = platforms.unix;
     # universal-ctags is preferred over emacs's ctags
     priority = 1;
-    maintainers = [ maintainers.mimadrid ];
+    maintainers = [ maintainers.mimame ];
   };
 }
diff --git a/pkgs/games/klavaro/default.nix b/pkgs/games/klavaro/default.nix
index e2a4cff291b..f58f86cd8fb 100644
--- a/pkgs/games/klavaro/default.nix
+++ b/pkgs/games/klavaro/default.nix
@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
     homepage = http://klavaro.sourceforge.net/;
     license = stdenv.lib.licenses.gpl3Plus;
     platforms = stdenv.lib.platforms.linux;
-    maintainers = [stdenv.lib.maintainers.mimadrid];
+    maintainers = [stdenv.lib.maintainers.mimame];
   };
 }
-- 
GitLab


From a5d5133e9c7ad37b161ecde4d96f6beb80a0d5f5 Mon Sep 17 00:00:00 2001
From: Lily Ballard <lily@sb.org>
Date: Sat, 14 Sep 2019 03:17:05 -0700
Subject: [PATCH 0229/2254] jazzy: 0.10.0 -> 0.11.0 (#68766)

* gem-config: fix sassc on darwin

By default the sassc gem compiles with LTO, but LTO is currently broken
on darwin.

* jazzy: 0.10.0 -> 0.11.0
---
 .../ruby-modules/gem-config/default.nix       |  5 +-
 pkgs/development/tools/jazzy/Gemfile.lock     | 32 ++++----
 pkgs/development/tools/jazzy/gemset.nix       | 78 +++++++------------
 3 files changed, 43 insertions(+), 72 deletions(-)

diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index e9f57d2b85f..a03e40e8097 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -507,7 +507,10 @@ in
       substituteInPlace lib/sassc/native.rb \
         --replace 'gem_root = spec.gem_dir' 'gem_root = File.join(__dir__, "../../")'
     '';
-  };
+  } // (if stdenv.isDarwin then {
+    # https://github.com/NixOS/nixpkgs/issues/19098
+    buildFlags = "--disable-lto";
+  } else {});
 
   scrypt = attrs:
     if stdenv.isDarwin then {
diff --git a/pkgs/development/tools/jazzy/Gemfile.lock b/pkgs/development/tools/jazzy/Gemfile.lock
index fbfba32814b..45b6a14eb08 100644
--- a/pkgs/development/tools/jazzy/Gemfile.lock
+++ b/pkgs/development/tools/jazzy/Gemfile.lock
@@ -1,18 +1,18 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.0)
+    CFPropertyList (3.0.1)
     activesupport (4.2.11.1)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     atomos (0.1.3)
-    claide (1.0.2)
-    cocoapods (1.7.4)
+    claide (1.0.3)
+    cocoapods (1.7.5)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.7.4)
+      cocoapods-core (= 1.7.5)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
       cocoapods-downloader (>= 1.2.2, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -28,7 +28,7 @@ GEM
       nap (~> 1.0)
       ruby-macho (~> 1.4)
       xcodeproj (>= 1.10.0, < 2.0)
-    cocoapods-core (1.7.4)
+    cocoapods-core (1.7.5)
       activesupport (>= 4.0.2, < 6)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
@@ -38,7 +38,7 @@ GEM
       nap
     cocoapods-search (1.0.0)
     cocoapods-stats (1.1.0)
-    cocoapods-trunk (1.3.1)
+    cocoapods-trunk (1.4.0)
       nap (>= 0.8, < 2.0)
       netrc (~> 0.11)
     cocoapods-try (1.1.0)
@@ -51,13 +51,13 @@ GEM
     gh_inspector (1.1.3)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    jazzy (0.10.0)
+    jazzy (0.11.0)
       cocoapods (~> 1.5)
       mustache (~> 1.1)
       open4
       redcarpet (~> 3.4)
       rouge (>= 2.0.6, < 4.0)
-      sass (~> 3.6)
+      sassc (~> 2.1)
       sqlite3 (~> 1.3)
       xcinvoke (~> 0.3.0)
     liferaft (0.0.6)
@@ -68,24 +68,18 @@ GEM
     nap (1.1.0)
     netrc (0.11.0)
     open4 (1.3.4)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
-      ffi (~> 1.0)
-    redcarpet (3.4.0)
-    rouge (3.6.0)
+    redcarpet (3.5.0)
+    rouge (3.10.0)
     ruby-macho (1.4.0)
-    sass (3.7.4)
-      sass-listen (~> 4.0.0)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
+    sassc (2.2.0)
+      ffi (~> 1.9)
     sqlite3 (1.4.1)
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     xcinvoke (0.3.0)
       liferaft (~> 0.0.6)
-    xcodeproj (1.11.0)
+    xcodeproj (1.12.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
diff --git a/pkgs/development/tools/jazzy/gemset.nix b/pkgs/development/tools/jazzy/gemset.nix
index ae544229a50..dada7f43073 100644
--- a/pkgs/development/tools/jazzy/gemset.nix
+++ b/pkgs/development/tools/jazzy/gemset.nix
@@ -25,18 +25,20 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0ykjag3k5msz3sf1j91rb55da2xh596y06m3a4yl79fiy2id0w9z";
+      sha256 = "0fr8sdzs2q1969zqh790w223hjidlwx4hfm4c91gj0va5j5pv3n8";
       type = "gem";
     };
-    version = "3.0.0";
+    version = "3.0.1";
   };
   claide = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0az54rp691hc42yl1xyix2cxv58byhaaf4gxbpghvvq29l476rzc";
+      sha256 = "0kasxsms24fgcdsq680nz99d5lazl9rmz1qkil2y5gbbssx89g0z";
       type = "gem";
     };
-    version = "1.0.2";
+    version = "1.0.3";
   };
   cocoapods = {
     dependencies = ["activesupport" "claide" "cocoapods-core" "cocoapods-deintegrate" "cocoapods-downloader" "cocoapods-plugins" "cocoapods-search" "cocoapods-stats" "cocoapods-trunk" "cocoapods-try" "colored2" "escape" "fourflusher" "gh_inspector" "molinillo" "nap" "ruby-macho" "xcodeproj"];
@@ -44,10 +46,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1h0cnrxh5k61yfh3f3kdx67gwfkvnvaqgsmwbmqpl7ffbpsg5gsc";
+      sha256 = "02gnm6l7f3pxmy7bqns0dhxmanlqp01hkpvng5cxryww17zrq2qz";
       type = "gem";
     };
-    version = "1.7.4";
+    version = "1.7.5";
   };
   cocoapods-core = {
     dependencies = ["activesupport" "fuzzy_match" "nap"];
@@ -55,10 +57,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0xbpaisml77q9k5bk5f7hfkzmnjymzczinvhgim34nvwd00rd30c";
+      sha256 = "1i53x5lhlvyirls2ch45x9wsrfqk7s3zp85lbnwps9abimxj4nh4";
       type = "gem";
     };
-    version = "1.7.4";
+    version = "1.7.5";
   };
   cocoapods-deintegrate = {
     groups = ["default"];
@@ -113,10 +115,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1plssgabdv6hcaq1c3gf43kf1d2prx883q8lzdr6chi5byzzs3yl";
+      sha256 = "1m0p27aij7d0n0b8h7nvyv3q3prcpwisbj7sla0fp2hvn4lqarl5";
       type = "gem";
     };
-    version = "1.3.1";
+    version = "1.4.0";
   };
   cocoapods-try = {
     source = {
@@ -202,15 +204,15 @@
     version = "0.9.5";
   };
   jazzy = {
-    dependencies = ["cocoapods" "mustache" "open4" "redcarpet" "rouge" "sass" "sqlite3" "xcinvoke"];
+    dependencies = ["cocoapods" "mustache" "open4" "redcarpet" "rouge" "sassc" "sqlite3" "xcinvoke"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0sljk5v4823h7kzf0yag7f1vf6sahpqip62xngvrhm3il9dx3j72";
+      sha256 = "0cwsmijhb845lrkwq1gxwa6a698vp47gdxcpav30dghrf1ikyzqm";
       type = "gem";
     };
-    version = "0.10.0";
+    version = "0.11.0";
   };
   liferaft = {
     source = {
@@ -284,44 +286,25 @@
     };
     version = "1.3.4";
   };
-  rb-fsevent = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1lm1k7wpz69jx7jrc92w3ggczkjyjbfziq5mg62vjnxmzs383xx8";
-      type = "gem";
-    };
-    version = "0.10.3";
-  };
-  rb-inotify = {
-    dependencies = ["ffi"];
+  redcarpet = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1fs7hxm9g6ywv2yih83b879klhc4fs8i0p9166z795qmd77dk0a4";
+      sha256 = "0skcyx1h8b5ms0rp2zm3ql6g322b8c1adnkwkqyv7z3kypb4bm7k";
       type = "gem";
     };
-    version = "0.10.0";
-  };
-  redcarpet = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0h9qz2hik4s9knpmbwrzb3jcp3vc5vygp9ya8lcpl7f1l9khmcd7";
-      type = "gem";
-    };
-    version = "3.4.0";
+    version = "3.5.0";
   };
   rouge = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0bxjfg6bgc6zpczc5nsmpd6406b97fg0hldl968rgxkz1m6hblda";
+      sha256 = "07j29vbgsi9v7kpx4lqpmh0hx59i420jig73dy46wx3id1i7vdqz";
       type = "gem";
     };
-    version = "3.6.0";
+    version = "3.10.0";
   };
   ruby-macho = {
     groups = ["default"];
@@ -333,25 +316,16 @@
     };
     version = "1.4.0";
   };
-  sass = {
-    dependencies = ["sass-listen"];
+  sassc = {
+    dependencies = ["ffi"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0p95lhs0jza5l7hqci1isflxakz83xkj97lkvxl919is0lwhv2w0";
-      type = "gem";
-    };
-    version = "3.7.4";
-  };
-  sass-listen = {
-    dependencies = ["rb-fsevent" "rb-inotify"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0xw3q46cmahkgyldid5hwyiwacp590zj2vmswlll68ryvmvcp7df";
+      sha256 = "178iflma5z4qk2lfzlxk8kh942skj45q6v6xwllkqng9xbjlyzkf";
       type = "gem";
     };
-    version = "4.0.0";
+    version = "2.2.0";
   };
   sqlite3 = {
     groups = ["default"];
@@ -397,9 +371,9 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1h73ilwyjwyyhj761an3pmicllw50514gxb6b1r4z4klc9rzxw4j";
+      sha256 = "162gwhrl7ppj6hlmnpp1scvy1ylcv5xqk51826v075sckdqjp8c8";
       type = "gem";
     };
-    version = "1.11.0";
+    version = "1.12.0";
   };
 }
\ No newline at end of file
-- 
GitLab


From a345623f2b05ffcc0c07f9fde5d3348cc7e5ec82 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 14 Sep 2019 12:18:36 +0200
Subject: [PATCH 0230/2254] spidermonkey_1_8_5: fix build with gcc8

closes #68765
closes #68763
---
 pkgs/development/interpreters/spidermonkey/1.8.5.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/interpreters/spidermonkey/1.8.5.nix b/pkgs/development/interpreters/spidermonkey/1.8.5.nix
index 8f9477c4c4a..97d2b67372a 100644
--- a/pkgs/development/interpreters/spidermonkey/1.8.5.nix
+++ b/pkgs/development/interpreters/spidermonkey/1.8.5.nix
@@ -37,6 +37,12 @@ stdenv.mkDerivation {
 
   patchFlags = "-p3";
 
+  # fixes build on gcc8
+  postPatch = ''
+    substituteInPlace ./methodjit/MethodJIT.cpp \
+      --replace 'asm volatile' 'asm'
+  '';
+
   # On the Sheevaplug, ARM, its nanojit thing segfaults in japi-tests in
   # "make check". Disabling tracejit makes it work, but then it needs the
   # patch findvanilla.patch do disable a checker about allocator safety. In case
-- 
GitLab


From ce37a040c262aed26e9c6fd63ba527ba1bc028cc Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 14 Sep 2019 12:58:42 +0200
Subject: [PATCH 0231/2254] nixos/hydra: incorporate upstream changes and
 update test

During the last update, `hydra-notify` was rewritten as a daemon which
listens to postgresql notifications for each build[1]. The module
uses the `hydra-notify.service` unit from upstream's Hydra module and
the VM test ensures that email notifications are sent properly.

Also updated `hydra-init.service` to install `pg_trgm` on a local
database if needed[2].

[1] https://github.com/NixOS/hydra/commit/c7861b85c4c3cc974b27147bbf3cc258b9fe9cc3
[2] https://github.com/NixOS/hydra/commit/8a0a5ec3a3200d4f4d4d38f87d0afdb49f092b39
---
 .../continuous-integration/hydra/default.nix  | 20 +++++++++++++++++++
 nixos/tests/hydra/create-trivial-project.sh   |  2 ++
 nixos/tests/hydra/default.nix                 | 17 +++++++++++-----
 3 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix
index 500acb48562..2da10a9a5e2 100644
--- a/nixos/modules/services/continuous-integration/hydra/default.nix
+++ b/nixos/modules/services/continuous-integration/hydra/default.nix
@@ -275,6 +275,7 @@ in
               ${pkgs.sudo}/bin/sudo -u ${config.services.postgresql.superUser} ${config.services.postgresql.package}/bin/createdb -O hydra hydra
               touch ${baseDir}/.db-created
             fi
+            echo "create extension if not exists pg_trgm" | ${pkgs.sudo}/bin/sudo -u ${config.services.postgresql.superUser} -- ${config.services.postgresql.package}/bin/psql hydra
           ''}
 
           if [ ! -e ${cfg.gcRootsDir} ]; then
@@ -379,6 +380,23 @@ in
           };
       };
 
+    systemd.services.hydra-notify =
+      { wantedBy = [ "multi-user.target" ];
+        requires = [ "hydra-init.service" ];
+        after = [ "hydra-init.service" ];
+        restartTriggers = [ hydraConf ];
+        environment = env // {
+          PGPASSFILE = "${baseDir}/pgpass-queue-runner";
+        };
+        serviceConfig =
+          { ExecStart = "@${cfg.package}/bin/hydra-notify hydra-notify";
+            # FIXME: run this under a less privileged user?
+            User = "hydra-queue-runner";
+            Restart = "always";
+            RestartSec = 5;
+          };
+      };
+
     # If there is less than a certain amount of free disk space, stop
     # the queue/evaluator to prevent builds from failing or aborting.
     systemd.services.hydra-check-space =
@@ -416,6 +434,8 @@ in
         hydra-users hydra-queue-runner hydra
         hydra-users hydra-www hydra
         hydra-users root hydra
+        # The postgres user is used to create the pg_trgm extension for the hydra database
+        hydra-users postgres postgres
       '';
 
     services.postgresql.authentication = optionalString haveLocalDB
diff --git a/nixos/tests/hydra/create-trivial-project.sh b/nixos/tests/hydra/create-trivial-project.sh
index 39122c9b473..5aae2d5bf90 100755
--- a/nixos/tests/hydra/create-trivial-project.sh
+++ b/nixos/tests/hydra/create-trivial-project.sh
@@ -44,6 +44,8 @@ cat >data.json <<EOF
   "enabled": "1",
   "visible": "1",
   "keepnr": "1",
+  "enableemail": true,
+  "emailoverride": "hydra@localhost",
   "nixexprinput": "trivial",
   "nixexprpath": "trivial.nix",
   "inputs": {
diff --git a/nixos/tests/hydra/default.nix b/nixos/tests/hydra/default.nix
index 76000450921..6ca05a2c779 100644
--- a/nixos/tests/hydra/default.nix
+++ b/nixos/tests/hydra/default.nix
@@ -55,7 +55,12 @@ let
               notificationSender = "example@example.com";
 
               package = pkgs.hydra.override { inherit nix; };
+
+              extraConfig = ''
+                email_notification = 1
+              '';
             };
+            services.postfix.enable = true;
             nix = {
               buildMachines = [{
                 hostName = "localhost";
@@ -70,12 +75,12 @@ let
           # let the system boot up
           $machine->waitForUnit("multi-user.target");
           # test whether the database is running
-          $machine->succeed("systemctl status postgresql.service");
+          $machine->waitForUnit("postgresql.service");
           # test whether the actual hydra daemons are running
-          $machine->succeed("systemctl status hydra-queue-runner.service");
-          $machine->succeed("systemctl status hydra-init.service");
-          $machine->succeed("systemctl status hydra-evaluator.service");
-          $machine->succeed("systemctl status hydra-send-stats.service");
+          $machine->waitForUnit("hydra-init.service");
+          $machine->requireActiveUnit("hydra-queue-runner.service");
+          $machine->requireActiveUnit("hydra-evaluator.service");
+          $machine->requireActiveUnit("hydra-notify.service");
 
           $machine->succeed("hydra-create-user admin --role admin --password admin");
 
@@ -86,6 +91,8 @@ let
           $machine->succeed("create-trivial-project.sh");
 
           $machine->waitUntilSucceeds('curl -L -s http://localhost:3000/build/1 -H "Accept: application/json" |  jq .buildstatus | xargs test 0 -eq');
+
+          $machine->waitUntilSucceeds('journalctl -eu hydra-notify.service -o cat | grep -q "sending mail notification to hydra@localhost"');
         '';
       })));
 
-- 
GitLab


From 9d1de74063d2dd7fae1dfc4dd2cbeb9834931bc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20M=C3=B6ller?= <fabianm88@gmail.com>
Date: Sat, 14 Sep 2019 13:35:35 +0200
Subject: [PATCH 0232/2254] pythonPackages.portend: fix darwin build

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

diff --git a/pkgs/development/python-modules/portend/default.nix b/pkgs/development/python-modules/portend/default.nix
index 5da7a7941c0..7aa66c2a309 100644
--- a/pkgs/development/python-modules/portend/default.nix
+++ b/pkgs/development/python-modules/portend/default.nix
@@ -24,6 +24,9 @@ buildPythonPackage rec {
     py.test --deselect=test_portend.py::TestChecker::test_check_port_listening
   '';
 
+  # Some of the tests use localhost networking.
+  __darwinAllowLocalNetworking = true;
+
   meta = with stdenv.lib; {
     description = "Monitor TCP ports for bound or unbound states";
     homepage = https://github.com/jaraco/portend;
-- 
GitLab


From bc42ab425b3f93e0eaeb2200be082c5ca70fa725 Mon Sep 17 00:00:00 2001
From: Henrik Jonsson <me@hkjn.me>
Date: Sat, 14 Sep 2019 13:40:32 +0200
Subject: [PATCH 0233/2254] wasabiwallet: 1.1.8 -> 1.1.9

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

diff --git a/pkgs/applications/blockchains/wasabiwallet/default.nix b/pkgs/applications/blockchains/wasabiwallet/default.nix
index 41510eebff6..6a5532f92c9 100644
--- a/pkgs/applications/blockchains/wasabiwallet/default.nix
+++ b/pkgs/applications/blockchains/wasabiwallet/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "wasabiwallet";
-  version = "1.1.8";
+  version = "1.1.9";
 
   src = fetchurl {
     url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/WasabiLinux-${version}.tar.gz";
-    sha256 = "10w4f9d0li25ifkmlmj6302i70sw3drdwd54d4r7x1n5kc6p164j";
+    sha256 = "1dz05ivhadfjfp4yfpz492401yznm3rlnx7g4nqzxwh4cmqzisrm";
   };
 
   dontBuild = true;
-- 
GitLab


From 72ec538d2c76180a8d0f79a13b88794d6efe06a7 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 14 Sep 2019 13:42:06 +0200
Subject: [PATCH 0234/2254] python3Packages.dlib: fix build

The CMake configuring is done in the `setup.py` and doesn't need to be
done by the setup hook. This broke the build as the setup-hook switches
into `source/build` which doesn't have a `setup.py`.

Relying on the setup script from upstream fixes the issue.

ZHF #68361
---
 pkgs/development/python-modules/dlib/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/python-modules/dlib/default.nix b/pkgs/development/python-modules/dlib/default.nix
index d9b3bb93264..a57d8307551 100644
--- a/pkgs/development/python-modules/dlib/default.nix
+++ b/pkgs/development/python-modules/dlib/default.nix
@@ -21,4 +21,7 @@ buildPythonPackage {
   '';
 
   checkInputs = [ pytest more-itertools ];
+
+  enableParallelBuilding = true;
+  dontUseCmakeConfigure = true;
 }
-- 
GitLab


From 42243e46b1c0ee01b6cc52897e495d069c0486ce Mon Sep 17 00:00:00 2001
From: Daniel Schaefer <git@danielschaefer.me>
Date: Sat, 14 Sep 2019 13:34:48 +0200
Subject: [PATCH 0235/2254] twister: 0.9.34 -> 2019-08-19

---
 .../networking/p2p/twister/default.nix        | 19 +++++++------------
 pkgs/top-level/all-packages.nix               |  4 +---
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/networking/p2p/twister/default.nix b/pkgs/applications/networking/p2p/twister/default.nix
index 647b708e102..30491470392 100644
--- a/pkgs/applications/networking/p2p/twister/default.nix
+++ b/pkgs/applications/networking/p2p/twister/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, autoconf, automake, libtool, pkgconfig, python2
+{ stdenv, fetchFromGitHub, fetchpatch, autoconf, automake, libtool, pkgconfig, python2
 , boost, db, openssl, geoip, libiconv, miniupnpc
 , srcOnly, fetchgit
 }:
@@ -17,12 +17,13 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "twister";
-  version = "0.9.34";
+  version = "2019-08-19";
 
-  src = fetchurl {
-    url = "https://github.com/miguelfreitas/twister-core/"
-        + "archive/v${version}.tar.gz";
-    sha256 = "1bi8libivd9y2bn9fc7vbc5q0jnal0pykpzgri6anqaww22y58jq";
+  src = fetchFromGitHub {
+    owner = "miguelfreitas";
+    repo = "twister-core";
+    rev = "31faf3f63e461ea0a9b23081567a4a552cf06873";
+    sha256 = "0xh1lgnl9nd86jr0mp7m8bkd7r5j4d6chd0y73h2xv4aq5sld0sp";
   };
 
   configureFlags = [
@@ -40,12 +41,6 @@ in stdenv.mkDerivation rec {
     boostPython db openssl geoip miniupnpc libiconv
   ];
 
-  patches = stdenv.lib.singleton (fetchpatch {
-    url = "https://github.com/miguelfreitas/twister-core/commit/"
-        + "dd4f5a176958ea6ed855dc3fcef79680c1c0c92c.patch";
-    sha256 = "06fgmqnjyl83civ3ixiq673k8zjgm8n2w4w46nsh810nprqim8s6";
-  });
-
   postPatch = ''
     sed -i -e '/-htmldir/s|(default: [^)]*)|(default: ${twisterHTML})|' \
       src/init.cpp
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bd67fe85526..3ae8c472648 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20872,9 +20872,7 @@ in
 
   tuxguitar = callPackage ../applications/editors/music/tuxguitar { };
 
-  twister = callPackage ../applications/networking/p2p/twister {
-    boost = boost160;
-  };
+  twister = callPackage ../applications/networking/p2p/twister { };
 
   twmn = libsForQt5.callPackage ../applications/misc/twmn { };
 
-- 
GitLab


From ab8bfa7d68494405f59b2ccdee3edecfdd334418 Mon Sep 17 00:00:00 2001
From: rliang <ricardoliang@gmail.com>
Date: Fri, 13 Sep 2019 18:48:43 -0300
Subject: [PATCH 0236/2254] vimPlugins: update

---
 pkgs/misc/vim-plugins/generated.nix    | 205 ++++++++++++++++---------
 pkgs/misc/vim-plugins/vim-plugin-names |   5 +
 2 files changed, 135 insertions(+), 75 deletions(-)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index f3b46348e75..812fbfab98d 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -61,12 +61,12 @@ let
 
   ale = buildVimPluginFrom2Nix {
     pname = "ale";
-    version = "2019-09-01";
+    version = "2019-09-12";
     src = fetchFromGitHub {
       owner = "w0rp";
       repo = "ale";
-      rev = "6e18c03d80c323e740f87103fc05955b5c61b54e";
-      sha256 = "0jgqmliy48fqdhc1lnsbvkgg24z85n7dv8z6k6xxnilcsrhfzds2";
+      rev = "61cfb3fefb0ebd8654be452046bd2ba24025311f";
+      sha256 = "11i5jr5zgvkl7wr99jjldyypbd5xsnyj8q9j379gl2xk5brjwbaf";
     };
   };
 
@@ -292,34 +292,34 @@ let
 
   coc-eslint = buildVimPluginFrom2Nix {
     pname = "coc-eslint";
-    version = "2019-06-17";
+    version = "2019-09-10";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-eslint";
-      rev = "c8f1639146748b46f871144ed471c44741492c97";
-      sha256 = "0adz0wv0kmyhgz5ahqrdkp8lp2nrxh06b6rri2z7jbgplyksa0qc";
+      rev = "943f22365e2b50e7372058c39e5b85d4d5254beb";
+      sha256 = "1p9gn5y9sk7jl6j1nfxhqk1h1xs1lhq2cg5pbilwsb42q5dzr79s";
     };
   };
 
   coc-git = buildVimPluginFrom2Nix {
     pname = "coc-git";
-    version = "2019-09-09";
+    version = "2019-09-10";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-git";
-      rev = "67d6df228ffca7e6247139184fcb53003ccf7810";
-      sha256 = "1xmm07k9c3kzyx4wrkamdpfh1pykihlrs35qcgy8wgqr9msqj9bq";
+      rev = "c463de323cb7f162747e545bff694d6293a9be60";
+      sha256 = "15r8gwsk69gg1p68jgi3gw0m29lbfs7iddcmhgr5qkrvk8rhhi1j";
     };
   };
 
   coc-go = buildVimPluginFrom2Nix {
     pname = "coc-go";
-    version = "2019-09-07";
+    version = "2019-09-13";
     src = fetchFromGitHub {
       owner = "josa42";
       repo = "coc-go";
-      rev = "16005f9249196c54cd85f0407152d04a4c487b30";
-      sha256 = "06jky64f2l4j5sn4v8ij5594afc85d4gk2mxd315j5b16sy661l3";
+      rev = "059f6ecae0849024d299d9e744622d439c73ddca";
+      sha256 = "0n9ffsk9qds5ap3049kw05v167ialhmix28mwygdxgzjvr9qpd4q";
     };
   };
 
@@ -380,12 +380,12 @@ let
 
   coc-json = buildVimPluginFrom2Nix {
     pname = "coc-json";
-    version = "2019-07-09";
+    version = "2019-09-12";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-json";
-      rev = "ed9743a6cfe1db5139e3a42f6aea01d3004be01b";
-      sha256 = "0h3dwcv931xs5y87kqyq2my5z85xv904cbmr41bj8mn1myw8chsf";
+      rev = "ad75187c954f55ec3f92ca9ac5d9f77347b0bbfe";
+      sha256 = "0hwv394498qz6bb5zl2i57d18dbl4faxmh3g2d8mfggmx16pv41n";
     };
   };
 
@@ -413,23 +413,23 @@ let
 
   coc-pairs = buildVimPluginFrom2Nix {
     pname = "coc-pairs";
-    version = "2019-09-09";
+    version = "2019-09-10";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-pairs";
-      rev = "318e8123b11d231ceb48c0e7dd9864881115d873";
-      sha256 = "0r9cnqn6mr6b9g7ahjhfxr7s82a6wcwxhwm22s6vparaa45k4mk0";
+      rev = "26b1be159c2f24d74c6f175e91b6a8fbd3868e9a";
+      sha256 = "16g2wz87l1pskn6ri71sdm1j5r4h8z1vjdg3ksqs6mz9x2vzy2zz";
     };
   };
 
   coc-prettier = buildVimPluginFrom2Nix {
     pname = "coc-prettier";
-    version = "2019-07-28";
+    version = "2019-09-10";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-prettier";
-      rev = "79ebb637c533dbddd774be8d87ff80b27650dcc9";
-      sha256 = "16ggli5ixxaa03f60j66my3zw64ciyi7pgqnf5i2k94yk35bi0d6";
+      rev = "b78dcb1000841a428d23d457ac93c190b98f7b35";
+      sha256 = "0krc9dnzglh8rff68xyp27qjdgmqhxvl94jy1x4asl5a5srzz7v7";
     };
   };
 
@@ -457,12 +457,12 @@ let
 
   coc-rls = buildVimPluginFrom2Nix {
     pname = "coc-rls";
-    version = "2019-07-13";
+    version = "2019-09-10";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-rls";
-      rev = "0c005a817016412e6fba56ab81d20a949c42fbd1";
-      sha256 = "0h5a1a9s9rarafmfy2i77rrsmg9393hdk53v3hfzs0f00q9qk7wn";
+      rev = "6d6cbb2768304bca987f83d23e7fe56b7fe66c2b";
+      sha256 = "18jz9qjxkb6626pnc5gmcfxq7yyyqnvalcllapsrk19ji6ykfi7k";
     };
   };
 
@@ -512,12 +512,12 @@ let
 
   coc-tabnine = buildVimPluginFrom2Nix {
     pname = "coc-tabnine";
-    version = "2019-08-23";
+    version = "2019-09-12";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-tabnine";
-      rev = "d6617d0ae2b2ba0f415961fed1ffc3827d06db54";
-      sha256 = "1drxhjr6yv4qja0z9pypq14lj18rkw0hpwcg0ji2fgiqrf2l9ywj";
+      rev = "cb787892b860a53fea65954b4afa32331ab17851";
+      sha256 = "0c7hk8alggvz837w48fqiz3d01z56pxg2qss13qpp01kvvw12np6";
     };
   };
 
@@ -890,12 +890,12 @@ let
 
   deoplete-lsp = buildVimPluginFrom2Nix {
     pname = "deoplete-lsp";
-    version = "2019-09-09";
+    version = "2019-09-11";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "deoplete-lsp";
-      rev = "9e5ab5d5ea955711bce2a64535ec42d9e76aa3fe";
-      sha256 = "1552fr18drc8q7qha8gbfckp906fihx8xdpj7z7y0yiw20bc4kk3";
+      rev = "28b15222852a0668b25ce04b66302275ea8cd4c5";
+      sha256 = "05n1smyjlzzq428h5hfs0drifxwjbshc9csv8jx7yjwpm4gqy2md";
     };
   };
 
@@ -1035,12 +1035,12 @@ let
 
   falcon = buildVimPluginFrom2Nix {
     pname = "falcon";
-    version = "2019-09-09";
+    version = "2019-09-12";
     src = fetchFromGitHub {
       owner = "fenetikm";
       repo = "falcon";
-      rev = "96eace33dd16d553a9318f08209f108ec69c5cd7";
-      sha256 = "09q9rk69xrj30knfdq5s4xxmiwnazs1l7lrsqwxpn0ggq8ryk5qd";
+      rev = "3ba858de194fc53b301fb640ab71b4263bc66175";
+      sha256 = "1vbzlq7k2l0yqhdcnldkliwyzqskf1bqjgxl2l4c0nj8rcjm5bw3";
     };
   };
 
@@ -1774,12 +1774,12 @@ let
 
   neoterm = buildVimPluginFrom2Nix {
     pname = "neoterm";
-    version = "2019-09-01";
+    version = "2019-09-12";
     src = fetchFromGitHub {
       owner = "kassio";
       repo = "neoterm";
-      rev = "f53fa5177c01180ea538290657721e1accbb02fe";
-      sha256 = "0v162hpl881dhb61vkyi4bvny5zn74pknlyh1liyhw6jy5hgc9b8";
+      rev = "511f6c64ca2530f4356e0b301ee0f34b956ac7aa";
+      sha256 = "1645q70jg81jy7gxdd8kr7i5pgkr2k7i71ijk4k23lxj0yd4fsim";
     };
   };
 
@@ -1807,23 +1807,23 @@ let
 
   nerdcommenter = buildVimPluginFrom2Nix {
     pname = "nerdcommenter";
-    version = "2019-08-27";
+    version = "2019-09-13";
     src = fetchFromGitHub {
       owner = "scrooloose";
       repo = "nerdcommenter";
-      rev = "2504a3d84e97be144019ef184f0c2aed42f3152d";
-      sha256 = "0djfm8k4yqaycydg4hpvnapyh2d5k0r3alhlk09rj1arsw2kzh38";
+      rev = "8228c7b0a7aa46b7846f7bf21bcb89ce24b9c20e";
+      sha256 = "098alydvc9calcxkv77c8wkxw41p2az2dk70bx279ngz648i150c";
     };
   };
 
   nerdtree = buildVimPluginFrom2Nix {
     pname = "nerdtree";
-    version = "2019-09-09";
+    version = "2019-09-13";
     src = fetchFromGitHub {
       owner = "scrooloose";
       repo = "nerdtree";
-      rev = "51fc75efdb8ac58c853492c3f61d854f65ed78ec";
-      sha256 = "098g4qq3h8nklynj4qnj02f6ivw10q07c69ssdrhgjwilpgv4nrk";
+      rev = "60ec10b477eefc81eeafafa2a8c1b00046ee48fb";
+      sha256 = "1l9lz56cdkifp4arf05z298jg0yfvr2wvfbnzaff62yc38n4hb4b";
     };
   };
 
@@ -2192,12 +2192,12 @@ let
 
   semshi = buildVimPluginFrom2Nix {
     pname = "semshi";
-    version = "2019-07-02";
+    version = "2019-09-12";
     src = fetchFromGitHub {
       owner = "numirias";
       repo = "semshi";
-      rev = "527ebc5a0465dbf6313a791c1c78a37420114799";
-      sha256 = "0ys1hnvk5mq4cigrrqx70ivlgwc7kblvbv3ncqlqihvxs2hhan4i";
+      rev = "741916c472adc40f82d191ec48e668e88251e626";
+      sha256 = "0ld4fk8a8k2mf8q32zjq3lbb8nhdg214n5kp221z0vw2a72zgkjn";
     };
   };
 
@@ -2830,12 +2830,12 @@ let
 
   vim-airline = buildVimPluginFrom2Nix {
     pname = "vim-airline";
-    version = "2019-09-09";
+    version = "2019-09-11";
     src = fetchFromGitHub {
       owner = "vim-airline";
       repo = "vim-airline";
-      rev = "63d8764f9d19def6d279b91e690ac2aa5662828d";
-      sha256 = "0sxjw1dmidw242m1ma607g957hz2w080ln4m4ac90wi1qssp8132";
+      rev = "89d1d43165c8ef6c029ee0e9590a0d67978a7c97";
+      sha256 = "0nkq6a5r2dx0jqp6ikbzbrvlfgpcn28y5l9b41bfpxkqplh03bhn";
     };
   };
 
@@ -3246,6 +3246,17 @@ let
     };
   };
 
+  vim-exchange = buildVimPluginFrom2Nix {
+    pname = "vim-exchange";
+    version = "2017-01-27";
+    src = fetchFromGitHub {
+      owner = "tommcdo";
+      repo = "vim-exchange";
+      rev = "05d82b87711c6c8b9b7389bfb91c24bc4f62aa87";
+      sha256 = "09fa156y8pxpzdbngifa7yzg1vjg1fjsgp1h9inj818zbig8mamb";
+    };
+  };
+
   vim-expand-region = buildVimPluginFrom2Nix {
     pname = "vim-expand-region";
     version = "2013-08-19";
@@ -3336,12 +3347,12 @@ let
 
   vim-fugitive = buildVimPluginFrom2Nix {
     pname = "vim-fugitive";
-    version = "2019-09-09";
+    version = "2019-09-11";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-fugitive";
-      rev = "35f1095f9b3ce70768bdd75dae76437cfa69dd02";
-      sha256 = "0d806k1prgsa0mgc779p3ngqjyd8shrf2i18xi58vsndrvsgn96v";
+      rev = "26f6037de68254376cd062286aeeaa7db804a973";
+      sha256 = "0cza5v99493llr02all1zwjy3gk19hypngk6j3kcrg7530c9sq6n";
     };
   };
 
@@ -3413,12 +3424,12 @@ let
 
   vim-go = buildVimPluginFrom2Nix {
     pname = "vim-go";
-    version = "2019-09-08";
+    version = "2019-09-13";
     src = fetchFromGitHub {
       owner = "fatih";
       repo = "vim-go";
-      rev = "925d29a73db14133d11361792a2e0393e1e2b457";
-      sha256 = "167s9dadk1nl0kw14p0mq7pkwhxg9xb5gkmhqh96rpz1z2730jw7";
+      rev = "041ca9669bbbe4a50b382d8972a7191edf873f55";
+      sha256 = "1q3sca1gpxc7iqdk6wkdzndwpf8i8z69is4jwmnhr0sk0jrjby6q";
     };
   };
 
@@ -3929,6 +3940,17 @@ let
     };
   };
 
+  vim-mucomplete = buildVimPluginFrom2Nix {
+    pname = "vim-mucomplete";
+    version = "2019-07-30";
+    src = fetchFromGitHub {
+      owner = "lifepillar";
+      repo = "vim-mucomplete";
+      rev = "eede692d8e8ee847de5c59d760f77fa27ea5ff47";
+      sha256 = "0c8rjqz0mzi9c69qjd9arljkwdckjp8x5d3ks570xhlcmp17qzn8";
+    };
+  };
+
   vim-multiple-cursors = buildVimPluginFrom2Nix {
     pname = "vim-multiple-cursors";
     version = "2019-07-11";
@@ -3962,6 +3984,17 @@ let
     };
   };
 
+  vim-ninja-feet = buildVimPluginFrom2Nix {
+    pname = "vim-ninja-feet";
+    version = "2019-05-12";
+    src = fetchFromGitHub {
+      owner = "tommcdo";
+      repo = "vim-ninja-feet";
+      rev = "5b48f97bf4865a25f5f4568c45cdfd08f946ec4f";
+      sha256 = "1i3n5nlwyg65k0f0qrimbfs67l2xx39cqp4gyrycw4vzp6hs0lsc";
+    };
+  };
+
   vim-nix = buildVimPluginFrom2Nix {
     pname = "vim-nix";
     version = "2019-06-03";
@@ -4030,12 +4063,12 @@ let
 
   vim-orgmode = buildVimPluginFrom2Nix {
     pname = "vim-orgmode";
-    version = "2019-08-05";
+    version = "2019-09-13";
     src = fetchFromGitHub {
       owner = "jceb";
       repo = "vim-orgmode";
-      rev = "10b5ddf57f9416ed5a33419e1095dba7d239b297";
-      sha256 = "1hik7bkk1rfxwwn77w1p7c6m1dz7ifpvnnfs8yizhlp9rgs0wjch";
+      rev = "2848ab2db5a2862d43d77acee04faf981f643dd0";
+      sha256 = "06cgb7zb239yk3rkym3nxy26ihm9b2ibqyvjyjgj43w1bm6jfwg5";
     };
   };
 
@@ -4151,12 +4184,12 @@ let
 
   vim-polyglot = buildVimPluginFrom2Nix {
     pname = "vim-polyglot";
-    version = "2019-09-06";
+    version = "2019-09-12";
     src = fetchFromGitHub {
       owner = "sheerun";
       repo = "vim-polyglot";
-      rev = "fbc2af9e820d85e17cd08023f4dcc66545735d58";
-      sha256 = "03lrnrhhhxmz5dbbsxhnnrff8myc21qrxsskfd2k6yh1hr9wwa5p";
+      rev = "4f3df59be709bf0d5c5c67dc804fde49abdc2700";
+      sha256 = "0rknm6bj75ax2a81bkw96nqakn2gb1mjfb6lgg8kwvcjzddfvmb9";
     };
   };
 
@@ -4259,6 +4292,17 @@ let
     };
   };
 
+  vim-rooter = buildVimPluginFrom2Nix {
+    pname = "vim-rooter";
+    version = "2019-05-18";
+    src = fetchFromGitHub {
+      owner = "airblade";
+      repo = "vim-rooter";
+      rev = "eef98131fef264d0f4e4f95c42e0de476c78009c";
+      sha256 = "144wwvi295q387w6cy9mv2inzla8ngd735gmf65lf33llp8hga59";
+    };
+  };
+
   vim-rsi = buildVimPluginFrom2Nix {
     pname = "vim-rsi";
     version = "2019-03-15";
@@ -4415,12 +4459,12 @@ let
 
   vim-snippets = buildVimPluginFrom2Nix {
     pname = "vim-snippets";
-    version = "2019-09-03";
+    version = "2019-09-13";
     src = fetchFromGitHub {
       owner = "honza";
       repo = "vim-snippets";
-      rev = "55b29ff83e9f5b43a138fb42100be6d7b5777d0d";
-      sha256 = "0zkxmj3l1jj1q9qigm13xksc7f3a7n7ik5yxgn4gxdpi9z79as4d";
+      rev = "2221222df8cbc1a99c29f3e55a7c340f4d16b1ff";
+      sha256 = "0vjgxxg7aq5j7lxc0pn0fral5gjb4fpc42442q8mkik6cpkd92h0";
     };
   };
 
@@ -4512,6 +4556,17 @@ let
     };
   };
 
+  vim-swap = buildVimPluginFrom2Nix {
+    pname = "vim-swap";
+    version = "2019-06-07";
+    src = fetchFromGitHub {
+      owner = "machakann";
+      repo = "vim-swap";
+      rev = "e52ff679c88f4aa7a7afe77fb42af78c93ed33c8";
+      sha256 = "0rqvxqqk961syawmyc2qdfb4w9ilb1r3mxxij2ja1jbhl1f3w4vq";
+    };
+  };
+
   vim-SyntaxRange = buildVimPluginFrom2Nix {
     pname = "vim-SyntaxRange";
     version = "2018-03-09";
@@ -4723,12 +4778,12 @@ let
 
   vim-visual-multi = buildVimPluginFrom2Nix {
     pname = "vim-visual-multi";
-    version = "2019-09-01";
+    version = "2019-09-12";
     src = fetchFromGitHub {
       owner = "mg979";
       repo = "vim-visual-multi";
-      rev = "d55e496786f064c022861c944cf38562006a4e9a";
-      sha256 = "1c049z9qgbc0g80zvixz0cqglq2qcg2pfmzjvp4gg5yq4k27r25y";
+      rev = "6ff6e336ac3df959c8d0462be277b4fff8661421";
+      sha256 = "1drp53cvbflr6x94vy0f57fg9nb3kxlaxvrc5w71id4mv0pr7bb2";
     };
   };
 
@@ -4767,12 +4822,12 @@ let
 
   vim-watchdogs = buildVimPluginFrom2Nix {
     pname = "vim-watchdogs";
-    version = "2019-04-03";
+    version = "2019-09-09";
     src = fetchFromGitHub {
       owner = "osyo-manga";
       repo = "vim-watchdogs";
-      rev = "33d74aaeb1ef71512baff9eea20a42e06f4f0bc4";
-      sha256 = "0jkkrlw9x524vvsggq51z0yyvys75dv2h21ijxzdqni49kf4vyhk";
+      rev = "8ee2af37095af08376ba2409da152c2a36a4ee90";
+      sha256 = "1hvgqdcnnz09afbas5brwls2sifs8y78jmq44ldgsjny9l445df4";
     };
   };
 
@@ -4877,12 +4932,12 @@ let
 
   vimtex = buildVimPluginFrom2Nix {
     pname = "vimtex";
-    version = "2019-09-09";
+    version = "2019-09-13";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "cb90d583b7d584d87d306b2b99abdbb097588196";
-      sha256 = "06308ji2r3733w9rgwphqdqkharf7hc3xliylzbl9hh6fmk3hj55";
+      rev = "365e3d27d922036d5770a2591a3670cc5a3db777";
+      sha256 = "1rgafa05lfvyzznlq1y7cb3b3q3m2df5j82ggjwds7wfl4pm4zcz";
     };
   };
 
@@ -5066,12 +5121,12 @@ let
 
   zenburn = buildVimPluginFrom2Nix {
     pname = "zenburn";
-    version = "2018-04-29";
+    version = "2019-09-13";
     src = fetchFromGitHub {
       owner = "jnurmine";
       repo = "zenburn";
-      rev = "2cacfcb222d9db34a8d1a13bb8bb814f039b98cd";
-      sha256 = "0m5d5sjckirfpdhg9sf1nl5xywvzdx6y04r13m47jlavf79hhimi";
+      rev = "13254888f5ebe53c3d9276c8afc18efe6addec8e";
+      sha256 = "1xdi8q4cggv16bv71ap8y8xrmzb7pjvknrymrnab55fgbpkxhzaj";
     };
   };
 
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index a919e17afa5..1395147ff72 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -1,5 +1,6 @@
 907th/vim-auto-save
 airblade/vim-gitgutter
+airblade/vim-rooter
 ajh17/Spacegray.vim
 albfan/nerdtree-git-plugin
 altercation/vim-colors-solarized
@@ -172,6 +173,7 @@ ledger/vim-ledger
 lepture/vim-jinja
 lervag/vimtex
 lfilho/cosco.vim
+lifepillar/vim-mucomplete
 LnL7/vim-nix
 LucHermitte/lh-brackets
 LucHermitte/lh-vim-lib
@@ -182,6 +184,7 @@ lumiliet/vim-twig
 luochen1990/rainbow
 lyokha/vim-xkbswitch
 machakann/vim-highlightedyank
+machakann/vim-swap
 majutsushi/tagbar
 maksimr/vim-jsbeautify
 MarcWeber/vim-addon-actions
@@ -376,7 +379,9 @@ tikhomirov/vim-glsl
 tmux-plugins/vim-tmux
 tomasr/molokai
 tomlion/vim-solidity
+tommcdo/vim-exchange
 tommcdo/vim-lion
+tommcdo/vim-ninja-feet
 tomtom/tcomment_vim
 tomtom/tlib_vim
 tpope/vim-abolish
-- 
GitLab


From e176117a81eb83eca4ec6eafdeedbbbdea7cb7fa Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 14 Sep 2019 13:59:20 +0200
Subject: [PATCH 0237/2254] python3Packages.face_recognition_models: fix
 startup

---
 .../python-modules/face_recognition_models/default.nix        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/face_recognition_models/default.nix b/pkgs/development/python-modules/face_recognition_models/default.nix
index 960bffb903d..12587e6792d 100644
--- a/pkgs/development/python-modules/face_recognition_models/default.nix
+++ b/pkgs/development/python-modules/face_recognition_models/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, stdenv, fetchPypi }:
+{ buildPythonPackage, stdenv, fetchPypi, setuptools }:
 
 buildPythonPackage rec {
   pname = "face_recognition_models";
@@ -12,6 +12,8 @@ buildPythonPackage rec {
   # no module named `tests` as no tests are available
   doCheck = false;
 
+  propagatedBuildInputs = [ setuptools ];
+
   meta = with stdenv.lib; {
     homepage = https://github.com/ageitgey/face_recognition_models;
     license = licenses.cc0;
-- 
GitLab


From 34b58364e4cef17448544020e2b0923775f46cfc Mon Sep 17 00:00:00 2001
From: Daniel Schaefer <git@danielschaefer.me>
Date: Sat, 14 Sep 2019 14:00:47 +0200
Subject: [PATCH 0238/2254] pytest: Add pytest_4 as its own attribute

Many packages aren't yet updated to handle the incompatible changes of
pytest5 so we still need v4.
---
 pkgs/top-level/python-packages.nix | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 96885a83ebb..62901ef2052 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1991,15 +1991,17 @@ in {
 
   pyhepmc = callPackage ../development/python-modules/pyhepmc { };
 
-  pytest = if isPy3k then
-    callPackage ../development/python-modules/pytest {
-      # hypothesis tests require pytest that causes dependency cycle
-      hypothesis = self.hypothesis.override { doCheck = false; };
-    }
-  else callPackage ../development/python-modules/pytest/2.nix {
-      # hypothesis tests require pytest that causes dependency cycle
-      hypothesis = self.hypothesis.override { doCheck = false; };
-    };
+  pytest = if isPy3k then self.pytest_5 else self.pytest_4;
+
+  pytest_5 = callPackage ../development/python-modules/pytest {
+    # hypothesis tests require pytest that causes dependency cycle
+    hypothesis = self.hypothesis.override { doCheck = false; };
+  };
+
+  pytest_4 = callPackage ../development/python-modules/pytest/4.nix {
+    # hypothesis tests require pytest that causes dependency cycle
+    hypothesis = self.hypothesis.override { doCheck = false; };
+  };
 
   pytest-helpers-namespace = callPackage ../development/python-modules/pytest-helpers-namespace { };
 
-- 
GitLab


From 3cb0ae999fd45f6f1f4eae4fac3b62c2905db9f4 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sat, 14 Sep 2019 08:04:28 -0400
Subject: [PATCH 0239/2254] Revert "networkmanager,modemmanager: fix service
 symlinks for systemd v243"

---
 nixos/modules/services/networking/networkmanager.nix | 5 -----
 pkgs/tools/networking/modem-manager/default.nix      | 7 +++++++
 pkgs/tools/networking/network-manager/default.nix    | 5 +++++
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index db047e6d0b8..db4d0e328e2 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -468,16 +468,12 @@ in {
         mkdir -m 700 -p /etc/ipsec.d
         mkdir -m 755 -p ${stateDirs}
       '';
-
-      aliases = [ "dbus-org.freedesktop.NetworkManager.service" ];
     };
 
     systemd.services.NetworkManager-wait-online = {
       wantedBy = [ "network-online.target" ];
     };
 
-    systemd.services.ModemManager.aliases = [ "dbus-org.freedesktop.ModemManager1.service" ];
-
     systemd.services.nm-setup-hostsdirs = mkIf dynamicHostsEnabled {
       wantedBy = [ "NetworkManager.service" ];
       before = [ "NetworkManager.service" ];
@@ -499,7 +495,6 @@ in {
 
       # useful binaries for user-specified hooks
       path = [ pkgs.iproute pkgs.utillinux pkgs.coreutils ];
-      aliases = [ "dbus-org.freedesktop.nm-dispatcher.service" ];
     };
 
     # Turn off NixOS' network management when networking is managed entirely by NetworkManager
diff --git a/pkgs/tools/networking/modem-manager/default.nix b/pkgs/tools/networking/modem-manager/default.nix
index fedc8d4b71d..b2644d0c2a4 100644
--- a/pkgs/tools/networking/modem-manager/default.nix
+++ b/pkgs/tools/networking/modem-manager/default.nix
@@ -32,6 +32,13 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
+  postInstall = ''
+    # systemd in NixOS doesn't use `systemctl enable`, so we need to establish
+    # aliases ourselves.
+    ln -s $out/etc/systemd/system/ModemManager.service \
+      $out/etc/systemd/system/dbus-org.freedesktop.ModemManager1.service
+  '';
+
   meta = with stdenv.lib; {
     description = "WWAN modem manager, part of NetworkManager";
     homepage = https://www.freedesktop.org/wiki/Software/ModemManager/;
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index 490ebd0fa6b..5bc915caea6 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -97,6 +97,11 @@ in stdenv.mkDerivation rec {
   '';
 
   postInstall = ''
+    # systemd in NixOS doesn't use `systemctl enable`, so we need to establish
+    # aliases ourselves.
+    ln -s $out/etc/systemd/system/NetworkManager-dispatcher.service $out/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service
+    ln -s $out/etc/systemd/system/NetworkManager.service $out/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service
+
     # Add the legacy service name from before #51382 to prevent NetworkManager
     # from not starting back up:
     # TODO: remove this once 19.10 is released
-- 
GitLab


From 447d625edc3a488deee1c9b2e5890dd974e55ee3 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 13 Sep 2019 11:11:53 -0500
Subject: [PATCH 0240/2254] networkmanager,modemmanager: fix service symlinks
 for systemd v243

Fixes problems such as:

systemd[1]: Failed to put bus name to hashmap: File exists
systemd[1]: dbus-org.freedesktop.nm-dispatcher.service: Two services allocated for the same bus name org.freedesktop.nm_dispatcher, refusing operation.

Problem is that systemd treats symlinks to files outside the service
path differently, causing our old workaround to look like two separate services.

These symlinks are intended to be a means for manually emulating
the behavior of the `Alias=` directive in these services.
Unfortunately even making these symlinks relative isn't enough,
since they don't make it to where it matters--
that only makes the links in /etc/static/systemd/system/*
relative, with systemd still being shown non-relative links
in /etc/systemd/system/*.

To fix this, drop all of this at the package level
and instead simply specify the aliases in the NixOS modules.

Also handle the same for modemmanager,
since the networkmanager NixOS module also handles that.
---
 nixos/modules/services/networking/networkmanager.nix | 5 +++++
 pkgs/tools/networking/modem-manager/default.nix      | 7 -------
 pkgs/tools/networking/network-manager/default.nix    | 5 -----
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index 2061c02fffb..bef0ff36567 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -462,12 +462,16 @@ in {
         mkdir -m 700 -p /etc/ipsec.d
         mkdir -m 755 -p ${stateDirs}
       '';
+
+      aliases = [ "dbus-org.freedesktop.NetworkManager.service" ];
     };
 
     systemd.services.NetworkManager-wait-online = {
       wantedBy = [ "network-online.target" ];
     };
 
+    systemd.services.ModemManager.aliases = [ "dbus-org.freedesktop.ModemManager1.service" ];
+
     systemd.services.nm-setup-hostsdirs = mkIf dynamicHostsEnabled {
       wantedBy = [ "NetworkManager.service" ];
       before = [ "NetworkManager.service" ];
@@ -489,6 +493,7 @@ in {
 
       # useful binaries for user-specified hooks
       path = [ pkgs.iproute pkgs.utillinux pkgs.coreutils ];
+      aliases = [ "dbus-org.freedesktop.nm-dispatcher.service" ];
     };
 
     # Turn off NixOS' network management
diff --git a/pkgs/tools/networking/modem-manager/default.nix b/pkgs/tools/networking/modem-manager/default.nix
index b2644d0c2a4..fedc8d4b71d 100644
--- a/pkgs/tools/networking/modem-manager/default.nix
+++ b/pkgs/tools/networking/modem-manager/default.nix
@@ -32,13 +32,6 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  postInstall = ''
-    # systemd in NixOS doesn't use `systemctl enable`, so we need to establish
-    # aliases ourselves.
-    ln -s $out/etc/systemd/system/ModemManager.service \
-      $out/etc/systemd/system/dbus-org.freedesktop.ModemManager1.service
-  '';
-
   meta = with stdenv.lib; {
     description = "WWAN modem manager, part of NetworkManager";
     homepage = https://www.freedesktop.org/wiki/Software/ModemManager/;
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index 5bc915caea6..490ebd0fa6b 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -97,11 +97,6 @@ in stdenv.mkDerivation rec {
   '';
 
   postInstall = ''
-    # systemd in NixOS doesn't use `systemctl enable`, so we need to establish
-    # aliases ourselves.
-    ln -s $out/etc/systemd/system/NetworkManager-dispatcher.service $out/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service
-    ln -s $out/etc/systemd/system/NetworkManager.service $out/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service
-
     # Add the legacy service name from before #51382 to prevent NetworkManager
     # from not starting back up:
     # TODO: remove this once 19.10 is released
-- 
GitLab


From dcdf68ee0153643e1da518ab7ff559a19ac63e6d Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 14 Sep 2019 14:04:51 +0200
Subject: [PATCH 0241/2254] xen_4_10: 4.10.0 -> 4.10.4

glusterfs compatibility fix, also added Wno-error flags for gcc8
compatibility
---
 pkgs/applications/virtualization/xen/4.10.nix |  28 +-
 .../virtualization/xen/xsa-patches.nix        | 452 +-----------------
 2 files changed, 14 insertions(+), 466 deletions(-)

diff --git a/pkgs/applications/virtualization/xen/4.10.nix b/pkgs/applications/virtualization/xen/4.10.nix
index 042b01e8678..d3c2ed9060c 100644
--- a/pkgs/applications/virtualization/xen/4.10.nix
+++ b/pkgs/applications/virtualization/xen/4.10.nix
@@ -38,11 +38,11 @@ let
 in
 
 callPackage (import ./generic.nix (rec {
-  version = "4.10.0";
+  version = "4.10.4";
 
   src = fetchurl {
     url = "https://downloads.xenproject.org/release/xen/${version}/xen-${version}.tar.gz";
-    sha256 = "0i38ap5b5m1kix6xb0vn9ya1yab35adyc98bzfnbq4lb7w1afqh2";
+    sha256 = "0ipkr7b3v3y183n6nfmz7q3gnzxa20011df4jpvxi6pmr8cpnkwh";
   };
 
   # Sources needed to build tools and firmwares.
@@ -52,12 +52,9 @@ callPackage (import ./generic.nix (rec {
         url = https://xenbits.xen.org/git-http/qemu-xen.git;
         # rev = "refs/tags/qemu-xen-${version}";
         # use revision hash - reproducible but must be updated with each new version
-        rev = "b79708a8ed1b3d18bee67baeaf33b3fa529493e2";
-        sha256 = "1yxxad6nvlfmrbgyc8ix19qmrsn1rx4zpyiqnfi4x4kg94acwa5w";
+        rev = "qemu-xen-${version}";
+        sha256 = "0laxvhdjz1njxjvq3jzw2yqvdr9gdn188kqjf2gcrfzgih7xv2ym";
       };
-      patches = [
-        qemuMemfdBuildFix
-      ];
       buildInputs = qemuDeps;
       postPatch = ''
         # needed in build but /usr/bin/env is not available in sandbox
@@ -151,17 +148,16 @@ callPackage (import ./generic.nix (rec {
     ++ optional (withOVMF) "--with-system-ovmf=${OVMF.fd}/FV/OVMF.fd"
     ++ optional (withInternalOVMF) "--enable-ovmf";
 
-  patches = with xsa; flatten [
-    XSA_252
-    XSA_253
-    XSA_255_1
-    XSA_255_2
-    XSA_256
+  NIX_CFLAGS_COMPILE = [
+    # Fix build on Glibc 2.24.
+    "-Wno-error=deprecated-declarations"
+    # Fix build with GCC 8
+    "-Wno-error=maybe-uninitialized"
+    "-Wno-error=stringop-truncation"
+    "-Wno-error=format-truncation"
+    "-Wno-error=array-bounds"
   ];
 
-  # Fix build on Glibc 2.24.
-  NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
-
   postPatch = ''
     # Avoid a glibc >= 2.25 deprecation warnings that get fatal via -Werror.
     sed 1i'#include <sys/sysmacros.h>' \
diff --git a/pkgs/applications/virtualization/xen/xsa-patches.nix b/pkgs/applications/virtualization/xen/xsa-patches.nix
index de692820d8f..26cdbc1f65f 100644
--- a/pkgs/applications/virtualization/xen/xsa-patches.nix
+++ b/pkgs/applications/virtualization/xen/xsa-patches.nix
@@ -66,30 +66,12 @@ in {
     sha256 = "0nnznkrvfbbc8z64dr9wvbdijd4qbpc0wz2j5vpmx6b32sm7932f";
   });
 
-  # 4.8
-  XSA_202 = (xsaPatch {
-    name = "202";
-    sha256 = "0j1d5akcjgx8w2c6w6p9znv77fkmps0880m2xgpbgs1ra9grshm1";
-  });
-
-  # 4.8
-  XSA_203 = (xsaPatch {
-    name = "203";
-    sha256 = "1s1q7xskvpg87ivwfaiqr0cj3ajdkhkhpmpikfkvq127h8hhmd8j";
-  });
-
   # 4.5
   XSA_204_45 = (xsaPatch {
     name = "204-4.5";
     sha256 = "083z9pbdz3f532fnzg7n2d5wzv6rmqc0f4mvc3mnmkd0rzqw8vcp";
   });
 
-  # 4.8
-  XSA_204 = (xsaPatch {
-    name = "204-4.8";
-    sha256 = "0rs498s4w2alz3h6jhlr2y0ni630vhggmxbrd1p1p3gcv8p6zzrr";
-  });
-
   # 4.5
   XSA_206_45 = [
     (xsaPatch {
@@ -190,86 +172,12 @@ in {
     })
   ];
 
-  # 4.8
-  XSA_206 = [
-    (xsaPatch {
-      name = "206-4.8/0001-xenstored-apply-a-write-transaction-rate-limit";
-      sha256 = "1c81d93i3qx7l38f9af0sd84w5x51zvn262mzl25ilcklql4kzl6";
-    })
-    (xsaPatch {
-      name = "206-4.8/0002-xenstored-Log-when-the-write-transaction-rate-limit-";
-      sha256 = "0b8iw409wi1x6p0swpnr51lcdlla1lgxjv5f910sj4wl96bca84q";
-    })
-    (xsaPatch {
-      name = "206-4.8/0003-oxenstored-comments-explaining-some-variables";
-      sha256 = "1d3n0y9syya4kaavrvqn01d3wsn85gmw7qrbylkclznqgkwdsr2p";
-    })
-    (xsaPatch {
-      name = "206-4.8/0004-oxenstored-handling-of-domain-conflict-credit";
-      sha256 = "020rw7hgc0dmhr4admz91kd99b4z1bdpji47nsy1255bjgvwc01k";
-    })
-    (xsaPatch {
-      name = "206-4.8/0005-oxenstored-ignore-domains-with-no-conflict-credit";
-      sha256 = "1ilhcgyn803bxvfbqv0ihfrh9jfpp0lidkv7i4613f9v9vjm8q0h";
-    })
-    (xsaPatch {
-      name = "206-4.8/0006-oxenstored-add-transaction-info-relevant-to-history-";
-      sha256 = "1dbd9pzda6hn9wj9pck44dlgz9nxvch3bzgrpaivanww8llxdfzz";
-    })
-    (xsaPatch {
-      name = "206-4.8/0007-oxenstored-support-commit-history-tracking";
-      sha256 = "1jfr56c22fqkhj6fnv1ha7zsid86zm9l0nihpb8m932xgc4a6h9h";
-    })
-    (xsaPatch {
-      name = "206-4.8/0008-oxenstored-only-record-operations-with-side-effects-";
-      sha256 = "1y845hj8krjdrirbd2jx4jqgnylwjv7bxnk7474lkld5kdnlbjyf";
-    })
-    (xsaPatch {
-      name = "206-4.8/0009-oxenstored-discard-old-commit-history-on-txn-end";
-      sha256 = "1lcr9gz2b77x74sr1flfymyyz4xzs04iv88rc1633ibyqxmvk0lx";
-    })
-    (xsaPatch {
-      name = "206-4.8/0010-oxenstored-track-commit-history";
-      sha256 = "1qwnivak4y038mpby75aaz0y70r0l3yc3hsz6wl5x0b74q6yy0ja";
-    })
-    (xsaPatch {
-      name = "206-4.8/0011-oxenstored-blame-the-connection-that-caused-a-transa";
-      sha256 = "0p2w5ddyhc6d95dnlxzc5k77j063p02d53ab7m7ijfm7m6gknq8y";
-    })
-    (xsaPatch {
-      name = "206-4.8/0012-oxenstored-allow-self-conflicts";
-      sha256 = "1571l81m30cbmqm4pk33q33p3dy58sfy2lnkl2wbgl2b3mkk657l";
-    })
-    (xsaPatch {
-      name = "206-4.8/0013-oxenstored-do-not-commit-read-only-transactions";
-      sha256 = "15985wl635w22dddjyx5l97b5p6m55mzv5ygk7xr0jx7mi192f9x";
-    })
-    (xsaPatch {
-      name = "206-4.8/0014-oxenstored-don-t-wake-to-issue-no-conflict-credit";
-      sha256 = "08672w4gaf2n3r8xy09h874gh5lg2vnrkjzq6xzvzdhdl092mipw";
-    })
-    (xsaPatch {
-      name = "206-4.8/0015-oxenstored-transaction-conflicts-improve-logging";
-      sha256 = "0ck98ms0py8wjsc38pbx6222x7n6l90zckfa7m7nnszsyc0sxxad";
-    })
-    (xsaPatch {
-      name = "206-4.8/0016-oxenstored-trim-history-in-the-frequent_ops-function";
-      sha256 = "014zs6i4gzrimn814k5i7gz66vbb0adkzr2qyai7i4fxc9h9r7w8";
-    })
-  ];
-
   # 4.5 - 4.8
   XSA_207 = (xsaPatch {
     name = "207";
     sha256 = "0wdlhijmw9mdj6a82pyw1rwwiz605dwzjc392zr3fpb2jklrvibc";
   });
 
-  # 4.8
-  XSA_210 = (xsaPatch {
-    name = "210";
-    sha256 = "02mykxqxnsrd0sr4ij022j8y7618wzi2a6j6j761vx8qgmh11xai";
-  });
-
   # 4.5 - 4.8
   XSA_212 = (xsaPatch {
     name = "212";
@@ -282,12 +190,6 @@ in {
     sha256 = "1vnqf89ydacr5bq3d6z2r33xb2sn5vsd934rncyc28ybc9rvj6wm";
   });
 
-  # 4.8
-  XSA_213 = (xsaPatch {
-    name = "213-4.8";
-    sha256 = "0ia3zr6r3bqy2h48fdy7p0iz423lniy3i0qkdvzgv5a8m80darr2";
-  });
-
   # 4.5 - 4.8
   XSA_214 = (xsaPatch {
     name = "214";
@@ -306,12 +208,6 @@ in {
     sha256 = "067pgsfrb9py2dhm1pk9g8f6fs40vyfrcxhj8c12vzamb6svzmn4";
   });
 
-  # 4.6 - 4.8
-  XSA_217 = (xsaPatch {
-    name = "217";
-    sha256 = "1khs5ilif14dzcm7lmikjzkwsrfzlmir1rgrgzkc411gf18ylzmj";
-  });
-
   # 4.5
   XSA_218_45 = [
     (xsaPatch {
@@ -332,46 +228,18 @@ in {
     })
   ];
 
-  # 4.8
-  XSA_218 = [
-    (xsaPatch {
-      name = "218-4.8/0001-gnttab-fix-unmap-pin-accounting-race";
-      sha256 = "0r363frai239r2wmwxi48kcr50gbk5l64nja0h9lppi3z2y3dkdd";
-    })
-    (xsaPatch {
-      name = "218-4.8/0002-gnttab-Avoid-potential-double-put-of-maptrack-entry";
-      sha256 = "07wm06i7frv7bsaykakx3g9h0hfqv96zcadvwf6wv194dggq1plc";
-    })
-    (xsaPatch {
-      name = "218-4.8/0003-gnttab-correct-maptrack-table-accesses";
-      sha256 = "0ad0irc3p4dmla8sp3frxbh2qciji1dipkslh0xqvy2hyf9p80y9";
-    })
-  ];
-
   # 4.5
   XSA_219_45 = (xsaPatch {
     name = "219-4.5";
     sha256 = "003msr5vhsc66scmdpgn0lp3p01g4zfw5vj86y5lw9ajkbaywdsm";
   });
 
-  # 4.8
-  XSA_219 = (xsaPatch {
-    name = "219-4.8";
-    sha256 = "16q7kiamy86x8qdvls74wmq5j72kgzgdilryig4q1b21mp0ij1jq";
-  });
-
   # 4.5
   XSA_220_45 = (xsaPatch {
     name = "220-4.5";
     sha256 = "1dj9nn6lzxlipjb3nb7b9m4337fl6yn2bd7ap1lqrjn8h9zkk1pp";
   });
 
-  # 4.8
-  XSA_220 = (xsaPatch {
-    name = "220-4.8";
-    sha256 = "0214qyqx7qap5y1pdi9fm0vz4y2fbyg71gaq36fisknj35dv2mh5";
-  });
-
   # 4.5 - 4.8
   XSA_221 = (xsaPatch {
     name = "221";
@@ -390,18 +258,6 @@ in {
     })
   ];
 
-  # 4.8
-  XSA_222 = [
-    (xsaPatch {
-      name = "222-1";
-      sha256 = "0x02x4kqwfw255638fh2zcxwig1dy6kadlmqim1jgnjgmrvvqas2";
-    })
-    (xsaPatch {
-      name = "222-2-4.8";
-      sha256 = "1xhyp6q3c5l8djh965g1i8201m2wvhms8k886h4sn30hks38giin";
-    })
-  ];
-
   # 4.5 - 4.8
   XSA_223 = (xsaPatch {
     name = "223";
@@ -428,32 +284,6 @@ in {
     })
   ];
 
-  # 4.8
-  XSA_224 = [
-    (xsaPatch {
-      name = "224-4.8/0001-gnttab-Fix-handling-of-dev_bus_addr-during-unmap";
-      sha256 = "1k326yan5811qzyvpdfkv801a19nyd09nsqayi8gyh58xx9c21m4";
-    })
-    (xsaPatch {
-      name = "224-4.8/0002-gnttab-never-create-host-mapping-unless-asked-to";
-      sha256 = "06nj1x59bbx9hrj26xmvbw8z805lfqhld9hm0ld0fs6dmcpqzcck";
-    })
-    (xsaPatch {
-      name = "224-4.8/0003-gnttab-correct-logic-to-get-page-references-during-m";
-      sha256 = "0kmag6fdsskgplcvzqp341yfi6pgc14wvjj58bp7ydb9hdk53qx2";
-    })
-    (xsaPatch {
-      name = "224-4.8/0004-gnttab-__gnttab_unmap_common_complete-is-all-or-noth";
-      sha256 = "1ww80pi7jr4gjpymkcw8qxmr5as18b2asdqv35527nqprylsff9f";
-    })
-  ];
-
-  # 4.6 - 4.8
-  XSA_225 = (xsaPatch {
-    name = "225";
-    sha256 = "0lcp2bs0r849xnvhrdf8s821v36cqdbzk8lwz6chrjhjalk6ha2g";
-  });
-
   # 4.5
   XSA_226_45 = [
     (xsaPatch {
@@ -466,42 +296,12 @@ in {
     })
   ];
 
-  # 4.8 - 4.9
-  XSA_226 = [
-    (xsaPatch {
-      name = "226-4.9/0001-gnttab-dont-use-possibly-unbounded-tail-calls";
-      sha256 = "1hx47ppv5q33cw4dwp82lgvv4fp28gx7rxijw0iaczsv8bvb8vcg";
-    })
-    (xsaPatch {
-      name = "226-4.9/0002-gnttab-fix-transitive-grant-handling";
-      sha256 = "1gzp8m2zfihwlk71c3lqyd0ajh9h11pvkhzhw0mawckxy0qksvlc";
-    })
-  ];
-
   # 4.5
   XSA_227_45 = (xsaPatch {
     name = "227-4.5";
     sha256 = "1qfjfisgqm4x98qw54x2qrvgjnvvzizx9p1pjhcnsps9q6g1y3x8";
   });
 
-  # 4.8 - 4.9
-  XSA_227 = (xsaPatch {
-    name = "227";
-    sha256 = "0zdcm43i5n08rh7rrnb0fcssvd4fgawwmizsa16w2ak7pzvgmg94";
-  });
-
-  # 4.8
-  XSA_228_48 = (xsaPatch {
-    name = "228-4.8";
-    sha256 = "085pnzwyv0rdb51hv5vhbhwfyxl0wg8sxcm912gjq8z7da5cv10n";
-  });
-
-  # 4.9
-  XSA_228 = (xsaPatch {
-    name = "228";
-    sha256 = "0c9nvfpnr5ira7ha3fszhvvh71nsxrvmzrab56xwjhl2dbw2yy23";
-  });
-
   # 4.5 - 4.9
   XSA_230 = (xsaPatch {
     name = "230";
@@ -514,12 +314,6 @@ in {
     sha256 = "06gwx2f1lg51dfk2b4zxp7wv9c4pxdi87pg2asvmxqc78ir7l5s6";
   });
 
-  # 4.8 - 4.9
-  XSA_231 = (xsaPatch {
-    name = "231-4.9";
-    sha256 = "09r8xxq2fd52wrk6i0y0sk3nbidfg6pzzrkx327hfmdjj76iyz3b";
-  });
-
   # 4.5 - 4.9
   XSA_232 = (xsaPatch {
     name = "232";
@@ -538,42 +332,18 @@ in {
     sha256 = "1ji6hbgybb4gbgz5l5fis9midnvjbddzam8d63377rkzdyb3yz9f";
   });
 
-  # 4.8
-  XSA_234_48 = (xsaPatch {
-    name = "234-4.8";
-    sha256 = "08n1pf7z5y67dmay1ap39bi81clgkx82fpmfn7jsh8k4aw94jrsa";
-  });
-
-  # 4.9
-  XSA_234 = (xsaPatch {
-    name = "234-4.9";
-    sha256 = "1znmxg432is0virw8321gax8zqq2zcmi2pc5p2j31sixylixsvzx";
-  });
-
   # 4.5
   XSA_235_45 = (xsaPatch {
     name = "235-4.5";
     sha256 = "0hhgnql2gji111020z4wiyzg23wqs6ymanb67rg11p4qad1fp3ff";
   });
 
-  # 4.8 - 4.9
-  XSA_235 = (xsaPatch {
-    name = "235-4.9";
-    sha256 = "1rj4jkmh79wm30jq9f8x65qv3al8l91zc3m5s23q0x6abn3pfb9z";
-  });
-
   # 4.5
   XSA_236_45 = (xsaPatch {
     name = "236-4.5";
     sha256 = "0hcla86x81wykssd2967gblp7fzx61290p4ls4v0hcyxdg2bs2yz";
   });
 
-  # 4.8 - 4.9
-  XSA_236 = (xsaPatch {
-    name = "236-4.9";
-    sha256 = "0vqxy7mgflga05l33j3488fwxmdw3p9yxj4ylhk9n3nw8id72ghq";
-  });
-
   # 4.5
   XSA_237_45 = [
     (xsaPatch {
@@ -598,78 +368,18 @@ in {
     })
   ];
 
-  # 4.8
-  XSA_237_48 = [
-    (xsaPatch {
-      name = "237-4.8/0001-x86-dont-allow-MSI-pIRQ-mapping-on-unowned-device";
-      sha256 = "0qjisp37lwi2611mp7fbbm1s7m0bx726rrg79dnxs2mj0skw59iv";
-    })
-    (xsaPatch {
-      name = "237-4.8/0002-x86-enforce-proper-privilege-when-mapping-pIRQ-s";
-      sha256 = "05q1dny13jrqhjfwak7r635mqp9chpibjvn8b7d90japc1nzpq62";
-    })
-    (xsaPatch {
-      name = "237-4.8/0003-x86-MSI-disallow-redundant-enabling";
-      sha256 = "1907lv8nb2zhpb6k6jlw4m0hm0n0lyd69vfr3wpzbc56dn0w7jqd";
-    })
-    (xsaPatch {
-      name = "237-4.8/0004-x86-IRQ-conditionally-preserve-irq-pirq-mapping-on-error";
-      sha256 = "06nrq0bx3p9ipab2r1why6qm4g32dj0x5q24hfkwc6ih0l9xwf8h";
-    })
-    (xsaPatch {
-      name = "237-4.8/0005-x86-FLASK-fix-unmap-domain-IRQ-XSM-hook";
-      sha256 = "1nbg7bjw2hv55gnkhf6chkh35va6brs08acq1d5jxncl6kv0amc1";
-    })
-  ];
-
-  # 4.9
-  XSA_237 = [
-    (xsaPatch {
-      name = "237-4.9/0001-x86-dont-allow-MSI-pIRQ-mapping-on-unowned-device";
-      sha256 = "1cbl24mqxa62h0wgsnrpcs6y6vs53znzj7g8dfsbmf74xwrd4px6";
-    })
-    (xsaPatch {
-      name = "237-4.9/0002-x86-enforce-proper-privilege-when-mapping-pIRQ-s";
-      sha256 = "0p60148j18b78pxz0dx5ymh1gyrhg2cgmxq0jxmbk090bc4jql35";
-    })
-    (xsaPatch {
-      name = "237-4.9/0003-x86-MSI-disallow-redundant-enabling";
-      sha256 = "1907lv8nb2zhpb6k6jlw4m0hm0n0lyd69vfr3wpzbc56dn0w7jqd";
-    })
-    (xsaPatch {
-      name = "237-4.9/0004-x86-IRQ-conditionally-preserve-irq-pirq-mapping-on-error";
-      sha256 = "0q95z5641amni53agimnzbspva53p0hz5wl16zaz2yhnjasj5pzr";
-    })
-    (xsaPatch {
-      name = "237-4.9/0005-x86-FLASK-fix-unmap-domain-IRQ-XSM-hook";
-      sha256 = "0bnqx9w7ppgx8wxj2zw09z0rkv1jzn3r0bd76cz0r22wz29fsdp2";
-    })
-  ];
-
   # 4.5
   XSA_238_45 = (xsaPatch {
     name = "238-4.5";
     sha256 = "1x2fg5vfv5jc084h5gjm6fq0nxjpzvi96px3sqzz4pvsvy4y4i1z";
   });
 
-  # 4.8 - 4.9
-  XSA_238 = (xsaPatch {
-    name = "238";
-    sha256 = "1cbmg1bi5ajh7qbwsl92ynaxw2c3p7i24p3wds81r4n93r0y5dxk";
-  });
-
   # 4.5
   XSA_239_45 = (xsaPatch {
     name = "239-4.5";
     sha256 = "06bi8q3973yajxsdj7pcqarvb56q2gisxdiy0cpbyffbmpkfv3h6";
   });
 
-  # 4.8 - 4.9
-  XSA_239 = (xsaPatch {
-    name = "239";
-    sha256 = "1a9r8j7167s43ds5i7v7mm4y970vjnbhhkrjzpmzlcx8kcz96vh3";
-  });
-
   # 4.5
   XSA_240_45 = [
     (xsaPatch {
@@ -682,42 +392,12 @@ in {
     })
   ];
 
-  # 4.8
-  XSA_240_48 = [
-    (xsaPatch {
-      name = "240-4.8/0001-x86-limit-linear-page-table-use-to-a-single-level";
-      sha256 = "0m44qhhqk2pdwqg8g28pypqrylq6iw00k9qrzf6qd0iza2y42kgj";
-    })
-    (xsaPatch {
-      name = "240-4.8/0002-x86-mm-Disable-PV-linear-pagetables-by-default";
-      sha256 = "1jd720wvngj9wq3fprdhakxvqlff0jd8zcx2pd3vsn2qvjbvr2gf";
-    })
-  ];
-
-  # 4.9
-  XSA_240 = [
-    (xsaPatch {
-      name = "240-4.9/0001-x86-limit-linear-page-table-use-to-a-single-level";
-      sha256 = "1759ni80aifakm44g4cc6pnmbcn1xjic8j66fvj0vibm0wqk6xck";
-    })
-    (xsaPatch {
-      name = "240-4.9/0002-x86-mm-Disable-PV-linear-pagetables-by-default";
-      sha256 = "0g6dpi006p5cjxw5d8h33p0429fdmdm6nqzj0m63ralpqvns3ib5";
-    })
-  ];
-
   # 4.5 - 4.8
   XSA_241 = (xsaPatch {
     name = "241-4.8";
     sha256 = "16zb75kzs98f4mdxhbyczk5mbh9dvn6j3yhfafki34x1dfdnq4pj";
   });
 
-  # 4.9
-  XSA_241_49 = (xsaPatch {
-    name = "241-4.9";
-    sha256 = "0xlhin7wkhmlnbp9mqcbq3q4drdwb5la482ja9nwkhi8i867p6wc";
-  });
-
   # 4.5 - 4.9
   XSA_242 = (xsaPatch {
     name = "242-4.9";
@@ -736,30 +416,12 @@ in {
     })
   ];
 
-  # 4.8
-  XSA_243_48 = (xsaPatch {
-    name = "243-4.8";
-    sha256 = "1q60zn55l9wpq45nrxh0av59sjz0jg8pkjm1gkyywkdsgg4fg5z4";
-  });
-
-  # 4.9
-  XSA_243 = (xsaPatch {
-    name = "243";
-    sha256 = "06fnbnh9zlsbkqih9ipnb7a8gly54m7lp17d854j1r370ad3c4yg";
-  });
-
   # 4.5
   XSA_244_45 = (xsaPatch {
     name = "244-4.5";
     sha256 = "05ci3vdl1ywfjpzcvsy1k52whxjk8pxzj7dh3r94yqasr56i5v2l";
   });
 
-  # 4.8 - 4.9
-  XSA_244 = (xsaPatch {
-    name = "244";
-    sha256 = "10308xsgmhb0vg6fk0ql8v94zifv6dcv6vkaicryfp405yj2rzkm";
-  });
-
   # 4.5 - 4.9
   XSA_245 = [
     (xsaPatch {
@@ -780,26 +442,6 @@ in {
     })
   ];
 
-  # 4.8 - 4.9
-  XSA_246 = [
-    (xsaPatch {
-      name = "246-4.9";
-      sha256 = "0z68vm0z5zvv9gm06pxs9kxq2q9fdbl0l0cm71ggzdplg1vw0snz";
-    })
-  ];
-
-  # 4.8
-  XSA_247_48 = [
-    (xsaPatch {
-      name = "247-4.8/0001-p2m-Always-check-to-see-if-removing-a-p2m-entry-actu";
-      sha256 = "0kvjrk90n69s721c2qj2df5raml3pjk6bg80aig353p620w6s3xh";
-    })
-    (xsaPatch {
-      name = "247-4.8/0002-p2m-Check-return-value-of-p2m_set_entry-when-decreas";
-      sha256 = "1s9kv6h6dd8psi5qf5l5gpk9qhq8blckwhl76cjbldcgi6imb3nr";
-    })
-  ];
-
   # 4.5
   XSA_247_45 = [
     (xsaPatch {
@@ -820,14 +462,6 @@ in {
     })
   ];
 
-  # 4.8
-  XSA_248_48 = [
-    (xsaPatch {
-      name = "248-4.8";
-      sha256 = "1ycw29q22ymxg18kxpr5p7vhpmp8klssbp5gq77hspxzz2mb96q1";
-    })
-  ];
-
   # 4.5 .. 4.9
   XSA_249 = [
    (xsaPatch {
@@ -835,6 +469,7 @@ in {
       sha256 = "0v6ngzqhkz7yv4n83xlpxfbkr2qyg5b1cds7ikkinm86hiqy6agl";
     })
   ];
+
   # 4.5
   XSA_250_45 = [
    (xsaPatch {
@@ -842,13 +477,7 @@ in {
       sha256 = "0pqldl6qnl834gvfp90z247q9xcjh3835s2iffnajz7jhjb2145d";
     })
   ];
-  # 4.8 ...
-  XSA_250 = [
-   (xsaPatch {
-      name = "250";
-      sha256 = "1wpigg8kmha57sspqqln3ih9nbczsw6rx3v72mc62lh62qvwd7x8";
-    })
-  ];
+
   # 4.5
   XSA_251_45 = [
    (xsaPatch {
@@ -856,81 +485,4 @@ in {
       sha256 = "0lc94cx271z09r0mhxaypyd9d4740051p28idf5calx5228dqjgm";
     })
   ];
-  # 4.8
-  XSA_251_48 = [
-   (xsaPatch {
-      name = "251-4.8";
-      sha256 = "079wi0j6iydid2zj7k584w2c393kgh588w7sjz2nn4039qn8k9mq";
-    })
-  ];
-  # 4.8
-  XSA_252_49 = [
-   (xsaPatch {
-      name = "252-4.9";
-      sha256 = "03sbn90nlkk5ba1n168rxjkc7x3mqj7rfqvspbwblmwikfbnms2n";
-    })
-  ];
-  # 4.8
-  XSA_255_49_1= [
-   (xsaPatch {
-      name = "255-4.9-1";
-      sha256 = "0gbin7yxbkq40lvm3gvj1vffavvbng3zpd2m8l1kqyz0rv4vm9zc";
-    })
-  ];
-  # 4.8
-  XSA_255_49_2= [
-   (xsaPatch {
-      name = "255-4.9-2";
-      sha256 = "0fyg5nnyfpfr80qq83pr64zjp5w1nx94bdblzsjap8gaqcahyr12";
-    })
-  ];
-  # 4.8
-  XSA_256_48= [
-   (xsaPatch {
-      name = "256-4.8";
-      sha256 = "1w84f717kxwx0h3rw18r4f8pl0l1h5xlj5fy80sr0ws4xkp1qdn4";
-    })
-  ];
-
-
-  # 4.10
-  XSA_252 = [
-   (xsaPatch {
-      name = "252";
-      sha256 = "0v4sg20dnvnwrjh3x69gk81v2kmcql7g2s044vg3wcxhzvij1rrn";
-    })
-  ];
-
-  # 4.10
-  XSA_253 = [
-   (xsaPatch {
-      name = "253";
-      sha256 = "0445vzlzy3gd499xraqh5r4qjar6qr0y3813h22jy1n84nhxz27i";
-    })
-  ];
-
-  # 4.10
-  XSA_255_1 = [
-   (xsaPatch {
-      name = "255-1";
-      sha256 = "05g2f3ji1rrjlw3yw4nrns50pnmsib8ybrf64scr1817mj0q9myr";
-    })
-  ];
-
-  # 4.10
-  XSA_255_2 = [
-   (xsaPatch {
-      name = "255-2";
-      sha256 = "08wbngw5z0f9g8di59hww3hhi7j9z49bpc4xlwn5akfcwbgf0961";
-    })
-  ];
-
-  # 4.10
-  XSA_256 = [
-   (xsaPatch {
-      name = "256";
-      sha256 = "1hicwhbwj6k25px55f4ncx1c5xiihi8pfvsb3kv57k7kaicb7pza";
-    })
-  ];
-
 }
-- 
GitLab


From 4a99b423fe56876cb240ba0824631a745f747924 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sat, 14 Sep 2019 15:18:12 +0300
Subject: [PATCH 0242/2254] sccache: 0.2.10 -> 0.2.11

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

diff --git a/pkgs/development/tools/misc/sccache/default.nix b/pkgs/development/tools/misc/sccache/default.nix
index b9a4658d3de..998abe112a6 100644
--- a/pkgs/development/tools/misc/sccache/default.nix
+++ b/pkgs/development/tools/misc/sccache/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, cargo, rustc, rustPlatform, pkgconfig, glib, openssl, darwin }:
 
 rustPlatform.buildRustPackage rec {
-  version = "0.2.10";
+  version = "0.2.11";
   pname = "sccache";
 
   src = fetchFromGitHub {
     owner = "mozilla";
     repo = "sccache";
     rev = version;
-    sha256 = "13fiifv3bi9shzp30wd7k2nd2j43vzdhk6z5rnfn5a9hmijqpg9n";
+    sha256 = "0084ddvzjgdpkwqc38kvzaz8n6av9ml3qqlkjma70hsis8w8gqjz";
   };
   cargoSha256 = "1bkglgrasyjyzjj9mwm32d3g3mg5yv74jj3zl7jf20dlq3rg3fh6";
 
-- 
GitLab


From cbab4663f33f59b1fe347beb66f12d0f73746301 Mon Sep 17 00:00:00 2001
From: Daniel Schaefer <git@danielschaefer.me>
Date: Sat, 14 Sep 2019 14:01:38 +0200
Subject: [PATCH 0243/2254] paperless: Use pytest_4 in django-crispy-forms

Doesn't build with pytest_5
---
 .../office/paperless/python-modules/django-crispy-forms.nix   | 4 ++--
 pkgs/development/python-modules/pytest/{2.nix => 4.nix}       | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename pkgs/development/python-modules/pytest/{2.nix => 4.nix} (100%)

diff --git a/pkgs/applications/office/paperless/python-modules/django-crispy-forms.nix b/pkgs/applications/office/paperless/python-modules/django-crispy-forms.nix
index c1e0f7da30f..465da386247 100644
--- a/pkgs/applications/office/paperless/python-modules/django-crispy-forms.nix
+++ b/pkgs/applications/office/paperless/python-modules/django-crispy-forms.nix
@@ -1,5 +1,5 @@
 { lib, buildPythonPackage, fetchFromGitHub
-, pytest, pytest-django, django }:
+, pytest_4, pytest-django, django }:
 
 buildPythonPackage {
   pname = "django-crispy-forms";
@@ -19,7 +19,7 @@ buildPythonPackage {
     export sourceRoot=source-
   '';
 
-  checkInputs = [ pytest pytest-django django ];
+  checkInputs = [ pytest_4 pytest-django django ];
 
   checkPhase = ''
     PYTHONPATH="$(pwd):$PYTHONPATH" \
diff --git a/pkgs/development/python-modules/pytest/2.nix b/pkgs/development/python-modules/pytest/4.nix
similarity index 100%
rename from pkgs/development/python-modules/pytest/2.nix
rename to pkgs/development/python-modules/pytest/4.nix
-- 
GitLab


From c6f257265db30a24f81cb0752578028c98b42cbf Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 14 Sep 2019 14:22:01 +0200
Subject: [PATCH 0244/2254] documize-community: 3.2.0 -> 3.3.0

https://github.com/documize/community/releases/tag/v3.3.0
---
 pkgs/servers/documize-community/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/documize-community/default.nix b/pkgs/servers/documize-community/default.nix
index 317783e4f8f..f06315b899d 100644
--- a/pkgs/servers/documize-community/default.nix
+++ b/pkgs/servers/documize-community/default.nix
@@ -2,13 +2,13 @@
 
 buildGoPackage rec {
   pname = "documize-community";
-  version = "3.2.0";
+  version = "3.3.0";
 
   src = fetchFromGitHub {
     owner = "documize";
     repo = "community";
     rev = "v${version}";
-    sha256 = "13r0x1mbprhk19a1cikq8cl553xdrxin9arw90am69iv6rcps3w3";
+    sha256 = "1qkc82bvpmgcil88630pnp1irc2w8rzlh702vl0v67vfmawpxpjq";
   };
 
   goPackagePath = "github.com/documize/community";
-- 
GitLab


From ea3ea651f95b492ebb9b516146a684e0e63a15a0 Mon Sep 17 00:00:00 2001
From: Daniel Schaefer <git@danielschaefer.me>
Date: Sat, 14 Sep 2019 14:17:08 +0200
Subject: [PATCH 0245/2254] ape: 6.7-131003 -> 2019-08-10

---
 pkgs/applications/misc/ape/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/misc/ape/default.nix b/pkgs/applications/misc/ape/default.nix
index e78ba2df999..0d8ebccb3d0 100644
--- a/pkgs/applications/misc/ape/default.nix
+++ b/pkgs/applications/misc/ape/default.nix
@@ -1,33 +1,33 @@
 { stdenv, swiProlog, makeWrapper,
   fetchFromGitHub,
-  lexicon ? "lexicon/clex_lexicon.pl",
+  lexicon ? "prolog/lexicon/clex_lexicon.pl",
   pname ? "ape",
   description ? "Parser for Attempto Controlled English (ACE)",
   license ? with stdenv.lib; licenses.lgpl3
   }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
-  version = "6.7-131003";
+  inherit pname;
+  version = "2019-08-10";
 
   buildInputs = [ swiProlog makeWrapper ];
 
   src = fetchFromGitHub {
      owner = "Attempto";
      repo = "APE";
-     rev = version;
-     sha256 = "0cw47qjg4896kw3vps6rfs02asvscsqvcfdiwgfmqb3hvykb1sdx";
+     rev = "113b81621262d7a395779465cb09397183e6f74c";
+     sha256 = "0xyvna2fbr18hi5yvm0zwh77q02dfna1g4g53z9mn2rmlfn2mhjh";
   };
 
   patchPhase = ''
     # We move the file first to avoid "same file" error in the default case
     cp ${lexicon} new_lexicon.pl
-    rm lexicon/clex_lexicon.pl
-    cp new_lexicon.pl lexicon/clex_lexicon.pl
+    rm prolog/lexicon/clex_lexicon.pl
+    cp new_lexicon.pl prolog/lexicon/clex_lexicon.pl
   '';
 
   buildPhase = ''
-    make build
+    make SHELL=${stdenv.shell} build
   '';
 
   installPhase = ''
-- 
GitLab


From d66430be79a91c64be85e6e8f0b622764ba89e13 Mon Sep 17 00:00:00 2001
From: Ivan Kozik <ivan@ludios.org>
Date: Tue, 10 Sep 2019 19:38:21 +0000
Subject: [PATCH 0246/2254] chromium: 76.0.3809.132 -> 77.0.3865.75

CVE-2019-5870 CVE-2019-5871 CVE-2019-5872 CVE-2019-5873
CVE-2019-5874 CVE-2019-5875 CVE-2019-5876 CVE-2019-5877
CVE-2019-5878 CVE-2019-5879 CVE-2019-5880 CVE-2019-5881
CVE-2019-13659 CVE-2019-13660 CVE-2019-13661 CVE-2019-13662
CVE-2019-13663 CVE-2019-13664 CVE-2019-13665 CVE-2019-13666
CVE-2019-13667 CVE-2019-13668 CVE-2019-13669 CVE-2019-13670
CVE-2019-13671 CVE-2019-13673 CVE-2019-13674 CVE-2019-13675
CVE-2019-13676 CVE-2019-13677 CVE-2019-13678 CVE-2019-13679
CVE-2019-13680 CVE-2019-13681 CVE-2019-13682 CVE-2019-13683
---
 .../networking/browsers/chromium/upstream-info.nix   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index 14799e9f96c..df2ce798f1f 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@@ -1,9 +1,9 @@
 # This file is autogenerated from update.sh in the same directory.
 {
   beta = {
-    sha256 = "0m7xdpi1f2a33csd7bsp91g5klz0hmr83ksfwsd2fki3iipvfs4w";
-    sha256bin64 = "1b4cyf4v55sy52mxxl8d70abg5ck5k45jaqdjsjw7dvh3s2x4bwp";
-    version = "77.0.3865.42";
+    sha256 = "12cp24h93b48pwfywf5b6qvjdlhxrhp87qdaqbfcn6g787r2z5gb";
+    sha256bin64 = "0d9w869qqwbmw3qjvxkfm37i7dvrgmrwm5y96sm1dg2jnxqj4bdz";
+    version = "77.0.3865.75";
   };
   dev = {
     sha256 = "0x5r6xqwiggwyzbinm252xc1n3f9r7cmmzj6assi4v1nsispdh2k";
@@ -11,8 +11,8 @@
     version = "78.0.3887.7";
   };
   stable = {
-    sha256 = "0hajwjf7swlgh1flpf8ljfrb2zhmcpzvrigvvxqd36g3nm04cknm";
-    sha256bin64 = "0hdsla8i3q0zbczia64ghqsf420alcc31xdishx1sv48x3rlrxkk";
-    version = "76.0.3809.132";
+    sha256 = "12cp24h93b48pwfywf5b6qvjdlhxrhp87qdaqbfcn6g787r2z5gb";
+    sha256bin64 = "1wp5g09czyslkkhw3nhbp39fxfcz0pprsgj8h0aggghpdbvzph3d";
+    version = "77.0.3865.75";
   };
 }
-- 
GitLab


From 740d4c22ecccf94b5b55c449437069a96a005c6c Mon Sep 17 00:00:00 2001
From: Daniel Fullmer <danielrf12@gmail.com>
Date: Fri, 13 Sep 2019 15:53:03 -0400
Subject: [PATCH 0247/2254] k2pdfopt: Fix build and clean up

---
 pkgs/applications/misc/k2pdfopt/default.nix   |   62 +-
 .../k2pdfopt/leptonica-CVE-2018-3836.patch    |   95 --
 .../misc/k2pdfopt/leptonica.patch             |  254 ++++
 pkgs/applications/misc/k2pdfopt/mupdf.patch   | 1060 +++++++++++++++++
 .../misc/k2pdfopt/tesseract.patch             |  678 ++++++++++-
 5 files changed, 1991 insertions(+), 158 deletions(-)
 delete mode 100644 pkgs/applications/misc/k2pdfopt/leptonica-CVE-2018-3836.patch
 create mode 100644 pkgs/applications/misc/k2pdfopt/leptonica.patch
 create mode 100644 pkgs/applications/misc/k2pdfopt/mupdf.patch

diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix
index 9391fe88c5e..58bd200e713 100644
--- a/pkgs/applications/misc/k2pdfopt/default.nix
+++ b/pkgs/applications/misc/k2pdfopt/default.nix
@@ -36,67 +36,19 @@ stdenv.mkDerivation rec {
 
   buildInputs =
   let
+    #  The patches below were constructed by taking the files from k2pdfopt in
+    #  the {mupdf,leptonica,tesseract}_mod/ directories, replacing the
+    #  corresponding files in the respective source trees, resolving any errors
+    #  with more recent versions of these depencencies, and running diff.
     mupdf_modded = mupdf.overrideAttrs (attrs: {
-      # Excluded the pdf-*.c files, since they mostly just broke the #includes
-      prePatch = ''
-        cp ${src}/mupdf_mod/{font,stext-device,string}.c source/fitz/
-        cp ${src}/mupdf_mod/font-win32.c source/pdf/
-      '';
+      patches = attrs.patches ++ [ ./mupdf.patch ]; # Last verified with mupdf 1.14.0
     });
-
     leptonica_modded = leptonica.overrideAttrs (attrs: {
-      name = "leptonica-1.74.4";
-      # Modified source files apply to this particular version of leptonica
-      version = "1.74.4";
-
-      src = fetchurl {
-        url = "http://www.leptonica.org/source/leptonica-1.74.4.tar.gz";
-        sha256 = "0fw39amgyv8v6nc7x8a4c7i37dm04i6c5zn62d24bgqnlhk59hr9";
-      };
-
-      prePatch = ''
-        cp ${src}/leptonica_mod/{allheaders.h,dewarp2.c,leptwin.c} src/
-      '';
-      patches = [
-        # stripped down copy of upstream commit b88c821f8d347bce0aea86d606c710303919f3d2
-        ./leptonica-CVE-2018-3836.patch
-        (fetchpatch {
-          # CVE-2018-7186
-          url = "https://github.com/DanBloomberg/leptonica/commit/"
-              + "ee301cb2029db8a6289c5295daa42bba7715e99a.patch";
-          sha256 = "0cgb7mvz2px1rg5i80wk1wxxjvzjga617d8q6j7qygkp7jm6495d";
-        })
-        (fetchpatch {
-          # CVE-2018-7247
-          url = "https://github.com/DanBloomberg/leptonica/commit/"
-              + "c1079bb8e77cdd426759e466729917ca37a3ed9f.patch";
-          sha256 = "1z4iac5gwqggh7aa8cvyp6nl9fwd1v7wif26caxc9y5qr3jj34qf";
-        })
-        (fetchpatch {
-          # CVE-2018-7440
-          url = "https://github.com/DanBloomberg/leptonica/commit/"
-              + "49ecb6c2dfd6ed5078c62f4a8eeff03e3beced3b.patch";
-          sha256 = "1hjmva98iaw9xj7prg7aimykyayikcwnk4hk0380007hqb35lqmy";
-        })
-      ];
+      patches = [ ./leptonica.patch ]; # Last verified with leptonica 1.78.0
     });
     tesseract_modded = tesseract4.override {
       tesseractBase = tesseract4.tesseractBase.overrideAttrs (_: {
-        prePatch = ''
-          cp ${src}/tesseract_mod/baseapi.{h,cpp} src/api/
-          cp ${src}/tesseract_mod/ccutil.{h,cpp} src/ccutil/
-          cp ${src}/tesseract_mod/genericvector.h src/ccutil/
-          cp ${src}/tesseract_mod/input.cpp src/lstm/
-          cp ${src}/tesseract_mod/lstmrecognizer.cpp src/lstm/
-          cp ${src}/tesseract_mod/mainblk.cpp src/ccutil/
-          cp ${src}/tesseract_mod/params.cpp src/ccutil/
-          cp ${src}/tesseract_mod/serialis.{h,cpp} src/ccutil/
-          cp ${src}/tesseract_mod/tesscapi.cpp src/api/
-          cp ${src}/tesseract_mod/tessdatamanager.cpp src/ccstruct/
-          cp ${src}/tesseract_mod/tessedit.cpp src/ccmain/
-          cp ${src}/include_mod/{tesseract.h,leptonica.h} src/api/
-        '';
-        patches = [ ./tesseract.patch ];
+        patches = [ ./tesseract.patch ]; # Last verified with tesseract 1.4
       });
     };
   in
diff --git a/pkgs/applications/misc/k2pdfopt/leptonica-CVE-2018-3836.patch b/pkgs/applications/misc/k2pdfopt/leptonica-CVE-2018-3836.patch
deleted file mode 100644
index f1b4170fbaa..00000000000
--- a/pkgs/applications/misc/k2pdfopt/leptonica-CVE-2018-3836.patch
+++ /dev/null
@@ -1,95 +0,0 @@
---- a/src/allheaders.h
-+++ b/src/allheaders.h
-@@ -2600,6 +2600,7 @@
- LEPT_DLL extern char * stringReverse ( const char *src );
- LEPT_DLL extern char * strtokSafe ( char *cstr, const char *seps, char **psaveptr );
- LEPT_DLL extern l_int32 stringSplitOnToken ( char *cstr, const char *seps, char **phead, char **ptail );
-+LEPT_DLL extern l_int32 stringCheckForChars ( const char *src, const char *chars, l_int32 *pfound );
- LEPT_DLL extern char * stringRemoveChars ( const char *src, const char *remchars );
- LEPT_DLL extern l_int32 stringFindSubstr ( const char *src, const char *sub, l_int32 *ploc );
- LEPT_DLL extern char * stringReplaceSubstr ( const char *src, const char *sub1, const char *sub2, l_int32 *pfound, l_int32 *ploc );
---- a/src/gplot.c
-+++ b/src/gplot.c
-@@ -141,9 +141,10 @@
-             const char  *xlabel,
-             const char  *ylabel)
- {
--char   *newroot;
--char    buf[L_BUF_SIZE];
--GPLOT  *gplot;
-+char    *newroot;
-+char     buf[L_BUF_SIZE];
-+l_int32  badchar;
-+GPLOT   *gplot;
- 
-     PROCNAME("gplotCreate");
- 
-@@ -152,6 +153,9 @@
-     if (outformat != GPLOT_PNG && outformat != GPLOT_PS &&
-         outformat != GPLOT_EPS && outformat != GPLOT_LATEX)
-         return (GPLOT *)ERROR_PTR("outformat invalid", procName, NULL);
-+    stringCheckForChars(rootname, "`;&|><\"?*", &badchar);
-+    if (badchar)  /* danger of command injection */
-+        return (GPLOT *)ERROR_PTR("invalid rootname", procName, NULL);
- 
-     if ((gplot = (GPLOT *)LEPT_CALLOC(1, sizeof(GPLOT))) == NULL)
-         return (GPLOT *)ERROR_PTR("gplot not made", procName, NULL);
---- a/src/utils2.c
-+++ b/src/utils2.c
-@@ -42,6 +42,7 @@
-  *           l_int32    stringSplitOnToken()
-  *
-  *       Find and replace string and array procs
-+ *           l_int32    stringCheckForChars()
-  *           char      *stringRemoveChars()
-  *           l_int32    stringFindSubstr()
-  *           char      *stringReplaceSubstr()
-@@ -701,6 +702,48 @@
- /*--------------------------------------------------------------------*
-  *                       Find and replace procs                       *
-  *--------------------------------------------------------------------*/
-+/*!
-+ * \brief   stringCheckForChars()
-+ *
-+ * \param[in]    src      input string; can be of zero length
-+ * \param[in]    chars    string of chars to be searched for in %src
-+ * \param[out]   pfound   1 if any characters are found; 0 otherwise
-+ * \return  0 if OK, 1 on error
-+ *
-+ * <pre>
-+ * Notes:
-+ *      (1) This can be used to sanitize an operation by checking for
-+ *          special characters that don't belong in a string.
-+ * </pre>
-+ */
-+l_int32
-+stringCheckForChars(const char  *src,
-+                    const char  *chars,
-+                    l_int32     *pfound)
-+{
-+char     ch;
-+l_int32  i, n;
-+
-+    PROCNAME("stringCheckForChars");
-+
-+    if (!pfound)
-+        return ERROR_INT("&found not defined", procName, 1);
-+    *pfound = FALSE;
-+    if (!src || !chars)
-+        return ERROR_INT("src and chars not both defined", procName, 1);
-+
-+    n = strlen(src);
-+    for (i = 0; i < n; i++) {
-+        ch = src[i];
-+        if (strchr(chars, ch)) {
-+            *pfound = TRUE;
-+            break;
-+        }
-+    }
-+    return 0;
-+}
-+
-+
- /*!
-  * \brief   stringRemoveChars()
-  *
diff --git a/pkgs/applications/misc/k2pdfopt/leptonica.patch b/pkgs/applications/misc/k2pdfopt/leptonica.patch
new file mode 100644
index 00000000000..dfab99fd013
--- /dev/null
+++ b/pkgs/applications/misc/k2pdfopt/leptonica.patch
@@ -0,0 +1,254 @@
+From 8c11a20925686855023df90ed477957c7d7fe91e Mon Sep 17 00:00:00 2001
+From: Daniel Fullmer <danielrf12@gmail.com>
+Date: Fri, 13 Sep 2019 15:54:21 -0400
+Subject: [PATCH] Willus mod for k2pdfopt
+
+---
+ src/allheaders.h |   4 ++
+ src/dewarp2.c    | 106 ++++++++++++++++++++++++++++++++++++++++++-----
+ src/leptwin.c    |   6 ++-
+ 3 files changed, 104 insertions(+), 12 deletions(-)
+
+diff --git a/src/allheaders.h b/src/allheaders.h
+index e68eff1..b3cc729 100644
+--- a/src/allheaders.h
++++ b/src/allheaders.h
+@@ -669,6 +669,10 @@ LEPT_DLL extern L_DEWARPA * dewarpaReadMem ( const l_uint8 *data, size_t size );
+ LEPT_DLL extern l_ok dewarpaWrite ( const char *filename, L_DEWARPA *dewa );
+ LEPT_DLL extern l_ok dewarpaWriteStream ( FILE *fp, L_DEWARPA *dewa );
+ LEPT_DLL extern l_ok dewarpaWriteMem ( l_uint8 **pdata, size_t *psize, L_DEWARPA *dewa );
++/* WILLUS MOD */
++    LEPT_DLL extern l_int32 dewarpBuildPageModel_ex ( L_DEWARP *dew, const char *debugfile,l_int32 fit_order );
++    LEPT_DLL extern l_int32 dewarpFindVertDisparity_ex ( L_DEWARP *dew, PTAA *ptaa, l_int32 rotflag,l_int32 fit_order );
++    LEPT_DLL extern l_int32 dewarpBuildLineModel_ex ( L_DEWARP *dew, l_int32 opensize, const char *debugfile,l_int32 fit_order );
+ LEPT_DLL extern l_ok dewarpBuildPageModel ( L_DEWARP *dew, const char *debugfile );
+ LEPT_DLL extern l_ok dewarpFindVertDisparity ( L_DEWARP *dew, PTAA *ptaa, l_int32 rotflag );
+ LEPT_DLL extern l_ok dewarpFindHorizDisparity ( L_DEWARP *dew, PTAA *ptaa );
+diff --git a/src/dewarp2.c b/src/dewarp2.c
+index 220eec1..2e29500 100644
+--- a/src/dewarp2.c
++++ b/src/dewarp2.c
+@@ -144,9 +144,17 @@ static const l_float32   L_ALLOWED_W_FRACT = 0.05;  /* no bigger */
+  *          longest textlines.
+  * </pre>
+  */
++/* WILLUS MOD */
+ l_ok
+-dewarpBuildPageModel(L_DEWARP    *dew,
+-                     const char  *debugfile)
++dewarpBuildPageModel(L_DEWARP *dew,const char *debugfile)
++{
++return(dewarpBuildPageModel_ex(dew,debugfile,2));
++}
++
++l_ok
++dewarpBuildPageModel_ex(L_DEWARP    *dew,
++                     const char  *debugfile,
++                     l_int32 fit_order)
+ {
+ l_int32  linecount, topline, botline, ret;
+ PIX     *pixs, *pix1, *pix2, *pix3;
+@@ -225,7 +233,7 @@ PTAA    *ptaa1, *ptaa2;
+         /* Get the sampled vertical disparity from the textline centers.
+          * The disparity array will push pixels vertically so that each
+          * textline is flat and centered at the y-position of the mid-point. */
+-    if (dewarpFindVertDisparity(dew, ptaa2, 0) != 0) {
++    if (dewarpFindVertDisparity_ex(dew, ptaa2, 0, fit_order) != 0) {
+         L_WARNING("vertical disparity not built\n", procName);
+         ptaaDestroy(&ptaa2);
+         return 1;
+@@ -290,13 +298,24 @@ PTAA    *ptaa1, *ptaa2;
+  *          a pdf.  Non-pix debug output goes to /tmp.
+  * </pre>
+  */
++/* WILLUS MOD */
+ l_ok
+ dewarpFindVertDisparity(L_DEWARP  *dew,
+                         PTAA      *ptaa,
+                         l_int32    rotflag)
+ {
++return(dewarpFindVertDisparity_ex(dew,ptaa,rotflag,2));
++}
++/* WILLUS MOD -- add cubic and quartic fits and ..._ex functions */
++l_int32
++dewarpFindVertDisparity_ex(L_DEWARP  *dew,
++                        PTAA      *ptaa,
++                        l_int32    rotflag,
++                        l_int32    fit_order)
++{
+ l_int32     i, j, nlines, npts, nx, ny, sampling;
+-l_float32   c0, c1, c2, x, y, midy, val, medval, meddev, minval, maxval;
++/* WILLUS MOD */
++l_float32   c0, c1, c2, c3, c4, x, y, midy, val, medval, meddev, minval, maxval;
+ l_float32  *famidys;
+ NUMA       *nax, *nafit, *nacurve0, *nacurve1, *nacurves;
+ NUMA       *namidy, *namidys, *namidysi;
+@@ -304,11 +323,22 @@ PIX        *pix1, *pix2, *pixcirc, *pixdb;
+ PTA        *pta, *ptad, *ptacirc;
+ PTAA       *ptaa0, *ptaa1, *ptaa2, *ptaa3, *ptaa4, *ptaa5, *ptaat;
+ FPIX       *fpix;
++/* WILLUS MOD */
++l_int32 fit_order1,fit_order2;
+ 
+     PROCNAME("dewarpFindVertDisparity");
+ 
+     if (!dew)
+         return ERROR_INT("dew not defined", procName, 1);
++/* WILLUS MOD */
++    if (fit_order < 10)
++        fit_order1 = fit_order2 = fit_order;
++    else
++        {
++        fit_order1=fit_order % 10;
++        fit_order2=fit_order / 10;
++        fit_order2=fit_order2 % 10;
++        }
+     dew->vsuccess = 0;
+     if (!ptaa)
+         return ERROR_INT("ptaa not defined", procName, 1);
+@@ -331,12 +361,32 @@ FPIX       *fpix;
+     pixdb = (rotflag) ? pixRotateOrth(dew->pixs, 1) : pixClone(dew->pixs);
+     for (i = 0; i < nlines; i++) {  /* for each line */
+         pta = ptaaGetPta(ptaa, i, L_CLONE);
+-        ptaGetQuadraticLSF(pta, &c2, &c1, &c0, NULL);
+-        numaAddNumber(nacurve0, c2);
++/* WILLUS MOD */
++if (fit_order1>3)
++    {
++    ptaGetQuarticLSF(pta, &c4, &c3, &c2, &c1, &c0, NULL);
++    numaAddNumber(nacurve0, c4);
++    }
++else if (fit_order1==3)
++    {
++    ptaGetCubicLSF(pta, &c3, &c2, &c1, &c0, NULL);
++    numaAddNumber(nacurve0, c3);
++    }
++else
++    {
++    ptaGetQuadraticLSF(pta, &c2, &c1, &c0, NULL);
++    numaAddNumber(nacurve0, c2);
++    }
+         ptad = ptaCreate(nx);
+         for (j = 0; j < nx; j++) {  /* uniformly sampled in x */
+              x = j * sampling;
+-             applyQuadraticFit(c2, c1, c0, x, &y);
++/* WILLUS MOD */
++if (fit_order1>3)
++    applyQuarticFit(c4, c3, c2, c1, c0, x, &y);
++else if (fit_order1==3)
++    applyCubicFit(c3, c2, c1, c0, x, &y);
++else
++    applyQuadraticFit(c2, c1, c0, x, &y);
+              ptaAddPt(ptad, x, y);
+         }
+         ptaaAddPta(ptaa0, ptad, L_INSERT);
+@@ -350,7 +400,13 @@ FPIX       *fpix;
+         for (i = 0; i < nlines; i++) {
+             pta = ptaaGetPta(ptaa, i, L_CLONE);
+             ptaGetArrays(pta, &nax, NULL);
+-            ptaGetQuadraticLSF(pta, NULL, NULL, NULL, &nafit);
++/* WILLUS MOD */
++if (fit_order1>3)
++ptaGetQuarticLSF(pta, NULL, NULL, NULL, NULL, NULL, &nafit);
++else if (fit_order1==3)
++ptaGetCubicLSF(pta, NULL, NULL, NULL, NULL, &nafit);
++else
++ptaGetQuadraticLSF(pta, NULL, NULL, NULL, &nafit);
+             ptad = ptaCreateFromNuma(nax, nafit);
+             ptaaAddPta(ptaat, ptad, L_INSERT);
+             ptaDestroy(&pta);
+@@ -494,11 +550,24 @@ FPIX       *fpix;
+     ptaa5 = ptaaCreate(nx);  /* uniformly sampled across full height of image */
+     for (j = 0; j < nx; j++) {  /* for each column */
+         pta = ptaaGetPta(ptaa4, j, L_CLONE);
+-        ptaGetQuadraticLSF(pta, &c2, &c1, &c0, NULL);
++/* WILLUS MOD */
++/* Order higher than 2 can cause a little craziness here. */
++if (fit_order2>3)
++    ptaGetQuarticLSF(pta, &c4, &c3, &c2, &c1, &c0, NULL);
++else if (fit_order2==3)
++    ptaGetCubicLSF(pta, &c3, &c2, &c1, &c0, NULL);
++else
++    ptaGetQuadraticLSF(pta, &c2, &c1, &c0, NULL);
+         ptad = ptaCreate(ny);
+         for (i = 0; i < ny; i++) {  /* uniformly sampled in y */
+              y = i * sampling;
+-             applyQuadraticFit(c2, c1, c0, y, &val);
++/* WILLUS MOD */
++if (fit_order2>3)
++    applyQuarticFit(c4, c3, c2, c1, c0, y, &val);
++else if (fit_order2==3)
++    applyCubicFit(c3, c2, c1, c0, y, &val);
++else
++    applyQuadraticFit(c2, c1, c0, y, &val);
+              ptaAddPt(ptad, y, val);
+         }
+         ptaaAddPta(ptaa5, ptad, L_INSERT);
+@@ -1602,11 +1671,21 @@ FPIX      *fpix;
+  *          See notes there.
+  * </pre>
+  */
++/* WILLUS MOD */
+ l_ok
+ dewarpBuildLineModel(L_DEWARP    *dew,
+                      l_int32      opensize,
+                      const char  *debugfile)
+ {
++return(dewarpBuildLineModel_ex(dew,opensize,debugfile,2));
++}
++
++l_int32
++dewarpBuildLineModel_ex(L_DEWARP    *dew,
++                     l_int32      opensize,
++                     const char  *debugfile,
++                     l_int32 fit_order)
++{
+ char     buf[64];
+ l_int32  i, j, bx, by, ret, nlines;
+ BOXA    *boxa;
+@@ -1695,6 +1774,8 @@ PTAA    *ptaa1, *ptaa2;
+ 
+             /* Remove all lines that are not at least 0.75 times the length
+              * of the longest line. */
++/* WILLUS MOD */
++/*
+         ptaa2 = dewarpRemoveShortLines(pix, ptaa1, 0.75, DEBUG_SHORT_LINES);
+         if (debugfile) {
+             pix1 = pixConvertTo32(pix);
+@@ -1704,6 +1785,8 @@ PTAA    *ptaa1, *ptaa2;
+             pixDestroy(&pix1);
+             pixDestroy(&pix2);
+         }
++*/
++ptaa2=ptaa1;
+         ptaaDestroy(&ptaa1);
+         nlines = ptaaGetCount(ptaa2);
+         if (nlines < dew->minlines) {
+@@ -1717,7 +1800,8 @@ PTAA    *ptaa1, *ptaa2;
+              * centers.  The disparity array will push pixels vertically
+              * so that each line is flat and centered at the y-position
+              * of the mid-point. */
+-        ret = dewarpFindVertDisparity(dew, ptaa2, 1 - i);
++/* WILLUS MOD */
++        ret = dewarpFindVertDisparity_ex(dew, ptaa2, 1 - i, fit_order);
+ 
+             /* If i == 0, move the result to the horizontal disparity,
+              * rotating it back by -90 degrees. */
+diff --git a/src/leptwin.c b/src/leptwin.c
+index 72643a0..573d33e 100644
+--- a/src/leptwin.c
++++ b/src/leptwin.c
+@@ -364,5 +364,9 @@ PIXCMAP   *cmap;
+ 
+     return hBitmap;
+ }
+-
++#else
++/* willus mod: Avoid weird issue with OS/X library archiver when there are no symbols */
++int leptwin_my_empty_func(void);
++int leptwin_my_empty_func(void)
++{return(0);}
+ #endif   /* _WIN32 */
+-- 
+2.22.0
+
diff --git a/pkgs/applications/misc/k2pdfopt/mupdf.patch b/pkgs/applications/misc/k2pdfopt/mupdf.patch
new file mode 100644
index 00000000000..f7c04d42a71
--- /dev/null
+++ b/pkgs/applications/misc/k2pdfopt/mupdf.patch
@@ -0,0 +1,1060 @@
+From 3d763f84872351c250ffea26150e73b02b8f4c6f Mon Sep 17 00:00:00 2001
+From: Daniel Fullmer <danielrf12@gmail.com>
+Date: Fri, 13 Sep 2019 15:11:45 -0400
+Subject: [PATCH] Willus mod for k2pdfopt
+
+---
+ source/fitz/filter-basic.c |   3 +
+ source/fitz/font-win32.c   | 866 +++++++++++++++++++++++++++++++++++++
+ source/fitz/font.c         |   3 +
+ source/fitz/stext-device.c |   5 +
+ source/fitz/string.c       |   5 +
+ source/pdf/pdf-annot.c     |  14 +-
+ source/pdf/pdf-link.c      |   3 +
+ source/pdf/pdf-parse.c     |   5 +
+ source/pdf/pdf-xref.c      |   9 +
+ 9 files changed, 912 insertions(+), 1 deletion(-)
+ create mode 100644 source/fitz/font-win32.c
+
+diff --git a/source/fitz/filter-basic.c b/source/fitz/filter-basic.c
+index 0713a62e7..b8ef4d292 100644
+--- a/source/fitz/filter-basic.c
++++ b/source/fitz/filter-basic.c
+@@ -259,7 +259,10 @@ look_for_endstream:
+ 	if (!state->warned)
+ 	{
+ 		state->warned = 1;
++/* willus mod -- no warning */
++/*
+ 		fz_warn(ctx, "PDF stream Length incorrect");
++*/
+ 	}
+ 	return *stm->rp++;
+ }
+diff --git a/source/fitz/font-win32.c b/source/fitz/font-win32.c
+new file mode 100644
+index 000000000..45de8cfd3
+--- /dev/null
++++ b/source/fitz/font-win32.c
+@@ -0,0 +1,866 @@
++/*
++** Routines to access MS Windows system fonts.
++** From sumatra PDF distro.
++** Modified for MuPDF v1.9a by willus.com
++*/
++#include "mupdf/pdf.h"
++
++/*
++	Which fonts are embedded is based on a few preprocessor definitions.
++
++	The base 14 fonts are always embedded.
++	For CJK font substitution we embed DroidSansFallback.
++
++	Set NOCJK to skip all CJK support (this also omits embedding the CJK CMaps)
++	Set NOCJKFONT to skip the embedded CJK font.
++	Set NOCJKFULL to embed a smaller CJK font without CJK Extension A support.
++*/
++
++#ifdef NOCJK
++#define NOCJKFONT
++#endif
++
++/* SumatraPDF: also load fonts included with Windows */
++#ifdef _WIN32
++
++#ifndef UNICODE
++#define UNICODE
++#endif
++#ifndef _UNICODE
++#define _UNICODE
++#endif
++
++#include <windows.h>
++
++// TODO: Use more of FreeType for TTF parsing (for performance reasons,
++//       the fonts can't be parsed completely, though)
++#include <ft2build.h>
++#include FT_TRUETYPE_IDS_H
++#include FT_TRUETYPE_TAGS_H
++
++#define TTC_VERSION1	0x00010000
++#define TTC_VERSION2	0x00020000
++
++#define MAX_FACENAME	128
++
++// Note: the font face must be the first field so that the structure
++//       can be treated like a simple string for searching
++typedef struct pdf_fontmapMS_s
++{
++	char fontface[MAX_FACENAME];
++	char fontpath[MAX_PATH];
++	int index;
++} pdf_fontmapMS;
++
++typedef struct pdf_fontlistMS_s
++{
++	pdf_fontmapMS *fontmap;
++	int len;
++	int cap;
++} pdf_fontlistMS;
++
++typedef struct _tagTT_OFFSET_TABLE
++{
++	ULONG	uVersion;
++	USHORT	uNumOfTables;
++	USHORT	uSearchRange;
++	USHORT	uEntrySelector;
++	USHORT	uRangeShift;
++} TT_OFFSET_TABLE;
++
++typedef struct _tagTT_TABLE_DIRECTORY
++{
++	ULONG	uTag;				//table name
++	ULONG	uCheckSum;			//Check sum
++	ULONG	uOffset;			//Offset from beginning of file
++	ULONG	uLength;			//length of the table in bytes
++} TT_TABLE_DIRECTORY;
++
++typedef struct _tagTT_NAME_TABLE_HEADER
++{
++	USHORT	uFSelector;			//format selector. Always 0
++	USHORT	uNRCount;			//Name Records count
++	USHORT	uStorageOffset;		//Offset for strings storage, from start of the table
++} TT_NAME_TABLE_HEADER;
++
++typedef struct _tagTT_NAME_RECORD
++{
++	USHORT	uPlatformID;
++	USHORT	uEncodingID;
++	USHORT	uLanguageID;
++	USHORT	uNameID;
++	USHORT	uStringLength;
++	USHORT	uStringOffset;	//from start of storage area
++} TT_NAME_RECORD;
++
++typedef struct _tagFONT_COLLECTION
++{
++	ULONG	Tag;
++	ULONG	Version;
++	ULONG	NumFonts;
++} FONT_COLLECTION;
++
++static struct {
++	char *name;
++	char *pattern;
++} baseSubstitutes[] = {
++	{ "Courier", "CourierNewPSMT" },
++	{ "Courier-Bold", "CourierNewPS-BoldMT" },
++	{ "Courier-Oblique", "CourierNewPS-ItalicMT" },
++	{ "Courier-BoldOblique", "CourierNewPS-BoldItalicMT" },
++	{ "Helvetica", "ArialMT" },
++	{ "Helvetica-Bold", "Arial-BoldMT" },
++	{ "Helvetica-Oblique", "Arial-ItalicMT" },
++	{ "Helvetica-BoldOblique", "Arial-BoldItalicMT" },
++	{ "Times-Roman", "TimesNewRomanPSMT" },
++	{ "Times-Bold", "TimesNewRomanPS-BoldMT" },
++	{ "Times-Italic", "TimesNewRomanPS-ItalicMT" },
++	{ "Times-BoldItalic", "TimesNewRomanPS-BoldItalicMT" },
++	{ "Symbol", "SymbolMT" },
++};
++static const char *base_font_names[][10] =
++{
++	{ "Courier", "CourierNew", "CourierNewPSMT", NULL },
++	{ "Courier-Bold", "CourierNew,Bold", "Courier,Bold",
++		"CourierNewPS-BoldMT", "CourierNew-Bold", NULL },
++	{ "Courier-Oblique", "CourierNew,Italic", "Courier,Italic",
++		"CourierNewPS-ItalicMT", "CourierNew-Italic", NULL },
++	{ "Courier-BoldOblique", "CourierNew,BoldItalic", "Courier,BoldItalic",
++		"CourierNewPS-BoldItalicMT", "CourierNew-BoldItalic", NULL },
++	{ "Helvetica", "ArialMT", "Arial", NULL },
++	{ "Helvetica-Bold", "Arial-BoldMT", "Arial,Bold", "Arial-Bold",
++		"Helvetica,Bold", NULL },
++	{ "Helvetica-Oblique", "Arial-ItalicMT", "Arial,Italic", "Arial-Italic",
++		"Helvetica,Italic", "Helvetica-Italic", NULL },
++	{ "Helvetica-BoldOblique", "Arial-BoldItalicMT",
++		"Arial,BoldItalic", "Arial-BoldItalic",
++		"Helvetica,BoldItalic", "Helvetica-BoldItalic", NULL },
++	{ "Times-Roman", "TimesNewRomanPSMT", "TimesNewRoman",
++		"TimesNewRomanPS", NULL },
++	{ "Times-Bold", "TimesNewRomanPS-BoldMT", "TimesNewRoman,Bold",
++		"TimesNewRomanPS-Bold", "TimesNewRoman-Bold", NULL },
++	{ "Times-Italic", "TimesNewRomanPS-ItalicMT", "TimesNewRoman,Italic",
++		"TimesNewRomanPS-Italic", "TimesNewRoman-Italic", NULL },
++	{ "Times-BoldItalic", "TimesNewRomanPS-BoldItalicMT",
++		"TimesNewRoman,BoldItalic", "TimesNewRomanPS-BoldItalic",
++		"TimesNewRoman-BoldItalic", NULL },
++	{ "Symbol", "Symbol,Italic", "Symbol,Bold", "Symbol,BoldItalic",
++		"SymbolMT", "SymbolMT,Italic", "SymbolMT,Bold", "SymbolMT,BoldItalic", NULL },
++	{ "ZapfDingbats", NULL }
++};
++
++static pdf_fontlistMS fontlistMS =
++{
++	NULL,
++	0,
++	0,
++};
++static int strcmp_ignore_space(const char *a, const char *b);
++static const char *clean_font_name(const char *fontname);
++static const char *pdf_clean_base14_name(const char *fontname);
++
++static inline USHORT BEtoHs(USHORT x)
++{
++	BYTE *data = (BYTE *)&x;
++	return (data[0] << 8) | data[1];
++}
++
++static inline ULONG BEtoHl(ULONG x)
++{
++	BYTE *data = (BYTE *)&x;
++	return (data[0] << 24) | (data[1] << 16) | (data[2] << 8) | data[3];
++}
++
++static int strcmp_ignore_space(const char *a, const char *b)
++{
++	while (1)
++	{
++		while (*a == ' ')
++			a++;
++		while (*b == ' ')
++			b++;
++		if (*a != *b)
++			return 1;
++		if (*a == 0)
++			return *a != *b;
++		if (*b == 0)
++			return *a != *b;
++		a++;
++		b++;
++	}
++}
++
++/* A little bit more sophisticated name matching so that e.g. "EurostileExtended"
++   matches "EurostileExtended-Roman" or "Tahoma-Bold,Bold" matches "Tahoma-Bold" */
++static int
++lookup_compare(const void *elem1, const void *elem2)
++{
++	const char *val1 = elem1;
++	const char *val2 = elem2;
++	int len1 = strlen(val1);
++	int len2 = strlen(val2);
++
++	if (len1 != len2)
++	{
++		const char *rest = len1 > len2 ? val1 + len2 : val2 + len1;
++		if (',' == *rest || !_stricmp(rest, "-roman"))
++			return _strnicmp(val1, val2, fz_mini(len1, len2));
++	}
++
++	return _stricmp(val1, val2);
++}
++
++static void
++remove_spaces(char *srcDest)
++{
++	char *dest;
++
++	for (dest = srcDest; *srcDest; srcDest++)
++		if (*srcDest != ' ')
++			*dest++ = *srcDest;
++	*dest = '\0';
++}
++
++static int
++str_ends_with(const char *str, const char *end)
++{
++	size_t len1 = strlen(str);
++	size_t len2 = strlen(end);
++
++	return len1 >= len2 && !strcmp(str + len1 - len2, end);
++}
++
++static pdf_fontmapMS *
++pdf_find_windows_font_path(const char *fontname)
++{
++	return bsearch(fontname, fontlistMS.fontmap, fontlistMS.len, sizeof(pdf_fontmapMS), lookup_compare);
++}
++
++/* source and dest can be same */
++static void
++decode_unicode_BE(fz_context *ctx, char *source, int sourcelen, char *dest, int destlen)
++{
++	WCHAR *tmp;
++	int converted, i;
++
++	if (sourcelen % 2 != 0)
++		fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : invalid unicode string");
++
++	tmp = fz_malloc_array(ctx, sourcelen / 2 + 1, sizeof(WCHAR));
++	for (i = 0; i < sourcelen / 2; i++)
++		tmp[i] = BEtoHs(((WCHAR *)source)[i]);
++	tmp[sourcelen / 2] = '\0';
++
++	converted = WideCharToMultiByte(CP_UTF8, 0, tmp, -1, dest, destlen, NULL, NULL);
++	fz_free(ctx, tmp);
++	if (!converted)
++		fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : invalid unicode string");
++}
++
++static void
++decode_platform_string(fz_context *ctx, int platform, int enctype, char *source, int sourcelen, char *dest, int destlen)
++{
++	switch (platform)
++	{
++	case TT_PLATFORM_APPLE_UNICODE:
++		switch (enctype)
++		{
++		case TT_APPLE_ID_DEFAULT:
++		case TT_APPLE_ID_UNICODE_2_0:
++			decode_unicode_BE(ctx, source, sourcelen, dest, destlen);
++			return;
++		}
++		fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : unsupported encoding (%d/%d)", platform, enctype);
++	case TT_PLATFORM_MACINTOSH:
++		switch (enctype)
++		{
++		case TT_MAC_ID_ROMAN:
++			if (sourcelen + 1 > destlen)
++				fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : overlong fontname: %s", source);
++			// TODO: Convert to UTF-8 from what encoding?
++			memcpy(dest, source, sourcelen);
++			dest[sourcelen] = 0;
++			return;
++		}
++		fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : unsupported encoding (%d/%d)", platform, enctype);
++	case TT_PLATFORM_MICROSOFT:
++		switch (enctype)
++		{
++		case TT_MS_ID_SYMBOL_CS:
++		case TT_MS_ID_UNICODE_CS:
++		case TT_MS_ID_UCS_4:
++			decode_unicode_BE(ctx, source, sourcelen, dest, destlen);
++			return;
++		}
++		fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : unsupported encoding (%d/%d)", platform, enctype);
++	default:
++		fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : unsupported encoding (%d/%d)", platform, enctype);
++	}
++}
++
++static void
++grow_system_font_list(fz_context *ctx, pdf_fontlistMS *fl)
++{
++	int newcap;
++	pdf_fontmapMS *newitems;
++
++	if (fl->cap == 0)
++		newcap = 1024;
++	else
++		newcap = fl->cap * 2;
++
++	// use realloc/free for the fontmap, since the list can
++	// remain in memory even with all fz_contexts destroyed
++	newitems = realloc(fl->fontmap, newcap * sizeof(pdf_fontmapMS));
++	if (!newitems)
++		fz_throw(ctx, FZ_ERROR_GENERIC, "OOM in grow_system_font_list");
++	memset(newitems + fl->cap, 0, sizeof(pdf_fontmapMS) * (newcap - fl->cap));
++
++	fl->fontmap = newitems;
++	fl->cap = newcap;
++}
++
++static void
++append_mapping(fz_context *ctx, pdf_fontlistMS *fl, const char *facename, const char *path, int index)
++{
++	if (fl->len == fl->cap)
++		grow_system_font_list(ctx, fl);
++
++	if (fl->len >= fl->cap)
++		fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : fontlist overflow");
++
++	fz_strlcpy(fl->fontmap[fl->len].fontface, facename, sizeof(fl->fontmap[0].fontface));
++	fz_strlcpy(fl->fontmap[fl->len].fontpath, path, sizeof(fl->fontmap[0].fontpath));
++	fl->fontmap[fl->len].index = index;
++
++	++fl->len;
++}
++
++static void
++safe_read(fz_context *ctx, fz_stream *file, int offset, char *buf, int size)
++{
++	int n;
++	fz_seek(ctx, file, offset, 0);
++	n = fz_read(ctx, file, (unsigned char *)buf, size);
++	if (n != size)
++		fz_throw(ctx, FZ_ERROR_GENERIC, "safe_read: read %d, expected %d", n, size);
++}
++
++static void
++read_ttf_string(fz_context *ctx, fz_stream *file, int offset, TT_NAME_RECORD *ttRecordBE, char *buf, int size)
++{
++	char szTemp[MAX_FACENAME * 2];
++	// ignore empty and overlong strings
++	int stringLength = BEtoHs(ttRecordBE->uStringLength);
++	if (stringLength == 0 || stringLength >= sizeof(szTemp))
++		return;
++
++	safe_read(ctx, file, offset + BEtoHs(ttRecordBE->uStringOffset), szTemp, stringLength);
++	decode_platform_string(ctx, BEtoHs(ttRecordBE->uPlatformID),
++		BEtoHs(ttRecordBE->uEncodingID), szTemp, stringLength, buf, size);
++}
++
++static void
++makeFakePSName(char szName[MAX_FACENAME], const char *szStyle)
++{
++	// append the font's subfamily, unless it's a Regular font
++	if (*szStyle && _stricmp(szStyle, "Regular") != 0)
++	{
++		fz_strlcat(szName, "-", MAX_FACENAME);
++		fz_strlcat(szName, szStyle, MAX_FACENAME);
++	}
++	remove_spaces(szName);
++}
++
++static void
++parseTTF(fz_context *ctx, fz_stream *file, int offset, int index, const char *path)
++{
++	TT_OFFSET_TABLE ttOffsetTableBE;
++	TT_TABLE_DIRECTORY tblDirBE;
++	TT_NAME_TABLE_HEADER ttNTHeaderBE;
++	TT_NAME_RECORD ttRecordBE;
++
++	char szPSName[MAX_FACENAME] = { 0 };
++	char szTTName[MAX_FACENAME] = { 0 };
++	char szStyle[MAX_FACENAME] = { 0 };
++	char szCJKName[MAX_FACENAME] = { 0 };
++	int i, count, tblOffset;
++
++	safe_read(ctx, file, offset, (char *)&ttOffsetTableBE, sizeof(TT_OFFSET_TABLE));
++
++	// check if this is a TrueType font of version 1.0 or an OpenType font
++	if (BEtoHl(ttOffsetTableBE.uVersion) != TTC_VERSION1 &&
++		BEtoHl(ttOffsetTableBE.uVersion) != TTAG_OTTO)
++	{
++		fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : invalid font version %x", (unsigned int)BEtoHl(ttOffsetTableBE.uVersion));
++	}
++
++	// determine the name table's offset by iterating through the offset table
++	count = BEtoHs(ttOffsetTableBE.uNumOfTables);
++	for (i = 0; i < count; i++)
++	{
++		int entryOffset = offset + sizeof(TT_OFFSET_TABLE) + i * sizeof(TT_TABLE_DIRECTORY);
++		safe_read(ctx, file, entryOffset, (char *)&tblDirBE, sizeof(TT_TABLE_DIRECTORY));
++		if (!BEtoHl(tblDirBE.uTag) || BEtoHl(tblDirBE.uTag) == TTAG_name)
++			break;
++	}
++	if (count == i || !BEtoHl(tblDirBE.uTag))
++		fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : nameless font");
++	tblOffset = BEtoHl(tblDirBE.uOffset);
++
++	// read the 'name' table for record count and offsets
++	safe_read(ctx, file, tblOffset, (char *)&ttNTHeaderBE, sizeof(TT_NAME_TABLE_HEADER));
++	offset = tblOffset + sizeof(TT_NAME_TABLE_HEADER);
++	tblOffset += BEtoHs(ttNTHeaderBE.uStorageOffset);
++
++	// read through the strings for PostScript name and font family
++	count = BEtoHs(ttNTHeaderBE.uNRCount);
++	for (i = 0; i < count; i++)
++	{
++		short langId, nameId;
++		BOOL isCJKName;
++
++		safe_read(ctx, file, offset + i * sizeof(TT_NAME_RECORD), (char *)&ttRecordBE, sizeof(TT_NAME_RECORD));
++
++		langId = BEtoHs(ttRecordBE.uLanguageID);
++		nameId = BEtoHs(ttRecordBE.uNameID);
++		isCJKName = TT_NAME_ID_FONT_FAMILY == nameId && LANG_CHINESE == PRIMARYLANGID(langId);
++
++		// ignore non-English strings (except for Chinese font names)
++		if (langId && langId != TT_MS_LANGID_ENGLISH_UNITED_STATES && !isCJKName)
++			continue;
++		// ignore names other than font (sub)family and PostScript name
++		fz_try(ctx)
++		{
++			if (isCJKName)
++				read_ttf_string(ctx, file, tblOffset, &ttRecordBE, szCJKName, sizeof(szCJKName));
++			else if (TT_NAME_ID_FONT_FAMILY == nameId)
++				read_ttf_string(ctx, file, tblOffset, &ttRecordBE, szTTName, sizeof(szTTName));
++			else if (TT_NAME_ID_FONT_SUBFAMILY == nameId)
++				read_ttf_string(ctx, file, tblOffset, &ttRecordBE, szStyle, sizeof(szStyle));
++			else if (TT_NAME_ID_PS_NAME == nameId)
++				read_ttf_string(ctx, file, tblOffset, &ttRecordBE, szPSName, sizeof(szPSName));
++		}
++		fz_catch(ctx)
++		{
++			fz_warn(ctx, "ignoring face name decoding fonterror");
++		}
++	}
++
++	// try to prevent non-Arial fonts from accidentally substituting Arial
++	if (!strcmp(szPSName, "ArialMT"))
++	{
++		// cf. https://code.google.com/p/sumatrapdf/issues/detail?id=2471
++		if (strcmp(szTTName, "Arial") != 0)
++			szPSName[0] = '\0';
++		// TODO: is there a better way to distinguish Arial Caps from Arial proper?
++		// cf. http://code.google.com/p/sumatrapdf/issues/detail?id=1290
++		else if (strstr(path, "caps") || strstr(path, "Caps"))
++			fz_throw(ctx, FZ_ERROR_GENERIC, "ignore %s, as it can't be distinguished from Arial,Regular", path);
++	}
++
++	if (szPSName[0])
++		append_mapping(ctx, &fontlistMS, szPSName, path, index);
++	if (szTTName[0])
++	{
++		// derive a PostScript-like name and add it, if it's different from the font's
++		// included PostScript name; cf. http://code.google.com/p/sumatrapdf/issues/detail?id=376
++		makeFakePSName(szTTName, szStyle);
++		// compare the two names before adding this one
++		if (lookup_compare(szTTName, szPSName))
++			append_mapping(ctx, &fontlistMS, szTTName, path, index);
++	}
++	if (szCJKName[0])
++	{
++		makeFakePSName(szCJKName, szStyle);
++		if (lookup_compare(szCJKName, szPSName) && lookup_compare(szCJKName, szTTName))
++			append_mapping(ctx, &fontlistMS, szCJKName, path, index);
++	}
++}
++
++static void
++parseTTFs(fz_context *ctx, const char *path)
++{
++	fz_stream *file = fz_open_file(ctx, path);
++	/* "fonterror : %s not found", path */
++	fz_try(ctx)
++	{
++		parseTTF(ctx, file, 0, 0, path);
++	}
++	fz_always(ctx)
++	{
++		fz_drop_stream(ctx,file);
++	}
++	fz_catch(ctx)
++	{
++		fz_rethrow(ctx);
++	}
++}
++
++static void
++parseTTCs(fz_context *ctx, const char *path)
++{
++	FONT_COLLECTION fontcollectionBE;
++	ULONG i, numFonts, *offsettableBE = NULL;
++
++	fz_stream *file = fz_open_file(ctx, path);
++	/* "fonterror : %s not found", path */
++
++	fz_var(offsettableBE);
++
++	fz_try(ctx)
++	{
++		safe_read(ctx, file, 0, (char *)&fontcollectionBE, sizeof(FONT_COLLECTION));
++		if (BEtoHl(fontcollectionBE.Tag) != TTAG_ttcf)
++			fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : wrong format %x", (unsigned int)BEtoHl(fontcollectionBE.Tag));
++		if (BEtoHl(fontcollectionBE.Version) != TTC_VERSION1 &&
++			BEtoHl(fontcollectionBE.Version) != TTC_VERSION2)
++		{
++			fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : invalid version %x", (unsigned int)BEtoHl(fontcollectionBE.Version));
++		}
++
++		numFonts = BEtoHl(fontcollectionBE.NumFonts);
++		offsettableBE = fz_malloc_array(ctx, numFonts, sizeof(ULONG));
++
++		safe_read(ctx, file, sizeof(FONT_COLLECTION), (char *)offsettableBE, numFonts * sizeof(ULONG));
++		for (i = 0; i < numFonts; i++)
++			parseTTF(ctx, file, BEtoHl(offsettableBE[i]), i, path);
++	}
++	fz_always(ctx)
++	{
++		fz_free(ctx, offsettableBE);
++		fz_drop_stream(ctx,file);
++	}
++	fz_catch(ctx)
++	{
++		fz_rethrow(ctx);
++	}
++}
++
++static void
++extend_system_font_list(fz_context *ctx, const WCHAR *path)
++{
++	WCHAR szPath[MAX_PATH], *lpFileName;
++	WIN32_FIND_DATA FileData;
++	HANDLE hList;
++
++	GetFullPathName(path, nelem(szPath), szPath, &lpFileName);
++
++	hList = FindFirstFile(szPath, &FileData);
++	if (hList == INVALID_HANDLE_VALUE)
++	{
++		// Don't complain about missing directories
++		if (GetLastError() == ERROR_FILE_NOT_FOUND)
++			return;
++		fz_throw(ctx, FZ_ERROR_GENERIC, "extend_system_font_list: unknown error %d", (int)GetLastError());
++	}
++	do
++	{
++		if (!(FileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY))
++		{
++			char szPathUtf8[MAX_PATH], *fileExt;
++			int res;
++			lstrcpyn(lpFileName, FileData.cFileName, szPath + MAX_PATH - lpFileName);
++			res = WideCharToMultiByte(CP_UTF8, 0, szPath, -1, szPathUtf8, sizeof(szPathUtf8), NULL, NULL);
++			if (!res)
++			{
++				fz_warn(ctx, "WideCharToMultiByte failed for %S", szPath);
++				continue;
++			}
++			fileExt = szPathUtf8 + strlen(szPathUtf8) - 4;
++			fz_try(ctx)
++			{
++				if (!_stricmp(fileExt, ".ttc"))
++					parseTTCs(ctx, szPathUtf8);
++				else if (!_stricmp(fileExt, ".ttf") || !_stricmp(fileExt, ".otf"))
++					parseTTFs(ctx, szPathUtf8);
++			}
++			fz_catch(ctx)
++			{
++				// ignore errors occurring while parsing a given font file
++			}
++		}
++	} while (FindNextFile(hList, &FileData));
++	FindClose(hList);
++}
++
++static void
++destroy_system_font_list(void)
++{
++	free(fontlistMS.fontmap);
++	memset(&fontlistMS, 0, sizeof(fontlistMS));
++}
++
++static void
++create_system_font_list(fz_context *ctx)
++{
++	WCHAR szFontDir[MAX_PATH];
++	UINT cch;
++
++	cch = GetWindowsDirectory(szFontDir, nelem(szFontDir) - 12);
++	if (0 < cch && cch < nelem(szFontDir) - 12)
++	{
++        /* willus.com edit--Win XP default MSVCRT.DLL doesn't have wcscat_s */
++#ifdef _WIN64
++		wcscat_s(szFontDir, MAX_PATH, L"\\Fonts\\*.?t?");
++#else
++		wcscat(szFontDir,L"\\Fonts\\*.?t?");
++#endif
++		extend_system_font_list(ctx, szFontDir);
++	}
++
++	if (fontlistMS.len == 0)
++		fz_warn(ctx, "couldn't find any usable system fonts");
++
++#ifdef NOCJKFONT
++	{
++		// If no CJK fallback font is builtin but one has been shipped separately (in the same
++		// directory as the main executable), add it to the list of loadable system fonts
++		WCHAR szFile[MAX_PATH], *lpFileName;
++		GetModuleFileName(0, szFontDir, MAX_PATH);
++		GetFullPathName(szFontDir, MAX_PATH, szFile, &lpFileName);
++		lstrcpyn(lpFileName, L"DroidSansFallback.ttf", szFile + MAX_PATH - lpFileName);
++		extend_system_font_list(ctx, szFile);
++	}
++#endif
++
++	// sort the font list, so that it can be searched binarily
++	qsort(fontlistMS.fontmap, fontlistMS.len, sizeof(pdf_fontmapMS), _stricmp);
++
++#ifdef DEBUG
++	// allow to overwrite system fonts for debugging purposes
++	// (either pass a full path or a search pattern such as "fonts\*.ttf")
++	cch = GetEnvironmentVariable(L"MUPDF_FONTS_PATTERN", szFontDir, nelem(szFontDir));
++	if (0 < cch && cch < nelem(szFontDir))
++	{
++		int i, prev_len = fontlistMS.len;
++		extend_system_font_list(ctx, szFontDir);
++		for (i = prev_len; i < fontlistMS.len; i++)
++		{
++			pdf_fontmapMS *entry = bsearch(fontlistMS.fontmap[i].fontface, fontlistMS.fontmap, prev_len, sizeof(pdf_fontmapMS), lookup_compare);
++			if (entry)
++				*entry = fontlistMS.fontmap[i];
++		}
++		qsort(fontlistMS.fontmap, fontlistMS.len, sizeof(pdf_fontmapMS), _stricmp);
++	}
++#endif
++
++	// make sure to clean up after ourselves
++	atexit(destroy_system_font_list);
++}
++
++static fz_font *
++pdf_load_windows_font_by_name(fz_context *ctx, const char *orig_name)
++{
++	pdf_fontmapMS *found = NULL;
++	char *comma, *fontname;
++	fz_font *font;
++
++    /* WILLUS MOD--not multi-threaded for k2pdfopt */
++	/* fz_synchronize_begin(); */
++	if (fontlistMS.len == 0)
++	{
++		fz_try(ctx)
++		{
++			create_system_font_list(ctx);
++		}
++		fz_catch(ctx) { }
++	}
++    /* WILLUS MOD--not multi-threaded for k2pdfopt */
++	/* fz_synchronize_end(); */
++	if (fontlistMS.len == 0)
++		fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror: couldn't find any fonts");
++
++	// work on a normalized copy of the font name
++	fontname = fz_strdup(ctx, orig_name);
++	remove_spaces(fontname);
++
++	// first, try to find the exact font name (including appended style information)
++	comma = strchr(fontname, ',');
++	if (comma)
++	{
++		*comma = '-';
++		found = pdf_find_windows_font_path(fontname);
++		*comma = ',';
++	}
++	// second, substitute the font name with a known PostScript name
++	else
++	{
++		int i;
++		for (i = 0; i < nelem(baseSubstitutes) && !found; i++)
++			if (!strcmp(fontname, baseSubstitutes[i].name))
++				found = pdf_find_windows_font_path(baseSubstitutes[i].pattern);
++	}
++	// third, search for the font name without additional style information
++	if (!found)
++		found = pdf_find_windows_font_path(fontname);
++	// fourth, try to separate style from basename for prestyled fonts (e.g. "ArialBold")
++	if (!found && !comma && (str_ends_with(fontname, "Bold") || str_ends_with(fontname, "Italic")))
++	{
++		int styleLen = str_ends_with(fontname, "Bold") ? 4 : str_ends_with(fontname, "BoldItalic") ? 10 : 6;
++		fontname = fz_resize_array(ctx, fontname, strlen(fontname) + 2, sizeof(char));
++		comma = fontname + strlen(fontname) - styleLen;
++		memmove(comma + 1, comma, styleLen + 1);
++		*comma = '-';
++		found = pdf_find_windows_font_path(fontname);
++		*comma = ',';
++		if (!found)
++			found = pdf_find_windows_font_path(fontname);
++	}
++	// fifth, try to convert the font name from the common Chinese codepage 936
++	if (!found && fontname[0] < 0)
++	{
++		WCHAR cjkNameW[MAX_FACENAME];
++		char cjkName[MAX_FACENAME];
++		if (MultiByteToWideChar(936, MB_ERR_INVALID_CHARS, fontname, -1, cjkNameW, nelem(cjkNameW)) &&
++			WideCharToMultiByte(CP_UTF8, 0, cjkNameW, -1, cjkName, nelem(cjkName), NULL, NULL))
++		{
++			comma = strchr(cjkName, ',');
++			if (comma)
++			{
++				*comma = '-';
++				found = pdf_find_windows_font_path(cjkName);
++				*comma = ',';
++			}
++			if (!found)
++				found = pdf_find_windows_font_path(cjkName);
++		}
++	}
++
++	fz_free(ctx, fontname);
++	if (!found)
++		fz_throw(ctx, FZ_ERROR_GENERIC, "couldn't find system font '%s'", orig_name);
++
++    /*
++	fz_warn(ctx, "loading non-embedded font '%s' from '%s'", orig_name, found->fontpath);
++    */
++
++	font = fz_new_font_from_file(ctx, orig_name, found->fontpath, found->index,
++		strcmp(found->fontface, "DroidSansFallback") != 0);
++    /* willus mod for MuPDF v1.10, 10-21-2016 */
++    {
++    fz_font_flags_t *flags;
++    flags=fz_font_flags(font);
++    if (flags!=NULL)
++    	flags->ft_substitute = 1;
++    }
++	return font;
++}
++
++static fz_font *
++pdf_load_windows_font(fz_context *ctx, const char *fontname, int bold, int italic, int needs_exact_metrics)
++{
++	if (needs_exact_metrics)
++	{
++		const char *clean_name;
++        /* WILLUS: Declare pdf_clean_base14_name() */
++        extern const char *pdf_clean_base14_name(const char *fontname);
++
++		/* TODO: the metrics for Times-Roman and Courier don't match
++		   those of Windows' Times New Roman and Courier New; for
++		   some reason, Poppler doesn't seem to have this problem */
++		int len;
++		if (fz_lookup_builtin_font(ctx,fontname, bold, italic, &len))
++			return NULL;
++
++		/* cf. http://code.google.com/p/sumatrapdf/issues/detail?id=2173 */
++		clean_name = pdf_clean_base14_name(fontname);
++		if (clean_name != fontname && !strncmp(clean_name, "Times-", 6))
++			return NULL;
++	}
++
++	// TODO: unset font->ft_substitute for base14/needs_exact_metrics?
++	return pdf_load_windows_font_by_name(ctx, fontname);
++}
++
++static const char *clean_font_name(const char *fontname)
++{
++	int i, k;
++	for (i = 0; i < nelem(base_font_names); i++)
++		for (k = 0; base_font_names[i][k]; k++)
++			if (!strcmp_ignore_space(base_font_names[i][k], fontname))
++				return base_font_names[i][0];
++	return fontname;
++}
++
++
++/* SumatraPDF: expose clean_font_name */
++static const char * pdf_clean_base14_name(const char *fontname)
++{
++	return clean_font_name(fontname);
++}
++
++static fz_font *
++pdf_load_windows_cjk_font(fz_context *ctx, const char *fontname, int ros, int serif)
++{
++	fz_font *font;
++
++    font=NULL; /* WILLUS: Avoid compiler warning */
++	/* try to find a matching system font before falling back to an approximate one */
++	fz_try(ctx)
++	{
++		font = pdf_load_windows_font_by_name(ctx, fontname);
++	}
++	fz_catch(ctx)
++	{
++		font = NULL;
++	}
++	if (font)
++		return font;
++
++	/* try to fall back to a reasonable system font */
++	fz_try(ctx)
++	{
++		if (serif)
++		{
++			switch (ros)
++			{
++			case FZ_ADOBE_CNS: font = pdf_load_windows_font_by_name(ctx, "MingLiU"); break;
++			case FZ_ADOBE_GB: font = pdf_load_windows_font_by_name(ctx, "SimSun"); break;
++			case FZ_ADOBE_JAPAN: font = pdf_load_windows_font_by_name(ctx, "MS-Mincho"); break;
++			case FZ_ADOBE_KOREA: font = pdf_load_windows_font_by_name(ctx, "Batang"); break;
++			default: fz_throw(ctx, FZ_ERROR_GENERIC, "invalid serif ros");
++			}
++		}
++		else
++		{
++			switch (ros)
++			{
++			case FZ_ADOBE_CNS: font = pdf_load_windows_font_by_name(ctx, "DFKaiShu-SB-Estd-BF"); break;
++			case FZ_ADOBE_GB:
++				fz_try(ctx)
++				{
++					font = pdf_load_windows_font_by_name(ctx, "KaiTi");
++				}
++				fz_catch(ctx)
++				{
++					font = pdf_load_windows_font_by_name(ctx, "KaiTi_GB2312");
++				}
++				break;
++			case FZ_ADOBE_JAPAN: font = pdf_load_windows_font_by_name(ctx, "MS-Gothic"); break;
++			case FZ_ADOBE_KOREA: font = pdf_load_windows_font_by_name(ctx, "Gulim"); break;
++			default: fz_throw(ctx, FZ_ERROR_GENERIC, "invalid sans-serif ros");
++			}
++		}
++	}
++	fz_catch(ctx)
++	{
++#ifdef NOCJKFONT
++		/* If no CJK fallback font is builtin, maybe one has been shipped separately */
++		font = pdf_load_windows_font_by_name(ctx, "DroidSansFallback");
++#else
++		fz_rethrow(ctx);
++#endif
++	}
++
++	return font;
++}
++
++#endif
++
++void pdf_install_load_system_font_funcs(fz_context *ctx)
++{
++#ifdef _WIN32
++	fz_install_load_system_font_funcs(ctx, pdf_load_windows_font, pdf_load_windows_cjk_font, NULL);
++#endif
++}
+diff --git a/source/fitz/font.c b/source/fitz/font.c
+index 733d91dae..69c46d968 100644
+--- a/source/fitz/font.c
++++ b/source/fitz/font.c
+@@ -5,8 +5,11 @@
+ #include "draw-imp.h"
+ 
+ #include <ft2build.h>
++/* willus mod -- remove hb includes */
++/*
+ #include "hb.h"
+ #include "hb-ft.h"
++*/
+ 
+ #include <assert.h>
+ 
+diff --git a/source/fitz/stext-device.c b/source/fitz/stext-device.c
+index 0ba944d44..3c05c51ac 100644
+--- a/source/fitz/stext-device.c
++++ b/source/fitz/stext-device.c
+@@ -692,6 +692,11 @@ fz_new_stext_device(fz_context *ctx, fz_stext_page *page, const fz_stext_options
+ 	dev->trm = fz_identity;
+ 	dev->lastchar = ' ';
+ 	dev->curdir = 1;
++    /* willus mod -- seems like this should be here, but not sure. */
++    if (opts)
++        dev->flags = opts->flags;
++    else
++        dev->flags = 0;
+ 
+ 	return (fz_device*)dev;
+ }
+diff --git a/source/fitz/string.c b/source/fitz/string.c
+index e70ae6e6e..b310463f4 100644
+--- a/source/fitz/string.c
++++ b/source/fitz/string.c
+@@ -448,6 +448,10 @@ fz_utflen(const char *s)
+ 
+ float fz_atof(const char *s)
+ {
++/* willus mod: atof(s), #if-#else-#endif */
++#if (!defined(__SSE__))
++    return(atof(s));
++#else
+ 	float result;
+ 
+ 	errno = 0;
+@@ -457,6 +461,7 @@ float fz_atof(const char *s)
+ 		return 1;
+ 	result = fz_clamp(result, -FLT_MAX, FLT_MAX);
+ 	return result;
++#endif
+ }
+ 
+ int fz_atoi(const char *s)
+diff --git a/source/pdf/pdf-annot.c b/source/pdf/pdf-annot.c
+index 68de8898a..5d43485bd 100644
+--- a/source/pdf/pdf-annot.c
++++ b/source/pdf/pdf-annot.c
+@@ -4,8 +4,20 @@
+ #include <string.h>
+ #include <time.h>
+ 
++/* willus mod--don't use _mkgmtime--not available in Win XP */
+ #ifdef _WIN32
+-#define timegm _mkgmtime
++static time_t timegm(struct tm *date);
++static time_t timegm(struct tm *date)
++
++    {
++    time_t t,z;
++    struct tm gmz;
++
++    z=(time_t)0;
++    gmz=(*gmtime(&z));
++    t=mktime(date)-mktime(&gmz);
++    return(t);
++    }
+ #endif
+ 
+ #define TEXT_ANNOT_SIZE (25.0f)
+diff --git a/source/pdf/pdf-link.c b/source/pdf/pdf-link.c
+index ae5beaa35..b5a52a000 100644
+--- a/source/pdf/pdf-link.c
++++ b/source/pdf/pdf-link.c
+@@ -351,6 +351,9 @@ pdf_resolve_link(fz_context *ctx, pdf_document *doc, const char *uri, float *xp,
+ 		}
+ 		return page;
+ 	}
++/* willus mod -- be quiet */
++/*
+ 	fz_warn(ctx, "unknown link uri '%s'", uri);
++*/
+ 	return -1;
+ }
+diff --git a/source/pdf/pdf-parse.c b/source/pdf/pdf-parse.c
+index 501c5626a..927ba6cd5 100644
+--- a/source/pdf/pdf-parse.c
++++ b/source/pdf/pdf-parse.c
+@@ -586,9 +586,14 @@ pdf_parse_ind_obj(fz_context *ctx, pdf_document *doc,
+ 			if (c == '\r')
+ 			{
+ 				c = fz_peek_byte(ctx, file);
++/* willus mod -- no warning */
++/*
+ 				if (c != '\n')
+ 					fz_warn(ctx, "line feed missing after stream begin marker (%d %d R)", num, gen);
+ 				else
++*/
++if (c=='\n')
++/* willus mod -- end */
+ 					fz_read_byte(ctx, file);
+ 			}
+ 			stm_ofs = fz_tell(ctx, file);
+diff --git a/source/pdf/pdf-xref.c b/source/pdf/pdf-xref.c
+index 2475b6e86..bc163563a 100644
+--- a/source/pdf/pdf-xref.c
++++ b/source/pdf/pdf-xref.c
+@@ -707,8 +707,11 @@ pdf_xref_size_from_old_trailer(fz_context *ctx, pdf_document *doc, pdf_lexbuf *b
+ 		if (!s)
+ 			fz_throw(ctx, FZ_ERROR_GENERIC, "xref subsection length missing");
+ 		len = fz_atoi(fz_strsep(&s, " "));
++/* willus mod -- no warning */
++/*
+ 		if (len < 0)
+ 			fz_throw(ctx, FZ_ERROR_GENERIC, "xref subsection length must be positive");
++*/
+ 
+ 		/* broken pdfs where the section is not on a separate line */
+ 		if (s && *s != '\0')
+@@ -1372,7 +1375,10 @@ pdf_init_document(fz_context *ctx, pdf_document *doc)
+ 	{
+ 		pdf_drop_xref_sections(ctx, doc);
+ 		fz_rethrow_if(ctx, FZ_ERROR_TRYLATER);
++/* willus mod -- be quiet */
++/*
+ 		fz_warn(ctx, "trying to repair broken xref");
++*/
+ 		repaired = 1;
+ 	}
+ 
+@@ -1496,7 +1502,10 @@ pdf_drop_document_imp(fz_context *ctx, pdf_document *doc)
+ 		/* Swallow error, but continue dropping */
+ 	}
+ 
++/* willu smod -- no pdf_drop_js */
++/*
+ 	pdf_drop_js(ctx, doc->js);
++*/
+ 
+ 	pdf_drop_xref_sections(ctx, doc);
+ 	fz_free(ctx, doc->xref_index);
+-- 
+2.22.0
+
diff --git a/pkgs/applications/misc/k2pdfopt/tesseract.patch b/pkgs/applications/misc/k2pdfopt/tesseract.patch
index b882f5b949c..adfee9ae282 100644
--- a/pkgs/applications/misc/k2pdfopt/tesseract.patch
+++ b/pkgs/applications/misc/k2pdfopt/tesseract.patch
@@ -1,13 +1,675 @@
+From 39aa8502eee7bb669a29d1a9b3bfe5c9595ad960 Mon Sep 17 00:00:00 2001
+From: Daniel Fullmer <danielrf12@gmail.com>
+Date: Fri, 13 Sep 2019 13:45:05 -0400
+Subject: [PATCH] Willus mod changes from k2pdfopt
+
+---
+ src/api/Makefile.am        |   1 +
+ src/api/baseapi.cpp        |  87 +++++++++++
+ src/api/baseapi.h          |   3 +
+ src/api/tesscapi.cpp       | 311 +++++++++++++++++++++++++++++++++++++
+ src/api/tesseract.h        |  29 ++++
+ src/ccmain/tessedit.cpp    |   5 +-
+ src/ccutil/ccutil.h        |   7 +
+ src/ccutil/genericvector.h |  21 ++-
+ src/ccutil/mainblk.cpp     |  17 +-
+ src/ccutil/params.cpp      |   3 +-
+ src/ccutil/serialis.cpp    |   3 +
+ src/ccutil/serialis.h      |   2 +
+ src/lstm/input.cpp         |   3 +
+ 13 files changed, 488 insertions(+), 4 deletions(-)
+ create mode 100644 src/api/tesscapi.cpp
+ create mode 100644 src/api/tesseract.h
+
 diff --git a/src/api/Makefile.am b/src/api/Makefile.am
-index d8c1e54..46ead13 100644
+index d9b76eb6..cd2dc30f 100644
 --- a/src/api/Makefile.am
 +++ b/src/api/Makefile.am
-@@ -42,7 +42,7 @@ libtesseract_api_la_CPPFLAGS = $(AM_CPPFLAGS)
- if VISIBILITY
- libtesseract_api_la_CPPFLAGS += -DTESS_EXPORTS
- endif
--libtesseract_api_la_SOURCES = baseapi.cpp capi.cpp renderer.cpp pdfrenderer.cpp
-+libtesseract_api_la_SOURCES = baseapi.cpp capi.cpp renderer.cpp pdfrenderer.cpp tesscapi.cpp
+@@ -39,6 +39,7 @@ libtesseract_api_la_SOURCES += lstmboxrenderer.cpp
+ libtesseract_api_la_SOURCES += pdfrenderer.cpp
+ libtesseract_api_la_SOURCES += wordstrboxrenderer.cpp
+ libtesseract_api_la_SOURCES += renderer.cpp
++libtesseract_api_la_SOURCES += tesscapi.cpp
  
  lib_LTLIBRARIES += libtesseract.la
- libtesseract_la_LDFLAGS = 
+ libtesseract_la_LDFLAGS = $(LEPTONICA_LIBS) $(OPENCL_LDFLAGS) $(libarchive_LIBS)
+diff --git a/src/api/baseapi.cpp b/src/api/baseapi.cpp
+index 9245d07c..ea964ee6 100644
+--- a/src/api/baseapi.cpp
++++ b/src/api/baseapi.cpp
+@@ -215,6 +215,14 @@ TessBaseAPI::TessBaseAPI()
+   // Use the current locale if building debug code.
+   std::locale::global(std::locale(""));
+ #endif
++  const char *locale;
++  locale = std::setlocale(LC_ALL, nullptr);
++/* willus mod Remove assertions--taken care of in tesscapi.cpp */
++//  ASSERT_HOST(!strcmp(locale, "C"));
++  locale = std::setlocale(LC_CTYPE, nullptr);
++//  ASSERT_HOST(!strcmp(locale, "C"));
++  locale = std::setlocale(LC_NUMERIC, nullptr);
++//  ASSERT_HOST(!strcmp(locale, "C"));
+ }
+ 
+ TessBaseAPI::~TessBaseAPI() {
+@@ -1333,6 +1341,85 @@ static void AddBoxToTSV(const PageIterator* it, PageIteratorLevel level,
+   text->add_str_int("\t", bottom - top);
+ }
+ 
++/* willus mod */
++int TessBaseAPI::GetOCRWords(int **x00,int **y00,int **x11,int **y11,int **ybaseline0,
++                             char **utf8words)
++
++    {
++    int iword,nwords,totlen,it8;
++    int *x0,*y0,*x1,*y1,*ybaseline;
++    char *tutf8;
++
++    ResultIterator *res_it = GetIterator();
++    /* Count words */
++    iword=0;
++    totlen=0;
++    while (!res_it->Empty(RIL_BLOCK))
++        {
++        if (res_it->Empty(RIL_WORD))
++            {
++            res_it->Next(RIL_WORD);
++            continue;
++            }
++        iword++;
++        STRING textstr=std::unique_ptr<const char[]>(res_it->GetUTF8Text(RIL_WORD)).get();
++        totlen+=strlen(textstr.string())+1;
++        res_it->Next(RIL_WORD);
++        }
++    nwords=iword;
++/*
++printf("\nnwords=%d, totlen=%d\n",nwords,totlen);
++*/
++    x0=(*x00)=(int *)malloc(sizeof(int)*5*nwords);
++    y0=(*y00)=&x0[nwords];
++    x1=(*x11)=&y0[nwords];
++    y1=(*y11)=&x1[nwords];
++    ybaseline=(*ybaseline0)=&y1[nwords];
++    tutf8=(*utf8words)=(char *)malloc(totlen);
++    iword=0;
++    it8=0;
++    res_it->Begin();
++    while (!res_it->Empty(RIL_BLOCK))
++        {
++        if (res_it->Empty(RIL_WORD))
++            {
++            res_it->Next(RIL_WORD);
++            continue;
++            }
++        STRING textstr=std::unique_ptr<const char[]>(res_it->GetUTF8Text(RIL_WORD)).get();
++        strcpy(&tutf8[it8],textstr.string());
++        it8 += strlen(&tutf8[it8])+1;
++        /*
++        STRING textstr("");
++        textstr += std::unique_ptr<const char[]>(res_it->GetUTF8Text(RIL_WORD)).get();
++        */
++/*
++printf("Word %d: '%s'\n",iword,textstr.string());
++*/
++        int left, top, right, bottom;
++        int u1,v1,u2,v2;
++        res_it->BoundingBox(RIL_WORD, &left, &top, &right, &bottom);
++        res_it->Baseline(RIL_WORD, &u1, &v1, &u2, &v2);
++        x0[iword]=left;
++        x1[iword]=right;
++        y0[iword]=top;
++        y1[iword]=bottom;
++        ybaseline[iword]=(v1+v2)/2;
++        iword++;
++/*
++printf("BB: (%d,%d)-(%d,%d)  BL: (%d,%d)-(%d,%d)\n",left,bottom,right,top,x1,y1,x2,y2);
++*/
++        res_it->Next(RIL_WORD);
++        }
++/*
++printf("iword=%d\n",iword);
++*/
++    return(iword);
++    }
++
++/* willus mod */
++int GetOCRWords(int **x0,int **y0,int **x1,int **y1,int **ybaseline,char **utf8words);
++
+ /**
+  * Make a TSV-formatted string from the internal data structures.
+  * page_number is 0-based but will appear in the output as 1-based.
+diff --git a/src/api/baseapi.h b/src/api/baseapi.h
+index 3724dd92..23be5920 100644
+--- a/src/api/baseapi.h
++++ b/src/api/baseapi.h
+@@ -575,6 +575,9 @@ class TESS_API TessBaseAPI {
+    */
+   char* GetHOCRText(ETEXT_DESC* monitor, int page_number);
+ 
++/* willus mod */
++int GetOCRWords(int **x0,int **y0,int **x1,int **y1,int **ybaseline,char **utf8words);
++
+   /**
+    * Make a HTML-formatted string with hOCR markup from the internal
+    * data structures.
+diff --git a/src/api/tesscapi.cpp b/src/api/tesscapi.cpp
+new file mode 100644
+index 00000000..1752fafe
+--- /dev/null
++++ b/src/api/tesscapi.cpp
+@@ -0,0 +1,311 @@
++/*
++** tesscapi.cpp    willus.com attempt at C wrapper for tesseract.
++**                 (Butchered from tesseractmain.cpp)
++**                 Last udpated 9-1-12
++**
++** Copyright (C) 2012  http://willus.com
++**
++** This program is free software: you can redistribute it and/or modify
++** it under the terms of the GNU Affero General Public License as
++** published by the Free Software Foundation, either version 3 of the
++** License, or (at your option) any later version.
++**
++** This program is distributed in the hope that it will be useful,
++** but WITHOUT ANY WARRANTY; without even the implied warranty of
++** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++** GNU Affero General Public License for more details.
++**
++** You should have received a copy of the GNU Affero General Public License
++** along with this program.  If not, see <http://www.gnu.org/licenses/>.
++**
++*/
++
++/*
++#include "mfcpch.h"
++*/
++// #define USE_VLD //Uncomment for Visual Leak Detector.
++#if (defined _MSC_VER && defined USE_VLD)
++#include <vld.h>
++#endif
++
++// Include automatically generated configuration file if running autoconf
++#ifdef HAVE_CONFIG_H
++#include "config_auto.h"
++#endif
++#include <locale.h>
++#ifdef USING_GETTEXT
++#include <libintl.h>
++#define _(x) gettext(x)
++#else
++#define _(x) (x)
++#endif
++
++#include "allheaders.h"
++#include "baseapi.h"
++#include "strngs.h"
++#include "params.h"
++#include "blobs.h"
++#include "simddetect.h"
++#include "tesseractclass.h"
++/*
++#include "notdll.h"
++*/
++
++/* C Wrappers */
++#include "tesseract.h"
++
++// static tesseract::TessBaseAPI api[4];
++
++/*
++** ocr_type=0:  OEM_DEFAULT
++** ocr_type=1:  OEM_TESSERACT_ONLY
++** ocr_type=2:  OEM_LSTM_ONLY
++** ocr_type=3:  OEM_TESSERACT_LSTM_COMBINED
++*/
++void *tess_capi_init(char *datapath,char *language,int ocr_type,FILE *out,
++                     char *initstr,int maxlen,int *status)
++
++    {
++    char original_locale[256];
++    tesseract::TessBaseAPI *api = new tesseract::TessBaseAPI;
++/*
++printf("@tess_capi_init\n");
++printf("    datapath='%s'\n",datapath);
++printf("    language='%s'\n",language);
++printf("    ocr_type=%d\n",ocr_type);
++*/
++#ifdef USE_NLS
++    setlocale (LC_ALL, "");
++    bindtextdomain (PACKAGE, LOCALEDIR);
++    textdomain (PACKAGE);
++#endif
++    /* willus mod, 11-24-16 */
++    /* Tesseract needs "C" locale to correctly parse all data .traineddata files. */
++/*
++printf("locale='%s'\n",setlocale(LC_ALL,NULL));
++printf("ctype='%s'\n",setlocale(LC_CTYPE,NULL));
++printf("numeric='%s'\n",setlocale(LC_NUMERIC,NULL));
++*/
++    strncpy(original_locale,setlocale(LC_ALL,NULL),255);
++    original_locale[255]='\0';
++/*
++printf("original_locale='%s'\n",original_locale);
++*/
++    setlocale(LC_ALL,"C");
++/*
++printf("new locale='%s'\n",setlocale(LC_ALL,NULL));
++printf("new ctype='%s'\n",setlocale(LC_CTYPE,NULL));
++printf("new numeric='%s'\n",setlocale(LC_NUMERIC,NULL));
++*/
++    // fprintf(stderr, "tesseract %s\n", tesseract::TessBaseAPI::Version());
++    // Make the order of args a bit more forgiving than it used to be.
++    const char* lang = "eng";
++    tesseract::PageSegMode pagesegmode = tesseract::PSM_SINGLE_BLOCK;
++    if (language!=NULL && language[0]!='\0')
++        lang = language;
++    /*
++    if (output == NULL)
++        {
++        fprintf(stderr, _("Usage:%s imagename outputbase [-l lang] "
++                      "[-psm pagesegmode] [configfile...]\n"), argv[0]);
++        fprintf(stderr,
++            _("pagesegmode values are:\n"
++              "0 = Orientation and script detection (OSD) only.\n"
++              "1 = Automatic page segmentation with OSD.\n"
++              "2 = Automatic page segmentation, but no OSD, or OCR\n"
++              "3 = Fully automatic page segmentation, but no OSD. (Default)\n"
++              "4 = Assume a single column of text of variable sizes.\n"
++              "5 = Assume a single uniform block of vertically aligned text.\n"
++              "6 = Assume a single uniform block of text.\n"
++              "7 = Treat the image as a single text line.\n"
++              "8 = Treat the image as a single word.\n"
++              "9 = Treat the image as a single word in a circle.\n"
++              "10 = Treat the image as a single character.\n"));
++        fprintf(stderr, _("-l lang and/or -psm pagesegmode must occur before any"
++                      "configfile.\n"));
++        exit(1);
++        }
++    */
++/*
++printf("SSE = %s\n",SIMDDetect::IsSSEAvailable() ? "AVAILABLE" : "NOT AVAILABLE");
++printf("AVX = %s\n",SIMDDetect::IsAVXAvailable() ? "AVAILABLE" : "NOT AVAILABLE");
++*/
++/*
++v4.00 loads either TESSERACT enginer, LSTM engine, or both.  No CUBE.
++*/
++    ocr_type=0; /* Ignore specified and use default */
++    api->SetOutputName(NULL);
++    (*status)=api->Init(datapath,lang,
++              ocr_type==0 ? tesseract::OEM_DEFAULT :
++                (ocr_type==1 ? tesseract::OEM_TESSERACT_ONLY :
++                   (ocr_type==2 ? tesseract::OEM_LSTM_ONLY :
++                                  (tesseract::OEM_TESSERACT_LSTM_COMBINED))));
++    if ((*status)!=0)
++        {
++        /* willus mod, 11-24-16 */
++        setlocale(LC_ALL,original_locale);
++        api->End();
++        delete api;
++        return(NULL);
++        }
++    /*
++    api.Init("tesscapi",lang,tesseract::OEM_DEFAULT,
++           &(argv[arg]), argc - arg, NULL, NULL, false);
++    */
++    // We have 2 possible sources of pagesegmode: a config file and
++    // the command line. For backwards compatability reasons, the
++    // default in tesseract is tesseract::PSM_SINGLE_BLOCK, but the
++    // default for this program is tesseract::PSM_AUTO. We will let
++    // the config file take priority, so the command-line default
++    // can take priority over the tesseract default, so we use the
++    // value from the command line only if the retrieved mode
++    // is still tesseract::PSM_SINGLE_BLOCK, indicating no change
++    // in any config file. Therefore the only way to force
++    // tesseract::PSM_SINGLE_BLOCK is from the command line.
++    // It would be simpler if we could set the value before Init,
++    // but that doesn't work.
++    if (api->GetPageSegMode() == tesseract::PSM_SINGLE_BLOCK)
++        api->SetPageSegMode(pagesegmode);
++
++    /*
++    ** Initialization message
++    */
++    {
++    char istr[1024];
++    int sse,avx;
++
++// printf("tessedit_ocr_engine_mode = %d\n",tessedit_ocr_engine_mode);
++    sprintf(istr,"%s",api->Version());
++    sse=tesseract::SIMDDetect::IsSSEAvailable();
++    avx=tesseract::SIMDDetect::IsAVXAvailable();
++    if (sse || avx)
++        sprintf(&istr[strlen(istr)]," [%s]",sse&&avx?"SSE+AVX":(sse?"SSE":"AVX"));
++    sprintf(&istr[strlen(istr)],"\n    Tesseract data folder = '%s'",datapath==NULL?getenv("TESSDATA_PREFIX"):datapath);
++    strcat(istr,"\n    Tesseract languages: ");
++    GenericVector<STRING> languages;
++    api->GetLoadedLanguagesAsVector(&languages);
++/*
++printf("OEM=%d\n",api->oem());
++printf("Langs='%s'\n",api->GetInitLanguagesAsString());
++printf("AnyTessLang()=%d\n",(int)api->tesseract()->AnyTessLang());
++printf("AnyLSTMLang()=%d\n",(int)api->tesseract()->AnyLSTMLang());
++printf("num_sub_langs()=%d\n",api->tesseract()->num_sub_langs());
++printf("languages.size()=%d\n",(int)languages.size());
++*/
++
++    for (int i=0;i<=api->tesseract()->num_sub_langs();i++)
++        {
++        tesseract::Tesseract *lang1;
++        int eng;
++        lang1 = i==0 ? api->tesseract() : api->tesseract()->get_sub_lang(i-1);
++        eng=(int)lang1->tessedit_ocr_engine_mode;
++        sprintf(&istr[strlen(istr)],"%s%s [%s]",i==0?"":", ",lang1->lang.string(),
++                 eng==2?"LSTM+Tess":(eng==1?"LSTM":"Tess"));
++        }
++/*
++printf("%d. '%s'\n",i+1,languages[i].string());
++printf("    sublang[%d].oem_engine = %d\n",i+1,(int)api->tesseract()->get_sub_lang(i)->tessedit_ocr_engine_mode);
++*/
++
++    /*
++    if (ocr_type==0 || ocr_type==3)
++        sprintf(&istr[strlen(istr)],"[LSTM+] (lang=");
++    else if (ocr_type==2)
++        sprintf(&istr[strlen(istr)],"[LSTM] (lang=");
++    strncpy(&istr[strlen(istr)],language,253-strlen(istr));
++    istr[253]='\0';
++    strcat(istr,")");
++    */
++    if (out!=NULL)
++        fprintf(out,"%s\n",istr);
++    if (initstr!=NULL)
++        {
++        strncpy(initstr,istr,maxlen-1);
++        initstr[maxlen-1]='\0';
++        }
++    }
++
++
++    /* Turn off LSTM debugging output */
++    api->SetVariable("lstm_debug_level","0");
++#if (WILLUSDEBUG & 1)
++    api->SetVariable("lstm_debug_level","9");
++    api->SetVariable("paragraph_debug_level","9");
++    api->SetVariable("tessdata_manager_debug_level","9");
++    api->SetVariable("tosp_debug_level","9");
++    api->SetVariable("wordrec_debug_level","9");
++    api->SetVariable("segsearch_debug_level","9");
++#endif
++    /* willus mod, 11-24-16 */
++    setlocale(LC_ALL,original_locale);
++    return((void *)api);
++    }
++
++
++int tess_capi_get_ocr(void *vapi,PIX *pix,char *outstr,int maxlen,int segmode,FILE *out)
++
++    {
++    tesseract::TessBaseAPI *api;
++    static int old_segmode=-1;
++
++    api=(tesseract::TessBaseAPI *)vapi;
++    if (old_segmode != segmode)
++        {
++        old_segmode=segmode;
++        api->SetPageSegMode((tesseract::PageSegMode)segmode);
++        }
++    if (!api->ProcessPage(pix,0,NULL,NULL,0,NULL))
++        {
++        /* pixDestroy(&pix); */
++        if (out!=NULL)
++            fprintf(out,"tesscapi:  Error during bitmap processing.\n");
++        api->Clear();
++        return(-1);
++        }
++    strncpy(outstr,api->GetUTF8Text(),maxlen-1);
++    outstr[maxlen-1]='\0';
++    api->Clear();
++    return(0);
++    }
++
++
++int tess_capi_get_ocr_multiword(void *vapi,PIX *pix,int segmode,
++                                int **left,int **top,int **right,int **bottom,
++                                int **ybase,char **text,int *nw,
++                                FILE *out)
++
++    {
++    tesseract::TessBaseAPI *api;
++    static int old_segmode=-1;
++
++    api=(tesseract::TessBaseAPI *)vapi;
++    if (old_segmode != segmode)
++        {
++        old_segmode=segmode;
++        api->SetPageSegMode((tesseract::PageSegMode)segmode);
++        }
++    if (!api->ProcessPage(pix,0,NULL,NULL,0,NULL))
++        {
++        if (out!=NULL)
++            fprintf(out,"tesscapi:  Error during bitmap processing.\n");
++        api->Clear();
++        (*nw)=0;
++        return(-1);
++        }
++    (*nw)=api->GetOCRWords(left,top,right,bottom,ybase,text);
++    api->Clear();
++    return(0);
++    }
++
++
++void tess_capi_end(void *vapi)
++
++    {
++    tesseract::TessBaseAPI *api;
++
++    if (vapi==NULL)
++        return;
++    api=(tesseract::TessBaseAPI *)vapi;
++    api->End();
++    delete api;
++    }
+diff --git a/src/api/tesseract.h b/src/api/tesseract.h
+new file mode 100644
+index 00000000..575948cc
+--- /dev/null
++++ b/src/api/tesseract.h
+@@ -0,0 +1,29 @@
++/*
++** Willus.com's Tesseract C Wrappers
++**
++** 6-8-12
++**
++*/
++
++#ifndef           _TESSERACT_H_
++#define           _TESSERACT_H_
++
++//#include <leptonica.h>
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++void *tess_capi_init(char *datapath,char *language,int ocr_type,FILE *out,
++                    char *initstr,int maxlen,int *status);
++int tess_capi_get_ocr(void *api,PIX *pix,char *outstr,int maxlen,int segmode,FILE *out);
++int tess_capi_get_ocr_multiword(void *vapi,PIX *pix,int segmode,
++                                int **left,int **top,int **right,int **bottom,
++                                int **ybase,char **text,int *nw,
++                                FILE *out);
++void tess_capi_end(void *api);
++
++#ifdef __cplusplus
++}
++#endif
++
++#endif
+diff --git a/src/ccmain/tessedit.cpp b/src/ccmain/tessedit.cpp
+index 17f0951b..7af94ee2 100644
+--- a/src/ccmain/tessedit.cpp
++++ b/src/ccmain/tessedit.cpp
+@@ -101,6 +101,10 @@ bool Tesseract::init_tesseract_lang_data(
+         " to your \"tessdata\" directory.\n");
+     return false;
+   }
++  /* willus mod */
++  TFile fp;
++  strncpy(fp.tfile_filename,tessdata_path.string(),511);
++  fp.tfile_filename[511]='\0';
+ #ifndef DISABLED_LEGACY_ENGINE
+   if (oem == OEM_DEFAULT) {
+     // Set the engine mode from availability, which can then be overridden by
+@@ -116,7 +120,6 @@ bool Tesseract::init_tesseract_lang_data(
+ #endif  // ndef DISABLED_LEGACY_ENGINE
+ 
+   // If a language specific config file (lang.config) exists, load it in.
+-  TFile fp;
+   if (mgr->GetComponent(TESSDATA_LANG_CONFIG, &fp)) {
+     ParamUtils::ReadParamsFromFp(SET_PARAM_CONSTRAINT_NONE, &fp,
+                                  this->params());
+diff --git a/src/ccutil/ccutil.h b/src/ccutil/ccutil.h
+index 71e89c60..bdeccc14 100644
+--- a/src/ccutil/ccutil.h
++++ b/src/ccutil/ccutil.h
+@@ -80,6 +80,13 @@ class CCUtil {
+   // Member parameters.
+   // These have to be declared and initialized after params_ member, since
+   // params_ should be initialized before parameters are added to it.
++/* willus mod */
++/*
++  #ifdef _WIN32
++  STRING_VAR_H(tessedit_module_name, WINDLLNAME,
++               "Module colocated with tessdata dir");
++  #endif
++*/
+   INT_VAR_H(ambigs_debug_level, 0, "Debug level for unichar ambiguities");
+   BOOL_VAR_H(use_definite_ambigs_for_classifier, false,
+              "Use definite ambiguities when running character classifier");
+diff --git a/src/ccutil/genericvector.h b/src/ccutil/genericvector.h
+index 3556d153..3a5e8662 100644
+--- a/src/ccutil/genericvector.h
++++ b/src/ccutil/genericvector.h
+@@ -382,7 +382,26 @@ inline bool LoadDataFromFile(const char* filename, GenericVector<char>* data) {
+       // reserve an extra byte in case caller wants to append a '\0' character
+       data->reserve(size + 1);
+       data->resize_no_init(size);
+-      result = static_cast<long>(fread(&(*data)[0], 1, size, fp)) == size;
++    /* willus mod Dec 2018--weird issue with Win XP and MinGW gcc 7.3.0 */
++    /* Can't read entire file at once -- need to break up into smaller blocksize reads */
++    {
++    int frs,n;
++    int blocksize;
++    blocksize=1024*1024;
++    for (n=0;1;)
++        {
++        int bs;
++        bs= size-n > blocksize ? blocksize : size-n;
++        frs=(int)fread(&(*data)[n],1,bs,fp);
++        n+=frs;
++        if (frs<bs || bs<blocksize || n>=size)
++            break;
++        }
++    result = static_cast<long>((long)n==size);
++    }
++    /*
++    result = static_cast<long>(fread(&(*data)[0], 1, size, fp)) == size;
++    */
+     }
+     fclose(fp);
+   }
+diff --git a/src/ccutil/mainblk.cpp b/src/ccutil/mainblk.cpp
+index 52b04b04..80b26044 100644
+--- a/src/ccutil/mainblk.cpp
++++ b/src/ccutil/mainblk.cpp
+@@ -55,8 +55,22 @@ void CCUtil::main_setup(const char *argv0, const char *basename) {
+ #if defined(_WIN32)
+   } else if (datadir == nullptr || _access(datadir.string(), 0) != 0) {
+     /* Look for tessdata in directory of executable. */
++    /*
++    char drive[_MAX_DRIVE];
++    char dir[_MAX_DIR];
++    */
+     char path[_MAX_PATH];
+-    DWORD length = GetModuleFileName(nullptr, path, sizeof(path));
++    int i;
++    /* DWORD length = */ GetModuleFileName(nullptr, path, sizeof(path));
++    /* willus mod--avoid _splitpath_s -- not in XP */
++    for (i=strlen(path)-1;i>=0 && path[i]!='/' && path[i]!='\\';i--);
++    if (i>=0)
++        {
++        path[i]='\0';
++        datadir=path;
++        datadir += "/tessdata";
++        }
++    /*
+     if (length > 0 && length < sizeof(path)) {
+       char* separator = std::strrchr(path, '\\');
+       if (separator != nullptr) {
+@@ -65,6 +79,7 @@ void CCUtil::main_setup(const char *argv0, const char *basename) {
+         datadir += "/tessdata";
+       }
+     }
++    */
+ #endif /* _WIN32 */
+ #if defined(TESSDATA_PREFIX)
+   } else {
+diff --git a/src/ccutil/params.cpp b/src/ccutil/params.cpp
+index 00bf2563..486c5ce0 100644
+--- a/src/ccutil/params.cpp
++++ b/src/ccutil/params.cpp
+@@ -82,7 +82,8 @@ bool ParamUtils::ReadParamsFromFp(SetParamConstraint constraint, TFile *fp,
+ 
+       if (!foundit) {
+         anyerr = true;         // had an error
+-        tprintf("Warning: Parameter not found: %s\n", line);
++        /* willus mod */
++        tprintf("Tesseract warning: Parameter %s not found in file %s.\n",line,fp->tfile_filename);
+       }
+     }
+   }
+diff --git a/src/ccutil/serialis.cpp b/src/ccutil/serialis.cpp
+index 7def011f..6107a494 100644
+--- a/src/ccutil/serialis.cpp
++++ b/src/ccutil/serialis.cpp
+@@ -201,6 +201,9 @@ bool TFile::Open(const STRING& filename, FileReader reader) {
+   offset_ = 0;
+   is_writing_ = false;
+   swap_ = false;
++  /* willus mod */
++  strncpy(tfile_filename,filename.string(),511);
++  tfile_filename[511]='\0';
+   if (reader == nullptr)
+     return LoadDataFromFile(filename, data_);
+   else
+diff --git a/src/ccutil/serialis.h b/src/ccutil/serialis.h
+index 095b9227..4cc8251e 100644
+--- a/src/ccutil/serialis.h
++++ b/src/ccutil/serialis.h
+@@ -77,6 +77,8 @@ class TFile {
+  public:
+   TFile();
+   ~TFile();
++  /* willus mod */
++  char tfile_filename[512];
+ 
+   // All the Open methods load the whole file into memory for reading.
+   // Opens a file with a supplied reader, or nullptr to use the default.
+diff --git a/src/lstm/input.cpp b/src/lstm/input.cpp
+index 73b584b3..0b0b54c3 100644
+--- a/src/lstm/input.cpp
++++ b/src/lstm/input.cpp
+@@ -93,8 +93,11 @@ Pix* Input::PrepareLSTMInputs(const ImageData& image_data,
+     return nullptr;
+   }
+   if (width < min_width || height < min_width) {
++    /* willus mod -- no warning */
++    /*
+     tprintf("Image too small to scale!! (%dx%d vs min width of %d)\n", width,
+             height, min_width);
++    */
+     pixDestroy(&pix);
+     return nullptr;
+   }
+-- 
+2.22.0
+
-- 
GitLab


From 0d5806fefd312d904c9f8b49c728a3072678a87e Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 14 Sep 2019 14:59:00 +0200
Subject: [PATCH 0248/2254] paperless: fix cors header

`django-cors-headers` 3.x (which is used in nixpkgs) requires a scheme
for allowed hosts. Upstream uses 2.4, however we create the python env
with Nix, so the source needs to be patched accordingly.
---
 pkgs/applications/office/paperless/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/applications/office/paperless/default.nix b/pkgs/applications/office/paperless/default.nix
index af2fd82ddb0..97088f36041 100644
--- a/pkgs/applications/office/paperless/default.nix
+++ b/pkgs/applications/office/paperless/default.nix
@@ -57,6 +57,12 @@ let
       cp -r --no-preserve=mode $src/src/* $src/LICENSE $srcDir
     '';
 
+    postPatch = ''
+      # django-cors-headers 3.x requires a scheme for allowed hosts
+      substituteInPlace $out/share/paperless/paperless/settings.py \
+        --replace "localhost:8080" "http://localhost:8080"
+    '';
+
     buildPhase = let
       # Paperless has explicit runtime checks that expect these binaries to be in PATH
       extraBin = lib.makeBinPath [ imagemagick7 ghostscript optipng tesseract unpaper ];
-- 
GitLab


From bfb0ac357e3dec0a1e1e701d5b7bbaa57acbd0da Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Wed, 24 Jul 2019 22:44:48 +0200
Subject: [PATCH 0249/2254] spectral: 2019-03-03 -> unstable-2019-08-15

---
 .../instant-messengers/spectral/default.nix   | 41 ++++++++-----------
 1 file changed, 16 insertions(+), 25 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/spectral/default.nix b/pkgs/applications/networking/instant-messengers/spectral/default.nix
index 29b314417c7..314a3bb6457 100644
--- a/pkgs/applications/networking/instant-messengers/spectral/default.nix
+++ b/pkgs/applications/networking/instant-messengers/spectral/default.nix
@@ -1,49 +1,40 @@
 { stdenv, fetchgit
-, pkgconfig, makeWrapper
-, qmake, qtbase, qtquickcontrols2, qtmultimedia
+, pkgconfig, wrapQtAppsHook
+, cmake
+, qtbase, qttools, qtquickcontrols2, qtmultimedia, qtkeychain
 , libpulseaudio
 # Not mentioned but seems needed
 , qtgraphicaleffects
 , qtdeclarative
 , qtmacextras
+, olm, cmark
 }:
 
-let
-  # Following "borrowed" from yubikey-manager-qt
-  qmlPath = qmlLib: "${qmlLib}/${qtbase.qtQmlPrefix}";
-
-  inherit (stdenv) lib;
-
-  qml2ImportPath = lib.concatMapStringsSep ":" qmlPath [
-    qtbase.bin qtdeclarative.bin qtquickcontrols2.bin qtgraphicaleffects qtmultimedia
-  ];
-
+let qtkeychain-qt5 = qtkeychain.override {
+  inherit qtbase qttools;
+  withQt5 = true;
+};
 in stdenv.mkDerivation {
   pname = "spectral";
-  version = "2019-03-03";
+  version = "unstable-2019-08-30";
 
   src = fetchgit {
     url = "https://gitlab.com/b0/spectral.git";
-    rev = "0473f25d38a064ee4e18203ec16eeae84fea4866";
-    sha256 = "1n09ginw6g0p42xj3zgxm52dvyyvj5psllv70vx21i50lvkbh9rw";
+    rev = "ee86c948aec5fe72979fc6df97f4a6ef711bdf94";
+    sha256 = "1mqabdkvzq48wki92wm2r79kj8g8m7ganpl47sh60qfsk4bxa8b2";
     fetchSubmodules = true;
   };
 
-  qmakeFlags = [ "CONFIG+=qtquickcompiler" "BUNDLE_FONT=true" ];
-
-  postInstall = ''
-    wrapProgram $out/bin/spectral \
-      --set QML2_IMPORT_PATH "${qml2ImportPath}"
-  '';
+  #qmakeFlags = [ "CONFIG+=qtquickcompiler" "BUNDLE_FONT=true" ];
 
-  nativeBuildInputs = [ pkgconfig qmake makeWrapper ];
-  buildInputs = [ qtbase qtquickcontrols2 qtmultimedia qtgraphicaleffects qtdeclarative ]
+  nativeBuildInputs = [ pkgconfig cmake wrapQtAppsHook ];
+  buildInputs = [ qtbase qtkeychain-qt5 qtquickcontrols2 qtmultimedia qtgraphicaleffects qtdeclarative olm cmark ]
     ++ stdenv.lib.optional stdenv.hostPlatform.isLinux libpulseaudio
     ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin qtmacextras;
 
   meta = with stdenv.lib; {
-    description = "A glossy client for Matrix, written in QtQuick Controls 2 and C++";
-    homepage = https://gitlab.com/b0/spectral;
+    description = "A glossy cross-platform Matrix client.";
+    homepage = "https://gitlab.com/b0/spectral";
     license = licenses.gpl3;
     platforms = with platforms; linux ++ darwin;
     maintainers = with maintainers; [ dtzWill ];
-- 
GitLab


From e416a394644fe17244958ed9f7f5507a1e642b50 Mon Sep 17 00:00:00 2001
From: Daniel Schaefer <git@danielschaefer.me>
Date: Sat, 14 Sep 2019 15:04:02 +0200
Subject: [PATCH 0250/2254] bareos: Mark as broken

Doesn't have a maintainer.
Doesn't work with our new glusterfs version.
bareos18 has changed from autotools to cmake so the derivation has to be
completely rewritten.
---
 pkgs/tools/backup/bareos/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix
index ce77ebe8c1a..79ae1e50ca2 100644
--- a/pkgs/tools/backup/bareos/default.nix
+++ b/pkgs/tools/backup/bareos/default.nix
@@ -77,5 +77,6 @@ stdenv.mkDerivation rec {
     description = "A fork of the bacula project";
     license = licenses.agpl3;
     platforms = platforms.unix;
+    broken = true;
   };
 }
-- 
GitLab


From 6a0c11b93118702cee109b2c5704bbba00a734ec Mon Sep 17 00:00:00 2001
From: Pierre Bourdon <delroth@gmail.com>
Date: Sat, 14 Sep 2019 15:23:26 +0200
Subject: [PATCH 0251/2254] home-assistant: add missing setuptools dependency

Fixes currently broken nixos hass test: https://hydra.nixos.org/build/100923199
---
 pkgs/servers/home-assistant/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 43633b07818..5f7ef11246e 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -124,7 +124,7 @@ in with py.pkgs; buildPythonApplication rec {
     # From setup.py
     aiohttp astral async-timeout attrs bcrypt certifi importlib-metadata jinja2
     pyjwt cryptography pip python-slugify pytz pyyaml requests ruamel_yaml
-    voluptuous voluptuous-serialize
+    setuptools voluptuous voluptuous-serialize
     # From http, frontend and recorder components and auth.mfa_modules.totp
     sqlalchemy aiohttp-cors hass-frontend pyotp pyqrcode
   ] ++ componentBuildInputs ++ extraBuildInputs;
-- 
GitLab


From d7cad2b8f9a4d3c7ec89c3fb19d1b2c685e536ec Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sat, 14 Sep 2019 13:56:53 +0100
Subject: [PATCH 0252/2254] pythonPackages.hug: enable tests

---
 .../python-modules/hug/default.nix            | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/hug/default.nix b/pkgs/development/python-modules/hug/default.nix
index 5638447bceb..bb38c738760 100644
--- a/pkgs/development/python-modules/hug/default.nix
+++ b/pkgs/development/python-modules/hug/default.nix
@@ -1,7 +1,11 @@
-{ lib , buildPythonPackage, fetchPypi, isPy27
+{ lib , buildPythonPackage, fetchFromGitHub, isPy27
 , falcon
 , pytestrunner
 , requests
+, pytest
+, marshmallow
+, mock
+, numpy
 }:
 
 buildPythonPackage rec {
@@ -9,16 +13,22 @@ buildPythonPackage rec {
   version = "2.6.0";
   disabled = isPy27;
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0iamrzjy8z1xibynkgfl6cn2sbm66awxbp75b26pi32fc41d0k50";
+  src = fetchFromGitHub {
+    owner = "hugapi";
+    repo = pname;
+    rev = version;
+    sha256 = "05rsv16g7ph100p8kl4l2jba0y4wcpp3xblc02mfp67zp1279vaq";
   };
 
   nativeBuildInputs = [ pytestrunner ];
   propagatedBuildInputs = [ falcon requests ];
 
-  # tests are not shipped in the tarball
-  doCheck = false;
+  checkInputs = [ mock marshmallow pytest numpy ];
+  checkPhase = ''
+    mv hug hug.hidden
+    # some tests attempt network access
+    PATH=$out/bin:$PATH pytest -k "not (test_request or test_datagram_request)"
+  '';
 
   meta = with lib; {
     description = "A Python framework that makes developing APIs as simple as possible, but no simpler";
-- 
GitLab


From 82783dc183b171be7b0a7434cf11f530b57ccf7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sat, 14 Sep 2019 11:22:45 -0300
Subject: [PATCH 0253/2254] materia-theme: 20190831 -> 20190912

---
 pkgs/data/themes/materia-theme/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/themes/materia-theme/default.nix b/pkgs/data/themes/materia-theme/default.nix
index 02c1b91a3eb..4a1458ee7a5 100644
--- a/pkgs/data/themes/materia-theme/default.nix
+++ b/pkgs/data/themes/materia-theme/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "materia-theme";
-  version = "20190831";
+  version = "20190912";
 
   src = fetchFromGitHub {
     owner = "nana-4";
     repo = pname;
     rev = "v${version}";
-    sha256 = "19b2wyq38wj3id0an47jln1y3zp5ih3kbrgmfpjp6bbdrmfcyccf";
+    sha256 = "07vbql1y9jfd0m34lw1674cfr6217dzg3irk0450kny8sjrrj6dx";
   };
 
   nativeBuildInputs = [ glib libxml2 bc ];
-- 
GitLab


From 77eef5529f0fc0b1711eb10ea2ec20084a1cb3f6 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 14 Sep 2019 16:47:09 +0200
Subject: [PATCH 0254/2254] svtplay-dl: 2.2 -> 2.4

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

diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix
index 12ba89304c0..b530193258c 100644
--- a/pkgs/tools/misc/svtplay-dl/default.nix
+++ b/pkgs/tools/misc/svtplay-dl/default.nix
@@ -2,20 +2,23 @@
 , gitMinimal }:
 
 let
-  inherit (python3Packages) python nose pycrypto pyyaml requests mock;
+
+  inherit (python3Packages)
+    python nose pycrypto pyyaml requests mock python-dateutil setuptools;
+
 in stdenv.mkDerivation rec {
   pname = "svtplay-dl";
-  version = "2.2";
+  version = "2.4";
 
   src = fetchFromGitHub {
     owner = "spaam";
     repo = "svtplay-dl";
     rev = version;
-    sha256 = "02yjz17x8dl5spn7mcbj1ji7vsyx0qwwa60zqyrdxpr03g1rnhdz";
+    sha256 = "146ss7pzh61yw84crk6hzfxkfdnf6bq07m11b6lgsw4hsn71g59w";
   };
 
   pythonPaths = [ pycrypto pyyaml requests ];
-  buildInputs = [ python perl nose mock makeWrapper ] ++ pythonPaths;
+  buildInputs = [ python perl nose mock makeWrapper python-dateutil setuptools ] ++ pythonPaths;
   nativeBuildInputs = [ gitMinimal zip ];
 
   postPatch = ''
@@ -32,9 +35,6 @@ in stdenv.mkDerivation rec {
 
   doCheck = true;
   checkPhase = ''
-    sed -i "/def test_parse_m3u8/i\\
-        @unittest.skip('requires internet')" lib/svtplay_dl/tests/hls.py
-
     sh scripts/run-tests.sh -2
   '';
 
-- 
GitLab


From 7791dccd3a91a7117093925fbc797b80d11486b2 Mon Sep 17 00:00:00 2001
From: Daniel Schaefer <git@danielschaefer.me>
Date: Sat, 14 Sep 2019 16:00:22 +0200
Subject: [PATCH 0255/2254] pythonPackages.zake: Skip failing test

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

diff --git a/pkgs/development/python-modules/zake/default.nix b/pkgs/development/python-modules/zake/default.nix
index 143f609d833..56fdbe45553 100644
--- a/pkgs/development/python-modules/zake/default.nix
+++ b/pkgs/development/python-modules/zake/default.nix
@@ -19,6 +19,10 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ kazoo six ];
   buildInputs = [ testtools ];
   checkPhase = ''
+    # Skip test - fails with our new kazoo version
+    substituteInPlace zake/tests/test_client.py \
+      --replace "test_child_watch_no_create" "_test_child_watch_no_create"
+
     ${python.interpreter} -m unittest discover zake/tests
   '';
 
-- 
GitLab


From 3605f128558958cca1157c6a8d59e535ad1cb641 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sat, 14 Sep 2019 19:08:38 +0200
Subject: [PATCH 0256/2254] giflib: 5.1.4 -> 5.2.1

5.1.5 says: Fix SF bug #113:
  Heap Buffer Overflow-2 in function DGifDecompressLine()
  in cgif.c.  This had been assigned CVE-2018-11490.
This *probably* also fixes a minor CVE-2019-15133 #68563 (DoS only).
(I couldn't find a good reference quickly.)

The changelogs are almost only bugfixes, and ABI tracker also looks OK:
https://abi-laboratory.pro/?view=timeline&l=giflib
so I gather this is suitable for direct push to nixpkgs staging-next.
I built several reverse dependencies locally.
---
 pkgs/development/libraries/giflib/5.1.nix | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/giflib/5.1.nix b/pkgs/development/libraries/giflib/5.1.nix
index fee760b3ea2..d97477e3f3a 100644
--- a/pkgs/development/libraries/giflib/5.1.nix
+++ b/pkgs/development/libraries/giflib/5.1.nix
@@ -1,18 +1,24 @@
 {stdenv, fetchurl, xmlto, docbook_xml_dtd_412, docbook_xsl, libxml2 }:
 
-stdenv.mkDerivation {
-  name = "giflib-5.1.4";
+stdenv.mkDerivation rec {
+  name = "giflib-5.2.1";
   src = fetchurl {
-    url = mirror://sourceforge/giflib/giflib-5.1.4.tar.bz2;
-    sha256 = "1md83dip8rf29y40cm5r7nn19705f54iraz6545zhwa6y8zyq9yz";
+    url = "mirror://sourceforge/giflib/${name}.tar.gz";
+    sha256 = "1gbrg03z1b6rlrvjyc6d41bc8j1bsr7rm8206gb1apscyii5bnii";
   };
 
+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace 'PREFIX = /usr/local' 'PREFIX = ${builtins.placeholder "out"}'
+  '';
+
   buildInputs = [ xmlto docbook_xml_dtd_412 docbook_xsl libxml2 ];
+
   meta = {
     description = "A library for reading and writing gif images";
     platforms = stdenv.lib.platforms.unix;
     license = stdenv.lib.licenses.mit;
     maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
-    branch = "5.1";
+    branch = "5.2";
   };
 }
-- 
GitLab


From 260761649bd857ea73eeb6cd21c7e6c9830d7215 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sat, 14 Sep 2019 20:12:49 +0200
Subject: [PATCH 0257/2254] ffmpeg_4, ffmpeg_full: 4.2 -> 4.2.1

Fixes #68561 CVE-2019-15942.
---
 pkgs/development/libraries/ffmpeg-full/default.nix | 4 ++--
 pkgs/development/libraries/ffmpeg/4.nix            | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix
index 45a4f48fd33..78d291e86fa 100644
--- a/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -238,11 +238,11 @@ assert opensslExtlib -> gnutls == null && openssl != null && nonfreeLicensing;
 
 stdenv.mkDerivation rec {
   pname = "ffmpeg-full";
-  version = "4.2";
+  version = "4.2.1";
 
   src = fetchurl {
     url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz";
-    sha256 = "1mgcxm7sqkajx35px05szsmn9mawwm03cfpmk3br7bcp3a1i0gq2";
+    sha256 = "1m5nkc61ihgcf0b2wabm0zyqa8sj3c0w8fi6kr879lb0kdzciiyf";
   };
 
   patches = [ ./prefer-libdav1d-over-libaom.patch ];
diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix
index 670f51000a6..a0b95cecaab 100644
--- a/pkgs/development/libraries/ffmpeg/4.nix
+++ b/pkgs/development/libraries/ffmpeg/4.nix
@@ -5,8 +5,8 @@
 }@args:
 
 callPackage ./generic.nix (args // rec {
-  version = branch;
+  version = "4.2.1";
   branch = "4.2";
-  sha256 = "1f3glany3p2j832a9wia5vj8ds9xpm0xxlyia91y17hy85gxwsrh";
+  sha256 = "090naa6rj46pzkgh03bf51hbqdz356qqckr2pw6pykc6ysiryak8";
   darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ];
 })
-- 
GitLab


From a715aa7073c683cb791763b88f7e9af43a276963 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Mon, 9 Sep 2019 16:43:26 -0400
Subject: [PATCH 0258/2254] kexectools: fix build on i686

https://hydra.nixos.org/build/99957229
See: https://src.fedoraproject.org/rpms/kexec-tools/c/cb1e5463b5298b064e9b6c86ad6fe3505fec9298

Forward-cherry picked from commit dc051dfdef1e, but only conditionally
for i686 to rebuild only where necessary.  Discussion: PR #68380.
---
 pkgs/os-specific/linux/kexectools/default.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kexectools/default.nix b/pkgs/os-specific/linux/kexectools/default.nix
index 3d3215e6b4b..d6fd7346f4f 100644
--- a/pkgs/os-specific/linux/kexectools/default.nix
+++ b/pkgs/os-specific/linux/kexectools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPackages, fetchurl, zlib }:
+{ stdenv, buildPackages, fetchurl, zlib, fetchpatch }:
 
 stdenv.mkDerivation rec {
   pname = "kexec-tools";
@@ -18,6 +18,16 @@ stdenv.mkDerivation rec {
   depsBuildBuild = [ buildPackages.stdenv.cc ];
   buildInputs = [ zlib ];
 
+  patches = stdenv.lib.optionals stdenv.hostPlatform.isi686 [
+    # fix build on i686
+    # See: https://src.fedoraproject.org/rpms/kexec-tools/c/cb1e5463b5298b064e9b6c86ad6fe3505fec9298
+    (fetchpatch {
+      name = "kexec-tools-2.0.20-fix-broken-multiboot2-buliding-for-i386.patch";
+      url = "https://src.fedoraproject.org/rpms/kexec-tools/raw/cb1e5463b5298b064e9b6c86ad6fe3505fec9298/f/kexec-tools-2.0.20-fix-broken-multiboot2-buliding-for-i386.patch";
+      sha256 = "1kzmcsbhwfdgxlc5s88ir0n494phww1j16yk0z42x09qlkxxkg0l";
+    })
+  ];
+
   meta = with stdenv.lib; {
     homepage = http://horms.net/projects/kexec/kexec-tools;
     description = "Tools related to the kexec Linux feature";
-- 
GitLab


From 9a88d2c8272547a39179a311164dc3a9ad539464 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Sat, 14 Sep 2019 11:45:38 -0700
Subject: [PATCH 0259/2254] pythonPackages.cheroot: fix tests

---
 pkgs/development/python-modules/cheroot/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix
index 8c55c3ac8bb..591bb0fbe37 100644
--- a/pkgs/development/python-modules/cheroot/default.nix
+++ b/pkgs/development/python-modules/cheroot/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   checkPhase = ''
     substituteInPlace pytest.ini --replace "--doctest-modules" "" --replace "-n auto" ""
     ${lib.optionalString (pythonAtLeast "3.7") "sed -i '/warnings/,+2d' pytest.ini"}
-    pytest ${lib.optionalString stdenv.isDarwin "--deselect=cheroot/test/test_ssl.py::test_http_over_https_error --deselect=cheroot/test/test_server.py::test_bind_addr_unix"}
+    pytest -k 'not tls' ${lib.optionalString stdenv.isDarwin "--deselect=cheroot/test/test_ssl.py::test_http_over_https_error --deselect=cheroot/test/test_server.py::test_bind_addr_unix"}
   '';
 
   meta = with lib; {
-- 
GitLab


From 63e7354815fb4a4047f0b74e3f012722b721adaf Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Sat, 14 Sep 2019 11:53:02 -0700
Subject: [PATCH 0260/2254] pythonPackages.ssdp: disable python2 tests

---
 pkgs/development/python-modules/ssdp/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/ssdp/default.nix b/pkgs/development/python-modules/ssdp/default.nix
index 82f1315ba3d..5ade47587d1 100644
--- a/pkgs/development/python-modules/ssdp/default.nix
+++ b/pkgs/development/python-modules/ssdp/default.nix
@@ -1,6 +1,7 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
+, isPy27
 , pbr
 , pytest
 }:
@@ -16,7 +17,9 @@ buildPythonPackage rec {
 
   buildInputs = [ pbr ];
   checkInputs = [ pytest ];
-  propagatedBuildInputs = [ ];
+
+  # test suite uses new async primitives
+  doCheck = !isPy27;
 
   meta = with stdenv.lib; {
     homepage = https://github.com/codingjoe/ssdp;
-- 
GitLab


From b0fc4b6e49e319d9d3e99f41430d29315d47f4c3 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Sat, 14 Sep 2019 12:09:56 -0700
Subject: [PATCH 0261/2254] pythonPackages.minidb: disable python2 tests

---
 .../python-modules/minidb/default.nix         | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/minidb/default.nix b/pkgs/development/python-modules/minidb/default.nix
index 209ecf998cc..bf66a886f76 100644
--- a/pkgs/development/python-modules/minidb/default.nix
+++ b/pkgs/development/python-modules/minidb/default.nix
@@ -1,29 +1,31 @@
-{ stdenv
-, buildPythonPackage
-, fetchurl
+{ lib, buildPythonPackage, fetchFromGitHub, isPy3k
 , nose
+, pytest
 }:
 
 buildPythonPackage rec {
   pname = "minidb";
   version = "2.0.2";
 
-  src = fetchurl {
-    url = "https://github.com/thp/minidb/archive/${version}.tar.gz";
-    sha256 = "17rvkpq8v7infvbgsi48vnxamhxb3f635nqn0sln7yyvh4i9k8a0";
+  src = fetchFromGitHub {
+    owner = "thp";
+    repo = "minidb";
+    rev = version;
+    sha256 = "14y5vf8vhgviczhzy9h3xv99fjvrg975nz4w1fj5c1jv37da1lq3";
   };
 
-  checkInputs = [ nose ];
-
+  # module imports are incompatible with python2
+  doCheck = isPy3k;
+  checkInputs = [ nose pytest ];
   checkPhase = ''
-    nosetests test
+    pytest
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A simple SQLite3-based store for Python objects";
-    homepage = https://thp.io/2010/minidb/;
-    license = stdenv.lib.licenses.isc;
-    maintainers = [ stdenv.lib.maintainers.tv ];
+    homepage = "https://thp.io/2010/minidb/";
+    license = licenses.isc;
+    maintainers = [ maintainers.tv ];
   };
 
 }
-- 
GitLab


From 6002a5e7f1301ddd5dcba0f1fe3098c422c230b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20M=C3=B6ller?= <fabianm88@gmail.com>
Date: Sat, 14 Sep 2019 21:12:22 +0200
Subject: [PATCH 0262/2254] pyzmq: fix darwin build

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

diff --git a/pkgs/development/python-modules/pyzmq/default.nix b/pkgs/development/python-modules/pyzmq/default.nix
index dcab96d12a6..40273cce888 100644
--- a/pkgs/development/python-modules/pyzmq/default.nix
+++ b/pkgs/development/python-modules/pyzmq/default.nix
@@ -32,4 +32,7 @@ buildPythonPackage rec {
       and not test_on_recv_wake \
       and not test_monitor"
   '';
+
+  # Some of the tests use localhost networking.
+  __darwinAllowLocalNetworking = true;
 }
-- 
GitLab


From 3b77eebc1b0edcd452523936de626d3837b646c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20M=C3=B6ller?= <fabianm88@gmail.com>
Date: Sat, 14 Sep 2019 21:15:20 +0200
Subject: [PATCH 0263/2254] nbformat: fix darwin build

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

diff --git a/pkgs/development/python-modules/nbformat/default.nix b/pkgs/development/python-modules/nbformat/default.nix
index 8b16ffb7e32..fbc71202d28 100644
--- a/pkgs/development/python-modules/nbformat/default.nix
+++ b/pkgs/development/python-modules/nbformat/default.nix
@@ -29,6 +29,9 @@ buildPythonPackage rec {
     export HOME=tmp
   '';
 
+  # Some of the tests use localhost networking.
+  __darwinAllowLocalNetworking = true;
+
   meta = {
     description = "The Jupyter Notebook format";
     homepage = https://jupyter.org/;
-- 
GitLab


From 00000ca0e808d368f5de217c46414742dfafb09e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20M=C3=B6ller?= <fabianm88@gmail.com>
Date: Sat, 14 Sep 2019 21:17:42 +0200
Subject: [PATCH 0264/2254] nbconvert: fix darwin build

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

diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix
index 69828b2b18f..2f0090b5967 100644
--- a/pkgs/development/python-modules/nbconvert/default.nix
+++ b/pkgs/development/python-modules/nbconvert/default.nix
@@ -44,6 +44,9 @@ buildPythonPackage rec {
     HOME=$(mktemp -d) py.test -v --ignore="nbconvert/preprocessors/tests/test_execute.py"
   '';
 
+  # Some of the tests use localhost networking.
+  __darwinAllowLocalNetworking = true;
+
   meta = {
     description = "Converting Jupyter Notebooks";
     homepage = https://jupyter.org/;
-- 
GitLab


From 88264604ff73d56eef0dcbde85ab71ab9476ca63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20M=C3=B6ller?= <fabianm88@gmail.com>
Date: Sat, 14 Sep 2019 21:19:09 +0200
Subject: [PATCH 0265/2254] ipykernel:fix darwin build

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

diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix
index 5203047b77f..4bdd9011d1e 100644
--- a/pkgs/development/python-modules/ipykernel/default.nix
+++ b/pkgs/development/python-modules/ipykernel/default.nix
@@ -37,6 +37,9 @@ buildPythonPackage rec {
     HOME=$(mktemp -d) pytest ipykernel -k "not (test_sys_path or test_sys_path_profile_dir or test_complete)"
   '';
 
+  # Some of the tests use localhost networking.
+  __darwinAllowLocalNetworking = true;
+
   meta = {
     description = "IPython Kernel for Jupyter";
     homepage = http://ipython.org/;
-- 
GitLab


From d3aaa25390589cd14a5373a991eaa49137f46215 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20M=C3=B6ller?= <fabianm88@gmail.com>
Date: Sat, 14 Sep 2019 21:20:54 +0200
Subject: [PATCH 0266/2254] notebook: fix darwin build

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

diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix
index 431d4bb4d56..d081a5a92fb 100644
--- a/pkgs/development/python-modules/notebook/default.nix
+++ b/pkgs/development/python-modules/notebook/default.nix
@@ -64,6 +64,9 @@ buildPythonPackage rec {
     else ""}
   '';
 
+  # Some of the tests use localhost networking.
+  __darwinAllowLocalNetworking = true;
+
   meta = {
     description = "The Jupyter HTML notebook is a web-based notebook environment for interactive computing";
     homepage = https://jupyter.org/;
-- 
GitLab


From 618b7d7de08540d244c5adcd03c5bdc996630191 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20M=C3=B6ller?= <fabianm88@gmail.com>
Date: Sat, 14 Sep 2019 22:24:57 +0200
Subject: [PATCH 0267/2254] nbval: fix darwin build

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

diff --git a/pkgs/development/python-modules/nbval/default.nix b/pkgs/development/python-modules/nbval/default.nix
index 60aa4806e2f..860142f1e94 100644
--- a/pkgs/development/python-modules/nbval/default.nix
+++ b/pkgs/development/python-modules/nbval/default.nix
@@ -45,6 +45,9 @@ buildPythonPackage rec {
     pytest tests --ignore tests/test_timeouts.py
   '';
 
+  # Some of the tests use localhost networking.
+  __darwinAllowLocalNetworking = true;
+
   meta = with lib; {
     description = "A py.test plugin to validate Jupyter notebooks";
     homepage = https://github.com/computationalmodelling/nbval;
-- 
GitLab


From 90b8849b2000676f92cb600808a24da07dd8ea89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20M=C3=B6ller?= <fabianm88@gmail.com>
Date: Sat, 14 Sep 2019 22:33:59 +0200
Subject: [PATCH 0268/2254] Logbook: fix darwin build

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

diff --git a/pkgs/development/python-modules/Logbook/default.nix b/pkgs/development/python-modules/Logbook/default.nix
index 866c0410929..503fefc0013 100644
--- a/pkgs/development/python-modules/Logbook/default.nix
+++ b/pkgs/development/python-modules/Logbook/default.nix
@@ -18,6 +18,9 @@ buildPythonPackage rec {
     py.test tests
   '';
 
+  # Some of the tests use localhost networking.
+  __darwinAllowLocalNetworking = true;
+
   meta = {
     homepage = https://pythonhosted.org/Logbook/;
     description = "A logging replacement for Python";
-- 
GitLab


From 806dfb3f6ade70b61910679177c2f64a696ad3c0 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sat, 14 Sep 2019 20:31:09 -0400
Subject: [PATCH 0269/2254] cataract: fix broken build

---
 pkgs/applications/misc/cataract/build.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/cataract/build.nix b/pkgs/applications/misc/cataract/build.nix
index 5f4e24f4d3c..1c33a92987c 100644
--- a/pkgs/applications/misc/cataract/build.nix
+++ b/pkgs/applications/misc/cataract/build.nix
@@ -22,17 +22,21 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
   buildInputs = [ glib libxml2 exiv2 imagemagick ];
 
+  prePatch = ''
+    sed -i 's|#include <exiv2/exif.hpp>|#include <exiv2/exiv2.hpp>|' src/jpeg-utils.cpp
+  '';
+
   installPhase = ''
     mkdir $out/{bin,share} -p
     cp src/cgg{,-dirgen} $out/bin/
   '';
 
-  meta = {
-    homepage = http://cgg.bzatek.net/;
-    description = "a simple static web photo gallery, designed to be clean and easily usable";
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.matthiasbeyer ];
-    platforms = with stdenv.lib.platforms; linux ++ darwin;
+  meta = with stdenv.lib; {
+    homepage = "http://cgg.bzatek.net/";
+    description = "A simple static web photo gallery, designed to be clean and easily usable";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.matthiasbeyer ];
+    platforms = with platforms; linux ++ darwin;
   };
 }
 
-- 
GitLab


From 3b50b01e99e41d8121c79646fa79803cd4201901 Mon Sep 17 00:00:00 2001
From: Dave Nicponski <dave.nicponski@gmail.com>
Date: Sat, 14 Sep 2019 21:40:43 -0400
Subject: [PATCH 0270/2254] unison-ucm: 1.0.M1c-alpha -> 1.0.M1d-alpha

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

diff --git a/pkgs/development/compilers/unison/default.nix b/pkgs/development/compilers/unison/default.nix
index 3bdf234f915..d4e536484c4 100644
--- a/pkgs/development/compilers/unison/default.nix
+++ b/pkgs/development/compilers/unison/default.nix
@@ -4,18 +4,18 @@
 
 stdenv.mkDerivation rec {
   pname = "unison-code-manager";
-  milestone_id = "M1c";
+  milestone_id = "M1d";
   version = "1.0.${milestone_id}-alpha";
 
   src = if (stdenv.isDarwin) then
     fetchurl {
       url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/unison-osx.tar.gz";
-      sha256 = "03q02r7qc7ybqz16kmpk2d8l9vx28kaj9x59mlxzi8a4mr0j3vzb";
+      sha256 = "0cgkqwniw2fclsxgx6b1kgjmylqnn67kjs61iygzbpip8nvcm7pv";
     }
   else
     fetchurl {
       url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/unison-linux64.tar.gz";
-      sha256 = "1iwynqnp1i39pyq9wc01x7y22y1qa0rrjlx40jjdgnj23y1r6jk4";
+      sha256 = "0rpz40d23daad16r2s4appiay3brbk0awp38yamavlr6dh23c9ws";
     };
 
   # The tarball is just the prebuilt binary, in the archive root.
-- 
GitLab


From 9165e72c7f0206a9b2216027164c69508ef5d75a Mon Sep 17 00:00:00 2001
From: Pierre Bourdon <delroth@gmail.com>
Date: Sat, 14 Sep 2019 18:50:24 +0200
Subject: [PATCH 0271/2254] chiaki: init at 1.0.3

---
 pkgs/games/chiaki/default.nix   | 31 +++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/games/chiaki/default.nix

diff --git a/pkgs/games/chiaki/default.nix b/pkgs/games/chiaki/default.nix
new file mode 100644
index 00000000000..7a9ac7d381c
--- /dev/null
+++ b/pkgs/games/chiaki/default.nix
@@ -0,0 +1,31 @@
+{ lib, mkDerivation, fetchFromGitHub
+, cmake, ffmpeg, libopus, qtbase, qtmultimedia, qtsvg, pkgconfig, protobuf
+, python3Packages, SDL2 }:
+
+mkDerivation rec {
+  pname = "chiaki";
+  version = "1.0.3";
+
+  src = fetchFromGitHub {
+    rev = "v${version}";
+    owner = "thestr4ng3r";
+    repo = "chiaki";
+    fetchSubmodules = true;
+    sha256 = "09c6izprqqvhn1vbr2897ql05w5c7iqakm6jn795a5faghjm1mah";
+  };
+
+  nativeBuildInputs = [
+    cmake pkgconfig protobuf python3Packages.python python3Packages.protobuf
+  ];
+  buildInputs = [ ffmpeg libopus qtbase qtmultimedia qtsvg protobuf SDL2 ];
+
+  doCheck = true;
+
+  meta = with lib; {
+    homepage = "https://github.com/thestr4ng3r/chiaki";
+    description = "Free and Open Source PS4 Remote Play Client";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ delroth ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 37699f9310b..fb751f174fd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21832,6 +21832,8 @@ in
 
   chessx = libsForQt59.callPackage ../games/chessx { };
 
+  chiaki = libsForQt5.callPackage ../games/chiaki { };
+
   chocolateDoom = callPackage ../games/chocolate-doom { };
 
   crispyDoom = callPackage ../games/crispy-doom { };
-- 
GitLab


From 6b2aa16ec1926f7027ad03ebf2b9b43370cb5e54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sun, 15 Sep 2019 09:36:40 +0200
Subject: [PATCH 0272/2254] expat: 2.27 -> 2.28 (security)

Fixes #68818 CVE-2019-15903 (on this nixpkgs branch).
https://github.com/libexpat/libexpat/blob/R_2_2_8/expat/Changes
---
 pkgs/development/libraries/expat/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix
index ef257401945..bb86ac57832 100644
--- a/pkgs/development/libraries/expat/default.nix
+++ b/pkgs/development/libraries/expat/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "expat-2.2.7";
+  name = "expat-2.2.8";
 
   src = fetchurl {
-    url = "mirror://sourceforge/expat/${name}.tar.bz2";
-    sha256 = "067cfhqwiswm4zynw7xaxl59mrrimaiyjhnn8byxma1i98pi1jfb";
+    url = "https://github.com/libexpat/libexpat/releases/download/R_2_2_8/${name}.tar.xz";
+    sha256 = "16vpj5mk3lps3x7fr8cs03rffx3ir4jilyqw0frayn6q94daijk1";
   };
 
   outputs = [ "out" "dev" ]; # TODO: fix referrers
-- 
GitLab


From 07753d8cf1f75861d6ee2662dd850a7db26e2db6 Mon Sep 17 00:00:00 2001
From: Vladyslav M <dywedir@gra.red>
Date: Sun, 15 Sep 2019 10:48:37 +0300
Subject: [PATCH 0273/2254] source-sans-pro: 2.045 -> 3.006

---
 pkgs/data/fonts/source-sans-pro/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/data/fonts/source-sans-pro/default.nix b/pkgs/data/fonts/source-sans-pro/default.nix
index bea5fea0f9d..5186b9fe4a5 100644
--- a/pkgs/data/fonts/source-sans-pro/default.nix
+++ b/pkgs/data/fonts/source-sans-pro/default.nix
@@ -1,9 +1,11 @@
 { lib, fetchzip }:
 
-fetchzip {
-  name = "source-sans-pro-2.045";
+let
+  version = "3.006";
+in fetchzip {
+  name = "source-sans-pro-${version}";
 
-  url = https://github.com/adobe-fonts/source-sans-pro/releases/download/2.045R-ro%2F1.095R-it/source-sans-pro-2.045R-ro-1.095R-it.zip;
+  url = "https://github.com/adobe-fonts/source-sans-pro/releases/download/${version}R/source-sans-pro-${version}R.zip";
 
   postFetch = ''
     mkdir -p $out/share/fonts/{opentype,truetype,variable}
@@ -12,7 +14,7 @@ fetchzip {
     unzip -j $downloadedFile "*/VAR/*.otf" -d $out/share/fonts/variable
   '';
 
-  sha256 = "0xjdp226ybdcfylbpfsdgnz2bf4pj4qv1wfs6fv22hjxlzqfixf3";
+  sha256 = "11jd50cqiq2s0z39rclg73iiw2j5yzgs1glfs9psw5wbbisgysmr";
 
   meta = with lib; {
     homepage = https://adobe-fonts.github.io/source-sans-pro/;
-- 
GitLab


From 1ba3d1a591a20d8f504b4eb74dc170fddc3b2bc4 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Thu, 12 Sep 2019 00:34:10 +0900
Subject: [PATCH 0274/2254] mupdf: 1.14.0 -> 1.16.1

---
 pkgs/applications/misc/mupdf/default.nix | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix
index 9219c4e2e42..ddd325214b2 100644
--- a/pkgs/applications/misc/mupdf/default.nix
+++ b/pkgs/applications/misc/mupdf/default.nix
@@ -14,24 +14,17 @@ let
 
 
 in stdenv.mkDerivation rec {
-  version = "1.14.0";
+  version = "1.16.1";
   pname = "mupdf";
 
   src = fetchurl {
     url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz";
-    sha256 = "093p7lv6pgyymagn28n58fs0np928r0i5p2az9cc4gwccwx4hhy4";
+    sha256 = "0iz4ickj52fxjp8crg573kjrl4viq279g589isdpgpckslysf7g7";
   };
 
   patches =
     # Use shared libraries to decrease size
-    [( fetchpatch
-      {
-          name = "CVE-2018-18662";
-          url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=164ddc22ee0d5b63a81d5148f44c37dd132a9356";
-          sha256 = "1jkzh20n3b854871h86cy5y7fvy0d5wyqy51b3fg6gj3a0jqpzzd";
-      }
-    )]
-    ++ stdenv.lib.optional (!stdenv.isDarwin) ./mupdf-1.14-shared_libs.patch
+    stdenv.lib.optional (!stdenv.isDarwin) ./mupdf-1.14-shared_libs.patch
     ++ stdenv.lib.optional stdenv.isDarwin ./darwin.patch
   ;
 
-- 
GitLab


From 8c5898347d233e624ec5cfe5a80f6d3c50021c67 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Thu, 12 Sep 2019 17:01:11 +0900
Subject: [PATCH 0275/2254] zathura: 0.3.4 -> 0.3.5

to fix issues with the new mupdf
---
 pkgs/applications/misc/zathura/pdf-mupdf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
index 2ebc640d683..d8c1364d395 100644
--- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
+++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
@@ -2,7 +2,7 @@
 , pkgconfig, zathura_core, cairo , gtk-mac-integration, girara, mupdf }:
 
 stdenv.mkDerivation rec {
-  version = "0.3.4";
+  version = "0.3.5";
   pname = "zathura-pdf-mupdf";
 
   # pwmt.org server was down at the time of last update
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     owner = "pwmt";
     repo = "zathura-pdf-mupdf";
     rev = version;
-    sha256 = "1m4w4jrybpjmx6pi33a5saxzmfd8rrym2k13jpd1fv543s17d9dy";
+    sha256 = "0wb46hllykbi30ir69s8s23mihivqn13mgfdzawbsn2a21p8y4zl";
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig ];
-- 
GitLab


From 8a4029fa8bfc7383a1467779d75ffdd4acbfab36 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Thu, 12 Sep 2019 17:13:36 +0900
Subject: [PATCH 0276/2254] llpp: 30 -> 31

---
 pkgs/applications/misc/llpp/default.nix       |  4 +--
 .../misc/llpp/fix-build-bash.patch            | 34 +++++++------------
 2 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix
index c66ef21416b..2c2acb6a743 100644
--- a/pkgs/applications/misc/llpp/default.nix
+++ b/pkgs/applications/misc/llpp/default.nix
@@ -5,12 +5,12 @@ assert lib.versionAtLeast (lib.getVersion ocaml) "4.07";
 
 stdenv.mkDerivation rec {
   pname = "llpp";
-  version = "30";
+  version = "31";
 
   src = fetchgit {
     url = "git://repo.or.cz/llpp.git";
     rev = "v${version}";
-    sha256 = "0iilpzf12hs0zky58j55l4y5dvzv7fc53nsrg324n9vka92mppvd";
+    sha256 = "14ibsm1zzxfidjajcj30b5m9in10q3817izahsjvkmryrvvn6qsg";
     fetchSubmodules = false;
   };
 
diff --git a/pkgs/applications/misc/llpp/fix-build-bash.patch b/pkgs/applications/misc/llpp/fix-build-bash.patch
index 25d503290ce..13dbdb926c8 100644
--- a/pkgs/applications/misc/llpp/fix-build-bash.patch
+++ b/pkgs/applications/misc/llpp/fix-build-bash.patch
@@ -1,14 +1,5 @@
-From cccadedfbcb6764a38382154838113a6b2fd4dee Mon Sep 17 00:00:00 2001
-From: Michael Hoang <enzime@users.noreply.github.com>
-Date: Mon, 10 Dec 2018 15:08:01 +1100
-Subject: [PATCH] Patch build.bash for nixpkgs
-
----
- build.bash | 37 ++-----------------------------------
- 1 file changed, 2 insertions(+), 35 deletions(-)
-
 diff --git a/build.bash b/build.bash
-index 1588011..72117d9 100755
+index 7c278b6..41494c5 100755
 --- a/build.bash
 +++ b/build.bash
 @@ -29,7 +29,6 @@ srcd="$(dirname $0)"
@@ -20,10 +11,10 @@ index 1588011..72117d9 100755
  mkdir -p $outd/{$wsid,lablGL}
  :>$outd/ordered
 @@ -39,12 +38,6 @@ isfresh() { test -r "$1.past" && . "$1.past" && test "$k" = "$2"; }
- mbt=native
+ mbt=${mbt:-native}
  mulibs="$mudir/build/$mbt/libmupdf.a" # $mudir/build/$mbt/libmupdf-third.a
  
--keycmd="(cd $mudir && git describe --tags --dirty); digest $mulibs"
+-keycmd="(cd $mudir && make -q build=$mbt libs && echo); digest $mulibs"
 -isfresh "$mulibs" "$(eval $keycmd)" || (
 -    make -C "$mudir" build=$mbt -j $mjobs libs
 -    echo "k='$(eval $keycmd)'" >$mudir/build/$mbt/libmupdf.a.past
@@ -32,12 +23,12 @@ index 1588011..72117d9 100755
  oincs() {
      local i=
      local incs1=
-@@ -90,32 +83,6 @@ mflags() {
+@@ -90,34 +83,6 @@ mflags() {
  }
  
  overs="$(ocamlc -vnum 2>/dev/null)" || overs=""
--test "$overs" = "4.07.0" || {
--    url=https://caml.inria.fr/pub/distrib/ocaml-4.07/ocaml-4.07.0.tar.xz
+-test "$overs" = "4.08" || {
+-    url=https://caml.inria.fr/pub/distrib/ocaml-4.08/ocaml-4.08.0.tar.xz
 -    txz=$outd/$(basename $url)
 -    isfresh $txz $url || {
 -        executable_p() { command -v "$1" >/dev/null 2>&1; }
@@ -54,8 +45,10 @@ index 1588011..72117d9 100755
 -        tar xf $txz -C $outd
 -        bn=$(basename $url)
 -        cd $outd/${bn%.tar.xz}
--        ./configure -prefix $absprefix                                      \
--                    -no-graph -no-debugger -no-ocamldoc -no-native-compiler
+-        ./configure --disable-vmthreads --disable-graph-lib \
+-                    --disable-ocamldoc --enable-debugger=no \
+-                    --disable-flat-float-array              \
+-                    --prefix=$absprefix
 -        make -j $mjobs world
 -        make install
 -        echo "k='$url'" >$absprefix/bin/ocamlc.past
@@ -65,7 +58,7 @@ index 1588011..72117d9 100755
  
  bocaml1() {
      grep -q "$3" $outd/ordered || {
-@@ -224,7 +191,7 @@ bobjc() {
+@@ -227,7 +192,7 @@ bobjc() {
      } && vecho "fresh $o"
  }
  
@@ -74,7 +67,7 @@ index 1588011..72117d9 100755
  
  cmd="(. $srcd/genconfstr.sh >$outd/confstruct.ml)"
  keycmd="digest $srcd/genconfstr.sh $outd/confstruct.ml"
-@@ -278,7 +245,7 @@ for m in ml_gl ml_glarray ml_raw; do
+@@ -281,7 +246,7 @@ for m in ml_gl ml_glarray ml_raw; do
  done
  
  libs="str.cma unix.cma"
@@ -83,6 +76,3 @@ index 1588011..72117d9 100755
  if $darwin; then
      mcomp=$(ocamlc -config | grep bytecomp_c_co | { read _ c; echo $c; })
      clibs="$clibs -framework Cocoa -framework OpenGL"
--- 
-2.19.2
-
-- 
GitLab


From 1fff932e7f9c9fbca12392122a10ef1d03e14450 Mon Sep 17 00:00:00 2001
From: Daniel Fullmer <danielrf12@gmail.com>
Date: Fri, 13 Sep 2019 16:23:47 -0400
Subject: [PATCH 0277/2254] k2pdfopt: Fix patch for mupdf 1.16.1

---
 pkgs/applications/misc/k2pdfopt/default.nix   |   4 +-
 .../misc/k2pdfopt/k2pdfopt-mupdf-1.16.1.patch | 151 ++++++++++++++++++
 pkgs/applications/misc/k2pdfopt/mupdf.patch   |  46 +++---
 3 files changed, 176 insertions(+), 25 deletions(-)
 create mode 100644 pkgs/applications/misc/k2pdfopt/k2pdfopt-mupdf-1.16.1.patch

diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix
index 58bd200e713..a2eba8e08c2 100644
--- a/pkgs/applications/misc/k2pdfopt/default.nix
+++ b/pkgs/applications/misc/k2pdfopt/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     cp -r ${v251a_src}/* $sourceRoot
   '';
 
-  patches = [ ./k2pdfopt.patch ];
+  patches = [ ./k2pdfopt.patch ./k2pdfopt-mupdf-1.16.1.patch ];
 
   nativeBuildInputs = [ cmake pkgconfig ];
 
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
     #  corresponding files in the respective source trees, resolving any errors
     #  with more recent versions of these depencencies, and running diff.
     mupdf_modded = mupdf.overrideAttrs (attrs: {
-      patches = attrs.patches ++ [ ./mupdf.patch ]; # Last verified with mupdf 1.14.0
+      patches = attrs.patches ++ [ ./mupdf.patch ]; # Last verified with mupdf 1.16.1
     });
     leptonica_modded = leptonica.overrideAttrs (attrs: {
       patches = [ ./leptonica.patch ]; # Last verified with leptonica 1.78.0
diff --git a/pkgs/applications/misc/k2pdfopt/k2pdfopt-mupdf-1.16.1.patch b/pkgs/applications/misc/k2pdfopt/k2pdfopt-mupdf-1.16.1.patch
new file mode 100644
index 00000000000..3a9eca30e75
--- /dev/null
+++ b/pkgs/applications/misc/k2pdfopt/k2pdfopt-mupdf-1.16.1.patch
@@ -0,0 +1,151 @@
+diff --git a/willuslib/wmupdf.c b/willuslib/wmupdf.c
+index 81627ef..f14a96c 100644
+--- a/willuslib/wmupdf.c
++++ b/willuslib/wmupdf.c
+@@ -189,8 +189,6 @@ int wmupdf_remake_pdf(char *infile,char *outfile,WPDFPAGEINFO *pageinfo,int use_
+     pdf_write_opts.do_compress=1;
+     pdf_write_opts.do_linear=0;
+     pdf_write_opts.do_garbage=1; /* 2 and 3 don't work for this. */
+-    pdf_write_opts.continue_on_error=0;
+-    pdf_write_opts.errors=NULL;
+     write_failed=0;
+     wpdfpageinfo_sort(pageinfo);
+     xref=NULL;
+@@ -1687,8 +1685,8 @@ WPDFOUTLINE *wpdfoutline_read_from_pdf_file(char *filename)
+         /* Sumatra version of MuPDF v1.4 -- use locally installed fonts */
+         pdf_install_load_system_font_funcs(ctx);
+         fz_try(ctx) { doc=fz_open_document(ctx,filename); }
+-        fz_catch(ctx) 
+-            { 
++        fz_catch(ctx)
++            {
+             fz_drop_context(ctx);
+             return(NULL);
+             }
+@@ -1890,5 +1888,5 @@ static pdf_obj *pdf_new_string_utf8(fz_context *ctx,char *string)
+     willus_mem_free((double **)&utfbuf,funcname);
+     return(pdfobj);
+     }
+-    
++
+ #endif /* HAVE_MUPDF_LIB */
+diff --git a/willuslib/wmupdfinfo.c b/willuslib/wmupdfinfo.c
+index 5c7f38c..9b9e6fd 100644
+--- a/willuslib/wmupdfinfo.c
++++ b/willuslib/wmupdfinfo.c
+@@ -237,23 +237,22 @@ static void showglobalinfo(fz_context *ctx, globals *glo,char *filename)
+         pdf_obj *robj;
+ 
+         robj=pdf_resolve_indirect(ctx,obj);
+-        n=pdf_sprint_obj(ctx,NULL,0,robj,1);
+-        buf=malloc(n+2);
++        buf=pdf_sprint_obj(ctx,NULL,0,&n,robj,1,0);
+         if (buf==NULL)
+             {
+             fz_write_printf(ctx,out,"Info object (%d %d R):\n",pdf_to_num(ctx,obj),pdf_to_gen(ctx,obj));
+-		    pdf_print_obj(ctx,out,robj,1);
++		    pdf_print_obj(ctx,out,robj,1,0);
+             }
+         else
+             {
+-            pdf_sprint_obj(ctx,buf,n+2,robj,1);
++            pdf_sprint_obj(ctx,buf,n+2,&n,robj,1,0);
+             display_pdf_field(ctx,out,buf,"Title","TITLE");
+             display_pdf_field(ctx,out,buf,"CreationDate","CREATED");
+             display_pdf_field(ctx,out,buf,"ModDate","LAST MODIFIED");
+             display_pdf_field(ctx,out,buf,"Producer","PDF PRODUCER");
+             display_pdf_field(ctx,out,buf,"Creator","CREATOR");
+             display_file_size(ctx,out,filename);
+-            free(buf);
++            fz_free(ctx,buf);
+             }
+ 	    }
+     if (glo->dims==1)
+@@ -275,7 +274,7 @@ static void showglobalinfo(fz_context *ctx, globals *glo,char *filename)
+ 	if (obj)
+         {
+ 		fz_write_printf(ctx,out, "\nEncryption object (%d %d R):\n", pdf_to_num(ctx,obj), pdf_to_gen(ctx,obj));
+-		pdf_print_obj(ctx,out, pdf_resolve_indirect(ctx,obj), 1);
++		pdf_print_obj(ctx,out, pdf_resolve_indirect(ctx,obj), 1, 0);
+         }
+     }
+ 
+@@ -396,7 +395,7 @@ gatherdimensions(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_
+ 	if (j < glo->dims)
+ 		return;
+ 
+-	glo->dim = fz_resize_array(ctx, glo->dim, glo->dims+1, sizeof(struct info));
++	glo->dim = fz_realloc_array(ctx, glo->dim, glo->dims+1, struct info);
+ 	glo->dims++;
+ 
+ 	glo->dim[glo->dims - 1].page = page;
+@@ -441,7 +440,7 @@ gatherfonts(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_obj *
+ 		if (k < glo->fonts)
+ 			continue;
+ 
+-		glo->font = fz_resize_array(ctx, glo->font, glo->fonts+1, sizeof(struct info));
++		glo->font = fz_realloc_array(ctx, glo->font, glo->fonts+1, struct info);
+ 		glo->fonts++;
+ 
+ 		glo->font[glo->fonts - 1].page = page;
+@@ -510,7 +509,7 @@ gatherimages(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_obj
+ 		if (k < glo->images)
+ 			continue;
+ 
+-		glo->image = fz_resize_array(ctx, glo->image, glo->images+1, sizeof(struct info));
++		glo->image = fz_realloc_array(ctx, glo->image, glo->images+1, struct info);
+ 		glo->images++;
+ 
+ 		glo->image[glo->images - 1].page = page;
+@@ -568,7 +567,7 @@ gatherforms(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_obj *
+ 		if (k < glo->forms)
+ 			continue;
+ 
+-		glo->form = fz_resize_array(ctx, glo->form, glo->forms+1, sizeof(struct info));
++		glo->form = fz_realloc_array(ctx, glo->form, glo->forms+1, struct info);
+ 		glo->forms++;
+ 
+ 		glo->form[glo->forms - 1].page = page;
+@@ -613,7 +612,7 @@ gatherpsobjs(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_obj
+ 		if (k < glo->psobjs)
+ 			continue;
+ 
+-		glo->psobj = fz_resize_array(ctx, glo->psobj, glo->psobjs+1, sizeof(struct info));
++		glo->psobj = fz_realloc_array(ctx, glo->psobj, glo->psobjs+1, struct info);
+ 		glo->psobjs++;
+ 
+ 		glo->psobj[glo->psobjs - 1].page = page;
+@@ -656,7 +655,7 @@ gathershadings(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_ob
+ 		if (k < glo->shadings)
+ 			continue;
+ 
+-		glo->shading = fz_resize_array(ctx, glo->shading, glo->shadings+1, sizeof(struct info));
++		glo->shading = fz_realloc_array(ctx, glo->shading, glo->shadings+1, struct info);
+ 		glo->shadings++;
+ 
+ 		glo->shading[glo->shadings - 1].page = page;
+@@ -724,7 +723,7 @@ gatherpatterns(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_ob
+ 		if (k < glo->patterns)
+ 			continue;
+ 
+-		glo->pattern = fz_resize_array(ctx, glo->pattern, glo->patterns+1, sizeof(struct info));
++		glo->pattern = fz_realloc_array(ctx, glo->pattern, glo->patterns+1, struct info);
+ 		glo->patterns++;
+ 
+ 		glo->pattern[glo->patterns - 1].page = page;
+@@ -1216,7 +1215,7 @@ void wmupdfinfo_get(char *filename,int *pagelist,char **buf)
+     if (fout==NULL)
+         return;
+     */
+-    
++
+     ctx = fz_new_context(NULL, NULL, FZ_STORE_UNLIMITED);
+     if (!ctx)
+         {
+@@ -1307,5 +1306,5 @@ static void date_convert(char *dst,char *src)
+     else if (src[i]!='\0')
+         sprintf(&dst[strlen(dst)]," %s",&src[i]);
+     }
+-    
++
+ #endif /* HAVE_MUPDF_LIB */
diff --git a/pkgs/applications/misc/k2pdfopt/mupdf.patch b/pkgs/applications/misc/k2pdfopt/mupdf.patch
index f7c04d42a71..0c59a1d2016 100644
--- a/pkgs/applications/misc/k2pdfopt/mupdf.patch
+++ b/pkgs/applications/misc/k2pdfopt/mupdf.patch
@@ -1,4 +1,4 @@
-From 3d763f84872351c250ffea26150e73b02b8f4c6f Mon Sep 17 00:00:00 2001
+From d8927c969e3387ca2669a616c0ba53bce918a031 Mon Sep 17 00:00:00 2001
 From: Daniel Fullmer <danielrf12@gmail.com>
 Date: Fri, 13 Sep 2019 15:11:45 -0400
 Subject: [PATCH] Willus mod for k2pdfopt
@@ -904,10 +904,10 @@ index 000000000..45de8cfd3
 +#endif
 +}
 diff --git a/source/fitz/font.c b/source/fitz/font.c
-index 733d91dae..69c46d968 100644
+index 00c6e8f99..1448b4a56 100644
 --- a/source/fitz/font.c
 +++ b/source/fitz/font.c
-@@ -5,8 +5,11 @@
+@@ -4,8 +4,11 @@
  #include "draw-imp.h"
  
  #include <ft2build.h>
@@ -920,13 +920,13 @@ index 733d91dae..69c46d968 100644
  #include <assert.h>
  
 diff --git a/source/fitz/stext-device.c b/source/fitz/stext-device.c
-index 0ba944d44..3c05c51ac 100644
+index 2df90305e..b1f99e056 100644
 --- a/source/fitz/stext-device.c
 +++ b/source/fitz/stext-device.c
-@@ -692,6 +692,11 @@ fz_new_stext_device(fz_context *ctx, fz_stext_page *page, const fz_stext_options
- 	dev->trm = fz_identity;
+@@ -825,6 +825,11 @@ fz_new_stext_device(fz_context *ctx, fz_stext_page *page, const fz_stext_options
  	dev->lastchar = ' ';
  	dev->curdir = 1;
+ 	dev->lasttext = NULL;
 +    /* willus mod -- seems like this should be here, but not sure. */
 +    if (opts)
 +        dev->flags = opts->flags;
@@ -936,11 +936,11 @@ index 0ba944d44..3c05c51ac 100644
  	return (fz_device*)dev;
  }
 diff --git a/source/fitz/string.c b/source/fitz/string.c
-index e70ae6e6e..b310463f4 100644
+index f8eedb682..7a767983d 100644
 --- a/source/fitz/string.c
 +++ b/source/fitz/string.c
-@@ -448,6 +448,10 @@ fz_utflen(const char *s)
- 
+@@ -560,6 +560,10 @@ fz_utflen(const char *s)
+ */
  float fz_atof(const char *s)
  {
 +/* willus mod: atof(s), #if-#else-#endif */
@@ -949,20 +949,20 @@ index e70ae6e6e..b310463f4 100644
 +#else
  	float result;
  
- 	errno = 0;
-@@ -457,6 +461,7 @@ float fz_atof(const char *s)
+ 	if (s == NULL)
+@@ -572,6 +576,7 @@ float fz_atof(const char *s)
  		return 1;
  	result = fz_clamp(result, -FLT_MAX, FLT_MAX);
  	return result;
 +#endif
  }
  
- int fz_atoi(const char *s)
+ /*
 diff --git a/source/pdf/pdf-annot.c b/source/pdf/pdf-annot.c
-index 68de8898a..5d43485bd 100644
+index 4dfdf36fe..acff7d12a 100644
 --- a/source/pdf/pdf-annot.c
 +++ b/source/pdf/pdf-annot.c
-@@ -4,8 +4,20 @@
+@@ -5,8 +5,20 @@
  #include <string.h>
  #include <time.h>
  
@@ -983,12 +983,12 @@ index 68de8898a..5d43485bd 100644
 +    }
  #endif
  
- #define TEXT_ANNOT_SIZE (25.0f)
+ #define isdigit(c) (c >= '0' && c <= '9')
 diff --git a/source/pdf/pdf-link.c b/source/pdf/pdf-link.c
-index ae5beaa35..b5a52a000 100644
+index 37444b471..613cc05b9 100644
 --- a/source/pdf/pdf-link.c
 +++ b/source/pdf/pdf-link.c
-@@ -351,6 +351,9 @@ pdf_resolve_link(fz_context *ctx, pdf_document *doc, const char *uri, float *xp,
+@@ -345,6 +345,9 @@ pdf_resolve_link(fz_context *ctx, pdf_document *doc, const char *uri, float *xp,
  		}
  		return page;
  	}
@@ -999,10 +999,10 @@ index ae5beaa35..b5a52a000 100644
  	return -1;
  }
 diff --git a/source/pdf/pdf-parse.c b/source/pdf/pdf-parse.c
-index 501c5626a..927ba6cd5 100644
+index 04a772204..9dd0cd898 100644
 --- a/source/pdf/pdf-parse.c
 +++ b/source/pdf/pdf-parse.c
-@@ -586,9 +586,14 @@ pdf_parse_ind_obj(fz_context *ctx, pdf_document *doc,
+@@ -663,9 +663,14 @@ pdf_parse_ind_obj(fz_context *ctx, pdf_document *doc,
  			if (c == '\r')
  			{
  				c = fz_peek_byte(ctx, file);
@@ -1018,10 +1018,10 @@ index 501c5626a..927ba6cd5 100644
  			}
  			stm_ofs = fz_tell(ctx, file);
 diff --git a/source/pdf/pdf-xref.c b/source/pdf/pdf-xref.c
-index 2475b6e86..bc163563a 100644
+index 8f888059b..08de7bfba 100644
 --- a/source/pdf/pdf-xref.c
 +++ b/source/pdf/pdf-xref.c
-@@ -707,8 +707,11 @@ pdf_xref_size_from_old_trailer(fz_context *ctx, pdf_document *doc, pdf_lexbuf *b
+@@ -710,8 +710,11 @@ pdf_xref_size_from_old_trailer(fz_context *ctx, pdf_document *doc, pdf_lexbuf *b
  		if (!s)
  			fz_throw(ctx, FZ_ERROR_GENERIC, "xref subsection length missing");
  		len = fz_atoi(fz_strsep(&s, " "));
@@ -1033,7 +1033,7 @@ index 2475b6e86..bc163563a 100644
  
  		/* broken pdfs where the section is not on a separate line */
  		if (s && *s != '\0')
-@@ -1372,7 +1375,10 @@ pdf_init_document(fz_context *ctx, pdf_document *doc)
+@@ -1378,7 +1381,10 @@ pdf_init_document(fz_context *ctx, pdf_document *doc)
  	{
  		pdf_drop_xref_sections(ctx, doc);
  		fz_rethrow_if(ctx, FZ_ERROR_TRYLATER);
@@ -1044,7 +1044,7 @@ index 2475b6e86..bc163563a 100644
  		repaired = 1;
  	}
  
-@@ -1496,7 +1502,10 @@ pdf_drop_document_imp(fz_context *ctx, pdf_document *doc)
+@@ -1506,7 +1512,10 @@ pdf_drop_document_imp(fz_context *ctx, pdf_document *doc)
  		/* Swallow error, but continue dropping */
  	}
  
-- 
GitLab


From f76c818bb0c917a2651aacd7a31ecfa96beabf5a Mon Sep 17 00:00:00 2001
From: "Evan.Stoll" <evan.stoll@rjginc.com>
Date: Sat, 14 Sep 2019 18:16:45 -0400
Subject: [PATCH 0278/2254] vimPlugins: Update

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

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 812fbfab98d..9e505558d5e 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -923,12 +923,12 @@ let
 
   deoplete-nvim = buildVimPluginFrom2Nix {
     pname = "deoplete-nvim";
-    version = "2019-09-09";
+    version = "2019-09-14";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "deoplete.nvim";
-      rev = "48b1643509e4ef3a4af6cf57df35e6c6ac1275ce";
-      sha256 = "192lph0kbs4mmbsz1jsjmrmy3an53bkd4lzyvn615r24qfbpcz14";
+      rev = "8df5ca1a9db11d919f3426f4d05b281be8913c89";
+      sha256 = "0c0g9h8fajmwb2snkqj093jwc8d1ypxcvmv7s80c90l635bks1yj";
     };
   };
 
@@ -1752,12 +1752,12 @@ let
 
   neosnippet-vim = buildVimPluginFrom2Nix {
     pname = "neosnippet-vim";
-    version = "2019-05-26";
+    version = "2019-09-14";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "neosnippet.vim";
-      rev = "ed80ae8cee732d52eb841d509a95aca9c27ece7a";
-      sha256 = "1xkq4w8mz9rfh6xpiqa1rnzd9id59d1bn58pw2fhcrm04cr3rk49";
+      rev = "3838f45930e8d6c05807c925350585c48bd21a4b";
+      sha256 = "1m6skrdjr6d1waxarxch2hn7416q9r13yan1bd7qx2w5gika606a";
     };
   };
 
@@ -2137,12 +2137,12 @@ let
 
   riv-vim = buildVimPluginFrom2Nix {
     pname = "riv-vim";
-    version = "2019-02-18";
+    version = "2019-09-14";
     src = fetchFromGitHub {
       owner = "Rykka";
       repo = "riv.vim";
-      rev = "ac64a8c8daaa862b83d27432fe87c79ad2a0c845";
-      sha256 = "0vvpp04n7ndcljrfa0m4hwvv9h20abgwr29fzv5qnasvcxcsawcq";
+      rev = "87a1f2c1e487ee0021855fd0c65c3f3244f4fc61";
+      sha256 = "13430czv87r16wcyb2f8izfihkhm2q6k1ki5bhzpbakzk7vwxwms";
     };
   };
 
@@ -3116,12 +3116,12 @@ let
 
   vim-devicons = buildVimPluginFrom2Nix {
     pname = "vim-devicons";
-    version = "2019-08-18";
+    version = "2019-09-14";
     src = fetchFromGitHub {
       owner = "ryanoasis";
       repo = "vim-devicons";
-      rev = "830f0fe48a337ed26384c43929032786f05c8d24";
-      sha256 = "06lsb8lwdbb6l0nznmxb9akd4ss9cw76d03z9h4q9yfjydyqf5kn";
+      rev = "3e67b21c6e6f955ee5051608c559c2e91c2ce3e5";
+      sha256 = "0105s1d1pn1ga2zpqi1lgjnx36plgfsniqx1b560dvmg8wglzpwx";
     };
   };
 
-- 
GitLab


From 9d392dec79e065566eed05d9356581bd563149ca Mon Sep 17 00:00:00 2001
From: "Evan.Stoll" <evan.stoll@rjginc.com>
Date: Sat, 14 Sep 2019 18:20:27 -0400
Subject: [PATCH 0279/2254] vimPlugins.vim-illuminate: init at 2019-08-04

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

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 9e505558d5e..5d7f1958f9f 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -3598,6 +3598,17 @@ let
     };
   };
 
+  vim-illuminate = buildVimPluginFrom2Nix {
+    pname = "vim-illuminate";
+    version = "2019-08-04";
+    src = fetchFromGitHub {
+      owner = "RRethy";
+      repo = "vim-illuminate";
+      rev = "0c37ddf0dfbe069b9f2cf1d4a341efe7b373f133";
+      sha256 = "11zjm9a6x57s5rs080p1gcj86l01765ayn3k9yx6mx8d48n8zr3k";
+    };
+  };
+
   vim-indent-guides = buildVimPluginFrom2Nix {
     pname = "vim-indent-guides";
     version = "2018-05-14";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 1395147ff72..73aef96caf6 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -324,6 +324,7 @@ rodjek/vim-puppet
 roxma/nvim-cm-racer
 roxma/nvim-completion-manager
 roxma/nvim-yarp
+RRethy/vim-illuminate
 rust-lang/rust.vim
 ryanoasis/vim-devicons
 Rykka/riv.vim
-- 
GitLab


From 991c0e1618a82c5d09a030f72479d6bba4cdf468 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sun, 15 Sep 2019 10:48:07 +0200
Subject: [PATCH 0280/2254] treewide: mark packages as buildable on darwin (PR
 #45364)

vcunat amended the commit a bit; see the PR for details/discussion.
---
 pkgs/applications/science/math/giac/default.nix               | 4 +---
 pkgs/applications/science/math/lrcalc/default.nix             | 2 +-
 pkgs/applications/science/math/nauty/default.nix              | 2 +-
 pkgs/applications/science/math/pynac/default.nix              | 2 +-
 pkgs/applications/science/math/singular/default.nix           | 2 +-
 pkgs/development/compilers/ecl/16.1.2.nix                     | 2 +-
 pkgs/development/libraries/arb/default.nix                    | 2 +-
 pkgs/development/libraries/fplll/default.nix                  | 2 +-
 pkgs/development/libraries/iml/default.nix                    | 2 +-
 pkgs/development/libraries/mpfi/default.nix                   | 2 +-
 pkgs/development/libraries/science/math/brial/default.nix     | 2 +-
 pkgs/development/libraries/science/math/cliquer/default.nix   | 2 +-
 pkgs/development/libraries/science/math/m4ri/default.nix      | 2 +-
 pkgs/development/libraries/science/math/m4rie/default.nix     | 2 +-
 pkgs/development/libraries/science/math/rankwidth/default.nix | 2 +-
 pkgs/development/libraries/science/math/rubiks/default.nix    | 2 +-
 pkgs/development/python-modules/cvxopt/default.nix            | 1 -
 17 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/pkgs/applications/science/math/giac/default.nix b/pkgs/applications/science/math/giac/default.nix
index ad82d7572e3..90b1b367a7c 100644
--- a/pkgs/applications/science/math/giac/default.nix
+++ b/pkgs/applications/science/math/giac/default.nix
@@ -104,9 +104,7 @@ stdenv.mkDerivation rec {
     description = "A free computer algebra system (CAS)";
     homepage = "https://www-fourier.ujf-grenoble.fr/~parisse/giac.html";
     license = licenses.gpl3Plus;
-    ## xcas is buildable on darwin but there are specific instructions I could
-    ## not test
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = [ maintainers.symphorien ];
   };
 }
diff --git a/pkgs/applications/science/math/lrcalc/default.nix b/pkgs/applications/science/math/lrcalc/default.nix
index eecb37dd743..f407358d8f2 100644
--- a/pkgs/applications/science/math/lrcalc/default.nix
+++ b/pkgs/applications/science/math/lrcalc/default.nix
@@ -35,6 +35,6 @@ stdenv.mkDerivation rec {
     homepage = http://math.rutgers.edu/~asbuch/lrcalc/;
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ timokau ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/applications/science/math/nauty/default.nix b/pkgs/applications/science/math/nauty/default.nix
index bd116b02e29..e9c8b688fb9 100644
--- a/pkgs/applications/science/math/nauty/default.nix
+++ b/pkgs/applications/science/math/nauty/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     description = ''Programs for computing automorphism groups of graphs and digraphs'';
     license = licenses.asl20;
     maintainers = with maintainers; [ raskin timokau ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     homepage = http://pallini.di.uniroma1.it/;
   };
 }
diff --git a/pkgs/applications/science/math/pynac/default.nix b/pkgs/applications/science/math/pynac/default.nix
index 75a46bb182a..05c0c0e8ec6 100644
--- a/pkgs/applications/science/math/pynac/default.nix
+++ b/pkgs/applications/science/math/pynac/default.nix
@@ -43,6 +43,6 @@ stdenv.mkDerivation rec {
     homepage    = http://pynac.org;
     license = licenses.gpl3;
     maintainers = with maintainers; [ timokau ];
-    platforms   = platforms.linux;
+    platforms   = platforms.unix;
   };
 }
diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix
index ccb139203ac..fccd1489e11 100644
--- a/pkgs/applications/science/math/singular/default.nix
+++ b/pkgs/applications/science/math/singular/default.nix
@@ -110,7 +110,7 @@ stdenv.mkDerivation rec {
     description = "A CAS for polynomial computations";
     maintainers = with maintainers; [ raskin timokau ];
     # 32 bit x86 fails with some link error: `undefined reference to `__divmoddi4@GCC_7.0.0'`
-    platforms = subtractLists platforms.i686 platforms.linux;
+    platforms = subtractLists platforms.i686 platforms.unix;
     license = licenses.gpl3; # Or GPLv2 at your option - but not GPLv4
     homepage = http://www.singular.uni-kl.de;
     downloadPage = "http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/";
diff --git a/pkgs/development/compilers/ecl/16.1.2.nix b/pkgs/development/compilers/ecl/16.1.2.nix
index c27f2a22670..bede9fa4aa6 100644
--- a/pkgs/development/compilers/ecl/16.1.2.nix
+++ b/pkgs/development/compilers/ecl/16.1.2.nix
@@ -78,6 +78,6 @@ stdenv.mkDerivation {
     description = "Lisp implementation aiming to be small, fast and easy to embed";
     license = stdenv.lib.licenses.mit ;
     maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/arb/default.nix b/pkgs/development/libraries/arb/default.nix
index d3e18aa776f..0e24d556b1a 100644
--- a/pkgs/development/libraries/arb/default.nix
+++ b/pkgs/development/libraries/arb/default.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
     description = ''A library for arbitrary-precision interval arithmetic'';
     license = stdenv.lib.licenses.lgpl21Plus;
     maintainers = with maintainers; [ raskin timokau ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/fplll/default.nix b/pkgs/development/libraries/fplll/default.nix
index a70e9934520..c2952cb47f1 100644
--- a/pkgs/development/libraries/fplll/default.nix
+++ b/pkgs/development/libraries/fplll/default.nix
@@ -17,6 +17,6 @@ stdenv.mkDerivation rec {
     description = ''Lattice algorithms using floating-point arithmetic'';
     license = stdenv.lib.licenses.lgpl21Plus;
     maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/iml/default.nix b/pkgs/development/libraries/iml/default.nix
index 5ad3e249fc3..2b85f12115b 100644
--- a/pkgs/development/libraries/iml/default.nix
+++ b/pkgs/development/libraries/iml/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     description = ''Algorithms for computing exact solutions to dense systems of linear equations over the integers'';
     license = stdenv.lib.licenses.gpl2Plus;
     maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
     homepage = https://cs.uwaterloo.ca/~astorjoh/iml.html;
     updateWalker = true;
   };
diff --git a/pkgs/development/libraries/mpfi/default.nix b/pkgs/development/libraries/mpfi/default.nix
index baefab487e5..fe46336649e 100644
--- a/pkgs/development/libraries/mpfi/default.nix
+++ b/pkgs/development/libraries/mpfi/default.nix
@@ -17,6 +17,6 @@ stdenv.mkDerivation rec {
     homepage = https://gforge.inria.fr/projects/mpfi/;
     license = stdenv.lib.licenses.lgpl21Plus;
     maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/science/math/brial/default.nix b/pkgs/development/libraries/science/math/brial/default.nix
index bc276b9923c..f08f6425655 100644
--- a/pkgs/development/libraries/science/math/brial/default.nix
+++ b/pkgs/development/libraries/science/math/brial/default.nix
@@ -41,6 +41,6 @@ stdenv.mkDerivation rec {
     description = "Legacy version of PolyBoRi maintained by sagemath developers";
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ timokau ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/science/math/cliquer/default.nix b/pkgs/development/libraries/science/math/cliquer/default.nix
index 5193c2db5c5..08f821dcb2c 100644
--- a/pkgs/development/libraries/science/math/cliquer/default.nix
+++ b/pkgs/development/libraries/science/math/cliquer/default.nix
@@ -33,6 +33,6 @@ stdenv.mkDerivation rec {
     '';
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ timokau ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/science/math/m4ri/default.nix b/pkgs/development/libraries/science/math/m4ri/default.nix
index b8c4fa67148..764901adf7b 100644
--- a/pkgs/development/libraries/science/math/m4ri/default.nix
+++ b/pkgs/development/libraries/science/math/m4ri/default.nix
@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
     description = "Library to do fast arithmetic with dense matrices over F_2";
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ timokau ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/science/math/m4rie/default.nix b/pkgs/development/libraries/science/math/m4rie/default.nix
index 6a664b1dfff..6a91230002a 100644
--- a/pkgs/development/libraries/science/math/m4rie/default.nix
+++ b/pkgs/development/libraries/science/math/m4rie/default.nix
@@ -34,6 +34,6 @@ stdenv.mkDerivation rec {
     '';
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ timokau ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/science/math/rankwidth/default.nix b/pkgs/development/libraries/science/math/rankwidth/default.nix
index 66c573245db..ded7b7dc90a 100644
--- a/pkgs/development/libraries/science/math/rankwidth/default.nix
+++ b/pkgs/development/libraries/science/math/rankwidth/default.nix
@@ -22,6 +22,6 @@ stdenv.mkDerivation rec {
     description = "Calculates rank-width and rank-decompositions";
     license = with licenses; [ gpl2Plus ];
     maintainers = with maintainers; [ timokau ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/science/math/rubiks/default.nix b/pkgs/development/libraries/science/math/rubiks/default.nix
index 207406388e0..3b2ddc6f06c 100644
--- a/pkgs/development/libraries/science/math/rubiks/default.nix
+++ b/pkgs/development/libraries/science/math/rubiks/default.nix
@@ -76,6 +76,6 @@ stdenv.mkDerivation rec {
       mit # Dik T. Winter's software
     ];
     maintainers = with maintainers; [ timokau ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/python-modules/cvxopt/default.nix b/pkgs/development/python-modules/cvxopt/default.nix
index 4847d57b67b..201c8ccda70 100644
--- a/pkgs/development/python-modules/cvxopt/default.nix
+++ b/pkgs/development/python-modules/cvxopt/default.nix
@@ -65,7 +65,6 @@ buildPythonPackage rec {
       programming language.
     '';
     maintainers = with maintainers; [ edwtjo ];
-    broken = stdenv.targetPlatform.isDarwin;
     license = licenses.gpl3Plus;
   };
 }
-- 
GitLab


From 1743fc5e4d7cd0e24034c6543210fef98f715542 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 15 Sep 2019 04:20:00 -0500
Subject: [PATCH 0281/2254] diff-pdf: 2017-12-30 -> 0.3

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

diff --git a/pkgs/applications/misc/diff-pdf/default.nix b/pkgs/applications/misc/diff-pdf/default.nix
index 0016f89746d..af47afcc601 100644
--- a/pkgs/applications/misc/diff-pdf/default.nix
+++ b/pkgs/applications/misc/diff-pdf/default.nix
@@ -7,15 +7,15 @@ let
     else
       [ wxGTK ];
 in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "diff-pdf";
-  version = "2017-12-30";
+  version = "0.3";
 
   src = fetchFromGitHub {
     owner = "vslavik";
     repo = "diff-pdf";
-    rev = "c4d67226ec4c29b30a7399e75f80636ff8a6f9fc";
-    sha256 = "1c3ig7ckrg37p5vzvgjnsfdzdad328wwsx0r31lbs1d8pkjkgq3m";
+    rev = "v${version}";
+    sha256 = "0vzvyjpk6m89zs6j1dq85f93n2b1i6akn2g0z9qhagjd2pds920i";
   };
 
   nativeBuildInputs = [ autoconf automake pkgconfig ];
@@ -24,9 +24,10 @@ stdenv.mkDerivation {
   preConfigure = "./bootstrap";
 
   meta = with stdenv.lib; {
-    homepage = http://vslavik.github.io/diff-pdf;
+    homepage = "https://vslavik.github.io/diff-pdf/";
     description = "Simple tool for visually comparing two PDF files";
     license = licenses.gpl2;
+    platforms = platforms.all;
     maintainers = with maintainers; [ dtzWill ];
   };
 }
-- 
GitLab


From 2631b963cd03ea49cd427909597212cb46841a6a Mon Sep 17 00:00:00 2001
From: "Evan.Stoll" <evan.stoll@rjginc.com>
Date: Sat, 14 Sep 2019 18:00:01 -0400
Subject: [PATCH 0282/2254] vimPlugins.colorizer: init at 2018-06-16

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

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 5d7f1958f9f..c82e7dcf8d4 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -609,6 +609,17 @@ let
     };
   };
 
+  colorizer = buildVimPluginFrom2Nix {
+    pname = "colorizer";
+    version = "2018-06-16";
+    src = fetchFromGitHub {
+      owner = "lilydjwg";
+      repo = "colorizer";
+      rev = "afc1491e5b9c36305ce710bdad2b48f069141183";
+      sha256 = "1dpiv9z8h6196acncyjhzd1qa56y17468fpxbfzrx5q2266sajc7";
+    };
+  };
+
   Colour-Sampler-Pack = buildVimPluginFrom2Nix {
     pname = "Colour-Sampler-Pack";
     version = "2012-11-30";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 73aef96caf6..67dd2db4a9f 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -174,6 +174,7 @@ lepture/vim-jinja
 lervag/vimtex
 lfilho/cosco.vim
 lifepillar/vim-mucomplete
+lilydjwg/colorizer
 LnL7/vim-nix
 LucHermitte/lh-brackets
 LucHermitte/lh-vim-lib
-- 
GitLab


From fa76f1f11c7021e16a57d8f4d9be2659d9345afe Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Sun, 15 Sep 2019 09:34:39 +0300
Subject: [PATCH 0283/2254] pythonPackages.XlsxWriter: 1.2.0 -> 1.2.1

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

diff --git a/pkgs/development/python-modules/XlsxWriter/default.nix b/pkgs/development/python-modules/XlsxWriter/default.nix
index b524cb0c6b3..679725db307 100644
--- a/pkgs/development/python-modules/XlsxWriter/default.nix
+++ b/pkgs/development/python-modules/XlsxWriter/default.nix
@@ -3,7 +3,7 @@
 buildPythonPackage rec {
 
   pname = "XlsxWriter";
-  version = "1.2.0";
+  version = "1.2.1";
 
   # PyPI release tarball doesn't contain tests so let's use GitHub. See:
   # https://github.com/jmcnamara/XlsxWriter/issues/327
@@ -11,7 +11,7 @@ buildPythonPackage rec {
     owner = "jmcnamara";
     repo = pname;
     rev = "RELEASE_${version}";
-    sha256 = "0w9ggzi887w4z6i5mz24kcy7qbkd4d7gycqi0dhqgaj9lzxh7jjh";
+    sha256 = "0br8ib9n17dfprfly93mjkhdhpndb7i4g57lwscvp2s69ssql32s";
   };
 
   meta = {
-- 
GitLab


From fc7374176fbb39891731a2453fd82ad5a67c286e Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sun, 15 Sep 2019 11:33:09 +0200
Subject: [PATCH 0284/2254] liblapack: build LAPACKE C api

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

diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix
index 5a62578481c..82e12cd57b3 100644
--- a/pkgs/development/libraries/science/math/liblapack/default.nix
+++ b/pkgs/development/libraries/science/math/liblapack/default.nix
@@ -25,6 +25,7 @@ stdenv.mkDerivation {
   cmakeFlags = [
     "-DUSE_OPTIMIZED_BLAS=ON"
     "-DCMAKE_Fortran_FLAGS=-fPIC"
+    "-DLAPACKE=ON"
   ]
   ++ (optional shared "-DBUILD_SHARED_LIBS=ON");
 
-- 
GitLab


From ecd20d2166ddd4f7d846518e5c794dccb9437f40 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sun, 15 Sep 2019 11:34:04 +0200
Subject: [PATCH 0285/2254] liblapack: remove optimized blas flag.

This cmake flag has no effect since no external blas
library is provided in the build inputs.
---
 pkgs/development/libraries/science/math/liblapack/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix
index 82e12cd57b3..076376dc3c1 100644
--- a/pkgs/development/libraries/science/math/liblapack/default.nix
+++ b/pkgs/development/libraries/science/math/liblapack/default.nix
@@ -23,7 +23,6 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ python2 ];
 
   cmakeFlags = [
-    "-DUSE_OPTIMIZED_BLAS=ON"
     "-DCMAKE_Fortran_FLAGS=-fPIC"
     "-DLAPACKE=ON"
   ]
-- 
GitLab


From c860babfe6a512aa7c7e83751547347a137ecd67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sun, 15 Sep 2019 13:17:37 +0200
Subject: [PATCH 0286/2254] redo-apenwarr: fixup a hard evaluation error on
 Darwin

---
 pkgs/development/tools/build-managers/redo-apenwarr/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/build-managers/redo-apenwarr/default.nix b/pkgs/development/tools/build-managers/redo-apenwarr/default.nix
index 83f87ac9661..d25367c3e57 100644
--- a/pkgs/development/tools/build-managers/redo-apenwarr/default.nix
+++ b/pkgs/development/tools/build-managers/redo-apenwarr/default.nix
@@ -41,7 +41,7 @@ in stdenv.mkDerivation rec {
       --replace "/bin/ls" "ls"
 
     substituteInPlace t/110-compile/hello.o.do \
-      --replace "/usr/include" "${stdenv.cc.libc.dev}/include"
+      --replace "/usr/include" "${stdenv.lib.getDev stdenv.cc.libc}/include"
 
     substituteInPlace t/200-shell/nonshelltest.do \
       --replace "/usr/bin/env perl" "${perl}/bin/perl"
-- 
GitLab


From a613c4a0089d64033bffa8052a1a5cc7cb829921 Mon Sep 17 00:00:00 2001
From: Thomas Kerber <tk@drwx.org>
Date: Sun, 15 Sep 2019 13:22:04 +0100
Subject: [PATCH 0287/2254] chmlib: 0.4 -> 0.4a

---
 pkgs/development/libraries/chmlib/default.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/chmlib/default.nix b/pkgs/development/libraries/chmlib/default.nix
index fbefee48d5b..4f4af87227f 100644
--- a/pkgs/development/libraries/chmlib/default.nix
+++ b/pkgs/development/libraries/chmlib/default.nix
@@ -1,17 +1,21 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "chmlib-0.40";
+  name = "chmlib-0.40a";
 
-  src = fetchurl {
-    url = "${meta.homepage}/${name}.tar.bz2";
-    sha256 = "18zzb4x3z0d7fjh1x5439bs62dmgsi4c1pg3qyr7h5gp1i5xcj9l";
+  src = fetchFromGitHub {
+    owner = "jedwing";
+    repo = "CHMLib";
+    rev = "2bef8d063ec7d88a8de6fd9f0513ea42ac0fa21f";
+    sha256 = "1hah0nw0l05npva2r35ywwd0kzyiiz4vamghm6d71h8170iva6m9";
   };
 
+  nativeBuildInputs = [ autoreconfHook ];
+
   meta = {
     homepage = http://www.jedrea.com/chmlib;
     license = stdenv.lib.licenses.lgpl2;
     description = "A library for dealing with Microsoft ITSS/CHM format files";
-    platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"];
+    platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux"];
   };
 }
-- 
GitLab


From 6e66cf0f6b4f2ca5c08fc75390f6554e5530208e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sun, 15 Sep 2019 14:40:47 +0200
Subject: [PATCH 0288/2254] giflib_5_1: remove the alias (appears unused)

In 3605f128 I somehow forgot about the 5.1 names that now don't make
sense anymore.  I can't see any evidence of _5_1 alias ever being used
or (potentially) useful; _5 might make sense, but for now I couldn't
see why add it.
---
 pkgs/development/libraries/giflib/{5.1.nix => default.nix} | 0
 pkgs/top-level/all-packages.nix                            | 3 +--
 2 files changed, 1 insertion(+), 2 deletions(-)
 rename pkgs/development/libraries/giflib/{5.1.nix => default.nix} (100%)

diff --git a/pkgs/development/libraries/giflib/5.1.nix b/pkgs/development/libraries/giflib/default.nix
similarity index 100%
rename from pkgs/development/libraries/giflib/5.1.nix
rename to pkgs/development/libraries/giflib/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b2d0de4b432..7c1d06e9f76 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12404,9 +12404,8 @@ in
 
   libwhereami = callPackage ../development/libraries/libwhereami { };
 
-  giflib = giflib_5_1;
   giflib_4_1 = callPackage ../development/libraries/giflib/4.1.nix { };
-  giflib_5_1 = callPackage ../development/libraries/giflib/5.1.nix { };
+  giflib     = callPackage ../development/libraries/giflib { };
 
   libunarr = callPackage ../development/libraries/libunarr { };
 
-- 
GitLab


From 2e87260fafdd3d18aa1719246fd704b35e55b0f2 Mon Sep 17 00:00:00 2001
From: Lucio Delelis <ldelelis@est.frba.utn.edu.ar>
Date: Sat, 14 Sep 2019 20:02:12 -0300
Subject: [PATCH 0289/2254] tmuxPlugins.sysstat: init at 2017-12-12

---
 pkgs/misc/tmux-plugins/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix
index 8d885cbf516..0fa80322d7b 100644
--- a/pkgs/misc/tmux-plugins/default.nix
+++ b/pkgs/misc/tmux-plugins/default.nix
@@ -225,6 +225,16 @@ in rec {
     };
   };
 
+  sysstat = mkDerivation {
+    pluginName = "sysstat";
+    src = fetchFromGitHub {
+      owner = "samoshkin";
+      repo = "tmux-plugin-sysstat";
+      rev = "29e150f403151f2341f3abcb2b2487a5f011dd23";
+      sha256 = "013mv9p6r2r0ls3p60l8hdad4hm8niv3wr27vgm925gxmibi4hyq";
+    };
+  };
+
   tmux-colors-solarized = mkDerivation {
     pluginName = "tmuxcolors";
     src = fetchFromGitHub {
-- 
GitLab


From 60516726c16def4866654e8119447d8557b3e5f1 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Sat, 14 Sep 2019 18:31:37 +0200
Subject: [PATCH 0290/2254] lidarr: 0.6.2.883 -> 0.7.1.1381

Changelogs:
 - https://github.com/lidarr/Lidarr/releases/tag/v0.7.0.1347
 - https://github.com/lidarr/Lidarr/releases/tag/v0.7.1.1381
---
 pkgs/servers/lidarr/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/lidarr/default.nix b/pkgs/servers/lidarr/default.nix
index 43ddc5f7b0f..e70fc685161 100644
--- a/pkgs/servers/lidarr/default.nix
+++ b/pkgs/servers/lidarr/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "lidarr";
-  version = "0.6.2.883";
+  version = "0.7.1.1381";
 
   src = fetchurl {
-    url = "https://github.com/lidarr/Lidarr/releases/download/v${version}/Lidarr.develop.${version}.linux.tar.gz";
-    sha256 = "0096j2vph739h288vnz481nrwaq540faplir394xqfz7ik0krg4v";
+    url = "https://github.com/lidarr/Lidarr/releases/download/v${version}/Lidarr.master.${version}.linux.tar.gz";
+    sha256 = "1vk1rlsb48ckdc4421a2qs0v5gy7kc4fad24dm3k14znh7llwypr";
   };
 
   buildInputs = [
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
     mkdir -p $out/bin
     cp -r * $out/bin/
 
-    # Mark all executable files as non-executable
-    find $out/bin -type f -executable | xargs chmod -x
+    # Mark main executable as executable
+    chmod +x $out/bin/Lidarr.exe
 
     makeWrapper "${mono}/bin/mono" $out/bin/Lidarr \
       --add-flags "$out/bin/Lidarr.exe" \
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A Usenet/BitTorrent music downloader";
-    homepage = https://lidarr.audio/;
+    homepage = "https://lidarr.audio/";
     license = licenses.gpl3;
     maintainers = [ maintainers.etu ];
     platforms = platforms.all;
-- 
GitLab


From d26fe3694073ba82f428b9aef36d5b2acf422392 Mon Sep 17 00:00:00 2001
From: koral <chahine.moreau@gmail.com>
Date: Sat, 14 Sep 2019 19:18:14 +0200
Subject: [PATCH 0291/2254] dtc: 1.5.0 -> 1.5.1

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

diff --git a/pkgs/development/compilers/dtc/default.nix b/pkgs/development/compilers/dtc/default.nix
index ea305cc5c84..6c47cbcd3a5 100644
--- a/pkgs/development/compilers/dtc/default.nix
+++ b/pkgs/development/compilers/dtc/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "dtc";
-  version = "1.5.0";
+  version = "1.5.1";
 
   src = fetchgit {
     url = "https://git.kernel.org/pub/scm/utils/dtc/dtc.git";
     rev = "refs/tags/v${version}";
-    sha256 = "075gj8bbahfdb8dlif3d2dpzjrkyf3bwbcmx96zpwhlgs0da8jxh";
+    sha256 = "1jhhfrg22h53lvm2lqhd66pyk20pil08ry03wcwyx1c3ln27k73z";
   };
 
   nativeBuildInputs = [ flex bison pkgconfig swig which ];
-- 
GitLab


From 5856dc86ac92233e454b026f2d967c5697f45af4 Mon Sep 17 00:00:00 2001
From: Nick Spinale <nick@nickspinale.com>
Date: Wed, 9 Jan 2019 16:45:29 +0000
Subject: [PATCH 0292/2254] bridge-utils: fix cross-compilation

---
 .../linux/bridge-utils/autoconf-ar.patch      | 25 +++++++++++++++++++
 .../linux/bridge-utils/default.nix            |  7 +++---
 2 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/os-specific/linux/bridge-utils/autoconf-ar.patch

diff --git a/pkgs/os-specific/linux/bridge-utils/autoconf-ar.patch b/pkgs/os-specific/linux/bridge-utils/autoconf-ar.patch
new file mode 100644
index 00000000000..efa41075644
--- /dev/null
+++ b/pkgs/os-specific/linux/bridge-utils/autoconf-ar.patch
@@ -0,0 +1,25 @@
+diff --git a/configure.in b/configure.in
+index 5e3f89b..19be6d9 100644
+--- a/configure.in
++++ b/configure.in
+@@ -9,6 +9,7 @@ dnl Checks for programs.
+ AC_PROG_CC
+ AC_PROG_INSTALL
+ AC_PROG_RANLIB
++AC_CHECK_TOOL([AR], [ar])
+ 
+ dnl Checks for header files.
+ AC_HEADER_STDC
+diff --git a/libbridge/Makefile.in b/libbridge/Makefile.in
+index 20512c4..83c802b 100644
+--- a/libbridge/Makefile.in
++++ b/libbridge/Makefile.in
+@@ -1,7 +1,7 @@
+ 
+ KERNEL_HEADERS=-I@KERNEL_HEADERS@
+ 
+-AR=ar
++AR=@AR@
+ RANLIB=@RANLIB@
+ 
+ CC=@CC@
diff --git a/pkgs/os-specific/linux/bridge-utils/default.nix b/pkgs/os-specific/linux/bridge-utils/default.nix
index 2725a5909b7..e3207fdf37d 100644
--- a/pkgs/os-specific/linux/bridge-utils/default.nix
+++ b/pkgs/os-specific/linux/bridge-utils/default.nix
@@ -8,11 +8,12 @@ stdenv.mkDerivation rec {
     sha256 = "42f9e5fb8f6c52e63a98a43b81bd281c227c529f194913e1c51ec48a393b6688";
   };
 
-  # Remove patch once the kernel headers are updated
-  patches = [ ./add-ip6-header.patch ];
+  patches = [
+    ./autoconf-ar.patch
+    ./add-ip6-header.patch # Remove patch once the kernel headers are updated
+  ];
 
   nativeBuildInputs = [ autoreconfHook ];
-  buildInputs = [ ];
 
   postInstall = ''
     # The bridge utils build does not fail even if the brctl binary
-- 
GitLab


From d22575e0751340b2df0d7d21730065ded27d5501 Mon Sep 17 00:00:00 2001
From: Nick Spinale <nick@nickspinale.com>
Date: Wed, 9 Jan 2019 16:45:53 +0000
Subject: [PATCH 0293/2254] drbd: fix cross-compilation

---
 pkgs/os-specific/linux/drbd/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/drbd/default.nix b/pkgs/os-specific/linux/drbd/default.nix
index 5e990511eed..0e35f45f042 100644
--- a/pkgs/os-specific/linux/drbd/default.nix
+++ b/pkgs/os-specific/linux/drbd/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
 
   patches = [ ./pass-force.patch ];
 
-  buildInputs = [ flex perl ];
+  nativeBuildInputs = [ flex ];
+  buildInputs = [ perl ];
 
   configureFlags = [
     "--without-distro"
-- 
GitLab


From f4951397bab4e8dbb6f8fba377d1e71bab2a7ee4 Mon Sep 17 00:00:00 2001
From: Nick Spinale <nick@nickspinale.com>
Date: Wed, 9 Jan 2019 16:43:02 +0000
Subject: [PATCH 0294/2254] lshw: fix cross-compilation

---
 pkgs/tools/system/lshw/default.nix | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/system/lshw/default.nix b/pkgs/tools/system/lshw/default.nix
index 65c905f28c6..29c20ad8d53 100644
--- a/pkgs/tools/system/lshw/default.nix
+++ b/pkgs/tools/system/lshw/default.nix
@@ -13,11 +13,18 @@ stdenv.mkDerivation rec {
     sha256 = "0brwra4jld0d53d7jsgca415ljglmmx1l2iazpj4ndilr48yy8mf";
   };
 
-  patches = [ (fetchpatch {
-    # fix crash in scan_dmi_sysfs() when run as non-root
-    url = "https://github.com/lyonel/lshw/commit/fbdc6ab15f7eea0ddcd63da355356ef156dd0d96.patch";
-    sha256 = "147wyr5m185f8swsmb4q1ahs9r1rycapbpa2548aqbv298bbish3";
-  })];
+  patches = [
+    (fetchpatch {
+      # fix crash in scan_dmi_sysfs() when run as non-root
+      url = "https://github.com/lyonel/lshw/commit/fbdc6ab15f7eea0ddcd63da355356ef156dd0d96.patch";
+      sha256 = "147wyr5m185f8swsmb4q1ahs9r1rycapbpa2548aqbv298bbish3";
+    })
+    (fetchpatch {
+      # support cross-compilation
+      url = "https://github.com/lyonel/lshw/commit/8486d25cea9b68794504fbd9e5c6e294bac6cb07.patch";
+      sha256 = "08f0wnxsq0agvsc66bhc7lxvk564ir0pp8pg3cym6a621prb9lm0";
+    })
+  ];
 
   nativeBuildInputs = [ pkgconfig ];
 
-- 
GitLab


From e224b17fec2a7c1b7ce0df4231280e03aba52ac3 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sat, 7 Sep 2019 20:51:28 +0300
Subject: [PATCH 0295/2254] qtutilities: 5.13.0 -> 6.0.0

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

diff --git a/pkgs/development/libraries/qtutilities/default.nix b/pkgs/development/libraries/qtutilities/default.nix
index 63b0a9f42a6..9eb43991bd6 100644
--- a/pkgs/development/libraries/qtutilities/default.nix
+++ b/pkgs/development/libraries/qtutilities/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "qtutilities";
-  version = "5.13.0";
+  version = "6.0.0";
 
   src = fetchFromGitHub {
     owner = "Martchus";
     repo = pname;
     rev = "v${version}";
-    sha256 = "03drxwpr3xdh4hm8pkd5mhjs0mzhz6634ldyq78pml39ciqm51nl";
+    sha256 = "0d2x4djr8lqb4vad8g8vxvd1sgki4issxhyy5r32snh2i8pxpbp9";
   };
 
   buildInputs = [ qtbase cpp-utilities ];
-- 
GitLab


From 5f1c02a1c925748df69d91df3bb8371dcb8a6285 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 15 Sep 2019 16:02:10 +0200
Subject: [PATCH 0296/2254] python2Packages.pytest_5: disable build

`pytest_5` only supports python3[1], however the python2 build was enabled by
separating pytest_4 and pytest_5 into two different attributes.

ZHF #68361

[1] https://docs.pytest.org/en/latest/py27-py34-deprecation.html
---
 pkgs/development/python-modules/pytest/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix
index 506b560e01a..1ddf52a33bd 100644
--- a/pkgs/development/python-modules/pytest/default.nix
+++ b/pkgs/development/python-modules/pytest/default.nix
@@ -6,6 +6,8 @@ buildPythonPackage rec {
   version = "5.1.0";
   pname = "pytest";
 
+  disabled = !isPy3k;
+
   preCheck = ''
     # don't test bash builtins
     rm testing/test_argcomplete.py
@@ -19,7 +21,6 @@ buildPythonPackage rec {
   checkInputs = [ hypothesis mock ];
   nativeBuildInputs = [ setuptools_scm ];
   propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites wcwidth packaging ]
-    ++ stdenv.lib.optionals (!isPy3k) [ funcsigs ]
     ++ stdenv.lib.optionals (pythonOlder "3.6") [ pathlib2 ];
 
   doCheck = !isPyPy; # https://github.com/pytest-dev/pytest/issues/3460
-- 
GitLab


From 57230c14e585189c9696d338a1cf8b594024721f Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@gmail.com>
Date: Tue, 3 Sep 2019 21:11:22 +0300
Subject: [PATCH 0297/2254] gpxsee: 7.12 -> 7.13

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

diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix
index 6e9296da267..4b2ed9af24e 100644
--- a/pkgs/applications/misc/gpxsee/default.nix
+++ b/pkgs/applications/misc/gpxsee/default.nix
@@ -2,13 +2,13 @@
 
 mkDerivation rec {
   pname = "gpxsee";
-  version = "7.12";
+  version = "7.13";
 
   src = fetchFromGitHub {
     owner = "tumic0";
     repo = "GPXSee";
     rev = version;
-    sha256 = "0c3axs3mm6xzabwbvy9vgq1sryjpi4h91nwzy9iyv9zjxz7phgzc";
+    sha256 = "08cg5k4ffj2wrcm4rk7vyixbyyz0424276fw2fn8lmziklkdqyjw";
   };
 
   nativeBuildInputs = [ qmake ];
@@ -28,7 +28,7 @@ mkDerivation rec {
       all common GPS log file formats.
     '';
     license = licenses.gpl3;
-    maintainers = [ maintainers.womfoo ];
+    maintainers = with maintainers; [ womfoo sikmir ];
     platforms = platforms.linux;
   };
 }
-- 
GitLab


From 659adfaf2767781f3f1a2dc6e1e3f5edaf24911c Mon Sep 17 00:00:00 2001
From: babariviere <babathriviere@gmail.com>
Date: Sat, 14 Sep 2019 22:11:28 +0200
Subject: [PATCH 0298/2254] iosevka: 1.4.3 -> 2.3.0

Integrate new Iosevka build system.
Add an extra arguments to add custom parameters (for example to map ligatures).
---
 pkgs/data/fonts/iosevka/default.nix       |   40 +-
 pkgs/data/fonts/iosevka/package-lock.json | 2868 ++++++++++++++++++---
 pkgs/data/fonts/iosevka/package-lock.nix  |    1 +
 3 files changed, 2462 insertions(+), 447 deletions(-)

diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix
index f7fce315e8c..b1c46ca08ac 100644
--- a/pkgs/data/fonts/iosevka/default.nix
+++ b/pkgs/data/fonts/iosevka/default.nix
@@ -8,7 +8,9 @@
   design ? [], upright ? [], italic ? [], oblique ? [],
   family ? null, weights ? [],
   # Custom font set name. Required if any custom settings above.
-  set ? null
+  set ? null,
+  # Extra parameters. Can be used for ligature mapping.
+  extraParameters ? null
 }:
 
 assert (design != []) -> set != null;
@@ -25,32 +27,33 @@ in
 let pname = if set != null then "iosevka-${set}" else "iosevka"; in
 
 let
-  version = "1.14.3";
+  version = "2.3.0";
   name = "${pname}-${version}";
   src = fetchFromGitHub {
     owner = "be5invis";
     repo ="Iosevka";
     rev = "v${version}";
-    sha256 = "0ba8hwxi88bp2jb9xfhk95nnlv8ykl74cv62xr4ybzm3b8ahpwqf";
+    sha256 = "1qnbxhx9wvij9zia226mc3sy8j7bfsw5v1cvxvsbbwjskwqdamvv";
   };
 in
 
 with lib;
-let unwords = concatStringsSep " "; in
+let quote = str: "\"" + str + "\""; in
+let toTomlList = list: "[" + (concatMapStringsSep ", " quote list) +"]"; in
+let unlines = concatStringsSep "\n"; in
 
 let
   param = name: options:
-    if options != [] then "${name}='${unwords options}'" else null;
-  config = unwords (lib.filter (x: x != null) [
+    if options != [] then "${name}=${toTomlList options}" else null;
+  config = unlines (lib.filter (x: x != null) [
+    "[buildPlans.${pname}]"
     (param "design" design)
     (param "upright" upright)
     (param "italic" italic)
     (param "oblique" oblique)
-    (if family != null then "family='${family}'" else null)
+    (if family != null then "family=\"${family}\"" else null)
     (param "weights" weights)
   ]);
-  custom = design != [] || upright != [] || italic != [] || oblique != []
-    || family != null || weights != [];
 in
 
 stdenv.mkDerivation {
@@ -58,8 +61,10 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ nodejs ttfautohint-nox otfcc ];
 
-  passAsFile = [ "installPackageLock" ];
+  passAsFile = [ "installPackageLock" "config" "extraParameters" ];
   installPackageLock = installPackageLock ./package-lock.json;
+  config = config;
+  extraParameters = extraParameters;
 
   preConfigure = ''
     HOME=$TMPDIR
@@ -70,21 +75,18 @@ stdenv.mkDerivation {
   configurePhase = ''
     runHook preConfigure
 
-    ${optionalString custom ''make custom-config set=${set} ${config}''}
-
-    runHook postConfigure
+    ${optionalString (set != null) ''mv "$configPath" private-build-plans.toml''}
+    ${optionalString (extraParameters != null) ''cat "$extraParametersPath" >> parameters.toml''}
   '';
 
-  makeFlags = lib.optionals custom [ "custom" "set=${set}" ];
+  buildPhase = ''
+    npm run build -- ttf::${pname}
+  '';
 
   installPhase = ''
-    runHook preInstall
-
     fontdir="$out/share/fonts/$pname"
     install -d "$fontdir"
     install "dist/$pname/ttf"/* "$fontdir"
-
-    runHook postInstall
   '';
 
   enableParallelBuilding = true;
@@ -98,6 +100,6 @@ stdenv.mkDerivation {
     '';
     license = licenses.ofl;
     platforms = platforms.all;
-    maintainers = with maintainers; [ cstrahan jfrankenau ttuegel ];
+    maintainers = with maintainers; [ cstrahan jfrankenau ttuegel babariviere ];
   };
 }
diff --git a/pkgs/data/fonts/iosevka/package-lock.json b/pkgs/data/fonts/iosevka/package-lock.json
index 54de11a1f42..7556566b01a 100644
--- a/pkgs/data/fonts/iosevka/package-lock.json
+++ b/pkgs/data/fonts/iosevka/package-lock.json
@@ -1,62 +1,286 @@
 {
   "name": "iosevka",
-  "version": "1.14.0",
+  "version": "2.3.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
+    "@babel/code-frame": {
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz",
+      "integrity": "sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==",
+      "dev": true,
+      "requires": {
+        "@babel/highlight": "^7.0.0"
+      }
+    },
+    "@babel/highlight": {
+      "version": "7.5.0",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.5.0.tgz",
+      "integrity": "sha512-7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.0.0",
+        "esutils": "^2.0.2",
+        "js-tokens": "^4.0.0"
+      }
+    },
     "JSONStream": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.2.tgz",
-      "integrity": "sha1-wQI3G27Dp887hHygDCC7D85Mbeo=",
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
+      "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
+      "requires": {
+        "jsonparse": "^1.2.0",
+        "through": ">=2.2.7 <3"
+      }
+    },
+    "abbrev": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
+    },
+    "acorn": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.3.0.tgz",
+      "integrity": "sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA==",
+      "dev": true
+    },
+    "acorn-jsx": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.0.2.tgz",
+      "integrity": "sha512-tiNTrP1MP0QrChmD2DdupCr6HWSFeKVw5d/dHTu4Y7rkAkRhU/Dt7dphAfIUyxtHpl/eBVip5uTNSpQJHylpAw==",
+      "dev": true
+    },
+    "ajv": {
+      "version": "6.10.2",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
+      "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
       "requires": {
-        "jsonparse": "1.3.1",
-        "through": "2.3.8"
+        "fast-deep-equal": "^2.0.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
       }
     },
     "amdefine": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
-      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU="
+      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
+      "dev": true
+    },
+    "ansi-escapes": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
+      "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
+      "dev": true
     },
     "ansi-regex": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
       "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
     },
+    "ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "requires": {
+        "color-convert": "^1.9.0"
+      }
+    },
+    "aproba": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
+      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
+    },
+    "are-we-there-yet": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
+      "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
+      "requires": {
+        "delegates": "^1.0.0",
+        "readable-stream": "^2.0.6"
+      }
+    },
+    "argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "requires": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "asn1": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
+      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
+      "requires": {
+        "safer-buffer": "~2.1.0"
+      }
+    },
+    "assert-plus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+    },
+    "astral-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
+      "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
+      "dev": true
+    },
+    "asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
+    },
+    "atob": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
+      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
+      "dev": true
+    },
+    "aws-sign2": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
+    },
+    "aws4": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
+      "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="
+    },
+    "balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
+    },
+    "bcrypt-pbkdf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
+      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
+      "requires": {
+        "tweetnacl": "^0.14.3"
+      }
+    },
     "bezier-js": {
-      "version": "2.2.5",
-      "resolved": "https://registry.npmjs.org/bezier-js/-/bezier-js-2.2.5.tgz",
-      "integrity": "sha512-HGh+GevPguxrAmnWF2/A+8c8FEatnKcE6WttpYWA5fn1CfpJz4reFbr11DuyFs2gwaIo9vF7aVXW2xg1iaqvyg=="
+      "version": "2.4.3",
+      "resolved": "https://registry.npmjs.org/bezier-js/-/bezier-js-2.4.3.tgz",
+      "integrity": "sha512-qAz1iAGoSE+kk5guAMyvoUgfHq+e5JwK5jRHh2/tuk4XDRUuECrrHLouN27jAzjhlJD2vAsBHofCi5sOn1jcbQ=="
+    },
+    "bindings": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
+      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+      "requires": {
+        "file-uri-to-path": "1.0.0"
+      }
     },
-    "builtin-modules": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
-      "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8="
+    "block-stream": {
+      "version": "0.0.9",
+      "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
+      "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
+      "requires": {
+        "inherits": "~2.0.0"
+      }
+    },
+    "bluebird": {
+      "version": "3.5.5",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz",
+      "integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w=="
+    },
+    "brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "requires": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "bufferstreams": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/bufferstreams/-/bufferstreams-1.1.3.tgz",
+      "integrity": "sha512-HaJnVuslRF4g2kSDeyl++AaVizoitCpL9PglzCYwy0uHHyvWerfvEb8jWmYbF1z4kiVFolGomnxSGl+GUQp2jg==",
+      "requires": {
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true
     },
     "camelcase": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-      "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo="
+      "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
+      "dev": true
     },
     "caryll-shapeops": {
       "version": "0.3.1",
       "resolved": "https://registry.npmjs.org/caryll-shapeops/-/caryll-shapeops-0.3.1.tgz",
       "integrity": "sha512-3TdH6DZGL08S6qEvCZLNaOHyFvmzQts8m+TyYEvc6/PiI+XgX5mIag1/CKczIM8e2QtDr8JKW8foo4VNOM8/Og==",
       "requires": {
-        "bezier-js": "2.2.5",
-        "clipper-lib": "1.0.0"
+        "bezier-js": "^2.2.1",
+        "clipper-lib": "^1.0.0"
+      }
+    },
+    "caseless": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
+    },
+    "chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "requires": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
       }
     },
+    "chardet": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
+      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
+      "dev": true
+    },
     "child-process-promise": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/child-process-promise/-/child-process-promise-2.2.1.tgz",
       "integrity": "sha1-RzChHvYQ+tRQuPIjx50x172tgHQ=",
       "requires": {
-        "cross-spawn": "4.0.2",
-        "node-version": "1.1.0",
-        "promise-polyfill": "6.1.0"
+        "cross-spawn": "^4.0.2",
+        "node-version": "^1.0.0",
+        "promise-polyfill": "^6.0.1"
+      },
+      "dependencies": {
+        "cross-spawn": {
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz",
+          "integrity": "sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE=",
+          "requires": {
+            "lru-cache": "^4.0.1",
+            "which": "^1.2.9"
+          }
+        }
+      }
+    },
+    "cli-cursor": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
+      "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
+      "requires": {
+        "restore-cursor": "^2.0.0"
       }
     },
+    "cli-width": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
+      "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
+      "dev": true
+    },
     "clipper-lib": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/clipper-lib/-/clipper-lib-1.0.0.tgz",
@@ -67,33 +291,119 @@
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
       "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
       "requires": {
-        "string-width": "1.0.2",
-        "strip-ansi": "3.0.1",
-        "wrap-ansi": "2.1.0"
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1",
+        "wrap-ansi": "^2.0.0"
+      },
+      "dependencies": {
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+          "requires": {
+            "number-is-nan": "^1.0.0"
+          }
+        },
+        "string-width": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+          "requires": {
+            "code-point-at": "^1.0.0",
+            "is-fullwidth-code-point": "^1.0.0",
+            "strip-ansi": "^3.0.0"
+          }
+        }
       }
     },
     "clone": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.3.tgz",
-      "integrity": "sha1-KY1+IjFmD0DAA8LtMUDezz9TCF8="
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+      "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18="
     },
     "code-point-at": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
       "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
     },
-    "coffee-script": {
-      "version": "1.12.7",
-      "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz",
-      "integrity": "sha512-fLeEhqwymYat/MpTPUjSKHVYYl0ec2mOyALEMLmzr5i1isuG+6jfI2j2d5oBO3VIzgUXgBVIcOT9uH1TFxBckw=="
+    "color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "requires": {
+        "color-name": "1.1.3"
+      }
+    },
+    "color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+    },
+    "colors": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.3.3.tgz",
+      "integrity": "sha512-mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==",
+      "dev": true
+    },
+    "combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "requires": {
+        "delayed-stream": "~1.0.0"
+      }
+    },
+    "complex.js": {
+      "version": "2.0.11",
+      "resolved": "https://registry.npmjs.org/complex.js/-/complex.js-2.0.11.tgz",
+      "integrity": "sha512-6IArJLApNtdg1P1dFtn3dnyzoZBEF0MwMnrfF1exSBRpZYoy4yieMkpZhQDC0uwctw48vii0CFVyHfpgZ/DfGw=="
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+    },
+    "console-control-strings": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
+    },
+    "core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
     },
     "cross-spawn": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz",
-      "integrity": "sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE=",
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+      "requires": {
+        "nice-try": "^1.0.4",
+        "path-key": "^2.0.1",
+        "semver": "^5.5.0",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
+      }
+    },
+    "css": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz",
+      "integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.3",
+        "source-map": "^0.6.1",
+        "source-map-resolve": "^0.5.2",
+        "urix": "^0.1.0"
+      }
+    },
+    "css-parse": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/css-parse/-/css-parse-2.0.0.tgz",
+      "integrity": "sha1-pGjuZnwW2BzPBcWMONKpfHgNv9Q=",
+      "dev": true,
       "requires": {
-        "lru-cache": "4.1.1",
-        "which": "1.3.0"
+        "css": "^2.0.0"
       }
     },
     "cubic2quad": {
@@ -101,186 +411,400 @@
       "resolved": "https://registry.npmjs.org/cubic2quad/-/cubic2quad-1.1.1.tgz",
       "integrity": "sha1-abGcYaP1tB7PLx1fro+wNBWqixU="
     },
+    "dashdash": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+      "requires": {
+        "assert-plus": "^1.0.0"
+      }
+    },
+    "debug": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+      "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+      "dev": true,
+      "requires": {
+        "ms": "^2.1.1"
+      }
+    },
     "decamelize": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
       "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
     },
+    "decimal.js": {
+      "version": "10.2.0",
+      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.2.0.tgz",
+      "integrity": "sha512-vDPw+rDgn3bZe1+F/pyEwb1oMG2XTlRVgAa6B4KccTEpYgF8w6eQllVbQcfIJnZyvzFtFpxnpGtx8dd7DJp/Rw=="
+    },
+    "decode-uri-component": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
+      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
+      "dev": true
+    },
     "deep-is": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ="
+      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
+      "dev": true
     },
-    "defaults": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz",
-      "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=",
+    "delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
+    },
+    "delegates": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
+    },
+    "doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "dev": true,
+      "requires": {
+        "esutils": "^2.0.2"
+      }
+    },
+    "ecc-jsbn": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
+      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
+      "requires": {
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.1.0"
+      }
+    },
+    "emoji-regex": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+      "dev": true
+    },
+    "end-of-stream": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
+      "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
       "requires": {
-        "clone": "1.0.3"
+        "once": "^1.4.0"
       }
     },
     "error-ex": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz",
-      "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
       "requires": {
-        "is-arrayish": "0.2.1"
+        "is-arrayish": "^0.2.1"
       }
     },
+    "escape-latex": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/escape-latex/-/escape-latex-1.2.0.tgz",
+      "integrity": "sha512-nV5aVWW1K0wEiUIEdZ4erkGGH8mDxGyxSeqPzRNtWP7ataw+/olFObw7hujFWlVjNsaDFw5VZ5NzVSIqRgfTiw=="
+    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
+    },
     "escodegen": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.9.0.tgz",
-      "integrity": "sha512-v0MYvNQ32bzwoG2OSFzWAkuahDQHK92JBN0pTAALJ4RIxEZe766QJPDR8Hqy7XNUy5K3fnVL76OqYAdc4TZEIw==",
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.12.0.tgz",
+      "integrity": "sha512-TuA+EhsanGcme5T3R0L80u4t8CpbXQjegRmf7+FPTJrtCTErXFeelblRgHQa1FofEzqYYJmJ/OqjTwREp9qgmg==",
+      "dev": true,
       "requires": {
-        "esprima": "3.1.3",
-        "estraverse": "4.2.0",
-        "esutils": "2.0.2",
-        "optionator": "0.8.2",
-        "source-map": "0.5.7"
+        "esprima": "^3.1.3",
+        "estraverse": "^4.2.0",
+        "esutils": "^2.0.2",
+        "optionator": "^0.8.1",
+        "source-map": "~0.6.1"
+      },
+      "dependencies": {
+        "esprima": {
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
+          "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=",
+          "dev": true
+        }
       }
     },
     "escope": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escope/-/escope-1.0.3.tgz",
       "integrity": "sha1-dZ3OhJbEJI/sLQyq9BCLzz8af10=",
+      "dev": true,
       "requires": {
-        "estraverse": "2.0.0"
+        "estraverse": "^2.0.0"
       },
       "dependencies": {
         "estraverse": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-2.0.0.tgz",
-          "integrity": "sha1-WuRpYyQ2ACBmdMyySgnhZnT83KE="
+          "integrity": "sha1-WuRpYyQ2ACBmdMyySgnhZnT83KE=",
+          "dev": true
+        }
+      }
+    },
+    "eslint": {
+      "version": "5.16.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.16.0.tgz",
+      "integrity": "sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.0.0",
+        "ajv": "^6.9.1",
+        "chalk": "^2.1.0",
+        "cross-spawn": "^6.0.5",
+        "debug": "^4.0.1",
+        "doctrine": "^3.0.0",
+        "eslint-scope": "^4.0.3",
+        "eslint-utils": "^1.3.1",
+        "eslint-visitor-keys": "^1.0.0",
+        "espree": "^5.0.1",
+        "esquery": "^1.0.1",
+        "esutils": "^2.0.2",
+        "file-entry-cache": "^5.0.1",
+        "functional-red-black-tree": "^1.0.1",
+        "glob": "^7.1.2",
+        "globals": "^11.7.0",
+        "ignore": "^4.0.6",
+        "import-fresh": "^3.0.0",
+        "imurmurhash": "^0.1.4",
+        "inquirer": "^6.2.2",
+        "js-yaml": "^3.13.0",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.3.0",
+        "lodash": "^4.17.11",
+        "minimatch": "^3.0.4",
+        "mkdirp": "^0.5.1",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.8.2",
+        "path-is-inside": "^1.0.2",
+        "progress": "^2.0.0",
+        "regexpp": "^2.0.1",
+        "semver": "^5.5.1",
+        "strip-ansi": "^4.0.0",
+        "strip-json-comments": "^2.0.1",
+        "table": "^5.2.3",
+        "text-table": "^0.2.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^3.0.0"
+          }
         }
       }
     },
+    "eslint-scope": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
+      "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
+      "dev": true,
+      "requires": {
+        "esrecurse": "^4.1.0",
+        "estraverse": "^4.1.1"
+      }
+    },
+    "eslint-utils": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.2.tgz",
+      "integrity": "sha512-eAZS2sEUMlIeCjBeubdj45dmBHQwPHWyBcT1VSYB7o9x9WRRqKxyUoiXlRjyAwzN7YEzHJlYg0NmzDRWx6GP4Q==",
+      "dev": true,
+      "requires": {
+        "eslint-visitor-keys": "^1.0.0"
+      }
+    },
+    "eslint-visitor-keys": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz",
+      "integrity": "sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==",
+      "dev": true
+    },
     "esmangle": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/esmangle/-/esmangle-1.0.1.tgz",
       "integrity": "sha1-2bs3uPjq+/Tm1O1reqKVarvTxMI=",
+      "dev": true,
       "requires": {
-        "escodegen": "1.3.3",
-        "escope": "1.0.3",
-        "esprima": "1.1.1",
-        "esshorten": "1.1.1",
-        "estraverse": "1.5.1",
-        "esutils": "1.0.0",
-        "optionator": "0.3.0",
-        "source-map": "0.1.43"
+        "escodegen": "~1.3.2",
+        "escope": "~1.0.1",
+        "esprima": "~1.1.1",
+        "esshorten": "~1.1.0",
+        "estraverse": "~1.5.0",
+        "esutils": "~ 1.0.0",
+        "optionator": "~0.3.0",
+        "source-map": "~0.1.33"
       },
       "dependencies": {
         "escodegen": {
           "version": "1.3.3",
           "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.3.3.tgz",
           "integrity": "sha1-8CQBb1qI4Eb9EgBQVek5gC5sXyM=",
+          "dev": true,
           "requires": {
-            "esprima": "1.1.1",
-            "estraverse": "1.5.1",
-            "esutils": "1.0.0",
-            "source-map": "0.1.43"
+            "esprima": "~1.1.1",
+            "estraverse": "~1.5.0",
+            "esutils": "~1.0.0",
+            "source-map": "~0.1.33"
           }
         },
         "esprima": {
           "version": "1.1.1",
           "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.1.1.tgz",
-          "integrity": "sha1-W28VR/TRAuZw4UDFCb5ncdautUk="
+          "integrity": "sha1-W28VR/TRAuZw4UDFCb5ncdautUk=",
+          "dev": true
         },
         "estraverse": {
           "version": "1.5.1",
           "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz",
-          "integrity": "sha1-hno+jlip+EYYr7bC3bzZFrfLr3E="
+          "integrity": "sha1-hno+jlip+EYYr7bC3bzZFrfLr3E=",
+          "dev": true
         },
         "esutils": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/esutils/-/esutils-1.0.0.tgz",
-          "integrity": "sha1-gVHTWOIMisx/t0XnRywAJf5JZXA="
+          "integrity": "sha1-gVHTWOIMisx/t0XnRywAJf5JZXA=",
+          "dev": true
         },
         "fast-levenshtein": {
           "version": "1.0.7",
           "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.0.7.tgz",
-          "integrity": "sha1-AXjc3uAjuSkFGTrwlZ6KdjnP3Lk="
+          "integrity": "sha1-AXjc3uAjuSkFGTrwlZ6KdjnP3Lk=",
+          "dev": true
         },
         "levn": {
           "version": "0.2.5",
           "resolved": "https://registry.npmjs.org/levn/-/levn-0.2.5.tgz",
           "integrity": "sha1-uo0znQykphDjo/FFucr0iAcVUFQ=",
+          "dev": true,
           "requires": {
-            "prelude-ls": "1.1.2",
-            "type-check": "0.3.2"
+            "prelude-ls": "~1.1.0",
+            "type-check": "~0.3.1"
           }
         },
         "optionator": {
           "version": "0.3.0",
           "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.3.0.tgz",
           "integrity": "sha1-lxWotfXnWGz/BsgkngOc1zZNP1Q=",
+          "dev": true,
           "requires": {
-            "deep-is": "0.1.3",
-            "fast-levenshtein": "1.0.7",
-            "levn": "0.2.5",
-            "prelude-ls": "1.1.2",
-            "type-check": "0.3.2",
-            "wordwrap": "0.0.3"
+            "deep-is": "~0.1.2",
+            "fast-levenshtein": "~1.0.0",
+            "levn": "~0.2.4",
+            "prelude-ls": "~1.1.0",
+            "type-check": "~0.3.1",
+            "wordwrap": "~0.0.2"
           }
         },
         "source-map": {
           "version": "0.1.43",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
           "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
+          "dev": true,
           "requires": {
-            "amdefine": "1.0.1"
+            "amdefine": ">=0.0.4"
           }
         },
         "wordwrap": {
           "version": "0.0.3",
           "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
-          "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc="
+          "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=",
+          "dev": true
         }
       }
     },
+    "espree": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-5.0.1.tgz",
+      "integrity": "sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A==",
+      "dev": true,
+      "requires": {
+        "acorn": "^6.0.7",
+        "acorn-jsx": "^5.0.0",
+        "eslint-visitor-keys": "^1.0.0"
+      }
+    },
     "esprima": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
-      "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM="
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "dev": true
+    },
+    "esquery": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz",
+      "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==",
+      "dev": true,
+      "requires": {
+        "estraverse": "^4.0.0"
+      }
+    },
+    "esrecurse": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
+      "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
+      "dev": true,
+      "requires": {
+        "estraverse": "^4.1.0"
+      }
     },
     "esshorten": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/esshorten/-/esshorten-1.1.1.tgz",
       "integrity": "sha1-F0+Wt8wmfkaHLYFOfbfCkL3/Yak=",
+      "dev": true,
       "requires": {
-        "escope": "1.0.3",
-        "estraverse": "4.1.1",
-        "esutils": "2.0.2"
+        "escope": "~1.0.1",
+        "estraverse": "~4.1.1",
+        "esutils": "~2.0.2"
       },
       "dependencies": {
         "estraverse": {
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.1.1.tgz",
-          "integrity": "sha1-9srKcokzqFDvkGYdDheYK6RxEaI="
+          "integrity": "sha1-9srKcokzqFDvkGYdDheYK6RxEaI=",
+          "dev": true
         }
       }
     },
     "estraverse": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
-      "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM="
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "dev": true
     },
     "esutils": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
-      "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs="
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "dev": true
     },
     "execa": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
       "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
       "requires": {
-        "cross-spawn": "5.1.0",
-        "get-stream": "3.0.0",
-        "is-stream": "1.1.0",
-        "npm-run-path": "2.0.2",
-        "p-finally": "1.0.0",
-        "signal-exit": "3.0.2",
-        "strip-eof": "1.0.0"
+        "cross-spawn": "^5.0.1",
+        "get-stream": "^3.0.0",
+        "is-stream": "^1.1.0",
+        "npm-run-path": "^2.0.0",
+        "p-finally": "^1.0.0",
+        "signal-exit": "^3.0.0",
+        "strip-eof": "^1.0.0"
       },
       "dependencies": {
         "cross-spawn": {
@@ -288,126 +812,506 @@
           "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
           "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
           "requires": {
-            "lru-cache": "4.1.1",
-            "shebang-command": "1.2.0",
-            "which": "1.3.0"
+            "lru-cache": "^4.0.1",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
           }
         }
       }
     },
+    "extend": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
+    },
+    "external-editor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
+      "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
+      "dev": true,
+      "requires": {
+        "chardet": "^0.7.0",
+        "iconv-lite": "^0.4.24",
+        "tmp": "^0.0.33"
+      }
+    },
+    "extsprintf": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
+    },
+    "fast-deep-equal": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
+      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
+    },
+    "fast-json-stable-stringify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
+      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
+    },
     "fast-levenshtein": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
+      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
+      "dev": true
     },
-    "find-up": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-      "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
+    "figures": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
+      "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
+      "dev": true,
       "requires": {
-        "path-exists": "2.1.0",
-        "pinkie-promise": "2.0.1"
+        "escape-string-regexp": "^1.0.5"
       }
     },
-    "fs-extra": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz",
-      "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=",
+    "file-entry-cache": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
+      "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==",
+      "dev": true,
       "requires": {
-        "graceful-fs": "4.1.11",
-        "jsonfile": "3.0.1",
-        "universalify": "0.1.1"
+        "flat-cache": "^2.0.1"
       }
     },
-    "get-caller-file": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz",
-      "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U="
-    },
-    "get-stream": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-      "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ="
-    },
-    "graceful-fs": {
-      "version": "4.1.11",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
-    },
-    "hosted-git-info": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz",
-      "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg=="
-    },
-    "invert-kv": {
+    "file-uri-to-path": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
-      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY="
-    },
-    "is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
+      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw=="
     },
-    "is-builtin-module": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
-      "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
+    "find-up": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+      "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
       "requires": {
-        "builtin-modules": "1.1.1"
+        "locate-path": "^2.0.0"
       }
     },
-    "is-fullwidth-code-point": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+    "first-chunk-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-2.0.0.tgz",
+      "integrity": "sha1-G97NuOCDwGZLkZRVgVd6Q6nzHXA=",
       "requires": {
-        "number-is-nan": "1.0.1"
+        "readable-stream": "^2.0.2"
       }
     },
-    "is-stream": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
+    "flat-cache": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",
+      "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==",
+      "dev": true,
+      "requires": {
+        "flatted": "^2.0.0",
+        "rimraf": "2.6.3",
+        "write": "1.0.3"
+      },
+      "dependencies": {
+        "rimraf": {
+          "version": "2.6.3",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+          "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        }
+      }
     },
-    "is-utf8": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI="
+    "flatted": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.1.tgz",
+      "integrity": "sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==",
+      "dev": true
     },
-    "isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
+    "forever-agent": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
     },
-    "jsonfile": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz",
-      "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=",
+    "form-data": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
+      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
       "requires": {
-        "graceful-fs": "4.1.11"
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.6",
+        "mime-types": "^2.1.12"
       }
     },
-    "jsonparse": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
-      "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA="
+    "fraction.js": {
+      "version": "4.0.12",
+      "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.0.12.tgz",
+      "integrity": "sha512-8Z1K0VTG4hzYY7kA/1sj4/r1/RWLBD3xwReT/RCrUCbzPszjNQCCsy3ktkU/eaEqX3MYa4pY37a52eiBlPMlhA=="
     },
-    "lcid": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
-      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
+    "fs-extra": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz",
+      "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=",
       "requires": {
-        "invert-kv": "1.0.0"
+        "graceful-fs": "^4.1.2",
+        "jsonfile": "^3.0.0",
+        "universalify": "^0.1.0"
+      }
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+    },
+    "fstream": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz",
+      "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "inherits": "~2.0.0",
+        "mkdirp": ">=0.5 0",
+        "rimraf": "2"
+      }
+    },
+    "functional-red-black-tree": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
+      "dev": true
+    },
+    "gauge": {
+      "version": "2.7.4",
+      "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
+      "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
+      "requires": {
+        "aproba": "^1.0.3",
+        "console-control-strings": "^1.0.0",
+        "has-unicode": "^2.0.0",
+        "object-assign": "^4.1.0",
+        "signal-exit": "^3.0.0",
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1",
+        "wide-align": "^1.1.0"
+      },
+      "dependencies": {
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+          "requires": {
+            "number-is-nan": "^1.0.0"
+          }
+        },
+        "string-width": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+          "requires": {
+            "code-point-at": "^1.0.0",
+            "is-fullwidth-code-point": "^1.0.0",
+            "strip-ansi": "^3.0.0"
+          }
+        }
+      }
+    },
+    "get-caller-file": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
+      "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="
+    },
+    "get-stream": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+      "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ="
+    },
+    "getpass": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+      "requires": {
+        "assert-plus": "^1.0.0"
+      }
+    },
+    "glob": {
+      "version": "7.1.4",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
+      "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
+      "requires": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      }
+    },
+    "globals": {
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+      "dev": true
+    },
+    "graceful-fs": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz",
+      "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q=="
+    },
+    "har-schema": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
+    },
+    "har-validator": {
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
+      "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
+      "requires": {
+        "ajv": "^6.5.5",
+        "har-schema": "^2.0.0"
+      }
+    },
+    "has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
+    },
+    "has-unicode": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
+    },
+    "hosted-git-info": {
+      "version": "2.8.4",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.4.tgz",
+      "integrity": "sha512-pzXIvANXEFrc5oFFXRMkbLPQ2rXRoDERwDLyrcUxGhaZhgP54BBSl9Oheh7Vv0T090cszWBxPjkQQ5Sq1PbBRQ=="
+    },
+    "http-signature": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+      "requires": {
+        "assert-plus": "^1.0.0",
+        "jsprim": "^1.2.2",
+        "sshpk": "^1.7.0"
+      }
+    },
+    "iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "dev": true,
+      "requires": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      }
+    },
+    "ignore": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+      "dev": true
+    },
+    "import-fresh": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.1.0.tgz",
+      "integrity": "sha512-PpuksHKGt8rXfWEr9m9EHIpgyyaltBy8+eF6GJM0QCAxMgxCfucMF3mjecK2QsJr0amJW7gTqh5/wht0z2UhEQ==",
+      "dev": true,
+      "requires": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      }
+    },
+    "imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+      "dev": true
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "requires": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+    },
+    "inquirer": {
+      "version": "6.5.2",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz",
+      "integrity": "sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==",
+      "dev": true,
+      "requires": {
+        "ansi-escapes": "^3.2.0",
+        "chalk": "^2.4.2",
+        "cli-cursor": "^2.1.0",
+        "cli-width": "^2.0.0",
+        "external-editor": "^3.0.3",
+        "figures": "^2.0.0",
+        "lodash": "^4.17.12",
+        "mute-stream": "0.0.7",
+        "run-async": "^2.2.0",
+        "rxjs": "^6.4.0",
+        "string-width": "^2.1.0",
+        "strip-ansi": "^5.1.0",
+        "through": "^2.3.6"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        }
+      }
+    },
+    "invert-kv": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
+      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY="
+    },
+    "is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
+    },
+    "is-fullwidth-code-point": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
+    },
+    "is-promise": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
+      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
+      "dev": true
+    },
+    "is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
+    },
+    "is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
+    },
+    "is-utf8": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
+      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI="
+    },
+    "isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+    },
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
+    },
+    "isstream": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
+    },
+    "javascript-natural-sort": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz",
+      "integrity": "sha1-+eIwPUUH9tdDVac2ZNFED7Wg71k="
+    },
+    "js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true
+    },
+    "js-yaml": {
+      "version": "3.13.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
+      "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
+      "dev": true,
+      "requires": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      }
+    },
+    "jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
+    },
+    "json-schema": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
+    },
+    "json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+    },
+    "json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
+      "dev": true
+    },
+    "json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
+    },
+    "jsonfile": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz",
+      "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=",
+      "requires": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "jsonparse": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
+      "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA="
+    },
+    "jsprim": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+      "requires": {
+        "assert-plus": "1.0.0",
+        "extsprintf": "1.3.0",
+        "json-schema": "0.2.3",
+        "verror": "1.10.0"
+      }
+    },
+    "lcid": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
+      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
+      "requires": {
+        "invert-kv": "^1.0.0"
       }
     },
     "levn": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
       "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+      "dev": true,
       "requires": {
-        "prelude-ls": "1.1.2",
-        "type-check": "0.3.2"
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2"
       }
     },
     "libspiro-js": {
@@ -419,12 +1323,13 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
       "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
+      "dev": true,
       "requires": {
-        "graceful-fs": "4.1.11",
-        "parse-json": "2.2.0",
-        "pify": "2.3.0",
-        "pinkie-promise": "2.0.1",
-        "strip-bom": "2.0.0"
+        "graceful-fs": "^4.1.2",
+        "parse-json": "^2.2.0",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0",
+        "strip-bom": "^2.0.0"
       }
     },
     "locate-path": {
@@ -432,36 +1337,60 @@
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
       "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
       "requires": {
-        "p-locate": "2.0.0",
-        "path-exists": "3.0.0"
-      },
-      "dependencies": {
-        "path-exists": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU="
-        }
+        "p-locate": "^2.0.0",
+        "path-exists": "^3.0.0"
       }
     },
+    "lodash": {
+      "version": "4.17.15",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
+      "dev": true
+    },
     "lru-cache": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz",
-      "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==",
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+      "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
+      "requires": {
+        "pseudomap": "^1.0.2",
+        "yallist": "^2.1.2"
+      }
+    },
+    "map-age-cleaner": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
+      "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
       "requires": {
-        "pseudomap": "1.0.2",
-        "yallist": "2.1.2"
+        "p-defer": "^1.0.0"
+      }
+    },
+    "mathjs": {
+      "version": "5.10.3",
+      "resolved": "https://registry.npmjs.org/mathjs/-/mathjs-5.10.3.tgz",
+      "integrity": "sha512-ySjg30BC3dYjQm73ILZtwcWzFJde0VU6otkXW/57IjjuYRa3Qaf0Kb8pydEuBZYtqW2OxreAtsricrAmOj3jIw==",
+      "requires": {
+        "complex.js": "2.0.11",
+        "decimal.js": "10.2.0",
+        "escape-latex": "1.2.0",
+        "fraction.js": "4.0.12",
+        "javascript-natural-sort": "0.7.1",
+        "seed-random": "2.2.0",
+        "tiny-emitter": "2.1.0",
+        "typed-function": "1.1.0"
       }
     },
     "megaminx": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/megaminx/-/megaminx-0.3.3.tgz",
-      "integrity": "sha512-lZBSLMro+XYJIix9zCZ8N6nZgixpjUPkX6CKuh+Y9Wl9bir/2Fp27NWapA0cNQCPrzOOI9sAwxc4BI14aIdumw==",
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/megaminx/-/megaminx-0.9.0.tgz",
+      "integrity": "sha512-1UcxrUXXYboLWS3AJ2NuLckLi3YR7eJiO5LsYAWHZjYE0mmSqJ2ogSt6JrG8YINyogW9/TUWpL1ojwbRsSbyXw==",
       "requires": {
-        "JSONStream": "1.3.2",
-        "child-process-promise": "2.2.1",
-        "cubic2quad": "1.1.1",
-        "fs-extra": "3.0.1",
-        "which": "1.3.0"
+        "JSONStream": "^1.3.1",
+        "child-process-promise": "^2.2.1",
+        "clone": "^2.1.1",
+        "fs-extra": "^3.0.1",
+        "strip-bom-stream": "^3.0.0",
+        "typo-geom": "^0.5.1",
+        "which": "^1.3.0"
       }
     },
     "mem": {
@@ -469,7 +1398,25 @@
       "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz",
       "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
       "requires": {
-        "mimic-fn": "1.2.0"
+        "mimic-fn": "^1.0.0"
+      }
+    },
+    "microbuffer": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/microbuffer/-/microbuffer-1.0.0.tgz",
+      "integrity": "sha1-izgy7UDIfVH0e7I0kTppinVtGdI="
+    },
+    "mime-db": {
+      "version": "1.40.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
+      "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="
+    },
+    "mime-types": {
+      "version": "2.1.24",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz",
+      "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==",
+      "requires": {
+        "mime-db": "1.40.0"
       }
     },
     "mimic-fn": {
@@ -477,20 +1424,103 @@
       "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
       "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="
     },
+    "minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "requires": {
+        "brace-expansion": "^1.1.7"
+      }
+    },
+    "minimist": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
+    },
+    "mkdirp": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+      "requires": {
+        "minimist": "0.0.8"
+      }
+    },
+    "ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "mute-stream": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
+      "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
+      "dev": true
+    },
+    "nan": {
+      "version": "2.14.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
+      "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg=="
+    },
+    "natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
+      "dev": true
+    },
+    "nice-try": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
+      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
+    },
+    "node-gyp": {
+      "version": "3.8.0",
+      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz",
+      "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==",
+      "requires": {
+        "fstream": "^1.0.0",
+        "glob": "^7.0.3",
+        "graceful-fs": "^4.1.2",
+        "mkdirp": "^0.5.0",
+        "nopt": "2 || 3",
+        "npmlog": "0 || 1 || 2 || 3 || 4",
+        "osenv": "0",
+        "request": "^2.87.0",
+        "rimraf": "2",
+        "semver": "~5.3.0",
+        "tar": "^2.0.0",
+        "which": "1"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
+          "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8="
+        }
+      }
+    },
     "node-version": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/node-version/-/node-version-1.1.0.tgz",
-      "integrity": "sha512-t1V2RFiaTavaW3jtQO0A2nok6k7/Gghuvx2rjvICuT0B0dYaObBQ4U0xHL+ZTPFZodt1LMYG2Vi2nypfz4/AJg=="
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/node-version/-/node-version-1.2.0.tgz",
+      "integrity": "sha512-ma6oU4Sk0qOoKEAymVoTvk8EdXEobdS7m/mAGhDJ8Rouugho48crHBORAmy5BoOcv8wraPM6xumapQp5hl4iIQ=="
+    },
+    "nopt": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
+      "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
+      "requires": {
+        "abbrev": "1"
+      }
     },
     "normalize-package-data": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
-      "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
       "requires": {
-        "hosted-git-info": "2.5.0",
-        "is-builtin-module": "1.0.0",
-        "semver": "5.5.0",
-        "validate-npm-package-license": "3.0.1"
+        "hosted-git-info": "^2.1.4",
+        "resolve": "^1.10.0",
+        "semver": "2 || 3 || 4 || 5",
+        "validate-npm-package-license": "^3.0.1"
       }
     },
     "npm-run-path": {
@@ -498,7 +1528,18 @@
       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
       "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
       "requires": {
-        "path-key": "2.0.1"
+        "path-key": "^2.0.0"
+      }
+    },
+    "npmlog": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
+      "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
+      "requires": {
+        "are-we-there-yet": "~1.1.2",
+        "console-control-strings": "~1.1.0",
+        "gauge": "~2.7.3",
+        "set-blocking": "~2.0.0"
       }
     },
     "number-is-nan": {
@@ -506,43 +1547,229 @@
       "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
       "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
     },
+    "oauth-sign": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
+      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
+    },
     "object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
       "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
     },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "onetime": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
+      "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
+      "requires": {
+        "mimic-fn": "^1.0.0"
+      }
+    },
     "optionator": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
       "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
+      "dev": true,
       "requires": {
-        "deep-is": "0.1.3",
-        "fast-levenshtein": "2.0.6",
-        "levn": "0.3.0",
-        "prelude-ls": "1.1.2",
-        "type-check": "0.3.2",
-        "wordwrap": "1.0.0"
+        "deep-is": "~0.1.3",
+        "fast-levenshtein": "~2.0.4",
+        "levn": "~0.3.0",
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2",
+        "wordwrap": "~1.0.0"
       }
     },
+    "os-homedir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
+    },
     "os-locale": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
-      "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
+      "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
+      "requires": {
+        "execa": "^0.7.0",
+        "lcid": "^1.0.0",
+        "mem": "^1.1.0"
+      }
+    },
+    "os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
+    },
+    "osenv": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
+      "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
       "requires": {
-        "lcid": "1.0.0"
+        "os-homedir": "^1.0.0",
+        "os-tmpdir": "^1.0.0"
       }
     },
+    "otfcc-ttcize": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/otfcc-ttcize/-/otfcc-ttcize-0.8.0.tgz",
+      "integrity": "sha512-0RFgy9TDsgTF/1UJ8bSQ4heTYRatDz3HOXXh8d3WyXReqeOU+edgkbG4ERMFPdzFnA+SgqKTnPRg+2pduZsmSQ==",
+      "requires": {
+        "child-process-promise": "^2.2.1",
+        "fs-extra": "^4.0.1",
+        "megaminx": "^0.3.2",
+        "temp": "^0.8.3",
+        "which": "^1.3.0",
+        "yargs": "^8.0.2"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0="
+        },
+        "fs-extra": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz",
+          "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==",
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "jsonfile": "^4.0.0",
+            "universalify": "^0.1.0"
+          }
+        },
+        "jsonfile": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+          "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+          "requires": {
+            "graceful-fs": "^4.1.6"
+          }
+        },
+        "load-json-file": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
+          "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "parse-json": "^2.2.0",
+            "pify": "^2.0.0",
+            "strip-bom": "^3.0.0"
+          }
+        },
+        "megaminx": {
+          "version": "0.3.3",
+          "resolved": "https://registry.npmjs.org/megaminx/-/megaminx-0.3.3.tgz",
+          "integrity": "sha512-lZBSLMro+XYJIix9zCZ8N6nZgixpjUPkX6CKuh+Y9Wl9bir/2Fp27NWapA0cNQCPrzOOI9sAwxc4BI14aIdumw==",
+          "requires": {
+            "JSONStream": "^1.3.1",
+            "child-process-promise": "^2.2.1",
+            "cubic2quad": "^1.1.0",
+            "fs-extra": "^3.0.1",
+            "which": "^1.3.0"
+          },
+          "dependencies": {
+            "fs-extra": {
+              "version": "3.0.1",
+              "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz",
+              "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=",
+              "requires": {
+                "graceful-fs": "^4.1.2",
+                "jsonfile": "^3.0.0",
+                "universalify": "^0.1.0"
+              }
+            },
+            "jsonfile": {
+              "version": "3.0.1",
+              "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz",
+              "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=",
+              "requires": {
+                "graceful-fs": "^4.1.6"
+              }
+            }
+          }
+        },
+        "path-type": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
+          "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
+          "requires": {
+            "pify": "^2.0.0"
+          }
+        },
+        "read-pkg": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
+          "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
+          "requires": {
+            "load-json-file": "^2.0.0",
+            "normalize-package-data": "^2.3.2",
+            "path-type": "^2.0.0"
+          }
+        },
+        "read-pkg-up": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
+          "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
+          "requires": {
+            "find-up": "^2.0.0",
+            "read-pkg": "^2.0.0"
+          }
+        },
+        "strip-bom": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM="
+        },
+        "yargs": {
+          "version": "8.0.2",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz",
+          "integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=",
+          "requires": {
+            "camelcase": "^4.1.0",
+            "cliui": "^3.2.0",
+            "decamelize": "^1.1.1",
+            "get-caller-file": "^1.0.1",
+            "os-locale": "^2.0.0",
+            "read-pkg-up": "^2.0.0",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^1.0.1",
+            "set-blocking": "^2.0.0",
+            "string-width": "^2.0.0",
+            "which-module": "^2.0.0",
+            "y18n": "^3.2.1",
+            "yargs-parser": "^7.0.0"
+          }
+        }
+      }
+    },
+    "p-defer": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
+      "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww="
+    },
     "p-finally": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
       "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4="
     },
+    "p-is-promise": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz",
+      "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg=="
+    },
     "p-limit": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.2.0.tgz",
-      "integrity": "sha512-Y/OtIaXtUPr4/YpMv1pCL5L5ed0rumAaAeBSj12F+bSlMdys7i8oQF/GUJmfpTS/QoaRrS/k6pma29haJpsMng==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
       "requires": {
-        "p-try": "1.0.0"
+        "p-try": "^1.0.0"
       }
     },
     "p-locate": {
@@ -550,7 +1777,7 @@
       "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
       "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
       "requires": {
-        "p-limit": "1.2.0"
+        "p-limit": "^1.1.0"
       }
     },
     "p-try": {
@@ -558,13 +1785,18 @@
       "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
       "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M="
     },
-    "pad": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/pad/-/pad-1.2.1.tgz",
-      "integrity": "sha512-cx/l/K+9UjGXJmoYolvP0l3cEUyB9BUdUL3wj3uwskIiApboLsinvsXxU9nSNg9Luz2ZyH0zzJNbqgLSNtfIDw==",
+    "pako": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.10.tgz",
+      "integrity": "sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw=="
+    },
+    "parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "dev": true,
       "requires": {
-        "coffee-script": "1.12.7",
-        "wcwidth": "1.0.1"
+        "callsites": "^3.0.0"
       }
     },
     "parse-json": {
@@ -572,78 +1804,145 @@
       "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
       "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
       "requires": {
-        "error-ex": "1.3.1"
+        "error-ex": "^1.2.0"
       }
     },
     "patel": {
-      "version": "0.32.1",
-      "resolved": "https://registry.npmjs.org/patel/-/patel-0.32.1.tgz",
-      "integrity": "sha1-nnC2sj/XqcgsV57VkbivpSF+YhI=",
-      "requires": {
-        "escodegen": "1.9.0",
-        "esmangle": "1.0.1",
-        "patrisika": "0.21.0",
-        "resumer": "0.0.0",
-        "yargs": "6.6.0"
+      "version": "0.33.1",
+      "resolved": "https://registry.npmjs.org/patel/-/patel-0.33.1.tgz",
+      "integrity": "sha512-zOv5DhGH2r4cRKnZfOlHmWqxBp9nMGnC3F/NZbUqFCYMA65RXiv8q1F96/6dm2ANR6xvCe+xLODQSb49IFoYQg==",
+      "dev": true,
+      "requires": {
+        "escodegen": ">=1.1.0",
+        "esmangle": ">=1.0.1",
+        "patrisika": ">=0.21.0",
+        "resumer": "*",
+        "yargs": "^6.6.0"
       },
       "dependencies": {
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+          "dev": true,
+          "requires": {
+            "number-is-nan": "^1.0.0"
+          }
+        },
+        "os-locale": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
+          "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
+          "dev": true,
+          "requires": {
+            "lcid": "^1.0.0"
+          }
+        },
+        "string-width": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+          "dev": true,
+          "requires": {
+            "code-point-at": "^1.0.0",
+            "is-fullwidth-code-point": "^1.0.0",
+            "strip-ansi": "^3.0.0"
+          }
+        },
+        "which-module": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
+          "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
+          "dev": true
+        },
         "yargs": {
           "version": "6.6.0",
           "resolved": "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz",
           "integrity": "sha1-eC7CHvQDNF+DCoCMo9UTr1YGUgg=",
+          "dev": true,
+          "requires": {
+            "camelcase": "^3.0.0",
+            "cliui": "^3.2.0",
+            "decamelize": "^1.1.1",
+            "get-caller-file": "^1.0.1",
+            "os-locale": "^1.4.0",
+            "read-pkg-up": "^1.0.1",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^1.0.1",
+            "set-blocking": "^2.0.0",
+            "string-width": "^1.0.2",
+            "which-module": "^1.0.0",
+            "y18n": "^3.2.1",
+            "yargs-parser": "^4.2.0"
+          }
+        },
+        "yargs-parser": {
+          "version": "4.2.1",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz",
+          "integrity": "sha1-KczqwNxPA8bIe0qfIX3RjJ90hxw=",
+          "dev": true,
           "requires": {
-            "camelcase": "3.0.0",
-            "cliui": "3.2.0",
-            "decamelize": "1.2.0",
-            "get-caller-file": "1.0.2",
-            "os-locale": "1.4.0",
-            "read-pkg-up": "1.0.1",
-            "require-directory": "2.1.1",
-            "require-main-filename": "1.0.1",
-            "set-blocking": "2.0.0",
-            "string-width": "1.0.2",
-            "which-module": "1.0.0",
-            "y18n": "3.2.1",
-            "yargs-parser": "4.2.1"
+            "camelcase": "^3.0.0"
           }
         }
       }
     },
     "path-exists": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-      "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-      "requires": {
-        "pinkie-promise": "2.0.1"
-      }
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU="
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
+    },
+    "path-is-inside": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
+      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
+      "dev": true
     },
     "path-key": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
       "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A="
     },
+    "path-parse": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
+      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="
+    },
     "path-type": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
       "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
+      "dev": true,
       "requires": {
-        "graceful-fs": "4.1.11",
-        "pify": "2.3.0",
-        "pinkie-promise": "2.0.1"
+        "graceful-fs": "^4.1.2",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
       }
     },
     "patrisika": {
       "version": "0.21.0",
       "resolved": "https://registry.npmjs.org/patrisika/-/patrisika-0.21.0.tgz",
       "integrity": "sha1-uCwn99QEFSLcXDG0O3xu+xnkdII=",
+      "dev": true,
       "requires": {
-        "patrisika-scopes": "0.11.0"
+        "patrisika-scopes": ">=0.11.0"
       }
     },
     "patrisika-scopes": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/patrisika-scopes/-/patrisika-scopes-0.11.0.tgz",
-      "integrity": "sha1-BSqddkoWXgs0zDW2ViqIJCA2tAM="
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/patrisika-scopes/-/patrisika-scopes-0.11.1.tgz",
+      "integrity": "sha512-UCIBMx1nzNaR5CcDoQ9/jtY5RlJqf2CrJYHiMZJhi15NPvsPKRfJT/DPZMkhCunexOKmH03EDZYZU1hGn7mL0w==",
+      "dev": true
+    },
+    "performance-now": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
     },
     "pify": {
       "version": "2.3.0",
@@ -653,48 +1952,182 @@
     "pinkie": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA="
+      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
+      "dev": true
     },
     "pinkie-promise": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
       "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
+      "dev": true,
       "requires": {
-        "pinkie": "2.0.4"
+        "pinkie": "^2.0.0"
       }
     },
     "prelude-ls": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ="
+      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+      "dev": true
+    },
+    "primitive-quadify-off-curves": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/primitive-quadify-off-curves/-/primitive-quadify-off-curves-0.4.1.tgz",
+      "integrity": "sha512-Kmn+IfF+hcARb1NX+XtoSQIxHS+WeOqqQ3YDihRe3KkvGkFxMrDQFFsDTXxwUOt9KmvD7FgWG6cO2ajZp4lEQg==",
+      "requires": {
+        "mathjs": "^5.0.3",
+        "tslib": "~1.9.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz",
+          "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ=="
+        }
+      }
+    },
+    "process-nextick-args": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
+    },
+    "progress": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
+      "dev": true
     },
     "promise-polyfill": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-6.1.0.tgz",
       "integrity": "sha1-36lpQ+qcEh/KTem1hoyznTRy4Fc="
     },
+    "proper-lockfile": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/proper-lockfile/-/proper-lockfile-3.2.0.tgz",
+      "integrity": "sha512-iMghHHXv2bsxl6NchhEaFck8tvX3F9cknEEh1SUpguUOBjN7PAAW9BLzmbc1g/mCD1gY3EE2EABBHPJfFdHFmA==",
+      "requires": {
+        "graceful-fs": "^4.1.11",
+        "retry": "^0.12.0",
+        "signal-exit": "^3.0.2"
+      }
+    },
     "pseudomap": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
       "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
     },
+    "psl": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.4.0.tgz",
+      "integrity": "sha512-HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw=="
+    },
+    "pump": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "requires": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
+    },
+    "qs": {
+      "version": "6.5.2",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
+      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
+    },
     "read-pkg": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
       "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
+      "dev": true,
       "requires": {
-        "load-json-file": "1.1.0",
-        "normalize-package-data": "2.4.0",
-        "path-type": "1.1.0"
+        "load-json-file": "^1.0.0",
+        "normalize-package-data": "^2.3.2",
+        "path-type": "^1.0.0"
       }
     },
     "read-pkg-up": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
       "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
+      "dev": true,
       "requires": {
-        "find-up": "1.1.2",
-        "read-pkg": "1.1.0"
+        "find-up": "^1.0.0",
+        "read-pkg": "^1.0.0"
+      },
+      "dependencies": {
+        "find-up": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
+          "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
+          "dev": true,
+          "requires": {
+            "path-exists": "^2.0.0",
+            "pinkie-promise": "^2.0.0"
+          }
+        },
+        "path-exists": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
+          "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
+          "dev": true,
+          "requires": {
+            "pinkie-promise": "^2.0.0"
+          }
+        }
+      }
+    },
+    "readable-stream": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+      "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+      "requires": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "regexpp": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz",
+      "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==",
+      "dev": true
+    },
+    "request": {
+      "version": "2.88.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
+      "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
+      "requires": {
+        "aws-sign2": "~0.7.0",
+        "aws4": "^1.8.0",
+        "caseless": "~0.12.0",
+        "combined-stream": "~1.0.6",
+        "extend": "~3.0.2",
+        "forever-agent": "~0.6.1",
+        "form-data": "~2.3.2",
+        "har-validator": "~5.1.0",
+        "http-signature": "~1.2.0",
+        "is-typedarray": "~1.0.0",
+        "isstream": "~0.1.2",
+        "json-stringify-safe": "~5.0.1",
+        "mime-types": "~2.1.19",
+        "oauth-sign": "~0.9.0",
+        "performance-now": "^2.1.0",
+        "qs": "~6.5.2",
+        "safe-buffer": "^5.1.2",
+        "tough-cookie": "~2.4.3",
+        "tunnel-agent": "^0.6.0",
+        "uuid": "^3.3.2"
       }
     },
     "require-directory": {
@@ -707,18 +2140,102 @@
       "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
       "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE="
     },
+    "resolve": {
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz",
+      "integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==",
+      "requires": {
+        "path-parse": "^1.0.6"
+      }
+    },
+    "resolve-from": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+      "dev": true
+    },
+    "resolve-url": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
+      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
+      "dev": true
+    },
+    "restore-cursor": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
+      "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
+      "requires": {
+        "onetime": "^2.0.0",
+        "signal-exit": "^3.0.2"
+      }
+    },
     "resumer": {
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz",
       "integrity": "sha1-8ej0YeQGS6Oegq883CqMiT0HZ1k=",
+      "dev": true,
+      "requires": {
+        "through": "~2.3.4"
+      }
+    },
+    "retry": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
+      "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs="
+    },
+    "rimraf": {
+      "version": "2.2.8",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz",
+      "integrity": "sha1-5Dm+Kq7jJzIZUnMPmaiSnk/FBYI="
+    },
+    "run-async": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
+      "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
+      "dev": true,
       "requires": {
-        "through": "2.3.8"
+        "is-promise": "^2.1.0"
       }
     },
+    "rxjs": {
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.3.tgz",
+      "integrity": "sha512-wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA==",
+      "dev": true,
+      "requires": {
+        "tslib": "^1.9.0"
+      }
+    },
+    "safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+    },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+    },
+    "sax": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+      "dev": true
+    },
+    "seed-random": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/seed-random/-/seed-random-2.2.0.tgz",
+      "integrity": "sha1-KpsZ4lCoFwmSMaW5mk2vgLf77VQ="
+    },
+    "semaphore-async-await": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/semaphore-async-await/-/semaphore-async-await-1.5.1.tgz",
+      "integrity": "sha1-hXvvXjZEYBykuVcLh+nfXKEpdPo="
+    },
     "semver": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
-      "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA=="
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
     },
     "set-blocking": {
       "version": "2.0.0",
@@ -730,7 +2247,7 @@
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
       "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
       "requires": {
-        "shebang-regex": "1.0.0"
+        "shebang-regex": "^1.0.0"
       }
     },
     "shebang-regex": {
@@ -743,38 +2260,134 @@
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
       "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
     },
+    "slice-ansi": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz",
+      "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^3.2.0",
+        "astral-regex": "^1.0.0",
+        "is-fullwidth-code-point": "^2.0.0"
+      }
+    },
     "source-map": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-      "optional": true
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true
+    },
+    "source-map-resolve": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
+      "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
+      "dev": true,
+      "requires": {
+        "atob": "^2.1.1",
+        "decode-uri-component": "^0.2.0",
+        "resolve-url": "^0.2.1",
+        "source-map-url": "^0.4.0",
+        "urix": "^0.1.0"
+      }
+    },
+    "source-map-url": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
+      "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
+      "dev": true
     },
     "spdx-correct": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz",
-      "integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz",
+      "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==",
       "requires": {
-        "spdx-license-ids": "1.2.2"
+        "spdx-expression-parse": "^3.0.0",
+        "spdx-license-ids": "^3.0.0"
       }
     },
+    "spdx-exceptions": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz",
+      "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA=="
+    },
     "spdx-expression-parse": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz",
-      "integrity": "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw="
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
+      "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
+      "requires": {
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
+      }
     },
     "spdx-license-ids": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz",
-      "integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc="
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz",
+      "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q=="
+    },
+    "split": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz",
+      "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==",
+      "requires": {
+        "through": "2"
+      }
+    },
+    "sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
+    },
+    "sshpk": {
+      "version": "1.16.1",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
+      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
+      "requires": {
+        "asn1": "~0.2.3",
+        "assert-plus": "^1.0.0",
+        "bcrypt-pbkdf": "^1.0.0",
+        "dashdash": "^1.12.0",
+        "ecc-jsbn": "~0.1.1",
+        "getpass": "^0.1.1",
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.0.2",
+        "tweetnacl": "~0.14.0"
+      }
+    },
+    "stack-trace": {
+      "version": "0.0.9",
+      "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz",
+      "integrity": "sha1-qPbq7KkGdMMz58Q5U/J1tFFRBpU="
     },
     "string-width": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+      "requires": {
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^4.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "requires": {
+            "ansi-regex": "^3.0.0"
+          }
+        }
+      }
+    },
+    "string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
       "requires": {
-        "code-point-at": "1.1.0",
-        "is-fullwidth-code-point": "1.0.0",
-        "strip-ansi": "3.0.1"
+        "safe-buffer": "~5.1.0"
       }
     },
     "strip-ansi": {
@@ -782,15 +2395,33 @@
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
       "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
       "requires": {
-        "ansi-regex": "2.1.1"
+        "ansi-regex": "^2.0.0"
       }
     },
     "strip-bom": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
       "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
+      "dev": true,
+      "requires": {
+        "is-utf8": "^0.2.0"
+      }
+    },
+    "strip-bom-buf": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom-buf/-/strip-bom-buf-1.0.0.tgz",
+      "integrity": "sha1-HLRar1dTD0yvhsf3UXnSyaUd1XI=",
+      "requires": {
+        "is-utf8": "^0.2.1"
+      }
+    },
+    "strip-bom-stream": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-3.0.0.tgz",
+      "integrity": "sha1-lWvMXYRDD2klapDtgjdlzYWOFZw=",
       "requires": {
-        "is-utf8": "0.2.1"
+        "first-chunk-stream": "^2.0.0",
+        "strip-bom-buf": "^1.0.0"
       }
     },
     "strip-eof": {
@@ -798,81 +2429,427 @@
       "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
       "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8="
     },
+    "strip-json-comments": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+      "dev": true
+    },
+    "stylus": {
+      "version": "0.54.7",
+      "resolved": "https://registry.npmjs.org/stylus/-/stylus-0.54.7.tgz",
+      "integrity": "sha512-Yw3WMTzVwevT6ZTrLCYNHAFmanMxdylelL3hkWNgPMeTCpMwpV3nXjpOHuBXtFv7aiO2xRuQS6OoAdgkNcSNug==",
+      "dev": true,
+      "requires": {
+        "css-parse": "~2.0.0",
+        "debug": "~3.1.0",
+        "glob": "^7.1.3",
+        "mkdirp": "~0.5.x",
+        "safer-buffer": "^2.1.2",
+        "sax": "~1.2.4",
+        "semver": "^6.0.0",
+        "source-map": "^0.7.3"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.7.3",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+          "dev": true
+        }
+      }
+    },
+    "supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "requires": {
+        "has-flag": "^3.0.0"
+      }
+    },
+    "table": {
+      "version": "5.4.6",
+      "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz",
+      "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==",
+      "dev": true,
+      "requires": {
+        "ajv": "^6.10.2",
+        "lodash": "^4.17.14",
+        "slice-ansi": "^2.1.0",
+        "string-width": "^3.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "dev": true
+        },
+        "string-width": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        }
+      }
+    },
+    "tar": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz",
+      "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==",
+      "requires": {
+        "block-stream": "*",
+        "fstream": "^1.0.12",
+        "inherits": "2"
+      }
+    },
+    "temp": {
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/temp/-/temp-0.8.3.tgz",
+      "integrity": "sha1-4Ma8TSa5AxJEEOT+2BEDAU38H1k=",
+      "requires": {
+        "os-tmpdir": "^1.0.0",
+        "rimraf": "~2.2.6"
+      }
+    },
+    "text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
+      "dev": true
+    },
     "through": {
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
       "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
     },
+    "tiny-emitter": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
+      "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
+    },
+    "tmp": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "dev": true,
+      "requires": {
+        "os-tmpdir": "~1.0.2"
+      }
+    },
     "toml": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/toml/-/toml-2.3.3.tgz",
-      "integrity": "sha512-O7L5hhSQHxuufWUdcTRPfuTh3phKfAZ/dqfxZFoxPCj2RYmpaSGLEIs016FCXItQwNr08yefUB5TSjzRYnajTA=="
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/toml/-/toml-2.3.6.tgz",
+      "integrity": "sha512-gVweAectJU3ebq//Ferr2JUY4WKSDe5N+z0FvjDncLGyHmIDoxgY/2Ie4qfEIDm4IS7OA6Rmdm7pdEEdMcV/xQ=="
     },
     "topsort": {
       "version": "0.0.2",
       "resolved": "https://registry.npmjs.org/topsort/-/topsort-0.0.2.tgz",
       "integrity": "sha1-Ll4O6KFDlBfxAdW5stA15iAmMyE="
     },
+    "tough-cookie": {
+      "version": "2.4.3",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
+      "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
+      "requires": {
+        "psl": "^1.1.24",
+        "punycode": "^1.4.1"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
+        }
+      }
+    },
+    "ts-process-promises": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/ts-process-promises/-/ts-process-promises-1.0.2.tgz",
+      "integrity": "sha512-6qWWz2HdFbD2uAfgS5t65Dd6HQKYjfra+YXQzKzxIG+RKTpoeDi+x+TW85SEF3cWUI2UecrOXJobvD+04MiTZg==",
+      "requires": {
+        "bluebird": "^3.0.5",
+        "resolve": "^1.1.6",
+        "split": "^1.0.0",
+        "stack-trace": "0.0.9"
+      }
+    },
+    "tslib": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz",
+      "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ=="
+    },
+    "ttf2woff": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/ttf2woff/-/ttf2woff-2.0.1.tgz",
+      "integrity": "sha1-hxgyJAAksJ25VwkEx8GSi4BXyWk=",
+      "requires": {
+        "argparse": "^1.0.6",
+        "microbuffer": "^1.0.0",
+        "pako": "^1.0.0"
+      }
+    },
+    "ttf2woff2": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/ttf2woff2/-/ttf2woff2-2.0.3.tgz",
+      "integrity": "sha1-XgIK/m5kMofzrXaHq+0g/mVOsyk=",
+      "requires": {
+        "bindings": "^1.2.1",
+        "bufferstreams": "^1.1.0",
+        "nan": "^2.1.0",
+        "node-gyp": "^3.0.3"
+      }
+    },
+    "tunnel-agent": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+      "requires": {
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "tweetnacl": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
+    },
     "type-check": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
       "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+      "dev": true,
+      "requires": {
+        "prelude-ls": "~1.1.2"
+      }
+    },
+    "typed-function": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/typed-function/-/typed-function-1.1.0.tgz",
+      "integrity": "sha512-TuQzwiT4DDg19beHam3E66oRXhyqlyfgjHB/5fcvsRXbfmWPJfto9B4a0TBdTrQAPGlGmXh/k7iUI+WsObgORA=="
+    },
+    "typo-geom": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/typo-geom/-/typo-geom-0.5.1.tgz",
+      "integrity": "sha512-nj81m0eqRMpK6NcwkGlT9r3CbwjCQhsFU6SBUuYW9TDveqIdi/QUFGkikoImtE1C6OzY2LvuVMSG8rx/ZTCGtQ==",
       "requires": {
-        "prelude-ls": "1.1.2"
+        "mathjs": "^5.0.3",
+        "tslib": "~1.9.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz",
+          "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ=="
+        }
       }
     },
     "universalify": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz",
-      "integrity": "sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc="
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
     },
     "unorm": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/unorm/-/unorm-1.4.1.tgz",
-      "integrity": "sha1-NkIA1fE2RsqLzURJAnEzVhR5IwA="
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/unorm/-/unorm-1.6.0.tgz",
+      "integrity": "sha512-b2/KCUlYZUeA7JFUuRJZPUtr4gZvBh7tavtv4fvk4+KV9pfGiR6CQAQAWl49ZpR3ts2dk4FYkP7EIgDJoiOLDA=="
+    },
+    "uri-js": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
+      "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
+      "requires": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "urix": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
+      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
+      "dev": true
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+    },
+    "uuid": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz",
+      "integrity": "sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ=="
     },
     "validate-npm-package-license": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
-      "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
       "requires": {
-        "spdx-correct": "1.0.2",
-        "spdx-expression-parse": "1.0.4"
+        "spdx-correct": "^3.0.0",
+        "spdx-expression-parse": "^3.0.0"
       }
     },
-    "wcwidth": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
-      "integrity": "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=",
+    "verda": {
+      "version": "1.0.0-4",
+      "resolved": "https://registry.npmjs.org/verda/-/verda-1.0.0-4.tgz",
+      "integrity": "sha512-DKr2WdWlPwJvmqCcjs6LPaBOacFQUdk6+u7tqwkxYKbHa0Touff7Y6x+YAWbnT1dace5Qlv/CRr6YBEaB08r3A==",
+      "requires": {
+        "chalk": "^2.4.1",
+        "cli-cursor": "^2.1.0",
+        "fast-deep-equal": "^2.0.1",
+        "fs-extra": "^6.0.1",
+        "proper-lockfile": "^3.0.2",
+        "semaphore-async-await": "^1.5.1",
+        "strip-ansi": "^5.2.0",
+        "ts-process-promises": "^1.0.2",
+        "tslib": "^1.9.3",
+        "which": "^1.3.1",
+        "yargs": "^12.0.1"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
+        },
+        "fs-extra": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-6.0.1.tgz",
+          "integrity": "sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==",
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "jsonfile": "^4.0.0",
+            "universalify": "^0.1.0"
+          }
+        },
+        "jsonfile": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+          "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+          "requires": {
+            "graceful-fs": "^4.1.6"
+          }
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        }
+      }
+    },
+    "verror": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
       "requires": {
-        "defaults": "1.0.3"
+        "assert-plus": "^1.0.0",
+        "core-util-is": "1.0.2",
+        "extsprintf": "^1.2.0"
       }
     },
     "which": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz",
-      "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
       "requires": {
-        "isexe": "2.0.0"
+        "isexe": "^2.0.0"
       }
     },
     "which-module": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
-      "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8="
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho="
+    },
+    "wide-align": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
+      "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
+      "requires": {
+        "string-width": "^1.0.2 || 2"
+      }
     },
     "wordwrap": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
-      "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus="
+      "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
+      "dev": true
     },
     "wrap-ansi": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
       "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
       "requires": {
-        "string-width": "1.0.2",
-        "strip-ansi": "3.0.1"
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1"
+      },
+      "dependencies": {
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+          "requires": {
+            "number-is-nan": "^1.0.0"
+          }
+        },
+        "string-width": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+          "requires": {
+            "code-point-at": "^1.0.0",
+            "is-fullwidth-code-point": "^1.0.0",
+            "strip-ansi": "^3.0.0"
+          }
+        }
+      }
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+    },
+    "write": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz",
+      "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==",
+      "dev": true,
+      "requires": {
+        "mkdirp": "^0.5.1"
       }
     },
     "y18n": {
@@ -886,23 +2863,22 @@
       "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI="
     },
     "yargs": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz",
-      "integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=",
-      "requires": {
-        "camelcase": "4.1.0",
-        "cliui": "3.2.0",
-        "decamelize": "1.2.0",
-        "get-caller-file": "1.0.2",
-        "os-locale": "2.1.0",
-        "read-pkg-up": "2.0.0",
-        "require-directory": "2.1.1",
-        "require-main-filename": "1.0.1",
-        "set-blocking": "2.0.0",
-        "string-width": "2.1.1",
-        "which-module": "2.0.0",
-        "y18n": "3.2.1",
-        "yargs-parser": "7.0.0"
+      "version": "12.0.5",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz",
+      "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==",
+      "requires": {
+        "cliui": "^4.0.0",
+        "decamelize": "^1.2.0",
+        "find-up": "^3.0.0",
+        "get-caller-file": "^1.0.1",
+        "os-locale": "^3.0.0",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^1.0.1",
+        "set-blocking": "^2.0.0",
+        "string-width": "^2.0.0",
+        "which-module": "^2.0.0",
+        "y18n": "^3.2.1 || ^4.0.0",
+        "yargs-parser": "^11.1.1"
       },
       "dependencies": {
         "ansi-regex": {
@@ -911,114 +2887,150 @@
           "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
         },
         "camelcase": {
+          "version": "5.3.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
+        },
+        "cliui": {
           "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0="
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
+          "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
+          "requires": {
+            "string-width": "^2.1.1",
+            "strip-ansi": "^4.0.0",
+            "wrap-ansi": "^2.0.0"
+          }
+        },
+        "execa": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+          "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+          "requires": {
+            "cross-spawn": "^6.0.0",
+            "get-stream": "^4.0.0",
+            "is-stream": "^1.1.0",
+            "npm-run-path": "^2.0.0",
+            "p-finally": "^1.0.0",
+            "signal-exit": "^3.0.0",
+            "strip-eof": "^1.0.0"
+          }
         },
         "find-up": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
           "requires": {
-            "locate-path": "2.0.0"
+            "locate-path": "^3.0.0"
           }
         },
-        "is-fullwidth-code-point": {
+        "get-stream": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+          "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+          "requires": {
+            "pump": "^3.0.0"
+          }
+        },
+        "invert-kv": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
+          "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
+          "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA=="
         },
-        "load-json-file": {
+        "lcid": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
-          "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
+          "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
+          "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
           "requires": {
-            "graceful-fs": "4.1.11",
-            "parse-json": "2.2.0",
-            "pify": "2.3.0",
-            "strip-bom": "3.0.0"
+            "invert-kv": "^2.0.0"
           }
         },
-        "os-locale": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
-          "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
+        "locate-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
           "requires": {
-            "execa": "0.7.0",
-            "lcid": "1.0.0",
-            "mem": "1.1.0"
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
           }
         },
-        "path-type": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
-          "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
+        "mem": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
+          "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
           "requires": {
-            "pify": "2.3.0"
+            "map-age-cleaner": "^0.1.1",
+            "mimic-fn": "^2.0.0",
+            "p-is-promise": "^2.0.0"
           }
         },
-        "read-pkg": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
-          "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
+        "mimic-fn": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+          "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
+        },
+        "os-locale": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
+          "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
           "requires": {
-            "load-json-file": "2.0.0",
-            "normalize-package-data": "2.4.0",
-            "path-type": "2.0.0"
+            "execa": "^1.0.0",
+            "lcid": "^2.0.0",
+            "mem": "^4.0.0"
           }
         },
-        "read-pkg-up": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
-          "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
+        "p-limit": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz",
+          "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==",
           "requires": {
-            "find-up": "2.1.0",
-            "read-pkg": "2.0.0"
+            "p-try": "^2.0.0"
           }
         },
-        "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+        "p-locate": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
           "requires": {
-            "is-fullwidth-code-point": "2.0.0",
-            "strip-ansi": "4.0.0"
+            "p-limit": "^2.0.0"
           }
         },
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
+        },
         "strip-ansi": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
           "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
           "requires": {
-            "ansi-regex": "3.0.0"
+            "ansi-regex": "^3.0.0"
           }
         },
-        "strip-bom": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM="
-        },
-        "which-module": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-          "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho="
-        },
         "yargs-parser": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz",
-          "integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=",
+          "version": "11.1.1",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz",
+          "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==",
           "requires": {
-            "camelcase": "4.1.0"
+            "camelcase": "^5.0.0",
+            "decamelize": "^1.2.0"
           }
         }
       }
     },
     "yargs-parser": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz",
-      "integrity": "sha1-KczqwNxPA8bIe0qfIX3RjJ90hxw=",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz",
+      "integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=",
       "requires": {
-        "camelcase": "3.0.0"
+        "camelcase": "^4.1.0"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0="
+        }
       }
     }
   }
diff --git a/pkgs/data/fonts/iosevka/package-lock.nix b/pkgs/data/fonts/iosevka/package-lock.nix
index 546482cc0d2..b677b3daf97 100644
--- a/pkgs/data/fonts/iosevka/package-lock.nix
+++ b/pkgs/data/fonts/iosevka/package-lock.nix
@@ -117,6 +117,7 @@ let
   prepareDepend = { name, src, depends, ... }:
     ''
       unpackFile '${src}'
+      mkdir -p $(dirname "${name}")
       mv package '${name}'
       mkdir -p '${name}/node_modules'
       (
-- 
GitLab


From d4e8f7908d739123470eb16ee778d5de00c8cc51 Mon Sep 17 00:00:00 2001
From: Mikhail Klementev <blame@dumpstack.io>
Date: Tue, 27 Aug 2019 20:24:55 +0000
Subject: [PATCH 0299/2254] NixOS/auto-upgrade: add gzip to service path

Resolves #28527
---
 nixos/modules/tasks/auto-upgrade.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/tasks/auto-upgrade.nix b/nixos/modules/tasks/auto-upgrade.nix
index 18753ae0c1a..7fe06699191 100644
--- a/nixos/modules/tasks/auto-upgrade.nix
+++ b/nixos/modules/tasks/auto-upgrade.nix
@@ -88,7 +88,7 @@ let cfg = config.system.autoUpgrade; in
           HOME = "/root";
         } // config.networking.proxy.envVars;
 
-      path = [ pkgs.coreutils pkgs.gnutar pkgs.xz.bin pkgs.gitMinimal config.nix.package.out ];
+      path = with pkgs; [ coreutils gnutar xz.bin gzip gitMinimal config.nix.package.out ];
 
       script = let
           nixos-rebuild = "${config.system.build.nixos-rebuild}/bin/nixos-rebuild";
-- 
GitLab


From 98997bb48997b27287a2995460d2fb6e1db88de7 Mon Sep 17 00:00:00 2001
From: Marek Fajkus <marek.faj@gmail.com>
Date: Sun, 15 Sep 2019 16:36:17 +0200
Subject: [PATCH 0300/2254] elmPackages.elm-language-server: Init at 1.4.1

---
 pkgs/development/compilers/elm/default.nix    |    2 +
 .../elm/packages/node-composition.nix         |    2 +-
 .../compilers/elm/packages/node-packages.json |    3 +-
 .../compilers/elm/packages/node-packages.nix  | 1121 ++++++++++++-----
 4 files changed, 809 insertions(+), 319 deletions(-)

diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix
index c8bef546b6d..ce18200943e 100644
--- a/pkgs/development/compilers/elm/default.nix
+++ b/pkgs/development/compilers/elm/default.nix
@@ -56,6 +56,8 @@ let
             */
             elm-test = patchBinwrap [elmi-to-json] elmNodePackages.elm-test;
             elm-verify-examples = patchBinwrap [elmi-to-json] elmNodePackages.elm-verify-examples;
+            elm-language-server = elmNodePackages."@elm-tooling/elm-language-server";
+
             # elm-analyse@0.16.4 build is not working
             elm-analyse = elmNodePackages."elm-analyse-0.16.3";
             inherit (elmNodePackages) elm-doc-preview elm-live elm-upgrade elm-xref;
diff --git a/pkgs/development/compilers/elm/packages/node-composition.nix b/pkgs/development/compilers/elm/packages/node-composition.nix
index 870ad900210..1ffd758ac82 100644
--- a/pkgs/development/compilers/elm/packages/node-composition.nix
+++ b/pkgs/development/compilers/elm/packages/node-composition.nix
@@ -2,7 +2,7 @@
 
 {pkgs ? import <nixpkgs> {
     inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs.nodejs-10_x}:
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}:
 
 let
   nodeEnv = import ../../../node-packages/node-env.nix {
diff --git a/pkgs/development/compilers/elm/packages/node-packages.json b/pkgs/development/compilers/elm/packages/node-packages.json
index 5ba7e49bfa6..9faaaced709 100644
--- a/pkgs/development/compilers/elm/packages/node-packages.json
+++ b/pkgs/development/compilers/elm/packages/node-packages.json
@@ -5,5 +5,6 @@
     "elm-upgrade",
     { "elm-analyse": "0.16.3" },
     "elm-live",
-    "elm-xref"
+    "elm-xref",
+    "@elm-tooling/elm-language-server"
 ]
diff --git a/pkgs/development/compilers/elm/packages/node-packages.nix b/pkgs/development/compilers/elm/packages/node-packages.nix
index 7605c377057..45fb96ed693 100644
--- a/pkgs/development/compilers/elm/packages/node-packages.nix
+++ b/pkgs/development/compilers/elm/packages/node-packages.nix
@@ -13,6 +13,33 @@ let
         sha512 = "r5160ogAvGyHsal38Kux7YYtodEKOj89RGb28ht1jh3SJb08VwRwAKKJL0bGb04Zd/3r9FL3BFIc3bBidYffCA==";
       };
     };
+    "@nodelib/fs.scandir-2.1.2" = {
+      name = "_at_nodelib_slash_fs.scandir";
+      packageName = "@nodelib/fs.scandir";
+      version = "2.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.2.tgz";
+        sha512 = "wrIBsjA5pl13f0RN4Zx4FNWmU71lv03meGKnqRUoCyan17s4V3WL92f3w3AIuWbNnpcrQyFBU5qMavJoB8d27w==";
+      };
+    };
+    "@nodelib/fs.stat-2.0.2" = {
+      name = "_at_nodelib_slash_fs.stat";
+      packageName = "@nodelib/fs.stat";
+      version = "2.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.2.tgz";
+        sha512 = "z8+wGWV2dgUhLqrtRYa03yDx4HWMvXKi1z8g3m2JyxAx8F7xk74asqPk5LAETjqDSGLFML/6CDl0+yFunSYicw==";
+      };
+    };
+    "@nodelib/fs.walk-1.2.3" = {
+      name = "_at_nodelib_slash_fs.walk";
+      packageName = "@nodelib/fs.walk";
+      version = "1.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.3.tgz";
+        sha512 = "l6t8xEhfK9Sa4YO5mIRdau7XSOADfmh3jCr0evNHdY+HNkW6xuQhgMH7D73VV6WpZOagrW0UludvMTiifiwTfA==";
+      };
+    };
     "@sindresorhus/is-0.7.0" = {
       name = "_at_sindresorhus_slash_is";
       packageName = "@sindresorhus/is";
@@ -22,6 +49,42 @@ let
         sha512 = "ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==";
       };
     };
+    "@types/events-3.0.0" = {
+      name = "_at_types_slash_events";
+      packageName = "@types/events";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz";
+        sha512 = "EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==";
+      };
+    };
+    "@types/glob-7.1.1" = {
+      name = "_at_types_slash_glob";
+      packageName = "@types/glob";
+      version = "7.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz";
+        sha512 = "1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==";
+      };
+    };
+    "@types/minimatch-3.0.3" = {
+      name = "_at_types_slash_minimatch";
+      packageName = "@types/minimatch";
+      version = "3.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz";
+        sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==";
+      };
+    };
+    "@types/node-12.7.5" = {
+      name = "_at_types_slash_node";
+      packageName = "@types/node";
+      version = "12.7.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/node/-/node-12.7.5.tgz";
+        sha512 = "9fq4jZVhPNW8r+UYKnxF1e2HkDWOWKM5bC2/7c9wPV835I0aOrVbS/Hw/pWPk2uKrNXQqg9Z959Kz+IYDd5p3w==";
+      };
+    };
     "accepts-1.3.7" = {
       name = "accepts";
       packageName = "accepts";
@@ -85,13 +148,13 @@ let
         sha512 = "5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==";
       };
     };
-    "anymatch-3.0.3" = {
+    "anymatch-3.1.0" = {
       name = "anymatch";
       packageName = "anymatch";
-      version = "3.0.3";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/anymatch/-/anymatch-3.0.3.tgz";
-        sha512 = "c6IvoeBECQlMVuYUjSwimnhmztImpErfxJzWZhIQinIvQWoGOnB0dLIgifbPHQt5heS6mNlaZG16f06H3C8t1g==";
+        url = "https://registry.npmjs.org/anymatch/-/anymatch-3.1.0.tgz";
+        sha512 = "Ozz7l4ixzI7Oxj2+cw+p0tVUt27BpaJ+1+q1TCeANWxHpvyn2+Un+YamBdfKu0uh8xLodGhoa1v7595NhKDAuA==";
       };
     };
     "arr-diff-4.0.0" = {
@@ -130,6 +193,15 @@ let
         sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2";
       };
     };
+    "array-union-2.1.0" = {
+      name = "array-union";
+      packageName = "array-union";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz";
+        sha512 = "HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==";
+      };
+    };
     "array-unique-0.3.2" = {
       name = "array-unique";
       packageName = "array-unique";
@@ -517,13 +589,13 @@ let
         sha512 = "IwXUx0FXc5ibYmPC2XeEj5mpXoV66sR+t3jqu2NS2GYwCktt3KF1/Qqjws/NkegajBA4RbZ5+DDwlOiJsxDHEg==";
       };
     };
-    "chokidar-3.0.0" = {
+    "chokidar-3.0.2" = {
       name = "chokidar";
       packageName = "chokidar";
-      version = "3.0.0";
+      version = "3.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chokidar/-/chokidar-3.0.0.tgz";
-        sha512 = "ebzWopcacB2J19Jsb5RPtMrzmjUZ5VAQnsL0Ztrix3lswozHbiDp+1Lg3AWSKHdwsps/W2vtshA/x3I827F78g==";
+        url = "https://registry.npmjs.org/chokidar/-/chokidar-3.0.2.tgz";
+        sha512 = "c4PR2egjNjI1um6bamCQ6bUNPDiyofNQruHvKgHQ4gDUP/ITSVSzNsiI5OWtHOsX323i5ha/kk4YmOZ1Ktg7KA==";
       };
     };
     "chownr-1.1.2" = {
@@ -544,15 +616,6 @@ let
         sha512 = "qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==";
       };
     };
-    "cli-color-1.2.0" = {
-      name = "cli-color";
-      packageName = "cli-color";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cli-color/-/cli-color-1.2.0.tgz";
-        sha1 = "3a5ae74fd76b6267af666e69e2afbbd01def34d1";
-      };
-    };
     "cliui-5.0.0" = {
       name = "cliui";
       packageName = "cliui";
@@ -616,22 +679,13 @@ let
         sha512 = "wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==";
       };
     };
-    "commander-2.9.0" = {
-      name = "commander";
-      packageName = "commander";
-      version = "2.9.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz";
-        sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4";
-      };
-    };
-    "commander-3.0.0" = {
+    "commander-3.0.1" = {
       name = "commander";
       packageName = "commander";
-      version = "3.0.0";
+      version = "3.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-3.0.0.tgz";
-        sha512 = "pl3QrGOBa9RZaslQiqnnKX2J068wcQw7j9AIaBQ9/JEp5RY6je4jKTImg0Bd+rpoONSe7GUFSgkxLeo17m3Pow==";
+        url = "https://registry.npmjs.org/commander/-/commander-3.0.1.tgz";
+        sha512 = "UNgvDd+csKdc9GD4zjtkHKQbT8Aspt2jCBqNSPp53vAS0L1tS9sXB2TCEOPHJ7kt9bN/niWkYj8T3RQSoMXdSQ==";
       };
     };
     "component-emitter-1.3.0" = {
@@ -670,15 +724,6 @@ let
         sha512 = "a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==";
       };
     };
-    "connect-pushstate-1.1.0" = {
-      name = "connect-pushstate";
-      packageName = "connect-pushstate";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/connect-pushstate/-/connect-pushstate-1.1.0.tgz";
-        sha1 = "bcab224271c439604a0fb0f614c0a5f563e88e24";
-      };
-    };
     "content-disposition-0.5.2" = {
       name = "content-disposition";
       packageName = "content-disposition";
@@ -778,6 +823,15 @@ let
         sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6";
       };
     };
+    "crocks-0.12.1" = {
+      name = "crocks";
+      packageName = "crocks";
+      version = "0.12.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/crocks/-/crocks-0.12.1.tgz";
+        sha512 = "2qCRJwBmPlRQXzd50k9gt9PaItultOP8lj/cKSH2Eai9aeBuNqAnDuyolAm9TGn6Pw/4BgbxtPJLU1S+tQ4WMQ==";
+      };
+    };
     "cross-spawn-4.0.0" = {
       name = "cross-spawn";
       packageName = "cross-spawn";
@@ -814,15 +868,6 @@ let
         sha1 = "88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b";
       };
     };
-    "d-1.0.1" = {
-      name = "d";
-      packageName = "d";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/d/-/d-1.0.1.tgz";
-        sha512 = "m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==";
-      };
-    };
     "dashdash-1.14.1" = {
       name = "dashdash";
       packageName = "dashdash";
@@ -886,13 +931,13 @@ let
         sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==";
       };
     };
-    "default-gateway-2.7.2" = {
+    "default-gateway-4.2.0" = {
       name = "default-gateway";
       packageName = "default-gateway";
-      version = "2.7.2";
+      version = "4.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/default-gateway/-/default-gateway-2.7.2.tgz";
-        sha512 = "lAc4i9QJR0YHSDFdzeBQKfZ1SRDG3hsJNEkrpcZa8QhBfidLAilT60BDEIVUUGqosFp425KOgB3uYqcnQrWafQ==";
+        url = "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz";
+        sha512 = "h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==";
       };
     };
     "define-properties-1.1.3" = {
@@ -967,6 +1012,15 @@ let
         sha1 = "978857442c44749e4206613e37946205826abd80";
       };
     };
+    "dir-glob-3.0.1" = {
+      name = "dir-glob";
+      packageName = "dir-glob";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz";
+        sha512 = "WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==";
+      };
+    };
     "duplexer3-0.1.4" = {
       name = "duplexer3";
       packageName = "duplexer3";
@@ -994,13 +1048,23 @@ let
         sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d";
       };
     };
-    "elm-serve-0.4.0" = {
-      name = "elm-serve";
-      packageName = "elm-serve";
-      version = "0.4.0";
+    "elm-analyse-git://github.com/elm-tooling/elm-analyse#f2a983fc7bab262a3e44b46732735d8510d18876" = {
+      name = "elm-analyse";
+      packageName = "elm-analyse";
+      version = "0.16.4";
+      src = fetchgit {
+        url = "git://github.com/elm-tooling/elm-analyse";
+        rev = "f2a983fc7bab262a3e44b46732735d8510d18876";
+        sha256 = "ce2770330503a0b8fe56eb369a95e9bad13b46676ff76f5303570d731cea4de2";
+      };
+    };
+    "elm-hot-1.1.1" = {
+      name = "elm-hot";
+      packageName = "elm-hot";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/elm-serve/-/elm-serve-0.4.0.tgz";
-        sha512 = "NYXzzaJT/zw8v7jzDWGXuvX3/soj+5NTLHxX0n/T6DICbmyDj8kO7rlI2wSKs9UTNjXhZ7quFQEKcgcf/SZksw==";
+        url = "https://registry.npmjs.org/elm-hot/-/elm-hot-1.1.1.tgz";
+        sha512 = "ZHjoHd2Ev6riNXNQirj3J+GKKXXwedAUikfFBYzlVL/+3CdGs96cpZ7nhAk4c5l//Qa9ymltrqX36mOlr0pPFA==";
       };
     };
     "elm-test-0.19.0-rev6" = {
@@ -1048,13 +1112,13 @@ let
         sha512 = "1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==";
       };
     };
-    "es-abstract-1.13.0" = {
+    "es-abstract-1.14.2" = {
       name = "es-abstract";
       packageName = "es-abstract";
-      version = "1.13.0";
+      version = "1.14.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.13.0.tgz";
-        sha512 = "vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==";
+        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.14.2.tgz";
+        sha512 = "DgoQmbpFNOofkjJtKwr87Ma5EW4Dc8fWhD0R+ndq7Oc456ivUfGOOP6oAZTTKl5/CcNMP+EN+e3/iUzgE0veZg==";
       };
     };
     "es-to-primitive-1.2.0" = {
@@ -1066,24 +1130,6 @@ let
         sha512 = "qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==";
       };
     };
-    "es5-ext-0.10.50" = {
-      name = "es5-ext";
-      packageName = "es5-ext";
-      version = "0.10.50";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.50.tgz";
-        sha512 = "KMzZTPBkeQV/JcSQhI5/z6d9VWJ3EnQ194USTUwIYZ2ZbpN8+SGXQKt1h68EX44+qt+Fzr8DO17vnxrw7c3agw==";
-      };
-    };
-    "es6-iterator-2.0.3" = {
-      name = "es6-iterator";
-      packageName = "es6-iterator";
-      version = "2.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz";
-        sha1 = "a7de889141a05a94b0854403b2d0a0fbfa98f3b7";
-      };
-    };
     "es6-promisify-6.0.2" = {
       name = "es6-promisify";
       packageName = "es6-promisify";
@@ -1093,24 +1139,6 @@ let
         sha512 = "eO6vFm0JvqGzjWIQA6QVKjxpmELfhWbDUWHm1rPfIbn55mhKPiAa5xpLmQWJrNa629ZIeQ8ZvMAi13kvrjK6Mg==";
       };
     };
-    "es6-symbol-3.1.1" = {
-      name = "es6-symbol";
-      packageName = "es6-symbol";
-      version = "3.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz";
-        sha1 = "bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77";
-      };
-    };
-    "es6-weak-map-2.0.3" = {
-      name = "es6-weak-map";
-      packageName = "es6-weak-map";
-      version = "2.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz";
-        sha512 = "p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==";
-      };
-    };
     "escape-html-1.0.3" = {
       name = "escape-html";
       packageName = "escape-html";
@@ -1138,15 +1166,6 @@ let
         sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887";
       };
     };
-    "event-emitter-0.3.5" = {
-      name = "event-emitter";
-      packageName = "event-emitter";
-      version = "0.3.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz";
-        sha1 = "df8c69eef1647923c7157b9ce83840610b02cc39";
-      };
-    };
     "eventemitter3-3.1.2" = {
       name = "eventemitter3";
       packageName = "eventemitter3";
@@ -1165,22 +1184,22 @@ let
         sha512 = "9sLAvzhI5nc8TpuQUh4ahMdCrWT00wPWz7j47/emR5+2qEfoZP5zzUXvx+vdx+H6ohhnsYC31iX04QLYJK8zTg==";
       };
     };
-    "execa-0.10.0" = {
+    "execa-1.0.0" = {
       name = "execa";
       packageName = "execa";
-      version = "0.10.0";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/execa/-/execa-0.10.0.tgz";
-        sha512 = "7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==";
+        url = "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz";
+        sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==";
       };
     };
-    "execa-1.0.0" = {
+    "execa-2.0.4" = {
       name = "execa";
       packageName = "execa";
-      version = "1.0.0";
+      version = "2.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz";
-        sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==";
+        url = "https://registry.npmjs.org/execa/-/execa-2.0.4.tgz";
+        sha512 = "VcQfhuGD51vQUQtKIq2fjGDLDbL6N1DTQVpYzxZ7LPIXw3HqTuIz6uxRmpV1qf8i31LHf2kjiaGI+GdHwRgbnQ==";
       };
     };
     "expand-brackets-2.1.4" = {
@@ -1282,6 +1301,24 @@ let
         sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49";
       };
     };
+    "fast-diff-1.2.0" = {
+      name = "fast-diff";
+      packageName = "fast-diff";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz";
+        sha512 = "xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==";
+      };
+    };
+    "fast-glob-3.0.4" = {
+      name = "fast-glob";
+      packageName = "fast-glob";
+      version = "3.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.0.4.tgz";
+        sha512 = "wkIbV6qg37xTJwqSsdnIphL1e+LaGz4AIQqr00mIubMaEhv1/HEmJ0uuCGZRNRUkZZmOB5mJKO0ZUTVq+SxMQg==";
+      };
+    };
     "fast-json-stable-stringify-2.0.0" = {
       name = "fast-json-stable-stringify";
       packageName = "fast-json-stable-stringify";
@@ -1291,6 +1328,15 @@ let
         sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2";
       };
     };
+    "fastq-1.6.0" = {
+      name = "fastq";
+      packageName = "fastq";
+      version = "1.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fastq/-/fastq-1.6.0.tgz";
+        sha512 = "jmxqQ3Z/nXoeyDmWAzF9kH1aGZSis6e/SbfPmJpUnyZ0ogr6iscHQaml4wsEepEWSdtmpy+eVXmCRIMpxaXqOA==";
+      };
+    };
     "fb-watchman-2.0.0" = {
       name = "fb-watchman";
       packageName = "fb-watchman";
@@ -1399,13 +1445,13 @@ let
         sha1 = "b88673c42009f8821fac2926e99720acee924fae";
       };
     };
-    "follow-redirects-1.8.1" = {
+    "follow-redirects-1.9.0" = {
       name = "follow-redirects";
       packageName = "follow-redirects";
-      version = "1.8.1";
+      version = "1.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.8.1.tgz";
-        sha512 = "micCIbldHioIegeKs41DoH0KS3AXfFzgS30qVkM6z/XOE/GJgvmsoc839NUqa1B9udYe9dQxgv7KFwng6+p/dw==";
+        url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.9.0.tgz";
+        sha512 = "CRcPzsSIbXyVDl0QI01muNDu69S8trU4jArW9LpOt2WtC6LyUJetcIrmfHsRBx7/Jb6GHJUiuqyYxPooFfNt6A==";
       };
     };
     "for-in-1.0.2" = {
@@ -1597,6 +1643,15 @@ let
         sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==";
       };
     };
+    "get-stream-5.1.0" = {
+      name = "get-stream";
+      packageName = "get-stream";
+      version = "5.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz";
+        sha512 = "EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==";
+      };
+    };
     "get-value-2.0.6" = {
       name = "get-value";
       packageName = "get-value";
@@ -1651,6 +1706,15 @@ let
         sha512 = "Z2RwiujPRGluePM6j699ktJYxmPpJKCfpGA13jz2hmFZC7gKetzrWvg5KN3+OsIFmydGyZ1AVwERCq1w/ZZwRg==";
       };
     };
+    "globby-10.0.1" = {
+      name = "globby";
+      packageName = "globby";
+      version = "10.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/globby/-/globby-10.0.1.tgz";
+        sha512 = "sSs4inE1FB2YQiymcmTv6NWENryABjUNPeWhOvmn4SjtKybglsyPZxFB3U1/+L1bYi0rNZDqCLlHyLYDl1Pq5A==";
+      };
+    };
     "got-6.7.1" = {
       name = "got";
       packageName = "got";
@@ -1678,15 +1742,6 @@ let
         sha512 = "IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==";
       };
     };
-    "graceful-readlink-1.0.1" = {
-      name = "graceful-readlink";
-      packageName = "graceful-readlink";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz";
-        sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725";
-      };
-    };
     "har-schema-2.0.0" = {
       name = "har-schema";
       packageName = "har-schema";
@@ -1840,6 +1895,15 @@ let
         sha512 = "uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==";
       };
     };
+    "http-errors-1.7.3" = {
+      name = "http-errors";
+      packageName = "http-errors";
+      version = "1.7.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz";
+        sha512 = "ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==";
+      };
+    };
     "http-proxy-1.17.0" = {
       name = "http-proxy";
       packageName = "http-proxy";
@@ -1876,6 +1940,15 @@ let
         sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==";
       };
     };
+    "ignore-5.1.4" = {
+      name = "ignore";
+      packageName = "ignore";
+      version = "5.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ignore/-/ignore-5.1.4.tgz";
+        sha512 = "MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==";
+      };
+    };
     "inflight-1.0.6" = {
       name = "inflight";
       packageName = "inflight";
@@ -1912,13 +1985,13 @@ let
         sha512 = "RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==";
       };
     };
-    "internal-ip-3.0.1" = {
+    "internal-ip-4.3.0" = {
       name = "internal-ip";
       packageName = "internal-ip";
-      version = "3.0.1";
+      version = "4.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/internal-ip/-/internal-ip-3.0.1.tgz";
-        sha512 = "NXXgESC2nNVtU+pqmC9e6R8B1GpKxzsAQhffvh5AL79qKnodd+L7tnEQmTiUAVngqLalPbSqRA7XGIEL5nCd0Q==";
+        url = "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz";
+        sha512 = "S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==";
       };
     };
     "into-stream-3.1.0" = {
@@ -2155,15 +2228,6 @@ let
         sha512 = "h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==";
       };
     };
-    "is-promise-2.1.0" = {
-      name = "is-promise";
-      packageName = "is-promise";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz";
-        sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa";
-      };
-    };
     "is-redirect-1.0.0" = {
       name = "is-redirect";
       packageName = "is-redirect";
@@ -2182,13 +2246,13 @@ let
         sha1 = "5517489b547091b0930e095654ced25ee97e9491";
       };
     };
-    "is-retry-allowed-1.1.0" = {
+    "is-retry-allowed-1.2.0" = {
       name = "is-retry-allowed";
       packageName = "is-retry-allowed";
-      version = "1.1.0";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz";
-        sha1 = "11a060568b67339444033d0125a61a20d564fb34";
+        url = "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz";
+        sha512 = "RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==";
       };
     };
     "is-stream-1.1.0" = {
@@ -2200,6 +2264,15 @@ let
         sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44";
       };
     };
+    "is-stream-2.0.0" = {
+      name = "is-stream";
+      packageName = "is-stream";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz";
+        sha512 = "XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==";
+      };
+    };
     "is-symbol-1.0.2" = {
       name = "is-symbol";
       packageName = "is-symbol";
@@ -2452,6 +2525,15 @@ let
         sha512 = "cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==";
       };
     };
+    "lodash-4.17.15" = {
+      name = "lodash";
+      packageName = "lodash";
+      version = "4.17.15";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz";
+        sha512 = "8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==";
+      };
+    };
     "lowercase-keys-1.0.0" = {
       name = "lowercase-keys";
       packageName = "lowercase-keys";
@@ -2479,15 +2561,6 @@ let
         sha512 = "sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==";
       };
     };
-    "lru-queue-0.1.0" = {
-      name = "lru-queue";
-      packageName = "lru-queue";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz";
-        sha1 = "2738bd9f0d3cf4f84490c5736c48699ac632cda3";
-      };
-    };
     "makeerror-1.0.11" = {
       name = "makeerror";
       packageName = "makeerror";
@@ -2533,15 +2606,6 @@ let
         sha1 = "8710d7af0aa626f8fffa1ce00168545263255748";
       };
     };
-    "memoizee-0.4.14" = {
-      name = "memoizee";
-      packageName = "memoizee";
-      version = "0.4.14";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/memoizee/-/memoizee-0.4.14.tgz";
-        sha512 = "/SWFvWegAIYAO4NQMpcX+gcra0yEZu4OntmUdrBaWrJncxOqAziGFlHxc7yjKVK2uu3lpPW27P27wkR82wA8mg==";
-      };
-    };
     "merge-descriptors-1.0.1" = {
       name = "merge-descriptors";
       packageName = "merge-descriptors";
@@ -2551,6 +2615,24 @@ let
         sha1 = "b00aaa556dd8b44568150ec9d1b953f3f90cbb61";
       };
     };
+    "merge-stream-2.0.0" = {
+      name = "merge-stream";
+      packageName = "merge-stream";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz";
+        sha512 = "abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==";
+      };
+    };
+    "merge2-1.3.0" = {
+      name = "merge2";
+      packageName = "merge2";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/merge2/-/merge2-1.3.0.tgz";
+        sha512 = "2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw==";
+      };
+    };
     "methods-1.1.2" = {
       name = "methods";
       packageName = "methods";
@@ -2569,6 +2651,15 @@ let
         sha512 = "MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==";
       };
     };
+    "micromatch-4.0.2" = {
+      name = "micromatch";
+      packageName = "micromatch";
+      version = "4.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz";
+        sha512 = "y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==";
+      };
+    };
     "mime-1.4.1" = {
       name = "mime";
       packageName = "mime";
@@ -2587,6 +2678,15 @@ let
         sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==";
       };
     };
+    "mime-2.4.3" = {
+      name = "mime";
+      packageName = "mime";
+      version = "2.4.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mime/-/mime-2.4.3.tgz";
+        sha512 = "QgrPRJfE+riq5TPZMcHZOtm8c6K/yYrMbKIoRfapfiGLxS8OTeIfRhUGW5LU7MlRa52KOAGCfUNruqLrIBvWZw==";
+      };
+    };
     "mime-db-1.40.0" = {
       name = "mime-db";
       packageName = "mime-db";
@@ -2605,6 +2705,15 @@ let
         sha512 = "WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==";
       };
     };
+    "mimic-fn-2.1.0" = {
+      name = "mimic-fn";
+      packageName = "mimic-fn";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz";
+        sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==";
+      };
+    };
     "mimic-response-1.0.1" = {
       name = "mimic-response";
       packageName = "mimic-response";
@@ -2641,22 +2750,22 @@ let
         sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284";
       };
     };
-    "minipass-2.4.0" = {
+    "minipass-2.5.1" = {
       name = "minipass";
       packageName = "minipass";
-      version = "2.4.0";
+      version = "2.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minipass/-/minipass-2.4.0.tgz";
-        sha512 = "6PmOuSP4NnZXzs2z6rbwzLJu/c5gdzYg1mRI/WIYdx45iiX7T+a4esOzavD6V/KmBzAaopFSTZPZcUx73bqKWA==";
+        url = "https://registry.npmjs.org/minipass/-/minipass-2.5.1.tgz";
+        sha512 = "dmpSnLJtNQioZFI5HfQ55Ad0DzzsMAb+HfokwRTNXwEQjepbTkl5mtIlSVxGIkOkxlpX7wIn5ET/oAd9fZ/Y/Q==";
       };
     };
-    "minizlib-1.2.1" = {
+    "minizlib-1.2.2" = {
       name = "minizlib";
       packageName = "minizlib";
-      version = "1.2.1";
+      version = "1.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz";
-        sha512 = "7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==";
+        url = "https://registry.npmjs.org/minizlib/-/minizlib-1.2.2.tgz";
+        sha512 = "hR3At21uSrsjjDTWrbu0IMLTpnkpv8IIMFDFaoz43Tmu4LkmAXfH44vNNzpTnf+OAQQCHrb91y/wc2J4x5XgSQ==";
       };
     };
     "mixin-deep-1.3.2" = {
@@ -2713,13 +2822,13 @@ let
         sha1 = "5041049269c96633c866386960b2f4289e75e5b0";
       };
     };
-    "mustache-3.0.3" = {
+    "mustache-3.1.0" = {
       name = "mustache";
       packageName = "mustache";
-      version = "3.0.3";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mustache/-/mustache-3.0.3.tgz";
-        sha512 = "vM5FkMHamTYmVYeAujypihuPrJQDtaUIlKeeVb1AMJ73OZLtWiF7GprqrjxD0gJWT53W9JfqXxf97nXQjMQkqA==";
+        url = "https://registry.npmjs.org/mustache/-/mustache-3.1.0.tgz";
+        sha512 = "3Bxq1R5LBZp7fbFPZzFe5WN4s0q3+gxZaZuZVY+QctYJiCiVgXHOTIC0/HgZuOPFt/6BQcx5u0H2CUOxT/RoGQ==";
       };
     };
     "nan-2.14.0" = {
@@ -2749,15 +2858,6 @@ let
         sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==";
       };
     };
-    "next-tick-1.0.0" = {
-      name = "next-tick";
-      packageName = "next-tick";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz";
-        sha1 = "ca86d1fe8828169b0120208e3dc8424b9db8342c";
-      };
-    };
     "nice-try-1.0.5" = {
       name = "nice-try";
       packageName = "nice-try";
@@ -2839,6 +2939,15 @@ let
         sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f";
       };
     };
+    "npm-run-path-3.1.0" = {
+      name = "npm-run-path";
+      packageName = "npm-run-path";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-3.1.0.tgz";
+        sha512 = "Dbl4A/VfiVGLgQv29URL9xshU8XDY1GeLy+fsaZ1AA8JDSfjvr5P5+pzRbWqRSBxk6/DW7MIh8lTM/PaGnP2kg==";
+      };
+    };
     "npx-10.2.0" = {
       name = "npx";
       packageName = "npx";
@@ -2875,6 +2984,15 @@ let
         sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c";
       };
     };
+    "object-inspect-1.6.0" = {
+      name = "object-inspect";
+      packageName = "object-inspect";
+      version = "1.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.6.0.tgz";
+        sha512 = "GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ==";
+      };
+    };
     "object-keys-1.1.1" = {
       name = "object-keys";
       packageName = "object-keys";
@@ -2929,13 +3047,22 @@ let
         sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1";
       };
     };
-    "opn-5.3.0" = {
-      name = "opn";
-      packageName = "opn";
-      version = "5.3.0";
+    "onetime-5.1.0" = {
+      name = "onetime";
+      packageName = "onetime";
+      version = "5.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz";
+        sha512 = "5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==";
+      };
+    };
+    "open-6.4.0" = {
+      name = "open";
+      packageName = "open";
+      version = "6.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/opn/-/opn-5.3.0.tgz";
-        sha512 = "bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g==";
+        url = "https://registry.npmjs.org/open/-/open-6.4.0.tgz";
+        sha512 = "IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg==";
       };
     };
     "opn-5.4.0" = {
@@ -3001,6 +3128,15 @@ let
         sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae";
       };
     };
+    "p-finally-2.0.1" = {
+      name = "p-finally";
+      packageName = "p-finally";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-finally/-/p-finally-2.0.1.tgz";
+        sha512 = "vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw==";
+      };
+    };
     "p-is-promise-1.1.0" = {
       name = "p-is-promise";
       packageName = "p-is-promise";
@@ -3109,6 +3245,15 @@ let
         sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40";
       };
     };
+    "path-key-3.1.0" = {
+      name = "path-key";
+      packageName = "path-key";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-key/-/path-key-3.1.0.tgz";
+        sha512 = "8cChqz0RP6SHJkMt48FW0A7+qUOn+OsnOsVtzI59tZ8m+5bCSk7hzwET0pulwOM2YMn9J1efb07KB9l9f30SGg==";
+      };
+    };
     "path-to-regexp-0.1.7" = {
       name = "path-to-regexp";
       packageName = "path-to-regexp";
@@ -3118,13 +3263,22 @@ let
         sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c";
       };
     };
-    "pem-1.13.2" = {
+    "path-type-4.0.0" = {
+      name = "path-type";
+      packageName = "path-type";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz";
+        sha512 = "gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==";
+      };
+    };
+    "pem-1.14.2" = {
       name = "pem";
       packageName = "pem";
-      version = "1.13.2";
+      version = "1.14.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pem/-/pem-1.13.2.tgz";
-        sha512 = "MPJWuEb/r6AG+GpZi2JnfNtGAZDeL/8+ERKwXEWRuST5i+4lq/Uy36B352OWIUSPQGH+HR1HEDcIDi+8cKxXNg==";
+        url = "https://registry.npmjs.org/pem/-/pem-1.14.2.tgz";
+        sha512 = "TOnPtq3ZFnCniOZ+rka4pk8UIze9xG1qI+wNE7EmkiR/cg+53uVvk5QbkWZ7M6RsuOxzz62FW1hlAobJr/lTOA==";
       };
     };
     "performance-now-2.1.0" = {
@@ -3226,13 +3380,13 @@ let
         sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3";
       };
     };
-    "psl-1.3.0" = {
+    "psl-1.4.0" = {
       name = "psl";
       packageName = "psl";
-      version = "1.3.0";
+      version = "1.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/psl/-/psl-1.3.0.tgz";
-        sha512 = "avHdspHO+9rQTLbv1RO+MPYeP/SzsCoxofjVnHanETfQhTJrmB0HlDoW+EiN/R+C0BZ+gERab9NY0lPN2TxNag==";
+        url = "https://registry.npmjs.org/psl/-/psl-1.4.0.tgz";
+        sha512 = "HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw==";
       };
     };
     "pump-3.0.0" = {
@@ -3298,15 +3452,6 @@ let
         sha512 = "gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==";
       };
     };
-    "querystringify-2.1.1" = {
-      name = "querystringify";
-      packageName = "querystringify";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz";
-        sha512 = "w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==";
-      };
-    };
     "range-parser-1.2.1" = {
       name = "range-parser";
       packageName = "range-parser";
@@ -3523,6 +3668,15 @@ let
         sha512 = "TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==";
       };
     };
+    "reusify-1.0.4" = {
+      name = "reusify";
+      packageName = "reusify";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz";
+        sha512 = "U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==";
+      };
+    };
     "rimraf-2.2.8" = {
       name = "rimraf";
       packageName = "rimraf";
@@ -3550,6 +3704,24 @@ let
         sha512 = "nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==";
       };
     };
+    "run-parallel-1.1.9" = {
+      name = "run-parallel";
+      packageName = "run-parallel";
+      version = "1.1.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz";
+        sha512 = "DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==";
+      };
+    };
+    "rxjs-6.5.3" = {
+      name = "rxjs";
+      packageName = "rxjs";
+      version = "6.5.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/rxjs/-/rxjs-6.5.3.tgz";
+        sha512 = "wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA==";
+      };
+    };
     "safe-buffer-5.1.1" = {
       name = "safe-buffer";
       packageName = "safe-buffer";
@@ -3757,6 +3929,15 @@ let
         sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d";
       };
     };
+    "slash-3.0.0" = {
+      name = "slash";
+      packageName = "slash";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz";
+        sha512 = "g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==";
+      };
+    };
     "snapdragon-0.8.2" = {
       name = "snapdragon";
       packageName = "snapdragon";
@@ -3901,6 +4082,24 @@ let
         sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==";
       };
     };
+    "string.prototype.trimleft-2.1.0" = {
+      name = "string.prototype.trimleft";
+      packageName = "string.prototype.trimleft";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz";
+        sha512 = "FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw==";
+      };
+    };
+    "string.prototype.trimright-2.1.0" = {
+      name = "string.prototype.trimright";
+      packageName = "string.prototype.trimright";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz";
+        sha512 = "fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg==";
+      };
+    };
     "string_decoder-0.10.31" = {
       name = "string_decoder";
       packageName = "string_decoder";
@@ -3946,6 +4145,15 @@ let
         sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf";
       };
     };
+    "strip-final-newline-2.0.0" = {
+      name = "strip-final-newline";
+      packageName = "strip-final-newline";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz";
+        sha512 = "BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==";
+      };
+    };
     "strip-json-comments-2.0.1" = {
       name = "strip-json-comments";
       packageName = "strip-json-comments";
@@ -3964,15 +4172,6 @@ let
         sha1 = "d78c14398297d604fe6588dc3b03deca7b91ba93";
       };
     };
-    "supervisor-0.12.0" = {
-      name = "supervisor";
-      packageName = "supervisor";
-      version = "0.12.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/supervisor/-/supervisor-0.12.0.tgz";
-        sha1 = "de7e6337015b291851c10f3538c4a7f04917ecc1";
-      };
-    };
     "supports-color-2.0.0" = {
       name = "supports-color";
       packageName = "supports-color";
@@ -4063,15 +4262,6 @@ let
         sha1 = "f32eacac5a175bea25d7fab565ab3ed8741ef56f";
       };
     };
-    "timers-ext-0.1.7" = {
-      name = "timers-ext";
-      packageName = "timers-ext";
-      version = "0.1.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.7.tgz";
-        sha512 = "b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==";
-      };
-    };
     "tmp-0.0.31" = {
       name = "tmp";
       packageName = "tmp";
@@ -4171,6 +4361,15 @@ let
         sha1 = "61dbc2d53b69ff6091a12a168fd7d433107e40f1";
       };
     };
+    "tslib-1.10.0" = {
+      name = "tslib";
+      packageName = "tslib";
+      version = "1.10.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz";
+        sha512 = "qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==";
+      };
+    };
     "tunnel-agent-0.6.0" = {
       name = "tunnel-agent";
       packageName = "tunnel-agent";
@@ -4189,15 +4388,6 @@ let
         sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64";
       };
     };
-    "type-1.0.3" = {
-      name = "type";
-      packageName = "type";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/type/-/type-1.0.3.tgz";
-        sha512 = "51IMtNfVcee8+9GJvj0spSuFcZHe9vSib6Xtgsny1Km9ugyz2mbS08I3rsUIRYgJohFRFU1160sgRodYz378Hg==";
-      };
-    };
     "type-is-1.6.18" = {
       name = "type-is";
       packageName = "type-is";
@@ -4288,13 +4478,13 @@ let
         sha512 = "NG1h/MdGIX3HzyqMjyj1laBCmlPYhcO4xEy7gEqqzGiSLw7XqDQCnY4nYSn5XSaH8mQ6TFkaujrO8d/PIZN85A==";
       };
     };
-    "upath-1.1.2" = {
+    "upath-1.2.0" = {
       name = "upath";
       packageName = "upath";
-      version = "1.1.2";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/upath/-/upath-1.1.2.tgz";
-        sha512 = "kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==";
+        url = "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz";
+        sha512 = "aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==";
       };
     };
     "uri-js-4.2.2" = {
@@ -4315,15 +4505,6 @@ let
         sha1 = "da937f7a62e21fec1fd18d49b35c2935067a6c72";
       };
     };
-    "url-parse-1.4.3" = {
-      name = "url-parse";
-      packageName = "url-parse";
-      version = "1.4.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/url-parse/-/url-parse-1.4.3.tgz";
-        sha512 = "rh+KuAW36YKo0vClhQzLLveoj8FwPJNu65xLb7Mrt+eZht0IPT0IXgSv8gcMegZ6NvjJUALf6Mf25POlMwD1Fw==";
-      };
-    };
     "url-parse-lax-1.0.0" = {
       name = "url-parse-lax";
       packageName = "url-parse-lax";
@@ -4414,6 +4595,60 @@ let
         sha1 = "3a105ca17053af55d6e270c1f8288682e18da400";
       };
     };
+    "vscode-jsonrpc-4.0.0" = {
+      name = "vscode-jsonrpc";
+      packageName = "vscode-jsonrpc";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-4.0.0.tgz";
+        sha512 = "perEnXQdQOJMTDFNv+UF3h1Y0z4iSiaN9jIlb0OqIYgosPCZGYh/MCUlkFtV2668PL69lRDO32hmvL2yiidUYg==";
+      };
+    };
+    "vscode-languageserver-5.2.1" = {
+      name = "vscode-languageserver";
+      packageName = "vscode-languageserver";
+      version = "5.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-5.2.1.tgz";
+        sha512 = "GuayqdKZqAwwaCUjDvMTAVRPJOp/SLON3mJ07eGsx/Iq9HjRymhKWztX41rISqDKhHVVyFM+IywICyZDla6U3A==";
+      };
+    };
+    "vscode-languageserver-protocol-3.14.1" = {
+      name = "vscode-languageserver-protocol";
+      packageName = "vscode-languageserver-protocol";
+      version = "3.14.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.14.1.tgz";
+        sha512 = "IL66BLb2g20uIKog5Y2dQ0IiigW0XKrvmWiOvc0yXw80z3tMEzEnHjaGAb3ENuU7MnQqgnYJ1Cl2l9RvNgDi4g==";
+      };
+    };
+    "vscode-languageserver-types-3.14.0" = {
+      name = "vscode-languageserver-types";
+      packageName = "vscode-languageserver-types";
+      version = "3.14.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.14.0.tgz";
+        sha512 = "lTmS6AlAlMHOvPQemVwo3CezxBp0sNB95KNPkqp3Nxd5VFEnuG1ByM0zlRWos0zjO3ZWtkvhal0COgiV1xIA4A==";
+      };
+    };
+    "vscode-uri-1.0.8" = {
+      name = "vscode-uri";
+      packageName = "vscode-uri";
+      version = "1.0.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vscode-uri/-/vscode-uri-1.0.8.tgz";
+        sha512 = "obtSWTlbJ+a+TFRYGaUumtVwb+InIUVI0Lu0VBUAPmj2cU5JutEXg3xUE0c2J5Tcy7h2DEKVJBFi+Y9ZSFzzPQ==";
+      };
+    };
+    "vscode-uri-2.0.3" = {
+      name = "vscode-uri";
+      packageName = "vscode-uri";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vscode-uri/-/vscode-uri-2.0.3.tgz";
+        sha512 = "4D3DI3F4uRy09WNtDGD93H9q034OHImxiIcSq664Hq1Y1AScehlP3qqZyTkX/RWxeu0MRMHGkrxYqm2qlDF/aw==";
+      };
+    };
     "walker-1.0.7" = {
       name = "walker";
       packageName = "walker";
@@ -4423,6 +4658,15 @@ let
         sha1 = "2f7f9b8fd10d677262b18a884e28d19618e028fb";
       };
     };
+    "web-tree-sitter-0.15.9" = {
+      name = "web-tree-sitter";
+      packageName = "web-tree-sitter";
+      version = "0.15.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/web-tree-sitter/-/web-tree-sitter-0.15.9.tgz";
+        sha512 = "1lf4lnmi8oxuEzI6gpUok2FQlHXOmV1iipltkQvmR785JWnUbjhw1sZnwSCkisQP+/g/aezpMGcW3mjz0uVhMw==";
+      };
+    };
     "which-1.3.1" = {
       name = "which";
       packageName = "which";
@@ -4477,15 +4721,6 @@ let
         sha512 = "8A/uRMnQy8KCQsmep1m7Bk+z/+LIkeF7w+TDMLtX1iZm5Hq9HsUDmgFGaW1ACW5Cj0b2Qo7wCvRhYN2ErUVp/A==";
       };
     };
-    "ws-5.2.0" = {
-      name = "ws";
-      packageName = "ws";
-      version = "5.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ws/-/ws-5.2.0.tgz";
-        sha512 = "c18dMeW+PEQdDFzkhDsnBAlS4Z8KGStBQQUcQ5mf7Nf689jyGk0594L+i9RaQuf4gog6SvWLJorz2NfSaqxZ7w==";
-      };
-    };
     "ws-5.2.2" = {
       name = "ws";
       packageName = "ws";
@@ -4504,6 +4739,24 @@ let
         sha512 = "GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==";
       };
     };
+    "ws-7.1.1" = {
+      name = "ws";
+      packageName = "ws";
+      version = "7.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ws/-/ws-7.1.1.tgz";
+        sha512 = "o41D/WmDeca0BqYhsr3nJzQyg9NF5X8l/UdnFNux9cS3lwB+swm8qGWX5rn+aD6xfBU3rGmtHij7g7x6LxFU3A==";
+      };
+    };
+    "ws-7.1.2" = {
+      name = "ws";
+      packageName = "ws";
+      version = "7.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ws/-/ws-7.1.2.tgz";
+        sha512 = "gftXq3XI81cJCgkUiAVixA0raD9IVmXqsylCrjRygw4+UOOGzPoxnQ6r/CnVL9i+mDncJo94tSkyrtuuQVBmrg==";
+      };
+    };
     "xmlbuilder-8.2.2" = {
       name = "xmlbuilder";
       packageName = "xmlbuilder";
@@ -4780,12 +5033,12 @@ in
       sources."mime-types-2.1.24"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
-      (sources."minipass-2.4.0" // {
+      (sources."minipass-2.5.1" // {
         dependencies = [
           sources."yallist-3.0.3"
         ];
       })
-      sources."minizlib-1.2.1"
+      sources."minizlib-1.2.2"
       sources."mixin-deep-1.3.2"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
@@ -4794,7 +5047,7 @@ in
       })
       sources."ms-2.0.0"
       sources."murmur-hash-js-1.0.0"
-      sources."mustache-3.0.3"
+      sources."mustache-3.1.0"
       sources."nan-2.14.0"
       sources."nanomatch-1.2.13"
       sources."node-elm-compiler-5.0.3"
@@ -4824,7 +5077,7 @@ in
       sources."posix-character-classes-0.1.1"
       sources."process-nextick-args-2.0.1"
       sources."pseudomap-1.0.2"
-      sources."psl-1.3.0"
+      sources."psl-1.4.0"
       sources."punycode-2.1.1"
       sources."qs-6.5.2"
       sources."readable-stream-2.3.6"
@@ -4949,7 +5202,7 @@ in
         ];
       })
       sources."unzip-stream-0.3.0"
-      sources."upath-1.1.2"
+      sources."upath-1.2.0"
       sources."uri-js-4.2.2"
       sources."urix-0.1.0"
       sources."use-3.1.1"
@@ -5193,12 +5446,12 @@ in
       sources."mime-types-2.1.24"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
-      (sources."minipass-2.4.0" // {
+      (sources."minipass-2.5.1" // {
         dependencies = [
           sources."yallist-3.0.3"
         ];
       })
-      sources."minizlib-1.2.1"
+      sources."minizlib-1.2.2"
       sources."mixin-deep-1.3.2"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
@@ -5207,7 +5460,7 @@ in
       })
       sources."ms-2.0.0"
       sources."murmur-hash-js-1.0.0"
-      sources."mustache-3.0.3"
+      sources."mustache-3.1.0"
       sources."nan-2.14.0"
       sources."nanomatch-1.2.13"
       sources."node-elm-compiler-5.0.3"
@@ -5241,7 +5494,7 @@ in
       sources."posix-character-classes-0.1.1"
       sources."process-nextick-args-2.0.1"
       sources."pseudomap-1.0.2"
-      sources."psl-1.3.0"
+      sources."psl-1.4.0"
       sources."punycode-2.1.1"
       sources."qs-6.5.2"
       sources."readable-stream-2.3.6"
@@ -5372,7 +5625,7 @@ in
         ];
       })
       sources."unzip-stream-0.3.0"
-      sources."upath-1.1.2"
+      sources."upath-1.2.0"
       sources."uri-js-4.2.2"
       sources."urix-0.1.0"
       sources."use-3.1.1"
@@ -5465,7 +5718,7 @@ in
       sources."collection-visit-1.0.0"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
-      sources."commander-3.0.0"
+      sources."commander-3.0.1"
       sources."component-emitter-1.3.0"
       sources."concat-map-0.0.1"
       sources."content-disposition-0.5.3"
@@ -5488,7 +5741,7 @@ in
       sources."ee-first-1.1.1"
       sources."encodeurl-1.0.2"
       sources."end-of-stream-1.4.1"
-      sources."es-abstract-1.13.0"
+      sources."es-abstract-1.14.2"
       sources."es-to-primitive-1.2.0"
       sources."escape-html-1.0.3"
       sources."escape-string-regexp-1.0.5"
@@ -5587,7 +5840,7 @@ in
       sources."is-plain-obj-1.1.0"
       sources."is-plain-object-2.0.4"
       sources."is-regex-1.0.4"
-      sources."is-retry-allowed-1.1.0"
+      sources."is-retry-allowed-1.2.0"
       sources."is-stream-1.1.0"
       sources."is-symbol-1.0.2"
       sources."is-windows-1.0.2"
@@ -5642,6 +5895,7 @@ in
           sources."kind-of-3.2.2"
         ];
       })
+      sources."object-inspect-1.6.0"
       sources."object-keys-1.1.1"
       sources."object-visit-1.0.1"
       sources."object.getownpropertydescriptors-2.0.3"
@@ -5760,6 +6014,8 @@ in
       })
       sources."statuses-1.5.0"
       sources."strict-uri-encode-1.1.0"
+      sources."string.prototype.trimleft-2.1.0"
+      sources."string.prototype.trimright-2.1.0"
       sources."string_decoder-1.1.1"
       sources."strip-eof-1.0.0"
       sources."strip-json-comments-2.0.1"
@@ -5844,7 +6100,7 @@ in
       sources."ini-1.3.5"
       sources."is-object-1.0.1"
       sources."is-redirect-1.0.0"
-      sources."is-retry-allowed-1.1.0"
+      sources."is-retry-allowed-1.2.0"
       sources."is-stream-1.1.0"
       sources."isexe-2.0.0"
       sources."isurl-1.0.0"
@@ -5983,7 +6239,7 @@ in
       sources."performance-now-2.1.0"
       sources."process-nextick-args-1.0.7"
       sources."proxy-addr-2.0.5"
-      sources."psl-1.3.0"
+      sources."psl-1.4.0"
       sources."punycode-2.1.1"
       sources."qs-6.5.1"
       sources."range-parser-1.2.1"
@@ -6050,57 +6306,46 @@ in
   elm-live = nodeEnv.buildNodePackage {
     name = "elm-live";
     packageName = "elm-live";
-    version = "3.4.1";
+    version = "4.0.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/elm-live/-/elm-live-3.4.1.tgz";
-      sha512 = "7J4MCV0uyzfnGznSdVzz9o2vgHQwHSVKgEW/NG7dG7nsDWWxqPudQ/FkHYJFWjkylnRtBZUAtB27ZwnLIsgRUw==";
+      url = "https://registry.npmjs.org/elm-live/-/elm-live-4.0.0.tgz";
+      sha512 = "Yf6afXvBnghRZkefxgXCf/KjCm3DlwT6lfTrjLSc5v0I0VXE2Rc5T9iqXihjg3alh9t8NwDVLL+/py8PkkdC9Q==";
     };
     dependencies = [
       sources."ansi-regex-2.1.1"
       sources."ansi-styles-2.2.1"
-      sources."anymatch-3.0.3"
-      sources."async-each-1.0.3"
+      sources."anymatch-3.1.0"
       sources."async-limiter-1.0.1"
       sources."binary-extensions-2.0.0"
       sources."braces-3.0.2"
       sources."chalk-1.1.3"
       sources."charenc-0.0.2"
-      sources."chokidar-3.0.0"
-      sources."cli-color-1.2.0"
+      sources."chokidar-3.0.2"
       sources."commander-2.17.1"
-      sources."connect-pushstate-1.1.0"
+      sources."crocks-0.12.1"
       sources."cross-spawn-5.0.1"
       sources."crypt-0.0.2"
-      sources."d-1.0.1"
       sources."debug-2.6.9"
-      sources."default-gateway-2.7.2"
+      sources."default-gateway-4.2.0"
       sources."depd-1.1.2"
       sources."destroy-1.0.4"
       sources."ee-first-1.1.1"
-      (sources."elm-serve-0.4.0" // {
-        dependencies = [
-          sources."commander-2.9.0"
-        ];
-      })
+      sources."elm-hot-1.1.1"
       sources."encodeurl-1.0.2"
-      sources."es5-ext-0.10.50"
-      sources."es6-iterator-2.0.3"
+      sources."end-of-stream-1.4.1"
       sources."es6-promisify-6.0.2"
-      sources."es6-symbol-3.1.1"
-      sources."es6-weak-map-2.0.3"
       sources."escape-html-1.0.3"
       sources."escape-string-regexp-1.0.5"
       sources."etag-1.8.1"
-      sources."event-emitter-0.3.5"
       sources."eventemitter3-3.1.2"
-      (sources."execa-0.10.0" // {
+      (sources."execa-1.0.0" // {
         dependencies = [
           sources."cross-spawn-6.0.5"
         ];
       })
       sources."fill-range-7.0.1"
-      sources."finalhandler-1.1.1"
-      (sources."follow-redirects-1.8.1" // {
+      sources."finalhandler-1.1.2"
+      (sources."follow-redirects-1.9.0" // {
         dependencies = [
           sources."debug-3.2.6"
           sources."ms-2.1.2"
@@ -6108,14 +6353,13 @@ in
       })
       sources."fresh-0.5.2"
       sources."fsevents-2.0.7"
-      sources."get-stream-3.0.0"
+      sources."get-stream-4.1.0"
       sources."glob-parent-5.0.0"
-      sources."graceful-readlink-1.0.1"
       sources."has-ansi-2.0.0"
-      sources."http-errors-1.6.3"
+      sources."http-errors-1.7.3"
       sources."http-proxy-1.17.0"
-      sources."inherits-2.0.3"
-      sources."internal-ip-3.0.1"
+      sources."inherits-2.0.4"
+      sources."internal-ip-4.3.0"
       sources."ip-regex-2.1.0"
       sources."ipaddr.js-1.9.1"
       sources."is-binary-path-2.1.0"
@@ -6123,53 +6367,52 @@ in
       sources."is-extglob-2.1.1"
       sources."is-glob-4.0.1"
       sources."is-number-7.0.0"
-      sources."is-promise-2.1.0"
       sources."is-stream-1.1.0"
       sources."is-wsl-1.1.0"
       sources."isexe-2.0.0"
       sources."lru-cache-4.1.5"
-      sources."lru-queue-0.1.0"
       sources."md5-2.2.1"
-      sources."memoizee-0.4.14"
-      sources."mime-1.4.1"
-      sources."minimist-1.2.0"
+      sources."mime-2.4.3"
       sources."ms-2.0.0"
-      sources."next-tick-1.0.0"
       sources."nice-try-1.0.5"
       sources."normalize-path-3.0.0"
       sources."npm-run-path-2.0.2"
       sources."on-finished-2.3.0"
-      sources."opn-5.3.0"
+      sources."once-1.4.0"
+      sources."open-6.4.0"
       sources."os-tmpdir-1.0.2"
       sources."p-finally-1.0.0"
       sources."parseurl-1.3.3"
       sources."path-key-2.0.1"
-      sources."pem-1.13.2"
+      sources."pem-1.14.2"
       sources."picomatch-2.0.7"
       sources."pseudomap-1.0.2"
-      sources."querystringify-2.1.1"
+      sources."pump-3.0.0"
       sources."range-parser-1.2.1"
       sources."readdirp-3.1.2"
       sources."requires-port-1.0.0"
       sources."semver-5.7.1"
-      sources."send-0.16.2"
-      sources."serve-static-1.13.2"
-      sources."setprototypeof-1.1.0"
+      (sources."send-0.17.1" // {
+        dependencies = [
+          sources."mime-1.6.0"
+          sources."ms-2.1.1"
+        ];
+      })
+      sources."serve-static-1.14.1"
+      sources."setprototypeof-1.1.1"
       sources."shebang-command-1.2.0"
       sources."shebang-regex-1.0.0"
       sources."signal-exit-3.0.2"
-      sources."statuses-1.4.0"
+      sources."statuses-1.5.0"
       sources."strip-ansi-3.0.1"
       sources."strip-eof-1.0.0"
-      sources."supervisor-0.12.0"
       sources."supports-color-2.0.0"
-      sources."timers-ext-0.1.7"
       sources."to-regex-range-5.0.1"
-      sources."type-1.0.3"
+      sources."toidentifier-1.0.0"
       sources."unpipe-1.0.0"
-      sources."url-parse-1.4.3"
       sources."which-1.3.1"
-      sources."ws-5.2.0"
+      sources."wrappy-1.0.2"
+      sources."ws-7.1.1"
       sources."yallist-2.1.2"
     ];
     buildInputs = globalBuildInputs;
@@ -6222,4 +6465,248 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
+  "@elm-tooling/elm-language-server" = nodeEnv.buildNodePackage {
+    name = "_at_elm-tooling_slash_elm-language-server";
+    packageName = "@elm-tooling/elm-language-server";
+    version = "1.4.1";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/@elm-tooling/elm-language-server/-/elm-language-server-1.4.1.tgz";
+      sha512 = "gzN/ee5JfQmg/+2xFq49zRN62ZFeMTu5A0unwQpOf3qLZa8Rz7no6OIaCnl6nEkNsaoAjvZxv1aFJOd2TtNtFw==";
+    };
+    dependencies = [
+      sources."@nodelib/fs.scandir-2.1.2"
+      sources."@nodelib/fs.stat-2.0.2"
+      sources."@nodelib/fs.walk-1.2.3"
+      sources."@types/events-3.0.0"
+      sources."@types/glob-7.1.1"
+      sources."@types/minimatch-3.0.3"
+      sources."@types/node-12.7.5"
+      sources."accepts-1.3.7"
+      sources."ajv-6.10.2"
+      sources."array-flatten-1.1.1"
+      sources."array-union-2.1.0"
+      sources."asn1-0.2.4"
+      sources."assert-plus-1.0.0"
+      sources."async-limiter-1.0.1"
+      sources."asynckit-0.4.0"
+      sources."aws-sign2-0.7.0"
+      sources."aws4-1.8.0"
+      sources."babel-runtime-6.18.0"
+      sources."balanced-match-1.0.0"
+      sources."bcrypt-pbkdf-1.0.2"
+      sources."body-parser-1.18.2"
+      sources."brace-expansion-1.1.11"
+      sources."braces-3.0.2"
+      sources."bytes-3.0.0"
+      sources."caseless-0.12.0"
+      sources."combined-stream-1.0.8"
+      sources."concat-map-0.0.1"
+      sources."concat-stream-1.5.2"
+      sources."content-disposition-0.5.2"
+      sources."content-type-1.0.4"
+      sources."cookie-0.3.1"
+      sources."cookie-signature-1.0.6"
+      sources."core-js-2.6.9"
+      sources."core-util-is-1.0.2"
+      sources."cross-spawn-6.0.5"
+      sources."dashdash-1.14.1"
+      sources."debug-2.6.9"
+      sources."delayed-stream-1.0.0"
+      sources."depd-1.1.2"
+      sources."destroy-1.0.4"
+      sources."dir-glob-3.0.1"
+      sources."ecc-jsbn-0.1.2"
+      sources."ee-first-1.1.1"
+      (sources."elm-analyse-git://github.com/elm-tooling/elm-analyse#f2a983fc7bab262a3e44b46732735d8510d18876" // {
+        dependencies = [
+          sources."ultron-1.1.1"
+          sources."ws-3.3.1"
+        ];
+      })
+      sources."encodeurl-1.0.2"
+      sources."end-of-stream-1.4.1"
+      sources."escape-html-1.0.3"
+      sources."etag-1.8.1"
+      (sources."execa-2.0.4" // {
+        dependencies = [
+          sources."is-stream-2.0.0"
+        ];
+      })
+      sources."express-4.16.3"
+      (sources."express-ws-2.0.0" // {
+        dependencies = [
+          sources."ws-1.1.5"
+        ];
+      })
+      sources."extend-3.0.2"
+      sources."extsprintf-1.3.0"
+      sources."fast-deep-equal-2.0.1"
+      sources."fast-diff-1.2.0"
+      sources."fast-glob-3.0.4"
+      sources."fast-json-stable-stringify-2.0.0"
+      sources."fastq-1.6.0"
+      sources."fill-range-7.0.1"
+      sources."finalhandler-1.1.1"
+      sources."find-0.2.7"
+      sources."forever-agent-0.6.1"
+      sources."form-data-2.3.3"
+      sources."forwarded-0.1.2"
+      sources."fresh-0.5.2"
+      sources."fs-extra-2.0.0"
+      sources."fs.realpath-1.0.0"
+      sources."get-stream-5.1.0"
+      sources."getpass-0.1.7"
+      sources."glob-7.1.4"
+      sources."glob-parent-5.0.0"
+      sources."globby-10.0.1"
+      sources."graceful-fs-4.2.2"
+      sources."har-schema-2.0.0"
+      sources."har-validator-5.1.3"
+      sources."http-errors-1.6.3"
+      sources."http-signature-1.2.0"
+      sources."iconv-lite-0.4.19"
+      sources."ignore-5.1.4"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.3"
+      sources."ipaddr.js-1.9.0"
+      sources."is-extglob-2.1.1"
+      sources."is-glob-4.0.1"
+      sources."is-number-7.0.0"
+      sources."is-stream-1.1.0"
+      sources."is-typedarray-1.0.0"
+      sources."is-wsl-1.1.0"
+      sources."isarray-1.0.0"
+      sources."isexe-2.0.0"
+      sources."isstream-0.1.2"
+      sources."jsbn-0.1.1"
+      sources."json-schema-0.2.3"
+      sources."json-schema-traverse-0.4.1"
+      sources."json-stringify-safe-5.0.1"
+      sources."jsonfile-2.4.0"
+      sources."jsprim-1.4.1"
+      sources."lodash-4.17.15"
+      sources."media-typer-0.3.0"
+      sources."merge-descriptors-1.0.1"
+      sources."merge-stream-2.0.0"
+      sources."merge2-1.3.0"
+      sources."methods-1.1.2"
+      sources."micromatch-4.0.2"
+      sources."mime-1.4.1"
+      sources."mime-db-1.40.0"
+      sources."mime-types-2.1.24"
+      sources."mimic-fn-2.1.0"
+      sources."minimatch-3.0.4"
+      sources."minimist-1.2.0"
+      sources."ms-2.0.0"
+      sources."negotiator-0.6.2"
+      sources."nice-try-1.0.5"
+      sources."node-watch-0.5.5"
+      (sources."npm-run-path-3.1.0" // {
+        dependencies = [
+          sources."path-key-3.1.0"
+        ];
+      })
+      sources."oauth-sign-0.9.0"
+      sources."on-finished-2.3.0"
+      sources."once-1.4.0"
+      sources."onetime-5.1.0"
+      sources."opn-5.4.0"
+      sources."options-0.0.6"
+      sources."os-homedir-1.0.2"
+      sources."os-tmpdir-1.0.2"
+      sources."p-finally-2.0.1"
+      sources."parseurl-1.3.3"
+      sources."path-is-absolute-1.0.1"
+      sources."path-key-2.0.1"
+      sources."path-to-regexp-0.1.7"
+      sources."path-type-4.0.0"
+      sources."performance-now-2.1.0"
+      sources."picomatch-2.0.7"
+      sources."process-nextick-args-1.0.7"
+      sources."proxy-addr-2.0.5"
+      sources."psl-1.4.0"
+      sources."pump-3.0.0"
+      sources."punycode-2.1.1"
+      sources."qs-6.5.1"
+      sources."range-parser-1.2.1"
+      (sources."raw-body-2.3.2" // {
+        dependencies = [
+          sources."depd-1.1.1"
+          sources."http-errors-1.6.2"
+          sources."setprototypeof-1.0.3"
+        ];
+      })
+      sources."readable-stream-2.0.6"
+      sources."regenerator-runtime-0.9.6"
+      (sources."request-2.88.0" // {
+        dependencies = [
+          sources."qs-6.5.2"
+          sources."safe-buffer-5.2.0"
+        ];
+      })
+      sources."reusify-1.0.4"
+      sources."run-parallel-1.1.9"
+      sources."rxjs-6.5.3"
+      sources."safe-buffer-5.1.1"
+      sources."safer-buffer-2.1.2"
+      sources."semver-5.7.1"
+      sources."send-0.16.2"
+      sources."serve-static-1.13.2"
+      sources."setprototypeof-1.1.0"
+      sources."shebang-command-1.2.0"
+      sources."shebang-regex-1.0.0"
+      sources."signal-exit-3.0.2"
+      sources."slash-3.0.0"
+      sources."sshpk-1.16.1"
+      sources."statuses-1.4.0"
+      sources."string_decoder-0.10.31"
+      sources."strip-final-newline-2.0.0"
+      sources."sums-0.2.4"
+      sources."through2-2.0.1"
+      sources."tmp-0.0.31"
+      sources."to-regex-range-5.0.1"
+      (sources."tough-cookie-2.4.3" // {
+        dependencies = [
+          sources."punycode-1.4.1"
+        ];
+      })
+      sources."traverse-chain-0.1.0"
+      sources."tslib-1.10.0"
+      sources."tunnel-agent-0.6.0"
+      sources."tweetnacl-0.14.5"
+      sources."type-is-1.6.18"
+      sources."typedarray-0.0.6"
+      sources."ultron-1.0.2"
+      sources."unpipe-1.0.0"
+      sources."uri-js-4.2.2"
+      sources."util-deprecate-1.0.2"
+      sources."utils-merge-1.0.1"
+      sources."uuid-3.3.3"
+      sources."vary-1.1.2"
+      sources."verror-1.10.0"
+      sources."vscode-jsonrpc-4.0.0"
+      (sources."vscode-languageserver-5.2.1" // {
+        dependencies = [
+          sources."vscode-uri-1.0.8"
+        ];
+      })
+      sources."vscode-languageserver-protocol-3.14.1"
+      sources."vscode-languageserver-types-3.14.0"
+      sources."vscode-uri-2.0.3"
+      sources."web-tree-sitter-0.15.9"
+      sources."which-1.3.1"
+      sources."wrappy-1.0.2"
+      sources."ws-7.1.2"
+      sources."xtend-4.0.2"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Implementation of an elm language server in node.";
+      homepage = "https://github.com/elm-tooling/elm-language-server#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
 }
\ No newline at end of file
-- 
GitLab


From 6ba044c1667a4966a69debe73940972307225301 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 15 Sep 2019 16:31:57 +0200
Subject: [PATCH 0301/2254] pythonPackages.demjson: disable on python 3

It doesn't seem to support _any_ python 3 versions.
---
 pkgs/development/python-modules/demjson/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/demjson/default.nix b/pkgs/development/python-modules/demjson/default.nix
index 853beaf34a1..265a4cb5712 100644
--- a/pkgs/development/python-modules/demjson/default.nix
+++ b/pkgs/development/python-modules/demjson/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy36 }:
+{ stdenv, buildPythonPackage, fetchPypi, isPy3k }:
 
 buildPythonPackage rec {
   pname = "demjson";
   version = "2.2.4";
-  disabled = isPy36;
+  disabled = isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-- 
GitLab


From 7dfd313a3d28dae7b49db615ca52aa4d35dd7cce Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Sun, 15 Sep 2019 17:21:04 +0200
Subject: [PATCH 0302/2254] pythonPackages.aioesphomeapi: 2.0.1 -> 2.2.0

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

diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix
index 0afb1c432d6..8d8467207ce 100644
--- a/pkgs/development/python-modules/aioesphomeapi/default.nix
+++ b/pkgs/development/python-modules/aioesphomeapi/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "aioesphomeapi";
-  version = "2.0.1";
+  version = "2.2.0";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "db09e34dfc148279f303481c7da94b84c9b1442a41794f039c31253e81a58ffb";
+    sha256 = "0znal1hi964acc8bl3z0ikscax7zziks838ld099rjsbffjwmwn5";
   };
 
   propagatedBuildInputs = [ attrs protobuf zeroconf ];
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Python Client for ESPHome native API";
-    homepage = https://github.com/esphome/aioesphomeapi;
+    homepage = "https://github.com/esphome/aioesphomeapi";
     license = licenses.mit;
     maintainers = with maintainers; [ dotlambda ];
 
-- 
GitLab


From 7cc7645fb0f9c6d6432ba6d72cc4b2774f24e1af Mon Sep 17 00:00:00 2001
From: Elmo Todurov <elmo.todurov@eesti.ee>
Date: Fri, 26 Jul 2019 12:01:10 +0300
Subject: [PATCH 0303/2254] maintainers: renamed myself

---
 maintainers/maintainer-list.nix | 10 ++++++----
 pkgs/games/tdm/default.nix      |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 3a761915d8a..058561eb624 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1109,10 +1109,6 @@
     githubId = 977929;
     name = "Cody Allen";
   };
-  cf6b88f = {
-    email = "elmo.todurov@eesti.ee";
-    name = "Elmo Todurov";
-  };
   cfouche = {
     email = "chaddai.fouche@gmail.com";
     github = "Chaddai";
@@ -1219,6 +1215,12 @@
     githubId = 3956062;
     name = "Simon Lackerbauer";
   };
+  cizra = {
+    email = "todurov+nix@gmail.com";
+    github = "cizra";
+    githubId = 2131991;
+    name = "Elmo Todurov";
+  };
   ck3d = {
     email = "ck3d@gmx.de";
     github = "ck3d";
diff --git a/pkgs/games/tdm/default.nix b/pkgs/games/tdm/default.nix
index 136bac8800e..f0a89adab57 100644
--- a/pkgs/games/tdm/default.nix
+++ b/pkgs/games/tdm/default.nix
@@ -96,7 +96,7 @@ EOF
     description = "The Dark Mod - stealth FPS inspired by the Thief series";
     homepage = "http://www.thedarkmod.com";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ cf6b88f ];
+    maintainers = with maintainers; [ cizra ];
     platforms = with platforms; [ "x86_64-linux" ];  # tdm also supports x86, but I don't have a x86 install at hand to test.
   };
 }
-- 
GitLab


From d3f6aef265a3e870c840820713392417c1b6c1ec Mon Sep 17 00:00:00 2001
From: Elmo Todurov <elmo.todurov@eesti.ee>
Date: Fri, 26 Jul 2019 22:45:43 +0300
Subject: [PATCH 0304/2254] tome2: init at 2.4

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

diff --git a/pkgs/games/tome2/default.nix b/pkgs/games/tome2/default.nix
new file mode 100644
index 00000000000..a632e523aaa
--- /dev/null
+++ b/pkgs/games/tome2/default.nix
@@ -0,0 +1,50 @@
+{ stdenv, fetchFromGitHub, makeDesktopItem, ncurses, libX11, boost, cmake }:
+
+let
+  pname = "tome2";
+  description = "A dungeon crawler similar to Angband, based on the works of Tolkien";
+
+  desktopItem = makeDesktopItem {
+    desktopName = pname;
+    name = pname;
+    exec = "${pname}-x11";
+    icon = pname;
+    terminal = "False";
+    comment = description;
+    type = "Application";
+    categories = "Game;RolePlaying;";
+    genericName = pname;
+  };
+
+in stdenv.mkDerivation {
+  inherit pname;
+  version = "2.4";
+
+  src = fetchFromGitHub {
+    owner = "tome2";
+    repo = "tome2";
+    rev = "4e6a906c80ff07b75a6acf4ff585b47303805e46";
+    sha256 = "06bddj55y673d7bnzblk8n01z32l6k2rad3bpzr8dmw464hx4wwf";
+  };
+
+  buildInputs = [ ncurses libX11 boost ];
+
+  nativeBuildInputs = [ cmake ];
+
+  cmakeFlags = [
+    "-DSYSTEM_INSTALL=ON"
+  ];
+
+  postInstall = ''
+    mkdir -p $out/share/applications
+    cp ${desktopItem}/share/applications/*.desktop $out/share/applications
+  '';
+
+  meta = with stdenv.lib; {
+    inherit description;
+    license = licenses.unfree;
+    maintainers = with maintainers; [ cizra ];
+    platforms = platforms.all;
+    homepage = "https://github.com/tome2/tome2";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index db16c9d5143..d592997ec64 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22401,6 +22401,8 @@ in
 
   tinyfugue = callPackage ../games/tinyfugue { };
 
+  tome2 = callPackage ../games/tome2 { };
+
   tome4 = callPackage ../games/tome4 { };
 
   toppler = callPackage ../games/toppler { };
-- 
GitLab


From 050646af126f13584146ca0e0ae2356bb1ea8f48 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 15 Sep 2019 18:14:11 +0200
Subject: [PATCH 0305/2254] nix-du: update version to show actual rev's date
 rather than `git-master`

---
 pkgs/tools/package-management/nix-du/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/package-management/nix-du/default.nix b/pkgs/tools/package-management/nix-du/default.nix
index 69f1c2e470a..870e6ce67b9 100644
--- a/pkgs/tools/package-management/nix-du/default.nix
+++ b/pkgs/tools/package-management/nix-du/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, rustPlatform, nix, boost, graphviz, darwin }:
 rustPlatform.buildRustPackage rec {
   pname = "nix-du";
-  version = "0.3.0-git-master";
+  version = "unstable-2019-07-15";
 
   src = fetchFromGitHub {
     owner = "symphorien";
-- 
GitLab


From ecf5f85a81d9ddd5a5c40eabb0e8fba3c8ed7481 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Sun, 15 Sep 2019 18:25:40 +0200
Subject: [PATCH 0306/2254] nixos/redshift: Move option renames to the module

---
 nixos/modules/rename.nix                | 14 --------------
 nixos/modules/services/x11/redshift.nix | 15 +++++++++++++++
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index d1303f90ad8..0c7c45a4708 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -273,20 +273,6 @@ with lib;
     (mkRenamedOptionModule [ "networking" "extraResolvconfConf" ] [ "networking" "resolvconf" "extraConfig" ])
     (mkRenamedOptionModule [ "networking" "resolvconfOptions" ] [ "networking" "resolvconf" "extraOptions" ])
 
-    # Redshift
-    (mkChangedOptionModule [ "services" "redshift" "latitude" ] [ "location" "latitude" ]
-      (config:
-        let value = getAttrFromPath [ "services" "redshift" "latitude" ] config;
-        in if value == null then
-          throw "services.redshift.latitude is set to null, you can remove this"
-          else builtins.fromJSON value))
-    (mkChangedOptionModule [ "services" "redshift" "longitude" ] [ "location" "longitude" ]
-      (config:
-        let value = getAttrFromPath [ "services" "redshift" "longitude" ] config;
-        in if value == null then
-          throw "services.redshift.longitude is set to null, you can remove this"
-          else builtins.fromJSON value))
-
     # Redis
     (mkRemovedOptionModule [ "services" "redis" "user" ] "The redis module now is hardcoded to the redis user.")
     (mkRemovedOptionModule [ "services" "redis" "dbpath" ] "The redis module now uses /var/lib/redis as data directory.")
diff --git a/nixos/modules/services/x11/redshift.nix b/nixos/modules/services/x11/redshift.nix
index 6ddb4c83764..048cc16263d 100644
--- a/nixos/modules/services/x11/redshift.nix
+++ b/nixos/modules/services/x11/redshift.nix
@@ -9,6 +9,21 @@ let
 
 in {
 
+  imports = [
+    (mkChangedOptionModule [ "services" "redshift" "latitude" ] [ "location" "latitude" ]
+      (config:
+        let value = getAttrFromPath [ "services" "redshift" "latitude" ] config;
+        in if value == null then
+          throw "services.redshift.latitude is set to null, you can remove this"
+          else builtins.fromJSON value))
+    (mkChangedOptionModule [ "services" "redshift" "longitude" ] [ "location" "longitude" ]
+      (config:
+        let value = getAttrFromPath [ "services" "redshift" "longitude" ] config;
+        in if value == null then
+          throw "services.redshift.longitude is set to null, you can remove this"
+          else builtins.fromJSON value))
+  ];
+
   options.services.redshift = {
     enable = mkOption {
       type = types.bool;
-- 
GitLab


From e686b39288ed84be08a878175300c05929a049d3 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Sun, 15 Sep 2019 18:26:53 +0200
Subject: [PATCH 0307/2254] nixos/redshift: Add rename for provider option

This was an oversight in https://github.com/NixOS/nixpkgs/pull/64309
resulting it backwards incompatibilities
---
 nixos/modules/services/x11/redshift.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/x11/redshift.nix b/nixos/modules/services/x11/redshift.nix
index 048cc16263d..21b0b33553a 100644
--- a/nixos/modules/services/x11/redshift.nix
+++ b/nixos/modules/services/x11/redshift.nix
@@ -22,6 +22,7 @@ in {
         in if value == null then
           throw "services.redshift.longitude is set to null, you can remove this"
           else builtins.fromJSON value))
+    (mkRenamedOptionModule [ "services" "redshift" "provider" ] [ "location" "provider" ])
   ];
 
   options.services.redshift = {
-- 
GitLab


From 2e363860c6cdc82e6ccb36ee342a81fd4aa029bf Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@fysik.su.se>
Date: Thu, 4 Apr 2019 14:51:33 +0200
Subject: [PATCH 0308/2254] openmpi: make build reproducible

fix:
* build and configure time stamps
* build and configure user
---
 pkgs/development/libraries/openmpi/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix
index 06e4726054e..974e98ad209 100644
--- a/pkgs/development/libraries/openmpi/default.nix
+++ b/pkgs/development/libraries/openmpi/default.nix
@@ -30,6 +30,13 @@ in stdenv.mkDerivation rec {
 
   postPatch = ''
     patchShebangs ./
+
+    # Ensure build is reproducible
+    ts=`date -d @$SOURCE_DATE_EPOCH`
+    sed -i 's/OPAL_CONFIGURE_USER=.*/OPAL_CONFIGURE_USER="nixbld"/' configure
+    sed -i 's/OPAL_CONFIGURE_HOST=.*/OPAL_CONFIGURE_HOST="localhost"/' configure
+    sed -i "s/OPAL_CONFIGURE_DATE=.*/OPAL_CONFIGURE_DATE=\"$ts\"/" configure
+    find -name "Makefile.in" -exec sed -i "s/\`date\`/$ts/" \{} \;
   '';
 
   buildInputs = with stdenv; [ gfortran zlib ]
-- 
GitLab


From 3857d3d6f996b53e063dc15a0fc604a1b8582681 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@fysik.su.se>
Date: Thu, 4 Apr 2019 15:13:34 +0200
Subject: [PATCH 0309/2254] openmpi: use absolute paths compiler wrapper

The MPI compiler wrappers should point to the
compilers used at build time per default.
---
 .../development/libraries/openmpi/default.nix | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix
index 974e98ad209..4ab2dd41855 100644
--- a/pkgs/development/libraries/openmpi/default.nix
+++ b/pkgs/development/libraries/openmpi/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchpatch, gfortran, perl, libnl
-, rdma-core, zlib, numactl, libevent, hwloc
+, rdma-core, zlib, numactl, libevent, hwloc, pkgsTargetTarget
 
 # Enable the Sun Grid Engine bindings
 , enableSGE ? false
@@ -58,6 +58,23 @@ in stdenv.mkDerivation rec {
     rm -f $out/lib/*.la
    '';
 
+  postFixup = ''
+    # default compilers should be indentical to the
+    # compilers at build time
+
+    sed -i 's:compiler=.*:compiler=${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}cc:' \
+      $out/share/openmpi/mpicc-wrapper-data.txt
+
+    sed -i 's:compiler=.*:compiler=${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}cc:' \
+       $out/share/openmpi/ortecc-wrapper-data.txt
+
+    sed -i 's:compiler=.*:compiler=${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}c++:' \
+       $out/share/openmpi/mpic++-wrapper-data.txt
+
+    sed -i 's:compiler=.*:compiler=${pkgsTargetTarget.gfortran}/bin/${pkgsTargetTarget.gfortran.targetPrefix}gfortran:'  \
+       $out/share/openmpi/mpifort-wrapper-data.txt
+  '';
+
   doCheck = true;
 
   meta = with stdenv.lib; {
-- 
GitLab


From 41b98797aeeda7758d91aabef9dece437f227c16 Mon Sep 17 00:00:00 2001
From: babariviere <babathriviere@gmail.com>
Date: Sun, 15 Sep 2019 19:36:10 +0200
Subject: [PATCH 0310/2254] iosevka: 1.4.3 -> 2.3.0

Use node2nix instead of reading package lock.
---
 pkgs/data/fonts/iosevka/default.nix           |   21 +-
 pkgs/data/fonts/iosevka/generate.sh           |    6 +
 .../fonts/iosevka/node-packages-generated.nix | 4257 +++++++++++++++++
 pkgs/data/fonts/iosevka/node-packages.json    |   20 +
 pkgs/data/fonts/iosevka/node-packages.nix     |   17 +
 pkgs/data/fonts/iosevka/package-lock.json     | 3037 ------------
 pkgs/data/fonts/iosevka/package-lock.nix      |  143 -
 7 files changed, 4309 insertions(+), 3192 deletions(-)
 create mode 100644 pkgs/data/fonts/iosevka/generate.sh
 create mode 100644 pkgs/data/fonts/iosevka/node-packages-generated.nix
 create mode 100644 pkgs/data/fonts/iosevka/node-packages.json
 create mode 100644 pkgs/data/fonts/iosevka/node-packages.nix
 delete mode 100644 pkgs/data/fonts/iosevka/package-lock.json
 delete mode 100644 pkgs/data/fonts/iosevka/package-lock.nix

diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix
index b1c46ca08ac..4864edde71d 100644
--- a/pkgs/data/fonts/iosevka/default.nix
+++ b/pkgs/data/fonts/iosevka/default.nix
@@ -1,5 +1,5 @@
 {
-  stdenv, lib,
+  stdenv, lib, pkgs,
   fetchFromGitHub, fetchurl,
   nodejs, ttfautohint-nox, otfcc,
 
@@ -21,7 +21,8 @@ assert (family != null) -> set != null;
 assert (weights != []) -> set != null;
 
 let
-  installPackageLock = import ./package-lock.nix { inherit fetchurl lib; };
+  system = builtins.currentSystem;
+  nodePackages = import ./node-packages.nix { inherit pkgs system nodejs; };
 in
 
 let pname = if set != null then "iosevka-${set}" else "iosevka"; in
@@ -54,6 +55,9 @@ let
     (if family != null then "family=\"${family}\"" else null)
     (param "weights" weights)
   ]);
+  installNodeModules = unlines (lib.mapAttrsToList
+    (name: value: "mkdir -p node_modules/${name}\n cp -r ${value.outPath}/lib/node_modules/. node_modules")
+    nodePackages);
 in
 
 stdenv.mkDerivation {
@@ -61,20 +65,13 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ nodejs ttfautohint-nox otfcc ];
 
-  passAsFile = [ "installPackageLock" "config" "extraParameters" ];
-  installPackageLock = installPackageLock ./package-lock.json;
+  passAsFile = [ "config" "extraParameters" ];
   config = config;
   extraParameters = extraParameters;
 
-  preConfigure = ''
-    HOME=$TMPDIR
-    source "$installPackageLockPath";
-    npm --offline rebuild
-  '';
-
   configurePhase = ''
-    runHook preConfigure
-
+    mkdir -p node_modules/.bin
+    ${installNodeModules}
     ${optionalString (set != null) ''mv "$configPath" private-build-plans.toml''}
     ${optionalString (extraParameters != null) ''cat "$extraParametersPath" >> parameters.toml''}
   '';
diff --git a/pkgs/data/fonts/iosevka/generate.sh b/pkgs/data/fonts/iosevka/generate.sh
new file mode 100644
index 00000000000..e7d675b9e76
--- /dev/null
+++ b/pkgs/data/fonts/iosevka/generate.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+node2nix --nodejs-10 --input node-packages.json \
+              --output node-packages-generated.nix \
+              --composition node-packages.nix \
+              --node-env ./../../../development/node-packages/node-env.nix
diff --git a/pkgs/data/fonts/iosevka/node-packages-generated.nix b/pkgs/data/fonts/iosevka/node-packages-generated.nix
new file mode 100644
index 00000000000..310e0161628
--- /dev/null
+++ b/pkgs/data/fonts/iosevka/node-packages-generated.nix
@@ -0,0 +1,4257 @@
+# This file has been generated by node2nix 1.7.0. Do not edit!
+
+{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
+
+let
+  sources = {
+    "@babel/code-frame-7.5.5" = {
+      name = "_at_babel_slash_code-frame";
+      packageName = "@babel/code-frame";
+      version = "7.5.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz";
+        sha512 = "27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==";
+      };
+    };
+    "@babel/highlight-7.5.0" = {
+      name = "_at_babel_slash_highlight";
+      packageName = "@babel/highlight";
+      version = "7.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.5.0.tgz";
+        sha512 = "7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ==";
+      };
+    };
+    "JSONStream-1.3.5" = {
+      name = "JSONStream";
+      packageName = "JSONStream";
+      version = "1.3.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz";
+        sha512 = "E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==";
+      };
+    };
+    "abbrev-1.1.1" = {
+      name = "abbrev";
+      packageName = "abbrev";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz";
+        sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==";
+      };
+    };
+    "acorn-7.0.0" = {
+      name = "acorn";
+      packageName = "acorn";
+      version = "7.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/acorn/-/acorn-7.0.0.tgz";
+        sha512 = "PaF/MduxijYYt7unVGRuds1vBC9bFxbNf+VWqhOClfdgy7RlVkQqt610ig1/yxTgsDIfW1cWDel5EBbOy3jdtQ==";
+      };
+    };
+    "acorn-jsx-5.0.2" = {
+      name = "acorn-jsx";
+      packageName = "acorn-jsx";
+      version = "5.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.0.2.tgz";
+        sha512 = "tiNTrP1MP0QrChmD2DdupCr6HWSFeKVw5d/dHTu4Y7rkAkRhU/Dt7dphAfIUyxtHpl/eBVip5uTNSpQJHylpAw==";
+      };
+    };
+    "ajv-6.10.2" = {
+      name = "ajv";
+      packageName = "ajv";
+      version = "6.10.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz";
+        sha512 = "TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==";
+      };
+    };
+    "amdefine-1.0.1" = {
+      name = "amdefine";
+      packageName = "amdefine";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz";
+        sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5";
+      };
+    };
+    "ansi-escapes-3.2.0" = {
+      name = "ansi-escapes";
+      packageName = "ansi-escapes";
+      version = "3.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz";
+        sha512 = "cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==";
+      };
+    };
+    "ansi-regex-2.1.1" = {
+      name = "ansi-regex";
+      packageName = "ansi-regex";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz";
+        sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df";
+      };
+    };
+    "ansi-regex-3.0.0" = {
+      name = "ansi-regex";
+      packageName = "ansi-regex";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz";
+        sha1 = "ed0317c322064f79466c02966bddb605ab37d998";
+      };
+    };
+    "ansi-regex-4.1.0" = {
+      name = "ansi-regex";
+      packageName = "ansi-regex";
+      version = "4.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz";
+        sha512 = "1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==";
+      };
+    };
+    "ansi-styles-3.2.1" = {
+      name = "ansi-styles";
+      packageName = "ansi-styles";
+      version = "3.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz";
+        sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==";
+      };
+    };
+    "aproba-1.2.0" = {
+      name = "aproba";
+      packageName = "aproba";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz";
+        sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==";
+      };
+    };
+    "are-we-there-yet-1.1.5" = {
+      name = "are-we-there-yet";
+      packageName = "are-we-there-yet";
+      version = "1.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz";
+        sha512 = "5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==";
+      };
+    };
+    "argparse-1.0.10" = {
+      name = "argparse";
+      packageName = "argparse";
+      version = "1.0.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz";
+        sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==";
+      };
+    };
+    "asn1-0.2.4" = {
+      name = "asn1";
+      packageName = "asn1";
+      version = "0.2.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz";
+        sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==";
+      };
+    };
+    "assert-plus-1.0.0" = {
+      name = "assert-plus";
+      packageName = "assert-plus";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz";
+        sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525";
+      };
+    };
+    "astral-regex-1.0.0" = {
+      name = "astral-regex";
+      packageName = "astral-regex";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz";
+        sha512 = "+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==";
+      };
+    };
+    "asynckit-0.4.0" = {
+      name = "asynckit";
+      packageName = "asynckit";
+      version = "0.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz";
+        sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79";
+      };
+    };
+    "atob-2.1.2" = {
+      name = "atob";
+      packageName = "atob";
+      version = "2.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz";
+        sha512 = "Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==";
+      };
+    };
+    "aws-sign2-0.7.0" = {
+      name = "aws-sign2";
+      packageName = "aws-sign2";
+      version = "0.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz";
+        sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8";
+      };
+    };
+    "aws4-1.8.0" = {
+      name = "aws4";
+      packageName = "aws4";
+      version = "1.8.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz";
+        sha512 = "ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==";
+      };
+    };
+    "balanced-match-1.0.0" = {
+      name = "balanced-match";
+      packageName = "balanced-match";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz";
+        sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767";
+      };
+    };
+    "bcrypt-pbkdf-1.0.2" = {
+      name = "bcrypt-pbkdf";
+      packageName = "bcrypt-pbkdf";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz";
+        sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e";
+      };
+    };
+    "bezier-js-2.4.3" = {
+      name = "bezier-js";
+      packageName = "bezier-js";
+      version = "2.4.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bezier-js/-/bezier-js-2.4.3.tgz";
+        sha512 = "qAz1iAGoSE+kk5guAMyvoUgfHq+e5JwK5jRHh2/tuk4XDRUuECrrHLouN27jAzjhlJD2vAsBHofCi5sOn1jcbQ==";
+      };
+    };
+    "bindings-1.5.0" = {
+      name = "bindings";
+      packageName = "bindings";
+      version = "1.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz";
+        sha512 = "p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==";
+      };
+    };
+    "bluebird-3.5.5" = {
+      name = "bluebird";
+      packageName = "bluebird";
+      version = "3.5.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz";
+        sha512 = "5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==";
+      };
+    };
+    "brace-expansion-1.1.11" = {
+      name = "brace-expansion";
+      packageName = "brace-expansion";
+      version = "1.1.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz";
+        sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==";
+      };
+    };
+    "bufferstreams-2.0.1" = {
+      name = "bufferstreams";
+      packageName = "bufferstreams";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bufferstreams/-/bufferstreams-2.0.1.tgz";
+        sha512 = "ZswyIoBfFb3cVDsnZLLj2IDJ/0ppYdil/v2EGlZXvoefO689FokEmFEldhN5dV7R2QBxFneqTJOMIpfqhj+n0g==";
+      };
+    };
+    "callsites-3.1.0" = {
+      name = "callsites";
+      packageName = "callsites";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz";
+        sha512 = "P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==";
+      };
+    };
+    "camelcase-3.0.0" = {
+      name = "camelcase";
+      packageName = "camelcase";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz";
+        sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a";
+      };
+    };
+    "camelcase-4.1.0" = {
+      name = "camelcase";
+      packageName = "camelcase";
+      version = "4.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz";
+        sha1 = "d545635be1e33c542649c69173e5de6acfae34dd";
+      };
+    };
+    "camelcase-5.3.1" = {
+      name = "camelcase";
+      packageName = "camelcase";
+      version = "5.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz";
+        sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==";
+      };
+    };
+    "caseless-0.12.0" = {
+      name = "caseless";
+      packageName = "caseless";
+      version = "0.12.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz";
+        sha1 = "1b681c21ff84033c826543090689420d187151dc";
+      };
+    };
+    "chalk-2.4.2" = {
+      name = "chalk";
+      packageName = "chalk";
+      version = "2.4.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz";
+        sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==";
+      };
+    };
+    "chardet-0.7.0" = {
+      name = "chardet";
+      packageName = "chardet";
+      version = "0.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz";
+        sha512 = "mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==";
+      };
+    };
+    "child-process-promise-2.2.1" = {
+      name = "child-process-promise";
+      packageName = "child-process-promise";
+      version = "2.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/child-process-promise/-/child-process-promise-2.2.1.tgz";
+        sha1 = "4730a11ef610fad450b8f223c79d31d7bdad8074";
+      };
+    };
+    "chownr-1.1.2" = {
+      name = "chownr";
+      packageName = "chownr";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/chownr/-/chownr-1.1.2.tgz";
+        sha512 = "GkfeAQh+QNy3wquu9oIZr6SS5x7wGdSgNQvD10X3r+AZr1Oys22HW8kAmDMvNg2+Dm0TeGaEuO8gFwdBXxwO8A==";
+      };
+    };
+    "cli-cursor-2.1.0" = {
+      name = "cli-cursor";
+      packageName = "cli-cursor";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz";
+        sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5";
+      };
+    };
+    "cli-width-2.2.0" = {
+      name = "cli-width";
+      packageName = "cli-width";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz";
+        sha1 = "ff19ede8a9a5e579324147b0c11f0fbcbabed639";
+      };
+    };
+    "clipper-lib-1.0.0" = {
+      name = "clipper-lib";
+      packageName = "clipper-lib";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/clipper-lib/-/clipper-lib-1.0.0.tgz";
+        sha1 = "e902ceb26e28ee5cfa6014abdf790a51efff4ecb";
+      };
+    };
+    "cliui-3.2.0" = {
+      name = "cliui";
+      packageName = "cliui";
+      version = "3.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz";
+        sha1 = "120601537a916d29940f934da3b48d585a39213d";
+      };
+    };
+    "cliui-4.1.0" = {
+      name = "cliui";
+      packageName = "cliui";
+      version = "4.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz";
+        sha512 = "4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==";
+      };
+    };
+    "cliui-5.0.0" = {
+      name = "cliui";
+      packageName = "cliui";
+      version = "5.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz";
+        sha512 = "PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==";
+      };
+    };
+    "clone-2.1.2" = {
+      name = "clone";
+      packageName = "clone";
+      version = "2.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz";
+        sha1 = "1b7f4b9f591f1e8f83670401600345a02887435f";
+      };
+    };
+    "code-point-at-1.1.0" = {
+      name = "code-point-at";
+      packageName = "code-point-at";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz";
+        sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77";
+      };
+    };
+    "color-convert-1.9.3" = {
+      name = "color-convert";
+      packageName = "color-convert";
+      version = "1.9.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz";
+        sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==";
+      };
+    };
+    "color-name-1.1.3" = {
+      name = "color-name";
+      packageName = "color-name";
+      version = "1.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz";
+        sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25";
+      };
+    };
+    "combined-stream-1.0.8" = {
+      name = "combined-stream";
+      packageName = "combined-stream";
+      version = "1.0.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz";
+        sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==";
+      };
+    };
+    "complex.js-2.0.11" = {
+      name = "complex.js";
+      packageName = "complex.js";
+      version = "2.0.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/complex.js/-/complex.js-2.0.11.tgz";
+        sha512 = "6IArJLApNtdg1P1dFtn3dnyzoZBEF0MwMnrfF1exSBRpZYoy4yieMkpZhQDC0uwctw48vii0CFVyHfpgZ/DfGw==";
+      };
+    };
+    "concat-map-0.0.1" = {
+      name = "concat-map";
+      packageName = "concat-map";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz";
+        sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b";
+      };
+    };
+    "console-control-strings-1.1.0" = {
+      name = "console-control-strings";
+      packageName = "console-control-strings";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz";
+        sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e";
+      };
+    };
+    "core-util-is-1.0.2" = {
+      name = "core-util-is";
+      packageName = "core-util-is";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz";
+        sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
+      };
+    };
+    "cross-spawn-4.0.2" = {
+      name = "cross-spawn";
+      packageName = "cross-spawn";
+      version = "4.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz";
+        sha1 = "7b9247621c23adfdd3856004a823cbe397424d41";
+      };
+    };
+    "cross-spawn-5.1.0" = {
+      name = "cross-spawn";
+      packageName = "cross-spawn";
+      version = "5.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz";
+        sha1 = "e8bd0efee58fcff6f8f94510a0a554bbfa235449";
+      };
+    };
+    "cross-spawn-6.0.5" = {
+      name = "cross-spawn";
+      packageName = "cross-spawn";
+      version = "6.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz";
+        sha512 = "eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==";
+      };
+    };
+    "css-2.2.4" = {
+      name = "css";
+      packageName = "css";
+      version = "2.2.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/css/-/css-2.2.4.tgz";
+        sha512 = "oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==";
+      };
+    };
+    "css-parse-2.0.0" = {
+      name = "css-parse";
+      packageName = "css-parse";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/css-parse/-/css-parse-2.0.0.tgz";
+        sha1 = "a468ee667c16d81ccf05c58c38d2a97c780dbfd4";
+      };
+    };
+    "cubic2quad-1.1.1" = {
+      name = "cubic2quad";
+      packageName = "cubic2quad";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cubic2quad/-/cubic2quad-1.1.1.tgz";
+        sha1 = "69b19c61a3f5b41ecf2f1d5fae8fb03415aa8b15";
+      };
+    };
+    "dashdash-1.14.1" = {
+      name = "dashdash";
+      packageName = "dashdash";
+      version = "1.14.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz";
+        sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0";
+      };
+    };
+    "debug-3.1.0" = {
+      name = "debug";
+      packageName = "debug";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz";
+        sha512 = "OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==";
+      };
+    };
+    "debug-4.1.1" = {
+      name = "debug";
+      packageName = "debug";
+      version = "4.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz";
+        sha512 = "pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==";
+      };
+    };
+    "decamelize-1.2.0" = {
+      name = "decamelize";
+      packageName = "decamelize";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz";
+        sha1 = "f6534d15148269b20352e7bee26f501f9a191290";
+      };
+    };
+    "decimal.js-10.2.0" = {
+      name = "decimal.js";
+      packageName = "decimal.js";
+      version = "10.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/decimal.js/-/decimal.js-10.2.0.tgz";
+        sha512 = "vDPw+rDgn3bZe1+F/pyEwb1oMG2XTlRVgAa6B4KccTEpYgF8w6eQllVbQcfIJnZyvzFtFpxnpGtx8dd7DJp/Rw==";
+      };
+    };
+    "decode-uri-component-0.2.0" = {
+      name = "decode-uri-component";
+      packageName = "decode-uri-component";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz";
+        sha1 = "eb3913333458775cb84cd1a1fae062106bb87545";
+      };
+    };
+    "deep-is-0.1.3" = {
+      name = "deep-is";
+      packageName = "deep-is";
+      version = "0.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz";
+        sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34";
+      };
+    };
+    "delayed-stream-1.0.0" = {
+      name = "delayed-stream";
+      packageName = "delayed-stream";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz";
+        sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619";
+      };
+    };
+    "delegates-1.0.0" = {
+      name = "delegates";
+      packageName = "delegates";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz";
+        sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a";
+      };
+    };
+    "doctrine-3.0.0" = {
+      name = "doctrine";
+      packageName = "doctrine";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz";
+        sha512 = "yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==";
+      };
+    };
+    "ecc-jsbn-0.1.2" = {
+      name = "ecc-jsbn";
+      packageName = "ecc-jsbn";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz";
+        sha1 = "3a83a904e54353287874c564b7549386849a98c9";
+      };
+    };
+    "emoji-regex-7.0.3" = {
+      name = "emoji-regex";
+      packageName = "emoji-regex";
+      version = "7.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz";
+        sha512 = "CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==";
+      };
+    };
+    "end-of-stream-1.4.1" = {
+      name = "end-of-stream";
+      packageName = "end-of-stream";
+      version = "1.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz";
+        sha512 = "1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==";
+      };
+    };
+    "error-ex-1.3.2" = {
+      name = "error-ex";
+      packageName = "error-ex";
+      version = "1.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz";
+        sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==";
+      };
+    };
+    "escape-latex-1.2.0" = {
+      name = "escape-latex";
+      packageName = "escape-latex";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/escape-latex/-/escape-latex-1.2.0.tgz";
+        sha512 = "nV5aVWW1K0wEiUIEdZ4erkGGH8mDxGyxSeqPzRNtWP7ataw+/olFObw7hujFWlVjNsaDFw5VZ5NzVSIqRgfTiw==";
+      };
+    };
+    "escape-string-regexp-1.0.5" = {
+      name = "escape-string-regexp";
+      packageName = "escape-string-regexp";
+      version = "1.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz";
+        sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4";
+      };
+    };
+    "escodegen-1.12.0" = {
+      name = "escodegen";
+      packageName = "escodegen";
+      version = "1.12.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/escodegen/-/escodegen-1.12.0.tgz";
+        sha512 = "TuA+EhsanGcme5T3R0L80u4t8CpbXQjegRmf7+FPTJrtCTErXFeelblRgHQa1FofEzqYYJmJ/OqjTwREp9qgmg==";
+      };
+    };
+    "escodegen-1.3.3" = {
+      name = "escodegen";
+      packageName = "escodegen";
+      version = "1.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/escodegen/-/escodegen-1.3.3.tgz";
+        sha1 = "f024016f5a88e046fd12005055e939802e6c5f23";
+      };
+    };
+    "escope-1.0.3" = {
+      name = "escope";
+      packageName = "escope";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/escope/-/escope-1.0.3.tgz";
+        sha1 = "759dce8496c4248fec2d0caaf4108bcf3f1a7f5d";
+      };
+    };
+    "eslint-scope-5.0.0" = {
+      name = "eslint-scope";
+      packageName = "eslint-scope";
+      version = "5.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.0.0.tgz";
+        sha512 = "oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw==";
+      };
+    };
+    "eslint-utils-1.4.2" = {
+      name = "eslint-utils";
+      packageName = "eslint-utils";
+      version = "1.4.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.2.tgz";
+        sha512 = "eAZS2sEUMlIeCjBeubdj45dmBHQwPHWyBcT1VSYB7o9x9WRRqKxyUoiXlRjyAwzN7YEzHJlYg0NmzDRWx6GP4Q==";
+      };
+    };
+    "eslint-visitor-keys-1.1.0" = {
+      name = "eslint-visitor-keys";
+      packageName = "eslint-visitor-keys";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz";
+        sha512 = "8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==";
+      };
+    };
+    "esmangle-1.0.1" = {
+      name = "esmangle";
+      packageName = "esmangle";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/esmangle/-/esmangle-1.0.1.tgz";
+        sha1 = "d9bb37b8f8eafbf4e6d4ed6b7aa2956abbd3c4c2";
+      };
+    };
+    "espree-6.1.1" = {
+      name = "espree";
+      packageName = "espree";
+      version = "6.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/espree/-/espree-6.1.1.tgz";
+        sha512 = "EYbr8XZUhWbYCqQRW0duU5LxzL5bETN6AjKBGy1302qqzPaCH10QbRg3Wvco79Z8x9WbiE8HYB4e75xl6qUYvQ==";
+      };
+    };
+    "esprima-1.1.1" = {
+      name = "esprima";
+      packageName = "esprima";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/esprima/-/esprima-1.1.1.tgz";
+        sha1 = "5b6f1547f4d102e670e140c509be6771d6aeb549";
+      };
+    };
+    "esprima-3.1.3" = {
+      name = "esprima";
+      packageName = "esprima";
+      version = "3.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz";
+        sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633";
+      };
+    };
+    "esprima-4.0.1" = {
+      name = "esprima";
+      packageName = "esprima";
+      version = "4.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz";
+        sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==";
+      };
+    };
+    "esquery-1.0.1" = {
+      name = "esquery";
+      packageName = "esquery";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz";
+        sha512 = "SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==";
+      };
+    };
+    "esrecurse-4.2.1" = {
+      name = "esrecurse";
+      packageName = "esrecurse";
+      version = "4.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz";
+        sha512 = "64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==";
+      };
+    };
+    "esshorten-1.1.1" = {
+      name = "esshorten";
+      packageName = "esshorten";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/esshorten/-/esshorten-1.1.1.tgz";
+        sha1 = "174f96b7cc267e46872d814e7db7c290bdff61a9";
+      };
+    };
+    "estraverse-1.5.1" = {
+      name = "estraverse";
+      packageName = "estraverse";
+      version = "1.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz";
+        sha1 = "867a3e8e58a9f84618afb6c2ddbcd916b7cbaf71";
+      };
+    };
+    "estraverse-2.0.0" = {
+      name = "estraverse";
+      packageName = "estraverse";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/estraverse/-/estraverse-2.0.0.tgz";
+        sha1 = "5ae46963243600206674ccb24a09e16674fcdca1";
+      };
+    };
+    "estraverse-4.1.1" = {
+      name = "estraverse";
+      packageName = "estraverse";
+      version = "4.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/estraverse/-/estraverse-4.1.1.tgz";
+        sha1 = "f6caca728933a850ef90661d0e17982ba47111a2";
+      };
+    };
+    "estraverse-4.3.0" = {
+      name = "estraverse";
+      packageName = "estraverse";
+      version = "4.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz";
+        sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==";
+      };
+    };
+    "esutils-1.0.0" = {
+      name = "esutils";
+      packageName = "esutils";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/esutils/-/esutils-1.0.0.tgz";
+        sha1 = "8151d358e20c8acc7fb745e7472c0025fe496570";
+      };
+    };
+    "esutils-2.0.3" = {
+      name = "esutils";
+      packageName = "esutils";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz";
+        sha512 = "kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==";
+      };
+    };
+    "execa-0.7.0" = {
+      name = "execa";
+      packageName = "execa";
+      version = "0.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz";
+        sha1 = "944becd34cc41ee32a63a9faf27ad5a65fc59777";
+      };
+    };
+    "execa-1.0.0" = {
+      name = "execa";
+      packageName = "execa";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz";
+        sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==";
+      };
+    };
+    "extend-3.0.2" = {
+      name = "extend";
+      packageName = "extend";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz";
+        sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==";
+      };
+    };
+    "external-editor-3.1.0" = {
+      name = "external-editor";
+      packageName = "external-editor";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz";
+        sha512 = "hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==";
+      };
+    };
+    "extsprintf-1.3.0" = {
+      name = "extsprintf";
+      packageName = "extsprintf";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz";
+        sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05";
+      };
+    };
+    "fast-deep-equal-2.0.1" = {
+      name = "fast-deep-equal";
+      packageName = "fast-deep-equal";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz";
+        sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49";
+      };
+    };
+    "fast-json-stable-stringify-2.0.0" = {
+      name = "fast-json-stable-stringify";
+      packageName = "fast-json-stable-stringify";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz";
+        sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2";
+      };
+    };
+    "fast-levenshtein-1.0.7" = {
+      name = "fast-levenshtein";
+      packageName = "fast-levenshtein";
+      version = "1.0.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.0.7.tgz";
+        sha1 = "0178dcdee023b92905193af0959e8a7639cfdcb9";
+      };
+    };
+    "fast-levenshtein-2.0.6" = {
+      name = "fast-levenshtein";
+      packageName = "fast-levenshtein";
+      version = "2.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz";
+        sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917";
+      };
+    };
+    "figures-2.0.0" = {
+      name = "figures";
+      packageName = "figures";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz";
+        sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962";
+      };
+    };
+    "file-entry-cache-5.0.1" = {
+      name = "file-entry-cache";
+      packageName = "file-entry-cache";
+      version = "5.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz";
+        sha512 = "bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==";
+      };
+    };
+    "file-uri-to-path-1.0.0" = {
+      name = "file-uri-to-path";
+      packageName = "file-uri-to-path";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz";
+        sha512 = "0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==";
+      };
+    };
+    "find-up-1.1.2" = {
+      name = "find-up";
+      packageName = "find-up";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz";
+        sha1 = "6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f";
+      };
+    };
+    "find-up-2.1.0" = {
+      name = "find-up";
+      packageName = "find-up";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz";
+        sha1 = "45d1b7e506c717ddd482775a2b77920a3c0c57a7";
+      };
+    };
+    "find-up-3.0.0" = {
+      name = "find-up";
+      packageName = "find-up";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz";
+        sha512 = "1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==";
+      };
+    };
+    "first-chunk-stream-2.0.0" = {
+      name = "first-chunk-stream";
+      packageName = "first-chunk-stream";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-2.0.0.tgz";
+        sha1 = "1bdecdb8e083c0664b91945581577a43a9f31d70";
+      };
+    };
+    "flat-cache-2.0.1" = {
+      name = "flat-cache";
+      packageName = "flat-cache";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz";
+        sha512 = "LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==";
+      };
+    };
+    "flatted-2.0.1" = {
+      name = "flatted";
+      packageName = "flatted";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/flatted/-/flatted-2.0.1.tgz";
+        sha512 = "a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==";
+      };
+    };
+    "forever-agent-0.6.1" = {
+      name = "forever-agent";
+      packageName = "forever-agent";
+      version = "0.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz";
+        sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91";
+      };
+    };
+    "form-data-2.3.3" = {
+      name = "form-data";
+      packageName = "form-data";
+      version = "2.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz";
+        sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==";
+      };
+    };
+    "fraction.js-4.0.12" = {
+      name = "fraction.js";
+      packageName = "fraction.js";
+      version = "4.0.12";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fraction.js/-/fraction.js-4.0.12.tgz";
+        sha512 = "8Z1K0VTG4hzYY7kA/1sj4/r1/RWLBD3xwReT/RCrUCbzPszjNQCCsy3ktkU/eaEqX3MYa4pY37a52eiBlPMlhA==";
+      };
+    };
+    "fs-extra-3.0.1" = {
+      name = "fs-extra";
+      packageName = "fs-extra";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz";
+        sha1 = "3794f378c58b342ea7dbbb23095109c4b3b62291";
+      };
+    };
+    "fs-extra-4.0.3" = {
+      name = "fs-extra";
+      packageName = "fs-extra";
+      version = "4.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz";
+        sha512 = "q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==";
+      };
+    };
+    "fs-extra-6.0.1" = {
+      name = "fs-extra";
+      packageName = "fs-extra";
+      version = "6.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-6.0.1.tgz";
+        sha512 = "GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==";
+      };
+    };
+    "fs-minipass-1.2.6" = {
+      name = "fs-minipass";
+      packageName = "fs-minipass";
+      version = "1.2.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.6.tgz";
+        sha512 = "crhvyXcMejjv3Z5d2Fa9sf5xLYVCF5O1c71QxbVnbLsmYMBEvDAftewesN/HhY03YRoA7zOMxjNGrF5svGaaeQ==";
+      };
+    };
+    "fs.realpath-1.0.0" = {
+      name = "fs.realpath";
+      packageName = "fs.realpath";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz";
+        sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
+      };
+    };
+    "functional-red-black-tree-1.0.1" = {
+      name = "functional-red-black-tree";
+      packageName = "functional-red-black-tree";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz";
+        sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327";
+      };
+    };
+    "gauge-2.7.4" = {
+      name = "gauge";
+      packageName = "gauge";
+      version = "2.7.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz";
+        sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7";
+      };
+    };
+    "get-caller-file-1.0.3" = {
+      name = "get-caller-file";
+      packageName = "get-caller-file";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz";
+        sha512 = "3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==";
+      };
+    };
+    "get-caller-file-2.0.5" = {
+      name = "get-caller-file";
+      packageName = "get-caller-file";
+      version = "2.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz";
+        sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==";
+      };
+    };
+    "get-stream-3.0.0" = {
+      name = "get-stream";
+      packageName = "get-stream";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz";
+        sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14";
+      };
+    };
+    "get-stream-4.1.0" = {
+      name = "get-stream";
+      packageName = "get-stream";
+      version = "4.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz";
+        sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==";
+      };
+    };
+    "getpass-0.1.7" = {
+      name = "getpass";
+      packageName = "getpass";
+      version = "0.1.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz";
+        sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa";
+      };
+    };
+    "glob-7.1.4" = {
+      name = "glob";
+      packageName = "glob";
+      version = "7.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz";
+        sha512 = "hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==";
+      };
+    };
+    "glob-parent-5.0.0" = {
+      name = "glob-parent";
+      packageName = "glob-parent";
+      version = "5.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.0.0.tgz";
+        sha512 = "Z2RwiujPRGluePM6j699ktJYxmPpJKCfpGA13jz2hmFZC7gKetzrWvg5KN3+OsIFmydGyZ1AVwERCq1w/ZZwRg==";
+      };
+    };
+    "globals-11.12.0" = {
+      name = "globals";
+      packageName = "globals";
+      version = "11.12.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz";
+        sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==";
+      };
+    };
+    "graceful-fs-4.2.2" = {
+      name = "graceful-fs";
+      packageName = "graceful-fs";
+      version = "4.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz";
+        sha512 = "IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==";
+      };
+    };
+    "har-schema-2.0.0" = {
+      name = "har-schema";
+      packageName = "har-schema";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz";
+        sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92";
+      };
+    };
+    "har-validator-5.1.3" = {
+      name = "har-validator";
+      packageName = "har-validator";
+      version = "5.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz";
+        sha512 = "sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==";
+      };
+    };
+    "has-flag-3.0.0" = {
+      name = "has-flag";
+      packageName = "has-flag";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz";
+        sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd";
+      };
+    };
+    "has-unicode-2.0.1" = {
+      name = "has-unicode";
+      packageName = "has-unicode";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz";
+        sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9";
+      };
+    };
+    "hosted-git-info-2.8.4" = {
+      name = "hosted-git-info";
+      packageName = "hosted-git-info";
+      version = "2.8.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.4.tgz";
+        sha512 = "pzXIvANXEFrc5oFFXRMkbLPQ2rXRoDERwDLyrcUxGhaZhgP54BBSl9Oheh7Vv0T090cszWBxPjkQQ5Sq1PbBRQ==";
+      };
+    };
+    "http-signature-1.2.0" = {
+      name = "http-signature";
+      packageName = "http-signature";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz";
+        sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1";
+      };
+    };
+    "iconv-lite-0.4.24" = {
+      name = "iconv-lite";
+      packageName = "iconv-lite";
+      version = "0.4.24";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz";
+        sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==";
+      };
+    };
+    "ignore-4.0.6" = {
+      name = "ignore";
+      packageName = "ignore";
+      version = "4.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz";
+        sha512 = "cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==";
+      };
+    };
+    "import-fresh-3.1.0" = {
+      name = "import-fresh";
+      packageName = "import-fresh";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.1.0.tgz";
+        sha512 = "PpuksHKGt8rXfWEr9m9EHIpgyyaltBy8+eF6GJM0QCAxMgxCfucMF3mjecK2QsJr0amJW7gTqh5/wht0z2UhEQ==";
+      };
+    };
+    "imurmurhash-0.1.4" = {
+      name = "imurmurhash";
+      packageName = "imurmurhash";
+      version = "0.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz";
+        sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea";
+      };
+    };
+    "inflight-1.0.6" = {
+      name = "inflight";
+      packageName = "inflight";
+      version = "1.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz";
+        sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9";
+      };
+    };
+    "inherits-2.0.4" = {
+      name = "inherits";
+      packageName = "inherits";
+      version = "2.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz";
+        sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==";
+      };
+    };
+    "inquirer-6.5.2" = {
+      name = "inquirer";
+      packageName = "inquirer";
+      version = "6.5.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz";
+        sha512 = "cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==";
+      };
+    };
+    "invert-kv-1.0.0" = {
+      name = "invert-kv";
+      packageName = "invert-kv";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz";
+        sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6";
+      };
+    };
+    "invert-kv-2.0.0" = {
+      name = "invert-kv";
+      packageName = "invert-kv";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz";
+        sha512 = "wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==";
+      };
+    };
+    "is-arrayish-0.2.1" = {
+      name = "is-arrayish";
+      packageName = "is-arrayish";
+      version = "0.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz";
+        sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d";
+      };
+    };
+    "is-extglob-2.1.1" = {
+      name = "is-extglob";
+      packageName = "is-extglob";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz";
+        sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2";
+      };
+    };
+    "is-fullwidth-code-point-1.0.0" = {
+      name = "is-fullwidth-code-point";
+      packageName = "is-fullwidth-code-point";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz";
+        sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb";
+      };
+    };
+    "is-fullwidth-code-point-2.0.0" = {
+      name = "is-fullwidth-code-point";
+      packageName = "is-fullwidth-code-point";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz";
+        sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f";
+      };
+    };
+    "is-glob-4.0.1" = {
+      name = "is-glob";
+      packageName = "is-glob";
+      version = "4.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz";
+        sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==";
+      };
+    };
+    "is-promise-2.1.0" = {
+      name = "is-promise";
+      packageName = "is-promise";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz";
+        sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa";
+      };
+    };
+    "is-stream-1.1.0" = {
+      name = "is-stream";
+      packageName = "is-stream";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz";
+        sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44";
+      };
+    };
+    "is-typedarray-1.0.0" = {
+      name = "is-typedarray";
+      packageName = "is-typedarray";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz";
+        sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a";
+      };
+    };
+    "is-utf8-0.2.1" = {
+      name = "is-utf8";
+      packageName = "is-utf8";
+      version = "0.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz";
+        sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72";
+      };
+    };
+    "isarray-1.0.0" = {
+      name = "isarray";
+      packageName = "isarray";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz";
+        sha1 = "bb935d48582cba168c06834957a54a3e07124f11";
+      };
+    };
+    "isexe-2.0.0" = {
+      name = "isexe";
+      packageName = "isexe";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz";
+        sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10";
+      };
+    };
+    "isstream-0.1.2" = {
+      name = "isstream";
+      packageName = "isstream";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz";
+        sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a";
+      };
+    };
+    "javascript-natural-sort-0.7.1" = {
+      name = "javascript-natural-sort";
+      packageName = "javascript-natural-sort";
+      version = "0.7.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz";
+        sha1 = "f9e2303d4507f6d74355a73664d1440fb5a0ef59";
+      };
+    };
+    "js-tokens-4.0.0" = {
+      name = "js-tokens";
+      packageName = "js-tokens";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz";
+        sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==";
+      };
+    };
+    "js-yaml-3.13.1" = {
+      name = "js-yaml";
+      packageName = "js-yaml";
+      version = "3.13.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz";
+        sha512 = "YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==";
+      };
+    };
+    "jsbn-0.1.1" = {
+      name = "jsbn";
+      packageName = "jsbn";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz";
+        sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513";
+      };
+    };
+    "json-schema-0.2.3" = {
+      name = "json-schema";
+      packageName = "json-schema";
+      version = "0.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz";
+        sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13";
+      };
+    };
+    "json-schema-traverse-0.4.1" = {
+      name = "json-schema-traverse";
+      packageName = "json-schema-traverse";
+      version = "0.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz";
+        sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==";
+      };
+    };
+    "json-stable-stringify-without-jsonify-1.0.1" = {
+      name = "json-stable-stringify-without-jsonify";
+      packageName = "json-stable-stringify-without-jsonify";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz";
+        sha1 = "9db7b59496ad3f3cfef30a75142d2d930ad72651";
+      };
+    };
+    "json-stringify-safe-5.0.1" = {
+      name = "json-stringify-safe";
+      packageName = "json-stringify-safe";
+      version = "5.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz";
+        sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
+      };
+    };
+    "jsonfile-3.0.1" = {
+      name = "jsonfile";
+      packageName = "jsonfile";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz";
+        sha1 = "a5ecc6f65f53f662c4415c7675a0331d0992ec66";
+      };
+    };
+    "jsonfile-4.0.0" = {
+      name = "jsonfile";
+      packageName = "jsonfile";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz";
+        sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb";
+      };
+    };
+    "jsonparse-1.3.1" = {
+      name = "jsonparse";
+      packageName = "jsonparse";
+      version = "1.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz";
+        sha1 = "3f4dae4a91fac315f71062f8521cc239f1366280";
+      };
+    };
+    "jsprim-1.4.1" = {
+      name = "jsprim";
+      packageName = "jsprim";
+      version = "1.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz";
+        sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2";
+      };
+    };
+    "lcid-1.0.0" = {
+      name = "lcid";
+      packageName = "lcid";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz";
+        sha1 = "308accafa0bc483a3867b4b6f2b9506251d1b835";
+      };
+    };
+    "lcid-2.0.0" = {
+      name = "lcid";
+      packageName = "lcid";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz";
+        sha512 = "avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==";
+      };
+    };
+    "levn-0.2.5" = {
+      name = "levn";
+      packageName = "levn";
+      version = "0.2.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/levn/-/levn-0.2.5.tgz";
+        sha1 = "ba8d339d0ca4a610e3a3f145b9caf48807155054";
+      };
+    };
+    "levn-0.3.0" = {
+      name = "levn";
+      packageName = "levn";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz";
+        sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee";
+      };
+    };
+    "load-json-file-1.1.0" = {
+      name = "load-json-file";
+      packageName = "load-json-file";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz";
+        sha1 = "956905708d58b4bab4c2261b04f59f31c99374c0";
+      };
+    };
+    "load-json-file-2.0.0" = {
+      name = "load-json-file";
+      packageName = "load-json-file";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz";
+        sha1 = "7947e42149af80d696cbf797bcaabcfe1fe29ca8";
+      };
+    };
+    "locate-path-2.0.0" = {
+      name = "locate-path";
+      packageName = "locate-path";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz";
+        sha1 = "2b568b265eec944c6d9c0de9c3dbbbca0354cd8e";
+      };
+    };
+    "locate-path-3.0.0" = {
+      name = "locate-path";
+      packageName = "locate-path";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz";
+        sha512 = "7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==";
+      };
+    };
+    "lodash-4.17.15" = {
+      name = "lodash";
+      packageName = "lodash";
+      version = "4.17.15";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz";
+        sha512 = "8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==";
+      };
+    };
+    "lru-cache-4.1.5" = {
+      name = "lru-cache";
+      packageName = "lru-cache";
+      version = "4.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz";
+        sha512 = "sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==";
+      };
+    };
+    "map-age-cleaner-0.1.3" = {
+      name = "map-age-cleaner";
+      packageName = "map-age-cleaner";
+      version = "0.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz";
+        sha512 = "bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==";
+      };
+    };
+    "mathjs-5.10.3" = {
+      name = "mathjs";
+      packageName = "mathjs";
+      version = "5.10.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mathjs/-/mathjs-5.10.3.tgz";
+        sha512 = "ySjg30BC3dYjQm73ILZtwcWzFJde0VU6otkXW/57IjjuYRa3Qaf0Kb8pydEuBZYtqW2OxreAtsricrAmOj3jIw==";
+      };
+    };
+    "megaminx-0.3.3" = {
+      name = "megaminx";
+      packageName = "megaminx";
+      version = "0.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/megaminx/-/megaminx-0.3.3.tgz";
+        sha512 = "lZBSLMro+XYJIix9zCZ8N6nZgixpjUPkX6CKuh+Y9Wl9bir/2Fp27NWapA0cNQCPrzOOI9sAwxc4BI14aIdumw==";
+      };
+    };
+    "mem-1.1.0" = {
+      name = "mem";
+      packageName = "mem";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz";
+        sha1 = "5edd52b485ca1d900fe64895505399a0dfa45f76";
+      };
+    };
+    "mem-4.3.0" = {
+      name = "mem";
+      packageName = "mem";
+      version = "4.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz";
+        sha512 = "qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==";
+      };
+    };
+    "microbuffer-1.0.0" = {
+      name = "microbuffer";
+      packageName = "microbuffer";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/microbuffer/-/microbuffer-1.0.0.tgz";
+        sha1 = "8b3832ed40c87d51f47bb234913a698a756d19d2";
+      };
+    };
+    "mime-db-1.40.0" = {
+      name = "mime-db";
+      packageName = "mime-db";
+      version = "1.40.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz";
+        sha512 = "jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==";
+      };
+    };
+    "mime-types-2.1.24" = {
+      name = "mime-types";
+      packageName = "mime-types";
+      version = "2.1.24";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz";
+        sha512 = "WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==";
+      };
+    };
+    "mimic-fn-1.2.0" = {
+      name = "mimic-fn";
+      packageName = "mimic-fn";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz";
+        sha512 = "jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==";
+      };
+    };
+    "mimic-fn-2.1.0" = {
+      name = "mimic-fn";
+      packageName = "mimic-fn";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz";
+        sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==";
+      };
+    };
+    "minimatch-3.0.4" = {
+      name = "minimatch";
+      packageName = "minimatch";
+      version = "3.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz";
+        sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==";
+      };
+    };
+    "minimist-0.0.8" = {
+      name = "minimist";
+      packageName = "minimist";
+      version = "0.0.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
+        sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
+      };
+    };
+    "minipass-2.5.1" = {
+      name = "minipass";
+      packageName = "minipass";
+      version = "2.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minipass/-/minipass-2.5.1.tgz";
+        sha512 = "dmpSnLJtNQioZFI5HfQ55Ad0DzzsMAb+HfokwRTNXwEQjepbTkl5mtIlSVxGIkOkxlpX7wIn5ET/oAd9fZ/Y/Q==";
+      };
+    };
+    "minizlib-1.2.2" = {
+      name = "minizlib";
+      packageName = "minizlib";
+      version = "1.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minizlib/-/minizlib-1.2.2.tgz";
+        sha512 = "hR3At21uSrsjjDTWrbu0IMLTpnkpv8IIMFDFaoz43Tmu4LkmAXfH44vNNzpTnf+OAQQCHrb91y/wc2J4x5XgSQ==";
+      };
+    };
+    "mkdirp-0.5.1" = {
+      name = "mkdirp";
+      packageName = "mkdirp";
+      version = "0.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
+        sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
+      };
+    };
+    "ms-2.0.0" = {
+      name = "ms";
+      packageName = "ms";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz";
+        sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8";
+      };
+    };
+    "ms-2.1.2" = {
+      name = "ms";
+      packageName = "ms";
+      version = "2.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz";
+        sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==";
+      };
+    };
+    "mute-stream-0.0.7" = {
+      name = "mute-stream";
+      packageName = "mute-stream";
+      version = "0.0.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz";
+        sha1 = "3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab";
+      };
+    };
+    "nan-2.14.0" = {
+      name = "nan";
+      packageName = "nan";
+      version = "2.14.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz";
+        sha512 = "INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==";
+      };
+    };
+    "natural-compare-1.4.0" = {
+      name = "natural-compare";
+      packageName = "natural-compare";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz";
+        sha1 = "4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7";
+      };
+    };
+    "nice-try-1.0.5" = {
+      name = "nice-try";
+      packageName = "nice-try";
+      version = "1.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz";
+        sha512 = "1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==";
+      };
+    };
+    "node-gyp-4.0.0" = {
+      name = "node-gyp";
+      packageName = "node-gyp";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-gyp/-/node-gyp-4.0.0.tgz";
+        sha512 = "2XiryJ8sICNo6ej8d0idXDEMKfVfFK7kekGCtJAuelGsYHQxhj13KTf95swTCN2dZ/4lTfZ84Fu31jqJEEgjWA==";
+      };
+    };
+    "node-version-1.2.0" = {
+      name = "node-version";
+      packageName = "node-version";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-version/-/node-version-1.2.0.tgz";
+        sha512 = "ma6oU4Sk0qOoKEAymVoTvk8EdXEobdS7m/mAGhDJ8Rouugho48crHBORAmy5BoOcv8wraPM6xumapQp5hl4iIQ==";
+      };
+    };
+    "nopt-3.0.6" = {
+      name = "nopt";
+      packageName = "nopt";
+      version = "3.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz";
+        sha1 = "c6465dbf08abcd4db359317f79ac68a646b28ff9";
+      };
+    };
+    "normalize-package-data-2.5.0" = {
+      name = "normalize-package-data";
+      packageName = "normalize-package-data";
+      version = "2.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz";
+        sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==";
+      };
+    };
+    "npm-run-path-2.0.2" = {
+      name = "npm-run-path";
+      packageName = "npm-run-path";
+      version = "2.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz";
+        sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f";
+      };
+    };
+    "npmlog-4.1.2" = {
+      name = "npmlog";
+      packageName = "npmlog";
+      version = "4.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz";
+        sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==";
+      };
+    };
+    "number-is-nan-1.0.1" = {
+      name = "number-is-nan";
+      packageName = "number-is-nan";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz";
+        sha1 = "097b602b53422a522c1afb8790318336941a011d";
+      };
+    };
+    "oauth-sign-0.9.0" = {
+      name = "oauth-sign";
+      packageName = "oauth-sign";
+      version = "0.9.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz";
+        sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==";
+      };
+    };
+    "object-assign-4.1.1" = {
+      name = "object-assign";
+      packageName = "object-assign";
+      version = "4.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz";
+        sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863";
+      };
+    };
+    "once-1.4.0" = {
+      name = "once";
+      packageName = "once";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz";
+        sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1";
+      };
+    };
+    "onetime-2.0.1" = {
+      name = "onetime";
+      packageName = "onetime";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz";
+        sha1 = "067428230fd67443b2794b22bba528b6867962d4";
+      };
+    };
+    "optionator-0.3.0" = {
+      name = "optionator";
+      packageName = "optionator";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/optionator/-/optionator-0.3.0.tgz";
+        sha1 = "9715a8b5f5e7586cff06c8249e039cd7364d3f54";
+      };
+    };
+    "optionator-0.8.2" = {
+      name = "optionator";
+      packageName = "optionator";
+      version = "0.8.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz";
+        sha1 = "364c5e409d3f4d6301d6c0b4c05bba50180aeb64";
+      };
+    };
+    "os-homedir-1.0.2" = {
+      name = "os-homedir";
+      packageName = "os-homedir";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz";
+        sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3";
+      };
+    };
+    "os-locale-1.4.0" = {
+      name = "os-locale";
+      packageName = "os-locale";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz";
+        sha1 = "20f9f17ae29ed345e8bde583b13d2009803c14d9";
+      };
+    };
+    "os-locale-2.1.0" = {
+      name = "os-locale";
+      packageName = "os-locale";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz";
+        sha512 = "3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==";
+      };
+    };
+    "os-locale-3.1.0" = {
+      name = "os-locale";
+      packageName = "os-locale";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz";
+        sha512 = "Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==";
+      };
+    };
+    "os-tmpdir-1.0.2" = {
+      name = "os-tmpdir";
+      packageName = "os-tmpdir";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz";
+        sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274";
+      };
+    };
+    "osenv-0.1.5" = {
+      name = "osenv";
+      packageName = "osenv";
+      version = "0.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz";
+        sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==";
+      };
+    };
+    "p-defer-1.0.0" = {
+      name = "p-defer";
+      packageName = "p-defer";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz";
+        sha1 = "9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c";
+      };
+    };
+    "p-finally-1.0.0" = {
+      name = "p-finally";
+      packageName = "p-finally";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz";
+        sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae";
+      };
+    };
+    "p-is-promise-2.1.0" = {
+      name = "p-is-promise";
+      packageName = "p-is-promise";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz";
+        sha512 = "Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==";
+      };
+    };
+    "p-limit-1.3.0" = {
+      name = "p-limit";
+      packageName = "p-limit";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz";
+        sha512 = "vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==";
+      };
+    };
+    "p-limit-2.2.1" = {
+      name = "p-limit";
+      packageName = "p-limit";
+      version = "2.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz";
+        sha512 = "85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==";
+      };
+    };
+    "p-locate-2.0.0" = {
+      name = "p-locate";
+      packageName = "p-locate";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz";
+        sha1 = "20a0103b222a70c8fd39cc2e580680f3dde5ec43";
+      };
+    };
+    "p-locate-3.0.0" = {
+      name = "p-locate";
+      packageName = "p-locate";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz";
+        sha512 = "x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==";
+      };
+    };
+    "p-try-1.0.0" = {
+      name = "p-try";
+      packageName = "p-try";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz";
+        sha1 = "cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3";
+      };
+    };
+    "p-try-2.2.0" = {
+      name = "p-try";
+      packageName = "p-try";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz";
+        sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==";
+      };
+    };
+    "pako-1.0.10" = {
+      name = "pako";
+      packageName = "pako";
+      version = "1.0.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pako/-/pako-1.0.10.tgz";
+        sha512 = "0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==";
+      };
+    };
+    "parent-module-1.0.1" = {
+      name = "parent-module";
+      packageName = "parent-module";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz";
+        sha512 = "GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==";
+      };
+    };
+    "parse-json-2.2.0" = {
+      name = "parse-json";
+      packageName = "parse-json";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz";
+        sha1 = "f480f40434ef80741f8469099f8dea18f55a4dc9";
+      };
+    };
+    "path-exists-2.1.0" = {
+      name = "path-exists";
+      packageName = "path-exists";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz";
+        sha1 = "0feb6c64f0fc518d9a754dd5efb62c7022761f4b";
+      };
+    };
+    "path-exists-3.0.0" = {
+      name = "path-exists";
+      packageName = "path-exists";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz";
+        sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515";
+      };
+    };
+    "path-is-absolute-1.0.1" = {
+      name = "path-is-absolute";
+      packageName = "path-is-absolute";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz";
+        sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f";
+      };
+    };
+    "path-key-2.0.1" = {
+      name = "path-key";
+      packageName = "path-key";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz";
+        sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40";
+      };
+    };
+    "path-parse-1.0.6" = {
+      name = "path-parse";
+      packageName = "path-parse";
+      version = "1.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz";
+        sha512 = "GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==";
+      };
+    };
+    "path-type-1.1.0" = {
+      name = "path-type";
+      packageName = "path-type";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz";
+        sha1 = "59c44f7ee491da704da415da5a4070ba4f8fe441";
+      };
+    };
+    "path-type-2.0.0" = {
+      name = "path-type";
+      packageName = "path-type";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz";
+        sha1 = "f012ccb8415b7096fc2daa1054c3d72389594c73";
+      };
+    };
+    "patrisika-0.21.0" = {
+      name = "patrisika";
+      packageName = "patrisika";
+      version = "0.21.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/patrisika/-/patrisika-0.21.0.tgz";
+        sha1 = "b82c27f7d4041522dc5c31b43b7c6efb19e47482";
+      };
+    };
+    "patrisika-scopes-0.11.1" = {
+      name = "patrisika-scopes";
+      packageName = "patrisika-scopes";
+      version = "0.11.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/patrisika-scopes/-/patrisika-scopes-0.11.1.tgz";
+        sha512 = "UCIBMx1nzNaR5CcDoQ9/jtY5RlJqf2CrJYHiMZJhi15NPvsPKRfJT/DPZMkhCunexOKmH03EDZYZU1hGn7mL0w==";
+      };
+    };
+    "performance-now-2.1.0" = {
+      name = "performance-now";
+      packageName = "performance-now";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz";
+        sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b";
+      };
+    };
+    "pify-2.3.0" = {
+      name = "pify";
+      packageName = "pify";
+      version = "2.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz";
+        sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c";
+      };
+    };
+    "pinkie-2.0.4" = {
+      name = "pinkie";
+      packageName = "pinkie";
+      version = "2.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz";
+        sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870";
+      };
+    };
+    "pinkie-promise-2.0.1" = {
+      name = "pinkie-promise";
+      packageName = "pinkie-promise";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz";
+        sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa";
+      };
+    };
+    "prelude-ls-1.1.2" = {
+      name = "prelude-ls";
+      packageName = "prelude-ls";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz";
+        sha1 = "21932a549f5e52ffd9a827f570e04be62a97da54";
+      };
+    };
+    "process-nextick-args-2.0.1" = {
+      name = "process-nextick-args";
+      packageName = "process-nextick-args";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz";
+        sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==";
+      };
+    };
+    "progress-2.0.3" = {
+      name = "progress";
+      packageName = "progress";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz";
+        sha512 = "7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==";
+      };
+    };
+    "promise-polyfill-6.1.0" = {
+      name = "promise-polyfill";
+      packageName = "promise-polyfill";
+      version = "6.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-6.1.0.tgz";
+        sha1 = "dfa96943ea9c121fca4de9b5868cb39d3472e057";
+      };
+    };
+    "proper-lockfile-3.2.0" = {
+      name = "proper-lockfile";
+      packageName = "proper-lockfile";
+      version = "3.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/proper-lockfile/-/proper-lockfile-3.2.0.tgz";
+        sha512 = "iMghHHXv2bsxl6NchhEaFck8tvX3F9cknEEh1SUpguUOBjN7PAAW9BLzmbc1g/mCD1gY3EE2EABBHPJfFdHFmA==";
+      };
+    };
+    "pseudomap-1.0.2" = {
+      name = "pseudomap";
+      packageName = "pseudomap";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz";
+        sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3";
+      };
+    };
+    "psl-1.4.0" = {
+      name = "psl";
+      packageName = "psl";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/psl/-/psl-1.4.0.tgz";
+        sha512 = "HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw==";
+      };
+    };
+    "pump-3.0.0" = {
+      name = "pump";
+      packageName = "pump";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz";
+        sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==";
+      };
+    };
+    "punycode-1.4.1" = {
+      name = "punycode";
+      packageName = "punycode";
+      version = "1.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz";
+        sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e";
+      };
+    };
+    "punycode-2.1.1" = {
+      name = "punycode";
+      packageName = "punycode";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz";
+        sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==";
+      };
+    };
+    "qs-6.5.2" = {
+      name = "qs";
+      packageName = "qs";
+      version = "6.5.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz";
+        sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==";
+      };
+    };
+    "read-pkg-1.1.0" = {
+      name = "read-pkg";
+      packageName = "read-pkg";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz";
+        sha1 = "f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28";
+      };
+    };
+    "read-pkg-2.0.0" = {
+      name = "read-pkg";
+      packageName = "read-pkg";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz";
+        sha1 = "8ef1c0623c6a6db0dc6713c4bfac46332b2368f8";
+      };
+    };
+    "read-pkg-up-1.0.1" = {
+      name = "read-pkg-up";
+      packageName = "read-pkg-up";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz";
+        sha1 = "9d63c13276c065918d57f002a57f40a1b643fb02";
+      };
+    };
+    "read-pkg-up-2.0.0" = {
+      name = "read-pkg-up";
+      packageName = "read-pkg-up";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz";
+        sha1 = "6b72a8048984e0c41e79510fd5e9fa99b3b549be";
+      };
+    };
+    "readable-stream-2.3.6" = {
+      name = "readable-stream";
+      packageName = "readable-stream";
+      version = "2.3.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz";
+        sha512 = "tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==";
+      };
+    };
+    "regexpp-2.0.1" = {
+      name = "regexpp";
+      packageName = "regexpp";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz";
+        sha512 = "lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==";
+      };
+    };
+    "request-2.88.0" = {
+      name = "request";
+      packageName = "request";
+      version = "2.88.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/request/-/request-2.88.0.tgz";
+        sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==";
+      };
+    };
+    "require-directory-2.1.1" = {
+      name = "require-directory";
+      packageName = "require-directory";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz";
+        sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42";
+      };
+    };
+    "require-main-filename-1.0.1" = {
+      name = "require-main-filename";
+      packageName = "require-main-filename";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz";
+        sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1";
+      };
+    };
+    "require-main-filename-2.0.0" = {
+      name = "require-main-filename";
+      packageName = "require-main-filename";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz";
+        sha512 = "NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==";
+      };
+    };
+    "resolve-1.12.0" = {
+      name = "resolve";
+      packageName = "resolve";
+      version = "1.12.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz";
+        sha512 = "B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==";
+      };
+    };
+    "resolve-from-4.0.0" = {
+      name = "resolve-from";
+      packageName = "resolve-from";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz";
+        sha512 = "pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==";
+      };
+    };
+    "resolve-url-0.2.1" = {
+      name = "resolve-url";
+      packageName = "resolve-url";
+      version = "0.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz";
+        sha1 = "2c637fe77c893afd2a663fe21aa9080068e2052a";
+      };
+    };
+    "restore-cursor-2.0.0" = {
+      name = "restore-cursor";
+      packageName = "restore-cursor";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz";
+        sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf";
+      };
+    };
+    "resumer-0.0.0" = {
+      name = "resumer";
+      packageName = "resumer";
+      version = "0.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz";
+        sha1 = "f1e8f461e4064ba39e82af3cdc2a8c893d076759";
+      };
+    };
+    "retry-0.12.0" = {
+      name = "retry";
+      packageName = "retry";
+      version = "0.12.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz";
+        sha1 = "1b42a6266a21f07421d1b0b54b7dc167b01c013b";
+      };
+    };
+    "rimraf-2.2.8" = {
+      name = "rimraf";
+      packageName = "rimraf";
+      version = "2.2.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz";
+        sha1 = "e439be2aaee327321952730f99a8929e4fc50582";
+      };
+    };
+    "rimraf-2.6.3" = {
+      name = "rimraf";
+      packageName = "rimraf";
+      version = "2.6.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz";
+        sha512 = "mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==";
+      };
+    };
+    "rimraf-2.7.1" = {
+      name = "rimraf";
+      packageName = "rimraf";
+      version = "2.7.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz";
+        sha512 = "uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==";
+      };
+    };
+    "run-async-2.3.0" = {
+      name = "run-async";
+      packageName = "run-async";
+      version = "2.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz";
+        sha1 = "0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0";
+      };
+    };
+    "rxjs-6.5.3" = {
+      name = "rxjs";
+      packageName = "rxjs";
+      version = "6.5.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/rxjs/-/rxjs-6.5.3.tgz";
+        sha512 = "wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA==";
+      };
+    };
+    "safe-buffer-5.1.2" = {
+      name = "safe-buffer";
+      packageName = "safe-buffer";
+      version = "5.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz";
+        sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==";
+      };
+    };
+    "safer-buffer-2.1.2" = {
+      name = "safer-buffer";
+      packageName = "safer-buffer";
+      version = "2.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz";
+        sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==";
+      };
+    };
+    "sax-1.2.4" = {
+      name = "sax";
+      packageName = "sax";
+      version = "1.2.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz";
+        sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==";
+      };
+    };
+    "seed-random-2.2.0" = {
+      name = "seed-random";
+      packageName = "seed-random";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/seed-random/-/seed-random-2.2.0.tgz";
+        sha1 = "2a9b19e250a817099231a5b99a4daf80b7fbed54";
+      };
+    };
+    "semaphore-async-await-1.5.1" = {
+      name = "semaphore-async-await";
+      packageName = "semaphore-async-await";
+      version = "1.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/semaphore-async-await/-/semaphore-async-await-1.5.1.tgz";
+        sha1 = "857bef5e3644601ca4b9570b87e9df5ca12974fa";
+      };
+    };
+    "semver-5.3.0" = {
+      name = "semver";
+      packageName = "semver";
+      version = "5.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz";
+        sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f";
+      };
+    };
+    "semver-5.7.1" = {
+      name = "semver";
+      packageName = "semver";
+      version = "5.7.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz";
+        sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==";
+      };
+    };
+    "semver-6.3.0" = {
+      name = "semver";
+      packageName = "semver";
+      version = "6.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz";
+        sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==";
+      };
+    };
+    "set-blocking-2.0.0" = {
+      name = "set-blocking";
+      packageName = "set-blocking";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz";
+        sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7";
+      };
+    };
+    "shebang-command-1.2.0" = {
+      name = "shebang-command";
+      packageName = "shebang-command";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz";
+        sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea";
+      };
+    };
+    "shebang-regex-1.0.0" = {
+      name = "shebang-regex";
+      packageName = "shebang-regex";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz";
+        sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3";
+      };
+    };
+    "signal-exit-3.0.2" = {
+      name = "signal-exit";
+      packageName = "signal-exit";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz";
+        sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d";
+      };
+    };
+    "slice-ansi-2.1.0" = {
+      name = "slice-ansi";
+      packageName = "slice-ansi";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz";
+        sha512 = "Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==";
+      };
+    };
+    "source-map-0.1.43" = {
+      name = "source-map";
+      packageName = "source-map";
+      version = "0.1.43";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz";
+        sha1 = "c24bc146ca517c1471f5dacbe2571b2b7f9e3346";
+      };
+    };
+    "source-map-0.6.1" = {
+      name = "source-map";
+      packageName = "source-map";
+      version = "0.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz";
+        sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==";
+      };
+    };
+    "source-map-0.7.3" = {
+      name = "source-map";
+      packageName = "source-map";
+      version = "0.7.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz";
+        sha512 = "CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==";
+      };
+    };
+    "source-map-resolve-0.5.2" = {
+      name = "source-map-resolve";
+      packageName = "source-map-resolve";
+      version = "0.5.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz";
+        sha512 = "MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==";
+      };
+    };
+    "source-map-url-0.4.0" = {
+      name = "source-map-url";
+      packageName = "source-map-url";
+      version = "0.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz";
+        sha1 = "3e935d7ddd73631b97659956d55128e87b5084a3";
+      };
+    };
+    "spdx-correct-3.1.0" = {
+      name = "spdx-correct";
+      packageName = "spdx-correct";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz";
+        sha512 = "lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==";
+      };
+    };
+    "spdx-exceptions-2.2.0" = {
+      name = "spdx-exceptions";
+      packageName = "spdx-exceptions";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz";
+        sha512 = "2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==";
+      };
+    };
+    "spdx-expression-parse-3.0.0" = {
+      name = "spdx-expression-parse";
+      packageName = "spdx-expression-parse";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz";
+        sha512 = "Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==";
+      };
+    };
+    "spdx-license-ids-3.0.5" = {
+      name = "spdx-license-ids";
+      packageName = "spdx-license-ids";
+      version = "3.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz";
+        sha512 = "J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==";
+      };
+    };
+    "split-1.0.1" = {
+      name = "split";
+      packageName = "split";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/split/-/split-1.0.1.tgz";
+        sha512 = "mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==";
+      };
+    };
+    "sprintf-js-1.0.3" = {
+      name = "sprintf-js";
+      packageName = "sprintf-js";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz";
+        sha1 = "04e6926f662895354f3dd015203633b857297e2c";
+      };
+    };
+    "sshpk-1.16.1" = {
+      name = "sshpk";
+      packageName = "sshpk";
+      version = "1.16.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz";
+        sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==";
+      };
+    };
+    "stack-trace-0.0.9" = {
+      name = "stack-trace";
+      packageName = "stack-trace";
+      version = "0.0.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz";
+        sha1 = "a8f6eaeca90674c333e7c43953f275b451510695";
+      };
+    };
+    "string-width-1.0.2" = {
+      name = "string-width";
+      packageName = "string-width";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz";
+        sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3";
+      };
+    };
+    "string-width-2.1.1" = {
+      name = "string-width";
+      packageName = "string-width";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz";
+        sha512 = "nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==";
+      };
+    };
+    "string-width-3.1.0" = {
+      name = "string-width";
+      packageName = "string-width";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz";
+        sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==";
+      };
+    };
+    "string_decoder-1.1.1" = {
+      name = "string_decoder";
+      packageName = "string_decoder";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz";
+        sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==";
+      };
+    };
+    "strip-ansi-3.0.1" = {
+      name = "strip-ansi";
+      packageName = "strip-ansi";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz";
+        sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf";
+      };
+    };
+    "strip-ansi-4.0.0" = {
+      name = "strip-ansi";
+      packageName = "strip-ansi";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz";
+        sha1 = "a8479022eb1ac368a871389b635262c505ee368f";
+      };
+    };
+    "strip-ansi-5.2.0" = {
+      name = "strip-ansi";
+      packageName = "strip-ansi";
+      version = "5.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz";
+        sha512 = "DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==";
+      };
+    };
+    "strip-bom-2.0.0" = {
+      name = "strip-bom";
+      packageName = "strip-bom";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz";
+        sha1 = "6219a85616520491f35788bdbf1447a99c7e6b0e";
+      };
+    };
+    "strip-bom-3.0.0" = {
+      name = "strip-bom";
+      packageName = "strip-bom";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz";
+        sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3";
+      };
+    };
+    "strip-bom-buf-1.0.0" = {
+      name = "strip-bom-buf";
+      packageName = "strip-bom-buf";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-bom-buf/-/strip-bom-buf-1.0.0.tgz";
+        sha1 = "1cb45aaf57530f4caf86c7f75179d2c9a51dd572";
+      };
+    };
+    "strip-bom-stream-3.0.0" = {
+      name = "strip-bom-stream";
+      packageName = "strip-bom-stream";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-3.0.0.tgz";
+        sha1 = "956bcc5d84430f69256a90ed823765cd858e159c";
+      };
+    };
+    "strip-eof-1.0.0" = {
+      name = "strip-eof";
+      packageName = "strip-eof";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz";
+        sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf";
+      };
+    };
+    "strip-json-comments-3.0.1" = {
+      name = "strip-json-comments";
+      packageName = "strip-json-comments";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz";
+        sha512 = "VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==";
+      };
+    };
+    "supports-color-5.5.0" = {
+      name = "supports-color";
+      packageName = "supports-color";
+      version = "5.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz";
+        sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==";
+      };
+    };
+    "table-5.4.6" = {
+      name = "table";
+      packageName = "table";
+      version = "5.4.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/table/-/table-5.4.6.tgz";
+        sha512 = "wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==";
+      };
+    };
+    "tar-4.4.10" = {
+      name = "tar";
+      packageName = "tar";
+      version = "4.4.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tar/-/tar-4.4.10.tgz";
+        sha512 = "g2SVs5QIxvo6OLp0GudTqEf05maawKUxXru104iaayWA09551tFCTI8f1Asb4lPfkBr91k07iL4c11XO3/b0tA==";
+      };
+    };
+    "temp-0.8.3" = {
+      name = "temp";
+      packageName = "temp";
+      version = "0.8.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/temp/-/temp-0.8.3.tgz";
+        sha1 = "e0c6bc4d26b903124410e4fed81103014dfc1f59";
+      };
+    };
+    "text-table-0.2.0" = {
+      name = "text-table";
+      packageName = "text-table";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz";
+        sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4";
+      };
+    };
+    "through-2.3.8" = {
+      name = "through";
+      packageName = "through";
+      version = "2.3.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/through/-/through-2.3.8.tgz";
+        sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5";
+      };
+    };
+    "tiny-emitter-2.1.0" = {
+      name = "tiny-emitter";
+      packageName = "tiny-emitter";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz";
+        sha512 = "NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==";
+      };
+    };
+    "tmp-0.0.33" = {
+      name = "tmp";
+      packageName = "tmp";
+      version = "0.0.33";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz";
+        sha512 = "jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==";
+      };
+    };
+    "tough-cookie-2.4.3" = {
+      name = "tough-cookie";
+      packageName = "tough-cookie";
+      version = "2.4.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz";
+        sha512 = "Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==";
+      };
+    };
+    "ts-process-promises-1.0.2" = {
+      name = "ts-process-promises";
+      packageName = "ts-process-promises";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ts-process-promises/-/ts-process-promises-1.0.2.tgz";
+        sha512 = "6qWWz2HdFbD2uAfgS5t65Dd6HQKYjfra+YXQzKzxIG+RKTpoeDi+x+TW85SEF3cWUI2UecrOXJobvD+04MiTZg==";
+      };
+    };
+    "tslib-1.10.0" = {
+      name = "tslib";
+      packageName = "tslib";
+      version = "1.10.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz";
+        sha512 = "qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==";
+      };
+    };
+    "tslib-1.9.3" = {
+      name = "tslib";
+      packageName = "tslib";
+      version = "1.9.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz";
+        sha512 = "4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==";
+      };
+    };
+    "tunnel-agent-0.6.0" = {
+      name = "tunnel-agent";
+      packageName = "tunnel-agent";
+      version = "0.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz";
+        sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd";
+      };
+    };
+    "tweetnacl-0.14.5" = {
+      name = "tweetnacl";
+      packageName = "tweetnacl";
+      version = "0.14.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz";
+        sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64";
+      };
+    };
+    "type-check-0.3.2" = {
+      name = "type-check";
+      packageName = "type-check";
+      version = "0.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz";
+        sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72";
+      };
+    };
+    "typed-function-1.1.0" = {
+      name = "typed-function";
+      packageName = "typed-function";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/typed-function/-/typed-function-1.1.0.tgz";
+        sha512 = "TuQzwiT4DDg19beHam3E66oRXhyqlyfgjHB/5fcvsRXbfmWPJfto9B4a0TBdTrQAPGlGmXh/k7iUI+WsObgORA==";
+      };
+    };
+    "typo-geom-0.5.1" = {
+      name = "typo-geom";
+      packageName = "typo-geom";
+      version = "0.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/typo-geom/-/typo-geom-0.5.1.tgz";
+        sha512 = "nj81m0eqRMpK6NcwkGlT9r3CbwjCQhsFU6SBUuYW9TDveqIdi/QUFGkikoImtE1C6OzY2LvuVMSG8rx/ZTCGtQ==";
+      };
+    };
+    "universalify-0.1.2" = {
+      name = "universalify";
+      packageName = "universalify";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz";
+        sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==";
+      };
+    };
+    "uri-js-4.2.2" = {
+      name = "uri-js";
+      packageName = "uri-js";
+      version = "4.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz";
+        sha512 = "KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==";
+      };
+    };
+    "urix-0.1.0" = {
+      name = "urix";
+      packageName = "urix";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz";
+        sha1 = "da937f7a62e21fec1fd18d49b35c2935067a6c72";
+      };
+    };
+    "util-deprecate-1.0.2" = {
+      name = "util-deprecate";
+      packageName = "util-deprecate";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz";
+        sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf";
+      };
+    };
+    "uuid-3.3.3" = {
+      name = "uuid";
+      packageName = "uuid";
+      version = "3.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz";
+        sha512 = "pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==";
+      };
+    };
+    "v8-compile-cache-2.1.0" = {
+      name = "v8-compile-cache";
+      packageName = "v8-compile-cache";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz";
+        sha512 = "usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g==";
+      };
+    };
+    "validate-npm-package-license-3.0.4" = {
+      name = "validate-npm-package-license";
+      packageName = "validate-npm-package-license";
+      version = "3.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz";
+        sha512 = "DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==";
+      };
+    };
+    "verror-1.10.0" = {
+      name = "verror";
+      packageName = "verror";
+      version = "1.10.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz";
+        sha1 = "3a105ca17053af55d6e270c1f8288682e18da400";
+      };
+    };
+    "which-1.3.1" = {
+      name = "which";
+      packageName = "which";
+      version = "1.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/which/-/which-1.3.1.tgz";
+        sha512 = "HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==";
+      };
+    };
+    "which-module-1.0.0" = {
+      name = "which-module";
+      packageName = "which-module";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz";
+        sha1 = "bba63ca861948994ff307736089e3b96026c2a4f";
+      };
+    };
+    "which-module-2.0.0" = {
+      name = "which-module";
+      packageName = "which-module";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz";
+        sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a";
+      };
+    };
+    "wide-align-1.1.3" = {
+      name = "wide-align";
+      packageName = "wide-align";
+      version = "1.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz";
+        sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==";
+      };
+    };
+    "wordwrap-0.0.3" = {
+      name = "wordwrap";
+      packageName = "wordwrap";
+      version = "0.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz";
+        sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107";
+      };
+    };
+    "wordwrap-1.0.0" = {
+      name = "wordwrap";
+      packageName = "wordwrap";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz";
+        sha1 = "27584810891456a4171c8d0226441ade90cbcaeb";
+      };
+    };
+    "wrap-ansi-2.1.0" = {
+      name = "wrap-ansi";
+      packageName = "wrap-ansi";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz";
+        sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85";
+      };
+    };
+    "wrap-ansi-5.1.0" = {
+      name = "wrap-ansi";
+      packageName = "wrap-ansi";
+      version = "5.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz";
+        sha512 = "QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==";
+      };
+    };
+    "wrappy-1.0.2" = {
+      name = "wrappy";
+      packageName = "wrappy";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz";
+        sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f";
+      };
+    };
+    "write-1.0.3" = {
+      name = "write";
+      packageName = "write";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/write/-/write-1.0.3.tgz";
+        sha512 = "/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==";
+      };
+    };
+    "y18n-3.2.1" = {
+      name = "y18n";
+      packageName = "y18n";
+      version = "3.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz";
+        sha1 = "6d15fba884c08679c0d77e88e7759e811e07fa41";
+      };
+    };
+    "y18n-4.0.0" = {
+      name = "y18n";
+      packageName = "y18n";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz";
+        sha512 = "r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==";
+      };
+    };
+    "yallist-2.1.2" = {
+      name = "yallist";
+      packageName = "yallist";
+      version = "2.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz";
+        sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52";
+      };
+    };
+    "yallist-3.0.3" = {
+      name = "yallist";
+      packageName = "yallist";
+      version = "3.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz";
+        sha512 = "S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==";
+      };
+    };
+    "yargs-12.0.5" = {
+      name = "yargs";
+      packageName = "yargs";
+      version = "12.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz";
+        sha512 = "Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==";
+      };
+    };
+    "yargs-6.6.0" = {
+      name = "yargs";
+      packageName = "yargs";
+      version = "6.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz";
+        sha1 = "782ec21ef403345f830a808ca3d513af56065208";
+      };
+    };
+    "yargs-8.0.2" = {
+      name = "yargs";
+      packageName = "yargs";
+      version = "8.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz";
+        sha1 = "6299a9055b1cefc969ff7e79c1d918dceb22c360";
+      };
+    };
+    "yargs-parser-11.1.1" = {
+      name = "yargs-parser";
+      packageName = "yargs-parser";
+      version = "11.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz";
+        sha512 = "C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==";
+      };
+    };
+    "yargs-parser-13.1.1" = {
+      name = "yargs-parser";
+      packageName = "yargs-parser";
+      version = "13.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz";
+        sha512 = "oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==";
+      };
+    };
+    "yargs-parser-4.2.1" = {
+      name = "yargs-parser";
+      packageName = "yargs-parser";
+      version = "4.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz";
+        sha1 = "29cceac0dc4f03c6c87b4a9f217dd18c9f74871c";
+      };
+    };
+    "yargs-parser-7.0.0" = {
+      name = "yargs-parser";
+      packageName = "yargs-parser";
+      version = "7.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz";
+        sha1 = "8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9";
+      };
+    };
+  };
+in
+{
+  caryll-shapeops = nodeEnv.buildNodePackage {
+    name = "caryll-shapeops";
+    packageName = "caryll-shapeops";
+    version = "0.3.1";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/caryll-shapeops/-/caryll-shapeops-0.3.1.tgz";
+      sha512 = "3TdH6DZGL08S6qEvCZLNaOHyFvmzQts8m+TyYEvc6/PiI+XgX5mIag1/CKczIM8e2QtDr8JKW8foo4VNOM8/Og==";
+    };
+    dependencies = [
+      sources."bezier-js-2.4.3"
+      sources."clipper-lib-1.0.0"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Boolean operations and overlap removal for curves.";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
+  libspiro-js = nodeEnv.buildNodePackage {
+    name = "libspiro-js";
+    packageName = "libspiro-js";
+    version = "0.3.1";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/libspiro-js/-/libspiro-js-0.3.1.tgz";
+      sha1 = "86652b0009a6d84ea79a5320bdca5f00612ee439";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "JavaScript libspiro port";
+      homepage = https://github.com/be5invis/libspiro-js;
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
+  megaminx = nodeEnv.buildNodePackage {
+    name = "megaminx";
+    packageName = "megaminx";
+    version = "0.9.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/megaminx/-/megaminx-0.9.0.tgz";
+      sha512 = "1UcxrUXXYboLWS3AJ2NuLckLi3YR7eJiO5LsYAWHZjYE0mmSqJ2ogSt6JrG8YINyogW9/TUWpL1ojwbRsSbyXw==";
+    };
+    dependencies = [
+      sources."JSONStream-1.3.5"
+      sources."child-process-promise-2.2.1"
+      sources."clone-2.1.2"
+      sources."complex.js-2.0.11"
+      sources."core-util-is-1.0.2"
+      sources."cross-spawn-4.0.2"
+      sources."decimal.js-10.2.0"
+      sources."escape-latex-1.2.0"
+      sources."first-chunk-stream-2.0.0"
+      sources."fraction.js-4.0.12"
+      sources."fs-extra-3.0.1"
+      sources."graceful-fs-4.2.2"
+      sources."inherits-2.0.4"
+      sources."is-utf8-0.2.1"
+      sources."isarray-1.0.0"
+      sources."isexe-2.0.0"
+      sources."javascript-natural-sort-0.7.1"
+      sources."jsonfile-3.0.1"
+      sources."jsonparse-1.3.1"
+      sources."lru-cache-4.1.5"
+      sources."mathjs-5.10.3"
+      sources."node-version-1.2.0"
+      sources."process-nextick-args-2.0.1"
+      sources."promise-polyfill-6.1.0"
+      sources."pseudomap-1.0.2"
+      sources."readable-stream-2.3.6"
+      sources."safe-buffer-5.1.2"
+      sources."seed-random-2.2.0"
+      sources."string_decoder-1.1.1"
+      sources."strip-bom-buf-1.0.0"
+      sources."strip-bom-stream-3.0.0"
+      sources."through-2.3.8"
+      sources."tiny-emitter-2.1.0"
+      sources."tslib-1.9.3"
+      sources."typed-function-1.1.0"
+      sources."typo-geom-0.5.1"
+      sources."universalify-0.1.2"
+      sources."util-deprecate-1.0.2"
+      sources."which-1.3.1"
+      sources."yallist-2.1.2"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "A typeface manipulation toolkit";
+      homepage = "https://github.com/caryll/Megaminx#readme";
+      license = "Apache-2.0";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
+  object-assign = nodeEnv.buildNodePackage {
+    name = "object-assign";
+    packageName = "object-assign";
+    version = "4.1.1";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz";
+      sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "ES2015 `Object.assign()` ponyfill";
+      homepage = "https://github.com/sindresorhus/object-assign#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
+  otfcc-ttcize = nodeEnv.buildNodePackage {
+    name = "otfcc-ttcize";
+    packageName = "otfcc-ttcize";
+    version = "0.8.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/otfcc-ttcize/-/otfcc-ttcize-0.8.0.tgz";
+      sha512 = "0RFgy9TDsgTF/1UJ8bSQ4heTYRatDz3HOXXh8d3WyXReqeOU+edgkbG4ERMFPdzFnA+SgqKTnPRg+2pduZsmSQ==";
+    };
+    dependencies = [
+      sources."JSONStream-1.3.5"
+      sources."ansi-regex-2.1.1"
+      sources."camelcase-4.1.0"
+      sources."child-process-promise-2.2.1"
+      (sources."cliui-3.2.0" // {
+        dependencies = [
+          sources."string-width-1.0.2"
+        ];
+      })
+      sources."code-point-at-1.1.0"
+      sources."cross-spawn-4.0.2"
+      sources."cubic2quad-1.1.1"
+      sources."decamelize-1.2.0"
+      sources."error-ex-1.3.2"
+      (sources."execa-0.7.0" // {
+        dependencies = [
+          sources."cross-spawn-5.1.0"
+        ];
+      })
+      sources."find-up-2.1.0"
+      sources."fs-extra-4.0.3"
+      sources."get-caller-file-1.0.3"
+      sources."get-stream-3.0.0"
+      sources."graceful-fs-4.2.2"
+      sources."hosted-git-info-2.8.4"
+      sources."invert-kv-1.0.0"
+      sources."is-arrayish-0.2.1"
+      sources."is-fullwidth-code-point-1.0.0"
+      sources."is-stream-1.1.0"
+      sources."isexe-2.0.0"
+      sources."jsonfile-4.0.0"
+      sources."jsonparse-1.3.1"
+      sources."lcid-1.0.0"
+      sources."load-json-file-2.0.0"
+      sources."locate-path-2.0.0"
+      sources."lru-cache-4.1.5"
+      (sources."megaminx-0.3.3" // {
+        dependencies = [
+          sources."fs-extra-3.0.1"
+          sources."jsonfile-3.0.1"
+        ];
+      })
+      sources."mem-1.1.0"
+      sources."mimic-fn-1.2.0"
+      sources."node-version-1.2.0"
+      sources."normalize-package-data-2.5.0"
+      sources."npm-run-path-2.0.2"
+      sources."number-is-nan-1.0.1"
+      sources."os-locale-2.1.0"
+      sources."os-tmpdir-1.0.2"
+      sources."p-finally-1.0.0"
+      sources."p-limit-1.3.0"
+      sources."p-locate-2.0.0"
+      sources."p-try-1.0.0"
+      sources."parse-json-2.2.0"
+      sources."path-exists-3.0.0"
+      sources."path-key-2.0.1"
+      sources."path-parse-1.0.6"
+      sources."path-type-2.0.0"
+      sources."pify-2.3.0"
+      sources."promise-polyfill-6.1.0"
+      sources."pseudomap-1.0.2"
+      sources."read-pkg-2.0.0"
+      sources."read-pkg-up-2.0.0"
+      sources."require-directory-2.1.1"
+      sources."require-main-filename-1.0.1"
+      sources."resolve-1.12.0"
+      sources."rimraf-2.2.8"
+      sources."semver-5.7.1"
+      sources."set-blocking-2.0.0"
+      sources."shebang-command-1.2.0"
+      sources."shebang-regex-1.0.0"
+      sources."signal-exit-3.0.2"
+      sources."spdx-correct-3.1.0"
+      sources."spdx-exceptions-2.2.0"
+      sources."spdx-expression-parse-3.0.0"
+      sources."spdx-license-ids-3.0.5"
+      (sources."string-width-2.1.1" // {
+        dependencies = [
+          sources."ansi-regex-3.0.0"
+          sources."is-fullwidth-code-point-2.0.0"
+          sources."strip-ansi-4.0.0"
+        ];
+      })
+      sources."strip-ansi-3.0.1"
+      sources."strip-bom-3.0.0"
+      sources."strip-eof-1.0.0"
+      sources."temp-0.8.3"
+      sources."through-2.3.8"
+      sources."universalify-0.1.2"
+      sources."validate-npm-package-license-3.0.4"
+      sources."which-1.3.1"
+      sources."which-module-2.0.0"
+      (sources."wrap-ansi-2.1.0" // {
+        dependencies = [
+          sources."string-width-1.0.2"
+        ];
+      })
+      sources."y18n-3.2.1"
+      sources."yallist-2.1.2"
+      sources."yargs-8.0.2"
+      sources."yargs-parser-7.0.0"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      license = "Apache 2.0";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
+  primitive-quadify-off-curves = nodeEnv.buildNodePackage {
+    name = "primitive-quadify-off-curves";
+    packageName = "primitive-quadify-off-curves";
+    version = "0.6.3";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/primitive-quadify-off-curves/-/primitive-quadify-off-curves-0.6.3.tgz";
+      sha512 = "NlkjdjHbXycTBGo9SDozAvOdmFDDOXuy4/rgmHsg1AB11QUbujybclmYWx1uPEgAELnh23S16KL5sD5uw540Ww==";
+    };
+    dependencies = [
+      sources."complex.js-2.0.11"
+      sources."decimal.js-10.2.0"
+      sources."escape-latex-1.2.0"
+      sources."fraction.js-4.0.12"
+      sources."javascript-natural-sort-0.7.1"
+      sources."mathjs-5.10.3"
+      sources."seed-random-2.2.0"
+      sources."tiny-emitter-2.1.0"
+      sources."tslib-1.9.3"
+      sources."typed-function-1.1.0"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Quadify a Cubic with only off-curve points";
+      license = "APLv2";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
+  toml = nodeEnv.buildNodePackage {
+    name = "toml";
+    packageName = "toml";
+    version = "3.0.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/toml/-/toml-3.0.0.tgz";
+      sha512 = "y/mWCZinnvxjTKYhJ+pYxwD0mRLVvOtdS2Awbgxln6iEnt4rk0yBxeSBHkGJcPucRiG0e55mwWp+g/05rsrd6w==";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "TOML parser for Node.js (parses TOML spec v0.4.0)";
+      homepage = "https://github.com/BinaryMuse/toml-node#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
+  topsort = nodeEnv.buildNodePackage {
+    name = "topsort";
+    packageName = "topsort";
+    version = "0.0.2";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/topsort/-/topsort-0.0.2.tgz";
+      sha1 = "2e5e0ee8a1439417f101d5b9b2d035e620263321";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Topological sort in JavaScript";
+      homepage = https://github.com/samuelneff/topsort;
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
+  ttf2woff = nodeEnv.buildNodePackage {
+    name = "ttf2woff";
+    packageName = "ttf2woff";
+    version = "2.0.1";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/ttf2woff/-/ttf2woff-2.0.1.tgz";
+      sha1 = "871832240024b09db9570904c7c1928b8057c969";
+    };
+    dependencies = [
+      sources."argparse-1.0.10"
+      sources."microbuffer-1.0.0"
+      sources."pako-1.0.10"
+      sources."sprintf-js-1.0.3"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Convert TTF font to WOFF";
+      homepage = "https://github.com/fontello/ttf2woff#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
+  ttf2woff2 = nodeEnv.buildNodePackage {
+    name = "ttf2woff2";
+    packageName = "ttf2woff2";
+    version = "3.0.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/ttf2woff2/-/ttf2woff2-3.0.0.tgz";
+      sha512 = "5/Web6B0lF/STNAQ0d5vAlRRquuWsNj8wOmKQ9ql9Bsgbx8MsLnNzaBG9vBcSE4s4Ry1QOr/MyUrDUIVgVPEfw==";
+    };
+    dependencies = [
+      sources."abbrev-1.1.1"
+      sources."ajv-6.10.2"
+      sources."ansi-regex-2.1.1"
+      sources."aproba-1.2.0"
+      sources."are-we-there-yet-1.1.5"
+      sources."asn1-0.2.4"
+      sources."assert-plus-1.0.0"
+      sources."asynckit-0.4.0"
+      sources."aws-sign2-0.7.0"
+      sources."aws4-1.8.0"
+      sources."balanced-match-1.0.0"
+      sources."bcrypt-pbkdf-1.0.2"
+      sources."bindings-1.5.0"
+      sources."brace-expansion-1.1.11"
+      sources."bufferstreams-2.0.1"
+      sources."caseless-0.12.0"
+      sources."chownr-1.1.2"
+      sources."code-point-at-1.1.0"
+      sources."combined-stream-1.0.8"
+      sources."concat-map-0.0.1"
+      sources."console-control-strings-1.1.0"
+      sources."core-util-is-1.0.2"
+      sources."dashdash-1.14.1"
+      sources."delayed-stream-1.0.0"
+      sources."delegates-1.0.0"
+      sources."ecc-jsbn-0.1.2"
+      sources."extend-3.0.2"
+      sources."extsprintf-1.3.0"
+      sources."fast-deep-equal-2.0.1"
+      sources."fast-json-stable-stringify-2.0.0"
+      sources."file-uri-to-path-1.0.0"
+      sources."forever-agent-0.6.1"
+      sources."form-data-2.3.3"
+      sources."fs-minipass-1.2.6"
+      sources."fs.realpath-1.0.0"
+      sources."gauge-2.7.4"
+      sources."getpass-0.1.7"
+      sources."glob-7.1.4"
+      sources."graceful-fs-4.2.2"
+      sources."har-schema-2.0.0"
+      sources."har-validator-5.1.3"
+      sources."has-unicode-2.0.1"
+      sources."http-signature-1.2.0"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.4"
+      sources."is-fullwidth-code-point-1.0.0"
+      sources."is-typedarray-1.0.0"
+      sources."isarray-1.0.0"
+      sources."isexe-2.0.0"
+      sources."isstream-0.1.2"
+      sources."jsbn-0.1.1"
+      sources."json-schema-0.2.3"
+      sources."json-schema-traverse-0.4.1"
+      sources."json-stringify-safe-5.0.1"
+      sources."jsprim-1.4.1"
+      sources."mime-db-1.40.0"
+      sources."mime-types-2.1.24"
+      sources."minimatch-3.0.4"
+      sources."minimist-0.0.8"
+      sources."minipass-2.5.1"
+      sources."minizlib-1.2.2"
+      sources."mkdirp-0.5.1"
+      sources."nan-2.14.0"
+      sources."node-gyp-4.0.0"
+      sources."nopt-3.0.6"
+      sources."npmlog-4.1.2"
+      sources."number-is-nan-1.0.1"
+      sources."oauth-sign-0.9.0"
+      sources."object-assign-4.1.1"
+      sources."once-1.4.0"
+      sources."os-homedir-1.0.2"
+      sources."os-tmpdir-1.0.2"
+      sources."osenv-0.1.5"
+      sources."path-is-absolute-1.0.1"
+      sources."performance-now-2.1.0"
+      sources."process-nextick-args-2.0.1"
+      sources."psl-1.4.0"
+      sources."punycode-2.1.1"
+      sources."qs-6.5.2"
+      sources."readable-stream-2.3.6"
+      sources."request-2.88.0"
+      sources."rimraf-2.7.1"
+      sources."safe-buffer-5.1.2"
+      sources."safer-buffer-2.1.2"
+      sources."semver-5.3.0"
+      sources."set-blocking-2.0.0"
+      sources."signal-exit-3.0.2"
+      sources."sshpk-1.16.1"
+      sources."string-width-1.0.2"
+      sources."string_decoder-1.1.1"
+      sources."strip-ansi-3.0.1"
+      sources."tar-4.4.10"
+      (sources."tough-cookie-2.4.3" // {
+        dependencies = [
+          sources."punycode-1.4.1"
+        ];
+      })
+      sources."tunnel-agent-0.6.0"
+      sources."tweetnacl-0.14.5"
+      sources."uri-js-4.2.2"
+      sources."util-deprecate-1.0.2"
+      sources."uuid-3.3.3"
+      sources."verror-1.10.0"
+      sources."which-1.3.1"
+      sources."wide-align-1.1.3"
+      sources."wrappy-1.0.2"
+      sources."yallist-3.0.3"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Convert TTF files to WOFF2 ones.";
+      homepage = https://github.com/nfroidure/ttf2woff2;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
+  unorm = nodeEnv.buildNodePackage {
+    name = "unorm";
+    packageName = "unorm";
+    version = "1.6.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/unorm/-/unorm-1.6.0.tgz";
+      sha512 = "b2/KCUlYZUeA7JFUuRJZPUtr4gZvBh7tavtv4fvk4+KV9pfGiR6CQAQAWl49ZpR3ts2dk4FYkP7EIgDJoiOLDA==";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "JavaScript Unicode 8.0 Normalization - NFC, NFD, NFKC, NFKD. Read <http://unicode.org/reports/tr15/> UAX #15 Unicode Normalization Forms.";
+      homepage = "https://github.com/walling/unorm#readme";
+      license = "MIT or GPL-2.0";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
+  verda = nodeEnv.buildNodePackage {
+    name = "verda";
+    packageName = "verda";
+    version = "1.0.0-4";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/verda/-/verda-1.0.0-4.tgz";
+      sha512 = "DKr2WdWlPwJvmqCcjs6LPaBOacFQUdk6+u7tqwkxYKbHa0Touff7Y6x+YAWbnT1dace5Qlv/CRr6YBEaB08r3A==";
+    };
+    dependencies = [
+      sources."ansi-regex-4.1.0"
+      sources."ansi-styles-3.2.1"
+      sources."bluebird-3.5.5"
+      sources."camelcase-5.3.1"
+      sources."chalk-2.4.2"
+      sources."cli-cursor-2.1.0"
+      (sources."cliui-4.1.0" // {
+        dependencies = [
+          sources."ansi-regex-3.0.0"
+          sources."strip-ansi-4.0.0"
+        ];
+      })
+      sources."code-point-at-1.1.0"
+      sources."color-convert-1.9.3"
+      sources."color-name-1.1.3"
+      sources."cross-spawn-6.0.5"
+      sources."decamelize-1.2.0"
+      sources."end-of-stream-1.4.1"
+      sources."escape-string-regexp-1.0.5"
+      sources."execa-1.0.0"
+      sources."fast-deep-equal-2.0.1"
+      sources."find-up-3.0.0"
+      sources."fs-extra-6.0.1"
+      sources."get-caller-file-1.0.3"
+      sources."get-stream-4.1.0"
+      sources."graceful-fs-4.2.2"
+      sources."has-flag-3.0.0"
+      sources."invert-kv-2.0.0"
+      sources."is-fullwidth-code-point-1.0.0"
+      sources."is-stream-1.1.0"
+      sources."isexe-2.0.0"
+      sources."jsonfile-4.0.0"
+      sources."lcid-2.0.0"
+      sources."locate-path-3.0.0"
+      sources."map-age-cleaner-0.1.3"
+      (sources."mem-4.3.0" // {
+        dependencies = [
+          sources."mimic-fn-2.1.0"
+        ];
+      })
+      sources."mimic-fn-1.2.0"
+      sources."nice-try-1.0.5"
+      sources."npm-run-path-2.0.2"
+      sources."number-is-nan-1.0.1"
+      sources."once-1.4.0"
+      sources."onetime-2.0.1"
+      sources."os-locale-3.1.0"
+      sources."p-defer-1.0.0"
+      sources."p-finally-1.0.0"
+      sources."p-is-promise-2.1.0"
+      sources."p-limit-2.2.1"
+      sources."p-locate-3.0.0"
+      sources."p-try-2.2.0"
+      sources."path-exists-3.0.0"
+      sources."path-key-2.0.1"
+      sources."path-parse-1.0.6"
+      sources."proper-lockfile-3.2.0"
+      sources."pump-3.0.0"
+      sources."require-directory-2.1.1"
+      sources."require-main-filename-1.0.1"
+      sources."resolve-1.12.0"
+      sources."restore-cursor-2.0.0"
+      sources."retry-0.12.0"
+      sources."semaphore-async-await-1.5.1"
+      sources."semver-5.7.1"
+      sources."set-blocking-2.0.0"
+      sources."shebang-command-1.2.0"
+      sources."shebang-regex-1.0.0"
+      sources."signal-exit-3.0.2"
+      sources."split-1.0.1"
+      sources."stack-trace-0.0.9"
+      (sources."string-width-2.1.1" // {
+        dependencies = [
+          sources."ansi-regex-3.0.0"
+          sources."is-fullwidth-code-point-2.0.0"
+          sources."strip-ansi-4.0.0"
+        ];
+      })
+      sources."strip-ansi-5.2.0"
+      sources."strip-eof-1.0.0"
+      sources."supports-color-5.5.0"
+      sources."through-2.3.8"
+      sources."ts-process-promises-1.0.2"
+      sources."tslib-1.10.0"
+      sources."universalify-0.1.2"
+      sources."which-1.3.1"
+      sources."which-module-2.0.0"
+      (sources."wrap-ansi-2.1.0" // {
+        dependencies = [
+          sources."ansi-regex-2.1.1"
+          sources."string-width-1.0.2"
+          sources."strip-ansi-3.0.1"
+        ];
+      })
+      sources."wrappy-1.0.2"
+      sources."y18n-4.0.0"
+      sources."yargs-12.0.5"
+      sources."yargs-parser-11.1.1"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Build Directly.";
+      license = "APLv2";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
+  yargs = nodeEnv.buildNodePackage {
+    name = "yargs";
+    packageName = "yargs";
+    version = "14.0.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/yargs/-/yargs-14.0.0.tgz";
+      sha512 = "ssa5JuRjMeZEUjg7bEL99AwpitxU/zWGAGpdj0di41pOEmJti8NR6kyUIJBkR78DTYNPZOU08luUo0GTHuB+ow==";
+    };
+    dependencies = [
+      sources."ansi-regex-4.1.0"
+      sources."ansi-styles-3.2.1"
+      sources."camelcase-5.3.1"
+      sources."cliui-5.0.0"
+      sources."color-convert-1.9.3"
+      sources."color-name-1.1.3"
+      sources."decamelize-1.2.0"
+      sources."emoji-regex-7.0.3"
+      sources."find-up-3.0.0"
+      sources."get-caller-file-2.0.5"
+      sources."is-fullwidth-code-point-2.0.0"
+      sources."locate-path-3.0.0"
+      sources."p-limit-2.2.1"
+      sources."p-locate-3.0.0"
+      sources."p-try-2.2.0"
+      sources."path-exists-3.0.0"
+      sources."require-directory-2.1.1"
+      sources."require-main-filename-2.0.0"
+      sources."set-blocking-2.0.0"
+      sources."string-width-3.1.0"
+      sources."strip-ansi-5.2.0"
+      sources."which-module-2.0.0"
+      sources."wrap-ansi-5.1.0"
+      sources."y18n-4.0.0"
+      sources."yargs-parser-13.1.1"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "yargs the modern, pirate-themed, successor to optimist.";
+      homepage = https://yargs.js.org/;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
+  colors = nodeEnv.buildNodePackage {
+    name = "colors";
+    packageName = "colors";
+    version = "1.3.3";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/colors/-/colors-1.3.3.tgz";
+      sha512 = "mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "get colors in your node.js console";
+      homepage = https://github.com/Marak/colors.js;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
+  patel = nodeEnv.buildNodePackage {
+    name = "patel";
+    packageName = "patel";
+    version = "0.33.1";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/patel/-/patel-0.33.1.tgz";
+      sha512 = "zOv5DhGH2r4cRKnZfOlHmWqxBp9nMGnC3F/NZbUqFCYMA65RXiv8q1F96/6dm2ANR6xvCe+xLODQSb49IFoYQg==";
+    };
+    dependencies = [
+      sources."amdefine-1.0.1"
+      sources."ansi-regex-2.1.1"
+      sources."camelcase-3.0.0"
+      sources."cliui-3.2.0"
+      sources."code-point-at-1.1.0"
+      sources."decamelize-1.2.0"
+      sources."deep-is-0.1.3"
+      sources."error-ex-1.3.2"
+      sources."escodegen-1.12.0"
+      (sources."escope-1.0.3" // {
+        dependencies = [
+          sources."estraverse-2.0.0"
+        ];
+      })
+      (sources."esmangle-1.0.1" // {
+        dependencies = [
+          sources."escodegen-1.3.3"
+          sources."esprima-1.1.1"
+          sources."estraverse-1.5.1"
+          sources."esutils-1.0.0"
+          sources."fast-levenshtein-1.0.7"
+          sources."levn-0.2.5"
+          sources."optionator-0.3.0"
+          sources."source-map-0.1.43"
+          sources."wordwrap-0.0.3"
+        ];
+      })
+      sources."esprima-3.1.3"
+      (sources."esshorten-1.1.1" // {
+        dependencies = [
+          sources."estraverse-4.1.1"
+        ];
+      })
+      sources."estraverse-4.3.0"
+      sources."esutils-2.0.3"
+      sources."fast-levenshtein-2.0.6"
+      sources."find-up-1.1.2"
+      sources."get-caller-file-1.0.3"
+      sources."graceful-fs-4.2.2"
+      sources."hosted-git-info-2.8.4"
+      sources."invert-kv-1.0.0"
+      sources."is-arrayish-0.2.1"
+      sources."is-fullwidth-code-point-1.0.0"
+      sources."is-utf8-0.2.1"
+      sources."lcid-1.0.0"
+      sources."levn-0.3.0"
+      sources."load-json-file-1.1.0"
+      sources."normalize-package-data-2.5.0"
+      sources."number-is-nan-1.0.1"
+      sources."optionator-0.8.2"
+      sources."os-locale-1.4.0"
+      sources."parse-json-2.2.0"
+      sources."path-exists-2.1.0"
+      sources."path-parse-1.0.6"
+      sources."path-type-1.1.0"
+      sources."patrisika-0.21.0"
+      sources."patrisika-scopes-0.11.1"
+      sources."pify-2.3.0"
+      sources."pinkie-2.0.4"
+      sources."pinkie-promise-2.0.1"
+      sources."prelude-ls-1.1.2"
+      sources."read-pkg-1.1.0"
+      sources."read-pkg-up-1.0.1"
+      sources."require-directory-2.1.1"
+      sources."require-main-filename-1.0.1"
+      sources."resolve-1.12.0"
+      sources."resumer-0.0.0"
+      sources."semver-5.7.1"
+      sources."set-blocking-2.0.0"
+      sources."source-map-0.6.1"
+      sources."spdx-correct-3.1.0"
+      sources."spdx-exceptions-2.2.0"
+      sources."spdx-expression-parse-3.0.0"
+      sources."spdx-license-ids-3.0.5"
+      sources."string-width-1.0.2"
+      sources."strip-ansi-3.0.1"
+      sources."strip-bom-2.0.0"
+      sources."through-2.3.8"
+      sources."type-check-0.3.2"
+      sources."validate-npm-package-license-3.0.4"
+      sources."which-module-1.0.0"
+      sources."wordwrap-1.0.0"
+      sources."wrap-ansi-2.1.0"
+      sources."y18n-3.2.1"
+      sources."yargs-6.6.0"
+      sources."yargs-parser-4.2.1"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "A Patrisika-based Example Language";
+      homepage = "https://github.com/be5invis/patel#readme";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
+  patrisika-scopes = nodeEnv.buildNodePackage {
+    name = "patrisika-scopes";
+    packageName = "patrisika-scopes";
+    version = "0.11.1";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/patrisika-scopes/-/patrisika-scopes-0.11.1.tgz";
+      sha512 = "UCIBMx1nzNaR5CcDoQ9/jtY5RlJqf2CrJYHiMZJhi15NPvsPKRfJT/DPZMkhCunexOKmH03EDZYZU1hGn7mL0w==";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "patrisika-scopes ================ A library for Patrisika's scopes.";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
+  eslint = nodeEnv.buildNodePackage {
+    name = "eslint";
+    packageName = "eslint";
+    version = "6.4.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/eslint/-/eslint-6.4.0.tgz";
+      sha512 = "WTVEzK3lSFoXUovDHEbkJqCVPEPwbhCq4trDktNI6ygs7aO41d4cDT0JFAT5MivzZeVLWlg7vHL+bgrQv/t3vA==";
+    };
+    dependencies = [
+      sources."@babel/code-frame-7.5.5"
+      sources."@babel/highlight-7.5.0"
+      sources."acorn-7.0.0"
+      sources."acorn-jsx-5.0.2"
+      sources."ajv-6.10.2"
+      sources."ansi-escapes-3.2.0"
+      sources."ansi-regex-3.0.0"
+      sources."ansi-styles-3.2.1"
+      sources."argparse-1.0.10"
+      sources."astral-regex-1.0.0"
+      sources."balanced-match-1.0.0"
+      sources."brace-expansion-1.1.11"
+      sources."callsites-3.1.0"
+      sources."chalk-2.4.2"
+      sources."chardet-0.7.0"
+      sources."cli-cursor-2.1.0"
+      sources."cli-width-2.2.0"
+      sources."color-convert-1.9.3"
+      sources."color-name-1.1.3"
+      sources."concat-map-0.0.1"
+      (sources."cross-spawn-6.0.5" // {
+        dependencies = [
+          sources."semver-5.7.1"
+        ];
+      })
+      sources."debug-4.1.1"
+      sources."deep-is-0.1.3"
+      sources."doctrine-3.0.0"
+      sources."emoji-regex-7.0.3"
+      sources."escape-string-regexp-1.0.5"
+      sources."eslint-scope-5.0.0"
+      sources."eslint-utils-1.4.2"
+      sources."eslint-visitor-keys-1.1.0"
+      sources."espree-6.1.1"
+      sources."esprima-4.0.1"
+      sources."esquery-1.0.1"
+      sources."esrecurse-4.2.1"
+      sources."estraverse-4.3.0"
+      sources."esutils-2.0.3"
+      sources."external-editor-3.1.0"
+      sources."fast-deep-equal-2.0.1"
+      sources."fast-json-stable-stringify-2.0.0"
+      sources."fast-levenshtein-2.0.6"
+      sources."figures-2.0.0"
+      sources."file-entry-cache-5.0.1"
+      sources."flat-cache-2.0.1"
+      sources."flatted-2.0.1"
+      sources."fs.realpath-1.0.0"
+      sources."functional-red-black-tree-1.0.1"
+      sources."glob-7.1.4"
+      sources."glob-parent-5.0.0"
+      sources."globals-11.12.0"
+      sources."has-flag-3.0.0"
+      sources."iconv-lite-0.4.24"
+      sources."ignore-4.0.6"
+      sources."import-fresh-3.1.0"
+      sources."imurmurhash-0.1.4"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.4"
+      sources."inquirer-6.5.2"
+      sources."is-extglob-2.1.1"
+      sources."is-fullwidth-code-point-2.0.0"
+      sources."is-glob-4.0.1"
+      sources."is-promise-2.1.0"
+      sources."isexe-2.0.0"
+      sources."js-tokens-4.0.0"
+      sources."js-yaml-3.13.1"
+      sources."json-schema-traverse-0.4.1"
+      sources."json-stable-stringify-without-jsonify-1.0.1"
+      sources."levn-0.3.0"
+      sources."lodash-4.17.15"
+      sources."mimic-fn-1.2.0"
+      sources."minimatch-3.0.4"
+      sources."minimist-0.0.8"
+      sources."mkdirp-0.5.1"
+      sources."ms-2.1.2"
+      sources."mute-stream-0.0.7"
+      sources."natural-compare-1.4.0"
+      sources."nice-try-1.0.5"
+      sources."once-1.4.0"
+      sources."onetime-2.0.1"
+      sources."optionator-0.8.2"
+      sources."os-tmpdir-1.0.2"
+      sources."parent-module-1.0.1"
+      sources."path-is-absolute-1.0.1"
+      sources."path-key-2.0.1"
+      sources."prelude-ls-1.1.2"
+      sources."progress-2.0.3"
+      sources."punycode-2.1.1"
+      sources."regexpp-2.0.1"
+      sources."resolve-from-4.0.0"
+      sources."restore-cursor-2.0.0"
+      sources."rimraf-2.6.3"
+      sources."run-async-2.3.0"
+      sources."rxjs-6.5.3"
+      sources."safer-buffer-2.1.2"
+      sources."semver-6.3.0"
+      sources."shebang-command-1.2.0"
+      sources."shebang-regex-1.0.0"
+      sources."signal-exit-3.0.2"
+      sources."slice-ansi-2.1.0"
+      sources."sprintf-js-1.0.3"
+      (sources."string-width-2.1.1" // {
+        dependencies = [
+          sources."strip-ansi-4.0.0"
+        ];
+      })
+      (sources."strip-ansi-5.2.0" // {
+        dependencies = [
+          sources."ansi-regex-4.1.0"
+        ];
+      })
+      sources."strip-json-comments-3.0.1"
+      sources."supports-color-5.5.0"
+      (sources."table-5.4.6" // {
+        dependencies = [
+          sources."string-width-3.1.0"
+        ];
+      })
+      sources."text-table-0.2.0"
+      sources."through-2.3.8"
+      sources."tmp-0.0.33"
+      sources."tslib-1.10.0"
+      sources."type-check-0.3.2"
+      sources."uri-js-4.2.2"
+      sources."v8-compile-cache-2.1.0"
+      sources."which-1.3.1"
+      sources."wordwrap-1.0.0"
+      sources."wrappy-1.0.2"
+      sources."write-1.0.3"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "An AST-based pattern checker for JavaScript.";
+      homepage = https://eslint.org/;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
+  stylus = nodeEnv.buildNodePackage {
+    name = "stylus";
+    packageName = "stylus";
+    version = "0.54.7";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/stylus/-/stylus-0.54.7.tgz";
+      sha512 = "Yw3WMTzVwevT6ZTrLCYNHAFmanMxdylelL3hkWNgPMeTCpMwpV3nXjpOHuBXtFv7aiO2xRuQS6OoAdgkNcSNug==";
+    };
+    dependencies = [
+      sources."atob-2.1.2"
+      sources."balanced-match-1.0.0"
+      sources."brace-expansion-1.1.11"
+      sources."concat-map-0.0.1"
+      (sources."css-2.2.4" // {
+        dependencies = [
+          sources."source-map-0.6.1"
+        ];
+      })
+      sources."css-parse-2.0.0"
+      sources."debug-3.1.0"
+      sources."decode-uri-component-0.2.0"
+      sources."fs.realpath-1.0.0"
+      sources."glob-7.1.4"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.4"
+      sources."minimatch-3.0.4"
+      sources."minimist-0.0.8"
+      sources."mkdirp-0.5.1"
+      sources."ms-2.0.0"
+      sources."once-1.4.0"
+      sources."path-is-absolute-1.0.1"
+      sources."resolve-url-0.2.1"
+      sources."safer-buffer-2.1.2"
+      sources."sax-1.2.4"
+      sources."semver-6.3.0"
+      sources."source-map-0.7.3"
+      sources."source-map-resolve-0.5.2"
+      sources."source-map-url-0.4.0"
+      sources."urix-0.1.0"
+      sources."wrappy-1.0.2"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Robust, expressive, and feature-rich CSS superset";
+      homepage = https://github.com/stylus/stylus;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/data/fonts/iosevka/node-packages.json b/pkgs/data/fonts/iosevka/node-packages.json
new file mode 100644
index 00000000000..468f788f9f3
--- /dev/null
+++ b/pkgs/data/fonts/iosevka/node-packages.json
@@ -0,0 +1,20 @@
+[
+    "caryll-shapeops",
+    "libspiro-js",
+    "megaminx",
+    "object-assign",
+    "otfcc-ttcize",
+    "primitive-quadify-off-curves",
+    "toml",
+    "topsort",
+    "ttf2woff",
+    "ttf2woff2",
+    "unorm",
+    "verda",
+    "yargs",
+    "colors",
+    "patel",
+    "patrisika-scopes",
+    "eslint",
+    "stylus"
+]
diff --git a/pkgs/data/fonts/iosevka/node-packages.nix b/pkgs/data/fonts/iosevka/node-packages.nix
new file mode 100644
index 00000000000..41e23864c44
--- /dev/null
+++ b/pkgs/data/fonts/iosevka/node-packages.nix
@@ -0,0 +1,17 @@
+# This file has been generated by node2nix 1.7.0. Do not edit!
+
+{pkgs ? import <nixpkgs> {
+    inherit system;
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}:
+
+let
+  nodeEnv = import ../../../development/node-packages/node-env.nix {
+    inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
+    inherit nodejs;
+    libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
+  };
+in
+import ./node-packages-generated.nix {
+  inherit (pkgs) fetchurl fetchgit;
+  inherit nodeEnv;
+}
\ No newline at end of file
diff --git a/pkgs/data/fonts/iosevka/package-lock.json b/pkgs/data/fonts/iosevka/package-lock.json
deleted file mode 100644
index 7556566b01a..00000000000
--- a/pkgs/data/fonts/iosevka/package-lock.json
+++ /dev/null
@@ -1,3037 +0,0 @@
-{
-  "name": "iosevka",
-  "version": "2.3.0",
-  "lockfileVersion": 1,
-  "requires": true,
-  "dependencies": {
-    "@babel/code-frame": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz",
-      "integrity": "sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==",
-      "dev": true,
-      "requires": {
-        "@babel/highlight": "^7.0.0"
-      }
-    },
-    "@babel/highlight": {
-      "version": "7.5.0",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.5.0.tgz",
-      "integrity": "sha512-7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ==",
-      "dev": true,
-      "requires": {
-        "chalk": "^2.0.0",
-        "esutils": "^2.0.2",
-        "js-tokens": "^4.0.0"
-      }
-    },
-    "JSONStream": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
-      "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
-      "requires": {
-        "jsonparse": "^1.2.0",
-        "through": ">=2.2.7 <3"
-      }
-    },
-    "abbrev": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
-    },
-    "acorn": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.3.0.tgz",
-      "integrity": "sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA==",
-      "dev": true
-    },
-    "acorn-jsx": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.0.2.tgz",
-      "integrity": "sha512-tiNTrP1MP0QrChmD2DdupCr6HWSFeKVw5d/dHTu4Y7rkAkRhU/Dt7dphAfIUyxtHpl/eBVip5uTNSpQJHylpAw==",
-      "dev": true
-    },
-    "ajv": {
-      "version": "6.10.2",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
-      "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
-      "requires": {
-        "fast-deep-equal": "^2.0.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      }
-    },
-    "amdefine": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
-      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
-      "dev": true
-    },
-    "ansi-escapes": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
-      "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
-      "dev": true
-    },
-    "ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
-    },
-    "ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "requires": {
-        "color-convert": "^1.9.0"
-      }
-    },
-    "aproba": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
-    },
-    "are-we-there-yet": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
-      "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
-      "requires": {
-        "delegates": "^1.0.0",
-        "readable-stream": "^2.0.6"
-      }
-    },
-    "argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "requires": {
-        "sprintf-js": "~1.0.2"
-      }
-    },
-    "asn1": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
-      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
-      "requires": {
-        "safer-buffer": "~2.1.0"
-      }
-    },
-    "assert-plus": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-    },
-    "astral-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
-      "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
-      "dev": true
-    },
-    "asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
-    },
-    "atob": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
-      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
-      "dev": true
-    },
-    "aws-sign2": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
-    },
-    "aws4": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
-      "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="
-    },
-    "balanced-match": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
-    },
-    "bcrypt-pbkdf": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
-      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
-      "requires": {
-        "tweetnacl": "^0.14.3"
-      }
-    },
-    "bezier-js": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/bezier-js/-/bezier-js-2.4.3.tgz",
-      "integrity": "sha512-qAz1iAGoSE+kk5guAMyvoUgfHq+e5JwK5jRHh2/tuk4XDRUuECrrHLouN27jAzjhlJD2vAsBHofCi5sOn1jcbQ=="
-    },
-    "bindings": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
-      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
-      "requires": {
-        "file-uri-to-path": "1.0.0"
-      }
-    },
-    "block-stream": {
-      "version": "0.0.9",
-      "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
-      "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
-      "requires": {
-        "inherits": "~2.0.0"
-      }
-    },
-    "bluebird": {
-      "version": "3.5.5",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz",
-      "integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w=="
-    },
-    "brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "requires": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "bufferstreams": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/bufferstreams/-/bufferstreams-1.1.3.tgz",
-      "integrity": "sha512-HaJnVuslRF4g2kSDeyl++AaVizoitCpL9PglzCYwy0uHHyvWerfvEb8jWmYbF1z4kiVFolGomnxSGl+GUQp2jg==",
-      "requires": {
-        "readable-stream": "^2.0.2"
-      }
-    },
-    "callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-      "dev": true
-    },
-    "camelcase": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-      "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
-      "dev": true
-    },
-    "caryll-shapeops": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/caryll-shapeops/-/caryll-shapeops-0.3.1.tgz",
-      "integrity": "sha512-3TdH6DZGL08S6qEvCZLNaOHyFvmzQts8m+TyYEvc6/PiI+XgX5mIag1/CKczIM8e2QtDr8JKW8foo4VNOM8/Og==",
-      "requires": {
-        "bezier-js": "^2.2.1",
-        "clipper-lib": "^1.0.0"
-      }
-    },
-    "caseless": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
-    },
-    "chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "requires": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      }
-    },
-    "chardet": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
-      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
-      "dev": true
-    },
-    "child-process-promise": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/child-process-promise/-/child-process-promise-2.2.1.tgz",
-      "integrity": "sha1-RzChHvYQ+tRQuPIjx50x172tgHQ=",
-      "requires": {
-        "cross-spawn": "^4.0.2",
-        "node-version": "^1.0.0",
-        "promise-polyfill": "^6.0.1"
-      },
-      "dependencies": {
-        "cross-spawn": {
-          "version": "4.0.2",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz",
-          "integrity": "sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE=",
-          "requires": {
-            "lru-cache": "^4.0.1",
-            "which": "^1.2.9"
-          }
-        }
-      }
-    },
-    "cli-cursor": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
-      "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
-      "requires": {
-        "restore-cursor": "^2.0.0"
-      }
-    },
-    "cli-width": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
-      "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
-      "dev": true
-    },
-    "clipper-lib": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/clipper-lib/-/clipper-lib-1.0.0.tgz",
-      "integrity": "sha1-6QLOsm4o7lz6YBSr33kKUe//Tss="
-    },
-    "cliui": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-      "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
-      "requires": {
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1",
-        "wrap-ansi": "^2.0.0"
-      },
-      "dependencies": {
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-          "requires": {
-            "number-is-nan": "^1.0.0"
-          }
-        },
-        "string-width": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-          "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
-          }
-        }
-      }
-    },
-    "clone": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
-      "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18="
-    },
-    "code-point-at": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
-    },
-    "color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "requires": {
-        "color-name": "1.1.3"
-      }
-    },
-    "color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
-    },
-    "colors": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/colors/-/colors-1.3.3.tgz",
-      "integrity": "sha512-mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==",
-      "dev": true
-    },
-    "combined-stream": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "requires": {
-        "delayed-stream": "~1.0.0"
-      }
-    },
-    "complex.js": {
-      "version": "2.0.11",
-      "resolved": "https://registry.npmjs.org/complex.js/-/complex.js-2.0.11.tgz",
-      "integrity": "sha512-6IArJLApNtdg1P1dFtn3dnyzoZBEF0MwMnrfF1exSBRpZYoy4yieMkpZhQDC0uwctw48vii0CFVyHfpgZ/DfGw=="
-    },
-    "concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
-    },
-    "console-control-strings": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
-    },
-    "core-util-is": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
-    },
-    "cross-spawn": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-      "requires": {
-        "nice-try": "^1.0.4",
-        "path-key": "^2.0.1",
-        "semver": "^5.5.0",
-        "shebang-command": "^1.2.0",
-        "which": "^1.2.9"
-      }
-    },
-    "css": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz",
-      "integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.3",
-        "source-map": "^0.6.1",
-        "source-map-resolve": "^0.5.2",
-        "urix": "^0.1.0"
-      }
-    },
-    "css-parse": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/css-parse/-/css-parse-2.0.0.tgz",
-      "integrity": "sha1-pGjuZnwW2BzPBcWMONKpfHgNv9Q=",
-      "dev": true,
-      "requires": {
-        "css": "^2.0.0"
-      }
-    },
-    "cubic2quad": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/cubic2quad/-/cubic2quad-1.1.1.tgz",
-      "integrity": "sha1-abGcYaP1tB7PLx1fro+wNBWqixU="
-    },
-    "dashdash": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-      "requires": {
-        "assert-plus": "^1.0.0"
-      }
-    },
-    "debug": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-      "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-      "dev": true,
-      "requires": {
-        "ms": "^2.1.1"
-      }
-    },
-    "decamelize": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
-    },
-    "decimal.js": {
-      "version": "10.2.0",
-      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.2.0.tgz",
-      "integrity": "sha512-vDPw+rDgn3bZe1+F/pyEwb1oMG2XTlRVgAa6B4KccTEpYgF8w6eQllVbQcfIJnZyvzFtFpxnpGtx8dd7DJp/Rw=="
-    },
-    "decode-uri-component": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
-      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
-      "dev": true
-    },
-    "deep-is": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
-      "dev": true
-    },
-    "delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
-    },
-    "delegates": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
-    },
-    "doctrine": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-      "dev": true,
-      "requires": {
-        "esutils": "^2.0.2"
-      }
-    },
-    "ecc-jsbn": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
-      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
-      "requires": {
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.1.0"
-      }
-    },
-    "emoji-regex": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
-      "dev": true
-    },
-    "end-of-stream": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
-      "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
-      "requires": {
-        "once": "^1.4.0"
-      }
-    },
-    "error-ex": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-      "requires": {
-        "is-arrayish": "^0.2.1"
-      }
-    },
-    "escape-latex": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/escape-latex/-/escape-latex-1.2.0.tgz",
-      "integrity": "sha512-nV5aVWW1K0wEiUIEdZ4erkGGH8mDxGyxSeqPzRNtWP7ataw+/olFObw7hujFWlVjNsaDFw5VZ5NzVSIqRgfTiw=="
-    },
-    "escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
-    },
-    "escodegen": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.12.0.tgz",
-      "integrity": "sha512-TuA+EhsanGcme5T3R0L80u4t8CpbXQjegRmf7+FPTJrtCTErXFeelblRgHQa1FofEzqYYJmJ/OqjTwREp9qgmg==",
-      "dev": true,
-      "requires": {
-        "esprima": "^3.1.3",
-        "estraverse": "^4.2.0",
-        "esutils": "^2.0.2",
-        "optionator": "^0.8.1",
-        "source-map": "~0.6.1"
-      },
-      "dependencies": {
-        "esprima": {
-          "version": "3.1.3",
-          "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
-          "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=",
-          "dev": true
-        }
-      }
-    },
-    "escope": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/escope/-/escope-1.0.3.tgz",
-      "integrity": "sha1-dZ3OhJbEJI/sLQyq9BCLzz8af10=",
-      "dev": true,
-      "requires": {
-        "estraverse": "^2.0.0"
-      },
-      "dependencies": {
-        "estraverse": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-2.0.0.tgz",
-          "integrity": "sha1-WuRpYyQ2ACBmdMyySgnhZnT83KE=",
-          "dev": true
-        }
-      }
-    },
-    "eslint": {
-      "version": "5.16.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.16.0.tgz",
-      "integrity": "sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "ajv": "^6.9.1",
-        "chalk": "^2.1.0",
-        "cross-spawn": "^6.0.5",
-        "debug": "^4.0.1",
-        "doctrine": "^3.0.0",
-        "eslint-scope": "^4.0.3",
-        "eslint-utils": "^1.3.1",
-        "eslint-visitor-keys": "^1.0.0",
-        "espree": "^5.0.1",
-        "esquery": "^1.0.1",
-        "esutils": "^2.0.2",
-        "file-entry-cache": "^5.0.1",
-        "functional-red-black-tree": "^1.0.1",
-        "glob": "^7.1.2",
-        "globals": "^11.7.0",
-        "ignore": "^4.0.6",
-        "import-fresh": "^3.0.0",
-        "imurmurhash": "^0.1.4",
-        "inquirer": "^6.2.2",
-        "js-yaml": "^3.13.0",
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.3.0",
-        "lodash": "^4.17.11",
-        "minimatch": "^3.0.4",
-        "mkdirp": "^0.5.1",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.8.2",
-        "path-is-inside": "^1.0.2",
-        "progress": "^2.0.0",
-        "regexpp": "^2.0.1",
-        "semver": "^5.5.1",
-        "strip-ansi": "^4.0.0",
-        "strip-json-comments": "^2.0.1",
-        "table": "^5.2.3",
-        "text-table": "^0.2.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-          "dev": true
-        },
-        "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^3.0.0"
-          }
-        }
-      }
-    },
-    "eslint-scope": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
-      "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
-      "dev": true,
-      "requires": {
-        "esrecurse": "^4.1.0",
-        "estraverse": "^4.1.1"
-      }
-    },
-    "eslint-utils": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.2.tgz",
-      "integrity": "sha512-eAZS2sEUMlIeCjBeubdj45dmBHQwPHWyBcT1VSYB7o9x9WRRqKxyUoiXlRjyAwzN7YEzHJlYg0NmzDRWx6GP4Q==",
-      "dev": true,
-      "requires": {
-        "eslint-visitor-keys": "^1.0.0"
-      }
-    },
-    "eslint-visitor-keys": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz",
-      "integrity": "sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==",
-      "dev": true
-    },
-    "esmangle": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/esmangle/-/esmangle-1.0.1.tgz",
-      "integrity": "sha1-2bs3uPjq+/Tm1O1reqKVarvTxMI=",
-      "dev": true,
-      "requires": {
-        "escodegen": "~1.3.2",
-        "escope": "~1.0.1",
-        "esprima": "~1.1.1",
-        "esshorten": "~1.1.0",
-        "estraverse": "~1.5.0",
-        "esutils": "~ 1.0.0",
-        "optionator": "~0.3.0",
-        "source-map": "~0.1.33"
-      },
-      "dependencies": {
-        "escodegen": {
-          "version": "1.3.3",
-          "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.3.3.tgz",
-          "integrity": "sha1-8CQBb1qI4Eb9EgBQVek5gC5sXyM=",
-          "dev": true,
-          "requires": {
-            "esprima": "~1.1.1",
-            "estraverse": "~1.5.0",
-            "esutils": "~1.0.0",
-            "source-map": "~0.1.33"
-          }
-        },
-        "esprima": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.1.1.tgz",
-          "integrity": "sha1-W28VR/TRAuZw4UDFCb5ncdautUk=",
-          "dev": true
-        },
-        "estraverse": {
-          "version": "1.5.1",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz",
-          "integrity": "sha1-hno+jlip+EYYr7bC3bzZFrfLr3E=",
-          "dev": true
-        },
-        "esutils": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/esutils/-/esutils-1.0.0.tgz",
-          "integrity": "sha1-gVHTWOIMisx/t0XnRywAJf5JZXA=",
-          "dev": true
-        },
-        "fast-levenshtein": {
-          "version": "1.0.7",
-          "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.0.7.tgz",
-          "integrity": "sha1-AXjc3uAjuSkFGTrwlZ6KdjnP3Lk=",
-          "dev": true
-        },
-        "levn": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/levn/-/levn-0.2.5.tgz",
-          "integrity": "sha1-uo0znQykphDjo/FFucr0iAcVUFQ=",
-          "dev": true,
-          "requires": {
-            "prelude-ls": "~1.1.0",
-            "type-check": "~0.3.1"
-          }
-        },
-        "optionator": {
-          "version": "0.3.0",
-          "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.3.0.tgz",
-          "integrity": "sha1-lxWotfXnWGz/BsgkngOc1zZNP1Q=",
-          "dev": true,
-          "requires": {
-            "deep-is": "~0.1.2",
-            "fast-levenshtein": "~1.0.0",
-            "levn": "~0.2.4",
-            "prelude-ls": "~1.1.0",
-            "type-check": "~0.3.1",
-            "wordwrap": "~0.0.2"
-          }
-        },
-        "source-map": {
-          "version": "0.1.43",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
-          "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
-          "dev": true,
-          "requires": {
-            "amdefine": ">=0.0.4"
-          }
-        },
-        "wordwrap": {
-          "version": "0.0.3",
-          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
-          "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=",
-          "dev": true
-        }
-      }
-    },
-    "espree": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-5.0.1.tgz",
-      "integrity": "sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A==",
-      "dev": true,
-      "requires": {
-        "acorn": "^6.0.7",
-        "acorn-jsx": "^5.0.0",
-        "eslint-visitor-keys": "^1.0.0"
-      }
-    },
-    "esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "dev": true
-    },
-    "esquery": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz",
-      "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==",
-      "dev": true,
-      "requires": {
-        "estraverse": "^4.0.0"
-      }
-    },
-    "esrecurse": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
-      "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
-      "dev": true,
-      "requires": {
-        "estraverse": "^4.1.0"
-      }
-    },
-    "esshorten": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/esshorten/-/esshorten-1.1.1.tgz",
-      "integrity": "sha1-F0+Wt8wmfkaHLYFOfbfCkL3/Yak=",
-      "dev": true,
-      "requires": {
-        "escope": "~1.0.1",
-        "estraverse": "~4.1.1",
-        "esutils": "~2.0.2"
-      },
-      "dependencies": {
-        "estraverse": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.1.1.tgz",
-          "integrity": "sha1-9srKcokzqFDvkGYdDheYK6RxEaI=",
-          "dev": true
-        }
-      }
-    },
-    "estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "dev": true
-    },
-    "esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "dev": true
-    },
-    "execa": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
-      "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
-      "requires": {
-        "cross-spawn": "^5.0.1",
-        "get-stream": "^3.0.0",
-        "is-stream": "^1.1.0",
-        "npm-run-path": "^2.0.0",
-        "p-finally": "^1.0.0",
-        "signal-exit": "^3.0.0",
-        "strip-eof": "^1.0.0"
-      },
-      "dependencies": {
-        "cross-spawn": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
-          "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
-          "requires": {
-            "lru-cache": "^4.0.1",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
-          }
-        }
-      }
-    },
-    "extend": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
-    },
-    "external-editor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
-      "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
-      "dev": true,
-      "requires": {
-        "chardet": "^0.7.0",
-        "iconv-lite": "^0.4.24",
-        "tmp": "^0.0.33"
-      }
-    },
-    "extsprintf": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
-    },
-    "fast-deep-equal": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
-    },
-    "fast-json-stable-stringify": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
-      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
-    },
-    "fast-levenshtein": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
-      "dev": true
-    },
-    "figures": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
-      "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
-      "dev": true,
-      "requires": {
-        "escape-string-regexp": "^1.0.5"
-      }
-    },
-    "file-entry-cache": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
-      "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==",
-      "dev": true,
-      "requires": {
-        "flat-cache": "^2.0.1"
-      }
-    },
-    "file-uri-to-path": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
-      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw=="
-    },
-    "find-up": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-      "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-      "requires": {
-        "locate-path": "^2.0.0"
-      }
-    },
-    "first-chunk-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-2.0.0.tgz",
-      "integrity": "sha1-G97NuOCDwGZLkZRVgVd6Q6nzHXA=",
-      "requires": {
-        "readable-stream": "^2.0.2"
-      }
-    },
-    "flat-cache": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",
-      "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==",
-      "dev": true,
-      "requires": {
-        "flatted": "^2.0.0",
-        "rimraf": "2.6.3",
-        "write": "1.0.3"
-      },
-      "dependencies": {
-        "rimraf": {
-          "version": "2.6.3",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
-          "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
-          "dev": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        }
-      }
-    },
-    "flatted": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.1.tgz",
-      "integrity": "sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==",
-      "dev": true
-    },
-    "forever-agent": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
-    },
-    "form-data": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
-      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
-      "requires": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.6",
-        "mime-types": "^2.1.12"
-      }
-    },
-    "fraction.js": {
-      "version": "4.0.12",
-      "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.0.12.tgz",
-      "integrity": "sha512-8Z1K0VTG4hzYY7kA/1sj4/r1/RWLBD3xwReT/RCrUCbzPszjNQCCsy3ktkU/eaEqX3MYa4pY37a52eiBlPMlhA=="
-    },
-    "fs-extra": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz",
-      "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=",
-      "requires": {
-        "graceful-fs": "^4.1.2",
-        "jsonfile": "^3.0.0",
-        "universalify": "^0.1.0"
-      }
-    },
-    "fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
-    },
-    "fstream": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz",
-      "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
-      "requires": {
-        "graceful-fs": "^4.1.2",
-        "inherits": "~2.0.0",
-        "mkdirp": ">=0.5 0",
-        "rimraf": "2"
-      }
-    },
-    "functional-red-black-tree": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
-      "dev": true
-    },
-    "gauge": {
-      "version": "2.7.4",
-      "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
-      "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
-      "requires": {
-        "aproba": "^1.0.3",
-        "console-control-strings": "^1.0.0",
-        "has-unicode": "^2.0.0",
-        "object-assign": "^4.1.0",
-        "signal-exit": "^3.0.0",
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1",
-        "wide-align": "^1.1.0"
-      },
-      "dependencies": {
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-          "requires": {
-            "number-is-nan": "^1.0.0"
-          }
-        },
-        "string-width": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-          "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
-          }
-        }
-      }
-    },
-    "get-caller-file": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
-      "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="
-    },
-    "get-stream": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-      "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ="
-    },
-    "getpass": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-      "requires": {
-        "assert-plus": "^1.0.0"
-      }
-    },
-    "glob": {
-      "version": "7.1.4",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
-      "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
-      "requires": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      }
-    },
-    "globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-      "dev": true
-    },
-    "graceful-fs": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz",
-      "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q=="
-    },
-    "har-schema": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
-    },
-    "har-validator": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
-      "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
-      "requires": {
-        "ajv": "^6.5.5",
-        "har-schema": "^2.0.0"
-      }
-    },
-    "has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
-    },
-    "has-unicode": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
-    },
-    "hosted-git-info": {
-      "version": "2.8.4",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.4.tgz",
-      "integrity": "sha512-pzXIvANXEFrc5oFFXRMkbLPQ2rXRoDERwDLyrcUxGhaZhgP54BBSl9Oheh7Vv0T090cszWBxPjkQQ5Sq1PbBRQ=="
-    },
-    "http-signature": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-      "requires": {
-        "assert-plus": "^1.0.0",
-        "jsprim": "^1.2.2",
-        "sshpk": "^1.7.0"
-      }
-    },
-    "iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "dev": true,
-      "requires": {
-        "safer-buffer": ">= 2.1.2 < 3"
-      }
-    },
-    "ignore": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
-      "dev": true
-    },
-    "import-fresh": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.1.0.tgz",
-      "integrity": "sha512-PpuksHKGt8rXfWEr9m9EHIpgyyaltBy8+eF6GJM0QCAxMgxCfucMF3mjecK2QsJr0amJW7gTqh5/wht0z2UhEQ==",
-      "dev": true,
-      "requires": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
-      }
-    },
-    "imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
-      "dev": true
-    },
-    "inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "requires": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-    },
-    "inquirer": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz",
-      "integrity": "sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==",
-      "dev": true,
-      "requires": {
-        "ansi-escapes": "^3.2.0",
-        "chalk": "^2.4.2",
-        "cli-cursor": "^2.1.0",
-        "cli-width": "^2.0.0",
-        "external-editor": "^3.0.3",
-        "figures": "^2.0.0",
-        "lodash": "^4.17.12",
-        "mute-stream": "0.0.7",
-        "run-async": "^2.2.0",
-        "rxjs": "^6.4.0",
-        "string-width": "^2.1.0",
-        "strip-ansi": "^5.1.0",
-        "through": "^2.3.6"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-          "dev": true
-        },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
-        }
-      }
-    },
-    "invert-kv": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
-      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY="
-    },
-    "is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
-    },
-    "is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
-    },
-    "is-promise": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
-      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
-      "dev": true
-    },
-    "is-stream": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
-    },
-    "is-typedarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
-    },
-    "is-utf8": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI="
-    },
-    "isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
-    },
-    "isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
-    },
-    "isstream": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
-    },
-    "javascript-natural-sort": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz",
-      "integrity": "sha1-+eIwPUUH9tdDVac2ZNFED7Wg71k="
-    },
-    "js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "dev": true
-    },
-    "js-yaml": {
-      "version": "3.13.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
-      "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
-      "dev": true,
-      "requires": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      }
-    },
-    "jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
-    },
-    "json-schema": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
-    },
-    "json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
-    },
-    "json-stable-stringify-without-jsonify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
-      "dev": true
-    },
-    "json-stringify-safe": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
-    },
-    "jsonfile": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz",
-      "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=",
-      "requires": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
-    "jsonparse": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
-      "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA="
-    },
-    "jsprim": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-      "requires": {
-        "assert-plus": "1.0.0",
-        "extsprintf": "1.3.0",
-        "json-schema": "0.2.3",
-        "verror": "1.10.0"
-      }
-    },
-    "lcid": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
-      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
-      "requires": {
-        "invert-kv": "^1.0.0"
-      }
-    },
-    "levn": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
-      "dev": true,
-      "requires": {
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2"
-      }
-    },
-    "libspiro-js": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/libspiro-js/-/libspiro-js-0.3.1.tgz",
-      "integrity": "sha1-hmUrAAmm2E6nmlMgvcpfAGEu5Dk="
-    },
-    "load-json-file": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.2",
-        "parse-json": "^2.2.0",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0",
-        "strip-bom": "^2.0.0"
-      }
-    },
-    "locate-path": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-      "requires": {
-        "p-locate": "^2.0.0",
-        "path-exists": "^3.0.0"
-      }
-    },
-    "lodash": {
-      "version": "4.17.15",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
-      "dev": true
-    },
-    "lru-cache": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-      "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-      "requires": {
-        "pseudomap": "^1.0.2",
-        "yallist": "^2.1.2"
-      }
-    },
-    "map-age-cleaner": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
-      "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
-      "requires": {
-        "p-defer": "^1.0.0"
-      }
-    },
-    "mathjs": {
-      "version": "5.10.3",
-      "resolved": "https://registry.npmjs.org/mathjs/-/mathjs-5.10.3.tgz",
-      "integrity": "sha512-ySjg30BC3dYjQm73ILZtwcWzFJde0VU6otkXW/57IjjuYRa3Qaf0Kb8pydEuBZYtqW2OxreAtsricrAmOj3jIw==",
-      "requires": {
-        "complex.js": "2.0.11",
-        "decimal.js": "10.2.0",
-        "escape-latex": "1.2.0",
-        "fraction.js": "4.0.12",
-        "javascript-natural-sort": "0.7.1",
-        "seed-random": "2.2.0",
-        "tiny-emitter": "2.1.0",
-        "typed-function": "1.1.0"
-      }
-    },
-    "megaminx": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/megaminx/-/megaminx-0.9.0.tgz",
-      "integrity": "sha512-1UcxrUXXYboLWS3AJ2NuLckLi3YR7eJiO5LsYAWHZjYE0mmSqJ2ogSt6JrG8YINyogW9/TUWpL1ojwbRsSbyXw==",
-      "requires": {
-        "JSONStream": "^1.3.1",
-        "child-process-promise": "^2.2.1",
-        "clone": "^2.1.1",
-        "fs-extra": "^3.0.1",
-        "strip-bom-stream": "^3.0.0",
-        "typo-geom": "^0.5.1",
-        "which": "^1.3.0"
-      }
-    },
-    "mem": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz",
-      "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
-      "requires": {
-        "mimic-fn": "^1.0.0"
-      }
-    },
-    "microbuffer": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/microbuffer/-/microbuffer-1.0.0.tgz",
-      "integrity": "sha1-izgy7UDIfVH0e7I0kTppinVtGdI="
-    },
-    "mime-db": {
-      "version": "1.40.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
-      "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="
-    },
-    "mime-types": {
-      "version": "2.1.24",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz",
-      "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==",
-      "requires": {
-        "mime-db": "1.40.0"
-      }
-    },
-    "mimic-fn": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
-      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="
-    },
-    "minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-      "requires": {
-        "brace-expansion": "^1.1.7"
-      }
-    },
-    "minimist": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
-    },
-    "mkdirp": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-      "requires": {
-        "minimist": "0.0.8"
-      }
-    },
-    "ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "mute-stream": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
-      "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
-      "dev": true
-    },
-    "nan": {
-      "version": "2.14.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
-      "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg=="
-    },
-    "natural-compare": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
-      "dev": true
-    },
-    "nice-try": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
-      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
-    },
-    "node-gyp": {
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz",
-      "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==",
-      "requires": {
-        "fstream": "^1.0.0",
-        "glob": "^7.0.3",
-        "graceful-fs": "^4.1.2",
-        "mkdirp": "^0.5.0",
-        "nopt": "2 || 3",
-        "npmlog": "0 || 1 || 2 || 3 || 4",
-        "osenv": "0",
-        "request": "^2.87.0",
-        "rimraf": "2",
-        "semver": "~5.3.0",
-        "tar": "^2.0.0",
-        "which": "1"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
-          "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8="
-        }
-      }
-    },
-    "node-version": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/node-version/-/node-version-1.2.0.tgz",
-      "integrity": "sha512-ma6oU4Sk0qOoKEAymVoTvk8EdXEobdS7m/mAGhDJ8Rouugho48crHBORAmy5BoOcv8wraPM6xumapQp5hl4iIQ=="
-    },
-    "nopt": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
-      "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
-      "requires": {
-        "abbrev": "1"
-      }
-    },
-    "normalize-package-data": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
-      "requires": {
-        "hosted-git-info": "^2.1.4",
-        "resolve": "^1.10.0",
-        "semver": "2 || 3 || 4 || 5",
-        "validate-npm-package-license": "^3.0.1"
-      }
-    },
-    "npm-run-path": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
-      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
-      "requires": {
-        "path-key": "^2.0.0"
-      }
-    },
-    "npmlog": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
-      "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
-      "requires": {
-        "are-we-there-yet": "~1.1.2",
-        "console-control-strings": "~1.1.0",
-        "gauge": "~2.7.3",
-        "set-blocking": "~2.0.0"
-      }
-    },
-    "number-is-nan": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
-    },
-    "oauth-sign": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
-    },
-    "object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
-    },
-    "once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "requires": {
-        "wrappy": "1"
-      }
-    },
-    "onetime": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
-      "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
-      "requires": {
-        "mimic-fn": "^1.0.0"
-      }
-    },
-    "optionator": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
-      "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
-      "dev": true,
-      "requires": {
-        "deep-is": "~0.1.3",
-        "fast-levenshtein": "~2.0.4",
-        "levn": "~0.3.0",
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2",
-        "wordwrap": "~1.0.0"
-      }
-    },
-    "os-homedir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
-    },
-    "os-locale": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
-      "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
-      "requires": {
-        "execa": "^0.7.0",
-        "lcid": "^1.0.0",
-        "mem": "^1.1.0"
-      }
-    },
-    "os-tmpdir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
-    },
-    "osenv": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
-      "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
-      "requires": {
-        "os-homedir": "^1.0.0",
-        "os-tmpdir": "^1.0.0"
-      }
-    },
-    "otfcc-ttcize": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/otfcc-ttcize/-/otfcc-ttcize-0.8.0.tgz",
-      "integrity": "sha512-0RFgy9TDsgTF/1UJ8bSQ4heTYRatDz3HOXXh8d3WyXReqeOU+edgkbG4ERMFPdzFnA+SgqKTnPRg+2pduZsmSQ==",
-      "requires": {
-        "child-process-promise": "^2.2.1",
-        "fs-extra": "^4.0.1",
-        "megaminx": "^0.3.2",
-        "temp": "^0.8.3",
-        "which": "^1.3.0",
-        "yargs": "^8.0.2"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0="
-        },
-        "fs-extra": {
-          "version": "4.0.3",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz",
-          "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==",
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "jsonfile": "^4.0.0",
-            "universalify": "^0.1.0"
-          }
-        },
-        "jsonfile": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-          "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
-          "requires": {
-            "graceful-fs": "^4.1.6"
-          }
-        },
-        "load-json-file": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
-          "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "parse-json": "^2.2.0",
-            "pify": "^2.0.0",
-            "strip-bom": "^3.0.0"
-          }
-        },
-        "megaminx": {
-          "version": "0.3.3",
-          "resolved": "https://registry.npmjs.org/megaminx/-/megaminx-0.3.3.tgz",
-          "integrity": "sha512-lZBSLMro+XYJIix9zCZ8N6nZgixpjUPkX6CKuh+Y9Wl9bir/2Fp27NWapA0cNQCPrzOOI9sAwxc4BI14aIdumw==",
-          "requires": {
-            "JSONStream": "^1.3.1",
-            "child-process-promise": "^2.2.1",
-            "cubic2quad": "^1.1.0",
-            "fs-extra": "^3.0.1",
-            "which": "^1.3.0"
-          },
-          "dependencies": {
-            "fs-extra": {
-              "version": "3.0.1",
-              "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz",
-              "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=",
-              "requires": {
-                "graceful-fs": "^4.1.2",
-                "jsonfile": "^3.0.0",
-                "universalify": "^0.1.0"
-              }
-            },
-            "jsonfile": {
-              "version": "3.0.1",
-              "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz",
-              "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=",
-              "requires": {
-                "graceful-fs": "^4.1.6"
-              }
-            }
-          }
-        },
-        "path-type": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
-          "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
-          "requires": {
-            "pify": "^2.0.0"
-          }
-        },
-        "read-pkg": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
-          "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
-          "requires": {
-            "load-json-file": "^2.0.0",
-            "normalize-package-data": "^2.3.2",
-            "path-type": "^2.0.0"
-          }
-        },
-        "read-pkg-up": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
-          "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
-          "requires": {
-            "find-up": "^2.0.0",
-            "read-pkg": "^2.0.0"
-          }
-        },
-        "strip-bom": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM="
-        },
-        "yargs": {
-          "version": "8.0.2",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz",
-          "integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=",
-          "requires": {
-            "camelcase": "^4.1.0",
-            "cliui": "^3.2.0",
-            "decamelize": "^1.1.1",
-            "get-caller-file": "^1.0.1",
-            "os-locale": "^2.0.0",
-            "read-pkg-up": "^2.0.0",
-            "require-directory": "^2.1.1",
-            "require-main-filename": "^1.0.1",
-            "set-blocking": "^2.0.0",
-            "string-width": "^2.0.0",
-            "which-module": "^2.0.0",
-            "y18n": "^3.2.1",
-            "yargs-parser": "^7.0.0"
-          }
-        }
-      }
-    },
-    "p-defer": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
-      "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww="
-    },
-    "p-finally": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
-      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4="
-    },
-    "p-is-promise": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz",
-      "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg=="
-    },
-    "p-limit": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
-      "requires": {
-        "p-try": "^1.0.0"
-      }
-    },
-    "p-locate": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-      "requires": {
-        "p-limit": "^1.1.0"
-      }
-    },
-    "p-try": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M="
-    },
-    "pako": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.10.tgz",
-      "integrity": "sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw=="
-    },
-    "parent-module": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "dev": true,
-      "requires": {
-        "callsites": "^3.0.0"
-      }
-    },
-    "parse-json": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-      "requires": {
-        "error-ex": "^1.2.0"
-      }
-    },
-    "patel": {
-      "version": "0.33.1",
-      "resolved": "https://registry.npmjs.org/patel/-/patel-0.33.1.tgz",
-      "integrity": "sha512-zOv5DhGH2r4cRKnZfOlHmWqxBp9nMGnC3F/NZbUqFCYMA65RXiv8q1F96/6dm2ANR6xvCe+xLODQSb49IFoYQg==",
-      "dev": true,
-      "requires": {
-        "escodegen": ">=1.1.0",
-        "esmangle": ">=1.0.1",
-        "patrisika": ">=0.21.0",
-        "resumer": "*",
-        "yargs": "^6.6.0"
-      },
-      "dependencies": {
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-          "dev": true,
-          "requires": {
-            "number-is-nan": "^1.0.0"
-          }
-        },
-        "os-locale": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
-          "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
-          "dev": true,
-          "requires": {
-            "lcid": "^1.0.0"
-          }
-        },
-        "string-width": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-          "dev": true,
-          "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
-          }
-        },
-        "which-module": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
-          "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
-          "dev": true
-        },
-        "yargs": {
-          "version": "6.6.0",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz",
-          "integrity": "sha1-eC7CHvQDNF+DCoCMo9UTr1YGUgg=",
-          "dev": true,
-          "requires": {
-            "camelcase": "^3.0.0",
-            "cliui": "^3.2.0",
-            "decamelize": "^1.1.1",
-            "get-caller-file": "^1.0.1",
-            "os-locale": "^1.4.0",
-            "read-pkg-up": "^1.0.1",
-            "require-directory": "^2.1.1",
-            "require-main-filename": "^1.0.1",
-            "set-blocking": "^2.0.0",
-            "string-width": "^1.0.2",
-            "which-module": "^1.0.0",
-            "y18n": "^3.2.1",
-            "yargs-parser": "^4.2.0"
-          }
-        },
-        "yargs-parser": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz",
-          "integrity": "sha1-KczqwNxPA8bIe0qfIX3RjJ90hxw=",
-          "dev": true,
-          "requires": {
-            "camelcase": "^3.0.0"
-          }
-        }
-      }
-    },
-    "path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU="
-    },
-    "path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
-    },
-    "path-is-inside": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
-      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
-      "dev": true
-    },
-    "path-key": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A="
-    },
-    "path-parse": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
-      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="
-    },
-    "path-type": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-      "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.2",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
-      }
-    },
-    "patrisika": {
-      "version": "0.21.0",
-      "resolved": "https://registry.npmjs.org/patrisika/-/patrisika-0.21.0.tgz",
-      "integrity": "sha1-uCwn99QEFSLcXDG0O3xu+xnkdII=",
-      "dev": true,
-      "requires": {
-        "patrisika-scopes": ">=0.11.0"
-      }
-    },
-    "patrisika-scopes": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/patrisika-scopes/-/patrisika-scopes-0.11.1.tgz",
-      "integrity": "sha512-UCIBMx1nzNaR5CcDoQ9/jtY5RlJqf2CrJYHiMZJhi15NPvsPKRfJT/DPZMkhCunexOKmH03EDZYZU1hGn7mL0w==",
-      "dev": true
-    },
-    "performance-now": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
-    },
-    "pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
-    },
-    "pinkie": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
-      "dev": true
-    },
-    "pinkie-promise": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-      "dev": true,
-      "requires": {
-        "pinkie": "^2.0.0"
-      }
-    },
-    "prelude-ls": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
-      "dev": true
-    },
-    "primitive-quadify-off-curves": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/primitive-quadify-off-curves/-/primitive-quadify-off-curves-0.4.1.tgz",
-      "integrity": "sha512-Kmn+IfF+hcARb1NX+XtoSQIxHS+WeOqqQ3YDihRe3KkvGkFxMrDQFFsDTXxwUOt9KmvD7FgWG6cO2ajZp4lEQg==",
-      "requires": {
-        "mathjs": "^5.0.3",
-        "tslib": "~1.9.0"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "1.9.3",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz",
-          "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ=="
-        }
-      }
-    },
-    "process-nextick-args": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
-    },
-    "progress": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
-      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
-      "dev": true
-    },
-    "promise-polyfill": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-6.1.0.tgz",
-      "integrity": "sha1-36lpQ+qcEh/KTem1hoyznTRy4Fc="
-    },
-    "proper-lockfile": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/proper-lockfile/-/proper-lockfile-3.2.0.tgz",
-      "integrity": "sha512-iMghHHXv2bsxl6NchhEaFck8tvX3F9cknEEh1SUpguUOBjN7PAAW9BLzmbc1g/mCD1gY3EE2EABBHPJfFdHFmA==",
-      "requires": {
-        "graceful-fs": "^4.1.11",
-        "retry": "^0.12.0",
-        "signal-exit": "^3.0.2"
-      }
-    },
-    "pseudomap": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
-      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
-    },
-    "psl": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.4.0.tgz",
-      "integrity": "sha512-HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw=="
-    },
-    "pump": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-      "requires": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
-      }
-    },
-    "punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
-    },
-    "qs": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
-    },
-    "read-pkg": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
-      "dev": true,
-      "requires": {
-        "load-json-file": "^1.0.0",
-        "normalize-package-data": "^2.3.2",
-        "path-type": "^1.0.0"
-      }
-    },
-    "read-pkg-up": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
-      "dev": true,
-      "requires": {
-        "find-up": "^1.0.0",
-        "read-pkg": "^1.0.0"
-      },
-      "dependencies": {
-        "find-up": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-          "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-          "dev": true,
-          "requires": {
-            "path-exists": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
-          }
-        },
-        "path-exists": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-          "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-          "dev": true,
-          "requires": {
-            "pinkie-promise": "^2.0.0"
-          }
-        }
-      }
-    },
-    "readable-stream": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-      "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-      "requires": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      }
-    },
-    "regexpp": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz",
-      "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==",
-      "dev": true
-    },
-    "request": {
-      "version": "2.88.0",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
-      "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
-      "requires": {
-        "aws-sign2": "~0.7.0",
-        "aws4": "^1.8.0",
-        "caseless": "~0.12.0",
-        "combined-stream": "~1.0.6",
-        "extend": "~3.0.2",
-        "forever-agent": "~0.6.1",
-        "form-data": "~2.3.2",
-        "har-validator": "~5.1.0",
-        "http-signature": "~1.2.0",
-        "is-typedarray": "~1.0.0",
-        "isstream": "~0.1.2",
-        "json-stringify-safe": "~5.0.1",
-        "mime-types": "~2.1.19",
-        "oauth-sign": "~0.9.0",
-        "performance-now": "^2.1.0",
-        "qs": "~6.5.2",
-        "safe-buffer": "^5.1.2",
-        "tough-cookie": "~2.4.3",
-        "tunnel-agent": "^0.6.0",
-        "uuid": "^3.3.2"
-      }
-    },
-    "require-directory": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
-    },
-    "require-main-filename": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
-      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE="
-    },
-    "resolve": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz",
-      "integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==",
-      "requires": {
-        "path-parse": "^1.0.6"
-      }
-    },
-    "resolve-from": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-      "dev": true
-    },
-    "resolve-url": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
-      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
-      "dev": true
-    },
-    "restore-cursor": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
-      "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
-      "requires": {
-        "onetime": "^2.0.0",
-        "signal-exit": "^3.0.2"
-      }
-    },
-    "resumer": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz",
-      "integrity": "sha1-8ej0YeQGS6Oegq883CqMiT0HZ1k=",
-      "dev": true,
-      "requires": {
-        "through": "~2.3.4"
-      }
-    },
-    "retry": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
-      "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs="
-    },
-    "rimraf": {
-      "version": "2.2.8",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz",
-      "integrity": "sha1-5Dm+Kq7jJzIZUnMPmaiSnk/FBYI="
-    },
-    "run-async": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
-      "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
-      "dev": true,
-      "requires": {
-        "is-promise": "^2.1.0"
-      }
-    },
-    "rxjs": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.3.tgz",
-      "integrity": "sha512-wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA==",
-      "dev": true,
-      "requires": {
-        "tslib": "^1.9.0"
-      }
-    },
-    "safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-    },
-    "safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
-    },
-    "sax": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-      "dev": true
-    },
-    "seed-random": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/seed-random/-/seed-random-2.2.0.tgz",
-      "integrity": "sha1-KpsZ4lCoFwmSMaW5mk2vgLf77VQ="
-    },
-    "semaphore-async-await": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/semaphore-async-await/-/semaphore-async-await-1.5.1.tgz",
-      "integrity": "sha1-hXvvXjZEYBykuVcLh+nfXKEpdPo="
-    },
-    "semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
-    },
-    "set-blocking": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
-    },
-    "shebang-command": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
-      "requires": {
-        "shebang-regex": "^1.0.0"
-      }
-    },
-    "shebang-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM="
-    },
-    "signal-exit": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
-    },
-    "slice-ansi": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz",
-      "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",
-      "dev": true,
-      "requires": {
-        "ansi-styles": "^3.2.0",
-        "astral-regex": "^1.0.0",
-        "is-fullwidth-code-point": "^2.0.0"
-      }
-    },
-    "source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true
-    },
-    "source-map-resolve": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
-      "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
-      "dev": true,
-      "requires": {
-        "atob": "^2.1.1",
-        "decode-uri-component": "^0.2.0",
-        "resolve-url": "^0.2.1",
-        "source-map-url": "^0.4.0",
-        "urix": "^0.1.0"
-      }
-    },
-    "source-map-url": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
-      "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
-      "dev": true
-    },
-    "spdx-correct": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz",
-      "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==",
-      "requires": {
-        "spdx-expression-parse": "^3.0.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "spdx-exceptions": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz",
-      "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA=="
-    },
-    "spdx-expression-parse": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
-      "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
-      "requires": {
-        "spdx-exceptions": "^2.1.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "spdx-license-ids": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz",
-      "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q=="
-    },
-    "split": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz",
-      "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==",
-      "requires": {
-        "through": "2"
-      }
-    },
-    "sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
-    },
-    "sshpk": {
-      "version": "1.16.1",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
-      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
-      "requires": {
-        "asn1": "~0.2.3",
-        "assert-plus": "^1.0.0",
-        "bcrypt-pbkdf": "^1.0.0",
-        "dashdash": "^1.12.0",
-        "ecc-jsbn": "~0.1.1",
-        "getpass": "^0.1.1",
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.0.2",
-        "tweetnacl": "~0.14.0"
-      }
-    },
-    "stack-trace": {
-      "version": "0.0.9",
-      "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz",
-      "integrity": "sha1-qPbq7KkGdMMz58Q5U/J1tFFRBpU="
-    },
-    "string-width": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-      "requires": {
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^4.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
-        },
-        "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-          "requires": {
-            "ansi-regex": "^3.0.0"
-          }
-        }
-      }
-    },
-    "string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "requires": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
-    "strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "requires": {
-        "ansi-regex": "^2.0.0"
-      }
-    },
-    "strip-bom": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-      "dev": true,
-      "requires": {
-        "is-utf8": "^0.2.0"
-      }
-    },
-    "strip-bom-buf": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom-buf/-/strip-bom-buf-1.0.0.tgz",
-      "integrity": "sha1-HLRar1dTD0yvhsf3UXnSyaUd1XI=",
-      "requires": {
-        "is-utf8": "^0.2.1"
-      }
-    },
-    "strip-bom-stream": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-3.0.0.tgz",
-      "integrity": "sha1-lWvMXYRDD2klapDtgjdlzYWOFZw=",
-      "requires": {
-        "first-chunk-stream": "^2.0.0",
-        "strip-bom-buf": "^1.0.0"
-      }
-    },
-    "strip-eof": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
-      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8="
-    },
-    "strip-json-comments": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
-      "dev": true
-    },
-    "stylus": {
-      "version": "0.54.7",
-      "resolved": "https://registry.npmjs.org/stylus/-/stylus-0.54.7.tgz",
-      "integrity": "sha512-Yw3WMTzVwevT6ZTrLCYNHAFmanMxdylelL3hkWNgPMeTCpMwpV3nXjpOHuBXtFv7aiO2xRuQS6OoAdgkNcSNug==",
-      "dev": true,
-      "requires": {
-        "css-parse": "~2.0.0",
-        "debug": "~3.1.0",
-        "glob": "^7.1.3",
-        "mkdirp": "~0.5.x",
-        "safer-buffer": "^2.1.2",
-        "sax": "~1.2.4",
-        "semver": "^6.0.0",
-        "source-map": "^0.7.3"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.7.3",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-          "dev": true
-        }
-      }
-    },
-    "supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "requires": {
-        "has-flag": "^3.0.0"
-      }
-    },
-    "table": {
-      "version": "5.4.6",
-      "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz",
-      "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==",
-      "dev": true,
-      "requires": {
-        "ajv": "^6.10.2",
-        "lodash": "^4.17.14",
-        "slice-ansi": "^2.1.0",
-        "string-width": "^3.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-          "dev": true
-        },
-        "string-width": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
-        }
-      }
-    },
-    "tar": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz",
-      "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==",
-      "requires": {
-        "block-stream": "*",
-        "fstream": "^1.0.12",
-        "inherits": "2"
-      }
-    },
-    "temp": {
-      "version": "0.8.3",
-      "resolved": "https://registry.npmjs.org/temp/-/temp-0.8.3.tgz",
-      "integrity": "sha1-4Ma8TSa5AxJEEOT+2BEDAU38H1k=",
-      "requires": {
-        "os-tmpdir": "^1.0.0",
-        "rimraf": "~2.2.6"
-      }
-    },
-    "text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
-      "dev": true
-    },
-    "through": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
-    },
-    "tiny-emitter": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
-      "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
-    },
-    "tmp": {
-      "version": "0.0.33",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
-      "dev": true,
-      "requires": {
-        "os-tmpdir": "~1.0.2"
-      }
-    },
-    "toml": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/toml/-/toml-2.3.6.tgz",
-      "integrity": "sha512-gVweAectJU3ebq//Ferr2JUY4WKSDe5N+z0FvjDncLGyHmIDoxgY/2Ie4qfEIDm4IS7OA6Rmdm7pdEEdMcV/xQ=="
-    },
-    "topsort": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/topsort/-/topsort-0.0.2.tgz",
-      "integrity": "sha1-Ll4O6KFDlBfxAdW5stA15iAmMyE="
-    },
-    "tough-cookie": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
-      "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
-      "requires": {
-        "psl": "^1.1.24",
-        "punycode": "^1.4.1"
-      },
-      "dependencies": {
-        "punycode": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
-        }
-      }
-    },
-    "ts-process-promises": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/ts-process-promises/-/ts-process-promises-1.0.2.tgz",
-      "integrity": "sha512-6qWWz2HdFbD2uAfgS5t65Dd6HQKYjfra+YXQzKzxIG+RKTpoeDi+x+TW85SEF3cWUI2UecrOXJobvD+04MiTZg==",
-      "requires": {
-        "bluebird": "^3.0.5",
-        "resolve": "^1.1.6",
-        "split": "^1.0.0",
-        "stack-trace": "0.0.9"
-      }
-    },
-    "tslib": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz",
-      "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ=="
-    },
-    "ttf2woff": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/ttf2woff/-/ttf2woff-2.0.1.tgz",
-      "integrity": "sha1-hxgyJAAksJ25VwkEx8GSi4BXyWk=",
-      "requires": {
-        "argparse": "^1.0.6",
-        "microbuffer": "^1.0.0",
-        "pako": "^1.0.0"
-      }
-    },
-    "ttf2woff2": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/ttf2woff2/-/ttf2woff2-2.0.3.tgz",
-      "integrity": "sha1-XgIK/m5kMofzrXaHq+0g/mVOsyk=",
-      "requires": {
-        "bindings": "^1.2.1",
-        "bufferstreams": "^1.1.0",
-        "nan": "^2.1.0",
-        "node-gyp": "^3.0.3"
-      }
-    },
-    "tunnel-agent": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-      "requires": {
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "tweetnacl": {
-      "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
-    },
-    "type-check": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-      "dev": true,
-      "requires": {
-        "prelude-ls": "~1.1.2"
-      }
-    },
-    "typed-function": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/typed-function/-/typed-function-1.1.0.tgz",
-      "integrity": "sha512-TuQzwiT4DDg19beHam3E66oRXhyqlyfgjHB/5fcvsRXbfmWPJfto9B4a0TBdTrQAPGlGmXh/k7iUI+WsObgORA=="
-    },
-    "typo-geom": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/typo-geom/-/typo-geom-0.5.1.tgz",
-      "integrity": "sha512-nj81m0eqRMpK6NcwkGlT9r3CbwjCQhsFU6SBUuYW9TDveqIdi/QUFGkikoImtE1C6OzY2LvuVMSG8rx/ZTCGtQ==",
-      "requires": {
-        "mathjs": "^5.0.3",
-        "tslib": "~1.9.0"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "1.9.3",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz",
-          "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ=="
-        }
-      }
-    },
-    "universalify": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
-    },
-    "unorm": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/unorm/-/unorm-1.6.0.tgz",
-      "integrity": "sha512-b2/KCUlYZUeA7JFUuRJZPUtr4gZvBh7tavtv4fvk4+KV9pfGiR6CQAQAWl49ZpR3ts2dk4FYkP7EIgDJoiOLDA=="
-    },
-    "uri-js": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
-      "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
-      "requires": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "urix": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
-      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
-      "dev": true
-    },
-    "util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
-    },
-    "uuid": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz",
-      "integrity": "sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ=="
-    },
-    "validate-npm-package-license": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
-      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
-      "requires": {
-        "spdx-correct": "^3.0.0",
-        "spdx-expression-parse": "^3.0.0"
-      }
-    },
-    "verda": {
-      "version": "1.0.0-4",
-      "resolved": "https://registry.npmjs.org/verda/-/verda-1.0.0-4.tgz",
-      "integrity": "sha512-DKr2WdWlPwJvmqCcjs6LPaBOacFQUdk6+u7tqwkxYKbHa0Touff7Y6x+YAWbnT1dace5Qlv/CRr6YBEaB08r3A==",
-      "requires": {
-        "chalk": "^2.4.1",
-        "cli-cursor": "^2.1.0",
-        "fast-deep-equal": "^2.0.1",
-        "fs-extra": "^6.0.1",
-        "proper-lockfile": "^3.0.2",
-        "semaphore-async-await": "^1.5.1",
-        "strip-ansi": "^5.2.0",
-        "ts-process-promises": "^1.0.2",
-        "tslib": "^1.9.3",
-        "which": "^1.3.1",
-        "yargs": "^12.0.1"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
-        },
-        "fs-extra": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-6.0.1.tgz",
-          "integrity": "sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==",
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "jsonfile": "^4.0.0",
-            "universalify": "^0.1.0"
-          }
-        },
-        "jsonfile": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-          "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
-          "requires": {
-            "graceful-fs": "^4.1.6"
-          }
-        },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
-        }
-      }
-    },
-    "verror": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-      "requires": {
-        "assert-plus": "^1.0.0",
-        "core-util-is": "1.0.2",
-        "extsprintf": "^1.2.0"
-      }
-    },
-    "which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "requires": {
-        "isexe": "^2.0.0"
-      }
-    },
-    "which-module": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho="
-    },
-    "wide-align": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
-      "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
-      "requires": {
-        "string-width": "^1.0.2 || 2"
-      }
-    },
-    "wordwrap": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
-      "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
-      "dev": true
-    },
-    "wrap-ansi": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
-      "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
-      "requires": {
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1"
-      },
-      "dependencies": {
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-          "requires": {
-            "number-is-nan": "^1.0.0"
-          }
-        },
-        "string-width": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-          "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
-          }
-        }
-      }
-    },
-    "wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
-    },
-    "write": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz",
-      "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==",
-      "dev": true,
-      "requires": {
-        "mkdirp": "^0.5.1"
-      }
-    },
-    "y18n": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
-      "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE="
-    },
-    "yallist": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI="
-    },
-    "yargs": {
-      "version": "12.0.5",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz",
-      "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==",
-      "requires": {
-        "cliui": "^4.0.0",
-        "decamelize": "^1.2.0",
-        "find-up": "^3.0.0",
-        "get-caller-file": "^1.0.1",
-        "os-locale": "^3.0.0",
-        "require-directory": "^2.1.1",
-        "require-main-filename": "^1.0.1",
-        "set-blocking": "^2.0.0",
-        "string-width": "^2.0.0",
-        "which-module": "^2.0.0",
-        "y18n": "^3.2.1 || ^4.0.0",
-        "yargs-parser": "^11.1.1"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
-        },
-        "camelcase": {
-          "version": "5.3.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
-        },
-        "cliui": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
-          "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
-          "requires": {
-            "string-width": "^2.1.1",
-            "strip-ansi": "^4.0.0",
-            "wrap-ansi": "^2.0.0"
-          }
-        },
-        "execa": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-          "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
-          "requires": {
-            "cross-spawn": "^6.0.0",
-            "get-stream": "^4.0.0",
-            "is-stream": "^1.1.0",
-            "npm-run-path": "^2.0.0",
-            "p-finally": "^1.0.0",
-            "signal-exit": "^3.0.0",
-            "strip-eof": "^1.0.0"
-          }
-        },
-        "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-          "requires": {
-            "locate-path": "^3.0.0"
-          }
-        },
-        "get-stream": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-          "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-          "requires": {
-            "pump": "^3.0.0"
-          }
-        },
-        "invert-kv": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
-          "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA=="
-        },
-        "lcid": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
-          "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
-          "requires": {
-            "invert-kv": "^2.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-          "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "mem": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
-          "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
-          "requires": {
-            "map-age-cleaner": "^0.1.1",
-            "mimic-fn": "^2.0.0",
-            "p-is-promise": "^2.0.0"
-          }
-        },
-        "mimic-fn": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-          "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
-        },
-        "os-locale": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
-          "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
-          "requires": {
-            "execa": "^1.0.0",
-            "lcid": "^2.0.0",
-            "mem": "^4.0.0"
-          }
-        },
-        "p-limit": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz",
-          "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==",
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-          "requires": {
-            "p-limit": "^2.0.0"
-          }
-        },
-        "p-try": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
-        },
-        "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-          "requires": {
-            "ansi-regex": "^3.0.0"
-          }
-        },
-        "yargs-parser": {
-          "version": "11.1.1",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz",
-          "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==",
-          "requires": {
-            "camelcase": "^5.0.0",
-            "decamelize": "^1.2.0"
-          }
-        }
-      }
-    },
-    "yargs-parser": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz",
-      "integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=",
-      "requires": {
-        "camelcase": "^4.1.0"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0="
-        }
-      }
-    }
-  }
-}
diff --git a/pkgs/data/fonts/iosevka/package-lock.nix b/pkgs/data/fonts/iosevka/package-lock.nix
deleted file mode 100644
index b677b3daf97..00000000000
--- a/pkgs/data/fonts/iosevka/package-lock.nix
+++ /dev/null
@@ -1,143 +0,0 @@
-{ lib, fetchurl }:
-
-with lib; with builtins;
-
-let
-  # Convert a base64-encoded string into a list of quads and padding.
-  fromBase64 = str:
-    let
-      len = stringLength str;
-      quads = 3 * len - 4 * padding;
-      padding =
-        if hasSuffix "==" str then 2 else
-        if hasSuffix "=" str then 1 else
-        0;
-      chars = stringToCharacters (substring 0 (len - padding) str);
-      table = {
-        A = [0 0 0];
-        B = [0 0 1];
-        C = [0 0 2];
-        D = [0 0 3];
-        E = [0 1 0];
-        F = [0 1 1];
-        G = [0 1 2];
-        H = [0 1 3];
-        I = [0 2 0];
-        J = [0 2 1];
-        K = [0 2 2];
-        L = [0 2 3];
-        M = [0 3 0];
-        N = [0 3 1];
-        O = [0 3 2];
-        P = [0 3 3];
-        Q = [1 0 0];
-        R = [1 0 1];
-        S = [1 0 2];
-        T = [1 0 3];
-        U = [1 1 0];
-        V = [1 1 1];
-        W = [1 1 2];
-        X = [1 1 3];
-        Y = [1 2 0];
-        Z = [1 2 1];
-        a = [1 2 2];
-        b = [1 2 3];
-        c = [1 3 0];
-        d = [1 3 1];
-        e = [1 3 2];
-        f = [1 3 3];
-        g = [2 0 0];
-        h = [2 0 1];
-        i = [2 0 2];
-        j = [2 0 3];
-        k = [2 1 0];
-        l = [2 1 1];
-        m = [2 1 2];
-        n = [2 1 3];
-        o = [2 2 0];
-        p = [2 2 1];
-        q = [2 2 2];
-        r = [2 2 3];
-        s = [2 3 0];
-        t = [2 3 1];
-        u = [2 3 2];
-        v = [2 3 3];
-        w = [3 0 0];
-        x = [3 0 1];
-        y = [3 0 2];
-        z = [3 0 3];
-        "0" = [3 1 0];
-        "1" = [3 1 1];
-        "2" = [3 1 2];
-        "3" = [3 1 3];
-        "4" = [3 2 0];
-        "5" = [3 2 1];
-        "6" = [3 2 2];
-        "7" = [3 2 3];
-        "8" = [3 3 0];
-        "9" = [3 3 1];
-        "+" = [3 3 2];
-        "/" = [3 3 3];
-      };
-    in
-      take quads (concatMap (c: table.${c}) chars);
-
-  # Convert a list of quads with padding into a base16-encoded string.
-  toBase16 = quads:
-    if length quads == 0 then "" else
-    if length quads == 1 then throw "toBase16: odd quads" else
-    let
-      hexad = 4 * elemAt quads 0 + elemAt quads 1;
-      hexits = "0123456789abcdef";
-    in
-      substring hexad 1 hexits + toBase16 (drop 2 quads);
-in
-
-let
-  fetchResolved = { resolved, integrity, ... }:
-    let args = { url = resolved; } // integrityHash integrity; in
-      fetchurl args;
-  integrityHash = integrity:
-    if hasPrefix "sha1-" integrity then integritySHA1 integrity else
-    if hasPrefix "sha512-" integrity then integritySHA512 integrity else
-    throw "don't understand integrity: ${integrity}";
-  integritySHA1 = integrity:
-    { sha1 = toBase16 (fromBase64 (removePrefix "sha1-" integrity)); };
-  integritySHA512 = integrity:
-    { sha512 = toBase16 (fromBase64 (removePrefix "sha512-" integrity)); };
-in
-
-let
-  depend = name: attrs@{ version, dependencies ? {}, ... }:
-      {
-        inherit name version;
-        src = fetchResolved attrs;
-        depends = mapAttrsToList depend dependencies;
-      };
-  prepareDepend = { name, src, depends, ... }:
-    ''
-      unpackFile '${src}'
-      mkdir -p $(dirname "${name}")
-      mv package '${name}'
-      mkdir -p '${name}/node_modules'
-      (
-          cd '${name}/node_modules'
-          ${concatMapStrings prepareDepend depends}
-      )
-    '';
-in
-
-packageLockFile:
-
-let
-  packageLock = fromJSON (readFile packageLockFile);
-  depends = mapAttrsToList depend packageLock.dependencies;
-in
-  ''
-    mkdir -p node_modules
-    (
-        cd node_modules
-        ${concatMapStrings prepareDepend depends}
-    )
-  ''
-
-- 
GitLab


From 2a8f7d71ce88983f14936b76a1d18ef432d65883 Mon Sep 17 00:00:00 2001
From: Dima <43349662+d-goldin@users.noreply.github.com>
Date: Sun, 15 Sep 2019 19:42:29 +0200
Subject: [PATCH 0311/2254] linux-libre: fixing build / deblobbing (#68844)

Build was failing because we were depending on tagged versions of
the deblobbing scripts. The tags are not updated and thus newer
changes required won't be reflected unless the tag is re-created, which
might not be reliably the case.

So bumping revision and switching to use the branches to access the
deblob scripts.

For context, in our case the missing change is:

--- /nix/store/sfc0rrhj5l44zpqgpsymq5750k5wzg8p-tags-r16790/4.19-gnu/deblob-4.19	1970-01-01 01:00:01.000000000 +0100
+++ ../deblob-4.19	2019-09-14 14:53:44.637404289 +0200
@@ -1879,7 +1879,11 @@

 announce BRCMFMAC - "Broadcom IEEE802.11n embedded FullMAC WLAN driver"
 reject_firmware drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
-reject_firmware drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
+if grep -q firmware_request_nowarn drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c; then
+  reject_firmware_nowarn drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
+else
+  reject_firmware drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
+fi
 clean_blob drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c
 clean_blob drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h
---
 pkgs/os-specific/linux/kernel/linux-libre.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix
index e4a4e40f370..ddaceb877f8 100644
--- a/pkgs/os-specific/linux/kernel/linux-libre.nix
+++ b/pkgs/os-specific/linux/kernel/linux-libre.nix
@@ -1,11 +1,11 @@
 { stdenv, lib, fetchsvn, linux
 , scripts ? fetchsvn {
-    url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/";
+    url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
 
     # Update this if linux_latest-libre fails to build.
-    # $ curl https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/ | grep -Eo 'Revision [0-9]+'
-    rev = "16604";
-    sha256 = "0d2dh52zv073zr74ilspy0fy3ivys5pq32j7fljs4fwi2bcljf51";
+    # $ curl https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/ | grep -Eo 'Revision [0-9]+'
+    rev = "16791";
+    sha256 = "1lpaka4hs7yrpnrzfybd6radjylwvw2p4aly68pypykqs2srvm7j";
   }
 , ...
 }:
@@ -25,7 +25,7 @@ in linux.override {
       name = "${linux.name}-libre-src";
       src = linux.src;
       buildPhase = ''
-        ${scripts}/${majorMinor}-gnu/deblob-${majorMinor} \
+        ${scripts}/${majorMinor}/deblob-${majorMinor} \
             ${major} ${minor} ${patch}
       '';
       checkPhase = ''
-- 
GitLab


From 3028233ea5b6c4fc9aff11472ac0e8db68f29e1e Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 15 Sep 2019 12:45:02 -0500
Subject: [PATCH 0312/2254] pythonPackages.pika: remove pyev dependency

pyev support was removed from upstream https://github.com/pika/pika/pull/934#issuecomment-361714844
---
 pkgs/development/python-modules/pika/default.nix | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/pika/default.nix b/pkgs/development/python-modules/pika/default.nix
index 28ca8a3e498..b09c4a240e5 100644
--- a/pkgs/development/python-modules/pika/default.nix
+++ b/pkgs/development/python-modules/pika/default.nix
@@ -1,12 +1,8 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
-, isPy3k
 , nose
 , mock
-, pyyaml
-, unittest2
-, pyev
 , twisted
 , tornado
 }:
@@ -20,11 +16,7 @@ buildPythonPackage rec {
     sha256 = "1gqx9avb9nwgiyw5nz08bf99v9b0hvzr1pmqn9wbhd2hnsj6p9wz";
   };
 
-  # Tests require twisted which is only availalble for python-2.x
-  doCheck = !isPy3k;
-
-  buildInputs = [ nose mock pyyaml unittest2 pyev ]
-    ++ stdenv.lib.optionals (!isPy3k) [ twisted tornado ];
+  checkInputs = [ nose mock twisted tornado ];
 
   meta = with stdenv.lib; {
     description = "Pure-Python implementation of the AMQP 0-9-1 protocol";
-- 
GitLab


From b05818f3897c1cac0806ef89a6b0b09e9b3f3c76 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 15 Sep 2019 12:46:58 -0500
Subject: [PATCH 0313/2254] pythonPackages.pyev: drop

pyev is unmaintained, and was removed from PyPI.
---
 .../python-modules/pyev/default.nix           | 30 -------------------
 pkgs/top-level/python-packages.nix            |  2 --
 2 files changed, 32 deletions(-)
 delete mode 100644 pkgs/development/python-modules/pyev/default.nix

diff --git a/pkgs/development/python-modules/pyev/default.nix b/pkgs/development/python-modules/pyev/default.nix
deleted file mode 100644
index b5ca0c7ef6c..00000000000
--- a/pkgs/development/python-modules/pyev/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, fetchurl, buildPythonPackage, libev }:
-
-buildPythonPackage rec {
-  pname = "pyev";
-  version = "0.9.0";
-
-  src = fetchurl {
-    url = "mirror://pypi/p/pyev/${pname}-${version}.tar.gz";
-    sha256 = "0rf603lc0s6zpa1nb25vhd8g4y337wg2wyz56i0agsdh7jchl0sx";
-  };
-
-  buildInputs = [ libev ];
-
-  libEvSharedLibrary =
-    if !stdenv.isDarwin
-    then "${libev}/lib/libev.so.4"
-    else "${libev}/lib/libev.4.dylib";
-
-  postPatch = ''
-    test -f "${libEvSharedLibrary}" || { echo "ERROR: File ${libEvSharedLibrary} does not exist, please fix nix expression for pyev"; exit 1; }
-    sed -i -e "s|libev_dll_name = find_library(\"ev\")|libev_dll_name = \"${libEvSharedLibrary}\"|" setup.py
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Python bindings for libev";
-    homepage = https://code.google.com/p/pyev/;
-    license = licenses.gpl3;
-    maintainers = [ maintainers.bjornfor ];
-  };
-}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 62901ef2052..6bc54ebef67 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4380,8 +4380,6 @@ in {
 
   pyenchant = callPackage ../development/python-modules/pyenchant { };
 
-  pyev = callPackage ../development/python-modules/pyev { };
-
   pyexcelerator = callPackage ../development/python-modules/pyexcelerator { };
 
   pyext = callPackage ../development/python-modules/pyext { };
-- 
GitLab


From 16c55d22ccef43d56eb4a555facd18c78ece6f25 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Fri, 13 Sep 2019 16:33:55 -0700
Subject: [PATCH 0314/2254] pgadmin: fix build

---
 pkgs/top-level/all-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bd67fe85526..57cb5c1b1d7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24137,7 +24137,9 @@ in
 
   pgmanage = callPackage ../applications/misc/pgmanage { };
 
-  pgadmin = callPackage ../applications/misc/pgadmin { };
+  pgadmin = callPackage ../applications/misc/pgadmin {
+    openssl = openssl_1_0_2;
+  };
 
   pgf = pgf2;
 
-- 
GitLab


From 7b7848ecb69c1bad9958585dcc215927815a7c84 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sun, 15 Sep 2019 19:00:15 +0000
Subject: [PATCH 0315/2254] jogl: remove #37364 workaround

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

diff --git a/pkgs/development/java-modules/jogl/default.nix b/pkgs/development/java-modules/jogl/default.nix
index d179fb53178..80f19ab65f5 100644
--- a/pkgs/development/java-modules/jogl/default.nix
+++ b/pkgs/development/java-modules/jogl/default.nix
@@ -1,9 +1,5 @@
-{ stdenv, fetchgit, ant, jdk, openjdk8, zulu8, git, xorg, udev, libGL, libGLU }:
+{ stdenv, fetchgit, ant, jdk, git, xorg, udev, libGL, libGLU }:
 
-let
-  # workaround https://github.com/NixOS/nixpkgs/issues/37364
-  jdk-without-symlinks = if jdk == openjdk8 then zulu8 else jdk;
-in
 {
   jogl_2_3_2 =
     let
@@ -32,7 +28,8 @@ in
           -exec sed -i 's@"libGLU.so"@"${libGLU}/lib/libGLU.so"@' {} \;
       '';
 
-      buildInputs = [ jdk-without-symlinks ant git udev xorg.libX11 xorg.libXrandr xorg.libXcursor xorg.libXt xorg.libXxf86vm xorg.libXrender ];
+      nativeBuildInputs = [ jdk ant git ];
+      buildInputs = [ udev xorg.libX11 xorg.libXrandr xorg.libXcursor xorg.libXt xorg.libXxf86vm xorg.libXrender ];
 
       buildPhase = ''
         cp -r ${gluegen-src} $NIX_BUILD_TOP/gluegen
-- 
GitLab


From 6c0595e17142b702b68e20864b530ef6326812b0 Mon Sep 17 00:00:00 2001
From: Greg Roodt <greg@canva.com>
Date: Mon, 16 Sep 2019 05:19:41 +1000
Subject: [PATCH 0316/2254] kubecfg: 0.12.0 -> 0.12.5 (#68715)

---
 pkgs/applications/networking/cluster/kubecfg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/kubecfg/default.nix b/pkgs/applications/networking/cluster/kubecfg/default.nix
index e1b5a4425d5..3d75ef543bc 100644
--- a/pkgs/applications/networking/cluster/kubecfg/default.nix
+++ b/pkgs/applications/networking/cluster/kubecfg/default.nix
@@ -1,6 +1,6 @@
 { lib, buildGoPackage, fetchFromGitHub, ... }:
 
-let version = "0.12.0"; in
+let version = "0.12.5"; in
 
 buildGoPackage {
   pname = "kubecfg";
@@ -10,7 +10,7 @@ buildGoPackage {
     owner = "bitnami";
     repo = "kubecfg";
     rev = "v${version}";
-    sha256 = "118p1fy6cihswwz03vp62cz8395hgfqd82nmfkw88fx7av23rfhb";
+    sha256 = "0pn37qkwn3kdsd0z3qxk95lqjn2zak7gkk0pwlqp26jmrx0vv18l";
   };
 
   goPackagePath = "github.com/bitnami/kubecfg";
-- 
GitLab


From 25a28f8720d00c022deb2588d7c38cf72bc504db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 15 Sep 2019 16:36:32 -0300
Subject: [PATCH 0317/2254] qogir-icon-theme: init at 2019-09-15

---
 pkgs/data/icons/qogir-icon-theme/default.nix | 29 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/data/icons/qogir-icon-theme/default.nix

diff --git a/pkgs/data/icons/qogir-icon-theme/default.nix b/pkgs/data/icons/qogir-icon-theme/default.nix
new file mode 100644
index 00000000000..b7ae27aac68
--- /dev/null
+++ b/pkgs/data/icons/qogir-icon-theme/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, gtk3 }:
+
+stdenv.mkDerivation rec {
+  pname = "qogir-icon-theme";
+  version = "2019-09-15";
+
+  src = fetchFromGitHub {
+    owner = "vinceliuice";
+    repo = pname;
+    rev = "4e1b6c693615bc2c7c7a11df6f4b90f2e6fb67db";
+    sha256 = "1vp1wp4fgmy5af8z8nb3m6wgmb6wbwlvx5smf9dxfcn254hdg8g0";
+  };
+
+  nativeBuildInputs = [ gtk3 ];
+
+  installPhase = ''
+    patchShebangs install.sh
+    mkdir -p $out/share/icons
+    name= ./install.sh -d $out/share/icons
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A colorful design icon theme for linux desktops";
+    homepage = https://github.com/vinceliuice/Qogir-icon-theme;
+    license = with licenses; [ gpl3 ];
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ romildo ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f478f638f63..9db20ab9ee9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16976,6 +16976,8 @@ in
 
   publicsuffix-list = callPackage ../data/misc/publicsuffix-list { };
 
+  qogir-icon-theme = callPackage ../data/icons/qogir-icon-theme { };
+
   qogir-theme = callPackage ../data/themes/qogir { };
 
   redhat-official-fonts = callPackage ../data/fonts/redhat-official { };
-- 
GitLab


From f9da799b87936d93c329aa0da1ac48b411e2cc63 Mon Sep 17 00:00:00 2001
From: Tom Hunger <tehunger@gmail.com>
Date: Sun, 15 Sep 2019 21:48:04 +0100
Subject: [PATCH 0318/2254] dynd: fix build

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

diff --git a/pkgs/development/python-modules/dynd/default.nix b/pkgs/development/python-modules/dynd/default.nix
index d4cd0e711a0..f3e4e0a8b73 100644
--- a/pkgs/development/python-modules/dynd/default.nix
+++ b/pkgs/development/python-modules/dynd/default.nix
@@ -26,6 +26,8 @@ buildPythonPackage rec {
     substituteInPlace setup.py --replace "'--always', '--match', 'v*']).decode('ascii').strip('\n')" ""
   '';
 
+  dontUseCmakeConfigure = true;
+
   # Python 3 works but has a broken import test that I couldn't
   # figure out.
   doCheck = !isPy3k;
-- 
GitLab


From ebdaba7205ad4eea90da91929cbf25b803ed96a5 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 15 Sep 2019 16:00:00 -0500
Subject: [PATCH 0319/2254] pythonPackages.pyperf: 1.6.0 -> 1.6.1

perf was renamed to pyperf [1] to avoid confusion with Linux perf
project.

[1] https://github.com/vstinner/pyperf/commit/60eb936a87e287c578e85ab33b8b9a91d609ba53
---
 .../python-modules/{perf => pyperf}/default.nix           | 8 ++++----
 pkgs/top-level/python-packages.nix                        | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename pkgs/development/python-modules/{perf => pyperf}/default.nix (80%)

diff --git a/pkgs/development/python-modules/perf/default.nix b/pkgs/development/python-modules/pyperf/default.nix
similarity index 80%
rename from pkgs/development/python-modules/perf/default.nix
rename to pkgs/development/python-modules/pyperf/default.nix
index 6c209ba8da0..51a08e1f7ea 100644
--- a/pkgs/development/python-modules/perf/default.nix
+++ b/pkgs/development/python-modules/pyperf/default.nix
@@ -14,12 +14,12 @@
 }:
 
 buildPythonPackage rec {
-  pname = "perf";
-  version = "1.6.0";
+  pname = "pyperf";
+  version = "1.6.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1vrv83v8rhyl51yaxlqzw567vz5a9qwkymk3vqvcl5sa2yd3mzgp";
+    sha256 = "8d0143a22a13ee10c997a648f30b82cdc40175d5a20b11055ae058a82e45d371";
   };
 
   checkInputs = [ nose psutil ] ++
@@ -36,7 +36,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Python module to generate and modify perf";
-    homepage = https://github.com/vstinner/perf;
+    homepage = "https://pyperf.readthedocs.io/";
     license = licenses.mit;
     maintainers = [ maintainers.costrouc ];
   };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 96885a83ebb..9ddbc188c35 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -821,7 +821,7 @@ in {
 
   pdfx = callPackage ../development/python-modules/pdfx { };
 
-  perf = callPackage ../development/python-modules/perf { };
+  pyperf = callPackage ../development/python-modules/pyperf { };
 
   perfplot = callPackage ../development/python-modules/perfplot { };
 
-- 
GitLab


From 956669e8948fe3624e7fca527a9116e13d6466f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miguel=20Madrid=20Menc=C3=ADa?=
 <miguel.madrid.mencia@gmail.com>
Date: Sun, 15 Sep 2019 23:28:10 +0200
Subject: [PATCH 0320/2254] fd: 7.3.0 -> 7.4.0

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

diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix
index 7465cb67f61..76661c77f7b 100644
--- a/pkgs/tools/misc/fd/default.nix
+++ b/pkgs/tools/misc/fd/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "fd";
-  version = "7.3.0";
+  version = "7.4.0";
 
   src = fetchFromGitHub {
     owner = "sharkdp";
     repo = "fd";
     rev = "v${version}";
-    sha256 = "0y4657w1pi4x9nmbv551dj00dyiv935m8ph7jlv00chwy3hrb3yi";
+    sha256 = "108p1p9bxhg4qzwfs6wqcakcvlpqw3w498jkz1vhmg6jp1mbmgdr";
   };
 
-  cargoSha256 = "1qqlii9693ih7pxl80v515a13jar3yayr5v7pa57x14i9syir10c";
+  cargoSha256 = "0ylanxcb1vrhvm9h3lvq8nh28362wi5hjy0pqdv5lh40pphcknnz";
 
   preFixup = ''
     install -Dm644 "$src/doc/fd.1" "$out/man/man1/fd.1"
-- 
GitLab


From 82d7833b9b65f3d274ddef9597b5f66d8453a2cc Mon Sep 17 00:00:00 2001
From: Dima <dgoldin+github@protonmail.ch>
Date: Sat, 14 Sep 2019 23:32:11 +0200
Subject: [PATCH 0321/2254] python37Packages.scikitlearn: patching build

For numpy>=1.17 a test-case broke that required adjustments to
a threshold.

See https://github.com/NixOS/nixpkgs/issues/68494
---
 .../development/python-modules/scikitlearn/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/development/python-modules/scikitlearn/default.nix b/pkgs/development/python-modules/scikitlearn/default.nix
index 7eb020bbe60..939782722c6 100644
--- a/pkgs/development/python-modules/scikitlearn/default.nix
+++ b/pkgs/development/python-modules/scikitlearn/default.nix
@@ -2,6 +2,7 @@
 , lib
 , buildPythonPackage
 , fetchPypi
+, fetchpatch
 , gfortran, glibcLocales
 , numpy, scipy, pytest, pillow
 , cython
@@ -40,6 +41,15 @@ buildPythonPackage rec {
   ];
   checkInputs = [ pytest ];
 
+  patches = [
+    # Fixes tests by changing threshold of a test-case that broke
+    # with numpy versions >= 1.17. This should be removed for versions > 0.21.2.
+	( fetchpatch {
+	  url = "https://github.com/scikit-learn/scikit-learn/commit/b730befc821caec5b984d9ff3aa7bc4bd7f4d9bb.patch";
+	  sha256 = "0z36m05mv6d494qwq0688rgwa7c4bbnm5s2rcjlrp29fwn3fy1bv";
+	})
+  ];
+
   LC_ALL="en_US.UTF-8";
 
   doCheck = !stdenv.isAarch64;
-- 
GitLab


From ca1a2467418f4b07b109109e20fe9652b961aed0 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Sat, 14 Sep 2019 12:46:17 -0700
Subject: [PATCH 0322/2254] pythonPackages.percol: mark broken

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

diff --git a/pkgs/development/python-modules/percol/default.nix b/pkgs/development/python-modules/percol/default.nix
index 9523a3e28fa..2d113049009 100644
--- a/pkgs/development/python-modules/percol/default.nix
+++ b/pkgs/development/python-modules/percol/default.nix
@@ -1,7 +1,5 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, isPy3k
+{ lib, buildPythonPackage, fetchPypi, isPy3k
+, six
 }:
 
 buildPythonPackage rec {
@@ -14,11 +12,14 @@ buildPythonPackage rec {
     sha256 = "7a649c6fae61635519d12a6bcacc742241aad1bff3230baef2cedd693ed9cfe8";
   };
 
-  meta = with stdenv.lib; {
+  propagatedBuildInputs = [ six ];
+
+  meta = with lib; {
     homepage = https://github.com/mooz/percol;
     description = "Adds flavor of interactive filtering to the traditional pipe concept of shell";
     license = licenses.mit;
     maintainers = with maintainers; [ koral ];
+    broken = true; # missing cmigemo package which is missing libmigemo.so
+    # also doesn't support python3
   };
-
 }
-- 
GitLab


From 383fc6e2cf473b95a588783d4dce4f0988de5849 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20M=C3=B6ller?= <fabianm88@gmail.com>
Date: Mon, 16 Sep 2019 00:29:08 +0200
Subject: [PATCH 0323/2254] amp: fix darwin build

---
 pkgs/applications/editors/amp/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/amp/default.nix b/pkgs/applications/editors/amp/default.nix
index 98692de4317..31d0806df8a 100644
--- a/pkgs/applications/editors/amp/default.nix
+++ b/pkgs/applications/editors/amp/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchFromGitHub, rustPlatform, openssl, pkgconfig, python3, xorg, cmake, libgit2 }:
+{ stdenv, fetchFromGitHub, rustPlatform, openssl, pkgconfig, python3, xorg, cmake, libgit2, darwin
+, curl }:
 
 rustPlatform.buildRustPackage rec {
   pname = "amp";
@@ -15,7 +16,8 @@ rustPlatform.buildRustPackage rec {
   cargoSha256 = "1bvj2zg19ak4vi47vjkqlybz011kn5zq1j7zznr76zrryacw4lz1";
 
   nativeBuildInputs = [ cmake pkgconfig ];
-  buildInputs = [ openssl python3 xorg.libxcb libgit2 ];
+  buildInputs = [ openssl python3 xorg.libxcb libgit2 ] ++ stdenv.lib.optionals stdenv.isDarwin
+    (with darwin.apple_sdk.frameworks; [ curl Security AppKit ]);
 
   # Tests need to write to the theme directory in HOME.
   preCheck = "export HOME=`mktemp -d`";
-- 
GitLab


From f21f980ab86473e5a7560dc02ff96c8ce9c21f72 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sun, 15 Sep 2019 18:19:21 -0400
Subject: [PATCH 0324/2254] qt5.qtwebengine: reduce log output

Identical fix as 6f1ad0676fafd70df48c193e6bd1c7956ac26e09.
---
 .../libraries/qt-5/modules/qtwebengine.nix    | 39 ++++++++++---------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
index 357c81fa4f6..c96aef3f4da 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
@@ -103,24 +103,27 @@ EOF
       --replace 'libs = [ "sandbox" ]' 'libs = [ "/usr/lib/libsandbox.1.dylib" ]'
     '');
 
-  NIX_CFLAGS_COMPILE =
-  # it fails when compiled with -march=sandybridge https://github.com/NixOS/nixpkgs/pull/59148#discussion_r276696940
-  # TODO: investigate and fix properly
-    lib.optionals (stdenv.hostPlatform.platform.gcc.arch or "" == "sandybridge") [ "-march=westmere" ] ++
-    lib.optionals stdenv.isDarwin [
-      "-DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_10"
-      "-DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_10"
-
-      #
-      # Prevent errors like
-      # /nix/store/xxx-apple-framework-CoreData/Library/Frameworks/CoreData.framework/Headers/NSEntityDescription.h:51:7:
-      # error: pointer to non-const type 'id' with no explicit ownership
-      #     id** _kvcPropertyAccessors;
-      #
-      # TODO remove when new Apple SDK is in
-      #
-      "-fno-objc-arc"
-    ];
+  NIX_CFLAGS_COMPILE = [
+    # with gcc8, -Wclass-memaccess became part of -Wall and this exceeds the logging limit
+    "-Wno-class-memaccess"
+  ] ++ lib.optionals (stdenv.hostPlatform.platform.gcc.arch or "" == "sandybridge") [
+    # it fails when compiled with -march=sandybridge https://github.com/NixOS/nixpkgs/pull/59148#discussion_r276696940
+    # TODO: investigate and fix properly
+    "-march=westmere"
+  ] ++ lib.optionals stdenv.isDarwin [
+    "-DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_10"
+    "-DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_10"
+
+    #
+    # Prevent errors like
+    # /nix/store/xxx-apple-framework-CoreData/Library/Frameworks/CoreData.framework/Headers/NSEntityDescription.h:51:7:
+    # error: pointer to non-const type 'id' with no explicit ownership
+    #     id** _kvcPropertyAccessors;
+    #
+    # TODO remove when new Apple SDK is in
+    #
+    "-fno-objc-arc"
+  ];
 
   preConfigure = ''
     export NINJAFLAGS=-j$NIX_BUILD_CORES
-- 
GitLab


From 5347a8038af081a52e485bcefe850243850ea9e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20M=C3=B6ller?= <fabianm88@gmail.com>
Date: Mon, 16 Sep 2019 01:37:19 +0200
Subject: [PATCH 0325/2254] cheroot: fix darwin sandbox build

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

diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix
index 591bb0fbe37..9b3050942a8 100644
--- a/pkgs/development/python-modules/cheroot/default.nix
+++ b/pkgs/development/python-modules/cheroot/default.nix
@@ -34,6 +34,9 @@ buildPythonPackage rec {
     pytest -k 'not tls' ${lib.optionalString stdenv.isDarwin "--deselect=cheroot/test/test_ssl.py::test_http_over_https_error --deselect=cheroot/test/test_server.py::test_bind_addr_unix"}
   '';
 
+  # Some of the tests use localhost networking.
+  __darwinAllowLocalNetworking = true;
+
   meta = with lib; {
     description = "High-performance, pure-Python HTTP";
     homepage = https://github.com/cherrypy/cheroot;
-- 
GitLab


From 139806d89d77a3c59785e4e59c00c7186e8e9ea6 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sun, 15 Sep 2019 20:19:24 -0400
Subject: [PATCH 0326/2254] gnome3.mutter328: fix graphical glitches in gala

See https://github.com/elementary/gala/issues/605 and patch
---
 ...tor-Preserve-valid-paint-volumes-til.patch | 147 ++++++++++++++++++
 pkgs/desktops/gnome-3/core/mutter/3.28.nix    |   2 +
 2 files changed, 149 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/core/mutter/0001-Revert-ClutterActor-Preserve-valid-paint-volumes-til.patch

diff --git a/pkgs/desktops/gnome-3/core/mutter/0001-Revert-ClutterActor-Preserve-valid-paint-volumes-til.patch b/pkgs/desktops/gnome-3/core/mutter/0001-Revert-ClutterActor-Preserve-valid-paint-volumes-til.patch
new file mode 100644
index 00000000000..0e1c33773b0
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/mutter/0001-Revert-ClutterActor-Preserve-valid-paint-volumes-til.patch
@@ -0,0 +1,147 @@
+From 76477def5c103f10d62e604305802d7f5506afd4 Mon Sep 17 00:00:00 2001
+From: worldofpeace <worldofpeace@protonmail.ch>
+Date: Sun, 15 Sep 2019 20:14:16 -0400
+Subject: [PATCH] Revert "ClutterActor: Preserve valid paint volumes till the
+ next relayout/repaint"
+
+This causes issues for users of mutter like in gala[0].
+
+Upstream report: https://gitlab.gnome.org/GNOME/mutter/issues/536
+[0]: https://github.com/elementary/gala/issues/605
+---
+ clutter/clutter/clutter-actor.c | 35 +++++----------------------------
+ 1 file changed, 5 insertions(+), 30 deletions(-)
+
+diff --git a/clutter/clutter/clutter-actor.c b/clutter/clutter/clutter-actor.c
+index e70892308..8cb60fa07 100644
+--- a/clutter/clutter/clutter-actor.c
++++ b/clutter/clutter/clutter-actor.c
+@@ -24,7 +24,7 @@
+ 
+ /**
+  * SECTION:clutter-actor
+- * @short_description: The basic element of the scene graph 
++ * @short_description: The basic element of the scene graph
+  *
+  * The ClutterActor class is the basic element of the scene graph in Clutter,
+  * and it encapsulates the position, size, and transformations of a node in
+@@ -840,7 +840,6 @@ struct _ClutterActorPrivate
+   guint needs_compute_expand        : 1;
+   guint needs_x_expand              : 1;
+   guint needs_y_expand              : 1;
+-  guint needs_paint_volume_update   : 1;
+   guint had_effects_on_last_paint_volume_update : 1;
+ };
+ 
+@@ -1511,8 +1510,6 @@ clutter_actor_real_map (ClutterActor *self)
+ 
+   CLUTTER_ACTOR_SET_FLAGS (self, CLUTTER_ACTOR_MAPPED);
+ 
+-  self->priv->needs_paint_volume_update = TRUE;
+-
+   stage = _clutter_actor_get_stage_internal (self);
+   priv->pick_id = _clutter_stage_acquire_pick_id (CLUTTER_STAGE (stage), self);
+ 
+@@ -2746,7 +2743,6 @@ clutter_actor_real_queue_relayout (ClutterActor *self)
+   priv->needs_width_request  = TRUE;
+   priv->needs_height_request = TRUE;
+   priv->needs_allocation     = TRUE;
+-  priv->needs_paint_volume_update = TRUE;
+ 
+   /* reset the cached size requests */
+   memset (priv->width_requests, 0,
+@@ -4742,7 +4738,7 @@ clutter_actor_set_rotation_center_internal (ClutterActor        *self,
+                                             ClutterRotateAxis    axis,
+                                             const ClutterVertex *center)
+ {
+-  ClutterVertex v = CLUTTER_VERTEX_INIT_ZERO; 
++  ClutterVertex v = CLUTTER_VERTEX_INIT_ZERO;
+   GObject *obj = G_OBJECT (self);
+   ClutterTransformInfo *info;
+ 
+@@ -8531,7 +8527,6 @@ clutter_actor_init (ClutterActor *self)
+   priv->needs_width_request = TRUE;
+   priv->needs_height_request = TRUE;
+   priv->needs_allocation = TRUE;
+-  priv->needs_paint_volume_update = TRUE;
+ 
+   priv->cached_width_age = 1;
+   priv->cached_height_age = 1;
+@@ -10098,9 +10093,6 @@ clutter_actor_allocate (ClutterActor           *self,
+       return;
+     }
+ 
+-  if (CLUTTER_ACTOR_IS_MAPPED (self))
+-    self->priv->needs_paint_volume_update = TRUE;
+-
+   if (!stage_allocation_changed)
+     {
+       /* If the actor didn't move but needs_allocation is set, we just
+@@ -12992,9 +12984,6 @@ clutter_actor_add_child_internal (ClutterActor              *self,
+       child->priv->needs_height_request = TRUE;
+       child->priv->needs_allocation = TRUE;
+ 
+-      if (CLUTTER_ACTOR_IS_MAPPED (child))
+-        child->priv->needs_paint_volume_update = TRUE;
+-
+       /* we only queue a relayout here, because any possible
+        * redraw has already been queued either by show() or
+        * by our call to queue_redraw() above
+@@ -14130,7 +14119,7 @@ clutter_actor_get_anchor_point_gravity (ClutterActor *self)
+  *
+  * Since: 0.6
+  *
+- * Deprecated: 1.12: Use #ClutterActor:pivot-point and 
++ * Deprecated: 1.12: Use #ClutterActor:pivot-point and
+  * clutter_actor_set_translation() instead.
+  */
+ void
+@@ -14178,7 +14167,7 @@ clutter_actor_move_anchor_point (ClutterActor *self,
+  *
+  * Since: 0.6
+  *
+- * Deprecated: 1.12: Use #ClutterActor:pivot-point and 
++ * Deprecated: 1.12: Use #ClutterActor:pivot-point and
+  * clutter_actor_set_translation() instead.
+  */
+ void
+@@ -14230,7 +14219,7 @@ clutter_actor_move_anchor_point_from_gravity (ClutterActor   *self,
+  *
+  * Since: 0.6
+  *
+- * Deprecated: 1.12: Use #ClutterActor:pivot-point and 
++ * Deprecated: 1.12: Use #ClutterActor:pivot-point and
+  * clutter_actor_set_translation() instead. E.g. For %CLUTTER_GRAVITY_CENTER set
+  * pivot_point to (0.5,0.5) and the translation to (width/2,height/2).
+  */
+@@ -17567,19 +17556,6 @@ _clutter_actor_get_paint_volume_mutable (ClutterActor *self)
+ 
+   if (priv->paint_volume_valid)
+     {
+-      /* If effects are applied, the actor paint volume
+-       * needs to be recomputed on each paint, since those
+-       * paint volumes could change over the duration of the
+-       * effect.
+-       *
+-       * We also need to update the paint volume if we went
+-       * from having effects to not having effects on the last
+-       * paint volume update. */
+-      if (!priv->needs_paint_volume_update &&
+-          priv->current_effect == NULL &&
+-          !has_paint_volume_override_effects &&
+-          !priv->had_effects_on_last_paint_volume_update)
+-        return &priv->paint_volume;
+       clutter_paint_volume_free (&priv->paint_volume);
+     }
+ 
+@@ -17588,7 +17564,6 @@ _clutter_actor_get_paint_volume_mutable (ClutterActor *self)
+   if (_clutter_actor_get_paint_volume_real (self, &priv->paint_volume))
+     {
+       priv->paint_volume_valid = TRUE;
+-      priv->needs_paint_volume_update = FALSE;
+       return &priv->paint_volume;
+     }
+   else
+-- 
+2.22.1
+
diff --git a/pkgs/desktops/gnome-3/core/mutter/3.28.nix b/pkgs/desktops/gnome-3/core/mutter/3.28.nix
index 41527298ffb..cc00fc5ece4 100644
--- a/pkgs/desktops/gnome-3/core/mutter/3.28.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/3.28.nix
@@ -54,6 +54,8 @@ stdenv.mkDerivation rec {
       url = "https://github.com/elementary/os-patches/commit/d636a44885c5be662997f8e19f7dcd26670b3219.patch";
       sha256 = "12pbxk6f39a09jxjam5a5hxl4whp3cifzpck2m7fpp0n98nc63qh";
     })
+    # See patch commit message
+    ./0001-Revert-ClutterActor-Preserve-valid-paint-volumes-til.patch
   ];
 
   configureFlags = [
-- 
GitLab


From a3757e6409113d511abd7100f60a242d01a450c7 Mon Sep 17 00:00:00 2001
From: Sirio Balmelli <sirio@b-ad.ch>
Date: Mon, 16 Sep 2019 04:25:59 +0200
Subject: [PATCH 0327/2254] racerd: fix broken build on Darwin (#68861)

* racerd: fix broken build on Darwin

Build on Darwin failing with 'ld: framework not found Security'

Add buildInput darwin.apple_sdk.frameworks.Security
when building on Darwin.

Signed-off-by: Sirio Balmelli <sirio@b-ad.ch>
---
 pkgs/development/tools/rust/racerd/default.nix | 5 +++--
 pkgs/top-level/all-packages.nix                | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/rust/racerd/default.nix b/pkgs/development/tools/rust/racerd/default.nix
index bfc30193eed..fab0dc05c45 100644
--- a/pkgs/development/tools/rust/racerd/default.nix
+++ b/pkgs/development/tools/rust/racerd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper }:
+{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper , Security }:
 
 with rustPlatform;
 
@@ -19,7 +19,8 @@ buildRustPackage rec {
 
   cargoSha256 = "15894qr0kpp5kivx0p71zmmfhfh8in0ydkvfirxh2r12x0r2jhdd";
 
-  buildInputs = [ makeWrapper ];
+  buildInputs = [ makeWrapper ]
+                ++ stdenv.lib.optional stdenv.isDarwin Security;
 
   RUST_SRC_PATH = rustPlatform.rustcSrc;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c334a7e75b4..27d08101a0c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8359,7 +8359,9 @@ in
   rustracer = callPackage ../development/tools/rust/racer {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
-  rustracerd = callPackage ../development/tools/rust/racerd { };
+  rustracerd = callPackage ../development/tools/rust/racerd {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
   rust-bindgen = callPackage ../development/tools/rust/bindgen { };
   rust-cbindgen = callPackage ../development/tools/rust/cbindgen {
     inherit (darwin.apple_sdk.frameworks) Security;
-- 
GitLab


From f6382c947b48d9268111ae6e7eaf2777cccc3b02 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Fri, 16 Aug 2019 09:52:17 +0800
Subject: [PATCH 0328/2254] maestral: 0.2.6 -> 0.4.0

---
 pkgs/applications/networking/maestral/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/maestral/default.nix b/pkgs/applications/networking/maestral/default.nix
index bfacac2eaf4..65490ada653 100644
--- a/pkgs/applications/networking/maestral/default.nix
+++ b/pkgs/applications/networking/maestral/default.nix
@@ -1,21 +1,23 @@
-{ lib, python3Packages, fetchFromGitHub
+{ stdenv, lib, python3Packages, fetchFromGitHub
 , withGui ? false, wrapQtAppsHook ? null }:
 
 python3Packages.buildPythonApplication rec {
   pname = "maestral${lib.optionalString withGui "-gui"}";
-  version = "0.2.6";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "SamSchott";
     repo = "maestral-dropbox";
     rev = "v${version}";
-    sha256 = "1nfjm58f6hnqbx9xnz2h929s2175ka1yf5jjlk4i60v0wppnrrdf";
+    sha256 = "1jjn9cz43850xvs52gvx16qc5z4l91y4kpn6fpl05iwgaisbi1ws";
   };
 
   disabled = python3Packages.pythonOlder "3.6";
 
   propagatedBuildInputs = (with python3Packages; [
-    blinker click dropbox keyring keyrings-alt requests u-msgpack-python watchdog
+    blinker click dropbox keyring keyrings-alt Pyro4 requests u-msgpack-python watchdog
+  ] ++ lib.optionals stdenv.isLinux [
+    sdnotify systemd
   ] ++ lib.optional withGui pyqt5);
 
   nativeBuildInputs = lib.optional withGui wrapQtAppsHook;
-- 
GitLab


From 6c97b0486c97481dfdb82036de5382921269a771 Mon Sep 17 00:00:00 2001
From: Yurii Izorkin <izorkin@elven.pw>
Date: Mon, 16 Sep 2019 06:48:37 +0300
Subject: [PATCH 0329/2254] mariadb: 10.3.17 -> 10.3.18 (#68541)

* mariadb: fix library locate

* mariadb: 10.3.17 -> 10.3.18
---
 .../sql/mariadb/cmake-fix-crypt-libs.patch    | 12 --------
 .../cmake-without-plugin-auth-pam.patch       | 12 ++++++++
 pkgs/servers/sql/mariadb/default.nix          | 29 +++++++++----------
 3 files changed, 26 insertions(+), 27 deletions(-)
 delete mode 100644 pkgs/servers/sql/mariadb/cmake-fix-crypt-libs.patch
 create mode 100644 pkgs/servers/sql/mariadb/cmake-without-plugin-auth-pam.patch

diff --git a/pkgs/servers/sql/mariadb/cmake-fix-crypt-libs.patch b/pkgs/servers/sql/mariadb/cmake-fix-crypt-libs.patch
deleted file mode 100644
index 64652c08c19..00000000000
--- a/pkgs/servers/sql/mariadb/cmake-fix-crypt-libs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/libmariadb/plugins/auth/CMakeLists.txt b/libmariadb/plugins/auth/CMakeLists.txt
-index aa599418..7a51f73b 100644
---- a/libmariadb/plugins/auth/CMakeLists.txt
-+++ b/libmariadb/plugins/auth/CMakeLists.txt
-@@ -50,6 +50,7 @@ IF(WITH_SSL)
-                         ${REF10_SOURCES}
-                         ${CRYPT_SOURCE}
-                 INCLUDES ${REF10_DIR}
-+                LIBRARIES ${ED25519_LIBS}
-                 COMPILE_OPTIONS -DMYSQL_CLIENT=1)
-   IF(MSVC)
-      # Silence conversion (integer truncantion) warnings from reference code
diff --git a/pkgs/servers/sql/mariadb/cmake-without-plugin-auth-pam.patch b/pkgs/servers/sql/mariadb/cmake-without-plugin-auth-pam.patch
new file mode 100644
index 00000000000..173fa1e0c63
--- /dev/null
+++ b/pkgs/servers/sql/mariadb/cmake-without-plugin-auth-pam.patch
@@ -0,0 +1,12 @@
+diff --git a/cmake/build_configurations/mysql_release.cmake b/cmake/build_configurations/mysql_release.cmake
+index f7790748..995621e0 100644
+--- a/cmake/build_configurations/mysql_release.cmake
++++ b/cmake/build_configurations/mysql_release.cmake
+@@ -121,7 +121,6 @@ ENDIF()
+ 
+ IF(UNIX)
+   SET(WITH_EXTRA_CHARSETS all CACHE STRING "")
+-  SET(PLUGIN_AUTH_PAM YES)
+ 
+   IF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+     IF(NOT IGNORE_AIO_CHECK)
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index ac14015c4cf..b188b2295a8 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, makeWrapper, ncurses, zlib, xz, lzo, lz4, bzip2, snappy
-, libiconv, openssl, pcre, boost, judy, bison, libxml2, libkrb5
+, libiconv, openssl, pcre, boost, judy, bison, libxml2, libkrb5, linux-pam, curl
 , libaio, libevent, jemalloc, cracklib, systemd, numactl, perl
 , fixDarwinDylibNames, cctools, CoreServices
 , asio, buildEnv, check, scons
@@ -28,21 +28,21 @@ galeraLibs = buildEnv {
 };
 
 common = rec { # attributes common to both builds
-  version = "10.3.17";
+  version = "10.3.18";
 
   src = fetchurl {
     urls = [
       "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz"
       "https://downloads.mariadb.com/MariaDB/mariadb-${version}/source/mariadb-${version}.tar.gz"
     ];
-    sha256 = "15vh15az16932q42y9dxpzwxldmh0x4hvzrar3f8kblsqm7ym890";
+    sha256 = "1p6yvmahnkmsz50zjzp20ak7jzbqysly5bdl51nnrngrbfl6qib9";
     name   = "mariadb-${version}.tar.gz";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];
 
   buildInputs = [
-    ncurses openssl zlib pcre jemalloc libiconv
+    ncurses openssl zlib pcre jemalloc libiconv curl
   ] ++ optionals stdenv.isLinux [ libaio systemd libkrb5 ]
     ++ optionals stdenv.isDarwin [ perl fixDarwinDylibNames cctools CoreServices ];
 
@@ -53,7 +53,6 @@ common = rec { # attributes common to both builds
   patches = [
     ./cmake-includedir.patch
     ./cmake-libmariadb-includedir.patch
-    ./cmake-fix-crypt-libs.patch
   ];
 
   cmakeFlags = [
@@ -68,7 +67,7 @@ common = rec { # attributes common to both builds
     "-DINSTALL_DOCDIR=share/doc/mysql"
     "-DINSTALL_DOCREADMEDIR=share/doc/mysql"
     "-DINSTALL_INCLUDEDIR=include/mysql"
-    "-DINSTALL_LIBDIR=lib/mysql"
+    "-DINSTALL_LIBDIR=lib"
     "-DINSTALL_PLUGINDIR=lib/mysql/plugin"
     "-DINSTALL_INFODIR=share/mysql/docs"
     "-DINSTALL_MANDIR=share/man"
@@ -97,7 +96,7 @@ common = rec { # attributes common to both builds
   postInstall = ''
     rm "$out"/lib/mysql/plugin/daemon_example.ini
     mkdir -p "$dev"/bin && mv "$out"/bin/{mariadb_config,mysql_config} "$dev"/bin
-    mkdir -p "$dev"/lib/mysql && mv "$out"/lib/mysql/{libmariadbclient.a,libmysqlclient.a,libmysqlclient_r.a,libmysqlservices.a} "$dev"/lib/mysql
+    mkdir -p "$dev"/lib/ && mv "$out"/lib/{libmariadbclient.a,libmysqlclient.a,libmysqlclient_r.a,libmysqlservices.a} "$dev"/lib
     mkdir -p "$dev"/lib/mysql/plugin && mv "$out"/lib/mysql/plugin/{caching_sha2_password.so,dialog.so,mysql_clear_password.so,sha256_password.so} "$dev"/lib/mysql/plugin
   '';
 
@@ -123,6 +122,7 @@ client = stdenv.mkDerivation (common // {
 
   patches = common.patches ++ [
     ./cmake-plugin-includedir.patch
+    ./cmake-without-plugin-auth-pam.patch
   ];
 
   cmakeFlags = common.cmakeFlags ++ [
@@ -136,14 +136,13 @@ client = stdenv.mkDerivation (common // {
       -DCMAKE_INSTALL_PREFIX_DEV=$dev"
   '';
 
-  postInstall =  common.postInstall + ''
+  postInstall = common.postInstall + ''
     rm -r "$out"/share/doc
     rm "$out"/bin/{mysqltest,mytop,wsrep_sst_rsync_wan}
-    libmysqlclient_path=$(readlink -f $out/lib/mysql/libmysqlclient${libExt})
-    rm "$out"/lib/mysql/{libmariadb${libExt},libmysqlclient${libExt},libmysqlclient_r${libExt}}
-    mv "$libmysqlclient_path" "$out"/lib/mysql/libmysqlclient${libExt}
-    ln -sv libmysqlclient${libExt} "$out"/lib/mysql/libmysqlclient_r${libExt}
-
+    libmysqlclient_path=$(readlink -f $out/lib/libmysqlclient${libExt})
+    rm "$out"/lib/{libmariadb${libExt},libmysqlclient${libExt},libmysqlclient_r${libExt}}
+    mv "$libmysqlclient_path" "$out"/lib/libmysqlclient${libExt}
+    ln -sv libmysqlclient${libExt} "$out"/lib/libmysqlclient_r${libExt}
   '';
 });
 
@@ -158,6 +157,7 @@ server = stdenv.mkDerivation (common // {
     xz lzo lz4 bzip2 snappy
     libxml2 boost judy libevent cracklib
   ] ++ optional (stdenv.isLinux && !stdenv.isAarch32) numactl
+    ++ optional stdenv.isLinux linux-pam
     ++ optional (!stdenv.isDarwin) mytopEnv;
 
   patches = common.patches ++ [
@@ -166,7 +166,6 @@ server = stdenv.mkDerivation (common // {
 
   cmakeFlags = common.cmakeFlags ++ [
     "-DMYSQL_DATADIR=/var/lib/mysql"
-    "-DINSTALL_PLUGINDIR=lib/mysql/plugin"
     "-DENABLED_LOCAL_INFILE=OFF"
     "-DWITH_READLINE=ON"
     "-DWITH_EXTRA_CHARSETS=all"
@@ -196,7 +195,7 @@ server = stdenv.mkDerivation (common // {
     chmod +x "$out"/bin/wsrep_sst_common
     rm "$out"/bin/mysql_client_test
     rm -r "$out"/data # Don't need testing data
-    rm "$out"/lib/mysql/{libmysqlclient${libExt},libmysqlclient_r${libExt}}
+    rm "$out"/lib/{libmysqlclient${libExt},libmysqlclient_r${libExt}}
     mv "$out"/share/{groonga,groonga-normalizer-mysql} "$out"/share/doc/mysql
   '' + optionalString withoutClient ''
     ${ # We don't build with GSSAPI on Darwin
-- 
GitLab


From 04a0b11c9b7bd00913f88cc8affd497aac9902aa Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 11 Sep 2019 13:59:20 +0800
Subject: [PATCH 0330/2254] pythonPackages.keyring: 18.0.1 -> 19.1.0

---
 .../python-modules/keyring/default.nix            | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix
index e54283735a8..cf1eeb5392c 100644
--- a/pkgs/development/python-modules/keyring/default.nix
+++ b/pkgs/development/python-modules/keyring/default.nix
@@ -1,27 +1,24 @@
 { stdenv, buildPythonPackage, fetchPypi
-, setuptools_scm, entrypoints, secretstorage
+, dbus-python, setuptools_scm, entrypoints, secretstorage
 , pytest, pytest-flake8 }:
 
 buildPythonPackage rec {
   pname = "keyring";
-  version = "18.0.1";
+  version = "19.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "67d6cc0132bd77922725fae9f18366bb314fd8f95ff4d323a4df41890a96a838";
+    sha256 = "13frfmws03jdyz9wxb4ylkvk80qiyb6a3h3sn7wx3ry97bn5li3a";
   };
 
   nativeBuildInputs = [ setuptools_scm ];
 
   checkInputs = [ pytest pytest-flake8 ];
 
-  propagatedBuildInputs = [ entrypoints ] ++ stdenv.lib.optional stdenv.isLinux secretstorage;
+  propagatedBuildInputs = [ dbus-python entrypoints ] ++ stdenv.lib.optional stdenv.isLinux secretstorage;
 
-  doCheck = !stdenv.isDarwin;
-
-  checkPhase = ''
-    py.test
-  '';
+  # checks try to access a darwin path on linux
+  doCheck = false;
 
   meta = with stdenv.lib; {
     description = "Store and access your passwords safely";
-- 
GitLab


From 29819009ec5880f0d4dc917486a894b24a785c27 Mon Sep 17 00:00:00 2001
From: Sascha Grunert <sgrunert@suse.com>
Date: Mon, 16 Sep 2019 06:15:49 +0200
Subject: [PATCH 0331/2254] cri-o: 1.15.1 -> 1.15.2 (#68490)

Signed-off-by: Sascha Grunert <sgrunert@suse.com>
---
 pkgs/applications/virtualization/cri-o/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix
index 0d2d0278cc3..07b6d024990 100644
--- a/pkgs/applications/virtualization/cri-o/default.nix
+++ b/pkgs/applications/virtualization/cri-o/default.nix
@@ -17,7 +17,7 @@
 
 buildGoPackage rec {
   project = "cri-o";
-  version = "1.15.1";
+  version = "1.15.2";
   name = "${project}-${version}${flavor}";
 
   goPackagePath = "github.com/${project}/${project}";
@@ -26,7 +26,7 @@ buildGoPackage rec {
     owner = "cri-o";
     repo = "cri-o";
     rev = "v${version}";
-    sha256 = "0yjj03qwwb6g05pzavimgj14p6805m3w8qqpl4fp4fpmbrsx4sb0";
+    sha256 = "0fiizxwxdq87h943421ivgw49jndk23yjz3saf1rzmn7g3xh2pn4";
   };
 
   outputs = [ "bin" "out" ];
-- 
GitLab


From b44fca170255bf51afa1e5b7200154d7524fe8fb Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Mon, 16 Sep 2019 06:29:08 +0200
Subject: [PATCH 0332/2254] pythonPackages.flaky: 3.5.3 -> 3.6.1 (#68411)

---
 .../python-modules/flaky/default.nix            | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/flaky/default.nix b/pkgs/development/python-modules/flaky/default.nix
index 523e6ac53e6..c4e803245d5 100644
--- a/pkgs/development/python-modules/flaky/default.nix
+++ b/pkgs/development/python-modules/flaky/default.nix
@@ -2,22 +2,29 @@
 , buildPythonPackage
 , fetchPypi
 , mock
+, nose
 , pytest
 }:
 
 buildPythonPackage rec {
   pname = "flaky";
-  version = "3.5.3";
+  version = "3.6.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "12bd5e41f372b2190e8d754b6e5829c2f11dbc764e10b30f57e59f829c9ca1da";
+    sha256 = "8cd5455bb00c677f787da424eaf8c4a58a922d0e97126d3085db5b279a98b698";
   };
 
-  buildInputs = [ mock pytest ];
+  checkInputs = [ mock nose pytest ];
 
-  # waiting for feedback https://github.com/box/flaky/issues/97
-  doCheck = false;
+  checkPhase = ''
+    # based on tox.ini
+    pytest -k 'example and not options' --doctest-modules test/test_pytest/
+    pytest -k 'example and not options' test/test_pytest/
+    pytest -p no:flaky test/test_pytest/test_flaky_pytest_plugin.py
+    nosetests --with-flaky --force-flaky --max-runs 2 test/test_nose/test_nose_options_example.py
+    pytest --force-flaky --max-runs 2  test/test_pytest/test_pytest_options_example.py
+  '';
 
   meta = with stdenv.lib; {
     homepage = https://github.com/box/flaky;
-- 
GitLab


From b02b889255f7c4ee94d9eb89c720e91c4213817c Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 16 Sep 2019 12:28:30 +0800
Subject: [PATCH 0333/2254] libwebsockets: re-init 3.1

---
 .../libraries/libwebsockets/default.nix       | 63 ++++++++++++-------
 pkgs/top-level/all-packages.nix               |  5 +-
 2 files changed, 45 insertions(+), 23 deletions(-)

diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/development/libraries/libwebsockets/default.nix
index a297bf61f78..732a529c21f 100644
--- a/pkgs/development/libraries/libwebsockets/default.nix
+++ b/pkgs/development/libraries/libwebsockets/default.nix
@@ -1,28 +1,47 @@
 { fetchFromGitHub, stdenv, cmake, openssl, zlib, libuv }:
 
-stdenv.mkDerivation rec {
-  pname = "libwebsockets";
-  version = "3.2.0";
-
-  src = fetchFromGitHub {
-    owner = "warmcat";
-    repo = "libwebsockets";
-    rev = "v${version}";
-    sha256 = "0ac5755h3w1pl6cznqbvg63dwkqy544fqlhvqyp7s11hgs7jx6l8";
+let
+  generic = { version, sha256 }: stdenv.mkDerivation rec {
+    pname = "libwebsockets";
+    inherit version;
+
+    src = fetchFromGitHub {
+      owner = "warmcat";
+      repo = "libwebsockets";
+      rev = "v${version}";
+      inherit sha256;
+    };
+
+    buildInputs = [ openssl zlib libuv ];
+
+    nativeBuildInputs = [ cmake ];
+
+    cmakeFlags = [ "-DLWS_WITH_PLUGINS=ON" ];
+
+    meta = with stdenv.lib; {
+      description = "Light, portable C library for websockets";
+      longDescription = ''
+        Libwebsockets is a lightweight pure C library built to
+        use minimal CPU and memory resources, and provide fast
+        throughput in both directions.
+      '';
+      homepage = "https://libwebsockets.org/";
+      license = licenses.lgpl21;
+      platforms = platforms.all;
+    };
   };
 
-  buildInputs = [ cmake openssl zlib libuv ];
-  cmakeFlags = [ "-DLWS_WITH_PLUGINS=ON" ];
-
-  meta = {
-    description = "Light, portable C library for websockets";
-    longDescription = ''
-      Libwebsockets is a lightweight pure C library built to
-      use minimal CPU and memory resources, and provide fast
-      throughput in both directions.
-    '';
-    homepage = https://github.com/warmcat/libwebsockets;
-    license = stdenv.lib.licenses.lgpl21;
-    platforms = stdenv.lib.platforms.all;
+in
+rec {
+  libwebsockets_3_1 = generic {
+    sha256 = "1w1wz6snf3cmcpa3f4dci2nz9za2f5rrylxl109id7bcb36xhbdl";
+    version = "3.1.0";
   };
+
+  libwebsockets_3_2 = generic {
+    version = "3.2.0";
+    sha256 = "0ac5755h3w1pl6cznqbvg63dwkqy544fqlhvqyp7s11hgs7jx6l8";
+  };
+
+  libwebsockets = libwebsockets_3_2;
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ca37025f7f3..a1323af6ef4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4581,7 +4581,10 @@ in
 
   librest = callPackage ../development/libraries/librest { };
 
-  libwebsockets = callPackage ../development/libraries/libwebsockets { };
+  inherit (callPackages ../development/libraries/libwebsockets { })
+    libwebsockets_3_1
+    libwebsockets_3_2
+    libwebsockets;
 
   lidarr = callPackage ../servers/lidarr { };
 
-- 
GitLab


From 05ee2af77d47802435fd29ccd6234050e125cf46 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 16 Sep 2019 12:28:46 +0800
Subject: [PATCH 0334/2254] mosquitto: 1.6.4 -> 1.6.5

---
 pkgs/servers/mqtt/mosquitto/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/servers/mqtt/mosquitto/default.nix
index 3357f7a16c1..5a5342b91d3 100644
--- a/pkgs/servers/mqtt/mosquitto/default.nix
+++ b/pkgs/servers/mqtt/mosquitto/default.nix
@@ -1,16 +1,16 @@
 { stdenv, lib, fetchFromGitHub, cmake, docbook_xsl, libxslt
-, openssl, libuuid, libwebsockets, c-ares, libuv
+, openssl, libuuid, libwebsockets_3_1, c-ares, libuv
 , systemd ? null, withSystemd ? stdenv.isLinux }:
 
 stdenv.mkDerivation rec {
   pname = "mosquitto";
-  version = "1.6.4";
+  version = "1.6.5";
 
   src = fetchFromGitHub {
     owner  = "eclipse";
     repo   = "mosquitto";
     rev    = "v${version}";
-    sha256 = "1kr1dgc4nzhyg3rzymbv4rka3rpb30rwsy6binb7apnw3n3ff58l";
+    sha256 = "0scgsi3rvs9s8vxv4r7d5d9ixbsfg4dwnjcy6zxwdz9dfn8qnngj";
   };
 
   postPatch = ''
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   '';
 
   buildInputs = [
-    openssl libuuid libwebsockets c-ares libuv
+    openssl libuuid libwebsockets_3_1 c-ares libuv
   ] ++ lib.optional withSystemd systemd;
 
   nativeBuildInputs = [ cmake docbook_xsl libxslt ];
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "An open source MQTT v3.1/3.1.1 broker";
-    homepage = http://mosquitto.org/;
+    homepage = "https://mosquitto.org/";
     license = licenses.epl10;
     maintainers = with maintainers; [ peterhoeg ];
     platforms = platforms.unix;
-- 
GitLab


From d88f4efd0b1172450cfd211ae659cc4f09ce6689 Mon Sep 17 00:00:00 2001
From: Marwan Aljubeh <marwan.aljubeh@gmail.com>
Date: Mon, 24 Jun 2019 23:42:30 +0100
Subject: [PATCH 0335/2254] munin: Use `outPath` for packages in `makeFlags`

With this change, evaluating the `makeFlags` attribute does not result in building the referenced packages.

This makes it possible for users to override `buildInputs` and remove inputs they don't want without having to also make a modified copy of the `makeFlags` attribute.

An example use case is to remove the `jre` dependency.
---
 pkgs/servers/monitoring/munin/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix
index 183cc3a2b95..d978cb003c7 100644
--- a/pkgs/servers/monitoring/munin/default.nix
+++ b/pkgs/servers/monitoring/munin/default.nix
@@ -96,10 +96,10 @@ stdenv.mkDerivation rec {
     PREFIX=$(out)
     DESTDIR=$(out)
     PERLLIB=$(out)/${perlPackages.perl.libPrefix}
-    PERL=${perlPackages.perl}/bin/perl
-    PYTHON=${python}/bin/python
-    RUBY=${ruby}/bin/ruby
-    JAVARUN=${jre}/bin/java
+    PERL=${perlPackages.perl.outPath}/bin/perl
+    PYTHON=${python.outPath}/bin/python
+    RUBY=${ruby.outPath}/bin/ruby
+    JAVARUN=${jre.outPath}/bin/java
     PLUGINUSER=munin
   '';
 
-- 
GitLab


From aaf3881a80b4d41466d5e2cd8d36d36e89698186 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Mon, 16 Sep 2019 08:26:51 +0200
Subject: [PATCH 0336/2254] handbrake: enableParallelBuilding = false

It doesn't build too long anyway, so let's prefer reliability.
---
 pkgs/applications/video/handbrake/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix
index 7155d63b8dc..f4d75ba1e5f 100644
--- a/pkgs/applications/video/handbrake/default.nix
+++ b/pkgs/applications/video/handbrake/default.nix
@@ -78,7 +78,8 @@ stdenv.mkDerivation rec {
   # (default distribution bundles&builds 3rd party libs),
   # don't trigger cmake build
   dontUseCmakeConfigure = true;
-  enableParallelBuilding = true;
+  # cp: cannot create regular file './internal_defaults.json': File exists
+  enableParallelBuilding = false;
 
   preConfigure = ''
     patchShebangs scripts
-- 
GitLab


From 65bda966309454fd1a69a2478e4b207069fc5b5b Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Mon, 16 Sep 2019 10:19:54 +0200
Subject: [PATCH 0337/2254] sfxr-qt: fix build by adding setuptools native dep

---
 pkgs/applications/audio/sfxr-qt/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/audio/sfxr-qt/default.nix b/pkgs/applications/audio/sfxr-qt/default.nix
index 706d0faa3bc..615a8a8c660 100644
--- a/pkgs/applications/audio/sfxr-qt/default.nix
+++ b/pkgs/applications/audio/sfxr-qt/default.nix
@@ -20,7 +20,7 @@ mkDerivation rec {
   };
   nativeBuildInputs = [
     cmake
-    (python3.withPackages (pp: with pp; [ pyyaml jinja2 ]))
+    (python3.withPackages (pp: with pp; [ pyyaml jinja2 setuptools ]))
   ];
   buildInputs = [
     qtbase
-- 
GitLab


From 35e9b2915a12d3641c6e412f3ad14b2b942e85b5 Mon Sep 17 00:00:00 2001
From: Arian van Putten <arian.vanputten@gmail.com>
Date: Mon, 16 Sep 2019 10:49:59 +0200
Subject: [PATCH 0338/2254] vault: 1.2.2 -> 1.2.3

Fixes the build because https://git.apache.org has been taken offline
and now has been replaced with another mirror
---
 pkgs/tools/security/vault/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix
index c0fa221c969..7620fc9760d 100644
--- a/pkgs/tools/security/vault/default.nix
+++ b/pkgs/tools/security/vault/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "vault";
-  version = "1.2.2";
+  version = "1.2.3";
 
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = "vault";
     rev = "v${version}";
-    sha256 = "1xljm7xmb4ldg3wx8s9kw1spffg4ywk4r1jqfa743czd2xxmqavl";
+    sha256 = "11zi12j09vi6j112a1n8f7sxwp15pbh0801bzh27ihcy01hlzdf8";
   };
 
-  modSha256 = "13pr3piv6hrsc562qagpn1h5wckiziyfqraj13172hdglz3n2i7q";
+  modSha256 = "10pr3piv6hrsc562qagpn1h5wckiziyfqraj13172hdglz3n2i7q";
 
   buildFlagsArray = [
     "-tags='vault'"
-- 
GitLab


From a6635fbc19f3d4d13256d11aa8fb14952b92826d Mon Sep 17 00:00:00 2001
From: Nick Spinale <nick@nickspinale.com>
Date: Sat, 14 Sep 2019 11:46:39 +0000
Subject: [PATCH 0339/2254] pinentry: fix cross-compilation

---
 .../tools/security/pinentry/autoconf-ar.patch | 35 +++++++++++++++++++
 pkgs/tools/security/pinentry/default.nix      |  8 +++--
 2 files changed, 40 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/tools/security/pinentry/autoconf-ar.patch

diff --git a/pkgs/tools/security/pinentry/autoconf-ar.patch b/pkgs/tools/security/pinentry/autoconf-ar.patch
new file mode 100644
index 00000000000..6f531cfce32
--- /dev/null
+++ b/pkgs/tools/security/pinentry/autoconf-ar.patch
@@ -0,0 +1,35 @@
+diff -ur a/configure.ac b/configure.ac
+--- a/configure.ac	2019-09-14 11:30:11.584847746 +0000
++++ b/configure.ac	2019-09-14 11:31:26.692355265 +0000
+@@ -81,6 +81,7 @@
+ AC_PROG_CPP
+ AC_PROG_INSTALL
+ AC_PROG_RANLIB
++AC_CHECK_TOOL(AR, ar)
+ # We need to check for cplusplus here because we may not do the test
+ # for Qt and autoconf does does not allow that.
+ AC_PROG_CXX
+diff -ur a/pinentry/Makefile.in b/pinentry/Makefile.in
+--- a/pinentry/Makefile.in	2017-12-03 17:43:23.000000000 +0000
++++ b/pinentry/Makefile.in	2019-09-14 11:32:02.532000236 +0000
+@@ -113,7 +113,7 @@
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+ LIBRARIES = $(noinst_LIBRARIES)
+-AR = ar
++AR = @AR@
+ ARFLAGS = cru
+ AM_V_AR = $(am__v_AR_@AM_V@)
+ am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
+diff -ur a/secmem/Makefile.in b/secmem/Makefile.in
+--- a/secmem/Makefile.in	2017-12-03 17:43:23.000000000 +0000
++++ b/secmem/Makefile.in	2019-09-14 11:31:58.764934552 +0000
+@@ -113,7 +113,7 @@
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+ LIBRARIES = $(noinst_LIBRARIES)
+-AR = ar
++AR = @AR@
+ ARFLAGS = cru
+ AM_V_AR = $(am__v_AR_@AM_V@)
+ am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix
index ac6a50960ad..ec1425bbeb4 100644
--- a/pkgs/tools/security/pinentry/default.nix
+++ b/pkgs/tools/security/pinentry/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, fetchpatch, stdenv, lib, pkgconfig
+{ fetchurl, fetchpatch, stdenv, lib, pkgconfig, autoreconfHook
 , libgpgerror, libassuan
 , libcap ? null, libsecret ? null, ncurses ? null, gtk2 ? null, gcr ? null
 , qt4 ? null, qt5 ? null
@@ -23,7 +23,7 @@ mkDerivation rec {
     sha256 = "0w35ypl960pczg5kp6km3dyr000m1hf0vpwwlh72jjkjza36c1v8";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig autoreconfHook ];
   buildInputs =
     [ libgpgerror libassuan libcap libsecret gtk2 gcr ncurses qt4 ]
     ++ stdenv.lib.optional (qt5 != null) qt5.qtbase;
@@ -32,7 +32,9 @@ mkDerivation rec {
     substituteInPlace pinentry/pinentry-curses.c --replace ncursesw ncurses
   '';
 
-  patches = lib.optionals (gtk2 != null) [
+  patches = [
+    ./autoconf-ar.patch
+  ] ++ lib.optionals (gtk2 != null) [
     (fetchpatch {
       url = "https://salsa.debian.org/debian/pinentry/raw/debian/1.1.0-1/debian/patches/"
           + "0007-gtk2-When-X11-input-grabbing-fails-try-again-over-0..patch";
-- 
GitLab


From e39d627a122de18e9b133e8f4c0ed3e006cbde5d Mon Sep 17 00:00:00 2001
From: Nick Spinale <nick@nickspinale.com>
Date: Sat, 14 Sep 2019 11:46:49 +0000
Subject: [PATCH 0340/2254] gnupg: fix cross-compilation

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

diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix
index 90bd55f55a2..e2f460e7e30 100644
--- a/pkgs/tools/security/gnupg/22.nix
+++ b/pkgs/tools/security/gnupg/22.nix
@@ -24,9 +24,9 @@ stdenv.mkDerivation rec {
   };
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig texinfo ];
   buildInputs = [
-    libgcrypt libassuan libksba libiconv npth gettext texinfo
+    libgcrypt libassuan libksba libiconv npth gettext
     readline libusb gnutls adns openldap zlib bzip2 sqlite
   ];
 
-- 
GitLab


From 7491f85e4faa1be03572f25787e2577bd4ac5962 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Mon, 16 Sep 2019 08:03:37 -0400
Subject: [PATCH 0341/2254] nixos/moodle: add extraConfig option

---
 nixos/modules/services/web-apps/moodle.nix | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/nixos/modules/services/web-apps/moodle.nix b/nixos/modules/services/web-apps/moodle.nix
index 7f71b86a6fe..211bc17ee19 100644
--- a/nixos/modules/services/web-apps/moodle.nix
+++ b/nixos/modules/services/web-apps/moodle.nix
@@ -45,6 +45,8 @@ let
   $CFG->aspellpath = '${pkgs.aspell}/bin/aspell';
   $CFG->pathtodot = '${pkgs.graphviz}/bin/dot';
 
+  ${cfg.extraConfig}
+
   require_once('${cfg.package}/share/moodle/lib/setup.php');
 
   // There is no php closing tag in this file,
@@ -172,6 +174,19 @@ in
         for details on configuration directives.
       '';
     };
+
+    extraConfig = mkOption {
+      type = types.lines;
+      default = "";
+      description = ''
+        Any additional text to be appended to the config.php
+        configuration file. This is a PHP script. For configuration
+        details, see <link xlink:href="https://docs.moodle.org/37/en/Configuration_file"/>.
+      '';
+      example = ''
+        $CFG->disableupdatenotifications = true;
+      '';
+    };
   };
 
   # implementation
-- 
GitLab


From 8a6e2f5d53a895c0bd4cffe05dd4c6a2fd41c02e Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 13 Sep 2019 08:43:15 +0200
Subject: [PATCH 0342/2254] linuxPackages.exfat-nofuse: 2018-04-16 ->
 2019-09-06

Upstream repository is unmaintained since 2018, maintainership got taken
over by AdrianBan ( https://github.com/dorimanx/exfat-nofuse/issues/145#issuecomment-528632096 )
---
 pkgs/os-specific/linux/exfat/default.nix | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/pkgs/os-specific/linux/exfat/default.nix b/pkgs/os-specific/linux/exfat/default.nix
index 036cd3f28a1..e66ac4d65ab 100644
--- a/pkgs/os-specific/linux/exfat/default.nix
+++ b/pkgs/os-specific/linux/exfat/default.nix
@@ -6,13 +6,13 @@ assert lib.versionAtLeast kernel.version  "4.2" || lib.versionOlder kernel.versi
 
 stdenv.mkDerivation rec {
   name = "exfat-nofuse-${version}-${kernel.version}";
-  version = "2018-04-16";
+  version = "2019-09-06";
 
   src = fetchFromGitHub {
-    owner = "dorimanx";
+    owner = "AdrianBan";
     repo = "exfat-nofuse";
-    rev = "01c30ad52625a7261e1b0d874553b6ca7af25966";
-    sha256 = "0n1ibamf1yj8iqapc86lfscnky9p07ngsi4f2kpv3d5r2s6mzsh6";
+    rev = "5536f067373c196f152061f5000fe0032dc07c48";
+    sha256 = "00mhadsv2iw8z00a6170hwbvk3afx484nn3irmd5f5kmhs34sw7k";
   };
 
   hardeningDisable = [ "pic" ];
@@ -27,18 +27,9 @@ stdenv.mkDerivation rec {
     install -m644 -b -D exfat.ko $out/lib/modules/${kernel.modDirVersion}/kernel/fs/exfat/exfat.ko
   '';
 
-  patches = [
-    # fix compile-errors in 4.18 and 4.20
-    # ref: https://github.com/dorimanx/exfat-nofuse/pull/137
-    (fetchpatch {
-      url = https://github.com/dorimanx/exfat-nofuse/compare/01c30ad52625a7261e1b0d874553b6ca7af25966...f93a47e6414d567a1e7f6ab7f34b015b20f9a050.patch ;
-      sha256 = "0w57pi9h6dwjxfgc3zpwy6sr4zw42hn1zj72f7wgfpqrx6d8xkh5";
-    } )
-  ];
-
   meta = {
     description = "exfat kernel module";
-    homepage = https://github.com/dorimanx/exfat-nofuse;
+    inherit (src.meta) homepage;
     license = lib.licenses.gpl2;
     maintainers = with lib.maintainers; [ makefu ];
     platforms = lib.platforms.linux;
-- 
GitLab


From 96b22bb697b722b9c3389abd0b304813e8a6b0d9 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@gmail.com>
Date: Mon, 16 Sep 2019 15:20:49 +0300
Subject: [PATCH 0343/2254] qt5ct: 0.39 -> 0.41

---
 pkgs/tools/misc/qt5ct/default.nix   |  9 ++-------
 pkgs/tools/misc/qt5ct/wayland.patch | 22 ----------------------
 2 files changed, 2 insertions(+), 29 deletions(-)
 delete mode 100644 pkgs/tools/misc/qt5ct/wayland.patch

diff --git a/pkgs/tools/misc/qt5ct/default.nix b/pkgs/tools/misc/qt5ct/default.nix
index fbb56b98be7..952268b26f0 100644
--- a/pkgs/tools/misc/qt5ct/default.nix
+++ b/pkgs/tools/misc/qt5ct/default.nix
@@ -4,22 +4,17 @@ let inherit (lib) getDev; in
 
 mkDerivation rec {
   pname = "qt5ct";
-  version = "0.39";
+  version = "0.41";
 
   src = fetchurl {
     url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
-    sha256 = "069y6c17gfics8rz3rdsn2x2hb39m4qka08ygwpxa8gqppffqs9p";
+    sha256 = "1p2p6116wg5bc0hcbi2sygwlgk0g9idxpci0qdh3p4lb1plk0h7j";
   };
 
   nativeBuildInputs = [ qmake qttools ];
 
   buildInputs = [ qtbase ];
 
-  # Wayland needs to know the desktop file name in order to show the app name and icon.
-  # Patch has been upstreamed and can be removed in the future.
-  # See: https://sourceforge.net/p/qt5ct/code/549/
-  patches = [ ./wayland.patch ];
-
   qmakeFlags = [
     "LRELEASE_EXECUTABLE=${getDev qttools}/bin/lrelease"
   ];
diff --git a/pkgs/tools/misc/qt5ct/wayland.patch b/pkgs/tools/misc/qt5ct/wayland.patch
deleted file mode 100644
index fe186cfa469..00000000000
--- a/pkgs/tools/misc/qt5ct/wayland.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/qt5ct/main.cpp
-+++ b/src/qt5ct/main.cpp
-@@ -29,14 +29,18 @@
- #include <QApplication>
- #include <QLibraryInfo>
- #include <QLocale>
--#include "qt5ct.h"
-+#include <QtGlobal>
- #include <QTranslator>
- #include <QtDebug>
-+#include "qt5ct.h"
- #include "mainwindow.h"
- 
- int main(int argc, char **argv)
- {
-     QApplication app(argc, argv);
-+#if (QT_VERSION >= QT_VERSION_CHECK(5, 7, 0))
-+    QGuiApplication::setDesktopFileName("qt5ct.desktop");
-+#endif
-     QTranslator translator;
-     QString locale = Qt5CT::systemLanguageID();
-     translator.load(QString(":/qt5ct_") + locale);
\ No newline at end of file
-- 
GitLab


From 908a842c89e3c6c08f9f9c1a0faa57587196f5d8 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Mon, 16 Sep 2019 08:22:05 -0400
Subject: [PATCH 0344/2254] zabbix: 4.2.5 -> 4.2.6, 4.0.11 -> 4.0.12

---
 pkgs/servers/monitoring/zabbix/versions.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix
index a1799839b64..248c05aab4f 100644
--- a/pkgs/servers/monitoring/zabbix/versions.nix
+++ b/pkgs/servers/monitoring/zabbix/versions.nix
@@ -1,12 +1,12 @@
 generic: {
   v42 = generic {
-    version = "4.2.5";
-    sha256 = "135bfafydmd66q97za84micymgf38s9zydp6jssrf7azik699fjd";
+    version = "4.2.6";
+    sha256 = "0r08v9ka0v8d7w133yr09vaxzl5lhbrsvbx900x15qv8lwliysv4";
   };
 
   v40 = generic {
-    version = "4.0.11";
-    sha256 = "02c4c82vbc27v09rci7flvwvjyb5sx0mknw0fz5i8bb23k1jbbxh";
+    version = "4.0.12";
+    sha256 = "1jlbzlz0rzcjixicdcd7xcjhfqwr82hngpazx85f40r9dy574pjw";
   };
 
   v30 = generic {
-- 
GitLab


From 054f01ee1ba7ea86f8442b7dcc9d99b8aece5427 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 13 Sep 2019 17:27:56 +0200
Subject: [PATCH 0345/2254] man-nixos-rebuild.xml: Improve layout

---
 nixos/doc/manual/man-nixos-rebuild.xml | 40 ++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/nixos/doc/manual/man-nixos-rebuild.xml b/nixos/doc/manual/man-nixos-rebuild.xml
index 4c20cfcdd7d..a83c4fb965e 100644
--- a/nixos/doc/manual/man-nixos-rebuild.xml
+++ b/nixos/doc/manual/man-nixos-rebuild.xml
@@ -7,10 +7,12 @@
   <refmiscinfo class="source">NixOS</refmiscinfo>
 <!-- <refmiscinfo class="version"><xi:include href="version.txt" parse="text"/></refmiscinfo> -->
  </refmeta>
+
  <refnamediv>
   <refname><command>nixos-rebuild</command>
   </refname><refpurpose>reconfigure a NixOS machine</refpurpose>
  </refnamediv>
+
  <refsynopsisdiv>
   <cmdsynopsis>
    <command>nixos-rebuild</command><group choice='req'>
@@ -74,6 +76,7 @@
    <arg>
     <option>--builders</option> <replaceable>builder-spec</replaceable>
    </arg>
+
    <sbr />
    <arg>
     <group choice='req'>
@@ -121,8 +124,10 @@
    </arg>
   </cmdsynopsis>
  </refsynopsisdiv>
+
  <refsection>
   <title>Description</title>
+
   <para>
    This command updates the system so that it corresponds to the configuration
    specified in <filename>/etc/nixos/configuration.nix</filename>. Thus, every
@@ -133,9 +138,11 @@
    (re)starts any system services if needed. Please note that user services need
    to be started manually as they aren't detected by the activation script at the moment.
   </para>
+
   <para>
    This command has one required argument, which specifies the desired
    operation. It must be one of the following:
+
    <variablelist>
     <varlistentry>
      <term>
@@ -152,6 +159,7 @@
       </para>
      </listitem>
     </varlistentry>
+
     <varlistentry>
      <term>
       <option>boot</option>
@@ -165,6 +173,7 @@
       </para>
      </listitem>
     </varlistentry>
+
     <varlistentry>
      <term>
       <option>test</option>
@@ -179,6 +188,7 @@
       </para>
      </listitem>
     </varlistentry>
+
     <varlistentry>
      <term>
       <option>build</option>
@@ -197,6 +207,7 @@
       </para>
      </listitem>
     </varlistentry>
+
     <varlistentry>
      <term>
       <option>dry-build</option>
@@ -208,6 +219,7 @@
       </para>
      </listitem>
     </varlistentry>
+
     <varlistentry>
      <term>
       <option>dry-activate</option>
@@ -222,6 +234,7 @@
       </para>
      </listitem>
     </varlistentry>
+
     <varlistentry>
      <term>
       <option>edit</option>
@@ -232,6 +245,7 @@
       </para>
      </listitem>
     </varlistentry>
+
     <varlistentry>
      <term>
       <option>build-vm</option>
@@ -249,12 +263,14 @@
 <prompt>$ </prompt>./result/bin/run-*-vm
 </screen>
       </para>
+
       <para>
        The VM is implemented using the <literal>qemu</literal> package. For
        best performance, you should load the <literal>kvm-intel</literal> or
        <literal>kvm-amd</literal> kernel modules to get hardware
        virtualisation.
       </para>
+
       <para>
        The VM mounts the Nix store of the host through the 9P file system. The
        host Nix store is read-only, so Nix commands that modify the Nix store
@@ -262,6 +278,7 @@
        <command>nixos-rebuild</command>; to change the VM’s configuration,
        you must halt the VM and re-run the commands above.
       </para>
+
       <para>
        The VM has its own <literal>ext3</literal> root file system, which is
        automatically created when the VM is first started, and is persistent
@@ -272,6 +289,7 @@
       </para>
      </listitem>
     </varlistentry>
+
     <varlistentry>
      <term>
       <option>build-vm-with-bootloader</option>
@@ -294,11 +312,13 @@
    </variablelist>
   </para>
  </refsection>
+
  <refsection>
   <title>Options</title>
   <para>
    This command accepts the following options:
   </para>
+
   <variablelist>
    <varlistentry>
     <term>
@@ -310,6 +330,7 @@
      </para>
     </listitem>
    </varlistentry>
+
    <varlistentry>
     <term>
      <option>--install-bootloader</option>
@@ -321,6 +342,7 @@
      </para>
     </listitem>
    </varlistentry>
+
    <varlistentry>
     <term>
      <option>--no-build-nix</option>
@@ -336,6 +358,7 @@
      </para>
     </listitem>
    </varlistentry>
+
    <varlistentry>
     <term>
      <option>--fast</option>
@@ -349,6 +372,7 @@
      </para>
     </listitem>
    </varlistentry>
+
    <varlistentry>
     <term>
      <option>--rollback</option>
@@ -363,6 +387,7 @@
      </para>
     </listitem>
    </varlistentry>
+
    <varlistentry>
     <term>
      <option>--builders</option> <replaceable>builder-spec</replaceable>
@@ -382,6 +407,7 @@
      </para>
     </listitem>
    </varlistentry>
+
    <varlistentry>
     <term>
      <option>--profile-name</option>
@@ -412,6 +438,7 @@
      </para>
     </listitem>
    </varlistentry>
+
    <varlistentry>
     <term>
      <option>--build-host</option>
@@ -437,6 +464,7 @@
      </para>
     </listitem>
    </varlistentry>
+
    <varlistentry>
     <term>
      <option>--target-host</option>
@@ -449,6 +477,7 @@
       be accessible over ssh, and for the commands <option>switch</option>,
       <option>boot</option> and <option>test</option> you need root access.
      </para>
+
      <para>
       If <option>--build-host</option> is not explicitly specified,
       <option>--build-host</option> will implicitly be set to the same value as
@@ -457,6 +486,7 @@
       place remotely (and no build artifacts will be copied to the local
       machine).
      </para>
+
      <para>
       You can include a remote user name in the host name
       (<replaceable>user@host</replaceable>). You can also set ssh options by
@@ -465,6 +495,7 @@
     </listitem>
    </varlistentry>
   </variablelist>
+
   <para>
    In addition, <command>nixos-rebuild</command> accepts various Nix-related
    flags, including <option>--max-jobs</option> / <option>-j</option>,
@@ -473,8 +504,10 @@
    <option>-v</option>. See the Nix manual for details.
   </para>
  </refsection>
+
  <refsection>
   <title>Environment</title>
+
   <variablelist>
    <varlistentry>
     <term>
@@ -487,6 +520,7 @@
      </para>
     </listitem>
    </varlistentry>
+
    <varlistentry>
     <term>
      <envar>NIX_SSHOPTS</envar>
@@ -500,9 +534,12 @@
    </varlistentry>
   </variablelist>
  </refsection>
+
  <refsection>
   <title>Files</title>
+
   <variablelist>
+
    <varlistentry>
     <term>
      <filename>/run/current-system</filename>
@@ -513,6 +550,7 @@
      </para>
     </listitem>
    </varlistentry>
+
    <varlistentry>
     <term>
      <filename>/nix/var/nix/profiles/system</filename>
@@ -524,8 +562,10 @@
      </para>
     </listitem>
    </varlistentry>
+
   </variablelist>
  </refsection>
+
  <refsection>
   <title>Bugs</title>
   <para>
-- 
GitLab


From 046ea6d08fce7bdc6360905adafae793310edfc2 Mon Sep 17 00:00:00 2001
From: Sebastian Ullrich <sebasti@nullri.ch>
Date: Mon, 16 Sep 2019 14:48:32 +0200
Subject: [PATCH 0346/2254] ccacheWrapper: make usable with clang

Override original `wrapCCWith` call to preserve essential arguments
---
 pkgs/top-level/all-packages.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3114319dec4..7668880edbf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9278,8 +9278,11 @@ in
   #     };
   # You can use a different directory, but whichever directory you choose
   # should be owned by user root, group nixbld with permissions 0770.
-  ccacheWrapper = makeOverridable ({ extraConfig ? "", unwrappedCC ? stdenv.cc.cc }:
-     wrapCC (ccache.links {inherit unwrappedCC extraConfig;})) {};
+  ccacheWrapper = makeOverridable ({ extraConfig ? "", cc ? stdenv.cc }:
+    cc.override { cc = ccache.links {
+      inherit extraConfig;
+      unwrappedCC = cc.cc;
+    }; }) {};
   ccacheStdenv = lowPrio (overrideCC stdenv buildPackages.ccacheWrapper);
 
   cccc = callPackage ../development/tools/analysis/cccc { };
-- 
GitLab


From 5867ab84db9d18bca434cff41be6bc5750f0ae95 Mon Sep 17 00:00:00 2001
From: David Wood <david@davidtw.co>
Date: Mon, 16 Sep 2019 14:47:15 +0100
Subject: [PATCH 0347/2254] franz: 5.3.1 -> 5.3.2

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

diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix
index 9a4ab636c5f..4ebb5bf86cb 100644
--- a/pkgs/applications/networking/instant-messengers/franz/default.nix
+++ b/pkgs/applications/networking/instant-messengers/franz/default.nix
@@ -3,13 +3,13 @@
 , gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }:
 
 let
-  version = "5.3.1";
+  version = "5.3.2";
 in stdenv.mkDerivation {
   pname = "franz";
   inherit version;
   src = fetchurl {
     url = "https://github.com/meetfranz/franz/releases/download/v${version}/franz_${version}_amd64.deb";
-    sha256 = "16ssg4cjjmq3cps8klyx3jxqma7f83cczwjnknlfqglrwwdpnb5d";
+    sha256 = "19mfw0wgjdhq38p0xvixdxvk07j3rdwlw87p8gjh4yi1qv0paj4i";
   };
 
   # don't remove runtime deps
-- 
GitLab


From 6bdaca51e80b2759f2d3c9ed298b0963eac16461 Mon Sep 17 00:00:00 2001
From: Craig Hall <ch9871@gmail.com>
Date: Thu, 1 Aug 2019 12:52:11 +0100
Subject: [PATCH 0348/2254] neovim: sort lists alphabetically

---
 pkgs/applications/editors/neovim/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix
index 7d558dfb893..8c39eed8a4a 100644
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@@ -13,7 +13,7 @@ with stdenv.lib;
 
 let
   neovimLuaEnv = lua.withPackages(ps:
-    (with ps; [ mpack lpeg luabitop ]
+    (with ps; [ lpeg luabitop mpack ]
     ++ optionals doCheck [
         nvim-client luv coxpcall busted luafilesystem penlight inspect
       ]
@@ -41,14 +41,14 @@ in
     enableParallelBuilding = true;
 
     buildInputs = [
+      gperf
       libtermkey
       libuv
+      libvterm-neovim
       msgpack
       ncurses
-      libvterm-neovim
-      unibilium
-      gperf
       neovimLuaEnv
+      unibilium
     ] ++ optional withJemalloc jemalloc
       ++ optional stdenv.isDarwin libiconv
       ++ optionals doCheck [ glibcLocales procps ]
@@ -77,8 +77,8 @@ in
     disallowedReferences = [ stdenv.cc ];
 
     cmakeFlags = [
-      "-DLUA_PRG=${neovimLuaEnv.interpreter}"
       "-DGPERF_PRG=${gperf}/bin/gperf"
+      "-DLUA_PRG=${neovimLuaEnv.interpreter}"
     ]
     ++ optional doCheck "-DBUSTED_PRG=${neovimLuaEnv}/bin/busted"
     ++ optional (!lua.pkgs.isLuaJIT) "-DPREFER_LUA=ON"
-- 
GitLab


From 968f357f9acee995bfe9c850e6baf085b26eb6b9 Mon Sep 17 00:00:00 2001
From: Koki Yasuno <lattfein@gmail.com>
Date: Mon, 16 Sep 2019 09:33:15 +0900
Subject: [PATCH 0349/2254] appimageTools: add at-spi2-core to multiPkgs

---
 pkgs/build-support/appimage/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix
index 1f84403c10f..9e55d1172cb 100644
--- a/pkgs/build-support/appimage/default.nix
+++ b/pkgs/build-support/appimage/default.nix
@@ -189,6 +189,7 @@ rec {
       # libraries not on the upstream include list, but nevertheless expected
       # by at least one appimage
       libtool.lib # for Synfigstudio
+      at-spi2-core
     ];
   };
 }
-- 
GitLab


From bd65f5e4dbf0551212a2121946f3b0db3cfe1b18 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 14 Sep 2019 22:47:35 -0500
Subject: [PATCH 0350/2254] linuxPackages*.turbostat: init

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

diff --git a/pkgs/os-specific/linux/turbostat/default.nix b/pkgs/os-specific/linux/turbostat/default.nix
new file mode 100644
index 00000000000..10074f490b8
--- /dev/null
+++ b/pkgs/os-specific/linux/turbostat/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, kernel }:
+
+stdenv.mkDerivation {
+  pname = "turbostat";
+  inherit (kernel) src version;
+
+  makeFlags = [ "PREFIX=${placeholder "out"}" ];
+
+  postPatch = ''
+    cd tools/power/x86/turbostat
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Report processor frequency and idle statistics";
+    homepage = https://www.kernel.org/;
+    license = licenses.gpl2;
+    platforms = [ "i686-linux" "x86_64-linux" ]; # x86-specific
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7668880edbf..22e2ca9437e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15876,6 +15876,8 @@ in
 
     tp_smapi = callPackage ../os-specific/linux/tp_smapi { };
 
+    turbostat = callPackage ../os-specific/linux/turbostat { };
+
     usbip = callPackage ../os-specific/linux/usbip { };
 
     v86d = callPackage ../os-specific/linux/v86d { };
-- 
GitLab


From 08466b346730c85eb2005ebe3357ff9ac4a97e27 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 14 Sep 2019 22:44:55 -0500
Subject: [PATCH 0351/2254] linuxPackages*.intel-speed-select (5.3+)

---
 .../linux/intel-speed-select/default.nix      | 20 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/os-specific/linux/intel-speed-select/default.nix

diff --git a/pkgs/os-specific/linux/intel-speed-select/default.nix b/pkgs/os-specific/linux/intel-speed-select/default.nix
new file mode 100644
index 00000000000..cf0dd75a8a4
--- /dev/null
+++ b/pkgs/os-specific/linux/intel-speed-select/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, kernel }:
+
+stdenv.mkDerivation {
+  pname = "intel-speed-select";
+  inherit (kernel) src version;
+
+  makeFlags = [ "bindir=${placeholder "out"}/bin" ];
+
+  postPatch = ''
+    cd tools/power/x86/intel-speed-select
+    sed -i 's,/usr,,g' Makefile
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Tool to enumerate and control the Intel Speed Select Technology features";
+    homepage = https://www.kernel.org/;
+    license = licenses.gpl2;
+    platforms = [ "i686-linux" "x86_64-linux" ]; # x86-specific
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7668880edbf..02e4a373d5e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15795,6 +15795,8 @@ in
 
     e1000e = if stdenv.lib.versionOlder kernel.version "4.10" then  callPackage ../os-specific/linux/e1000e {} else null;
 
+    intel-speed-select = if stdenv.lib.versionAtLeast kernel.version "5.3" then callPackage ../os-specific/linux/intel-speed-select { } else null;
+
     ixgbevf = callPackage ../os-specific/linux/ixgbevf {};
 
     it87 = callPackage ../os-specific/linux/it87 {};
-- 
GitLab


From 8166bc934b254d61ea059f63764632fc2785d9da Mon Sep 17 00:00:00 2001
From: Nick Spinale <nick@nickspinale.com>
Date: Tue, 10 Sep 2019 23:02:19 +0000
Subject: [PATCH 0352/2254] build-support/docker: set default image arch to
 host arch

The architecture of an image should default to the architecture for
which that image is being composed or pulled. buildPackages.go.GOARCH is
an easy way to compute that architecture with the correct terminology.
---
 pkgs/build-support/docker/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index 83e21c8945d..37b25232b96 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -1,4 +1,5 @@
 {
+  buildPackages,
   cacert,
   callPackage,
   closureInfo,
@@ -47,7 +48,7 @@ rec {
     , imageDigest
     , sha256
     , os ? "linux"
-    , arch ? "amd64"
+    , arch ? buildPackages.go.GOARCH
 
       # This is used to set name to the pulled image
     , finalImageName ? imageName
@@ -540,7 +541,7 @@ rec {
       configJson = let
           pure = writeText "${baseName}-config.json" (builtins.toJSON {
             inherit created config;
-            architecture = "amd64";
+            architecture = buildPackages.go.GOARCH;
             os = "linux";
           });
           impure = runCommand "${baseName}-standard-dynamic-date.json"
@@ -658,7 +659,7 @@ rec {
       baseJson = let
           pure = writeText "${baseName}-config.json" (builtins.toJSON {
             inherit created config;
-            architecture = "amd64";
+            architecture = buildPackages.go.GOARCH;
             os = "linux";
           });
           impure = runCommand "${baseName}-config.json"
-- 
GitLab


From 25fb1e59d61b735f2e7c759c37feb449ce7eb8ae Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Mon, 16 Sep 2019 16:28:34 +0200
Subject: [PATCH 0353/2254] nixpkgs-fmt: 0.5.0 -> 0.6.0

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

diff --git a/pkgs/tools/nix/nixpkgs-fmt/default.nix b/pkgs/tools/nix/nixpkgs-fmt/default.nix
index 7ac73fac39e..6c5f0660d12 100644
--- a/pkgs/tools/nix/nixpkgs-fmt/default.nix
+++ b/pkgs/tools/nix/nixpkgs-fmt/default.nix
@@ -1,13 +1,13 @@
 { lib, rustPlatform, fetchFromGitHub }:
 rustPlatform.buildRustPackage rec {
   pname = "nixpkgs-fmt";
-  version = "0.5.0";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = pname;
     rev = "v${version}";
-    sha256 = "07hnyx616dk03md00pmgpb5c2sp9w0n5l94s82arair0kpi0ncy0";
+    sha256 = "18kvsgl3kpla33dp1nbpd1kdgndfqcmlwwpjls55fp4mlczf8lcx";
   };
 
   cargoSha256 = "0wfx7shsdqrwbnzr2a0fnly1kd93mxbm96zjq5pzrq94lphkhqhz";
-- 
GitLab


From 7f9a12014750b39481170929ee9c60bda0e2fc1f Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 16 Sep 2019 09:04:07 -0500
Subject: [PATCH 0354/2254] elfinfo: 0.7.5 -> 0.7.6

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

diff --git a/pkgs/development/tools/misc/elfinfo/default.nix b/pkgs/development/tools/misc/elfinfo/default.nix
index 23c01338f60..cb127906c0b 100644
--- a/pkgs/development/tools/misc/elfinfo/default.nix
+++ b/pkgs/development/tools/misc/elfinfo/default.nix
@@ -1,17 +1,19 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 
-buildGoPackage rec {
+buildGoModule rec {
   pname = "elfinfo";
-  version = "0.7.5";
+  version = "0.7.6";
 
   goPackagePath = "github.com/xyproto/elfinfo";
   src = fetchFromGitHub {
     rev = version;
     owner = "xyproto";
     repo = "elfinfo";
-    sha256 = "0b6zyfq0yhpbf03h52q2lgf6ff086gcsbnhm6chx18h0q1g17m96";
+    sha256 = "0f6ik4d157assxdfslnyc91mg70kfh396rapikfv473znx2v2pg9";
   };
 
+  modSha256 = "1xr0pylaqcb4f4g862120cgqdxp0bpwsk77zd6g7kk91lqdcvsdf";
+
   meta = with stdenv.lib; {
     description = "Small utility for showing information about ELF files";
     homepage = https://elfinfo.roboticoverlords.org/;
-- 
GitLab


From 2ff3620d0dcd8dbb61d14cafba01f4ca47acd8bb Mon Sep 17 00:00:00 2001
From: Jeroen de Haas <jeroendehaas@users.noreply.github.com>
Date: Mon, 16 Sep 2019 16:39:52 +0200
Subject: [PATCH 0355/2254] fmt: 5.3.0 -> 6.0.0 (#68168)

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

diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix
index 796861a3065..fd35b697d7c 100644
--- a/pkgs/development/libraries/fmt/default.nix
+++ b/pkgs/development/libraries/fmt/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, cmake, enableShared ? true }:
 
 stdenv.mkDerivation rec {
-  version = "5.3.0";
+  version = "6.0.0";
   pname = "fmt";
 
   src = fetchFromGitHub {
     owner = "fmtlib";
     repo = "fmt";
     rev = version;
-    sha256 = "1hl9s69a5ql5nckc0ifh2fzlgsgv1wsn6yhqkpnrhasqkhj0hgv4";
+    sha256 = "0yfrw6by4h27k3psv9x1q7z2kdbz7pkwxidr494bpa6ppglij6ba";
   };
 
   outputs = [ "out" "dev" ];
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   doCheck = true;
-  # preCheckHook ensures the test binaries can find libfmt.so.5
+  # preCheckHook ensures the test binaries can find libfmt.so
   preCheck = if enableShared
              then "export LD_LIBRARY_PATH=\"$PWD\""
              else "";
-- 
GitLab


From b9ed9c7fed0d1aeae42ac382d6fefff65563e81d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 16 Sep 2019 16:49:33 +0200
Subject: [PATCH 0356/2254] Typo

---
 nixos/modules/system/activation/activation-script.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix
index 74c150a848d..ddfd1af4a31 100644
--- a/nixos/modules/system/activation/activation-script.nix
+++ b/nixos/modules/system/activation/activation-script.nix
@@ -218,7 +218,7 @@ in
 
     systemd.user = {
       services.nixos-activation = {
-        description = "Run user specific NixOS activation";
+        description = "Run user-specific NixOS activation";
         script = config.system.userActivationScripts.script;
         unitConfig.ConditionUser = "!@system";
         serviceConfig.Type = "oneshot";
-- 
GitLab


From b20a0e49c8c0d5c84b917bfbbe3f2ead31886a67 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 16 Sep 2019 16:51:19 +0200
Subject: [PATCH 0357/2254] Revert systemd interface version to 2

The new systemd in 19.09 gives an "Access Denied" error when doing
"systemctl daemon-reexec" on an 19.03 system. The fix is to use the
previous systemctl to signal the daemon to re-exec itself. This
ensures that users don't have to reboot when upgrading from NixOS
19.03 to 19.09.
---
 .../activation/switch-to-configuration.pl     | 19 +++++++++++++------
 pkgs/os-specific/linux/systemd/default.nix    |  2 +-
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl
index 8ff00fa11dc..641cf9faadc 100644
--- a/nixos/modules/system/activation/switch-to-configuration.pl
+++ b/nixos/modules/system/activation/switch-to-configuration.pl
@@ -10,6 +10,9 @@ use Cwd 'abs_path';
 
 my $out = "@out@";
 
+# FIXME: maybe we should use /proc/1/exe to get the current systemd.
+my $curSystemd = abs_path("/run/current-system/sw/bin");
+
 # To be robust against interruption, record what units need to be started etc.
 my $startListFile = "/run/systemd/start-list";
 my $restartListFile = "/run/systemd/restart-list";
@@ -267,7 +270,7 @@ while (my ($unit, $state) = each %{$activePrev}) {
 sub pathToUnitName {
     my ($path) = @_;
     # Use current version of systemctl binary before daemon is reexeced.
-    open my $cmd, "-|", "/run/current-system/sw/bin/systemd-escape", "--suffix=mount", "-p", $path
+    open my $cmd, "-|", "$curSystemd/systemd-escape", "--suffix=mount", "-p", $path
         or die "Unable to escape $path!\n";
     my $escaped = join "", <$cmd>;
     chomp $escaped;
@@ -370,7 +373,7 @@ if (scalar (keys %unitsToStop) > 0) {
     print STDERR "stopping the following units: ", join(", ", @unitsToStopFiltered), "\n"
         if scalar @unitsToStopFiltered;
     # Use current version of systemctl binary before daemon is reexeced.
-    system("/run/current-system/sw/bin/systemctl", "stop", "--", sort(keys %unitsToStop)); # FIXME: ignore errors?
+    system("$curSystemd/systemctl", "stop", "--", sort(keys %unitsToStop)); # FIXME: ignore errors?
 }
 
 print STDERR "NOT restarting the following changed units: ", join(", ", sort(keys %unitsToSkip)), "\n"
@@ -382,10 +385,12 @@ my $res = 0;
 print STDERR "activating the configuration...\n";
 system("$out/activate", "$out") == 0 or $res = 2;
 
-# Restart systemd if necessary.
+# Restart systemd if necessary. Note that this is done using the
+# current version of systemd, just in case the new one has trouble
+# communicating with the running pid 1.
 if ($restartSystemd) {
     print STDERR "restarting systemd...\n";
-    system("@systemd@/bin/systemctl", "daemon-reexec") == 0 or $res = 2;
+    system("$curSystemd/systemctl", "daemon-reexec") == 0 or $res = 2;
 }
 
 # Forget about previously failed services.
@@ -401,8 +406,10 @@ while (my $f = <$listActiveUsers>) {
     my ($uid, $name) = ($+{uid}, $+{user});
     print STDERR "reloading user units for $name...\n";
 
-    system("@su@", "-s", "@shell@", "-l", $name, "-c", "XDG_RUNTIME_DIR=/run/user/$uid @systemd@/bin/systemctl --user daemon-reload");
-    system("@su@", "-s", "@shell@", "-l", $name, "-c", "XDG_RUNTIME_DIR=/run/user/$uid @systemd@/bin/systemctl --user start nixos-activation.service");
+    system("@su@", "-s", "@shell@", "-l", $name, "-c",
+           "export XDG_RUNTIME_DIR=/run/user/$uid; " .
+           "$curSystemd/systemctl --user daemon-reexec; " .
+           "@systemd@/bin/systemctl --user start nixos-activation.service");
 }
 
 close $listActiveUsers;
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 90b33e183ce..083166848f2 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -223,7 +223,7 @@ in stdenv.mkDerivation {
   # in a backwards-incompatible way.  If the interface version of two
   # systemd builds is the same, then we can switch between them at
   # runtime; otherwise we can't and we need to reboot.
-  passthru.interfaceVersion = 3;
+  passthru.interfaceVersion = 2;
 
   meta = with stdenv.lib; {
     homepage = http://www.freedesktop.org/wiki/Software/systemd;
-- 
GitLab


From bbf0e8aa3cae7bec88ba28b8db6402d066dacf5a Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 16 Sep 2019 09:05:14 -0500
Subject: [PATCH 0358/2254] mediainfo,mediainfo-gui,libmediainfo: 19.07 ->
 19.09

---
 pkgs/applications/misc/mediainfo-gui/default.nix    | 4 ++--
 pkgs/applications/misc/mediainfo/default.nix        | 4 ++--
 pkgs/development/libraries/libmediainfo/default.nix | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix
index 9eb4a0897d4..b84bc08ddb3 100644
--- a/pkgs/applications/misc/mediainfo-gui/default.nix
+++ b/pkgs/applications/misc/mediainfo-gui/default.nix
@@ -2,11 +2,11 @@
 , desktop-file-utils, libSM, imagemagick }:
 
 stdenv.mkDerivation rec {
-  version = "19.07";
+  version = "19.09";
   pname = "mediainfo-gui";
   src = fetchurl {
     url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
-    sha256 = "0b2ypdlpj5v64ggqk628mgqraba27z725sa0zf0fa4agxhf9ka44";
+    sha256 = "1a2ssklg12sjsw09y8my9kf35mizi3zj7w002nspcmw28apb1x82";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix
index 98d5ef72b22..f084d17e389 100644
--- a/pkgs/applications/misc/mediainfo/default.nix
+++ b/pkgs/applications/misc/mediainfo/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, zlib }:
 
 stdenv.mkDerivation rec {
-  version = "19.07";
+  version = "19.09";
   pname = "mediainfo";
   src = fetchurl {
     url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
-    sha256 = "0b2ypdlpj5v64ggqk628mgqraba27z725sa0zf0fa4agxhf9ka44";
+    sha256 = "1a2ssklg12sjsw09y8my9kf35mizi3zj7w002nspcmw28apb1x82";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix
index adf856544c4..92fe81c73f4 100644
--- a/pkgs/development/libraries/libmediainfo/default.nix
+++ b/pkgs/development/libraries/libmediainfo/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, zlib }:
 
 stdenv.mkDerivation rec {
-  version = "19.07";
+  version = "19.09";
   pname = "libmediainfo";
   src = fetchurl {
     url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz";
-    sha256 = "0k3d7mha1lay2s09crc9z9zr970l617lb0c3b35wl44flkqf7jss";
+    sha256 = "13j7by2czapzi6qznxj4nmn3hwiyglcf2ypja4n6zgnz96jf21pz";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
-- 
GitLab


From cc2bca78e29eaf86fb758620af3307035d8ea13c Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 16 Sep 2019 09:01:58 -0500
Subject: [PATCH 0359/2254] gcalcli: 4.1.1 -> 4.2.0

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

diff --git a/pkgs/applications/misc/gcalcli/default.nix b/pkgs/applications/misc/gcalcli/default.nix
index 6f380114a27..8381f182e5d 100644
--- a/pkgs/applications/misc/gcalcli/default.nix
+++ b/pkgs/applications/misc/gcalcli/default.nix
@@ -5,13 +5,13 @@ with python3.pkgs;
 
 buildPythonApplication rec {
   pname = "gcalcli";
-  version = "4.1.1";
+  version = "4.2.0";
 
   src = fetchFromGitHub {
     owner  = "insanum";
     repo   = pname;
     rev    = "v${version}";
-    sha256 = "1qlmslywm4dfimggly4p0ckn2gj165mq1p0wkry9jpb3sg1m5fdf";
+    sha256 = "0746vmhfclkpkqnyaidxid2z20mlv86hv0pjxy1qglrja91vkd72";
   };
 
   postPatch = lib.optionalString stdenv.isLinux ''
-- 
GitLab


From c63dba2025280215767773b2aac94d93427f086e Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sun, 15 Sep 2019 15:45:12 -0500
Subject: [PATCH 0360/2254] xorg.libXfont2: 2.0.3 -> 2.0.4

https://lists.x.org/archives/xorg-announce/2019-September/003022.html
---
 pkgs/servers/x11/xorg/default.nix   | 6 +++---
 pkgs/servers/x11/xorg/tarballs.list | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index e752f3ad834..ba203f57e48 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -872,11 +872,11 @@ lib.makeScope newScope (self: with self; {
   }) {};
 
   libXfont2 = callPackage ({ stdenv, pkgconfig, fetchurl, libfontenc, xorgproto, freetype, xtrans, zlib }: stdenv.mkDerivation {
-    name = "libXfont2-2.0.3";
+    name = "libXfont2-2.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libXfont2-2.0.3.tar.bz2;
-      sha256 = "0klwmimmhm3axpj8pwn5l41lbggh47r5aazhw63zxkbwfgyvg2hf";
+      url = mirror://xorg/individual/lib/libXfont2-2.0.4.tar.bz2;
+      sha256 = "1rk9pjxcm01lbr1dxhnvk4f2qrn6zp068qjbvvz5w0z5d0rin5bd";
     };
     hardeningDisable = [ "bindnow" "relro" ];
     nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 05b035197c1..ed6b38c7dfc 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -188,7 +188,7 @@ mirror://xorg/individual/lib/libXdmcp-1.1.3.tar.bz2
 mirror://xorg/individual/lib/libXext-1.3.4.tar.bz2
 mirror://xorg/individual/lib/libXfixes-5.0.3.tar.bz2
 mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2
-mirror://xorg/individual/lib/libXfont2-2.0.3.tar.bz2
+mirror://xorg/individual/lib/libXfont2-2.0.4.tar.bz2
 mirror://xorg/individual/lib/libXft-2.3.3.tar.bz2
 mirror://xorg/individual/lib/libXi-1.7.10.tar.bz2
 mirror://xorg/individual/lib/libXinerama-1.1.4.tar.bz2
-- 
GitLab


From 769487362f4a75e126298bcc020fe6492e943d1e Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sun, 15 Sep 2019 15:36:16 -0500
Subject: [PATCH 0361/2254] nsjail: 2.8 -> 2.9

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

diff --git a/pkgs/tools/security/nsjail/default.nix b/pkgs/tools/security/nsjail/default.nix
index 3f04d276489..f1335a1ad1d 100644
--- a/pkgs/tools/security/nsjail/default.nix
+++ b/pkgs/tools/security/nsjail/default.nix
@@ -4,14 +4,14 @@
 
 stdenv.mkDerivation rec {
   pname = "nsjail";
-  version = "2.8";
+  version = "2.9";
 
   src = fetchFromGitHub {
     owner           = "google";
     repo            = "nsjail";
     rev             = version;
     fetchSubmodules = true;
-    sha256          = "0cgycj0cz74plmz4asxryqprg6mkzpmnxzqbfsp1wwackinxq5fq";
+    sha256          = "0218n0qjb45fawqqfj3gdxgd0fw5k0vxn9iggi0ciljmr9zywkgh";
   };
 
   postPatch = ''
-- 
GitLab


From b558ca80e461bbf632aa0920a675394e823bbc2e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 16 Sep 2019 16:59:19 +0200
Subject: [PATCH 0362/2254] shotcut: update version 19.08.16 to 19.09.14

Changelog is at https://shotcut.org/blog/new-release-190914/.
---
 pkgs/applications/video/shotcut/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix
index 176c4be4946..c41ba899ddd 100644
--- a/pkgs/applications/video/shotcut/default.nix
+++ b/pkgs/applications/video/shotcut/default.nix
@@ -7,13 +7,13 @@ assert stdenv.lib.versionAtLeast mlt.version "6.8.0";
 
 mkDerivation rec {
   pname = "shotcut";
-  version = "19.08.16";
+  version = "19.09.14";
 
   src = fetchFromGitHub {
     owner = "mltframework";
     repo = "shotcut";
     rev = "v${version}";
-    sha256 = "0alnnfgimfs8fjddkcfx4pzyijwz5dgnqic5qazaza6f4kf60801";
+    sha256 = "1cl8ba1n0h450r4n5mfqmyjaxvczs3m19blwxslqskvmxy5my3cn";
   };
 
   enableParallelBuilding = true;
@@ -36,7 +36,7 @@ mkDerivation rec {
 
   qtWrapperArgs = [
     "--prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1"
-    "--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [jack1 SDL2 ]}"
+    "--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [jack1 SDL2]}"
     "--prefix PATH : ${mlt}/bin"
     ];
 
-- 
GitLab


From 3eb894e55b194e925743b445bd3e932c57f4aa3f Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 14 Sep 2019 13:02:14 -0500
Subject: [PATCH 0363/2254] stress-ng: 0.10.02 -> 0.10.05

---
 pkgs/tools/system/stress-ng/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix
index 9a9879d5564..d5b9b0fb73a 100644
--- a/pkgs/tools/system/stress-ng/default.nix
+++ b/pkgs/tools/system/stress-ng/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "stress-ng";
-  version = "0.10.02";
+  version = "0.10.05";
 
   src = fetchurl {
     url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "100daxz0j80jhmpfnqa78mvfwq1qj7zb67y7w9f747a0f1havvim";
+    sha256 = "0hkghs99fl8kzg3lkkd4w6cj5133zr9a415py0ng60kzrfffmgdy";
   };
 
   # All platforms inputs then Linux-only ones
-- 
GitLab


From c6af7bf1acb0149dbd8564da689bdfb30c01937a Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 14 Sep 2019 13:01:52 -0500
Subject: [PATCH 0364/2254] wireguard: 0.0.20190702 -> 0.0.20190913

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

diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix
index ef6b0d5c641..bd17fa054d3 100644
--- a/pkgs/tools/networking/wireguard-tools/default.nix
+++ b/pkgs/tools/networking/wireguard-tools/default.nix
@@ -13,11 +13,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "wireguard-tools";
-  version = "0.0.20190702";
+  version = "0.0.20190913";
 
   src = fetchzip {
     url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
-    sha256 = "1xl4hzqrny3855s7h1k24py81gdjyfv0mhv6y528f6p0h38r89s3";
+    sha256 = "08ns5d6xbl0qylb98mml0yh0yp837a1sm3hvpra21by1dvx8k0dg";
   };
 
   sourceRoot = "source/src/tools";
-- 
GitLab


From c8c6d91b22ac9e7ade783662d41111c0e55147d2 Mon Sep 17 00:00:00 2001
From: David Wood <david@davidtw.co>
Date: Mon, 16 Sep 2019 16:19:42 +0100
Subject: [PATCH 0365/2254] maintainers: Add `davidtwco`

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 058561eb624..6ba7937211d 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1480,6 +1480,16 @@
     github = "davidrusu";
     name = "David Rusu";
   };
+  davidtwco = {
+    email = "nix@david.davidtw.co";
+    github = "davidtwco";
+    githubId = 1295100;
+    name = "David Wood";
+    keys = [{
+      longkeyid = "rsa4096/0x01760B4F9F53F154";
+      fingerprint = "5B08 313C 6853 E5BF FA91  A817 0176 0B4F 9F53 F154";
+    }];
+  };
   davorb = {
     email = "davor@davor.se";
     github = "davorb";
-- 
GitLab


From d857d1628f4a7f09632cc325bddc2e347aa8fda3 Mon Sep 17 00:00:00 2001
From: David Wood <david@davidtw.co>
Date: Mon, 16 Sep 2019 16:27:13 +0100
Subject: [PATCH 0366/2254] starship: 0.15.0 -> 0.17.0

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

diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix
index c51bf998b32..5d571e0c022 100644
--- a/pkgs/tools/misc/starship/default.nix
+++ b/pkgs/tools/misc/starship/default.nix
@@ -2,19 +2,19 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "starship";
-  version = "0.15.0";
+  version = "0.17.0";
 
   src = fetchFromGitHub {
     owner = "starship";
     repo = "starship";
     rev = "v${version}";
-    sha256 = "164qxbzlzg53xicp2n5kg9qbmvlckc6rk78n69s82d2d09mbq1ks";
+    sha256 = "0vlpvacay25dzb5wix9jd91j0j1nrwz4k8zglj7210mhabfpnxvb";
   };
 
   buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ];
   nativeBuildInputs = [ pkgconfig ];
 
-  cargoSha256 = "192lq0wf8c2p3s4n6c0xr02hwyswypxypimbghi4m8f3fgj2l3ig";
+  cargoSha256 = "0p16pa9psbj9126b4p61l0skmmasp2ms6c6r5rh3dfr8gg77qzpa";
   checkPhase = "cargo test -- --skip directory::home_directory --skip directory::directory_in_root";
 
   meta = with stdenv.lib; {
-- 
GitLab


From 11d71d18f6974918160846c93aabd445e40f5cd9 Mon Sep 17 00:00:00 2001
From: Lorenzo Manacorda <lorenzo@mailbox.org>
Date: Mon, 16 Sep 2019 17:43:19 +0200
Subject: [PATCH 0367/2254] electrum-ltc: remove asymmetric from maintainers

Not using the application anymore.
---
 pkgs/applications/misc/electrum/ltc.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix
index 0a28efbc28c..88f44c6cc85 100644
--- a/pkgs/applications/misc/electrum/ltc.nix
+++ b/pkgs/applications/misc/electrum/ltc.nix
@@ -51,7 +51,7 @@ python3Packages.buildPythonApplication rec {
     homepage = https://electrum-ltc.org/;
     license = licenses.mit;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ asymmetric ];
+    maintainers = with maintainers; [ ];
   };
 }
 
-- 
GitLab


From 61c9725ff4ec873ae1c51864a57c8569debfcc86 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 16 Sep 2019 16:06:28 +0000
Subject: [PATCH 0368/2254] ocamlPackages.cryptokit: fix installation of shared
 libraries

Fixes #68874
---
 pkgs/development/ocaml-modules/cryptokit/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/ocaml-modules/cryptokit/default.nix b/pkgs/development/ocaml-modules/cryptokit/default.nix
index 8180373a3dd..8181433e1ee 100644
--- a/pkgs/development/ocaml-modules/cryptokit/default.nix
+++ b/pkgs/development/ocaml-modules/cryptokit/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
 
   buildFlags = "setup.data build";
 
-  preBuild = "mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/cryptokit";
+  preBuild = "mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs";
 
   meta = {
     homepage = http://pauillac.inria.fr/~xleroy/software.html;
-- 
GitLab


From 2173d4756006494ab5f276bea99af9f2f4678d50 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 16 Sep 2019 16:06:35 +0000
Subject: [PATCH 0369/2254] ocamlPackages.ocsigen_server: fix loading of shared
 libraries

---
 pkgs/development/ocaml-modules/ocsigen-server/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix
index 9499bff84a1..df484b230c2 100644
--- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix
+++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   ''
   rm -rf $out/var/run
   wrapProgram $out/bin/ocsigenserver \
-    --prefix CAML_LD_LIBRARY_PATH : "${mkpath ssl "ssl"}:${mkpath ocamlnet "netsys"}:${mkpath ocamlnet "netstring"}:${mkpath ocaml_pcre "pcre"}:${mkpath cryptokit "cryptokit"}:${mkpath ocaml_sqlite3 "sqlite3"}"
+    --prefix CAML_LD_LIBRARY_PATH : "$CAML_LD_LIBRARY_PATH:${mkpath ssl "ssl"}:${mkpath ocamlnet "netsys"}:${mkpath ocamlnet "netstring"}:${mkpath ocaml_pcre "pcre"}:${mkpath ocaml_sqlite3 "sqlite3"}"
   '';
 
   dontPatchShebangs = true;
-- 
GitLab


From 8288301636baac8184e85a0b2ed7f510a8cf51cd Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 16 Sep 2019 11:49:18 +0000
Subject: [PATCH 0370/2254] =?UTF-8?q?coq=5F8=5F10:=208.10+=CE=B22=20?=
 =?UTF-8?q?=E2=86=92=208.10+=CE=B23?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/applications/science/logic/coq/default.nix | 2 +-
 pkgs/top-level/coq-packages.nix                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index a04ec0bb16c..99e9d856a71 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -28,7 +28,7 @@ let
    "8.8.2" = "1lip3xja924dm6qblisk1bk0x8ai24s5xxqxphbdxj6djglj68fd";
    "8.9.0" = "1dkgdjc4n1m15m1p724hhi5cyxpqbjw6rxc5na6fl3v4qjjfnizh";
    "8.9.1" = "1xrq6mkhpq994bncmnijf8jwmwn961kkpl4mwwlv7j3dgnysrcv2";
-   "8.10+beta2" = "0jk7pwydhd17ab7ii69zvi4sgrr630q2lsxhckaj3sz55cpjlhal";
+   "8.10+beta3" = "08c7q97jyblsf7dhk8jf1fx1cp9qr3dr5s42wigx10wh7i6j7pca";
   }.${version};
   coq-version = stdenv.lib.versions.majorMinor version;
   versionAtLeast = stdenv.lib.versionAtLeast coq-version;
diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix
index d4c2c3b1e3f..cc42ff161f9 100644
--- a/pkgs/top-level/coq-packages.nix
+++ b/pkgs/top-level/coq-packages.nix
@@ -127,7 +127,7 @@ in rec {
     version = "8.9.1";
   };
   coq_8_10 = callPackage ../applications/science/logic/coq {
-    version = "8.10+beta2";
+    version = "8.10+beta3";
   };
 
   coqPackages_8_5 = mkCoqPackages coq_8_5;
-- 
GitLab


From a5460536647fdb421d89f87a23724893426004f6 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 14 Sep 2019 16:54:15 -0500
Subject: [PATCH 0371/2254] cpustat: init at 0.02.09

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

diff --git a/pkgs/os-specific/linux/cpustat/default.nix b/pkgs/os-specific/linux/cpustat/default.nix
new file mode 100644
index 00000000000..8c0d206a8d1
--- /dev/null
+++ b/pkgs/os-specific/linux/cpustat/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, lib, fetchurl, ncurses }:
+
+stdenv.mkDerivation rec {
+  pname = "cpustat";
+  version = "0.02.09";
+  src = fetchurl {
+    url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.xz";
+    sha256 = "12xahv65yrhs5r830clkl1qnwg3dnrk5qn3zsznzbv1iy2f3cj7y";
+  };
+  buildInputs = [ ncurses ];
+  installFlags = [
+    "BINDIR=${placeholder "out"}/bin"
+    "MANDIR=${placeholder "out"}/share/man/man8"
+  ];
+  meta = with lib; {
+    description = "CPU usage monitoring tool";
+    homepage = "https://kernel.ubuntu.com/~cking/cpustat/";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ dtzWill ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7668880edbf..5782a52f659 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15408,6 +15408,8 @@ in
 
   cifs-utils = callPackage ../os-specific/linux/cifs-utils { };
 
+  cpustat = callPackage ../os-specific/linux/cpustat { };
+
   cockroachdb = callPackage ../servers/sql/cockroachdb { };
 
   conky = callPackage ../os-specific/linux/conky ({
-- 
GitLab


From 467e561be0358933140f517abfa54dfdf0e211eb Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sun, 15 Sep 2019 16:51:16 -0500
Subject: [PATCH 0372/2254] power-calibrate: init at 0.01.28

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

diff --git a/pkgs/os-specific/linux/power-calibrate/default.nix b/pkgs/os-specific/linux/power-calibrate/default.nix
new file mode 100644
index 00000000000..da83a3bc357
--- /dev/null
+++ b/pkgs/os-specific/linux/power-calibrate/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, lib, fetchurl }:
+
+stdenv.mkDerivation rec {
+  pname = "power-calibrate";
+  version = "0.01.28";
+  src = fetchurl {
+    url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.gz";
+    sha256 = "1miyjs0vngzfdlsxhn5gndcalzkh28grg4m6faivvp1c6mjp794m";
+  };
+  installFlags = [
+    "BINDIR=${placeholder "out"}/bin"
+    "MANDIR=${placeholder "out"}/share/man/man8"
+  ];
+  meta = with lib; {
+    description = "Tool to calibrate power consumption";
+    homepage = "https://kernel.ubuntu.com/~cking/power-calibrate/";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ dtzWill ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7668880edbf..1b0b3bec4fa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15625,6 +15625,8 @@ in
 
   osxfuse = callPackage ../os-specific/darwin/osxfuse { };
 
+  power-calibrate = callPackage ../os-specific/linux/power-calibrate { };
+
   powerstat = callPackage ../os-specific/linux/powerstat { };
 
   smemstat = callPackage ../os-specific/linux/smemstat { };
-- 
GitLab


From 3ba36885524e6a283b75b3ae57b20be1ef23d8e3 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 14 Sep 2019 17:09:36 -0500
Subject: [PATCH 0373/2254] health-check: init at 0.03.02

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

diff --git a/pkgs/os-specific/linux/health-check/default.nix b/pkgs/os-specific/linux/health-check/default.nix
new file mode 100644
index 00000000000..e76d77a4448
--- /dev/null
+++ b/pkgs/os-specific/linux/health-check/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, lib, fetchurl, json_c, libbsd }:
+
+stdenv.mkDerivation rec {
+  pname = "health-check";
+  version = "0.03.02";
+  src = fetchurl {
+    url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.gz";
+    sha256 = "12n2qp5lrlahkgrkwy3mjm0nscz6yhhh80z4xmd2n96pn8f3d4hh";
+  };
+  buildInputs = [ json_c libbsd ];
+  makeFlags = [ "JSON_OUTPUT=y" "FNOTIFY=y" ];
+  installFlags = [
+    "BINDIR=${placeholder "out"}/bin"
+    "MANDIR=${placeholder "out"}/share/man/man8"
+  ];
+  meta = with lib; {
+    description = "Process monitoring tool";
+    homepage = "https://kernel.ubuntu.com/~cking/health-check/";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ dtzWill ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7668880edbf..8212da7c66c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15532,6 +15532,8 @@ in
 
   hdparm = callPackage ../os-specific/linux/hdparm { };
 
+  health-check = callPackage ../os-specific/linux/health-check { };
+
   hibernate = callPackage ../os-specific/linux/hibernate { };
 
   hostapd = callPackage ../os-specific/linux/hostapd { };
-- 
GitLab


From a95a53aadc3a84ff8c2660f44aa124c58da241cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Mon, 16 Sep 2019 19:22:01 +0200
Subject: [PATCH 0374/2254] Revert "pythonPackages.flaky: 3.5.3 -> 3.6.1
 (#68411)"

This reverts commit b44fca170255bf51afa1e5b7200154d7524fe8fb.
I'm moving this to the staging branch.
It's a huge rebuild (on the order of 20k jobs), and it seems like that
was not noticed, and I can't see sufficient motivation to skip ahead of
e.g. the CVE fixes we have in staging-next.
---
 .../python-modules/flaky/default.nix            | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/flaky/default.nix b/pkgs/development/python-modules/flaky/default.nix
index c4e803245d5..523e6ac53e6 100644
--- a/pkgs/development/python-modules/flaky/default.nix
+++ b/pkgs/development/python-modules/flaky/default.nix
@@ -2,29 +2,22 @@
 , buildPythonPackage
 , fetchPypi
 , mock
-, nose
 , pytest
 }:
 
 buildPythonPackage rec {
   pname = "flaky";
-  version = "3.6.1";
+  version = "3.5.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8cd5455bb00c677f787da424eaf8c4a58a922d0e97126d3085db5b279a98b698";
+    sha256 = "12bd5e41f372b2190e8d754b6e5829c2f11dbc764e10b30f57e59f829c9ca1da";
   };
 
-  checkInputs = [ mock nose pytest ];
+  buildInputs = [ mock pytest ];
 
-  checkPhase = ''
-    # based on tox.ini
-    pytest -k 'example and not options' --doctest-modules test/test_pytest/
-    pytest -k 'example and not options' test/test_pytest/
-    pytest -p no:flaky test/test_pytest/test_flaky_pytest_plugin.py
-    nosetests --with-flaky --force-flaky --max-runs 2 test/test_nose/test_nose_options_example.py
-    pytest --force-flaky --max-runs 2  test/test_pytest/test_pytest_options_example.py
-  '';
+  # waiting for feedback https://github.com/box/flaky/issues/97
+  doCheck = false;
 
   meta = with stdenv.lib; {
     homepage = https://github.com/box/flaky;
-- 
GitLab


From 31be449657de67a4593c36ef416569d4c63f97a5 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 14 Sep 2019 18:12:36 -0500
Subject: [PATCH 0375/2254] stress-ng: workaround kernel header SNAFU
 re:sysinfo, fix w/musl

---
 pkgs/tools/system/stress-ng/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix
index d5b9b0fb73a..7f7ce425fa7 100644
--- a/pkgs/tools/system/stress-ng/default.nix
+++ b/pkgs/tools/system/stress-ng/default.nix
@@ -21,6 +21,8 @@ stdenv.mkDerivation rec {
     substituteInPlace Makefile --replace "/usr" ""
   '';
 
+  NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.hostPlatform.isMusl "-D_LINUX_SYSINFO_H=1";
+
   # Won't build on i686 because the binary will be linked again in the
   # install phase without checking the dependencies. This will prevent
   # triggering the rebuild. Why this only happens on i686 remains a
-- 
GitLab


From 57a9aa53f914b54efe524bdcb2630e90dbaec4e1 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 16 Sep 2019 08:04:48 -0400
Subject: [PATCH 0376/2254] linux: 4.14.143 -> 4.14.144

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index 0a0ccaffa7d..290a17f69f6 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.14.143";
+  version = "4.14.144";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "14rxck0dd0rirj09aj4xsbylcvvfrgqxr1fx0c570dxr7kqg4d15";
+    sha256 = "0m6a0ggg6sxhpzmmbczwxpil5s0ndlvf4bd6zx4v4q50bdkq92yb";
   };
 } // (args.argsOverride or {}))
-- 
GitLab


From 572785b869c1ee0e9f69f4c04843f1633c12881a Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 16 Sep 2019 08:04:55 -0400
Subject: [PATCH 0377/2254] linux: 4.19.72 -> 4.19.73

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix
index 16277e6c85f..e1c1a260375 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.19.72";
+  version = "4.19.73";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0v8zypwyc9bcmm16hbvk092h9qnwqc0f6m61bz2ml499pnrvdz7r";
+    sha256 = "1asz4zyfw7iyg68x3h8r5pgbqpk4vpblfzcb295xmn52y9zfgdbx";
   };
 } // (args.argsOverride or {}))
-- 
GitLab


From f282e78e4b93477d959e108ad4ec21847215c29b Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 16 Sep 2019 08:04:58 -0400
Subject: [PATCH 0378/2254] linux: 4.4.192 -> 4.4.193

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index 9f03e200f1b..a256d406bbf 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.4.192";
+  version = "4.4.193";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0fwak1hrahcky1hdk4h8693rjpx65c2sqzfm1x71nhhysa6r3fig";
+    sha256 = "13iy0xyrqqagnrk7msp1qfw6xsc0dlc74dpdzki9rfsxcildxz3a";
   };
 } // (args.argsOverride or {}))
-- 
GitLab


From 9ea89fd6c7b2c059ea46ef483ec2be03f7cb5904 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 16 Sep 2019 08:05:01 -0400
Subject: [PATCH 0379/2254] linux: 4.9.192 -> 4.9.193

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index 9b91ced27d0..b43af36bca0 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.9.192";
+  version = "4.9.193";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0m4d6b5sfcx3iv0agia080fbcn9icyqzgzxp946zv93hrq6306ks";
+    sha256 = "00gx2sg0zc1xz6gs1kdkkd35gn7kjq1bjp1ydc774szsq0f0ircv";
   };
 } // (args.argsOverride or {}))
-- 
GitLab


From ef13578aacf966f482c48deb7a67cafd5e084b55 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 16 Sep 2019 08:05:04 -0400
Subject: [PATCH 0380/2254] linux: 5.2.14 -> 5.2.15

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

diff --git a/pkgs/os-specific/linux/kernel/linux-5.2.nix b/pkgs/os-specific/linux/kernel/linux-5.2.nix
index 47e57b8bb0a..27459e9ac6d 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.2.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.2.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.2.14";
+  version = "5.2.15";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "136fs0pn5acg40rlq51zl5001rk8fx01gi2ffd58cspfgx3kckf6";
+    sha256 = "0jhc70r2rygm91qifjagg1jgbpjwyyq6m8g1n5iv81l1v84i0mpb";
   };
 } // (args.argsOverride or {}))
-- 
GitLab


From 921071da08d673f34b3dcfcd6129cb2c95f54a3b Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 16 Sep 2019 09:18:32 -0400
Subject: [PATCH 0381/2254] linux: Add 5.3, linux-libre: 16791 -> 16794

Update linuxPackages_latest to 5.3
---
 pkgs/os-specific/linux/kernel/linux-5.3.nix   | 18 ++++++++++++++++++
 pkgs/os-specific/linux/kernel/linux-libre.nix |  2 +-
 pkgs/top-level/all-packages.nix               |  7 ++++++-
 3 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/os-specific/linux/kernel/linux-5.3.nix

diff --git a/pkgs/os-specific/linux/kernel/linux-5.3.nix b/pkgs/os-specific/linux/kernel/linux-5.3.nix
new file mode 100644
index 00000000000..e9cb412d8db
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/linux-5.3.nix
@@ -0,0 +1,18 @@
+{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:
+
+with stdenv.lib;
+
+buildLinux (args // rec {
+  version = "5.3";
+
+  # modDirVersion needs to be x.y.z, will automatically add .0 if needed
+  modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
+
+  # branchVersion needs to be x.y
+  extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version)));
+
+  src = fetchurl {
+    url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
+    sha256 = "1ck70ns130nqf6xy02bwm67y00yh46lhjzdajq7zzx1wa6bw7wvq";
+  };
+} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix
index ddaceb877f8..d29a2382c2a 100644
--- a/pkgs/os-specific/linux/kernel/linux-libre.nix
+++ b/pkgs/os-specific/linux/kernel/linux-libre.nix
@@ -4,7 +4,7 @@
 
     # Update this if linux_latest-libre fails to build.
     # $ curl https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/ | grep -Eo 'Revision [0-9]+'
-    rev = "16791";
+    rev = "16794";
     sha256 = "1lpaka4hs7yrpnrzfybd6radjylwvw2p4aly68pypykqs2srvm7j";
   }
 , ...
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 02e4a373d5e..f12d5257d92 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15717,6 +15717,10 @@ in
       ];
   };
 
+  linux_5_3 = callPackage ../os-specific/linux/kernel/linux-5.3.nix {
+    kernelPatches = [ kernelPatches.bridge_stp_helper ];
+  };
+
   linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix {
     kernelPatches = [
       kernelPatches.bridge_stp_helper
@@ -15911,7 +15915,7 @@ in
   linux = linuxPackages.kernel;
 
   # Update this when adding the newest kernel major version!
-  linuxPackages_latest = linuxPackages_5_2;
+  linuxPackages_latest = linuxPackages_5_3;
   linux_latest = linuxPackages_latest.kernel;
 
   # Build the kernel modules for the some of the kernels.
@@ -15922,6 +15926,7 @@ in
   linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14);
   linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19);
   linuxPackages_5_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_2);
+  linuxPackages_5_3 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_3);
 
   # When adding to this list:
   # - Update linuxPackages_latest to the latest version
-- 
GitLab


From 3fcc4441d7ab18d10694a3dce3c8644339bcaf9d Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 16 Sep 2019 14:00:15 -0400
Subject: [PATCH 0382/2254] glibc: fix cross compilation with gcc8

---
 pkgs/development/libraries/glibc/common.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index 33c8e5076da..8e8e445f017 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -19,7 +19,7 @@
 
 { stdenv, lib
 , buildPackages
-, fetchurl ? null
+, fetchurl, fetchpatch
 , linuxHeaders ? null
 , gd ? null, libpng ? null
 , bison
@@ -95,7 +95,15 @@ stdenv.mkDerivation ({
     ]
     ++ lib.optional stdenv.isx86_64 ./fix-x64-abi.patch
     ++ lib.optional stdenv.hostPlatform.isMusl ./fix-rpc-types-musl-conflicts.patch
-    ++ lib.optional stdenv.buildPlatform.isDarwin ./darwin-cross-build.patch;
+    ++ lib.optional stdenv.buildPlatform.isDarwin ./darwin-cross-build.patch
+
+    # Remove after upgrading to glibc 2.28+
+    ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) (fetchpatch {
+      url = "https://sourceware.org/git/?p=glibc.git;a=patch;h=780684eb04298977bc411ebca1eadeeba4877833";
+      name = "correct-pwent-parsing-issue-and-resulting-build.patch";
+      sha256 = "08fja894vzaj8phwfhsfik6jj2pbji7kypy3q8pgxvsd508zdv1q";
+      excludes = [ "ChangeLog" ];
+    });
 
   postPatch =
     ''
-- 
GitLab


From a41a49aa642f4ae4980b07cf4c3e7c5f4c82f88d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 16 Sep 2019 18:48:39 +0200
Subject: [PATCH 0383/2254] shotcut: fix bogus path to ffmpeg binary

---
 pkgs/applications/video/shotcut/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix
index c41ba899ddd..a50ee8b5664 100644
--- a/pkgs/applications/video/shotcut/default.nix
+++ b/pkgs/applications/video/shotcut/default.nix
@@ -30,6 +30,7 @@ mkDerivation rec {
   prePatch = ''
     sed 's_shotcutPath, "qmelt"_"${mlt}/bin/melt"_' -i src/jobs/meltjob.cpp
     sed 's_shotcutPath, "ffmpeg"_"${mlt.ffmpeg}/bin/ffmpeg"_' -i src/jobs/ffmpegjob.cpp
+    sed 's_qApp->applicationDirPath(), "ffmpeg"_"${mlt.ffmpeg}/bin/ffmpeg"_' -i src/docks/encodedock.cpp
     NICE=$(type -P nice)
     sed "s_/usr/bin/nice_''${NICE}_" -i src/jobs/meltjob.cpp src/jobs/ffmpegjob.cpp
   '';
-- 
GitLab


From 3ffd7ba6d039e5764349b680d9a5996924a62a67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miguel=20Madrid=20Menc=C3=ADa?=
 <miguel.madrid.mencia@gmail.com>
Date: Mon, 16 Sep 2019 21:04:25 +0200
Subject: [PATCH 0384/2254] gigedit: 1.1.0 -> 1.1.1

---
 pkgs/applications/audio/gigedit/default.nix       |  6 ++----
 .../gigedit/gigedit-1.1.0-pangomm-2.40.1.patch    | 15 ---------------
 2 files changed, 2 insertions(+), 19 deletions(-)
 delete mode 100644 pkgs/applications/audio/gigedit/gigedit-1.1.0-pangomm-2.40.1.patch

diff --git a/pkgs/applications/audio/gigedit/default.nix b/pkgs/applications/audio/gigedit/default.nix
index d8fada45eb1..b8ec2d7116f 100644
--- a/pkgs/applications/audio/gigedit/default.nix
+++ b/pkgs/applications/audio/gigedit/default.nix
@@ -4,15 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gigedit";
-  version = "1.1.0";
+  version = "1.1.1";
 
   src = fetchurl {
     url = "https://download.linuxsampler.org/packages/${pname}-${version}.tar.bz2";
-    sha256 = "087pc919q28r1vw31c7w4m14bqnp4md1i2wbmk8w0vmwv2cbx2ni";
+    sha256 = "08db12crwf0dy1dbyrmivqqpg5zicjikqkmf2kb1ywpq0a9hcxrb";
   };
 
-  patches = [ ./gigedit-1.1.0-pangomm-2.40.1.patch ];
-
   preConfigure = "make -f Makefile.svn";
 
   nativeBuildInputs = [ autoconf automake intltool libtool pkgconfig which ];
diff --git a/pkgs/applications/audio/gigedit/gigedit-1.1.0-pangomm-2.40.1.patch b/pkgs/applications/audio/gigedit/gigedit-1.1.0-pangomm-2.40.1.patch
deleted file mode 100644
index eb00fcc87a2..00000000000
--- a/pkgs/applications/audio/gigedit/gigedit-1.1.0-pangomm-2.40.1.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/src/gigedit/wrapLabel.cc
-+++ b/src/gigedit/wrapLabel.cc
-@@ -64,12 +64,7 @@ WrapLabel::WrapLabel(const Glib::ustring &text) // IN: The label text
-    : mWrapWidth(0),
-      mWrapHeight(0)
- {
--   // pangomm >= 2.35.1
--#if PANGOMM_MAJOR_VERSION > 2 || (PANGOMM_MAJOR_VERSION == 2 && (PANGOMM_MINOR_VERSION > 35 || (PANGOMM_MINOR_VERSION == 35 && PANGOMM_MICRO_VERSION >= 1)))
--   get_layout()->set_wrap(Pango::WrapMode::WORD_CHAR);
--#else
-    get_layout()->set_wrap(Pango::WRAP_WORD_CHAR);
--#endif
-    set_alignment(0.0, 0.0);
-    set_text(text);
- }
-- 
GitLab


From afc1e5f1a728a0b6f0dddcd5a546be82d5393fb0 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 16 Sep 2019 12:49:23 -0700
Subject: [PATCH 0385/2254] python3Packages.boltztrap2: fix build

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

diff --git a/pkgs/development/python-modules/boltztrap2/default.nix b/pkgs/development/python-modules/boltztrap2/default.nix
index a86acbb23ac..50f2023418e 100644
--- a/pkgs/development/python-modules/boltztrap2/default.nix
+++ b/pkgs/development/python-modules/boltztrap2/default.nix
@@ -23,6 +23,8 @@ buildPythonPackage rec {
     sha256 = "1hambr925ml2v2zcxnmnpi39395gl2928yac4p2kghk9xicymraw";
   };
 
+  dontUseCmakeConfigure = true;
+
   nativeBuildInputs = [ cmake cython ];
   checkInputs = [ pytest ];
   propagatedBuildInputs = [ spglib numpy scipy matplotlib ase netcdf4 ];
-- 
GitLab


From 93e25e8b00dc40a879be3a5fc11cf720a5f1ac1d Mon Sep 17 00:00:00 2001
From: Craig Hall <ch9871@gmail.com>
Date: Thu, 1 Aug 2019 12:53:56 +0100
Subject: [PATCH 0386/2254] luaPackages.luv: add libluv output

Co-authored-by: Roman Volosatovs <rvolosatovs@riseup.net>
---
 pkgs/development/lua-modules/overrides.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix
index 233503c2eca..9f57fbb5fa9 100644
--- a/pkgs/development/lua-modules/overrides.nix
+++ b/pkgs/development/lua-modules/overrides.nix
@@ -276,8 +276,19 @@ with super;
     propagatedBuildInputs = [
       pkgs.libuv
     ];
+
+    passthru = {
+      libluv = self.luv.override({
+        preBuild = self.luv.preBuild + ''
+         sed -i 's,\(option(BUILD_MODULE.*\)ON,\1OFF,' CMakeLists.txt
+         sed -i 's,\(option(BUILD_SHARED_LIBS.*\)OFF,\1ON,' CMakeLists.txt
+         sed -i 's,${"\${INSTALL_INC_DIR}"},${placeholder "out"}/include/luv,' CMakeLists.txt
+        '';
+      });
+    };
   });
 
+
   rapidjson = super.rapidjson.override({
     preBuild = ''
       sed -i '/set(CMAKE_CXX_FLAGS/d' CMakeLists.txt
-- 
GitLab


From 53502fce1b9123b676f2722b2960bab30340b5ab Mon Sep 17 00:00:00 2001
From: Roman Volosatovs <rvolosatovs@riseup.net>
Date: Mon, 16 Sep 2019 10:21:22 +0200
Subject: [PATCH 0387/2254] libvterm-neovim: 2018-11-26 -> 2019-08-28

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

diff --git a/pkgs/development/libraries/libvterm-neovim/default.nix b/pkgs/development/libraries/libvterm-neovim/default.nix
index 48dbc5f395c..231b426e6a7 100644
--- a/pkgs/development/libraries/libvterm-neovim/default.nix
+++ b/pkgs/development/libraries/libvterm-neovim/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation {
   pname = "libvterm-neovim";
-  version = "2018-11-26";
+  version = "2019-08-28";
 
   src = fetchFromGitHub {
     owner = "neovim";
     repo = "libvterm";
-    rev = "f600f523545b7d4018ebf320e3273795dbe43c8a";
-    sha256 = "08lxd8xs9cg4axgq6bkb7afjxg3s29s1a3niqqm4wjb7iyi2jx5b";
+    rev = "1aa95e24d8f07a396aa80b7cd52f93e2b5bcca79";
+    sha256 = "0vjd397lqrfv4kc79i5izva4bynbymx3gllkg281fnk0b15vxfif";
   };
 
   buildInputs = [ perl ];
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
     description = "VT220/xterm/ECMA-48 terminal emulator library";
     homepage = http://www.leonerd.org.uk/code/libvterm/;
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = with maintainers; [ rvolosatovs ];
     platforms = platforms.unix;
   };
 }
-- 
GitLab


From 824869c3fc01bb2081d2e41206156fd91ee37557 Mon Sep 17 00:00:00 2001
From: Roman Volosatovs <rvolosatovs@riseup.net>
Date: Mon, 16 Sep 2019 22:00:04 +0200
Subject: [PATCH 0388/2254] neovim: 0.3.8 -> 0.4.2

---
 pkgs/applications/editors/neovim/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix
index 8c39eed8a4a..6808d7115c5 100644
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@@ -21,13 +21,13 @@ let
 in
   stdenv.mkDerivation rec {
     pname = "neovim-unwrapped";
-    version = "0.3.8";
+    version = "0.4.2";
 
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "neovim";
       rev = "v${version}";
-      sha256 = "15flii3p4g9f65xy9jpkb8liajrvhm5ck4j39z6d6b1nkxr6ghwb";
+      sha256 = "13w446plvgl219lhj29jyimhiqvs1y1byrz4qpdmxgyddmx9xqss";
     };
 
     patches = [
@@ -45,6 +45,7 @@ in
       libtermkey
       libuv
       libvterm-neovim
+      lua.pkgs.luv.libluv
       msgpack
       ncurses
       neovimLuaEnv
@@ -78,6 +79,7 @@ in
 
     cmakeFlags = [
       "-DGPERF_PRG=${gperf}/bin/gperf"
+      "-DLIBLUV_LIBRARY=${lua.pkgs.luv}/lib/lua/${lua.luaversion}/luv.so"
       "-DLUA_PRG=${neovimLuaEnv.interpreter}"
     ]
     ++ optional doCheck "-DBUSTED_PRG=${neovimLuaEnv}/bin/busted"
-- 
GitLab


From 9b092e228b2d9eab54c49685cddd6e30fde8eceb Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 16 Sep 2019 13:24:14 -0700
Subject: [PATCH 0389/2254] python3Packages.websockets: 7.0 -> 8.0.2

---
 .../python-modules/websockets/default.nix     | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/websockets/default.nix b/pkgs/development/python-modules/websockets/default.nix
index 2e0caae4b46..589a8089fca 100644
--- a/pkgs/development/python-modules/websockets/default.nix
+++ b/pkgs/development/python-modules/websockets/default.nix
@@ -1,24 +1,26 @@
 { lib
-, fetchPypi
+, fetchFromGitHub
 , buildPythonPackage
 , pythonOlder
+, pytest
 }:
 
 buildPythonPackage rec {
   pname = "websockets";
-  version = "7.0";
+  version = "8.0.2";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "17vwr6sa1y3lb24wzfyyc98c5v03di4j8f24qkqa9vsvaghc7qq8";
+  src = fetchFromGitHub {
+    owner = "aaugustin";
+    repo = pname;
+    rev = version;
+    sha256 = "02fgb8gib4z5fqv30brz3mhxmblw9bw0978fhpjdrkj7wvqrz5h8";
   };
 
   disabled = pythonOlder "3.3";
-  doCheck = false; # protocol tests fail
 
-  meta = {
+  meta = with lib; {
     description = "WebSocket implementation in Python 3";
-    homepage = https://github.com/aaugustin/websockets;
-    license = lib.licenses.bsd3;
+    homepage = "https://github.com/aaugustin/websockets";
+    license = licenses.bsd3;
   };
 }
-- 
GitLab


From af564fbd8a8bed14ee4758b39fb3eeef4750520f Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 16 Sep 2019 22:46:26 +0200
Subject: [PATCH 0390/2254] evcxr: 0.4.4 -> 0.4.5

New release: https://github.com/google/evcxr/blob/v0.4.5/RELEASE_NOTES.md#version-045

Also added myself as maintainer and removed `zeromq` from the build
inputs as it's now vendored by upstream.
---
 .../interpreters/evcxr/default.nix            | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/interpreters/evcxr/default.nix b/pkgs/development/interpreters/evcxr/default.nix
index 54ee243cb33..c4259091f7b 100644
--- a/pkgs/development/interpreters/evcxr/default.nix
+++ b/pkgs/development/interpreters/evcxr/default.nix
@@ -1,30 +1,30 @@
-{ cargo, fetchFromGitHub, makeWrapper, pkgconfig, rustPlatform, stdenv, gcc, Security, zeromq }:
+{ cargo, fetchFromGitHub, makeWrapper, pkgconfig, rustPlatform, stdenv, gcc, Security, cmake }:
 
 rustPlatform.buildRustPackage rec {
   pname = "evcxr";
-  version = "0.4.4";
+  version = "0.4.5";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "evcxr";
     rev = "v${version}";
-    sha256 = "1j2vsqgljqw7415rgjlnc1w3nmr9ghizx2mncbm1yipwj8xbrmf6";
+    sha256 = "13fs9fgvdf8bh6vc8xs8qhil0a1qhm4gvv0ici37xh8a94ngsn7h";
   };
 
-  cargoSha256 = "0ckxpmi547y7q4w287znimpxgaj3mjkgmkcs2n9cp4m8cw143hly";
+  cargoSha256 = "0g17g12isah4nkqp9i299qr1sz19k4czcc43rm1wbs0y9szaqvwc";
 
-  nativeBuildInputs = [ pkgconfig makeWrapper ];
-  buildInputs = [ zeromq ] ++ stdenv.lib.optional stdenv.isDarwin Security;
+  nativeBuildInputs = [ pkgconfig makeWrapper cmake ];
+  buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
   postInstall = ''
     wrapProgram $out/bin/evcxr --prefix PATH : ${stdenv.lib.makeBinPath [ cargo gcc ]}
     rm $out/bin/testing_runtime
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "An evaluation context for Rust";
     homepage = "https://github.com/google/evcxr";
-    license = stdenv.lib.licenses.asl20;
-    maintainers = [ stdenv.lib.maintainers.protoben ];
-    platforms = stdenv.lib.platforms.all;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ protoben ma27 ];
+    platforms = platforms.all;
   };
 }
-- 
GitLab


From 3161b0319b6649d8e41343c53e6ca7004ce93271 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 16 Sep 2019 23:01:37 +0200
Subject: [PATCH 0391/2254] todoist: fix gomod hash

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

diff --git a/pkgs/applications/misc/todoist/default.nix b/pkgs/applications/misc/todoist/default.nix
index cda756fe543..eaedad16748 100644
--- a/pkgs/applications/misc/todoist/default.nix
+++ b/pkgs/applications/misc/todoist/default.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
     sha256 = "0qhmv65il14lns817yxhma784jw5bz629svzh2ykrmilx5f7dxqc";
   };
 
-  modSha256 = "01dqw4x9rbi1kqrfygais0jzmbqxgzx298xy7f52z0npschpigiv";
+  modSha256 = "1nnp5ijz4n34gc97rar4wlvlbx21ndpjyb2mc6gxdk1wzx3mgswp";
 
   meta = {
     homepage = https://github.com/sachaos/todoist;
-- 
GitLab


From 4fee6bee73ac50dbe0336c6c194ca155f6f5186a Mon Sep 17 00:00:00 2001
From: Roman Volosatovs <rvolosatovs@riseup.net>
Date: Mon, 16 Sep 2019 23:07:32 +0200
Subject: [PATCH 0392/2254] helmfile: 0.79.3 -> 0.85.0

---
 pkgs/applications/networking/cluster/helmfile/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix
index 1faa0988a66..6decad2f9fb 100644
--- a/pkgs/applications/networking/cluster/helmfile/default.nix
+++ b/pkgs/applications/networking/cluster/helmfile/default.nix
@@ -1,6 +1,6 @@
 { lib, buildGoModule, fetchFromGitHub, makeWrapper, kubernetes-helm, ... }:
 
-let version = "0.79.3"; in
+let version = "0.85.0"; in
 
 buildGoModule {
   pname = "helmfile";
@@ -10,12 +10,12 @@ buildGoModule {
     owner = "roboll";
     repo = "helmfile";
     rev = "v${version}";
-    sha256 = "0wgfpidpqyvh41dnw351v91z4szi1s6lqak9li2pmddz1rdkx66v";
+    sha256 = "0k1019ddzhhl8kn70ibqf6srlfv92jkc26m78pic5c7ibqyq5fds";
   };
 
   goPackagePath = "github.com/roboll/helmfile";
 
-  modSha256 = "1ksz1c4j7mhsbq6ifqab04588d48c9glyhr4d3d4jyvi19qhwx1d";
+  modSha256 = "1npjm3rs32c1rwx8xb9s03jhd156da6p66hpaqccm7b6zxsm32nv";
 
   nativeBuildInputs = [ makeWrapper ];
 
-- 
GitLab


From 0f4f80173aa0c00fab1604627e55c7d9c158cb4f Mon Sep 17 00:00:00 2001
From: Roman Volosatovs <rvolosatovs@riseup.net>
Date: Mon, 16 Sep 2019 23:34:10 +0200
Subject: [PATCH 0393/2254] tendermint: 0.32.2 -> 0.32.3

---
 pkgs/tools/networking/tendermint/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/tendermint/default.nix b/pkgs/tools/networking/tendermint/default.nix
index a884ed0ccd4..0b9c254deeb 100644
--- a/pkgs/tools/networking/tendermint/default.nix
+++ b/pkgs/tools/networking/tendermint/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "tendermint";
-  version = "0.32.2";
+  version = "0.32.3";
 
   src = fetchFromGitHub {
     owner = "tendermint";
     repo = pname;
-    rev = "d70135ec71979e7588c649c80f2acea65346a99a";
-    sha256 = "062lzc1c96nwg22ql10mwjkxhq68lyak7s0id5y4f9mmj6d4rd69";
+    rev = "v${version}";
+    sha256 = "0vpnw42a28glghdpgxmqhxd63cnbpghhazpzsdksqkw0i1l36ywr";
   };
 
-  modSha256 = "0hl8ly2qx0fv9diipqkcrlaz3ncsb2h81i0ccf5gn9cmyl37x0yk";
+  modSha256 = "1h51zgvjq3bm09yhm54rk8a86cqa1zma3mx6pb0kq7k72xvhpx0a";
 
   meta = with stdenv.lib; {
     description = "Byzantine-Fault Tolerant State Machines. Or Blockchain, for short.";
-- 
GitLab


From 80d1a3b37cdb621417f6be6783af48285d48b5d1 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 16 Sep 2019 15:07:28 -0700
Subject: [PATCH 0394/2254] python3Packages.uvicorn: 0.8.4 -> 0.9.0

---
 .../python-modules/uvicorn/default.nix        | 24 ++++++++++++-------
 .../python-modules/uvicorn/setup.patch        | 13 ----------
 2 files changed, 16 insertions(+), 21 deletions(-)
 delete mode 100644 pkgs/development/python-modules/uvicorn/setup.patch

diff --git a/pkgs/development/python-modules/uvicorn/default.nix b/pkgs/development/python-modules/uvicorn/default.nix
index 1bf0d1c54f0..9f7efef1e84 100644
--- a/pkgs/development/python-modules/uvicorn/default.nix
+++ b/pkgs/development/python-modules/uvicorn/default.nix
@@ -1,23 +1,27 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , click
 , h11
 , httptools
 , uvloop
 , websockets
 , wsproto
+, pytest
+, requests
 , isPy27
 }:
 
 buildPythonPackage rec {
   pname = "uvicorn";
-  version = "0.8.4";
+  version = "0.9.0";
   disabled = isPy27;
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1l8rfm30inx9pma893i7sby9h7y910k58841zqaajksn563b882k";
+  src = fetchFromGitHub {
+    owner = "encode";
+    repo = pname;
+    rev = version;
+    sha256 = "0z4h04mbkzqgpk698bac6f50jxkf02ils6khzl7zbw7yvi6gkkc8";
   };
 
   propagatedBuildInputs = [
@@ -29,11 +33,15 @@ buildPythonPackage rec {
     wsproto
   ];
 
-  checkPhase = ''
-    $out/bin/uvicorn --help
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "h11==0.8.*" "h11"
   '';
 
-  patches = [ ./setup.patch ];
+  checkInputs = [ pytest requests ];
+  checkPhase = ''
+    pytest
+  '';
 
   meta = with lib; {
     homepage = https://www.uvicorn.org/;
diff --git a/pkgs/development/python-modules/uvicorn/setup.patch b/pkgs/development/python-modules/uvicorn/setup.patch
deleted file mode 100644
index f1d974b42d9..00000000000
--- a/pkgs/development/python-modules/uvicorn/setup.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 802cda4..561abf4 100755
---- a/setup.py
-+++ b/setup.py
-@@ -42,7 +42,7 @@ env_marker = (
- 
- requirements = [
-     "click==7.*",
--    "h11==0.8.*",
-+    "h11",
-     "websockets==7.*",
-     "httptools==0.0.13 ;" + env_marker,
-     "uvloop==0.12.* ;" + env_marker,
-- 
GitLab


From 2d8a5baa9ca5feeccf4472995f22b8af62b533d0 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 16 Sep 2019 13:29:34 -0700
Subject: [PATCH 0395/2254] python3Packages.python-engineio: 3.4.3 -> 3.9.3

---
 .../python-engineio/default.nix               | 26 +++++++++----------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix
index 93dd9fb654f..bf6d4cd2381 100644
--- a/pkgs/development/python-modules/python-engineio/default.nix
+++ b/pkgs/development/python-modules/python-engineio/default.nix
@@ -1,27 +1,25 @@
-{ stdenv
-, buildPythonPackage
-, fetchFromGitHub
-, six
+{ stdenv, buildPythonPackage, fetchFromGitHub
+, aiohttp
 , eventlet
-, mock
 , iana-etc
 , libredirect
-, aiohttp
-, websockets
-, websocket_client
+, mock
 , requests
+, six
 , tornado
+, websocket_client
+, websockets
 }:
 
 buildPythonPackage rec {
   pname = "python-engineio";
-  version = "3.4.3";
+  version = "3.9.3";
 
   src = fetchFromGitHub {
     owner = "miguelgrinberg";
     repo = "python-engineio";
     rev = "v${version}";
-    sha256 = "0wk81rqigw47z087f5kc7b9iwqggypxc62q8q818qyzqwb93ysxf";
+    sha256 = "0rwlj12d37dpw6y3bdn6rxv68xnd9ykj4fr3ly0fa143xci35d9y";
   };
 
   propagatedBuildInputs = [
@@ -29,13 +27,13 @@ buildPythonPackage rec {
   ];
 
   checkInputs = [
+    aiohttp
     eventlet
     mock
-    aiohttp
-    websockets
-    websocket_client
-    tornado
     requests
+    tornado
+    websocket_client
+    websockets
   ];
 
   # make /etc/protocols accessible to fix socket.getprotobyname('tcp') in sandbox
-- 
GitLab


From 8276314608e4a253b65cc72d29fef36935f52e02 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Mon, 16 Sep 2019 22:15:21 +0000
Subject: [PATCH 0396/2254] treewide: fix string escapes

---
 pkgs/applications/video/kino/default.nix           |  2 +-
 .../haskell-modules/hackage-packages.nix           |  4 ++--
 pkgs/development/tools/misc/ctags/wrapped.nix      | 14 +++++++-------
 .../apple-source-releases/system_cmds/default.nix  |  4 ++--
 pkgs/tools/typesetting/tex/texlive/combine.nix     |  4 ++--
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/video/kino/default.nix b/pkgs/applications/video/kino/default.nix
index 4ddd84433e8..1b9f0d0997a 100644
--- a/pkgs/applications/video/kino/default.nix
+++ b/pkgs/applications/video/kino/default.nix
@@ -80,7 +80,7 @@ stdenv.mkDerivation {
 
   postInstall = "
     rpath=`patchelf --print-rpath \$out/bin/kino`;
-    for i in $\buildInputs; do
+    for i in $buildInputs; do
       echo adding \$i/lib
       rpath=\$rpath\${rpath:+:}\$i/lib
     done
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 3b91b02ffad..f83f15d1285 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -57630,7 +57630,7 @@ self: {
        version = "0.1.0.1";
        sha256 = "0rwi5zwvqn18g7qyp9aw51w3yzkqbff9g7rcqdk1l871fvq8qhha";
        libraryHaskellDepends = [ base ];
-       description = "Haskell operator `g ... f = \x1 .. xn -> g (f x1 .. xn)`.";
+       description = "Haskell operator `g ... f = \\x1 .. xn -> g (f x1 .. xn)`.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -251536,7 +251536,7 @@ self: {
          base containers exceptions free spiros split text transformers
        ];
        executableHaskellDepends = [ base ];
-       description = "Automate keyboard\/mouse\/clipboard\/application interaction";
+       description = "Automate keyboard/mouse/clipboard/application interaction";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
diff --git a/pkgs/development/tools/misc/ctags/wrapped.nix b/pkgs/development/tools/misc/ctags/wrapped.nix
index 869e7a61121..08f8049aa8a 100644
--- a/pkgs/development/tools/misc/ctags/wrapped.nix
+++ b/pkgs/development/tools/misc/ctags/wrapped.nix
@@ -27,10 +27,10 @@ with pkgs.stdenv.lib;
 
   # don't scan version control directories
   defaultArgs = [
-    "--exclude=\.svn"
-    "--exclude=\.hg"
-    "--exclude=\.git"
-    "--exclude=\_darcs"
+    "--exclude=.svn"
+    "--exclude=.hg"
+    "--exclude=.git"
+    "--exclude=_darcs"
     "--sort=yes"
   ];
 
@@ -38,8 +38,8 @@ with pkgs.stdenv.lib;
   asLang = [
     "--langdef=ActionScript"
     "--langmap=ActionScript:.as"
-    "--regex-ActionScript=/function[ \\t]+([A-Za-z0-9_]+)[ \\t]*\\(/\1/f,function,functions/"
-    "--regex-ActionScript=/function[ \\t]+(set|get)[ \\t]+([A-Za-z0-9_]+)[ \\t]*\\(/\2/p,property,properties/"
+    "--regex-ActionScript=/function[ \\t]+([A-Za-z0-9_]+)[ \\t]*\\(/\\1/f,function,functions/"
+    "--regex-ActionScript=/function[ \\t]+(set|get)[ \\t]+([A-Za-z0-9_]+)[ \\t]*\\(/\\2/p,property,properties/"
     "--regex-ActionScript=/interface[ \\t]+[a-z0-9_.]*([A-Z][A-Za-z0-9_]+)/\\1/i,interface,interfaces/"
     "--regex-ActionScript=/package[ \\t]+([^ \\t]*)/\\1/p/"
     "--regex-ActionScript=/class[ \\t]+[a-z0-9_.]*([A-Z][A-Za-z0-9_]+)/\\1/c,class,classes/"
@@ -67,7 +67,7 @@ with pkgs.stdenv.lib;
   nixLang = [
     "--langdef=NIX"
     "--langmap=NIX:.nix"
-    "--regex-NIX=/\([^ \\t*]*\)[ \\t]*=/\\1/f/"
+    "--regex-NIX=/([^ \\t*]*)[ \\t]*=/\\1/f/"
   ];
 
   rubyLang = [
diff --git a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix
index 03556296ca1..16454cbc1a5 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix
@@ -14,8 +14,8 @@ appleDerivation {
   #                    + lib.optionalString hostPlatform.isAarch32 "-D__arm__";
   NIX_CFLAGS_COMPILE = [ "-DDAEMON_UID=1"
                          "-DDAEMON_GID=1"
-                         "-DDEFAULT_AT_QUEUE=\'a\'"
-                         "-DDEFAULT_BATCH_QUEUE=\'b\'"
+                         "-DDEFAULT_AT_QUEUE='a'"
+                         "-DDEFAULT_BATCH_QUEUE='b'"
                          "-DPERM_PATH=\"/usr/lib/cron/\""
                          "-DOPEN_DIRECTORY"
                          "-DNO_DIRECT_RPC"
diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix
index 69fde7784f5..6622a03decc 100644
--- a/pkgs/tools/typesetting/tex/texlive/combine.nix
+++ b/pkgs/tools/typesetting/tex/texlive/combine.nix
@@ -136,9 +136,9 @@ in buildEnv {
     script =
       writeText "hyphens.sed" (
         # pick up the header
-        "1,/^\% from/p;"
+        "1,/^% from/p;"
         # pick up all sections matching packages that we combine
-        + lib.concatMapStrings (pname: "/^\% from ${pname}:$/,/^\%/p;\n") pnames
+        + lib.concatMapStrings (pname: "/^% from ${pname}:$/,/^%/p;\n") pnames
       );
   in ''
     (
-- 
GitLab


From e8c29fa77c2d08ecbc93754b681f2902b53bef79 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Mon, 16 Sep 2019 17:34:15 -0500
Subject: [PATCH 0397/2254] update-python-libraries: use version key for latest
 release (#68857)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

From warehouse API reference [1]:

     GET /pypi/<project_name>/json

     Returns metadata (info) about an individual project at the latest
     version […]

[1] https://warehouse.pypa.io/api-reference/json/#project
---
 .../update-python-libraries.py                | 37 +------------------
 1 file changed, 2 insertions(+), 35 deletions(-)

diff --git a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py
index 9292a930703..2315e53220b 100755
--- a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py
+++ b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py
@@ -116,45 +116,11 @@ SEMVER = {
 }
 
 
-def _determine_latest_version(current_version, target, versions):
-    """Determine latest version, given `target`.
-    """
-    current_version = Version(current_version)
-
-    def _parse_versions(versions):
-        for v in versions:
-            try:
-                yield Version(v)
-            except InvalidVersion:
-                pass
-
-    versions = _parse_versions(versions)
-
-    index = SEMVER[target]
-
-    ceiling = list(current_version[0:index])
-    if len(ceiling) == 0:
-        ceiling = None
-    else:
-        ceiling[-1]+=1
-        ceiling = Version(".".join(map(str, ceiling)))
-
-    # We do not want prereleases
-    versions = SpecifierSet(prereleases=PRERELEASES).filter(versions)
-
-    if ceiling is not None:
-        versions = SpecifierSet(f"<{ceiling}").filter(versions)
-
-    return (max(sorted(versions))).raw_version
-
-
 def _get_latest_version_pypi(package, extension, current_version, target):
     """Get latest version and hash from PyPI."""
     url = "{}/{}/json".format(INDEX, package)
     json = _fetch_page(url)
-
-    versions = json['releases'].keys()
-    version = _determine_latest_version(current_version, target, versions)
+    version = json['info']['version']
 
     try:
         releases = json['releases'][version]
@@ -166,6 +132,7 @@ def _get_latest_version_pypi(package, extension, current_version, target):
             sha256 = release['digests']['sha256']
             break
     else:
+        logging.error("Release not found for extension: {}".format(extension))
         sha256 = None
     return version, sha256
 
-- 
GitLab


From 602a39c31825629f03c7e65169f040d73305c3e7 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Mon, 16 Sep 2019 23:40:32 +0000
Subject: [PATCH 0398/2254] nixos/rspamd: fix fancy unicode quote

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

diff --git a/nixos/modules/services/mail/rspamd.nix b/nixos/modules/services/mail/rspamd.nix
index 89aa9d17ff7..4db35d9e89a 100644
--- a/nixos/modules/services/mail/rspamd.nix
+++ b/nixos/modules/services/mail/rspamd.nix
@@ -68,7 +68,7 @@ let
           replaced with <literal>rspamd_proxy</literal>.
         '';
         apply = let
-            from = "services.rspamd.workers.\”${name}\".type";
+            from = "services.rspamd.workers.\"${name}\".type";
             files = options.type.files;
             warning = "The option `${from}` defined in ${showFiles files} has enum value `proxy` which has been renamed to `rspamd_proxy`";
           in x: if x == "proxy" then traceWarning warning "rspamd_proxy" else x;
-- 
GitLab


From 1aadcee68a3857459499208c376ef687584f72b9 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 17 Sep 2019 00:18:14 +0000
Subject: [PATCH 0399/2254] nixos/less: fix escape

---
 nixos/modules/programs/less.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/programs/less.nix b/nixos/modules/programs/less.nix
index e19935b77ca..75b3e707d57 100644
--- a/nixos/modules/programs/less.nix
+++ b/nixos/modules/programs/less.nix
@@ -54,8 +54,8 @@ in
         type = types.attrsOf types.str;
         default = {};
         example = {
-          h = "noaction 5\e(";
-          l = "noaction 5\e)";
+          h = "noaction 5\\e(";
+          l = "noaction 5\\e)";
         };
         description = "Defines new command keys.";
       };
-- 
GitLab


From fbd2b55715f10a5b8b2e15992dbb1ddebc9e7e29 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 17 Sep 2019 00:19:28 +0000
Subject: [PATCH 0400/2254] nixos/graphite: fix escape

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

diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix
index 64cb6c3da1e..f7874af3df2 100644
--- a/nixos/modules/services/monitoring/graphite.nix
+++ b/nixos/modules/services/monitoring/graphite.nix
@@ -239,7 +239,7 @@ in {
         description = "Any metrics received which match one of the experssions will be dropped.";
         default = null;
         type = types.nullOr types.str;
-        example = "^some\.noisy\.metric\.prefix\..*";
+        example = "^some\\.noisy\\.metric\\.prefix\\..*";
       };
 
       whitelist = mkOption {
-- 
GitLab


From b384420f2c9365236c2dc35e95321e53df4d2f1d Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 17 Sep 2019 00:20:05 +0000
Subject: [PATCH 0401/2254] nixos/prosody: fix escape

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

diff --git a/nixos/modules/services/networking/prosody.nix b/nixos/modules/services/networking/prosody.nix
index 1ae063aa6bb..7a503e71166 100644
--- a/nixos/modules/services/networking/prosody.nix
+++ b/nixos/modules/services/networking/prosody.nix
@@ -465,7 +465,7 @@ in
 
       modules_enabled = {
 
-        ${ lib.concatStringsSep "\n\ \ " (lib.mapAttrsToList
+        ${ lib.concatStringsSep "\n  " (lib.mapAttrsToList
           (name: val: optionalString val "${toLua name};")
         cfg.modules) }
         ${ lib.concatStringsSep "\n" (map (x: "${toLua x};") cfg.package.communityModules)}
-- 
GitLab


From 08195254aa9a554a903a165617abd0e51a2c550e Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 17 Sep 2019 00:22:11 +0000
Subject: [PATCH 0402/2254] nixos/matomo: fix string escape

---
 nixos/modules/services/web-apps/matomo.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/web-apps/matomo.nix b/nixos/modules/services/web-apps/matomo.nix
index d9f840408cc..8e0f9f8582d 100644
--- a/nixos/modules/services/web-apps/matomo.nix
+++ b/nixos/modules/services/web-apps/matomo.nix
@@ -105,8 +105,8 @@ in {
         default = null;
         example = {
           serverAliases = [
-            "matomo.$\{config.networking.domain\}"
-            "stats.$\{config.networking.domain\}"
+            "matomo.\${config.networking.domain}"
+            "stats.\${config.networking.domain}"
           ];
           enableACME = false;
         };
@@ -115,7 +115,7 @@ in {
             Either this option or the webServerUser option is mandatory.
             Set this to {} to just enable the virtualHost if you don't need any customization.
             If enabled, then by default, the <option>serverName</option> is
-            <literal>${user}.$\{config.networking.hostName\}.$\{config.networking.domain\}</literal>,
+            <literal>${user}.''${config.networking.hostName}.''${config.networking.domain}</literal>,
             SSL is active, and certificates are acquired via ACME.
             If this is set to null (the default), no nginx virtualHost will be configured.
         '';
@@ -275,7 +275,7 @@ in {
           fastcgi_pass unix:${phpSocket};
         '';
         # Any other attempt to access any php files is forbidden
-        locations."~* ^.+\.php$".extraConfig = ''
+        locations."~* ^.+\\.php$".extraConfig = ''
           return 403;
         '';
         # Disallow access to unneeded directories
@@ -284,7 +284,7 @@ in {
           return 403;
         '';
         # Disallow access to several helper files
-        locations."~* \.(?:bat|git|ini|sh|txt|tpl|xml|md)$".extraConfig = ''
+        locations."~* \\.(?:bat|git|ini|sh|txt|tpl|xml|md)$".extraConfig = ''
           return 403;
         '';
         # No crawling of this site for bots that obey robots.txt - no useful information here.
-- 
GitLab


From 4641b683f6d8c8e769ae849316de1522ae18179f Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 17 Sep 2019 00:22:56 +0000
Subject: [PATCH 0403/2254] nixos/restya-board: fix string escape

---
 nixos/modules/services/web-apps/restya-board.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/web-apps/restya-board.nix b/nixos/modules/services/web-apps/restya-board.nix
index 1e7882488ac..2c2f36ac598 100644
--- a/nixos/modules/services/web-apps/restya-board.nix
+++ b/nixos/modules/services/web-apps/restya-board.nix
@@ -235,7 +235,7 @@ in
 
       locations."/".root = "${runDir}/client";
 
-      locations."~ \.php$" = {
+      locations."~ \\.php$" = {
         tryFiles = "$uri =404";
         extraConfig = ''
           include ${pkgs.nginx}/conf/fastcgi_params;
@@ -246,7 +246,7 @@ in
         '';
       };
 
-      locations."~* \.(css|js|less|html|ttf|woff|jpg|jpeg|gif|png|bmp|ico)" = {
+      locations."~* \\.(css|js|less|html|ttf|woff|jpg|jpeg|gif|png|bmp|ico)" = {
         root = "${runDir}/client";
         extraConfig = ''
           if (-f $request_filename) {
-- 
GitLab


From 432a2d73be9a4cc70a030abc8a8d8e445fc814f9 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 17 Sep 2019 00:23:51 +0000
Subject: [PATCH 0404/2254] nixos/tt-rss: fix string escape

---
 nixos/modules/services/web-apps/tt-rss.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix
index abe4748591e..b92e3449894 100644
--- a/nixos/modules/services/web-apps/tt-rss.nix
+++ b/nixos/modules/services/web-apps/tt-rss.nix
@@ -548,7 +548,7 @@ let
             index = "index.php";
           };
 
-          locations."~ \.php$" = {
+          locations."~ \\.php$" = {
             extraConfig = ''
               fastcgi_split_path_info ^(.+\.php)(/.+)$;
               fastcgi_pass unix:${config.services.phpfpm.pools.${cfg.pool}.socket};
-- 
GitLab


From 48086fbd702d83ae0839272724350c73184f22fb Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 17 Sep 2019 00:27:13 +0000
Subject: [PATCH 0405/2254] nixos/matomo: fix escape

---
 nixos/modules/services/web-apps/matomo.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-apps/matomo.nix b/nixos/modules/services/web-apps/matomo.nix
index 8e0f9f8582d..1e34aff8d17 100644
--- a/nixos/modules/services/web-apps/matomo.nix
+++ b/nixos/modules/services/web-apps/matomo.nix
@@ -115,7 +115,7 @@ in {
             Either this option or the webServerUser option is mandatory.
             Set this to {} to just enable the virtualHost if you don't need any customization.
             If enabled, then by default, the <option>serverName</option> is
-            <literal>${user}.''${config.networking.hostName}.''${config.networking.domain}</literal>,
+            <literal>''${user}.''${config.networking.hostName}.''${config.networking.domain}</literal>,
             SSL is active, and certificates are acquired via ACME.
             If this is set to null (the default), no nginx virtualHost will be configured.
         '';
-- 
GitLab


From 21dd0207b2f38fbc28f3eada71ce2eb31e5be56f Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Mon, 16 Sep 2019 21:49:00 -0400
Subject: [PATCH 0406/2254] alacritty: fix path to xdg-open

---
 pkgs/applications/misc/alacritty/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix
index dddf8d93412..24f788ef468 100644
--- a/pkgs/applications/misc/alacritty/default.nix
+++ b/pkgs/applications/misc/alacritty/default.nix
@@ -22,6 +22,7 @@
   libxcb,
   libxkbcommon,
   wayland,
+  xdg_utils,
 
   # Darwin Frameworks
   AppKit,
@@ -75,6 +76,10 @@ in buildRustPackage rec {
     ++ lib.optionals stdenv.isDarwin [ AppKit CoreGraphics CoreServices CoreText Foundation OpenGL ];
 
   outputs = [ "out" "terminfo" ];
+  postPatch = ''
+    substituteInPlace alacritty_terminal/src/config/mouse.rs \
+      --replace xdg-open ${xdg_utils}/bin/xdg-open
+  '';
 
   postBuild = lib.optionalString stdenv.isDarwin "make app";
 
-- 
GitLab


From 00f6c93f83089404ac29dce9a1b88526f1da291b Mon Sep 17 00:00:00 2001
From: Malo Bourgon <mbourgon@gmail.com>
Date: Mon, 15 Jul 2019 11:35:07 -0700
Subject: [PATCH 0407/2254] nodePackages: update

---
 .../node-packages/composition-v10.nix         |    4 +-
 .../node-packages/composition-v12.nix         |    4 +-
 pkgs/development/node-packages/node-env.nix   |  152 +-
 .../node-packages/node-packages-v10.nix       | 7538 +++++++++--------
 .../node-packages/node-packages-v12.nix       |  118 +-
 5 files changed, 4000 insertions(+), 3816 deletions(-)

diff --git a/pkgs/development/node-packages/composition-v10.nix b/pkgs/development/node-packages/composition-v10.nix
index 9e2521717ef..fa4b4c3be56 100644
--- a/pkgs/development/node-packages/composition-v10.nix
+++ b/pkgs/development/node-packages/composition-v10.nix
@@ -1,8 +1,8 @@
-# This file has been generated by node2nix 1.6.0. Do not edit!
+# This file has been generated by node2nix 1.7.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs.nodejs-10_x}:
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}:
 
 let
   nodeEnv = import ./node-env.nix {
diff --git a/pkgs/development/node-packages/composition-v12.nix b/pkgs/development/node-packages/composition-v12.nix
index 4ed0336ec5c..880d72efd35 100644
--- a/pkgs/development/node-packages/composition-v12.nix
+++ b/pkgs/development/node-packages/composition-v12.nix
@@ -1,8 +1,8 @@
-# This file has been generated by node2nix 1.6.0. Do not edit!
+# This file has been generated by node2nix 1.7.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs.nodejs-6_x}:
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
 
 let
   nodeEnv = import ./node-env.nix {
diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix
index 720e0cc0850..670556bf271 100644
--- a/pkgs/development/node-packages/node-env.nix
+++ b/pkgs/development/node-packages/node-env.nix
@@ -11,7 +11,7 @@ let
 
     cat > $out/bin/tar <<EOF
     #! ${stdenv.shell} -e
-    $(type -p tar) "\$@" --warning=no-unknown-keyword
+    $(type -p tar) "\$@" --warning=no-unknown-keyword --delay-directory-restore
     EOF
 
     chmod +x $out/bin/tar
@@ -72,7 +72,7 @@ let
           packageDir="$(find . -maxdepth 1 -type d | tail -1)"
 
           # Restore write permissions to make building work
-          find "$packageDir" -type d -print0 | xargs -0 chmod u+x
+          find "$packageDir" -type d -exec chmod u+x {} \;
           chmod -R u+w "$packageDir"
 
           # Move the extracted tarball into the output folder
@@ -219,7 +219,16 @@ let
                       packageObj["_integrity"] = "sha1-000000000000000000000000000="; // When no _integrity string has been provided (e.g. by Git dependencies), add a dummy one. It does not seem to harm and it bypasses downloads.
                   }
 
-                  packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories.
+                  if(dependency.resolved) {
+                      packageObj["_resolved"] = dependency.resolved; // Adopt the resolved property if one has been provided
+                  } else {
+                      packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories.
+                  }
+
+                  if(dependency.from !== undefined) { // Adopt from property if one has been provided
+                      packageObj["_from"] = dependency.from;
+                  }
+
                   fs.writeFileSync(packageJSONPath, JSON.stringify(packageObj, null, 2));
               }
 
@@ -308,6 +317,61 @@ let
     '';
   };
 
+  prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}:
+    let
+      forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com";
+    in
+    ''
+        # Pinpoint the versions of all dependencies to the ones that are actually being used
+        echo "pinpointing versions of dependencies..."
+        source $pinpointDependenciesScriptPath
+
+        # Patch the shebangs of the bundled modules to prevent them from
+        # calling executables outside the Nix store as much as possible
+        patchShebangs .
+
+        # Deploy the Node.js package by running npm install. Since the
+        # dependencies have been provided already by ourselves, it should not
+        # attempt to install them again, which is good, because we want to make
+        # it Nix's responsibility. If it needs to install any dependencies
+        # anyway (e.g. because the dependency parameters are
+        # incomplete/incorrect), it fails.
+        #
+        # The other responsibilities of NPM are kept -- version checks, build
+        # steps, postprocessing etc.
+
+        export HOME=$TMPDIR
+        cd "${packageName}"
+        runHook preRebuild
+
+        ${stdenv.lib.optionalString bypassCache ''
+          ${stdenv.lib.optionalString reconstructLock ''
+            if [ -f package-lock.json ]
+            then
+                echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!"
+                echo "This will most likely result in version mismatches! We will remove the lock file and regenerate it!"
+                rm package-lock.json
+            else
+                echo "No package-lock.json file found, reconstructing..."
+            fi
+
+            node ${reconstructPackageLock}
+          ''}
+
+          node ${addIntegrityFieldsScript}
+        ''}
+
+        npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild
+
+        if [ "$dontNpmInstall" != "1" ]
+        then
+            # NPM tries to download packages even when they already exist if npm-shrinkwrap is used.
+            rm -f npm-shrinkwrap.json
+
+            npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install
+        fi
+    '';
+
   # Builds and composes an NPM package including all its dependencies
   buildNodePackage =
     { name
@@ -319,6 +383,7 @@ let
     , npmFlags ? ""
     , dontNpmInstall ? false
     , bypassCache ? false
+    , reconstructLock ? false
     , preRebuild ? ""
     , dontStrip ? true
     , unpackPhase ? "true"
@@ -326,11 +391,10 @@ let
     , ... }@args:
 
     let
-      forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com";
       extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ];
     in
     stdenv.mkDerivation ({
-      name = "node-${name}-${version}";
+      name = "node_${name}-${version}";
       buildInputs = [ tarWrapper python nodejs ]
         ++ stdenv.lib.optional (stdenv.isLinux) utillinux
         ++ stdenv.lib.optional (stdenv.isDarwin) libtool
@@ -352,47 +416,7 @@ let
         # Compose the package and all its dependencies
         source $compositionScriptPath
 
-        # Pinpoint the versions of all dependencies to the ones that are actually being used
-        echo "pinpointing versions of dependencies..."
-        source $pinpointDependenciesScriptPath
-
-        # Patch the shebangs of the bundled modules to prevent them from
-        # calling executables outside the Nix store as much as possible
-        patchShebangs .
-
-        # Deploy the Node.js package by running npm install. Since the
-        # dependencies have been provided already by ourselves, it should not
-        # attempt to install them again, which is good, because we want to make
-        # it Nix's responsibility. If it needs to install any dependencies
-        # anyway (e.g. because the dependency parameters are
-        # incomplete/incorrect), it fails.
-        #
-        # The other responsibilities of NPM are kept -- version checks, build
-        # steps, postprocessing etc.
-
-        export HOME=$TMPDIR
-        cd "${packageName}"
-        runHook preRebuild
-
-        ${stdenv.lib.optionalString bypassCache ''
-          if [ ! -f package-lock.json ]
-          then
-              echo "No package-lock.json file found, reconstructing..."
-              node ${reconstructPackageLock}
-          fi
-
-          node ${addIntegrityFieldsScript}
-        ''}
-
-        npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild
-
-        if [ "$dontNpmInstall" != "1" ]
-        then
-            # NPM tries to download packages even when they already exist if npm-shrinkwrap is used.
-            rm -f npm-shrinkwrap.json
-
-            npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install
-        fi
+        ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }}
 
         # Create symlink to the deployed executable folder, if applicable
         if [ -d "$out/lib/node_modules/.bin" ]
@@ -431,14 +455,13 @@ let
     , npmFlags ? ""
     , dontNpmInstall ? false
     , bypassCache ? false
+    , reconstructLock ? false
     , dontStrip ? true
     , unpackPhase ? "true"
     , buildPhase ? "true"
     , ... }@args:
 
     let
-      forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com";
-
       extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ];
 
       nodeDependencies = stdenv.mkDerivation ({
@@ -473,39 +496,13 @@ let
             fi
           ''}
 
-          # Pinpoint the versions of all dependencies to the ones that are actually being used
-          echo "pinpointing versions of dependencies..."
+          # Go to the parent folder to make sure that all packages are pinpointed
           cd ..
           ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
 
-          source $pinpointDependenciesScriptPath
-          cd ${packageName}
-
-          # Patch the shebangs of the bundled modules to prevent them from
-          # calling executables outside the Nix store as much as possible
-          patchShebangs .
-
-          export HOME=$PWD
-
-          ${stdenv.lib.optionalString bypassCache ''
-            if [ ! -f package-lock.json ]
-            then
-                echo "No package-lock.json file found, reconstructing..."
-                node ${reconstructPackageLock}
-            fi
-
-            node ${addIntegrityFieldsScript}
-          ''}
-
-          npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild
-
-          ${stdenv.lib.optionalString (!dontNpmInstall) ''
-            # NPM tries to download packages even when they already exist if npm-shrinkwrap is used.
-            rm -f npm-shrinkwrap.json
-
-            npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install
-          ''}
+          ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }}
 
+          # Expose the executables that were installed
           cd ..
           ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
 
@@ -532,6 +529,7 @@ let
       inherit nodeDependencies;
       shellHook = stdenv.lib.optionalString (dependencies != []) ''
         export NODE_PATH=$nodeDependencies/lib/node_modules
+        export PATH="$nodeDependencies/bin:$PATH"
       '';
     };
 in
diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix
index ce8a63cfdd3..8dffbd45fe2 100644
--- a/pkgs/development/node-packages/node-packages-v10.nix
+++ b/pkgs/development/node-packages/node-packages-v10.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.6.0. Do not edit!
+# This file has been generated by node2nix 1.7.0. Do not edit!
 
 {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
@@ -13,67 +13,67 @@ let
         sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ==";
       };
     };
-    "@angular-devkit/architect-0.802.0" = {
+    "@angular-devkit/architect-0.803.4" = {
       name = "_at_angular-devkit_slash_architect";
       packageName = "@angular-devkit/architect";
-      version = "0.802.0";
+      version = "0.803.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.802.0.tgz";
-        sha512 = "Zd/ao7uE8ctV4n6drKl35cK5xrRsmgva7lsiBRc4J09vDWaRrCsxTKr6nw1gkFBDuSGZc9OmvtEFFPg2I/YHwQ==";
+        url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.803.4.tgz";
+        sha512 = "Ek+xb9GfzHLbD+ATmupbzTSNFGddkH6dbb36cB6gme+vnlBVfXP0dxOg5lRKZoUIFJyREl9jSrA5zUhVwXaoVg==";
       };
     };
-    "@angular-devkit/core-8.2.0" = {
+    "@angular-devkit/core-8.3.4" = {
       name = "_at_angular-devkit_slash_core";
       packageName = "@angular-devkit/core";
-      version = "8.2.0";
+      version = "8.3.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@angular-devkit/core/-/core-8.2.0.tgz";
-        sha512 = "jZQn5hQ84++00+yuD/Ak303/Q06keFVyd+QbSfVrpHTFyOwPeNNSPLbN6A0S7X3bKOuoZhUHg+eQBa5BljVC2g==";
+        url = "https://registry.npmjs.org/@angular-devkit/core/-/core-8.3.4.tgz";
+        sha512 = "QjUN9EakpQ+sFYeMfBMecxVhgI4Vdg0k20h6PZDjZ9lqYNXjpaQVtBo7qiPYHh5kQeJEvdrzca6yeYuCP3TvZw==";
       };
     };
-    "@angular-devkit/schematics-8.2.0" = {
+    "@angular-devkit/schematics-8.3.4" = {
       name = "_at_angular-devkit_slash_schematics";
       packageName = "@angular-devkit/schematics";
-      version = "8.2.0";
+      version = "8.3.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-8.2.0.tgz";
-        sha512 = "/XUWJijLXzhtWdjoQ5ioLo5r5V5+sJ0SSnSP0N8MQyLOgTd1FDGtBMsAMJ3n2/uwUl2/O9WTlV1xNLlg7neYVQ==";
+        url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-8.3.4.tgz";
+        sha512 = "+QXhrAEcReQJL4fn+35NbcdW5d1vawqSZUokqga8E971YUVUk55mHpIQ39Vpj3S9jhTRYwxsHl+7v9N7UaREmg==";
       };
     };
-    "@antora/asciidoc-loader-2.0.0" = {
+    "@antora/asciidoc-loader-2.1.1" = {
       name = "_at_antora_slash_asciidoc-loader";
       packageName = "@antora/asciidoc-loader";
-      version = "2.0.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@antora/asciidoc-loader/-/asciidoc-loader-2.0.0.tgz";
-        sha512 = "kbpSBMM618Do5dXtG5mC5kk8VEXYDsciJ0orw7vrYeFzRBbR4Y4qpzbsQeuQNB4r2iLoztxErvg04SBb5CsGdQ==";
+        url = "https://registry.npmjs.org/@antora/asciidoc-loader/-/asciidoc-loader-2.1.1.tgz";
+        sha512 = "5j4wKrLgoiIoghqMYv9FkEstISozG753L5YMuQ5sbiQToKhZp4frKx8hZfrwlUCyGQ9BKqIVlkhkPValkpp26g==";
       };
     };
-    "@antora/content-aggregator-2.0.0" = {
+    "@antora/content-aggregator-2.1.1" = {
       name = "_at_antora_slash_content-aggregator";
       packageName = "@antora/content-aggregator";
-      version = "2.0.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@antora/content-aggregator/-/content-aggregator-2.0.0.tgz";
-        sha512 = "24JQSDQZ609yJHs7abIqF5FikNg0EWvFwBYck1Kbl5vRikmDTpSMBhhPKJhAVe4lREm6/FVYO7t9CEmjp69prA==";
+        url = "https://registry.npmjs.org/@antora/content-aggregator/-/content-aggregator-2.1.1.tgz";
+        sha512 = "uORcwPt2js5i6m492zOyszU0+GA748+Zvcrwf6jeOWsBePyYIVxI2L6TmJ8Ulw65scEQOKTrvsITb8lFCVLkWQ==";
       };
     };
-    "@antora/content-classifier-2.0.0" = {
+    "@antora/content-classifier-2.1.1" = {
       name = "_at_antora_slash_content-classifier";
       packageName = "@antora/content-classifier";
-      version = "2.0.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@antora/content-classifier/-/content-classifier-2.0.0.tgz";
-        sha512 = "d1MB57X3AaXy30rw+dudxbJ2cdw/Uk1U4JxHbWIkdrEJKty2fbnBu3xjyb70qAv5G0ayovJpqZOaR+YwS0ibbQ==";
+        url = "https://registry.npmjs.org/@antora/content-classifier/-/content-classifier-2.1.1.tgz";
+        sha512 = "HQlDCoycTxk8IDMx4IaaNkqlHcik5Q22L2/nHQTevYfiErS4wfCmern1O42DvPj72VT72JnnDg87WBvTgZTRTA==";
       };
     };
-    "@antora/document-converter-2.0.0" = {
+    "@antora/document-converter-2.1.1" = {
       name = "_at_antora_slash_document-converter";
       packageName = "@antora/document-converter";
-      version = "2.0.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@antora/document-converter/-/document-converter-2.0.0.tgz";
-        sha512 = "8slnLdeMxI4kU64fMsNp58HjpFYZ7chrl5tCYr1/4Jr00fVHwn8vx2YS1cKyowcrmb9uG6YI/pMNt9F3kjTtYA==";
+        url = "https://registry.npmjs.org/@antora/document-converter/-/document-converter-2.1.1.tgz";
+        sha512 = "WnMHE5JCkdOYFQ7ytqq2d6Wj0zmy2ifXzU1M2Eo7ZwbSxjkrLVGRFlPbTIybdgnqhIss6ef01qZ+F/+8ZBTFvw==";
       };
     };
     "@antora/expand-path-helper-1.0.0" = {
@@ -85,67 +85,67 @@ let
         sha512 = "hg3y6M3OvRTb7jtLAnwwloYDxafbyKYttcf16kGCXvP7Wqosh7c+Ag+ltaZ7VSebpzpphO/umb/BXdpU7rxapw==";
       };
     };
-    "@antora/navigation-builder-2.0.0" = {
+    "@antora/navigation-builder-2.1.1" = {
       name = "_at_antora_slash_navigation-builder";
       packageName = "@antora/navigation-builder";
-      version = "2.0.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@antora/navigation-builder/-/navigation-builder-2.0.0.tgz";
-        sha512 = "tuI2dNDy9sqgkHoiqn52M0lWrxxOafrEUIPSskjyGf0MjFP3pBPKnHiBmAl2r+NhXCAfcIb5khe4rSS18bfiVA==";
+        url = "https://registry.npmjs.org/@antora/navigation-builder/-/navigation-builder-2.1.1.tgz";
+        sha512 = "H3VmqIfvuCTAae7Xd1rWYXhQKXhvCLhr0lxWeuSvVp6xzTo3Zf/VnhCGlllLoB+69PSCfcSEm2J5oCy6ySa6WA==";
       };
     };
-    "@antora/page-composer-2.0.0" = {
+    "@antora/page-composer-2.1.1" = {
       name = "_at_antora_slash_page-composer";
       packageName = "@antora/page-composer";
-      version = "2.0.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@antora/page-composer/-/page-composer-2.0.0.tgz";
-        sha512 = "1I0vhO6UCyNJRLYICTU+jCTEmkHeJ13tao0nfOOAiSyamDkyX7vM935qfzGBjwZdur8Clq4jpiCuvFTmXMtIfQ==";
+        url = "https://registry.npmjs.org/@antora/page-composer/-/page-composer-2.1.1.tgz";
+        sha512 = "PqxMt+s4aTCW2woC/MjjfTG1Hy20A3olsW7ZqpanAao+CGdcqeGbu9LFh65lKGL3MOM0NBIDJG0qqX1RNBX1Nw==";
       };
     };
-    "@antora/playbook-builder-2.0.0" = {
+    "@antora/playbook-builder-2.1.1" = {
       name = "_at_antora_slash_playbook-builder";
       packageName = "@antora/playbook-builder";
-      version = "2.0.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@antora/playbook-builder/-/playbook-builder-2.0.0.tgz";
-        sha512 = "uLU4+rpIRZiMit8s1lkbiz5L5V8cPL40RJMRHFb4B7k2PXbvNiZZAMHZBeFgVwfJIKmKAIeUCDgOHgiBIlFc+A==";
+        url = "https://registry.npmjs.org/@antora/playbook-builder/-/playbook-builder-2.1.1.tgz";
+        sha512 = "mdsV8OJq9gbw8IUOhNI5+gCfPJl5UyS7H/TbE4oVimebHpmHSld3/GKc7DjuR0Ge4jxNxwlRyDEtfQiNvnBmug==";
       };
     };
-    "@antora/redirect-producer-2.0.0" = {
+    "@antora/redirect-producer-2.1.1" = {
       name = "_at_antora_slash_redirect-producer";
       packageName = "@antora/redirect-producer";
-      version = "2.0.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@antora/redirect-producer/-/redirect-producer-2.0.0.tgz";
-        sha512 = "qlRPGNAhtbIOWK9XHEdH4Iiaz1/8SBvm5rK46R4YinjZqMibMehOfFoIdRf2qsE9mfOsYKwKUSF8Jnv/emXuJw==";
+        url = "https://registry.npmjs.org/@antora/redirect-producer/-/redirect-producer-2.1.1.tgz";
+        sha512 = "jdnx19b5qlbjUZCwSGrUTUozRPj39OxTr8PeF3jp+qD+TMZuA6XV/6Qp6d1TN2d6a5PQ+d5852g+B2wZmPMIoQ==";
       };
     };
-    "@antora/site-mapper-2.0.0" = {
+    "@antora/site-mapper-2.1.1" = {
       name = "_at_antora_slash_site-mapper";
       packageName = "@antora/site-mapper";
-      version = "2.0.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@antora/site-mapper/-/site-mapper-2.0.0.tgz";
-        sha512 = "rPpDLuJbM7c0fNpzf95qrxsjzNAXuyACXE+FXUOwmFp3SYIFGEWATLk1MMNes7SfLAchMMVwjEr1Uii3D5+/Mw==";
+        url = "https://registry.npmjs.org/@antora/site-mapper/-/site-mapper-2.1.1.tgz";
+        sha512 = "nJvzzu/S4B+qm5SLfNToaC576spPx/FGZqvS99QbRQ11KK10y7rqERlq/wR/nu1IL+zISgw5zJW3qNlTq9YSIg==";
       };
     };
-    "@antora/site-publisher-2.0.0" = {
+    "@antora/site-publisher-2.1.1" = {
       name = "_at_antora_slash_site-publisher";
       packageName = "@antora/site-publisher";
-      version = "2.0.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@antora/site-publisher/-/site-publisher-2.0.0.tgz";
-        sha512 = "kjKfQSEpcLiw653h9IzCG+L9sYm/v9GXAcbzXN1IYoNPO1Od0EPQ2RXGviqeQNYcWJLyRq48cQpNx7o2/KqVag==";
+        url = "https://registry.npmjs.org/@antora/site-publisher/-/site-publisher-2.1.1.tgz";
+        sha512 = "sGuUeIV5bo4VgbnVN6lJNLnVrJWJyyM1rfu5eInOvPru0dQ5zzH8ij93q+5Lxc30zwj+TDI371AFluzz+TWK3A==";
       };
     };
-    "@antora/ui-loader-2.0.0" = {
+    "@antora/ui-loader-2.1.1" = {
       name = "_at_antora_slash_ui-loader";
       packageName = "@antora/ui-loader";
-      version = "2.0.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@antora/ui-loader/-/ui-loader-2.0.0.tgz";
-        sha512 = "CaD+Dp13G7EZhEr6Jg6OEvPHjJZ2FROXwdaY4XP+vBrKmI+QZwS3V+uG0NYbCRxhR1W8N8CYm5hc1UTvGH19cA==";
+        url = "https://registry.npmjs.org/@antora/ui-loader/-/ui-loader-2.1.1.tgz";
+        sha512 = "/fPYFRtJsUp4LwOu1MrstAcd+BQFdr5afb5l0iaAi3GuXLLLMasdCIH0jByi4GSiNsYlJ6P+/Jbv+BiUiMY/cg==";
       };
     };
     "@apollographql/apollo-tools-0.4.0" = {
@@ -211,13 +211,13 @@ let
         sha512 = "jRsuseXBo9pN197KnDwhhaaBzyZr2oIcLHHTt2oDdQrej5Qp57dCCJafWx5ivU8/alEYDpssYqv1MUqcxwQlrA==";
       };
     };
-    "@babel/core-7.5.5" = {
+    "@babel/core-7.6.0" = {
       name = "_at_babel_slash_core";
       packageName = "@babel/core";
-      version = "7.5.5";
+      version = "7.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/core/-/core-7.5.5.tgz";
-        sha512 = "i4qoSr2KTtce0DmkuuQBV4AuQgGPUcPXMr9L5MyYAtk06z068lQ10a4O009fe5OB/DfNV+h+qqT7ddNV8UnRjg==";
+        url = "https://registry.npmjs.org/@babel/core/-/core-7.6.0.tgz";
+        sha512 = "FuRhDRtsd6IptKpHXAa+4WPZYY2ZzgowkbLBecEDDSje1X/apG7jQM33or3NdOmjXBKWGOg4JmSiRfUfuTtHXw==";
       };
     };
     "@babel/generator-7.0.0-beta.38" = {
@@ -238,13 +238,13 @@ let
         sha512 = "8EXhHRFqlVVWXPezBW5keTiQi/rJMQTg/Y9uVCEZ0CAF3PKtCCaVRnp64Ii1ujhkoDhhF1fVsImoN4yJ2uz4Wg==";
       };
     };
-    "@babel/generator-7.5.5" = {
+    "@babel/generator-7.6.0" = {
       name = "_at_babel_slash_generator";
       packageName = "@babel/generator";
-      version = "7.5.5";
+      version = "7.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/generator/-/generator-7.5.5.tgz";
-        sha512 = "ETI/4vyTSxTzGnU2c49XHv2zhExkv9JHLTwDAFz85kmcwuShvYG2H08FwgIguQf4JC75CBnXAUM5PqeF4fj0nQ==";
+        url = "https://registry.npmjs.org/@babel/generator/-/generator-7.6.0.tgz";
+        sha512 = "Ms8Mo7YBdMMn1BYuNtKuP/z0TgEIhbcyB8HVR6PPNYp4P61lMsABiS4A3VG1qznjXVCf3r+fVHhm4efTYVsySA==";
       };
     };
     "@babel/helper-annotate-as-pure-7.0.0" = {
@@ -283,13 +283,13 @@ let
         sha512 = "l79boDFJ8S1c5hvQvG+rc+wHw6IuH7YldmRKsYtpbawsxURu/paVy57FZMomGK22/JckepaikOkY0MoAmdyOlQ==";
       };
     };
-    "@babel/helper-create-class-features-plugin-7.5.5" = {
+    "@babel/helper-create-class-features-plugin-7.6.0" = {
       name = "_at_babel_slash_helper-create-class-features-plugin";
       packageName = "@babel/helper-create-class-features-plugin";
-      version = "7.5.5";
+      version = "7.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.5.5.tgz";
-        sha512 = "ZsxkyYiRA7Bg+ZTRpPvB6AbOFKTFFK4LrvTet8lInm0V468MWCaSYJE+I7v2z2r8KNLtYiV+K5kTCnR7dvyZjg==";
+        url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.6.0.tgz";
+        sha512 = "O1QWBko4fzGju6VoVvrZg0RROCVifcLxiApnGP3OWfWzvxRZFCoBD81K5ur5e3bVY2Vf/5rIJm8cqPKn8HUJng==";
       };
     };
     "@babel/helper-define-map-7.5.5" = {
@@ -436,13 +436,13 @@ let
         sha512 = "o9fP1BZLLSrYlxYEYyl2aS+Flun5gtjTIG8iln+XuEzQTs0PLagAGSXUcqruJwD5fM48jzIEggCKpIfWTcR7pQ==";
       };
     };
-    "@babel/helpers-7.5.5" = {
+    "@babel/helpers-7.6.0" = {
       name = "_at_babel_slash_helpers";
       packageName = "@babel/helpers";
-      version = "7.5.5";
+      version = "7.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.5.5.tgz";
-        sha512 = "nRq2BUhxZFnfEn/ciJuhklHvFOqjJUD5wpx+1bxUF2axL9C+v4DE/dmp5sT2dKnpOs4orZWzpAZqlCy8QqE/7g==";
+        url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.6.0.tgz";
+        sha512 = "W9kao7OBleOjfXtFGgArGRX6eCP0UEcA2ZWEWNkJdRZnHhW4eEbeswbG3EwaRsnQUAEGWYgMq1HsIXuNNNy2eQ==";
       };
     };
     "@babel/highlight-7.5.0" = {
@@ -463,13 +463,13 @@ let
         sha512 = "tXZCqWtlOOP4wgCp6RjRvLmfuhnqTLy9VHwRochJBCP2nDm27JnnuFEnXFASVyQNHk36jD1tAammsCEEqgscIQ==";
       };
     };
-    "@babel/parser-7.5.5" = {
+    "@babel/parser-7.6.0" = {
       name = "_at_babel_slash_parser";
       packageName = "@babel/parser";
-      version = "7.5.5";
+      version = "7.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/parser/-/parser-7.5.5.tgz";
-        sha512 = "E5BN68cqR7dhKan1SfqgPGhQ178bkVKpXTPEXnFJBrEt8/DKRZlybmy+IgYLTeN7tp1R5Ccmbm2rBk17sHYU3g==";
+        url = "https://registry.npmjs.org/@babel/parser/-/parser-7.6.0.tgz";
+        sha512 = "+o2q111WEx4srBs7L9eJmcwi655eD8sXniLqMB93TBK9GrNzGrxDWSjiqz2hLU0Ha8MTXFIP0yd9fNdP+m43ZQ==";
       };
     };
     "@babel/plugin-external-helpers-7.0.0" = {
@@ -643,13 +643,13 @@ let
         sha512 = "ntQPR6q1/NKuphly49+QiQiTN0O63uOwjdD6dhIjSWBI5xlrbUFh720TIpzBhpnrLfv2tNH/BXvLIab1+BAI0w==";
       };
     };
-    "@babel/plugin-transform-block-scoping-7.5.5" = {
+    "@babel/plugin-transform-block-scoping-7.6.0" = {
       name = "_at_babel_slash_plugin-transform-block-scoping";
       packageName = "@babel/plugin-transform-block-scoping";
-      version = "7.5.5";
+      version = "7.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.5.5.tgz";
-        sha512 = "82A3CLRRdYubkG85lKwhZB0WZoHxLGsJdux/cOVaJCJpvYFl1LVzAIFyRsa7CvXqW8rBM4Zf3Bfn8PHt5DP0Sg==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.6.0.tgz";
+        sha512 = "tIt4E23+kw6TgL/edACZwP1OUKrjOTyMrFMLoT5IOFrfMRabCgekjqFd5o6PaAMildBu46oFkekIdMuGkkPEpA==";
       };
     };
     "@babel/plugin-transform-classes-7.5.5" = {
@@ -670,13 +670,13 @@ let
         sha512 = "kP/drqTxY6Xt3NNpKiMomfgkNn4o7+vKxK2DDKcBG9sHj51vHqMBGy8wbDS/J4lMxnqs153/T3+DmCEAkC5cpA==";
       };
     };
-    "@babel/plugin-transform-destructuring-7.5.0" = {
+    "@babel/plugin-transform-destructuring-7.6.0" = {
       name = "_at_babel_slash_plugin-transform-destructuring";
       packageName = "@babel/plugin-transform-destructuring";
-      version = "7.5.0";
+      version = "7.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.5.0.tgz";
-        sha512 = "YbYgbd3TryYYLGyC7ZR+Tq8H/+bCmwoaxHfJHupom5ECstzbRLTch6gOQbhEY9Z4hiCNHEURgq06ykFv9JZ/QQ==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.6.0.tgz";
+        sha512 = "2bGIS5P1v4+sWTCnKNDZDxbGvEqi0ijeqM/YqHtVGrvG2y0ySgnEEhXErvE9dA0bnIzY9bIzdFK0jFA46ASIIQ==";
       };
     };
     "@babel/plugin-transform-dotall-regex-7.4.4" = {
@@ -778,13 +778,13 @@ let
         sha512 = "V6y0uaUQrQPXUrmj+hgnks8va2L0zcZymeU7TtWEgdRLNkceafKXEduv7QzgQAE4lT+suwooG9dC7LFhdRAbVQ==";
       };
     };
-    "@babel/plugin-transform-modules-commonjs-7.5.0" = {
+    "@babel/plugin-transform-modules-commonjs-7.6.0" = {
       name = "_at_babel_slash_plugin-transform-modules-commonjs";
       packageName = "@babel/plugin-transform-modules-commonjs";
-      version = "7.5.0";
+      version = "7.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.5.0.tgz";
-        sha512 = "xmHq0B+ytyrWJvQTc5OWAC4ii6Dhr0s22STOoydokG51JjWhyYo5mRPXoi+ZmtHQhZZwuXNN+GG5jy5UZZJxIQ==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.6.0.tgz";
+        sha512 = "Ma93Ix95PNSEngqomy5LSBMAQvYKVe3dy+JlVJSHEXZR5ASL9lQBedMiCyVtmTLraIDVRE3ZjTZvmXXD2Ozw3g==";
       };
     };
     "@babel/plugin-transform-modules-systemjs-7.5.0" = {
@@ -805,13 +805,13 @@ let
         sha512 = "BV3bw6MyUH1iIsGhXlOK6sXhmSarZjtJ/vMiD9dNmpY8QXFFQTj+6v92pcfy1iqa8DeAfJFwoxcrS/TUZda6sw==";
       };
     };
-    "@babel/plugin-transform-named-capturing-groups-regex-7.4.5" = {
+    "@babel/plugin-transform-named-capturing-groups-regex-7.6.0" = {
       name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex";
       packageName = "@babel/plugin-transform-named-capturing-groups-regex";
-      version = "7.4.5";
+      version = "7.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.4.5.tgz";
-        sha512 = "z7+2IsWafTBbjNsOxU/Iv5CvTJlr5w4+HGu1HovKYTtgJ362f7kBcQglkfmlspKKZ3bgrbSGvLfNx++ZJgCWsg==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.6.0.tgz";
+        sha512 = "jem7uytlmrRl3iCAuQyw8BpB4c4LWvSpvIeXKpMb+7j84lkx4m4mYr5ErAcmN5KM7B6BqrAvRGjBIbbzqCczew==";
       };
     };
     "@babel/plugin-transform-new-target-7.4.4" = {
@@ -877,13 +877,13 @@ let
         sha512 = "fz43fqW8E1tAB3DKF19/vxbpib1fuyCwSPE418ge5ZxILnBhWyhtPgz8eh1RCGGJlwvksHkyxMxh0eenFi+kFw==";
       };
     };
-    "@babel/plugin-transform-runtime-7.5.5" = {
+    "@babel/plugin-transform-runtime-7.6.0" = {
       name = "_at_babel_slash_plugin-transform-runtime";
       packageName = "@babel/plugin-transform-runtime";
-      version = "7.5.5";
+      version = "7.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.5.5.tgz";
-        sha512 = "6Xmeidsun5rkwnGfMOp6/z9nSzWpHFNVr2Jx7kwoq4mVatQfQx5S56drBgEHF+XQbKOdIaOiMIINvp/kAwMN+w==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.6.0.tgz";
+        sha512 = "Da8tMf7uClzwUm/pnJ1S93m/aRXmoYNDD7TkHua8xBDdaAs54uZpTWvEt6NGwmoVMb9mZbntfTqmG2oSzN/7Vg==";
       };
     };
     "@babel/plugin-transform-shorthand-properties-7.2.0" = {
@@ -931,13 +931,13 @@ let
         sha512 = "2LNhETWYxiYysBtrBTqL8+La0jIoQQnIScUJc74OYvUGRmkskNY4EzLCnjHBzdmb38wqtTaixpo1NctEcvMDZw==";
       };
     };
-    "@babel/plugin-transform-typescript-7.5.5" = {
+    "@babel/plugin-transform-typescript-7.6.0" = {
       name = "_at_babel_slash_plugin-transform-typescript";
       packageName = "@babel/plugin-transform-typescript";
-      version = "7.5.5";
+      version = "7.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.5.5.tgz";
-        sha512 = "pehKf4m640myZu5B2ZviLaiBlxMCjSZ1qTEO459AXKX5GnPueyulJeCqZFs1nz/Ya2dDzXQ1NxZ/kKNWyD4h6w==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.6.0.tgz";
+        sha512 = "yzw7EopOOr6saONZ3KA3lpizKnWRTe+rfBqg4AmQbSow7ik7fqmzrfIqt053osLwLE2AaTqGinLM2tl6+M/uog==";
       };
     };
     "@babel/plugin-transform-unicode-regex-7.4.4" = {
@@ -967,13 +967,13 @@ let
         sha512 = "2mwqfYMK8weA0g0uBKOt4FE3iEodiHy9/CW0b+nWXcbL+pGzLx8ESYc+j9IIxr6LTDHWKgPm71i9smo02bw+gA==";
       };
     };
-    "@babel/preset-env-7.5.5" = {
+    "@babel/preset-env-7.6.0" = {
       name = "_at_babel_slash_preset-env";
       packageName = "@babel/preset-env";
-      version = "7.5.5";
+      version = "7.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.5.5.tgz";
-        sha512 = "GMZQka/+INwsMz1A5UEql8tG015h5j/qjptpKY2gJ7giy8ohzU710YciJB5rcKsWGWHiW3RUnHib0E5/m3Tp3A==";
+        url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.6.0.tgz";
+        sha512 = "1efzxFv/TcPsNXlRhMzRnkBFMeIqBBgzwmZwlFDw5Ubj0AGLeufxugirwZmkkX/ayi3owsSqoQ4fw8LkfK9SYg==";
       };
     };
     "@babel/preset-flow-7.0.0" = {
@@ -994,22 +994,22 @@ let
         sha512 = "A8ia2Wus0OAP6hh28ZgPSCBJEX3Jnql3kg9di/I+Lmg1gbJXgDZBrHr/UGZXl20Vi1lXgMuUq8c8J899KFr5gA==";
       };
     };
-    "@babel/preset-typescript-7.3.3" = {
+    "@babel/preset-typescript-7.6.0" = {
       name = "_at_babel_slash_preset-typescript";
       packageName = "@babel/preset-typescript";
-      version = "7.3.3";
+      version = "7.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.3.3.tgz";
-        sha512 = "mzMVuIP4lqtn4du2ynEfdO0+RYcslwrZiJHXu4MGaC1ctJiW2fyaeDrtjJGs7R/KebZ1sgowcIoWf4uRpEfKEg==";
+        url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.6.0.tgz";
+        sha512 = "4xKw3tTcCm0qApyT6PqM9qniseCE79xGHiUnNdKGdxNsGUc2X7WwZybqIpnTmoukg3nhPceI5KPNzNqLNeIJww==";
       };
     };
-    "@babel/register-7.5.5" = {
+    "@babel/register-7.6.0" = {
       name = "_at_babel_slash_register";
       packageName = "@babel/register";
-      version = "7.5.5";
+      version = "7.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/register/-/register-7.5.5.tgz";
-        sha512 = "pdd5nNR+g2qDkXZlW1yRCWFlNrAn2PPdnZUB72zjX4l1Vv4fMRRLwyf+n/idFCLI1UgVGboUU8oVziwTBiyNKQ==";
+        url = "https://registry.npmjs.org/@babel/register/-/register-7.6.0.tgz";
+        sha512 = "78BomdN8el+x/nkup9KwtjJXuptW5oXMFmP11WoM2VJBjxrKv4grC3qjpLL8RGGUYUGsm57xnjYFM2uom+jWUQ==";
       };
     };
     "@babel/runtime-7.3.4" = {
@@ -1030,22 +1030,22 @@ let
         sha512 = "TuI4qpWZP6lGOGIuGWtp9sPluqYICmbk8T/1vpSysqJxRPkudh/ofFWyqdcMsDf2s7KvDL4/YHgKyvcS3g9CJQ==";
       };
     };
-    "@babel/runtime-7.5.5" = {
+    "@babel/runtime-7.6.0" = {
       name = "_at_babel_slash_runtime";
       packageName = "@babel/runtime";
-      version = "7.5.5";
+      version = "7.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.5.5.tgz";
-        sha512 = "28QvEGyQyNkB0/m2B4FU7IEZGK2NUrcMtT6BZEFALTguLk+AUT6ofsHtPk5QyjAdUkpMJ+/Em+quwz4HOt30AQ==";
+        url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.6.0.tgz";
+        sha512 = "89eSBLJsxNxOERC0Op4vd+0Bqm6wRMqMbFtV3i0/fbaWw/mJ8Q3eBvgX0G4SyrOOLCtbu98HspF8o09MRT+KzQ==";
       };
     };
-    "@babel/runtime-corejs2-7.5.5" = {
+    "@babel/runtime-corejs2-7.6.0" = {
       name = "_at_babel_slash_runtime-corejs2";
       packageName = "@babel/runtime-corejs2";
-      version = "7.5.5";
+      version = "7.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.5.5.tgz";
-        sha512 = "FYATQVR00NSNi7mUfpPDp7E8RYMXDuO8gaix7u/w3GekfUinKgX1AcTxs7SoiEmoEW9mbpjrwqWSW6zCmw5h8A==";
+        url = "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.6.0.tgz";
+        sha512 = "zbPQzlbyJab2xCYb6VaESn8Tk/XiVpQJU7WvIKiQCwlFyc2NSCzKjqtBXCvpZBbiTOHCx10s2656REVnySwb+A==";
       };
     };
     "@babel/template-7.2.2" = {
@@ -1057,13 +1057,13 @@ let
         sha512 = "zRL0IMM02AUDwghf5LMSSDEz7sBCO2YnNmpg3uWTZj/v1rcG2BmQUvaGU8GhU8BvfMh1k2KIAYZ7Ji9KXPUg7g==";
       };
     };
-    "@babel/template-7.4.4" = {
+    "@babel/template-7.6.0" = {
       name = "_at_babel_slash_template";
       packageName = "@babel/template";
-      version = "7.4.4";
+      version = "7.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/template/-/template-7.4.4.tgz";
-        sha512 = "CiGzLN9KgAvgZsnivND7rkA+AeJ9JB0ciPOD4U59GKbQP2iQl+olF1l76kJOupqidozfZ32ghwBEJDhnk9MEcw==";
+        url = "https://registry.npmjs.org/@babel/template/-/template-7.6.0.tgz";
+        sha512 = "5AEH2EXD8euCk446b7edmgFdub/qfH1SN6Nii3+fyXP807QRx9Q73A2N5hNwRRslC2H9sNzaFhsPubkS4L8oNQ==";
       };
     };
     "@babel/traverse-7.3.4" = {
@@ -1075,13 +1075,13 @@ let
         sha512 = "TvTHKp6471OYEcE/91uWmhR6PrrYywQntCHSaZ8CM8Vmp+pjAusal4nGB2WCCQd0rvI7nOMKn9GnbcvTUz3/ZQ==";
       };
     };
-    "@babel/traverse-7.5.5" = {
+    "@babel/traverse-7.6.0" = {
       name = "_at_babel_slash_traverse";
       packageName = "@babel/traverse";
-      version = "7.5.5";
+      version = "7.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.5.5.tgz";
-        sha512 = "MqB0782whsfffYfSjH4TM+LMjrJnhCNEDMDIjeTpl+ASaUvxcjoiVCo/sM1GhS1pHOXYfWVCYneLjMckuUxDaQ==";
+        url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.6.0.tgz";
+        sha512 = "93t52SaOBgml/xY74lsmt7xOR4ufYvhb5c5qiM6lu4J/dWGMAfAh6eKw4PjLes6DI6nQgearoxnFJk60YchpvQ==";
       };
     };
     "@babel/types-7.0.0-beta.38" = {
@@ -1102,13 +1102,13 @@ let
         sha512 = "WEkp8MsLftM7O/ty580wAmZzN1nDmCACc5+jFzUt+GUFNNIi3LdRlueYz0YIlmJhlZx1QYDMZL5vdWCL0fNjFQ==";
       };
     };
-    "@babel/types-7.5.5" = {
+    "@babel/types-7.6.1" = {
       name = "_at_babel_slash_types";
       packageName = "@babel/types";
-      version = "7.5.5";
+      version = "7.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/types/-/types-7.5.5.tgz";
-        sha512 = "s63F9nJioLqOlW3UkyMd+BYhXt44YuaFm/VV0VwuteqjYwRrObkU7ra9pY4wAJR3oXi8hJrMcrcJdO/HH33vtw==";
+        url = "https://registry.npmjs.org/@babel/types/-/types-7.6.1.tgz";
+        sha512 = "X7gdiuaCmA0uRjCmRtYJNAVCc/q+5xSgsfKJHqMN4iNLILX39677fJE1O40arPMh0TTtS9ItH67yre6c7k6t0g==";
       };
     };
     "@calebboyd/semaphore-1.3.1" = {
@@ -1246,13 +1246,13 @@ let
         sha512 = "k1WGfKRQyhJpIr+P17O5vLIo2ko1PFLKwoetatdduUSt/aQ4J2sJrJwwatdI5Z3SiYk/mRH9S3JpdmMFd/IK4g==";
       };
     };
-    "@evocateur/pacote-9.6.3" = {
+    "@evocateur/pacote-9.6.5" = {
       name = "_at_evocateur_slash_pacote";
       packageName = "@evocateur/pacote";
-      version = "9.6.3";
+      version = "9.6.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@evocateur/pacote/-/pacote-9.6.3.tgz";
-        sha512 = "ExqNqcbdHQprEgKnY/uQz7WRtyHRbQxRl4JnVkSkmtF8qffRrF9K+piZKNLNSkRMOT/3H0e3IP44QVCHaXMWOQ==";
+        url = "https://registry.npmjs.org/@evocateur/pacote/-/pacote-9.6.5.tgz";
+        sha512 = "EI552lf0aG2nOV8NnZpTxNo2PcXKPmDbF9K8eCBFQdIZwHNGN/mi815fxtmUMa2wTa1yndotICIDt/V0vpEx2w==";
       };
     };
     "@gulp-sourcemaps/identity-map-1.0.2" = {
@@ -1273,58 +1273,49 @@ let
         sha1 = "890ae7c5d8c877f6d384860215ace9d7ec945bda";
       };
     };
-    "@hapi/address-2.0.0" = {
+    "@hapi/address-2.1.1" = {
       name = "_at_hapi_slash_address";
       packageName = "@hapi/address";
-      version = "2.0.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@hapi/address/-/address-2.0.0.tgz";
-        sha512 = "mV6T0IYqb0xL1UALPFplXYQmR0twnXG0M6jUswpquqT2sD12BOiCiLy3EvMp/Fy7s3DZElC4/aPjEjo2jeZpvw==";
+        url = "https://registry.npmjs.org/@hapi/address/-/address-2.1.1.tgz";
+        sha512 = "DYuHzu978pP1XW1GD3HGvLnAFjbQTIgc2+V153FGkbS2pgo9haigCdwBnUDrbhaOkgiJlbZvoEqDrcxSLHpiWA==";
       };
     };
-    "@hapi/hoek-6.2.4" = {
-      name = "_at_hapi_slash_hoek";
-      packageName = "@hapi/hoek";
-      version = "6.2.4";
+    "@hapi/bourne-1.3.2" = {
+      name = "_at_hapi_slash_bourne";
+      packageName = "@hapi/bourne";
+      version = "1.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@hapi/hoek/-/hoek-6.2.4.tgz";
-        sha512 = "HOJ20Kc93DkDVvjwHyHawPwPkX44sIrbXazAUDiUXaY2R9JwQGo2PhFfnQtdrsIe4igjG2fPgMra7NYw7qhy0A==";
+        url = "https://registry.npmjs.org/@hapi/bourne/-/bourne-1.3.2.tgz";
+        sha512 = "1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA==";
       };
     };
-    "@hapi/hoek-8.1.0" = {
+    "@hapi/hoek-8.2.4" = {
       name = "_at_hapi_slash_hoek";
       packageName = "@hapi/hoek";
-      version = "8.1.0";
+      version = "8.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.1.0.tgz";
-        sha512 = "b1J4jxYnW+n6lC91V6Pqg9imP9BZq0HNCeM+3sbXg05rQsE9cGYrKFpZjyztVesGmNRE6R+QaEoWGATeIiUVjA==";
+        url = "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.2.4.tgz";
+        sha512 = "Ze5SDNt325yZvNO7s5C4fXDscjJ6dcqLFXJQ/M7dZRQCewuDj2iDUuBi6jLQt+APbW9RjjVEvLr35FXuOEqjow==";
       };
     };
-    "@hapi/joi-15.1.0" = {
+    "@hapi/joi-15.1.1" = {
       name = "_at_hapi_slash_joi";
       packageName = "@hapi/joi";
-      version = "15.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@hapi/joi/-/joi-15.1.0.tgz";
-        sha512 = "n6kaRQO8S+kepUTbXL9O/UOL788Odqs38/VOfoCrATDtTvyfiO3fgjlSRaNkHabpTLgM7qru9ifqXlXbXk8SeQ==";
-      };
-    };
-    "@hapi/marker-1.0.0" = {
-      name = "_at_hapi_slash_marker";
-      packageName = "@hapi/marker";
-      version = "1.0.0";
+      version = "15.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@hapi/marker/-/marker-1.0.0.tgz";
-        sha512 = "JOfdekTXnJexfE8PyhZFyHvHjt81rBFSAbTIRAhF2vv/2Y1JzoKsGqxH/GpZJoF7aEfYok8JVcAHmSz1gkBieA==";
+        url = "https://registry.npmjs.org/@hapi/joi/-/joi-15.1.1.tgz";
+        sha512 = "entf8ZMOK8sc+8YfeOlM8pCfg3b5+WZIKBfUaaJT8UsjAAPjartzxIYm3TIbjvA4u+u++KbcXD38k682nVHDAQ==";
       };
     };
-    "@hapi/topo-3.1.2" = {
+    "@hapi/topo-3.1.3" = {
       name = "_at_hapi_slash_topo";
       packageName = "@hapi/topo";
-      version = "3.1.2";
+      version = "3.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@hapi/topo/-/topo-3.1.2.tgz";
-        sha512 = "r+aumOqJ5QbD6aLPJWqVjMAPsx5pZKz+F5yPqXZ/WWG9JTtHbQqlzrJoknJ0iJxLj9vlXtmpSdjlkszseeG8OA==";
+        url = "https://registry.npmjs.org/@hapi/topo/-/topo-3.1.3.tgz";
+        sha512 = "JmS9/vQK6dcUYn7wc2YZTqzIKubAQcJKu2KCKAru6es482U5RT5fP1EXCPtlXpiK7PR0On/kpQKI4fRKkzpZBQ==";
       };
     };
     "@iarna/toml-2.2.3" = {
@@ -1336,94 +1327,94 @@ let
         sha512 = "FmuxfCuolpLl0AnQ2NHSzoUKWEJDFl63qXjzdoWBVyFCXzMGm1spBzk7LeHNoVCiWCF7mRVms9e6jEV9+MoPbg==";
       };
     };
-    "@ionic/cli-framework-2.1.2" = {
+    "@ionic/cli-framework-2.1.6" = {
       name = "_at_ionic_slash_cli-framework";
       packageName = "@ionic/cli-framework";
-      version = "2.1.2";
+      version = "2.1.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-2.1.2.tgz";
-        sha512 = "PQZ5+T2ccVHTA3tnuGOarQhjB6lkeU9SaVzbkgyUHzBxadfenLFffEyLz7WHaLVQfR2po19NIJ2Hy8dIFKepig==";
+        url = "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-2.1.6.tgz";
+        sha512 = "V0jkrOXfPes0N1ECmiWDgcRZSaWq7PUFCctMNNqe4xwbQ61aDNypEIQCvVdgIk16zVBKrMI4EP94Qplvi6CYGw==";
       };
     };
-    "@ionic/discover-2.0.2" = {
+    "@ionic/discover-2.0.5" = {
       name = "_at_ionic_slash_discover";
       packageName = "@ionic/discover";
-      version = "2.0.2";
+      version = "2.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ionic/discover/-/discover-2.0.2.tgz";
-        sha512 = "W4AMv6bmJzKtAz92m7XA+6rCkvO/9Q6+BJzrO9KD3qIt4rIH//CZP05yFK79XlqI3Vt4Ke0GsqBDuEfgBXaN/Q==";
+        url = "https://registry.npmjs.org/@ionic/discover/-/discover-2.0.5.tgz";
+        sha512 = "4gVq4UvCHzgQtE0Sffc6MZiwDE9XjWhYsKm81h85dz/iVT4sx0c5fFvJzGXg7OFHCsVN2PhmlIwdgmYetqB5Ow==";
       };
     };
-    "@ionic/utils-array-1.0.1" = {
+    "@ionic/utils-array-1.2.0" = {
       name = "_at_ionic_slash_utils-array";
       packageName = "@ionic/utils-array";
-      version = "1.0.1";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ionic/utils-array/-/utils-array-1.0.1.tgz";
-        sha512 = "XqGhwcGS5XwXpQbGi1K97UY1bBZLYlj/DQ5HVE6551C6QF6PRM8WAlpKs4m4Y1MZ5FRLbZOSykcx6q4mlFF5FA==";
+        url = "https://registry.npmjs.org/@ionic/utils-array/-/utils-array-1.2.0.tgz";
+        sha512 = "wJfshi287FRjZM43+w3OkMl4n7hDTmK/9Jxm9Ot5hBDgeLP6Fw/OBb6tt+nGjhRBJbk1oOi7ksJgyBw/+1ldzg==";
       };
     };
-    "@ionic/utils-fs-2.0.3" = {
+    "@ionic/utils-fs-2.0.6" = {
       name = "_at_ionic_slash_utils-fs";
       packageName = "@ionic/utils-fs";
-      version = "2.0.3";
+      version = "2.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-2.0.3.tgz";
-        sha512 = "vTZ7ckBWAPyhOQ/EQKtQK2WdTaNdOJHtHLebOoFLy0Bl/fWlqNAaaLfc9IXkp+eGwYBmpa9t48bHjiHtF1IT5Q==";
+        url = "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-2.0.6.tgz";
+        sha512 = "iU1UwU5NW2nlLvNNE3QoeH6I+wN3a4ypHFcS6Bp7qUDENeI+oTxHzVHKHM6qt7T/24TFLNcHVxcq/pGIt7vgOA==";
       };
     };
-    "@ionic/utils-network-1.0.1" = {
+    "@ionic/utils-network-1.0.4" = {
       name = "_at_ionic_slash_utils-network";
       packageName = "@ionic/utils-network";
-      version = "1.0.1";
+      version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ionic/utils-network/-/utils-network-1.0.1.tgz";
-        sha512 = "3fqq+2SzlWRpf4029Cry86D/Vb/hTc2zO90GtFlCU+3az2IpGQOzGeVrZ8az9pgzROY/hDfdL6VUsvwF4MF20g==";
+        url = "https://registry.npmjs.org/@ionic/utils-network/-/utils-network-1.0.4.tgz";
+        sha512 = "VDWlschcLc6t71AAk54ywycVwahRv2qK82DOxdiN02YwurqXclcT2wmZCjnzAgBOPEepqmxj0mKozPA9YYWcbg==";
       };
     };
-    "@ionic/utils-object-1.0.1" = {
+    "@ionic/utils-object-1.0.4" = {
       name = "_at_ionic_slash_utils-object";
       packageName = "@ionic/utils-object";
-      version = "1.0.1";
+      version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ionic/utils-object/-/utils-object-1.0.1.tgz";
-        sha512 = "SIc8bqsCJA8+zsIPS34TmgTJg0WyqkJzcSEZTdfpMPS+qPq/Sm2yaeDGRhlXGRnfDckulRiCK3mhW2dfNPTGhQ==";
+        url = "https://registry.npmjs.org/@ionic/utils-object/-/utils-object-1.0.4.tgz";
+        sha512 = "B05kWS+Uj0rGrvG1RvAzDBuggstmWM0X4OUb3p9GhZJJQsNK2/0W03VfPOkNuaDi15NF/WFwLS7/yp7kM25mTw==";
       };
     };
-    "@ionic/utils-process-1.0.1" = {
+    "@ionic/utils-process-1.0.4" = {
       name = "_at_ionic_slash_utils-process";
       packageName = "@ionic/utils-process";
-      version = "1.0.1";
+      version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ionic/utils-process/-/utils-process-1.0.1.tgz";
-        sha512 = "kEAte96A5xBA0wJX35ykHERgc4KkYS4Xiq7XsSMo3inBbN2rNUkRIzC+aFM3IFeNKtCqgNgh7t9LczvLDEzdiQ==";
+        url = "https://registry.npmjs.org/@ionic/utils-process/-/utils-process-1.0.4.tgz";
+        sha512 = "F70r4Dup0yz03lDVCiRva2Qz7+VXNtUnfx7pfIFaDQv54sUem7ozG6zl4db5EE3a4RAJUCbM5YQFsAojnEUc+g==";
       };
     };
-    "@ionic/utils-stream-2.0.0" = {
+    "@ionic/utils-stream-2.0.3" = {
       name = "_at_ionic_slash_utils-stream";
       packageName = "@ionic/utils-stream";
-      version = "2.0.0";
+      version = "2.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ionic/utils-stream/-/utils-stream-2.0.0.tgz";
-        sha512 = "xUMsvW6/5R3NpWJD6wkT/324PQ2RU9if9b4SjBgrSBrgKWEiwXopz6JihjRwh1Xq2qn5MiV+2eXSgpq5jnhX0w==";
+        url = "https://registry.npmjs.org/@ionic/utils-stream/-/utils-stream-2.0.3.tgz";
+        sha512 = "Y1OAcJwP8uNCYQiRxywfo85jdOVbfdvRwjuvFVupFrLQet6kOBKh9wHHnivoS9du+Wlq4VjuFh03LmmAaHwenA==";
       };
     };
-    "@ionic/utils-subprocess-1.0.3" = {
+    "@ionic/utils-subprocess-1.0.7" = {
       name = "_at_ionic_slash_utils-subprocess";
       packageName = "@ionic/utils-subprocess";
-      version = "1.0.3";
+      version = "1.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ionic/utils-subprocess/-/utils-subprocess-1.0.3.tgz";
-        sha512 = "JX65/RBWM/25k0Cum61aFalpcWCymX0uDf7B3rBT7ptzuEdawOrA2ho0t3J4wXgCqmHy+Pq0woaAqwg8rccDKw==";
+        url = "https://registry.npmjs.org/@ionic/utils-subprocess/-/utils-subprocess-1.0.7.tgz";
+        sha512 = "QXCqdwSSGiyxgs36faSbxiVIRCUBI6ckmCSWSLRGZAo4EZ7MuPQUqU+oVILkTWTOPAMWNcJtS67zJNMTccsSUg==";
       };
     };
-    "@ionic/utils-terminal-1.0.1" = {
+    "@ionic/utils-terminal-1.0.4" = {
       name = "_at_ionic_slash_utils-terminal";
       packageName = "@ionic/utils-terminal";
-      version = "1.0.1";
+      version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ionic/utils-terminal/-/utils-terminal-1.0.1.tgz";
-        sha512 = "y/mEpPNPW2oYfFGtFTCRbZAmp0Go17S7uNUFGKThV397lmHm3yiPiu0M5cDV9v/UDuOZ7nmz3LqwhtIaPPeK9g==";
+        url = "https://registry.npmjs.org/@ionic/utils-terminal/-/utils-terminal-1.0.4.tgz";
+        sha512 = "+iJbFff7mnJ6ROE465+/DG8eweFmINVy69Bdw9fr8Vcf8WhJWxMw0vd59J/gaUSsHuxoufZYftVXVoWUd8RfWA==";
       };
     };
     "@kbrandwijk/swagger-to-graphql-2.4.3" = {
@@ -1975,58 +1966,58 @@ let
         sha512 = "bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==";
       };
     };
-    "@node-red/editor-api-0.20.7" = {
+    "@node-red/editor-api-0.20.8" = {
       name = "_at_node-red_slash_editor-api";
       packageName = "@node-red/editor-api";
-      version = "0.20.7";
+      version = "0.20.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-0.20.7.tgz";
-        sha512 = "wGuJJ9eyFwHT1PHFOzp+VvXm3MhwKUfxB2uoc6668aKSHILcoOTnOc+i+JUlXxPe2zVu9zulgRiSkrWhDAO2Qw==";
+        url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-0.20.8.tgz";
+        sha512 = "VaetYYU/gu4CgUs80ymiBg9BVw4Ge4kYF4NPgs4S8t/c1BRz2ZZd5idCDw7MaN602eDiYnspx3QMH8X3sqYsTQ==";
       };
     };
-    "@node-red/editor-client-0.20.7" = {
+    "@node-red/editor-client-0.20.8" = {
       name = "_at_node-red_slash_editor-client";
       packageName = "@node-red/editor-client";
-      version = "0.20.7";
+      version = "0.20.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-0.20.7.tgz";
-        sha512 = "svF01v6Mn1MYv5bSg/zL86ToCG2yZW3/7SqWTe4cJ1MRCRvllAb1IVCFnWm8sQcgfOGmaLT9q4Jsgb5HAF8M/w==";
+        url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-0.20.8.tgz";
+        sha512 = "TyZ+ma0jRU/T0BChpl17hHa0cMOnPX9DYFbpyT8p5ghRHIHYYL/3rFFflwB+5bAwbK1Y8Z2LKB7dngzL7jzpTQ==";
       };
     };
-    "@node-red/nodes-0.20.7" = {
+    "@node-red/nodes-0.20.8" = {
       name = "_at_node-red_slash_nodes";
       packageName = "@node-red/nodes";
-      version = "0.20.7";
+      version = "0.20.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-0.20.7.tgz";
-        sha512 = "ZDokAULh6Y+d+8WbjQoYXikinXrV/KVv/q2UGculSgDuDWNIju0A8hQyGBQ3fSBe7PIahl/G4B7Znc4ds1HtEg==";
+        url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-0.20.8.tgz";
+        sha512 = "yR+kNSkUQowQLHpk7buY36Pz5utA3q3n/49LvgvyxxRwgOPUBv4KNaFLDipUjqgD2spaznh+VTAMT8UUO0xeig==";
       };
     };
-    "@node-red/registry-0.20.7" = {
+    "@node-red/registry-0.20.8" = {
       name = "_at_node-red_slash_registry";
       packageName = "@node-red/registry";
-      version = "0.20.7";
+      version = "0.20.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@node-red/registry/-/registry-0.20.7.tgz";
-        sha512 = "TdZVO7DSe21FcF/97zJWVVVaZ7M/z1bbai2vNDIyJA4BFKRadUsCVCkRjgOfJTrmcrvwTqhLKI2yZ53Ovty4HQ==";
+        url = "https://registry.npmjs.org/@node-red/registry/-/registry-0.20.8.tgz";
+        sha512 = "3B5wYJOAWNLa3qhzdFZYqHa8X2+U4mdno6f0GQ2vzaNMdcxM9VvkpXLvmnThcQJsYqbxAiwuaUZUL1mX0KePsA==";
       };
     };
-    "@node-red/runtime-0.20.7" = {
+    "@node-red/runtime-0.20.8" = {
       name = "_at_node-red_slash_runtime";
       packageName = "@node-red/runtime";
-      version = "0.20.7";
+      version = "0.20.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-0.20.7.tgz";
-        sha512 = "q5VNbwPJfSlBMvY4M31Q0EFvCbM85r28lFBQVqY6Qqqh7QgxFKzJWGfkvqg9GBjUo+Wx1QfdMYJxBZlTmYMARg==";
+        url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-0.20.8.tgz";
+        sha512 = "R7X3E8VXGlzXbYd0hTqhgU8rzyc2uNXDb3u37C3rduCViotcKWrQho4n/UdQS4H+T1Bu0H6Zoo+1EGAsQ92nGA==";
       };
     };
-    "@node-red/util-0.20.7" = {
+    "@node-red/util-0.20.8" = {
       name = "_at_node-red_slash_util";
       packageName = "@node-red/util";
-      version = "0.20.7";
+      version = "0.20.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@node-red/util/-/util-0.20.7.tgz";
-        sha512 = "LWFC7wFgm0mZJhv+oSELnmRnFawgAByJA6GCdAOnMSLEHJfqcprSHEIYj+S4/rUnS0xjRgL8FO9D+kOWsgVK0A==";
+        url = "https://registry.npmjs.org/@node-red/util/-/util-0.20.8.tgz";
+        sha512 = "tid1o8fy94b6XU6/8cVDm5Kn9tNWm1AoaLPrhfDxJaObtrcHC6KtEhJJxPq61nhzZxJOuT/DHqBUGwTXTKg7Zg==";
       };
     };
     "@nodelib/fs.stat-1.1.3" = {
@@ -2038,13 +2029,13 @@ let
         sha512 = "shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==";
       };
     };
-    "@octokit/endpoint-5.3.2" = {
+    "@octokit/endpoint-5.3.5" = {
       name = "_at_octokit_slash_endpoint";
       packageName = "@octokit/endpoint";
-      version = "5.3.2";
+      version = "5.3.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-5.3.2.tgz";
-        sha512 = "gRjteEM9I6f4D8vtwU2iGUTn9RX/AJ0SVXiqBUEuYEWVGGAVjSXdT0oNmghH5lvQNWs8mwt6ZaultuG6yXivNw==";
+        url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-5.3.5.tgz";
+        sha512 = "f8KqzIrnzPLiezDsZZPB+K8v8YSv6aKFl7eOu59O46lmlW4HagWl1U6NWl6LmT8d1w7NsKBI3paVtzcnRGO1gw==";
       };
     };
     "@octokit/plugin-enterprise-rest-3.6.2" = {
@@ -2056,13 +2047,13 @@ let
         sha512 = "3wF5eueS5OHQYuAEudkpN+xVeUsg8vYEMMenEzLphUZ7PRZ8OJtDcsreL3ad9zxXmBbaFWzLmFcdob5CLyZftA==";
       };
     };
-    "@octokit/request-5.0.2" = {
+    "@octokit/request-5.1.0" = {
       name = "_at_octokit_slash_request";
       packageName = "@octokit/request";
-      version = "5.0.2";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@octokit/request/-/request-5.0.2.tgz";
-        sha512 = "z1BQr43g4kOL4ZrIVBMHwi68Yg9VbkRUyuAgqCp1rU3vbYa69+2gIld/+gHclw15bJWQnhqqyEb7h5a5EqgZ0A==";
+        url = "https://registry.npmjs.org/@octokit/request/-/request-5.1.0.tgz";
+        sha512 = "I15T9PwjFs4tbWyhtFU2Kq7WDPidYMvRB7spmxoQRZfxSmiqullG+Nz+KbSmpkfnlvHwTr1e31R5WReFRKMXjg==";
       };
     };
     "@octokit/request-error-1.0.4" = {
@@ -2074,13 +2065,13 @@ let
         sha512 = "L4JaJDXn8SGT+5G0uX79rZLv0MNJmfGa4vb4vy1NnpjSnWDLJRy6m90udGwvMmavwsStgbv2QNkPzzTCMmL+ig==";
       };
     };
-    "@octokit/rest-16.28.7" = {
+    "@octokit/rest-16.28.9" = {
       name = "_at_octokit_slash_rest";
       packageName = "@octokit/rest";
-      version = "16.28.7";
+      version = "16.28.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@octokit/rest/-/rest-16.28.7.tgz";
-        sha512 = "cznFSLEhh22XD3XeqJw51OLSfyL2fcFKUO+v2Ep9MTAFfFLS1cK1Zwd1yEgQJmJoDnj4/vv3+fGGZweG+xsbIA==";
+        url = "https://registry.npmjs.org/@octokit/rest/-/rest-16.28.9.tgz";
+        sha512 = "IKGnX+Tvzt7XHhs8f4ajqxyJvYAMNX5nWfoJm4CQj8LZToMiaJgutf5KxxpxoC3y5w7JTJpW5rnWnF4TsIvCLA==";
       };
     };
     "@parcel/fs-1.11.0" = {
@@ -2218,31 +2209,31 @@ let
         sha1 = "a777360b5b39a1a2e5106f8e858f2fd2d060c570";
       };
     };
-    "@sailshq/lodash-3.10.3" = {
+    "@sailshq/lodash-3.10.4" = {
       name = "_at_sailshq_slash_lodash";
       packageName = "@sailshq/lodash";
-      version = "3.10.3";
+      version = "3.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@sailshq/lodash/-/lodash-3.10.3.tgz";
-        sha512 = "XTF5BtsTSiSpTnfqrCGS5Q8FvSHWCywA0oRxFAZo8E1a8k1MMFUvk3VlRk3q/SusEYwy7gvVdyt9vvNlTa2VuA==";
+        url = "https://registry.npmjs.org/@sailshq/lodash/-/lodash-3.10.4.tgz";
+        sha512 = "YXJqp9gdHcZKAmBY/WnwFpPtNQp2huD/ME2YMurH2YHJvxrVzYsmpKw/pb7yINArRpp8E++fwbQd3ajYXGA45Q==";
       };
     };
-    "@schematics/angular-8.2.0" = {
+    "@schematics/angular-8.3.4" = {
       name = "_at_schematics_slash_angular";
       packageName = "@schematics/angular";
-      version = "8.2.0";
+      version = "8.3.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@schematics/angular/-/angular-8.2.0.tgz";
-        sha512 = "DOo2wtk9fk0kHCDA/I+/mRrGKirgeqVhDbgOV4d2gbYSAiTl0s1Gb4eFAkJeovQTlARfaL2PIqDDkNeYjc7xpw==";
+        url = "https://registry.npmjs.org/@schematics/angular/-/angular-8.3.4.tgz";
+        sha512 = "/HO6vZosULsJnwZLG9JLePyaR2g4MePrk27c3H/WbFNN4ajBePe1Mj34q6HCzje30NduLV8B3SykPnG1CoNy5Q==";
       };
     };
-    "@schematics/update-0.802.0" = {
+    "@schematics/update-0.803.4" = {
       name = "_at_schematics_slash_update";
       packageName = "@schematics/update";
-      version = "0.802.0";
+      version = "0.803.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@schematics/update/-/update-0.802.0.tgz";
-        sha512 = "vMcFLTuw9jSlWQq6nNgMQi2fT/wGyaucvjkxFAs7pC+lyRwYws3IkOukbET7WeJ3ix0ZBEhMbPJ8EibUNDITjw==";
+        url = "https://registry.npmjs.org/@schematics/update/-/update-0.803.4.tgz";
+        sha512 = "ZLCUR7VpUkv3zjeOmcny3UAtwHbQLeBeDsoLYIVQZyepqk3kRPBGaW/xYwmNng04bVfMCtcTx9yrs7n4+Lt/Iw==";
       };
     };
     "@sindresorhus/is-0.14.0" = {
@@ -2272,6 +2263,15 @@ let
         sha512 = "CWr7a3rTVrN5Vs8GYReRAvTourbXHOqB1zglcskj05ICH4GZL5BOAza2ARai+qc3Nz0nY08Bozi1x0014KOqlg==";
       };
     };
+    "@snyk/cli-interface-2.1.0" = {
+      name = "_at_snyk_slash_cli-interface";
+      packageName = "@snyk/cli-interface";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.1.0.tgz";
+        sha512 = "b/magC8iNQP9QhSDeV9RQDSaY3sNy57k0UH1Y/sMOSvVLHLsA7dOi/HrPWTiLouyGqcuYzwjkz7bNbu8cwmVDQ==";
+      };
+    };
     "@snyk/composer-lockfile-parser-1.0.3" = {
       name = "_at_snyk_slash_composer-lockfile-parser";
       packageName = "@snyk/composer-lockfile-parser";
@@ -2560,13 +2560,22 @@ let
         sha512 = "6BmYWSBea18+tSjjSC3QIyV93ZKAeNWGM7R6aYt1ryTZXrlHF+QLV0G2yV0viEGVyRkyQsWfMoJ0k/YghBX5sQ==";
       };
     };
-    "@types/body-parser-1.17.0" = {
+    "@types/body-parser-1.17.1" = {
       name = "_at_types_slash_body-parser";
       packageName = "@types/body-parser";
-      version = "1.17.0";
+      version = "1.17.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.17.1.tgz";
+        sha512 = "RoX2EZjMiFMjZh9lmYrwgoP9RTpAjSHiJxdp4oidAQVO02T7HER3xj9UKue5534ULWeqVEkujhWcyvUce+d68w==";
+      };
+    };
+    "@types/bunyan-1.8.6" = {
+      name = "_at_types_slash_bunyan";
+      packageName = "@types/bunyan";
+      version = "1.8.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.17.0.tgz";
-        sha512 = "a2+YeUjPkztKJu5aIF2yArYFQQp8d51wZ7DavSHjFuY1mqVgidGyzEQ41JIVNy82fXj8yPgy2vJmfIywgESW6w==";
+        url = "https://registry.npmjs.org/@types/bunyan/-/bunyan-1.8.6.tgz";
+        sha512 = "YiozPOOsS6bIuz31ilYqR5SlLif4TBWsousN2aCWLi5233nZSX19tFbcQUPdR7xJ8ypPyxkCGNxg0CIV5n9qxQ==";
       };
     };
     "@types/connect-3.4.32" = {
@@ -2587,31 +2596,31 @@ let
         sha512 = "aRnpPa7ysx3aNW60hTiCtLHlQaIFsXFCgQlpakNgDNVFzbtusSY8PwjAQgRWfSk0ekNoBjO51eQRB6upA9uuyw==";
       };
     };
-    "@types/cookies-0.7.2" = {
+    "@types/cookies-0.7.3" = {
       name = "_at_types_slash_cookies";
       packageName = "@types/cookies";
-      version = "0.7.2";
+      version = "0.7.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/cookies/-/cookies-0.7.2.tgz";
-        sha512 = "jnihWgshWystcJKrz8C9hV+Ot9lqOUyAh2RF+o3BEo6K6AS2l4zYCb9GYaBuZ3C6Il59uIGqpE3HvCun4KKeJA==";
+        url = "https://registry.npmjs.org/@types/cookies/-/cookies-0.7.3.tgz";
+        sha512 = "NEkYn8pNsYZIxf3ZrjdPoeyueiPc0RbQClUpTwmdHkpmQQ8iDAlQYKpabuegHy7BJcqTteSTkhURMEs9ZxyEWg==";
       };
     };
-    "@types/cors-2.8.5" = {
+    "@types/cors-2.8.6" = {
       name = "_at_types_slash_cors";
       packageName = "@types/cors";
-      version = "2.8.5";
+      version = "2.8.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/cors/-/cors-2.8.5.tgz";
-        sha512 = "GmK8AKu8i+s+EChK/uZ5IbrXPcPaQKWaNSGevDT/7o3gFObwSUQwqb1jMqxuo+YPvj0ckGzINI+EO7EHcmJjKg==";
+        url = "https://registry.npmjs.org/@types/cors/-/cors-2.8.6.tgz";
+        sha512 = "invOmosX0DqbpA+cE2yoHGUlF/blyf7nB0OGYBBiH27crcVm5NmFaZkLP4Ta1hGaesckCi5lVLlydNJCxkTOSg==";
       };
     };
-    "@types/debug-4.1.4" = {
+    "@types/debug-4.1.5" = {
       name = "_at_types_slash_debug";
       packageName = "@types/debug";
-      version = "4.1.4";
+      version = "4.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/debug/-/debug-4.1.4.tgz";
-        sha512 = "D9MyoQFI7iP5VdpEyPZyjjqIJ8Y8EDNQFIFVLOmeg1rI1xiHOChyUPMPRUVfqFCerxfE+yS3vMyj37F6IdtOoQ==";
+        url = "https://registry.npmjs.org/@types/debug/-/debug-4.1.5.tgz";
+        sha512 = "Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ==";
       };
     };
     "@types/estree-0.0.39" = {
@@ -2632,22 +2641,31 @@ let
         sha512 = "EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==";
       };
     };
-    "@types/express-4.17.0" = {
+    "@types/express-4.17.1" = {
       name = "_at_types_slash_express";
       packageName = "@types/express";
-      version = "4.17.0";
+      version = "4.17.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/express/-/express-4.17.0.tgz";
-        sha512 = "CjaMu57cjgjuZbh9DpkloeGxV45CnMGlVd+XpG7Gm9QgVrd7KFq+X4HY0vM+2v0bczS48Wg7bvnMY5TN+Xmcfw==";
+        url = "https://registry.npmjs.org/@types/express/-/express-4.17.1.tgz";
+        sha512 = "VfH/XCP0QbQk5B5puLqTLEeFgR8lfCJHZJKkInZ9mkYd+u8byX0kztXEQxEk4wZXJs8HI+7km2ALXjn4YKcX9w==";
       };
     };
-    "@types/express-serve-static-core-4.16.7" = {
+    "@types/express-serve-static-core-4.16.9" = {
       name = "_at_types_slash_express-serve-static-core";
       packageName = "@types/express-serve-static-core";
-      version = "4.16.7";
+      version = "4.16.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.16.9.tgz";
+        sha512 = "GqpaVWR0DM8FnRUJYKlWgyARoBUAVfRIeVDZQKOttLFp5SmhhF9YFIYeTPwMd/AXfxlP7xVO2dj1fGu0Q+krKQ==";
+      };
+    };
+    "@types/fs-capacitor-2.0.0" = {
+      name = "_at_types_slash_fs-capacitor";
+      packageName = "@types/fs-capacitor";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.16.7.tgz";
-        sha512 = "847KvL8Q1y3TtFLRTXcVakErLJQgdpFSaq+k043xefz9raEf0C7HalpSY7OW5PyjCnY8P7bPW5t/Co9qqp+USg==";
+        url = "https://registry.npmjs.org/@types/fs-capacitor/-/fs-capacitor-2.0.0.tgz";
+        sha512 = "FKVPOCFbhCvZxpVAMhdBdTfVfXUpsh15wFHgqOKxh9N9vzWZVuWCSijZ5T4U34XYNnuj2oduh6xcs1i+LPI+BQ==";
       };
     };
     "@types/glob-7.1.1" = {
@@ -2659,31 +2677,22 @@ let
         sha512 = "1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==";
       };
     };
-    "@types/graphql-14.2.3" = {
-      name = "_at_types_slash_graphql";
-      packageName = "@types/graphql";
-      version = "14.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/graphql/-/graphql-14.2.3.tgz";
-        sha512 = "UoCovaxbJIxagCvVfalfK7YaNhmxj3BQFRQ2RHQKLiu+9wNXhJnlbspsLHt/YQM99IaLUUFJNzCwzc6W0ypMeQ==";
-      };
-    };
-    "@types/graphql-upload-8.0.0" = {
+    "@types/graphql-upload-8.0.3" = {
       name = "_at_types_slash_graphql-upload";
       packageName = "@types/graphql-upload";
-      version = "8.0.0";
+      version = "8.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/graphql-upload/-/graphql-upload-8.0.0.tgz";
-        sha512 = "xeDYfZb0SeRpCRuivN9TXLEVsbG0F4inFtx03yadZeaTXr1kC224/ZvlV6NKqQ//HNvUxneYcEoUB5ugJc8dnA==";
+        url = "https://registry.npmjs.org/@types/graphql-upload/-/graphql-upload-8.0.3.tgz";
+        sha512 = "hmLg9pCU/GmxBscg8GCr1vmSoEmbItNNxdD5YH2TJkXm//8atjwuprB+xJBK714JG1dkxbbhp5RHX+Pz1KsCMA==";
       };
     };
-    "@types/http-assert-1.5.0" = {
+    "@types/http-assert-1.5.1" = {
       name = "_at_types_slash_http-assert";
       packageName = "@types/http-assert";
-      version = "1.5.0";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/http-assert/-/http-assert-1.5.0.tgz";
-        sha512 = "8CBLG8RmxSvoY07FE6M/QpvJ7J5KzeKqF8eWN7Dq6Ks+lBTQae8Roc2G81lUu2Kw5Ju1gymOuvgyUsussbjAaA==";
+        url = "https://registry.npmjs.org/@types/http-assert/-/http-assert-1.5.1.tgz";
+        sha512 = "PGAK759pxyfXE78NbKxyfRcWYA/KwW17X290cNev/qAsn9eQIxkH4shoNBafH37wewhDG/0p1cHPbK6+SzZjWQ==";
       };
     };
     "@types/keygrip-1.0.1" = {
@@ -2740,22 +2749,22 @@ let
         sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==";
       };
     };
-    "@types/node-10.14.14" = {
+    "@types/node-10.14.18" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "10.14.14";
+      version = "10.14.18";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-10.14.14.tgz";
-        sha512 = "xXD08vZsvpv4xptQXj1+ky22f7ZoKu5ZNI/4l+/BXG3X+XaeZsmaFbbTKuhSE3NjjvRuZFxFf9sQBMXIcZNFMQ==";
+        url = "https://registry.npmjs.org/@types/node/-/node-10.14.18.tgz";
+        sha512 = "ryO3Q3++yZC/+b8j8BdKd/dn9JlzlHBPdm80656xwYUdmPkpTGTjkAdt6BByiNupGPE8w0FhBgvYy/fX9hRNGQ==";
       };
     };
-    "@types/node-12.6.9" = {
+    "@types/node-12.7.5" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "12.6.9";
+      version = "12.7.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-12.6.9.tgz";
-        sha512 = "+YB9FtyxXGyD54p8rXwWaN1EWEyar5L58GlGWgtH2I9rGmLGBQcw63+0jw+ujqVavNuO47S1ByAjm9zdHMnskw==";
+        url = "https://registry.npmjs.org/@types/node/-/node-12.7.5.tgz";
+        sha512 = "9fq4jZVhPNW8r+UYKnxF1e2HkDWOWKM5bC2/7c9wPV835I0aOrVbS/Hw/pWPk2uKrNXQqg9Z959Kz+IYDd5p3w==";
       };
     };
     "@types/node-6.14.7" = {
@@ -2767,13 +2776,13 @@ let
         sha512 = "YbPXbaynBTe0pVExPhL76TsWnxSPeFAvImIsmylpBWn/yfw+lHy+Q68aawvZHsgskT44ZAoeE67GM5f+Brekew==";
       };
     };
-    "@types/node-8.10.51" = {
+    "@types/node-8.10.54" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "8.10.51";
+      version = "8.10.54";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-8.10.51.tgz";
-        sha512 = "cArrlJp3Yv6IyFT/DYe+rlO8o3SIHraALbBW/+CcCYW/a9QucpLI+n2p4sRxAvl2O35TiecpX2heSZtJjvEO+Q==";
+        url = "https://registry.npmjs.org/@types/node/-/node-8.10.54.tgz";
+        sha512 = "kaYyLYf6ICn6/isAyD4K1MyWWd5Q3JgH6bnMN089LUx88+s4W8GvK9Q6JMBVu5vsFFp7pMdSxdKmlBXwH/VFRg==";
       };
     };
     "@types/q-1.5.2" = {
@@ -2794,13 +2803,31 @@ let
         sha512 = "ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==";
       };
     };
-    "@types/serve-static-1.13.2" = {
+    "@types/restify-4.3.6" = {
+      name = "_at_types_slash_restify";
+      packageName = "@types/restify";
+      version = "4.3.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/restify/-/restify-4.3.6.tgz";
+        sha512 = "4l4f0EXnleXQttlhRCXtTuJ8UelsKiAKIK2AAEd2epBHu41aEbM0U2z6E5tUrNwlbxz7qaNBISduGMeg+G3PaA==";
+      };
+    };
+    "@types/semver-5.5.0" = {
+      name = "_at_types_slash_semver";
+      packageName = "@types/semver";
+      version = "5.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/semver/-/semver-5.5.0.tgz";
+        sha512 = "41qEJgBH/TWgo5NFSvBCJ1qkoi3Q6ONSF2avrHq1LVEZfYpdHmj0y9SuTK+u9ZhG1sYQKBL1AWXKyLWP4RaUoQ==";
+      };
+    };
+    "@types/serve-static-1.13.3" = {
       name = "_at_types_slash_serve-static";
       packageName = "@types/serve-static";
-      version = "1.13.2";
+      version = "1.13.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.2.tgz";
-        sha512 = "/BZ4QRLpH/bNYgZgwhKEh+5AsboDBcUdlBYgzoLX0fpj3Y2gp6EApyOlM3bK53wQS/OE1SrdSYBAbux2D1528Q==";
+        url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.3.tgz";
+        sha512 = "oprSwp094zOglVrXdlo/4bAHtKTAxX6VT8FOZlBKrmyLbNvE1zxZyJ6yikMVtHIvwP45+ZQGJn+FdXGKTozq0g==";
       };
     };
     "@types/superagent-3.8.2" = {
@@ -2839,13 +2866,22 @@ let
         sha512 = "mlGER3Aqmq7bqR1tTTIVHq8KSAFFRyGbrxuM8C/H82g6k7r2fS+IMEkIu3D7JHzG10NvPdR8DNx0jr0pwpp4dA==";
       };
     };
-    "@types/ws-6.0.2" = {
+    "@types/ws-6.0.3" = {
       name = "_at_types_slash_ws";
       packageName = "@types/ws";
-      version = "6.0.2";
+      version = "6.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/ws/-/ws-6.0.3.tgz";
+        sha512 = "yBTM0P05Tx9iXGq00BbJPo37ox68R5vaGTXivs6RGh/BQ6QP5zqZDGWdAO6JbRE/iR1l80xeGAwCQS2nMV9S/w==";
+      };
+    };
+    "@types/xml2js-0.4.3" = {
+      name = "_at_types_slash_xml2js";
+      packageName = "@types/xml2js";
+      version = "0.4.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/ws/-/ws-6.0.2.tgz";
-        sha512 = "22XiR1ox9LftTaAtn/c5JCninwc7moaqbkJfaDUb7PkaUitcf5vbTZHdq9dxSMviCm9C3W85rzB8e6yNR70apQ==";
+        url = "https://registry.npmjs.org/@types/xml2js/-/xml2js-0.4.3.tgz";
+        sha512 = "Pv2HGRE4gWLs31In7nsyXEH4uVVsd0HNV9i2dyASvtDIlOtSTr1eczPLDpdEuyv5LWH5LT20GIXwPjkshKWI1g==";
       };
     };
     "@types/zen-observable-0.8.0" = {
@@ -2857,40 +2893,40 @@ let
         sha512 = "te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg==";
       };
     };
-    "@vue/cli-shared-utils-3.10.0" = {
+    "@vue/cli-shared-utils-3.11.0" = {
       name = "_at_vue_slash_cli-shared-utils";
       packageName = "@vue/cli-shared-utils";
-      version = "3.10.0";
+      version = "3.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-3.10.0.tgz";
-        sha512 = "i96XBUtLdWeKFCC/ot12ngqnVikN/dXpelGdyxvNZczCkX7Je0FUdrZkiw0+uTYTu1RmuYWpLs+vb/YQerjiWg==";
+        url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-3.11.0.tgz";
+        sha512 = "D7pst/4v9H1DD66fLxlZOwRR09R03MV0ROdKxBHmh3FmnApCA/RiaolFA/8w+B3CnevYMlV3SJ5fOAgedbswbA==";
       };
     };
-    "@vue/cli-ui-3.10.0" = {
+    "@vue/cli-ui-3.11.0" = {
       name = "_at_vue_slash_cli-ui";
       packageName = "@vue/cli-ui";
-      version = "3.10.0";
+      version = "3.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-3.10.0.tgz";
-        sha512 = "Tekgh54ClA+x3ey3H1td/RVhGt9MG02/z/OtG+q2Dcy9j47bscDDiTv3OJgw64WrH5tqz1aKEA/SibxL9ehS+Q==";
+        url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-3.11.0.tgz";
+        sha512 = "mbCUUOJSPGLQ+wxPTX+NE6HsiCpt3wpv56AuUlCv14mUEkm98p+4xzkgPQ1neYxG7fg5Vn8fExiFvge73Lvzdg==";
       };
     };
-    "@vue/cli-ui-addon-webpack-3.10.0" = {
+    "@vue/cli-ui-addon-webpack-3.11.0" = {
       name = "_at_vue_slash_cli-ui-addon-webpack";
       packageName = "@vue/cli-ui-addon-webpack";
-      version = "3.10.0";
+      version = "3.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-3.10.0.tgz";
-        sha512 = "c930BWpeFu1H+mbUZT4VSLngD95yaOAg9qr21Kq1KMZ3CW7gakbttwpgXjn8edwdkvUl65IpSkdh/n/XyYyXxg==";
+        url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-3.11.0.tgz";
+        sha512 = "q0kELq8c6nPAM74J2NELxn9NdaQ0bqYS9l8EsvLbqfTd/GM7leWytkdO6GYClu1VJ3Ohm3xQsKjpDHCcKSW7tw==";
       };
     };
-    "@vue/cli-ui-addon-widgets-3.10.0" = {
+    "@vue/cli-ui-addon-widgets-3.11.0" = {
       name = "_at_vue_slash_cli-ui-addon-widgets";
       packageName = "@vue/cli-ui-addon-widgets";
-      version = "3.10.0";
+      version = "3.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-3.10.0.tgz";
-        sha512 = "FvPB05n8Gp0TbvWPXnlwcQPSLZIwEY+Mzwh0pMDTN9yoxnf+/xhIt2PwRmFtecIBqyBZAIyYI50wmCxs9c2Hbw==";
+        url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-3.11.0.tgz";
+        sha512 = "iEKaaWyGafYmHJKDd2rISSqMw61L3XX9E9Vo/sVWK0uVITTsSyBmNwZeTcaaEB6YVbZeCHRJtq2Q/JRjvD9SPA==";
       };
     };
     "@webassemblyjs/ast-1.8.1" = {
@@ -3370,13 +3406,13 @@ let
         sha1 = "5faad9c2c07f60dd76770f71cf025b62a63cfd4e";
       };
     };
-    "abab-2.0.0" = {
+    "abab-2.0.1" = {
       name = "abab";
       packageName = "abab";
-      version = "2.0.0";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/abab/-/abab-2.0.0.tgz";
-        sha512 = "sY5AXXVZv4Y1VACTtR11UJCPHHudgY5i26Qj5TypE6DKlIApbwb5uqhXcJ5UUGbvZNRh7EeIoW+LrJumBsKp7w==";
+        url = "https://registry.npmjs.org/abab/-/abab-2.0.1.tgz";
+        sha512 = "1zSbbCuoIjafKZ3mblY5ikvAb0ODUbqBnFuUb7f6uLeQhhGJ0vEV4ntmtxKLT2WgXCO94E07BjunsIw1jOMPZw==";
       };
     };
     "abbrev-1.1.1" = {
@@ -3415,6 +3451,15 @@ let
         sha512 = "jzewKKpZbaYUa6HTThnrl+GrJhzjEAeuc7hTVpZdzg7kupXZFoqQDFwyOwLNbmJKJlmzw8yiipMPkDiuKkT06Q==";
       };
     };
+    "abstract-leveldown-6.1.1" = {
+      name = "abstract-leveldown";
+      packageName = "abstract-leveldown";
+      version = "6.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-6.1.1.tgz";
+        sha512 = "7fK/KySVqzKIomdhkSWzX4YBQhzkzEMbWSiaB6mSN9e+ZdV3KEeKxia/8xQzCkATA5xnnukdP88cFR0D2FsFXw==";
+      };
+    };
     "abstract-logging-1.0.0" = {
       name = "abstract-logging";
       packageName = "abstract-logging";
@@ -3442,15 +3487,6 @@ let
         sha1 = "e5f1f3928c6d95fd96558c36ec3d9d0de4a6ecea";
       };
     };
-    "accepts-1.3.3" = {
-      name = "accepts";
-      packageName = "accepts";
-      version = "1.3.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz";
-        sha1 = "c3ca7434938648c3e0d9c1e328dd68b622c284ca";
-      };
-    };
     "accepts-1.3.7" = {
       name = "accepts";
       packageName = "accepts";
@@ -3514,22 +3550,22 @@ let
         sha512 = "T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==";
       };
     };
-    "acorn-6.2.1" = {
+    "acorn-6.3.0" = {
       name = "acorn";
       packageName = "acorn";
-      version = "6.2.1";
+      version = "6.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-6.2.1.tgz";
-        sha512 = "JD0xT5FCRDNyjDda3Lrg/IxFscp9q4tiYtxE1/nOzlKCk7hIRuYjhq1kCNkbPjMRMZuFq20HNQn1I9k8Oj0E+Q==";
+        url = "https://registry.npmjs.org/acorn/-/acorn-6.3.0.tgz";
+        sha512 = "/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA==";
       };
     };
-    "acorn-dynamic-import-4.0.0" = {
-      name = "acorn-dynamic-import";
-      packageName = "acorn-dynamic-import";
-      version = "4.0.0";
+    "acorn-7.0.0" = {
+      name = "acorn";
+      packageName = "acorn";
+      version = "7.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz";
-        sha512 = "d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==";
+        url = "https://registry.npmjs.org/acorn/-/acorn-7.0.0.tgz";
+        sha512 = "PaF/MduxijYYt7unVGRuds1vBC9bFxbNf+VWqhOClfdgy7RlVkQqt610ig1/yxTgsDIfW1cWDel5EBbOy3jdtQ==";
       };
     };
     "acorn-globals-1.0.9" = {
@@ -3550,13 +3586,13 @@ let
         sha1 = "fd8270f71fbb4996b004fa880ee5d46573a731bf";
       };
     };
-    "acorn-globals-4.3.3" = {
+    "acorn-globals-4.3.4" = {
       name = "acorn-globals";
       packageName = "acorn-globals";
-      version = "4.3.3";
+      version = "4.3.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.3.tgz";
-        sha512 = "vkR40VwS2SYO98AIeFvzWWh+xyc2qi9s7OoXSFEGIP/rOJKzjnhykaZJNnHdoq4BL2gGxI5EZOU16z896EYnOQ==";
+        url = "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.4.tgz";
+        sha512 = "clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A==";
       };
     };
     "acorn-jsx-3.0.1" = {
@@ -3568,13 +3604,13 @@ let
         sha1 = "afdf9488fb1ecefc8348f6fb22f464e32a58b36b";
       };
     };
-    "acorn-jsx-5.0.1" = {
+    "acorn-jsx-5.0.2" = {
       name = "acorn-jsx";
       packageName = "acorn-jsx";
-      version = "5.0.1";
+      version = "5.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.0.1.tgz";
-        sha512 = "HJ7CfNHrfJLlNTzIEUTj43LNWGkqpRLxm3YjAlcD0ACydk9XynzYsCBHxut+iqt+1aBXkx9UP/w/ZqMr13XIzg==";
+        url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.0.2.tgz";
+        sha512 = "tiNTrP1MP0QrChmD2DdupCr6HWSFeKVw5d/dHTu4Y7rkAkRhU/Dt7dphAfIUyxtHpl/eBVip5uTNSpQJHylpAw==";
       };
     };
     "acorn-loose-6.1.0" = {
@@ -3586,13 +3622,13 @@ let
         sha512 = "FHhXoiF0Uch3IqsrnPpWwCtiv5PYvipTpT1k9lDMgQVVYc9iDuSl5zdJV358aI8twfHCYMFBRVYvAVki9wC/ng==";
       };
     };
-    "acorn-node-1.7.0" = {
+    "acorn-node-1.8.2" = {
       name = "acorn-node";
       packageName = "acorn-node";
-      version = "1.7.0";
+      version = "1.8.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn-node/-/acorn-node-1.7.0.tgz";
-        sha512 = "XhahLSsCB6X6CJbe+uNu3Mn9sJBNFxtBN9NLgAOQovfS6Kh0lDUtmlclhjn9CvEK7A7YyRU13PXlNcpSiLI9Yw==";
+        url = "https://registry.npmjs.org/acorn-node/-/acorn-node-1.8.2.tgz";
+        sha512 = "8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A==";
       };
     };
     "acorn-walk-6.2.0" = {
@@ -3604,6 +3640,15 @@ let
         sha512 = "7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==";
       };
     };
+    "acorn-walk-7.0.0" = {
+      name = "acorn-walk";
+      packageName = "acorn-walk";
+      version = "7.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.0.0.tgz";
+        sha512 = "7Bv1We7ZGuU79zZbb6rRqcpxo3OY+zrdtloZWoyD8fmGX+FeXRjE+iuGkZjSXLVovLzrsvMGMy0EkwA0E0umxg==";
+      };
+    };
     "adal-node-0.1.28" = {
       name = "adal-node";
       packageName = "adal-node";
@@ -4180,13 +4225,13 @@ let
         sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==";
       };
     };
-    "ansi-styles-4.0.0" = {
+    "ansi-styles-4.1.0" = {
       name = "ansi-styles";
       packageName = "ansi-styles";
-      version = "4.0.0";
+      version = "4.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.0.0.tgz";
-        sha512 = "8zjUtFJ3db/QoPXuuEMloS2AUf79/yeyttJ7Abr3hteopJu9HK8vsgGviGUMq+zyA6cZZO6gAyZoMTF6TgaEjA==";
+        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.1.0.tgz";
+        sha512 = "Qts4KCLKG+waHc9C4m07weIY8qyeixoS0h6RnbsNVD6Fw+pEZGW3vTyObL3WXpE09Mq4Oi7/lBEyLmOiLtlYWQ==";
       };
     };
     "ansi-term-0.0.2" = {
@@ -4261,13 +4306,13 @@ let
         sha512 = "5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==";
       };
     };
-    "anymatch-3.0.3" = {
+    "anymatch-3.1.0" = {
       name = "anymatch";
       packageName = "anymatch";
-      version = "3.0.3";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/anymatch/-/anymatch-3.0.3.tgz";
-        sha512 = "c6IvoeBECQlMVuYUjSwimnhmztImpErfxJzWZhIQinIvQWoGOnB0dLIgifbPHQt5heS6mNlaZG16f06H3C8t1g==";
+        url = "https://registry.npmjs.org/anymatch/-/anymatch-3.1.0.tgz";
+        sha512 = "Ozz7l4ixzI7Oxj2+cw+p0tVUt27BpaJ+1+q1TCeANWxHpvyn2+Un+YamBdfKu0uh8xLodGhoa1v7595NhKDAuA==";
       };
     };
     "ap-0.1.0" = {
@@ -4306,31 +4351,31 @@ let
         sha512 = "+KA685AV5ETEJfjZuviRTEImGA11uNBp/MJGnaCvkgr+BYRrGLruVKBv6WvyFod27WEB2sp7SsG8cNBKANhGLg==";
       };
     };
-    "apollo-cache-control-0.8.1" = {
+    "apollo-cache-control-0.8.4" = {
       name = "apollo-cache-control";
       packageName = "apollo-cache-control";
-      version = "0.8.1";
+      version = "0.8.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.8.1.tgz";
-        sha512 = "yQy5KB/OuX90PsdztWc4vfc4R//ZmW/AxNgXKWga0xW5OzEsysdJWHAsTzb40/rkJ9VNeQ+0N5wGikiS+jSCzg==";
+        url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.8.4.tgz";
+        sha512 = "IZ1d3AXZtkZhLYo0kWqTbZ6nqLFaeUvLdMESs+9orMadBZ7mvzcAfBwrhKyCWPGeAAZ/jKv8FtYHybpchHgFAg==";
       };
     };
-    "apollo-cache-inmemory-1.6.2" = {
+    "apollo-cache-inmemory-1.6.3" = {
       name = "apollo-cache-inmemory";
       packageName = "apollo-cache-inmemory";
-      version = "1.6.2";
+      version = "1.6.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-cache-inmemory/-/apollo-cache-inmemory-1.6.2.tgz";
-        sha512 = "AyCl3PGFv5Qv1w4N9vlg63GBPHXgMCekZy5mhlS042ji0GW84uTySX+r3F61ZX3+KM1vA4m9hQyctrEGiv5XjQ==";
+        url = "https://registry.npmjs.org/apollo-cache-inmemory/-/apollo-cache-inmemory-1.6.3.tgz";
+        sha512 = "S4B/zQNSuYc0M/1Wq8dJDTIO9yRgU0ZwDGnmlqxGGmFombOZb9mLjylewSfQKmjNpciZ7iUIBbJ0mHlPJTzdXg==";
       };
     };
-    "apollo-client-2.6.3" = {
+    "apollo-client-2.6.4" = {
       name = "apollo-client";
       packageName = "apollo-client";
-      version = "2.6.3";
+      version = "2.6.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-client/-/apollo-client-2.6.3.tgz";
-        sha512 = "DS8pmF5CGiiJ658dG+mDn8pmCMMQIljKJSTeMNHnFuDLV0uAPZoeaAwVFiAmB408Ujqt92oIZ/8yJJAwSIhd4A==";
+        url = "https://registry.npmjs.org/apollo-client/-/apollo-client-2.6.4.tgz";
+        sha512 = "oWOwEOxQ9neHHVZrQhHDbI6bIibp9SHgxaLRVPoGvOFy7OH5XUykZE7hBQAVxq99tQjBzgytaZffQkeWo1B4VQ==";
       };
     };
     "apollo-codegen-0.20.2" = {
@@ -4405,22 +4450,22 @@ let
         sha512 = "0/h5hce2FIGn6Y4+EHMeMINQxFwcgjw1vU+xV3KGaaEgyEAEQ3/n9pyz43M8mOm/JVgg8Eb4CtM1AtCkRQuFGw==";
       };
     };
-    "apollo-datasource-0.6.1" = {
+    "apollo-datasource-0.6.3" = {
       name = "apollo-datasource";
       packageName = "apollo-datasource";
-      version = "0.6.1";
+      version = "0.6.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-0.6.1.tgz";
-        sha512 = "oy7c+9Up8PSZwJ1qTK9Idh1acDpIocvw+C0zcHg14ycvNz7qWHSwLUSaAjuQMd9SYFzB3sxfyEhyfyhIogT2+Q==";
+        url = "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-0.6.3.tgz";
+        sha512 = "gRYyFVpJgHE2hhS+VxMeOerxXQ/QYxWG7T6QddfugJWYAG9DRCl65e2b7txcGq2NP3r+O1iCm4GNwhRBDJbd8A==";
       };
     };
-    "apollo-engine-reporting-1.4.3" = {
+    "apollo-engine-reporting-1.4.6" = {
       name = "apollo-engine-reporting";
       packageName = "apollo-engine-reporting";
-      version = "1.4.3";
+      version = "1.4.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-1.4.3.tgz";
-        sha512 = "xv27qfc9dhi1yaWOhNQRmfF+SoLy74hl+M42arpIWdkoDe22fVTmTIqxqGwo4TFR3Z2OkAV5tNzuuOI/icd0Rg==";
+        url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-1.4.6.tgz";
+        sha512 = "acfb7oFnru/8YQdY4x6+7WJbZfzdVETI8Cl+9ImgUrvUnE8P+f2SsGTKXTC1RuUvve4c56PAvaPgE+z8X1a1Mw==";
       };
     };
     "apollo-engine-reporting-protobuf-0.4.0" = {
@@ -4450,31 +4495,31 @@ let
         sha512 = "t3CO/xIDVsCG2qOvx2MEbuu4b/6LzQjcBBwiVnxclmmFyAxYCIe7rpPlnLHSq7HyOMlCWDMozjoeWfdqYSaLqQ==";
       };
     };
-    "apollo-link-1.2.12" = {
+    "apollo-link-1.2.13" = {
       name = "apollo-link";
       packageName = "apollo-link";
-      version = "1.2.12";
+      version = "1.2.13";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-link/-/apollo-link-1.2.12.tgz";
-        sha512 = "fsgIAXPKThyMVEMWQsUN22AoQI+J/pVXcjRGAShtk97h7D8O+SPskFinCGEkxPeQpE83uKaqafB2IyWdjN+J3Q==";
+        url = "https://registry.npmjs.org/apollo-link/-/apollo-link-1.2.13.tgz";
+        sha512 = "+iBMcYeevMm1JpYgwDEIDt/y0BB7VWyvlm/7x+TIPNLHCTCMgcEgDuW5kH86iQZWo0I7mNwQiTOz+/3ShPFmBw==";
       };
     };
-    "apollo-link-context-1.0.18" = {
+    "apollo-link-context-1.0.19" = {
       name = "apollo-link-context";
       packageName = "apollo-link-context";
-      version = "1.0.18";
+      version = "1.0.19";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-link-context/-/apollo-link-context-1.0.18.tgz";
-        sha512 = "aG5cbUp1zqOHHQjAJXG7n/izeMQ6LApd/whEF5z6qZp5ATvcyfSNkCfy3KRJMMZZ3iNfVTs6jF+IUA8Zvf+zeg==";
+        url = "https://registry.npmjs.org/apollo-link-context/-/apollo-link-context-1.0.19.tgz";
+        sha512 = "TUi5TyufU84hEiGkpt+5gdH5HkB3Gx46npNfoxR4of3DKBCMuItGERt36RCaryGcU/C3u2zsICU3tJ+Z9LjFoQ==";
       };
     };
-    "apollo-link-http-common-0.2.14" = {
+    "apollo-link-http-common-0.2.15" = {
       name = "apollo-link-http-common";
       packageName = "apollo-link-http-common";
-      version = "0.2.14";
+      version = "0.2.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-link-http-common/-/apollo-link-http-common-0.2.14.tgz";
-        sha512 = "v6mRU1oN6XuX8beVIRB6OpF4q1ULhSnmy7ScnHnuo1qV6GaFmDcbdvXqxIkAV1Q8SQCo2lsv4HeqJOWhFfApOg==";
+        url = "https://registry.npmjs.org/apollo-link-http-common/-/apollo-link-http-common-0.2.15.tgz";
+        sha512 = "+Heey4S2IPsPyTf8Ag3PugUupASJMW894iVps6hXbvwtg1aHSNMXUYO5VG7iRHkPzqpuzT4HMBanCTXPjtGzxg==";
       };
     };
     "apollo-link-persisted-queries-0.2.2" = {
@@ -4495,13 +4540,13 @@ let
         sha512 = "xMPcAfuiPVYXaLwC6oJFIZrKgV3GmdO31Ag2eufRoXpvT0AfJZjdaPB4450Nu9TslHRePN9A3quxNueILlQxlw==";
       };
     };
-    "apollo-link-ws-1.0.18" = {
+    "apollo-link-ws-1.0.19" = {
       name = "apollo-link-ws";
       packageName = "apollo-link-ws";
-      version = "1.0.18";
+      version = "1.0.19";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-link-ws/-/apollo-link-ws-1.0.18.tgz";
-        sha512 = "nrWh9m7k1FQw1AK1GB1VTJS0o01cpsP2RYmTAh2j+P4lL2/72WgsblhbuF+yA1/jsgVrzg6xa+TNw3UwgGp3+g==";
+        url = "https://registry.npmjs.org/apollo-link-ws/-/apollo-link-ws-1.0.19.tgz";
+        sha512 = "mRXmeUkc55ixOdYRtfq5rq3o9sboKghKABKroDVhJnkdS56zthBEWMAD+phajujOUbqByxjok0te8ABqByBdeQ==";
       };
     };
     "apollo-server-caching-0.5.0" = {
@@ -4513,67 +4558,67 @@ let
         sha512 = "l7ieNCGxUaUAVAAp600HjbUJxVaxjJygtPV0tPTe1Q3HkPy6LEWoY6mNHV7T268g1hxtPTxcdRu7WLsJrg7ufw==";
       };
     };
-    "apollo-server-core-2.8.1" = {
+    "apollo-server-core-2.9.3" = {
       name = "apollo-server-core";
       packageName = "apollo-server-core";
-      version = "2.8.1";
+      version = "2.9.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.8.1.tgz";
-        sha512 = "BpvhKdycTI1v5n8biJ5c/DVF7MCbTL3JtB9llHGkqYgHaTH1gXguh2qD8Vcki+rpUNO5P1lcj5V6oVXoSUFXlA==";
+        url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.9.3.tgz";
+        sha512 = "KQpOM3nAXdMqKVE0HHcOkH/EVhyDqFEKLNFlsyGHGOn9ujpI6RsltX+YpXRyAdbfQHpTk11v/IAo6XksWN+g1Q==";
       };
     };
-    "apollo-server-env-2.4.1" = {
+    "apollo-server-env-2.4.3" = {
       name = "apollo-server-env";
       packageName = "apollo-server-env";
-      version = "2.4.1";
+      version = "2.4.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-2.4.1.tgz";
-        sha512 = "J4G1Q6qyb7KjjqvQdVM5HUH3QDb52VK1Rv+MWL0rHcstJx9Fh/NK0sS+nujrMfKw57NVUs2d4KuYtl/EnW/txg==";
+        url = "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-2.4.3.tgz";
+        sha512 = "23R5Xo9OMYX0iyTu2/qT0EUb+AULCBriA9w8HDfMoChB8M+lFClqUkYtaTTHDfp6eoARLW8kDBhPOBavsvKAjA==";
       };
     };
-    "apollo-server-errors-2.3.1" = {
+    "apollo-server-errors-2.3.3" = {
       name = "apollo-server-errors";
       packageName = "apollo-server-errors";
-      version = "2.3.1";
+      version = "2.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-server-errors/-/apollo-server-errors-2.3.1.tgz";
-        sha512 = "errZvnh0vUQChecT7M4A/h94dnBSRL213dNxpM5ueMypaLYgnp4hiCTWIEaooo9E4yMGd1qA6WaNbLDG2+bjcg==";
+        url = "https://registry.npmjs.org/apollo-server-errors/-/apollo-server-errors-2.3.3.tgz";
+        sha512 = "MO4oJ129vuCcbqwr5ZwgxqGGiLz3hCyowz0bstUF7MR+vNGe4oe3DWajC9lv4CxrhcqUHQOeOPViOdIo1IxE3g==";
       };
     };
-    "apollo-server-express-2.8.1" = {
+    "apollo-server-express-2.9.3" = {
       name = "apollo-server-express";
       packageName = "apollo-server-express";
-      version = "2.8.1";
+      version = "2.9.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.8.1.tgz";
-        sha512 = "XoWqSuNQkL8ivBq5LXJW6wV0/Ef+m8w4fAK/7PBspLHVfDAbHRyRr6zraotim2Kl7NOnzcqHtb6sB9yozjL0hA==";
+        url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.9.3.tgz";
+        sha512 = "Hkfs+ce6GqaoSzDOJs8Pj7W3YUjH0BzGglo5HMsOXOnjPZ0pJE9v8fmK76rlkITLw7GjvIq5GKlafymC31FMBw==";
       };
     };
-    "apollo-server-plugin-base-0.6.1" = {
+    "apollo-server-plugin-base-0.6.4" = {
       name = "apollo-server-plugin-base";
       packageName = "apollo-server-plugin-base";
-      version = "0.6.1";
+      version = "0.6.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.6.1.tgz";
-        sha512 = "gLLF0kz4QOOyczDGWuR2ZNDfa1nHfyFNG76ue8Es0/0ujnMT9KoSokXkx1hDh0X7FFTMj/MelYYoNEqgTH88zw==";
+        url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.6.4.tgz";
+        sha512 = "4rY+cBAIpQomGWYBtk8hHkLQWHrh5hgIBPQqmhXh00YFdcY+Ob1/cU2/2iqTcIzhtcaezsc8OZ63au6ahSBQqg==";
       };
     };
-    "apollo-server-types-0.2.1" = {
+    "apollo-server-types-0.2.4" = {
       name = "apollo-server-types";
       packageName = "apollo-server-types";
-      version = "0.2.1";
+      version = "0.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.2.1.tgz";
-        sha512 = "ls26d6jjY7x91ctLWtbpQHGW0lcFR1LcOpDvBQUC2aCwQzuW/6yV7F3hfcEdLR9pjIxcA4yAtFQcKf5olDWVkA==";
+        url = "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.2.4.tgz";
+        sha512 = "G4FvBVgGQcTW6ZBS2+hvcDQkSfdOIKV+cHADduXA275v+5zl42g+bCaGd/hCCKTDRjmQvObLiMxH/BJ6pDMQgA==";
       };
     };
-    "apollo-tracing-0.8.1" = {
+    "apollo-tracing-0.8.4" = {
       name = "apollo-tracing";
       packageName = "apollo-tracing";
-      version = "0.8.1";
+      version = "0.8.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.8.1.tgz";
-        sha512 = "zhVNC7N6hg9IJEeSEXFDxcnXD5GJQAbHxaoKVBKEolcIIsz6EGd700ORdagJgFKLReVp9O65HPrZJCg66sVx7g==";
+        url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.8.4.tgz";
+        sha512 = "DjbFW0IvHicSlTVG+vK+1WINfBMRCdPPHJSW/j65JMir9Oe56WGeqL8qz8hptdUUmLYEb+azvcyyGsJsiR3zpQ==";
       };
     };
     "apollo-upload-client-10.0.1" = {
@@ -5719,13 +5764,13 @@ let
         sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3";
       };
     };
-    "aws-sdk-2.504.0" = {
+    "aws-sdk-2.529.0" = {
       name = "aws-sdk";
       packageName = "aws-sdk";
-      version = "2.504.0";
+      version = "2.529.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.504.0.tgz";
-        sha512 = "azOX54oovJv0zWzO23fBgIprwsvx8KUuMR+cAUAOx23D8LJ5S+sl3UYS9Q1X4qF/blBTa4+ZNawZDV0N1HiQmw==";
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.529.0.tgz";
+        sha512 = "CtRxgI4ZVZ8cdFCddlIVIy06cEW5gzTJBpyouZ/ySgZ6BiYj+0e77LwoNsnQE2nUNWCbydTLn3dbz4ZZMDpuIg==";
       };
     };
     "aws-sign2-0.6.0" = {
@@ -6088,13 +6133,13 @@ let
         sha512 = "ab0LlM5Q3pcKm+V6F6yx2ShzGOTYMcmJvLdL3PQsC9hF+hrYsBdkTCdNZdlPBgrSB8jp5vzhmK83qHGRs14hHw==";
       };
     };
-    "azure-keyvault-3.0.4" = {
+    "azure-keyvault-3.0.5" = {
       name = "azure-keyvault";
       packageName = "azure-keyvault";
-      version = "3.0.4";
+      version = "3.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-keyvault/-/azure-keyvault-3.0.4.tgz";
-        sha1 = "b7733d8f58d99a66f9ae766451556eb3b058dae5";
+        url = "https://registry.npmjs.org/azure-keyvault/-/azure-keyvault-3.0.5.tgz";
+        sha512 = "59fzKRq9dnzv03lEuImvgXc3QjRJoSJtK0gv1WXoqCivBuPdFNK+x6hAjoEDS2WEOXG+7m3uiJWqpMh/8NW3ow==";
       };
     };
     "azure-monitoring-0.10.6" = {
@@ -6322,13 +6367,13 @@ let
         sha512 = "Vj97CTn/lE9hR1D+jKUeHfNy+m1baNiJ1wJvoGyOBUx7F7kJqDZxr9nCHjO/Ad+irbR3HzR6jABpSSA29QsrXQ==";
       };
     };
-    "babel-plugin-minify-dead-code-elimination-0.5.0" = {
+    "babel-plugin-minify-dead-code-elimination-0.5.1" = {
       name = "babel-plugin-minify-dead-code-elimination";
       packageName = "babel-plugin-minify-dead-code-elimination";
-      version = "0.5.0";
+      version = "0.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/babel-plugin-minify-dead-code-elimination/-/babel-plugin-minify-dead-code-elimination-0.5.0.tgz";
-        sha512 = "XQteBGXlgEoAKc/BhO6oafUdT4LBa7ARi55mxoyhLHNuA+RlzRmeMAfc31pb/UqU01wBzRc36YqHQzopnkd/6Q==";
+        url = "https://registry.npmjs.org/babel-plugin-minify-dead-code-elimination/-/babel-plugin-minify-dead-code-elimination-0.5.1.tgz";
+        sha512 = "x8OJOZIrRmQBcSqxBcLbMIK8uPmTvNWPXH2bh5MDCW1latEqYiRMuUkPImKcfpo59pTUB2FT7HfcgtG8ZlR5Qg==";
       };
     };
     "babel-plugin-minify-flip-comparisons-0.4.3" = {
@@ -6340,13 +6385,13 @@ let
         sha1 = "00ca870cb8f13b45c038b3c1ebc0f227293c965a";
       };
     };
-    "babel-plugin-minify-guarded-expressions-0.4.3" = {
+    "babel-plugin-minify-guarded-expressions-0.4.4" = {
       name = "babel-plugin-minify-guarded-expressions";
       packageName = "babel-plugin-minify-guarded-expressions";
-      version = "0.4.3";
+      version = "0.4.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/babel-plugin-minify-guarded-expressions/-/babel-plugin-minify-guarded-expressions-0.4.3.tgz";
-        sha1 = "cc709b4453fd21b1f302877444c89f88427ce397";
+        url = "https://registry.npmjs.org/babel-plugin-minify-guarded-expressions/-/babel-plugin-minify-guarded-expressions-0.4.4.tgz";
+        sha512 = "RMv0tM72YuPPfLT9QLr3ix9nwUIq+sHT6z8Iu3sLbqldzC1Dls8DPCywzUIzkTx9Zh1hWX4q/m9BPoPed9GOfA==";
       };
     };
     "babel-plugin-minify-infinity-0.4.3" = {
@@ -6385,13 +6430,13 @@ let
         sha512 = "aXZiaqWDNUbyNNNpWs/8NyST+oU7QTpK7J9zFEFSA0eOmtUNMU3fczlTTTlnCxHmq/jYNFEmkkSG3DDBtW3Y4Q==";
       };
     };
-    "babel-plugin-minify-simplify-0.5.0" = {
+    "babel-plugin-minify-simplify-0.5.1" = {
       name = "babel-plugin-minify-simplify";
       packageName = "babel-plugin-minify-simplify";
-      version = "0.5.0";
+      version = "0.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/babel-plugin-minify-simplify/-/babel-plugin-minify-simplify-0.5.0.tgz";
-        sha512 = "TM01J/YcKZ8XIQd1Z3nF2AdWHoDsarjtZ5fWPDksYZNsoOjQ2UO2EWm824Ym6sp127m44gPlLFiO5KFxU8pA5Q==";
+        url = "https://registry.npmjs.org/babel-plugin-minify-simplify/-/babel-plugin-minify-simplify-0.5.1.tgz";
+        sha512 = "OSYDSnoCxP2cYDMk9gxNAed6uJDiDz65zgL6h8d3tm8qXIagWGMLWhqysT6DY3Vs7Fgq7YUDcjOomhVUb+xX6A==";
       };
     };
     "babel-plugin-minify-type-constructors-0.4.3" = {
@@ -6583,13 +6628,13 @@ let
         sha1 = "8ec7a03a138f001a1a8fb1e8113652bf1a55da46";
       };
     };
-    "babel-preset-minify-0.5.0" = {
+    "babel-preset-minify-0.5.1" = {
       name = "babel-preset-minify";
       packageName = "babel-preset-minify";
-      version = "0.5.0";
+      version = "0.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/babel-preset-minify/-/babel-preset-minify-0.5.0.tgz";
-        sha512 = "xj1s9Mon+RFubH569vrGCayA9Fm2GMsCgDRm1Jb8SgctOB7KFcrVc2o8K3YHUyMz+SWP8aea75BoS8YfsXXuiA==";
+        url = "https://registry.npmjs.org/babel-preset-minify/-/babel-preset-minify-0.5.1.tgz";
+        sha512 = "1IajDumYOAPYImkHbrKeiN5AKKP9iOmRoO2IPbIuVp0j2iuCcj0n7P260z38siKMZZ+85d3mJZdtW8IgOv+Tzg==";
       };
     };
     "babel-register-6.26.0" = {
@@ -6790,15 +6835,6 @@ let
         sha512 = "mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==";
       };
     };
-    "base64-url-1.2.1" = {
-      name = "base64-url";
-      packageName = "base64-url";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/base64-url/-/base64-url-1.2.1.tgz";
-        sha1 = "199fd661702a0e7b7dcae6e0698bb089c52f6d78";
-      };
-    };
     "base64-url-2.3.2" = {
       name = "base64-url";
       packageName = "base64-url";
@@ -6844,15 +6880,6 @@ let
         sha1 = "e9be8ce33540cada4881768c59bd63865736e913";
       };
     };
-    "basic-auth-1.0.4" = {
-      name = "basic-auth";
-      packageName = "basic-auth";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/basic-auth/-/basic-auth-1.0.4.tgz";
-        sha1 = "030935b01de7c9b94a824b29f3fccb750d3a5290";
-      };
-    };
     "basic-auth-1.1.0" = {
       name = "basic-auth";
       packageName = "basic-auth";
@@ -6871,24 +6898,6 @@ let
         sha512 = "NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==";
       };
     };
-    "basic-auth-connect-1.0.0" = {
-      name = "basic-auth-connect";
-      packageName = "basic-auth-connect";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/basic-auth-connect/-/basic-auth-connect-1.0.0.tgz";
-        sha1 = "fdb0b43962ca7b40456a7c2bb48fe173da2d2122";
-      };
-    };
-    "batch-0.5.3" = {
-      name = "batch";
-      packageName = "batch";
-      version = "0.5.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/batch/-/batch-0.5.3.tgz";
-        sha1 = "3f3414f380321743bfc1042f9a83ff1d5824d464";
-      };
-    };
     "batch-0.6.1" = {
       name = "batch";
       packageName = "batch";
@@ -7177,31 +7186,31 @@ let
         sha512 = "fvb6M58Ceiv/S94nu6zeaiMoJvUYOeIqRbgaClm+kJTzCAqJPtAR/31pXNYB5iEReOoKqQB5zY33gY0W6ZRWQQ==";
       };
     };
-    "bittorrent-dht-9.0.1" = {
+    "bittorrent-dht-9.0.3" = {
       name = "bittorrent-dht";
       packageName = "bittorrent-dht";
-      version = "9.0.1";
+      version = "9.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-9.0.1.tgz";
-        sha512 = "DgymMDZyv5y0pyys73pFa3rImRliqxkiDvVwJ35e+co6MHQJ30M5ZvTstwJ38CtdMlF36RoLnL2z14ICl7pv/A==";
+        url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-9.0.3.tgz";
+        sha512 = "6FISjApL62THEMyptDm0kPTAnInBn8Sft3dK/JZcCI07LRIpIP+3Z6gle6xJUhyRVs6K5HmXAtaRatFsOEySOg==";
       };
     };
-    "bittorrent-peerid-1.3.0" = {
+    "bittorrent-peerid-1.3.2" = {
       name = "bittorrent-peerid";
       packageName = "bittorrent-peerid";
-      version = "1.3.0";
+      version = "1.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bittorrent-peerid/-/bittorrent-peerid-1.3.0.tgz";
-        sha512 = "SYd5H3RbN1ex+TrWAKXkEkASFWxAR7Tk6iLt9tfAT9ehBvZb/Y3AQDVRVJynlrixcWpnmsLYKI7tkRWgp7ORoQ==";
+        url = "https://registry.npmjs.org/bittorrent-peerid/-/bittorrent-peerid-1.3.2.tgz";
+        sha512 = "3xPhNfklf4xzxFVw9Y7W5dnGNhubVF0r8BK3imIsB6E3aDA4d6WhsceK1Yusos0TiiB9QZrdCsVXVqs26sFMxw==";
       };
     };
-    "bittorrent-protocol-3.1.0" = {
+    "bittorrent-protocol-3.1.1" = {
       name = "bittorrent-protocol";
       packageName = "bittorrent-protocol";
-      version = "3.1.0";
+      version = "3.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bittorrent-protocol/-/bittorrent-protocol-3.1.0.tgz";
-        sha512 = "XPi4PpU8iaHA1HC8ku+3kr+r6TzhG8WFprJs/yUzTE67JSkRcKO5X+XphqeQPj6LkP0syNcUUOp22EDV7Eg4Sg==";
+        url = "https://registry.npmjs.org/bittorrent-protocol/-/bittorrent-protocol-3.1.1.tgz";
+        sha512 = "kthSXghQ9DRQ4Lrjr1ceyIeEMeL5x9WiaSrQyR+5Nrr3g9QY6MvDeq+KLQz17R6094iDmT/LgFbQYAPj09/oUA==";
       };
     };
     "bittorrent-tracker-7.7.0" = {
@@ -7213,13 +7222,13 @@ let
         sha1 = "ffd2eabc141d36ed5c1817df7e992f91fd7fc65c";
       };
     };
-    "bittorrent-tracker-9.12.1" = {
+    "bittorrent-tracker-9.14.4" = {
       name = "bittorrent-tracker";
       packageName = "bittorrent-tracker";
-      version = "9.12.1";
+      version = "9.14.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-9.12.1.tgz";
-        sha512 = "5gjqHG3xV3eEy3UOOn4kkB09sl66t+fYzBGFMI83lRC/+33xmgpDYnu2lOnjYdRPAKWv0nBJT5XR/l9JkQ341A==";
+        url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-9.14.4.tgz";
+        sha512 = "2Y/MNRjYhysD6t4r38z7l1WTT7g23IAqRWZRsj7xnnpciFn4xE4qiKmyFwA4gtbFGAZ14K3DdaqZbiQsC3PEfQ==";
       };
     };
     "bl-0.8.2" = {
@@ -7249,15 +7258,6 @@ let
         sha512 = "e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==";
       };
     };
-    "bl-2.2.0" = {
-      name = "bl";
-      packageName = "bl";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bl/-/bl-2.2.0.tgz";
-        sha512 = "wbgvOpqopSr7uq6fJrLH8EsvYMJf9gzfo2jCsL2eTy75qXPukA4pCgHamOQkZtY5vmfVtjB+P3LNlMHW5CEZXA==";
-      };
-    };
     "bl-3.0.0" = {
       name = "bl";
       packageName = "bl";
@@ -7321,15 +7321,6 @@ let
         sha1 = "b89562bd6994af95ba1e812155536333aa23cf24";
       };
     };
-    "blob-0.0.4" = {
-      name = "blob";
-      packageName = "blob";
-      version = "0.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/blob/-/blob-0.0.4.tgz";
-        sha1 = "bcf13052ca54463f30f9fc7e95b9a47630a94921";
-      };
-    };
     "blob-0.0.5" = {
       name = "blob";
       packageName = "blob";
@@ -7483,15 +7474,6 @@ let
         sha1 = "090700c4ba28862a8520ef378395fdee5f61c229";
       };
     };
-    "body-parser-1.13.3" = {
-      name = "body-parser";
-      packageName = "body-parser";
-      version = "1.13.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/body-parser/-/body-parser-1.13.3.tgz";
-        sha1 = "c08cf330c3358e151016a05746f13f029c97fa97";
-      };
-    };
     "body-parser-1.18.3" = {
       name = "body-parser";
       packageName = "body-parser";
@@ -7780,13 +7762,13 @@ let
         sha512 = "qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==";
       };
     };
-    "browserify-16.3.0" = {
+    "browserify-16.5.0" = {
       name = "browserify";
       packageName = "browserify";
-      version = "16.3.0";
+      version = "16.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browserify/-/browserify-16.3.0.tgz";
-        sha512 = "BWaaD7alyGZVEBBwSTYx4iJF5DswIGzK17o8ai9w4iKRbYpk3EOiprRHMRRA8DCZFmFeOdx7A385w2XdFvxWmg==";
+        url = "https://registry.npmjs.org/browserify/-/browserify-16.5.0.tgz";
+        sha512 = "6bfI3cl76YLAnCZ75AGu/XPOsqUhRyc0F/olGIJeCxtfxF2HvPKEcmjU9M8oAPxl4uBY1U7Nry33Q6koV3f2iw==";
       };
     };
     "browserify-aes-1.2.0" = {
@@ -7879,13 +7861,13 @@ let
         sha512 = "Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==";
       };
     };
-    "browserslist-4.6.6" = {
+    "browserslist-4.7.0" = {
       name = "browserslist";
       packageName = "browserslist";
-      version = "4.6.6";
+      version = "4.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browserslist/-/browserslist-4.6.6.tgz";
-        sha512 = "D2Nk3W9JL9Fp/gIcWei8LrERCS+eXu9AM5cfXA8WEZ84lFks+ARnZ0q/R69m2SV3Wjma83QDDPxsNKXUwdIsyA==";
+        url = "https://registry.npmjs.org/browserslist/-/browserslist-4.7.0.tgz";
+        sha512 = "9rGNDtnj+HaahxiVV38Gn8n8Lr8REKsel68v1sPFfIGEK6uSXTY3h9acgiT1dZVtOOUtifo/Dn8daDQ5dUgVsA==";
       };
     };
     "btoa-lite-1.0.0" = {
@@ -7933,13 +7915,13 @@ let
         sha1 = "6d1bb601b07a4efced97094132093027c95bc298";
       };
     };
-    "buffer-5.2.1" = {
+    "buffer-5.4.3" = {
       name = "buffer";
       packageName = "buffer";
-      version = "5.2.1";
+      version = "5.4.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/buffer/-/buffer-5.2.1.tgz";
-        sha512 = "c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg==";
+        url = "https://registry.npmjs.org/buffer/-/buffer-5.4.3.tgz";
+        sha512 = "zvj65TkFeIt3i6aj5bIvJDzjjQQGs4o/sNoezg1F1kYap9Nu2jcUdpwzRSJTHMMzG0H7bZkn4rNQpImhuxWX2A==";
       };
     };
     "buffer-alloc-1.2.0" = {
@@ -8122,13 +8104,22 @@ let
         sha1 = "7afd74a45f937fa422a1d338c08bbfdc76cd725d";
       };
     };
-    "bufrw-1.2.1" = {
+    "bufrw-1.3.0" = {
       name = "bufrw";
       packageName = "bufrw";
-      version = "1.2.1";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bufrw/-/bufrw-1.3.0.tgz";
+        sha512 = "jzQnSbdJqhIltU9O5KUiTtljP9ccw2u5ix59McQy4pV2xGhVLhRZIndY8GIrgh5HjXa6+QJ9AQhOd2QWQizJFQ==";
+      };
+    };
+    "builtin-modules-1.1.1" = {
+      name = "builtin-modules";
+      packageName = "builtin-modules";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bufrw/-/bufrw-1.2.1.tgz";
-        sha1 = "93f222229b4f5f5e2cd559236891407f9853663b";
+        url = "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz";
+        sha1 = "270f076c5a72c02f5b65a47df94c5fe3a278892f";
       };
     };
     "builtin-modules-2.0.0" = {
@@ -8266,15 +8257,6 @@ let
         sha1 = "ac93c410e2ffc9cc7cf4b464b38289067f5e47b4";
       };
     };
-    "bytes-2.4.0" = {
-      name = "bytes";
-      packageName = "bytes";
-      version = "2.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bytes/-/bytes-2.4.0.tgz";
-        sha1 = "7d97196f9d5baf7f6935e25985549edd2a6c2339";
-      };
-    };
     "bytes-3.0.0" = {
       name = "bytes";
       packageName = "bytes";
@@ -8311,13 +8293,13 @@ let
         sha1 = "3fb410c7e91558eb1ab22a82834577aa6bd61d42";
       };
     };
-    "cacache-12.0.2" = {
+    "cacache-12.0.3" = {
       name = "cacache";
       packageName = "cacache";
-      version = "12.0.2";
+      version = "12.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cacache/-/cacache-12.0.2.tgz";
-        sha512 = "ifKgxH2CKhJEg6tNdAwziu6Q33EvuG26tYcda6PT3WKisZcYDXsnEdnRv67Po3yCzFfaSoMjGZzJyD2c3DT1dg==";
+        url = "https://registry.npmjs.org/cacache/-/cacache-12.0.3.tgz";
+        sha512 = "kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw==";
       };
     };
     "cache-base-1.0.1" = {
@@ -8536,13 +8518,13 @@ let
         sha1 = "a2aa5fb1af688758259c32c141426d78923b9b77";
       };
     };
-    "camelcase-keys-5.2.0" = {
+    "camelcase-keys-6.0.1" = {
       name = "camelcase-keys";
       packageName = "camelcase-keys";
-      version = "5.2.0";
+      version = "6.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-5.2.0.tgz";
-        sha512 = "mSM/OQKD1HS5Ll2AXxeaHSdqCGC/QQ8IrgTbKYA/rxnC36thBKysfIr9+OVBWuW17jyZF4swHkjtglawgBmVFg==";
+        url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.0.1.tgz";
+        sha512 = "Pet+fVo99HMVy183qJuyTiQECQlb0dCXg89qhixcud88j4BSns+gzhSrjRT0ustEYSWJqKMO42arm1cS1VG5FA==";
       };
     };
     "caniuse-api-3.0.0" = {
@@ -8599,13 +8581,13 @@ let
         sha1 = "1b681c21ff84033c826543090689420d187151dc";
       };
     };
-    "castv2-0.1.9" = {
+    "castv2-0.1.10" = {
       name = "castv2";
       packageName = "castv2";
-      version = "0.1.9";
+      version = "0.1.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/castv2/-/castv2-0.1.9.tgz";
-        sha1 = "d0b0fab1fd06b0d9cca636886716ec1293a5905a";
+        url = "https://registry.npmjs.org/castv2/-/castv2-0.1.10.tgz";
+        sha512 = "3QWevHrjT22KdF08Y2a217IYCDQDP7vEJaY4n0lPBeC5UBYbMFMadDfVTsaQwq7wqsEgYUHElPGm3EO1ey+TNw==";
       };
     };
     "castv2-client-1.2.0" = {
@@ -8968,31 +8950,31 @@ let
         sha1 = "798e689778151c8076b4b360e5edd28cda2bb468";
       };
     };
-    "chokidar-2.1.6" = {
+    "chokidar-2.1.8" = {
       name = "chokidar";
       packageName = "chokidar";
-      version = "2.1.6";
+      version = "2.1.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chokidar/-/chokidar-2.1.6.tgz";
-        sha512 = "V2jUo67OKkc6ySiRpJrjlpJKl9kDuG+Xb8VgsGzb+aEouhgS1D0weyPU4lEzdAcsCAvrih2J2BqyXqHWvVLw5g==";
+        url = "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz";
+        sha512 = "ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==";
       };
     };
-    "chokidar-3.0.0" = {
+    "chokidar-3.0.2" = {
       name = "chokidar";
       packageName = "chokidar";
-      version = "3.0.0";
+      version = "3.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chokidar/-/chokidar-3.0.0.tgz";
-        sha512 = "ebzWopcacB2J19Jsb5RPtMrzmjUZ5VAQnsL0Ztrix3lswozHbiDp+1Lg3AWSKHdwsps/W2vtshA/x3I827F78g==";
+        url = "https://registry.npmjs.org/chokidar/-/chokidar-3.0.2.tgz";
+        sha512 = "c4PR2egjNjI1um6bamCQ6bUNPDiyofNQruHvKgHQ4gDUP/ITSVSzNsiI5OWtHOsX323i5ha/kk4YmOZ1Ktg7KA==";
       };
     };
-    "chokidar-3.0.2" = {
+    "chokidar-3.1.0" = {
       name = "chokidar";
       packageName = "chokidar";
-      version = "3.0.2";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chokidar/-/chokidar-3.0.2.tgz";
-        sha512 = "c4PR2egjNjI1um6bamCQ6bUNPDiyofNQruHvKgHQ4gDUP/ITSVSzNsiI5OWtHOsX323i5ha/kk4YmOZ1Ktg7KA==";
+        url = "https://registry.npmjs.org/chokidar/-/chokidar-3.1.0.tgz";
+        sha512 = "6vZfo+7W0EOlbSo0nhVKMz4yyssrwiPbBZ8wj1lq8/+l4ZhGZ2U4Md7PspvmijXp1a26D3B7AHEBmIB7aVtaOQ==";
       };
     };
     "chownr-0.0.2" = {
@@ -9013,13 +8995,40 @@ let
         sha512 = "GkfeAQh+QNy3wquu9oIZr6SS5x7wGdSgNQvD10X3r+AZr1Oys22HW8kAmDMvNg2+Dm0TeGaEuO8gFwdBXxwO8A==";
       };
     };
-    "chroma-js-2.0.4" = {
+    "chroma-js-2.0.6" = {
       name = "chroma-js";
       packageName = "chroma-js";
-      version = "2.0.4";
+      version = "2.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chroma-js/-/chroma-js-2.0.4.tgz";
-        sha512 = "gk71qOrSdBTLbsd0DIUO3QjZL8tTvMwpG1EoXYScy7rI4rcO4EyYH6zGuvCgUDumKumqg0pt6Ua+vWnMJsTYhw==";
+        url = "https://registry.npmjs.org/chroma-js/-/chroma-js-2.0.6.tgz";
+        sha512 = "IiiClbBRkRwuXNl6impq5ssEhUGpmWvc5zzImZbDUWLWcFbj6ZbtsdZEx6sIXMKes7azgYaUpnmsY1T8BL6PqQ==";
+      };
+    };
+    "chrome-dgram-3.0.3" = {
+      name = "chrome-dgram";
+      packageName = "chrome-dgram";
+      version = "3.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/chrome-dgram/-/chrome-dgram-3.0.3.tgz";
+        sha512 = "rktbTuXuzriInBm9qESjTqRhnscp26gAdsQnUSWIY4a3miF9gnFOBGib+DO0zcJ0ZF2wj6wwQrPgyWfT4+as3g==";
+      };
+    };
+    "chrome-dns-1.0.1" = {
+      name = "chrome-dns";
+      packageName = "chrome-dns";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/chrome-dns/-/chrome-dns-1.0.1.tgz";
+        sha512 = "HqsYJgIc8ljJJOqOzLphjAs79EUuWSX3nzZi2LNkzlw3GIzAeZbaSektC8iT/tKvLqZq8yl1GJu5o6doA4TRbg==";
+      };
+    };
+    "chrome-net-3.3.3" = {
+      name = "chrome-net";
+      packageName = "chrome-net";
+      version = "3.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/chrome-net/-/chrome-net-3.3.3.tgz";
+        sha512 = "11jL8+Ogna8M5TEdyalE8IG6cpaFEU3YcaxAj3YjZKjRM/PeT70pZbrUY+xoGwqiEJZwJE4Td2CvGxUvS9ytKQ==";
       };
     };
     "chrome-remote-interface-0.26.1" = {
@@ -9229,15 +9238,6 @@ let
         sha1 = "adc3200fa471cc211b0da7f566b71e98b9d67347";
       };
     };
-    "cli-color-1.2.0" = {
-      name = "cli-color";
-      packageName = "cli-color";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cli-color/-/cli-color-1.2.0.tgz";
-        sha1 = "3a5ae74fd76b6267af666e69e2afbbd01def34d1";
-      };
-    };
     "cli-cursor-1.0.2" = {
       name = "cli-cursor";
       packageName = "cli-cursor";
@@ -9256,6 +9256,15 @@ let
         sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5";
       };
     };
+    "cli-cursor-3.1.0" = {
+      name = "cli-cursor";
+      packageName = "cli-cursor";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz";
+        sha512 = "I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==";
+      };
+    };
     "cli-list-0.2.0" = {
       name = "cli-list";
       packageName = "cli-list";
@@ -9562,22 +9571,13 @@ let
         sha512 = "FXDYw4TjR8wgPZYui2LeTqWh1BLpfQ8lB6upMtlpDF6WlOOxghmTTxWyngdKTgozqBgKnHbTVwTE+hOHqAykuQ==";
       };
     };
-    "closest-to-2.0.0" = {
-      name = "closest-to";
-      packageName = "closest-to";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/closest-to/-/closest-to-2.0.0.tgz";
-        sha1 = "bb2a860edb7769b62d04821748ae50da24dbefaa";
-      };
-    };
-    "cmd-shim-2.0.2" = {
+    "cmd-shim-2.1.0" = {
       name = "cmd-shim";
       packageName = "cmd-shim";
-      version = "2.0.2";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cmd-shim/-/cmd-shim-2.0.2.tgz";
-        sha1 = "6fcbda99483a8fd15d7d30a196ca69d688a2efdb";
+        url = "https://registry.npmjs.org/cmd-shim/-/cmd-shim-2.1.0.tgz";
+        sha512 = "A5C0Cyf2H8sKsHqX0tvIWRXw5/PK++3Dc0lDbsugr90nOECLLuSPahVQBG8pgmgiXgm/TzBWMqI2rWdZwHduAw==";
       };
     };
     "cmdln-3.2.1" = {
@@ -9769,13 +9769,13 @@ let
         sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==";
       };
     };
-    "color-convert-2.0.0" = {
+    "color-convert-2.0.1" = {
       name = "color-convert";
       packageName = "color-convert";
-      version = "2.0.0";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/color-convert/-/color-convert-2.0.0.tgz";
-        sha512 = "hzTicsCJIHdxih9+2aLR1tNGZX5qSJGRHDPVwSY26tVrEf55XNajLOBWz2UuWSIergszA09/bqnOiHyqx9fxQg==";
+        url = "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz";
+        sha512 = "RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==";
       };
     };
     "color-name-1.1.3" = {
@@ -10075,15 +10075,6 @@ let
         sha1 = "fd430e889832ec353b9acd1de217c11cb3eef873";
       };
     };
-    "commander-2.6.0" = {
-      name = "commander";
-      packageName = "commander";
-      version = "2.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-2.6.0.tgz";
-        sha1 = "9df7e52fb2a0cb0fb89058ee80c3104225f37e1d";
-      };
-    };
     "commander-2.8.1" = {
       name = "commander";
       packageName = "commander";
@@ -10102,6 +10093,24 @@ let
         sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4";
       };
     };
+    "commander-3.0.0" = {
+      name = "commander";
+      packageName = "commander";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/commander/-/commander-3.0.0.tgz";
+        sha512 = "pl3QrGOBa9RZaslQiqnnKX2J068wcQw7j9AIaBQ9/JEp5RY6je4jKTImg0Bd+rpoONSe7GUFSgkxLeo17m3Pow==";
+      };
+    };
+    "commander-3.0.1" = {
+      name = "commander";
+      packageName = "commander";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/commander/-/commander-3.0.1.tgz";
+        sha512 = "UNgvDd+csKdc9GD4zjtkHKQbT8Aspt2jCBqNSPp53vAS0L1tS9sXB2TCEOPHJ7kt9bN/niWkYj8T3RQSoMXdSQ==";
+      };
+    };
     "commist-1.1.0" = {
       name = "commist";
       packageName = "commist";
@@ -10246,15 +10255,6 @@ let
         sha512 = "BGHeLCK1GV7j1bSmQQAi26X+GgWcTjLr/0tzSvMCl3LH1w1IJ4PFSPoV5316b30cneTziC+B1a+3OjoSUcQYmw==";
       };
     };
-    "compression-1.5.2" = {
-      name = "compression";
-      packageName = "compression";
-      version = "1.5.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/compression/-/compression-1.5.2.tgz";
-        sha1 = "b03b8d86e6f8ad29683cba8df91ddc6ffc77b395";
-      };
-    };
     "compression-1.7.3" = {
       name = "compression";
       packageName = "compression";
@@ -10372,15 +10372,6 @@ let
         sha1 = "4d26ddc485c32e5a1cf1b35854823b4720d25a52";
       };
     };
-    "connect-2.30.2" = {
-      name = "connect";
-      packageName = "connect";
-      version = "2.30.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/connect/-/connect-2.30.2.tgz";
-        sha1 = "8da9bcbe8a054d3d318d74dfec903b5c39a1b609";
-      };
-    };
     "connect-3.7.0" = {
       name = "connect";
       packageName = "connect";
@@ -10408,24 +10399,6 @@ let
         sha1 = "b269b2bb82ddb1ac3db5099c0fb582aba99fb37a";
       };
     };
-    "connect-pushstate-1.1.0" = {
-      name = "connect-pushstate";
-      packageName = "connect-pushstate";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/connect-pushstate/-/connect-pushstate-1.1.0.tgz";
-        sha1 = "bcab224271c439604a0fb0f614c0a5f563e88e24";
-      };
-    };
-    "connect-timeout-1.6.2" = {
-      name = "connect-timeout";
-      packageName = "connect-timeout";
-      version = "1.6.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/connect-timeout/-/connect-timeout-1.6.2.tgz";
-        sha1 = "de9a5ec61e33a12b6edaab7b5f062e98c599b88e";
-      };
-    };
     "connections-1.4.2" = {
       name = "connections";
       packageName = "connections";
@@ -10705,13 +10678,13 @@ let
         sha1 = "f67a4938c5233443564250479c67014bac878499";
       };
     };
-    "convict-4.4.1" = {
+    "convict-5.1.0" = {
       name = "convict";
       packageName = "convict";
-      version = "4.4.1";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/convict/-/convict-4.4.1.tgz";
-        sha512 = "celpR4hOWWwb/S8azhzgQwDon6muAJlNe2LTLeOGyoSgH390TsaqoieAe9BLbAv7+9wNfG7DTA2q3IfFp2viKw==";
+        url = "https://registry.npmjs.org/convict/-/convict-5.1.0.tgz";
+        sha512 = "0+Rf3wUfEpz+UuwksNgjREf+81eRDsiQ64ZAs3Gh2rZeXIjiI5m0pxwybRZUebpSKEfOFxN5oUthIUpnqIMh6w==";
       };
     };
     "cookie-0.0.4" = {
@@ -10741,15 +10714,6 @@ let
         sha1 = "72fec3d24e48a3432073d90c12642005061004b1";
       };
     };
-    "cookie-0.1.3" = {
-      name = "cookie";
-      packageName = "cookie";
-      version = "0.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cookie/-/cookie-0.1.3.tgz";
-        sha1 = "e734a5c1417fce472d5aef82c381cabb64d1a435";
-      };
-    };
     "cookie-0.3.1" = {
       name = "cookie";
       packageName = "cookie";
@@ -10768,15 +10732,6 @@ let
         sha512 = "+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==";
       };
     };
-    "cookie-parser-1.3.5" = {
-      name = "cookie-parser";
-      packageName = "cookie-parser";
-      version = "1.3.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.3.5.tgz";
-        sha1 = "9d755570fb5d17890771227a02314d9be7cf8356";
-      };
-    };
     "cookie-parser-1.4.4" = {
       name = "cookie-parser";
       packageName = "cookie-parser";
@@ -10939,15 +10894,6 @@ let
         sha512 = "h479g/5a0PXn//yiFuMrD5MDEbB+mtihNkWcE6uD/aCh/6z0FRZ9sWH3NfZbHDB+Bp1yGLYsjbH8LZBL8KOQ0w==";
       };
     };
-    "core-js-2.5.7" = {
-      name = "core-js";
-      packageName = "core-js";
-      version = "2.5.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz";
-        sha512 = "RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==";
-      };
-    };
     "core-js-2.6.9" = {
       name = "core-js";
       packageName = "core-js";
@@ -10957,31 +10903,22 @@ let
         sha512 = "HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A==";
       };
     };
-    "core-js-3.1.4" = {
+    "core-js-3.2.1" = {
       name = "core-js";
       packageName = "core-js";
-      version = "3.1.4";
+      version = "3.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/core-js/-/core-js-3.1.4.tgz";
-        sha512 = "YNZN8lt82XIMLnLirj9MhKDFZHalwzzrL9YLt6eb0T5D0EDl4IQ90IGkua8mHbnxNrkj1d8hbdizMc0Qmg1WnQ==";
+        url = "https://registry.npmjs.org/core-js/-/core-js-3.2.1.tgz";
+        sha512 = "Qa5XSVefSVPRxy2XfUC13WbvqkxhkwB3ve+pgCQveNgYzbM/UxZeu1dcOX/xr4UmfUd+muuvsaxilQzCyUurMw==";
       };
     };
-    "core-js-compat-3.1.4" = {
+    "core-js-compat-3.2.1" = {
       name = "core-js-compat";
       packageName = "core-js-compat";
-      version = "3.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.1.4.tgz";
-        sha512 = "Z5zbO9f1d0YrJdoaQhphVAnKPimX92D6z8lCGphH89MNRxlL1prI9ExJPqVwP0/kgkQCv8c4GJGT8X16yUncOg==";
-      };
-    };
-    "core-js-pure-3.1.4" = {
-      name = "core-js-pure";
-      packageName = "core-js-pure";
-      version = "3.1.4";
+      version = "3.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.1.4.tgz";
-        sha512 = "uJ4Z7iPNwiu1foygbcZYJsJs1jiXrTTCvxfLDXNhI/I+NHbSIEyr548y4fcsCEyWY0XgfAG/qqaunJ1SThHenA==";
+        url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.2.1.tgz";
+        sha512 = "MwPZle5CF9dEaMYdDeWm73ao/IflDH+FjeJCWEADcEgFSE9TLimFKwJsfmkwzI8eC0Aj0mgvMDjeQjrElkz4/A==";
       };
     };
     "core-util-is-1.0.2" = {
@@ -11092,15 +11029,6 @@ let
         sha1 = "5d9c8fb77a245cd5eca291e5d2d005334bab0082";
       };
     };
-    "crc-3.3.0" = {
-      name = "crc";
-      packageName = "crc";
-      version = "3.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/crc/-/crc-3.3.0.tgz";
-        sha1 = "fa622e1bc388bf257309082d6b65200ce67090ba";
-      };
-    };
     "crc-3.8.0" = {
       name = "crc";
       packageName = "crc";
@@ -11173,13 +11101,13 @@ let
         sha512 = "MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==";
       };
     };
-    "create-torrent-4.2.1" = {
+    "create-torrent-4.4.1" = {
       name = "create-torrent";
       packageName = "create-torrent";
-      version = "4.2.1";
+      version = "4.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/create-torrent/-/create-torrent-4.2.1.tgz";
-        sha512 = "IlKF2B3vrAGVzcgYVVgfsekp4p2N9BqkGeVqckTljajs+qIQ5oAwAzELJtb6sZ14UQBT7ZQNOOyvxgIL98VpZg==";
+        url = "https://registry.npmjs.org/create-torrent/-/create-torrent-4.4.1.tgz";
+        sha512 = "LuoXnCRMKEo3KR3jEbCRpP3Nu2TUhLTlb/axP9+rl+ouhBpxTaHaTTN1bdUS2x2VK3wWyCBl1OZHyHhlRBntWg==";
       };
     };
     "creato-1.0.5" = {
@@ -11191,6 +11119,15 @@ let
         sha512 = "bneB5jF+I0XNe4d3E6PYszPRb+5S8B3UQ3hDlY6ZSkfEU34RKqCfbUodxwwJn8DhmPYiuefEqEGxvstXEwXuUA==";
       };
     };
+    "crocks-0.12.1" = {
+      name = "crocks";
+      packageName = "crocks";
+      version = "0.12.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/crocks/-/crocks-0.12.1.tgz";
+        sha512 = "2qCRJwBmPlRQXzd50k9gt9PaItultOP8lj/cKSH2Eai9aeBuNqAnDuyolAm9TGn6Pw/4BgbxtPJLU1S+tQ4WMQ==";
+      };
+    };
     "cron-1.7.1" = {
       name = "cron";
       packageName = "cron";
@@ -11326,15 +11263,6 @@ let
         sha1 = "a230f64f568310e1498009940790ec99545bca7e";
       };
     };
-    "csrf-3.0.6" = {
-      name = "csrf";
-      packageName = "csrf";
-      version = "3.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/csrf/-/csrf-3.0.6.tgz";
-        sha1 = "b61120ddceeafc91e76ed5313bb5c0b2667b710a";
-      };
-    };
     "csrf-3.1.0" = {
       name = "csrf";
       packageName = "csrf";
@@ -11389,13 +11317,13 @@ let
         sha1 = "5908668294a1becd261ae0a4ce21b0b551f21d16";
       };
     };
-    "css-parse-1.7.0" = {
+    "css-parse-2.0.0" = {
       name = "css-parse";
       packageName = "css-parse";
-      version = "1.7.0";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/css-parse/-/css-parse-1.7.0.tgz";
-        sha1 = "321f6cf73782a6ff751111390fc05e2c657d8c9b";
+        url = "https://registry.npmjs.org/css-parse/-/css-parse-2.0.0.tgz";
+        sha1 = "a468ee667c16d81ccf05c58c38d2a97c780dbfd4";
       };
     };
     "css-select-1.2.0" = {
@@ -11614,15 +11542,6 @@ let
         sha512 = "fh725p0R83wA5JukCik5hdEko/LizW/Vl7pkKDa1WJUVCosg141mqaAWCScB+nkEaRMFMGbutHMOr6oBNc/j9A==";
       };
     };
-    "csurf-1.8.3" = {
-      name = "csurf";
-      packageName = "csurf";
-      version = "1.8.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/csurf/-/csurf-1.8.3.tgz";
-        sha1 = "23f2a13bf1d8fce1d0c996588394442cba86a56a";
-      };
-    };
     "csv-0.4.6" = {
       name = "csv";
       packageName = "csv";
@@ -11776,13 +11695,13 @@ let
         sha1 = "1bcfa56b081448cdb5e12bfc1bfad34b47fba8f3";
       };
     };
-    "cyclist-0.2.2" = {
+    "cyclist-1.0.1" = {
       name = "cyclist";
       packageName = "cyclist";
-      version = "0.2.2";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz";
-        sha1 = "1b33792e11e914a2fd6d6ed6447464444e5fa640";
+        url = "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz";
+        sha1 = "596e9698fd0c80e12038c2b82d6eb1b35b6224d9";
       };
     };
     "d-1.0.1" = {
@@ -12136,15 +12055,6 @@ let
         sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da";
       };
     };
-    "debug-2.3.3" = {
-      name = "debug";
-      packageName = "debug";
-      version = "2.3.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz";
-        sha1 = "40c453e67e6e13c901ddec317af8986cda9eff8c";
-      };
-    };
     "debug-2.6.9" = {
       name = "debug";
       packageName = "debug";
@@ -12343,6 +12253,15 @@ let
         sha1 = "f5d260292b660e084eff4cdbc9f08ad3247448b5";
       };
     };
+    "deep-equal-1.1.0" = {
+      name = "deep-equal";
+      packageName = "deep-equal";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.0.tgz";
+        sha512 = "ZbfWJq/wN1Z273o7mUSjILYqehAktR2NVoSrOukDkU9kg2v/Uv89yU4Cvz8seJeAmtN5oqiefKq8FPuXOboqLw==";
+      };
+    };
     "deep-extend-0.2.11" = {
       name = "deep-extend";
       packageName = "deep-extend";
@@ -12370,13 +12289,13 @@ let
         sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==";
       };
     };
-    "deep-freeze-0.0.1" = {
-      name = "deep-freeze";
-      packageName = "deep-freeze";
-      version = "0.0.1";
+    "deep-freeze-node-1.1.3" = {
+      name = "deep-freeze-node";
+      packageName = "deep-freeze-node";
+      version = "1.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/deep-freeze/-/deep-freeze-0.0.1.tgz";
-        sha1 = "3a0b0005de18672819dfd38cd31f91179c893e84";
+        url = "https://registry.npmjs.org/deep-freeze-node/-/deep-freeze-node-1.1.3.tgz";
+        sha512 = "CrA+1BVGfs9ZrGFMYtHfFHncWivh9XPb+6g8bLOzYPJmW8FmUs1dXLjALzU1SMqOMdoD5pQJARXtzxfeLqE9HQ==";
       };
     };
     "deep-is-0.1.2" = {
@@ -12442,15 +12361,6 @@ let
         sha512 = "GRQOafGHwMHpjPx9iCvTgpu9NojZ49q794EEL94JVEw6VaeA8XTUyBKvAkOOjBX9oJNiV6G3P+T+tihFjo2TqA==";
       };
     };
-    "deepmerge-4.0.0" = {
-      name = "deepmerge";
-      packageName = "deepmerge";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/deepmerge/-/deepmerge-4.0.0.tgz";
-        sha512 = "YZ1rOP5+kHor4hMAH+HRQnBQHg+wvS1un1hAOuIcxcBy0hzcUf6Jg2a1w65kpoOUnurOfZbERwjI1TfZxNjcww==";
-      };
-    };
     "default-browser-id-1.0.4" = {
       name = "default-browser-id";
       packageName = "default-browser-id";
@@ -12469,13 +12379,13 @@ let
         sha512 = "QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==";
       };
     };
-    "default-gateway-2.7.2" = {
+    "default-gateway-4.2.0" = {
       name = "default-gateway";
       packageName = "default-gateway";
-      version = "2.7.2";
+      version = "4.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/default-gateway/-/default-gateway-2.7.2.tgz";
-        sha512 = "lAc4i9QJR0YHSDFdzeBQKfZ1SRDG3hsJNEkrpcZa8QhBfidLAilT60BDEIVUUGqosFp425KOgB3uYqcnQrWafQ==";
+        url = "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz";
+        sha512 = "h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==";
       };
     };
     "default-resolution-2.0.0" = {
@@ -12523,13 +12433,13 @@ let
         sha1 = "2cef1f111e1c57870d8bbb8af2650e587cd2f5b4";
       };
     };
-    "deferred-leveldown-5.1.0" = {
+    "deferred-leveldown-5.2.0" = {
       name = "deferred-leveldown";
       packageName = "deferred-leveldown";
-      version = "5.1.0";
+      version = "5.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-5.1.0.tgz";
-        sha512 = "PvDY+BT2ONu2XVRgxHb77hYelLtMYxKSGuWuJJdVRXh9ntqx9GYTFJno/SKAz5xcd+yjQwyQeIZrUPjPvA52mg==";
+        url = "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-5.2.0.tgz";
+        sha512 = "E1s224a+nv7nEZQL/s+q4ARzBhsfo3KiEjK3qdvDAvMfWE68GnGsMRYKanoZgYqq+LNgyRMYPzBgEmAXjM2i5g==";
       };
     };
     "define-properties-1.1.3" = {
@@ -12595,6 +12505,15 @@ let
         sha1 = "fcf490a37ece266464d9cc431ab98c5819ced095";
       };
     };
+    "delay-4.3.0" = {
+      name = "delay";
+      packageName = "delay";
+      version = "4.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/delay/-/delay-4.3.0.tgz";
+        sha512 = "Lwaf3zVFDMBop1yDuFZ19F9WyGcZcGacsbdlZtWjQmM50tOcMntm1njF/Nb/Vjij3KaSvCF+sEYGKrrjObu2NA==";
+      };
+    };
     "delayed-stream-0.0.5" = {
       name = "delayed-stream";
       packageName = "delayed-stream";
@@ -12811,6 +12730,15 @@ let
         sha1 = "f41f1c10be4b00e87b5f13da680759f2c5bfd3e2";
       };
     };
+    "detect-node-2.0.4" = {
+      name = "detect-node";
+      packageName = "detect-node";
+      version = "2.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz";
+        sha512 = "ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==";
+      };
+    };
     "detective-4.7.1" = {
       name = "detective";
       packageName = "detective";
@@ -13252,15 +13180,6 @@ let
         sha1 = "672226dc74c8f799ad35307df936aba11acd6018";
       };
     };
-    "dom4-2.1.3" = {
-      name = "dom4";
-      packageName = "dom4";
-      version = "2.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dom4/-/dom4-2.1.3.tgz";
-        sha512 = "begvh4z5GV0kyxx+YgJZ7sIo/jsELx/v7MQxoLZpOvT5yFo18X8dfgtUmKAwdGuyMeugncylarLHlO4gIK6YNw==";
-      };
-    };
     "domain-browser-1.2.0" = {
       name = "domain-browser";
       packageName = "domain-browser";
@@ -13423,6 +13342,15 @@ let
         sha1 = "def1f1ca5d6059d24a766e587942c21106ce1275";
       };
     };
+    "dotnet-deps-parser-4.5.0" = {
+      name = "dotnet-deps-parser";
+      packageName = "dotnet-deps-parser";
+      version = "4.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dotnet-deps-parser/-/dotnet-deps-parser-4.5.0.tgz";
+        sha512 = "t6rBxcWVZSDNhhWdsbq9ozaCzfPXV79FiyES1JLNEoA7nYF+zDC2VZvFZSnH8ilU3bghJXxZPH+EcKYvfw8g/g==";
+      };
+    };
     "downgrade-root-1.2.2" = {
       name = "downgrade-root";
       packageName = "downgrade-root";
@@ -13513,13 +13441,13 @@ let
         sha1 = "0b078d5517937d873101452d9146737557b75e51";
       };
     };
-    "dtrace-provider-0.8.7" = {
+    "dtrace-provider-0.8.8" = {
       name = "dtrace-provider";
       packageName = "dtrace-provider";
-      version = "0.8.7";
+      version = "0.8.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.7.tgz";
-        sha1 = "dc939b4d3e0620cfe0c1cd803d0d2d7ed04ffd04";
+        url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.8.tgz";
+        sha512 = "b7Z7cNtHPhH9EJhNNbbeqTcXB8LGFFZhq1PGgEvpeHlzd36bhbdTWoE/Ba/YguqpBSlAPKnARWhVlhunCMwfxg==";
       };
     };
     "duplexer-0.1.1" = {
@@ -13684,13 +13612,13 @@ let
         sha512 = "gzao+mxnYDzIysXKMQi/+M1mjy/rjestjg6OPoYTtI+3Izp23oiGZitsl9lPDPiTGXbcSIk1iJWhliSaglxnUg==";
       };
     };
-    "editions-2.1.3" = {
+    "editions-2.2.0" = {
       name = "editions";
       packageName = "editions";
-      version = "2.1.3";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/editions/-/editions-2.1.3.tgz";
-        sha512 = "xDZyVm0A4nLgMNWVVLJvcwMjI80ShiH/27RyLiCnW1L273TcJIA25C4pwJ33AWV01OX6UriP35Xu+lH4S7HWQw==";
+        url = "https://registry.npmjs.org/editions/-/editions-2.2.0.tgz";
+        sha512 = "RYg3iEA2BDLCNVe8PUkD+ox5vAKxB9XS/mAhx1bdxGCF0CpX077C0pyTA9t5D6idCYA3avl5/XDHKPsHFrygfw==";
       };
     };
     "editor-1.0.0" = {
@@ -13747,22 +13675,22 @@ let
         sha1 = "cc872c168880ae3c7189762fd5ffc00896c9518a";
       };
     };
-    "ejs-2.6.2" = {
+    "ejs-2.7.1" = {
       name = "ejs";
       packageName = "ejs";
-      version = "2.6.2";
+      version = "2.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ejs/-/ejs-2.6.2.tgz";
-        sha512 = "PcW2a0tyTuPHz3tWyYqtK6r1fZ3gp+3Sop8Ph+ZYN81Ob5rwmbHEzaqs10N3BEsaGTkh/ooniXK+WwszGlc2+Q==";
+        url = "https://registry.npmjs.org/ejs/-/ejs-2.7.1.tgz";
+        sha512 = "kS/gEPzZs3Y1rRsbGX4UOSjtP/CeJP0CxSNZHYxGfVM/VgLcv0ZqM7C45YyTj2DI2g7+P9Dd24C+IMIg6D0nYQ==";
       };
     };
-    "electron-to-chromium-1.3.215" = {
+    "electron-to-chromium-1.3.260" = {
       name = "electron-to-chromium";
       packageName = "electron-to-chromium";
-      version = "1.3.215";
+      version = "1.3.260";
       src = fetchurl {
-        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.215.tgz";
-        sha512 = "ZV3OnwF0FlIygwxAG2H92yt7WGjWBpawyFAFu8e9k7xJatY+BPowID0D0Bs3PMACYAJATEejw/I9cawO27ZvTg==";
+        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.260.tgz";
+        sha512 = "wGt+OivF1C1MPwaSv3LJ96ebNbLAWlx3HndivDDWqwIVSQxmhL17Y/YmwUdEMtS/bPyommELt47Dct0/VZNQBQ==";
       };
     };
     "elegant-spinner-1.0.1" = {
@@ -13774,13 +13702,13 @@ let
         sha1 = "db043521c95d7e303fd8f345bedc3349cfb0729e";
       };
     };
-    "element-helper-json-2.0.5" = {
+    "element-helper-json-2.0.6" = {
       name = "element-helper-json";
       packageName = "element-helper-json";
-      version = "2.0.5";
+      version = "2.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/element-helper-json/-/element-helper-json-2.0.5.tgz";
-        sha512 = "XBFDNA4aAygKLqt3S7jhwWivUJInO9Yw2zlJjayPDSNDsg9OMIHbi/UE3JfJq7kw9BHDn6CchnSRVIcWG1AuzA==";
+        url = "https://registry.npmjs.org/element-helper-json/-/element-helper-json-2.0.6.tgz";
+        sha512 = "AzJvyAAYwFvv4zesXVQbB8zNBMJl/6HjDulY2NfxHdOEhsjq1knIoYOI+Ln20OlYX431sxSBO/5ji+aaQr/VoQ==";
       };
     };
     "elementtree-0.1.7" = {
@@ -13792,22 +13720,22 @@ let
         sha1 = "9ac91be6e52fb6e6244c4e54a4ac3ed8ae8e29c0";
       };
     };
-    "elliptic-6.5.0" = {
+    "elliptic-6.5.1" = {
       name = "elliptic";
       packageName = "elliptic";
-      version = "6.5.0";
+      version = "6.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/elliptic/-/elliptic-6.5.0.tgz";
-        sha512 = "eFOJTMyCYb7xtE/caJ6JJu+bhi67WCYNbkGSknu20pmM8Ke/bqOfdnZWxyoGN26JgfxTbXrsCkEw4KheCT/KGg==";
+        url = "https://registry.npmjs.org/elliptic/-/elliptic-6.5.1.tgz";
+        sha512 = "xvJINNLbTeWQjrl6X+7eQCrIy/YPv5XCpKW6kB5mKvtnGILoLDcySuwomfdzt0BMdLNVnuRNTuzKNHj0bva1Cg==";
       };
     };
-    "elm-serve-0.4.0" = {
-      name = "elm-serve";
-      packageName = "elm-serve";
-      version = "0.4.0";
+    "elm-hot-1.1.1" = {
+      name = "elm-hot";
+      packageName = "elm-hot";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/elm-serve/-/elm-serve-0.4.0.tgz";
-        sha512 = "NYXzzaJT/zw8v7jzDWGXuvX3/soj+5NTLHxX0n/T6DICbmyDj8kO7rlI2wSKs9UTNjXhZ7quFQEKcgcf/SZksw==";
+        url = "https://registry.npmjs.org/elm-hot/-/elm-hot-1.1.1.tgz";
+        sha512 = "ZHjoHd2Ev6riNXNQirj3J+GKKXXwedAUikfFBYzlVL/+3CdGs96cpZ7nhAk4c5l//Qa9ymltrqX36mOlr0pPFA==";
       };
     };
     "email-validator-2.0.4" = {
@@ -13937,13 +13865,13 @@ let
         sha1 = "538b66f3ee62cd1ab51ec323829d1f9480c74beb";
       };
     };
-    "encoding-down-6.1.0" = {
+    "encoding-down-6.2.0" = {
       name = "encoding-down";
       packageName = "encoding-down";
-      version = "6.1.0";
+      version = "6.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/encoding-down/-/encoding-down-6.1.0.tgz";
-        sha512 = "pBW1mbuQDHQhQLBtqarX8x2oLynahiOzBY5L/BosNqcstJ8MjpSc3rx1yCUIqb6bUE2vsp3t0BaXS0ZDP1s5pg==";
+        url = "https://registry.npmjs.org/encoding-down/-/encoding-down-6.2.0.tgz";
+        sha512 = "XlIoQMBMbU4aE01uSKpAix0sXBJWK8YPhuOdvKa1CroThZyUpj0zWzt+bbe7g1KWsdhNFFzHkQHSdDymVtpJ1w==";
       };
     };
     "end-of-stream-0.1.5" = {
@@ -14018,15 +13946,6 @@ let
         sha1 = "2d968308fffae5d17f5209b6775246e90d8a705e";
       };
     };
-    "engine.io-1.8.5" = {
-      name = "engine.io";
-      packageName = "engine.io";
-      version = "1.8.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io/-/engine.io-1.8.5.tgz";
-        sha512 = "j1DWIcktw4hRwrv6nWx++5nFH2X64x16MAG2P0Lmi5Dvdfi3I+Jhc7JKJIdAmDJa+5aZ/imHV7dWRPy2Cqjh3A==";
-      };
-    };
     "engine.io-3.2.1" = {
       name = "engine.io";
       packageName = "engine.io";
@@ -14054,15 +13973,6 @@ let
         sha1 = "1c5a65d5c5af6d04b44c22c3dbcd95c39ed1c989";
       };
     };
-    "engine.io-client-1.8.5" = {
-      name = "engine.io-client";
-      packageName = "engine.io-client";
-      version = "1.8.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.5.tgz";
-        sha512 = "AYTgHyeVUPitsseqjoedjhYJapNVoSPShbZ+tEUX9/73jgZ/Z3sUlJf9oYgdEBBdVhupUpUqSxH0kBCXlQnmZg==";
-      };
-    };
     "engine.io-client-3.2.1" = {
       name = "engine.io-client";
       packageName = "engine.io-client";
@@ -14090,15 +14000,6 @@ let
         sha1 = "d38813143a411cb3b914132ab05bf99e6f7a248e";
       };
     };
-    "engine.io-parser-1.3.2" = {
-      name = "engine.io-parser";
-      packageName = "engine.io-parser";
-      version = "1.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.3.2.tgz";
-        sha1 = "937b079f0007d0893ec56d46cb220b8cb435220a";
-      };
-    };
     "engine.io-parser-2.1.3" = {
       name = "engine.io-parser";
       packageName = "engine.io-parser";
@@ -14198,15 +14099,6 @@ let
         sha1 = "85675afba237c43f98de2d46adc0e532a4dcf48b";
       };
     };
-    "envinfo-7.1.0" = {
-      name = "envinfo";
-      packageName = "envinfo";
-      version = "7.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/envinfo/-/envinfo-7.1.0.tgz";
-        sha512 = "38LJhrmyQafVInoYlaEDxomIfjtK+HUtp1JsInWdKtpxk0MlTU60fqYHg0LrKgxxJuq6H89ddw4IkxfQejZ77g==";
-      };
-    };
     "envinfo-7.3.1" = {
       name = "envinfo";
       packageName = "envinfo";
@@ -14234,13 +14126,13 @@ let
         sha1 = "06e0116d3028f6aef4806849eb0ea6a748ae6960";
       };
     };
-    "errlop-1.1.1" = {
+    "errlop-1.1.2" = {
       name = "errlop";
       packageName = "errlop";
-      version = "1.1.1";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/errlop/-/errlop-1.1.1.tgz";
-        sha512 = "WX7QjiPHhsny7/PQvrhS5VMizXXKoKCS3udaBp8gjlARdbn+XmK300eKBAAN0hGyRaTCtRpOaxK+xFVPUJ3zkw==";
+        url = "https://registry.npmjs.org/errlop/-/errlop-1.1.2.tgz";
+        sha512 = "djkRp+urJ+SmqDBd7F6LUgm4Be1TTYBxia2bhjNdFBuBDQtJDHExD2VbxR6eyst3h1TZy3qPRCdqb6FBoFttTA==";
       };
     };
     "errno-0.1.7" = {
@@ -14270,15 +14162,6 @@ let
         sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==";
       };
     };
-    "errorhandler-1.4.3" = {
-      name = "errorhandler";
-      packageName = "errorhandler";
-      version = "1.4.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/errorhandler/-/errorhandler-1.4.3.tgz";
-        sha1 = "b7b70ed8f359e9db88092f2d20c0f831420ad83f";
-      };
-    };
     "errorhandler-1.5.1" = {
       name = "errorhandler";
       packageName = "errorhandler";
@@ -14288,13 +14171,13 @@ let
         sha512 = "rcOwbfvP1WTViVoUjcfZicVzjhjTuhSMntHh6mW3IrEiyE6mJyXvsToJUJGlGlw/2xU9P5whlWNGlIDVeCiT4A==";
       };
     };
-    "es-abstract-1.13.0" = {
+    "es-abstract-1.14.2" = {
       name = "es-abstract";
       packageName = "es-abstract";
-      version = "1.13.0";
+      version = "1.14.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.13.0.tgz";
-        sha512 = "vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==";
+        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.14.2.tgz";
+        sha512 = "DgoQmbpFNOofkjJtKwr87Ma5EW4Dc8fWhD0R+ndq7Oc456ivUfGOOP6oAZTTKl5/CcNMP+EN+e3/iUzgE0veZg==";
       };
     };
     "es-to-primitive-1.2.0" = {
@@ -14306,13 +14189,13 @@ let
         sha512 = "qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==";
       };
     };
-    "es5-ext-0.10.50" = {
+    "es5-ext-0.10.51" = {
       name = "es5-ext";
       packageName = "es5-ext";
-      version = "0.10.50";
+      version = "0.10.51";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.50.tgz";
-        sha512 = "KMzZTPBkeQV/JcSQhI5/z6d9VWJ3EnQ194USTUwIYZ2ZbpN8+SGXQKt1h68EX44+qt+Fzr8DO17vnxrw7c3agw==";
+        url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.51.tgz";
+        sha512 = "oRpWzM2WcLHVKpnrcyB7OW8j/s67Ba04JCm0WnNv3RiABSvs7mrQlutB8DBv793gKcp0XENR8Il8WxGTlZ73gQ==";
       };
     };
     "es5-ext-0.8.2" = {
@@ -14423,6 +14306,15 @@ let
         sha512 = "J3ZkwbEnnO+fGAKrjVpeUAnZshAdfZvbhQpqfIH9kSAspReRC4nJnu8ewm55b4y9ElyeuhCTzJD0XiH8Tsbhlw==";
       };
     };
+    "es6-promisify-6.0.2" = {
+      name = "es6-promisify";
+      packageName = "es6-promisify";
+      version = "6.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es6-promisify/-/es6-promisify-6.0.2.tgz";
+        sha512 = "eO6vFm0JvqGzjWIQA6QVKjxpmELfhWbDUWHm1rPfIbn55mhKPiAa5xpLmQWJrNa629ZIeQ8ZvMAi13kvrjK6Mg==";
+      };
+    };
     "es6-set-0.1.5" = {
       name = "es6-set";
       packageName = "es6-set";
@@ -14441,6 +14333,15 @@ let
         sha1 = "bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77";
       };
     };
+    "es6-symbol-3.1.2" = {
+      name = "es6-symbol";
+      packageName = "es6-symbol";
+      version = "3.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.2.tgz";
+        sha512 = "/ZypxQsArlv+KHpGvng52/Iz8by3EQPxhmbuz8yFG89N/caTFBSbcXONDw0aMjy827gQg26XAjP4uXFvnfINmQ==";
+      };
+    };
     "es6-weak-map-2.0.3" = {
       name = "es6-weak-map";
       packageName = "es6-weak-map";
@@ -14468,15 +14369,6 @@ let
         sha1 = "181a286ead397a39a92857cfb1d43052e356bff0";
       };
     };
-    "escape-html-1.0.2" = {
-      name = "escape-html";
-      packageName = "escape-html";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.2.tgz";
-        sha1 = "d77d32fa98e38c2f41ae85e9278e0e0e6ba1022c";
-      };
-    };
     "escape-html-1.0.3" = {
       name = "escape-html";
       packageName = "escape-html";
@@ -14522,13 +14414,13 @@ let
         sha512 = "UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==";
       };
     };
-    "escodegen-1.11.1" = {
+    "escodegen-1.12.0" = {
       name = "escodegen";
       packageName = "escodegen";
-      version = "1.11.1";
+      version = "1.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/escodegen/-/escodegen-1.11.1.tgz";
-        sha512 = "JwiqFD9KdGVVpeuRa68yU3zZnBEOcPs0nKW7wZzXky8Z7tffdYUHbe11bPCV5jYlK6DVdKLWLm0f5I/QlL0Kmw==";
+        url = "https://registry.npmjs.org/escodegen/-/escodegen-1.12.0.tgz";
+        sha512 = "TuA+EhsanGcme5T3R0L80u4t8CpbXQjegRmf7+FPTJrtCTErXFeelblRgHQa1FofEzqYYJmJ/OqjTwREp9qgmg==";
       };
     };
     "escodegen-1.9.1" = {
@@ -14576,13 +14468,13 @@ let
         sha512 = "S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg==";
       };
     };
-    "eslint-6.1.0" = {
+    "eslint-6.4.0" = {
       name = "eslint";
       packageName = "eslint";
-      version = "6.1.0";
+      version = "6.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eslint/-/eslint-6.1.0.tgz";
-        sha512 = "QhrbdRD7ofuV09IuE2ySWBz0FyXCq0rriLTZXZqaWSI79CVtHVRdkFuFTViiqzZhkCgfOh9USpriuGN2gIpZDQ==";
+        url = "https://registry.npmjs.org/eslint/-/eslint-6.4.0.tgz";
+        sha512 = "WTVEzK3lSFoXUovDHEbkJqCVPEPwbhCq4trDktNI6ygs7aO41d4cDT0JFAT5MivzZeVLWlg7vHL+bgrQv/t3vA==";
       };
     };
     "eslint-plugin-no-unsafe-innerhtml-1.0.16" = {
@@ -14639,13 +14531,13 @@ let
         sha512 = "oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw==";
       };
     };
-    "eslint-utils-1.4.0" = {
+    "eslint-utils-1.4.2" = {
       name = "eslint-utils";
       packageName = "eslint-utils";
-      version = "1.4.0";
+      version = "1.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.0.tgz";
-        sha512 = "7ehnzPaP5IIEh1r1tkjuIrxqhNkzUJa9z3R92tLJdZIVdWaczEhr3EbhGtsMrVxi1KeR8qA7Off6SWc5WNQqyQ==";
+        url = "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.2.tgz";
+        sha512 = "eAZS2sEUMlIeCjBeubdj45dmBHQwPHWyBcT1VSYB7o9x9WRRqKxyUoiXlRjyAwzN7YEzHJlYg0NmzDRWx6GP4Q==";
       };
     };
     "eslint-visitor-keys-1.0.0" = {
@@ -14657,6 +14549,15 @@ let
         sha512 = "qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==";
       };
     };
+    "eslint-visitor-keys-1.1.0" = {
+      name = "eslint-visitor-keys";
+      packageName = "eslint-visitor-keys";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz";
+        sha512 = "8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==";
+      };
+    };
     "esm-3.2.25" = {
       name = "esm";
       packageName = "esm";
@@ -14693,13 +14594,13 @@ let
         sha512 = "qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A==";
       };
     };
-    "espree-6.0.0" = {
+    "espree-6.1.1" = {
       name = "espree";
       packageName = "espree";
-      version = "6.0.0";
+      version = "6.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/espree/-/espree-6.0.0.tgz";
-        sha512 = "lJvCS6YbCn3ImT3yKkPe0+tJ+mH6ljhGNjHQH9mRtiO6gjhVAOhVXW1yjnwqGwTkK3bGbye+hb00nFNmu0l/1Q==";
+        url = "https://registry.npmjs.org/espree/-/espree-6.1.1.tgz";
+        sha512 = "EYbr8XZUhWbYCqQRW0duU5LxzL5bETN6AjKBGy1302qqzPaCH10QbRg3Wvco79Z8x9WbiE8HYB4e75xl6qUYvQ==";
       };
     };
     "esprima-2.0.0" = {
@@ -14765,13 +14666,13 @@ let
         sha512 = "64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==";
       };
     };
-    "estraverse-4.2.0" = {
+    "estraverse-4.3.0" = {
       name = "estraverse";
       packageName = "estraverse";
-      version = "4.2.0";
+      version = "4.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz";
-        sha1 = "0dee3fed31fcd469618ce7342099fc1afa0bdb13";
+        url = "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz";
+        sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==";
       };
     };
     "estree-walker-0.5.2" = {
@@ -14810,15 +14711,6 @@ let
         sha1 = "54c50de04ee42695562925ac566588291be7e9ea";
       };
     };
-    "etag-1.7.0" = {
-      name = "etag";
-      packageName = "etag";
-      version = "1.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/etag/-/etag-1.7.0.tgz";
-        sha1 = "03d30b5f67dd6e632d2945d30d6652731a34d5d8";
-      };
-    };
     "etag-1.8.1" = {
       name = "etag";
       packageName = "etag";
@@ -14981,6 +14873,15 @@ let
         sha512 = "tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q==";
       };
     };
+    "eventemitter3-4.0.0" = {
+      name = "eventemitter3";
+      packageName = "eventemitter3";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.0.tgz";
+        sha512 = "qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg==";
+      };
+    };
     "events-1.1.1" = {
       name = "events";
       packageName = "events";
@@ -15224,15 +15125,6 @@ let
         sha1 = "4ce8ea1f3635e69e49f0ebb497b6a4b0a51ce6f0";
       };
     };
-    "express-3.21.2" = {
-      name = "express";
-      packageName = "express";
-      version = "3.21.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/express/-/express-3.21.2.tgz";
-        sha1 = "0c2903ee5c54e63d65a96170764703550665a3de";
-      };
-    };
     "express-3.4.4" = {
       name = "express";
       packageName = "express";
@@ -15287,15 +15179,6 @@ let
         sha512 = "0Dzn6LQG0ohd2S+zJVMhsntwcDakEzm/uKJSZxH7B66ZBvTsB5LU/HvfO1dHG+RRiKuCg0aWfUa66PljnDjEdw==";
       };
     };
-    "express-session-1.11.3" = {
-      name = "express-session";
-      packageName = "express-session";
-      version = "1.11.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/express-session/-/express-session-1.11.3.tgz";
-        sha1 = "5cc98f3f5ff84ed835f91cbf0aabd0c7107400af";
-      };
-    };
     "express-session-1.16.2" = {
       name = "express-session";
       packageName = "express-session";
@@ -15629,13 +15512,13 @@ let
         sha1 = "66e4028e381eaa002edeb280d10238f3a46c3402";
       };
     };
-    "fast-json-patch-2.2.0" = {
+    "fast-json-patch-2.2.1" = {
       name = "fast-json-patch";
       packageName = "fast-json-patch";
-      version = "2.2.0";
+      version = "2.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-2.2.0.tgz";
-        sha512 = "LdR6I9Cukps4lPUbSwrk81EHYo2XKsMnbiJJDQyBGGX7oTGovqBFxSVqQ+gOVoMxWfI1ua0vlHcXGpIggxtEFA==";
+        url = "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-2.2.1.tgz";
+        sha512 = "4j5uBaTnsYAV5ebkidvxiLUYOwjQ+JSFljeqfTxCrH9bDmlCQaOJFS84oDJ2rAXZq2yskmk3ORfoP9DCwqFNig==";
       };
     };
     "fast-json-stable-stringify-2.0.0" = {
@@ -15674,13 +15557,13 @@ let
         sha512 = "QJYT/i0QYoiZBQ71ivxdyTqkwKkQ0oxACXHYxH2zYHJEgzi2LsbjgvtzTbLi1SZcF190Db2YP7I7eTsU2egOlw==";
       };
     };
-    "fast-safe-stringify-2.0.6" = {
+    "fast-safe-stringify-2.0.7" = {
       name = "fast-safe-stringify";
       packageName = "fast-safe-stringify";
-      version = "2.0.6";
+      version = "2.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.0.6.tgz";
-        sha512 = "q8BZ89jjc+mz08rSxROs8VsrBBcn1SIw1kq9NjolL509tkABRk9io01RAjSaEv1Xb2uFLt8VtRiZbGp5H8iDtg==";
+        url = "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz";
+        sha512 = "Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA==";
       };
     };
     "fast-text-encoding-1.0.0" = {
@@ -15836,6 +15719,15 @@ let
         sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962";
       };
     };
+    "figures-3.0.0" = {
+      name = "figures";
+      packageName = "figures";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/figures/-/figures-3.0.0.tgz";
+        sha512 = "HKri+WoWoUgr83pehn/SIgLOMZ9nAWC6dcGj26RY2R4F50u4+RTUz0RCrUlOV3nKRAICW1UGzyb+kcX2qK1S/g==";
+      };
+    };
     "file-entry-cache-2.0.0" = {
       name = "file-entry-cache";
       packageName = "file-entry-cache";
@@ -15863,13 +15755,13 @@ let
         sha512 = "uzk64HRpUZyTGZtVuvrjP0FYxzQrBf4rojot6J65YMEbwBLB0CWm0CLojVpwpmFmxcE/lkvYICgfcGozbBq6rw==";
       };
     };
-    "file-type-12.0.1" = {
+    "file-type-12.1.0" = {
       name = "file-type";
       packageName = "file-type";
-      version = "12.0.1";
+      version = "12.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/file-type/-/file-type-12.0.1.tgz";
-        sha512 = "YIs1E51cmqcmgF38ODjy0+M/l5DyfIIy3vngTOujQr/lXqkaSskfBniaZoZ1HVIpa5FTf5e7hCXS4TzxfNGMRQ==";
+        url = "https://registry.npmjs.org/file-type/-/file-type-12.1.0.tgz";
+        sha512 = "aZkf42yWGiH+vSOpbVgvbnoRuX4JiitMX9pHYqTHemNQ3lrx64iHi33YGAP7TSJSno56kxQY1lHmw8S6ujlFUg==";
       };
     };
     "file-type-3.9.0" = {
@@ -16034,15 +15926,6 @@ let
         sha1 = "b1a09aa1e6a607b3541669b09bcb727f460cd426";
       };
     };
-    "finalhandler-0.4.0" = {
-      name = "finalhandler";
-      packageName = "finalhandler";
-      version = "0.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.0.tgz";
-        sha1 = "965a52d9e8d05d2b857548541fb89b53a2497d9b";
-      };
-    };
     "finalhandler-1.1.1" = {
       name = "finalhandler";
       packageName = "finalhandler";
@@ -16331,13 +16214,13 @@ let
         sha512 = "ougBA2q6Rn9sZrjZQ9r5pTFxCotlGouySpD2yRIuq5AYwwfIT8HHhVMeSwrN5qJayjHINLJyrnsSkkPCZyfMrQ==";
       };
     };
-    "flow-parser-0.104.0" = {
+    "flow-parser-0.107.0" = {
       name = "flow-parser";
       packageName = "flow-parser";
-      version = "0.104.0";
+      version = "0.107.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.104.0.tgz";
-        sha512 = "S2VGfM/qU4g9NUf2hA5qH/QmQsZIflxFO7victnYN1LR5SoOUsn3JtMhXLKHm2QlnZwwJKIdLt/uYyPr4LiQAA==";
+        url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.107.0.tgz";
+        sha512 = "GtMCS8qzP0VskiE5qfN4zYiwjnClV/BxPZ4zUqMRUfyaF+gBuLHDTPqVLJ4ndGedrdv54510rsXDSbkCqUig+g==";
       };
     };
     "fluent-ffmpeg-2.1.2" = {
@@ -16457,13 +16340,13 @@ let
         sha1 = "5214d7537a4d06a4a301c0cc262feb84188002e7";
       };
     };
-    "follow-redirects-1.7.0" = {
+    "follow-redirects-1.9.0" = {
       name = "follow-redirects";
       packageName = "follow-redirects";
-      version = "1.7.0";
+      version = "1.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.7.0.tgz";
-        sha512 = "m/pZQy4Gj287eNy94nivy5wchN3Kp+Q5WgUPNy5lJSZ3sgkVKSYV/ZChMAQVIgx1SqfZ2zBZtPA2YlXIWxxJOQ==";
+        url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.9.0.tgz";
+        sha512 = "CRcPzsSIbXyVDl0QI01muNDu69S8trU4jArW9LpOt2WtC6LyUJetcIrmfHsRBx7/Jb6GHJUiuqyYxPooFfNt6A==";
       };
     };
     "for-each-0.3.3" = {
@@ -16610,13 +16493,13 @@ let
         sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==";
       };
     };
-    "form-data-2.5.0" = {
+    "form-data-2.5.1" = {
       name = "form-data";
       packageName = "form-data";
-      version = "2.5.0";
+      version = "2.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/form-data/-/form-data-2.5.0.tgz";
-        sha512 = "WXieX3G/8side6VIqx44ablyULoGruSde5PNTxoUyo5CeyAMX6nVWUd0rgist/EuX655cjhUhTo1Fo3tRYqbcA==";
+        url = "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz";
+        sha512 = "m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==";
       };
     };
     "format-0.2.2" = {
@@ -16691,6 +16574,15 @@ let
         sha1 = "4290fad27f13e89be7f33799c6bc5a0abfff0d19";
       };
     };
+    "freelist-1.0.3" = {
+      name = "freelist";
+      packageName = "freelist";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/freelist/-/freelist-1.0.3.tgz";
+        sha1 = "006775509f3935701784d3ed2fc9f12c9df1bab2";
+      };
+    };
     "fresh-0.1.0" = {
       name = "fresh";
       packageName = "fresh";
@@ -16718,15 +16610,6 @@ let
         sha1 = "3582499206c9723714190edd74b4604feb4a614c";
       };
     };
-    "fresh-0.3.0" = {
-      name = "fresh";
-      packageName = "fresh";
-      version = "0.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fresh/-/fresh-0.3.0.tgz";
-        sha1 = "651f838e22424e7566de161d8358caa199f83d4f";
-      };
-    };
     "fresh-0.5.2" = {
       name = "fresh";
       packageName = "fresh";
@@ -16772,6 +16655,15 @@ let
         sha512 = "KhjJmZAs2eqfhCb6PdPx4RcZtheGTz86tpTC5JTvqBn/xda+Nb+0C7dCyjOSN7T76H6a56LvH0SVXQMchLXDRw==";
       };
     };
+    "fs-chunk-store-2.0.1" = {
+      name = "fs-chunk-store";
+      packageName = "fs-chunk-store";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fs-chunk-store/-/fs-chunk-store-2.0.1.tgz";
+        sha512 = "V9PXz33rhq6E9lFmvmElmLyvEvnSeryU/TzfHnCEIpEU6Y/2Fyc4xEeeneV/pUgKG1mRAKSU+DBtHyO2GQ2EBA==";
+      };
+    };
     "fs-constants-1.0.0" = {
       name = "fs-constants";
       packageName = "fs-constants";
@@ -16880,13 +16772,13 @@ let
         sha512 = "yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==";
       };
     };
-    "fs-minipass-1.2.6" = {
+    "fs-minipass-1.2.7" = {
       name = "fs-minipass";
       packageName = "fs-minipass";
-      version = "1.2.6";
+      version = "1.2.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.6.tgz";
-        sha512 = "crhvyXcMejjv3Z5d2Fa9sf5xLYVCF5O1c71QxbVnbLsmYMBEvDAftewesN/HhY03YRoA7zOMxjNGrF5svGaaeQ==";
+        url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz";
+        sha512 = "GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==";
       };
     };
     "fs-mkdirp-stream-1.0.0" = {
@@ -17564,15 +17456,6 @@ let
         sha1 = "3b44afa0943bdc31b2037b934791e2e084bcb7f6";
       };
     };
-    "glob-7.0.6" = {
-      name = "glob";
-      packageName = "glob";
-      version = "7.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz";
-        sha1 = "211bafaf49e525b8cd93260d14ab136152b3f57a";
-      };
-    };
     "glob-7.1.2" = {
       name = "glob";
       packageName = "glob";
@@ -17699,13 +17582,13 @@ let
         sha1 = "e76989268a6c74c38908b1305b10fc0e394e9d0f";
       };
     };
-    "global-agent-2.0.1" = {
+    "global-agent-2.1.0" = {
       name = "global-agent";
       packageName = "global-agent";
-      version = "2.0.1";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/global-agent/-/global-agent-2.0.1.tgz";
-        sha512 = "2iGb96/51XxsekctZR4IiP7SoWuGEkmFpsyySasq3RFmvIwDCQJzatB2NqK0sk7h2hVYQdRphL52lrO5grF/jg==";
+        url = "https://registry.npmjs.org/global-agent/-/global-agent-2.1.0.tgz";
+        sha512 = "o5BKvbhjGKHFRMkw+xtZeTEyyHGDsdXaFvOHDQx6pzCURtIaznEL2URkXfp2xxzth8Y/6n9yysHXnjjLH6soBw==";
       };
     };
     "global-dirs-0.1.1" = {
@@ -17817,6 +17700,15 @@ let
         sha512 = "S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==";
       };
     };
+    "globalthis-1.0.0" = {
+      name = "globalthis";
+      packageName = "globalthis";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/globalthis/-/globalthis-1.0.0.tgz";
+        sha512 = "vcCAZTJ3r5Qcu5l8/2oyVdoFwxKgfYnMTR2vwWeux/NAVZK3PwcMaWkdUIn4GJbmKuRK7xcvDsLuK+CKcXyodg==";
+      };
+    };
     "globalyzer-0.1.4" = {
       name = "globalyzer";
       packageName = "globalyzer";
@@ -17988,13 +17880,13 @@ let
         sha1 = "7cd2cdb228a4a3f36e95efa6cc142de7d1a136d0";
       };
     };
-    "graceful-fs-3.0.11" = {
+    "graceful-fs-3.0.12" = {
       name = "graceful-fs";
       packageName = "graceful-fs";
-      version = "3.0.11";
+      version = "3.0.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.11.tgz";
-        sha1 = "7613c778a1afea62f25c630a086d7f3acbbdd818";
+        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.12.tgz";
+        sha512 = "J55gaCS4iTTJfTXIxSVw3EMQckcqkpdRv3IR7gu6sq0+tbC363Zx6KH/SEwXASK9JRbhyZmVjJEVJIOxYsB3Qg==";
       };
     };
     "graceful-fs-4.1.11" = {
@@ -18006,13 +17898,13 @@ let
         sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658";
       };
     };
-    "graceful-fs-4.2.1" = {
+    "graceful-fs-4.2.2" = {
       name = "graceful-fs";
       packageName = "graceful-fs";
-      version = "4.2.1";
+      version = "4.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.1.tgz";
-        sha512 = "b9usnbDGnD928gJB3LrCmxoibr3VE4U2SMo5PBuBnokWyDADTqDPXg4YpwKF1trpH+UbGp7QLicO3+aWEy0+mw==";
+        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz";
+        sha512 = "IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==";
       };
     };
     "graceful-readlink-1.0.1" = {
@@ -18078,13 +17970,13 @@ let
         sha512 = "QZ5BL8ZO/B20VA8APauGBg3GyEgZ19eduvpLWoq5x7gMmWnHoy8rlQWPLmWgFvo1yNgjSEFMesmS4R6pPr7xog==";
       };
     };
-    "graphql-14.4.2" = {
+    "graphql-14.5.6" = {
       name = "graphql";
       packageName = "graphql";
-      version = "14.4.2";
+      version = "14.5.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/graphql/-/graphql-14.4.2.tgz";
-        sha512 = "6uQadiRgnpnSS56hdZUSvFrVcQ6OF9y6wkxJfKquFtHlnl7+KSuWwSJsdwiK1vybm1HgcdbpGkCpvhvsVQ0UZQ==";
+        url = "https://registry.npmjs.org/graphql/-/graphql-14.5.6.tgz";
+        sha512 = "zJ6Oz8P1yptV4O4DYXdArSwvmirPetDOBnGFRBl0zQEC68vNW3Ny8qo8VzMgfr+iC8PKiRYJ+f2wub41oDCoQg==";
       };
     };
     "graphql-anywhere-4.2.4" = {
@@ -18132,22 +18024,13 @@ let
         sha512 = "bOufkkog0cSfHJ9gVD3Wy+KHmkSTHWcFfPaV/NVpIvfJx15gU0/CzuC6lcTjioWmn+UGzYdoqmP7OrJAWT57sw==";
       };
     };
-    "graphql-extensions-0.8.1" = {
+    "graphql-extensions-0.10.3" = {
       name = "graphql-extensions";
       packageName = "graphql-extensions";
-      version = "0.8.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.8.1.tgz";
-        sha512 = "d/L4x7/PPWhviJqi7jIWOVJPzfzagYgPizSQUpa+3hozbWhwpWEnfxwgL5/If5MnPUikBnqlkOLCyjHMNdipYA==";
-      };
-    };
-    "graphql-extensions-0.9.1" = {
-      name = "graphql-extensions";
-      packageName = "graphql-extensions";
-      version = "0.9.1";
+      version = "0.10.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.9.1.tgz";
-        sha512 = "JR/KStdwALd48B/xSG/Mi85zamuJd8THvVlzGM5juznPDN0wTYG5SARGzzvoqHxgxuUHYdzpvESwMAisORJdCQ==";
+        url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.10.3.tgz";
+        sha512 = "kwU0gUe+Qdfr8iZYT91qrPSwQNgPhB/ClF1m1LEPdxlptk5FhFmjpxAcbMZ8q7j0kjfnbp2IeV1OhRDCEPqz2w==";
       };
     };
     "graphql-import-0.4.5" = {
@@ -18411,13 +18294,13 @@ let
         sha1 = "e28c4d45d05ecbbed818363ce8f9c5926229ffe5";
       };
     };
-    "handlebars-4.1.2" = {
+    "handlebars-4.2.0" = {
       name = "handlebars";
       packageName = "handlebars";
-      version = "4.1.2";
+      version = "4.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/handlebars/-/handlebars-4.1.2.tgz";
-        sha512 = "nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw==";
+        url = "https://registry.npmjs.org/handlebars/-/handlebars-4.2.0.tgz";
+        sha512 = "Kb4xn5Qh1cxAKvQnzNWZ512DhABzyFNmsaJf3OAkWNa4NkaqWcNI8Tao8Tasi0/F4JD9oyG0YxuFyvyR57d+Gw==";
       };
     };
     "har-schema-1.0.5" = {
@@ -18519,15 +18402,6 @@ let
         sha1 = "36077ef1d15f333484aa7fa77a28606f1c655b37";
       };
     };
-    "has-binary-0.1.7" = {
-      name = "has-binary";
-      packageName = "has-binary";
-      version = "0.1.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/has-binary/-/has-binary-0.1.7.tgz";
-        sha1 = "68e61eb16210c9545a0a5cce06a873912fe1e68c";
-      };
-    };
     "has-binary-data-0.1.1" = {
       name = "has-binary-data";
       packageName = "has-binary-data";
@@ -18915,6 +18789,15 @@ let
         sha512 = "l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==";
       };
     };
+    "hexer-1.5.0" = {
+      name = "hexer";
+      packageName = "hexer";
+      version = "1.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hexer/-/hexer-1.5.0.tgz";
+        sha1 = "b86ce808598e8a9d1892c571f3cedd86fc9f0653";
+      };
+    };
     "highlight.js-8.2.0" = {
       name = "highlight.js";
       packageName = "highlight.js";
@@ -18933,13 +18816,13 @@ let
         sha1 = "e6d9dbe57cbefe60751f02af336195870c90c01e";
       };
     };
-    "highlight.js-9.15.9" = {
+    "highlight.js-9.15.10" = {
       name = "highlight.js";
       packageName = "highlight.js";
-      version = "9.15.9";
+      version = "9.15.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/highlight.js/-/highlight.js-9.15.9.tgz";
-        sha512 = "M0zZvfLr5p0keDMCAhNBp03XJbKBxUx5AfyfufMdFMEP4N/Xj6dh0IqC75ys7BAzceR34NgcvXjupRVaHBPPVQ==";
+        url = "https://registry.npmjs.org/highlight.js/-/highlight.js-9.15.10.tgz";
+        sha512 = "RoV7OkQm0T3os3Dd2VHLNMoaoDVx77Wygln3n9l5YV172XonWG6rgQD3XnF/BuFFZw9A0TJgmMSO8FEWQgvcXw==";
       };
     };
     "hipchatter-0.3.2" = {
@@ -19014,13 +18897,13 @@ let
         sha1 = "08a74d9272a9cc83ae8e6bbe0303f0ee76432094";
       };
     };
-    "hosted-git-info-2.8.2" = {
+    "hosted-git-info-2.8.4" = {
       name = "hosted-git-info";
       packageName = "hosted-git-info";
-      version = "2.8.2";
+      version = "2.8.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.2.tgz";
-        sha512 = "CyjlXII6LMsPMyUzxpTt8fzh5QwzGqPmQXgY/Jyf4Zfp27t/FvfhwoE/8laaMUcMy816CkWF20I7NeQhwwY88w==";
+        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.4.tgz";
+        sha512 = "pzXIvANXEFrc5oFFXRMkbLPQ2rXRoDERwDLyrcUxGhaZhgP54BBSl9Oheh7Vv0T090cszWBxPjkQQ5Sq1PbBRQ==";
       };
     };
     "hsl-regex-1.0.0" = {
@@ -19203,15 +19086,6 @@ let
         sha512 = "TcIMG3qeVLgDr1TEd2XvHaTnMPwYQUQMIBLy+5pLSDKYFc7UIqj39w8EGzZkaxoLv/l2K8HaI0t5AVA+YYgUew==";
       };
     };
-    "http-errors-1.3.1" = {
-      name = "http-errors";
-      packageName = "http-errors";
-      version = "1.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/http-errors/-/http-errors-1.3.1.tgz";
-        sha1 = "197e22cdebd4198585e8694ef6786197b91ed942";
-      };
-    };
     "http-errors-1.6.3" = {
       name = "http-errors";
       packageName = "http-errors";
@@ -19257,6 +19131,16 @@ let
         sha1 = "29691b6fc58f4f7e81a3605dca82682b068e4430";
       };
     };
+    "http-node-git://github.com/feross/http-node#webtorrent" = {
+      name = "http-node";
+      packageName = "http-node";
+      version = "1.2.0";
+      src = fetchgit {
+        url = "git://github.com/feross/http-node";
+        rev = "342ef8624495343ffd050bd0808b3750cf0e3974";
+        sha256 = "d7408d01b05fcbd5bb4fb44fd3d7d71463bafd5124d7e69c6f3e97cef8c65368";
+      };
+    };
     "http-parser-js-0.4.10" = {
       name = "http-parser-js";
       packageName = "http-parser-js";
@@ -19266,6 +19150,15 @@ let
         sha1 = "92c9c1374c35085f75db359ec56cc257cbb93fa4";
       };
     };
+    "http-parser-js-0.4.13" = {
+      name = "http-parser-js";
+      packageName = "http-parser-js";
+      version = "0.4.13";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.13.tgz";
+        sha1 = "3bd6d6fde6e3172c9334c3b33b6c193d80fe1137";
+      };
+    };
     "http-proxy-1.17.0" = {
       name = "http-proxy";
       packageName = "http-proxy";
@@ -19410,13 +19303,13 @@ let
         sha512 = "PH5GBkXqFxw5+4eKaKRIkD23y6vRd/IXSl7IldyJxEXpDH9SEIXRORkBtkGni/ae2P7RVOw6Wxypd2tGXhha1w==";
       };
     };
-    "hypercore-7.5.1" = {
+    "hypercore-7.7.1" = {
       name = "hypercore";
       packageName = "hypercore";
-      version = "7.5.1";
+      version = "7.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hypercore/-/hypercore-7.5.1.tgz";
-        sha512 = "tgololYj3O6Y0Mg6PK7EJntRu+auKSYuER2a8pVetPqnDSJ1RfAVlyVr3VmuS5W9hS0PwH4OXl4R/uVfkuNNoQ==";
+        url = "https://registry.npmjs.org/hypercore/-/hypercore-7.7.1.tgz";
+        sha512 = "boEiPCK848pNGACW1j111tJApu530e/UPpwbHytJZlrVf3YdgUIP1KL3aSi5xJFLUnuO8GLGl4lIsSeH8TaQQA==";
       };
     };
     "hypercore-crypto-1.0.0" = {
@@ -19428,13 +19321,13 @@ let
         sha512 = "xFwOnNlOt8L+SovC7dTNchKaNYJb5l8rKZZwpWQnCme1r7CU4Hlhp1RDqPES6b0OpS7DkTo9iU0GltQGkpsjMw==";
       };
     };
-    "hypercore-protocol-6.11.1" = {
+    "hypercore-protocol-6.12.0" = {
       name = "hypercore-protocol";
       packageName = "hypercore-protocol";
-      version = "6.11.1";
+      version = "6.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hypercore-protocol/-/hypercore-protocol-6.11.1.tgz";
-        sha512 = "4vyYGzSTRCfpIPnpYO/WN0VeS2oGeIrzCCwIXfz5TL2dyyHu7wF5xiigNuUfTn9n3cTOwwbH+EKsygTNsO2yfw==";
+        url = "https://registry.npmjs.org/hypercore-protocol/-/hypercore-protocol-6.12.0.tgz";
+        sha512 = "T3oy9/7QFejqJX2RGcCUU1944e5/eKbLlSz9JPTNN1QbYFJgat/r7eTyOO8SMSLUimUmQx6YBMKhgYbdKzp7Bw==";
       };
     };
     "hyperdrive-9.16.0" = {
@@ -19491,24 +19384,6 @@ let
         sha512 = "7cCrVn/BcoSOGJwTilAjGgWWzUDg4scTLX1sIBMWq6QjYYBrT+ChSAvmgVyQxkHinaIcswC04XK6l15RxM4Dkg==";
       };
     };
-    "iconv-lite-0.4.11" = {
-      name = "iconv-lite";
-      packageName = "iconv-lite";
-      version = "0.4.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.11.tgz";
-        sha1 = "2ecb42fd294744922209a2e7c404dac8793d8ade";
-      };
-    };
-    "iconv-lite-0.4.13" = {
-      name = "iconv-lite";
-      packageName = "iconv-lite";
-      version = "0.4.13";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz";
-        sha1 = "1f88aba4ab0b1508e8312acc39345f36e992e2f2";
-      };
-    };
     "iconv-lite-0.4.23" = {
       name = "iconv-lite";
       packageName = "iconv-lite";
@@ -19608,13 +19483,13 @@ let
         sha512 = "cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==";
       };
     };
-    "ignore-5.1.2" = {
+    "ignore-5.1.4" = {
       name = "ignore";
       packageName = "ignore";
-      version = "5.1.2";
+      version = "5.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ignore/-/ignore-5.1.2.tgz";
-        sha512 = "vdqWBp7MyzdmHkkRWV5nY+PfGRbYbahfuvsBCh277tq+w9zyNi7h5CYJCK0kmzti9kU+O/cB7sE8HvKv6aXAKQ==";
+        url = "https://registry.npmjs.org/ignore/-/ignore-5.1.4.tgz";
+        sha512 = "MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==";
       };
     };
     "ignore-by-default-1.0.1" = {
@@ -19626,13 +19501,13 @@ let
         sha1 = "48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09";
       };
     };
-    "ignore-walk-3.0.1" = {
+    "ignore-walk-3.0.2" = {
       name = "ignore-walk";
       packageName = "ignore-walk";
-      version = "3.0.1";
+      version = "3.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz";
-        sha512 = "DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==";
+        url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.2.tgz";
+        sha512 = "EXyErtpHbn75ZTsOADsfx6J/FPo6/5cjev46PXrcTpd8z3BoRkXgYu9/JVqrI7tusjmwCZutGeRJeU0Wo1e4Cw==";
       };
     };
     "image-data-uri-2.0.1" = {
@@ -19698,13 +19573,13 @@ let
         sha1 = "0ecdad0c546332672d7b5b511b26bb18ce56e73f";
       };
     };
-    "immediate-chunk-store-2.0.0" = {
+    "immediate-chunk-store-2.1.0" = {
       name = "immediate-chunk-store";
       packageName = "immediate-chunk-store";
-      version = "2.0.0";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/immediate-chunk-store/-/immediate-chunk-store-2.0.0.tgz";
-        sha512 = "5s6NiCGbtWc+OQA60jrre54w12U7tynIyUNjO5LJjNA5lWwvCv6640roq8Wk/wIuaqnd4Pgtp453OyJ7hbONkQ==";
+        url = "https://registry.npmjs.org/immediate-chunk-store/-/immediate-chunk-store-2.1.0.tgz";
+        sha512 = "QshP0SFpsy/bHQBjYMgzCcnLoqTj6PHFg8ZkPi2WbTw1qddNy0puuPDaFlXyrsZAdWMT3QziPDMzfj+mzCVMYg==";
       };
     };
     "import-fresh-2.0.0" = {
@@ -20031,22 +19906,31 @@ let
         sha512 = "QIEQG4YyQ2UYZGDC4srMZ7BjHOmNk1lR2JQj5UknBapklm6WHA+VVH7N+sUdX3A7NeCfGF8o4X1S3Ao7nAcIeg==";
       };
     };
-    "inquirer-6.2.2" = {
+    "inquirer-6.5.0" = {
       name = "inquirer";
       packageName = "inquirer";
-      version = "6.2.2";
+      version = "6.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/inquirer/-/inquirer-6.2.2.tgz";
-        sha512 = "Z2rREiXA6cHRR9KBOarR3WuLlFzlIfAEIiB45ll5SSadMg7WqOh1MKEjjndfuH5ewXdixWCxqnVfGOQzPeiztA==";
+        url = "https://registry.npmjs.org/inquirer/-/inquirer-6.5.0.tgz";
+        sha512 = "scfHejeG/lVZSpvCXpsB4j/wQNPM5JC8kiElOI0OUTwmc1RTpXr4H32/HOlQHcZiYl2z2VElwuCVDRG8vFmbnA==";
       };
     };
-    "inquirer-6.5.0" = {
+    "inquirer-6.5.1" = {
       name = "inquirer";
       packageName = "inquirer";
-      version = "6.5.0";
+      version = "6.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/inquirer/-/inquirer-6.5.0.tgz";
-        sha512 = "scfHejeG/lVZSpvCXpsB4j/wQNPM5JC8kiElOI0OUTwmc1RTpXr4H32/HOlQHcZiYl2z2VElwuCVDRG8vFmbnA==";
+        url = "https://registry.npmjs.org/inquirer/-/inquirer-6.5.1.tgz";
+        sha512 = "uxNHBeQhRXIoHWTSNYUFhQVrHYFThIt6IVo2fFmSe8aBwdR3/w6b58hJpiL/fMukFkvGzjg+hSxFtwvVmKZmXw==";
+      };
+    };
+    "inquirer-6.5.2" = {
+      name = "inquirer";
+      packageName = "inquirer";
+      version = "6.5.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz";
+        sha512 = "cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==";
       };
     };
     "inquirer-autocomplete-prompt-1.0.1" = {
@@ -20166,13 +20050,13 @@ let
         sha1 = "ae9fbf93b984878785d50a8de1b356956058cf5c";
       };
     };
-    "internal-ip-3.0.1" = {
+    "internal-ip-4.3.0" = {
       name = "internal-ip";
       packageName = "internal-ip";
-      version = "3.0.1";
+      version = "4.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/internal-ip/-/internal-ip-3.0.1.tgz";
-        sha512 = "NXXgESC2nNVtU+pqmC9e6R8B1GpKxzsAQhffvh5AL79qKnodd+L7tnEQmTiUAVngqLalPbSqRA7XGIEL5nCd0Q==";
+        url = "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz";
+        sha512 = "S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==";
       };
     };
     "interpret-1.1.0" = {
@@ -20418,13 +20302,13 @@ let
         sha1 = "50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6";
       };
     };
-    "is-absolute-url-3.0.0" = {
+    "is-absolute-url-3.0.2" = {
       name = "is-absolute-url";
       packageName = "is-absolute-url";
-      version = "3.0.0";
+      version = "3.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.0.tgz";
-        sha512 = "3OkP8XrM2Xq4/IxsJnClfMp3OaM3TAatLPLKPeWcxLBTrpe6hihwtX+XZfJTcXg/FTRi4qjy0y/C5qiyNxY24g==";
+        url = "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.2.tgz";
+        sha512 = "+5g/wLlcm1AcxSP7014m6GvbPHswDx980vD/3bZaap8aGV9Yfs7Q6y6tfaupgZ5O74Byzc8dGrSCJ+bFXx0KdA==";
       };
     };
     "is-accessor-descriptor-0.1.6" = {
@@ -20463,6 +20347,15 @@ let
         sha512 = "A1IGAPO5AW9vSh7omxIlOGwIqEvpW/TA+DksVOPM5ODuxKlZS09+TEM1E3275lJqO2oJ38vDpeAL3DCIiHE6eA==";
       };
     };
+    "is-arguments-1.0.4" = {
+      name = "is-arguments";
+      packageName = "is-arguments";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz";
+        sha512 = "xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==";
+      };
+    };
     "is-arrayish-0.2.1" = {
       name = "is-arrayish";
       packageName = "is-arrayish";
@@ -21147,13 +21040,13 @@ let
         sha512 = "qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==";
       };
     };
-    "is-retry-allowed-1.1.0" = {
+    "is-retry-allowed-1.2.0" = {
       name = "is-retry-allowed";
       packageName = "is-retry-allowed";
-      version = "1.1.0";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz";
-        sha1 = "11a060568b67339444033d0125a61a20d564fb34";
+        url = "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz";
+        sha512 = "RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==";
       };
     };
     "is-root-1.0.0" = {
@@ -21372,15 +21265,6 @@ let
         sha1 = "1f16e4aa22b04d1336b66188a66af3c600c3a66d";
       };
     };
-    "is-wsl-2.1.0" = {
-      name = "is-wsl";
-      packageName = "is-wsl";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-wsl/-/is-wsl-2.1.0.tgz";
-        sha512 = "pFTjpv/x5HRj8kbZ/Msxi9VrvtOMRBqaDi3OIcbwPI3OuH+r3lLxVWukLITBaOGJIbA/w2+M1eVmVa4XNQlAmQ==";
-      };
-    };
     "is-yarn-global-0.3.0" = {
       name = "is-yarn-global";
       packageName = "is-yarn-global";
@@ -21606,13 +21490,13 @@ let
         sha1 = "dc5ebed10d04a5e0eaf49ef0009bec473d1a6b31";
       };
     };
-    "jaeger-client-3.15.0" = {
+    "jaeger-client-3.16.0" = {
       name = "jaeger-client";
       packageName = "jaeger-client";
-      version = "3.15.0";
+      version = "3.16.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jaeger-client/-/jaeger-client-3.15.0.tgz";
-        sha512 = "0SfuEE7E6XVLhu8th5JG/ACtnIWq4Tad0iSst3+De9HOMSz1RI0Tl1MLXzetudI670rqfCs4m37XCTMRgu8oxg==";
+        url = "https://registry.npmjs.org/jaeger-client/-/jaeger-client-3.16.0.tgz";
+        sha512 = "F4y4rQ7RTYFDu6QGsFXOnrZb2Pk6BvhnecOZQZvM+BmNahgE+5y9mfToMe4SsELuJ7NQM5JF+Oau1u/xwefr9A==";
       };
     };
     "javascript-stringify-1.6.0" = {
@@ -21678,13 +21562,13 @@ let
         sha512 = "57mw92ZOKoR77YBLUkauN1xNq1xlxOm2KaPty/jlYrkEyGotUBBvq46a6wXh6d3aM4CccGuwymSge18/9IoB3A==";
       };
     };
-    "joplin-turndown-plugin-gfm-1.0.8" = {
+    "joplin-turndown-plugin-gfm-1.0.9" = {
       name = "joplin-turndown-plugin-gfm";
       packageName = "joplin-turndown-plugin-gfm";
-      version = "1.0.8";
+      version = "1.0.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/joplin-turndown-plugin-gfm/-/joplin-turndown-plugin-gfm-1.0.8.tgz";
-        sha512 = "uXgq2zGvjiMl/sXG7946EGhh1pyGbZ0L/6z21LBi8D6BJgHQufmXdve/UP3zpgnhiFhfXvzGY10uNaTuDQ99iQ==";
+        url = "https://registry.npmjs.org/joplin-turndown-plugin-gfm/-/joplin-turndown-plugin-gfm-1.0.9.tgz";
+        sha512 = "SOa/Uiy3nyoBGtHqFe+TBg10UTIOzzcUUzNhx2MyR4Z0vbKL3enGggGypig1t7G5uHwv5j+NhooRuM619Zk0bw==";
       };
     };
     "jpeg-js-0.1.2" = {
@@ -21732,13 +21616,13 @@ let
         sha512 = "M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw==";
       };
     };
-    "js-beautify-1.10.1" = {
+    "js-beautify-1.10.2" = {
       name = "js-beautify";
       packageName = "js-beautify";
-      version = "1.10.1";
+      version = "1.10.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.10.1.tgz";
-        sha512 = "4y8SHOIRC+/YQ2gs3zJEKBUraQerq49FJYyXRpdzUGYQzCq8q9xtIh0YXial1S5KmonVui4aiUb6XaGyjE51XA==";
+        url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.10.2.tgz";
+        sha512 = "ZtBYyNUYJIsBWERnQP0rPN9KjkrDfJcMjuVGcvXOUJrD1zmOGwhRwQ4msG+HJ+Ni/FA7+sRQEMYVzdTQDvnzvQ==";
       };
     };
     "js-levenshtein-1.1.6" = {
@@ -21885,13 +21769,13 @@ let
         sha512 = "y8Px43oyiBM13Zc1z780FrfNLJCXTL40EWlty/LXUtcjykRBNgLlCjWXpfSPBl2iv+N7koQN+dvqszHZgT/Fjw==";
       };
     };
-    "jsdom-15.1.1" = {
+    "jsdom-14.1.0" = {
       name = "jsdom";
       packageName = "jsdom";
-      version = "15.1.1";
+      version = "14.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsdom/-/jsdom-15.1.1.tgz";
-        sha512 = "cQZRBB33arrDAeCrAEWn1U3SvrvC8XysBua9Oqg1yWrsY/gYcusloJC3RZJXuY5eehSCmws8f2YeliCqGSkrtQ==";
+        url = "https://registry.npmjs.org/jsdom/-/jsdom-14.1.0.tgz";
+        sha512 = "O901mfJSuTdwU2w3Sn+74T+RnDVP+FuV5fH8tcPWyqrseRAb0s5xOtPgCFiPOtLcyK7CLIJwPyD83ZqQWvA5ng==";
       };
     };
     "jsdom-7.2.2" = {
@@ -22128,15 +22012,6 @@ let
         sha1 = "f6efc93c06a04de9aec53053df2559bb19e2038b";
       };
     };
-    "json3-3.3.2" = {
-      name = "json3";
-      packageName = "json3";
-      version = "3.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz";
-        sha1 = "3c0434743df93e2f5c42aee7b19bcb483575f4e1";
-      };
-    };
     "json5-0.5.1" = {
       name = "json5";
       packageName = "json5";
@@ -22525,22 +22400,22 @@ let
         sha512 = "mgAJZeFYbpP0xzJzmS0TQTYoFI0sjy3GnKFhg8wyboL+KvWg2WLaA2Oy9PthLPx2Rxz4WeBMk4y3MSOrDJ95FA==";
       };
     };
-    "k-rpc-5.0.0" = {
+    "k-rpc-5.1.0" = {
       name = "k-rpc";
       packageName = "k-rpc";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/k-rpc/-/k-rpc-5.0.0.tgz";
-        sha512 = "vCH2rQdfMOS+MlUuTSuar1pS2EMrltURf9LmAR9xR6Jik0XPlMX3vEixgqMn17wKmFVCublJqSJ4hJIP7oKZ3Q==";
+        url = "https://registry.npmjs.org/k-rpc/-/k-rpc-5.1.0.tgz";
+        sha512 = "FGc+n70Hcjoa/X2JTwP+jMIOpBz+pkRffHnSl9yrYiwUxg3FIgD50+u1ePfJUOnRCnx6pbjmVk5aAeB1wIijuQ==";
       };
     };
-    "k-rpc-socket-1.8.0" = {
+    "k-rpc-socket-1.11.1" = {
       name = "k-rpc-socket";
       packageName = "k-rpc-socket";
-      version = "1.8.0";
+      version = "1.11.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.8.0.tgz";
-        sha512 = "f/9TynsO8YYjZ6JjNNtSSH7CJcIHcio1buy3zqByGxb/GX8AWLdL6FZEWTrN8V3/J7W4/E0ZTQQ+Jt2rVq7ELg==";
+        url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.11.1.tgz";
+        sha512 = "8xtA8oqbZ6v1Niryp2/g4GxW16EQh5MvrUylQoOG+zcrDff5CKttON2XUXvMwlIHq4/2zfPVFiinAccJ+WhxoA==";
       };
     };
     "keep-alive-agent-0.0.1" = {
@@ -22912,13 +22787,13 @@ let
         sha512 = "XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA==";
       };
     };
-    "length-prefixed-message-3.0.3" = {
+    "length-prefixed-message-3.0.4" = {
       name = "length-prefixed-message";
       packageName = "length-prefixed-message";
-      version = "3.0.3";
+      version = "3.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/length-prefixed-message/-/length-prefixed-message-3.0.3.tgz";
-        sha1 = "245474d69abc0614dca368dc35aa8074982a23ac";
+        url = "https://registry.npmjs.org/length-prefixed-message/-/length-prefixed-message-3.0.4.tgz";
+        sha512 = "Tqyx4nggb9nkLD6p4hyIz7UiVNg5u3OnCP2h0hS/HXpheH88rsoNEgNB8xTnpPMw6zWXGZ7Cpg1zhWPlsJ0/TQ==";
       };
     };
     "less-2.7.3" = {
@@ -22993,13 +22868,13 @@ let
         sha512 = "m5JRIyHZn5VnCCFeRegJkn5bQd3MJK5qZX12zg3Oivc8+BUIS2yFS6ANMMeHX2ieGxucNvEn6/ZnyjmZQLLUWw==";
       };
     };
-    "level-packager-5.0.2" = {
+    "level-packager-5.0.3" = {
       name = "level-packager";
       packageName = "level-packager";
-      version = "5.0.2";
+      version = "5.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/level-packager/-/level-packager-5.0.2.tgz";
-        sha512 = "sJWdeW5tObvTvgP4Xf2psL5CEUsZjDjiTtlcimHp3Ifd4qbmkEGquN82C5ZtC7VpWEiISeUIBtIcCskVzEpvFw==";
+        url = "https://registry.npmjs.org/level-packager/-/level-packager-5.0.3.tgz";
+        sha512 = "Ut62o3nvUNCxYldM5+13+0sYow6ifKj2C26/0ToB7zKgdypF5wRKcVkcztQVwsQi+ZnrmDzhimp7FKP5Ynv6Rg==";
       };
     };
     "level-post-1.0.7" = {
@@ -23020,13 +22895,13 @@ let
         sha512 = "SBSR60x+dghhwGUxPKS+BvV1xNqnwsEUBKmnFepPaHJ6VkBXyPK9SImGc3K2BkwBfpxlt7GKkBNlCnrdufsejA==";
       };
     };
-    "leveldown-5.1.1" = {
+    "leveldown-5.2.0" = {
       name = "leveldown";
       packageName = "leveldown";
-      version = "5.1.1";
+      version = "5.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/leveldown/-/leveldown-5.1.1.tgz";
-        sha512 = "4n2R/vEA/sssh5TKtFwM9gshW2tirNoURLqekLRUUzuF+eUBLFAufO8UW7bz8lBbG2jw8tQDF3LC+LcUCc12kg==";
+        url = "https://registry.npmjs.org/leveldown/-/leveldown-5.2.0.tgz";
+        sha512 = "Ml6mWFqhhyUbuJUVaOd6ZVBHA5T0XLOK0cwNRIBEDJCjBiJBM3fpi4gdTIhU5/tWqtxMFMQbmo/U7a9rbA1stg==";
       };
     };
     "levelup-0.19.1" = {
@@ -23038,13 +22913,13 @@ let
         sha1 = "f3a6a7205272c4b5f35e412ff004a03a0aedf50b";
       };
     };
-    "levelup-4.1.0" = {
+    "levelup-4.2.0" = {
       name = "levelup";
       packageName = "levelup";
-      version = "4.1.0";
+      version = "4.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/levelup/-/levelup-4.1.0.tgz";
-        sha512 = "+Qhe2/jb5affN7BeFgWUUWVdYoGXO2nFS3QLEZKZynnQyP9xqA+7wgOz3fD8SST2UKpHQuZgjyJjTcB2nMl2dQ==";
+        url = "https://registry.npmjs.org/levelup/-/levelup-4.2.0.tgz";
+        sha512 = "TiHUSYrSUQhG7a5MZIKq6ClDcARSvMvSy5GTM8I62tHV5XiWqf+aInF+CAenQKzVRG2s6fufg62Lv8614Extyg==";
       };
     };
     "leven-2.1.0" = {
@@ -23389,15 +23264,6 @@ let
         sha1 = "d22c9ac660288f3843e16ba7d2b5d06cca27d777";
       };
     };
-    "lodash-4.17.14" = {
-      name = "lodash";
-      packageName = "lodash";
-      version = "4.17.14";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash/-/lodash-4.17.14.tgz";
-        sha512 = "mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw==";
-      };
-    };
     "lodash-4.17.15" = {
       name = "lodash";
       packageName = "lodash";
@@ -24415,13 +24281,13 @@ let
         sha1 = "88328fd7d1ce7938b29283746f0b1bc126b24708";
       };
     };
-    "log-update-3.2.0" = {
+    "log-update-3.3.0" = {
       name = "log-update";
       packageName = "log-update";
-      version = "3.2.0";
+      version = "3.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/log-update/-/log-update-3.2.0.tgz";
-        sha512 = "KJ6zAPIHWo7Xg1jYror6IUDFJBq1bQ4Bi4wAEp2y/0ScjBBVi/g0thr0sUVhuvuXauWzczt7T2QHghPDNnKBuw==";
+        url = "https://registry.npmjs.org/log-update/-/log-update-3.3.0.tgz";
+        sha512 = "YSKm5n+YjZoGZT5lfmOqasVH1fIH9xQA9A81Y48nZ99PxAP62vdCCtua+Gcu6oTn0nqtZd/LwRV+Vflo53ZDWA==";
       };
     };
     "log4js-4.5.1" = {
@@ -24442,13 +24308,13 @@ let
         sha512 = "+lZh4OpERDBLqjiwDLpAWNQu6KMjnlXH2ByZwCuSqVPJletw0kTWJf5CgSNAUKn1KUkv3m2cUz/LK8zyEy7wzQ==";
       };
     };
-    "loglevel-1.6.3" = {
+    "loglevel-1.6.4" = {
       name = "loglevel";
       packageName = "loglevel";
-      version = "1.6.3";
+      version = "1.6.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/loglevel/-/loglevel-1.6.3.tgz";
-        sha512 = "LoEDv5pgpvWgPF4kNYuIp0qqSJVWak/dML0RY74xlzMZiT9w77teNAwKYKWBTYjlokMirg+o3jBwp+vlLrcfAA==";
+        url = "https://registry.npmjs.org/loglevel/-/loglevel-1.6.4.tgz";
+        sha512 = "p0b6mOGKcGa+7nnmKbpzR6qloPbrgLcnio++E+14Vo/XffOGwZtRpUhr8dTH/x2oCMmEoIU0Zwm3ZauhvYD17g==";
       };
     };
     "loglevel-colored-level-prefix-1.0.0" = {
@@ -25036,13 +24902,13 @@ let
         sha1 = "a65cd29087a92598b8791257a523e021222ac1f9";
       };
     };
-    "map-obj-3.1.0" = {
+    "map-obj-4.1.0" = {
       name = "map-obj";
       packageName = "map-obj";
-      version = "3.1.0";
+      version = "4.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/map-obj/-/map-obj-3.1.0.tgz";
-        sha512 = "Xg1iyYz/+iIW6YoMldux47H/e5QZyDSB41Kb0ev+YYHh3FJnyyzY0vTk/WbVeWcCvdXd70cOriUBmhP8alUFBA==";
+        url = "https://registry.npmjs.org/map-obj/-/map-obj-4.1.0.tgz";
+        sha512 = "glc9y00wgtwcDmp7GaE/0b0OnxpNJsVf3ael/An6Fe2Q51LLwN1er6sdomLRzz5h0+yMpiYLhWYF5R7HeqVd4g==";
       };
     };
     "map-stream-0.0.7" = {
@@ -25225,15 +25091,6 @@ let
         sha1 = "c6f34834a0d8dbc3b37c27ee8bbcb27c7775582e";
       };
     };
-    "matcher-1.1.1" = {
-      name = "matcher";
-      packageName = "matcher";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/matcher/-/matcher-1.1.1.tgz";
-        sha512 = "+BmqxWIubKTRKNWx/ahnCkk3mG8m7OturVlqq6HiojGJTd5hVYbgZm6WzcYPCoB+KBT4Vd6R7WSRG2OADNaCjg==";
-      };
-    };
     "matcher-2.0.0" = {
       name = "matcher";
       packageName = "matcher";
@@ -25261,6 +25118,16 @@ let
         sha512 = "rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==";
       };
     };
+    "mathjax-full-git://github.com/mathjax/MathJax-src.git" = {
+      name = "mathjax-full";
+      packageName = "mathjax-full";
+      version = "3.0.0";
+      src = fetchgit {
+        url = "git://github.com/mathjax/MathJax-src.git";
+        rev = "0d74266e1820220d33cb6b29d4ca3575b352ac0d";
+        sha256 = "a4d1a272ec79367f3e4515d1cbd9bbe3f77687aa17443398288e91a6f23b1241";
+      };
+    };
     "md5-2.2.1" = {
       name = "md5";
       packageName = "md5";
@@ -25576,15 +25443,6 @@ let
         sha1 = "c36a52a781437513c57275f39dd9d317514ac8c7";
       };
     };
-    "merge-descriptors-1.0.0" = {
-      name = "merge-descriptors";
-      packageName = "merge-descriptors";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.0.tgz";
-        sha1 = "2169cf7538e1b0cc87fb88e1502d8474bbf79864";
-      };
-    };
     "merge-descriptors-1.0.1" = {
       name = "merge-descriptors";
       packageName = "merge-descriptors";
@@ -25603,13 +25461,13 @@ let
         sha1 = "a5de46538dae84d4114cc5ea02b4772a6346701f";
       };
     };
-    "merge2-1.2.4" = {
+    "merge2-1.3.0" = {
       name = "merge2";
       packageName = "merge2";
-      version = "1.2.4";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/merge2/-/merge2-1.2.4.tgz";
-        sha512 = "FYE8xI+6pjFOhokZu0We3S5NKCirLbCzSh2Usf3qEyr4X8U+0jNg9P8RZ4qz+V2UoECLVwSyzU3LxXBaLGtD3A==";
+        url = "https://registry.npmjs.org/merge2/-/merge2-1.3.0.tgz";
+        sha512 = "2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw==";
       };
     };
     "merkle-tree-stream-3.0.3" = {
@@ -25639,15 +25497,6 @@ let
         sha1 = "833afbb5a2a6385e2d9ae3d935e39e33eaea5231";
       };
     };
-    "method-override-2.3.10" = {
-      name = "method-override";
-      packageName = "method-override";
-      version = "2.3.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/method-override/-/method-override-2.3.10.tgz";
-        sha1 = "e3daf8d5dee10dd2dce7d4ae88d62bbee77476b4";
-      };
-    };
     "method-override-3.0.0" = {
       name = "method-override";
       packageName = "method-override";
@@ -25801,6 +25650,15 @@ let
         sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==";
       };
     };
+    "mime-2.4.3" = {
+      name = "mime";
+      packageName = "mime";
+      version = "2.4.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mime/-/mime-2.4.3.tgz";
+        sha512 = "QgrPRJfE+riq5TPZMcHZOtm8c6K/yYrMbKIoRfapfiGLxS8OTeIfRhUGW5LU7MlRa52KOAGCfUNruqLrIBvWZw==";
+      };
+    };
     "mime-2.4.4" = {
       name = "mime";
       packageName = "mime";
@@ -25837,6 +25695,15 @@ let
         sha512 = "jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==";
       };
     };
+    "mime-db-1.41.0" = {
+      name = "mime-db";
+      packageName = "mime-db";
+      version = "1.41.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.41.0.tgz";
+        sha512 = "B5gxBI+2K431XW8C2rcc/lhppbuji67nf9v39eH8pkWoZDxnAL0PxdpH32KYRScniF8qDHBDlI+ipgg5WrCUYw==";
+      };
+    };
     "mime-types-2.0.14" = {
       name = "mime-types";
       packageName = "mime-types";
@@ -26026,13 +25893,13 @@ let
         sha512 = "oP88Dw3LK/pdrKyMdlbmg3W50969UNr4ctISzJfPl+YPYHTAOrS+dihXnsgRNKSRIzDsrnV3eE2CCVlZbpOKdQ==";
       };
     };
-    "minipass-2.3.5" = {
+    "minipass-2.6.2" = {
       name = "minipass";
       packageName = "minipass";
-      version = "2.3.5";
+      version = "2.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz";
-        sha512 = "Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==";
+        url = "https://registry.npmjs.org/minipass/-/minipass-2.6.2.tgz";
+        sha512 = "38Jwdc8AttUDaQAIRX8Iaw3QoCDWjAwKMGeGDF9JUi9QCPMjH5qAQg/hdO8o1nC7Nmh1/CqzMg5FQPEKuKwznQ==";
       };
     };
     "minitouch-prebuilt-1.2.0" = {
@@ -26044,13 +25911,13 @@ let
         sha512 = "YBTCTK0kPQIry0dJUqnj+OKw7qk1BDk4JnOH55ujaL4vtf9f3fRsHtD+zz899SKwT2t319HrrfBNwMLx6h2Vtg==";
       };
     };
-    "minizlib-1.2.1" = {
+    "minizlib-1.2.2" = {
       name = "minizlib";
       packageName = "minizlib";
-      version = "1.2.1";
+      version = "1.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz";
-        sha512 = "7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==";
+        url = "https://registry.npmjs.org/minizlib/-/minizlib-1.2.2.tgz";
+        sha512 = "hR3At21uSrsjjDTWrbu0IMLTpnkpv8IIMFDFaoz43Tmu4LkmAXfH44vNNzpTnf+OAQQCHrb91y/wc2J4x5XgSQ==";
       };
     };
     "mired-0.0.0" = {
@@ -26107,6 +25974,15 @@ let
         sha1 = "4fb949441dab182540f1fe035ba60e1947a5e57e";
       };
     };
+    "mj-context-menu-0.2.0" = {
+      name = "mj-context-menu";
+      packageName = "mj-context-menu";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mj-context-menu/-/mj-context-menu-0.2.0.tgz";
+        sha512 = "yJxrWBHCjFZEHsZgfs7m5g9OSCNzsVYadW6f6lX3pgZL67vmodtSW/4zhsYmuDKweXfHs0M1kJge1uQIasWA+g==";
+      };
+    };
     "mkdirp-0.3.0" = {
       name = "mkdirp";
       packageName = "mkdirp";
@@ -26260,15 +26136,6 @@ let
         sha512 = "IrhznRheWtDcT/TEL3cqaT4UJOqc5G3K8TnGq29PRXZil+sWGPkcM6SHVUZVirTKFKceuCadfyDMjmRoXCN21A==";
       };
     };
-    "morgan-1.6.1" = {
-      name = "morgan";
-      packageName = "morgan";
-      version = "1.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/morgan/-/morgan-1.6.1.tgz";
-        sha1 = "5fd818398c6819cba28a7cd6664f292fe1c0bbf2";
-      };
-    };
     "morgan-1.9.1" = {
       name = "morgan";
       packageName = "morgan";
@@ -26296,22 +26163,22 @@ let
         sha1 = "be2c005fda32e0b29af1f05d7c4b33214c701f92";
       };
     };
-    "mp4-box-encoding-1.3.0" = {
+    "mp4-box-encoding-1.4.1" = {
       name = "mp4-box-encoding";
       packageName = "mp4-box-encoding";
-      version = "1.3.0";
+      version = "1.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mp4-box-encoding/-/mp4-box-encoding-1.3.0.tgz";
-        sha512 = "U4pMLpjT/UzB8d36dxj6Mf1bG9xypEvgbuRIa1fztRXNKKTCAtRxsnFZhNOd7YDFOKtjBgssYGvo4H/Q3ZY1MA==";
+        url = "https://registry.npmjs.org/mp4-box-encoding/-/mp4-box-encoding-1.4.1.tgz";
+        sha512 = "2/PRtGGiqPc/VEhbm7xAQ+gbb7yzHjjMAv6MpAifr5pCpbh3fQUdj93uNgwPiTppAGu8HFKe3PeU+OdRyAxStA==";
       };
     };
-    "mp4-stream-3.0.0" = {
+    "mp4-stream-3.1.0" = {
       name = "mp4-stream";
       packageName = "mp4-stream";
-      version = "3.0.0";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mp4-stream/-/mp4-stream-3.0.0.tgz";
-        sha512 = "UCvsZaEP2b+Tl2mJOmb+TXdA2f24ggNUadgQkpgvaNDZQNGs6/O8ivFcj9ogf4Bj4R6dbqv18VXUdp16BhXk/A==";
+        url = "https://registry.npmjs.org/mp4-stream/-/mp4-stream-3.1.0.tgz";
+        sha512 = "ZQQjf0VEiqPucwRvmT3e0pfZfMSE3nc5ngGUiN1+2VMxCtrInrlAjZ2K6jpNmxSZ/roiQne/ovYJYTeOvZDXPw==";
       };
     };
     "mpath-0.2.1" = {
@@ -26368,15 +26235,6 @@ let
         sha1 = "9cd13c03adbff25b65effde7ce864ee952017098";
       };
     };
-    "ms-0.7.2" = {
-      name = "ms";
-      packageName = "ms";
-      version = "0.7.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz";
-        sha1 = "ae25cf2512b3885a1d95d7f037868d8431124765";
-      };
-    };
     "ms-2.0.0" = {
       name = "ms";
       packageName = "ms";
@@ -26584,15 +26442,6 @@ let
         sha1 = "a567c2af000ad22dc8f2a653d91978ae1f5316f4";
       };
     };
-    "multiparty-3.3.2" = {
-      name = "multiparty";
-      packageName = "multiparty";
-      version = "3.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/multiparty/-/multiparty-3.3.2.tgz";
-        sha1 = "35de6804dc19643e5249f3d3e3bdc6c8ce301d3f";
-      };
-    };
     "multiparty-4.2.1" = {
       name = "multiparty";
       packageName = "multiparty";
@@ -26647,13 +26496,13 @@ let
         sha512 = "xasv76hl6nr1dEy3lPvy7Ej7K/Lx3O/FCvwge8PeVJpciPPoNCbaANcNiBug3IpdvTveZUcAV0DJzdnUDMesNQ==";
       };
     };
-    "multistream-3.1.0" = {
+    "multistream-4.0.0" = {
       name = "multistream";
       packageName = "multistream";
-      version = "3.1.0";
+      version = "4.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/multistream/-/multistream-3.1.0.tgz";
-        sha512 = "zBgD3kn8izQAN/TaL1PCMv15vYpf+Vcrsfub06njuYVYlzUldzpopTlrEZ53pZVEbfn3Shtv7vRFoOv6LOV87Q==";
+        url = "https://registry.npmjs.org/multistream/-/multistream-4.0.0.tgz";
+        sha512 = "t0C8MAtH/d3Y+5nooEtUMWli92lVw9Jhx4uOhRl5GAwS5vc+YTmp/VXNJNsCBAMeEyK/6zhbk6x9JE3AiCvo4g==";
       };
     };
     "mustache-2.3.2" = {
@@ -26881,13 +26730,22 @@ let
         sha512 = "Hv9USGyH8EsPy0o8pPWE7x3YRIfuZDgMBirzjU6XLebhiSK2g53JlfqgolD0c39ne6wXAfaBNcIAvYe22Bav+Q==";
       };
     };
-    "nanoid-2.0.3" = {
+    "nanoguard-1.2.1" = {
+      name = "nanoguard";
+      packageName = "nanoguard";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nanoguard/-/nanoguard-1.2.1.tgz";
+        sha512 = "XowCxURA68arCQEypYKAxyIvBUP2EkqA8mZCXqJ2yzLpFblxSjiP06PUUpVK2no3cgGhsbRlBrsEuYIflxu79w==";
+      };
+    };
+    "nanoid-2.1.1" = {
       name = "nanoid";
       packageName = "nanoid";
-      version = "2.0.3";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nanoid/-/nanoid-2.0.3.tgz";
-        sha512 = "NbaoqdhIYmY6FXDRB4eYtDVC9Z9eCbn8TyaiC16LNKtpPv/aqa0tOPD8y6gNE4yUNnaZ7LLhYtXOev/6+cBtfw==";
+        url = "https://registry.npmjs.org/nanoid/-/nanoid-2.1.1.tgz";
+        sha512 = "0YbJdaL4JFoejIOoawgLcYValFGJ2iyUuVDIWL3g8Es87SSOWFbWdRUMV3VMSiyPs3SQ3QxCIxFX00q5DLkMCw==";
       };
     };
     "nanolru-1.0.0" = {
@@ -26944,6 +26802,15 @@ let
         sha512 = "Tr0DNY4RzTaBG2W2m3l7ZtFuJChTH6VZhXVhkGGjF/4cZTt+i8GcM9ozD+30Lmr4mDoZ5Xx34t2o4GJqYWDGcg==";
       };
     };
+    "napi-macros-2.0.0" = {
+      name = "napi-macros";
+      packageName = "napi-macros";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/napi-macros/-/napi-macros-2.0.0.tgz";
+        sha512 = "A0xLykHtARfueITVDernsAWdtIMbOJgKgcluwENp3AlsKN/PloyO10HtmoqnFAQAcxPkgZN7wdfPfEd0zNGxbg==";
+      };
+    };
     "native-dns-cache-git+https://github.com/okTurtles/native-dns-cache.git#8714196bb9223cc9a4064a4fddf9e82ec50b7d4d" = {
       name = "native-dns-cache";
       packageName = "native-dns-cache";
@@ -27110,13 +26977,13 @@ let
         sha1 = "ae603b36b134bcec347b452422b0bf98d5832ec8";
       };
     };
-    "nearley-2.18.0" = {
+    "nearley-2.19.0" = {
       name = "nearley";
       packageName = "nearley";
-      version = "2.18.0";
+      version = "2.19.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nearley/-/nearley-2.18.0.tgz";
-        sha512 = "/zQOMCeJcioI0xJtd5RpBiWw2WP7wLe6vq8/3Yu0rEwgus/G/+pViX80oA87JdVgjRt2895mZSv2VfZmy4W1uw==";
+        url = "https://registry.npmjs.org/nearley/-/nearley-2.19.0.tgz";
+        sha512 = "2v52FTw7RPqieZr3Gth1luAXZR7Je6q3KaDHY5bjl/paDUdMu35fZ8ICNgiYJRr3tf3NMvIQQR1r27AvEr9CRA==";
       };
     };
     "neat-csv-2.1.0" = {
@@ -27209,15 +27076,6 @@ let
         sha1 = "269d5c476810ec92edbe7b6c2f28316384f9a7e8";
       };
     };
-    "negotiator-0.6.1" = {
-      name = "negotiator";
-      packageName = "negotiator";
-      version = "0.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz";
-        sha1 = "2b327184e8992101177b28563fb5e7102acd0ca9";
-      };
-    };
     "negotiator-0.6.2" = {
       name = "negotiator";
       packageName = "negotiator";
@@ -27326,13 +27184,13 @@ let
         sha1 = "ca86d1fe8828169b0120208e3dc8424b9db8342c";
       };
     };
-    "nextgen-events-1.1.1" = {
+    "nextgen-events-1.3.0" = {
       name = "nextgen-events";
       packageName = "nextgen-events";
-      version = "1.1.1";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nextgen-events/-/nextgen-events-1.1.1.tgz";
-        sha512 = "vnKAjcvttm+ILOpLuNEFUuqYAfMYfvThpTGLLZT8w+mSCMmnRsKt/qWNuNkb3/RgNyon3EqPT6bDy4xSJkbKsA==";
+        url = "https://registry.npmjs.org/nextgen-events/-/nextgen-events-1.3.0.tgz";
+        sha512 = "eBz5mrO4Hw2eenPVm0AVPHuAzg/RZetAWMI547RH8O9+a0UYhCysiZ3KoNWslnWNlHetb9kzowEshsKsmFo2YQ==";
       };
     };
     "nice-try-1.0.5" = {
@@ -27425,13 +27283,13 @@ let
         sha512 = "iEOqDAOFl6uN5jZGRj39Jdo8qALzf2HPXtpFso8+BMaDylDrUMYMwhFbfYGgxdnMlsRnxYTwv68kaXEpsHIapg==";
       };
     };
-    "node-abi-2.10.0" = {
+    "node-abi-2.11.0" = {
       name = "node-abi";
       packageName = "node-abi";
-      version = "2.10.0";
+      version = "2.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-abi/-/node-abi-2.10.0.tgz";
-        sha512 = "OT0WepUvYHXdki6DU8LWhEkuo3M44i2paWBYtH9qXtPb9YiKlYEKa5WUII20XEcOv7UJPzfB0kZfPZdW46zdkw==";
+        url = "https://registry.npmjs.org/node-abi/-/node-abi-2.11.0.tgz";
+        sha512 = "kuy/aEg75u40v378WRllQ4ZexaXJiCvB68D2scDXclp/I4cRq6togpbOoKhmN07tns9Zldu51NNERo0wehfX9g==";
       };
     };
     "node-addon-api-1.7.1" = {
@@ -27615,13 +27473,13 @@ let
         sha512 = "zLcTg6P4AbcHPq465ZMFNXx7XpKKJh+7kkN699NiQWisR2uWYOWNWqRHAmbnmKiL4e9aLSlmy5U7rEMUXV59+A==";
       };
     };
-    "node-gyp-build-4.1.0" = {
+    "node-gyp-build-4.1.1" = {
       name = "node-gyp-build";
       packageName = "node-gyp-build";
-      version = "4.1.0";
+      version = "4.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.1.0.tgz";
-        sha512 = "rGLv++nK20BG8gc0MzzcYe1Nl3p3mtwJ74Q2QD0HTEDKZ6NvOFSelY6s2QBPWIHRR8h7hpad0LiwajfClBJfNg==";
+        url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.1.1.tgz";
+        sha512 = "dSq1xmcPDKPZ2EED2S6zw/b9NKsqzXRE6dVr8TVQnI3FJOTteUMuqF3Qqs6LZg+mLGYJWqQzMbIjMtJqTv87nQ==";
       };
     };
     "node-int64-0.4.0" = {
@@ -27669,13 +27527,13 @@ let
         sha512 = "SUDEb+o71XR5lXSTyivXd9J7fCloE3SyP4lSgt3lU2oSANiox+SxlNRGPjDKrwU1YN3ix2KN/VGGCg0t01rttQ==";
       };
     };
-    "node-notifier-5.4.2" = {
+    "node-notifier-5.4.3" = {
       name = "node-notifier";
       packageName = "node-notifier";
-      version = "5.4.2";
+      version = "5.4.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-notifier/-/node-notifier-5.4.2.tgz";
-        sha512 = "85nkTziazE2dR4pyoLxMwz0b9MmxFQPVXYs/WlWI7CPtBkARJOV+89khdNjpbclXIJDECQYnTvh1xuZV3WHkCA==";
+        url = "https://registry.npmjs.org/node-notifier/-/node-notifier-5.4.3.tgz";
+        sha512 = "M4UBGcs4jeOK9CjTsYwkvH6/MzuUmGCyTW+kCY7uO+1ZVr0+FHGdPdIf5CCLqAaxnRrWidyoQlNkMIIVwbKB8Q==";
       };
     };
     "node-persist-2.1.0" = {
@@ -27732,13 +27590,13 @@ let
         sha512 = "OsJV74qxnvz/AMGgcfZoDaeDXKD3oY3QVIbBmwszTFkRisTSXbMQyn4UWzUMOtA5SVhrBZOTp0wcoSBgfMfMmQ==";
       };
     };
-    "node-red-node-email-1.6.2" = {
+    "node-red-node-email-1.6.3" = {
       name = "node-red-node-email";
       packageName = "node-red-node-email";
-      version = "1.6.2";
+      version = "1.6.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-1.6.2.tgz";
-        sha512 = "px5xvIE649aEAh08hAqnFV/IyqN1EQ9nHsTp8OWvVdNZqfAEcT0O6jjMONN/ur5Az1Uyrc7cA3c+iYmc2yzGMg==";
+        url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-1.6.3.tgz";
+        sha512 = "78O7CASdGAP2wmMJvqsMYdNrCHI54lSE97hWpbNQPG2QC2d15TEUQU+E8KgNzquPtJn0Pjh/cvzt+kQwKjkaUg==";
       };
     };
     "node-red-node-feedparser-0.1.14" = {
@@ -27750,13 +27608,13 @@ let
         sha512 = "Bb9M5bFrOqoFxBVxfstBM/g+VPaV4EPQptXQBMrlsCd3P40CXcGL0mDylXU+3cekWNd5hLHfqTHvXJdkowHGDw==";
       };
     };
-    "node-red-node-rbe-0.2.4" = {
+    "node-red-node-rbe-0.2.5" = {
       name = "node-red-node-rbe";
       packageName = "node-red-node-rbe";
-      version = "0.2.4";
+      version = "0.2.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.2.4.tgz";
-        sha512 = "ft/8/dTRGzGQ9vCnAzuBxzR+aDv4Yun/vuSKi/eI5Qj2/ZBal28L9HpWziSTWlLrMhZns8CRz7s2p84P2ee/vA==";
+        url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.2.5.tgz";
+        sha512 = "WPwIOZIdDprgfqOe8bEun47wkFFc+5Uw/1w3O/kZn/kS2IpI1q+wijUDK+Hw8q4d8KgA58B30wh+10UvXzsPDA==";
       };
     };
     "node-red-node-sentiment-0.1.4" = {
@@ -27786,13 +27644,13 @@ let
         sha512 = "8V4tLL0nM1DOUgEtTOBSTZcLbtZ4Gg4CPFVHiPmLCo2QYTMQ0JdBIYj4pg95LbJbYkV721fqsw1RDsitBfYuCQ==";
       };
     };
-    "node-releases-1.1.26" = {
+    "node-releases-1.1.32" = {
       name = "node-releases";
       packageName = "node-releases";
-      version = "1.1.26";
+      version = "1.1.32";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.26.tgz";
-        sha512 = "fZPsuhhUHMTlfkhDLGtfY80DSJTjOcx+qD1j5pqPkuhUHVS7xHZIg9EE4DHK8O3f0zTxXHX5VIkDG8pu98/wfQ==";
+        url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.32.tgz";
+        sha512 = "VhVknkitq8dqtWoluagsGPn3dxTvN9fwgR59fV3D7sLBHe0JfDramsMI8n8mY//ccq/Kkrf8ZRHRpsyVZ3qw1A==";
       };
     };
     "node-request-by-swagger-1.1.4" = {
@@ -27903,13 +27761,13 @@ let
         sha512 = "TEHBNBPHv7Ie/0o3HXnb7xrPSSQmH1dXwQKRaMKDBGt/ZN54lvDVujP6hKkO/vjkIYL9rK8kHSG11+G42Nhxuw==";
       };
     };
-    "nodemon-1.19.1" = {
+    "nodemon-1.19.2" = {
       name = "nodemon";
       packageName = "nodemon";
-      version = "1.19.1";
+      version = "1.19.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nodemon/-/nodemon-1.19.1.tgz";
-        sha512 = "/DXLzd/GhiaDXXbGId5BzxP1GlsqtMGM9zTmkWrgXtSqjKmGSbLicM/oAy4FR0YWm14jCHRwnR31AHS2dYFHrg==";
+        url = "https://registry.npmjs.org/nodemon/-/nodemon-1.19.2.tgz";
+        sha512 = "hRLYaw5Ihyw9zK7NF+9EUzVyS6Cvgc14yh8CAYr38tPxJa6UrOxwAQ351GwrgoanHCF0FalQFn6w5eoX/LGdJw==";
       };
     };
     "nomnom-1.8.1" = {
@@ -28119,13 +27977,13 @@ let
         sha1 = "99b85aec29fcb388d2dd351f0013bf5268787e67";
       };
     };
-    "npm-lifecycle-3.1.2" = {
+    "npm-lifecycle-3.1.3" = {
       name = "npm-lifecycle";
       packageName = "npm-lifecycle";
-      version = "3.1.2";
+      version = "3.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-lifecycle/-/npm-lifecycle-3.1.2.tgz";
-        sha512 = "nhfOcoTHrW1lJJlM2o77vTE2RWR4YOVyj7YzmY0y5itsMjEuoJHteio/ez0BliENEPsNxIUQgwhyEW9dShj3Ww==";
+        url = "https://registry.npmjs.org/npm-lifecycle/-/npm-lifecycle-3.1.3.tgz";
+        sha512 = "M0QmmqbEHBXxDrmc6X3+eKjW9+F7Edg1ENau92WkYw1sox6wojHzEZJIRm1ItljEiaigZlKL8mXni/4ylAy1Dg==";
       };
     };
     "npm-package-arg-6.1.0" = {
@@ -28137,6 +27995,15 @@ let
         sha512 = "zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA==";
       };
     };
+    "npm-package-arg-6.1.1" = {
+      name = "npm-package-arg";
+      packageName = "npm-package-arg";
+      version = "6.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.1.tgz";
+        sha512 = "qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==";
+      };
+    };
     "npm-packlist-1.4.4" = {
       name = "npm-packlist";
       packageName = "npm-packlist";
@@ -28173,6 +28040,15 @@ let
         sha512 = "+IluBC5K201+gRU85vFlUwX3PFShZAbAgDNp2ewJdWMVSppdo/Zih0ul2Ecky/X7b51J7LrrUAP+XOmOCvYZqA==";
       };
     };
+    "npm-pick-manifest-3.0.2" = {
+      name = "npm-pick-manifest";
+      packageName = "npm-pick-manifest";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-3.0.2.tgz";
+        sha512 = "wNprTNg+X5nf+tDi+hbjdHhM4bX+mKqv6XmPh7B5eG+QY9VARfQPfCEH013H5GqfNj6ee8Ij2fg8yk0mzps1Vw==";
+      };
+    };
     "npm-prefix-1.2.0" = {
       name = "npm-prefix";
       packageName = "npm-prefix";
@@ -28200,13 +28076,13 @@ let
         sha512 = "Qs6P6nnopig+Y8gbzpeN/dkt+n7IyVd8f45NTMotGk6Qo7GfBmzwYx6jRLoOOgKiMnaQfYxsuyQlD8Mc3guBhg==";
       };
     };
-    "npm-registry-fetch-4.0.0" = {
+    "npm-registry-fetch-4.0.1" = {
       name = "npm-registry-fetch";
       packageName = "npm-registry-fetch";
-      version = "4.0.0";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.0.tgz";
-        sha512 = "Jllq35Jag8dtv0M17ue74XtdQTyqKzuAYGiX9mAjOhkmNjib3bBUgK6mUY61+AHnXeSRobQkpY3/xIOS/omptw==";
+        url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.1.tgz";
+        sha512 = "1ZQ+yjnxc698R5h9Yje9CASapzAZr7aYDkJDdERg9xg2hOEY0vRJwskOaJAXq8N/eLavzvW4g564YAfq6zMn/A==";
       };
     };
     "npm-run-4.1.2" = {
@@ -28435,15 +28311,6 @@ let
         sha1 = "9bedd5ca0897949bca47e7ff408062d549f587f2";
       };
     };
-    "object-assign-4.1.0" = {
-      name = "object-assign";
-      packageName = "object-assign";
-      version = "4.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz";
-        sha1 = "7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0";
-      };
-    };
     "object-assign-4.1.1" = {
       name = "object-assign";
       packageName = "object-assign";
@@ -28507,6 +28374,15 @@ let
         sha512 = "GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ==";
       };
     };
+    "object-is-1.0.1" = {
+      name = "object-is";
+      packageName = "object-is";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object-is/-/object-is-1.0.1.tgz";
+        sha1 = "0aa60ec9989a0b3ed795cf4d06f62cf1ad6539b6";
+      };
+    };
     "object-keys-0.4.0" = {
       name = "object-keys";
       packageName = "object-keys";
@@ -28822,6 +28698,15 @@ let
         sha1 = "067428230fd67443b2794b22bba528b6867962d4";
       };
     };
+    "onetime-5.1.0" = {
+      name = "onetime";
+      packageName = "onetime";
+      version = "5.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz";
+        sha512 = "5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==";
+      };
+    };
     "ono-4.0.11" = {
       name = "ono";
       packageName = "ono";
@@ -28930,15 +28815,6 @@ let
         sha512 = "nNnZDkUNExBwEpb7LZaeMeQgvrlO8l4bgY/LvGNZCR0xG/dGWqHqjKrAmR5GUoYo0FIz38kxasvA1aevxWs2CA==";
       };
     };
-    "opn-5.3.0" = {
-      name = "opn";
-      packageName = "opn";
-      version = "5.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/opn/-/opn-5.3.0.tgz";
-        sha512 = "bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g==";
-      };
-    };
     "opn-5.5.0" = {
       name = "opn";
       packageName = "opn";
@@ -28957,13 +28833,13 @@ let
         sha512 = "I9PKfIZC+e4RXZ/qr1RhgyCnGgYX0UEIlXgWnCOVACIvFgaC9rz6Won7xbdhoHrd8IIhV7YEpHjreNUNkqCGkQ==";
       };
     };
-    "optimism-0.9.6" = {
+    "optimism-0.10.3" = {
       name = "optimism";
       packageName = "optimism";
-      version = "0.9.6";
+      version = "0.10.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/optimism/-/optimism-0.9.6.tgz";
-        sha512 = "bWr/ZP32UgFCQAoSkz33XctHwpq2via2sBvGvO5JIlrU8gaiM0LvoKj3QMle9LWdSKlzKik8XGSerzsdfYLNxA==";
+        url = "https://registry.npmjs.org/optimism/-/optimism-0.10.3.tgz";
+        sha512 = "9A5pqGoQk49H6Vhjb9kPgAeeECfUDF6aIICbMDL23kDLStBn1MWk3YvcZ4xWF9CsSf6XEgvRLkXy4xof/56vVw==";
       };
     };
     "optimist-0.2.8" = {
@@ -29290,13 +29166,13 @@ let
         sha512 = "vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==";
       };
     };
-    "p-limit-2.2.0" = {
+    "p-limit-2.2.1" = {
       name = "p-limit";
       packageName = "p-limit";
-      version = "2.2.0";
+      version = "2.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz";
-        sha512 = "pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==";
+        url = "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz";
+        sha512 = "85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==";
       };
     };
     "p-locate-2.0.0" = {
@@ -29362,6 +29238,15 @@ let
         sha512 = "3cRXXn3/O0o3+eVmUroJPSj/esxoEFIm0ZOno/T+NzG/VZgPOqQ8WKmlNqubSEpZmCIngEy34unkHGg83ZIBmg==";
       };
     };
+    "p-queue-6.1.1" = {
+      name = "p-queue";
+      packageName = "p-queue";
+      version = "6.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-queue/-/p-queue-6.1.1.tgz";
+        sha512 = "R9gq36Th88xZ+rWAptN5IXLwqkwA1gagCQhT6ZXQ6RxEfmjb9ZW+UBzRVqv9sm5TQmbbI/TsKgGLbOaA61xR5w==";
+      };
+    };
     "p-reduce-1.0.0" = {
       name = "p-reduce";
       packageName = "p-reduce";
@@ -29398,6 +29283,15 @@ let
         sha512 = "88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==";
       };
     };
+    "p-timeout-3.1.0" = {
+      name = "p-timeout";
+      packageName = "p-timeout";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-timeout/-/p-timeout-3.1.0.tgz";
+        sha512 = "C27DYI+tCroT8J8cTEyySGydl2B7FlxrGNF5/wmMbl1V+jeehUCzEE/BVgzRebdm2K3ZitKOKx8YbdFumDyYmw==";
+      };
+    };
     "p-try-1.0.0" = {
       name = "p-try";
       packageName = "p-try";
@@ -29461,15 +29355,6 @@ let
         sha512 = "EeHQFFTlEmLrkIQoxbE9w0FuAWHoc1XpthDqnZ/i9keOt701cteyXwAxQFLpVqVjj3feh2TodkihjLaRUtIgLg==";
       };
     };
-    "package-json-6.4.0" = {
-      name = "package-json";
-      packageName = "package-json";
-      version = "6.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/package-json/-/package-json-6.4.0.tgz";
-        sha512 = "bd1T8OBG7hcvMd9c/udgv6u5v9wISP3Oyl9Cm7Weop8EFwrtcQDnS2sb6zhwqus2WslSr5wSTIPiTTpxxmPm7Q==";
-      };
-    };
     "package-json-6.5.0" = {
       name = "package-json";
       packageName = "package-json";
@@ -29506,13 +29391,22 @@ let
         sha1 = "79b302fc144cdfbb4ab6feba7040e6a5d99c79c7";
       };
     };
-    "pacote-9.5.4" = {
+    "pacote-9.5.5" = {
       name = "pacote";
       packageName = "pacote";
-      version = "9.5.4";
+      version = "9.5.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pacote/-/pacote-9.5.4.tgz";
-        sha512 = "nWr0ari6E+apbdoN0hToTKZElO5h4y8DGFa2pyNA5GQIdcP0imC96bA0bbPw1gpeguVIiUgHHaAlq/6xfPp8Qw==";
+        url = "https://registry.npmjs.org/pacote/-/pacote-9.5.5.tgz";
+        sha512 = "jAEP+Nqj4kyMWyNpfTU/Whx1jA7jEc5cCOlurm0/0oL+v8TAp1QSsK83N7bYe+2bEdFzMAtPG5TBebjzzGV0cA==";
+      };
+    };
+    "pacote-9.5.8" = {
+      name = "pacote";
+      packageName = "pacote";
+      version = "9.5.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pacote/-/pacote-9.5.8.tgz";
+        sha512 = "0Tl8Oi/K0Lo4MZmH0/6IsT3gpGf9eEAznLXEQPKgPq7FscnbUOyopnVpwXlnQdIbCUaojWy1Wd7VMyqfVsRrIw==";
       };
     };
     "pad-0.0.5" = {
@@ -29551,13 +29445,13 @@ let
         sha512 = "0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==";
       };
     };
-    "parallel-transform-1.1.0" = {
+    "parallel-transform-1.2.0" = {
       name = "parallel-transform";
       packageName = "parallel-transform";
-      version = "1.1.0";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz";
-        sha1 = "d410f065b05da23081fcd10f28854c29bda33b06";
+        url = "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz";
+        sha512 = "P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==";
       };
     };
     "param-case-2.1.1" = {
@@ -29776,13 +29670,13 @@ let
         sha512 = "yy7UTSmliOT/7Yl+P4hwwW2W7PbCTAMcD0lasaVG+k4/2laj42YWzLm468bLFGDoFPIb29g3BuwBcA3gLopKww==";
       };
     };
-    "parse-torrent-7.0.0" = {
+    "parse-torrent-7.0.1" = {
       name = "parse-torrent";
       packageName = "parse-torrent";
-      version = "7.0.0";
+      version = "7.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-7.0.0.tgz";
-        sha512 = "i/Y9CNp2xn+moDrNWApBZ5rW9xRY6x6z4A71Lw886UKx7E/DkVAzuvA7efVtcPgdY3iI9ea0thaoqeMN3GZBOA==";
+        url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-7.0.1.tgz";
+        sha512 = "FdF1kBImRLt+ICV4NTz8L+sI2hFlPXAq1tXuw21gKz8EuThyVUFJ/wPfBEyYQrvnBpmGf7cM/LVSOhMRe8MrKw==";
       };
     };
     "parse-torrent-file-2.1.4" = {
@@ -29848,15 +29742,6 @@ let
         sha1 = "9b10c6c0d825ab589e685153826de0a3ba278bcc";
       };
     };
-    "parsejson-0.0.3" = {
-      name = "parsejson";
-      packageName = "parsejson";
-      version = "0.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/parsejson/-/parsejson-0.0.3.tgz";
-        sha1 = "ab7e3759f209ece99437973f7d0f1f64ae0e64ab";
-      };
-    };
     "parseqs-0.0.2" = {
       name = "parseqs";
       packageName = "parseqs";
@@ -30253,15 +30138,6 @@ let
         sha1 = "1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d";
       };
     };
-    "pause-0.1.0" = {
-      name = "pause";
-      packageName = "pause";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pause/-/pause-0.1.0.tgz";
-        sha1 = "ebc8a4a8619ff0b8a81ac1513c3434ff469fdb74";
-      };
-    };
     "pause-stream-0.0.11" = {
       name = "pause-stream";
       packageName = "pause-stream";
@@ -30316,13 +30192,13 @@ let
         sha1 = "cf8bafae6eddff4b5a7efb185269eaaf4610ddbd";
       };
     };
-    "pem-1.13.2" = {
+    "pem-1.14.2" = {
       name = "pem";
       packageName = "pem";
-      version = "1.13.2";
+      version = "1.14.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pem/-/pem-1.13.2.tgz";
-        sha512 = "MPJWuEb/r6AG+GpZi2JnfNtGAZDeL/8+ERKwXEWRuST5i+4lq/Uy36B352OWIUSPQGH+HR1HEDcIDi+8cKxXNg==";
+        url = "https://registry.npmjs.org/pem/-/pem-1.14.2.tgz";
+        sha512 = "TOnPtq3ZFnCniOZ+rka4pk8UIze9xG1qI+wNE7EmkiR/cg+53uVvk5QbkWZ7M6RsuOxzz62FW1hlAobJr/lTOA==";
       };
     };
     "pend-1.2.0" = {
@@ -30397,13 +30273,13 @@ let
         sha512 = "OlE82n3yMOE5dY9RMOwxhoWefeMlxwk5IVxoj0sSzSFIlmvhN4obzTvO3s/d/b5JhcgXikjaspsy/HuUDTqbBg==";
       };
     };
-    "piece-length-1.0.0" = {
+    "piece-length-2.0.1" = {
       name = "piece-length";
       packageName = "piece-length";
-      version = "1.0.0";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/piece-length/-/piece-length-1.0.0.tgz";
-        sha1 = "4db7167157fd69fef14caf7262cd39f189b24508";
+        url = "https://registry.npmjs.org/piece-length/-/piece-length-2.0.1.tgz";
+        sha512 = "dBILiDmm43y0JPISWEmVGKBETQjwJe6mSU9GND+P9KW0SJGUwoU/odyH1nbalOP9i8WSYuqf1lQnaj92Bhw+Ug==";
       };
     };
     "pify-2.3.0" = {
@@ -30586,13 +30462,13 @@ let
         sha1 = "9a99433f3789d1e2757c04e3803395b6fa55a348";
       };
     };
-    "please-upgrade-node-3.1.1" = {
+    "please-upgrade-node-3.2.0" = {
       name = "please-upgrade-node";
       packageName = "please-upgrade-node";
-      version = "3.1.1";
+      version = "3.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.1.1.tgz";
-        sha512 = "KY1uHnQ2NlQHqIJQpnh/i54rKkuxCEBx+voJIS/Mvb+L2iYd2NMotwduhKTMjfC1uKoX3VXOxLjIYG66dfJTVQ==";
+        url = "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz";
+        sha512 = "gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg==";
       };
     };
     "plist-1.2.0" = {
@@ -30676,6 +30552,15 @@ let
         sha512 = "ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==";
       };
     };
+    "pluralize-8.0.0" = {
+      name = "pluralize";
+      packageName = "pluralize";
+      version = "8.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pluralize/-/pluralize-8.0.0.tgz";
+        sha512 = "Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==";
+      };
+    };
     "pn-1.1.0" = {
       name = "pn";
       packageName = "pn";
@@ -30721,13 +30606,13 @@ let
         sha1 = "2f4b58b5592972350cd97f482aba68f8e05574bc";
       };
     };
-    "portfinder-1.0.21" = {
+    "portfinder-1.0.24" = {
       name = "portfinder";
       packageName = "portfinder";
-      version = "1.0.21";
+      version = "1.0.24";
       src = fetchurl {
-        url = "https://registry.npmjs.org/portfinder/-/portfinder-1.0.21.tgz";
-        sha512 = "ESabpDCzmBS3ekHbmpAIiESq3udRsCBGiBZLsC+HgBKv2ezb0R4oG+7RnYEVZ/ZCfhel5Tx3UzdNWA0Lox2QCA==";
+        url = "https://registry.npmjs.org/portfinder/-/portfinder-1.0.24.tgz";
+        sha512 = "ekRl7zD2qxYndYflwiryJwMioBI7LI7rVXg3EnLK3sjkouT5eOuhS3gS255XxBksa30VG8UPZYZCdgfGOfkSUg==";
       };
     };
     "posix-character-classes-0.1.1" = {
@@ -30776,13 +30661,13 @@ let
         sha512 = "MOo8zNSlIqh22Uaa3drkdIAgUGEL+AD1ESiSdmElLUmE2uVDo1QloiT/IfW9qRw8Gw+Y/w69UVMGwbufMSftxA==";
       };
     };
-    "postcss-7.0.17" = {
+    "postcss-7.0.18" = {
       name = "postcss";
       packageName = "postcss";
-      version = "7.0.17";
+      version = "7.0.18";
       src = fetchurl {
-        url = "https://registry.npmjs.org/postcss/-/postcss-7.0.17.tgz";
-        sha512 = "546ZowA+KZ3OasvQZHsbuEpysvwTZNGJv9EfyCQdsIDltPSWHAeTQ5fQy/Npi2ZDtLI3zs7Ps/p6wThErhm9fQ==";
+        url = "https://registry.npmjs.org/postcss/-/postcss-7.0.18.tgz";
+        sha512 = "/7g1QXXgegpF+9GJj4iN7ChGF40sYuGYJ8WZu8DZWnmhQ/G36hfdk3q9LBJmoK+lZ+yzZ5KYpOoxq7LF1BxE8g==";
       };
     };
     "postcss-calc-7.0.1" = {
@@ -31100,13 +30985,13 @@ let
         sha512 = "pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==";
       };
     };
-    "posthtml-0.11.4" = {
+    "posthtml-0.11.6" = {
       name = "posthtml";
       packageName = "posthtml";
-      version = "0.11.4";
+      version = "0.11.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/posthtml/-/posthtml-0.11.4.tgz";
-        sha512 = "ezlzBkoPoRgh0jkmT1dsM8eT+lr2azyZ546kbda8oHnVnzvyaB3Ywo6UxUz8wPSOkFAAflCxZJhvvpQH1F6qcA==";
+        url = "https://registry.npmjs.org/posthtml/-/posthtml-0.11.6.tgz";
+        sha512 = "C2hrAPzmRdpuL3iH0TDdQ6XCc9M7Dcc3zEW5BLerY65G4tWWszwv6nG/ksi6ul5i2mx22ubdljgktXCtNkydkw==";
       };
     };
     "posthtml-parser-0.4.1" = {
@@ -31127,13 +31012,13 @@ let
         sha512 = "yvt54j0zCBHQVEFAuR+yHld8CZrCa/E1Z/OcFNCV1IEWTLVxT8O7nYnM4IIw1CD4r8kaRd3lc42+0lgCKgm87w==";
       };
     };
-    "prebuild-install-5.3.0" = {
+    "prebuild-install-5.3.2" = {
       name = "prebuild-install";
       packageName = "prebuild-install";
-      version = "5.3.0";
+      version = "5.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.3.0.tgz";
-        sha512 = "aaLVANlj4HgZweKttFNUVNRxDukytuIuxeK2boIMHjagNJCiVKWFsKF4tCE3ql3GbrD2tExPQ7/pwtEJcHNZeg==";
+        url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.3.2.tgz";
+        sha512 = "INDfXzTPnhT+WYQemqnAXlP7SvfiFMopMozSgXCZ+RDLb279gKfIuLk4o7PgEawLp3WrMgIYGBpkxpraROHsSA==";
       };
     };
     "precond-0.2.3" = {
@@ -31217,6 +31102,15 @@ let
         sha512 = "2UzApPuxi2yRoyMlXMazgR6UcH9DKJhNgCviIwY3ixZ9THWSSrUww5vkiZ3C48WvpFl1M1y/oU63deSy1puWEA==";
       };
     };
+    "prettier-tslint-0.4.2" = {
+      name = "prettier-tslint";
+      packageName = "prettier-tslint";
+      version = "0.4.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/prettier-tslint/-/prettier-tslint-0.4.2.tgz";
+        sha512 = "urhX7U/F+fu8sztEs/Z7CxNS8PdEytEwGKhQaH5fxxCdRmHGT45FoClyDlcZrMk9cK/8JpX/asFmTOHtSGJfLg==";
+      };
+    };
     "pretty-format-23.6.0" = {
       name = "pretty-format";
       packageName = "pretty-format";
@@ -31334,6 +31228,15 @@ let
         sha512 = "nm7RvWUxps+2+jZKNLkd04mNapXNariS6G5WIEVzvAqjx7EUuKcY1Dp3e6oUK7GLwzJ+3gbSbPLFAASHFQrPcQ==";
       };
     };
+    "process-0.10.1" = {
+      name = "process";
+      packageName = "process";
+      version = "0.10.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/process/-/process-0.10.1.tgz";
+        sha1 = "842457cc51cfed72dc775afeeafb8c6034372725";
+      };
+    };
     "process-0.11.10" = {
       name = "process";
       packageName = "process";
@@ -31712,13 +31615,13 @@ let
         sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3";
       };
     };
-    "psl-1.3.0" = {
+    "psl-1.4.0" = {
       name = "psl";
       packageName = "psl";
-      version = "1.3.0";
+      version = "1.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/psl/-/psl-1.3.0.tgz";
-        sha512 = "avHdspHO+9rQTLbv1RO+MPYeP/SzsCoxofjVnHanETfQhTJrmB0HlDoW+EiN/R+C0BZ+gERab9NY0lPN2TxNag==";
+        url = "https://registry.npmjs.org/psl/-/psl-1.4.0.tgz";
+        sha512 = "HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw==";
       };
     };
     "pstree.remy-1.1.7" = {
@@ -32270,13 +32173,13 @@ let
         sha1 = "1ee5b6f76fd3b3a49a5afb6ded5c0320acb3cfc7";
       };
     };
-    "pull-stream-3.6.13" = {
+    "pull-stream-3.6.14" = {
       name = "pull-stream";
       packageName = "pull-stream";
-      version = "3.6.13";
+      version = "3.6.14";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.6.13.tgz";
-        sha512 = "enbnbnO+czsPuCq9s9HTTzDzzVQD5TSe60aO3nBioeJ9mevh8RzE4Hxbujo9TReg1fJlmNEL8uyQTUgn8+rSHg==";
+        url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.6.14.tgz";
+        sha512 = "KIqdvpqHHaTUA2mCYcLG1ibEbu/LCKoJZsBWyv9lSYtPkJPBq8m3Hxa103xHi6D2thj5YXa0TqK3L3GUkwgnew==";
       };
     };
     "pull-through-1.0.18" = {
@@ -32594,6 +32497,15 @@ let
         sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==";
       };
     };
+    "qs-6.8.0" = {
+      name = "qs";
+      packageName = "qs";
+      version = "6.8.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/qs/-/qs-6.8.0.tgz";
+        sha512 = "tPSkj8y92PfZVbinY1n84i1Qdx75lZjMQYx9WZhnkofyxzw2r7Ho39G3/aEvSUdebxpnnM4LZJCtvE/Aq3+s9w==";
+      };
+    };
     "query-string-1.0.1" = {
       name = "query-string";
       packageName = "query-string";
@@ -32657,6 +32569,15 @@ let
         sha512 = "AMD7w5hRXcFSb8s9u38acBZ+309u6GsiibP4/0YacJeaurRshogB7v/ZcVPxP5gD5+zIw6ixRHdutiYUJfwKHw==";
       };
     };
+    "queue-microtask-1.1.2" = {
+      name = "queue-microtask";
+      packageName = "queue-microtask";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.1.2.tgz";
+        sha512 = "F9wwNePtXrzZenAB3ax0Y8TSKGvuB7Qw16J30hspEUTbfUM+H827XyN3rlpwhVmtm5wuZtbKIHjOnwDn7MUxWQ==";
+      };
+    };
     "quick-format-unescaped-3.0.2" = {
       name = "quick-format-unescaped";
       packageName = "quick-format-unescaped";
@@ -32675,6 +32596,15 @@ let
         sha1 = "4360b17c61136ad38078397ff11416e186dcfbb8";
       };
     };
+    "quick-lru-4.0.1" = {
+      name = "quick-lru";
+      packageName = "quick-lru";
+      version = "4.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz";
+        sha512 = "ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==";
+      };
+    };
     "quicktask-1.1.0" = {
       name = "quicktask";
       packageName = "quicktask";
@@ -32891,15 +32821,6 @@ let
         sha1 = "a2c2f98c8531cee99c63d8d238b7de97bb659fca";
       };
     };
-    "raw-body-2.1.7" = {
-      name = "raw-body";
-      packageName = "raw-body";
-      version = "2.1.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/raw-body/-/raw-body-2.1.7.tgz";
-        sha1 = "adfeace2e4fb3098058014d08c072dcc59758774";
-      };
-    };
     "raw-body-2.3.3" = {
       name = "raw-body";
       packageName = "raw-body";
@@ -32963,13 +32884,13 @@ let
         sha512 = "C0SIXdXDSus2yqqvV7qifnb4NoWP7mEBXJq3axci301mXHCZb8Djwm4hrEZo4UeXRaEnfjH98uQ8EBppk2oNWA==";
       };
     };
-    "react-is-16.8.6" = {
+    "react-is-16.9.0" = {
       name = "react-is";
       packageName = "react-is";
-      version = "16.8.6";
+      version = "16.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/react-is/-/react-is-16.8.6.tgz";
-        sha512 = "aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA==";
+        url = "https://registry.npmjs.org/react-is/-/react-is-16.9.0.tgz";
+        sha512 = "tJBzzzIgnnRfEm046qRcURvwQnZVXmuCbscxUO5RWrGTXpon2d4c8mI0D8WE6ydVIm29JiLB6+RslkIvym9Rjw==";
       };
     };
     "read-1.0.7" = {
@@ -32999,13 +32920,13 @@ let
         sha512 = "CEjy9LCzhmD7nUpJ1oVOE6s/hBkejlcJEgLQHVnQznOSilOPb+kpKktlLfFDK3/WP43+F80xkUTM2VOkYoSYvQ==";
       };
     };
-    "read-cmd-shim-1.0.1" = {
+    "read-cmd-shim-1.0.4" = {
       name = "read-cmd-shim";
       packageName = "read-cmd-shim";
-      version = "1.0.1";
+      version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-1.0.1.tgz";
-        sha1 = "2d5d157786a37c055d22077c32c53f8329e91c7b";
+        url = "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-1.0.4.tgz";
+        sha512 = "Pqpl3qJ/QdOIjRYA0q5DND/gLvGOfpIz/fYVDGYpOXfW/lFrIttmLsBnd6IkyK10+JHU9zhsaudfvrQTBB9YFQ==";
       };
     };
     "read-metadata-1.0.0" = {
@@ -33026,13 +32947,13 @@ let
         sha1 = "2724fd6a8113d73764ac288d4386270c1dbf17f0";
       };
     };
-    "read-package-json-2.0.13" = {
+    "read-package-json-2.1.0" = {
       name = "read-package-json";
       packageName = "read-package-json";
-      version = "2.0.13";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.13.tgz";
-        sha512 = "/1dZ7TRZvGrYqE0UAfN6qQb5GYBsNcqS1C0tNK601CFOJmtHI7NIGXwetEPU/OtoFHZL3hDxm4rolFFVE9Bnmg==";
+        url = "https://registry.npmjs.org/read-package-json/-/read-package-json-2.1.0.tgz";
+        sha512 = "KLhu8M1ZZNkMcrq1+0UJbR8Dii8KZUqB0Sha4mOx/bknfKI/fyrQVrG/YIt2UOtG667sD8+ee4EXMM91W9dC+A==";
       };
     };
     "read-package-tree-5.3.1" = {
@@ -33197,13 +33118,13 @@ let
         sha512 = "1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==";
       };
     };
-    "readdirp-3.1.1" = {
+    "readdirp-3.1.2" = {
       name = "readdirp";
       packageName = "readdirp";
-      version = "3.1.1";
+      version = "3.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/readdirp/-/readdirp-3.1.1.tgz";
-        sha512 = "XXdSXZrQuvqoETj50+JAitxz1UPdt5dupjT6T5nVB+WvjMv2XKYj+s7hPeAVCXvmJrL36O4YYyWlIC3an2ePiQ==";
+        url = "https://registry.npmjs.org/readdirp/-/readdirp-3.1.2.tgz";
+        sha512 = "8rhl0xs2cxfVsqzreYCvs8EwBfn/DhVdqtoLmw19uI3SC5avYX9teCurlErfpPXGmYtMHReGaP2RsLnFvz/lnw==";
       };
     };
     "readline2-0.1.1" = {
@@ -33440,13 +33361,13 @@ let
         sha512 = "J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==";
       };
     };
-    "regexp-tree-0.1.11" = {
+    "regexp-tree-0.1.13" = {
       name = "regexp-tree";
       packageName = "regexp-tree";
-      version = "0.1.11";
+      version = "0.1.13";
       src = fetchurl {
-        url = "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.11.tgz";
-        sha512 = "7/l/DgapVVDzZobwMCCgMlqiqyLFJ0cduo/j+3BcDJIB+yJdsYCfKuI3l/04NV+H/rfNRdPIDbXNZHM9XvQatg==";
+        url = "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.13.tgz";
+        sha512 = "hwdV/GQY5F8ReLZWO+W1SRoN5YfpOKY6852+tBFcma72DKBIcHjPRIlIvQN35bCOljuAfP2G2iB0FC/w236mUw==";
       };
     };
     "regexp.prototype.flags-1.2.0" = {
@@ -33485,13 +33406,13 @@ let
         sha1 = "86a763f58ee4d7c2f6b102e4764050de7ed90c6b";
       };
     };
-    "regexpu-core-4.5.4" = {
+    "regexpu-core-4.6.0" = {
       name = "regexpu-core";
       packageName = "regexpu-core";
-      version = "4.5.4";
+      version = "4.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.5.4.tgz";
-        sha512 = "BtizvGtFQKGPUcTy56o3nk1bGRp4SZOTYrDtGNlqCQufptV5IkkLN6Emw+yunAJjzf+C9FQFtvq7IoA3+oMYHQ==";
+        url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.6.0.tgz";
+        sha512 = "YlVaefl8P5BnFYOITTNzDvan1ulLOiXJzCNZxduTIosN17b87h3bvG9yHMoHaRuo88H4mQ06Aodj5VtYGGGiTg==";
       };
     };
     "registry-auth-token-3.3.2" = {
@@ -33755,13 +33676,13 @@ let
         sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef";
       };
     };
-    "render-media-3.3.0" = {
+    "render-media-3.4.0" = {
       name = "render-media";
       packageName = "render-media";
-      version = "3.3.0";
+      version = "3.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/render-media/-/render-media-3.3.0.tgz";
-        sha512 = "IWz+3KbUxFaxke8v/TJE0nZlhoNTTqSYS3hh284R+6rgqwahR4hA+5dAAyb0A1t4M4oLwePaGlHllfQiS2ItWQ==";
+        url = "https://registry.npmjs.org/render-media/-/render-media-3.4.0.tgz";
+        sha512 = "0BTIvIBS4xdC/qPpoj8ZsdZ/YoQhn+DutUqBkur1yUs5SnDoruiAtaHFJhxle8pREnNN/kT8E8fkftgMkJ8Tvg==";
       };
     };
     "repeat-element-1.1.3" = {
@@ -34160,15 +34081,6 @@ let
         sha1 = "2c637fe77c893afd2a663fe21aa9080068e2052a";
       };
     };
-    "response-time-2.3.2" = {
-      name = "response-time";
-      packageName = "response-time";
-      version = "2.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/response-time/-/response-time-2.3.2.tgz";
-        sha1 = "ffa71bab952d62f7c1d49b7434355fbc68dffc5a";
-      };
-    };
     "responselike-1.0.2" = {
       name = "responselike";
       packageName = "responselike";
@@ -34232,6 +34144,15 @@ let
         sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf";
       };
     };
+    "restore-cursor-3.1.0" = {
+      name = "restore-cursor";
+      packageName = "restore-cursor";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz";
+        sha512 = "l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==";
+      };
+    };
     "resumer-0.0.0" = {
       name = "resumer";
       packageName = "resumer";
@@ -34448,6 +34369,24 @@ let
         sha512 = "mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==";
       };
     };
+    "rimraf-2.7.1" = {
+      name = "rimraf";
+      packageName = "rimraf";
+      version = "2.7.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz";
+        sha512 = "uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==";
+      };
+    };
+    "rimraf-3.0.0" = {
+      name = "rimraf";
+      packageName = "rimraf";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/rimraf/-/rimraf-3.0.0.tgz";
+        sha512 = "NDGVxTsjqfunkds7CqsOiEnxln4Bo7Nddl3XhS4pXg5OzwkLqJ971ZVAAnB+DDLnF76N+VnDEiBHaVV8I06SUg==";
+      };
+    };
     "ripemd160-2.0.2" = {
       name = "ripemd160";
       packageName = "ripemd160";
@@ -34475,13 +34414,13 @@ let
         sha1 = "df43e80d9bc82ad4430bcfef03f49c717e8b2e8c";
       };
     };
-    "roarr-2.13.3" = {
+    "roarr-2.14.1" = {
       name = "roarr";
       packageName = "roarr";
-      version = "2.13.3";
+      version = "2.14.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/roarr/-/roarr-2.13.3.tgz";
-        sha512 = "f75w2kr46yWvV7tdnAFRzXiggNBaPrPAwai0Disa5NovRP5DtACrMrhr72Vot1ZNCDmMJ1hF7ix2Q5F+NJZwoA==";
+        url = "https://registry.npmjs.org/roarr/-/roarr-2.14.1.tgz";
+        sha512 = "Fhm9shQ8JhpjFnOT7bgxKR7Xcg1Tq+0/Tdy+bloB4sUxxAib4MZDMJ6AjUBRE+798l2MnhhF2JTqbqx1+/kRyQ==";
       };
     };
     "rollup-0.67.0" = {
@@ -34538,13 +34477,13 @@ let
         sha512 = "SxrAIgpH/B5/W4SeULgreOemxcpEgKs2gcD42zXw50bhqGWmcnlXneVInQpAqzA/cIly4bJrOpeelmB9p4YXSQ==";
       };
     };
-    "rollup-pluginutils-2.8.1" = {
+    "rollup-pluginutils-2.8.2" = {
       name = "rollup-pluginutils";
       packageName = "rollup-pluginutils";
-      version = "2.8.1";
+      version = "2.8.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.8.1.tgz";
-        sha512 = "J5oAoysWar6GuZo0s+3bZ6sVZAC0pfqKz68De7ZgDi5z63jOVZn1uJL/+z1jeKHNbGII8kAyHF5q8LnxSX5lQg==";
+        url = "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz";
+        sha512 = "EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==";
       };
     };
     "root-check-1.0.0" = {
@@ -34745,13 +34684,13 @@ let
         sha512 = "Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==";
       };
     };
-    "rxjs-6.5.2" = {
+    "rxjs-6.5.3" = {
       name = "rxjs";
       packageName = "rxjs";
-      version = "6.5.2";
+      version = "6.5.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rxjs/-/rxjs-6.5.2.tgz";
-        sha512 = "HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg==";
+        url = "https://registry.npmjs.org/rxjs/-/rxjs-6.5.3.tgz";
+        sha512 = "wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA==";
       };
     };
     "s3-stream-upload-2.0.2" = {
@@ -34871,13 +34810,13 @@ let
         sha512 = "jLYV0DORrzY3xaz/S9ydJL6Iz7essZeAfnAavsJ+zsJGZ1MOnsS52yRjU3uF3pJa/lla7+wisp//fxOwOH8SKQ==";
       };
     };
-    "sanitize-filename-1.6.2" = {
+    "sanitize-filename-1.6.3" = {
       name = "sanitize-filename";
       packageName = "sanitize-filename";
-      version = "1.6.2";
+      version = "1.6.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sanitize-filename/-/sanitize-filename-1.6.2.tgz";
-        sha512 = "cmTzND7RMxUB+f7gI+4+KAVHWEg0lfXvQJdko+FXDP5bNbGIdx4KMP5pX6lv5jfT9jSf6OBbjyxjFtZQwYA/ig==";
+        url = "https://registry.npmjs.org/sanitize-filename/-/sanitize-filename-1.6.3.tgz";
+        sha512 = "y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg==";
       };
     };
     "sax-0.5.8" = {
@@ -35114,13 +35053,13 @@ let
         sha512 = "RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==";
       };
     };
-    "semver-5.7.0" = {
+    "semver-5.7.1" = {
       name = "semver";
       packageName = "semver";
-      version = "5.7.0";
+      version = "5.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz";
-        sha512 = "Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==";
+        url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz";
+        sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==";
       };
     };
     "semver-6.0.0" = {
@@ -35258,24 +35197,6 @@ let
         sha1 = "1beabfd42f9e2709f99028af3078ac12b47092d5";
       };
     };
-    "send-0.13.0" = {
-      name = "send";
-      packageName = "send";
-      version = "0.13.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/send/-/send-0.13.0.tgz";
-        sha1 = "518f921aeb0560aec7dcab2990b14cf6f3cce5de";
-      };
-    };
-    "send-0.13.2" = {
-      name = "send";
-      packageName = "send";
-      version = "0.13.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/send/-/send-0.13.2.tgz";
-        sha1 = "765e7607c8055452bba6f0b052595350986036de";
-      };
-    };
     "send-0.16.2" = {
       name = "send";
       packageName = "send";
@@ -35357,13 +35278,13 @@ let
         sha512 = "5j9GgyGsP9vV9Uj1S0lDCvlsd+gc2LEPVK7HHHte7IyPwOD4lVQFeaX143gx3U5AnoCi+wbcb3mvaxVysjpxEw==";
       };
     };
-    "serialize-javascript-1.7.0" = {
+    "serialize-javascript-1.9.1" = {
       name = "serialize-javascript";
       packageName = "serialize-javascript";
-      version = "1.7.0";
+      version = "1.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.7.0.tgz";
-        sha512 = "ke8UG8ulpFOxO8f8gRYabHQe/ZntKlcig2Mp+8+URDP1D8vJZ0KUt7LYo07q25Z/+JVSgpr/cui9PIp5H6/+nA==";
+        url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.9.1.tgz";
+        sha512 = "0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A==";
       };
     };
     "serialize-to-js-1.2.2" = {
@@ -35384,15 +35305,6 @@ let
         sha1 = "12d4c5aa1c3ffb8f6d1dc5f395aa9455569c3f91";
       };
     };
-    "serve-favicon-2.3.2" = {
-      name = "serve-favicon";
-      packageName = "serve-favicon";
-      version = "2.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.3.2.tgz";
-        sha1 = "dd419e268de012ab72b319d337f2105013f9381f";
-      };
-    };
     "serve-favicon-2.5.0" = {
       name = "serve-favicon";
       packageName = "serve-favicon";
@@ -35411,15 +35323,6 @@ let
         sha512 = "63N075Tn3PsFYcu0NVV7tb367UbiW3gnC+/50ohL4oqOhAG6bmbaWqiRcXQgbzqc0ALBjSAzg7VTfa0Qw4E3hA==";
       };
     };
-    "serve-index-1.7.3" = {
-      name = "serve-index";
-      packageName = "serve-index";
-      version = "1.7.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/serve-index/-/serve-index-1.7.3.tgz";
-        sha1 = "7a057fc6ee28dc63f64566e5fa57b111a86aecd2";
-      };
-    };
     "serve-index-1.9.1" = {
       name = "serve-index";
       packageName = "serve-index";
@@ -35429,15 +35332,6 @@ let
         sha1 = "d3768d69b1e7d82e5ce050fff5b453bea12a9239";
       };
     };
-    "serve-static-1.10.3" = {
-      name = "serve-static";
-      packageName = "serve-static";
-      version = "1.10.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/serve-static/-/serve-static-1.10.3.tgz";
-        sha1 = "ce5a6ecd3101fed5ec09827dac22a9c29bfb0535";
-      };
-    };
     "serve-static-1.13.2" = {
       name = "serve-static";
       packageName = "serve-static";
@@ -35537,13 +35431,13 @@ let
         sha512 = "JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==";
       };
     };
-    "seventh-0.7.27" = {
+    "seventh-0.7.28" = {
       name = "seventh";
       packageName = "seventh";
-      version = "0.7.27";
+      version = "0.7.28";
       src = fetchurl {
-        url = "https://registry.npmjs.org/seventh/-/seventh-0.7.27.tgz";
-        sha512 = "vId7EbEQ7xr+wjBBFQBChtLzbqIQWe0cNtZMGtOVBig5p1XrsjVXvkBhdVcJRJdDh6pnn/5h5ai+208fDldXXA==";
+        url = "https://registry.npmjs.org/seventh/-/seventh-0.7.28.tgz";
+        sha512 = "WitJqSwsjLWbCP9cciaozByx4csddLQyNoaPBqOpYFMNE6iD6FK/pM8J2yqtpauSxJUUo7Wfv5KF5w1jbVov7A==";
       };
     };
     "sha.js-2.4.11" = {
@@ -35627,6 +35521,15 @@ let
         sha1 = "f4781949cce402697127430ea3b3c5476f481767";
       };
     };
+    "shell-quote-1.7.2" = {
+      name = "shell-quote";
+      packageName = "shell-quote";
+      version = "1.7.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.2.tgz";
+        sha512 = "mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==";
+      };
+    };
     "shelljs-0.3.0" = {
       name = "shelljs";
       packageName = "shelljs";
@@ -35672,13 +35575,13 @@ let
         sha512 = "vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==";
       };
     };
-    "shortid-2.2.14" = {
+    "shortid-2.2.15" = {
       name = "shortid";
       packageName = "shortid";
-      version = "2.2.14";
+      version = "2.2.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/shortid/-/shortid-2.2.14.tgz";
-        sha512 = "4UnZgr9gDdA1kaKj/38IiudfC3KHKhDc1zi/HSxd9FQDR0VLwH3/y79tZJLsVYPsJgIjeHjqIWaWVRJUj9qZOQ==";
+        url = "https://registry.npmjs.org/shortid/-/shortid-2.2.15.tgz";
+        sha512 = "5EaCy2mx2Jgc/Fdn9uuDuNIIfWBpzY4XIlhoqtXF6qsf+/+SGZ+FxDdX/ZsMZiWupIWNqAEmiNY4RC+LSmCeOw==";
       };
     };
     "shush-1.0.0" = {
@@ -35771,13 +35674,13 @@ let
         sha512 = "Wvre/Jq5vgoz31Z9stYWPLn0PqRqmBDpFSdypAnHu5AvRVCYPRYGnvryNLiXu8GOBNDH82J2FRHUGMjjHUpXFw==";
       };
     };
-    "simple-git-1.124.0" = {
+    "simple-git-1.126.0" = {
       name = "simple-git";
       packageName = "simple-git";
-      version = "1.124.0";
+      version = "1.126.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-git/-/simple-git-1.124.0.tgz";
-        sha512 = "ks9mBoO4ODQy/xGLC8Cc+YDvj/hho/IKgPhi6h5LI/sA+YUdHc3v0DEoHzM29VmulubpGCxMJUSFmyXNsjNMEA==";
+        url = "https://registry.npmjs.org/simple-git/-/simple-git-1.126.0.tgz";
+        sha512 = "47mqHxgZnN8XRa9HbpWprzUv3Ooqz9RY/LSZgvA7jCkW8jcwLahMz7LKugY91KZehfG0sCVPtgXiU72hd6b1Bw==";
       };
     };
     "simple-markdown-0.4.4" = {
@@ -35816,6 +35719,15 @@ let
         sha512 = "TQl9rm4rdKAVmhO++sXAb8TNN0D6JAD5iyI1mqEPNpxUzTRrtm4aOG1pDf/5W/qCFihiaoK6uuL9rvQz1x1VKw==";
       };
     };
+    "simple-sha1-3.0.1" = {
+      name = "simple-sha1";
+      packageName = "simple-sha1";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/simple-sha1/-/simple-sha1-3.0.1.tgz";
+        sha512 = "q7ehqWfHc1VhOm7sW099YDZ4I0yYX7rqyhqqhHV1IYeUTjPOhHyD3mXvv8k2P+rO7+7c8R4/D+8ffzC9BE7Cqg==";
+      };
+    };
     "simple-swizzle-0.2.2" = {
       name = "simple-swizzle";
       packageName = "simple-swizzle";
@@ -35834,13 +35746,13 @@ let
         sha1 = "5d3d5751bb39aeba2f710d8eec78768df821f38d";
       };
     };
-    "simple-websocket-8.0.0" = {
+    "simple-websocket-8.0.1" = {
       name = "simple-websocket";
       packageName = "simple-websocket";
-      version = "8.0.0";
+      version = "8.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-websocket/-/simple-websocket-8.0.0.tgz";
-        sha512 = "DwBEoqOq8gvnblarMPkhZD6AWituWbVfTil/UflowYm/Bu5SK23BDKGxrVwgQXGKydzxlSiYva7LC3/hXSRLIw==";
+        url = "https://registry.npmjs.org/simple-websocket/-/simple-websocket-8.0.1.tgz";
+        sha512 = "2QKSRjf+tqFXLVmOQjf95gHeKhuyx2k1ouDjtnE0uKCYw84HfN85HsXo+GmPH+2PIh5BQql++g2AIbHgGAZU4w==";
       };
     };
     "single-line-log-0.4.1" = {
@@ -36086,13 +35998,13 @@ let
         sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198";
       };
     };
-    "snyk-1.210.0" = {
+    "snyk-1.227.0" = {
       name = "snyk";
       packageName = "snyk";
-      version = "1.210.0";
+      version = "1.227.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk/-/snyk-1.210.0.tgz";
-        sha512 = "k6/EIX1Dc4Qk8omcKQDm13RRywkKqXoQ0IMz5Nyk1y8sdmg1S78QSWnfTaEPe+OQE1olrtjInrDX3Yu20CnMzg==";
+        url = "https://registry.npmjs.org/snyk/-/snyk-1.227.0.tgz";
+        sha512 = "ejfq2FIca+b/zu4hkJwFUob1Emn+s9wXYw5VHJSS6BjiniNi6dIa24AARG3BWiVsN/3NvzCYAkcqhYGaJ6xyVw==";
       };
     };
     "snyk-config-2.2.3" = {
@@ -36104,13 +36016,13 @@ let
         sha512 = "9NjxHVMd1U1LFw66Lya4LXgrsFUiuRiL4opxfTFo0LmMNzUoU5Bk/p0zDdg3FE5Wg61r4fP2D8w+QTl6M8CGiw==";
       };
     };
-    "snyk-docker-plugin-1.25.1" = {
+    "snyk-docker-plugin-1.29.1" = {
       name = "snyk-docker-plugin";
       packageName = "snyk-docker-plugin";
-      version = "1.25.1";
+      version = "1.29.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-1.25.1.tgz";
-        sha512 = "n/LfA7VXjPEcSz2ZfZonT/DPSC89Zs1/HD0inPFN4RLQT3WiQnjqJUXct+D0nWwEVfhLWNc+Y7PLcTjpnZ9R3Q==";
+        url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-1.29.1.tgz";
+        sha512 = "Mucc1rZ7l0U8Dykr5m6HPjau8b2H8JVtVaXGbKSZD6e/47JDJhudkgrWjsS5Yt/Zdp1weE3+4SguftFiVR971A==";
       };
     };
     "snyk-go-parser-1.3.1" = {
@@ -36131,13 +36043,13 @@ let
         sha512 = "9hsGgloioGuey5hbZfv+MkFEslxXHyzUlaAazcR0NsY7VLyG/b2g3f88f/ZwCwlWaKL9LMv/ERIiey3oWAB/qg==";
       };
     };
-    "snyk-gradle-plugin-2.12.5" = {
+    "snyk-gradle-plugin-3.0.2" = {
       name = "snyk-gradle-plugin";
       packageName = "snyk-gradle-plugin";
-      version = "2.12.5";
+      version = "3.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-2.12.5.tgz";
-        sha512 = "AmiQQUL0nlY3SjWUSMSmmbp273ETJzsqvk1E8jf+G/Q3mRl9xZ6BkPMebweD/y5d/smoQmr6rKL57OG+OXoi3w==";
+        url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.0.2.tgz";
+        sha512 = "9nyR03kHmePqBGaQiUeo3RD1YJ4qE5/V4tOmDQ8LNjHTQ54Xr8OXFC5xlJMV8FCtXrRXY0/WX8RMUPEUAm4c9g==";
       };
     };
     "snyk-module-1.9.1" = {
@@ -36149,13 +36061,13 @@ let
         sha512 = "A+CCyBSa4IKok5uEhqT+hV/35RO6APFNLqk9DRRHg7xW2/j//nPX8wTSZUPF8QeRNEk/sX+6df7M1y6PBHGSHA==";
       };
     };
-    "snyk-mvn-plugin-2.3.3" = {
+    "snyk-mvn-plugin-2.4.0" = {
       name = "snyk-mvn-plugin";
       packageName = "snyk-mvn-plugin";
-      version = "2.3.3";
+      version = "2.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.3.3.tgz";
-        sha512 = "NYFL+jtHfAJk+Jdyme4I8pTvg/wfoHgkOs1g1nFUEPTcpBb5mfqy7Q9hDJWvnfXY8M6P9aEqvO+bmCVgTQvySg==";
+        url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.4.0.tgz";
+        sha512 = "Fmt6Mjx6zZz+4q6PnBkhuNGhEX++q/pKMI26ls4p3JPkx4KxBz89oncpkmf7P8YCkoaka8oHhtDEv/R4Z9LleQ==";
       };
     };
     "snyk-nodejs-lockfile-parser-1.16.0" = {
@@ -36167,13 +36079,13 @@ let
         sha512 = "cf3uozRXEG88nsjOQlo+SfOJPpcLs45qpnuk2vhBBZ577IMnV+fTOJQsP2YRiikLUbdgkVlduviwUO6OVn1PhA==";
       };
     };
-    "snyk-nuget-plugin-1.11.3" = {
+    "snyk-nuget-plugin-1.12.1" = {
       name = "snyk-nuget-plugin";
       packageName = "snyk-nuget-plugin";
-      version = "1.11.3";
+      version = "1.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.11.3.tgz";
-        sha512 = "UgLTMr7Vz0qZoL15SkFAUfMb4Vw/qFxf6lBoL2v8xA+Mqdvn2Yu9x/yW659ElFVSUjniqKTFyloKq9/XSv+c+A==";
+        url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.12.1.tgz";
+        sha512 = "QuANQxBjTGj3hEf2YpEQ0WuI4Yq/93boqWUs4eoSTfDyBRFgIkUP6fLkzNldrkL8fQbcagqQ2Xz8M9IEKRQtMg==";
       };
     };
     "snyk-paket-parser-1.5.0" = {
@@ -36203,13 +36115,13 @@ let
         sha512 = "KI6GHt+Oj4fYKiCp7duhseUj5YhyL/zJOrrJg0u6r59Ux9w8gmkUYT92FHW27ihwuT6IPzdGNEuy06Yv2C9WaQ==";
       };
     };
-    "snyk-python-plugin-1.10.2" = {
+    "snyk-python-plugin-1.13.2" = {
       name = "snyk-python-plugin";
       packageName = "snyk-python-plugin";
-      version = "1.10.2";
+      version = "1.13.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.10.2.tgz";
-        sha512 = "dLswHfVI9Ax8+Ia/onhv1p9S5y+Ie/oELOfpfNApbb0BPTJ5k1c2CQ7WcgQ5/nDRMUOgoKn4VTObaAGmD5or9A==";
+        url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.13.2.tgz";
+        sha512 = "G9R1cYHw0E/VSx9tFa5nZp+653FIMXheteidrF3hjUe71jRdJELEUV/z5jxqYEWEFemcwGhMfW87De91GChVIQ==";
       };
     };
     "snyk-resolve-1.0.1" = {
@@ -36221,22 +36133,22 @@ let
         sha512 = "7+i+LLhtBo1Pkth01xv+RYJU8a67zmJ8WFFPvSxyCjdlKIcsps4hPQFebhz+0gC5rMemlaeIV6cqwqUf9PEDpw==";
       };
     };
-    "snyk-resolve-deps-4.0.3" = {
+    "snyk-resolve-deps-4.4.0" = {
       name = "snyk-resolve-deps";
       packageName = "snyk-resolve-deps";
-      version = "4.0.3";
+      version = "4.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-resolve-deps/-/snyk-resolve-deps-4.0.3.tgz";
-        sha512 = "GP3VBrkz1iDDw2q8ftTqppHqzIAxmsUIoXR+FRWDKcipkKHXHJyUmtEo11QVT5fNRV0D0RCsssk2S5CTxTCu6A==";
+        url = "https://registry.npmjs.org/snyk-resolve-deps/-/snyk-resolve-deps-4.4.0.tgz";
+        sha512 = "aFPtN8WLqIk4E1ulMyzvV5reY1Iksz+3oPnUVib1jKdyTHymmOIYF7z8QZ4UUr52UsgmrD9EA/dq7jpytwFoOQ==";
       };
     };
-    "snyk-sbt-plugin-2.6.1" = {
+    "snyk-sbt-plugin-2.8.0" = {
       name = "snyk-sbt-plugin";
       packageName = "snyk-sbt-plugin";
-      version = "2.6.1";
+      version = "2.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-2.6.1.tgz";
-        sha512 = "zWU14cm+cpamJ0CJdekTfgmv6ifdgVcapO6d27KTJThqRuR0arCqGPPyZa/Zl+jzhcK0dtRS4Ihk7g+d36SWIg==";
+        url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-2.8.0.tgz";
+        sha512 = "ZzyBdND5CsaO0xkv05geZXu8Dd6Llvr/5oTj811U7h7UmrvljrAiABW4RGjRJPrPVuuJaDej2p633sgGtK9UsA==";
       };
     };
     "snyk-tree-1.0.0" = {
@@ -36266,15 +36178,6 @@ let
         sha1 = "b566532888dae3ac9058a12f294015ebdfa8084a";
       };
     };
-    "socket.io-1.7.4" = {
-      name = "socket.io";
-      packageName = "socket.io";
-      version = "1.7.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io/-/socket.io-1.7.4.tgz";
-        sha1 = "2f7ecedc3391bf2d5c73e291fe233e6e34d4dd00";
-      };
-    };
     "socket.io-2.1.1" = {
       name = "socket.io";
       packageName = "socket.io";
@@ -36302,15 +36205,6 @@ let
         sha1 = "bd39329b8961371787e24f345b074ec9cf000e33";
       };
     };
-    "socket.io-adapter-0.5.0" = {
-      name = "socket.io-adapter";
-      packageName = "socket.io-adapter";
-      version = "0.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz";
-        sha1 = "cb6d4bb8bec81e1078b99677f9ced0046066bb8b";
-      };
-    };
     "socket.io-adapter-1.1.1" = {
       name = "socket.io-adapter";
       packageName = "socket.io-adapter";
@@ -36329,15 +36223,6 @@ let
         sha1 = "c86cb3e507ab2f96da4500bd34fcf46a1e9dfe5e";
       };
     };
-    "socket.io-client-1.7.4" = {
-      name = "socket.io-client";
-      packageName = "socket.io-client";
-      version = "1.7.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.7.4.tgz";
-        sha1 = "ec9f820356ed99ef6d357f0756d648717bdd4281";
-      };
-    };
     "socket.io-client-2.1.1" = {
       name = "socket.io-client";
       packageName = "socket.io-client";
@@ -36374,15 +36259,6 @@ let
         sha1 = "2609601f59e6a7fab436a53be3d333fbbfcbd30a";
       };
     };
-    "socket.io-parser-2.3.1" = {
-      name = "socket.io-parser";
-      packageName = "socket.io-parser";
-      version = "2.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.3.1.tgz";
-        sha1 = "dd532025103ce429697326befd64005fcfe5b4a0";
-      };
-    };
     "socket.io-parser-3.2.0" = {
       name = "socket.io-parser";
       packageName = "socket.io-parser";
@@ -36491,13 +36367,13 @@ let
         sha512 = "UMmCHovws/sxIBZsIRhIl8uRPou/RFDD0vVop81T1hG106NLLgqajKKuHAOtAP6hflnZ0UrVA2VFwddTd/NQyA==";
       };
     };
-    "sodium-native-2.4.5" = {
+    "sodium-native-2.4.6" = {
       name = "sodium-native";
       packageName = "sodium-native";
-      version = "2.4.5";
+      version = "2.4.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sodium-native/-/sodium-native-2.4.5.tgz";
-        sha512 = "G1uhd4l1OexzUC/6eHIbAvoivCs9T7ncDlEWodZglPZVUOXi6jtSe7tCi25aYB06zRoOjVfE4SL+hZ4EfkyZgw==";
+        url = "https://registry.npmjs.org/sodium-native/-/sodium-native-2.4.6.tgz";
+        sha512 = "Ro9lhTjot8M01nwKLXiqLSmjR7B8o+Wg4HmJUjEShw/q6XPlNMzjPkA1VJKaMH8SO8fJ/sggAKVwreTaFszS2Q==";
       };
     };
     "sodium-universal-2.0.0" = {
@@ -36509,13 +36385,13 @@ let
         sha512 = "csdVyakzHJRyCevY4aZC2Eacda8paf+4nmRGF2N7KxCLKY2Ajn72JsExaQlJQ2BiXJncp44p3T+b80cU+2TTsg==";
       };
     };
-    "sonic-boom-0.7.5" = {
+    "sonic-boom-0.7.6" = {
       name = "sonic-boom";
       packageName = "sonic-boom";
-      version = "0.7.5";
+      version = "0.7.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sonic-boom/-/sonic-boom-0.7.5.tgz";
-        sha512 = "1pKrnAV6RfvntPnarY71tpthFTM3pWZWWQdghZY8ARjtDPGzG/inxqSuRwQY/7V1woUjfyxPb437zn4p5phgnQ==";
+        url = "https://registry.npmjs.org/sonic-boom/-/sonic-boom-0.7.6.tgz";
+        sha512 = "k9E2QQ4zxuVRLDW+ZW6ISzJs3wlEorVdmM7ApDgor7wsGKSDG5YGHsGmgLY4XYh4DMlr/2ap2BWAE7yTFJtWnQ==";
       };
     };
     "sorcery-0.10.0" = {
@@ -36842,6 +36718,15 @@ let
         sha1 = "70eff23cde4e97d52a445f65afddcc5695eb5edb";
       };
     };
+    "speech-rule-engine-3.0.0-beta.6" = {
+      name = "speech-rule-engine";
+      packageName = "speech-rule-engine";
+      version = "3.0.0-beta.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/speech-rule-engine/-/speech-rule-engine-3.0.0-beta.6.tgz";
+        sha512 = "B7gcT53jAsKpx7WvFYQcyUlFmgS3Wa9KlDy0FY8SOTa+Wz5EqmI0MpCD5/fYm8/2qiCPp8HwZg+H3cBgM+sNVw==";
+      };
+    };
     "speedometer-0.1.4" = {
       name = "speedometer";
       packageName = "speedometer";
@@ -37004,6 +36889,15 @@ let
         sha512 = "IkvzjmsWQl9BuBiM4xKpl5X8WCR4w0AeJHRdobCdXZ8dT/lNc1XS6WqvY35N6+YzIIgzSBeY5prdFObID9F9tA==";
       };
     };
+    "sqlite3-4.1.0" = {
+      name = "sqlite3";
+      packageName = "sqlite3";
+      version = "4.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sqlite3/-/sqlite3-4.1.0.tgz";
+        sha512 = "RvqoKxq+8pDHsJo7aXxsFR18i+dU2Wp5o12qAJOV5LNcDt+fgJsc2QKKg3sIRfXrN9ZjzY1T7SNe/DFVqAXjaw==";
+      };
+    };
     "srt2vtt-1.3.1" = {
       name = "srt2vtt";
       packageName = "srt2vtt";
@@ -37508,15 +37402,6 @@ let
         sha1 = "cbd243953cc42effd548b5d22388ed689ec639bd";
       };
     };
-    "statuses-1.2.1" = {
-      name = "statuses";
-      packageName = "statuses";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz";
-        sha1 = "dded45cc18256d51ed40aec142489d5c61026d28";
-      };
-    };
     "statuses-1.4.0" = {
       name = "statuses";
       packageName = "statuses";
@@ -37697,6 +37582,15 @@ let
         sha512 = "+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==";
       };
     };
+    "stream-http-3.1.0" = {
+      name = "stream-http";
+      packageName = "stream-http";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/stream-http/-/stream-http-3.1.0.tgz";
+        sha512 = "cuB6RgO7BqC4FBYzmnvhob5Do3wIdIsXAgGycHJnW+981gHqoYcYz9lqjJrk8WXRddbwPuqPYRl+bag6mYv4lw==";
+      };
+    };
     "stream-parser-0.3.1" = {
       name = "stream-parser";
       packageName = "stream-parser";
@@ -37742,15 +37636,6 @@ let
         sha1 = "bbf6b39f5f43ec30bc71babcb37557acecf34353";
       };
     };
-    "stream-to-blob-1.0.2" = {
-      name = "stream-to-blob";
-      packageName = "stream-to-blob";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/stream-to-blob/-/stream-to-blob-1.0.2.tgz";
-        sha512 = "ryeEu3DGMt/095uTShIYGzLbbhZ+tHQtgp5HWEhXALSoc4U1iLSvpReZUdysahnJ3tki80wBBgryqqBzFZ0KaA==";
-      };
-    };
     "stream-to-blob-2.0.0" = {
       name = "stream-to-blob";
       packageName = "stream-to-blob";
@@ -37760,13 +37645,13 @@ let
         sha512 = "E+YitTtIHo7RQ4Cmgl+EzlMpqvLroTynRgt4t0pI4y5oz/piqlBQB8NFXLIWcjGOsKw+THnImrdpWcOCVxK25Q==";
       };
     };
-    "stream-to-blob-url-2.1.2" = {
+    "stream-to-blob-url-3.0.0" = {
       name = "stream-to-blob-url";
       packageName = "stream-to-blob-url";
-      version = "2.1.2";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stream-to-blob-url/-/stream-to-blob-url-2.1.2.tgz";
-        sha512 = "dpfeYUYNodazv7rU+B9DOBj8u+dueXKOWqCy1lzPBxqeVIqq93jVTn68DZoBPLiYXSdsY9AW8D1l1BuxvghqEA==";
+        url = "https://registry.npmjs.org/stream-to-blob-url/-/stream-to-blob-url-3.0.0.tgz";
+        sha512 = "Mu1iPvbBkzdUPCZ+J+XBr/oagjOBfj4vpErHRIe08QzWeILSDtF5LXo6v44HeQFpx7dfqcBKjGUbSNCJ+38zqQ==";
       };
     };
     "stream-to-promise-2.2.0" = {
@@ -37904,13 +37789,13 @@ let
         sha1 = "5ea211cd92d228e184294990a6cc97b366a77cb0";
       };
     };
-    "string-kit-0.9.10" = {
+    "string-kit-0.9.12" = {
       name = "string-kit";
       packageName = "string-kit";
-      version = "0.9.10";
+      version = "0.9.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string-kit/-/string-kit-0.9.10.tgz";
-        sha512 = "hcJem/u3/ddt3lSY2Xlx953XCHe3C8BX2XEWbPrByjyJ0CSR36X7kzsGFsI5lLaG94dLCQYpt8ffVwRjKpRT6g==";
+        url = "https://registry.npmjs.org/string-kit/-/string-kit-0.9.12.tgz";
+        sha512 = "l6BRL9uO4uV1o6/r/mJthahp8qatqGv4l6Z2o2mX+y2VYc7gFb2YD0k3zThvw3BATj/nDvLTB1s167vc2JdeDg==";
       };
     };
     "string-length-2.0.0" = {
@@ -38021,6 +37906,24 @@ let
         sha512 = "9EIjYD/WdlvLpn987+ctkLf0FfvBefOCuiEr2henD8X+7jfwPnyvTdmW8OJhj5p+M0/96mBdynLWkxUr+rHlpg==";
       };
     };
+    "string.prototype.trimleft-2.1.0" = {
+      name = "string.prototype.trimleft";
+      packageName = "string.prototype.trimleft";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz";
+        sha512 = "FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw==";
+      };
+    };
+    "string.prototype.trimright-2.1.0" = {
+      name = "string.prototype.trimright";
+      packageName = "string.prototype.trimright";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz";
+        sha512 = "fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg==";
+      };
+    };
     "string2compact-1.3.0" = {
       name = "string2compact";
       packageName = "string2compact";
@@ -38048,13 +37951,13 @@ let
         sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==";
       };
     };
-    "string_decoder-1.2.0" = {
+    "string_decoder-1.3.0" = {
       name = "string_decoder";
       packageName = "string_decoder";
-      version = "1.2.0";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.2.0.tgz";
-        sha512 = "6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w==";
+        url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz";
+        sha512 = "hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==";
       };
     };
     "stringify-entities-1.3.2" = {
@@ -38345,13 +38248,13 @@ let
         sha1 = "29f4dc129fa1ca22150cd867223cee2bed5ff6a2";
       };
     };
-    "stylus-0.54.5" = {
+    "stylus-0.54.7" = {
       name = "stylus";
       packageName = "stylus";
-      version = "0.54.5";
+      version = "0.54.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stylus/-/stylus-0.54.5.tgz";
-        sha1 = "42b9560931ca7090ce8515a798ba9e6aa3d6dc79";
+        url = "https://registry.npmjs.org/stylus/-/stylus-0.54.7.tgz";
+        sha512 = "Yw3WMTzVwevT6ZTrLCYNHAFmanMxdylelL3hkWNgPMeTCpMwpV3nXjpOHuBXtFv7aiO2xRuQS6OoAdgkNcSNug==";
       };
     };
     "stylus-supremacy-2.12.7" = {
@@ -38453,15 +38356,6 @@ let
         sha512 = "TktJma5jPdiH1BNN+reF/RMW3b8aBTCV7KlLFV0uYcREgNf3pvo7Rdt564OcFHwkGb3mYEhHuWPBhSbOwiNaYw==";
       };
     };
-    "supervisor-0.12.0" = {
-      name = "supervisor";
-      packageName = "supervisor";
-      version = "0.12.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/supervisor/-/supervisor-0.12.0.tgz";
-        sha1 = "de7e6337015b291851c10f3538c4a7f04917ecc1";
-      };
-    };
     "supports-color-0.2.0" = {
       name = "supports-color";
       packageName = "supports-color";
@@ -38741,13 +38635,13 @@ let
         sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w==";
       };
     };
-    "systeminformation-4.14.4" = {
+    "systeminformation-4.14.8" = {
       name = "systeminformation";
       packageName = "systeminformation";
-      version = "4.14.4";
+      version = "4.14.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.14.4.tgz";
-        sha512 = "ib2dodksiiaGOW4rcKvFr5naHkODI9GwQPugLb6FLKppkIsE7rj2dfY2UdMBr7oX0/iZP981hoxmbk2e6zl99Q==";
+        url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.14.8.tgz";
+        sha512 = "05wW1YaMBI6LlVtvw2wXQGr0thpX8E0IImYcpbqUiNanfmq8e+V89pDW2L5V/mN8kU37W0VtVySftQ0PwMIXKw==";
       };
     };
     "syswide-cas-5.3.0" = {
@@ -38777,13 +38671,13 @@ let
         sha512 = "UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==";
       };
     };
-    "table-5.4.5" = {
+    "table-5.4.6" = {
       name = "table";
       packageName = "table";
-      version = "5.4.5";
+      version = "5.4.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/table/-/table-5.4.5.tgz";
-        sha512 = "oGa2Hl7CQjfoaogtrOHEJroOcYILTx7BZWLGsJIlzoWmB2zmguhNfPJZsWPKYek/MgCxfco54gEi31d1uN2hFA==";
+        url = "https://registry.npmjs.org/table/-/table-5.4.6.tgz";
+        sha512 = "wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==";
       };
     };
     "table-layout-0.4.5" = {
@@ -38832,13 +38726,13 @@ let
         sha1 = "7cbcb64b5a141b6a2efc2c5d2c67b4e150b2a268";
       };
     };
-    "tail-2.0.2" = {
+    "tail-2.0.3" = {
       name = "tail";
       packageName = "tail";
-      version = "2.0.2";
+      version = "2.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tail/-/tail-2.0.2.tgz";
-        sha512 = "raFipiKWdGKEzxbvZwnhUGqjvsv0gpa/1A479rL//NOxnNwYZDN4MPk6xJJdUFs8P2Xrff3nbH5fcyYRLU4UHQ==";
+        url = "https://registry.npmjs.org/tail/-/tail-2.0.3.tgz";
+        sha512 = "s9NOGkLqqiDEtBttQZI7acLS8ycYK5sTlDwNjGnpXG9c8AWj0cfAtwEIzo/hVRMMiC5EYz+bXaJWC1u1u0GPpQ==";
       };
     };
     "taketalk-1.0.0" = {
@@ -38913,13 +38807,13 @@ let
         sha512 = "g2SVs5QIxvo6OLp0GudTqEf05maawKUxXru104iaayWA09551tFCTI8f1Asb4lPfkBr91k07iL4c11XO3/b0tA==";
       };
     };
-    "tar-fs-1.16.3" = {
+    "tar-fs-2.0.0" = {
       name = "tar-fs";
       packageName = "tar-fs";
-      version = "1.16.3";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tar-fs/-/tar-fs-1.16.3.tgz";
-        sha512 = "NvCeXpYx7OsmOh8zIOP/ebG55zZmxLE0etfWRbWok+q2Qo8x/vOR/IJT1taADXPe+jsiu9axDb3X4B+iIgNlKw==";
+        url = "https://registry.npmjs.org/tar-fs/-/tar-fs-2.0.0.tgz";
+        sha512 = "vaY0obB6Om/fso8a8vakQBzwholQ7v5+uy+tF3Ozvxv1KNezmVQAiWtcNmMHFSFPqL3dJA8ha6gdtFbfX9mcxA==";
       };
     };
     "tar-pack-3.4.1" = {
@@ -39084,13 +38978,13 @@ let
         sha1 = "458b83887f288fc56d6fffbfad262e26638efa69";
       };
     };
-    "terminal-kit-1.29.3" = {
+    "terminal-kit-1.31.3" = {
       name = "terminal-kit";
       packageName = "terminal-kit";
-      version = "1.29.3";
+      version = "1.31.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.29.3.tgz";
-        sha512 = "RngmihiCinQ0CT3Q7l2R4aiV50czaB0gmGZ2rOZXhX5vWAkUAsnRVcv4JG068KQP1FbQNhm88CU/nBCZQmMPUQ==";
+        url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.31.3.tgz";
+        sha512 = "nFNMB70bnvvlCazD2GLhJNmL8uaYxtCd5NarsNFI98oDtn7VJr2TCkfKGX2NxIK42wFWE9ieCUEA93kDvPcBWw==";
       };
     };
     "terser-3.17.0" = {
@@ -39102,13 +38996,13 @@ let
         sha512 = "/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==";
       };
     };
-    "terser-4.1.3" = {
+    "terser-4.3.1" = {
       name = "terser";
       packageName = "terser";
-      version = "4.1.3";
+      version = "4.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/terser/-/terser-4.1.3.tgz";
-        sha512 = "on13d+cnpn5bMouZu+J8tPYQecsdRJCJuxFJ+FVoPBoLJgk5bCBkp+Uen2hWyi0KIUm6eDarnlAlH+KgIx/PuQ==";
+        url = "https://registry.npmjs.org/terser/-/terser-4.3.1.tgz";
+        sha512 = "pnzH6dnFEsR2aa2SJaKb1uSCl3QmIsJ8dEkj0Fky+2AwMMcC9doMqLOQIH6wVTEKaVfKVvLSk5qxPBEZT9mywg==";
       };
     };
     "terser-webpack-plugin-1.4.1" = {
@@ -39444,13 +39338,13 @@ let
         sha1 = "c9c58b575be8407375cb5e2462dacee74359f41d";
       };
     };
-    "timers-browserify-2.0.10" = {
+    "timers-browserify-2.0.11" = {
       name = "timers-browserify";
       packageName = "timers-browserify";
-      version = "2.0.10";
+      version = "2.0.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.10.tgz";
-        sha512 = "YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==";
+        url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz";
+        sha512 = "60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==";
       };
     };
     "timers-ext-0.1.7" = {
@@ -39858,13 +39752,13 @@ let
         sha1 = "2d17d82cf669ada7f9dfe75db4b31f7034b71e29";
       };
     };
-    "torrent-discovery-9.1.2" = {
+    "torrent-discovery-9.2.1" = {
       name = "torrent-discovery";
       packageName = "torrent-discovery";
-      version = "9.1.2";
+      version = "9.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-9.1.2.tgz";
-        sha512 = "LW5CZEWwmlnK0iDwiV8glDI9jWQ1OhL1hGnyn5/ystOSa2+cZO1d2xcKemghf1tlG0C3ytmLE4rnM5yXR5eN3A==";
+        url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-9.2.1.tgz";
+        sha512 = "bjKkbTEkcoZTXF8nhcRu6UWqbkpUsehd/6umoZqjgj/dM8nD3O7wNkPZrmls+vVf+2LT9ejZMlNUvZCqSe8cqg==";
       };
     };
     "torrent-piece-1.1.2" = {
@@ -40191,13 +40085,13 @@ let
         sha512 = "uEtWkFM/sdZvRNNDL3Ehu4WVpwaulhwQszV8mrtcdeE8nN00BV9mAmQ88RkrBhFgl9gMgvjJLAQcZbnPXI9mlA==";
       };
     };
-    "ts-node-8.3.0" = {
+    "ts-node-8.4.1" = {
       name = "ts-node";
       packageName = "ts-node";
-      version = "8.3.0";
+      version = "8.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ts-node/-/ts-node-8.3.0.tgz";
-        sha512 = "dyNS/RqyVTDcmNM4NIBAeDMpsAdaQ+ojdf0GOLqE6nwJOgzEkdRNzJywhDfwnuvB10oa6NLVG1rUJQCpRN7qoQ==";
+        url = "https://registry.npmjs.org/ts-node/-/ts-node-8.4.1.tgz";
+        sha512 = "5LpRN+mTiCs7lI5EtbXmF/HfMeCjzt7DH9CZwtkr6SywStrNQC723wG+aOWFiLNn7zT3kD/RnFqi3ZUfr4l5Qw==";
       };
     };
     "tslib-1.10.0" = {
@@ -40218,13 +40112,13 @@ let
         sha512 = "4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==";
       };
     };
-    "tsscmp-1.0.5" = {
-      name = "tsscmp";
-      packageName = "tsscmp";
-      version = "1.0.5";
+    "tslint-5.20.0" = {
+      name = "tslint";
+      packageName = "tslint";
+      version = "5.20.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.5.tgz";
-        sha1 = "7dc4a33af71581ab4337da91d85ca5427ebd9a97";
+        url = "https://registry.npmjs.org/tslint/-/tslint-5.20.0.tgz";
+        sha512 = "2vqIvkMHbnx8acMogAERQ/IuINOq6DFqgF8/VDvhEkBqQh/x6SP0Y+OHnKth9/ZcHQSroOZwUQSN18v8KKF0/g==";
       };
     };
     "tsscmp-1.0.6" = {
@@ -40236,6 +40130,15 @@ let
         sha512 = "LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==";
       };
     };
+    "tsutils-2.29.0" = {
+      name = "tsutils";
+      packageName = "tsutils";
+      version = "2.29.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz";
+        sha512 = "g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==";
+      };
+    };
     "ttl-1.3.1" = {
       name = "ttl";
       packageName = "ttl";
@@ -40488,6 +40391,15 @@ let
         sha512 = "ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g==";
       };
     };
+    "typescript-3.6.3" = {
+      name = "typescript";
+      packageName = "typescript";
+      version = "3.6.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/typescript/-/typescript-3.6.3.tgz";
+        sha512 = "N7bceJL1CtRQ2RiG0AQME13ksR7DiuQh/QehubYcghzv20tnh+MQnQIuJddTmsbqYj+dztchykemz0zFzlvdQw==";
+      };
+    };
     "typescript-eslint-parser-16.0.1" = {
       name = "typescript-eslint-parser";
       packageName = "typescript-eslint-parser";
@@ -40623,24 +40535,6 @@ let
         sha1 = "0ea10e8035e8eb5b8e4449f06da1c730663baa81";
       };
     };
-    "uid-safe-2.0.0" = {
-      name = "uid-safe";
-      packageName = "uid-safe";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.0.0.tgz";
-        sha1 = "a7f3c6ca64a1f6a5d04ec0ef3e4c3d5367317137";
-      };
-    };
-    "uid-safe-2.1.4" = {
-      name = "uid-safe";
-      packageName = "uid-safe";
-      version = "2.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.4.tgz";
-        sha1 = "3ad6f38368c6d4c8c75ec17623fb79aa1d071d81";
-      };
-    };
     "uid-safe-2.1.5" = {
       name = "uid-safe";
       packageName = "uid-safe";
@@ -40731,13 +40625,13 @@ let
         sha1 = "e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa";
       };
     };
-    "uncss-0.17.0" = {
+    "uncss-0.17.2" = {
       name = "uncss";
       packageName = "uncss";
-      version = "0.17.0";
+      version = "0.17.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uncss/-/uncss-0.17.0.tgz";
-        sha512 = "ZFFHCpAUEC0kJkuJelLYjrr0/bHBlgrN8XRDQN+wt9VVqap8Avj4fxt2WDJJZi0aSzYVaWCQoX19ZM+JZ5lqnw==";
+        url = "https://registry.npmjs.org/uncss/-/uncss-0.17.2.tgz";
+        sha512 = "hu2HquwDItuGDem4YsJROdAD8SknmWtM24zwhQax6J1se8tPjV1cnwPKhtjodzBaUhaL8Zb3hlGdZ2WAUpbAOg==";
       };
     };
     "undeclared-identifiers-1.1.3" = {
@@ -41199,13 +41093,13 @@ let
         sha512 = "gE91dtMvNkjO+kWsPstHRtSwHXz0l2axqptGYp5ceg4MsuurloM0PU3pdOfpb5zBXUvyjT4PwhWK2m39uczZuw==";
       };
     };
-    "universal-user-agent-3.0.0" = {
+    "universal-user-agent-4.0.0" = {
       name = "universal-user-agent";
       packageName = "universal-user-agent";
-      version = "3.0.0";
+      version = "4.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-3.0.0.tgz";
-        sha512 = "T3siHThqoj5X0benA5H0qcDnrKGXzU8TKoX15x/tQHw1hQBvIEBHjxQ2klizYsqBOO/Q+WuxoQUihadeeqDnoA==";
+        url = "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-4.0.0.tgz";
+        sha512 = "eM8knLpev67iBDizr/YtqkJsF3GK8gzDc6st/WKzrTuPtcsOKW/0IdL4cnMBsU69pOx0otavLWBDGTwg+dB0aA==";
       };
     };
     "universalify-0.1.2" = {
@@ -41361,6 +41255,15 @@ let
         sha512 = "kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==";
       };
     };
+    "upath-1.2.0" = {
+      name = "upath";
+      packageName = "upath";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz";
+        sha512 = "aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==";
+      };
+    };
     "update-check-1.5.2" = {
       name = "update-check";
       packageName = "update-check";
@@ -41523,15 +41426,6 @@ let
         sha512 = "jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA==";
       };
     };
-    "url-parse-1.4.3" = {
-      name = "url-parse";
-      packageName = "url-parse";
-      version = "1.4.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/url-parse/-/url-parse-1.4.3.tgz";
-        sha512 = "rh+KuAW36YKo0vClhQzLLveoj8FwPJNu65xLb7Mrt+eZht0IPT0IXgSv8gcMegZ6NvjJUALf6Mf25POlMwD1Fw==";
-      };
-    };
     "url-parse-1.4.7" = {
       name = "url-parse";
       packageName = "url-parse";
@@ -41568,15 +41462,6 @@ let
         sha1 = "dbad1e0c9e29e105dd0b1f09f6862f7fdb482724";
       };
     };
-    "url-template-2.0.8" = {
-      name = "url-template";
-      packageName = "url-template";
-      version = "2.0.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/url-template/-/url-template-2.0.8.tgz";
-        sha1 = "fc565a3cccbff7730c775f5641f9555791439f21";
-      };
-    };
     "url-to-options-1.0.1" = {
       name = "url-to-options";
       packageName = "url-to-options";
@@ -41631,22 +41516,22 @@ let
         sha512 = "4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==";
       };
     };
-    "ut_metadata-3.4.0" = {
+    "ut_metadata-3.5.0" = {
       name = "ut_metadata";
       packageName = "ut_metadata";
-      version = "3.4.0";
+      version = "3.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ut_metadata/-/ut_metadata-3.4.0.tgz";
-        sha512 = "/Igrr2rPD0NH/dNx493alpHxGBF/XREu68bZU4zigrYiQMQpYL68sKbNo9ND5DcmbMp0lNppw4mOhSSONgUYKw==";
+        url = "https://registry.npmjs.org/ut_metadata/-/ut_metadata-3.5.0.tgz";
+        sha512 = "eqiRaDYiDl94uVB9oR8Yor+xl0rSKUovsqDxMt+hXzJt1yLYAo0HksVLlSiPPwkXBGFpERQADPanCi0EGhixnw==";
       };
     };
-    "ut_pex-1.2.1" = {
+    "ut_pex-2.0.0" = {
       name = "ut_pex";
       packageName = "ut_pex";
-      version = "1.2.1";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ut_pex/-/ut_pex-1.2.1.tgz";
-        sha512 = "ZrxMCbffYtxQDqvREN9kBXK2CB9tPnd5PylHoqQX9ai+3HV9/S39FnA5JnhLOC82dxIQQg0nTN2wmhtAdGNtOA==";
+        url = "https://registry.npmjs.org/ut_pex/-/ut_pex-2.0.0.tgz";
+        sha512 = "Uc0IxXGlES1DfeG+ITUISAvCF4Uldj7tt/n7s3TBt0KyXqDViOO26X5WfwXtUpEwn8fyZyerzf/YOK4rIZ2S3Q==";
       };
     };
     "utf-8-validate-1.2.2" = {
@@ -41856,6 +41741,15 @@ let
         sha512 = "yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==";
       };
     };
+    "uuid-3.3.3" = {
+      name = "uuid";
+      packageName = "uuid";
+      version = "3.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz";
+        sha512 = "pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==";
+      };
+    };
     "v8-compile-cache-2.0.3" = {
       name = "v8-compile-cache";
       packageName = "v8-compile-cache";
@@ -41955,15 +41849,6 @@ let
         sha512 = "X/p3UZerAIsbBfN/IwahhYaBbY68EN/UQBWHtsbXGT5bfrH/p4NQzUCG1kF/rtKaNpnJ7jAu6NGTdSNtyNIXMw==";
       };
     };
-    "validator-10.8.0" = {
-      name = "validator";
-      packageName = "validator";
-      version = "10.8.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/validator/-/validator-10.8.0.tgz";
-        sha512 = "mXqMxfCh5NLsVgYVKl9WvnHNDPCcbNppHSPPowu0VjtSsGWVY+z8hJF44edLR1nbLNzi3jYoYsIl8KZpioIk6g==";
-      };
-    };
     "validator-5.2.0" = {
       name = "validator";
       packageName = "validator";
@@ -42297,15 +42182,6 @@ let
         sha512 = "CstaK/ebTz1W3Qp41Bt9Lj/2DmumFsCwC2sKahDNSPh0mPh7/UyMLCoU8ZBX34CRU0d61B4W41yIFsV0NKMZeA==";
       };
     };
-    "vhost-3.0.2" = {
-      name = "vhost";
-      packageName = "vhost";
-      version = "3.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vhost/-/vhost-3.0.2.tgz";
-        sha1 = "2fb1decd4c466aa88b0f9341af33dc1aff2478d5";
-      };
-    };
     "videostream-3.2.1" = {
       name = "videostream";
       packageName = "videostream";
@@ -42396,13 +42272,13 @@ let
         sha1 = "ab6549d61d172c2b1b87be5c508d239c8ef87705";
       };
     };
-    "vlc-command-1.1.2" = {
+    "vlc-command-1.2.0" = {
       name = "vlc-command";
       packageName = "vlc-command";
-      version = "1.1.2";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vlc-command/-/vlc-command-1.1.2.tgz";
-        sha512 = "KZ15RTHz96OEiQDA8oNFn1edYDWyKJIWI4gF74Am9woZo5XmVYryk5RYXSwOMvsaAgL5ejICEGCl0suQyDBu+Q==";
+        url = "https://registry.npmjs.org/vlc-command/-/vlc-command-1.2.0.tgz";
+        sha512 = "YTr1w5KmxRN5CBCvplKOD6g/OjwCl5iz+SIjDbq8gWTkByYZun5duHm+OLUkBlbJrCGvMyFyNhTMQxV4Ny0v8g==";
       };
     };
     "vlq-0.2.3" = {
@@ -42495,13 +42371,13 @@ let
         sha512 = "perEnXQdQOJMTDFNv+UF3h1Y0z4iSiaN9jIlb0OqIYgosPCZGYh/MCUlkFtV2668PL69lRDO32hmvL2yiidUYg==";
       };
     };
-    "vscode-jsonrpc-4.1.0-next.2" = {
+    "vscode-jsonrpc-4.1.0-next.3" = {
       name = "vscode-jsonrpc";
       packageName = "vscode-jsonrpc";
-      version = "4.1.0-next.2";
+      version = "4.1.0-next.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-4.1.0-next.2.tgz";
-        sha512 = "GsBLjP9DxQ42yl1mW9GEIlnSc0+R8mfzhaebwmmTPEJjezD5SPoAo3DFrIAFZha9yvQ1nzZfZlhtVpGQmgxtXg==";
+        url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-4.1.0-next.3.tgz";
+        sha512 = "Z6oxBiMks2+UADV1QHXVooSakjyhI+eHTnXzDyVvVMmegvSfkXk2w6mPEdSkaNHFBdtWW7n20H1yw2nA3A17mg==";
       };
     };
     "vscode-languageclient-4.0.1" = {
@@ -42540,13 +42416,13 @@ let
         sha512 = "GuayqdKZqAwwaCUjDvMTAVRPJOp/SLON3mJ07eGsx/Iq9HjRymhKWztX41rISqDKhHVVyFM+IywICyZDla6U3A==";
       };
     };
-    "vscode-languageserver-5.3.0-next.8" = {
+    "vscode-languageserver-5.3.0-next.10" = {
       name = "vscode-languageserver";
       packageName = "vscode-languageserver";
-      version = "5.3.0-next.8";
+      version = "5.3.0-next.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-5.3.0-next.8.tgz";
-        sha512 = "6vUb96wsRfrFqndril3gct/FBCSc24OxFZ2iz7kuEuXvLaIcEVOcSZIqQK8oFN7PdbAIaa9nnIpKSy4Yd15cIw==";
+        url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-5.3.0-next.10.tgz";
+        sha512 = "QL7Fe1FT6PdLtVzwJeZ78pTic4eZbzLRy7yAQgPb9xalqqgZESR0+yDZPwJrM3E7PzOmwHBceYcJR54eQZ7Kng==";
       };
     };
     "vscode-languageserver-protocol-3.14.1" = {
@@ -42558,13 +42434,13 @@ let
         sha512 = "IL66BLb2g20uIKog5Y2dQ0IiigW0XKrvmWiOvc0yXw80z3tMEzEnHjaGAb3ENuU7MnQqgnYJ1Cl2l9RvNgDi4g==";
       };
     };
-    "vscode-languageserver-protocol-3.15.0-next.6" = {
+    "vscode-languageserver-protocol-3.15.0-next.8" = {
       name = "vscode-languageserver-protocol";
       packageName = "vscode-languageserver-protocol";
-      version = "3.15.0-next.6";
+      version = "3.15.0-next.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.0-next.6.tgz";
-        sha512 = "/yDpYlWyNs26mM23mT73xmOFsh1iRfgZfBdHmfAxwDKwpQKLoOSqVidtYfxlK/pD3IEKGcAVnT4WXTsguxxAMQ==";
+        url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.0-next.8.tgz";
+        sha512 = "9FigDhuYTUqX73IGKgJeyLmfXQJv9p3t22RF3peT+HM33uFiTZE3MUgHj4I9m/dKCDvuJt0yvbI27ut4hDoGRQ==";
       };
     };
     "vscode-languageserver-protocol-3.6.0" = {
@@ -42594,13 +42470,13 @@ let
         sha512 = "lTmS6AlAlMHOvPQemVwo3CezxBp0sNB95KNPkqp3Nxd5VFEnuG1ByM0zlRWos0zjO3ZWtkvhal0COgiV1xIA4A==";
       };
     };
-    "vscode-languageserver-types-3.15.0-next.2" = {
+    "vscode-languageserver-types-3.15.0-next.4" = {
       name = "vscode-languageserver-types";
       packageName = "vscode-languageserver-types";
-      version = "3.15.0-next.2";
+      version = "3.15.0-next.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.15.0-next.2.tgz";
-        sha512 = "2JkrMWWUi2rlVLSo9OFR2PIGUzdiowEM8NgNYiwLKnXTjpwpjjIrJbNNxDik7Rv4oo9KtikcFQZKXbrKilL/MQ==";
+        url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.15.0-next.4.tgz";
+        sha512 = "IKIWTdUPBnOtwznIrhxKnjVZ7hYxEzwZ3M2xmDi7OjjexuOM6LnGtoo1Dv4wYSik4epK4STEib6e8da2GxUsJA==";
       };
     };
     "vscode-nls-3.2.5" = {
@@ -42729,15 +42605,6 @@ let
         sha512 = "jVZkw4/I/HT5ZMvRnhv78okGusqe0+qH2A0Em0Cp8aq78+NK9TII263CDVz2QXZsIT+yyV/gZc/j/vlwa+Epyg==";
       };
     };
-    "vuetify-helper-json-1.0.0" = {
-      name = "vuetify-helper-json";
-      packageName = "vuetify-helper-json";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vuetify-helper-json/-/vuetify-helper-json-1.0.0.tgz";
-        sha512 = "JNjc77FJbWEOk+Y9uzPr8u3cogRivjUE1Ha9DhPruBJutRO1Lf4ZVff44/N37vwC9e9JJGjj7y4JtT2kY7exrw==";
-      };
-    };
     "w3c-hr-time-1.0.1" = {
       name = "w3c-hr-time";
       packageName = "w3c-hr-time";
@@ -42855,22 +42722,22 @@ let
         sha512 = "YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==";
       };
     };
-    "webpack-4.39.1" = {
+    "webpack-4.40.2" = {
       name = "webpack";
       packageName = "webpack";
-      version = "4.39.1";
+      version = "4.40.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webpack/-/webpack-4.39.1.tgz";
-        sha512 = "/LAb2TJ2z+eVwisldp3dqTEoNhzp/TLCZlmZm3GGGAlnfIWDgOEE758j/9atklNLfRyhKbZTCOIoPqLJXeBLbQ==";
+        url = "https://registry.npmjs.org/webpack/-/webpack-4.40.2.tgz";
+        sha512 = "5nIvteTDCUws2DVvP9Qe+JPla7kWPPIDFZv55To7IycHWZ+Z5qBdaBYPyuXWdhggTufZkQwfIK+5rKQTVovm2A==";
       };
     };
-    "webpack-cli-3.3.6" = {
+    "webpack-cli-3.3.8" = {
       name = "webpack-cli";
       packageName = "webpack-cli";
-      version = "3.3.6";
+      version = "3.3.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.6.tgz";
-        sha512 = "0vEa83M7kJtxK/jUhlpZ27WHIOndz5mghWL2O53kiDoA9DIxSKnfqB92LoqEn77cT4f3H2cZm1BMEat/6AZz3A==";
+        url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.8.tgz";
+        sha512 = "RANYSXwikSWINjHMd/mtesblNSpjpDLoYTBtP99n1RhXqVI/wxN40Auqy42I7y4xrbmRBoA5Zy5E0JSBD5XRhw==";
       };
     };
     "webpack-core-0.6.9" = {
@@ -42918,13 +42785,13 @@ let
         sha512 = "EXy/zXb9kNHI07TIMz1oIUIrPZxQRA8aeJ5XYg5ihV8K4kD1DuA+FY6R96HfdIHzlSzS8HiISAfrm+vVQkZBug==";
       };
     };
-    "webtorrent-0.106.0" = {
+    "webtorrent-0.107.16" = {
       name = "webtorrent";
       packageName = "webtorrent";
-      version = "0.106.0";
+      version = "0.107.16";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.106.0.tgz";
-        sha512 = "CTj4J6yj6TuNTfrjRL84tunlCwIM+4hBu/6BfZslgi+iHdiJklUmFra/1WXBsx1madUB6/Ujx1eh4w+FO0on7g==";
+        url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.107.16.tgz";
+        sha512 = "5fdPZFiZPxwbigAHtMVQ7ZCXbZSQlxgB6JPD77itpc9DdKYPpliFwCLsNiQpj1jmpo91HlHUJk+Xp3ks1fLUQg==";
       };
     };
     "whatwg-encoding-1.0.5" = {
@@ -43062,6 +42929,15 @@ let
         sha1 = "20b721df05b35b706176ffa10b0909aba4603035";
       };
     };
+    "wicked-good-xpath-1.3.0" = {
+      name = "wicked-good-xpath";
+      packageName = "wicked-good-xpath";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wicked-good-xpath/-/wicked-good-xpath-1.3.0.tgz";
+        sha1 = "81b0e95e8650e49c94b22298fff8686b5553cf6c";
+      };
+    };
     "wide-align-1.1.3" = {
       name = "wide-align";
       packageName = "wide-align";
@@ -43476,15 +43352,6 @@ let
         sha512 = "nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==";
       };
     };
-    "ws-5.2.0" = {
-      name = "ws";
-      packageName = "ws";
-      version = "5.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ws/-/ws-5.2.0.tgz";
-        sha512 = "c18dMeW+PEQdDFzkhDsnBAlS4Z8KGStBQQUcQ5mf7Nf689jyGk0594L+i9RaQuf4gog6SvWLJorz2NfSaqxZ7w==";
-      };
-    };
     "ws-5.2.2" = {
       name = "ws";
       packageName = "ws";
@@ -43521,13 +43388,13 @@ let
         sha512 = "o41D/WmDeca0BqYhsr3nJzQyg9NF5X8l/UdnFNux9cS3lwB+swm8qGWX5rn+aD6xfBU3rGmtHij7g7x6LxFU3A==";
       };
     };
-    "wtf-8-1.0.0" = {
-      name = "wtf-8";
-      packageName = "wtf-8";
-      version = "1.0.0";
+    "ws-7.1.2" = {
+      name = "ws";
+      packageName = "ws";
+      version = "7.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/wtf-8/-/wtf-8-1.0.0.tgz";
-        sha1 = "392d8ba2d0f1c34d1ee2d630f15d0efb68e1048a";
+        url = "https://registry.npmjs.org/ws/-/ws-7.1.2.tgz";
+        sha512 = "gftXq3XI81cJCgkUiAVixA0raD9IVmXqsylCrjRygw4+UOOGzPoxnQ6r/CnVL9i+mDncJo94tSkyrtuuQVBmrg==";
       };
     };
     "x-default-browser-0.3.1" = {
@@ -43692,6 +43559,15 @@ let
         sha512 = "esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==";
       };
     };
+    "xml2js-0.4.22" = {
+      name = "xml2js";
+      packageName = "xml2js";
+      version = "0.4.22";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xml2js/-/xml2js-0.4.22.tgz";
+        sha512 = "MWTbxAQqclRSTnehWWe5nMKzI3VmJ8ltiJEco8akcC6j3miOhjjfzKum5sId+CWhfxdOs/1xauYr8/ZDBtQiRw==";
+      };
+    };
     "xml2tss-0.0.5" = {
       name = "xml2tss";
       packageName = "xml2tss";
@@ -43719,6 +43595,15 @@ let
         sha1 = "c4614ba74e0ad196e609c9272cd9e1ddb28a8a58";
       };
     };
+    "xmlbuilder-11.0.1" = {
+      name = "xmlbuilder";
+      packageName = "xmlbuilder";
+      version = "11.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz";
+        sha512 = "fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==";
+      };
+    };
     "xmlbuilder-2.5.2" = {
       name = "xmlbuilder";
       packageName = "xmlbuilder";
@@ -43746,13 +43631,13 @@ let
         sha1 = "132ee63d2ec5565c557e20f4c22df9aca686b10d";
       };
     };
-    "xmlchars-2.1.1" = {
+    "xmlchars-2.2.0" = {
       name = "xmlchars";
       packageName = "xmlchars";
-      version = "2.1.1";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/xmlchars/-/xmlchars-2.1.1.tgz";
-        sha512 = "7hew1RPJ1iIuje/Y01bGD/mXokXxegAgVS+e+E0wSi2ILHQkYAH1+JXARwTjZSM4Z4Z+c73aKspEcqj+zPPL/w==";
+        url = "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz";
+        sha512 = "JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==";
       };
     };
     "xmlcreate-2.0.1" = {
@@ -43782,6 +43667,15 @@ let
         sha1 = "d501f97b3bdb403af8ef9ecc20573187aadac0e9";
       };
     };
+    "xmldom-sre-0.1.31" = {
+      name = "xmldom-sre";
+      packageName = "xmldom-sre";
+      version = "0.1.31";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xmldom-sre/-/xmldom-sre-0.1.31.tgz";
+        sha512 = "f9s+fUkX04BxQf+7mMWAp5zk61pciie+fFLC9hX9UVvCeJQfNHRHXpeo5MPcR0EUf57PYLdt+ZO4f3Ipk2oZUw==";
+      };
+    };
     "xmlhttprequest-1.8.0" = {
       name = "xmlhttprequest";
       packageName = "xmlhttprequest";
@@ -43801,15 +43695,6 @@ let
         sha256 = "28dd0394d85befe8be4e9cd9f6803102780c62cbb09298cb174b52ff9777624f";
       };
     };
-    "xmlhttprequest-ssl-1.5.3" = {
-      name = "xmlhttprequest-ssl";
-      packageName = "xmlhttprequest-ssl";
-      version = "1.5.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz";
-        sha1 = "185a888c04eca46c3e4070d99f7b49de3528992d";
-      };
-    };
     "xmlhttprequest-ssl-1.5.5" = {
       name = "xmlhttprequest-ssl";
       packageName = "xmlhttprequest-ssl";
@@ -44008,6 +43893,15 @@ let
         sha512 = "ivSoxqBGYOqQVruxD35+EyCFDYNEFL/Uo6FcOnz+9xZdZzK0Zzw4r4KhbrME1Oo2gOggwJod2MnsdamSG7H9ig==";
       };
     };
+    "yargs-11.1.0" = {
+      name = "yargs";
+      packageName = "yargs";
+      version = "11.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs/-/yargs-11.1.0.tgz";
+        sha512 = "NwW69J42EsCSanF8kyn5upxvjp5ds+t3+udGBeTbFnERA+lF541DDpMawzo4z6W/QrzNM18D+BPMiOBibnFV5A==";
+      };
+    };
     "yargs-12.0.4" = {
       name = "yargs";
       packageName = "yargs";
@@ -44053,6 +43947,15 @@ let
         sha512 = "2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==";
       };
     };
+    "yargs-14.1.0" = {
+      name = "yargs";
+      packageName = "yargs";
+      version = "14.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs/-/yargs-14.1.0.tgz";
+        sha512 = "IdkQq1NiiV1fPwN5I2o4B0PKVjKh1EP71egpWO8dlovT8LG8JrXRmbH23v6I3CtjeEMnNC/IF3lq6XepPoELdg==";
+      };
+    };
     "yargs-3.10.0" = {
       name = "yargs";
       packageName = "yargs";
@@ -44116,15 +44019,6 @@ let
         sha512 = "VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==";
       };
     };
-    "yargs-parser-11.0.0" = {
-      name = "yargs-parser";
-      packageName = "yargs-parser";
-      version = "11.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.0.0.tgz";
-        sha512 = "dvsafRjM45h79WOTvS/dP35Sb31SlGAKz6tFjI97kGC4MJFBuzTZY6TTYHrz0QSMQdkyd8Y+RsOMLr+JY0nPFQ==";
-      };
-    };
     "yargs-parser-11.1.1" = {
       name = "yargs-parser";
       packageName = "yargs-parser";
@@ -44152,6 +44046,15 @@ let
         sha512 = "oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==";
       };
     };
+    "yargs-parser-14.0.0" = {
+      name = "yargs-parser";
+      packageName = "yargs-parser";
+      version = "14.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-14.0.0.tgz";
+        sha512 = "zn/Mnx+tbFjkCFUodEpjXckNS65NfpB5oyqOkDDEG/8uxlfLZJu2IoBLQFjukUkn9rBbGkVYNzrDh6qy4NUd3g==";
+      };
+    };
     "yargs-parser-2.4.1" = {
       name = "yargs-parser";
       packageName = "yargs-parser";
@@ -44197,6 +44100,15 @@ let
         sha512 = "yP+6QqN8BmrgW2ggLtTbdrOyBNSI7zBa4IykmiV5R1wl1JWNxQvWhMfMdmzIYtKU7oP3OOInY/tl2ov3BDjnJQ==";
       };
     };
+    "yargs-parser-9.0.2" = {
+      name = "yargs-parser";
+      packageName = "yargs-parser";
+      version = "9.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-9.0.2.tgz";
+        sha1 = "9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077";
+      };
+    };
     "yargs-unparser-1.5.0" = {
       name = "yargs-unparser";
       packageName = "yargs-unparser";
@@ -44206,13 +44118,13 @@ let
         sha512 = "HK25qidFTCVuj/D1VfNiEndpLIeJN78aqgR23nL3y4N0U/91cOAzqfHlF8n2BvoNDcZmJKin3ddNSvOxSr8flw==";
       };
     };
-    "yarn-1.16.0" = {
+    "yarn-1.17.3" = {
       name = "yarn";
       packageName = "yarn";
-      version = "1.16.0";
+      version = "1.17.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yarn/-/yarn-1.16.0.tgz";
-        sha512 = "cfemyGlnWKA1zopUUgebTPf8C4WkPIZ+TJmklwcEAJ4u6oWPtJeAzrsamaGGh/+b1XWe8W51yzAImC4AWbWR1g==";
+        url = "https://registry.npmjs.org/yarn/-/yarn-1.17.3.tgz";
+        sha512 = "CgA8o7nRZaQvmeF/WBx2FC7f9W/0X59T2IaLYqgMo6637wfp5mMEsM3YXoJtKUspnpmDJKl/gGFhnqS+sON7hA==";
       };
     };
     "yauzl-2.10.0" = {
@@ -44323,13 +44235,13 @@ let
         sha512 = "kQz39uonEjEESwh+qCi83kcC3rZJGh4mrZW7xjkSQYXkq//JZHTtKo+6yuVloTgMtzsIWOJrjIrKvk/dqm0L5g==";
       };
     };
-    "zen-observable-ts-0.8.19" = {
+    "zen-observable-ts-0.8.20" = {
       name = "zen-observable-ts";
       packageName = "zen-observable-ts";
-      version = "0.8.19";
+      version = "0.8.20";
       src = fetchurl {
-        url = "https://registry.npmjs.org/zen-observable-ts/-/zen-observable-ts-0.8.19.tgz";
-        sha512 = "u1a2rpE13G+jSzrg3aiCqXU5tN2kw41b+cBZGmnc+30YimdkKiDj9bTowcB41eL77/17RF/h+393AuVgShyheQ==";
+        url = "https://registry.npmjs.org/zen-observable-ts/-/zen-observable-ts-0.8.20.tgz";
+        sha512 = "2rkjiPALhOtRaDX6pWyNqK1fnP5KkJJybYebopNSn6wDG1lxBoFs2+nwwXKoA6glHIrtwrfBBy6da0stkKtTAA==";
       };
     };
     "zerr-1.0.4" = {
@@ -44383,25 +44295,25 @@ in
   "@angular/cli" = nodeEnv.buildNodePackage {
     name = "_at_angular_slash_cli";
     packageName = "@angular/cli";
-    version = "8.2.0";
+    version = "8.3.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/@angular/cli/-/cli-8.2.0.tgz";
-      sha512 = "KtjC5Mge93YjPQXxEKnXzQ7pmryizfVunrcKHSwhnzfNdwqSjcfL2evl4oBT07b6RfT0nF8HWn0ATWpiLWwrXQ==";
+      url = "https://registry.npmjs.org/@angular/cli/-/cli-8.3.4.tgz";
+      sha512 = "5Jp7a1/Yepm2JkrMHY2Q7nO1FxlNvGp1Zc3m9dp4ydH08qO6/Z8WO0HF+/BxAsHZzB+XV91E1ZzbLR0RdsM8ag==";
     };
     dependencies = [
-      sources."@angular-devkit/architect-0.802.0"
-      sources."@angular-devkit/core-8.2.0"
-      sources."@angular-devkit/schematics-8.2.0"
-      sources."@schematics/angular-8.2.0"
-      sources."@schematics/update-0.802.0"
+      sources."@angular-devkit/architect-0.803.4"
+      sources."@angular-devkit/core-8.3.4"
+      sources."@angular-devkit/schematics-8.3.4"
+      sources."@schematics/angular-8.3.4"
+      sources."@schematics/update-0.803.4"
       sources."@yarnpkg/lockfile-1.1.0"
       sources."JSONStream-1.3.5"
       sources."agent-base-4.3.0"
       sources."agentkeepalive-3.5.2"
       sources."ajv-6.10.2"
       sources."ansi-colors-4.1.1"
-      sources."ansi-escapes-3.2.0"
-      sources."ansi-regex-3.0.0"
+      sources."ansi-escapes-4.2.1"
+      sources."ansi-regex-4.1.0"
       sources."ansi-styles-3.2.1"
       sources."aproba-1.2.0"
       sources."asap-2.0.6"
@@ -44416,12 +44328,12 @@ in
       sources."brace-expansion-1.1.11"
       sources."buffer-from-1.1.1"
       sources."builtins-1.0.3"
-      sources."cacache-12.0.2"
+      sources."cacache-12.0.3"
       sources."caseless-0.12.0"
       sources."chalk-2.4.2"
       sources."chardet-0.7.0"
       sources."chownr-1.1.2"
-      sources."cli-cursor-2.1.0"
+      sources."cli-cursor-3.1.0"
       sources."cli-width-2.2.0"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
@@ -44430,7 +44342,7 @@ in
       sources."concat-stream-1.6.2"
       sources."copy-concurrently-1.0.5"
       sources."core-util-is-1.0.2"
-      sources."cyclist-0.2.2"
+      sources."cyclist-1.0.1"
       sources."dashdash-1.14.1"
       sources."debug-4.1.1"
       sources."debuglog-1.0.1"
@@ -44439,10 +44351,11 @@ in
       sources."dezalgo-1.0.3"
       sources."duplexify-3.7.1"
       sources."ecc-jsbn-0.1.2"
+      sources."emoji-regex-8.0.0"
       sources."encoding-0.1.12"
       sources."end-of-stream-1.4.1"
       sources."err-code-1.1.2"
-      sources."es-abstract-1.13.0"
+      sources."es-abstract-1.14.2"
       sources."es-to-primitive-1.2.0"
       sources."es6-promise-4.2.8"
       sources."es6-promisify-5.0.0"
@@ -44453,12 +44366,12 @@ in
       sources."fast-deep-equal-2.0.1"
       sources."fast-json-stable-stringify-2.0.0"
       sources."figgy-pudding-3.5.1"
-      sources."figures-2.0.0"
+      sources."figures-3.0.0"
       sources."flush-write-stream-1.1.1"
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.3"
       sources."from2-2.3.0"
-      sources."fs-minipass-1.2.6"
+      sources."fs-minipass-1.2.7"
       sources."fs-write-stream-atomic-1.0.10"
       sources."fs.realpath-1.0.0"
       sources."function-bind-1.1.1"
@@ -44466,13 +44379,13 @@ in
       sources."get-stream-4.1.0"
       sources."getpass-0.1.7"
       sources."glob-7.1.4"
-      sources."graceful-fs-4.2.1"
+      sources."graceful-fs-4.2.2"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.3"
       sources."has-1.0.3"
       sources."has-flag-3.0.0"
       sources."has-symbols-1.0.0"
-      sources."hosted-git-info-2.8.2"
+      sources."hosted-git-info-2.8.4"
       sources."http-cache-semantics-3.8.1"
       (sources."http-proxy-agent-2.1.0" // {
         dependencies = [
@@ -44489,17 +44402,17 @@ in
       sources."humanize-ms-1.2.1"
       sources."iconv-lite-0.4.24"
       sources."iferr-0.1.5"
-      sources."ignore-walk-3.0.1"
+      sources."ignore-walk-3.0.2"
       sources."imurmurhash-0.1.4"
       sources."infer-owner-1.0.4"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."ini-1.3.5"
-      sources."inquirer-6.5.0"
+      sources."inquirer-6.5.1"
       sources."ip-1.1.5"
       sources."is-callable-1.1.4"
       sources."is-date-object-1.0.1"
-      sources."is-fullwidth-code-point-2.0.0"
+      sources."is-fullwidth-code-point-3.0.0"
       sources."is-promise-2.1.0"
       sources."is-regex-1.0.4"
       sources."is-symbol-1.0.2"
@@ -44521,50 +44434,51 @@ in
       sources."make-fetch-happen-5.0.0"
       sources."mime-db-1.40.0"
       sources."mime-types-2.1.24"
-      sources."mimic-fn-1.2.0"
+      sources."mimic-fn-2.1.0"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
-      sources."minipass-2.3.5"
-      sources."minizlib-1.2.1"
+      sources."minipass-2.6.2"
+      sources."minizlib-1.2.2"
       sources."mississippi-3.0.0"
       sources."mkdirp-0.5.1"
       sources."move-concurrently-1.0.1"
       sources."ms-2.1.2"
-      sources."mute-stream-0.0.7"
+      sources."mute-stream-0.0.8"
       sources."node-fetch-npm-2.0.2"
       (sources."normalize-package-data-2.5.0" // {
         dependencies = [
-          sources."semver-5.7.0"
+          sources."semver-5.7.1"
         ];
       })
       sources."npm-bundled-1.0.6"
       (sources."npm-package-arg-6.1.0" // {
         dependencies = [
-          sources."semver-5.7.0"
+          sources."semver-5.7.1"
         ];
       })
       sources."npm-packlist-1.4.4"
       (sources."npm-pick-manifest-2.2.3" // {
         dependencies = [
-          sources."semver-5.7.0"
+          sources."semver-5.7.1"
         ];
       })
-      sources."npm-registry-fetch-4.0.0"
+      sources."npm-registry-fetch-4.0.1"
       sources."oauth-sign-0.9.0"
+      sources."object-inspect-1.6.0"
       sources."object-keys-1.1.1"
       sources."object.getownpropertydescriptors-2.0.3"
       sources."once-1.4.0"
-      sources."onetime-2.0.1"
+      sources."onetime-5.1.0"
       sources."open-6.4.0"
       sources."os-homedir-1.0.2"
       sources."os-tmpdir-1.0.2"
       sources."osenv-0.1.5"
-      (sources."pacote-9.5.4" // {
+      (sources."pacote-9.5.5" // {
         dependencies = [
-          sources."semver-5.7.0"
+          sources."semver-5.7.1"
         ];
       })
-      sources."parallel-transform-1.1.0"
+      sources."parallel-transform-1.2.0"
       sources."path-is-absolute-1.0.1"
       sources."path-parse-1.0.6"
       sources."performance-now-2.1.0"
@@ -44572,7 +44486,7 @@ in
       sources."promise-inflight-1.0.1"
       sources."promise-retry-1.1.1"
       sources."protoduck-5.0.1"
-      sources."psl-1.3.0"
+      sources."psl-1.4.0"
       sources."pump-3.0.0"
       (sources."pumpify-1.5.1" // {
         dependencies = [
@@ -44581,7 +44495,7 @@ in
       })
       sources."punycode-2.1.1"
       sources."qs-6.5.2"
-      sources."read-package-json-2.0.13"
+      sources."read-package-json-2.1.0"
       sources."read-package-tree-5.3.1"
       (sources."readable-stream-2.3.6" // {
         dependencies = [
@@ -44591,9 +44505,9 @@ in
       sources."readdir-scoped-modules-1.1.0"
       sources."request-2.88.0"
       sources."resolve-1.12.0"
-      sources."restore-cursor-2.0.0"
+      sources."restore-cursor-3.1.0"
       sources."retry-0.10.1"
-      sources."rimraf-2.6.3"
+      sources."rimraf-2.7.1"
       sources."run-async-2.3.0"
       sources."run-queue-1.0.3"
       sources."rxjs-6.4.0"
@@ -44602,7 +44516,7 @@ in
       sources."semver-6.3.0"
       (sources."semver-intersect-1.4.0" // {
         dependencies = [
-          sources."semver-5.7.0"
+          sources."semver-5.7.1"
         ];
       })
       sources."signal-exit-3.0.2"
@@ -44624,21 +44538,15 @@ in
       sources."ssri-6.0.1"
       sources."stream-each-1.2.3"
       sources."stream-shift-1.0.0"
-      (sources."string-width-2.1.1" // {
-        dependencies = [
-          sources."strip-ansi-4.0.0"
-        ];
-      })
+      sources."string-width-4.1.0"
+      sources."string.prototype.trimleft-2.1.0"
+      sources."string.prototype.trimright-2.1.0"
       (sources."string_decoder-1.1.1" // {
         dependencies = [
           sources."safe-buffer-5.1.2"
         ];
       })
-      (sources."strip-ansi-5.2.0" // {
-        dependencies = [
-          sources."ansi-regex-4.1.0"
-        ];
-      })
+      sources."strip-ansi-5.2.0"
       sources."supports-color-5.5.0"
       sources."symbol-observable-1.2.0"
       sources."tar-4.4.10"
@@ -44653,6 +44561,7 @@ in
       sources."tslib-1.10.0"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
+      sources."type-fest-0.5.2"
       sources."typedarray-0.0.6"
       sources."unique-filename-1.1.1"
       sources."unique-slug-2.0.2"
@@ -44664,7 +44573,7 @@ in
       sources."uri-js-4.2.2"
       sources."util-deprecate-1.0.2"
       sources."util-promisify-2.1.0"
-      sources."uuid-3.3.2"
+      sources."uuid-3.3.3"
       sources."validate-npm-package-license-3.0.4"
       sources."validate-npm-package-name-3.0.0"
       sources."verror-1.10.0"
@@ -44682,41 +44591,37 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   "@antora/cli" = nodeEnv.buildNodePackage {
     name = "_at_antora_slash_cli";
     packageName = "@antora/cli";
-    version = "2.0.0";
+    version = "2.1.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/@antora/cli/-/cli-2.0.0.tgz";
-      sha512 = "vgoGTRRFkPtKeMgGoBevYzK97DwT75rxUeE6yAtm50i7e/aIGoXFyCglaXdsyP4FAfENVqN+DWy3ZuKxhPfc7g==";
+      url = "https://registry.npmjs.org/@antora/cli/-/cli-2.1.1.tgz";
+      sha512 = "U0xrC4/k2ci04u9Y1Qme6DcZNo1vcJfX8GC8JueMbe+58V6mxewE6yoIuYYCsuy+SI1D0Kbod+M8DrDnxubMSA==";
     };
     dependencies = [
-      sources."@antora/playbook-builder-2.0.0"
+      sources."@antora/playbook-builder-2.1.1"
       sources."@iarna/toml-2.2.3"
       sources."argparse-1.0.10"
       sources."camelcase-5.3.1"
-      sources."camelcase-keys-5.2.0"
-      sources."commander-2.20.0"
-      (sources."convict-4.4.1" // {
-        dependencies = [
-          sources."json5-1.0.1"
-        ];
-      })
+      sources."camelcase-keys-6.0.1"
+      sources."commander-3.0.1"
+      sources."convict-5.1.0"
       sources."decamelize-1.2.0"
-      sources."deep-freeze-0.0.1"
-      sources."depd-1.1.2"
+      sources."deep-freeze-node-1.1.3"
       sources."esprima-4.0.1"
       sources."js-yaml-3.13.1"
       sources."json5-2.1.0"
       sources."lodash.clonedeep-4.5.0"
-      sources."map-obj-3.1.0"
+      sources."map-obj-4.1.0"
       sources."minimist-1.2.0"
-      sources."moment-2.22.2"
-      sources."quick-lru-1.1.0"
+      sources."moment-2.24.0"
+      sources."quick-lru-4.0.1"
       sources."sprintf-js-1.0.3"
-      sources."validator-10.8.0"
-      sources."yargs-parser-11.0.0"
+      sources."validator-10.11.0"
+      sources."yargs-parser-13.0.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -44726,29 +44631,30 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   "@antora/site-generator-default" = nodeEnv.buildNodePackage {
     name = "_at_antora_slash_site-generator-default";
     packageName = "@antora/site-generator-default";
-    version = "2.0.0";
+    version = "2.1.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/@antora/site-generator-default/-/site-generator-default-2.0.0.tgz";
-      sha512 = "YMor7dPAef4Pqyxbz7/ZqS0k5haxtcIkmEAfTJpGthCtRhrYfOu2iH+ZntnKRCubNdSgs77CRYjpSjm43rQ7FQ==";
+      url = "https://registry.npmjs.org/@antora/site-generator-default/-/site-generator-default-2.1.1.tgz";
+      sha512 = "lXE4+gW29OM20t8z1aYyr51KQuEow7kxu4sN8TDCr+2yU0Oqx/6Nxm9zUN33hT6XkNH0oMccdcWr0Aay22Lg2w==";
     };
     dependencies = [
-      sources."@antora/asciidoc-loader-2.0.0"
-      sources."@antora/content-aggregator-2.0.0"
-      sources."@antora/content-classifier-2.0.0"
-      sources."@antora/document-converter-2.0.0"
+      sources."@antora/asciidoc-loader-2.1.1"
+      sources."@antora/content-aggregator-2.1.1"
+      sources."@antora/content-classifier-2.1.1"
+      sources."@antora/document-converter-2.1.1"
       sources."@antora/expand-path-helper-1.0.0"
-      sources."@antora/navigation-builder-2.0.0"
-      sources."@antora/page-composer-2.0.0"
-      sources."@antora/playbook-builder-2.0.0"
-      sources."@antora/redirect-producer-2.0.0"
-      sources."@antora/site-mapper-2.0.0"
-      sources."@antora/site-publisher-2.0.0"
-      sources."@antora/ui-loader-2.0.0"
-      sources."@babel/runtime-7.5.5"
+      sources."@antora/navigation-builder-2.1.1"
+      sources."@antora/page-composer-2.1.1"
+      sources."@antora/playbook-builder-2.1.1"
+      sources."@antora/redirect-producer-2.1.1"
+      sources."@antora/site-mapper-2.1.1"
+      sources."@antora/site-publisher-2.1.1"
+      sources."@antora/ui-loader-2.1.1"
+      sources."@babel/runtime-7.6.0"
       sources."@iarna/toml-2.2.3"
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
@@ -44759,12 +44665,7 @@ in
       sources."balanced-match-1.0.0"
       sources."base64-js-0.0.2"
       sources."benchmark-1.0.0"
-      (sources."bl-2.2.0" // {
-        dependencies = [
-          sources."readable-stream-2.3.6"
-          sources."string_decoder-1.1.1"
-        ];
-      })
+      sources."bl-3.0.0"
       sources."bops-0.0.7"
       sources."brace-expansion-1.1.11"
       sources."buffer-crc32-0.2.13"
@@ -44778,7 +44679,7 @@ in
         ];
       })
       sources."camelcase-5.3.1"
-      sources."camelcase-keys-5.2.0"
+      sources."camelcase-keys-6.0.1"
       sources."clean-git-ref-1.0.3"
       sources."clone-2.1.2"
       sources."clone-buffer-1.0.0"
@@ -44787,25 +44688,25 @@ in
       (sources."cloneable-readable-1.1.3" // {
         dependencies = [
           sources."readable-stream-2.3.6"
+          sources."safe-buffer-5.1.2"
           sources."string_decoder-1.1.1"
         ];
       })
       sources."commander-2.20.0"
       sources."concat-map-0.0.1"
-      sources."convert-source-map-1.6.0"
-      (sources."convict-4.4.1" // {
+      (sources."convert-source-map-1.6.0" // {
         dependencies = [
-          sources."json5-1.0.1"
+          sources."safe-buffer-5.1.2"
         ];
       })
+      sources."convict-5.1.0"
       sources."core-util-is-1.0.2"
       sources."crc-32-1.2.0"
       sources."decamelize-1.2.0"
       sources."decompress-response-3.3.0"
-      sources."deep-freeze-0.0.1"
+      sources."deep-freeze-node-1.1.3"
       sources."defer-to-connect-1.0.2"
       sources."define-properties-1.1.3"
-      sources."depd-1.1.2"
       sources."diff-3.5.0"
       sources."diff-lines-1.1.1"
       sources."duplexer-0.1.1"
@@ -44813,11 +44714,12 @@ in
       (sources."duplexify-3.7.1" // {
         dependencies = [
           sources."readable-stream-2.3.6"
+          sources."safe-buffer-5.1.2"
           sources."string_decoder-1.1.1"
         ];
       })
       sources."end-of-stream-1.4.1"
-      sources."escape-string-regexp-1.0.5"
+      sources."escape-string-regexp-2.0.0"
       sources."esprima-4.0.1"
       sources."event-stream-3.3.4"
       sources."exit-on-epipe-1.0.1"
@@ -44826,14 +44728,16 @@ in
       (sources."flush-write-stream-1.1.1" // {
         dependencies = [
           sources."readable-stream-2.3.6"
+          sources."safe-buffer-5.1.2"
           sources."string_decoder-1.1.1"
         ];
       })
       sources."from-0.1.7"
-      sources."fs-extra-7.0.1"
+      sources."fs-extra-8.1.0"
       (sources."fs-mkdirp-stream-1.0.0" // {
         dependencies = [
           sources."readable-stream-2.3.6"
+          sources."safe-buffer-5.1.2"
           sources."string_decoder-1.1.1"
           sources."through2-2.0.5"
         ];
@@ -44852,24 +44756,26 @@ in
         dependencies = [
           sources."glob-7.1.4"
           sources."readable-stream-2.3.6"
+          sources."safe-buffer-5.1.2"
           sources."string_decoder-1.1.1"
         ];
       })
       sources."globalyzer-0.1.4"
       sources."globrex-0.1.2"
       sources."got-9.6.0"
-      sources."graceful-fs-4.2.1"
+      sources."graceful-fs-4.2.2"
       (sources."gulp-vinyl-zip-2.1.2" // {
         dependencies = [
           sources."readable-stream-2.3.6"
+          sources."safe-buffer-5.1.2"
           sources."string_decoder-1.1.1"
           sources."through2-2.0.5"
         ];
       })
-      sources."handlebars-4.1.2"
+      sources."handlebars-4.2.0"
       sources."has-symbols-1.0.0"
       sources."http-cache-semantics-4.0.3"
-      sources."ignore-5.1.2"
+      sources."ignore-5.1.4"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."is-absolute-1.0.0"
@@ -44893,6 +44799,7 @@ in
       (sources."lazystream-1.0.0" // {
         dependencies = [
           sources."readable-stream-2.3.6"
+          sources."safe-buffer-5.1.2"
           sources."string_decoder-1.1.1"
         ];
       })
@@ -44900,10 +44807,10 @@ in
       sources."lodash-4.17.15"
       sources."lodash.clonedeep-4.5.0"
       sources."lowercase-keys-1.0.1"
-      sources."map-obj-3.1.0"
+      sources."map-obj-4.1.0"
       sources."map-stream-0.1.0"
       sources."marky-1.2.1"
-      sources."matcher-1.1.1"
+      sources."matcher-2.0.0"
       sources."mime-db-1.40.0"
       sources."mime-types-2.1.24"
       sources."mimic-response-1.0.1"
@@ -44911,7 +44818,7 @@ in
       sources."minimatch-all-1.1.0"
       sources."minimist-1.2.0"
       sources."minimisted-2.0.0"
-      sources."moment-2.22.2"
+      sources."moment-2.24.0"
       sources."multi-progress-2.0.0"
       sources."neo-async-2.6.1"
       sources."nick-0.1.3"
@@ -44930,6 +44837,7 @@ in
       (sources."ordered-read-streams-1.0.1" // {
         dependencies = [
           sources."readable-stream-2.3.6"
+          sources."safe-buffer-5.1.2"
           sources."string_decoder-1.1.1"
         ];
       })
@@ -44947,14 +44855,22 @@ in
       sources."pump-2.0.1"
       sources."pumpify-1.5.1"
       sources."queue-4.5.1"
-      sources."quick-lru-1.1.0"
+      sources."quick-lru-4.0.1"
       sources."readable-stream-3.4.0"
       sources."regenerator-runtime-0.13.3"
       sources."remove-bom-buffer-3.0.0"
       (sources."remove-bom-stream-1.2.0" // {
         dependencies = [
-          sources."readable-stream-2.3.6"
-          sources."string_decoder-1.1.1"
+          (sources."readable-stream-2.3.6" // {
+            dependencies = [
+              sources."safe-buffer-5.1.2"
+            ];
+          })
+          (sources."string_decoder-1.1.1" // {
+            dependencies = [
+              sources."safe-buffer-5.1.2"
+            ];
+          })
           sources."through2-2.0.5"
         ];
       })
@@ -44963,7 +44879,7 @@ in
       sources."require-from-string-2.0.2"
       sources."resolve-options-1.1.0"
       sources."responselike-1.0.2"
-      sources."safe-buffer-5.1.2"
+      sources."safe-buffer-5.2.0"
       sources."sha.js-2.4.11"
       sources."simple-concat-1.0.0"
       sources."simple-get-3.0.3"
@@ -44974,12 +44890,13 @@ in
       sources."stream-combiner-0.0.4"
       sources."stream-shift-1.0.0"
       sources."stream-source-0.3.5"
-      sources."string_decoder-1.2.0"
+      sources."string_decoder-1.3.0"
       sources."through-2.3.8"
       sources."through2-3.0.1"
       (sources."through2-filter-3.0.0" // {
         dependencies = [
           sources."readable-stream-2.3.6"
+          sources."safe-buffer-5.1.2"
           sources."string_decoder-1.1.1"
           sources."through2-2.0.5"
         ];
@@ -44989,6 +44906,7 @@ in
       (sources."to-through-2.0.0" // {
         dependencies = [
           sources."readable-stream-2.3.6"
+          sources."safe-buffer-5.1.2"
           sources."string_decoder-1.1.1"
           sources."through2-2.0.5"
         ];
@@ -45000,13 +44918,14 @@ in
       sources."universalify-0.1.2"
       sources."url-parse-lax-3.0.0"
       sources."util-deprecate-1.0.2"
-      sources."validator-10.8.0"
+      sources."validator-10.11.0"
       sources."value-or-function-3.0.0"
       sources."varint-0.0.3"
       sources."vinyl-2.2.0"
       (sources."vinyl-fs-3.0.3" // {
         dependencies = [
           sources."readable-stream-2.3.6"
+          sources."safe-buffer-5.1.2"
           sources."string_decoder-1.1.1"
           sources."through2-2.0.5"
         ];
@@ -45017,7 +44936,7 @@ in
       sources."xdg-basedir-3.0.0"
       sources."xmlhttprequest-1.8.0"
       sources."xtend-4.0.2"
-      sources."yargs-parser-11.0.0"
+      sources."yargs-parser-13.0.0"
       sources."yauzl-2.10.0"
       sources."yazl-2.5.1"
     ];
@@ -45029,30 +44948,31 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   "@vue/cli" = nodeEnv.buildNodePackage {
     name = "_at_vue_slash_cli";
     packageName = "@vue/cli";
-    version = "3.10.0";
+    version = "3.11.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/@vue/cli/-/cli-3.10.0.tgz";
-      sha512 = "0A2wsUPAoiiqr4B/EAlz1SPUNbq0pbyt4I8V6fiwie5oJXaxfJ8Vl8rpSUsZ2PzwpowgdiutjFkOxvFmhHAkQQ==";
+      url = "https://registry.npmjs.org/@vue/cli/-/cli-3.11.0.tgz";
+      sha512 = "dhnkqsg1TRyaauKl7j8b0n5N8vB1Vm6cBqU4n2Re0LeYzO4UUE6KlOAt1zTVn+5Nx45V1NAoPWff1iefPDTT8g==";
     };
     dependencies = [
       sources."@akryum/winattr-3.0.0"
       sources."@apollographql/apollo-tools-0.4.0"
       sources."@apollographql/graphql-playground-html-1.6.24"
       sources."@babel/code-frame-7.5.5"
-      (sources."@babel/core-7.5.5" // {
+      (sources."@babel/core-7.6.0" // {
         dependencies = [
-          sources."semver-5.7.0"
+          sources."semver-5.7.1"
         ];
       })
-      sources."@babel/generator-7.5.5"
+      sources."@babel/generator-7.6.0"
       sources."@babel/helper-annotate-as-pure-7.0.0"
       sources."@babel/helper-builder-binary-assignment-operator-visitor-7.1.0"
       sources."@babel/helper-call-delegate-7.4.4"
-      sources."@babel/helper-create-class-features-plugin-7.5.5"
+      sources."@babel/helper-create-class-features-plugin-7.6.0"
       sources."@babel/helper-define-map-7.5.5"
       sources."@babel/helper-explode-assignable-expression-7.1.0"
       sources."@babel/helper-function-name-7.1.0"
@@ -45069,9 +44989,9 @@ in
       sources."@babel/helper-simple-access-7.1.0"
       sources."@babel/helper-split-export-declaration-7.4.4"
       sources."@babel/helper-wrap-function-7.2.0"
-      sources."@babel/helpers-7.5.5"
+      sources."@babel/helpers-7.6.0"
       sources."@babel/highlight-7.5.0"
-      sources."@babel/parser-7.5.5"
+      sources."@babel/parser-7.6.0"
       sources."@babel/plugin-proposal-async-generator-functions-7.2.0"
       sources."@babel/plugin-proposal-class-properties-7.5.5"
       sources."@babel/plugin-proposal-dynamic-import-7.5.0"
@@ -45089,10 +45009,10 @@ in
       sources."@babel/plugin-transform-arrow-functions-7.2.0"
       sources."@babel/plugin-transform-async-to-generator-7.5.0"
       sources."@babel/plugin-transform-block-scoped-functions-7.2.0"
-      sources."@babel/plugin-transform-block-scoping-7.5.5"
+      sources."@babel/plugin-transform-block-scoping-7.6.0"
       sources."@babel/plugin-transform-classes-7.5.5"
       sources."@babel/plugin-transform-computed-properties-7.2.0"
-      sources."@babel/plugin-transform-destructuring-7.5.0"
+      sources."@babel/plugin-transform-destructuring-7.6.0"
       sources."@babel/plugin-transform-dotall-regex-7.4.4"
       sources."@babel/plugin-transform-duplicate-keys-7.5.0"
       sources."@babel/plugin-transform-exponentiation-operator-7.2.0"
@@ -45102,10 +45022,10 @@ in
       sources."@babel/plugin-transform-literals-7.2.0"
       sources."@babel/plugin-transform-member-expression-literals-7.2.0"
       sources."@babel/plugin-transform-modules-amd-7.5.0"
-      sources."@babel/plugin-transform-modules-commonjs-7.5.0"
+      sources."@babel/plugin-transform-modules-commonjs-7.6.0"
       sources."@babel/plugin-transform-modules-systemjs-7.5.0"
       sources."@babel/plugin-transform-modules-umd-7.2.0"
-      sources."@babel/plugin-transform-named-capturing-groups-regex-7.4.5"
+      sources."@babel/plugin-transform-named-capturing-groups-regex-7.6.0"
       sources."@babel/plugin-transform-new-target-7.4.4"
       sources."@babel/plugin-transform-object-super-7.5.5"
       sources."@babel/plugin-transform-parameters-7.4.4"
@@ -45117,28 +45037,24 @@ in
       sources."@babel/plugin-transform-sticky-regex-7.2.0"
       sources."@babel/plugin-transform-template-literals-7.4.4"
       sources."@babel/plugin-transform-typeof-symbol-7.2.0"
-      sources."@babel/plugin-transform-typescript-7.5.5"
+      sources."@babel/plugin-transform-typescript-7.6.0"
       sources."@babel/plugin-transform-unicode-regex-7.4.4"
-      (sources."@babel/preset-env-7.5.5" // {
+      (sources."@babel/preset-env-7.6.0" // {
         dependencies = [
-          sources."semver-5.7.0"
+          sources."semver-5.7.1"
         ];
       })
       sources."@babel/preset-flow-7.0.0"
-      sources."@babel/preset-typescript-7.3.3"
-      sources."@babel/register-7.5.5"
-      sources."@babel/template-7.4.4"
-      sources."@babel/traverse-7.5.5"
-      sources."@babel/types-7.5.5"
-      sources."@hapi/address-2.0.0"
-      sources."@hapi/hoek-6.2.4"
-      sources."@hapi/joi-15.1.0"
-      sources."@hapi/marker-1.0.0"
-      (sources."@hapi/topo-3.1.2" // {
-        dependencies = [
-          sources."@hapi/hoek-8.1.0"
-        ];
-      })
+      sources."@babel/preset-typescript-7.6.0"
+      sources."@babel/register-7.6.0"
+      sources."@babel/template-7.6.0"
+      sources."@babel/traverse-7.6.0"
+      sources."@babel/types-7.6.1"
+      sources."@hapi/address-2.1.1"
+      sources."@hapi/bourne-1.3.2"
+      sources."@hapi/hoek-8.2.4"
+      sources."@hapi/joi-15.1.1"
+      sources."@hapi/topo-3.1.3"
       sources."@mrmlnc/readdir-enhanced-2.2.1"
       sources."@nodelib/fs.stat-1.1.3"
       sources."@protobufjs/aspromise-1.1.2"
@@ -45152,36 +45068,36 @@ in
       sources."@protobufjs/pool-1.1.0"
       sources."@protobufjs/utf8-1.1.0"
       sources."@types/accepts-1.3.5"
-      sources."@types/body-parser-1.17.0"
+      sources."@types/body-parser-1.17.1"
       sources."@types/connect-3.4.32"
-      sources."@types/cookies-0.7.2"
-      sources."@types/cors-2.8.5"
+      sources."@types/cookies-0.7.3"
+      sources."@types/cors-2.8.6"
       sources."@types/events-3.0.0"
-      sources."@types/express-4.17.0"
-      sources."@types/express-serve-static-core-4.16.7"
+      sources."@types/express-4.17.1"
+      sources."@types/express-serve-static-core-4.16.9"
+      sources."@types/fs-capacitor-2.0.0"
       sources."@types/glob-7.1.1"
-      sources."@types/graphql-14.2.3"
-      sources."@types/graphql-upload-8.0.0"
-      sources."@types/http-assert-1.5.0"
+      sources."@types/graphql-upload-8.0.3"
+      sources."@types/http-assert-1.5.1"
       sources."@types/keygrip-1.0.1"
       sources."@types/koa-2.0.49"
       sources."@types/koa-compose-3.2.4"
       sources."@types/long-4.0.0"
       sources."@types/mime-2.0.1"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-12.6.9"
+      sources."@types/node-12.7.5"
       sources."@types/range-parser-1.2.3"
-      sources."@types/serve-static-1.13.2"
-      sources."@types/ws-6.0.2"
+      sources."@types/serve-static-1.13.3"
+      sources."@types/ws-6.0.3"
       sources."@types/zen-observable-0.8.0"
-      sources."@vue/cli-shared-utils-3.10.0"
-      (sources."@vue/cli-ui-3.10.0" // {
+      sources."@vue/cli-shared-utils-3.11.0"
+      (sources."@vue/cli-ui-3.11.0" // {
         dependencies = [
           sources."clone-2.1.2"
         ];
       })
-      sources."@vue/cli-ui-addon-webpack-3.10.0"
-      sources."@vue/cli-ui-addon-widgets-3.10.0"
+      sources."@vue/cli-ui-addon-webpack-3.11.0"
+      sources."@vue/cli-ui-addon-widgets-3.11.0"
       sources."@wry/context-0.4.4"
       sources."@wry/equality-0.1.9"
       sources."abbrev-1.1.1"
@@ -45198,36 +45114,28 @@ in
         ];
       })
       sources."apollo-cache-1.3.2"
-      (sources."apollo-cache-control-0.8.1" // {
-        dependencies = [
-          sources."graphql-extensions-0.8.1"
-        ];
-      })
-      sources."apollo-cache-inmemory-1.6.2"
-      sources."apollo-client-2.6.3"
-      sources."apollo-datasource-0.6.1"
-      sources."apollo-engine-reporting-1.4.3"
+      sources."apollo-cache-control-0.8.4"
+      sources."apollo-cache-inmemory-1.6.3"
+      sources."apollo-client-2.6.4"
+      sources."apollo-datasource-0.6.3"
+      sources."apollo-engine-reporting-1.4.6"
       sources."apollo-engine-reporting-protobuf-0.4.0"
       sources."apollo-env-0.5.1"
       sources."apollo-graphql-0.3.3"
-      sources."apollo-link-1.2.12"
-      sources."apollo-link-context-1.0.18"
-      sources."apollo-link-http-common-0.2.14"
+      sources."apollo-link-1.2.13"
+      sources."apollo-link-context-1.0.19"
+      sources."apollo-link-http-common-0.2.15"
       sources."apollo-link-persisted-queries-0.2.2"
       sources."apollo-link-state-0.4.2"
-      sources."apollo-link-ws-1.0.18"
+      sources."apollo-link-ws-1.0.19"
       sources."apollo-server-caching-0.5.0"
-      sources."apollo-server-core-2.8.1"
-      sources."apollo-server-env-2.4.1"
-      sources."apollo-server-errors-2.3.1"
-      sources."apollo-server-express-2.8.1"
-      sources."apollo-server-plugin-base-0.6.1"
-      sources."apollo-server-types-0.2.1"
-      (sources."apollo-tracing-0.8.1" // {
-        dependencies = [
-          sources."graphql-extensions-0.8.1"
-        ];
-      })
+      sources."apollo-server-core-2.9.3"
+      sources."apollo-server-env-2.4.3"
+      sources."apollo-server-errors-2.3.3"
+      sources."apollo-server-express-2.9.3"
+      sources."apollo-server-plugin-base-0.6.4"
+      sources."apollo-server-types-0.2.4"
+      sources."apollo-tracing-0.8.4"
       sources."apollo-upload-client-10.0.1"
       sources."apollo-utilities-1.3.2"
       sources."arg-4.1.1"
@@ -45235,10 +45143,7 @@ in
       sources."arr-diff-4.0.0"
       sources."arr-flatten-1.1.0"
       sources."arr-union-3.1.0"
-      sources."array-filter-0.0.1"
       sources."array-flatten-1.1.1"
-      sources."array-map-0.0.0"
-      sources."array-reduce-0.0.0"
       sources."array-union-1.0.2"
       sources."array-uniq-1.0.3"
       sources."array-unique-0.3.2"
@@ -45279,8 +45184,8 @@ in
       sources."boxen-1.3.0"
       sources."brace-expansion-1.1.11"
       sources."braces-2.3.2"
-      sources."browserslist-4.6.6"
-      sources."buffer-5.2.1"
+      sources."browserslist-4.7.0"
+      sources."buffer-5.4.3"
       sources."buffer-alloc-1.2.0"
       sources."buffer-alloc-unsafe-1.1.0"
       sources."buffer-crc32-0.2.13"
@@ -45299,7 +45204,7 @@ in
       sources."chalk-2.4.2"
       sources."chardet-0.7.0"
       sources."cheerio-1.0.0-rc.3"
-      sources."chokidar-2.1.6"
+      sources."chokidar-2.1.8"
       sources."ci-info-1.6.0"
       (sources."class-utils-0.3.6" // {
         dependencies = [
@@ -45325,7 +45230,7 @@ in
       sources."cli-width-2.2.0"
       sources."clipboard-2.0.4"
       sources."clone-1.0.4"
-      sources."cmd-shim-2.0.2"
+      sources."cmd-shim-2.1.0"
       sources."collection-visit-1.0.0"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
@@ -45343,9 +45248,8 @@ in
       sources."cookie-0.4.0"
       sources."cookie-signature-1.0.6"
       sources."copy-descriptor-0.1.1"
-      sources."core-js-3.1.4"
-      sources."core-js-compat-3.1.4"
-      sources."core-js-pure-3.1.4"
+      sources."core-js-3.2.1"
+      sources."core-js-compat-3.2.1"
       sources."core-util-is-1.0.2"
       sources."cors-2.8.5"
       sources."create-error-class-3.0.2"
@@ -45416,13 +45320,13 @@ in
       sources."easy-stack-1.0.0"
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
-      sources."ejs-2.6.2"
-      sources."electron-to-chromium-1.3.215"
+      sources."ejs-2.7.1"
+      sources."electron-to-chromium-1.3.260"
       sources."encodeurl-1.0.2"
       sources."end-of-stream-1.4.1"
       sources."entities-1.1.2"
       sources."envinfo-7.3.1"
-      sources."es-abstract-1.13.0"
+      sources."es-abstract-1.14.2"
       sources."es-to-primitive-1.2.0"
       sources."escape-html-1.0.3"
       sources."escape-string-regexp-1.0.5"
@@ -45437,7 +45341,7 @@ in
         dependencies = [
           sources."cross-spawn-6.0.5"
           sources."get-stream-4.1.0"
-          sources."semver-5.7.0"
+          sources."semver-5.7.1"
         ];
       })
       (sources."expand-brackets-2.1.4" // {
@@ -45493,12 +45397,12 @@ in
         dependencies = [
           sources."make-dir-2.1.0"
           sources."pify-4.0.1"
-          sources."semver-5.7.0"
+          sources."semver-5.7.1"
         ];
       })
       sources."find-up-3.0.0"
       sources."fkill-6.2.0"
-      sources."flow-parser-0.104.0"
+      sources."flow-parser-0.107.0"
       sources."for-in-1.0.2"
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.3"
@@ -45538,15 +45442,15 @@ in
       })
       sources."good-listener-1.2.2"
       sources."got-6.7.1"
-      sources."graceful-fs-4.2.1"
+      sources."graceful-fs-4.2.2"
       sources."graceful-readlink-1.0.1"
-      sources."graphql-14.4.2"
+      sources."graphql-14.5.6"
       (sources."graphql-anywhere-4.2.4" // {
         dependencies = [
           sources."ts-invariant-0.3.3"
         ];
       })
-      sources."graphql-extensions-0.9.1"
+      sources."graphql-extensions-0.10.3"
       sources."graphql-subscriptions-1.1.0"
       sources."graphql-tag-2.10.1"
       sources."graphql-tools-4.0.5"
@@ -45587,7 +45491,7 @@ in
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."ini-1.3.5"
-      sources."inquirer-6.5.0"
+      sources."inquirer-6.5.2"
       sources."into-stream-2.0.1"
       sources."invariant-2.2.4"
       sources."ipaddr.js-1.9.0"
@@ -45619,7 +45523,7 @@ in
       sources."is-property-1.0.2"
       sources."is-redirect-1.0.0"
       sources."is-regex-1.0.4"
-      sources."is-retry-allowed-1.1.0"
+      sources."is-retry-allowed-1.2.0"
       sources."is-stream-1.1.0"
       sources."is-symbol-1.0.2"
       sources."is-typedarray-1.0.0"
@@ -45651,7 +45555,6 @@ in
       sources."json-stringify-safe-5.0.1"
       sources."json5-2.1.0"
       sources."jsonfile-4.0.0"
-      sources."jsonify-0.0.0"
       sources."jsprim-1.4.1"
       sources."kind-of-6.0.2"
       sources."latest-version-3.1.0"
@@ -45674,7 +45577,7 @@ in
       sources."media-typer-0.3.0"
       sources."merge-1.2.1"
       sources."merge-descriptors-1.0.1"
-      sources."merge2-1.2.4"
+      sources."merge2-1.3.0"
       sources."methods-1.1.2"
       (sources."micromatch-3.1.10" // {
         dependencies = [
@@ -45702,7 +45605,7 @@ in
       sources."ms-2.0.0"
       sources."mute-stream-0.0.7"
       sources."nan-2.14.0"
-      sources."nanoid-2.0.3"
+      sources."nanoid-2.1.1"
       (sources."nanomatch-1.2.13" // {
         dependencies = [
           sources."extend-shallow-3.0.2"
@@ -45722,21 +45625,21 @@ in
       sources."node-fetch-2.6.0"
       sources."node-ipc-9.1.1"
       sources."node-modules-regexp-1.0.0"
-      (sources."node-notifier-5.4.2" // {
+      (sources."node-notifier-5.4.3" // {
         dependencies = [
-          sources."is-wsl-2.1.0"
+          sources."semver-5.7.1"
         ];
       })
-      (sources."node-releases-1.1.26" // {
+      (sources."node-releases-1.1.32" // {
         dependencies = [
-          sources."semver-5.7.0"
+          sources."semver-5.7.1"
         ];
       })
-      (sources."nodemon-1.19.1" // {
+      (sources."nodemon-1.19.2" // {
         dependencies = [
           sources."debug-3.2.6"
           sources."ms-2.1.2"
-          sources."semver-5.7.0"
+          sources."semver-5.7.1"
         ];
       })
       sources."nopt-1.0.10"
@@ -45759,6 +45662,7 @@ in
           sources."kind-of-3.2.2"
         ];
       })
+      sources."object-inspect-1.6.0"
       sources."object-keys-1.1.1"
       sources."object-path-0.11.4"
       sources."object-visit-1.0.1"
@@ -45769,16 +45673,16 @@ in
       sources."once-1.4.0"
       sources."onetime-2.0.1"
       sources."open-6.4.0"
-      sources."optimism-0.9.6"
+      sources."optimism-0.10.3"
       sources."ora-3.4.0"
       sources."os-tmpdir-1.0.2"
       sources."p-finally-1.0.0"
-      sources."p-limit-2.2.0"
+      sources."p-limit-2.2.1"
       sources."p-locate-3.0.0"
       sources."p-try-2.2.0"
       (sources."package-json-4.0.1" // {
         dependencies = [
-          sources."semver-5.7.0"
+          sources."semver-5.7.1"
         ];
       })
       sources."parse-git-config-2.0.3"
@@ -45806,7 +45710,7 @@ in
       sources."pinkie-promise-2.0.1"
       sources."pirates-4.0.1"
       sources."pkg-dir-3.0.0"
-      (sources."portfinder-1.0.21" // {
+      (sources."portfinder-1.0.24" // {
         dependencies = [
           sources."debug-2.6.9"
         ];
@@ -45820,13 +45724,13 @@ in
       sources."proto-list-1.2.4"
       (sources."protobufjs-6.8.8" // {
         dependencies = [
-          sources."@types/node-10.14.14"
+          sources."@types/node-10.14.18"
         ];
       })
       sources."proxy-addr-2.0.5"
       sources."ps-list-4.1.0"
       sources."pseudomap-1.0.2"
-      sources."psl-1.3.0"
+      sources."psl-1.4.0"
       sources."pstree.remy-1.1.7"
       sources."pump-3.0.0"
       sources."punycode-2.1.1"
@@ -45856,8 +45760,8 @@ in
           sources."is-extendable-1.0.1"
         ];
       })
-      sources."regexp-tree-0.1.11"
-      sources."regexpu-core-4.5.4"
+      sources."regexp-tree-0.1.13"
+      sources."regexpu-core-4.6.0"
       sources."registry-auth-token-3.4.0"
       sources."registry-url-3.1.0"
       sources."regjsgen-0.5.0"
@@ -45881,10 +45785,10 @@ in
       sources."restore-cursor-2.0.0"
       sources."ret-0.1.15"
       sources."retry-0.12.0"
-      sources."rimraf-2.6.3"
+      sources."rimraf-2.7.1"
       sources."rss-parser-3.7.2"
       sources."run-async-2.3.0"
-      sources."rxjs-6.5.2"
+      sources."rxjs-6.5.3"
       sources."safe-buffer-5.1.2"
       sources."safe-regex-1.1.0"
       sources."safer-buffer-2.1.2"
@@ -45899,7 +45803,7 @@ in
       sources."semver-6.3.0"
       (sources."semver-diff-2.1.0" // {
         dependencies = [
-          sources."semver-5.7.0"
+          sources."semver-5.7.1"
         ];
       })
       (sources."send-0.17.1" // {
@@ -45918,9 +45822,9 @@ in
       sources."sha.js-2.4.11"
       sources."shebang-command-1.2.0"
       sources."shebang-regex-1.0.0"
-      sources."shell-quote-1.6.1"
+      sources."shell-quote-1.7.2"
       sources."shellwords-0.1.1"
-      sources."shortid-2.2.14"
+      sources."shortid-2.2.15"
       sources."signal-exit-3.0.2"
       sources."slash-2.0.0"
       (sources."snapdragon-0.8.2" // {
@@ -45996,6 +45900,8 @@ in
         ];
       })
       sources."string.prototype.padstart-3.0.0"
+      sources."string.prototype.trimleft-2.1.0"
+      sources."string.prototype.trimright-2.1.0"
       sources."string_decoder-1.1.1"
       sources."strip-ansi-5.2.0"
       sources."strip-dirs-2.1.0"
@@ -46055,12 +45961,12 @@ in
       sources."trim-repeated-1.0.0"
       sources."trim-right-1.0.1"
       sources."ts-invariant-0.4.4"
-      sources."ts-node-8.3.0"
+      sources."ts-node-8.4.1"
       sources."tslib-1.10.0"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."type-is-1.6.18"
-      sources."typescript-3.5.3"
+      sources."typescript-3.6.3"
       sources."unbzip2-stream-1.3.3"
       (sources."undefsafe-2.0.2" // {
         dependencies = [
@@ -46086,7 +45992,7 @@ in
         ];
       })
       sources."unzip-response-2.0.1"
-      sources."upath-1.1.2"
+      sources."upath-1.2.0"
       sources."update-notifier-2.5.0"
       sources."uri-js-4.2.2"
       sources."urix-0.1.0"
@@ -46096,7 +46002,7 @@ in
       sources."util-deprecate-1.0.2"
       sources."util.promisify-1.0.0"
       sources."utils-merge-1.0.1"
-      sources."uuid-3.3.2"
+      sources."uuid-3.3.3"
       sources."validate-npm-package-name-3.0.0"
       sources."vary-1.1.2"
       sources."verror-1.10.0"
@@ -46116,8 +46022,8 @@ in
       sources."write-file-atomic-2.4.3"
       sources."ws-6.2.1"
       sources."xdg-basedir-3.0.0"
-      sources."xml2js-0.4.19"
-      sources."xmlbuilder-9.0.7"
+      sources."xml2js-0.4.22"
+      sources."xmlbuilder-11.0.1"
       sources."xtend-4.0.2"
       sources."yallist-3.0.3"
       (sources."yaml-front-matter-3.4.1" // {
@@ -46128,7 +46034,7 @@ in
       sources."yauzl-2.10.0"
       sources."yn-3.1.1"
       sources."zen-observable-0.8.14"
-      sources."zen-observable-ts-0.8.19"
+      sources."zen-observable-ts-0.8.20"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -46138,6 +46044,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   "@webassemblyjs/cli" = nodeEnv.buildNodePackage {
     name = "_at_webassemblyjs_slash_cli";
@@ -46176,6 +46083,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   "@webassemblyjs/repl" = nodeEnv.buildNodePackage {
     name = "_at_webassemblyjs_slash_repl";
@@ -46214,6 +46122,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   "@webassemblyjs/wasm-strip" = nodeEnv.buildNodePackage {
     name = "_at_webassemblyjs_slash_wasm-strip";
@@ -46250,6 +46159,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   "@webassemblyjs/wasm-text-gen" = nodeEnv.buildNodePackage {
     name = "_at_webassemblyjs_slash_wasm-text-gen";
@@ -46261,11 +46171,11 @@ in
     };
     dependencies = [
       sources."@babel/code-frame-7.5.5"
-      sources."@babel/generator-7.5.5"
+      sources."@babel/generator-7.6.0"
       sources."@babel/highlight-7.5.0"
-      sources."@babel/parser-7.5.5"
-      sources."@babel/template-7.4.4"
-      sources."@babel/types-7.5.5"
+      sources."@babel/parser-7.6.0"
+      sources."@babel/template-7.6.0"
+      sources."@babel/types-7.6.1"
       sources."@webassemblyjs/ast-1.8.5"
       sources."@webassemblyjs/floating-point-hex-parser-1.8.5"
       sources."@webassemblyjs/helper-api-error-1.8.5"
@@ -46305,6 +46215,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   "@webassemblyjs/wast-refmt" = nodeEnv.buildNodePackage {
     name = "_at_webassemblyjs_slash_wast-refmt";
@@ -46334,23 +46245,24 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   alloy = nodeEnv.buildNodePackage {
     name = "alloy";
     packageName = "alloy";
-    version = "1.14.0";
+    version = "1.14.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/alloy/-/alloy-1.14.0.tgz";
-      sha512 = "42iwEb64YKWuX7E73Q6zIz7/eP6p3SvacSR02LVoTfveitVXTXw5lzW9JFmBQRqua1kdN+YeaPgx8ocz8Ea3wQ==";
+      url = "https://registry.npmjs.org/alloy/-/alloy-1.14.1.tgz";
+      sha512 = "AbKwsUIrmy4jj6QbQr9QZcDRtmEw1vp+cx9BoX+0KHi+pDu9ZoFFYN1hIkojlnGWzd1R2xZshB/p8LsMyZ1ndw==";
     };
     dependencies = [
       sources."@babel/code-frame-7.5.5"
-      (sources."@babel/core-7.5.5" // {
+      (sources."@babel/core-7.6.0" // {
         dependencies = [
           sources."source-map-0.5.7"
         ];
       })
-      (sources."@babel/generator-7.5.5" // {
+      (sources."@babel/generator-7.6.0" // {
         dependencies = [
           sources."source-map-0.5.7"
         ];
@@ -46358,12 +46270,12 @@ in
       sources."@babel/helper-function-name-7.1.0"
       sources."@babel/helper-get-function-arity-7.0.0"
       sources."@babel/helper-split-export-declaration-7.4.4"
-      sources."@babel/helpers-7.5.5"
+      sources."@babel/helpers-7.6.0"
       sources."@babel/highlight-7.5.0"
-      sources."@babel/parser-7.5.5"
-      sources."@babel/template-7.4.4"
-      sources."@babel/traverse-7.5.5"
-      sources."@babel/types-7.5.5"
+      sources."@babel/parser-7.6.0"
+      sources."@babel/template-7.6.0"
+      sources."@babel/traverse-7.6.0"
+      sources."@babel/types-7.6.1"
       sources."JSV-4.0.2"
       sources."ansi-styles-3.2.1"
       sources."array-unique-0.3.2"
@@ -46396,7 +46308,7 @@ in
         ];
       })
       sources."globals-11.12.0"
-      sources."graceful-fs-4.2.1"
+      sources."graceful-fs-4.2.2"
       sources."has-color-0.1.7"
       sources."has-flag-3.0.0"
       sources."homedir-polyfill-1.0.3"
@@ -46428,7 +46340,7 @@ in
       sources."resolve-1.12.0"
       sources."safe-buffer-5.1.2"
       sources."sax-0.5.8"
-      sources."semver-5.7.0"
+      sources."semver-5.7.1"
       sources."source-map-0.6.1"
       sources."strip-ansi-0.1.1"
       sources."supports-color-5.5.0"
@@ -46450,6 +46362,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   asar = nodeEnv.buildNodePackage {
     name = "asar";
@@ -46476,7 +46389,7 @@ in
       sources."mkdirp-0.5.1"
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
-      sources."rimraf-2.6.3"
+      sources."rimraf-2.7.1"
       sources."tmp-0.1.0"
       sources."tmp-promise-1.1.0"
       sources."wrappy-1.0.2"
@@ -46489,6 +46402,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   azure-cli = nodeEnv.buildNodePackage {
     name = "azure-cli";
@@ -46499,7 +46413,7 @@ in
       sha512 = "MMiK5sFfIocNMWCc5PshUCAe6aY4P13/GCmSwudOziA/pFdQMHU8jhu+jU2SSWFug4K1ugeuCwtMXe43oL0PhQ==";
     };
     dependencies = [
-      sources."@types/node-8.10.51"
+      sources."@types/node-8.10.54"
       sources."JSV-4.0.2"
       sources."adal-node-0.1.28"
       sources."ajv-6.10.2"
@@ -46589,16 +46503,16 @@ in
       (sources."azure-common-0.9.22" // {
         dependencies = [
           sources."validator-9.4.1"
-          (sources."xml2js-0.4.19" // {
+          (sources."xml2js-0.4.22" // {
             dependencies = [
-              sources."xmlbuilder-9.0.7"
+              sources."xmlbuilder-11.0.1"
             ];
           })
         ];
       })
       sources."azure-gallery-2.0.0-pre.18"
       sources."azure-graph-2.2.0"
-      sources."azure-keyvault-3.0.4"
+      sources."azure-keyvault-3.0.5"
       (sources."azure-monitoring-0.10.6" // {
         dependencies = [
           sources."underscore-1.9.1"
@@ -46654,14 +46568,17 @@ in
       })
       sources."date-utils-1.2.21"
       sources."dateformat-1.0.2-1.2.3"
-      sources."deep-equal-1.0.1"
+      sources."deep-equal-1.1.0"
       sources."defaults-1.0.3"
+      sources."define-properties-1.1.3"
       sources."delayed-stream-1.0.0"
       sources."duplexer-0.1.1"
       sources."easy-table-1.1.0"
       sources."ecc-jsbn-0.1.2"
       sources."ecdsa-sig-formatter-1.0.11"
       sources."envconf-0.0.4"
+      sources."es-abstract-1.14.2"
+      sources."es-to-primitive-1.2.0"
       sources."escape-string-regexp-1.0.5"
       sources."event-stream-3.1.5"
       sources."extend-3.0.2"
@@ -46679,6 +46596,7 @@ in
       })
       sources."from-0.1.7"
       sources."fs.realpath-1.0.0"
+      sources."function-bind-1.1.1"
       sources."galaxy-0.1.12"
       sources."generate-function-2.3.1"
       sources."generate-object-property-1.2.0"
@@ -46695,8 +46613,10 @@ in
           sources."commander-2.20.0"
         ];
       })
+      sources."has-1.0.3"
       sources."has-ansi-2.0.0"
       sources."has-color-0.1.7"
+      sources."has-symbols-1.0.0"
       sources."hash-base-3.0.4"
       sources."hawk-3.1.3"
       sources."hoek-2.16.3"
@@ -46706,11 +46626,16 @@ in
       sources."i-0.3.6"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
+      sources."is-arguments-1.0.4"
       sources."is-buffer-1.1.6"
+      sources."is-callable-1.1.4"
+      sources."is-date-object-1.0.1"
       sources."is-my-ip-valid-1.0.0"
       sources."is-my-json-valid-2.20.0"
       sources."is-property-1.0.2"
+      sources."is-regex-1.0.4"
       sources."is-stream-1.1.0"
+      sources."is-symbol-1.0.2"
       sources."is-typedarray-1.0.0"
       sources."isarray-1.0.0"
       sources."isstream-0.1.2"
@@ -46773,6 +46698,10 @@ in
         ];
       })
       sources."oauth-sign-0.8.2"
+      sources."object-inspect-1.6.0"
+      sources."object-is-1.0.1"
+      sources."object-keys-1.1.1"
+      sources."object.getownpropertydescriptors-2.0.3"
       sources."omelette-0.3.2"
       sources."once-1.4.0"
       sources."openssl-wrapper-0.3.4"
@@ -46797,7 +46726,7 @@ in
           })
         ];
       })
-      sources."psl-1.3.0"
+      sources."psl-1.4.0"
       sources."punycode-1.4.1"
       sources."qs-6.2.3"
       sources."read-1.0.7"
@@ -46806,6 +46735,7 @@ in
           sources."isarray-0.0.1"
         ];
       })
+      sources."regexp.prototype.flags-1.2.0"
       (sources."request-2.88.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
@@ -46821,7 +46751,7 @@ in
         ];
       })
       sources."revalidator-0.1.8"
-      sources."rimraf-2.6.3"
+      sources."rimraf-2.7.1"
       sources."safe-buffer-5.2.0"
       sources."safer-buffer-2.1.2"
       sources."sax-1.2.4"
@@ -46842,6 +46772,8 @@ in
       sources."stream-combiner-0.0.4"
       sources."streamline-0.10.17"
       sources."streamline-streams-0.1.5"
+      sources."string.prototype.trimleft-2.1.0"
+      sources."string.prototype.trimright-2.1.0"
       sources."string_decoder-0.10.31"
       sources."stringstream-0.0.6"
       sources."strip-ansi-3.0.1"
@@ -46862,12 +46794,13 @@ in
       })
       sources."user-home-2.0.0"
       sources."util-deprecate-1.0.2"
+      sources."util.promisify-1.0.0"
       (sources."utile-0.2.1" // {
         dependencies = [
           sources."async-0.2.10"
         ];
       })
-      sources."uuid-3.3.2"
+      sources."uuid-3.3.3"
       sources."validator-5.2.0"
       (sources."verror-1.10.0" // {
         dependencies = [
@@ -46898,14 +46831,15 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   azure-functions-core-tools = nodeEnv.buildNodePackage {
     name = "azure-functions-core-tools";
     packageName = "azure-functions-core-tools";
-    version = "2.7.1505";
+    version = "2.7.1585";
     src = fetchurl {
-      url = "https://registry.npmjs.org/azure-functions-core-tools/-/azure-functions-core-tools-2.7.1505.tgz";
-      sha512 = "3v1lDv6zwhGi2Qb8rNFA3tR+8h/vlufuanRgbw2ofPCPBCC29yiyQs2+IiCTBHVAxcBPN0h5rsELstoZ3S2Odw==";
+      url = "https://registry.npmjs.org/azure-functions-core-tools/-/azure-functions-core-tools-2.7.1585.tgz";
+      sha512 = "jxtiDsa1M5eMmXyjrkX8b2jl+7QKsjWifF8ralXI9DJYh1jJATUKGAPw56n5SJFbsxZlxxdxDoboOkgFP4aeog==";
     };
     dependencies = [
       sources."agent-base-4.3.0"
@@ -46932,7 +46866,7 @@ in
       sources."fs.realpath-1.0.0"
       sources."fstream-1.0.12"
       sources."glob-7.1.3"
-      sources."graceful-fs-4.2.1"
+      sources."graceful-fs-4.2.2"
       sources."has-flag-3.0.0"
       sources."https-proxy-agent-2.2.1"
       sources."inflight-1.0.6"
@@ -46968,6 +46902,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   bash-language-server = nodeEnv.buildNodePackage {
     name = "bash-language-server";
@@ -46978,11 +46913,11 @@ in
       sha512 = "GqW24myNihrUroXdL40AemizC3lBvr2wOiF0GzxYWqsBsJvi6CQor0Y9t10jOGn11evMhncmR2f2LoQdjsNpqw==";
     };
     dependencies = [
-      sources."abab-2.0.0"
+      sources."abab-2.0.1"
       sources."acorn-5.7.3"
-      (sources."acorn-globals-4.3.3" // {
+      (sources."acorn-globals-4.3.4" // {
         dependencies = [
-          sources."acorn-6.2.1"
+          sources."acorn-6.3.0"
         ];
       })
       sources."acorn-walk-6.2.0"
@@ -46999,12 +46934,13 @@ in
       sources."aws4-1.8.0"
       sources."balanced-match-1.0.0"
       sources."bcrypt-pbkdf-1.0.2"
-      sources."bl-1.2.2"
+      (sources."bl-3.0.0" // {
+        dependencies = [
+          sources."readable-stream-3.4.0"
+        ];
+      })
       sources."brace-expansion-1.1.11"
       sources."browser-process-hrtime-0.1.3"
-      sources."buffer-alloc-1.2.0"
-      sources."buffer-alloc-unsafe-1.1.0"
-      sources."buffer-fill-1.0.0"
       sources."caseless-0.12.0"
       sources."chownr-1.1.2"
       sources."code-point-at-1.1.0"
@@ -47029,9 +46965,9 @@ in
       sources."domexception-1.0.1"
       sources."ecc-jsbn-0.1.2"
       sources."end-of-stream-1.4.1"
-      sources."escodegen-1.11.1"
+      sources."escodegen-1.12.0"
       sources."esprima-3.1.3"
-      sources."estraverse-4.2.0"
+      sources."estraverse-4.3.0"
       sources."esutils-2.0.3"
       sources."expand-template-2.0.3"
       sources."extend-3.0.2"
@@ -47082,7 +47018,7 @@ in
       })
       sources."nan-2.14.0"
       sources."napi-build-utils-1.0.1"
-      sources."node-abi-2.10.0"
+      sources."node-abi-2.11.0"
       sources."noop-logger-0.1.1"
       sources."npmlog-4.1.2"
       sources."number-is-nan-1.0.1"
@@ -47091,16 +47027,15 @@ in
       sources."object-assign-4.1.1"
       sources."once-1.4.0"
       sources."optionator-0.8.2"
-      sources."os-homedir-1.0.2"
       sources."parse5-4.0.0"
       sources."path-is-absolute-1.0.1"
       sources."performance-now-2.1.0"
       sources."pn-1.1.0"
-      sources."prebuild-install-5.3.0"
+      sources."prebuild-install-5.3.2"
       sources."prelude-ls-1.1.2"
       sources."process-nextick-args-2.0.1"
-      sources."psl-1.3.0"
-      sources."pump-2.0.1"
+      sources."psl-1.4.0"
+      sources."pump-3.0.0"
       sources."punycode-2.1.1"
       sources."qs-6.5.2"
       sources."rc-1.2.8"
@@ -47115,11 +47050,11 @@ in
       sources."safe-buffer-5.2.0"
       sources."safer-buffer-2.1.2"
       sources."sax-1.2.4"
-      sources."semver-5.7.0"
+      sources."semver-5.7.1"
       sources."set-blocking-2.0.0"
       sources."signal-exit-3.0.2"
       sources."simple-concat-1.0.0"
-      sources."simple-get-2.8.1"
+      sources."simple-get-3.0.3"
       sources."source-map-0.6.1"
       sources."sshpk-1.16.1"
       sources."stealthy-require-1.1.1"
@@ -47132,13 +47067,12 @@ in
       sources."strip-ansi-3.0.1"
       sources."strip-json-comments-2.0.1"
       sources."symbol-tree-3.2.4"
-      (sources."tar-fs-1.16.3" // {
+      sources."tar-fs-2.0.0"
+      (sources."tar-stream-2.1.0" // {
         dependencies = [
-          sources."pump-1.0.3"
+          sources."readable-stream-3.4.0"
         ];
       })
-      sources."tar-stream-1.6.2"
-      sources."to-buffer-1.1.1"
       (sources."tough-cookie-2.4.3" // {
         dependencies = [
           sources."punycode-1.4.1"
@@ -47154,7 +47088,7 @@ in
       sources."uri-js-4.2.2"
       sources."urijs-1.19.1"
       sources."util-deprecate-1.0.2"
-      sources."uuid-3.3.2"
+      sources."uuid-3.3.3"
       sources."verror-1.10.0"
       sources."vscode-jsonrpc-4.0.0"
       sources."vscode-languageserver-4.4.2"
@@ -47172,7 +47106,6 @@ in
       sources."wrappy-1.0.2"
       sources."ws-5.2.2"
       sources."xml-name-validator-3.0.0"
-      sources."xtend-4.0.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -47182,6 +47115,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   bower = nodeEnv.buildNodePackage {
     name = "bower";
@@ -47199,6 +47133,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   bower2nix = nodeEnv.buildNodePackage {
     name = "bower2nix";
@@ -47231,14 +47166,14 @@ in
       sources."find-up-1.1.2"
       (sources."fs-extra-0.26.7" // {
         dependencies = [
-          sources."graceful-fs-4.2.1"
+          sources."graceful-fs-4.2.2"
         ];
       })
       sources."fs.realpath-1.0.0"
       sources."get-stdin-4.0.1"
       sources."glob-6.0.4"
-      sources."graceful-fs-3.0.11"
-      sources."hosted-git-info-2.8.2"
+      sources."graceful-fs-3.0.12"
+      sources."hosted-git-info-2.8.4"
       sources."indent-string-2.1.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
@@ -47249,25 +47184,24 @@ in
       sources."is-utf8-0.2.1"
       (sources."jsonfile-2.4.0" // {
         dependencies = [
-          sources."graceful-fs-4.2.1"
+          sources."graceful-fs-4.2.2"
         ];
       })
       (sources."klaw-1.3.1" // {
         dependencies = [
-          sources."graceful-fs-4.2.1"
+          sources."graceful-fs-4.2.2"
         ];
       })
       (sources."load-json-file-1.1.0" // {
         dependencies = [
-          sources."graceful-fs-4.2.1"
+          sources."graceful-fs-4.2.2"
         ];
       })
       sources."lodash-4.2.1"
       sources."loud-rejection-1.6.0"
-      sources."lru-cache-5.1.1"
       sources."map-obj-1.0.1"
       sources."meow-3.7.0"
-      sources."mime-db-1.40.0"
+      sources."mime-db-1.41.0"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
       (sources."mkdirp-0.5.1" // {
@@ -47288,7 +47222,7 @@ in
       sources."path-parse-1.0.6"
       (sources."path-type-1.1.0" // {
         dependencies = [
-          sources."graceful-fs-4.2.1"
+          sources."graceful-fs-4.2.2"
         ];
       })
       sources."pify-2.3.0"
@@ -47301,12 +47235,12 @@ in
       sources."redent-1.0.0"
       sources."repeating-2.0.1"
       sources."resolve-1.12.0"
-      (sources."rimraf-2.6.3" // {
+      (sources."rimraf-2.7.1" // {
         dependencies = [
           sources."glob-7.1.4"
         ];
       })
-      sources."semver-5.7.0"
+      sources."semver-5.7.1"
       sources."signal-exit-3.0.2"
       sources."sort-keys-1.1.2"
       sources."sort-keys-length-1.0.1"
@@ -47325,7 +47259,6 @@ in
       sources."trim-newlines-1.0.0"
       sources."validate-npm-package-license-3.0.4"
       sources."wrappy-1.0.2"
-      sources."yallist-3.0.3"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -47335,24 +47268,21 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   browserify = nodeEnv.buildNodePackage {
     name = "browserify";
     packageName = "browserify";
-    version = "16.3.0";
+    version = "16.5.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/browserify/-/browserify-16.3.0.tgz";
-      sha512 = "BWaaD7alyGZVEBBwSTYx4iJF5DswIGzK17o8ai9w4iKRbYpk3EOiprRHMRRA8DCZFmFeOdx7A385w2XdFvxWmg==";
+      url = "https://registry.npmjs.org/browserify/-/browserify-16.5.0.tgz";
+      sha512 = "6bfI3cl76YLAnCZ75AGu/XPOsqUhRyc0F/olGIJeCxtfxF2HvPKEcmjU9M8oAPxl4uBY1U7Nry33Q6koV3f2iw==";
     };
     dependencies = [
       sources."JSONStream-1.3.5"
-      sources."acorn-6.2.1"
-      sources."acorn-dynamic-import-4.0.0"
-      sources."acorn-node-1.7.0"
-      sources."acorn-walk-6.2.0"
-      sources."array-filter-0.0.1"
-      sources."array-map-0.0.0"
-      sources."array-reduce-0.0.0"
+      sources."acorn-7.0.0"
+      sources."acorn-node-1.8.2"
+      sources."acorn-walk-7.0.0"
       sources."asn1.js-4.10.1"
       (sources."assert-1.5.0" // {
         dependencies = [
@@ -47377,7 +47307,7 @@ in
       sources."browserify-rsa-4.0.1"
       sources."browserify-sign-4.0.4"
       sources."browserify-zlib-0.2.0"
-      sources."buffer-5.2.1"
+      sources."buffer-5.4.3"
       sources."buffer-from-1.1.1"
       sources."buffer-xor-1.0.3"
       sources."builtin-status-codes-3.0.0"
@@ -47407,7 +47337,7 @@ in
       sources."diffie-hellman-5.0.3"
       sources."domain-browser-1.2.0"
       sources."duplexer2-0.1.4"
-      sources."elliptic-6.5.0"
+      sources."elliptic-6.5.1"
       sources."events-2.1.0"
       sources."evp_bytestokey-1.0.3"
       sources."fs.realpath-1.0.0"
@@ -47471,18 +47401,18 @@ in
       sources."safe-buffer-5.2.0"
       sources."sha.js-2.4.11"
       sources."shasum-1.0.2"
-      sources."shell-quote-1.6.1"
+      sources."shell-quote-1.7.2"
       sources."simple-concat-1.0.0"
       sources."source-map-0.5.7"
       sources."stream-browserify-2.0.2"
       sources."stream-combiner2-1.1.1"
-      sources."stream-http-2.8.3"
-      sources."stream-splicer-2.0.1"
-      (sources."string_decoder-1.2.0" // {
+      (sources."stream-http-3.1.0" // {
         dependencies = [
-          sources."safe-buffer-5.1.2"
+          sources."readable-stream-3.4.0"
         ];
       })
+      sources."stream-splicer-2.0.1"
+      sources."string_decoder-1.3.0"
       (sources."subarg-1.0.0" // {
         dependencies = [
           sources."minimist-1.2.0"
@@ -47492,7 +47422,6 @@ in
       sources."through-2.3.8"
       sources."through2-2.0.5"
       sources."timers-browserify-1.4.2"
-      sources."to-arraybuffer-1.0.1"
       sources."tty-browserify-0.0.1"
       sources."typedarray-0.0.6"
       sources."umd-3.0.3"
@@ -47520,6 +47449,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   castnow = nodeEnv.buildNodePackage {
     name = "castnow";
@@ -47530,6 +47460,18 @@ in
       sha512 = "VybZ8QYuJyJHt88TIi12nxsIO/89vmcM1Trna0bTq5O2uzz5SDBE2piU+x87B85V4woosyw9T45f39CZzYjxAw==";
     };
     dependencies = [
+      sources."@protobufjs/aspromise-1.1.2"
+      sources."@protobufjs/base64-1.1.2"
+      sources."@protobufjs/codegen-2.0.4"
+      sources."@protobufjs/eventemitter-1.1.0"
+      sources."@protobufjs/fetch-1.1.0"
+      sources."@protobufjs/float-1.0.2"
+      sources."@protobufjs/inquire-1.1.0"
+      sources."@protobufjs/path-1.1.2"
+      sources."@protobufjs/pool-1.1.0"
+      sources."@protobufjs/utf8-1.1.0"
+      sources."@types/long-4.0.0"
+      sources."@types/node-10.14.18"
       sources."addr-to-ip-port-1.5.1"
       sources."airplay-js-0.2.16"
       sources."ajv-6.10.2"
@@ -47540,7 +47482,6 @@ in
       sources."array-find-index-1.0.2"
       sources."array-loop-1.0.0"
       sources."array-shuffle-1.0.1"
-      sources."ascli-0.3.0"
       sources."asn1-0.2.4"
       sources."assert-plus-1.0.0"
       sources."asynckit-0.4.0"
@@ -47571,30 +47512,33 @@ in
       sources."buffer-equals-1.0.4"
       sources."buffer-fill-1.0.0"
       sources."buffer-from-1.1.1"
-      sources."bufferview-1.0.1"
-      sources."bytebuffer-3.5.5"
       sources."camelcase-2.1.1"
       sources."camelcase-keys-2.1.0"
       sources."caseless-0.12.0"
-      sources."castv2-0.1.9"
+      (sources."castv2-0.1.10" // {
+        dependencies = [
+          sources."debug-4.1.1"
+        ];
+      })
       sources."castv2-client-1.2.0"
       sources."chalk-1.0.0"
+      sources."chrome-dgram-3.0.3"
+      sources."chrome-dns-1.0.1"
+      sources."chrome-net-3.3.3"
       sources."chromecast-player-0.2.3"
       sources."chromecast-scanner-0.5.0"
       sources."cli-width-1.1.1"
       sources."clivas-0.1.4"
       sources."co-3.1.0"
       sources."codepage-1.4.0"
-      sources."colour-0.7.1"
       sources."combined-stream-1.0.8"
-      sources."commander-2.20.0"
+      sources."commander-3.0.1"
       sources."compact2string-1.4.1"
       sources."concat-map-0.0.1"
       (sources."concat-stream-2.0.0" // {
         dependencies = [
           sources."readable-stream-3.4.0"
-          sources."safe-buffer-5.1.2"
-          sources."string_decoder-1.2.0"
+          sources."string_decoder-1.3.0"
         ];
       })
       sources."core-util-is-1.0.2"
@@ -47602,10 +47546,15 @@ in
       sources."cyclist-0.1.1"
       sources."dashdash-1.14.1"
       sources."debounced-seeker-1.0.0"
-      sources."debug-2.6.9"
+      (sources."debug-2.6.9" // {
+        dependencies = [
+          sources."ms-2.0.0"
+        ];
+      })
       sources."decamelize-1.2.0"
       sources."decompress-response-3.3.0"
       sources."deep-extend-0.2.11"
+      sources."define-properties-1.1.3"
       sources."delayed-stream-1.0.0"
       sources."diveSync-0.3.0"
       sources."dns-js-0.2.1"
@@ -47616,6 +47565,8 @@ in
         ];
       })
       sources."error-ex-1.3.2"
+      sources."es-abstract-1.14.2"
+      sources."es-to-primitive-1.2.0"
       sources."escape-string-regexp-1.0.5"
       sources."exit-on-epipe-1.0.1"
       sources."extend-3.0.2"
@@ -47640,17 +47591,20 @@ in
         ];
       })
       sources."fs.realpath-1.0.0"
+      sources."function-bind-1.1.1"
       sources."get-browser-rtc-1.0.2"
       sources."get-stdin-4.0.1"
       sources."getpass-0.1.7"
       sources."glob-7.1.4"
       sources."got-1.2.2"
-      sources."graceful-fs-4.2.1"
+      sources."graceful-fs-4.2.2"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.3"
+      sources."has-1.0.3"
       sources."has-ansi-1.0.3"
+      sources."has-symbols-1.0.0"
       sources."hat-0.0.3"
-      sources."hosted-git-info-2.8.2"
+      sources."hosted-git-info-2.8.4"
       sources."http-signature-1.2.0"
       sources."immediate-chunk-store-1.0.8"
       sources."indent-string-2.1.0"
@@ -47663,7 +47617,11 @@ in
       sources."ip-set-1.0.2"
       sources."ipaddr.js-1.9.1"
       sources."is-arrayish-0.2.1"
+      sources."is-callable-1.1.4"
+      sources."is-date-object-1.0.1"
       sources."is-finite-1.0.2"
+      sources."is-regex-1.0.4"
+      sources."is-symbol-1.0.2"
       sources."is-typedarray-1.0.0"
       sources."is-utf8-0.2.1"
       sources."isarray-0.0.1"
@@ -47679,19 +47637,19 @@ in
           sources."k-bucket-2.0.1"
         ];
       })
-      sources."k-rpc-socket-1.8.0"
+      sources."k-rpc-socket-1.11.1"
       sources."keypress-0.2.1"
       sources."load-json-file-1.1.0"
       sources."lodash-3.10.1"
-      sources."long-2.4.0"
+      sources."long-4.0.0"
       sources."loud-rejection-1.6.0"
       sources."lru-2.0.1"
-      sources."lru-cache-5.1.1"
       sources."magnet-uri-5.2.4"
       sources."map-obj-1.0.1"
       (sources."mdns-js-1.0.3" // {
         dependencies = [
           sources."debug-3.1.0"
+          sources."ms-2.0.0"
           sources."semver-5.4.1"
         ];
       })
@@ -47707,7 +47665,7 @@ in
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
       sources."mkdirp-0.3.5"
-      sources."ms-2.0.0"
+      sources."ms-2.1.2"
       sources."multicast-dns-4.0.1"
       sources."mutate.js-0.2.0"
       sources."mute-stream-0.0.4"
@@ -47717,6 +47675,9 @@ in
       sources."numeral-1.5.6"
       sources."oauth-sign-0.9.0"
       sources."object-assign-1.0.0"
+      sources."object-inspect-1.6.0"
+      sources."object-keys-1.1.1"
+      sources."object.getownpropertydescriptors-2.0.3"
       sources."once-1.4.0"
       sources."open-0.0.5"
       (sources."optimist-0.6.1" // {
@@ -47725,7 +47686,6 @@ in
         ];
       })
       sources."options-0.0.6"
-      sources."optjs-3.2.2"
       sources."pad-0.0.5"
       sources."parse-json-2.2.0"
       (sources."parse-torrent-5.9.1" // {
@@ -47766,8 +47726,8 @@ in
       sources."plist-3.0.1"
       sources."process-nextick-args-2.0.1"
       sources."promiscuous-0.6.0"
-      sources."protobufjs-3.8.2"
-      sources."psl-1.3.0"
+      sources."protobufjs-6.8.8"
+      sources."psl-1.4.0"
       (sources."pump-0.3.5" // {
         dependencies = [
           sources."once-1.2.0"
@@ -47812,7 +47772,7 @@ in
       sources."repeating-2.0.1"
       sources."request-2.88.0"
       sources."resolve-1.12.0"
-      sources."rimraf-2.6.3"
+      sources."rimraf-2.7.1"
       sources."router-0.6.2"
       sources."run-parallel-1.1.9"
       sources."run-series-1.1.8"
@@ -47821,7 +47781,7 @@ in
       sources."safe-buffer-5.2.0"
       sources."safer-buffer-2.1.2"
       sources."sax-1.2.4"
-      sources."semver-5.7.0"
+      sources."semver-5.7.1"
       sources."signal-exit-3.0.2"
       sources."simple-concat-1.0.0"
       sources."simple-get-2.8.1"
@@ -47856,6 +47816,8 @@ in
       sources."srt2vtt-1.3.1"
       sources."sshpk-1.16.1"
       sources."stream-transcoder-0.0.5"
+      sources."string.prototype.trimleft-2.1.0"
+      sources."string.prototype.trimright-2.1.0"
       sources."string2compact-1.3.0"
       sources."string_decoder-0.10.31"
       sources."strip-ansi-2.0.1"
@@ -47893,8 +47855,9 @@ in
       sources."uri-js-4.2.2"
       sources."utfx-1.0.1"
       sources."util-deprecate-1.0.2"
+      sources."util.promisify-1.0.0"
       sources."utp-0.0.7"
-      sources."uuid-3.3.2"
+      sources."uuid-3.3.3"
       sources."validate-npm-package-license-3.0.4"
       sources."verror-1.10.0"
       sources."voc-1.1.0"
@@ -47908,12 +47871,15 @@ in
           sources."ultron-1.0.2"
         ];
       })
-      sources."xml2js-0.4.19"
+      (sources."xml2js-0.4.22" // {
+        dependencies = [
+          sources."xmlbuilder-11.0.1"
+        ];
+      })
       sources."xmlbuilder-9.0.7"
       sources."xmldom-0.1.27"
       sources."xspfr-0.3.1"
       sources."xtend-4.0.2"
-      sources."yallist-3.0.3"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -47923,6 +47889,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   clean-css = nodeEnv.buildNodePackage {
     name = "clean-css";
@@ -47943,6 +47910,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   coffee-script = nodeEnv.buildNodePackage {
     name = "coffee-script";
@@ -47960,6 +47928,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   coinmon = nodeEnv.buildNodePackage {
     name = "coinmon";
@@ -47984,7 +47953,7 @@ in
       sources."commander-2.20.0"
       sources."debug-3.2.6"
       sources."escape-string-regexp-1.0.5"
-      sources."follow-redirects-1.7.0"
+      sources."follow-redirects-1.9.0"
       sources."has-flag-3.0.0"
       sources."humanize-plus-1.8.2"
       sources."is-buffer-1.1.6"
@@ -48010,6 +47979,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   configurable-http-proxy = nodeEnv.buildNodePackage {
     name = "configurable-http-proxy";
@@ -48035,9 +48005,9 @@ in
       sources."enabled-1.0.2"
       sources."env-variable-0.0.5"
       sources."eventemitter3-3.1.2"
-      sources."fast-safe-stringify-2.0.6"
+      sources."fast-safe-stringify-2.0.7"
       sources."fecha-2.3.3"
-      sources."follow-redirects-1.7.0"
+      sources."follow-redirects-1.9.0"
       sources."http-proxy-1.17.0"
       sources."inherits-2.0.4"
       sources."is-arrayish-0.3.2"
@@ -48053,12 +48023,12 @@ in
       sources."process-nextick-args-2.0.1"
       sources."readable-stream-3.4.0"
       sources."requires-port-1.0.0"
-      sources."safe-buffer-5.1.2"
+      sources."safe-buffer-5.2.0"
       sources."simple-swizzle-0.2.2"
       sources."stack-trace-0.0.10"
       sources."statsd-parser-0.0.4"
       sources."strftime-0.10.0"
-      sources."string_decoder-1.2.0"
+      sources."string_decoder-1.3.0"
       sources."text-hex-1.0.0"
       sources."triple-beam-1.3.0"
       sources."util-deprecate-1.0.2"
@@ -48066,6 +48036,7 @@ in
       (sources."winston-transport-4.3.0" // {
         dependencies = [
           sources."readable-stream-2.3.6"
+          sources."safe-buffer-5.1.2"
           sources."string_decoder-1.1.1"
         ];
       })
@@ -48078,6 +48049,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   cordova = nodeEnv.buildNodePackage {
     name = "cordova";
@@ -48093,7 +48065,7 @@ in
       sources."@types/events-3.0.0"
       sources."@types/glob-7.1.1"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-12.6.9"
+      sources."@types/node-12.7.5"
       sources."abbrev-1.1.1"
       sources."accepts-1.3.7"
       sources."ajv-6.10.2"
@@ -48239,7 +48211,7 @@ in
       sources."end-of-stream-1.4.1"
       sources."endent-1.3.0"
       sources."env-paths-1.0.0"
-      sources."es-abstract-1.13.0"
+      sources."es-abstract-1.14.2"
       sources."es-to-primitive-1.2.0"
       sources."escape-html-1.0.3"
       sources."escape-string-regexp-1.0.5"
@@ -48321,7 +48293,7 @@ in
           sources."get-stream-3.0.0"
         ];
       })
-      sources."graceful-fs-4.2.1"
+      sources."graceful-fs-4.2.2"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.3"
       sources."has-1.0.3"
@@ -48333,7 +48305,7 @@ in
           sources."kind-of-4.0.0"
         ];
       })
-      sources."hosted-git-info-2.8.2"
+      sources."hosted-git-info-2.8.4"
       (sources."http-errors-1.7.2" // {
         dependencies = [
           sources."inherits-2.0.3"
@@ -48350,7 +48322,7 @@ in
       sources."inherits-2.0.4"
       sources."ini-1.3.5"
       sources."init-package-json-1.10.3"
-      (sources."inquirer-6.5.0" // {
+      (sources."inquirer-6.5.2" // {
         dependencies = [
           sources."mute-stream-0.0.7"
         ];
@@ -48382,7 +48354,7 @@ in
       sources."is-promise-2.1.0"
       sources."is-redirect-1.0.0"
       sources."is-regex-1.0.4"
-      sources."is-retry-allowed-1.1.0"
+      sources."is-retry-allowed-1.2.0"
       sources."is-stream-1.1.0"
       sources."is-symbol-1.0.2"
       sources."is-typedarray-1.0.0"
@@ -48407,7 +48379,7 @@ in
       sources."lodash.debounce-4.0.8"
       sources."loud-rejection-2.1.0"
       sources."lowercase-keys-1.0.1"
-      sources."lru-cache-5.1.1"
+      sources."lru-cache-4.1.5"
       sources."macos-release-2.3.0"
       sources."make-dir-1.3.0"
       sources."map-cache-0.2.2"
@@ -48415,7 +48387,7 @@ in
       sources."md5-file-4.0.0"
       sources."media-typer-0.3.0"
       sources."merge-descriptors-1.0.1"
-      sources."merge2-1.2.4"
+      sources."merge2-1.3.0"
       sources."methods-1.1.2"
       sources."micromatch-3.1.10"
       sources."mime-1.6.0"
@@ -48436,7 +48408,7 @@ in
       sources."nice-try-1.0.5"
       sources."nopt-4.0.1"
       sources."normalize-package-data-2.5.0"
-      sources."npm-package-arg-6.1.0"
+      sources."npm-package-arg-6.1.1"
       sources."npm-run-path-2.0.2"
       sources."oauth-sign-0.9.0"
       (sources."object-copy-0.1.0" // {
@@ -48495,7 +48467,7 @@ in
       sources."promzard-0.3.0"
       sources."proxy-addr-2.0.5"
       sources."pseudomap-1.0.2"
-      sources."psl-1.3.0"
+      sources."psl-1.4.0"
       sources."pump-3.0.0"
       sources."punycode-2.1.1"
       sources."q-1.5.1"
@@ -48513,7 +48485,7 @@ in
           sources."pify-4.0.1"
         ];
       })
-      (sources."read-package-json-2.0.13" // {
+      (sources."read-package-json-2.1.0" // {
         dependencies = [
           sources."slash-1.0.0"
         ];
@@ -48537,12 +48509,12 @@ in
       sources."resumer-0.0.0"
       sources."ret-0.1.15"
       sources."run-async-2.3.0"
-      sources."rxjs-6.5.2"
+      sources."rxjs-6.5.3"
       sources."safe-buffer-5.1.2"
       sources."safe-regex-1.1.0"
       sources."safer-buffer-2.1.2"
       sources."sax-1.1.4"
-      sources."semver-5.7.0"
+      sources."semver-5.7.1"
       sources."semver-diff-2.1.0"
       (sources."send-0.17.1" // {
         dependencies = [
@@ -48621,6 +48593,8 @@ in
         ];
       })
       sources."string.prototype.trim-1.1.2"
+      sources."string.prototype.trimleft-2.1.0"
+      sources."string.prototype.trimright-2.1.0"
       (sources."strip-ansi-5.2.0" // {
         dependencies = [
           sources."ansi-regex-4.1.0"
@@ -48636,8 +48610,6 @@ in
           sources."cross-spawn-5.1.0"
           sources."execa-0.7.0"
           sources."get-stream-3.0.0"
-          sources."lru-cache-4.1.5"
-          sources."yallist-2.1.2"
         ];
       })
       sources."through-2.3.8"
@@ -48682,7 +48654,7 @@ in
       sources."url-parse-lax-1.0.0"
       sources."use-3.1.1"
       sources."utils-merge-1.0.1"
-      sources."uuid-3.3.2"
+      sources."uuid-3.3.3"
       sources."valid-identifier-0.0.2"
       sources."validate-npm-package-license-3.0.4"
       sources."validate-npm-package-name-3.0.0"
@@ -48701,7 +48673,7 @@ in
       sources."xdg-basedir-3.0.0"
       sources."xmlbuilder-9.0.7"
       sources."xmldom-0.1.27"
-      sources."yallist-3.0.3"
+      sources."yallist-2.1.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -48711,6 +48683,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   cpy-cli = nodeEnv.buildNodePackage {
     name = "cpy-cli";
@@ -48726,7 +48699,7 @@ in
       sources."@types/events-3.0.0"
       sources."@types/glob-7.1.1"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-12.6.9"
+      sources."@types/node-12.7.5"
       sources."arr-diff-4.0.0"
       sources."arr-flatten-1.1.0"
       sources."arr-union-3.1.0"
@@ -48836,14 +48809,14 @@ in
       })
       sources."glob-to-regexp-0.3.0"
       sources."globby-9.2.0"
-      sources."graceful-fs-4.2.1"
+      sources."graceful-fs-4.2.2"
       sources."has-value-1.0.0"
       (sources."has-values-1.0.0" // {
         dependencies = [
           sources."kind-of-4.0.0"
         ];
       })
-      sources."hosted-git-info-2.8.2"
+      sources."hosted-git-info-2.8.4"
       sources."ignore-4.0.6"
       sources."indent-string-3.2.0"
       sources."inflight-1.0.6"
@@ -48875,13 +48848,12 @@ in
       })
       sources."locate-path-2.0.0"
       sources."loud-rejection-1.6.0"
-      sources."lru-cache-5.1.1"
       sources."make-dir-2.1.0"
       sources."map-cache-0.2.2"
       sources."map-obj-2.0.0"
       sources."map-visit-1.0.0"
       sources."meow-5.0.0"
-      sources."merge2-1.2.4"
+      sources."merge2-1.3.0"
       sources."micromatch-3.1.10"
       sources."minimatch-3.0.4"
       sources."minimist-options-3.0.2"
@@ -48938,7 +48910,7 @@ in
       sources."ret-0.1.15"
       sources."safe-buffer-5.2.0"
       sources."safe-regex-1.1.0"
-      sources."semver-5.7.0"
+      sources."semver-5.7.1"
       (sources."set-value-2.0.1" // {
         dependencies = [
           sources."extend-shallow-2.0.1"
@@ -49024,7 +48996,6 @@ in
       sources."use-3.1.1"
       sources."validate-npm-package-license-3.0.4"
       sources."wrappy-1.0.2"
-      sources."yallist-3.0.3"
       sources."yargs-parser-10.1.0"
     ];
     buildInputs = globalBuildInputs;
@@ -49035,6 +49006,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   create-cycle-app = nodeEnv.buildNodePackage {
     name = "create-cycle-app";
@@ -49055,7 +49027,7 @@ in
       sources."@cycle/run-3.4.0"
       sources."@cycle/time-0.10.1"
       sources."@types/cookiejar-2.1.1"
-      sources."@types/node-12.6.9"
+      sources."@types/node-12.7.5"
       sources."@types/superagent-3.8.2"
       sources."ansi-escapes-3.2.0"
       sources."ansi-regex-2.1.1"
@@ -49084,17 +49056,21 @@ in
       sources."d-1.0.1"
       sources."debug-3.2.6"
       sources."delayed-stream-1.0.0"
-      sources."es5-ext-0.10.50"
+      sources."es5-ext-0.10.51"
       sources."es6-iterator-2.0.3"
       sources."es6-map-0.1.5"
-      sources."es6-set-0.1.5"
-      sources."es6-symbol-3.1.1"
+      (sources."es6-set-0.1.5" // {
+        dependencies = [
+          sources."es6-symbol-3.1.1"
+        ];
+      })
+      sources."es6-symbol-3.1.2"
       sources."escape-string-regexp-1.0.5"
       sources."event-emitter-0.3.5"
       sources."extend-3.0.2"
       sources."external-editor-2.2.0"
       sources."figures-2.0.0"
-      sources."form-data-2.5.0"
+      sources."form-data-2.5.1"
       sources."formidable-1.2.1"
       sources."has-ansi-2.0.0"
       sources."has-flag-3.0.0"
@@ -49134,7 +49110,7 @@ in
       sources."performance-now-2.1.0"
       sources."process-nextick-args-2.0.1"
       sources."pseudomap-1.0.2"
-      sources."qs-6.7.0"
+      sources."qs-6.8.0"
       sources."quicktask-1.1.0"
       sources."raf-3.3.2"
       sources."readable-stream-2.3.6"
@@ -49183,14 +49159,15 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   create-react-app = nodeEnv.buildNodePackage {
     name = "create-react-app";
     packageName = "create-react-app";
-    version = "3.0.1";
+    version = "3.1.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/create-react-app/-/create-react-app-3.0.1.tgz";
-      sha512 = "uOLGMyegGQbm7/kWbHUzsqM16MiehRItBq3WXamzYsKLXdXXAHxEEX57WqcFwd/XybeD/1/KSYkroJdEyk7swA==";
+      url = "https://registry.npmjs.org/create-react-app/-/create-react-app-3.1.1.tgz";
+      sha512 = "EaK59gIwEsSZjjIN4MyG0DkXcatF3cEXYODIH7rDrlUremb7iwi5RzZGGISmPIrfywLC82Qom/8CXiT8hwixPQ==";
     };
     dependencies = [
       sources."ansi-escapes-3.2.0"
@@ -49207,17 +49184,17 @@ in
       sources."cli-width-2.2.0"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
-      sources."commander-2.19.0"
+      sources."commander-2.20.0"
       sources."concat-map-0.0.1"
       sources."core-util-is-1.0.2"
       (sources."cross-spawn-6.0.5" // {
         dependencies = [
-          sources."semver-5.7.0"
+          sources."semver-5.7.1"
         ];
       })
       sources."debug-2.6.9"
       sources."duplexer2-0.0.2"
-      sources."envinfo-7.1.0"
+      sources."envinfo-7.3.1"
       sources."escape-string-regexp-1.0.5"
       sources."external-editor-3.1.0"
       sources."figures-2.0.0"
@@ -49226,13 +49203,13 @@ in
       sources."fstream-1.0.12"
       sources."fstream-ignore-1.0.5"
       sources."glob-7.1.4"
-      sources."graceful-fs-4.2.1"
+      sources."graceful-fs-4.2.2"
       sources."has-flag-3.0.0"
       sources."hyperquest-2.1.3"
       sources."iconv-lite-0.4.24"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
-      sources."inquirer-6.2.2"
+      sources."inquirer-6.5.0"
       sources."is-fullwidth-code-point-2.0.0"
       sources."is-promise-2.1.0"
       sources."isarray-0.0.1"
@@ -49254,12 +49231,12 @@ in
       sources."process-nextick-args-2.0.1"
       sources."readable-stream-1.1.14"
       sources."restore-cursor-2.0.0"
-      sources."rimraf-2.6.3"
+      sources."rimraf-2.7.1"
       sources."run-async-2.3.0"
-      sources."rxjs-6.5.2"
+      sources."rxjs-6.5.3"
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
-      sources."semver-6.0.0"
+      sources."semver-6.3.0"
       sources."shebang-command-1.2.0"
       sources."shebang-regex-1.0.0"
       sources."signal-exit-3.0.2"
@@ -49307,6 +49284,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   create-react-native-app = nodeEnv.buildNodePackage {
     name = "create-react-native-app";
@@ -49326,7 +49304,7 @@ in
       sources."cross-spawn-5.1.0"
       sources."escape-string-regexp-1.0.5"
       sources."fs-extra-4.0.3"
-      sources."graceful-fs-4.2.1"
+      sources."graceful-fs-4.2.2"
       sources."has-flag-3.0.0"
       sources."isexe-2.0.0"
       sources."jsonfile-4.0.0"
@@ -49335,7 +49313,7 @@ in
       sources."path-exists-3.0.0"
       sources."pseudomap-1.0.2"
       sources."regenerator-runtime-0.11.1"
-      sources."semver-5.7.0"
+      sources."semver-5.7.1"
       sources."shebang-command-1.2.0"
       sources."shebang-regex-1.0.0"
       sources."source-map-0.5.7"
@@ -49353,6 +49331,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   csslint = nodeEnv.buildNodePackage {
     name = "csslint";
@@ -49374,6 +49353,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   dat = nodeEnv.buildNodePackage {
     name = "dat";
@@ -49454,6 +49434,9 @@ in
       sources."capture-stack-trace-1.0.1"
       sources."caseless-0.12.0"
       sources."chalk-2.4.2"
+      sources."chrome-dgram-3.0.3"
+      sources."chrome-dns-1.0.1"
+      sources."chrome-net-3.3.3"
       sources."ci-info-1.6.0"
       sources."circular-append-file-1.0.1"
       (sources."class-utils-0.3.6" // {
@@ -49551,7 +49534,7 @@ in
       sources."duplexify-3.7.1"
       sources."ecc-jsbn-0.1.2"
       sources."end-of-stream-1.4.1"
-      sources."es-abstract-1.13.0"
+      sources."es-abstract-1.14.2"
       sources."es-to-primitive-1.2.0"
       sources."escape-string-regexp-1.0.5"
       sources."execa-0.7.0"
@@ -49616,7 +49599,7 @@ in
       sources."global-4.3.2"
       sources."global-dirs-0.1.1"
       sources."got-6.7.1"
-      sources."graceful-fs-4.2.1"
+      sources."graceful-fs-4.2.2"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.3"
       sources."has-1.0.3"
@@ -49630,14 +49613,14 @@ in
       })
       sources."http-methods-0.1.0"
       sources."http-signature-1.2.0"
-      (sources."hypercore-7.5.1" // {
+      (sources."hypercore-7.7.1" // {
         dependencies = [
           sources."codecs-2.0.0"
           sources."unordered-set-2.0.1"
         ];
       })
       sources."hypercore-crypto-1.0.0"
-      (sources."hypercore-protocol-6.11.1" // {
+      (sources."hypercore-protocol-6.12.0" // {
         dependencies = [
           sources."varint-5.0.0"
         ];
@@ -49680,7 +49663,7 @@ in
       sources."is-plain-object-2.0.4"
       sources."is-redirect-1.0.0"
       sources."is-regex-1.0.4"
-      sources."is-retry-allowed-1.1.0"
+      sources."is-retry-allowed-1.2.0"
       sources."is-stream-1.1.0"
       sources."is-string-1.0.4"
       sources."is-symbol-1.0.2"
@@ -49702,7 +49685,7 @@ in
           sources."k-bucket-4.0.1"
         ];
       })
-      (sources."k-rpc-socket-1.8.0" // {
+      (sources."k-rpc-socket-1.11.1" // {
         dependencies = [
           sources."bencode-2.0.1"
         ];
@@ -49711,7 +49694,7 @@ in
       sources."kind-of-6.0.2"
       sources."last-one-wins-1.0.4"
       sources."latest-version-3.1.0"
-      sources."length-prefixed-message-3.0.3"
+      sources."length-prefixed-message-3.0.4"
       sources."lodash.throttle-4.1.1"
       sources."lowercase-keys-1.0.1"
       sources."lru-3.1.0"
@@ -49750,6 +49733,7 @@ in
       sources."nan-2.14.0"
       sources."nanoassert-1.1.0"
       sources."nanobus-4.4.0"
+      sources."nanoguard-1.2.1"
       sources."nanomatch-1.2.13"
       sources."nanoscheduler-1.0.3"
       sources."nanotiming-7.3.1"
@@ -49778,6 +49762,7 @@ in
           sources."kind-of-3.2.2"
         ];
       })
+      sources."object-inspect-1.6.0"
       sources."object-keys-1.1.1"
       sources."object-visit-1.0.1"
       sources."object.pick-1.3.0"
@@ -49807,7 +49792,7 @@ in
         ];
       })
       sources."pseudomap-1.0.2"
-      sources."psl-1.3.0"
+      sources."psl-1.4.0"
       sources."pump-3.0.0"
       sources."punycode-2.1.1"
       sources."qs-6.5.2"
@@ -49835,12 +49820,13 @@ in
       sources."resolve-url-0.2.1"
       sources."ret-0.1.15"
       sources."revalidator-0.1.8"
-      sources."rimraf-2.6.3"
+      sources."rimraf-2.7.1"
+      sources."run-series-1.1.8"
       sources."rusha-0.8.13"
       sources."safe-buffer-5.2.0"
       sources."safe-regex-1.1.0"
       sources."safer-buffer-2.1.2"
-      sources."semver-5.7.0"
+      sources."semver-5.7.1"
       sources."semver-diff-2.1.0"
       (sources."set-value-2.0.1" // {
         dependencies = [
@@ -49891,9 +49877,9 @@ in
         ];
       })
       sources."sodium-javascript-0.5.5"
-      (sources."sodium-native-2.4.5" // {
+      (sources."sodium-native-2.4.6" // {
         dependencies = [
-          sources."node-gyp-build-4.1.0"
+          sources."node-gyp-build-4.1.1"
         ];
       })
       sources."sodium-universal-2.0.0"
@@ -49935,6 +49921,8 @@ in
       sources."stream-shift-1.0.0"
       sources."string-width-2.1.1"
       sources."string.prototype.trim-1.2.0"
+      sources."string.prototype.trimleft-2.1.0"
+      sources."string.prototype.trimright-2.1.0"
       (sources."string_decoder-1.1.1" // {
         dependencies = [
           sources."safe-buffer-5.1.2"
@@ -50010,7 +49998,7 @@ in
           sources."unordered-set-2.0.1"
         ];
       })
-      sources."uuid-3.3.2"
+      sources."uuid-3.3.3"
       sources."varint-3.0.1"
       sources."verror-1.10.0"
       sources."which-1.3.1"
@@ -50038,6 +50026,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   dhcp = nodeEnv.buildNodePackage {
     name = "dhcp";
@@ -50058,6 +50047,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   dnschain = nodeEnv.buildNodePackage {
     name = "dnschain";
@@ -50202,14 +50192,15 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   elasticdump = nodeEnv.buildNodePackage {
     name = "elasticdump";
     packageName = "elasticdump";
-    version = "6.3.3";
+    version = "6.9.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.3.3.tgz";
-      sha512 = "Ie0l2UPxw5owgBMT5zhYSZCS4cEXmIqcFiyLoPgArYgb2MNPPYLGFFBq7v8mvKzYAnl8zZcpGoXD4yzNM+lGxA==";
+      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.9.1.tgz";
+      sha512 = "5nnktnPlrlJIMDlkgWrS64LUdT7VpPo5WgC1o2CMYSV7Bb0lxga6HotsEAMsiddwVT2wJg7tmAZQd6/Lz+N5Hg==";
     };
     dependencies = [
       sources."JSONStream-1.3.5"
@@ -50218,7 +50209,7 @@ in
       sources."assert-plus-1.0.0"
       sources."async-2.6.3"
       sources."asynckit-0.4.0"
-      sources."aws-sdk-2.504.0"
+      sources."aws-sdk-2.529.0"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.8.0"
       sources."base64-js-1.3.1"
@@ -50231,8 +50222,10 @@ in
       sources."core-util-is-1.0.2"
       sources."dashdash-1.14.1"
       sources."decimal.js-10.2.0"
+      sources."delay-4.3.0"
       sources."delayed-stream-1.0.0"
       sources."ecc-jsbn-0.1.2"
+      sources."eventemitter3-4.0.0"
       sources."events-1.1.1"
       sources."extend-3.0.2"
       sources."extsprintf-1.3.0"
@@ -50269,9 +50262,12 @@ in
       sources."minimist-0.0.10"
       sources."oauth-sign-0.9.0"
       sources."optimist-0.6.1"
+      sources."p-finally-1.0.0"
+      sources."p-queue-6.1.1"
+      sources."p-timeout-3.1.0"
       sources."performance-now-2.1.0"
       sources."process-nextick-args-2.0.1"
-      sources."psl-1.3.0"
+      sources."psl-1.4.0"
       sources."punycode-1.3.2"
       sources."qs-6.5.2"
       sources."querystring-0.2.0"
@@ -50332,61 +50328,51 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   elm-live = nodeEnv.buildNodePackage {
     name = "elm-live";
     packageName = "elm-live";
-    version = "3.4.1";
+    version = "4.0.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/elm-live/-/elm-live-3.4.1.tgz";
-      sha512 = "7J4MCV0uyzfnGznSdVzz9o2vgHQwHSVKgEW/NG7dG7nsDWWxqPudQ/FkHYJFWjkylnRtBZUAtB27ZwnLIsgRUw==";
+      url = "https://registry.npmjs.org/elm-live/-/elm-live-4.0.0.tgz";
+      sha512 = "Yf6afXvBnghRZkefxgXCf/KjCm3DlwT6lfTrjLSc5v0I0VXE2Rc5T9iqXihjg3alh9t8NwDVLL+/py8PkkdC9Q==";
     };
     dependencies = [
       sources."ansi-regex-2.1.1"
       sources."ansi-styles-2.2.1"
-      sources."anymatch-3.0.3"
-      sources."async-each-1.0.3"
+      sources."anymatch-3.1.0"
       sources."async-limiter-1.0.1"
       sources."binary-extensions-2.0.0"
       sources."braces-3.0.2"
       sources."chalk-1.1.3"
       sources."charenc-0.0.2"
-      sources."chokidar-3.0.0"
-      sources."cli-color-1.2.0"
+      sources."chokidar-3.0.2"
       sources."commander-2.17.1"
-      sources."connect-pushstate-1.1.0"
+      sources."crocks-0.12.1"
       sources."cross-spawn-5.0.1"
       sources."crypt-0.0.2"
-      sources."d-1.0.1"
       sources."debug-2.6.9"
-      sources."default-gateway-2.7.2"
+      sources."default-gateway-4.2.0"
       sources."depd-1.1.2"
       sources."destroy-1.0.4"
       sources."ee-first-1.1.1"
-      (sources."elm-serve-0.4.0" // {
-        dependencies = [
-          sources."commander-2.9.0"
-        ];
-      })
+      sources."elm-hot-1.1.1"
       sources."encodeurl-1.0.2"
-      sources."es5-ext-0.10.50"
-      sources."es6-iterator-2.0.3"
-      sources."es6-promisify-6.0.1"
-      sources."es6-symbol-3.1.1"
-      sources."es6-weak-map-2.0.3"
+      sources."end-of-stream-1.4.1"
+      sources."es6-promisify-6.0.2"
       sources."escape-html-1.0.3"
       sources."escape-string-regexp-1.0.5"
       sources."etag-1.8.1"
-      sources."event-emitter-0.3.5"
       sources."eventemitter3-3.1.2"
-      (sources."execa-0.10.0" // {
+      (sources."execa-1.0.0" // {
         dependencies = [
           sources."cross-spawn-6.0.5"
         ];
       })
       sources."fill-range-7.0.1"
-      sources."finalhandler-1.1.1"
-      (sources."follow-redirects-1.7.0" // {
+      sources."finalhandler-1.1.2"
+      (sources."follow-redirects-1.9.0" // {
         dependencies = [
           sources."debug-3.2.6"
           sources."ms-2.1.2"
@@ -50394,14 +50380,13 @@ in
       })
       sources."fresh-0.5.2"
       sources."fsevents-2.0.7"
-      sources."get-stream-3.0.0"
+      sources."get-stream-4.1.0"
       sources."glob-parent-5.0.0"
-      sources."graceful-readlink-1.0.1"
       sources."has-ansi-2.0.0"
-      sources."http-errors-1.6.3"
+      sources."http-errors-1.7.3"
       sources."http-proxy-1.17.0"
-      sources."inherits-2.0.3"
-      sources."internal-ip-3.0.1"
+      sources."inherits-2.0.4"
+      sources."internal-ip-4.3.0"
       sources."ip-regex-2.1.0"
       sources."ipaddr.js-1.9.1"
       sources."is-binary-path-2.1.0"
@@ -50409,53 +50394,52 @@ in
       sources."is-extglob-2.1.1"
       sources."is-glob-4.0.1"
       sources."is-number-7.0.0"
-      sources."is-promise-2.1.0"
       sources."is-stream-1.1.0"
       sources."is-wsl-1.1.0"
       sources."isexe-2.0.0"
       sources."lru-cache-4.1.5"
-      sources."lru-queue-0.1.0"
       sources."md5-2.2.1"
-      sources."memoizee-0.4.14"
-      sources."mime-1.4.1"
-      sources."minimist-1.2.0"
+      sources."mime-2.4.3"
       sources."ms-2.0.0"
-      sources."next-tick-1.0.0"
       sources."nice-try-1.0.5"
       sources."normalize-path-3.0.0"
       sources."npm-run-path-2.0.2"
       sources."on-finished-2.3.0"
-      sources."opn-5.3.0"
+      sources."once-1.4.0"
+      sources."open-6.4.0"
       sources."os-tmpdir-1.0.2"
       sources."p-finally-1.0.0"
       sources."parseurl-1.3.3"
       sources."path-key-2.0.1"
-      sources."pem-1.13.2"
+      sources."pem-1.14.2"
       sources."picomatch-2.0.7"
       sources."pseudomap-1.0.2"
-      sources."querystringify-2.1.1"
+      sources."pump-3.0.0"
       sources."range-parser-1.2.1"
-      sources."readdirp-3.1.1"
+      sources."readdirp-3.1.2"
       sources."requires-port-1.0.0"
-      sources."semver-5.7.0"
-      sources."send-0.16.2"
-      sources."serve-static-1.13.2"
-      sources."setprototypeof-1.1.0"
+      sources."semver-5.7.1"
+      (sources."send-0.17.1" // {
+        dependencies = [
+          sources."mime-1.6.0"
+          sources."ms-2.1.1"
+        ];
+      })
+      sources."serve-static-1.14.1"
+      sources."setprototypeof-1.1.1"
       sources."shebang-command-1.2.0"
       sources."shebang-regex-1.0.0"
       sources."signal-exit-3.0.2"
-      sources."statuses-1.4.0"
+      sources."statuses-1.5.0"
       sources."strip-ansi-3.0.1"
       sources."strip-eof-1.0.0"
-      sources."supervisor-0.12.0"
       sources."supports-color-2.0.0"
-      sources."timers-ext-0.1.7"
       sources."to-regex-range-5.0.1"
-      sources."type-1.0.3"
+      sources."toidentifier-1.0.0"
       sources."unpipe-1.0.0"
-      sources."url-parse-1.4.3"
       sources."which-1.3.1"
-      sources."ws-5.2.0"
+      sources."wrappy-1.0.2"
+      sources."ws-7.1.1"
       sources."yallist-2.1.2"
     ];
     buildInputs = globalBuildInputs;
@@ -50466,6 +50450,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   elm-oracle = nodeEnv.buildNodePackage {
     name = "elm-oracle";
@@ -50483,6 +50468,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   emoj = nodeEnv.buildNodePackage {
     name = "emoj";
@@ -50560,18 +50546,13 @@ in
       sources."get-stream-3.0.0"
       sources."globals-9.18.0"
       sources."got-7.1.0"
-      sources."graceful-fs-4.2.1"
+      sources."graceful-fs-4.2.2"
       sources."has-ansi-3.0.0"
       sources."has-flag-3.0.0"
       sources."has-symbol-support-x-1.4.2"
       sources."has-to-string-tag-x-1.4.1"
       sources."home-or-tmp-2.0.0"
-      (sources."hosted-git-info-2.8.2" // {
-        dependencies = [
-          sources."lru-cache-5.1.1"
-          sources."yallist-3.0.3"
-        ];
-      })
+      sources."hosted-git-info-2.8.4"
       sources."import-jsx-1.3.2"
       sources."imurmurhash-0.1.4"
       sources."indent-string-3.2.0"
@@ -50590,7 +50571,7 @@ in
       sources."is-obj-1.0.1"
       sources."is-object-1.0.1"
       sources."is-plain-obj-1.1.0"
-      sources."is-retry-allowed-1.1.0"
+      sources."is-retry-allowed-1.2.0"
       sources."is-stream-1.1.0"
       sources."is-utf8-0.2.1"
       sources."isexe-2.0.0"
@@ -50658,7 +50639,7 @@ in
       sources."private-0.1.8"
       sources."prop-types-15.7.2"
       sources."pseudomap-1.0.2"
-      sources."react-is-16.8.6"
+      sources."react-is-16.9.0"
       sources."read-pkg-1.1.0"
       (sources."read-pkg-up-1.0.1" // {
         dependencies = [
@@ -50678,7 +50659,7 @@ in
       sources."resolve-from-3.0.0"
       sources."restore-cursor-2.0.0"
       sources."safe-buffer-5.2.0"
-      sources."semver-5.7.0"
+      sources."semver-5.7.1"
       sources."shebang-command-1.2.0"
       sources."shebang-regex-1.0.0"
       sources."signal-exit-3.0.2"
@@ -50729,6 +50710,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   emojione = nodeEnv.buildNodePackage {
     name = "emojione";
@@ -50745,20 +50727,21 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   eslint = nodeEnv.buildNodePackage {
     name = "eslint";
     packageName = "eslint";
-    version = "6.1.0";
+    version = "6.4.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/eslint/-/eslint-6.1.0.tgz";
-      sha512 = "QhrbdRD7ofuV09IuE2ySWBz0FyXCq0rriLTZXZqaWSI79CVtHVRdkFuFTViiqzZhkCgfOh9USpriuGN2gIpZDQ==";
+      url = "https://registry.npmjs.org/eslint/-/eslint-6.4.0.tgz";
+      sha512 = "WTVEzK3lSFoXUovDHEbkJqCVPEPwbhCq4trDktNI6ygs7aO41d4cDT0JFAT5MivzZeVLWlg7vHL+bgrQv/t3vA==";
     };
     dependencies = [
       sources."@babel/code-frame-7.5.5"
       sources."@babel/highlight-7.5.0"
-      sources."acorn-6.2.1"
-      sources."acorn-jsx-5.0.1"
+      sources."acorn-7.0.0"
+      sources."acorn-jsx-5.0.2"
       sources."ajv-6.10.2"
       sources."ansi-escapes-3.2.0"
       sources."ansi-regex-3.0.0"
@@ -50777,7 +50760,7 @@ in
       sources."concat-map-0.0.1"
       (sources."cross-spawn-6.0.5" // {
         dependencies = [
-          sources."semver-5.7.0"
+          sources."semver-5.7.1"
         ];
       })
       sources."debug-4.1.1"
@@ -50786,13 +50769,13 @@ in
       sources."emoji-regex-7.0.3"
       sources."escape-string-regexp-1.0.5"
       sources."eslint-scope-5.0.0"
-      sources."eslint-utils-1.4.0"
-      sources."eslint-visitor-keys-1.0.0"
-      sources."espree-6.0.0"
+      sources."eslint-utils-1.4.2"
+      sources."eslint-visitor-keys-1.1.0"
+      sources."espree-6.1.1"
       sources."esprima-4.0.1"
       sources."esquery-1.0.1"
       sources."esrecurse-4.2.1"
-      sources."estraverse-4.2.0"
+      sources."estraverse-4.3.0"
       sources."esutils-2.0.3"
       sources."external-editor-3.1.0"
       sources."fast-deep-equal-2.0.1"
@@ -50814,7 +50797,7 @@ in
       sources."imurmurhash-0.1.4"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
-      sources."inquirer-6.5.0"
+      sources."inquirer-6.5.2"
       sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-2.0.0"
       sources."is-glob-4.0.1"
@@ -50849,7 +50832,7 @@ in
       sources."restore-cursor-2.0.0"
       sources."rimraf-2.6.3"
       sources."run-async-2.3.0"
-      sources."rxjs-6.5.2"
+      sources."rxjs-6.5.3"
       sources."safer-buffer-2.1.2"
       sources."semver-6.3.0"
       sources."shebang-command-1.2.0"
@@ -50869,7 +50852,7 @@ in
       })
       sources."strip-json-comments-3.0.1"
       sources."supports-color-5.5.0"
-      (sources."table-5.4.5" // {
+      (sources."table-5.4.6" // {
         dependencies = [
           sources."string-width-3.1.0"
         ];
@@ -50894,6 +50877,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   eslint_d = nodeEnv.buildNodePackage {
     name = "eslint_d";
@@ -50906,8 +50890,8 @@ in
     dependencies = [
       sources."@babel/code-frame-7.5.5"
       sources."@babel/highlight-7.5.0"
-      sources."acorn-6.2.1"
-      sources."acorn-jsx-5.0.1"
+      sources."acorn-7.0.0"
+      sources."acorn-jsx-5.0.2"
       sources."ajv-6.10.2"
       sources."ansi-escapes-3.2.0"
       sources."ansi-regex-3.0.0"
@@ -50927,7 +50911,7 @@ in
       sources."core_d-1.0.1"
       (sources."cross-spawn-6.0.5" // {
         dependencies = [
-          sources."semver-5.7.0"
+          sources."semver-5.7.1"
         ];
       })
       sources."debug-4.1.1"
@@ -50935,15 +50919,15 @@ in
       sources."doctrine-3.0.0"
       sources."emoji-regex-7.0.3"
       sources."escape-string-regexp-1.0.5"
-      sources."eslint-6.1.0"
+      sources."eslint-6.4.0"
       sources."eslint-scope-5.0.0"
-      sources."eslint-utils-1.4.0"
-      sources."eslint-visitor-keys-1.0.0"
-      sources."espree-6.0.0"
+      sources."eslint-utils-1.4.2"
+      sources."eslint-visitor-keys-1.1.0"
+      sources."espree-6.1.1"
       sources."esprima-4.0.1"
       sources."esquery-1.0.1"
       sources."esrecurse-4.2.1"
-      sources."estraverse-4.2.0"
+      sources."estraverse-4.3.0"
       sources."esutils-2.0.3"
       sources."external-editor-3.1.0"
       sources."fast-deep-equal-2.0.1"
@@ -50965,7 +50949,7 @@ in
       sources."imurmurhash-0.1.4"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
-      sources."inquirer-6.5.0"
+      sources."inquirer-6.5.2"
       sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-2.0.0"
       sources."is-glob-4.0.1"
@@ -51003,7 +50987,7 @@ in
       sources."restore-cursor-2.0.0"
       sources."rimraf-2.6.3"
       sources."run-async-2.3.0"
-      sources."rxjs-6.5.2"
+      sources."rxjs-6.5.3"
       sources."safer-buffer-2.1.2"
       sources."semver-6.3.0"
       sources."shebang-command-1.2.0"
@@ -51023,7 +51007,7 @@ in
       })
       sources."strip-json-comments-3.0.1"
       sources."supports-color-5.5.0"
-      (sources."table-5.4.5" // {
+      (sources."table-5.4.6" // {
         dependencies = [
           sources."string-width-3.1.0"
         ];
@@ -51048,6 +51032,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   "fast-cli-1.x" = nodeEnv.buildNodePackage {
     name = "fast-cli";
@@ -51104,13 +51089,13 @@ in
       sources."fs-extra-1.0.0"
       sources."get-stdin-4.0.1"
       sources."getpass-0.1.7"
-      sources."graceful-fs-4.2.1"
+      sources."graceful-fs-4.2.2"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.3"
       sources."has-ansi-2.0.0"
       sources."has-flag-3.0.0"
       sources."hasha-2.2.0"
-      sources."hosted-git-info-2.8.2"
+      sources."hosted-git-info-2.8.4"
       sources."http-signature-1.2.0"
       sources."indent-string-2.1.0"
       sources."inherits-2.0.4"
@@ -51140,7 +51125,6 @@ in
       })
       sources."log-update-1.0.2"
       sources."loud-rejection-1.6.0"
-      sources."lru-cache-5.1.1"
       sources."map-obj-1.0.1"
       sources."meow-3.7.0"
       sources."mime-db-1.40.0"
@@ -51184,7 +51168,7 @@ in
       sources."process-nextick-args-2.0.1"
       sources."progress-1.1.8"
       sources."promise-phantom-3.1.6"
-      sources."psl-1.3.0"
+      sources."psl-1.4.0"
       sources."punycode-2.1.1"
       sources."qs-6.5.2"
       sources."read-pkg-1.1.0"
@@ -51198,7 +51182,7 @@ in
       sources."restore-cursor-1.0.1"
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
-      sources."semver-5.7.0"
+      sources."semver-5.7.1"
       sources."signal-exit-3.0.2"
       sources."spdx-correct-3.1.0"
       sources."spdx-exceptions-2.2.0"
@@ -51223,11 +51207,10 @@ in
       sources."typedarray-0.0.6"
       sources."uri-js-4.2.2"
       sources."util-deprecate-1.0.2"
-      sources."uuid-3.3.2"
+      sources."uuid-3.3.3"
       sources."validate-npm-package-license-3.0.4"
       sources."verror-1.10.0"
       sources."which-1.3.1"
-      sources."yallist-3.0.3"
       sources."yauzl-2.4.1"
       sources."zen-observable-0.5.2"
     ];
@@ -51239,6 +51222,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   fkill-cli = nodeEnv.buildNodePackage {
     name = "fkill-cli";
@@ -51292,18 +51276,13 @@ in
       sources."generate-function-1.1.0"
       sources."generate-object-property-1.2.0"
       sources."get-stream-3.0.0"
-      sources."graceful-fs-4.2.1"
+      sources."graceful-fs-4.2.2"
       sources."has-flag-3.0.0"
-      (sources."hosted-git-info-2.8.2" // {
-        dependencies = [
-          sources."lru-cache-5.1.1"
-          sources."yallist-3.0.3"
-        ];
-      })
+      sources."hosted-git-info-2.8.4"
       sources."iconv-lite-0.4.24"
       sources."indent-string-3.2.0"
       sources."inherits-2.0.4"
-      (sources."inquirer-6.5.0" // {
+      (sources."inquirer-6.5.2" // {
         dependencies = [
           sources."ansi-regex-4.1.0"
           sources."strip-ansi-5.2.0"
@@ -51380,11 +51359,11 @@ in
       sources."resolve-1.12.0"
       sources."restore-cursor-2.0.0"
       sources."run-async-2.3.0"
-      sources."rxjs-6.5.2"
+      sources."rxjs-6.5.3"
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
       sources."sec-1.0.0"
-      sources."semver-5.7.0"
+      sources."semver-5.7.1"
       sources."shebang-command-1.2.0"
       sources."shebang-regex-1.0.0"
       sources."signal-exit-3.0.2"
@@ -51431,6 +51410,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   forever = nodeEnv.buildNodePackage {
     name = "forever";
@@ -51507,7 +51487,8 @@ in
       sources."cycle-1.0.3"
       sources."debug-2.6.9"
       sources."decode-uri-component-0.2.0"
-      sources."deep-equal-1.0.1"
+      sources."deep-equal-1.1.0"
+      sources."define-properties-1.1.3"
       (sources."define-property-2.0.2" // {
         dependencies = [
           sources."isobject-3.0.1"
@@ -51547,11 +51528,13 @@ in
       sources."fragment-cache-0.2.1"
       sources."fs.realpath-1.0.0"
       sources."fsevents-1.2.9"
+      sources."function-bind-1.1.1"
       sources."get-value-2.0.6"
       sources."glob-7.1.4"
       sources."glob-base-0.3.0"
       sources."glob-parent-2.0.0"
-      sources."graceful-fs-4.2.1"
+      sources."graceful-fs-4.2.2"
+      sources."has-1.0.3"
       (sources."has-value-1.0.0" // {
         dependencies = [
           sources."isobject-3.0.1"
@@ -51576,6 +51559,7 @@ in
           sources."kind-of-6.0.2"
         ];
       })
+      sources."is-arguments-1.0.4"
       sources."is-binary-path-1.0.1"
       sources."is-buffer-1.1.6"
       (sources."is-data-descriptor-1.0.0" // {
@@ -51583,6 +51567,7 @@ in
           sources."kind-of-6.0.2"
         ];
       })
+      sources."is-date-object-1.0.1"
       (sources."is-descriptor-1.0.2" // {
         dependencies = [
           sources."kind-of-6.0.2"
@@ -51601,6 +51586,7 @@ in
       })
       sources."is-posix-bracket-0.1.1"
       sources."is-primitive-2.0.0"
+      sources."is-regex-1.0.4"
       sources."is-windows-1.0.2"
       sources."isarray-1.0.0"
       sources."isobject-2.1.0"
@@ -51656,6 +51642,8 @@ in
           })
         ];
       })
+      sources."object-is-1.0.1"
+      sources."object-keys-1.1.1"
       (sources."object-visit-1.0.1" // {
         dependencies = [
           sources."isobject-3.0.1"
@@ -51749,6 +51737,7 @@ in
       })
       sources."regex-cache-0.4.4"
       sources."regex-not-1.0.2"
+      sources."regexp.prototype.flags-1.2.0"
       sources."remove-trailing-separator-1.1.0"
       sources."repeat-element-1.1.3"
       sources."repeat-string-1.6.1"
@@ -51756,7 +51745,7 @@ in
       sources."resumer-0.0.0"
       sources."ret-0.1.15"
       sources."revalidator-0.1.8"
-      sources."rimraf-2.6.3"
+      sources."rimraf-2.7.1"
       sources."safe-buffer-5.1.2"
       sources."safe-regex-1.1.0"
       (sources."set-value-2.0.1" // {
@@ -51861,6 +51850,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   git-run = nodeEnv.buildNodePackage {
     name = "git-run";
@@ -51878,7 +51868,7 @@ in
       sources."microee-0.0.6"
       sources."minilog-3.1.0"
       sources."ms-2.1.2"
-      sources."simple-git-1.124.0"
+      sources."simple-git-1.126.0"
       sources."tabtab-git+https://github.com/mixu/node-tabtab.git"
     ];
     buildInputs = globalBuildInputs;
@@ -51889,6 +51879,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   git-ssb = nodeEnv.buildNodePackage {
     name = "git-ssb";
@@ -51916,7 +51907,7 @@ in
       sources."git-remote-ssb-2.0.4"
       sources."git-ssb-web-2.8.0"
       sources."hashlru-2.3.0"
-      sources."highlight.js-9.15.9"
+      sources."highlight.js-9.15.10"
       sources."increment-buffer-1.0.1"
       sources."inherits-2.0.4"
       sources."ini-1.3.5"
@@ -51953,8 +51944,8 @@ in
       sources."multiserver-scopes-1.0.0"
       sources."muxrpc-6.4.2"
       sources."nan-2.14.0"
-      sources."nearley-2.18.0"
-      sources."node-gyp-build-4.1.0"
+      sources."nearley-2.19.0"
+      sources."node-gyp-build-4.1.1"
       sources."node-polyglot-1.0.0"
       sources."non-private-ip-1.4.4"
       sources."options-0.0.6"
@@ -52001,7 +51992,7 @@ in
       sources."pull-pushable-2.2.0"
       sources."pull-reader-1.3.1"
       sources."pull-skip-footer-0.1.0"
-      sources."pull-stream-3.6.13"
+      sources."pull-stream-3.6.14"
       (sources."pull-through-1.0.18" // {
         dependencies = [
           sources."looper-3.0.0"
@@ -52016,7 +52007,7 @@ in
       sources."ret-0.1.15"
       sources."safe-buffer-5.2.0"
       sources."secret-handshake-1.1.20"
-      sources."semver-5.7.0"
+      sources."semver-5.7.1"
       sources."separator-escape-0.0.0"
       sources."sha.js-2.4.5"
       sources."smart-buffer-4.0.2"
@@ -52029,7 +52020,7 @@ in
         ];
       })
       sources."sodium-chloride-1.1.2"
-      sources."sodium-native-2.4.5"
+      sources."sodium-native-2.4.6"
       sources."split-buffer-1.0.0"
       sources."ssb-avatar-0.2.0"
       sources."ssb-caps-1.1.0"
@@ -52078,6 +52069,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   git-standup = nodeEnv.buildNodePackage {
     name = "git-standup";
@@ -52095,14 +52087,15 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   graphql-cli = nodeEnv.buildNodePackage {
     name = "graphql-cli";
     packageName = "graphql-cli";
-    version = "3.0.12";
+    version = "3.0.14";
     src = fetchurl {
-      url = "https://registry.npmjs.org/graphql-cli/-/graphql-cli-3.0.12.tgz";
-      sha512 = "+6MxnbXHaAcpF574KTmpkXJmwXQmtP8YVaTY3IKBgqHzL5PMmTrrFgbLUbwDVJDZ5sSr/kMZgZFMiAczMYtykw==";
+      url = "https://registry.npmjs.org/graphql-cli/-/graphql-cli-3.0.14.tgz";
+      sha512 = "YNLHnZsePE2rJycM4E79sE4dx9G1S3rRbKdSbQEFEjOr1wHMEVzvZ3mL4Er6yqIYNWNC95HpQjxfCbjBBxRyng==";
     };
     dependencies = [
       sources."@babel/generator-7.0.0-beta.38"
@@ -52293,7 +52286,7 @@ in
       sources."forwarded-0.1.2"
       sources."fresh-0.5.2"
       sources."fs-extra-5.0.0"
-      sources."fs-minipass-1.2.6"
+      sources."fs-minipass-1.2.7"
       sources."fs.realpath-1.0.0"
       sources."get-caller-file-1.0.3"
       sources."get-stream-3.0.0"
@@ -52303,7 +52296,7 @@ in
       sources."global-modules-1.0.0"
       sources."global-prefix-1.0.2"
       sources."got-6.7.1"
-      sources."graceful-fs-4.2.1"
+      sources."graceful-fs-4.2.2"
       sources."graphcool-json-schema-1.2.1"
       (sources."graphcool-yml-0.4.15" // {
         dependencies = [
@@ -52316,7 +52309,7 @@ in
           sources."ms-2.1.2"
         ];
       })
-      sources."graphql-14.4.2"
+      sources."graphql-14.5.6"
       (sources."graphql-cli-prepare-1.4.19" // {
         dependencies = [
           sources."chalk-2.3.1"
@@ -52341,12 +52334,7 @@ in
       sources."has-flag-3.0.0"
       sources."header-case-1.0.1"
       sources."homedir-polyfill-1.0.3"
-      (sources."hosted-git-info-2.8.2" // {
-        dependencies = [
-          sources."lru-cache-5.1.1"
-          sources."yallist-3.0.3"
-        ];
-      })
+      sources."hosted-git-info-2.8.4"
       (sources."http-errors-1.7.2" // {
         dependencies = [
           sources."inherits-2.0.3"
@@ -52391,7 +52379,7 @@ in
       sources."is-path-inside-1.0.1"
       sources."is-promise-2.1.0"
       sources."is-redirect-1.0.0"
-      sources."is-retry-allowed-1.1.0"
+      sources."is-retry-allowed-1.2.0"
       sources."is-stream-1.1.0"
       sources."is-typedarray-1.0.0"
       sources."is-upper-case-1.1.2"
@@ -52471,12 +52459,12 @@ in
       sources."mimic-fn-1.2.0"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
-      (sources."minipass-2.3.5" // {
+      (sources."minipass-2.6.2" // {
         dependencies = [
           sources."yallist-3.0.3"
         ];
       })
-      sources."minizlib-1.2.1"
+      sources."minizlib-1.2.2"
       sources."mkdirp-0.5.1"
       sources."ms-2.0.0"
       sources."mute-stream-0.0.7"
@@ -52553,7 +52541,7 @@ in
       sources."proxy-addr-2.0.5"
       sources."prr-1.0.1"
       sources."pseudomap-1.0.2"
-      sources."psl-1.3.0"
+      sources."psl-1.4.0"
       sources."pump-3.0.0"
       sources."punycode-2.1.1"
       sources."qs-6.5.2"
@@ -52585,13 +52573,13 @@ in
       sources."resolve-dir-1.0.1"
       sources."resolve-from-4.0.0"
       sources."restore-cursor-2.0.0"
-      sources."rimraf-2.6.3"
+      sources."rimraf-2.7.1"
       sources."run-async-2.3.0"
-      sources."rxjs-6.5.2"
+      sources."rxjs-6.5.3"
       sources."safe-buffer-5.2.0"
       sources."safer-buffer-2.1.2"
       sources."scuid-1.1.0"
-      sources."semver-5.7.0"
+      sources."semver-5.7.1"
       sources."semver-diff-2.1.0"
       (sources."send-0.17.1" // {
         dependencies = [
@@ -52677,7 +52665,7 @@ in
       sources."url-regex-3.2.0"
       sources."util-deprecate-1.0.2"
       sources."utils-merge-1.0.1"
-      sources."uuid-3.3.2"
+      sources."uuid-3.3.3"
       sources."validate-npm-package-license-3.0.4"
       sources."validator-10.11.0"
       sources."vary-1.1.2"
@@ -52713,7 +52701,7 @@ in
           sources."mem-4.3.0"
           sources."mimic-fn-2.1.0"
           sources."os-locale-3.1.0"
-          sources."p-limit-2.2.0"
+          sources."p-limit-2.2.1"
           sources."p-locate-3.0.0"
           sources."p-try-2.2.0"
           sources."yargs-parser-11.1.1"
@@ -52730,6 +52718,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   grunt-cli = nodeEnv.buildNodePackage {
     name = "grunt-cli";
@@ -52995,6 +52984,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   gtop = nodeEnv.buildNodePackage {
     name = "gtop";
@@ -53020,8 +53010,11 @@ in
       sources."cli-table-0.3.1"
       sources."colors-1.0.3"
       sources."core-util-is-1.0.2"
+      sources."define-properties-1.1.3"
       sources."drawille-blessed-contrib-1.0.0"
       sources."drawille-canvas-blessed-contrib-0.1.3"
+      sources."es-abstract-1.14.2"
+      sources."es-to-primitive-1.2.0"
       sources."escape-string-regexp-1.0.5"
       sources."esprima-3.0.0"
       (sources."event-stream-0.9.8" // {
@@ -53029,10 +53022,17 @@ in
           sources."optimist-0.2.8"
         ];
       })
+      sources."function-bind-1.1.1"
       sources."gl-matrix-2.8.1"
+      sources."has-1.0.3"
       sources."has-ansi-2.0.0"
+      sources."has-symbols-1.0.0"
       sources."here-0.0.2"
       sources."inherits-2.0.4"
+      sources."is-callable-1.1.4"
+      sources."is-date-object-1.0.1"
+      sources."is-regex-1.0.4"
+      sources."is-symbol-1.0.2"
       sources."isarray-0.0.1"
       sources."lodash-4.17.15"
       sources."lodash.assign-4.2.0"
@@ -53044,6 +53044,9 @@ in
       sources."memorystream-0.3.1"
       sources."node-emoji-1.10.0"
       sources."nopt-2.1.2"
+      sources."object-inspect-1.6.0"
+      sources."object-keys-1.1.1"
+      sources."object.getownpropertydescriptors-2.0.3"
       sources."optimist-0.3.7"
       sources."picture-tuber-1.0.2"
       sources."png-js-0.1.1"
@@ -53051,15 +53054,18 @@ in
       sources."redeyed-1.0.1"
       sources."sax-1.2.4"
       sources."sparkline-0.1.2"
+      sources."string.prototype.trimleft-2.1.0"
+      sources."string.prototype.trimright-2.1.0"
       sources."string_decoder-0.10.31"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
-      sources."systeminformation-4.14.4"
+      sources."systeminformation-4.14.8"
       sources."term-canvas-0.0.5"
+      sources."util.promisify-1.0.0"
       sources."wordwrap-0.0.3"
       sources."x256-0.0.2"
-      sources."xml2js-0.4.19"
-      sources."xmlbuilder-9.0.7"
+      sources."xml2js-0.4.22"
+      sources."xmlbuilder-11.0.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -53069,6 +53075,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   gulp = nodeEnv.buildNodePackage {
     name = "gulp";
@@ -53132,7 +53139,7 @@ in
       sources."buffer-from-1.1.1"
       sources."cache-base-1.0.1"
       sources."camelcase-3.0.0"
-      (sources."chokidar-2.1.6" // {
+      (sources."chokidar-2.1.8" // {
         dependencies = [
           sources."normalize-path-3.0.0"
         ];
@@ -53187,9 +53194,9 @@ in
       sources."each-props-1.3.2"
       sources."end-of-stream-1.4.1"
       sources."error-ex-1.3.2"
-      sources."es5-ext-0.10.50"
+      sources."es5-ext-0.10.51"
       sources."es6-iterator-2.0.3"
-      sources."es6-symbol-3.1.1"
+      sources."es6-symbol-3.1.2"
       sources."es6-weak-map-2.0.3"
       (sources."expand-brackets-2.1.4" // {
         dependencies = [
@@ -53253,7 +53260,7 @@ in
       sources."global-modules-1.0.0"
       sources."global-prefix-1.0.2"
       sources."glogg-1.0.2"
-      sources."graceful-fs-4.2.1"
+      sources."graceful-fs-4.2.2"
       sources."gulp-cli-2.2.0"
       sources."gulplog-1.0.0"
       sources."has-symbols-1.0.0"
@@ -53264,7 +53271,7 @@ in
         ];
       })
       sources."homedir-polyfill-1.0.3"
-      sources."hosted-git-info-2.8.2"
+      sources."hosted-git-info-2.8.4"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."ini-1.3.5"
@@ -53305,7 +53312,6 @@ in
       sources."lead-1.0.0"
       sources."liftoff-3.1.0"
       sources."load-json-file-1.1.0"
-      sources."lru-cache-5.1.1"
       sources."make-iterator-1.0.1"
       sources."map-cache-0.2.2"
       sources."map-visit-1.0.0"
@@ -53396,7 +53402,7 @@ in
       sources."ret-0.1.15"
       sources."safe-buffer-5.1.2"
       sources."safe-regex-1.1.0"
-      sources."semver-5.7.0"
+      sources."semver-5.7.1"
       sources."semver-greatest-satisfied-range-1.1.0"
       sources."set-blocking-2.0.0"
       (sources."set-value-2.0.1" // {
@@ -53495,7 +53501,7 @@ in
           sources."has-values-0.1.4"
         ];
       })
-      sources."upath-1.1.2"
+      sources."upath-1.2.0"
       sources."urix-0.1.0"
       sources."use-3.1.1"
       sources."util-deprecate-1.0.2"
@@ -53511,7 +53517,6 @@ in
       sources."wrappy-1.0.2"
       sources."xtend-4.0.2"
       sources."y18n-3.2.1"
-      sources."yallist-3.0.3"
       sources."yargs-7.1.0"
       sources."yargs-parser-5.0.0"
     ];
@@ -53523,6 +53528,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   gulp-cli = nodeEnv.buildNodePackage {
     name = "gulp-cli";
@@ -53587,9 +53593,9 @@ in
       sources."detect-file-1.0.0"
       sources."each-props-1.3.2"
       sources."error-ex-1.3.2"
-      sources."es5-ext-0.10.50"
+      sources."es5-ext-0.10.51"
       sources."es6-iterator-2.0.3"
-      sources."es6-symbol-3.1.1"
+      sources."es6-symbol-3.1.2"
       (sources."expand-brackets-2.1.4" // {
         dependencies = [
           sources."define-property-0.2.5"
@@ -53631,7 +53637,7 @@ in
       sources."global-modules-1.0.0"
       sources."global-prefix-1.0.2"
       sources."glogg-1.0.2"
-      sources."graceful-fs-4.2.1"
+      sources."graceful-fs-4.2.2"
       sources."gulplog-1.0.0"
       sources."has-value-1.0.0"
       (sources."has-values-1.0.0" // {
@@ -53640,7 +53646,7 @@ in
         ];
       })
       sources."homedir-polyfill-1.0.3"
-      sources."hosted-git-info-2.8.2"
+      sources."hosted-git-info-2.8.4"
       sources."inherits-2.0.4"
       sources."ini-1.3.5"
       sources."interpret-1.2.0"
@@ -53684,7 +53690,6 @@ in
       sources."lcid-1.0.0"
       sources."liftoff-3.1.0"
       sources."load-json-file-1.1.0"
-      sources."lru-cache-5.1.1"
       (sources."make-iterator-1.0.1" // {
         dependencies = [
           sources."kind-of-6.0.2"
@@ -53769,7 +53774,7 @@ in
       sources."ret-0.1.15"
       sources."safe-buffer-5.1.2"
       sources."safe-regex-1.1.0"
-      sources."semver-5.7.0"
+      sources."semver-5.7.1"
       sources."semver-greatest-satisfied-range-1.1.0"
       sources."set-blocking-2.0.0"
       (sources."set-value-2.0.1" // {
@@ -53852,7 +53857,6 @@ in
       sources."which-module-1.0.0"
       sources."wrap-ansi-2.1.0"
       sources."y18n-3.2.1"
-      sources."yallist-3.0.3"
       sources."yargs-7.1.0"
       sources."yargs-parser-5.0.0"
     ];
@@ -53864,6 +53868,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   html-minifier = nodeEnv.buildNodePackage {
     name = "html-minifier";
@@ -53894,6 +53899,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   htmlhint = nodeEnv.buildNodePackage {
     name = "htmlhint";
@@ -53983,7 +53989,7 @@ in
       sources."path-is-absolute-1.0.1"
       sources."path-parse-1.0.6"
       sources."performance-now-2.1.0"
-      sources."psl-1.3.0"
+      sources."psl-1.4.0"
       sources."punycode-2.1.1"
       sources."qs-6.5.2"
       sources."readable-stream-1.1.14"
@@ -54002,7 +54008,7 @@ in
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."uri-js-4.2.2"
-      sources."uuid-3.3.2"
+      sources."uuid-3.3.3"
       sources."verror-1.10.0"
       sources."wrappy-1.0.2"
       sources."xml-1.0.1"
@@ -54015,6 +54021,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   http-server = nodeEnv.buildNodePackage {
     name = "http-server";
@@ -54031,7 +54038,7 @@ in
       sources."debug-3.2.6"
       sources."ecstatic-3.3.2"
       sources."eventemitter3-3.1.2"
-      sources."follow-redirects-1.7.0"
+      sources."follow-redirects-1.9.0"
       sources."he-1.2.0"
       sources."http-proxy-1.17.0"
       sources."mime-1.6.0"
@@ -54048,7 +54055,7 @@ in
           sources."minimist-0.0.10"
         ];
       })
-      (sources."portfinder-1.0.21" // {
+      (sources."portfinder-1.0.24" // {
         dependencies = [
           sources."debug-2.6.9"
           sources."ms-2.0.0"
@@ -54068,6 +54075,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   hueadm = nodeEnv.buildNodePackage {
     name = "hueadm";
@@ -54084,7 +54092,7 @@ in
       sources."balanced-match-1.0.0"
       sources."brace-expansion-1.1.11"
       sources."cmdln-4.4.0"
-      sources."color-convert-2.0.0"
+      sources."color-convert-2.0.1"
       sources."color-name-1.1.4"
       sources."concat-map-0.0.1"
       sources."core-util-is-1.0.2"
@@ -54106,9 +54114,9 @@ in
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
       sources."readable-stream-3.4.0"
-      sources."safe-buffer-5.1.2"
+      sources."safe-buffer-5.2.0"
       sources."sprintf-js-1.0.3"
-      sources."string_decoder-1.2.0"
+      sources."string_decoder-1.3.0"
       sources."tabula-1.10.0"
       sources."util-deprecate-1.0.2"
       sources."verror-1.10.0"
@@ -54123,6 +54131,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   imapnotify = nodeEnv.buildNodePackage {
     name = "imapnotify";
@@ -54141,7 +54150,7 @@ in
       sources."concat-map-0.0.1"
       sources."core-util-is-1.0.2"
       sources."cycle-1.0.3"
-      sources."dtrace-provider-0.8.7"
+      sources."dtrace-provider-0.8.8"
       sources."eyes-0.1.8"
       sources."glob-6.0.4"
       sources."imap-0.8.19"
@@ -54185,6 +54194,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   indium = nodeEnv.buildNodePackage {
     name = "indium";
@@ -54200,7 +54210,7 @@ in
       sources."commander-2.11.0"
       sources."node-fetch-2.6.0"
       sources."safe-buffer-5.1.2"
-      sources."semver-5.7.0"
+      sources."semver-5.7.1"
       sources."source-map-0.7.3"
       sources."ultron-1.1.1"
       sources."ws-3.3.3"
@@ -54213,27 +54223,28 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   ionic = nodeEnv.buildNodePackage {
     name = "ionic";
     packageName = "ionic";
-    version = "5.2.3";
+    version = "5.2.8";
     src = fetchurl {
-      url = "https://registry.npmjs.org/ionic/-/ionic-5.2.3.tgz";
-      sha512 = "4TX29yrOhlcSFX8LRoB3ss2PaSyV6DBVnnCC7S/hBhmN0jS6/bQS7nO7gafvX8he08MF9DEfz5GVqXvME9a4og==";
+      url = "https://registry.npmjs.org/ionic/-/ionic-5.2.8.tgz";
+      sha512 = "BeUquVJKI5CEqfyt1YlibDyvf/CyiXwg2957/vm6xkxp4At8D9tKJ3Ldb5e74SEgon5u1+mbcGNjDYB/OtTHgQ==";
     };
     dependencies = [
-      sources."@ionic/cli-framework-2.1.2"
-      sources."@ionic/discover-2.0.2"
-      sources."@ionic/utils-array-1.0.1"
-      sources."@ionic/utils-fs-2.0.3"
-      sources."@ionic/utils-network-1.0.1"
-      sources."@ionic/utils-object-1.0.1"
-      sources."@ionic/utils-process-1.0.1"
-      sources."@ionic/utils-stream-2.0.0"
-      sources."@ionic/utils-subprocess-1.0.3"
-      sources."@ionic/utils-terminal-1.0.1"
-      sources."@types/node-8.10.51"
+      sources."@ionic/cli-framework-2.1.6"
+      sources."@ionic/discover-2.0.5"
+      sources."@ionic/utils-array-1.2.0"
+      sources."@ionic/utils-fs-2.0.6"
+      sources."@ionic/utils-network-1.0.4"
+      sources."@ionic/utils-object-1.0.4"
+      sources."@ionic/utils-process-1.0.4"
+      sources."@ionic/utils-stream-2.0.3"
+      sources."@ionic/utils-subprocess-1.0.7"
+      sources."@ionic/utils-terminal-1.0.4"
+      sources."@types/node-8.10.54"
       sources."agent-base-4.3.0"
       sources."ansi-escapes-3.2.0"
       sources."ansi-regex-3.0.0"
@@ -54260,7 +54271,7 @@ in
       sources."core-util-is-1.0.2"
       (sources."cross-spawn-6.0.5" // {
         dependencies = [
-          sources."semver-5.7.0"
+          sources."semver-5.7.1"
         ];
       })
       sources."data-uri-to-buffer-2.0.1"
@@ -54273,6 +54284,7 @@ in
       (sources."duplexer2-0.1.4" // {
         dependencies = [
           sources."readable-stream-2.3.6"
+          sources."safe-buffer-5.1.2"
           sources."string_decoder-1.1.1"
         ];
       })
@@ -54282,9 +54294,9 @@ in
       sources."es6-promise-4.2.8"
       sources."es6-promisify-5.0.0"
       sources."escape-string-regexp-1.0.5"
-      sources."escodegen-1.11.1"
+      sources."escodegen-1.12.0"
       sources."esprima-3.1.3"
-      sources."estraverse-4.2.0"
+      sources."estraverse-4.3.0"
       sources."esutils-2.0.3"
       sources."execa-1.0.0"
       sources."extend-3.0.2"
@@ -54292,10 +54304,10 @@ in
       sources."fast-levenshtein-2.0.6"
       sources."figures-2.0.0"
       sources."file-uri-to-path-1.0.0"
-      sources."form-data-2.5.0"
+      sources."form-data-2.5.1"
       sources."formidable-1.2.1"
       sources."fs-extra-8.1.0"
-      sources."fs-minipass-1.2.6"
+      sources."fs-minipass-1.2.7"
       sources."fs.realpath-1.0.0"
       (sources."ftp-0.3.10" // {
         dependencies = [
@@ -54307,7 +54319,7 @@ in
       sources."get-stream-4.1.0"
       sources."get-uri-2.0.3"
       sources."glob-7.1.4"
-      sources."graceful-fs-4.2.1"
+      sources."graceful-fs-4.2.2"
       sources."has-flag-3.0.0"
       sources."http-errors-1.7.3"
       (sources."http-proxy-agent-2.1.0" // {
@@ -54325,7 +54337,7 @@ in
       sources."imurmurhash-0.1.4"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
-      (sources."inquirer-6.5.0" // {
+      (sources."inquirer-6.5.2" // {
         dependencies = [
           (sources."string-width-2.1.1" // {
             dependencies = [
@@ -54362,7 +54374,7 @@ in
       sources."lodash.isarray-3.0.4"
       sources."lodash.keys-3.1.2"
       sources."lodash.restparam-3.6.1"
-      (sources."log-update-3.2.0" // {
+      (sources."log-update-3.3.0" // {
         dependencies = [
           sources."string-width-3.1.0"
           sources."wrap-ansi-5.1.0"
@@ -54377,12 +54389,12 @@ in
       sources."mimic-fn-1.2.0"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
-      (sources."minipass-2.3.5" // {
+      (sources."minipass-2.6.2" // {
         dependencies = [
           sources."yallist-3.0.3"
         ];
       })
-      sources."minizlib-1.2.1"
+      sources."minizlib-1.2.2"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
@@ -54418,15 +54430,15 @@ in
       sources."proxy-from-env-1.0.0"
       sources."pseudomap-1.0.2"
       sources."pump-3.0.0"
-      sources."qs-6.7.0"
+      sources."qs-6.8.0"
       sources."raw-body-2.4.1"
       sources."readable-stream-3.4.0"
       sources."restore-cursor-2.0.0"
-      sources."rimraf-2.6.3"
+      sources."rimraf-3.0.0"
       sources."rsvp-3.6.2"
       sources."run-async-2.3.0"
-      sources."rxjs-6.5.2"
-      sources."safe-buffer-5.1.2"
+      sources."rxjs-6.5.3"
+      sources."safe-buffer-5.2.0"
       sources."safer-buffer-2.1.2"
       sources."sax-1.1.4"
       sources."semver-6.3.0"
@@ -54449,6 +54461,7 @@ in
       (sources."stream-combiner2-1.1.1" // {
         dependencies = [
           sources."readable-stream-2.3.6"
+          sources."safe-buffer-5.1.2"
           sources."string_decoder-1.1.1"
         ];
       })
@@ -54458,7 +54471,7 @@ in
           sources."is-fullwidth-code-point-3.0.0"
         ];
       })
-      sources."string_decoder-1.2.0"
+      sources."string_decoder-1.3.0"
       (sources."strip-ansi-5.2.0" // {
         dependencies = [
           sources."ansi-regex-4.1.0"
@@ -54490,20 +54503,20 @@ in
       sources."unpipe-1.0.0"
       sources."untildify-4.0.0"
       sources."util-deprecate-1.0.2"
-      sources."uuid-3.3.2"
+      sources."uuid-3.3.3"
       sources."which-1.3.1"
       sources."windows-release-3.2.0"
       sources."wordwrap-1.0.0"
       (sources."wrap-ansi-6.0.0" // {
         dependencies = [
-          sources."ansi-styles-4.0.0"
-          sources."color-convert-2.0.0"
+          sources."ansi-styles-4.1.0"
+          sources."color-convert-2.0.1"
           sources."color-name-1.1.4"
         ];
       })
       sources."wrappy-1.0.2"
       sources."write-file-atomic-3.0.0"
-      sources."ws-7.1.1"
+      sources."ws-7.1.2"
       sources."xregexp-2.0.0"
       sources."yallist-2.1.2"
     ];
@@ -54515,6 +54528,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   ios-deploy = nodeEnv.buildNodePackage {
     name = "ios-deploy";
@@ -54532,6 +54546,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   jake = nodeEnv.buildNodePackage {
     name = "jake";
@@ -54566,6 +54581,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   javascript-typescript-langserver = nodeEnv.buildNodePackage {
     name = "javascript-typescript-langserver";
@@ -54582,7 +54598,7 @@ in
       sources."assertion-error-1.1.0"
       sources."balanced-match-1.0.0"
       sources."brace-expansion-1.1.11"
-      sources."bufrw-1.2.1"
+      sources."bufrw-1.3.0"
       sources."chai-4.2.0"
       sources."chai-as-promised-7.1.1"
       sources."chalk-2.4.2"
@@ -54595,15 +54611,16 @@ in
       sources."error-7.0.2"
       sources."escape-string-regexp-1.0.5"
       sources."fast-deep-equal-2.0.1"
-      sources."fast-json-patch-2.2.0"
+      sources."fast-json-patch-2.2.1"
       sources."fs.realpath-1.0.0"
       sources."get-func-name-2.0.0"
       sources."glob-7.1.4"
       sources."has-flag-3.0.0"
+      sources."hexer-1.5.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."iterare-1.2.0"
-      (sources."jaeger-client-3.15.0" // {
+      (sources."jaeger-client-3.16.0" // {
         dependencies = [
           sources."opentracing-0.13.0"
         ];
@@ -54611,6 +54628,7 @@ in
       sources."lodash-4.17.15"
       sources."long-2.4.0"
       sources."minimatch-3.0.4"
+      sources."minimist-1.2.0"
       sources."mz-2.7.0"
       sources."node-int64-0.4.0"
       sources."object-assign-4.1.1"
@@ -54619,6 +54637,7 @@ in
       sources."opentracing-0.14.4"
       sources."path-is-absolute-1.0.1"
       sources."pathval-1.1.0"
+      sources."process-0.10.1"
       sources."rxjs-5.5.12"
       sources."semaphore-async-await-1.5.1"
       sources."string-similarity-2.0.0"
@@ -54630,7 +54649,7 @@ in
       sources."thriftrw-3.11.3"
       sources."type-detect-4.0.8"
       sources."typescript-3.0.3"
-      sources."uuid-3.3.2"
+      sources."uuid-3.3.3"
       sources."vscode-jsonrpc-4.0.0"
       sources."vscode-languageserver-5.2.1"
       sources."vscode-languageserver-protocol-3.14.1"
@@ -54648,23 +54667,24 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   joplin = nodeEnv.buildNodePackage {
     name = "joplin";
     packageName = "joplin";
-    version = "1.0.141";
+    version = "1.0.146";
     src = fetchurl {
-      url = "https://registry.npmjs.org/joplin/-/joplin-1.0.141.tgz";
-      sha512 = "Zl2YwRnjSEJM0LJrc+CB2tnfitfXNQ+wLGfT81usa1552CRdloyFrpwg3ivl+CjgMtpO8979maZw5OBpC6Ys/A==";
+      url = "https://registry.npmjs.org/joplin/-/joplin-1.0.146.tgz";
+      sha512 = "Qy7lEfrvRfCL2c+NQWXjSVrwVTsflwxSozvntF8yMtPDhGvy912PjQQFjRplqusdmUEOOacupcRovcvC+T5Bbw==";
     };
     dependencies = [
       sources."@cronvel/get-pixels-3.3.1"
-      sources."abab-2.0.0"
+      sources."abab-2.0.1"
       sources."abbrev-1.1.1"
       sources."acorn-5.7.3"
-      (sources."acorn-globals-4.3.3" // {
+      (sources."acorn-globals-4.3.4" // {
         dependencies = [
-          sources."acorn-6.2.1"
+          sources."acorn-6.3.0"
         ];
       })
       sources."acorn-walk-6.2.0"
@@ -54698,19 +54718,20 @@ in
       sources."balanced-match-1.0.0"
       sources."base-64-0.1.0"
       sources."bcrypt-pbkdf-1.0.2"
-      sources."bl-1.2.2"
+      (sources."bl-3.0.0" // {
+        dependencies = [
+          sources."readable-stream-3.4.0"
+        ];
+      })
       sources."brace-expansion-1.1.11"
       sources."browser-process-hrtime-0.1.3"
-      sources."buffer-alloc-1.2.0"
-      sources."buffer-alloc-unsafe-1.1.0"
-      sources."buffer-fill-1.0.0"
       sources."camel-case-3.0.0"
       sources."camelcase-4.1.0"
       sources."caseless-0.12.0"
       sources."chalk-2.4.2"
       sources."charenc-0.0.2"
       sources."chownr-1.1.2"
-      sources."chroma-js-2.0.4"
+      sources."chroma-js-2.0.6"
       sources."clean-css-4.2.1"
       sources."cliss-0.0.2"
       sources."code-point-at-1.1.0"
@@ -54742,8 +54763,10 @@ in
       sources."deep-extend-0.6.0"
       sources."deep-is-0.1.3"
       sources."deepmerge-2.2.1"
+      sources."define-properties-1.1.3"
       sources."delayed-stream-1.0.0"
       sources."delegates-1.0.0"
+      sources."depd-1.1.2"
       sources."detect-libc-1.0.3"
       sources."diacritics-1.3.0"
       sources."diff-match-patch-1.0.4"
@@ -54760,11 +54783,13 @@ in
       sources."encoding-0.1.12"
       sources."end-of-stream-1.4.1"
       sources."entities-1.1.2"
+      sources."es-abstract-1.14.2"
+      sources."es-to-primitive-1.2.0"
       sources."es6-promise-pool-2.5.0"
       sources."escape-string-regexp-1.0.5"
-      sources."escodegen-1.11.1"
+      sources."escodegen-1.12.0"
       sources."esprima-3.1.3"
-      sources."estraverse-4.2.0"
+      sources."estraverse-4.3.0"
       sources."esutils-2.0.3"
       sources."expand-template-2.0.3"
       sources."extend-3.0.2"
@@ -54773,20 +54798,22 @@ in
       sources."fast-json-stable-stringify-2.0.0"
       sources."fast-levenshtein-2.0.6"
       sources."fault-1.0.3"
+      sources."fd-slicer-1.1.0"
       sources."file-type-10.11.0"
       sources."file-uri-to-path-1.0.0"
       sources."find-up-2.1.0"
-      sources."follow-redirects-1.7.0"
+      sources."follow-redirects-1.9.0"
       sources."for-each-property-0.0.4"
       sources."for-each-property-deep-0.0.3"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.5.0"
+      sources."form-data-2.5.1"
       sources."format-0.2.2"
       sources."fs-constants-1.0.0"
       sources."fs-copy-file-sync-1.1.1"
       sources."fs-extra-5.0.0"
-      sources."fs-minipass-1.2.6"
+      sources."fs-minipass-1.2.7"
       sources."fs.realpath-1.0.0"
+      sources."function-bind-1.1.1"
       (sources."gauge-2.7.4" // {
         dependencies = [
           sources."strip-ansi-3.0.1"
@@ -54797,20 +54824,23 @@ in
       sources."getpass-0.1.7"
       sources."github-from-package-0.0.0"
       sources."glob-7.1.4"
-      sources."graceful-fs-4.2.1"
+      sources."graceful-fs-4.2.2"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.3"
+      sources."has-1.0.3"
       sources."has-ansi-2.0.0"
       sources."has-flag-3.0.0"
+      sources."has-symbols-1.0.0"
       sources."has-unicode-2.0.1"
       sources."he-1.2.0"
       sources."highlight.js-9.12.0"
       sources."html-encoding-sniffer-1.0.2"
       sources."html-entities-1.2.1"
       sources."html-minifier-3.5.21"
+      sources."http-errors-1.7.3"
       sources."http-signature-1.2.0"
       sources."iconv-lite-0.4.24"
-      sources."ignore-walk-3.0.1"
+      sources."ignore-walk-3.0.2"
       (sources."image-data-uri-2.0.1" // {
         dependencies = [
           sources."fs-extra-0.26.7"
@@ -54851,9 +54881,13 @@ in
       sources."is-absolute-0.2.6"
       sources."is-arrayish-0.3.2"
       sources."is-buffer-1.1.6"
+      sources."is-callable-1.1.4"
+      sources."is-date-object-1.0.1"
       sources."is-fullwidth-code-point-1.0.0"
+      sources."is-regex-1.0.4"
       sources."is-relative-0.2.1"
       sources."is-stream-1.1.0"
+      sources."is-symbol-1.0.2"
       sources."is-typedarray-1.0.0"
       sources."is-unc-path-0.1.2"
       sources."is-windows-0.2.0"
@@ -54865,7 +54899,7 @@ in
       sources."isarray-1.0.0"
       sources."isstream-0.1.2"
       sources."joplin-turndown-4.0.17"
-      sources."joplin-turndown-plugin-gfm-1.0.8"
+      sources."joplin-turndown-plugin-gfm-1.0.9"
       sources."jpeg-js-0.1.2"
       sources."js-tokens-4.0.0"
       sources."jsbn-0.1.1"
@@ -54901,21 +54935,22 @@ in
       sources."mimic-response-1.0.1"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
-      sources."minipass-2.3.5"
-      sources."minizlib-1.2.1"
+      sources."minipass-2.6.2"
+      sources."minizlib-1.2.2"
       sources."mkdirp-0.5.1"
       sources."moment-2.24.0"
       sources."ms-2.1.2"
+      sources."multiparty-4.2.1"
       sources."nan-2.14.0"
       sources."napi-build-utils-1.0.1"
       sources."ndarray-1.0.18"
       sources."ndarray-pack-1.2.1"
       sources."needle-2.4.0"
-      sources."nextgen-events-1.1.1"
+      sources."nextgen-events-1.3.0"
       sources."no-case-2.3.2"
-      (sources."node-abi-2.10.0" // {
+      (sources."node-abi-2.11.0" // {
         dependencies = [
-          sources."semver-5.7.0"
+          sources."semver-5.7.1"
         ];
       })
       sources."node-bitmap-0.0.1"
@@ -54924,7 +54959,7 @@ in
       sources."node-persist-2.1.0"
       (sources."node-pre-gyp-0.11.0" // {
         dependencies = [
-          sources."semver-5.7.0"
+          sources."semver-5.7.1"
         ];
       })
       sources."noop-logger-0.1.1"
@@ -54936,12 +54971,15 @@ in
       sources."nwsapi-2.1.4"
       sources."oauth-sign-0.9.0"
       sources."object-assign-4.1.1"
+      sources."object-inspect-1.6.0"
+      sources."object-keys-1.1.1"
       (sources."object-to-arguments-0.0.8" // {
         dependencies = [
           sources."inspect-parameters-declaration-0.0.10"
           sources."magicli-0.0.5"
         ];
       })
+      sources."object.getownpropertydescriptors-2.0.3"
       sources."omggif-1.0.10"
       sources."once-1.4.0"
       sources."optionator-0.8.2"
@@ -54955,45 +54993,44 @@ in
       sources."parse5-4.0.0"
       sources."path-exists-3.0.0"
       sources."path-is-absolute-1.0.1"
+      sources."pend-1.2.0"
       sources."performance-now-2.1.0"
       sources."pify-3.0.0"
       sources."pipe-functions-1.3.0"
       sources."pn-1.1.0"
       sources."pngjs-2.3.1"
-      (sources."prebuild-install-5.3.0" // {
+      (sources."prebuild-install-5.3.2" // {
         dependencies = [
           sources."minimist-1.2.0"
-          sources."simple-get-2.8.1"
         ];
       })
       sources."prelude-ls-1.1.2"
       sources."process-nextick-args-2.0.1"
       sources."promise-7.3.1"
       sources."proper-lockfile-2.0.1"
-      sources."psl-1.3.0"
-      sources."pump-2.0.1"
+      sources."psl-1.4.0"
+      sources."pump-3.0.0"
       sources."punycode-2.1.1"
       sources."q-1.1.2"
       sources."qs-6.5.2"
       sources."query-string-4.3.4"
       sources."querystringify-2.1.1"
+      sources."random-bytes-1.0.0"
       (sources."rc-1.2.8" // {
         dependencies = [
           sources."minimist-1.2.0"
         ];
       })
       sources."read-chunk-2.1.0"
-      (sources."readable-stream-2.3.6" // {
-        dependencies = [
-          sources."safe-buffer-5.1.2"
-        ];
-      })
+      sources."readable-stream-2.3.6"
       sources."reduce-flatten-1.0.1"
       sources."redux-3.7.2"
       sources."relateurl-0.2.7"
       (sources."request-2.88.0" // {
         dependencies = [
           sources."form-data-2.3.3"
+          sources."punycode-1.4.1"
+          sources."tough-cookie-2.4.3"
         ];
       })
       sources."request-promise-core-1.1.2"
@@ -55001,15 +55038,16 @@ in
       sources."requires-port-1.0.0"
       sources."resolve-url-0.2.1"
       sources."retry-0.10.1"
-      sources."rimraf-2.6.3"
-      sources."safe-buffer-5.2.0"
+      sources."rimraf-2.7.1"
+      sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
       sources."sax-1.2.4"
       sources."semver-6.3.0"
       sources."server-destroy-1.0.1"
       sources."set-blocking-2.0.0"
       sources."setimmediate-1.0.5"
-      sources."seventh-0.7.27"
+      sources."setprototypeof-1.1.1"
+      sources."seventh-0.7.28"
       sources."sharp-0.22.1"
       sources."signal-exit-3.0.2"
       sources."simple-concat-1.0.0"
@@ -55025,11 +55063,12 @@ in
       sources."source-map-url-0.4.0"
       sources."split-skip-0.0.2"
       sources."sprintf-js-1.1.2"
-      sources."sqlite3-4.0.9"
+      sources."sqlite3-4.1.0"
       sources."sshpk-1.16.1"
+      sources."statuses-1.5.0"
       sources."stealthy-require-1.1.1"
       sources."strict-uri-encode-1.1.0"
-      sources."string-kit-0.9.10"
+      sources."string-kit-0.9.12"
       sources."string-padding-1.0.2"
       sources."string-to-stream-1.1.1"
       (sources."string-width-1.0.2" // {
@@ -55037,11 +55076,9 @@ in
           sources."strip-ansi-3.0.1"
         ];
       })
-      (sources."string_decoder-1.1.1" // {
-        dependencies = [
-          sources."safe-buffer-5.1.2"
-        ];
-      })
+      sources."string.prototype.trimleft-2.1.0"
+      sources."string.prototype.trimright-2.1.0"
+      sources."string_decoder-1.1.1"
       (sources."stringify-parameters-0.0.4" // {
         dependencies = [
           sources."magicli-0.0.5"
@@ -55059,19 +55096,19 @@ in
       sources."syswide-cas-5.3.0"
       sources."table-layout-0.4.5"
       sources."tar-4.4.10"
-      (sources."tar-fs-1.16.3" // {
+      sources."tar-fs-2.0.0"
+      (sources."tar-stream-2.1.0" // {
         dependencies = [
-          sources."pump-1.0.3"
+          sources."readable-stream-3.4.0"
         ];
       })
-      sources."tar-stream-1.6.2"
       (sources."tcp-port-used-0.1.2" // {
         dependencies = [
           sources."debug-0.7.4"
           sources."q-0.9.7"
         ];
       })
-      sources."terminal-kit-1.29.3"
+      sources."terminal-kit-1.31.3"
       (sources."tkwidgets-0.5.26" // {
         dependencies = [
           sources."is-fullwidth-code-point-2.0.0"
@@ -55079,12 +55116,8 @@ in
           sources."string-width-2.1.1"
         ];
       })
-      sources."to-buffer-1.1.1"
-      (sources."tough-cookie-2.4.3" // {
-        dependencies = [
-          sources."punycode-1.4.1"
-        ];
-      })
+      sources."toidentifier-1.0.0"
+      sources."tough-cookie-2.5.0"
       sources."tr46-1.0.1"
       sources."tree-kit-0.6.1"
       sources."tunnel-agent-0.6.0"
@@ -55097,6 +55130,7 @@ in
           sources."commander-2.19.0"
         ];
       })
+      sources."uid-safe-2.1.5"
       sources."unc-path-regex-0.1.2"
       sources."uniq-1.0.1"
       sources."universalify-0.1.2"
@@ -55106,7 +55140,8 @@ in
       sources."urix-0.1.0"
       sources."url-parse-1.4.7"
       sources."util-deprecate-1.0.2"
-      sources."uuid-3.3.2"
+      sources."util.promisify-1.0.0"
+      sources."uuid-3.3.3"
       sources."valid-url-1.0.9"
       sources."verror-1.10.0"
       sources."w3c-hr-time-1.0.1"
@@ -55128,9 +55163,8 @@ in
       sources."wrappy-1.0.2"
       sources."ws-5.2.2"
       sources."xml-name-validator-3.0.0"
-      sources."xml2js-0.4.19"
-      sources."xmlbuilder-9.0.7"
-      sources."xtend-4.0.2"
+      sources."xml2js-0.4.22"
+      sources."xmlbuilder-11.0.1"
       sources."yallist-3.0.3"
       sources."yargs-parser-7.0.0"
     ];
@@ -55142,14 +55176,15 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   js-beautify = nodeEnv.buildNodePackage {
     name = "js-beautify";
     packageName = "js-beautify";
-    version = "1.10.1";
+    version = "1.10.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.10.1.tgz";
-      sha512 = "4y8SHOIRC+/YQ2gs3zJEKBUraQerq49FJYyXRpdzUGYQzCq8q9xtIh0YXial1S5KmonVui4aiUb6XaGyjE51XA==";
+      url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.10.2.tgz";
+      sha512 = "ZtBYyNUYJIsBWERnQP0rPN9KjkrDfJcMjuVGcvXOUJrD1zmOGwhRwQ4msG+HJ+Ni/FA7+sRQEMYVzdTQDvnzvQ==";
     };
     dependencies = [
       sources."abbrev-1.1.1"
@@ -55176,7 +55211,7 @@ in
       sources."path-is-absolute-1.0.1"
       sources."proto-list-1.2.4"
       sources."pseudomap-1.0.2"
-      sources."semver-5.7.0"
+      sources."semver-5.7.1"
       sources."sigmund-1.0.1"
       sources."wrappy-1.0.2"
       sources."yallist-2.1.2"
@@ -55189,6 +55224,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   js-yaml = nodeEnv.buildNodePackage {
     name = "js-yaml";
@@ -55211,6 +55247,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   jsdoc = nodeEnv.buildNodePackage {
     name = "jsdoc";
@@ -55221,13 +55258,13 @@ in
       sha512 = "Yf1ZKA3r9nvtMWHO1kEuMZTlHOF8uoQ0vyo5eH7SQy5YeIiHM+B0DgKnn+X6y6KDYZcF7G2SPkKF+JORCXWE/A==";
     };
     dependencies = [
-      sources."@babel/parser-7.5.5"
+      sources."@babel/parser-7.6.0"
       sources."argparse-1.0.10"
       sources."bluebird-3.5.5"
       sources."catharsis-0.8.11"
       sources."entities-1.1.2"
       sources."escape-string-regexp-2.0.0"
-      sources."graceful-fs-4.2.1"
+      sources."graceful-fs-4.2.2"
       sources."js2xmlparser-4.0.0"
       sources."klaw-3.0.0"
       sources."linkify-it-2.2.0"
@@ -55254,6 +55291,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   jshint = nodeEnv.buildNodePackage {
     name = "jshint";
@@ -55306,6 +55344,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   json = nodeEnv.buildNodePackage {
     name = "json";
@@ -55322,6 +55361,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   json-diff = nodeEnv.buildNodePackage {
     name = "json-diff";
@@ -55346,6 +55386,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   json-refs = nodeEnv.buildNodePackage {
     name = "json-refs";
@@ -55367,7 +55408,7 @@ in
       sources."delayed-stream-1.0.0"
       sources."esprima-4.0.1"
       sources."extend-3.0.2"
-      sources."form-data-2.5.0"
+      sources."form-data-2.5.1"
       sources."formidable-1.2.1"
       sources."graphlib-2.1.7"
       sources."inherits-2.0.4"
@@ -55383,7 +55424,7 @@ in
       sources."path-loader-1.0.10"
       sources."process-nextick-args-2.0.1"
       sources."punycode-2.1.1"
-      sources."qs-6.7.0"
+      sources."qs-6.8.0"
       sources."readable-stream-2.3.6"
       sources."safe-buffer-5.1.2"
       sources."slash-2.0.0"
@@ -55401,14 +55442,15 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   json-server = nodeEnv.buildNodePackage {
     name = "json-server";
     packageName = "json-server";
-    version = "0.15.0";
+    version = "0.15.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/json-server/-/json-server-0.15.0.tgz";
-      sha512 = "mo9CuRVoEzJ82g/IaxU0ljSKgPpRoj6rYiJoDIUK7VEqplOca2Saq6eTwmRULRgPiRe4hHC0aYB9tNKJUAQGgQ==";
+      url = "https://registry.npmjs.org/json-server/-/json-server-0.15.1.tgz";
+      sha512 = "6Vc6tC1uLasnMd6Ksnq+4gSQcRqLuSJ/yLoIG4fr4P8f5dAR1gbCqgaVRlk8jfRune0NXcrfDrz7liwAD2WEeQ==";
     };
     dependencies = [
       sources."@sindresorhus/is-0.14.0"
@@ -55507,7 +55549,7 @@ in
           sources."get-stream-4.1.0"
         ];
       })
-      sources."graceful-fs-4.2.1"
+      sources."graceful-fs-4.2.2"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.3"
       sources."has-flag-3.0.0"
@@ -55566,7 +55608,7 @@ in
       sources."minimist-1.2.0"
       sources."morgan-1.9.1"
       sources."ms-2.0.0"
-      sources."nanoid-2.0.3"
+      sources."nanoid-2.1.1"
       sources."negotiator-0.6.2"
       sources."normalize-url-4.3.0"
       sources."npm-run-path-2.0.2"
@@ -55577,7 +55619,7 @@ in
       sources."once-1.4.0"
       sources."p-cancelable-1.1.0"
       sources."p-finally-1.0.0"
-      sources."p-limit-2.2.0"
+      sources."p-limit-2.2.1"
       sources."p-locate-3.0.0"
       sources."p-try-2.2.0"
       sources."package-json-6.5.0"
@@ -55588,12 +55630,12 @@ in
       sources."path-to-regexp-0.1.7"
       sources."performance-now-2.1.0"
       sources."pify-3.0.0"
-      sources."please-upgrade-node-3.1.1"
-      sources."pluralize-7.0.0"
+      sources."please-upgrade-node-3.2.0"
+      sources."pluralize-8.0.0"
       sources."prepend-http-2.0.0"
       sources."proxy-addr-2.0.5"
       sources."pseudomap-1.0.2"
-      sources."psl-1.3.0"
+      sources."psl-1.4.0"
       sources."pump-3.0.0"
       sources."punycode-2.1.1"
       sources."qs-6.7.0"
@@ -55616,7 +55658,7 @@ in
       sources."semver-compare-1.0.0"
       (sources."semver-diff-2.1.0" // {
         dependencies = [
-          sources."semver-5.7.0"
+          sources."semver-5.7.1"
         ];
       })
       (sources."send-0.17.1" // {
@@ -55657,7 +55699,7 @@ in
       sources."uri-js-4.2.2"
       sources."url-parse-lax-3.0.0"
       sources."utils-merge-1.0.1"
-      sources."uuid-3.3.2"
+      sources."uuid-3.3.3"
       sources."vary-1.1.2"
       sources."verror-1.10.0"
       sources."which-1.3.1"
@@ -55675,8 +55717,8 @@ in
       sources."xdg-basedir-3.0.0"
       sources."y18n-4.0.0"
       sources."yallist-2.1.2"
-      sources."yargs-13.3.0"
-      sources."yargs-parser-13.1.1"
+      sources."yargs-14.1.0"
+      sources."yargs-parser-14.0.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -55686,6 +55728,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   jsonlint = nodeEnv.buildNodePackage {
     name = "jsonlint";
@@ -55711,19 +55754,20 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   karma = nodeEnv.buildNodePackage {
     name = "karma";
     packageName = "karma";
-    version = "4.2.0";
+    version = "4.3.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/karma/-/karma-4.2.0.tgz";
-      sha512 = "fmCuxN1rwJxTdZfOXK5LjlmS4Ana/OvzNMpkyLL/TLE8hmgSkpVpMYQ7RTVa8TNKRVQDZNl5W1oF5cfKfgIMlA==";
+      url = "https://registry.npmjs.org/karma/-/karma-4.3.0.tgz";
+      sha512 = "NSPViHOt+RW38oJklvYxQC4BSQsv737oQlr/r06pCM+slDOr4myuI1ivkRmp+3dVpJDfZt2DmaPJ2wkx+ZZuMQ==";
     };
     dependencies = [
       sources."accepts-1.3.7"
       sources."after-0.8.2"
-      sources."anymatch-3.0.3"
+      sources."anymatch-3.1.0"
       sources."arraybuffer.slice-0.0.7"
       sources."async-2.6.3"
       sources."async-limiter-1.0.1"
@@ -55743,7 +55787,7 @@ in
       sources."buffer-fill-1.0.0"
       sources."bytes-3.1.0"
       sources."callsite-1.0.0"
-      sources."chokidar-3.0.2"
+      sources."chokidar-3.1.0"
       sources."colors-1.3.3"
       sources."component-bind-1.0.0"
       sources."component-emitter-1.2.1"
@@ -55752,7 +55796,7 @@ in
       sources."connect-3.7.0"
       sources."content-type-1.0.4"
       sources."cookie-0.3.1"
-      sources."core-js-3.1.4"
+      sources."core-js-3.2.1"
       sources."custom-event-1.0.1"
       sources."date-format-2.1.0"
       sources."debug-2.6.9"
@@ -55779,7 +55823,7 @@ in
       sources."fill-range-7.0.1"
       sources."finalhandler-1.1.2"
       sources."flatted-2.0.1"
-      (sources."follow-redirects-1.7.0" // {
+      (sources."follow-redirects-1.9.0" // {
         dependencies = [
           sources."debug-3.2.6"
           sources."ms-2.1.2"
@@ -55790,7 +55834,7 @@ in
       sources."fsevents-2.0.7"
       sources."glob-7.1.4"
       sources."glob-parent-5.0.0"
-      sources."graceful-fs-4.2.1"
+      sources."graceful-fs-4.2.2"
       sources."has-binary2-1.0.3"
       sources."has-cors-1.1.0"
       sources."http-errors-1.7.2"
@@ -55838,10 +55882,10 @@ in
       sources."qs-6.7.0"
       sources."range-parser-1.2.1"
       sources."raw-body-2.4.0"
-      sources."readdirp-3.1.1"
+      sources."readdirp-3.1.2"
       sources."requires-port-1.0.0"
       sources."rfdc-1.1.4"
-      sources."rimraf-2.6.3"
+      sources."rimraf-2.7.1"
       sources."safe-buffer-5.2.0"
       sources."safer-buffer-2.1.2"
       sources."setprototypeof-1.1.1"
@@ -55899,6 +55943,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   lcov-result-merger = nodeEnv.buildNodePackage {
     name = "lcov-result-merger";
@@ -55931,7 +55976,7 @@ in
       sources."glob-7.1.4"
       sources."glob-parent-3.1.0"
       sources."glob-stream-6.1.0"
-      sources."graceful-fs-4.2.1"
+      sources."graceful-fs-4.2.2"
       sources."has-symbols-1.0.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
@@ -55992,6 +56037,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   leetcode-cli = nodeEnv.buildNodePackage {
     name = "leetcode-cli";
@@ -56053,9 +56099,9 @@ in
       sources."end-of-stream-1.4.1"
       sources."entities-1.1.2"
       sources."escape-string-regexp-1.0.5"
-      sources."escodegen-1.11.1"
+      sources."escodegen-1.12.0"
       sources."esprima-3.1.3"
-      sources."estraverse-4.2.0"
+      sources."estraverse-4.3.0"
       sources."esutils-2.0.3"
       sources."execa-1.0.0"
       sources."extend-3.0.2"
@@ -56143,7 +56189,7 @@ in
       sources."p-defer-1.0.0"
       sources."p-finally-1.0.0"
       sources."p-is-promise-2.1.0"
-      sources."p-limit-2.2.0"
+      sources."p-limit-2.2.1"
       sources."p-locate-3.0.0"
       sources."p-try-2.2.0"
       sources."parse5-1.5.1"
@@ -56154,7 +56200,7 @@ in
       sources."pkginfo-0.4.1"
       sources."prelude-ls-1.1.2"
       sources."prompt-1.0.0"
-      sources."psl-1.3.0"
+      sources."psl-1.4.0"
       sources."pump-3.0.0"
       sources."punycode-2.1.1"
       sources."qs-6.5.2"
@@ -56170,12 +56216,12 @@ in
       sources."require-main-filename-1.0.1"
       sources."restore-cursor-2.0.0"
       sources."revalidator-0.1.8"
-      sources."rimraf-2.6.3"
+      sources."rimraf-2.7.1"
       sources."safe-buffer-5.2.0"
       sources."safer-buffer-2.1.2"
       sources."sax-1.2.4"
       sources."secure-keys-1.0.0"
-      sources."semver-5.7.0"
+      sources."semver-5.7.1"
       sources."set-blocking-2.0.0"
       sources."shebang-command-1.2.0"
       sources."shebang-regex-1.0.0"
@@ -56201,7 +56247,7 @@ in
           sources."async-0.9.2"
         ];
       })
-      sources."uuid-3.3.2"
+      sources."uuid-3.3.3"
       sources."verror-1.10.0"
       sources."wcwidth-1.0.1"
       sources."webidl-conversions-2.0.1"
@@ -56247,6 +56293,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   lerna = nodeEnv.buildNodePackage {
     name = "lerna";
@@ -56265,13 +56312,13 @@ in
       (sources."@evocateur/libnpmpublish-1.2.2" // {
         dependencies = [
           sources."aproba-2.0.0"
-          sources."semver-5.7.0"
+          sources."semver-5.7.1"
         ];
       })
       sources."@evocateur/npm-registry-fetch-4.0.0"
-      (sources."@evocateur/pacote-9.6.3" // {
+      (sources."@evocateur/pacote-9.6.5" // {
         dependencies = [
-          sources."semver-5.7.0"
+          sources."semver-5.7.1"
         ];
       })
       sources."@lerna/add-3.16.2"
@@ -56351,25 +56398,25 @@ in
       sources."@lerna/write-log-file-3.13.0"
       sources."@mrmlnc/readdir-enhanced-2.2.1"
       sources."@nodelib/fs.stat-1.1.3"
-      (sources."@octokit/endpoint-5.3.2" // {
+      (sources."@octokit/endpoint-5.3.5" // {
         dependencies = [
           sources."is-plain-object-3.0.0"
           sources."isobject-4.0.0"
         ];
       })
       sources."@octokit/plugin-enterprise-rest-3.6.2"
-      (sources."@octokit/request-5.0.2" // {
+      (sources."@octokit/request-5.1.0" // {
         dependencies = [
           sources."is-plain-object-3.0.0"
           sources."isobject-4.0.0"
         ];
       })
       sources."@octokit/request-error-1.0.4"
-      sources."@octokit/rest-16.28.7"
+      sources."@octokit/rest-16.28.9"
       sources."@types/events-3.0.0"
       sources."@types/glob-7.1.1"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-12.6.9"
+      sources."@types/node-12.7.5"
       sources."@zkochan/cmd-shim-3.1.0"
       sources."JSONStream-1.3.5"
       sources."abbrev-1.1.1"
@@ -56422,7 +56469,7 @@ in
       sources."builtins-1.0.3"
       sources."byline-5.0.0"
       sources."byte-size-5.0.1"
-      sources."cacache-12.0.2"
+      sources."cacache-12.0.3"
       sources."cache-base-1.0.1"
       sources."call-me-maybe-1.0.1"
       sources."caller-callsite-2.0.0"
@@ -56512,11 +56559,11 @@ in
       sources."cosmiconfig-5.2.1"
       (sources."cross-spawn-6.0.5" // {
         dependencies = [
-          sources."semver-5.7.0"
+          sources."semver-5.7.1"
         ];
       })
       sources."currently-unhandled-0.4.1"
-      sources."cyclist-0.2.2"
+      sources."cyclist-1.0.1"
       sources."dargs-4.1.0"
       sources."dashdash-1.14.1"
       sources."dateformat-3.0.3"
@@ -56534,7 +56581,6 @@ in
       })
       sources."decode-uri-component-0.2.0"
       sources."dedent-0.7.0"
-      sources."deepmerge-4.0.0"
       sources."defaults-1.0.3"
       sources."define-properties-1.1.3"
       sources."define-property-2.0.2"
@@ -56553,7 +56599,7 @@ in
       sources."env-paths-1.0.0"
       sources."err-code-1.1.2"
       sources."error-ex-1.3.2"
-      sources."es-abstract-1.13.0"
+      sources."es-abstract-1.14.2"
       sources."es-to-primitive-1.2.0"
       sources."es6-promise-4.2.8"
       sources."es6-promisify-5.0.0"
@@ -56621,7 +56667,7 @@ in
       sources."fragment-cache-0.2.1"
       sources."from2-2.3.0"
       sources."fs-extra-8.1.0"
-      sources."fs-minipass-1.2.6"
+      sources."fs-minipass-1.2.7"
       sources."fs-write-stream-atomic-1.0.10"
       sources."fs.realpath-1.0.0"
       sources."function-bind-1.1.1"
@@ -56678,8 +56724,8 @@ in
           sources."pify-4.0.1"
         ];
       })
-      sources."graceful-fs-4.2.1"
-      (sources."handlebars-4.1.2" // {
+      sources."graceful-fs-4.2.2"
+      (sources."handlebars-4.2.0" // {
         dependencies = [
           sources."source-map-0.6.1"
         ];
@@ -56696,7 +56742,7 @@ in
           sources."kind-of-4.0.0"
         ];
       })
-      sources."hosted-git-info-2.8.2"
+      sources."hosted-git-info-2.8.4"
       sources."http-cache-semantics-3.8.1"
       sources."http-proxy-agent-2.1.0"
       sources."http-signature-1.2.0"
@@ -56705,7 +56751,7 @@ in
       sources."iconv-lite-0.4.24"
       sources."iferr-0.1.5"
       sources."ignore-4.0.6"
-      sources."ignore-walk-3.0.1"
+      sources."ignore-walk-3.0.2"
       (sources."import-fresh-2.0.0" // {
         dependencies = [
           sources."resolve-from-3.0.0"
@@ -56720,10 +56766,10 @@ in
       sources."ini-1.3.5"
       (sources."init-package-json-1.10.3" // {
         dependencies = [
-          sources."semver-5.7.0"
+          sources."semver-5.7.1"
         ];
       })
-      (sources."inquirer-6.5.0" // {
+      (sources."inquirer-6.5.2" // {
         dependencies = [
           sources."ansi-regex-4.1.0"
           sources."strip-ansi-5.2.0"
@@ -56812,7 +56858,7 @@ in
           sources."minimist-1.2.0"
         ];
       })
-      sources."merge2-1.2.4"
+      sources."merge2-1.3.0"
       sources."micromatch-3.1.10"
       sources."mime-db-1.40.0"
       sources."mime-types-2.1.24"
@@ -56820,8 +56866,8 @@ in
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
       sources."minimist-options-3.0.2"
-      sources."minipass-2.3.5"
-      sources."minizlib-1.2.1"
+      sources."minipass-2.6.2"
+      sources."minizlib-1.2.2"
       sources."mississippi-3.0.0"
       (sources."mixin-deep-1.3.2" // {
         dependencies = [
@@ -56849,21 +56895,21 @@ in
       sources."nopt-3.0.6"
       (sources."normalize-package-data-2.5.0" // {
         dependencies = [
-          sources."semver-5.7.0"
+          sources."semver-5.7.1"
         ];
       })
       sources."normalize-url-3.3.0"
       sources."npm-bundled-1.0.6"
-      sources."npm-lifecycle-3.1.2"
-      (sources."npm-package-arg-6.1.0" // {
+      sources."npm-lifecycle-3.1.3"
+      (sources."npm-package-arg-6.1.1" // {
         dependencies = [
-          sources."semver-5.7.0"
+          sources."semver-5.7.1"
         ];
       })
       sources."npm-packlist-1.4.4"
-      (sources."npm-pick-manifest-2.2.3" // {
+      (sources."npm-pick-manifest-3.0.2" // {
         dependencies = [
-          sources."semver-5.7.0"
+          sources."semver-5.7.1"
         ];
       })
       sources."npm-run-path-2.0.2"
@@ -56884,6 +56930,7 @@ in
           sources."kind-of-3.2.2"
         ];
       })
+      sources."object-inspect-1.6.0"
       sources."object-keys-1.1.1"
       sources."object-visit-1.0.1"
       sources."object.getownpropertydescriptors-2.0.3"
@@ -56900,7 +56947,7 @@ in
       sources."p-defer-1.0.0"
       sources."p-finally-1.0.0"
       sources."p-is-promise-2.1.0"
-      sources."p-limit-2.2.0"
+      sources."p-limit-2.2.1"
       sources."p-locate-3.0.0"
       sources."p-map-2.1.0"
       sources."p-map-series-1.0.0"
@@ -56909,7 +56956,7 @@ in
       sources."p-reduce-1.0.0"
       sources."p-try-2.2.0"
       sources."p-waterfall-1.0.0"
-      sources."parallel-transform-1.1.0"
+      sources."parallel-transform-1.2.0"
       sources."parse-github-repo-url-1.4.1"
       sources."parse-json-4.0.0"
       sources."parse-path-4.0.1"
@@ -56934,7 +56981,7 @@ in
       sources."proto-list-1.2.4"
       sources."protocols-1.4.7"
       sources."protoduck-5.0.1"
-      sources."psl-1.3.0"
+      sources."psl-1.4.0"
       sources."pump-3.0.0"
       (sources."pumpify-1.5.1" // {
         dependencies = [
@@ -56946,8 +56993,8 @@ in
       sources."qs-6.5.2"
       sources."quick-lru-1.1.0"
       sources."read-1.0.7"
-      sources."read-cmd-shim-1.0.1"
-      (sources."read-package-json-2.0.13" // {
+      sources."read-cmd-shim-1.0.4"
+      (sources."read-package-json-2.1.0" // {
         dependencies = [
           sources."slash-1.0.0"
         ];
@@ -56992,10 +57039,10 @@ in
       sources."restore-cursor-2.0.0"
       sources."ret-0.1.15"
       sources."retry-0.10.1"
-      sources."rimraf-2.6.3"
+      sources."rimraf-2.7.1"
       sources."run-async-2.3.0"
       sources."run-queue-1.0.3"
-      sources."rxjs-6.5.2"
+      sources."rxjs-6.5.3"
       sources."safe-buffer-5.2.0"
       sources."safe-regex-1.1.0"
       sources."safer-buffer-2.1.2"
@@ -57087,6 +57134,8 @@ in
           sources."strip-ansi-4.0.0"
         ];
       })
+      sources."string.prototype.trimleft-2.1.0"
+      sources."string.prototype.trimright-2.1.0"
       (sources."string_decoder-1.1.1" // {
         dependencies = [
           sources."safe-buffer-5.1.2"
@@ -57141,7 +57190,7 @@ in
       sources."union-value-1.0.1"
       sources."unique-filename-1.1.1"
       sources."unique-slug-2.0.2"
-      sources."universal-user-agent-3.0.0"
+      sources."universal-user-agent-4.0.0"
       sources."universalify-0.1.2"
       (sources."unset-value-1.0.0" // {
         dependencies = [
@@ -57155,11 +57204,10 @@ in
       })
       sources."uri-js-4.2.2"
       sources."urix-0.1.0"
-      sources."url-template-2.0.8"
       sources."use-3.1.1"
       sources."util-deprecate-1.0.2"
       sources."util-promisify-2.1.0"
-      sources."uuid-3.3.2"
+      sources."uuid-3.3.3"
       sources."validate-npm-package-license-3.0.4"
       sources."validate-npm-package-name-3.0.0"
       sources."verror-1.10.0"
@@ -57183,7 +57231,7 @@ in
         dependencies = [
           sources."make-dir-2.1.0"
           sources."pify-4.0.1"
-          sources."semver-5.7.0"
+          sources."semver-5.7.1"
         ];
       })
       (sources."write-pkg-3.2.0" // {
@@ -57205,14 +57253,15 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   less = nodeEnv.buildNodePackage {
     name = "less";
     packageName = "less";
-    version = "3.9.0";
+    version = "3.10.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/less/-/less-3.9.0.tgz";
-      sha512 = "31CmtPEZraNUtuUREYjSqRkeETFdyEHSEPAGq4erDlUXtda7pzNmctdljdIagSb589d/qXGWiiP31R5JVf+v0w==";
+      url = "https://registry.npmjs.org/less/-/less-3.10.3.tgz";
+      sha512 = "vz32vqfgmoxF1h3K4J+yKCtajH0PWmjkIFgbs5d78E/c/e+UQTnI+lWK+1eQRE95PXM2mC3rJlLSSP9VQHnaow==";
     };
     dependencies = [
       sources."ajv-6.10.2"
@@ -57238,7 +57287,7 @@ in
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.3"
       sources."getpass-0.1.7"
-      sources."graceful-fs-4.2.1"
+      sources."graceful-fs-4.2.2"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.3"
       sources."http-signature-1.2.0"
@@ -57259,7 +57308,7 @@ in
       sources."performance-now-2.1.0"
       sources."promise-7.3.1"
       sources."prr-1.0.1"
-      sources."psl-1.3.0"
+      sources."psl-1.4.0"
       sources."punycode-2.1.1"
       sources."qs-6.5.2"
       sources."request-2.88.0"
@@ -57275,7 +57324,7 @@ in
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."uri-js-4.2.2"
-      sources."uuid-3.3.2"
+      sources."uuid-3.3.3"
       sources."verror-1.10.0"
     ];
     buildInputs = globalBuildInputs;
@@ -57286,6 +57335,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   less-plugin-clean-css = nodeEnv.buildNodePackage {
     name = "less-plugin-clean-css";
@@ -57309,6 +57359,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   live-server = nodeEnv.buildNodePackage {
     name = "live-server";
@@ -57350,7 +57401,7 @@ in
         ];
       })
       sources."cache-base-1.0.1"
-      sources."chokidar-2.1.6"
+      sources."chokidar-2.1.8"
       (sources."class-utils-0.3.6" // {
         dependencies = [
           sources."define-property-0.2.5"
@@ -57432,7 +57483,7 @@ in
           sources."is-glob-3.1.0"
         ];
       })
-      sources."graceful-fs-4.2.1"
+      sources."graceful-fs-4.2.2"
       sources."has-value-1.0.0"
       (sources."has-values-1.0.0" // {
         dependencies = [
@@ -57613,12 +57664,12 @@ in
           sources."has-values-0.1.4"
         ];
       })
-      sources."upath-1.1.2"
+      sources."upath-1.2.0"
       sources."urix-0.1.0"
       sources."use-3.1.1"
       sources."util-deprecate-1.0.2"
       sources."utils-merge-1.0.1"
-      sources."uuid-3.3.2"
+      sources."uuid-3.3.3"
       sources."vary-1.1.2"
       sources."websocket-driver-0.7.3"
       sources."websocket-extensions-0.1.3"
@@ -57631,6 +57682,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   livedown = nodeEnv.buildNodePackage {
     name = "livedown";
@@ -57774,7 +57826,7 @@ in
       sources."github-slugger-1.2.1"
       sources."glob-base-0.3.0"
       sources."glob-parent-2.0.0"
-      sources."graceful-fs-4.2.1"
+      sources."graceful-fs-4.2.2"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.3"
       (sources."has-binary2-1.0.3" // {
@@ -57920,7 +57972,7 @@ in
       sources."preserve-0.2.0"
       sources."process-nextick-args-2.0.1"
       sources."proxy-addr-2.0.5"
-      sources."psl-1.3.0"
+      sources."psl-1.4.0"
       sources."punycode-2.1.1"
       sources."qs-6.7.0"
       (sources."randomatic-3.1.1" // {
@@ -58116,7 +58168,7 @@ in
       sources."use-3.1.1"
       sources."util-deprecate-1.0.2"
       sources."utils-merge-1.0.1"
-      sources."uuid-3.3.2"
+      sources."uuid-3.3.3"
       sources."vary-1.1.2"
       sources."verror-1.10.0"
       sources."ws-6.1.4"
@@ -58131,6 +58183,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   "lumo-build-deps-../interpreters/clojurescript/lumo" = nodeEnv.buildNodePackage {
     name = "lumo-build-deps";
@@ -58139,12 +58192,12 @@ in
     src = ../interpreters/clojurescript/lumo;
     dependencies = [
       sources."@babel/code-frame-7.5.5"
-      sources."@babel/core-7.5.5"
-      sources."@babel/generator-7.5.5"
+      sources."@babel/core-7.6.0"
+      sources."@babel/generator-7.6.0"
       sources."@babel/helper-annotate-as-pure-7.0.0"
       sources."@babel/helper-builder-binary-assignment-operator-visitor-7.1.0"
       sources."@babel/helper-call-delegate-7.4.4"
-      sources."@babel/helper-create-class-features-plugin-7.5.5"
+      sources."@babel/helper-create-class-features-plugin-7.6.0"
       sources."@babel/helper-define-map-7.5.5"
       sources."@babel/helper-explode-assignable-expression-7.1.0"
       sources."@babel/helper-function-name-7.1.0"
@@ -58161,9 +58214,9 @@ in
       sources."@babel/helper-simple-access-7.1.0"
       sources."@babel/helper-split-export-declaration-7.4.4"
       sources."@babel/helper-wrap-function-7.2.0"
-      sources."@babel/helpers-7.5.5"
+      sources."@babel/helpers-7.6.0"
       sources."@babel/highlight-7.5.0"
-      sources."@babel/parser-7.5.5"
+      sources."@babel/parser-7.6.0"
       sources."@babel/plugin-external-helpers-7.0.0"
       sources."@babel/plugin-proposal-async-generator-functions-7.2.0"
       sources."@babel/plugin-proposal-class-properties-7.5.5"
@@ -58180,10 +58233,10 @@ in
       sources."@babel/plugin-transform-arrow-functions-7.2.0"
       sources."@babel/plugin-transform-async-to-generator-7.5.0"
       sources."@babel/plugin-transform-block-scoped-functions-7.2.0"
-      sources."@babel/plugin-transform-block-scoping-7.5.5"
+      sources."@babel/plugin-transform-block-scoping-7.6.0"
       sources."@babel/plugin-transform-classes-7.5.5"
       sources."@babel/plugin-transform-computed-properties-7.2.0"
-      sources."@babel/plugin-transform-destructuring-7.5.0"
+      sources."@babel/plugin-transform-destructuring-7.6.0"
       sources."@babel/plugin-transform-dotall-regex-7.4.4"
       sources."@babel/plugin-transform-duplicate-keys-7.5.0"
       sources."@babel/plugin-transform-exponentiation-operator-7.2.0"
@@ -58192,29 +58245,29 @@ in
       sources."@babel/plugin-transform-literals-7.2.0"
       sources."@babel/plugin-transform-member-expression-literals-7.2.0"
       sources."@babel/plugin-transform-modules-amd-7.5.0"
-      sources."@babel/plugin-transform-modules-commonjs-7.5.0"
+      sources."@babel/plugin-transform-modules-commonjs-7.6.0"
       sources."@babel/plugin-transform-modules-systemjs-7.5.0"
       sources."@babel/plugin-transform-modules-umd-7.2.0"
-      sources."@babel/plugin-transform-named-capturing-groups-regex-7.4.5"
+      sources."@babel/plugin-transform-named-capturing-groups-regex-7.6.0"
       sources."@babel/plugin-transform-new-target-7.4.4"
       sources."@babel/plugin-transform-object-super-7.5.5"
       sources."@babel/plugin-transform-parameters-7.4.4"
       sources."@babel/plugin-transform-property-literals-7.2.0"
       sources."@babel/plugin-transform-regenerator-7.4.5"
       sources."@babel/plugin-transform-reserved-words-7.2.0"
-      sources."@babel/plugin-transform-runtime-7.5.5"
+      sources."@babel/plugin-transform-runtime-7.6.0"
       sources."@babel/plugin-transform-shorthand-properties-7.2.0"
       sources."@babel/plugin-transform-spread-7.2.2"
       sources."@babel/plugin-transform-sticky-regex-7.2.0"
       sources."@babel/plugin-transform-template-literals-7.4.4"
       sources."@babel/plugin-transform-typeof-symbol-7.2.0"
       sources."@babel/plugin-transform-unicode-regex-7.4.4"
-      sources."@babel/preset-env-7.5.5"
+      sources."@babel/preset-env-7.6.0"
       sources."@babel/preset-stage-2-7.0.0"
-      sources."@babel/runtime-7.5.5"
-      sources."@babel/template-7.4.4"
-      sources."@babel/traverse-7.5.5"
-      sources."@babel/types-7.5.5"
+      sources."@babel/runtime-7.6.0"
+      sources."@babel/template-7.6.0"
+      sources."@babel/traverse-7.6.0"
+      sources."@babel/types-7.6.1"
       sources."@calebboyd/semaphore-1.3.1"
       sources."@comandeer/babel-plugin-banner-4.1.0"
       sources."@mrmlnc/readdir-enhanced-2.2.1"
@@ -58225,7 +58278,7 @@ in
       sources."@types/events-3.0.0"
       sources."@types/glob-7.1.1"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-12.6.9"
+      sources."@types/node-12.7.5"
       sources."@webassemblyjs/ast-1.8.5"
       sources."@webassemblyjs/floating-point-hex-parser-1.8.5"
       sources."@webassemblyjs/helper-api-error-1.8.5"
@@ -58247,7 +58300,7 @@ in
       sources."@xtuc/ieee754-1.2.0"
       sources."@xtuc/long-4.2.2"
       sources."ace.improved-0.2.1"
-      sources."acorn-6.2.1"
+      sources."acorn-6.3.0"
       sources."ajv-6.10.2"
       sources."ajv-errors-1.0.1"
       sources."ajv-keywords-3.4.1"
@@ -58352,14 +58405,14 @@ in
       sources."babel-plugin-jest-hoist-23.2.0"
       sources."babel-plugin-minify-builtins-0.5.0"
       sources."babel-plugin-minify-constant-folding-0.5.0"
-      sources."babel-plugin-minify-dead-code-elimination-0.5.0"
+      sources."babel-plugin-minify-dead-code-elimination-0.5.1"
       sources."babel-plugin-minify-flip-comparisons-0.4.3"
-      sources."babel-plugin-minify-guarded-expressions-0.4.3"
+      sources."babel-plugin-minify-guarded-expressions-0.4.4"
       sources."babel-plugin-minify-infinity-0.4.3"
       sources."babel-plugin-minify-mangle-names-0.5.0"
       sources."babel-plugin-minify-numeric-literals-0.4.3"
       sources."babel-plugin-minify-replace-0.5.0"
-      sources."babel-plugin-minify-simplify-0.5.0"
+      sources."babel-plugin-minify-simplify-0.5.1"
       sources."babel-plugin-minify-type-constructors-0.4.3"
       sources."babel-plugin-syntax-flow-6.18.0"
       sources."babel-plugin-syntax-object-rest-spread-6.13.0"
@@ -58376,7 +58429,7 @@ in
       sources."babel-plugin-transform-simplify-comparison-operators-6.9.4"
       sources."babel-plugin-transform-undefined-to-void-6.9.4"
       sources."babel-preset-jest-23.2.0"
-      sources."babel-preset-minify-0.5.0"
+      sources."babel-preset-minify-0.5.1"
       (sources."babel-runtime-6.26.0" // {
         dependencies = [
           sources."regenerator-runtime-0.11.1"
@@ -58418,8 +58471,8 @@ in
       sources."browserify-rsa-4.0.1"
       sources."browserify-sign-4.0.4"
       sources."browserify-zlib-0.2.0"
-      sources."browserslist-4.6.6"
-      sources."buffer-5.2.1"
+      sources."browserslist-4.7.0"
+      sources."buffer-5.4.3"
       sources."buffer-alloc-1.2.0"
       sources."buffer-alloc-unsafe-1.1.0"
       sources."buffer-crc32-0.2.13"
@@ -58428,7 +58481,7 @@ in
       sources."buffer-xor-1.0.3"
       sources."builtin-modules-2.0.0"
       sources."builtin-status-codes-3.0.0"
-      sources."cacache-12.0.2"
+      sources."cacache-12.0.3"
       (sources."cache-base-1.0.1" // {
         dependencies = [
           sources."isobject-3.0.1"
@@ -58450,7 +58503,7 @@ in
         ];
       })
       sources."cherow-1.6.9"
-      (sources."chokidar-2.1.6" // {
+      (sources."chokidar-2.1.8" // {
         dependencies = [
           sources."array-unique-0.3.2"
           sources."braces-2.3.2"
@@ -58518,12 +58571,11 @@ in
       sources."copy-concurrently-1.0.5"
       sources."copy-descriptor-0.1.1"
       sources."core-js-2.6.9"
-      (sources."core-js-compat-3.1.4" // {
+      (sources."core-js-compat-3.2.1" // {
         dependencies = [
           sources."semver-6.3.0"
         ];
       })
-      sources."core-js-pure-3.1.4"
       sources."core-util-is-1.0.2"
       sources."create-ecdh-4.0.3"
       sources."create-hash-1.2.0"
@@ -58531,7 +58583,7 @@ in
       sources."cross-env-5.2.0"
       sources."cross-spawn-6.0.5"
       sources."crypto-browserify-3.12.0"
-      sources."cyclist-0.2.2"
+      sources."cyclist-1.0.1"
       sources."date-now-0.1.4"
       sources."death-1.1.0"
       sources."debug-4.1.1"
@@ -58600,8 +58652,8 @@ in
       })
       sources."duplexer3-0.1.4"
       sources."duplexify-3.7.1"
-      sources."electron-to-chromium-1.3.215"
-      sources."elliptic-6.5.0"
+      sources."electron-to-chromium-1.3.260"
+      sources."elliptic-6.5.1"
       sources."emoji-regex-7.0.3"
       sources."emojis-list-2.1.0"
       sources."end-of-stream-1.4.1"
@@ -58610,9 +58662,9 @@ in
       sources."error-ex-1.3.2"
       sources."escape-string-regexp-1.0.5"
       sources."eslint-scope-3.7.1"
-      sources."eslint-visitor-keys-1.0.0"
+      sources."eslint-visitor-keys-1.1.0"
       sources."esrecurse-4.2.1"
-      sources."estraverse-4.2.0"
+      sources."estraverse-4.3.0"
       sources."estree-walker-0.6.1"
       sources."esutils-2.0.3"
       sources."events-3.0.0"
@@ -58795,7 +58847,7 @@ in
           sources."p-cancelable-1.1.0"
         ];
       })
-      sources."graceful-fs-4.2.1"
+      sources."graceful-fs-4.2.2"
       sources."graceful-readlink-1.0.1"
       sources."has-ansi-2.0.0"
       sources."has-flag-3.0.0"
@@ -58821,7 +58873,7 @@ in
       sources."hash.js-1.1.7"
       sources."hmac-drbg-1.0.1"
       sources."homedir-polyfill-1.0.3"
-      sources."hosted-git-info-2.8.2"
+      sources."hosted-git-info-2.8.4"
       sources."http-cache-semantics-3.8.1"
       sources."https-browserify-1.0.0"
       sources."ieee754-1.1.13"
@@ -58874,7 +58926,7 @@ in
       })
       sources."is-posix-bracket-0.1.1"
       sources."is-primitive-2.0.0"
-      sources."is-retry-allowed-1.1.0"
+      sources."is-retry-allowed-1.2.0"
       sources."is-stream-1.1.0"
       sources."is-utf8-0.2.1"
       sources."is-windows-1.0.2"
@@ -58905,8 +58957,6 @@ in
       })
       sources."locate-path-2.0.0"
       sources."lodash-4.17.15"
-      sources."lodash.isplainobject-4.0.6"
-      sources."lodash.some-4.6.0"
       sources."log-symbols-2.2.0"
       sources."loose-envify-1.4.0"
       sources."lowercase-keys-1.0.1"
@@ -58930,10 +58980,10 @@ in
         ];
       })
       sources."memory-fs-0.4.1"
-      sources."merge2-1.2.4"
+      sources."merge2-1.3.0"
       sources."micromatch-2.3.11"
       sources."miller-rabin-4.0.1"
-      sources."mime-db-1.40.0"
+      sources."mime-db-1.41.0"
       sources."mimic-fn-1.2.0"
       sources."mimic-response-1.0.1"
       sources."minimalistic-assert-1.0.1"
@@ -58976,7 +59026,7 @@ in
           sources."punycode-1.4.1"
         ];
       })
-      sources."node-releases-1.1.26"
+      sources."node-releases-1.1.32"
       sources."normalize-package-data-2.5.0"
       sources."normalize-path-2.1.1"
       (sources."normalize-url-2.0.1" // {
@@ -59037,7 +59087,7 @@ in
       sources."p-timeout-2.0.1"
       sources."p-try-1.0.0"
       sources."pako-1.0.10"
-      sources."parallel-transform-1.1.0"
+      sources."parallel-transform-1.2.0"
       sources."paredit.js-0.3.4"
       sources."parse-asn1-5.1.4"
       sources."parse-glob-3.0.4"
@@ -59060,7 +59110,7 @@ in
         dependencies = [
           sources."find-up-3.0.0"
           sources."locate-path-3.0.0"
-          sources."p-limit-2.2.0"
+          sources."p-limit-2.2.1"
           sources."p-locate-3.0.0"
           sources."p-try-2.2.0"
         ];
@@ -59157,8 +59207,8 @@ in
       sources."regenerator-transform-0.14.1"
       sources."regex-cache-0.4.4"
       sources."regex-not-1.0.2"
-      sources."regexp-tree-0.1.11"
-      sources."regexpu-core-4.5.4"
+      sources."regexp-tree-0.1.13"
+      sources."regexpu-core-4.6.0"
       sources."regjsgen-0.5.0"
       (sources."regjsparser-0.6.0" // {
         dependencies = [
@@ -59199,7 +59249,7 @@ in
       sources."restore-cursor-2.0.0"
       sources."ret-0.1.15"
       sources."retry-0.12.0"
-      sources."rimraf-2.6.3"
+      sources."rimraf-2.7.1"
       sources."ripemd160-2.0.2"
       sources."rollup-0.67.0"
       sources."rollup-plugin-babel-4.0.3"
@@ -59211,14 +59261,14 @@ in
       })
       sources."rollup-plugin-node-resolve-3.4.0"
       sources."rollup-plugin-replace-2.1.0"
-      sources."rollup-pluginutils-2.8.1"
+      sources."rollup-pluginutils-2.8.2"
       sources."run-queue-1.0.3"
       sources."safe-buffer-5.1.2"
       sources."safe-regex-1.1.0"
       sources."schema-utils-1.0.0"
       sources."seek-bzip-1.0.5"
-      sources."semver-5.7.0"
-      sources."serialize-javascript-1.7.0"
+      sources."semver-5.7.1"
+      sources."serialize-javascript-1.9.1"
       sources."set-blocking-2.0.0"
       (sources."set-value-2.0.1" // {
         dependencies = [
@@ -59313,7 +59363,7 @@ in
       sources."supports-color-2.0.0"
       sources."tapable-1.1.3"
       sources."tar-stream-1.6.2"
-      (sources."terser-4.1.3" // {
+      (sources."terser-4.3.1" // {
         dependencies = [
           sources."commander-2.20.0"
           sources."source-map-0.6.1"
@@ -59328,7 +59378,7 @@ in
       sources."through-2.3.8"
       sources."through2-2.0.5"
       sources."timed-out-4.0.1"
-      sources."timers-browserify-2.0.10"
+      sources."timers-browserify-2.0.11"
       sources."to-arraybuffer-1.0.1"
       sources."to-buffer-1.1.1"
       sources."to-fast-properties-2.0.0"
@@ -59365,7 +59415,7 @@ in
           sources."isobject-3.0.1"
         ];
       })
-      sources."upath-1.1.2"
+      sources."upath-1.2.0"
       sources."uri-js-4.2.2"
       sources."urix-0.1.0"
       (sources."url-0.11.0" // {
@@ -59388,7 +59438,7 @@ in
       sources."vm-browserify-1.1.0"
       sources."watchpack-1.6.0"
       sources."wcwidth-1.0.1"
-      (sources."webpack-4.39.1" // {
+      (sources."webpack-4.40.2" // {
         dependencies = [
           sources."arr-diff-4.0.0"
           sources."array-unique-0.3.2"
@@ -59430,7 +59480,7 @@ in
           sources."ms-2.0.0"
         ];
       })
-      (sources."webpack-cli-3.3.6" // {
+      (sources."webpack-cli-3.3.8" // {
         dependencies = [
           sources."supports-color-6.1.0"
         ];
@@ -59470,7 +59520,7 @@ in
         dependencies = [
           sources."find-up-3.0.0"
           sources."locate-path-3.0.0"
-          sources."p-limit-2.2.0"
+          sources."p-limit-2.2.1"
           sources."p-locate-3.0.0"
           sources."p-try-2.2.0"
           sources."require-main-filename-2.0.0"
@@ -59484,6 +59534,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   madoko = nodeEnv.buildNodePackage {
     name = "madoko";
@@ -59506,6 +59557,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   markdown-link-check = nodeEnv.buildNodePackage {
     name = "markdown-link-check";
@@ -59567,7 +59619,7 @@ in
       sources."oauth-sign-0.9.0"
       sources."performance-now-2.1.0"
       sources."progress-2.0.3"
-      sources."psl-1.3.0"
+      sources."psl-1.4.0"
       sources."punycode-2.1.1"
       sources."qs-6.5.2"
       sources."request-2.88.0"
@@ -59583,7 +59635,7 @@ in
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."uri-js-4.2.2"
-      sources."uuid-3.3.2"
+      sources."uuid-3.3.3"
       sources."verror-1.10.0"
     ];
     buildInputs = globalBuildInputs;
@@ -59594,23 +59646,34 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   mathjax = nodeEnv.buildNodePackage {
     name = "mathjax";
     packageName = "mathjax";
-    version = "2.7.5";
+    version = "3.0.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/mathjax/-/mathjax-2.7.5.tgz";
-      sha512 = "OzsJNitEHAJB3y4IIlPCAvS0yoXwYjlo2Y4kmm9KQzyIBZt2d8yKRalby3uTRNN4fZQiGL2iMXjpdP1u2Rq2DQ==";
+      url = "https://registry.npmjs.org/mathjax/-/mathjax-3.0.0.tgz";
+      sha512 = "z4uLbDHNbs/aRuR6zCcnzwFQuMixkHCcWqgVaommfK/3cA1Ahq7OXemn+m8JwTYcBApSHgcrSbPr9sm3sZFL+A==";
     };
+    dependencies = [
+      sources."commander-3.0.1"
+      sources."esm-3.2.25"
+      sources."mathjax-full-git://github.com/mathjax/MathJax-src.git"
+      sources."mj-context-menu-0.2.0"
+      sources."speech-rule-engine-3.0.0-beta.6"
+      sources."wicked-good-xpath-1.3.0"
+      sources."xmldom-sre-0.1.31"
+    ];
     buildInputs = globalBuildInputs;
     meta = {
-      description = "Beautiful math in all browsers. MathJax is an open-source JavaScript display engine for LaTeX, MathML, and AsciiMath notation that works in all browsers.";
+      description = "Beautiful math in all browsers. MathJax is an open-source JavaScript display engine for LaTeX, MathML, and AsciiMath notation that works in all browsers. This package includes the packaged components (install mathjax-full to get the source code).";
       homepage = "https://github.com/mathjax/MathJax#readme";
       license = "Apache-2.0";
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   meat = nodeEnv.buildNodePackage {
     name = "meat";
@@ -59647,14 +59710,15 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   meguca = nodeEnv.buildNodePackage {
     name = "meguca";
     packageName = "meguca";
-    version = "1.1.4";
+    version = "1.1.6";
     src = fetchurl {
-      url = "https://registry.npmjs.org/meguca/-/meguca-1.1.4.tgz";
-      sha512 = "ccvNbLwUeWRLWO9l0dZj1G0T+n10MRtORrvuq8/UYBgCKzdmvHW5FTU/3T2yO2P3AK+6Ghsey/+6KBiJpokeSg==";
+      url = "https://registry.npmjs.org/meguca/-/meguca-1.1.6.tgz";
+      sha512 = "kqg6t8mUUpb4WwD+4WqgS41AejdSkIEmPCB7v2D7ioxtLFiCaQUlu+K8rT6qOe3PmMacZ2sZsmdIs5jtYtxPig==";
     };
     dependencies = [
       (sources."@gulp-sourcemaps/identity-map-1.0.2" // {
@@ -59676,7 +59740,7 @@ in
         dependencies = [
           sources."glob-7.1.4"
           sources."minimatch-3.0.4"
-          sources."semver-5.7.0"
+          sources."semver-5.7.1"
           sources."uglify-js-2.8.29"
         ];
       })
@@ -59775,7 +59839,6 @@ in
       sources."concat-map-0.0.1"
       sources."convert-source-map-1.6.0"
       sources."copy-descriptor-0.1.1"
-      sources."core-js-2.5.7"
       sources."core-util-is-1.0.2"
       sources."cryptiles-2.0.5"
       (sources."css-2.2.4" // {
@@ -59806,7 +59869,6 @@ in
       sources."deprecated-0.0.1"
       sources."detect-file-1.0.0"
       sources."detect-newline-2.1.0"
-      sources."dom4-2.1.3"
       (sources."duplexer2-0.0.2" // {
         dependencies = [
           sources."isarray-0.0.1"
@@ -59824,9 +59886,9 @@ in
       sources."ecc-jsbn-0.1.2"
       sources."end-of-stream-0.1.5"
       sources."errno-0.1.7"
-      sources."es5-ext-0.10.50"
+      sources."es5-ext-0.10.51"
       sources."es6-iterator-2.0.3"
-      sources."es6-symbol-3.1.1"
+      sources."es6-symbol-3.1.2"
       sources."es6-weak-map-2.0.3"
       sources."escape-string-regexp-1.0.5"
       sources."event-emitter-0.3.5"
@@ -59886,7 +59948,7 @@ in
       sources."fragment-cache-0.2.1"
       (sources."fs-mkdirp-stream-1.0.0" // {
         dependencies = [
-          sources."graceful-fs-4.2.1"
+          sources."graceful-fs-4.2.2"
           sources."readable-stream-2.3.6"
           sources."string_decoder-1.1.1"
           sources."through2-2.0.5"
@@ -59917,7 +59979,7 @@ in
         ];
       })
       sources."glogg-1.0.2"
-      sources."graceful-fs-3.0.11"
+      sources."graceful-fs-3.0.12"
       sources."gulp-3.9.1"
       (sources."gulp-clean-css-3.10.0" // {
         dependencies = [
@@ -59941,7 +60003,7 @@ in
       })
       (sources."gulp-sourcemaps-2.6.4" // {
         dependencies = [
-          sources."graceful-fs-4.2.1"
+          sources."graceful-fs-4.2.2"
           sources."readable-stream-2.3.6"
           sources."source-map-0.6.1"
           sources."string_decoder-1.1.1"
@@ -59958,7 +60020,7 @@ in
           sources."extend-shallow-1.1.4"
           sources."glob-7.1.4"
           sources."glob-stream-6.1.0"
-          sources."graceful-fs-4.2.1"
+          sources."graceful-fs-4.2.2"
           sources."kind-of-1.1.0"
           sources."minimatch-3.0.4"
           sources."ordered-read-streams-1.0.1"
@@ -60060,7 +60122,7 @@ in
       sources."lead-1.0.0"
       (sources."less-2.7.3" // {
         dependencies = [
-          sources."graceful-fs-4.2.1"
+          sources."graceful-fs-4.2.2"
         ];
       })
       sources."liftoff-2.5.0"
@@ -60328,7 +60390,7 @@ in
       sources."use-3.1.1"
       sources."user-home-1.1.1"
       sources."util-deprecate-1.0.2"
-      sources."uuid-3.3.2"
+      sources."uuid-3.3.3"
       sources."v8flags-2.1.1"
       sources."value-or-function-3.0.0"
       (sources."verror-1.10.0" // {
@@ -60346,7 +60408,7 @@ in
         dependencies = [
           sources."clone-2.1.2"
           sources."clone-stats-1.0.0"
-          sources."graceful-fs-4.2.1"
+          sources."graceful-fs-4.2.2"
           sources."vinyl-2.2.0"
         ];
       })
@@ -60367,6 +60429,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   mocha = nodeEnv.buildNodePackage {
     name = "mocha";
@@ -60402,7 +60465,7 @@ in
       sources."diff-3.5.0"
       sources."emoji-regex-7.0.3"
       sources."end-of-stream-1.4.1"
-      sources."es-abstract-1.13.0"
+      sources."es-abstract-1.14.2"
       sources."es-to-primitive-1.2.0"
       sources."escape-string-regexp-1.0.5"
       sources."esprima-4.0.1"
@@ -60446,6 +60509,7 @@ in
       sources."node-environment-flags-1.0.5"
       sources."npm-run-path-2.0.2"
       sources."number-is-nan-1.0.1"
+      sources."object-inspect-1.6.0"
       sources."object-keys-1.1.1"
       sources."object.assign-4.1.0"
       sources."object.getownpropertydescriptors-2.0.3"
@@ -60454,7 +60518,7 @@ in
       sources."p-defer-1.0.0"
       sources."p-finally-1.0.0"
       sources."p-is-promise-2.1.0"
-      sources."p-limit-2.2.0"
+      sources."p-limit-2.2.1"
       sources."p-locate-3.0.0"
       sources."p-try-2.2.0"
       sources."path-exists-3.0.0"
@@ -60463,13 +60527,15 @@ in
       sources."pump-3.0.0"
       sources."require-directory-2.1.1"
       sources."require-main-filename-2.0.0"
-      sources."semver-5.7.0"
+      sources."semver-5.7.1"
       sources."set-blocking-2.0.0"
       sources."shebang-command-1.2.0"
       sources."shebang-regex-1.0.0"
       sources."signal-exit-3.0.2"
       sources."sprintf-js-1.0.3"
       sources."string-width-2.1.1"
+      sources."string.prototype.trimleft-2.1.0"
+      sources."string.prototype.trimright-2.1.0"
       sources."strip-ansi-4.0.0"
       sources."strip-eof-1.0.0"
       sources."strip-json-comments-2.0.1"
@@ -60512,6 +60578,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   multi-file-swagger = nodeEnv.buildNodePackage {
     name = "multi-file-swagger";
@@ -60533,7 +60600,7 @@ in
       sources."delayed-stream-1.0.0"
       sources."esprima-4.0.1"
       sources."extend-3.0.2"
-      sources."form-data-2.5.0"
+      sources."form-data-2.5.1"
       sources."formidable-1.2.1"
       sources."graphlib-2.1.7"
       sources."inherits-2.0.4"
@@ -60554,7 +60621,7 @@ in
       sources."path-loader-1.0.10"
       sources."process-nextick-args-2.0.1"
       sources."punycode-2.1.1"
-      sources."qs-6.7.0"
+      sources."qs-6.8.0"
       sources."readable-stream-2.3.6"
       sources."safe-buffer-5.1.2"
       sources."slash-2.0.0"
@@ -60571,6 +60638,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   neovim = nodeEnv.buildNodePackage {
     name = "neovim";
@@ -60593,7 +60661,7 @@ in
       sources."isstream-0.1.2"
       sources."lodash-4.17.15"
       sources."msgpack-lite-0.1.26"
-      sources."semver-5.7.0"
+      sources."semver-5.7.1"
       sources."stack-trace-0.0.10"
       sources."traverse-0.6.6"
       sources."which-1.3.1"
@@ -60607,6 +60675,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   nijs = nodeEnv.buildNodePackage {
     name = "nijs";
@@ -60628,6 +60697,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   node-gyp = nodeEnv.buildNodePackage {
     name = "node-gyp";
@@ -60669,12 +60739,12 @@ in
       sources."fast-json-stable-stringify-2.0.0"
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.3"
-      sources."fs-minipass-1.2.6"
+      sources."fs-minipass-1.2.7"
       sources."fs.realpath-1.0.0"
       sources."gauge-2.7.4"
       sources."getpass-0.1.7"
       sources."glob-7.1.4"
-      sources."graceful-fs-4.2.1"
+      sources."graceful-fs-4.2.2"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.3"
       sources."has-unicode-2.0.1"
@@ -60695,8 +60765,8 @@ in
       sources."mime-types-2.1.24"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
-      sources."minipass-2.3.5"
-      sources."minizlib-1.2.1"
+      sources."minipass-2.6.2"
+      sources."minizlib-1.2.2"
       sources."mkdirp-0.5.1"
       sources."nopt-3.0.6"
       sources."npmlog-4.1.2"
@@ -60707,12 +60777,12 @@ in
       sources."path-is-absolute-1.0.1"
       sources."performance-now-2.1.0"
       sources."process-nextick-args-2.0.1"
-      sources."psl-1.3.0"
+      sources."psl-1.4.0"
       sources."punycode-2.1.1"
       sources."qs-6.5.2"
       sources."readable-stream-2.3.6"
       sources."request-2.88.0"
-      sources."rimraf-2.6.3"
+      sources."rimraf-2.7.1"
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
       sources."semver-5.3.0"
@@ -60732,7 +60802,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."uri-js-4.2.2"
       sources."util-deprecate-1.0.2"
-      sources."uuid-3.3.2"
+      sources."uuid-3.3.3"
       sources."verror-1.10.0"
       sources."which-1.3.1"
       sources."wide-align-1.1.3"
@@ -60747,14 +60817,15 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   node-gyp-build = nodeEnv.buildNodePackage {
     name = "node-gyp-build";
     packageName = "node-gyp-build";
-    version = "4.1.0";
+    version = "4.1.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.1.0.tgz";
-      sha512 = "rGLv++nK20BG8gc0MzzcYe1Nl3p3mtwJ74Q2QD0HTEDKZ6NvOFSelY6s2QBPWIHRR8h7hpad0LiwajfClBJfNg==";
+      url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.1.1.tgz";
+      sha512 = "dSq1xmcPDKPZ2EED2S6zw/b9NKsqzXRE6dVr8TVQnI3FJOTteUMuqF3Qqs6LZg+mLGYJWqQzMbIjMtJqTv87nQ==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -60764,6 +60835,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   node-inspector = nodeEnv.buildNodePackage {
     name = "node-inspector";
@@ -60857,14 +60929,14 @@ in
         ];
       })
       sources."glob-5.0.15"
-      sources."graceful-fs-4.2.1"
+      sources."graceful-fs-4.2.2"
       sources."har-schema-1.0.5"
       sources."har-validator-4.2.1"
       sources."has-unicode-2.0.1"
       sources."hawk-3.1.3"
       sources."headless-0.1.7"
       sources."hoek-2.16.3"
-      sources."hosted-git-info-2.8.2"
+      sources."hosted-git-info-2.8.4"
       sources."http-errors-1.7.2"
       sources."http-signature-1.1.1"
       sources."iconv-lite-0.4.24"
@@ -60896,7 +60968,6 @@ in
       sources."load-json-file-1.1.0"
       sources."lodash-2.4.2"
       sources."loud-rejection-1.6.0"
-      sources."lru-cache-5.1.1"
       sources."map-obj-1.0.1"
       sources."media-typer-0.3.0"
       sources."meow-3.7.0"
@@ -60918,8 +60989,8 @@ in
       (sources."node-pre-gyp-0.6.39" // {
         dependencies = [
           sources."glob-7.1.4"
-          sources."rimraf-2.6.3"
-          sources."semver-5.7.0"
+          sources."rimraf-2.7.1"
+          sources."semver-5.7.1"
         ];
       })
       sources."nopt-4.0.1"
@@ -61007,7 +61078,7 @@ in
       (sources."tar-pack-3.4.1" // {
         dependencies = [
           sources."glob-7.1.4"
-          sources."rimraf-2.6.3"
+          sources."rimraf-2.7.1"
         ];
       })
       sources."toidentifier-1.0.0"
@@ -61024,7 +61095,7 @@ in
       sources."untildify-2.1.0"
       sources."util-deprecate-1.0.2"
       sources."utils-merge-1.0.1"
-      sources."uuid-3.3.2"
+      sources."uuid-3.3.3"
       sources."v8-debug-1.0.1"
       sources."v8-profiler-5.7.0"
       sources."validate-npm-package-license-3.0.4"
@@ -61054,7 +61125,6 @@ in
       sources."xmldom-0.1.27"
       sources."xtend-4.0.2"
       sources."y18n-3.2.1"
-      sources."yallist-3.0.3"
       sources."yargs-3.32.0"
     ];
     buildInputs = globalBuildInputs;
@@ -61064,6 +61134,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   node-pre-gyp = nodeEnv.buildNodePackage {
     name = "node-pre-gyp";
@@ -61089,13 +61160,13 @@ in
       sources."deep-extend-0.6.0"
       sources."delegates-1.0.0"
       sources."detect-libc-1.0.3"
-      sources."fs-minipass-1.2.6"
+      sources."fs-minipass-1.2.7"
       sources."fs.realpath-1.0.0"
       sources."gauge-2.7.4"
       sources."glob-7.1.4"
       sources."has-unicode-2.0.1"
       sources."iconv-lite-0.4.24"
-      sources."ignore-walk-3.0.1"
+      sources."ignore-walk-3.0.2"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."ini-1.3.5"
@@ -61103,8 +61174,8 @@ in
       sources."isarray-1.0.0"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
-      sources."minipass-2.3.5"
-      sources."minizlib-1.2.1"
+      sources."minipass-2.6.2"
+      sources."minizlib-1.2.2"
       sources."mkdirp-0.5.1"
       sources."ms-2.1.2"
       sources."needle-2.4.0"
@@ -61126,11 +61197,11 @@ in
         ];
       })
       sources."readable-stream-2.3.6"
-      sources."rimraf-2.6.3"
+      sources."rimraf-2.7.1"
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
       sources."sax-1.2.4"
-      sources."semver-5.7.0"
+      sources."semver-5.7.1"
       sources."set-blocking-2.0.0"
       sources."signal-exit-3.0.2"
       sources."string-width-1.0.2"
@@ -61151,20 +61222,21 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   node-red = nodeEnv.buildNodePackage {
     name = "node-red";
     packageName = "node-red";
-    version = "0.20.7";
+    version = "0.20.8";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-red/-/node-red-0.20.7.tgz";
-      sha512 = "klwQup/74kYGLBujQj4txrmpMYUdR88A68xjdycedD9dwMDwWCu8NL5t+O8XMWYxJ332hOIgLS62tm8ChxrkuQ==";
+      url = "https://registry.npmjs.org/node-red/-/node-red-0.20.8.tgz";
+      sha512 = "+i2SHPo8AQED0lyf7xoGcWAs142Nc5zvCTzmuncslgxVt/fl6XADEEY4yT/eDVNOwRrf9TZMjhSxBM9ScJJu7Q==";
     };
     dependencies = [
-      sources."@babel/runtime-7.5.5"
-      sources."@node-red/editor-api-0.20.7"
-      sources."@node-red/editor-client-0.20.7"
-      (sources."@node-red/nodes-0.20.7" // {
+      sources."@babel/runtime-7.6.0"
+      sources."@node-red/editor-api-0.20.8"
+      sources."@node-red/editor-client-0.20.8"
+      (sources."@node-red/nodes-0.20.8" // {
         dependencies = [
           sources."cookie-0.4.0"
           sources."http-errors-1.7.3"
@@ -61178,9 +61250,9 @@ in
           })
         ];
       })
-      sources."@node-red/registry-0.20.7"
-      sources."@node-red/runtime-0.20.7"
-      sources."@node-red/util-0.20.7"
+      sources."@node-red/registry-0.20.8"
+      sources."@node-red/runtime-0.20.8"
+      sources."@node-red/util-0.20.8"
       sources."abbrev-1.1.1"
       sources."accepts-1.3.7"
       sources."addressparser-1.0.1"
@@ -61292,13 +61364,17 @@ in
       sources."encodeurl-1.0.2"
       sources."end-of-stream-1.4.1"
       sources."entities-1.1.2"
-      sources."es5-ext-0.10.50"
+      sources."es5-ext-0.10.51"
       sources."es6-iterator-2.0.3"
       sources."es6-map-0.1.5"
       sources."es6-promise-4.2.8"
       sources."es6-promisify-5.0.0"
-      sources."es6-set-0.1.5"
-      sources."es6-symbol-3.1.1"
+      (sources."es6-set-0.1.5" // {
+        dependencies = [
+          sources."es6-symbol-3.1.1"
+        ];
+      })
+      sources."es6-symbol-3.1.2"
       sources."escape-html-1.0.3"
       sources."esprima-4.0.1"
       sources."etag-1.8.1"
@@ -61329,7 +61405,7 @@ in
       sources."forwarded-0.1.2"
       sources."fresh-0.5.2"
       sources."fs-extra-8.1.0"
-      sources."fs-minipass-1.2.6"
+      sources."fs-minipass-1.2.7"
       sources."fs.notify-0.0.4"
       sources."fs.realpath-1.0.0"
       sources."gauge-2.7.4"
@@ -61342,7 +61418,7 @@ in
           sources."string_decoder-1.1.1"
         ];
       })
-      sources."graceful-fs-4.2.1"
+      sources."graceful-fs-4.2.2"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.3"
       sources."has-unicode-2.0.1"
@@ -61361,7 +61437,7 @@ in
       })
       sources."i18next-15.1.0"
       sources."iconv-lite-0.4.24"
-      sources."ignore-walk-3.0.1"
+      sources."ignore-walk-3.0.2"
       (sources."imap-0.8.19" // {
         dependencies = [
           sources."isarray-0.0.1"
@@ -61436,12 +61512,12 @@ in
       sources."mime-types-2.1.24"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
-      (sources."minipass-2.3.5" // {
+      (sources."minipass-2.6.2" // {
         dependencies = [
           sources."yallist-3.0.3"
         ];
       })
-      sources."minizlib-1.2.1"
+      sources."minizlib-1.2.2"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
@@ -61471,12 +61547,12 @@ in
       sources."next-tick-1.0.0"
       (sources."node-pre-gyp-0.12.0" // {
         dependencies = [
-          sources."semver-5.7.0"
+          sources."semver-5.7.1"
         ];
       })
-      sources."node-red-node-email-1.6.2"
+      sources."node-red-node-email-1.6.3"
       sources."node-red-node-feedparser-0.1.14"
-      sources."node-red-node-rbe-0.2.4"
+      sources."node-red-node-rbe-0.2.5"
       sources."node-red-node-sentiment-0.1.4"
       sources."node-red-node-tail-0.0.2"
       sources."node-red-node-twitter-1.1.5"
@@ -61522,7 +61598,7 @@ in
       sources."process-nextick-args-2.0.1"
       sources."proxy-addr-2.0.5"
       sources."pseudomap-1.0.2"
-      sources."psl-1.3.0"
+      sources."psl-1.4.0"
       sources."pump-3.0.0"
       (sources."pumpify-1.5.1" // {
         dependencies = [
@@ -61545,7 +61621,7 @@ in
         ];
       })
       sources."retry-0.6.1"
-      sources."rimraf-2.6.3"
+      sources."rimraf-2.7.1"
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
       sources."sax-1.2.4"
@@ -61569,10 +61645,14 @@ in
       sources."stream-shift-1.0.0"
       sources."streamsearch-0.1.2"
       sources."string-width-1.0.2"
-      sources."string_decoder-1.2.0"
+      (sources."string_decoder-1.3.0" // {
+        dependencies = [
+          sources."safe-buffer-5.2.0"
+        ];
+      })
       sources."strip-ansi-3.0.1"
       sources."strip-json-comments-2.0.1"
-      sources."tail-2.0.2"
+      sources."tail-2.0.3"
       (sources."tar-4.4.10" // {
         dependencies = [
           sources."yallist-3.0.3"
@@ -61616,7 +61696,7 @@ in
       })
       sources."util-deprecate-1.0.2"
       sources."utils-merge-1.0.1"
-      sources."uuid-3.3.2"
+      sources."uuid-3.3.3"
       sources."vary-1.1.2"
       sources."verror-1.10.0"
       (sources."websocket-stream-5.5.0" // {
@@ -61644,6 +61724,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   node2nix = nodeEnv.buildNodePackage {
     name = "node2nix";
@@ -61697,7 +61778,7 @@ in
           sources."rimraf-2.2.8"
         ];
       })
-      sources."fs-minipass-1.2.6"
+      sources."fs-minipass-1.2.7"
       (sources."fs.extra-1.3.2" // {
         dependencies = [
           sources."mkdirp-0.3.5"
@@ -61707,11 +61788,11 @@ in
       sources."gauge-2.7.4"
       sources."getpass-0.1.7"
       sources."glob-7.1.4"
-      sources."graceful-fs-4.2.1"
+      sources."graceful-fs-4.2.2"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.3"
       sources."has-unicode-2.0.1"
-      sources."hosted-git-info-2.8.2"
+      sources."hosted-git-info-2.8.4"
       sources."http-signature-1.2.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
@@ -61726,30 +61807,29 @@ in
       sources."json-stringify-safe-5.0.1"
       sources."jsonfile-1.0.1"
       sources."jsprim-1.4.1"
-      sources."lru-cache-5.1.1"
       sources."mime-db-1.40.0"
       sources."mime-types-2.1.24"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
-      sources."minipass-2.3.5"
-      sources."minizlib-1.2.1"
+      sources."minipass-2.6.2"
+      sources."minizlib-1.2.2"
       sources."mkdirp-0.5.1"
       sources."ncp-0.4.2"
       sources."nijs-0.0.25"
       sources."nopt-3.0.6"
       (sources."normalize-package-data-2.5.0" // {
         dependencies = [
-          sources."semver-5.7.0"
+          sources."semver-5.7.1"
         ];
       })
-      (sources."npm-package-arg-6.1.0" // {
+      (sources."npm-package-arg-6.1.1" // {
         dependencies = [
-          sources."semver-5.7.0"
+          sources."semver-5.7.1"
         ];
       })
       (sources."npm-registry-client-8.6.0" // {
         dependencies = [
-          sources."semver-5.7.0"
+          sources."semver-5.7.1"
         ];
       })
       (sources."npmconf-2.1.3" // {
@@ -61772,7 +61852,7 @@ in
       sources."performance-now-2.1.0"
       sources."process-nextick-args-2.0.1"
       sources."proto-list-1.2.4"
-      sources."psl-1.3.0"
+      sources."psl-1.4.0"
       sources."punycode-2.1.1"
       sources."qs-6.5.2"
       (sources."readable-stream-2.3.6" // {
@@ -61817,7 +61897,7 @@ in
       sources."uid-number-0.0.5"
       sources."uri-js-4.2.2"
       sources."util-deprecate-1.0.2"
-      sources."uuid-3.3.2"
+      sources."uuid-3.3.3"
       sources."validate-npm-package-license-3.0.4"
       sources."validate-npm-package-name-3.0.0"
       sources."verror-1.10.0"
@@ -61834,14 +61914,15 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   nodemon = nodeEnv.buildNodePackage {
     name = "nodemon";
     packageName = "nodemon";
-    version = "1.19.1";
+    version = "1.19.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/nodemon/-/nodemon-1.19.1.tgz";
-      sha512 = "/DXLzd/GhiaDXXbGId5BzxP1GlsqtMGM9zTmkWrgXtSqjKmGSbLicM/oAy4FR0YWm14jCHRwnR31AHS2dYFHrg==";
+      url = "https://registry.npmjs.org/nodemon/-/nodemon-1.19.2.tgz";
+      sha512 = "hRLYaw5Ihyw9zK7NF+9EUzVyS6Cvgc14yh8CAYr38tPxJa6UrOxwAQ351GwrgoanHCF0FalQFn6w5eoX/LGdJw==";
     };
     dependencies = [
       sources."abbrev-1.1.1"
@@ -61879,7 +61960,7 @@ in
       sources."camelcase-4.1.0"
       sources."capture-stack-trace-1.0.1"
       sources."chalk-2.4.2"
-      sources."chokidar-2.1.6"
+      sources."chokidar-2.1.8"
       sources."ci-info-1.6.0"
       (sources."class-utils-0.3.6" // {
         dependencies = [
@@ -61968,7 +62049,7 @@ in
       })
       sources."global-dirs-0.1.1"
       sources."got-6.7.1"
-      sources."graceful-fs-4.2.1"
+      sources."graceful-fs-4.2.2"
       sources."has-flag-3.0.0"
       sources."has-value-1.0.0"
       (sources."has-values-1.0.0" // {
@@ -62002,7 +62083,7 @@ in
       sources."is-path-inside-1.0.1"
       sources."is-plain-object-2.0.4"
       sources."is-redirect-1.0.0"
-      sources."is-retry-allowed-1.1.0"
+      sources."is-retry-allowed-1.2.0"
       sources."is-stream-1.1.0"
       sources."is-windows-1.0.2"
       sources."isarray-1.0.0"
@@ -62066,7 +62147,7 @@ in
       sources."ret-0.1.15"
       sources."safe-buffer-5.1.2"
       sources."safe-regex-1.1.0"
-      sources."semver-5.7.0"
+      sources."semver-5.7.1"
       sources."semver-diff-2.1.0"
       (sources."set-value-2.0.1" // {
         dependencies = [
@@ -62166,7 +62247,7 @@ in
         ];
       })
       sources."unzip-response-2.0.1"
-      sources."upath-1.1.2"
+      sources."upath-1.2.0"
       sources."update-notifier-2.5.0"
       sources."urix-0.1.0"
       sources."url-parse-lax-1.0.0"
@@ -62186,14 +62267,15 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   npm = nodeEnv.buildNodePackage {
     name = "npm";
     packageName = "npm";
-    version = "6.10.2";
+    version = "6.11.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-6.10.2.tgz";
-      sha512 = "B6n5dgmsl1fpBYhor2OTEn9Md0r63/FpQocDn4WNT4gIQRQZLql9g+mk8s3j9qZD370kUTzwDaOBSmDdNGK3NA==";
+      url = "https://registry.npmjs.org/npm/-/npm-6.11.3.tgz";
+      sha512 = "K2h+MPzZiY39Xf6eHEdECe/LKoJXam4UCflz5kIxoskN3LQFeYs5fqBGT5i4TtM/aBk+86Mcf+jgXs/WuWAutQ==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -62203,14 +62285,15 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   npm-check-updates = nodeEnv.buildNodePackage {
     name = "npm-check-updates";
     packageName = "npm-check-updates";
-    version = "3.1.20";
+    version = "3.1.23";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-3.1.20.tgz";
-      sha512 = "mc9BAoOYSTwP/IvoA+ofdkWSipwRvhgC0qop1PvlMZojgzi7N/dykdxOIWrw0OlZPnEKvXkKFEuPk97LrvXE1A==";
+      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-3.1.23.tgz";
+      sha512 = "Z2dkMdNgue6OPkQDPcAK62Qrwv+G1PaEmKrDrrSAiSP7pRD3u30xOVy1nLukS1XrJ2/zF8XTVxFe9/ubcvlcPQ==";
     };
     dependencies = [
       sources."@sindresorhus/is-0.14.0"
@@ -62229,7 +62312,7 @@ in
       sources."brace-expansion-1.1.11"
       sources."buffer-from-1.1.1"
       sources."builtins-1.0.3"
-      sources."cacache-12.0.2"
+      sources."cacache-12.0.3"
       (sources."cacheable-request-6.1.0" // {
         dependencies = [
           sources."get-stream-5.1.0"
@@ -62248,7 +62331,7 @@ in
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
       sources."colors-1.0.3"
-      sources."commander-2.20.0"
+      sources."commander-3.0.1"
       sources."concat-map-0.0.1"
       sources."concat-stream-1.6.2"
       sources."configstore-4.0.0"
@@ -62261,7 +62344,7 @@ in
         ];
       })
       sources."crypto-random-string-1.0.0"
-      sources."cyclist-0.2.2"
+      sources."cyclist-1.0.1"
       (sources."debug-3.1.0" // {
         dependencies = [
           sources."ms-2.0.0"
@@ -62291,7 +62374,7 @@ in
       sources."find-up-4.1.0"
       sources."flush-write-stream-1.1.1"
       sources."from2-2.3.0"
-      sources."fs-minipass-1.2.6"
+      sources."fs-minipass-1.2.7"
       sources."fs-write-stream-atomic-1.0.10"
       sources."fs.realpath-1.0.0"
       sources."genfun-5.0.0"
@@ -62300,18 +62383,18 @@ in
       sources."glob-7.1.4"
       sources."global-dirs-0.1.1"
       sources."got-9.6.0"
-      sources."graceful-fs-4.2.1"
+      sources."graceful-fs-4.2.2"
       sources."has-ansi-2.0.0"
       sources."has-flag-3.0.0"
       sources."has-yarn-2.1.0"
-      sources."hosted-git-info-2.8.2"
+      sources."hosted-git-info-2.8.4"
       sources."http-cache-semantics-3.8.1"
       sources."http-proxy-agent-2.1.0"
       sources."https-proxy-agent-2.2.2"
       sources."humanize-ms-1.2.1"
       sources."iconv-lite-0.4.24"
       sources."iferr-0.1.5"
-      sources."ignore-walk-3.0.1"
+      sources."ignore-walk-3.0.2"
       sources."import-lazy-2.1.0"
       sources."imurmurhash-0.1.4"
       sources."infer-owner-1.0.4"
@@ -62360,8 +62443,8 @@ in
       sources."mimic-response-1.0.1"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
-      sources."minipass-2.3.5"
-      sources."minizlib-1.2.1"
+      sources."minipass-2.6.2"
+      sources."minizlib-1.2.2"
       sources."mississippi-3.0.0"
       sources."mkdirp-0.5.1"
       sources."move-concurrently-1.0.1"
@@ -62377,23 +62460,23 @@ in
       sources."node-fetch-npm-2.0.2"
       (sources."normalize-package-data-2.5.0" // {
         dependencies = [
-          sources."semver-5.7.0"
+          sources."semver-5.7.1"
         ];
       })
       sources."normalize-url-4.3.0"
       sources."npm-bundled-1.0.6"
-      (sources."npm-package-arg-6.1.0" // {
+      (sources."npm-package-arg-6.1.1" // {
         dependencies = [
-          sources."semver-5.7.0"
+          sources."semver-5.7.1"
         ];
       })
       sources."npm-packlist-1.4.4"
-      (sources."npm-pick-manifest-2.2.3" // {
+      (sources."npm-pick-manifest-3.0.2" // {
         dependencies = [
-          sources."semver-5.7.0"
+          sources."semver-5.7.1"
         ];
       })
-      sources."npm-registry-fetch-4.0.0"
+      sources."npm-registry-fetch-4.0.1"
       sources."npm-run-path-2.0.2"
       sources."object-assign-4.1.1"
       sources."object-keys-1.1.1"
@@ -62403,16 +62486,16 @@ in
       sources."osenv-0.1.5"
       sources."p-cancelable-1.1.0"
       sources."p-finally-1.0.0"
-      sources."p-limit-2.2.0"
+      sources."p-limit-2.2.1"
       sources."p-locate-4.1.0"
       sources."p-try-2.2.0"
       sources."package-json-6.5.0"
-      (sources."pacote-9.5.4" // {
+      (sources."pacote-9.5.8" // {
         dependencies = [
-          sources."semver-5.7.0"
+          sources."semver-5.7.1"
         ];
       })
-      sources."parallel-transform-1.1.0"
+      sources."parallel-transform-1.2.0"
       sources."path-exists-4.0.0"
       sources."path-is-absolute-1.0.1"
       sources."path-is-inside-1.0.2"
@@ -62460,14 +62543,14 @@ in
       sources."resolve-1.12.0"
       sources."responselike-1.0.2"
       sources."retry-0.10.1"
-      sources."rimraf-2.6.3"
+      sources."rimraf-2.7.1"
       sources."run-queue-1.0.3"
       sources."safe-buffer-5.2.0"
       sources."safer-buffer-2.1.2"
       sources."semver-6.3.0"
       (sources."semver-diff-2.1.0" // {
         dependencies = [
-          sources."semver-5.7.0"
+          sources."semver-5.7.1"
         ];
       })
       sources."semver-utils-1.1.4"
@@ -62544,6 +62627,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   "npm2nix-git://github.com/NixOS/npm2nix.git#5.12.0" = nodeEnv.buildNodePackage {
     name = "npm2nix";
@@ -62605,7 +62689,7 @@ in
       sources."fs.realpath-1.0.0"
       (sources."fstream-0.1.31" // {
         dependencies = [
-          sources."graceful-fs-3.0.11"
+          sources."graceful-fs-3.0.12"
           sources."mkdirp-0.5.1"
         ];
       })
@@ -62660,7 +62744,7 @@ in
       sources."performance-now-2.1.0"
       sources."process-nextick-args-2.0.1"
       sources."proto-list-1.2.4"
-      sources."psl-1.3.0"
+      sources."psl-1.4.0"
       sources."punycode-2.1.1"
       sources."qs-6.5.2"
       (sources."readable-stream-2.3.6" // {
@@ -62670,7 +62754,7 @@ in
       })
       sources."request-2.88.0"
       sources."retry-0.6.0"
-      sources."rimraf-2.6.3"
+      sources."rimraf-2.7.1"
       sources."safe-buffer-5.2.0"
       sources."safer-buffer-2.1.2"
       sources."semver-4.3.6"
@@ -62707,7 +62791,7 @@ in
       sources."underscore.string-2.3.3"
       sources."uri-js-4.2.2"
       sources."util-deprecate-1.0.2"
-      sources."uuid-3.3.2"
+      sources."uuid-3.3.3"
       sources."verror-1.10.0"
       sources."walk-2.3.14"
       sources."wide-align-1.1.3"
@@ -62720,6 +62804,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   ocaml-language-server = nodeEnv.buildNodePackage {
     name = "ocaml-language-server";
@@ -62761,6 +62846,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   parcel-bundler = nodeEnv.buildNodePackage {
     name = "parcel-bundler";
@@ -62789,16 +62875,16 @@ in
       (sources."@babel/helper-call-delegate-7.4.4" // {
         dependencies = [
           sources."@babel/code-frame-7.5.5"
-          sources."@babel/generator-7.5.5"
-          sources."@babel/parser-7.5.5"
-          sources."@babel/traverse-7.5.5"
-          sources."@babel/types-7.5.5"
+          sources."@babel/generator-7.6.0"
+          sources."@babel/parser-7.6.0"
+          sources."@babel/traverse-7.6.0"
+          sources."@babel/types-7.6.1"
           sources."source-map-0.5.7"
         ];
       })
       (sources."@babel/helper-define-map-7.5.5" // {
         dependencies = [
-          sources."@babel/types-7.5.5"
+          sources."@babel/types-7.6.1"
         ];
       })
       sources."@babel/helper-explode-assignable-expression-7.1.0"
@@ -62806,20 +62892,20 @@ in
       sources."@babel/helper-get-function-arity-7.0.0"
       (sources."@babel/helper-hoist-variables-7.4.4" // {
         dependencies = [
-          sources."@babel/types-7.5.5"
+          sources."@babel/types-7.6.1"
         ];
       })
       (sources."@babel/helper-member-expression-to-functions-7.5.5" // {
         dependencies = [
-          sources."@babel/types-7.5.5"
+          sources."@babel/types-7.6.1"
         ];
       })
       sources."@babel/helper-module-imports-7.0.0"
       (sources."@babel/helper-module-transforms-7.5.5" // {
         dependencies = [
-          sources."@babel/parser-7.5.5"
-          sources."@babel/template-7.4.4"
-          sources."@babel/types-7.5.5"
+          sources."@babel/parser-7.6.0"
+          sources."@babel/template-7.6.0"
+          sources."@babel/types-7.6.1"
         ];
       })
       sources."@babel/helper-optimise-call-expression-7.0.0"
@@ -62829,28 +62915,28 @@ in
       (sources."@babel/helper-replace-supers-7.5.5" // {
         dependencies = [
           sources."@babel/code-frame-7.5.5"
-          sources."@babel/generator-7.5.5"
-          sources."@babel/parser-7.5.5"
-          sources."@babel/traverse-7.5.5"
-          sources."@babel/types-7.5.5"
+          sources."@babel/generator-7.6.0"
+          sources."@babel/parser-7.6.0"
+          sources."@babel/traverse-7.6.0"
+          sources."@babel/types-7.6.1"
           sources."source-map-0.5.7"
         ];
       })
       sources."@babel/helper-simple-access-7.1.0"
       (sources."@babel/helper-split-export-declaration-7.4.4" // {
         dependencies = [
-          sources."@babel/types-7.5.5"
+          sources."@babel/types-7.6.1"
         ];
       })
       sources."@babel/helper-wrap-function-7.2.0"
-      (sources."@babel/helpers-7.5.5" // {
+      (sources."@babel/helpers-7.6.0" // {
         dependencies = [
           sources."@babel/code-frame-7.5.5"
-          sources."@babel/generator-7.5.5"
-          sources."@babel/parser-7.5.5"
-          sources."@babel/template-7.4.4"
-          sources."@babel/traverse-7.5.5"
-          sources."@babel/types-7.5.5"
+          sources."@babel/generator-7.6.0"
+          sources."@babel/parser-7.6.0"
+          sources."@babel/template-7.6.0"
+          sources."@babel/traverse-7.6.0"
+          sources."@babel/types-7.6.1"
           sources."source-map-0.5.7"
         ];
       })
@@ -62870,10 +62956,10 @@ in
       sources."@babel/plugin-transform-arrow-functions-7.2.0"
       sources."@babel/plugin-transform-async-to-generator-7.5.0"
       sources."@babel/plugin-transform-block-scoped-functions-7.2.0"
-      sources."@babel/plugin-transform-block-scoping-7.5.5"
+      sources."@babel/plugin-transform-block-scoping-7.6.0"
       sources."@babel/plugin-transform-classes-7.5.5"
       sources."@babel/plugin-transform-computed-properties-7.2.0"
-      sources."@babel/plugin-transform-destructuring-7.5.0"
+      sources."@babel/plugin-transform-destructuring-7.6.0"
       sources."@babel/plugin-transform-dotall-regex-7.4.4"
       sources."@babel/plugin-transform-duplicate-keys-7.5.0"
       sources."@babel/plugin-transform-exponentiation-operator-7.2.0"
@@ -62885,7 +62971,7 @@ in
       sources."@babel/plugin-transform-modules-commonjs-7.2.0"
       sources."@babel/plugin-transform-modules-systemjs-7.5.0"
       sources."@babel/plugin-transform-modules-umd-7.2.0"
-      sources."@babel/plugin-transform-named-capturing-groups-regex-7.4.5"
+      sources."@babel/plugin-transform-named-capturing-groups-regex-7.6.0"
       sources."@babel/plugin-transform-new-target-7.4.4"
       sources."@babel/plugin-transform-object-super-7.5.5"
       sources."@babel/plugin-transform-parameters-7.4.4"
@@ -62911,12 +62997,12 @@ in
       sources."@parcel/watcher-1.12.0"
       sources."@parcel/workers-1.11.0"
       sources."@types/q-1.5.2"
-      sources."abab-2.0.0"
+      sources."abab-2.0.1"
       sources."abbrev-1.1.1"
       sources."acorn-5.7.3"
-      (sources."acorn-globals-4.3.3" // {
+      (sources."acorn-globals-4.3.4" // {
         dependencies = [
-          sources."acorn-6.2.1"
+          sources."acorn-6.3.0"
         ];
       })
       sources."acorn-walk-6.2.0"
@@ -62991,7 +63077,7 @@ in
           sources."pako-1.0.10"
         ];
       })
-      sources."browserslist-4.6.6"
+      sources."browserslist-4.7.0"
       (sources."buffer-4.9.1" // {
         dependencies = [
           sources."isarray-1.0.0"
@@ -63010,7 +63096,7 @@ in
       sources."caniuse-lite-1.0.30000989"
       sources."caseless-0.12.0"
       sources."chalk-2.4.2"
-      sources."chokidar-2.1.6"
+      sources."chokidar-2.1.8"
       sources."cipher-base-1.0.4"
       sources."class-utils-0.3.6"
       sources."cli-cursor-2.1.0"
@@ -63145,18 +63231,22 @@ in
       sources."ecc-jsbn-0.1.2"
       sources."editorconfig-0.15.3"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.3.215"
-      sources."elliptic-6.5.0"
+      sources."electron-to-chromium-1.3.260"
+      sources."elliptic-6.5.1"
       sources."encodeurl-1.0.2"
       sources."entities-1.1.2"
       sources."error-ex-1.3.2"
-      sources."es-abstract-1.13.0"
+      (sources."es-abstract-1.14.2" // {
+        dependencies = [
+          sources."object-inspect-1.6.0"
+        ];
+      })
       sources."es-to-primitive-1.2.0"
       sources."escape-html-1.0.3"
       sources."escape-string-regexp-1.0.5"
       sources."escodegen-1.9.1"
       sources."esprima-3.1.3"
-      sources."estraverse-4.2.0"
+      sources."estraverse-4.3.0"
       sources."esutils-2.0.3"
       sources."etag-1.8.1"
       sources."events-3.0.0"
@@ -63203,7 +63293,7 @@ in
       })
       sources."glob-to-regexp-0.3.0"
       sources."globals-11.12.0"
-      sources."graceful-fs-4.2.1"
+      sources."graceful-fs-4.2.2"
       sources."grapheme-breaker-0.3.2"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.3"
@@ -63232,7 +63322,7 @@ in
       sources."html-tags-1.2.0"
       (sources."htmlnano-0.2.4" // {
         dependencies = [
-          sources."terser-4.1.3"
+          sources."terser-4.3.1"
         ];
       })
       (sources."htmlparser2-3.10.1" // {
@@ -63252,7 +63342,6 @@ in
       sources."inherits-2.0.4"
       sources."ini-1.3.5"
       sources."invariant-2.2.4"
-      sources."ip-regex-2.1.0"
       sources."is-absolute-url-2.1.0"
       (sources."is-accessor-descriptor-1.0.0" // {
         dependencies = [
@@ -63295,7 +63384,7 @@ in
       sources."isexe-2.0.0"
       sources."isobject-3.0.1"
       sources."isstream-0.1.2"
-      sources."js-beautify-1.10.1"
+      sources."js-beautify-1.10.2"
       sources."js-levenshtein-1.1.6"
       sources."js-tokens-4.0.0"
       (sources."js-yaml-3.13.1" // {
@@ -63304,11 +63393,11 @@ in
         ];
       })
       sources."jsbn-0.1.1"
-      (sources."jsdom-15.1.1" // {
+      (sources."jsdom-14.1.0" // {
         dependencies = [
-          sources."acorn-6.2.1"
-          sources."escodegen-1.11.1"
-          sources."ws-7.1.1"
+          sources."acorn-6.3.0"
+          sources."escodegen-1.12.0"
+          sources."ws-6.2.1"
         ];
       })
       sources."jsesc-2.5.2"
@@ -63338,7 +63427,7 @@ in
           sources."source-map-0.5.7"
         ];
       })
-      sources."merge2-1.2.4"
+      sources."merge2-1.3.0"
       (sources."micromatch-3.1.10" // {
         dependencies = [
           sources."define-property-2.0.2"
@@ -63384,7 +63473,7 @@ in
           sources."punycode-1.4.1"
         ];
       })
-      sources."node-releases-1.1.26"
+      sources."node-releases-1.1.32"
       sources."nopt-4.0.1"
       sources."normalize-html-whitespace-1.0.0"
       sources."normalize-path-3.0.0"
@@ -63427,7 +63516,7 @@ in
       sources."physical-cpu-count-2.0.0"
       sources."pn-1.1.0"
       sources."posix-character-classes-0.1.1"
-      (sources."postcss-7.0.17" // {
+      (sources."postcss-7.0.18" // {
         dependencies = [
           sources."supports-color-6.1.0"
         ];
@@ -63493,7 +63582,7 @@ in
       sources."postcss-svgo-4.0.2"
       sources."postcss-unique-selectors-4.0.1"
       sources."postcss-value-parser-3.3.1"
-      sources."posthtml-0.11.4"
+      sources."posthtml-0.11.6"
       sources."posthtml-parser-0.4.1"
       sources."posthtml-render-1.1.5"
       sources."prelude-ls-1.1.2"
@@ -63502,7 +63591,7 @@ in
       sources."process-nextick-args-2.0.1"
       sources."proto-list-1.2.4"
       sources."pseudomap-1.0.2"
-      sources."psl-1.3.0"
+      sources."psl-1.4.0"
       sources."public-encrypt-4.0.3"
       sources."punycode-2.1.1"
       sources."q-1.5.1"
@@ -63529,8 +63618,8 @@ in
           sources."is-extendable-1.0.1"
         ];
       })
-      sources."regexp-tree-0.1.11"
-      sources."regexpu-core-4.5.4"
+      sources."regexp-tree-0.1.13"
+      sources."regexpu-core-4.6.0"
       sources."regjsgen-0.5.0"
       (sources."regjsparser-0.6.0" // {
         dependencies = [
@@ -63547,11 +63636,7 @@ in
         ];
       })
       sources."request-promise-core-1.1.2"
-      (sources."request-promise-native-1.0.7" // {
-        dependencies = [
-          sources."tough-cookie-2.5.0"
-        ];
-      })
+      sources."request-promise-native-1.0.7"
       sources."resolve-1.12.0"
       sources."resolve-from-3.0.0"
       sources."resolve-url-0.2.1"
@@ -63559,7 +63644,7 @@ in
       sources."ret-0.1.15"
       sources."rgb-regex-1.0.1"
       sources."rgba-regex-1.0.0"
-      sources."rimraf-2.6.3"
+      sources."rimraf-2.7.1"
       sources."ripemd160-2.0.2"
       sources."safe-buffer-5.1.2"
       sources."safe-regex-1.1.0"
@@ -63567,7 +63652,7 @@ in
       sources."safer-eval-1.3.5"
       sources."sax-1.2.4"
       sources."saxes-3.1.11"
-      sources."semver-5.7.0"
+      sources."semver-5.7.1"
       (sources."send-0.17.1" // {
         dependencies = [
           (sources."debug-2.6.9" // {
@@ -63627,6 +63712,8 @@ in
       sources."stealthy-require-1.1.1"
       sources."stream-browserify-2.0.2"
       sources."stream-http-2.8.3"
+      sources."string.prototype.trimleft-2.1.0"
+      sources."string.prototype.trimright-2.1.0"
       sources."string_decoder-1.1.1"
       sources."strip-ansi-4.0.0"
       (sources."stylehacks-4.0.3" // {
@@ -63639,7 +63726,7 @@ in
       sources."symbol-tree-3.2.4"
       sources."terser-3.17.0"
       sources."through2-2.0.5"
-      sources."timers-browserify-2.0.10"
+      sources."timers-browserify-2.0.11"
       sources."timsort-0.3.0"
       sources."tiny-inflate-1.0.2"
       sources."to-arraybuffer-1.0.1"
@@ -63654,7 +63741,7 @@ in
       })
       sources."to-regex-range-2.1.1"
       sources."toidentifier-1.0.0"
-      sources."tough-cookie-3.0.1"
+      sources."tough-cookie-2.5.0"
       sources."tr46-1.0.1"
       sources."trim-right-1.0.1"
       sources."tty-browserify-0.0.0"
@@ -63662,10 +63749,10 @@ in
       sources."tweetnacl-0.14.5"
       sources."type-check-0.3.2"
       sources."typedarray-0.0.6"
-      (sources."uncss-0.17.0" // {
+      (sources."uncss-0.17.2" // {
         dependencies = [
           sources."cssesc-3.0.0"
-          sources."is-absolute-url-3.0.0"
+          sources."is-absolute-url-3.0.2"
           sources."postcss-selector-parser-6.0.2"
         ];
       })
@@ -63689,7 +63776,7 @@ in
           sources."isarray-1.0.0"
         ];
       })
-      sources."upath-1.1.2"
+      sources."upath-1.2.0"
       sources."uri-js-4.2.2"
       sources."urix-0.1.0"
       (sources."url-0.11.0" // {
@@ -63705,7 +63792,7 @@ in
       })
       sources."util-deprecate-1.0.2"
       sources."util.promisify-1.0.0"
-      sources."uuid-3.3.2"
+      sources."uuid-3.3.3"
       sources."v8-compile-cache-2.1.0"
       sources."vendors-1.0.3"
       sources."verror-1.10.0"
@@ -63723,7 +63810,7 @@ in
       sources."wrappy-1.0.2"
       sources."ws-5.2.2"
       sources."xml-name-validator-3.0.0"
-      sources."xmlchars-2.1.1"
+      sources."xmlchars-2.2.0"
       sources."xtend-4.0.2"
       sources."yallist-2.1.2"
     ];
@@ -63735,6 +63822,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   peerflix = nodeEnv.buildNodePackage {
     name = "peerflix";
@@ -63791,6 +63879,9 @@ in
       sources."camelcase-keys-2.1.0"
       sources."chalk-1.1.3"
       sources."chardet-0.4.2"
+      sources."chrome-dgram-3.0.3"
+      sources."chrome-dns-1.0.1"
+      sources."chrome-net-3.3.3"
       sources."cli-cursor-2.1.0"
       sources."cli-width-2.2.0"
       sources."clivas-0.2.0"
@@ -63808,8 +63899,9 @@ in
       sources."debug-2.6.9"
       sources."decamelize-1.2.0"
       sources."decompress-response-3.3.0"
-      sources."deep-equal-1.0.1"
+      sources."deep-equal-1.1.0"
       sources."deep-extend-0.6.0"
+      sources."define-properties-1.1.3"
       sources."dns-equal-1.0.0"
       sources."dns-packet-1.3.1"
       sources."dns-txt-2.0.2"
@@ -63828,14 +63920,16 @@ in
         ];
       })
       sources."fs.realpath-1.0.0"
+      sources."function-bind-1.1.1"
       sources."get-browser-rtc-1.0.2"
       sources."get-stdin-4.0.1"
       sources."glob-7.1.4"
-      sources."graceful-fs-4.2.1"
+      sources."graceful-fs-4.2.2"
+      sources."has-1.0.3"
       sources."has-ansi-2.0.0"
       sources."has-flag-3.0.0"
       sources."hat-0.0.3"
-      sources."hosted-git-info-2.8.2"
+      sources."hosted-git-info-2.8.4"
       sources."http-headers-3.0.2"
       sources."iconv-lite-0.4.24"
       sources."immediate-chunk-store-1.0.8"
@@ -63859,10 +63953,13 @@ in
       sources."ip-1.1.5"
       sources."ip-set-1.0.2"
       sources."ipaddr.js-1.9.1"
+      sources."is-arguments-1.0.4"
       sources."is-arrayish-0.2.1"
+      sources."is-date-object-1.0.1"
       sources."is-finite-1.0.2"
       sources."is-fullwidth-code-point-1.0.0"
       sources."is-promise-2.1.0"
+      sources."is-regex-1.0.4"
       sources."is-utf8-0.2.1"
       sources."isarray-1.0.0"
       sources."k-bucket-0.6.0"
@@ -63871,13 +63968,12 @@ in
           sources."k-bucket-2.0.1"
         ];
       })
-      sources."k-rpc-socket-1.8.0"
+      sources."k-rpc-socket-1.11.1"
       sources."keypress-0.2.1"
       sources."load-json-file-1.1.0"
       sources."lodash-3.10.1"
       sources."loud-rejection-1.6.0"
       sources."lru-2.0.1"
-      sources."lru-cache-5.1.1"
       sources."magnet-uri-5.2.4"
       sources."map-obj-1.0.1"
       sources."meow-3.7.0"
@@ -63897,6 +63993,8 @@ in
       sources."number-is-nan-1.0.1"
       sources."numeral-2.0.6"
       sources."object-assign-4.1.1"
+      sources."object-is-1.0.1"
+      sources."object-keys-1.1.1"
       sources."once-1.4.0"
       sources."onetime-2.0.1"
       sources."open-0.0.5"
@@ -63953,11 +64051,12 @@ in
       sources."read-pkg-up-1.0.1"
       sources."readable-stream-2.3.6"
       sources."redent-1.0.0"
+      sources."regexp.prototype.flags-1.2.0"
       sources."repeating-2.0.1"
       sources."resolve-1.12.0"
       sources."restore-cursor-2.0.0"
       sources."reverse-http-1.3.0"
-      sources."rimraf-2.6.3"
+      sources."rimraf-2.7.1"
       sources."run-async-2.3.0"
       sources."run-parallel-1.1.9"
       sources."run-series-1.1.8"
@@ -63965,7 +64064,7 @@ in
       sources."rxjs-5.5.12"
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
-      sources."semver-5.7.0"
+      sources."semver-5.7.1"
       sources."server-destroy-1.0.1"
       sources."signal-exit-3.0.2"
       sources."simple-concat-1.0.0"
@@ -64027,7 +64126,6 @@ in
       sources."xmlbuilder-4.0.0"
       sources."xmldom-0.1.27"
       sources."xtend-4.0.2"
-      sources."yallist-3.0.3"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -64037,17 +64135,18 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   peerflix-server = nodeEnv.buildNodePackage {
     name = "peerflix-server";
     packageName = "peerflix-server";
-    version = "0.4.2";
+    version = "0.5.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.4.2.tgz";
-      sha512 = "UuY4QsKFEPpB52Ee0y0jOOrTN1Mm2Lee/EJN3RdOxJxEupBujBypqZAfxQrjtsKle8QkZHG3z4j/DnwkroYnUQ==";
+      url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.5.0.tgz";
+      sha512 = "TmtYwbayKLfzTj4rMIQ5nfGcXqkp8VwsCXkfZz95JdJcfk0+HYhflLDwviq+qOUxgKMYpoggqb129c3KST7zmQ==";
     };
     dependencies = [
-      sources."accepts-1.2.13"
+      sources."accepts-1.3.7"
       sources."addr-to-ip-port-1.5.1"
       sources."after-0.8.2"
       sources."ajv-6.10.2"
@@ -64057,10 +64156,12 @@ in
           sources."readable-stream-2.3.6"
         ];
       })
-      sources."arraybuffer.slice-0.0.6"
+      sources."array-flatten-1.1.1"
+      sources."arraybuffer.slice-0.0.7"
       sources."asn1-0.2.4"
       sources."assert-plus-1.0.0"
       sources."async-2.6.3"
+      sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.8.0"
@@ -64068,11 +64169,8 @@ in
       sources."balanced-match-1.0.0"
       sources."base64-arraybuffer-0.1.5"
       sources."base64-js-1.3.1"
-      sources."base64-url-1.2.1"
       sources."base64id-1.0.0"
-      sources."basic-auth-1.0.4"
-      sources."basic-auth-connect-1.0.0"
-      sources."batch-0.5.3"
+      sources."basic-auth-2.0.1"
       sources."bcrypt-pbkdf-1.0.2"
       sources."bencode-0.7.0"
       sources."better-assert-1.0.2"
@@ -64082,21 +64180,17 @@ in
         dependencies = [
           sources."bencode-0.8.0"
           sources."minimist-1.2.0"
+          sources."ultron-1.0.2"
+          sources."ws-1.1.5"
         ];
       })
       sources."bl-3.0.0"
-      sources."blob-0.0.4"
+      sources."blob-0.0.5"
       sources."bn.js-4.11.8"
       sources."bncode-0.5.3"
-      (sources."body-parser-1.13.3" // {
-        dependencies = [
-          sources."depd-1.0.1"
-          sources."http-errors-1.3.1"
-          sources."qs-4.0.0"
-        ];
-      })
+      sources."body-parser-1.19.0"
       sources."brace-expansion-1.1.11"
-      sources."buffer-5.2.1"
+      sources."buffer-5.4.3"
       sources."buffer-alloc-1.2.0"
       sources."buffer-alloc-unsafe-1.1.0"
       sources."buffer-crc32-0.2.13"
@@ -64104,11 +64198,13 @@ in
       sources."buffer-equals-1.0.4"
       sources."buffer-fill-1.0.0"
       sources."buffer-from-1.1.1"
-      sources."bytes-2.1.0"
+      sources."bytes-3.1.0"
       sources."callsite-1.0.0"
       sources."caseless-0.12.0"
+      sources."chrome-dgram-3.0.3"
+      sources."chrome-dns-1.0.1"
+      sources."chrome-net-3.3.3"
       sources."combined-stream-1.0.8"
-      sources."commander-2.6.0"
       sources."compact2string-1.4.1"
       sources."component-bind-1.0.0"
       sources."component-emitter-1.2.1"
@@ -64118,124 +64214,81 @@ in
           sources."readable-stream-2.3.6"
         ];
       })
-      sources."compressible-2.0.17"
-      sources."compression-1.5.2"
       sources."concat-map-0.0.1"
-      (sources."connect-2.30.2" // {
+      (sources."connect-multiparty-2.2.0" // {
         dependencies = [
-          sources."depd-1.0.1"
-          sources."http-errors-1.3.1"
-          sources."isarray-0.0.1"
-          sources."multiparty-3.3.2"
-          sources."qs-4.0.0"
-          sources."readable-stream-1.1.14"
-          sources."string_decoder-0.10.31"
-        ];
-      })
-      sources."connect-multiparty-2.2.0"
-      (sources."connect-timeout-1.6.2" // {
-        dependencies = [
-          sources."http-errors-1.3.1"
+          sources."qs-6.5.2"
         ];
       })
-      sources."content-disposition-0.5.0"
+      sources."content-disposition-0.5.3"
       sources."content-type-1.0.4"
-      sources."cookie-0.1.3"
-      sources."cookie-parser-1.3.5"
+      sources."cookie-0.4.0"
       sources."cookie-signature-1.0.6"
       sources."core-util-is-1.0.2"
       sources."crc-3.8.0"
       sources."crc32-stream-3.0.1"
-      (sources."csrf-3.0.6" // {
-        dependencies = [
-          sources."uid-safe-2.1.4"
-        ];
-      })
-      (sources."csurf-1.8.3" // {
-        dependencies = [
-          sources."http-errors-1.3.1"
-        ];
-      })
       sources."cyclist-0.1.1"
       sources."dashdash-1.14.1"
-      sources."debug-2.2.0"
+      sources."debug-2.6.9"
       sources."decompress-response-3.3.0"
       sources."delayed-stream-1.0.0"
       sources."depd-1.1.2"
       sources."destroy-1.0.4"
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
+      sources."encodeurl-1.0.2"
       sources."end-of-stream-1.4.1"
-      (sources."engine.io-1.8.5" // {
+      (sources."engine.io-3.3.2" // {
         dependencies = [
-          sources."accepts-1.3.3"
           sources."cookie-0.3.1"
-          sources."debug-2.3.3"
-          sources."ms-0.7.2"
-          sources."negotiator-0.6.1"
-        ];
-      })
-      (sources."engine.io-client-1.8.5" // {
-        dependencies = [
-          sources."debug-2.3.3"
-          sources."ms-0.7.2"
-        ];
-      })
-      sources."engine.io-parser-1.3.2"
-      (sources."errorhandler-1.4.3" // {
-        dependencies = [
-          sources."accepts-1.3.7"
-          sources."escape-html-1.0.3"
-          sources."negotiator-0.6.2"
-        ];
-      })
-      sources."escape-html-1.0.2"
-      sources."etag-1.7.0"
-      (sources."express-3.21.2" // {
-        dependencies = [
-          sources."depd-1.0.1"
-          sources."range-parser-1.0.3"
+          sources."debug-3.1.0"
         ];
       })
-      (sources."express-session-1.11.3" // {
+      (sources."engine.io-client-3.3.2" // {
         dependencies = [
-          sources."crc-3.3.0"
-          sources."depd-1.0.1"
-          sources."uid-safe-2.0.0"
+          sources."debug-3.1.0"
         ];
       })
+      sources."engine.io-parser-2.1.3"
+      sources."escape-html-1.0.3"
+      sources."etag-1.8.1"
+      sources."express-4.17.1"
       sources."extend-3.0.2"
       sources."extsprintf-1.3.0"
       sources."fast-deep-equal-2.0.1"
       sources."fast-json-stable-stringify-2.0.0"
       sources."fd-slicer-1.1.0"
       sources."fifo-0.1.4"
-      sources."finalhandler-0.4.0"
+      sources."finalhandler-1.1.2"
       sources."flatten-0.0.1"
       sources."fluent-ffmpeg-2.1.2"
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.3"
       sources."forwarded-0.1.2"
-      sources."fresh-0.3.0"
+      sources."fresh-0.5.2"
       sources."fs-chunk-store-1.7.0"
       sources."fs-constants-1.0.0"
       sources."fs.realpath-1.0.0"
       sources."get-browser-rtc-1.0.2"
       sources."getpass-0.1.7"
       sources."glob-7.1.4"
-      sources."graceful-fs-4.2.1"
+      sources."graceful-fs-4.2.2"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.3"
-      (sources."has-binary-0.1.7" // {
+      (sources."has-binary2-1.0.3" // {
         dependencies = [
-          sources."isarray-0.0.1"
+          sources."isarray-2.0.1"
         ];
       })
       sources."has-cors-1.1.0"
       sources."hat-0.0.3"
-      sources."http-errors-1.7.3"
+      (sources."http-errors-1.7.2" // {
+        dependencies = [
+          sources."inherits-2.0.3"
+        ];
+      })
       sources."http-signature-1.2.0"
-      sources."iconv-lite-0.4.11"
+      sources."iconv-lite-0.4.24"
       sources."ieee754-1.1.13"
       sources."immediate-chunk-store-1.0.8"
       sources."indexof-0.0.1"
@@ -64243,7 +64296,7 @@ in
       sources."inherits-2.0.4"
       sources."ip-1.1.5"
       sources."ip-set-1.0.2"
-      sources."ipaddr.js-1.0.5"
+      sources."ipaddr.js-1.9.0"
       sources."is-typedarray-1.0.0"
       sources."isarray-1.0.0"
       sources."isexe-2.0.0"
@@ -64252,7 +64305,6 @@ in
       sources."json-schema-0.2.3"
       sources."json-schema-traverse-0.4.1"
       sources."json-stringify-safe-5.0.1"
-      sources."json3-3.3.2"
       sources."jsprim-1.4.1"
       sources."k-bucket-0.6.0"
       (sources."k-rpc-3.7.0" // {
@@ -64260,7 +64312,7 @@ in
           sources."k-bucket-2.0.1"
         ];
       })
-      (sources."k-rpc-socket-1.8.0" // {
+      (sources."k-rpc-socket-1.11.1" // {
         dependencies = [
           sources."bencode-2.0.1"
         ];
@@ -64279,33 +64331,21 @@ in
       sources."lru-2.0.1"
       sources."magnet-uri-2.0.1"
       sources."media-typer-0.3.0"
-      sources."merge-descriptors-1.0.0"
-      (sources."method-override-2.3.10" // {
-        dependencies = [
-          sources."debug-2.6.9"
-          sources."ms-2.0.0"
-          sources."vary-1.1.2"
-        ];
-      })
+      sources."merge-descriptors-1.0.1"
       sources."methods-1.1.2"
-      sources."mime-1.3.4"
+      sources."mime-1.6.0"
       sources."mime-db-1.40.0"
       sources."mime-types-2.1.24"
       sources."mimic-response-1.0.1"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
       sources."mkdirp-0.5.1"
-      (sources."morgan-1.6.1" // {
-        dependencies = [
-          sources."depd-1.0.1"
-        ];
-      })
-      sources."ms-0.7.1"
+      sources."morgan-1.9.1"
+      sources."ms-2.0.0"
       sources."multiparty-4.2.1"
-      sources."negotiator-0.5.3"
+      sources."negotiator-0.6.2"
       sources."normalize-path-3.0.0"
       sources."oauth-sign-0.9.0"
-      sources."object-assign-4.1.0"
       sources."object-component-0.0.3"
       sources."on-finished-2.3.0"
       sources."on-headers-1.0.2"
@@ -64317,12 +64357,11 @@ in
         ];
       })
       sources."parse-torrent-file-2.1.4"
-      sources."parsejson-0.0.3"
       sources."parseqs-0.0.5"
       sources."parseuri-0.0.5"
       sources."parseurl-1.3.3"
       sources."path-is-absolute-1.0.1"
-      sources."pause-0.1.0"
+      sources."path-to-regexp-0.1.7"
       (sources."peer-wire-protocol-0.7.1" // {
         dependencies = [
           sources."bncode-0.2.3"
@@ -64335,64 +64374,38 @@ in
       sources."pend-1.2.0"
       sources."performance-now-2.1.0"
       sources."process-nextick-args-2.0.1"
-      sources."proxy-addr-1.0.10"
-      sources."psl-1.3.0"
-      sources."pump-1.0.3"
+      sources."proxy-addr-2.0.5"
+      sources."psl-1.4.0"
+      sources."pump-3.0.0"
       sources."punycode-2.1.1"
-      sources."qs-6.5.2"
+      sources."qs-6.7.0"
       sources."random-access-file-2.1.3"
       sources."random-access-storage-1.4.0"
       sources."random-bytes-1.0.0"
       sources."random-iterate-1.0.1"
       sources."randombytes-2.1.0"
       sources."range-parser-1.2.1"
-      (sources."raw-body-2.1.7" // {
-        dependencies = [
-          sources."bytes-2.4.0"
-          sources."iconv-lite-0.4.13"
-        ];
-      })
+      sources."raw-body-2.4.0"
       sources."re-emitter-1.1.4"
       sources."read-torrent-1.3.1"
       sources."readable-stream-3.4.0"
-      sources."request-2.88.0"
-      sources."response-time-2.3.2"
-      sources."rimraf-2.6.3"
-      sources."rndm-1.2.0"
+      (sources."request-2.88.0" // {
+        dependencies = [
+          sources."qs-6.5.2"
+        ];
+      })
+      sources."rimraf-2.7.1"
       sources."run-parallel-1.1.9"
       sources."run-series-1.1.8"
       sources."rusha-0.8.13"
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
-      (sources."send-0.13.0" // {
-        dependencies = [
-          sources."depd-1.0.1"
-          sources."destroy-1.0.3"
-          sources."http-errors-1.3.1"
-          sources."range-parser-1.0.3"
-          sources."statuses-1.2.1"
-        ];
-      })
-      (sources."serve-favicon-2.3.2" // {
-        dependencies = [
-          sources."ms-0.7.2"
-        ];
-      })
-      (sources."serve-index-1.7.3" // {
-        dependencies = [
-          sources."escape-html-1.0.3"
-          sources."http-errors-1.3.1"
-        ];
-      })
-      (sources."serve-static-1.10.3" // {
+      (sources."send-0.17.1" // {
         dependencies = [
-          sources."escape-html-1.0.3"
-          sources."http-errors-1.3.1"
-          sources."range-parser-1.0.3"
-          sources."send-0.13.2"
-          sources."statuses-1.2.1"
+          sources."ms-2.1.1"
         ];
       })
+      sources."serve-static-1.14.1"
       sources."setprototypeof-1.1.1"
       sources."simple-concat-1.0.0"
       sources."simple-get-2.8.1"
@@ -64406,44 +64419,30 @@ in
         dependencies = [
           sources."readable-stream-2.3.6"
           sources."safe-buffer-5.0.1"
-          sources."ultron-1.1.1"
           sources."ws-2.3.1"
         ];
       })
-      (sources."socket.io-1.7.4" // {
-        dependencies = [
-          sources."debug-2.3.3"
-          sources."ms-0.7.2"
-        ];
-      })
-      (sources."socket.io-adapter-0.5.0" // {
+      (sources."socket.io-2.2.0" // {
         dependencies = [
-          sources."debug-2.3.3"
-          sources."ms-0.7.2"
+          sources."debug-4.1.1"
+          sources."ms-2.1.2"
         ];
       })
-      (sources."socket.io-client-1.7.4" // {
+      sources."socket.io-adapter-1.1.1"
+      (sources."socket.io-client-2.2.0" // {
         dependencies = [
-          sources."debug-2.3.3"
-          sources."ms-0.7.2"
+          sources."debug-3.1.0"
         ];
       })
-      (sources."socket.io-parser-2.3.1" // {
+      (sources."socket.io-parser-3.3.0" // {
         dependencies = [
-          sources."component-emitter-1.1.2"
-          sources."isarray-0.0.1"
+          sources."debug-3.1.0"
+          sources."isarray-2.0.1"
         ];
       })
       sources."speedometer-0.1.4"
       sources."sshpk-1.16.1"
       sources."statuses-1.5.0"
-      (sources."stream-counter-0.2.0" // {
-        dependencies = [
-          sources."isarray-0.0.1"
-          sources."readable-stream-1.1.14"
-          sources."string_decoder-0.10.31"
-        ];
-      })
       sources."string2compact-1.3.0"
       sources."string_decoder-1.1.1"
       sources."tar-stream-2.1.0"
@@ -64465,27 +64464,24 @@ in
           sources."punycode-1.4.1"
         ];
       })
-      sources."tsscmp-1.0.5"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."type-is-1.6.18"
       sources."uid-safe-2.1.5"
-      sources."ultron-1.0.2"
+      sources."ultron-1.1.1"
       sources."uniq-1.0.1"
       sources."unpipe-1.0.0"
       sources."uri-js-4.2.2"
       sources."util-deprecate-1.0.2"
-      sources."utils-merge-1.0.0"
+      sources."utils-merge-1.0.1"
       sources."utp-0.0.7"
-      sources."uuid-3.3.2"
-      sources."vary-1.0.1"
+      sources."uuid-3.3.3"
+      sources."vary-1.1.2"
       sources."verror-1.10.0"
-      sources."vhost-3.0.2"
       sources."which-1.3.1"
       sources."wrappy-1.0.2"
-      sources."ws-1.1.5"
-      sources."wtf-8-1.0.0"
-      sources."xmlhttprequest-ssl-1.5.3"
+      sources."ws-6.1.4"
+      sources."xmlhttprequest-ssl-1.5.5"
       sources."xtend-4.0.2"
       sources."yeast-0.1.2"
       sources."zip-stream-2.1.2"
@@ -64498,14 +64494,15 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   pnpm = nodeEnv.buildNodePackage {
     name = "pnpm";
     packageName = "pnpm";
-    version = "3.6.3";
+    version = "3.8.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/pnpm/-/pnpm-3.6.3.tgz";
-      sha512 = "Hxk8VouMZRh870u0hJHCcumylGO8VV6Id+Fm7S+MyZVGGgtaZlEFFV2HIndVd9nXTksS+RuhINX6jGIVmqTmDg==";
+      url = "https://registry.npmjs.org/pnpm/-/pnpm-3.8.1.tgz";
+      sha512 = "uINy/U+TNvUHInG1l0/NrgDosUtafn9BrHjP5+v+ojpw+zb/lgXjkQmMHB4461LKezlNoBb7+0JOrNnm5JhZFg==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -64515,6 +64512,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   prettier = nodeEnv.buildNodePackage {
     name = "prettier";
@@ -64532,6 +64530,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   pulp = nodeEnv.buildNodePackage {
     name = "pulp";
@@ -64543,13 +64542,9 @@ in
     };
     dependencies = [
       sources."JSONStream-1.3.5"
-      sources."acorn-6.2.1"
-      sources."acorn-dynamic-import-4.0.0"
-      sources."acorn-node-1.7.0"
-      sources."acorn-walk-6.2.0"
-      sources."array-filter-0.0.1"
-      sources."array-map-0.0.0"
-      sources."array-reduce-0.0.0"
+      sources."acorn-7.0.0"
+      sources."acorn-node-1.8.2"
+      sources."acorn-walk-7.0.0"
       sources."asn1.js-4.10.1"
       (sources."assert-1.5.0" // {
         dependencies = [
@@ -64569,7 +64564,7 @@ in
           sources."resolve-1.1.7"
         ];
       })
-      (sources."browserify-16.3.0" // {
+      (sources."browserify-16.5.0" // {
         dependencies = [
           sources."concat-stream-1.6.2"
         ];
@@ -64587,7 +64582,7 @@ in
       sources."browserify-rsa-4.0.1"
       sources."browserify-sign-4.0.4"
       sources."browserify-zlib-0.2.0"
-      sources."buffer-5.2.1"
+      sources."buffer-5.4.3"
       sources."buffer-crc32-0.2.13"
       sources."buffer-from-1.1.1"
       sources."buffer-xor-1.0.3"
@@ -64623,7 +64618,7 @@ in
       sources."diffie-hellman-5.0.3"
       sources."domain-browser-1.2.0"
       sources."duplexer2-0.1.4"
-      sources."elliptic-6.5.0"
+      sources."elliptic-6.5.1"
       sources."es6-promise-3.3.1"
       sources."events-2.1.0"
       sources."evp_bytestokey-1.0.3"
@@ -64633,7 +64628,7 @@ in
       sources."get-assigned-identifiers-1.2.0"
       sources."glob-7.1.4"
       sources."globule-1.2.1"
-      sources."graceful-fs-4.2.1"
+      sources."graceful-fs-4.2.2"
       sources."has-1.0.3"
       sources."hash-base-3.0.4"
       sources."hash.js-1.1.7"
@@ -64711,13 +64706,13 @@ in
         ];
       })
       sources."resolve-1.12.0"
-      sources."rimraf-2.6.3"
+      sources."rimraf-2.7.1"
       sources."ripemd160-2.0.2"
       sources."safe-buffer-5.2.0"
       sources."sander-0.5.1"
       sources."sha.js-2.4.11"
       sources."shasum-1.0.2"
-      sources."shell-quote-1.6.1"
+      sources."shell-quote-1.7.2"
       sources."simple-concat-1.0.0"
       (sources."sorcery-0.10.0" // {
         dependencies = [
@@ -64728,24 +64723,27 @@ in
       sources."sourcemap-codec-1.4.6"
       sources."stream-browserify-2.0.2"
       sources."stream-combiner2-1.1.1"
-      sources."stream-http-2.8.3"
-      sources."stream-splicer-2.0.1"
-      (sources."string_decoder-1.2.0" // {
+      (sources."stream-http-3.1.0" // {
         dependencies = [
-          sources."safe-buffer-5.1.2"
+          sources."readable-stream-3.4.0"
         ];
       })
+      sources."stream-splicer-2.0.1"
+      sources."string_decoder-1.3.0"
       (sources."subarg-1.0.0" // {
         dependencies = [
           sources."minimist-1.2.0"
         ];
       })
       sources."syntax-error-1.4.0"
-      sources."temp-0.9.0"
+      (sources."temp-0.9.0" // {
+        dependencies = [
+          sources."rimraf-2.6.3"
+        ];
+      })
       sources."through-2.3.8"
       sources."through2-2.0.5"
       sources."timers-browserify-1.4.2"
-      sources."to-arraybuffer-1.0.1"
       sources."tree-kill-1.2.1"
       sources."tty-browserify-0.0.1"
       sources."typedarray-0.0.6"
@@ -64776,6 +64774,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   react-native-cli = nodeEnv.buildNodePackage {
     name = "react-native-cli";
@@ -64795,15 +64794,21 @@ in
       sources."colors-0.6.2"
       sources."concat-map-0.0.1"
       sources."cycle-1.0.3"
-      sources."deep-equal-1.0.1"
+      sources."deep-equal-1.1.0"
+      sources."define-properties-1.1.3"
       sources."escape-string-regexp-1.0.5"
       sources."eyes-0.1.8"
       sources."fs.realpath-1.0.0"
+      sources."function-bind-1.1.1"
       sources."glob-7.1.4"
+      sources."has-1.0.3"
       sources."has-ansi-2.0.0"
       sources."i-0.3.6"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
+      sources."is-arguments-1.0.4"
+      sources."is-date-object-1.0.1"
+      sources."is-regex-1.0.4"
       sources."isstream-0.1.2"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
@@ -64814,14 +64819,17 @@ in
       })
       sources."mute-stream-0.0.8"
       sources."ncp-0.4.2"
+      sources."object-is-1.0.1"
+      sources."object-keys-1.1.1"
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
       sources."pkginfo-0.4.1"
       sources."prompt-0.2.14"
       sources."read-1.0.7"
+      sources."regexp.prototype.flags-1.2.0"
       sources."revalidator-0.1.8"
-      sources."rimraf-2.6.3"
-      sources."semver-5.7.0"
+      sources."rimraf-2.7.1"
+      sources."semver-5.7.1"
       sources."stack-trace-0.0.10"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
@@ -64841,6 +64849,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   react-tools = nodeEnv.buildNodePackage {
     name = "react-tools";
@@ -64865,7 +64874,7 @@ in
       sources."esprima-3.1.3"
       sources."esprima-fb-13001.1001.0-dev-harmony-fb"
       sources."glob-5.0.15"
-      sources."graceful-fs-4.2.1"
+      sources."graceful-fs-4.2.2"
       sources."iconv-lite-0.4.24"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
@@ -64894,6 +64903,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   "reveal.js" = nodeEnv.buildNodePackage {
     name = "reveal.js";
@@ -64911,6 +64921,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   s3http = nodeEnv.buildNodePackage {
     name = "s3http";
@@ -65011,7 +65022,7 @@ in
       })
       sources."pause-0.0.1"
       sources."performance-now-2.1.0"
-      sources."psl-1.3.0"
+      sources."psl-1.4.0"
       sources."punycode-2.1.1"
       sources."qs-0.6.5"
       sources."range-parser-0.0.4"
@@ -65036,7 +65047,7 @@ in
       sources."uid2-0.0.3"
       sources."uri-js-4.2.2"
       sources."util-0.4.9"
-      sources."uuid-3.3.2"
+      sources."uuid-3.3.3"
       sources."verror-1.10.0"
       sources."xml2js-0.2.4"
       sources."xmlbuilder-0.4.2"
@@ -65046,6 +65057,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   semver = nodeEnv.buildNodePackage {
     name = "semver";
@@ -65063,6 +65075,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   serve = nodeEnv.buildNodePackage {
     name = "serve";
@@ -65168,6 +65181,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   shout = nodeEnv.buildNodePackage {
     name = "shout";
@@ -65315,7 +65329,7 @@ in
       sources."pause-stream-0.0.11"
       sources."performance-now-2.1.0"
       sources."proxy-addr-2.0.5"
-      sources."psl-1.3.0"
+      sources."psl-1.4.0"
       sources."punycode-2.1.1"
       sources."qs-6.7.0"
       sources."range-parser-1.2.1"
@@ -65385,7 +65399,7 @@ in
       sources."uri-js-4.2.2"
       sources."utf8-2.0.0"
       sources."utils-merge-1.0.1"
-      sources."uuid-3.3.2"
+      sources."uuid-3.3.3"
       sources."vary-1.1.2"
       sources."verror-1.10.0"
       (sources."ws-0.4.31" // {
@@ -65403,6 +65417,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   sloc = nodeEnv.buildNodePackage {
     name = "sloc";
@@ -65495,7 +65510,7 @@ in
       sources."for-in-1.0.2"
       sources."fragment-cache-0.2.1"
       sources."get-value-2.0.6"
-      sources."graceful-fs-4.2.1"
+      sources."graceful-fs-4.2.2"
       sources."graceful-readlink-1.0.1"
       sources."has-value-1.0.0"
       (sources."has-values-1.0.0" // {
@@ -65642,6 +65657,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   smartdc = nodeEnv.buildNodePackage {
     name = "smartdc";
@@ -65784,28 +65800,34 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   snyk = nodeEnv.buildNodePackage {
     name = "snyk";
     packageName = "snyk";
-    version = "1.210.0";
+    version = "1.227.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/snyk/-/snyk-1.210.0.tgz";
-      sha512 = "k6/EIX1Dc4Qk8omcKQDm13RRywkKqXoQ0IMz5Nyk1y8sdmg1S78QSWnfTaEPe+OQE1olrtjInrDX3Yu20CnMzg==";
+      url = "https://registry.npmjs.org/snyk/-/snyk-1.227.0.tgz";
+      sha512 = "ejfq2FIca+b/zu4hkJwFUob1Emn+s9wXYw5VHJSS6BjiniNi6dIa24AARG3BWiVsN/3NvzCYAkcqhYGaJ6xyVw==";
     };
     dependencies = [
+      sources."@snyk/cli-interface-2.1.0"
       sources."@snyk/composer-lockfile-parser-1.0.3"
       sources."@snyk/dep-graph-1.12.0"
       sources."@snyk/gemfile-1.2.0"
       sources."@types/agent-base-4.2.0"
-      sources."@types/debug-4.1.4"
+      sources."@types/bunyan-1.8.6"
+      sources."@types/debug-4.1.5"
       sources."@types/events-3.0.0"
-      sources."@types/node-12.6.9"
+      sources."@types/node-12.7.5"
+      sources."@types/restify-4.3.6"
+      sources."@types/semver-5.5.0"
+      sources."@types/xml2js-0.4.3"
       sources."@yarnpkg/lockfile-1.1.0"
       sources."abbrev-1.1.1"
       sources."agent-base-4.3.0"
       sources."ansi-align-2.0.0"
-      sources."ansi-escapes-4.2.1"
+      sources."ansi-escapes-3.2.0"
       sources."ansi-regex-3.0.0"
       sources."ansi-styles-3.2.1"
       sources."ansicolors-0.3.2"
@@ -65837,6 +65859,7 @@ in
           sources."is-fullwidth-code-point-1.0.0"
           sources."string-width-1.0.2"
           sources."strip-ansi-3.0.1"
+          sources."wrap-ansi-2.1.0"
         ];
       })
       sources."clone-deep-0.3.0"
@@ -65850,33 +65873,42 @@ in
       sources."create-error-class-3.0.2"
       (sources."cross-spawn-6.0.5" // {
         dependencies = [
-          sources."semver-5.7.0"
+          sources."semver-5.7.1"
         ];
       })
       sources."crypto-random-string-1.0.0"
       (sources."data-uri-to-buffer-2.0.1" // {
         dependencies = [
-          sources."@types/node-8.10.51"
+          sources."@types/node-8.10.54"
         ];
       })
       sources."debug-3.2.6"
       sources."decamelize-1.2.0"
       sources."deep-extend-0.6.0"
       sources."deep-is-0.1.3"
+      sources."define-properties-1.1.3"
       sources."degenerator-1.0.4"
       sources."depd-1.1.2"
       sources."diff-4.0.1"
       sources."dockerfile-ast-0.0.16"
       sources."dot-prop-4.2.0"
+      (sources."dotnet-deps-parser-4.5.0" // {
+        dependencies = [
+          sources."xml2js-0.4.19"
+        ];
+      })
       sources."duplexer3-0.1.4"
       sources."email-validator-2.0.4"
+      sources."emoji-regex-7.0.3"
       sources."end-of-stream-1.4.1"
+      sources."es-abstract-1.14.2"
+      sources."es-to-primitive-1.2.0"
       sources."es6-promise-4.2.8"
       sources."es6-promisify-5.0.0"
       sources."escape-string-regexp-1.0.5"
-      sources."escodegen-1.11.1"
+      sources."escodegen-1.12.0"
       sources."esprima-3.1.3"
-      sources."estraverse-4.2.0"
+      sources."estraverse-4.3.0"
       sources."esutils-2.0.3"
       sources."execa-1.0.0"
       sources."extend-3.0.2"
@@ -65892,6 +65924,7 @@ in
           sources."readable-stream-1.1.14"
         ];
       })
+      sources."function-bind-1.1.1"
       sources."get-stream-4.1.0"
       (sources."get-uri-2.0.3" // {
         dependencies = [
@@ -65907,15 +65940,12 @@ in
           sources."get-stream-3.0.0"
         ];
       })
-      sources."graceful-fs-4.2.1"
+      sources."graceful-fs-4.2.2"
       sources."graphlib-2.1.7"
+      sources."has-1.0.3"
       sources."has-flag-3.0.0"
-      (sources."hosted-git-info-2.8.2" // {
-        dependencies = [
-          sources."lru-cache-5.1.1"
-          sources."yallist-3.0.3"
-        ];
-      })
+      sources."has-symbols-1.0.0"
+      sources."hosted-git-info-2.8.4"
       sources."http-errors-1.7.3"
       (sources."http-proxy-agent-2.1.0" // {
         dependencies = [
@@ -65931,15 +65961,13 @@ in
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."ini-1.3.5"
-      (sources."inquirer-6.5.0" // {
-        dependencies = [
-          sources."ansi-escapes-3.2.0"
-        ];
-      })
+      sources."inquirer-6.5.2"
       sources."invert-kv-1.0.0"
       sources."ip-1.1.5"
       sources."is-buffer-1.1.6"
+      sources."is-callable-1.1.4"
       sources."is-ci-1.2.1"
+      sources."is-date-object-1.0.1"
       sources."is-extendable-0.1.1"
       sources."is-fullwidth-code-point-2.0.0"
       sources."is-installed-globally-0.1.0"
@@ -65949,9 +65977,11 @@ in
       sources."is-plain-object-2.0.4"
       sources."is-promise-2.1.0"
       sources."is-redirect-1.0.0"
-      sources."is-retry-allowed-1.1.0"
+      sources."is-regex-1.0.4"
+      sources."is-retry-allowed-1.2.0"
       sources."is-ssh-1.3.1"
       sources."is-stream-1.1.0"
+      sources."is-symbol-1.0.2"
       sources."is-wsl-1.1.0"
       sources."isarray-0.0.1"
       sources."isexe-2.0.0"
@@ -65965,6 +65995,7 @@ in
         dependencies = [
           sources."isarray-1.0.0"
           sources."readable-stream-2.3.6"
+          sources."safe-buffer-5.1.2"
           sources."string_decoder-1.1.1"
         ];
       })
@@ -66004,6 +66035,9 @@ in
       sources."npm-run-path-2.0.2"
       sources."number-is-nan-1.0.1"
       sources."object-hash-1.3.1"
+      sources."object-inspect-1.6.0"
+      sources."object-keys-1.1.1"
+      sources."object.getownpropertydescriptors-2.0.3"
       sources."once-1.4.0"
       sources."onetime-2.0.1"
       sources."opn-5.5.0"
@@ -66016,7 +66050,7 @@ in
       sources."pac-resolver-3.0.0"
       (sources."package-json-4.0.1" // {
         dependencies = [
-          sources."semver-5.7.0"
+          sources."semver-5.7.1"
         ];
       })
       sources."pako-1.0.10"
@@ -66039,23 +66073,23 @@ in
       sources."rc-1.2.8"
       (sources."readable-stream-3.4.0" // {
         dependencies = [
-          sources."string_decoder-1.2.0"
+          sources."string_decoder-1.3.0"
         ];
       })
       sources."registry-auth-token-3.4.0"
       sources."registry-url-3.1.0"
       sources."restore-cursor-2.0.0"
-      sources."rimraf-2.6.3"
+      sources."rimraf-2.7.1"
       sources."run-async-2.3.0"
-      sources."rxjs-6.5.2"
-      sources."safe-buffer-5.1.2"
+      sources."rxjs-6.5.3"
+      sources."safe-buffer-5.2.0"
       sources."safer-buffer-2.1.2"
       sources."sax-1.2.4"
       sources."secure-keys-1.0.0"
       sources."semver-6.3.0"
       (sources."semver-diff-2.1.0" // {
         dependencies = [
-          sources."semver-5.7.0"
+          sources."semver-5.7.1"
         ];
       })
       sources."set-immediate-shim-1.0.1"
@@ -66070,7 +66104,7 @@ in
       sources."signal-exit-3.0.2"
       sources."smart-buffer-4.0.2"
       sources."snyk-config-2.2.3"
-      (sources."snyk-docker-plugin-1.25.1" // {
+      (sources."snyk-docker-plugin-1.29.1" // {
         dependencies = [
           sources."debug-4.1.1"
         ];
@@ -66081,19 +66115,19 @@ in
           sources."debug-4.1.1"
         ];
       })
-      (sources."snyk-gradle-plugin-2.12.5" // {
+      (sources."snyk-gradle-plugin-3.0.2" // {
         dependencies = [
           sources."debug-4.1.1"
         ];
       })
       sources."snyk-module-1.9.1"
-      (sources."snyk-mvn-plugin-2.3.3" // {
+      (sources."snyk-mvn-plugin-2.4.0" // {
         dependencies = [
           sources."tslib-1.9.3"
         ];
       })
       sources."snyk-nodejs-lockfile-parser-1.16.0"
-      sources."snyk-nuget-plugin-1.11.3"
+      sources."snyk-nuget-plugin-1.12.1"
       sources."snyk-paket-parser-1.5.0"
       (sources."snyk-php-plugin-1.6.4" // {
         dependencies = [
@@ -66101,14 +66135,15 @@ in
         ];
       })
       sources."snyk-policy-1.13.5"
-      sources."snyk-python-plugin-1.10.2"
+      sources."snyk-python-plugin-1.13.2"
       sources."snyk-resolve-1.0.1"
-      (sources."snyk-resolve-deps-4.0.3" // {
+      (sources."snyk-resolve-deps-4.4.0" // {
         dependencies = [
-          sources."semver-5.7.0"
+          sources."@types/node-6.14.7"
+          sources."semver-5.7.1"
         ];
       })
-      (sources."snyk-sbt-plugin-2.6.1" // {
+      (sources."snyk-sbt-plugin-2.8.0" // {
         dependencies = [
           sources."tmp-0.1.0"
         ];
@@ -66130,6 +66165,8 @@ in
           sources."strip-ansi-4.0.0"
         ];
       })
+      sources."string.prototype.trimleft-2.1.0"
+      sources."string.prototype.trimright-2.1.0"
       sources."string_decoder-0.10.31"
       (sources."strip-ansi-5.2.0" // {
         dependencies = [
@@ -66158,32 +66195,33 @@ in
       sources."tree-kill-1.2.1"
       sources."tslib-1.10.0"
       sources."type-check-0.3.2"
-      sources."type-fest-0.5.2"
       sources."unique-string-1.0.0"
       sources."unpipe-1.0.0"
       sources."unzip-response-2.0.1"
       sources."update-notifier-2.5.0"
       sources."url-parse-lax-1.0.0"
       sources."util-deprecate-1.0.2"
-      sources."uuid-3.3.2"
+      sources."util.promisify-1.0.0"
+      sources."uuid-3.3.3"
       sources."vscode-languageserver-types-3.14.0"
       sources."which-1.3.1"
       sources."widest-line-2.0.1"
       sources."window-size-0.1.4"
       sources."windows-release-3.2.0"
       sources."wordwrap-1.0.0"
-      (sources."wrap-ansi-2.1.0" // {
+      (sources."wrap-ansi-5.1.0" // {
         dependencies = [
-          sources."ansi-regex-2.1.1"
-          sources."is-fullwidth-code-point-1.0.0"
-          sources."string-width-1.0.2"
-          sources."strip-ansi-3.0.1"
+          sources."string-width-3.1.0"
         ];
       })
       sources."wrappy-1.0.2"
       sources."write-file-atomic-2.4.3"
       sources."xdg-basedir-3.0.0"
-      sources."xml2js-0.4.19"
+      (sources."xml2js-0.4.22" // {
+        dependencies = [
+          sources."xmlbuilder-11.0.1"
+        ];
+      })
       sources."xmlbuilder-9.0.7"
       sources."xregexp-2.0.0"
       sources."y18n-3.2.1"
@@ -66205,6 +66243,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   "socket.io" = nodeEnv.buildNodePackage {
     name = "socket.io";
@@ -66280,6 +66319,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   speed-test = nodeEnv.buildNodePackage {
     name = "speed-test";
@@ -66311,12 +66351,7 @@ in
       sources."color-name-1.1.3"
       sources."configstore-3.1.2"
       sources."create-error-class-3.0.2"
-      (sources."cross-spawn-5.1.0" // {
-        dependencies = [
-          sources."lru-cache-4.1.5"
-          sources."yallist-2.1.2"
-        ];
-      })
+      sources."cross-spawn-5.1.0"
       sources."crypto-random-string-1.0.0"
       sources."currently-unhandled-0.4.1"
       sources."debug-3.1.0"
@@ -66328,21 +66363,27 @@ in
       })
       sources."deep-extend-0.6.0"
       sources."defaults-1.0.3"
+      sources."define-properties-1.1.3"
       sources."dot-prop-4.2.0"
       sources."draftlog-1.0.12"
       sources."duplexer3-0.1.4"
       sources."error-ex-1.3.2"
+      sources."es-abstract-1.14.2"
+      sources."es-to-primitive-1.2.0"
       sources."es6-promise-4.2.8"
       sources."es6-promisify-5.0.0"
       sources."escape-string-regexp-1.0.5"
       sources."execa-0.7.0"
       sources."find-up-2.1.0"
+      sources."function-bind-1.1.1"
       sources."get-stream-3.0.0"
       sources."global-dirs-0.1.1"
       sources."got-6.7.1"
-      sources."graceful-fs-4.2.1"
+      sources."graceful-fs-4.2.2"
+      sources."has-1.0.3"
       sources."has-flag-3.0.0"
-      sources."hosted-git-info-2.8.2"
+      sources."has-symbols-1.0.0"
+      sources."hosted-git-info-2.8.4"
       sources."http-proxy-agent-2.1.0"
       sources."https-proxy-agent-2.2.2"
       sources."import-lazy-2.1.0"
@@ -66350,7 +66391,9 @@ in
       sources."indent-string-3.2.0"
       sources."ini-1.3.5"
       sources."is-arrayish-0.2.1"
+      sources."is-callable-1.1.4"
       sources."is-ci-1.2.1"
+      sources."is-date-object-1.0.1"
       sources."is-fullwidth-code-point-2.0.0"
       sources."is-installed-globally-0.1.0"
       sources."is-npm-1.0.0"
@@ -66358,8 +66401,10 @@ in
       sources."is-path-inside-1.0.1"
       sources."is-plain-obj-1.1.0"
       sources."is-redirect-1.0.0"
-      sources."is-retry-allowed-1.1.0"
+      sources."is-regex-1.0.4"
+      sources."is-retry-allowed-1.2.0"
       sources."is-stream-1.1.0"
+      sources."is-symbol-1.0.2"
       sources."isexe-2.0.0"
       sources."json-parse-better-errors-1.0.2"
       sources."latest-version-3.1.0"
@@ -66369,7 +66414,7 @@ in
       sources."log-update-2.3.0"
       sources."loud-rejection-1.6.0"
       sources."lowercase-keys-1.0.1"
-      sources."lru-cache-5.1.1"
+      sources."lru-cache-4.1.5"
       sources."make-dir-1.3.0"
       sources."map-obj-2.0.0"
       sources."meow-5.0.0"
@@ -66379,6 +66424,9 @@ in
       sources."ms-2.0.0"
       sources."normalize-package-data-2.5.0"
       sources."npm-run-path-2.0.2"
+      sources."object-inspect-1.6.0"
+      sources."object-keys-1.1.1"
+      sources."object.getownpropertydescriptors-2.0.3"
       sources."onetime-2.0.1"
       (sources."ora-3.4.0" // {
         dependencies = [
@@ -66412,7 +66460,7 @@ in
       sources."round-to-3.0.0"
       sources."safe-buffer-5.2.0"
       sources."sax-1.2.4"
-      sources."semver-5.7.0"
+      sources."semver-5.7.1"
       sources."semver-diff-2.1.0"
       sources."shebang-command-1.2.0"
       sources."shebang-regex-1.0.0"
@@ -66423,6 +66471,8 @@ in
       sources."spdx-license-ids-3.0.5"
       sources."speedtest-net-1.5.1"
       sources."string-width-2.1.1"
+      sources."string.prototype.trimleft-2.1.0"
+      sources."string.prototype.trimright-2.1.0"
       sources."strip-ansi-4.0.0"
       sources."strip-bom-3.0.0"
       sources."strip-eof-1.0.0"
@@ -66436,6 +66486,7 @@ in
       sources."unzip-response-2.0.1"
       sources."update-notifier-2.5.0"
       sources."url-parse-lax-1.0.0"
+      sources."util.promisify-1.0.0"
       sources."validate-npm-package-license-3.0.4"
       sources."wcwidth-1.0.1"
       sources."which-1.3.1"
@@ -66443,9 +66494,9 @@ in
       sources."wrap-ansi-3.0.1"
       sources."write-file-atomic-2.4.3"
       sources."xdg-basedir-3.0.0"
-      sources."xml2js-0.4.19"
-      sources."xmlbuilder-9.0.7"
-      sources."yallist-3.0.3"
+      sources."xml2js-0.4.22"
+      sources."xmlbuilder-11.0.1"
+      sources."yallist-2.1.2"
       sources."yargs-parser-10.1.0"
     ];
     buildInputs = globalBuildInputs;
@@ -66456,14 +66507,15 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   ssb-server = nodeEnv.buildNodePackage {
     name = "ssb-server";
     packageName = "ssb-server";
-    version = "15.1.0";
+    version = "15.1.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/ssb-server/-/ssb-server-15.1.0.tgz";
-      sha512 = "4qn3Q+xpKL6BKBTgO1dHSt5ljyrZkWVoHYaZzCYbs75rGbaGvc0evSyu2TpaYwiiSxrVxJGYr8s4MyXzdPqUVQ==";
+      url = "https://registry.npmjs.org/ssb-server/-/ssb-server-15.1.1.tgz";
+      sha512 = "MaQl721UDrU/YM1U2bu6bdLqSg8qPYjkGg/6TevWoohqSLLOfo3CXyE8OARCqX37y9fhKOKXAhhmqj8nPgQ2yw==";
     };
     dependencies = [
       sources."abstract-leveldown-6.0.3"
@@ -66576,9 +66628,13 @@ in
       sources."cross-spawn-6.0.5"
       sources."debug-4.1.1"
       sources."decode-uri-component-0.2.0"
-      sources."deep-equal-1.0.1"
+      sources."deep-equal-1.1.0"
       sources."deep-extend-0.6.0"
-      sources."deferred-leveldown-5.1.0"
+      (sources."deferred-leveldown-5.2.0" // {
+        dependencies = [
+          sources."abstract-leveldown-6.1.1"
+        ];
+      })
       sources."define-properties-1.1.3"
       (sources."define-property-2.0.2" // {
         dependencies = [
@@ -66593,10 +66649,14 @@ in
       sources."elegant-spinner-1.0.1"
       sources."emoji-named-characters-1.0.2"
       sources."emoji-server-1.0.0"
-      sources."encoding-down-6.1.0"
+      (sources."encoding-down-6.2.0" // {
+        dependencies = [
+          sources."abstract-leveldown-6.1.1"
+        ];
+      })
       sources."epidemic-broadcast-trees-7.0.0"
       sources."errno-0.1.7"
-      sources."es-abstract-1.13.0"
+      sources."es-abstract-1.14.2"
       sources."es-to-primitive-1.2.0"
       sources."escape-string-regexp-1.0.5"
       sources."exit-hook-1.1.1"
@@ -66650,7 +66710,7 @@ in
       sources."glob-parent-2.0.0"
       sources."globby-4.1.0"
       sources."gossip-query-2.0.2"
-      sources."graceful-fs-4.2.1"
+      sources."graceful-fs-4.2.2"
       sources."has-1.0.3"
       sources."has-ansi-2.0.0"
       sources."has-network-0.0.1"
@@ -66690,6 +66750,7 @@ in
       })
       sources."is-alphabetical-1.0.3"
       sources."is-alphanumerical-1.0.3"
+      sources."is-arguments-1.0.4"
       sources."is-binary-path-1.0.1"
       sources."is-buffer-1.1.6"
       sources."is-callable-1.1.4"
@@ -66743,7 +66804,7 @@ in
         ];
       })
       sources."level-js-4.0.1"
-      sources."level-packager-5.0.2"
+      sources."level-packager-5.0.3"
       sources."level-post-1.0.7"
       (sources."level-sublevel-6.6.5" // {
         dependencies = [
@@ -66766,8 +66827,12 @@ in
           sources."string_decoder-0.10.31"
         ];
       })
-      sources."leveldown-5.1.1"
-      sources."levelup-4.1.0"
+      (sources."leveldown-5.2.0" // {
+        dependencies = [
+          sources."abstract-leveldown-6.1.1"
+        ];
+      })
+      sources."levelup-4.2.0"
       sources."libnested-1.4.1"
       sources."libsodium-0.7.5"
       sources."libsodium-wrappers-0.7.5"
@@ -66824,11 +66889,11 @@ in
           sources."kind-of-6.0.2"
         ];
       })
-      sources."napi-macros-1.8.2"
+      sources."napi-macros-2.0.0"
       sources."ncp-2.0.0"
-      sources."nearley-2.18.0"
+      sources."nearley-2.19.0"
       sources."nice-try-1.0.5"
-      sources."node-gyp-build-4.1.0"
+      sources."node-gyp-build-4.1.1"
       sources."non-private-ip-1.4.4"
       sources."normalize-path-2.1.1"
       sources."normalize-uri-1.1.2"
@@ -66848,6 +66913,7 @@ in
         ];
       })
       sources."object-inspect-1.6.0"
+      sources."object-is-1.0.1"
       sources."object-keys-1.1.1"
       (sources."object-visit-1.0.1" // {
         dependencies = [
@@ -66927,7 +66993,7 @@ in
       sources."pull-reader-1.3.1"
       sources."pull-sink-through-0.0.0"
       sources."pull-sort-1.0.2"
-      sources."pull-stream-3.6.13"
+      sources."pull-stream-3.6.14"
       (sources."pull-through-1.0.18" // {
         dependencies = [
           sources."looper-3.0.0"
@@ -67011,6 +67077,7 @@ in
       })
       sources."regex-cache-0.4.4"
       sources."regex-not-1.0.2"
+      sources."regexp.prototype.flags-1.2.0"
       sources."relative-url-1.0.2"
       (sources."remark-3.2.3" // {
         dependencies = [
@@ -67028,7 +67095,7 @@ in
       sources."resumer-0.0.0"
       sources."ret-0.1.15"
       sources."right-pad-1.0.1"
-      (sources."rimraf-2.6.3" // {
+      (sources."rimraf-2.7.1" // {
         dependencies = [
           sources."glob-7.1.4"
         ];
@@ -67039,7 +67106,7 @@ in
       sources."safe-regex-1.1.0"
       sources."secret-handshake-1.1.20"
       sources."secret-stack-6.3.0"
-      sources."semver-5.7.0"
+      sources."semver-5.7.1"
       sources."separator-escape-0.0.0"
       (sources."set-value-2.0.1" // {
         dependencies = [
@@ -67087,7 +67154,7 @@ in
         ];
       })
       sources."sodium-chloride-1.1.2"
-      sources."sodium-native-2.4.5"
+      sources."sodium-native-2.4.6"
       sources."source-map-0.5.7"
       sources."source-map-resolve-0.5.2"
       sources."source-map-url-0.4.0"
@@ -67154,6 +67221,8 @@ in
       })
       sources."string-width-1.0.2"
       sources."string.prototype.trim-1.1.2"
+      sources."string.prototype.trimleft-2.1.0"
+      sources."string.prototype.trimright-2.1.0"
       sources."string_decoder-1.1.1"
       sources."stringify-entities-1.3.2"
       sources."strip-ansi-3.0.1"
@@ -67161,6 +67230,7 @@ in
       sources."supports-color-2.0.0"
       (sources."tape-4.11.0" // {
         dependencies = [
+          sources."deep-equal-1.0.1"
           sources."glob-7.1.4"
         ];
       })
@@ -67233,6 +67303,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   stackdriver-statsd-backend = nodeEnv.buildNodePackage {
     name = "stackdriver-statsd-backend";
@@ -67250,6 +67321,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   stf = nodeEnv.buildNodePackage {
     name = "stf";
@@ -67260,7 +67332,7 @@ in
       sha512 = "ddyn6GoWoboSze2SSRMKjDGu4i0z1xaQ0KN5BiQInAyeuIXGiZygZBxeJsO02GrQJ88rCb5i9JSR+qMwyBz6Bw==";
     };
     dependencies = [
-      sources."@sailshq/lodash-3.10.3"
+      sources."@sailshq/lodash-3.10.4"
       (sources."@slack/client-3.16.0" // {
         dependencies = [
           sources."bluebird-3.5.5"
@@ -67319,7 +67391,11 @@ in
       sources."async-1.5.2"
       sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
-      sources."aws-sdk-2.504.0"
+      (sources."aws-sdk-2.529.0" // {
+        dependencies = [
+          sources."uuid-3.3.2"
+        ];
+      })
       sources."aws-sign2-0.6.0"
       sources."aws4-1.8.0"
       sources."babel-runtime-6.26.0"
@@ -67428,7 +67504,7 @@ in
       sources."dicer-0.2.5"
       sources."doctypes-1.1.0"
       sources."drange-1.1.1"
-      (sources."dtrace-provider-0.8.7" // {
+      (sources."dtrace-provider-0.8.8" // {
         dependencies = [
           sources."nan-2.14.0"
         ];
@@ -67487,7 +67563,7 @@ in
       sources."fd-slicer-1.1.0"
       sources."finalhandler-1.1.2"
       sources."find-up-3.0.0"
-      (sources."follow-redirects-1.7.0" // {
+      (sources."follow-redirects-1.9.0" // {
         dependencies = [
           sources."debug-3.2.6"
           sources."ms-2.1.2"
@@ -67515,7 +67591,7 @@ in
           sources."ms-2.1.2"
         ];
       })
-      sources."graceful-fs-4.2.1"
+      sources."graceful-fs-4.2.2"
       sources."graphlib-2.1.7"
       sources."har-schema-2.0.0"
       sources."har-validator-2.0.6"
@@ -67535,12 +67611,7 @@ in
         ];
       })
       sources."hoek-2.16.3"
-      (sources."hosted-git-info-2.8.2" // {
-        dependencies = [
-          sources."lru-cache-5.1.1"
-          sources."yallist-3.0.3"
-        ];
-      })
+      sources."hosted-git-info-2.8.4"
       (sources."http-errors-1.7.2" // {
         dependencies = [
           sources."inherits-2.0.3"
@@ -67711,7 +67782,7 @@ in
       sources."p-defer-1.0.0"
       sources."p-finally-1.0.0"
       sources."p-is-promise-2.1.0"
-      sources."p-limit-2.2.0"
+      sources."p-limit-2.2.1"
       sources."p-locate-3.0.0"
       sources."p-try-2.2.0"
       sources."parse-json-2.2.0"
@@ -67753,7 +67824,7 @@ in
         ];
       })
       sources."pseudomap-1.0.2"
-      sources."psl-1.3.0"
+      sources."psl-1.4.0"
       sources."pug-2.0.4"
       sources."pug-attrs-2.0.4"
       sources."pug-code-gen-2.0.2"
@@ -67823,7 +67894,7 @@ in
       sources."safe-json-stringify-1.2.0"
       sources."safer-buffer-2.1.2"
       sources."sax-1.2.1"
-      sources."semver-5.7.0"
+      sources."semver-5.7.1"
       (sources."send-0.17.1" // {
         dependencies = [
           sources."ms-2.1.1"
@@ -67901,9 +67972,9 @@ in
       (sources."superagent-3.8.3" // {
         dependencies = [
           sources."debug-3.2.6"
-          sources."form-data-2.5.0"
+          sources."form-data-2.5.1"
           sources."ms-2.1.2"
-          sources."qs-6.7.0"
+          sources."qs-6.8.0"
           sources."readable-stream-2.3.6"
           sources."string_decoder-1.1.1"
         ];
@@ -67916,7 +67987,7 @@ in
           sources."esprima-4.0.1"
           sources."js-yaml-3.13.1"
           sources."lodash-3.10.1"
-          sources."qs-6.7.0"
+          sources."qs-6.8.0"
         ];
       })
       sources."swagger-schema-official-2.0.0-bab6bed"
@@ -67979,7 +68050,7 @@ in
       sources."utf-8-validate-1.2.2"
       sources."util-deprecate-1.0.2"
       sources."utils-merge-1.0.1"
-      sources."uuid-3.3.2"
+      sources."uuid-3.3.3"
       sources."validate-npm-package-license-3.0.4"
       sources."validator-5.7.0"
       sources."vary-1.1.2"
@@ -68075,6 +68146,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   svgo = nodeEnv.buildNodePackage {
     name = "svgo";
@@ -68112,7 +68184,7 @@ in
       sources."domelementtype-1.3.1"
       sources."domutils-1.7.0"
       sources."entities-2.0.0"
-      sources."es-abstract-1.13.0"
+      sources."es-abstract-1.14.2"
       sources."es-to-primitive-1.2.0"
       sources."escape-string-regexp-1.0.5"
       sources."esprima-4.0.1"
@@ -68129,6 +68201,7 @@ in
       sources."minimist-0.0.8"
       sources."mkdirp-0.5.1"
       sources."nth-check-1.0.2"
+      sources."object-inspect-1.6.0"
       sources."object-keys-1.1.1"
       sources."object.getownpropertydescriptors-2.0.3"
       sources."object.values-1.1.0"
@@ -68137,6 +68210,8 @@ in
       sources."source-map-0.5.7"
       sources."sprintf-js-1.0.3"
       sources."stable-0.1.8"
+      sources."string.prototype.trimleft-2.1.0"
+      sources."string.prototype.trimright-2.1.0"
       sources."supports-color-5.5.0"
       sources."unquote-1.1.1"
       sources."util.promisify-1.0.0"
@@ -68149,6 +68224,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   swagger = nodeEnv.buildNodePackage {
     name = "swagger";
@@ -68226,7 +68302,7 @@ in
       sources."capture-stack-trace-1.0.1"
       sources."chalk-1.1.3"
       sources."charenc-0.0.2"
-      sources."chokidar-2.1.6"
+      sources."chokidar-2.1.8"
       sources."ci-info-1.6.0"
       (sources."class-utils-0.3.6" // {
         dependencies = [
@@ -68336,7 +68412,7 @@ in
       })
       sources."finalhandler-1.1.2"
       sources."for-in-1.0.2"
-      sources."form-data-2.5.0"
+      sources."form-data-2.5.1"
       sources."formidable-1.2.1"
       sources."fragment-cache-0.2.1"
       sources."fresh-0.5.2"
@@ -68353,14 +68429,14 @@ in
       })
       sources."global-dirs-0.1.1"
       sources."got-6.7.1"
-      sources."graceful-fs-4.2.1"
+      sources."graceful-fs-4.2.2"
       (sources."graphlib-2.1.7" // {
         dependencies = [
           sources."lodash-4.17.15"
         ];
       })
       sources."growl-1.9.2"
-      (sources."handlebars-4.1.2" // {
+      (sources."handlebars-4.2.0" // {
         dependencies = [
           sources."source-map-0.6.1"
         ];
@@ -68409,7 +68485,7 @@ in
       sources."is-path-inside-1.0.1"
       sources."is-plain-object-2.0.4"
       sources."is-redirect-1.0.0"
-      sources."is-retry-allowed-1.1.0"
+      sources."is-retry-allowed-1.2.0"
       sources."is-stream-1.1.0"
       sources."is-valid-path-0.1.1"
       sources."is-windows-1.0.2"
@@ -68500,7 +68576,7 @@ in
       sources."nanomatch-1.2.13"
       sources."native-promise-only-0.8.1"
       sources."neo-async-2.6.1"
-      (sources."nodemon-1.19.1" // {
+      (sources."nodemon-1.19.2" // {
         dependencies = [
           sources."debug-3.2.6"
           sources."ms-2.1.2"
@@ -68543,7 +68619,7 @@ in
         dependencies = [
           sources."debug-3.2.6"
           sources."ms-2.1.2"
-          sources."qs-6.7.0"
+          sources."qs-6.8.0"
           sources."superagent-3.8.3"
         ];
       })
@@ -68584,13 +68660,13 @@ in
       sources."resolve-url-0.2.1"
       sources."restore-cursor-1.0.1"
       sources."ret-0.1.15"
-      sources."rimraf-2.6.3"
+      sources."rimraf-2.7.1"
       sources."run-async-0.1.0"
       sources."rx-lite-3.1.2"
       sources."safe-buffer-5.1.2"
       sources."safe-regex-1.1.0"
-      sources."sanitize-filename-1.6.2"
-      sources."semver-5.7.0"
+      sources."sanitize-filename-1.6.3"
+      sources."semver-5.7.1"
       sources."semver-diff-2.1.0"
       (sources."send-0.17.1" // {
         dependencies = [
@@ -68740,7 +68816,7 @@ in
         ];
       })
       sources."unzip-response-2.0.1"
-      sources."upath-1.1.2"
+      sources."upath-1.2.0"
       (sources."update-notifier-2.5.0" // {
         dependencies = [
           sources."ansi-styles-3.2.1"
@@ -68775,6 +68851,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   "tedicross-git+https://github.com/TediCross/TediCross.git#v0.8.7" = nodeEnv.buildNodePackage {
     name = "tedicross";
@@ -68786,7 +68863,7 @@ in
       sha256 = "886069ecc5eedf0371b948e8ff66e7f2943c85fe7cfdaa7183e1a3572d55852b";
     };
     dependencies = [
-      sources."@types/node-12.6.9"
+      sources."@types/node-12.7.5"
       sources."ajv-6.10.2"
       sources."ansi-regex-4.1.0"
       sources."ansi-styles-3.2.1"
@@ -68847,13 +68924,13 @@ in
       sources."ms-2.1.2"
       sources."node-fetch-2.6.0"
       sources."oauth-sign-0.9.0"
-      sources."p-limit-2.2.0"
+      sources."p-limit-2.2.1"
       sources."p-locate-3.0.0"
       sources."p-try-2.2.0"
       sources."path-exists-3.0.0"
       sources."performance-now-2.1.0"
       sources."prism-media-0.0.3"
-      sources."psl-1.3.0"
+      sources."psl-1.4.0"
       sources."punycode-2.1.1"
       sources."qs-6.5.2"
       sources."ramda-0.25.0"
@@ -68884,7 +68961,7 @@ in
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-1.0.1"
       sources."uri-js-4.2.2"
-      sources."uuid-3.3.2"
+      sources."uuid-3.3.3"
       sources."verror-1.10.0"
       sources."which-module-2.0.0"
       sources."wrap-ansi-5.1.0"
@@ -68900,6 +68977,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   tern = nodeEnv.buildNodePackage {
     name = "tern";
@@ -68910,7 +68988,7 @@ in
       sha512 = "6jK0DcgziZ0NAitZNncg+do/fKGh8hQJShcVU7dHoAljdckr7qr2oozd4l4kTIA7M+0FoKXy6gvRBLO8oWpTEw==";
     };
     dependencies = [
-      sources."acorn-6.2.1"
+      sources."acorn-6.3.0"
       sources."acorn-loose-6.1.0"
       sources."acorn-walk-6.2.0"
       sources."balanced-match-1.0.0"
@@ -68921,7 +68999,7 @@ in
       sources."errno-0.1.7"
       sources."fs.realpath-1.0.0"
       sources."glob-7.1.4"
-      sources."graceful-fs-4.2.1"
+      sources."graceful-fs-4.2.2"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."isarray-1.0.0"
@@ -68948,6 +69026,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   textlint = nodeEnv.buildNodePackage {
     name = "textlint";
@@ -68998,12 +69077,12 @@ in
       sources."core-util-is-1.0.2"
       sources."crypt-0.0.2"
       sources."debug-4.1.1"
-      sources."deep-equal-1.0.1"
+      sources."deep-equal-1.1.0"
       sources."deep-is-0.1.3"
       sources."define-properties-1.1.3"
       sources."diff-4.0.1"
       sources."error-ex-1.3.2"
-      sources."es-abstract-1.13.0"
+      sources."es-abstract-1.14.2"
       sources."es-to-primitive-1.2.0"
       sources."escape-string-regexp-1.0.5"
       sources."esprima-4.0.1"
@@ -69019,15 +69098,16 @@ in
       sources."function-bind-1.1.1"
       sources."get-stdin-5.0.1"
       sources."glob-7.1.4"
-      sources."graceful-fs-4.2.1"
+      sources."graceful-fs-4.2.2"
       sources."has-1.0.3"
       sources."has-ansi-2.0.0"
       sources."has-symbols-1.0.0"
-      sources."hosted-git-info-2.8.2"
+      sources."hosted-git-info-2.8.4"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."is-alphabetical-1.0.3"
       sources."is-alphanumerical-1.0.3"
+      sources."is-arguments-1.0.4"
       sources."is-arrayish-0.2.1"
       sources."is-buffer-1.1.6"
       sources."is-callable-1.1.4"
@@ -69057,7 +69137,6 @@ in
       sources."locate-path-2.0.0"
       sources."lodash-4.17.15"
       sources."log-symbols-1.0.2"
-      sources."lru-cache-5.1.1"
       sources."map-like-2.0.0"
       sources."markdown-escapes-1.0.3"
       sources."md5-2.2.1"
@@ -69068,6 +69147,8 @@ in
       sources."normalize-package-data-2.5.0"
       sources."number-is-nan-1.0.1"
       sources."object-assign-4.1.1"
+      sources."object-inspect-1.6.0"
+      sources."object-is-1.0.1"
       sources."object-keys-1.1.1"
       sources."once-1.4.0"
       sources."optionator-0.8.2"
@@ -69100,6 +69181,7 @@ in
         ];
       })
       sources."readable-stream-2.3.6"
+      sources."regexp.prototype.flags-1.2.0"
       sources."remark-frontmatter-1.3.2"
       sources."remark-parse-5.0.0"
       sources."repeat-string-1.6.1"
@@ -69108,7 +69190,7 @@ in
       sources."resolve-1.12.0"
       sources."rimraf-2.6.3"
       sources."safe-buffer-5.1.2"
-      sources."semver-5.7.0"
+      sources."semver-5.7.1"
       sources."slice-ansi-0.0.4"
       sources."spdx-correct-3.1.0"
       sources."spdx-exceptions-2.2.0"
@@ -69118,6 +69200,8 @@ in
       sources."state-toggle-1.0.2"
       sources."string-width-1.0.2"
       sources."string.prototype.padstart-3.0.0"
+      sources."string.prototype.trimleft-2.1.0"
+      sources."string.prototype.trimright-2.1.0"
       sources."string_decoder-1.1.1"
       sources."strip-ansi-3.0.1"
       sources."strip-bom-2.0.0"
@@ -69158,7 +69242,6 @@ in
       sources."x-is-string-0.1.0"
       sources."xml-escape-1.1.0"
       sources."xtend-4.0.2"
-      sources."yallist-3.0.3"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -69168,6 +69251,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   textlint-plugin-latex = nodeEnv.buildNodePackage {
     name = "textlint-plugin-latex";
@@ -69189,6 +69273,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   textlint-rule-abbr-within-parentheses = nodeEnv.buildNodePackage {
     name = "textlint-rule-abbr-within-parentheses";
@@ -69212,6 +69297,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   textlint-rule-alex = nodeEnv.buildNodePackage {
     name = "textlint-rule-alex";
@@ -69266,12 +69352,7 @@ in
       sources."configstore-3.1.2"
       sources."core-util-is-1.0.2"
       sources."create-error-class-3.0.2"
-      (sources."cross-spawn-5.1.0" // {
-        dependencies = [
-          sources."lru-cache-4.1.5"
-          sources."yallist-2.1.2"
-        ];
-      })
+      sources."cross-spawn-5.1.0"
       sources."crypto-random-string-1.0.0"
       sources."currently-unhandled-0.4.1"
       sources."cuss-1.16.0"
@@ -69301,9 +69382,9 @@ in
       sources."glob-7.1.4"
       sources."global-dirs-0.1.1"
       sources."got-6.7.1"
-      sources."graceful-fs-4.2.1"
+      sources."graceful-fs-4.2.2"
       sources."has-flag-3.0.0"
-      sources."hosted-git-info-2.8.2"
+      sources."hosted-git-info-2.8.4"
       sources."ignore-3.3.10"
       sources."import-lazy-2.1.0"
       sources."imurmurhash-0.1.4"
@@ -69329,7 +69410,7 @@ in
       sources."is-path-inside-1.0.1"
       sources."is-plain-obj-1.1.0"
       sources."is-redirect-1.0.0"
-      sources."is-retry-allowed-1.1.0"
+      sources."is-retry-allowed-1.2.0"
       sources."is-stream-1.1.0"
       sources."is-utf8-0.2.1"
       sources."is-whitespace-character-1.0.3"
@@ -69345,7 +69426,7 @@ in
       sources."lodash.intersection-4.4.0"
       sources."loud-rejection-1.6.0"
       sources."lowercase-keys-1.0.1"
-      sources."lru-cache-5.1.1"
+      sources."lru-cache-4.1.5"
       (sources."make-dir-1.3.0" // {
         dependencies = [
           sources."pify-3.0.0"
@@ -69415,7 +69496,7 @@ in
       sources."retext-equality-3.2.0"
       sources."retext-profanities-4.4.0"
       sources."safe-buffer-5.1.2"
-      sources."semver-5.7.0"
+      sources."semver-5.7.1"
       sources."semver-diff-2.1.0"
       sources."shebang-command-1.2.0"
       sources."shebang-regex-1.0.0"
@@ -69519,7 +69600,7 @@ in
       sources."x-is-string-0.1.0"
       sources."xdg-basedir-3.0.0"
       sources."xtend-4.0.2"
-      sources."yallist-3.0.3"
+      sources."yallist-2.1.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -69529,6 +69610,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   textlint-rule-common-misspellings = nodeEnv.buildNodePackage {
     name = "textlint-rule-common-misspellings";
@@ -69553,6 +69635,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   textlint-rule-diacritics = nodeEnv.buildNodePackage {
     name = "textlint-rule-diacritics";
@@ -69574,6 +69657,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   textlint-rule-en-max-word-count = nodeEnv.buildNodePackage {
     name = "textlint-rule-en-max-word-count";
@@ -69610,6 +69694,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   textlint-rule-max-comma = nodeEnv.buildNodePackage {
     name = "textlint-rule-max-comma";
@@ -69646,6 +69731,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   textlint-rule-no-start-duplicated-conjunction = nodeEnv.buildNodePackage {
     name = "textlint-rule-no-start-duplicated-conjunction";
@@ -69663,7 +69749,7 @@ in
       sources."concat-stream-1.6.2"
       sources."core-util-is-1.0.2"
       sources."define-properties-1.1.3"
-      sources."es-abstract-1.13.0"
+      sources."es-abstract-1.14.2"
       sources."es-to-primitive-1.2.0"
       sources."function-bind-1.1.1"
       sources."has-1.0.3"
@@ -69675,12 +69761,15 @@ in
       sources."is-symbol-1.0.2"
       sources."isarray-1.0.0"
       sources."object-assign-4.1.1"
+      sources."object-inspect-1.6.0"
       sources."object-keys-1.1.1"
       sources."object.values-1.1.0"
       sources."process-nextick-args-2.0.1"
       sources."readable-stream-2.3.6"
       sources."safe-buffer-5.1.2"
       sources."sentence-splitter-3.0.11"
+      sources."string.prototype.trimleft-2.1.0"
+      sources."string.prototype.trimright-2.1.0"
       sources."string_decoder-1.1.1"
       sources."structured-source-3.0.2"
       sources."textlint-rule-helper-2.1.1"
@@ -69698,6 +69787,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   textlint-rule-period-in-list-item = nodeEnv.buildNodePackage {
     name = "textlint-rule-period-in-list-item";
@@ -69713,7 +69803,7 @@ in
       sources."define-properties-1.1.3"
       sources."emoji-regex-6.5.1"
       sources."end-with-1.0.2"
-      sources."es-abstract-1.13.0"
+      sources."es-abstract-1.14.2"
       sources."es-to-primitive-1.2.0"
       sources."function-bind-1.1.1"
       sources."has-1.0.3"
@@ -69722,7 +69812,10 @@ in
       sources."is-date-object-1.0.1"
       sources."is-regex-1.0.4"
       sources."is-symbol-1.0.2"
+      sources."object-inspect-1.6.0"
       sources."object-keys-1.1.1"
+      sources."string.prototype.trimleft-2.1.0"
+      sources."string.prototype.trimright-2.1.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -69732,6 +69825,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   textlint-rule-stop-words = nodeEnv.buildNodePackage {
     name = "textlint-rule-stop-words";
@@ -69761,6 +69855,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   textlint-rule-terminology = nodeEnv.buildNodePackage {
     name = "textlint-rule-terminology";
@@ -69790,6 +69885,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   textlint-rule-unexpanded-acronym = nodeEnv.buildNodePackage {
     name = "textlint-rule-unexpanded-acronym";
@@ -69802,7 +69898,7 @@ in
     dependencies = [
       sources."array-includes-3.0.3"
       sources."define-properties-1.1.3"
-      sources."es-abstract-1.13.0"
+      sources."es-abstract-1.14.2"
       sources."es-to-primitive-1.2.0"
       sources."function-bind-1.1.1"
       sources."has-1.0.3"
@@ -69812,7 +69908,10 @@ in
       sources."is-date-object-1.0.1"
       sources."is-regex-1.0.4"
       sources."is-symbol-1.0.2"
+      sources."object-inspect-1.6.0"
       sources."object-keys-1.1.1"
+      sources."string.prototype.trimleft-2.1.0"
+      sources."string.prototype.trimright-2.1.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -69822,6 +69921,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   textlint-rule-write-good = nodeEnv.buildNodePackage {
     name = "textlint-rule-write-good";
@@ -69861,14 +69961,15 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   thelounge = nodeEnv.buildNodePackage {
     name = "thelounge";
     packageName = "thelounge";
-    version = "3.1.1";
+    version = "3.2.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/thelounge/-/thelounge-3.1.1.tgz";
-      sha512 = "TaYiWjvP5wjKAob3qMr8Ks+C8LfTxIohrhZ8b4DuilHlZCpIeEgADXs2K8u+ZVSMJ6GHOQKvpCogSE30sTL36A==";
+      url = "https://registry.npmjs.org/thelounge/-/thelounge-3.2.0.tgz";
+      sha512 = "yOS19bt2O0l6DGAiJRad6DFMmDHmDVylfInLthNl9YfMfgSoC7aZcT7fofTe9htAE4SRfac9YsgKEtmywQ+MkA==";
     };
     dependencies = [
       sources."@sindresorhus/is-0.14.0"
@@ -69886,6 +69987,7 @@ in
         dependencies = [
           sources."isarray-1.0.0"
           sources."readable-stream-2.3.6"
+          sources."safe-buffer-5.1.2"
           sources."string_decoder-1.1.1"
         ];
       })
@@ -69930,17 +70032,21 @@ in
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
       sources."combined-stream-1.0.8"
-      sources."commander-2.20.0"
+      sources."commander-3.0.0"
       sources."component-bind-1.0.0"
       sources."component-emitter-1.2.1"
       sources."component-inherit-0.0.3"
       sources."concat-map-0.0.1"
       sources."console-control-strings-1.1.0"
-      sources."content-disposition-0.5.3"
+      (sources."content-disposition-0.5.3" // {
+        dependencies = [
+          sources."safe-buffer-5.1.2"
+        ];
+      })
       sources."content-type-1.0.4"
       sources."cookie-0.4.0"
       sources."cookie-signature-1.0.6"
-      sources."core-js-3.1.4"
+      sources."core-js-3.2.1"
       sources."core-util-is-1.0.2"
       sources."css-select-1.2.0"
       sources."css-what-2.1.3"
@@ -69984,13 +70090,17 @@ in
       sources."escape-string-regexp-1.0.5"
       sources."etag-1.8.1"
       sources."eventemitter3-2.0.3"
-      sources."express-4.17.1"
+      (sources."express-4.17.1" // {
+        dependencies = [
+          sources."safe-buffer-5.1.2"
+        ];
+      })
       sources."extend-3.0.2"
       sources."extsprintf-1.2.0"
       sources."fast-deep-equal-2.0.1"
       sources."fast-json-stable-stringify-2.0.0"
       sources."fast-text-encoding-1.0.0"
-      sources."file-type-12.0.1"
+      sources."file-type-12.1.0"
       sources."filename-reserved-regex-2.0.0"
       sources."filenamify-4.1.0"
       sources."finalhandler-1.1.2"
@@ -69999,14 +70109,14 @@ in
       sources."forwarded-0.1.2"
       sources."fresh-0.5.2"
       sources."fs-extra-8.1.0"
-      sources."fs-minipass-1.2.6"
+      sources."fs-minipass-1.2.7"
       sources."fs.realpath-1.0.0"
       sources."gauge-2.7.4"
       sources."get-stream-4.1.0"
       sources."getpass-0.1.7"
       sources."glob-7.1.4"
       sources."got-9.6.0"
-      sources."graceful-fs-4.2.1"
+      sources."graceful-fs-4.2.2"
       sources."grapheme-splitter-1.0.4"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.3"
@@ -70030,7 +70140,7 @@ in
         ];
       })
       sources."iconv-lite-0.4.24"
-      sources."ignore-walk-3.0.1"
+      sources."ignore-walk-3.0.2"
       sources."indexof-0.0.1"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
@@ -70062,8 +70172,8 @@ in
           sources."assert-plus-0.1.5"
         ];
       })
-      sources."linkify-it-2.1.0"
-      sources."lodash-4.17.14"
+      sources."linkify-it-2.2.0"
+      sources."lodash-4.17.15"
       sources."lodash.assignin-4.2.0"
       sources."lodash.bind-4.2.1"
       sources."lodash.defaults-4.2.0"
@@ -70088,8 +70198,8 @@ in
       sources."minimalistic-assert-1.0.1"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
-      sources."minipass-2.3.5"
-      sources."minizlib-1.2.1"
+      sources."minipass-2.6.2"
+      sources."minizlib-1.2.2"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
@@ -70107,7 +70217,7 @@ in
       sources."negotiator-0.6.2"
       (sources."node-pre-gyp-0.11.0" // {
         dependencies = [
-          sources."semver-5.7.0"
+          sources."semver-5.7.1"
         ];
       })
       sources."nopt-4.0.1"
@@ -70128,7 +70238,7 @@ in
       sources."p-cancelable-1.1.0"
       sources."p-finally-1.0.0"
       sources."p-try-2.2.0"
-      sources."package-json-6.4.0"
+      sources."package-json-6.5.0"
       sources."parseqs-0.0.5"
       sources."parseuri-0.0.5"
       sources."parseurl-1.3.3"
@@ -70140,7 +70250,7 @@ in
       sources."prepend-http-2.0.0"
       sources."process-nextick-args-2.0.1"
       sources."proxy-addr-2.0.5"
-      sources."psl-1.3.0"
+      sources."psl-1.4.0"
       sources."pump-3.0.0"
       sources."punycode-2.1.1"
       sources."qs-6.7.0"
@@ -70151,7 +70261,7 @@ in
       sources."read-chunk-3.2.0"
       sources."readable-stream-3.4.0"
       sources."regenerator-runtime-0.13.3"
-      sources."registry-auth-token-3.4.0"
+      sources."registry-auth-token-4.0.0"
       sources."registry-url-5.1.0"
       (sources."request-2.88.0" // {
         dependencies = [
@@ -70159,11 +70269,11 @@ in
         ];
       })
       sources."responselike-1.0.2"
-      sources."rimraf-2.6.3"
-      sources."safe-buffer-5.1.2"
+      sources."rimraf-2.7.1"
+      sources."safe-buffer-5.2.0"
       sources."safer-buffer-2.1.2"
       sources."sax-1.2.4"
-      sources."semver-6.2.0"
+      sources."semver-6.3.0"
       (sources."send-0.17.1" // {
         dependencies = [
           sources."ms-2.1.1"
@@ -70200,7 +70310,7 @@ in
       sources."statuses-1.5.0"
       sources."streamsearch-0.1.2"
       sources."string-width-1.0.2"
-      sources."string_decoder-1.2.0"
+      sources."string_decoder-1.3.0"
       sources."strip-ansi-3.0.1"
       sources."strip-json-comments-2.0.1"
       sources."strip-outer-1.0.1"
@@ -70244,7 +70354,7 @@ in
       sources."ws-6.1.4"
       sources."xmlhttprequest-ssl-1.5.5"
       sources."yallist-3.0.3"
-      sources."yarn-1.16.0"
+      sources."yarn-1.17.3"
       sources."yeast-0.1.2"
     ];
     buildInputs = globalBuildInputs;
@@ -70255,14 +70365,15 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   three = nodeEnv.buildNodePackage {
     name = "three";
     packageName = "three";
-    version = "0.107.0";
+    version = "0.108.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/three/-/three-0.107.0.tgz";
-      sha512 = "vqbKJRLBEviPVa7poEzXocobicwxzsctr5mnymA7n8fEzcVS49rYP0RrwqZ98JqujRoruK+/YzcchNpRP+kXsQ==";
+      url = "https://registry.npmjs.org/three/-/three-0.108.0.tgz";
+      sha512 = "d1ysIXwi8qTlbmMwrTxi5pYiiYIflEr0e48krP0LAY8ndS8c6fkLHn6NvRT+o76/Fs9PBLxFViuI62iGVWwwlg==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -70272,14 +70383,15 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   tiddlywiki = nodeEnv.buildNodePackage {
     name = "tiddlywiki";
     packageName = "tiddlywiki";
-    version = "5.1.19";
+    version = "5.1.21";
     src = fetchurl {
-      url = "https://registry.npmjs.org/tiddlywiki/-/tiddlywiki-5.1.19.tgz";
-      sha512 = "G7JnwrQJ6d2ue49yaBl7WzmTOV/WH/mm4WgknChr6z8sSUVU+czPoYBXfwqHOuCbdZqWRPjiYfjkdm+eUiWodw==";
+      url = "https://registry.npmjs.org/tiddlywiki/-/tiddlywiki-5.1.21.tgz";
+      sha512 = "VuBK9N2u9ttPcaHCh4NmRX3YYB2tMPoIKCHhfNaJ62VGQj8ozmVD+PkvP/w7R50g6HaZtaSsqUJj26gRTIBa6w==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -70289,6 +70401,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   titanium = nodeEnv.buildNodePackage {
     name = "titanium";
@@ -70338,7 +70451,7 @@ in
       sources."fs.realpath-1.0.0"
       sources."getpass-0.1.7"
       sources."glob-7.1.4"
-      sources."graceful-fs-4.2.1"
+      sources."graceful-fs-4.2.2"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.3"
       sources."http-signature-1.2.0"
@@ -70374,7 +70487,7 @@ in
       sources."path-is-absolute-1.0.1"
       sources."performance-now-2.1.0"
       sources."pkginfo-0.3.1"
-      sources."psl-1.3.0"
+      sources."psl-1.4.0"
       sources."punycode-2.1.1"
       sources."qs-6.5.2"
       sources."request-2.88.0"
@@ -70402,7 +70515,7 @@ in
       sources."uglify-js-3.4.10"
       sources."universalify-0.1.2"
       sources."uri-js-4.2.2"
-      sources."uuid-3.3.2"
+      sources."uuid-3.3.3"
       sources."verror-1.10.0"
       (sources."winston-1.1.2" // {
         dependencies = [
@@ -70422,14 +70535,15 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   triton = nodeEnv.buildNodePackage {
     name = "triton";
     packageName = "triton";
-    version = "7.3.0";
+    version = "7.5.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/triton/-/triton-7.3.0.tgz";
-      sha512 = "7O44Ds3J1bVeTHW4uZKSaEzxyV4+Dy5P29hQ4G9XgxGMUAVGtfUZEe77gppEqIxoIscDP9LRpzBPim21b6p+8Q==";
+      url = "https://registry.npmjs.org/triton/-/triton-7.5.0.tgz";
+      sha512 = "t1b1B2H0y9jOUqDm2rr9gQsnI0mm0ws47h+pz8sBWw+Ylw+J664bM/usKPevh38J17zlKo3FisAZvSjcOVfIZQ==";
     };
     dependencies = [
       sources."asn1-0.2.4"
@@ -70454,7 +70568,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."dtrace-provider-0.8.7"
+      sources."dtrace-provider-0.8.8"
       sources."ecc-jsbn-0.1.2"
       sources."extsprintf-1.0.2"
       sources."fast-safe-stringify-1.2.3"
@@ -70581,7 +70695,7 @@ in
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."util-deprecate-1.0.2"
-      sources."uuid-3.3.2"
+      sources."uuid-3.3.3"
       (sources."vasync-1.6.3" // {
         dependencies = [
           sources."extsprintf-1.2.0"
@@ -70613,6 +70727,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   tsun = nodeEnv.buildNodePackage {
     name = "tsun";
@@ -70651,6 +70766,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   ttf2eot = nodeEnv.buildNodePackage {
     name = "ttf2eot";
@@ -70673,14 +70789,15 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   typescript = nodeEnv.buildNodePackage {
     name = "typescript";
     packageName = "typescript";
-    version = "3.5.3";
+    version = "3.6.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/typescript/-/typescript-3.5.3.tgz";
-      sha512 = "ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g==";
+      url = "https://registry.npmjs.org/typescript/-/typescript-3.6.3.tgz";
+      sha512 = "N7bceJL1CtRQ2RiG0AQME13ksR7DiuQh/QehubYcghzv20tnh+MQnQIuJddTmsbqYj+dztchykemz0zFzlvdQw==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -70690,31 +70807,33 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   typescript-language-server = nodeEnv.buildNodePackage {
     name = "typescript-language-server";
     packageName = "typescript-language-server";
-    version = "0.3.8";
+    version = "0.4.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-0.3.8.tgz";
-      sha512 = "ohi+libVtaJ0F8asuXeqYlrPV84AkbcpWsp5kBeO6XnCrilwQS+elDrJ+jPu2tfVy3CIUpUbUYUmg4Bq3CA/XQ==";
+      url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-0.4.0.tgz";
+      sha512 = "K8jNOmDFn+QfrCh8ujby2pGDs5rpjYZQn+zvQnf42rxG4IHbfw5CHoMvbGkWPK/J5Gw8/l5K3i03kVZC2IBElg==";
     };
     dependencies = [
       sources."command-exists-1.2.6"
       sources."commander-2.20.0"
       sources."crypto-random-string-1.0.0"
       sources."fs-extra-7.0.1"
-      sources."graceful-fs-4.2.1"
+      sources."graceful-fs-4.2.2"
       sources."jsonfile-4.0.0"
       sources."p-debounce-1.0.0"
       sources."temp-dir-1.0.0"
       sources."tempy-0.2.1"
       sources."unique-string-1.0.0"
       sources."universalify-0.1.2"
-      sources."vscode-jsonrpc-4.0.0"
-      sources."vscode-languageserver-4.4.2"
-      sources."vscode-languageserver-protocol-3.14.1"
-      sources."vscode-languageserver-types-3.14.0"
+      sources."vscode-jsonrpc-4.1.0-next.3"
+      sources."vscode-languageserver-5.3.0-next.10"
+      sources."vscode-languageserver-protocol-3.15.0-next.8"
+      sources."vscode-languageserver-types-3.15.0-next.4"
+      sources."vscode-textbuffer-1.0.0"
       sources."vscode-uri-1.0.8"
     ];
     buildInputs = globalBuildInputs;
@@ -70724,6 +70843,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   uglify-js = nodeEnv.buildNodePackage {
     name = "uglify-js";
@@ -70745,14 +70865,15 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   ungit = nodeEnv.buildNodePackage {
     name = "ungit";
     packageName = "ungit";
-    version = "1.4.46";
+    version = "1.4.47";
     src = fetchurl {
-      url = "https://registry.npmjs.org/ungit/-/ungit-1.4.46.tgz";
-      sha512 = "mJFQJQftgrdqP4npnUd9P9WUeMsTfrDeStfTuUG8g58ELxm2RKvLsphxzKK5HkI+u61MasftxdGvcGPUs3gOzQ==";
+      url = "https://registry.npmjs.org/ungit/-/ungit-1.4.47.tgz";
+      sha512 = "aTkH2jg6vCcobdSeElJ2xqRI6zHL8Y+TPLEgE+86BmdSLPyRgvYbqTzvieTXF+4U9y693NtfyALcvKxqHhcmJA==";
     };
     dependencies = [
       sources."abbrev-1.1.1"
@@ -70820,7 +70941,7 @@ in
       sources."core-util-is-1.0.2"
       (sources."cross-spawn-6.0.5" // {
         dependencies = [
-          sources."semver-5.7.0"
+          sources."semver-5.7.1"
         ];
       })
       sources."crossroads-0.12.2"
@@ -70843,9 +70964,9 @@ in
         ];
       })
       sources."ecc-jsbn-0.1.2"
-      (sources."editions-2.1.3" // {
+      (sources."editions-2.2.0" // {
         dependencies = [
-          sources."semver-5.7.0"
+          sources."semver-6.3.0"
         ];
       })
       sources."ee-first-1.1.1"
@@ -70863,7 +70984,7 @@ in
         ];
       })
       sources."engine.io-parser-2.1.3"
-      sources."errlop-1.1.1"
+      sources."errlop-1.1.2"
       sources."escape-html-1.0.3"
       sources."etag-1.8.1"
       sources."eve-0.5.4"
@@ -70895,7 +71016,7 @@ in
       sources."eyes-0.1.8"
       sources."fast-deep-equal-2.0.1"
       sources."fast-json-stable-stringify-2.0.0"
-      sources."fast-safe-stringify-2.0.6"
+      sources."fast-safe-stringify-2.0.7"
       (sources."finalhandler-1.1.1" // {
         dependencies = [
           sources."statuses-1.4.0"
@@ -70914,7 +71035,7 @@ in
       sources."getmac-1.4.6"
       sources."getpass-0.1.7"
       sources."glob-7.1.4"
-      sources."graceful-fs-4.2.1"
+      sources."graceful-fs-4.2.2"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.3"
       (sources."has-binary2-1.0.3" // {
@@ -70930,16 +71051,11 @@ in
           sources."mkdirp-0.3.0"
         ];
       })
-      (sources."hosted-git-info-2.8.2" // {
-        dependencies = [
-          sources."lru-cache-5.1.1"
-          sources."yallist-3.0.3"
-        ];
-      })
+      sources."hosted-git-info-2.8.4"
       sources."http-errors-1.7.2"
       sources."http-signature-1.2.0"
       sources."iconv-lite-0.4.24"
-      sources."ignore-5.1.2"
+      sources."ignore-5.1.4"
       sources."indexof-0.0.1"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
@@ -70994,18 +71110,18 @@ in
       sources."nopt-1.0.10"
       (sources."normalize-package-data-2.5.0" // {
         dependencies = [
-          sources."semver-5.7.0"
+          sources."semver-5.7.1"
         ];
       })
       sources."npm-6.9.2"
-      (sources."npm-package-arg-6.1.0" // {
+      (sources."npm-package-arg-6.1.1" // {
         dependencies = [
-          sources."semver-5.7.0"
+          sources."semver-5.7.1"
         ];
       })
       (sources."npm-registry-client-8.6.0" // {
         dependencies = [
-          sources."semver-5.7.0"
+          sources."semver-5.7.1"
         ];
       })
       sources."npm-run-path-2.0.2"
@@ -71027,7 +71143,7 @@ in
       sources."p-defer-1.0.0"
       sources."p-finally-1.0.0"
       sources."p-is-promise-2.1.0"
-      sources."p-limit-2.2.0"
+      sources."p-limit-2.2.1"
       sources."p-locate-3.0.0"
       sources."p-try-2.2.0"
       sources."parseqs-0.0.5"
@@ -71046,7 +71162,7 @@ in
       sources."process-nextick-args-2.0.1"
       sources."proxy-addr-2.0.5"
       sources."pseudomap-1.0.2"
-      sources."psl-1.3.0"
+      sources."psl-1.4.0"
       sources."pump-3.0.0"
       sources."punycode-2.1.1"
       sources."qs-6.7.0"
@@ -71149,7 +71265,7 @@ in
       sources."uri-js-4.2.2"
       sources."util-deprecate-1.0.2"
       sources."utils-merge-1.0.1"
-      sources."uuid-3.3.2"
+      sources."uuid-3.3.3"
       sources."validate-npm-package-license-3.0.4"
       sources."validate-npm-package-name-3.0.0"
       sources."vary-1.1.2"
@@ -71191,6 +71307,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   vscode-css-languageserver-bin = nodeEnv.buildNodePackage {
     name = "vscode-css-languageserver-bin";
@@ -71218,6 +71335,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   vscode-html-languageserver-bin = nodeEnv.buildNodePackage {
     name = "vscode-html-languageserver-bin";
@@ -71255,6 +71373,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   vue-cli = nodeEnv.buildNodePackage {
     name = "vue-cli";
@@ -71289,7 +71408,7 @@ in
       sources."bl-1.2.2"
       sources."bluebird-3.5.5"
       sources."brace-expansion-1.1.11"
-      sources."buffer-5.2.1"
+      sources."buffer-5.4.3"
       sources."buffer-alloc-1.2.0"
       sources."buffer-alloc-unsafe-1.1.0"
       sources."buffer-crc32-0.2.13"
@@ -71364,10 +71483,10 @@ in
       sources."git-clone-0.1.0"
       sources."glob-7.1.4"
       sources."got-6.7.1"
-      sources."graceful-fs-4.2.1"
+      sources."graceful-fs-4.2.2"
       sources."graceful-readlink-1.0.1"
       sources."gray-matter-2.1.1"
-      sources."handlebars-4.1.2"
+      sources."handlebars-4.2.0"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.3"
       (sources."has-ansi-2.0.0" // {
@@ -71385,7 +71504,7 @@ in
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."ini-1.3.5"
-      sources."inquirer-6.5.0"
+      sources."inquirer-6.5.2"
       sources."is-3.3.0"
       sources."is-extendable-0.1.1"
       sources."is-fullwidth-code-point-2.0.0"
@@ -71393,7 +71512,7 @@ in
       sources."is-object-1.0.1"
       sources."is-promise-2.1.0"
       sources."is-redirect-1.0.0"
-      sources."is-retry-allowed-1.1.0"
+      sources."is-retry-allowed-1.2.0"
       sources."is-stream-1.1.0"
       sources."is-typedarray-1.0.0"
       sources."is-utf8-0.2.1"
@@ -71456,7 +71575,7 @@ in
       sources."prepend-http-1.0.4"
       sources."process-nextick-args-2.0.1"
       sources."proto-list-1.2.4"
-      sources."psl-1.3.0"
+      sources."psl-1.4.0"
       sources."punycode-2.1.1"
       sources."qs-6.5.2"
       sources."read-metadata-1.0.0"
@@ -71468,9 +71587,9 @@ in
       sources."recursive-readdir-2.2.2"
       sources."request-2.88.0"
       sources."restore-cursor-2.0.0"
-      sources."rimraf-2.6.3"
+      sources."rimraf-2.7.1"
       sources."run-async-2.3.0"
-      sources."rxjs-6.5.2"
+      sources."rxjs-6.5.3"
       sources."safe-buffer-5.2.0"
       sources."safer-buffer-2.1.2"
       (sources."seek-bzip-1.0.5" // {
@@ -71478,7 +71597,7 @@ in
           sources."commander-2.8.1"
         ];
       })
-      sources."semver-5.7.0"
+      sources."semver-5.7.1"
       sources."signal-exit-3.0.2"
       sources."source-map-0.6.1"
       sources."sprintf-js-1.0.3"
@@ -71530,7 +71649,7 @@ in
       sources."url-to-options-1.0.1"
       sources."user-home-2.0.0"
       sources."util-deprecate-1.0.2"
-      sources."uuid-3.3.2"
+      sources."uuid-3.3.3"
       sources."validate-npm-package-name-3.0.0"
       sources."verror-1.10.0"
       sources."ware-1.3.0"
@@ -71550,19 +71669,22 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   vue-language-server = nodeEnv.buildNodePackage {
     name = "vue-language-server";
     packageName = "vue-language-server";
-    version = "0.0.57";
+    version = "0.0.61";
     src = fetchurl {
-      url = "https://registry.npmjs.org/vue-language-server/-/vue-language-server-0.0.57.tgz";
-      sha512 = "o0CSn0HJdo1/ASh2nY9MZh/dZrq+U+fVfIL4XDL/VRMrFAyr9pPmhT9/pdRZlHPN46r05UhBfGQXnbeOOssguA==";
+      url = "https://registry.npmjs.org/vue-language-server/-/vue-language-server-0.0.61.tgz";
+      sha512 = "/fBg8FrW2H4CRO/dsr3VuGVYs5RS6zQIT+eG9SEQdo3VRDF8bNmJro1QpszJ0KVC7UxW9+fwf98i+xDBtne2Xw==";
     };
     dependencies = [
       sources."@babel/code-frame-7.5.5"
       sources."@babel/highlight-7.5.0"
       sources."@emmetio/extract-abbreviation-0.1.6"
+      sources."@mrmlnc/readdir-enhanced-2.2.1"
+      sources."@nodelib/fs.stat-1.1.3"
       sources."@starptech/expression-parser-0.9.0"
       sources."@starptech/hast-util-from-webparser-0.9.0"
       sources."@starptech/prettyhtml-0.9.0"
@@ -71573,28 +71695,42 @@ in
       sources."@starptech/rehype-minify-whitespace-0.9.0"
       sources."@starptech/rehype-webparser-0.9.0"
       sources."@starptech/webparser-0.9.0"
-      sources."@types/node-12.6.9"
+      sources."@types/node-12.7.5"
       sources."@types/unist-2.0.3"
       sources."@types/vfile-3.0.2"
       sources."@types/vfile-message-1.0.1"
       sources."abbrev-1.1.1"
-      sources."acorn-6.2.1"
-      sources."acorn-jsx-5.0.1"
+      sources."acorn-6.3.0"
+      sources."acorn-jsx-5.0.2"
       sources."ajv-6.10.2"
       sources."ajv-keywords-2.1.1"
-      sources."amdefine-1.0.1"
       sources."ansi-align-2.0.0"
       sources."ansi-escapes-3.2.0"
       sources."ansi-regex-3.0.0"
       sources."ansi-styles-3.2.1"
-      sources."anymatch-1.3.2"
+      (sources."anymatch-1.3.2" // {
+        dependencies = [
+          sources."arr-diff-2.0.0"
+          sources."array-unique-0.2.1"
+          sources."braces-1.8.5"
+          sources."expand-brackets-0.1.5"
+          sources."extglob-0.3.2"
+          sources."is-buffer-1.1.6"
+          sources."is-extglob-1.0.0"
+          sources."is-glob-2.0.1"
+          sources."kind-of-3.2.2"
+          sources."micromatch-2.3.11"
+        ];
+      })
       sources."argparse-1.0.10"
-      sources."arr-diff-2.0.0"
+      sources."arr-diff-4.0.0"
       sources."arr-flatten-1.1.0"
       sources."arr-union-3.1.0"
       sources."array-find-index-1.0.2"
       sources."array-iterate-1.1.3"
-      sources."array-unique-0.2.1"
+      sources."array-union-1.0.2"
+      sources."array-uniq-1.0.3"
+      sources."array-unique-0.3.2"
       sources."arrify-1.0.1"
       sources."assign-symbols-1.0.0"
       sources."astral-regex-1.0.0"
@@ -71617,21 +71753,22 @@ in
       (sources."base-0.11.2" // {
         dependencies = [
           sources."define-property-1.0.0"
-          sources."isobject-3.0.1"
         ];
       })
       sources."binary-extensions-1.13.1"
       sources."bootstrap-vue-helper-json-1.1.1"
       sources."boxen-1.3.0"
       sources."brace-expansion-1.1.11"
-      sources."braces-1.8.5"
-      sources."buefy-helper-json-1.0.3"
-      sources."buffer-from-1.1.1"
-      (sources."cache-base-1.0.1" // {
+      (sources."braces-2.3.2" // {
         dependencies = [
-          sources."isobject-3.0.1"
+          sources."extend-shallow-2.0.1"
         ];
       })
+      sources."buefy-helper-json-1.0.3"
+      sources."buffer-from-1.1.1"
+      sources."builtin-modules-1.1.1"
+      sources."cache-base-1.0.1"
+      sources."call-me-maybe-1.0.1"
       (sources."caller-path-0.1.0" // {
         dependencies = [
           sources."callsites-0.2.0"
@@ -71648,7 +71785,13 @@ in
       sources."character-entities-legacy-1.1.3"
       sources."character-reference-invalid-1.1.3"
       sources."chardet-0.7.0"
-      sources."chokidar-1.5.2"
+      (sources."chokidar-1.5.2" // {
+        dependencies = [
+          sources."glob-parent-2.0.0"
+          sources."is-extglob-1.0.0"
+          sources."is-glob-2.0.1"
+        ];
+      })
       sources."ci-info-1.6.0"
       sources."circular-json-0.3.3"
       (sources."class-utils-0.3.6" // {
@@ -71666,21 +71809,13 @@ in
             ];
           })
           sources."is-descriptor-0.1.6"
-          sources."isobject-3.0.1"
           sources."kind-of-5.1.0"
         ];
       })
       sources."cli-boxes-1.0.0"
       sources."cli-cursor-2.1.0"
       sources."cli-width-2.2.0"
-      (sources."cliui-3.2.0" // {
-        dependencies = [
-          sources."ansi-regex-2.1.1"
-          sources."is-fullwidth-code-point-1.0.0"
-          sources."string-width-1.0.2"
-          sources."strip-ansi-3.0.1"
-        ];
-      })
+      sources."cliui-4.1.0"
       sources."clone-1.0.4"
       sources."co-4.6.0"
       sources."code-point-at-1.1.0"
@@ -71706,14 +71841,14 @@ in
       sources."core-js-2.6.9"
       sources."core-util-is-1.0.2"
       sources."create-error-class-3.0.2"
-      (sources."cross-spawn-5.1.0" // {
+      sources."cross-spawn-5.1.0"
+      sources."crypto-random-string-1.0.0"
+      (sources."css-2.2.4" // {
         dependencies = [
-          sources."lru-cache-4.1.5"
-          sources."yallist-2.1.2"
+          sources."source-map-0.6.1"
         ];
       })
-      sources."crypto-random-string-1.0.0"
-      sources."css-parse-1.7.0"
+      sources."css-parse-2.0.0"
       sources."currently-unhandled-0.4.1"
       sources."debug-3.2.6"
       sources."decamelize-1.2.0"
@@ -71726,22 +71861,15 @@ in
       sources."deep-extend-0.6.0"
       sources."deep-is-0.1.3"
       sources."defaults-1.0.3"
-      (sources."define-property-2.0.2" // {
-        dependencies = [
-          sources."isobject-3.0.1"
-        ];
-      })
+      sources."define-property-2.0.2"
+      sources."diff-4.0.1"
+      sources."dir-glob-2.0.0"
       sources."dlv-1.1.3"
       sources."doctrine-3.0.0"
       sources."dot-prop-4.2.0"
       sources."duplexer3-0.1.4"
-      (sources."editorconfig-0.15.3" // {
-        dependencies = [
-          sources."lru-cache-4.1.5"
-          sources."yallist-2.1.2"
-        ];
-      })
-      sources."element-helper-json-2.0.5"
+      sources."editorconfig-0.15.3"
+      sources."element-helper-json-2.0.6"
       sources."emoji-regex-7.0.3"
       sources."error-ex-1.3.2"
       sources."escape-string-regexp-1.0.5"
@@ -71760,17 +71888,45 @@ in
         ];
       })
       sources."eslint-scope-4.0.3"
-      sources."eslint-utils-1.4.0"
-      sources."eslint-visitor-keys-1.0.0"
+      sources."eslint-utils-1.4.2"
+      sources."eslint-visitor-keys-1.1.0"
       sources."espree-5.0.1"
       sources."esprima-4.0.1"
       sources."esquery-1.0.1"
       sources."esrecurse-4.2.1"
-      sources."estraverse-4.2.0"
+      sources."estraverse-4.3.0"
       sources."esutils-2.0.3"
       sources."execa-0.7.0"
-      sources."expand-brackets-0.1.5"
-      sources."expand-range-1.8.2"
+      (sources."expand-brackets-2.1.4" // {
+        dependencies = [
+          sources."debug-2.6.9"
+          sources."define-property-0.2.5"
+          sources."extend-shallow-2.0.1"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-buffer-1.1.6"
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
+          sources."ms-2.0.0"
+        ];
+      })
+      (sources."expand-range-1.8.2" // {
+        dependencies = [
+          sources."fill-range-2.2.4"
+          sources."is-buffer-1.1.6"
+          sources."is-number-2.1.0"
+          sources."isobject-2.1.0"
+          sources."kind-of-3.2.2"
+        ];
+      })
       sources."extend-3.0.2"
       (sources."extend-shallow-3.0.2" // {
         dependencies = [
@@ -71778,15 +71934,25 @@ in
         ];
       })
       sources."external-editor-3.1.0"
-      sources."extglob-0.3.2"
+      (sources."extglob-2.0.4" // {
+        dependencies = [
+          sources."define-property-1.0.0"
+          sources."extend-shallow-2.0.1"
+        ];
+      })
       sources."fast-deep-equal-2.0.1"
+      sources."fast-glob-2.2.7"
       sources."fast-json-stable-stringify-2.0.0"
       sources."fast-levenshtein-2.0.6"
       sources."fault-1.0.3"
       sources."figures-2.0.0"
       sources."file-entry-cache-5.0.1"
       sources."filename-regex-2.0.1"
-      sources."fill-range-2.2.4"
+      (sources."fill-range-4.0.0" // {
+        dependencies = [
+          sources."extend-shallow-2.0.1"
+        ];
+      })
       sources."find-up-2.1.0"
       sources."flat-cache-2.0.1"
       sources."flatted-2.0.1"
@@ -71799,15 +71965,28 @@ in
       sources."fsevents-1.2.9"
       sources."function-bind-1.1.1"
       sources."functional-red-black-tree-1.0.1"
+      sources."get-caller-file-1.0.3"
       sources."get-stream-3.0.0"
       sources."get-value-2.0.6"
       sources."glob-7.1.4"
-      sources."glob-base-0.3.0"
-      sources."glob-parent-2.0.0"
+      (sources."glob-base-0.3.0" // {
+        dependencies = [
+          sources."glob-parent-2.0.0"
+          sources."is-extglob-1.0.0"
+          sources."is-glob-2.0.1"
+        ];
+      })
+      (sources."glob-parent-3.1.0" // {
+        dependencies = [
+          sources."is-glob-3.1.0"
+        ];
+      })
+      sources."glob-to-regexp-0.3.0"
       sources."global-dirs-0.1.1"
       sources."globals-11.12.0"
+      sources."globby-8.0.2"
       sources."got-6.7.1"
-      sources."graceful-fs-4.2.1"
+      sources."graceful-fs-4.2.2"
       sources."gridsome-helper-json-1.0.3"
       sources."has-1.0.3"
       (sources."has-ansi-2.0.0" // {
@@ -71816,19 +71995,10 @@ in
         ];
       })
       sources."has-flag-3.0.0"
-      (sources."has-value-1.0.0" // {
-        dependencies = [
-          sources."isobject-3.0.1"
-        ];
-      })
+      sources."has-value-1.0.0"
       (sources."has-values-1.0.0" // {
         dependencies = [
           sources."is-buffer-1.1.6"
-          (sources."is-number-3.0.0" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
           sources."kind-of-4.0.0"
         ];
       })
@@ -71839,7 +72009,7 @@ in
       sources."hast-util-parse-selector-2.2.2"
       sources."hast-util-to-string-1.0.2"
       sources."hast-util-whitespace-1.0.3"
-      sources."hosted-git-info-2.8.2"
+      sources."hosted-git-info-2.8.4"
       sources."html-void-elements-1.0.4"
       sources."html-whitespace-sensitive-tag-names-1.0.1"
       sources."iconv-lite-0.4.24"
@@ -71855,69 +72025,58 @@ in
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."ini-1.3.5"
-      (sources."inquirer-6.5.0" // {
+      (sources."inquirer-6.5.2" // {
         dependencies = [
           sources."ansi-regex-4.1.0"
           sources."strip-ansi-5.2.0"
         ];
       })
       sources."invert-kv-1.0.0"
-      (sources."is-accessor-descriptor-1.0.0" // {
-        dependencies = [
-          sources."kind-of-6.0.2"
-        ];
-      })
+      sources."is-accessor-descriptor-1.0.0"
       sources."is-alphabetical-1.0.3"
       sources."is-alphanumerical-1.0.3"
       sources."is-arrayish-0.2.1"
       sources."is-binary-path-1.0.1"
       sources."is-buffer-2.0.3"
       sources."is-ci-1.2.1"
-      (sources."is-data-descriptor-1.0.0" // {
-        dependencies = [
-          sources."kind-of-6.0.2"
-        ];
-      })
+      sources."is-data-descriptor-1.0.0"
       sources."is-decimal-1.0.3"
-      (sources."is-descriptor-1.0.2" // {
-        dependencies = [
-          sources."kind-of-6.0.2"
-        ];
-      })
+      sources."is-descriptor-1.0.2"
       sources."is-dotfile-1.0.3"
       sources."is-empty-1.2.0"
       sources."is-equal-shallow-0.1.3"
       sources."is-extendable-0.1.1"
-      sources."is-extglob-1.0.0"
+      sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-2.0.0"
-      sources."is-glob-2.0.1"
+      sources."is-glob-4.0.1"
       sources."is-hexadecimal-1.0.3"
       sources."is-hidden-1.1.2"
       sources."is-installed-globally-0.1.0"
       sources."is-npm-1.0.0"
-      sources."is-number-2.1.0"
+      (sources."is-number-3.0.0" // {
+        dependencies = [
+          sources."is-buffer-1.1.6"
+          sources."kind-of-3.2.2"
+        ];
+      })
       sources."is-obj-1.0.1"
       sources."is-object-1.0.1"
       sources."is-path-inside-1.0.1"
       sources."is-plain-obj-1.1.0"
-      (sources."is-plain-object-2.0.4" // {
-        dependencies = [
-          sources."isobject-3.0.1"
-        ];
-      })
+      sources."is-plain-object-2.0.4"
       sources."is-posix-bracket-0.1.1"
       sources."is-primitive-2.0.0"
       sources."is-promise-2.1.0"
       sources."is-redirect-1.0.0"
       sources."is-resolvable-1.1.0"
-      sources."is-retry-allowed-1.1.0"
+      sources."is-retry-allowed-1.2.0"
       sources."is-stream-1.1.0"
       sources."is-utf8-0.2.1"
       sources."is-windows-1.0.2"
       sources."isarray-1.0.0"
       sources."isexe-2.0.0"
-      sources."isobject-2.1.0"
-      sources."js-beautify-1.10.1"
+      sources."isobject-3.0.1"
+      sources."js-beautify-1.10.2"
       sources."js-tokens-4.0.0"
       sources."js-yaml-3.13.1"
       sources."json-parse-better-errors-1.0.2"
@@ -71925,11 +72084,7 @@ in
       sources."json-stable-stringify-without-jsonify-1.0.1"
       sources."json5-2.1.0"
       sources."jsonc-parser-1.0.3"
-      (sources."kind-of-3.2.2" // {
-        dependencies = [
-          sources."is-buffer-1.1.6"
-        ];
-      })
+      sources."kind-of-6.0.2"
       sources."latest-version-3.1.0"
       sources."lcid-1.0.0"
       sources."levn-0.3.0"
@@ -71944,7 +72099,7 @@ in
       sources."lodash.merge-4.6.2"
       sources."lodash.rest-4.0.5"
       sources."lodash.unescape-4.0.1"
-      sources."loglevel-1.6.3"
+      sources."loglevel-1.6.4"
       (sources."loglevel-colored-level-prefix-1.0.0" // {
         dependencies = [
           sources."ansi-regex-2.1.1"
@@ -71957,19 +72112,21 @@ in
       sources."longest-streak-1.0.0"
       sources."loud-rejection-1.6.0"
       sources."lowercase-keys-1.0.1"
-      sources."lru-cache-5.1.1"
+      sources."lru-cache-4.1.5"
       sources."make-dir-1.3.0"
       sources."map-cache-0.2.2"
       sources."map-obj-2.0.0"
       sources."map-visit-1.0.0"
       sources."markdown-table-0.4.0"
       sources."math-random-1.0.4"
+      sources."mem-1.1.0"
       (sources."meow-5.0.0" // {
         dependencies = [
           sources."read-pkg-up-3.0.0"
         ];
       })
-      sources."micromatch-2.3.11"
+      sources."merge2-1.3.0"
+      sources."micromatch-3.1.10"
       sources."mimic-fn-1.2.0"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
@@ -71988,13 +72145,7 @@ in
       sources."ms-2.1.2"
       sources."mute-stream-0.0.7"
       sources."nan-2.14.0"
-      (sources."nanomatch-1.2.13" // {
-        dependencies = [
-          sources."arr-diff-4.0.0"
-          sources."array-unique-0.3.2"
-          sources."kind-of-6.0.2"
-        ];
-      })
+      sources."nanomatch-1.2.13"
       sources."natural-compare-1.4.0"
       sources."nice-try-1.0.5"
       sources."nopt-4.0.1"
@@ -72009,30 +72160,24 @@ in
         dependencies = [
           sources."define-property-0.2.5"
           sources."is-accessor-descriptor-0.1.6"
+          sources."is-buffer-1.1.6"
           sources."is-data-descriptor-0.1.4"
           (sources."is-descriptor-0.1.6" // {
             dependencies = [
               sources."kind-of-5.1.0"
             ];
           })
+          sources."kind-of-3.2.2"
         ];
       })
-      (sources."object-visit-1.0.1" // {
-        dependencies = [
-          sources."isobject-3.0.1"
-        ];
-      })
+      sources."object-visit-1.0.1"
       sources."object.omit-2.0.1"
-      (sources."object.pick-1.3.0" // {
-        dependencies = [
-          sources."isobject-3.0.1"
-        ];
-      })
+      sources."object.pick-1.3.0"
       sources."once-1.4.0"
       sources."onetime-2.0.1"
       sources."optionator-0.8.2"
       sources."os-homedir-1.0.2"
-      sources."os-locale-1.4.0"
+      sources."os-locale-2.1.0"
       sources."os-tmpdir-1.0.2"
       sources."osenv-0.1.5"
       sources."p-finally-1.0.0"
@@ -72043,9 +72188,15 @@ in
       sources."parent-module-1.0.1"
       sources."parse-entities-1.2.2"
       sources."parse-gitignore-1.0.1"
-      sources."parse-glob-3.0.4"
+      (sources."parse-glob-3.0.4" // {
+        dependencies = [
+          sources."is-extglob-1.0.0"
+          sources."is-glob-2.0.1"
+        ];
+      })
       sources."parse-json-4.0.0"
       sources."pascalcase-0.1.1"
+      sources."path-dirname-1.0.2"
       sources."path-exists-3.0.0"
       sources."path-is-absolute-1.0.1"
       sources."path-is-inside-1.0.2"
@@ -72099,6 +72250,7 @@ in
           sources."write-0.2.1"
         ];
       })
+      sources."prettier-tslint-0.4.2"
       sources."pretty-format-23.6.0"
       sources."process-nextick-args-2.0.1"
       sources."progress-2.0.3"
@@ -72110,7 +72262,6 @@ in
       (sources."randomatic-3.1.1" // {
         dependencies = [
           sources."is-number-4.0.0"
-          sources."kind-of-6.0.2"
         ];
       })
       sources."rc-1.2.8"
@@ -72119,66 +72270,13 @@ in
         dependencies = [
           sources."find-up-3.0.0"
           sources."locate-path-3.0.0"
-          sources."p-limit-2.2.0"
+          sources."p-limit-2.2.1"
           sources."p-locate-3.0.0"
           sources."p-try-2.2.0"
         ];
       })
       sources."readable-stream-2.3.6"
-      (sources."readdirp-2.2.1" // {
-        dependencies = [
-          sources."arr-diff-4.0.0"
-          sources."array-unique-0.3.2"
-          (sources."braces-2.3.2" // {
-            dependencies = [
-              sources."extend-shallow-2.0.1"
-            ];
-          })
-          sources."debug-2.6.9"
-          (sources."expand-brackets-2.1.4" // {
-            dependencies = [
-              sources."define-property-0.2.5"
-              sources."extend-shallow-2.0.1"
-            ];
-          })
-          (sources."extglob-2.0.4" // {
-            dependencies = [
-              sources."define-property-1.0.0"
-              sources."extend-shallow-2.0.1"
-            ];
-          })
-          (sources."fill-range-4.0.0" // {
-            dependencies = [
-              sources."extend-shallow-2.0.1"
-            ];
-          })
-          (sources."is-accessor-descriptor-0.1.6" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."is-buffer-1.1.6"
-          (sources."is-data-descriptor-0.1.4" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          (sources."is-descriptor-0.1.6" // {
-            dependencies = [
-              sources."kind-of-5.1.0"
-            ];
-          })
-          (sources."is-number-3.0.0" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."isobject-3.0.1"
-          sources."kind-of-6.0.2"
-          sources."micromatch-3.1.10"
-          sources."ms-2.0.0"
-        ];
-      })
+      sources."readdirp-2.2.1"
       sources."redent-2.0.0"
       sources."regenerator-runtime-0.11.1"
       sources."regex-cache-0.4.4"
@@ -72203,6 +72301,7 @@ in
       sources."repeat-element-1.1.3"
       sources."repeat-string-1.6.1"
       sources."replace-ext-1.0.0"
+      sources."require-directory-2.1.1"
       sources."require-main-filename-1.0.1"
       sources."require-relative-0.8.7"
       (sources."require-uncached-1.0.3" // {
@@ -72219,14 +72318,14 @@ in
       sources."run-async-2.3.0"
       sources."rx-lite-4.0.8"
       sources."rx-lite-aggregates-4.0.8"
-      sources."rxjs-6.5.2"
+      sources."rxjs-6.5.3"
       sources."safe-buffer-5.1.2"
       sources."safe-regex-1.1.0"
       sources."safer-buffer-2.1.2"
-      sources."sax-0.5.8"
-      sources."semver-5.7.0"
+      sources."sax-1.2.4"
+      sources."semver-5.7.1"
       sources."semver-diff-2.1.0"
-      sources."set-blocking-1.0.0"
+      sources."set-blocking-2.0.0"
       (sources."set-value-2.0.1" // {
         dependencies = [
           sources."extend-shallow-2.0.1"
@@ -72237,6 +72336,7 @@ in
       sources."shellsubstitute-1.2.0"
       sources."sigmund-1.0.1"
       sources."signal-exit-3.0.2"
+      sources."slash-1.0.0"
       sources."slice-ansi-2.1.0"
       (sources."snapdragon-0.8.2" // {
         dependencies = [
@@ -72257,17 +72357,20 @@ in
           sources."is-descriptor-0.1.6"
           sources."kind-of-5.1.0"
           sources."ms-2.0.0"
-          sources."source-map-0.5.7"
         ];
       })
       (sources."snapdragon-node-2.1.1" // {
         dependencies = [
           sources."define-property-1.0.0"
-          sources."isobject-3.0.1"
         ];
       })
-      sources."snapdragon-util-3.0.1"
-      sources."source-map-0.1.43"
+      (sources."snapdragon-util-3.0.1" // {
+        dependencies = [
+          sources."is-buffer-1.1.6"
+          sources."kind-of-3.2.2"
+        ];
+      })
+      sources."source-map-0.5.7"
       sources."source-map-resolve-0.5.2"
       sources."source-map-url-0.4.0"
       sources."space-separated-tokens-1.1.4"
@@ -72308,22 +72411,42 @@ in
         dependencies = [
           sources."ansi-regex-2.1.1"
           sources."ansi-styles-2.2.1"
+          sources."camelcase-3.0.0"
           sources."chalk-1.1.3"
+          sources."cliui-3.2.0"
+          sources."find-up-1.1.2"
           sources."glob-7.0.4"
+          sources."is-fullwidth-code-point-1.0.0"
+          sources."load-json-file-1.1.0"
+          sources."os-locale-1.4.0"
+          sources."parse-json-2.2.0"
+          sources."path-exists-2.1.0"
           sources."path-is-absolute-1.0.0"
+          sources."path-type-1.1.0"
+          sources."pify-2.3.0"
+          sources."read-pkg-1.1.0"
+          sources."read-pkg-up-1.0.1"
+          sources."set-blocking-1.0.0"
+          sources."string-width-1.0.2"
           sources."strip-ansi-3.0.1"
+          sources."strip-bom-2.0.0"
           sources."supports-color-2.0.0"
+          sources."yargs-4.7.1"
+          sources."yargs-parser-2.4.1"
         ];
       })
-      (sources."stylus-0.54.5" // {
+      (sources."stylus-0.54.7" // {
         dependencies = [
-          sources."glob-7.0.6"
+          sources."debug-3.1.0"
+          sources."ms-2.0.0"
+          sources."semver-6.3.0"
+          sources."source-map-0.7.3"
         ];
       })
       sources."stylus-supremacy-2.12.7"
       sources."supports-color-5.5.0"
       sources."symbol-0.2.3"
-      (sources."table-5.4.5" // {
+      (sources."table-5.4.6" // {
         dependencies = [
           sources."ansi-regex-4.1.0"
           sources."string-width-3.1.0"
@@ -72335,13 +72458,14 @@ in
       sources."through-2.3.8"
       sources."timed-out-4.0.1"
       sources."tmp-0.0.33"
-      sources."to-object-path-0.3.0"
-      sources."to-regex-3.0.2"
-      (sources."to-regex-range-2.1.1" // {
+      (sources."to-object-path-0.3.0" // {
         dependencies = [
-          sources."is-number-3.0.0"
+          sources."is-buffer-1.1.6"
+          sources."kind-of-3.2.2"
         ];
       })
+      sources."to-regex-3.0.2"
+      sources."to-regex-range-2.1.1"
       (sources."to-vfile-5.0.3" // {
         dependencies = [
           sources."vfile-3.0.1"
@@ -72352,9 +72476,11 @@ in
       sources."trim-trailing-lines-1.1.2"
       sources."trough-1.0.4"
       sources."tslib-1.10.0"
+      sources."tslint-5.20.0"
+      sources."tsutils-2.29.0"
       sources."type-check-0.3.2"
       sources."typedarray-0.0.6"
-      sources."typescript-3.5.3"
+      sources."typescript-3.6.3"
       (sources."typescript-eslint-parser-16.0.1" // {
         dependencies = [
           sources."semver-5.5.0"
@@ -72394,7 +72520,6 @@ in
             ];
           })
           sources."has-values-0.1.4"
-          sources."isobject-3.0.1"
         ];
       })
       sources."untildify-2.1.0"
@@ -72428,10 +72553,10 @@ in
           sources."vscode-languageserver-types-3.14.0"
         ];
       })
-      sources."vscode-jsonrpc-4.1.0-next.2"
-      sources."vscode-languageserver-5.3.0-next.8"
-      sources."vscode-languageserver-protocol-3.15.0-next.6"
-      sources."vscode-languageserver-types-3.15.0-next.2"
+      sources."vscode-jsonrpc-4.1.0-next.3"
+      sources."vscode-languageserver-5.3.0-next.10"
+      sources."vscode-languageserver-protocol-3.15.0-next.8"
+      sources."vscode-languageserver-types-3.15.0-next.4"
       sources."vscode-nls-4.1.1"
       sources."vscode-textbuffer-1.0.0"
       sources."vscode-uri-1.0.8"
@@ -72441,9 +72566,9 @@ in
         ];
       })
       sources."vue-onsenui-helper-json-1.0.2"
-      sources."vuetify-helper-json-1.0.0"
       sources."wcwidth-1.0.1"
       sources."which-1.3.1"
+      sources."which-module-2.0.0"
       sources."widest-line-2.0.1"
       sources."window-size-0.2.0"
       sources."wordwrap-1.0.0"
@@ -72463,24 +72588,10 @@ in
       sources."xdg-basedir-3.0.0"
       sources."xtend-4.0.2"
       sources."y18n-3.2.1"
-      sources."yallist-3.0.3"
-      (sources."yargs-4.7.1" // {
+      sources."yallist-2.1.2"
+      (sources."yargs-11.1.0" // {
         dependencies = [
-          sources."ansi-regex-2.1.1"
-          sources."camelcase-3.0.0"
-          sources."find-up-1.1.2"
-          sources."is-fullwidth-code-point-1.0.0"
-          sources."load-json-file-1.1.0"
-          sources."parse-json-2.2.0"
-          sources."path-exists-2.1.0"
-          sources."path-type-1.1.0"
-          sources."pify-2.3.0"
-          sources."read-pkg-1.1.0"
-          sources."read-pkg-up-1.0.1"
-          sources."string-width-1.0.2"
-          sources."strip-ansi-3.0.1"
-          sources."strip-bom-2.0.0"
-          sources."yargs-parser-2.4.1"
+          sources."yargs-parser-9.0.2"
         ];
       })
       sources."yargs-parser-10.1.0"
@@ -72493,6 +72604,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   web-ext = nodeEnv.buildNodePackage {
     name = "web-ext";
@@ -72507,19 +72619,24 @@ in
       sources."@babel/highlight-7.5.0"
       sources."@babel/polyfill-7.4.4"
       sources."@babel/runtime-7.4.5"
-      sources."@babel/runtime-corejs2-7.5.5"
+      sources."@babel/runtime-corejs2-7.6.0"
       sources."@cliqz-oss/firefox-client-0.3.1"
       sources."@cliqz-oss/node-firefox-connect-1.2.1"
       sources."@sindresorhus/is-0.14.0"
+      sources."@snyk/cli-interface-2.1.0"
       sources."@snyk/composer-lockfile-parser-1.0.3"
       sources."@snyk/dep-graph-1.12.0"
       sources."@snyk/gemfile-1.2.0"
       sources."@szmarczak/http-timer-1.1.2"
       sources."@types/agent-base-4.2.0"
-      sources."@types/debug-4.1.4"
+      sources."@types/bunyan-1.8.6"
+      sources."@types/debug-4.1.5"
       sources."@types/events-3.0.0"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-12.6.9"
+      sources."@types/node-12.7.5"
+      sources."@types/restify-4.3.6"
+      sources."@types/semver-5.5.0"
+      sources."@types/xml2js-0.4.3"
       sources."@yarnpkg/lockfile-1.1.0"
       sources."JSONSelect-0.2.1"
       sources."abbrev-1.1.1"
@@ -72548,7 +72665,7 @@ in
       sources."ajv-keywords-1.5.1"
       sources."ajv-merge-patch-4.1.0"
       sources."ansi-align-2.0.0"
-      sources."ansi-escapes-4.2.1"
+      sources."ansi-escapes-3.2.0"
       sources."ansi-regex-2.1.1"
       sources."ansi-styles-3.2.1"
       sources."ansicolors-0.3.2"
@@ -72559,6 +72676,7 @@ in
           sources."async-2.6.3"
           sources."isarray-1.0.0"
           sources."readable-stream-2.3.6"
+          sources."safe-buffer-5.1.2"
           sources."string_decoder-1.1.1"
         ];
       })
@@ -72566,6 +72684,7 @@ in
         dependencies = [
           sources."isarray-1.0.0"
           sources."readable-stream-2.3.6"
+          sources."safe-buffer-5.1.2"
           sources."string_decoder-1.1.1"
         ];
       })
@@ -72624,8 +72743,16 @@ in
       (sources."bl-1.2.2" // {
         dependencies = [
           sources."isarray-1.0.0"
-          sources."readable-stream-2.3.6"
-          sources."string_decoder-1.1.1"
+          (sources."readable-stream-2.3.6" // {
+            dependencies = [
+              sources."safe-buffer-5.1.2"
+            ];
+          })
+          (sources."string_decoder-1.1.1" // {
+            dependencies = [
+              sources."safe-buffer-5.1.2"
+            ];
+          })
         ];
       })
       sources."bluebird-2.9.34"
@@ -72641,7 +72768,7 @@ in
           sources."extend-shallow-2.0.1"
         ];
       })
-      sources."buffer-5.2.1"
+      sources."buffer-5.4.3"
       sources."buffer-alloc-1.2.0"
       sources."buffer-alloc-unsafe-1.1.0"
       sources."buffer-crc32-0.2.13"
@@ -72670,7 +72797,7 @@ in
       sources."chalk-2.4.2"
       sources."chardet-0.7.0"
       sources."cheerio-1.0.0-rc.3"
-      (sources."chokidar-2.1.6" // {
+      (sources."chokidar-2.1.8" // {
         dependencies = [
           sources."fsevents-1.2.9"
           sources."normalize-path-3.0.0"
@@ -72702,6 +72829,7 @@ in
         dependencies = [
           sources."is-fullwidth-code-point-1.0.0"
           sources."string-width-1.0.2"
+          sources."wrap-ansi-2.1.0"
         ];
       })
       sources."clone-1.0.4"
@@ -72722,6 +72850,7 @@ in
         dependencies = [
           sources."isarray-1.0.0"
           sources."readable-stream-2.3.6"
+          sources."safe-buffer-5.1.2"
           sources."string_decoder-1.1.1"
         ];
       })
@@ -72730,6 +72859,7 @@ in
         dependencies = [
           sources."isarray-1.0.0"
           sources."readable-stream-2.3.6"
+          sources."safe-buffer-5.1.2"
           sources."string_decoder-1.1.1"
         ];
       })
@@ -72742,13 +72872,14 @@ in
         dependencies = [
           sources."isarray-1.0.0"
           sources."readable-stream-2.3.6"
+          sources."safe-buffer-5.1.2"
           sources."string_decoder-1.1.1"
         ];
       })
       sources."create-error-class-3.0.2"
       (sources."cross-spawn-6.0.5" // {
         dependencies = [
-          sources."semver-5.7.0"
+          sources."semver-5.7.1"
         ];
       })
       sources."crx-parser-0.1.2"
@@ -72759,7 +72890,7 @@ in
       sources."dashdash-1.14.1"
       (sources."data-uri-to-buffer-2.0.1" // {
         dependencies = [
-          sources."@types/node-8.10.51"
+          sources."@types/node-8.10.54"
         ];
       })
       sources."debounce-1.2.0"
@@ -72771,13 +72902,14 @@ in
       })
       sources."decode-uri-component-0.2.0"
       sources."decompress-response-3.3.0"
-      sources."deep-equal-1.0.1"
+      sources."deep-equal-1.1.0"
       sources."deep-extend-0.6.0"
       sources."deep-is-0.1.3"
       sources."deepcopy-0.6.3"
       sources."deepmerge-3.2.0"
       sources."defaults-1.0.3"
       sources."defer-to-connect-1.0.2"
+      sources."define-properties-1.1.3"
       sources."define-property-2.0.2"
       (sources."degenerator-1.0.4" // {
         dependencies = [
@@ -72799,7 +72931,12 @@ in
       sources."domhandler-2.4.2"
       sources."domutils-1.5.1"
       sources."dot-prop-4.2.0"
-      sources."dtrace-provider-0.8.7"
+      (sources."dotnet-deps-parser-4.5.0" // {
+        dependencies = [
+          sources."xml2js-0.4.19"
+        ];
+      })
+      sources."dtrace-provider-0.8.8"
       sources."duplexer3-0.1.4"
       sources."ecc-jsbn-0.1.2"
       sources."ecdsa-sig-formatter-1.0.11"
@@ -72809,17 +72946,23 @@ in
       sources."end-of-stream-1.4.1"
       sources."entities-1.1.2"
       sources."error-ex-1.3.2"
-      sources."es5-ext-0.10.50"
+      sources."es-abstract-1.14.2"
+      sources."es-to-primitive-1.2.0"
+      sources."es5-ext-0.10.51"
       sources."es6-error-4.1.1"
       sources."es6-iterator-2.0.3"
       sources."es6-map-0.1.5"
       sources."es6-promise-2.3.0"
       sources."es6-promisify-6.0.1"
-      sources."es6-set-0.1.5"
-      sources."es6-symbol-3.1.1"
+      (sources."es6-set-0.1.5" // {
+        dependencies = [
+          sources."es6-symbol-3.1.1"
+        ];
+      })
+      sources."es6-symbol-3.1.2"
       sources."es6-weak-map-2.0.3"
       sources."escape-string-regexp-1.0.5"
-      (sources."escodegen-1.11.1" // {
+      (sources."escodegen-1.12.0" // {
         dependencies = [
           sources."esprima-3.1.3"
         ];
@@ -72830,7 +72973,7 @@ in
           sources."ansi-regex-3.0.0"
           sources."debug-4.1.1"
           sources."ms-2.1.2"
-          sources."semver-5.7.0"
+          sources."semver-5.7.1"
           sources."strip-ansi-4.0.0"
           sources."strip-json-comments-2.0.1"
         ];
@@ -72874,18 +73017,18 @@ in
         ];
       })
       sources."eslint-scope-4.0.3"
-      sources."eslint-utils-1.4.0"
+      sources."eslint-utils-1.4.2"
       sources."eslint-visitor-keys-1.0.0"
       (sources."espree-5.0.1" // {
         dependencies = [
-          sources."acorn-6.2.1"
-          sources."acorn-jsx-5.0.1"
+          sources."acorn-6.3.0"
+          sources."acorn-jsx-5.0.2"
         ];
       })
       sources."esprima-4.0.1"
       sources."esquery-1.0.1"
       sources."esrecurse-4.2.1"
-      sources."estraverse-4.2.0"
+      sources."estraverse-4.3.0"
       sources."esutils-2.0.3"
       sources."event-emitter-0.3.5"
       sources."event-to-promise-0.8.0"
@@ -72928,11 +73071,11 @@ in
       })
       sources."extsprintf-1.3.0"
       sources."fast-deep-equal-2.0.1"
-      sources."fast-json-patch-2.2.0"
+      sources."fast-json-patch-2.2.1"
       sources."fast-json-stable-stringify-2.0.0"
       sources."fast-levenshtein-2.0.6"
       sources."fast-redact-1.5.0"
-      sources."fast-safe-stringify-2.0.6"
+      sources."fast-safe-stringify-2.0.7"
       sources."fd-slicer-1.1.0"
       sources."figures-2.0.0"
       sources."file-entry-cache-5.0.1"
@@ -72968,6 +73111,7 @@ in
           sources."string_decoder-0.10.31"
         ];
       })
+      sources."function-bind-1.1.1"
       sources."functional-red-black-tree-1.0.1"
       (sources."fx-runner-1.0.11" // {
         dependencies = [
@@ -73010,15 +73154,17 @@ in
           sources."get-stream-3.0.0"
         ];
       })
-      sources."graceful-fs-4.2.1"
+      sources."graceful-fs-4.2.2"
       sources."graceful-readlink-1.0.1"
       sources."graphlib-2.1.7"
       sources."growly-1.3.0"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.3"
+      sources."has-1.0.3"
       sources."has-ansi-2.0.0"
       sources."has-color-0.1.7"
       sources."has-flag-3.0.0"
+      sources."has-symbols-1.0.0"
       sources."has-value-1.0.0"
       (sources."has-values-1.0.0" // {
         dependencies = [
@@ -73026,12 +73172,7 @@ in
         ];
       })
       sources."has-yarn-2.1.0"
-      (sources."hosted-git-info-2.8.2" // {
-        dependencies = [
-          sources."lru-cache-5.1.1"
-          sources."yallist-3.0.3"
-        ];
-      })
+      sources."hosted-git-info-2.8.4"
       sources."htmlparser2-3.10.1"
       sources."http-cache-semantics-4.0.3"
       sources."http-errors-1.7.3"
@@ -73057,9 +73198,8 @@ in
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."ini-1.3.5"
-      (sources."inquirer-6.5.0" // {
+      (sources."inquirer-6.5.2" // {
         dependencies = [
-          sources."ansi-escapes-3.2.0"
           sources."ansi-regex-4.1.0"
           sources."strip-ansi-5.2.0"
         ];
@@ -73073,15 +73213,18 @@ in
           sources."kind-of-6.0.2"
         ];
       })
+      sources."is-arguments-1.0.4"
       sources."is-arrayish-0.2.1"
       sources."is-binary-path-1.0.1"
       sources."is-buffer-1.1.6"
+      sources."is-callable-1.1.4"
       sources."is-ci-1.2.1"
       (sources."is-data-descriptor-1.0.0" // {
         dependencies = [
           sources."kind-of-6.0.2"
         ];
       })
+      sources."is-date-object-1.0.1"
       (sources."is-descriptor-1.0.2" // {
         dependencies = [
           sources."kind-of-6.0.2"
@@ -73103,11 +73246,13 @@ in
       sources."is-promise-2.1.0"
       sources."is-property-1.0.2"
       sources."is-redirect-1.0.0"
+      sources."is-regex-1.0.4"
       sources."is-relative-0.1.3"
       sources."is-resolvable-1.1.0"
-      sources."is-retry-allowed-1.1.0"
+      sources."is-retry-allowed-1.2.0"
       sources."is-ssh-1.3.1"
       sources."is-stream-1.1.0"
+      sources."is-symbol-1.0.2"
       sources."is-typedarray-1.0.0"
       sources."is-utf8-0.2.1"
       sources."is-windows-1.0.2"
@@ -73144,6 +73289,7 @@ in
         dependencies = [
           sources."isarray-1.0.0"
           sources."readable-stream-2.3.6"
+          sources."safe-buffer-5.1.2"
           sources."string_decoder-1.1.1"
         ];
       })
@@ -73157,6 +73303,7 @@ in
         dependencies = [
           sources."isarray-1.0.0"
           sources."readable-stream-2.3.6"
+          sources."safe-buffer-5.1.2"
           sources."string_decoder-1.1.1"
         ];
       })
@@ -73263,7 +73410,7 @@ in
       sources."node-forge-0.7.6"
       (sources."node-notifier-5.4.0" // {
         dependencies = [
-          sources."semver-5.7.0"
+          sources."semver-5.7.1"
         ];
       })
       (sources."nomnom-1.8.1" // {
@@ -73293,7 +73440,11 @@ in
         ];
       })
       sources."object-hash-1.3.1"
+      sources."object-inspect-1.6.0"
+      sources."object-is-1.0.1"
+      sources."object-keys-1.1.1"
       sources."object-visit-1.0.1"
+      sources."object.getownpropertydescriptors-2.0.3"
       sources."object.pick-1.3.0"
       sources."once-1.4.0"
       sources."onetime-2.0.1"
@@ -73313,7 +73464,7 @@ in
       sources."p-defer-1.0.0"
       sources."p-finally-1.0.0"
       sources."p-is-promise-2.1.0"
-      sources."p-limit-2.2.0"
+      sources."p-limit-2.2.1"
       sources."p-locate-3.0.0"
       sources."p-try-2.2.0"
       (sources."pac-proxy-agent-3.0.0" // {
@@ -73325,7 +73476,7 @@ in
       sources."pac-resolver-3.0.0"
       (sources."package-json-4.0.1" // {
         dependencies = [
-          sources."semver-5.7.0"
+          sources."semver-5.7.1"
         ];
       })
       sources."pako-1.0.10"
@@ -73373,7 +73524,7 @@ in
       })
       sources."proxy-from-env-1.0.0"
       sources."pseudomap-1.0.2"
-      sources."psl-1.3.0"
+      sources."psl-1.4.0"
       sources."pump-3.0.0"
       sources."punycode-2.1.1"
       sources."qs-6.5.2"
@@ -73389,6 +73540,7 @@ in
         dependencies = [
           sources."isarray-1.0.0"
           sources."readable-stream-2.3.6"
+          sources."safe-buffer-5.1.2"
           sources."string_decoder-1.1.1"
         ];
       })
@@ -73401,6 +73553,7 @@ in
       sources."rechoir-0.6.2"
       sources."regenerator-runtime-0.13.3"
       sources."regex-not-1.0.2"
+      sources."regexp.prototype.flags-1.2.0"
       sources."regexpp-2.0.1"
       sources."registry-auth-token-3.4.0"
       sources."registry-url-3.1.0"
@@ -73425,8 +73578,8 @@ in
       sources."rimraf-2.6.3"
       sources."run-async-2.3.0"
       sources."rx-lite-3.1.2"
-      sources."rxjs-6.5.2"
-      sources."safe-buffer-5.1.2"
+      sources."rxjs-6.5.3"
+      sources."safe-buffer-5.2.0"
       sources."safe-json-stringify-1.2.0"
       sources."safe-regex-1.1.0"
       sources."safer-buffer-2.1.2"
@@ -73435,7 +73588,7 @@ in
       sources."semver-6.1.1"
       (sources."semver-diff-2.1.0" // {
         dependencies = [
-          sources."semver-5.7.0"
+          sources."semver-5.7.1"
         ];
       })
       sources."set-blocking-2.0.0"
@@ -73503,7 +73656,7 @@ in
         ];
       })
       sources."snapdragon-util-3.0.1"
-      (sources."snyk-1.210.0" // {
+      (sources."snyk-1.227.0" // {
         dependencies = [
           sources."ansi-regex-4.1.0"
           sources."debug-3.2.6"
@@ -73518,7 +73671,7 @@ in
           sources."ms-2.1.2"
         ];
       })
-      (sources."snyk-docker-plugin-1.25.1" // {
+      (sources."snyk-docker-plugin-1.29.1" // {
         dependencies = [
           sources."debug-4.1.1"
           sources."ms-2.1.2"
@@ -73532,7 +73685,7 @@ in
           sources."tmp-0.0.33"
         ];
       })
-      (sources."snyk-gradle-plugin-2.12.5" // {
+      (sources."snyk-gradle-plugin-3.0.2" // {
         dependencies = [
           sources."debug-4.1.1"
           sources."ms-2.1.2"
@@ -73545,13 +73698,13 @@ in
           sources."ms-2.1.2"
         ];
       })
-      (sources."snyk-mvn-plugin-2.3.3" // {
+      (sources."snyk-mvn-plugin-2.4.0" // {
         dependencies = [
           sources."tslib-1.9.3"
         ];
       })
       sources."snyk-nodejs-lockfile-parser-1.16.0"
-      (sources."snyk-nuget-plugin-1.11.3" // {
+      (sources."snyk-nuget-plugin-1.12.1" // {
         dependencies = [
           sources."debug-3.2.6"
           sources."ms-2.1.2"
@@ -73569,7 +73722,7 @@ in
           sources."ms-2.1.2"
         ];
       })
-      (sources."snyk-python-plugin-1.10.2" // {
+      (sources."snyk-python-plugin-1.13.2" // {
         dependencies = [
           sources."tmp-0.0.33"
         ];
@@ -73580,14 +73733,15 @@ in
           sources."ms-2.1.2"
         ];
       })
-      (sources."snyk-resolve-deps-4.0.3" // {
+      (sources."snyk-resolve-deps-4.4.0" // {
         dependencies = [
+          sources."@types/node-6.14.7"
           sources."debug-3.2.6"
           sources."ms-2.1.2"
-          sources."semver-5.7.0"
+          sources."semver-5.7.1"
         ];
       })
-      (sources."snyk-sbt-plugin-2.6.1" // {
+      (sources."snyk-sbt-plugin-2.8.0" // {
         dependencies = [
           sources."semver-6.3.0"
         ];
@@ -73607,7 +73761,7 @@ in
           sources."es6-promisify-5.0.0"
         ];
       })
-      sources."sonic-boom-0.7.5"
+      sources."sonic-boom-0.7.6"
       sources."source-map-0.6.1"
       sources."source-map-resolve-0.5.2"
       sources."source-map-support-0.5.12"
@@ -73649,7 +73803,9 @@ in
           sources."strip-ansi-4.0.0"
         ];
       })
-      sources."string_decoder-1.2.0"
+      sources."string.prototype.trimleft-2.1.0"
+      sources."string.prototype.trimright-2.1.0"
+      sources."string_decoder-1.3.0"
       sources."strip-ansi-3.0.1"
       sources."strip-bom-3.0.0"
       sources."strip-bom-buf-2.0.0"
@@ -73657,7 +73813,7 @@ in
       sources."strip-eof-1.0.0"
       sources."strip-json-comments-3.0.1"
       sources."supports-color-5.5.0"
-      (sources."table-5.4.5" // {
+      (sources."table-5.4.6" // {
         dependencies = [
           sources."ajv-6.10.2"
           sources."ansi-regex-4.1.0"
@@ -73669,6 +73825,7 @@ in
         dependencies = [
           sources."isarray-1.0.0"
           sources."readable-stream-2.3.6"
+          sources."safe-buffer-5.1.2"
           sources."string_decoder-1.1.1"
         ];
       })
@@ -73710,7 +73867,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."type-1.0.3"
       sources."type-check-0.3.2"
-      sources."type-fest-0.5.2"
+      sources."type-fest-0.3.1"
       sources."typedarray-0.0.6"
       sources."underscore-1.6.0"
       sources."union-value-1.0.1"
@@ -73749,7 +73906,6 @@ in
           sources."semver-6.3.0"
           sources."string-width-3.1.0"
           sources."strip-ansi-5.2.0"
-          sources."type-fest-0.3.1"
           sources."url-parse-lax-3.0.0"
         ];
       })
@@ -73759,7 +73915,8 @@ in
       sources."use-3.1.1"
       sources."user-home-2.0.0"
       sources."util-deprecate-1.0.2"
-      sources."uuid-3.3.2"
+      sources."util.promisify-1.0.0"
+      sources."uuid-3.3.3"
       sources."verror-1.10.0"
       sources."vscode-languageserver-types-3.14.0"
       sources."watchpack-1.6.0"
@@ -73774,17 +73931,22 @@ in
       sources."windows-release-3.2.0"
       sources."winreg-0.0.12"
       sources."wordwrap-1.0.0"
-      (sources."wrap-ansi-2.1.0" // {
+      (sources."wrap-ansi-5.1.0" // {
         dependencies = [
-          sources."is-fullwidth-code-point-1.0.0"
-          sources."string-width-1.0.2"
+          sources."ansi-regex-4.1.0"
+          sources."string-width-3.1.0"
+          sources."strip-ansi-5.2.0"
         ];
       })
       sources."wrappy-1.0.2"
       sources."write-1.0.3"
       sources."write-file-atomic-2.4.3"
       sources."xdg-basedir-3.0.0"
-      sources."xml2js-0.4.19"
+      (sources."xml2js-0.4.22" // {
+        dependencies = [
+          sources."xmlbuilder-11.0.1"
+        ];
+      })
       sources."xmlbuilder-9.0.7"
       sources."xregexp-2.0.0"
       sources."xtend-4.0.2"
@@ -73796,7 +73958,6 @@ in
           sources."cliui-5.0.0"
           sources."string-width-3.1.0"
           sources."strip-ansi-5.2.0"
-          sources."wrap-ansi-5.1.0"
           sources."y18n-4.0.0"
         ];
       })
@@ -73816,6 +73977,7 @@ in
         dependencies = [
           sources."isarray-1.0.0"
           sources."readable-stream-2.3.6"
+          sources."safe-buffer-5.1.2"
           sources."string_decoder-1.1.1"
         ];
       })
@@ -73828,14 +73990,15 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   webpack = nodeEnv.buildNodePackage {
     name = "webpack";
     packageName = "webpack";
-    version = "4.39.1";
+    version = "4.40.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webpack/-/webpack-4.39.1.tgz";
-      sha512 = "/LAb2TJ2z+eVwisldp3dqTEoNhzp/TLCZlmZm3GGGAlnfIWDgOEE758j/9atklNLfRyhKbZTCOIoPqLJXeBLbQ==";
+      url = "https://registry.npmjs.org/webpack/-/webpack-4.40.2.tgz";
+      sha512 = "5nIvteTDCUws2DVvP9Qe+JPla7kWPPIDFZv55To7IycHWZ+Z5qBdaBYPyuXWdhggTufZkQwfIK+5rKQTVovm2A==";
     };
     dependencies = [
       sources."@webassemblyjs/ast-1.8.5"
@@ -73858,7 +74021,7 @@ in
       sources."@webassemblyjs/wast-printer-1.8.5"
       sources."@xtuc/ieee754-1.2.0"
       sources."@xtuc/long-4.2.2"
-      sources."acorn-6.2.1"
+      sources."acorn-6.3.0"
       sources."ajv-6.10.2"
       sources."ajv-errors-1.0.1"
       sources."ajv-keywords-3.4.1"
@@ -73910,9 +74073,9 @@ in
       sources."buffer-from-1.1.1"
       sources."buffer-xor-1.0.3"
       sources."builtin-status-codes-3.0.0"
-      sources."cacache-12.0.2"
+      sources."cacache-12.0.3"
       sources."cache-base-1.0.1"
-      sources."chokidar-2.1.6"
+      sources."chokidar-2.1.8"
       sources."chownr-1.1.2"
       sources."chrome-trace-event-1.0.2"
       sources."cipher-base-1.0.4"
@@ -73948,7 +74111,7 @@ in
       sources."create-hash-1.2.0"
       sources."create-hmac-1.1.7"
       sources."crypto-browserify-3.12.0"
-      sources."cyclist-0.2.2"
+      sources."cyclist-1.0.1"
       sources."date-now-0.1.4"
       sources."debug-2.6.9"
       sources."decode-uri-component-0.2.0"
@@ -73957,14 +74120,14 @@ in
       sources."diffie-hellman-5.0.3"
       sources."domain-browser-1.2.0"
       sources."duplexify-3.7.1"
-      sources."elliptic-6.5.0"
+      sources."elliptic-6.5.1"
       sources."emojis-list-2.1.0"
       sources."end-of-stream-1.4.1"
       sources."enhanced-resolve-4.1.0"
       sources."errno-0.1.7"
       sources."eslint-scope-4.0.3"
       sources."esrecurse-4.2.1"
-      sources."estraverse-4.2.0"
+      sources."estraverse-4.3.0"
       sources."events-3.0.0"
       sources."evp_bytestokey-1.0.3"
       (sources."expand-brackets-2.1.4" // {
@@ -74020,7 +74183,7 @@ in
           sources."is-glob-3.1.0"
         ];
       })
-      sources."graceful-fs-4.2.1"
+      sources."graceful-fs-4.2.2"
       sources."has-value-1.0.0"
       (sources."has-values-1.0.0" // {
         dependencies = [
@@ -74115,11 +74278,11 @@ in
       sources."object.pick-1.3.0"
       sources."once-1.4.0"
       sources."os-browserify-0.3.0"
-      sources."p-limit-2.2.0"
+      sources."p-limit-2.2.1"
       sources."p-locate-3.0.0"
       sources."p-try-2.2.0"
       sources."pako-1.0.10"
-      sources."parallel-transform-1.1.0"
+      sources."parallel-transform-1.2.0"
       sources."parse-asn1-5.1.4"
       sources."pascalcase-0.1.1"
       sources."path-browserify-0.0.1"
@@ -74154,14 +74317,14 @@ in
       sources."repeat-string-1.6.1"
       sources."resolve-url-0.2.1"
       sources."ret-0.1.15"
-      sources."rimraf-2.6.3"
+      sources."rimraf-2.7.1"
       sources."ripemd160-2.0.2"
       sources."run-queue-1.0.3"
       sources."safe-buffer-5.1.2"
       sources."safe-regex-1.1.0"
       sources."schema-utils-1.0.0"
-      sources."semver-5.7.0"
-      sources."serialize-javascript-1.7.0"
+      sources."semver-5.7.1"
+      sources."serialize-javascript-1.9.1"
       (sources."set-value-2.0.1" // {
         dependencies = [
           sources."extend-shallow-2.0.1"
@@ -74231,7 +74394,7 @@ in
       sources."stream-shift-1.0.0"
       sources."string_decoder-1.1.1"
       sources."tapable-1.1.3"
-      (sources."terser-4.1.3" // {
+      (sources."terser-4.3.1" // {
         dependencies = [
           sources."source-map-0.6.1"
         ];
@@ -74242,7 +74405,7 @@ in
         ];
       })
       sources."through2-2.0.5"
-      sources."timers-browserify-2.0.10"
+      sources."timers-browserify-2.0.11"
       sources."to-arraybuffer-1.0.1"
       (sources."to-object-path-0.3.0" // {
         dependencies = [
@@ -74267,7 +74430,7 @@ in
           sources."has-values-0.1.4"
         ];
       })
-      sources."upath-1.1.2"
+      sources."upath-1.2.0"
       sources."uri-js-4.2.2"
       sources."urix-0.1.0"
       (sources."url-0.11.0" // {
@@ -74303,14 +74466,15 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   webpack-cli = nodeEnv.buildNodePackage {
     name = "webpack-cli";
     packageName = "webpack-cli";
-    version = "3.3.6";
+    version = "3.3.8";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.6.tgz";
-      sha512 = "0vEa83M7kJtxK/jUhlpZ27WHIOndz5mghWL2O53kiDoA9DIxSKnfqB92LoqEn77cT4f3H2cZm1BMEat/6AZz3A==";
+      url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.8.tgz";
+      sha512 = "RANYSXwikSWINjHMd/mtesblNSpjpDLoYTBtP99n1RhXqVI/wxN40Auqy42I7y4xrbmRBoA5Zy5E0JSBD5XRhw==";
     };
     dependencies = [
       sources."ansi-regex-4.1.0"
@@ -74424,7 +74588,7 @@ in
         ];
       })
       sources."global-prefix-1.0.2"
-      sources."graceful-fs-4.2.1"
+      sources."graceful-fs-4.2.2"
       sources."has-flag-3.0.0"
       sources."has-value-1.0.0"
       (sources."has-values-1.0.0" // {
@@ -74499,7 +74663,7 @@ in
       sources."p-defer-1.0.0"
       sources."p-finally-1.0.0"
       sources."p-is-promise-2.1.0"
-      sources."p-limit-2.2.0"
+      sources."p-limit-2.2.1"
       sources."p-locate-3.0.0"
       sources."p-try-2.2.0"
       sources."parse-passwd-1.0.0"
@@ -74528,7 +74692,7 @@ in
       sources."ret-0.1.15"
       sources."safe-buffer-5.1.2"
       sources."safe-regex-1.1.0"
-      sources."semver-5.7.0"
+      sources."semver-5.7.1"
       sources."set-blocking-2.0.0"
       (sources."set-value-2.0.1" // {
         dependencies = [
@@ -74631,38 +74795,50 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   webtorrent-cli = nodeEnv.buildNodePackage {
     name = "webtorrent-cli";
     packageName = "webtorrent-cli";
-    version = "3.0.0";
+    version = "3.0.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-3.0.0.tgz";
-      sha512 = "ktehmMXkJbM1gnlPxiiVbTYq0rQHLs+U/A/3pXNt0vIYjHgzsydooejwHZlmL7vxdfZAaSHilbkBDRgWW071rA==";
+      url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-3.0.4.tgz";
+      sha512 = "aIxXrSAtLmENSEfQlg5xs+wV/nRp+wtckilxxpFp22k428L0DHn6jGRBWEDJ99D1lzmm9UD5NvGe2MpbsDOLOg==";
     };
     dependencies = [
+      sources."@protobufjs/aspromise-1.1.2"
+      sources."@protobufjs/base64-1.1.2"
+      sources."@protobufjs/codegen-2.0.4"
+      sources."@protobufjs/eventemitter-1.1.0"
+      sources."@protobufjs/fetch-1.1.0"
+      sources."@protobufjs/float-1.0.2"
+      sources."@protobufjs/inquire-1.1.0"
+      sources."@protobufjs/path-1.1.2"
+      sources."@protobufjs/pool-1.1.0"
+      sources."@protobufjs/utf8-1.1.0"
+      sources."@types/long-4.0.0"
+      sources."@types/node-10.14.18"
       sources."addr-to-ip-port-1.5.1"
       sources."airplay-js-0.3.0"
-      sources."ascli-0.3.0"
       sources."async-limiter-1.0.1"
       sources."balanced-match-1.0.0"
       sources."bencode-2.0.1"
       sources."binary-search-1.3.6"
       sources."bitfield-3.0.0"
-      (sources."bittorrent-dht-9.0.1" // {
+      (sources."bittorrent-dht-9.0.3" // {
         dependencies = [
           sources."debug-4.1.1"
           sources."ms-2.1.2"
         ];
       })
-      sources."bittorrent-peerid-1.3.0"
-      (sources."bittorrent-protocol-3.1.0" // {
+      sources."bittorrent-peerid-1.3.2"
+      (sources."bittorrent-protocol-3.1.1" // {
         dependencies = [
           sources."debug-4.1.1"
           sources."ms-2.1.2"
         ];
       })
-      (sources."bittorrent-tracker-9.12.1" // {
+      (sources."bittorrent-tracker-9.14.4" // {
         dependencies = [
           sources."debug-4.1.1"
           sources."ms-2.1.2"
@@ -74676,16 +74852,21 @@ in
       sources."browserify-package-json-1.0.1"
       sources."buffer-alloc-1.2.0"
       sources."buffer-alloc-unsafe-1.1.0"
-      sources."buffer-equals-1.0.4"
       sources."buffer-fill-1.0.0"
       sources."buffer-from-1.1.1"
       sources."buffer-indexof-1.1.1"
       sources."bufferutil-4.0.1"
-      sources."bufferview-1.0.1"
-      sources."bytebuffer-3.5.5"
-      sources."castv2-0.1.9"
+      (sources."castv2-0.1.10" // {
+        dependencies = [
+          sources."debug-4.1.1"
+          sources."ms-2.1.2"
+        ];
+      })
       sources."castv2-client-1.2.0"
       sources."charset-1.0.1"
+      sources."chrome-dgram-3.0.3"
+      sources."chrome-dns-1.0.1"
+      sources."chrome-net-3.3.3"
       (sources."chromecasts-1.9.1" // {
         dependencies = [
           sources."mime-1.6.0"
@@ -74693,8 +74874,6 @@ in
       })
       sources."chunk-store-stream-4.1.0"
       sources."clivas-0.2.0"
-      sources."closest-to-2.0.0"
-      sources."colour-0.7.1"
       sources."common-tags-1.8.0"
       sources."compact2string-1.4.1"
       sources."concat-map-0.0.1"
@@ -74706,9 +74885,10 @@ in
         ];
       })
       sources."core-util-is-1.0.2"
-      sources."create-torrent-4.2.1"
+      sources."create-torrent-4.4.1"
       sources."debug-2.6.9"
       sources."decompress-response-3.3.0"
+      sources."define-properties-1.1.3"
       (sources."dlnacasts-0.1.0" // {
         dependencies = [
           sources."mime-1.6.0"
@@ -74720,44 +74900,53 @@ in
       sources."ee-first-1.1.1"
       sources."elementtree-0.1.7"
       sources."end-of-stream-1.4.1"
+      sources."es-abstract-1.14.2"
+      sources."es-to-primitive-1.2.0"
+      sources."escape-html-1.0.3"
       sources."executable-4.1.1"
       sources."filestream-5.0.0"
-      (sources."fs-chunk-store-1.7.0" // {
+      sources."freelist-1.0.3"
+      (sources."fs-chunk-store-2.0.1" // {
         dependencies = [
           sources."thunky-1.0.3"
         ];
       })
       sources."fs.realpath-1.0.0"
+      sources."function-bind-1.1.1"
       sources."get-browser-rtc-1.0.2"
       sources."get-stdin-7.0.0"
       sources."glob-7.1.4"
+      sources."has-1.0.3"
+      sources."has-symbols-1.0.0"
       sources."he-1.2.0"
-      sources."immediate-chunk-store-2.0.0"
+      sources."http-node-git://github.com/feross/http-node#webtorrent"
+      sources."http-parser-js-0.4.13"
+      sources."immediate-chunk-store-2.1.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."ip-1.1.5"
       sources."ip-set-1.0.2"
       sources."ipaddr.js-1.9.1"
       sources."is-ascii-1.0.0"
+      sources."is-callable-1.1.4"
+      sources."is-date-object-1.0.1"
       sources."is-file-1.0.0"
+      sources."is-regex-1.0.4"
+      sources."is-symbol-1.0.2"
       sources."is-typedarray-1.0.0"
       sources."is-wsl-1.1.0"
       sources."isarray-1.0.0"
       sources."junk-3.1.0"
       sources."k-bucket-5.0.0"
-      (sources."k-rpc-5.0.0" // {
-        dependencies = [
-          sources."k-bucket-4.0.1"
-        ];
-      })
-      sources."k-rpc-socket-1.8.0"
+      sources."k-rpc-5.1.0"
+      sources."k-rpc-socket-1.11.1"
       sources."last-one-wins-1.0.4"
       (sources."load-ip-set-2.1.0" // {
         dependencies = [
           sources."simple-get-3.0.3"
         ];
       })
-      sources."long-2.4.0"
+      sources."long-4.0.0"
       sources."lru-3.1.0"
       sources."magnet-uri-5.2.4"
       sources."mdns-js-0.5.0"
@@ -74774,34 +74963,36 @@ in
         ];
       })
       sources."moment-2.24.0"
-      sources."mp4-box-encoding-1.3.0"
-      sources."mp4-stream-3.0.0"
+      sources."mp4-box-encoding-1.4.1"
+      sources."mp4-stream-3.1.0"
       sources."ms-2.0.0"
       (sources."multicast-dns-6.2.3" // {
         dependencies = [
           sources."thunky-1.0.3"
         ];
       })
-      sources."multistream-3.1.0"
+      sources."multistream-4.0.0"
       sources."netmask-1.0.6"
       sources."network-address-1.1.2"
       sources."next-event-1.0.0"
       sources."node-gyp-build-3.7.0"
       sources."node-ssdp-2.9.1"
       sources."nodebmc-0.0.7"
+      sources."object-inspect-1.6.0"
+      sources."object-keys-1.1.1"
+      sources."object.getownpropertydescriptors-2.0.3"
       sources."on-finished-2.3.0"
       sources."once-1.4.0"
       sources."open-6.4.0"
-      sources."optjs-3.2.2"
       sources."package-json-versionify-1.0.4"
       sources."parse-numeric-range-0.0.2"
-      (sources."parse-torrent-7.0.0" // {
+      (sources."parse-torrent-7.0.1" // {
         dependencies = [
           sources."simple-get-3.0.3"
         ];
       })
       sources."path-is-absolute-1.0.1"
-      sources."piece-length-1.0.0"
+      sources."piece-length-2.0.1"
       sources."pify-2.3.0"
       (sources."plist-with-patches-0.5.1" // {
         dependencies = [
@@ -74810,9 +75001,10 @@ in
       })
       sources."prettier-bytes-1.0.4"
       sources."process-nextick-args-2.0.1"
-      sources."protobufjs-3.8.2"
+      sources."protobufjs-6.8.8"
       sources."pump-3.0.0"
       sources."qap-3.3.1"
+      sources."queue-microtask-1.1.2"
       sources."random-access-file-2.1.3"
       sources."random-access-storage-1.4.0"
       sources."random-iterate-1.0.1"
@@ -74821,13 +75013,13 @@ in
       sources."range-slice-stream-2.0.0"
       sources."readable-stream-3.4.0"
       sources."record-cache-1.1.0"
-      (sources."render-media-3.3.0" // {
+      (sources."render-media-3.4.0" // {
         dependencies = [
           sources."debug-4.1.1"
           sources."ms-2.1.2"
         ];
       })
-      sources."rimraf-2.6.3"
+      sources."rimraf-3.0.0"
       sources."run-parallel-1.1.9"
       sources."run-parallel-limit-1.0.5"
       sources."run-series-1.1.8"
@@ -74843,8 +75035,8 @@ in
           sources."ms-2.1.2"
         ];
       })
-      sources."simple-sha1-2.1.2"
-      (sources."simple-websocket-8.0.0" // {
+      sources."simple-sha1-3.0.1"
+      (sources."simple-websocket-8.0.1" // {
         dependencies = [
           sources."debug-4.1.1"
           sources."ms-2.1.2"
@@ -74853,23 +75045,17 @@ in
       sources."speedometer-1.1.0"
       sources."split-1.0.1"
       sources."stream-to-blob-2.0.0"
-      (sources."stream-to-blob-url-2.1.2" // {
-        dependencies = [
-          sources."stream-to-blob-1.0.2"
-        ];
-      })
+      sources."stream-to-blob-url-3.0.0"
       sources."stream-with-known-length-to-buffer-1.0.3"
+      sources."string.prototype.trimleft-2.1.0"
+      sources."string.prototype.trimright-2.1.0"
       sources."string2compact-1.3.0"
-      (sources."string_decoder-1.2.0" // {
-        dependencies = [
-          sources."safe-buffer-5.1.2"
-        ];
-      })
+      sources."string_decoder-1.3.0"
       sources."thirty-two-1.0.2"
       sources."through-2.3.8"
       sources."thunky-0.1.0"
       sources."to-arraybuffer-1.0.1"
-      (sources."torrent-discovery-9.1.2" // {
+      (sources."torrent-discovery-9.2.1" // {
         dependencies = [
           sources."debug-4.1.1"
           sources."ms-2.1.2"
@@ -74884,18 +75070,19 @@ in
       sources."upnp-device-client-1.0.2"
       sources."upnp-mediarenderer-client-1.2.4"
       sources."url-join-4.0.1"
-      (sources."ut_metadata-3.4.0" // {
+      (sources."ut_metadata-3.5.0" // {
         dependencies = [
           sources."debug-4.1.1"
           sources."ms-2.1.2"
         ];
       })
-      sources."ut_pex-1.2.1"
+      sources."ut_pex-2.0.0"
       sources."utf-8-validate-5.0.2"
       sources."util-deprecate-1.0.2"
+      sources."util.promisify-1.0.0"
       sources."videostream-3.2.1"
-      sources."vlc-command-1.1.2"
-      (sources."webtorrent-0.106.0" // {
+      sources."vlc-command-1.2.0"
+      (sources."webtorrent-0.107.16" // {
         dependencies = [
           sources."debug-4.1.1"
           sources."ms-2.1.2"
@@ -74904,9 +75091,9 @@ in
       })
       sources."winreg-1.2.4"
       sources."wrappy-1.0.2"
-      sources."ws-7.1.1"
-      sources."xml2js-0.4.19"
-      sources."xmlbuilder-9.0.7"
+      sources."ws-7.1.2"
+      sources."xml2js-0.4.22"
+      sources."xmlbuilder-11.0.1"
       sources."xmldom-0.1.27"
     ];
     buildInputs = globalBuildInputs;
@@ -74917,6 +75104,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   wring = nodeEnv.buildNodePackage {
     name = "wring";
@@ -74934,14 +75122,15 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   write-good = nodeEnv.buildNodePackage {
     name = "write-good";
     packageName = "write-good";
-    version = "1.0.1";
+    version = "1.0.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/write-good/-/write-good-1.0.1.tgz";
-      sha512 = "wSmjZBTHMOexWmK3AmSORGlWAICD98BF0LORYjkK58tChjjMr/BltpvohCThxmIE2vcHYccXHzSVBd/v8ew71g==";
+      url = "https://registry.npmjs.org/write-good/-/write-good-1.0.2.tgz";
+      sha512 = "1gm9Ouz7mBROF7aC8vvSm/3JtPfTiZ+fegPGCKdxsYhf6VYeStHfVFx2Hnj2kJviHPx5zZkiQ8DytzZMP0Zqwg==";
     };
     dependencies = [
       sources."adverb-where-0.2.1"
@@ -74960,6 +75149,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   yarn = nodeEnv.buildNodePackage {
     name = "yarn";
@@ -74977,6 +75167,7 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
   yo = nodeEnv.buildNodePackage {
     name = "yo";
@@ -75093,7 +75284,7 @@ in
       sources."config-chain-1.1.12"
       sources."configstore-3.1.2"
       sources."copy-descriptor-0.1.1"
-      sources."core-js-3.1.4"
+      sources."core-js-3.2.1"
       sources."core-util-is-1.0.2"
       sources."create-error-class-3.0.2"
       sources."cross-spawn-6.0.5"
@@ -75107,9 +75298,11 @@ in
       sources."decompress-response-3.3.0"
       sources."deep-extend-0.6.0"
       sources."default-uid-1.0.0"
+      sources."define-properties-1.1.3"
       sources."define-property-2.0.2"
       sources."delayed-stream-1.0.0"
       sources."delegates-1.0.0"
+      sources."detect-node-2.0.4"
       sources."diff-3.5.0"
       (sources."dir-glob-2.0.0" // {
         dependencies = [
@@ -75187,6 +75380,7 @@ in
       sources."from2-2.3.0"
       sources."fs.realpath-1.0.0"
       sources."fullname-3.3.0"
+      sources."function-bind-1.1.1"
       sources."gauge-1.2.7"
       sources."get-stdin-4.0.1"
       sources."get-stream-3.0.0"
@@ -75199,16 +75393,17 @@ in
         ];
       })
       sources."glob-to-regexp-0.3.0"
-      (sources."global-agent-2.0.1" // {
+      (sources."global-agent-2.1.0" // {
         dependencies = [
           sources."semver-6.3.0"
         ];
       })
       sources."global-dirs-0.1.1"
       sources."global-tunnel-ng-2.7.1"
+      sources."globalthis-1.0.0"
       sources."globby-8.0.2"
       sources."got-8.3.2"
-      sources."graceful-fs-4.2.1"
+      sources."graceful-fs-4.2.2"
       sources."grouped-queue-0.3.3"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.3"
@@ -75227,12 +75422,7 @@ in
           sources."kind-of-4.0.0"
         ];
       })
-      (sources."hosted-git-info-2.8.2" // {
-        dependencies = [
-          sources."lru-cache-5.1.1"
-          sources."yallist-3.0.3"
-        ];
-      })
+      sources."hosted-git-info-2.8.4"
       sources."http-cache-semantics-3.8.1"
       sources."http-signature-1.2.0"
       sources."humanize-string-1.0.2"
@@ -75244,7 +75434,7 @@ in
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."ini-1.3.5"
-      sources."inquirer-6.5.0"
+      sources."inquirer-6.5.2"
       sources."insight-0.10.3"
       sources."into-stream-3.1.0"
       sources."ip-regex-2.1.0"
@@ -75275,7 +75465,7 @@ in
       sources."is-promise-2.1.0"
       sources."is-redirect-1.0.0"
       sources."is-regexp-1.0.0"
-      sources."is-retry-allowed-1.1.0"
+      sources."is-retry-allowed-1.2.0"
       sources."is-root-1.0.0"
       sources."is-scoped-1.0.0"
       sources."is-stream-1.1.0"
@@ -75341,7 +75531,7 @@ in
           sources."read-pkg-up-1.0.1"
         ];
       })
-      sources."merge2-1.2.4"
+      sources."merge2-1.3.0"
       sources."micromatch-3.1.10"
       sources."mime-db-1.40.0"
       sources."mime-types-2.1.24"
@@ -75393,6 +75583,7 @@ in
           sources."kind-of-3.2.2"
         ];
       })
+      sources."object-keys-1.1.1"
       sources."object-visit-1.0.1"
       sources."object.pick-1.3.0"
       sources."once-1.4.0"
@@ -75445,7 +75636,7 @@ in
       sources."process-nextick-args-2.0.1"
       sources."proto-list-1.2.4"
       sources."pseudomap-1.0.2"
-      sources."psl-1.3.0"
+      sources."psl-1.4.0"
       sources."pump-3.0.0"
       sources."punycode-2.1.1"
       sources."qs-6.5.2"
@@ -75457,7 +75648,7 @@ in
           sources."find-up-3.0.0"
           sources."load-json-file-4.0.0"
           sources."locate-path-3.0.0"
-          sources."p-limit-2.2.0"
+          sources."p-limit-2.2.1"
           sources."p-locate-3.0.0"
           sources."p-try-2.2.0"
           sources."parse-json-4.0.0"
@@ -75494,16 +75685,16 @@ in
       sources."responselike-1.0.2"
       sources."restore-cursor-2.0.0"
       sources."ret-0.1.15"
-      sources."roarr-2.13.3"
+      sources."roarr-2.14.1"
       sources."root-check-1.0.0"
       sources."run-async-2.3.0"
       sources."rx-4.1.0"
-      sources."rxjs-6.5.2"
+      sources."rxjs-6.5.3"
       sources."safe-buffer-5.2.0"
       sources."safe-regex-1.1.0"
       sources."safer-buffer-2.1.2"
       sources."scoped-regex-1.0.0"
-      sources."semver-5.7.0"
+      sources."semver-5.7.1"
       sources."semver-compare-1.0.0"
       sources."semver-diff-2.1.0"
       sources."semver-regex-1.0.0"
@@ -75683,7 +75874,7 @@ in
       sources."use-3.1.1"
       sources."user-home-2.0.0"
       sources."util-deprecate-1.0.2"
-      sources."uuid-3.3.2"
+      sources."uuid-3.3.3"
       sources."validate-npm-package-license-3.0.4"
       sources."verror-1.10.0"
       sources."vinyl-1.2.0"
@@ -75749,5 +75940,6 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
 }
\ No newline at end of file
diff --git a/pkgs/development/node-packages/node-packages-v12.nix b/pkgs/development/node-packages/node-packages-v12.nix
index a4a765d70ed..63b388f88eb 100644
--- a/pkgs/development/node-packages/node-packages-v12.nix
+++ b/pkgs/development/node-packages/node-packages-v12.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.6.0. Do not edit!
+# This file has been generated by node2nix 1.7.0. Do not edit!
 
 {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
@@ -643,13 +643,13 @@ let
         sha1 = "f46f0c75b7841f8d200b3348cd4d691d5a099d15";
       };
     };
-    "fs-minipass-1.2.6" = {
+    "fs-minipass-1.2.7" = {
       name = "fs-minipass";
       packageName = "fs-minipass";
-      version = "1.2.6";
+      version = "1.2.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.6.tgz";
-        sha512 = "crhvyXcMejjv3Z5d2Fa9sf5xLYVCF5O1c71QxbVnbLsmYMBEvDAftewesN/HhY03YRoA7zOMxjNGrF5svGaaeQ==";
+        url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz";
+        sha512 = "GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==";
       };
     };
     "fs.extra-1.3.2" = {
@@ -724,13 +724,13 @@ let
         sha1 = "dbf743c6c14992593c655568cb66ed32c0122ebe";
       };
     };
-    "graceful-fs-4.2.1" = {
+    "graceful-fs-4.2.2" = {
       name = "graceful-fs";
       packageName = "graceful-fs";
-      version = "4.2.1";
+      version = "4.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.1.tgz";
-        sha512 = "b9usnbDGnD928gJB3LrCmxoibr3VE4U2SMo5PBuBnokWyDADTqDPXg4YpwKF1trpH+UbGp7QLicO3+aWEy0+mw==";
+        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz";
+        sha512 = "IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==";
       };
     };
     "grunt-known-options-1.1.1" = {
@@ -814,13 +814,13 @@ let
         sha512 = "eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==";
       };
     };
-    "hosted-git-info-2.8.2" = {
+    "hosted-git-info-2.8.4" = {
       name = "hosted-git-info";
       packageName = "hosted-git-info";
-      version = "2.8.2";
+      version = "2.8.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.2.tgz";
-        sha512 = "CyjlXII6LMsPMyUzxpTt8fzh5QwzGqPmQXgY/Jyf4Zfp27t/FvfhwoE/8laaMUcMy816CkWF20I7NeQhwwY88w==";
+        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.4.tgz";
+        sha512 = "pzXIvANXEFrc5oFFXRMkbLPQ2rXRoDERwDLyrcUxGhaZhgP54BBSl9Oheh7Vv0T090cszWBxPjkQQ5Sq1PbBRQ==";
       };
     };
     "http-signature-1.2.0" = {
@@ -1183,15 +1183,6 @@ let
         sha1 = "2009291bb31cea861bbf10a7c15a28caf75c31ec";
       };
     };
-    "lru-cache-5.1.1" = {
-      name = "lru-cache";
-      packageName = "lru-cache";
-      version = "5.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz";
-        sha512 = "KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==";
-      };
-    };
     "make-iterator-1.0.1" = {
       name = "make-iterator";
       packageName = "make-iterator";
@@ -1264,22 +1255,22 @@ let
         sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
       };
     };
-    "minipass-2.3.5" = {
+    "minipass-2.6.2" = {
       name = "minipass";
       packageName = "minipass";
-      version = "2.3.5";
+      version = "2.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz";
-        sha512 = "Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==";
+        url = "https://registry.npmjs.org/minipass/-/minipass-2.6.2.tgz";
+        sha512 = "38Jwdc8AttUDaQAIRX8Iaw3QoCDWjAwKMGeGDF9JUi9QCPMjH5qAQg/hdO8o1nC7Nmh1/CqzMg5FQPEKuKwznQ==";
       };
     };
-    "minizlib-1.2.1" = {
+    "minizlib-1.2.2" = {
       name = "minizlib";
       packageName = "minizlib";
-      version = "1.2.1";
+      version = "1.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz";
-        sha512 = "7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==";
+        url = "https://registry.npmjs.org/minizlib/-/minizlib-1.2.2.tgz";
+        sha512 = "hR3At21uSrsjjDTWrbu0IMLTpnkpv8IIMFDFaoz43Tmu4LkmAXfH44vNNzpTnf+OAQQCHrb91y/wc2J4x5XgSQ==";
       };
     };
     "mixin-deep-1.3.2" = {
@@ -1372,13 +1363,13 @@ let
         sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==";
       };
     };
-    "npm-package-arg-6.1.0" = {
+    "npm-package-arg-6.1.1" = {
       name = "npm-package-arg";
       packageName = "npm-package-arg";
-      version = "6.1.0";
+      version = "6.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.0.tgz";
-        sha512 = "zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA==";
+        url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.1.tgz";
+        sha512 = "qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==";
       };
     };
     "npm-registry-client-8.6.0" = {
@@ -1633,13 +1624,13 @@ let
         sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849";
       };
     };
-    "psl-1.3.0" = {
+    "psl-1.4.0" = {
       name = "psl";
       packageName = "psl";
-      version = "1.3.0";
+      version = "1.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/psl/-/psl-1.3.0.tgz";
-        sha512 = "avHdspHO+9rQTLbv1RO+MPYeP/SzsCoxofjVnHanETfQhTJrmB0HlDoW+EiN/R+C0BZ+gERab9NY0lPN2TxNag==";
+        url = "https://registry.npmjs.org/psl/-/psl-1.4.0.tgz";
+        sha512 = "HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw==";
       };
     };
     "punycode-1.4.1" = {
@@ -1831,13 +1822,13 @@ let
         sha1 = "300bc6e0e86374f7ba61068b5b1ecd57fc6532da";
       };
     };
-    "semver-5.7.0" = {
+    "semver-5.7.1" = {
       name = "semver";
       packageName = "semver";
-      version = "5.7.0";
+      version = "5.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz";
-        sha512 = "Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==";
+        url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz";
+        sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==";
       };
     };
     "semver-6.1.3" = {
@@ -2200,13 +2191,13 @@ let
         sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf";
       };
     };
-    "uuid-3.3.2" = {
+    "uuid-3.3.3" = {
       name = "uuid";
       packageName = "uuid";
-      version = "3.3.2";
+      version = "3.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz";
-        sha512 = "yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==";
+        url = "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz";
+        sha512 = "pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==";
       };
     };
     "v8flags-3.1.3" = {
@@ -2312,7 +2303,8 @@ in
       license = "MIT";
     };
     production = true;
-    bypassCache = false;
+    bypassCache = true;
+    reconstructLock = true;
   };
   coffee-script = nodeEnv.buildNodePackage {
     name = "coffee-script";
@@ -2329,7 +2321,8 @@ in
       license = "MIT";
     };
     production = true;
-    bypassCache = false;
+    bypassCache = true;
+    reconstructLock = true;
   };
   grunt-cli = nodeEnv.buildNodePackage {
     name = "grunt-cli";
@@ -2594,7 +2587,8 @@ in
       license = "MIT";
     };
     production = true;
-    bypassCache = false;
+    bypassCache = true;
+    reconstructLock = true;
   };
   node2nix = nodeEnv.buildNodePackage {
     name = "node2nix";
@@ -2648,7 +2642,7 @@ in
           sources."rimraf-2.2.8"
         ];
       })
-      sources."fs-minipass-1.2.6"
+      sources."fs-minipass-1.2.7"
       (sources."fs.extra-1.3.2" // {
         dependencies = [
           sources."mkdirp-0.3.5"
@@ -2658,11 +2652,11 @@ in
       sources."gauge-2.7.4"
       sources."getpass-0.1.7"
       sources."glob-7.1.4"
-      sources."graceful-fs-4.2.1"
+      sources."graceful-fs-4.2.2"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.3"
       sources."has-unicode-2.0.1"
-      sources."hosted-git-info-2.8.2"
+      sources."hosted-git-info-2.8.4"
       sources."http-signature-1.2.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
@@ -2677,30 +2671,29 @@ in
       sources."json-stringify-safe-5.0.1"
       sources."jsonfile-1.0.1"
       sources."jsprim-1.4.1"
-      sources."lru-cache-5.1.1"
       sources."mime-db-1.40.0"
       sources."mime-types-2.1.24"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
-      sources."minipass-2.3.5"
-      sources."minizlib-1.2.1"
+      sources."minipass-2.6.2"
+      sources."minizlib-1.2.2"
       sources."mkdirp-0.5.1"
       sources."ncp-0.4.2"
       sources."nijs-0.0.25"
       sources."nopt-3.0.6"
       (sources."normalize-package-data-2.5.0" // {
         dependencies = [
-          sources."semver-5.7.0"
+          sources."semver-5.7.1"
         ];
       })
-      (sources."npm-package-arg-6.1.0" // {
+      (sources."npm-package-arg-6.1.1" // {
         dependencies = [
-          sources."semver-5.7.0"
+          sources."semver-5.7.1"
         ];
       })
       (sources."npm-registry-client-8.6.0" // {
         dependencies = [
-          sources."semver-5.7.0"
+          sources."semver-5.7.1"
         ];
       })
       (sources."npmconf-2.1.3" // {
@@ -2723,7 +2716,7 @@ in
       sources."performance-now-2.1.0"
       sources."process-nextick-args-2.0.1"
       sources."proto-list-1.2.4"
-      sources."psl-1.3.0"
+      sources."psl-1.4.0"
       sources."punycode-2.1.1"
       sources."qs-6.5.2"
       (sources."readable-stream-2.3.6" // {
@@ -2768,7 +2761,7 @@ in
       sources."uid-number-0.0.5"
       sources."uri-js-4.2.2"
       sources."util-deprecate-1.0.2"
-      sources."uuid-3.3.2"
+      sources."uuid-3.3.3"
       sources."validate-npm-package-license-3.0.4"
       sources."validate-npm-package-name-3.0.0"
       sources."verror-1.10.0"
@@ -2784,6 +2777,7 @@ in
       license = "MIT";
     };
     production = true;
-    bypassCache = false;
+    bypassCache = true;
+    reconstructLock = true;
   };
 }
\ No newline at end of file
-- 
GitLab


From 279d51e585ae2464ba5a5e7eb8cca25e9aa0bcd1 Mon Sep 17 00:00:00 2001
From: Malo Bourgon <mbourgon@gmail.com>
Date: Mon, 15 Jul 2019 11:57:05 -0700
Subject: [PATCH 0408/2254] nodePackages.serverless: init at 1.52.0

Closes https://github.com/NixOS/nixpkgs/pull/64204.
---
 .../node-packages/node-packages-v10.json      |    1 +
 .../node-packages/node-packages-v10.nix       | 1038 +++++++++++++++++
 2 files changed, 1039 insertions(+)

diff --git a/pkgs/development/node-packages/node-packages-v10.json b/pkgs/development/node-packages/node-packages-v10.json
index e53f64d8eca..ef5afe37117 100644
--- a/pkgs/development/node-packages/node-packages-v10.json
+++ b/pkgs/development/node-packages/node-packages-v10.json
@@ -109,6 +109,7 @@
 , "s3http"
 , "semver"
 , "serve"
+, "serverless"
 , "shout"
 , "sloc"
 , "smartdc"
diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix
index 8dffbd45fe2..3f4c4d1b9b5 100644
--- a/pkgs/development/node-packages/node-packages-v10.nix
+++ b/pkgs/development/node-packages/node-packages-v10.nix
@@ -2236,6 +2236,69 @@ let
         sha512 = "ZLCUR7VpUkv3zjeOmcny3UAtwHbQLeBeDsoLYIVQZyepqk3kRPBGaW/xYwmNng04bVfMCtcTx9yrs7n4+Lt/Iw==";
       };
     };
+    "@serverless/cli-1.2.1" = {
+      name = "_at_serverless_slash_cli";
+      packageName = "@serverless/cli";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@serverless/cli/-/cli-1.2.1.tgz";
+        sha512 = "+Ip9UsmrH2e6Q36ZHmeEWu4ez36Srl1hgeaM6t6YPGJlNRNFw650Xt43K5EAZpWVvGJNYuNaQs9FZs4ZnakLgQ==";
+      };
+    };
+    "@serverless/component-metrics-1.0.8" = {
+      name = "_at_serverless_slash_component-metrics";
+      packageName = "@serverless/component-metrics";
+      version = "1.0.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@serverless/component-metrics/-/component-metrics-1.0.8.tgz";
+        sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang==";
+      };
+    };
+    "@serverless/core-1.0.0" = {
+      name = "_at_serverless_slash_core";
+      packageName = "@serverless/core";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@serverless/core/-/core-1.0.0.tgz";
+        sha512 = "XP5KXvEGlrNIOV/KJ0KKwzeov9MqZQ+Ck3z7JW/gtd8ryoKK+5+ah2WL77DXETeHeEwxZhJdrNatqc0FXauEiw==";
+      };
+    };
+    "@serverless/enterprise-plugin-2.0.0" = {
+      name = "_at_serverless_slash_enterprise-plugin";
+      packageName = "@serverless/enterprise-plugin";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-2.0.0.tgz";
+        sha512 = "jfTXC3eAFkgXbsHfDwLr6od3evwnmz0KhVs/p5HXXh37BGX8ETVFUoWsrIOf92flbGDPBEyzcHXX5cfNBlfNKA==";
+      };
+    };
+    "@serverless/event-mocks-1.1.1" = {
+      name = "_at_serverless_slash_event-mocks";
+      packageName = "@serverless/event-mocks";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@serverless/event-mocks/-/event-mocks-1.1.1.tgz";
+        sha512 = "YAV5V/y+XIOfd+HEVeXfPWZb8C6QLruFk9tBivoX2roQLWVq145s4uxf8D0QioCueuRzkukHUS4JIj+KVoS34A==";
+      };
+    };
+    "@serverless/platform-sdk-2.1.1" = {
+      name = "_at_serverless_slash_platform-sdk";
+      packageName = "@serverless/platform-sdk";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@serverless/platform-sdk/-/platform-sdk-2.1.1.tgz";
+        sha512 = "bWmXwhUmnDxY4A5zFKinbBQaPcMbxd5i07i8nyJUDjvr8F8gB9fo2n5A20c1ahOIEiFntBRC9y4/6fxNjIsXqQ==";
+      };
+    };
+    "@serverless/template-1.1.0" = {
+      name = "_at_serverless_slash_template";
+      packageName = "@serverless/template";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@serverless/template/-/template-1.1.0.tgz";
+        sha512 = "ezrtGAf1pKXKfsd+o381L2HAtVxhmXlm59rq7iBPosqChrrE8NI081IIMNTi93JLpTULZaSCRLMDMwVrCJ0ZMw==";
+      };
+    };
     "@sindresorhus/is-0.14.0" = {
       name = "_at_sindresorhus_slash_is";
       packageName = "@sindresorhus/is";
@@ -2722,6 +2785,15 @@ let
         sha512 = "ioou0rxkuWL+yBQYsHUQAzRTfVxAg8Y2VfMftU+Y3RA03/MzuFL0x/M2sXXj3PkfnENbHsjeHR1aMdezLYpTeA==";
       };
     };
+    "@types/lodash-4.14.138" = {
+      name = "_at_types_slash_lodash";
+      packageName = "@types/lodash";
+      version = "4.14.138";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.138.tgz";
+        sha512 = "A4uJgHz4hakwNBdHNPdxOTkYmXNgmUAKLbXZ7PKGslgeV0Mb8P3BlbYfPovExek1qnod4pDfRbxuzcVs3dlFLg==";
+      };
+    };
     "@types/long-4.0.0" = {
       name = "_at_types_slash_long";
       packageName = "@types/long";
@@ -4756,6 +4828,15 @@ let
         sha1 = "f92e72233056dfc6969472749c267bdb046b1d70";
       };
     };
+    "archiver-1.3.0" = {
+      name = "archiver";
+      packageName = "archiver";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/archiver/-/archiver-1.3.0.tgz";
+        sha1 = "4f2194d6d8f99df3f531e6881f14f15d55faaf22";
+      };
+    };
     "archiver-2.1.1" = {
       name = "archiver";
       packageName = "archiver";
@@ -8131,6 +8212,15 @@ let
         sha512 = "3U5kUA5VPsRUA3nofm/BXX7GVHKfxz0hOBAPxXrIvHzlDRkQVqEn6yi8QJegxl4LzOHLdvb7XF5dVawa/VVYBg==";
       };
     };
+    "builtin-modules-3.1.0" = {
+      name = "builtin-modules";
+      packageName = "builtin-modules";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.1.0.tgz";
+        sha512 = "k0KL0aWZuBt2lrxrcASWDfwOLMnodeQjodT/1SxEQAXsHANgo6ZC/VEaSEHCXt7aSTZ4/4H5LKa+tBXmW7Vtvw==";
+      };
+    };
     "builtin-status-codes-3.0.0" = {
       name = "builtin-status-codes";
       packageName = "builtin-status-codes";
@@ -8347,6 +8437,15 @@ let
         sha512 = "5r2GqsoEb4qMTTN9J+WzXfjov+hjxT+j3u5K+kIVNIwAd99DLCJE9pBIMP1qVeybV6JiijL385Oz0DcYxfbOIg==";
       };
     };
+    "cachedir-2.2.0" = {
+      name = "cachedir";
+      packageName = "cachedir";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cachedir/-/cachedir-2.2.0.tgz";
+        sha512 = "VvxA0xhNqIIfg0V9AmJkDg91DaJwryutH5rVEZAhcNi4iJFj9f+QxmAjgK1LT9I8OgToX27fypX6/MeCXVbBjQ==";
+      };
+    };
     "call-me-maybe-1.0.1" = {
       name = "call-me-maybe";
       packageName = "call-me-maybe";
@@ -12424,6 +12523,15 @@ let
         sha512 = "k09hcQcTDY+cwgiwa6PYKLm3jlagNzQ+RSvhjzESOGOx+MNOuXkxTfEvPrO1IOQ81tArCFYQgi631clB70RpQw==";
       };
     };
+    "deferred-0.7.11" = {
+      name = "deferred";
+      packageName = "deferred";
+      version = "0.7.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/deferred/-/deferred-0.7.11.tgz";
+        sha512 = "8eluCl/Blx4YOGwMapBvXRKxHXhA8ejDXYzEaK8+/gtcm8hRMhSLmXSqDmNUKNc/C8HNSmuyyp/hflhqDAvK2A==";
+      };
+    };
     "deferred-leveldown-0.2.0" = {
       name = "deferred-leveldown";
       packageName = "deferred-leveldown";
@@ -13333,6 +13441,15 @@ let
         sha512 = "HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w==";
       };
     };
+    "dotenv-8.1.0" = {
+      name = "dotenv";
+      packageName = "dotenv";
+      version = "8.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dotenv/-/dotenv-8.1.0.tgz";
+        sha512 = "GUE3gqcDCaMltj2++g6bRQ5rBJWtkWTmqmD0fo1RnnMuUqHNCt2oTPeDnS9n6fKYvlhn7AeBkb38lymBtWBQdA==";
+      };
+    };
     "dotenv-expand-4.2.0" = {
       name = "dotenv-expand";
       packageName = "dotenv-expand";
@@ -14567,6 +14684,15 @@ let
         sha512 = "U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA==";
       };
     };
+    "esniff-1.1.0" = {
+      name = "esniff";
+      packageName = "esniff";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/esniff/-/esniff-1.1.0.tgz";
+        sha1 = "c66849229f91464dede2e0d40201ed6abf65f2ac";
+      };
+    };
     "espree-3.5.4" = {
       name = "espree";
       packageName = "espree";
@@ -15971,6 +16097,15 @@ let
         sha1 = "675d358b2ca3892d795a1ab47232f8b6e2e0dde4";
       };
     };
+    "find-requires-1.0.0" = {
+      name = "find-requires";
+      packageName = "find-requires";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/find-requires/-/find-requires-1.0.0.tgz";
+        sha512 = "UME7hNwBfzeISSFQcBEDemEEskpOjI/shPrpJM5PI4DSdn6hX0dmz+2dL70blZER2z8tSnTRL+2rfzlYgtbBoQ==";
+      };
+    };
     "find-up-1.1.2" = {
       name = "find-up";
       packageName = "find-up";
@@ -16709,6 +16844,15 @@ let
         sha1 = "9ae1fdd94897798edab76d0918cf42d0c3184fa9";
       };
     };
+    "fs-extra-0.30.0" = {
+      name = "fs-extra";
+      packageName = "fs-extra";
+      version = "0.30.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz";
+        sha1 = "f233ffcc08d4da7d432daa449776989db1df93f0";
+      };
+    };
     "fs-extra-0.6.4" = {
       name = "fs-extra";
       packageName = "fs-extra";
@@ -16826,6 +16970,15 @@ let
         sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
       };
     };
+    "fs2-0.3.5" = {
+      name = "fs2";
+      packageName = "fs2";
+      version = "0.3.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fs2/-/fs2-0.3.5.tgz";
+        sha512 = "EL6G81ucjbmmycRwgekYMjjbKGFSop+eHgYLvBiQydp0H0Qugwbs5qOhifSzbCLZPy25rgXxsxsSrFqpTkitwA==";
+      };
+    };
     "fsevents-1.2.9" = {
       name = "fsevents";
       packageName = "fsevents";
@@ -17727,6 +17880,15 @@ let
         sha1 = "080f54549ec1b82a6c60e631fc82e1211dbe95f8";
       };
     };
+    "globby-6.1.0" = {
+      name = "globby";
+      packageName = "globby";
+      version = "6.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz";
+        sha1 = "f5a6d70e8395e21c858fb0489d64df02424d506c";
+      };
+    };
     "globby-8.0.2" = {
       name = "globby";
       packageName = "globby";
@@ -21265,6 +21427,15 @@ let
         sha1 = "1f16e4aa22b04d1336b66188a66af3c600c3a66d";
       };
     };
+    "is-wsl-2.1.0" = {
+      name = "is-wsl";
+      packageName = "is-wsl";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-wsl/-/is-wsl-2.1.0.tgz";
+        sha512 = "pFTjpv/x5HRj8kbZ/Msxi9VrvtOMRBqaDi3OIcbwPI3OuH+r3lLxVWukLITBaOGJIbA/w2+M1eVmVa4XNQlAmQ==";
+      };
+    };
     "is-yarn-global-0.3.0" = {
       name = "is-yarn-global";
       packageName = "is-yarn-global";
@@ -21355,6 +21526,15 @@ let
         sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10";
       };
     };
+    "iso8601-duration-1.2.0" = {
+      name = "iso8601-duration";
+      packageName = "iso8601-duration";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/iso8601-duration/-/iso8601-duration-1.2.0.tgz";
+        sha512 = "ErTBd++b17E8nmWII1K1uZtBgD1E8RjyvwmxlCjPHNqHMD7gmcMHOw0E8Ro/6+QT4PhHRSnnMo7bxa1vFPkwhg==";
+      };
+    };
     "isobject-2.1.0" = {
       name = "isobject";
       packageName = "isobject";
@@ -21841,6 +22021,15 @@ let
         sha1 = "5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898";
       };
     };
+    "json-cycle-1.3.0" = {
+      name = "json-cycle";
+      packageName = "json-cycle";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json-cycle/-/json-cycle-1.3.0.tgz";
+        sha512 = "FD/SedD78LCdSvJaOUQAXseT8oQBb5z6IVYaQaCrVUlu9zOAr1BDdKyVYQaSD/GDsAMrXpKcOyBD4LIl8nfjHw==";
+      };
+    };
     "json-edm-parser-0.1.2" = {
       name = "json-edm-parser";
       packageName = "json-edm-parser";
@@ -24596,6 +24785,15 @@ let
         sha1 = "3b1ded0d1ba82e188b9bdaba9eee6486f864a434";
       };
     };
+    "lsmod-1.0.0" = {
+      name = "lsmod";
+      packageName = "lsmod";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lsmod/-/lsmod-1.0.0.tgz";
+        sha1 = "9a00f76dca36eb23fa05350afe1b585d4299e64b";
+      };
+    };
     "lstream-0.0.4" = {
       name = "lstream";
       packageName = "lstream";
@@ -26896,6 +27094,15 @@ let
         sha1 = "17b09581988979fddafe0201e931ba933c96cbb4";
       };
     };
+    "ncjsm-3.0.0" = {
+      name = "ncjsm";
+      packageName = "ncjsm";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ncjsm/-/ncjsm-3.0.0.tgz";
+        sha512 = "UEEzv/yccTNNyS7ZLmOUquT/k9ttrJCgGrswRrfuj4riplQquZoxAhCaoxSATj59gdpLaGWqXDXRxrRS2zOarw==";
+      };
+    };
     "nconf-0.10.0" = {
       name = "nconf";
       packageName = "nconf";
@@ -31147,6 +31354,15 @@ let
         sha1 = "fcffab41d19cab4dfae5e575e64246619b12d289";
       };
     };
+    "prettyoutput-1.2.0" = {
+      name = "prettyoutput";
+      packageName = "prettyoutput";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/prettyoutput/-/prettyoutput-1.2.0.tgz";
+        sha512 = "G2gJwLzLcYS+2m6bTAe+CcDpwak9YpcvpScI0tE4WYb2O3lEZD/YywkMNpGqsSx5wttGvh2UXaKROTKKCyM2dw==";
+      };
+    };
     "printf-0.2.5" = {
       name = "printf";
       packageName = "printf";
@@ -31345,6 +31561,15 @@ let
         sha1 = "bbcfd248725259f2bb115a27bfa8d65dc420f931";
       };
     };
+    "promise-queue-2.2.5" = {
+      name = "promise-queue";
+      packageName = "promise-queue";
+      version = "2.2.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/promise-queue/-/promise-queue-2.2.5.tgz";
+        sha1 = "2f6f5f7c0f6d08109e967659c79b88a9ed5e93b4";
+      };
+    };
     "promise-retry-1.1.1" = {
       name = "promise-retry";
       packageName = "promise-retry";
@@ -32659,6 +32884,15 @@ let
         sha512 = "GXpfrYVPwx3K7RQ6aYT8KPS8XViSXUVJT1ONhoKPE9VAleW42YE+U+8VEyGWt41EnEQW7gwecYJriTI0pKoecQ==";
       };
     };
+    "ramda-0.26.1" = {
+      name = "ramda";
+      packageName = "ramda";
+      version = "0.26.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ramda/-/ramda-0.26.1.tgz";
+        sha512 = "hLWjpy7EnsDBb0p+Z3B7rPi3GDeRG5ZtiI33kJhTt+ORCd38AbAIjB/9zRIUoeTbE/AVX5ZkU7m6bznsvrf8eQ==";
+      };
+    };
     "randexp-0.4.6" = {
       name = "randexp";
       packageName = "randexp";
@@ -32794,6 +33028,15 @@ let
         sha512 = "PPYLwZ63lXi6Tv2EZ8w3M4FzC0rVqvxivaOVS8pXSp5FMIHFnvi4MWHL3UdFLhwSy50aNtJsgjY0mBC6oFL26Q==";
       };
     };
+    "raven-1.2.1" = {
+      name = "raven";
+      packageName = "raven";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/raven/-/raven-1.2.1.tgz";
+        sha1 = "949c134db028a190b7bbf8f790aae541b7c020bd";
+      };
+    };
     "raven-js-3.27.2" = {
       name = "raven-js";
       packageName = "raven-js";
@@ -37330,6 +37573,15 @@ let
         sha1 = "547c70b347e8d32b4e108ea1a2a159e5fdde19c0";
       };
     };
+    "stack-trace-0.0.9" = {
+      name = "stack-trace";
+      packageName = "stack-trace";
+      version = "0.0.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz";
+        sha1 = "a8f6eaeca90674c333e7c43953f275b451510695";
+      };
+    };
     "stampit-1.2.0" = {
       name = "stampit";
       packageName = "stampit";
@@ -38698,6 +38950,15 @@ let
         sha1 = "bb9c2ca6324f659fde7634c2caf3c096e1187ca7";
       };
     };
+    "tabtab-2.2.2" = {
+      name = "tabtab";
+      packageName = "tabtab";
+      version = "2.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tabtab/-/tabtab-2.2.2.tgz";
+        sha1 = "7a047f143b010b4cbd31f857e82961512cbf4e14";
+      };
+    };
     "tabtab-git+https://github.com/mixu/node-tabtab.git" = {
       name = "tabtab";
       packageName = "tabtab";
@@ -41732,6 +41993,24 @@ let
         sha512 = "FYjr3bHBnJpw8yD0CmFCh5USyDgr6VtuncEIun100GqCUdgqnkAx9irSY3tA4UrzRH56qmiocP2fs1QjQ7ZDZA==";
       };
     };
+    "uuid-2.0.3" = {
+      name = "uuid";
+      packageName = "uuid";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz";
+        sha1 = "67e2e863797215530dff318e5bf9dcebfd47b21a";
+      };
+    };
+    "uuid-3.0.0" = {
+      name = "uuid";
+      packageName = "uuid";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uuid/-/uuid-3.0.0.tgz";
+        sha1 = "6728fc0459c450d796a99c31837569bdf672d728";
+      };
+    };
     "uuid-3.3.2" = {
       name = "uuid";
       packageName = "uuid";
@@ -42641,6 +42920,15 @@ let
         sha512 = "ttGcuHA/OBnN2pcM6johpYlEms7XpO5/fyKIr48541xXedan4roO8cS1Q2S/zbbjGH/BarYDAMeS2Mi9HE5Tig==";
       };
     };
+    "walkdir-0.0.11" = {
+      name = "walkdir";
+      packageName = "walkdir";
+      version = "0.0.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/walkdir/-/walkdir-0.0.11.tgz";
+        sha1 = "a16d025eb931bd03b52f308caed0f40fcebe9532";
+      };
+    };
     "ware-1.3.0" = {
       name = "ware";
       packageName = "ware";
@@ -43848,6 +44136,15 @@ let
         sha1 = "08536d4e73d322b1c9ce207ab8dd70e04d20ae6e";
       };
     };
+    "yaml-ast-parser-0.0.43" = {
+      name = "yaml-ast-parser";
+      packageName = "yaml-ast-parser";
+      version = "0.0.43";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yaml-ast-parser/-/yaml-ast-parser-0.0.43.tgz";
+        sha512 = "2PTINUwsRqSd+s8XxKaJWQlUuEMHJQyEuh2edBbW8KNJz0SJPwUSD2zRWqezFEdN7IzAgeuYHFUCF7o8zRdZ0A==";
+      };
+    };
     "yaml-front-matter-3.4.1" = {
       name = "yaml-front-matter";
       packageName = "yaml-front-matter";
@@ -65183,6 +65480,747 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
+  serverless = nodeEnv.buildNodePackage {
+    name = "serverless";
+    packageName = "serverless";
+    version = "1.52.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/serverless/-/serverless-1.52.0.tgz";
+      sha512 = "No+hosiPng/0MKfFMNj6lfLmNmn5vzLduss55YkefQNKZ9oJEBeZqBDrUEZC9reTHUpilCx0ESiLqkMoPBst2g==";
+    };
+    dependencies = [
+      sources."@serverless/cli-1.2.1"
+      (sources."@serverless/component-metrics-1.0.8" // {
+        dependencies = [
+          sources."node-fetch-2.6.0"
+        ];
+      })
+      (sources."@serverless/core-1.0.0" // {
+        dependencies = [
+          sources."fs-extra-7.0.1"
+          sources."semver-6.3.0"
+        ];
+      })
+      (sources."@serverless/enterprise-plugin-2.0.0" // {
+        dependencies = [
+          sources."fs-extra-7.0.1"
+          sources."node-fetch-2.6.0"
+          sources."uuid-3.3.3"
+        ];
+      })
+      sources."@serverless/event-mocks-1.1.1"
+      (sources."@serverless/platform-sdk-2.1.1" // {
+        dependencies = [
+          sources."ramda-0.25.0"
+          sources."uuid-3.3.3"
+        ];
+      })
+      sources."@serverless/template-1.1.0"
+      sources."@sindresorhus/is-0.14.0"
+      sources."@szmarczak/http-timer-1.1.2"
+      sources."@types/lodash-4.14.138"
+      sources."accepts-1.3.7"
+      sources."agent-base-4.3.0"
+      sources."ansi-0.3.1"
+      sources."ansi-align-2.0.0"
+      sources."ansi-escapes-4.2.1"
+      sources."ansi-regex-4.1.0"
+      sources."ansi-styles-3.2.1"
+      sources."anymatch-3.1.0"
+      (sources."archiver-1.3.0" // {
+        dependencies = [
+          sources."async-2.6.3"
+        ];
+      })
+      (sources."archiver-utils-1.3.0" // {
+        dependencies = [
+          sources."normalize-path-2.1.1"
+        ];
+      })
+      sources."are-we-there-yet-1.1.5"
+      sources."argparse-1.0.10"
+      sources."arr-diff-4.0.0"
+      sources."arr-union-3.1.0"
+      sources."array-flatten-1.1.1"
+      sources."array-union-1.0.2"
+      sources."array-uniq-1.0.3"
+      sources."array-unique-0.3.2"
+      sources."assign-symbols-1.0.0"
+      sources."async-1.5.2"
+      sources."asynckit-0.4.0"
+      sources."atob-2.1.2"
+      (sources."aws-sdk-2.529.0" // {
+        dependencies = [
+          sources."buffer-4.9.1"
+          sources."ieee754-1.1.8"
+          sources."uuid-3.3.2"
+        ];
+      })
+      sources."balanced-match-1.0.0"
+      (sources."base-0.11.2" // {
+        dependencies = [
+          sources."define-property-1.0.0"
+        ];
+      })
+      sources."base64-js-1.3.1"
+      sources."binary-extensions-2.0.0"
+      sources."bl-1.2.2"
+      sources."bluebird-3.5.5"
+      sources."body-parser-1.19.0"
+      sources."boxen-1.3.0"
+      sources."brace-expansion-1.1.11"
+      sources."braces-3.0.2"
+      sources."buffer-5.4.3"
+      sources."buffer-alloc-1.2.0"
+      sources."buffer-alloc-unsafe-1.1.0"
+      sources."buffer-crc32-0.2.13"
+      sources."buffer-fill-1.0.0"
+      sources."buffer-from-1.1.1"
+      sources."builtin-modules-3.1.0"
+      sources."bytes-3.1.0"
+      sources."cache-base-1.0.1"
+      (sources."cacheable-request-6.1.0" // {
+        dependencies = [
+          sources."get-stream-5.1.0"
+          sources."lowercase-keys-2.0.0"
+        ];
+      })
+      sources."cachedir-2.2.0"
+      sources."camelcase-4.1.0"
+      sources."capture-stack-trace-1.0.1"
+      sources."caw-2.0.1"
+      sources."chalk-2.4.2"
+      sources."chardet-0.7.0"
+      sources."chokidar-3.1.0"
+      sources."ci-info-1.6.0"
+      (sources."class-utils-0.3.6" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-buffer-1.1.6"
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
+        ];
+      })
+      sources."cli-boxes-1.0.0"
+      sources."cli-cursor-2.1.0"
+      sources."cli-width-2.2.0"
+      sources."clone-response-1.0.2"
+      sources."code-point-at-1.1.0"
+      sources."collection-visit-1.0.0"
+      sources."color-convert-1.9.3"
+      sources."color-name-1.1.3"
+      sources."colors-1.3.3"
+      sources."combined-stream-1.0.8"
+      sources."commander-2.19.0"
+      sources."component-emitter-1.3.0"
+      (sources."compress-commons-1.2.2" // {
+        dependencies = [
+          sources."normalize-path-2.1.1"
+        ];
+      })
+      sources."concat-map-0.0.1"
+      sources."concat-stream-1.6.2"
+      sources."config-chain-1.1.12"
+      sources."configstore-3.1.2"
+      (sources."content-disposition-0.5.3" // {
+        dependencies = [
+          sources."safe-buffer-5.1.2"
+        ];
+      })
+      sources."content-type-1.0.4"
+      sources."cookie-0.4.0"
+      sources."cookie-signature-1.0.6"
+      sources."cookiejar-2.1.2"
+      sources."copy-descriptor-0.1.1"
+      sources."core-util-is-1.0.2"
+      sources."crc-3.8.0"
+      sources."crc32-stream-2.0.0"
+      sources."create-error-class-3.0.2"
+      sources."cross-spawn-5.1.0"
+      sources."crypto-random-string-1.0.0"
+      sources."d-1.0.1"
+      sources."debug-2.6.9"
+      sources."decode-uri-component-0.2.0"
+      sources."decompress-4.2.0"
+      sources."decompress-response-3.3.0"
+      sources."decompress-tar-4.1.1"
+      (sources."decompress-tarbz2-4.1.1" // {
+        dependencies = [
+          sources."file-type-6.2.0"
+        ];
+      })
+      sources."decompress-targz-4.1.1"
+      (sources."decompress-unzip-4.0.1" // {
+        dependencies = [
+          sources."file-type-3.9.0"
+          sources."get-stream-2.3.1"
+        ];
+      })
+      sources."deep-extend-0.6.0"
+      sources."defer-to-connect-1.0.2"
+      sources."deferred-0.7.11"
+      sources."define-property-2.0.2"
+      sources."delayed-stream-1.0.0"
+      sources."delegates-1.0.0"
+      sources."depd-1.1.2"
+      sources."destroy-1.0.4"
+      sources."dot-prop-4.2.0"
+      sources."dotenv-8.1.0"
+      (sources."download-5.0.3" // {
+        dependencies = [
+          sources."get-stream-3.0.0"
+          sources."got-6.7.1"
+          sources."prepend-http-1.0.4"
+          sources."url-parse-lax-1.0.0"
+        ];
+      })
+      sources."duplexer3-0.1.4"
+      sources."ee-first-1.1.1"
+      sources."encodeurl-1.0.2"
+      sources."encoding-0.1.12"
+      sources."end-of-stream-1.4.1"
+      sources."es5-ext-0.10.51"
+      sources."es6-iterator-2.0.3"
+      sources."es6-promise-4.2.8"
+      sources."es6-promisify-5.0.0"
+      (sources."es6-set-0.1.5" // {
+        dependencies = [
+          sources."es6-symbol-3.1.1"
+        ];
+      })
+      sources."es6-symbol-3.1.2"
+      sources."es6-weak-map-2.0.3"
+      sources."escape-html-1.0.3"
+      sources."escape-string-regexp-1.0.5"
+      sources."esniff-1.1.0"
+      sources."esprima-4.0.1"
+      sources."etag-1.8.1"
+      sources."event-emitter-0.3.5"
+      sources."events-1.1.1"
+      (sources."execa-0.7.0" // {
+        dependencies = [
+          sources."get-stream-3.0.0"
+        ];
+      })
+      sources."exit-hook-1.1.1"
+      (sources."express-4.17.1" // {
+        dependencies = [
+          sources."safe-buffer-5.1.2"
+        ];
+      })
+      sources."extend-3.0.2"
+      sources."extend-shallow-3.0.2"
+      sources."external-editor-3.1.0"
+      sources."fast-levenshtein-2.0.6"
+      sources."fd-slicer-1.1.0"
+      sources."figures-3.0.0"
+      sources."file-type-5.2.0"
+      sources."filename-reserved-regex-2.0.0"
+      sources."filenamify-2.1.0"
+      sources."filesize-3.6.1"
+      sources."fill-range-7.0.1"
+      sources."finalhandler-1.1.2"
+      sources."find-requires-1.0.0"
+      sources."flat-4.1.0"
+      sources."for-in-1.0.2"
+      sources."form-data-2.5.1"
+      sources."formidable-1.2.1"
+      sources."forwarded-0.1.2"
+      sources."fragment-cache-0.2.1"
+      sources."fresh-0.5.2"
+      sources."fs-constants-1.0.0"
+      (sources."fs-extra-0.30.0" // {
+        dependencies = [
+          sources."jsonfile-2.4.0"
+        ];
+      })
+      sources."fs.realpath-1.0.0"
+      sources."fs2-0.3.5"
+      sources."fsevents-2.0.7"
+      sources."gauge-1.2.7"
+      sources."get-proxy-2.1.0"
+      sources."get-stdin-5.0.1"
+      sources."get-stream-4.1.0"
+      sources."get-value-2.0.6"
+      sources."glob-7.1.4"
+      sources."glob-parent-5.0.0"
+      sources."global-dirs-0.1.1"
+      sources."globby-6.1.0"
+      sources."got-9.6.0"
+      sources."graceful-fs-4.2.2"
+      sources."graceful-readlink-1.0.1"
+      sources."graphlib-2.1.7"
+      (sources."has-ansi-2.0.0" // {
+        dependencies = [
+          sources."ansi-regex-2.1.1"
+        ];
+      })
+      sources."has-flag-3.0.0"
+      sources."has-symbol-support-x-1.4.2"
+      sources."has-to-string-tag-x-1.4.1"
+      sources."has-unicode-2.0.1"
+      sources."has-value-1.0.0"
+      (sources."has-values-1.0.0" // {
+        dependencies = [
+          sources."is-buffer-1.1.6"
+          (sources."is-number-3.0.0" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."kind-of-4.0.0"
+        ];
+      })
+      sources."http-cache-semantics-4.0.3"
+      sources."http-errors-1.7.2"
+      (sources."https-proxy-agent-2.2.2" // {
+        dependencies = [
+          sources."debug-3.2.6"
+          sources."ms-2.1.2"
+        ];
+      })
+      sources."iconv-lite-0.4.24"
+      sources."ieee754-1.1.13"
+      sources."ignore-5.1.4"
+      sources."immediate-3.0.6"
+      sources."import-lazy-2.1.0"
+      sources."imurmurhash-0.1.4"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.3"
+      sources."ini-1.3.5"
+      (sources."inquirer-6.5.2" // {
+        dependencies = [
+          sources."ansi-escapes-3.2.0"
+          sources."figures-2.0.0"
+        ];
+      })
+      sources."ipaddr.js-1.9.0"
+      sources."is-accessor-descriptor-1.0.0"
+      sources."is-binary-path-2.1.0"
+      sources."is-buffer-2.0.3"
+      sources."is-ci-1.2.1"
+      sources."is-data-descriptor-1.0.0"
+      sources."is-descriptor-1.0.2"
+      sources."is-docker-1.1.0"
+      sources."is-extendable-1.0.1"
+      sources."is-extglob-2.1.1"
+      sources."is-fullwidth-code-point-2.0.0"
+      sources."is-glob-4.0.1"
+      sources."is-installed-globally-0.1.0"
+      sources."is-natural-number-4.0.1"
+      sources."is-npm-1.0.0"
+      sources."is-number-7.0.0"
+      sources."is-obj-1.0.1"
+      sources."is-object-1.0.1"
+      sources."is-path-inside-1.0.1"
+      sources."is-plain-object-2.0.4"
+      sources."is-promise-2.1.0"
+      sources."is-redirect-1.0.0"
+      sources."is-retry-allowed-1.2.0"
+      sources."is-stream-1.1.0"
+      sources."is-windows-1.0.2"
+      sources."is-wsl-2.1.0"
+      sources."isarray-1.0.0"
+      sources."isexe-2.0.0"
+      sources."iso8601-duration-1.2.0"
+      sources."isobject-3.0.1"
+      sources."isomorphic-fetch-2.2.1"
+      sources."isurl-1.0.0"
+      sources."jmespath-0.15.0"
+      sources."js-yaml-3.13.1"
+      sources."json-buffer-3.0.0"
+      sources."json-cycle-1.3.0"
+      sources."json-refs-2.1.7"
+      sources."json-stringify-safe-5.0.1"
+      sources."jsonata-1.6.5"
+      sources."jsonfile-4.0.0"
+      sources."jszip-3.2.2"
+      sources."jwt-decode-2.2.0"
+      sources."keyv-3.1.0"
+      sources."kind-of-6.0.2"
+      sources."klaw-1.3.1"
+      (sources."latest-version-3.1.0" // {
+        dependencies = [
+          sources."get-stream-3.0.0"
+          sources."got-6.7.1"
+          sources."package-json-4.0.1"
+          sources."prepend-http-1.0.4"
+          sources."registry-auth-token-3.4.0"
+          sources."registry-url-3.1.0"
+          sources."url-parse-lax-1.0.0"
+        ];
+      })
+      sources."lazystream-1.0.0"
+      sources."lie-3.3.0"
+      sources."lodash-4.17.15"
+      sources."lodash.difference-4.5.0"
+      sources."lodash.pad-4.5.1"
+      sources."lodash.padend-4.6.1"
+      sources."lodash.padstart-4.6.1"
+      sources."lodash.uniq-4.5.0"
+      sources."lowercase-keys-1.0.1"
+      sources."lru-cache-4.1.5"
+      sources."lru-queue-0.1.0"
+      sources."lsmod-1.0.0"
+      (sources."make-dir-1.3.0" // {
+        dependencies = [
+          sources."pify-3.0.0"
+        ];
+      })
+      sources."map-cache-0.2.2"
+      sources."map-visit-1.0.0"
+      sources."media-typer-0.3.0"
+      sources."memoizee-0.4.14"
+      sources."merge-descriptors-1.0.1"
+      sources."methods-1.1.2"
+      sources."mime-1.6.0"
+      sources."mime-db-1.40.0"
+      sources."mime-types-2.1.24"
+      sources."mimic-fn-1.2.0"
+      sources."mimic-response-1.0.1"
+      sources."minimatch-3.0.4"
+      sources."minimist-1.2.0"
+      sources."mixin-deep-1.3.2"
+      (sources."mkdirp-0.5.1" // {
+        dependencies = [
+          sources."minimist-0.0.8"
+        ];
+      })
+      sources."moment-2.24.0"
+      sources."ms-2.0.0"
+      sources."mute-stream-0.0.7"
+      sources."nanoid-2.1.1"
+      sources."nanomatch-1.2.13"
+      sources."native-promise-only-0.8.1"
+      sources."ncjsm-3.0.0"
+      sources."negotiator-0.6.2"
+      sources."next-tick-1.0.0"
+      sources."node-dir-0.1.17"
+      sources."node-fetch-1.7.3"
+      sources."normalize-path-3.0.0"
+      sources."normalize-url-4.3.0"
+      (sources."npm-conf-1.1.3" // {
+        dependencies = [
+          sources."pify-3.0.0"
+        ];
+      })
+      sources."npm-run-path-2.0.2"
+      sources."npmlog-2.0.4"
+      sources."number-is-nan-1.0.1"
+      sources."object-assign-4.1.1"
+      (sources."object-copy-0.1.0" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          sources."is-accessor-descriptor-0.1.6"
+          sources."is-buffer-1.1.6"
+          sources."is-data-descriptor-0.1.4"
+          (sources."is-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-5.1.0"
+            ];
+          })
+          sources."kind-of-3.2.2"
+        ];
+      })
+      sources."object-hash-1.3.1"
+      sources."object-visit-1.0.1"
+      sources."object.pick-1.3.0"
+      sources."on-finished-2.3.0"
+      sources."once-1.4.0"
+      sources."onetime-2.0.1"
+      (sources."opn-5.5.0" // {
+        dependencies = [
+          sources."is-wsl-1.1.0"
+        ];
+      })
+      sources."os-shim-0.1.3"
+      sources."os-tmpdir-1.0.2"
+      sources."p-cancelable-1.1.0"
+      sources."p-finally-1.0.0"
+      (sources."package-json-6.5.0" // {
+        dependencies = [
+          sources."semver-6.3.0"
+        ];
+      })
+      sources."pako-1.0.10"
+      sources."parseurl-1.3.3"
+      sources."pascalcase-0.1.1"
+      sources."path-is-absolute-1.0.1"
+      sources."path-is-inside-1.0.2"
+      sources."path-key-2.0.1"
+      sources."path-loader-1.0.10"
+      sources."path-to-regexp-0.1.7"
+      sources."pend-1.2.0"
+      sources."picomatch-2.0.7"
+      sources."pify-2.3.0"
+      sources."pinkie-2.0.4"
+      sources."pinkie-promise-2.0.1"
+      sources."prepend-http-2.0.0"
+      sources."prettyoutput-1.2.0"
+      sources."process-nextick-args-2.0.1"
+      sources."promise-queue-2.2.5"
+      sources."proto-list-1.2.4"
+      sources."proxy-addr-2.0.5"
+      sources."pseudomap-1.0.2"
+      sources."pump-3.0.0"
+      sources."punycode-1.3.2"
+      sources."qs-6.7.0"
+      sources."querystring-0.2.0"
+      sources."ramda-0.26.1"
+      sources."range-parser-1.2.1"
+      (sources."raven-1.2.1" // {
+        dependencies = [
+          sources."cookie-0.3.1"
+          sources."uuid-3.0.0"
+        ];
+      })
+      sources."raw-body-2.4.0"
+      sources."rc-1.2.8"
+      (sources."readable-stream-2.3.6" // {
+        dependencies = [
+          sources."safe-buffer-5.1.2"
+        ];
+      })
+      sources."readdirp-3.1.2"
+      sources."regenerator-runtime-0.13.3"
+      sources."regex-not-1.0.2"
+      sources."registry-auth-token-4.0.0"
+      sources."registry-url-5.1.0"
+      sources."remove-trailing-separator-1.1.0"
+      sources."replaceall-0.1.6"
+      sources."resolve-url-0.2.1"
+      sources."responselike-1.0.2"
+      sources."restore-cursor-2.0.0"
+      sources."ret-0.1.15"
+      sources."rimraf-2.7.1"
+      sources."run-async-2.3.0"
+      sources."rx-4.1.0"
+      sources."rxjs-6.5.3"
+      sources."safe-buffer-5.2.0"
+      sources."safe-regex-1.1.0"
+      sources."safer-buffer-2.1.2"
+      sources."sax-1.2.1"
+      (sources."seek-bzip-1.0.5" // {
+        dependencies = [
+          sources."commander-2.8.1"
+        ];
+      })
+      sources."semver-5.7.1"
+      sources."semver-diff-2.1.0"
+      sources."semver-regex-1.0.0"
+      (sources."send-0.17.1" // {
+        dependencies = [
+          sources."ms-2.1.1"
+        ];
+      })
+      sources."serve-static-1.14.1"
+      sources."set-immediate-shim-1.0.1"
+      (sources."set-value-2.0.1" // {
+        dependencies = [
+          sources."extend-shallow-2.0.1"
+          sources."is-extendable-0.1.1"
+        ];
+      })
+      sources."setprototypeof-1.1.1"
+      sources."shebang-command-1.2.0"
+      sources."shebang-regex-1.0.0"
+      sources."shortid-2.2.15"
+      sources."signal-exit-3.0.2"
+      (sources."simple-git-1.126.0" // {
+        dependencies = [
+          sources."debug-4.1.1"
+          sources."ms-2.1.2"
+        ];
+      })
+      sources."slash-1.0.0"
+      (sources."snapdragon-0.8.2" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          sources."extend-shallow-2.0.1"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-buffer-1.1.6"
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."is-extendable-0.1.1"
+          sources."kind-of-5.1.0"
+          sources."source-map-0.5.7"
+        ];
+      })
+      sources."source-map-0.6.1"
+      sources."source-map-resolve-0.5.2"
+      sources."source-map-support-0.5.13"
+      sources."source-map-url-0.4.0"
+      sources."spawn-sync-1.0.15"
+      sources."split-string-3.1.0"
+      sources."sprintf-js-1.0.3"
+      sources."stack-trace-0.0.9"
+      (sources."static-extend-0.1.2" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-buffer-1.1.6"
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
+        ];
+      })
+      sources."statuses-1.5.0"
+      (sources."string-width-2.1.1" // {
+        dependencies = [
+          sources."ansi-regex-3.0.0"
+          sources."strip-ansi-4.0.0"
+        ];
+      })
+      (sources."string_decoder-1.1.1" // {
+        dependencies = [
+          sources."safe-buffer-5.1.2"
+        ];
+      })
+      sources."strip-ansi-5.2.0"
+      sources."strip-dirs-2.1.0"
+      sources."strip-eof-1.0.0"
+      sources."strip-json-comments-2.0.1"
+      sources."strip-outer-1.0.1"
+      (sources."superagent-3.8.3" // {
+        dependencies = [
+          sources."debug-3.2.6"
+          sources."ms-2.1.2"
+        ];
+      })
+      sources."supports-color-5.5.0"
+      (sources."tabtab-2.2.2" // {
+        dependencies = [
+          sources."ansi-escapes-1.4.0"
+          sources."ansi-regex-2.1.1"
+          sources."ansi-styles-2.2.1"
+          sources."chalk-1.1.3"
+          sources."cli-cursor-1.0.2"
+          sources."external-editor-1.1.1"
+          sources."figures-1.7.0"
+          sources."inquirer-1.2.3"
+          sources."is-fullwidth-code-point-1.0.0"
+          sources."mute-stream-0.0.6"
+          sources."onetime-1.1.0"
+          sources."restore-cursor-1.0.1"
+          sources."string-width-1.0.2"
+          sources."strip-ansi-3.0.1"
+          sources."supports-color-2.0.0"
+          sources."tmp-0.0.29"
+        ];
+      })
+      sources."tar-stream-1.6.2"
+      sources."term-size-1.2.0"
+      sources."through-2.3.8"
+      sources."timed-out-4.0.1"
+      sources."timers-ext-0.1.7"
+      sources."tmp-0.0.33"
+      sources."to-buffer-1.1.1"
+      (sources."to-object-path-0.3.0" // {
+        dependencies = [
+          sources."is-buffer-1.1.6"
+          sources."kind-of-3.2.2"
+        ];
+      })
+      sources."to-readable-stream-1.0.0"
+      sources."to-regex-3.0.2"
+      sources."to-regex-range-5.0.1"
+      sources."toidentifier-1.0.0"
+      sources."traverse-0.6.6"
+      sources."trim-repeated-1.0.0"
+      sources."tslib-1.10.0"
+      sources."tunnel-agent-0.6.0"
+      sources."type-1.0.3"
+      sources."type-fest-0.5.2"
+      sources."type-is-1.6.18"
+      sources."typedarray-0.0.6"
+      sources."unbzip2-stream-1.3.3"
+      (sources."union-value-1.0.1" // {
+        dependencies = [
+          sources."is-extendable-0.1.1"
+        ];
+      })
+      sources."unique-string-1.0.0"
+      sources."universalify-0.1.2"
+      sources."unpipe-1.0.0"
+      (sources."unset-value-1.0.0" // {
+        dependencies = [
+          (sources."has-value-0.3.1" // {
+            dependencies = [
+              sources."isobject-2.1.0"
+            ];
+          })
+          sources."has-values-0.1.4"
+        ];
+      })
+      sources."untildify-3.0.3"
+      sources."unzip-response-2.0.1"
+      sources."update-notifier-2.5.0"
+      (sources."uri-js-3.0.2" // {
+        dependencies = [
+          sources."punycode-2.1.1"
+        ];
+      })
+      sources."urix-0.1.0"
+      sources."url-0.10.3"
+      sources."url-parse-lax-3.0.0"
+      sources."url-to-options-1.0.1"
+      sources."use-3.1.1"
+      sources."util-deprecate-1.0.2"
+      sources."utils-merge-1.0.1"
+      sources."uuid-2.0.3"
+      sources."vary-1.1.2"
+      sources."walkdir-0.0.11"
+      sources."whatwg-fetch-3.0.0"
+      sources."which-1.3.1"
+      sources."widest-line-2.0.1"
+      sources."wrappy-1.0.2"
+      sources."write-file-atomic-2.4.3"
+      sources."xdg-basedir-3.0.0"
+      sources."xml2js-0.4.19"
+      sources."xmlbuilder-9.0.7"
+      sources."xtend-4.0.2"
+      sources."yallist-2.1.2"
+      sources."yaml-ast-parser-0.0.43"
+      sources."yamljs-0.3.0"
+      sources."yauzl-2.10.0"
+      sources."zip-stream-1.2.0"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more";
+      homepage = "https://github.com/serverless/serverless#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
   shout = nodeEnv.buildNodePackage {
     name = "shout";
     packageName = "shout";
-- 
GitLab


From 1a5c68c7fe3c2d7c7862b4f0788ea65595502a87 Mon Sep 17 00:00:00 2001
From: Jason Felice <jason.m.felice@gmail.com>
Date: Fri, 13 Sep 2019 15:13:42 -0400
Subject: [PATCH 0409/2254] plan9port: do not use which in builder.sh

Removing the build time dependency on which broke builder.sh
---
 pkgs/tools/system/plan9port/builder.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/system/plan9port/builder.sh b/pkgs/tools/system/plan9port/builder.sh
index 77f6632ff53..f5c447ea0a5 100644
--- a/pkgs/tools/system/plan9port/builder.sh
+++ b/pkgs/tools/system/plan9port/builder.sh
@@ -22,7 +22,7 @@ plan9portLinkFlags()
 configurePhase()
 {
     (
-        echo CC9=\"$(which $CC)\"
+        echo CC9=\"$(command -v $CC)\"
         echo CFLAGS=\"$NIX_CFLAGS_COMPILE\"
         echo LDFLAGS=\"$(plan9portLinkFlags)\"
         echo X11=\"${libXt_dev}/include\"
-- 
GitLab


From cc5baf2d8671d2f2dd9e00fc8bbc96d769ec27e0 Mon Sep 17 00:00:00 2001
From: Thomas Kerber <tk@drwx.org>
Date: Sat, 17 Aug 2019 17:42:22 +0100
Subject: [PATCH 0410/2254] Various: Add support for raspberry pi 4.

---
 .../installer/cd-dvd/sd-image-raspberrypi.nix |  2 +-
 .../cd-dvd/sd-image-raspberrypi4.nix          | 31 +++++++++++++++++++
 .../loader/raspberrypi/raspberrypi-builder.sh | 10 +++++-
 .../boot/loader/raspberrypi/raspberrypi.nix   |  6 ++--
 .../boot/loader/raspberrypi/uboot-builder.nix |  6 ++--
 nixos/release.nix                             |  5 +++
 .../linux/device-tree/raspberrypi.nix         |  3 +-
 .../firmware/raspberrypi-wireless/default.nix | 12 +++----
 .../linux/firmware/raspberrypi/default.nix    |  4 +--
 pkgs/os-specific/linux/kernel/linux-rpi.nix   | 31 ++++++++++++-------
 pkgs/top-level/aliases.nix                    |  2 ++
 pkgs/top-level/all-packages.nix               | 29 +++++++++++++++--
 12 files changed, 112 insertions(+), 29 deletions(-)
 create mode 100644 nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix

diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
index 2a131d9ce98..ba4127eaa0e 100644
--- a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
@@ -19,7 +19,7 @@ in
   boot.loader.generic-extlinux-compatible.enable = true;
 
   boot.consoleLogLevel = lib.mkDefault 7;
-  boot.kernelPackages = pkgs.linuxPackages_rpi;
+  boot.kernelPackages = pkgs.linuxPackages_rpi1;
 
   sdImage = {
     populateFirmwareCommands = let
diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix
new file mode 100644
index 00000000000..c545a1e7e24
--- /dev/null
+++ b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix
@@ -0,0 +1,31 @@
+# To build, use:
+# nix-build nixos -I nixos-config=nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix -A config.system.build.sdImage
+{ config, lib, pkgs, ... }:
+
+{
+  imports = [
+    ../../profiles/base.nix
+    ../../profiles/installation-device.nix
+    ./sd-image.nix
+  ];
+
+  boot.loader.grub.enable = false;
+  boot.loader.raspberryPi.enable = true;
+  boot.loader.raspberryPi.version = 4;
+  boot.kernelPackages = pkgs.linuxPackages_rpi4;
+
+  boot.consoleLogLevel = lib.mkDefault 7;
+
+  sdImage = {
+    firmwareSize = 128;
+    # This is a hack to avoid replicating config.txt from boot.loader.raspberryPi
+    populateFirmwareCommands =
+      "${config.system.build.installBootLoader} ${config.system.build.toplevel} -d ./firmware";
+    # As the boot process is done entirely in the firmware partition.
+    populateRootCommands = "";
+  };
+
+  # the installation media is also the installation target,
+  # so we don't want to provide the installation configuration.nix.
+  installer.cloneConfig = false;
+}
diff --git a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.sh b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.sh
index 0fb07de10c0..c8b5bf2e61a 100644
--- a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.sh
+++ b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.sh
@@ -71,7 +71,7 @@ addEntry() {
 
     local kernel=$(readlink -f $path/kernel)
     local initrd=$(readlink -f $path/initrd)
-    local dtb_path=$(readlink -f $path/kernel-modules/dtbs)
+    local dtb_path=$(readlink -f $path/dtbs)
 
     if test -n "@copyKernels@"; then
         copyToKernelsDir $kernel; kernel=$result
@@ -113,10 +113,18 @@ done
 fwdir=@firmware@/share/raspberrypi/boot/
 copyForced $fwdir/bootcode.bin  $target/bootcode.bin
 copyForced $fwdir/fixup.dat     $target/fixup.dat
+copyForced $fwdir/fixup4.dat    $target/fixup4.dat
+copyForced $fwdir/fixup4cd.dat  $target/fixup4cd.dat
+copyForced $fwdir/fixup4db.dat  $target/fixup4db.dat
+copyForced $fwdir/fixup4x.dat   $target/fixup4x.dat
 copyForced $fwdir/fixup_cd.dat  $target/fixup_cd.dat
 copyForced $fwdir/fixup_db.dat  $target/fixup_db.dat
 copyForced $fwdir/fixup_x.dat   $target/fixup_x.dat
 copyForced $fwdir/start.elf     $target/start.elf
+copyForced $fwdir/start4.elf    $target/start4.elf
+copyForced $fwdir/start4cd.elf  $target/start4cd.elf
+copyForced $fwdir/start4db.elf  $target/start4db.elf
+copyForced $fwdir/start4x.elf   $target/start4x.elf
 copyForced $fwdir/start_cd.elf  $target/start_cd.elf
 copyForced $fwdir/start_db.elf  $target/start_db.elf
 copyForced $fwdir/start_x.elf   $target/start_x.elf
diff --git a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
index 1c8354e5269..337afe9ef62 100644
--- a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
+++ b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
@@ -59,7 +59,7 @@ in
 
       version = mkOption {
         default = 2;
-        type = types.enum [ 0 1 2 3 ];
+        type = types.enum [ 0 1 2 3 4 ];
         description = ''
         '';
       };
@@ -97,8 +97,8 @@ in
 
   config = mkIf cfg.enable {
     assertions = singleton {
-      assertion = !pkgs.stdenv.hostPlatform.isAarch64 || cfg.version == 3;
-      message = "Only Raspberry Pi 3 supports aarch64.";
+      assertion = !pkgs.stdenv.hostPlatform.isAarch64 || cfg.version >= 3;
+      message = "Only Raspberry Pi >= 3 supports aarch64.";
     };
 
     system.build.installBootLoader = builder;
diff --git a/nixos/modules/system/boot/loader/raspberrypi/uboot-builder.nix b/nixos/modules/system/boot/loader/raspberrypi/uboot-builder.nix
index 9d4f8a93d28..1dc397e521b 100644
--- a/nixos/modules/system/boot/loader/raspberrypi/uboot-builder.nix
+++ b/nixos/modules/system/boot/loader/raspberrypi/uboot-builder.nix
@@ -10,11 +10,13 @@ let
       pkgs.ubootRaspberryPi
     else if version == 2 then
       pkgs.ubootRaspberryPi2
-    else
+    else if version == 3 then
       if isAarch64 then
         pkgs.ubootRaspberryPi3_64bit
       else
-        pkgs.ubootRaspberryPi3_32bit;
+        pkgs.ubootRaspberryPi3_32bit
+    else
+      throw "U-Boot is not yet supported on the raspberry pi 4.";
 
   extlinuxConfBuilder =
     import ../generic-extlinux-compatible/extlinux-conf-builder.nix {
diff --git a/nixos/release.nix b/nixos/release.nix
index c7c60965890..3227d509619 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -180,6 +180,11 @@ in rec {
     inherit system;
   });
 
+  sd_image_raspberrypi4 = forMatchingSystems [ "aarch64-linux" ] (system: makeSdImage {
+    module = ./modules/installer/cd-dvd/sd-image-raspberrypi4.nix;
+    inherit system;
+  });
+
   # A bootable VirtualBox virtual appliance as an OVA file (i.e. packaged OVF).
   ova = forMatchingSystems [ "x86_64-linux" ] (system:
 
diff --git a/pkgs/os-specific/linux/device-tree/raspberrypi.nix b/pkgs/os-specific/linux/device-tree/raspberrypi.nix
index a77200a68f7..5e99e870ac8 100644
--- a/pkgs/os-specific/linux/device-tree/raspberrypi.nix
+++ b/pkgs/os-specific/linux/device-tree/raspberrypi.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation {
 
     cp ${raspberrypifw}/share/raspberrypi/boot/bcm*.dtb .
 
-    cp bcm2708-rpi-0-w.dtb bcm2835-rpi-zero-w.dtb
+    cp bcm2708-rpi-zero-w.dtb bcm2835-rpi-zero-w.dtb
     cp bcm2708-rpi-b.dtb bcm2835-rpi-a.dtb
     cp bcm2708-rpi-b.dtb bcm2835-rpi-b.dtb
     cp bcm2708-rpi-b.dtb bcm2835-rpi-b-rev2.dtb
@@ -23,6 +23,7 @@ stdenvNoCC.mkDerivation {
     cp bcm2710-rpi-3-b.dtb bcm2837-rpi-3-b.dtb
     cp bcm2710-rpi-3-b-plus.dtb bcm2837-rpi-3-b-plus.dtb
     cp bcm2710-rpi-cm3.dtb bcm2837-rpi-cm3.dtb
+    cp bcm2711-rpi-4-b.dtb bcm2838-rpi-4-b.dtb
   '';
 
   passthru = {
diff --git a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix
index e9ee91a2de7..392ddda6f57 100644
--- a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix
+++ b/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix
@@ -2,22 +2,22 @@
 
 stdenv.mkDerivation {
   pname = "raspberrypi-wireless-firmware";
-  version = "2018-08-20";
+  version = "2019-08-16";
 
   srcs = [
     (fetchFromGitHub {
       name = "bluez-firmware";
       owner = "RPi-Distro";
       repo = "bluez-firmware";
-      rev = "ade2bae1aaaebede09abb8fb546f767a0e4c7804";
-      sha256 = "07gm76gxp5anv6paryvxcp34a86fkny8kdlzqhzcpfczzglkp6ag";
+      rev = "96eefffcccc725425fd83be5e0704a5c32b79e54";
+      sha256 = "05h57gcxhb2c84h99cyxxx4mzi6kd5fm8pjqkz3nq5vs3nv8cqhr";
     })
     (fetchFromGitHub {
       name = "firmware-nonfree";
       owner = "RPi-Distro";
       repo = "firmware-nonfree";
-      rev = "b518de45ced519e8f7a499f4778100173402ae43";
-      sha256 = "1d5026ic9awji6c67irpwsxpxgsc0dhn11d3abkxi2vvra1pir4g";
+      rev = "130cb86fa30cafbd575d38865fa546350d4c5f9c";
+      sha256 = "0jmhgbpldzz8n8lncpzwfl5ym8zgss05y952rfpwcf9v5c7vgabx";
     })
   ];
 
@@ -41,7 +41,7 @@ stdenv.mkDerivation {
 
   outputHashMode = "recursive";
   outputHashAlgo = "sha256";
-  outputHash = "1s5gb00v42s5izbaw8irs1fwvhh7z9wl07czc0nkw6p91871ivb7";
+  outputHash = "1r4alf1fbj6vkkf54d0anm47ymb6gn2ykl4a2hhd34b0hnf1dnhn";
 
   meta = with stdenv.lib; {
     description = "Firmware for builtin Wifi/Bluetooth devices in the Raspberry Pi 3 and Zero W";
diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
index ebd69d1fe12..98cf56f799e 100644
--- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
+++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "raspberrypi-firmware";
-  version = "1.20190620+1";
+  version = "1.20190819";
 
   src = fetchFromGitHub {
     owner = "raspberrypi";
     repo = "firmware";
     rev = version;
-    sha256 = "0gbqlkr50qlmbpwr0n61pb58w0k3sfjfirh2y683rlkp5rlq7mrf";
+    sha256 = "0qzpc092qg748i5s23xa1jk6qpga9wn0441r2awsz0apkysqx5fj";
   };
 
   installPhase = ''
diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix
index 1b4700a2e39..0ec879268e9 100644
--- a/pkgs/os-specific/linux/kernel/linux-rpi.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix
@@ -1,8 +1,8 @@
-{ stdenv, lib, buildPackages, fetchFromGitHub, perl, buildLinux, ... } @ args:
+{ stdenv, lib, buildPackages, fetchFromGitHub, perl, buildLinux, rpiVersion, ... } @ args:
 
 let
-  modDirVersion = "4.14.98";
-  tag = "1.20190215";
+  modDirVersion = "4.19.71";
+  tag = "1.20190906";
 in
 lib.overrideDerivation (buildLinux (args // {
   version = "${modDirVersion}-${tag}";
@@ -11,25 +11,33 @@ lib.overrideDerivation (buildLinux (args // {
   src = fetchFromGitHub {
     owner = "raspberrypi";
     repo = "linux";
-    rev = "raspberrypi-kernel_${tag}-1";
-    sha256 = "1gc4x7p82m2v1jhahhyl7qfdkflj71ly6p0fpc1vf9sk13hbwgj2";
+    rev = "9532eb3c84d8d952ef28da3d135683ac01adc9b8";
+    sha256 = "0168wz8kkdzbyha41iqlgn1z1kcy4smg89rgxkgadzq78y7fglpl";
   };
 
   defconfig = {
-    armv6l-linux = "bcmrpi_defconfig";
-    armv7l-linux = "bcm2709_defconfig";
-    aarch64-linux = "bcmrpi3_defconfig";
-  }.${stdenv.hostPlatform.system} or (throw "linux_rpi not supported on '${stdenv.hostPlatform.system}'");
+    "1" = "bcmrpi_defconfig";
+    "2" = "bcm2709_defconfig";
+    "3" = "bcmrpi3_defconfig";
+    "4" = "bcm2711_defconfig";
+  }.${toString rpiVersion};
 
   features = {
     efiBootStub = false;
   } // (args.features or {});
 
-  extraMeta.hydraPlatforms = [ "aarch64-linux" ];
-} // (args.argsOverride or {}))) (oldAttrs: {
+  extraMeta = if (rpiVersion < 3) then {
+    platforms = with lib.platforms; [ arm ];
+    hydraPlatforms = [];
+  } else {
+    platforms = with lib.platforms; [ arm aarch64 ];
+    hydraPlatforms = [ "aarch64-linux" ];
+  };
+})) (oldAttrs: {
   postConfigure = ''
     # The v7 defconfig has this set to '-v7' which screws up our modDirVersion.
     sed -i $buildRoot/.config -e 's/^CONFIG_LOCALVERSION=.*/CONFIG_LOCALVERSION=""/'
+    sed -i $buildRoot/include/config/auto.conf -e 's/^CONFIG_LOCALVERSION=.*/CONFIG_LOCALVERSION=""/'
   '';
 
   # Make copies of the DTBs named after the upstream names so that U-Boot finds them.
@@ -56,5 +64,6 @@ lib.overrideDerivation (buildLinux (args // {
     copyDTB bcm2710-rpi-3-b.dtb bcm2837-rpi-3-b.dtb
     copyDTB bcm2710-rpi-3-b-plus.dtb bcm2837-rpi-3-b-plus.dtb
     copyDTB bcm2710-rpi-cm3.dtb bcm2837-rpi-cm3.dtb
+    copyDTB bcm2711-rpi-4-b.dtb bcm2838-rpi-4-b.dtb
   '';
 })
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index abdbdc11679..e3adaf71850 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -194,6 +194,8 @@ mapAliases ({
   libtidy = html-tidy;  # added 2014-12-21
   libudev = udev; # added 2018-04-25
   links = links2; # added 2016-01-31
+  linux_rpi0 = linux_rpi1;
+  linuxPackages_rpi0 = linuxPackages_rpi1;
   lttngTools = lttng-tools;  # added 2014-07-31
   lttngUst = lttng-ust;  # added 2014-07-31
   lua5_1_sockets = lua51Packages.luasocket; # added 2017-05-02
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 120ffd7504b..fb18681fe19 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15692,10 +15692,32 @@ in
     kernelPatches = linux_4_19.kernelPatches;
   };
 
-  linux_rpi = callPackage ../os-specific/linux/kernel/linux-rpi.nix {
+  linux_rpi1 = callPackage ../os-specific/linux/kernel/linux-rpi.nix {
     kernelPatches = with kernelPatches; [
       bridge_stp_helper
     ];
+    rpiVersion = 1;
+  };
+
+  linux_rpi2 = callPackage ../os-specific/linux/kernel/linux-rpi.nix {
+    kernelPatches = with kernelPatches; [
+      bridge_stp_helper
+    ];
+    rpiVersion = 2;
+  };
+
+  linux_rpi3 = callPackage ../os-specific/linux/kernel/linux-rpi.nix {
+    kernelPatches = with kernelPatches; [
+      bridge_stp_helper
+    ];
+    rpiVersion = 3;
+  };
+
+  linux_rpi4 = callPackage ../os-specific/linux/kernel/linux-rpi.nix {
+    kernelPatches = with kernelPatches; [
+      bridge_stp_helper
+    ];
+    rpiVersion = 4;
   };
 
   linux_4_4 = callPackage ../os-specific/linux/kernel/linux-4.4.nix {
@@ -15945,7 +15967,10 @@ in
 
   # Build the kernel modules for the some of the kernels.
   linuxPackages_mptcp = linuxPackagesFor pkgs.linux_mptcp;
-  linuxPackages_rpi = linuxPackagesFor pkgs.linux_rpi;
+  linuxPackages_rpi1 = linuxPackagesFor pkgs.linux_rpi1;
+  linuxPackages_rpi2 = linuxPackagesFor pkgs.linux_rpi2;
+  linuxPackages_rpi3 = linuxPackagesFor pkgs.linux_rpi3;
+  linuxPackages_rpi4 = linuxPackagesFor pkgs.linux_rpi4;
   linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4);
   linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9);
   linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14);
-- 
GitLab


From d0c6414938ee183e5df0f5136a1e66da5b4b148e Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 16 Sep 2019 22:16:37 -0500
Subject: [PATCH 0411/2254] cpustat: newlines between (most) attributes

Exception is made for pname/version as is convention.
---
 pkgs/os-specific/linux/cpustat/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/os-specific/linux/cpustat/default.nix b/pkgs/os-specific/linux/cpustat/default.nix
index 8c0d206a8d1..23ed2b07c96 100644
--- a/pkgs/os-specific/linux/cpustat/default.nix
+++ b/pkgs/os-specific/linux/cpustat/default.nix
@@ -3,15 +3,19 @@
 stdenv.mkDerivation rec {
   pname = "cpustat";
   version = "0.02.09";
+
   src = fetchurl {
     url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.xz";
     sha256 = "12xahv65yrhs5r830clkl1qnwg3dnrk5qn3zsznzbv1iy2f3cj7y";
   };
+
   buildInputs = [ ncurses ];
+
   installFlags = [
     "BINDIR=${placeholder "out"}/bin"
     "MANDIR=${placeholder "out"}/share/man/man8"
   ];
+
   meta = with lib; {
     description = "CPU usage monitoring tool";
     homepage = "https://kernel.ubuntu.com/~cking/cpustat/";
-- 
GitLab


From 647a90fd925bb47423423b878faccf635be2c982 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 16 Sep 2019 22:18:26 -0500
Subject: [PATCH 0412/2254] power-calibrate: whitespace touchup

---
 pkgs/os-specific/linux/power-calibrate/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/os-specific/linux/power-calibrate/default.nix b/pkgs/os-specific/linux/power-calibrate/default.nix
index da83a3bc357..75c6f1716fc 100644
--- a/pkgs/os-specific/linux/power-calibrate/default.nix
+++ b/pkgs/os-specific/linux/power-calibrate/default.nix
@@ -3,14 +3,17 @@
 stdenv.mkDerivation rec {
   pname = "power-calibrate";
   version = "0.01.28";
+
   src = fetchurl {
     url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.gz";
     sha256 = "1miyjs0vngzfdlsxhn5gndcalzkh28grg4m6faivvp1c6mjp794m";
   };
+
   installFlags = [
     "BINDIR=${placeholder "out"}/bin"
     "MANDIR=${placeholder "out"}/share/man/man8"
   ];
+
   meta = with lib; {
     description = "Tool to calibrate power consumption";
     homepage = "https://kernel.ubuntu.com/~cking/power-calibrate/";
-- 
GitLab


From 93818840793620b11d73f9eac0ab29bea8154caa Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 16 Sep 2019 22:19:02 -0500
Subject: [PATCH 0413/2254] health-check: whitespace between attributes

---
 pkgs/os-specific/linux/health-check/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/os-specific/linux/health-check/default.nix b/pkgs/os-specific/linux/health-check/default.nix
index e76d77a4448..c90029907c0 100644
--- a/pkgs/os-specific/linux/health-check/default.nix
+++ b/pkgs/os-specific/linux/health-check/default.nix
@@ -3,16 +3,21 @@
 stdenv.mkDerivation rec {
   pname = "health-check";
   version = "0.03.02";
+
   src = fetchurl {
     url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.gz";
     sha256 = "12n2qp5lrlahkgrkwy3mjm0nscz6yhhh80z4xmd2n96pn8f3d4hh";
   };
+
   buildInputs = [ json_c libbsd ];
+
   makeFlags = [ "JSON_OUTPUT=y" "FNOTIFY=y" ];
+
   installFlags = [
     "BINDIR=${placeholder "out"}/bin"
     "MANDIR=${placeholder "out"}/share/man/man8"
   ];
+
   meta = with lib; {
     description = "Process monitoring tool";
     homepage = "https://kernel.ubuntu.com/~cking/health-check/";
-- 
GitLab


From be3dae2e3ac9a088d23b7770ef42ca6d35510a2d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 17 Sep 2019 08:37:56 +0200
Subject: [PATCH 0414/2254] nixos: improve the example that shows how to
 include nvidia_x11 in boot.extraModulePackages

Fixes https://github.com/NixOS/nixpkgs/issues/68931.
---
 nixos/modules/system/boot/kernel.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix
index 50dbf2f8365..8a309f3bc5f 100644
--- a/nixos/modules/system/boot/kernel.nix
+++ b/nixos/modules/system/boot/kernel.nix
@@ -108,7 +108,7 @@ in
     boot.extraModulePackages = mkOption {
       type = types.listOf types.package;
       default = [];
-      example = literalExample "[ pkgs.linuxPackages.nvidia_x11 ]";
+      example = literalExample "[ config.boot.kernelPackages.nvidia_x11 ]";
       description = "A list of additional packages supplying kernel modules.";
     };
 
-- 
GitLab


From aceac9d531b72a49546f743ef96ee515770295c9 Mon Sep 17 00:00:00 2001
From: talyz <kim.lindberger@gmail.com>
Date: Mon, 16 Sep 2019 16:22:18 +0200
Subject: [PATCH 0415/2254] nixos/gitlab: Add gnutar and gzip to
 gitlab-sidekiq's path

Tar and gzip are needed when importing GitLab project exports.
---
 nixos/modules/services/misc/gitlab.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index 66da6864fca..1e1eb0fd9a1 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -673,6 +673,10 @@ in {
         openssh
         nodejs
         gnupg
+
+        # Needed for GitLab project imports
+        gnutar
+        gzip
       ];
       serviceConfig = {
         Type = "simple";
-- 
GitLab


From 80ddf729869fe65236a18056c1a751d55efc6013 Mon Sep 17 00:00:00 2001
From: David Wood <david@davidtw.co>
Date: Mon, 16 Sep 2019 16:20:05 +0100
Subject: [PATCH 0416/2254] pastel: init at 0.5.3

---
 pkgs/applications/misc/pastel/default.nix | 25 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  4 ++++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/applications/misc/pastel/default.nix

diff --git a/pkgs/applications/misc/pastel/default.nix b/pkgs/applications/misc/pastel/default.nix
new file mode 100644
index 00000000000..eac6d131b35
--- /dev/null
+++ b/pkgs/applications/misc/pastel/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, rustPlatform, Security }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "pastel";
+  version = "0.5.3";
+
+  src = fetchFromGitHub {
+    owner = "sharkdp";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0f54p3pzfp7xrwlqn61l7j41vmgcfph3bhq2khxh5apfwwdx9nng";
+  };
+
+  cargoSha256 = "05yvlm7z3zfn8qd8nb9zpch9xsfzidrpyrgg2vij3h3q095mdm66";
+
+  buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
+
+  meta = with stdenv.lib; {
+    description = "A command-line tool to generate, analyze, convert and manipulate colors";
+    homepage = https://github.com/sharkdp/pastel;
+    license = with licenses; [ asl20 /* or */ mit ];
+    maintainers = with maintainers; [ davidtwco ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7668880edbf..6327f792219 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1872,6 +1872,10 @@ in
 
   optar = callPackage ../tools/graphics/optar {};
 
+  pastel = callPackage ../applications/misc/pastel {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
+
   patdiff = callPackage ../tools/misc/patdiff { };
 
   pbpst = callPackage ../applications/misc/pbpst { };
-- 
GitLab


From f924dc9f9917e90064b41ee377749580d7736b52 Mon Sep 17 00:00:00 2001
From: marius851000 <mariusdavid@laposte.net>
Date: Tue, 17 Sep 2019 12:38:55 +0200
Subject: [PATCH 0417/2254] protonvpn-cli: fix missing runtime dependancies

---
 pkgs/applications/networking/protonvpn-cli/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/protonvpn-cli/default.nix b/pkgs/applications/networking/protonvpn-cli/default.nix
index e79ca515b51..f426a7c3a58 100644
--- a/pkgs/applications/networking/protonvpn-cli/default.nix
+++ b/pkgs/applications/networking/protonvpn-cli/default.nix
@@ -28,12 +28,9 @@ in stdenv.mkDerivation rec {
         "  echo \"Connecting...\"" \
         "  sed -ri 's@${expectedUpdateResolvPath}@${actualUpdateResolvePath}@g' \"\$openvpn_config\"; echo \"Connecting...\""
     cp protonvpn-cli.sh "$out/bin/protonvpn-cli"
-    ln -s "$out/bin/protonvpn-cli" "$out/bin/pvpn"
-  '';
-
-  postInstallPhase = ''
-    wrapProgram $out/protonvpn-cli \
+    wrapProgram $out/bin/protonvpn-cli \
       --prefix PATH : ${lib.makeBinPath [ coreutils openvpn python dialog wget update-resolv-conf ]}
+    ln -s "$out/bin/protonvpn-cli" "$out/bin/pvpn"
   '';
 
   meta = with stdenv.lib; {
-- 
GitLab


From f8860eb6701d316ae6497b72195bc1c5b2a61666 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20M=C3=B6ller?= <fabianm88@gmail.com>
Date: Tue, 17 Sep 2019 14:24:04 +0200
Subject: [PATCH 0418/2254] boringtun: fix darwin build

---
 pkgs/tools/networking/boringtun/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/boringtun/default.nix b/pkgs/tools/networking/boringtun/default.nix
index 068d51229cb..05e9ba1282e 100644
--- a/pkgs/tools/networking/boringtun/default.nix
+++ b/pkgs/tools/networking/boringtun/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, rustPlatform }:
+{ stdenv, fetchFromGitHub, rustPlatform, darwin }:
 
 rustPlatform.buildRustPackage rec {
   pname = "boringtun";
@@ -21,6 +21,8 @@ rustPlatform.buildRustPackage rec {
   # we append a new line to the end of file.
   preConfigure = "echo '' >> .cargo/config";
 
+  buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
+
   # Testing this project requires sudo, Docker and network access, etc.
   doCheck = false;
 
-- 
GitLab


From 6d370a57b4485cd256f55899e9f64a2b295ce66d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Tue, 17 Sep 2019 09:54:20 -0300
Subject: [PATCH 0419/2254] papirus-maia-icon-theme: init at 2019-07-26

---
 .../icons/papirus-maia-icon-theme/default.nix | 36 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/data/icons/papirus-maia-icon-theme/default.nix

diff --git a/pkgs/data/icons/papirus-maia-icon-theme/default.nix b/pkgs/data/icons/papirus-maia-icon-theme/default.nix
new file mode 100644
index 00000000000..e15e64c2101
--- /dev/null
+++ b/pkgs/data/icons/papirus-maia-icon-theme/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub, cmake, gtk3 }:
+
+stdenv.mkDerivation rec {
+  pname = "papirus-maia-icon-theme";
+  version = "2019-07-26";
+
+  src = fetchFromGitHub {
+    owner = "Ste74";
+    repo = pname;
+    rev = "90d47c817cc0edeed8b5a90335e669948ff4a116";
+    sha256 = "0d6lvdg5nw5wfaq8lxszcws174vg12ywkrqzn6czimhmhp48jf5p";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    gtk3
+  ];
+
+  postPatch = ''
+    substituteInPlace CMakeLists.txt --replace /usr "$out"
+  '';
+
+  postFixup = ''
+    for theme in $out/share/icons/*; do
+      gtk-update-icon-cache $theme
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Manjaro variation of Papirus icon theme";
+    homepage = https://github.com/Ste74/papirus-maia-icon-theme;
+    license = licenses.lgpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ romildo ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 39a98790390..4be1da1b832 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16949,6 +16949,8 @@ in
 
   papirus-icon-theme = callPackage ../data/icons/papirus-icon-theme { };
 
+  papirus-maia-icon-theme = callPackage ../data/icons/papirus-maia-icon-theme { };
+
   papis = with python3Packages; toPythonApplication papis;
 
   paps = callPackage ../tools/misc/paps { };
-- 
GitLab


From 527fc0032536c7bc80451ac980d961c264a82a3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20M=C3=B6ller?= <fabianm88@gmail.com>
Date: Tue, 17 Sep 2019 16:25:09 +0200
Subject: [PATCH 0420/2254] csvs-to-sqlite: 0.9 -> 1.0

---
 .../development/python-modules/csvs-to-sqlite/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/csvs-to-sqlite/default.nix b/pkgs/development/python-modules/csvs-to-sqlite/default.nix
index ab9ca982718..0e5e902be2e 100644
--- a/pkgs/development/python-modules/csvs-to-sqlite/default.nix
+++ b/pkgs/development/python-modules/csvs-to-sqlite/default.nix
@@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
+, isPy3k
 , pytestrunner
 , click
 , dateparser
@@ -12,17 +13,16 @@
 
 buildPythonPackage rec {
   pname = "csvs-to-sqlite";
-  version = "0.9";
+  version = "1.0";
+  disabled = !isPy3k;
 
   src = fetchFromGitHub {
     owner = "simonw";
     repo = pname;
     rev = version;
-    sha256 = "0js86m4kj70g9n9gagr8l6kgswqllg6hn1xa3yvxwv95i59ihpz5";
+    sha256 = "0n80y9a6qhbhhbz64jdpscx0nha9jn9nygp9nkgszmw04ri5j5hm";
   };
 
-  buildInputs = [ pytestrunner ];
-
   propagatedBuildInputs = [
     click
     dateparser
-- 
GitLab


From 36daaa7c6796ac4117e81ebfcd162ccb3d86d499 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Tue, 17 Sep 2019 12:08:41 -0300
Subject: [PATCH 0421/2254] mate.atril: 1.22.1 -> 1.22.2

---
 pkgs/desktops/mate/atril/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix
index 15dea9b1018..f19114a5442 100644
--- a/pkgs/desktops/mate/atril/default.nix
+++ b/pkgs/desktops/mate/atril/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "atril";
-  version = "1.22.1";
+  version = "1.22.2";
 
   src = fetchurl {
     url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0i2wgsksgwhrmajj1lay3iym4dcyj8cdd813yh5mrfz4rkv49190";
+    sha256 = "11l78zkxszvsjr74cmk1wff5ycqrzd89y6k36rydv2rb5af2nsfw";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From c27360ae47a76fe8de6a23a21e19e3d85e13dc0c Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Tue, 17 Sep 2019 20:43:16 +0900
Subject: [PATCH 0422/2254] qemu-guest: allow to override security.rngd

... otherwise enabling it causes a merge conflict.

Enabling it was necessary to give enough entropy for the sshd daemon in
my libvirt/nixops VM to generate keys see
https://github.com/NixOS/nixops/issues/1199.
---
 nixos/modules/profiles/qemu-guest.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/profiles/qemu-guest.nix b/nixos/modules/profiles/qemu-guest.nix
index 315d04093b1..0ea70107f71 100644
--- a/nixos/modules/profiles/qemu-guest.nix
+++ b/nixos/modules/profiles/qemu-guest.nix
@@ -1,7 +1,7 @@
 # Common configuration for virtual machines running under QEMU (using
 # virtio).
 
-{ ... }:
+{ lib, ... }:
 
 {
   boot.initrd.availableKernelModules = [ "virtio_net" "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_scsi" "9p" "9pnet_virtio" ];
@@ -15,5 +15,5 @@
       hwclock -s
     '';
 
-  security.rngd.enable = false;
+  security.rngd.enable = lib.mkDefault false;
 }
-- 
GitLab


From ec885ad2a81cc7122342dc14ee14c238874a1d72 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Tue, 17 Sep 2019 17:35:39 +0200
Subject: [PATCH 0423/2254] prometheus-blackbox-exporter: 0.15.0 -> 0.15.1

---
 pkgs/servers/monitoring/prometheus/blackbox-exporter.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
index 983eb6bf6c8..e15dce8ae45 100644
--- a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "blackbox_exporter";
-  version = "0.15.0";
+  version = "0.15.1";
   rev = version;
 
   goPackagePath = "github.com/prometheus/blackbox_exporter";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "prometheus";
     repo = "blackbox_exporter";
-    sha256 = "06llb37xpn5zjnqkw526vbk4mfdiwrv3yg7aw4365p3gz5dk085i";
+    sha256 = "14z4xkkh9jb6ylclzsyj6gyqrb67lxs5cxd7lrs70qli567gzqwc";
   };
 
   doCheck = true;
-- 
GitLab


From d73ccc66e11b3bf5e53e8abcace87384b91f0db8 Mon Sep 17 00:00:00 2001
From: David Wood <david@davidtw.co>
Date: Tue, 17 Sep 2019 17:45:39 +0100
Subject: [PATCH 0424/2254] franz: 5.3.2 -> 5.3.3

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

diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix
index 4ebb5bf86cb..46a27737d23 100644
--- a/pkgs/applications/networking/instant-messengers/franz/default.nix
+++ b/pkgs/applications/networking/instant-messengers/franz/default.nix
@@ -3,13 +3,13 @@
 , gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }:
 
 let
-  version = "5.3.2";
+  version = "5.3.3";
 in stdenv.mkDerivation {
   pname = "franz";
   inherit version;
   src = fetchurl {
     url = "https://github.com/meetfranz/franz/releases/download/v${version}/franz_${version}_amd64.deb";
-    sha256 = "19mfw0wgjdhq38p0xvixdxvk07j3rdwlw87p8gjh4yi1qv0paj4i";
+    sha256 = "03ii1gpc2wijy917565pqig1ihd4zhal12i2f5k916i7fp8912m1";
   };
 
   # don't remove runtime deps
-- 
GitLab


From 446dd2543d8be0d53c30166133dd964a5340e214 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 17 Sep 2019 13:28:21 -0400
Subject: [PATCH 0425/2254] scribusUnstable: drop harfbuzz

---
 pkgs/applications/office/scribus/unstable.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/scribus/unstable.nix b/pkgs/applications/office/scribus/unstable.nix
index eef57179b3e..3c5ae4c4b0a 100644
--- a/pkgs/applications/office/scribus/unstable.nix
+++ b/pkgs/applications/office/scribus/unstable.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, mkDerivation, pkgconfig, cmake, qtbase, cairo, pixman,
 boost, cups, fontconfig, freetype, hunspell, libjpeg, libtiff, libxml2, lcms2,
-podofo, poppler, poppler_data, python2, harfbuzz, qtimageformats, qttools, harfbuzzFull }:
+podofo, poppler, poppler_data, python2, qtimageformats, qttools, harfbuzzFull }:
 
 let
   pythonEnv = python2.withPackages(ps: [ps.tkinter ps.pillow]);
@@ -20,7 +20,7 @@ mkDerivation rec {
   buildInputs = [
     qtbase cairo pixman boost cups fontconfig
     freetype hunspell libjpeg libtiff libxml2 lcms2 podofo poppler
-    poppler_data pythonEnv harfbuzz qtimageformats qttools harfbuzzFull
+    poppler_data pythonEnv qtimageformats qttools harfbuzzFull
   ];
 
   meta = {
-- 
GitLab


From 35fe50352fa4ea295fda43e429b4581533e48af4 Mon Sep 17 00:00:00 2001
From: "Antoine R. Dumont (@ardumont)" <antoine.romain.dumont@gmail.com>
Date: Thu, 7 Mar 2019 11:29:25 +0100
Subject: [PATCH 0426/2254] nixos/minidlna: Allow more configuration options

This commits allows the user to configure:
- more minidlna options
- the ones not yet disclosed in nix (extending the existing minimal subset)
---
 .../modules/services/networking/minidlna.nix  | 67 ++++++++++++++++++-
 nixos/tests/all-tests.nix                     |  1 +
 nixos/tests/minidlna.nix                      | 39 +++++++++++
 3 files changed, 105 insertions(+), 2 deletions(-)
 create mode 100644 nixos/tests/minidlna.nix

diff --git a/nixos/modules/services/networking/minidlna.nix b/nixos/modules/services/networking/minidlna.nix
index 0947471adbc..3ddea3c9757 100644
--- a/nixos/modules/services/networking/minidlna.nix
+++ b/nixos/modules/services/networking/minidlna.nix
@@ -36,6 +36,37 @@ in
         '';
     };
 
+    services.minidlna.friendlyName = mkOption {
+      type = types.str;
+      default = "${config.networking.hostName} MiniDLNA";
+      defaultText = "$HOSTNAME MiniDLNA";
+      example = "rpi3";
+      description =
+        ''
+          Name that the DLNA server presents to clients.
+        '';
+    };
+
+    services.minidlna.rootContainer = mkOption {
+      type = types.str;
+      default = ".";
+      example = "B";
+      description =
+        ''
+          Use a different container as the root of the directory tree presented
+          to clients. The possible values are:
+          - "." - standard container
+          - "B" - "Browse Directory"
+          - "M" - "Music"
+          - "P" - "Pictures"
+          - "V" - "Video"
+          - Or, you can specify the ObjectID of your desired root container
+            (eg. 1$F for Music/Playlists)
+          If you specify "B" and the client device is audio-only then
+          "Music/Folders" will be used as root.
+         '';
+    };
+
     services.minidlna.loglevel = mkOption {
       type = types.str;
       default = "warn";
@@ -66,7 +97,37 @@ in
 
     services.minidlna.config = mkOption {
       type = types.lines;
-      description = "The contents of MiniDLNA's configuration file.";
+      description =
+      ''
+        The contents of MiniDLNA's configuration file.
+        When the service is activated, a basic template is generated
+        from the current options opened here.
+      '';
+    };
+
+    services.minidlna.extraConfig = mkOption {
+      type = types.lines;
+      default = "";
+      example = ''
+        # Not exhaustive example
+        # Support for streaming .jpg and .mp3 files to a TiVo supporting HMO.
+        enable_tivo=no
+        # SSDP notify interval, in seconds.
+        notify_interval=10
+        # maximum number of simultaneous connections
+        # note: many clients open several simultaneous connections while
+        # streaming
+        max_connections=50
+        # set this to yes to allow symlinks that point outside user-defined
+        # media_dirs.
+        wide_links=yes
+      '';
+      description =
+      ''
+        Extra minidlna options not yet opened for configuration here
+        (strict_dlna, model_number, model_name, etc...).  This is appended
+        to the current service already provided.
+      '';
     };
   };
 
@@ -75,13 +136,15 @@ in
     services.minidlna.config =
       ''
         port=${toString port}
-        friendly_name=${config.networking.hostName} MiniDLNA
+        friendly_name=${cfg.friendlyName}
         db_dir=/var/cache/minidlna
         log_level=${cfg.loglevel}
         inotify=yes
+        root_container=${cfg.rootContainer}
         ${concatMapStrings (dir: ''
           media_dir=${dir}
         '') cfg.mediaDirs}
+        ${cfg.extraConfig}
       '';
 
     users.users.minidlna = {
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index e2c62cd306d..5643da99e55 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -162,6 +162,7 @@ in
   metabase = handleTest ./metabase.nix {};
   miniflux = handleTest ./miniflux.nix {};
   minio = handleTest ./minio.nix {};
+  minidlna = handleTest ./minidlna.nix {};
   misc = handleTest ./misc.nix {};
   mongodb = handleTest ./mongodb.nix {};
   moodle = handleTest ./moodle.nix {};
diff --git a/nixos/tests/minidlna.nix b/nixos/tests/minidlna.nix
new file mode 100644
index 00000000000..7bf1bed69d0
--- /dev/null
+++ b/nixos/tests/minidlna.nix
@@ -0,0 +1,39 @@
+import ./make-test.nix ({ pkgs, ... }: {
+  name = "minidlna";
+
+  nodes = {
+    server =
+      { ... }:
+      {
+        imports = [ ../modules/profiles/minimal.nix ];
+        networking.firewall.allowedTCPPorts = [ 8200 ];
+        services.minidlna = {
+          enable = true;
+          loglevel = "error";
+          mediaDirs = [
+           "PV,/tmp/stuff"
+          ];
+          friendlyName = "rpi3";
+          rootContainer = "B";
+          extraConfig =
+          ''
+            album_art_names=Cover.jpg/cover.jpg/AlbumArtSmall.jpg/albumartsmall.jpg
+            album_art_names=AlbumArt.jpg/albumart.jpg/Album.jpg/album.jpg
+            album_art_names=Folder.jpg/folder.jpg/Thumb.jpg/thumb.jpg
+            notify_interval=60
+          '';
+        };
+      };
+      client = { ... }: { };
+  };
+
+  testScript =
+  ''
+    startAll;
+    $server->succeed("mkdir -p /tmp/stuff && chown minidlna: /tmp/stuff");
+    $server->waitForUnit("minidlna");
+    $server->waitForOpenPort("8200");
+    $server->succeed("curl --fail http://localhost:8200/");
+    $client->succeed("curl --fail http://server:8200/");
+  '';
+})
-- 
GitLab


From 84d4243ccc6677a1e76f2f85efcc07fac5279efb Mon Sep 17 00:00:00 2001
From: ysander <ysander@techfak.uni-bielefeld.de>
Date: Sat, 3 Aug 2019 16:28:49 +0200
Subject: [PATCH 0427/2254] solaar: track latest release and set correct repo
 owner

Update project homepage

Drop 'unstable' package name attribute
---
 pkgs/applications/misc/solaar/default.nix | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/misc/solaar/default.nix b/pkgs/applications/misc/solaar/default.nix
index f2e1aa6bdb6..722b0bc5077 100644
--- a/pkgs/applications/misc/solaar/default.nix
+++ b/pkgs/applications/misc/solaar/default.nix
@@ -1,17 +1,14 @@
 { fetchFromGitHub, lib, gobject-introspection, gtk3, python3Packages }:
-
 # Although we copy in the udev rules here, you probably just want to use logitech-udev-rules instead of
 # adding this to services.udev.packages on NixOS
-
-python3Packages.buildPythonApplication {
-  pname = "solaar-unstable";
-  version = "2019-01-30";
-
+python3Packages.buildPythonApplication rec {
+  pname = "solaar";
+  version = "1.0.1";
   src = fetchFromGitHub {
-    owner = "pwr";
+    owner = "pwr-Solaar";
     repo = "Solaar";
-    rev = "c07c115ee379e82db84283aaa29dc53df033a8c8";
-    sha256 = "0xg181xcwzzs8pdqvjrkjyaaga7ir93hzjvd17j9g3ns8xfj2mvr";
+    rev = "${version}";
+    sha256 = "1ni3aimpl9vyhwzi61mvm8arkii52cmb6bzjma9cnkjyx328pkid";
   };
 
   propagatedBuildInputs = with python3Packages; [ gobject-introspection gtk3 pygobject3 pyudev ];
@@ -28,7 +25,6 @@ python3Packages.buildPythonApplication {
   '';
 
   enableParallelBuilding = true;
-
   meta = with lib; {
     description = "Linux devices manager for the Logitech Unifying Receiver";
     longDescription = ''
@@ -43,7 +39,7 @@ python3Packages.buildPythonApplication {
       To be able to use it, make sure you have access to /dev/hidraw* files.
     '';
     license = licenses.gpl2;
-    homepage = https://pwr.github.io/Solaar/;
+    homepage = https://pwr-solaar.github.io/Solaar/;
     platforms = platforms.linux;
     maintainers = with maintainers; [ spinus ysndr ];
   };
-- 
GitLab


From f01224374d61d1e6b9d9b256c646746df7a47cdd Mon Sep 17 00:00:00 2001
From: Alex Whitt <alex.joseph.whitt@gmail.com>
Date: Tue, 6 Aug 2019 11:08:18 -0400
Subject: [PATCH 0428/2254] nixos/jenkins: Copy plugins as .jpi to fix
 initialization errors

---
 .../modules/services/continuous-integration/jenkins/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix
index ec6a36413fe..0ec90671388 100644
--- a/nixos/modules/services/continuous-integration/jenkins/default.nix
+++ b/nixos/modules/services/continuous-integration/jenkins/default.nix
@@ -193,7 +193,7 @@ in {
               then ""
               else
                 let pluginCmds = lib.attrsets.mapAttrsToList
-                      (n: v: "cp ${v} ${cfg.home}/plugins/${n}.hpi")
+                      (n: v: "cp ${v} ${cfg.home}/plugins/${n}.jpi")
                       cfg.plugins;
                 in ''
                   rm -r ${cfg.home}/plugins || true
-- 
GitLab


From 5667484b642f87144ca975e1b96b1eab3771a4b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 17 Sep 2019 20:24:28 +0200
Subject: [PATCH 0429/2254] ntopng: mark as broken

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

diff --git a/pkgs/tools/networking/ntopng/default.nix b/pkgs/tools/networking/ntopng/default.nix
index 06d28e844ff..d745ba8d14d 100644
--- a/pkgs/tools/networking/ntopng/default.nix
+++ b/pkgs/tools/networking/ntopng/default.nix
@@ -62,5 +62,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3Plus;
     platforms = platforms.linux ++ platforms.darwin;
     maintainers = [ maintainers.bjornfor ];
+    broken = true;  # broken since commit "libpcap: 1.8.1 -> 1.9.0"
   };
 }
-- 
GitLab


From 1897cf8ad8def31e056758093a498384e06daa21 Mon Sep 17 00:00:00 2001
From: Vlad Artamonov <742047+vladdy@users.noreply.github.com>
Date: Tue, 17 Sep 2019 14:29:57 -0400
Subject: [PATCH 0430/2254] pulumi: 0.17.27 -> 1.1.0

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

diff --git a/pkgs/tools/admin/pulumi/default.nix b/pkgs/tools/admin/pulumi/default.nix
index de09931e7c1..a7199c66547 100644
--- a/pkgs/tools/admin/pulumi/default.nix
+++ b/pkgs/tools/admin/pulumi/default.nix
@@ -4,17 +4,17 @@ with lib;
 
 let
 
-  version = "0.17.27";
+  version = "1.1.0";
 
   # switch the dropdown to “manual” on https://pulumi.io/quickstart/install.html # TODO: update script
   pulumiArchPackage = {
     x86_64-linux = {
       url = "https://get.pulumi.com/releases/sdk/pulumi-v${version}-linux-x64.tar.gz";
-      sha256 = "13ajgc8x5l3s93hmz6jg88if10bvd319jmkljy4n26zdp30vfqmw";
+      sha256 = "1r498pxsjdj9mhdzh9vh4nw8fcjxfga44xlg43b0yakkgrp7c224";
     };
     x86_64-darwin = {
       url = "https://get.pulumi.com/releases/sdk/pulumi-v${version}-darwin-x64.tar.gz";
-      sha256 = "0chpbnz2s4icwgmfq6kl8blz5mg4lpdqg061w3nh0p04adpgrn48";
+      sha256 = "02nr5yxn5aqgbwrnl4shgd6rh4n4v8giqki4qkbgx74xf3bbwihg";
     };
   };
 
-- 
GitLab


From 1c8ed8fd7ee6d55c1758eaac600a5c40c072243a Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 17 Sep 2019 21:25:34 +0200
Subject: [PATCH 0431/2254] gitRepo: 1.13.5.1 -> 1.13.6

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

diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix
index b26548ebe99..0128eb9da2c 100644
--- a/pkgs/applications/version-management/git-repo/default.nix
+++ b/pkgs/applications/version-management/git-repo/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "git-repo";
-  version = "1.13.5.1";
+  version = "1.13.6";
 
   src = fetchFromGitHub {
     owner = "android";
     repo = "tools_repo";
     rev = "v${version}";
-    sha256 = "13rp0fq76a6qlw60pnipkgfng25i0ygyk66y30jv7hy8ip4aa92n";
+    sha256 = "1a12h84anf3sshkkcv30ljgibb35gmh01bmi6sicyhxbn1hrfi3w";
   };
 
   nativeBuildInputs = [ makeWrapper ];
-- 
GitLab


From 7f6e616fee2e79526cbe700b3f937c8abe1de2c1 Mon Sep 17 00:00:00 2001
From: Roman Volosatovs <rvolosatovs@riseup.net>
Date: Tue, 17 Sep 2019 00:17:36 +0200
Subject: [PATCH 0432/2254] packr: 2.5.2 -> 2.6.0

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

diff --git a/pkgs/development/libraries/packr/default.nix b/pkgs/development/libraries/packr/default.nix
index bc8133aaf82..e2be8ded31c 100644
--- a/pkgs/development/libraries/packr/default.nix
+++ b/pkgs/development/libraries/packr/default.nix
@@ -5,16 +5,18 @@
 
 buildGoModule rec {
   pname = "packr";
-  version = "2.5.2";
+  version = "2.6.0";
 
   src = fetchFromGitHub {
     owner = "gobuffalo";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1ciffa5xbd93fylwz93wr4m4fj83dcla55dmdshaqz28rbsapnc1";
+    sha256 = "11bd0s3hyzvhcg1q0iahv2w9f0w1k57jfxgswhz7dyndxvvr2b8i";
   };
 
-  modSha256 = "086gydrl3i35hawb5m7rsb4a0llcpdpgid1xfw2z9n6jkwkclw4n";
+  subPackages = [ "packr" "v2/packr2" ];
+
+  modSha256 = "0afhkvivma16bi8rz3kwcsz9mhmcn4zm6rrymxkvazx6b844hcdv";
 
   meta = with lib; {
     description = "The simple and easy way to embed static files into Go binaries";
-- 
GitLab


From 944aa2bb0db64bc490889fc4d426248c47a8aad4 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Tue, 17 Sep 2019 22:35:43 +0200
Subject: [PATCH 0433/2254] paperwork: include setuptools to fix startup

---
 pkgs/applications/office/paperwork/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/office/paperwork/default.nix b/pkgs/applications/office/paperwork/default.nix
index adbd4c30a39..79e4b8debc9 100644
--- a/pkgs/applications/office/paperwork/default.nix
+++ b/pkgs/applications/office/paperwork/default.nix
@@ -61,7 +61,7 @@ python3Packages.buildPythonApplication rec {
   '';
 
   propagatedBuildInputs = with python3Packages; [
-    paperwork-backend pypillowfight gtk3 cairo pyxdg dateutil
+    paperwork-backend pypillowfight gtk3 cairo pyxdg dateutil setuptools
   ];
 
   makeWrapperArgs = [
-- 
GitLab


From a8167d10f6d346e6af09ffe10b8505dd3c3cd097 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 17 Sep 2019 16:37:28 -0400
Subject: [PATCH 0434/2254] xfceUnstable: make an alias

To be removed with xfce4-12.
---
 pkgs/top-level/aliases.nix      | 1 +
 pkgs/top-level/all-packages.nix | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index d2d438cf099..6a41829dc7b 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -390,6 +390,7 @@ mapAliases ({
   winusb = woeusb; # added 2017-12-22
   wireguard = wireguard-tools; # added 2018-05-19
   morituri = whipper; # added 2018-09-13
+  xfceUnstable = xfce4-14; # added 2019-09-17
   x11 = xlibsWrapper; # added 2015-09
   xbmc = kodi; # added 2018-04-25
   xbmcPlain = kodiPlain; # added 2018-04-25
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3ba6e479366..1bb8868db8d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22704,7 +22704,6 @@ in
   solarc-gtk-theme = callPackage ../misc/themes/solarc { };
 
   xfce = xfce4-12;
-  xfceUnstable = xfce4-14;
 
   xfce4-12 = recurseIntoAttrs (callPackage ../desktops/xfce { });
   xfce4-14 = recurseIntoAttrs (callPackage ../desktops/xfce4-14 { });
-- 
GitLab


From 5bcec7642fcfc3dec003db62f7634d811e28ed90 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 17 Sep 2019 16:40:00 -0400
Subject: [PATCH 0435/2254] nixos/xfce4-14: remove gtk-xfce-engine

Xfce 4.14 deprecated this.
It had many gtk2 themes that don't work that confused users #68977.
---
 nixos/modules/services/x11/desktop-managers/xfce4-14.nix | 1 -
 pkgs/desktops/xfce4-14/default.nix                       | 7 ++-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/xfce4-14.nix b/nixos/modules/services/x11/desktop-managers/xfce4-14.nix
index 57d1268d655..ae7ee322c64 100644
--- a/nixos/modules/services/x11/desktop-managers/xfce4-14.nix
+++ b/nixos/modules/services/x11/desktop-managers/xfce4-14.nix
@@ -69,7 +69,6 @@ in
 
       exo
       garcon
-      gtk-xfce-engine
       libxfce4ui
       xfconf
 
diff --git a/pkgs/desktops/xfce4-14/default.nix b/pkgs/desktops/xfce4-14/default.nix
index 294dfa92c79..0e2c8c1696b 100644
--- a/pkgs/desktops/xfce4-14/default.nix
+++ b/pkgs/desktops/xfce4-14/default.nix
@@ -93,8 +93,6 @@ makeScope newScope (self: with self; {
 
   ## COMMON PARTS WITH XFCE 4.12
 
-  gtk-xfce-engine = callPackage ../xfce/core/gtk-xfce-engine.nix { withGtk3 = false; };
-
   xfce4-icon-theme = callPackage ../xfce/art/xfce4-icon-theme.nix { };
 
   xfwm4-themes = callPackage ../xfce/art/xfwm4-themes.nix { };
@@ -113,7 +111,6 @@ makeScope newScope (self: with self; {
 
 
   ## ALIASES
-
-  # added 2019-08-18
-  xfce4-mixer = throw "deprecated 2019-08-18: obsoleted by xfce4-pulseaudio-plugin";
+  xfce4-mixer = throw "deprecated 2019-08-18: obsoleted by xfce4-pulseaudio-plugin"; # added 2019-08-18
+  gtk-xfce-engine = throw "deprecated 2019-09-17: Xfce 4.14 deprecated gtk-xfce-engine"; # added 2019-09-17
 })
-- 
GitLab


From f85e126f8ce44e8be17807305422f8cba2991ede Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 17 Sep 2019 16:44:35 -0400
Subject: [PATCH 0436/2254] nixos/xfce4-14: add gnome-themes-extra

---
 nixos/modules/services/x11/desktop-managers/xfce4-14.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/x11/desktop-managers/xfce4-14.nix b/nixos/modules/services/x11/desktop-managers/xfce4-14.nix
index ae7ee322c64..ca51df88eef 100644
--- a/nixos/modules/services/x11/desktop-managers/xfce4-14.nix
+++ b/nixos/modules/services/x11/desktop-managers/xfce4-14.nix
@@ -53,6 +53,7 @@ in
       glib # for gsettings
       gtk3.out # gtk-update-icon-cache
 
+      gnome3.gnome-themes-extra
       gnome3.adwaita-icon-theme
       hicolor-icon-theme
       tango-icon-theme
-- 
GitLab


From f6398d8ba2729778ea0ae0a0d283335997721d26 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 17 Sep 2019 17:02:59 -0400
Subject: [PATCH 0437/2254] nixos/xfce4-14: cleanup defaults slightly

We added
- parole
- pavucontrol
- xfce4-taskmanager
- xfwm4-themes

to the default packages.
---
 .../services/x11/desktop-managers/xfce4-14.nix        | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/xfce4-14.nix b/nixos/modules/services/x11/desktop-managers/xfce4-14.nix
index ca51df88eef..a521e4a8a8d 100644
--- a/nixos/modules/services/x11/desktop-managers/xfce4-14.nix
+++ b/nixos/modules/services/x11/desktop-managers/xfce4-14.nix
@@ -74,11 +74,14 @@ in
       xfconf
 
       mousepad
+      parole
+      pavucontrol
       ristretto
       xfce4-appfinder
       xfce4-screenshooter
       xfce4-session
       xfce4-settings
+      xfce4-taskmanager
       xfce4-terminal
 
       # TODO: resync patch for plugins
@@ -88,10 +91,12 @@ in
       ++ optional config.networking.networkmanager.enable networkmanagerapplet
       ++ optional config.hardware.pulseaudio.enable xfce4-pulseaudio-plugin
       ++ optional config.powerManagement.enable xfce4-power-manager
-      ++ optional cfg.enableXfwm xfwm4
-      ++ optionals (!cfg.noDesktop) [
-        xfce4-panel
+      ++ optionals cfg.enableXfwm [
+        xfwm4
+        xfwm4-themes
+      ] ++ optionals (!cfg.noDesktop) [
         xfce4-notifyd
+        xfce4-panel
         xfdesktop
       ];
 
-- 
GitLab


From e85327035487efed5612e283b0c2934fec87a697 Mon Sep 17 00:00:00 2001
From: Averell Dalton <averell+nixpkgs@rxd4.com>
Date: Tue, 17 Sep 2019 23:07:34 +0200
Subject: [PATCH 0438/2254] pythonPackages.iso-639: add setuptools dependency

---
 pkgs/development/python-modules/iso-639/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/iso-639/default.nix b/pkgs/development/python-modules/iso-639/default.nix
index fe6382f6fb6..59d0d27b8b6 100644
--- a/pkgs/development/python-modules/iso-639/default.nix
+++ b/pkgs/development/python-modules/iso-639/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchPypi, buildPythonPackage }:
+{ lib, fetchPypi, buildPythonPackage, setuptools }:
 
 buildPythonPackage rec {
   pname = "iso-639";
@@ -9,6 +9,8 @@ buildPythonPackage rec {
     sha256 = "dc9cd4b880b898d774c47fe9775167404af8a85dd889d58f9008035109acce49";
   };
 
+  propagatedBuildInputs = [ setuptools ];
+
   meta = with lib; {
     homepage = https://github.com/noumar/iso639;
     description = "ISO 639 library for Python";
-- 
GitLab


From 044f771d593bacc97c56cdfe046f527cd3a30184 Mon Sep 17 00:00:00 2001
From: Dima <dgoldin+github@protonmail.ch>
Date: Tue, 10 Sep 2019 00:01:59 +0200
Subject: [PATCH 0439/2254] libressl: fixing nc for version>=2.9

This addresses https://github.com/NixOS/nixpkgs/issues/68286

When `-R` (CA file location) is not specified, nc tries to fall back to
a default location. In 2.8 this was still configurable at compile time,
but was changed somewhere after. This replaces `/etc/ssl/cert.pem`
with `${cacert}/etc/ssl/cert.pem` in the code directly.

For a discussion of this, see https://github.com/NixOS/nixpkgs/pull/68456
---
 pkgs/development/libraries/libressl/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix
index 71b8d2bb20e..4bfa6cd0b8e 100644
--- a/pkgs/development/libraries/libressl/default.nix
+++ b/pkgs/development/libraries/libressl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, lib, cmake }:
+{ stdenv, fetchurl, lib, cmake, cacert }:
 
 let
 
@@ -31,6 +31,12 @@ let
       rm configure
     '';
 
+    # Since 2.9.x the default location can't be configured from the build using
+    # DEFAULT_CA_FILE anymore, instead we have to patch the default value.
+    postPatch = lib.optionalString (lib.versionAtLeast version "2.9.2") ''
+      substituteInPlace ./tls/tls_config.c --replace '"/etc/ssl/cert.pem"' '"${cacert}/etc/ssl/certs/ca-bundle.crt"'
+    '';
+
     enableParallelBuilding = true;
 
     outputs = [ "bin" "dev" "out" "man" "nc" ];
-- 
GitLab


From f676b540d9e53374c9d4412af290f3fdf5d2c75a Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 17 Sep 2019 16:20:00 -0500
Subject: [PATCH 0440/2254] terraform: 0.12.8 -> 0.12.9

Changelog: https://github.com/hashicorp/terraform/releases/tag/v0.12.9
---
 pkgs/applications/networking/cluster/terraform/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 9c07760355c..ec452a312e4 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -97,8 +97,8 @@ in rec {
   terraform_0_11-full = terraform_0_11.full;
 
   terraform_0_12 = pluggable (generic {
-    version = "0.12.8";
-    sha256 = "1qlhbn6xj2nd8gwr6aiyjsb62qmj4j9jnxab006xgdr1avvl2p67";
+    version = "0.12.9";
+    sha256 = "14js4n08rg30y0jrm0na79syglpb64cb7cxys0x3w47pcbgymrka";
     patches = [ ./provider-path.patch ];
     passthru = { inherit plugins; };
   });
-- 
GitLab


From 6bbf9dc419c39189520ce5bcc68f2b071e71557d Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 17 Sep 2019 23:34:07 +0200
Subject: [PATCH 0441/2254] firmwareLinuxNonfree: 2019-07-17 -> 2019-08-15

---
 .../linux/firmware/firmware-linux-nonfree/default.nix     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
index 380444f0269..a6e3ccad501 100644
--- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
+++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "firmware-linux-nonfree";
-  version = "2019-07-17";
+  version = "2019-08-15";
 
   src = fetchgit {
     url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git";
-    rev = "20190717";
-    sha256 = "1dcaqdqyffxiadx420pg20157wqidz0c0ca5mrgyfxgrbh6a4mdj";
+    rev = "20190815";
+    sha256 = "06p6scpmhdifzi3yhg5n4f2kqp4pl20xhh0k2kw70p10zgxg2l4r";
   };
 
   installFlags = [ "DESTDIR=$(out)" ];
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   outputHashMode = "recursive";
   outputHashAlgo = "sha256";
-  outputHash = "1q3zqa3xxg4679p893xzwpa43afvdnnkg5xb0qs6mac75sizngid";
+  outputHash = "1dgclb44li70z0vkk9qxlbsj2jnqwx97gd7c429i2nv9lhgm14vx";
 
   meta = with stdenv.lib; {
     description = "Binary firmware collection packaged by kernel.org";
-- 
GitLab


From fb45993a6233a8e59005621f09648732fb2ccffd Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 17 Sep 2019 17:48:40 -0400
Subject: [PATCH 0442/2254] nixos/release: add gnome3 closure

---
 nixos/release.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nixos/release.nix b/nixos/release.nix
index c7c60965890..a4b6b6bb91a 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -292,6 +292,12 @@ in rec {
         services.xserver.desktopManager.xfce.enable = true;
       });
 
+    gnome3 = makeClosure ({ ... }:
+      { services.xserver.enable = true;
+        services.xserver.displayManager.gdm.enable = true;
+        services.xserver.desktopManager.gnome3.enable = true;
+      });
+
     # Linux/Apache/PostgreSQL/PHP stack.
     lapp = makeClosure ({ pkgs, ... }:
       { services.httpd.enable = true;
-- 
GitLab


From 879f851cfceaa5f10086b9f5b176a12f3f1e047f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 17 Sep 2019 23:38:15 +0200
Subject: [PATCH 0443/2254] gnome3.gnome-boxes: set maintainers =
 gnome3.maintainers

All packages under ./pkgs/desktops/gnome-3/apps/ are maintained by
gnome3.maintainers except this one. Fix it.
---
 pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
index 27ce5d0f078..2f0a21896e9 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
@@ -61,6 +61,6 @@ in stdenv.mkDerivation rec {
     homepage = https://wiki.gnome.org/Apps/Boxes;
     license = licenses.gpl3;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ bjornfor ];
+    maintainers = gnome3.maintainers;
   };
 }
-- 
GitLab


From 9566ec034b9515ba2487d3625664109b59ca46f1 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 18 Sep 2019 00:05:47 +0200
Subject: [PATCH 0444/2254] hardware.brightnessctl: add brightnessctl to env

---
 nixos/modules/hardware/brightnessctl.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/hardware/brightnessctl.nix b/nixos/modules/hardware/brightnessctl.nix
index 341e4b791c2..2d54398d10d 100644
--- a/nixos/modules/hardware/brightnessctl.nix
+++ b/nixos/modules/hardware/brightnessctl.nix
@@ -25,6 +25,7 @@ in
 
   config = mkIf cfg.enable {
     services.udev.packages = with pkgs; [ brightnessctl ];
+    environment.systemPackages = with pkgs; [ brightnessctl ];
   };
 
 }
-- 
GitLab


From 101947774c8aea770c650b7d3b78d50c63215742 Mon Sep 17 00:00:00 2001
From: Nick Spinale <nick@nickspinale.com>
Date: Sat, 14 Sep 2019 12:53:04 +0000
Subject: [PATCH 0445/2254] udisks2: disable docs when cross-compiling

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

diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix
index e99e9e37d82..1d967b38eb9 100644
--- a/pkgs/os-specific/linux/udisks/2-default.nix
+++ b/pkgs/os-specific/linux/udisks/2-default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     sha256 = "01wx2x8xyal595dhdih7rva2bz7gqzgwdp56gi0ikjdzayx17wcf";
   };
 
-  outputs = [ "out" "man" "dev" "devdoc" ];
+  outputs = [ "out" "man" "dev" ] ++ stdenv.lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) "devdoc";
 
   patches = [
     (substituteAll {
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
   preConfigure = "NOCONFIGURE=1 ./autogen.sh";
 
   configureFlags = [
-    "--enable-gtk-doc"
+    (stdenv.lib.enableFeature (stdenv.buildPlatform == stdenv.hostPlatform) "gtk-doc")
     "--localstatedir=/var"
     "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
     "--with-udevdir=$(out)/lib/udev"
-- 
GitLab


From 35f39ac48ce6ed046b7dcce3ee6e8e9162ac12aa Mon Sep 17 00:00:00 2001
From: Nick Spinale <nick@nickspinale.com>
Date: Wed, 11 Sep 2019 13:07:31 +0000
Subject: [PATCH 0446/2254] dtc: make python bindings optional

dtc's build system does not support cross-compilation of its
swig-generated python bindings.
---
 pkgs/development/compilers/dtc/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/dtc/default.nix b/pkgs/development/compilers/dtc/default.nix
index ea305cc5c84..dc628c0d762 100644
--- a/pkgs/development/compilers/dtc/default.nix
+++ b/pkgs/development/compilers/dtc/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchgit, flex, bison, pkgconfig, python2, swig, which }:
+{ stdenv, lib, fetchgit, flex, bison, pkgconfig, which
+, pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform, python2, swig
+}:
 
 stdenv.mkDerivation rec {
   pname = "dtc";
@@ -10,16 +12,17 @@ stdenv.mkDerivation rec {
     sha256 = "075gj8bbahfdb8dlif3d2dpzjrkyf3bwbcmx96zpwhlgs0da8jxh";
   };
 
-  nativeBuildInputs = [ flex bison pkgconfig swig which ];
-  buildInputs = [ python2 ];
+  nativeBuildInputs = [ flex bison pkgconfig which ] ++ lib.optionals pythonSupport [ python2 swig ];
+  buildInputs = lib.optionals pythonSupport [ python2 ];
 
   postPatch = ''
     patchShebangs pylibfdt/
   '';
 
+  makeFlags = lib.optionals (!pythonSupport) [ "NO_PYTHON=1" ];
   installFlags = [ "INSTALL=install" "PREFIX=$(out)" "SETUP_PREFIX=$(out)" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Device Tree Compiler";
     homepage = https://git.kernel.org/cgit/utils/dtc/dtc.git;
     license = licenses.gpl2; # dtc itself is GPLv2, libfdt is dual GPL/BSD
-- 
GitLab


From 39b5f5956ed4520ac73cc984c64f4863c2fb9025 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Tue, 17 Sep 2019 23:09:48 +0000
Subject: [PATCH 0447/2254] tarsnap: fix license to mark as unfree

tarsnap has always been unfree, but this wasn't expressed properly, so
it wouldn't be caught by allowUnfree = false.
---
 pkgs/tools/backup/tarsnap/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/backup/tarsnap/default.nix b/pkgs/tools/backup/tarsnap/default.nix
index d24da778dcd..8d23e955095 100644
--- a/pkgs/tools/backup/tarsnap/default.nix
+++ b/pkgs/tools/backup/tarsnap/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Online backups for the truly paranoid";
     homepage    = "http://www.tarsnap.com/";
-    license     = "tarsnap";
+    license     = stdenv.lib.licenses.unfree;
     platforms   = stdenv.lib.platforms.unix;
     maintainers = with stdenv.lib.maintainers; [ thoughtpolice roconnor ];
   };
-- 
GitLab


From 19d730df8560797473c923bfe371de4bb203338a Mon Sep 17 00:00:00 2001
From: Ivan Kozik <ivan@ludios.org>
Date: Tue, 17 Sep 2019 23:31:08 +0000
Subject: [PATCH 0448/2254] chromium: add patch to fix performance regression
 with fonts

This reverts a commit to fix a serious performance regression
introduced in Chromium 77:

https://bugs.chromium.org/p/chromium/issues/detail?id=1003997
---
 pkgs/applications/networking/browsers/chromium/common.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 6d43c313cc0..744ad79062b 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -138,6 +138,13 @@ let
       ./patches/jumbo-sorted.patch
       ./patches/no-build-timestamps.patch
       ./patches/widevine.patch
+      # Revert "Implement GetFallbackFont on Linux" to fix a performance regression
+      # Remove after https://bugs.chromium.org/p/chromium/issues/detail?id=1003997 is fixed
+      (fetchpatch {
+        url = "https://github.com/chromium/chromium/commit/5a32abe4247f80fdb55c55a289b906b0e42faa5f.patch";
+        sha256 = "1a4jqmki6cyi2dwvaszh01db2diqnz1d50mhpdpby3dd1cw0xmfy";
+        revert = true;
+      })
 
       # Unfortunately, chromium regularly breaks on major updates and
       # then needs various patches backported in order to be compiled with GCC.
-- 
GitLab


From 0b73294d60c14a9865bc9317acee2f14716f4d4e Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 17 Sep 2019 19:49:18 -0400
Subject: [PATCH 0449/2254] fixup! nixos/xfce4-14: cleanup defaults slightly

---
 nixos/modules/services/x11/desktop-managers/xfce4-14.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/xfce4-14.nix b/nixos/modules/services/x11/desktop-managers/xfce4-14.nix
index a521e4a8a8d..f0f47cb70dc 100644
--- a/nixos/modules/services/x11/desktop-managers/xfce4-14.nix
+++ b/nixos/modules/services/x11/desktop-managers/xfce4-14.nix
@@ -75,7 +75,6 @@ in
 
       mousepad
       parole
-      pavucontrol
       ristretto
       xfce4-appfinder
       xfce4-screenshooter
@@ -89,9 +88,11 @@ in
       thunar
     ] # TODO: NetworkManager doesn't belong here
       ++ optional config.networking.networkmanager.enable networkmanagerapplet
-      ++ optional config.hardware.pulseaudio.enable xfce4-pulseaudio-plugin
       ++ optional config.powerManagement.enable xfce4-power-manager
-      ++ optionals cfg.enableXfwm [
+      ++ optionals config.hardware.pulseaudio.enable [
+        pavucontrol
+        xfce4-pulseaudio-plugin
+      ] ++ optionals cfg.enableXfwm [
         xfwm4
         xfwm4-themes
       ] ++ optionals (!cfg.noDesktop) [
-- 
GitLab


From 11435e061670d319cbba7df3feacb80c12a8d452 Mon Sep 17 00:00:00 2001
From: Enno Lohmeier <enno@nerdworks.de>
Date: Wed, 18 Sep 2019 01:59:01 +0200
Subject: [PATCH 0450/2254] xmind: fix shell escape

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

diff --git a/pkgs/applications/misc/xmind/default.nix b/pkgs/applications/misc/xmind/default.nix
index c673002fb51..0332de0195c 100644
--- a/pkgs/applications/misc/xmind/default.nix
+++ b/pkgs/applications/misc/xmind/default.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
         cp -r $out/libexec/configuration/ \$HOME/.xmind/configuration-cathy/
       fi
 
-      exec "$out/libexec/XMind" "$@"
+      exec "$out/libexec/XMind" "\$@"
     EOF
     chmod +x $out/bin/XMind
 
-- 
GitLab


From 7854b86d46d6e9cbb701c0d256c42fcd18a16e1b Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 17 Sep 2019 20:01:59 -0400
Subject: [PATCH 0451/2254] libfprint: 0.99 -> 1.0

https://gitlab.freedesktop.org/libfprint/libfprint/-/tags/V_1_0
---
 .../libraries/libfprint/default.nix           | 53 +++++++++++++++----
 1 file changed, 43 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/libfprint/default.nix b/pkgs/development/libraries/libfprint/default.nix
index 410496a7bb7..9a6db72ae05 100644
--- a/pkgs/development/libraries/libfprint/default.nix
+++ b/pkgs/development/libraries/libfprint/default.nix
@@ -1,11 +1,27 @@
-{ thinkpad ? false, stdenv, fetchFromGitHub, fetchurl, pkgconfig, meson, ninja, libusb, pixman, glib, nss, gtk3
-, coreutils, gtk-doc, docbook_xsl, docbook_xml_dtd_43, openssl ? null }:
+{ thinkpad ? false
+, stdenv
+, fetchFromGitHub
+, fetchurl
+, pkgconfig
+, meson
+, ninja
+, libusb
+, pixman
+, glib
+, nss
+, gtk3
+, coreutils
+, gtk-doc
+, docbook_xsl
+, docbook_xml_dtd_43
+, openssl ? null
+}:
 
 assert thinkpad -> openssl != null;
 
 stdenv.mkDerivation rec {
   pname = "libfprint" + stdenv.lib.optionalString thinkpad "-thinkpad";
-  version = "0.99.0";
+  version = "1.0";
 
   src = {
     libfprint-thinkpad =
@@ -16,19 +32,36 @@ stdenv.mkDerivation rec {
         sha256 = "1vps1wrp7hskf13f7jrv0dwry2fcid76x2w463wplngp63cj7b3b";
       };
     libfprint = fetchurl {
-      url = "https://gitlab.freedesktop.org/libfprint/libfprint/uploads/82ba3cef5bdf72997df711eacdb13c0f/libfprint-${version}.tar.xz";
-      sha256 = "16r4nl40y0jri57jiqmdz4s87byblx22lbhyvqpljd6mqm5rg187";
+      url = "https://gitlab.freedesktop.org/libfprint/libfprint/uploads/aff93e9921d1cff53d7c070944952ff9/libfprint-${version}.tar.xz";
+      sha256 = "0v84pd12v016m8iimhq39fgzamlarqccsr7d98cvrrwrzrgcixrd";
     };
   }.${pname};
 
-  buildInputs = [ libusb pixman glib nss gtk3 ]
-    ++ stdenv.lib.optional thinkpad openssl;
+  nativeBuildInputs = [
+    pkgconfig
+    meson
+    ninja
+    gtk-doc
+    docbook_xsl
+    docbook_xml_dtd_43
+  ];
 
-  nativeBuildInputs = [ pkgconfig meson ninja gtk-doc docbook_xsl docbook_xml_dtd_43 ];
+  buildInputs = [
+    libusb
+    pixman
+    glib
+    nss
+    gtk3
+  ]
+  ++ stdenv.lib.optional thinkpad openssl
+  ;
 
-  mesonFlags = [ "-Dudev_rules_dir=lib/udev/rules.d" "-Dx11-examples=false" ];
+  mesonFlags = [
+    "-Dudev_rules_dir=${placeholder "out"}/lib/udev/rules.d"
+    "-Dx11-examples=false"
+  ];
 
-  preConfigure = ''
+  postPatch = ''
     substituteInPlace libfprint/meson.build \
       --replace /bin/echo ${coreutils}/bin/echo
   '';
-- 
GitLab


From 2b239b5b309db6f02fa99dea509fd67613dc69e3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 18 Sep 2019 02:12:57 +0200
Subject: [PATCH 0452/2254] pythonPackages.markdown: add missing setuptools to
 propagatedBuildInput

Fixes the following ImportError on application startup:

/nix/store/qh7ndfsar3icmwqbiwcla7pc8x1133vg-python2.7-Markdown-3.1.1/bin/markdown_py README.md > README.html.new
Traceback (most recent call last):
  File "/nix/store/qh7ndfsar3icmwqbiwcla7pc8x1133vg-python2.7-Markdown-3.1.1/bin/.markdown_py-wrapped", line 7, in <module>
    from markdown.__main__ import run
  File "/nix/store/qh7ndfsar3icmwqbiwcla7pc8x1133vg-python2.7-Markdown-3.1.1/lib/python2.7/site-packages/markdown/__init__.py", line 25, in <module>
    from .core import Markdown, markdown, markdownFromFile
  File "/nix/store/qh7ndfsar3icmwqbiwcla7pc8x1133vg-python2.7-Markdown-3.1.1/lib/python2.7/site-packages/markdown/core.py", line 29, in <module>
    import pkg_resources
ImportError: No module named pkg_resources
make: *** [Makefile:53: README.html] Error 1
---
 pkgs/development/python-modules/markdown/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/python-modules/markdown/default.nix b/pkgs/development/python-modules/markdown/default.nix
index 364fa4d81be..1438391dc40 100644
--- a/pkgs/development/python-modules/markdown/default.nix
+++ b/pkgs/development/python-modules/markdown/default.nix
@@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, setuptools
 , nose
 , pyyaml
 }:
@@ -14,6 +15,8 @@ buildPythonPackage rec {
     sha256 = "2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a";
   };
 
+  propagatedBuildInputs = [ setuptools ];
+
   checkInputs = [ nose pyyaml ];
 
   meta = {
-- 
GitLab


From e2644036f63b323c3c2138d779a19c08e0f415bb Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 17 Sep 2019 20:15:57 -0400
Subject: [PATCH 0453/2254] fprintd: 0.8.1 -> 0.9.0

Resolves issues with StateDirectory not being set in
systemd unit.

https://gitlab.freedesktop.org/libfprint/fprintd/-/tags/V_0_9_0
---
 nixos/modules/services/security/fprintd.nix |  7 ---
 pkgs/tools/security/fprintd/default.nix     | 49 +++++++++++++++------
 2 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/nixos/modules/services/security/fprintd.nix b/nixos/modules/services/security/fprintd.nix
index 5662ebc61d2..8ece1ca1901 100644
--- a/nixos/modules/services/security/fprintd.nix
+++ b/nixos/modules/services/security/fprintd.nix
@@ -50,13 +50,6 @@ in
 
     systemd.packages = [ cfg.package ];
 
-
-    # The upstream unit does not use StateDirectory, and will
-    # fail if the directory it needs is not present. Should be
-    # fixed when https://gitlab.freedesktop.org/libfprint/fprintd/merge_requests/5
-    # is merged.
-    systemd.services.fprintd.serviceConfig.StateDirectory = "fprint";
-
   };
 
 }
diff --git a/pkgs/tools/security/fprintd/default.nix b/pkgs/tools/security/fprintd/default.nix
index 84727f55b93..201780b1492 100644
--- a/pkgs/tools/security/fprintd/default.nix
+++ b/pkgs/tools/security/fprintd/default.nix
@@ -1,26 +1,49 @@
 { thinkpad ? false
-, stdenv, fetchurl, pkgconfig, intltool, libfprint-thinkpad ? null
-, libfprint ? null, glib, dbus-glib, polkit, nss, pam, systemd }:
+, stdenv
+, fetchurl
+, pkgconfig
+, intltool
+, libfprint-thinkpad ? null
+, libfprint ? null
+, glib
+, dbus-glib
+, polkit
+, nss
+, pam
+, systemd
+}:
 
 stdenv.mkDerivation rec {
   pname = "fprintd" + stdenv.lib.optionalString thinkpad "-thinkpad";
-  version = "0.8.1";
+  version = "0.9.0";
 
   src = fetchurl {
-    url = "https://gitlab.freedesktop.org/libfprint/fprintd/uploads/bdd9f91909f535368b7c21f72311704a/fprintd-${version}.tar.xz";
-    sha256 = "124s0g9syvglgsmqnavp2a8c0zcq8cyaph8p8iyvbla11vfizs9l";
+    url = "https://gitlab.freedesktop.org/libfprint/fprintd/uploads/9dec4b63d1f00e637070be1477ce63c0/fprintd-${version}.tar.xz";
+    sha256 = "182gcnwb6zjwmk0dn562rjmpbk7ac7dhipbfdhfic2sn1jzis49p";
   };
 
-  buildInputs = [ glib dbus-glib polkit nss pam systemd ]
-    ++ stdenv.lib.optional thinkpad libfprint-thinkpad
-    ++ stdenv.lib.optional (!thinkpad) libfprint;
+  nativeBuildInputs = [
+    intltool
+    pkgconfig
+  ];
 
-  nativeBuildInputs = [ pkgconfig intltool ];
+  buildInputs = [
+    glib
+    dbus-glib
+    polkit
+    nss
+    pam
+    systemd
+  ]
+  ++ stdenv.lib.optional thinkpad libfprint-thinkpad
+  ++ stdenv.lib.optional (!thinkpad) libfprint
+  ;
 
-  configureFlags = [ 
-    "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" 
-    "--localstatedir=/var" 
-    "--sysconfdir=${placeholder "out"}/etc" 
+  configureFlags = [
+    # is hardcoded to /var/lib/fprint, this is for the StateDirectory install target
+    "--localstatedir=${placeholder "out"}/var"
+    "--sysconfdir=${placeholder "out"}/etc"
+    "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
   ];
 
   meta = with stdenv.lib; {
-- 
GitLab


From a0f7cd09977a702eea411b411200d5272242ee9f Mon Sep 17 00:00:00 2001
From: Greg Roodt <greg@canva.com>
Date: Sat, 14 Sep 2019 09:40:58 +1000
Subject: [PATCH 0454/2254] qbec: init at 0.7.5

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

diff --git a/pkgs/applications/networking/cluster/qbec/default.nix b/pkgs/applications/networking/cluster/qbec/default.nix
new file mode 100644
index 00000000000..9e578b9b333
--- /dev/null
+++ b/pkgs/applications/networking/cluster/qbec/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+  pname = "qbec";
+  version = "0.7.5";
+
+  src = fetchFromGitHub {
+    owner = "splunk";
+    repo = "qbec";
+    rev = "v${version}";
+    sha256 = "1q3rbxih4fn0zv8dni5dxb3pq840spplfy08x941najqfgflv9gb";
+  };
+
+  modSha256 = "0s1brqvzm1ghhqb46aqfj0lpnaq76rav0hwwb82ccw8h7052y4jn";
+
+  meta = with lib; {
+    description = "Configure kubernetes objects on multiple clusters using jsonnet https://qbec.io";
+    homepage = https://github.com/splunk/qbec;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ groodt ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bd67fe85526..3587151c90a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19601,6 +19601,8 @@ in
 
   qtcurve = libsForQt5.callPackage ../misc/themes/qtcurve {};
 
+  qbec = callPackage ../applications/networking/cluster/qbec { };
+
   rssguard = libsForQt5.callPackage ../applications/networking/feedreaders/rssguard { };
 
   scudcloud = callPackage ../applications/networking/instant-messengers/scudcloud { };
-- 
GitLab


From bd56ba8096ea9b5acfa10fd7c887d4d6cedc74b9 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 17 Sep 2019 19:50:42 -0500
Subject: [PATCH 0455/2254] mtm: 1.0.1 -> 1.1.0

Changelog: https://github.com/deadpixi/mtm/releases/tag/1.1.0
---
 pkgs/tools/misc/mtm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/mtm/default.nix b/pkgs/tools/misc/mtm/default.nix
index d0bf3521c7c..b518a159e91 100644
--- a/pkgs/tools/misc/mtm/default.nix
+++ b/pkgs/tools/misc/mtm/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "mtm";
-  version = "1.0.1";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "deadpixi";
     repo = pname;
     rev = version;
-    sha256 = "0q23z1dfjz3qkmxqm0d8sg81gn6w1j2n2j6c9hk1kk7iv21v1zb0";
+    sha256 = "0k9xachd9wnyhj8sh4yninckgwm3a7zdxnn490x65ikn4vqb7w8x";
   };
 
   buildInputs = [ ncurses ];
-- 
GitLab


From cd518845e2ca008f5a00b38ffa0f1c99f154f6cc Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Mon, 5 Aug 2019 21:53:07 -0400
Subject: [PATCH 0456/2254] doc/stdenv: document meson variables

---
 doc/cross-compilation.xml           |  40 +++---
 doc/functions/dockertools.xml       |  34 +++--
 doc/functions/ocitools.xml          |  12 +-
 doc/languages-frameworks/gnome.xml  | 185 +++++++++++++++++++++++-----
 doc/languages-frameworks/perl.xml   |  12 +-
 doc/languages-frameworks/qt.xml     | 154 ++++++++++++-----------
 doc/meta.xml                        |  10 +-
 doc/package-notes.xml               |  66 +++++-----
 doc/package-specific-user-notes.xml |  88 ++++++-------
 doc/quick-start.xml                 |   8 +-
 doc/stdenv.xml                      | 126 ++++++++++++++-----
 11 files changed, 456 insertions(+), 279 deletions(-)

diff --git a/doc/cross-compilation.xml b/doc/cross-compilation.xml
index b7844da195d..d212706e171 100644
--- a/doc/cross-compilation.xml
+++ b/doc/cross-compilation.xml
@@ -485,10 +485,10 @@ nix-build &lt;nixpkgs&gt; --arg crossSystem '{ config = "&lt;arch&gt;-&lt;os&gt;
     <xref
     linkend="ssec-cross-dependency-categorization"/> are specified as
     lists of derivations given to <varname>mkDerivation</varname>, as
-    documented in <xref linkend="ssec-stdenv-dependencies"/>. In short,
-    each list of dependencies for "host → target" of "foo → bar" is called
-    <varname>depsFooBar</varname>, with exceptions for backwards
-    compatibility that <varname>depsBuildHost</varname> is instead called
+    documented in <xref linkend="ssec-stdenv-dependencies"/>. In short, each
+    list of dependencies for "host → target" of "foo → bar" is called
+    <varname>depsFooBar</varname>, with exceptions for backwards compatibility
+    that <varname>depsBuildHost</varname> is instead called
     <varname>nativeBuildInputs</varname> and <varname>depsHostTarget</varname>
     is instead called <varname>buildInputs</varname>. Nixpkgs is now structured
     so that each <varname>depsFooBar</varname> is automatically taken from
@@ -507,9 +507,8 @@ nix-build &lt;nixpkgs&gt; --arg crossSystem '{ config = "&lt;arch&gt;-&lt;os&gt;
     <varname>buildPackages</varname>, <varname>pkgs</varname>, and
     <varname>targetPackages</varname>. Those are now redefined as aliases to
     <varname>pkgsBuildHost</varname>, <varname>pkgsHostTarget</varname>, and
-    <varname>pkgsTargetTarget</varname>. It is acceptable, even
-    recommended, to use them for libraries to show that the host platform is
-    irrelevant.
+    <varname>pkgsTargetTarget</varname>. It is acceptable, even recommended, to
+    use them for libraries to show that the host platform is irrelevant.
    </para>
 
    <para>
@@ -581,14 +580,15 @@ nix-build &lt;nixpkgs&gt; --arg crossSystem '{ config = "&lt;arch&gt;-&lt;os&gt;
     <varname>pkgsHostTarget</varname> refers to the current one, and
     <varname>pkgsTargetTarget</varname> refers to the next one. When there is
     no previous or next stage, they instead refer to the current stage. Note
-    how all the invariants regarding the mapping between dependency and depending
-    packages' build host and target platforms are preserved.
+    how all the invariants regarding the mapping between dependency and
+    depending packages' build host and target platforms are preserved.
     <varname>pkgsBuildTarget</varname> and <varname>pkgsHostHost</varname> are
     more complex in that the stage fitting the requirements isn't always a
     fixed chain of "prevs" and "nexts" away (modulo the "saturating"
-    self-references at the ends). We just special case each instead. All the primary
-    edges are implemented is in <filename>pkgs/stdenv/booter.nix</filename>,
-    and secondarily aliases in <filename>pkgs/top-level/stage.nix</filename>.
+    self-references at the ends). We just special case each instead. All the
+    primary edges are implemented is in
+    <filename>pkgs/stdenv/booter.nix</filename>, and secondarily aliases in
+    <filename>pkgs/top-level/stage.nix</filename>.
    </para>
 
    <note>
@@ -645,19 +645,19 @@ nix-build &lt;nixpkgs&gt; --arg crossSystem '{ config = "&lt;arch&gt;-&lt;os&gt;
      "infinite recursions" / cycles. When only package sets that don't mention
      target are used, the package set forms a directed acyclic graph. This
      means that all cycles that exist are confined to one stage. This means
-     they are a lot smaller, and easier to follow in the code or a backtrace. It
-     also means they are present in native and cross builds alike, and so more
-     likely to be caught by CI and other users.
+     they are a lot smaller, and easier to follow in the code or a backtrace.
+     It also means they are present in native and cross builds alike, and so
+     more likely to be caught by CI and other users.
     </para>
     <para>
      Thirdly, it is because everything target-mentioning only exists to
      accommodate compilers with lousy build systems that insist on the compiler
      itself and standard library being built together. Of course that is bad
-     because bigger derivations means longer rebuilds. It is also problematic because
-     it tends to make the standard libraries less like other libraries than
-     they could be, complicating code and build systems alike. Because of the
-     other problems, and because of these innate disadvantages, compilers ought
-     to be packaged another way where possible.
+     because bigger derivations means longer rebuilds. It is also problematic
+     because it tends to make the standard libraries less like other libraries
+     than they could be, complicating code and build systems alike. Because of
+     the other problems, and because of these innate disadvantages, compilers
+     ought to be packaged another way where possible.
     </para>
    </note>
 
diff --git a/doc/functions/dockertools.xml b/doc/functions/dockertools.xml
index a284182bb04..6b293a2e778 100644
--- a/doc/functions/dockertools.xml
+++ b/doc/functions/dockertools.xml
@@ -325,10 +325,9 @@ hello        latest   de2bf4786de6   About a minute ago   25.2MB
     </term>
     <listitem>
      <para>
-       Shell commands to run while building the final layer, without access
-       to most of the layer contents. Changes to this layer are "on top"
-       of all the other layers, so can create additional directories
-       and files.
+      Shell commands to run while building the final layer, without access to
+      most of the layer contents. Changes to this layer are "on top" of all the
+      other layers, so can create additional directories and files.
      </para>
     </listitem>
    </varlistentry>
@@ -493,28 +492,23 @@ pullImage {
   </calloutlist>
 
   <para>
-    <literal>nix-prefetch-docker</literal> command can be used to get required
-    image parameters:
-
+   <literal>nix-prefetch-docker</literal> command can be used to get required
+   image parameters:
 <screen>
 <prompt>$ </prompt>nix run nixpkgs.nix-prefetch-docker -c nix-prefetch-docker --image-name mysql --image-tag 5
 </screen>
-
-    Since a given <varname>imageName</varname> may transparently refer to a
-    manifest list of images which support multiple architectures and/or
-    operating systems, you can supply the <option>--os</option> and
-    <option>--arch</option> arguments to specify exactly which image you want.
-    By default it will match the OS and architecture of the host the command is
-    run on.
-
+   Since a given <varname>imageName</varname> may transparently refer to a
+   manifest list of images which support multiple architectures and/or
+   operating systems, you can supply the <option>--os</option> and
+   <option>--arch</option> arguments to specify exactly which image you want.
+   By default it will match the OS and architecture of the host the command is
+   run on.
 <screen>
 <prompt>$ </prompt>nix-prefetch-docker --image-name mysql --image-tag 5 --arch x86_64 --os linux
 </screen>
-
-    Desired image name and tag can be set using
-    <option>--final-image-name</option> and <option>--final-image-tag</option>
-    arguments:
-
+   Desired image name and tag can be set using
+   <option>--final-image-name</option> and <option>--final-image-tag</option>
+   arguments:
 <screen>
 <prompt>$ </prompt>nix-prefetch-docker --image-name mysql --image-tag 5 --final-image-name eu.gcr.io/my-project/mysql --final-image-tag prod
 </screen>
diff --git a/doc/functions/ocitools.xml b/doc/functions/ocitools.xml
index 163bee2382e..56de0c22ec6 100644
--- a/doc/functions/ocitools.xml
+++ b/doc/functions/ocitools.xml
@@ -51,10 +51,10 @@ buildContainer {
    <calloutlist>
     <callout arearefs='ex-ociTools-buildContainer-1'>
      <para>
-      <varname>args</varname> specifies a set of arguments to run inside the container.
-      This is the only required argument for <varname>buildContainer</varname>.
-      All referenced packages inside the derivation will be made available
-      inside the container
+      <varname>args</varname> specifies a set of arguments to run inside the
+      container. This is the only required argument for
+      <varname>buildContainer</varname>. All referenced packages inside the
+      derivation will be made available inside the container
      </para>
     </callout>
     <callout arearefs='ex-ociTools-buildContainer-2'>
@@ -66,8 +66,8 @@ buildContainer {
     </callout>
     <callout arearefs='ex-ociTools-buildContainer-3'>
      <para>
-       <varname>readonly</varname> makes the container's rootfs read-only if it is set to true.
-       The default value is false <literal>false</literal>.
+      <varname>readonly</varname> makes the container's rootfs read-only if it
+      is set to true. The default value is false <literal>false</literal>.
      </para>
     </callout>
    </calloutlist>
diff --git a/doc/languages-frameworks/gnome.xml b/doc/languages-frameworks/gnome.xml
index 9e0f21a6c74..42b4ae04322 100644
--- a/doc/languages-frameworks/gnome.xml
+++ b/doc/languages-frameworks/gnome.xml
@@ -5,26 +5,53 @@
   <title>Packaging GNOME applications</title>
 
   <para>
-   Programs in the GNOME universe are written in various languages but they all use GObject-based libraries like GLib, GTK or GStreamer. These libraries are often modular, relying on looking into certain directories to find their modules. However, due to Nix’s specific file system organization, this will fail without our intervention. Fortunately, the libraries usually allow overriding the directories through environment variables, either natively or thanks to a patch in nixpkgs. <link xlink:href="#fun-wrapProgram">Wrapping</link> the executables to ensure correct paths are available to the application constitutes a significant part of packaging a modern desktop application. In this section, we will describe various modules needed by such applications, environment variables needed to make the modules load, and finally a script that will do the work for us.
+   Programs in the GNOME universe are written in various languages but they all
+   use GObject-based libraries like GLib, GTK or GStreamer. These libraries are
+   often modular, relying on looking into certain directories to find their
+   modules. However, due to Nix’s specific file system organization, this
+   will fail without our intervention. Fortunately, the libraries usually allow
+   overriding the directories through environment variables, either natively or
+   thanks to a patch in nixpkgs.
+   <link xlink:href="#fun-wrapProgram">Wrapping</link> the executables to
+   ensure correct paths are available to the application constitutes a
+   significant part of packaging a modern desktop application. In this section,
+   we will describe various modules needed by such applications, environment
+   variables needed to make the modules load, and finally a script that will do
+   the work for us.
   </para>
 
   <section xml:id="ssec-gnome-settings">
    <title>Settings</title>
 
    <para>
-    <link xlink:href="https://developer.gnome.org/gio/stable/GSettings.html">GSettings</link> API is often used for storing settings. GSettings schemas are required, to know the type and other metadata of the stored values. GLib looks for <filename>glib-2.0/schemas/gschemas.compiled</filename> files inside the directories of <envar>XDG_DATA_DIRS</envar>.
+    <link xlink:href="https://developer.gnome.org/gio/stable/GSettings.html">GSettings</link>
+    API is often used for storing settings. GSettings schemas are required, to
+    know the type and other metadata of the stored values. GLib looks for
+    <filename>glib-2.0/schemas/gschemas.compiled</filename> files inside the
+    directories of <envar>XDG_DATA_DIRS</envar>.
    </para>
 
    <para>
-    On Linux, GSettings API is implemented using <link xlink:href="https://wiki.gnome.org/Projects/dconf">dconf</link> backend. You will need to add <literal>dconf</literal> GIO module to <envar>GIO_EXTRA_MODULES</envar> variable, otherwise the <literal>memory</literal> backend will be used and the saved settings will not be persistent.
+    On Linux, GSettings API is implemented using
+    <link xlink:href="https://wiki.gnome.org/Projects/dconf">dconf</link>
+    backend. You will need to add <literal>dconf</literal> GIO module to
+    <envar>GIO_EXTRA_MODULES</envar> variable, otherwise the
+    <literal>memory</literal> backend will be used and the saved settings will
+    not be persistent.
    </para>
 
    <para>
-    Last you will need the dconf database D-Bus service itself. You can enable it using <option>programs.dconf.enable</option>.
+    Last you will need the dconf database D-Bus service itself. You can enable
+    it using <option>programs.dconf.enable</option>.
    </para>
 
    <para>
-    Some applications will also require <package>gsettings-desktop-schemas</package> for things like reading proxy configuration or user interface customization. This dependency is often not mentioned by upstream, you should grep for <literal>org.gnome.desktop</literal> and <literal>org.gnome.system</literal> to see if the schemas are needed.
+    Some applications will also require
+    <package>gsettings-desktop-schemas</package> for things like reading proxy
+    configuration or user interface customization. This dependency is often not
+    mentioned by upstream, you should grep for
+    <literal>org.gnome.desktop</literal> and
+    <literal>org.gnome.system</literal> to see if the schemas are needed.
    </para>
   </section>
 
@@ -32,7 +59,16 @@
    <title>Icons</title>
 
    <para>
-    When an application uses icons, an icon theme should be available in <envar>XDG_DATA_DIRS</envar>. The package for the default, icon-less <link xlink:href="https://www.freedesktop.org/wiki/Software/icon-theme/">hicolor-icon-theme</link> contains <link linkend="ssec-gnome-hooks-hicolor-icon-theme">a setup hook</link> that will pick up icon themes from <literal>buildInputs</literal> and pass it to our wrapper. Unfortunately, relying on that would mean every user has to download the theme included in the package expression no matter their preference. For that reason, we leave the installation of icon theme on the user. If you use one of the desktop environments, you probably already have an icon theme installed.
+    When an application uses icons, an icon theme should be available in
+    <envar>XDG_DATA_DIRS</envar>. The package for the default, icon-less
+    <link xlink:href="https://www.freedesktop.org/wiki/Software/icon-theme/">hicolor-icon-theme</link>
+    contains <link linkend="ssec-gnome-hooks-hicolor-icon-theme">a setup
+    hook</link> that will pick up icon themes from
+    <literal>buildInputs</literal> and pass it to our wrapper. Unfortunately,
+    relying on that would mean every user has to download the theme included in
+    the package expression no matter their preference. For that reason, we
+    leave the installation of icon theme on the user. If you use one of the
+    desktop environments, you probably already have an icon theme installed.
    </para>
   </section>
 
@@ -40,7 +76,12 @@
    <title>GTK Themes</title>
 
    <para>
-    Previously, a GTK theme needed to be in <envar>XDG_DATA_DIRS</envar>. This is no longer necessary for most programs since GTK incorporated Adwaita theme. Some programs (for example, those designed for <link xlink:href="https://elementary.io/docs/human-interface-guidelines#human-interface-guidelines">elementary HIG</link>) might require a special theme like <package>pantheon.elementary-gtk-theme</package>.
+    Previously, a GTK theme needed to be in <envar>XDG_DATA_DIRS</envar>. This
+    is no longer necessary for most programs since GTK incorporated Adwaita
+    theme. Some programs (for example, those designed for
+    <link xlink:href="https://elementary.io/docs/human-interface-guidelines#human-interface-guidelines">elementary
+    HIG</link>) might require a special theme like
+    <package>pantheon.elementary-gtk-theme</package>.
    </para>
   </section>
 
@@ -48,7 +89,10 @@
    <title>GObject introspection typelibs</title>
 
    <para>
-    <link xlink:href="https://wiki.gnome.org/Projects/GObjectIntrospection">GObject introspection</link> allows applications to use C libraries in other languages easily. It does this through <literal>typelib</literal> files searched in <envar>GI_TYPELIB_PATH</envar>.
+    <link xlink:href="https://wiki.gnome.org/Projects/GObjectIntrospection">GObject
+    introspection</link> allows applications to use C libraries in other
+    languages easily. It does this through <literal>typelib</literal> files
+    searched in <envar>GI_TYPELIB_PATH</envar>.
    </para>
   </section>
 
@@ -56,7 +100,11 @@
    <title>Various plug-ins</title>
 
    <para>
-    If your application uses <link xlink:href="https://gstreamer.freedesktop.org/">GStreamer</link> or <link xlink:href="https://wiki.gnome.org/Projects/Grilo">Grilo</link>, you should set <envar>GST_PLUGIN_SYSTEM_PATH_1_0</envar> and <envar>GRL_PLUGIN_PATH</envar>, respectively.
+    If your application uses
+    <link xlink:href="https://gstreamer.freedesktop.org/">GStreamer</link> or
+    <link xlink:href="https://wiki.gnome.org/Projects/Grilo">Grilo</link>, you
+    should set <envar>GST_PLUGIN_SYSTEM_PATH_1_0</envar> and
+    <envar>GRL_PLUGIN_PATH</envar>, respectively.
    </para>
   </section>
  </section>
@@ -65,7 +113,8 @@
   <title>Onto <package>wrapGAppsHook</package></title>
 
   <para>
-   Given the requirements above, the package expression would become messy quickly:
+   Given the requirements above, the package expression would become messy
+   quickly:
 <programlisting>
 preFixup = ''
   for f in $(find $out/bin/ $out/libexec/ -type f -executable); do
@@ -79,48 +128,76 @@ preFixup = ''
   done
 '';
 </programlisting>
-   Fortunately, there is <package>wrapGAppsHook</package>, that does the wrapping for us. In particular, it works in conjunction with other setup hooks that will populate the variable:
+   Fortunately, there is <package>wrapGAppsHook</package>, that does the
+   wrapping for us. In particular, it works in conjunction with other setup
+   hooks that will populate the variable:
    <itemizedlist>
     <listitem xml:id="ssec-gnome-hooks-wrapgappshook">
      <para>
-      <package>wrapGAppsHook</package> itself will add the package’s <filename>share</filename> directory to <envar>XDG_DATA_DIRS</envar>.
+      <package>wrapGAppsHook</package> itself will add the package’s
+      <filename>share</filename> directory to <envar>XDG_DATA_DIRS</envar>.
      </para>
     </listitem>
     <listitem xml:id="ssec-gnome-hooks-glib">
      <para>
-      <package>glib</package> setup hook will populate <envar>GSETTINGS_SCHEMAS_PATH</envar> and then <package>wrapGAppsHook</package> will prepend it to <envar>XDG_DATA_DIRS</envar>.
+      <package>glib</package> setup hook will populate
+      <envar>GSETTINGS_SCHEMAS_PATH</envar> and then
+      <package>wrapGAppsHook</package> will prepend it to
+      <envar>XDG_DATA_DIRS</envar>.
      </para>
     </listitem>
     <listitem xml:id="ssec-gnome-hooks-dconf">
      <para>
-      <package>gnome3.dconf.lib</package> is a dependency of <package>wrapGAppsHook</package>, which then also adds it to the <envar>GIO_EXTRA_MODULES</envar> variable.
+      <package>gnome3.dconf.lib</package> is a dependency of
+      <package>wrapGAppsHook</package>, which then also adds it to the
+      <envar>GIO_EXTRA_MODULES</envar> variable.
      </para>
     </listitem>
     <listitem xml:id="ssec-gnome-hooks-hicolor-icon-theme">
      <para>
-      <package>hicolor-icon-theme</package>’s setup hook will add icon themes to <envar>XDG_ICON_DIRS</envar> which is prepended to <envar>XDG_DATA_DIRS</envar> by <package>wrapGAppsHook</package>.
+      <package>hicolor-icon-theme</package>’s setup hook will add icon themes
+      to <envar>XDG_ICON_DIRS</envar> which is prepended to
+      <envar>XDG_DATA_DIRS</envar> by <package>wrapGAppsHook</package>.
      </para>
     </listitem>
     <listitem xml:id="ssec-gnome-hooks-gobject-introspection">
      <para>
-      <package>gobject-introspection</package> setup hook populates <envar>GI_TYPELIB_PATH</envar> variable with <filename>lib/girepository-1.0</filename> directories of dependencies, which is then added to wrapper by <package>wrapGAppsHook</package>. It also adds <filename>share</filename> directories of dependencies to <envar>XDG_DATA_DIRS</envar>, which is intended to promote GIR files but it also <link xlink:href="https://github.com/NixOS/nixpkgs/issues/32790">pollutes the closures</link> of packages using <package>wrapGAppsHook</package>.
+      <package>gobject-introspection</package> setup hook populates
+      <envar>GI_TYPELIB_PATH</envar> variable with
+      <filename>lib/girepository-1.0</filename> directories of dependencies,
+      which is then added to wrapper by <package>wrapGAppsHook</package>. It
+      also adds <filename>share</filename> directories of dependencies to
+      <envar>XDG_DATA_DIRS</envar>, which is intended to promote GIR files but
+      it also
+      <link xlink:href="https://github.com/NixOS/nixpkgs/issues/32790">pollutes
+      the closures</link> of packages using <package>wrapGAppsHook</package>.
      </para>
      <warning>
       <para>
-       The setup hook <link xlink:href="https://github.com/NixOS/nixpkgs/issues/56943">currently</link> does not work in expressions with <literal>strictDeps</literal> enabled, like Python packages. In those cases, you will need to disable it with <code>strictDeps = false;</code>.
+       The setup hook
+       <link xlink:href="https://github.com/NixOS/nixpkgs/issues/56943">currently</link>
+       does not work in expressions with <literal>strictDeps</literal> enabled,
+       like Python packages. In those cases, you will need to disable it with
+       <code>strictDeps = false;</code>.
       </para>
      </warning>
     </listitem>
     <listitem xml:id="ssec-gnome-hooks-gst-grl-plugins">
      <para>
-      Setup hooks of <package>gst_all_1.gstreamer</package> and <package>gnome3.grilo</package> will populate the <envar>GST_PLUGIN_SYSTEM_PATH_1_0</envar> and <envar>GRL_PLUGIN_PATH</envar> variables, respectively, which will then be added to the wrapper by <literal>wrapGAppsHook</literal>.
+      Setup hooks of <package>gst_all_1.gstreamer</package> and
+      <package>gnome3.grilo</package> will populate the
+      <envar>GST_PLUGIN_SYSTEM_PATH_1_0</envar> and
+      <envar>GRL_PLUGIN_PATH</envar> variables, respectively, which will then
+      be added to the wrapper by <literal>wrapGAppsHook</literal>.
      </para>
     </listitem>
    </itemizedlist>
   </para>
 
   <para>
-   You can also pass additional arguments to <literal>makeWrapper</literal> using <literal>gappsWrapperArgs</literal> in <literal>preFixup</literal> hook:
+   You can also pass additional arguments to <literal>makeWrapper</literal>
+   using <literal>gappsWrapperArgs</literal> in <literal>preFixup</literal>
+   hook:
 <programlisting>
 preFixup = ''
   gappsWrapperArgs+=(
@@ -138,7 +215,13 @@ preFixup = ''
   <title>Updating GNOME packages</title>
 
   <para>
-   Most GNOME package offer <link linkend="var-passthru-updateScript"><literal>updateScript</literal></link>, it is therefore possible to update to latest source tarball by running <command>nix-shell maintainers/scripts/update.nix --argstr package gnome3.nautilus</command> or even en masse with <command>nix-shell maintainers/scripts/update.nix --argstr path gnome3</command>. Read the package’s <filename>NEWS</filename> file to see what changed.
+   Most GNOME package offer
+   <link linkend="var-passthru-updateScript"><literal>updateScript</literal></link>,
+   it is therefore possible to update to latest source tarball by running
+   <command>nix-shell maintainers/scripts/update.nix --argstr package
+   gnome3.nautilus</command> or even en masse with <command>nix-shell
+   maintainers/scripts/update.nix --argstr path gnome3</command>. Read the
+   package’s <filename>NEWS</filename> file to see what changed.
   </para>
  </section>
 
@@ -152,7 +235,17 @@ preFixup = ''
     </term>
     <listitem>
      <para>
-      There are no schemas avalable in <envar>XDG_DATA_DIRS</envar>. Temporarily add a random package containing schemas like <package>gsettings-desktop-schemas</package> to <literal>buildInputs</literal>. <link linkend="ssec-gnome-hooks-glib"><package>glib</package></link> and <link linkend="ssec-gnome-hooks-wrapgappshook"><package>wrapGAppsHook</package></link> setup hooks will take care of making the schemas available to application and you will see the actual missing schemas with the <link linkend="ssec-gnome-common-issues-missing-schema">next error</link>. Or you can try looking through the source code for the actual schemas used.
+      There are no schemas avalable in <envar>XDG_DATA_DIRS</envar>.
+      Temporarily add a random package containing schemas like
+      <package>gsettings-desktop-schemas</package> to
+      <literal>buildInputs</literal>.
+      <link linkend="ssec-gnome-hooks-glib"><package>glib</package></link> and
+      <link linkend="ssec-gnome-hooks-wrapgappshook"><package>wrapGAppsHook</package></link>
+      setup hooks will take care of making the schemas available to application
+      and you will see the actual missing schemas with the
+      <link linkend="ssec-gnome-common-issues-missing-schema">next
+      error</link>. Or you can try looking through the source code for the
+      actual schemas used.
      </para>
     </listitem>
    </varlistentry>
@@ -162,7 +255,11 @@ preFixup = ''
     </term>
     <listitem>
      <para>
-      Package is missing some GSettings schemas. You can find out the package containing the schema with <command>nix-locate <replaceable>org.gnome.foo</replaceable>.gschema.xml</command> and let the hooks handle the wrapping as <link linkend="ssec-gnome-common-issues-no-schemas">above</link>.
+      Package is missing some GSettings schemas. You can find out the package
+      containing the schema with <command>nix-locate
+      <replaceable>org.gnome.foo</replaceable>.gschema.xml</command> and let
+      the hooks handle the wrapping as
+      <link linkend="ssec-gnome-common-issues-no-schemas">above</link>.
      </para>
     </listitem>
    </varlistentry>
@@ -172,7 +269,14 @@ preFixup = ''
     </term>
     <listitem>
      <para>
-      This is because derivers like <function>python.pkgs.buildPythonApplication</function> or <function>qt5.mkDerivation</function> have setup-hooks automatically added that produce wrappers with <package>makeWrapper</package>. The simplest way to workaround that is to disable the <package>wrapGAppsHook</package> automatic wrapping with <code>dontWrapGApps = true;</code> and pass the arguments it intended to pass to <package>makeWrapper</package> to another.
+      This is because derivers like
+      <function>python.pkgs.buildPythonApplication</function> or
+      <function>qt5.mkDerivation</function> have setup-hooks automatically
+      added that produce wrappers with <package>makeWrapper</package>. The
+      simplest way to workaround that is to disable the
+      <package>wrapGAppsHook</package> automatic wrapping with
+      <code>dontWrapGApps = true;</code> and pass the arguments it intended to
+      pass to <package>makeWrapper</package> to another.
      </para>
      <para>
       In the case of a Python application it could look like:
@@ -224,34 +328,55 @@ mkDerivation {
     </term>
     <listitem>
      <para>
-      You can rely on applications depending on the library set the necessary environment variables but that it often easy to miss. Instead we recommend to patch the paths in the source code whenever possible. Here are some examples:
+      You can rely on applications depending on the library set the necessary
+      environment variables but that it often easy to miss. Instead we
+      recommend to patch the paths in the source code whenever possible. Here
+      are some examples:
       <itemizedlist>
        <listitem xml:id="ssec-gnome-common-issues-unwrappable-package-gnome-shell-ext">
         <para>
-         <link xlink:href="https://github.com/NixOS/nixpkgs/blob/7bb8f05f12ca3cff9da72b56caa2f7472d5732bc/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix#L21-L24">Replacing a <envar>GI_TYPELIB_PATH</envar> in GNOME Shell extension</link> – we are using <function>substituteAll</function> to include the path to a typelib into a patch.
+         <link xlink:href="https://github.com/NixOS/nixpkgs/blob/7bb8f05f12ca3cff9da72b56caa2f7472d5732bc/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix#L21-L24">Replacing
+         a <envar>GI_TYPELIB_PATH</envar> in GNOME Shell extension</link> –
+         we are using <function>substituteAll</function> to include the path to
+         a typelib into a patch.
         </para>
        </listitem>
        <listitem xml:id="ssec-gnome-common-issues-unwrappable-package-gsettings">
         <para>
-         The following examples are hardcoding GSettings schema paths. To get the schema paths we use the functions
+         The following examples are hardcoding GSettings schema paths. To get
+         the schema paths we use the functions
          <itemizedlist>
           <listitem>
            <para>
-            <function>glib.getSchemaPath</function> Takes a nix package attribute as an argument.
+            <function>glib.getSchemaPath</function> Takes a nix package
+            attribute as an argument.
            </para>
           </listitem>
           <listitem>
            <para>
-            <function>glib.makeSchemaPath</function> Takes a package output like <literal>$out</literal> and a derivation name. You should use this if the schemas you need to hardcode are in the same derivation.
+            <function>glib.makeSchemaPath</function> Takes a package output
+            like <literal>$out</literal> and a derivation name. You should use
+            this if the schemas you need to hardcode are in the same
+            derivation.
            </para>
           </listitem>
          </itemizedlist>
         </para>
         <para xml:id="ssec-gnome-common-issues-unwrappable-package-gsettings-vala">
-         <link xlink:href="https://github.com/NixOS/nixpkgs/blob/7bb8f05f12ca3cff9da72b56caa2f7472d5732bc/pkgs/desktops/pantheon/apps/elementary-files/default.nix#L78-L86">Hard-coding GSettings schema path in Vala plug-in (dynamically loaded library)</link> – here, <function>substituteAll</function> cannot be used since the schema comes from the same package preventing us from pass its path to the function, probably due to a <link xlink:href="https://github.com/NixOS/nix/issues/1846">Nix bug</link>.
+         <link xlink:href="https://github.com/NixOS/nixpkgs/blob/7bb8f05f12ca3cff9da72b56caa2f7472d5732bc/pkgs/desktops/pantheon/apps/elementary-files/default.nix#L78-L86">Hard-coding
+         GSettings schema path in Vala plug-in (dynamically loaded
+         library)</link> – here, <function>substituteAll</function> cannot be
+         used since the schema comes from the same package preventing us from
+         pass its path to the function, probably due to a
+         <link xlink:href="https://github.com/NixOS/nix/issues/1846">Nix
+         bug</link>.
         </para>
         <para xml:id="ssec-gnome-common-issues-unwrappable-package-gsettings-c">
-         <link xlink:href="https://github.com/NixOS/nixpkgs/blob/29c120c065d03b000224872251bed93932d42412/pkgs/development/libraries/glib-networking/default.nix#L31-L34">Hard-coding GSettings schema path in C library</link> – nothing special other than using <link xlink:href="https://github.com/NixOS/nixpkgs/pull/67957#issuecomment-527717467">Coccinelle patch</link> to generate the patch itself.
+         <link xlink:href="https://github.com/NixOS/nixpkgs/blob/29c120c065d03b000224872251bed93932d42412/pkgs/development/libraries/glib-networking/default.nix#L31-L34">Hard-coding
+         GSettings schema path in C library</link> – nothing special other
+         than using
+         <link xlink:href="https://github.com/NixOS/nixpkgs/pull/67957#issuecomment-527717467">Coccinelle
+         patch</link> to generate the patch itself.
         </para>
        </listitem>
       </itemizedlist>
diff --git a/doc/languages-frameworks/perl.xml b/doc/languages-frameworks/perl.xml
index 065212a0e18..d5911cf67fd 100644
--- a/doc/languages-frameworks/perl.xml
+++ b/doc/languages-frameworks/perl.xml
@@ -141,8 +141,8 @@ ClassC3Componentised = buildPerlPackage rec {
  <para>
   On Darwin, if a script has too many
   <literal>-I<replaceable>dir</replaceable></literal> flags in its first line
-  (its “shebang line”), it will not run. This can be worked around by calling
-  the <literal>shortenPerlShebang</literal> function from the
+  (its “shebang line”), it will not run. This can be worked around by
+  calling the <literal>shortenPerlShebang</literal> function from the
   <literal>postInstall</literal> phase:
 <programlisting>
 { stdenv, buildPerlPackage, fetchurl, shortenPerlShebang }:
@@ -162,10 +162,10 @@ ImageExifTool = buildPerlPackage {
   '';
 };
 </programlisting>
- This will remove the <literal>-I</literal> flags from the shebang line,
- rewrite them in the <literal>use lib</literal> form, and put them on the next
- line instead. This function can be given any number of Perl scripts as
- arguments; it will modify them in-place.
+  This will remove the <literal>-I</literal> flags from the shebang line,
+  rewrite them in the <literal>use lib</literal> form, and put them on the next
+  line instead. This function can be given any number of Perl scripts as
+  arguments; it will modify them in-place.
  </para>
 
  <section xml:id="ssec-generation-from-CPAN">
diff --git a/doc/languages-frameworks/qt.xml b/doc/languages-frameworks/qt.xml
index 3332ce8c06e..d6f3314ab08 100644
--- a/doc/languages-frameworks/qt.xml
+++ b/doc/languages-frameworks/qt.xml
@@ -4,16 +4,16 @@
  <title>Qt</title>
 
  <para>
-   This section describes the differences between Nix expressions for Qt
-   libraries and applications and Nix expressions for other C++ software. Some
-   knowledge of the latter is assumed. There are primarily two problems which
-   the Qt infrastructure is designed to address: ensuring consistent versioning
-   of all dependencies and finding dependencies at runtime.
+  This section describes the differences between Nix expressions for Qt
+  libraries and applications and Nix expressions for other C++ software. Some
+  knowledge of the latter is assumed. There are primarily two problems which
+  the Qt infrastructure is designed to address: ensuring consistent versioning
+  of all dependencies and finding dependencies at runtime.
  </para>
 
  <example xml:id='qt-default-nix'>
-   <title>Nix expression for a Qt package (<filename>default.nix</filename>)</title>
-   <programlisting>
+  <title>Nix expression for a Qt package (<filename>default.nix</filename>)</title>
+<programlisting>
 { mkDerivation, lib, qtbase }: <co xml:id='qt-default-nix-co-1' />
 
 mkDerivation { <co xml:id='qt-default-nix-co-2' />
@@ -26,53 +26,51 @@ mkDerivation { <co xml:id='qt-default-nix-co-2' />
  </example>
 
  <calloutlist>
-   <callout arearefs='qt-default-nix-co-1'>
-     <para>
-       Import <literal>mkDerivation</literal> and Qt (such as
-       <literal>qtbase</literal> modules directly. <emphasis>Do not</emphasis>
-       import Qt package sets; the Qt versions of dependencies may not be
-       coherent, causing build and runtime failures.
-     </para>
-   </callout>
-   <callout arearefs='qt-default-nix-co-2'>
-     <para>
-       Use <literal>mkDerivation</literal> instead of
-       <literal>stdenv.mkDerivation</literal>. <literal>mkDerivation</literal>
-       is a wrapper around <literal>stdenv.mkDerivation</literal> which
-       applies some Qt-specific settings.
-       This deriver accepts the same arguments as
-       <literal>stdenv.mkDerivation</literal>; refer to
-       <xref linkend='chap-stdenv' /> for details.
-     </para>
-     <para>
-       To use another deriver instead of
-       <literal>stdenv.mkDerivation</literal>, use
-       <literal>mkDerivationWith</literal>:
+  <callout arearefs='qt-default-nix-co-1'>
+   <para>
+    Import <literal>mkDerivation</literal> and Qt (such as
+    <literal>qtbase</literal> modules directly. <emphasis>Do not</emphasis>
+    import Qt package sets; the Qt versions of dependencies may not be
+    coherent, causing build and runtime failures.
+   </para>
+  </callout>
+  <callout arearefs='qt-default-nix-co-2'>
+   <para>
+    Use <literal>mkDerivation</literal> instead of
+    <literal>stdenv.mkDerivation</literal>. <literal>mkDerivation</literal> is
+    a wrapper around <literal>stdenv.mkDerivation</literal> which applies some
+    Qt-specific settings. This deriver accepts the same arguments as
+    <literal>stdenv.mkDerivation</literal>; refer to
+    <xref linkend='chap-stdenv' /> for details.
+   </para>
+   <para>
+    To use another deriver instead of <literal>stdenv.mkDerivation</literal>,
+    use <literal>mkDerivationWith</literal>:
 <programlisting>
 mkDerivationWith myDeriver {
   # ...
 }
 </programlisting>
-       If you cannot use <literal>mkDerivationWith</literal>, please refer to
-       <xref linkend='qt-runtime-dependencies' />.
-     </para>
-   </callout>
-   <callout arearefs='qt-default-nix-co-3'>
-     <para>
-       <literal>mkDerivation</literal> accepts the same arguments as
-       <literal>stdenv.mkDerivation</literal>, such as
-       <literal>buildInputs</literal>.
-     </para>
-   </callout>
+    If you cannot use <literal>mkDerivationWith</literal>, please refer to
+    <xref linkend='qt-runtime-dependencies' />.
+   </para>
+  </callout>
+  <callout arearefs='qt-default-nix-co-3'>
+   <para>
+    <literal>mkDerivation</literal> accepts the same arguments as
+    <literal>stdenv.mkDerivation</literal>, such as
+    <literal>buildInputs</literal>.
+   </para>
+  </callout>
  </calloutlist>
 
  <formalpara xml:id='qt-runtime-dependencies'>
-   <title>Locating runtime dependencies</title>
-   <para>
-     Qt applications need to be wrapped to find runtime dependencies.  If you
-     cannot use <literal>mkDerivation</literal> or
-     <literal>mkDerivationWith</literal> above, include
-     <literal>wrapQtAppsHook</literal> in <literal>nativeBuildInputs</literal>:
+  <title>Locating runtime dependencies</title>
+  <para>
+   Qt applications need to be wrapped to find runtime dependencies. If you
+   cannot use <literal>mkDerivation</literal> or
+   <literal>mkDerivationWith</literal> above, include
+   <literal>wrapQtAppsHook</literal> in <literal>nativeBuildInputs</literal>:
 <programlisting>
 stdenv.mkDerivation {
   # ...
@@ -80,13 +78,13 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ wrapQtAppsHook ];
 }
 </programlisting>
-   </para>
+  </para>
  </formalpara>
 
  <para>
-   Entries added to <literal>qtWrapperArgs</literal> are used to modify the
-   wrappers created by <literal>wrapQtAppsHook</literal>. The entries are
-   passed as arguments to <xref linkend='fun-wrapProgram' />.
+  Entries added to <literal>qtWrapperArgs</literal> are used to modify the
+  wrappers created by <literal>wrapQtAppsHook</literal>. The entries are passed
+  as arguments to <xref linkend='fun-wrapProgram' />.
 <programlisting>
 mkDerivation {
   # ...
@@ -97,8 +95,8 @@ mkDerivation {
  </para>
 
  <para>
-  Set <literal>dontWrapQtApps</literal> to stop applications from being
-  wrapped automatically. It is required to wrap applications manually with
+  Set <literal>dontWrapQtApps</literal> to stop applications from being wrapped
+  automatically. It is required to wrap applications manually with
   <literal>wrapQtApp</literal>, using the syntax of
   <xref linkend='fun-wrapProgram' />:
 <programlisting>
@@ -115,16 +113,17 @@ mkDerivation {
 
  <note>
   <para>
-    <literal>wrapQtAppsHook</literal> ignores files that are non-ELF executables.
-    This means that scripts won't be automatically wrapped so you'll need to manually
-    wrap them as previously mentioned. An example of when you'd always need to do this
-    is with Python applications that use PyQT.
+   <literal>wrapQtAppsHook</literal> ignores files that are non-ELF
+   executables. This means that scripts won't be automatically wrapped so
+   you'll need to manually wrap them as previously mentioned. An example of
+   when you'd always need to do this is with Python applications that use PyQT.
   </para>
  </note>
 
  <para>
-  Libraries are built with every available version of Qt. Use the <literal>meta.broken</literal>
-  attribute to disable the package for unsupported Qt versions:
+  Libraries are built with every available version of Qt. Use the
+  <literal>meta.broken</literal> attribute to disable the package for
+  unsupported Qt versions:
 <programlisting>
 mkDerivation {
   # ...
@@ -136,13 +135,13 @@ mkDerivation {
  </para>
 
  <formalpara>
-   <title>Adding a library to Nixpkgs</title>
-   <para>
-     Add a Qt library to <filename>all-packages.nix</filename> by adding it to the
-     collection inside <literal>mkLibsForQt5</literal>. This ensures that the
-     library is built with every available version of Qt as needed.
-     <example xml:id='qt-library-all-packages-nix'>
-       <title>Adding a Qt library to <filename>all-packages.nix</filename></title>
+  <title>Adding a library to Nixpkgs</title>
+  <para>
+   Add a Qt library to <filename>all-packages.nix</filename> by adding it to
+   the collection inside <literal>mkLibsForQt5</literal>. This ensures that the
+   library is built with every available version of Qt as needed.
+   <example xml:id='qt-library-all-packages-nix'>
+    <title>Adding a Qt library to <filename>all-packages.nix</filename></title>
 <programlisting>
 {
   # ...
@@ -156,19 +155,19 @@ mkDerivation {
   # ...
 }
 </programlisting>
-     </example>
-   </para>
+   </example>
+  </para>
  </formalpara>
 
  <formalpara>
-   <title>Adding an application to Nixpkgs</title>
-   <para>
-     Add a Qt application to <filename>all-packages.nix</filename> using
-     <literal>libsForQt5.callPackage</literal> instead of the usual
-     <literal>callPackage</literal>. The former ensures that all dependencies
-     are built with the same version of Qt.
-     <example xml:id='qt-application-all-packages-nix'>
-       <title>Adding a Qt application to <filename>all-packages.nix</filename></title>
+  <title>Adding an application to Nixpkgs</title>
+  <para>
+   Add a Qt application to <filename>all-packages.nix</filename> using
+   <literal>libsForQt5.callPackage</literal> instead of the usual
+   <literal>callPackage</literal>. The former ensures that all dependencies are
+   built with the same version of Qt.
+   <example xml:id='qt-application-all-packages-nix'>
+    <title>Adding a Qt application to <filename>all-packages.nix</filename></title>
 <programlisting>
 {
   # ...
@@ -178,8 +177,7 @@ mkDerivation {
   # ...
 }
 </programlisting>
-     </example>
-   </para>
+   </example>
+  </para>
  </formalpara>
-
 </section>
diff --git a/doc/meta.xml b/doc/meta.xml
index 58c390a68b8..49db73ab79e 100644
--- a/doc/meta.xml
+++ b/doc/meta.xml
@@ -156,9 +156,9 @@ hello-2.3  A program that produces a familiar, friendly greeting
     </term>
     <listitem>
      <para>
-      A link or a list of links to the location of Changelog for a package.
-     A link may use expansion to refer to the correct changelog version.
-             Example:
+      A link or a list of links to the location of Changelog for a package. A
+      link may use expansion to refer to the correct changelog version.
+      Example:
       <literal>"https://git.savannah.gnu.org/cgit/hello.git/plain/NEWS?h=v${version}"</literal>
      </para>
     </listitem>
@@ -273,8 +273,8 @@ meta.platforms = stdenv.lib.platforms.linux;
        This attribute is special in that it is not actually under the
        <literal>meta</literal> attribute set but rather under the
        <literal>passthru</literal> attribute set. This is due to how
-       <literal>meta</literal> attributes work, and the fact that they
-       are supposed to contain only metadata, not derivations.
+       <literal>meta</literal> attributes work, and the fact that they are
+       supposed to contain only metadata, not derivations.
       </para>
      </warning>
      <para>
diff --git a/doc/package-notes.xml b/doc/package-notes.xml
index d2c660e22a9..ef3c2a7c848 100644
--- a/doc/package-notes.xml
+++ b/doc/package-notes.xml
@@ -311,7 +311,8 @@ packageOverrides = pkgs: {
   <title>Elm</title>
 
   <para>
-   To start a development environment do <command>nix-shell -p elmPackages.elm elmPackages.elm-format</command>
+   To start a development environment do <command>nix-shell -p elmPackages.elm
+   elmPackages.elm-format</command>
   </para>
 
   <para>
@@ -506,10 +507,11 @@ stdenv.mkDerivation {
    <para>
     The IBus engine is based on <literal>hunspell</literal> to support
     completion in many languages. By default the dictionaries
-    <literal>de-de</literal>, <literal>en-us</literal>, <literal>fr-moderne</literal>
-    <literal>es-es</literal>, <literal>it-it</literal>,
-    <literal>sv-se</literal> and <literal>sv-fi</literal> are in use. To add
-    another dictionary, the package can be overridden like this:
+    <literal>de-de</literal>, <literal>en-us</literal>,
+    <literal>fr-moderne</literal> <literal>es-es</literal>,
+    <literal>it-it</literal>, <literal>sv-se</literal> and
+    <literal>sv-fi</literal> are in use. To add another dictionary, the package
+    can be overridden like this:
 <programlisting>ibus-engines.typing-booster.override {
   langs = [ "de-at" "en-gb" ];
 }</programlisting>
@@ -543,47 +545,45 @@ stdenv.mkDerivation {
   <title>Nginx</title>
 
   <para>
-    <link xlink:href="https://nginx.org/">Nginx</link> is a
-    reverse proxy and lightweight webserver.
+   <link xlink:href="https://nginx.org/">Nginx</link> is a reverse proxy and
+   lightweight webserver.
   </para>
 
   <section xml:id="sec-nginx-etag">
    <title>ETags on static files served from the Nix store</title>
 
    <para>
-     HTTP has a couple different mechanisms for caching to prevent
-     clients from having to download the same content repeatedly
-     if a resource has not changed since the last time it was requested.
-     When nginx is used as a server for static files, it implements
-     the caching mechanism based on the
-     <link xlink:href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Last-Modified"><literal>Last-Modified</literal></link>
-     response header automatically; unfortunately, it works by using
-     filesystem timestamps to determine the value of the
-     <literal>Last-Modified</literal> header. This doesn't give the
-     desired behavior when the file is in the Nix store, because all
-     file timestamps are set to 0 (for reasons related to build
-     reproducibility).
+    HTTP has a couple different mechanisms for caching to prevent clients from
+    having to download the same content repeatedly if a resource has not
+    changed since the last time it was requested. When nginx is used as a
+    server for static files, it implements the caching mechanism based on the
+    <link xlink:href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Last-Modified"><literal>Last-Modified</literal></link>
+    response header automatically; unfortunately, it works by using filesystem
+    timestamps to determine the value of the <literal>Last-Modified</literal>
+    header. This doesn't give the desired behavior when the file is in the Nix
+    store, because all file timestamps are set to 0 (for reasons related to
+    build reproducibility).
    </para>
 
    <para>
-     Fortunately, HTTP supports an alternative (and more effective)
-     caching mechanism: the
+    Fortunately, HTTP supports an alternative (and more effective) caching
+    mechanism: the
     <link xlink:href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/ETag"><literal>ETag</literal></link>
-    response header. The value of the <literal>ETag</literal> header
-    specifies some identifier for the particular content that the
-    server is sending (e.g. a hash). When a client makes a second
-    request for the same resource, it sends that value back in an
-    <literal>If-None-Match</literal> header. If the ETag value is
-    unchanged, then the server does not need to resend the content.
+    response header. The value of the <literal>ETag</literal> header specifies
+    some identifier for the particular content that the server is sending (e.g.
+    a hash). When a client makes a second request for the same resource, it
+    sends that value back in an <literal>If-None-Match</literal> header. If the
+    ETag value is unchanged, then the server does not need to resend the
+    content.
    </para>
 
    <para>
-    As of NixOS 19.09, the nginx package in Nixpkgs is patched such
-    that when nginx serves a file out of <filename>/nix/store</filename>,
-    the hash in the store path is used as the <literal>ETag</literal>
-    header in the HTTP response, thus providing proper caching functionality.
-    This happens automatically; you do not need to do modify any
-    configuration to get this behavior.
+    As of NixOS 19.09, the nginx package in Nixpkgs is patched such that when
+    nginx serves a file out of <filename>/nix/store</filename>, the hash in the
+    store path is used as the <literal>ETag</literal> header in the HTTP
+    response, thus providing proper caching functionality. This happens
+    automatically; you do not need to do modify any configuration to get this
+    behavior.
    </para>
   </section>
  </section>
diff --git a/doc/package-specific-user-notes.xml b/doc/package-specific-user-notes.xml
index ef23b022c88..09af69bb15d 100644
--- a/doc/package-specific-user-notes.xml
+++ b/doc/package-specific-user-notes.xml
@@ -1,14 +1,10 @@
 <chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="package-specific-user-notes">
  <title>Package-specific usage notes</title>
  <para>
-         These chapters includes some notes
-         that apply to specific packages and should
-         answer some of the frequently asked questions
-         related to Nixpkgs use.
-
-  Some useful information related to package use
-  can be found in <link linkend="chap-package-notes">package-specific development notes</link>.
-
+  These chapters includes some notes that apply to specific packages and should
+  answer some of the frequently asked questions related to Nixpkgs use. Some
+  useful information related to package use can be found in
+  <link linkend="chap-package-notes">package-specific development notes</link>.
  </para>
  <section xml:id="opengl">
   <title>OpenGL</title>
@@ -47,7 +43,6 @@
    <literal>locales</literal> of the package.
   </para>
  </section>
-
  <section xml:id="sec-emacs">
   <title>Emacs</title>
 
@@ -204,46 +199,43 @@ overrides = self: super: rec {
 </screen>
   </section>
  </section>
-
  <section xml:id="dlib">
   <title>DLib</title>
 
   <para>
-    <link xlink:href="http://dlib.net/">DLib</link> is a modern, C++-based toolkit which
-    provides several machine learning algorithms.
+   <link xlink:href="http://dlib.net/">DLib</link> is a modern, C++-based
+   toolkit which provides several machine learning algorithms.
   </para>
 
   <section xml:id="compiling-without-avx-support">
    <title>Compiling without AVX support</title>
 
    <para>
-     Especially older CPUs don't support
-     <link xlink:href="https://en.wikipedia.org/wiki/Advanced_Vector_Extensions">AVX</link>
-     (<abbrev>Advanced Vector Extensions</abbrev>) instructions that are used by DLib to
-     optimize their algorithms.
+    Especially older CPUs don't support
+    <link xlink:href="https://en.wikipedia.org/wiki/Advanced_Vector_Extensions">AVX</link>
+    (<abbrev>Advanced Vector Extensions</abbrev>) instructions that are used by
+    DLib to optimize their algorithms.
    </para>
 
    <para>
-    On the affected hardware errors like <literal>Illegal instruction</literal> will occur.
-    In those cases AVX support needs to be disabled:
+    On the affected hardware errors like <literal>Illegal instruction</literal>
+    will occur. In those cases AVX support needs to be disabled:
 <programlisting>self: super: {
   dlib = super.dlib.override { avxSupport = false; };
 }</programlisting>
    </para>
   </section>
  </section>
-
  <section xml:id="unfree-software">
   <title>Unfree software</title>
 
   <para>
    All users of Nixpkgs are free software users, and many users (and
    developers) of Nixpkgs want to limit and tightly control their exposure to
-   unfree software. At the same time, many users need (or want)
-   to run some specific
-   pieces of proprietary software. Nixpkgs includes some expressions for unfree
-   software packages. By default unfree software cannot be installed and
-   doesn’t show up in searches. To allow installing unfree software in a
+   unfree software. At the same time, many users need (or want) to run some
+   specific pieces of proprietary software. Nixpkgs includes some expressions
+   for unfree software packages. By default unfree software cannot be installed
+   and doesn’t show up in searches. To allow installing unfree software in a
    single Nix invocation one can export
    <literal>NIXPKGS_ALLOW_UNFREE=1</literal>. For a persistent solution, users
    can set <literal>allowUnfree</literal> in the Nixpkgs configuration.
@@ -256,7 +248,6 @@ overrides = self: super: rec {
    <literal>true</literal> for unfree packages that should be allowed.
   </para>
  </section>
-
  <section xml:id="sec-steam">
   <title>Steam</title>
 
@@ -407,21 +398,24 @@ overrides = self: super: rec {
    </para>
   </section>
  </section>
-
  <section xml:id="sec-citrix">
   <title>Citrix Receiver &amp; Citrix Workspace App</title>
 
   <para>
    <note>
     <para>
-     Please note that the <literal>citrix_receiver</literal> package has been deprecated since its
-     development was <link xlink:href="https://docs.citrix.com/en-us/citrix-workspace-app.html">discontinued by upstream</link>
-     and has been replaced by <link xlink:href="https://www.citrix.com/products/workspace-app/">the citrix workspace app</link>.
+     Please note that the <literal>citrix_receiver</literal> package has been
+     deprecated since its development was
+     <link xlink:href="https://docs.citrix.com/en-us/citrix-workspace-app.html">discontinued
+     by upstream</link> and has been replaced by
+     <link xlink:href="https://www.citrix.com/products/workspace-app/">the
+     citrix workspace app</link>.
     </para>
    </note>
-   <link xlink:href="https://www.citrix.com/products/receiver/">Citrix Receiver</link> and
-   <link xlink:href="https://www.citrix.com/products/workspace-app/">Citrix Workspace App</link>
-   are a remote desktop viewers which provide access to
+   <link xlink:href="https://www.citrix.com/products/receiver/">Citrix
+   Receiver</link> and
+   <link xlink:href="https://www.citrix.com/products/workspace-app/">Citrix
+   Workspace App</link> are a remote desktop viewers which provide access to
    <link xlink:href="https://www.citrix.com/products/xenapp-xendesktop/">XenDesktop</link>
    installations.
   </para>
@@ -432,24 +426,24 @@ overrides = self: super: rec {
    <para>
     The tarball archive needs to be downloaded manually as the license
     agreements of the vendor for
-    <link xlink:href="https://www.citrix.com/downloads/citrix-receiver/">Citrix Receiver</link>
-    or <link xlink:href="https://www.citrix.de/downloads/workspace-app/linux/workspace-app-for-linux-latest.html">Citrix Workspace</link>
-    need to be accepted first.
-    Then run <command>nix-prefetch-url file://$PWD/linuxx64-$version.tar.gz</command>.
-    With the archive available
-    in the store the package can be built and installed with Nix.
+    <link xlink:href="https://www.citrix.com/downloads/citrix-receiver/">Citrix
+    Receiver</link> or
+    <link xlink:href="https://www.citrix.de/downloads/workspace-app/linux/workspace-app-for-linux-latest.html">Citrix
+    Workspace</link> need to be accepted first. Then run
+    <command>nix-prefetch-url file://$PWD/linuxx64-$version.tar.gz</command>.
+    With the archive available in the store the package can be built and
+    installed with Nix.
    </para>
 
    <warning>
     <title>Caution with <command>nix-shell</command> installs</title>
     <para>
-     It's recommended to install <literal>Citrix Receiver</literal>
-     and/or <literal>Citrix Workspace</literal> using
-     <literal>nix-env -i</literal> or globally to
-     ensure that the <literal>.desktop</literal> files are installed properly
-     into <literal>$XDG_CONFIG_DIRS</literal>. Otherwise it won't be possible to
-     open <literal>.ica</literal> files automatically from the browser to start
-     a Citrix connection.
+     It's recommended to install <literal>Citrix Receiver</literal> and/or
+     <literal>Citrix Workspace</literal> using <literal>nix-env -i</literal> or
+     globally to ensure that the <literal>.desktop</literal> files are
+     installed properly into <literal>$XDG_CONFIG_DIRS</literal>. Otherwise it
+     won't be possible to open <literal>.ica</literal> files automatically from
+     the browser to start a Citrix connection.
     </para>
    </warning>
   </section>
@@ -458,8 +452,8 @@ overrides = self: super: rec {
    <title>Custom certificates</title>
 
    <para>
-    The <literal>Citrix Workspace App</literal>
-    in <literal>nixpkgs</literal> trust several certificates
+    The <literal>Citrix Workspace App</literal> in <literal>nixpkgs</literal>
+    trust several certificates
     <link xlink:href="https://curl.haxx.se/docs/caextract.html">from the
     Mozilla database</link> by default. However several companies using Citrix
     might require their own corporate certificate. On distros with imperative
diff --git a/doc/quick-start.xml b/doc/quick-start.xml
index 292d66864a4..39e3e7396bd 100644
--- a/doc/quick-start.xml
+++ b/doc/quick-start.xml
@@ -210,9 +210,11 @@
    </listitem>
    <listitem>
     <para>
-     Optionally commit the new package and open a pull request <link
-     xlink:href="https://github.com/NixOS/nixpkgs/pulls">to nixpkgs</link>, or
-     use <link
+     Optionally commit the new package and open a pull request
+     <link
+     xlink:href="https://github.com/NixOS/nixpkgs/pulls">to
+     nixpkgs</link>, or use
+     <link
      xlink:href="https://discourse.nixos.org/t/about-the-patches-category/477">
      the Patches category</link> on Discourse for sending a patch without a
      GitHub account.
diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index f8c2aff9785..a4bc2809be0 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -736,8 +736,8 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ]
       commit</command> or any other commands that cannot handle that.
      </para>
      <para>
-      For information about how to run the updates, execute
-      <command>nix-shell maintainers/scripts/update.nix</command>.
+      For information about how to run the updates, execute <command>nix-shell
+      maintainers/scripts/update.nix</command>.
      </para>
     </listitem>
    </varlistentry>
@@ -764,7 +764,8 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ]
    to <emphasis>add</emphasis> some commands to a phase, e.g. by defining
    <literal>postInstall</literal> or <literal>preFixup</literal>, as skipping
    some of the default actions may have unexpected consequences. The default
-   script for each phase is defined in the file <filename>pkgs/stdenv/generic/setup.sh</filename>.
+   script for each phase is defined in the file
+   <filename>pkgs/stdenv/generic/setup.sh</filename>.
   </para>
 
   <section xml:id="ssec-controlling-phases">
@@ -786,7 +787,8 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ]
         set, the default value is used, which is <literal>$prePhases
         unpackPhase patchPhase $preConfigurePhases configurePhase
         $preBuildPhases buildPhase checkPhase $preInstallPhases installPhase
-        fixupPhase installCheckPhase $preDistPhases distPhase $postPhases</literal>.
+        fixupPhase installCheckPhase $preDistPhases distPhase
+        $postPhases</literal>.
        </para>
        <para>
         Usually, if you just want to add a few phases, it’s more convenient
@@ -1605,7 +1607,7 @@ installTargets = "install-bin install-doc";</programlisting>
      </term>
      <listitem>
       <para>
-        Set to true to skip the fixup phase.
+       Set to true to skip the fixup phase.
       </para>
      </listitem>
     </varlistentry>
@@ -2411,12 +2413,12 @@ addEnvHooks "$hostOffset" myBashFunction
       <para>
        The Bintools Wrapper was only just recently split off from CC Wrapper,
        so the division of labor is still being worked out. For example, it
-       shouldn't care about the C standard library, but just take a
-       derivation with the dynamic loader (which happens to be the glibc on
-       linux). Dependency finding however is a task both wrappers will continue
-       to need to share, and probably the most important to understand. It is
-       currently accomplished by collecting directories of host-platform
-       dependencies (i.e. <varname>buildInputs</varname> and
+       shouldn't care about the C standard library, but just take a derivation
+       with the dynamic loader (which happens to be the glibc on linux).
+       Dependency finding however is a task both wrappers will continue to need
+       to share, and probably the most important to understand. It is currently
+       accomplished by collecting directories of host-platform dependencies
+       (i.e. <varname>buildInputs</varname> and
        <varname>nativeBuildInputs</varname>) in environment variables. The
        Bintools Wrapper's setup hook causes any <filename>lib</filename> and
        <filename>lib64</filename> subdirectories to be added to
@@ -2633,7 +2635,8 @@ addEnvHooks "$hostOffset" myBashFunction
      </term>
      <listitem>
       <para>
-       Hooks related to GNOME platform and related libraries like GLib, GTK and GStreamer are described in <xref linkend="sec-language-gnome" />.
+       Hooks related to GNOME platform and related libraries like GLib, GTK and
+       GStreamer are described in <xref linkend="sec-language-gnome" />.
       </para>
      </listitem>
     </varlistentry>
@@ -2688,12 +2691,12 @@ addEnvHooks "$hostOffset" myBashFunction
        At <filename>/var/lib/cntr</filename> the sandboxed filesystem is
        mounted. All commands and files of the system are still accessible
        within the shell. To execute commands from the sandbox use the cntr exec
-       subcommand. <command>cntr</command> is only supported
-       on Linux-based platforms. To use it first add <literal>cntr</literal> to
-       your <literal>environment.systemPackages</literal> on NixOS or
-       alternatively to the root user on non-NixOS systems. Then in the package
-       that is supposed to be inspected, add <literal>breakpointHook</literal>
-       to <literal>nativeBuildInputs</literal>.
+       subcommand. <command>cntr</command> is only supported on Linux-based
+       platforms. To use it first add <literal>cntr</literal> to your
+       <literal>environment.systemPackages</literal> on NixOS or alternatively
+       to the root user on non-NixOS systems. Then in the package that is
+       supposed to be inspected, add <literal>breakpointHook</literal> to
+       <literal>nativeBuildInputs</literal>.
 <programlisting>
 nativeBuildInputs = [ breakpointHook ];
 </programlisting>
@@ -2703,11 +2706,11 @@ nativeBuildInputs = [ breakpointHook ];
       <note>
        <title>Caution with remote builds</title>
        <para>
-        This won't work with remote builds as the build environment is on
-        a different machine and can't be accessed by <command>cntr</command>.
-        Remote builds can be turned off by setting <literal>--option builders ''</literal>
-        for <command>nix-build</command> or <literal>--builders ''</literal> for
-        <command>nix build</command>.
+        This won't work with remote builds as the build environment is on a
+        different machine and can't be accessed by <command>cntr</command>.
+        Remote builds can be turned off by setting <literal>--option builders
+        ''</literal> for <command>nix-build</command> or <literal>--builders
+        ''</literal> for <command>nix build</command>.
        </para>
       </note>
      </listitem>
@@ -2806,17 +2809,78 @@ postInstall = ''
     </varlistentry>
     <varlistentry>
      <term>
-      meson
+      Meson
      </term>
      <listitem>
       <para>
-       Overrides the configure phase to run meson to generate Ninja files. You
-       can disable this behavior by setting configurePhase to a custom value,
-       or by setting dontUseMesonConfigure. To run these files, you should
-       accompany meson with ninja. mesonFlags controls only the flags passed to
-       meson. By default, parallel building is enabled as Meson supports
+       Overrides the configure phase to run meson to generate Ninja files. To
+       run these files, you should accompany Meson with ninja. By default,
+       <varname>enableParallelBuilding</varname> is enabled as Meson supports
        parallel building almost everywhere.
       </para>
+      <variablelist>
+       <title>Variables controlling Meson</title>
+       <varlistentry>
+        <term>
+         <varname>mesonFlags</varname>
+        </term>
+        <listitem>
+         <para>
+          Controls the flags passed to meson.
+         </para>
+        </listitem>
+       </varlistentry>
+       <varlistentry>
+        <term>
+         <varname>mesonBuildType</varname>
+        </term>
+        <listitem>
+         <para>
+          Which
+          <link
+          xlink:href="https://mesonbuild.com/Builtin-options.html#core-options"><command>--buildtype</command></link>
+          to pass to Meson. We default to <literal>plain</literal>.
+         </para>
+        </listitem>
+       </varlistentry>
+       <varlistentry>
+        <term>
+         <varname>mesonAutoFeatures</varname>
+        </term>
+        <listitem>
+         <para>
+          What value to set
+          <link
+          xlink:href="https://mesonbuild.com/Builtin-options.html#core-options"><command>-Dauto_features=</command></link>
+          to. We default to <command>enabled</command>.
+         </para>
+        </listitem>
+       </varlistentry>
+       <varlistentry>
+        <term>
+         <varname>mesonWrapMode</varname>
+        </term>
+        <listitem>
+         <para>
+          What value to set
+          <link
+          xlink:href="https://mesonbuild.com/Builtin-options.html#core-options"><command>-Dwrap_mode=</command></link>
+          to. We default to <command>nodownload</command> as we disallow
+          network access.
+         </para>
+        </listitem>
+       </varlistentry>
+       <varlistentry>
+        <term>
+         <varname>dontUseMesonConfigure</varname>
+        </term>
+        <listitem>
+         <para>
+          Disables using Meson's <varname>configurePhase</varname>.
+         </para>
+        </listitem>
+       </varlistentry>
+      </variablelist>
      </listitem>
     </varlistentry>
     <varlistentry>
@@ -2851,8 +2915,8 @@ postInstall = ''
       <para>
        Overrides the configure, build, and install phases. This will run the
        "waf" script used by many projects. If wafPath (default ./waf) doesn’t
-       exist, it will copy the version of waf available in Nixpkgs. wafFlags can
-       be used to pass flags to the waf script.
+       exist, it will copy the version of waf available in Nixpkgs. wafFlags
+       can be used to pass flags to the waf script.
       </para>
      </listitem>
     </varlistentry>
-- 
GitLab


From 9499f4f5c15520dc2033fd195b87802e5164d8c4 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 17 Sep 2019 20:38:51 -0500
Subject: [PATCH 0457/2254] pianobar: enable on darwin

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

diff --git a/pkgs/applications/audio/pianobar/default.nix b/pkgs/applications/audio/pianobar/default.nix
index 40e45a76b4b..26b94f306bc 100644
--- a/pkgs/applications/audio/pianobar/default.nix
+++ b/pkgs/applications/audio/pianobar/default.nix
@@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A console front-end for Pandora.com";
-    homepage = http://6xq.net/projects/pianobar/;
-    platforms = platforms.linux;
+    homepage = "https://6xq.net/pianobar/";
+    platforms = platforms.unix;
     license = licenses.mit; # expat version
   };
 }
-- 
GitLab


From 4dfd5069d65f9dd792508f2f51bfbd922ea4a098 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Tue, 17 Sep 2019 22:40:01 -0300
Subject: [PATCH 0458/2254] arc-theme: 20190910 -> 20190917

---
 pkgs/data/themes/arc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/themes/arc/default.nix b/pkgs/data/themes/arc/default.nix
index dc54c1499fb..8dcfacadb49 100644
--- a/pkgs/data/themes/arc/default.nix
+++ b/pkgs/data/themes/arc/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "arc-theme";
-  version = "20190910";
+  version = "20190917";
 
   src = fetchFromGitHub {
     owner  = "arc-design";
     repo   = pname;
     rev    = version;
-    sha256 = "161kx9ii5ij1503nvhgn3pyqfj7cj03l1di2yf8kwwfczbi4mq3j";
+    sha256 = "1qgpk4p2hi5hd4yy0hj93kq1vs0b32wb8qkaj1wi90c8gwddq5wa";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From 5084011920f8e9a4a00f71dc699f43fd4599d219 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 17 Sep 2019 20:56:44 -0500
Subject: [PATCH 0459/2254] rclone: 1.49.2 -> 1.49.3 (#68999)

Changelog: https://forum.rclone.org/t/rclone-1-49-3-release/11825
---
 pkgs/applications/networking/sync/rclone/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix
index 3e93dcc4440..aa0870ea858 100644
--- a/pkgs/applications/networking/sync/rclone/default.nix
+++ b/pkgs/applications/networking/sync/rclone/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "rclone";
-  version = "1.49.2";
+  version = "1.49.3";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "1a90fr7cw78qhwdgkjwshap345jk1ipm3nnk7xf3nayiyibvk5dg";
+    sha256 = "0dd5xrbf62n4y77zzaai1rc069ism1ikvcw43hzja3mzwfa0sqqa";
   };
 
   modSha256 = "158mpmy8q67dk1ks9p926n1670gsk7rhd0vpjh44f4g64ddnhk03";
-- 
GitLab


From d990f0df4d159665ab63a4374d40bba107dff8cc Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 17 Sep 2019 21:16:09 -0500
Subject: [PATCH 0460/2254] telegraf: 1.10.2 -> 1.12.1

---
 pkgs/servers/monitoring/telegraf/default.nix  |   9 +-
 .../telegraf/{deps-1.10.2.nix => deps.nix}    | 177 ++++++++++++++----
 2 files changed, 142 insertions(+), 44 deletions(-)
 rename pkgs/servers/monitoring/telegraf/{deps-1.10.2.nix => deps.nix} (87%)

diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix
index bf2a5935d1d..eb95077dc24 100644
--- a/pkgs/servers/monitoring/telegraf/default.nix
+++ b/pkgs/servers/monitoring/telegraf/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "telegraf";
-  version = "1.10.2";
+  version = "1.12.1";
 
   goPackagePath = "github.com/influxdata/telegraf";
 
@@ -14,20 +14,19 @@ buildGoPackage rec {
     owner = "influxdata";
     repo = "telegraf";
     rev = version;
-    sha256 = "0g27yczb49xf8nbhkzx7lv8378613afq9qx1gr5yhlpfrl4sgb69";
+    sha256 = "00cd4kskdswcinv5bhwimggi0vbznq3sb2dllkhidx0bird3wdiw";
   };
 
   buildFlagsArray = [ ''-ldflags=
-    -X main.version=${version}
+    -w -s -X main.version=${version}
   '' ];
 
-  goDeps = ./. + "/deps-${version}.nix";
+  goDeps = ./deps.nix;
 
   meta = with lib; {
     description = "The plugin-driven server agent for collecting & reporting metrics.";
     license = licenses.mit;
     homepage = https://www.influxdata.com/time-series-platform/telegraf/;
     maintainers = with maintainers; [ mic92 roblabla ];
-    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/servers/monitoring/telegraf/deps-1.10.2.nix b/pkgs/servers/monitoring/telegraf/deps.nix
similarity index 87%
rename from pkgs/servers/monitoring/telegraf/deps-1.10.2.nix
rename to pkgs/servers/monitoring/telegraf/deps.nix
index 2655595ee69..952d78980b0 100644
--- a/pkgs/servers/monitoring/telegraf/deps-1.10.2.nix
+++ b/pkgs/servers/monitoring/telegraf/deps.nix
@@ -67,9 +67,9 @@
     goPackagePath  = "github.com/Shopify/sarama";
     fetch = {
       type = "git";
-      url = "https://github.com/Shopify/sarama";
-      rev =  "a6144ae922fd99dd0ea5046c8137acfb7fab0914";
-      sha256 = "13x23kmjg7milzc34a0acll5b6q6yh9jfh7qjh6zran1inp9lnba";
+      url = "https://github.com/influxdata/sarama.git";
+      rev =  "b12709e6ca29240128c89fe0b30b6a76be42b457";
+      sha256 = "0hp8g1qwcir2356y48a1qsbhc8qvb44lswhlrc5vgnzscq54zj35";
     };
   }
   {
@@ -122,8 +122,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/aws/aws-sdk-go";
-      rev =  "bf8067ceb6e7f51e150c218972dccfeeed892b85";
-      sha256 = "0kxw0blzxr5vc5c0il7hh178vv86ib7af3j9pnzsfzhm3byw0ccx";
+      rev =  "5312c8dac9067d339c4e68d7e0dd5507b2f01849";
+      sha256 = "1ddm89qbnmnr6dh040m7093mn2zk15ncvdnw9w1ifj75sn5q69pn";
     };
   }
   {
@@ -135,15 +135,6 @@
       sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3";
     };
   }
-  {
-    goPackagePath  = "github.com/bsm/sarama-cluster";
-    fetch = {
-      type = "git";
-      url = "https://github.com/bsm/sarama-cluster";
-      rev =  "cf455bc755fe41ac9bb2861e7a961833d9c2ecc3";
-      sha256 = "000rklq9jx66bbbdklsvm7l9fd9r8d6k3qxx18xfjklblk1v9y19";
-    };
-  }
   {
     goPackagePath  = "github.com/caio/go-tdigest";
     fetch = {
@@ -162,6 +153,15 @@
       sha256 = "0k4899ifpir6kmfxli8a2xfj5zdh0xb2jd0fq2r38wzd4pk25ipr";
     };
   }
+  {
+    goPackagePath  = "github.com/cisco-ie/nx-telemetry-proto";
+    fetch = {
+      type = "git";
+      url = "https://github.com/cisco-ie/nx-telemetry-proto";
+      rev =  "82441e232cf6af9be0f808bf0c6421ee8519880e";
+      sha256 = "15l4a71hmw6w9pkq2dh1lpjb7sjq0v57qn8wkdhsyls3f2bczw9p";
+    };
+  }
   {
     goPackagePath  = "github.com/couchbase/go-couchbase";
     fetch = {
@@ -203,8 +203,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/denisenkom/go-mssqldb";
-      rev =  "1eb28afdf9b6e56cf673badd47545f844fe81103";
-      sha256 = "1p2x2k7azbp4cwdjn1nv0zzaf0fvxaysnjrlyxskqlm2cq5vp5ab";
+      rev =  "2be1aa521ff4499e74b7861a2779ba1e96e3e2c5";
+      sha256 = "0c502ycxg7sdnpvwky5wm2xbxw03lspsjxbmvpabp78dlf3gnmhb";
     };
   }
   {
@@ -302,8 +302,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/eclipse/paho.mqtt.golang";
-      rev =  "36d01c2b4cbeb3d2a12063e4880ce30800af9560";
-      sha256 = "1vgxdv4f1g92jx5sj143y3jc18sfd712il4rbaxckgrpsb7gq8ch";
+      rev =  "adca289fdcf8c883800aafa545bc263452290bae";
+      sha256 = "1f81ia8pkfz2084bla4kirrh7yrfg8dy11gsi84m75j25nf762zn";
     };
   }
   {
@@ -325,12 +325,12 @@
     };
   }
   {
-    goPackagePath  = "github.com/go-ini/ini";
+    goPackagePath  = "github.com/glinton/ping";
     fetch = {
       type = "git";
-      url = "https://github.com/go-ini/ini";
-      rev =  "358ee7663966325963d4e8b2e1fbd570c5195153";
-      sha256 = "1zr51xaka7px1pmfndm12fvg6a3cr24kg77j28zczbfcc6h339gy";
+      url = "https://github.com/glinton/ping";
+      rev =  "1983bc2fd5de3ea00aa5457bbc8774300e889db9";
+      sha256 = "0ixxdwknb2pr1gsp9ay41pl6lhbzz487h43hnynix3gxl38lg6rc";
     };
   }
   {
@@ -365,8 +365,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/go-sql-driver/mysql";
-      rev =  "d523deb1b23d913de5bdada721a6071e71283618";
-      sha256 = "1jwz2j3vd5hlzmnkh20d4276yd8cxy7pac3x3dfi52jkm82ms99n";
+      rev =  "72cd26f257d44c1114970e19afddcd812016007e";
+      sha256 = "1fvsvwc1v2i0gqn01mynvi1shp5xm0xaym6xng09fcbqb56lbjx1";
     };
   }
   {
@@ -414,6 +414,24 @@
       sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds";
     };
   }
+  {
+    goPackagePath  = "github.com/google/go-github";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/go-github";
+      rev =  "7462feb2032c2da9e3b85e9b04e6853a6e9e14ca";
+      sha256 = "1sk43llk5fgb00l99rmrmfrk81da2gsvjl1m6r1k1chpjaghxj11";
+    };
+  }
+  {
+    goPackagePath  = "github.com/google/go-querystring";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/go-querystring";
+      rev =  "44c6ddd0a2342c386950e880b658017258da92fc";
+      sha256 = "0xl12bqyvmn4xcnf8p9ksj9rmnr7s40pvppsdmy8n9bzw1db0iwz";
+    };
+  }
   {
     goPackagePath  = "github.com/google/uuid";
     fetch = {
@@ -495,6 +513,15 @@
       sha256 = "1a81fcm1i0ji2iva0dcimiichgwpbcb7lx0vyaks87zj5wf04qy9";
     };
   }
+  {
+    goPackagePath  = "github.com/hashicorp/go-uuid";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/go-uuid";
+      rev =  "4f571afc59f3043a65f8fe6bf46d887b10a01d43";
+      sha256 = "0jvb88m0rq41bwgirsadgw7mnayl27av3gd2vqa3xvxp3fy0hp5k";
+    };
+  }
   {
     goPackagePath  = "github.com/hashicorp/serf";
     fetch = {
@@ -527,8 +554,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/influxdata/toml";
-      rev =  "2a2e3012f7cfbef64091cc79776311e65dfa211b";
-      sha256 = "1dyzsg79rgl5bcvq7i7cnwhxr7racyhfhmqdq2701zgv77v3rab3";
+      rev =  "270119a8ce653b297f12189c9099ef1409979f2b";
+      sha256 = "1dprq2nx1kh78fqr6awir27ankjkbsjw2rza07ri5m2pxd3kxhsv";
     };
   }
   {
@@ -545,8 +572,17 @@
     fetch = {
       type = "git";
       url = "https://github.com/jackc/pgx";
-      rev =  "89f1e6ac7276b61d885db5e5aed6fcbedd1c7e31";
-      sha256 = "0qln29f443m9sw6yf0xy8m45wag9jg87hbwiplb511d5783l7jwk";
+      rev =  "8faa4453fc7051d1076053f8854077753ab912f2";
+      sha256 = "0zx52pidklrmxkxja0i38zn4yq6z909jvyb30xr48qlsbjn5y6zx";
+    };
+  }
+  {
+    goPackagePath  = "github.com/jcmturner/gofork";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jcmturner/gofork";
+      rev =  "dc7c13fece037a4a36e2b3c69db4991498d30692";
+      sha256 = "0xzsnjqv3d59w9pgqzf6550wdwaqnac7zcdgqfd25w65yhcffzhr";
     };
   }
   {
@@ -554,8 +590,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/jmespath/go-jmespath";
-      rev =  "0b12d6b5";
-      sha256 = "1vv6hph8j6xgv7gwl9vvhlsaaqsm22sxxqmgmldi4v11783pc1ld";
+      rev =  "c2b33e84";
+      sha256 = "1r6w7ydx8ydryxk3sfhzsk8m6f1nsik9jg3i1zhi69v4kfl4d5cz";
     };
   }
   {
@@ -639,6 +675,15 @@
       sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya";
     };
   }
+  {
+    goPackagePath  = "github.com/mdlayher/apcupsd";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mdlayher/apcupsd";
+      rev =  "2fe55d9e1d0704d3c6f03f69a1fd9ebe2aef9df1";
+      sha256 = "1y8wabqln92h2g71aglgf0cp66b7zj8zb2wb03jhpfm75ssv1yyb";
+    };
+  }
   {
     goPackagePath  = "github.com/miekg/dns";
     fetch = {
@@ -720,6 +765,15 @@
       sha256 = "194wdmgsc0qhdjx95ka7blly58r9bj2vc0bgls7jawzszfpsbx8x";
     };
   }
+  {
+    goPackagePath  = "github.com/openconfig/gnmi";
+    fetch = {
+      type = "git";
+      url = "https://github.com/openconfig/gnmi";
+      rev =  "33a1865c302903e7a2e06f35960e6bc31e84b9f6";
+      sha256 = "0yzsda16k9kwhq4kvsixsg6cb67vyn177x0h5n1s9zrrdxbvm05c";
+    };
+  }
   {
     goPackagePath  = "github.com/opencontainers/go-digest";
     fetch = {
@@ -860,8 +914,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/shirou/gopsutil";
-      rev =  "071446942108a03a13cf0717275ad3bdbcb691b4";
-      sha256 = "0ai246kqsfm3xlnp4pp4d197djh6jrbjja832f355zhg3l9fqwfp";
+      rev =  "d80c43f9c984a48783daf22f4bd9278006ae483a";
+      sha256 = "0zqcdvf0ym6nylz9ac1z38d3src8yws34n7gkvhpn52ikp801asn";
     };
   }
   {
@@ -923,8 +977,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/tidwall/gjson";
-      rev =  "f123b340873a0084cb27267eddd8ff615115fbff";
-      sha256 = "1axph65dv3l0mmr2iis4r5jk2qy5ffdvh4gdxz4pv92jyincf5fj";
+      rev =  "d7c940e59395fdcaff4584cb442b2e7808f6711e";
+      sha256 = "14x1g5gnziyh3vpr5mxpw2r5h65mncn548xdvamrpzngjm1idzhi";
     };
   }
   {
@@ -936,6 +990,15 @@
       sha256 = "14nv96h0mjki5q685qx8y331h4yga6hlfh3z9nz6acvnv284q578";
     };
   }
+  {
+    goPackagePath  = "github.com/tidwall/pretty";
+    fetch = {
+      type = "git";
+      url = "https://github.com/tidwall/pretty";
+      rev =  "1166b9ac2b65e46a43d8618d30d1554f4652d49b";
+      sha256 = "1jwpj5903lh8hsj9apm2gwd70809zq0gjgmivkxaq4iq29wnv0n9";
+    };
+  }
   {
     goPackagePath  = "github.com/vishvananda/netlink";
     fetch = {
@@ -1030,7 +1093,7 @@
     goPackagePath  = "golang.org/x/net";
     fetch = {
       type = "git";
-      url = "https://go.googlesource.com/net";
+      url = "https://github.com/golang/net.git";
       rev =  "a680a1efc54dd51c040b3b5ce4939ea3cf2ea0d1";
       sha256 = "018zmn4kmg2mbngcciqal54slc3pl4ry5vlv0bw36fcxvnazxnbp";
     };
@@ -1039,7 +1102,7 @@
     goPackagePath  = "golang.org/x/oauth2";
     fetch = {
       type = "git";
-      url = "https://go.googlesource.com/oauth2";
+      url = "https://github.com/golang/oauth2.git";
       rev =  "d2e6202438beef2727060aa7cabdd924d92ebfd9";
       sha256 = "0wbn75fd10485nb93bm4kqldqifdim5xqy4v7r5sdvimvf3fyhn7";
     };
@@ -1057,9 +1120,9 @@
     goPackagePath  = "golang.org/x/sys";
     fetch = {
       type = "git";
-      url = "https://go.googlesource.com/sys";
-      rev =  "7c4c994c65f702f41ed7d6620a2cb34107576a77";
-      sha256 = "19ss1k6id7dc0i61vw9arz03vpvwc2mxwdn99qq2galy0z3b8hbi";
+      url = "https://github.com/golang/sys.git";
+      rev =  "51ab0e2deafac1f46c46ad59cf0921be2f180c3d";
+      sha256 = "0xdhpckbql3bsqkpc2k5b1cpnq3q1qjqjjq2j3p707rfwb8nm91a";
     };
   }
   {
@@ -1152,6 +1215,42 @@
       sha256 = "00k5iqjcp371fllqxncv7jkf80hn1zww92zm78cclbcn4ybigkng";
     };
   }
+  {
+    goPackagePath  = "gopkg.in/jcmturner/aescts.v1";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jcmturner/aescts";
+      rev =  "f6abebb3171c4c1b1fea279cb7c7325020a26290";
+      sha256 = "0rbq4zf3db48xa2gqdp2swws7wizmbwagigqkr1zxzd1ramps6rv";
+    };
+  }
+  {
+    goPackagePath  = "gopkg.in/jcmturner/dnsutils.v1";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jcmturner/dnsutils";
+      rev =  "13eeb8d49ffb74d7a75784c35e4d900607a3943c";
+      sha256 = "0l543c64pyzbnrc00jspg21672l3a0kjjw9pbdxwna93w8d8m927";
+    };
+  }
+  {
+    goPackagePath  = "gopkg.in/jcmturner/gokrb5.v7";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jcmturner/gokrb5";
+      rev =  "363118e62befa8a14ff01031c025026077fe5d6d";
+      sha256 = "08mbag2283q1pyfi696g80521r9n1id3804r6sssrhf3kxzkfhnv";
+    };
+  }
+  {
+    goPackagePath  = "gopkg.in/jcmturner/rpc.v1";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jcmturner/rpc";
+      rev =  "99a8ce2fbf8b8087b6ed12a37c61b10f04070043";
+      sha256 = "0hkmvf8qdcifnzym8kv1xhq7lq0wpr0i6gzff159lh9xn0wfg175";
+    };
+  }
   {
     goPackagePath  = "gopkg.in/ldap.v2";
     fetch = {
-- 
GitLab


From 651cd75f6ce60c9a828c0827e838baee2629674d Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Wed, 18 Sep 2019 03:14:12 +0000
Subject: [PATCH 0461/2254] python.pkgs.scikitlearn: 0.20.3 -> 0.20.4

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

diff --git a/pkgs/development/python-modules/scikitlearn/0.20.nix b/pkgs/development/python-modules/scikitlearn/0.20.nix
index b1c074faa8f..92977331a84 100644
--- a/pkgs/development/python-modules/scikitlearn/0.20.nix
+++ b/pkgs/development/python-modules/scikitlearn/0.20.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "scikit-learn";
-  version = "0.20.3";
+  version = "0.20.4";
   # UnboundLocalError: local variable 'message' referenced before assignment
   disabled = stdenv.isi686;  # https://github.com/scikit-learn/scikit-learn/issues/5534
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c503802a81de18b8b4d40d069f5e363795ee44b1605f38bc104160ca3bfe2c41";
+    sha256 = "1z3w2c50dwwa297j88pr16pyrjysagsvdj7vrlq40q8777rs7a6z";
   };
 
   buildInputs = [ pillow gfortran glibcLocales ];
-- 
GitLab


From 48c0062fe92852ae0a77c1355793f81c43f3c40e Mon Sep 17 00:00:00 2001
From: Samuel Leathers <samuel.leathers@iohk.io>
Date: Tue, 17 Sep 2019 23:30:53 -0400
Subject: [PATCH 0462/2254] linuxPackages.ply: add rsync to native build inputs

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

diff --git a/pkgs/os-specific/linux/ply/default.nix b/pkgs/os-specific/linux/ply/default.nix
index 24213cd2fb5..42739e53fda 100644
--- a/pkgs/os-specific/linux/ply/default.nix
+++ b/pkgs/os-specific/linux/ply/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, kernel, fetchFromGitHub, autoreconfHook, yacc, flex, p7zip }:
+{ stdenv, kernel, fetchFromGitHub, autoreconfHook, yacc, flex, p7zip, rsync }:
 
 assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "4.0";
 
@@ -7,7 +7,7 @@ let
 in stdenv.mkDerivation {
   pname = "ply";
   inherit version;
-  nativeBuildInputs = [ autoreconfHook flex yacc p7zip ];
+  nativeBuildInputs = [ autoreconfHook flex yacc p7zip rsync ];
 
   src = fetchFromGitHub {
     owner = "iovisor";
-- 
GitLab


From fa64037b9968414ebec83d97d3536d5e841c5bda Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 17 Sep 2019 22:41:28 -0500
Subject: [PATCH 0463/2254] mkvtoolnix: fix build with clang

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

diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix
index 04ddbbb8c06..af917981e1c 100644
--- a/pkgs/applications/video/mkvtoolnix/default.nix
+++ b/pkgs/applications/video/mkvtoolnix/default.nix
@@ -50,6 +50,8 @@ stdenv.mkDerivation rec {
     (enableFeature withGUI "qt")
   ];
 
+  CXXFLAGS = optional stdenv.cc.isClang "-std=c++14";
+
   dontWrapQtApps = true;
   postFixup = optionalString withGUI ''
     wrapQtApp $out/bin/mkvtoolnix-gui
-- 
GitLab


From 24d976e39f9d65d29fa2cd4e9a3f2891722fa279 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 17 Sep 2019 23:48:00 -0500
Subject: [PATCH 0464/2254] terraform-lsp: 0.0.5 -> 0.0.6

Changelog: https://github.com/juliosueiras/terraform-lsp/releases/tag/v0.0.6
---
 pkgs/development/tools/misc/terraform-lsp/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/terraform-lsp/default.nix b/pkgs/development/tools/misc/terraform-lsp/default.nix
index 573575f2d4f..333e413a4c4 100644
--- a/pkgs/development/tools/misc/terraform-lsp/default.nix
+++ b/pkgs/development/tools/misc/terraform-lsp/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "terraform-lsp";
-  version = "0.0.5";
+  version = "0.0.6";
 
   src = fetchFromGitHub {
     owner = "juliosueiras";
     repo = pname;
     rev = "v${version}";
-    sha256 = "018ypvmd9cwys5l7rm1c7b9jf8fljdk0m22id32d88jiw4iwq44m";
+    sha256 = "1nalypaw64kdv5zmmb0xgkajhs2gf71ivbxvgwpgvlv2lyidawx5";
   };
 
-  modSha256 = "1196fn69nnplj7sz5mffawf58j9n7h211shv795gknvfnwavh344";
+  modSha256 = "1mb3169vdlv4h10k15pg88s48s2b6y7v5frk9j9ahg52grygcqb2";
 
   meta = with lib; {
     description = "Language Server Protocol for Terraform";
-- 
GitLab


From 77490218e9c2905af2141c54f6694d325db7e6dc Mon Sep 17 00:00:00 2001
From: Serhii Khoma <srghma@gmail.com>
Date: Wed, 18 Sep 2019 10:33:00 +0300
Subject: [PATCH 0465/2254] hubstaff: 1.4.10 -> 1.4.11

---
 pkgs/applications/misc/hubstaff/revision.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/hubstaff/revision.json b/pkgs/applications/misc/hubstaff/revision.json
index 3170a63379c..64cad5c0292 100644
--- a/pkgs/applications/misc/hubstaff/revision.json
+++ b/pkgs/applications/misc/hubstaff/revision.json
@@ -1,5 +1,5 @@
 {
-  "url": "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.4.10-848554d6/Hubstaff-1.4.10-848554d6.sh",
-  "version": "1.4.10-848554d6",
-  "sha256": "1hwncdzpzawrwswr3ibhxny0aa5k9f8f2qf636bdzqilwhv6342z"
+  "url": "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.4.11-a12e5bad/Hubstaff-1.4.11-a12e5bad.sh",
+  "version": "1.4.11-a12e5bad",
+  "sha256": "0nqmw02spplqppvz2jniq5p5y69l8n5xp9wji4032kn4qsba33jn"
 }
-- 
GitLab


From 7cb3992c6ca82dafea550d995226e208b4ec22c6 Mon Sep 17 00:00:00 2001
From: Sirio Balmelli <sirio@b-ad.ch>
Date: Tue, 17 Sep 2019 16:46:05 +0200
Subject: [PATCH 0466/2254] cargo-inspect: fix build on Darwin

package fails to build with 'ld: framework not found Security'
Solve by adding darwin.apple_sdk.frameworks.Security on Darwin.

Signed-off-by: Sirio Balmelli <sirio@b-ad.ch>
---
 pkgs/development/tools/rust/cargo-inspect/default.nix | 4 +++-
 pkgs/top-level/all-packages.nix                       | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-inspect/default.nix b/pkgs/development/tools/rust/cargo-inspect/default.nix
index ec2325fc625..79b1214de65 100644
--- a/pkgs/development/tools/rust/cargo-inspect/default.nix
+++ b/pkgs/development/tools/rust/cargo-inspect/default.nix
@@ -1,4 +1,4 @@
-{ lib, rustPlatform, fetchFromGitHub }:
+{ stdenv, lib, rustPlatform, fetchFromGitHub, Security }:
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-inspect";
@@ -11,6 +11,8 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0rjy8jlar939fkl7wi8a6zxsrl4axz2nrhv745ny8x38ii4sfbzr";
   };
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   cargoSha256 = "1pxvcf991w0jfxdissvwal5slrx7vpk3rqkzwk4hxfv0mjiqxsg5";
 
   meta = with lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 79c6017df63..d1479c2f978 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8339,7 +8339,9 @@ in
   cargo-bloat = callPackage ../development/tools/rust/cargo-bloat { };
   cargo-expand = callPackage ../development/tools/rust/cargo-expand { };
   cargo-fuzz = callPackage ../development/tools/rust/cargo-fuzz { };
-  cargo-inspect = callPackage ../development/tools/rust/cargo-inspect { };
+  cargo-inspect = callPackage ../development/tools/rust/cargo-inspect {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
   cargo-make = callPackage ../development/tools/rust/cargo-make {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
-- 
GitLab


From 36b40dcc7c81f011dff038daf1d5d3c54e3a7d13 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 18 Sep 2019 04:20:00 -0500
Subject: [PATCH 0467/2254] nodejs-10_x: 10.16.0 -> 10.16.3

---
 pkgs/development/web/nodejs/v10.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/v10.nix b/pkgs/development/web/nodejs/v10.nix
index 5743868d5d9..939b065a55c 100644
--- a/pkgs/development/web/nodejs/v10.nix
+++ b/pkgs/development/web/nodejs/v10.nix
@@ -5,6 +5,6 @@ let
 in
   buildNodejs {
     inherit enableNpm;
-    version = "10.16.0";
-    sha256 = "0236jlb1hxhzqjlmmlxipcycrndiq92c8434iyy7zshh3n4pzqqq";
+    version = "10.16.3";
+    sha256 = "1gbblbmvx7a0wkgp3fs2pf5c1hymdpnfc7zqp1slg5hmfhyi5wbv";
   }
-- 
GitLab


From b973a8e0d0197fbd8cbd0f253c45d7e3fbfe2022 Mon Sep 17 00:00:00 2001
From: John Mercier <moaxcp@gmail.com>
Date: Sat, 7 Sep 2019 08:54:22 -0400
Subject: [PATCH 0468/2254] micronaut init at 1.2.1

---
 pkgs/development/tools/micronaut/default.nix | 37 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/development/tools/micronaut/default.nix

diff --git a/pkgs/development/tools/micronaut/default.nix b/pkgs/development/tools/micronaut/default.nix
new file mode 100644
index 00000000000..102f911bf85
--- /dev/null
+++ b/pkgs/development/tools/micronaut/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchzip, jdk, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  pname = "micronaut";
+  version = "1.2.1";
+
+  src = fetchzip {
+    url = "https://github.com/micronaut-projects/micronaut-core/releases/download/v${version}/${pname}-${version}.zip";
+    sha256 = "0lfl2hfakpdcfii3a3jr6kws731jamy4fb3dmlnj5ydk0zbnmk6r";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    rm bin/mn.bat
+    cp -r . $out
+    wrapProgram $out/bin/mn \
+      --prefix JAVA_HOME : ${jdk} 
+  '';
+
+  meta = with stdenv.lib; {
+    description = ''
+      A modern, JVM-based, full-stack framework for building modular, 
+      easily testable microservice and serverless applications.
+    '';
+    longDescription = ''
+      Reflection-based IoC frameworks load and cache reflection data for 
+      every single field, method, and constructor in your code, whereas with 
+      Micronaut, your application startup time and memory consumption are 
+      not bound to the size of your codebase.
+    '';
+    homepage = https://micronaut.io/;
+    license = licenses.asl20;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ moaxcp ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4ac7927bf8a..94c0e1b1d7a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14736,6 +14736,8 @@ in
 
   meteor = callPackage ../servers/meteor { };
 
+  micronaut = callPackage ../development/tools/micronaut {};
+
   minio = callPackage ../servers/minio { };
 
   # Backwards compatibility.
-- 
GitLab


From 4a719e28847755757cad8cf6417a3bb9b990714c Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 18 Sep 2019 07:18:54 -0400
Subject: [PATCH 0469/2254] oh-my-zsh: 2019-09-11 -> 2019-09-13

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

diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix
index 8aa66d65fad..eea0c818920 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -4,13 +4,13 @@
 { stdenv, fetchgit }:
 
 stdenv.mkDerivation rec {
-  version = "2019-09-11";
+  version = "2019-09-13";
   pname = "oh-my-zsh";
-  rev = "ddd359dd668f448856438304bedfe952d1749efd";
+  rev = "32338fd40cae45c775dadc34ae05476811a3834b";
 
   src = fetchgit { inherit rev;
     url = "https://github.com/robbyrussell/oh-my-zsh";
-    sha256 = "027f0si4ah8ppwypxip3ximkwbh4n9ghv7kip2cfj5h5nqlg786q";
+    sha256 = "0fp1hzxmml14ds12751icbsm2v3rhwm2vf5qzc65722fvvb98p0p";
   };
 
   pathsToLink = [ "/share/oh-my-zsh" ];
-- 
GitLab


From 4291d178be8f663fb31568b3adf7dd4968f4ab1c Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 18 Sep 2019 13:15:32 +0200
Subject: [PATCH 0470/2254] wlr-randr: init at unstable-2019-03-21

This is a simple clone of `xrandr` for wayland and is recommended by
sway's wiki[1] as replacement for `xrandr`.

Although the package is not stable yet, it's written by some sway
developers and appears to work pretty well.

When adding an additional monitor to your laptop (with the laptop being
"below" the monitor), this can be configured like this:

```
wlr-randr --output eDP-1 --on --pos 0,1080 --output HDMI-A-1 --on --pos 0,0
```

[1] https://github.com/swaywm/sway/wiki/i3-Migration-Guide#common-xorg-apps-used-on-i3-with-wayland-alternatives
---
 pkgs/tools/misc/wlr-randr/default.nix | 23 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/tools/misc/wlr-randr/default.nix

diff --git a/pkgs/tools/misc/wlr-randr/default.nix b/pkgs/tools/misc/wlr-randr/default.nix
new file mode 100644
index 00000000000..c9f43964696
--- /dev/null
+++ b/pkgs/tools/misc/wlr-randr/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub, meson, ninja, cmake, pkgconfig, wayland }:
+
+stdenv.mkDerivation rec {
+  pname = "wlr-randr";
+  version = "unstable-2019-03-21";
+
+  src = fetchFromGitHub {
+    owner = "emersion";
+    repo = pname;
+    rev = "c4066aa3249963dc7877119cffce10f3fa8b6304";
+    sha256 = "1ahw4sv07xg5rh9vr7j28636iaxs06vnybm3li6y8dz2sky7hk88";
+  };
+
+  nativeBuildInputs = [ meson ninja cmake pkgconfig ];
+  buildInputs = [ wayland ];
+
+  meta = with stdenv.lib; {
+    license = licenses.mit;
+    description = "An xrandr clone for wlroots compositors";
+    homepage = "https://github.com/emersion/wlr-randr";
+    maintainers = with maintainers; [ ma27 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 79c6017df63..58a26fa4e0e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18722,6 +18722,8 @@ in
 
   super-productivity = callPackage ../applications/networking/super-productivity { };
 
+  wlr-randr = callPackage ../tools/misc/wlr-randr { };
+
   wlroots = callPackage ../development/libraries/wlroots { };
 
   sway = callPackage ../applications/window-managers/sway { };
-- 
GitLab


From 3a635da857bbbbaf0714e9483c7e3f8ef4c99653 Mon Sep 17 00:00:00 2001
From: hyperfekt <git@hyperfekt.net>
Date: Thu, 5 Sep 2019 23:23:51 +0200
Subject: [PATCH 0471/2254] minecraft: 2015-07-24 -> 2.1.5965

switched to the new official launcher, renamed to minecraft-launcher,
and added an update script
---
 pkgs/games/minecraft/default.nix | 142 +++++++++++++++++++++++++------
 pkgs/games/minecraft/update.sh   |   7 ++
 2 files changed, 121 insertions(+), 28 deletions(-)
 create mode 100755 pkgs/games/minecraft/update.sh

diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix
index 32830d6f3d0..7abd6c162e0 100644
--- a/pkgs/games/minecraft/default.nix
+++ b/pkgs/games/minecraft/default.nix
@@ -1,51 +1,137 @@
-{ stdenv, fetchurl, makeDesktopItem, makeWrapper
-, jdk, jre, libpulseaudio, libXxf86vm
+{ stdenv
+, fetchurl
+, makeDesktopItem
+, makeWrapper
+, jre # old or modded versions of the game may require Java 8 (https://aur.archlinux.org/packages/minecraft-launcher/#pinned-674960)
+, xorg
+, zlib
+, nss
+, nspr
+, fontconfig
+, gnome2
+, cairo
+, expat
+, alsaLib
+, cups
+, dbus
+, atk
+, gtk2-x11
+, gdk-pixbuf
+, glib
+, curl
+, freetype
+, libpulseaudio
+, systemd
+, flite ? null
+, libXxf86vm ? null
 }:
 
 let
   desktopItem = makeDesktopItem {
-    name = "minecraft";
-    exec = "minecraft";
-    icon = "minecraft";
-    comment = "A sandbox-building game";
-    desktopName = "Minecraft";
-    genericName = "minecraft";
-    categories = "Game;";
+    name = "minecraft-launcher";
+    exec = "minecraft-launcher";
+    icon = "minecraft-launcher";
+    comment = "Official launcher for Minecraft, a sandbox-building game";
+    desktopName = "Minecraft Launcher";
+    categories = "Game;Application;";
   };
 
-  libPath = stdenv.lib.makeLibraryPath [
-    libpulseaudio
-    libXxf86vm # Needed only for versions <1.13
-  ];
+  envLibPath = stdenv.lib.makeLibraryPath [
+      curl
+      libpulseaudio
+      systemd
+      alsaLib # needed for narrator
+      flite # needed for narrator
+      libXxf86vm # needed only for versions <1.13
+    ];
 
-in stdenv.mkDerivation {
-  name = "minecraft-2015-07-24";
+  libPath = stdenv.lib.makeLibraryPath ([
+    alsaLib
+    atk
+    cairo
+    cups
+    dbus
+    expat
+    fontconfig
+    freetype
+    gdk-pixbuf
+    glib
+    gnome2.GConf
+    gnome2.pango
+    gtk2-x11
+    nspr
+    nss
+    stdenv.cc.cc
+    zlib
+  ] ++
+  (with xorg; [
+    libX11
+    libxcb
+    libXcomposite
+    libXcursor
+    libXdamage
+    libXext
+    libXfixes
+    libXi
+    libXrandr
+    libXrender
+    libXtst
+    libXScrnSaver
+  ]));
+in
+ stdenv.mkDerivation rec {
+  pname = "minecraft-launcher";
+
+  version = "2.1.5965";
 
   src = fetchurl {
-    url = "https://s3.amazonaws.com/Minecraft.Download/launcher/Minecraft.jar";
-    sha256 = "04pj4l5q0a64jncm2kk45r7nxnxa2z9n110dcxbbahdi6wk0png8";
+    url = "https://launcher.mojang.com/download/linux/x86_64/minecraft-launcher_${version}.tar.gz";
+    sha256 = "0wlc49s541li4cbxdmlw8fp34hp1q9m6ngr7l5hfdhv1i13s5845";
+  };
+
+  icon = fetchurl {
+    url = "https://launcher.mojang.com/download/minecraft-launcher.svg";
+    sha256 = "0w8z21ml79kblv20wh5lz037g130pxkgs8ll9s3bi94zn2pbrhim";
   };
 
   nativeBuildInputs = [ makeWrapper ];
 
-  unpackPhase = "${jdk}/bin/jar xf $src favicon.png";
+  sourceRoot = ".";
+
+  dontConfigure = true;
+  dontBuild = true;
 
   installPhase = ''
-    mkdir -p $out/bin $out/share/minecraft
+    mkdir -p $out/opt
+    mv minecraft-launcher $out/opt
 
-    makeWrapper ${jre}/bin/java $out/bin/minecraft \
-      --add-flags "-jar $out/share/minecraft/minecraft.jar" \
-      --suffix LD_LIBRARY_PATH : ${libPath}
+    ${desktopItem.buildCommand}
+    install -D $icon $out/share/icons/hicolor/symbolic/apps/minecraft-launcher.svg
 
-    cp $src $out/share/minecraft/minecraft.jar
-    cp -r ${desktopItem}/share/applications $out/share
-    install -D favicon.png $out/share/icons/hicolor/32x32/apps/minecraft.png
+    makeWrapper $out/opt/minecraft-launcher/minecraft-launcher $out/bin/minecraft-launcher \
+      --prefix LD_LIBRARY_PATH : ${envLibPath} \
+      --prefix PATH : ${stdenv.lib.makeBinPath [ jre ]}
+  '';
+
+  preFixup = ''
+    patchelf \
+      --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \
+      --set-rpath '$ORIGIN/'":${libPath}" \
+      $out/opt/minecraft-launcher/minecraft-launcher
+    patchelf \
+      --set-rpath '$ORIGIN/'":${libPath}" \
+      $out/opt/minecraft-launcher/libcef.so
+    patchelf \
+      --set-rpath '$ORIGIN/'":${libPath}" \
+      $out/opt/minecraft-launcher/liblauncher.so
   '';
 
   meta = with stdenv.lib; {
-    description = "A sandbox-building game";
-    homepage = https://minecraft.net;
+    description = "Official launcher for Minecraft, a sandbox-building game";
+    homepage = "https://minecraft.net";
     maintainers = with maintainers; [ cpages ryantm infinisil ];
-    license = licenses.unfreeRedistributable;
+    license = licenses.unfree;
   };
+
+  passthru.updateScript = ./update.sh;
 }
diff --git a/pkgs/games/minecraft/update.sh b/pkgs/games/minecraft/update.sh
new file mode 100755
index 00000000000..02b362e839b
--- /dev/null
+++ b/pkgs/games/minecraft/update.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl jq gnugrep common-updater-scripts
+
+set -eu -o pipefail
+
+version=$(curl -s 'https://aur.archlinux.org/rpc/?v=5&type=info&arg[]=minecraft-launcher' | jq '.results[0].Version' | grep -Po '[.\d]*(?=-)')
+update-source-version minecraft "$version"
-- 
GitLab


From 75d88e42b6049af69375379fac52fb994c2e0ffc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 18 Sep 2019 10:36:58 -0300
Subject: [PATCH 0472/2254] enlightenment.enlightenment: alphabetize dependence
 list

---
 pkgs/desktops/enlightenment/enlightenment.nix | 27 +++++++++----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix
index b2a9d398709..5b80a161d0c 100644
--- a/pkgs/desktops/enlightenment/enlightenment.nix
+++ b/pkgs/desktops/enlightenment/enlightenment.nix
@@ -1,7 +1,6 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, efl,
-  xcbutilkeysyms, libXrandr, libXdmcp, libxcb, libffi, pam, alsaLib,
-  luajit, bzip2, libpthreadstubs, gdbm, libcap, mesa,
-  xkeyboard_config, pcre,
+{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, alsaLib, bzip2,
+  efl, gdbm, libXdmcp, libXrandr, libcap, libffi, libpthreadstubs,
+  libxcb, luajit, mesa, pam, pcre, xcbutilkeysyms, xkeyboard_config,
 
   bluetoothSupport ? true, bluez5,
   pulseSupport ? !stdenv.isDarwin, libpulseaudio,
@@ -17,27 +16,27 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    meson
-    ninja
     (pkgconfig.override { vanilla = true; })
     gettext
+    meson
+    ninja
   ];
 
   buildInputs = [
+    alsaLib
+    bzip2
     efl
+    gdbm
     libXdmcp
-    libxcb
-    xcbutilkeysyms
     libXrandr
     libffi
-    pam
-    alsaLib
-    luajit
-    bzip2
     libpthreadstubs
-    gdbm
-    pcre
+    libxcb
+    luajit
     mesa
+    pam
+    pcre
+    xcbutilkeysyms
     xkeyboard_config
   ]
   ++ stdenv.lib.optional stdenv.isLinux libcap
-- 
GitLab


From eb59755f70b5f3d675de509178ebc57346d6601b Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Wed, 18 Sep 2019 15:34:56 +0200
Subject: [PATCH 0473/2254] tests/hardened: fix build

Bug introduced by 4ead3d2ec3d4fac9ee22da47bbe3bc9defb62c49

For ZHF https://github.com/NixOS/nixpkgs/issues/68361
---
 nixos/tests/hardened.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/tests/hardened.nix b/nixos/tests/hardened.nix
index 90f9793b370..cbf76f9e558 100644
--- a/nixos/tests/hardened.nix
+++ b/nixos/tests/hardened.nix
@@ -10,6 +10,7 @@ import ./make-test.nix ({ pkgs, ...} : {
     { users.users.alice = { isNormalUser = true; extraGroups = [ "proc" ]; };
       users.users.sybil = { isNormalUser = true; group = "wheel"; };
       imports = [ ../modules/profiles/hardened.nix ];
+      environment.memoryAllocator.provider = "graphene-hardened";
       nix.useSandbox = false;
       virtualisation.emptyDiskImages = [ 4096 ];
       boot.initrd.postDeviceCommands = ''
-- 
GitLab


From cfc7a32966dc6cabd925fdc84d082cfc9067b576 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 18 Sep 2019 11:28:49 -0300
Subject: [PATCH 0474/2254] enlightenment.enlightenment: add dependency on bc

---
 pkgs/desktops/enlightenment/enlightenment.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix
index 5b80a161d0c..a5724385e41 100644
--- a/pkgs/desktops/enlightenment/enlightenment.nix
+++ b/pkgs/desktops/enlightenment/enlightenment.nix
@@ -1,6 +1,7 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, alsaLib, bzip2,
-  efl, gdbm, libXdmcp, libXrandr, libcap, libffi, libpthreadstubs,
-  libxcb, luajit, mesa, pam, pcre, xcbutilkeysyms, xkeyboard_config,
+{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, alsaLib, bc,
+  bzip2, efl, gdbm, libXdmcp, libXrandr, libcap, libffi,
+  libpthreadstubs, libxcb, luajit, mesa, pam, pcre, xcbutilkeysyms,
+  xkeyboard_config,
 
   bluetoothSupport ? true, bluez5,
   pulseSupport ? !stdenv.isDarwin, libpulseaudio,
@@ -24,6 +25,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     alsaLib
+    bc  # for the Everything module calculator mode
     bzip2
     efl
     gdbm
@@ -67,6 +69,9 @@ stdenv.mkDerivation rec {
 
     substituteInPlace src/bin/e_import_config_dialog.c \
       --replace "e_prefix_bin_get()" "\"${efl}/bin\""
+
+    substituteInPlace src/modules/everything/evry_plug_calc.c \
+      --replace "ecore_exe_pipe_run(\"bc -l\"" "ecore_exe_pipe_run(\"${bc}/bin/bc -l\""
   '';
 
   mesonFlags = [ "-Dsystemdunitdir=lib/systemd/user" ];
-- 
GitLab


From 866cc3e7923633095dce48493303c52238e16637 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Mon, 19 Aug 2019 16:05:10 +0200
Subject: [PATCH 0475/2254] nixos/system-environment: introduce
 environment.profileRelativeSessionVariables

There is a need for having sessionVariables set relative to the Nix Profiles.
Such as in #68383.
---
 nixos/modules/config/shells-environment.nix   |  2 +
 nixos/modules/config/system-environment.nix   | 76 ++++++++++++++++---
 nixos/modules/programs/environment.nix        |  2 +-
 nixos/modules/security/pam.nix                |  2 +-
 .../services/x11/display-managers/gdm.nix     |  2 +-
 .../services/x11/display-managers/lightdm.nix |  2 +-
 .../services/x11/display-managers/sddm.nix    |  2 +-
 7 files changed, 73 insertions(+), 15 deletions(-)

diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix
index 9dfc1add829..d939cbb393e 100644
--- a/nixos/modules/config/shells-environment.nix
+++ b/nixos/modules/config/shells-environment.nix
@@ -157,6 +157,8 @@ in
     # terminal instead of logging out of X11).
     environment.variables = config.environment.sessionVariables;
 
+    environment.profileRelativeEnvVars = config.environment.profileRelativeSessionVariables;
+
     environment.shellAliases = mapAttrs (name: mkDefault) {
       ls = "ls --color=tty";
       ll = "ls -l";
diff --git a/nixos/modules/config/system-environment.nix b/nixos/modules/config/system-environment.nix
index 6011e354ece..792d1dbb38f 100644
--- a/nixos/modules/config/system-environment.nix
+++ b/nixos/modules/config/system-environment.nix
@@ -8,6 +8,11 @@ let
 
   cfg = config.environment;
 
+  pamProfiles =
+    map
+      (replaceStrings ["$HOME" "$USER"] ["@{HOME}" "@{PAM_USER}"])
+      cfg.profiles;
+
 in
 
 {
@@ -18,25 +23,76 @@ in
       default = {};
       description = ''
         A set of environment variables used in the global environment.
-        These variables will be set by PAM.
-        The value of each variable can be either a string or a list of
-        strings.  The latter is concatenated, interspersed with colon
-        characters.
+        These variables will be set by PAM early in the login process.
+
+        The value of each session variable can be either a string or a
+        list of strings. The latter is concatenated, interspersed with
+        colon characters.
+
+        Note, due to limitations in the PAM format values may not
+        contain the <literal>"</literal> character.
+
+        Also, these variables are merged into
+        <xref linkend="opt-environment.variables"/> and it is
+        therefore not possible to use PAM style variables such as
+        <code>@{HOME}</code>.
       '';
       type = with types; attrsOf (either str (listOf str));
       apply = mapAttrs (n: v: if isList v then concatStringsSep ":" v else v);
     };
 
+    environment.profileRelativeSessionVariables = mkOption {
+      type = types.attrsOf (types.listOf types.str);
+      example = { PATH = [ "/bin" ]; MANPATH = [ "/man" "/share/man" ]; };
+      description = ''
+        Attribute set of environment variable used in the global
+        environment. These variables will be set by PAM early in the
+        login process.
+
+        Variable substitution is available as described in
+        <citerefentry>
+          <refentrytitle>pam_env.conf</refentrytitle>
+          <manvolnum>5</manvolnum>
+        </citerefentry>.
+
+        Each attribute maps to a list of relative paths. Each relative
+        path is appended to the each profile of
+        <option>environment.profiles</option> to form the content of
+        the corresponding environment variable.
+
+        Also, these variables are merged into
+        <xref linkend="opt-environment.profileRelativeEnvVars"/> and it is
+        therefore not possible to use PAM style variables such as
+        <code>@{HOME}</code>.
+      '';
+    };
+
   };
 
   config = {
 
-    system.build.pamEnvironment = pkgs.writeText "pam-environment"
-       ''
-         ${concatStringsSep "\n" (
-           (mapAttrsToList (n: v: ''${n}="${concatStringsSep ":" v}"'')
-             (zipAttrsWith (const concatLists) ([ (mapAttrs (n: v: [ v ]) cfg.sessionVariables) ]))))}
-       '';
+    system.build.pamEnvironment =
+      let
+        suffixedVariables =
+          flip mapAttrs cfg.profileRelativeSessionVariables (envVar: suffixes:
+            flip concatMap pamProfiles (profile:
+              map (suffix: "${profile}${suffix}") suffixes
+            )
+          );
+
+        pamVariable = n: v:
+          ''${n}   DEFAULT="${concatStringsSep ":" (toList v)}"'';
+
+        pamVariables =
+          concatStringsSep "\n"
+          (mapAttrsToList pamVariable
+          (zipAttrsWith (n: concatLists)
+            [
+              (mapAttrs (n: toList) cfg.sessionVariables)
+              suffixedVariables
+            ]));
+      in
+        pkgs.writeText "pam-environment" "${pamVariables}\n";
 
   };
 
diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix
index 66eb8348266..5a11c7cdabc 100644
--- a/nixos/modules/programs/environment.nix
+++ b/nixos/modules/programs/environment.nix
@@ -30,7 +30,7 @@ in
       ];
 
     # TODO: move most of these elsewhere
-    environment.profileRelativeEnvVars =
+    environment.profileRelativeSessionVariables =
       { PATH = [ "/bin" ];
         INFOPATH = [ "/info" "/share/info" ];
         KDEDIRS = [ "" ];
diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index 9c7ddc2f4ee..3cf09611fba 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -415,7 +415,7 @@ let
 
           # Session management.
           ${optionalString cfg.setEnvironment ''
-            session required pam_env.so envfile=${config.system.build.pamEnvironment}
+            session required pam_env.so conffile=${config.system.build.pamEnvironment} readenv=0
           ''}
           session required pam_unix.so
           ${optionalString cfg.setLoginUid
diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index 3f1669d0851..a58febb3341 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -262,7 +262,7 @@ in
         password required       pam_deny.so
 
         session  required       pam_succeed_if.so audit quiet_success user = gdm
-        session  required       pam_env.so envfile=${config.system.build.pamEnvironment}
+        session  required       pam_env.so conffile=${config.system.build.pamEnvironment} readenv=0
         session  optional       ${pkgs.systemd}/lib/security/pam_systemd.so
         session  optional       pam_keyinit.so force revoke
         session  optional       pam_permit.so
diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix
index c26a5b61535..f105cb496e6 100644
--- a/nixos/modules/services/x11/display-managers/lightdm.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm.nix
@@ -249,7 +249,7 @@ in
         password required       pam_deny.so
 
         session  required       pam_succeed_if.so audit quiet_success user = lightdm
-        session  required       pam_env.so envfile=${config.system.build.pamEnvironment}
+        session  required       pam_env.so conffile=${config.system.build.pamEnvironment} readenv=0
         session  optional       ${pkgs.systemd}/lib/security/pam_systemd.so
         session  optional       pam_keyinit.so force revoke
         session  optional       pam_permit.so
diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix
index c6cb281c2cc..1a6df194084 100644
--- a/nixos/modules/services/x11/display-managers/sddm.nix
+++ b/nixos/modules/services/x11/display-managers/sddm.nix
@@ -242,7 +242,7 @@ in
         password required       pam_deny.so
 
         session  required       pam_succeed_if.so audit quiet_success user = sddm
-        session  required       pam_env.so envfile=${config.system.build.pamEnvironment}
+        session  required       pam_env.so conffile=${config.system.build.pamEnvironment} readenv=0
         session  optional       ${pkgs.systemd}/lib/security/pam_systemd.so
         session  optional       pam_keyinit.so force revoke
         session  optional       pam_permit.so
-- 
GitLab


From 671404509bff0229d2ae85e33b70e90dd324ef49 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Wed, 11 Sep 2019 06:39:05 -0400
Subject: [PATCH 0476/2254] nixos/terminfo: use profileRelativeSessionVariables

---
 nixos/modules/config/terminfo.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/config/terminfo.nix b/nixos/modules/config/terminfo.nix
index b86ce2dbf05..1396640af67 100644
--- a/nixos/modules/config/terminfo.nix
+++ b/nixos/modules/config/terminfo.nix
@@ -12,7 +12,7 @@
       source = "${config.system.path}/share/terminfo";
     };
 
-    environment.profileRelativeEnvVars = {
+    environment.profileRelativeSessionVariables = {
       TERMINFO_DIRS = [ "/share/terminfo" ];
     };
 
-- 
GitLab


From df56adac5342004133607a2cf6050e59bbc018c0 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Wed, 11 Sep 2019 06:39:20 -0400
Subject: [PATCH 0477/2254] nixos/xdg/icons: use
 profileRelativeSessionVariables

---
 nixos/modules/config/xdg/icons.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/config/xdg/icons.nix b/nixos/modules/config/xdg/icons.nix
index 8268a3771a0..cc82b9e94f9 100644
--- a/nixos/modules/config/xdg/icons.nix
+++ b/nixos/modules/config/xdg/icons.nix
@@ -7,19 +7,19 @@ with lib;
       type = types.bool;
       default = true;
       description = ''
-        Whether to install files to support the 
+        Whether to install files to support the
         <link xlink:href="https://specifications.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html">XDG Icon Theme specification</link>.
       '';
     };
   };
 
   config = mkIf config.xdg.icons.enable {
-    environment.pathsToLink = [ 
-      "/share/icons" 
-      "/share/pixmaps" 
+    environment.pathsToLink = [
+      "/share/icons"
+      "/share/pixmaps"
     ];
-    
-    environment.profileRelativeEnvVars = {
+
+    environment.profileRelativeSessionVariables = {
       XCURSOR_PATH = [ "/share/icons" ];
     };
   };
-- 
GitLab


From 453036c8a7d4ef76f6e0c28a305622e3ea57cc3b Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Wed, 11 Sep 2019 06:39:48 -0400
Subject: [PATCH 0478/2254] nixos/gdm: don't set XCURSOR_PATH

---
 nixos/modules/services/x11/display-managers/gdm.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index a58febb3341..0a5d52e319e 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -142,8 +142,6 @@ in
           GDM_X_SERVER_EXTRA_ARGS = toString
             (filter (arg: arg != "-terminate") cfg.xserverArgs);
           XDG_DATA_DIRS = "${cfg.session.desktops}/share/";
-          # Find the mouse
-          XCURSOR_PATH = "~/.icons:${pkgs.gnome3.adwaita-icon-theme}/share/icons";
         } // optionalAttrs (xSessionWrapper != null) {
           # Make GDM use this wrapper before running the session, which runs the
           # configured setupCommands. This relies on a patched GDM which supports
-- 
GitLab


From feab607ae53499f235e25e0b2a370feaa87f7244 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Wed, 11 Sep 2019 06:40:29 -0400
Subject: [PATCH 0479/2254] nixos/sddm: don't set XDG_DATA_DIRS

environment.profileRelativeSessionVariables should make this unneeded.
---
 nixos/modules/services/x11/display-managers/sddm.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix
index 1a6df194084..8847acb0c60 100644
--- a/nixos/modules/services/x11/display-managers/sddm.nix
+++ b/nixos/modules/services/x11/display-managers/sddm.nix
@@ -219,8 +219,6 @@ in
         # Load themes from system environment
         QT_PLUGIN_PATH = "/run/current-system/sw/" + pkgs.qt5.qtbase.qtPluginPrefix;
         QML2_IMPORT_PATH = "/run/current-system/sw/" + pkgs.qt5.qtbase.qtQmlPrefix;
-
-        XDG_DATA_DIRS = "/run/current-system/sw/share";
       };
 
       execCmd = "exec /run/current-system/sw/bin/sddm";
-- 
GitLab


From 7814a2f566b153fb7bc802bcc36aab7848b02484 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Wed, 11 Sep 2019 07:00:16 -0400
Subject: [PATCH 0480/2254] nixos/enso-os: don't wrap in module

---
 .../lightdm-greeters/enso-os.nix              | 36 ++++------------
 .../lightdm-enso-os-greeter/default.nix       | 41 +++++++++----------
 .../lightdm-enso-os-greeter/fix-paths.patch   | 24 +++++++++++
 3 files changed, 52 insertions(+), 49 deletions(-)
 create mode 100644 pkgs/applications/display-managers/lightdm-enso-os-greeter/fix-paths.patch

diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix
index de128809ce3..129df139c61 100644
--- a/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix
@@ -10,32 +10,6 @@ let
   icons = cfg.iconTheme.package;
   cursors = cfg.cursorTheme.package;
 
-  # We need a few things in the environment for the greeter to run with
-  # fonts/icons.
-  wrappedEnsoGreeter = pkgs.runCommand "lightdm-enso-os-greeter" {
-      buildInputs = [ pkgs.makeWrapper ];
-      preferLocalBuild = true;
-    } ''
-      # This wrapper ensures that we actually get themes
-      makeWrapper ${pkgs.lightdm-enso-os-greeter}/bin/pantheon-greeter \
-        $out/greeter \
-        --prefix PATH : "${pkgs.glibc.bin}/bin" \
-        --set GDK_PIXBUF_MODULE_FILE "${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" \
-        --set GTK_PATH "${theme}:${pkgs.gtk3.out}" \
-        --set GTK_EXE_PREFIX "${theme}" \
-        --set GTK_DATA_PREFIX "${theme}" \
-        --set XDG_DATA_DIRS "${theme}/share:${icons}/share:${cursors}/share" \
-        --set XDG_CONFIG_HOME "${theme}/share"
-
-      cat - > $out/lightdm-enso-os-greeter.desktop << EOF
-      [Desktop Entry]
-      Name=LightDM Greeter
-      Comment=This runs the LightDM Greeter
-      Exec=$out/greeter
-      Type=Application
-      EOF
-    '';
-
   ensoGreeterConf = pkgs.writeText "lightdm-enso-os-greeter.conf" ''
     [greeter]
     default-wallpaper=${ldmcfg.background}
@@ -144,10 +118,16 @@ in {
   config = mkIf (ldmcfg.enable && cfg.enable) {
     environment.etc."lightdm/greeter.conf".source = ensoGreeterConf;
 
+    environment.systemPackages = [
+      cursors
+      icons
+      theme
+    ];
+
     services.xserver.displayManager.lightdm = {
       greeter = mkDefault {
-        package = wrappedEnsoGreeter;
-        name = "lightdm-enso-os-greeter";
+        package = pkgs.lightdm-enso-os-greeter.xgreeters;
+        name = "pantheon-greeter";
       };
 
       greeters = {
diff --git a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix b/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix
index accdea3ae2d..3128f125cd9 100644
--- a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix
+++ b/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchgit, pkgconfig
+{ stdenv, fetchgit, pkgconfig, linkFarm, lightdm-enso-os-greeter
 , dbus, pcre, epoxy, libXdmcp, at-spi2-core, libxklavier, libxkbcommon, libpthreadstubs
-, gtk3, vala, cmake, libgee, libX11, lightdm, gdk-pixbuf, clutter-gtk }:
+, gtk3, vala, cmake, libgee, libX11, lightdm, gdk-pixbuf, clutter-gtk, wrapGAppsHook, librsvg }:
 
 stdenv.mkDerivation {
   version = "0.2.1";
@@ -12,12 +12,21 @@ stdenv.mkDerivation {
     sha256 = "11jm181jq1vbn83h235avpdxz7pqq6prqyzki5yryy53mkj4kgxz";
   };
 
+  patches = [
+    ./fix-paths.patch
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    pkgconfig
+    vala
+    wrapGAppsHook
+  ];
+
   buildInputs = [
     dbus
     gtk3
     pcre
-    vala
-    cmake
     epoxy
     libgee
     libX11
@@ -29,31 +38,21 @@ stdenv.mkDerivation {
     at-spi2-core
     libxkbcommon
     libpthreadstubs
+    librsvg
   ];
 
-  nativeBuildInputs = [
-    pkgconfig
-  ];
-
-  postPatch = ''
-    sed -i "s@\''${CMAKE_INSTALL_PREFIX}/@@" greeter/CMakeLists.txt
-  '';
-
   preConfigure = ''
     cd greeter
   '';
 
-  installFlags = [
-    "DESTDIR=$(out)"
-  ];
-
-  preFixup = ''
-    mv $out/usr/* $out
-    rm -r $out/usr
-  '';
+  passthru.xgreeters = linkFarm "enso-os-greeter-xgreeters" [{
+    path = "${lightdm-enso-os-greeter}/share/xgreeters/pantheon-greeter.desktop";
+    name = "pantheon-greeter.desktop";
+  }];
 
   postFixup = ''
-    rm -r $out/sbin
+    substituteInPlace $out/share/xgreeters/pantheon-greeter.desktop \
+      --replace "pantheon-greeter" "$out/bin/pantheon-greeter"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/display-managers/lightdm-enso-os-greeter/fix-paths.patch b/pkgs/applications/display-managers/lightdm-enso-os-greeter/fix-paths.patch
new file mode 100644
index 00000000000..ab3ad2b10e4
--- /dev/null
+++ b/pkgs/applications/display-managers/lightdm-enso-os-greeter/fix-paths.patch
@@ -0,0 +1,24 @@
+diff --git a/greeter/CMakeLists.txt b/greeter/CMakeLists.txt
+index 57aebb0..ab50bff 100644
+--- a/greeter/CMakeLists.txt
++++ b/greeter/CMakeLists.txt
+@@ -9,7 +9,6 @@ list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
+ set (CONF_DIR "/etc/lightdm")
+ set (DATADIR "${CMAKE_INSTALL_PREFIX}/share")
+ set (PKGDATADIR "${DATADIR}/enso/greeter")
+-set (CMAKE_INSTALL_PREFIX /usr)
+ set (VERSION "1.0.6")
+ 
+ 
+@@ -94,9 +93,9 @@ glib_compile_resources (GLIB_RESOURCES_CSS SOURCE data/css.gresource.xml)
+ add_executable (pantheon-greeter ${VALA_C} ${GLIB_RESOURCES_CSS})
+ target_link_libraries(pantheon-greeter m)
+ 
+-install (TARGETS pantheon-greeter RUNTIME DESTINATION sbin)
++install (TARGETS pantheon-greeter RUNTIME DESTINATION bin)
+ install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/pantheon-greeter.desktop DESTINATION share/xgreeters)
+-install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/greeter.conf DESTINATION ${CONF_DIR})
++install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/greeter.conf DESTINATION etc/lightdm)
+ install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/fingerprint.svg DESTINATION ${PKGDATADIR})
+ install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/power.svg DESTINATION ${PKGDATADIR})
+ install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/checked.svg DESTINATION ${PKGDATADIR})
-- 
GitLab


From b558eb8329d36f79cdb635aace92b5aa033eaee6 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Wed, 11 Sep 2019 07:07:45 -0400
Subject: [PATCH 0481/2254] nixos/lightdm-gtk-greeter: don't wrap in module

---
 .../display-managers/lightdm-greeters/gtk.nix | 36 ++++---------------
 .../display-managers/lightdm/gtk-greeter.nix  | 31 +++++++++++-----
 2 files changed, 30 insertions(+), 37 deletions(-)

diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix
index 5b280b02423..de932e6e840 100644
--- a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix
@@ -15,34 +15,6 @@ let
   icons = cfg.iconTheme.package;
   cursors = cfg.cursorTheme.package;
 
-  # The default greeter provided with this expression is the GTK greeter.
-  # Again, we need a few things in the environment for the greeter to run with
-  # fonts/icons.
-  wrappedGtkGreeter = pkgs.runCommand "lightdm-gtk-greeter" {
-      buildInputs = [ pkgs.makeWrapper ];
-      preferLocalBuild = true;
-    } ''
-      # This wrapper ensures that we actually get themes
-      makeWrapper ${pkgs.lightdm_gtk_greeter}/sbin/lightdm-gtk-greeter \
-        $out/greeter \
-        --prefix PATH : "${lib.getBin pkgs.stdenv.cc.libc}/bin" \
-        --set GDK_PIXBUF_MODULE_FILE "${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" \
-        --set GTK_PATH "${theme}:${pkgs.gtk3.out}" \
-        --set GTK_EXE_PREFIX "${theme}" \
-        --set GTK_DATA_PREFIX "${theme}" \
-        --set XDG_DATA_DIRS "${theme}/share:${icons}/share" \
-        --set XDG_CONFIG_HOME "${theme}/share" \
-        --set XCURSOR_PATH "${cursors}/share/icons"
-
-      cat - > $out/lightdm-gtk-greeter.desktop << EOF
-      [Desktop Entry]
-      Name=LightDM Greeter
-      Comment=This runs the LightDM Greeter
-      Exec=$out/greeter
-      Type=Application
-      EOF
-    '';
-
   gtkGreeterConf = writeText "lightdm-gtk-greeter.conf"
     ''
     [greeter]
@@ -185,10 +157,16 @@ in
   config = mkIf (ldmcfg.enable && cfg.enable) {
 
     services.xserver.displayManager.lightdm.greeter = mkDefault {
-      package = wrappedGtkGreeter;
+      package = pkgs.lightdm_gtk_greeter.xgreeters;
       name = "lightdm-gtk-greeter";
     };
 
+    environment.systemPackages = [
+      cursors
+      icons
+      theme
+    ];
+
     environment.etc."lightdm/lightdm-gtk-greeter.conf".source = gtkGreeterConf;
 
   };
diff --git a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix
index f892a9da50b..0a49fa8c739 100644
--- a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix
+++ b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix
@@ -1,7 +1,18 @@
-{ stdenv, fetchurl, lightdm, pkgconfig, intltool
-, hicolor-icon-theme, makeWrapper
-, useGTK2 ? false, gtk2, gtk3 # gtk3 seems better supported
-, exo, at-spi2-core
+{ stdenv
+, lightdm_gtk_greeter
+, fetchurl
+, lightdm
+, pkgconfig
+, intltool
+, linkFarm
+, wrapGAppsHook
+, useGTK2 ? false
+, gtk2
+, gtk3 # gtk3 seems better supported
+, exo
+, at-spi2-core
+, librsvg
+, hicolor-icon-theme
 }:
 
 #ToDo: bad icons with gtk2;
@@ -20,14 +31,15 @@ stdenv.mkDerivation rec {
     sha256 = "1pis5qyg95pg31dvnfqq34bzgj00hg4vs547r8h60lxjk81z8p15";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ lightdm exo intltool makeWrapper hicolor-icon-theme ]
+  nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ];
+  buildInputs = [ lightdm exo librsvg hicolor-icon-theme ]
     ++ (if useGTK2 then [ gtk2 ] else [ gtk3 ]);
 
   configureFlags = [
     "--localstatedir=/var"
     "--sysconfdir=/etc"
     "--disable-indicator-services-command"
+    "--sbindir=${placeholder "out"}/bin" # for wrapGAppsHook to wrap automatically
   ] ++ stdenv.lib.optional useGTK2 "--with-gtk2";
 
   preConfigure = ''
@@ -44,10 +56,13 @@ stdenv.mkDerivation rec {
   postInstall = ''
     substituteInPlace "$out/share/xgreeters/lightdm-gtk-greeter.desktop" \
       --replace "Exec=lightdm-gtk-greeter" "Exec=$out/sbin/lightdm-gtk-greeter"
-    wrapProgram "$out/sbin/lightdm-gtk-greeter" \
-      --prefix XDG_DATA_DIRS ":" "${hicolor-icon-theme}/share"
   '';
 
+  passthru.xgreeters = linkFarm "lightdm-gtk-greeter-xgreeters" [{
+    path = "${lightdm_gtk_greeter}/share/xgreeters/lightdm-gtk-greeter.desktop";
+    name = "lightdm-gtk-greeter.desktop";
+  }];
+
   meta = with stdenv.lib; {
     homepage = https://launchpad.net/lightdm-gtk-greeter;
     platforms = platforms.linux;
-- 
GitLab


From 6d7687871e5d5efc2cd706ab39e4c86f14842084 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Wed, 11 Sep 2019 07:10:36 -0400
Subject: [PATCH 0482/2254] lightdm-mini-greeter: use wrapGAppsHook

---
 .../display-managers/lightdm-mini-greeter/default.nix     | 8 ++++----
 .../applications/display-managers/lightdm/gtk-greeter.nix | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix b/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix
index 69635718e3b..ad2ac58a8b6 100644
--- a/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix
+++ b/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, lightdm, gtk3 }:
+{ stdenv, linkFarm, lightdm-mini-greeter, fetchFromGitHub, autoreconfHook, pkgconfig, lightdm, gtk3, glib, gdk-pixbuf, wrapGAppsHook, librsvg }:
 
 stdenv.mkDerivation rec {
   pname = "lightdm-mini-greeter";
@@ -11,11 +11,11 @@ stdenv.mkDerivation rec {
     sha256 = "1qi0bsqi8z2zv3303ww0kd7bciz6qx8na5bkvgrqlwyvq31czai5";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
-  buildInputs = [ lightdm gtk3 ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig wrapGAppsHook ];
+  buildInputs = [ lightdm gtk3 glib gdk-pixbuf librsvg ];
 
   configureFlags = [ "--sysconfdir=/etc" ];
-  makeFlags = [ "configdir=$(out)/etc" ];
+  makeFlags = [ "configdir=${placeholder "out"}/etc" ];
 
   postInstall = ''
     substituteInPlace "$out/share/xgreeters/lightdm-mini-greeter.desktop" \
diff --git a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix
index 0a49fa8c739..5b1490a6b3b 100644
--- a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix
+++ b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     substituteInPlace "$out/share/xgreeters/lightdm-gtk-greeter.desktop" \
-      --replace "Exec=lightdm-gtk-greeter" "Exec=$out/sbin/lightdm-gtk-greeter"
+      --replace "Exec=lightdm-gtk-greeter" "Exec=$out/bin/lightdm-gtk-greeter"
   '';
 
   passthru.xgreeters = linkFarm "lightdm-gtk-greeter-xgreeters" [{
-- 
GitLab


From 5669b062356b5d5b8019ecc706a70d75ec30da0f Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Wed, 11 Sep 2019 07:11:04 -0400
Subject: [PATCH 0483/2254] lightdm-mini-greeter: put xgreeters in passthru

---
 .../x11/display-managers/lightdm-greeters/mini.nix         | 7 +------
 .../display-managers/lightdm-mini-greeter/default.nix      | 5 +++++
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix
index ba8151a60f2..fa9445af32e 100644
--- a/nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix
@@ -8,11 +8,6 @@ let
   ldmcfg = dmcfg.lightdm;
   cfg = ldmcfg.greeters.mini;
 
-  xgreeters = pkgs.linkFarm "lightdm-mini-greeter-xgreeters" [{
-    path = "${pkgs.lightdm-mini-greeter}/share/xgreeters/lightdm-mini-greeter.desktop";
-    name = "lightdm-mini-greeter.desktop";
-  }];
-
   miniGreeterConf = pkgs.writeText "lightdm-mini-greeter.conf"
     ''
     [greeter]
@@ -90,7 +85,7 @@ in
     services.xserver.displayManager.lightdm.greeters.gtk.enable = false;
 
     services.xserver.displayManager.lightdm.greeter = mkDefault {
-      package = xgreeters;
+      package = pkgs.lightdm-mini-greeter.xgreeters;
       name = "lightdm-mini-greeter";
     };
 
diff --git a/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix b/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix
index ad2ac58a8b6..b5b26d7cc43 100644
--- a/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix
+++ b/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix
@@ -22,6 +22,11 @@ stdenv.mkDerivation rec {
       --replace "Exec=lightdm-mini-greeter" "Exec=$out/bin/lightdm-mini-greeter"
   '';
 
+  passthru.xgreeters = linkFarm "lightdm-mini-greeter-xgreeters" [{
+    path = "${lightdm-mini-greeter}/share/xgreeters/lightdm-mini-greeter.desktop";
+    name = "lightdm-mini-greeter.desktop";
+  }];
+
   meta = with stdenv.lib; {
     description = "A minimal, configurable, single-user GTK3 LightDM greeter";
     homepage = https://github.com/prikhi/lightdm-mini-greeter;
-- 
GitLab


From cc125810cb4f305c5bcee937648ff3704f13c472 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Thu, 12 Sep 2019 16:20:54 -0400
Subject: [PATCH 0484/2254] nixos/environment: set GTK_DATA_PREFIX

Many desktop environment modules are already setting
this so it already makes sense to just do this globally.
---
 nixos/modules/programs/environment.nix                    | 1 +
 nixos/modules/services/editors/emacs.nix                  | 8 +-------
 .../services/x11/desktop-managers/enlightenment.nix       | 4 ----
 nixos/modules/services/x11/desktop-managers/mate.nix      | 6 ------
 nixos/modules/services/x11/desktop-managers/xfce.nix      | 6 ------
 nixos/modules/services/x11/desktop-managers/xfce4-14.nix  | 6 ------
 pkgs/misc/themes/clearlooks-phenix/default.nix            | 3 ---
 7 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix
index 5a11c7cdabc..d92c4189159 100644
--- a/nixos/modules/programs/environment.nix
+++ b/nixos/modules/programs/environment.nix
@@ -22,6 +22,7 @@ in
         EDITOR = mkDefault "nano";
         XCURSOR_PATH = [ "$HOME/.icons" ];
         XDG_CONFIG_DIRS = [ "/etc/xdg" ]; # needs to be before profile-relative paths to allow changes through environment.etc
+        GTK_DATA_PREFIX = "${config.system.path}"; # needed for gtk2 apps to find themes
       };
 
     environment.profiles = mkAfter
diff --git a/nixos/modules/services/editors/emacs.nix b/nixos/modules/services/editors/emacs.nix
index ba7ec967919..d791b387665 100644
--- a/nixos/modules/services/editors/emacs.nix
+++ b/nixos/modules/services/editors/emacs.nix
@@ -95,13 +95,7 @@ in {
 
     environment.systemPackages = [ cfg.package editorScript desktopApplicationFile ];
 
-    environment.variables = {
-      # This is required so that GTK applications launched from Emacs
-      # get properly themed:
-      GTK_DATA_PREFIX = "${config.system.path}";
-    } // (if cfg.defaultEditor then {
-        EDITOR = mkOverride 900 "${editorScript}/bin/emacseditor";
-      } else {});
+    environment.variables.EDITOR = mkIf cfg.defaultEditor (mkOverride 900 "${editorScript}/bin/emacseditor");
   };
 
   meta.doc = ./emacs.xml;
diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix
index 9914b668709..3745069f6ea 100644
--- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix
+++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix
@@ -48,10 +48,6 @@ in
     services.xserver.desktopManager.session = [
     { name = "Enlightenment";
       start = ''
-        # Set GTK_DATA_PREFIX so that GTK can find the themes
-        export GTK_DATA_PREFIX=${config.system.path}
-        # find theme engines
-        export GTK_PATH=${config.system.path}/lib/gtk-3.0:${config.system.path}/lib/gtk-2.0
         export XDG_MENU_PREFIX=e-
 
         export GST_PLUGIN_PATH="${GST_PLUGIN_PATH}"
diff --git a/nixos/modules/services/x11/desktop-managers/mate.nix b/nixos/modules/services/x11/desktop-managers/mate.nix
index d7a871c9c70..4563583e070 100644
--- a/nixos/modules/services/x11/desktop-managers/mate.nix
+++ b/nixos/modules/services/x11/desktop-managers/mate.nix
@@ -48,12 +48,6 @@ in
       name = "mate";
       bgSupport = true;
       start = ''
-        # Set GTK_DATA_PREFIX so that GTK can find the themes
-        export GTK_DATA_PREFIX=${config.system.path}
-
-        # Find theme engines
-        export GTK_PATH=${config.system.path}/lib/gtk-3.0:${config.system.path}/lib/gtk-2.0
-
         export XDG_MENU_PREFIX=mate-
 
         # Let caja find extensions
diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix
index e3249aef50c..6965c6d2646 100644
--- a/nixos/modules/services/x11/desktop-managers/xfce.nix
+++ b/nixos/modules/services/x11/desktop-managers/xfce.nix
@@ -107,12 +107,6 @@ in
       start = ''
         ${cfg.extraSessionCommands}
 
-        # Set GTK_PATH so that GTK can find the theme engines.
-        export GTK_PATH="${config.system.path}/lib/gtk-2.0:${config.system.path}/lib/gtk-3.0"
-
-        # Set GTK_DATA_PREFIX so that GTK can find the Xfce themes.
-        export GTK_DATA_PREFIX=${config.system.path}
-
         ${pkgs.runtimeShell} ${pkgs.xfce.xinitrc} &
         waitPID=$!
       '';
diff --git a/nixos/modules/services/x11/desktop-managers/xfce4-14.nix b/nixos/modules/services/x11/desktop-managers/xfce4-14.nix
index 57d1268d655..458d4a2f422 100644
--- a/nixos/modules/services/x11/desktop-managers/xfce4-14.nix
+++ b/nixos/modules/services/x11/desktop-managers/xfce4-14.nix
@@ -114,12 +114,6 @@ in
       name = "xfce4-14";
       bgSupport = true;
       start = ''
-        # Set GTK_PATH so that GTK can find the theme engines.
-        export GTK_PATH="${config.system.path}/lib/gtk-2.0:${config.system.path}/lib/gtk-3.0"
-
-        # Set GTK_DATA_PREFIX so that GTK can find the Xfce themes.
-        export GTK_DATA_PREFIX=${config.system.path}
-
         ${pkgs.runtimeShell} ${pkgs.xfce4-14.xinitrc} &
         waitPID=$!
       '';
diff --git a/pkgs/misc/themes/clearlooks-phenix/default.nix b/pkgs/misc/themes/clearlooks-phenix/default.nix
index 04929a4cb4d..7c1eb54f92f 100644
--- a/pkgs/misc/themes/clearlooks-phenix/default.nix
+++ b/pkgs/misc/themes/clearlooks-phenix/default.nix
@@ -23,9 +23,6 @@ stdenv.mkDerivation rec {
       The Clearlooks-Phénix project aims at creating a GTK3 port of Clearlooks,
       the default theme for Gnome 2. Style is also included for GTK2, Unity and
       for Metacity, Openbox and Xfwm4 window managers.
-
-      You should install this theme into your user profile and then set
-      GTK_DATA_PREFIX to `~/.nix-profile`.
     '';
     homepage = https://github.com/jpfleury/clearlooks-phenix;
     downloadPage = https://github.com/jpfleury/clearlooks-phenix/releases;
-- 
GitLab


From 6663a795a3da44555f01cc04b90edd4157306bbb Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Fri, 13 Sep 2019 11:28:07 -0400
Subject: [PATCH 0485/2254] nixos/environment: set GTK_EXE_PREFIX

---
 nixos/modules/programs/environment.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix
index d92c4189159..4bbc750fd52 100644
--- a/nixos/modules/programs/environment.nix
+++ b/nixos/modules/programs/environment.nix
@@ -23,6 +23,7 @@ in
         XCURSOR_PATH = [ "$HOME/.icons" ];
         XDG_CONFIG_DIRS = [ "/etc/xdg" ]; # needs to be before profile-relative paths to allow changes through environment.etc
         GTK_DATA_PREFIX = "${config.system.path}"; # needed for gtk2 apps to find themes
+        GTK_EXE_PREFIX = "${config.system.path}";
       };
 
     environment.profiles = mkAfter
-- 
GitLab


From 2c709342632f385a23dab39dcb4ad3ebb4a89498 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Sep 2019 15:17:27 +0000
Subject: [PATCH 0486/2254] ghc: revert "compile with DWARF support by default"

This reverts commits 2021578686790d2c733eb1fa9c2034826996b176 and
f4316473d94e0e5eff2736bd24dc802e09752771.

Fixes https://github.com/NixOS/nixpkgs/issues/69023.
---
 pkgs/development/compilers/ghc/8.2.2.nix | 8 +-------
 pkgs/development/compilers/ghc/8.4.4.nix | 8 +-------
 pkgs/development/compilers/ghc/8.6.4.nix | 8 +-------
 pkgs/development/compilers/ghc/8.6.5.nix | 8 +-------
 pkgs/development/compilers/ghc/8.8.1.nix | 8 +-------
 pkgs/development/compilers/ghc/head.nix  | 8 +-------
 6 files changed, 6 insertions(+), 42 deletions(-)

diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix
index 2e500db536c..a034e4ec8dd 100644
--- a/pkgs/development/compilers/ghc/8.2.2.nix
+++ b/pkgs/development/compilers/ghc/8.2.2.nix
@@ -8,9 +8,6 @@
 
 , libiconv ? null, ncurses
 
-, enableDwarf ? !stdenv.targetPlatform.isDarwin &&
-                !stdenv.targetPlatform.isWindows, elfutils # for DWARF support
-
 , useLLVM ? !stdenv.targetPlatform.isx86 || (stdenv.targetPlatform.isMusl && stdenv.hostPlatform != stdenv.targetPlatform)
 , # LLVM is conceptually a run-time-only depedendency, but for
   # non-x86, we need LLVM to bootstrap later stages, so it becomes a
@@ -72,8 +69,7 @@ let
   # Splicer will pull out correct variations
   libDeps = platform: [ ncurses ]
     ++ stdenv.lib.optional (!enableIntegerSimple) gmp
-    ++ stdenv.lib.optional (platform.libc != "glibc") libiconv
-    ++ stdenv.lib.optional enableDwarf elfutils;
+    ++ stdenv.lib.optional (platform.libc != "glibc") libiconv;
 
   toolsForTarget = [
     pkgsBuildTarget.targetPackages.stdenv.cc
@@ -207,8 +203,6 @@ stdenv.mkDerivation (rec {
   ] ++ stdenv.lib.optionals (targetPlatform.isDarwin && targetPlatform.isAarch64) [
     # fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/
     "--disable-large-address-space"
-  ] ++ stdenv.lib.optional enableDwarf [
-    "--enable-dwarf-unwind"
   ];
 
   # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
diff --git a/pkgs/development/compilers/ghc/8.4.4.nix b/pkgs/development/compilers/ghc/8.4.4.nix
index 2fbdff865ed..52fb926cdc6 100644
--- a/pkgs/development/compilers/ghc/8.4.4.nix
+++ b/pkgs/development/compilers/ghc/8.4.4.nix
@@ -7,9 +7,6 @@
 
 , libiconv ? null, ncurses
 
-, enableDwarf ? !stdenv.targetPlatform.isDarwin &&
-                !stdenv.targetPlatform.isWindows, elfutils # for DWARF support
-
 , useLLVM ? !stdenv.targetPlatform.isx86 || (stdenv.targetPlatform.isMusl && stdenv.hostPlatform != stdenv.targetPlatform)
 , # LLVM is conceptually a run-time-only depedendency, but for
   # non-x86, we need LLVM to bootstrap later stages, so it becomes a
@@ -74,8 +71,7 @@ let
   # Splicer will pull out correct variations
   libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ]
     ++ stdenv.lib.optional (!enableIntegerSimple) gmp
-    ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv
-    ++ stdenv.lib.optional enableDwarf elfutils;
+    ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
 
   toolsForTarget = [
     pkgsBuildTarget.targetPackages.stdenv.cc
@@ -184,8 +180,6 @@ stdenv.mkDerivation (rec {
   ] ++ stdenv.lib.optionals (targetPlatform.isDarwin && targetPlatform.isAarch64) [
     # fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/
     "--disable-large-address-space"
-  ] ++ stdenv.lib.optional enableDwarf [
-    "--enable-dwarf-unwind"
   ];
 
   # Make sure we never relax`$PATH` and hooks support for compatability.
diff --git a/pkgs/development/compilers/ghc/8.6.4.nix b/pkgs/development/compilers/ghc/8.6.4.nix
index 151e80198f4..18b2407a90b 100644
--- a/pkgs/development/compilers/ghc/8.6.4.nix
+++ b/pkgs/development/compilers/ghc/8.6.4.nix
@@ -7,9 +7,6 @@
 
 , libiconv ? null, ncurses
 
-, enableDwarf ? !stdenv.targetPlatform.isDarwin &&
-                !stdenv.targetPlatform.isWindows, elfutils # for DWARF support
-
 , # GHC can be built with system libffi or a bundled one.
   libffi ? null
 
@@ -79,8 +76,7 @@ let
   libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ]
     ++ [libffi]
     ++ stdenv.lib.optional (!enableIntegerSimple) gmp
-    ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv
-    ++ stdenv.lib.optional enableDwarf elfutils;
+    ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
 
   toolsForTarget = [
     pkgsBuildTarget.targetPackages.stdenv.cc
@@ -183,8 +179,6 @@ stdenv.mkDerivation (rec {
     "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
   ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [
     "--disable-large-address-space"
-  ] ++ stdenv.lib.optional enableDwarf [
-    "--enable-dwarf-unwind"
   ];
 
   # Make sure we never relax`$PATH` and hooks support for compatability.
diff --git a/pkgs/development/compilers/ghc/8.6.5.nix b/pkgs/development/compilers/ghc/8.6.5.nix
index 0a218c29264..cdbcb8e1aed 100644
--- a/pkgs/development/compilers/ghc/8.6.5.nix
+++ b/pkgs/development/compilers/ghc/8.6.5.nix
@@ -7,9 +7,6 @@
 
 , libiconv ? null, ncurses
 
-, enableDwarf ? !stdenv.targetPlatform.isDarwin &&
-                !stdenv.targetPlatform.isWindows, elfutils # for DWARF support
-
 , # GHC can be built with system libffi or a bundled one.
   libffi ? null
 
@@ -79,8 +76,7 @@ let
   libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ]
     ++ [libffi]
     ++ stdenv.lib.optional (!enableIntegerSimple) gmp
-    ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv
-    ++ stdenv.lib.optional enableDwarf elfutils;
+    ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
 
   toolsForTarget = [
     pkgsBuildTarget.targetPackages.stdenv.cc
@@ -183,8 +179,6 @@ stdenv.mkDerivation (rec {
     "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
   ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [
     "--disable-large-address-space"
-  ] ++ stdenv.lib.optional enableDwarf [
-    "--enable-dwarf-unwind"
   ];
 
   # Make sure we never relax`$PATH` and hooks support for compatability.
diff --git a/pkgs/development/compilers/ghc/8.8.1.nix b/pkgs/development/compilers/ghc/8.8.1.nix
index 3783b97795a..95bbab3cb3e 100644
--- a/pkgs/development/compilers/ghc/8.8.1.nix
+++ b/pkgs/development/compilers/ghc/8.8.1.nix
@@ -7,9 +7,6 @@
 
 , libiconv ? null, ncurses
 
-, enableDwarf ? !stdenv.targetPlatform.isDarwin &&
-                !stdenv.targetPlatform.isWindows, elfutils # for DWARF support
-
 , # GHC can be built with system libffi or a bundled one.
   libffi ? null
 
@@ -79,8 +76,7 @@ let
   libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ]
     ++ [libffi]
     ++ stdenv.lib.optional (!enableIntegerSimple) gmp
-    ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv
-    ++ stdenv.lib.optional enableDwarf elfutils;
+    ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
 
   toolsForTarget = [
     pkgsBuildTarget.targetPackages.stdenv.cc
@@ -168,8 +164,6 @@ stdenv.mkDerivation (rec {
     "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
   ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [
     "--disable-large-address-space"
-  ] ++ stdenv.lib.optional enableDwarf [
-    "--enable-dwarf-unwind"
   ];
 
   # Make sure we never relax`$PATH` and hooks support for compatability.
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index cbc404de862..b78f5bc2204 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -7,9 +7,6 @@
 
 , libiconv ? null, ncurses
 
-, enableDwarf ? !stdenv.targetPlatform.isDarwin &&
-                !stdenv.targetPlatform.isWindows, elfutils # for DWARF support
-
 , useLLVM ? !stdenv.targetPlatform.isx86
 , # LLVM is conceptually a run-time-only depedendency, but for
   # non-x86, we need LLVM to bootstrap later stages, so it becomes a
@@ -76,8 +73,7 @@ let
   # Splicer will pull out correct variations
   libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ]
     ++ stdenv.lib.optional (!enableIntegerSimple) gmp
-    ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv
-    ++ stdenv.lib.optional enableDwarf elfutils;
+    ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
 
   toolsForTarget = [
     pkgsBuildTarget.targetPackages.stdenv.cc
@@ -180,8 +176,6 @@ stdenv.mkDerivation (rec {
     "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
   ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [
     "--disable-large-address-space"
-  ] ++ stdenv.lib.optional enableDwarf [
-    "--enable-dwarf-unwind"
   ];
 
   # Make sure we never relax`$PATH` and hooks support for compatability.
-- 
GitLab


From ddb77f3437fa437c29857f62ee2db2b1af0ae4f3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Sep 2019 18:24:42 +0200
Subject: [PATCH 0487/2254] ghc: drop obsolete 8.6.4 version

The latest version in the 8.6.x branch is 8.6.5.
---
 pkgs/development/compilers/elm/default.nix |   2 +-
 pkgs/development/compilers/ghc/8.6.4.nix   | 251 ---------------------
 pkgs/top-level/haskell-packages.nix        |  13 +-
 3 files changed, 2 insertions(+), 264 deletions(-)
 delete mode 100644 pkgs/development/compilers/ghc/8.6.4.nix

diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix
index ce18200943e..676fa19d9e8 100644
--- a/pkgs/development/compilers/elm/default.nix
+++ b/pkgs/development/compilers/elm/default.nix
@@ -12,7 +12,7 @@ let
       inherit (stdenv.hostPlatform) system;
     };
 
-  hsPkgs = haskell.packages.ghc864.override {
+  hsPkgs = haskell.packages.ghc865.override {
     overrides = self: super: with haskell.lib;
       let elmPkgs = rec {
             elm = overrideCabal (self.callPackage ./packages/elm.nix { }) (drv: {
diff --git a/pkgs/development/compilers/ghc/8.6.4.nix b/pkgs/development/compilers/ghc/8.6.4.nix
deleted file mode 100644
index 18b2407a90b..00000000000
--- a/pkgs/development/compilers/ghc/8.6.4.nix
+++ /dev/null
@@ -1,251 +0,0 @@
-{ stdenv, pkgsBuildTarget, targetPackages
-
-# build-tools
-, bootPkgs
-, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4, sphinx
-, bash
-
-, libiconv ? null, ncurses
-
-, # GHC can be built with system libffi or a bundled one.
-  libffi ? null
-
-, useLLVM ? !stdenv.targetPlatform.isx86
-, # LLVM is conceptually a run-time-only depedendency, but for
-  # non-x86, we need LLVM to bootstrap later stages, so it becomes a
-  # build-time dependency too.
-  buildLlvmPackages, llvmPackages
-
-, # If enabled, GHC will be built with the GPL-free but slower integer-simple
-  # library instead of the faster but GPLed integer-gmp library.
-  enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
-
-, # If enabled, use -fPIC when compiling static libs.
-  enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform
-
-, # Whether to build dynamic libs for the standard library (on the target
-  # platform). Static libs are always built.
-  enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt
-
-, # Whetherto build terminfo.
-  enableTerminfo ? !stdenv.targetPlatform.isWindows
-
-, # What flavour to build. An empty string indicates no
-  # specific flavour and falls back to ghc default values.
-  ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
-    (if useLLVM then "perf-cross" else "perf-cross-ncg")
-
-, # Whether to disable the large address space allocator
-  # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/
-  disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64
-}:
-
-assert !enableIntegerSimple -> gmp != null;
-
-let
-  inherit (stdenv) buildPlatform hostPlatform targetPlatform;
-
-  inherit (bootPkgs) ghc;
-
-  # TODO(@Ericson2314) Make unconditional
-  targetPrefix = stdenv.lib.optionalString
-    (targetPlatform != hostPlatform)
-    "${targetPlatform.config}-";
-
-  buildMK = ''
-    BuildFlavour = ${ghcFlavour}
-    ifneq \"\$(BuildFlavour)\" \"\"
-    include mk/flavours/\$(BuildFlavour).mk
-    endif
-    DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
-    INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"}
-  '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
-    Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"}
-    CrossCompilePrefix = ${targetPrefix}
-    HADDOCK_DOCS = NO
-    BUILD_SPHINX_HTML = NO
-    BUILD_SPHINX_PDF = NO
-  '' + stdenv.lib.optionalString enableRelocatedStaticLibs ''
-    GhcLibHcOpts += -fPIC
-    GhcRtsHcOpts += -fPIC
-  '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
-    EXTRA_CC_OPTS += -std=gnu99
-  '';
-
-  # Splicer will pull out correct variations
-  libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ]
-    ++ [libffi]
-    ++ stdenv.lib.optional (!enableIntegerSimple) gmp
-    ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
-
-  toolsForTarget = [
-    pkgsBuildTarget.targetPackages.stdenv.cc
-  ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm;
-
-  targetCC = builtins.head toolsForTarget;
-
-in
-stdenv.mkDerivation (rec {
-  version = "8.6.4";
-  name = "${targetPrefix}ghc-${version}";
-
-  src = fetchurl {
-    url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz";
-    sha256 = "0fihs1sr0hpk67dn9cmrsav13kkcp9hz8ggdqcrs80rj8vj0fpav";
-  };
-
-  enableParallelBuilding = true;
-
-  outputs = [ "out" "doc" ];
-
-  patches = [
-    (fetchpatch rec { # https://phabricator.haskell.org/D5123
-     url = "http://tarballs.nixos.org/sha256/${sha256}";
-     name = "D5123.diff";
-     sha256 = "0nhqwdamf2y4gbwqxcgjxs0kqx23w9gv5kj0zv6450dq19rji82n";
-    })
-    (fetchpatch { # https://github.com/haskell/haddock/issues/900
-     url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/983.diff";
-     name = "loadpluginsinmodules.diff";
-     sha256 = "0bvvv0zsfq2581zsir97zfkggc1kkircbbajc2fz3b169ycpbha1";
-     extraPrefix = "utils/haddock/";
-     stripLen = 1;
-   })
-  ];
-
-  postPatch = "patchShebangs .";
-
-  # GHC is a bit confused on its cross terminology.
-  preConfigure = ''
-    for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do
-      export "''${env#TARGET_}=''${!env}"
-    done
-    # GHC is a bit confused on its cross terminology, as these would normally be
-    # the *host* tools.
-    export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
-    export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
-    # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
-    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isLinux ".gold"}"
-    export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
-    export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
-    export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
-    export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib"
-    export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf"
-    export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip"
-
-    echo -n "${buildMK}" > mk/build.mk
-    sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
-  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
-    export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
-    export NIX_LDFLAGS+=" -no_dtrace_dof"
-  '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
-    sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets
-  '' + stdenv.lib.optionalString targetPlatform.isMusl ''
-      echo "patching llvm-targets for musl targets..."
-      echo "Cloning these existing '*-linux-gnu*' targets:"
-      grep linux-gnu llvm-targets | sed 's/^/  /'
-      echo "(go go gadget sed)"
-      sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets
-      echo "llvm-targets now contains these '*-linux-musl*' targets:"
-      grep linux-musl llvm-targets | sed 's/^/  /'
-
-      echo "And now patching to preserve '-musleabi' as done with '-gnueabi'"
-      # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen)
-      for x in configure aclocal.m4; do
-        substituteInPlace $x \
-          --replace '*-android*|*-gnueabi*)' \
-                    '*-android*|*-gnueabi*|*-musleabi*)'
-      done
-  '';
-
-  # TODO(@Ericson2314): Always pass "--target" and always prefix.
-  configurePlatforms = [ "build" "host" ]
-    ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
-  # `--with` flags for libraries needed for RTS linker
-  configureFlags = [
-    "--datadir=$doc/share/doc/ghc"
-    "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
-  ] ++ stdenv.lib.optionals (libffi != null) ["--with-system-libffi" "--with-ffi-includes=${targetPackages.libffi.dev}/include" "--with-ffi-libraries=${targetPackages.libffi.out}/lib"
-  ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [
-    "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib"
-  ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
-    "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
-  ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
-    "--enable-bootstrap-with-devel-snapshot"
-  ] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [
-    "CFLAGS=-fuse-ld=gold"
-    "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
-    "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
-  ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [
-    "--disable-large-address-space"
-  ];
-
-  # Make sure we never relax`$PATH` and hooks support for compatability.
-  strictDeps = true;
-
-  # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
-	dontAddExtraLibs = true;
-
-  nativeBuildInputs = [
-    perl autoconf automake m4 python3 sphinx
-    ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
-  ];
-
-  # For building runtime libs
-  depsBuildTarget = toolsForTarget;
-
-  buildInputs = [ perl bash ] ++ (libDeps hostPlatform);
-
-  propagatedBuildInputs = [ targetPackages.stdenv.cc ]
-    ++ stdenv.lib.optional useLLVM llvmPackages.llvm;
-
-  depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform);
-  depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform);
-
-  # required, because otherwise all symbols from HSffi.o are stripped, and
-  # that in turn causes GHCi to abort
-  stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
-
-  # See #63511 - the only unstripped file is the debug rts which isn't meant to
-  # be stripped.
-  dontStrip = true;
-
-  checkTarget = "test";
-
-  hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";
-
-  postInstall = ''
-    # Install the bash completion file.
-    install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc
-
-    # Patch scripts to include "readelf" and "cat" in $PATH.
-    for i in "$out/bin/"*; do
-      test ! -h $i || continue
-      egrep --quiet '^#!' <(head -n 1 $i) || continue
-      sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
-    done
-  '';
-
-  passthru = {
-    inherit bootPkgs targetPrefix;
-
-    inherit llvmPackages;
-    inherit enableShared;
-
-    # Our Cabal compiler name
-    haskellCompilerName = "ghc-8.6.4";
-  };
-
-  meta = {
-    homepage = http://haskell.org/ghc;
-    description = "The Glasgow Haskell Compiler";
-    maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
-    inherit (ghc.meta) license platforms;
-  };
-
-} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt {
-  dontStrip = true;
-  dontPatchELF = true;
-  noAuditTmpdir = true;
-})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 49bfc58adf0..6755448dcbf 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -59,12 +59,6 @@ in {
       buildLlvmPackages = buildPackages.llvmPackages_5;
       llvmPackages = pkgs.llvmPackages_5;
     };
-    ghc864 = callPackage ../development/compilers/ghc/8.6.4.nix {
-      bootPkgs = packages.ghc822Binary;
-      inherit (buildPackages.python3Packages) sphinx;
-      buildLlvmPackages = buildPackages.llvmPackages_6;
-      llvmPackages = pkgs.llvmPackages_6;
-    };
     ghc865 = callPackage ../development/compilers/ghc/8.6.5.nix {
       bootPkgs = packages.ghc822Binary;
       inherit (buildPackages.python3Packages) sphinx;
@@ -91,7 +85,7 @@ in {
       ghcjsDepOverrides = callPackage ../development/compilers/ghcjs-ng/8.4/dep-overrides.nix {};
     };
     ghcjs86 = callPackage ../development/compilers/ghcjs-ng {
-      bootPkgs = packages.ghc864;
+      bootPkgs = packages.ghc865;
       ghcjsSrcJson = ../development/compilers/ghcjs-ng/8.6/git.json;
       stage0 = ../development/compilers/ghcjs-ng/8.6/stage0.nix;
       ghcjsDepOverrides = callPackage ../development/compilers/ghcjs-ng/8.6/dep-overrides.nix {};
@@ -136,11 +130,6 @@ in {
       ghc = bh.compiler.ghc844;
       compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.4.x.nix { };
     };
-    ghc864 = callPackage ../development/haskell-modules {
-      buildHaskellPackages = bh.packages.ghc864;
-      ghc = bh.compiler.ghc864;
-      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.6.x.nix { };
-    };
     ghc865 = callPackage ../development/haskell-modules {
       buildHaskellPackages = bh.packages.ghc865;
       ghc = bh.compiler.ghc865;
-- 
GitLab


From 1f157b8cf8a640389b789ae24fd49752f53de1d7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Sep 2019 18:28:11 +0200
Subject: [PATCH 0488/2254] ghc: drop obsolete 8.2.2 version

We keep the last 3 major releases of GHC around, which are
versions 8.8.1, 8.6.5, and 8.4.4.
---
 pkgs/development/compilers/ghc/8.2.2.nix | 276 -----------------------
 pkgs/top-level/haskell-packages.nix      |  11 -
 2 files changed, 287 deletions(-)
 delete mode 100644 pkgs/development/compilers/ghc/8.2.2.nix

diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix
deleted file mode 100644
index a034e4ec8dd..00000000000
--- a/pkgs/development/compilers/ghc/8.2.2.nix
+++ /dev/null
@@ -1,276 +0,0 @@
-{ stdenv, pkgsBuildTarget, targetPackages
-
-# build-tools
-, bootPkgs
-, autoconf, autoreconfHook, automake, coreutils, fetchurl, fetchpatch, perl, python3, sphinx
-, bash
-, runCommand
-
-, libiconv ? null, ncurses
-
-, useLLVM ? !stdenv.targetPlatform.isx86 || (stdenv.targetPlatform.isMusl && stdenv.hostPlatform != stdenv.targetPlatform)
-, # LLVM is conceptually a run-time-only depedendency, but for
-  # non-x86, we need LLVM to bootstrap later stages, so it becomes a
-  # build-time dependency too.
-  buildLlvmPackages, llvmPackages
-
-, # If enabled, GHC will be built with the GPL-free but slower integer-simple
-  # library instead of the faster but GPLed integer-gmp library.
-  enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
-
-, # If enabled, use -fPIC when compiling static libs.
-  enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform
-
-, # Whether to build dynamic libs for the standard library (on the target
-  # platform). Static libs are always built.
-  enableShared ? !stdenv.targetPlatform.useiOSPrebuilt
-
-, # What flavour to build. An empty string indicates no
-  # specific flavour and falls back to ghc default values.
-  ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) "perf-cross"
-, # Whether to backport https://phabricator.haskell.org/D4388 for
-  # deterministic profiling symbol names, at the cost of a slightly
-  # non-standard GHC API
-  deterministicProfiling ? false
-}:
-
-assert !enableIntegerSimple -> gmp != null;
-
-let
-  inherit (stdenv) buildPlatform hostPlatform targetPlatform;
-
-  inherit (bootPkgs) ghc;
-
-  # TODO(@Ericson2314) Make unconditional
-  targetPrefix = stdenv.lib.optionalString
-    (targetPlatform != hostPlatform)
-    "${targetPlatform.config}-";
-
-  buildMK = ''
-    BuildFlavour = ${ghcFlavour}
-    ifneq \"\$(BuildFlavour)\" \"\"
-    include mk/flavours/\$(BuildFlavour).mk
-    endif
-    DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
-    INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"}
-  '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
-    Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"}
-    CrossCompilePrefix = ${targetPrefix}
-    HADDOCK_DOCS = NO
-    BUILD_SPHINX_HTML = NO
-    BUILD_SPHINX_PDF = NO
-  '' + stdenv.lib.optionalString enableRelocatedStaticLibs ''
-    GhcLibHcOpts += -fPIC
-    GhcRtsHcOpts += -fPIC
-  '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
-    EXTRA_CC_OPTS += -std=gnu99
-  '';
-
-  # Splicer will pull out correct variations
-  libDeps = platform: [ ncurses ]
-    ++ stdenv.lib.optional (!enableIntegerSimple) gmp
-    ++ stdenv.lib.optional (platform.libc != "glibc") libiconv;
-
-  toolsForTarget = [
-    pkgsBuildTarget.targetPackages.stdenv.cc
-  ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm;
-
-  targetCC = builtins.head toolsForTarget;
-
-in
-stdenv.mkDerivation (rec {
-  version = "8.2.2";
-  name = "${targetPrefix}ghc-${version}";
-
-  src = fetchurl {
-    url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz";
-    sha256 = "1z05vkpaj54xdypmaml50hgsdpw29dhbs2r7magx0cm199iw73mv";
-  };
-
-  enableParallelBuilding = true;
-
-  outputs = [ "out" "doc" ];
-
-  patches = [
-    (fetchpatch { # Fix STRIP to be substituted from configure
-      url = "https://git.haskell.org/ghc.git/commitdiff_plain/2fc8ce5f0c8c81771c26266ac0b150ca9b75c5f3";
-      sha256 = "03253ci40np1v6k0wmi4aypj3nmj3rdyvb1k6rwqipb30nfc719f";
-    })
-    (import ./abi-depends-determinism.nix { inherit fetchpatch runCommand; })
-  ] ++ stdenv.lib.optionals (hostPlatform != targetPlatform) [
-    # Cherry-pick a few commits from newer hsc2hs so that proper binary is
-    # installed -- stage 2 normally but stage 1 with cross.
-    #
-    # TODO make unconditional next mass rebuild.
-    (fetchpatch {
-      url = "https://git.haskell.org/hsc2hs.git/patch/ecdac062b5cf1d284906487849c56f4e149b3c8e";
-      sha256 = "1gagswi26j50z44sdx0mk1sb3wr0nrqyaph9j724zp6iwqslxyzm";
-      extraPrefix = "utils/hsc2hs/";
-      stripLen = 1;
-    })
-    (fetchpatch {
-      url = "https://git.haskell.org/hsc2hs.git/patch/598303cbffcd230635fbce28ce4105d177fdf76a";
-      sha256 = "0hqcg434qbh1bz1pk85cap2q4v9i8bs6x65yzq4spz6xk3zq6af7";
-      extraPrefix = "utils/hsc2hs/";
-      stripLen = 1;
-    })
-    (fetchpatch {
-      url = "https://git.haskell.org/hsc2hs.git/patch/9483ad10064fbbb97ab525280623826b1ef63959";
-      sha256 = "1cpfdhfc0cz9xkjzkcgwx4fbyj96dkmd04wpwi1vji7fahw8kmf3";
-      extraPrefix = "utils/hsc2hs/";
-      stripLen = 1;
-    })
-    (fetchpatch {
-      url = "https://git.haskell.org/hsc2hs.git/patch/738f3666c878ee9e79c3d5e819ef8b3460288edf";
-      sha256 = "0plzsbfaq6vb1023lsarrjglwgr9chld4q3m99rcfzx0yx5mibp3";
-      extraPrefix = "utils/hsc2hs/";
-      stripLen = 1;
-    })
-  ] ++ stdenv.lib.optionals (hostPlatform != targetPlatform && targetPlatform.system == hostPlatform.system) [
-    (fetchpatch {
-      url = "https://raw.githubusercontent.com/gentoo/gentoo/08a41d2dff99645af6ac5a7bb4774f5f193b6f20/dev-lang/ghc/files/ghc-8.2.1_rc1-unphased-cross.patch";
-      sha256 = "1hxj80bjx0x3w0f35cj3k2wipppr1ald03jwfy5q0xlxygdha17w";
-    })
-    (fetchpatch {
-      url = "https://raw.githubusercontent.com/gentoo/gentoo/08a41d2dff99645af6ac5a7bb4774f5f193b6f20/dev-lang/ghc/files/ghc-8.2.1_rc1-staged-cross.patch";
-      sha256 = "12xsln3zyfpvml8bwdpbc003h6zl1qh2qcq1rhdrw02n45dz8lvc";
-    })
-    (fetchpatch {
-      url = "https://raw.githubusercontent.com/gentoo/gentoo/08a41d2dff99645af6ac5a7bb4774f5f193b6f20/dev-lang/ghc/files/ghc-8.2.1_rc1-ghci-cross.patch";
-      sha256 = "03dcqf5af3vjhrky3f2z26j4d9h8qd9nkv76xp0l97h4cqk7vfqb";
-    })
-    (fetchpatch {
-      url = "https://raw.githubusercontent.com/gentoo/gentoo/08a41d2dff99645af6ac5a7bb4774f5f193b6f20/dev-lang/ghc/files/ghc-8.2.1_rc1-stage2-cross.patch";
-      sha256 = "0pi2m85wjxaaablq6n4q5vyn9qxvry5d7nmja4b28i68yb4ly9g1";
-    })
-    (fetchpatch {
-      url = "https://raw.githubusercontent.com/gentoo/gentoo/08a41d2dff99645af6ac5a7bb4774f5f193b6f20/dev-lang/ghc/files/ghc-8.2.1_rc1-hp2ps-cross.patch";
-      sha256 = "1fszfavf1cvrf02x500mi7jykcpvpl2i7i4qzr2qz9sbmyq063f0";
-    })
-  ] ++ stdenv.lib.optional deterministicProfiling
-    (fetchpatch { # Backport of https://phabricator.haskell.org/D4388 for more determinism
-      url = "https://github.com/shlevy/ghc/commit/fec1b8d3555c447c0d8da0e96b659be67c8bb4bc.patch";
-      sha256 = "1lyysz6hfd1njcigpm8xppbnkadqfs0kvrp7s8vqgb38pjswj5hg";
-    })
-    ++ stdenv.lib.optional stdenv.isDarwin ./backport-dylib-command-size-limit.patch;
-
-  postPatch = "patchShebangs .";
-
-  # GHC is a bit confused on its cross terminology.
-  preConfigure = ''
-    for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do
-      export "''${env#TARGET_}=''${!env}"
-    done
-    # GHC is a bit confused on its cross terminology, as these would normally be
-    # the *host* tools.
-    export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
-    export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
-    # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
-    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isLinux ".gold"}"
-    export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
-    export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
-    export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
-    export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib"
-    export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf"
-    export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip"
-
-    echo -n "${buildMK}" > mk/build.mk
-    sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
-  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
-    export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
-    export NIX_LDFLAGS+=" -no_dtrace_dof"
-  '';
-
-  # TODO(@Ericson2314): Always pass "--target" and always prefix.
-  configurePlatforms = [ "build" "host" ]
-    ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
-  # `--with` flags for libraries needed for RTS linker
-  configureFlags = [
-    "--datadir=$doc/share/doc/ghc"
-  ] ++ stdenv.lib.optional (targetPlatform == hostPlatform) [
-    "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
-  ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [
-    "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib"
-  ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc") [
-    "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
-  ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
-    "--enable-bootstrap-with-devel-snapshot"
-  ] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [
-    "CFLAGS=-fuse-ld=gold"
-    "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
-    "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
-  ] ++ stdenv.lib.optionals (targetPlatform.isDarwin && targetPlatform.isAarch64) [
-    # fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/
-    "--disable-large-address-space"
-  ];
-
-  # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
-  dontAddExtraLibs = true;
-
-  # Make sure we never relax`$PATH` and hooks support for compatability.
-  strictDeps = true;
-
-  nativeBuildInputs = [
-    autoconf autoreconfHook automake perl python3 sphinx
-    ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
-  ];
-
-  # For building runtime libs
-  depsBuildTarget = toolsForTarget;
-
-  buildInputs = [ perl bash ] ++ (libDeps hostPlatform);
-
-  propagatedBuildInputs = [ targetPackages.stdenv.cc ]
-    ++ stdenv.lib.optional useLLVM llvmPackages.llvm;
-
-  depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform);
-  depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform);
-
-  # required, because otherwise all symbols from HSffi.o are stripped, and
-  # that in turn causes GHCi to abort
-  stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
-
-  # See #63511 - the only unstripped file is the debug rts which isn't meant to
-  # be stripped.
-  dontStrip = true;
-
-  checkTarget = "test";
-  doCheck = false; # fails with "testsuite/tests: No such file or directory.  Stop."
-
-  hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";
-
-  postInstall = ''
-    # Install the bash completion file.
-    install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc
-
-    # Patch scripts to include "readelf" and "cat" in $PATH.
-    for i in "$out/bin/"*; do
-      test ! -h $i || continue
-      egrep --quiet '^#!' <(head -n 1 $i) || continue
-      sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
-    done
-  '';
-
-  passthru = {
-    inherit bootPkgs targetPrefix;
-
-    inherit llvmPackages;
-    inherit enableShared;
-
-    # Our Cabal compiler name
-    haskellCompilerName = "ghc-8.2.2";
-  };
-
-  meta = {
-    homepage = http://haskell.org/ghc;
-    description = "The Glasgow Haskell Compiler";
-    maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
-    inherit (ghc.meta) license platforms;
-  };
-
-} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt {
-  dontStrip = true;
-  dontPatchELF = true;
-  noAuditTmpdir = true;
-})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 6755448dcbf..b6ef1824682 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -47,12 +47,6 @@ in {
 
     ghc863Binary = callPackage ../development/compilers/ghc/8.6.3-binary.nix { };
 
-    ghc822 = callPackage ../development/compilers/ghc/8.2.2.nix {
-      bootPkgs = packages.ghc822Binary;
-      inherit (buildPackages.python3Packages) sphinx;
-      buildLlvmPackages = buildPackages.llvmPackages_39;
-      llvmPackages = pkgs.llvmPackages_39;
-    };
     ghc844 = callPackage ../development/compilers/ghc/8.4.4.nix {
       bootPkgs = packages.ghc822Binary;
       sphinx = buildPackages.python3Packages.sphinx_1_7_9;
@@ -120,11 +114,6 @@ in {
       compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.6.x.nix { };
       packageSetConfig = bootstrapPackageSet;
     };
-    ghc822 = callPackage ../development/haskell-modules {
-      buildHaskellPackages = bh.packages.ghc822;
-      ghc = bh.compiler.ghc822;
-      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { };
-    };
     ghc844 = callPackage ../development/haskell-modules {
       buildHaskellPackages = bh.packages.ghc844;
       ghc = bh.compiler.ghc844;
-- 
GitLab


From 8dcaebfe3b09c2829c5c1bf4f997b6ec7fb8bcd5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Sep 2019 18:30:31 +0200
Subject: [PATCH 0489/2254] ghc: drop unused abi-depends-determinism.nix patch

---
 .../compilers/ghc/abi-depends-determinism.nix        | 12 ------------
 1 file changed, 12 deletions(-)
 delete mode 100644 pkgs/development/compilers/ghc/abi-depends-determinism.nix

diff --git a/pkgs/development/compilers/ghc/abi-depends-determinism.nix b/pkgs/development/compilers/ghc/abi-depends-determinism.nix
deleted file mode 100644
index bc803b74617..00000000000
--- a/pkgs/development/compilers/ghc/abi-depends-determinism.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-# https://phabricator.haskell.org/D4159 to fix non-determinism in
-# cached abi-depends fields in package databases, modified to only
-# contain hunks that exist in distribution tarballs.
-{ fetchpatch, runCommand }: let
-  base = fetchpatch rec { # Non-determinism in cached abi-depends fields
-    # Originally https://phabricator-files.haskell.org/file/data/4pqrbo5b62sifktfbrls/PHID-FILE-4g4zjiqlfxmmlaos7lz7/D4159.diff
-    url = "http://tarballs.nixos.org/sha256/${sha256}";
-    name = "D4159.diff";
-    sha256 = "0b8a08sisf1swmarm6nh9rgw7cpzi2rwdzvrd6ny49c7wk0f7x4b";
-  };
-in runCommand base.name {}
-  "sed -n '/utils\\/ghc-pkg/,$p' ${base} >$out"
-- 
GitLab


From 8e09b940f8e2e37f2dc3e130cf8fa35c92ae12e1 Mon Sep 17 00:00:00 2001
From: pacien <pacien.trangirard@pacien.net>
Date: Wed, 18 Sep 2019 18:32:25 +0200
Subject: [PATCH 0490/2254] riot-web: 1.3.3 -> 1.3.5

---
 .../networking/instant-messengers/riot/riot-web.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
index 2755d181da2..b938f4f47cf 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "riot-web";
-  version = "1.3.3";
+  version = "1.3.5";
 
   src = fetchurl {
     url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
-    sha256 = "1n5h7q3h0akw09p4z7nwprxsa8jnmwbvwn2npq7zz62ccasb4fv9";
+    sha256 = "0vpfv5rvrhrws52j4lxnj1qyagf9894znpxkdnkp72g19qsjn66g";
   };
 
   installPhase = let
-- 
GitLab


From e32515aa92b3982e26915175339444b4d0c6ef22 Mon Sep 17 00:00:00 2001
From: pacien <pacien.trangirard@pacien.net>
Date: Wed, 18 Sep 2019 18:32:41 +0200
Subject: [PATCH 0491/2254] riot-desktop: 1.3.3 -> 1.3.5

---
 .../instant-messengers/riot/riot-desktop-package.json         | 2 +-
 .../networking/instant-messengers/riot/riot-desktop.nix       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json
index 2e9602458e7..b9017c12d60 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json
@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "src/electron-main.js",
-  "version": "1.3.3",
+  "version": "1.3.5",
   "description": "A feature-rich client for Matrix.org",
   "author": "New Vector Ltd.",
   "dependencies": {
diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
index 2c4557f2cc0..1fde990e4a8 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
@@ -6,12 +6,12 @@
 
 let
   executableName = "riot-desktop";
-  version = "1.3.3";
+  version = "1.3.5";
   riot-web-src = fetchFromGitHub {
     owner = "vector-im";
     repo = "riot-web";
     rev = "v${version}";
-    sha256 = "1nzzxcz4r9932cha80q1bzn1425m67fsl89pn7n7ybrv6y0jnxpc";
+    sha256 = "05xwp6062lvjsy539swa6dxj3k3dw1667nkx8ffwdl1dg17wphy8";
   };
 
 in yarn2nix-moretea.mkYarnPackage rec {
-- 
GitLab


From 518e23bcb87d0ce6d953cf59a30262b0b254f46d Mon Sep 17 00:00:00 2001
From: pacien <pacien.trangirard@pacien.net>
Date: Wed, 18 Sep 2019 18:39:30 +0200
Subject: [PATCH 0492/2254] gscan2pdf: 2.5.5 -> 2.5.6

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

diff --git a/pkgs/applications/graphics/gscan2pdf/default.nix b/pkgs/applications/graphics/gscan2pdf/default.nix
index 9af1a0fc914..b0e76d23dac 100644
--- a/pkgs/applications/graphics/gscan2pdf/default.nix
+++ b/pkgs/applications/graphics/gscan2pdf/default.nix
@@ -10,11 +10,11 @@ with stdenv.lib;
 
 perlPackages.buildPerlPackage rec {
   pname = "gscan2pdf";
-  version = "2.5.5";
+  version = "2.5.6";
 
   src = fetchurl {
     url = "mirror://sourceforge/gscan2pdf/${version}/${pname}-${version}.tar.xz";
-    sha256 = "0gfhjmv768hx2l3jk2mjhh1snkgkaddgw70s14jq8kxhhzvhlmv8";
+    sha256 = "0wp81nsi5jfypabwmjqiamxr739jq5ij79n5fzn5pbw1hg5gcmfz";
   };
 
   nativeBuildInputs = [ wrapGAppsHook ];
-- 
GitLab


From 3b96c76bef1a2e788558974dc535d3ea788d978a Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 18 Sep 2019 12:47:57 -0400
Subject: [PATCH 0493/2254] wxMSW: mark broken
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This hasn’t worked for a while:

https://hydra.nixos.org/job/nixpkgs/cross-trunk/crossMingw32.windows.wxMSW.x86_64-linux
---
 pkgs/os-specific/windows/wxMSW-2.8/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/os-specific/windows/wxMSW-2.8/default.nix b/pkgs/os-specific/windows/wxMSW-2.8/default.nix
index 65690af9869..2764c4232c1 100644
--- a/pkgs/os-specific/windows/wxMSW-2.8/default.nix
+++ b/pkgs/os-specific/windows/wxMSW-2.8/default.nix
@@ -31,5 +31,7 @@ stdenv.mkDerivation {
 
   meta = {
     platforms = stdenv.lib.platforms.windows;
+
+    broken = true;
   };
 }
-- 
GitLab


From 2c32f91bfc3d50175dd1f1eb87bf34626b7e8ab5 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 18 Sep 2019 12:48:25 -0400
Subject: [PATCH 0494/2254] nix: mark unix only

Nix is only known to work on unix like platforms.

https://hydra.nixos.org/job/nixpkgs/cross-trunk/crossMingw32.nix.x86_64-linux
---
 pkgs/tools/package-management/nix/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index c038249b69f..4d4f73ad7c2 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -121,7 +121,7 @@ common =
         homepage = https://nixos.org/;
         license = stdenv.lib.licenses.lgpl2Plus;
         maintainers = [ stdenv.lib.maintainers.eelco ];
-        platforms = stdenv.lib.platforms.all;
+        platforms = stdenv.lib.platforms.unix;
         outputsToInstall = [ "out" "man" ];
       };
 
-- 
GitLab


From b3f4ce351e6e34ad5bcffe0d308701570e445739 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Wed, 18 Sep 2019 11:34:02 -0400
Subject: [PATCH 0495/2254] nixos/xdg/icons: match XCURSOR_PATH spec

---
 nixos/modules/config/xdg/icons.nix     | 17 ++++++++++++++---
 nixos/modules/programs/environment.nix |  1 -
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/config/xdg/icons.nix b/nixos/modules/config/xdg/icons.nix
index cc82b9e94f9..4677ce090b0 100644
--- a/nixos/modules/config/xdg/icons.nix
+++ b/nixos/modules/config/xdg/icons.nix
@@ -19,9 +19,20 @@ with lib;
       "/share/pixmaps"
     ];
 
-    environment.profileRelativeSessionVariables = {
-      XCURSOR_PATH = [ "/share/icons" ];
-    };
+    # libXcursor looks for cursors in XCURSOR_PATH
+    # it mostly follows the spec for icons
+    # See: https://www.x.org/releases/current/doc/man/man3/Xcursor.3.xhtml Themes
+
+    # These are preferred so they come first in the list
+    environment.sessionVariables.XCURSOR_PATH = [
+      "$HOME/.icons"
+      "$HOME/.local/share/icons"
+    ];
+
+    environment.profileRelativeSessionVariables.XCURSOR_PATH = [
+      "/share/icons"
+      "/share/pixmaps"
+    ];
   };
 
 }
diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix
index 4bbc750fd52..fcffb213498 100644
--- a/nixos/modules/programs/environment.nix
+++ b/nixos/modules/programs/environment.nix
@@ -20,7 +20,6 @@ in
       { NIXPKGS_CONFIG = "/etc/nix/nixpkgs-config.nix";
         PAGER = mkDefault "less -R";
         EDITOR = mkDefault "nano";
-        XCURSOR_PATH = [ "$HOME/.icons" ];
         XDG_CONFIG_DIRS = [ "/etc/xdg" ]; # needs to be before profile-relative paths to allow changes through environment.etc
         GTK_DATA_PREFIX = "${config.system.path}"; # needed for gtk2 apps to find themes
         GTK_EXE_PREFIX = "${config.system.path}";
-- 
GitLab


From 8fa86fda32fdbfdb970f441b9023748b5e5a99d5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Sep 2019 19:28:04 +0200
Subject: [PATCH 0496/2254] haskell-packages.nix: cosmetic

---
 pkgs/top-level/haskell-packages.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 49bfc58adf0..b01fdb9ffe1 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1,6 +1,4 @@
-{ buildPackages, pkgs
-, newScope
-}:
+{ buildPackages, pkgs, newScope }:
 
 let
   # These are attributes in compiler and packages that don't support integer-simple.
-- 
GitLab


From e04435a773d268f0510258f19aa60d1760302359 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 17 Sep 2019 21:16:20 +0200
Subject: [PATCH 0497/2254] LTS Haskell 14.6

---
 .../configuration-hackage2nix.yaml            | 68 +++++++++----------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index c0692d975df..ded5ea4679f 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -43,7 +43,7 @@ core-packages:
   - ghcjs-base-0
 
 default-package-overrides:
-  # LTS Haskell 14.5
+  # LTS Haskell 14.6
   - abstract-deque ==0.3
   - abstract-deque-tests ==0.3
   - abstract-par ==0.3.3
@@ -55,7 +55,7 @@ default-package-overrides:
   - adjunctions ==4.4
   - adler32 ==0.1.2.0
   - advent-of-code-api ==0.1.2.3
-  - aeson ==1.4.4.0
+  - aeson ==1.4.5.0
   - aeson-attoparsec ==0.0.0
   - aeson-better-errors ==0.9.1.0
   - aeson-casing ==0.2.0.0
@@ -98,7 +98,7 @@ default-package-overrides:
   - appendmap ==0.1.5
   - apply-refact ==0.6.0.0
   - apportionment ==0.0.0.3
-  - approximate ==0.3.1
+  - approximate ==0.3.2
   - app-settings ==0.2.0.12
   - arbor-lru-cache ==0.1.1.0
   - arithmoi ==0.9.0.0
@@ -356,7 +356,7 @@ default-package-overrides:
   - comonad ==5.0.5
   - compact ==0.1.0.1
   - compactmap ==0.1.4.2.1
-  - compensated ==0.7.2
+  - compensated ==0.7.3
   - compiler-warnings ==0.1.0
   - composable-associations ==0.1.0.0
   - composable-associations-aeson ==0.1.0.0
@@ -509,7 +509,7 @@ default-package-overrides:
   - dependent-map ==0.2.4.0
   - dependent-sum ==0.4
   - dependent-sum-template ==0.0.0.6
-  - deque ==0.4.2.3
+  - deque ==0.4.3
   - deriveJsonNoPrefix ==0.1.0.1
   - deriving-compat ==0.5.7
   - derulo ==1.0.5
@@ -623,7 +623,7 @@ default-package-overrides:
   - eventful-sqlite ==0.2.0
   - eventful-test-helpers ==0.2.0
   - event-list ==0.1.2
-  - eventstore ==1.3.0
+  - eventstore ==1.3.1
   - every ==0.0.1
   - exact-combinatorics ==0.2.0.9
   - exact-pi ==0.5.0.1
@@ -775,7 +775,7 @@ default-package-overrides:
   - ghc-lib-parser ==8.8.0.20190424
   - ghc-parser ==0.2.0.3
   - ghc-paths ==0.1.0.12
-  - ghc-prof ==1.4.1.5
+  - ghc-prof ==1.4.1.6
   - ghc-syntax-highlighter ==0.0.4.0
   - ghc-tcplugins-extra ==0.3
   - ghc-typelits-extra ==0.3.1
@@ -806,7 +806,7 @@ default-package-overrides:
   - glabrous ==2.0.0
   - glaze ==0.3.0.1
   - glazier ==1.0.0.0
-  - GLFW-b ==3.2.1.0
+  - GLFW-b ==3.2.1.1
   - Glob ==0.10.0
   - gloss ==1.13.0.1
   - gloss-algorithms ==1.13.0.1
@@ -863,8 +863,8 @@ default-package-overrides:
   - haskell-gi-base ==0.23.0
   - haskell-gi-overloading ==1.0
   - haskell-lexer ==1.0.2
-  - haskell-lsp ==0.15.0.1
-  - haskell-lsp-types ==0.15.0.1
+  - haskell-lsp ==0.15.0.0
+  - haskell-lsp-types ==0.15.0.0
   - haskell-names ==0.9.6
   - haskell-spacegoo ==0.2.0.1
   - haskell-src ==1.0.3.0
@@ -967,7 +967,7 @@ default-package-overrides:
   - hslua-aeson ==1.0.0
   - hslua-module-system ==0.2.1
   - hslua-module-text ==0.2.1
-  - HsOpenSSL ==0.11.4.16
+  - HsOpenSSL ==0.11.4.17
   - HsOpenSSL-x509-system ==0.1.0.3
   - hsp ==0.10.0
   - hspec ==2.7.1
@@ -1063,7 +1063,7 @@ default-package-overrides:
   - hxt-unicode ==9.0.2.4
   - hybrid-vectors ==0.2.2
   - hyper ==0.1.0.3
-  - hyperloglog ==0.4.2
+  - hyperloglog ==0.4.3
   - hyphenation ==0.8
   - hyraxAbif ==0.2.3.15
   - iconv ==0.4.1.3
@@ -1086,7 +1086,7 @@ default-package-overrides:
   - indexed-list-literals ==0.2.1.2
   - infer-license ==0.2.0
   - inflections ==0.4.0.4
-  - influxdb ==1.7.1
+  - influxdb ==1.7.1.1
   - ini ==0.4.1
   - inj ==1.0
   - inline-c ==0.7.0.1
@@ -1201,7 +1201,7 @@ default-package-overrides:
   - leapseconds-announced ==2017.1.0.1
   - learn-physics ==0.6.4
   - lens ==4.17.1
-  - lens-action ==0.2.3
+  - lens-action ==0.2.4
   - lens-aeson ==1.0.2
   - lens-datetime ==0.3
   - lens-family ==1.2.3
@@ -1277,10 +1277,10 @@ default-package-overrides:
   - markdown-unlit ==0.5.0
   - markov-chain ==0.0.3.4
   - massiv ==0.4.1.0
-  - massiv-io ==0.1.6.0
+  - massiv-io ==0.1.7.0
   - massiv-test ==0.1.0
   - mathexpr ==0.3.0.0
-  - math-functions ==0.3.2.0
+  - math-functions ==0.3.2.1
   - matplotlib ==0.7.4
   - matrices ==0.5.0
   - matrix ==0.3.6.1
@@ -1329,7 +1329,6 @@ default-package-overrides:
   - missing-foreign ==0.1.1
   - MissingH ==1.4.1.0
   - mixed-types-num ==0.4.0.1
-  - mixpanel-client ==0.2.1
   - mltool ==0.2.0.1
   - mmap ==0.5.9
   - mmark ==0.0.7.1
@@ -1425,7 +1424,7 @@ default-package-overrides:
   - network-anonymous-i2p ==0.10.0
   - network-attoparsec ==0.12.2
   - network-bsd ==2.8.0.0
-  - network-byte-order ==0.1.1.0
+  - network-byte-order ==0.1.1.1
   - network-conduit-tls ==1.3.2
   - network-house ==0.1.0.2
   - network-info ==0.2.0.10
@@ -1437,8 +1436,8 @@ default-package-overrides:
   - network-transport ==0.5.4
   - network-transport-composed ==0.2.1
   - network-uri ==2.6.1.0
-  - newtype ==0.2.1.0
-  - newtype-generics ==0.5.3
+  - newtype ==0.2.2.0
+  - newtype-generics ==0.5.4
   - nicify-lib ==1.0.1
   - NineP ==0.0.2.1
   - nix-paths ==1.0.1
@@ -1480,7 +1479,7 @@ default-package-overrides:
   - OneTuple ==0.2.2
   - Only ==0.1
   - oo-prototypes ==0.1.0.0
-  - opaleye ==0.6.7004.0
+  - opaleye ==0.6.7004.1
   - OpenAL ==1.7.0.5
   - open-browser ==0.2.1.0
   - openexr-write ==0.1.0.2
@@ -1663,7 +1662,7 @@ default-package-overrides:
   - protocol-buffers ==2.4.12
   - protocol-buffers-descriptor ==2.4.12
   - protocol-radius ==0.0.1.1
-  - protocol-radius-test ==0.1.0.0
+  - protocol-radius-test ==0.1.0.1
   - proto-lens ==0.5.1.0
   - proto-lens-arbitrary ==0.1.2.7
   - proto-lens-optparse ==0.1.1.5
@@ -1679,8 +1678,7 @@ default-package-overrides:
   - purescript-bridge ==0.13.0.0
   - pure-zlib ==0.6.6
   - pushbullet-types ==0.4.1.0
-  - pusher-http-haskell ==1.5.1.9
-  - PyF ==0.8.1.0
+  - pusher-http-haskell ==1.5.1.10
   - qchas ==1.1.0.1
   - qm-interpolated-string ==0.3.0.0
   - qnap-decrypt ==0.3.5
@@ -1733,7 +1731,7 @@ default-package-overrides:
   - read-editor ==0.1.0.2
   - read-env-var ==1.0.0.0
   - reanimate ==0.1.5.0
-  - reanimate-svg ==0.9.1.0
+  - reanimate-svg ==0.9.1.1
   - rebase ==1.3.1.1
   - record-dot-preprocessor ==0.2
   - record-hasfield ==1.0
@@ -1769,6 +1767,8 @@ default-package-overrides:
   - repa ==3.4.1.4
   - repa-algorithms ==3.4.1.3
   - repa-io ==3.4.1.1
+  - replace-attoparsec ==1.0.1.0
+  - replace-megaparsec ==1.1.3.0
   - repline ==0.2.1.0
   - req ==2.1.0
   - req-conduit ==1.0.0
@@ -1883,7 +1883,7 @@ default-package-overrides:
   - servant-pipes ==0.15
   - servant-ruby ==0.9.0.0
   - servant-server ==0.16.2
-  - servant-static-th ==0.2.2.0
+  - servant-static-th ==0.2.2.1
   - servant-swagger ==1.1.7.1
   - servant-swagger-ui ==0.3.4.3.22.2
   - servant-swagger-ui-core ==0.3.3
@@ -1921,7 +1921,7 @@ default-package-overrides:
   - simple ==0.11.3
   - simple-cabal ==0.0.0.1
   - simple-cmd ==0.2.0.1
-  - simple-cmd-args ==0.1.2
+  - simple-cmd-args ==0.1.3
   - simple-log ==0.9.12
   - simple-reflect ==0.3.3
   - simple-sendfile ==0.2.28
@@ -2011,7 +2011,7 @@ default-package-overrides:
   - strict ==0.3.2
   - strict-base-types ==0.6.1
   - strict-concurrency ==0.2.4.3
-  - strict-list ==0.1.4
+  - strict-list ==0.1.5
   - stringbuilder ==0.5.1
   - string-class ==0.1.7.0
   - string-combinators ==0.6.0.5
@@ -2180,7 +2180,7 @@ default-package-overrides:
   - tonatona-servant ==0.1.0.2
   - torsor ==0.1
   - tostring ==0.2.1.1
-  - TotalMap ==0.1.0.0
+  - TotalMap ==0.1.1.1
   - tracing ==0.0.4.0
   - transaction ==0.1.1.3
   - transformers-base ==0.4.5.2
@@ -2245,11 +2245,11 @@ default-package-overrides:
   - unique-logic ==0.4
   - unique-logic-tf ==0.5.1
   - unit-constraint ==0.0.0
-  - universe ==1.1
+  - universe ==1.1.1
   - universe-base ==1.1.1
   - universe-dependent-sum ==1.1.0.1
   - universe-instances-base ==1.1
-  - universe-instances-extended ==1.1
+  - universe-instances-extended ==1.1.1
   - universe-instances-trans ==1.1
   - universe-reverse-instances ==1.1
   - universum ==1.5.0
@@ -2309,7 +2309,7 @@ default-package-overrides:
   - verbosity ==0.3.0.0
   - versions ==3.5.1.1
   - ViennaRNAParser ==1.3.3
-  - viewprof ==0.0.0.29
+  - viewprof ==0.0.0.30
   - vinyl ==0.11.0
   - vivid ==0.4.2.3
   - vivid-osc ==0.5.0.0
@@ -2339,7 +2339,7 @@ default-package-overrides:
   - wai-transformers ==0.1.0
   - wai-websockets ==3.0.1.2
   - warp ==3.2.28
-  - warp-tls ==3.2.7
+  - warp-tls ==3.2.8
   - warp-tls-uid ==0.2.0.6
   - wave ==0.2.0
   - wcwidth ==0.0.2
@@ -2435,7 +2435,7 @@ default-package-overrides:
   - yesod-csp ==0.2.5.0
   - yesod-eventsource ==1.6.0
   - yesod-fb ==0.5.0
-  - yesod-form ==1.6.6
+  - yesod-form ==1.6.7
   - yesod-form-bootstrap4 ==2.1.2
   - yesod-gitrepo ==0.3.0
   - yesod-gitrev ==0.2.1
-- 
GitLab


From 780cdeb31c2249082d0c5ecf6c11caaa2034f46f Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Sun, 15 Sep 2019 09:13:37 +0300
Subject: [PATCH 0498/2254] haskellPackages.scheduler: mark unbroken

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

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index ded5ea4679f..75a3a739670 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -8691,7 +8691,6 @@ broken-packages:
   - scenegraph
   - schedevr
   - schedule-planner
-  - scheduler
   - schedyield
   - schematic
   - scholdoc
-- 
GitLab


From f56d16a89ed9aeff4c62d342f8baa162c7aac29b Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Thu, 12 Sep 2019 09:22:58 +0300
Subject: [PATCH 0499/2254] haskellPackages.massiv: mark unbroken

---
 .../development/haskell-modules/configuration-hackage2nix.yaml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 75a3a739670..4f9d7a57261 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -7150,9 +7150,6 @@ broken-packages:
   - marxup
   - masakazu-bot
   - MASMGen
-  - massiv
-  - massiv-io
-  - massiv-test
   - master-plan
   - matchable-th
   - matchers
-- 
GitLab


From 168b39e66f98c1d991fd12d0dda91870cbd6caef Mon Sep 17 00:00:00 2001
From: Luc Tielen <luc.tielen@kabisa.nl>
Date: Sun, 15 Sep 2019 18:16:58 +0200
Subject: [PATCH 0500/2254] Revert "haskell.packages.ghc881.cabal-doctest: use
 super.cabal-doctest_1_0_7"

This reverts commit 5e91bfa80acea3dabca7034f8a517044965b6270.
---
 .../haskell-modules/configuration-ghc-8.8.x.nix        | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 69bd3844c9c..6fa02c39c43 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -74,7 +74,15 @@ self: super: {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/vector-th-unbox-0.2.1.6.patch";
     sha256 = "0169yf9ms1g5mmkc5l6hpffzm34zdrqdng4df02nbdmfgba45h19";
   });
-  cabal-doctest = super.cabal-doctest_1_0_7;
+  cabal-doctest = overrideSrc (doJailbreak super.cabal-doctest) {
+    version = "1.0.7";
+    src = pkgs.fetchFromGitHub {
+      owner = "phadej";
+      repo = "cabal-doctest";
+      rev = "5abe80fe4ef2eca337bad719d957a0fe1b571392";
+      sha256 = "08040fjkdlg7ll3jrc7xpbn0ca6y22zlvngnz1inh511f4wvq80d";
+    };
+  };
   regex-base = overrideCabal (appendPatch super.regex-base (pkgs.fetchpatch {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-base-0.93.2.patch";
     sha256 = "01d1plrdx6hcspwn2h6y9pyi5366qk926vb5cl5qcl6x4m23l6y1";
-- 
GitLab


From 8a0c213261a00a38ae7c902e4acc689200ab1775 Mon Sep 17 00:00:00 2001
From: Luc Tielen <luc.tielen@kabisa.nl>
Date: Sun, 15 Sep 2019 18:51:59 +0200
Subject: [PATCH 0501/2254] haskell.packages.ghc881.yaml: fix missing attribute
 issue

---
 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 6fa02c39c43..1ea3be21ba9 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -167,7 +167,7 @@ self: super: {
     '';
   });
   system-fileio = doJailbreak super.system-fileio;
-  yaml = self.yaml_0_11_1_2;
+  yaml = super.yaml;
   haskell-src-meta = appendPatch (dontCheck (doJailbreak super.haskell-src-meta)) (pkgs.fetchpatch {
     url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/haskell-src-meta-0.8.2.patch";
     sha256 = "146im1amywyl29kcldvgrxpwj22lrpzxysl7vc8rmn3hrq130dyc";
-- 
GitLab


From 9b2394519c194df17c3028caa92be7ba50cbb710 Mon Sep 17 00:00:00 2001
From: Luc Tielen <luc.tielen@kabisa.nl>
Date: Sun, 15 Sep 2019 19:33:25 +0200
Subject: [PATCH 0502/2254] haskell.packages.ghc881.alex: apply temporary patch
 for ghc881

---
 .../haskell-modules/configuration-common.nix  |  2 +-
 .../patches/alex-3.2.4-ghc8.8.x.patch         | 27 +++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/haskell-modules/patches/alex-3.2.4-ghc8.8.x.patch

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index c4cca42309d..88557fba162 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1005,7 +1005,7 @@ self: super: {
   spdx = dontCheck super.spdx;
 
   # The test suite does not know how to find the 'alex' binary.
-  alex = overrideCabal super.alex (drv: {
+  alex = overrideCabal (appendPatch super.alex ./patches/alex-3.2.4-ghc8.8.x.patch) (drv: {
     testSystemDepends = (drv.testSystemDepends or []) ++ [pkgs.which];
     preCheck = ''export PATH="$PWD/dist/build/alex:$PATH"'';
   });
diff --git a/pkgs/development/haskell-modules/patches/alex-3.2.4-ghc8.8.x.patch b/pkgs/development/haskell-modules/patches/alex-3.2.4-ghc8.8.x.patch
new file mode 100644
index 00000000000..47efdfda860
--- /dev/null
+++ b/pkgs/development/haskell-modules/patches/alex-3.2.4-ghc8.8.x.patch
@@ -0,0 +1,27 @@
+From deaae6eddef5186bfd0e42e2c3ced39e26afa4d6 Mon Sep 17 00:00:00 2001
+From: "Joseph C. Sible" <josephcsible@users.noreply.github.com>
+Date: Sat, 31 Aug 2019 21:19:37 -0400
+Subject: [PATCH] Remove fail from default_typeclass test
+
+This was added when we copied in StateT from MTL, but we don't actually
+use it. Since the MonadFail Proposal was finished in GHC 8.8.1, it now
+breaks compiling, so remove it.
+---
+ tests/default_typeclass.x | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/tests/default_typeclass.x b/tests/default_typeclass.x
+index fb06684..5491e28 100644
+--- a/tests/default_typeclass.x
++++ b/tests/default_typeclass.x
+@@ -285,7 +285,6 @@ instance (Monad m) => Monad (StateT s m) where
+     m >>= k  = StateT $ \s -> do
+         (a, s') <- runStateT m s
+         runStateT (k a) s'
+-    fail str = StateT $ \_ -> fail str
+ 
+ -- | Fetch the current value of the state within the monad.
+ get' :: (Monad m) => StateT s m s
+-- 
+2.16.1
+
-- 
GitLab


From 3ad52721a47fe8368929819774bf9821bc036706 Mon Sep 17 00:00:00 2001
From: Luc Tielen <luc.tielen@kabisa.nl>
Date: Sun, 15 Sep 2019 23:03:22 +0200
Subject: [PATCH 0503/2254] haskell.packages.ghc881.haskell-src-meta: fix build

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 1ea3be21ba9..91b6b84a421 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -169,8 +169,8 @@ self: super: {
   system-fileio = doJailbreak super.system-fileio;
   yaml = super.yaml;
   haskell-src-meta = appendPatch (dontCheck (doJailbreak super.haskell-src-meta)) (pkgs.fetchpatch {
-    url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/haskell-src-meta-0.8.2.patch";
-    sha256 = "146im1amywyl29kcldvgrxpwj22lrpzxysl7vc8rmn3hrq130dyc";
+    url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/haskell-src-meta-0.8.3.patch";
+    sha256 = "1asl932mibr5y057xx8v1a7n3qy87lcnclsfh8pbxq1m3iwjkxy8";
   });
   asn1-encoding = appendPatch (dontCheck (doJailbreak super.asn1-encoding)) (pkgs.fetchpatch {
     url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/asn1-encoding-0.9.5.patch";
-- 
GitLab


From 0b183e5d1475a18e8b1f94f3a232e991af202b21 Mon Sep 17 00:00:00 2001
From: Luc Tielen <luc.tielen@kabisa.nl>
Date: Mon, 16 Sep 2019 12:33:56 +0200
Subject: [PATCH 0504/2254] haskell.packages.ghc881.happy: fix build

---
 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 91b6b84a421..8a0d474127a 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -105,10 +105,7 @@ self: super: {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/hackage-security-0.5.3.0.patch";
     sha256 = "0l8x0pbsn18fj5ak5q0g5rva4xw1s9yc4d86a1pfyaz467b9i5a4";
   });
-  happy = appendPatch super.happy (pkgs.fetchpatch {
-    url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/happy-1.19.11.patch";
-    sha256 = "16m659kxbq0s87ak2y1pqggfy67yfvcwc0zi3hcphf3v8735xhkk";
-  });
+  happy = super.happy;
   hedgehog = appendPatch super.hedgehog (pkgs.fetchpatch {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/hedgehog-0.6.1.patch";
     sha256 = "04xwznd3lfgracfz68ls6vfm19rhq8fb74r6ii0grpv6cx4rr21i";
-- 
GitLab


From 1135dd3e23835a4fa3287911d3dcd3e546ce596a Mon Sep 17 00:00:00 2001
From: Luc Tielen <luc.tielen@kabisa.nl>
Date: Mon, 16 Sep 2019 13:20:31 +0200
Subject: [PATCH 0505/2254] haskell.packages.ghc881.haskell-src-exts: fix build

---
 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 8a0d474127a..1cfe150c600 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -93,10 +93,7 @@ self: super: {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-posix-0.95.2.patch";
     sha256 = "006yli58jpqp786zm1xlncjsilc38iv3a09r4pv94l587sdzasd2";
   });
-  haskell-src-exts = appendPatch super.haskell-src-exts (pkgs.fetchpatch {
-    url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/haskell-src-exts-1.21.0.patch";
-    sha256 = "0alb28hcsp774c9s73dgrajcb44vgv1xqfg2n5a9y2bpyngqscs3";
-  });
+  haskell-src-exts = super.haskell-src-exts;
   optparse-applicative = appendPatch (doJailbreak super.optparse-applicative) (pkgs.fetchpatch {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/optparse-applicative-0.14.3.0.patch";
     sha256 = "068sjj98jqiq3h8h03mg4w2pa11q8lxkx2i4lmxivq77xyhlwq3y";
-- 
GitLab


From 230565a8593194cbcffa780f4521398eaa57925a Mon Sep 17 00:00:00 2001
From: Luc Tielen <luc.tielen@kabisa.nl>
Date: Mon, 16 Sep 2019 13:48:29 +0200
Subject: [PATCH 0506/2254] haskell.packages.ghc881.cabal-doctest: fix build

---
 .../haskell-modules/configuration-ghc-8.8.x.nix          | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 1cfe150c600..1f7bcc6e95e 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -74,15 +74,6 @@ self: super: {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/vector-th-unbox-0.2.1.6.patch";
     sha256 = "0169yf9ms1g5mmkc5l6hpffzm34zdrqdng4df02nbdmfgba45h19";
   });
-  cabal-doctest = overrideSrc (doJailbreak super.cabal-doctest) {
-    version = "1.0.7";
-    src = pkgs.fetchFromGitHub {
-      owner = "phadej";
-      repo = "cabal-doctest";
-      rev = "5abe80fe4ef2eca337bad719d957a0fe1b571392";
-      sha256 = "08040fjkdlg7ll3jrc7xpbn0ca6y22zlvngnz1inh511f4wvq80d";
-    };
-  };
   regex-base = overrideCabal (appendPatch super.regex-base (pkgs.fetchpatch {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-base-0.93.2.patch";
     sha256 = "01d1plrdx6hcspwn2h6y9pyi5366qk926vb5cl5qcl6x4m23l6y1";
-- 
GitLab


From 6a6b39b73f508c406612db46a302aa8c7738ef2b Mon Sep 17 00:00:00 2001
From: Luc Tielen <luc.tielen@kabisa.nl>
Date: Mon, 16 Sep 2019 14:30:25 +0200
Subject: [PATCH 0507/2254] haskell.packages.ghc881.vector-th-unbox: fix build

---
 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 1f7bcc6e95e..952c836d678 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -70,7 +70,7 @@ self: super: {
       sha256 = "1p1pinca33vd10iy7hl20c1fc99vharcgcai6z3ngqbq50k2pd3q";
     };
   };
-  vector-th-unbox = appendPatch super.vector-th-unbox (pkgs.fetchpatch {
+  vector-th-unbox = appendPatch (doJailbreak super.vector-th-unbox) (pkgs.fetchpatch {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/vector-th-unbox-0.2.1.6.patch";
     sha256 = "0169yf9ms1g5mmkc5l6hpffzm34zdrqdng4df02nbdmfgba45h19";
   });
-- 
GitLab


From de404e0976518bde60b7cb67e60af794f0124c3f Mon Sep 17 00:00:00 2001
From: Luc Tielen <luc.tielen@kabisa.nl>
Date: Mon, 16 Sep 2019 16:02:56 +0200
Subject: [PATCH 0508/2254] haskell.packages.ghc881.socks: fix issue with base
 dependency version

---
 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 952c836d678..a930098e91d 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -115,7 +115,7 @@ self: super: {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/shakespeare-2.0.20.patch";
     sha256 = "1dgx41ylahj4wk8r422aik0d7qdpawdga4gqz905nvlnhqjla58y";
   });
-  socks = appendPatch super.socks (pkgs.fetchpatch {
+  socks = appendPatch (doJailbreak super.socks) (pkgs.fetchpatch {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/socks-0.6.0.patch";
     sha256 = "1dsqmx0sw62x4glh43c0sbizd2y00v5xybiqadn96v6pmfrap5cp";
   });
-- 
GitLab


From a2b742f80c6c4a03f894fe1e74d31bd4abcdd06e Mon Sep 17 00:00:00 2001
From: Luc Tielen <luc.tielen@kabisa.nl>
Date: Mon, 16 Sep 2019 16:27:34 +0200
Subject: [PATCH 0509/2254] haskell.packages.ghc881.attoparsec: fix build issue

---
 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index a930098e91d..e6f5a8c1f5c 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -103,10 +103,7 @@ self: super: {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-tdfa-1.2.3.1.patch";
     sha256 = "1lhas4s2ms666prb475gaw2bqw1v4y8cxi66sy20j727sx7ppjs7";
   });
-  attoparsec = appendPatch (doJailbreak super.attoparsec) (pkgs.fetchpatch {
-    url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/attoparsec-0.13.2.2.patch";
-    sha256 = "13i1p5g0xzxnv966nlyb77mfmxvg9jzbym1d36h1ajn045yf4igl";
-  });
+  attoparsec = super.attoparsec;
   cassava = appendPatch super.cassava (pkgs.fetchpatch {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/cassava-0.5.1.0.patch";
     sha256 = "11scwwjp94si90vb8v5yr291g9qwv5l223z8y0g0lc63932bp63g";
-- 
GitLab


From d0a1d73438778a9c2d7f36a6e83b8158c9a91ae9 Mon Sep 17 00:00:00 2001
From: Luc Tielen <luc.tielen@kabisa.nl>
Date: Mon, 16 Sep 2019 17:49:39 +0200
Subject: [PATCH 0510/2254] haskell.packages.ghc881.vault: avoid build issue
 with docs

---
 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index e6f5a8c1f5c..aad21b5817a 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -159,4 +159,5 @@ self: super: {
     sha256 = "0a3159rnaw6shjzdm46799crd4pxh33s23qy51xa7z6nv5q8wsb5";
   });
   tls = self.tls_1_5_1;
+  vault = dontHaddock super.vault;
 }
-- 
GitLab


From c120b6957cce1b608528d7380547bb8e6c8080a7 Mon Sep 17 00:00:00 2001
From: Luc Tielen <luc.tielen@kabisa.nl>
Date: Mon, 16 Sep 2019 18:02:21 +0200
Subject: [PATCH 0511/2254] haskell.packages.ghc881.hedgehog: fix build issue

---
 .../development/haskell-modules/configuration-ghc-8.8.x.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index aad21b5817a..29be9b9c6fd 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -94,9 +94,9 @@ self: super: {
     sha256 = "0l8x0pbsn18fj5ak5q0g5rva4xw1s9yc4d86a1pfyaz467b9i5a4";
   });
   happy = super.happy;
-  hedgehog = appendPatch super.hedgehog (pkgs.fetchpatch {
-    url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/hedgehog-0.6.1.patch";
-    sha256 = "04xwznd3lfgracfz68ls6vfm19rhq8fb74r6ii0grpv6cx4rr21i";
+  hedgehog = appendPatch (doJailbreak super.hedgehog) (pkgs.fetchpatch {
+    url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/hedgehog-1.0.patch";
+    sha256 = "16gadh1hb74jqvzc9c893sffb1y2vjglblyrqjwp7xfhccq7g8yw";
   });
   easytest = self.easytest_0_3;
   regex-tdfa = appendPatch super.regex-tdfa (pkgs.fetchpatch {
-- 
GitLab


From fce1182f4b72f0d0cac968aede357bf439c43151 Mon Sep 17 00:00:00 2001
From: Luc Tielen <luc.tielen@kabisa.nl>
Date: Mon, 16 Sep 2019 18:52:28 +0200
Subject: [PATCH 0512/2254] haskell.packages.ghc881.tasty-hedgehog: fix
 dependency versioning issue

---
 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 29be9b9c6fd..a5c84898ab4 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -149,6 +149,7 @@ self: super: {
     '';
   });
   system-fileio = doJailbreak super.system-fileio;
+  tasty-hedgehog = doJailbreak super.tasty-hedgehog;
   yaml = super.yaml;
   haskell-src-meta = appendPatch (dontCheck (doJailbreak super.haskell-src-meta)) (pkgs.fetchpatch {
     url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/haskell-src-meta-0.8.3.patch";
-- 
GitLab


From b55447925deb439c5ec16d0ee072379346ad0379 Mon Sep 17 00:00:00 2001
From: Luc Tielen <luc.tielen@kabisa.nl>
Date: Mon, 16 Sep 2019 21:52:08 +0200
Subject: [PATCH 0513/2254] Update dhall: 1.25.0 -> 1.26.0

---
 pkgs/development/haskell-modules/configuration-common.nix | 4 ++--
 pkgs/development/haskell-modules/configuration-nix.nix    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 88557fba162..12c6d1bcbfd 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1197,8 +1197,8 @@ self: super: {
   temporary-resourcet = doJailbreak super.temporary-resourcet;
 
   # Requires dhall >= 1.23.0
-  ats-pkg = super.ats-pkg.override { dhall = self.dhall_1_25_0; };
-  dhall-to-cabal = super.dhall-to-cabal.override { dhall = self.dhall_1_25_0; };
+  ats-pkg = super.ats-pkg.override { dhall = self.dhall_1_26_0; };
+  dhall-to-cabal = super.dhall-to-cabal.override { dhall = self.dhall_1_26_0; };
 
   # Test suite doesn't work with current QuickCheck
   # https://github.com/pruvisto/heap/issues/11
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 88ec8ad85ff..5db25686fc6 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -589,7 +589,7 @@ self: super: builtins.intersectAttrs super {
   snap-server = dontCheck super.snap-server;
 
   # Tests require internet
-  dhall_1_25_0 = dontCheck super.dhall_1_25_0;
+  dhall_1_26_0 = dontCheck super.dhall_1_26_0;
   http-download = dontCheck super.http-download;
   pantry = dontCheck super.pantry;
 
-- 
GitLab


From 4ea67e42c41800034159f134c547780bac0f2a78 Mon Sep 17 00:00:00 2001
From: Luc Tielen <luc.tielen@kabisa.nl>
Date: Mon, 16 Sep 2019 22:11:40 +0200
Subject: [PATCH 0514/2254] Only patch alex for ghc881

---
 pkgs/development/haskell-modules/configuration-common.nix  | 2 +-
 .../haskell-modules/configuration-ghc-8.8.x.nix            | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 12c6d1bcbfd..a3cffdb8a1d 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1005,7 +1005,7 @@ self: super: {
   spdx = dontCheck super.spdx;
 
   # The test suite does not know how to find the 'alex' binary.
-  alex = overrideCabal (appendPatch super.alex ./patches/alex-3.2.4-ghc8.8.x.patch) (drv: {
+  alex = overrideCabal super.alex (drv: {
     testSystemDepends = (drv.testSystemDepends or []) ++ [pkgs.which];
     preCheck = ''export PATH="$PWD/dist/build/alex:$PATH"'';
   });
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index a5c84898ab4..063452b053f 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -161,4 +161,11 @@ self: super: {
   });
   tls = self.tls_1_5_1;
   vault = dontHaddock super.vault;
+
+  # The test suite does not know how to find the 'alex' binary.
+  # TODO remove patch when alex gets a newer release than 3.2.4
+  alex = overrideCabal (appendPatch super.alex ./patches/alex-3.2.4-ghc8.8.x.patch) (drv: {
+    testSystemDepends = (drv.testSystemDepends or []) ++ [pkgs.which];
+    preCheck = ''export PATH="$PWD/dist/build/alex:$PATH"'';
+  });
 }
-- 
GitLab


From fc06be9341d103ae503711dbca390487d48a7f36 Mon Sep 17 00:00:00 2001
From: Luc Tielen <luc.tielen@kabisa.nl>
Date: Mon, 16 Sep 2019 22:22:05 +0200
Subject: [PATCH 0515/2254] Remove unneeded code

---
 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 063452b053f..9ab397323e5 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -84,7 +84,6 @@ self: super: {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-posix-0.95.2.patch";
     sha256 = "006yli58jpqp786zm1xlncjsilc38iv3a09r4pv94l587sdzasd2";
   });
-  haskell-src-exts = super.haskell-src-exts;
   optparse-applicative = appendPatch (doJailbreak super.optparse-applicative) (pkgs.fetchpatch {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/optparse-applicative-0.14.3.0.patch";
     sha256 = "068sjj98jqiq3h8h03mg4w2pa11q8lxkx2i4lmxivq77xyhlwq3y";
@@ -93,7 +92,6 @@ self: super: {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/hackage-security-0.5.3.0.patch";
     sha256 = "0l8x0pbsn18fj5ak5q0g5rva4xw1s9yc4d86a1pfyaz467b9i5a4";
   });
-  happy = super.happy;
   hedgehog = appendPatch (doJailbreak super.hedgehog) (pkgs.fetchpatch {
     url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/hedgehog-1.0.patch";
     sha256 = "16gadh1hb74jqvzc9c893sffb1y2vjglblyrqjwp7xfhccq7g8yw";
@@ -103,7 +101,6 @@ self: super: {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-tdfa-1.2.3.1.patch";
     sha256 = "1lhas4s2ms666prb475gaw2bqw1v4y8cxi66sy20j727sx7ppjs7";
   });
-  attoparsec = super.attoparsec;
   cassava = appendPatch super.cassava (pkgs.fetchpatch {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/cassava-0.5.1.0.patch";
     sha256 = "11scwwjp94si90vb8v5yr291g9qwv5l223z8y0g0lc63932bp63g";
-- 
GitLab


From 6facf5b59400e37caa7bb2003139ad7d05ba5488 Mon Sep 17 00:00:00 2001
From: Luc Tielen <luc.tielen@kabisa.nl>
Date: Mon, 16 Sep 2019 22:39:07 +0200
Subject: [PATCH 0516/2254] ghc881 - alex: point directly to working commit

---
 .../configuration-ghc-8.8.x.nix               | 11 +++++---
 .../patches/alex-3.2.4-ghc8.8.x.patch         | 27 -------------------
 2 files changed, 8 insertions(+), 30 deletions(-)
 delete mode 100644 pkgs/development/haskell-modules/patches/alex-3.2.4-ghc8.8.x.patch

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 9ab397323e5..2188b8d0091 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -147,7 +147,6 @@ self: super: {
   });
   system-fileio = doJailbreak super.system-fileio;
   tasty-hedgehog = doJailbreak super.tasty-hedgehog;
-  yaml = super.yaml;
   haskell-src-meta = appendPatch (dontCheck (doJailbreak super.haskell-src-meta)) (pkgs.fetchpatch {
     url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/haskell-src-meta-0.8.3.patch";
     sha256 = "1asl932mibr5y057xx8v1a7n3qy87lcnclsfh8pbxq1m3iwjkxy8";
@@ -160,8 +159,14 @@ self: super: {
   vault = dontHaddock super.vault;
 
   # The test suite does not know how to find the 'alex' binary.
-  # TODO remove patch when alex gets a newer release than 3.2.4
-  alex = overrideCabal (appendPatch super.alex ./patches/alex-3.2.4-ghc8.8.x.patch) (drv: {
+  alex = overrideCabal (overrideSrc super.alex {
+    src = pkgs.fetchFromGitHub {
+      owner = "simonmar";
+      repo = "alex";
+      rev = "11042dbcc45382c57216eecb1438b625e1cca350";
+      sha256 = "03ywnf0mh3fzb636kq8gjz0vs06qg9kqi3lsh0b24wsfw7pppysr";
+    };
+  }) (drv: {
     testSystemDepends = (drv.testSystemDepends or []) ++ [pkgs.which];
     preCheck = ''export PATH="$PWD/dist/build/alex:$PATH"'';
   });
diff --git a/pkgs/development/haskell-modules/patches/alex-3.2.4-ghc8.8.x.patch b/pkgs/development/haskell-modules/patches/alex-3.2.4-ghc8.8.x.patch
deleted file mode 100644
index 47efdfda860..00000000000
--- a/pkgs/development/haskell-modules/patches/alex-3.2.4-ghc8.8.x.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From deaae6eddef5186bfd0e42e2c3ced39e26afa4d6 Mon Sep 17 00:00:00 2001
-From: "Joseph C. Sible" <josephcsible@users.noreply.github.com>
-Date: Sat, 31 Aug 2019 21:19:37 -0400
-Subject: [PATCH] Remove fail from default_typeclass test
-
-This was added when we copied in StateT from MTL, but we don't actually
-use it. Since the MonadFail Proposal was finished in GHC 8.8.1, it now
-breaks compiling, so remove it.
----
- tests/default_typeclass.x | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/tests/default_typeclass.x b/tests/default_typeclass.x
-index fb06684..5491e28 100644
---- a/tests/default_typeclass.x
-+++ b/tests/default_typeclass.x
-@@ -285,7 +285,6 @@ instance (Monad m) => Monad (StateT s m) where
-     m >>= k  = StateT $ \s -> do
-         (a, s') <- runStateT m s
-         runStateT (k a) s'
--    fail str = StateT $ \_ -> fail str
- 
- -- | Fetch the current value of the state within the monad.
- get' :: (Monad m) => StateT s m s
--- 
-2.16.1
-
-- 
GitLab


From 5ea256fe5fb038327f2c6593eed1d715d69ec4e7 Mon Sep 17 00:00:00 2001
From: Luc Tielen <luc.tielen@kabisa.nl>
Date: Mon, 16 Sep 2019 23:52:26 +0200
Subject: [PATCH 0517/2254] ghc881 - alex: try only applying relevant patch

---
 .../haskell-modules/configuration-ghc-8.8.x.nix     | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 2188b8d0091..756ff243aa2 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -159,14 +159,11 @@ self: super: {
   vault = dontHaddock super.vault;
 
   # The test suite does not know how to find the 'alex' binary.
-  alex = overrideCabal (overrideSrc super.alex {
-    src = pkgs.fetchFromGitHub {
-      owner = "simonmar";
-      repo = "alex";
-      rev = "11042dbcc45382c57216eecb1438b625e1cca350";
-      sha256 = "03ywnf0mh3fzb636kq8gjz0vs06qg9kqi3lsh0b24wsfw7pppysr";
-    };
-  }) (drv: {
+  # TODO dont fetch patch if https://github.com/simonmar/alex/issues/140 is resolved
+  alex = overrideCabal (appendPatch super.alex (pkgs.fetchpatch {
+    url = "https://github.com/simonmar/alex/commit/deaae6eddef5186bfd0e42e2c3ced39e26afa4d6.patch";
+    sha256 = "1v40gmnw4lqyk271wngdwz8whpfdhmza58srbkka8icwwwrck3l5";
+  })) (drv: {
     testSystemDepends = (drv.testSystemDepends or []) ++ [pkgs.which];
     preCheck = ''export PATH="$PWD/dist/build/alex:$PATH"'';
   });
-- 
GitLab


From de051787bff567367ea120539beffc03302edba3 Mon Sep 17 00:00:00 2001
From: Luc Tielen <luc.tielen@kabisa.nl>
Date: Tue, 17 Sep 2019 11:02:47 +0200
Subject: [PATCH 0518/2254] ghc881 - alex: simplify override

---
 .../development/haskell-modules/configuration-ghc-8.8.x.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 756ff243aa2..41925d89550 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -158,13 +158,9 @@ self: super: {
   tls = self.tls_1_5_1;
   vault = dontHaddock super.vault;
 
-  # The test suite does not know how to find the 'alex' binary.
   # TODO dont fetch patch if https://github.com/simonmar/alex/issues/140 is resolved
-  alex = overrideCabal (appendPatch super.alex (pkgs.fetchpatch {
+  alex = appendPatch super.alex (pkgs.fetchpatch {
     url = "https://github.com/simonmar/alex/commit/deaae6eddef5186bfd0e42e2c3ced39e26afa4d6.patch";
     sha256 = "1v40gmnw4lqyk271wngdwz8whpfdhmza58srbkka8icwwwrck3l5";
-  })) (drv: {
-    testSystemDepends = (drv.testSystemDepends or []) ++ [pkgs.which];
-    preCheck = ''export PATH="$PWD/dist/build/alex:$PATH"'';
   });
 }
-- 
GitLab


From e405fe40cc826bdecb1f22b5cb8c7291293530e2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Sep 2019 18:12:28 +0200
Subject: [PATCH 0519/2254] hackage2nix: disable builds that break evaluation
 on Hydra

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

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 4f9d7a57261..dcfc40ef5ed 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -3116,6 +3116,7 @@ broken-packages:
   - armor
   - arpa
   - arpack
+  - array-builder
   - array-chunks
   - array-forth
   - array-primops
@@ -4741,6 +4742,11 @@ broken-packages:
   - feed-translator
   - feed2lj
   - feed2twitter
+  - fei-base
+  - fei-cocoapi
+  - fei-dataiter
+  - fei-examples
+  - fei-nn
   - feldspar-compiler
   - feldspar-language
   - fenfire
@@ -4786,6 +4792,7 @@ broken-packages:
   - findhttp
   - fingertree-psqueue
   - fingertree-tf
+  - finitary-derive
   - FiniteMap
   - firefly-example
   - first-and-last
@@ -5087,6 +5094,7 @@ broken-packages:
   - ghci-history-parser
   - ghci-lib
   - ghci-ng
+  - ghcide
   - ghcjs-base-stub
   - ghcjs-dom-jsffi
   - ghcjs-fetch
@@ -5709,6 +5717,7 @@ broken-packages:
   - hdbi-tests
   - hdf
   - hDFA
+  - hdiff
   - hdigest
   - hdirect
   - hdis86
@@ -6376,6 +6385,7 @@ broken-packages:
   - ide-backend-server
   - ideas
   - ideas-math
+  - ideas-math-types
   - idempotent
   - identifiers
   - idiii
@@ -9561,6 +9571,7 @@ broken-packages:
   - through-text
   - throwable-exceptions
   - thumbnail-plus
+  - thumbnail-polish
   - tic-tac-toe
   - tickle
   - TicTacToe
-- 
GitLab


From 4c85abae94b0a55ff76387c1f1793370a170dda8 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 18 Sep 2019 13:57:20 -0400
Subject: [PATCH 0520/2254] treewide: use libtinfo.so.5 where needed

This was originally added in

https://github.com/NixOS/nixpkgs/pull/21350

best to use this name for clarity.
---
 pkgs/applications/editors/jetbrains/default.nix       | 4 ++--
 pkgs/applications/radio/tlf/default.nix               | 8 +++-----
 pkgs/applications/science/logic/saw-tools/default.nix | 3 +--
 pkgs/applications/science/programming/fdr/default.nix | 7 +++----
 pkgs/development/arduino/arduino-core/default.nix     | 2 +-
 5 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index a33b9531730..a302be304e5 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -1,6 +1,6 @@
 { lib, stdenv, callPackage, fetchurl
 , python
-, jdk, cmake, libxml2, zlib, python3, ncurses
+, jdk, cmake, libxml2, zlib, python3, ncurses5
 }:
 
 with stdenv.lib;
@@ -34,7 +34,7 @@ let
 
           lldbLibPath=$out/clion-${version}/bin/lldb/linux/lib
           interp="$(cat $NIX_CC/nix-support/dynamic-linker)"
-          ln -s ${ncurses.out}/lib/libncurses.so $lldbLibPath/libtinfo.so.5
+          ln -s ${ncurses5.out}/lib/libtinfo.so.5 $lldbLibPath/libtinfo.so.5
 
           patchelf --set-interpreter $interp \
             --set-rpath "${lib.makeLibraryPath [ libxml2 zlib stdenv.cc.cc.lib ]}:$lldbLibPath" \
diff --git a/pkgs/applications/radio/tlf/default.nix b/pkgs/applications/radio/tlf/default.nix
index 92183306038..f45e695486d 100644
--- a/pkgs/applications/radio/tlf/default.nix
+++ b/pkgs/applications/radio/tlf/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, autoreconfHook, autoconf, automake, pkgconfig, glib
-, perl, ncurses, hamlib, xmlrpc_c }:
+, perl, ncurses5, hamlib, xmlrpc_c }:
 
 stdenv.mkDerivation rec {
   pname = "tlf";
@@ -13,15 +13,13 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ autoreconfHook autoconf automake pkgconfig perl ];
-  buildInputs = [ glib ncurses hamlib xmlrpc_c ];
+  buildInputs = [ glib ncurses5 hamlib xmlrpc_c ];
 
   configureFlags = [ "--enable-hamlib" "--enable-fldigi-xmlrpc" ];
 
   postInstall = ''
     mkdir -p $out/lib
-
-    # Hack around lack of libtinfo in NixOS
-    ln -s ${ncurses.out}/lib/libncursesw.so.6 $out/lib/libtinfo.so.5
+    ln -s ${ncurses5.out}/lib/libtinfo.so.5 $out/lib/libtinfo.so.5
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/science/logic/saw-tools/default.nix b/pkgs/applications/science/logic/saw-tools/default.nix
index d357bef2c7a..c4041281054 100644
--- a/pkgs/applications/science/logic/saw-tools/default.nix
+++ b/pkgs/applications/science/logic/saw-tools/default.nix
@@ -34,8 +34,7 @@ stdenv.mkDerivation {
     mv bin $out/bin
     mv doc $out/share
 
-    # Hack around lack of libtinfo in NixOS
-    ln -s ${ncurses.out}/lib/libncursesw.so.5       $out/lib/libtinfo.so.5
+    ln -s ${ncurses.out}/lib/libtinfo.so.5       $out/lib/libtinfo.so.5
     ln -s ${stdenv.cc.libc}/lib/libpthread.so.0 $out/lib/libpthread.so.0
 
     # Add a clang symlink for easy building with a suitable compiler.
diff --git a/pkgs/applications/science/programming/fdr/default.nix b/pkgs/applications/science/programming/fdr/default.nix
index 3bfb70f5ce8..2c0bb84c801 100644
--- a/pkgs/applications/science/programming/fdr/default.nix
+++ b/pkgs/applications/science/programming/fdr/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, qtbase, qtx11extras, ncurses, xorg, zlib, python27Packages}:
+{stdenv, fetchurl, qtbase, qtx11extras, ncurses5, xorg, zlib, python27Packages}:
 stdenv.mkDerivation {
   name = "fdr-4.2.3";
   src = fetchurl {
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
     python27Packages.python
     qtbase
     qtx11extras
-    ncurses
+    ncurses5
     xorg.libX11
     xorg.libXft
     zlib
@@ -26,8 +26,7 @@ stdenv.mkDerivation {
     rm -r lib/qt_plugins
 
     cp -r * "$out"
-    # Hack around lack of libtinfo in NixOS
-    ln -s ${ncurses.out}/lib/libncursesw.so.6 $out/lib/libtinfo.so.5
+    ln -s ${ncurses5.out}/lib/libtinfo.so.5 $out/lib/libtinfo.so.5
     ln -s ${qtbase.bin}/${qtbase.qtPluginPrefix} $out/lib/qt_plugins
     ln -s ${zlib.out}/lib/libz.so.1 $out/lib/libz.so.1
 
diff --git a/pkgs/development/arduino/arduino-core/default.nix b/pkgs/development/arduino/arduino-core/default.nix
index 2897bac0614..840fbff60eb 100644
--- a/pkgs/development/arduino/arduino-core/default.nix
+++ b/pkgs/development/arduino/arduino-core/default.nix
@@ -200,7 +200,7 @@ stdenv.mkDerivation rec {
 
     # avrdude_bin is linked against libtinfo.so.5
     mkdir $out/lib/
-    ln -s ${lib.makeLibraryPath [ncurses5]}/libncursesw.so.5 $out/lib/libtinfo.so.5
+    ln -s ${lib.makeLibraryPath [ncurses5]}/libtinfo.so.5 $out/lib/libtinfo.so.5
 
     ${stdenv.lib.optionalString withTeensyduino ''
       # Patch the Teensy loader binary
-- 
GitLab


From 6b3832a5194feacf4e9708fe94869f3aa7781296 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 18 Sep 2019 20:12:58 +0200
Subject: [PATCH 0521/2254] mdadm: fix path to sendmail

Without this, mdadm won't be able to send email notifications:

  $ sudo mdadm --monitor --scan --test
  sh: /nix/store/2v8jn0lxza72grcm6hciak9fpgm7xb3a-system-sendmail-1.0: Is a directory

Fixes: b074a40f74c2 ("mdadm: use shared system-sendmail")
---
 pkgs/os-specific/linux/mdadm/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix
index 5aa9e9b43da..8638ac9f798 100644
--- a/pkgs/os-specific/linux/mdadm/default.nix
+++ b/pkgs/os-specific/linux/mdadm/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   postPatch = ''
     sed -e 's@/lib/udev@''${out}/lib/udev@' \
         -e 's@ -Werror @ @' \
-        -e 's@/usr/sbin/sendmail@${system-sendmail}@' -i Makefile
+        -e 's@/usr/sbin/sendmail@${system-sendmail}/bin/sendmail@' -i Makefile
     sed -i \
         -e 's@/usr/bin/basename@${coreutils}/bin/basename@g' \
         -e 's@BINDIR/blkid@${utillinux}/bin/blkid@g' \
-- 
GitLab


From 48859723ac1ec913104497db6845d78688dec38c Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Wed, 18 Sep 2019 15:11:21 -0400
Subject: [PATCH 0522/2254] vboot_reference: use the right ar when
 cross-compiling

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

diff --git a/pkgs/tools/system/vboot_reference/default.nix b/pkgs/tools/system/vboot_reference/default.nix
index 85baa3d3f30..d21e3e7dd92 100644
--- a/pkgs/tools/system/vboot_reference/default.nix
+++ b/pkgs/tools/system/vboot_reference/default.nix
@@ -19,6 +19,11 @@ stdenv.mkDerivation rec {
 
   patches = [ ./dont_static_link.patch ];
 
+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace "ar qc" '${stdenv.cc.bintools.targetPrefix}ar qc'
+  '';
+
   preBuild = ''
     patchShebangs scripts
   '';
-- 
GitLab


From 641f6356d387ef493812de23f75114effc0cc398 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 6 Sep 2019 04:24:10 +0200
Subject: [PATCH 0523/2254] doc: Disable wrapping source

Even a simple typo fix can result in a reflow of a whole paragraph, leading to illegible diffs. The majority of text editors supports wrapping the source code to a comfortable width so it makes sense to me to sacrifice the few that do not rather than the unfortunately line-oriented diff tools.
---
 nixos/doc/xmlformat.conf | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/doc/xmlformat.conf b/nixos/doc/xmlformat.conf
index 4a565c8465b..c3f39c7fd81 100644
--- a/nixos/doc/xmlformat.conf
+++ b/nixos/doc/xmlformat.conf
@@ -37,7 +37,6 @@ para abstract
   entry-break  1
   exit-break   1
   normalize    yes
-  wrap-length  79
 
 title
   format       block
-- 
GitLab


From 83442bc07c2d30e6c106543c30bfaa104d09c503 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 18 Sep 2019 12:44:25 -0700
Subject: [PATCH 0524/2254] mystem: fix hash

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

diff --git a/pkgs/applications/misc/mystem/default.nix b/pkgs/applications/misc/mystem/default.nix
index deecc92d993..6a6c95b6572 100644
--- a/pkgs/applications/misc/mystem/default.nix
+++ b/pkgs/applications/misc/mystem/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://download.cdn.yandex.net/mystem/${pname}-${version}-linux-64bit.tar.gz";
-    sha256 = "0q3vxvyj5bqllqnlivy5llss39z7j0bgpn6kv8mrc54vjdhppx10";
+    sha256 = "0qha7jvkdmil3jiwrpsfhkqsbkqn9dzgx3ayxwjdmv73ikmg95j6";
   };
 
   buildCommand = ''
-- 
GitLab


From 713fda2eb51911ae9420d6c5295317fa932b3497 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 18 Sep 2019 21:50:18 +0200
Subject: [PATCH 0525/2254] nixos/sway: install swaybg by default

---
 nixos/modules/programs/sway.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/programs/sway.nix b/nixos/modules/programs/sway.nix
index b4f03151cdc..f92d09a7ef4 100644
--- a/nixos/modules/programs/sway.nix
+++ b/nixos/modules/programs/sway.nix
@@ -55,7 +55,7 @@ in {
     extraPackages = mkOption {
       type = with types; listOf package;
       default = with pkgs; [
-        swaylock swayidle
+        swaylock swayidle swaybg
         xwayland rxvt_unicode dmenu
       ];
       defaultText = literalExample ''
-- 
GitLab


From cde50a4fab169a90ee4a6c08e82c77be803aa744 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Sep 2019 21:53:40 +0200
Subject: [PATCH 0526/2254] shotcut: use vaapi_device /dev/dri/renderD128
 instead of ":0"

This fixes the auto-detection of VAAPI hardware encoders
provided by Intel chipsets. Be sure to define

  hardware.opengl.extraPackages = [pkgs.vaapiIntel];

in configuration.nix to make the necessary OpenGL drivers
available.
---
 pkgs/applications/video/shotcut/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix
index a50ee8b5664..3edee15db5f 100644
--- a/pkgs/applications/video/shotcut/default.nix
+++ b/pkgs/applications/video/shotcut/default.nix
@@ -33,6 +33,8 @@ mkDerivation rec {
     sed 's_qApp->applicationDirPath(), "ffmpeg"_"${mlt.ffmpeg}/bin/ffmpeg"_' -i src/docks/encodedock.cpp
     NICE=$(type -P nice)
     sed "s_/usr/bin/nice_''${NICE}_" -i src/jobs/meltjob.cpp src/jobs/ffmpegjob.cpp
+    # Fix VAAPI auto-config: https://github.com/mltframework/shotcut/issues/771
+    sed 's#"-vaapi_device" << ":0"#"-vaapi_device" << "/dev/dri/renderD128"#' -i src/docks/encodedock.cpp
   '';
 
   qtWrapperArgs = [
-- 
GitLab


From 83c2ad80ca8c6087b034155e2a767c4f72a6df3f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 18 Sep 2019 22:12:54 +0200
Subject: [PATCH 0527/2254] doc: re-format

---
 doc/coding-conventions.xml            |  306 ++----
 doc/configuration.xml                 |  184 +---
 doc/contributing.xml                  |   15 +-
 doc/cross-compilation.xml             |  390 +-------
 doc/functions.xml                     |    3 +-
 doc/functions/appimagetools.xml       |   32 +-
 doc/functions/debug.xml               |   11 +-
 doc/functions/dockertools.xml         |  224 +----
 doc/functions/fetchers.xml            |   78 +-
 doc/functions/fhs-environments.xml    |   38 +-
 doc/functions/generators.xml          |   25 +-
 doc/functions/library.xml             |    3 +-
 doc/functions/library/asserts.xml     |   13 +-
 doc/functions/library/attrsets.xml    |  145 +--
 doc/functions/nix-gitignore.xml       |   24 +-
 doc/functions/ocitools.xml            |   26 +-
 doc/functions/overrides.xml           |   95 +-
 doc/functions/prefer-remote-fetch.xml |    8 +-
 doc/functions/shell.xml               |    4 +-
 doc/functions/snaptools.xml           |   31 +-
 doc/functions/trivial-builders.xml    |   46 +-
 doc/languages-frameworks/beam.xml     |  163 +---
 doc/languages-frameworks/bower.xml    |   71 +-
 doc/languages-frameworks/coq.xml      |   20 +-
 doc/languages-frameworks/gnome.xml    |  185 +---
 doc/languages-frameworks/go.xml       |   73 +-
 doc/languages-frameworks/index.xml    |    7 +-
 doc/languages-frameworks/java.xml     |   40 +-
 doc/languages-frameworks/lua.xml      |   20 +-
 doc/languages-frameworks/ocaml.xml    |   32 +-
 doc/languages-frameworks/perl.xml     |   98 +-
 doc/languages-frameworks/qt.xml       |   60 +-
 doc/languages-frameworks/ruby.xml     |   37 +-
 doc/languages-frameworks/texlive.xml  |   27 +-
 doc/meta.xml                          |  164 +---
 doc/multiple-output.xml               |  158 +--
 doc/overlays.xml                      |   93 +-
 doc/package-notes.xml                 |  262 +----
 doc/package-specific-user-notes.xml   |  175 +---
 doc/platform-notes.xml                |   34 +-
 doc/quick-start.xml                   |  144 +--
 doc/release-notes.xml                 |  260 ++---
 doc/reviewing-contributions.xml       |  160 +--
 doc/stdenv.xml                        | 1299 +++++--------------------
 doc/submitting-changes.xml            |  171 +---
 45 files changed, 1105 insertions(+), 4349 deletions(-)

diff --git a/doc/coding-conventions.xml b/doc/coding-conventions.xml
index 48356247a49..799f1479467 100644
--- a/doc/coding-conventions.xml
+++ b/doc/coding-conventions.xml
@@ -8,24 +8,17 @@
   <itemizedlist>
    <listitem>
     <para>
-     Use 2 spaces of indentation per indentation level in Nix expressions, 4
-     spaces in shell scripts.
+     Use 2 spaces of indentation per indentation level in Nix expressions, 4 spaces in shell scripts.
     </para>
    </listitem>
    <listitem>
     <para>
-     Do not use tab characters, i.e. configure your editor to use soft tabs.
-     For instance, use <literal>(setq-default indent-tabs-mode nil)</literal>
-     in Emacs. Everybody has different tab settings so it’s asking for
-     trouble.
+     Do not use tab characters, i.e. configure your editor to use soft tabs. For instance, use <literal>(setq-default indent-tabs-mode nil)</literal> in Emacs. Everybody has different tab settings so it’s asking for trouble.
     </para>
    </listitem>
    <listitem>
     <para>
-     Use <literal>lowerCamelCase</literal> for variable names, not
-     <literal>UpperCamelCase</literal>. Note, this rule does not apply to
-     package attribute names, which instead follow the rules in
-     <xref linkend="sec-package-naming"/>.
+     Use <literal>lowerCamelCase</literal> for variable names, not <literal>UpperCamelCase</literal>. Note, this rule does not apply to package attribute names, which instead follow the rules in <xref linkend="sec-package-naming"/>.
     </para>
    </listitem>
    <listitem>
@@ -52,8 +45,7 @@ foo { arg = ...; }
    </listitem>
    <listitem>
     <para>
-     In attribute sets or lists that span multiple lines, the attribute names
-     or list elements should be aligned:
+     In attribute sets or lists that span multiple lines, the attribute names or list elements should be aligned:
 <programlisting>
 # A long list.
 list = [
@@ -97,8 +89,7 @@ attrs = { x = 1280; y = 1024; };
    </listitem>
    <listitem>
     <para>
-     Breaking in the middle of a function argument can give hard-to-read code,
-     like
+     Breaking in the middle of a function argument can give hard-to-read code, like
 <programlisting>
 someFunction { x = 1280;
   y = 1024; } otherArg
@@ -123,8 +114,7 @@ in someFunction res otherArg yetAnotherArg
    </listitem>
    <listitem>
     <para>
-     The bodies of functions, asserts, and withs are not indented to prevent a
-     lot of superfluous indentation levels, i.e.
+     The bodies of functions, asserts, and withs are not indented to prevent a lot of superfluous indentation levels, i.e.
 <programlisting>
 { arg1, arg2 }:
 assert system == "i686-linux";
@@ -156,8 +146,7 @@ stdenv.mkDerivation { ...
    </listitem>
    <listitem>
     <para>
-     Functions should list their expected arguments as precisely as possible.
-     That is, write
+     Functions should list their expected arguments as precisely as possible. That is, write
 <programlisting>
 { stdenv, fetchurl, perl }: <replaceable>...</replaceable>
 </programlisting>
@@ -171,9 +160,7 @@ args: with args; <replaceable>...</replaceable>
 </programlisting>
     </para>
     <para>
-     For functions that are truly generic in the number of arguments (such as
-     wrappers around <varname>mkDerivation</varname>) that have some required
-     arguments, you should write them using an <literal>@</literal>-pattern:
+     For functions that are truly generic in the number of arguments (such as wrappers around <varname>mkDerivation</varname>) that have some required arguments, you should write them using an <literal>@</literal>-pattern:
 <programlisting>
 { stdenv, doCoverageAnalysis ? false, ... } @ args:
 
@@ -197,35 +184,20 @@ args.stdenv.mkDerivation (args // {
   <title>Package naming</title>
 
   <para>
-   The key words <emphasis>must</emphasis>, <emphasis>must not</emphasis>,
-   <emphasis>required</emphasis>, <emphasis>shall</emphasis>, <emphasis>shall
-   not</emphasis>, <emphasis>should</emphasis>, <emphasis>should
-   not</emphasis>, <emphasis>recommended</emphasis>, <emphasis>may</emphasis>,
-   and <emphasis>optional</emphasis> in this section are to be interpreted as
-   described in <link xlink:href="https://tools.ietf.org/html/rfc2119">RFC
-   2119</link>. Only <emphasis>emphasized</emphasis> words are to be
-   interpreted in this way.
+   The key words <emphasis>must</emphasis>, <emphasis>must not</emphasis>, <emphasis>required</emphasis>, <emphasis>shall</emphasis>, <emphasis>shall not</emphasis>, <emphasis>should</emphasis>, <emphasis>should not</emphasis>, <emphasis>recommended</emphasis>, <emphasis>may</emphasis>, and <emphasis>optional</emphasis> in this section are to be interpreted as described in <link xlink:href="https://tools.ietf.org/html/rfc2119">RFC 2119</link>. Only <emphasis>emphasized</emphasis> words are to be interpreted in this way.
   </para>
 
   <para>
-   In Nixpkgs, there are generally three different names associated with a
-   package:
+   In Nixpkgs, there are generally three different names associated with a package:
    <itemizedlist>
     <listitem>
      <para>
-      The <varname>name</varname> attribute of the derivation (excluding the
-      version part). This is what most users see, in particular when using
-      <command>nix-env</command>.
+      The <varname>name</varname> attribute of the derivation (excluding the version part). This is what most users see, in particular when using <command>nix-env</command>.
      </para>
     </listitem>
     <listitem>
      <para>
-      The variable name used for the instantiated package in
-      <filename>all-packages.nix</filename>, and when passing it as a
-      dependency to other functions. Typically this is called the
-      <emphasis>package attribute name</emphasis>. This is what Nix expression
-      authors see. It can also be used when installing using <command>nix-env
-      -iA</command>.
+      The variable name used for the instantiated package in <filename>all-packages.nix</filename>, and when passing it as a dependency to other functions. Typically this is called the <emphasis>package attribute name</emphasis>. This is what Nix expression authors see. It can also be used when installing using <command>nix-env -iA</command>.
      </para>
     </listitem>
     <listitem>
@@ -234,12 +206,7 @@ args.stdenv.mkDerivation (args // {
      </para>
     </listitem>
    </itemizedlist>
-   Most of the time, these are the same. For instance, the package
-   <literal>e2fsprogs</literal> has a <varname>name</varname> attribute
-   <literal>"e2fsprogs-<replaceable>version</replaceable>"</literal>, is bound
-   to the variable name <varname>e2fsprogs</varname> in
-   <filename>all-packages.nix</filename>, and the Nix expression is in
-   <filename>pkgs/os-specific/linux/e2fsprogs/default.nix</filename>.
+   Most of the time, these are the same. For instance, the package <literal>e2fsprogs</literal> has a <varname>name</varname> attribute <literal>"e2fsprogs-<replaceable>version</replaceable>"</literal>, is bound to the variable name <varname>e2fsprogs</varname> in <filename>all-packages.nix</filename>, and the Nix expression is in <filename>pkgs/os-specific/linux/e2fsprogs/default.nix</filename>.
   </para>
 
   <para>
@@ -247,51 +214,32 @@ args.stdenv.mkDerivation (args // {
    <itemizedlist>
     <listitem>
      <para>
-      The <literal>name</literal> attribute <emphasis>should</emphasis> be
-      identical to the upstream package name.
+      The <literal>name</literal> attribute <emphasis>should</emphasis> be identical to the upstream package name.
      </para>
     </listitem>
     <listitem>
      <para>
-      The <literal>name</literal> attribute <emphasis>must not</emphasis>
-      contain uppercase letters — e.g., <literal>"mplayer-1.0rc2"</literal>
-      instead of <literal>"MPlayer-1.0rc2"</literal>.
+      The <literal>name</literal> attribute <emphasis>must not</emphasis> contain uppercase letters — e.g., <literal>"mplayer-1.0rc2"</literal> instead of <literal>"MPlayer-1.0rc2"</literal>.
      </para>
     </listitem>
     <listitem>
      <para>
-      The version part of the <literal>name</literal> attribute
-      <emphasis>must</emphasis> start with a digit (following a dash) — e.g.,
-      <literal>"hello-0.3.1rc2"</literal>.
+      The version part of the <literal>name</literal> attribute <emphasis>must</emphasis> start with a digit (following a dash) — e.g., <literal>"hello-0.3.1rc2"</literal>.
      </para>
     </listitem>
     <listitem>
      <para>
-      If a package is not a release but a commit from a repository, then the
-      version part of the name <emphasis>must</emphasis> be the date of that
-      (fetched) commit. The date <emphasis>must</emphasis> be in
-      <literal>"YYYY-MM-DD"</literal> format. Also append
-      <literal>"unstable"</literal> to the name - e.g.,
-      <literal>"pkgname-unstable-2014-09-23"</literal>.
+      If a package is not a release but a commit from a repository, then the version part of the name <emphasis>must</emphasis> be the date of that (fetched) commit. The date <emphasis>must</emphasis> be in <literal>"YYYY-MM-DD"</literal> format. Also append <literal>"unstable"</literal> to the name - e.g., <literal>"pkgname-unstable-2014-09-23"</literal>.
      </para>
     </listitem>
     <listitem>
      <para>
-      Dashes in the package name <emphasis>should</emphasis> be preserved in
-      new variable names, rather than converted to underscores or camel cased
-      — e.g., <varname>http-parser</varname> instead of
-      <varname>http_parser</varname> or <varname>httpParser</varname>. The
-      hyphenated style is preferred in all three package names.
+      Dashes in the package name <emphasis>should</emphasis> be preserved in new variable names, rather than converted to underscores or camel cased — e.g., <varname>http-parser</varname> instead of <varname>http_parser</varname> or <varname>httpParser</varname>. The hyphenated style is preferred in all three package names.
      </para>
     </listitem>
     <listitem>
      <para>
-      If there are multiple versions of a package, this
-      <emphasis>should</emphasis> be reflected in the variable names in
-      <filename>all-packages.nix</filename>, e.g. <varname>json-c-0-9</varname>
-      and <varname>json-c-0-11</varname>. If there is an obvious “default”
-      version, make an attribute like <literal>json-c = json-c-0-9;</literal>.
-      See also <xref linkend="sec-versioning" />
+      If there are multiple versions of a package, this <emphasis>should</emphasis> be reflected in the variable names in <filename>all-packages.nix</filename>, e.g. <varname>json-c-0-9</varname> and <varname>json-c-0-11</varname>. If there is an obvious “default” version, make an attribute like <literal>json-c = json-c-0-9;</literal>. See also <xref linkend="sec-versioning" />
      </para>
     </listitem>
    </itemizedlist>
@@ -301,31 +249,18 @@ args.stdenv.mkDerivation (args // {
   <title>File naming and organisation</title>
 
   <para>
-   Names of files and directories should be in lowercase, with dashes between
-   words — not in camel case. For instance, it should be
-   <filename>all-packages.nix</filename>, not
-   <filename>allPackages.nix</filename> or
-   <filename>AllPackages.nix</filename>.
+   Names of files and directories should be in lowercase, with dashes between words — not in camel case. For instance, it should be <filename>all-packages.nix</filename>, not <filename>allPackages.nix</filename> or <filename>AllPackages.nix</filename>.
   </para>
 
   <section xml:id="sec-hierarchy">
    <title>Hierarchy</title>
 
    <para>
-    Each package should be stored in its own directory somewhere in the
-    <filename>pkgs/</filename> tree, i.e. in
-    <filename>pkgs/<replaceable>category</replaceable>/<replaceable>subcategory</replaceable>/<replaceable>...</replaceable>/<replaceable>pkgname</replaceable></filename>.
-    Below are some rules for picking the right category for a package. Many
-    packages fall under several categories; what matters is the
-    <emphasis>primary</emphasis> purpose of a package. For example, the
-    <literal>libxml2</literal> package builds both a library and some tools;
-    but it’s a library foremost, so it goes under
-    <filename>pkgs/development/libraries</filename>.
+    Each package should be stored in its own directory somewhere in the <filename>pkgs/</filename> tree, i.e. in <filename>pkgs/<replaceable>category</replaceable>/<replaceable>subcategory</replaceable>/<replaceable>...</replaceable>/<replaceable>pkgname</replaceable></filename>. Below are some rules for picking the right category for a package. Many packages fall under several categories; what matters is the <emphasis>primary</emphasis> purpose of a package. For example, the <literal>libxml2</literal> package builds both a library and some tools; but it’s a library foremost, so it goes under <filename>pkgs/development/libraries</filename>.
    </para>
 
    <para>
-    When in doubt, consider refactoring the <filename>pkgs/</filename> tree,
-    e.g. creating new categories or splitting up an existing category.
+    When in doubt, consider refactoring the <filename>pkgs/</filename> tree, e.g. creating new categories or splitting up an existing category.
    </para>
 
    <variablelist>
@@ -341,8 +276,7 @@ args.stdenv.mkDerivation (args // {
         </term>
         <listitem>
          <para>
-          <filename>development/libraries</filename> (e.g.
-          <filename>libxml2</filename>)
+          <filename>development/libraries</filename> (e.g. <filename>libxml2</filename>)
          </para>
         </listitem>
        </varlistentry>
@@ -352,8 +286,7 @@ args.stdenv.mkDerivation (args // {
         </term>
         <listitem>
          <para>
-          <filename>development/compilers</filename> (e.g.
-          <filename>gcc</filename>)
+          <filename>development/compilers</filename> (e.g. <filename>gcc</filename>)
          </para>
         </listitem>
        </varlistentry>
@@ -363,8 +296,7 @@ args.stdenv.mkDerivation (args // {
         </term>
         <listitem>
          <para>
-          <filename>development/interpreters</filename> (e.g.
-          <filename>guile</filename>)
+          <filename>development/interpreters</filename> (e.g. <filename>guile</filename>)
          </para>
         </listitem>
        </varlistentry>
@@ -380,8 +312,7 @@ args.stdenv.mkDerivation (args // {
            </term>
            <listitem>
             <para>
-             <filename>development/tools/parsing</filename> (e.g.
-             <filename>bison</filename>, <filename>flex</filename>)
+             <filename>development/tools/parsing</filename> (e.g. <filename>bison</filename>, <filename>flex</filename>)
             </para>
            </listitem>
           </varlistentry>
@@ -391,8 +322,7 @@ args.stdenv.mkDerivation (args // {
            </term>
            <listitem>
             <para>
-             <filename>development/tools/build-managers</filename> (e.g.
-             <filename>gnumake</filename>)
+             <filename>development/tools/build-managers</filename> (e.g. <filename>gnumake</filename>)
             </para>
            </listitem>
           </varlistentry>
@@ -402,8 +332,7 @@ args.stdenv.mkDerivation (args // {
            </term>
            <listitem>
             <para>
-             <filename>development/tools/misc</filename> (e.g.
-             <filename>binutils</filename>)
+             <filename>development/tools/misc</filename> (e.g. <filename>binutils</filename>)
             </para>
            </listitem>
           </varlistentry>
@@ -429,8 +358,7 @@ args.stdenv.mkDerivation (args // {
      </term>
      <listitem>
       <para>
-       (A tool is a relatively small program, especially one intended to be
-       used non-interactively.)
+       (A tool is a relatively small program, especially one intended to be used non-interactively.)
       </para>
       <variablelist>
        <varlistentry>
@@ -439,8 +367,7 @@ args.stdenv.mkDerivation (args // {
         </term>
         <listitem>
          <para>
-          <filename>tools/networking</filename> (e.g.
-          <filename>wget</filename>)
+          <filename>tools/networking</filename> (e.g. <filename>wget</filename>)
          </para>
         </listitem>
        </varlistentry>
@@ -470,8 +397,7 @@ args.stdenv.mkDerivation (args // {
         </term>
         <listitem>
          <para>
-          <filename>tools/archivers</filename> (e.g. <filename>zip</filename>,
-          <filename>tar</filename>)
+          <filename>tools/archivers</filename> (e.g. <filename>zip</filename>, <filename>tar</filename>)
          </para>
         </listitem>
        </varlistentry>
@@ -481,8 +407,7 @@ args.stdenv.mkDerivation (args // {
         </term>
         <listitem>
          <para>
-          <filename>tools/compression</filename> (e.g.
-          <filename>gzip</filename>, <filename>bzip2</filename>)
+          <filename>tools/compression</filename> (e.g. <filename>gzip</filename>, <filename>bzip2</filename>)
          </para>
         </listitem>
        </varlistentry>
@@ -492,8 +417,7 @@ args.stdenv.mkDerivation (args // {
         </term>
         <listitem>
          <para>
-          <filename>tools/security</filename> (e.g. <filename>nmap</filename>,
-          <filename>gnupg</filename>)
+          <filename>tools/security</filename> (e.g. <filename>nmap</filename>, <filename>gnupg</filename>)
          </para>
         </listitem>
        </varlistentry>
@@ -532,8 +456,7 @@ args.stdenv.mkDerivation (args // {
         </term>
         <listitem>
          <para>
-          <filename>servers/http</filename> (e.g.
-          <filename>apache-httpd</filename>)
+          <filename>servers/http</filename> (e.g. <filename>apache-httpd</filename>)
          </para>
         </listitem>
        </varlistentry>
@@ -543,8 +466,7 @@ args.stdenv.mkDerivation (args // {
         </term>
         <listitem>
          <para>
-          <filename>servers/x11</filename> (e.g. <filename>xorg</filename> —
-          this includes the client libraries and programs)
+          <filename>servers/x11</filename> (e.g. <filename>xorg</filename> — this includes the client libraries and programs)
          </para>
         </listitem>
        </varlistentry>
@@ -567,8 +489,7 @@ args.stdenv.mkDerivation (args // {
      </term>
      <listitem>
       <para>
-       <filename>desktops</filename> (e.g. <filename>kde</filename>,
-       <filename>gnome</filename>, <filename>enlightenment</filename>)
+       <filename>desktops</filename> (e.g. <filename>kde</filename>, <filename>gnome</filename>, <filename>enlightenment</filename>)
       </para>
      </listitem>
     </varlistentry>
@@ -578,8 +499,7 @@ args.stdenv.mkDerivation (args // {
      </term>
      <listitem>
       <para>
-       <filename>applications/window-managers</filename> (e.g.
-       <filename>awesome</filename>, <filename>stumpwm</filename>)
+       <filename>applications/window-managers</filename> (e.g. <filename>awesome</filename>, <filename>stumpwm</filename>)
       </para>
      </listitem>
     </varlistentry>
@@ -589,8 +509,7 @@ args.stdenv.mkDerivation (args // {
      </term>
      <listitem>
       <para>
-       A (typically large) program with a distinct user interface, primarily
-       used interactively.
+       A (typically large) program with a distinct user interface, primarily used interactively.
       </para>
       <variablelist>
        <varlistentry>
@@ -599,8 +518,7 @@ args.stdenv.mkDerivation (args // {
         </term>
         <listitem>
          <para>
-          <filename>applications/version-management</filename> (e.g.
-          <filename>subversion</filename>)
+          <filename>applications/version-management</filename> (e.g. <filename>subversion</filename>)
          </para>
         </listitem>
        </varlistentry>
@@ -610,8 +528,7 @@ args.stdenv.mkDerivation (args // {
         </term>
         <listitem>
          <para>
-          <filename>applications/video</filename> (e.g.
-          <filename>vlc</filename>)
+          <filename>applications/video</filename> (e.g. <filename>vlc</filename>)
          </para>
         </listitem>
        </varlistentry>
@@ -621,8 +538,7 @@ args.stdenv.mkDerivation (args // {
         </term>
         <listitem>
          <para>
-          <filename>applications/graphics</filename> (e.g.
-          <filename>gimp</filename>)
+          <filename>applications/graphics</filename> (e.g. <filename>gimp</filename>)
          </para>
         </listitem>
        </varlistentry>
@@ -638,8 +554,7 @@ args.stdenv.mkDerivation (args // {
            </term>
            <listitem>
             <para>
-             <filename>applications/networking/mailreaders</filename> (e.g.
-             <filename>thunderbird</filename>)
+             <filename>applications/networking/mailreaders</filename> (e.g. <filename>thunderbird</filename>)
             </para>
            </listitem>
           </varlistentry>
@@ -649,8 +564,7 @@ args.stdenv.mkDerivation (args // {
            </term>
            <listitem>
             <para>
-             <filename>applications/networking/newsreaders</filename> (e.g.
-             <filename>pan</filename>)
+             <filename>applications/networking/newsreaders</filename> (e.g. <filename>pan</filename>)
             </para>
            </listitem>
           </varlistentry>
@@ -660,8 +574,7 @@ args.stdenv.mkDerivation (args // {
            </term>
            <listitem>
             <para>
-             <filename>applications/networking/browsers</filename> (e.g.
-             <filename>firefox</filename>)
+             <filename>applications/networking/browsers</filename> (e.g. <filename>firefox</filename>)
             </para>
            </listitem>
           </varlistentry>
@@ -719,8 +632,7 @@ args.stdenv.mkDerivation (args // {
            </term>
            <listitem>
             <para>
-             <filename>data/sgml+xml/schemas/xml-dtd</filename> (e.g.
-             <filename>docbook</filename>)
+             <filename>data/sgml+xml/schemas/xml-dtd</filename> (e.g. <filename>docbook</filename>)
             </para>
            </listitem>
           </varlistentry>
@@ -733,8 +645,7 @@ args.stdenv.mkDerivation (args // {
              (Okay, these are executable...)
             </para>
             <para>
-             <filename>data/sgml+xml/stylesheets/xslt</filename> (e.g.
-             <filename>docbook-xsl</filename>)
+             <filename>data/sgml+xml/stylesheets/xslt</filename> (e.g. <filename>docbook-xsl</filename>)
             </para>
            </listitem>
           </varlistentry>
@@ -771,36 +682,15 @@ args.stdenv.mkDerivation (args // {
    <title>Versioning</title>
 
    <para>
-    Because every version of a package in Nixpkgs creates a potential
-    maintenance burden, old versions of a package should not be kept unless
-    there is a good reason to do so. For instance, Nixpkgs contains several
-    versions of GCC because other packages don’t build with the latest
-    version of GCC. Other examples are having both the latest stable and latest
-    pre-release version of a package, or to keep several major releases of an
-    application that differ significantly in functionality.
+    Because every version of a package in Nixpkgs creates a potential maintenance burden, old versions of a package should not be kept unless there is a good reason to do so. For instance, Nixpkgs contains several versions of GCC because other packages don’t build with the latest version of GCC. Other examples are having both the latest stable and latest pre-release version of a package, or to keep several major releases of an application that differ significantly in functionality.
    </para>
 
    <para>
-    If there is only one version of a package, its Nix expression should be
-    named <filename>e2fsprogs/default.nix</filename>. If there are multiple
-    versions, this should be reflected in the filename, e.g.
-    <filename>e2fsprogs/1.41.8.nix</filename> and
-    <filename>e2fsprogs/1.41.9.nix</filename>. The version in the filename
-    should leave out unnecessary detail. For instance, if we keep the latest
-    Firefox 2.0.x and 3.5.x versions in Nixpkgs, they should be named
-    <filename>firefox/2.0.nix</filename> and
-    <filename>firefox/3.5.nix</filename>, respectively (which, at a given
-    point, might contain versions <literal>2.0.0.20</literal> and
-    <literal>3.5.4</literal>). If a version requires many auxiliary files, you
-    can use a subdirectory for each version, e.g.
-    <filename>firefox/2.0/default.nix</filename> and
-    <filename>firefox/3.5/default.nix</filename>.
+    If there is only one version of a package, its Nix expression should be named <filename>e2fsprogs/default.nix</filename>. If there are multiple versions, this should be reflected in the filename, e.g. <filename>e2fsprogs/1.41.8.nix</filename> and <filename>e2fsprogs/1.41.9.nix</filename>. The version in the filename should leave out unnecessary detail. For instance, if we keep the latest Firefox 2.0.x and 3.5.x versions in Nixpkgs, they should be named <filename>firefox/2.0.nix</filename> and <filename>firefox/3.5.nix</filename>, respectively (which, at a given point, might contain versions <literal>2.0.0.20</literal> and <literal>3.5.4</literal>). If a version requires many auxiliary files, you can use a subdirectory for each version, e.g. <filename>firefox/2.0/default.nix</filename> and <filename>firefox/3.5/default.nix</filename>.
    </para>
 
    <para>
-    All versions of a package <emphasis>must</emphasis> be included in
-    <filename>all-packages.nix</filename> to make sure that they evaluate
-    correctly.
+    All versions of a package <emphasis>must</emphasis> be included in <filename>all-packages.nix</filename> to make sure that they evaluate correctly.
    </para>
   </section>
  </section>
@@ -808,25 +698,15 @@ args.stdenv.mkDerivation (args // {
   <title>Fetching Sources</title>
 
   <para>
-   There are multiple ways to fetch a package source in nixpkgs. The general
-   guideline is that you should package reproducible sources with a high degree
-   of availability. Right now there is only one fetcher which has mirroring
-   support and that is <literal>fetchurl</literal>. Note that you should also
-   prefer protocols which have a corresponding proxy environment variable.
+   There are multiple ways to fetch a package source in nixpkgs. The general guideline is that you should package reproducible sources with a high degree of availability. Right now there is only one fetcher which has mirroring support and that is <literal>fetchurl</literal>. Note that you should also prefer protocols which have a corresponding proxy environment variable.
   </para>
 
   <para>
-   You can find many source fetch helpers in
-   <literal>pkgs/build-support/fetch*</literal>.
+   You can find many source fetch helpers in <literal>pkgs/build-support/fetch*</literal>.
   </para>
 
   <para>
-   In the file <literal>pkgs/top-level/all-packages.nix</literal> you can find
-   fetch helpers, these have names on the form <literal>fetchFrom*</literal>.
-   The intention of these are to provide snapshot fetches but using the same
-   api as some of the version controlled fetchers from
-   <literal>pkgs/build-support/</literal>. As an example going from bad to
-   good:
+   In the file <literal>pkgs/top-level/all-packages.nix</literal> you can find fetch helpers, these have names on the form <literal>fetchFrom*</literal>. The intention of these are to provide snapshot fetches but using the same api as some of the version controlled fetchers from <literal>pkgs/build-support/</literal>. As an example going from bad to good:
    <itemizedlist>
     <listitem>
      <para>
@@ -863,11 +743,7 @@ src = fetchFromGitHub {
   sha256 = "1i2yxndxb6yc9l6c99pypbd92lfq5aac4klq7y2v93c9qvx2cgpc";
 }
 </programlisting>
-      Find the value to put as <literal>sha256</literal> by running
-      <literal>nix run -f '&lt;nixpkgs&gt;' nix-prefetch-github -c
-      nix-prefetch-github --rev 1f795f9f44607cc5bec70d1300150bfefcef2aae NixOS
-      nix</literal> or <literal>nix-prefetch-url --unpack
-      https://github.com/NixOS/nix/archive/1f795f9f44607cc5bec70d1300150bfefcef2aae.tar.gz</literal>.
+      Find the value to put as <literal>sha256</literal> by running <literal>nix run -f '&lt;nixpkgs&gt;' nix-prefetch-github -c nix-prefetch-github --rev 1f795f9f44607cc5bec70d1300150bfefcef2aae NixOS nix</literal> or <literal>nix-prefetch-url --unpack https://github.com/NixOS/nix/archive/1f795f9f44607cc5bec70d1300150bfefcef2aae.tar.gz</literal>.
      </para>
     </listitem>
    </itemizedlist>
@@ -883,40 +759,23 @@ src = fetchFromGitHub {
   <orderedlist>
    <listitem>
     <para>
-     Prefetch URL (with <literal>nix-prefetch-<replaceable>XXX</replaceable>
-     <replaceable>URL</replaceable></literal>, where
-     <replaceable>XXX</replaceable> is one of <literal>url</literal>,
-     <literal>git</literal>, <literal>hg</literal>, <literal>cvs</literal>,
-     <literal>bzr</literal>, <literal>svn</literal>). Hash is printed to
-     stdout.
+     Prefetch URL (with <literal>nix-prefetch-<replaceable>XXX</replaceable> <replaceable>URL</replaceable></literal>, where <replaceable>XXX</replaceable> is one of <literal>url</literal>, <literal>git</literal>, <literal>hg</literal>, <literal>cvs</literal>, <literal>bzr</literal>, <literal>svn</literal>). Hash is printed to stdout.
     </para>
    </listitem>
    <listitem>
     <para>
-     Prefetch by package source (with <literal>nix-prefetch-url
-     '&lt;nixpkgs&gt;' -A <replaceable>PACKAGE</replaceable>.src</literal>,
-     where <replaceable>PACKAGE</replaceable> is package attribute name). Hash
-     is printed to stdout.
+     Prefetch by package source (with <literal>nix-prefetch-url '&lt;nixpkgs&gt;' -A <replaceable>PACKAGE</replaceable>.src</literal>, where <replaceable>PACKAGE</replaceable> is package attribute name). Hash is printed to stdout.
     </para>
     <para>
-     This works well when you've upgraded existing package version and want to
-     find out new hash, but is useless if package can't be accessed by
-     attribute or package has multiple sources (<literal>.srcs</literal>,
-     architecture-dependent sources, etc).
+     This works well when you've upgraded existing package version and want to find out new hash, but is useless if package can't be accessed by attribute or package has multiple sources (<literal>.srcs</literal>, architecture-dependent sources, etc).
     </para>
    </listitem>
    <listitem>
     <para>
-     Upstream provided hash: use it when upstream provides
-     <literal>sha256</literal> or <literal>sha512</literal> (when upstream
-     provides <literal>md5</literal>, don't use it, compute
-     <literal>sha256</literal> instead).
+     Upstream provided hash: use it when upstream provides <literal>sha256</literal> or <literal>sha512</literal> (when upstream provides <literal>md5</literal>, don't use it, compute <literal>sha256</literal> instead).
     </para>
     <para>
-     A little nuance is that <literal>nix-prefetch-*</literal> tools produce
-     hash encoded with <literal>base32</literal>, but upstream usually provides
-     hexadecimal (<literal>base16</literal>) encoding. Fetchers understand both
-     formats. Nixpkgs does not standardize on any one format.
+     A little nuance is that <literal>nix-prefetch-*</literal> tools produce hash encoded with <literal>base32</literal>, but upstream usually provides hexadecimal (<literal>base16</literal>) encoding. Fetchers understand both formats. Nixpkgs does not standardize on any one format.
     </para>
     <para>
      You can convert between formats with nix-hash, for example:
@@ -927,28 +786,18 @@ src = fetchFromGitHub {
    </listitem>
    <listitem>
     <para>
-     Extracting hash from local source tarball can be done with
-     <literal>sha256sum</literal>. Use <literal>nix-prefetch-url
-     file:///path/to/tarball </literal> if you want base32 hash.
+     Extracting hash from local source tarball can be done with <literal>sha256sum</literal>. Use <literal>nix-prefetch-url file:///path/to/tarball </literal> if you want base32 hash.
     </para>
    </listitem>
    <listitem>
     <para>
-     Fake hash: set fake hash in package expression, perform build and extract
-     correct hash from error Nix prints.
+     Fake hash: set fake hash in package expression, perform build and extract correct hash from error Nix prints.
     </para>
     <para>
-     For package updates it is enough to change one symbol to make hash fake.
-     For new packages, you can use <literal>lib.fakeSha256</literal>,
-     <literal>lib.fakeSha512</literal> or any other fake hash.
+     For package updates it is enough to change one symbol to make hash fake. For new packages, you can use <literal>lib.fakeSha256</literal>, <literal>lib.fakeSha512</literal> or any other fake hash.
     </para>
     <para>
-     This is last resort method when reconstructing source URL is non-trivial
-     and <literal>nix-prefetch-url -A</literal> isn't applicable (for example,
-     <link xlink:href="https://github.com/NixOS/nixpkgs/blob/d2ab091dd308b99e4912b805a5eb088dd536adb9/pkgs/applications/video/kodi/default.nix#L73">
-     one of <literal>kodi</literal> dependencies</link>). The easiest way then
-     would be replace hash with a fake one and rebuild. Nix build will fail and
-     error message will contain desired hash.
+     This is last resort method when reconstructing source URL is non-trivial and <literal>nix-prefetch-url -A</literal> isn't applicable (for example, <link xlink:href="https://github.com/NixOS/nixpkgs/blob/d2ab091dd308b99e4912b805a5eb088dd536adb9/pkgs/applications/video/kodi/default.nix#L73"> one of <literal>kodi</literal> dependencies</link>). The easiest way then would be replace hash with a fake one and rebuild. Nix build will fail and error message will contain desired hash.
     </para>
     <warning>
      <para>
@@ -962,9 +811,7 @@ src = fetchFromGitHub {
    <title>Obtaining hashes securely</title>
 
    <para>
-    Let's say Man-in-the-Middle (MITM) sits close to your network. Then instead
-    of fetching source you can fetch malware, and instead of source hash you
-    get hash of malware. Here are security considerations for this scenario:
+    Let's say Man-in-the-Middle (MITM) sits close to your network. Then instead of fetching source you can fetch malware, and instead of source hash you get hash of malware. Here are security considerations for this scenario:
    </para>
 
    <itemizedlist>
@@ -975,8 +822,7 @@ src = fetchFromGitHub {
     </listitem>
     <listitem>
      <para>
-      hashes from upstream (in method 3) should be obtained via secure
-      protocol;
+      hashes from upstream (in method 3) should be obtained via secure protocol;
      </para>
     </listitem>
     <listitem>
@@ -986,12 +832,7 @@ src = fetchFromGitHub {
     </listitem>
     <listitem>
      <para>
-      <literal>https://</literal> URLs are not secure in method 5. When
-      obtaining hashes with fake hash method, TLS checks are disabled. So
-      refetch source hash from several different networks to exclude MITM
-      scenario. Alternatively, use fake hash method to make Nix error, but
-      instead of extracting hash from error, extract
-      <literal>https://</literal> URL and prefetch it with method 1.
+      <literal>https://</literal> URLs are not secure in method 5. When obtaining hashes with fake hash method, TLS checks are disabled. So refetch source hash from several different networks to exclude MITM scenario. Alternatively, use fake hash method to make Nix error, but instead of extracting hash from error, extract <literal>https://</literal> URL and prefetch it with method 1.
      </para>
     </listitem>
    </itemizedlist>
@@ -1001,8 +842,7 @@ src = fetchFromGitHub {
   <title>Patches</title>
 
   <para>
-   Patches available online should be retrieved using
-   <literal>fetchpatch</literal>.
+   Patches available online should be retrieved using <literal>fetchpatch</literal>.
   </para>
 
   <para>
@@ -1018,10 +858,7 @@ patches = [
   </para>
 
   <para>
-   Otherwise, you can add a <literal>.patch</literal> file to the
-   <literal>nixpkgs</literal> repository. In the interest of keeping our
-   maintenance burden to a minimum, only patches that are unique to
-   <literal>nixpkgs</literal> should be added in this way.
+   Otherwise, you can add a <literal>.patch</literal> file to the <literal>nixpkgs</literal> repository. In the interest of keeping our maintenance burden to a minimum, only patches that are unique to <literal>nixpkgs</literal> should be added in this way.
   </para>
 
   <para>
@@ -1031,8 +868,7 @@ patches = [ ./0001-changes.patch ];
   </para>
 
   <para>
-   If you do need to do create this sort of patch file, one way to do so is
-   with git:
+   If you do need to do create this sort of patch file, one way to do so is with git:
    <orderedlist>
     <listitem>
      <para>
@@ -1043,8 +879,7 @@ patches = [ ./0001-changes.patch ];
     </listitem>
     <listitem>
      <para>
-      If a git repository is not already present, create one and stage all of
-      the source files.
+      If a git repository is not already present, create one and stage all of the source files.
 <screen>
 <prompt>$ </prompt>git init
 <prompt>$ </prompt>git add .</screen>
@@ -1052,8 +887,7 @@ patches = [ ./0001-changes.patch ];
     </listitem>
     <listitem>
      <para>
-      Edit some files to make whatever changes need to be included in the
-      patch.
+      Edit some files to make whatever changes need to be included in the patch.
      </para>
     </listitem>
     <listitem>
diff --git a/doc/configuration.xml b/doc/configuration.xml
index b497fa4e272..cb660452d82 100644
--- a/doc/configuration.xml
+++ b/doc/configuration.xml
@@ -3,49 +3,38 @@
          xml:id="chap-packageconfig">
  <title>Global configuration</title>
  <para>
-  Nix comes with certain defaults about what packages can and cannot be
-  installed, based on a package's metadata. By default, Nix will prevent
-  installation if any of the following criteria are true:
+  Nix comes with certain defaults about what packages can and cannot be installed, based on a package's metadata. By default, Nix will prevent installation if any of the following criteria are true:
  </para>
  <itemizedlist>
   <listitem>
    <para>
-    The package is thought to be broken, and has had its
-    <literal>meta.broken</literal> set to <literal>true</literal>.
+    The package is thought to be broken, and has had its <literal>meta.broken</literal> set to <literal>true</literal>.
    </para>
   </listitem>
   <listitem>
    <para>
-    The package isn't intended to run on the given system, as none of its
-    <literal>meta.platforms</literal> match the given system.
+    The package isn't intended to run on the given system, as none of its <literal>meta.platforms</literal> match the given system.
    </para>
   </listitem>
   <listitem>
    <para>
-    The package's <literal>meta.license</literal> is set to a license which is
-    considered to be unfree.
+    The package's <literal>meta.license</literal> is set to a license which is considered to be unfree.
    </para>
   </listitem>
   <listitem>
    <para>
-    The package has known security vulnerabilities but has not or can not be
-    updated for some reason, and a list of issues has been entered in to the
-    package's <literal>meta.knownVulnerabilities</literal>.
+    The package has known security vulnerabilities but has not or can not be updated for some reason, and a list of issues has been entered in to the package's <literal>meta.knownVulnerabilities</literal>.
    </para>
   </listitem>
  </itemizedlist>
  <para>
-  Note that all this is checked during evaluation already, and the check
-  includes any package that is evaluated. In particular, all build-time
-  dependencies are checked. <literal>nix-env -qa</literal> will (attempt to)
-  hide any packages that would be refused.
+  Note that all this is checked during evaluation already, and the check includes any package that is evaluated. In particular, all build-time dependencies are checked. <literal>nix-env -qa</literal> will (attempt to) hide any packages that would be refused.
  </para>
  <para>
   Each of these criteria can be altered in the nixpkgs configuration.
  </para>
  <para>
-  The nixpkgs configuration for a NixOS system is set in the
-  <literal>configuration.nix</literal>, as in the following example:
+  The nixpkgs configuration for a NixOS system is set in the <literal>configuration.nix</literal>, as in the following example:
 <programlisting>
 {
   nixpkgs.config = {
@@ -53,13 +42,10 @@
   };
 }
 </programlisting>
-  However, this does not allow unfree software for individual users. Their
-  configurations are managed separately.
+  However, this does not allow unfree software for individual users. Their configurations are managed separately.
  </para>
  <para>
-  A user's of nixpkgs configuration is stored in a user-specific configuration
-  file located at <filename>~/.config/nixpkgs/config.nix</filename>. For
-  example:
+  A user's of nixpkgs configuration is stored in a user-specific configuration file located at <filename>~/.config/nixpkgs/config.nix</filename>. For example:
 <programlisting>
 {
   allowUnfree = true;
@@ -67,31 +53,25 @@
 </programlisting>
  </para>
  <para>
-  Note that we are not able to test or build unfree software on Hydra due to
-  policy. Most unfree licenses prohibit us from either executing or
-  distributing the software.
+  Note that we are not able to test or build unfree software on Hydra due to policy. Most unfree licenses prohibit us from either executing or distributing the software.
  </para>
  <section xml:id="sec-allow-broken">
   <title>Installing broken packages</title>
 
   <para>
-   There are two ways to try compiling a package which has been marked as
-   broken.
+   There are two ways to try compiling a package which has been marked as broken.
   </para>
 
   <itemizedlist>
    <listitem>
     <para>
-     For allowing the build of a broken package once, you can use an
-     environment variable for a single invocation of the nix tools:
+     For allowing the build of a broken package once, you can use an environment variable for a single invocation of the nix tools:
 <programlisting>$ export NIXPKGS_ALLOW_BROKEN=1</programlisting>
     </para>
    </listitem>
    <listitem>
     <para>
-     For permanently allowing broken packages to be built, you may add
-     <literal>allowBroken = true;</literal> to your user's configuration file,
-     like this:
+     For permanently allowing broken packages to be built, you may add <literal>allowBroken = true;</literal> to your user's configuration file, like this:
 <programlisting>
 {
   allowBroken = true;
@@ -105,23 +85,19 @@
   <title>Installing packages on unsupported systems</title>
 
   <para>
-   There are also two ways to try compiling a package which has been marked as
-   unsuported for the given system.
+   There are also two ways to try compiling a package which has been marked as unsuported for the given system.
   </para>
 
   <itemizedlist>
    <listitem>
     <para>
-     For allowing the build of a broken package once, you can use an
-     environment variable for a single invocation of the nix tools:
+     For allowing the build of a broken package once, you can use an environment variable for a single invocation of the nix tools:
 <programlisting>$ export NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM=1</programlisting>
     </para>
    </listitem>
    <listitem>
     <para>
-     For permanently allowing broken packages to be built, you may add
-     <literal>allowUnsupportedSystem = true;</literal> to your user's
-     configuration file, like this:
+     For permanently allowing broken packages to be built, you may add <literal>allowUnsupportedSystem = true;</literal> to your user's configuration file, like this:
 <programlisting>
 {
   allowUnsupportedSystem = true;
@@ -132,42 +108,29 @@
   </itemizedlist>
 
   <para>
-   The difference between a package being unsupported on some system and being
-   broken is admittedly a bit fuzzy. If a program <emphasis>ought</emphasis> to
-   work on a certain platform, but doesn't, the platform should be included in
-   <literal>meta.platforms</literal>, but marked as broken with e.g.
-   <literal>meta.broken = !hostPlatform.isWindows</literal>. Of course, this
-   begs the question of what "ought" means exactly. That is left to the package
-   maintainer.
+   The difference between a package being unsupported on some system and being broken is admittedly a bit fuzzy. If a program <emphasis>ought</emphasis> to work on a certain platform, but doesn't, the platform should be included in <literal>meta.platforms</literal>, but marked as broken with e.g. <literal>meta.broken = !hostPlatform.isWindows</literal>. Of course, this begs the question of what "ought" means exactly. That is left to the package maintainer.
   </para>
  </section>
  <section xml:id="sec-allow-unfree">
   <title>Installing unfree packages</title>
 
   <para>
-   There are several ways to tweak how Nix handles a package which has been
-   marked as unfree.
+   There are several ways to tweak how Nix handles a package which has been marked as unfree.
   </para>
 
   <itemizedlist>
    <listitem>
     <para>
-     To temporarily allow all unfree packages, you can use an environment
-     variable for a single invocation of the nix tools:
+     To temporarily allow all unfree packages, you can use an environment variable for a single invocation of the nix tools:
 <programlisting>$ export NIXPKGS_ALLOW_UNFREE=1</programlisting>
     </para>
    </listitem>
    <listitem>
     <para>
-     It is possible to permanently allow individual unfree packages, while
-     still blocking unfree packages by default using the
-     <literal>allowUnfreePredicate</literal> configuration option in the user
-     configuration file.
+     It is possible to permanently allow individual unfree packages, while still blocking unfree packages by default using the <literal>allowUnfreePredicate</literal> configuration option in the user configuration file.
     </para>
     <para>
-     This option is a function which accepts a package as a parameter, and
-     returns a boolean. The following example configuration accepts a package
-     and always returns false:
+     This option is a function which accepts a package as a parameter, and returns a boolean. The following example configuration accepts a package and always returns false:
 <programlisting>
 {
   allowUnfreePredicate = (pkg: false);
@@ -175,8 +138,7 @@
 </programlisting>
     </para>
     <para>
-     For a more useful example, try the following. This configuration only
-     allows unfree packages named flash player and visual studio code:
+     For a more useful example, try the following. This configuration only allows unfree packages named flash player and visual studio code:
 <programlisting>
 {
   allowUnfreePredicate = (pkg: builtins.elem
@@ -190,14 +152,10 @@
    </listitem>
    <listitem>
     <para>
-     It is also possible to whitelist and blacklist licenses that are
-     specifically acceptable or not acceptable, using
-     <literal>whitelistedLicenses</literal> and
-     <literal>blacklistedLicenses</literal>, respectively.
+     It is also possible to whitelist and blacklist licenses that are specifically acceptable or not acceptable, using <literal>whitelistedLicenses</literal> and <literal>blacklistedLicenses</literal>, respectively.
     </para>
     <para>
-     The following example configuration whitelists the licenses
-     <literal>amd</literal> and <literal>wtfpl</literal>:
+     The following example configuration whitelists the licenses <literal>amd</literal> and <literal>wtfpl</literal>:
 <programlisting>
 {
   whitelistedLicenses = with stdenv.lib.licenses; [ amd wtfpl ];
@@ -205,8 +163,7 @@
 </programlisting>
     </para>
     <para>
-     The following example configuration blacklists the <literal>gpl3</literal>
-     and <literal>agpl3</literal> licenses:
+     The following example configuration blacklists the <literal>gpl3</literal> and <literal>agpl3</literal> licenses:
 <programlisting>
 {
   blacklistedLicenses = with stdenv.lib.licenses; [ agpl3 gpl3 ];
@@ -217,37 +174,29 @@
   </itemizedlist>
 
   <para>
-   A complete list of licenses can be found in the file
-   <filename>lib/licenses.nix</filename> of the nixpkgs tree.
+   A complete list of licenses can be found in the file <filename>lib/licenses.nix</filename> of the nixpkgs tree.
   </para>
  </section>
  <section xml:id="sec-allow-insecure">
   <title>Installing insecure packages</title>
 
   <para>
-   There are several ways to tweak how Nix handles a package which has been
-   marked as insecure.
+   There are several ways to tweak how Nix handles a package which has been marked as insecure.
   </para>
 
   <itemizedlist>
    <listitem>
     <para>
-     To temporarily allow all insecure packages, you can use an environment
-     variable for a single invocation of the nix tools:
+     To temporarily allow all insecure packages, you can use an environment variable for a single invocation of the nix tools:
 <programlisting>$ export NIXPKGS_ALLOW_INSECURE=1</programlisting>
     </para>
    </listitem>
    <listitem>
     <para>
-     It is possible to permanently allow individual insecure packages, while
-     still blocking other insecure packages by default using the
-     <literal>permittedInsecurePackages</literal> configuration option in the
-     user configuration file.
+     It is possible to permanently allow individual insecure packages, while still blocking other insecure packages by default using the <literal>permittedInsecurePackages</literal> configuration option in the user configuration file.
     </para>
     <para>
-     The following example configuration permits the installation of the
-     hypothetically insecure package <literal>hello</literal>, version
-     <literal>1.2.3</literal>:
+     The following example configuration permits the installation of the hypothetically insecure package <literal>hello</literal>, version <literal>1.2.3</literal>:
 <programlisting>
 {
   permittedInsecurePackages = [
@@ -259,18 +208,13 @@
    </listitem>
    <listitem>
     <para>
-     It is also possible to create a custom policy around which insecure
-     packages to allow and deny, by overriding the
-     <literal>allowInsecurePredicate</literal> configuration option.
+     It is also possible to create a custom policy around which insecure packages to allow and deny, by overriding the <literal>allowInsecurePredicate</literal> configuration option.
     </para>
     <para>
-     The <literal>allowInsecurePredicate</literal> option is a function which
-     accepts a package and returns a boolean, much like
-     <literal>allowUnfreePredicate</literal>.
+     The <literal>allowInsecurePredicate</literal> option is a function which accepts a package and returns a boolean, much like <literal>allowUnfreePredicate</literal>.
     </para>
     <para>
-     The following configuration example only allows insecure packages with
-     very short names:
+     The following configuration example only allows insecure packages with very short names:
 <programlisting>
 {
   allowInsecurePredicate = (pkg: (builtins.stringLength (builtins.parseDrvName pkg.name).name) &lt;= 5);
@@ -278,8 +222,7 @@
 </programlisting>
     </para>
     <para>
-     Note that <literal>permittedInsecurePackages</literal> is only checked if
-     <literal>allowInsecurePredicate</literal> is not specified.
+     Note that <literal>permittedInsecurePackages</literal> is only checked if <literal>allowInsecurePredicate</literal> is not specified.
     </para>
    </listitem>
   </itemizedlist>
@@ -289,10 +232,7 @@
   <title>Modify packages via <literal>packageOverrides</literal></title>
 
   <para>
-   You can define a function called <varname>packageOverrides</varname> in your
-   local <filename>~/.config/nixpkgs/config.nix</filename> to override Nix
-   packages. It must be a function that takes pkgs as an argument and returns a
-   modified set of packages.
+   You can define a function called <varname>packageOverrides</varname> in your local <filename>~/.config/nixpkgs/config.nix</filename> to override Nix packages. It must be a function that takes pkgs as an argument and returns a modified set of packages.
 <programlisting>
 {
   packageOverrides = pkgs: rec {
@@ -309,15 +249,7 @@
    <title>Build an environment</title>
 
    <para>
-    Using <literal>packageOverrides</literal>, it is possible to manage
-    packages declaratively. This means that we can list all of our desired
-    packages within a declarative Nix expression. For example, to have
-    <literal>aspell</literal>, <literal>bc</literal>,
-    <literal>ffmpeg</literal>, <literal>coreutils</literal>,
-    <literal>gdb</literal>, <literal>nixUnstable</literal>,
-    <literal>emscripten</literal>, <literal>jq</literal>,
-    <literal>nox</literal>, and <literal>silver-searcher</literal>, we could
-    use the following in <filename>~/.config/nixpkgs/config.nix</filename>:
+    Using <literal>packageOverrides</literal>, it is possible to manage packages declaratively. This means that we can list all of our desired packages within a declarative Nix expression. For example, to have <literal>aspell</literal>, <literal>bc</literal>, <literal>ffmpeg</literal>, <literal>coreutils</literal>, <literal>gdb</literal>, <literal>nixUnstable</literal>, <literal>emscripten</literal>, <literal>jq</literal>, <literal>nox</literal>, and <literal>silver-searcher</literal>, we could use the following in <filename>~/.config/nixpkgs/config.nix</filename>:
    </para>
 
 <screen>
@@ -343,13 +275,7 @@
 </screen>
 
    <para>
-    To install it into our environment, you can just run <literal>nix-env -iA
-    nixpkgs.myPackages</literal>. If you want to load the packages to be built
-    from a working copy of <literal>nixpkgs</literal> you just run
-    <literal>nix-env -f. -iA myPackages</literal>. To explore what's been
-    installed, just look through <filename>~/.nix-profile/</filename>. You can
-    see that a lot of stuff has been installed. Some of this stuff is useful
-    some of it isn't. Let's tell Nixpkgs to only link the stuff that we want:
+    To install it into our environment, you can just run <literal>nix-env -iA nixpkgs.myPackages</literal>. If you want to load the packages to be built from a working copy of <literal>nixpkgs</literal> you just run <literal>nix-env -f. -iA myPackages</literal>. To explore what's been installed, just look through <filename>~/.nix-profile/</filename>. You can see that a lot of stuff has been installed. Some of this stuff is useful some of it isn't. Let's tell Nixpkgs to only link the stuff that we want:
    </para>
 
 <screen>
@@ -376,12 +302,7 @@
 </screen>
 
    <para>
-    <literal>pathsToLink</literal> tells Nixpkgs to only link the paths listed
-    which gets rid of the extra stuff in the profile. <filename>/bin</filename>
-    and <filename>/share</filename> are good defaults for a user environment,
-    getting rid of the clutter. If you are running on Nix on MacOS, you may
-    want to add another path as well, <filename>/Applications</filename>, that
-    makes GUI apps available.
+    <literal>pathsToLink</literal> tells Nixpkgs to only link the paths listed which gets rid of the extra stuff in the profile. <filename>/bin</filename> and <filename>/share</filename> are good defaults for a user environment, getting rid of the clutter. If you are running on Nix on MacOS, you may want to add another path as well, <filename>/Applications</filename>, that makes GUI apps available.
    </para>
   </section>
 
@@ -389,13 +310,7 @@
    <title>Getting documentation</title>
 
    <para>
-    After building that new environment, look through
-    <filename>~/.nix-profile</filename> to make sure everything is there that
-    we wanted. Discerning readers will note that some files are missing. Look
-    inside <filename>~/.nix-profile/share/man/man1/</filename> to verify this.
-    There are no man pages for any of the Nix tools! This is because some
-    packages like Nix have multiple outputs for things like documentation (see
-    section 4). Let's make Nix install those as well.
+    After building that new environment, look through <filename>~/.nix-profile</filename> to make sure everything is there that we wanted. Discerning readers will note that some files are missing. Look inside <filename>~/.nix-profile/share/man/man1/</filename> to verify this. There are no man pages for any of the Nix tools! This is because some packages like Nix have multiple outputs for things like documentation (see section 4). Let's make Nix install those as well.
    </para>
 
 <screen>
@@ -422,9 +337,7 @@
 </screen>
 
    <para>
-    This provides us with some useful documentation for using our packages.
-    However, if we actually want those manpages to be detected by man, we need
-    to set up our environment. This can also be managed within Nix expressions.
+    This provides us with some useful documentation for using our packages. However, if we actually want those manpages to be detected by man, we need to set up our environment. This can also be managed within Nix expressions.
    </para>
 
 <screen>
@@ -460,9 +373,7 @@
 </screen>
 
    <para>
-    For this to work fully, you must also have this script sourced when you are
-    logged in. Try adding something like this to your
-    <filename>~/.profile</filename> file:
+    For this to work fully, you must also have this script sourced when you are logged in. Try adding something like this to your <filename>~/.profile</filename> file:
    </para>
 
 <screen>
@@ -477,8 +388,7 @@ fi
 </screen>
 
    <para>
-    Now just run <literal>source $HOME/.profile</literal> and you can starting
-    loading man pages from your environent.
+    Now just run <literal>source $HOME/.profile</literal> and you can starting loading man pages from your environent.
    </para>
   </section>
 
@@ -486,9 +396,7 @@ fi
    <title>GNU info setup</title>
 
    <para>
-    Configuring GNU info is a little bit trickier than man pages. To work
-    correctly, info needs a database to be generated. This can be done with
-    some small modifications to our environment scripts.
+    Configuring GNU info is a little bit trickier than man pages. To work correctly, info needs a database to be generated. This can be done with some small modifications to our environment scripts.
    </para>
 
 <screen>
@@ -534,11 +442,7 @@ fi
 </screen>
 
    <para>
-    <literal>postBuild</literal> tells Nixpkgs to run a command after building
-    the environment. In this case, <literal>install-info</literal> adds the
-    installed info pages to <literal>dir</literal> which is GNU info's default
-    root node. Note that <literal>texinfoInteractive</literal> is added to the
-    environment to give the <literal>install-info</literal> command.
+    <literal>postBuild</literal> tells Nixpkgs to run a command after building the environment. In this case, <literal>install-info</literal> adds the installed info pages to <literal>dir</literal> which is GNU info's default root node. Note that <literal>texinfoInteractive</literal> is added to the environment to give the <literal>install-info</literal> command.
    </para>
   </section>
  </section>
diff --git a/doc/contributing.xml b/doc/contributing.xml
index 523c1c9c8f0..b0266043775 100644
--- a/doc/contributing.xml
+++ b/doc/contributing.xml
@@ -3,10 +3,8 @@
          xml:id="chap-contributing">
  <title>Contributing to this documentation</title>
  <para>
-  The DocBook sources of the Nixpkgs manual are in the
-  <filename
-xlink:href="https://github.com/NixOS/nixpkgs/tree/master/doc">doc</filename>
-  subdirectory of the Nixpkgs repository.
+  The DocBook sources of the Nixpkgs manual are in the <filename
+xlink:href="https://github.com/NixOS/nixpkgs/tree/master/doc">doc</filename> subdirectory of the Nixpkgs repository.
  </para>
  <para>
   You can quickly check your edits with <command>make</command>:
@@ -17,19 +15,16 @@ xlink:href="https://github.com/NixOS/nixpkgs/tree/master/doc">doc</filename>
 <prompt>[nix-shell]$ </prompt>make
 </screen>
  <para>
-  If you experience problems, run <command>make debug</command> to help
-  understand the docbook errors.
+  If you experience problems, run <command>make debug</command> to help understand the docbook errors.
  </para>
  <para>
-  After making modifications to the manual, it's important to build it before
-  committing. You can do that as follows:
+  After making modifications to the manual, it's important to build it before committing. You can do that as follows:
 <screen>
 <prompt>$ </prompt>cd /path/to/nixpkgs/doc
 <prompt>$ </prompt>nix-shell
 <prompt>[nix-shell]$ </prompt>make clean
 <prompt>[nix-shell]$ </prompt>nix-build .
 </screen>
-  If the build succeeds, the manual will be in
-  <filename>./result/share/doc/nixpkgs/manual.html</filename>.
+  If the build succeeds, the manual will be in <filename>./result/share/doc/nixpkgs/manual.html</filename>.
  </para>
 </chapter>
diff --git a/doc/cross-compilation.xml b/doc/cross-compilation.xml
index d212706e171..f496fa3f896 100644
--- a/doc/cross-compilation.xml
+++ b/doc/cross-compilation.xml
@@ -6,25 +6,11 @@
   <title>Introduction</title>
 
   <para>
-   "Cross-compilation" means compiling a program on one machine for another
-   type of machine. For example, a typical use of cross-compilation is to
-   compile programs for embedded devices. These devices often don't have the
-   computing power and memory to compile their own programs. One might think
-   that cross-compilation is a fairly niche concern. However, there are
-   significant advantages to rigorously distinguishing between build-time and
-   run-time environments! Significant, because the benefits apply even when one
-   is developing and deploying on the same machine. Nixpkgs is increasingly
-   adopting the opinion that packages should be written with cross-compilation
-   in mind, and nixpkgs should evaluate in a similar way (by minimizing
-   cross-compilation-specific special cases) whether or not one is
-   cross-compiling.
+   "Cross-compilation" means compiling a program on one machine for another type of machine. For example, a typical use of cross-compilation is to compile programs for embedded devices. These devices often don't have the computing power and memory to compile their own programs. One might think that cross-compilation is a fairly niche concern. However, there are significant advantages to rigorously distinguishing between build-time and run-time environments! Significant, because the benefits apply even when one is developing and deploying on the same machine. Nixpkgs is increasingly adopting the opinion that packages should be written with cross-compilation in mind, and nixpkgs should evaluate in a similar way (by minimizing cross-compilation-specific special cases) whether or not one is cross-compiling.
   </para>
 
   <para>
-   This chapter will be organized in three parts. First, it will describe the
-   basics of how to package software in a way that supports cross-compilation.
-   Second, it will describe how to use Nixpkgs when cross-compiling. Third, it
-   will describe the internal infrastructure supporting cross-compilation.
+   This chapter will be organized in three parts. First, it will describe the basics of how to package software in a way that supports cross-compilation. Second, it will describe how to use Nixpkgs when cross-compiling. Third, it will describe the internal infrastructure supporting cross-compilation.
   </para>
  </section>
 <!--============================================================-->
@@ -35,24 +21,12 @@
    <title>Platform parameters</title>
 
    <para>
-    Nixpkgs follows the
-    <link
-     xlink:href="https://gcc.gnu.org/onlinedocs/gccint/Configure-Terms.html">conventions
-    of GNU autoconf</link>. We distinguish between 3 types of platforms when
-    building a derivation: <wordasword>build</wordasword>,
-    <wordasword>host</wordasword>, and <wordasword>target</wordasword>. In
-    summary, <wordasword>build</wordasword> is the platform on which a package
-    is being built, <wordasword>host</wordasword> is the platform on which it
-    will run. The third attribute, <wordasword>target</wordasword>, is relevant
-    only for certain specific compilers and build tools.
+    Nixpkgs follows the <link
+     xlink:href="https://gcc.gnu.org/onlinedocs/gccint/Configure-Terms.html">conventions of GNU autoconf</link>. We distinguish between 3 types of platforms when building a derivation: <wordasword>build</wordasword>, <wordasword>host</wordasword>, and <wordasword>target</wordasword>. In summary, <wordasword>build</wordasword> is the platform on which a package is being built, <wordasword>host</wordasword> is the platform on which it will run. The third attribute, <wordasword>target</wordasword>, is relevant only for certain specific compilers and build tools.
    </para>
 
    <para>
-    In Nixpkgs, these three platforms are defined as attribute sets under the
-    names <literal>buildPlatform</literal>, <literal>hostPlatform</literal>,
-    and <literal>targetPlatform</literal>. They are always defined as
-    attributes in the standard environment. That means one can access them
-    like:
+    In Nixpkgs, these three platforms are defined as attribute sets under the names <literal>buildPlatform</literal>, <literal>hostPlatform</literal>, and <literal>targetPlatform</literal>. They are always defined as attributes in the standard environment. That means one can access them like:
 <programlisting>{ stdenv, fooDep, barDep, .. }: ...stdenv.buildPlatform...</programlisting>
     .
    </para>
@@ -64,9 +38,7 @@
      </term>
      <listitem>
       <para>
-       The "build platform" is the platform on which a package is built. Once
-       someone has a built package, or pre-built binary package, the build
-       platform should not matter and can be ignored.
+       The "build platform" is the platform on which a package is built. Once someone has a built package, or pre-built binary package, the build platform should not matter and can be ignored.
       </para>
      </listitem>
     </varlistentry>
@@ -76,9 +48,7 @@
      </term>
      <listitem>
       <para>
-       The "host platform" is the platform on which a package will be run. This
-       is the simplest platform to understand, but also the one with the worst
-       name.
+       The "host platform" is the platform on which a package will be run. This is the simplest platform to understand, but also the one with the worst name.
       </para>
      </listitem>
     </varlistentry>
@@ -88,44 +58,23 @@
      </term>
      <listitem>
       <para>
-       The "target platform" attribute is, unlike the other two attributes, not
-       actually fundamental to the process of building software. Instead, it is
-       only relevant for compatibility with building certain specific compilers
-       and build tools. It can be safely ignored for all other packages.
+       The "target platform" attribute is, unlike the other two attributes, not actually fundamental to the process of building software. Instead, it is only relevant for compatibility with building certain specific compilers and build tools. It can be safely ignored for all other packages.
       </para>
       <para>
-       The build process of certain compilers is written in such a way that the
-       compiler resulting from a single build can itself only produce binaries
-       for a single platform. The task of specifying this single "target
-       platform" is thus pushed to build time of the compiler. The root cause
-       of this is that the compiler (which will be run on the host) and the
-       standard library/runtime (which will be run on the target) are built by
-       a single build process.
+       The build process of certain compilers is written in such a way that the compiler resulting from a single build can itself only produce binaries for a single platform. The task of specifying this single "target platform" is thus pushed to build time of the compiler. The root cause of this is that the compiler (which will be run on the host) and the standard library/runtime (which will be run on the target) are built by a single build process.
       </para>
       <para>
-       There is no fundamental need to think about a single target ahead of
-       time like this. If the tool supports modular or pluggable backends, both
-       the need to specify the target at build time and the constraint of
-       having only a single target disappear. An example of such a tool is
-       LLVM.
+       There is no fundamental need to think about a single target ahead of time like this. If the tool supports modular or pluggable backends, both the need to specify the target at build time and the constraint of having only a single target disappear. An example of such a tool is LLVM.
       </para>
       <para>
-       Although the existence of a "target platfom" is arguably a historical
-       mistake, it is a common one: examples of tools that suffer from it are
-       GCC, Binutils, GHC and Autoconf. Nixpkgs tries to avoid sharing in the
-       mistake where possible. Still, because the concept of a target platform
-       is so ingrained, it is best to support it as is.
+       Although the existence of a "target platfom" is arguably a historical mistake, it is a common one: examples of tools that suffer from it are GCC, Binutils, GHC and Autoconf. Nixpkgs tries to avoid sharing in the mistake where possible. Still, because the concept of a target platform is so ingrained, it is best to support it as is.
       </para>
      </listitem>
     </varlistentry>
    </variablelist>
 
    <para>
-    The exact schema these fields follow is a bit ill-defined due to a long and
-    convoluted evolution, but this is slowly being cleaned up. You can see
-    examples of ones used in practice in
-    <literal>lib.systems.examples</literal>; note how they are not all very
-    consistent. For now, here are few fields can count on them containing:
+    The exact schema these fields follow is a bit ill-defined due to a long and convoluted evolution, but this is slowly being cleaned up. You can see examples of ones used in practice in <literal>lib.systems.examples</literal>; note how they are not all very consistent. For now, here are few fields can count on them containing:
    </para>
 
    <variablelist>
@@ -135,13 +84,7 @@
      </term>
      <listitem>
       <para>
-       This is a two-component shorthand for the platform. Examples of this
-       would be "x86_64-darwin" and "i686-linux"; see
-       <literal>lib.systems.doubles</literal> for more. The first component
-       corresponds to the CPU architecture of the platform and the second to
-       the operating system of the platform (<literal>[cpu]-[os]</literal>).
-       This format has built-in support in Nix, such as the
-       <varname>builtins.currentSystem</varname> impure string.
+       This is a two-component shorthand for the platform. Examples of this would be "x86_64-darwin" and "i686-linux"; see <literal>lib.systems.doubles</literal> for more. The first component corresponds to the CPU architecture of the platform and the second to the operating system of the platform (<literal>[cpu]-[os]</literal>). This format has built-in support in Nix, such as the <varname>builtins.currentSystem</varname> impure string.
       </para>
      </listitem>
     </varlistentry>
@@ -151,15 +94,7 @@
      </term>
      <listitem>
       <para>
-       This is a 3- or 4- component shorthand for the platform. Examples of
-       this would be <literal>x86_64-unknown-linux-gnu</literal> and
-       <literal>aarch64-apple-darwin14</literal>. This is a standard format
-       called the "LLVM target triple", as they are pioneered by LLVM. In the
-       4-part form, this corresponds to
-       <literal>[cpu]-[vendor]-[os]-[abi]</literal>. This format is strictly
-       more informative than the "Nix host double", as the previous format
-       could analogously be termed. This needs a better name than
-       <varname>config</varname>!
+       This is a 3- or 4- component shorthand for the platform. Examples of this would be <literal>x86_64-unknown-linux-gnu</literal> and <literal>aarch64-apple-darwin14</literal>. This is a standard format called the "LLVM target triple", as they are pioneered by LLVM. In the 4-part form, this corresponds to <literal>[cpu]-[vendor]-[os]-[abi]</literal>. This format is strictly more informative than the "Nix host double", as the previous format could analogously be termed. This needs a better name than <varname>config</varname>!
       </para>
      </listitem>
     </varlistentry>
@@ -169,10 +104,7 @@
      </term>
      <listitem>
       <para>
-       This is a Nix representation of a parsed LLVM target triple with
-       white-listed components. This can be specified directly, or actually
-       parsed from the <varname>config</varname>. See
-       <literal>lib.systems.parse</literal> for the exact representation.
+       This is a Nix representation of a parsed LLVM target triple with white-listed components. This can be specified directly, or actually parsed from the <varname>config</varname>. See <literal>lib.systems.parse</literal> for the exact representation.
       </para>
      </listitem>
     </varlistentry>
@@ -182,10 +114,7 @@
      </term>
      <listitem>
       <para>
-       This is a string identifying the standard C library used. Valid
-       identifiers include "glibc" for GNU libc, "libSystem" for Darwin's
-       Libsystem, and "uclibc" for µClibc. It should probably be refactored to
-       use the module system, like <varname>parse</varname>.
+       This is a string identifying the standard C library used. Valid identifiers include "glibc" for GNU libc, "libSystem" for Darwin's Libsystem, and "uclibc" for µClibc. It should probably be refactored to use the module system, like <varname>parse</varname>.
       </para>
      </listitem>
     </varlistentry>
@@ -195,10 +124,7 @@
      </term>
      <listitem>
       <para>
-       These predicates are defined in <literal>lib.systems.inspect</literal>,
-       and slapped onto every platform. They are superior to the ones in
-       <varname>stdenv</varname> as they force the user to be explicit about
-       which platform they are inspecting. Please use these instead of those.
+       These predicates are defined in <literal>lib.systems.inspect</literal>, and slapped onto every platform. They are superior to the ones in <varname>stdenv</varname> as they force the user to be explicit about which platform they are inspecting. Please use these instead of those.
       </para>
      </listitem>
     </varlistentry>
@@ -208,11 +134,7 @@
      </term>
      <listitem>
       <para>
-       This is, quite frankly, a dumping ground of ad-hoc settings (it's an
-       attribute set). See <literal>lib.systems.platforms</literal> for
-       examples—there's hopefully one in there that will work verbatim for
-       each platform that is working. Please help us triage these flags and
-       give them better homes!
+       This is, quite frankly, a dumping ground of ad-hoc settings (it's an attribute set). See <literal>lib.systems.platforms</literal> for examples—there's hopefully one in there that will work verbatim for each platform that is working. Please help us triage these flags and give them better homes!
       </para>
      </listitem>
     </varlistentry>
@@ -224,62 +146,33 @@
 
    <note>
     <para>
-     This is a rather philosophical description that isn't very
-     Nixpkgs-specific. For an overview of all the relevant attributes given to
-     <varname>mkDerivation</varname>, see
-     <xref
-     linkend="ssec-stdenv-dependencies"/>. For a description of how
-     everything is implemented, see
-     <xref linkend="ssec-cross-dependency-implementation" />.
+     This is a rather philosophical description that isn't very Nixpkgs-specific. For an overview of all the relevant attributes given to <varname>mkDerivation</varname>, see <xref
+     linkend="ssec-stdenv-dependencies"/>. For a description of how everything is implemented, see <xref linkend="ssec-cross-dependency-implementation" />.
     </para>
    </note>
 
    <para>
-    In this section we explore the relationship between both runtime and
-    build-time dependencies and the 3 Autoconf platforms.
+    In this section we explore the relationship between both runtime and build-time dependencies and the 3 Autoconf platforms.
    </para>
 
    <para>
-    A run time dependency between two packages requires that their host
-    platforms match. This is directly implied by the meaning of "host platform"
-    and "runtime dependency": The package dependency exists while both packages
-    are running on a single host platform.
+    A run time dependency between two packages requires that their host platforms match. This is directly implied by the meaning of "host platform" and "runtime dependency": The package dependency exists while both packages are running on a single host platform.
    </para>
 
    <para>
-    A build time dependency, however, has a shift in platforms between the
-    depending package and the depended-on package. "build time dependency"
-    means that to build the depending package we need to be able to run the
-    depended-on's package. The depending package's build platform is therefore
-    equal to the depended-on package's host platform.
+    A build time dependency, however, has a shift in platforms between the depending package and the depended-on package. "build time dependency" means that to build the depending package we need to be able to run the depended-on's package. The depending package's build platform is therefore equal to the depended-on package's host platform.
    </para>
 
    <para>
-    If both the dependency and depending packages aren't compilers or other
-    machine-code-producing tools, we're done. And indeed
-    <varname>buildInputs</varname> and <varname>nativeBuildInputs</varname>
-    have covered these simpler build-time and run-time (respectively) changes
-    for many years. But if the dependency does produce machine code, we might
-    need to worry about its target platform too. In principle, that target
-    platform might be any of the depending package's build, host, or target
-    platforms, but we prohibit dependencies from a "later" platform to an
-    earlier platform to limit confusion because we've never seen a legitimate
-    use for them.
+    If both the dependency and depending packages aren't compilers or other machine-code-producing tools, we're done. And indeed <varname>buildInputs</varname> and <varname>nativeBuildInputs</varname> have covered these simpler build-time and run-time (respectively) changes for many years. But if the dependency does produce machine code, we might need to worry about its target platform too. In principle, that target platform might be any of the depending package's build, host, or target platforms, but we prohibit dependencies from a "later" platform to an earlier platform to limit confusion because we've never seen a legitimate use for them.
    </para>
 
    <para>
-    Finally, if the depending package is a compiler or other
-    machine-code-producing tool, it might need dependencies that run at "emit
-    time". This is for compilers that (regrettably) insist on being built
-    together with their source langauges' standard libraries. Assuming build !=
-    host != target, a run-time dependency of the standard library cannot be run
-    at the compiler's build time or run time, but only at the run time of code
-    emitted by the compiler.
+    Finally, if the depending package is a compiler or other machine-code-producing tool, it might need dependencies that run at "emit time". This is for compilers that (regrettably) insist on being built together with their source langauges' standard libraries. Assuming build != host != target, a run-time dependency of the standard library cannot be run at the compiler's build time or run time, but only at the run time of code emitted by the compiler.
    </para>
 
    <para>
-    Putting this all together, that means we have dependencies in the form
-    "host → target", in at most the following six combinations:
+    Putting this all together, that means we have dependencies in the form "host → target", in at most the following six combinations:
     <table>
      <caption>Possible dependency types</caption>
      <thead>
@@ -318,16 +211,7 @@
    </para>
 
    <para>
-    Some examples will make this table clearer. Suppose there's some package
-    that is being built with a <literal>(build, host, target)</literal>
-    platform triple of <literal>(foo, bar, baz)</literal>. If it has a
-    build-time library dependency, that would be a "host → build" dependency
-    with a triple of <literal>(foo, foo, *)</literal> (the target platform is
-    irrelevant). If it needs a compiler to be built, that would be a "build →
-    host" dependency with a triple of <literal>(foo, foo, *)</literal> (the
-    target platform is irrelevant). That compiler, would be built with another
-    compiler, also "build → host" dependency, with a triple of <literal>(foo,
-    foo, foo)</literal>.
+    Some examples will make this table clearer. Suppose there's some package that is being built with a <literal>(build, host, target)</literal> platform triple of <literal>(foo, bar, baz)</literal>. If it has a build-time library dependency, that would be a "host → build" dependency with a triple of <literal>(foo, foo, *)</literal> (the target platform is irrelevant). If it needs a compiler to be built, that would be a "build → host" dependency with a triple of <literal>(foo, foo, *)</literal> (the target platform is irrelevant). That compiler, would be built with another compiler, also "build → host" dependency, with a triple of <literal>(foo, foo, foo)</literal>.
    </para>
   </section>
 
@@ -335,20 +219,14 @@
    <title>Cross packaging cookbook</title>
 
    <para>
-    Some frequently encountered problems when packaging for cross-compilation
-    should be answered here. Ideally, the information above is exhaustive, so
-    this section cannot provide any new information, but it is ludicrous and
-    cruel to expect everyone to spend effort working through the interaction of
-    many features just to figure out the same answer to the same common
-    problem. Feel free to add to this list!
+    Some frequently encountered problems when packaging for cross-compilation should be answered here. Ideally, the information above is exhaustive, so this section cannot provide any new information, but it is ludicrous and cruel to expect everyone to spend effort working through the interaction of many features just to figure out the same answer to the same common problem. Feel free to add to this list!
    </para>
 
    <qandaset>
     <qandaentry xml:id="cross-qa-build-c-program-in-build-environment">
      <question>
       <para>
-       What if my package's build system needs to build a C program to be run
-       under the build environment?
+       What if my package's build system needs to build a C program to be run under the build environment?
       </para>
      </question>
      <answer>
@@ -366,11 +244,7 @@
      </question>
      <answer>
       <para>
-       Many packages assume that an unprefixed <command>ar</command> is
-       available, but Nix doesn't provide one. It only provides a prefixed one,
-       just as it only does for all the other binutils programs. It may be
-       necessary to patch the package to fix the build system to use a prefixed
-       `ar`.
+       Many packages assume that an unprefixed <command>ar</command> is available, but Nix doesn't provide one. It only provides a prefixed one, just as it only does for all the other binutils programs. It may be necessary to patch the package to fix the build system to use a prefixed `ar`.
       </para>
      </answer>
     </qandaentry>
@@ -395,82 +269,32 @@
   <title>Cross-building packages</title>
 
   <para>
-   Nixpkgs can be instantiated with <varname>localSystem</varname> alone, in
-   which case there is no cross-compiling and everything is built by and for
-   that system, or also with <varname>crossSystem</varname>, in which case
-   packages run on the latter, but all building happens on the former. Both
-   parameters take the same schema as the 3 (build, host, and target) platforms
-   defined in the previous section. As mentioned above,
-   <literal>lib.systems.examples</literal> has some platforms which are used as
-   arguments for these parameters in practice. You can use them
-   programmatically, or on the command line:
+   Nixpkgs can be instantiated with <varname>localSystem</varname> alone, in which case there is no cross-compiling and everything is built by and for that system, or also with <varname>crossSystem</varname>, in which case packages run on the latter, but all building happens on the former. Both parameters take the same schema as the 3 (build, host, and target) platforms defined in the previous section. As mentioned above, <literal>lib.systems.examples</literal> has some platforms which are used as arguments for these parameters in practice. You can use them programmatically, or on the command line:
 <programlisting>
 nix-build &lt;nixpkgs&gt; --arg crossSystem '(import &lt;nixpkgs/lib&gt;).systems.examples.fooBarBaz' -A whatever</programlisting>
   </para>
 
   <note>
    <para>
-    Eventually we would like to make these platform examples an unnecessary
-    convenience so that
+    Eventually we would like to make these platform examples an unnecessary convenience so that
 <programlisting>
 nix-build &lt;nixpkgs&gt; --arg crossSystem '{ config = "&lt;arch&gt;-&lt;os&gt;-&lt;vendor&gt;-&lt;abi&gt;"; }' -A whatever</programlisting>
-    works in the vast majority of cases. The problem today is dependencies on
-    other sorts of configuration which aren't given proper defaults. We rely on
-    the examples to crudely to set those configuration parameters in some
-    vaguely sane manner on the users behalf. Issue
-    <link xlink:href="https://github.com/NixOS/nixpkgs/issues/34274">#34274</link>
-    tracks this inconvenience along with its root cause in crufty configuration
-    options.
+    works in the vast majority of cases. The problem today is dependencies on other sorts of configuration which aren't given proper defaults. We rely on the examples to crudely to set those configuration parameters in some vaguely sane manner on the users behalf. Issue <link xlink:href="https://github.com/NixOS/nixpkgs/issues/34274">#34274</link> tracks this inconvenience along with its root cause in crufty configuration options.
    </para>
   </note>
 
   <para>
-   While one is free to pass both parameters in full, there's a lot of logic to
-   fill in missing fields. As discussed in the previous section, only one of
-   <varname>system</varname>, <varname>config</varname>, and
-   <varname>parsed</varname> is needed to infer the other two. Additionally,
-   <varname>libc</varname> will be inferred from <varname>parse</varname>.
-   Finally, <literal>localSystem.system</literal> is also
-   <emphasis>impurely</emphasis> inferred based on the platform evaluation
-   occurs. This means it is often not necessary to pass
-   <varname>localSystem</varname> at all, as in the command-line example in the
-   previous paragraph.
+   While one is free to pass both parameters in full, there's a lot of logic to fill in missing fields. As discussed in the previous section, only one of <varname>system</varname>, <varname>config</varname>, and <varname>parsed</varname> is needed to infer the other two. Additionally, <varname>libc</varname> will be inferred from <varname>parse</varname>. Finally, <literal>localSystem.system</literal> is also <emphasis>impurely</emphasis> inferred based on the platform evaluation occurs. This means it is often not necessary to pass <varname>localSystem</varname> at all, as in the command-line example in the previous paragraph.
   </para>
 
   <note>
    <para>
-    Many sources (manual, wiki, etc) probably mention passing
-    <varname>system</varname>, <varname>platform</varname>, along with the
-    optional <varname>crossSystem</varname> to nixpkgs: <literal>import
-    &lt;nixpkgs&gt; { system = ..; platform = ..; crossSystem = ..;
-    }</literal>. Passing those two instead of <varname>localSystem</varname> is
-    still supported for compatibility, but is discouraged. Indeed, much of the
-    inference we do for these parameters is motivated by compatibility as much
-    as convenience.
+    Many sources (manual, wiki, etc) probably mention passing <varname>system</varname>, <varname>platform</varname>, along with the optional <varname>crossSystem</varname> to nixpkgs: <literal>import &lt;nixpkgs&gt; { system = ..; platform = ..; crossSystem = ..; }</literal>. Passing those two instead of <varname>localSystem</varname> is still supported for compatibility, but is discouraged. Indeed, much of the inference we do for these parameters is motivated by compatibility as much as convenience.
    </para>
   </note>
 
   <para>
-   One would think that <varname>localSystem</varname> and
-   <varname>crossSystem</varname> overlap horribly with the three
-   <varname>*Platforms</varname> (<varname>buildPlatform</varname>,
-   <varname>hostPlatform,</varname> and <varname>targetPlatform</varname>; see
-   <varname>stage.nix</varname> or the manual). Actually, those identifiers are
-   purposefully not used here to draw a subtle but important distinction: While
-   the granularity of having 3 platforms is necessary to properly *build*
-   packages, it is overkill for specifying the user's *intent* when making a
-   build plan or package set. A simple "build vs deploy" dichotomy is adequate:
-   the sliding window principle described in the previous section shows how to
-   interpolate between the these two "end points" to get the 3 platform triple
-   for each bootstrapping stage. That means for any package a given package
-   set, even those not bound on the top level but only reachable via
-   dependencies or <varname>buildPackages</varname>, the three platforms will
-   be defined as one of <varname>localSystem</varname> or
-   <varname>crossSystem</varname>, with the former replacing the latter as one
-   traverses build-time dependencies. A last simple difference is that
-   <varname>crossSystem</varname> should be null when one doesn't want to
-   cross-compile, while the <varname>*Platform</varname>s are always non-null.
-   <varname>localSystem</varname> is always non-null.
+   One would think that <varname>localSystem</varname> and <varname>crossSystem</varname> overlap horribly with the three <varname>*Platforms</varname> (<varname>buildPlatform</varname>, <varname>hostPlatform,</varname> and <varname>targetPlatform</varname>; see <varname>stage.nix</varname> or the manual). Actually, those identifiers are purposefully not used here to draw a subtle but important distinction: While the granularity of having 3 platforms is necessary to properly *build* packages, it is overkill for specifying the user's *intent* when making a build plan or package set. A simple "build vs deploy" dichotomy is adequate: the sliding window principle described in the previous section shows how to interpolate between the these two "end points" to get the 3 platform triple for each bootstrapping stage. That means for any package a given package set, even those not bound on the top level but only reachable via dependencies or <varname>buildPackages</varname>, the three platforms will be defined as one of <varname>localSystem</varname> or <varname>crossSystem</varname>, with the former replacing the latter as one traverses build-time dependencies. A last simple difference is that <varname>crossSystem</varname> should be null when one doesn't want to cross-compile, while the <varname>*Platform</varname>s are always non-null. <varname>localSystem</varname> is always non-null.
   </para>
  </section>
 <!--============================================================-->
@@ -481,61 +305,20 @@ nix-build &lt;nixpkgs&gt; --arg crossSystem '{ config = "&lt;arch&gt;-&lt;os&gt;
    <title>Implementation of dependencies</title>
 
    <para>
-    The categorizes of dependencies developed in
-    <xref
-    linkend="ssec-cross-dependency-categorization"/> are specified as
-    lists of derivations given to <varname>mkDerivation</varname>, as
-    documented in <xref linkend="ssec-stdenv-dependencies"/>. In short, each
-    list of dependencies for "host → target" of "foo → bar" is called
-    <varname>depsFooBar</varname>, with exceptions for backwards compatibility
-    that <varname>depsBuildHost</varname> is instead called
-    <varname>nativeBuildInputs</varname> and <varname>depsHostTarget</varname>
-    is instead called <varname>buildInputs</varname>. Nixpkgs is now structured
-    so that each <varname>depsFooBar</varname> is automatically taken from
-    <varname>pkgsFooBar</varname>. (These <varname>pkgsFooBar</varname>s are
-    quite new, so there is no special case for
-    <varname>nativeBuildInputs</varname> and <varname>buildInputs</varname>.)
-    For example, <varname>pkgsBuildHost.gcc</varname> should be used at
-    build-time, while <varname>pkgsHostTarget.gcc</varname> should be used at
-    run-time.
+    The categorizes of dependencies developed in <xref
+    linkend="ssec-cross-dependency-categorization"/> are specified as lists of derivations given to <varname>mkDerivation</varname>, as documented in <xref linkend="ssec-stdenv-dependencies"/>. In short, each list of dependencies for "host → target" of "foo → bar" is called <varname>depsFooBar</varname>, with exceptions for backwards compatibility that <varname>depsBuildHost</varname> is instead called <varname>nativeBuildInputs</varname> and <varname>depsHostTarget</varname> is instead called <varname>buildInputs</varname>. Nixpkgs is now structured so that each <varname>depsFooBar</varname> is automatically taken from <varname>pkgsFooBar</varname>. (These <varname>pkgsFooBar</varname>s are quite new, so there is no special case for <varname>nativeBuildInputs</varname> and <varname>buildInputs</varname>.) For example, <varname>pkgsBuildHost.gcc</varname> should be used at build-time, while <varname>pkgsHostTarget.gcc</varname> should be used at run-time.
    </para>
 
    <para>
-    Now, for most of Nixpkgs's history, there were no
-    <varname>pkgsFooBar</varname> attributes, and most packages have not been
-    refactored to use it explicitly. Prior to those, there were just
-    <varname>buildPackages</varname>, <varname>pkgs</varname>, and
-    <varname>targetPackages</varname>. Those are now redefined as aliases to
-    <varname>pkgsBuildHost</varname>, <varname>pkgsHostTarget</varname>, and
-    <varname>pkgsTargetTarget</varname>. It is acceptable, even recommended, to
-    use them for libraries to show that the host platform is irrelevant.
+    Now, for most of Nixpkgs's history, there were no <varname>pkgsFooBar</varname> attributes, and most packages have not been refactored to use it explicitly. Prior to those, there were just <varname>buildPackages</varname>, <varname>pkgs</varname>, and <varname>targetPackages</varname>. Those are now redefined as aliases to <varname>pkgsBuildHost</varname>, <varname>pkgsHostTarget</varname>, and <varname>pkgsTargetTarget</varname>. It is acceptable, even recommended, to use them for libraries to show that the host platform is irrelevant.
    </para>
 
    <para>
-    But before that, there was just <varname>pkgs</varname>, even though both
-    <varname>buildInputs</varname> and <varname>nativeBuildInputs</varname>
-    existed. [Cross barely worked, and those were implemented with some hacks
-    on <varname>mkDerivation</varname> to override dependencies.] What this
-    means is the vast majority of packages do not use any explicit package set
-    to populate their dependencies, just using whatever
-    <varname>callPackage</varname> gives them even if they do correctly sort
-    their dependencies into the multiple lists described above. And indeed,
-    asking that users both sort their dependencies, <emphasis>and</emphasis>
-    take them from the right attribute set, is both too onerous and redundant,
-    so the recommended approach (for now) is to continue just categorizing by
-    list and not using an explicit package set.
+    But before that, there was just <varname>pkgs</varname>, even though both <varname>buildInputs</varname> and <varname>nativeBuildInputs</varname> existed. [Cross barely worked, and those were implemented with some hacks on <varname>mkDerivation</varname> to override dependencies.] What this means is the vast majority of packages do not use any explicit package set to populate their dependencies, just using whatever <varname>callPackage</varname> gives them even if they do correctly sort their dependencies into the multiple lists described above. And indeed, asking that users both sort their dependencies, <emphasis>and</emphasis> take them from the right attribute set, is both too onerous and redundant, so the recommended approach (for now) is to continue just categorizing by list and not using an explicit package set.
    </para>
 
    <para>
-    To make this work, we "splice" together the six
-    <varname>pkgsFooBar</varname> package sets and have
-    <varname>callPackage</varname> actually take its arguments from that. This
-    is currently implemented in <filename>pkgs/top-level/splice.nix</filename>.
-    <varname>mkDerivation</varname> then, for each dependency attribute, pulls
-    the right derivation out from the splice. This splicing can be skipped when
-    not cross-compiling as the package sets are the same, but still is a bit
-    slow for cross-compiling. We'd like to do something better, but haven't
-    come up with anything yet.
+    To make this work, we "splice" together the six <varname>pkgsFooBar</varname> package sets and have <varname>callPackage</varname> actually take its arguments from that. This is currently implemented in <filename>pkgs/top-level/splice.nix</filename>. <varname>mkDerivation</varname> then, for each dependency attribute, pulls the right derivation out from the splice. This splicing can be skipped when not cross-compiling as the package sets are the same, but still is a bit slow for cross-compiling. We'd like to do something better, but haven't come up with anything yet.
    </para>
   </section>
 
@@ -543,21 +326,11 @@ nix-build &lt;nixpkgs&gt; --arg crossSystem '{ config = "&lt;arch&gt;-&lt;os&gt;
    <title>Bootstrapping</title>
 
    <para>
-    Each of the package sets described above come from a single bootstrapping
-    stage. While <filename>pkgs/top-level/default.nix</filename>, coordinates
-    the composition of stages at a high level,
-    <filename>pkgs/top-level/stage.nix</filename> "ties the knot" (creates the
-    fixed point) of each stage. The package sets are defined per-stage however,
-    so they can be thought of as edges between stages (the nodes) in a graph.
-    Compositions like <literal>pkgsBuildTarget.targetPackages</literal> can be
-    thought of as paths to this graph.
+    Each of the package sets described above come from a single bootstrapping stage. While <filename>pkgs/top-level/default.nix</filename>, coordinates the composition of stages at a high level, <filename>pkgs/top-level/stage.nix</filename> "ties the knot" (creates the fixed point) of each stage. The package sets are defined per-stage however, so they can be thought of as edges between stages (the nodes) in a graph. Compositions like <literal>pkgsBuildTarget.targetPackages</literal> can be thought of as paths to this graph.
    </para>
 
    <para>
-    While there are many package sets, and thus many edges, the stages can also
-    be arranged in a linear chain. In other words, many of the edges are
-    redundant as far as connectivity is concerned. This hinges on the type of
-    bootstrapping we do. Currently for cross it is:
+    While there are many package sets, and thus many edges, the stages can also be arranged in a linear chain. In other words, many of the edges are redundant as far as connectivity is concerned. This hinges on the type of bootstrapping we do. Currently for cross it is:
     <orderedlist>
      <listitem>
       <para>
@@ -575,102 +348,45 @@ nix-build &lt;nixpkgs&gt; --arg crossSystem '{ config = "&lt;arch&gt;-&lt;os&gt;
       </para>
      </listitem>
     </orderedlist>
-    In each stage, <varname>pkgsBuildHost</varname> refers the the previous
-    stage, <varname>pkgsBuildBuild</varname> refers to the one before that, and
-    <varname>pkgsHostTarget</varname> refers to the current one, and
-    <varname>pkgsTargetTarget</varname> refers to the next one. When there is
-    no previous or next stage, they instead refer to the current stage. Note
-    how all the invariants regarding the mapping between dependency and
-    depending packages' build host and target platforms are preserved.
-    <varname>pkgsBuildTarget</varname> and <varname>pkgsHostHost</varname> are
-    more complex in that the stage fitting the requirements isn't always a
-    fixed chain of "prevs" and "nexts" away (modulo the "saturating"
-    self-references at the ends). We just special case each instead. All the
-    primary edges are implemented is in
-    <filename>pkgs/stdenv/booter.nix</filename>, and secondarily aliases in
-    <filename>pkgs/top-level/stage.nix</filename>.
+    In each stage, <varname>pkgsBuildHost</varname> refers the the previous stage, <varname>pkgsBuildBuild</varname> refers to the one before that, and <varname>pkgsHostTarget</varname> refers to the current one, and <varname>pkgsTargetTarget</varname> refers to the next one. When there is no previous or next stage, they instead refer to the current stage. Note how all the invariants regarding the mapping between dependency and depending packages' build host and target platforms are preserved. <varname>pkgsBuildTarget</varname> and <varname>pkgsHostHost</varname> are more complex in that the stage fitting the requirements isn't always a fixed chain of "prevs" and "nexts" away (modulo the "saturating" self-references at the ends). We just special case each instead. All the primary edges are implemented is in <filename>pkgs/stdenv/booter.nix</filename>, and secondarily aliases in <filename>pkgs/top-level/stage.nix</filename>.
    </para>
 
    <note>
     <para>
-     Note the native stages are bootstrapped in legacy ways that predate the
-     current cross implementation. This is why the the bootstrapping stages
-     leading up to the final stages are ignored inthe previous paragraph.
+     Note the native stages are bootstrapped in legacy ways that predate the current cross implementation. This is why the the bootstrapping stages leading up to the final stages are ignored inthe previous paragraph.
     </para>
    </note>
 
    <para>
-    If one looks at the 3 platform triples, one can see that they overlap such
-    that one could put them together into a chain like:
+    If one looks at the 3 platform triples, one can see that they overlap such that one could put them together into a chain like:
 <programlisting>
 (native, native, native, foreign, foreign)
 </programlisting>
-    If one imagines the saturating self references at the end being replaced
-    with infinite stages, and then overlays those platform triples, one ends up
-    with the infinite tuple:
+    If one imagines the saturating self references at the end being replaced with infinite stages, and then overlays those platform triples, one ends up with the infinite tuple:
 <programlisting>
 (native..., native, native, native, foreign, foreign, foreign...)
 </programlisting>
-    On can then imagine any sequence of platforms such that there are bootstrap
-    stages with their 3 platforms determined by "sliding a window" that is the
-    3 tuple through the sequence. This was the original model for
-    bootstrapping. Without a target platform (assume a better world where all
-    compilers are multi-target and all standard libraries are built in their
-    own derivation), this is sufficient. Conversely if one wishes to cross
-    compile "faster", with a "Canadian Cross" bootstraping stage where
-    <literal>build != host != target</literal>, more bootstrapping stages are
-    needed since no sliding window providess the pesky
-    <varname>pkgsBuildTarget</varname> package set since it skips the Canadian
-    cross stage's "host".
+    On can then imagine any sequence of platforms such that there are bootstrap stages with their 3 platforms determined by "sliding a window" that is the 3 tuple through the sequence. This was the original model for bootstrapping. Without a target platform (assume a better world where all compilers are multi-target and all standard libraries are built in their own derivation), this is sufficient. Conversely if one wishes to cross compile "faster", with a "Canadian Cross" bootstraping stage where <literal>build != host != target</literal>, more bootstrapping stages are needed since no sliding window providess the pesky <varname>pkgsBuildTarget</varname> package set since it skips the Canadian cross stage's "host".
    </para>
 
    <note>
     <para>
-     It is much better to refer to <varname>buildPackages</varname> than
-     <varname>targetPackages</varname>, or more broadly package sets that do
-     not mention "target". There are three reasons for this.
+     It is much better to refer to <varname>buildPackages</varname> than <varname>targetPackages</varname>, or more broadly package sets that do not mention "target". There are three reasons for this.
     </para>
     <para>
-     First, it is because bootstrapping stages do not have a unique
-     <varname>targetPackages</varname>. For example a <literal>(x86-linux,
-     x86-linux, arm-linux)</literal> and <literal>(x86-linux, x86-linux,
-     x86-windows)</literal> package set both have a <literal>(x86-linux,
-     x86-linux, x86-linux)</literal> package set. Because there is no canonical
-     <varname>targetPackages</varname> for such a native (<literal>build ==
-     host == target</literal>) package set, we set their
-     <varname>targetPackages</varname>
+     First, it is because bootstrapping stages do not have a unique <varname>targetPackages</varname>. For example a <literal>(x86-linux, x86-linux, arm-linux)</literal> and <literal>(x86-linux, x86-linux, x86-windows)</literal> package set both have a <literal>(x86-linux, x86-linux, x86-linux)</literal> package set. Because there is no canonical <varname>targetPackages</varname> for such a native (<literal>build == host == target</literal>) package set, we set their <varname>targetPackages</varname>
     </para>
     <para>
-     Second, it is because this is a frequent source of hard-to-follow
-     "infinite recursions" / cycles. When only package sets that don't mention
-     target are used, the package set forms a directed acyclic graph. This
-     means that all cycles that exist are confined to one stage. This means
-     they are a lot smaller, and easier to follow in the code or a backtrace.
-     It also means they are present in native and cross builds alike, and so
-     more likely to be caught by CI and other users.
+     Second, it is because this is a frequent source of hard-to-follow "infinite recursions" / cycles. When only package sets that don't mention target are used, the package set forms a directed acyclic graph. This means that all cycles that exist are confined to one stage. This means they are a lot smaller, and easier to follow in the code or a backtrace. It also means they are present in native and cross builds alike, and so more likely to be caught by CI and other users.
     </para>
     <para>
-     Thirdly, it is because everything target-mentioning only exists to
-     accommodate compilers with lousy build systems that insist on the compiler
-     itself and standard library being built together. Of course that is bad
-     because bigger derivations means longer rebuilds. It is also problematic
-     because it tends to make the standard libraries less like other libraries
-     than they could be, complicating code and build systems alike. Because of
-     the other problems, and because of these innate disadvantages, compilers
-     ought to be packaged another way where possible.
+     Thirdly, it is because everything target-mentioning only exists to accommodate compilers with lousy build systems that insist on the compiler itself and standard library being built together. Of course that is bad because bigger derivations means longer rebuilds. It is also problematic because it tends to make the standard libraries less like other libraries than they could be, complicating code and build systems alike. Because of the other problems, and because of these innate disadvantages, compilers ought to be packaged another way where possible.
     </para>
    </note>
 
    <note>
     <para>
-     If one explores Nixpkgs, they will see derivations with names like
-     <literal>gccCross</literal>. Such <literal>*Cross</literal> derivations is
-     a holdover from before we properly distinguished between the host and
-     target platforms—the derivation with "Cross" in the name covered the
-     <literal>build = host != target</literal> case, while the other covered
-     the <literal>host = target</literal>, with build platform the same or not
-     based on whether one was using its <literal>.nativeDrv</literal> or
-     <literal>.crossDrv</literal>. This ugliness will disappear soon.
+     If one explores Nixpkgs, they will see derivations with names like <literal>gccCross</literal>. Such <literal>*Cross</literal> derivations is a holdover from before we properly distinguished between the host and target platforms—the derivation with "Cross" in the name covered the <literal>build = host != target</literal> case, while the other covered the <literal>host = target</literal>, with build platform the same or not based on whether one was using its <literal>.nativeDrv</literal> or <literal>.crossDrv</literal>. This ugliness will disappear soon.
     </para>
    </note>
   </section>
diff --git a/doc/functions.xml b/doc/functions.xml
index 96bd95958ea..3e126e6b139 100644
--- a/doc/functions.xml
+++ b/doc/functions.xml
@@ -4,8 +4,7 @@
          xml:id="chap-functions">
  <title>Functions reference</title>
  <para>
-  The nixpkgs repository has several utility functions to manipulate Nix
-  expressions.
+  The nixpkgs repository has several utility functions to manipulate Nix expressions.
  </para>
  <xi:include href="functions/library.xml" />
  <xi:include href="functions/overrides.xml" />
diff --git a/doc/functions/appimagetools.xml b/doc/functions/appimagetools.xml
index e6dbc22f48d..37e4251cda2 100644
--- a/doc/functions/appimagetools.xml
+++ b/doc/functions/appimagetools.xml
@@ -5,17 +5,12 @@
  <title>pkgs.appimageTools</title>
 
  <para>
-  <varname>pkgs.appimageTools</varname> is a set of functions for extracting
-  and wrapping <link xlink:href="https://appimage.org/">AppImage</link> files.
-  They are meant to be used if traditional packaging from source is infeasible,
-  or it would take too long. To quickly run an AppImage file,
-  <literal>pkgs.appimage-run</literal> can be used as well.
+  <varname>pkgs.appimageTools</varname> is a set of functions for extracting and wrapping <link xlink:href="https://appimage.org/">AppImage</link> files. They are meant to be used if traditional packaging from source is infeasible, or it would take too long. To quickly run an AppImage file, <literal>pkgs.appimage-run</literal> can be used as well.
  </para>
 
  <warning>
   <para>
-   The <varname>appimageTools</varname> API is unstable and may be subject to
-   backwards-incompatible changes in the future.
+   The <varname>appimageTools</varname> API is unstable and may be subject to backwards-incompatible changes in the future.
   </para>
  </warning>
 
@@ -23,9 +18,7 @@
   <title>AppImage formats</title>
 
   <para>
-   There are different formats for AppImages, see
-   <link xlink:href="https://github.com/AppImage/AppImageSpec/blob/74ad9ca2f94bf864a4a0dac1f369dd4f00bd1c28/draft.md#image-format">the
-   specification</link> for details.
+   There are different formats for AppImages, see <link xlink:href="https://github.com/AppImage/AppImageSpec/blob/74ad9ca2f94bf864a4a0dac1f369dd4f00bd1c28/draft.md#image-format">the specification</link> for details.
   </para>
 
   <itemizedlist>
@@ -55,8 +48,7 @@ type2.AppImage: ELF 64-bit LSB executable, x86-64, version 1 (SYSV) (Lepton 3.x)
 </screen>
 
   <para>
-   Note how the type 1 AppImage is described as an <literal>ISO 9660 CD-ROM
-   filesystem</literal>, and the type 2 AppImage is not.
+   Note how the type 1 AppImage is described as an <literal>ISO 9660 CD-ROM filesystem</literal>, and the type 2 AppImage is not.
   </para>
  </section>
 
@@ -64,8 +56,7 @@ type2.AppImage: ELF 64-bit LSB executable, x86-64, version 1 (SYSV) (Lepton 3.x)
   <title>Wrapping</title>
 
   <para>
-   Depending on the type of AppImage you're wrapping, you'll have to use
-   <varname>wrapType1</varname> or <varname>wrapType2</varname>.
+   Depending on the type of AppImage you're wrapping, you'll have to use <varname>wrapType1</varname> or <varname>wrapType2</varname>.
   </para>
 
 <programlisting>
@@ -91,23 +82,16 @@ appimageTools.wrapType2 { # or wrapType1
    </callout>
    <callout arearefs='ex-appimageTools-wrapping-2'>
     <para>
-     <varname>extraPkgs</varname> allows you to pass a function to include
-     additional packages inside the FHS environment your AppImage is going to
-     run in. There are a few ways to learn which dependencies an application
-     needs:
+     <varname>extraPkgs</varname> allows you to pass a function to include additional packages inside the FHS environment your AppImage is going to run in. There are a few ways to learn which dependencies an application needs:
      <itemizedlist>
       <listitem>
        <para>
-        Looking through the extracted AppImage files, reading its scripts and
-        running <command>patchelf</command> and <command>ldd</command> on its
-        executables. This can also be done in <command>appimage-run</command>,
-        by setting <command>APPIMAGE_DEBUG_EXEC=bash</command>.
+        Looking through the extracted AppImage files, reading its scripts and running <command>patchelf</command> and <command>ldd</command> on its executables. This can also be done in <command>appimage-run</command>, by setting <command>APPIMAGE_DEBUG_EXEC=bash</command>.
        </para>
       </listitem>
       <listitem>
        <para>
-        Running <command>strace -vfefile</command> on the wrapped executable,
-        looking for libraries that can't be found.
+        Running <command>strace -vfefile</command> on the wrapped executable, looking for libraries that can't be found.
        </para>
       </listitem>
      </itemizedlist>
diff --git a/doc/functions/debug.xml b/doc/functions/debug.xml
index c6b3611eea5..c27421f12e7 100644
--- a/doc/functions/debug.xml
+++ b/doc/functions/debug.xml
@@ -5,17 +5,10 @@
  <title>Debugging Nix Expressions</title>
 
  <para>
-  Nix is a unityped, dynamic language, this means every value can potentially
-  appear anywhere. Since it is also non-strict, evaluation order and what
-  ultimately is evaluated might surprise you. Therefore it is important to be
-  able to debug nix expressions.
+  Nix is a unityped, dynamic language, this means every value can potentially appear anywhere. Since it is also non-strict, evaluation order and what ultimately is evaluated might surprise you. Therefore it is important to be able to debug nix expressions.
  </para>
 
  <para>
-  In the <literal>lib/debug.nix</literal> file you will find a number of
-  functions that help (pretty-)printing values while evaluation is runnnig. You
-  can even specify how deep these values should be printed recursively, and
-  transform them on the fly. Please consult the docstrings in
-  <literal>lib/debug.nix</literal> for usage information.
+  In the <literal>lib/debug.nix</literal> file you will find a number of functions that help (pretty-)printing values while evaluation is runnnig. You can even specify how deep these values should be printed recursively, and transform them on the fly. Please consult the docstrings in <literal>lib/debug.nix</literal> for usage information.
  </para>
 </section>
diff --git a/doc/functions/dockertools.xml b/doc/functions/dockertools.xml
index 6b293a2e778..2243453c3e9 100644
--- a/doc/functions/dockertools.xml
+++ b/doc/functions/dockertools.xml
@@ -5,17 +5,12 @@
  <title>pkgs.dockerTools</title>
 
  <para>
-  <varname>pkgs.dockerTools</varname> is a set of functions for creating and
-  manipulating Docker images according to the
-  <link xlink:href="https://github.com/moby/moby/blob/master/image/spec/v1.2.md#docker-image-specification-v120">
-  Docker Image Specification v1.2.0 </link>. Docker itself is not used to
-  perform any of the operations done by these functions.
+  <varname>pkgs.dockerTools</varname> is a set of functions for creating and manipulating Docker images according to the <link xlink:href="https://github.com/moby/moby/blob/master/image/spec/v1.2.md#docker-image-specification-v120"> Docker Image Specification v1.2.0 </link>. Docker itself is not used to perform any of the operations done by these functions.
  </para>
 
  <warning>
   <para>
-   The <varname>dockerTools</varname> API is unstable and may be subject to
-   backwards-incompatible changes in the future.
+   The <varname>dockerTools</varname> API is unstable and may be subject to backwards-incompatible changes in the future.
   </para>
  </warning>
 
@@ -23,15 +18,11 @@
   <title>buildImage</title>
 
   <para>
-   This function is analogous to the <command>docker build</command> command,
-   in that it can be used to build a Docker-compatible repository tarball
-   containing a single image with one or multiple layers. As such, the result
-   is suitable for being loaded in Docker with <command>docker load</command>.
+   This function is analogous to the <command>docker build</command> command, in that it can be used to build a Docker-compatible repository tarball containing a single image with one or multiple layers. As such, the result is suitable for being loaded in Docker with <command>docker load</command>.
   </para>
 
   <para>
-   The parameters of <varname>buildImage</varname> with relative example values
-   are described below:
+   The parameters of <varname>buildImage</varname> with relative example values are described below:
   </para>
 
   <example xml:id='ex-dockerTools-buildImage'>
@@ -63,135 +54,89 @@ buildImage {
   </example>
 
   <para>
-   The above example will build a Docker image <literal>redis/latest</literal>
-   from the given base image. Loading and running this image in Docker results
-   in <literal>redis-server</literal> being started automatically.
+   The above example will build a Docker image <literal>redis/latest</literal> from the given base image. Loading and running this image in Docker results in <literal>redis-server</literal> being started automatically.
   </para>
 
   <calloutlist>
    <callout arearefs='ex-dockerTools-buildImage-1'>
     <para>
-     <varname>name</varname> specifies the name of the resulting image. This is
-     the only required argument for <varname>buildImage</varname>.
+     <varname>name</varname> specifies the name of the resulting image. This is the only required argument for <varname>buildImage</varname>.
     </para>
    </callout>
    <callout arearefs='ex-dockerTools-buildImage-2'>
     <para>
-     <varname>tag</varname> specifies the tag of the resulting image. By
-     default it's <literal>null</literal>, which indicates that the nix output
-     hash will be used as tag.
+     <varname>tag</varname> specifies the tag of the resulting image. By default it's <literal>null</literal>, which indicates that the nix output hash will be used as tag.
     </para>
    </callout>
    <callout arearefs='ex-dockerTools-buildImage-3'>
     <para>
-     <varname>fromImage</varname> is the repository tarball containing the base
-     image. It must be a valid Docker image, such as exported by
-     <command>docker save</command>. By default it's <literal>null</literal>,
-     which can be seen as equivalent to <literal>FROM scratch</literal> of a
-     <filename>Dockerfile</filename>.
+     <varname>fromImage</varname> is the repository tarball containing the base image. It must be a valid Docker image, such as exported by <command>docker save</command>. By default it's <literal>null</literal>, which can be seen as equivalent to <literal>FROM scratch</literal> of a <filename>Dockerfile</filename>.
     </para>
    </callout>
    <callout arearefs='ex-dockerTools-buildImage-4'>
     <para>
-     <varname>fromImageName</varname> can be used to further specify the base
-     image within the repository, in case it contains multiple images. By
-     default it's <literal>null</literal>, in which case
-     <varname>buildImage</varname> will peek the first image available in the
-     repository.
+     <varname>fromImageName</varname> can be used to further specify the base image within the repository, in case it contains multiple images. By default it's <literal>null</literal>, in which case <varname>buildImage</varname> will peek the first image available in the repository.
     </para>
    </callout>
    <callout arearefs='ex-dockerTools-buildImage-5'>
     <para>
-     <varname>fromImageTag</varname> can be used to further specify the tag of
-     the base image within the repository, in case an image contains multiple
-     tags. By default it's <literal>null</literal>, in which case
-     <varname>buildImage</varname> will peek the first tag available for the
-     base image.
+     <varname>fromImageTag</varname> can be used to further specify the tag of the base image within the repository, in case an image contains multiple tags. By default it's <literal>null</literal>, in which case <varname>buildImage</varname> will peek the first tag available for the base image.
     </para>
    </callout>
    <callout arearefs='ex-dockerTools-buildImage-6'>
     <para>
-     <varname>contents</varname> is a derivation that will be copied in the new
-     layer of the resulting image. This can be similarly seen as <command>ADD
-     contents/ /</command> in a <filename>Dockerfile</filename>. By default
-     it's <literal>null</literal>.
+     <varname>contents</varname> is a derivation that will be copied in the new layer of the resulting image. This can be similarly seen as <command>ADD contents/ /</command> in a <filename>Dockerfile</filename>. By default it's <literal>null</literal>.
     </para>
    </callout>
    <callout arearefs='ex-dockerTools-buildImage-runAsRoot'>
     <para>
-     <varname>runAsRoot</varname> is a bash script that will run as root in an
-     environment that overlays the existing layers of the base image with the
-     new resulting layer, including the previously copied
-     <varname>contents</varname> derivation. This can be similarly seen as
-     <command>RUN ...</command> in a <filename>Dockerfile</filename>.
+     <varname>runAsRoot</varname> is a bash script that will run as root in an environment that overlays the existing layers of the base image with the new resulting layer, including the previously copied <varname>contents</varname> derivation. This can be similarly seen as <command>RUN ...</command> in a <filename>Dockerfile</filename>.
      <note>
       <para>
-       Using this parameter requires the <literal>kvm</literal> device to be
-       available.
+       Using this parameter requires the <literal>kvm</literal> device to be available.
       </para>
      </note>
     </para>
    </callout>
    <callout arearefs='ex-dockerTools-buildImage-8'>
     <para>
-     <varname>config</varname> is used to specify the configuration of the
-     containers that will be started off the built image in Docker. The
-     available options are listed in the
-     <link xlink:href="https://github.com/moby/moby/blob/master/image/spec/v1.2.md#image-json-field-descriptions">
-     Docker Image Specification v1.2.0 </link>.
+     <varname>config</varname> is used to specify the configuration of the containers that will be started off the built image in Docker. The available options are listed in the <link xlink:href="https://github.com/moby/moby/blob/master/image/spec/v1.2.md#image-json-field-descriptions"> Docker Image Specification v1.2.0 </link>.
     </para>
    </callout>
   </calloutlist>
 
   <para>
-   After the new layer has been created, its closure (to which
-   <varname>contents</varname>, <varname>config</varname> and
-   <varname>runAsRoot</varname> contribute) will be copied in the layer itself.
-   Only new dependencies that are not already in the existing layers will be
-   copied.
+   After the new layer has been created, its closure (to which <varname>contents</varname>, <varname>config</varname> and <varname>runAsRoot</varname> contribute) will be copied in the layer itself. Only new dependencies that are not already in the existing layers will be copied.
   </para>
 
   <para>
-   At the end of the process, only one new single layer will be produced and
-   added to the resulting image.
+   At the end of the process, only one new single layer will be produced and added to the resulting image.
   </para>
 
   <para>
-   The resulting repository will only list the single image
-   <varname>image/tag</varname>. In the case of
-   <xref linkend='ex-dockerTools-buildImage'/> it would be
-   <varname>redis/latest</varname>.
+   The resulting repository will only list the single image <varname>image/tag</varname>. In the case of <xref linkend='ex-dockerTools-buildImage'/> it would be <varname>redis/latest</varname>.
   </para>
 
   <para>
-   It is possible to inspect the arguments with which an image was built using
-   its <varname>buildArgs</varname> attribute.
+   It is possible to inspect the arguments with which an image was built using its <varname>buildArgs</varname> attribute.
   </para>
 
   <note>
    <para>
-    If you see errors similar to <literal>getProtocolByName: does not exist (no
-    such protocol name: tcp)</literal> you may need to add
-    <literal>pkgs.iana-etc</literal> to <varname>contents</varname>.
+    If you see errors similar to <literal>getProtocolByName: does not exist (no such protocol name: tcp)</literal> you may need to add <literal>pkgs.iana-etc</literal> to <varname>contents</varname>.
    </para>
   </note>
 
   <note>
    <para>
-    If you see errors similar to <literal>Error_Protocol ("certificate has
-    unknown CA",True,UnknownCa)</literal> you may need to add
-    <literal>pkgs.cacert</literal> to <varname>contents</varname>.
+    If you see errors similar to <literal>Error_Protocol ("certificate has unknown CA",True,UnknownCa)</literal> you may need to add <literal>pkgs.cacert</literal> to <varname>contents</varname>.
    </para>
   </note>
 
   <example xml:id="example-pkgs-dockerTools-buildImage-creation-date">
    <title>Impurely Defining a Docker Layer's Creation Date</title>
    <para>
-    By default <function>buildImage</function> will use a static date of one
-    second past the UNIX Epoch. This allows <function>buildImage</function> to
-    produce binary reproducible images. When listing images with
-    <command>docker images</command>, the newly created images will be listed
-    like this:
+    By default <function>buildImage</function> will use a static date of one second past the UNIX Epoch. This allows <function>buildImage</function> to produce binary reproducible images. When listing images with <command>docker images</command>, the newly created images will be listed like this:
    </para>
 <screen><![CDATA[
 $ docker images
@@ -199,9 +144,7 @@ REPOSITORY   TAG      IMAGE ID       CREATED        SIZE
 hello        latest   08c791c7846e   48 years ago   25.2MB
 ]]></screen>
    <para>
-    You can break binary reproducibility but have a sorted, meaningful
-    <literal>CREATED</literal> column by setting <literal>created</literal> to
-    <literal>now</literal>.
+    You can break binary reproducibility but have a sorted, meaningful <literal>CREATED</literal> column by setting <literal>created</literal> to <literal>now</literal>.
    </para>
 <programlisting><![CDATA[
 pkgs.dockerTools.buildImage {
@@ -214,8 +157,7 @@ pkgs.dockerTools.buildImage {
 }
 ]]></programlisting>
    <para>
-    and now the Docker CLI will display a reasonable date and sort the images
-    as expected:
+    and now the Docker CLI will display a reasonable date and sort the images as expected:
 <screen><![CDATA[
 $ docker images
 REPOSITORY   TAG      IMAGE ID       CREATED              SIZE
@@ -230,8 +172,7 @@ hello        latest   de2bf4786de6   About a minute ago   25.2MB
   <title>buildLayeredImage</title>
 
   <para>
-   Create a Docker image with many of the store paths being on their own layer
-   to improve sharing between images.
+   Create a Docker image with many of the store paths being on their own layer to improve sharing between images.
   </para>
 
   <variablelist>
@@ -264,8 +205,7 @@ hello        latest   de2bf4786de6   About a minute ago   25.2MB
     </term>
     <listitem>
      <para>
-      Top level paths in the container. Either a single derivation, or a list
-      of derivations.
+      Top level paths in the container. Either a single derivation, or a list of derivations.
      </para>
      <para>
       <emphasis>Default:</emphasis> <literal>[]</literal>
@@ -278,10 +218,7 @@ hello        latest   de2bf4786de6   About a minute ago   25.2MB
     </term>
     <listitem>
      <para>
-      Run-time configuration of the container. A full list of the options are
-      available at in the
-      <link xlink:href="https://github.com/moby/moby/blob/master/image/spec/v1.2.md#image-json-field-descriptions">
-      Docker Image Specification v1.2.0 </link>.
+      Run-time configuration of the container. A full list of the options are available at in the <link xlink:href="https://github.com/moby/moby/blob/master/image/spec/v1.2.md#image-json-field-descriptions"> Docker Image Specification v1.2.0 </link>.
      </para>
      <para>
       <emphasis>Default:</emphasis> <literal>{}</literal>
@@ -294,9 +231,7 @@ hello        latest   de2bf4786de6   About a minute ago   25.2MB
     </term>
     <listitem>
      <para>
-      Date and time the layers were created. Follows the same
-      <literal>now</literal> exception supported by
-      <literal>buildImage</literal>.
+      Date and time the layers were created. Follows the same <literal>now</literal> exception supported by <literal>buildImage</literal>.
      </para>
      <para>
       <emphasis>Default:</emphasis> <literal>1970-01-01T00:00:01Z</literal>
@@ -325,9 +260,7 @@ hello        latest   de2bf4786de6   About a minute ago   25.2MB
     </term>
     <listitem>
      <para>
-      Shell commands to run while building the final layer, without access to
-      most of the layer contents. Changes to this layer are "on top" of all the
-      other layers, so can create additional directories and files.
+      Shell commands to run while building the final layer, without access to most of the layer contents. Changes to this layer are "on top" of all the other layers, so can create additional directories and files.
      </para>
     </listitem>
    </varlistentry>
@@ -337,8 +270,7 @@ hello        latest   de2bf4786de6   About a minute ago   25.2MB
    <title>Behavior of <varname>contents</varname> in the final image</title>
 
    <para>
-    Each path directly listed in <varname>contents</varname> will have a
-    symlink in the root of the image.
+    Each path directly listed in <varname>contents</varname> will have a symlink in the root of the image.
    </para>
 
    <para>
@@ -349,8 +281,7 @@ pkgs.dockerTools.buildLayeredImage {
   contents = [ pkgs.hello ];
 }
 ]]></programlisting>
-    will create symlinks for all the paths in the <literal>hello</literal>
-    package:
+    will create symlinks for all the paths in the <literal>hello</literal> package:
 <screen><![CDATA[
 /bin/hello -> /nix/store/h1zb1padqbbb7jicsvkmrym3r6snphxg-hello-2.10/bin/hello
 /share/info/hello.info -> /nix/store/h1zb1padqbbb7jicsvkmrym3r6snphxg-hello-2.10/share/info/hello.info
@@ -363,13 +294,11 @@ pkgs.dockerTools.buildLayeredImage {
    <title>Automatic inclusion of <varname>config</varname> references</title>
 
    <para>
-    The closure of <varname>config</varname> is automatically included in the
-    closure of the final image.
+    The closure of <varname>config</varname> is automatically included in the closure of the final image.
    </para>
 
    <para>
-    This allows you to make very simple Docker images with very little code.
-    This container will start up and run <command>hello</command>:
+    This allows you to make very simple Docker images with very little code. This container will start up and run <command>hello</command>:
 <programlisting><![CDATA[
 pkgs.dockerTools.buildLayeredImage {
   name = "hello";
@@ -383,31 +312,23 @@ pkgs.dockerTools.buildLayeredImage {
    <title>Adjusting <varname>maxLayers</varname></title>
 
    <para>
-    Increasing the <varname>maxLayers</varname> increases the number of layers
-    which have a chance to be shared between different images.
+    Increasing the <varname>maxLayers</varname> increases the number of layers which have a chance to be shared between different images.
    </para>
 
    <para>
-    Modern Docker installations support up to 128 layers, however older
-    versions support as few as 42.
+    Modern Docker installations support up to 128 layers, however older versions support as few as 42.
    </para>
 
    <para>
-    If the produced image will not be extended by other Docker builds, it is
-    safe to set <varname>maxLayers</varname> to <literal>128</literal>. However
-    it will be impossible to extend the image further.
+    If the produced image will not be extended by other Docker builds, it is safe to set <varname>maxLayers</varname> to <literal>128</literal>. However it will be impossible to extend the image further.
    </para>
 
    <para>
-    The first (<literal>maxLayers-2</literal>) most "popular" paths will have
-    their own individual layers, then layer #<literal>maxLayers-1</literal>
-    will contain all the remaining "unpopular" paths, and finally layer
-    #<literal>maxLayers</literal> will contain the Image configuration.
+    The first (<literal>maxLayers-2</literal>) most "popular" paths will have their own individual layers, then layer #<literal>maxLayers-1</literal> will contain all the remaining "unpopular" paths, and finally layer #<literal>maxLayers</literal> will contain the Image configuration.
    </para>
 
    <para>
-    Docker's Layers are not inherently ordered, they are content-addressable
-    and are not explicitly layered until they are composed in to an Image.
+    Docker's Layers are not inherently ordered, they are content-addressable and are not explicitly layered until they are composed in to an Image.
    </para>
   </section>
  </section>
@@ -416,10 +337,7 @@ pkgs.dockerTools.buildLayeredImage {
   <title>pullImage</title>
 
   <para>
-   This function is analogous to the <command>docker pull</command> command, in
-   that it can be used to pull a Docker image from a Docker registry. By
-   default <link xlink:href="https://hub.docker.com/">Docker Hub</link> is used
-   to pull images.
+   This function is analogous to the <command>docker pull</command> command, in that it can be used to pull a Docker image from a Docker registry. By default <link xlink:href="https://hub.docker.com/">Docker Hub</link> is used to pull images.
   </para>
 
   <para>
@@ -444,71 +362,51 @@ pullImage {
   <calloutlist>
    <callout arearefs='ex-dockerTools-pullImage-1'>
     <para>
-     <varname>imageName</varname> specifies the name of the image to be
-     downloaded, which can also include the registry namespace (e.g.
-     <literal>nixos</literal>). This argument is required.
+     <varname>imageName</varname> specifies the name of the image to be downloaded, which can also include the registry namespace (e.g. <literal>nixos</literal>). This argument is required.
     </para>
    </callout>
    <callout arearefs='ex-dockerTools-pullImage-2'>
     <para>
-     <varname>imageDigest</varname> specifies the digest of the image to be
-     downloaded. This argument is required.
+     <varname>imageDigest</varname> specifies the digest of the image to be downloaded. This argument is required.
     </para>
    </callout>
    <callout arearefs='ex-dockerTools-pullImage-3'>
     <para>
-     <varname>finalImageName</varname>, if specified, this is the name of the
-     image to be created. Note it is never used to fetch the image since we
-     prefer to rely on the immutable digest ID. By default it's equal to
-     <varname>imageName</varname>.
+     <varname>finalImageName</varname>, if specified, this is the name of the image to be created. Note it is never used to fetch the image since we prefer to rely on the immutable digest ID. By default it's equal to <varname>imageName</varname>.
     </para>
    </callout>
    <callout arearefs='ex-dockerTools-pullImage-4'>
     <para>
-     <varname>finalImageTag</varname>, if specified, this is the tag of the
-     image to be created. Note it is never used to fetch the image since we
-     prefer to rely on the immutable digest ID. By default it's
-     <literal>latest</literal>.
+     <varname>finalImageTag</varname>, if specified, this is the tag of the image to be created. Note it is never used to fetch the image since we prefer to rely on the immutable digest ID. By default it's <literal>latest</literal>.
     </para>
    </callout>
    <callout arearefs='ex-dockerTools-pullImage-5'>
     <para>
-     <varname>sha256</varname> is the checksum of the whole fetched image. This
-     argument is required.
+     <varname>sha256</varname> is the checksum of the whole fetched image. This argument is required.
     </para>
    </callout>
    <callout arearefs='ex-dockerTools-pullImage-6'>
     <para>
-     <varname>os</varname>, if specified, is the operating system of the
-     fetched image. By default it's <literal>linux</literal>.
+     <varname>os</varname>, if specified, is the operating system of the fetched image. By default it's <literal>linux</literal>.
     </para>
    </callout>
    <callout arearefs='ex-dockerTools-pullImage-7'>
     <para>
-     <varname>arch</varname>, if specified, is the cpu architecture of the
-     fetched image. By default it's <literal>x86_64</literal>.
+     <varname>arch</varname>, if specified, is the cpu architecture of the fetched image. By default it's <literal>x86_64</literal>.
     </para>
    </callout>
   </calloutlist>
 
   <para>
-   <literal>nix-prefetch-docker</literal> command can be used to get required
-   image parameters:
+   <literal>nix-prefetch-docker</literal> command can be used to get required image parameters:
 <screen>
 <prompt>$ </prompt>nix run nixpkgs.nix-prefetch-docker -c nix-prefetch-docker --image-name mysql --image-tag 5
 </screen>
-   Since a given <varname>imageName</varname> may transparently refer to a
-   manifest list of images which support multiple architectures and/or
-   operating systems, you can supply the <option>--os</option> and
-   <option>--arch</option> arguments to specify exactly which image you want.
-   By default it will match the OS and architecture of the host the command is
-   run on.
+   Since a given <varname>imageName</varname> may transparently refer to a manifest list of images which support multiple architectures and/or operating systems, you can supply the <option>--os</option> and <option>--arch</option> arguments to specify exactly which image you want. By default it will match the OS and architecture of the host the command is run on.
 <screen>
 <prompt>$ </prompt>nix-prefetch-docker --image-name mysql --image-tag 5 --arch x86_64 --os linux
 </screen>
-   Desired image name and tag can be set using
-   <option>--final-image-name</option> and <option>--final-image-tag</option>
-   arguments:
+   Desired image name and tag can be set using <option>--final-image-name</option> and <option>--final-image-tag</option> arguments:
 <screen>
 <prompt>$ </prompt>nix-prefetch-docker --image-name mysql --image-tag 5 --final-image-name eu.gcr.io/my-project/mysql --final-image-tag prod
 </screen>
@@ -519,17 +417,12 @@ pullImage {
   <title>exportImage</title>
 
   <para>
-   This function is analogous to the <command>docker export</command> command,
-   in that it can be used to flatten a Docker image that contains multiple
-   layers. It is in fact the result of the merge of all the layers of the
-   image. As such, the result is suitable for being imported in Docker with
-   <command>docker import</command>.
+   This function is analogous to the <command>docker export</command> command, in that it can be used to flatten a Docker image that contains multiple layers. It is in fact the result of the merge of all the layers of the image. As such, the result is suitable for being imported in Docker with <command>docker import</command>.
   </para>
 
   <note>
    <para>
-    Using this function requires the <literal>kvm</literal> device to be
-    available.
+    Using this function requires the <literal>kvm</literal> device to be available.
    </para>
   </note>
 
@@ -551,14 +444,11 @@ exportImage {
   </example>
 
   <para>
-   The parameters relative to the base image have the same synopsis as
-   described in <xref linkend='ssec-pkgs-dockerTools-buildImage'/>, except that
-   <varname>fromImage</varname> is the only required argument in this case.
+   The parameters relative to the base image have the same synopsis as described in <xref linkend='ssec-pkgs-dockerTools-buildImage'/>, except that <varname>fromImage</varname> is the only required argument in this case.
   </para>
 
   <para>
-   The <varname>name</varname> argument is the name of the derivation output,
-   which defaults to <varname>fromImage.name</varname>.
+   The <varname>name</varname> argument is the name of the derivation output, which defaults to <varname>fromImage.name</varname>.
   </para>
  </section>
 
@@ -566,11 +456,7 @@ exportImage {
   <title>shadowSetup</title>
 
   <para>
-   This constant string is a helper for setting up the base files for managing
-   users and groups, only if such files don't exist already. It is suitable for
-   being used in a <varname>runAsRoot</varname>
-   <xref linkend='ex-dockerTools-buildImage-runAsRoot'/> script for cases like
-   in the example below:
+   This constant string is a helper for setting up the base files for managing users and groups, only if such files don't exist already. It is suitable for being used in a <varname>runAsRoot</varname> <xref linkend='ex-dockerTools-buildImage-runAsRoot'/> script for cases like in the example below:
   </para>
 
   <example xml:id='ex-dockerTools-shadowSetup'>
@@ -592,9 +478,7 @@ buildImage {
   </example>
 
   <para>
-   Creating base files like <literal>/etc/passwd</literal> or
-   <literal>/etc/login.defs</literal> is necessary for shadow-utils to
-   manipulate users and groups.
+   Creating base files like <literal>/etc/passwd</literal> or <literal>/etc/login.defs</literal> is necessary for shadow-utils to manipulate users and groups.
   </para>
  </section>
 </section>
diff --git a/doc/functions/fetchers.xml b/doc/functions/fetchers.xml
index a736008c9d4..369c1fb153e 100644
--- a/doc/functions/fetchers.xml
+++ b/doc/functions/fetchers.xml
@@ -5,18 +5,11 @@
  <title>Fetcher functions</title>
 
  <para>
-  When using Nix, you will frequently need to download source code and other
-  files from the internet. Nixpkgs comes with a few helper functions that allow
-  you to fetch fixed-output derivations in a structured way.
+  When using Nix, you will frequently need to download source code and other files from the internet. Nixpkgs comes with a few helper functions that allow you to fetch fixed-output derivations in a structured way.
  </para>
 
  <para>
-  The two fetcher primitives are <function>fetchurl</function> and
-  <function>fetchzip</function>. Both of these have two required arguments, a
-  URL and a hash. The hash is typically <literal>sha256</literal>, although
-  many more hash algorithms are supported. Nixpkgs contributors are currently
-  recommended to use <literal>sha256</literal>. This hash will be used by Nix
-  to identify your source. A typical usage of fetchurl is provided below.
+  The two fetcher primitives are <function>fetchurl</function> and <function>fetchzip</function>. Both of these have two required arguments, a URL and a hash. The hash is typically <literal>sha256</literal>, although many more hash algorithms are supported. Nixpkgs contributors are currently recommended to use <literal>sha256</literal>. This hash will be used by Nix to identify your source. A typical usage of fetchurl is provided below.
  </para>
 
 <programlisting><![CDATA[
@@ -32,30 +25,15 @@ stdenv.mkDerivation {
 ]]></programlisting>
 
  <para>
-  The main difference between <function>fetchurl</function> and
-  <function>fetchzip</function> is in how they store the contents.
-  <function>fetchurl</function> will store the unaltered contents of the URL
-  within the Nix store. <function>fetchzip</function> on the other hand will
-  decompress the archive for you, making files and directories directly
-  accessible in the future. <function>fetchzip</function> can only be used with
-  archives. Despite the name, <function>fetchzip</function> is not limited to
-  .zip files and can also be used with any tarball.
+  The main difference between <function>fetchurl</function> and <function>fetchzip</function> is in how they store the contents. <function>fetchurl</function> will store the unaltered contents of the URL within the Nix store. <function>fetchzip</function> on the other hand will decompress the archive for you, making files and directories directly accessible in the future. <function>fetchzip</function> can only be used with archives. Despite the name, <function>fetchzip</function> is not limited to .zip files and can also be used with any tarball.
  </para>
 
  <para>
-  <function>fetchpatch</function> works very similarly to
-  <function>fetchurl</function> with the same arguments expected. It expects
-  patch files as a source and and performs normalization on them before
-  computing the checksum. For example it will remove comments or other unstable
-  parts that are sometimes added by version control systems and can change over
-  time.
+  <function>fetchpatch</function> works very similarly to <function>fetchurl</function> with the same arguments expected. It expects patch files as a source and and performs normalization on them before computing the checksum. For example it will remove comments or other unstable parts that are sometimes added by version control systems and can change over time.
  </para>
 
  <para>
-  Other fetcher functions allow you to add source code directly from a VCS such
-  as subversion or git. These are mostly straightforward names based on the
-  name of the command used with the VCS system. Because they give you a working
-  repository, they act most like <function>fetchzip</function>.
+  Other fetcher functions allow you to add source code directly from a VCS such as subversion or git. These are mostly straightforward names based on the name of the command used with the VCS system. Because they give you a working repository, they act most like <function>fetchzip</function>.
  </para>
 
  <variablelist>
@@ -65,8 +43,7 @@ stdenv.mkDerivation {
    </term>
    <listitem>
     <para>
-     Used with Subversion. Expects <literal>url</literal> to a Subversion
-     directory, <literal>rev</literal>, and <literal>sha256</literal>.
+     Used with Subversion. Expects <literal>url</literal> to a Subversion directory, <literal>rev</literal>, and <literal>sha256</literal>.
     </para>
    </listitem>
   </varlistentry>
@@ -76,10 +53,7 @@ stdenv.mkDerivation {
    </term>
    <listitem>
     <para>
-     Used with Git. Expects <literal>url</literal> to a Git repo,
-     <literal>rev</literal>, and <literal>sha256</literal>.
-     <literal>rev</literal> in this case can be full the git commit id (SHA1
-     hash) or a tag name like <literal>refs/tags/v1.0</literal>.
+     Used with Git. Expects <literal>url</literal> to a Git repo, <literal>rev</literal>, and <literal>sha256</literal>. <literal>rev</literal> in this case can be full the git commit id (SHA1 hash) or a tag name like <literal>refs/tags/v1.0</literal>.
     </para>
    </listitem>
   </varlistentry>
@@ -89,8 +63,7 @@ stdenv.mkDerivation {
    </term>
    <listitem>
     <para>
-     Used with Fossil. Expects <literal>url</literal> to a Fossil archive,
-     <literal>rev</literal>, and <literal>sha256</literal>.
+     Used with Fossil. Expects <literal>url</literal> to a Fossil archive, <literal>rev</literal>, and <literal>sha256</literal>.
     </para>
    </listitem>
   </varlistentry>
@@ -100,8 +73,7 @@ stdenv.mkDerivation {
    </term>
    <listitem>
     <para>
-     Used with CVS. Expects <literal>cvsRoot</literal>, <literal>tag</literal>,
-     and <literal>sha256</literal>.
+     Used with CVS. Expects <literal>cvsRoot</literal>, <literal>tag</literal>, and <literal>sha256</literal>.
     </para>
    </listitem>
   </varlistentry>
@@ -111,18 +83,14 @@ stdenv.mkDerivation {
    </term>
    <listitem>
     <para>
-     Used with Mercurial. Expects <literal>url</literal>,
-     <literal>rev</literal>, and <literal>sha256</literal>.
+     Used with Mercurial. Expects <literal>url</literal>, <literal>rev</literal>, and <literal>sha256</literal>.
     </para>
    </listitem>
   </varlistentry>
  </variablelist>
 
  <para>
-  A number of fetcher functions wrap part of <function>fetchurl</function> and
-  <function>fetchzip</function>. They are mainly convenience functions intended
-  for commonly used destinations of source code in Nixpkgs. These wrapper
-  fetchers are listed below.
+  A number of fetcher functions wrap part of <function>fetchurl</function> and <function>fetchzip</function>. They are mainly convenience functions intended for commonly used destinations of source code in Nixpkgs. These wrapper fetchers are listed below.
  </para>
 
  <variablelist>
@@ -132,17 +100,7 @@ stdenv.mkDerivation {
    </term>
    <listitem>
     <para>
-     <function>fetchFromGitHub</function> expects four arguments.
-     <literal>owner</literal> is a string corresponding to the GitHub user or
-     organization that controls this repository. <literal>repo</literal>
-     corresponds to the name of the software repository. These are located at
-     the top of every GitHub HTML page as
-     <literal>owner</literal>/<literal>repo</literal>. <literal>rev</literal>
-     corresponds to the Git commit hash or tag (e.g <literal>v1.0</literal>)
-     that will be downloaded from Git. Finally, <literal>sha256</literal>
-     corresponds to the hash of the extracted directory. Again, other hash
-     algorithms are also available but <literal>sha256</literal> is currently
-     preferred.
+     <function>fetchFromGitHub</function> expects four arguments. <literal>owner</literal> is a string corresponding to the GitHub user or organization that controls this repository. <literal>repo</literal> corresponds to the name of the software repository. These are located at the top of every GitHub HTML page as <literal>owner</literal>/<literal>repo</literal>. <literal>rev</literal> corresponds to the Git commit hash or tag (e.g <literal>v1.0</literal>) that will be downloaded from Git. Finally, <literal>sha256</literal> corresponds to the hash of the extracted directory. Again, other hash algorithms are also available but <literal>sha256</literal> is currently preferred.
     </para>
    </listitem>
   </varlistentry>
@@ -152,8 +110,7 @@ stdenv.mkDerivation {
    </term>
    <listitem>
     <para>
-     This is used with GitLab repositories. The arguments expected are very
-     similar to fetchFromGitHub above.
+     This is used with GitLab repositories. The arguments expected are very similar to fetchFromGitHub above.
     </para>
    </listitem>
   </varlistentry>
@@ -163,8 +120,7 @@ stdenv.mkDerivation {
    </term>
    <listitem>
     <para>
-     This is used with BitBucket repositories. The arguments expected are very
-     similar to fetchFromGitHub above.
+     This is used with BitBucket repositories. The arguments expected are very similar to fetchFromGitHub above.
     </para>
    </listitem>
   </varlistentry>
@@ -174,8 +130,7 @@ stdenv.mkDerivation {
    </term>
    <listitem>
     <para>
-     This is used with Savannah repositories. The arguments expected are very
-     similar to fetchFromGitHub above.
+     This is used with Savannah repositories. The arguments expected are very similar to fetchFromGitHub above.
     </para>
    </listitem>
   </varlistentry>
@@ -185,8 +140,7 @@ stdenv.mkDerivation {
    </term>
    <listitem>
     <para>
-     This is used with repo.or.cz repositories. The arguments expected are very
-     similar to fetchFromGitHub above.
+     This is used with repo.or.cz repositories. The arguments expected are very similar to fetchFromGitHub above.
     </para>
    </listitem>
   </varlistentry>
diff --git a/doc/functions/fhs-environments.xml b/doc/functions/fhs-environments.xml
index 79682080be3..e7b81e97a23 100644
--- a/doc/functions/fhs-environments.xml
+++ b/doc/functions/fhs-environments.xml
@@ -5,15 +5,7 @@
  <title>buildFHSUserEnv</title>
 
  <para>
-  <function>buildFHSUserEnv</function> provides a way to build and run
-  FHS-compatible lightweight sandboxes. It creates an isolated root with bound
-  <filename>/nix/store</filename>, so its footprint in terms of disk space
-  needed is quite small. This allows one to run software which is hard or
-  unfeasible to patch for NixOS -- 3rd-party source trees with FHS assumptions,
-  games distributed as tarballs, software with integrity checking and/or
-  external self-updated binaries. It uses Linux namespaces feature to create
-  temporary lightweight environments which are destroyed after all child
-  processes exit, without root user rights requirement. Accepted arguments are:
+  <function>buildFHSUserEnv</function> provides a way to build and run FHS-compatible lightweight sandboxes. It creates an isolated root with bound <filename>/nix/store</filename>, so its footprint in terms of disk space needed is quite small. This allows one to run software which is hard or unfeasible to patch for NixOS -- 3rd-party source trees with FHS assumptions, games distributed as tarballs, software with integrity checking and/or external self-updated binaries. It uses Linux namespaces feature to create temporary lightweight environments which are destroyed after all child processes exit, without root user rights requirement. Accepted arguments are:
  </para>
 
  <variablelist>
@@ -33,8 +25,7 @@
    </term>
    <listitem>
     <para>
-     Packages to be installed for the main host's architecture (i.e. x86_64 on
-     x86_64 installations). Along with libraries binaries are also installed.
+     Packages to be installed for the main host's architecture (i.e. x86_64 on x86_64 installations). Along with libraries binaries are also installed.
     </para>
    </listitem>
   </varlistentry>
@@ -44,9 +35,7 @@
    </term>
    <listitem>
     <para>
-     Packages to be installed for all architectures supported by a host (i.e.
-     i686 and x86_64 on x86_64 installations). Only libraries are installed by
-     default.
+     Packages to be installed for all architectures supported by a host (i.e. i686 and x86_64 on x86_64 installations). Only libraries are installed by default.
     </para>
    </listitem>
   </varlistentry>
@@ -66,8 +55,7 @@
    </term>
    <listitem>
     <para>
-     Like <literal>extraBuildCommands</literal>, but executed only on multilib
-     architectures.
+     Like <literal>extraBuildCommands</literal>, but executed only on multilib architectures.
     </para>
    </listitem>
   </varlistentry>
@@ -77,8 +65,7 @@
    </term>
    <listitem>
     <para>
-     Additional derivation outputs to be linked for both target and
-     multi-architecture packages.
+     Additional derivation outputs to be linked for both target and multi-architecture packages.
     </para>
    </listitem>
   </varlistentry>
@@ -88,8 +75,7 @@
    </term>
    <listitem>
     <para>
-     Additional commands to be executed for finalizing the derivation with
-     runner script.
+     Additional commands to be executed for finalizing the derivation with runner script.
     </para>
    </listitem>
   </varlistentry>
@@ -99,16 +85,14 @@
    </term>
    <listitem>
     <para>
-     A command that would be executed inside the sandbox and passed all the
-     command line arguments. It defaults to <literal>bash</literal>.
+     A command that would be executed inside the sandbox and passed all the command line arguments. It defaults to <literal>bash</literal>.
     </para>
    </listitem>
   </varlistentry>
  </variablelist>
 
  <para>
-  One can create a simple environment using a <literal>shell.nix</literal> like
-  that:
+  One can create a simple environment using a <literal>shell.nix</literal> like that:
  </para>
 
 <programlisting><![CDATA[
@@ -133,10 +117,6 @@
 ]]></programlisting>
 
  <para>
-  Running <literal>nix-shell</literal> would then drop you into a shell with
-  these libraries and binaries available. You can use this to run closed-source
-  applications which expect FHS structure without hassles: simply change
-  <literal>runScript</literal> to the application path, e.g.
-  <filename>./bin/start.sh</filename> -- relative paths are supported.
+  Running <literal>nix-shell</literal> would then drop you into a shell with these libraries and binaries available. You can use this to run closed-source applications which expect FHS structure without hassles: simply change <literal>runScript</literal> to the application path, e.g. <filename>./bin/start.sh</filename> -- relative paths are supported.
  </para>
 </section>
diff --git a/doc/functions/generators.xml b/doc/functions/generators.xml
index e860b10e897..9ce1f85eb17 100644
--- a/doc/functions/generators.xml
+++ b/doc/functions/generators.xml
@@ -5,28 +5,15 @@
  <title>Generators</title>
 
  <para>
-  Generators are functions that create file formats from nix data structures,
-  e. g. for configuration files. There are generators available for:
-  <literal>INI</literal>, <literal>JSON</literal> and <literal>YAML</literal>
+  Generators are functions that create file formats from nix data structures, e. g. for configuration files. There are generators available for: <literal>INI</literal>, <literal>JSON</literal> and <literal>YAML</literal>
  </para>
 
  <para>
-  All generators follow a similar call interface: <code>generatorName
-  configFunctions data</code>, where <literal>configFunctions</literal> is an
-  attrset of user-defined functions that format nested parts of the content.
-  They each have common defaults, so often they do not need to be set manually.
-  An example is <code>mkSectionName ? (name: libStr.escape [ "[" "]" ]
-  name)</code> from the <literal>INI</literal> generator. It receives the name
-  of a section and sanitizes it. The default <literal>mkSectionName</literal>
-  escapes <literal>[</literal> and <literal>]</literal> with a backslash.
+  All generators follow a similar call interface: <code>generatorName configFunctions data</code>, where <literal>configFunctions</literal> is an attrset of user-defined functions that format nested parts of the content. They each have common defaults, so often they do not need to be set manually. An example is <code>mkSectionName ? (name: libStr.escape [ "[" "]" ] name)</code> from the <literal>INI</literal> generator. It receives the name of a section and sanitizes it. The default <literal>mkSectionName</literal> escapes <literal>[</literal> and <literal>]</literal> with a backslash.
  </para>
 
  <para>
-  Generators can be fine-tuned to produce exactly the file format required by
-  your application/service. One example is an INI-file format which uses
-  <literal>: </literal> as separator, the strings
-  <literal>"yes"</literal>/<literal>"no"</literal> as boolean values and
-  requires all string values to be quoted:
+  Generators can be fine-tuned to produce exactly the file format required by your application/service. One example is an INI-file format which uses <literal>: </literal> as separator, the strings <literal>"yes"</literal>/<literal>"no"</literal> as boolean values and requires all string values to be quoted:
  </para>
 
 <programlisting>
@@ -77,13 +64,11 @@ merge:"diff3"
 
  <note>
   <para>
-   Nix store paths can be converted to strings by enclosing a derivation
-   attribute like so: <code>"${drv}"</code>.
+   Nix store paths can be converted to strings by enclosing a derivation attribute like so: <code>"${drv}"</code>.
   </para>
  </note>
 
  <para>
-  Detailed documentation for each generator can be found in
-  <literal>lib/generators.nix</literal>.
+  Detailed documentation for each generator can be found in <literal>lib/generators.nix</literal>.
  </para>
 </section>
diff --git a/doc/functions/library.xml b/doc/functions/library.xml
index e6aedaa6efd..6ffb944b5a6 100644
--- a/doc/functions/library.xml
+++ b/doc/functions/library.xml
@@ -5,8 +5,7 @@
  <title>Nixpkgs Library Functions</title>
 
  <para>
-  Nixpkgs provides a standard library at <varname>pkgs.lib</varname>, or
-  through <code>import &lt;nixpkgs/lib&gt;</code>.
+  Nixpkgs provides a standard library at <varname>pkgs.lib</varname>, or through <code>import &lt;nixpkgs/lib&gt;</code>.
  </para>
 
  <xi:include href="./library/asserts.xml" />
diff --git a/doc/functions/library/asserts.xml b/doc/functions/library/asserts.xml
index 437850e408b..10891039e86 100644
--- a/doc/functions/library/asserts.xml
+++ b/doc/functions/library/asserts.xml
@@ -27,8 +27,7 @@
     </term>
     <listitem>
      <para>
-      Condition under which the <varname>msg</varname> should
-      <emphasis>not</emphasis> be printed.
+      Condition under which the <varname>msg</varname> should <emphasis>not</emphasis> be printed.
      </para>
     </listitem>
    </varlistentry>
@@ -64,9 +63,7 @@ stderr> assert failed
   <xi:include href="./locations.xml" xpointer="lib.asserts.assertOneOf" />
 
   <para>
-   Specialized <function>asserts.assertMsg</function> for checking if
-   <varname>val</varname> is one of the elements of <varname>xs</varname>.
-   Useful for checking enums.
+   Specialized <function>asserts.assertMsg</function> for checking if <varname>val</varname> is one of the elements of <varname>xs</varname>. Useful for checking enums.
   </para>
 
   <variablelist>
@@ -76,8 +73,7 @@ stderr> assert failed
     </term>
     <listitem>
      <para>
-      The name of the variable the user entered <varname>val</varname> into,
-      for inclusion in the error message.
+      The name of the variable the user entered <varname>val</varname> into, for inclusion in the error message.
      </para>
     </listitem>
    </varlistentry>
@@ -87,8 +83,7 @@ stderr> assert failed
     </term>
     <listitem>
      <para>
-      The value of what the user provided, to be compared against the values in
-      <varname>xs</varname>.
+      The value of what the user provided, to be compared against the values in <varname>xs</varname>.
      </para>
     </listitem>
    </varlistentry>
diff --git a/doc/functions/library/attrsets.xml b/doc/functions/library/attrsets.xml
index 65d0b40e2e8..f9234069392 100644
--- a/doc/functions/library/attrsets.xml
+++ b/doc/functions/library/attrsets.xml
@@ -23,8 +23,7 @@
     </term>
     <listitem>
      <para>
-      A list of strings representing the path through the nested attribute set
-      <varname>set</varname>.
+      A list of strings representing the path through the nested attribute set <varname>set</varname>.
      </para>
     </listitem>
    </varlistentry>
@@ -34,8 +33,7 @@
     </term>
     <listitem>
      <para>
-      Default value if <varname>attrPath</varname> does not resolve to an
-      existing value.
+      Default value if <varname>attrPath</varname> does not resolve to an existing value.
      </para>
     </listitem>
    </varlistentry>
@@ -88,8 +86,7 @@ lib.attrsets.attrByPath [ "a" "b" ] 0 {}
     </term>
     <listitem>
      <para>
-      A list of strings representing the path through the nested attribute set
-      <varname>set</varname>.
+      A list of strings representing the path through the nested attribute set <varname>set</varname>.
      </para>
     </listitem>
    </varlistentry>
@@ -125,8 +122,7 @@ lib.attrsets.hasAttrByPath
   <xi:include href="./locations.xml" xpointer="lib.attrsets.setAttrByPath" />
 
   <para>
-   Create a new attribute set with <varname>value</varname> set at the nested
-   attribute location specified in <varname>attrPath</varname>.
+   Create a new attribute set with <varname>value</varname> set at the nested attribute location specified in <varname>attrPath</varname>.
   </para>
 
   <variablelist>
@@ -146,8 +142,7 @@ lib.attrsets.hasAttrByPath
     </term>
     <listitem>
      <para>
-      The value to set at the location described by
-      <varname>attrPath</varname>.
+      The value to set at the location described by <varname>attrPath</varname>.
      </para>
     </listitem>
    </varlistentry>
@@ -171,8 +166,7 @@ lib.attrsets.setAttrByPath [ "a" "b" ] 3
   <xi:include href="./locations.xml" xpointer="lib.attrsets.getAttrFromPath" />
 
   <para>
-   Like <xref linkend="function-library-lib.attrsets.attrByPath" /> except
-   without a default, and it will throw if the value doesn't exist.
+   Like <xref linkend="function-library-lib.attrsets.attrByPath" /> except without a default, and it will throw if the value doesn't exist.
   </para>
 
   <variablelist>
@@ -182,8 +176,7 @@ lib.attrsets.setAttrByPath [ "a" "b" ] 3
     </term>
     <listitem>
      <para>
-      A list of strings representing the path through the nested attribute set
-      <varname>set</varname>.
+      A list of strings representing the path through the nested attribute set <varname>set</varname>.
      </para>
     </listitem>
    </varlistentry>
@@ -235,8 +228,7 @@ lib.attrsets.getAttrFromPath [ "x" "y" ] { }
     </term>
     <listitem>
      <para>
-      The list of attributes to fetch from <varname>set</varname>. Each
-      attribute name must exist on the attrbitue set.
+      The list of attributes to fetch from <varname>set</varname>. Each attribute name must exist on the attrbitue set.
      </para>
     </listitem>
    </varlistentry>
@@ -282,8 +274,7 @@ error: attribute 'd' missing
   </para>
 
   <para>
-   Provides a backwards-compatible interface of
-   <function>builtins.attrValues</function> for Nix version older than 1.8.
+   Provides a backwards-compatible interface of <function>builtins.attrValues</function> for Nix version older than 1.8.
   </para>
 
   <variablelist>
@@ -317,14 +308,11 @@ lib.attrsets.attrValues { a = 1; b = 2; c = 3; }
   <xi:include href="./locations.xml" xpointer="lib.attrsets.catAttrs" />
 
   <para>
-   Collect each attribute named `attr' from the list of attribute sets,
-   <varname>sets</varname>. Sets that don't contain the named attribute are
-   ignored.
+   Collect each attribute named `attr' from the list of attribute sets, <varname>sets</varname>. Sets that don't contain the named attribute are ignored.
   </para>
 
   <para>
-   Provides a backwards-compatible interface of
-   <function>builtins.catAttrs</function> for Nix version older than 1.9.
+   Provides a backwards-compatible interface of <function>builtins.catAttrs</function> for Nix version older than 1.9.
   </para>
 
   <variablelist>
@@ -334,8 +322,7 @@ lib.attrsets.attrValues { a = 1; b = 2; c = 3; }
     </term>
     <listitem>
      <para>
-      Attribute name to select from each attribute set in
-      <varname>sets</varname>.
+      Attribute name to select from each attribute set in <varname>sets</varname>.
      </para>
     </listitem>
    </varlistentry>
@@ -372,8 +359,7 @@ catAttrs "a" [{a = 1;} {b = 0;} {a = 2;}]
   <xi:include href="./locations.xml" xpointer="lib.attrsets.filterAttrs" />
 
   <para>
-   Filter an attribute set by removing all attributes for which the given
-   predicate return false.
+   Filter an attribute set by removing all attributes for which the given predicate return false.
   </para>
 
   <variablelist>
@@ -386,8 +372,7 @@ catAttrs "a" [{a = 1;} {b = 0;} {a = 2;}]
       <literal>String -> Any -> Bool</literal>
      </para>
      <para>
-      Predicate which returns true to include an attribute, or returns false to
-      exclude it.
+      Predicate which returns true to include an attribute, or returns false to exclude it.
      </para>
      <variablelist>
       <varlistentry>
@@ -412,8 +397,7 @@ catAttrs "a" [{a = 1;} {b = 0;} {a = 2;}]
       </varlistentry>
      </variablelist>
      <para>
-      Returns <literal>true</literal> to include the attribute,
-      <literal>false</literal> to exclude the attribute.
+      Returns <literal>true</literal> to include the attribute, <literal>false</literal> to exclude the attribute.
      </para>
     </listitem>
    </varlistentry>
@@ -447,8 +431,7 @@ filterAttrs (n: v: n == "foo") { foo = 1; bar = 2; }
   <xi:include href="./locations.xml" xpointer="lib.attrsets.filterAttrsRecursive" />
 
   <para>
-   Filter an attribute set recursively by removing all attributes for which the
-   given predicate return false.
+   Filter an attribute set recursively by removing all attributes for which the given predicate return false.
   </para>
 
   <variablelist>
@@ -461,8 +444,7 @@ filterAttrs (n: v: n == "foo") { foo = 1; bar = 2; }
       <literal>String -> Any -> Bool</literal>
      </para>
      <para>
-      Predicate which returns true to include an attribute, or returns false to
-      exclude it.
+      Predicate which returns true to include an attribute, or returns false to exclude it.
      </para>
      <variablelist>
       <varlistentry>
@@ -487,8 +469,7 @@ filterAttrs (n: v: n == "foo") { foo = 1; bar = 2; }
       </varlistentry>
      </variablelist>
      <para>
-      Returns <literal>true</literal> to include the attribute,
-      <literal>false</literal> to exclude the attribute.
+      Returns <literal>true</literal> to include the attribute, <literal>false</literal> to exclude the attribute.
      </para>
     </listitem>
    </varlistentry>
@@ -557,8 +538,7 @@ lib.attrsets.filterAttrsRecursive
       <literal>Any -> Any -> Any</literal>
      </para>
      <para>
-      Given a value <varname>val</varname> and a collector
-      <varname>col</varname>, combine the two.
+      Given a value <varname>val</varname> and a collector <varname>col</varname>, combine the two.
      </para>
      <variablelist>
       <varlistentry>
@@ -578,8 +558,7 @@ lib.attrsets.filterAttrsRecursive
        <listitem>
 <!-- TODO: make this not bad, use more fold-ey terms -->
         <para>
-         The result of previous <function>op</function> calls with other values
-         and <function>nul</function>.
+         The result of previous <function>op</function> calls with other values and <function>nul</function>.
         </para>
        </listitem>
       </varlistentry>
@@ -632,9 +611,7 @@ lib.attrsets.foldAttrs
   <xi:include href="./locations.xml" xpointer="lib.attrsets.collect" />
 
   <para>
-   Recursively collect sets that verify a given predicate named
-   <varname>pred</varname> from the set <varname>attrs</varname>. The recursion
-   stops when <varname>pred</varname> returns <literal>true</literal>.
+   Recursively collect sets that verify a given predicate named <varname>pred</varname> from the set <varname>attrs</varname>. The recursion stops when <varname>pred</varname> returns <literal>true</literal>.
   </para>
 
   <variablelist>
@@ -702,8 +679,7 @@ collect (x: x ? outPath)
   <xi:include href="./locations.xml" xpointer="lib.attrsets.nameValuePair" />
 
   <para>
-   Utility function that creates a <literal>{name, value}</literal> pair as
-   expected by <function>builtins.listToAttrs</function>.
+   Utility function that creates a <literal>{name, value}</literal> pair as expected by <function>builtins.listToAttrs</function>.
   </para>
 
   <variablelist>
@@ -747,13 +723,11 @@ nameValuePair "some" 6
   <xi:include href="./locations.xml" xpointer="lib.attrsets.mapAttrs" />
 
   <para>
-   Apply a function to each element in an attribute set, creating a new
-   attribute set.
+   Apply a function to each element in an attribute set, creating a new attribute set.
   </para>
 
   <para>
-   Provides a backwards-compatible interface of
-   <function>builtins.mapAttrs</function> for Nix version older than 2.1.
+   Provides a backwards-compatible interface of <function>builtins.mapAttrs</function> for Nix version older than 2.1.
   </para>
 
   <variablelist>
@@ -814,9 +788,7 @@ lib.attrsets.mapAttrs
   <xi:include href="./locations.xml" xpointer="lib.attrsets.mapAttrs-prime" />
 
   <para>
-   Like <function>mapAttrs</function>, but allows the name of each attribute to
-   be changed in addition to the value. The applied function should return both
-   the new name and value as a <function>nameValuePair</function>.
+   Like <function>mapAttrs</function>, but allows the name of each attribute to be changed in addition to the value. The applied function should return both the new name and value as a <function>nameValuePair</function>.
   </para>
 
   <variablelist>
@@ -829,10 +801,8 @@ lib.attrsets.mapAttrs
       <literal>String -> Any -> { name = String; value = Any }</literal>
      </para>
      <para>
-      Given an attribute's name and value, return a new
-      <link
-       linkend="function-library-lib.attrsets.nameValuePair">name
-      value pair</link>.
+      Given an attribute's name and value, return a new <link
+       linkend="function-library-lib.attrsets.nameValuePair">name value pair</link>.
      </para>
      <variablelist>
       <varlistentry>
@@ -891,8 +861,7 @@ lib.attrsets.mapAttrs' (name: value: lib.attrsets.nameValuePair ("foo_" + name)
   <xi:include href="./locations.xml" xpointer="lib.attrsets.mapAttrsToList" />
 
   <para>
-   Call <varname>fn</varname> for each attribute in the given
-   <varname>set</varname> and return the result in a list.
+   Call <varname>fn</varname> for each attribute in the given <varname>set</varname> and return the result in a list.
   </para>
 
   <variablelist>
@@ -962,9 +931,7 @@ lib.attrsets.mapAttrsToList (name: value: "${name}=${value}")
   <xi:include href="./locations.xml" xpointer="lib.attrsets.mapAttrsRecursive" />
 
   <para>
-   Like <function>mapAttrs</function>, except that it recursively applies
-   itself to attribute sets. Also, the first argument of the argument function
-   is a <emphasis>list</emphasis> of the names of the containing attributes.
+   Like <function>mapAttrs</function>, except that it recursively applies itself to attribute sets. Also, the first argument of the argument function is a <emphasis>list</emphasis> of the names of the containing attributes.
   </para>
 
   <variablelist>
@@ -989,10 +956,7 @@ lib.attrsets.mapAttrsToList (name: value: "${name}=${value}")
          The list of attribute names to this value.
         </para>
         <para>
-         For example, the <varname>name_path</varname> for the
-         <literal>example</literal> string in the attribute set <literal>{ foo
-         = { bar = "example"; }; }</literal> is <literal>[ "foo" "bar"
-         ]</literal>.
+         For example, the <varname>name_path</varname> for the <literal>example</literal> string in the attribute set <literal>{ foo = { bar = "example"; }; }</literal> is <literal>[ "foo" "bar" ]</literal>.
         </para>
        </listitem>
       </varlistentry>
@@ -1059,11 +1023,7 @@ mapAttrsRecursive
   <xi:include href="./locations.xml" xpointer="lib.attrsets.mapAttrsRecursiveCond" />
 
   <para>
-   Like <function>mapAttrsRecursive</function>, but it takes an additional
-   predicate function that tells it whether to recursive into an attribute set.
-   If it returns false, <function>mapAttrsRecursiveCond</function> does not
-   recurse, but does apply the map function. It is returns true, it does
-   recurse, and does not apply the map function.
+   Like <function>mapAttrsRecursive</function>, but it takes an additional predicate function that tells it whether to recursive into an attribute set. If it returns false, <function>mapAttrsRecursiveCond</function> does not recurse, but does apply the map function. It is returns true, it does recurse, and does not apply the map function.
   </para>
 
   <variablelist>
@@ -1076,8 +1036,7 @@ mapAttrsRecursive
       <literal>(AttrSet -> Bool)</literal>
      </para>
      <para>
-      Determine if <function>mapAttrsRecursive</function> should recurse deeper
-      in to the attribute set.
+      Determine if <function>mapAttrsRecursive</function> should recurse deeper in to the attribute set.
      </para>
      <variablelist>
       <varlistentry>
@@ -1114,10 +1073,7 @@ mapAttrsRecursive
          The list of attribute names to this value.
         </para>
         <para>
-         For example, the <varname>name_path</varname> for the
-         <literal>example</literal> string in the attribute set <literal>{ foo
-         = { bar = "example"; }; }</literal> is <literal>[ "foo" "bar"
-         ]</literal>.
+         For example, the <varname>name_path</varname> for the <literal>example</literal> string in the attribute set <literal>{ foo = { bar = "example"; }; }</literal> is <literal>[ "foo" "bar" ]</literal>.
         </para>
        </listitem>
       </varlistentry>
@@ -1181,8 +1137,7 @@ lib.attrsets.mapAttrsRecursiveCond
   <xi:include href="./locations.xml" xpointer="lib.attrsets.genAttrs" />
 
   <para>
-   Generate an attribute set by mapping a function over a list of attribute
-   names.
+   Generate an attribute set by mapping a function over a list of attribute names.
   </para>
 
   <variablelist>
@@ -1241,8 +1196,7 @@ lib.attrsets.genAttrs [ "foo" "bar" ] (name: "x_${name}")
   <xi:include href="./locations.xml" xpointer="lib.attrsets.isDerivation" />
 
   <para>
-   Check whether the argument is a derivation. Any set with <code>{ type =
-   "derivation"; }</code> counts as a derivation.
+   Check whether the argument is a derivation. Any set with <code>{ type = "derivation"; }</code> counts as a derivation.
   </para>
 
   <variablelist>
@@ -1320,8 +1274,7 @@ lib.attrsets.isDerivation "foobar"
     </term>
     <listitem>
      <para>
-      Condition under which the <varname>as</varname> attribute set is
-      returned.
+      Condition under which the <varname>as</varname> attribute set is returned.
      </para>
     </listitem>
    </varlistentry>
@@ -1363,8 +1316,7 @@ lib.attrsets.optionalAttrs false { my = "set"; }
   <xi:include href="./locations.xml" xpointer="lib.attrsets.zipAttrsWithNames" />
 
   <para>
-   Merge sets of attributes and use the function <varname>f</varname> to merge
-   attribute values where the attribute name is in <varname>names</varname>.
+   Merge sets of attributes and use the function <varname>f</varname> to merge attribute values where the attribute name is in <varname>names</varname>.
   </para>
 
   <variablelist>
@@ -1451,11 +1403,8 @@ lib.attrsets.zipAttrsWithNames
   <xi:include href="./locations.xml" xpointer="lib.attrsets.zipAttrsWith" />
 
   <para>
-   Merge sets of attributes and use the function <varname>f</varname> to merge
-   attribute values. Similar to
-   <xref
-   linkend="function-library-lib.attrsets.zipAttrsWithNames" /> where
-   all key names are passed for <varname>names</varname>.
+   Merge sets of attributes and use the function <varname>f</varname> to merge attribute values. Similar to <xref
+   linkend="function-library-lib.attrsets.zipAttrsWithNames" /> where all key names are passed for <varname>names</varname>.
   </para>
 
   <variablelist>
@@ -1531,9 +1480,7 @@ lib.attrsets.zipAttrsWith
   <xi:include href="./locations.xml" xpointer="lib.attrsets.zipAttrs" />
 
   <para>
-   Merge sets of attributes and combine each attribute value in to a list.
-   Similar to <xref linkend="function-library-lib.attrsets.zipAttrsWith" />
-   where the merge function returns a list of all values.
+   Merge sets of attributes and combine each attribute value in to a list. Similar to <xref linkend="function-library-lib.attrsets.zipAttrsWith" /> where the merge function returns a list of all values.
   </para>
 
   <variablelist>
@@ -1573,12 +1520,7 @@ lib.attrsets.zipAttrs
   <xi:include href="./locations.xml" xpointer="lib.attrsets.recursiveUpdateUntil" />
 
   <para>
-   Does the same as the update operator <literal>//</literal> except that
-   attributes are merged until the given predicate is verified. The predicate
-   should accept 3 arguments which are the path to reach the attribute, a part
-   of the first attribute set and a part of the second attribute set. When the
-   predicate is verified, the value of the first attribute set is replaced by
-   the value of the second attribute set.
+   Does the same as the update operator <literal>//</literal> except that attributes are merged until the given predicate is verified. The predicate should accept 3 arguments which are the path to reach the attribute, a part of the first attribute set and a part of the second attribute set. When the predicate is verified, the value of the first attribute set is replaced by the value of the second attribute set.
   </para>
 
   <variablelist>
@@ -1681,10 +1623,7 @@ lib.attrsets.recursiveUpdateUntil (path: l: r: path == ["foo"])
   <xi:include href="./locations.xml" xpointer="lib.attrsets.recursiveUpdate" />
 
   <para>
-   A recursive variant of the update operator <literal>//</literal>. The
-   recursion stops when one of the attribute values is not an attribute set, in
-   which case the right hand side value takes precedence over the left hand
-   side value.
+   A recursive variant of the update operator <literal>//</literal>. The recursion stops when one of the attribute values is not an attribute set, in which case the right hand side value takes precedence over the left hand side value.
   </para>
 
   <variablelist>
diff --git a/doc/functions/nix-gitignore.xml b/doc/functions/nix-gitignore.xml
index 9011570d1ea..37a82b196cc 100644
--- a/doc/functions/nix-gitignore.xml
+++ b/doc/functions/nix-gitignore.xml
@@ -5,21 +5,14 @@
  <title>pkgs.nix-gitignore</title>
 
  <para>
-  <function>pkgs.nix-gitignore</function> is a function that acts similarly to
-  <literal>builtins.filterSource</literal> but also allows filtering with the
-  help of the gitignore format.
+  <function>pkgs.nix-gitignore</function> is a function that acts similarly to <literal>builtins.filterSource</literal> but also allows filtering with the help of the gitignore format.
  </para>
 
  <section xml:id="sec-pkgs-nix-gitignore-usage">
   <title>Usage</title>
 
   <para>
-   <literal>pkgs.nix-gitignore</literal> exports a number of functions, but
-   you'll most likely need either <literal>gitignoreSource</literal> or
-   <literal>gitignoreSourcePure</literal>. As their first argument, they both
-   accept either 1. a file with gitignore lines or 2. a string with gitignore
-   lines, or 3. a list of either of the two. They will be concatenated into a
-   single big string.
+   <literal>pkgs.nix-gitignore</literal> exports a number of functions, but you'll most likely need either <literal>gitignoreSource</literal> or <literal>gitignoreSourcePure</literal>. As their first argument, they both accept either 1. a file with gitignore lines or 2. a string with gitignore lines, or 3. a list of either of the two. They will be concatenated into a single big string.
   </para>
 
 <programlisting><![CDATA[
@@ -40,8 +33,7 @@
   ]]></programlisting>
 
   <para>
-   These functions are derived from the <literal>Filter</literal> functions by
-   setting the first filter argument to <literal>(_: _: true)</literal>:
+   These functions are derived from the <literal>Filter</literal> functions by setting the first filter argument to <literal>(_: _: true)</literal>:
   </para>
 
 <programlisting><![CDATA[
@@ -50,12 +42,7 @@ gitignoreSource = gitignoreFilterSource (_: _: true);
   ]]></programlisting>
 
   <para>
-   Those filter functions accept the same arguments the
-   <literal>builtins.filterSource</literal> function would pass to its filters,
-   thus <literal>fn: gitignoreFilterSourcePure fn ""</literal> should be
-   extensionally equivalent to <literal>filterSource</literal>. The file is
-   blacklisted iff it's blacklisted by either your filter or the
-   gitignoreFilter.
+   Those filter functions accept the same arguments the <literal>builtins.filterSource</literal> function would pass to its filters, thus <literal>fn: gitignoreFilterSourcePure fn ""</literal> should be extensionally equivalent to <literal>filterSource</literal>. The file is blacklisted iff it's blacklisted by either your filter or the gitignoreFilter.
   </para>
 
   <para>
@@ -71,8 +58,7 @@ gitignoreFilter = ign: root: filterPattern (gitignoreToPatterns ign) root;
   <title>gitignore files in subdirectories</title>
 
   <para>
-   If you wish to use a filter that would search for .gitignore files in
-   subdirectories, just like git does by default, use this function:
+   If you wish to use a filter that would search for .gitignore files in subdirectories, just like git does by default, use this function:
   </para>
 
 <programlisting><![CDATA[
diff --git a/doc/functions/ocitools.xml b/doc/functions/ocitools.xml
index 56de0c22ec6..f61075b242f 100644
--- a/doc/functions/ocitools.xml
+++ b/doc/functions/ocitools.xml
@@ -5,26 +5,18 @@
  <title>pkgs.ociTools</title>
 
  <para>
-  <varname>pkgs.ociTools</varname> is a set of functions for creating
-  containers according to the
-  <link xlink:href="https://github.com/opencontainers/runtime-spec">OCI
-  container specification v1.0.0</link>. Beyond that it makes no assumptions
-  about the container runner you choose to use to run the created container.
+  <varname>pkgs.ociTools</varname> is a set of functions for creating containers according to the <link xlink:href="https://github.com/opencontainers/runtime-spec">OCI container specification v1.0.0</link>. Beyond that it makes no assumptions about the container runner you choose to use to run the created container.
  </para>
 
  <section xml:id="ssec-pkgs-ociTools-buildContainer">
   <title>buildContainer</title>
 
   <para>
-   This function creates a simple OCI container that runs a single command
-   inside of it. An OCI container consists of a <varname>config.json</varname>
-   and a rootfs directory.The nix store of the container will contain all
-   referenced dependencies of the given command.
+   This function creates a simple OCI container that runs a single command inside of it. An OCI container consists of a <varname>config.json</varname> and a rootfs directory.The nix store of the container will contain all referenced dependencies of the given command.
   </para>
 
   <para>
-   The parameters of <varname>buildContainer</varname> with an example value
-   are described below:
+   The parameters of <varname>buildContainer</varname> with an example value are described below:
   </para>
 
   <example xml:id='ex-ociTools-buildContainer'>
@@ -51,23 +43,17 @@ buildContainer {
    <calloutlist>
     <callout arearefs='ex-ociTools-buildContainer-1'>
      <para>
-      <varname>args</varname> specifies a set of arguments to run inside the
-      container. This is the only required argument for
-      <varname>buildContainer</varname>. All referenced packages inside the
-      derivation will be made available inside the container
+      <varname>args</varname> specifies a set of arguments to run inside the container. This is the only required argument for <varname>buildContainer</varname>. All referenced packages inside the derivation will be made available inside the container
      </para>
     </callout>
     <callout arearefs='ex-ociTools-buildContainer-2'>
      <para>
-      <varname>mounts</varname> specifies additional mount points chosen by the
-      user. By default only a minimal set of necessary filesystems are mounted
-      into the container (e.g procfs, cgroupfs)
+      <varname>mounts</varname> specifies additional mount points chosen by the user. By default only a minimal set of necessary filesystems are mounted into the container (e.g procfs, cgroupfs)
      </para>
     </callout>
     <callout arearefs='ex-ociTools-buildContainer-3'>
      <para>
-      <varname>readonly</varname> makes the container's rootfs read-only if it
-      is set to true. The default value is false <literal>false</literal>.
+      <varname>readonly</varname> makes the container's rootfs read-only if it is set to true. The default value is false <literal>false</literal>.
      </para>
     </callout>
    </calloutlist>
diff --git a/doc/functions/overrides.xml b/doc/functions/overrides.xml
index 1bd90d2a0c7..4ba4283c609 100644
--- a/doc/functions/overrides.xml
+++ b/doc/functions/overrides.xml
@@ -5,23 +5,18 @@
  <title>Overriding</title>
 
  <para>
-  Sometimes one wants to override parts of <literal>nixpkgs</literal>, e.g.
-  derivation attributes, the results of derivations.
+  Sometimes one wants to override parts of <literal>nixpkgs</literal>, e.g. derivation attributes, the results of derivations.
  </para>
 
  <para>
-  These functions are used to make changes to packages, returning only single
-  packages. <link xlink:href="#chap-overlays">Overlays</link>, on the other
-  hand, can be used to combine the overridden packages across the entire
-  package set of Nixpkgs.
+  These functions are used to make changes to packages, returning only single packages. <link xlink:href="#chap-overlays">Overlays</link>, on the other hand, can be used to combine the overridden packages across the entire package set of Nixpkgs.
  </para>
 
  <section xml:id="sec-pkg-override">
   <title>&lt;pkg&gt;.override</title>
 
   <para>
-   The function <varname>override</varname> is usually available for all the
-   derivations in the nixpkgs expression (<varname>pkgs</varname>).
+   The function <varname>override</varname> is usually available for all the derivations in the nixpkgs expression (<varname>pkgs</varname>).
   </para>
 
   <para>
@@ -47,10 +42,7 @@ mypkg = pkgs.callPackage ./mypkg.nix {
   </para>
 
   <para>
-   In the first example, <varname>pkgs.foo</varname> is the result of a
-   function call with some default arguments, usually a derivation. Using
-   <varname>pkgs.foo.override</varname> will call the same function with the
-   given new arguments.
+   In the first example, <varname>pkgs.foo</varname> is the result of a function call with some default arguments, usually a derivation. Using <varname>pkgs.foo.override</varname> will call the same function with the given new arguments.
   </para>
  </section>
 
@@ -58,12 +50,7 @@ mypkg = pkgs.callPackage ./mypkg.nix {
   <title>&lt;pkg&gt;.overrideAttrs</title>
 
   <para>
-   The function <varname>overrideAttrs</varname> allows overriding the
-   attribute set passed to a <varname>stdenv.mkDerivation</varname> call,
-   producing a new derivation based on the original one. This function is
-   available on all derivations produced by the
-   <varname>stdenv.mkDerivation</varname> function, which is most packages in
-   the nixpkgs expression <varname>pkgs</varname>.
+   The function <varname>overrideAttrs</varname> allows overriding the attribute set passed to a <varname>stdenv.mkDerivation</varname> call, producing a new derivation based on the original one. This function is available on all derivations produced by the <varname>stdenv.mkDerivation</varname> function, which is most packages in the nixpkgs expression <varname>pkgs</varname>.
   </para>
 
   <para>
@@ -76,30 +63,16 @@ helloWithDebug = pkgs.hello.overrideAttrs (oldAttrs: rec {
   </para>
 
   <para>
-   In the above example, the <varname>separateDebugInfo</varname> attribute is
-   overridden to be true, thus building debug info for
-   <varname>helloWithDebug</varname>, while all other attributes will be
-   retained from the original <varname>hello</varname> package.
+   In the above example, the <varname>separateDebugInfo</varname> attribute is overridden to be true, thus building debug info for <varname>helloWithDebug</varname>, while all other attributes will be retained from the original <varname>hello</varname> package.
   </para>
 
   <para>
-   The argument <varname>oldAttrs</varname> is conventionally used to refer to
-   the attr set originally passed to <varname>stdenv.mkDerivation</varname>.
+   The argument <varname>oldAttrs</varname> is conventionally used to refer to the attr set originally passed to <varname>stdenv.mkDerivation</varname>.
   </para>
 
   <note>
    <para>
-    Note that <varname>separateDebugInfo</varname> is processed only by the
-    <varname>stdenv.mkDerivation</varname> function, not the generated, raw Nix
-    derivation. Thus, using <varname>overrideDerivation</varname> will not work
-    in this case, as it overrides only the attributes of the final derivation.
-    It is for this reason that <varname>overrideAttrs</varname> should be
-    preferred in (almost) all cases to <varname>overrideDerivation</varname>,
-    i.e. to allow using <varname>stdenv.mkDerivation</varname> to process input
-    arguments, as well as the fact that it is easier to use (you can use the
-    same attribute names you see in your Nix code, instead of the ones
-    generated (e.g. <varname>buildInputs</varname> vs
-    <varname>nativeBuildInputs</varname>), and it involves less typing).
+    Note that <varname>separateDebugInfo</varname> is processed only by the <varname>stdenv.mkDerivation</varname> function, not the generated, raw Nix derivation. Thus, using <varname>overrideDerivation</varname> will not work in this case, as it overrides only the attributes of the final derivation. It is for this reason that <varname>overrideAttrs</varname> should be preferred in (almost) all cases to <varname>overrideDerivation</varname>, i.e. to allow using <varname>stdenv.mkDerivation</varname> to process input arguments, as well as the fact that it is easier to use (you can use the same attribute names you see in your Nix code, instead of the ones generated (e.g. <varname>buildInputs</varname> vs <varname>nativeBuildInputs</varname>), and it involves less typing).
    </para>
   </note>
  </section>
@@ -109,34 +82,18 @@ helloWithDebug = pkgs.hello.overrideAttrs (oldAttrs: rec {
 
   <warning>
    <para>
-    You should prefer <varname>overrideAttrs</varname> in almost all cases, see
-    its documentation for the reasons why.
-    <varname>overrideDerivation</varname> is not deprecated and will continue
-    to work, but is less nice to use and does not have as many abilities as
-    <varname>overrideAttrs</varname>.
+    You should prefer <varname>overrideAttrs</varname> in almost all cases, see its documentation for the reasons why. <varname>overrideDerivation</varname> is not deprecated and will continue to work, but is less nice to use and does not have as many abilities as <varname>overrideAttrs</varname>.
    </para>
   </warning>
 
   <warning>
    <para>
-    Do not use this function in Nixpkgs as it evaluates a Derivation before
-    modifying it, which breaks package abstraction and removes error-checking
-    of function arguments. In addition, this evaluation-per-function
-    application incurs a performance penalty, which can become a problem if
-    many overrides are used. It is only intended for ad-hoc customisation, such
-    as in <filename>~/.config/nixpkgs/config.nix</filename>.
+    Do not use this function in Nixpkgs as it evaluates a Derivation before modifying it, which breaks package abstraction and removes error-checking of function arguments. In addition, this evaluation-per-function application incurs a performance penalty, which can become a problem if many overrides are used. It is only intended for ad-hoc customisation, such as in <filename>~/.config/nixpkgs/config.nix</filename>.
    </para>
   </warning>
 
   <para>
-   The function <varname>overrideDerivation</varname> creates a new derivation
-   based on an existing one by overriding the original's attributes with the
-   attribute set produced by the specified function. This function is available
-   on all derivations defined using the <varname>makeOverridable</varname>
-   function. Most standard derivation-producing functions, such as
-   <varname>stdenv.mkDerivation</varname>, are defined using this function,
-   which means most packages in the nixpkgs expression,
-   <varname>pkgs</varname>, have this function.
+   The function <varname>overrideDerivation</varname> creates a new derivation based on an existing one by overriding the original's attributes with the attribute set produced by the specified function. This function is available on all derivations defined using the <varname>makeOverridable</varname> function. Most standard derivation-producing functions, such as <varname>stdenv.mkDerivation</varname>, are defined using this function, which means most packages in the nixpkgs expression, <varname>pkgs</varname>, have this function.
   </para>
 
   <para>
@@ -154,27 +111,16 @@ mySed = pkgs.gnused.overrideDerivation (oldAttrs: {
   </para>
 
   <para>
-   In the above example, the <varname>name</varname>, <varname>src</varname>,
-   and <varname>patches</varname> of the derivation will be overridden, while
-   all other attributes will be retained from the original derivation.
+   In the above example, the <varname>name</varname>, <varname>src</varname>, and <varname>patches</varname> of the derivation will be overridden, while all other attributes will be retained from the original derivation.
   </para>
 
   <para>
-   The argument <varname>oldAttrs</varname> is used to refer to the attribute
-   set of the original derivation.
+   The argument <varname>oldAttrs</varname> is used to refer to the attribute set of the original derivation.
   </para>
 
   <note>
    <para>
-    A package's attributes are evaluated *before* being modified by the
-    <varname>overrideDerivation</varname> function. For example, the
-    <varname>name</varname> attribute reference in <varname>url =
-    "mirror://gnu/hello/${name}.tar.gz";</varname> is filled-in *before* the
-    <varname>overrideDerivation</varname> function modifies the attribute set.
-    This means that overriding the <varname>name</varname> attribute, in this
-    example, *will not* change the value of the <varname>url</varname>
-    attribute. Instead, we need to override both the <varname>name</varname>
-    *and* <varname>url</varname> attributes.
+    A package's attributes are evaluated *before* being modified by the <varname>overrideDerivation</varname> function. For example, the <varname>name</varname> attribute reference in <varname>url = "mirror://gnu/hello/${name}.tar.gz";</varname> is filled-in *before* the <varname>overrideDerivation</varname> function modifies the attribute set. This means that overriding the <varname>name</varname> attribute, in this example, *will not* change the value of the <varname>url</varname> attribute. Instead, we need to override both the <varname>name</varname> *and* <varname>url</varname> attributes.
    </para>
   </note>
  </section>
@@ -183,9 +129,7 @@ mySed = pkgs.gnused.overrideDerivation (oldAttrs: {
   <title>lib.makeOverridable</title>
 
   <para>
-   The function <varname>lib.makeOverridable</varname> is used to make the
-   result of a function easily customizable. This utility only makes sense for
-   functions that accept an argument set and return an attribute set.
+   The function <varname>lib.makeOverridable</varname> is used to make the result of a function easily customizable. This utility only makes sense for functions that accept an argument set and return an attribute set.
   </para>
 
   <para>
@@ -197,16 +141,11 @@ c = lib.makeOverridable f { a = 1; b = 2; };
   </para>
 
   <para>
-   The variable <varname>c</varname> is the value of the <varname>f</varname>
-   function applied with some default arguments. Hence the value of
-   <varname>c.result</varname> is <literal>3</literal>, in this example.
+   The variable <varname>c</varname> is the value of the <varname>f</varname> function applied with some default arguments. Hence the value of <varname>c.result</varname> is <literal>3</literal>, in this example.
   </para>
 
   <para>
-   The variable <varname>c</varname> however also has some additional
-   functions, like <link linkend="sec-pkg-override">c.override</link> which can
-   be used to override the default arguments. In this example the value of
-   <varname>(c.override { a = 4; }).result</varname> is 6.
+   The variable <varname>c</varname> however also has some additional functions, like <link linkend="sec-pkg-override">c.override</link> which can be used to override the default arguments. In this example the value of <varname>(c.override { a = 4; }).result</varname> is 6.
   </para>
  </section>
 </section>
diff --git a/doc/functions/prefer-remote-fetch.xml b/doc/functions/prefer-remote-fetch.xml
index 3e43fd28ade..94d25d3d3ae 100644
--- a/doc/functions/prefer-remote-fetch.xml
+++ b/doc/functions/prefer-remote-fetch.xml
@@ -5,16 +5,12 @@
  <title>prefer-remote-fetch overlay</title>
 
  <para>
-  <function>prefer-remote-fetch</function> is an overlay that download sources
-  on remote builder. This is useful when the evaluating machine has a slow
-  upload while the builder can fetch faster directly from the source. To use
-  it, put the following snippet as a new overlay:
+  <function>prefer-remote-fetch</function> is an overlay that download sources on remote builder. This is useful when the evaluating machine has a slow upload while the builder can fetch faster directly from the source. To use it, put the following snippet as a new overlay:
 <programlisting>
 self: super:
   (super.prefer-remote-fetch self super)
 </programlisting>
-  A full configuration example for that sets the overlay up for your own
-  account, could look like this
+  A full configuration example for that sets the overlay up for your own account, could look like this
 <screen>
 <prompt>$ </prompt>mkdir ~/.config/nixpkgs/overlays/
 <prompt>$ </prompt>cat &gt; ~/.config/nixpkgs/overlays/prefer-remote-fetch.nix &lt;&lt;EOF
diff --git a/doc/functions/shell.xml b/doc/functions/shell.xml
index e5031c9463c..cef65d06b88 100644
--- a/doc/functions/shell.xml
+++ b/doc/functions/shell.xml
@@ -5,9 +5,7 @@
  <title>pkgs.mkShell</title>
 
  <para>
-  <function>pkgs.mkShell</function> is a special kind of derivation that is
-  only useful when using it combined with <command>nix-shell</command>. It will
-  in fact fail to instantiate when invoked with <command>nix-build</command>.
+  <function>pkgs.mkShell</function> is a special kind of derivation that is only useful when using it combined with <command>nix-shell</command>. It will in fact fail to instantiate when invoked with <command>nix-build</command>.
  </para>
 
  <section xml:id="sec-pkgs-mkShell-usage">
diff --git a/doc/functions/snaptools.xml b/doc/functions/snaptools.xml
index d0e3efdf6c6..422fcfa37d8 100644
--- a/doc/functions/snaptools.xml
+++ b/doc/functions/snaptools.xml
@@ -5,28 +5,22 @@
  <title>pkgs.snapTools</title>
 
  <para>
-  <varname>pkgs.snapTools</varname> is a set of functions for creating
-  Snapcraft images. Snap and Snapcraft is not used to perform these operations.
+  <varname>pkgs.snapTools</varname> is a set of functions for creating Snapcraft images. Snap and Snapcraft is not used to perform these operations.
  </para>
 
  <section xml:id="ssec-pkgs-snapTools-makeSnap-signature">
   <title>The makeSnap Function</title>
 
   <para>
-   <function>makeSnap</function> takes a single named argument,
-   <parameter>meta</parameter>. This argument mirrors
-   <link xlink:href="https://docs.snapcraft.io/snap-format">the upstream
-   <filename>snap.yaml</filename> format</link> exactly.
+   <function>makeSnap</function> takes a single named argument, <parameter>meta</parameter>. This argument mirrors <link xlink:href="https://docs.snapcraft.io/snap-format">the upstream <filename>snap.yaml</filename> format</link> exactly.
   </para>
 
   <para>
-   The <parameter>base</parameter> should not be be specified, as
-   <function>makeSnap</function> will force set it.
+   The <parameter>base</parameter> should not be be specified, as <function>makeSnap</function> will force set it.
   </para>
 
   <para>
-   Currently, <function>makeSnap</function> does not support creating GUI
-   stubs.
+   Currently, <function>makeSnap</function> does not support creating GUI stubs.
   </para>
  </section>
 
@@ -40,9 +34,7 @@
    </para>
 <programlisting><xi:include href="./snap/example-hello.nix" parse="text" /></programlisting>
    <para>
-    <command>nix-build</command> this expression and install it with
-    <command>snap install ./result --dangerous</command>.
-    <command>hello</command> will now be the Snapcraft version of the package.
+    <command>nix-build</command> this expression and install it with <command>snap install ./result --dangerous</command>. <command>hello</command> will now be the Snapcraft version of the package.
    </para>
   </example>
  </section>
@@ -53,21 +45,14 @@
   <example xml:id="ex-snapTools-buildSnap-firefox">
    <title>Making a Graphical Snap</title>
    <para>
-    Graphical programs require many more integrations with the host. This
-    example uses Firefox as an example, because it is one of the most
-    complicated programs we could package.
+    Graphical programs require many more integrations with the host. This example uses Firefox as an example, because it is one of the most complicated programs we could package.
    </para>
 <programlisting><xi:include href="./snap/example-firefox.nix" parse="text" /></programlisting>
    <para>
-    <command>nix-build</command> this expression and install it with
-    <command>snap install ./result --dangerous</command>.
-    <command>nix-example-firefox</command> will now be the Snapcraft version of
-    the Firefox package.
+    <command>nix-build</command> this expression and install it with <command>snap install ./result --dangerous</command>. <command>nix-example-firefox</command> will now be the Snapcraft version of the Firefox package.
    </para>
    <para>
-    The specific meaning behind plugs can be looked up in the
-    <link xlink:href="https://docs.snapcraft.io/supported-interfaces">Snapcraft
-    interface documentation</link>.
+    The specific meaning behind plugs can be looked up in the <link xlink:href="https://docs.snapcraft.io/supported-interfaces">Snapcraft interface documentation</link>.
    </para>
   </example>
  </section>
diff --git a/doc/functions/trivial-builders.xml b/doc/functions/trivial-builders.xml
index 0211a4f3172..ae9f3a1b255 100644
--- a/doc/functions/trivial-builders.xml
+++ b/doc/functions/trivial-builders.xml
@@ -5,11 +5,7 @@
  <title>Trivial builders</title>
 
  <para>
-  Nixpkgs provides a couple of functions that help with building derivations.
-  The most important one, <function>stdenv.mkDerivation</function>, has already
-  been documented above. The following functions wrap
-  <function>stdenv.mkDerivation</function>, making it easier to use in certain
-  cases.
+  Nixpkgs provides a couple of functions that help with building derivations. The most important one, <function>stdenv.mkDerivation</function>, has already been documented above. The following functions wrap <function>stdenv.mkDerivation</function>, making it easier to use in certain cases.
  </para>
 
  <variablelist>
@@ -19,17 +15,7 @@
    </term>
    <listitem>
     <para>
-     This takes three arguments, <literal>name</literal>,
-     <literal>env</literal>, and <literal>buildCommand</literal>.
-     <literal>name</literal> is just the name that Nix will append to the store
-     path in the same way that <literal>stdenv.mkDerivation</literal> uses its
-     <literal>name</literal> attribute. <literal>env</literal> is an attribute
-     set specifying environment variables that will be set for this derivation.
-     These attributes are then passed to the wrapped
-     <literal>stdenv.mkDerivation</literal>. <literal>buildCommand</literal>
-     specifies the commands that will be run to create this derivation. Note
-     that you will need to create <literal>$out</literal> for Nix to register
-     the command as successful.
+     This takes three arguments, <literal>name</literal>, <literal>env</literal>, and <literal>buildCommand</literal>. <literal>name</literal> is just the name that Nix will append to the store path in the same way that <literal>stdenv.mkDerivation</literal> uses its <literal>name</literal> attribute. <literal>env</literal> is an attribute set specifying environment variables that will be set for this derivation. These attributes are then passed to the wrapped <literal>stdenv.mkDerivation</literal>. <literal>buildCommand</literal> specifies the commands that will be run to create this derivation. Note that you will need to create <literal>$out</literal> for Nix to register the command as successful.
     </para>
     <para>
      An example of using <literal>runCommand</literal> is provided below.
@@ -62,10 +48,7 @@
    </term>
    <listitem>
     <para>
-     This works just like <literal>runCommand</literal>. The only difference is
-     that it also provides a C compiler in <literal>buildCommand</literal>’s
-     environment. To minimize your dependencies, you should only use this if
-     you are sure you will need a C compiler as part of running your command.
+     This works just like <literal>runCommand</literal>. The only difference is that it also provides a C compiler in <literal>buildCommand</literal>’s environment. To minimize your dependencies, you should only use this if you are sure you will need a C compiler as part of running your command.
     </para>
    </listitem>
   </varlistentry>
@@ -75,20 +58,10 @@
    </term>
    <listitem>
     <para>
-     These functions write <literal>text</literal> to the Nix store. This is
-     useful for creating scripts from Nix expressions.
-     <literal>writeTextFile</literal> takes an attribute set and expects two
-     arguments, <literal>name</literal> and <literal>text</literal>.
-     <literal>name</literal> corresponds to the name used in the Nix store
-     path. <literal>text</literal> will be the contents of the file. You can
-     also set <literal>executable</literal> to true to make this file have the
-     executable bit set.
+     These functions write <literal>text</literal> to the Nix store. This is useful for creating scripts from Nix expressions. <literal>writeTextFile</literal> takes an attribute set and expects two arguments, <literal>name</literal> and <literal>text</literal>. <literal>name</literal> corresponds to the name used in the Nix store path. <literal>text</literal> will be the contents of the file. You can also set <literal>executable</literal> to true to make this file have the executable bit set.
     </para>
     <para>
-     Many more commands wrap <literal>writeTextFile</literal> including
-     <literal>writeText</literal>, <literal>writeTextDir</literal>,
-     <literal>writeScript</literal>, and <literal>writeScriptBin</literal>.
-     These are convenience functions over <literal>writeTextFile</literal>.
+     Many more commands wrap <literal>writeTextFile</literal> including <literal>writeText</literal>, <literal>writeTextDir</literal>, <literal>writeScript</literal>, and <literal>writeScriptBin</literal>. These are convenience functions over <literal>writeTextFile</literal>.
     </para>
    </listitem>
   </varlistentry>
@@ -98,14 +71,7 @@
    </term>
    <listitem>
     <para>
-     This can be used to put many derivations into the same directory
-     structure. It works by creating a new derivation and adding symlinks to
-     each of the paths listed. It expects two arguments,
-     <literal>name</literal>, and <literal>paths</literal>.
-     <literal>name</literal> is the name used in the Nix store path for the
-     created derivation. <literal>paths</literal> is a list of paths that will
-     be symlinked. These paths can be to Nix store derivations or any other
-     subdirectory contained within.
+     This can be used to put many derivations into the same directory structure. It works by creating a new derivation and adding symlinks to each of the paths listed. It expects two arguments, <literal>name</literal>, and <literal>paths</literal>. <literal>name</literal> is the name used in the Nix store path for the created derivation. <literal>paths</literal> is a list of paths that will be symlinked. These paths can be to Nix store derivations or any other subdirectory contained within.
     </para>
    </listitem>
   </varlistentry>
diff --git a/doc/languages-frameworks/beam.xml b/doc/languages-frameworks/beam.xml
index dee7f2d7419..65f28d0a2d3 100644
--- a/doc/languages-frameworks/beam.xml
+++ b/doc/languages-frameworks/beam.xml
@@ -7,12 +7,7 @@
   <title>Introduction</title>
 
   <para>
-   In this document and related Nix expressions, we use the term,
-   <emphasis>BEAM</emphasis>, to describe the environment. BEAM is the name of
-   the Erlang Virtual Machine and, as far as we're concerned, from a packaging
-   perspective, all languages that run on the BEAM are interchangeable. That
-   which varies, like the build system, is transparent to users of any given
-   BEAM package, so we make no distinction.
+   In this document and related Nix expressions, we use the term, <emphasis>BEAM</emphasis>, to describe the environment. BEAM is the name of the Erlang Virtual Machine and, as far as we're concerned, from a packaging perspective, all languages that run on the BEAM are interchangeable. That which varies, like the build system, is transparent to users of any given BEAM package, so we make no distinction.
   </para>
  </section>
 
@@ -20,57 +15,36 @@
   <title>Structure</title>
 
   <para>
-   All BEAM-related expressions are available via the top-level
-   <literal>beam</literal> attribute, which includes:
+   All BEAM-related expressions are available via the top-level <literal>beam</literal> attribute, which includes:
   </para>
 
   <itemizedlist>
    <listitem>
     <para>
-     <literal>interpreters</literal>: a set of compilers running on the BEAM,
-     including multiple Erlang/OTP versions
-     (<literal>beam.interpreters.erlangR19</literal>, etc), Elixir
-     (<literal>beam.interpreters.elixir</literal>) and LFE
-     (<literal>beam.interpreters.lfe</literal>).
+     <literal>interpreters</literal>: a set of compilers running on the BEAM, including multiple Erlang/OTP versions (<literal>beam.interpreters.erlangR19</literal>, etc), Elixir (<literal>beam.interpreters.elixir</literal>) and LFE (<literal>beam.interpreters.lfe</literal>).
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>packages</literal>: a set of package sets, each compiled with a
-     specific Erlang/OTP version, e.g.
-     <literal>beam.packages.erlangR19</literal>.
+     <literal>packages</literal>: a set of package sets, each compiled with a specific Erlang/OTP version, e.g. <literal>beam.packages.erlangR19</literal>.
     </para>
    </listitem>
   </itemizedlist>
 
   <para>
-   The default Erlang compiler, defined by
-   <literal>beam.interpreters.erlang</literal>, is aliased as
-   <literal>erlang</literal>. The default BEAM package set is defined by
-   <literal>beam.packages.erlang</literal> and aliased at the top level as
-   <literal>beamPackages</literal>.
+   The default Erlang compiler, defined by <literal>beam.interpreters.erlang</literal>, is aliased as <literal>erlang</literal>. The default BEAM package set is defined by <literal>beam.packages.erlang</literal> and aliased at the top level as <literal>beamPackages</literal>.
   </para>
 
   <para>
-   To create a package set built with a custom Erlang version, use the lambda,
-   <literal>beam.packagesWith</literal>, which accepts an Erlang/OTP derivation
-   and produces a package set similar to
-   <literal>beam.packages.erlang</literal>.
+   To create a package set built with a custom Erlang version, use the lambda, <literal>beam.packagesWith</literal>, which accepts an Erlang/OTP derivation and produces a package set similar to <literal>beam.packages.erlang</literal>.
   </para>
 
   <para>
-   Many Erlang/OTP distributions available in
-   <literal>beam.interpreters</literal> have versions with ODBC and/or Java
-   enabled. For example, there's
-   <literal>beam.interpreters.erlangR19_odbc_javac</literal>, which corresponds
-   to <literal>beam.interpreters.erlangR19</literal>.
+   Many Erlang/OTP distributions available in <literal>beam.interpreters</literal> have versions with ODBC and/or Java enabled. For example, there's <literal>beam.interpreters.erlangR19_odbc_javac</literal>, which corresponds to <literal>beam.interpreters.erlangR19</literal>.
   </para>
 
   <para xml:id="erlang-call-package">
-   We also provide the lambda,
-   <literal>beam.packages.erlang.callPackage</literal>, which simplifies
-   writing BEAM package definitions by injecting all packages from
-   <literal>beam.packages.erlang</literal> into the top-level context.
+   We also provide the lambda, <literal>beam.packages.erlang.callPackage</literal>, which simplifies writing BEAM package definitions by injecting all packages from <literal>beam.packages.erlang</literal> into the top-level context.
   </para>
  </section>
 
@@ -81,24 +55,16 @@
    <title>Rebar3</title>
 
    <para>
-    By default, Rebar3 wants to manage its own dependencies. This is perfectly
-    acceptable in the normal, non-Nix setup, but in the Nix world, it is not.
-    To rectify this, we provide two versions of Rebar3:
+    By default, Rebar3 wants to manage its own dependencies. This is perfectly acceptable in the normal, non-Nix setup, but in the Nix world, it is not. To rectify this, we provide two versions of Rebar3:
     <itemizedlist>
      <listitem>
       <para>
-       <literal>rebar3</literal>: patched to remove the ability to download
-       anything. When not running it via <literal>nix-shell</literal> or
-       <literal>nix-build</literal>, it's probably not going to work as
-       desired.
+       <literal>rebar3</literal>: patched to remove the ability to download anything. When not running it via <literal>nix-shell</literal> or <literal>nix-build</literal>, it's probably not going to work as desired.
       </para>
      </listitem>
      <listitem>
       <para>
-       <literal>rebar3-open</literal>: the normal, unmodified Rebar3. It should
-       work exactly as would any other version of Rebar3. Any Erlang package
-       should rely on <literal>rebar3</literal> instead. See
-       <xref
+       <literal>rebar3-open</literal>: the normal, unmodified Rebar3. It should work exactly as would any other version of Rebar3. Any Erlang package should rely on <literal>rebar3</literal> instead. See <xref
             linkend="rebar3-packages"/>.
       </para>
      </listitem>
@@ -110,10 +76,7 @@
    <title>Mix &amp; Erlang.mk</title>
 
    <para>
-    Both Mix and Erlang.mk work exactly as expected. There is a bootstrap
-    process that needs to be run for both, however, which is supported by the
-    <literal>buildMix</literal> and <literal>buildErlangMk</literal>
-    derivations, respectively.
+    Both Mix and Erlang.mk work exactly as expected. There is a bootstrap process that needs to be run for both, however, which is supported by the <literal>buildMix</literal> and <literal>buildErlangMk</literal> derivations, respectively.
    </para>
   </section>
  </section>
@@ -122,13 +85,7 @@
   <title>How to Install BEAM Packages</title>
 
   <para>
-   BEAM packages are not registered at the top level, simply because they are
-   not relevant to the vast majority of Nix users. They are installable using
-   the <literal>beam.packages.erlang</literal> attribute set (aliased as
-   <literal>beamPackages</literal>), which points to packages built by the
-   default Erlang/OTP version in Nixpkgs, as defined by
-   <literal>beam.interpreters.erlang</literal>. To list the available packages
-   in <literal>beamPackages</literal>, use the following command:
+   BEAM packages are not registered at the top level, simply because they are not relevant to the vast majority of Nix users. They are installable using the <literal>beam.packages.erlang</literal> attribute set (aliased as <literal>beamPackages</literal>), which points to packages built by the default Erlang/OTP version in Nixpkgs, as defined by <literal>beam.interpreters.erlang</literal>. To list the available packages in <literal>beamPackages</literal>, use the following command:
   </para>
 
 <screen>
@@ -143,8 +100,7 @@ beamPackages.rebar3-pc  pc-1.1.0
 </screen>
 
   <para>
-   To install any of those packages into your profile, refer to them by their
-   attribute path (first column):
+   To install any of those packages into your profile, refer to them by their attribute path (first column):
   </para>
 
 <screen>
@@ -152,9 +108,7 @@ beamPackages.rebar3-pc  pc-1.1.0
 </screen>
 
   <para>
-   The attribute path of any BEAM package corresponds to the name of that
-   particular package in <link xlink:href="https://hex.pm">Hex</link> or its
-   OTP Application/Release name.
+   The attribute path of any BEAM package corresponds to the name of that particular package in <link xlink:href="https://hex.pm">Hex</link> or its OTP Application/Release name.
   </para>
  </section>
 
@@ -168,13 +122,8 @@ beamPackages.rebar3-pc  pc-1.1.0
     <title>Rebar3 Packages</title>
 
     <para>
-     The Nix function, <literal>buildRebar3</literal>, defined in
-     <literal>beam.packages.erlang.buildRebar3</literal> and aliased at the top
-     level, can be used to build a derivation that understands how to build a
-     Rebar3 project. For example, we can build
-     <link
-        xlink:href="https://github.com/erlang-nix/hex2nix">hex2nix</link>
-     as follows:
+     The Nix function, <literal>buildRebar3</literal>, defined in <literal>beam.packages.erlang.buildRebar3</literal> and aliased at the top level, can be used to build a derivation that understands how to build a Rebar3 project. For example, we can build <link
+        xlink:href="https://github.com/erlang-nix/hex2nix">hex2nix</link> as follows:
     </para>
 
 <programlisting>
@@ -196,25 +145,16 @@ buildRebar3 rec {
 </programlisting>
 
     <para>
-     Such derivations are callable with
-     <literal>beam.packages.erlang.callPackage</literal> (see
-     <xref
-        linkend="erlang-call-package"/>). To call this package using
-     the normal <literal>callPackage</literal>, refer to dependency packages
-     via <literal>beamPackages</literal>, e.g.
-     <literal>beamPackages.ibrowse</literal>.
+     Such derivations are callable with <literal>beam.packages.erlang.callPackage</literal> (see <xref
+        linkend="erlang-call-package"/>). To call this package using the normal <literal>callPackage</literal>, refer to dependency packages via <literal>beamPackages</literal>, e.g. <literal>beamPackages.ibrowse</literal>.
     </para>
 
     <para>
-     Notably, <literal>buildRebar3</literal> includes
-     <literal>beamDeps</literal>, while <literal>stdenv.mkDerivation</literal>
-     does not. BEAM dependencies added there will be correctly handled by the
-     system.
+     Notably, <literal>buildRebar3</literal> includes <literal>beamDeps</literal>, while <literal>stdenv.mkDerivation</literal> does not. BEAM dependencies added there will be correctly handled by the system.
     </para>
 
     <para>
-     If a package needs to compile native code via Rebar3's port compilation
-     mechanism, add <literal>compilePort = true;</literal> to the derivation.
+     If a package needs to compile native code via Rebar3's port compilation mechanism, add <literal>compilePort = true;</literal> to the derivation.
     </para>
    </section>
 
@@ -222,9 +162,7 @@ buildRebar3 rec {
     <title>Erlang.mk Packages</title>
 
     <para>
-     Erlang.mk functions similarly to Rebar3, except we use
-     <literal>buildErlangMk</literal> instead of
-     <literal>buildRebar3</literal>.
+     Erlang.mk functions similarly to Rebar3, except we use <literal>buildErlangMk</literal> instead of <literal>buildRebar3</literal>.
     </para>
 
 <programlisting>
@@ -257,8 +195,7 @@ buildErlangMk {
     <title>Mix Packages</title>
 
     <para>
-     Mix functions similarly to Rebar3, except we use
-     <literal>buildMix</literal> instead of <literal>buildRebar3</literal>.
+     Mix functions similarly to Rebar3, except we use <literal>buildMix</literal> instead of <literal>buildRebar3</literal>.
     </para>
 
 <programlisting>
@@ -323,11 +260,7 @@ buildHex {
    <title>Accessing an Environment</title>
 
    <para>
-    Often, we simply want to access a valid environment that contains a
-    specific package and its dependencies. We can accomplish that with the
-    <literal>env</literal> attribute of a derivation. For example, let's say we
-    want to access an Erlang REPL with <literal>ibrowse</literal> loaded up. We
-    could do the following:
+    Often, we simply want to access a valid environment that contains a specific package and its dependencies. We can accomplish that with the <literal>env</literal> attribute of a derivation. For example, let's say we want to access an Erlang REPL with <literal>ibrowse</literal> loaded up. We could do the following:
    </para>
 
 <screen>
@@ -373,8 +306,7 @@ ok</computeroutput>
 </screen>
 
    <para>
-    Notice the <literal>-A beamPackages.ibrowse.env</literal>. That is the key
-    to this functionality.
+    Notice the <literal>-A beamPackages.ibrowse.env</literal>. That is the key to this functionality.
    </para>
   </section>
 
@@ -382,11 +314,7 @@ ok</computeroutput>
    <title>Creating a Shell</title>
 
    <para>
-    Getting access to an environment often isn't enough to do real development.
-    Usually, we need to create a <literal>shell.nix</literal> file and do our
-    development inside of the environment specified therein. This file looks a
-    lot like the packaging described above, except that <literal>src</literal>
-    points to the project root and we call the package directly.
+    Getting access to an environment often isn't enough to do real development. Usually, we need to create a <literal>shell.nix</literal> file and do our development inside of the environment specified therein. This file looks a lot like the packaging described above, except that <literal>src</literal> points to the project root and we call the package directly.
    </para>
 
 <programlisting>
@@ -414,8 +342,7 @@ in
     <title>Building in a Shell (for Mix Projects)</title>
 
     <para>
-     We can leverage the support of the derivation, irrespective of the build
-     derivation, by calling the commands themselves.
+     We can leverage the support of the derivation, irrespective of the build derivation, by calling the commands themselves.
     </para>
 
 <programlisting>
@@ -477,12 +404,8 @@ analyze: build plt
 </programlisting>
 
     <para>
-     Using a <literal>shell.nix</literal> as described (see
-     <xref
-      linkend="creating-a-shell"/>) should just work. Aside from
-     <literal>test</literal>, <literal>plt</literal>, and
-     <literal>analyze</literal>, the Make targets work just fine for all of the
-     build derivations.
+     Using a <literal>shell.nix</literal> as described (see <xref
+      linkend="creating-a-shell"/>) should just work. Aside from <literal>test</literal>, <literal>plt</literal>, and <literal>analyze</literal>, the Make targets work just fine for all of the build derivations.
     </para>
    </section>
   </section>
@@ -492,25 +415,14 @@ analyze: build plt
   <title>Generating Packages from Hex with <literal>hex2nix</literal></title>
 
   <para>
-   Updating the <link xlink:href="https://hex.pm">Hex</link> package set
-   requires
-   <link
-    xlink:href="https://github.com/erlang-nix/hex2nix">hex2nix</link>.
-   Given the path to the Erlang modules (usually
-   <literal>pkgs/development/erlang-modules</literal>), it will dump a file
-   called <literal>hex-packages.nix</literal>, containing all the packages that
-   use a recognized build system in
-   <link
-    xlink:href="https://hex.pm">Hex</link>. It can't be determined,
-   however, whether every package is buildable.
+   Updating the <link xlink:href="https://hex.pm">Hex</link> package set requires <link
+    xlink:href="https://github.com/erlang-nix/hex2nix">hex2nix</link>. Given the path to the Erlang modules (usually <literal>pkgs/development/erlang-modules</literal>), it will dump a file called <literal>hex-packages.nix</literal>, containing all the packages that use a recognized build system in <link
+    xlink:href="https://hex.pm">Hex</link>. It can't be determined, however, whether every package is buildable.
   </para>
 
   <para>
-   To make life easier for our users, try to build every
-   <link
-      xlink:href="https://hex.pm">Hex</link> package and remove those
-   that fail. To do that, simply run the following command in the root of your
-   <literal>nixpkgs</literal> repository:
+   To make life easier for our users, try to build every <link
+      xlink:href="https://hex.pm">Hex</link> package and remove those that fail. To do that, simply run the following command in the root of your <literal>nixpkgs</literal> repository:
   </para>
 
 <screen>
@@ -518,11 +430,8 @@ analyze: build plt
 </screen>
 
   <para>
-   That will attempt to build every package in <literal>beamPackages</literal>.
-   Then manually remove those that fail. Hopefully, someone will improve
-   <link
-      xlink:href="https://github.com/erlang-nix/hex2nix">hex2nix</link>
-   in the future to automate the process.
+   That will attempt to build every package in <literal>beamPackages</literal>. Then manually remove those that fail. Hopefully, someone will improve <link
+      xlink:href="https://github.com/erlang-nix/hex2nix">hex2nix</link> in the future to automate the process.
   </para>
  </section>
 </section>
diff --git a/doc/languages-frameworks/bower.xml b/doc/languages-frameworks/bower.xml
index 118f6e10473..b0738cad293 100644
--- a/doc/languages-frameworks/bower.xml
+++ b/doc/languages-frameworks/bower.xml
@@ -4,32 +4,22 @@
  <title>Bower</title>
 
  <para>
-  <link xlink:href="http://bower.io">Bower</link> is a package manager for web
-  site front-end components. Bower packages (comprising of build artefacts and
-  sometimes sources) are stored in <command>git</command> repositories,
-  typically on Github. The package registry is run by the Bower team with
-  package metadata coming from the <filename>bower.json</filename> file within
-  each package.
+  <link xlink:href="http://bower.io">Bower</link> is a package manager for web site front-end components. Bower packages (comprising of build artefacts and sometimes sources) are stored in <command>git</command> repositories, typically on Github. The package registry is run by the Bower team with package metadata coming from the <filename>bower.json</filename> file within each package.
  </para>
 
  <para>
-  The end result of running Bower is a <filename>bower_components</filename>
-  directory which can be included in the web app's build process.
+  The end result of running Bower is a <filename>bower_components</filename> directory which can be included in the web app's build process.
  </para>
 
  <para>
-  Bower can be run interactively, by installing
-  <varname>nodePackages.bower</varname>. More interestingly, the Bower
-  components can be declared in a Nix derivation, with the help of
-  <varname>nodePackages.bower2nix</varname>.
+  Bower can be run interactively, by installing <varname>nodePackages.bower</varname>. More interestingly, the Bower components can be declared in a Nix derivation, with the help of <varname>nodePackages.bower2nix</varname>.
  </para>
 
  <section xml:id="ssec-bower2nix-usage">
   <title><command>bower2nix</command> usage</title>
 
   <para>
-   Suppose you have a <filename>bower.json</filename> with the following
-   contents:
+   Suppose you have a <filename>bower.json</filename> with the following contents:
    <example xml:id="ex-bowerJson">
     <title><filename>bower.json</filename></title>
 <programlisting language="json">
@@ -45,8 +35,7 @@
   </para>
 
   <para>
-   Running <command>bower2nix</command> will produce something like the
-   following output:
+   Running <command>bower2nix</command> will produce something like the following output:
 <programlisting language="nix">
 <![CDATA[{ fetchbower, buildEnv }:
 buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [
@@ -58,15 +47,11 @@ buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [
   </para>
 
   <para>
-   Using the <command>bower2nix</command> command line arguments, the output
-   can be redirected to a file. A name like
-   <filename>bower-packages.nix</filename> would be fine.
+   Using the <command>bower2nix</command> command line arguments, the output can be redirected to a file. A name like <filename>bower-packages.nix</filename> would be fine.
   </para>
 
   <para>
-   The resulting derivation is a union of all the downloaded Bower packages
-   (and their dependencies). To use it, they still need to be linked together
-   by Bower, which is where <varname>buildBowerComponents</varname> is useful.
+   The resulting derivation is a union of all the downloaded Bower packages (and their dependencies). To use it, they still need to be linked together by Bower, which is where <varname>buildBowerComponents</varname> is useful.
   </para>
  </section>
 
@@ -74,10 +59,7 @@ buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [
   <title><varname>buildBowerComponents</varname> function</title>
 
   <para>
-   The function is implemented in
-   <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/bower-modules/generic/default.nix">
-   <filename>pkgs/development/bower-modules/generic/default.nix</filename></link>.
-   Example usage:
+   The function is implemented in <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/bower-modules/generic/default.nix"> <filename>pkgs/development/bower-modules/generic/default.nix</filename></link>. Example usage:
    <example xml:id="ex-buildBowerComponents">
     <title>buildBowerComponents</title>
 <programlisting language="nix">
@@ -91,34 +73,27 @@ bowerComponents = buildBowerComponents {
   </para>
 
   <para>
-   In <xref linkend="ex-buildBowerComponents" />, the following arguments are
-   of special significance to the function:
+   In <xref linkend="ex-buildBowerComponents" />, the following arguments are of special significance to the function:
    <calloutlist>
     <callout arearefs="ex-buildBowerComponents-1">
      <para>
-      <varname>generated</varname> specifies the file which was created by
-      <command>bower2nix</command>.
+      <varname>generated</varname> specifies the file which was created by <command>bower2nix</command>.
      </para>
     </callout>
     <callout arearefs="ex-buildBowerComponents-2">
      <para>
-      <varname>src</varname> is your project's sources. It needs to contain a
-      <filename>bower.json</filename> file.
+      <varname>src</varname> is your project's sources. It needs to contain a <filename>bower.json</filename> file.
      </para>
     </callout>
    </calloutlist>
   </para>
 
   <para>
-   <varname>buildBowerComponents</varname> will run Bower to link together the
-   output of <command>bower2nix</command>, resulting in a
-   <filename>bower_components</filename> directory which can be used.
+   <varname>buildBowerComponents</varname> will run Bower to link together the output of <command>bower2nix</command>, resulting in a <filename>bower_components</filename> directory which can be used.
   </para>
 
   <para>
-   Here is an example of a web frontend build process using
-   <command>gulp</command>. You might use <command>grunt</command>, or anything
-   else.
+   Here is an example of a web frontend build process using <command>gulp</command>. You might use <command>grunt</command>, or anything else.
   </para>
 
   <example xml:id="ex-bowerGulpFile">
@@ -174,21 +149,17 @@ pkgs.stdenv.mkDerivation {
    <calloutlist>
     <callout arearefs="ex-buildBowerComponentsDefault-1">
      <para>
-      The result of <varname>buildBowerComponents</varname> is an input to the
-      frontend build.
+      The result of <varname>buildBowerComponents</varname> is an input to the frontend build.
      </para>
     </callout>
     <callout arearefs="ex-buildBowerComponentsDefault-2">
      <para>
-      Whether to symlink or copy the <filename>bower_components</filename>
-      directory depends on the build tool in use. In this case a copy is used
-      to avoid <command>gulp</command> silliness with permissions.
+      Whether to symlink or copy the <filename>bower_components</filename> directory depends on the build tool in use. In this case a copy is used to avoid <command>gulp</command> silliness with permissions.
      </para>
     </callout>
     <callout arearefs="ex-buildBowerComponentsDefault-3">
      <para>
-      <command>gulp</command> requires <varname>HOME</varname> to refer to a
-      writeable directory.
+      <command>gulp</command> requires <varname>HOME</varname> to refer to a writeable directory.
      </para>
     </callout>
     <callout arearefs="ex-buildBowerComponentsDefault-4">
@@ -210,17 +181,13 @@ pkgs.stdenv.mkDerivation {
     </term>
     <listitem>
      <para>
-      This means that Bower was looking for a package version which doesn't
-      exist in the generated <filename>bower-packages.nix</filename>.
+      This means that Bower was looking for a package version which doesn't exist in the generated <filename>bower-packages.nix</filename>.
      </para>
      <para>
-      If <filename>bower.json</filename> has been updated, then run
-      <command>bower2nix</command> again.
+      If <filename>bower.json</filename> has been updated, then run <command>bower2nix</command> again.
      </para>
      <para>
-      It could also be a bug in <command>bower2nix</command> or
-      <command>fetchbower</command>. If possible, try reformulating the version
-      specification in <filename>bower.json</filename>.
+      It could also be a bug in <command>bower2nix</command> or <command>fetchbower</command>. If possible, try reformulating the version specification in <filename>bower.json</filename>.
      </para>
     </listitem>
    </varlistentry>
diff --git a/doc/languages-frameworks/coq.xml b/doc/languages-frameworks/coq.xml
index 4314df5c9df..86d9226166f 100644
--- a/doc/languages-frameworks/coq.xml
+++ b/doc/languages-frameworks/coq.xml
@@ -4,31 +4,19 @@
  <title>Coq</title>
 
  <para>
-  Coq libraries should be installed in
-  <literal>$(out)/lib/coq/${coq.coq-version}/user-contrib/</literal>. Such
-  directories are automatically added to the <literal>$COQPATH</literal>
-  environment variable by the hook defined in the Coq derivation.
+  Coq libraries should be installed in <literal>$(out)/lib/coq/${coq.coq-version}/user-contrib/</literal>. Such directories are automatically added to the <literal>$COQPATH</literal> environment variable by the hook defined in the Coq derivation.
  </para>
 
  <para>
-  Some extensions (plugins) might require OCaml and sometimes other OCaml
-  packages. The <literal>coq.ocamlPackages</literal> attribute can be used to
-  depend on the same package set Coq was built against.
+  Some extensions (plugins) might require OCaml and sometimes other OCaml packages. The <literal>coq.ocamlPackages</literal> attribute can be used to depend on the same package set Coq was built against.
  </para>
 
  <para>
-  Coq libraries may be compatible with some specific versions of Coq only. The
-  <literal>compatibleCoqVersions</literal> attribute is used to precisely
-  select those versions of Coq that are compatible with this derivation.
+  Coq libraries may be compatible with some specific versions of Coq only. The <literal>compatibleCoqVersions</literal> attribute is used to precisely select those versions of Coq that are compatible with this derivation.
  </para>
 
  <para>
-  Here is a simple package example. It is a pure Coq library, thus it depends
-  on Coq. It builds on the Mathematical Components library, thus it also takes
-  <literal>mathcomp</literal> as <literal>buildInputs</literal>. Its
-  <literal>Makefile</literal> has been generated using
-  <literal>coq_makefile</literal> so we only have to set the
-  <literal>$COQLIB</literal> variable at install time.
+  Here is a simple package example. It is a pure Coq library, thus it depends on Coq. It builds on the Mathematical Components library, thus it also takes <literal>mathcomp</literal> as <literal>buildInputs</literal>. Its <literal>Makefile</literal> has been generated using <literal>coq_makefile</literal> so we only have to set the <literal>$COQLIB</literal> variable at install time.
  </para>
 
 <programlisting>
diff --git a/doc/languages-frameworks/gnome.xml b/doc/languages-frameworks/gnome.xml
index 42b4ae04322..9e0f21a6c74 100644
--- a/doc/languages-frameworks/gnome.xml
+++ b/doc/languages-frameworks/gnome.xml
@@ -5,53 +5,26 @@
   <title>Packaging GNOME applications</title>
 
   <para>
-   Programs in the GNOME universe are written in various languages but they all
-   use GObject-based libraries like GLib, GTK or GStreamer. These libraries are
-   often modular, relying on looking into certain directories to find their
-   modules. However, due to Nix’s specific file system organization, this
-   will fail without our intervention. Fortunately, the libraries usually allow
-   overriding the directories through environment variables, either natively or
-   thanks to a patch in nixpkgs.
-   <link xlink:href="#fun-wrapProgram">Wrapping</link> the executables to
-   ensure correct paths are available to the application constitutes a
-   significant part of packaging a modern desktop application. In this section,
-   we will describe various modules needed by such applications, environment
-   variables needed to make the modules load, and finally a script that will do
-   the work for us.
+   Programs in the GNOME universe are written in various languages but they all use GObject-based libraries like GLib, GTK or GStreamer. These libraries are often modular, relying on looking into certain directories to find their modules. However, due to Nix’s specific file system organization, this will fail without our intervention. Fortunately, the libraries usually allow overriding the directories through environment variables, either natively or thanks to a patch in nixpkgs. <link xlink:href="#fun-wrapProgram">Wrapping</link> the executables to ensure correct paths are available to the application constitutes a significant part of packaging a modern desktop application. In this section, we will describe various modules needed by such applications, environment variables needed to make the modules load, and finally a script that will do the work for us.
   </para>
 
   <section xml:id="ssec-gnome-settings">
    <title>Settings</title>
 
    <para>
-    <link xlink:href="https://developer.gnome.org/gio/stable/GSettings.html">GSettings</link>
-    API is often used for storing settings. GSettings schemas are required, to
-    know the type and other metadata of the stored values. GLib looks for
-    <filename>glib-2.0/schemas/gschemas.compiled</filename> files inside the
-    directories of <envar>XDG_DATA_DIRS</envar>.
+    <link xlink:href="https://developer.gnome.org/gio/stable/GSettings.html">GSettings</link> API is often used for storing settings. GSettings schemas are required, to know the type and other metadata of the stored values. GLib looks for <filename>glib-2.0/schemas/gschemas.compiled</filename> files inside the directories of <envar>XDG_DATA_DIRS</envar>.
    </para>
 
    <para>
-    On Linux, GSettings API is implemented using
-    <link xlink:href="https://wiki.gnome.org/Projects/dconf">dconf</link>
-    backend. You will need to add <literal>dconf</literal> GIO module to
-    <envar>GIO_EXTRA_MODULES</envar> variable, otherwise the
-    <literal>memory</literal> backend will be used and the saved settings will
-    not be persistent.
+    On Linux, GSettings API is implemented using <link xlink:href="https://wiki.gnome.org/Projects/dconf">dconf</link> backend. You will need to add <literal>dconf</literal> GIO module to <envar>GIO_EXTRA_MODULES</envar> variable, otherwise the <literal>memory</literal> backend will be used and the saved settings will not be persistent.
    </para>
 
    <para>
-    Last you will need the dconf database D-Bus service itself. You can enable
-    it using <option>programs.dconf.enable</option>.
+    Last you will need the dconf database D-Bus service itself. You can enable it using <option>programs.dconf.enable</option>.
    </para>
 
    <para>
-    Some applications will also require
-    <package>gsettings-desktop-schemas</package> for things like reading proxy
-    configuration or user interface customization. This dependency is often not
-    mentioned by upstream, you should grep for
-    <literal>org.gnome.desktop</literal> and
-    <literal>org.gnome.system</literal> to see if the schemas are needed.
+    Some applications will also require <package>gsettings-desktop-schemas</package> for things like reading proxy configuration or user interface customization. This dependency is often not mentioned by upstream, you should grep for <literal>org.gnome.desktop</literal> and <literal>org.gnome.system</literal> to see if the schemas are needed.
    </para>
   </section>
 
@@ -59,16 +32,7 @@
    <title>Icons</title>
 
    <para>
-    When an application uses icons, an icon theme should be available in
-    <envar>XDG_DATA_DIRS</envar>. The package for the default, icon-less
-    <link xlink:href="https://www.freedesktop.org/wiki/Software/icon-theme/">hicolor-icon-theme</link>
-    contains <link linkend="ssec-gnome-hooks-hicolor-icon-theme">a setup
-    hook</link> that will pick up icon themes from
-    <literal>buildInputs</literal> and pass it to our wrapper. Unfortunately,
-    relying on that would mean every user has to download the theme included in
-    the package expression no matter their preference. For that reason, we
-    leave the installation of icon theme on the user. If you use one of the
-    desktop environments, you probably already have an icon theme installed.
+    When an application uses icons, an icon theme should be available in <envar>XDG_DATA_DIRS</envar>. The package for the default, icon-less <link xlink:href="https://www.freedesktop.org/wiki/Software/icon-theme/">hicolor-icon-theme</link> contains <link linkend="ssec-gnome-hooks-hicolor-icon-theme">a setup hook</link> that will pick up icon themes from <literal>buildInputs</literal> and pass it to our wrapper. Unfortunately, relying on that would mean every user has to download the theme included in the package expression no matter their preference. For that reason, we leave the installation of icon theme on the user. If you use one of the desktop environments, you probably already have an icon theme installed.
    </para>
   </section>
 
@@ -76,12 +40,7 @@
    <title>GTK Themes</title>
 
    <para>
-    Previously, a GTK theme needed to be in <envar>XDG_DATA_DIRS</envar>. This
-    is no longer necessary for most programs since GTK incorporated Adwaita
-    theme. Some programs (for example, those designed for
-    <link xlink:href="https://elementary.io/docs/human-interface-guidelines#human-interface-guidelines">elementary
-    HIG</link>) might require a special theme like
-    <package>pantheon.elementary-gtk-theme</package>.
+    Previously, a GTK theme needed to be in <envar>XDG_DATA_DIRS</envar>. This is no longer necessary for most programs since GTK incorporated Adwaita theme. Some programs (for example, those designed for <link xlink:href="https://elementary.io/docs/human-interface-guidelines#human-interface-guidelines">elementary HIG</link>) might require a special theme like <package>pantheon.elementary-gtk-theme</package>.
    </para>
   </section>
 
@@ -89,10 +48,7 @@
    <title>GObject introspection typelibs</title>
 
    <para>
-    <link xlink:href="https://wiki.gnome.org/Projects/GObjectIntrospection">GObject
-    introspection</link> allows applications to use C libraries in other
-    languages easily. It does this through <literal>typelib</literal> files
-    searched in <envar>GI_TYPELIB_PATH</envar>.
+    <link xlink:href="https://wiki.gnome.org/Projects/GObjectIntrospection">GObject introspection</link> allows applications to use C libraries in other languages easily. It does this through <literal>typelib</literal> files searched in <envar>GI_TYPELIB_PATH</envar>.
    </para>
   </section>
 
@@ -100,11 +56,7 @@
    <title>Various plug-ins</title>
 
    <para>
-    If your application uses
-    <link xlink:href="https://gstreamer.freedesktop.org/">GStreamer</link> or
-    <link xlink:href="https://wiki.gnome.org/Projects/Grilo">Grilo</link>, you
-    should set <envar>GST_PLUGIN_SYSTEM_PATH_1_0</envar> and
-    <envar>GRL_PLUGIN_PATH</envar>, respectively.
+    If your application uses <link xlink:href="https://gstreamer.freedesktop.org/">GStreamer</link> or <link xlink:href="https://wiki.gnome.org/Projects/Grilo">Grilo</link>, you should set <envar>GST_PLUGIN_SYSTEM_PATH_1_0</envar> and <envar>GRL_PLUGIN_PATH</envar>, respectively.
    </para>
   </section>
  </section>
@@ -113,8 +65,7 @@
   <title>Onto <package>wrapGAppsHook</package></title>
 
   <para>
-   Given the requirements above, the package expression would become messy
-   quickly:
+   Given the requirements above, the package expression would become messy quickly:
 <programlisting>
 preFixup = ''
   for f in $(find $out/bin/ $out/libexec/ -type f -executable); do
@@ -128,76 +79,48 @@ preFixup = ''
   done
 '';
 </programlisting>
-   Fortunately, there is <package>wrapGAppsHook</package>, that does the
-   wrapping for us. In particular, it works in conjunction with other setup
-   hooks that will populate the variable:
+   Fortunately, there is <package>wrapGAppsHook</package>, that does the wrapping for us. In particular, it works in conjunction with other setup hooks that will populate the variable:
    <itemizedlist>
     <listitem xml:id="ssec-gnome-hooks-wrapgappshook">
      <para>
-      <package>wrapGAppsHook</package> itself will add the package’s
-      <filename>share</filename> directory to <envar>XDG_DATA_DIRS</envar>.
+      <package>wrapGAppsHook</package> itself will add the package’s <filename>share</filename> directory to <envar>XDG_DATA_DIRS</envar>.
      </para>
     </listitem>
     <listitem xml:id="ssec-gnome-hooks-glib">
      <para>
-      <package>glib</package> setup hook will populate
-      <envar>GSETTINGS_SCHEMAS_PATH</envar> and then
-      <package>wrapGAppsHook</package> will prepend it to
-      <envar>XDG_DATA_DIRS</envar>.
+      <package>glib</package> setup hook will populate <envar>GSETTINGS_SCHEMAS_PATH</envar> and then <package>wrapGAppsHook</package> will prepend it to <envar>XDG_DATA_DIRS</envar>.
      </para>
     </listitem>
     <listitem xml:id="ssec-gnome-hooks-dconf">
      <para>
-      <package>gnome3.dconf.lib</package> is a dependency of
-      <package>wrapGAppsHook</package>, which then also adds it to the
-      <envar>GIO_EXTRA_MODULES</envar> variable.
+      <package>gnome3.dconf.lib</package> is a dependency of <package>wrapGAppsHook</package>, which then also adds it to the <envar>GIO_EXTRA_MODULES</envar> variable.
      </para>
     </listitem>
     <listitem xml:id="ssec-gnome-hooks-hicolor-icon-theme">
      <para>
-      <package>hicolor-icon-theme</package>’s setup hook will add icon themes
-      to <envar>XDG_ICON_DIRS</envar> which is prepended to
-      <envar>XDG_DATA_DIRS</envar> by <package>wrapGAppsHook</package>.
+      <package>hicolor-icon-theme</package>’s setup hook will add icon themes to <envar>XDG_ICON_DIRS</envar> which is prepended to <envar>XDG_DATA_DIRS</envar> by <package>wrapGAppsHook</package>.
      </para>
     </listitem>
     <listitem xml:id="ssec-gnome-hooks-gobject-introspection">
      <para>
-      <package>gobject-introspection</package> setup hook populates
-      <envar>GI_TYPELIB_PATH</envar> variable with
-      <filename>lib/girepository-1.0</filename> directories of dependencies,
-      which is then added to wrapper by <package>wrapGAppsHook</package>. It
-      also adds <filename>share</filename> directories of dependencies to
-      <envar>XDG_DATA_DIRS</envar>, which is intended to promote GIR files but
-      it also
-      <link xlink:href="https://github.com/NixOS/nixpkgs/issues/32790">pollutes
-      the closures</link> of packages using <package>wrapGAppsHook</package>.
+      <package>gobject-introspection</package> setup hook populates <envar>GI_TYPELIB_PATH</envar> variable with <filename>lib/girepository-1.0</filename> directories of dependencies, which is then added to wrapper by <package>wrapGAppsHook</package>. It also adds <filename>share</filename> directories of dependencies to <envar>XDG_DATA_DIRS</envar>, which is intended to promote GIR files but it also <link xlink:href="https://github.com/NixOS/nixpkgs/issues/32790">pollutes the closures</link> of packages using <package>wrapGAppsHook</package>.
      </para>
      <warning>
       <para>
-       The setup hook
-       <link xlink:href="https://github.com/NixOS/nixpkgs/issues/56943">currently</link>
-       does not work in expressions with <literal>strictDeps</literal> enabled,
-       like Python packages. In those cases, you will need to disable it with
-       <code>strictDeps = false;</code>.
+       The setup hook <link xlink:href="https://github.com/NixOS/nixpkgs/issues/56943">currently</link> does not work in expressions with <literal>strictDeps</literal> enabled, like Python packages. In those cases, you will need to disable it with <code>strictDeps = false;</code>.
       </para>
      </warning>
     </listitem>
     <listitem xml:id="ssec-gnome-hooks-gst-grl-plugins">
      <para>
-      Setup hooks of <package>gst_all_1.gstreamer</package> and
-      <package>gnome3.grilo</package> will populate the
-      <envar>GST_PLUGIN_SYSTEM_PATH_1_0</envar> and
-      <envar>GRL_PLUGIN_PATH</envar> variables, respectively, which will then
-      be added to the wrapper by <literal>wrapGAppsHook</literal>.
+      Setup hooks of <package>gst_all_1.gstreamer</package> and <package>gnome3.grilo</package> will populate the <envar>GST_PLUGIN_SYSTEM_PATH_1_0</envar> and <envar>GRL_PLUGIN_PATH</envar> variables, respectively, which will then be added to the wrapper by <literal>wrapGAppsHook</literal>.
      </para>
     </listitem>
    </itemizedlist>
   </para>
 
   <para>
-   You can also pass additional arguments to <literal>makeWrapper</literal>
-   using <literal>gappsWrapperArgs</literal> in <literal>preFixup</literal>
-   hook:
+   You can also pass additional arguments to <literal>makeWrapper</literal> using <literal>gappsWrapperArgs</literal> in <literal>preFixup</literal> hook:
 <programlisting>
 preFixup = ''
   gappsWrapperArgs+=(
@@ -215,13 +138,7 @@ preFixup = ''
   <title>Updating GNOME packages</title>
 
   <para>
-   Most GNOME package offer
-   <link linkend="var-passthru-updateScript"><literal>updateScript</literal></link>,
-   it is therefore possible to update to latest source tarball by running
-   <command>nix-shell maintainers/scripts/update.nix --argstr package
-   gnome3.nautilus</command> or even en masse with <command>nix-shell
-   maintainers/scripts/update.nix --argstr path gnome3</command>. Read the
-   package’s <filename>NEWS</filename> file to see what changed.
+   Most GNOME package offer <link linkend="var-passthru-updateScript"><literal>updateScript</literal></link>, it is therefore possible to update to latest source tarball by running <command>nix-shell maintainers/scripts/update.nix --argstr package gnome3.nautilus</command> or even en masse with <command>nix-shell maintainers/scripts/update.nix --argstr path gnome3</command>. Read the package’s <filename>NEWS</filename> file to see what changed.
   </para>
  </section>
 
@@ -235,17 +152,7 @@ preFixup = ''
     </term>
     <listitem>
      <para>
-      There are no schemas avalable in <envar>XDG_DATA_DIRS</envar>.
-      Temporarily add a random package containing schemas like
-      <package>gsettings-desktop-schemas</package> to
-      <literal>buildInputs</literal>.
-      <link linkend="ssec-gnome-hooks-glib"><package>glib</package></link> and
-      <link linkend="ssec-gnome-hooks-wrapgappshook"><package>wrapGAppsHook</package></link>
-      setup hooks will take care of making the schemas available to application
-      and you will see the actual missing schemas with the
-      <link linkend="ssec-gnome-common-issues-missing-schema">next
-      error</link>. Or you can try looking through the source code for the
-      actual schemas used.
+      There are no schemas avalable in <envar>XDG_DATA_DIRS</envar>. Temporarily add a random package containing schemas like <package>gsettings-desktop-schemas</package> to <literal>buildInputs</literal>. <link linkend="ssec-gnome-hooks-glib"><package>glib</package></link> and <link linkend="ssec-gnome-hooks-wrapgappshook"><package>wrapGAppsHook</package></link> setup hooks will take care of making the schemas available to application and you will see the actual missing schemas with the <link linkend="ssec-gnome-common-issues-missing-schema">next error</link>. Or you can try looking through the source code for the actual schemas used.
      </para>
     </listitem>
    </varlistentry>
@@ -255,11 +162,7 @@ preFixup = ''
     </term>
     <listitem>
      <para>
-      Package is missing some GSettings schemas. You can find out the package
-      containing the schema with <command>nix-locate
-      <replaceable>org.gnome.foo</replaceable>.gschema.xml</command> and let
-      the hooks handle the wrapping as
-      <link linkend="ssec-gnome-common-issues-no-schemas">above</link>.
+      Package is missing some GSettings schemas. You can find out the package containing the schema with <command>nix-locate <replaceable>org.gnome.foo</replaceable>.gschema.xml</command> and let the hooks handle the wrapping as <link linkend="ssec-gnome-common-issues-no-schemas">above</link>.
      </para>
     </listitem>
    </varlistentry>
@@ -269,14 +172,7 @@ preFixup = ''
     </term>
     <listitem>
      <para>
-      This is because derivers like
-      <function>python.pkgs.buildPythonApplication</function> or
-      <function>qt5.mkDerivation</function> have setup-hooks automatically
-      added that produce wrappers with <package>makeWrapper</package>. The
-      simplest way to workaround that is to disable the
-      <package>wrapGAppsHook</package> automatic wrapping with
-      <code>dontWrapGApps = true;</code> and pass the arguments it intended to
-      pass to <package>makeWrapper</package> to another.
+      This is because derivers like <function>python.pkgs.buildPythonApplication</function> or <function>qt5.mkDerivation</function> have setup-hooks automatically added that produce wrappers with <package>makeWrapper</package>. The simplest way to workaround that is to disable the <package>wrapGAppsHook</package> automatic wrapping with <code>dontWrapGApps = true;</code> and pass the arguments it intended to pass to <package>makeWrapper</package> to another.
      </para>
      <para>
       In the case of a Python application it could look like:
@@ -328,55 +224,34 @@ mkDerivation {
     </term>
     <listitem>
      <para>
-      You can rely on applications depending on the library set the necessary
-      environment variables but that it often easy to miss. Instead we
-      recommend to patch the paths in the source code whenever possible. Here
-      are some examples:
+      You can rely on applications depending on the library set the necessary environment variables but that it often easy to miss. Instead we recommend to patch the paths in the source code whenever possible. Here are some examples:
       <itemizedlist>
        <listitem xml:id="ssec-gnome-common-issues-unwrappable-package-gnome-shell-ext">
         <para>
-         <link xlink:href="https://github.com/NixOS/nixpkgs/blob/7bb8f05f12ca3cff9da72b56caa2f7472d5732bc/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix#L21-L24">Replacing
-         a <envar>GI_TYPELIB_PATH</envar> in GNOME Shell extension</link> –
-         we are using <function>substituteAll</function> to include the path to
-         a typelib into a patch.
+         <link xlink:href="https://github.com/NixOS/nixpkgs/blob/7bb8f05f12ca3cff9da72b56caa2f7472d5732bc/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix#L21-L24">Replacing a <envar>GI_TYPELIB_PATH</envar> in GNOME Shell extension</link> – we are using <function>substituteAll</function> to include the path to a typelib into a patch.
         </para>
        </listitem>
        <listitem xml:id="ssec-gnome-common-issues-unwrappable-package-gsettings">
         <para>
-         The following examples are hardcoding GSettings schema paths. To get
-         the schema paths we use the functions
+         The following examples are hardcoding GSettings schema paths. To get the schema paths we use the functions
          <itemizedlist>
           <listitem>
            <para>
-            <function>glib.getSchemaPath</function> Takes a nix package
-            attribute as an argument.
+            <function>glib.getSchemaPath</function> Takes a nix package attribute as an argument.
            </para>
           </listitem>
           <listitem>
            <para>
-            <function>glib.makeSchemaPath</function> Takes a package output
-            like <literal>$out</literal> and a derivation name. You should use
-            this if the schemas you need to hardcode are in the same
-            derivation.
+            <function>glib.makeSchemaPath</function> Takes a package output like <literal>$out</literal> and a derivation name. You should use this if the schemas you need to hardcode are in the same derivation.
            </para>
           </listitem>
          </itemizedlist>
         </para>
         <para xml:id="ssec-gnome-common-issues-unwrappable-package-gsettings-vala">
-         <link xlink:href="https://github.com/NixOS/nixpkgs/blob/7bb8f05f12ca3cff9da72b56caa2f7472d5732bc/pkgs/desktops/pantheon/apps/elementary-files/default.nix#L78-L86">Hard-coding
-         GSettings schema path in Vala plug-in (dynamically loaded
-         library)</link> – here, <function>substituteAll</function> cannot be
-         used since the schema comes from the same package preventing us from
-         pass its path to the function, probably due to a
-         <link xlink:href="https://github.com/NixOS/nix/issues/1846">Nix
-         bug</link>.
+         <link xlink:href="https://github.com/NixOS/nixpkgs/blob/7bb8f05f12ca3cff9da72b56caa2f7472d5732bc/pkgs/desktops/pantheon/apps/elementary-files/default.nix#L78-L86">Hard-coding GSettings schema path in Vala plug-in (dynamically loaded library)</link> – here, <function>substituteAll</function> cannot be used since the schema comes from the same package preventing us from pass its path to the function, probably due to a <link xlink:href="https://github.com/NixOS/nix/issues/1846">Nix bug</link>.
         </para>
         <para xml:id="ssec-gnome-common-issues-unwrappable-package-gsettings-c">
-         <link xlink:href="https://github.com/NixOS/nixpkgs/blob/29c120c065d03b000224872251bed93932d42412/pkgs/development/libraries/glib-networking/default.nix#L31-L34">Hard-coding
-         GSettings schema path in C library</link> – nothing special other
-         than using
-         <link xlink:href="https://github.com/NixOS/nixpkgs/pull/67957#issuecomment-527717467">Coccinelle
-         patch</link> to generate the patch itself.
+         <link xlink:href="https://github.com/NixOS/nixpkgs/blob/29c120c065d03b000224872251bed93932d42412/pkgs/development/libraries/glib-networking/default.nix#L31-L34">Hard-coding GSettings schema path in C library</link> – nothing special other than using <link xlink:href="https://github.com/NixOS/nixpkgs/pull/67957#issuecomment-527717467">Coccinelle patch</link> to generate the patch itself.
         </para>
        </listitem>
       </itemizedlist>
diff --git a/doc/languages-frameworks/go.xml b/doc/languages-frameworks/go.xml
index b2b4962cb5f..288a9029863 100644
--- a/doc/languages-frameworks/go.xml
+++ b/doc/languages-frameworks/go.xml
@@ -7,21 +7,16 @@
   <title>Go modules</title>
 
   <para>
-   The function <varname> buildGoModule </varname> builds Go programs managed
-   with Go modules. It builds a
-   <link xlink:href="https://github.com/golang/go/wiki/Modules">Go
-   modules</link> through a two phase build:
+   The function <varname> buildGoModule </varname> builds Go programs managed with Go modules. It builds a <link xlink:href="https://github.com/golang/go/wiki/Modules">Go modules</link> through a two phase build:
    <itemizedlist>
     <listitem>
      <para>
-      An intermediate fetcher derivation. This derivation will be used to fetch
-      all of the dependencies of the Go module.
+      An intermediate fetcher derivation. This derivation will be used to fetch all of the dependencies of the Go module.
      </para>
     </listitem>
     <listitem>
      <para>
-      A final derivation will use the output of the intermediate derivation to
-      build the binaries and produce the final output.
+      A final derivation will use the output of the intermediate derivation to build the binaries and produce the final output.
      </para>
     </listitem>
    </itemizedlist>
@@ -57,21 +52,16 @@ pet = buildGoModule rec {
   </example>
 
   <para>
-   <xref linkend='ex-buildGoModule'/> is an example expression using
-   buildGoModule, the following arguments are of special significance to the
-   function:
+   <xref linkend='ex-buildGoModule'/> is an example expression using buildGoModule, the following arguments are of special significance to the function:
    <calloutlist>
     <callout arearefs='ex-buildGoModule-1'>
      <para>
-      <varname>modSha256</varname> is the hash of the output of the
-      intermediate fetcher derivation.
+      <varname>modSha256</varname> is the hash of the output of the intermediate fetcher derivation.
      </para>
     </callout>
     <callout arearefs='ex-buildGoModule-2'>
      <para>
-      <varname>subPackages</varname> limits the builder from building child
-      packages that have not been listed. If <varname>subPackages</varname> is
-      not specified, all child packages will be built.
+      <varname>subPackages</varname> limits the builder from building child packages that have not been listed. If <varname>subPackages</varname> is not specified, all child packages will be built.
      </para>
     </callout>
    </calloutlist>
@@ -82,8 +72,7 @@ pet = buildGoModule rec {
   <title>Go legacy</title>
 
   <para>
-   The function <varname> buildGoPackage </varname> builds legacy Go programs,
-   not supporting Go modules.
+   The function <varname> buildGoPackage </varname> builds legacy Go programs, not supporting Go modules.
   </para>
 
   <example xml:id='ex-buildGoPackage'>
@@ -111,49 +100,36 @@ deis = buildGoPackage rec {
   </example>
 
   <para>
-   <xref linkend='ex-buildGoPackage'/> is an example expression using
-   buildGoPackage, the following arguments are of special significance to the
-   function:
+   <xref linkend='ex-buildGoPackage'/> is an example expression using buildGoPackage, the following arguments are of special significance to the function:
    <calloutlist>
     <callout arearefs='ex-buildGoPackage-1'>
      <para>
-      <varname>goPackagePath</varname> specifies the package's canonical Go
-      import path.
+      <varname>goPackagePath</varname> specifies the package's canonical Go import path.
      </para>
     </callout>
     <callout arearefs='ex-buildGoPackage-2'>
      <para>
-      <varname>subPackages</varname> limits the builder from building child
-      packages that have not been listed. If <varname>subPackages</varname> is
-      not specified, all child packages will be built.
+      <varname>subPackages</varname> limits the builder from building child packages that have not been listed. If <varname>subPackages</varname> is not specified, all child packages will be built.
      </para>
      <para>
-      In this example only <literal>github.com/deis/deis/client</literal> will
-      be built.
+      In this example only <literal>github.com/deis/deis/client</literal> will be built.
      </para>
     </callout>
     <callout arearefs='ex-buildGoPackage-3'>
      <para>
-      <varname>goDeps</varname> is where the Go dependencies of a Go program
-      are listed as a list of package source identified by Go import path. It
-      could be imported as a separate <varname>deps.nix</varname> file for
-      readability. The dependency data structure is described below.
+      <varname>goDeps</varname> is where the Go dependencies of a Go program are listed as a list of package source identified by Go import path. It could be imported as a separate <varname>deps.nix</varname> file for readability. The dependency data structure is described below.
      </para>
     </callout>
     <callout arearefs='ex-buildGoPackage-4'>
      <para>
-      <varname>buildFlags</varname> is a list of flags passed to the go build
-      command.
+      <varname>buildFlags</varname> is a list of flags passed to the go build command.
      </para>
     </callout>
    </calloutlist>
   </para>
 
   <para>
-   The <varname>goDeps</varname> attribute can be imported from a separate
-   <varname>nix</varname> file that defines which Go libraries are needed and
-   should be included in <varname>GOPATH</varname> for
-   <varname>buildPhase</varname>.
+   The <varname>goDeps</varname> attribute can be imported from a separate <varname>nix</varname> file that defines which Go libraries are needed and should be included in <varname>GOPATH</varname> for <varname>buildPhase</varname>.
   </para>
 
   <example xml:id='ex-goDeps'>
@@ -196,27 +172,18 @@ deis = buildGoPackage rec {
     </callout>
     <callout arearefs='ex-goDeps-3'>
      <para>
-      <varname>fetch type</varname> that needs to be used to get package
-      source. If <varname>git</varname> is used there should be
-      <varname>url</varname>, <varname>rev</varname> and
-      <varname>sha256</varname> defined next to it.
+      <varname>fetch type</varname> that needs to be used to get package source. If <varname>git</varname> is used there should be <varname>url</varname>, <varname>rev</varname> and <varname>sha256</varname> defined next to it.
      </para>
     </callout>
    </calloutlist>
   </para>
 
   <para>
-   To extract dependency information from a Go package in automated way use
-   <link xlink:href="https://github.com/kamilchm/go2nix">go2nix</link>. It can
-   produce complete derivation and <varname>goDeps</varname> file for Go
-   programs.
+   To extract dependency information from a Go package in automated way use <link xlink:href="https://github.com/kamilchm/go2nix">go2nix</link>. It can produce complete derivation and <varname>goDeps</varname> file for Go programs.
   </para>
 
   <para>
-   <varname>buildGoPackage</varname> produces
-   <xref linkend='chap-multiple-output' xrefstyle="select: title" /> where
-   <varname>bin</varname> includes program binaries. You can test build a Go
-   binary as follows:
+   <varname>buildGoPackage</varname> produces <xref linkend='chap-multiple-output' xrefstyle="select: title" /> where <varname>bin</varname> includes program binaries. You can test build a Go binary as follows:
 <screen>
 <prompt>$ </prompt>nix-build -A deis.bin
 </screen>
@@ -224,13 +191,11 @@ deis = buildGoPackage rec {
 <screen>
 <prompt>$ </prompt>nix-build -A deis.all
 </screen>
-   <varname>bin</varname> output will be installed by default with
-   <varname>nix-env -i</varname> or <varname>systemPackages</varname>.
+   <varname>bin</varname> output will be installed by default with <varname>nix-env -i</varname> or <varname>systemPackages</varname>.
   </para>
 
   <para>
-   You may use Go packages installed into the active Nix profiles by adding the
-   following to your ~/.bashrc:
+   You may use Go packages installed into the active Nix profiles by adding the following to your ~/.bashrc:
 <screen>
 for p in $NIX_PROFILES; do
     GOPATH="$p/share/go:$GOPATH"
diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml
index 5836294b774..cd0b48adb14 100644
--- a/doc/languages-frameworks/index.xml
+++ b/doc/languages-frameworks/index.xml
@@ -3,12 +3,7 @@
          xml:id="chap-language-support">
  <title>Support for specific programming languages and frameworks</title>
  <para>
-  The <link linkend="chap-stdenv">standard build environment</link> makes it
-  easy to build typical Autotools-based packages with very little code. Any
-  other kind of package can be accomodated by overriding the appropriate phases
-  of <literal>stdenv</literal>. However, there are specialised functions in
-  Nixpkgs to easily build packages for other programming languages, such as
-  Perl or Haskell. These are described in this chapter.
+  The <link linkend="chap-stdenv">standard build environment</link> makes it easy to build typical Autotools-based packages with very little code. Any other kind of package can be accomodated by overriding the appropriate phases of <literal>stdenv</literal>. However, there are specialised functions in Nixpkgs to easily build packages for other programming languages, such as Perl or Haskell. These are described in this chapter.
  </para>
  <xi:include href="android.section.xml" />
  <xi:include href="beam.xml" />
diff --git a/doc/languages-frameworks/java.xml b/doc/languages-frameworks/java.xml
index 68a1a097984..bf0fc488392 100644
--- a/doc/languages-frameworks/java.xml
+++ b/doc/languages-frameworks/java.xml
@@ -15,37 +15,24 @@ stdenv.mkDerivation {
   buildPhase = "ant";
 }
 </programlisting>
-  Note that <varname>jdk</varname> is an alias for the OpenJDK (self-built
-  where available, or pre-built via Zulu). Platforms with OpenJDK not (yet) in
-  Nixpkgs (<literal>Aarch32</literal>, <literal>Aarch64</literal>) point to the
-  (unfree) <literal>oraclejdk</literal>.
+  Note that <varname>jdk</varname> is an alias for the OpenJDK (self-built where available, or pre-built via Zulu). Platforms with OpenJDK not (yet) in Nixpkgs (<literal>Aarch32</literal>, <literal>Aarch64</literal>) point to the (unfree) <literal>oraclejdk</literal>.
  </para>
 
  <para>
-  JAR files that are intended to be used by other packages should be installed
-  in <filename>$out/share/java</filename>. JDKs have a stdenv setup hook that
-  add any JARs in the <filename>share/java</filename> directories of the build
-  inputs to the <envar>CLASSPATH</envar> environment variable. For instance, if
-  the package <literal>libfoo</literal> installs a JAR named
-  <filename>foo.jar</filename> in its <filename>share/java</filename>
-  directory, and another package declares the attribute
+  JAR files that are intended to be used by other packages should be installed in <filename>$out/share/java</filename>. JDKs have a stdenv setup hook that add any JARs in the <filename>share/java</filename> directories of the build inputs to the <envar>CLASSPATH</envar> environment variable. For instance, if the package <literal>libfoo</literal> installs a JAR named <filename>foo.jar</filename> in its <filename>share/java</filename> directory, and another package declares the attribute
 <programlisting>
 buildInputs = [ libfoo ];
 nativeBuildInputs = [ jdk ];
 </programlisting>
-  then <envar>CLASSPATH</envar> will be set to
-  <filename>/nix/store/...-libfoo/share/java/foo.jar</filename>.
+  then <envar>CLASSPATH</envar> will be set to <filename>/nix/store/...-libfoo/share/java/foo.jar</filename>.
  </para>
 
  <para>
-  Private JARs should be installed in a location like
-  <filename>$out/share/<replaceable>package-name</replaceable></filename>.
+  Private JARs should be installed in a location like <filename>$out/share/<replaceable>package-name</replaceable></filename>.
  </para>
 
  <para>
-  If your Java package provides a program, you need to generate a wrapper
-  script to run it using the OpenJRE. You can use
-  <literal>makeWrapper</literal> for this:
+  If your Java package provides a program, you need to generate a wrapper script to run it using the OpenJRE. You can use <literal>makeWrapper</literal> for this:
 <programlisting>
 nativeBuildInputs = [ makeWrapper ];
 
@@ -56,30 +43,21 @@ installPhase =
       --add-flags "-cp $out/share/java/foo.jar org.foo.Main"
   '';
 </programlisting>
-  Note the use of <literal>jre</literal>, which is the part of the OpenJDK
-  package that contains the Java Runtime Environment. By using
-  <literal>${jre}/bin/java</literal> instead of
-  <literal>${jdk}/bin/java</literal>, you prevent your package from depending
-  on the JDK at runtime.
+  Note the use of <literal>jre</literal>, which is the part of the OpenJDK package that contains the Java Runtime Environment. By using <literal>${jre}/bin/java</literal> instead of <literal>${jdk}/bin/java</literal>, you prevent your package from depending on the JDK at runtime.
  </para>
 
  <para>
-  Note all JDKs passthru <literal>home</literal>, so if your application
-  requires environment variables like <envar>JAVA_HOME</envar> being set, that
-  can be done in a generic fashion with the <literal>--set</literal> argument
-  of <literal>makeWrapper</literal>:
+  Note all JDKs passthru <literal>home</literal>, so if your application requires environment variables like <envar>JAVA_HOME</envar> being set, that can be done in a generic fashion with the <literal>--set</literal> argument of <literal>makeWrapper</literal>:
 <programlisting>
 --set JAVA_HOME ${jdk.home}
 </programlisting>
  </para>
 
  <para>
-  It is possible to use a different Java compiler than <command>javac</command>
-  from the OpenJDK. For instance, to use the GNU Java Compiler:
+  It is possible to use a different Java compiler than <command>javac</command> from the OpenJDK. For instance, to use the GNU Java Compiler:
 <programlisting>
 nativeBuildInputs = [ gcj ant ];
 </programlisting>
-  Here, Ant will automatically use <command>gij</command> (the GNU Java
-  Runtime) instead of the OpenJRE.
+  Here, Ant will automatically use <command>gij</command> (the GNU Java Runtime) instead of the OpenJRE.
  </para>
 </section>
diff --git a/doc/languages-frameworks/lua.xml b/doc/languages-frameworks/lua.xml
index 5144bb24ff6..bcca6b73753 100644
--- a/doc/languages-frameworks/lua.xml
+++ b/doc/languages-frameworks/lua.xml
@@ -4,18 +4,11 @@
  <title>Lua</title>
 
  <para>
-  Lua packages are built by the <varname>buildLuaPackage</varname> function.
-  This function is implemented in
-  <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/lua-modules/generic/default.nix">
-  <filename>pkgs/development/lua-modules/generic/default.nix</filename></link>
-  and works similarly to <varname>buildPerlPackage</varname>. (See
-  <xref linkend="sec-language-perl"/> for details.)
+  Lua packages are built by the <varname>buildLuaPackage</varname> function. This function is implemented in <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/lua-modules/generic/default.nix"> <filename>pkgs/development/lua-modules/generic/default.nix</filename></link> and works similarly to <varname>buildPerlPackage</varname>. (See <xref linkend="sec-language-perl"/> for details.)
  </para>
 
  <para>
-  Lua packages are defined in
-  <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/lua-packages.nix"><filename>pkgs/top-level/lua-packages.nix</filename></link>.
-  Most of them are simple. For example:
+  Lua packages are defined in <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/lua-packages.nix"><filename>pkgs/top-level/lua-packages.nix</filename></link>. Most of them are simple. For example:
 <programlisting>
 fileSystem = buildLuaPackage {
   name = "filesystem-1.6.2";
@@ -33,16 +26,11 @@ fileSystem = buildLuaPackage {
  </para>
 
  <para>
-  Though, more complicated package should be placed in a seperate file in
-  <link
+  Though, more complicated package should be placed in a seperate file in <link
   xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/lua-modules"><filename>pkgs/development/lua-modules</filename></link>.
  </para>
 
  <para>
-  Lua packages accept additional parameter <varname>disabled</varname>, which
-  defines the condition of disabling package from luaPackages. For example, if
-  package has <varname>disabled</varname> assigned to <literal>lua.luaversion
-  != "5.1"</literal>, it will not be included in any luaPackages except
-  lua51Packages, making it only be built for lua 5.1.
+  Lua packages accept additional parameter <varname>disabled</varname>, which defines the condition of disabling package from luaPackages. For example, if package has <varname>disabled</varname> assigned to <literal>lua.luaversion != "5.1"</literal>, it will not be included in any luaPackages except lua51Packages, making it only be built for lua 5.1.
  </para>
 </section>
diff --git a/doc/languages-frameworks/ocaml.xml b/doc/languages-frameworks/ocaml.xml
index b7006ecba99..a0ea209b493 100644
--- a/doc/languages-frameworks/ocaml.xml
+++ b/doc/languages-frameworks/ocaml.xml
@@ -4,35 +4,15 @@
  <title>OCaml</title>
 
  <para>
-  OCaml libraries should be installed in
-  <literal>$(out)/lib/ocaml/${ocaml.version}/site-lib/</literal>. Such
-  directories are automatically added to the <literal>$OCAMLPATH</literal>
-  environment variable when building another package that depends on them or
-  when opening a <literal>nix-shell</literal>.
+  OCaml libraries should be installed in <literal>$(out)/lib/ocaml/${ocaml.version}/site-lib/</literal>. Such directories are automatically added to the <literal>$OCAMLPATH</literal> environment variable when building another package that depends on them or when opening a <literal>nix-shell</literal>.
  </para>
 
  <para>
-  Given that most of the OCaml ecosystem is now built with dune, nixpkgs
-  includes a convenience build support function called
-  <literal>buildDunePackage</literal> that will build an OCaml package using
-  dune, OCaml and findlib and any additional dependencies provided as
-  <literal>buildInputs</literal> or <literal>propagatedBuildInputs</literal>.
+  Given that most of the OCaml ecosystem is now built with dune, nixpkgs includes a convenience build support function called <literal>buildDunePackage</literal> that will build an OCaml package using dune, OCaml and findlib and any additional dependencies provided as <literal>buildInputs</literal> or <literal>propagatedBuildInputs</literal>.
  </para>
 
  <para>
-  Here is a simple package example. It defines an (optional) attribute
-  <literal>minimumOCamlVersion</literal> that will be used to throw a
-  descriptive evaluation error if building with an older OCaml is attempted. It
-  uses the <literal>fetchFromGitHub</literal> fetcher to get its source. It
-  sets the <literal>doCheck</literal> (optional) attribute to
-  <literal>true</literal> which means that tests will be run with <literal>dune
-  runtest -p angstrom</literal> after the build (<literal>dune build -p
-  angstrom</literal>) is complete. It uses <literal>alcotest</literal> as a
-  build input (because it is needed to run the tests) and
-  <literal>bigstringaf</literal> and <literal>result</literal> as propagated
-  build inputs (thus they will also be available to libraries depending on this
-  library). The library will be installed using the
-  <literal>angstrom.install</literal> file that dune generates.
+  Here is a simple package example. It defines an (optional) attribute <literal>minimumOCamlVersion</literal> that will be used to throw a descriptive evaluation error if building with an older OCaml is attempted. It uses the <literal>fetchFromGitHub</literal> fetcher to get its source. It sets the <literal>doCheck</literal> (optional) attribute to <literal>true</literal> which means that tests will be run with <literal>dune runtest -p angstrom</literal> after the build (<literal>dune build -p angstrom</literal>) is complete. It uses <literal>alcotest</literal> as a build input (because it is needed to run the tests) and <literal>bigstringaf</literal> and <literal>result</literal> as propagated build inputs (thus they will also be available to libraries depending on this library). The library will be installed using the <literal>angstrom.install</literal> file that dune generates.
  </para>
 
 <programlisting>
@@ -65,11 +45,7 @@ buildDunePackage rec {
 </programlisting>
 
  <para>
-  Here is a second example, this time using a source archive generated with
-  <literal>dune-release</literal>. It is a good idea to use this archive when
-  it is available as it will usually contain substituted variables such as a
-  <literal>%%VERSION%%</literal> field. This library does not depend on any
-  other OCaml library and no tests are run after building it.
+  Here is a second example, this time using a source archive generated with <literal>dune-release</literal>. It is a good idea to use this archive when it is available as it will usually contain substituted variables such as a <literal>%%VERSION%%</literal> field. This library does not depend on any other OCaml library and no tests are run after building it.
  </para>
 
 <programlisting>
diff --git a/doc/languages-frameworks/perl.xml b/doc/languages-frameworks/perl.xml
index d5911cf67fd..d9b6b2721c6 100644
--- a/doc/languages-frameworks/perl.xml
+++ b/doc/languages-frameworks/perl.xml
@@ -4,24 +4,13 @@
  <title>Perl</title>
 
  <para>
-  Nixpkgs provides a function <varname>buildPerlPackage</varname>, a generic
-  package builder function for any Perl package that has a standard
-  <varname>Makefile.PL</varname>. It’s implemented in
-  <link
+  Nixpkgs provides a function <varname>buildPerlPackage</varname>, a generic package builder function for any Perl package that has a standard <varname>Makefile.PL</varname>. It’s implemented in <link
 xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/perl-modules/generic"><filename>pkgs/development/perl-modules/generic</filename></link>.
  </para>
 
  <para>
-  Perl packages from CPAN are defined in
-  <link
-xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/perl-packages.nix"><filename>pkgs/top-level/perl-packages.nix</filename></link>,
-  rather than <filename>pkgs/all-packages.nix</filename>. Most Perl packages
-  are so straight-forward to build that they are defined here directly, rather
-  than having a separate function for each package called from
-  <filename>perl-packages.nix</filename>. However, more complicated packages
-  should be put in a separate file, typically in
-  <filename>pkgs/development/perl-modules</filename>. Here is an example of the
-  former:
+  Perl packages from CPAN are defined in <link
+xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/perl-packages.nix"><filename>pkgs/top-level/perl-packages.nix</filename></link>, rather than <filename>pkgs/all-packages.nix</filename>. Most Perl packages are so straight-forward to build that they are defined here directly, rather than having a separate function for each package called from <filename>perl-packages.nix</filename>. However, more complicated packages should be put in a separate file, typically in <filename>pkgs/development/perl-modules</filename>. Here is an example of the former:
 <programlisting>
 ClassC3 = buildPerlPackage rec {
   name = "Class-C3-0.21";
@@ -31,32 +20,22 @@ ClassC3 = buildPerlPackage rec {
   };
 };
 </programlisting>
-  Note the use of <literal>mirror://cpan/</literal>, and the
-  <literal>${name}</literal> in the URL definition to ensure that the name
-  attribute is consistent with the source that we’re actually downloading.
-  Perl packages are made available in <filename>all-packages.nix</filename>
-  through the variable <varname>perlPackages</varname>. For instance, if you
-  have a package that needs <varname>ClassC3</varname>, you would typically
-  write
+  Note the use of <literal>mirror://cpan/</literal>, and the <literal>${name}</literal> in the URL definition to ensure that the name attribute is consistent with the source that we’re actually downloading. Perl packages are made available in <filename>all-packages.nix</filename> through the variable <varname>perlPackages</varname>. For instance, if you have a package that needs <varname>ClassC3</varname>, you would typically write
 <programlisting>
 foo = import ../path/to/foo.nix {
   inherit stdenv fetchurl ...;
   inherit (perlPackages) ClassC3;
 };
 </programlisting>
-  in <filename>all-packages.nix</filename>. You can test building a Perl
-  package as follows:
+  in <filename>all-packages.nix</filename>. You can test building a Perl package as follows:
 <screen>
 <prompt>$ </prompt>nix-build -A perlPackages.ClassC3
 </screen>
-  <varname>buildPerlPackage</varname> adds <literal>perl-</literal> to the
-  start of the name attribute, so the package above is actually called
-  <literal>perl-Class-C3-0.21</literal>. So to install it, you can say:
+  <varname>buildPerlPackage</varname> adds <literal>perl-</literal> to the start of the name attribute, so the package above is actually called <literal>perl-Class-C3-0.21</literal>. So to install it, you can say:
 <screen>
 <prompt>$ </prompt>nix-env -i perl-Class-C3
 </screen>
-  (Of course you can also install using the attribute name: <literal>nix-env -i
-  -A perlPackages.ClassC3</literal>.)
+  (Of course you can also install using the attribute name: <literal>nix-env -i -A perlPackages.ClassC3</literal>.)
  </para>
 
  <para>
@@ -64,40 +43,24 @@ foo = import ../path/to/foo.nix {
   <orderedlist>
    <listitem>
     <para>
-     In the configure phase, it calls <literal>perl Makefile.PL</literal> to
-     generate a Makefile. You can set the variable
-     <varname>makeMakerFlags</varname> to pass flags to
-     <filename>Makefile.PL</filename>
+     In the configure phase, it calls <literal>perl Makefile.PL</literal> to generate a Makefile. You can set the variable <varname>makeMakerFlags</varname> to pass flags to <filename>Makefile.PL</filename>
     </para>
    </listitem>
    <listitem>
     <para>
-     It adds the contents of the <envar>PERL5LIB</envar> environment variable
-     to <literal>#! .../bin/perl</literal> line of Perl scripts as
-     <literal>-I<replaceable>dir</replaceable></literal> flags. This ensures
-     that a script can find its dependencies. (This can cause this shebang line
-     to become too long for Darwin to handle; see the note below.)
+     It adds the contents of the <envar>PERL5LIB</envar> environment variable to <literal>#! .../bin/perl</literal> line of Perl scripts as <literal>-I<replaceable>dir</replaceable></literal> flags. This ensures that a script can find its dependencies. (This can cause this shebang line to become too long for Darwin to handle; see the note below.)
     </para>
    </listitem>
    <listitem>
     <para>
-     In the fixup phase, it writes the propagated build inputs
-     (<varname>propagatedBuildInputs</varname>) to the file
-     <filename>$out/nix-support/propagated-user-env-packages</filename>.
-     <command>nix-env</command> recursively installs all packages listed in
-     this file when you install a package that has it. This ensures that a Perl
-     package can find its dependencies.
+     In the fixup phase, it writes the propagated build inputs (<varname>propagatedBuildInputs</varname>) to the file <filename>$out/nix-support/propagated-user-env-packages</filename>. <command>nix-env</command> recursively installs all packages listed in this file when you install a package that has it. This ensures that a Perl package can find its dependencies.
     </para>
    </listitem>
   </orderedlist>
  </para>
 
  <para>
-  <varname>buildPerlPackage</varname> is built on top of
-  <varname>stdenv</varname>, so everything can be customised in the usual way.
-  For instance, the <literal>BerkeleyDB</literal> module has a
-  <varname>preConfigure</varname> hook to generate a configuration file used by
-  <filename>Makefile.PL</filename>:
+  <varname>buildPerlPackage</varname> is built on top of <varname>stdenv</varname>, so everything can be customised in the usual way. For instance, the <literal>BerkeleyDB</literal> module has a <varname>preConfigure</varname> hook to generate a configuration file used by <filename>Makefile.PL</filename>:
 <programlisting>
 { buildPerlPackage, fetchurl, db }:
 
@@ -118,12 +81,7 @@ buildPerlPackage rec {
  </para>
 
  <para>
-  Dependencies on other Perl packages can be specified in the
-  <varname>buildInputs</varname> and <varname>propagatedBuildInputs</varname>
-  attributes. If something is exclusively a build-time dependency, use
-  <varname>buildInputs</varname>; if it’s (also) a runtime dependency, use
-  <varname>propagatedBuildInputs</varname>. For instance, this builds a Perl
-  module that has runtime dependencies on a bunch of other modules:
+  Dependencies on other Perl packages can be specified in the <varname>buildInputs</varname> and <varname>propagatedBuildInputs</varname> attributes. If something is exclusively a build-time dependency, use <varname>buildInputs</varname>; if it’s (also) a runtime dependency, use <varname>propagatedBuildInputs</varname>. For instance, this builds a Perl module that has runtime dependencies on a bunch of other modules:
 <programlisting>
 ClassC3Componentised = buildPerlPackage rec {
   name = "Class-C3-Componentised-1.0004";
@@ -139,11 +97,7 @@ ClassC3Componentised = buildPerlPackage rec {
  </para>
 
  <para>
-  On Darwin, if a script has too many
-  <literal>-I<replaceable>dir</replaceable></literal> flags in its first line
-  (its “shebang line”), it will not run. This can be worked around by
-  calling the <literal>shortenPerlShebang</literal> function from the
-  <literal>postInstall</literal> phase:
+  On Darwin, if a script has too many <literal>-I<replaceable>dir</replaceable></literal> flags in its first line (its “shebang line”), it will not run. This can be worked around by calling the <literal>shortenPerlShebang</literal> function from the <literal>postInstall</literal> phase:
 <programlisting>
 { stdenv, buildPerlPackage, fetchurl, shortenPerlShebang }:
 
@@ -162,20 +116,14 @@ ImageExifTool = buildPerlPackage {
   '';
 };
 </programlisting>
-  This will remove the <literal>-I</literal> flags from the shebang line,
-  rewrite them in the <literal>use lib</literal> form, and put them on the next
-  line instead. This function can be given any number of Perl scripts as
-  arguments; it will modify them in-place.
+  This will remove the <literal>-I</literal> flags from the shebang line, rewrite them in the <literal>use lib</literal> form, and put them on the next line instead. This function can be given any number of Perl scripts as arguments; it will modify them in-place.
  </para>
 
  <section xml:id="ssec-generation-from-CPAN">
   <title>Generation from CPAN</title>
 
   <para>
-   Nix expressions for Perl packages can be generated (almost) automatically
-   from CPAN. This is done by the program
-   <command>nix-generate-from-cpan</command>, which can be installed as
-   follows:
+   Nix expressions for Perl packages can be generated (almost) automatically from CPAN. This is done by the program <command>nix-generate-from-cpan</command>, which can be installed as follows:
   </para>
 
 <screen>
@@ -183,9 +131,7 @@ ImageExifTool = buildPerlPackage {
 </screen>
 
   <para>
-   This program takes a Perl module name, looks it up on CPAN, fetches and
-   unpacks the corresponding package, and prints a Nix expression on standard
-   output. For example:
+   This program takes a Perl module name, looks it up on CPAN, fetches and unpacks the corresponding package, and prints a Nix expression on standard output. For example:
 <screen>
 <prompt>$ </prompt>nix-generate-from-cpan XML::Simple
   XMLSimple = buildPerlPackage rec {
@@ -201,9 +147,7 @@ ImageExifTool = buildPerlPackage {
     };
   };
 </screen>
-   The output can be pasted into
-   <filename>pkgs/top-level/perl-packages.nix</filename> or wherever else you
-   need it.
+   The output can be pasted into <filename>pkgs/top-level/perl-packages.nix</filename> or wherever else you need it.
   </para>
  </section>
 
@@ -211,13 +155,7 @@ ImageExifTool = buildPerlPackage {
   <title>Cross-compiling modules</title>
 
   <para>
-   Nixpkgs has experimental support for cross-compiling Perl modules. In many
-   cases, it will just work out of the box, even for modules with native
-   extensions. Sometimes, however, the Makefile.PL for a module may
-   (indirectly) import a native module. In that case, you will need to make a
-   stub for that module that will satisfy the Makefile.PL and install it into
-   <filename>lib/perl5/site_perl/cross_perl/${perl.version}</filename>. See the
-   <varname>postInstall</varname> for <varname>DBI</varname> for an example.
+   Nixpkgs has experimental support for cross-compiling Perl modules. In many cases, it will just work out of the box, even for modules with native extensions. Sometimes, however, the Makefile.PL for a module may (indirectly) import a native module. In that case, you will need to make a stub for that module that will satisfy the Makefile.PL and install it into <filename>lib/perl5/site_perl/cross_perl/${perl.version}</filename>. See the <varname>postInstall</varname> for <varname>DBI</varname> for an example.
   </para>
  </section>
 </section>
diff --git a/doc/languages-frameworks/qt.xml b/doc/languages-frameworks/qt.xml
index d6f3314ab08..8d97de504ad 100644
--- a/doc/languages-frameworks/qt.xml
+++ b/doc/languages-frameworks/qt.xml
@@ -4,11 +4,7 @@
  <title>Qt</title>
 
  <para>
-  This section describes the differences between Nix expressions for Qt
-  libraries and applications and Nix expressions for other C++ software. Some
-  knowledge of the latter is assumed. There are primarily two problems which
-  the Qt infrastructure is designed to address: ensuring consistent versioning
-  of all dependencies and finding dependencies at runtime.
+  This section describes the differences between Nix expressions for Qt libraries and applications and Nix expressions for other C++ software. Some knowledge of the latter is assumed. There are primarily two problems which the Qt infrastructure is designed to address: ensuring consistent versioning of all dependencies and finding dependencies at runtime.
  </para>
 
  <example xml:id='qt-default-nix'>
@@ -28,38 +24,26 @@ mkDerivation { <co xml:id='qt-default-nix-co-2' />
  <calloutlist>
   <callout arearefs='qt-default-nix-co-1'>
    <para>
-    Import <literal>mkDerivation</literal> and Qt (such as
-    <literal>qtbase</literal> modules directly. <emphasis>Do not</emphasis>
-    import Qt package sets; the Qt versions of dependencies may not be
-    coherent, causing build and runtime failures.
+    Import <literal>mkDerivation</literal> and Qt (such as <literal>qtbase</literal> modules directly. <emphasis>Do not</emphasis> import Qt package sets; the Qt versions of dependencies may not be coherent, causing build and runtime failures.
    </para>
   </callout>
   <callout arearefs='qt-default-nix-co-2'>
    <para>
-    Use <literal>mkDerivation</literal> instead of
-    <literal>stdenv.mkDerivation</literal>. <literal>mkDerivation</literal> is
-    a wrapper around <literal>stdenv.mkDerivation</literal> which applies some
-    Qt-specific settings. This deriver accepts the same arguments as
-    <literal>stdenv.mkDerivation</literal>; refer to
-    <xref linkend='chap-stdenv' /> for details.
+    Use <literal>mkDerivation</literal> instead of <literal>stdenv.mkDerivation</literal>. <literal>mkDerivation</literal> is a wrapper around <literal>stdenv.mkDerivation</literal> which applies some Qt-specific settings. This deriver accepts the same arguments as <literal>stdenv.mkDerivation</literal>; refer to <xref linkend='chap-stdenv' /> for details.
    </para>
    <para>
-    To use another deriver instead of <literal>stdenv.mkDerivation</literal>,
-    use <literal>mkDerivationWith</literal>:
+    To use another deriver instead of <literal>stdenv.mkDerivation</literal>, use <literal>mkDerivationWith</literal>:
 <programlisting>
 mkDerivationWith myDeriver {
   # ...
 }
 </programlisting>
-    If you cannot use <literal>mkDerivationWith</literal>, please refer to
-    <xref linkend='qt-runtime-dependencies' />.
+    If you cannot use <literal>mkDerivationWith</literal>, please refer to <xref linkend='qt-runtime-dependencies' />.
    </para>
   </callout>
   <callout arearefs='qt-default-nix-co-3'>
    <para>
-    <literal>mkDerivation</literal> accepts the same arguments as
-    <literal>stdenv.mkDerivation</literal>, such as
-    <literal>buildInputs</literal>.
+    <literal>mkDerivation</literal> accepts the same arguments as <literal>stdenv.mkDerivation</literal>, such as <literal>buildInputs</literal>.
    </para>
   </callout>
  </calloutlist>
@@ -67,10 +51,7 @@ mkDerivationWith myDeriver {
  <formalpara xml:id='qt-runtime-dependencies'>
   <title>Locating runtime dependencies</title>
   <para>
-   Qt applications need to be wrapped to find runtime dependencies. If you
-   cannot use <literal>mkDerivation</literal> or
-   <literal>mkDerivationWith</literal> above, include
-   <literal>wrapQtAppsHook</literal> in <literal>nativeBuildInputs</literal>:
+   Qt applications need to be wrapped to find runtime dependencies. If you cannot use <literal>mkDerivation</literal> or <literal>mkDerivationWith</literal> above, include <literal>wrapQtAppsHook</literal> in <literal>nativeBuildInputs</literal>:
 <programlisting>
 stdenv.mkDerivation {
   # ...
@@ -82,9 +63,7 @@ stdenv.mkDerivation {
  </formalpara>
 
  <para>
-  Entries added to <literal>qtWrapperArgs</literal> are used to modify the
-  wrappers created by <literal>wrapQtAppsHook</literal>. The entries are passed
-  as arguments to <xref linkend='fun-wrapProgram' />.
+  Entries added to <literal>qtWrapperArgs</literal> are used to modify the wrappers created by <literal>wrapQtAppsHook</literal>. The entries are passed as arguments to <xref linkend='fun-wrapProgram' />.
 <programlisting>
 mkDerivation {
   # ...
@@ -95,10 +74,7 @@ mkDerivation {
  </para>
 
  <para>
-  Set <literal>dontWrapQtApps</literal> to stop applications from being wrapped
-  automatically. It is required to wrap applications manually with
-  <literal>wrapQtApp</literal>, using the syntax of
-  <xref linkend='fun-wrapProgram' />:
+  Set <literal>dontWrapQtApps</literal> to stop applications from being wrapped automatically. It is required to wrap applications manually with <literal>wrapQtApp</literal>, using the syntax of <xref linkend='fun-wrapProgram' />:
 <programlisting>
 mkDerivation {
   # ...
@@ -113,17 +89,12 @@ mkDerivation {
 
  <note>
   <para>
-   <literal>wrapQtAppsHook</literal> ignores files that are non-ELF
-   executables. This means that scripts won't be automatically wrapped so
-   you'll need to manually wrap them as previously mentioned. An example of
-   when you'd always need to do this is with Python applications that use PyQT.
+   <literal>wrapQtAppsHook</literal> ignores files that are non-ELF executables. This means that scripts won't be automatically wrapped so you'll need to manually wrap them as previously mentioned. An example of when you'd always need to do this is with Python applications that use PyQT.
   </para>
  </note>
 
  <para>
-  Libraries are built with every available version of Qt. Use the
-  <literal>meta.broken</literal> attribute to disable the package for
-  unsupported Qt versions:
+  Libraries are built with every available version of Qt. Use the <literal>meta.broken</literal> attribute to disable the package for unsupported Qt versions:
 <programlisting>
 mkDerivation {
   # ...
@@ -137,9 +108,7 @@ mkDerivation {
  <formalpara>
   <title>Adding a library to Nixpkgs</title>
   <para>
-   Add a Qt library to <filename>all-packages.nix</filename> by adding it to
-   the collection inside <literal>mkLibsForQt5</literal>. This ensures that the
-   library is built with every available version of Qt as needed.
+   Add a Qt library to <filename>all-packages.nix</filename> by adding it to the collection inside <literal>mkLibsForQt5</literal>. This ensures that the library is built with every available version of Qt as needed.
    <example xml:id='qt-library-all-packages-nix'>
     <title>Adding a Qt library to <filename>all-packages.nix</filename></title>
 <programlisting>
@@ -162,10 +131,7 @@ mkDerivation {
  <formalpara>
   <title>Adding an application to Nixpkgs</title>
   <para>
-   Add a Qt application to <filename>all-packages.nix</filename> using
-   <literal>libsForQt5.callPackage</literal> instead of the usual
-   <literal>callPackage</literal>. The former ensures that all dependencies are
-   built with the same version of Qt.
+   Add a Qt application to <filename>all-packages.nix</filename> using <literal>libsForQt5.callPackage</literal> instead of the usual <literal>callPackage</literal>. The former ensures that all dependencies are built with the same version of Qt.
    <example xml:id='qt-application-all-packages-nix'>
     <title>Adding a Qt application to <filename>all-packages.nix</filename></title>
 <programlisting>
diff --git a/doc/languages-frameworks/ruby.xml b/doc/languages-frameworks/ruby.xml
index df4e5acb22c..b28745fd6e2 100644
--- a/doc/languages-frameworks/ruby.xml
+++ b/doc/languages-frameworks/ruby.xml
@@ -4,11 +4,7 @@
  <title>Ruby</title>
 
  <para>
-  There currently is support to bundle applications that are packaged as Ruby
-  gems. The utility "bundix" allows you to write a
-  <filename>Gemfile</filename>, let bundler create a
-  <filename>Gemfile.lock</filename>, and then convert this into a nix
-  expression that contains all Gem dependencies automatically.
+  There currently is support to bundle applications that are packaged as Ruby gems. The utility "bundix" allows you to write a <filename>Gemfile</filename>, let bundler create a <filename>Gemfile.lock</filename>, and then convert this into a nix expression that contains all Gem dependencies automatically.
  </para>
 
  <para>
@@ -45,9 +41,7 @@ bundlerEnv rec {
 </screen>
 
  <para>
-  Please check in the <filename>Gemfile</filename>,
-  <filename>Gemfile.lock</filename> and the <filename>gemset.nix</filename> so
-  future updates can be run easily.
+  Please check in the <filename>Gemfile</filename>, <filename>Gemfile.lock</filename> and the <filename>gemset.nix</filename> so future updates can be run easily.
  </para>
 
  <para>
@@ -62,10 +56,7 @@ $ nix-shell -p bundix --run 'bundix'
 </screen>
 
  <para>
-  For tools written in Ruby - i.e. where the desire is to install a package and
-  then execute e.g. <command>rake</command> at the command line, there is an
-  alternative builder called <literal>bundlerApp</literal>. Set up the
-  <filename>gemset.nix</filename> the same way, and then, for example:
+  For tools written in Ruby - i.e. where the desire is to install a package and then execute e.g. <command>rake</command> at the command line, there is an alternative builder called <literal>bundlerApp</literal>. Set up the <filename>gemset.nix</filename> the same way, and then, for example:
  </para>
 
 <screen>
@@ -87,29 +78,11 @@ bundlerApp {
 </screen>
 
  <para>
-  The chief advantage of <literal>bundlerApp</literal> over
-  <literal>bundlerEnv</literal> is the executables introduced in the
-  environment are precisely those selected in the <literal>exes</literal> list,
-  as opposed to <literal>bundlerEnv</literal> which adds all the executables
-  made available by gems in the gemset, which can mean e.g.
-  <command>rspec</command> or <command>rake</command> in unpredictable versions
-  available from various packages.
+  The chief advantage of <literal>bundlerApp</literal> over <literal>bundlerEnv</literal> is the executables introduced in the environment are precisely those selected in the <literal>exes</literal> list, as opposed to <literal>bundlerEnv</literal> which adds all the executables made available by gems in the gemset, which can mean e.g. <command>rspec</command> or <command>rake</command> in unpredictable versions available from various packages.
  </para>
 
  <para>
-  Resulting derivations for both builders also have two helpful attributes,
-  <literal>env</literal> and <literal>wrappedRuby</literal>. The first one
-  allows one to quickly drop into <command>nix-shell</command> with the
-  specified environment present. E.g. <command>nix-shell -A sensu.env</command>
-  would give you an environment with Ruby preset so it has all the libraries
-  necessary for <literal>sensu</literal> in its paths. The second one can be
-  used to make derivations from custom Ruby scripts which have
-  <filename>Gemfile</filename>s with their dependencies specified. It is a
-  derivation with <command>ruby</command> wrapped so it can find all the needed
-  dependencies. For example, to make a derivation <literal>my-script</literal>
-  for a <filename>my-script.rb</filename> (which should be placed in
-  <filename>bin</filename>) you should run <command>bundix</command> as
-  specified above and then use <literal>bundlerEnv</literal> like this:
+  Resulting derivations for both builders also have two helpful attributes, <literal>env</literal> and <literal>wrappedRuby</literal>. The first one allows one to quickly drop into <command>nix-shell</command> with the specified environment present. E.g. <command>nix-shell -A sensu.env</command> would give you an environment with Ruby preset so it has all the libraries necessary for <literal>sensu</literal> in its paths. The second one can be used to make derivations from custom Ruby scripts which have <filename>Gemfile</filename>s with their dependencies specified. It is a derivation with <command>ruby</command> wrapped so it can find all the needed dependencies. For example, to make a derivation <literal>my-script</literal> for a <filename>my-script.rb</filename> (which should be placed in <filename>bin</filename>) you should run <command>bundix</command> as specified above and then use <literal>bundlerEnv</literal> like this:
  </para>
 
 <programlisting>
diff --git a/doc/languages-frameworks/texlive.xml b/doc/languages-frameworks/texlive.xml
index 97f274933be..7876cc213b6 100644
--- a/doc/languages-frameworks/texlive.xml
+++ b/doc/languages-frameworks/texlive.xml
@@ -4,8 +4,7 @@
  <title>TeX Live</title>
 
  <para>
-  Since release 15.09 there is a new TeX Live packaging that lives entirely
-  under attribute <varname>texlive</varname>.
+  Since release 15.09 there is a new TeX Live packaging that lives entirely under attribute <varname>texlive</varname>.
  </para>
 
  <section xml:id="sec-language-texlive-users-guide">
@@ -14,28 +13,23 @@
   <itemizedlist>
    <listitem>
     <para>
-     For basic usage just pull <varname>texlive.combined.scheme-basic</varname>
-     for an environment with basic LaTeX support.
+     For basic usage just pull <varname>texlive.combined.scheme-basic</varname> for an environment with basic LaTeX support.
     </para>
    </listitem>
    <listitem>
     <para>
-     It typically won't work to use separately installed packages together.
-     Instead, you can build a custom set of packages like this:
+     It typically won't work to use separately installed packages together. Instead, you can build a custom set of packages like this:
 <programlisting>
 texlive.combine {
   inherit (texlive) scheme-small collection-langkorean algorithms cm-super;
 }
 </programlisting>
-     There are all the schemes, collections and a few thousand packages, as
-     defined upstream (perhaps with tiny differences).
+     There are all the schemes, collections and a few thousand packages, as defined upstream (perhaps with tiny differences).
     </para>
    </listitem>
    <listitem>
     <para>
-     By default you only get executables and files needed during runtime, and a
-     little documentation for the core packages. To change that, you need to
-     add <varname>pkgFilter</varname> function to <varname>combine</varname>.
+     By default you only get executables and files needed during runtime, and a little documentation for the core packages. To change that, you need to add <varname>pkgFilter</varname> function to <varname>combine</varname>.
 <programlisting>
 texlive.combine {
   # inherit (texlive) whatever-you-want;
@@ -59,10 +53,7 @@ nix-repl> texlive.collection-<TAB>
    </listitem>
    <listitem>
     <para>
-     Note that the wrapper assumes that the result has a chance to be useful.
-     For example, the core executables should be present, as well as some core
-     data files. The supported way of ensuring this is by including some
-     scheme, for example <varname>scheme-basic</varname>, into the combination.
+     Note that the wrapper assumes that the result has a chance to be useful. For example, the core executables should be present, as well as some core data files. The supported way of ensuring this is by including some scheme, for example <varname>scheme-basic</varname>, into the combination.
     </para>
    </listitem>
   </itemizedlist>
@@ -84,14 +75,12 @@ nix-repl> texlive.collection-<TAB>
    </listitem>
    <listitem>
     <para>
-     feature/bug: when a package is rejected by <varname>pkgFilter</varname>,
-     its dependencies are still propagated;
+     feature/bug: when a package is rejected by <varname>pkgFilter</varname>, its dependencies are still propagated;
     </para>
    </listitem>
    <listitem>
     <para>
-     in case of any bugs or feature requests, file a github issue or better a
-     pull request and /cc @vcunat.
+     in case of any bugs or feature requests, file a github issue or better a pull request and /cc @vcunat.
     </para>
    </listitem>
   </itemizedlist>
diff --git a/doc/meta.xml b/doc/meta.xml
index 49db73ab79e..9371196818a 100644
--- a/doc/meta.xml
+++ b/doc/meta.xml
@@ -3,10 +3,7 @@
          xml:id="chap-meta">
  <title>Meta-attributes</title>
  <para>
-  Nix packages can declare <emphasis>meta-attributes</emphasis> that contain
-  information about a package such as a description, its homepage, its license,
-  and so on. For instance, the GNU Hello package has a <varname>meta</varname>
-  declaration like this:
+  Nix packages can declare <emphasis>meta-attributes</emphasis> that contain information about a package such as a description, its homepage, its license, and so on. For instance, the GNU Hello package has a <varname>meta</varname> declaration like this:
 <programlisting>
 meta = with stdenv.lib; {
   description = "A program that produces a familiar, friendly greeting";
@@ -22,13 +19,10 @@ meta = with stdenv.lib; {
 </programlisting>
  </para>
  <para>
-  Meta-attributes are not passed to the builder of the package. Thus, a change
-  to a meta-attribute doesn’t trigger a recompilation of the package. The
-  value of a meta-attribute must be a string.
+  Meta-attributes are not passed to the builder of the package. Thus, a change to a meta-attribute doesn’t trigger a recompilation of the package. The value of a meta-attribute must be a string.
  </para>
  <para>
-  The meta-attributes of a package can be queried from the command-line using
-  <command>nix-env</command>:
+  The meta-attributes of a package can be queried from the command-line using <command>nix-env</command>:
 <screen>
 <prompt>$ </prompt>nix-env -qa hello --json
 {
@@ -67,8 +61,7 @@ meta = with stdenv.lib; {
 
 
 </screen>
-  <command>nix-env</command> knows about the <varname>description</varname>
-  field specifically:
+  <command>nix-env</command> knows about the <varname>description</varname> field specifically:
 <screen>
 <prompt>$ </prompt>nix-env -qa hello --description
 hello-2.3  A program that produces a familiar, friendly greeting
@@ -88,18 +81,13 @@ hello-2.3  A program that produces a familiar, friendly greeting
     </term>
     <listitem>
      <para>
-      A short (one-line) description of the package. This is shown by
-      <command>nix-env -q --description</command> and also on the Nixpkgs
-      release pages.
+      A short (one-line) description of the package. This is shown by <command>nix-env -q --description</command> and also on the Nixpkgs release pages.
      </para>
      <para>
-      Don’t include a period at the end. Don’t include newline characters.
-      Capitalise the first character. For brevity, don’t repeat the name of
-      package — just describe what it does.
+      Don’t include a period at the end. Don’t include newline characters. Capitalise the first character. For brevity, don’t repeat the name of package — just describe what it does.
      </para>
      <para>
-      Wrong: <literal>"libpng is a library that allows you to decode PNG
-      images."</literal>
+      Wrong: <literal>"libpng is a library that allows you to decode PNG images."</literal>
      </para>
      <para>
       Right: <literal>"A library for decoding PNG images"</literal>
@@ -122,9 +110,7 @@ hello-2.3  A program that produces a familiar, friendly greeting
     </term>
     <listitem>
      <para>
-      Release branch. Used to specify that a package is not going to receive
-      updates that are not in this branch; for example, Linux kernel 3.0 is
-      supposed to be updated to 3.0.X, not 3.1.
+      Release branch. Used to specify that a package is not going to receive updates that are not in this branch; for example, Linux kernel 3.0 is supposed to be updated to 3.0.X, not 3.1.
      </para>
     </listitem>
    </varlistentry>
@@ -134,8 +120,7 @@ hello-2.3  A program that produces a familiar, friendly greeting
     </term>
     <listitem>
      <para>
-      The package’s homepage. Example:
-      <literal>https://www.gnu.org/software/hello/manual/</literal>
+      The package’s homepage. Example: <literal>https://www.gnu.org/software/hello/manual/</literal>
      </para>
     </listitem>
    </varlistentry>
@@ -145,8 +130,7 @@ hello-2.3  A program that produces a familiar, friendly greeting
     </term>
     <listitem>
      <para>
-      The page where a link to the current version can be found. Example:
-      <literal>https://ftp.gnu.org/gnu/hello/</literal>
+      The page where a link to the current version can be found. Example: <literal>https://ftp.gnu.org/gnu/hello/</literal>
      </para>
     </listitem>
    </varlistentry>
@@ -156,10 +140,7 @@ hello-2.3  A program that produces a familiar, friendly greeting
     </term>
     <listitem>
      <para>
-      A link or a list of links to the location of Changelog for a package. A
-      link may use expansion to refer to the correct changelog version.
-      Example:
-      <literal>"https://git.savannah.gnu.org/cgit/hello.git/plain/NEWS?h=v${version}"</literal>
+      A link or a list of links to the location of Changelog for a package. A link may use expansion to refer to the correct changelog version. Example: <literal>"https://git.savannah.gnu.org/cgit/hello.git/plain/NEWS?h=v${version}"</literal>
      </para>
     </listitem>
    </varlistentry>
@@ -169,46 +150,32 @@ hello-2.3  A program that produces a familiar, friendly greeting
     </term>
     <listitem>
      <para>
-      The license, or licenses, for the package. One from the attribute set
-      defined in
-      <link
-          xlink:href="https://github.com/NixOS/nixpkgs/blob/master/lib/licenses.nix">
-      <filename>nixpkgs/lib/licenses.nix</filename></link>. At this moment
-      using both a list of licenses and a single license is valid. If the
-      license field is in the form of a list representation, then it means that
-      parts of the package are licensed differently. Each license should
-      preferably be referenced by their attribute. The non-list attribute value
-      can also be a space delimited string representation of the contained
-      attribute shortNames or spdxIds. The following are all valid examples:
+      The license, or licenses, for the package. One from the attribute set defined in <link
+          xlink:href="https://github.com/NixOS/nixpkgs/blob/master/lib/licenses.nix"> <filename>nixpkgs/lib/licenses.nix</filename></link>. At this moment using both a list of licenses and a single license is valid. If the license field is in the form of a list representation, then it means that parts of the package are licensed differently. Each license should preferably be referenced by their attribute. The non-list attribute value can also be a space delimited string representation of the contained attribute shortNames or spdxIds. The following are all valid examples:
       <itemizedlist>
        <listitem>
         <para>
-         Single license referenced by attribute (preferred)
-         <literal>stdenv.lib.licenses.gpl3</literal>.
+         Single license referenced by attribute (preferred) <literal>stdenv.lib.licenses.gpl3</literal>.
         </para>
        </listitem>
        <listitem>
         <para>
-         Single license referenced by its attribute shortName (frowned upon)
-         <literal>"gpl3"</literal>.
+         Single license referenced by its attribute shortName (frowned upon) <literal>"gpl3"</literal>.
         </para>
        </listitem>
        <listitem>
         <para>
-         Single license referenced by its attribute spdxId (frowned upon)
-         <literal>"GPL-3.0"</literal>.
+         Single license referenced by its attribute spdxId (frowned upon) <literal>"GPL-3.0"</literal>.
         </para>
        </listitem>
        <listitem>
         <para>
-         Multiple licenses referenced by attribute (preferred) <literal>with
-         stdenv.lib.licenses; [ asl20 free ofl ]</literal>.
+         Multiple licenses referenced by attribute (preferred) <literal>with stdenv.lib.licenses; [ asl20 free ofl ]</literal>.
         </para>
        </listitem>
        <listitem>
         <para>
-         Multiple licenses referenced as a space delimited string of attribute
-         shortNames (frowned upon) <literal>"asl20 free ofl"</literal>.
+         Multiple licenses referenced as a space delimited string of attribute shortNames (frowned upon) <literal>"asl20 free ofl"</literal>.
         </para>
        </listitem>
       </itemizedlist>
@@ -222,13 +189,8 @@ hello-2.3  A program that produces a familiar, friendly greeting
     </term>
     <listitem>
      <para>
-      A list of names and e-mail addresses of the maintainers of this Nix
-      expression. If you would like to be a maintainer of a package, you may
-      want to add yourself to
-      <link
-    xlink:href="https://github.com/NixOS/nixpkgs/blob/master/maintainers/maintainer-list.nix"><filename>nixpkgs/maintainers/maintainer-list.nix</filename></link>
-      and write something like <literal>[ stdenv.lib.maintainers.alice
-      stdenv.lib.maintainers.bob ]</literal>.
+      A list of names and e-mail addresses of the maintainers of this Nix expression. If you would like to be a maintainer of a package, you may want to add yourself to <link
+    xlink:href="https://github.com/NixOS/nixpkgs/blob/master/maintainers/maintainer-list.nix"><filename>nixpkgs/maintainers/maintainer-list.nix</filename></link> and write something like <literal>[ stdenv.lib.maintainers.alice stdenv.lib.maintainers.bob ]</literal>.
      </para>
     </listitem>
    </varlistentry>
@@ -238,10 +200,7 @@ hello-2.3  A program that produces a familiar, friendly greeting
     </term>
     <listitem>
      <para>
-      The <emphasis>priority</emphasis> of the package, used by
-      <command>nix-env</command> to resolve file name conflicts between
-      packages. See the Nix manual page for <command>nix-env</command> for
-      details. Example: <literal>"10"</literal> (a low-priority package).
+      The <emphasis>priority</emphasis> of the package, used by <command>nix-env</command> to resolve file name conflicts between packages. See the Nix manual page for <command>nix-env</command> for details. Example: <literal>"10"</literal> (a low-priority package).
      </para>
     </listitem>
    </varlistentry>
@@ -251,15 +210,11 @@ hello-2.3  A program that produces a familiar, friendly greeting
     </term>
     <listitem>
      <para>
-      The list of Nix platform types on which the package is supported. Hydra
-      builds packages according to the platform specified. If no platform is
-      specified, the package does not have prebuilt binaries. An example is:
+      The list of Nix platform types on which the package is supported. Hydra builds packages according to the platform specified. If no platform is specified, the package does not have prebuilt binaries. An example is:
 <programlisting>
 meta.platforms = stdenv.lib.platforms.linux;
 </programlisting>
-      Attribute Set <varname>stdenv.lib.platforms</varname> defines
-      <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/lib/systems/doubles.nix">
-      various common lists</link> of platforms types.
+      Attribute Set <varname>stdenv.lib.platforms</varname> defines <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/lib/systems/doubles.nix"> various common lists</link> of platforms types.
      </para>
     </listitem>
    </varlistentry>
@@ -270,23 +225,14 @@ meta.platforms = stdenv.lib.platforms.linux;
     <listitem>
      <warning>
       <para>
-       This attribute is special in that it is not actually under the
-       <literal>meta</literal> attribute set but rather under the
-       <literal>passthru</literal> attribute set. This is due to how
-       <literal>meta</literal> attributes work, and the fact that they are
-       supposed to contain only metadata, not derivations.
+       This attribute is special in that it is not actually under the <literal>meta</literal> attribute set but rather under the <literal>passthru</literal> attribute set. This is due to how <literal>meta</literal> attributes work, and the fact that they are supposed to contain only metadata, not derivations.
       </para>
      </warning>
      <para>
-      An attribute set with as values tests. A test is a derivation, which
-      builds successfully when the test passes, and fails to build otherwise. A
-      derivation that is a test needs to have <literal>meta.timeout</literal>
-      defined.
+      An attribute set with as values tests. A test is a derivation, which builds successfully when the test passes, and fails to build otherwise. A derivation that is a test needs to have <literal>meta.timeout</literal> defined.
      </para>
      <para>
-      The NixOS tests are available as <literal>nixosTests</literal> in
-      parameters of derivations. For instance, the OpenSMTPD derivation
-      includes lines similar to:
+      The NixOS tests are available as <literal>nixosTests</literal> in parameters of derivations. For instance, the OpenSMTPD derivation includes lines similar to:
 <programlisting>
 { /* ... */, nixosTests }:
 {
@@ -305,13 +251,7 @@ meta.platforms = stdenv.lib.platforms.linux;
     </term>
     <listitem>
      <para>
-      A timeout (in seconds) for building the derivation. If the derivation
-      takes longer than this time to build, it can fail due to breaking the
-      timeout. However, all computers do not have the same computing power,
-      hence some builders may decide to apply a multiplicative factor to this
-      value. When filling this value in, try to keep it approximately
-      consistent with other values already present in
-      <literal>nixpkgs</literal>.
+      A timeout (in seconds) for building the derivation. If the derivation takes longer than this time to build, it can fail due to breaking the timeout. However, all computers do not have the same computing power, hence some builders may decide to apply a multiplicative factor to this value. When filling this value in, try to keep it approximately consistent with other values already present in <literal>nixpkgs</literal>.
      </para>
     </listitem>
    </varlistentry>
@@ -321,13 +261,7 @@ meta.platforms = stdenv.lib.platforms.linux;
     </term>
     <listitem>
      <para>
-      The list of Nix platform types for which the Hydra instance at
-      <literal>hydra.nixos.org</literal> will build the package. (Hydra is the
-      Nix-based continuous build system.) It defaults to the value of
-      <varname>meta.platforms</varname>. Thus, the only reason to set
-      <varname>meta.hydraPlatforms</varname> is if you want
-      <literal>hydra.nixos.org</literal> to build the package on a subset of
-      <varname>meta.platforms</varname>, or not at all, e.g.
+      The list of Nix platform types for which the Hydra instance at <literal>hydra.nixos.org</literal> will build the package. (Hydra is the Nix-based continuous build system.) It defaults to the value of <varname>meta.platforms</varname>. Thus, the only reason to set <varname>meta.hydraPlatforms</varname> is if you want <literal>hydra.nixos.org</literal> to build the package on a subset of <varname>meta.platforms</varname>, or not at all, e.g.
 <programlisting>
 meta.platforms = stdenv.lib.platforms.linux;
 meta.hydraPlatforms = [];
@@ -341,10 +275,7 @@ meta.hydraPlatforms = [];
     </term>
     <listitem>
      <para>
-      If set to <literal>true</literal>, the package is marked as “broken”,
-      meaning that it won’t show up in <literal>nix-env -qa</literal>, and
-      cannot be built or installed. Such packages should be removed from
-      Nixpkgs eventually unless they are fixed.
+      If set to <literal>true</literal>, the package is marked as “broken”, meaning that it won’t show up in <literal>nix-env -qa</literal>, and cannot be built or installed. Such packages should be removed from Nixpkgs eventually unless they are fixed.
      </para>
     </listitem>
    </varlistentry>
@@ -354,12 +285,7 @@ meta.hydraPlatforms = [];
     </term>
     <listitem>
      <para>
-      If set to <literal>true</literal>, the package is tested to be updated
-      correctly by the <literal>update-walker.sh</literal> script without
-      additional settings. Such packages have <varname>meta.version</varname>
-      set and their homepage (or the page specified by
-      <varname>meta.downloadPage</varname>) contains a direct link to the
-      package tarball.
+      If set to <literal>true</literal>, the package is tested to be updated correctly by the <literal>update-walker.sh</literal> script without additional settings. Such packages have <varname>meta.version</varname> set and their homepage (or the page specified by <varname>meta.downloadPage</varname>) contains a direct link to the package tarball.
      </para>
     </listitem>
    </varlistentry>
@@ -369,17 +295,11 @@ meta.hydraPlatforms = [];
   <title>Licenses</title>
 
   <para>
-   The <varname>meta.license</varname> attribute should preferrably contain a
-   value from <varname>stdenv.lib.licenses</varname> defined in
-   <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/lib/licenses.nix">
-   <filename>nixpkgs/lib/licenses.nix</filename></link>, or in-place license
-   description of the same format if the license is unlikely to be useful in
-   another expression.
+   The <varname>meta.license</varname> attribute should preferrably contain a value from <varname>stdenv.lib.licenses</varname> defined in <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/lib/licenses.nix"> <filename>nixpkgs/lib/licenses.nix</filename></link>, or in-place license description of the same format if the license is unlikely to be useful in another expression.
   </para>
 
   <para>
-   Although it's typically better to indicate the specific license, a few
-   generic options are available:
+   Although it's typically better to indicate the specific license, a few generic options are available:
    <variablelist>
     <varlistentry>
      <term>
@@ -397,18 +317,10 @@ meta.hydraPlatforms = [];
      </term>
      <listitem>
       <para>
-       Unfree package that can be redistributed in binary form. That is, it’s
-       legal to redistribute the <emphasis>output</emphasis> of the derivation.
-       This means that the package can be included in the Nixpkgs channel.
+       Unfree package that can be redistributed in binary form. That is, it’s legal to redistribute the <emphasis>output</emphasis> of the derivation. This means that the package can be included in the Nixpkgs channel.
       </para>
       <para>
-       Sometimes proprietary software can only be redistributed unmodified.
-       Make sure the builder doesn’t actually modify the original binaries;
-       otherwise we’re breaking the license. For instance, the NVIDIA X11
-       drivers can be redistributed unmodified, but our builder applies
-       <command>patchelf</command> to make them work. Thus, its license is
-       <varname>"unfree"</varname> and it cannot be included in the Nixpkgs
-       channel.
+       Sometimes proprietary software can only be redistributed unmodified. Make sure the builder doesn’t actually modify the original binaries; otherwise we’re breaking the license. For instance, the NVIDIA X11 drivers can be redistributed unmodified, but our builder applies <command>patchelf</command> to make them work. Thus, its license is <varname>"unfree"</varname> and it cannot be included in the Nixpkgs channel.
       </para>
      </listitem>
     </varlistentry>
@@ -418,9 +330,7 @@ meta.hydraPlatforms = [];
      </term>
      <listitem>
       <para>
-       Unfree package that cannot be redistributed. You can build it yourself,
-       but you cannot redistribute the output of the derivation. Thus it cannot
-       be included in the Nixpkgs channel.
+       Unfree package that cannot be redistributed. You can build it yourself, but you cannot redistribute the output of the derivation. Thus it cannot be included in the Nixpkgs channel.
       </para>
      </listitem>
     </varlistentry>
@@ -430,9 +340,7 @@ meta.hydraPlatforms = [];
      </term>
      <listitem>
       <para>
-       This package supplies unfree, redistributable firmware. This is a
-       separate value from <varname>unfree-redistributable</varname> because
-       not everybody cares whether firmware is free.
+       This package supplies unfree, redistributable firmware. This is a separate value from <varname>unfree-redistributable</varname> because not everybody cares whether firmware is free.
       </para>
      </listitem>
     </varlistentry>
diff --git a/doc/multiple-output.xml b/doc/multiple-output.xml
index d0247e081f9..83275bb2fbd 100644
--- a/doc/multiple-output.xml
+++ b/doc/multiple-output.xml
@@ -10,31 +10,16 @@
   <title>Introduction</title>
 
   <para>
-   The Nix language allows a derivation to produce multiple outputs, which is
-   similar to what is utilized by other Linux distribution packaging systems.
-   The outputs reside in separate Nix store paths, so they can be mostly
-   handled independently of each other, including passing to build inputs,
-   garbage collection or binary substitution. The exception is that building
-   from source always produces all the outputs.
+   The Nix language allows a derivation to produce multiple outputs, which is similar to what is utilized by other Linux distribution packaging systems. The outputs reside in separate Nix store paths, so they can be mostly handled independently of each other, including passing to build inputs, garbage collection or binary substitution. The exception is that building from source always produces all the outputs.
   </para>
 
   <para>
-   The main motivation is to save disk space by reducing runtime closure sizes;
-   consequently also sizes of substituted binaries get reduced. Splitting can
-   be used to have more granular runtime dependencies, for example the typical
-   reduction is to split away development-only files, as those are typically
-   not needed during runtime. As a result, closure sizes of many packages can
-   get reduced to a half or even much less.
+   The main motivation is to save disk space by reducing runtime closure sizes; consequently also sizes of substituted binaries get reduced. Splitting can be used to have more granular runtime dependencies, for example the typical reduction is to split away development-only files, as those are typically not needed during runtime. As a result, closure sizes of many packages can get reduced to a half or even much less.
   </para>
 
   <note>
    <para>
-    The reduction effects could be instead achieved by building the parts in
-    completely separate derivations. That would often additionally reduce
-    build-time closures, but it tends to be much harder to write such
-    derivations, as build systems typically assume all parts are being built at
-    once. This compromise approach of single source package producing multiple
-    binary packages is also utilized often by rpm and deb.
+    The reduction effects could be instead achieved by building the parts in completely separate derivations. That would often additionally reduce build-time closures, but it tends to be much harder to write such derivations, as build systems typically assume all parts are being built at once. This compromise approach of single source package producing multiple binary packages is also utilized often by rpm and deb.
    </para>
   </note>
  </section>
@@ -42,23 +27,18 @@
   <title>Installing a split package</title>
 
   <para>
-   When installing a package via <varname>systemPackages</varname> or
-   <command>nix-env</command> you have several options:
+   When installing a package via <varname>systemPackages</varname> or <command>nix-env</command> you have several options:
   </para>
 
   <itemizedlist>
    <listitem>
     <para>
-     You can install particular outputs explicitly, as each is available in the
-     Nix language as an attribute of the package. The
-     <varname>outputs</varname> attribute contains a list of output names.
+     You can install particular outputs explicitly, as each is available in the Nix language as an attribute of the package. The <varname>outputs</varname> attribute contains a list of output names.
     </para>
    </listitem>
    <listitem>
     <para>
-     You can let it use the default outputs. These are handled by
-     <varname>meta.outputsToInstall</varname> attribute that contains a list of
-     output names.
+     You can let it use the default outputs. These are handled by <varname>meta.outputsToInstall</varname> attribute that contains a list of output names.
     </para>
     <para>
      TODO: more about tweaking the attribute, etc.
@@ -66,19 +46,11 @@
    </listitem>
    <listitem>
     <para>
-     NixOS provides configuration option
-     <varname>environment.extraOutputsToInstall</varname> that allows adding
-     extra outputs of <varname>environment.systemPackages</varname> atop the
-     default ones. It's mainly meant for documentation and debug symbols, and
-     it's also modified by specific options.
+     NixOS provides configuration option <varname>environment.extraOutputsToInstall</varname> that allows adding extra outputs of <varname>environment.systemPackages</varname> atop the default ones. It's mainly meant for documentation and debug symbols, and it's also modified by specific options.
     </para>
     <note>
      <para>
-      At this moment there is no similar configurability for packages installed
-      by <command>nix-env</command>. You can still use approach from
-      <xref linkend="sec-modify-via-packageOverrides" /> to override
-      <varname>meta.outputsToInstall</varname> attributes, but that's a rather
-      inconvenient way.
+      At this moment there is no similar configurability for packages installed by <command>nix-env</command>. You can still use approach from <xref linkend="sec-modify-via-packageOverrides" /> to override <varname>meta.outputsToInstall</varname> attributes, but that's a rather inconvenient way.
      </para>
     </note>
    </listitem>
@@ -88,25 +60,15 @@
   <title>Using a split package</title>
 
   <para>
-   In the Nix language the individual outputs can be reached explicitly as
-   attributes, e.g. <varname>coreutils.info</varname>, but the typical case is
-   just using packages as build inputs.
+   In the Nix language the individual outputs can be reached explicitly as attributes, e.g. <varname>coreutils.info</varname>, but the typical case is just using packages as build inputs.
   </para>
 
   <para>
-   When a multiple-output derivation gets into a build input of another
-   derivation, the <varname>dev</varname> output is added if it exists,
-   otherwise the first output is added. In addition to that,
-   <varname>propagatedBuildOutputs</varname> of that package which by default
-   contain <varname>$outputBin</varname> and <varname>$outputLib</varname> are
-   also added. (See <xref linkend="multiple-output-file-type-groups" />.)
+   When a multiple-output derivation gets into a build input of another derivation, the <varname>dev</varname> output is added if it exists, otherwise the first output is added. In addition to that, <varname>propagatedBuildOutputs</varname> of that package which by default contain <varname>$outputBin</varname> and <varname>$outputLib</varname> are also added. (See <xref linkend="multiple-output-file-type-groups" />.)
   </para>
 
   <para>
-   In some cases it may be desirable to combine different outputs under a
-   single store path. A function <literal>symlinkJoin</literal> can be used to
-   do this. (Note that it may negate some closure size benefits of using a
-   multiple-output package.)
+   In some cases it may be desirable to combine different outputs under a single store path. A function <literal>symlinkJoin</literal> can be used to do this. (Note that it may negate some closure size benefits of using a multiple-output package.)
   </para>
  </section>
  <section xml:id="sec-multiple-outputs-">
@@ -117,29 +79,18 @@
   </para>
 
   <para>
-   In nixpkgs there is a framework supporting multiple-output derivations. It
-   tries to cover most cases by default behavior. You can find the source
-   separated in
-   &lt;<filename>nixpkgs/pkgs/build-support/setup-hooks/multiple-outputs.sh</filename>&gt;;
-   it's relatively well-readable. The whole machinery is triggered by defining
-   the <varname>outputs</varname> attribute to contain the list of desired
-   output names (strings).
+   In nixpkgs there is a framework supporting multiple-output derivations. It tries to cover most cases by default behavior. You can find the source separated in &lt;<filename>nixpkgs/pkgs/build-support/setup-hooks/multiple-outputs.sh</filename>&gt;; it's relatively well-readable. The whole machinery is triggered by defining the <varname>outputs</varname> attribute to contain the list of desired output names (strings).
   </para>
 
 <programlisting>outputs = [ "bin" "dev" "out" "doc" ];</programlisting>
 
   <para>
-   Often such a single line is enough. For each output an equally named
-   environment variable is passed to the builder and contains the path in nix
-   store for that output. Typically you also want to have the main
-   <varname>out</varname> output, as it catches any files that didn't get
-   elsewhere.
+   Often such a single line is enough. For each output an equally named environment variable is passed to the builder and contains the path in nix store for that output. Typically you also want to have the main <varname>out</varname> output, as it catches any files that didn't get elsewhere.
   </para>
 
   <note>
    <para>
-    There is a special handling of the <varname>debug</varname> output,
-    described at <xref linkend="stdenv-separateDebugInfo" />.
+    There is a special handling of the <varname>debug</varname> output, described at <xref linkend="stdenv-separateDebugInfo" />.
    </para>
   </note>
 
@@ -147,36 +98,15 @@
    <title><quote>Binaries first</quote></title>
 
    <para>
-    A commonly adopted convention in <literal>nixpkgs</literal> is that
-    executables provided by the package are contained within its first output.
-    This convention allows the dependent packages to reference the executables
-    provided by packages in a uniform manner. For instance, provided with the
-    knowledge that the <literal>perl</literal> package contains a
-    <literal>perl</literal> executable it can be referenced as
-    <literal>${pkgs.perl}/bin/perl</literal> within a Nix derivation that needs
-    to execute a Perl script.
+    A commonly adopted convention in <literal>nixpkgs</literal> is that executables provided by the package are contained within its first output. This convention allows the dependent packages to reference the executables provided by packages in a uniform manner. For instance, provided with the knowledge that the <literal>perl</literal> package contains a <literal>perl</literal> executable it can be referenced as <literal>${pkgs.perl}/bin/perl</literal> within a Nix derivation that needs to execute a Perl script.
    </para>
 
    <para>
-    The <literal>glibc</literal> package is a deliberate single exception to
-    the <quote>binaries first</quote> convention. The <literal>glibc</literal>
-    has <literal>libs</literal> as its first output allowing the libraries
-    provided by <literal>glibc</literal> to be referenced directly (e.g.
-    <literal>${stdenv.glibc}/lib/ld-linux-x86-64.so.2</literal>). The
-    executables provided by <literal>glibc</literal> can be accessed via its
-    <literal>bin</literal> attribute (e.g.
-    <literal>${stdenv.glibc.bin}/bin/ldd</literal>).
+    The <literal>glibc</literal> package is a deliberate single exception to the <quote>binaries first</quote> convention. The <literal>glibc</literal> has <literal>libs</literal> as its first output allowing the libraries provided by <literal>glibc</literal> to be referenced directly (e.g. <literal>${stdenv.glibc}/lib/ld-linux-x86-64.so.2</literal>). The executables provided by <literal>glibc</literal> can be accessed via its <literal>bin</literal> attribute (e.g. <literal>${stdenv.glibc.bin}/bin/ldd</literal>).
    </para>
 
    <para>
-    The reason for why <literal>glibc</literal> deviates from the convention is
-    because referencing a library provided by <literal>glibc</literal> is a
-    very common operation among Nix packages. For instance, third-party
-    executables packaged by Nix are typically patched and relinked with the
-    relevant version of <literal>glibc</literal> libraries from Nix packages
-    (please see the documentation on
-    <link xlink:href="https://nixos.org/patchelf.html">patchelf</link> for more
-    details).
+    The reason for why <literal>glibc</literal> deviates from the convention is because referencing a library provided by <literal>glibc</literal> is a very common operation among Nix packages. For instance, third-party executables packaged by Nix are typically patched and relinked with the relevant version of <literal>glibc</literal> libraries from Nix packages (please see the documentation on <link xlink:href="https://nixos.org/patchelf.html">patchelf</link> for more details).
    </para>
   </section>
 
@@ -184,13 +114,7 @@
    <title>File type groups</title>
 
    <para>
-    The support code currently recognizes some particular kinds of outputs and
-    either instructs the build system of the package to put files into their
-    desired outputs or it moves the files during the fixup phase. Each group of
-    file types has an <varname>outputFoo</varname> variable specifying the
-    output name where they should go. If that variable isn't defined by the
-    derivation writer, it is guessed &ndash; a default output name is defined,
-    falling back to other possibilities if the output isn't defined.
+    The support code currently recognizes some particular kinds of outputs and either instructs the build system of the package to put files into their desired outputs or it moves the files during the fixup phase. Each group of file types has an <varname>outputFoo</varname> variable specifying the output name where they should go. If that variable isn't defined by the derivation writer, it is guessed &ndash; a default output name is defined, falling back to other possibilities if the output isn't defined.
    </para>
 
    <variablelist>
@@ -200,9 +124,7 @@
      </term>
      <listitem>
       <para>
-       is for development-only files. These include C(++) headers, pkg-config,
-       cmake and aclocal files. They go to <varname>dev</varname> or
-       <varname>out</varname> by default.
+       is for development-only files. These include C(++) headers, pkg-config, cmake and aclocal files. They go to <varname>dev</varname> or <varname>out</varname> by default.
       </para>
      </listitem>
     </varlistentry>
@@ -212,8 +134,7 @@
      </term>
      <listitem>
       <para>
-       is meant for user-facing binaries, typically residing in bin/. They go
-       to <varname>bin</varname> or <varname>out</varname> by default.
+       is meant for user-facing binaries, typically residing in bin/. They go to <varname>bin</varname> or <varname>out</varname> by default.
       </para>
      </listitem>
     </varlistentry>
@@ -223,9 +144,7 @@
      </term>
      <listitem>
       <para>
-       is meant for libraries, typically residing in <filename>lib/</filename>
-       and <filename>libexec/</filename>. They go to <varname>lib</varname> or
-       <varname>out</varname> by default.
+       is meant for libraries, typically residing in <filename>lib/</filename> and <filename>libexec/</filename>. They go to <varname>lib</varname> or <varname>out</varname> by default.
       </para>
      </listitem>
     </varlistentry>
@@ -235,9 +154,7 @@
      </term>
      <listitem>
       <para>
-       is for user documentation, typically residing in
-       <filename>share/doc/</filename>. It goes to <varname>doc</varname> or
-       <varname>out</varname> by default.
+       is for user documentation, typically residing in <filename>share/doc/</filename>. It goes to <varname>doc</varname> or <varname>out</varname> by default.
       </para>
      </listitem>
     </varlistentry>
@@ -247,10 +164,7 @@
      </term>
      <listitem>
       <para>
-       is for <emphasis>developer</emphasis> documentation. Currently we count
-       gtk-doc and devhelp books in there. It goes to <varname>devdoc</varname>
-       or is removed (!) by default. This is because e.g. gtk-doc tends to be
-       rather large and completely unused by nixpkgs users.
+       is for <emphasis>developer</emphasis> documentation. Currently we count gtk-doc and devhelp books in there. It goes to <varname>devdoc</varname> or is removed (!) by default. This is because e.g. gtk-doc tends to be rather large and completely unused by nixpkgs users.
       </para>
      </listitem>
     </varlistentry>
@@ -260,8 +174,7 @@
      </term>
      <listitem>
       <para>
-       is for man pages (except for section 3). They go to
-       <varname>man</varname> or <varname>$outputBin</varname> by default.
+       is for man pages (except for section 3). They go to <varname>man</varname> or <varname>$outputBin</varname> by default.
       </para>
      </listitem>
     </varlistentry>
@@ -271,8 +184,7 @@
      </term>
      <listitem>
       <para>
-       is for section 3 man pages. They go to <varname>devman</varname> or
-       <varname>$outputMan</varname> by default.
+       is for section 3 man pages. They go to <varname>devman</varname> or <varname>$outputMan</varname> by default.
       </para>
      </listitem>
     </varlistentry>
@@ -282,8 +194,7 @@
      </term>
      <listitem>
       <para>
-       is for info pages. They go to <varname>info</varname> or
-       <varname>$outputBin</varname> by default.
+       is for info pages. They go to <varname>info</varname> or <varname>$outputBin</varname> by default.
       </para>
      </listitem>
     </varlistentry>
@@ -296,31 +207,22 @@
    <itemizedlist>
     <listitem>
      <para>
-      Some configure scripts don't like some of the parameters passed by
-      default by the framework, e.g. <literal>--docdir=/foo/bar</literal>. You
-      can disable this by setting <literal>setOutputFlags = false;</literal>.
+      Some configure scripts don't like some of the parameters passed by default by the framework, e.g. <literal>--docdir=/foo/bar</literal>. You can disable this by setting <literal>setOutputFlags = false;</literal>.
      </para>
     </listitem>
     <listitem>
      <para>
-      The outputs of a single derivation can retain references to each other,
-      but note that circular references are not allowed. (And each
-      strongly-connected component would act as a single output anyway.)
+      The outputs of a single derivation can retain references to each other, but note that circular references are not allowed. (And each strongly-connected component would act as a single output anyway.)
      </para>
     </listitem>
     <listitem>
      <para>
-      Most of split packages contain their core functionality in libraries.
-      These libraries tend to refer to various kind of data that typically gets
-      into <varname>out</varname>, e.g. locale strings, so there is often no
-      advantage in separating the libraries into <varname>lib</varname>, as
-      keeping them in <varname>out</varname> is easier.
+      Most of split packages contain their core functionality in libraries. These libraries tend to refer to various kind of data that typically gets into <varname>out</varname>, e.g. locale strings, so there is often no advantage in separating the libraries into <varname>lib</varname>, as keeping them in <varname>out</varname> is easier.
      </para>
     </listitem>
     <listitem>
      <para>
-      Some packages have hidden assumptions on install paths, which complicates
-      splitting.
+      Some packages have hidden assumptions on install paths, which complicates splitting.
      </para>
     </listitem>
    </itemizedlist>
diff --git a/doc/overlays.xml b/doc/overlays.xml
index bff2339ca93..26a888368ab 100644
--- a/doc/overlays.xml
+++ b/doc/overlays.xml
@@ -3,47 +3,32 @@
          xml:id="chap-overlays">
  <title>Overlays</title>
  <para>
-  This chapter describes how to extend and change Nixpkgs using overlays.
-  Overlays are used to add layers in the fixed-point used by Nixpkgs to compose
-  the set of all packages.
+  This chapter describes how to extend and change Nixpkgs using overlays. Overlays are used to add layers in the fixed-point used by Nixpkgs to compose the set of all packages.
  </para>
  <para>
-  Nixpkgs can be configured with a list of overlays, which are applied in
-  order. This means that the order of the overlays can be significant if
-  multiple layers override the same package.
+  Nixpkgs can be configured with a list of overlays, which are applied in order. This means that the order of the overlays can be significant if multiple layers override the same package.
  </para>
 <!--============================================================-->
  <section xml:id="sec-overlays-install">
   <title>Installing overlays</title>
 
   <para>
-   The list of overlays can be set either explicitly in a Nix expression, or
-   through <literal>&lt;nixpkgs-overlays></literal> or user configuration
-   files.
+   The list of overlays can be set either explicitly in a Nix expression, or through <literal>&lt;nixpkgs-overlays></literal> or user configuration files.
   </para>
 
   <section xml:id="sec-overlays-argument">
    <title>Set overlays in NixOS or Nix expressions</title>
 
    <para>
-    On a NixOS system the value of the <literal>nixpkgs.overlays</literal>
-    option, if present, is passed to the system Nixpkgs directly as an
-    argument. Note that this does not affect the overlays for non-NixOS
-    operations (e.g. <literal>nix-env</literal>), which are
-    <link xlink:href="#sec-overlays-lookup">looked</link> up independently.
+    On a NixOS system the value of the <literal>nixpkgs.overlays</literal> option, if present, is passed to the system Nixpkgs directly as an argument. Note that this does not affect the overlays for non-NixOS operations (e.g. <literal>nix-env</literal>), which are <link xlink:href="#sec-overlays-lookup">looked</link> up independently.
    </para>
 
    <para>
-    The list of overlays can be passed explicitly when importing nixpkgs, for
-    example <literal>import &lt;nixpkgs> { overlays = [ overlay1 overlay2 ];
-    }</literal>.
+    The list of overlays can be passed explicitly when importing nixpkgs, for example <literal>import &lt;nixpkgs> { overlays = [ overlay1 overlay2 ]; }</literal>.
    </para>
 
    <para>
-    Further overlays can be added by calling the <literal>pkgs.extend</literal>
-    or <literal>pkgs.appendOverlays</literal>, although it is often preferable
-    to avoid these functions, because they recompute the Nixpkgs fixpoint,
-    which is somewhat expensive to do.
+    Further overlays can be added by calling the <literal>pkgs.extend</literal> or <literal>pkgs.appendOverlays</literal>, although it is often preferable to avoid these functions, because they recompute the Nixpkgs fixpoint, which is somewhat expensive to do.
    </para>
   </section>
 
@@ -58,30 +43,20 @@
     <orderedlist>
      <listitem>
       <para>
-       First, if an
-       <link xlink:href="#sec-overlays-argument"><varname>overlays</varname>
-       argument</link> to the Nixpkgs function itself is given, then that is
-       used and no path lookup will be performed.
+       First, if an <link xlink:href="#sec-overlays-argument"><varname>overlays</varname> argument</link> to the Nixpkgs function itself is given, then that is used and no path lookup will be performed.
       </para>
      </listitem>
      <listitem>
       <para>
-       Otherwise, if the Nix path entry
-       <literal>&lt;nixpkgs-overlays></literal> exists, we look for overlays at
-       that path, as described below.
+       Otherwise, if the Nix path entry <literal>&lt;nixpkgs-overlays></literal> exists, we look for overlays at that path, as described below.
       </para>
       <para>
-       See the section on <literal>NIX_PATH</literal> in the Nix manual for
-       more details on how to set a value for
-       <literal>&lt;nixpkgs-overlays>.</literal>
+       See the section on <literal>NIX_PATH</literal> in the Nix manual for more details on how to set a value for <literal>&lt;nixpkgs-overlays>.</literal>
       </para>
      </listitem>
      <listitem>
       <para>
-       If one of <filename>~/.config/nixpkgs/overlays.nix</filename> and
-       <filename>~/.config/nixpkgs/overlays/</filename> exists, then we look
-       for overlays at that path, as described below. It is an error if both
-       exist.
+       If one of <filename>~/.config/nixpkgs/overlays.nix</filename> and <filename>~/.config/nixpkgs/overlays/</filename> exists, then we look for overlays at that path, as described below. It is an error if both exist.
       </para>
      </listitem>
     </orderedlist>
@@ -92,15 +67,12 @@
     <itemizedlist>
      <listitem>
       <para>
-       If the path is a file, then the file is imported as a Nix expression and
-       used as the list of overlays.
+       If the path is a file, then the file is imported as a Nix expression and used as the list of overlays.
       </para>
      </listitem>
      <listitem>
       <para>
-       If the path is a directory, then we take the content of the directory,
-       order it lexicographically, and attempt to interpret each as an overlay
-       by:
+       If the path is a directory, then we take the content of the directory, order it lexicographically, and attempt to interpret each as an overlay by:
        <itemizedlist>
         <listitem>
          <para>
@@ -109,8 +81,7 @@
         </listitem>
         <listitem>
          <para>
-          Importing a top-level <filename>default.nix</filename> file, if it is
-          a directory.
+          Importing a top-level <filename>default.nix</filename> file, if it is a directory.
          </para>
         </listitem>
        </itemizedlist>
@@ -120,12 +91,7 @@
    </para>
 
    <para>
-    Because overlays that are set in NixOS configuration do not affect
-    non-NixOS operations such as <literal>nix-env</literal>, the
-    <filename>overlays.nix</filename> option provides a convenient way to use
-    the same overlays for a NixOS system configuration and user configuration:
-    the same file can be used as <filename>overlays.nix</filename> and imported
-    as the value of <literal>nixpkgs.overlays</literal>.
+    Because overlays that are set in NixOS configuration do not affect non-NixOS operations such as <literal>nix-env</literal>, the <filename>overlays.nix</filename> option provides a convenient way to use the same overlays for a NixOS system configuration and user configuration: the same file can be used as <filename>overlays.nix</filename> and imported as the value of <literal>nixpkgs.overlays</literal>.
    </para>
 
 <!-- TODO: Example of sharing overlays between NixOS configuration
@@ -139,9 +105,7 @@
   <title>Defining overlays</title>
 
   <para>
-   Overlays are Nix functions which accept two arguments, conventionally called
-   <varname>self</varname> and <varname>super</varname>, and return a set of
-   packages. For example, the following is a valid overlay.
+   Overlays are Nix functions which accept two arguments, conventionally called <varname>self</varname> and <varname>super</varname>, and return a set of packages. For example, the following is a valid overlay.
   </para>
 
 <programlisting>
@@ -158,38 +122,19 @@ self: super:
 </programlisting>
 
   <para>
-   The first argument (<varname>self</varname>) corresponds to the final
-   package set. You should use this set for the dependencies of all packages
-   specified in your overlay. For example, all the dependencies of
-   <varname>rr</varname> in the example above come from
-   <varname>self</varname>, as well as the overridden dependencies used in the
-   <varname>boost</varname> override.
+   The first argument (<varname>self</varname>) corresponds to the final package set. You should use this set for the dependencies of all packages specified in your overlay. For example, all the dependencies of <varname>rr</varname> in the example above come from <varname>self</varname>, as well as the overridden dependencies used in the <varname>boost</varname> override.
   </para>
 
   <para>
-   The second argument (<varname>super</varname>) corresponds to the result of
-   the evaluation of the previous stages of Nixpkgs. It does not contain any of
-   the packages added by the current overlay, nor any of the following
-   overlays. This set should be used either to refer to packages you wish to
-   override, or to access functions defined in Nixpkgs. For example, the
-   original recipe of <varname>boost</varname> in the above example, comes from
-   <varname>super</varname>, as well as the <varname>callPackage</varname>
-   function.
+   The second argument (<varname>super</varname>) corresponds to the result of the evaluation of the previous stages of Nixpkgs. It does not contain any of the packages added by the current overlay, nor any of the following overlays. This set should be used either to refer to packages you wish to override, or to access functions defined in Nixpkgs. For example, the original recipe of <varname>boost</varname> in the above example, comes from <varname>super</varname>, as well as the <varname>callPackage</varname> function.
   </para>
 
   <para>
-   The value returned by this function should be a set similar to
-   <filename>pkgs/top-level/all-packages.nix</filename>, containing overridden
-   and/or new packages.
+   The value returned by this function should be a set similar to <filename>pkgs/top-level/all-packages.nix</filename>, containing overridden and/or new packages.
   </para>
 
   <para>
-   Overlays are similar to other methods for customizing Nixpkgs, in particular
-   the <literal>packageOverrides</literal> attribute described in
-   <xref linkend="sec-modify-via-packageOverrides"/>. Indeed,
-   <literal>packageOverrides</literal> acts as an overlay with only the
-   <varname>super</varname> argument. It is therefore appropriate for basic
-   use, but overlays are more powerful and easier to distribute.
+   Overlays are similar to other methods for customizing Nixpkgs, in particular the <literal>packageOverrides</literal> attribute described in <xref linkend="sec-modify-via-packageOverrides"/>. Indeed, <literal>packageOverrides</literal> acts as an overlay with only the <varname>super</varname> argument. It is therefore appropriate for basic use, but overlays are more powerful and easier to distribute.
   </para>
  </section>
 </chapter>
diff --git a/doc/package-notes.xml b/doc/package-notes.xml
index ef3c2a7c848..770b277cd90 100644
--- a/doc/package-notes.xml
+++ b/doc/package-notes.xml
@@ -3,38 +3,23 @@
          xml:id="chap-package-notes">
  <title>Package Notes</title>
  <para>
-  This chapter contains information about how to use and maintain the Nix
-  expressions for a number of specific packages, such as the Linux kernel or
-  X.org.
+  This chapter contains information about how to use and maintain the Nix expressions for a number of specific packages, such as the Linux kernel or X.org.
  </para>
 <!--============================================================-->
  <section xml:id="sec-linux-kernel">
   <title>Linux kernel</title>
 
   <para>
-   The Nix expressions to build the Linux kernel are in
-   <link
+   The Nix expressions to build the Linux kernel are in <link
 xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/os-specific/linux/kernel"><filename>pkgs/os-specific/linux/kernel</filename></link>.
   </para>
 
   <para>
-   The function that builds the kernel has an argument
-   <varname>kernelPatches</varname> which should be a list of <literal>{name,
-   patch, extraConfig}</literal> attribute sets, where <varname>name</varname>
-   is the name of the patch (which is included in the kernel’s
-   <varname>meta.description</varname> attribute), <varname>patch</varname> is
-   the patch itself (possibly compressed), and <varname>extraConfig</varname>
-   (optional) is a string specifying extra options to be concatenated to the
-   kernel configuration file (<filename>.config</filename>).
+   The function that builds the kernel has an argument <varname>kernelPatches</varname> which should be a list of <literal>{name, patch, extraConfig}</literal> attribute sets, where <varname>name</varname> is the name of the patch (which is included in the kernel’s <varname>meta.description</varname> attribute), <varname>patch</varname> is the patch itself (possibly compressed), and <varname>extraConfig</varname> (optional) is a string specifying extra options to be concatenated to the kernel configuration file (<filename>.config</filename>).
   </para>
 
   <para>
-   The kernel derivation exports an attribute <varname>features</varname>
-   specifying whether optional functionality is or isn’t enabled. This is
-   used in NixOS to implement kernel-specific behaviour. For instance, if the
-   kernel has the <varname>iwlwifi</varname> feature (i.e. has built-in support
-   for Intel wireless chipsets), then NixOS doesn’t have to build the
-   external <varname>iwlwifi</varname> package:
+   The kernel derivation exports an attribute <varname>features</varname> specifying whether optional functionality is or isn’t enabled. This is used in NixOS to implement kernel-specific behaviour. For instance, if the kernel has the <varname>iwlwifi</varname> feature (i.e. has built-in support for Intel wireless chipsets), then NixOS doesn’t have to build the external <varname>iwlwifi</varname> package:
 <programlisting>
 modulesTree = [kernel]
   ++ pkgs.lib.optional (!kernel.features ? iwlwifi) kernelPackages.iwlwifi
@@ -47,45 +32,31 @@ modulesTree = [kernel]
    <orderedlist>
     <listitem>
      <para>
-      Copy the old Nix expression (e.g. <filename>linux-2.6.21.nix</filename>)
-      to the new one (e.g. <filename>linux-2.6.22.nix</filename>) and update
-      it.
+      Copy the old Nix expression (e.g. <filename>linux-2.6.21.nix</filename>) to the new one (e.g. <filename>linux-2.6.22.nix</filename>) and update it.
      </para>
     </listitem>
     <listitem>
      <para>
-      Add the new kernel to <filename>all-packages.nix</filename> (e.g., create
-      an attribute <varname>kernel_2_6_22</varname>).
+      Add the new kernel to <filename>all-packages.nix</filename> (e.g., create an attribute <varname>kernel_2_6_22</varname>).
      </para>
     </listitem>
     <listitem>
      <para>
-      Now we’re going to update the kernel configuration. First unpack the
-      kernel. Then for each supported platform (<literal>i686</literal>,
-      <literal>x86_64</literal>, <literal>uml</literal>) do the following:
+      Now we’re going to update the kernel configuration. First unpack the kernel. Then for each supported platform (<literal>i686</literal>, <literal>x86_64</literal>, <literal>uml</literal>) do the following:
       <orderedlist>
        <listitem>
         <para>
-         Make an copy from the old config (e.g.
-         <filename>config-2.6.21-i686-smp</filename>) to the new one (e.g.
-         <filename>config-2.6.22-i686-smp</filename>).
+         Make an copy from the old config (e.g. <filename>config-2.6.21-i686-smp</filename>) to the new one (e.g. <filename>config-2.6.22-i686-smp</filename>).
         </para>
        </listitem>
        <listitem>
         <para>
-         Copy the config file for this platform (e.g.
-         <filename>config-2.6.22-i686-smp</filename>) to
-         <filename>.config</filename> in the kernel source tree.
+         Copy the config file for this platform (e.g. <filename>config-2.6.22-i686-smp</filename>) to <filename>.config</filename> in the kernel source tree.
         </para>
        </listitem>
        <listitem>
         <para>
-         Run <literal>make oldconfig
-         ARCH=<replaceable>{i386,x86_64,um}</replaceable></literal> and answer
-         all questions. (For the uml configuration, also add
-         <literal>SHELL=bash</literal>.) Make sure to keep the configuration
-         consistent between platforms (i.e. don’t enable some feature on
-         <literal>i686</literal> and disable it on <literal>x86_64</literal>).
+         Run <literal>make oldconfig ARCH=<replaceable>{i386,x86_64,um}</replaceable></literal> and answer all questions. (For the uml configuration, also add <literal>SHELL=bash</literal>.) Make sure to keep the configuration consistent between platforms (i.e. don’t enable some feature on <literal>i686</literal> and disable it on <literal>x86_64</literal>).
         </para>
        </listitem>
        <listitem>
@@ -99,8 +70,7 @@ modulesTree = [kernel]
        </listitem>
        <listitem>
         <para>
-         Copy <filename>.config</filename> over the new config file (e.g.
-         <filename>config-2.6.22-i686-smp</filename>).
+         Copy <filename>.config</filename> over the new config file (e.g. <filename>config-2.6.22-i686-smp</filename>).
         </para>
        </listitem>
       </orderedlist>
@@ -108,18 +78,12 @@ modulesTree = [kernel]
     </listitem>
     <listitem>
      <para>
-      Test building the kernel: <literal>nix-build -A kernel_2_6_22</literal>.
-      If it compiles, ship it! For extra credit, try booting NixOS with it.
+      Test building the kernel: <literal>nix-build -A kernel_2_6_22</literal>. If it compiles, ship it! For extra credit, try booting NixOS with it.
      </para>
     </listitem>
     <listitem>
      <para>
-      It may be that the new kernel requires updating the external kernel
-      modules and kernel-dependent packages listed in the
-      <varname>linuxPackagesFor</varname> function in
-      <filename>all-packages.nix</filename> (such as the NVIDIA drivers, AUFS,
-      etc.). If the updated packages aren’t backwards compatible with older
-      kernels, you may need to keep the older versions around.
+      It may be that the new kernel requires updating the external kernel modules and kernel-dependent packages listed in the <varname>linuxPackagesFor</varname> function in <filename>all-packages.nix</filename> (such as the NVIDIA drivers, AUFS, etc.). If the updated packages aren’t backwards compatible with older kernels, you may need to keep the older versions around.
      </para>
     </listitem>
    </orderedlist>
@@ -130,13 +94,7 @@ modulesTree = [kernel]
   <title>X.org</title>
 
   <para>
-   The Nix expressions for the X.org packages reside in
-   <filename>pkgs/servers/x11/xorg/default.nix</filename>. This file is
-   automatically generated from lists of tarballs in an X.org release. As such
-   it should not be modified directly; rather, you should modify the lists, the
-   generator script or the file
-   <filename>pkgs/servers/x11/xorg/overrides.nix</filename>, in which you can
-   override or add to the derivations produced by the generator.
+   The Nix expressions for the X.org packages reside in <filename>pkgs/servers/x11/xorg/default.nix</filename>. This file is automatically generated from lists of tarballs in an X.org release. As such it should not be modified directly; rather, you should modify the lists, the generator script or the file <filename>pkgs/servers/x11/xorg/overrides.nix</filename>, in which you can override or add to the derivations produced by the generator.
   </para>
 
   <para>
@@ -146,37 +104,22 @@ modulesTree = [kernel]
 <prompt>$ </prompt>cat tarballs-7.5.list extra.list old.list \
   | perl ./generate-expr-from-tarballs.pl
 </screen>
-   For each of the tarballs in the <filename>.list</filename> files, the script
-   downloads it, unpacks it, and searches its <filename>configure.ac</filename>
-   and <filename>*.pc.in</filename> files for dependencies. This information is
-   used to generate <filename>default.nix</filename>. The generator caches
-   downloaded tarballs between runs. Pay close attention to the <literal>NOT
-   FOUND: <replaceable>name</replaceable></literal> messages at the end of the
-   run, since they may indicate missing dependencies. (Some might be optional
-   dependencies, however.)
+   For each of the tarballs in the <filename>.list</filename> files, the script downloads it, unpacks it, and searches its <filename>configure.ac</filename> and <filename>*.pc.in</filename> files for dependencies. This information is used to generate <filename>default.nix</filename>. The generator caches downloaded tarballs between runs. Pay close attention to the <literal>NOT FOUND: <replaceable>name</replaceable></literal> messages at the end of the run, since they may indicate missing dependencies. (Some might be optional dependencies, however.)
   </para>
 
   <para>
-   A file like <filename>tarballs-7.5.list</filename> contains all tarballs in
-   a X.org release. It can be generated like this:
+   A file like <filename>tarballs-7.5.list</filename> contains all tarballs in a X.org release. It can be generated like this:
 <screen>
 <prompt>$ </prompt>export i="mirror://xorg/X11R7.4/src/everything/"
 <prompt>$ </prompt>cat $(PRINT_PATH=1 nix-prefetch-url $i | tail -n 1) \
   | perl -e 'while (&lt;>) { if (/(href|HREF)="([^"]*.bz2)"/) { print "$ENV{'i'}$2\n"; }; }' \
   | sort > tarballs-7.4.list
 </screen>
-   <filename>extra.list</filename> contains libraries that aren’t part of
-   X.org proper, but are closely related to it, such as
-   <literal>libxcb</literal>. <filename>old.list</filename> contains some
-   packages that were removed from X.org, but are still needed by some people
-   or by other packages (such as <varname>imake</varname>).
+   <filename>extra.list</filename> contains libraries that aren’t part of X.org proper, but are closely related to it, such as <literal>libxcb</literal>. <filename>old.list</filename> contains some packages that were removed from X.org, but are still needed by some people or by other packages (such as <varname>imake</varname>).
   </para>
 
   <para>
-   If the expression for a package requires derivation attributes that the
-   generator cannot figure out automatically (say, <varname>patches</varname>
-   or a <varname>postInstall</varname> hook), you should modify
-   <filename>pkgs/servers/x11/xorg/overrides.nix</filename>.
+   If the expression for a package requires derivation attributes that the generator cannot figure out automatically (say, <varname>patches</varname> or a <varname>postInstall</varname> hook), you should modify <filename>pkgs/servers/x11/xorg/overrides.nix</filename>.
   </para>
  </section>
 <!--============================================================-->
@@ -199,41 +142,19 @@ modulesTree = [kernel]
   <title>Eclipse</title>
 
   <para>
-   The Nix expressions related to the Eclipse platform and IDE are in
-   <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/eclipse"><filename>pkgs/applications/editors/eclipse</filename></link>.
+   The Nix expressions related to the Eclipse platform and IDE are in <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/eclipse"><filename>pkgs/applications/editors/eclipse</filename></link>.
   </para>
 
   <para>
-   Nixpkgs provides a number of packages that will install Eclipse in its
-   various forms. These range from the bare-bones Eclipse Platform to the more
-   fully featured Eclipse SDK or Scala-IDE packages and multiple version are
-   often available. It is possible to list available Eclipse packages by
-   issuing the command:
+   Nixpkgs provides a number of packages that will install Eclipse in its various forms. These range from the bare-bones Eclipse Platform to the more fully featured Eclipse SDK or Scala-IDE packages and multiple version are often available. It is possible to list available Eclipse packages by issuing the command:
 <screen>
 <prompt>$ </prompt>nix-env -f '&lt;nixpkgs&gt;' -qaP -A eclipses --description
 </screen>
-   Once an Eclipse variant is installed it can be run using the
-   <command>eclipse</command> command, as expected. From within Eclipse it is
-   then possible to install plugins in the usual manner by either manually
-   specifying an Eclipse update site or by installing the Marketplace Client
-   plugin and using it to discover and install other plugins. This installation
-   method provides an Eclipse installation that closely resemble a manually
-   installed Eclipse.
+   Once an Eclipse variant is installed it can be run using the <command>eclipse</command> command, as expected. From within Eclipse it is then possible to install plugins in the usual manner by either manually specifying an Eclipse update site or by installing the Marketplace Client plugin and using it to discover and install other plugins. This installation method provides an Eclipse installation that closely resemble a manually installed Eclipse.
   </para>
 
   <para>
-   If you prefer to install plugins in a more declarative manner then Nixpkgs
-   also offer a number of Eclipse plugins that can be installed in an
-   <emphasis>Eclipse environment</emphasis>. This type of environment is
-   created using the function <varname>eclipseWithPlugins</varname> found
-   inside the <varname>nixpkgs.eclipses</varname> attribute set. This function
-   takes as argument <literal>{ eclipse, plugins ? [], jvmArgs ? [] }</literal>
-   where <varname>eclipse</varname> is a one of the Eclipse packages described
-   above, <varname>plugins</varname> is a list of plugin derivations, and
-   <varname>jvmArgs</varname> is a list of arguments given to the JVM running
-   the Eclipse. For example, say you wish to install the latest Eclipse
-   Platform with the popular Eclipse Color Theme plugin and also allow Eclipse
-   to use more RAM. You could then add
+   If you prefer to install plugins in a more declarative manner then Nixpkgs also offer a number of Eclipse plugins that can be installed in an <emphasis>Eclipse environment</emphasis>. This type of environment is created using the function <varname>eclipseWithPlugins</varname> found inside the <varname>nixpkgs.eclipses</varname> attribute set. This function takes as argument <literal>{ eclipse, plugins ? [], jvmArgs ? [] }</literal> where <varname>eclipse</varname> is a one of the Eclipse packages described above, <varname>plugins</varname> is a list of plugin derivations, and <varname>jvmArgs</varname> is a list of arguments given to the JVM running the Eclipse. For example, say you wish to install the latest Eclipse Platform with the popular Eclipse Color Theme plugin and also allow Eclipse to use more RAM. You could then add
 <screen>
 packageOverrides = pkgs: {
   myEclipse = with pkgs.eclipses; eclipseWithPlugins {
@@ -243,38 +164,18 @@ packageOverrides = pkgs: {
   };
 }
 </screen>
-   to your Nixpkgs configuration
-   (<filename>~/.config/nixpkgs/config.nix</filename>) and install it by
-   running <command>nix-env -f '&lt;nixpkgs&gt;' -iA myEclipse</command> and
-   afterward run Eclipse as usual. It is possible to find out which plugins are
-   available for installation using <varname>eclipseWithPlugins</varname> by
-   running
+   to your Nixpkgs configuration (<filename>~/.config/nixpkgs/config.nix</filename>) and install it by running <command>nix-env -f '&lt;nixpkgs&gt;' -iA myEclipse</command> and afterward run Eclipse as usual. It is possible to find out which plugins are available for installation using <varname>eclipseWithPlugins</varname> by running
 <screen>
 <prompt>$ </prompt>nix-env -f '&lt;nixpkgs&gt;' -qaP -A eclipses.plugins --description
 </screen>
   </para>
 
   <para>
-   If there is a need to install plugins that are not available in Nixpkgs then
-   it may be possible to define these plugins outside Nixpkgs using the
-   <varname>buildEclipseUpdateSite</varname> and
-   <varname>buildEclipsePlugin</varname> functions found in the
-   <varname>nixpkgs.eclipses.plugins</varname> attribute set. Use the
-   <varname>buildEclipseUpdateSite</varname> function to install a plugin
-   distributed as an Eclipse update site. This function takes <literal>{ name,
-   src }</literal> as argument where <literal>src</literal> indicates the
-   Eclipse update site archive. All Eclipse features and plugins within the
-   downloaded update site will be installed. When an update site archive is not
-   available then the <varname>buildEclipsePlugin</varname> function can be
-   used to install a plugin that consists of a pair of feature and plugin JARs.
-   This function takes an argument <literal>{ name, srcFeature, srcPlugin
-   }</literal> where <literal>srcFeature</literal> and
-   <literal>srcPlugin</literal> are the feature and plugin JARs, respectively.
+   If there is a need to install plugins that are not available in Nixpkgs then it may be possible to define these plugins outside Nixpkgs using the <varname>buildEclipseUpdateSite</varname> and <varname>buildEclipsePlugin</varname> functions found in the <varname>nixpkgs.eclipses.plugins</varname> attribute set. Use the <varname>buildEclipseUpdateSite</varname> function to install a plugin distributed as an Eclipse update site. This function takes <literal>{ name, src }</literal> as argument where <literal>src</literal> indicates the Eclipse update site archive. All Eclipse features and plugins within the downloaded update site will be installed. When an update site archive is not available then the <varname>buildEclipsePlugin</varname> function can be used to install a plugin that consists of a pair of feature and plugin JARs. This function takes an argument <literal>{ name, srcFeature, srcPlugin }</literal> where <literal>srcFeature</literal> and <literal>srcPlugin</literal> are the feature and plugin JARs, respectively.
   </para>
 
   <para>
-   Expanding the previous example with two plugins using the above functions we
-   have
+   Expanding the previous example with two plugins using the above functions we have
 <screen>
 packageOverrides = pkgs: {
   myEclipse = with pkgs.eclipses; eclipseWithPlugins {
@@ -311,19 +212,15 @@ packageOverrides = pkgs: {
   <title>Elm</title>
 
   <para>
-   To start a development environment do <command>nix-shell -p elmPackages.elm
-   elmPackages.elm-format</command>
+   To start a development environment do <command>nix-shell -p elmPackages.elm elmPackages.elm-format</command>
   </para>
 
   <para>
-   To update Elm compiler, see
-   <filename>nixpkgs/pkgs/development/compilers/elm/README.md</filename>.
+   To update Elm compiler, see <filename>nixpkgs/pkgs/development/compilers/elm/README.md</filename>.
   </para>
 
   <para>
-   To package Elm applications,
-   <link xlink:href="https://github.com/hercules-ci/elm2nix#elm2nix">read about
-   elm2nix</link>.
+   To package Elm applications, <link xlink:href="https://github.com/hercules-ci/elm2nix#elm2nix">read about elm2nix</link>.
   </para>
  </section>
  <section xml:id="sec-kakoune">
@@ -342,11 +239,7 @@ packageOverrides = pkgs: {
   <title>Interactive shell helpers</title>
 
   <para>
-   Some packages provide the shell integration to be more useful. But unlike
-   other systems, nix doesn't have a standard share directory location. This is
-   why a bunch <command>PACKAGE-share</command> scripts are shipped that print
-   the location of the corresponding shared folder. Current list of such
-   packages is as following:
+   Some packages provide the shell integration to be more useful. But unlike other systems, nix doesn't have a standard share directory location. This is why a bunch <command>PACKAGE-share</command> scripts are shipped that print the location of the corresponding shared folder. Current list of such packages is as following:
    <itemizedlist>
     <listitem>
      <para>
@@ -369,31 +262,20 @@ packageOverrides = pkgs: {
   <title>Weechat</title>
 
   <para>
-   Weechat can be configured to include your choice of plugins, reducing its
-   closure size from the default configuration which includes all available
-   plugins. To make use of this functionality, install an expression that
-   overrides its configuration such as
+   Weechat can be configured to include your choice of plugins, reducing its closure size from the default configuration which includes all available plugins. To make use of this functionality, install an expression that overrides its configuration such as
 <programlisting>weechat.override {configure = {availablePlugins, ...}: {
     plugins = with availablePlugins; [ python perl ];
   }
 }</programlisting>
-   If the <literal>configure</literal> function returns an attrset without the
-   <literal>plugins</literal> attribute, <literal>availablePlugins</literal>
-   will be used automatically.
+   If the <literal>configure</literal> function returns an attrset without the <literal>plugins</literal> attribute, <literal>availablePlugins</literal> will be used automatically.
   </para>
 
   <para>
-   The plugins currently available are <literal>python</literal>,
-   <literal>perl</literal>, <literal>ruby</literal>, <literal>guile</literal>,
-   <literal>tcl</literal> and <literal>lua</literal>.
+   The plugins currently available are <literal>python</literal>, <literal>perl</literal>, <literal>ruby</literal>, <literal>guile</literal>, <literal>tcl</literal> and <literal>lua</literal>.
   </para>
 
   <para>
-   The python and perl plugins allows the addition of extra libraries. For
-   instance, the <literal>inotify.py</literal> script in weechat-scripts
-   requires D-Bus or libnotify, and the <literal>fish.py</literal> script
-   requires pycrypto. To use these scripts, use the plugin's
-   <literal>withPackages</literal> attribute:
+   The python and perl plugins allows the addition of extra libraries. For instance, the <literal>inotify.py</literal> script in weechat-scripts requires D-Bus or libnotify, and the <literal>fish.py</literal> script requires pycrypto. To use these scripts, use the plugin's <literal>withPackages</literal> attribute:
 <programlisting>weechat.override { configure = {availablePlugins, ...}: {
     plugins = with availablePlugins; [
             (python.withPackages (ps: with ps; [ pycrypto python-dbus ]))
@@ -404,8 +286,7 @@ packageOverrides = pkgs: {
   </para>
 
   <para>
-   In order to also keep all default plugins installed, it is possible to use
-   the following method:
+   In order to also keep all default plugins installed, it is possible to use the following method:
 <programlisting>weechat.override { configure = { availablePlugins, ... }: {
   plugins = builtins.attrValues (availablePlugins // {
     python = availablePlugins.python.withPackages (ps: with ps; [ pycrypto python-dbus ]);
@@ -415,9 +296,7 @@ packageOverrides = pkgs: {
   </para>
 
   <para>
-   WeeChat allows to set defaults on startup using the
-   <literal>--run-command</literal>. The <literal>configure</literal> method
-   can be used to pass commands to the program:
+   WeeChat allows to set defaults on startup using the <literal>--run-command</literal>. The <literal>configure</literal> method can be used to pass commands to the program:
 <programlisting>weechat.override {
   configure = { availablePlugins, ... }: {
     init = ''
@@ -426,14 +305,11 @@ packageOverrides = pkgs: {
     '';
   };
 }</programlisting>
-   Further values can be added to the list of commands when running
-   <literal>weechat --run-command "your-commands"</literal>.
+   Further values can be added to the list of commands when running <literal>weechat --run-command "your-commands"</literal>.
   </para>
 
   <para>
-   Additionally it's possible to specify scripts to be loaded when starting
-   <literal>weechat</literal>. These will be loaded before the commands from
-   <literal>init</literal>:
+   Additionally it's possible to specify scripts to be loaded when starting <literal>weechat</literal>. These will be loaded before the commands from <literal>init</literal>:
 <programlisting>weechat.override {
   configure = { availablePlugins, ... }: {
     scripts = with pkgs.weechatScripts; [
@@ -447,11 +323,7 @@ packageOverrides = pkgs: {
   </para>
 
   <para>
-   In <literal>nixpkgs</literal> there's a subpackage which contains
-   derivations for WeeChat scripts. Such derivations expect a
-   <literal>passthru.scripts</literal> attribute which contains a list of all
-   scripts inside the store path. Furthermore all scripts have to live in
-   <literal>$out/share</literal>. An exemplary derivation looks like this:
+   In <literal>nixpkgs</literal> there's a subpackage which contains derivations for WeeChat scripts. Such derivations expect a <literal>passthru.scripts</literal> attribute which contains a list of all scripts inside the store path. Furthermore all scripts have to live in <literal>$out/share</literal>. An exemplary derivation looks like this:
 <programlisting>{ stdenv, fetchurl }:
 
 stdenv.mkDerivation {
@@ -480,18 +352,11 @@ stdenv.mkDerivation {
    <title>Activating the engine</title>
 
    <para>
-    IBus needs to be configured accordingly to activate
-    <literal>typing-booster</literal>. The configuration depends on the desktop
-    manager in use. For detailed instructions, please refer to the
-    <link xlink:href="https://mike-fabian.github.io/ibus-typing-booster/documentation.html">upstream
-    docs</link>.
+    IBus needs to be configured accordingly to activate <literal>typing-booster</literal>. The configuration depends on the desktop manager in use. For detailed instructions, please refer to the <link xlink:href="https://mike-fabian.github.io/ibus-typing-booster/documentation.html">upstream docs</link>.
    </para>
 
    <para>
-    On NixOS you need to explicitly enable <literal>ibus</literal> with given
-    engines before customizing your desktop to use
-    <literal>typing-booster</literal>. This can be achieved using the
-    <literal>ibus</literal> module:
+    On NixOS you need to explicitly enable <literal>ibus</literal> with given engines before customizing your desktop to use <literal>typing-booster</literal>. This can be achieved using the <literal>ibus</literal> module:
 <programlisting>{ pkgs, ... }: {
   i18n.inputMethod = {
     enabled = "ibus";
@@ -505,21 +370,14 @@ stdenv.mkDerivation {
    <title>Using custom hunspell dictionaries</title>
 
    <para>
-    The IBus engine is based on <literal>hunspell</literal> to support
-    completion in many languages. By default the dictionaries
-    <literal>de-de</literal>, <literal>en-us</literal>,
-    <literal>fr-moderne</literal> <literal>es-es</literal>,
-    <literal>it-it</literal>, <literal>sv-se</literal> and
-    <literal>sv-fi</literal> are in use. To add another dictionary, the package
-    can be overridden like this:
+    The IBus engine is based on <literal>hunspell</literal> to support completion in many languages. By default the dictionaries <literal>de-de</literal>, <literal>en-us</literal>, <literal>fr-moderne</literal> <literal>es-es</literal>, <literal>it-it</literal>, <literal>sv-se</literal> and <literal>sv-fi</literal> are in use. To add another dictionary, the package can be overridden like this:
 <programlisting>ibus-engines.typing-booster.override {
   langs = [ "de-at" "en-gb" ];
 }</programlisting>
    </para>
 
    <para>
-    <emphasis>Note: each language passed to <literal>langs</literal> must be an
-    attribute name in <literal>pkgs.hunspellDicts</literal>.</emphasis>
+    <emphasis>Note: each language passed to <literal>langs</literal> must be an attribute name in <literal>pkgs.hunspellDicts</literal>.</emphasis>
    </para>
   </section>
 
@@ -527,10 +385,7 @@ stdenv.mkDerivation {
    <title>Built-in emoji picker</title>
 
    <para>
-    The <literal>ibus-engines.typing-booster</literal> package contains a
-    program named <literal>emoji-picker</literal>. To display all emojis
-    correctly, a special font such as <literal>noto-fonts-emoji</literal> is
-    needed:
+    The <literal>ibus-engines.typing-booster</literal> package contains a program named <literal>emoji-picker</literal>. To display all emojis correctly, a special font such as <literal>noto-fonts-emoji</literal> is needed:
    </para>
 
    <para>
@@ -545,45 +400,22 @@ stdenv.mkDerivation {
   <title>Nginx</title>
 
   <para>
-   <link xlink:href="https://nginx.org/">Nginx</link> is a reverse proxy and
-   lightweight webserver.
+   <link xlink:href="https://nginx.org/">Nginx</link> is a reverse proxy and lightweight webserver.
   </para>
 
   <section xml:id="sec-nginx-etag">
    <title>ETags on static files served from the Nix store</title>
 
    <para>
-    HTTP has a couple different mechanisms for caching to prevent clients from
-    having to download the same content repeatedly if a resource has not
-    changed since the last time it was requested. When nginx is used as a
-    server for static files, it implements the caching mechanism based on the
-    <link xlink:href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Last-Modified"><literal>Last-Modified</literal></link>
-    response header automatically; unfortunately, it works by using filesystem
-    timestamps to determine the value of the <literal>Last-Modified</literal>
-    header. This doesn't give the desired behavior when the file is in the Nix
-    store, because all file timestamps are set to 0 (for reasons related to
-    build reproducibility).
+    HTTP has a couple different mechanisms for caching to prevent clients from having to download the same content repeatedly if a resource has not changed since the last time it was requested. When nginx is used as a server for static files, it implements the caching mechanism based on the <link xlink:href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Last-Modified"><literal>Last-Modified</literal></link> response header automatically; unfortunately, it works by using filesystem timestamps to determine the value of the <literal>Last-Modified</literal> header. This doesn't give the desired behavior when the file is in the Nix store, because all file timestamps are set to 0 (for reasons related to build reproducibility).
    </para>
 
    <para>
-    Fortunately, HTTP supports an alternative (and more effective) caching
-    mechanism: the
-    <link xlink:href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/ETag"><literal>ETag</literal></link>
-    response header. The value of the <literal>ETag</literal> header specifies
-    some identifier for the particular content that the server is sending (e.g.
-    a hash). When a client makes a second request for the same resource, it
-    sends that value back in an <literal>If-None-Match</literal> header. If the
-    ETag value is unchanged, then the server does not need to resend the
-    content.
+    Fortunately, HTTP supports an alternative (and more effective) caching mechanism: the <link xlink:href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/ETag"><literal>ETag</literal></link> response header. The value of the <literal>ETag</literal> header specifies some identifier for the particular content that the server is sending (e.g. a hash). When a client makes a second request for the same resource, it sends that value back in an <literal>If-None-Match</literal> header. If the ETag value is unchanged, then the server does not need to resend the content.
    </para>
 
    <para>
-    As of NixOS 19.09, the nginx package in Nixpkgs is patched such that when
-    nginx serves a file out of <filename>/nix/store</filename>, the hash in the
-    store path is used as the <literal>ETag</literal> header in the HTTP
-    response, thus providing proper caching functionality. This happens
-    automatically; you do not need to do modify any configuration to get this
-    behavior.
+    As of NixOS 19.09, the nginx package in Nixpkgs is patched such that when nginx serves a file out of <filename>/nix/store</filename>, the hash in the store path is used as the <literal>ETag</literal> header in the HTTP response, thus providing proper caching functionality. This happens automatically; you do not need to do modify any configuration to get this behavior.
    </para>
   </section>
  </section>
diff --git a/doc/package-specific-user-notes.xml b/doc/package-specific-user-notes.xml
index 09af69bb15d..a3ee42dc7fa 100644
--- a/doc/package-specific-user-notes.xml
+++ b/doc/package-specific-user-notes.xml
@@ -1,46 +1,24 @@
 <chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="package-specific-user-notes">
  <title>Package-specific usage notes</title>
  <para>
-  These chapters includes some notes that apply to specific packages and should
-  answer some of the frequently asked questions related to Nixpkgs use. Some
-  useful information related to package use can be found in
-  <link linkend="chap-package-notes">package-specific development notes</link>.
+  These chapters includes some notes that apply to specific packages and should answer some of the frequently asked questions related to Nixpkgs use. Some useful information related to package use can be found in <link linkend="chap-package-notes">package-specific development notes</link>.
  </para>
  <section xml:id="opengl">
   <title>OpenGL</title>
 
   <para>
-   Packages that use OpenGL have NixOS desktop as their primary target. The
-   current solution for loading the GPU-specific drivers is based on
-   <literal>libglvnd</literal> and looks for the driver implementation in
-   <literal>LD_LIBRARY_PATH</literal>. If you are using a non-NixOS
-   GNU/Linux/X11 desktop with free software video drivers, consider launching
-   OpenGL-dependent programs from Nixpkgs with Nixpkgs versions of
-   <literal>libglvnd</literal> and <literal>mesa_drivers</literal> in
-   <literal>LD_LIBRARY_PATH</literal>. For proprietary video drivers you might
-   have luck with also adding the corresponding video driver package.
+   Packages that use OpenGL have NixOS desktop as their primary target. The current solution for loading the GPU-specific drivers is based on <literal>libglvnd</literal> and looks for the driver implementation in <literal>LD_LIBRARY_PATH</literal>. If you are using a non-NixOS GNU/Linux/X11 desktop with free software video drivers, consider launching OpenGL-dependent programs from Nixpkgs with Nixpkgs versions of <literal>libglvnd</literal> and <literal>mesa_drivers</literal> in <literal>LD_LIBRARY_PATH</literal>. For proprietary video drivers you might have luck with also adding the corresponding video driver package.
   </para>
  </section>
  <section xml:id="locales">
   <title>Locales</title>
 
   <para>
-   To allow simultaneous use of packages linked against different versions of
-   <literal>glibc</literal> with different locale archive formats Nixpkgs
-   patches <literal>glibc</literal> to rely on
-   <literal>LOCALE_ARCHIVE</literal> environment variable.
+   To allow simultaneous use of packages linked against different versions of <literal>glibc</literal> with different locale archive formats Nixpkgs patches <literal>glibc</literal> to rely on <literal>LOCALE_ARCHIVE</literal> environment variable.
   </para>
 
   <para>
-   On non-NixOS distributions this variable is obviously not set. This can
-   cause regressions in language support or even crashes in some
-   Nixpkgs-provided programs. The simplest way to mitigate this problem is
-   exporting the <literal>LOCALE_ARCHIVE</literal> variable pointing to
-   <literal>${glibcLocales}/lib/locale/locale-archive</literal>. The drawback
-   (and the reason this is not the default) is the relatively large (a hundred
-   MiB) size of the full set of locales. It is possible to build a custom set
-   of locales by overriding parameters <literal>allLocales</literal> and
-   <literal>locales</literal> of the package.
+   On non-NixOS distributions this variable is obviously not set. This can cause regressions in language support or even crashes in some Nixpkgs-provided programs. The simplest way to mitigate this problem is exporting the <literal>LOCALE_ARCHIVE</literal> variable pointing to <literal>${glibcLocales}/lib/locale/locale-archive</literal>. The drawback (and the reason this is not the default) is the relatively large (a hundred MiB) size of the full set of locales. It is possible to build a custom set of locales by overriding parameters <literal>allLocales</literal> and <literal>locales</literal> of the package.
   </para>
  </section>
  <section xml:id="sec-emacs">
@@ -50,15 +28,7 @@
    <title>Configuring Emacs</title>
 
    <para>
-    The Emacs package comes with some extra helpers to make it easier to
-    configure. <varname>emacsWithPackages</varname> allows you to manage
-    packages from ELPA. This means that you will not have to install that
-    packages from within Emacs. For instance, if you wanted to use
-    <literal>company</literal>, <literal>counsel</literal>,
-    <literal>flycheck</literal>, <literal>ivy</literal>,
-    <literal>magit</literal>, <literal>projectile</literal>, and
-    <literal>use-package</literal> you could use this as a
-    <filename>~/.config/nixpkgs/config.nix</filename> override:
+    The Emacs package comes with some extra helpers to make it easier to configure. <varname>emacsWithPackages</varname> allows you to manage packages from ELPA. This means that you will not have to install that packages from within Emacs. For instance, if you wanted to use <literal>company</literal>, <literal>counsel</literal>, <literal>flycheck</literal>, <literal>ivy</literal>, <literal>magit</literal>, <literal>projectile</literal>, and <literal>use-package</literal> you could use this as a <filename>~/.config/nixpkgs/config.nix</filename> override:
    </para>
 
 <screen>
@@ -78,15 +48,7 @@
 </screen>
 
    <para>
-    You can install it like any other packages via <command>nix-env -iA
-    myEmacs</command>. However, this will only install those packages. It will
-    not <literal>configure</literal> them for us. To do this, we need to
-    provide a configuration file. Luckily, it is possible to do this from
-    within Nix! By modifying the above example, we can make Emacs load a custom
-    config file. The key is to create a package that provide a
-    <filename>default.el</filename> file in
-    <filename>/share/emacs/site-start/</filename>. Emacs knows to load this
-    file automatically when it starts.
+    You can install it like any other packages via <command>nix-env -iA myEmacs</command>. However, this will only install those packages. It will not <literal>configure</literal> them for us. To do this, we need to provide a configuration file. Luckily, it is possible to do this from within Nix! By modifying the above example, we can make Emacs load a custom config file. The key is to create a package that provide a <filename>default.el</filename> file in <filename>/share/emacs/site-start/</filename>. Emacs knows to load this file automatically when it starts.
    </para>
 
 <screen>
@@ -168,22 +130,11 @@ cp ${myEmacsConfig} $out/share/emacs/site-lisp/default.el
 </screen>
 
    <para>
-    This provides a fairly full Emacs start file. It will load in addition to
-    the user's presonal config. You can always disable it by passing
-    <command>-q</command> to the Emacs command.
+    This provides a fairly full Emacs start file. It will load in addition to the user's presonal config. You can always disable it by passing <command>-q</command> to the Emacs command.
    </para>
 
    <para>
-    Sometimes <varname>emacsWithPackages</varname> is not enough, as this
-    package set has some priorities imposed on packages (with the lowest
-    priority assigned to Melpa Unstable, and the highest for packages manually
-    defined in <filename>pkgs/top-level/emacs-packages.nix</filename>). But you
-    can't control this priorities when some package is installed as a
-    dependency. You can override it on per-package-basis, providing all the
-    required dependencies manually - but it's tedious and there is always a
-    possibility that an unwanted dependency will sneak in through some other
-    package. To completely override such a package you can use
-    <varname>overrideScope'</varname>.
+    Sometimes <varname>emacsWithPackages</varname> is not enough, as this package set has some priorities imposed on packages (with the lowest priority assigned to Melpa Unstable, and the highest for packages manually defined in <filename>pkgs/top-level/emacs-packages.nix</filename>). But you can't control this priorities when some package is installed as a dependency. You can override it on per-package-basis, providing all the required dependencies manually - but it's tedious and there is always a possibility that an unwanted dependency will sneak in through some other package. To completely override such a package you can use <varname>overrideScope'</varname>.
    </para>
 
 <screen>
@@ -203,23 +154,18 @@ overrides = self: super: rec {
   <title>DLib</title>
 
   <para>
-   <link xlink:href="http://dlib.net/">DLib</link> is a modern, C++-based
-   toolkit which provides several machine learning algorithms.
+   <link xlink:href="http://dlib.net/">DLib</link> is a modern, C++-based toolkit which provides several machine learning algorithms.
   </para>
 
   <section xml:id="compiling-without-avx-support">
    <title>Compiling without AVX support</title>
 
    <para>
-    Especially older CPUs don't support
-    <link xlink:href="https://en.wikipedia.org/wiki/Advanced_Vector_Extensions">AVX</link>
-    (<abbrev>Advanced Vector Extensions</abbrev>) instructions that are used by
-    DLib to optimize their algorithms.
+    Especially older CPUs don't support <link xlink:href="https://en.wikipedia.org/wiki/Advanced_Vector_Extensions">AVX</link> (<abbrev>Advanced Vector Extensions</abbrev>) instructions that are used by DLib to optimize their algorithms.
    </para>
 
    <para>
-    On the affected hardware errors like <literal>Illegal instruction</literal>
-    will occur. In those cases AVX support needs to be disabled:
+    On the affected hardware errors like <literal>Illegal instruction</literal> will occur. In those cases AVX support needs to be disabled:
 <programlisting>self: super: {
   dlib = super.dlib.override { avxSupport = false; };
 }</programlisting>
@@ -230,22 +176,11 @@ overrides = self: super: rec {
   <title>Unfree software</title>
 
   <para>
-   All users of Nixpkgs are free software users, and many users (and
-   developers) of Nixpkgs want to limit and tightly control their exposure to
-   unfree software. At the same time, many users need (or want) to run some
-   specific pieces of proprietary software. Nixpkgs includes some expressions
-   for unfree software packages. By default unfree software cannot be installed
-   and doesn’t show up in searches. To allow installing unfree software in a
-   single Nix invocation one can export
-   <literal>NIXPKGS_ALLOW_UNFREE=1</literal>. For a persistent solution, users
-   can set <literal>allowUnfree</literal> in the Nixpkgs configuration.
+   All users of Nixpkgs are free software users, and many users (and developers) of Nixpkgs want to limit and tightly control their exposure to unfree software. At the same time, many users need (or want) to run some specific pieces of proprietary software. Nixpkgs includes some expressions for unfree software packages. By default unfree software cannot be installed and doesn’t show up in searches. To allow installing unfree software in a single Nix invocation one can export <literal>NIXPKGS_ALLOW_UNFREE=1</literal>. For a persistent solution, users can set <literal>allowUnfree</literal> in the Nixpkgs configuration.
   </para>
 
   <para>
-   Fine-grained control is possible by defining
-   <literal>allowUnfreePredicate</literal> function in config; it takes the
-   <literal>mkDerivation</literal> parameter attrset and returns
-   <literal>true</literal> for unfree packages that should be allowed.
+   Fine-grained control is possible by defining <literal>allowUnfreePredicate</literal> function in config; it takes the <literal>mkDerivation</literal> parameter attrset and returns <literal>true</literal> for unfree packages that should be allowed.
   </para>
  </section>
  <section xml:id="sec-steam">
@@ -255,13 +190,7 @@ overrides = self: super: rec {
    <title>Steam in Nix</title>
 
    <para>
-    Steam is distributed as a <filename>.deb</filename> file, for now only as
-    an i686 package (the amd64 package only has documentation). When unpacked,
-    it has a script called <filename>steam</filename> that in Ubuntu (their
-    target distro) would go to <filename>/usr/bin </filename>. When run for the
-    first time, this script copies some files to the user's home, which include
-    another script that is the ultimate responsible for launching the steam
-    binary, which is also in $HOME.
+    Steam is distributed as a <filename>.deb</filename> file, for now only as an i686 package (the amd64 package only has documentation). When unpacked, it has a script called <filename>steam</filename> that in Ubuntu (their target distro) would go to <filename>/usr/bin </filename>. When run for the first time, this script copies some files to the user's home, which include another script that is the ultimate responsible for launching the steam binary, which is also in $HOME.
    </para>
 
    <para>
@@ -269,8 +198,7 @@ overrides = self: super: rec {
     <itemizedlist>
      <listitem>
       <para>
-       We don't have <filename>/bin/bash</filename> and many scripts point
-       there. Similarly for <filename>/usr/bin/python</filename> .
+       We don't have <filename>/bin/bash</filename> and many scripts point there. Similarly for <filename>/usr/bin/python</filename> .
       </para>
      </listitem>
      <listitem>
@@ -280,8 +208,7 @@ overrides = self: super: rec {
      </listitem>
      <listitem>
       <para>
-       The <filename>steam.sh</filename> script in $HOME can not be patched, as
-       it is checked and rewritten by steam.
+       The <filename>steam.sh</filename> script in $HOME can not be patched, as it is checked and rewritten by steam.
       </para>
      </listitem>
      <listitem>
@@ -293,11 +220,7 @@ overrides = self: super: rec {
    </para>
 
    <para>
-    The current approach to deploy Steam in NixOS is composing a FHS-compatible
-    chroot environment, as documented
-    <link xlink:href="http://sandervanderburg.blogspot.nl/2013/09/composing-fhs-compatible-chroot.html">here</link>.
-    This allows us to have binaries in the expected paths without disrupting
-    the system, and to avoid patching them to work in a non FHS environment.
+    The current approach to deploy Steam in NixOS is composing a FHS-compatible chroot environment, as documented <link xlink:href="http://sandervanderburg.blogspot.nl/2013/09/composing-fhs-compatible-chroot.html">here</link>. This allows us to have binaries in the expected paths without disrupting the system, and to avoid patching them to work in a non FHS environment.
    </para>
   </section>
 
@@ -309,9 +232,7 @@ overrides = self: super: rec {
 <programlisting>hardware.opengl.driSupport32Bit = true;</programlisting>
     in your <filename>/etc/nixos/configuration.nix</filename>. You'll also need
 <programlisting>hardware.pulseaudio.support32Bit = true;</programlisting>
-    if you are using PulseAudio - this will enable 32bit ALSA apps integration.
-    To use the Steam controller or other Steam supported controllers such as
-    the DualShock 4 or Nintendo Switch Pro, you need to add
+    if you are using PulseAudio - this will enable 32bit ALSA apps integration. To use the Steam controller or other Steam supported controllers such as the DualShock 4 or Nintendo Switch Pro, you need to add
 <programlisting>hardware.steam-hardware.enable = true;</programlisting>
     to your configuration.
    </para>
@@ -342,19 +263,14 @@ overrides = self: super: rec {
        <itemizedlist>
         <listitem>
          <para>
-          The <literal>newStdcpp</literal> parameter was removed since NixOS
-          17.09 and should not be needed anymore.
+          The <literal>newStdcpp</literal> parameter was removed since NixOS 17.09 and should not be needed anymore.
          </para>
         </listitem>
         <listitem>
          <para>
-          Steam ships statically linked with a version of libcrypto that
-          conflics with the one dynamically loaded by radeonsi_dri.so. If you
-          get the error
+          Steam ships statically linked with a version of libcrypto that conflics with the one dynamically loaded by radeonsi_dri.so. If you get the error
 <programlisting>steam.sh: line 713: 7842 Segmentation fault (core dumped)</programlisting>
-          have a look at
-          <link xlink:href="https://github.com/NixOS/nixpkgs/pull/20269">this
-          pull request</link>.
+          have a look at <link xlink:href="https://github.com/NixOS/nixpkgs/pull/20269">this pull request</link>.
          </para>
         </listitem>
        </itemizedlist>
@@ -368,8 +284,7 @@ overrides = self: super: rec {
        <orderedlist>
         <listitem>
          <para>
-          There is no java in steam chrootenv by default. If you get a message
-          like
+          There is no java in steam chrootenv by default. If you get a message like
 <programlisting>/home/foo/.local/share/Steam/SteamApps/common/towns/towns.sh: line 1: java: command not found</programlisting>
           You need to add
 <programlisting> steam.override { withJava = true; };</programlisting>
@@ -387,8 +302,7 @@ overrides = self: super: rec {
    <title>steam-run</title>
 
    <para>
-    The FHS-compatible chroot used for steam can also be used to run other
-    linux games that expect a FHS environment. To do it, add
+    The FHS-compatible chroot used for steam can also be used to run other linux games that expect a FHS environment. To do it, add
 <programlisting>pkgs.(steam.override {
           nativeOnly = true;
           newStdcpp = true;
@@ -404,46 +318,23 @@ overrides = self: super: rec {
   <para>
    <note>
     <para>
-     Please note that the <literal>citrix_receiver</literal> package has been
-     deprecated since its development was
-     <link xlink:href="https://docs.citrix.com/en-us/citrix-workspace-app.html">discontinued
-     by upstream</link> and has been replaced by
-     <link xlink:href="https://www.citrix.com/products/workspace-app/">the
-     citrix workspace app</link>.
+     Please note that the <literal>citrix_receiver</literal> package has been deprecated since its development was <link xlink:href="https://docs.citrix.com/en-us/citrix-workspace-app.html">discontinued by upstream</link> and has been replaced by <link xlink:href="https://www.citrix.com/products/workspace-app/">the citrix workspace app</link>.
     </para>
    </note>
-   <link xlink:href="https://www.citrix.com/products/receiver/">Citrix
-   Receiver</link> and
-   <link xlink:href="https://www.citrix.com/products/workspace-app/">Citrix
-   Workspace App</link> are a remote desktop viewers which provide access to
-   <link xlink:href="https://www.citrix.com/products/xenapp-xendesktop/">XenDesktop</link>
-   installations.
+   <link xlink:href="https://www.citrix.com/products/receiver/">Citrix Receiver</link> and <link xlink:href="https://www.citrix.com/products/workspace-app/">Citrix Workspace App</link> are a remote desktop viewers which provide access to <link xlink:href="https://www.citrix.com/products/xenapp-xendesktop/">XenDesktop</link> installations.
   </para>
 
   <section xml:id="sec-citrix-base">
    <title>Basic usage</title>
 
    <para>
-    The tarball archive needs to be downloaded manually as the license
-    agreements of the vendor for
-    <link xlink:href="https://www.citrix.com/downloads/citrix-receiver/">Citrix
-    Receiver</link> or
-    <link xlink:href="https://www.citrix.de/downloads/workspace-app/linux/workspace-app-for-linux-latest.html">Citrix
-    Workspace</link> need to be accepted first. Then run
-    <command>nix-prefetch-url file://$PWD/linuxx64-$version.tar.gz</command>.
-    With the archive available in the store the package can be built and
-    installed with Nix.
+    The tarball archive needs to be downloaded manually as the license agreements of the vendor for <link xlink:href="https://www.citrix.com/downloads/citrix-receiver/">Citrix Receiver</link> or <link xlink:href="https://www.citrix.de/downloads/workspace-app/linux/workspace-app-for-linux-latest.html">Citrix Workspace</link> need to be accepted first. Then run <command>nix-prefetch-url file://$PWD/linuxx64-$version.tar.gz</command>. With the archive available in the store the package can be built and installed with Nix.
    </para>
 
    <warning>
     <title>Caution with <command>nix-shell</command> installs</title>
     <para>
-     It's recommended to install <literal>Citrix Receiver</literal> and/or
-     <literal>Citrix Workspace</literal> using <literal>nix-env -i</literal> or
-     globally to ensure that the <literal>.desktop</literal> files are
-     installed properly into <literal>$XDG_CONFIG_DIRS</literal>. Otherwise it
-     won't be possible to open <literal>.ica</literal> files automatically from
-     the browser to start a Citrix connection.
+     It's recommended to install <literal>Citrix Receiver</literal> and/or <literal>Citrix Workspace</literal> using <literal>nix-env -i</literal> or globally to ensure that the <literal>.desktop</literal> files are installed properly into <literal>$XDG_CONFIG_DIRS</literal>. Otherwise it won't be possible to open <literal>.ica</literal> files automatically from the browser to start a Citrix connection.
     </para>
    </warning>
   </section>
@@ -452,17 +343,7 @@ overrides = self: super: rec {
    <title>Custom certificates</title>
 
    <para>
-    The <literal>Citrix Workspace App</literal> in <literal>nixpkgs</literal>
-    trust several certificates
-    <link xlink:href="https://curl.haxx.se/docs/caextract.html">from the
-    Mozilla database</link> by default. However several companies using Citrix
-    might require their own corporate certificate. On distros with imperative
-    packaging these certs can be stored easily in
-    <link xlink:href="https://developer-docs.citrix.com/projects/receiver-for-linux-command-reference/en/13.7/"><literal>$ICAROOT</literal></link>,
-    however this directory is a store path in <literal>nixpkgs</literal>. In
-    order to work around this issue the package provides a simple mechanism to
-    add custom certificates without rebuilding the entire package using
-    <literal>symlinkJoin</literal>:
+    The <literal>Citrix Workspace App</literal> in <literal>nixpkgs</literal> trust several certificates <link xlink:href="https://curl.haxx.se/docs/caextract.html">from the Mozilla database</link> by default. However several companies using Citrix might require their own corporate certificate. On distros with imperative packaging these certs can be stored easily in <link xlink:href="https://developer-docs.citrix.com/projects/receiver-for-linux-command-reference/en/13.7/"><literal>$ICAROOT</literal></link>, however this directory is a store path in <literal>nixpkgs</literal>. In order to work around this issue the package provides a simple mechanism to add custom certificates without rebuilding the entire package using <literal>symlinkJoin</literal>:
 <programlisting>
 <![CDATA[with import <nixpkgs> { config.allowUnfree = true; };
 let extraCerts = [ ./custom-cert-1.pem ./custom-cert-2.pem /* ... */ ]; in
diff --git a/doc/platform-notes.xml b/doc/platform-notes.xml
index 157d3fe2fcd..d8d7692fc9a 100644
--- a/doc/platform-notes.xml
+++ b/doc/platform-notes.xml
@@ -12,12 +12,7 @@
   <itemizedlist>
    <listitem>
     <para>
-     The Darwin <literal>stdenv</literal> uses clang instead of gcc. When
-     referring to the compiler <varname>$CC</varname> or <command>cc</command>
-     will work in both cases. Some builds hardcode gcc/g++ in their build
-     scripts, that can usually be fixed with using something like
-     <literal>makeFlags = [ "CC=cc" ];</literal> or by patching the build
-     scripts.
+     The Darwin <literal>stdenv</literal> uses clang instead of gcc. When referring to the compiler <varname>$CC</varname> or <command>cc</command> will work in both cases. Some builds hardcode gcc/g++ in their build scripts, that can usually be fixed with using something like <literal>makeFlags = [ "CC=cc" ];</literal> or by patching the build scripts.
     </para>
 <programlisting>
 stdenv.mkDerivation {
@@ -31,12 +26,7 @@ stdenv.mkDerivation {
    </listitem>
    <listitem>
     <para>
-     On Darwin, libraries are linked using absolute paths, libraries are
-     resolved by their <literal>install_name</literal> at link time. Sometimes
-     packages won't set this correctly causing the library lookups to fail at
-     runtime. This can be fixed by adding extra linker flags or by running
-     <command>install_name_tool -id</command> during the
-     <function>fixupPhase</function>.
+     On Darwin, libraries are linked using absolute paths, libraries are resolved by their <literal>install_name</literal> at link time. Sometimes packages won't set this correctly causing the library lookups to fail at runtime. This can be fixed by adding extra linker flags or by running <command>install_name_tool -id</command> during the <function>fixupPhase</function>.
     </para>
 <programlisting>
 stdenv.mkDerivation {
@@ -48,16 +38,10 @@ stdenv.mkDerivation {
    </listitem>
    <listitem>
     <para>
-     Even if the libraries are linked using absolute paths and resolved via
-     their <literal>install_name</literal> correctly, tests can sometimes fail
-     to run binaries. This happens because the <varname>checkPhase</varname>
-     runs before the libraries are installed.
+     Even if the libraries are linked using absolute paths and resolved via their <literal>install_name</literal> correctly, tests can sometimes fail to run binaries. This happens because the <varname>checkPhase</varname> runs before the libraries are installed.
     </para>
     <para>
-     This can usually be solved by running the tests after the
-     <varname>installPhase</varname> or alternatively by using
-     <varname>DYLD_LIBRARY_PATH</varname>. More information about this variable
-     can be found in the <citerefentry>
+     This can usually be solved by running the tests after the <varname>installPhase</varname> or alternatively by using <varname>DYLD_LIBRARY_PATH</varname>. More information about this variable can be found in the <citerefentry>
      <refentrytitle>dyld</refentrytitle>
      <manvolnum>1</manvolnum></citerefentry> manpage.
     </para>
@@ -78,11 +62,7 @@ stdenv.mkDerivation {
    </listitem>
    <listitem>
     <para>
-     Some packages assume xcode is available and use <command>xcrun</command>
-     to resolve build tools like <command>clang</command>, etc. This causes
-     errors like <code>xcode-select: error: no developer tools were found at
-     '/Applications/Xcode.app'</code> while the build doesn't actually depend
-     on xcode.
+     Some packages assume xcode is available and use <command>xcrun</command> to resolve build tools like <command>clang</command>, etc. This causes errors like <code>xcode-select: error: no developer tools were found at '/Applications/Xcode.app'</code> while the build doesn't actually depend on xcode.
     </para>
 <programlisting>
 stdenv.mkDerivation {
@@ -95,9 +75,7 @@ stdenv.mkDerivation {
 }
 </programlisting>
     <para>
-     The package <literal>xcbuild</literal> can be used to build projects that
-     really depend on Xcode. However, this replacement is not 100% compatible
-     with Xcode and can occasionally cause issues.
+     The package <literal>xcbuild</literal> can be used to build projects that really depend on Xcode. However, this replacement is not 100% compatible with Xcode and can occasionally cause issues.
     </para>
    </listitem>
   </itemizedlist>
diff --git a/doc/quick-start.xml b/doc/quick-start.xml
index 39e3e7396bd..80514cba490 100644
--- a/doc/quick-start.xml
+++ b/doc/quick-start.xml
@@ -15,120 +15,75 @@
    </listitem>
    <listitem>
     <para>
-     Find a good place in the Nixpkgs tree to add the Nix expression for your
-     package. For instance, a library package typically goes into
-     <filename>pkgs/development/libraries/<replaceable>pkgname</replaceable></filename>,
-     while a web browser goes into
-     <filename>pkgs/applications/networking/browsers/<replaceable>pkgname</replaceable></filename>.
-     See <xref linkend="sec-organisation" /> for some hints on the tree
-     organisation. Create a directory for your package, e.g.
+     Find a good place in the Nixpkgs tree to add the Nix expression for your package. For instance, a library package typically goes into <filename>pkgs/development/libraries/<replaceable>pkgname</replaceable></filename>, while a web browser goes into <filename>pkgs/applications/networking/browsers/<replaceable>pkgname</replaceable></filename>. See <xref linkend="sec-organisation" /> for some hints on the tree organisation. Create a directory for your package, e.g.
 <screen>
 <prompt>$ </prompt>mkdir pkgs/development/libraries/libfoo</screen>
     </para>
    </listitem>
    <listitem>
     <para>
-     In the package directory, create a Nix expression — a piece of code that
-     describes how to build the package. In this case, it should be a
-     <emphasis>function</emphasis> that is called with the package dependencies
-     as arguments, and returns a build of the package in the Nix store. The
-     expression should usually be called <filename>default.nix</filename>.
+     In the package directory, create a Nix expression — a piece of code that describes how to build the package. In this case, it should be a <emphasis>function</emphasis> that is called with the package dependencies as arguments, and returns a build of the package in the Nix store. The expression should usually be called <filename>default.nix</filename>.
 <screen>
 <prompt>$ </prompt>emacs pkgs/development/libraries/libfoo/default.nix
 <prompt>$ </prompt>git add pkgs/development/libraries/libfoo/default.nix</screen>
     </para>
     <para>
-     You can have a look at the existing Nix expressions under
-     <filename>pkgs/</filename> to see how it’s done. Here are some good
-     ones:
+     You can have a look at the existing Nix expressions under <filename>pkgs/</filename> to see how it’s done. Here are some good ones:
      <itemizedlist>
       <listitem>
        <para>
-        GNU Hello:
-        <link
-          xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/misc/hello/default.nix"><filename>pkgs/applications/misc/hello/default.nix</filename></link>.
-        Trivial package, which specifies some <varname>meta</varname>
-        attributes which is good practice.
+        GNU Hello: <link
+          xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/misc/hello/default.nix"><filename>pkgs/applications/misc/hello/default.nix</filename></link>. Trivial package, which specifies some <varname>meta</varname> attributes which is good practice.
        </para>
       </listitem>
       <listitem>
        <para>
-        GNU cpio:
-        <link
-          xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/archivers/cpio/default.nix"><filename>pkgs/tools/archivers/cpio/default.nix</filename></link>.
-        Also a simple package. The generic builder in <varname>stdenv</varname>
-        does everything for you. It has no dependencies beyond
-        <varname>stdenv</varname>.
+        GNU cpio: <link
+          xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/archivers/cpio/default.nix"><filename>pkgs/tools/archivers/cpio/default.nix</filename></link>. Also a simple package. The generic builder in <varname>stdenv</varname> does everything for you. It has no dependencies beyond <varname>stdenv</varname>.
        </para>
       </listitem>
       <listitem>
        <para>
-        GNU Multiple Precision arithmetic library (GMP):
-        <link
-          xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/libraries/gmp/5.1.x.nix"><filename>pkgs/development/libraries/gmp/5.1.x.nix</filename></link>.
-        Also done by the generic builder, but has a dependency on
-        <varname>m4</varname>.
+        GNU Multiple Precision arithmetic library (GMP): <link
+          xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/libraries/gmp/5.1.x.nix"><filename>pkgs/development/libraries/gmp/5.1.x.nix</filename></link>. Also done by the generic builder, but has a dependency on <varname>m4</varname>.
        </para>
       </listitem>
       <listitem>
        <para>
-        Pan, a GTK-based newsreader:
-        <link
-          xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/networking/newsreaders/pan/default.nix"><filename>pkgs/applications/networking/newsreaders/pan/default.nix</filename></link>.
-        Has an optional dependency on <varname>gtkspell</varname>, which is
-        only built if <varname>spellCheck</varname> is <literal>true</literal>.
+        Pan, a GTK-based newsreader: <link
+          xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/networking/newsreaders/pan/default.nix"><filename>pkgs/applications/networking/newsreaders/pan/default.nix</filename></link>. Has an optional dependency on <varname>gtkspell</varname>, which is only built if <varname>spellCheck</varname> is <literal>true</literal>.
        </para>
       </listitem>
       <listitem>
        <para>
-        Apache HTTPD:
-        <link
-          xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/http/apache-httpd/2.4.nix"><filename>pkgs/servers/http/apache-httpd/2.4.nix</filename></link>.
-        A bunch of optional features, variable substitutions in the configure
-        flags, a post-install hook, and miscellaneous hackery.
+        Apache HTTPD: <link
+          xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/http/apache-httpd/2.4.nix"><filename>pkgs/servers/http/apache-httpd/2.4.nix</filename></link>. A bunch of optional features, variable substitutions in the configure flags, a post-install hook, and miscellaneous hackery.
        </para>
       </listitem>
       <listitem>
        <para>
-        Thunderbird:
-        <link
-          xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/networking/mailreaders/thunderbird/default.nix"><filename>pkgs/applications/networking/mailreaders/thunderbird/default.nix</filename></link>.
-        Lots of dependencies.
+        Thunderbird: <link
+          xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/networking/mailreaders/thunderbird/default.nix"><filename>pkgs/applications/networking/mailreaders/thunderbird/default.nix</filename></link>. Lots of dependencies.
        </para>
       </listitem>
       <listitem>
        <para>
-        JDiskReport, a Java utility:
-        <link
-          xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/jdiskreport/default.nix"><filename>pkgs/tools/misc/jdiskreport/default.nix</filename></link>
-        (and the
-        <link
-          xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/jdiskreport/builder.sh">builder</link>).
-        Nixpkgs doesn’t have a decent <varname>stdenv</varname> for Java yet
-        so this is pretty ad-hoc.
+        JDiskReport, a Java utility: <link
+          xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/jdiskreport/default.nix"><filename>pkgs/tools/misc/jdiskreport/default.nix</filename></link> (and the <link
+          xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/jdiskreport/builder.sh">builder</link>). Nixpkgs doesn’t have a decent <varname>stdenv</varname> for Java yet so this is pretty ad-hoc.
        </para>
       </listitem>
       <listitem>
        <para>
-        XML::Simple, a Perl module:
-        <link
-          xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/perl-packages.nix"><filename>pkgs/top-level/perl-packages.nix</filename></link>
-        (search for the <varname>XMLSimple</varname> attribute). Most Perl
-        modules are so simple to build that they are defined directly in
-        <filename>perl-packages.nix</filename>; no need to make a separate file
-        for them.
+        XML::Simple, a Perl module: <link
+          xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/perl-packages.nix"><filename>pkgs/top-level/perl-packages.nix</filename></link> (search for the <varname>XMLSimple</varname> attribute). Most Perl modules are so simple to build that they are defined directly in <filename>perl-packages.nix</filename>; no need to make a separate file for them.
        </para>
       </listitem>
       <listitem>
        <para>
-        Adobe Reader:
-        <link
-          xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/misc/adobe-reader/default.nix"><filename>pkgs/applications/misc/adobe-reader/default.nix</filename></link>.
-        Shows how binary-only packages can be supported. In particular the
-        <link
-          xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/misc/adobe-reader/builder.sh">builder</link>
-        uses <command>patchelf</command> to set the RUNPATH and ELF interpreter
-        of the executables so that the right libraries are found at runtime.
+        Adobe Reader: <link
+          xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/misc/adobe-reader/default.nix"><filename>pkgs/applications/misc/adobe-reader/default.nix</filename></link>. Shows how binary-only packages can be supported. In particular the <link
+          xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/misc/adobe-reader/builder.sh">builder</link> uses <command>patchelf</command> to set the RUNPATH and ELF interpreter of the executables so that the right libraries are found at runtime.
        </para>
       </listitem>
      </itemizedlist>
@@ -138,67 +93,45 @@
      <itemizedlist>
       <listitem>
        <para>
-        All <varname linkend="chap-meta">meta</varname> attributes are
-        optional, but it’s still a good idea to provide at least the
-        <varname>description</varname>, <varname>homepage</varname> and
-        <varname
+        All <varname linkend="chap-meta">meta</varname> attributes are optional, but it’s still a good idea to provide at least the <varname>description</varname>, <varname>homepage</varname> and <varname
           linkend="sec-meta-license">license</varname>.
        </para>
       </listitem>
       <listitem>
        <para>
-        You can use <command>nix-prefetch-url</command>
-        <replaceable>url</replaceable> to get the SHA-256 hash of source
-        distributions. There are similar commands as
-        <command>nix-prefetch-git</command> and
-        <command>nix-prefetch-hg</command> available in
-        <literal>nix-prefetch-scripts</literal> package.
+        You can use <command>nix-prefetch-url</command> <replaceable>url</replaceable> to get the SHA-256 hash of source distributions. There are similar commands as <command>nix-prefetch-git</command> and <command>nix-prefetch-hg</command> available in <literal>nix-prefetch-scripts</literal> package.
        </para>
       </listitem>
       <listitem>
        <para>
-        A list of schemes for <literal>mirror://</literal> URLs can be found in
-        <link
+        A list of schemes for <literal>mirror://</literal> URLs can be found in <link
           xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/build-support/fetchurl/mirrors.nix"><filename>pkgs/build-support/fetchurl/mirrors.nix</filename></link>.
        </para>
       </listitem>
      </itemizedlist>
     </para>
     <para>
-     The exact syntax and semantics of the Nix expression language, including
-     the built-in function, are described in the Nix manual in the
-     <link
-    xlink:href="http://hydra.nixos.org/job/nix/trunk/tarball/latest/download-by-type/doc/manual/#chap-writing-nix-expressions">chapter
-     on writing Nix expressions</link>.
+     The exact syntax and semantics of the Nix expression language, including the built-in function, are described in the Nix manual in the <link
+    xlink:href="http://hydra.nixos.org/job/nix/trunk/tarball/latest/download-by-type/doc/manual/#chap-writing-nix-expressions">chapter on writing Nix expressions</link>.
     </para>
    </listitem>
    <listitem>
     <para>
-     Add a call to the function defined in the previous step to
-     <link
-    xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/all-packages.nix"><filename>pkgs/top-level/all-packages.nix</filename></link>
-     with some descriptive name for the variable, e.g.
-     <varname>libfoo</varname>.
+     Add a call to the function defined in the previous step to <link
+    xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/all-packages.nix"><filename>pkgs/top-level/all-packages.nix</filename></link> with some descriptive name for the variable, e.g. <varname>libfoo</varname>.
 <screen>
 <prompt>$ </prompt>emacs pkgs/top-level/all-packages.nix</screen>
     </para>
     <para>
-     The attributes in that file are sorted by category (like “Development /
-     Libraries”) that more-or-less correspond to the directory structure of
-     Nixpkgs, and then by attribute name.
+     The attributes in that file are sorted by category (like “Development / Libraries”) that more-or-less correspond to the directory structure of Nixpkgs, and then by attribute name.
     </para>
    </listitem>
    <listitem>
     <para>
-     To test whether the package builds, run the following command from the
-     root of the nixpkgs source tree:
+     To test whether the package builds, run the following command from the root of the nixpkgs source tree:
 <screen>
 <prompt>$ </prompt>nix-build -A libfoo</screen>
-     where <varname>libfoo</varname> should be the variable name defined in the
-     previous step. You may want to add the flag <option>-K</option> to keep
-     the temporary build directory in case something fails. If the build
-     succeeds, a symlink <filename>./result</filename> to the package in the
-     Nix store is created.
+     where <varname>libfoo</varname> should be the variable name defined in the previous step. You may want to add the flag <option>-K</option> to keep the temporary build directory in case something fails. If the build succeeds, a symlink <filename>./result</filename> to the package in the Nix store is created.
     </para>
    </listitem>
    <listitem>
@@ -210,14 +143,9 @@
    </listitem>
    <listitem>
     <para>
-     Optionally commit the new package and open a pull request
-     <link
-     xlink:href="https://github.com/NixOS/nixpkgs/pulls">to
-     nixpkgs</link>, or use
-     <link
-     xlink:href="https://discourse.nixos.org/t/about-the-patches-category/477">
-     the Patches category</link> on Discourse for sending a patch without a
-     GitHub account.
+     Optionally commit the new package and open a pull request <link
+     xlink:href="https://github.com/NixOS/nixpkgs/pulls">to nixpkgs</link>, or use <link
+     xlink:href="https://discourse.nixos.org/t/about-the-patches-category/477"> the Patches category</link> on Discourse for sending a patch without a GitHub account.
     </para>
    </listitem>
   </orderedlist>
diff --git a/doc/release-notes.xml b/doc/release-notes.xml
index 8d9b1813010..b85f61da079 100644
--- a/doc/release-notes.xml
+++ b/doc/release-notes.xml
@@ -6,15 +6,11 @@
   <title>Release 0.14 (June 4, 2012)</title>
 
   <para>
-   In preparation for the switch from Subversion to Git, this release is mainly
-   the prevent the Nixpkgs version number from going backwards. (This would
-   happen because prerelease version numbers produced for the Git repository
-   are lower than those for the Subversion repository.)
+   In preparation for the switch from Subversion to Git, this release is mainly the prevent the Nixpkgs version number from going backwards. (This would happen because prerelease version numbers produced for the Git repository are lower than those for the Subversion repository.)
   </para>
 
   <para>
-   Since the last release, there have been thousands of changes and new
-   packages by numerous contributors. For details, see the commit logs.
+   Since the last release, there have been thousands of changes and new packages by numerous contributors. For details, see the commit logs.
   </para>
  </section>
  <section xml:id="release-notes-0.13">
@@ -55,14 +51,11 @@
   <title>Release 0.12 (April 24, 2009)</title>
 
   <para>
-   There are way too many additions to Nixpkgs since the last release to list
-   here: for example, the number of packages on Linux has increased from 1002
-   to 2159. However, some specific improvements are worth listing:
+   There are way too many additions to Nixpkgs since the last release to list here: for example, the number of packages on Linux has increased from 1002 to 2159. However, some specific improvements are worth listing:
    <itemizedlist>
     <listitem>
      <para>
-      Nixpkgs now has a manual. In particular, it describes the standard build
-      environment in detail.
+      Nixpkgs now has a manual. In particular, it describes the standard build environment in detail.
      </para>
     </listitem>
     <listitem>
@@ -122,9 +115,7 @@
     </listitem>
     <listitem>
      <para>
-      Support for building derivations in a virtual machine, including RPM and
-      Debian builds in automatically generated VM images. See
-      <filename>pkgs/build-support/vm/default.nix</filename> for details.
+      Support for building derivations in a virtual machine, including RPM and Debian builds in automatically generated VM images. See <filename>pkgs/build-support/vm/default.nix</filename> for details.
      </para>
     </listitem>
     <listitem>
@@ -136,13 +127,7 @@
   </para>
 
   <para>
-   The following people contributed to this release: Andres Löh, Arie
-   Middelkoop, Armijn Hemel, Eelco Dolstra, Lluís Batlle, Ludovic Courtès,
-   Marc Weber, Mart Kolthof, Martin Bravenboer, Michael Raskin, Nicolas
-   Pierron, Peter Simons, Pjotr Prins, Rob Vermaas, Sander van der Burg, Tobias
-   Hammerschmidt, Valentin David, Wouter den Breejen and Yury G. Kudryashov. In
-   addition, several people contributed patches on the
-   <literal>nix-dev</literal> mailing list.
+   The following people contributed to this release: Andres Löh, Arie Middelkoop, Armijn Hemel, Eelco Dolstra, Lluís Batlle, Ludovic Courtès, Marc Weber, Mart Kolthof, Martin Bravenboer, Michael Raskin, Nicolas Pierron, Peter Simons, Pjotr Prins, Rob Vermaas, Sander van der Burg, Tobias Hammerschmidt, Valentin David, Wouter den Breejen and Yury G. Kudryashov. In addition, several people contributed patches on the <literal>nix-dev</literal> mailing list.
   </para>
  </section>
  <section xml:id="release-notes-0.11">
@@ -153,25 +138,12 @@
    <itemizedlist>
     <listitem>
      <para>
-      The standard build environment (<literal>stdenv</literal>) is now pure on
-      the <literal>x86_64-linux</literal> and <literal>powerpc-linux</literal>
-      platforms, just as on <literal>i686-linux</literal>. (Purity means that
-      building and using the standard environment has no dependencies outside
-      of the Nix store. For instance, it doesn’t require an external C
-      compiler such as <filename>/usr/bin/gcc</filename>.) Also, the statically
-      linked binaries used in the bootstrap process are now automatically
-      reproducible, making it easy to update the bootstrap tools and to add
-      support for other Linux platforms. See
-      <filename>pkgs/stdenv/linux/make-bootstrap-tools.nix</filename> for
-      details.
+      The standard build environment (<literal>stdenv</literal>) is now pure on the <literal>x86_64-linux</literal> and <literal>powerpc-linux</literal> platforms, just as on <literal>i686-linux</literal>. (Purity means that building and using the standard environment has no dependencies outside of the Nix store. For instance, it doesn’t require an external C compiler such as <filename>/usr/bin/gcc</filename>.) Also, the statically linked binaries used in the bootstrap process are now automatically reproducible, making it easy to update the bootstrap tools and to add support for other Linux platforms. See <filename>pkgs/stdenv/linux/make-bootstrap-tools.nix</filename> for details.
      </para>
     </listitem>
     <listitem>
      <para>
-      Hook variables in the generic builder are now executed using the
-      <function>eval</function> shell command. This has a major advantage: you
-      can write hooks directly in Nix expressions. For instance, rather than
-      writing a builder like this:
+      Hook variables in the generic builder are now executed using the <function>eval</function> shell command. This has a major advantage: you can write hooks directly in Nix expressions. For instance, rather than writing a builder like this:
 <programlisting>
 source $stdenv/setup
 
@@ -182,91 +154,57 @@ postInstall() {
 }
 
 genericBuild</programlisting>
-      (the <literal>gzip</literal> builder), you can just add this attribute to
-      the derivation:
+      (the <literal>gzip</literal> builder), you can just add this attribute to the derivation:
 <programlisting>
 postInstall = "ln -sf gzip $out/bin/gunzip; ln -sf gzip $out/bin/zcat";</programlisting>
-      and so a separate build script becomes unnecessary. This should allow us
-      to get rid of most builders in Nixpkgs.
+      and so a separate build script becomes unnecessary. This should allow us to get rid of most builders in Nixpkgs.
      </para>
     </listitem>
     <listitem>
      <para>
-      It is now possible to have the generic builder pass arguments to
-      <command>configure</command> and <command>make</command> that contain
-      whitespace. Previously, for example, you could say in a builder,
+      It is now possible to have the generic builder pass arguments to <command>configure</command> and <command>make</command> that contain whitespace. Previously, for example, you could say in a builder,
 <programlisting>
 configureFlags="CFLAGS=-O0"</programlisting>
       but not
 <programlisting>
 configureFlags="CFLAGS=-O0 -g"</programlisting>
-      since the <literal>-g</literal> would be interpreted as a separate
-      argument to <command>configure</command>. Now you can say
+      since the <literal>-g</literal> would be interpreted as a separate argument to <command>configure</command>. Now you can say
 <programlisting>
 configureFlagsArray=("CFLAGS=-O0 -g")</programlisting>
       or similarly
 <programlisting>
 configureFlagsArray=("CFLAGS=-O0 -g" "LDFLAGS=-L/foo -L/bar")</programlisting>
-      which does the right thing. Idem for <literal>makeFlags</literal>,
-      <literal>installFlags</literal>, <literal>checkFlags</literal> and
-      <literal>distFlags</literal>.
+      which does the right thing. Idem for <literal>makeFlags</literal>, <literal>installFlags</literal>, <literal>checkFlags</literal> and <literal>distFlags</literal>.
      </para>
      <para>
-      Unfortunately you can't pass arrays to Bash through the environment, so
-      you can't put the array above in a Nix expression, e.g.,
+      Unfortunately you can't pass arrays to Bash through the environment, so you can't put the array above in a Nix expression, e.g.,
 <programlisting>
 configureFlagsArray = ["CFLAGS=-O0 -g"];</programlisting>
-      since it would just be flattened to a since string. However, you
-      <emphasis>can</emphasis> use the inline hooks described above:
+      since it would just be flattened to a since string. However, you <emphasis>can</emphasis> use the inline hooks described above:
 <programlisting>
 preConfigure = "configureFlagsArray=(\"CFLAGS=-O0 -g\")";</programlisting>
      </para>
     </listitem>
     <listitem>
      <para>
-      The function <function>fetchurl</function> now has support for two
-      different kinds of mirroring of files. First, it has support for
-      <emphasis>content-addressable mirrors</emphasis>. For example, given the
-      <function>fetchurl</function> call
+      The function <function>fetchurl</function> now has support for two different kinds of mirroring of files. First, it has support for <emphasis>content-addressable mirrors</emphasis>. For example, given the <function>fetchurl</function> call
 <programlisting>
 fetchurl {
   url = http://releases.mozilla.org/<replaceable>...</replaceable>/firefox-2.0.0.6-source.tar.bz2;
   sha1 = "eb72f55e4a8bf08e8c6ef227c0ade3d068ba1082";
 }</programlisting>
-      <function>fetchurl</function> will first try to download this file from
-      <link
-  xlink:href="http://tarballs.nixos.org/sha1/eb72f55e4a8bf08e8c6ef227c0ade3d068ba1082"/>.
-      If that file doesn’t exist, it will try the original URL. In general,
-      the “content-addressed” location is
-      <replaceable>mirror</replaceable><literal>/</literal><replaceable>hash-type</replaceable><literal>/</literal><replaceable>hash</replaceable>.
-      There is currently only one content-addressable mirror
-      (<link
-  xlink:href="http://tarballs.nixos.org"/>), but more can be
-      specified in the <varname>hashedMirrors</varname> attribute in
-      <filename>pkgs/build-support/fetchurl/mirrors.nix</filename>, or by
-      setting the <envar>NIX_HASHED_MIRRORS</envar> environment variable to a
-      whitespace-separated list of URLs.
+      <function>fetchurl</function> will first try to download this file from <link
+  xlink:href="http://tarballs.nixos.org/sha1/eb72f55e4a8bf08e8c6ef227c0ade3d068ba1082"/>. If that file doesn’t exist, it will try the original URL. In general, the “content-addressed” location is <replaceable>mirror</replaceable><literal>/</literal><replaceable>hash-type</replaceable><literal>/</literal><replaceable>hash</replaceable>. There is currently only one content-addressable mirror (<link
+  xlink:href="http://tarballs.nixos.org"/>), but more can be specified in the <varname>hashedMirrors</varname> attribute in <filename>pkgs/build-support/fetchurl/mirrors.nix</filename>, or by setting the <envar>NIX_HASHED_MIRRORS</envar> environment variable to a whitespace-separated list of URLs.
      </para>
      <para>
-      Second, <function>fetchurl</function> has support for widely-mirrored
-      distribution sites such as SourceForge or the Linux kernel archives.
-      Given a URL of the form
-      <literal>mirror://<replaceable>site</replaceable>/<replaceable>path</replaceable></literal>,
-      it will try to download <replaceable>path</replaceable> from a
-      configurable list of mirrors for <replaceable>site</replaceable>. (This
-      idea was borrowed from Gentoo Linux.) Example:
+      Second, <function>fetchurl</function> has support for widely-mirrored distribution sites such as SourceForge or the Linux kernel archives. Given a URL of the form <literal>mirror://<replaceable>site</replaceable>/<replaceable>path</replaceable></literal>, it will try to download <replaceable>path</replaceable> from a configurable list of mirrors for <replaceable>site</replaceable>. (This idea was borrowed from Gentoo Linux.) Example:
 <programlisting>
 fetchurl {
   url = mirror://gnu/gcc/gcc-4.2.0/gcc-core-4.2.0.tar.bz2;
   sha256 = "0ykhzxhr8857dr97z0j9wyybfz1kjr71xk457cfapfw5fjas4ny1";
 }</programlisting>
-      Currently <replaceable>site</replaceable> can be
-      <literal>sourceforge</literal>, <literal>gnu</literal> and
-      <literal>kernel</literal>. The list of mirrors is defined in
-      <filename>pkgs/build-support/fetchurl/mirrors.nix</filename>. You can
-      override the list of mirrors for a particular site by setting the
-      environment variable
-      <envar>NIX_MIRRORS_<replaceable>site</replaceable></envar>, e.g.
+      Currently <replaceable>site</replaceable> can be <literal>sourceforge</literal>, <literal>gnu</literal> and <literal>kernel</literal>. The list of mirrors is defined in <filename>pkgs/build-support/fetchurl/mirrors.nix</filename>. You can override the list of mirrors for a particular site by setting the environment variable <envar>NIX_MIRRORS_<replaceable>site</replaceable></envar>, e.g.
 <programlisting>
 export NIX_MIRRORS_sourceforge=http://osdn.dl.sourceforge.net/sourceforge/</programlisting>
      </para>
@@ -339,9 +277,7 @@ export NIX_MIRRORS_sourceforge=http://osdn.dl.sourceforge.net/sourceforge/</prog
   </para>
 
   <para>
-   The following people contributed to this release: Andres Löh, Arie
-   Middelkoop, Armijn Hemel, Eelco Dolstra, Marc Weber, Mart Kolthof, Martin
-   Bravenboer, Michael Raskin, Wouter den Breejen and Yury G. Kudryashov.
+   The following people contributed to this release: Andres Löh, Arie Middelkoop, Armijn Hemel, Eelco Dolstra, Marc Weber, Mart Kolthof, Martin Bravenboer, Michael Raskin, Wouter den Breejen and Yury G. Kudryashov.
   </para>
  </section>
  <section xml:id="release-notes-0.10">
@@ -349,10 +285,8 @@ export NIX_MIRRORS_sourceforge=http://osdn.dl.sourceforge.net/sourceforge/</prog
 
   <note>
    <para>
-    This release of Nixpkgs requires
-    <link
-xlink:href='http://nixos.org/releases/nix/nix-0.10/'>Nix 0.10</link>
-    or higher.
+    This release of Nixpkgs requires <link
+xlink:href='http://nixos.org/releases/nix/nix-0.10/'>Nix 0.10</link> or higher.
    </para>
   </note>
 
@@ -363,32 +297,15 @@ xlink:href='http://nixos.org/releases/nix/nix-0.10/'>Nix 0.10</link>
   <itemizedlist>
    <listitem>
     <para>
-     <filename>pkgs/system/all-packages-generic.nix</filename> is gone, we now
-     just have <filename>pkgs/top-level/all-packages.nix</filename> that
-     contains all available packages. This should cause much less confusion
-     with users. <filename>all-packages.nix</filename> is a function that by
-     default returns packages for the current platform, but you can override
-     this by specifying a different <varname>system</varname> argument.
+     <filename>pkgs/system/all-packages-generic.nix</filename> is gone, we now just have <filename>pkgs/top-level/all-packages.nix</filename> that contains all available packages. This should cause much less confusion with users. <filename>all-packages.nix</filename> is a function that by default returns packages for the current platform, but you can override this by specifying a different <varname>system</varname> argument.
     </para>
    </listitem>
    <listitem>
     <para>
-     Certain packages in Nixpkgs are now user-configurable through a
-     configuration file, i.e., without having to edit the Nix expressions in
-     Nixpkgs. For instance, the Firefox provided in the Nixpkgs channel is
-     built without the RealPlayer plugin (for legal reasons). Previously, you
-     could easily enable RealPlayer support by editing the call to the Firefox
-     function in <filename>all-packages.nix</filename>, but such changes are
-     not respected when Firefox is subsequently updated through the Nixpkgs
-     channel.
+     Certain packages in Nixpkgs are now user-configurable through a configuration file, i.e., without having to edit the Nix expressions in Nixpkgs. For instance, the Firefox provided in the Nixpkgs channel is built without the RealPlayer plugin (for legal reasons). Previously, you could easily enable RealPlayer support by editing the call to the Firefox function in <filename>all-packages.nix</filename>, but such changes are not respected when Firefox is subsequently updated through the Nixpkgs channel.
     </para>
     <para>
-     The Nixpkgs configuration file (found in
-     <filename>~/.nixpkgs/config.nix</filename> or through the
-     <envar>NIXPKGS_CONFIG</envar> environment variable) is an attribute set
-     that contains configuration options that
-     <filename>all-packages.nix</filename> reads and uses for certain packages.
-     For instance, the following configuration file:
+     The Nixpkgs configuration file (found in <filename>~/.nixpkgs/config.nix</filename> or through the <envar>NIXPKGS_CONFIG</envar> environment variable) is an attribute set that contains configuration options that <filename>all-packages.nix</filename> reads and uses for certain packages. For instance, the following configuration file:
 <programlisting>
 {
   firefox = {
@@ -398,9 +315,7 @@ xlink:href='http://nixos.org/releases/nix/nix-0.10/'>Nix 0.10</link>
      persistently enables RealPlayer support in the Firefox build.
     </para>
     <para>
-     (Actually, <literal>firefox.enableRealPlayer</literal> is the
-     <emphasis>only</emphasis> configuration option currently available, but
-     more are sure to be added.)
+     (Actually, <literal>firefox.enableRealPlayer</literal> is the <emphasis>only</emphasis> configuration option currently available, but more are sure to be added.)
     </para>
    </listitem>
    <listitem>
@@ -409,17 +324,8 @@ xlink:href='http://nixos.org/releases/nix/nix-0.10/'>Nix 0.10</link>
      <itemizedlist>
       <listitem>
        <para>
-        <literal>i686-cygwin</literal>, i.e., Windows (using
-        <link xlink:href="http://www.cygwin.com/">Cygwin</link>). The standard
-        environment on <literal>i686-cygwin</literal> by default builds
-        binaries for the Cygwin environment (i.e., it uses Cygwin tools and
-        produces executables that use the Cygwin library). However, there is
-        also a standard environment that produces binaries that use
-        <link
-      xlink:href="http://www.mingw.org/">MinGW</link>. You can
-        use it by calling <filename>all-package.nix</filename> with the
-        <varname>stdenvType</varname> argument set to
-        <literal>"i686-mingw"</literal>.
+        <literal>i686-cygwin</literal>, i.e., Windows (using <link xlink:href="http://www.cygwin.com/">Cygwin</link>). The standard environment on <literal>i686-cygwin</literal> by default builds binaries for the Cygwin environment (i.e., it uses Cygwin tools and produces executables that use the Cygwin library). However, there is also a standard environment that produces binaries that use <link
+      xlink:href="http://www.mingw.org/">MinGW</link>. You can use it by calling <filename>all-package.nix</filename> with the <varname>stdenvType</varname> argument set to <literal>"i686-mingw"</literal>.
        </para>
       </listitem>
       <listitem>
@@ -434,9 +340,7 @@ xlink:href='http://nixos.org/releases/nix/nix-0.10/'>Nix 0.10</link>
       </listitem>
       <listitem>
        <para>
-        <literal>x86_64-linux</literal>, i.e., Linux on 64-bit AMD/Intel CPUs.
-        Unlike <literal>i686-linux</literal>, this platform doesn’t have a
-        pure <literal>stdenv</literal> yet.
+        <literal>x86_64-linux</literal>, i.e., Linux on 64-bit AMD/Intel CPUs. Unlike <literal>i686-linux</literal>, this platform doesn’t have a pure <literal>stdenv</literal> yet.
        </para>
       </listitem>
      </itemizedlist>
@@ -472,21 +376,10 @@ xlink:href='http://nixos.org/releases/nix/nix-0.10/'>Nix 0.10</link>
    </listitem>
    <listitem>
     <para>
-     It is now <emphasis>much</emphasis> easier to override the default C
-     compiler and other tools in <literal>stdenv</literal> for specific
-     packages. <filename>all-packages.nix</filename> provides two utility
-     functions for this purpose: <function>overrideGCC</function> and
-     <function>overrideInStdenv</function>. Both take a
-     <literal>stdenv</literal> and return an augmented
-     <literal>stdenv</literal>; the formed changes the C compiler, and the
-     latter adds additional packages to the front of
-     <literal>stdenv</literal>’s initial <envar>PATH</envar>, allowing tools
-     to be overridden.
+     It is now <emphasis>much</emphasis> easier to override the default C compiler and other tools in <literal>stdenv</literal> for specific packages. <filename>all-packages.nix</filename> provides two utility functions for this purpose: <function>overrideGCC</function> and <function>overrideInStdenv</function>. Both take a <literal>stdenv</literal> and return an augmented <literal>stdenv</literal>; the formed changes the C compiler, and the latter adds additional packages to the front of <literal>stdenv</literal>’s initial <envar>PATH</envar>, allowing tools to be overridden.
     </para>
     <para>
-     For instance, the package <varname>strategoxt</varname> doesn’t build
-     with the GNU Make in <literal>stdenv</literal> (version 3.81), so we call
-     it with an augmented <literal>stdenv</literal> that uses GNU Make 3.80:
+     For instance, the package <varname>strategoxt</varname> doesn’t build with the GNU Make in <literal>stdenv</literal> (version 3.81), so we call it with an augmented <literal>stdenv</literal> that uses GNU Make 3.80:
 <programlisting>
 strategoxt = (import ../development/compilers/strategoxt) {
   inherit fetchurl pkgconfig sdf aterm;
@@ -494,8 +387,7 @@ strategoxt = (import ../development/compilers/strategoxt) {
 };
 
 gnumake380 = <replaceable>...</replaceable>;</programlisting>
-     Likewise, there are many packages that don’t compile with the default
-     GCC (4.1.1), but that’s easily fixed:
+     Likewise, there are many packages that don’t compile with the default GCC (4.1.1), but that’s easily fixed:
 <programlisting>
 exult = import ../games/exult {
   inherit fetchurl SDL SDL_mixer zlib libpng unzip;
@@ -505,13 +397,7 @@ exult = import ../games/exult {
    </listitem>
    <listitem>
     <para>
-     It has also become much easier to experiment with changes to the
-     <literal>stdenv</literal> setup script (which notably contains the generic
-     builder). Since edits to <filename>pkgs/stdenv/generic/setup.sh</filename>
-     trigger a rebuild of <emphasis>everything</emphasis>, this was formerly
-     quite painful. But now <literal>stdenv</literal> contains a function to
-     “regenerate” <literal>stdenv</literal> with a different setup script,
-     allowing the use of a different setup script for specific packages:
+     It has also become much easier to experiment with changes to the <literal>stdenv</literal> setup script (which notably contains the generic builder). Since edits to <filename>pkgs/stdenv/generic/setup.sh</filename> trigger a rebuild of <emphasis>everything</emphasis>, this was formerly quite painful. But now <literal>stdenv</literal> contains a function to “regenerate” <literal>stdenv</literal> with a different setup script, allowing the use of a different setup script for specific packages:
 <programlisting>
 pkg = import <replaceable>...</replaceable> {
   stdenv = stdenv.regenerate ./my-setup.sh;
@@ -521,10 +407,7 @@ pkg = import <replaceable>...</replaceable> {
    </listitem>
    <listitem>
     <para>
-     Packages can now have a human-readable <emphasis>description</emphasis>
-     field. Package descriptions are shown by <literal>nix-env -qa
-     --description</literal>. In addition, they’re shown on the Nixpkgs
-     release page. A description can be added to a package as follows:
+     Packages can now have a human-readable <emphasis>description</emphasis> field. Package descriptions are shown by <literal>nix-env -qa --description</literal>. In addition, they’re shown on the Nixpkgs release page. A description can be added to a package as follows:
 <programlisting>
 stdenv.mkDerivation {
   name = "exult-1.2";
@@ -533,34 +416,26 @@ stdenv.mkDerivation {
     description = "A reimplementation of the Ultima VII game engine";
   };
 }</programlisting>
-     The <varname>meta</varname> attribute is not passed to the builder, so
-     changes to the description do not trigger a rebuild. Additional
-     <varname>meta</varname> attributes may be defined in the future (such as
-     the URL of the package’s homepage, the license, etc.).
+     The <varname>meta</varname> attribute is not passed to the builder, so changes to the description do not trigger a rebuild. Additional <varname>meta</varname> attributes may be defined in the future (such as the URL of the package’s homepage, the license, etc.).
     </para>
    </listitem>
   </itemizedlist>
 
   <para>
-   The following people contributed to this release: Andres Löh, Armijn Hemel,
-   Christof Douma, Eelco Dolstra, Eelco Visser, Mart Kolthof, Martin
-   Bravenboer, Merijn de Jonge, Rob Vermaas and Roy van den Broek.
+   The following people contributed to this release: Andres Löh, Armijn Hemel, Christof Douma, Eelco Dolstra, Eelco Visser, Mart Kolthof, Martin Bravenboer, Merijn de Jonge, Rob Vermaas and Roy van den Broek.
   </para>
  </section>
  <section xml:id="release-notes-0.9">
   <title>Release 0.9 (January 31, 2006)</title>
 
   <para>
-   There have been zillions of changes since the last release of Nixpkgs. Many
-   packages have been added or updated. The following are some of the more
-   notable changes:
+   There have been zillions of changes since the last release of Nixpkgs. Many packages have been added or updated. The following are some of the more notable changes:
   </para>
 
   <itemizedlist>
    <listitem>
     <para>
-     Distribution files have been moved to
-     <link
+     Distribution files have been moved to <link
   xlink:href="http://nixos.org/" />.
     </para>
    </listitem>
@@ -576,24 +451,17 @@ stdenv.mkDerivation {
    </listitem>
    <listitem>
     <para>
-     The old, unofficial Xlibs has been replaced by the official modularised
-     X11 distribution from X.org, i.e., X11R7.0. X11R7.0 consists of 287 (!)
-     packages, all of which are in Nixpkgs though not all have been tested. It
-     is now possible to build a working X server (previously we only had X
-     client libraries). We use a fully Nixified X server on NixOS.
+     The old, unofficial Xlibs has been replaced by the official modularised X11 distribution from X.org, i.e., X11R7.0. X11R7.0 consists of 287 (!) packages, all of which are in Nixpkgs though not all have been tested. It is now possible to build a working X server (previously we only had X client libraries). We use a fully Nixified X server on NixOS.
     </para>
    </listitem>
    <listitem>
     <para>
-     The Sun JDK 5 has been purified, i.e., it doesn’t require any non-Nix
-     components such as <filename>/lib/ld-linux.so.2</filename>. This means
-     that Java applications such as Eclipse and Azureus can run on NixOS.
+     The Sun JDK 5 has been purified, i.e., it doesn’t require any non-Nix components such as <filename>/lib/ld-linux.so.2</filename>. This means that Java applications such as Eclipse and Azureus can run on NixOS.
     </para>
    </listitem>
    <listitem>
     <para>
-     Hardware-accelerated OpenGL support, used by games like Quake 3 (which is
-     now built from source).
+     Hardware-accelerated OpenGL support, used by games like Quake 3 (which is now built from source).
     </para>
    </listitem>
    <listitem>
@@ -608,8 +476,7 @@ stdenv.mkDerivation {
    </listitem>
    <listitem>
     <para>
-     Some support for cross-compilation: cross-compiling builds of GCC and
-     Binutils, and cross-compiled builds of the C library uClibc.
+     Some support for cross-compilation: cross-compiling builds of GCC and Binutils, and cross-compiled builds of the C library uClibc.
     </para>
    </listitem>
    <listitem>
@@ -618,8 +485,7 @@ stdenv.mkDerivation {
      <itemizedlist>
       <listitem>
        <para>
-        teTeX, including support for building LaTeX documents using Nix (with
-        automatic dependency determination).
+        teTeX, including support for building LaTeX documents using Nix (with automatic dependency determination).
        </para>
       </listitem>
       <listitem>
@@ -629,14 +495,12 @@ stdenv.mkDerivation {
       </listitem>
       <listitem>
        <para>
-        System-level packages to support NixOS, e.g. Grub, GNU
-        <literal>parted</literal> and so on.
+        System-level packages to support NixOS, e.g. Grub, GNU <literal>parted</literal> and so on.
        </para>
       </listitem>
       <listitem>
        <para>
-        <literal>ecj</literal>, the Eclipse Compiler for Java, so we finally
-        have a freely distributable compiler that supports Java 5.0.
+        <literal>ecj</literal>, the Eclipse Compiler for Java, so we finally have a freely distributable compiler that supports Java 5.0.
        </para>
       </listitem>
       <listitem>
@@ -661,8 +525,7 @@ stdenv.mkDerivation {
       </listitem>
       <listitem>
        <para>
-        <literal>kdelibs</literal>. This allows us to add KDE-based packages
-        (such as <literal>kcachegrind</literal>).
+        <literal>kdelibs</literal>. This allows us to add KDE-based packages (such as <literal>kcachegrind</literal>).
        </para>
       </listitem>
      </itemizedlist>
@@ -671,17 +534,14 @@ stdenv.mkDerivation {
   </itemizedlist>
 
   <para>
-   The following people contributed to this release: Andres Löh, Armijn Hemel,
-   Bogdan Dumitriu, Christof Douma, Eelco Dolstra, Eelco Visser, Mart Kolthof,
-   Martin Bravenboer, Rob Vermaas and Roy van den Broek.
+   The following people contributed to this release: Andres Löh, Armijn Hemel, Bogdan Dumitriu, Christof Douma, Eelco Dolstra, Eelco Visser, Mart Kolthof, Martin Bravenboer, Rob Vermaas and Roy van den Broek.
   </para>
  </section>
  <section xml:id="release-notes-0.8">
   <title>Release 0.8 (April 11, 2005)</title>
 
   <para>
-   This release is mostly to remain synchronised with the changed hashing
-   scheme in Nix 0.8.
+   This release is mostly to remain synchronised with the changed hashing scheme in Nix 0.8.
   </para>
 
   <para>
@@ -706,16 +566,10 @@ stdenv.mkDerivation {
   <itemizedlist>
    <listitem>
     <para>
-     The bootstrap process for the standard build environment on Linux
-     (stdenv-linux) has been improved. It is no longer dependent in its initial
-     bootstrap stages on the system Glibc, GCC, and other tools. Rather,
-     Nixpkgs contains a statically linked bash and curl, and uses that to
-     download other statically linked tools. These are then used to build a
-     Glibc and dynamically linked versions of all other tools.
+     The bootstrap process for the standard build environment on Linux (stdenv-linux) has been improved. It is no longer dependent in its initial bootstrap stages on the system Glibc, GCC, and other tools. Rather, Nixpkgs contains a statically linked bash and curl, and uses that to download other statically linked tools. These are then used to build a Glibc and dynamically linked versions of all other tools.
     </para>
     <para>
-     This change also makes the bootstrap process faster. For instance, GCC is
-     built only once instead of three times.
+     This change also makes the bootstrap process faster. For instance, GCC is built only once instead of three times.
     </para>
     <para>
      (Contributed by Armijn Hemel.)
@@ -723,17 +577,13 @@ stdenv.mkDerivation {
    </listitem>
    <listitem>
     <para>
-     Tarballs used by Nixpkgs are now obtained from the same server that hosts
-     Nixpkgs (<link
-  xlink:href="http://catamaran.labs.cs.uu.nl/" />). This
-     reduces the risk of packages being unbuildable due to moved or deleted
-     files on various servers.
+     Tarballs used by Nixpkgs are now obtained from the same server that hosts Nixpkgs (<link
+  xlink:href="http://catamaran.labs.cs.uu.nl/" />). This reduces the risk of packages being unbuildable due to moved or deleted files on various servers.
     </para>
    </listitem>
    <listitem>
     <para>
-     There now is a generic mechanism for building Perl modules. See the
-     various Perl modules defined in pkgs/system/all-packages-generic.nix.
+     There now is a generic mechanism for building Perl modules. See the various Perl modules defined in pkgs/system/all-packages-generic.nix.
     </para>
    </listitem>
    <listitem>
diff --git a/doc/reviewing-contributions.xml b/doc/reviewing-contributions.xml
index 5aa950625ef..5a14684f9b1 100644
--- a/doc/reviewing-contributions.xml
+++ b/doc/reviewing-contributions.xml
@@ -6,68 +6,40 @@
  <title>Reviewing contributions</title>
  <warning>
   <para>
-   The following section is a draft, and the policy for reviewing is still
-   being discussed in issues such as
-   <link
-	   xlink:href="https://github.com/NixOS/nixpkgs/issues/11166">#11166
-   </link> and
-   <link
-	   xlink:href="https://github.com/NixOS/nixpkgs/issues/20836">#20836
-   </link>.
+   The following section is a draft, and the policy for reviewing is still being discussed in issues such as <link
+	   xlink:href="https://github.com/NixOS/nixpkgs/issues/11166">#11166 </link> and <link
+	   xlink:href="https://github.com/NixOS/nixpkgs/issues/20836">#20836 </link>.
   </para>
  </warning>
  <para>
-  The Nixpkgs project receives a fairly high number of contributions via GitHub
-  pull requests. Reviewing and approving these is an important task and a way
-  to contribute to the project.
+  The Nixpkgs project receives a fairly high number of contributions via GitHub pull requests. Reviewing and approving these is an important task and a way to contribute to the project.
  </para>
  <para>
-  The high change rate of Nixpkgs makes any pull request that remains open for
-  too long subject to conflicts that will require extra work from the submitter
-  or the merger. Reviewing pull requests in a timely manner and being
-  responsive to the comments is the key to avoid this issue. GitHub provides
-  sort filters that can be used to see the
-  <link
-  xlink:href="https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc">most
-  recently</link> and the
-  <link
-  xlink:href="https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-asc">least
-  recently</link> updated pull requests. We highly encourage looking at
-  <link xlink:href="https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+is%3Aopen+review%3Anone+status%3Asuccess+-label%3A%222.status%3A+work-in-progress%22+no%3Aproject+no%3Aassignee+no%3Amilestone">
-  this list of ready to merge, unreviewed pull requests</link>.
+  The high change rate of Nixpkgs makes any pull request that remains open for too long subject to conflicts that will require extra work from the submitter or the merger. Reviewing pull requests in a timely manner and being responsive to the comments is the key to avoid this issue. GitHub provides sort filters that can be used to see the <link
+  xlink:href="https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc">most recently</link> and the <link
+  xlink:href="https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-asc">least recently</link> updated pull requests. We highly encourage looking at <link xlink:href="https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+is%3Aopen+review%3Anone+status%3Asuccess+-label%3A%222.status%3A+work-in-progress%22+no%3Aproject+no%3Aassignee+no%3Amilestone"> this list of ready to merge, unreviewed pull requests</link>.
  </para>
  <para>
-  When reviewing a pull request, please always be nice and polite.
-  Controversial changes can lead to controversial opinions, but it is important
-  to respect every community member and their work.
+  When reviewing a pull request, please always be nice and polite. Controversial changes can lead to controversial opinions, but it is important to respect every community member and their work.
  </para>
  <para>
-  GitHub provides reactions as a simple and quick way to provide feedback to
-  pull requests or any comments. The thumb-down reaction should be used with
-  care and if possible accompanied with some explanation so the submitter has
-  directions to improve their contribution.
+  GitHub provides reactions as a simple and quick way to provide feedback to pull requests or any comments. The thumb-down reaction should be used with care and if possible accompanied with some explanation so the submitter has directions to improve their contribution.
  </para>
  <para>
-  pull request reviews should include a list of what has been reviewed in a
-  comment, so other reviewers and mergers can know the state of the review.
+  pull request reviews should include a list of what has been reviewed in a comment, so other reviewers and mergers can know the state of the review.
  </para>
  <para>
-  All the review template samples provided in this section are generic and
-  meant as examples. Their usage is optional and the reviewer is free to adapt
-  them to their liking.
+  All the review template samples provided in this section are generic and meant as examples. Their usage is optional and the reviewer is free to adapt them to their liking.
  </para>
  <section xml:id="reviewing-contributions-package-updates">
   <title>Package updates</title>
 
   <para>
-   A package update is the most trivial and common type of pull request. These
-   pull requests mainly consist of updating the version part of the package
-   name and the source hash.
+   A package update is the most trivial and common type of pull request. These pull requests mainly consist of updating the version part of the package name and the source hash.
   </para>
 
   <para>
-   It can happen that non-trivial updates include patches or more complex
-   changes.
+   It can happen that non-trivial updates include patches or more complex changes.
   </para>
 
   <para>
@@ -82,8 +54,7 @@
     <itemizedlist>
      <listitem>
       <para>
-       <literal>8.has: package (update)</literal> and any topic label that fit
-       the updated package.
+       <literal>8.has: package (update)</literal> and any topic label that fit the updated package.
       </para>
      </listitem>
     </itemizedlist>
@@ -105,9 +76,7 @@
     <itemizedlist>
      <listitem>
       <para>
-       <link xlink:href="https://help.github.com/articles/about-codeowners/">CODEOWNERS</link>
-       will make GitHub notify users based on the submitted changes, but it can
-       happen that it misses some of the package maintainers.
+       <link xlink:href="https://help.github.com/articles/about-codeowners/">CODEOWNERS</link> will make GitHub notify users based on the submitted changes, but it can happen that it misses some of the package maintainers.
       </para>
      </listitem>
     </itemizedlist>
@@ -119,15 +88,12 @@
     <itemizedlist>
      <listitem>
       <para>
-       License can change with version updates, so it should be checked to
-       match the upstream license.
+       License can change with version updates, so it should be checked to match the upstream license.
       </para>
      </listitem>
      <listitem>
       <para>
-       If the package has no maintainer, a maintainer must be set. This can be
-       the update submitter or a community member that accepts to take
-       maintainership of the package.
+       If the package has no maintainer, a maintainer must be set. This can be the update submitter or a community member that accepts to take maintainership of the package.
       </para>
      </listitem>
     </itemizedlist>
@@ -144,14 +110,10 @@
     <itemizedlist>
      <listitem>
       <para>
-       pull requests are often targeted to the master or staging branch, and
-       building the pull request locally when it is submitted can trigger many
-       source builds.
+       pull requests are often targeted to the master or staging branch, and building the pull request locally when it is submitted can trigger many source builds.
       </para>
       <para>
-       It is possible to rebase the changes on nixos-unstable or
-       nixpkgs-unstable for easier review by running the following commands
-       from a nixpkgs clone.
+       It is possible to rebase the changes on nixos-unstable or nixpkgs-unstable for easier review by running the following commands from a nixpkgs clone.
 <screen>
 <prompt>$ </prompt>git remote add channels https://github.com/NixOS/nixpkgs-channels.git <co
   xml:id='reviewing-rebase-1' />
@@ -163,8 +125,7 @@
        <calloutlist>
         <callout arearefs='reviewing-rebase-1'>
          <para>
-          This should be done only once to be able to fetch channel branches
-          from the nixpkgs-channels repository.
+          This should be done only once to be able to fetch channel branches from the nixpkgs-channels repository.
          </para>
         </callout>
         <callout arearefs='reviewing-rebase-2'>
@@ -174,9 +135,7 @@
         </callout>
         <callout arearefs='reviewing-rebase-3'>
          <para>
-          Fetching the pull request changes, <varname>PRNUMBER</varname> is the
-          number at the end of the pull request title and
-          <varname>BASEBRANCH</varname> the base branch of the pull request.
+          Fetching the pull request changes, <varname>PRNUMBER</varname> is the number at the end of the pull request title and <varname>BASEBRANCH</varname> the base branch of the pull request.
          </para>
         </callout>
         <callout arearefs='reviewing-rebase-4'>
@@ -189,12 +148,7 @@
      </listitem>
      <listitem>
       <para>
-       The
-       <link xlink:href="https://github.com/Mic92/nix-review">nix-review</link>
-       tool can be used to review a pull request content in a single command.
-       <varname>PRNUMBER</varname> should be replaced by the number at the end
-       of the pull request title. You can also provide the full github pull
-       request url.
+       The <link xlink:href="https://github.com/Mic92/nix-review">nix-review</link> tool can be used to review a pull request content in a single command. <varname>PRNUMBER</varname> should be replaced by the number at the end of the pull request title. You can also provide the full github pull request url.
       </para>
 <screen>
 <prompt>$ </prompt>nix-shell -p nix-review --run "nix-review pr PRNUMBER"
@@ -231,8 +185,7 @@
   <title>New packages</title>
 
   <para>
-   New packages are a common type of pull requests. These pull requests
-   consists in adding a new nix-expression for a package.
+   New packages are a common type of pull requests. These pull requests consists in adding a new nix-expression for a package.
   </para>
 
   <para>
@@ -247,8 +200,7 @@
     <itemizedlist>
      <listitem>
       <para>
-       <literal>8.has: package (new)</literal> and any topic label that fit the
-       new package.
+       <literal>8.has: package (new)</literal> and any topic label that fit the new package.
       </para>
      </listitem>
     </itemizedlist>
@@ -280,8 +232,7 @@
      </listitem>
      <listitem>
       <para>
-       A maintainer must be set. This can be the package submitter or a
-       community member that accepts to take maintainership of the package.
+       A maintainer must be set. This can be the package submitter or a community member that accepts to take maintainership of the package.
       </para>
      </listitem>
     </itemizedlist>
@@ -303,8 +254,7 @@
      </listitem>
      <listitem>
       <para>
-       The most appropriate function should be used (e.g. packages from GitHub
-       should use <literal>fetchFromGitHub</literal>).
+       The most appropriate function should be used (e.g. packages from GitHub should use <literal>fetchFromGitHub</literal>).
       </para>
      </listitem>
     </itemizedlist>
@@ -351,8 +301,7 @@
   <title>Module updates</title>
 
   <para>
-   Module updates are submissions changing modules in some ways. These often
-   contains changes to the options or introduce new options.
+   Module updates are submissions changing modules in some ways. These often contains changes to the options or introduce new options.
   </para>
 
   <para>
@@ -367,8 +316,7 @@
     <itemizedlist>
      <listitem>
       <para>
-       <literal>8.has: module (update)</literal> and any topic label that fit
-       the module.
+       <literal>8.has: module (update)</literal> and any topic label that fit the module.
       </para>
      </listitem>
     </itemizedlist>
@@ -380,9 +328,7 @@
     <itemizedlist>
      <listitem>
       <para>
-       <link xlink:href="https://help.github.com/articles/about-codeowners/">CODEOWNERS</link>
-       will make GitHub notify users based on the submitted changes, but it can
-       happen that it misses some of the package maintainers.
+       <link xlink:href="https://help.github.com/articles/about-codeowners/">CODEOWNERS</link> will make GitHub notify users based on the submitted changes, but it can happen that it misses some of the package maintainers.
       </para>
      </listitem>
     </itemizedlist>
@@ -399,9 +345,7 @@
     <itemizedlist>
      <listitem>
       <para>
-       Type should be appropriate (string related types differs in their
-       merging capabilities, <literal>optionSet</literal> and
-       <literal>string</literal> types are deprecated).
+       Type should be appropriate (string related types differs in their merging capabilities, <literal>optionSet</literal> and <literal>string</literal> types are deprecated).
       </para>
      </listitem>
      <listitem>
@@ -418,23 +362,19 @@
     <itemizedlist>
      <listitem>
       <para>
-       <literal>mkRenamedOptionModule</literal> and
-       <literal>mkAliasOptionModule</literal> functions provide way to make
-       option changes backward compatible.
+       <literal>mkRenamedOptionModule</literal> and <literal>mkAliasOptionModule</literal> functions provide way to make option changes backward compatible.
       </para>
      </listitem>
     </itemizedlist>
    </listitem>
    <listitem>
     <para>
-     Ensure that removed options are declared with
-     <literal>mkRemovedOptionModule</literal>
+     Ensure that removed options are declared with <literal>mkRemovedOptionModule</literal>
     </para>
    </listitem>
    <listitem>
     <para>
-     Ensure that changes that are not backward compatible are mentioned in
-     release notes.
+     Ensure that changes that are not backward compatible are mentioned in release notes.
     </para>
    </listitem>
    <listitem>
@@ -480,8 +420,7 @@
     <itemizedlist>
      <listitem>
       <para>
-       <literal>8.has: module (new)</literal> and any topic label that fit the
-       module.
+       <literal>8.has: module (new)</literal> and any topic label that fit the module.
       </para>
      </listitem>
     </itemizedlist>
@@ -498,9 +437,7 @@
     <itemizedlist>
      <listitem>
       <para>
-       Type should be appropriate (string related types differs in their
-       merging capabilities, <literal>optionSet</literal> and
-       <literal>string</literal> types are deprecated).
+       Type should be appropriate (string related types differs in their merging capabilities, <literal>optionSet</literal> and <literal>string</literal> types are deprecated).
       </para>
      </listitem>
      <listitem>
@@ -522,8 +459,7 @@
      </listitem>
      <listitem>
       <para>
-       Module documentation should be declared with
-       <literal>meta.doc</literal>.
+       Module documentation should be declared with <literal>meta.doc</literal>.
       </para>
      </listitem>
     </itemizedlist>
@@ -535,8 +471,7 @@
     <itemizedlist>
      <listitem>
       <para>
-       For example, enabling a module should not open firewall ports by
-       default.
+       For example, enabling a module should not open firewall ports by default.
       </para>
      </listitem>
     </itemizedlist>
@@ -573,25 +508,18 @@
   </para>
 
   <para>
-   If you consider having enough knowledge and experience in a topic and would
-   like to be a long-term reviewer for related submissions, please contact the
-   current reviewers for that topic. They will give you information about the
-   reviewing process. The main reviewers for a topic can be hard to find as
-   there is no list, but checking past pull requests to see who reviewed or
-   git-blaming the code to see who committed to that topic can give some hints.
+   If you consider having enough knowledge and experience in a topic and would like to be a long-term reviewer for related submissions, please contact the current reviewers for that topic. They will give you information about the reviewing process. The main reviewers for a topic can be hard to find as there is no list, but checking past pull requests to see who reviewed or git-blaming the code to see who committed to that topic can give some hints.
   </para>
 
   <para>
-   Container system, boot system and library changes are some examples of the
-   pull requests fitting this category.
+   Container system, boot system and library changes are some examples of the pull requests fitting this category.
   </para>
  </section>
  <section xml:id="reviewing-contributions--merging-pull-requests">
   <title>Merging pull requests</title>
 
   <para>
-   It is possible for community members that have enough knowledge and
-   experience on a special topic to contribute by merging pull requests.
+   It is possible for community members that have enough knowledge and experience on a special topic to contribute by merging pull requests.
   </para>
 
   <para>
@@ -608,12 +536,8 @@ policy.
 -->
 
   <para>
-   In a case a contributor definitively leaves the Nix community, they should
-   create an issue or post on
-   <link
-   xlink:href="https://discourse.nixos.org">Discourse</link> with
-   references of packages and modules they maintain so the maintainership can
-   be taken over by other contributors.
+   In a case a contributor definitively leaves the Nix community, they should create an issue or post on <link
+   xlink:href="https://discourse.nixos.org">Discourse</link> with references of packages and modules they maintain so the maintainership can be taken over by other contributors.
   </para>
  </section>
 </chapter>
diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index a4bc2809be0..5495ce29ce3 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -3,22 +3,13 @@
          xml:id="chap-stdenv">
  <title>The Standard Environment</title>
  <para>
-  The standard build environment in the Nix Packages collection provides an
-  environment for building Unix packages that does a lot of common build tasks
-  automatically. In fact, for Unix packages that use the standard
-  <literal>./configure; make; make install</literal> build interface, you
-  don’t need to write a build script at all; the standard environment does
-  everything automatically. If <literal>stdenv</literal> doesn’t do what you
-  need automatically, you can easily customise or override the various build
-  phases.
+  The standard build environment in the Nix Packages collection provides an environment for building Unix packages that does a lot of common build tasks automatically. In fact, for Unix packages that use the standard <literal>./configure; make; make install</literal> build interface, you don’t need to write a build script at all; the standard environment does everything automatically. If <literal>stdenv</literal> doesn’t do what you need automatically, you can easily customise or override the various build phases.
  </para>
  <section xml:id="sec-using-stdenv">
   <title>Using <literal>stdenv</literal></title>
 
   <para>
-   To build a package with the standard environment, you use the function
-   <varname>stdenv.mkDerivation</varname>, instead of the primitive built-in
-   function <varname>derivation</varname>, e.g.
+   To build a package with the standard environment, you use the function <varname>stdenv.mkDerivation</varname>, instead of the primitive built-in function <varname>derivation</varname>, e.g.
 <programlisting>
 stdenv.mkDerivation {
   name = "libfoo-1.2.3";
@@ -27,17 +18,7 @@ stdenv.mkDerivation {
     sha256 = "0x2g1jqygyr5wiwg4ma1nd7w4ydpy82z9gkcv8vh2v8dn3y58v5m";
   };
 }</programlisting>
-   (<varname>stdenv</varname> needs to be in scope, so if you write this in a
-   separate Nix expression from <filename>pkgs/all-packages.nix</filename>, you
-   need to pass it as a function argument.) Specifying a
-   <varname>name</varname> and a <varname>src</varname> is the absolute minimum
-   Nix requires. For convenience, you can also use <varname>pname</varname> and
-   <varname>version</varname> attributes and <literal>mkDerivation</literal>
-   will automatically set <varname>name</varname> to
-   <literal>"${pname}-${version}"</literal> by default. Since
-   <link xlink:href="https://github.com/NixOS/rfcs/pull/35">RFC 0035</link>,
-   this is preferred for packages in Nixpkgs, as it allows us to reuse the
-   version easily:
+   (<varname>stdenv</varname> needs to be in scope, so if you write this in a separate Nix expression from <filename>pkgs/all-packages.nix</filename>, you need to pass it as a function argument.) Specifying a <varname>name</varname> and a <varname>src</varname> is the absolute minimum Nix requires. For convenience, you can also use <varname>pname</varname> and <varname>version</varname> attributes and <literal>mkDerivation</literal> will automatically set <varname>name</varname> to <literal>"${pname}-${version}"</literal> by default. Since <link xlink:href="https://github.com/NixOS/rfcs/pull/35">RFC 0035</link>, this is preferred for packages in Nixpkgs, as it allows us to reuse the version easily:
 <programlisting>
 stdenv.mkDerivation rec {
   pname = "libfoo";
@@ -50,31 +31,18 @@ stdenv.mkDerivation rec {
   </para>
 
   <para>
-   Many packages have dependencies that are not provided in the standard
-   environment. It’s usually sufficient to specify those dependencies in the
-   <varname>buildInputs</varname> attribute:
+   Many packages have dependencies that are not provided in the standard environment. It’s usually sufficient to specify those dependencies in the <varname>buildInputs</varname> attribute:
 <programlisting>
 stdenv.mkDerivation {
   name = "libfoo-1.2.3";
   ...
   buildInputs = [libbar perl ncurses];
 }</programlisting>
-   This attribute ensures that the <filename>bin</filename> subdirectories of
-   these packages appear in the <envar>PATH</envar> environment variable during
-   the build, that their <filename>include</filename> subdirectories are
-   searched by the C compiler, and so on. (See
-   <xref linkend="ssec-setup-hooks"/> for details.)
+   This attribute ensures that the <filename>bin</filename> subdirectories of these packages appear in the <envar>PATH</envar> environment variable during the build, that their <filename>include</filename> subdirectories are searched by the C compiler, and so on. (See <xref linkend="ssec-setup-hooks"/> for details.)
   </para>
 
   <para>
-   Often it is necessary to override or modify some aspect of the build. To
-   make this easier, the standard environment breaks the package build into a
-   number of <emphasis>phases</emphasis>, all of which can be overridden or
-   modified individually: unpacking the sources, applying patches, configuring,
-   building, and installing. (There are some others; see
-   <xref linkend="sec-stdenv-phases"/>.) For instance, a package that doesn’t
-   supply a makefile but instead has to be compiled “manually” could be
-   handled like this:
+   Often it is necessary to override or modify some aspect of the build. To make this easier, the standard environment breaks the package build into a number of <emphasis>phases</emphasis>, all of which can be overridden or modified individually: unpacking the sources, applying patches, configuring, building, and installing. (There are some others; see <xref linkend="sec-stdenv-phases"/>.) For instance, a package that doesn’t supply a makefile but instead has to be compiled “manually” could be handled like this:
 <programlisting>
 stdenv.mkDerivation {
   name = "fnord-4.5";
@@ -87,20 +55,15 @@ stdenv.mkDerivation {
     cp foo $out/bin
   '';
 }</programlisting>
-   (Note the use of <literal>''</literal>-style string literals, which are very
-   convenient for large multi-line script fragments because they don’t need
-   escaping of <literal>"</literal> and <literal>\</literal>, and because
-   indentation is intelligently removed.)
+   (Note the use of <literal>''</literal>-style string literals, which are very convenient for large multi-line script fragments because they don’t need escaping of <literal>"</literal> and <literal>\</literal>, and because indentation is intelligently removed.)
   </para>
 
   <para>
-   There are many other attributes to customise the build. These are listed in
-   <xref linkend="ssec-stdenv-attributes"/>.
+   There are many other attributes to customise the build. These are listed in <xref linkend="ssec-stdenv-attributes"/>.
   </para>
 
   <para>
-   While the standard environment provides a generic builder, you can still
-   supply your own build script:
+   While the standard environment provides a generic builder, you can still supply your own build script:
 <programlisting>
 stdenv.mkDerivation {
   name = "libfoo-1.2.3";
@@ -111,9 +74,7 @@ stdenv.mkDerivation {
 <programlisting>
 source $stdenv/setup
 </programlisting>
-   to let <literal>stdenv</literal> set up the environment (e.g., process the
-   <varname>buildInputs</varname>). If you want, you can still use
-   <literal>stdenv</literal>’s generic builder:
+   to let <literal>stdenv</literal> set up the environment (e.g., process the <varname>buildInputs</varname>). If you want, you can still use <literal>stdenv</literal>’s generic builder:
 <programlisting>
 source $stdenv/setup
 
@@ -179,23 +140,17 @@ genericBuild
     </listitem>
     <listitem>
      <para>
-      <command>gzip</command>, <command>bzip2</command> and
-      <command>xz</command>.
+      <command>gzip</command>, <command>bzip2</command> and <command>xz</command>.
      </para>
     </listitem>
     <listitem>
      <para>
-      GNU Make. It has been patched to provide <quote>nested</quote> output
-      that can be fed into the <command>nix-log2xml</command> command and
-      <command>log2html</command> stylesheet to create a structured, readable
-      output of the build steps performed by Make.
+      GNU Make. It has been patched to provide <quote>nested</quote> output that can be fed into the <command>nix-log2xml</command> command and <command>log2html</command> stylesheet to create a structured, readable output of the build steps performed by Make.
      </para>
     </listitem>
     <listitem>
      <para>
-      Bash. This is the shell used for all builders in the Nix Packages
-      collection. Not using <command>/bin/sh</command> removes a large source
-      of portability problems.
+      Bash. This is the shell used for all builders in the Nix Packages collection. Not using <command>/bin/sh</command> removes a large source of portability problems.
      </para>
     </listitem>
     <listitem>
@@ -207,108 +162,52 @@ genericBuild
   </para>
 
   <para>
-   On Linux, <literal>stdenv</literal> also includes the
-   <command>patchelf</command> utility.
+   On Linux, <literal>stdenv</literal> also includes the <command>patchelf</command> utility.
   </para>
  </section>
  <section xml:id="ssec-stdenv-dependencies">
   <title>Specifying dependencies</title>
 
   <para>
-   As described in the Nix manual, almost any <filename>*.drv</filename> store
-   path in a derivation's attribute set will induce a dependency on that
-   derivation. <varname>mkDerivation</varname>, however, takes a few attributes
-   intended to, between them, include all the dependencies of a package. This
-   is done both for structure and consistency, but also so that certain other
-   setup can take place. For example, certain dependencies need their bin
-   directories added to the <envar>PATH</envar>. That is built-in, but other
-   setup is done via a pluggable mechanism that works in conjunction with these
-   dependency attributes. See <xref linkend="ssec-setup-hooks"/> for details.
+   As described in the Nix manual, almost any <filename>*.drv</filename> store path in a derivation's attribute set will induce a dependency on that derivation. <varname>mkDerivation</varname>, however, takes a few attributes intended to, between them, include all the dependencies of a package. This is done both for structure and consistency, but also so that certain other setup can take place. For example, certain dependencies need their bin directories added to the <envar>PATH</envar>. That is built-in, but other setup is done via a pluggable mechanism that works in conjunction with these dependency attributes. See <xref linkend="ssec-setup-hooks"/> for details.
   </para>
 
   <para>
-   Dependencies can be broken down along three axes: their host and target
-   platforms relative to the new derivation's, and whether they are propagated.
-   The platform distinctions are motivated by cross compilation; see
-   <xref linkend="chap-cross"/> for exactly what each platform means.
+   Dependencies can be broken down along three axes: their host and target platforms relative to the new derivation's, and whether they are propagated. The platform distinctions are motivated by cross compilation; see <xref linkend="chap-cross"/> for exactly what each platform means.
    <footnote xml:id="footnote-stdenv-ignored-build-platform">
     <para>
-     The build platform is ignored because it is a mere implementation detail
-     of the package satisfying the dependency: As a general programming
-     principle, dependencies are always <emphasis>specified</emphasis> as
-     interfaces, not concrete implementation.
+     The build platform is ignored because it is a mere implementation detail of the package satisfying the dependency: As a general programming principle, dependencies are always <emphasis>specified</emphasis> as interfaces, not concrete implementation.
     </para>
    </footnote>
-   But even if one is not cross compiling, the platforms imply whether or not
-   the dependency is needed at run-time or build-time, a concept that makes
-   perfect sense outside of cross compilation. By default, the
-   run-time/build-time distinction is just a hint for mental clarity, but with
-   <varname>strictDeps</varname> set it is mostly enforced even in the native
-   case.
+   But even if one is not cross compiling, the platforms imply whether or not the dependency is needed at run-time or build-time, a concept that makes perfect sense outside of cross compilation. By default, the run-time/build-time distinction is just a hint for mental clarity, but with <varname>strictDeps</varname> set it is mostly enforced even in the native case.
   </para>
 
   <para>
-   The extension of <envar>PATH</envar> with dependencies, alluded to above,
-   proceeds according to the relative platforms alone. The process is carried
-   out only for dependencies whose host platform matches the new derivation's
-   build platform i.e. dependencies which run on the platform where the new
-   derivation will be built.
+   The extension of <envar>PATH</envar> with dependencies, alluded to above, proceeds according to the relative platforms alone. The process is carried out only for dependencies whose host platform matches the new derivation's build platform i.e. dependencies which run on the platform where the new derivation will be built.
    <footnote xml:id="footnote-stdenv-native-dependencies-in-path">
     <para>
-     Currently, this means for native builds all dependencies are put on the
-     <envar>PATH</envar>. But in the future that may not be the case for sake
-     of matching cross: the platforms would be assumed to be unique for native
-     and cross builds alike, so only the <varname>depsBuild*</varname> and
-     <varname>nativeBuildInputs</varname> would be added to the
-     <envar>PATH</envar>.
+     Currently, this means for native builds all dependencies are put on the <envar>PATH</envar>. But in the future that may not be the case for sake of matching cross: the platforms would be assumed to be unique for native and cross builds alike, so only the <varname>depsBuild*</varname> and <varname>nativeBuildInputs</varname> would be added to the <envar>PATH</envar>.
     </para>
    </footnote>
-   For each dependency <replaceable>dep</replaceable> of those dependencies,
-   <filename><replaceable>dep</replaceable>/bin</filename>, if present, is
-   added to the <envar>PATH</envar> environment variable.
+   For each dependency <replaceable>dep</replaceable> of those dependencies, <filename><replaceable>dep</replaceable>/bin</filename>, if present, is added to the <envar>PATH</envar> environment variable.
   </para>
 
   <para>
-   The dependency is propagated when it forces some of its other-transitive
-   (non-immediate) downstream dependencies to also take it on as an immediate
-   dependency. Nix itself already takes a package's transitive dependencies
-   into account, but this propagation ensures nixpkgs-specific infrastructure
-   like setup hooks (mentioned above) also are run as if the propagated
-   dependency.
+   The dependency is propagated when it forces some of its other-transitive (non-immediate) downstream dependencies to also take it on as an immediate dependency. Nix itself already takes a package's transitive dependencies into account, but this propagation ensures nixpkgs-specific infrastructure like setup hooks (mentioned above) also are run as if the propagated dependency.
   </para>
 
   <para>
-   It is important to note that dependencies are not necessarily propagated as
-   the same sort of dependency that they were before, but rather as the
-   corresponding sort so that the platform rules still line up. The exact rules
-   for dependency propagation can be given by assigning to each dependency two
-   integers based one how its host and target platforms are offset from the
-   depending derivation's platforms. Those offsets are given below in the
-   descriptions of each dependency list attribute. Algorithmically, we traverse
-   propagated inputs, accumulating every propagated dependency's propagated
-   dependencies and adjusting them to account for the "shift in perspective"
-   described by the current dependency's platform offsets. This results in sort
-   a transitive closure of the dependency relation, with the offsets being
-   approximately summed when two dependency links are combined. We also prune
-   transitive dependencies whose combined offsets go out-of-bounds, which can
-   be viewed as a filter over that transitive closure removing dependencies
-   that are blatantly absurd.
+   It is important to note that dependencies are not necessarily propagated as the same sort of dependency that they were before, but rather as the corresponding sort so that the platform rules still line up. The exact rules for dependency propagation can be given by assigning to each dependency two integers based one how its host and target platforms are offset from the depending derivation's platforms. Those offsets are given below in the descriptions of each dependency list attribute. Algorithmically, we traverse propagated inputs, accumulating every propagated dependency's propagated dependencies and adjusting them to account for the "shift in perspective" described by the current dependency's platform offsets. This results in sort a transitive closure of the dependency relation, with the offsets being approximately summed when two dependency links are combined. We also prune transitive dependencies whose combined offsets go out-of-bounds, which can be viewed as a filter over that transitive closure removing dependencies that are blatantly absurd.
   </para>
 
   <para>
-   We can define the process precisely with
-   <link xlink:href="https://en.wikipedia.org/wiki/Natural_deduction">Natural
-   Deduction</link> using the inference rules. This probably seems a bit
-   obtuse, but so is the bash code that actually implements it!
+   We can define the process precisely with <link xlink:href="https://en.wikipedia.org/wiki/Natural_deduction">Natural Deduction</link> using the inference rules. This probably seems a bit obtuse, but so is the bash code that actually implements it!
    <footnote xml:id="footnote-stdenv-find-inputs-location">
     <para>
-     The <function>findInputs</function> function, currently residing in
-     <filename>pkgs/stdenv/generic/setup.sh</filename>, implements the
-     propagation logic.
+     The <function>findInputs</function> function, currently residing in <filename>pkgs/stdenv/generic/setup.sh</filename>, implements the propagation logic.
     </para>
    </footnote>
-   They're confusing in very different ways so... hopefully if something
-   doesn't make sense in one presentation, it will in the other!
+   They're confusing in very different ways so... hopefully if something doesn't make sense in one presentation, it will in the other!
 <programlisting>
 let mapOffset(h, t, i) = i + (if i &lt;= 0 then h else t - 1)
 
@@ -335,50 +234,22 @@ propagated-dep(mapOffset(h0, t0, h1),
 propagated-dep(h, t, A, B)
 ----------------------------- Propagated dependencies count as dependencies
 dep(h, t, A, B)</programlisting>
-   Some explanation of this monstrosity is in order. In the common case, the
-   target offset of a dependency is the successor to the target offset:
-   <literal>t = h + 1</literal>. That means that:
+   Some explanation of this monstrosity is in order. In the common case, the target offset of a dependency is the successor to the target offset: <literal>t = h + 1</literal>. That means that:
 <programlisting>
 let f(h, t, i) = i + (if i &lt;= 0 then h else t - 1)
 let f(h, h + 1, i) = i + (if i &lt;= 0 then h else (h + 1) - 1)
 let f(h, h + 1, i) = i + (if i &lt;= 0 then h else h)
 let f(h, h + 1, i) = i + h
 </programlisting>
-   This is where "sum-like" comes in from above: We can just sum all of the
-   host offsets to get the host offset of the transitive dependency. The target
-   offset is the transitive dependency is simply the host offset + 1, just as
-   it was with the dependencies composed to make this transitive one; it can be
-   ignored as it doesn't add any new information.
+   This is where "sum-like" comes in from above: We can just sum all of the host offsets to get the host offset of the transitive dependency. The target offset is the transitive dependency is simply the host offset + 1, just as it was with the dependencies composed to make this transitive one; it can be ignored as it doesn't add any new information.
   </para>
 
   <para>
-   Because of the bounds checks, the uncommon cases are <literal>h =
-   t</literal> and <literal>h + 2 = t</literal>. In the former case, the
-   motivation for <function>mapOffset</function> is that since its host and
-   target platforms are the same, no transitive dependency of it should be able
-   to "discover" an offset greater than its reduced target offsets.
-   <function>mapOffset</function> effectively "squashes" all its transitive
-   dependencies' offsets so that none will ever be greater than the target
-   offset of the original <literal>h = t</literal> package. In the other case,
-   <literal>h + 1</literal> is skipped over between the host and target
-   offsets. Instead of squashing the offsets, we need to "rip" them apart so no
-   transitive dependencies' offset is that one.
+   Because of the bounds checks, the uncommon cases are <literal>h = t</literal> and <literal>h + 2 = t</literal>. In the former case, the motivation for <function>mapOffset</function> is that since its host and target platforms are the same, no transitive dependency of it should be able to "discover" an offset greater than its reduced target offsets. <function>mapOffset</function> effectively "squashes" all its transitive dependencies' offsets so that none will ever be greater than the target offset of the original <literal>h = t</literal> package. In the other case, <literal>h + 1</literal> is skipped over between the host and target offsets. Instead of squashing the offsets, we need to "rip" them apart so no transitive dependencies' offset is that one.
   </para>
 
   <para>
-   Overall, the unifying theme here is that propagation shouldn't be
-   introducing transitive dependencies involving platforms the depending
-   package is unaware of. [One can imagine the dependending package asking for
-   dependencies with the platforms it knows about; other platforms it doesn't
-   know how to ask for. The platform description in that scenario is a kind of
-   unforagable capability.] The offset bounds checking and definition of
-   <function>mapOffset</function> together ensure that this is the case.
-   Discovering a new offset is discovering a new platform, and since those
-   platforms weren't in the derivation "spec" of the needing package, they
-   cannot be relevant. From a capability perspective, we can imagine that the
-   host and target platforms of a package are the capabilities a package
-   requires, and the depending package must provide the capability to the
-   dependency.
+   Overall, the unifying theme here is that propagation shouldn't be introducing transitive dependencies involving platforms the depending package is unaware of. [One can imagine the dependending package asking for dependencies with the platforms it knows about; other platforms it doesn't know how to ask for. The platform description in that scenario is a kind of unforagable capability.] The offset bounds checking and definition of <function>mapOffset</function> together ensure that this is the case. Discovering a new offset is discovering a new platform, and since those platforms weren't in the derivation "spec" of the needing package, they cannot be relevant. From a capability perspective, we can imagine that the host and target platforms of a package are the capabilities a package requires, and the depending package must provide the capability to the dependency.
   </para>
 
   <variablelist>
@@ -389,23 +260,10 @@ let f(h, h + 1, i) = i + h
     </term>
     <listitem>
      <para>
-      A list of dependencies whose host and target platforms are the new
-      derivation's build platform. This means a <literal>-1</literal> host and
-      <literal>-1</literal> target offset from the new derivation's platforms.
-      These are programs and libraries used at build time that produce programs
-      and libraries also used at build time. If the dependency doesn't care
-      about the target platform (i.e. isn't a compiler or similar tool), put it
-      in <varname>nativeBuildInputs</varname> instead. The most common use of
-      this <literal>buildPackages.stdenv.cc</literal>, the default C compiler
-      for this role. That example crops up more than one might think in old
-      commonly used C libraries.
+      A list of dependencies whose host and target platforms are the new derivation's build platform. This means a <literal>-1</literal> host and <literal>-1</literal> target offset from the new derivation's platforms. These are programs and libraries used at build time that produce programs and libraries also used at build time. If the dependency doesn't care about the target platform (i.e. isn't a compiler or similar tool), put it in <varname>nativeBuildInputs</varname> instead. The most common use of this <literal>buildPackages.stdenv.cc</literal>, the default C compiler for this role. That example crops up more than one might think in old commonly used C libraries.
      </para>
      <para>
-      Since these packages are able to be run at build-time, they are always
-      added to the <envar>PATH</envar>, as described above. But since these
-      packages are only guaranteed to be able to run then, they shouldn't
-      persist as run-time dependencies. This isn't currently enforced, but
-      could be in the future.
+      Since these packages are able to be run at build-time, they are always added to the <envar>PATH</envar>, as described above. But since these packages are only guaranteed to be able to run then, they shouldn't persist as run-time dependencies. This isn't currently enforced, but could be in the future.
      </para>
     </listitem>
    </varlistentry>
@@ -415,24 +273,10 @@ let f(h, h + 1, i) = i + h
     </term>
     <listitem>
      <para>
-      A list of dependencies whose host platform is the new derivation's build
-      platform, and target platform is the new derivation's host platform. This
-      means a <literal>-1</literal> host offset and <literal>0</literal> target
-      offset from the new derivation's platforms. These are programs and
-      libraries used at build-time that, if they are a compiler or similar
-      tool, produce code to run at run-time—i.e. tools used to build the new
-      derivation. If the dependency doesn't care about the target platform
-      (i.e. isn't a compiler or similar tool), put it here, rather than in
-      <varname>depsBuildBuild</varname> or <varname>depsBuildTarget</varname>.
-      This could be called <varname>depsBuildHost</varname> but
-      <varname>nativeBuildInputs</varname> is used for historical continuity.
-     </para>
-     <para>
-      Since these packages are able to be run at build-time, they are added to
-      the <envar>PATH</envar>, as described above. But since these packages are
-      only guaranteed to be able to run then, they shouldn't persist as
-      run-time dependencies. This isn't currently enforced, but could be in the
-      future.
+      A list of dependencies whose host platform is the new derivation's build platform, and target platform is the new derivation's host platform. This means a <literal>-1</literal> host offset and <literal>0</literal> target offset from the new derivation's platforms. These are programs and libraries used at build-time that, if they are a compiler or similar tool, produce code to run at run-time—i.e. tools used to build the new derivation. If the dependency doesn't care about the target platform (i.e. isn't a compiler or similar tool), put it here, rather than in <varname>depsBuildBuild</varname> or <varname>depsBuildTarget</varname>. This could be called <varname>depsBuildHost</varname> but <varname>nativeBuildInputs</varname> is used for historical continuity.
+     </para>
+     <para>
+      Since these packages are able to be run at build-time, they are added to the <envar>PATH</envar>, as described above. But since these packages are only guaranteed to be able to run then, they shouldn't persist as run-time dependencies. This isn't currently enforced, but could be in the future.
      </para>
     </listitem>
    </varlistentry>
@@ -442,39 +286,13 @@ let f(h, h + 1, i) = i + h
     </term>
     <listitem>
      <para>
-      A list of dependencies whose host platform is the new derivation's build
-      platform, and target platform is the new derivation's target platform.
-      This means a <literal>-1</literal> host offset and <literal>1</literal>
-      target offset from the new derivation's platforms. These are programs
-      used at build time that produce code to run with code produced by the
-      depending package. Most commonly, these are tools used to build the
-      runtime or standard library that the currently-being-built compiler will
-      inject into any code it compiles. In many cases, the
-      currently-being-built-compiler is itself employed for that task, but when
-      that compiler won't run (i.e. its build and host platform differ) this is
-      not possible. Other times, the compiler relies on some other tool, like
-      binutils, that is always built separately so that the dependency is
-      unconditional.
-     </para>
-     <para>
-      This is a somewhat confusing concept to wrap one’s head around, and for
-      good reason. As the only dependency type where the platform offsets are
-      not adjacent integers, it requires thinking of a bootstrapping stage
-      <emphasis>two</emphasis> away from the current one. It and its use-case
-      go hand in hand and are both considered poor form: try to not need this
-      sort of dependency, and try to avoid building standard libraries and
-      runtimes in the same derivation as the compiler produces code using them.
-      Instead strive to build those like a normal library, using the
-      newly-built compiler just as a normal library would. In short, do not use
-      this attribute unless you are packaging a compiler and are sure it is
-      needed.
-     </para>
-     <para>
-      Since these packages are able to run at build time, they are added to the
-      <envar>PATH</envar>, as described above. But since these packages are
-      only guaranteed to be able to run then, they shouldn't persist as
-      run-time dependencies. This isn't currently enforced, but could be in the
-      future.
+      A list of dependencies whose host platform is the new derivation's build platform, and target platform is the new derivation's target platform. This means a <literal>-1</literal> host offset and <literal>1</literal> target offset from the new derivation's platforms. These are programs used at build time that produce code to run with code produced by the depending package. Most commonly, these are tools used to build the runtime or standard library that the currently-being-built compiler will inject into any code it compiles. In many cases, the currently-being-built-compiler is itself employed for that task, but when that compiler won't run (i.e. its build and host platform differ) this is not possible. Other times, the compiler relies on some other tool, like binutils, that is always built separately so that the dependency is unconditional.
+     </para>
+     <para>
+      This is a somewhat confusing concept to wrap one’s head around, and for good reason. As the only dependency type where the platform offsets are not adjacent integers, it requires thinking of a bootstrapping stage <emphasis>two</emphasis> away from the current one. It and its use-case go hand in hand and are both considered poor form: try to not need this sort of dependency, and try to avoid building standard libraries and runtimes in the same derivation as the compiler produces code using them. Instead strive to build those like a normal library, using the newly-built compiler just as a normal library would. In short, do not use this attribute unless you are packaging a compiler and are sure it is needed.
+     </para>
+     <para>
+      Since these packages are able to run at build time, they are added to the <envar>PATH</envar>, as described above. But since these packages are only guaranteed to be able to run then, they shouldn't persist as run-time dependencies. This isn't currently enforced, but could be in the future.
      </para>
     </listitem>
    </varlistentry>
@@ -484,16 +302,7 @@ let f(h, h + 1, i) = i + h
     </term>
     <listitem>
      <para>
-      A list of dependencies whose host and target platforms match the new
-      derivation's host platform. This means a <literal>0</literal> host offset
-      and <literal>0</literal> target offset from the new derivation's host
-      platform. These are packages used at run-time to generate code also used
-      at run-time. In practice, this would usually be tools used by compilers
-      for macros or a metaprogramming system, or libraries used by the macros
-      or metaprogramming code itself. It's always preferable to use a
-      <varname>depsBuildBuild</varname> dependency in the derivation being
-      built over a <varname>depsHostHost</varname> on the tool doing the
-      building for this purpose.
+      A list of dependencies whose host and target platforms match the new derivation's host platform. This means a <literal>0</literal> host offset and <literal>0</literal> target offset from the new derivation's host platform. These are packages used at run-time to generate code also used at run-time. In practice, this would usually be tools used by compilers for macros or a metaprogramming system, or libraries used by the macros or metaprogramming code itself. It's always preferable to use a <varname>depsBuildBuild</varname> dependency in the derivation being built over a <varname>depsHostHost</varname> on the tool doing the building for this purpose.
      </para>
     </listitem>
    </varlistentry>
@@ -503,21 +312,10 @@ let f(h, h + 1, i) = i + h
     </term>
     <listitem>
      <para>
-      A list of dependencies whose host platform and target platform match the
-      new derivation's. This means a <literal>0</literal> host offset and a
-      <literal>1</literal> target offset from the new derivation's host
-      platform. This would be called <varname>depsHostTarget</varname> but for
-      historical continuity. If the dependency doesn't care about the target
-      platform (i.e. isn't a compiler or similar tool), put it here, rather
-      than in <varname>depsBuildBuild</varname>.
+      A list of dependencies whose host platform and target platform match the new derivation's. This means a <literal>0</literal> host offset and a <literal>1</literal> target offset from the new derivation's host platform. This would be called <varname>depsHostTarget</varname> but for historical continuity. If the dependency doesn't care about the target platform (i.e. isn't a compiler or similar tool), put it here, rather than in <varname>depsBuildBuild</varname>.
      </para>
      <para>
-      These are often programs and libraries used by the new derivation at
-      <emphasis>run</emphasis>-time, but that isn't always the case. For
-      example, the machine code in a statically-linked library is only used at
-      run-time, but the derivation containing the library is only needed at
-      build-time. Even in the dynamic case, the library may also be needed at
-      build-time to appease the linker.
+      These are often programs and libraries used by the new derivation at <emphasis>run</emphasis>-time, but that isn't always the case. For example, the machine code in a statically-linked library is only used at run-time, but the derivation containing the library is only needed at build-time. Even in the dynamic case, the library may also be needed at build-time to appease the linker.
      </para>
     </listitem>
    </varlistentry>
@@ -527,14 +325,7 @@ let f(h, h + 1, i) = i + h
     </term>
     <listitem>
      <para>
-      A list of dependencies whose host platform matches the new derivation's
-      target platform. This means a <literal>1</literal> offset from the new
-      derivation's platforms. These are packages that run on the target
-      platform, e.g. the standard library or run-time deps of standard library
-      that a compiler insists on knowing about. It's poor form in almost all
-      cases for a package to depend on another from a future stage [future
-      stage corresponding to positive offset]. Do not use this attribute unless
-      you are packaging a compiler and are sure it is needed.
+      A list of dependencies whose host platform matches the new derivation's target platform. This means a <literal>1</literal> offset from the new derivation's platforms. These are packages that run on the target platform, e.g. the standard library or run-time deps of standard library that a compiler insists on knowing about. It's poor form in almost all cases for a package to depend on another from a future stage [future stage corresponding to positive offset]. Do not use this attribute unless you are packaging a compiler and are sure it is needed.
      </para>
     </listitem>
    </varlistentry>
@@ -544,9 +335,7 @@ let f(h, h + 1, i) = i + h
     </term>
     <listitem>
      <para>
-      The propagated equivalent of <varname>depsBuildBuild</varname>. This
-      perhaps never ought to be used, but it is included for consistency [see
-      below for the others].
+      The propagated equivalent of <varname>depsBuildBuild</varname>. This perhaps never ought to be used, but it is included for consistency [see below for the others].
      </para>
     </listitem>
    </varlistentry>
@@ -556,18 +345,7 @@ let f(h, h + 1, i) = i + h
     </term>
     <listitem>
      <para>
-      The propagated equivalent of <varname>nativeBuildInputs</varname>. This
-      would be called <varname>depsBuildHostPropagated</varname> but for
-      historical continuity. For example, if package <varname>Y</varname> has
-      <literal>propagatedNativeBuildInputs = [X]</literal>, and package
-      <varname>Z</varname> has <literal>buildInputs = [Y]</literal>, then
-      package <varname>Z</varname> will be built as if it included package
-      <varname>X</varname> in its <varname>nativeBuildInputs</varname>. If
-      instead, package <varname>Z</varname> has <literal>nativeBuildInputs =
-      [Y]</literal>, then <varname>Z</varname> will be built as if it included
-      <varname>X</varname> in the <varname>depsBuildBuild</varname> of package
-      <varname>Z</varname>, because of the sum of the two <literal>-1</literal>
-      host offsets.
+      The propagated equivalent of <varname>nativeBuildInputs</varname>. This would be called <varname>depsBuildHostPropagated</varname> but for historical continuity. For example, if package <varname>Y</varname> has <literal>propagatedNativeBuildInputs = [X]</literal>, and package <varname>Z</varname> has <literal>buildInputs = [Y]</literal>, then package <varname>Z</varname> will be built as if it included package <varname>X</varname> in its <varname>nativeBuildInputs</varname>. If instead, package <varname>Z</varname> has <literal>nativeBuildInputs = [Y]</literal>, then <varname>Z</varname> will be built as if it included <varname>X</varname> in the <varname>depsBuildBuild</varname> of package <varname>Z</varname>, because of the sum of the two <literal>-1</literal> host offsets.
      </para>
     </listitem>
    </varlistentry>
@@ -577,8 +355,7 @@ let f(h, h + 1, i) = i + h
     </term>
     <listitem>
      <para>
-      The propagated equivalent of <varname>depsBuildTarget</varname>. This is
-      prefixed for the same reason of alerting potential users.
+      The propagated equivalent of <varname>depsBuildTarget</varname>. This is prefixed for the same reason of alerting potential users.
      </para>
     </listitem>
    </varlistentry>
@@ -598,9 +375,7 @@ let f(h, h + 1, i) = i + h
     </term>
     <listitem>
      <para>
-      The propagated equivalent of <varname>buildInputs</varname>. This would
-      be called <varname>depsHostTargetPropagated</varname> but for historical
-      continuity.
+      The propagated equivalent of <varname>buildInputs</varname>. This would be called <varname>depsHostTargetPropagated</varname> but for historical continuity.
      </para>
     </listitem>
    </varlistentry>
@@ -610,8 +385,7 @@ let f(h, h + 1, i) = i + h
     </term>
     <listitem>
      <para>
-      The propagated equivalent of <varname>depsTargetTarget</varname>. This is
-      prefixed for the same reason of alerting potential users.
+      The propagated equivalent of <varname>depsTargetTarget</varname>. This is prefixed for the same reason of alerting potential users.
      </para>
     </listitem>
    </varlistentry>
@@ -628,15 +402,7 @@ let f(h, h + 1, i) = i + h
     </term>
     <listitem>
      <para>
-      A natural number indicating how much information to log. If set to 1 or
-      higher, <literal>stdenv</literal> will print moderate debugging
-      information during the build. In particular, the <command>gcc</command>
-      and <command>ld</command> wrapper scripts will print out the complete
-      command line passed to the wrapped tools. If set to 6 or higher, the
-      <literal>stdenv</literal> setup script will be run with <literal>set
-      -x</literal> tracing. If set to 7 or higher, the <command>gcc</command>
-      and <command>ld</command> wrapper scripts will also be run with
-      <literal>set -x</literal> tracing.
+      A natural number indicating how much information to log. If set to 1 or higher, <literal>stdenv</literal> will print moderate debugging information during the build. In particular, the <command>gcc</command> and <command>ld</command> wrapper scripts will print out the complete command line passed to the wrapped tools. If set to 6 or higher, the <literal>stdenv</literal> setup script will be run with <literal>set -x</literal> tracing. If set to 7 or higher, the <command>gcc</command> and <command>ld</command> wrapper scripts will also be run with <literal>set -x</literal> tracing.
      </para>
     </listitem>
    </varlistentry>
@@ -650,15 +416,10 @@ let f(h, h + 1, i) = i + h
     </term>
     <listitem>
      <para>
-      If set to <literal>true</literal>, <literal>stdenv</literal> will pass
-      specific flags to <literal>make</literal> and other build tools to enable
-      parallel building with up to <literal>build-cores</literal> workers.
+      If set to <literal>true</literal>, <literal>stdenv</literal> will pass specific flags to <literal>make</literal> and other build tools to enable parallel building with up to <literal>build-cores</literal> workers.
      </para>
      <para>
-      Unless set to <literal>false</literal>, some build systems with good
-      support for parallel building including <literal>cmake</literal>,
-      <literal>meson</literal>, and <literal>qmake</literal> will set it to
-      <literal>true</literal>.
+      Unless set to <literal>false</literal>, some build systems with good support for parallel building including <literal>cmake</literal>, <literal>meson</literal>, and <literal>qmake</literal> will set it to <literal>true</literal>.
      </para>
     </listitem>
    </varlistentry>
@@ -672,8 +433,7 @@ let f(h, h + 1, i) = i + h
     </term>
     <listitem>
      <para>
-      This is an attribute set which can be filled with arbitrary values. For
-      example:
+      This is an attribute set which can be filled with arbitrary values. For example:
 <programlisting>
 passthru = {
   foo = "bar";
@@ -685,17 +445,7 @@ passthru = {
 </programlisting>
      </para>
      <para>
-      Values inside it are not passed to the builder, so you can change them
-      without triggering a rebuild. However, they can be accessed outside of a
-      derivation directly, as if they were set inside a derivation itself, e.g.
-      <literal>hello.baz.value1</literal>. We don't specify any usage or schema
-      of <literal>passthru</literal> - it is meant for values that would be
-      useful outside the derivation in other parts of a Nix expression (e.g. in
-      other derivations). An example would be to convey some specific
-      dependency of your derivation which contains a program with plugins
-      support. Later, others who make derivations with plugins can use
-      passed-through dependency to ensure that their plugin would be
-      binary-compatible with built program.
+      Values inside it are not passed to the builder, so you can change them without triggering a rebuild. However, they can be accessed outside of a derivation directly, as if they were set inside a derivation itself, e.g. <literal>hello.baz.value1</literal>. We don't specify any usage or schema of <literal>passthru</literal> - it is meant for values that would be useful outside the derivation in other parts of a Nix expression (e.g. in other derivations). An example would be to convey some specific dependency of your derivation which contains a program with plugins support. Later, others who make derivations with plugins can use passed-through dependency to ensure that their plugin would be binary-compatible with built program.
      </para>
     </listitem>
    </varlistentry>
@@ -705,9 +455,7 @@ passthru = {
     </term>
     <listitem>
      <para>
-      A script to be run by <filename>maintainers/scripts/update.nix</filename>
-      when the package is matched. It needs to be an executable file, either on
-      the file system:
+      A script to be run by <filename>maintainers/scripts/update.nix</filename> when the package is matched. It needs to be an executable file, either on the file system:
 <programlisting>
 passthru.updateScript = ./update.sh;
 </programlisting>
@@ -723,21 +471,16 @@ passthru.updateScript = writeScript "update-zoom-us" ''
   update-source-version zoom-us "$version"
 '';
 </programlisting>
-      The attribute can also contain a list, a script followed by arguments to
-      be passed to it:
+      The attribute can also contain a list, a script followed by arguments to be passed to it:
 <programlisting>
 passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ];
 </programlisting>
      </para>
      <para>
-      The script will be usually run from the root of the Nixpkgs repository
-      but you should not rely on that. Also note that the update scripts will
-      be run in parallel by default; you should avoid running <command>git
-      commit</command> or any other commands that cannot handle that.
+      The script will be usually run from the root of the Nixpkgs repository but you should not rely on that. Also note that the update scripts will be run in parallel by default; you should avoid running <command>git commit</command> or any other commands that cannot handle that.
      </para>
      <para>
-      For information about how to run the updates, execute <command>nix-shell
-      maintainers/scripts/update.nix</command>.
+      For information about how to run the updates, execute <command>nix-shell maintainers/scripts/update.nix</command>.
      </para>
     </listitem>
    </varlistentry>
@@ -747,33 +490,18 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ]
   <title>Phases</title>
 
   <para>
-   The generic builder has a number of <emphasis>phases</emphasis>. Package
-   builds are split into phases to make it easier to override specific parts of
-   the build (e.g., unpacking the sources or installing the binaries).
-   Furthermore, it allows a nicer presentation of build logs in the Nix build
-   farm.
+   The generic builder has a number of <emphasis>phases</emphasis>. Package builds are split into phases to make it easier to override specific parts of the build (e.g., unpacking the sources or installing the binaries). Furthermore, it allows a nicer presentation of build logs in the Nix build farm.
   </para>
 
   <para>
-   Each phase can be overridden in its entirety either by setting the
-   environment variable <varname><replaceable>name</replaceable>Phase</varname>
-   to a string containing some shell commands to be executed, or by redefining
-   the shell function <varname><replaceable>name</replaceable>Phase</varname>.
-   The former is convenient to override a phase from the derivation, while the
-   latter is convenient from a build script. However, typically one only wants
-   to <emphasis>add</emphasis> some commands to a phase, e.g. by defining
-   <literal>postInstall</literal> or <literal>preFixup</literal>, as skipping
-   some of the default actions may have unexpected consequences. The default
-   script for each phase is defined in the file
-   <filename>pkgs/stdenv/generic/setup.sh</filename>.
+   Each phase can be overridden in its entirety either by setting the environment variable <varname><replaceable>name</replaceable>Phase</varname> to a string containing some shell commands to be executed, or by redefining the shell function <varname><replaceable>name</replaceable>Phase</varname>. The former is convenient to override a phase from the derivation, while the latter is convenient from a build script. However, typically one only wants to <emphasis>add</emphasis> some commands to a phase, e.g. by defining <literal>postInstall</literal> or <literal>preFixup</literal>, as skipping some of the default actions may have unexpected consequences. The default script for each phase is defined in the file <filename>pkgs/stdenv/generic/setup.sh</filename>.
   </para>
 
   <section xml:id="ssec-controlling-phases">
    <title>Controlling phases</title>
 
    <para>
-    There are a number of variables that control what phases are executed and
-    in what order:
+    There are a number of variables that control what phases are executed and in what order:
     <variablelist>
      <title>Variables affecting phase control</title>
      <varlistentry>
@@ -782,19 +510,10 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ]
       </term>
       <listitem>
        <para>
-        Specifies the phases. You can change the order in which phases are
-        executed, or add new phases, by setting this variable. If it’s not
-        set, the default value is used, which is <literal>$prePhases
-        unpackPhase patchPhase $preConfigurePhases configurePhase
-        $preBuildPhases buildPhase checkPhase $preInstallPhases installPhase
-        fixupPhase installCheckPhase $preDistPhases distPhase
-        $postPhases</literal>.
+        Specifies the phases. You can change the order in which phases are executed, or add new phases, by setting this variable. If it’s not set, the default value is used, which is <literal>$prePhases unpackPhase patchPhase $preConfigurePhases configurePhase $preBuildPhases buildPhase checkPhase $preInstallPhases installPhase fixupPhase installCheckPhase $preDistPhases distPhase $postPhases</literal>.
        </para>
        <para>
-        Usually, if you just want to add a few phases, it’s more convenient
-        to set one of the variables below (such as
-        <varname>preInstallPhases</varname>), as you then don’t specify all
-        the normal phases.
+        Usually, if you just want to add a few phases, it’s more convenient to set one of the variables below (such as <varname>preInstallPhases</varname>), as you then don’t specify all the normal phases.
        </para>
       </listitem>
      </varlistentry>
@@ -876,11 +595,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ]
    <title>The unpack phase</title>
 
    <para>
-    The unpack phase is responsible for unpacking the source code of the
-    package. The default implementation of <function>unpackPhase</function>
-    unpacks the source files listed in the <envar>src</envar> environment
-    variable to the current directory. It supports the following files by
-    default:
+    The unpack phase is responsible for unpacking the source code of the package. The default implementation of <function>unpackPhase</function> unpacks the source files listed in the <envar>src</envar> environment variable to the current directory. It supports the following files by default:
     <variablelist>
      <varlistentry>
       <term>
@@ -888,13 +603,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ]
       </term>
       <listitem>
        <para>
-        These can optionally be compressed using <command>gzip</command>
-        (<filename>.tar.gz</filename>, <filename>.tgz</filename> or
-        <filename>.tar.Z</filename>), <command>bzip2</command>
-        (<filename>.tar.bz2</filename>, <filename>.tbz2</filename> or
-        <filename>.tbz</filename>) or <command>xz</command>
-        (<filename>.tar.xz</filename>, <filename>.tar.lzma</filename> or
-        <filename>.txz</filename>).
+        These can optionally be compressed using <command>gzip</command> (<filename>.tar.gz</filename>, <filename>.tgz</filename> or <filename>.tar.Z</filename>), <command>bzip2</command> (<filename>.tar.bz2</filename>, <filename>.tbz2</filename> or <filename>.tbz</filename>) or <command>xz</command> (<filename>.tar.xz</filename>, <filename>.tar.lzma</filename> or <filename>.txz</filename>).
        </para>
       </listitem>
      </varlistentry>
@@ -904,9 +613,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ]
       </term>
       <listitem>
        <para>
-        Zip files are unpacked using <command>unzip</command>. However,
-        <command>unzip</command> is not in the standard environment, so you
-        should add it to <varname>nativeBuildInputs</varname> yourself.
+        Zip files are unpacked using <command>unzip</command>. However, <command>unzip</command> is not in the standard environment, so you should add it to <varname>nativeBuildInputs</varname> yourself.
        </para>
       </listitem>
      </varlistentry>
@@ -916,16 +623,12 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ]
       </term>
       <listitem>
        <para>
-        These are simply copied to the current directory. The hash part of the
-        file name is stripped, e.g.
-        <filename>/nix/store/1wydxgby13cz...-my-sources</filename> would be
-        copied to <filename>my-sources</filename>.
+        These are simply copied to the current directory. The hash part of the file name is stripped, e.g. <filename>/nix/store/1wydxgby13cz...-my-sources</filename> would be copied to <filename>my-sources</filename>.
        </para>
       </listitem>
      </varlistentry>
     </variablelist>
-    Additional file types can be supported by setting the
-    <varname>unpackCmd</varname> variable (see below).
+    Additional file types can be supported by setting the <varname>unpackCmd</varname> variable (see below).
    </para>
 
    <para></para>
@@ -938,8 +641,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ]
      </term>
      <listitem>
       <para>
-       The list of source files or directories to be unpacked or copied. One of
-       these must be set.
+       The list of source files or directories to be unpacked or copied. One of these must be set.
       </para>
      </listitem>
     </varlistentry>
@@ -949,10 +651,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ]
      </term>
      <listitem>
       <para>
-       After running <function>unpackPhase</function>, the generic builder
-       changes the current directory to the directory created by unpacking the
-       sources. If there are multiple source directories, you should set
-       <varname>sourceRoot</varname> to the name of the intended directory.
+       After running <function>unpackPhase</function>, the generic builder changes the current directory to the directory created by unpacking the sources. If there are multiple source directories, you should set <varname>sourceRoot</varname> to the name of the intended directory.
       </para>
      </listitem>
     </varlistentry>
@@ -962,10 +661,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ]
      </term>
      <listitem>
       <para>
-       Alternatively to setting <varname>sourceRoot</varname>, you can set
-       <varname>setSourceRoot</varname> to a shell command to be evaluated by
-       the unpack phase after the sources have been unpacked. This command must
-       set <varname>sourceRoot</varname>.
+       Alternatively to setting <varname>sourceRoot</varname>, you can set <varname>setSourceRoot</varname> to a shell command to be evaluated by the unpack phase after the sources have been unpacked. This command must set <varname>sourceRoot</varname>.
       </para>
      </listitem>
     </varlistentry>
@@ -1005,10 +701,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ]
      </term>
      <listitem>
       <para>
-       If set to <literal>1</literal>, the unpacked sources are
-       <emphasis>not</emphasis> made writable. By default, they are made
-       writable to prevent problems with read-only sources. For example, copied
-       store directories would be read-only without this.
+       If set to <literal>1</literal>, the unpacked sources are <emphasis>not</emphasis> made writable. By default, they are made writable to prevent problems with read-only sources. For example, copied store directories would be read-only without this.
       </para>
      </listitem>
     </varlistentry>
@@ -1018,9 +711,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ]
      </term>
      <listitem>
       <para>
-       The unpack phase evaluates the string <literal>$unpackCmd</literal> for
-       any unrecognised file. The path to the current source file is contained
-       in the <varname>curSrc</varname> variable.
+       The unpack phase evaluates the string <literal>$unpackCmd</literal> for any unrecognised file. The path to the current source file is contained in the <varname>curSrc</varname> variable.
       </para>
      </listitem>
     </varlistentry>
@@ -1031,8 +722,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ]
    <title>The patch phase</title>
 
    <para>
-    The patch phase applies the list of patches defined in the
-    <varname>patches</varname> variable.
+    The patch phase applies the list of patches defined in the <varname>patches</varname> variable.
    </para>
 
    <variablelist>
@@ -1043,11 +733,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ]
      </term>
      <listitem>
       <para>
-       The list of patches. They must be in the format accepted by the
-       <command>patch</command> command, and may optionally be compressed using
-       <command>gzip</command> (<filename>.gz</filename>),
-       <command>bzip2</command> (<filename>.bz2</filename>) or
-       <command>xz</command> (<filename>.xz</filename>).
+       The list of patches. They must be in the format accepted by the <command>patch</command> command, and may optionally be compressed using <command>gzip</command> (<filename>.gz</filename>), <command>bzip2</command> (<filename>.bz2</filename>) or <command>xz</command> (<filename>.xz</filename>).
       </para>
      </listitem>
     </varlistentry>
@@ -1057,9 +743,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ]
      </term>
      <listitem>
       <para>
-       Flags to be passed to <command>patch</command>. If not set, the argument
-       <option>-p1</option> is used, which causes the leading directory
-       component to be stripped from the file names in each patch.
+       Flags to be passed to <command>patch</command>. If not set, the argument <option>-p1</option> is used, which causes the leading directory component to be stripped from the file names in each patch.
       </para>
      </listitem>
     </varlistentry>
@@ -1090,9 +774,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ]
    <title>The configure phase</title>
 
    <para>
-    The configure phase prepares the source tree for building. The default
-    <function>configurePhase</function> runs <filename>./configure</filename>
-    (typically an Autoconf-generated script) if it exists.
+    The configure phase prepares the source tree for building. The default <function>configurePhase</function> runs <filename>./configure</filename> (typically an Autoconf-generated script) if it exists.
    </para>
 
    <variablelist>
@@ -1103,10 +785,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ]
      </term>
      <listitem>
       <para>
-       The name of the configure script. It defaults to
-       <filename>./configure</filename> if it exists; otherwise, the configure
-       phase is skipped. This can actually be a command (like <literal>perl
-       ./Configure.pl</literal>).
+       The name of the configure script. It defaults to <filename>./configure</filename> if it exists; otherwise, the configure phase is skipped. This can actually be a command (like <literal>perl ./Configure.pl</literal>).
       </para>
      </listitem>
     </varlistentry>
@@ -1116,8 +795,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ]
      </term>
      <listitem>
       <para>
-       A list of strings passed as additional arguments to the configure
-       script.
+       A list of strings passed as additional arguments to the configure script.
       </para>
      </listitem>
     </varlistentry>
@@ -1137,9 +815,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ]
      </term>
      <listitem>
       <para>
-       A shell array containing additional arguments passed to the configure
-       script. You must use this instead of <varname>configureFlags</varname>
-       if the arguments contain spaces.
+       A shell array containing additional arguments passed to the configure script. You must use this instead of <varname>configureFlags</varname> if the arguments contain spaces.
       </para>
      </listitem>
     </varlistentry>
@@ -1149,8 +825,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ]
      </term>
      <listitem>
       <para>
-       By default, the flag <literal>--prefix=$prefix</literal> is added to the
-       configure flags. If this is undesirable, set this variable to true.
+       By default, the flag <literal>--prefix=$prefix</literal> is added to the configure flags. If this is undesirable, set this variable to true.
       </para>
      </listitem>
     </varlistentry>
@@ -1160,9 +835,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ]
      </term>
      <listitem>
       <para>
-       The prefix under which the package must be installed, passed via the
-       <option>--prefix</option> option to the configure script. It defaults to
-       <option>$out</option>.
+       The prefix under which the package must be installed, passed via the <option>--prefix</option> option to the configure script. It defaults to <option>$out</option>.
       </para>
      </listitem>
     </varlistentry>
@@ -1172,8 +845,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ]
      </term>
      <listitem>
       <para>
-       The key to use when specifying the prefix. By default, this is set to
-       <option>--prefix=</option> as that is used by the majority of packages.
+       The key to use when specifying the prefix. By default, this is set to <option>--prefix=</option> as that is used by the majority of packages.
       </para>
      </listitem>
     </varlistentry>
@@ -1183,9 +855,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ]
      </term>
      <listitem>
       <para>
-       By default, the flag <literal>--disable-dependency-tracking</literal> is
-       added to the configure flags to speed up Automake-based builds. If this
-       is undesirable, set this variable to true.
+       By default, the flag <literal>--disable-dependency-tracking</literal> is added to the configure flags to speed up Automake-based builds. If this is undesirable, set this variable to true.
       </para>
      </listitem>
     </varlistentry>
@@ -1195,15 +865,10 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ]
      </term>
      <listitem>
       <para>
-       By default, the configure phase applies some special hackery to all
-       files called <filename>ltmain.sh</filename> before running the configure
-       script in order to improve the purity of Libtool-based packages
+       By default, the configure phase applies some special hackery to all files called <filename>ltmain.sh</filename> before running the configure script in order to improve the purity of Libtool-based packages
        <footnote xml:id="footnote-stdenv-sys-lib-search-path">
         <para>
-         It clears the
-         <varname>sys_lib_<replaceable>*</replaceable>search_path</varname>
-         variables in the Libtool script to prevent Libtool from using
-         libraries in <filename>/usr/lib</filename> and such.
+         It clears the <varname>sys_lib_<replaceable>*</replaceable>search_path</varname> variables in the Libtool script to prevent Libtool from using libraries in <filename>/usr/lib</filename> and such.
         </para>
        </footnote>
        . If this is undesirable, set this variable to true.
@@ -1216,9 +881,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ]
      </term>
      <listitem>
       <para>
-       By default, when the configure script has
-       <option>--enable-static</option>, the option
-       <option>--disable-static</option> is added to the configure flags.
+       By default, when the configure script has <option>--enable-static</option>, the option <option>--disable-static</option> is added to the configure flags.
       </para>
       <para>
        If this is undesirable, set this variable to true.
@@ -1231,16 +894,10 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ]
      </term>
      <listitem>
       <para>
-       By default, when cross compiling, the configure script has
-       <option>--build=...</option> and <option>--host=...</option> passed.
-       Packages can instead pass <literal>[ "build" "host" "target" ]</literal>
-       or a subset to control exactly which platform flags are passed.
-       Compilers and other tools can use this to also pass the target platform.
+       By default, when cross compiling, the configure script has <option>--build=...</option> and <option>--host=...</option> passed. Packages can instead pass <literal>[ "build" "host" "target" ]</literal> or a subset to control exactly which platform flags are passed. Compilers and other tools can use this to also pass the target platform.
        <footnote xml:id="footnote-stdenv-build-time-guessing-impurity">
         <para>
-         Eventually these will be passed building natively as well, to improve
-         determinism: build-time guessing, as is done today, is a risk of
-         impurity.
+         Eventually these will be passed building natively as well, to improve determinism: build-time guessing, as is done today, is a risk of impurity.
         </para>
        </footnote>
       </para>
@@ -1273,12 +930,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ]
    <title>The build phase</title>
 
    <para>
-    The build phase is responsible for actually building the package (e.g.
-    compiling it). The default <function>buildPhase</function> simply calls
-    <command>make</command> if a file named <filename>Makefile</filename>,
-    <filename>makefile</filename> or <filename>GNUmakefile</filename> exists in
-    the current directory (or the <varname>makefile</varname> is explicitly
-    set); otherwise it does nothing.
+    The build phase is responsible for actually building the package (e.g. compiling it). The default <function>buildPhase</function> simply calls <command>make</command> if a file named <filename>Makefile</filename>, <filename>makefile</filename> or <filename>GNUmakefile</filename> exists in the current directory (or the <varname>makefile</varname> is explicitly set); otherwise it does nothing.
    </para>
 
    <variablelist>
@@ -1309,17 +961,13 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ]
      </term>
      <listitem>
       <para>
-       A list of strings passed as additional flags to <command>make</command>.
-       These flags are also used by the default install and check phase. For
-       setting make flags specific to the build phase, use
-       <varname>buildFlags</varname> (see below).
+       A list of strings passed as additional flags to <command>make</command>. These flags are also used by the default install and check phase. For setting make flags specific to the build phase, use <varname>buildFlags</varname> (see below).
 <programlisting>
 makeFlags = [ "PREFIX=$(out)" ];
 </programlisting>
        <note>
         <para>
-         The flags are quoted in bash, but environment variables can be
-         specified by using the make syntax.
+         The flags are quoted in bash, but environment variables can be specified by using the make syntax.
         </para>
        </note>
       </para>
@@ -1331,18 +979,13 @@ makeFlags = [ "PREFIX=$(out)" ];
      </term>
      <listitem>
       <para>
-       A shell array containing additional arguments passed to
-       <command>make</command>. You must use this instead of
-       <varname>makeFlags</varname> if the arguments contain spaces, e.g.
+       A shell array containing additional arguments passed to <command>make</command>. You must use this instead of <varname>makeFlags</varname> if the arguments contain spaces, e.g.
 <programlisting>
 preBuild = ''
   makeFlagsArray+=(CFLAGS="-O0 -g" LDFLAGS="-lfoo -lbar")
 '';
 </programlisting>
-       Note that shell arrays cannot be passed through environment variables,
-       so you cannot set <varname>makeFlagsArray</varname> in a derivation
-       attribute (because those are passed through environment variables): you
-       have to define them in shell code.
+       Note that shell arrays cannot be passed through environment variables, so you cannot set <varname>makeFlagsArray</varname> in a derivation attribute (because those are passed through environment variables): you have to define them in shell code.
       </para>
      </listitem>
     </varlistentry>
@@ -1352,9 +995,7 @@ preBuild = ''
      </term>
      <listitem>
       <para>
-       A list of strings passed as additional flags to <command>make</command>.
-       Like <varname>makeFlags</varname> and <varname>makeFlagsArray</varname>,
-       but only used by the build phase.
+       A list of strings passed as additional flags to <command>make</command>. Like <varname>makeFlags</varname> and <varname>makeFlagsArray</varname>, but only used by the build phase.
       </para>
      </listitem>
     </varlistentry>
@@ -1381,14 +1022,11 @@ preBuild = ''
    </variablelist>
 
    <para>
-    You can set flags for <command>make</command> through the
-    <varname>makeFlags</varname> variable.
+    You can set flags for <command>make</command> through the <varname>makeFlags</varname> variable.
    </para>
 
    <para>
-    Before and after running <command>make</command>, the hooks
-    <varname>preBuild</varname> and <varname>postBuild</varname> are called,
-    respectively.
+    Before and after running <command>make</command>, the hooks <varname>preBuild</varname> and <varname>postBuild</varname> are called, respectively.
    </para>
   </section>
 
@@ -1396,10 +1034,7 @@ preBuild = ''
    <title>The check phase</title>
 
    <para>
-    The check phase checks whether the package was built correctly by running
-    its test suite. The default <function>checkPhase</function> calls
-    <command>make check</command>, but only if the <varname>doCheck</varname>
-    variable is enabled.
+    The check phase checks whether the package was built correctly by running its test suite. The default <function>checkPhase</function> calls <command>make check</command>, but only if the <varname>doCheck</varname> variable is enabled.
    </para>
 
    <variablelist>
@@ -1410,14 +1045,9 @@ preBuild = ''
      </term>
      <listitem>
       <para>
-       Controls whether the check phase is executed. By default it is skipped,
-       but if <varname>doCheck</varname> is set to true, the check phase is
-       usually executed. Thus you should set
+       Controls whether the check phase is executed. By default it is skipped, but if <varname>doCheck</varname> is set to true, the check phase is usually executed. Thus you should set
 <programlisting>doCheck = true;</programlisting>
-       in the derivation to enable checks. The exception is cross compilation.
-       Cross compiled builds never run tests, no matter how
-       <varname>doCheck</varname> is set, as the newly-built program won't run
-       on the platform used to build it.
+       in the derivation to enable checks. The exception is cross compilation. Cross compiled builds never run tests, no matter how <varname>doCheck</varname> is set, as the newly-built program won't run on the platform used to build it.
       </para>
      </listitem>
     </varlistentry>
@@ -1437,8 +1067,7 @@ preBuild = ''
      </term>
      <listitem>
       <para>
-       The make target that runs the tests. Defaults to
-       <literal>check</literal>.
+       The make target that runs the tests. Defaults to <literal>check</literal>.
       </para>
      </listitem>
     </varlistentry>
@@ -1448,9 +1077,7 @@ preBuild = ''
      </term>
      <listitem>
       <para>
-       A list of strings passed as additional flags to <command>make</command>.
-       Like <varname>makeFlags</varname> and <varname>makeFlagsArray</varname>,
-       but only used by the check phase.
+       A list of strings passed as additional flags to <command>make</command>. Like <varname>makeFlags</varname> and <varname>makeFlagsArray</varname>, but only used by the check phase.
       </para>
      </listitem>
     </varlistentry>
@@ -1460,9 +1087,7 @@ preBuild = ''
      </term>
      <listitem>
       <para>
-       A list of dependencies used by the phase. This gets included in
-       <varname>nativeBuildInputs</varname> when <varname>doCheck</varname> is
-       set.
+       A list of dependencies used by the phase. This gets included in <varname>nativeBuildInputs</varname> when <varname>doCheck</varname> is set.
       </para>
      </listitem>
     </varlistentry>
@@ -1493,10 +1118,7 @@ preBuild = ''
    <title>The install phase</title>
 
    <para>
-    The install phase is responsible for installing the package in the Nix
-    store under <envar>out</envar>. The default
-    <function>installPhase</function> creates the directory
-    <literal>$out</literal> and calls <command>make install</command>.
+    The install phase is responsible for installing the package in the Nix store under <envar>out</envar>. The default <function>installPhase</function> creates the directory <literal>$out</literal> and calls <command>make install</command>.
    </para>
 
    <variablelist>
@@ -1517,8 +1139,7 @@ preBuild = ''
      </term>
      <listitem>
       <para>
-       The make targets that perform the installation. Defaults to
-       <literal>install</literal>. Example:
+       The make targets that perform the installation. Defaults to <literal>install</literal>. Example:
 <programlisting>
 installTargets = "install-bin install-doc";</programlisting>
       </para>
@@ -1530,9 +1151,7 @@ installTargets = "install-bin install-doc";</programlisting>
      </term>
      <listitem>
       <para>
-       A list of strings passed as additional flags to <command>make</command>.
-       Like <varname>makeFlags</varname> and <varname>makeFlagsArray</varname>,
-       but only used by the install phase.
+       A list of strings passed as additional flags to <command>make</command>. Like <varname>makeFlags</varname> and <varname>makeFlagsArray</varname>, but only used by the install phase.
       </para>
      </listitem>
     </varlistentry>
@@ -1563,15 +1182,11 @@ installTargets = "install-bin install-doc";</programlisting>
    <title>The fixup phase</title>
 
    <para>
-    The fixup phase performs some (Nix-specific) post-processing actions on the
-    files installed under <filename>$out</filename> by the install phase. The
-    default <function>fixupPhase</function> does the following:
+    The fixup phase performs some (Nix-specific) post-processing actions on the files installed under <filename>$out</filename> by the install phase. The default <function>fixupPhase</function> does the following:
     <itemizedlist>
      <listitem>
       <para>
-       It moves the <filename>man/</filename>, <filename>doc/</filename> and
-       <filename>info/</filename> subdirectories of <envar>$out</envar> to
-       <filename>share/</filename>.
+       It moves the <filename>man/</filename>, <filename>doc/</filename> and <filename>info/</filename> subdirectories of <envar>$out</envar> to <filename>share/</filename>.
       </para>
      </listitem>
      <listitem>
@@ -1581,19 +1196,12 @@ installTargets = "install-bin install-doc";</programlisting>
      </listitem>
      <listitem>
       <para>
-       On Linux, it applies the <command>patchelf</command> command to ELF
-       executables and libraries to remove unused directories from the
-       <literal>RPATH</literal> in order to prevent unnecessary runtime
-       dependencies.
+       On Linux, it applies the <command>patchelf</command> command to ELF executables and libraries to remove unused directories from the <literal>RPATH</literal> in order to prevent unnecessary runtime dependencies.
       </para>
      </listitem>
      <listitem>
       <para>
-       It rewrites the interpreter paths of shell scripts to paths found in
-       <envar>PATH</envar>. E.g., <filename>/usr/bin/perl</filename> will be
-       rewritten to
-       <filename>/nix/store/<replaceable>some-perl</replaceable>/bin/perl</filename>
-       found in <envar>PATH</envar>.
+       It rewrites the interpreter paths of shell scripts to paths found in <envar>PATH</envar>. E.g., <filename>/usr/bin/perl</filename> will be rewritten to <filename>/nix/store/<replaceable>some-perl</replaceable>/bin/perl</filename> found in <envar>PATH</envar>.
       </para>
      </listitem>
     </itemizedlist>
@@ -1617,8 +1225,7 @@ installTargets = "install-bin install-doc";</programlisting>
      </term>
      <listitem>
       <para>
-       If set, libraries and executables are not stripped. By default, they
-       are.
+       If set, libraries and executables are not stripped. By default, they are.
       </para>
      </listitem>
     </varlistentry>
@@ -1628,10 +1235,7 @@ installTargets = "install-bin install-doc";</programlisting>
      </term>
      <listitem>
       <para>
-       Like <varname>dontStrip</varname>, but only affects the
-       <command>strip</command> command targetting the package's host platform.
-       Useful when supporting cross compilation, but otherwise feel free to
-       ignore.
+       Like <varname>dontStrip</varname>, but only affects the <command>strip</command> command targetting the package's host platform. Useful when supporting cross compilation, but otherwise feel free to ignore.
       </para>
      </listitem>
     </varlistentry>
@@ -1641,10 +1245,7 @@ installTargets = "install-bin install-doc";</programlisting>
      </term>
      <listitem>
       <para>
-       Like <varname>dontStrip</varname>, but only affects the
-       <command>strip</command> command targetting the packages' target
-       platform. Useful when supporting cross compilation, but otherwise feel
-       free to ignore.
+       Like <varname>dontStrip</varname>, but only affects the <command>strip</command> command targetting the packages' target platform. Useful when supporting cross compilation, but otherwise feel free to ignore.
       </para>
      </listitem>
     </varlistentry>
@@ -1654,8 +1255,7 @@ installTargets = "install-bin install-doc";</programlisting>
      </term>
      <listitem>
       <para>
-       If set, files in <filename>$out/sbin</filename> are not moved to
-       <filename>$out/bin</filename>. By default, they are.
+       If set, files in <filename>$out/sbin</filename> are not moved to <filename>$out/bin</filename>. By default, they are.
       </para>
      </listitem>
     </varlistentry>
@@ -1665,10 +1265,7 @@ installTargets = "install-bin install-doc";</programlisting>
      </term>
      <listitem>
       <para>
-       List of directories to search for libraries and executables from which
-       <emphasis>all</emphasis> symbols should be stripped. By default, it’s
-       empty. Stripping all symbols is risky, since it may remove not just
-       debug symbols but also ELF information necessary for normal execution.
+       List of directories to search for libraries and executables from which <emphasis>all</emphasis> symbols should be stripped. By default, it’s empty. Stripping all symbols is risky, since it may remove not just debug symbols but also ELF information necessary for normal execution.
       </para>
      </listitem>
     </varlistentry>
@@ -1678,9 +1275,7 @@ installTargets = "install-bin install-doc";</programlisting>
      </term>
      <listitem>
       <para>
-       Flags passed to the <command>strip</command> command applied to the
-       files in the directories listed in <varname>stripAllList</varname>.
-       Defaults to <option>-s</option> (i.e. <option>--strip-all</option>).
+       Flags passed to the <command>strip</command> command applied to the files in the directories listed in <varname>stripAllList</varname>. Defaults to <option>-s</option> (i.e. <option>--strip-all</option>).
       </para>
      </listitem>
     </varlistentry>
@@ -1690,9 +1285,7 @@ installTargets = "install-bin install-doc";</programlisting>
      </term>
      <listitem>
       <para>
-       List of directories to search for libraries and executables from which
-       only debugging-related symbols should be stripped. It defaults to
-       <literal>lib bin sbin</literal>.
+       List of directories to search for libraries and executables from which only debugging-related symbols should be stripped. It defaults to <literal>lib bin sbin</literal>.
       </para>
      </listitem>
     </varlistentry>
@@ -1702,9 +1295,7 @@ installTargets = "install-bin install-doc";</programlisting>
      </term>
      <listitem>
       <para>
-       Flags passed to the <command>strip</command> command applied to the
-       files in the directories listed in <varname>stripDebugList</varname>.
-       Defaults to <option>-S</option> (i.e. <option>--strip-debug</option>).
+       Flags passed to the <command>strip</command> command applied to the files in the directories listed in <varname>stripDebugList</varname>. Defaults to <option>-S</option> (i.e. <option>--strip-debug</option>).
       </para>
      </listitem>
     </varlistentry>
@@ -1714,8 +1305,7 @@ installTargets = "install-bin install-doc";</programlisting>
      </term>
      <listitem>
       <para>
-       If set, the <command>patchelf</command> command is not used to remove
-       unnecessary <literal>RPATH</literal> entries. Only applies to Linux.
+       If set, the <command>patchelf</command> command is not used to remove unnecessary <literal>RPATH</literal> entries. Only applies to Linux.
       </para>
      </listitem>
     </varlistentry>
@@ -1725,8 +1315,7 @@ installTargets = "install-bin install-doc";</programlisting>
      </term>
      <listitem>
       <para>
-       If set, scripts starting with <literal>#!</literal> do not have their
-       interpreter paths rewritten to paths in the Nix store.
+       If set, scripts starting with <literal>#!</literal> do not have their interpreter paths rewritten to paths in the Nix store.
       </para>
      </listitem>
     </varlistentry>
@@ -1736,9 +1325,7 @@ installTargets = "install-bin install-doc";</programlisting>
      </term>
      <listitem>
       <para>
-       If set, libtool <literal>.la</literal> files associated with shared
-       libraries won't have their <literal>dependency_libs</literal> field
-       cleared.
+       If set, libtool <literal>.la</literal> files associated with shared libraries won't have their <literal>dependency_libs</literal> field cleared.
       </para>
      </listitem>
     </varlistentry>
@@ -1748,9 +1335,7 @@ installTargets = "install-bin install-doc";</programlisting>
      </term>
      <listitem>
       <para>
-       The list of directories that must be moved from
-       <filename>$out</filename> to <filename>$out/share</filename>. Defaults
-       to <literal>man doc info</literal>.
+       The list of directories that must be moved from <filename>$out</filename> to <filename>$out/share</filename>. Defaults to <literal>man doc info</literal>.
       </para>
      </listitem>
     </varlistentry>
@@ -1760,11 +1345,7 @@ installTargets = "install-bin install-doc";</programlisting>
      </term>
      <listitem>
       <para>
-       A package can export a <link linkend="ssec-setup-hooks">setup
-       hook</link> by setting this variable. The setup hook, if defined, is
-       copied to <filename>$out/nix-support/setup-hook</filename>. Environment
-       variables are then substituted in it using
-       <function
+       A package can export a <link linkend="ssec-setup-hooks">setup hook</link> by setting this variable. The setup hook, if defined, is copied to <filename>$out/nix-support/setup-hook</filename>. Environment variables are then substituted in it using <function
        linkend="fun-substituteAll">substituteAll</function>.
       </para>
      </listitem>
@@ -1795,25 +1376,14 @@ installTargets = "install-bin install-doc";</programlisting>
      </term>
      <listitem>
       <para>
-       If set to <literal>true</literal>, the standard environment will enable
-       debug information in C/C++ builds. After installation, the debug
-       information will be separated from the executables and stored in the
-       output named <literal>debug</literal>. (This output is enabled
-       automatically; you don’t need to set the <varname>outputs</varname>
-       attribute explicitly.) To be precise, the debug information is stored in
-       <filename><replaceable>debug</replaceable>/lib/debug/.build-id/<replaceable>XX</replaceable>/<replaceable>YYYY…</replaceable></filename>,
-       where <replaceable>XXYYYY…</replaceable> is the <replaceable>build
-       ID</replaceable> of the binary — a SHA-1 hash of the contents of the
-       binary. Debuggers like GDB use the build ID to look up the separated
-       debug information.
+       If set to <literal>true</literal>, the standard environment will enable debug information in C/C++ builds. After installation, the debug information will be separated from the executables and stored in the output named <literal>debug</literal>. (This output is enabled automatically; you don’t need to set the <varname>outputs</varname> attribute explicitly.) To be precise, the debug information is stored in <filename><replaceable>debug</replaceable>/lib/debug/.build-id/<replaceable>XX</replaceable>/<replaceable>YYYY…</replaceable></filename>, where <replaceable>XXYYYY…</replaceable> is the <replaceable>build ID</replaceable> of the binary — a SHA-1 hash of the contents of the binary. Debuggers like GDB use the build ID to look up the separated debug information.
       </para>
       <para>
        For example, with GDB, you can add
 <programlisting>
 set debug-file-directory ~/.nix-profile/lib/debug
 </programlisting>
-       to <filename>~/.gdbinit</filename>. GDB will then be able to find debug
-       information installed via <literal>nix-env -i</literal>.
+       to <filename>~/.gdbinit</filename>. GDB will then be able to find debug information installed via <literal>nix-env -i</literal>.
       </para>
      </listitem>
     </varlistentry>
@@ -1824,10 +1394,7 @@ set debug-file-directory ~/.nix-profile/lib/debug
    <title>The installCheck phase</title>
 
    <para>
-    The installCheck phase checks whether the package was installed correctly
-    by running its test suite against the installed directories. The default
-    <function>installCheck</function> calls <command>make
-    installcheck</command>.
+    The installCheck phase checks whether the package was installed correctly by running its test suite against the installed directories. The default <function>installCheck</function> calls <command>make installcheck</command>.
    </para>
 
    <variablelist>
@@ -1838,14 +1405,9 @@ set debug-file-directory ~/.nix-profile/lib/debug
      </term>
      <listitem>
       <para>
-       Controls whether the installCheck phase is executed. By default it is
-       skipped, but if <varname>doInstallCheck</varname> is set to true, the
-       installCheck phase is usually executed. Thus you should set
+       Controls whether the installCheck phase is executed. By default it is skipped, but if <varname>doInstallCheck</varname> is set to true, the installCheck phase is usually executed. Thus you should set
 <programlisting>doInstallCheck = true;</programlisting>
-       in the derivation to enable install checks. The exception is cross
-       compilation. Cross compiled builds never run tests, no matter how
-       <varname>doInstallCheck</varname> is set, as the newly-built program
-       won't run on the platform used to build it.
+       in the derivation to enable install checks. The exception is cross compilation. Cross compiled builds never run tests, no matter how <varname>doInstallCheck</varname> is set, as the newly-built program won't run on the platform used to build it.
       </para>
      </listitem>
     </varlistentry>
@@ -1855,8 +1417,7 @@ set debug-file-directory ~/.nix-profile/lib/debug
      </term>
      <listitem>
       <para>
-       The make target that runs the install tests. Defaults to
-       <literal>installcheck</literal>.
+       The make target that runs the install tests. Defaults to <literal>installcheck</literal>.
       </para>
      </listitem>
     </varlistentry>
@@ -1866,9 +1427,7 @@ set debug-file-directory ~/.nix-profile/lib/debug
      </term>
      <listitem>
       <para>
-       A list of strings passed as additional flags to <command>make</command>.
-       Like <varname>makeFlags</varname> and <varname>makeFlagsArray</varname>,
-       but only used by the installCheck phase.
+       A list of strings passed as additional flags to <command>make</command>. Like <varname>makeFlags</varname> and <varname>makeFlagsArray</varname>, but only used by the installCheck phase.
       </para>
      </listitem>
     </varlistentry>
@@ -1878,9 +1437,7 @@ set debug-file-directory ~/.nix-profile/lib/debug
      </term>
      <listitem>
       <para>
-       A list of dependencies used by the phase. This gets included in
-       <varname>nativeBuildInputs</varname> when
-       <varname>doInstallCheck</varname> is set.
+       A list of dependencies used by the phase. This gets included in <varname>nativeBuildInputs</varname> when <varname>doInstallCheck</varname> is set.
       </para>
      </listitem>
     </varlistentry>
@@ -1911,11 +1468,7 @@ set debug-file-directory ~/.nix-profile/lib/debug
    <title>The distribution phase</title>
 
    <para>
-    The distribution phase is intended to produce a source distribution of the
-    package. The default <function>distPhase</function> first calls
-    <command>make dist</command>, then it copies the resulting source tarballs
-    to <filename>$out/tarballs/</filename>. This phase is only executed if the
-    attribute <varname>doDist</varname> is set.
+    The distribution phase is intended to produce a source distribution of the package. The default <function>distPhase</function> first calls <command>make dist</command>, then it copies the resulting source tarballs to <filename>$out/tarballs/</filename>. This phase is only executed if the attribute <varname>doDist</varname> is set.
    </para>
 
    <variablelist>
@@ -1926,8 +1479,7 @@ set debug-file-directory ~/.nix-profile/lib/debug
      </term>
      <listitem>
       <para>
-       The make target that produces the distribution. Defaults to
-       <literal>dist</literal>.
+       The make target that produces the distribution. Defaults to <literal>dist</literal>.
       </para>
      </listitem>
     </varlistentry>
@@ -1947,9 +1499,7 @@ set debug-file-directory ~/.nix-profile/lib/debug
      </term>
      <listitem>
       <para>
-       The names of the source distribution files to be copied to
-       <filename>$out/tarballs/</filename>. It can contain shell wildcards. The
-       default is <filename>*.tar.gz</filename>.
+       The names of the source distribution files to be copied to <filename>$out/tarballs/</filename>. It can contain shell wildcards. The default is <filename>*.tar.gz</filename>.
       </para>
      </listitem>
     </varlistentry>
@@ -2000,8 +1550,7 @@ set debug-file-directory ~/.nix-profile/lib/debug
     </term>
     <listitem>
      <para>
-      Constructs a wrapper for a program with various possible arguments. For
-      example:
+      Constructs a wrapper for a program with various possible arguments. For example:
 <programlisting>
 # adds `FOOBAR=baz` to `$out/bin/foo`’s environment
 makeWrapper $out/bin/foo $wrapperfile --set FOOBAR baz
@@ -2011,12 +1560,10 @@ makeWrapper $out/bin/foo $wrapperfile --set FOOBAR baz
 # (via string replacements or in `configurePhase`).
 makeWrapper $out/bin/foo $wrapperfile --prefix PATH : ${lib.makeBinPath [ hello git ]}
 </programlisting>
-      There’s many more kinds of arguments, they are documented in
-      <literal>nixpkgs/pkgs/build-support/setup-hooks/make-wrapper.sh</literal>.
+      There’s many more kinds of arguments, they are documented in <literal>nixpkgs/pkgs/build-support/setup-hooks/make-wrapper.sh</literal>.
      </para>
      <para>
-      <literal>wrapProgram</literal> is a convenience function you probably
-      want to use most of the time.
+      <literal>wrapProgram</literal> is a convenience function you probably want to use most of the time.
      </para>
     </listitem>
    </varlistentry>
@@ -2026,10 +1573,7 @@ makeWrapper $out/bin/foo $wrapperfile --prefix PATH : ${lib.makeBinPath [ hello
     </term>
     <listitem>
      <para>
-      Performs string substitution on the contents of
-      <replaceable>infile</replaceable>, writing the result to
-      <replaceable>outfile</replaceable>. The substitutions in
-      <replaceable>subs</replaceable> are of the following form:
+      Performs string substitution on the contents of <replaceable>infile</replaceable>, writing the result to <replaceable>outfile</replaceable>. The substitutions in <replaceable>subs</replaceable> are of the following form:
       <variablelist>
        <varlistentry>
         <term>
@@ -2037,8 +1581,7 @@ makeWrapper $out/bin/foo $wrapperfile --prefix PATH : ${lib.makeBinPath [ hello
         </term>
         <listitem>
          <para>
-          Replace every occurrence of the string <replaceable>s1</replaceable>
-          by <replaceable>s2</replaceable>.
+          Replace every occurrence of the string <replaceable>s1</replaceable> by <replaceable>s2</replaceable>.
          </para>
         </listitem>
        </varlistentry>
@@ -2048,13 +1591,7 @@ makeWrapper $out/bin/foo $wrapperfile --prefix PATH : ${lib.makeBinPath [ hello
         </term>
         <listitem>
          <para>
-          Replace every occurrence of
-          <literal>@<replaceable>varName</replaceable>@</literal> by the
-          contents of the environment variable
-          <replaceable>varName</replaceable>. This is useful for generating
-          files from templates, using
-          <literal>@<replaceable>...</replaceable>@</literal> in the template
-          as placeholders.
+          Replace every occurrence of <literal>@<replaceable>varName</replaceable>@</literal> by the contents of the environment variable <replaceable>varName</replaceable>. This is useful for generating files from templates, using <literal>@<replaceable>...</replaceable>@</literal> in the template as placeholders.
          </para>
         </listitem>
        </varlistentry>
@@ -2064,9 +1601,7 @@ makeWrapper $out/bin/foo $wrapperfile --prefix PATH : ${lib.makeBinPath [ hello
         </term>
         <listitem>
          <para>
-          Replace every occurrence of
-          <literal>@<replaceable>varName</replaceable>@</literal> by the string
-          <replaceable>s</replaceable>.
+          Replace every occurrence of <literal>@<replaceable>varName</replaceable>@</literal> by the string <replaceable>s</replaceable>.
          </para>
         </listitem>
        </varlistentry>
@@ -2082,14 +1617,8 @@ substitute ./foo.in ./foo.out \
 </programlisting>
      </para>
      <para>
-      <function>substitute</function> is implemented using the
-      <command
-      xlink:href="http://replace.richardlloyd.org.uk/">replace</command>
-      command. Unlike with the <command>sed</command> command, you don’t have
-      to worry about escaping special characters. It supports performing
-      substitutions on binary files (such as executables), though there
-      you’ll probably want to make sure that the replacement string is as
-      long as the replaced string.
+      <function>substitute</function> is implemented using the <command
+      xlink:href="http://replace.richardlloyd.org.uk/">replace</command> command. Unlike with the <command>sed</command> command, you don’t have to worry about escaping special characters. It supports performing substitutions on binary files (such as executables), though there you’ll probably want to make sure that the replacement string is as long as the replaced string.
      </para>
     </listitem>
    </varlistentry>
@@ -2099,8 +1628,7 @@ substitute ./foo.in ./foo.out \
     </term>
     <listitem>
      <para>
-      Like <function>substitute</function>, but performs the substitutions in
-      place on the file <replaceable>file</replaceable>.
+      Like <function>substitute</function>, but performs the substitutions in place on the file <replaceable>file</replaceable>.
      </para>
     </listitem>
    </varlistentry>
@@ -2110,22 +1638,13 @@ substitute ./foo.in ./foo.out \
     </term>
     <listitem>
      <para>
-      Replaces every occurrence of
-      <literal>@<replaceable>varName</replaceable>@</literal>, where
-      <replaceable>varName</replaceable> is any environment variable, in
-      <replaceable>infile</replaceable>, writing the result to
-      <replaceable>outfile</replaceable>. For instance, if
-      <replaceable>infile</replaceable> has the contents
+      Replaces every occurrence of <literal>@<replaceable>varName</replaceable>@</literal>, where <replaceable>varName</replaceable> is any environment variable, in <replaceable>infile</replaceable>, writing the result to <replaceable>outfile</replaceable>. For instance, if <replaceable>infile</replaceable> has the contents
 <programlisting>
 #! @bash@/bin/sh
 PATH=@coreutils@/bin
 echo @foo@
 </programlisting>
-      and the environment contains
-      <literal>bash=/nix/store/bmwp0q28cf21...-bash-3.2-p39</literal> and
-      <literal>coreutils=/nix/store/68afga4khv0w...-coreutils-6.12</literal>,
-      but does not contain the variable <varname>foo</varname>, then the output
-      will be
+      and the environment contains <literal>bash=/nix/store/bmwp0q28cf21...-bash-3.2-p39</literal> and <literal>coreutils=/nix/store/68afga4khv0w...-coreutils-6.12</literal>, but does not contain the variable <varname>foo</varname>, then the output will be
 <programlisting>
 #! /nix/store/bmwp0q28cf21...-bash-3.2-p39/bin/sh
 PATH=/nix/store/68afga4khv0w...-coreutils-6.12/bin
@@ -2134,13 +1653,7 @@ echo @foo@
       That is, no substitution is performed for undefined variables.
      </para>
      <para>
-      Environment variables that start with an uppercase letter or an
-      underscore are filtered out, to prevent global variables (like
-      <literal>HOME</literal>) or private variables (like
-      <literal>__ETC_PROFILE_DONE</literal>) from accidentally getting
-      substituted. The variables also have to be valid bash “names”, as
-      defined in the bash manpage (alphanumeric or <literal>_</literal>, must
-      not start with a number).
+      Environment variables that start with an uppercase letter or an underscore are filtered out, to prevent global variables (like <literal>HOME</literal>) or private variables (like <literal>__ETC_PROFILE_DONE</literal>) from accidentally getting substituted. The variables also have to be valid bash “names”, as defined in the bash manpage (alphanumeric or <literal>_</literal>, must not start with a number).
      </para>
     </listitem>
    </varlistentry>
@@ -2150,8 +1663,7 @@ echo @foo@
     </term>
     <listitem>
      <para>
-      Like <function>substituteAll</function>, but performs the substitutions
-      in place on the file <replaceable>file</replaceable>.
+      Like <function>substituteAll</function>, but performs the substitutions in place on the file <replaceable>file</replaceable>.
      </para>
     </listitem>
    </varlistentry>
@@ -2161,14 +1673,12 @@ echo @foo@
     </term>
     <listitem>
      <para>
-      Strips the directory and hash part of a store path, outputting the name
-      part to <literal>stdout</literal>. For example:
+      Strips the directory and hash part of a store path, outputting the name part to <literal>stdout</literal>. For example:
 <programlisting>
 # prints coreutils-8.24
 stripHash "/nix/store/9s9r019176g7cvn2nvcw41gsp862y6b4-coreutils-8.24"
 </programlisting>
-      If you wish to store the result in another variable, then the following
-      idiom may be useful:
+      If you wish to store the result in another variable, then the following idiom may be useful:
 <programlisting>
 name="/nix/store/9s9r019176g7cvn2nvcw41gsp862y6b4-coreutils-8.24"
 someVar=$(stripHash $name)
@@ -2182,13 +1692,10 @@ someVar=$(stripHash $name)
     </term>
     <listitem>
      <para>
-      Convenience function for <literal>makeWrapper</literal> that
-      automatically creates a sane wrapper file It takes all the same arguments
-      as <literal>makeWrapper</literal>, except for <literal>--argv0</literal>.
+      Convenience function for <literal>makeWrapper</literal> that automatically creates a sane wrapper file It takes all the same arguments as <literal>makeWrapper</literal>, except for <literal>--argv0</literal>.
      </para>
      <para>
-      It cannot be applied multiple times, since it will overwrite the wrapper
-      file.
+      It cannot be applied multiple times, since it will overwrite the wrapper file.
      </para>
     </listitem>
    </varlistentry>
@@ -2198,85 +1705,34 @@ someVar=$(stripHash $name)
   <title>Package setup hooks</title>
 
   <para>
-   Nix itself considers a build-time dependency as merely something that should
-   previously be built and accessible at build time—packages themselves are
-   on their own to perform any additional setup. In most cases, that is fine,
-   and the downstream derivation can deal with its own dependencies. But for a
-   few common tasks, that would result in almost every package doing the same
-   sort of setup work—depending not on the package itself, but entirely on
-   which dependencies were used.
+   Nix itself considers a build-time dependency as merely something that should previously be built and accessible at build time—packages themselves are on their own to perform any additional setup. In most cases, that is fine, and the downstream derivation can deal with its own dependencies. But for a few common tasks, that would result in almost every package doing the same sort of setup work—depending not on the package itself, but entirely on which dependencies were used.
   </para>
 
   <para>
-   In order to alleviate this burden, the <firstterm>setup hook</firstterm>
-   mechanism was written, where any package can include a shell script that [by
-   convention rather than enforcement by Nix], any downstream
-   reverse-dependency will source as part of its build process. That allows the
-   downstream dependency to merely specify its dependencies, and lets those
-   dependencies effectively initialize themselves. No boilerplate mirroring the
-   list of dependencies is needed.
+   In order to alleviate this burden, the <firstterm>setup hook</firstterm> mechanism was written, where any package can include a shell script that [by convention rather than enforcement by Nix], any downstream reverse-dependency will source as part of its build process. That allows the downstream dependency to merely specify its dependencies, and lets those dependencies effectively initialize themselves. No boilerplate mirroring the list of dependencies is needed.
   </para>
 
   <para>
-   The setup hook mechanism is a bit of a sledgehammer though: a powerful
-   feature with a broad and indiscriminate area of effect. The combination of
-   its power and implicit use may be expedient, but isn't without costs. Nix
-   itself is unchanged, but the spirit of added dependencies being effect-free
-   is violated even if the letter isn't. For example, if a derivation path is
-   mentioned more than once, Nix itself doesn't care and simply makes sure the
-   dependency derivation is already built just the same—depending is just
-   needing something to exist, and needing is idempotent. However, a dependency
-   specified twice will have its setup hook run twice, and that could easily
-   change the build environment (though a well-written setup hook will
-   therefore strive to be idempotent so this is in fact not observable). More
-   broadly, setup hooks are anti-modular in that multiple dependencies, whether
-   the same or different, should not interfere and yet their setup hooks may
-   well do so.
+   The setup hook mechanism is a bit of a sledgehammer though: a powerful feature with a broad and indiscriminate area of effect. The combination of its power and implicit use may be expedient, but isn't without costs. Nix itself is unchanged, but the spirit of added dependencies being effect-free is violated even if the letter isn't. For example, if a derivation path is mentioned more than once, Nix itself doesn't care and simply makes sure the dependency derivation is already built just the same—depending is just needing something to exist, and needing is idempotent. However, a dependency specified twice will have its setup hook run twice, and that could easily change the build environment (though a well-written setup hook will therefore strive to be idempotent so this is in fact not observable). More broadly, setup hooks are anti-modular in that multiple dependencies, whether the same or different, should not interfere and yet their setup hooks may well do so.
   </para>
 
   <para>
-   The most typical use of the setup hook is actually to add other hooks which
-   are then run (i.e. after all the setup hooks) on each dependency. For
-   example, the C compiler wrapper's setup hook feeds itself flags for each
-   dependency that contains relevant libraries and headers. This is done by
-   defining a bash function, and appending its name to one of
-   <envar>envBuildBuildHooks</envar>`, <envar>envBuildHostHooks</envar>`,
-   <envar>envBuildTargetHooks</envar>`, <envar>envHostHostHooks</envar>`,
-   <envar>envHostTargetHooks</envar>`, or <envar>envTargetTargetHooks</envar>`.
-   These 6 bash variables correspond to the 6 sorts of dependencies by platform
-   (there's 12 total but we ignore the propagated/non-propagated axis).
+   The most typical use of the setup hook is actually to add other hooks which are then run (i.e. after all the setup hooks) on each dependency. For example, the C compiler wrapper's setup hook feeds itself flags for each dependency that contains relevant libraries and headers. This is done by defining a bash function, and appending its name to one of <envar>envBuildBuildHooks</envar>`, <envar>envBuildHostHooks</envar>`, <envar>envBuildTargetHooks</envar>`, <envar>envHostHostHooks</envar>`, <envar>envHostTargetHooks</envar>`, or <envar>envTargetTargetHooks</envar>`. These 6 bash variables correspond to the 6 sorts of dependencies by platform (there's 12 total but we ignore the propagated/non-propagated axis).
   </para>
 
   <para>
-   Packages adding a hook should not hard code a specific hook, but rather
-   choose a variable <emphasis>relative</emphasis> to how they are included.
-   Returning to the C compiler wrapper example, if the wrapper itself is an
-   <literal>n</literal> dependency, then it only wants to accumulate flags from
-   <literal>n + 1</literal> dependencies, as only those ones match the
-   compiler's target platform. The <envar>hostOffset</envar> variable is
-   defined with the current dependency's host offset
-   <envar>targetOffset</envar> with its target offset, before its setup hook is
-   sourced. Additionally, since most environment hooks don't care about the
-   target platform, that means the setup hook can append to the right bash
-   array by doing something like
+   Packages adding a hook should not hard code a specific hook, but rather choose a variable <emphasis>relative</emphasis> to how they are included. Returning to the C compiler wrapper example, if the wrapper itself is an <literal>n</literal> dependency, then it only wants to accumulate flags from <literal>n + 1</literal> dependencies, as only those ones match the compiler's target platform. The <envar>hostOffset</envar> variable is defined with the current dependency's host offset <envar>targetOffset</envar> with its target offset, before its setup hook is sourced. Additionally, since most environment hooks don't care about the target platform, that means the setup hook can append to the right bash array by doing something like
 <programlisting language="bash">
 addEnvHooks "$hostOffset" myBashFunction
 </programlisting>
   </para>
 
   <para>
-   The <emphasis>existence</emphasis> of setups hooks has long been documented
-   and packages inside Nixpkgs are free to use this mechanism. Other packages,
-   however, should not rely on these mechanisms not changing between Nixpkgs
-   versions. Because of the existing issues with this system, there's little
-   benefit from mandating it be stable for any period of time.
+   The <emphasis>existence</emphasis> of setups hooks has long been documented and packages inside Nixpkgs are free to use this mechanism. Other packages, however, should not rely on these mechanisms not changing between Nixpkgs versions. Because of the existing issues with this system, there's little benefit from mandating it be stable for any period of time.
   </para>
 
   <para>
-   First, let’s cover some setup hooks that are part of Nixpkgs default
-   stdenv. This means that they are run for every package built using
-   <function>stdenv.mkDerivation</function>. Some of these are platform
-   specific, so they may run on Linux but not Darwin or vice-versa.
+   First, let’s cover some setup hooks that are part of Nixpkgs default stdenv. This means that they are run for every package built using <function>stdenv.mkDerivation</function>. Some of these are platform specific, so they may run on Linux but not Darwin or vice-versa.
    <variablelist>
     <varlistentry>
      <term>
@@ -2284,10 +1740,7 @@ addEnvHooks "$hostOffset" myBashFunction
      </term>
      <listitem>
       <para>
-       This setup hook moves any installed documentation to the
-       <literal>/share</literal> subdirectory directory. This includes the man,
-       doc and info directories. This is needed for legacy programs that do not
-       know how to use the <literal>share</literal> subdirectory.
+       This setup hook moves any installed documentation to the <literal>/share</literal> subdirectory directory. This includes the man, doc and info directories. This is needed for legacy programs that do not know how to use the <literal>share</literal> subdirectory.
       </para>
      </listitem>
     </varlistentry>
@@ -2297,9 +1750,7 @@ addEnvHooks "$hostOffset" myBashFunction
      </term>
      <listitem>
       <para>
-       This setup hook compresses any man pages that have been installed. The
-       compression is done using the gzip program. This helps to reduce the
-       installed size of packages.
+       This setup hook compresses any man pages that have been installed. The compression is done using the gzip program. This helps to reduce the installed size of packages.
       </para>
      </listitem>
     </varlistentry>
@@ -2309,9 +1760,7 @@ addEnvHooks "$hostOffset" myBashFunction
      </term>
      <listitem>
       <para>
-       This runs the strip command on installed binaries and libraries. This
-       removes unnecessary information like debug symbols when they are not
-       needed. This also helps to reduce the installed size of packages.
+       This runs the strip command on installed binaries and libraries. This removes unnecessary information like debug symbols when they are not needed. This also helps to reduce the installed size of packages.
       </para>
      </listitem>
     </varlistentry>
@@ -2321,12 +1770,7 @@ addEnvHooks "$hostOffset" myBashFunction
      </term>
      <listitem>
       <para>
-       This setup hook patches installed scripts to use the full path to the
-       shebang interpreter. A shebang interpreter is the first commented line
-       of a script telling the operating system which program will run the
-       script (e.g <literal>#!/bin/bash</literal>). In Nix, we want an exact
-       path to that interpreter to be used. This often replaces
-       <literal>/bin/sh</literal> with a path in the Nix store.
+       This setup hook patches installed scripts to use the full path to the shebang interpreter. A shebang interpreter is the first commented line of a script telling the operating system which program will run the script (e.g <literal>#!/bin/bash</literal>). In Nix, we want an exact path to that interpreter to be used. This often replaces <literal>/bin/sh</literal> with a path in the Nix store.
       </para>
      </listitem>
     </varlistentry>
@@ -2336,10 +1780,7 @@ addEnvHooks "$hostOffset" myBashFunction
      </term>
      <listitem>
       <para>
-       This verifies that no references are left from the install binaries to
-       the directory used to build those binaries. This ensures that the
-       binaries do not need things outside the Nix store. This is currently
-       supported in Linux only.
+       This verifies that no references are left from the install binaries to the directory used to build those binaries. This ensures that the binaries do not need things outside the Nix store. This is currently supported in Linux only.
       </para>
      </listitem>
     </varlistentry>
@@ -2349,12 +1790,7 @@ addEnvHooks "$hostOffset" myBashFunction
      </term>
      <listitem>
       <para>
-       This setup hook adds configure flags that tell packages to install files
-       into any one of the proper outputs listed in <literal>outputs</literal>.
-       This behavior can be turned off by setting
-       <literal>setOutputFlags</literal> to false in the derivation
-       environment. See <xref linkend="chap-multiple-output"/> for more
-       information.
+       This setup hook adds configure flags that tell packages to install files into any one of the proper outputs listed in <literal>outputs</literal>. This behavior can be turned off by setting <literal>setOutputFlags</literal> to false in the derivation environment. See <xref linkend="chap-multiple-output"/> for more information.
       </para>
      </listitem>
     </varlistentry>
@@ -2364,9 +1800,7 @@ addEnvHooks "$hostOffset" myBashFunction
      </term>
      <listitem>
       <para>
-       This setup hook moves any binaries installed in the sbin subdirectory
-       into bin. In addition, a link is provided from sbin to bin for
-       compatibility.
+       This setup hook moves any binaries installed in the sbin subdirectory into bin. In addition, a link is provided from sbin to bin for compatibility.
       </para>
      </listitem>
     </varlistentry>
@@ -2376,9 +1810,7 @@ addEnvHooks "$hostOffset" myBashFunction
      </term>
      <listitem>
       <para>
-       This setup hook moves any libraries installed in the lib64 subdirectory
-       into lib. In addition, a link is provided from lib64 to lib for
-       compatibility.
+       This setup hook moves any libraries installed in the lib64 subdirectory into lib. In addition, a link is provided from lib64 to lib for compatibility.
       </para>
      </listitem>
     </varlistentry>
@@ -2388,8 +1820,7 @@ addEnvHooks "$hostOffset" myBashFunction
      </term>
      <listitem>
       <para>
-       This sets <literal>SOURCE_DATE_EPOCH</literal> to the modification time
-       of the most recent file.
+       This sets <literal>SOURCE_DATE_EPOCH</literal> to the modification time of the most recent file.
       </para>
      </listitem>
     </varlistentry>
@@ -2399,70 +1830,22 @@ addEnvHooks "$hostOffset" myBashFunction
      </term>
      <listitem>
       <para>
-       The Bintools Wrapper wraps the binary utilities for a bunch of
-       miscellaneous purposes. These are GNU Binutils when targetting Linux,
-       and a mix of cctools and GNU binutils for Darwin. [The "Bintools" name
-       is supposed to be a compromise between "Binutils" and "cctools" not
-       denoting any specific implementation.] Specifically, the underlying
-       bintools package, and a C standard library (glibc or Darwin's libSystem,
-       just for the dynamic loader) are all fed in, and dependency finding,
-       hardening (see below), and purity checks for each are handled by the
-       Bintools Wrapper. Packages typically depend on CC Wrapper, which in turn
-       (at run time) depends on the Bintools Wrapper.
-      </para>
-      <para>
-       The Bintools Wrapper was only just recently split off from CC Wrapper,
-       so the division of labor is still being worked out. For example, it
-       shouldn't care about the C standard library, but just take a derivation
-       with the dynamic loader (which happens to be the glibc on linux).
-       Dependency finding however is a task both wrappers will continue to need
-       to share, and probably the most important to understand. It is currently
-       accomplished by collecting directories of host-platform dependencies
-       (i.e. <varname>buildInputs</varname> and
-       <varname>nativeBuildInputs</varname>) in environment variables. The
-       Bintools Wrapper's setup hook causes any <filename>lib</filename> and
-       <filename>lib64</filename> subdirectories to be added to
-       <envar>NIX_LDFLAGS</envar>. Since the CC Wrapper and the Bintools
-       Wrapper use the same strategy, most of the Bintools Wrapper code is
-       sparsely commented and refers to the CC Wrapper. But the CC Wrapper's
-       code, by contrast, has quite lengthy comments. The Bintools Wrapper
-       merely cites those, rather than repeating them, to avoid falling out of
-       sync.
-      </para>
-      <para>
-       A final task of the setup hook is defining a number of standard
-       environment variables to tell build systems which executables fulfill
-       which purpose. They are defined to just be the base name of the tools,
-       under the assumption that the Bintools Wrapper's binaries will be on the
-       path. Firstly, this helps poorly-written packages, e.g. ones that look
-       for just <command>gcc</command> when <envar>CC</envar> isn't defined yet
-       <command>clang</command> is to be used. Secondly, this helps packages
-       not get confused when cross-compiling, in which case multiple Bintools
-       Wrappers may simultaneously be in use.
+       The Bintools Wrapper wraps the binary utilities for a bunch of miscellaneous purposes. These are GNU Binutils when targetting Linux, and a mix of cctools and GNU binutils for Darwin. [The "Bintools" name is supposed to be a compromise between "Binutils" and "cctools" not denoting any specific implementation.] Specifically, the underlying bintools package, and a C standard library (glibc or Darwin's libSystem, just for the dynamic loader) are all fed in, and dependency finding, hardening (see below), and purity checks for each are handled by the Bintools Wrapper. Packages typically depend on CC Wrapper, which in turn (at run time) depends on the Bintools Wrapper.
+      </para>
+      <para>
+       The Bintools Wrapper was only just recently split off from CC Wrapper, so the division of labor is still being worked out. For example, it shouldn't care about the C standard library, but just take a derivation with the dynamic loader (which happens to be the glibc on linux). Dependency finding however is a task both wrappers will continue to need to share, and probably the most important to understand. It is currently accomplished by collecting directories of host-platform dependencies (i.e. <varname>buildInputs</varname> and <varname>nativeBuildInputs</varname>) in environment variables. The Bintools Wrapper's setup hook causes any <filename>lib</filename> and <filename>lib64</filename> subdirectories to be added to <envar>NIX_LDFLAGS</envar>. Since the CC Wrapper and the Bintools Wrapper use the same strategy, most of the Bintools Wrapper code is sparsely commented and refers to the CC Wrapper. But the CC Wrapper's code, by contrast, has quite lengthy comments. The Bintools Wrapper merely cites those, rather than repeating them, to avoid falling out of sync.
+      </para>
+      <para>
+       A final task of the setup hook is defining a number of standard environment variables to tell build systems which executables fulfill which purpose. They are defined to just be the base name of the tools, under the assumption that the Bintools Wrapper's binaries will be on the path. Firstly, this helps poorly-written packages, e.g. ones that look for just <command>gcc</command> when <envar>CC</envar> isn't defined yet <command>clang</command> is to be used. Secondly, this helps packages not get confused when cross-compiling, in which case multiple Bintools Wrappers may simultaneously be in use.
        <footnote xml:id="footnote-stdenv-per-platform-wrapper">
         <para>
-         Each wrapper targets a single platform, so if binaries for multiple
-         platforms are needed, the underlying binaries must be wrapped multiple
-         times. As this is a property of the wrapper itself, the multiple
-         wrappings are needed whether or not the same underlying binaries can
-         target multiple platforms.
+         Each wrapper targets a single platform, so if binaries for multiple platforms are needed, the underlying binaries must be wrapped multiple times. As this is a property of the wrapper itself, the multiple wrappings are needed whether or not the same underlying binaries can target multiple platforms.
         </para>
        </footnote>
-       <envar>BUILD_</envar>- and <envar>TARGET_</envar>-prefixed versions of
-       the normal environment variable are defined for additional Bintools
-       Wrappers, properly disambiguating them.
+       <envar>BUILD_</envar>- and <envar>TARGET_</envar>-prefixed versions of the normal environment variable are defined for additional Bintools Wrappers, properly disambiguating them.
       </para>
       <para>
-       A problem with this final task is that the Bintools Wrapper is honest
-       and defines <envar>LD</envar> as <command>ld</command>. Most packages,
-       however, firstly use the C compiler for linking, secondly use
-       <envar>LD</envar> anyways, defining it as the C compiler, and thirdly,
-       only so define <envar>LD</envar> when it is undefined as a fallback.
-       This triple-threat means Bintools Wrapper will break those packages, as
-       LD is already defined as the actual linker which the package won't
-       override yet doesn't want to use. The workaround is to define, just for
-       the problematic package, <envar>LD</envar> as the C compiler. A good way
-       to do this would be <command>preConfigure = "LD=$CC"</command>.
+       A problem with this final task is that the Bintools Wrapper is honest and defines <envar>LD</envar> as <command>ld</command>. Most packages, however, firstly use the C compiler for linking, secondly use <envar>LD</envar> anyways, defining it as the C compiler, and thirdly, only so define <envar>LD</envar> when it is undefined as a fallback. This triple-threat means Bintools Wrapper will break those packages, as LD is already defined as the actual linker which the package won't override yet doesn't want to use. The workaround is to define, just for the problematic package, <envar>LD</envar> as the C compiler. A good way to do this would be <command>preConfigure = "LD=$CC"</command>.
       </para>
      </listitem>
     </varlistentry>
@@ -2472,31 +1855,13 @@ addEnvHooks "$hostOffset" myBashFunction
      </term>
      <listitem>
       <para>
-       The CC Wrapper wraps a C toolchain for a bunch of miscellaneous
-       purposes. Specifically, a C compiler (GCC or Clang), wrapped binary
-       tools, and a C standard library (glibc or Darwin's libSystem, just for
-       the dynamic loader) are all fed in, and dependency finding, hardening
-       (see below), and purity checks for each are handled by the CC Wrapper.
-       Packages typically depend on the CC Wrapper, which in turn (at run-time)
-       depends on the Bintools Wrapper.
+       The CC Wrapper wraps a C toolchain for a bunch of miscellaneous purposes. Specifically, a C compiler (GCC or Clang), wrapped binary tools, and a C standard library (glibc or Darwin's libSystem, just for the dynamic loader) are all fed in, and dependency finding, hardening (see below), and purity checks for each are handled by the CC Wrapper. Packages typically depend on the CC Wrapper, which in turn (at run-time) depends on the Bintools Wrapper.
       </para>
       <para>
-       Dependency finding is undoubtedly the main task of the CC Wrapper. This
-       works just like the Bintools Wrapper, except that any
-       <filename>include</filename> subdirectory of any relevant dependency is
-       added to <envar>NIX_CFLAGS_COMPILE</envar>. The setup hook itself
-       contains some lengthy comments describing the exact convoluted mechanism
-       by which this is accomplished.
+       Dependency finding is undoubtedly the main task of the CC Wrapper. This works just like the Bintools Wrapper, except that any <filename>include</filename> subdirectory of any relevant dependency is added to <envar>NIX_CFLAGS_COMPILE</envar>. The setup hook itself contains some lengthy comments describing the exact convoluted mechanism by which this is accomplished.
       </para>
       <para>
-       Similarly, the CC Wrapper follows the Bintools Wrapper in defining
-       standard environment variables with the names of the tools it wraps, for
-       the same reasons described above. Importantly, while it includes a
-       <command>cc</command> symlink to the c compiler for portability, the
-       <envar>CC</envar> will be defined using the compiler's "real name" (i.e.
-       <command>gcc</command> or <command>clang</command>). This helps lousy
-       build systems that inspect on the name of the compiler rather than run
-       it.
+       Similarly, the CC Wrapper follows the Bintools Wrapper in defining standard environment variables with the names of the tools it wraps, for the same reasons described above. Importantly, while it includes a <command>cc</command> symlink to the c compiler for portability, the <envar>CC</envar> will be defined using the compiler's "real name" (i.e. <command>gcc</command> or <command>clang</command>). This helps lousy build systems that inspect on the name of the compiler rather than run it.
       </para>
      </listitem>
     </varlistentry>
@@ -2504,9 +1869,7 @@ addEnvHooks "$hostOffset" myBashFunction
   </para>
 
   <para>
-   Here are some more packages that provide a setup hook. Since the list of
-   hooks is extensible, this is not an exhaustive list the mechanism is only to
-   be used as a last resort, it might cover most uses.
+   Here are some more packages that provide a setup hook. Since the list of hooks is extensible, this is not an exhaustive list the mechanism is only to be used as a last resort, it might cover most uses.
    <variablelist>
     <varlistentry>
      <term>
@@ -2514,11 +1877,7 @@ addEnvHooks "$hostOffset" myBashFunction
      </term>
      <listitem>
       <para>
-       Adds the <filename>lib/site_perl</filename> subdirectory of each build
-       input to the <envar>PERL5LIB</envar> environment variable. For instance,
-       if <varname>buildInputs</varname> contains Perl, then the
-       <filename>lib/site_perl</filename> subdirectory of each input is added
-       to the <envar>PERL5LIB</envar> environment variable.
+       Adds the <filename>lib/site_perl</filename> subdirectory of each build input to the <envar>PERL5LIB</envar> environment variable. For instance, if <varname>buildInputs</varname> contains Perl, then the <filename>lib/site_perl</filename> subdirectory of each input is added to the <envar>PERL5LIB</envar> environment variable.
       </para>
      </listitem>
     </varlistentry>
@@ -2528,9 +1887,7 @@ addEnvHooks "$hostOffset" myBashFunction
      </term>
      <listitem>
       <para>
-       Adds the <filename>lib/${python.libPrefix}/site-packages</filename>
-       subdirectory of each build input to the <envar>PYTHONPATH</envar>
-       environment variable.
+       Adds the <filename>lib/${python.libPrefix}/site-packages</filename> subdirectory of each build input to the <envar>PYTHONPATH</envar> environment variable.
       </para>
      </listitem>
     </varlistentry>
@@ -2540,9 +1897,7 @@ addEnvHooks "$hostOffset" myBashFunction
      </term>
      <listitem>
       <para>
-       Adds the <filename>lib/pkgconfig</filename> and
-       <filename>share/pkgconfig</filename> subdirectories of each build input
-       to the <envar>PKG_CONFIG_PATH</envar> environment variable.
+       Adds the <filename>lib/pkgconfig</filename> and <filename>share/pkgconfig</filename> subdirectories of each build input to the <envar>PKG_CONFIG_PATH</envar> environment variable.
       </para>
      </listitem>
     </varlistentry>
@@ -2552,8 +1907,7 @@ addEnvHooks "$hostOffset" myBashFunction
      </term>
      <listitem>
       <para>
-       Adds the <filename>share/aclocal</filename> subdirectory of each build
-       input to the <envar>ACLOCAL_PATH</envar> environment variable.
+       Adds the <filename>share/aclocal</filename> subdirectory of each build input to the <envar>ACLOCAL_PATH</envar> environment variable.
       </para>
      </listitem>
     </varlistentry>
@@ -2563,12 +1917,7 @@ addEnvHooks "$hostOffset" myBashFunction
      </term>
      <listitem>
       <para>
-       The <varname>autoreconfHook</varname> derivation adds
-       <varname>autoreconfPhase</varname>, which runs autoreconf, libtoolize
-       and automake, essentially preparing the configure script in
-       autotools-based builds. Most autotools-based packages come with the
-       configure script pre-generated, but this hook is necessary for a few
-       packages and when you need to patch the package’s configure scripts.
+       The <varname>autoreconfHook</varname> derivation adds <varname>autoreconfPhase</varname>, which runs autoreconf, libtoolize and automake, essentially preparing the configure script in autotools-based builds. Most autotools-based packages come with the configure script pre-generated, but this hook is necessary for a few packages and when you need to patch the package’s configure scripts.
       </para>
      </listitem>
     </varlistentry>
@@ -2578,10 +1927,7 @@ addEnvHooks "$hostOffset" myBashFunction
      </term>
      <listitem>
       <para>
-       Adds every file named <filename>catalog.xml</filename> found under the
-       <filename>xml/dtd</filename> and <filename>xml/xsl</filename>
-       subdirectories of each build input to the
-       <envar>XML_CATALOG_FILES</envar> environment variable.
+       Adds every file named <filename>catalog.xml</filename> found under the <filename>xml/dtd</filename> and <filename>xml/xsl</filename> subdirectories of each build input to the <envar>XML_CATALOG_FILES</envar> environment variable.
       </para>
      </listitem>
     </varlistentry>
@@ -2591,8 +1937,7 @@ addEnvHooks "$hostOffset" myBashFunction
      </term>
      <listitem>
       <para>
-       Adds the <filename>share/texmf-nix</filename> subdirectory of each build
-       input to the <envar>TEXINPUTS</envar> environment variable.
+       Adds the <filename>share/texmf-nix</filename> subdirectory of each build input to the <envar>TEXINPUTS</envar> environment variable.
       </para>
      </listitem>
     </varlistentry>
@@ -2612,9 +1957,7 @@ addEnvHooks "$hostOffset" myBashFunction
      </term>
      <listitem>
       <para>
-       Exports <envar>GDK_PIXBUF_MODULE_FILE</envar> environment variable to
-       the builder. Add librsvg package to <varname>buildInputs</varname> to
-       get svg support.
+       Exports <envar>GDK_PIXBUF_MODULE_FILE</envar> environment variable to the builder. Add librsvg package to <varname>buildInputs</varname> to get svg support.
       </para>
      </listitem>
     </varlistentry>
@@ -2624,8 +1967,7 @@ addEnvHooks "$hostOffset" myBashFunction
      </term>
      <listitem>
       <para>
-       Creates a temporary package database and registers every Haskell build
-       input in it (TODO: how?).
+       Creates a temporary package database and registers every Haskell build input in it (TODO: how?).
       </para>
      </listitem>
     </varlistentry>
@@ -2635,8 +1977,7 @@ addEnvHooks "$hostOffset" myBashFunction
      </term>
      <listitem>
       <para>
-       Hooks related to GNOME platform and related libraries like GLib, GTK and
-       GStreamer are described in <xref linkend="sec-language-gnome" />.
+       Hooks related to GNOME platform and related libraries like GLib, GTK and GStreamer are described in <xref linkend="sec-language-gnome" />.
       </para>
      </listitem>
     </varlistentry>
@@ -2646,15 +1987,10 @@ addEnvHooks "$hostOffset" myBashFunction
      </term>
      <listitem>
       <para>
-       This is a special setup hook which helps in packaging proprietary
-       software in that it automatically tries to find missing shared library
-       dependencies of ELF files based on the given
-       <varname>buildInputs</varname> and <varname>nativeBuildInputs</varname>.
+       This is a special setup hook which helps in packaging proprietary software in that it automatically tries to find missing shared library dependencies of ELF files based on the given <varname>buildInputs</varname> and <varname>nativeBuildInputs</varname>.
       </para>
       <para>
-       You can also specify a <envar>runtimeDependencies</envar> environment
-       variable which lists dependencies that are unconditionally added to all
-       executables.
+       You can also specify a <envar>runtimeDependencies</envar> environment variable which lists dependencies that are unconditionally added to all executables.
       </para>
       <para>
        This is useful for programs that use <citerefentry>
@@ -2662,16 +1998,10 @@ addEnvHooks "$hostOffset" myBashFunction
        <manvolnum>3</manvolnum> </citerefentry> to load libraries at runtime.
       </para>
       <para>
-       In certain situations you may want to run the main command
-       (<command>autoPatchelf</command>) of the setup hook on a file or a set
-       of directories instead of unconditionally patching all outputs. This can
-       be done by setting the <envar>dontAutoPatchelf</envar> environment
-       variable to a non-empty value.
+       In certain situations you may want to run the main command (<command>autoPatchelf</command>) of the setup hook on a file or a set of directories instead of unconditionally patching all outputs. This can be done by setting the <envar>dontAutoPatchelf</envar> environment variable to a non-empty value.
       </para>
       <para>
-       The <command>autoPatchelf</command> command also recognizes a
-       <parameter class="command">--no-recurse</parameter> command line flag,
-       which prevents it from recursing into subdirectories.
+       The <command>autoPatchelf</command> command also recognizes a <parameter class="command">--no-recurse</parameter> command line flag, which prevents it from recursing into subdirectories.
       </para>
      </listitem>
     </varlistentry>
@@ -2681,36 +2011,16 @@ addEnvHooks "$hostOffset" myBashFunction
      </term>
      <listitem>
       <para>
-       This hook will make a build pause instead of stopping when a failure
-       happens. It prevents nix from cleaning up the build environment
-       immediately and allows the user to attach to a build environment using
-       the <command>cntr</command> command. Upon build error it will print
-       instructions on how to use <command>cntr</command>, which can be used to
-       enter the environment for debugging. Installing cntr and running the
-       command will provide shell access to the build sandbox of failed build.
-       At <filename>/var/lib/cntr</filename> the sandboxed filesystem is
-       mounted. All commands and files of the system are still accessible
-       within the shell. To execute commands from the sandbox use the cntr exec
-       subcommand. <command>cntr</command> is only supported on Linux-based
-       platforms. To use it first add <literal>cntr</literal> to your
-       <literal>environment.systemPackages</literal> on NixOS or alternatively
-       to the root user on non-NixOS systems. Then in the package that is
-       supposed to be inspected, add <literal>breakpointHook</literal> to
-       <literal>nativeBuildInputs</literal>.
+       This hook will make a build pause instead of stopping when a failure happens. It prevents nix from cleaning up the build environment immediately and allows the user to attach to a build environment using the <command>cntr</command> command. Upon build error it will print instructions on how to use <command>cntr</command>, which can be used to enter the environment for debugging. Installing cntr and running the command will provide shell access to the build sandbox of failed build. At <filename>/var/lib/cntr</filename> the sandboxed filesystem is mounted. All commands and files of the system are still accessible within the shell. To execute commands from the sandbox use the cntr exec subcommand. <command>cntr</command> is only supported on Linux-based platforms. To use it first add <literal>cntr</literal> to your <literal>environment.systemPackages</literal> on NixOS or alternatively to the root user on non-NixOS systems. Then in the package that is supposed to be inspected, add <literal>breakpointHook</literal> to <literal>nativeBuildInputs</literal>.
 <programlisting>
 nativeBuildInputs = [ breakpointHook ];
 </programlisting>
-       When a build failure happens there will be an instruction printed that
-       shows how to attach with <literal>cntr</literal> to the build sandbox.
+       When a build failure happens there will be an instruction printed that shows how to attach with <literal>cntr</literal> to the build sandbox.
       </para>
       <note>
        <title>Caution with remote builds</title>
        <para>
-        This won't work with remote builds as the build environment is on a
-        different machine and can't be accessed by <command>cntr</command>.
-        Remote builds can be turned off by setting <literal>--option builders
-        ''</literal> for <command>nix-build</command> or <literal>--builders
-        ''</literal> for <command>nix build</command>.
+        This won't work with remote builds as the build environment is on a different machine and can't be accessed by <command>cntr</command>. Remote builds can be turned off by setting <literal>--option builders ''</literal> for <command>nix-build</command> or <literal>--builders ''</literal> for <command>nix build</command>.
        </para>
       </note>
      </listitem>
@@ -2721,28 +2031,13 @@ nativeBuildInputs = [ breakpointHook ];
      </term>
      <listitem>
       <para>
-       This hook helps with installing manpages and shell completion files. It
-       exposes 2 shell functions <literal>installManPage</literal> and
-       <literal>installShellCompletion</literal> that can be used from your
-       <literal>postInstall</literal> hook.
+       This hook helps with installing manpages and shell completion files. It exposes 2 shell functions <literal>installManPage</literal> and <literal>installShellCompletion</literal> that can be used from your <literal>postInstall</literal> hook.
       </para>
       <para>
-       The <literal>installManPage</literal> function takes one or more paths
-       to manpages to install. The manpages must have a section suffix, and may
-       optionally be compressed (with <literal>.gz</literal> suffix). This
-       function will place them into the correct directory.
+       The <literal>installManPage</literal> function takes one or more paths to manpages to install. The manpages must have a section suffix, and may optionally be compressed (with <literal>.gz</literal> suffix). This function will place them into the correct directory.
       </para>
       <para>
-       The <literal>installShellCompletion</literal> function takes one or more
-       paths to shell completion files. By default it will autodetect the shell
-       type from the completion file extension, but you may also specify it by
-       passing one of <literal>--bash</literal>, <literal>--fish</literal>, or
-       <literal>--zsh</literal>. These flags apply to all paths listed after
-       them (up until another shell flag is given). Each path may also have a
-       custom installation name provided by providing a flag <literal>--name
-       NAME</literal> before the path. If this flag is not provided, zsh
-       completions will be renamed automatically such that
-       <literal>foobar.zsh</literal> becomes <literal>_foobar</literal>.
+       The <literal>installShellCompletion</literal> function takes one or more paths to shell completion files. By default it will autodetect the shell type from the completion file extension, but you may also specify it by passing one of <literal>--bash</literal>, <literal>--fish</literal>, or <literal>--zsh</literal>. These flags apply to all paths listed after them (up until another shell flag is given). Each path may also have a custom installation name provided by providing a flag <literal>--name NAME</literal> before the path. If this flag is not provided, zsh completions will be renamed automatically such that <literal>foobar.zsh</literal> becomes <literal>_foobar</literal>.
 <programlisting>
 nativeBuildInputs = [ installShellFiles ];
 postInstall = ''
@@ -2764,13 +2059,7 @@ postInstall = ''
      </term>
      <listitem>
       <para>
-       A few libraries automatically add to <literal>NIX_LDFLAGS</literal>
-       their library, making their symbols automatically available to the
-       linker. This includes libiconv and libintl (gettext). This is done to
-       provide compatibility between GNU Linux, where libiconv and libintl are
-       bundled in, and other systems where that might not be the case.
-       Sometimes, this behavior is not desired. To disable this behavior, set
-       <literal>dontAddExtraLibs</literal>.
+       A few libraries automatically add to <literal>NIX_LDFLAGS</literal> their library, making their symbols automatically available to the linker. This includes libiconv and libintl (gettext). This is done to provide compatibility between GNU Linux, where libiconv and libintl are bundled in, and other systems where that might not be the case. Sometimes, this behavior is not desired. To disable this behavior, set <literal>dontAddExtraLibs</literal>.
       </para>
      </listitem>
     </varlistentry>
@@ -2780,16 +2069,7 @@ postInstall = ''
      </term>
      <listitem>
       <para>
-       Overrides the default configure phase to run the CMake command. By
-       default, we use the Make generator of CMake. In addition, dependencies
-       are added automatically to CMAKE_PREFIX_PATH so that packages are
-       correctly detected by CMake. Some additional flags are passed in to give
-       similar behavior to configure-based packages. You can disable this
-       hook’s behavior by setting configurePhase to a custom value, or by
-       setting dontUseCmakeConfigure. cmakeFlags controls flags passed only to
-       CMake. By default, parallel building is enabled as CMake supports
-       parallel building almost everywhere. When Ninja is also in use, CMake
-       will detect that and use the ninja generator.
+       Overrides the default configure phase to run the CMake command. By default, we use the Make generator of CMake. In addition, dependencies are added automatically to CMAKE_PREFIX_PATH so that packages are correctly detected by CMake. Some additional flags are passed in to give similar behavior to configure-based packages. You can disable this hook’s behavior by setting configurePhase to a custom value, or by setting dontUseCmakeConfigure. cmakeFlags controls flags passed only to CMake. By default, parallel building is enabled as CMake supports parallel building almost everywhere. When Ninja is also in use, CMake will detect that and use the ninja generator.
       </para>
      </listitem>
     </varlistentry>
@@ -2799,11 +2079,7 @@ postInstall = ''
      </term>
      <listitem>
       <para>
-       Overrides the build and install phases to run the “xcbuild” command.
-       This hook is needed when a project only comes with build files for the
-       XCode build system. You can disable this behavior by setting buildPhase
-       and configurePhase to a custom value. xcbuildFlags controls flags passed
-       only to xcbuild.
+       Overrides the build and install phases to run the “xcbuild” command. This hook is needed when a project only comes with build files for the XCode build system. You can disable this behavior by setting buildPhase and configurePhase to a custom value. xcbuildFlags controls flags passed only to xcbuild.
       </para>
      </listitem>
     </varlistentry>
@@ -2813,10 +2089,7 @@ postInstall = ''
      </term>
      <listitem>
       <para>
-       Overrides the configure phase to run meson to generate Ninja files. To
-       run these files, you should accompany Meson with ninja. By default,
-       <varname>enableParallelBuilding</varname> is enabled as Meson supports
-       parallel building almost everywhere.
+       Overrides the configure phase to run meson to generate Ninja files. To run these files, you should accompany Meson with ninja. By default, <varname>enableParallelBuilding</varname> is enabled as Meson supports parallel building almost everywhere.
       </para>
       <variablelist>
        <title>Variables controlling Meson</title>
@@ -2836,10 +2109,8 @@ postInstall = ''
         </term>
         <listitem>
          <para>
-          Which
-          <link
-          xlink:href="https://mesonbuild.com/Builtin-options.html#core-options"><command>--buildtype</command></link>
-          to pass to Meson. We default to <literal>plain</literal>.
+          Which <link
+          xlink:href="https://mesonbuild.com/Builtin-options.html#core-options"><command>--buildtype</command></link> to pass to Meson. We default to <literal>plain</literal>.
          </para>
         </listitem>
        </varlistentry>
@@ -2849,10 +2120,8 @@ postInstall = ''
         </term>
         <listitem>
          <para>
-          What value to set
-          <link
-          xlink:href="https://mesonbuild.com/Builtin-options.html#core-options"><command>-Dauto_features=</command></link>
-          to. We default to <command>enabled</command>.
+          What value to set <link
+          xlink:href="https://mesonbuild.com/Builtin-options.html#core-options"><command>-Dauto_features=</command></link> to. We default to <command>enabled</command>.
          </para>
         </listitem>
        </varlistentry>
@@ -2862,11 +2131,8 @@ postInstall = ''
         </term>
         <listitem>
          <para>
-          What value to set
-          <link
-          xlink:href="https://mesonbuild.com/Builtin-options.html#core-options"><command>-Dwrap_mode=</command></link>
-          to. We default to <command>nodownload</command> as we disallow
-          network access.
+          What value to set <link
+          xlink:href="https://mesonbuild.com/Builtin-options.html#core-options"><command>-Dwrap_mode=</command></link> to. We default to <command>nodownload</command> as we disallow network access.
          </para>
         </listitem>
        </varlistentry>
@@ -2889,10 +2155,7 @@ postInstall = ''
      </term>
      <listitem>
       <para>
-       Overrides the build, install, and check phase to run ninja instead of
-       make. You can disable this behavior with the dontUseNinjaBuild,
-       dontUseNinjaInstall, and dontUseNinjaCheck, respectively. Parallel
-       building is enabled by default in Ninja.
+       Overrides the build, install, and check phase to run ninja instead of make. You can disable this behavior with the dontUseNinjaBuild, dontUseNinjaInstall, and dontUseNinjaCheck, respectively. Parallel building is enabled by default in Ninja.
       </para>
      </listitem>
     </varlistentry>
@@ -2902,8 +2165,7 @@ postInstall = ''
      </term>
      <listitem>
       <para>
-       This setup hook will allow you to unzip .zip files specified in $src.
-       There are many similar packages like unrar, undmg, etc.
+       This setup hook will allow you to unzip .zip files specified in $src. There are many similar packages like unrar, undmg, etc.
       </para>
      </listitem>
     </varlistentry>
@@ -2913,10 +2175,7 @@ postInstall = ''
      </term>
      <listitem>
       <para>
-       Overrides the configure, build, and install phases. This will run the
-       "waf" script used by many projects. If wafPath (default ./waf) doesn’t
-       exist, it will copy the version of waf available in Nixpkgs. wafFlags
-       can be used to pass flags to the waf script.
+       Overrides the configure, build, and install phases. This will run the "waf" script used by many projects. If wafPath (default ./waf) doesn’t exist, it will copy the version of waf available in Nixpkgs. wafFlags can be used to pass flags to the waf script.
       </para>
      </listitem>
     </varlistentry>
@@ -2926,9 +2185,7 @@ postInstall = ''
      </term>
      <listitem>
       <para>
-       Overrides the build, install, and check phases. This uses the scons
-       build system as a replacement for make. scons does not provide a
-       configure phase, so everything is managed at build and install time.
+       Overrides the build, install, and check phases. This uses the scons build system as a replacement for make. scons does not provide a configure phase, so everything is managed at build and install time.
       </para>
      </listitem>
     </varlistentry>
@@ -2939,40 +2196,26 @@ postInstall = ''
   <title>Purity in Nixpkgs</title>
 
   <para>
-   [measures taken to prevent dependencies on packages outside the store, and
-   what you can do to prevent them]
+   [measures taken to prevent dependencies on packages outside the store, and what you can do to prevent them]
   </para>
 
   <para>
-   GCC doesn't search in locations such as <filename>/usr/include</filename>.
-   In fact, attempts to add such directories through the <option>-I</option>
-   flag are filtered out. Likewise, the linker (from GNU binutils) doesn't
-   search in standard locations such as <filename>/usr/lib</filename>. Programs
-   built on Linux are linked against a GNU C Library that likewise doesn't
-   search in the default system locations.
+   GCC doesn't search in locations such as <filename>/usr/include</filename>. In fact, attempts to add such directories through the <option>-I</option> flag are filtered out. Likewise, the linker (from GNU binutils) doesn't search in standard locations such as <filename>/usr/lib</filename>. Programs built on Linux are linked against a GNU C Library that likewise doesn't search in the default system locations.
   </para>
  </section>
  <section xml:id="sec-hardening-in-nixpkgs">
   <title>Hardening in Nixpkgs</title>
 
   <para>
-   There are flags available to harden packages at compile or link-time. These
-   can be toggled using the <varname>stdenv.mkDerivation</varname> parameters
-   <varname>hardeningDisable</varname> and <varname>hardeningEnable</varname>.
+   There are flags available to harden packages at compile or link-time. These can be toggled using the <varname>stdenv.mkDerivation</varname> parameters <varname>hardeningDisable</varname> and <varname>hardeningEnable</varname>.
   </para>
 
   <para>
-   Both parameters take a list of flags as strings. The special
-   <varname>"all"</varname> flag can be passed to
-   <varname>hardeningDisable</varname> to turn off all hardening. These flags
-   can also be used as environment variables for testing or development
-   purposes.
+   Both parameters take a list of flags as strings. The special <varname>"all"</varname> flag can be passed to <varname>hardeningDisable</varname> to turn off all hardening. These flags can also be used as environment variables for testing or development purposes.
   </para>
 
   <para>
-   The following flags are enabled by default and might require disabling with
-   <varname>hardeningDisable</varname> if the program to package is
-   incompatible.
+   The following flags are enabled by default and might require disabling with <varname>hardeningDisable</varname> if the program to package is incompatible.
   </para>
 
   <variablelist>
@@ -2982,13 +2225,7 @@ postInstall = ''
     </term>
     <listitem>
      <para>
-      Adds the <option>-Wformat -Wformat-security
-      -Werror=format-security</option> compiler options. At present, this warns
-      about calls to <varname>printf</varname> and <varname>scanf</varname>
-      functions where the format string is not a string literal and there are
-      no format arguments, as in <literal>printf(foo);</literal>. This may be a
-      security hole if the format string came from untrusted input and contains
-      <literal>%n</literal>.
+      Adds the <option>-Wformat -Wformat-security -Werror=format-security</option> compiler options. At present, this warns about calls to <varname>printf</varname> and <varname>scanf</varname> functions where the format string is not a string literal and there are no format arguments, as in <literal>printf(foo);</literal>. This may be a security hole if the format string came from untrusted input and contains <literal>%n</literal>.
      </para>
      <para>
       This needs to be turned off or fixed for errors similar to:
@@ -3007,12 +2244,7 @@ cc1plus: some warnings being treated as errors
     </term>
     <listitem>
      <para>
-      Adds the <option>-fstack-protector-strong --param
-      ssp-buffer-size=4</option> compiler options. This adds safety checks
-      against stack overwrites rendering many potential code injection attacks
-      into aborting situations. In the best case this turns code injection
-      vulnerabilities into denial of service or into non-issues (depending on
-      the application).
+      Adds the <option>-fstack-protector-strong --param ssp-buffer-size=4</option> compiler options. This adds safety checks against stack overwrites rendering many potential code injection attacks into aborting situations. In the best case this turns code injection vulnerabilities into denial of service or into non-issues (depending on the application).
      </para>
      <para>
       This needs to be turned off or fixed for errors similar to:
@@ -3029,19 +2261,10 @@ bin/blib.a(bios_console.o): In function `bios_handle_cup':
     </term>
     <listitem>
      <para>
-      Adds the <option>-O2 -D_FORTIFY_SOURCE=2</option> compiler options.
-      During code generation the compiler knows a great deal of information
-      about buffer sizes (where possible), and attempts to replace insecure
-      unlimited length buffer function calls with length-limited ones. This is
-      especially useful for old, crufty code. Additionally, format strings in
-      writable memory that contain '%n' are blocked. If an application depends
-      on such a format string, it will need to be worked around.
+      Adds the <option>-O2 -D_FORTIFY_SOURCE=2</option> compiler options. During code generation the compiler knows a great deal of information about buffer sizes (where possible), and attempts to replace insecure unlimited length buffer function calls with length-limited ones. This is especially useful for old, crufty code. Additionally, format strings in writable memory that contain '%n' are blocked. If an application depends on such a format string, it will need to be worked around.
      </para>
      <para>
-      Additionally, some warnings are enabled which might trigger build
-      failures if compiler warnings are treated as errors in the package build.
-      In this case, set <option>NIX_CFLAGS_COMPILE</option> to
-      <option>-Wno-error=warning-type</option>.
+      Additionally, some warnings are enabled which might trigger build failures if compiler warnings are treated as errors in the package build. In this case, set <option>NIX_CFLAGS_COMPILE</option> to <option>-Wno-error=warning-type</option>.
      </para>
      <para>
       This needs to be turned off or fixed for errors similar to:
@@ -3070,15 +2293,10 @@ fcntl2.h:50:4: error: call to '__open_missing_mode' declared with attribute erro
     </term>
     <listitem>
      <para>
-      Adds the <option>-fPIC</option> compiler options. This options adds
-      support for position independent code in shared libraries and thus making
-      ASLR possible.
+      Adds the <option>-fPIC</option> compiler options. This options adds support for position independent code in shared libraries and thus making ASLR possible.
      </para>
      <para>
-      Most notably, the Linux kernel, kernel modules and other code not running
-      in an operating system environment like boot loaders won't build with PIC
-      enabled. The compiler will is most cases complain that PIC is not
-      supported for a specific build.
+      Most notably, the Linux kernel, kernel modules and other code not running in an operating system environment like boot loaders won't build with PIC enabled. The compiler will is most cases complain that PIC is not supported for a specific build.
      </para>
      <para>
       This needs to be turned off or fixed for assembler errors similar to:
@@ -3095,13 +2313,7 @@ ccbLfRgg.s:33: Error: missing or invalid displacement expression `private_key_le
     </term>
     <listitem>
      <para>
-      Signed integer overflow is undefined behaviour according to the C
-      standard. If it happens, it is an error in the program as it should check
-      for overflow before it can happen, not afterwards. GCC provides built-in
-      functions to perform arithmetic with overflow checking, which are correct
-      and faster than any custom implementation. As a workaround, the option
-      <option>-fno-strict-overflow</option> makes gcc behave as if signed
-      integer overflows were defined.
+      Signed integer overflow is undefined behaviour according to the C standard. If it happens, it is an error in the program as it should check for overflow before it can happen, not afterwards. GCC provides built-in functions to perform arithmetic with overflow checking, which are correct and faster than any custom implementation. As a workaround, the option <option>-fno-strict-overflow</option> makes gcc behave as if signed integer overflows were defined.
      </para>
      <para>
       This flag should not trigger any build or runtime errors.
@@ -3114,18 +2326,10 @@ ccbLfRgg.s:33: Error: missing or invalid displacement expression `private_key_le
     </term>
     <listitem>
      <para>
-      Adds the <option>-z relro</option> linker option. During program load,
-      several ELF memory sections need to be written to by the linker, but can
-      be turned read-only before turning over control to the program. This
-      prevents some GOT (and .dtors) overwrite attacks, but at least the part
-      of the GOT used by the dynamic linker (.got.plt) is still vulnerable.
+      Adds the <option>-z relro</option> linker option. During program load, several ELF memory sections need to be written to by the linker, but can be turned read-only before turning over control to the program. This prevents some GOT (and .dtors) overwrite attacks, but at least the part of the GOT used by the dynamic linker (.got.plt) is still vulnerable.
      </para>
      <para>
-      This flag can break dynamic shared object loading. For instance, the
-      module systems of Xorg and OpenCV are incompatible with this flag. In
-      almost all cases the <varname>bindnow</varname> flag must also be
-      disabled and incompatible programs typically fail with similar errors at
-      runtime.
+      This flag can break dynamic shared object loading. For instance, the module systems of Xorg and OpenCV are incompatible with this flag. In almost all cases the <varname>bindnow</varname> flag must also be disabled and incompatible programs typically fail with similar errors at runtime.
      </para>
     </listitem>
    </varlistentry>
@@ -3135,18 +2339,10 @@ ccbLfRgg.s:33: Error: missing or invalid displacement expression `private_key_le
     </term>
     <listitem>
      <para>
-      Adds the <option>-z bindnow</option> linker option. During program load,
-      all dynamic symbols are resolved, allowing for the complete GOT to be
-      marked read-only (due to <varname>relro</varname>). This prevents GOT
-      overwrite attacks. For very large applications, this can incur some
-      performance loss during initial load while symbols are resolved, but this
-      shouldn't be an issue for daemons.
+      Adds the <option>-z bindnow</option> linker option. During program load, all dynamic symbols are resolved, allowing for the complete GOT to be marked read-only (due to <varname>relro</varname>). This prevents GOT overwrite attacks. For very large applications, this can incur some performance loss during initial load while symbols are resolved, but this shouldn't be an issue for daemons.
      </para>
      <para>
-      This flag can break dynamic shared object loading. For instance, the
-      module systems of Xorg and PHP are incompatible with this flag. Programs
-      incompatible with this flag often fail at runtime due to missing symbols,
-      like:
+      This flag can break dynamic shared object loading. For instance, the module systems of Xorg and PHP are incompatible with this flag. Programs incompatible with this flag often fail at runtime due to missing symbols, like:
      </para>
 <programlisting>
 intel_drv.so: undefined symbol: vgaHWFreeHWRec
@@ -3156,9 +2352,7 @@ intel_drv.so: undefined symbol: vgaHWFreeHWRec
   </variablelist>
 
   <para>
-   The following flags are disabled by default and should be enabled with
-   <varname>hardeningEnable</varname> for packages that take untrusted input
-   like network services.
+   The following flags are disabled by default and should be enabled with <varname>hardeningEnable</varname> for packages that take untrusted input like network services.
   </para>
 
   <variablelist>
@@ -3168,31 +2362,14 @@ intel_drv.so: undefined symbol: vgaHWFreeHWRec
     </term>
     <listitem>
      <para>
-      Adds the <option>-fPIE</option> compiler and <option>-pie</option> linker
-      options. Position Independent Executables are needed to take advantage of
-      Address Space Layout Randomization, supported by modern kernel versions.
-      While ASLR can already be enforced for data areas in the stack and heap
-      (brk and mmap), the code areas must be compiled as position-independent.
-      Shared libraries already do this with the <varname>pic</varname> flag, so
-      they gain ASLR automatically, but binary .text regions need to be build
-      with <varname>pie</varname> to gain ASLR. When this happens, ROP attacks
-      are much harder since there are no static locations to bounce off of
-      during a memory corruption attack.
+      Adds the <option>-fPIE</option> compiler and <option>-pie</option> linker options. Position Independent Executables are needed to take advantage of Address Space Layout Randomization, supported by modern kernel versions. While ASLR can already be enforced for data areas in the stack and heap (brk and mmap), the code areas must be compiled as position-independent. Shared libraries already do this with the <varname>pic</varname> flag, so they gain ASLR automatically, but binary .text regions need to be build with <varname>pie</varname> to gain ASLR. When this happens, ROP attacks are much harder since there are no static locations to bounce off of during a memory corruption attack.
      </para>
     </listitem>
    </varlistentry>
   </variablelist>
 
   <para>
-   For more in-depth information on these hardening flags and hardening in
-   general, refer to the
-   <link xlink:href="https://wiki.debian.org/Hardening">Debian Wiki</link>,
-   <link xlink:href="https://wiki.ubuntu.com/Security/Features">Ubuntu
-   Wiki</link>,
-   <link xlink:href="https://wiki.gentoo.org/wiki/Project:Hardened">Gentoo
-   Wiki</link>, and the
-   <link xlink:href="https://wiki.archlinux.org/index.php/DeveloperWiki:Security">
-   Arch Wiki</link>.
+   For more in-depth information on these hardening flags and hardening in general, refer to the <link xlink:href="https://wiki.debian.org/Hardening">Debian Wiki</link>, <link xlink:href="https://wiki.ubuntu.com/Security/Features">Ubuntu Wiki</link>, <link xlink:href="https://wiki.gentoo.org/wiki/Project:Hardened">Gentoo Wiki</link>, and the <link xlink:href="https://wiki.archlinux.org/index.php/DeveloperWiki:Security"> Arch Wiki</link>.
   </para>
  </section>
 </chapter>
diff --git a/doc/submitting-changes.xml b/doc/submitting-changes.xml
index a04ec08b048..9c98abbe87a 100644
--- a/doc/submitting-changes.xml
+++ b/doc/submitting-changes.xml
@@ -8,8 +8,7 @@
   <itemizedlist>
    <listitem>
     <para>
-     Read <link xlink:href="https://nixos.org/nixpkgs/manual/">Manual (How to
-     write packages for Nix)</link>.
+     Read <link xlink:href="https://nixos.org/nixpkgs/manual/">Manual (How to write packages for Nix)</link>.
     </para>
    </listitem>
    <listitem>
@@ -23,15 +22,11 @@
      <itemizedlist>
       <listitem>
        <para>
-        You can make branch from a commit of your local
-        <command>nixos-version</command>. That will help you to avoid
-        additional local compilations. Because you will receive packages from
-        binary cache.
+        You can make branch from a commit of your local <command>nixos-version</command>. That will help you to avoid additional local compilations. Because you will receive packages from binary cache.
         <itemizedlist>
          <listitem>
           <para>
-           For example: <command>nixos-version</command> returns
-           <command>15.05.git.0998212 (Dingo)</command>. So you can do:
+           For example: <command>nixos-version</command> returns <command>15.05.git.0998212 (Dingo)</command>. So you can do:
           </para>
          </listitem>
         </itemizedlist>
@@ -55,9 +50,7 @@
      <itemizedlist>
       <listitem>
        <para>
-        If you removed pkgs, made some major NixOS changes etc., write about
-        them in
-        <command>nixos/doc/manual/release-notes/rl-unstable.xml</command>.
+        If you removed pkgs, made some major NixOS changes etc., write about them in <command>nixos/doc/manual/release-notes/rl-unstable.xml</command>.
        </para>
       </listitem>
      </itemizedlist>
@@ -65,8 +58,7 @@
    </listitem>
    <listitem>
     <para>
-     Check for unnecessary whitespace with <command>git diff --check</command>
-     before committing.
+     Check for unnecessary whitespace with <command>git diff --check</command> before committing.
     </para>
    </listitem>
    <listitem>
@@ -121,8 +113,7 @@ Additional information.
            <itemizedlist>
             <listitem>
              <para>
-              <command>nix-env -i pkg-name -f &lt;path to your local nixpkgs
-              folder&gt;</command>
+              <command>nix-env -i pkg-name -f &lt;path to your local nixpkgs folder&gt;</command>
              </para>
             </listitem>
            </itemizedlist>
@@ -134,14 +125,12 @@ Additional information.
            <itemizedlist>
             <listitem>
              <para>
-              Make sure it's in
-              <command>pkgs/top-level/all-packages.nix</command>
+              Make sure it's in <command>pkgs/top-level/all-packages.nix</command>
              </para>
             </listitem>
             <listitem>
              <para>
-              <command>nix-env -i pkg-name -f &lt;path to your local nixpkgs
-              folder&gt;</command>
+              <command>nix-env -i pkg-name -f &lt;path to your local nixpkgs folder&gt;</command>
              </para>
             </listitem>
            </itemizedlist>
@@ -149,15 +138,11 @@ Additional information.
          </listitem>
          <listitem>
           <para>
-           <emphasis>If you don't want to install pkg in you
-           profile</emphasis>.
+           <emphasis>If you don't want to install pkg in you profile</emphasis>.
            <itemizedlist>
             <listitem>
              <para>
-              <command>nix-build -A pkg-attribute-name &lt;path to your local
-              nixpkgs folder&gt;/default.nix</command> and check results in the
-              folder <command>result</command>. It will appear in the same
-              directory where you did <command>nix-build</command>.
+              <command>nix-build -A pkg-attribute-name &lt;path to your local nixpkgs folder&gt;/default.nix</command> and check results in the folder <command>result</command>. It will appear in the same directory where you did <command>nix-build</command>.
              </para>
             </listitem>
            </itemizedlist>
@@ -165,9 +150,7 @@ Additional information.
          </listitem>
          <listitem>
           <para>
-           If you did <command>nix-env -i pkg-name</command> you can do
-           <command>nix-env -e pkg-name</command> to uninstall it from your
-           system.
+           If you did <command>nix-env -i pkg-name</command> you can do <command>nix-env -e pkg-name</command> to uninstall it from your system.
           </para>
          </listitem>
         </itemizedlist>
@@ -179,10 +162,7 @@ Additional information.
         <itemizedlist>
          <listitem>
           <para>
-           You can add new module to your NixOS configuration file (usually
-           it's <command>/etc/nixos/configuration.nix</command>). And do
-           <command>sudo nixos-rebuild test -I nixpkgs=&lt;path to your local
-           nixpkgs folder&gt; --fast</command>.
+           You can add new module to your NixOS configuration file (usually it's <command>/etc/nixos/configuration.nix</command>). And do <command>sudo nixos-rebuild test -I nixpkgs=&lt;path to your local nixpkgs folder&gt; --fast</command>.
           </para>
          </listitem>
         </itemizedlist>
@@ -193,9 +173,7 @@ Additional information.
    </listitem>
    <listitem>
     <para>
-     If you have commits <command>pkg-name: oh, forgot to insert
-     whitespace</command>: squash commits in this case. Use <command>git rebase
-     -i</command>.
+     If you have commits <command>pkg-name: oh, forgot to insert whitespace</command>: squash commits in this case. Use <command>git rebase -i</command>.
     </para>
    </listitem>
    <listitem>
@@ -220,8 +198,7 @@ Additional information.
      <itemizedlist>
       <listitem>
        <para>
-        Write the title in format <command>(pkg-name | nixos/&lt;module>):
-        improvement</command>.
+        Write the title in format <command>(pkg-name | nixos/&lt;module>): improvement</command>.
         <itemizedlist>
          <listitem>
           <para>
@@ -233,8 +210,7 @@ Additional information.
       </listitem>
       <listitem>
        <para>
-        Write in comment if you have tested your patch. Do not rely much on
-        <command>TravisCI</command>.
+        Write in comment if you have tested your patch. Do not rely much on <command>TravisCI</command>.
        </para>
       </listitem>
       <listitem>
@@ -244,8 +220,7 @@ Additional information.
       </listitem>
       <listitem>
        <para>
-        Notify maintainers of the package. For example add to the message:
-        <command>cc @jagajaga @domenkozar</command>.
+        Notify maintainers of the package. For example add to the message: <command>cc @jagajaga @domenkozar</command>.
        </para>
       </listitem>
      </itemizedlist>
@@ -257,64 +232,39 @@ Additional information.
   <title>Pull Request Template</title>
 
   <para>
-   The pull request template helps determine what steps have been made for a
-   contribution so far, and will help guide maintainers on the status of a
-   change. The motivation section of the PR should include any extra details
-   the title does not address and link any existing issues related to the pull
-   request.
+   The pull request template helps determine what steps have been made for a contribution so far, and will help guide maintainers on the status of a change. The motivation section of the PR should include any extra details the title does not address and link any existing issues related to the pull request.
   </para>
 
   <para>
-   When a PR is created, it will be pre-populated with some checkboxes detailed
-   below:
+   When a PR is created, it will be pre-populated with some checkboxes detailed below:
   </para>
 
   <section xml:id="submitting-changes-tested-with-sandbox">
    <title>Tested using sandboxing</title>
 
    <para>
-    When sandbox builds are enabled, Nix will setup an isolated environment for
-    each build process. It is used to remove further hidden dependencies set by
-    the build environment to improve reproducibility. This includes access to
-    the network during the build outside of <function>fetch*</function>
-    functions and files outside the Nix store. Depending on the operating
-    system access to other resources are blocked as well (ex. inter process
-    communication is isolated on Linux); see
-    <link
-      xlink:href="https://nixos.org/nix/manual/#description-45">build-use-sandbox</link>
-    in Nix manual for details.
+    When sandbox builds are enabled, Nix will setup an isolated environment for each build process. It is used to remove further hidden dependencies set by the build environment to improve reproducibility. This includes access to the network during the build outside of <function>fetch*</function> functions and files outside the Nix store. Depending on the operating system access to other resources are blocked as well (ex. inter process communication is isolated on Linux); see <link
+      xlink:href="https://nixos.org/nix/manual/#description-45">build-use-sandbox</link> in Nix manual for details.
    </para>
 
    <para>
-    Sandboxing is not enabled by default in Nix due to a small performance hit
-    on each build. In pull requests for
-    <link
-        xlink:href="https://github.com/NixOS/nixpkgs/">nixpkgs</link>
-    people are asked to test builds with sandboxing enabled (see
-    <literal>Tested using sandboxing</literal> in the pull request template)
-    because
-    in<link
-        xlink:href="https://nixos.org/hydra/">https://nixos.org/hydra/</link>
-    sandboxing is also used.
+    Sandboxing is not enabled by default in Nix due to a small performance hit on each build. In pull requests for <link
+        xlink:href="https://github.com/NixOS/nixpkgs/">nixpkgs</link> people are asked to test builds with sandboxing enabled (see <literal>Tested using sandboxing</literal> in the pull request template) because in<link
+        xlink:href="https://nixos.org/hydra/">https://nixos.org/hydra/</link> sandboxing is also used.
    </para>
 
    <para>
-    Depending if you use NixOS or other platforms you can use one of the
-    following methods to enable sandboxing
-    <emphasis role="bold">before</emphasis> building the package:
+    Depending if you use NixOS or other platforms you can use one of the following methods to enable sandboxing <emphasis role="bold">before</emphasis> building the package:
     <itemizedlist>
      <listitem>
       <para>
-       <emphasis role="bold">Globally enable sandboxing on NixOS</emphasis>:
-       add the following to <filename>configuration.nix</filename>
+       <emphasis role="bold">Globally enable sandboxing on NixOS</emphasis>: add the following to <filename>configuration.nix</filename>
 <screen>nix.useSandbox = true;</screen>
       </para>
      </listitem>
      <listitem>
       <para>
-       <emphasis role="bold">Globally enable sandboxing on non-NixOS
-       platforms</emphasis>: add the following to:
-       <filename>/etc/nix/nix.conf</filename>
+       <emphasis role="bold">Globally enable sandboxing on non-NixOS platforms</emphasis>: add the following to: <filename>/etc/nix/nix.conf</filename>
 <screen>build-use-sandbox = true</screen>
       </para>
      </listitem>
@@ -326,11 +276,7 @@ Additional information.
    <title>Built on platform(s)</title>
 
    <para>
-    Many Nix packages are designed to run on multiple platforms. As such, it's
-    important to let the maintainer know which platforms your changes have been
-    tested on. It's not always practical to test a change on all platforms, and
-    is not required for a pull request to be merged. Only check the systems you
-    tested the build on in this section.
+    Many Nix packages are designed to run on multiple platforms. As such, it's important to let the maintainer know which platforms your changes have been tested on. It's not always practical to test a change on all platforms, and is not required for a pull request to be merged. Only check the systems you tested the build on in this section.
    </para>
   </section>
 
@@ -338,15 +284,8 @@ Additional information.
    <title>Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)</title>
 
    <para>
-    Packages with automated tests are much more likely to be merged in a timely
-    fashion because it doesn't require as much manual testing by the maintainer
-    to verify the functionality of the package. If there are existing tests for
-    the package, they should be run to verify your changes do not break the
-    tests. Tests only apply to packages with NixOS modules defined and can only
-    be run on Linux. For more details on writing and running tests, see the
-    <link
-        xlink:href="https://nixos.org/nixos/manual/index.html#sec-nixos-tests">section
-    in the NixOS manual</link>.
+    Packages with automated tests are much more likely to be merged in a timely fashion because it doesn't require as much manual testing by the maintainer to verify the functionality of the package. If there are existing tests for the package, they should be run to verify your changes do not break the tests. Tests only apply to packages with NixOS modules defined and can only be run on Linux. For more details on writing and running tests, see the <link
+        xlink:href="https://nixos.org/nixos/manual/index.html#sec-nixos-tests">section in the NixOS manual</link>.
    </para>
   </section>
 
@@ -354,11 +293,7 @@ Additional information.
    <title>Tested compilation of all pkgs that depend on this change using <command>nix-review</command></title>
 
    <para>
-    If you are updating a package's version, you can use nix-review to make
-    sure all packages that depend on the updated package still compile
-    correctly. The <command>nix-review</command> utility can look for and build
-    all dependencies either based on uncommited changes with the
-    <literal>wip</literal> option or specifying a github pull request number.
+    If you are updating a package's version, you can use nix-review to make sure all packages that depend on the updated package still compile correctly. The <command>nix-review</command> utility can look for and build all dependencies either based on uncommited changes with the <literal>wip</literal> option or specifying a github pull request number.
    </para>
 
    <para>
@@ -376,13 +311,7 @@ Additional information.
    <title>Tested execution of all binary files (usually in <filename>./result/bin/</filename>)</title>
 
    <para>
-    It's important to test any executables generated by a build when you change
-    or create a package in nixpkgs. This can be done by looking in
-    <filename>./result/bin</filename> and running any files in there, or at a
-    minimum, the main executable for the package. For example, if you make a
-    change to <package>texlive</package>, you probably would only check the
-    binaries associated with the change you made rather than testing all of
-    them.
+    It's important to test any executables generated by a build when you change or create a package in nixpkgs. This can be done by looking in <filename>./result/bin</filename> and running any files in there, or at a minimum, the main executable for the package. For example, if you make a change to <package>texlive</package>, you probably would only check the binaries associated with the change you made rather than testing all of them.
    </para>
   </section>
 
@@ -390,14 +319,8 @@ Additional information.
    <title>Meets Nixpkgs contribution standards</title>
 
    <para>
-    The last checkbox is fits
-    <link
-        xlink:href="https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md">CONTRIBUTING.md</link>.
-    The contributing document has detailed information on standards the Nix
-    community has for commit messages, reviews, licensing of contributions you
-    make to the project, etc... Everyone should read and understand the
-    standards the community has for contributing before submitting a pull
-    request.
+    The last checkbox is fits <link
+        xlink:href="https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md">CONTRIBUTING.md</link>. The contributing document has detailed information on standards the Nix community has for commit messages, reviews, licensing of contributions you make to the project, etc... Everyone should read and understand the standards the community has for contributing before submitting a pull request.
    </para>
   </section>
  </section>
@@ -435,22 +358,17 @@ Additional information.
   <itemizedlist>
    <listitem>
     <para>
-     Commits must be sufficiently tested before being merged, both for the
-     master and staging branches.
+     Commits must be sufficiently tested before being merged, both for the master and staging branches.
     </para>
    </listitem>
    <listitem>
     <para>
-     Hydra builds for master and staging should not be used as testing
-     platform, it's a build farm for changes that have been already tested.
+     Hydra builds for master and staging should not be used as testing platform, it's a build farm for changes that have been already tested.
     </para>
    </listitem>
    <listitem>
     <para>
-     When changing the bootloader installation process, extra care must be
-     taken. Grub installations cannot be rolled back, hence changes may break
-     people's installations forever. For any non-trivial change to the
-     bootloader please file a PR asking for review, especially from @edolstra.
+     When changing the bootloader installation process, extra care must be taken. Grub installations cannot be rolled back, hence changes may break people's installations forever. For any non-trivial change to the bootloader please file a PR asking for review, especially from @edolstra.
     </para>
    </listitem>
   </itemizedlist>
@@ -473,20 +391,12 @@ Additional information.
    <itemizedlist>
     <listitem>
      <para>
-      It's only for non-breaking mass-rebuild commits. That means it's not to
-      be used for testing, and changes must have been well tested already.
-      <link xlink:href="https://web.archive.org/web/20160528180406/http://comments.gmane.org/gmane.linux.distributions.nixos/13447">Read
-      policy here</link>.
+      It's only for non-breaking mass-rebuild commits. That means it's not to be used for testing, and changes must have been well tested already. <link xlink:href="https://web.archive.org/web/20160528180406/http://comments.gmane.org/gmane.linux.distributions.nixos/13447">Read policy here</link>.
      </para>
     </listitem>
     <listitem>
      <para>
-      If the branch is already in a broken state, please refrain from adding
-      extra new breakages. Stabilize it for a few days, merge into master, then
-      resume development on staging.
-      <link xlink:href="http://hydra.nixos.org/jobset/nixpkgs/staging#tabs-evaluations">Keep
-      an eye on the staging evaluations here</link>. If any fixes for staging
-      happen to be already in master, then master can be merged into staging.
+      If the branch is already in a broken state, please refrain from adding extra new breakages. Stabilize it for a few days, merge into master, then resume development on staging. <link xlink:href="http://hydra.nixos.org/jobset/nixpkgs/staging#tabs-evaluations">Keep an eye on the staging evaluations here</link>. If any fixes for staging happen to be already in master, then master can be merged into staging.
      </para>
     </listitem>
    </itemizedlist>
@@ -498,10 +408,7 @@ Additional information.
    <itemizedlist>
     <listitem>
      <para>
-      If you're cherry-picking a commit to a stable release branch, always use
-      <command>git cherry-pick -xe</command> and ensure the message contains a
-      clear description about why this needs to be included in the stable
-      branch.
+      If you're cherry-picking a commit to a stable release branch, always use <command>git cherry-pick -xe</command> and ensure the message contains a clear description about why this needs to be included in the stable branch.
      </para>
      <para>
       An example of a cherry-picked commit would look like this:
-- 
GitLab


From ea6e8775bd69e4676c623a85c39f1da540d29ad1 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 18 Sep 2019 22:13:35 +0200
Subject: [PATCH 0528/2254] nixos/doc: re-format

---
 .../manual/administration/boot-problems.xml   |  32 +-
 .../manual/administration/cleaning-store.xml  |  32 +-
 .../administration/container-networking.xml   |  26 +-
 .../doc/manual/administration/containers.xml  |  19 +-
 .../manual/administration/control-groups.xml  |  33 +-
 .../administration/declarative-containers.xml |  31 +-
 .../administration/imperative-containers.xml  |  57 +-
 nixos/doc/manual/administration/logging.xml   |  19 +-
 .../administration/maintenance-mode.xml       |   4 +-
 .../administration/network-problems.xml       |  13 +-
 nixos/doc/manual/administration/rebooting.xml |  11 +-
 nixos/doc/manual/administration/rollback.xml  |  15 +-
 nixos/doc/manual/administration/running.xml   |   3 +-
 .../manual/administration/service-mgmt.xml    |  26 +-
 .../administration/store-corruption.xml       |  17 +-
 .../manual/administration/troubleshooting.xml |   3 +-
 .../manual/administration/user-sessions.xml   |  15 +-
 .../doc/manual/configuration/abstractions.xml |  48 +-
 .../configuration/ad-hoc-network-config.xml   |   5 +-
 .../manual/configuration/ad-hoc-packages.xml  |  26 +-
 .../configuration/adding-custom-packages.xml  |  23 +-
 .../doc/manual/configuration/config-file.xml  |  71 +-
 .../manual/configuration/config-syntax.xml    |  14 +-
 .../manual/configuration/configuration.xml    |   6 +-
 .../configuration/customizing-packages.xml    |  54 +-
 .../configuration/declarative-packages.xml    |  23 +-
 .../doc/manual/configuration/file-systems.xml |  28 +-
 nixos/doc/manual/configuration/firewall.xml   |  15 +-
 .../doc/manual/configuration/ipv4-config.xml  |  15 +-
 .../doc/manual/configuration/ipv6-config.xml  |  13 +-
 nixos/doc/manual/configuration/kubernetes.xml |  74 +-
 .../doc/manual/configuration/linux-kernel.xml |  59 +-
 .../configuration/luks-file-systems.xml       |  12 +-
 nixos/doc/manual/configuration/matrix.xml     |  73 +-
 nixos/doc/manual/configuration/modularity.xml |  63 +-
 .../manual/configuration/network-manager.xml  |  22 +-
 nixos/doc/manual/configuration/networking.xml |   3 +-
 .../doc/manual/configuration/package-mgmt.xml |  13 +-
 nixos/doc/manual/configuration/profiles.xml   |  13 +-
 .../configuration/profiles/all-hardware.xml   |  10 +-
 .../manual/configuration/profiles/base.xml    |   6 +-
 .../configuration/profiles/clone-config.xml   |  10 +-
 .../manual/configuration/profiles/demo.xml    |   6 +-
 .../profiles/docker-container.xml             |   7 +-
 .../configuration/profiles/graphical.xml      |  11 +-
 .../configuration/profiles/hardened.xml       |  14 +-
 .../configuration/profiles/headless.xml       |   6 +-
 .../profiles/installation-device.xml          |  25 +-
 .../manual/configuration/profiles/minimal.xml |   8 +-
 .../configuration/profiles/qemu-guest.xml     |   7 +-
 nixos/doc/manual/configuration/ssh.xml        |   7 +-
 nixos/doc/manual/configuration/summary.xml    |   8 +-
 nixos/doc/manual/configuration/user-mgmt.xml  |  53 +-
 nixos/doc/manual/configuration/wireless.xml   |  18 +-
 nixos/doc/manual/configuration/x-windows.xml  | 151 +---
 nixos/doc/manual/configuration/xfce.xml       |  21 +-
 nixos/doc/manual/development/assertions.xml   |  18 +-
 .../doc/manual/development/building-nixos.xml |  11 +-
 .../doc/manual/development/building-parts.xml |  31 +-
 .../manual/development/importing-modules.xml  |   7 +-
 .../manual/development/meta-attributes.xml    |  19 +-
 nixos/doc/manual/development/nixos-tests.xml  |   9 +-
 .../development/option-declarations.xml       |  80 +-
 nixos/doc/manual/development/option-def.xml   |  34 +-
 nixos/doc/manual/development/option-types.xml | 208 ++---
 nixos/doc/manual/development/releases.xml     | 126 ++-
 .../manual/development/replace-modules.xml    |  22 +-
 .../running-nixos-tests-interactively.xml     |  14 +-
 .../development/running-nixos-tests.xml       |  13 +-
 nixos/doc/manual/development/sources.xml      |  48 +-
 .../manual/development/testing-installer.xml  |   6 +-
 .../development/writing-documentation.xml     |  74 +-
 .../manual/development/writing-modules.xml    |  69 +-
 .../development/writing-nixos-tests.xml       | 113 +--
 .../manual/installation/changing-config.xml   |  53 +-
 .../doc/manual/installation/installation.xml  |   3 +-
 .../installing-behind-a-proxy.xml             |  15 +-
 .../installing-from-other-distro.xml          | 152 +---
 .../manual/installation/installing-pxe.xml    |  25 +-
 .../manual/installation/installing-usb.xml    |  15 +-
 .../installing-virtualbox-guest.xml           |  29 +-
 nixos/doc/manual/installation/installing.xml  | 230 ++----
 nixos/doc/manual/installation/obtaining.xml   |  38 +-
 nixos/doc/manual/installation/upgrading.xml   |  82 +-
 nixos/doc/manual/man-configuration.xml        |   5 +-
 nixos/doc/manual/man-nixos-build-vms.xml      |  41 +-
 nixos/doc/manual/man-nixos-enter.xml          |  22 +-
 .../doc/manual/man-nixos-generate-config.xml  |  64 +-
 nixos/doc/manual/man-nixos-install.xml        |  95 +--
 nixos/doc/manual/man-nixos-option.xml         |  27 +-
 nixos/doc/manual/man-nixos-rebuild.xml        | 309 +++-----
 nixos/doc/manual/man-nixos-version.xml        |  23 +-
 nixos/doc/manual/manual.xml                   |  21 +-
 .../manual/release-notes/release-notes.xml    |   3 +-
 nixos/doc/manual/release-notes/rl-1404.xml    |  83 +-
 nixos/doc/manual/release-notes/rl-1412.xml    |  81 +-
 nixos/doc/manual/release-notes/rl-1509.xml    | 208 ++---
 nixos/doc/manual/release-notes/rl-1603.xml    | 205 +----
 nixos/doc/manual/release-notes/rl-1609.xml    | 161 +---
 nixos/doc/manual/release-notes/rl-1703.xml    | 193 ++---
 nixos/doc/manual/release-notes/rl-1709.xml    | 292 ++-----
 nixos/doc/manual/release-notes/rl-1803.xml    | 266 ++-----
 nixos/doc/manual/release-notes/rl-1809.xml    | 311 ++------
 nixos/doc/manual/release-notes/rl-1903.xml    | 448 ++---------
 nixos/doc/manual/release-notes/rl-1909.xml    | 731 ++++++++----------
 nixos/doc/manual/release-notes/rl-2003.xml    |   7 +-
 nixos/modules/i18n/input-method/default.xml   |  74 +-
 nixos/modules/programs/digitalbitbox/doc.xml  |  33 +-
 nixos/modules/programs/plotinus.xml           |  13 +-
 nixos/modules/programs/zsh/oh-my-zsh.xml      |  62 +-
 nixos/modules/security/acme.xml               |  30 +-
 nixos/modules/security/hidepid.xml            |  11 +-
 .../services/databases/foundationdb.xml       | 197 +----
 .../modules/services/databases/postgresql.xml |  39 +-
 nixos/modules/services/desktops/flatpak.xml   |  25 +-
 nixos/modules/services/editors/emacs.xml      | 221 ++----
 nixos/modules/services/hardware/trezord.xml   |  10 +-
 nixos/modules/services/misc/gitlab.xml        |  34 +-
 .../modules/services/misc/taskserver/doc.xml  |  74 +-
 nixos/modules/services/misc/weechat.xml       |  21 +-
 .../monitoring/prometheus/exporters.xml       |  51 +-
 .../services/networking/dnscrypt-proxy.xml    |  14 +-
 .../modules/services/web-apps/matomo-doc.xml  |  56 +-
 nixos/modules/services/web-apps/nextcloud.xml |  55 +-
 124 files changed, 1894 insertions(+), 5663 deletions(-)

diff --git a/nixos/doc/manual/administration/boot-problems.xml b/nixos/doc/manual/administration/boot-problems.xml
index de3d8ac21ae..d6f9cb190fb 100644
--- a/nixos/doc/manual/administration/boot-problems.xml
+++ b/nixos/doc/manual/administration/boot-problems.xml
@@ -6,12 +6,7 @@
  <title>Boot Problems</title>
 
  <para>
-  If NixOS fails to boot, there are a number of kernel command line parameters
-  that may help you to identify or fix the issue. You can add these parameters
-  in the GRUB boot menu by pressing “e” to modify the selected boot entry
-  and editing the line starting with <literal>linux</literal>. The following
-  are some useful kernel command line parameters that are recognised by the
-  NixOS boot scripts or by systemd:
+  If NixOS fails to boot, there are a number of kernel command line parameters that may help you to identify or fix the issue. You can add these parameters in the GRUB boot menu by pressing “e” to modify the selected boot entry and editing the line starting with <literal>linux</literal>. The following are some useful kernel command line parameters that are recognised by the NixOS boot scripts or by systemd:
   <variablelist>
    <varlistentry>
     <term>
@@ -19,9 +14,7 @@
     </term>
     <listitem>
      <para>
-      Start a root shell if something goes wrong in stage 1 of the boot process
-      (the initial ramdisk). This is disabled by default because there is no
-      authentication for the root shell.
+      Start a root shell if something goes wrong in stage 1 of the boot process (the initial ramdisk). This is disabled by default because there is no authentication for the root shell.
      </para>
     </listitem>
    </varlistentry>
@@ -31,10 +24,7 @@
     </term>
     <listitem>
      <para>
-      Start an interactive shell in stage 1 before anything useful has been
-      done. That is, no modules have been loaded and no file systems have been
-      mounted, except for <filename>/proc</filename> and
-      <filename>/sys</filename>.
+      Start an interactive shell in stage 1 before anything useful has been done. That is, no modules have been loaded and no file systems have been mounted, except for <filename>/proc</filename> and <filename>/sys</filename>.
      </para>
     </listitem>
    </varlistentry>
@@ -54,11 +44,7 @@
     </term>
     <listitem>
      <para>
-      Boot into rescue mode (a.k.a. single user mode). This will cause systemd
-      to start nothing but the unit <literal>rescue.target</literal>, which
-      runs <command>sulogin</command> to prompt for the root password and start
-      a root login shell. Exiting the shell causes the system to continue with
-      the normal boot process.
+      Boot into rescue mode (a.k.a. single user mode). This will cause systemd to start nothing but the unit <literal>rescue.target</literal>, which runs <command>sulogin</command> to prompt for the root password and start a root login shell. Exiting the shell causes the system to continue with the normal boot process.
      </para>
     </listitem>
    </varlistentry>
@@ -68,8 +54,7 @@
     </term>
     <listitem>
      <para>
-      Make systemd very verbose and send log messages to the console instead of
-      the journal.
+      Make systemd very verbose and send log messages to the console instead of the journal.
      </para>
     </listitem>
    </varlistentry>
@@ -80,11 +65,6 @@
  </para>
 
  <para>
-  If no login prompts or X11 login screens appear (e.g. due to hanging
-  dependencies), you can press Alt+ArrowUp. If you’re lucky, this will start
-  rescue mode (described above). (Also note that since most units have a
-  90-second timeout before systemd gives up on them, the
-  <command>agetty</command> login prompts should appear eventually unless
-  something is very wrong.)
+  If no login prompts or X11 login screens appear (e.g. due to hanging dependencies), you can press Alt+ArrowUp. If you’re lucky, this will start rescue mode (described above). (Also note that since most units have a 90-second timeout before systemd gives up on them, the <command>agetty</command> login prompts should appear eventually unless something is very wrong.)
  </para>
 </section>
diff --git a/nixos/doc/manual/administration/cleaning-store.xml b/nixos/doc/manual/administration/cleaning-store.xml
index 526803e429b..3cbc022cd33 100644
--- a/nixos/doc/manual/administration/cleaning-store.xml
+++ b/nixos/doc/manual/administration/cleaning-store.xml
@@ -5,31 +5,22 @@
         xml:id="sec-nix-gc">
  <title>Cleaning the Nix Store</title>
  <para>
-  Nix has a purely functional model, meaning that packages are never upgraded
-  in place. Instead new versions of packages end up in a different location in
-  the Nix store (<filename>/nix/store</filename>). You should periodically run
-  Nix’s <emphasis>garbage collector</emphasis> to remove old, unreferenced
-  packages. This is easy:
+  Nix has a purely functional model, meaning that packages are never upgraded in place. Instead new versions of packages end up in a different location in the Nix store (<filename>/nix/store</filename>). You should periodically run Nix’s <emphasis>garbage collector</emphasis> to remove old, unreferenced packages. This is easy:
 <screen>
 <prompt>$ </prompt>nix-collect-garbage
 </screen>
-  Alternatively, you can use a systemd unit that does the same in the
-  background:
+  Alternatively, you can use a systemd unit that does the same in the background:
 <screen>
 <prompt># </prompt>systemctl start nix-gc.service
 </screen>
-  You can tell NixOS in <filename>configuration.nix</filename> to run this unit
-  automatically at certain points in time, for instance, every night at 03:15:
+  You can tell NixOS in <filename>configuration.nix</filename> to run this unit automatically at certain points in time, for instance, every night at 03:15:
 <programlisting>
 <xref linkend="opt-nix.gc.automatic"/> = true;
 <xref linkend="opt-nix.gc.dates"/> = "03:15";
 </programlisting>
  </para>
  <para>
-  The commands above do not remove garbage collector roots, such as old system
-  configurations. Thus they do not remove the ability to roll back to previous
-  configurations. The following command deletes old roots, removing the ability
-  to roll back to them:
+  The commands above do not remove garbage collector roots, such as old system configurations. Thus they do not remove the ability to roll back to previous configurations. The following command deletes old roots, removing the ability to roll back to them:
 <screen>
 <prompt>$ </prompt>nix-collect-garbage -d
 </screen>
@@ -37,27 +28,20 @@
 <screen>
 <prompt>$ </prompt>nix-env -p /nix/var/nix/profiles/per-user/eelco/profile --delete-generations old
 </screen>
-  Note that NixOS system configurations are stored in the profile
-  <filename>/nix/var/nix/profiles/system</filename>.
+  Note that NixOS system configurations are stored in the profile <filename>/nix/var/nix/profiles/system</filename>.
  </para>
  <para>
-  Another way to reclaim disk space (often as much as 40% of the size of the
-  Nix store) is to run Nix’s store optimiser, which seeks out identical files
-  in the store and replaces them with hard links to a single copy.
+  Another way to reclaim disk space (often as much as 40% of the size of the Nix store) is to run Nix’s store optimiser, which seeks out identical files in the store and replaces them with hard links to a single copy.
 <screen>
 <prompt>$ </prompt>nix-store --optimise
 </screen>
-  Since this command needs to read the entire Nix store, it can take quite a
-  while to finish.
+  Since this command needs to read the entire Nix store, it can take quite a while to finish.
  </para>
  <section xml:id="sect-nixos-gc-boot-entries">
   <title>NixOS Boot Entries</title>
 
   <para>
-   If your <filename>/boot</filename> partition runs out of space, after
-   clearing old profiles you must rebuild your system with
-   <literal>nixos-rebuild</literal> to update the <filename>/boot</filename>
-   partition and clear space.
+   If your <filename>/boot</filename> partition runs out of space, after clearing old profiles you must rebuild your system with <literal>nixos-rebuild</literal> to update the <filename>/boot</filename> partition and clear space.
   </para>
  </section>
 </chapter>
diff --git a/nixos/doc/manual/administration/container-networking.xml b/nixos/doc/manual/administration/container-networking.xml
index 42486f01fe8..745fa524916 100644
--- a/nixos/doc/manual/administration/container-networking.xml
+++ b/nixos/doc/manual/administration/container-networking.xml
@@ -6,10 +6,7 @@
  <title>Container Networking</title>
 
  <para>
-  When you create a container using <literal>nixos-container create</literal>,
-  it gets it own private IPv4 address in the range
-  <literal>10.233.0.0/16</literal>. You can get the container’s IPv4 address
-  as follows:
+  When you create a container using <literal>nixos-container create</literal>, it gets it own private IPv4 address in the range <literal>10.233.0.0/16</literal>. You can get the container’s IPv4 address as follows:
 <screen>
 <prompt># </prompt>nixos-container show-ip foo
 10.233.4.2
@@ -20,34 +17,21 @@
  </para>
 
  <para>
-  Networking is implemented using a pair of virtual Ethernet devices. The
-  network interface in the container is called <literal>eth0</literal>, while
-  the matching interface in the host is called
-  <literal>ve-<replaceable>container-name</replaceable></literal> (e.g.,
-  <literal>ve-foo</literal>). The container has its own network namespace and
-  the <literal>CAP_NET_ADMIN</literal> capability, so it can perform arbitrary
-  network configuration such as setting up firewall rules, without affecting or
-  having access to the host’s network.
+  Networking is implemented using a pair of virtual Ethernet devices. The network interface in the container is called <literal>eth0</literal>, while the matching interface in the host is called <literal>ve-<replaceable>container-name</replaceable></literal> (e.g., <literal>ve-foo</literal>). The container has its own network namespace and the <literal>CAP_NET_ADMIN</literal> capability, so it can perform arbitrary network configuration such as setting up firewall rules, without affecting or having access to the host’s network.
  </para>
 
  <para>
-  By default, containers cannot talk to the outside network. If you want that,
-  you should set up Network Address Translation (NAT) rules on the host to
-  rewrite container traffic to use your external IP address. This can be
-  accomplished using the following configuration on the host:
+  By default, containers cannot talk to the outside network. If you want that, you should set up Network Address Translation (NAT) rules on the host to rewrite container traffic to use your external IP address. This can be accomplished using the following configuration on the host:
 <programlisting>
 <xref linkend="opt-networking.nat.enable"/> = true;
 <xref linkend="opt-networking.nat.internalInterfaces"/> = ["ve-+"];
 <xref linkend="opt-networking.nat.externalInterface"/> = "eth0";
 </programlisting>
-  where <literal>eth0</literal> should be replaced with the desired external
-  interface. Note that <literal>ve-+</literal> is a wildcard that matches all
-  container interfaces.
+  where <literal>eth0</literal> should be replaced with the desired external interface. Note that <literal>ve-+</literal> is a wildcard that matches all container interfaces.
  </para>
 
  <para>
-  If you are using Network Manager, you need to explicitly prevent it from
-  managing container interfaces:
+  If you are using Network Manager, you need to explicitly prevent it from managing container interfaces:
 <programlisting>
 networking.networkmanager.unmanaged = [ "interface-name:ve-*" ];
 </programlisting>
diff --git a/nixos/doc/manual/administration/containers.xml b/nixos/doc/manual/administration/containers.xml
index 0d3355e56a5..2d5a6dd46a3 100644
--- a/nixos/doc/manual/administration/containers.xml
+++ b/nixos/doc/manual/administration/containers.xml
@@ -5,28 +5,15 @@
         xml:id="ch-containers">
  <title>Container Management</title>
  <para>
-  NixOS allows you to easily run other NixOS instances as
-  <emphasis>containers</emphasis>. Containers are a light-weight approach to
-  virtualisation that runs software in the container at the same speed as in
-  the host system. NixOS containers share the Nix store of the host, making
-  container creation very efficient.
+  NixOS allows you to easily run other NixOS instances as <emphasis>containers</emphasis>. Containers are a light-weight approach to virtualisation that runs software in the container at the same speed as in the host system. NixOS containers share the Nix store of the host, making container creation very efficient.
  </para>
  <warning>
   <para>
-   Currently, NixOS containers are not perfectly isolated from the host system.
-   This means that a user with root access to the container can do things that
-   affect the host. So you should not give container root access to untrusted
-   users.
+   Currently, NixOS containers are not perfectly isolated from the host system. This means that a user with root access to the container can do things that affect the host. So you should not give container root access to untrusted users.
   </para>
  </warning>
  <para>
-  NixOS containers can be created in two ways: imperatively, using the command
-  <command>nixos-container</command>, and declaratively, by specifying them in
-  your <filename>configuration.nix</filename>. The declarative approach implies
-  that containers get upgraded along with your host system when you run
-  <command>nixos-rebuild</command>, which is often not what you want. By
-  contrast, in the imperative approach, containers are configured and updated
-  independently from the host system.
+  NixOS containers can be created in two ways: imperatively, using the command <command>nixos-container</command>, and declaratively, by specifying them in your <filename>configuration.nix</filename>. The declarative approach implies that containers get upgraded along with your host system when you run <command>nixos-rebuild</command>, which is often not what you want. By contrast, in the imperative approach, containers are configured and updated independently from the host system.
  </para>
  <xi:include href="imperative-containers.xml" />
  <xi:include href="declarative-containers.xml" />
diff --git a/nixos/doc/manual/administration/control-groups.xml b/nixos/doc/manual/administration/control-groups.xml
index 16d03cc0d1a..d6ae89da30c 100644
--- a/nixos/doc/manual/administration/control-groups.xml
+++ b/nixos/doc/manual/administration/control-groups.xml
@@ -5,16 +5,10 @@
         xml:id="sec-cgroups">
  <title>Control Groups</title>
  <para>
-  To keep track of the processes in a running system, systemd uses
-  <emphasis>control groups</emphasis> (cgroups). A control group is a set of
-  processes used to allocate resources such as CPU, memory or I/O bandwidth.
-  There can be multiple control group hierarchies, allowing each kind of
-  resource to be managed independently.
+  To keep track of the processes in a running system, systemd uses <emphasis>control groups</emphasis> (cgroups). A control group is a set of processes used to allocate resources such as CPU, memory or I/O bandwidth. There can be multiple control group hierarchies, allowing each kind of resource to be managed independently.
  </para>
  <para>
-  The command <command>systemd-cgls</command> lists all control groups in the
-  <literal>systemd</literal> hierarchy, which is what systemd uses to keep
-  track of the processes belonging to each service or user session:
+  The command <command>systemd-cgls</command> lists all control groups in the <literal>systemd</literal> hierarchy, which is what systemd uses to keep track of the processes belonging to each service or user session:
 <screen>
 <prompt>$ </prompt>systemd-cgls
 ├─user
@@ -32,34 +26,19 @@
   │ └─2376 dhcpcd --config /nix/store/f8dif8dsi2yaa70n03xir8r653776ka6-dhcpcd.conf
   └─ <replaceable>...</replaceable>
 </screen>
-  Similarly, <command>systemd-cgls cpu</command> shows the cgroups in the CPU
-  hierarchy, which allows per-cgroup CPU scheduling priorities. By default,
-  every systemd service gets its own CPU cgroup, while all user sessions are in
-  the top-level CPU cgroup. This ensures, for instance, that a thousand
-  run-away processes in the <literal>httpd.service</literal> cgroup cannot
-  starve the CPU for one process in the <literal>postgresql.service</literal>
-  cgroup. (By contrast, it they were in the same cgroup, then the PostgreSQL
-  process would get 1/1001 of the cgroup’s CPU time.) You can limit a
-  service’s CPU share in <filename>configuration.nix</filename>:
+  Similarly, <command>systemd-cgls cpu</command> shows the cgroups in the CPU hierarchy, which allows per-cgroup CPU scheduling priorities. By default, every systemd service gets its own CPU cgroup, while all user sessions are in the top-level CPU cgroup. This ensures, for instance, that a thousand run-away processes in the <literal>httpd.service</literal> cgroup cannot starve the CPU for one process in the <literal>postgresql.service</literal> cgroup. (By contrast, it they were in the same cgroup, then the PostgreSQL process would get 1/1001 of the cgroup’s CPU time.) You can limit a service’s CPU share in <filename>configuration.nix</filename>:
 <programlisting>
 <link linkend="opt-systemd.services._name_.serviceConfig">systemd.services.httpd.serviceConfig</link>.CPUShares = 512;
 </programlisting>
-  By default, every cgroup has 1024 CPU shares, so this will halve the CPU
-  allocation of the <literal>httpd.service</literal> cgroup.
+  By default, every cgroup has 1024 CPU shares, so this will halve the CPU allocation of the <literal>httpd.service</literal> cgroup.
  </para>
  <para>
-  There also is a <literal>memory</literal> hierarchy that controls memory
-  allocation limits; by default, all processes are in the top-level cgroup, so
-  any service or session can exhaust all available memory. Per-cgroup memory
-  limits can be specified in <filename>configuration.nix</filename>; for
-  instance, to limit <literal>httpd.service</literal> to 512 MiB of RAM
-  (excluding swap):
+  There also is a <literal>memory</literal> hierarchy that controls memory allocation limits; by default, all processes are in the top-level cgroup, so any service or session can exhaust all available memory. Per-cgroup memory limits can be specified in <filename>configuration.nix</filename>; for instance, to limit <literal>httpd.service</literal> to 512 MiB of RAM (excluding swap):
 <programlisting>
 <link linkend="opt-systemd.services._name_.serviceConfig">systemd.services.httpd.serviceConfig</link>.MemoryLimit = "512M";
 </programlisting>
  </para>
  <para>
-  The command <command>systemd-cgtop</command> shows a continuously updated
-  list of all cgroups with their CPU and memory usage.
+  The command <command>systemd-cgtop</command> shows a continuously updated list of all cgroups with their CPU and memory usage.
  </para>
 </chapter>
diff --git a/nixos/doc/manual/administration/declarative-containers.xml b/nixos/doc/manual/administration/declarative-containers.xml
index d03dbc4d705..a463d201478 100644
--- a/nixos/doc/manual/administration/declarative-containers.xml
+++ b/nixos/doc/manual/administration/declarative-containers.xml
@@ -6,10 +6,7 @@
  <title>Declarative Container Specification</title>
 
  <para>
-  You can also specify containers and their configuration in the host’s
-  <filename>configuration.nix</filename>. For example, the following specifies
-  that there shall be a container named <literal>database</literal> running
-  PostgreSQL:
+  You can also specify containers and their configuration in the host’s <filename>configuration.nix</filename>. For example, the following specifies that there shall be a container named <literal>database</literal> running PostgreSQL:
 <programlisting>
 containers.database =
   { config =
@@ -19,18 +16,11 @@ containers.database =
       };
   };
 </programlisting>
-  If you run <literal>nixos-rebuild switch</literal>, the container will be
-  built. If the container was already running, it will be updated in place,
-  without rebooting. The container can be configured to start automatically by
-  setting <literal>containers.database.autoStart = true</literal> in its
-  configuration.
+  If you run <literal>nixos-rebuild switch</literal>, the container will be built. If the container was already running, it will be updated in place, without rebooting. The container can be configured to start automatically by setting <literal>containers.database.autoStart = true</literal> in its configuration.
  </para>
 
  <para>
-  By default, declarative containers share the network namespace of the host,
-  meaning that they can listen on (privileged) ports. However, they cannot
-  change the network configuration. You can give a container its own network as
-  follows:
+  By default, declarative containers share the network namespace of the host, meaning that they can listen on (privileged) ports. However, they cannot change the network configuration. You can give a container its own network as follows:
 <programlisting>
 containers.database = {
   <link linkend="opt-containers._name_.privateNetwork">privateNetwork</link> = true;
@@ -38,23 +28,14 @@ containers.database = {
   <link linkend="opt-containers._name_.localAddress">localAddress</link> = "192.168.100.11";
 };
 </programlisting>
-  This gives the container a private virtual Ethernet interface with IP address
-  <literal>192.168.100.11</literal>, which is hooked up to a virtual Ethernet
-  interface on the host with IP address <literal>192.168.100.10</literal>. (See
-  the next section for details on container networking.)
+  This gives the container a private virtual Ethernet interface with IP address <literal>192.168.100.11</literal>, which is hooked up to a virtual Ethernet interface on the host with IP address <literal>192.168.100.10</literal>. (See the next section for details on container networking.)
  </para>
 
  <para>
-  To disable the container, just remove it from
-  <filename>configuration.nix</filename> and run <literal>nixos-rebuild
-  switch</literal>. Note that this will not delete the root directory of the
-  container in <literal>/var/lib/containers</literal>. Containers can be
-  destroyed using the imperative method: <literal>nixos-container destroy
-  foo</literal>.
+  To disable the container, just remove it from <filename>configuration.nix</filename> and run <literal>nixos-rebuild switch</literal>. Note that this will not delete the root directory of the container in <literal>/var/lib/containers</literal>. Containers can be destroyed using the imperative method: <literal>nixos-container destroy foo</literal>.
  </para>
 
  <para>
-  Declarative containers can be started and stopped using the corresponding
-  systemd service, e.g. <literal>systemctl start container@database</literal>.
+  Declarative containers can be started and stopped using the corresponding systemd service, e.g. <literal>systemctl start container@database</literal>.
  </para>
 </section>
diff --git a/nixos/doc/manual/administration/imperative-containers.xml b/nixos/doc/manual/administration/imperative-containers.xml
index 7ded0c11786..d5da6bf2017 100644
--- a/nixos/doc/manual/administration/imperative-containers.xml
+++ b/nixos/doc/manual/administration/imperative-containers.xml
@@ -6,9 +6,7 @@
  <title>Imperative Container Management</title>
 
  <para>
-  We’ll cover imperative container management using
-  <command>nixos-container</command> first. Be aware that container management
-  is currently only possible as <literal>root</literal>.
+  We’ll cover imperative container management using <command>nixos-container</command> first. Be aware that container management is currently only possible as <literal>root</literal>.
  </para>
 
  <para>
@@ -16,23 +14,14 @@
 <screen>
 # nixos-container create foo
 </screen>
-  This creates the container’s root directory in
-  <filename>/var/lib/containers/foo</filename> and a small configuration file
-  in <filename>/etc/containers/foo.conf</filename>. It also builds the
-  container’s initial system configuration and stores it in
-  <filename>/nix/var/nix/profiles/per-container/foo/system</filename>. You can
-  modify the initial configuration of the container on the command line. For
-  instance, to create a container that has <command>sshd</command> running,
-  with the given public key for <literal>root</literal>:
+  This creates the container’s root directory in <filename>/var/lib/containers/foo</filename> and a small configuration file in <filename>/etc/containers/foo.conf</filename>. It also builds the container’s initial system configuration and stores it in <filename>/nix/var/nix/profiles/per-container/foo/system</filename>. You can modify the initial configuration of the container on the command line. For instance, to create a container that has <command>sshd</command> running, with the given public key for <literal>root</literal>:
 <screen>
 # nixos-container create foo --config '
   <xref linkend="opt-services.openssh.enable"/> = true;
   <link linkend="opt-users.users._name__.openssh.authorizedKeys.keys">users.users.root.openssh.authorizedKeys.keys</link> = ["ssh-dss AAAAB3N…"];
 '
 </screen>
-  By default the next free address in the <literal>10.233.0.0/16</literal> subnet will be chosen
-  as container IP. This behavior can be altered by setting <literal>--host-address</literal> and
-  <literal>--local-address</literal>:
+  By default the next free address in the <literal>10.233.0.0/16</literal> subnet will be chosen as container IP. This behavior can be altered by setting <literal>--host-address</literal> and <literal>--local-address</literal>:
 <screen>
 # nixos-container create test --config-file test-container.nix \
     --local-address 10.235.1.2 --host-address 10.235.1.1
@@ -44,35 +33,25 @@
 <screen>
 # nixos-container start foo
 </screen>
-  This command will return as soon as the container has booted and has reached
-  <literal>multi-user.target</literal>. On the host, the container runs within
-  a systemd unit called
-  <literal>container@<replaceable>container-name</replaceable>.service</literal>.
-  Thus, if something went wrong, you can get status info using
-  <command>systemctl</command>:
+  This command will return as soon as the container has booted and has reached <literal>multi-user.target</literal>. On the host, the container runs within a systemd unit called <literal>container@<replaceable>container-name</replaceable>.service</literal>. Thus, if something went wrong, you can get status info using <command>systemctl</command>:
 <screen>
 # systemctl status container@foo
 </screen>
  </para>
 
  <para>
-  If the container has started successfully, you can log in as root using the
-  <command>root-login</command> operation:
+  If the container has started successfully, you can log in as root using the <command>root-login</command> operation:
 <screen>
 # nixos-container root-login foo
 [root@foo:~]#
 </screen>
-  Note that only root on the host can do this (since there is no
-  authentication). You can also get a regular login prompt using the
-  <command>login</command> operation, which is available to all users on the
-  host:
+  Note that only root on the host can do this (since there is no authentication). You can also get a regular login prompt using the <command>login</command> operation, which is available to all users on the host:
 <screen>
 # nixos-container login foo
 foo login: alice
 Password: ***
 </screen>
-  With <command>nixos-container run</command>, you can execute arbitrary
-  commands in the container:
+  With <command>nixos-container run</command>, you can execute arbitrary commands in the container:
 <screen>
 # nixos-container run foo -- uname -a
 Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux
@@ -80,15 +59,11 @@ Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux
  </para>
 
  <para>
-  There are several ways to change the configuration of the container. First,
-  on the host, you can edit
-  <literal>/var/lib/container/<replaceable>name</replaceable>/etc/nixos/configuration.nix</literal>,
-  and run
+  There are several ways to change the configuration of the container. First, on the host, you can edit <literal>/var/lib/container/<replaceable>name</replaceable>/etc/nixos/configuration.nix</literal>, and run
 <screen>
 # nixos-container update foo
 </screen>
-  This will build and activate the new configuration. You can also specify a
-  new configuration on the command line:
+  This will build and activate the new configuration. You can also specify a new configuration on the command line:
 <screen>
 # nixos-container update foo --config '
   <xref linkend="opt-services.httpd.enable"/> = true;
@@ -99,23 +74,15 @@ Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux
 # curl http://$(nixos-container show-ip foo)/
 &lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">…
 </screen>
-  However, note that this will overwrite the container’s
-  <filename>/etc/nixos/configuration.nix</filename>.
+  However, note that this will overwrite the container’s <filename>/etc/nixos/configuration.nix</filename>.
  </para>
 
  <para>
-  Alternatively, you can change the configuration from within the container
-  itself by running <command>nixos-rebuild switch</command> inside the
-  container. Note that the container by default does not have a copy of the
-  NixOS channel, so you should run <command>nix-channel --update</command>
-  first.
+  Alternatively, you can change the configuration from within the container itself by running <command>nixos-rebuild switch</command> inside the container. Note that the container by default does not have a copy of the NixOS channel, so you should run <command>nix-channel --update</command> first.
  </para>
 
  <para>
-  Containers can be stopped and started using <literal>nixos-container
-  stop</literal> and <literal>nixos-container start</literal>, respectively, or
-  by using <command>systemctl</command> on the container’s service unit. To
-  destroy a container, including its file system, do
+  Containers can be stopped and started using <literal>nixos-container stop</literal> and <literal>nixos-container start</literal>, respectively, or by using <command>systemctl</command> on the container’s service unit. To destroy a container, including its file system, do
 <screen>
 # nixos-container destroy foo
 </screen>
diff --git a/nixos/doc/manual/administration/logging.xml b/nixos/doc/manual/administration/logging.xml
index da4877fcdf0..8089b457786 100644
--- a/nixos/doc/manual/administration/logging.xml
+++ b/nixos/doc/manual/administration/logging.xml
@@ -5,18 +5,11 @@
         xml:id="sec-logging">
  <title>Logging</title>
  <para>
-  System-wide logging is provided by systemd’s <emphasis>journal</emphasis>,
-  which subsumes traditional logging daemons such as syslogd and klogd. Log
-  entries are kept in binary files in <filename>/var/log/journal/</filename>.
-  The command <literal>journalctl</literal> allows you to see the contents of
-  the journal. For example,
+  System-wide logging is provided by systemd’s <emphasis>journal</emphasis>, which subsumes traditional logging daemons such as syslogd and klogd. Log entries are kept in binary files in <filename>/var/log/journal/</filename>. The command <literal>journalctl</literal> allows you to see the contents of the journal. For example,
 <screen>
 <prompt>$ </prompt>journalctl -b
 </screen>
-  shows all journal entries since the last reboot. (The output of
-  <command>journalctl</command> is piped into <command>less</command> by
-  default.) You can use various options and match operators to restrict output
-  to messages of interest. For instance, to get all messages from PostgreSQL:
+  shows all journal entries since the last reboot. (The output of <command>journalctl</command> is piped into <command>less</command> by default.) You can use various options and match operators to restrict output to messages of interest. For instance, to get all messages from PostgreSQL:
 <screen>
 <prompt>$ </prompt>journalctl -u postgresql.service
 -- Logs begin at Mon, 2013-01-07 13:28:01 CET, end at Tue, 2013-01-08 01:09:57 CET. --
@@ -26,8 +19,7 @@ Jan 07 15:44:14 hagbard postgres[2681]: [2-1] LOG:  database system is shut down
 Jan 07 15:45:10 hagbard postgres[2532]: [1-1] LOG:  database system was shut down at 2013-01-07 15:44:14 CET
 Jan 07 15:45:13 hagbard postgres[2500]: [1-1] LOG:  database system is ready to accept connections
 </screen>
-  Or to get all messages since the last reboot that have at least a
-  “critical” severity level:
+  Or to get all messages since the last reboot that have at least a “critical” severity level:
 <screen>
 <prompt>$ </prompt>journalctl -b -p crit
 Dec 17 21:08:06 mandark sudo[3673]: pam_unix(sudo:auth): auth could not identify password for [alice]
@@ -35,9 +27,6 @@ Dec 29 01:30:22 mandark kernel[6131]: [1053513.909444] CPU6: Core temperature ab
 </screen>
  </para>
  <para>
-  The system journal is readable by root and by users in the
-  <literal>wheel</literal> and <literal>systemd-journal</literal> groups. All
-  users have a private journal that can be read using
-  <command>journalctl</command>.
+  The system journal is readable by root and by users in the <literal>wheel</literal> and <literal>systemd-journal</literal> groups. All users have a private journal that can be read using <command>journalctl</command>.
  </para>
 </chapter>
diff --git a/nixos/doc/manual/administration/maintenance-mode.xml b/nixos/doc/manual/administration/maintenance-mode.xml
index 71e3f9ea665..dc11316dc1a 100644
--- a/nixos/doc/manual/administration/maintenance-mode.xml
+++ b/nixos/doc/manual/administration/maintenance-mode.xml
@@ -9,8 +9,6 @@
   You can enter rescue mode by running:
 <screen>
 # systemctl rescue</screen>
-  This will eventually give you a single-user root shell. Systemd will stop
-  (almost) all system services. To get out of maintenance mode, just exit from
-  the rescue shell.
+  This will eventually give you a single-user root shell. Systemd will stop (almost) all system services. To get out of maintenance mode, just exit from the rescue shell.
  </para>
 </section>
diff --git a/nixos/doc/manual/administration/network-problems.xml b/nixos/doc/manual/administration/network-problems.xml
index 570f5835884..1d41e5c2995 100644
--- a/nixos/doc/manual/administration/network-problems.xml
+++ b/nixos/doc/manual/administration/network-problems.xml
@@ -6,20 +6,11 @@
  <title>Network Problems</title>
 
  <para>
-  Nix uses a so-called <emphasis>binary cache</emphasis> to optimise building a
-  package from source into downloading it as a pre-built binary. That is,
-  whenever a command like <command>nixos-rebuild</command> needs a path in the
-  Nix store, Nix will try to download that path from the Internet rather than
-  build it from source. The default binary cache is
-  <uri>https://cache.nixos.org/</uri>. If this cache is unreachable, Nix
-  operations may take a long time due to HTTP connection timeouts. You can
-  disable the use of the binary cache by adding <option>--option
-  use-binary-caches false</option>, e.g.
+  Nix uses a so-called <emphasis>binary cache</emphasis> to optimise building a package from source into downloading it as a pre-built binary. That is, whenever a command like <command>nixos-rebuild</command> needs a path in the Nix store, Nix will try to download that path from the Internet rather than build it from source. The default binary cache is <uri>https://cache.nixos.org/</uri>. If this cache is unreachable, Nix operations may take a long time due to HTTP connection timeouts. You can disable the use of the binary cache by adding <option>--option use-binary-caches false</option>, e.g.
 <screen>
 # nixos-rebuild switch --option use-binary-caches false
 </screen>
-  If you have an alternative binary cache at your disposal, you can use it
-  instead:
+  If you have an alternative binary cache at your disposal, you can use it instead:
 <screen>
 # nixos-rebuild switch --option binary-caches http://my-cache.example.org/
 </screen>
diff --git a/nixos/doc/manual/administration/rebooting.xml b/nixos/doc/manual/administration/rebooting.xml
index a5abd6f0258..989712b20fa 100644
--- a/nixos/doc/manual/administration/rebooting.xml
+++ b/nixos/doc/manual/administration/rebooting.xml
@@ -16,20 +16,15 @@
 <screen>
 # reboot
 </screen>
-  which is equivalent to <command>systemctl reboot</command>. Alternatively,
-  you can quickly reboot the system using <literal>kexec</literal>, which
-  bypasses the BIOS by directly loading the new kernel into memory:
+  which is equivalent to <command>systemctl reboot</command>. Alternatively, you can quickly reboot the system using <literal>kexec</literal>, which bypasses the BIOS by directly loading the new kernel into memory:
 <screen>
 # systemctl kexec
 </screen>
  </para>
  <para>
-  The machine can be suspended to RAM (if supported) using <command>systemctl
-  suspend</command>, and suspended to disk using <command>systemctl
-  hibernate</command>.
+  The machine can be suspended to RAM (if supported) using <command>systemctl suspend</command>, and suspended to disk using <command>systemctl hibernate</command>.
  </para>
  <para>
-  These commands can be run by any user who is logged in locally, i.e. on a
-  virtual console or in X11; otherwise, the user is asked for authentication.
+  These commands can be run by any user who is logged in locally, i.e. on a virtual console or in X11; otherwise, the user is asked for authentication.
  </para>
 </chapter>
diff --git a/nixos/doc/manual/administration/rollback.xml b/nixos/doc/manual/administration/rollback.xml
index fb87810ba46..aa6d3c95676 100644
--- a/nixos/doc/manual/administration/rollback.xml
+++ b/nixos/doc/manual/administration/rollback.xml
@@ -6,19 +6,11 @@
  <title>Rolling Back Configuration Changes</title>
 
  <para>
-  After running <command>nixos-rebuild</command> to switch to a new
-  configuration, you may find that the new configuration doesn’t work very
-  well. In that case, there are several ways to return to a previous
-  configuration.
+  After running <command>nixos-rebuild</command> to switch to a new configuration, you may find that the new configuration doesn’t work very well. In that case, there are several ways to return to a previous configuration.
  </para>
 
  <para>
-  First, the GRUB boot manager allows you to boot into any previous
-  configuration that hasn’t been garbage-collected. These configurations can
-  be found under the GRUB submenu “NixOS - All configurations”. This is
-  especially useful if the new configuration fails to boot. After the system
-  has booted, you can make the selected configuration the default for
-  subsequent boots:
+  First, the GRUB boot manager allows you to boot into any previous configuration that hasn’t been garbage-collected. These configurations can be found under the GRUB submenu “NixOS - All configurations”. This is especially useful if the new configuration fails to boot. After the system has booted, you can make the selected configuration the default for subsequent boots:
 <screen>
 # /run/current-system/bin/switch-to-configuration boot</screen>
  </para>
@@ -30,8 +22,7 @@
   This is equivalent to running:
 <screen>
 # /nix/var/nix/profiles/system-<replaceable>N</replaceable>-link/bin/switch-to-configuration switch</screen>
-  where <replaceable>N</replaceable> is the number of the NixOS system
-  configuration. To get a list of the available configurations, do:
+  where <replaceable>N</replaceable> is the number of the NixOS system configuration. To get a list of the available configurations, do:
 <screen>
 <prompt>$ </prompt>ls -l /nix/var/nix/profiles/system-*-link
 <replaceable>...</replaceable>
diff --git a/nixos/doc/manual/administration/running.xml b/nixos/doc/manual/administration/running.xml
index 19bec1f7794..12512a003c8 100644
--- a/nixos/doc/manual/administration/running.xml
+++ b/nixos/doc/manual/administration/running.xml
@@ -6,8 +6,7 @@
  <title>Administration</title>
  <partintro xml:id="ch-running-intro">
   <para>
-   This chapter describes various aspects of managing a running NixOS system,
-   such as how to use the <command>systemd</command> service manager.
+   This chapter describes various aspects of managing a running NixOS system, such as how to use the <command>systemd</command> service manager.
   </para>
  </partintro>
  <xi:include href="service-mgmt.xml" />
diff --git a/nixos/doc/manual/administration/service-mgmt.xml b/nixos/doc/manual/administration/service-mgmt.xml
index 1b9c745eb59..4ad30ce55a8 100644
--- a/nixos/doc/manual/administration/service-mgmt.xml
+++ b/nixos/doc/manual/administration/service-mgmt.xml
@@ -5,21 +5,10 @@
          xml:id="sec-systemctl">
  <title>Service Management</title>
  <para>
-  In NixOS, all system services are started and monitored using the systemd
-  program. Systemd is the “init” process of the system (i.e. PID 1), the
-  parent of all other processes. It manages a set of so-called “units”,
-  which can be things like system services (programs), but also mount points,
-  swap files, devices, targets (groups of units) and more. Units can have
-  complex dependencies; for instance, one unit can require that another unit
-  must be successfully started before the first unit can be started. When the
-  system boots, it starts a unit named <literal>default.target</literal>; the
-  dependencies of this unit cause all system services to be started, file
-  systems to be mounted, swap files to be activated, and so on.
+  In NixOS, all system services are started and monitored using the systemd program. Systemd is the “init” process of the system (i.e. PID 1), the parent of all other processes. It manages a set of so-called “units”, which can be things like system services (programs), but also mount points, swap files, devices, targets (groups of units) and more. Units can have complex dependencies; for instance, one unit can require that another unit must be successfully started before the first unit can be started. When the system boots, it starts a unit named <literal>default.target</literal>; the dependencies of this unit cause all system services to be started, file systems to be mounted, swap files to be activated, and so on.
  </para>
  <para>
-  The command <command>systemctl</command> is the main way to interact with
-  <command>systemd</command>. Without any arguments, it shows the status of
-  active units:
+  The command <command>systemctl</command> is the main way to interact with <command>systemd</command>. Without any arguments, it shows the status of active units:
 <screen>
 <prompt>$ </prompt>systemctl
 -.mount          loaded active mounted   /
@@ -30,8 +19,7 @@ graphical.target loaded active active    Graphical Interface
 </screen>
  </para>
  <para>
-  You can ask for detailed status information about a unit, for instance, the
-  PostgreSQL database service:
+  You can ask for detailed status information about a unit, for instance, the PostgreSQL database service:
 <screen>
 <prompt>$ </prompt>systemctl status postgresql.service
 postgresql.service - PostgreSQL Server
@@ -51,9 +39,7 @@ Jan 07 15:55:57 hagbard postgres[2390]: [1-1] LOG:  database system is ready to
 Jan 07 15:55:57 hagbard postgres[2420]: [1-1] LOG:  autovacuum launcher started
 Jan 07 15:55:57 hagbard systemd[1]: Started PostgreSQL Server.
 </screen>
-  Note that this shows the status of the unit (active and running), all the
-  processes belonging to the service, as well as the most recent log messages
-  from the service.
+  Note that this shows the status of the unit (active and running), all the processes belonging to the service, as well as the most recent log messages from the service.
  </para>
  <para>
   Units can be stopped, started or restarted:
@@ -62,9 +48,7 @@ Jan 07 15:55:57 hagbard systemd[1]: Started PostgreSQL Server.
 # systemctl start postgresql.service
 # systemctl restart postgresql.service
 </screen>
-  These operations are synchronous: they wait until the service has finished
-  starting or stopping (or has failed). Starting a unit will cause the
-  dependencies of that unit to be started as well (if necessary).
+  These operations are synchronous: they wait until the service has finished starting or stopping (or has failed). Starting a unit will cause the dependencies of that unit to be started as well (if necessary).
  </para>
 <!-- - cgroups: each service and user session is a cgroup
 
diff --git a/nixos/doc/manual/administration/store-corruption.xml b/nixos/doc/manual/administration/store-corruption.xml
index b9d11152d5e..dc0a672d5bd 100644
--- a/nixos/doc/manual/administration/store-corruption.xml
+++ b/nixos/doc/manual/administration/store-corruption.xml
@@ -6,23 +6,15 @@
  <title>Nix Store Corruption</title>
 
  <para>
-  After a system crash, it’s possible for files in the Nix store to become
-  corrupted. (For instance, the Ext4 file system has the tendency to replace
-  un-synced files with zero bytes.) NixOS tries hard to prevent this from
-  happening: it performs a <command>sync</command> before switching to a new
-  configuration, and Nix’s database is fully transactional. If corruption
-  still occurs, you may be able to fix it automatically.
+  After a system crash, it’s possible for files in the Nix store to become corrupted. (For instance, the Ext4 file system has the tendency to replace un-synced files with zero bytes.) NixOS tries hard to prevent this from happening: it performs a <command>sync</command> before switching to a new configuration, and Nix’s database is fully transactional. If corruption still occurs, you may be able to fix it automatically.
  </para>
 
  <para>
-  If the corruption is in a path in the closure of the NixOS system
-  configuration, you can fix it by doing
+  If the corruption is in a path in the closure of the NixOS system configuration, you can fix it by doing
 <screen>
 <prompt># </prompt>nixos-rebuild switch --repair
 </screen>
-  This will cause Nix to check every path in the closure, and if its
-  cryptographic hash differs from the hash recorded in Nix’s database, the
-  path is rebuilt or redownloaded.
+  This will cause Nix to check every path in the closure, and if its cryptographic hash differs from the hash recorded in Nix’s database, the path is rebuilt or redownloaded.
  </para>
 
  <para>
@@ -30,7 +22,6 @@
 <screen>
 <prompt># </prompt>nix-store --verify --check-contents --repair
 </screen>
-  Any corrupt paths will be redownloaded if they’re available in a binary
-  cache; otherwise, they cannot be repaired.
+  Any corrupt paths will be redownloaded if they’re available in a binary cache; otherwise, they cannot be repaired.
  </para>
 </section>
diff --git a/nixos/doc/manual/administration/troubleshooting.xml b/nixos/doc/manual/administration/troubleshooting.xml
index 6496e7bde38..923b1e96c7c 100644
--- a/nixos/doc/manual/administration/troubleshooting.xml
+++ b/nixos/doc/manual/administration/troubleshooting.xml
@@ -5,8 +5,7 @@
         xml:id="ch-troubleshooting">
  <title>Troubleshooting</title>
  <para>
-  This chapter describes solutions to common problems you might encounter when
-  you manage your NixOS system.
+  This chapter describes solutions to common problems you might encounter when you manage your NixOS system.
  </para>
  <xi:include href="boot-problems.xml" />
  <xi:include href="maintenance-mode.xml" />
diff --git a/nixos/doc/manual/administration/user-sessions.xml b/nixos/doc/manual/administration/user-sessions.xml
index 80daf6bdbff..c7969f4f0d6 100644
--- a/nixos/doc/manual/administration/user-sessions.xml
+++ b/nixos/doc/manual/administration/user-sessions.xml
@@ -5,10 +5,7 @@
         xml:id="sec-user-sessions">
  <title>User Sessions</title>
  <para>
-  Systemd keeps track of all users who are logged into the system (e.g. on a
-  virtual console or remotely via SSH). The command <command>loginctl</command>
-  allows querying and manipulating user sessions. For instance, to list all
-  user sessions:
+  Systemd keeps track of all users who are logged into the system (e.g. on a virtual console or remotely via SSH). The command <command>loginctl</command> allows querying and manipulating user sessions. For instance, to list all user sessions:
 <screen>
 <prompt>$ </prompt>loginctl
    SESSION        UID USER             SEAT
@@ -16,10 +13,7 @@
         c3          0 root             seat0
         c4        500 alice
 </screen>
-  This shows that two users are logged in locally, while another is logged in
-  remotely. (“Seats” are essentially the combinations of displays and input
-  devices attached to the system; usually, there is only one seat.) To get
-  information about a session:
+  This shows that two users are logged in locally, while another is logged in remotely. (“Seats” are essentially the combinations of displays and input devices attached to the system; usually, there is only one seat.) To get information about a session:
 <screen>
 <prompt>$ </prompt>loginctl session-status c3
 c3 - root (0)
@@ -34,10 +28,7 @@ c3 - root (0)
                   ├─10339 -bash
                   └─10355 w3m nixos.org
 </screen>
-  This shows that the user is logged in on virtual console 3. It also lists the
-  processes belonging to this session. Since systemd keeps track of this, you
-  can terminate a session in a way that ensures that all the session’s
-  processes are gone:
+  This shows that the user is logged in on virtual console 3. It also lists the processes belonging to this session. Since systemd keeps track of this, you can terminate a session in a way that ensures that all the session’s processes are gone:
 <screen>
 # loginctl terminate-session c3
 </screen>
diff --git a/nixos/doc/manual/configuration/abstractions.xml b/nixos/doc/manual/configuration/abstractions.xml
index 5bf0635cc1a..6e6850769f5 100644
--- a/nixos/doc/manual/configuration/abstractions.xml
+++ b/nixos/doc/manual/configuration/abstractions.xml
@@ -6,8 +6,7 @@
  <title>Abstractions</title>
 
  <para>
-  If you find yourself repeating yourself over and over, it’s time to
-  abstract. Take, for instance, this Apache HTTP Server configuration:
+  If you find yourself repeating yourself over and over, it’s time to abstract. Take, for instance, this Apache HTTP Server configuration:
 <programlisting>
 {
   <xref linkend="opt-services.httpd.virtualHosts"/> =
@@ -27,9 +26,7 @@
     ];
 }
 </programlisting>
-  It defines two virtual hosts with nearly identical configuration; the only
-  difference is that the second one has SSL enabled. To prevent this
-  duplication, we can use a <literal>let</literal>:
+  It defines two virtual hosts with nearly identical configuration; the only difference is that the second one has SSL enabled. To prevent this duplication, we can use a <literal>let</literal>:
 <programlisting>
 let
   exampleOrgCommon =
@@ -50,16 +47,11 @@ in
     ];
 }
 </programlisting>
-  The <literal>let exampleOrgCommon = <replaceable>...</replaceable></literal>
-  defines a variable named <literal>exampleOrgCommon</literal>. The
-  <literal>//</literal> operator merges two attribute sets, so the
-  configuration of the second virtual host is the set
-  <literal>exampleOrgCommon</literal> extended with the SSL options.
+  The <literal>let exampleOrgCommon = <replaceable>...</replaceable></literal> defines a variable named <literal>exampleOrgCommon</literal>. The <literal>//</literal> operator merges two attribute sets, so the configuration of the second virtual host is the set <literal>exampleOrgCommon</literal> extended with the SSL options.
  </para>
 
  <para>
-  You can write a <literal>let</literal> wherever an expression is allowed.
-  Thus, you also could have written:
+  You can write a <literal>let</literal> wherever an expression is allowed. Thus, you also could have written:
 <programlisting>
 {
   <xref linkend="opt-services.httpd.virtualHosts"/> =
@@ -69,16 +61,11 @@ in
     ];
 }
 </programlisting>
-  but not <literal>{ let exampleOrgCommon = <replaceable>...</replaceable>; in
-  <replaceable>...</replaceable>; }</literal> since attributes (as opposed to
-  attribute values) are not expressions.
+  but not <literal>{ let exampleOrgCommon = <replaceable>...</replaceable>; in <replaceable>...</replaceable>; }</literal> since attributes (as opposed to attribute values) are not expressions.
  </para>
 
  <para>
-  <emphasis>Functions</emphasis> provide another method of abstraction. For
-  instance, suppose that we want to generate lots of different virtual hosts,
-  all with identical configuration except for the host name. This can be done
-  as follows:
+  <emphasis>Functions</emphasis> provide another method of abstraction. For instance, suppose that we want to generate lots of different virtual hosts, all with identical configuration except for the host name. This can be done as follows:
 <programlisting>
 {
   <xref linkend="opt-services.httpd.virtualHosts"/> =
@@ -96,15 +83,11 @@ in
       ];
 }
 </programlisting>
-  Here, <varname>makeVirtualHost</varname> is a function that takes a single
-  argument <literal>name</literal> and returns the configuration for a virtual
-  host. That function is then called for several names to produce the list of
-  virtual host configurations.
+  Here, <varname>makeVirtualHost</varname> is a function that takes a single argument <literal>name</literal> and returns the configuration for a virtual host. That function is then called for several names to produce the list of virtual host configurations.
  </para>
 
  <para>
-  We can further improve on this by using the function <varname>map</varname>,
-  which applies another function to every element in a list:
+  We can further improve on this by using the function <varname>map</varname>, which applies another function to every element in a list:
 <programlisting>
 {
   <xref linkend="opt-services.httpd.virtualHosts"/> =
@@ -114,15 +97,11 @@ in
       [ "example.org" "example.com" "example.gov" "example.nl" ];
 }
 </programlisting>
-  (The function <literal>map</literal> is called a <emphasis>higher-order
-  function</emphasis> because it takes another function as an argument.)
+  (The function <literal>map</literal> is called a <emphasis>higher-order function</emphasis> because it takes another function as an argument.)
  </para>
 
  <para>
-  What if you need more than one argument, for instance, if we want to use a
-  different <literal>documentRoot</literal> for each virtual host? Then we can
-  make <varname>makeVirtualHost</varname> a function that takes a
-  <emphasis>set</emphasis> as its argument, like this:
+  What if you need more than one argument, for instance, if we want to use a different <literal>documentRoot</literal> for each virtual host? Then we can make <varname>makeVirtualHost</varname> a function that takes a <emphasis>set</emphasis> as its argument, like this:
 <programlisting>
 {
   <xref linkend="opt-services.httpd.virtualHosts"/> =
@@ -140,9 +119,7 @@ in
       ];
 }
 </programlisting>
-  But in this case (where every root is a subdirectory of
-  <filename>/sites</filename> named after the virtual host), it would have been
-  shorter to define <varname>makeVirtualHost</varname> as
+  But in this case (where every root is a subdirectory of <filename>/sites</filename> named after the virtual host), it would have been shorter to define <varname>makeVirtualHost</varname> as
 <programlisting>
 makeVirtualHost = name:
   { hostName = name;
@@ -150,7 +127,6 @@ makeVirtualHost = name:
     adminAddr = "alice@example.org";
   };
 </programlisting>
-  Here, the construct <literal>${<replaceable>...</replaceable>}</literal>
-  allows the result of an expression to be spliced into a string.
+  Here, the construct <literal>${<replaceable>...</replaceable>}</literal> allows the result of an expression to be spliced into a string.
  </para>
 </section>
diff --git a/nixos/doc/manual/configuration/ad-hoc-network-config.xml b/nixos/doc/manual/configuration/ad-hoc-network-config.xml
index 00e595c7cb7..97276e8a177 100644
--- a/nixos/doc/manual/configuration/ad-hoc-network-config.xml
+++ b/nixos/doc/manual/configuration/ad-hoc-network-config.xml
@@ -6,10 +6,7 @@
  <title>Ad-Hoc Configuration</title>
 
  <para>
-  You can use <xref linkend="opt-networking.localCommands"/> to specify shell
-  commands to be run at the end of <literal>network-setup.service</literal>.
-  This is useful for doing network configuration not covered by the existing
-  NixOS modules. For instance, to statically configure an IPv6 address:
+  You can use <xref linkend="opt-networking.localCommands"/> to specify shell commands to be run at the end of <literal>network-setup.service</literal>. This is useful for doing network configuration not covered by the existing NixOS modules. For instance, to statically configure an IPv6 address:
 <programlisting>
 <xref linkend="opt-networking.localCommands"/> =
   ''
diff --git a/nixos/doc/manual/configuration/ad-hoc-packages.xml b/nixos/doc/manual/configuration/ad-hoc-packages.xml
index c7e882d846f..f15a22469a0 100644
--- a/nixos/doc/manual/configuration/ad-hoc-packages.xml
+++ b/nixos/doc/manual/configuration/ad-hoc-packages.xml
@@ -6,33 +6,18 @@
  <title>Ad-Hoc Package Management</title>
 
  <para>
-  With the command <command>nix-env</command>, you can install and uninstall
-  packages from the command line. For instance, to install Mozilla Thunderbird:
+  With the command <command>nix-env</command>, you can install and uninstall packages from the command line. For instance, to install Mozilla Thunderbird:
 <screen>
 <prompt>$ </prompt>nix-env -iA nixos.thunderbird</screen>
-  If you invoke this as root, the package is installed in the Nix profile
-  <filename>/nix/var/nix/profiles/default</filename> and visible to all users
-  of the system; otherwise, the package ends up in
-  <filename>/nix/var/nix/profiles/per-user/<replaceable>username</replaceable>/profile</filename>
-  and is not visible to other users. The <option>-A</option> flag specifies the
-  package by its attribute name; without it, the package is installed by
-  matching against its package name (e.g. <literal>thunderbird</literal>). The
-  latter is slower because it requires matching against all available Nix
-  packages, and is ambiguous if there are multiple matching packages.
+  If you invoke this as root, the package is installed in the Nix profile <filename>/nix/var/nix/profiles/default</filename> and visible to all users of the system; otherwise, the package ends up in <filename>/nix/var/nix/profiles/per-user/<replaceable>username</replaceable>/profile</filename> and is not visible to other users. The <option>-A</option> flag specifies the package by its attribute name; without it, the package is installed by matching against its package name (e.g. <literal>thunderbird</literal>). The latter is slower because it requires matching against all available Nix packages, and is ambiguous if there are multiple matching packages.
  </para>
 
  <para>
-  Packages come from the NixOS channel. You typically upgrade a package by
-  updating to the latest version of the NixOS channel:
+  Packages come from the NixOS channel. You typically upgrade a package by updating to the latest version of the NixOS channel:
 <screen>
 <prompt>$ </prompt>nix-channel --update nixos
 </screen>
-  and then running <literal>nix-env -i</literal> again. Other packages in the
-  profile are <emphasis>not</emphasis> affected; this is the crucial difference
-  with the declarative style of package management, where running
-  <command>nixos-rebuild switch</command> causes all packages to be updated to
-  their current versions in the NixOS channel. You can however upgrade all
-  packages for which there is a newer version by doing:
+  and then running <literal>nix-env -i</literal> again. Other packages in the profile are <emphasis>not</emphasis> affected; this is the crucial difference with the declarative style of package management, where running <command>nixos-rebuild switch</command> causes all packages to be updated to their current versions in the NixOS channel. You can however upgrade all packages for which there is a newer version by doing:
 <screen>
 <prompt>$ </prompt>nix-env -u '*'
 </screen>
@@ -53,8 +38,7 @@
  </para>
 
  <para>
-  <command>nix-env</command> has many more flags. For details, see the
-  <citerefentry>
+  <command>nix-env</command> has many more flags. For details, see the <citerefentry>
   <refentrytitle>nix-env</refentrytitle>
   <manvolnum>1</manvolnum></citerefentry> manpage or the Nix manual.
  </para>
diff --git a/nixos/doc/manual/configuration/adding-custom-packages.xml b/nixos/doc/manual/configuration/adding-custom-packages.xml
index 182641055e4..210a2aef37b 100644
--- a/nixos/doc/manual/configuration/adding-custom-packages.xml
+++ b/nixos/doc/manual/configuration/adding-custom-packages.xml
@@ -6,33 +6,23 @@
  <title>Adding Custom Packages</title>
 
  <para>
-  It’s possible that a package you need is not available in NixOS. In that
-  case, you can do two things. First, you can clone the Nixpkgs repository, add
-  the package to your clone, and (optionally) submit a patch or pull request to
-  have it accepted into the main Nixpkgs repository. This is described in
-  detail in the <link
-xlink:href="http://nixos.org/nixpkgs/manual">Nixpkgs
-  manual</link>. In short, you clone Nixpkgs:
+  It’s possible that a package you need is not available in NixOS. In that case, you can do two things. First, you can clone the Nixpkgs repository, add the package to your clone, and (optionally) submit a patch or pull request to have it accepted into the main Nixpkgs repository. This is described in detail in the <link
+xlink:href="http://nixos.org/nixpkgs/manual">Nixpkgs manual</link>. In short, you clone Nixpkgs:
 <screen>
 <prompt>$ </prompt>git clone https://github.com/NixOS/nixpkgs
 <prompt>$ </prompt>cd nixpkgs
 </screen>
-  Then you write and test the package as described in the Nixpkgs manual.
-  Finally, you add it to <literal>environment.systemPackages</literal>, e.g.
+  Then you write and test the package as described in the Nixpkgs manual. Finally, you add it to <literal>environment.systemPackages</literal>, e.g.
 <programlisting>
 <xref linkend="opt-environment.systemPackages"/> = [ pkgs.my-package ];
 </programlisting>
-  and you run <command>nixos-rebuild</command>, specifying your own Nixpkgs
-  tree:
+  and you run <command>nixos-rebuild</command>, specifying your own Nixpkgs tree:
 <screen>
 # nixos-rebuild switch -I nixpkgs=/path/to/my/nixpkgs</screen>
  </para>
 
  <para>
-  The second possibility is to add the package outside of the Nixpkgs tree. For
-  instance, here is how you specify a build of the
-  <link xlink:href="https://www.gnu.org/software/hello/">GNU Hello</link>
-  package directly in <filename>configuration.nix</filename>:
+  The second possibility is to add the package outside of the Nixpkgs tree. For instance, here is how you specify a build of the <link xlink:href="https://www.gnu.org/software/hello/">GNU Hello</link> package directly in <filename>configuration.nix</filename>:
 <programlisting>
 <xref linkend="opt-environment.systemPackages"/> =
   let
@@ -46,8 +36,7 @@ xlink:href="http://nixos.org/nixpkgs/manual">Nixpkgs
   in
   [ my-hello ];
 </programlisting>
-  Of course, you can also move the definition of <literal>my-hello</literal>
-  into a separate Nix expression, e.g.
+  Of course, you can also move the definition of <literal>my-hello</literal> into a separate Nix expression, e.g.
 <programlisting>
 <xref linkend="opt-environment.systemPackages"/> = [ (import ./my-hello.nix) ];
 </programlisting>
diff --git a/nixos/doc/manual/configuration/config-file.xml b/nixos/doc/manual/configuration/config-file.xml
index eadafb94b8f..38296caaa9a 100644
--- a/nixos/doc/manual/configuration/config-file.xml
+++ b/nixos/doc/manual/configuration/config-file.xml
@@ -13,15 +13,7 @@
 { <replaceable>option definitions</replaceable>
 }
 </programlisting>
-  The first line (<literal>{ config, pkgs, ... }:</literal>) denotes that this
-  is actually a function that takes at least the two arguments
-  <varname>config</varname> and <varname>pkgs</varname>. (These are explained
-  later.) The function returns a <emphasis>set</emphasis> of option definitions
-  (<literal>{ <replaceable>...</replaceable> }</literal>). These definitions
-  have the form <literal><replaceable>name</replaceable> =
-  <replaceable>value</replaceable></literal>, where
-  <replaceable>name</replaceable> is the name of an option and
-  <replaceable>value</replaceable> is its value. For example,
+  The first line (<literal>{ config, pkgs, ... }:</literal>) denotes that this is actually a function that takes at least the two arguments <varname>config</varname> and <varname>pkgs</varname>. (These are explained later.) The function returns a <emphasis>set</emphasis> of option definitions (<literal>{ <replaceable>...</replaceable> }</literal>). These definitions have the form <literal><replaceable>name</replaceable> = <replaceable>value</replaceable></literal>, where <replaceable>name</replaceable> is the name of an option and <replaceable>value</replaceable> is its value. For example,
 <programlisting>
 { config, pkgs, ... }:
 
@@ -30,19 +22,11 @@
   <xref linkend="opt-services.httpd.documentRoot"/> = "/webroot";
 }
 </programlisting>
-  defines a configuration with three option definitions that together enable
-  the Apache HTTP Server with <filename>/webroot</filename> as the document
-  root.
+  defines a configuration with three option definitions that together enable the Apache HTTP Server with <filename>/webroot</filename> as the document root.
  </para>
 
  <para>
-  Sets can be nested, and in fact dots in option names are shorthand for
-  defining a set containing another set. For instance,
-  <xref linkend="opt-services.httpd.enable"/> defines a set named
-  <varname>services</varname> that contains a set named
-  <varname>httpd</varname>, which in turn contains an option definition named
-  <varname>enable</varname> with value <literal>true</literal>. This means that
-  the example above can also be written as:
+  Sets can be nested, and in fact dots in option names are shorthand for defining a set containing another set. For instance, <xref linkend="opt-services.httpd.enable"/> defines a set named <varname>services</varname> that contains a set named <varname>httpd</varname>, which in turn contains an option definition named <varname>enable</varname> with value <literal>true</literal>. This means that the example above can also be written as:
 <programlisting>
 { config, pkgs, ... }:
 
@@ -55,22 +39,15 @@
   };
 }
 </programlisting>
-  which may be more convenient if you have lots of option definitions that
-  share the same prefix (such as <literal>services.httpd</literal>).
+  which may be more convenient if you have lots of option definitions that share the same prefix (such as <literal>services.httpd</literal>).
  </para>
 
  <para>
-  NixOS checks your option definitions for correctness. For instance, if you
-  try to define an option that doesn’t exist (that is, doesn’t have a
-  corresponding <emphasis>option declaration</emphasis>),
-  <command>nixos-rebuild</command> will give an error like:
+  NixOS checks your option definitions for correctness. For instance, if you try to define an option that doesn’t exist (that is, doesn’t have a corresponding <emphasis>option declaration</emphasis>), <command>nixos-rebuild</command> will give an error like:
 <screen>
 The option `services.httpd.enable' defined in `/etc/nixos/configuration.nix' does not exist.
 </screen>
-  Likewise, values in option definitions must have a correct type. For
-  instance, <option>services.httpd.enable</option> must be a Boolean
-  (<literal>true</literal> or <literal>false</literal>). Trying to give it a
-  value of another type, such as a string, will cause an error:
+  Likewise, values in option definitions must have a correct type. For instance, <option>services.httpd.enable</option> must be a Boolean (<literal>true</literal> or <literal>false</literal>). Trying to give it a value of another type, such as a string, will cause an error:
 <screen>
 The option value `services.httpd.enable' in `/etc/nixos/configuration.nix' is not a boolean.
 </screen>
@@ -89,12 +66,10 @@ The option value `services.httpd.enable' in `/etc/nixos/configuration.nix' is no
 <programlisting>
 <xref linkend="opt-networking.hostName"/> = "dexter";
 </programlisting>
-      Special characters can be escaped by prefixing them with a backslash
-      (e.g. <literal>\"</literal>).
+      Special characters can be escaped by prefixing them with a backslash (e.g. <literal>\"</literal>).
      </para>
      <para>
-      Multi-line strings can be enclosed in <emphasis>double single
-      quotes</emphasis>, e.g.
+      Multi-line strings can be enclosed in <emphasis>double single quotes</emphasis>, e.g.
 <programlisting>
 <xref linkend="opt-networking.extraHosts"/> =
   ''
@@ -102,13 +77,7 @@ The option value `services.httpd.enable' in `/etc/nixos/configuration.nix' is no
     10.0.0.1 server
   '';
 </programlisting>
-      The main difference is that it strips from each line a number of spaces
-      equal to the minimal indentation of the string as a whole (disregarding
-      the indentation of empty lines), and that characters like
-      <literal>"</literal> and <literal>\</literal> are not special (making it
-      more convenient for including things like shell code). See more info
-      about this in the Nix manual
-      <link
+      The main difference is that it strips from each line a number of spaces equal to the minimal indentation of the string as a whole (disregarding the indentation of empty lines), and that characters like <literal>"</literal> and <literal>\</literal> are not special (making it more convenient for including things like shell code). See more info about this in the Nix manual <link
       xlink:href="https://nixos.org/nix/manual/#ssec-values">here</link>.
      </para>
     </listitem>
@@ -137,12 +106,7 @@ The option value `services.httpd.enable' in `/etc/nixos/configuration.nix' is no
 <programlisting>
 <xref linkend="opt-boot.kernel.sysctl"/>."net.ipv4.tcp_keepalive_time" = 60;
 </programlisting>
-      (Note that here the attribute name
-      <literal>net.ipv4.tcp_keepalive_time</literal> is enclosed in quotes to
-      prevent it from being interpreted as a set named <literal>net</literal>
-      containing a set named <literal>ipv4</literal>, and so on. This is
-      because it’s not a NixOS option but the literal name of a Linux kernel
-      setting.)
+      (Note that here the attribute name <literal>net.ipv4.tcp_keepalive_time</literal> is enclosed in quotes to prevent it from being interpreted as a set named <literal>net</literal> containing a set named <literal>ipv4</literal>, and so on. This is because it’s not a NixOS option but the literal name of a Linux kernel setting.)
      </para>
     </listitem>
    </varlistentry>
@@ -152,8 +116,7 @@ The option value `services.httpd.enable' in `/etc/nixos/configuration.nix' is no
     </term>
     <listitem>
      <para>
-      Sets were introduced above. They are name/value pairs enclosed in braces,
-      as in the option definition
+      Sets were introduced above. They are name/value pairs enclosed in braces, as in the option definition
 <programlisting>
 <xref linkend="opt-fileSystems"/>."/boot" =
   { device = "/dev/sda1";
@@ -170,8 +133,7 @@ The option value `services.httpd.enable' in `/etc/nixos/configuration.nix' is no
     </term>
     <listitem>
      <para>
-      The important thing to note about lists is that list elements are
-      separated by whitespace, like this:
+      The important thing to note about lists is that list elements are separated by whitespace, like this:
 <programlisting>
 <xref linkend="opt-boot.kernelModules"/> = [ "fuse" "kvm-intel" "coretemp" ];
 </programlisting>
@@ -188,9 +150,7 @@ swapDevices = [ { device = "/dev/disk/by-label/swap"; } ];
     </term>
     <listitem>
      <para>
-      Usually, the packages you need are already part of the Nix Packages
-      collection, which is a set that can be accessed through the function
-      argument <varname>pkgs</varname>. Typical uses:
+      Usually, the packages you need are already part of the Nix Packages collection, which is a set that can be accessed through the function argument <varname>pkgs</varname>. Typical uses:
 <programlisting>
 <xref linkend="opt-environment.systemPackages"/> =
   [ pkgs.thunderbird
@@ -199,10 +159,7 @@ swapDevices = [ { device = "/dev/disk/by-label/swap"; } ];
 
 <xref linkend="opt-services.postgresql.package"/> = pkgs.postgresql_10;
 </programlisting>
-      The latter option definition changes the default PostgreSQL package used
-      by NixOS’s PostgreSQL service to 10.x. For more information on
-      packages, including how to add new ones, see
-      <xref linkend="sec-custom-packages"/>.
+      The latter option definition changes the default PostgreSQL package used by NixOS’s PostgreSQL service to 10.x. For more information on packages, including how to add new ones, see <xref linkend="sec-custom-packages"/>.
      </para>
     </listitem>
    </varlistentry>
diff --git a/nixos/doc/manual/configuration/config-syntax.xml b/nixos/doc/manual/configuration/config-syntax.xml
index 5ef498cf9ae..9de5c6f477b 100644
--- a/nixos/doc/manual/configuration/config-syntax.xml
+++ b/nixos/doc/manual/configuration/config-syntax.xml
@@ -5,18 +5,8 @@
          xml:id="sec-configuration-syntax">
  <title>Configuration Syntax</title>
  <para>
-  The NixOS configuration file
-  <filename>/etc/nixos/configuration.nix</filename> is actually a <emphasis>Nix
-  expression</emphasis>, which is the Nix package manager’s purely functional
-  language for describing how to build packages and configurations. This means
-  you have all the expressive power of that language at your disposal,
-  including the ability to abstract over common patterns, which is very useful
-  when managing complex systems. The syntax and semantics of the Nix language
-  are fully described in the
-  <link
-xlink:href="http://nixos.org/nix/manual/#chap-writing-nix-expressions">Nix
-  manual</link>, but here we give a short overview of the most important
-  constructs useful in NixOS configuration files.
+  The NixOS configuration file <filename>/etc/nixos/configuration.nix</filename> is actually a <emphasis>Nix expression</emphasis>, which is the Nix package manager’s purely functional language for describing how to build packages and configurations. This means you have all the expressive power of that language at your disposal, including the ability to abstract over common patterns, which is very useful when managing complex systems. The syntax and semantics of the Nix language are fully described in the <link
+xlink:href="http://nixos.org/nix/manual/#chap-writing-nix-expressions">Nix manual</link>, but here we give a short overview of the most important constructs useful in NixOS configuration files.
  </para>
  <xi:include href="config-file.xml" />
  <xi:include href="abstractions.xml" />
diff --git a/nixos/doc/manual/configuration/configuration.xml b/nixos/doc/manual/configuration/configuration.xml
index 5961209bc13..0197eb9b3a2 100644
--- a/nixos/doc/manual/configuration/configuration.xml
+++ b/nixos/doc/manual/configuration/configuration.xml
@@ -6,11 +6,7 @@
  <title>Configuration</title>
  <partintro xml:id="ch-configuration-intro">
   <para>
-   This chapter describes how to configure various aspects of a NixOS machine
-   through the configuration file
-   <filename>/etc/nixos/configuration.nix</filename>. As described in
-   <xref linkend="sec-changing-config" />, changes to this file only take
-   effect after you run <command>nixos-rebuild</command>.
+   This chapter describes how to configure various aspects of a NixOS machine through the configuration file <filename>/etc/nixos/configuration.nix</filename>. As described in <xref linkend="sec-changing-config" />, changes to this file only take effect after you run <command>nixos-rebuild</command>.
   </para>
  </partintro>
  <xi:include href="config-syntax.xml" />
diff --git a/nixos/doc/manual/configuration/customizing-packages.xml b/nixos/doc/manual/configuration/customizing-packages.xml
index 34e6ab4b24d..589db91e9b0 100644
--- a/nixos/doc/manual/configuration/customizing-packages.xml
+++ b/nixos/doc/manual/configuration/customizing-packages.xml
@@ -6,47 +6,25 @@
  <title>Customising Packages</title>
 
  <para>
-  Some packages in Nixpkgs have options to enable or disable optional
-  functionality or change other aspects of the package. For instance, the
-  Firefox wrapper package (which provides Firefox with a set of plugins such as
-  the Adobe Flash player) has an option to enable the Google Talk plugin. It
-  can be set in <filename>configuration.nix</filename> as follows: <filename>
-  nixpkgs.config.firefox.enableGoogleTalkPlugin = true; </filename>
+  Some packages in Nixpkgs have options to enable or disable optional functionality or change other aspects of the package. For instance, the Firefox wrapper package (which provides Firefox with a set of plugins such as the Adobe Flash player) has an option to enable the Google Talk plugin. It can be set in <filename>configuration.nix</filename> as follows: <filename> nixpkgs.config.firefox.enableGoogleTalkPlugin = true; </filename>
  </para>
 
  <warning>
   <para>
-   Unfortunately, Nixpkgs currently lacks a way to query available
-   configuration options.
+   Unfortunately, Nixpkgs currently lacks a way to query available configuration options.
   </para>
  </warning>
 
  <para>
-  Apart from high-level options, it’s possible to tweak a package in almost
-  arbitrary ways, such as changing or disabling dependencies of a package. For
-  instance, the Emacs package in Nixpkgs by default has a dependency on GTK 2.
-  If you want to build it against GTK 3, you can specify that as follows:
+  Apart from high-level options, it’s possible to tweak a package in almost arbitrary ways, such as changing or disabling dependencies of a package. For instance, the Emacs package in Nixpkgs by default has a dependency on GTK 2. If you want to build it against GTK 3, you can specify that as follows:
 <programlisting>
 <xref linkend="opt-environment.systemPackages"/> = [ (pkgs.emacs.override { gtk = pkgs.gtk3; }) ];
 </programlisting>
-  The function <varname>override</varname> performs the call to the Nix
-  function that produces Emacs, with the original arguments amended by the set
-  of arguments specified by you. So here the function argument
-  <varname>gtk</varname> gets the value <literal>pkgs.gtk3</literal>, causing
-  Emacs to depend on GTK 3. (The parentheses are necessary because in Nix,
-  function application binds more weakly than list construction, so without
-  them, <xref linkend="opt-environment.systemPackages"/> would be a list with
-  two elements.)
+  The function <varname>override</varname> performs the call to the Nix function that produces Emacs, with the original arguments amended by the set of arguments specified by you. So here the function argument <varname>gtk</varname> gets the value <literal>pkgs.gtk3</literal>, causing Emacs to depend on GTK 3. (The parentheses are necessary because in Nix, function application binds more weakly than list construction, so without them, <xref linkend="opt-environment.systemPackages"/> would be a list with two elements.)
  </para>
 
  <para>
-  Even greater customisation is possible using the function
-  <varname>overrideAttrs</varname>. While the <varname>override</varname>
-  mechanism above overrides the arguments of a package function,
-  <varname>overrideAttrs</varname> allows changing the
-  <emphasis>attributes</emphasis> passed to <literal>mkDerivation</literal>.
-  This permits changing any aspect of the package, such as the source code. For
-  instance, if you want to override the source code of Emacs, you can say:
+  Even greater customisation is possible using the function <varname>overrideAttrs</varname>. While the <varname>override</varname> mechanism above overrides the arguments of a package function, <varname>overrideAttrs</varname> allows changing the <emphasis>attributes</emphasis> passed to <literal>mkDerivation</literal>. This permits changing any aspect of the package, such as the source code. For instance, if you want to override the source code of Emacs, you can say:
 <programlisting>
 <xref linkend="opt-environment.systemPackages"/> = [
   (pkgs.emacs.overrideAttrs (oldAttrs: {
@@ -55,32 +33,16 @@
   }))
 ];
 </programlisting>
-  Here, <varname>overrideAttrs</varname> takes the Nix derivation specified by
-  <varname>pkgs.emacs</varname> and produces a new derivation in which the
-  original’s <literal>name</literal> and <literal>src</literal> attribute
-  have been replaced by the given values by re-calling
-  <literal>stdenv.mkDerivation</literal>. The original attributes are
-  accessible via the function argument, which is conventionally named
-  <varname>oldAttrs</varname>.
+  Here, <varname>overrideAttrs</varname> takes the Nix derivation specified by <varname>pkgs.emacs</varname> and produces a new derivation in which the original’s <literal>name</literal> and <literal>src</literal> attribute have been replaced by the given values by re-calling <literal>stdenv.mkDerivation</literal>. The original attributes are accessible via the function argument, which is conventionally named <varname>oldAttrs</varname>.
  </para>
 
  <para>
-  The overrides shown above are not global. They do not affect the original
-  package; other packages in Nixpkgs continue to depend on the original rather
-  than the customised package. This means that if another package in your
-  system depends on the original package, you end up with two instances of the
-  package. If you want to have everything depend on your customised instance,
-  you can apply a <emphasis>global</emphasis> override as follows:
+  The overrides shown above are not global. They do not affect the original package; other packages in Nixpkgs continue to depend on the original rather than the customised package. This means that if another package in your system depends on the original package, you end up with two instances of the package. If you want to have everything depend on your customised instance, you can apply a <emphasis>global</emphasis> override as follows:
 <screen>
 nixpkgs.config.packageOverrides = pkgs:
   { emacs = pkgs.emacs.override { gtk = pkgs.gtk3; };
   };
 </screen>
-  The effect of this definition is essentially equivalent to modifying the
-  <literal>emacs</literal> attribute in the Nixpkgs source tree. Any package in
-  Nixpkgs that depends on <literal>emacs</literal> will be passed your
-  customised instance. (However, the value <literal>pkgs.emacs</literal> in
-  <varname>nixpkgs.config.packageOverrides</varname> refers to the original
-  rather than overridden instance, to prevent an infinite recursion.)
+  The effect of this definition is essentially equivalent to modifying the <literal>emacs</literal> attribute in the Nixpkgs source tree. Any package in Nixpkgs that depends on <literal>emacs</literal> will be passed your customised instance. (However, the value <literal>pkgs.emacs</literal> in <varname>nixpkgs.config.packageOverrides</varname> refers to the original rather than overridden instance, to prevent an infinite recursion.)
  </para>
 </section>
diff --git a/nixos/doc/manual/configuration/declarative-packages.xml b/nixos/doc/manual/configuration/declarative-packages.xml
index 5fb3bcb9f8f..4b15e1ca42e 100644
--- a/nixos/doc/manual/configuration/declarative-packages.xml
+++ b/nixos/doc/manual/configuration/declarative-packages.xml
@@ -6,17 +6,11 @@
  <title>Declarative Package Management</title>
 
  <para>
-  With declarative package management, you specify which packages you want on
-  your system by setting the option
-  <xref linkend="opt-environment.systemPackages"/>. For instance, adding the
-  following line to <filename>configuration.nix</filename> enables the Mozilla
-  Thunderbird email application:
+  With declarative package management, you specify which packages you want on your system by setting the option <xref linkend="opt-environment.systemPackages"/>. For instance, adding the following line to <filename>configuration.nix</filename> enables the Mozilla Thunderbird email application:
 <programlisting>
 <xref linkend="opt-environment.systemPackages"/> = [ pkgs.thunderbird ];
 </programlisting>
-  The effect of this specification is that the Thunderbird package from Nixpkgs
-  will be built or downloaded as part of the system when you run
-  <command>nixos-rebuild switch</command>.
+  The effect of this specification is that the Thunderbird package from Nixpkgs will be built or downloaded as part of the system when you run <command>nixos-rebuild switch</command>.
  </para>
 
  <para>
@@ -26,20 +20,15 @@
 nixos.firefox   firefox-23.0   Mozilla Firefox - the browser, reloaded
 <replaceable>...</replaceable>
 </screen>
-  The first column in the output is the <emphasis>attribute name</emphasis>,
-  such as <literal>nixos.thunderbird</literal>.
+  The first column in the output is the <emphasis>attribute name</emphasis>, such as <literal>nixos.thunderbird</literal>.
  </para>
- <para>
-  Note: the <literal>nixos</literal> prefix tells us that we want to get the
-  package from the <literal>nixos</literal> channel and works only in CLI tools.
 
-  In declarative configuration use <literal>pkgs</literal> prefix (variable).
+ <para>
+  Note: the <literal>nixos</literal> prefix tells us that we want to get the package from the <literal>nixos</literal> channel and works only in CLI tools. In declarative configuration use <literal>pkgs</literal> prefix (variable).
  </para>
 
  <para>
-  To “uninstall” a package, simply remove it from
-  <xref linkend="opt-environment.systemPackages"/> and run
-  <command>nixos-rebuild switch</command>.
+  To “uninstall” a package, simply remove it from <xref linkend="opt-environment.systemPackages"/> and run <command>nixos-rebuild switch</command>.
  </para>
 
  <xi:include href="customizing-packages.xml" />
diff --git a/nixos/doc/manual/configuration/file-systems.xml b/nixos/doc/manual/configuration/file-systems.xml
index e4c03de71b7..1f762b2b00e 100644
--- a/nixos/doc/manual/configuration/file-systems.xml
+++ b/nixos/doc/manual/configuration/file-systems.xml
@@ -5,41 +5,21 @@
          xml:id="ch-file-systems">
  <title>File Systems</title>
  <para>
-  You can define file systems using the <option>fileSystems</option>
-  configuration option. For instance, the following definition causes NixOS to
-  mount the Ext4 file system on device
-  <filename>/dev/disk/by-label/data</filename> onto the mount point
-  <filename>/data</filename>:
+  You can define file systems using the <option>fileSystems</option> configuration option. For instance, the following definition causes NixOS to mount the Ext4 file system on device <filename>/dev/disk/by-label/data</filename> onto the mount point <filename>/data</filename>:
 <programlisting>
 <xref linkend="opt-fileSystems"/>."/data" =
   { device = "/dev/disk/by-label/data";
     fsType = "ext4";
   };
 </programlisting>
-  Mount points are created automatically if they don’t already exist. For
-  <option><link linkend="opt-fileSystems._name__.device">device</link></option>,
-  it’s best to use the topology-independent device aliases in
-  <filename>/dev/disk/by-label</filename> and
-  <filename>/dev/disk/by-uuid</filename>, as these don’t change if the
-  topology changes (e.g. if a disk is moved to another IDE controller).
+  Mount points are created automatically if they don’t already exist. For <option><link linkend="opt-fileSystems._name__.device">device</link></option>, it’s best to use the topology-independent device aliases in <filename>/dev/disk/by-label</filename> and <filename>/dev/disk/by-uuid</filename>, as these don’t change if the topology changes (e.g. if a disk is moved to another IDE controller).
  </para>
  <para>
-  You can usually omit the file system type
-  (<option><link linkend="opt-fileSystems._name__.fsType">fsType</link></option>),
-  since <command>mount</command> can usually detect the type and load the
-  necessary kernel module automatically. However, if the file system is needed
-  at early boot (in the initial ramdisk) and is not <literal>ext2</literal>,
-  <literal>ext3</literal> or <literal>ext4</literal>, then it’s best to
-  specify <option>fsType</option> to ensure that the kernel module is
-  available.
+  You can usually omit the file system type (<option><link linkend="opt-fileSystems._name__.fsType">fsType</link></option>), since <command>mount</command> can usually detect the type and load the necessary kernel module automatically. However, if the file system is needed at early boot (in the initial ramdisk) and is not <literal>ext2</literal>, <literal>ext3</literal> or <literal>ext4</literal>, then it’s best to specify <option>fsType</option> to ensure that the kernel module is available.
  </para>
  <note>
   <para>
-   System startup will fail if any of the filesystems fails to mount, dropping
-   you to the emergency shell. You can make a mount asynchronous and
-   non-critical by adding
-   <literal><link linkend="opt-fileSystems._name__.options">options</link> = [
-   "nofail" ];</literal>.
+   System startup will fail if any of the filesystems fails to mount, dropping you to the emergency shell. You can make a mount asynchronous and non-critical by adding <literal><link linkend="opt-fileSystems._name__.options">options</link> = [ "nofail" ];</literal>.
   </para>
  </note>
  <xi:include href="luks-file-systems.xml" />
diff --git a/nixos/doc/manual/configuration/firewall.xml b/nixos/doc/manual/configuration/firewall.xml
index 47a19ac82c0..fbed9ac7c95 100644
--- a/nixos/doc/manual/configuration/firewall.xml
+++ b/nixos/doc/manual/configuration/firewall.xml
@@ -6,21 +6,15 @@
  <title>Firewall</title>
 
  <para>
-  NixOS has a simple stateful firewall that blocks incoming connections and
-  other unexpected packets. The firewall applies to both IPv4 and IPv6 traffic.
-  It is enabled by default. It can be disabled as follows:
+  NixOS has a simple stateful firewall that blocks incoming connections and other unexpected packets. The firewall applies to both IPv4 and IPv6 traffic. It is enabled by default. It can be disabled as follows:
 <programlisting>
 <xref linkend="opt-networking.firewall.enable"/> = false;
 </programlisting>
-  If the firewall is enabled, you can open specific TCP ports to the outside
-  world:
+  If the firewall is enabled, you can open specific TCP ports to the outside world:
 <programlisting>
 <xref linkend="opt-networking.firewall.allowedTCPPorts"/> = [ 80 443 ];
 </programlisting>
-  Note that TCP port 22 (ssh) is opened automatically if the SSH daemon is
-  enabled (<option><xref linkend="opt-services.openssh.enable"/> =
-  true</option>). UDP ports can be opened through
-  <xref linkend="opt-networking.firewall.allowedUDPPorts"/>.
+  Note that TCP port 22 (ssh) is opened automatically if the SSH daemon is enabled (<option><xref linkend="opt-services.openssh.enable"/> = true</option>). UDP ports can be opened through <xref linkend="opt-networking.firewall.allowedUDPPorts"/>.
  </para>
 
  <para>
@@ -31,7 +25,6 @@
   { from = 8000; to = 8010; }
 ];
 </programlisting>
-  Similarly, UDP port ranges can be opened through
-  <xref linkend="opt-networking.firewall.allowedUDPPortRanges"/>.
+  Similarly, UDP port ranges can be opened through <xref linkend="opt-networking.firewall.allowedUDPPortRanges"/>.
  </para>
 </section>
diff --git a/nixos/doc/manual/configuration/ipv4-config.xml b/nixos/doc/manual/configuration/ipv4-config.xml
index 71ddf41491b..3ebde2193cb 100644
--- a/nixos/doc/manual/configuration/ipv4-config.xml
+++ b/nixos/doc/manual/configuration/ipv4-config.xml
@@ -6,17 +6,14 @@
  <title>IPv4 Configuration</title>
 
  <para>
-  By default, NixOS uses DHCP (specifically, <command>dhcpcd</command>) to
-  automatically configure network interfaces. However, you can configure an
-  interface manually as follows:
+  By default, NixOS uses DHCP (specifically, <command>dhcpcd</command>) to automatically configure network interfaces. However, you can configure an interface manually as follows:
 <programlisting>
 <link linkend="opt-networking.interfaces._name__.ipv4.addresses">networking.interfaces.eth0.ipv4.addresses</link> = [ {
   address = "192.168.1.2";
   prefixLength = 24;
 } ];
 </programlisting>
-  Typically you’ll also want to set a default gateway and set of name
-  servers:
+  Typically you’ll also want to set a default gateway and set of name servers:
 <programlisting>
 <xref linkend="opt-networking.defaultGateway"/> = "192.168.1.1";
 <xref linkend="opt-networking.nameservers"/> = [ "8.8.8.8" ];
@@ -25,10 +22,7 @@
 
  <note>
   <para>
-   Statically configured interfaces are set up by the systemd service
-   <replaceable>interface-name</replaceable><literal>-cfg.service</literal>.
-   The default gateway and name server configuration is performed by
-   <literal>network-setup.service</literal>.
+   Statically configured interfaces are set up by the systemd service <replaceable>interface-name</replaceable><literal>-cfg.service</literal>. The default gateway and name server configuration is performed by <literal>network-setup.service</literal>.
   </para>
  </note>
 
@@ -37,7 +31,6 @@
 <programlisting>
 <xref linkend="opt-networking.hostName"/> = "cartman";
 </programlisting>
-  The default host name is <literal>nixos</literal>. Set it to the empty string
-  (<literal>""</literal>) to allow the DHCP server to provide the host name.
+  The default host name is <literal>nixos</literal>. Set it to the empty string (<literal>""</literal>) to allow the DHCP server to provide the host name.
  </para>
 </section>
diff --git a/nixos/doc/manual/configuration/ipv6-config.xml b/nixos/doc/manual/configuration/ipv6-config.xml
index 675a5d9a260..690cfcca015 100644
--- a/nixos/doc/manual/configuration/ipv6-config.xml
+++ b/nixos/doc/manual/configuration/ipv6-config.xml
@@ -6,25 +6,21 @@
  <title>IPv6 Configuration</title>
 
  <para>
-  IPv6 is enabled by default. Stateless address autoconfiguration is used to
-  automatically assign IPv6 addresses to all interfaces. You can disable IPv6
-  support globally by setting:
+  IPv6 is enabled by default. Stateless address autoconfiguration is used to automatically assign IPv6 addresses to all interfaces. You can disable IPv6 support globally by setting:
 <programlisting>
 <xref linkend="opt-networking.enableIPv6"/> = false;
 </programlisting>
  </para>
 
  <para>
-  You can disable IPv6 on a single interface using a normal sysctl (in this
-  example, we use interface <varname>eth0</varname>):
+  You can disable IPv6 on a single interface using a normal sysctl (in this example, we use interface <varname>eth0</varname>):
 <programlisting>
 <xref linkend="opt-boot.kernel.sysctl"/>."net.ipv6.conf.eth0.disable_ipv6" = true;
 </programlisting>
  </para>
 
  <para>
-  As with IPv4 networking interfaces are automatically configured via DHCPv6.
-  You can configure an interface manually:
+  As with IPv4 networking interfaces are automatically configured via DHCPv6. You can configure an interface manually:
 <programlisting>
 <link linkend="opt-networking.interfaces._name__.ipv6.addresses">networking.interfaces.eth0.ipv6.addresses</link> = [ {
   address = "fe00:aa:bb:cc::2";
@@ -44,7 +40,6 @@
  </para>
 
  <para>
-  See <xref linkend='sec-ipv4' /> for similar examples and additional
-  information.
+  See <xref linkend='sec-ipv4' /> for similar examples and additional information.
  </para>
 </section>
diff --git a/nixos/doc/manual/configuration/kubernetes.xml b/nixos/doc/manual/configuration/kubernetes.xml
index 54a100e4479..de5ceb83e77 100644
--- a/nixos/doc/manual/configuration/kubernetes.xml
+++ b/nixos/doc/manual/configuration/kubernetes.xml
@@ -5,12 +5,10 @@
          xml:id="sec-kubernetes">
  <title>Kubernetes</title>
  <para>
-  The NixOS Kubernetes module is a collective term for a handful of individual
-  submodules implementing the Kubernetes cluster components.
+  The NixOS Kubernetes module is a collective term for a handful of individual submodules implementing the Kubernetes cluster components.
  </para>
  <para>
-  There are generally two ways of enabling Kubernetes on NixOS. One way is to
-  enable and configure cluster components appropriately by hand:
+  There are generally two ways of enabling Kubernetes on NixOS. One way is to enable and configure cluster components appropriately by hand:
 <programlisting>
 services.kubernetes = {
   apiserver.enable = true;
@@ -21,9 +19,7 @@ services.kubernetes = {
   flannel.enable = true;
 };
 </programlisting>
-  Another way is to assign cluster roles ("master" and/or "node") to the host.
-  This enables apiserver, controllerManager, scheduler, addonManager,
-  kube-proxy and etcd:
+  Another way is to assign cluster roles ("master" and/or "node") to the host. This enables apiserver, controllerManager, scheduler, addonManager, kube-proxy and etcd:
 <programlisting>
 <xref linkend="opt-services.kubernetes.roles"/> = [ "master" ];
 </programlisting>
@@ -31,66 +27,29 @@ services.kubernetes = {
 <programlisting>
 <xref linkend="opt-services.kubernetes.roles"/> = [ "node" ];
 </programlisting>
-  Assigning both the master and node roles is usable if you want a single node
-  Kubernetes cluster for dev or testing purposes:
+  Assigning both the master and node roles is usable if you want a single node Kubernetes cluster for dev or testing purposes:
 <programlisting>
 <xref linkend="opt-services.kubernetes.roles"/> = [ "master" "node" ];
 </programlisting>
-  Note: Assigning either role will also default both
-  <xref linkend="opt-services.kubernetes.flannel.enable"/> and
-  <xref linkend="opt-services.kubernetes.easyCerts"/> to true. This sets up
-  flannel as CNI and activates automatic PKI bootstrapping.
+  Note: Assigning either role will also default both <xref linkend="opt-services.kubernetes.flannel.enable"/> and <xref linkend="opt-services.kubernetes.easyCerts"/> to true. This sets up flannel as CNI and activates automatic PKI bootstrapping.
  </para>
  <para>
-  As of kubernetes 1.10.X it has been deprecated to open non-tls-enabled ports
-  on kubernetes components. Thus, from NixOS 19.03 all plain HTTP ports have
-  been disabled by default. While opening insecure ports is still possible, it
-  is recommended not to bind these to other interfaces than loopback. To
-  re-enable the insecure port on the apiserver, see options:
-  <xref linkend="opt-services.kubernetes.apiserver.insecurePort"/> and
-  <xref linkend="opt-services.kubernetes.apiserver.insecureBindAddress"/>
+  As of kubernetes 1.10.X it has been deprecated to open non-tls-enabled ports on kubernetes components. Thus, from NixOS 19.03 all plain HTTP ports have been disabled by default. While opening insecure ports is still possible, it is recommended not to bind these to other interfaces than loopback. To re-enable the insecure port on the apiserver, see options: <xref linkend="opt-services.kubernetes.apiserver.insecurePort"/> and <xref linkend="opt-services.kubernetes.apiserver.insecureBindAddress"/>
  </para>
  <note>
   <para>
-   As of NixOS 19.03, it is mandatory to configure:
-   <xref linkend="opt-services.kubernetes.masterAddress"/>. The masterAddress
-   must be resolveable and routeable by all cluster nodes. In single node
-   clusters, this can be set to <literal>localhost</literal>.
+   As of NixOS 19.03, it is mandatory to configure: <xref linkend="opt-services.kubernetes.masterAddress"/>. The masterAddress must be resolveable and routeable by all cluster nodes. In single node clusters, this can be set to <literal>localhost</literal>.
   </para>
  </note>
  <para>
-  Role-based access control (RBAC) authorization mode is enabled by default.
-  This means that anonymous requests to the apiserver secure port will
-  expectedly cause a permission denied error. All cluster components must
-  therefore be configured with x509 certificates for two-way tls communication.
-  The x509 certificate subject section determines the roles and permissions
-  granted by the apiserver to perform clusterwide or namespaced operations. See
-  also:
-  <link
-     xlink:href="https://kubernetes.io/docs/reference/access-authn-authz/rbac/">
-  Using RBAC Authorization</link>.
+  Role-based access control (RBAC) authorization mode is enabled by default. This means that anonymous requests to the apiserver secure port will expectedly cause a permission denied error. All cluster components must therefore be configured with x509 certificates for two-way tls communication. The x509 certificate subject section determines the roles and permissions granted by the apiserver to perform clusterwide or namespaced operations. See also: <link
+     xlink:href="https://kubernetes.io/docs/reference/access-authn-authz/rbac/"> Using RBAC Authorization</link>.
  </para>
  <para>
-  The NixOS kubernetes module provides an option for automatic certificate
-  bootstrapping and configuration,
-  <xref linkend="opt-services.kubernetes.easyCerts"/>. The PKI bootstrapping
-  process involves setting up a certificate authority (CA) daemon (cfssl) on
-  the kubernetes master node. cfssl generates a CA-cert for the cluster, and
-  uses the CA-cert for signing subordinate certs issued to each of the cluster
-  components. Subsequently, the certmgr daemon monitors active certificates and
-  renews them when needed. For single node Kubernetes clusters, setting
-  <xref linkend="opt-services.kubernetes.easyCerts"/> = true is sufficient and
-  no further action is required. For joining extra node machines to an existing
-  cluster on the other hand, establishing initial trust is mandatory.
+  The NixOS kubernetes module provides an option for automatic certificate bootstrapping and configuration, <xref linkend="opt-services.kubernetes.easyCerts"/>. The PKI bootstrapping process involves setting up a certificate authority (CA) daemon (cfssl) on the kubernetes master node. cfssl generates a CA-cert for the cluster, and uses the CA-cert for signing subordinate certs issued to each of the cluster components. Subsequently, the certmgr daemon monitors active certificates and renews them when needed. For single node Kubernetes clusters, setting <xref linkend="opt-services.kubernetes.easyCerts"/> = true is sufficient and no further action is required. For joining extra node machines to an existing cluster on the other hand, establishing initial trust is mandatory.
  </para>
  <para>
-  To add new nodes to the cluster: On any (non-master) cluster node where
-  <xref linkend="opt-services.kubernetes.easyCerts"/> is enabled, the helper
-  script <literal>nixos-kubernetes-node-join</literal> is available on PATH.
-  Given a token on stdin, it will copy the token to the kubernetes secrets
-  directory and restart the certmgr service. As requested certificates are
-  issued, the script will restart kubernetes cluster components as needed for
-  them to pick up new keypairs.
+  To add new nodes to the cluster: On any (non-master) cluster node where <xref linkend="opt-services.kubernetes.easyCerts"/> is enabled, the helper script <literal>nixos-kubernetes-node-join</literal> is available on PATH. Given a token on stdin, it will copy the token to the kubernetes secrets directory and restart the certmgr service. As requested certificates are issued, the script will restart kubernetes cluster components as needed for them to pick up new keypairs.
  </para>
  <note>
   <para>
@@ -98,15 +57,6 @@ services.kubernetes = {
   </para>
  </note>
  <para>
-  In order to interact with an RBAC-enabled cluster as an administrator, one
-  needs to have cluster-admin privileges. By default, when easyCerts is
-  enabled, a cluster-admin kubeconfig file is generated and linked into
-  <literal>/etc/kubernetes/cluster-admin.kubeconfig</literal> as determined by
-  <xref linkend="opt-services.kubernetes.pki.etcClusterAdminKubeconfig"/>.
-  <literal>export KUBECONFIG=/etc/kubernetes/cluster-admin.kubeconfig</literal>
-  will make kubectl use this kubeconfig to access and authenticate the cluster.
-  The cluster-admin kubeconfig references an auto-generated keypair owned by
-  root. Thus, only root on the kubernetes master may obtain cluster-admin
-  rights by means of this file.
+  In order to interact with an RBAC-enabled cluster as an administrator, one needs to have cluster-admin privileges. By default, when easyCerts is enabled, a cluster-admin kubeconfig file is generated and linked into <literal>/etc/kubernetes/cluster-admin.kubeconfig</literal> as determined by <xref linkend="opt-services.kubernetes.pki.etcClusterAdminKubeconfig"/>. <literal>export KUBECONFIG=/etc/kubernetes/cluster-admin.kubeconfig</literal> will make kubectl use this kubeconfig to access and authenticate the cluster. The cluster-admin kubeconfig references an auto-generated keypair owned by root. Thus, only root on the kubernetes master may obtain cluster-admin rights by means of this file.
  </para>
 </chapter>
diff --git a/nixos/doc/manual/configuration/linux-kernel.xml b/nixos/doc/manual/configuration/linux-kernel.xml
index 644d3a33ffd..7f757f287ce 100644
--- a/nixos/doc/manual/configuration/linux-kernel.xml
+++ b/nixos/doc/manual/configuration/linux-kernel.xml
@@ -5,27 +5,19 @@
          xml:id="sec-kernel-config">
  <title>Linux Kernel</title>
  <para>
-  You can override the Linux kernel and associated packages using the option
-  <option>boot.kernelPackages</option>. For instance, this selects the Linux
-  3.10 kernel:
+  You can override the Linux kernel and associated packages using the option <option>boot.kernelPackages</option>. For instance, this selects the Linux 3.10 kernel:
 <programlisting>
 <xref linkend="opt-boot.kernelPackages"/> = pkgs.linuxPackages_3_10;
 </programlisting>
-  Note that this not only replaces the kernel, but also packages that are
-  specific to the kernel version, such as the NVIDIA video drivers. This
-  ensures that driver packages are consistent with the kernel.
+  Note that this not only replaces the kernel, but also packages that are specific to the kernel version, such as the NVIDIA video drivers. This ensures that driver packages are consistent with the kernel.
  </para>
  <para>
-  The default Linux kernel configuration should be fine for most users. You can
-  see the configuration of your current kernel with the following command:
+  The default Linux kernel configuration should be fine for most users. You can see the configuration of your current kernel with the following command:
 <programlisting>
 zcat /proc/config.gz
 </programlisting>
-  If you want to change the kernel configuration, you can use the
-  <option>packageOverrides</option> feature (see
-  <xref
-linkend="sec-customising-packages" />). For instance, to enable support
-  for the kernel debugger KGDB:
+  If you want to change the kernel configuration, you can use the <option>packageOverrides</option> feature (see <xref
+linkend="sec-customising-packages" />). For instance, to enable support for the kernel debugger KGDB:
 <programlisting>
 nixpkgs.config.packageOverrides = pkgs:
   { linux_3_4 = pkgs.linux_3_4.override {
@@ -36,44 +28,31 @@ nixpkgs.config.packageOverrides = pkgs:
     };
   };
 </programlisting>
-  <varname>extraConfig</varname> takes a list of Linux kernel configuration
-  options, one per line. The name of the option should not include the prefix
-  <literal>CONFIG_</literal>. The option value is typically
-  <literal>y</literal>, <literal>n</literal> or <literal>m</literal> (to build
-  something as a kernel module).
+  <varname>extraConfig</varname> takes a list of Linux kernel configuration options, one per line. The name of the option should not include the prefix <literal>CONFIG_</literal>. The option value is typically <literal>y</literal>, <literal>n</literal> or <literal>m</literal> (to build something as a kernel module).
  </para>
  <para>
-  Kernel modules for hardware devices are generally loaded automatically by
-  <command>udev</command>. You can force a module to be loaded via
-  <xref linkend="opt-boot.kernelModules"/>, e.g.
+  Kernel modules for hardware devices are generally loaded automatically by <command>udev</command>. You can force a module to be loaded via <xref linkend="opt-boot.kernelModules"/>, e.g.
 <programlisting>
 <xref linkend="opt-boot.kernelModules"/> = [ "fuse" "kvm-intel" "coretemp" ];
 </programlisting>
-  If the module is required early during the boot (e.g. to mount the root file
-  system), you can use <xref linkend="opt-boot.initrd.kernelModules"/>:
+  If the module is required early during the boot (e.g. to mount the root file system), you can use <xref linkend="opt-boot.initrd.kernelModules"/>:
 <programlisting>
 <xref linkend="opt-boot.initrd.kernelModules"/> = [ "cifs" ];
 </programlisting>
-  This causes the specified modules and their dependencies to be added to the
-  initial ramdisk.
+  This causes the specified modules and their dependencies to be added to the initial ramdisk.
  </para>
  <para>
-  Kernel runtime parameters can be set through
-  <xref linkend="opt-boot.kernel.sysctl"/>, e.g.
+  Kernel runtime parameters can be set through <xref linkend="opt-boot.kernel.sysctl"/>, e.g.
 <programlisting>
 <xref linkend="opt-boot.kernel.sysctl"/>."net.ipv4.tcp_keepalive_time" = 120;
 </programlisting>
-  sets the kernel’s TCP keepalive time to 120 seconds. To see the available
-  parameters, run <command>sysctl -a</command>.
+  sets the kernel’s TCP keepalive time to 120 seconds. To see the available parameters, run <command>sysctl -a</command>.
  </para>
  <section xml:id="sec-linux-config-customizing">
   <title>Customize your kernel</title>
 
   <para>
-   The first step before compiling the kernel is to generate an appropriate
-   <literal>.config</literal> configuration. Either you pass your own config
-   via the <literal>configfile</literal> setting of
-   <literal>linuxManualConfig</literal>:
+   The first step before compiling the kernel is to generate an appropriate <literal>.config</literal> configuration. Either you pass your own config via the <literal>configfile</literal> setting of <literal>linuxManualConfig</literal>:
 <screen><![CDATA[
   custom-kernel = super.linuxManualConfig {
     inherit (super) stdenv hostPlatform;
@@ -84,17 +63,11 @@ nixpkgs.config.packageOverrides = pkgs:
     allowImportFromDerivation = true;
   };
   ]]></screen>
-   You can edit the config with this snippet (by default <command>make
-   menuconfig</command> won't work out of the box on nixos):
+   You can edit the config with this snippet (by default <command>make menuconfig</command> won't work out of the box on nixos):
 <screen><![CDATA[
       nix-shell -E 'with import <nixpkgs> {}; kernelToOverride.overrideAttrs (o: {nativeBuildInputs=o.nativeBuildInputs ++ [ pkgconfig ncurses ];})'
   ]]></screen>
-   or you can let nixpkgs generate the configuration. Nixpkgs generates it via
-   answering the interactive kernel utility <command>make config</command>. The
-   answers depend on parameters passed to
-   <filename>pkgs/os-specific/linux/kernel/generic.nix</filename> (which you
-   can influence by overriding <literal>extraConfig, autoModules,
-   modDirVersion, preferBuiltin, extraConfig</literal>).
+   or you can let nixpkgs generate the configuration. Nixpkgs generates it via answering the interactive kernel utility <command>make config</command>. The answers depend on parameters passed to <filename>pkgs/os-specific/linux/kernel/generic.nix</filename> (which you can influence by overriding <literal>extraConfig, autoModules, modDirVersion, preferBuiltin, extraConfig</literal>).
 <screen><![CDATA[
 
   mptcp93.override ({
@@ -121,9 +94,7 @@ nixpkgs.config.packageOverrides = pkgs:
   <title>Developing kernel modules</title>
 
   <para>
-   When developing kernel modules it's often convenient to run edit-compile-run
-   loop as quickly as possible. See below snippet as an example of developing
-   <literal>mellanox</literal> drivers.
+   When developing kernel modules it's often convenient to run edit-compile-run loop as quickly as possible. See below snippet as an example of developing <literal>mellanox</literal> drivers.
   </para>
 
 <screen><![CDATA[
diff --git a/nixos/doc/manual/configuration/luks-file-systems.xml b/nixos/doc/manual/configuration/luks-file-systems.xml
index 8a2b107e0ee..d57fd256b2e 100644
--- a/nixos/doc/manual/configuration/luks-file-systems.xml
+++ b/nixos/doc/manual/configuration/luks-file-systems.xml
@@ -6,10 +6,7 @@
  <title>LUKS-Encrypted File Systems</title>
 
  <para>
-  NixOS supports file systems that are encrypted using
-  <emphasis>LUKS</emphasis> (Linux Unified Key Setup). For example, here is how
-  you create an encrypted Ext4 file system on the device
-  <filename>/dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d</filename>:
+  NixOS supports file systems that are encrypted using <emphasis>LUKS</emphasis> (Linux Unified Key Setup). For example, here is how you create an encrypted Ext4 file system on the device <filename>/dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d</filename>:
 <screen>
 # cryptsetup luksFormat /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d
 
@@ -26,15 +23,12 @@ Enter passphrase for /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d: ***
 
 # mkfs.ext4 /dev/mapper/crypted
 </screen>
-  To ensure that this file system is automatically mounted at boot time as
-  <filename>/</filename>, add the following to
-  <filename>configuration.nix</filename>:
+  To ensure that this file system is automatically mounted at boot time as <filename>/</filename>, add the following to <filename>configuration.nix</filename>:
 <programlisting>
 <link linkend="opt-boot.initrd.luks.devices._name__.device">boot.initrd.luks.devices.crypted.device</link> = "/dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d";
 <xref linkend="opt-fileSystems"/>."/".device = "/dev/mapper/crypted";
 </programlisting>
-  Should grub be used as bootloader, and <filename>/boot</filename> is located
-  on an encrypted partition, it is necessary to add the following grub option:
+  Should grub be used as bootloader, and <filename>/boot</filename> is located on an encrypted partition, it is necessary to add the following grub option:
 <programlisting><xref linkend="opt-boot.loader.grub.enableCryptodisk"/> = true;</programlisting>
  </para>
 </section>
diff --git a/nixos/doc/manual/configuration/matrix.xml b/nixos/doc/manual/configuration/matrix.xml
index ef8d5cbda88..c7c7e4e5491 100644
--- a/nixos/doc/manual/configuration/matrix.xml
+++ b/nixos/doc/manual/configuration/matrix.xml
@@ -5,33 +5,16 @@
          xml:id="module-services-matrix">
  <title>Matrix</title>
  <para>
-  <link xlink:href="https://matrix.org/">Matrix</link> is an open standard for
-  interoperable, decentralised, real-time communication over IP. It can be used
-  to power Instant Messaging, VoIP/WebRTC signalling, Internet of Things
-  communication - or anywhere you need a standard HTTP API for publishing and
-  subscribing to data whilst tracking the conversation history.
+  <link xlink:href="https://matrix.org/">Matrix</link> is an open standard for interoperable, decentralised, real-time communication over IP. It can be used to power Instant Messaging, VoIP/WebRTC signalling, Internet of Things communication - or anywhere you need a standard HTTP API for publishing and subscribing to data whilst tracking the conversation history.
  </para>
  <para>
-  This chapter will show you how to set up your own, self-hosted Matrix
-  homeserver using the Synapse reference homeserver, and how to serve your own
-  copy of the Riot web client. See the
-  <link xlink:href="https://matrix.org/docs/projects/try-matrix-now.html">Try
-  Matrix Now!</link> overview page for links to Riot Apps for Android and iOS,
-  desktop clients, as well as bridges to other networks and other projects
-  around Matrix.
+  This chapter will show you how to set up your own, self-hosted Matrix homeserver using the Synapse reference homeserver, and how to serve your own copy of the Riot web client. See the <link xlink:href="https://matrix.org/docs/projects/try-matrix-now.html">Try Matrix Now!</link> overview page for links to Riot Apps for Android and iOS, desktop clients, as well as bridges to other networks and other projects around Matrix.
  </para>
  <section xml:id="module-services-matrix-synapse">
   <title>Synapse Homeserver</title>
 
   <para>
-   <link xlink:href="https://github.com/matrix-org/synapse">Synapse</link> is
-   the reference homeserver implementation of Matrix from the core development
-   team at matrix.org. The following configuration example will set up a
-   synapse server for the <literal>example.org</literal> domain, served from
-   the host <literal>myhostname.example.org</literal>. For more information,
-   please refer to the
-   <link xlink:href="https://github.com/matrix-org/synapse#synapse-installation">
-   installation instructions of Synapse </link>.
+   <link xlink:href="https://github.com/matrix-org/synapse">Synapse</link> is the reference homeserver implementation of Matrix from the core development team at matrix.org. The following configuration example will set up a synapse server for the <literal>example.org</literal> domain, served from the host <literal>myhostname.example.org</literal>. For more information, please refer to the <link xlink:href="https://github.com/matrix-org/synapse#synapse-installation"> installation instructions of Synapse </link>.
 <programlisting>
 let
   fqdn =
@@ -121,26 +104,11 @@ in {
   </para>
 
   <para>
-   If the <code>A</code> and <code>AAAA</code> DNS records on
-   <literal>example.org</literal> do not point on the same host as the records
-   for <code>myhostname.example.org</code>, you can easily move the
-   <code>/.well-known</code> virtualHost section of the code to the host that
-   is serving <literal>example.org</literal>, while the rest stays on
-   <literal>myhostname.example.org</literal> with no other changes required.
-   This pattern also allows to seamlessly move the homeserver from
-   <literal>myhostname.example.org</literal> to
-   <literal>myotherhost.example.org</literal> by only changing the
-   <code>/.well-known</code> redirection target.
+   If the <code>A</code> and <code>AAAA</code> DNS records on <literal>example.org</literal> do not point on the same host as the records for <code>myhostname.example.org</code>, you can easily move the <code>/.well-known</code> virtualHost section of the code to the host that is serving <literal>example.org</literal>, while the rest stays on <literal>myhostname.example.org</literal> with no other changes required. This pattern also allows to seamlessly move the homeserver from <literal>myhostname.example.org</literal> to <literal>myotherhost.example.org</literal> by only changing the <code>/.well-known</code> redirection target.
   </para>
 
   <para>
-   If you want to run a server with public registration by anybody, you can
-   then enable <option>services.matrix-synapse.enable_registration =
-   true;</option>. Otherwise, or you can generate a registration secret with
-   <command>pwgen -s 64 1</command> and set it with
-   <option>services.matrix-synapse.registration_shared_secret</option>. To
-   create a new user or admin, run the following after you have set the secret
-   and have rebuilt NixOS:
+   If you want to run a server with public registration by anybody, you can then enable <option>services.matrix-synapse.enable_registration = true;</option>. Otherwise, or you can generate a registration secret with <command>pwgen -s 64 1</command> and set it with <option>services.matrix-synapse.registration_shared_secret</option>. To create a new user or admin, run the following after you have set the secret and have rebuilt NixOS:
 <screen>
 <prompt>$ </prompt>nix run nixpkgs.matrix-synapse
 <prompt>$ </prompt>register_new_matrix_user -k <replaceable>your-registration-shared-secret</replaceable> http://localhost:8008
@@ -150,32 +118,14 @@ in {
 <prompt>Make admin [no]:</prompt>
 Success!
 </screen>
-   In the example, this would create a user with the Matrix Identifier
-   <literal>@your-username:example.org</literal>. Note that the registration
-   secret ends up in the nix store and therefore is world-readable by any user
-   on your machine, so it makes sense to only temporarily activate the
-   <option>registration_shared_secret</option> option until a better solution
-   for NixOS is in place.
+   In the example, this would create a user with the Matrix Identifier <literal>@your-username:example.org</literal>. Note that the registration secret ends up in the nix store and therefore is world-readable by any user on your machine, so it makes sense to only temporarily activate the <option>registration_shared_secret</option> option until a better solution for NixOS is in place.
   </para>
  </section>
  <section xml:id="module-services-matrix-riot-web">
   <title>Riot Web Client</title>
 
   <para>
-   <link xlink:href="https://github.com/vector-im/riot-web/">Riot Web</link> is
-   the reference web client for Matrix and developed by the core team at
-   matrix.org. The following snippet can be optionally added to the code before
-   to complete the synapse installation with a web client served at
-   <code>https://riot.myhostname.example.org</code> and
-   <code>https://riot.example.org</code>. Alternatively, you can use the hosted
-   copy at <link xlink:href="https://riot.im/app">https://riot.im/app</link>,
-   or use other web clients or native client applications. Due to the
-   <literal>/.well-known</literal> urls set up done above, many clients should
-   fill in the required connection details automatically when you enter your
-   Matrix Identifier. See
-   <link xlink:href="https://matrix.org/docs/projects/try-matrix-now.html">Try
-   Matrix Now!</link> for a list of existing clients and their supported
-   featureset.
+   <link xlink:href="https://github.com/vector-im/riot-web/">Riot Web</link> is the reference web client for Matrix and developed by the core team at matrix.org. The following snippet can be optionally added to the code before to complete the synapse installation with a web client served at <code>https://riot.myhostname.example.org</code> and <code>https://riot.example.org</code>. Alternatively, you can use the hosted copy at <link xlink:href="https://riot.im/app">https://riot.im/app</link>, or use other web clients or native client applications. Due to the <literal>/.well-known</literal> urls set up done above, many clients should fill in the required connection details automatically when you enter your Matrix Identifier. See <link xlink:href="https://matrix.org/docs/projects/try-matrix-now.html">Try Matrix Now!</link> for a list of existing clients and their supported featureset.
 <programlisting>
 services.nginx.virtualHosts."riot.${fqdn}" = {
   enableACME = true;
@@ -190,14 +140,7 @@ services.nginx.virtualHosts."riot.${fqdn}" = {
   </para>
 
   <para>
-   Note that the Riot developers do not recommend running Riot and your Matrix
-   homeserver on the same fully-qualified domain name for security reasons. In
-   the example, this means that you should not reuse the
-   <literal>myhostname.example.org</literal> virtualHost to also serve Riot,
-   but instead serve it on a different subdomain, like
-   <literal>riot.example.org</literal> in the example. See the
-   <link xlink:href="https://github.com/vector-im/riot-web#important-security-note">Riot
-   Important Security Notes</link> for more information on this subject.
+   Note that the Riot developers do not recommend running Riot and your Matrix homeserver on the same fully-qualified domain name for security reasons. In the example, this means that you should not reuse the <literal>myhostname.example.org</literal> virtualHost to also serve Riot, but instead serve it on a different subdomain, like <literal>riot.example.org</literal> in the example. See the <link xlink:href="https://github.com/vector-im/riot-web#important-security-note">Riot Important Security Notes</link> for more information on this subject.
   </para>
  </section>
 </chapter>
diff --git a/nixos/doc/manual/configuration/modularity.xml b/nixos/doc/manual/configuration/modularity.xml
index 7ad0ae80a48..b485ff1ebf6 100644
--- a/nixos/doc/manual/configuration/modularity.xml
+++ b/nixos/doc/manual/configuration/modularity.xml
@@ -6,18 +6,11 @@
  <title>Modularity</title>
 
  <para>
-  The NixOS configuration mechanism is modular. If your
-  <filename>configuration.nix</filename> becomes too big, you can split it into
-  multiple files. Likewise, if you have multiple NixOS configurations (e.g. for
-  different computers) with some commonality, you can move the common
-  configuration into a shared file.
+  The NixOS configuration mechanism is modular. If your <filename>configuration.nix</filename> becomes too big, you can split it into multiple files. Likewise, if you have multiple NixOS configurations (e.g. for different computers) with some commonality, you can move the common configuration into a shared file.
  </para>
 
  <para>
-  Modules have exactly the same syntax as
-  <filename>configuration.nix</filename>. In fact,
-  <filename>configuration.nix</filename> is itself a module. You can use other
-  modules by including them from <filename>configuration.nix</filename>, e.g.:
+  Modules have exactly the same syntax as <filename>configuration.nix</filename>. In fact, <filename>configuration.nix</filename> is itself a module. You can use other modules by including them from <filename>configuration.nix</filename>, e.g.:
 <programlisting>
 { config, pkgs, ... }:
 
@@ -27,9 +20,7 @@
   <replaceable>...</replaceable>
 }
 </programlisting>
-  Here, we include two modules from the same directory,
-  <filename>vpn.nix</filename> and <filename>kde.nix</filename>. The latter
-  might look like this:
+  Here, we include two modules from the same directory, <filename>vpn.nix</filename> and <filename>kde.nix</filename>. The latter might look like this:
 <programlisting>
 { config, pkgs, ... }:
 
@@ -38,55 +29,32 @@
   <xref linkend="opt-services.xserver.desktopManager.plasma5.enable"/> = true;
 }
 </programlisting>
-  Note that both <filename>configuration.nix</filename> and
-  <filename>kde.nix</filename> define the option
-  <xref linkend="opt-environment.systemPackages"/>. When multiple modules
-  define an option, NixOS will try to <emphasis>merge</emphasis> the
-  definitions. In the case of <xref linkend="opt-environment.systemPackages"/>,
-  that’s easy: the lists of packages can simply be concatenated. The value in
-  <filename>configuration.nix</filename> is merged last, so for list-type
-  options, it will appear at the end of the merged list. If you want it to
-  appear first, you can use <varname>mkBefore</varname>:
+  Note that both <filename>configuration.nix</filename> and <filename>kde.nix</filename> define the option <xref linkend="opt-environment.systemPackages"/>. When multiple modules define an option, NixOS will try to <emphasis>merge</emphasis> the definitions. In the case of <xref linkend="opt-environment.systemPackages"/>, that’s easy: the lists of packages can simply be concatenated. The value in <filename>configuration.nix</filename> is merged last, so for list-type options, it will appear at the end of the merged list. If you want it to appear first, you can use <varname>mkBefore</varname>:
 <programlisting>
 <xref linkend="opt-boot.kernelModules"/> = mkBefore [ "kvm-intel" ];
 </programlisting>
-  This causes the <literal>kvm-intel</literal> kernel module to be loaded
-  before any other kernel modules.
+  This causes the <literal>kvm-intel</literal> kernel module to be loaded before any other kernel modules.
  </para>
 
  <para>
-  For other types of options, a merge may not be possible. For instance, if two
-  modules define <xref linkend="opt-services.httpd.adminAddr"/>,
-  <command>nixos-rebuild</command> will give an error:
+  For other types of options, a merge may not be possible. For instance, if two modules define <xref linkend="opt-services.httpd.adminAddr"/>, <command>nixos-rebuild</command> will give an error:
 <screen>
 The unique option `services.httpd.adminAddr' is defined multiple times, in `/etc/nixos/httpd.nix' and `/etc/nixos/configuration.nix'.
 </screen>
-  When that happens, it’s possible to force one definition take precedence
-  over the others:
+  When that happens, it’s possible to force one definition take precedence over the others:
 <programlisting>
 <xref linkend="opt-services.httpd.adminAddr"/> = pkgs.lib.mkForce "bob@example.org";
 </programlisting>
  </para>
 
  <para>
-  When using multiple modules, you may need to access configuration values
-  defined in other modules. This is what the <varname>config</varname> function
-  argument is for: it contains the complete, merged system configuration. That
-  is, <varname>config</varname> is the result of combining the configurations
-  returned by every module
+  When using multiple modules, you may need to access configuration values defined in other modules. This is what the <varname>config</varname> function argument is for: it contains the complete, merged system configuration. That is, <varname>config</varname> is the result of combining the configurations returned by every module
   <footnote xml:id="footnote-nix-is-lazy">
    <para>
-    If you’re wondering how it’s possible that the (indirect)
-    <emphasis>result</emphasis> of a function is passed as an
-    <emphasis>input</emphasis> to that same function: that’s because Nix is a
-    “lazy” language — it only computes values when they are needed. This
-    works as long as no individual configuration value depends on itself.
+    If you’re wondering how it’s possible that the (indirect) <emphasis>result</emphasis> of a function is passed as an <emphasis>input</emphasis> to that same function: that’s because Nix is a “lazy” language — it only computes values when they are needed. This works as long as no individual configuration value depends on itself.
    </para>
   </footnote>
-  . For example, here is a module that adds some packages to
-  <xref linkend="opt-environment.systemPackages"/> only if
-  <xref linkend="opt-services.xserver.enable"/> is set to
-  <literal>true</literal> somewhere else:
+  . For example, here is a module that adds some packages to <xref linkend="opt-environment.systemPackages"/> only if <xref linkend="opt-services.xserver.enable"/> is set to <literal>true</literal> somewhere else:
 <programlisting>
 { config, pkgs, ... }:
 
@@ -102,9 +70,7 @@ The unique option `services.httpd.adminAddr' is defined multiple times, in `/etc
  </para>
 
  <para>
-  With multiple modules, it may not be obvious what the final value of a
-  configuration option is. The command <option>nixos-option</option> allows you
-  to find out:
+  With multiple modules, it may not be obvious what the final value of a configuration option is. The command <option>nixos-option</option> allows you to find out:
 <screen>
 <prompt>$ </prompt>nixos-option <xref linkend="opt-services.xserver.enable"/>
 true
@@ -112,8 +78,7 @@ true
 <prompt>$ </prompt>nixos-option <xref linkend="opt-boot.kernelModules"/>
 [ "tun" "ipv6" "loop" <replaceable>...</replaceable> ]
 </screen>
-  Interactive exploration of the configuration is possible using <command>nix
-  repl</command>, a read-eval-print loop for Nix expressions. A typical use:
+  Interactive exploration of the configuration is possible using <command>nix repl</command>, a read-eval-print loop for Nix expressions. A typical use:
 <screen>
 <prompt>$ </prompt>nix repl '&lt;nixpkgs/nixos>'
 
@@ -126,9 +91,7 @@ true
  </para>
 
  <para>
-  While abstracting your configuration, you may find it useful to generate
-  modules using code, instead of writing files. The example below would have
-  the same effect as importing a file which sets those options.
+  While abstracting your configuration, you may find it useful to generate modules using code, instead of writing files. The example below would have the same effect as importing a file which sets those options.
 <programlisting>
 { config, pkgs, ... }:
 
diff --git a/nixos/doc/manual/configuration/network-manager.xml b/nixos/doc/manual/configuration/network-manager.xml
index d103ee24978..fb06d60b487 100644
--- a/nixos/doc/manual/configuration/network-manager.xml
+++ b/nixos/doc/manual/configuration/network-manager.xml
@@ -6,39 +6,27 @@
  <title>NetworkManager</title>
 
  <para>
-  To facilitate network configuration, some desktop environments use
-  NetworkManager. You can enable NetworkManager by setting:
+  To facilitate network configuration, some desktop environments use NetworkManager. You can enable NetworkManager by setting:
 <programlisting>
 <xref linkend="opt-networking.networkmanager.enable"/> = true;
 </programlisting>
-  some desktop managers (e.g., GNOME) enable NetworkManager automatically for
-  you.
+  some desktop managers (e.g., GNOME) enable NetworkManager automatically for you.
  </para>
 
  <para>
-  All users that should have permission to change network settings must belong
-  to the <code>networkmanager</code> group:
+  All users that should have permission to change network settings must belong to the <code>networkmanager</code> group:
 <programlisting>
 <link linkend="opt-users.users._name__.extraGroups">users.users.alice.extraGroups</link> = [ "networkmanager" ];
 </programlisting>
  </para>
 
  <para>
-  NetworkManager is controlled using either <command>nmcli</command> or
-  <command>nmtui</command> (curses-based terminal user interface). See their
-  manual pages for details on their usage. Some desktop environments (GNOME,
-  KDE) have their own configuration tools for NetworkManager. On XFCE, there is
-  no configuration tool for NetworkManager by default: by adding
-  <code>networkmanagerapplet</code> to the list of system packages, the
-  graphical applet will be installed and will launch automatically when XFCE is
-  starting (and will show in the status tray).
+  NetworkManager is controlled using either <command>nmcli</command> or <command>nmtui</command> (curses-based terminal user interface). See their manual pages for details on their usage. Some desktop environments (GNOME, KDE) have their own configuration tools for NetworkManager. On XFCE, there is no configuration tool for NetworkManager by default: by adding <code>networkmanagerapplet</code> to the list of system packages, the graphical applet will be installed and will launch automatically when XFCE is starting (and will show in the status tray).
  </para>
 
  <note>
   <para>
-   <code>networking.networkmanager</code> and <code>networking.wireless</code>
-   (WPA Supplicant) cannot be enabled at the same time: you can still connect
-   to the wireless networks using NetworkManager.
+   <code>networking.networkmanager</code> and <code>networking.wireless</code> (WPA Supplicant) cannot be enabled at the same time: you can still connect to the wireless networks using NetworkManager.
   </para>
  </note>
 </section>
diff --git a/nixos/doc/manual/configuration/networking.xml b/nixos/doc/manual/configuration/networking.xml
index 02cf811e0bd..10eeebadb62 100644
--- a/nixos/doc/manual/configuration/networking.xml
+++ b/nixos/doc/manual/configuration/networking.xml
@@ -5,8 +5,7 @@
          xml:id="sec-networking">
  <title>Networking</title>
  <para>
-  This section describes how to configure networking components on your NixOS
-  machine.
+  This section describes how to configure networking components on your NixOS machine.
  </para>
  <xi:include href="network-manager.xml" />
  <xi:include href="ssh.xml" />
diff --git a/nixos/doc/manual/configuration/package-mgmt.xml b/nixos/doc/manual/configuration/package-mgmt.xml
index e8ac5d0681a..6abb83fedcc 100644
--- a/nixos/doc/manual/configuration/package-mgmt.xml
+++ b/nixos/doc/manual/configuration/package-mgmt.xml
@@ -5,23 +5,16 @@
          xml:id="sec-package-management">
  <title>Package Management</title>
  <para>
-  This section describes how to add additional packages to your system. NixOS
-  has two distinct styles of package management:
+  This section describes how to add additional packages to your system. NixOS has two distinct styles of package management:
   <itemizedlist>
    <listitem>
     <para>
-     <emphasis>Declarative</emphasis>, where you declare what packages you want
-     in your <filename>configuration.nix</filename>. Every time you run
-     <command>nixos-rebuild</command>, NixOS will ensure that you get a
-     consistent set of binaries corresponding to your specification.
+     <emphasis>Declarative</emphasis>, where you declare what packages you want in your <filename>configuration.nix</filename>. Every time you run <command>nixos-rebuild</command>, NixOS will ensure that you get a consistent set of binaries corresponding to your specification.
     </para>
    </listitem>
    <listitem>
     <para>
-     <emphasis>Ad hoc</emphasis>, where you install, upgrade and uninstall
-     packages via the <command>nix-env</command> command. This style allows
-     mixing packages from different Nixpkgs versions. It’s the only choice
-     for non-root users.
+     <emphasis>Ad hoc</emphasis>, where you install, upgrade and uninstall packages via the <command>nix-env</command> command. This style allows mixing packages from different Nixpkgs versions. It’s the only choice for non-root users.
     </para>
    </listitem>
   </itemizedlist>
diff --git a/nixos/doc/manual/configuration/profiles.xml b/nixos/doc/manual/configuration/profiles.xml
index 9d08f7f7bed..94a61229398 100644
--- a/nixos/doc/manual/configuration/profiles.xml
+++ b/nixos/doc/manual/configuration/profiles.xml
@@ -5,12 +5,7 @@
          xml:id="ch-profiles">
  <title>Profiles</title>
  <para>
-  In some cases, it may be desirable to take advantage of commonly-used,
-  predefined configurations provided by nixpkgs, but different from those that
-  come as default. This is a role fulfilled by NixOS's Profiles, which come as
-  files living in <filename>&lt;nixpkgs/nixos/modules/profiles&gt;</filename>.
-  That is to say, expected usage is to add them to the imports list of your
-  <filename>/etc/configuration.nix</filename> as such:
+  In some cases, it may be desirable to take advantage of commonly-used, predefined configurations provided by nixpkgs, but different from those that come as default. This is a role fulfilled by NixOS's Profiles, which come as files living in <filename>&lt;nixpkgs/nixos/modules/profiles&gt;</filename>. That is to say, expected usage is to add them to the imports list of your <filename>/etc/configuration.nix</filename> as such:
  </para>
 <programlisting>
   imports = [
@@ -18,12 +13,10 @@
   ];
 </programlisting>
  <para>
-  Even if some of these profiles seem only useful in the context of install
-  media, many are actually intended to be used in real installs.
+  Even if some of these profiles seem only useful in the context of install media, many are actually intended to be used in real installs.
  </para>
  <para>
-  What follows is a brief explanation on the purpose and use-case for each
-  profile. Detailing each option configured by each one is out of scope.
+  What follows is a brief explanation on the purpose and use-case for each profile. Detailing each option configured by each one is out of scope.
  </para>
  <xi:include href="profiles/all-hardware.xml" />
  <xi:include href="profiles/base.xml" />
diff --git a/nixos/doc/manual/configuration/profiles/all-hardware.xml b/nixos/doc/manual/configuration/profiles/all-hardware.xml
index 2936f71069d..41593432d81 100644
--- a/nixos/doc/manual/configuration/profiles/all-hardware.xml
+++ b/nixos/doc/manual/configuration/profiles/all-hardware.xml
@@ -6,16 +6,10 @@
  <title>All Hardware</title>
 
  <para>
-  Enables all hardware supported by NixOS: i.e., all firmware is included, and
-  all devices from which one may boot are enabled in the initrd. Its primary
-  use is in the NixOS installation CDs.
+  Enables all hardware supported by NixOS: i.e., all firmware is included, and all devices from which one may boot are enabled in the initrd. Its primary use is in the NixOS installation CDs.
  </para>
 
  <para>
-  The enabled kernel modules include support for SATA and PATA, SCSI
-  (partially), USB, Firewire (untested), Virtio (QEMU, KVM, etc.), VMware, and
-  Hyper-V. Additionally, <xref linkend="opt-hardware.enableAllFirmware"/> is
-  enabled, and the firmware for the ZyDAS ZD1211 chipset is specifically
-  installed.
+  The enabled kernel modules include support for SATA and PATA, SCSI (partially), USB, Firewire (untested), Virtio (QEMU, KVM, etc.), VMware, and Hyper-V. Additionally, <xref linkend="opt-hardware.enableAllFirmware"/> is enabled, and the firmware for the ZyDAS ZD1211 chipset is specifically installed.
  </para>
 </section>
diff --git a/nixos/doc/manual/configuration/profiles/base.xml b/nixos/doc/manual/configuration/profiles/base.xml
index b75f6ba25b4..31e10ebca55 100644
--- a/nixos/doc/manual/configuration/profiles/base.xml
+++ b/nixos/doc/manual/configuration/profiles/base.xml
@@ -6,10 +6,6 @@
  <title>Base</title>
 
  <para>
-  Defines the software packages included in the "minimal" installation CD. It
-  installs several utilities useful in a simple recovery or install media, such
-  as a text-mode web browser, and tools for manipulating block devices,
-  networking, hardware diagnostics, and filesystems (with their respective
-  kernel modules).
+  Defines the software packages included in the "minimal" installation CD. It installs several utilities useful in a simple recovery or install media, such as a text-mode web browser, and tools for manipulating block devices, networking, hardware diagnostics, and filesystems (with their respective kernel modules).
  </para>
 </section>
diff --git a/nixos/doc/manual/configuration/profiles/clone-config.xml b/nixos/doc/manual/configuration/profiles/clone-config.xml
index 04fa1643d0f..95a4d292c40 100644
--- a/nixos/doc/manual/configuration/profiles/clone-config.xml
+++ b/nixos/doc/manual/configuration/profiles/clone-config.xml
@@ -6,16 +6,10 @@
  <title>Clone Config</title>
 
  <para>
-  This profile is used in installer images. It provides an editable
-  configuration.nix that imports all the modules that were also used when
-  creating the image in the first place. As a result it allows users to edit
-  and rebuild the live-system.
+  This profile is used in installer images. It provides an editable configuration.nix that imports all the modules that were also used when creating the image in the first place. As a result it allows users to edit and rebuild the live-system.
  </para>
 
  <para>
-  On images where the installation media also becomes an installation target,
-  copying over <literal>configuration.nix</literal> should be disabled by
-  setting <literal>installer.cloneConfig</literal> to <literal>false</literal>.
-  For example, this is done in <literal>sd-image-aarch64.nix</literal>.
+  On images where the installation media also becomes an installation target, copying over <literal>configuration.nix</literal> should be disabled by setting <literal>installer.cloneConfig</literal> to <literal>false</literal>. For example, this is done in <literal>sd-image-aarch64.nix</literal>.
  </para>
 </section>
diff --git a/nixos/doc/manual/configuration/profiles/demo.xml b/nixos/doc/manual/configuration/profiles/demo.xml
index 395a5ec357c..9e9694c19ab 100644
--- a/nixos/doc/manual/configuration/profiles/demo.xml
+++ b/nixos/doc/manual/configuration/profiles/demo.xml
@@ -6,10 +6,6 @@
  <title>Demo</title>
 
  <para>
-  This profile just enables a <systemitem class="username">demo</systemitem>
-  user, with password <literal>demo</literal>, uid <literal>1000</literal>,
-  <systemitem class="groupname">wheel</systemitem> group and
-  <link linkend="opt-services.xserver.displayManager.sddm.autoLogin"> autologin
-  in the SDDM display manager</link>.
+  This profile just enables a <systemitem class="username">demo</systemitem> user, with password <literal>demo</literal>, uid <literal>1000</literal>, <systemitem class="groupname">wheel</systemitem> group and <link linkend="opt-services.xserver.displayManager.sddm.autoLogin"> autologin in the SDDM display manager</link>.
  </para>
 </section>
diff --git a/nixos/doc/manual/configuration/profiles/docker-container.xml b/nixos/doc/manual/configuration/profiles/docker-container.xml
index efa7b8f24c4..b57020ebb78 100644
--- a/nixos/doc/manual/configuration/profiles/docker-container.xml
+++ b/nixos/doc/manual/configuration/profiles/docker-container.xml
@@ -6,11 +6,6 @@
  <title>Docker Container</title>
 
  <para>
-  This is the profile from which the Docker images are generated. It prepares a
-  working system by importing the
-  <link linkend="sec-profile-minimal">Minimal</link> and
-  <link linkend="sec-profile-clone-config">Clone Config</link> profiles, and
-  setting appropriate configuration options that are useful inside a container
-  context, like <xref linkend="opt-boot.isContainer"/>.
+  This is the profile from which the Docker images are generated. It prepares a working system by importing the <link linkend="sec-profile-minimal">Minimal</link> and <link linkend="sec-profile-clone-config">Clone Config</link> profiles, and setting appropriate configuration options that are useful inside a container context, like <xref linkend="opt-boot.isContainer"/>.
  </para>
 </section>
diff --git a/nixos/doc/manual/configuration/profiles/graphical.xml b/nixos/doc/manual/configuration/profiles/graphical.xml
index 73e3abc59d0..1dfd9d642e2 100644
--- a/nixos/doc/manual/configuration/profiles/graphical.xml
+++ b/nixos/doc/manual/configuration/profiles/graphical.xml
@@ -6,17 +6,10 @@
  <title>Graphical</title>
 
  <para>
-  Defines a NixOS configuration with the Plasma 5 desktop. It's used by the
-  graphical installation CD.
+  Defines a NixOS configuration with the Plasma 5 desktop. It's used by the graphical installation CD.
  </para>
 
  <para>
-  It sets <xref linkend="opt-services.xserver.enable"/>,
-  <xref linkend="opt-services.xserver.displayManager.sddm.enable"/>,
-  <xref linkend="opt-services.xserver.desktopManager.plasma5.enable"/> (
-  <link linkend="opt-services.xserver.desktopManager.plasma5.enableQt4Support">
-  without Qt4 Support</link>), and
-  <xref linkend="opt-services.xserver.libinput.enable"/> to true. It also
-  includes glxinfo and firefox in the system packages list.
+  It sets <xref linkend="opt-services.xserver.enable"/>, <xref linkend="opt-services.xserver.displayManager.sddm.enable"/>, <xref linkend="opt-services.xserver.desktopManager.plasma5.enable"/> ( <link linkend="opt-services.xserver.desktopManager.plasma5.enableQt4Support"> without Qt4 Support</link>), and <xref linkend="opt-services.xserver.libinput.enable"/> to true. It also includes glxinfo and firefox in the system packages list.
  </para>
 </section>
diff --git a/nixos/doc/manual/configuration/profiles/hardened.xml b/nixos/doc/manual/configuration/profiles/hardened.xml
index dc83fc837e2..2cb23f6d5d0 100644
--- a/nixos/doc/manual/configuration/profiles/hardened.xml
+++ b/nixos/doc/manual/configuration/profiles/hardened.xml
@@ -6,19 +6,11 @@
  <title>Hardened</title>
 
  <para>
-  A profile with most (vanilla) hardening options enabled by default,
-  potentially at the cost of features and performance.
+  A profile with most (vanilla) hardening options enabled by default, potentially at the cost of features and performance.
  </para>
 
  <para>
-  This includes a hardened kernel, and limiting the system information
-  available to processes through the <filename>/sys</filename> and
-  <filename>/proc</filename> filesystems. It also disables the User Namespaces
-  feature of the kernel, which stops Nix from being able to build anything
-  (this particular setting can be overriden via
-  <xref linkend="opt-security.allowUserNamespaces"/>). See the
-  <literal
-   xlink:href="https://github.com/nixos/nixpkgs/tree/master/nixos/modules/profiles/hardened.nix">
-  profile source</literal> for further detail on which settings are altered.
+  This includes a hardened kernel, and limiting the system information available to processes through the <filename>/sys</filename> and <filename>/proc</filename> filesystems. It also disables the User Namespaces feature of the kernel, which stops Nix from being able to build anything (this particular setting can be overriden via <xref linkend="opt-security.allowUserNamespaces"/>). See the <literal
+   xlink:href="https://github.com/nixos/nixpkgs/tree/master/nixos/modules/profiles/hardened.nix"> profile source</literal> for further detail on which settings are altered.
  </para>
 </section>
diff --git a/nixos/doc/manual/configuration/profiles/headless.xml b/nixos/doc/manual/configuration/profiles/headless.xml
index 1b64497ebf7..3fceb6f912b 100644
--- a/nixos/doc/manual/configuration/profiles/headless.xml
+++ b/nixos/doc/manual/configuration/profiles/headless.xml
@@ -10,10 +10,6 @@
  </para>
 
  <para>
-  Disables <link linkend="opt-sound.enable">sound</link>,
-  <link linkend="opt-boot.vesa">vesa</link>, serial consoles,
-  <link linkend="opt-systemd.enableEmergencyMode">emergency mode</link>,
-  <link linkend="opt-boot.loader.grub.splashImage">grub splash images</link>
-  and configures the kernel to reboot automatically on panic.
+  Disables <link linkend="opt-sound.enable">sound</link>, <link linkend="opt-boot.vesa">vesa</link>, serial consoles, <link linkend="opt-systemd.enableEmergencyMode">emergency mode</link>, <link linkend="opt-boot.loader.grub.splashImage">grub splash images</link> and configures the kernel to reboot automatically on panic.
  </para>
 </section>
diff --git a/nixos/doc/manual/configuration/profiles/installation-device.xml b/nixos/doc/manual/configuration/profiles/installation-device.xml
index 192ae955b68..af9f551fa98 100644
--- a/nixos/doc/manual/configuration/profiles/installation-device.xml
+++ b/nixos/doc/manual/configuration/profiles/installation-device.xml
@@ -6,31 +6,18 @@
  <title>Installation Device</title>
 
  <para>
-  Provides a basic configuration for installation devices like CDs.
-  This enables redistributable firmware, includes the
-  <link linkend="sec-profile-clone-config">Clone Config profile</link>
-  and a copy of the Nixpkgs channel, so <command>nixos-install</command>
-  works out of the box.
+  Provides a basic configuration for installation devices like CDs. This enables redistributable firmware, includes the <link linkend="sec-profile-clone-config">Clone Config profile</link> and a copy of the Nixpkgs channel, so <command>nixos-install</command> works out of the box.
  </para>
+
  <para>
-  Documentation for <link linkend="opt-documentation.enable">Nixpkgs</link>
-  and <link linkend="opt-documentation.nixos.enable">NixOS</link> are
-  forcefully enabled (to override the
-  <link linkend="sec-profile-minimal">Minimal profile</link> preference); the
-  NixOS manual is shown automatically on TTY 8, udisks is disabled.
-  Autologin is enabled as <literal>nixos</literal> user, while passwordless
-  login as both <literal>root</literal> and <literal>nixos</literal> is possible.
-  Passwordless <command>sudo</command> is enabled too.
-  <link linkend="opt-networking.wireless.enable">wpa_supplicant</link> is
-  enabled, but configured to not autostart.
+  Documentation for <link linkend="opt-documentation.enable">Nixpkgs</link> and <link linkend="opt-documentation.nixos.enable">NixOS</link> are forcefully enabled (to override the <link linkend="sec-profile-minimal">Minimal profile</link> preference); the NixOS manual is shown automatically on TTY 8, udisks is disabled. Autologin is enabled as <literal>nixos</literal> user, while passwordless login as both <literal>root</literal> and <literal>nixos</literal> is possible. Passwordless <command>sudo</command> is enabled too. <link linkend="opt-networking.wireless.enable">wpa_supplicant</link> is enabled, but configured to not autostart.
  </para>
+
  <para>
-  It is explained how to login, start the ssh server, and if available,
-  how to start the display manager.
+  It is explained how to login, start the ssh server, and if available, how to start the display manager.
  </para>
 
  <para>
-  Several settings are tweaked so that the installer has a better chance of
-  succeeding under low-memory environments.
+  Several settings are tweaked so that the installer has a better chance of succeeding under low-memory environments.
  </para>
 </section>
diff --git a/nixos/doc/manual/configuration/profiles/minimal.xml b/nixos/doc/manual/configuration/profiles/minimal.xml
index 179f2d0be64..82aa15c174a 100644
--- a/nixos/doc/manual/configuration/profiles/minimal.xml
+++ b/nixos/doc/manual/configuration/profiles/minimal.xml
@@ -6,12 +6,6 @@
  <title>Minimal</title>
 
  <para>
-  This profile defines a small NixOS configuration. It does not contain any
-  graphical stuff. It's a very short file that enables
-  <link linkend="opt-environment.noXlibs">noXlibs</link>, sets
-  <link linkend="opt-i18n.supportedLocales">i18n.supportedLocales</link> to
-  only support the user-selected locale,
-  <link linkend="opt-documentation.enable">disables packages' documentation
-  </link>, and <link linkend="opt-sound.enable">disables sound</link>.
+  This profile defines a small NixOS configuration. It does not contain any graphical stuff. It's a very short file that enables <link linkend="opt-environment.noXlibs">noXlibs</link>, sets <link linkend="opt-i18n.supportedLocales">i18n.supportedLocales</link> to only support the user-selected locale, <link linkend="opt-documentation.enable">disables packages' documentation </link>, and <link linkend="opt-sound.enable">disables sound</link>.
  </para>
 </section>
diff --git a/nixos/doc/manual/configuration/profiles/qemu-guest.xml b/nixos/doc/manual/configuration/profiles/qemu-guest.xml
index 5d055c45d2d..265f2746f3c 100644
--- a/nixos/doc/manual/configuration/profiles/qemu-guest.xml
+++ b/nixos/doc/manual/configuration/profiles/qemu-guest.xml
@@ -6,13 +6,10 @@
  <title>QEMU Guest</title>
 
  <para>
-  This profile contains common configuration for virtual machines running under
-  QEMU (using virtio).
+  This profile contains common configuration for virtual machines running under QEMU (using virtio).
  </para>
 
  <para>
-  It makes virtio modules available on the initrd, sets the system time from
-  the hardware clock to work around a bug in qemu-kvm, and
-  <link linkend="opt-security.rngd.enable">enables rngd</link>.
+  It makes virtio modules available on the initrd, sets the system time from the hardware clock to work around a bug in qemu-kvm, and <link linkend="opt-security.rngd.enable">enables rngd</link>.
  </para>
 </section>
diff --git a/nixos/doc/manual/configuration/ssh.xml b/nixos/doc/manual/configuration/ssh.xml
index a4af1b96583..9e5c0c1dbdb 100644
--- a/nixos/doc/manual/configuration/ssh.xml
+++ b/nixos/doc/manual/configuration/ssh.xml
@@ -10,14 +10,11 @@
 <programlisting>
 <xref linkend="opt-services.openssh.enable"/> = true;
 </programlisting>
-  By default, root logins using a password are disallowed. They can be disabled
-  entirely by setting <xref linkend="opt-services.openssh.permitRootLogin"/> to
-  <literal>"no"</literal>.
+  By default, root logins using a password are disallowed. They can be disabled entirely by setting <xref linkend="opt-services.openssh.permitRootLogin"/> to <literal>"no"</literal>.
  </para>
 
  <para>
-  You can declaratively specify authorised RSA/DSA public keys for a user as
-  follows:
+  You can declaratively specify authorised RSA/DSA public keys for a user as follows:
 <!-- FIXME: this might not work if the user is unmanaged. -->
 <programlisting>
 <link linkend="opt-users.users._name__.openssh.authorizedKeys.keys">users.users.alice.openssh.authorizedKeys.keys</link> =
diff --git a/nixos/doc/manual/configuration/summary.xml b/nixos/doc/manual/configuration/summary.xml
index ea980254a8f..c9c8b67b0cf 100644
--- a/nixos/doc/manual/configuration/summary.xml
+++ b/nixos/doc/manual/configuration/summary.xml
@@ -6,12 +6,8 @@
  <title>Syntax Summary</title>
 
  <para>
-  Below is a summary of the most important syntactic constructs in the Nix
-  expression language. It’s not complete. In particular, there are many other
-  built-in functions. See the
-  <link
-xlink:href="http://nixos.org/nix/manual/#chap-writing-nix-expressions">Nix
-  manual</link> for the rest.
+  Below is a summary of the most important syntactic constructs in the Nix expression language. It’s not complete. In particular, there are many other built-in functions. See the <link
+xlink:href="http://nixos.org/nix/manual/#chap-writing-nix-expressions">Nix manual</link> for the rest.
  </para>
 
  <informaltable frame='none'>
diff --git a/nixos/doc/manual/configuration/user-mgmt.xml b/nixos/doc/manual/configuration/user-mgmt.xml
index 4b1710f3a2b..db8323ec4d4 100644
--- a/nixos/doc/manual/configuration/user-mgmt.xml
+++ b/nixos/doc/manual/configuration/user-mgmt.xml
@@ -5,10 +5,7 @@
          xml:id="sec-user-management">
  <title>User Management</title>
  <para>
-  NixOS supports both declarative and imperative styles of user management. In
-  the declarative style, users are specified in
-  <filename>configuration.nix</filename>. For instance, the following states
-  that a user account named <literal>alice</literal> shall exist:
+  NixOS supports both declarative and imperative styles of user management. In the declarative style, users are specified in <filename>configuration.nix</filename>. For instance, the following states that a user account named <literal>alice</literal> shall exist:
 <programlisting>
 <xref linkend="opt-users.users"/>.alice = {
   <link linkend="opt-users.users._name__.isNormalUser">isNormalUser</link> = true;
@@ -18,60 +15,33 @@
   <link linkend="opt-users.users._name__.openssh.authorizedKeys.keys">openssh.authorizedKeys.keys</link> = [ "ssh-dss AAAAB3Nza... alice@foobar" ];
 };
 </programlisting>
-  Note that <literal>alice</literal> is a member of the
-  <literal>wheel</literal> and <literal>networkmanager</literal> groups, which
-  allows her to use <command>sudo</command> to execute commands as
-  <literal>root</literal> and to configure the network, respectively. Also note
-  the SSH public key that allows remote logins with the corresponding private
-  key. Users created in this way do not have a password by default, so they
-  cannot log in via mechanisms that require a password. However, you can use
-  the <command>passwd</command> program to set a password, which is retained
-  across invocations of <command>nixos-rebuild</command>.
+  Note that <literal>alice</literal> is a member of the <literal>wheel</literal> and <literal>networkmanager</literal> groups, which allows her to use <command>sudo</command> to execute commands as <literal>root</literal> and to configure the network, respectively. Also note the SSH public key that allows remote logins with the corresponding private key. Users created in this way do not have a password by default, so they cannot log in via mechanisms that require a password. However, you can use the <command>passwd</command> program to set a password, which is retained across invocations of <command>nixos-rebuild</command>.
  </para>
  <para>
-  If you set <xref linkend="opt-users.mutableUsers"/> to false, then the
-  contents of <literal>/etc/passwd</literal> and <literal>/etc/group</literal>
-  will be congruent to your NixOS configuration. For instance, if you remove a
-  user from <xref linkend="opt-users.users"/> and run nixos-rebuild, the user
-  account will cease to exist. Also, imperative commands for managing users and
-  groups, such as useradd, are no longer available. Passwords may still be
-  assigned by setting the user's
-  <link linkend="opt-users.users._name__.hashedPassword">hashedPassword</link>
-  option. A hashed password can be generated using <command>mkpasswd -m
-  sha-512</command> after installing the <literal>mkpasswd</literal> package.
+  If you set <xref linkend="opt-users.mutableUsers"/> to false, then the contents of <literal>/etc/passwd</literal> and <literal>/etc/group</literal> will be congruent to your NixOS configuration. For instance, if you remove a user from <xref linkend="opt-users.users"/> and run nixos-rebuild, the user account will cease to exist. Also, imperative commands for managing users and groups, such as useradd, are no longer available. Passwords may still be assigned by setting the user's <link linkend="opt-users.users._name__.hashedPassword">hashedPassword</link> option. A hashed password can be generated using <command>mkpasswd -m sha-512</command> after installing the <literal>mkpasswd</literal> package.
  </para>
  <para>
-  A user ID (uid) is assigned automatically. You can also specify a uid
-  manually by adding
+  A user ID (uid) is assigned automatically. You can also specify a uid manually by adding
 <programlisting>
 uid = 1000;
 </programlisting>
   to the user specification.
  </para>
  <para>
-  Groups can be specified similarly. The following states that a group named
-  <literal>students</literal> shall exist:
+  Groups can be specified similarly. The following states that a group named <literal>students</literal> shall exist:
 <programlisting>
 <xref linkend="opt-users.groups"/>.students.gid = 1000;
 </programlisting>
-  As with users, the group ID (gid) is optional and will be assigned
-  automatically if it’s missing.
+  As with users, the group ID (gid) is optional and will be assigned automatically if it’s missing.
  </para>
  <para>
-  In the imperative style, users and groups are managed by commands such as
-  <command>useradd</command>, <command>groupmod</command> and so on. For
-  instance, to create a user account named <literal>alice</literal>:
+  In the imperative style, users and groups are managed by commands such as <command>useradd</command>, <command>groupmod</command> and so on. For instance, to create a user account named <literal>alice</literal>:
 <screen>
 # useradd -m alice</screen>
-  To make all nix tools available to this new user use `su - USER` which opens
-  a login shell (==shell that loads the profile) for given user. This will
-  create the ~/.nix-defexpr symlink. So run:
+  To make all nix tools available to this new user use `su - USER` which opens a login shell (==shell that loads the profile) for given user. This will create the ~/.nix-defexpr symlink. So run:
 <screen>
 # su - alice -c "true"</screen>
-  The flag <option>-m</option> causes the creation of a home directory for the
-  new user, which is generally what you want. The user does not have an initial
-  password and therefore cannot log in. A password can be set using the
-  <command>passwd</command> utility:
+  The flag <option>-m</option> causes the creation of a home directory for the new user, which is generally what you want. The user does not have an initial password and therefore cannot log in. A password can be set using the <command>passwd</command> utility:
 <screen>
 # passwd alice
 Enter new UNIX password: ***
@@ -80,9 +50,6 @@ Retype new UNIX password: ***
   A user can be deleted using <command>userdel</command>:
 <screen>
 # userdel -r alice</screen>
-  The flag <option>-r</option> deletes the user’s home directory. Accounts
-  can be modified using <command>usermod</command>. Unix groups can be managed
-  using <command>groupadd</command>, <command>groupmod</command> and
-  <command>groupdel</command>.
+  The flag <option>-r</option> deletes the user’s home directory. Accounts can be modified using <command>usermod</command>. Unix groups can be managed using <command>groupadd</command>, <command>groupmod</command> and <command>groupdel</command>.
  </para>
 </chapter>
diff --git a/nixos/doc/manual/configuration/wireless.xml b/nixos/doc/manual/configuration/wireless.xml
index 9c0e3a8d7aa..5c203423997 100644
--- a/nixos/doc/manual/configuration/wireless.xml
+++ b/nixos/doc/manual/configuration/wireless.xml
@@ -6,9 +6,7 @@
  <title>Wireless Networks</title>
 
  <para>
-  For a desktop installation using NetworkManager (e.g., GNOME), you just have
-  to make sure the user is in the <code>networkmanager</code> group and you can
-  skip the rest of this section on wireless networks.
+  For a desktop installation using NetworkManager (e.g., GNOME), you just have to make sure the user is in the <code>networkmanager</code> group and you can skip the rest of this section on wireless networks.
  </para>
 
  <para>
@@ -25,17 +23,13 @@
   "free.wifi" = {};
 };
 </programlisting>
-  Be aware that keys will be written to the nix store in plaintext! When no
-  networks are set, it will default to using a configuration file at
-  <literal>/etc/wpa_supplicant.conf</literal>. You should edit this file
-  yourself to define wireless networks, WPA keys and so on (see <citerefentry>
+  Be aware that keys will be written to the nix store in plaintext! When no networks are set, it will default to using a configuration file at <literal>/etc/wpa_supplicant.conf</literal>. You should edit this file yourself to define wireless networks, WPA keys and so on (see <citerefentry>
   <refentrytitle>wpa_supplicant.conf</refentrytitle>
   <manvolnum>5</manvolnum> </citerefentry>).
  </para>
 
  <para>
-  If you are using WPA2 you can generate pskRaw key using
-  <command>wpa_passphrase</command>:
+  If you are using WPA2 you can generate pskRaw key using <command>wpa_passphrase</command>:
 <screen>
 <prompt>$ </prompt>wpa_passphrase ESSID PSK
 network={
@@ -51,12 +45,10 @@ network={
   };
 }
 </programlisting>
-  or you can use it to directly generate the
-  <literal>wpa_supplicant.conf</literal>:
+  or you can use it to directly generate the <literal>wpa_supplicant.conf</literal>:
 <screen>
 <prompt># </prompt>wpa_passphrase ESSID PSK > /etc/wpa_supplicant.conf</screen>
-  After you have edited the <literal>wpa_supplicant.conf</literal>, you need to
-  restart the wpa_supplicant service.
+  After you have edited the <literal>wpa_supplicant.conf</literal>, you need to restart the wpa_supplicant service.
 <screen>
 <prompt># </prompt>systemctl restart wpa_supplicant.service</screen>
  </para>
diff --git a/nixos/doc/manual/configuration/x-windows.xml b/nixos/doc/manual/configuration/x-windows.xml
index f6f659b02af..2d65ba479aa 100644
--- a/nixos/doc/manual/configuration/x-windows.xml
+++ b/nixos/doc/manual/configuration/x-windows.xml
@@ -5,23 +5,18 @@
          xml:id="sec-x11">
  <title>X Window System</title>
  <para>
-  The X Window System (X11) provides the basis of NixOS’ graphical user
-  interface. It can be enabled as follows:
+  The X Window System (X11) provides the basis of NixOS’ graphical user interface. It can be enabled as follows:
 <programlisting>
 <xref linkend="opt-services.xserver.enable"/> = true;
 </programlisting>
-  The X server will automatically detect and use the appropriate video driver
-  from a set of X.org drivers (such as <literal>vesa</literal> and
-  <literal>intel</literal>). You can also specify a driver manually, e.g.
+  The X server will automatically detect and use the appropriate video driver from a set of X.org drivers (such as <literal>vesa</literal> and <literal>intel</literal>). You can also specify a driver manually, e.g.
 <programlisting>
 <xref linkend="opt-services.xserver.videoDrivers"/> = [ "r128" ];
 </programlisting>
   to enable X.org’s <literal>xf86-video-r128</literal> driver.
  </para>
  <para>
-  You also need to enable at least one desktop or window manager. Otherwise,
-  you can only log into a plain undecorated <command>xterm</command> window.
-  Thus you should pick one or more of the following lines:
+  You also need to enable at least one desktop or window manager. Otherwise, you can only log into a plain undecorated <command>xterm</command> window. Thus you should pick one or more of the following lines:
 <programlisting>
 <xref linkend="opt-services.xserver.desktopManager.plasma5.enable"/> = true;
 <xref linkend="opt-services.xserver.desktopManager.xfce.enable"/> = true;
@@ -34,9 +29,7 @@
 </programlisting>
  </para>
  <para>
-  NixOS’s default <emphasis>display manager</emphasis> (the program that
-  provides a graphical login prompt and manages the X server) is LightDM. You
-  can select an alternative one by picking one of the following lines:
+  NixOS’s default <emphasis>display manager</emphasis> (the program that provides a graphical login prompt and manages the X server) is LightDM. You can select an alternative one by picking one of the following lines:
 <programlisting>
 <xref linkend="opt-services.xserver.displayManager.sddm.enable"/> = true;
 <xref linkend="opt-services.xserver.displayManager.slim.enable"/> = true;
@@ -50,8 +43,7 @@
 </programlisting>
  </para>
  <para>
-  The X server is started automatically at boot time. If you don’t want this
-  to happen, you can set:
+  The X server is started automatically at boot time. If you don’t want this to happen, you can set:
 <programlisting>
 <xref linkend="opt-services.xserver.autorun"/> = false;
 </programlisting>
@@ -61,8 +53,7 @@
 </screen>
  </para>
  <para>
-  On 64-bit systems, if you want OpenGL for 32-bit programs such as in Wine,
-  you should also set the following:
+  On 64-bit systems, if you want OpenGL for 32-bit programs such as in Wine, you should also set the following:
 <programlisting>
 <xref linkend="opt-hardware.opengl.driSupport32Bit"/> = true;
 </programlisting>
@@ -70,23 +61,18 @@
  <simplesect xml:id="sec-x11-auto-login">
   <title>Auto-login</title>
   <para>
-  The x11 login screen can be skipped entirely, automatically logging you into
-  your window manager and desktop environment when you boot your computer.
+   The x11 login screen can be skipped entirely, automatically logging you into your window manager and desktop environment when you boot your computer.
   </para>
   <para>
-  This is especially helpful if you have disk encryption enabled. Since you
-  already have to provide a password to decrypt your disk, entering a second
-  password to login can be redundant.
+   This is especially helpful if you have disk encryption enabled. Since you already have to provide a password to decrypt your disk, entering a second password to login can be redundant.
   </para>
   <para>
-  To enable auto-login, you need to define your default window manager and
-  desktop environment. If you wanted no desktop environment and i3 as your your
-  window manager, you'd define:
+   To enable auto-login, you need to define your default window manager and desktop environment. If you wanted no desktop environment and i3 as your your window manager, you'd define:
 <programlisting>
 <xref linkend="opt-services.xserver.desktopManager.default"/> = "none";
 <xref linkend="opt-services.xserver.windowManager.default"/> = "i3";
 </programlisting>
-  And, finally, to enable auto-login for a user <literal>johndoe</literal>:
+   And, finally, to enable auto-login for a user <literal>johndoe</literal>:
 <programlisting>
 <xref linkend="opt-services.xserver.displayManager.auto.enable"/> = true;
 <xref linkend="opt-services.xserver.displayManager.auto.user"/> = "johndoe";
@@ -96,9 +82,7 @@
  <simplesect xml:id="sec-x11-graphics-cards-nvidia">
   <title>Proprietary NVIDIA drivers</title>
   <para>
-   NVIDIA provides a proprietary driver for its graphics cards that has better
-   3D performance than the X.org drivers. It is not enabled by default because
-   it’s not free software. You can enable it as follows:
+   NVIDIA provides a proprietary driver for its graphics cards that has better 3D performance than the X.org drivers. It is not enabled by default because it’s not free software. You can enable it as follows:
 <programlisting>
 <xref linkend="opt-services.xserver.videoDrivers"/> = [ "nvidia" ];
 </programlisting>
@@ -109,76 +93,51 @@
 <xref linkend="opt-services.xserver.videoDrivers"/> = [ "nvidiaLegacy304" ];
 <xref linkend="opt-services.xserver.videoDrivers"/> = [ "nvidiaLegacy173" ];
 </programlisting>
-   You may need to reboot after enabling this driver to prevent a clash with
-   other kernel modules.
+   You may need to reboot after enabling this driver to prevent a clash with other kernel modules.
   </para>
  </simplesect>
  <simplesect xml:id="sec-x11--graphics-cards-amd">
   <title>Proprietary AMD drivers</title>
   <para>
-   AMD provides a proprietary driver for its graphics cards that has better 3D
-   performance than the X.org drivers. It is not enabled by default because
-   it’s not free software. You can enable it as follows:
+   AMD provides a proprietary driver for its graphics cards that has better 3D performance than the X.org drivers. It is not enabled by default because it’s not free software. You can enable it as follows:
 <programlisting>
 <xref linkend="opt-services.xserver.videoDrivers"/> = [ "ati_unfree" ];
 </programlisting>
-   You will need to reboot after enabling this driver to prevent a clash with
-   other kernel modules.
+   You will need to reboot after enabling this driver to prevent a clash with other kernel modules.
   </para>
   <note>
-  <para>
-   For recent AMD GPUs you most likely want to keep either the defaults
-   or <literal>"amdgpu"</literal> (both free).
-  </para>
+   <para>
+    For recent AMD GPUs you most likely want to keep either the defaults or <literal>"amdgpu"</literal> (both free).
+   </para>
   </note>
  </simplesect>
  <simplesect xml:id="sec-x11-touchpads">
   <title>Touchpads</title>
   <para>
-   Support for Synaptics touchpads (found in many laptops such as the Dell
-   Latitude series) can be enabled as follows:
+   Support for Synaptics touchpads (found in many laptops such as the Dell Latitude series) can be enabled as follows:
 <programlisting>
 <xref linkend="opt-services.xserver.libinput.enable"/> = true;
 </programlisting>
-   The driver has many options (see <xref linkend="ch-options"/>). For
-   instance, the following disables tap-to-click behavior:
+   The driver has many options (see <xref linkend="ch-options"/>). For instance, the following disables tap-to-click behavior:
 <programlisting>
 <xref linkend="opt-services.xserver.libinput.tapping"/> = false;
 </programlisting>
-   Note: the use of <literal>services.xserver.synaptics</literal> is deprecated
-   since NixOS 17.09.
+   Note: the use of <literal>services.xserver.synaptics</literal> is deprecated since NixOS 17.09.
   </para>
  </simplesect>
  <simplesect xml:id="sec-x11-gtk-and-qt-themes">
   <title>GTK/Qt themes</title>
   <para>
-   GTK themes can be installed either to user profile or system-wide (via
-   <literal>environment.systemPackages</literal>). To make Qt 5 applications
-   look similar to GTK2 ones, you can install <literal>qt5.qtbase.gtk</literal>
-   package into your system environment. It should work for all Qt 5 library
-   versions.
+   GTK themes can be installed either to user profile or system-wide (via <literal>environment.systemPackages</literal>). To make Qt 5 applications look similar to GTK2 ones, you can install <literal>qt5.qtbase.gtk</literal> package into your system environment. It should work for all Qt 5 library versions.
   </para>
  </simplesect>
  <simplesect xml:id="custom-xkb-layouts">
   <title>Custom XKB layouts</title>
   <para>
-   It is possible to install custom
-   <link xlink:href="https://en.wikipedia.org/wiki/X_keyboard_extension">
-    XKB
-   </link>
-   keyboard layouts using the option
-   <option>
-    <link linkend="opt-services.xserver.extraLayouts">
-     services.xserver.extraLayouts
-    </link>
-   </option>.
-   As a first example, we are going to create a layout based on the basic US
-   layout, with an additional layer to type some greek symbols by pressing the
-   right-alt key.
+   It is possible to install custom <link xlink:href="https://en.wikipedia.org/wiki/X_keyboard_extension"> XKB </link> keyboard layouts using the option <option> <link linkend="opt-services.xserver.extraLayouts"> services.xserver.extraLayouts </link> </option>. As a first example, we are going to create a layout based on the basic US layout, with an additional layer to type some greek symbols by pressing the right-alt key.
   </para>
   <para>
-   To do this we are going to create a <literal>us-greek</literal> file
-   with a <literal>xkb_symbols</literal> section.
+   To do this we are going to create a <literal>us-greek</literal> file with a <literal>xkb_symbols</literal> section.
   </para>
 <programlisting>
 xkb_symbols &quot;us-greek&quot;
@@ -194,8 +153,7 @@ xkb_symbols &quot;us-greek&quot;
 };
 </programlisting>
   <para>
-   To install the layout, the filepath, a description and the list of
-   languages must be given:
+   To install the layout, the filepath, a description and the list of languages must be given:
   </para>
 <programlisting>
 <xref linkend="opt-services.xserver.extraLayouts"/>.us-greek = {
@@ -205,32 +163,18 @@ xkb_symbols &quot;us-greek&quot;
 }
 </programlisting>
   <note>
-  <para>
-   The name should match the one given to the
-   <literal>xkb_symbols</literal> block.
-  </para>
+   <para>
+    The name should match the one given to the <literal>xkb_symbols</literal> block.
+   </para>
   </note>
   <para>
-   The layout should now be installed and ready to use: try it by
-   running <literal>setxkbmap us-greek</literal> and type
-   <literal>&lt;alt&gt;+a</literal>. To change the default the usual
-   <option>
-    <link linkend="opt-services.xserver.layout">
-     services.xserver.layout
-    </link>
-   </option>
-   option can still be used.
+   The layout should now be installed and ready to use: try it by running <literal>setxkbmap us-greek</literal> and type <literal>&lt;alt&gt;+a</literal>. To change the default the usual <option> <link linkend="opt-services.xserver.layout"> services.xserver.layout </link> </option> option can still be used.
   </para>
   <para>
-   A layout can have several other components besides
-   <literal>xkb_symbols</literal>, for example we will define new
-   keycodes for some multimedia key and bind these to some symbol.
+   A layout can have several other components besides <literal>xkb_symbols</literal>, for example we will define new keycodes for some multimedia key and bind these to some symbol.
   </para>
   <para>
-   Use the <emphasis>xev</emphasis> utility from
-   <literal>pkgs.xorg.xev</literal> to find the codes of the keys of
-   interest, then create a <literal>media-key</literal> file to hold
-   the keycodes definitions
+   Use the <emphasis>xev</emphasis> utility from <literal>pkgs.xorg.xev</literal> to find the codes of the keys of interest, then create a <literal>media-key</literal> file to hold the keycodes definitions
   </para>
 <programlisting>
 xkb_keycodes &quot;media&quot;
@@ -240,7 +184,7 @@ xkb_keycodes &quot;media&quot;
 }
 </programlisting>
   <para>
-    Now use the newly define keycodes in <literal>media-sym</literal>:
+   Now use the newly define keycodes in <literal>media-sym</literal>:
   </para>
 <programlisting>
 xkb_symbols &quot;media&quot;
@@ -251,7 +195,7 @@ xkb_symbols &quot;media&quot;
 }
 </programlisting>
   <para>
-    As before, to install the layout do
+   As before, to install the layout do
   </para>
 <programlisting>
 <xref linkend="opt-services.xserver.extraLayouts"/>.media = {
@@ -262,37 +206,22 @@ xkb_symbols &quot;media&quot;
 };
 </programlisting>
   <note>
-  <para>
-   The function <literal>pkgs.writeText &lt;filename&gt; &lt;content&gt;
-   </literal> can be useful if you prefer to keep the layout definitions
-   inside the NixOS configuration.
-  </para>
+   <para>
+    The function <literal>pkgs.writeText &lt;filename&gt; &lt;content&gt; </literal> can be useful if you prefer to keep the layout definitions inside the NixOS configuration.
+   </para>
   </note>
   <para>
-    Unfortunately, the Xorg server does not (currently) support setting a
-    keymap directly but relies instead on XKB rules to select the matching
-    components (keycodes, types, ...) of a layout. This means that components
-    other than symbols won't be loaded by default. As a workaround, you
-    can set the keymap using <literal>setxkbmap</literal> at the start of the
-    session with:
+   Unfortunately, the Xorg server does not (currently) support setting a keymap directly but relies instead on XKB rules to select the matching components (keycodes, types, ...) of a layout. This means that components other than symbols won't be loaded by default. As a workaround, you can set the keymap using <literal>setxkbmap</literal> at the start of the session with:
   </para>
 <programlisting>
 <xref linkend="opt-services.xserver.displayManager.sessionCommands"/> = "setxkbmap -keycodes media";
 </programlisting>
   <para>
-    If you are manually starting the X server, you should set the argument
-    <literal>-xkbdir /etc/X11/xkb</literal>, otherwise X won't find your layout files.
-    For example with <command>xinit</command> run
-    <screen><prompt>$ </prompt>xinit -- -xkbdir /etc/X11/xkb</screen>
+   If you are manually starting the X server, you should set the argument <literal>-xkbdir /etc/X11/xkb</literal>, otherwise X won't find your layout files. For example with <command>xinit</command> run
+<screen><prompt>$ </prompt>xinit -- -xkbdir /etc/X11/xkb</screen>
   </para>
   <para>
-   To learn how to write layouts take a look at the XKB
-  <link xlink:href="https://www.x.org/releases/current/doc/xorg-docs/input/XKB-Enhancing.html#Defining_New_Layouts">
-   documentation
-  </link>. More example layouts can also be found
-  <link xlink:href="https://wiki.archlinux.org/index.php/X_KeyBoard_extension#Basic_examples">
-   here
-  </link>.
+   To learn how to write layouts take a look at the XKB <link xlink:href="https://www.x.org/releases/current/doc/xorg-docs/input/XKB-Enhancing.html#Defining_New_Layouts"> documentation </link>. More example layouts can also be found <link xlink:href="https://wiki.archlinux.org/index.php/X_KeyBoard_extension#Basic_examples"> here </link>.
   </para>
-</simplesect>
+ </simplesect>
 </chapter>
diff --git a/nixos/doc/manual/configuration/xfce.xml b/nixos/doc/manual/configuration/xfce.xml
index 6ac99c6b2be..7a93a452fd9 100644
--- a/nixos/doc/manual/configuration/xfce.xml
+++ b/nixos/doc/manual/configuration/xfce.xml
@@ -14,8 +14,7 @@
 </programlisting>
  </para>
  <para>
-  Optionally, <emphasis>compton</emphasis> can be enabled for nice graphical
-  effects, some example settings:
+  Optionally, <emphasis>compton</emphasis> can be enabled for nice graphical effects, some example settings:
 <programlisting>
 <link linkend="opt-services.compton.enable">services.compton</link> = {
   <link linkend="opt-services.compton.enable">enable</link>          = true;
@@ -27,9 +26,7 @@
 </programlisting>
  </para>
  <para>
-  Some Xfce programs are not installed automatically. To install them manually
-  (system wide), put them into your
-  <xref linkend="opt-environment.systemPackages"/>.
+  Some Xfce programs are not installed automatically. To install them manually (system wide), put them into your <xref linkend="opt-environment.systemPackages"/>.
  </para>
  <simplesect xml:id="sec-xfce-thunar-volumes">
   <title>Thunar Volume Support</title>
@@ -44,25 +41,17 @@
  <simplesect xml:id="sec-xfce-polkit">
   <title>Polkit Authentication Agent</title>
   <para>
-   There is no authentication agent automatically installed alongside Xfce. To
-   allow mounting of local (non-removable) filesystems, you will need to
-   install one. Installing <emphasis>polkit_gnome</emphasis>, a rebuild, logout
-   and login did the trick.
+   There is no authentication agent automatically installed alongside Xfce. To allow mounting of local (non-removable) filesystems, you will need to install one. Installing <emphasis>polkit_gnome</emphasis>, a rebuild, logout and login did the trick.
   </para>
  </simplesect>
  <simplesect xml:id="sec-xfce-troubleshooting">
   <title>Troubleshooting</title>
   <para>
-   Even after enabling udisks2, volume management might not work. Thunar and/or
-   the desktop takes time to show up. Thunar will spit out this kind of message
-   on start (look at <command>journalctl --user -b</command>).
+   Even after enabling udisks2, volume management might not work. Thunar and/or the desktop takes time to show up. Thunar will spit out this kind of message on start (look at <command>journalctl --user -b</command>).
 <programlisting>
 Thunar:2410): GVFS-RemoteVolumeMonitor-WARNING **: remote volume monitor with dbus name org.gtk.Private.UDisks2VolumeMonitor is not supported
 </programlisting>
-   This is caused by some needed GNOME services not running. This is all fixed
-   by enabling "Launch GNOME services on startup" in the Advanced tab of the
-   Session and Startup settings panel. Alternatively, you can run this command
-   to do the same thing.
+   This is caused by some needed GNOME services not running. This is all fixed by enabling "Launch GNOME services on startup" in the Advanced tab of the Session and Startup settings panel. Alternatively, you can run this command to do the same thing.
 <programlisting>
 <prompt>$ </prompt>xfconf-query -c xfce4-session -p /compat/LaunchGNOME -s true
 </programlisting>
diff --git a/nixos/doc/manual/development/assertions.xml b/nixos/doc/manual/development/assertions.xml
index 32f90cf2e7c..c7d5b960aa6 100644
--- a/nixos/doc/manual/development/assertions.xml
+++ b/nixos/doc/manual/development/assertions.xml
@@ -6,18 +6,11 @@
  <title>Warnings and Assertions</title>
 
  <para>
-  When configuration problems are detectable in a module, it is a good idea to
-  write an assertion or warning. Doing so provides clear feedback to the user
-  and prevents errors after the build.
+  When configuration problems are detectable in a module, it is a good idea to write an assertion or warning. Doing so provides clear feedback to the user and prevents errors after the build.
  </para>
 
  <para>
-  Although Nix has the <literal>abort</literal> and
-  <literal>builtins.trace</literal>
-  <link xlink:href="https://nixos.org/nix/manual/#ssec-builtins">functions</link>
-  to perform such tasks, they are not ideally suited for NixOS modules. Instead
-  of these functions, you can declare your warnings and assertions using the
-  NixOS module system.
+  Although Nix has the <literal>abort</literal> and <literal>builtins.trace</literal> <link xlink:href="https://nixos.org/nix/manual/#ssec-builtins">functions</link> to perform such tasks, they are not ideally suited for NixOS modules. Instead of these functions, you can declare your warnings and assertions using the NixOS module system.
  </para>
 
  <section xml:id="sec-assertions-warnings">
@@ -48,12 +41,7 @@
   <title>Assertions</title>
 
   <para>
-   This example, extracted from the
-   <link xlink:href="https://github.com/NixOS/nixpkgs/blob/release-17.09/nixos/modules/services/logging/syslogd.nix">
-   <literal>syslogd</literal> module </link> shows how to use
-   <literal>assertions</literal>. Since there can only be one active syslog
-   daemon at a time, an assertion is useful to prevent such a broken system
-   from being built.
+   This example, extracted from the <link xlink:href="https://github.com/NixOS/nixpkgs/blob/release-17.09/nixos/modules/services/logging/syslogd.nix"> <literal>syslogd</literal> module </link> shows how to use <literal>assertions</literal>. Since there can only be one active syslog daemon at a time, an assertion is useful to prevent such a broken system from being built.
   </para>
 
 <programlisting>
diff --git a/nixos/doc/manual/development/building-nixos.xml b/nixos/doc/manual/development/building-nixos.xml
index 56a596baed0..a4bb18656e0 100644
--- a/nixos/doc/manual/development/building-nixos.xml
+++ b/nixos/doc/manual/development/building-nixos.xml
@@ -5,22 +5,17 @@
         xml:id="sec-building-cd">
  <title>Building Your Own NixOS CD</title>
  <para>
-  Building a NixOS CD is as easy as configuring your own computer. The idea is
-  to use another module which will replace your
-  <filename>configuration.nix</filename> to configure the system that would be
-  installed on the CD.
+  Building a NixOS CD is as easy as configuring your own computer. The idea is to use another module which will replace your <filename>configuration.nix</filename> to configure the system that would be installed on the CD.
  </para>
  <para>
-  Default CD/DVD configurations are available inside
-  <filename>nixos/modules/installer/cd-dvd</filename>.
+  Default CD/DVD configurations are available inside <filename>nixos/modules/installer/cd-dvd</filename>.
 <screen>
 <prompt>$ </prompt>git clone https://github.com/NixOS/nixpkgs.git
 <prompt>$ </prompt>cd nixpkgs/nixos
 <prompt>$ </prompt>nix-build -A config.system.build.isoImage -I nixos-config=modules/installer/cd-dvd/installation-cd-minimal.nix default.nix</screen>
  </para>
  <para>
-  Before burning your CD/DVD, you can check the content of the image by
-  mounting anywhere like suggested by the following command:
+  Before burning your CD/DVD, you can check the content of the image by mounting anywhere like suggested by the following command:
 <screen>
 <prompt># </prompt>mount -o loop -t iso9660 ./result/iso/cd.iso /mnt/iso</screen>
  </para>
diff --git a/nixos/doc/manual/development/building-parts.xml b/nixos/doc/manual/development/building-parts.xml
index 88369fb891b..e05a1342b7a 100644
--- a/nixos/doc/manual/development/building-parts.xml
+++ b/nixos/doc/manual/development/building-parts.xml
@@ -5,14 +5,11 @@
         xml:id="sec-building-parts">
  <title>Building Specific Parts of NixOS</title>
  <para>
-  With the command <command>nix-build</command>, you can build specific parts
-  of your NixOS configuration. This is done as follows:
+  With the command <command>nix-build</command>, you can build specific parts of your NixOS configuration. This is done as follows:
 <screen>
 <prompt>$ </prompt>cd <replaceable>/path/to/nixpkgs/nixos</replaceable>
 <prompt>$ </prompt>nix-build -A config.<replaceable>option</replaceable></screen>
-  where <replaceable>option</replaceable> is a NixOS option with type
-  “derivation” (i.e. something that can be built). Attributes of interest
-  include:
+  where <replaceable>option</replaceable> is a NixOS option with type “derivation” (i.e. something that can be built). Attributes of interest include:
   <variablelist>
    <varlistentry>
     <term>
@@ -20,10 +17,7 @@
     </term>
     <listitem>
      <para>
-      The top-level option that builds the entire NixOS system. Everything else
-      in your configuration is indirectly pulled in by this option. This is
-      what <command>nixos-rebuild</command> builds and what
-      <filename>/run/current-system</filename> points to afterwards.
+      The top-level option that builds the entire NixOS system. Everything else in your configuration is indirectly pulled in by this option. This is what <command>nixos-rebuild</command> builds and what <filename>/run/current-system</filename> points to afterwards.
      </para>
      <para>
       A shortcut to build this is:
@@ -48,8 +42,7 @@
     </term>
     <listitem>
      <para>
-      A tree of symlinks that form the static parts of
-      <filename>/etc</filename>.
+      A tree of symlinks that form the static parts of <filename>/etc</filename>.
      </para>
     </listitem>
    </varlistentry>
@@ -62,9 +55,7 @@
     </term>
     <listitem>
      <para>
-      The initial ramdisk and kernel of the system. This allows a quick way to
-      test whether the kernel and the initial ramdisk boot correctly, by using
-      QEMU’s <option>-kernel</option> and <option>-initrd</option> options:
+      The initial ramdisk and kernel of the system. This allows a quick way to test whether the kernel and the initial ramdisk boot correctly, by using QEMU’s <option>-kernel</option> and <option>-initrd</option> options:
 <screen>
 <prompt>$ </prompt>nix-build -A config.system.build.initialRamdisk -o initrd
 <prompt>$ </prompt>nix-build -A config.system.build.kernel -o kernel
@@ -95,24 +86,18 @@
     </term>
     <listitem>
      <para>
-      This builds the unit with the specified name. Note that since unit names
-      contain dots (e.g. <literal>httpd.service</literal>), you need to put
-      them between quotes, like this:
+      This builds the unit with the specified name. Note that since unit names contain dots (e.g. <literal>httpd.service</literal>), you need to put them between quotes, like this:
 <screen>
 <prompt>$ </prompt>nix-build -A 'config.systemd.units."httpd.service".unit'
 </screen>
-      You can also test individual units, without rebuilding the whole system,
-      by putting them in <filename>/run/systemd/system</filename>:
+      You can also test individual units, without rebuilding the whole system, by putting them in <filename>/run/systemd/system</filename>:
 <screen>
 <prompt>$ </prompt>cp $(nix-build -A 'config.systemd.units."httpd.service".unit')/httpd.service \
     /run/systemd/system/tmp-httpd.service
 <prompt># </prompt>systemctl daemon-reload
 <prompt># </prompt>systemctl start tmp-httpd.service
 </screen>
-      Note that the unit must not have the same name as any unit in
-      <filename>/etc/systemd/system</filename> since those take precedence over
-      <filename>/run/systemd/system</filename>. That’s why the unit is
-      installed as <filename>tmp-httpd.service</filename> here.
+      Note that the unit must not have the same name as any unit in <filename>/etc/systemd/system</filename> since those take precedence over <filename>/run/systemd/system</filename>. That’s why the unit is installed as <filename>tmp-httpd.service</filename> here.
      </para>
     </listitem>
    </varlistentry>
diff --git a/nixos/doc/manual/development/importing-modules.xml b/nixos/doc/manual/development/importing-modules.xml
index 1c6a5671eda..0d57681783e 100644
--- a/nixos/doc/manual/development/importing-modules.xml
+++ b/nixos/doc/manual/development/importing-modules.xml
@@ -6,8 +6,7 @@
  <title>Importing Modules</title>
 
  <para>
-  Sometimes NixOS modules need to be used in configuration but exist outside of
-  Nixpkgs. These modules can be imported:
+  Sometimes NixOS modules need to be used in configuration but exist outside of Nixpkgs. These modules can be imported:
  </para>
 
 <programlisting>
@@ -25,9 +24,7 @@
 </programlisting>
 
  <para>
-  The environment variable <literal>NIXOS_EXTRA_MODULE_PATH</literal> is an
-  absolute path to a NixOS module that is included alongside the Nixpkgs NixOS
-  modules. Like any NixOS module, this module can import additional modules:
+  The environment variable <literal>NIXOS_EXTRA_MODULE_PATH</literal> is an absolute path to a NixOS module that is included alongside the Nixpkgs NixOS modules. Like any NixOS module, this module can import additional modules:
  </para>
 
 <programlisting>
diff --git a/nixos/doc/manual/development/meta-attributes.xml b/nixos/doc/manual/development/meta-attributes.xml
index 3d019a4987e..fd15bd3638f 100644
--- a/nixos/doc/manual/development/meta-attributes.xml
+++ b/nixos/doc/manual/development/meta-attributes.xml
@@ -6,18 +6,12 @@
  <title>Meta Attributes</title>
 
  <para>
-  Like Nix packages, NixOS modules can declare meta-attributes to provide extra
-  information. Module meta attributes are defined in the
-  <filename
-    xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/misc/meta.nix">meta.nix</filename>
-  special module.
+  Like Nix packages, NixOS modules can declare meta-attributes to provide extra information. Module meta attributes are defined in the <filename
+    xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/misc/meta.nix">meta.nix</filename> special module.
  </para>
 
  <para>
-  <literal>meta</literal> is a top level attribute like
-  <literal>options</literal> and <literal>config</literal>. Available
-  meta-attributes are <literal>maintainers</literal> and
-  <literal>doc</literal>.
+  <literal>meta</literal> is a top level attribute like <literal>options</literal> and <literal>config</literal>. Available meta-attributes are <literal>maintainers</literal> and <literal>doc</literal>.
  </para>
 
  <para>
@@ -51,11 +45,8 @@
   </callout>
   <callout arearefs='modules-meta-2'>
    <para>
-    <varname>doc</varname> points to a valid DocBook file containing the module
-    documentation. Its contents is automatically added to
-    <xref
-      linkend="ch-configuration"/>. Changes to a module documentation
-    have to be checked to not break building the NixOS manual:
+    <varname>doc</varname> points to a valid DocBook file containing the module documentation. Its contents is automatically added to <xref
+      linkend="ch-configuration"/>. Changes to a module documentation have to be checked to not break building the NixOS manual:
    </para>
 <programlisting>$ nix-build nixos/release.nix -A manual</programlisting>
   </callout>
diff --git a/nixos/doc/manual/development/nixos-tests.xml b/nixos/doc/manual/development/nixos-tests.xml
index 2695082e386..aedc40e93a6 100644
--- a/nixos/doc/manual/development/nixos-tests.xml
+++ b/nixos/doc/manual/development/nixos-tests.xml
@@ -5,13 +5,8 @@
         xml:id="sec-nixos-tests">
  <title>NixOS Tests</title>
  <para>
-  When you add some feature to NixOS, you should write a test for it. NixOS
-  tests are kept in the directory
-  <filename
-xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/tests">nixos/tests</filename>,
-  and are executed (using Nix) by a testing framework that automatically starts
-  one or more virtual machines containing the NixOS system(s) required for the
-  test.
+  When you add some feature to NixOS, you should write a test for it. NixOS tests are kept in the directory <filename
+xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/tests">nixos/tests</filename>, and are executed (using Nix) by a testing framework that automatically starts one or more virtual machines containing the NixOS system(s) required for the test.
  </para>
  <xi:include href="writing-nixos-tests.xml" />
  <xi:include href="running-nixos-tests.xml" />
diff --git a/nixos/doc/manual/development/option-declarations.xml b/nixos/doc/manual/development/option-declarations.xml
index eee81bf6426..d6fb3f8f687 100644
--- a/nixos/doc/manual/development/option-declarations.xml
+++ b/nixos/doc/manual/development/option-declarations.xml
@@ -6,9 +6,7 @@
  <title>Option Declarations</title>
 
  <para>
-  An option declaration specifies the name, type and description of a NixOS
-  configuration option. It is invalid to define an option that hasn’t been
-  declared in any module. An option declaration generally looks like this:
+  An option declaration specifies the name, type and description of a NixOS configuration option. It is invalid to define an option that hasn’t been declared in any module. An option declaration generally looks like this:
 <programlisting>
 options = {
   <replaceable>name</replaceable> = mkOption {
@@ -19,13 +17,8 @@ options = {
   };
 };
 </programlisting>
-  The attribute names within the <replaceable>name</replaceable> attribute path
-  must be camel cased in general but should, as an exception, match the
-  <link
-xlink:href="https://nixos.org/nixpkgs/manual/#sec-package-naming">
-  package attribute name</link> when referencing a Nixpkgs package. For
-  example, the option <varname>services.nix-serve.bindAddress</varname>
-  references the <varname>nix-serve</varname> Nixpkgs package.
+  The attribute names within the <replaceable>name</replaceable> attribute path must be camel cased in general but should, as an exception, match the <link
+xlink:href="https://nixos.org/nixpkgs/manual/#sec-package-naming"> package attribute name</link> when referencing a Nixpkgs package. For example, the option <varname>services.nix-serve.bindAddress</varname> references the <varname>nix-serve</varname> Nixpkgs package.
  </para>
 
  <para>
@@ -37,9 +30,7 @@ xlink:href="https://nixos.org/nixpkgs/manual/#sec-package-naming">
     </term>
     <listitem>
      <para>
-      The type of the option (see <xref linkend='sec-option-types' />). It may
-      be omitted, but that’s not advisable since it may lead to errors that
-      are hard to diagnose.
+      The type of the option (see <xref linkend='sec-option-types' />). It may be omitted, but that’s not advisable since it may lead to errors that are hard to diagnose.
      </para>
     </listitem>
    </varlistentry>
@@ -49,10 +40,7 @@ xlink:href="https://nixos.org/nixpkgs/manual/#sec-package-naming">
     </term>
     <listitem>
      <para>
-      The default value used if no value is defined by any module. A default is
-      not required; but if a default is not given, then users of the module
-      will have to define the value of the option, otherwise an error will be
-      thrown.
+      The default value used if no value is defined by any module. A default is not required; but if a default is not given, then users of the module will have to define the value of the option, otherwise an error will be thrown.
      </para>
     </listitem>
    </varlistentry>
@@ -72,8 +60,7 @@ xlink:href="https://nixos.org/nixpkgs/manual/#sec-package-naming">
     </term>
     <listitem>
      <para>
-      A textual description of the option, in DocBook format, that will be
-      included in the NixOS manual.
+      A textual description of the option, in DocBook format, that will be included in the NixOS manual.
      </para>
     </listitem>
    </varlistentry>
@@ -84,22 +71,15 @@ xlink:href="https://nixos.org/nixpkgs/manual/#sec-package-naming">
   <title>Extensible Option Types</title>
 
   <para>
-   Extensible option types is a feature that allow to extend certain types
-   declaration through multiple module files. This feature only work with a
-   restricted set of types, namely <literal>enum</literal> and
-   <literal>submodules</literal> and any composed forms of them.
+   Extensible option types is a feature that allow to extend certain types declaration through multiple module files. This feature only work with a restricted set of types, namely <literal>enum</literal> and <literal>submodules</literal> and any composed forms of them.
   </para>
 
   <para>
-   Extensible option types can be used for <literal>enum</literal> options that
-   affects multiple modules, or as an alternative to related
-   <literal>enable</literal> options.
+   Extensible option types can be used for <literal>enum</literal> options that affects multiple modules, or as an alternative to related <literal>enable</literal> options.
   </para>
 
   <para>
-   As an example, we will take the case of display managers. There is a central
-   display manager module for generic display manager options and a module file
-   per display manager backend (slim, sddm, gdm ...).
+   As an example, we will take the case of display managers. There is a central display manager module for generic display manager options and a module file per display manager backend (slim, sddm, gdm ...).
   </para>
 
   <para>
@@ -107,14 +87,12 @@ xlink:href="https://nixos.org/nixpkgs/manual/#sec-package-naming">
    <itemizedlist>
     <listitem>
      <para>
-      Managing the display managers independently by adding an enable option to
-      every display manager module backend. (NixOS)
+      Managing the display managers independently by adding an enable option to every display manager module backend. (NixOS)
      </para>
     </listitem>
     <listitem>
      <para>
-      Managing the display managers in the central module by adding an option
-      to select which display manager backend to use.
+      Managing the display managers in the central module by adding an option to select which display manager backend to use.
      </para>
     </listitem>
    </itemizedlist>
@@ -125,37 +103,22 @@ xlink:href="https://nixos.org/nixpkgs/manual/#sec-package-naming">
   </para>
 
   <para>
-   Making backends independent can quickly become hard to manage. For display
-   managers, there can be only one enabled at a time, but the type system can
-   not enforce this restriction as there is no relation between each backend
-   <literal>enable</literal> option. As a result, this restriction has to be
-   done explicitely by adding assertions in each display manager backend
-   module.
+   Making backends independent can quickly become hard to manage. For display managers, there can be only one enabled at a time, but the type system can not enforce this restriction as there is no relation between each backend <literal>enable</literal> option. As a result, this restriction has to be done explicitely by adding assertions in each display manager backend module.
   </para>
 
   <para>
-   On the other hand, managing the display managers backends in the central
-   module will require to change the central module option every time a new
-   backend is added or removed.
+   On the other hand, managing the display managers backends in the central module will require to change the central module option every time a new backend is added or removed.
   </para>
 
   <para>
-   By using extensible option types, it is possible to create a placeholder
-   option in the central module
-   (<xref linkend='ex-option-declaration-eot-service'
-      />), and to extend
-   it in each backend module
-   (<xref
-      linkend='ex-option-declaration-eot-backend-slim' />,
-   <xref
+   By using extensible option types, it is possible to create a placeholder option in the central module (<xref linkend='ex-option-declaration-eot-service'
+      />), and to extend it in each backend module (<xref
+      linkend='ex-option-declaration-eot-backend-slim' />, <xref
       linkend='ex-option-declaration-eot-backend-sddm' />).
   </para>
 
   <para>
-   As a result, <literal>displayManager.enable</literal> option values can be
-   added without changing the main service module file and the type system
-   automatically enforce that there can only be a single display manager
-   enabled.
+   As a result, <literal>displayManager.enable</literal> option values can be added without changing the main service module file and the type system automatically enforce that there can only be a single display manager enabled.
   </para>
 
   <example xml:id='ex-option-declaration-eot-service'>
@@ -184,16 +147,11 @@ services.xserver.displayManager.enable = mkOption {
   </example>
 
   <para>
-   The placeholder declaration is a standard <literal>mkOption</literal>
-   declaration, but it is important that extensible option declarations only
-   use the <literal>type</literal> argument.
+   The placeholder declaration is a standard <literal>mkOption</literal> declaration, but it is important that extensible option declarations only use the <literal>type</literal> argument.
   </para>
 
   <para>
-   Extensible option types work with any of the composed variants of
-   <literal>enum</literal> such as <literal>with types; nullOr (enum [ "foo"
-   "bar" ])</literal> or <literal>with types; listOf (enum [ "foo" "bar"
-   ])</literal>.
+   Extensible option types work with any of the composed variants of <literal>enum</literal> such as <literal>with types; nullOr (enum [ "foo" "bar" ])</literal> or <literal>with types; listOf (enum [ "foo" "bar" ])</literal>.
   </para>
  </section>
 </section>
diff --git a/nixos/doc/manual/development/option-def.xml b/nixos/doc/manual/development/option-def.xml
index 50a705d0cb8..883778c7eb9 100644
--- a/nixos/doc/manual/development/option-def.xml
+++ b/nixos/doc/manual/development/option-def.xml
@@ -6,33 +6,26 @@
  <title>Option Definitions</title>
 
  <para>
-  Option definitions are generally straight-forward bindings of values to
-  option names, like
+  Option definitions are generally straight-forward bindings of values to option names, like
 <programlisting>
 config = {
   services.httpd.enable = true;
 };
 </programlisting>
-  However, sometimes you need to wrap an option definition or set of option
-  definitions in a <emphasis>property</emphasis> to achieve certain effects:
+  However, sometimes you need to wrap an option definition or set of option definitions in a <emphasis>property</emphasis> to achieve certain effects:
  </para>
 
  <simplesect xml:id="sec-option-definitions-delaying-conditionals">
   <title>Delaying Conditionals</title>
   <para>
-   If a set of option definitions is conditional on the value of another
-   option, you may need to use <varname>mkIf</varname>. Consider, for instance:
+   If a set of option definitions is conditional on the value of another option, you may need to use <varname>mkIf</varname>. Consider, for instance:
 <programlisting>
 config = if config.services.httpd.enable then {
   environment.systemPackages = [ <replaceable>...</replaceable> ];
   <replaceable>...</replaceable>
 } else {};
 </programlisting>
-   This definition will cause Nix to fail with an “infinite recursion”
-   error. Why? Because the value of
-   <option>config.services.httpd.enable</option> depends on the value being
-   constructed here. After all, you could also write the clearly circular and
-   contradictory:
+   This definition will cause Nix to fail with an “infinite recursion” error. Why? Because the value of <option>config.services.httpd.enable</option> depends on the value being constructed here. After all, you could also write the clearly circular and contradictory:
 <programlisting>
 config = if config.services.httpd.enable then {
   services.httpd.enable = false;
@@ -47,9 +40,7 @@ config = mkIf config.services.httpd.enable {
   <replaceable>...</replaceable>
 };
 </programlisting>
-   The special function <varname>mkIf</varname> causes the evaluation of the
-   conditional to be “pushed down” into the individual definitions, as if
-   you had written:
+   The special function <varname>mkIf</varname> causes the evaluation of the conditional to be “pushed down” into the individual definitions, as if you had written:
 <programlisting>
 config = {
   environment.systemPackages = if config.services.httpd.enable then [ <replaceable>...</replaceable> ] else [];
@@ -62,27 +53,18 @@ config = {
  <simplesect xml:id="sec-option-definitions-setting-priorities">
   <title>Setting Priorities</title>
   <para>
-   A module can override the definitions of an option in other modules by
-   setting a <emphasis>priority</emphasis>. All option definitions that do not
-   have the lowest priority value are discarded. By default, option definitions
-   have priority 1000. You can specify an explicit priority by using
-   <varname>mkOverride</varname>, e.g.
+   A module can override the definitions of an option in other modules by setting a <emphasis>priority</emphasis>. All option definitions that do not have the lowest priority value are discarded. By default, option definitions have priority 1000. You can specify an explicit priority by using <varname>mkOverride</varname>, e.g.
 <programlisting>
 services.openssh.enable = mkOverride 10 false;
 </programlisting>
-   This definition causes all other definitions with priorities above 10 to be
-   discarded. The function <varname>mkForce</varname> is equal to
-   <varname>mkOverride 50</varname>.
+   This definition causes all other definitions with priorities above 10 to be discarded. The function <varname>mkForce</varname> is equal to <varname>mkOverride 50</varname>.
   </para>
  </simplesect>
 
  <simplesect xml:id="sec-option-definitions-merging">
   <title>Merging Configurations</title>
   <para>
-   In conjunction with <literal>mkIf</literal>, it is sometimes useful for a
-   module to return multiple sets of option definitions, to be merged together
-   as if they were declared in separate modules. This can be done using
-   <varname>mkMerge</varname>:
+   In conjunction with <literal>mkIf</literal>, it is sometimes useful for a module to return multiple sets of option definitions, to be merged together as if they were declared in separate modules. This can be done using <varname>mkMerge</varname>:
 <programlisting>
 config = mkMerge
   [ # Unconditional stuff.
diff --git a/nixos/doc/manual/development/option-types.xml b/nixos/doc/manual/development/option-types.xml
index 8fcbb627342..7cd26e4c937 100644
--- a/nixos/doc/manual/development/option-types.xml
+++ b/nixos/doc/manual/development/option-types.xml
@@ -6,18 +6,14 @@
  <title>Options Types</title>
 
  <para>
-  Option types are a way to put constraints on the values a module option can
-  take. Types are also responsible of how values are merged in case of multiple
-  value definitions.
+  Option types are a way to put constraints on the values a module option can take. Types are also responsible of how values are merged in case of multiple value definitions.
  </para>
 
  <section xml:id="sec-option-types-basic">
   <title>Basic Types</title>
 
   <para>
-   Basic types are the simplest available types in the module system. Basic
-   types include multiple string types that mainly differ in how definition
-   merging is handled.
+   Basic types are the simplest available types in the module system. Basic types include multiple string types that mainly differ in how definition merging is handled.
   </para>
 
   <variablelist>
@@ -37,8 +33,7 @@
     </term>
     <listitem>
      <para>
-      A boolean, its values can be <literal>true</literal> or
-      <literal>false</literal>.
+      A boolean, its values can be <literal>true</literal> or <literal>false</literal>.
      </para>
     </listitem>
    </varlistentry>
@@ -48,9 +43,7 @@
     </term>
     <listitem>
      <para>
-      A filesystem path, defined as anything that when coerced to a string
-      starts with a slash. Even if derivations can be considered as path, the
-      more specific <literal>types.package</literal> should be preferred.
+      A filesystem path, defined as anything that when coerced to a string starts with a slash. Even if derivations can be considered as path, the more specific <literal>types.package</literal> should be preferred.
      </para>
     </listitem>
    </varlistentry>
@@ -87,12 +80,7 @@
     </term>
     <listitem>
      <para>
-      Signed integers with a fixed length (8, 16 or 32 bits). They go from
-      <inlineequation><mathphrase>−2<superscript>n</superscript>/2</mathphrase>
-      </inlineequation> to <inlineequation>
-      <mathphrase>2<superscript>n</superscript>/2−1</mathphrase>
-      </inlineequation> respectively (e.g. <literal>−128</literal> to
-      <literal>127</literal> for 8 bits).
+      Signed integers with a fixed length (8, 16 or 32 bits). They go from <inlineequation><mathphrase>−2<superscript>n</superscript>/2</mathphrase> </inlineequation> to <inlineequation> <mathphrase>2<superscript>n</superscript>/2−1</mathphrase> </inlineequation> respectively (e.g. <literal>−128</literal> to <literal>127</literal> for 8 bits).
      </para>
     </listitem>
    </varlistentry>
@@ -112,12 +100,7 @@
     </term>
     <listitem>
      <para>
-      Unsigned integers with a fixed length (8, 16 or 32 bits). They go from
-      <inlineequation><mathphrase>0</mathphrase></inlineequation> to
-      <inlineequation>
-      <mathphrase>2<superscript>n</superscript>−1</mathphrase>
-      </inlineequation> respectively (e.g. <literal>0</literal> to
-      <literal>255</literal> for 8 bits).
+      Unsigned integers with a fixed length (8, 16 or 32 bits). They go from <inlineequation><mathphrase>0</mathphrase></inlineequation> to <inlineequation> <mathphrase>2<superscript>n</superscript>−1</mathphrase> </inlineequation> respectively (e.g. <literal>0</literal> to <literal>255</literal> for 8 bits).
      </para>
     </listitem>
    </varlistentry>
@@ -137,8 +120,7 @@
     </term>
     <listitem>
      <para>
-      A port number. This type is an alias to
-      <link linkend='types.ints.ux'><varname>types.ints.u16</varname></link>.
+      A port number. This type is an alias to <link linkend='types.ints.ux'><varname>types.ints.u16</varname></link>.
      </para>
     </listitem>
    </varlistentry>
@@ -165,8 +147,7 @@
     </term>
     <listitem>
      <para>
-      A string. Multiple definitions are concatenated with a new line
-      <literal>"\n"</literal>.
+      A string. Multiple definitions are concatenated with a new line <literal>"\n"</literal>.
      </para>
     </listitem>
    </varlistentry>
@@ -176,8 +157,7 @@
     </term>
     <listitem>
      <para>
-      A string. Multiple definitions are concatenated with a comma
-      <literal>","</literal>.
+      A string. Multiple definitions are concatenated with a comma <literal>","</literal>.
      </para>
     </listitem>
    </varlistentry>
@@ -187,8 +167,7 @@
     </term>
     <listitem>
      <para>
-      A string. Multiple definitions are concatenated with a collon
-      <literal>":"</literal>.
+      A string. Multiple definitions are concatenated with a collon <literal>":"</literal>.
      </para>
     </listitem>
    </varlistentry>
@@ -198,9 +177,7 @@
     </term>
     <listitem>
      <para>
-      A string matching a specific regular expression. Multiple definitions
-      cannot be merged. The regular expression is processed using
-      <literal>builtins.match</literal>.
+      A string matching a specific regular expression. Multiple definitions cannot be merged. The regular expression is processed using <literal>builtins.match</literal>.
      </para>
     </listitem>
    </varlistentry>
@@ -221,9 +198,7 @@
     </term>
     <listitem>
      <para>
-      One element of the list <replaceable>l</replaceable>, e.g.
-      <literal>types.enum [ "left" "right" ]</literal>. Multiple definitions
-      cannot be merged.
+      One element of the list <replaceable>l</replaceable>, e.g. <literal>types.enum [ "left" "right" ]</literal>. Multiple definitions cannot be merged.
      </para>
     </listitem>
    </varlistentry>
@@ -233,8 +208,7 @@
     </term>
     <listitem>
      <para>
-      A string with a custom separator <replaceable>sep</replaceable>, e.g.
-      <literal>types.separatedString "|"</literal>.
+      A string with a custom separator <replaceable>sep</replaceable>, e.g. <literal>types.separatedString "|"</literal>.
      </para>
     </listitem>
    </varlistentry>
@@ -244,9 +218,7 @@
     </term>
     <listitem>
      <para>
-      An integer between <replaceable>lowest</replaceable> and
-      <replaceable>highest</replaceable> (both inclusive). Useful for creating
-      types like <literal>types.port</literal>.
+      An integer between <replaceable>lowest</replaceable> and <replaceable>highest</replaceable> (both inclusive). Useful for creating types like <literal>types.port</literal>.
      </para>
     </listitem>
    </varlistentry>
@@ -256,11 +228,7 @@
     </term>
     <listitem>
      <para>
-      A set of sub options <replaceable>o</replaceable>.
-      <replaceable>o</replaceable> can be an attribute set or a function
-      returning an attribute set. Submodules are used in composed types to
-      create modular options. Submodule are detailed in
-      <xref
+      A set of sub options <replaceable>o</replaceable>. <replaceable>o</replaceable> can be an attribute set or a function returning an attribute set. Submodules are used in composed types to create modular options. Submodule are detailed in <xref
           linkend='section-option-types-submodule' />.
      </para>
     </listitem>
@@ -272,9 +240,7 @@
   <title>Composed Types</title>
 
   <para>
-   Composed types are types that take a type as parameter. <literal>listOf
-   int</literal> and <literal>either int str</literal> are examples of composed
-   types.
+   Composed types are types that take a type as parameter. <literal>listOf int</literal> and <literal>either int str</literal> are examples of composed types.
   </para>
 
   <variablelist>
@@ -284,8 +250,7 @@
     </term>
     <listitem>
      <para>
-      A list of <replaceable>t</replaceable> type, e.g. <literal>types.listOf
-      int</literal>. Multiple definitions are merged with list concatenation.
+      A list of <replaceable>t</replaceable> type, e.g. <literal>types.listOf int</literal>. Multiple definitions are merged with list concatenation.
      </para>
     </listitem>
    </varlistentry>
@@ -295,9 +260,7 @@
     </term>
     <listitem>
      <para>
-      An attribute set of where all the values are of
-      <replaceable>t</replaceable> type. Multiple definitions result in the
-      joined attribute set.
+      An attribute set of where all the values are of <replaceable>t</replaceable> type. Multiple definitions result in the joined attribute set.
      </para>
     </listitem>
    </varlistentry>
@@ -307,8 +270,7 @@
     </term>
     <listitem>
      <para>
-      An attribute set or a list of <replaceable>t</replaceable> type. Multiple
-      definitions are merged according to the value.
+      An attribute set or a list of <replaceable>t</replaceable> type. Multiple definitions are merged according to the value.
      </para>
     </listitem>
    </varlistentry>
@@ -318,8 +280,7 @@
     </term>
     <listitem>
      <para>
-      <literal>null</literal> or type <replaceable>t</replaceable>. Multiple
-      definitions are merged according to type <replaceable>t</replaceable>.
+      <literal>null</literal> or type <replaceable>t</replaceable>. Multiple definitions are merged according to type <replaceable>t</replaceable>.
      </para>
     </listitem>
    </varlistentry>
@@ -329,8 +290,7 @@
     </term>
     <listitem>
      <para>
-      Ensures that type <replaceable>t</replaceable> cannot be merged. It is
-      used to ensure option definitions are declared only once.
+      Ensures that type <replaceable>t</replaceable> cannot be merged. It is used to ensure option definitions are declared only once.
      </para>
     </listitem>
    </varlistentry>
@@ -340,9 +300,7 @@
     </term>
     <listitem>
      <para>
-      Type <replaceable>t1</replaceable> or type <replaceable>t2</replaceable>,
-      e.g. <literal>with types; either int str</literal>. Multiple definitions
-      cannot be merged.
+      Type <replaceable>t1</replaceable> or type <replaceable>t2</replaceable>, e.g. <literal>with types; either int str</literal>. Multiple definitions cannot be merged.
      </para>
     </listitem>
    </varlistentry>
@@ -352,9 +310,7 @@
     </term>
     <listitem>
      <para>
-      Type <replaceable>t1</replaceable> or type <replaceable>t2</replaceable> and so forth,
-      e.g. <literal>with types; oneOf [ int str bool ]</literal>. Multiple definitions
-      cannot be merged.
+      Type <replaceable>t1</replaceable> or type <replaceable>t2</replaceable> and so forth, e.g. <literal>with types; oneOf [ int str bool ]</literal>. Multiple definitions cannot be merged.
      </para>
     </listitem>
    </varlistentry>
@@ -364,12 +320,7 @@
     </term>
     <listitem>
      <para>
-      Type <replaceable>to</replaceable> or type
-      <replaceable>from</replaceable> which will be coerced to type
-      <replaceable>to</replaceable> using function <replaceable>f</replaceable>
-      which takes an argument of type <replaceable>from</replaceable> and
-      return a value of type <replaceable>to</replaceable>. Can be used to
-      preserve backwards compatibility of an option if its type was changed.
+      Type <replaceable>to</replaceable> or type <replaceable>from</replaceable> which will be coerced to type <replaceable>to</replaceable> using function <replaceable>f</replaceable> which takes an argument of type <replaceable>from</replaceable> and return a value of type <replaceable>to</replaceable>. Can be used to preserve backwards compatibility of an option if its type was changed.
      </para>
     </listitem>
    </varlistentry>
@@ -380,22 +331,15 @@
   <title>Submodule</title>
 
   <para>
-   <literal>submodule</literal> is a very powerful type that defines a set of
-   sub-options that are handled like a separate module.
+   <literal>submodule</literal> is a very powerful type that defines a set of sub-options that are handled like a separate module.
   </para>
 
   <para>
-   It takes a parameter <replaceable>o</replaceable>, that should be a set, or
-   a function returning a set with an <literal>options</literal> key defining
-   the sub-options. Submodule option definitions are type-checked accordingly
-   to the <literal>options</literal> declarations. Of course, you can nest
-   submodule option definitons for even higher modularity.
+   It takes a parameter <replaceable>o</replaceable>, that should be a set, or a function returning a set with an <literal>options</literal> key defining the sub-options. Submodule option definitions are type-checked accordingly to the <literal>options</literal> declarations. Of course, you can nest submodule option definitons for even higher modularity.
   </para>
 
   <para>
-   The option set can be defined directly
-   (<xref linkend='ex-submodule-direct' />) or as reference
-   (<xref linkend='ex-submodule-reference' />).
+   The option set can be defined directly (<xref linkend='ex-submodule-direct' />) or as reference (<xref linkend='ex-submodule-reference' />).
   </para>
 
   <example xml:id='ex-submodule-direct'>
@@ -438,12 +382,7 @@ options.mod = mkOption {
   </example>
 
   <para>
-   The <literal>submodule</literal> type is especially interesting when used
-   with composed types like <literal>attrsOf</literal> or
-   <literal>listOf</literal>. When composed with <literal>listOf</literal>
-   (<xref linkend='ex-submodule-listof-declaration' />),
-   <literal>submodule</literal> allows multiple definitions of the submodule
-   option set (<xref linkend='ex-submodule-listof-definition' />).
+   The <literal>submodule</literal> type is especially interesting when used with composed types like <literal>attrsOf</literal> or <literal>listOf</literal>. When composed with <literal>listOf</literal> (<xref linkend='ex-submodule-listof-declaration' />), <literal>submodule</literal> allows multiple definitions of the submodule option set (<xref linkend='ex-submodule-listof-definition' />).
   </para>
 
   <example xml:id='ex-submodule-listof-declaration'>
@@ -474,10 +413,7 @@ config.mod = [
   </example>
 
   <para>
-   When composed with <literal>attrsOf</literal>
-   (<xref linkend='ex-submodule-attrsof-declaration' />),
-   <literal>submodule</literal> allows multiple named definitions of the
-   submodule option set (<xref linkend='ex-submodule-attrsof-definition' />).
+   When composed with <literal>attrsOf</literal> (<xref linkend='ex-submodule-attrsof-declaration' />), <literal>submodule</literal> allows multiple named definitions of the submodule option set (<xref linkend='ex-submodule-attrsof-definition' />).
   </para>
 
   <example xml:id='ex-submodule-attrsof-declaration'>
@@ -510,8 +446,7 @@ config.mod.two = { foo = 2; bar = "two"; };</screen>
   <title>Extending types</title>
 
   <para>
-   Types are mainly characterized by their <literal>check</literal> and
-   <literal>merge</literal> functions.
+   Types are mainly characterized by their <literal>check</literal> and <literal>merge</literal> functions.
   </para>
 
   <variablelist>
@@ -521,13 +456,8 @@ config.mod.two = { foo = 2; bar = "two"; };</screen>
     </term>
     <listitem>
      <para>
-      The function to type check the value. Takes a value as parameter and
-      return a boolean. It is possible to extend a type check with the
-      <literal>addCheck</literal> function
-      (<xref
-          linkend='ex-extending-type-check-1' />), or to fully
-      override the check function
-      (<xref linkend='ex-extending-type-check-2' />).
+      The function to type check the value. Takes a value as parameter and return a boolean. It is possible to extend a type check with the <literal>addCheck</literal> function (<xref
+          linkend='ex-extending-type-check-1' />), or to fully override the check function (<xref linkend='ex-extending-type-check-2' />).
      </para>
      <example xml:id='ex-extending-type-check-1'>
       <title>Adding a type check</title>
@@ -555,11 +485,7 @@ nixThings = mkOption {
     </term>
     <listitem>
      <para>
-      Function to merge the options values when multiple values are set. The
-      function takes two parameters, <literal>loc</literal> the option path as
-      a list of strings, and <literal>defs</literal> the list of defined values
-      as a list. It is possible to override a type merge function for custom
-      needs.
+      Function to merge the options values when multiple values are set. The function takes two parameters, <literal>loc</literal> the option path as a list of strings, and <literal>defs</literal> the list of defined values as a list. It is possible to override a type merge function for custom needs.
      </para>
     </listitem>
    </varlistentry>
@@ -570,12 +496,8 @@ nixThings = mkOption {
   <title>Custom Types</title>
 
   <para>
-   Custom types can be created with the <literal>mkOptionType</literal>
-   function. As type creation includes some more complex topics such as
-   submodule handling, it is recommended to get familiar with
-   <filename
-  xlink:href="https://github.com/NixOS/nixpkgs/blob/master/lib/types.nix">types.nix</filename>
-   code before creating a new type.
+   Custom types can be created with the <literal>mkOptionType</literal> function. As type creation includes some more complex topics such as submodule handling, it is recommended to get familiar with <filename
+  xlink:href="https://github.com/NixOS/nixpkgs/blob/master/lib/types.nix">types.nix</filename> code before creating a new type.
   </para>
 
   <para>
@@ -599,8 +521,7 @@ nixThings = mkOption {
     </term>
     <listitem>
      <para>
-      Description of the type used in documentation. Give information of the
-      type and any of its arguments.
+      Description of the type used in documentation. Give information of the type and any of its arguments.
      </para>
     </listitem>
    </varlistentry>
@@ -610,10 +531,7 @@ nixThings = mkOption {
     </term>
     <listitem>
      <para>
-      A function to type check the definition value. Takes the definition value
-      as a parameter and returns a boolean indicating the type check result,
-      <literal>true</literal> for success and <literal>false</literal> for
-      failure.
+      A function to type check the definition value. Takes the definition value as a parameter and returns a boolean indicating the type check result, <literal>true</literal> for success and <literal>false</literal> for failure.
      </para>
     </listitem>
    </varlistentry>
@@ -632,8 +550,7 @@ nixThings = mkOption {
        </term>
        <listitem>
         <para>
-         The option path as a list of strings, e.g. <literal>["boot" "loader
-         "grub" "enable"]</literal>.
+         The option path as a list of strings, e.g. <literal>["boot" "loader "grub" "enable"]</literal>.
         </para>
        </listitem>
       </varlistentry>
@@ -643,12 +560,7 @@ nixThings = mkOption {
        </term>
        <listitem>
         <para>
-         The list of sets of defined <literal>value</literal> and
-         <literal>file</literal> where the value was defined, e.g. <literal>[ {
-         file = "/foo.nix"; value = 1; } { file = "/bar.nix"; value = 2 }
-         ]</literal>. The <literal>merge</literal> function should return the
-         merged value or throw an error in case the values are impossible or
-         not meant to be merged.
+         The list of sets of defined <literal>value</literal> and <literal>file</literal> where the value was defined, e.g. <literal>[ { file = "/foo.nix"; value = 1; } { file = "/bar.nix"; value = 2 } ]</literal>. The <literal>merge</literal> function should return the merged value or throw an error in case the values are impossible or not meant to be merged.
         </para>
        </listitem>
       </varlistentry>
@@ -661,13 +573,7 @@ nixThings = mkOption {
     </term>
     <listitem>
      <para>
-      For composed types that can take a submodule as type parameter, this
-      function generate sub-options documentation. It takes the current option
-      prefix as a list and return the set of sub-options. Usually defined in a
-      recursive manner by adding a term to the prefix, e.g. <literal>prefix:
-      elemType.getSubOptions (prefix ++
-      [<replaceable>"prefix"</replaceable>])</literal> where
-      <replaceable>"prefix"</replaceable> is the newly added prefix.
+      For composed types that can take a submodule as type parameter, this function generate sub-options documentation. It takes the current option prefix as a list and return the set of sub-options. Usually defined in a recursive manner by adding a term to the prefix, e.g. <literal>prefix: elemType.getSubOptions (prefix ++ [<replaceable>"prefix"</replaceable>])</literal> where <replaceable>"prefix"</replaceable> is the newly added prefix.
      </para>
     </listitem>
    </varlistentry>
@@ -677,11 +583,7 @@ nixThings = mkOption {
     </term>
     <listitem>
      <para>
-      For composed types that can take a submodule as type parameter, this
-      function should return the type parameters submodules. If the type
-      parameter is called <literal>elemType</literal>, the function should just
-      recursively look into submodules by returning
-      <literal>elemType.getSubModules;</literal>.
+      For composed types that can take a submodule as type parameter, this function should return the type parameters submodules. If the type parameter is called <literal>elemType</literal>, the function should just recursively look into submodules by returning <literal>elemType.getSubModules;</literal>.
      </para>
     </listitem>
    </varlistentry>
@@ -691,14 +593,7 @@ nixThings = mkOption {
     </term>
     <listitem>
      <para>
-      For composed types that can take a submodule as type parameter, this
-      function can be used to substitute the parameter of a submodule type. It
-      takes a module as parameter and return the type with the submodule
-      options substituted. It is usually defined as a type function call with a
-      recursive call to <literal>substSubModules</literal>, e.g for a type
-      <literal>composedType</literal> that take an <literal>elemtype</literal>
-      type parameter, this function should be defined as <literal>m:
-      composedType (elemType.substSubModules m)</literal>.
+      For composed types that can take a submodule as type parameter, this function can be used to substitute the parameter of a submodule type. It takes a module as parameter and return the type with the submodule options substituted. It is usually defined as a type function call with a recursive call to <literal>substSubModules</literal>, e.g for a type <literal>composedType</literal> that take an <literal>elemtype</literal> type parameter, this function should be defined as <literal>m: composedType (elemType.substSubModules m)</literal>.
      </para>
     </listitem>
    </varlistentry>
@@ -708,9 +603,7 @@ nixThings = mkOption {
     </term>
     <listitem>
      <para>
-      A function to merge multiple type declarations. Takes the type to merge
-      <literal>functor</literal> as parameter. A <literal>null</literal> return
-      value means that type cannot be merged.
+      A function to merge multiple type declarations. Takes the type to merge <literal>functor</literal> as parameter. A <literal>null</literal> return value means that type cannot be merged.
      </para>
      <variablelist>
       <varlistentry>
@@ -725,8 +618,7 @@ nixThings = mkOption {
       </varlistentry>
      </variablelist>
      <para>
-      Note: There is a generic <literal>defaultTypeMerge</literal> that work
-      with most of value and composed types.
+      Note: There is a generic <literal>defaultTypeMerge</literal> that work with most of value and composed types.
      </para>
     </listitem>
    </varlistentry>
@@ -736,8 +628,7 @@ nixThings = mkOption {
     </term>
     <listitem>
      <para>
-      An attribute set representing the type. It is used for type operations
-      and has the following keys:
+      An attribute set representing the type. It is used for type operations and has the following keys:
      </para>
      <variablelist>
       <varlistentry>
@@ -766,10 +657,7 @@ nixThings = mkOption {
        </term>
        <listitem>
         <para>
-         Holds the value parameter for value types. The types that have a
-         <literal>payload</literal> are the <literal>enum</literal>,
-         <literal>separatedString</literal> and <literal>submodule</literal>
-         types.
+         Holds the value parameter for value types. The types that have a <literal>payload</literal> are the <literal>enum</literal>, <literal>separatedString</literal> and <literal>submodule</literal> types.
         </para>
        </listitem>
       </varlistentry>
@@ -779,9 +667,7 @@ nixThings = mkOption {
        </term>
        <listitem>
         <para>
-         A binary operation that can merge the payloads of two same types.
-         Defined as a function that take two payloads as parameters and return
-         the payloads merged.
+         A binary operation that can merge the payloads of two same types. Defined as a function that take two payloads as parameters and return the payloads merged.
         </para>
        </listitem>
       </varlistentry>
diff --git a/nixos/doc/manual/development/releases.xml b/nixos/doc/manual/development/releases.xml
index 1cdec64f69b..8cc4490ff54 100755
--- a/nixos/doc/manual/development/releases.xml
+++ b/nixos/doc/manual/development/releases.xml
@@ -17,15 +17,12 @@
    <itemizedlist spacing="compact">
     <listitem>
      <para>
-      Send an email to the nix-devel mailinglist as a warning about upcoming
-      beta "feature freeze" in a month.
+      Send an email to the nix-devel mailinglist as a warning about upcoming beta "feature freeze" in a month.
      </para>
     </listitem>
     <listitem>
      <para>
-      Discuss with Eelco Dolstra and the community (via IRC, ML) about what
-      will reach the deadline. Any issue or Pull Request targeting the release
-      should be included in the release milestone.
+      Discuss with Eelco Dolstra and the community (via IRC, ML) about what will reach the deadline. Any issue or Pull Request targeting the release should be included in the release milestone.
      </para>
     </listitem>
    </itemizedlist>
@@ -37,42 +34,32 @@
    <itemizedlist spacing="compact">
     <listitem>
      <para>
-      <link xlink:href="https://github.com/NixOS/nixpkgs/issues/13559">Create
-      an issue for tracking Zero Hydra Failures progress. ZHF is an effort to
-      get build failures down to zero.</link>
+      <link xlink:href="https://github.com/NixOS/nixpkgs/issues/13559">Create an issue for tracking Zero Hydra Failures progress. ZHF is an effort to get build failures down to zero.</link>
      </para>
     </listitem>
     <listitem>
      <para>
-      <literal>git tag -a -s -m &quot;Release 17.09-beta&quot; 17.09-beta
-      &amp;&amp; git push --tags</literal>
+      <literal>git tag -a -s -m &quot;Release 17.09-beta&quot; 17.09-beta &amp;&amp; git push --tags</literal>
      </para>
     </listitem>
     <listitem>
      <para>
-      From the master branch run <literal>git checkout -B
-      release-17.09</literal>.
+      From the master branch run <literal>git checkout -B release-17.09</literal>.
      </para>
     </listitem>
     <listitem>
      <para>
-      <link xlink:href="https://github.com/NixOS/nixos-org-configurations/pull/18">
-      Make sure a channel is created at http://nixos.org/channels/. </link>
+      <link xlink:href="https://github.com/NixOS/nixos-org-configurations/pull/18"> Make sure a channel is created at http://nixos.org/channels/. </link>
      </para>
     </listitem>
     <listitem>
      <para>
-      <link xlink:href="https://github.com/NixOS/nixpkgs/compare/bdf161ed8d21...6b63c4616790">
-      Bump the <literal>system.defaultChannel</literal> attribute in
-      <literal>nixos/modules/misc/version.nix</literal> </link>
+      <link xlink:href="https://github.com/NixOS/nixpkgs/compare/bdf161ed8d21...6b63c4616790"> Bump the <literal>system.defaultChannel</literal> attribute in <literal>nixos/modules/misc/version.nix</literal> </link>
      </para>
     </listitem>
     <listitem>
      <para>
-      <link xlink:href="https://github.com/NixOS/nixpkgs/commit/d6b08acd1ccac0d9d502c4b635e00b04d3387f06">
-      Update <literal>versionSuffix</literal> in
-      <literal>nixos/release.nix</literal></link>, use <literal>git log
-      --format=%an|wc -l</literal> to get the commit count
+      <link xlink:href="https://github.com/NixOS/nixpkgs/commit/d6b08acd1ccac0d9d502c4b635e00b04d3387f06"> Update <literal>versionSuffix</literal> in <literal>nixos/release.nix</literal></link>, use <literal>git log --format=%an|wc -l</literal> to get the commit count
      </para>
     </listitem>
     <listitem>
@@ -82,44 +69,32 @@
     </listitem>
     <listitem>
      <para>
-      <link xlink:href="https://github.com/NixOS/nixpkgs/commit/b8a4095003e27659092892a4708bb3698231a842">
-      Pick a new name for the unstable branch. </link>
+      <link xlink:href="https://github.com/NixOS/nixpkgs/commit/b8a4095003e27659092892a4708bb3698231a842"> Pick a new name for the unstable branch. </link>
      </para>
     </listitem>
     <listitem>
      <para>
-      Create a new release notes file for the upcoming release + 1, in this
-      case <literal>rl-1803.xml</literal>.
+      Create a new release notes file for the upcoming release + 1, in this case <literal>rl-1803.xml</literal>.
      </para>
     </listitem>
     <listitem>
      <para>
-      Create two Hydra jobsets: release-17.09 and release-17.09-small with
-      <literal>stableBranch</literal> set to false.
+      Create two Hydra jobsets: release-17.09 and release-17.09-small with <literal>stableBranch</literal> set to false.
      </para>
     </listitem>
     <listitem>
      <para>
-      Remove attributes that we know we will not be able to support,
-      especially if there is a stable alternative. E.g. Check that our
-      Linux kernels'
-      <link xlink:href="https://www.kernel.org/category/releases.html">
-      projected end-of-life</link> are after our release projected
-      end-of-life
+      Remove attributes that we know we will not be able to support, especially if there is a stable alternative. E.g. Check that our Linux kernels' <link xlink:href="https://www.kernel.org/category/releases.html"> projected end-of-life</link> are after our release projected end-of-life
      </para>
     </listitem>
     <listitem>
      <para>
-      Edit changelog at
-      <literal>nixos/doc/manual/release-notes/rl-1709.xml</literal> (double
-      check desktop versions are noted)
+      Edit changelog at <literal>nixos/doc/manual/release-notes/rl-1709.xml</literal> (double check desktop versions are noted)
      </para>
      <itemizedlist spacing="compact">
       <listitem>
        <para>
-        Get all new NixOS modules <literal>git diff
-        release-17.03..release-17.09 nixos/modules/module-list.nix|grep
-        ^+</literal>
+        Get all new NixOS modules <literal>git diff release-17.03..release-17.09 nixos/modules/module-list.nix|grep ^+</literal>
        </para>
       </listitem>
       <listitem>
@@ -138,8 +113,7 @@
    <itemizedlist spacing="compact">
     <listitem>
      <para>
-      Monitor the master branch for bugfixes and minor updates and cherry-pick
-      them to the release branch.
+      Monitor the master branch for bugfixes and minor updates and cherry-pick them to the release branch.
      </para>
     </listitem>
    </itemizedlist>
@@ -156,21 +130,17 @@
     </listitem>
     <listitem>
      <para>
-      Release Nix (currently only Eelco Dolstra can do that).
-      <link xlink:href="https://github.com/NixOS/nixpkgs/commit/53710c752a85f00658882531bc90a23a3d1287e4">
-      Make sure fallback is updated. </link>
+      Release Nix (currently only Eelco Dolstra can do that). <link xlink:href="https://github.com/NixOS/nixpkgs/commit/53710c752a85f00658882531bc90a23a3d1287e4"> Make sure fallback is updated. </link>
      </para>
     </listitem>
     <listitem>
      <para>
-      <link xlink:href="https://github.com/NixOS/nixpkgs/commit/40fd9ae3ac8048758abdcfc7d28a78b5f22fe97e">
-      Update README.md with new stable NixOS version information. </link>
+      <link xlink:href="https://github.com/NixOS/nixpkgs/commit/40fd9ae3ac8048758abdcfc7d28a78b5f22fe97e"> Update README.md with new stable NixOS version information. </link>
      </para>
     </listitem>
     <listitem>
      <para>
-      Change <literal>stableBranch</literal> to true and wait for channel to
-      update.
+      Change <literal>stableBranch</literal> to true and wait for channel to update.
      </para>
     </listitem>
    </itemizedlist>
@@ -187,34 +157,27 @@
     </listitem>
     <listitem>
      <para>
-      Update "Chapter 4. Upgrading NixOS" section of the manual to match 
-      new stable release version.
+      Update "Chapter 4. Upgrading NixOS" section of the manual to match new stable release version.
      </para>
     </listitem>
     <listitem>
      <para>
-      Update http://nixos.org/nixos/download.html and
-      http://nixos.org/nixos/manual in
-      https://github.com/NixOS/nixos-org-configurations
+      Update http://nixos.org/nixos/download.html and http://nixos.org/nixos/manual in https://github.com/NixOS/nixos-org-configurations
      </para>
     </listitem>
     <listitem>
      <para>
-      Get number of commits for the release: <literal>git log
-      release-14.04..release-14.12 --format=%an|wc -l</literal>
+      Get number of commits for the release: <literal>git log release-14.04..release-14.12 --format=%an|wc -l</literal>
      </para>
     </listitem>
     <listitem>
      <para>
-      Commits by contributor: <literal>git log release-14.04..release-14.12
-      --format=%an|sort|uniq -c|sort -rn</literal>
+      Commits by contributor: <literal>git log release-14.04..release-14.12 --format=%an|sort|uniq -c|sort -rn</literal>
      </para>
     </listitem>
     <listitem>
      <para>
-      Send an email to nix-dev to announce the release with above information.
-      Best to check how previous email was formulated to see what needs to be
-      included.
+      Send an email to nix-dev to announce the release with above information. Best to check how previous email was formulated to see what needs to be included.
      </para>
     </listitem>
    </itemizedlist>
@@ -222,26 +185,45 @@
  </section>
  <section xml:id="release-managers">
   <title>Release Management Team</title>
+
   <para>
-   For each release there are two release managers. After each release the
-   release manager having managed two releases steps down and the release
-   management team of the last release appoints a new release manager.
+   For each release there are two release managers. After each release the release manager having managed two releases steps down and the release management team of the last release appoints a new release manager.
   </para>
+
   <para>
-   This makes sure a release management team always consists of one release
-   manager who already has managed one release and one release manager being
-   introduced to their role, making it easier to pass on knowledge and
-   experience.
+   This makes sure a release management team always consists of one release manager who already has managed one release and one release manager being introduced to their role, making it easier to pass on knowledge and experience.
   </para>
+
   <para>
    A release manager's role and responsibilities are:
   </para>
+
   <itemizedlist>
-   <listitem><para>manage the release process</para></listitem>
-   <listitem><para>start discussions about features and changes for a given release</para></listitem>
-   <listitem><para>create a roadmap</para></listitem>
-   <listitem><para>release in cooperation with Eelco Dolstra</para></listitem>
-   <listitem><para>decide which bug fixes, features, etc... get backported after a release</para></listitem>
+   <listitem>
+    <para>
+     manage the release process
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     start discussions about features and changes for a given release
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     create a roadmap
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     release in cooperation with Eelco Dolstra
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     decide which bug fixes, features, etc... get backported after a release
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
  <section xml:id="release-schedule">
diff --git a/nixos/doc/manual/development/replace-modules.xml b/nixos/doc/manual/development/replace-modules.xml
index 7b103c36d90..9940143de8e 100644
--- a/nixos/doc/manual/development/replace-modules.xml
+++ b/nixos/doc/manual/development/replace-modules.xml
@@ -6,27 +6,15 @@
  <title>Replace Modules</title>
 
  <para>
-  Modules that are imported can also be disabled. The option declarations and
-  config implementation of a disabled module will be ignored, allowing another
-  to take it's place. This can be used to import a set of modules from another
-  channel while keeping the rest of the system on a stable release.
+  Modules that are imported can also be disabled. The option declarations and config implementation of a disabled module will be ignored, allowing another to take it's place. This can be used to import a set of modules from another channel while keeping the rest of the system on a stable release.
  </para>
 
  <para>
-  <literal>disabledModules</literal> is a top level attribute like
-  <literal>imports</literal>, <literal>options</literal> and
-  <literal>config</literal>. It contains a list of modules that will be
-  disabled. This can either be the full path to the module or a string with the
-  filename relative to the modules path (eg. &lt;nixpkgs/nixos/modules&gt; for
-  nixos).
+  <literal>disabledModules</literal> is a top level attribute like <literal>imports</literal>, <literal>options</literal> and <literal>config</literal>. It contains a list of modules that will be disabled. This can either be the full path to the module or a string with the filename relative to the modules path (eg. &lt;nixpkgs/nixos/modules&gt; for nixos).
  </para>
 
  <para>
-  This example will replace the existing postgresql module with the version
-  defined in the nixos-unstable channel while keeping the rest of the modules
-  and packages from the original nixos channel. This only overrides the module
-  definition, this won't use postgresql from nixos-unstable unless explicitly
-  configured to do so.
+  This example will replace the existing postgresql module with the version defined in the nixos-unstable channel while keeping the rest of the modules and packages from the original nixos channel. This only overrides the module definition, this won't use postgresql from nixos-unstable unless explicitly configured to do so.
  </para>
 
 <programlisting>
@@ -46,9 +34,7 @@
 </programlisting>
 
  <para>
-  This example shows how to define a custom module as a replacement for an
-  existing module. Importing this module will disable the original module
-  without having to know it's implementation details.
+  This example shows how to define a custom module as a replacement for an existing module. Importing this module will disable the original module without having to know it's implementation details.
  </para>
 
 <programlisting>
diff --git a/nixos/doc/manual/development/running-nixos-tests-interactively.xml b/nixos/doc/manual/development/running-nixos-tests-interactively.xml
index e390d62fde2..e4ded136ca6 100644
--- a/nixos/doc/manual/development/running-nixos-tests-interactively.xml
+++ b/nixos/doc/manual/development/running-nixos-tests-interactively.xml
@@ -6,8 +6,7 @@
  <title>Running Tests interactively</title>
 
  <para>
-  The test itself can be run interactively. This is particularly useful when
-  developing or debugging a test:
+  The test itself can be run interactively. This is particularly useful when developing or debugging a test:
 <screen>
 <prompt>$ </prompt>nix-build nixos/tests/login.nix -A driver
 <prompt>$ </prompt>./result/bin/nixos-test-driver
@@ -21,10 +20,7 @@ starting VDE switch for network 1
 <prompt>&gt;</prompt> $machine->succeed("touch /tmp/foo")
 <prompt>&gt;</prompt> print($machine->succeed("pwd")) # Show stdout of command
 </screen>
-  The function <command>testScript</command> executes the entire test script
-  and drops you back into the test driver command line upon its completion.
-  This allows you to inspect the state of the VMs after the test (e.g. to debug
-  the test script).
+  The function <command>testScript</command> executes the entire test script and drops you back into the test driver command line upon its completion. This allows you to inspect the state of the VMs after the test (e.g. to debug the test script).
  </para>
 
  <para>
@@ -33,12 +29,10 @@ starting VDE switch for network 1
 <prompt>$ </prompt>nix-build nixos/tests/login.nix -A driver
 <prompt>$ </prompt>./result/bin/nixos-run-vms
 </screen>
-  The script <command>nixos-run-vms</command> starts the virtual machines
-  defined by test.
+  The script <command>nixos-run-vms</command> starts the virtual machines defined by test.
  </para>
 
  <para>
-  The machine state is kept across VM restarts in
-  <filename>/tmp/vm-state-</filename><varname>machinename</varname>.
+  The machine state is kept across VM restarts in <filename>/tmp/vm-state-</filename><varname>machinename</varname>.
  </para>
 </section>
diff --git a/nixos/doc/manual/development/running-nixos-tests.xml b/nixos/doc/manual/development/running-nixos-tests.xml
index 13ae1ed9369..7d81be9b1c6 100644
--- a/nixos/doc/manual/development/running-nixos-tests.xml
+++ b/nixos/doc/manual/development/running-nixos-tests.xml
@@ -6,11 +6,8 @@
  <title>Running Tests</title>
 
  <para>
-  You can run tests using <command>nix-build</command>. For example, to run the
-  test
-  <filename
-xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/login.nix">login.nix</filename>,
-  you just do:
+  You can run tests using <command>nix-build</command>. For example, to run the test <filename
+xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/login.nix">login.nix</filename>, you just do:
 <screen>
 <prompt>$ </prompt>nix-build '&lt;nixpkgs/nixos/tests/login.nix>'
 </screen>
@@ -24,11 +21,7 @@ machine: QEMU running (pid 8841)
 …
 6 out of 6 tests succeeded
 </screen>
-  After building/downloading all required dependencies, this will perform a
-  build that starts a QEMU/KVM virtual machine containing a NixOS system. The
-  virtual machine mounts the Nix store of the host; this makes VM creation very
-  fast, as no disk image needs to be created. Afterwards, you can view a
-  pretty-printed log of the test:
+  After building/downloading all required dependencies, this will perform a build that starts a QEMU/KVM virtual machine containing a NixOS system. The virtual machine mounts the Nix store of the host; this makes VM creation very fast, as no disk image needs to be created. Afterwards, you can view a pretty-printed log of the test:
 <screen>
 <prompt>$ </prompt>firefox result/log.html
 </screen>
diff --git a/nixos/doc/manual/development/sources.xml b/nixos/doc/manual/development/sources.xml
index 3c30c782746..71441feb1ff 100644
--- a/nixos/doc/manual/development/sources.xml
+++ b/nixos/doc/manual/development/sources.xml
@@ -5,77 +5,47 @@
         xml:id="sec-getting-sources">
  <title>Getting the Sources</title>
  <para>
-  By default, NixOS’s <command>nixos-rebuild</command> command uses the NixOS
-  and Nixpkgs sources provided by the <literal>nixos</literal> channel (kept in
-  <filename>/nix/var/nix/profiles/per-user/root/channels/nixos</filename>). To
-  modify NixOS, however, you should check out the latest sources from Git. This
-  is as follows:
+  By default, NixOS’s <command>nixos-rebuild</command> command uses the NixOS and Nixpkgs sources provided by the <literal>nixos</literal> channel (kept in <filename>/nix/var/nix/profiles/per-user/root/channels/nixos</filename>). To modify NixOS, however, you should check out the latest sources from Git. This is as follows:
 <screen>
 <prompt>$ </prompt>git clone https://github.com/NixOS/nixpkgs
 <prompt>$ </prompt>cd nixpkgs
 <prompt>$ </prompt>git remote add channels https://github.com/NixOS/nixpkgs-channels
 <prompt>$ </prompt>git remote update channels
 </screen>
-  This will check out the latest Nixpkgs sources to
-  <filename>./nixpkgs</filename> the NixOS sources to
-  <filename>./nixpkgs/nixos</filename>. (The NixOS source tree lives in a
-  subdirectory of the Nixpkgs repository.) The remote
-  <literal>channels</literal> refers to a read-only repository that tracks the
-  Nixpkgs/NixOS channels (see <xref linkend="sec-upgrading"/> for more
-  information about channels). Thus, the Git branch
-  <literal>channels/nixos-17.03</literal> will contain the latest built and
-  tested version available in the <literal>nixos-17.03</literal> channel.
+  This will check out the latest Nixpkgs sources to <filename>./nixpkgs</filename> the NixOS sources to <filename>./nixpkgs/nixos</filename>. (The NixOS source tree lives in a subdirectory of the Nixpkgs repository.) The remote <literal>channels</literal> refers to a read-only repository that tracks the Nixpkgs/NixOS channels (see <xref linkend="sec-upgrading"/> for more information about channels). Thus, the Git branch <literal>channels/nixos-17.03</literal> will contain the latest built and tested version available in the <literal>nixos-17.03</literal> channel.
  </para>
  <para>
-  It’s often inconvenient to develop directly on the master branch, since if
-  somebody has just committed (say) a change to GCC, then the binary cache may
-  not have caught up yet and you’ll have to rebuild everything from source.
-  So you may want to create a local branch based on your current NixOS version:
+  It’s often inconvenient to develop directly on the master branch, since if somebody has just committed (say) a change to GCC, then the binary cache may not have caught up yet and you’ll have to rebuild everything from source. So you may want to create a local branch based on your current NixOS version:
 <screen>
 <prompt>$ </prompt>nixos-version
 17.09pre104379.6e0b727 (Hummingbird)
 
 <prompt>$ </prompt>git checkout -b local 6e0b727
 </screen>
-  Or, to base your local branch on the latest version available in a NixOS
-  channel:
+  Or, to base your local branch on the latest version available in a NixOS channel:
 <screen>
 <prompt>$ </prompt>git remote update channels
 <prompt>$ </prompt>git checkout -b local channels/nixos-17.03
 </screen>
-  (Replace <literal>nixos-17.03</literal> with the name of the channel you want
-  to use.) You can use <command>git merge</command> or <command>git
-  rebase</command> to keep your local branch in sync with the channel, e.g.
+  (Replace <literal>nixos-17.03</literal> with the name of the channel you want to use.) You can use <command>git merge</command> or <command>git rebase</command> to keep your local branch in sync with the channel, e.g.
 <screen>
 <prompt>$ </prompt>git remote update channels
 <prompt>$ </prompt>git merge channels/nixos-17.03
 </screen>
-  You can use <command>git cherry-pick</command> to copy commits from your
-  local branch to the upstream branch.
+  You can use <command>git cherry-pick</command> to copy commits from your local branch to the upstream branch.
  </para>
  <para>
-  If you want to rebuild your system using your (modified) sources, you need to
-  tell <command>nixos-rebuild</command> about them using the
-  <option>-I</option> flag:
+  If you want to rebuild your system using your (modified) sources, you need to tell <command>nixos-rebuild</command> about them using the <option>-I</option> flag:
 <screen>
 <prompt># </prompt>nixos-rebuild switch -I nixpkgs=<replaceable>/my/sources</replaceable>/nixpkgs
 </screen>
  </para>
  <para>
-  If you want <command>nix-env</command> to use the expressions in
-  <replaceable>/my/sources</replaceable>, use <command>nix-env -f
-  <replaceable>/my/sources</replaceable>/nixpkgs</command>, or change the
-  default by adding a symlink in <filename>~/.nix-defexpr</filename>:
+  If you want <command>nix-env</command> to use the expressions in <replaceable>/my/sources</replaceable>, use <command>nix-env -f <replaceable>/my/sources</replaceable>/nixpkgs</command>, or change the default by adding a symlink in <filename>~/.nix-defexpr</filename>:
 <screen>
 <prompt>$ </prompt>ln -s <replaceable>/my/sources</replaceable>/nixpkgs ~/.nix-defexpr/nixpkgs
 </screen>
-  You may want to delete the symlink
-  <filename>~/.nix-defexpr/channels_root</filename> to prevent root’s NixOS
-  channel from clashing with your own tree (this may break the
-  command-not-found utility though). If you want to go back to the default
-  state, you may just remove the <filename>~/.nix-defexpr</filename> directory
-  completely, log out and log in again and it should have been recreated with a
-  link to the root channels.
+  You may want to delete the symlink <filename>~/.nix-defexpr/channels_root</filename> to prevent root’s NixOS channel from clashing with your own tree (this may break the command-not-found utility though). If you want to go back to the default state, you may just remove the <filename>~/.nix-defexpr</filename> directory completely, log out and log in again and it should have been recreated with a link to the root channels.
  </para>
 <!-- FIXME: not sure what this means.
 <para>You should not pass the base directory
diff --git a/nixos/doc/manual/development/testing-installer.xml b/nixos/doc/manual/development/testing-installer.xml
index 902f995fbc1..e1185e0926a 100644
--- a/nixos/doc/manual/development/testing-installer.xml
+++ b/nixos/doc/manual/development/testing-installer.xml
@@ -5,15 +5,13 @@
         xml:id="ch-testing-installer">
  <title>Testing the Installer</title>
  <para>
-  Building, burning, and booting from an installation CD is rather tedious, so
-  here is a quick way to see if the installer works properly:
+  Building, burning, and booting from an installation CD is rather tedious, so here is a quick way to see if the installer works properly:
 <screen>
 <prompt># </prompt>mount -t tmpfs none /mnt
 <prompt># </prompt>nixos-generate-config --root /mnt
 <prompt>$ </prompt>nix-build '&lt;nixpkgs/nixos>' -A config.system.build.nixos-install
 <prompt># </prompt>./result/bin/nixos-install</screen>
-  To start a login shell in the new NixOS installation in
-  <filename>/mnt</filename>:
+  To start a login shell in the new NixOS installation in <filename>/mnt</filename>:
 <screen>
 <prompt>$ </prompt>nix-build '&lt;nixpkgs/nixos>' -A config.system.build.nixos-enter
 <prompt># </prompt>./result/bin/nixos-enter
diff --git a/nixos/doc/manual/development/writing-documentation.xml b/nixos/doc/manual/development/writing-documentation.xml
index 2183937ad0d..ffefa208f66 100644
--- a/nixos/doc/manual/development/writing-documentation.xml
+++ b/nixos/doc/manual/development/writing-documentation.xml
@@ -5,18 +5,13 @@
         xml:id="sec-writing-documentation">
  <title>Writing NixOS Documentation</title>
  <para>
-  As NixOS grows, so too does the need for a catalogue and explanation of its
-  extensive functionality. Collecting pertinent information from disparate
-  sources and presenting it in an accessible style would be a worthy
-  contribution to the project.
+  As NixOS grows, so too does the need for a catalogue and explanation of its extensive functionality. Collecting pertinent information from disparate sources and presenting it in an accessible style would be a worthy contribution to the project.
  </para>
  <section xml:id="sec-writing-docs-building-the-manual">
   <title>Building the Manual</title>
 
   <para>
-   The DocBook sources of the <xref linkend="book-nixos-manual"/> are in the
-   <link xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/doc/manual"><filename>nixos/doc/manual</filename></link>
-   subdirectory of the Nixpkgs repository.
+   The DocBook sources of the <xref linkend="book-nixos-manual"/> are in the <link xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/doc/manual"><filename>nixos/doc/manual</filename></link> subdirectory of the Nixpkgs repository.
   </para>
 
   <para>
@@ -29,59 +24,45 @@
 </screen>
 
   <para>
-   Once you are done making modifications to the manual, it's important to
-   build it before committing. You can do that as follows:
+   Once you are done making modifications to the manual, it's important to build it before committing. You can do that as follows:
   </para>
 
 <screen>nix-build nixos/release.nix -A manual.x86_64-linux</screen>
 
   <para>
-   When this command successfully finishes, it will tell you where the manual
-   got generated. The HTML will be accessible through the
-   <filename>result</filename> symlink at
-   <filename>./result/share/doc/nixos/index.html</filename>.
+   When this command successfully finishes, it will tell you where the manual got generated. The HTML will be accessible through the <filename>result</filename> symlink at <filename>./result/share/doc/nixos/index.html</filename>.
   </para>
  </section>
  <section xml:id="sec-writing-docs-editing-docbook-xml">
   <title>Editing DocBook XML</title>
 
   <para>
-   For general information on how to write in DocBook, see
-   <link xlink:href="http://www.docbook.org/tdg5/en/html/docbook.html"> DocBook
-   5: The Definitive Guide</link>.
+   For general information on how to write in DocBook, see <link xlink:href="http://www.docbook.org/tdg5/en/html/docbook.html"> DocBook 5: The Definitive Guide</link>.
   </para>
 
   <para>
-   Emacs nXML Mode is very helpful for editing DocBook XML because it validates
-   the document as you write, and precisely locates errors. To use it, see
-   <xref linkend="sec-emacs-docbook-xml"/>.
+   Emacs nXML Mode is very helpful for editing DocBook XML because it validates the document as you write, and precisely locates errors. To use it, see <xref linkend="sec-emacs-docbook-xml"/>.
   </para>
 
   <para>
-   <link xlink:href="http://pandoc.org">Pandoc</link> can generate DocBook XML
-   from a multitude of formats, which makes a good starting point.
+   <link xlink:href="http://pandoc.org">Pandoc</link> can generate DocBook XML from a multitude of formats, which makes a good starting point.
    <example xml:id="ex-pandoc-xml-conv">
     <title>Pandoc invocation to convert GitHub-Flavoured MarkDown to DocBook 5 XML</title>
 <screen>pandoc -f markdown_github -t docbook5 docs.md -o my-section.md</screen>
    </example>
-   Pandoc can also quickly convert a single <filename>section.xml</filename> to
-   HTML, which is helpful when drafting.
+   Pandoc can also quickly convert a single <filename>section.xml</filename> to HTML, which is helpful when drafting.
   </para>
 
   <para>
-   Sometimes writing valid DocBook is simply too difficult. In this case,
-   submit your documentation updates in a
-   <link
-  xlink:href="https://github.com/NixOS/nixpkgs/issues/new">GitHub
-   Issue</link> and someone will handle the conversion to XML for you.
+   Sometimes writing valid DocBook is simply too difficult. In this case, submit your documentation updates in a <link
+  xlink:href="https://github.com/NixOS/nixpkgs/issues/new">GitHub Issue</link> and someone will handle the conversion to XML for you.
   </para>
  </section>
  <section xml:id="sec-writing-docs-creating-a-topic">
   <title>Creating a Topic</title>
 
   <para>
-   You can use an existing topic as a basis for the new topic or create a topic
-   from scratch.
+   You can use an existing topic as a basis for the new topic or create a topic from scratch.
   </para>
 
   <para>
@@ -89,40 +70,27 @@
    <itemizedlist>
     <listitem>
      <para>
-      The NixOS
-      <link xlink:href="http://www.docbook.org/tdg5/en/html/book.html"><tag>book</tag></link>
-      element is in <filename>nixos/doc/manual/manual.xml</filename>. It
-      includes several
-      <link xlink:href="http://www.docbook.org/tdg5/en/html/book.html"><tag>part</tag>s</link>
-      which are in subdirectories.
+      The NixOS <link xlink:href="http://www.docbook.org/tdg5/en/html/book.html"><tag>book</tag></link> element is in <filename>nixos/doc/manual/manual.xml</filename>. It includes several <link xlink:href="http://www.docbook.org/tdg5/en/html/book.html"><tag>part</tag>s</link> which are in subdirectories.
      </para>
     </listitem>
     <listitem>
      <para>
-      Store the topic file in the same directory as the <tag>part</tag> to
-      which it belongs. If your topic is about configuring a NixOS module, then
-      the XML file can be stored alongside the module definition
-      <filename>nix</filename> file.
+      Store the topic file in the same directory as the <tag>part</tag> to which it belongs. If your topic is about configuring a NixOS module, then the XML file can be stored alongside the module definition <filename>nix</filename> file.
      </para>
     </listitem>
     <listitem>
      <para>
-      If you include multiple words in the file name, separate the words with a
-      dash. For example: <filename>ipv6-config.xml</filename>.
+      If you include multiple words in the file name, separate the words with a dash. For example: <filename>ipv6-config.xml</filename>.
      </para>
     </listitem>
     <listitem>
      <para>
-      Make sure that the <tag>xml:id</tag> value is unique. You can use
-      abbreviations if the ID is too long. For example:
-      <varname>nixos-config</varname>.
+      Make sure that the <tag>xml:id</tag> value is unique. You can use abbreviations if the ID is too long. For example: <varname>nixos-config</varname>.
      </para>
     </listitem>
     <listitem>
      <para>
-      Determine whether your topic is a chapter or a section. If you are
-      unsure, open an existing topic file and check whether the main element is
-      chapter or section.
+      Determine whether your topic is a chapter or a section. If you are unsure, open an existing topic file and check whether the main element is chapter or section.
      </para>
     </listitem>
    </itemizedlist>
@@ -132,17 +100,11 @@
   <title>Adding a Topic to the Book</title>
 
   <para>
-   Open the parent XML file and add an <varname>xi:include</varname> element to
-   the list of chapters with the file name of the topic that you created. If
-   you created a <tag>section</tag>, you add the file to the <tag>chapter</tag>
-   file. If you created a <tag>chapter</tag>, you add the file to the
-   <tag>part</tag> file.
+   Open the parent XML file and add an <varname>xi:include</varname> element to the list of chapters with the file name of the topic that you created. If you created a <tag>section</tag>, you add the file to the <tag>chapter</tag> file. If you created a <tag>chapter</tag>, you add the file to the <tag>part</tag> file.
   </para>
 
   <para>
-   If the topic is about configuring a NixOS module, it can be automatically
-   included in the manual by using the <varname>meta.doc</varname> attribute.
-   See <xref
+   If the topic is about configuring a NixOS module, it can be automatically included in the manual by using the <varname>meta.doc</varname> attribute. See <xref
   linkend="sec-meta-attributes"/> for an explanation.
   </para>
  </section>
diff --git a/nixos/doc/manual/development/writing-modules.xml b/nixos/doc/manual/development/writing-modules.xml
index bbf793bb0be..18088040bd6 100644
--- a/nixos/doc/manual/development/writing-modules.xml
+++ b/nixos/doc/manual/development/writing-modules.xml
@@ -5,49 +5,25 @@
         xml:id="sec-writing-modules">
  <title>Writing NixOS Modules</title>
  <para>
-  NixOS has a modular system for declarative configuration. This system
-  combines multiple <emphasis>modules</emphasis> to produce the full system
-  configuration. One of the modules that constitute the configuration is
-  <filename>/etc/nixos/configuration.nix</filename>. Most of the others live in
-  the
-  <link
-xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/modules"><filename>nixos/modules</filename></link>
-  subdirectory of the Nixpkgs tree.
+  NixOS has a modular system for declarative configuration. This system combines multiple <emphasis>modules</emphasis> to produce the full system configuration. One of the modules that constitute the configuration is <filename>/etc/nixos/configuration.nix</filename>. Most of the others live in the <link
+xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/modules"><filename>nixos/modules</filename></link> subdirectory of the Nixpkgs tree.
  </para>
  <para>
-  Each NixOS module is a file that handles one logical aspect of the
-  configuration, such as a specific kind of hardware, a service, or network
-  settings. A module configuration does not have to handle everything from
-  scratch; it can use the functionality provided by other modules for its
-  implementation. Thus a module can <emphasis>declare</emphasis> options that
-  can be used by other modules, and conversely can <emphasis>define</emphasis>
-  options provided by other modules in its own implementation. For example, the
-  module
-  <link
-xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/security/pam.nix"><filename>pam.nix</filename></link>
-  declares the option <option>security.pam.services</option> that allows other
-  modules (e.g.
-  <link
-xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/services/networking/ssh/sshd.nix"><filename>sshd.nix</filename></link>)
-  to define PAM services; and it defines the option
-  <option>environment.etc</option> (declared by
-  <link
-xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/system/etc/etc.nix"><filename>etc.nix</filename></link>)
-  to cause files to be created in <filename>/etc/pam.d</filename>.
+  Each NixOS module is a file that handles one logical aspect of the configuration, such as a specific kind of hardware, a service, or network settings. A module configuration does not have to handle everything from scratch; it can use the functionality provided by other modules for its implementation. Thus a module can <emphasis>declare</emphasis> options that can be used by other modules, and conversely can <emphasis>define</emphasis> options provided by other modules in its own implementation. For example, the module <link
+xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/security/pam.nix"><filename>pam.nix</filename></link> declares the option <option>security.pam.services</option> that allows other modules (e.g. <link
+xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/services/networking/ssh/sshd.nix"><filename>sshd.nix</filename></link>) to define PAM services; and it defines the option <option>environment.etc</option> (declared by <link
+xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/system/etc/etc.nix"><filename>etc.nix</filename></link>) to cause files to be created in <filename>/etc/pam.d</filename>.
  </para>
  <para xml:id="para-module-syn">
   In <xref
-linkend="sec-configuration-syntax"/>, we saw the following structure
-  of NixOS modules:
+linkend="sec-configuration-syntax"/>, we saw the following structure of NixOS modules:
 <programlisting>
 { config, pkgs, ... }:
 
 { <replaceable>option definitions</replaceable>
 }
 </programlisting>
-  This is actually an <emphasis>abbreviated</emphasis> form of module that only
-  defines options, but does not declare any. The structure of full NixOS
-  modules is shown in <xref linkend='ex-module-syntax' />.
+  This is actually an <emphasis>abbreviated</emphasis> form of module that only defines options, but does not declare any. The structure of full NixOS modules is shown in <xref linkend='ex-module-syntax' />.
  </para>
  <example xml:id='ex-module-syntax'>
   <title>Structure of NixOS Modules</title>
@@ -73,47 +49,28 @@ linkend="sec-configuration-syntax"/>, we saw the following structure
   <calloutlist>
    <callout arearefs='module-syntax-1'>
     <para>
-     This line makes the current Nix expression a function. The variable
-     <varname>pkgs</varname> contains Nixpkgs, while <varname>config</varname>
-     contains the full system configuration. This line can be omitted if there
-     is no reference to <varname>pkgs</varname> and <varname>config</varname>
-     inside the module.
+     This line makes the current Nix expression a function. The variable <varname>pkgs</varname> contains Nixpkgs, while <varname>config</varname> contains the full system configuration. This line can be omitted if there is no reference to <varname>pkgs</varname> and <varname>config</varname> inside the module.
     </para>
    </callout>
    <callout arearefs='module-syntax-2'>
     <para>
-     This list enumerates the paths to other NixOS modules that should be
-     included in the evaluation of the system configuration. A default set of
-     modules is defined in the file
-     <filename>modules/module-list.nix</filename>. These don't need to be added
-     in the import list.
+     This list enumerates the paths to other NixOS modules that should be included in the evaluation of the system configuration. A default set of modules is defined in the file <filename>modules/module-list.nix</filename>. These don't need to be added in the import list.
     </para>
    </callout>
    <callout arearefs='module-syntax-3'>
     <para>
-     The attribute <varname>options</varname> is a nested set of
-     <emphasis>option declarations</emphasis> (described below).
+     The attribute <varname>options</varname> is a nested set of <emphasis>option declarations</emphasis> (described below).
     </para>
    </callout>
    <callout arearefs='module-syntax-4'>
     <para>
-     The attribute <varname>config</varname> is a nested set of
-     <emphasis>option definitions</emphasis> (also described below).
+     The attribute <varname>config</varname> is a nested set of <emphasis>option definitions</emphasis> (also described below).
     </para>
    </callout>
   </calloutlist>
  </para>
  <para>
-  <xref linkend='locate-example' /> shows a module that handles the regular
-  update of the “locate” database, an index of all files in the file
-  system. This module declares two options that can be defined by other modules
-  (typically the user’s <filename>configuration.nix</filename>):
-  <option>services.locate.enable</option> (whether the database should be
-  updated) and <option>services.locate.interval</option> (when the update
-  should be done). It implements its functionality by defining two options
-  declared by other modules: <option>systemd.services</option> (the set of all
-  systemd services) and <option>systemd.timers</option> (the list of commands
-  to be executed periodically by <command>systemd</command>).
+  <xref linkend='locate-example' /> shows a module that handles the regular update of the “locate” database, an index of all files in the file system. This module declares two options that can be defined by other modules (typically the user’s <filename>configuration.nix</filename>): <option>services.locate.enable</option> (whether the database should be updated) and <option>services.locate.interval</option> (when the update should be done). It implements its functionality by defining two options declared by other modules: <option>systemd.services</option> (the set of all systemd services) and <option>systemd.timers</option> (the list of commands to be executed periodically by <command>systemd</command>).
  </para>
  <example xml:id='locate-example'>
   <title>NixOS Module for the “locate” Service</title>
diff --git a/nixos/doc/manual/development/writing-nixos-tests.xml b/nixos/doc/manual/development/writing-nixos-tests.xml
index 6be2d0a4d23..5df60e2ec82 100644
--- a/nixos/doc/manual/development/writing-nixos-tests.xml
+++ b/nixos/doc/manual/development/writing-nixos-tests.xml
@@ -31,22 +31,9 @@ import ./make-test.nix {
     '';
 }
 </programlisting>
-  The attribute <literal>testScript</literal> is a bit of Perl code that
-  executes the test (described below). During the test, it will start one or
-  more virtual machines, the configuration of which is described by the
-  attribute <literal>machine</literal> (if you need only one machine in your
-  test) or by the attribute <literal>nodes</literal> (if you need multiple
-  machines). For instance,
-  <filename
-xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/login.nix">login.nix</filename>
-  only needs a single machine to test whether users can log in on the virtual
-  console, whether device ownership is correctly maintained when switching
-  between consoles, and so on. On the other hand,
-  <filename
-xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/nfs.nix">nfs.nix</filename>,
-  which tests NFS client and server functionality in the Linux kernel
-  (including whether locks are maintained across server crashes), requires
-  three machines: a server and two clients.
+  The attribute <literal>testScript</literal> is a bit of Perl code that executes the test (described below). During the test, it will start one or more virtual machines, the configuration of which is described by the attribute <literal>machine</literal> (if you need only one machine in your test) or by the attribute <literal>nodes</literal> (if you need multiple machines). For instance, <filename
+xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/login.nix">login.nix</filename> only needs a single machine to test whether users can log in on the virtual console, whether device ownership is correctly maintained when switching between consoles, and so on. On the other hand, <filename
+xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/nfs.nix">nfs.nix</filename>, which tests NFS client and server functionality in the Linux kernel (including whether locks are maintained across server crashes), requires three machines: a server and two clients.
  </para>
 
  <para>
@@ -69,10 +56,8 @@ xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/nfs.nix">nf
     </term>
     <listitem>
      <para>
-      The virtual networks to which the VM is connected. See
-      <filename
-    xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/nat.nix">nat.nix</filename>
-      for an example.
+      The virtual networks to which the VM is connected. See <filename
+    xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/nat.nix">nat.nix</filename> for an example.
      </para>
     </listitem>
    </varlistentry>
@@ -82,38 +67,23 @@ xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/nfs.nix">nf
     </term>
     <listitem>
      <para>
-      By default, the Nix store in the VM is not writable. If you enable this
-      option, a writable union file system is mounted on top of the Nix store
-      to make it appear writable. This is necessary for tests that run Nix
-      operations that modify the store.
+      By default, the Nix store in the VM is not writable. If you enable this option, a writable union file system is mounted on top of the Nix store to make it appear writable. This is necessary for tests that run Nix operations that modify the store.
      </para>
     </listitem>
    </varlistentry>
   </variablelist>
-  For more options, see the module
-  <filename
+  For more options, see the module <filename
 xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/virtualisation/qemu-vm.nix">qemu-vm.nix</filename>.
  </para>
 
  <para>
-  The test script is a sequence of Perl statements that perform various
-  actions, such as starting VMs, executing commands in the VMs, and so on. Each
-  virtual machine is represented as an object stored in the variable
-  <literal>$<replaceable>name</replaceable></literal>, where
-  <replaceable>name</replaceable> is the identifier of the machine (which is
-  just <literal>machine</literal> if you didn’t specify multiple machines
-  using the <literal>nodes</literal> attribute). For instance, the following
-  starts the machine, waits until it has finished booting, then executes a
-  command and checks that the output is more-or-less correct:
+  The test script is a sequence of Perl statements that perform various actions, such as starting VMs, executing commands in the VMs, and so on. Each virtual machine is represented as an object stored in the variable <literal>$<replaceable>name</replaceable></literal>, where <replaceable>name</replaceable> is the identifier of the machine (which is just <literal>machine</literal> if you didn’t specify multiple machines using the <literal>nodes</literal> attribute). For instance, the following starts the machine, waits until it has finished booting, then executes a command and checks that the output is more-or-less correct:
 <programlisting>
 $machine->start;
 $machine->waitForUnit("default.target");
 $machine->succeed("uname") =~ /Linux/ or die;
 </programlisting>
-  The first line is actually unnecessary; machines are implicitly started when
-  you first execute an action on them (such as <literal>waitForUnit</literal>
-  or <literal>succeed</literal>). If you have multiple machines, you can speed
-  up the test by starting them in parallel:
+  The first line is actually unnecessary; machines are implicitly started when you first execute an action on them (such as <literal>waitForUnit</literal> or <literal>succeed</literal>). If you have multiple machines, you can speed up the test by starting them in parallel:
 <programlisting>
 startAll;
 </programlisting>
@@ -128,8 +98,7 @@ startAll;
     </term>
     <listitem>
      <para>
-      Start the virtual machine. This method is asynchronous — it does not
-      wait for the machine to finish booting.
+      Start the virtual machine. This method is asynchronous — it does not wait for the machine to finish booting.
      </para>
     </listitem>
    </varlistentry>
@@ -159,8 +128,7 @@ startAll;
     </term>
     <listitem>
      <para>
-      Simulate unplugging the Ethernet cable that connects the machine to the
-      other machines.
+      Simulate unplugging the Ethernet cable that connects the machine to the other machines.
      </para>
     </listitem>
    </varlistentry>
@@ -180,8 +148,7 @@ startAll;
     </term>
     <listitem>
      <para>
-      Take a picture of the display of the virtual machine, in PNG format. The
-      screenshot is linked from the HTML log.
+      Take a picture of the display of the virtual machine, in PNG format. The screenshot is linked from the HTML log.
      </para>
     </listitem>
    </varlistentry>
@@ -191,13 +158,11 @@ startAll;
     </term>
     <listitem>
      <para>
-      Return a textual representation of what is currently visible on the
-      machine's screen using optical character recognition.
+      Return a textual representation of what is currently visible on the machine's screen using optical character recognition.
      </para>
      <note>
       <para>
-       This requires passing <option>enableOCR</option> to the test attribute
-       set.
+       This requires passing <option>enableOCR</option> to the test attribute set.
       </para>
      </note>
     </listitem>
@@ -208,8 +173,7 @@ startAll;
     </term>
     <listitem>
      <para>
-      Send a command to the QEMU monitor. This is rarely used, but allows doing
-      stuff such as attaching virtual USB disks to a running machine.
+      Send a command to the QEMU monitor. This is rarely used, but allows doing stuff such as attaching virtual USB disks to a running machine.
      </para>
     </listitem>
    </varlistentry>
@@ -219,8 +183,7 @@ startAll;
     </term>
     <listitem>
      <para>
-      Simulate pressing keys on the virtual keyboard, e.g.,
-      <literal>sendKeys("ctrl-alt-delete")</literal>.
+      Simulate pressing keys on the virtual keyboard, e.g., <literal>sendKeys("ctrl-alt-delete")</literal>.
      </para>
     </listitem>
    </varlistentry>
@@ -230,9 +193,7 @@ startAll;
     </term>
     <listitem>
      <para>
-      Simulate typing a sequence of characters on the virtual keyboard, e.g.,
-      <literal>sendKeys("foobar\n")</literal> will type the string
-      <literal>foobar</literal> followed by the Enter key.
+      Simulate typing a sequence of characters on the virtual keyboard, e.g., <literal>sendKeys("foobar\n")</literal> will type the string <literal>foobar</literal> followed by the Enter key.
      </para>
     </listitem>
    </varlistentry>
@@ -242,9 +203,7 @@ startAll;
     </term>
     <listitem>
      <para>
-      Execute a shell command, returning a list
-      <literal>(<replaceable>status</replaceable>,
-      <replaceable>stdout</replaceable>)</literal>.
+      Execute a shell command, returning a list <literal>(<replaceable>status</replaceable>, <replaceable>stdout</replaceable>)</literal>.
      </para>
     </listitem>
    </varlistentry>
@@ -254,8 +213,7 @@ startAll;
     </term>
     <listitem>
      <para>
-      Execute a shell command, raising an exception if the exit status is not
-      zero, otherwise returning the standard output.
+      Execute a shell command, raising an exception if the exit status is not zero, otherwise returning the standard output.
      </para>
     </listitem>
    </varlistentry>
@@ -265,8 +223,7 @@ startAll;
     </term>
     <listitem>
      <para>
-      Like <methodname>succeed</methodname>, but raising an exception if the
-      command returns a zero status.
+      Like <methodname>succeed</methodname>, but raising an exception if the command returns a zero status.
      </para>
     </listitem>
    </varlistentry>
@@ -316,8 +273,7 @@ startAll;
     </term>
     <listitem>
      <para>
-      Wait until a process is listening on the given TCP port (on
-      <literal>localhost</literal>, at least).
+      Wait until a process is listening on the given TCP port (on <literal>localhost</literal>, at least).
      </para>
     </listitem>
    </varlistentry>
@@ -347,14 +303,11 @@ startAll;
     </term>
     <listitem>
      <para>
-      Wait until the supplied regular expressions matches the textual contents
-      of the screen by using optical character recognition (see
-      <methodname>getScreenText</methodname>).
+      Wait until the supplied regular expressions matches the textual contents of the screen by using optical character recognition (see <methodname>getScreenText</methodname>).
      </para>
      <note>
       <para>
-       This requires passing <option>enableOCR</option> to the test attribute
-       set.
+       This requires passing <option>enableOCR</option> to the test attribute set.
       </para>
      </note>
     </listitem>
@@ -365,8 +318,7 @@ startAll;
     </term>
     <listitem>
      <para>
-      Wait until an X11 window has appeared whose name matches the given
-      regular expression, e.g., <literal>waitForWindow(qr/Terminal/)</literal>.
+      Wait until an X11 window has appeared whose name matches the given regular expression, e.g., <literal>waitForWindow(qr/Terminal/)</literal>.
      </para>
     </listitem>
    </varlistentry>
@@ -376,13 +328,10 @@ startAll;
     </term>
     <listitem>
      <para>
-      Copies a file from host to machine, e.g.,
-      <literal>copyFileFromHost("myfile", "/etc/my/important/file")</literal>.
+      Copies a file from host to machine, e.g., <literal>copyFileFromHost("myfile", "/etc/my/important/file")</literal>.
      </para>
      <para>
-      The first argument is the file on the host. The file needs to be
-      accessible while building the nix derivation. The second argument is the
-      location of the file on the machine.
+      The first argument is the file on the host. The file needs to be accessible while building the nix derivation. The second argument is the location of the file on the machine.
      </para>
     </listitem>
    </varlistentry>
@@ -392,8 +341,7 @@ startAll;
     </term>
     <listitem>
      <para>
-      Runs <literal>systemctl</literal> commands with optional support for
-      <literal>systemctl --user</literal>
+      Runs <literal>systemctl</literal> commands with optional support for <literal>systemctl --user</literal>
      </para>
      <para>
 <programlisting>
@@ -407,15 +355,12 @@ $machine->systemctl("list-jobs --no-pager", "any-user"); // spawns a shell for `
  </para>
 
  <para>
-  To test user units declared by <literal>systemd.user.services</literal> the
-  optional <literal>$user</literal> argument can be used:
+  To test user units declared by <literal>systemd.user.services</literal> the optional <literal>$user</literal> argument can be used:
 <programlisting>
 $machine->start;
 $machine->waitForX;
 $machine->waitForUnit("xautolock.service", "x-session-user");
 </programlisting>
-  This applies to <literal>systemctl</literal>, <literal>getUnitInfo</literal>,
-  <literal>waitForUnit</literal>, <literal>startJob</literal> and
-  <literal>stopJob</literal>.
+  This applies to <literal>systemctl</literal>, <literal>getUnitInfo</literal>, <literal>waitForUnit</literal>, <literal>startJob</literal> and <literal>stopJob</literal>.
  </para>
 </section>
diff --git a/nixos/doc/manual/installation/changing-config.xml b/nixos/doc/manual/installation/changing-config.xml
index 48193d986ab..65b384dd596 100644
--- a/nixos/doc/manual/installation/changing-config.xml
+++ b/nixos/doc/manual/installation/changing-config.xml
@@ -4,28 +4,20 @@
          xml:id="sec-changing-config">
  <title>Changing the Configuration</title>
  <para>
-  The file <filename>/etc/nixos/configuration.nix</filename> contains the
-  current configuration of your machine. Whenever you’ve
-  <link linkend="ch-configuration">changed something</link> in that file, you
-  should do
+  The file <filename>/etc/nixos/configuration.nix</filename> contains the current configuration of your machine. Whenever you’ve <link linkend="ch-configuration">changed something</link> in that file, you should do
 <screen>
 <prompt># </prompt>nixos-rebuild switch
 </screen>
-  to build the new configuration, make it the default configuration for
-  booting, and try to realise the configuration in the running system (e.g., by
-  restarting system services).
+  to build the new configuration, make it the default configuration for booting, and try to realise the configuration in the running system (e.g., by restarting system services).
   <warning>
    <para>
-    This command doesn't start/stop <link linkend="opt-systemd.user.services">user
-    services</link> automatically. <command>nixos-rebuild</command> only runs a
-    <literal>daemon-reload</literal> for each user with running user services.
+    This command doesn't start/stop <link linkend="opt-systemd.user.services">user services</link> automatically. <command>nixos-rebuild</command> only runs a <literal>daemon-reload</literal> for each user with running user services.
    </para>
   </warning>
  </para>
  <warning>
   <para>
-   These commands must be executed as root, so you should either run them from
-   a root shell or by prefixing them with <literal>sudo -i</literal>.
+   These commands must be executed as root, so you should either run them from a root shell or by prefixing them with <literal>sudo -i</literal>.
   </para>
  </warning>
  <para>
@@ -33,63 +25,44 @@
 <screen>
 <prompt># </prompt>nixos-rebuild test
 </screen>
-  to build the configuration and switch the running system to it, but without
-  making it the boot default. So if (say) the configuration locks up your
-  machine, you can just reboot to get back to a working configuration.
+  to build the configuration and switch the running system to it, but without making it the boot default. So if (say) the configuration locks up your machine, you can just reboot to get back to a working configuration.
  </para>
  <para>
   There is also
 <screen>
 <prompt># </prompt>nixos-rebuild boot
 </screen>
-  to build the configuration and make it the boot default, but not switch to it
-  now (so it will only take effect after the next reboot).
+  to build the configuration and make it the boot default, but not switch to it now (so it will only take effect after the next reboot).
  </para>
  <para>
-  You can make your configuration show up in a different submenu of the GRUB 2
-  boot screen by giving it a different <emphasis>profile name</emphasis>, e.g.
+  You can make your configuration show up in a different submenu of the GRUB 2 boot screen by giving it a different <emphasis>profile name</emphasis>, e.g.
 <screen>
 <prompt># </prompt>nixos-rebuild switch -p test
 </screen>
-  which causes the new configuration (and previous ones created using
-  <literal>-p test</literal>) to show up in the GRUB submenu “NixOS - Profile
-  'test'”. This can be useful to separate test configurations from
-  “stable” configurations.
+  which causes the new configuration (and previous ones created using <literal>-p test</literal>) to show up in the GRUB submenu “NixOS - Profile 'test'”. This can be useful to separate test configurations from “stable” configurations.
  </para>
  <para>
   Finally, you can do
 <screen>
 <prompt>$ </prompt>nixos-rebuild build
 </screen>
-  to build the configuration but nothing more. This is useful to see whether
-  everything compiles cleanly.
+  to build the configuration but nothing more. This is useful to see whether everything compiles cleanly.
  </para>
  <para>
-  If you have a machine that supports hardware virtualisation, you can also
-  test the new configuration in a sandbox by building and running a QEMU
-  <emphasis>virtual machine</emphasis> that contains the desired configuration.
-  Just do
+  If you have a machine that supports hardware virtualisation, you can also test the new configuration in a sandbox by building and running a QEMU <emphasis>virtual machine</emphasis> that contains the desired configuration. Just do
 <screen>
 <prompt>$ </prompt>nixos-rebuild build-vm
 <prompt>$ </prompt>./result/bin/run-*-vm
 </screen>
-  The VM does not have any data from your host system, so your existing user
-  accounts and home directories will not be available unless you have set
-  <literal>mutableUsers = false</literal>. Another way is to temporarily add
-  the following to your configuration:
+  The VM does not have any data from your host system, so your existing user accounts and home directories will not be available unless you have set <literal>mutableUsers = false</literal>. Another way is to temporarily add the following to your configuration:
 <screen>
 <link linkend="opt-users.users._name__.initialHashedPassword">users.users.your-user.initialHashedPassword</link> = "test";
 </screen>
-  <emphasis>Important:</emphasis> delete the $hostname.qcow2 file if you have
-  started the virtual machine at least once without the right users, otherwise
-  the changes will not get picked up. You can forward ports on the host to the
-  guest. For instance, the following will forward host port 2222 to guest port
-  22 (SSH):
+  <emphasis>Important:</emphasis> delete the $hostname.qcow2 file if you have started the virtual machine at least once without the right users, otherwise the changes will not get picked up. You can forward ports on the host to the guest. For instance, the following will forward host port 2222 to guest port 22 (SSH):
 <screen>
 <prompt>$ </prompt>QEMU_NET_OPTS="hostfwd=tcp::2222-:22" ./result/bin/run-*-vm
 </screen>
-  allowing you to log in via SSH (assuming you have set the appropriate
-  passwords or SSH authorized keys):
+  allowing you to log in via SSH (assuming you have set the appropriate passwords or SSH authorized keys):
 <screen>
 <prompt>$ </prompt>ssh -p 2222 localhost
 </screen>
diff --git a/nixos/doc/manual/installation/installation.xml b/nixos/doc/manual/installation/installation.xml
index 2901f462dee..a9d2c74d115 100644
--- a/nixos/doc/manual/installation/installation.xml
+++ b/nixos/doc/manual/installation/installation.xml
@@ -6,8 +6,7 @@
  <title>Installation</title>
  <partintro xml:id="ch-installation-intro">
   <para>
-   This section describes how to obtain, install, and configure NixOS for
-   first-time use.
+   This section describes how to obtain, install, and configure NixOS for first-time use.
   </para>
  </partintro>
  <xi:include href="obtaining.xml" />
diff --git a/nixos/doc/manual/installation/installing-behind-a-proxy.xml b/nixos/doc/manual/installation/installing-behind-a-proxy.xml
index 8f9baff44b5..4f74f0b3029 100644
--- a/nixos/doc/manual/installation/installing-behind-a-proxy.xml
+++ b/nixos/doc/manual/installation/installing-behind-a-proxy.xml
@@ -6,16 +6,13 @@
  <title>Installing behind a proxy</title>
 
  <para>
-  To install NixOS behind a proxy, do the following before running
-  <literal>nixos-install</literal>.
+  To install NixOS behind a proxy, do the following before running <literal>nixos-install</literal>.
  </para>
 
  <orderedlist numeration="arabic">
   <listitem>
    <para>
-    Update proxy configuration in
-    <literal>/mnt/etc/nixos/configuration.nix</literal> to keep the internet
-    accessible after reboot.
+    Update proxy configuration in <literal>/mnt/etc/nixos/configuration.nix</literal> to keep the internet accessible after reboot.
    </para>
 <programlisting>
 networking.proxy.default = &quot;http://user:password@proxy:port/&quot;;
@@ -24,8 +21,7 @@ networking.proxy.noProxy = &quot;127.0.0.1,localhost,internal.domain&quot;;
   </listitem>
   <listitem>
    <para>
-    Setup the proxy environment variables in the shell where you are running
-    <literal>nixos-install</literal>.
+    Setup the proxy environment variables in the shell where you are running <literal>nixos-install</literal>.
    </para>
 <programlisting>
 # proxy_url=&quot;http://user:password@proxy:port/&quot;
@@ -39,10 +35,7 @@ networking.proxy.noProxy = &quot;127.0.0.1,localhost,internal.domain&quot;;
 
  <note>
   <para>
-   If you are switching networks with different proxy configurations, use the
-   <literal>nesting.clone</literal> option in
-   <literal>configuration.nix</literal> to switch proxies at runtime. Refer to
-   <xref linkend="ch-options" /> for more information.
+   If you are switching networks with different proxy configurations, use the <literal>nesting.clone</literal> option in <literal>configuration.nix</literal> to switch proxies at runtime. Refer to <xref linkend="ch-options" /> for more information.
   </para>
  </note>
 </section>
diff --git a/nixos/doc/manual/installation/installing-from-other-distro.xml b/nixos/doc/manual/installation/installing-from-other-distro.xml
index 8ed45899fd7..468757ed60b 100644
--- a/nixos/doc/manual/installation/installing-from-other-distro.xml
+++ b/nixos/doc/manual/installation/installing-from-other-distro.xml
@@ -8,28 +8,23 @@
  <title>Installing from another Linux distribution</title>
 
  <para>
-  Because Nix (the package manager) &amp; Nixpkgs (the Nix packages collection)
-  can both be installed on any (most?) Linux distributions, they can be used to
-  install NixOS in various creative ways. You can, for instance:
+  Because Nix (the package manager) &amp; Nixpkgs (the Nix packages collection) can both be installed on any (most?) Linux distributions, they can be used to install NixOS in various creative ways. You can, for instance:
  </para>
 
  <orderedlist>
   <listitem>
    <para>
-    Install NixOS on another partition, from your existing Linux distribution
-    (without the use of a USB or optical device!)
+    Install NixOS on another partition, from your existing Linux distribution (without the use of a USB or optical device!)
    </para>
   </listitem>
   <listitem>
    <para>
-    Install NixOS on the same partition (in place!), from your existing
-    non-NixOS Linux distribution using <literal>NIXOS_LUSTRATE</literal>.
+    Install NixOS on the same partition (in place!), from your existing non-NixOS Linux distribution using <literal>NIXOS_LUSTRATE</literal>.
    </para>
   </listitem>
   <listitem>
    <para>
-    Install NixOS on your hard drive from the Live CD of any Linux
-    distribution.
+    Install NixOS on your hard drive from the Live CD of any Linux distribution.
    </para>
   </listitem>
  </orderedlist>
@@ -50,10 +45,8 @@
 <prompt>$ </prompt>curl https://nixos.org/nix/install | sh
 <prompt>$ </prompt>. $HOME/.nix-profile/etc/profile.d/nix.sh # …or open a fresh shell</screen>
    <para>
-    More details in the
-    <link
-                    xlink:href="https://nixos.org/nix/manual/#chap-quick-start">
-    Nix manual</link>
+    More details in the <link
+                    xlink:href="https://nixos.org/nix/manual/#chap-quick-start"> Nix manual</link>
    </para>
   </listitem>
   <listitem>
@@ -61,21 +54,18 @@
     Switch to the NixOS channel:
    </para>
    <para>
-    If you've just installed Nix on a non-NixOS distribution, you will be on
-    the <literal>nixpkgs</literal> channel by default.
+    If you've just installed Nix on a non-NixOS distribution, you will be on the <literal>nixpkgs</literal> channel by default.
    </para>
 <screen>
 <prompt>$ </prompt>nix-channel --list
 nixpkgs https://nixos.org/channels/nixpkgs-unstable</screen>
    <para>
-    As that channel gets released without running the NixOS tests, it will be
-    safer to use the <literal>nixos-*</literal> channels instead:
+    As that channel gets released without running the NixOS tests, it will be safer to use the <literal>nixos-*</literal> channels instead:
    </para>
 <screen>
 <prompt>$ </prompt>nix-channel --add https://nixos.org/channels/nixos-<replaceable>version</replaceable> nixpkgs</screen>
    <para>
-    You may want to throw in a <literal>nix-channel --update</literal> for good
-    measure.
+    You may want to throw in a <literal>nix-channel --update</literal> for good measure.
    </para>
   </listitem>
   <listitem>
@@ -83,33 +73,24 @@ nixpkgs https://nixos.org/channels/nixpkgs-unstable</screen>
     Install the NixOS installation tools:
    </para>
    <para>
-    You'll need <literal>nixos-generate-config</literal> and
-    <literal>nixos-install</literal> and we'll throw in some man pages and
-    <literal>nixos-enter</literal> just in case you want to chroot into your
-    NixOS partition. They are installed by default on NixOS, but you don't have
-    NixOS yet..
+    You'll need <literal>nixos-generate-config</literal> and <literal>nixos-install</literal> and we'll throw in some man pages and <literal>nixos-enter</literal> just in case you want to chroot into your NixOS partition. They are installed by default on NixOS, but you don't have NixOS yet..
    </para>
 <screen><prompt>$ </prompt>nix-env -iE "_: with import &lt;nixpkgs/nixos&gt; { configuration = {}; }; with config.system.build; [ nixos-generate-config nixos-install nixos-enter manual.manpages ]"</screen>
   </listitem>
   <listitem>
    <note>
     <para>
-     The following 5 steps are only for installing NixOS to another partition.
-     For installing NixOS in place using <literal>NIXOS_LUSTRATE</literal>,
-     skip ahead.
+     The following 5 steps are only for installing NixOS to another partition. For installing NixOS in place using <literal>NIXOS_LUSTRATE</literal>, skip ahead.
     </para>
    </note>
    <para>
     Prepare your target partition:
    </para>
    <para>
-    At this point it is time to prepare your target partition. Please refer to
-    the partitioning, file-system creation, and mounting steps of
-    <xref linkend="sec-installation" />
+    At this point it is time to prepare your target partition. Please refer to the partitioning, file-system creation, and mounting steps of <xref linkend="sec-installation" />
    </para>
    <para>
-    If you're about to install NixOS in place using
-    <literal>NIXOS_LUSTRATE</literal> there is nothing to do for this step.
+    If you're about to install NixOS in place using <literal>NIXOS_LUSTRATE</literal> there is nothing to do for this step.
    </para>
   </listitem>
   <listitem>
@@ -118,17 +99,11 @@ nixpkgs https://nixos.org/channels/nixpkgs-unstable</screen>
    </para>
 <screen><prompt>$ </prompt>sudo `which nixos-generate-config` --root /mnt</screen>
    <para>
-    You'll probably want to edit the configuration files. Refer to the
-    <literal>nixos-generate-config</literal> step in
-    <xref
-                    linkend="sec-installation" /> for more
-    information.
+    You'll probably want to edit the configuration files. Refer to the <literal>nixos-generate-config</literal> step in <xref
+                    linkend="sec-installation" /> for more information.
    </para>
    <para>
-    Consider setting up the NixOS bootloader to give you the ability to boot on
-    your existing Linux partition. For instance, if you're using GRUB and your
-    existing distribution is running Ubuntu, you may want to add something like
-    this to your <literal>configuration.nix</literal>:
+    Consider setting up the NixOS bootloader to give you the ability to boot on your existing Linux partition. For instance, if you're using GRUB and your existing distribution is running Ubuntu, you may want to add something like this to your <literal>configuration.nix</literal>:
    </para>
 <programlisting>
 <xref linkend="opt-boot.loader.grub.extraEntries"/> = ''
@@ -138,14 +113,12 @@ nixpkgs https://nixos.org/channels/nixpkgs-unstable</screen>
   }
 '';</programlisting>
    <para>
-    (You can find the appropriate UUID for your partition in
-    <literal>/dev/disk/by-uuid</literal>)
+    (You can find the appropriate UUID for your partition in <literal>/dev/disk/by-uuid</literal>)
    </para>
   </listitem>
   <listitem>
    <para>
-    Create the <literal>nixbld</literal> group and user on your original
-    distribution:
+    Create the <literal>nixbld</literal> group and user on your original distribution:
    </para>
 <screen>
 <prompt>$ </prompt>sudo groupadd -g 30000 nixbld
@@ -157,14 +130,12 @@ nixpkgs https://nixos.org/channels/nixpkgs-unstable</screen>
    </para>
    <warning>
     <para>
-     Once you complete this step, you might no longer be able to boot on
-     existing systems without the help of a rescue USB drive or similar.
+     Once you complete this step, you might no longer be able to boot on existing systems without the help of a rescue USB drive or similar.
     </para>
    </warning>
 <screen><prompt>$ </prompt>sudo PATH="$PATH" NIX_PATH="$NIX_PATH" `which nixos-install` --root /mnt</screen>
    <para>
-    Again, please refer to the <literal>nixos-install</literal> step in
-    <xref linkend="sec-installation" /> for more information.
+    Again, please refer to the <literal>nixos-install</literal> step in <xref linkend="sec-installation" /> for more information.
    </para>
    <para>
     That should be it for installation to another partition!
@@ -178,16 +149,13 @@ nixpkgs https://nixos.org/channels/nixpkgs-unstable</screen>
 <prompt>$ </prompt>sudo userdel nixbld
 <prompt>$ </prompt>sudo groupdel nixbld</screen>
    <para>
-    If you do not wish to keep the Nix package manager installed either, run
-    something like <literal>sudo rm -rv ~/.nix-* /nix</literal> and remove the
-    line that the Nix installer added to your <literal>~/.profile</literal>.
+    If you do not wish to keep the Nix package manager installed either, run something like <literal>sudo rm -rv ~/.nix-* /nix</literal> and remove the line that the Nix installer added to your <literal>~/.profile</literal>.
    </para>
   </listitem>
   <listitem>
    <note>
     <para>
-     The following steps are only for installing NixOS in place using
-     <literal>NIXOS_LUSTRATE</literal>:
+     The following steps are only for installing NixOS in place using <literal>NIXOS_LUSTRATE</literal>:
     </para>
    </note>
    <para>
@@ -195,20 +163,11 @@ nixpkgs https://nixos.org/channels/nixpkgs-unstable</screen>
    </para>
 <screen><prompt>$ </prompt>sudo `which nixos-generate-config` --root /</screen>
    <para>
-    Note that this will place the generated configuration files in
-    <literal>/etc/nixos</literal>. You'll probably want to edit the
-    configuration files. Refer to the <literal>nixos-generate-config</literal>
-    step in <xref
-                    linkend="sec-installation" /> for more
-    information.
+    Note that this will place the generated configuration files in <literal>/etc/nixos</literal>. You'll probably want to edit the configuration files. Refer to the <literal>nixos-generate-config</literal> step in <xref
+                    linkend="sec-installation" /> for more information.
    </para>
    <para>
-    You'll likely want to set a root password for your first boot using the
-    configuration files because you won't have a chance to enter a password
-    until after you reboot. You can initalize the root password to an empty one
-    with this line: (and of course don't forget to set one once you've rebooted
-    or to lock the account with <literal>sudo passwd -l root</literal> if you
-    use <literal>sudo</literal>)
+    You'll likely want to set a root password for your first boot using the configuration files because you won't have a chance to enter a password until after you reboot. You can initalize the root password to an empty one with this line: (and of course don't forget to set one once you've rebooted or to lock the account with <literal>sudo passwd -l root</literal> if you use <literal>sudo</literal>)
    </para>
 <programlisting>
 <link linkend="opt-users.users._name__.initialHashedPassword">users.users.root.initialHashedPassword</link> = "";
@@ -216,34 +175,25 @@ nixpkgs https://nixos.org/channels/nixpkgs-unstable</screen>
   </listitem>
   <listitem>
    <para>
-    Build the NixOS closure and install it in the <literal>system</literal>
-    profile:
+    Build the NixOS closure and install it in the <literal>system</literal> profile:
    </para>
 <screen><prompt>$ </prompt>nix-env -p /nix/var/nix/profiles/system -f '&lt;nixpkgs/nixos&gt;' -I nixos-config=/etc/nixos/configuration.nix -iA system</screen>
   </listitem>
   <listitem>
    <para>
-    Change ownership of the <literal>/nix</literal> tree to root (since your
-    Nix install was probably single user):
+    Change ownership of the <literal>/nix</literal> tree to root (since your Nix install was probably single user):
    </para>
 <screen><prompt>$ </prompt>sudo chown -R 0.0 /nix</screen>
   </listitem>
   <listitem>
    <para>
-    Set up the <literal>/etc/NIXOS</literal> and
-    <literal>/etc/NIXOS_LUSTRATE</literal> files:
+    Set up the <literal>/etc/NIXOS</literal> and <literal>/etc/NIXOS_LUSTRATE</literal> files:
    </para>
    <para>
-    <literal>/etc/NIXOS</literal> officializes that this is now a NixOS
-    partition (the bootup scripts require its presence).
+    <literal>/etc/NIXOS</literal> officializes that this is now a NixOS partition (the bootup scripts require its presence).
    </para>
    <para>
-    <literal>/etc/NIXOS_LUSTRATE</literal> tells the NixOS bootup scripts to
-    move <emphasis>everything</emphasis> that's in the root partition to
-    <literal>/old-root</literal>. This will move your existing distribution out
-    of the way in the very early stages of the NixOS bootup. There are
-    exceptions (we do need to keep NixOS there after all), so the NixOS
-    lustrate process will not touch:
+    <literal>/etc/NIXOS_LUSTRATE</literal> tells the NixOS bootup scripts to move <emphasis>everything</emphasis> that's in the root partition to <literal>/old-root</literal>. This will move your existing distribution out of the way in the very early stages of the NixOS bootup. There are exceptions (we do need to keep NixOS there after all), so the NixOS lustrate process will not touch:
    </para>
    <itemizedlist>
     <listitem>
@@ -258,26 +208,19 @@ nixpkgs https://nixos.org/channels/nixpkgs-unstable</screen>
     </listitem>
     <listitem>
      <para>
-      Any file or directory listed in <literal>/etc/NIXOS_LUSTRATE</literal>
-      (one per line)
+      Any file or directory listed in <literal>/etc/NIXOS_LUSTRATE</literal> (one per line)
      </para>
     </listitem>
    </itemizedlist>
    <note>
     <para>
-     Support for <literal>NIXOS_LUSTRATE</literal> was added in NixOS 16.09.
-     The act of "lustrating" refers to the wiping of the existing distribution.
-     Creating <literal>/etc/NIXOS_LUSTRATE</literal> can also be used on NixOS
-     to remove all mutable files from your root partition (anything that's not
-     in <literal>/nix</literal> or <literal>/boot</literal> gets "lustrated" on
-     the next boot.
+     Support for <literal>NIXOS_LUSTRATE</literal> was added in NixOS 16.09. The act of "lustrating" refers to the wiping of the existing distribution. Creating <literal>/etc/NIXOS_LUSTRATE</literal> can also be used on NixOS to remove all mutable files from your root partition (anything that's not in <literal>/nix</literal> or <literal>/boot</literal> gets "lustrated" on the next boot.
     </para>
     <para>
      lustrate /ˈlʌstreɪt/ verb.
     </para>
     <para>
-     purify by expiatory sacrifice, ceremonial washing, or some other ritual
-     action.
+     purify by expiatory sacrifice, ceremonial washing, or some other ritual action.
     </para>
    </note>
    <para>
@@ -288,8 +231,7 @@ nixpkgs https://nixos.org/channels/nixpkgs-unstable</screen>
 <prompt>$ </prompt>sudo touch /etc/NIXOS_LUSTRATE
 </screen>
    <para>
-    Let's also make sure the NixOS configuration files are kept once we reboot
-    on NixOS:
+    Let's also make sure the NixOS configuration files are kept once we reboot on NixOS:
    </para>
 <screen>
 <prompt>$ </prompt>echo etc/nixos | sudo tee -a /etc/NIXOS_LUSTRATE
@@ -297,18 +239,11 @@ nixpkgs https://nixos.org/channels/nixpkgs-unstable</screen>
   </listitem>
   <listitem>
    <para>
-    Finally, move the <literal>/boot</literal> directory of your current
-    distribution out of the way (the lustrate process will take care of the
-    rest once you reboot, but this one must be moved out now because NixOS
-    needs to install its own boot files:
+    Finally, move the <literal>/boot</literal> directory of your current distribution out of the way (the lustrate process will take care of the rest once you reboot, but this one must be moved out now because NixOS needs to install its own boot files:
    </para>
    <warning>
     <para>
-     Once you complete this step, your current distribution will no longer be
-     bootable! If you didn't get all the NixOS configuration right, especially
-     those settings pertaining to boot loading and root partition, NixOS may
-     not be bootable either. Have a USB rescue device ready in case this
-     happens.
+     Once you complete this step, your current distribution will no longer be bootable! If you didn't get all the NixOS configuration right, especially those settings pertaining to boot loading and root partition, NixOS may not be bootable either. Have a USB rescue device ready in case this happens.
     </para>
    </warning>
 <screen>
@@ -321,8 +256,7 @@ sudo /nix/var/nix/profiles/system/bin/switch-to-configuration boot
   </listitem>
   <listitem>
    <para>
-    If for some reason you want to revert to the old distribution, you'll need
-    to boot on a USB rescue disk and do something along these lines:
+    If for some reason you want to revert to the old distribution, you'll need to boot on a USB rescue disk and do something along these lines:
    </para>
 <screen>
 # mkdir root
@@ -337,20 +271,14 @@ sudo /nix/var/nix/profiles/system/bin/switch-to-configuration boot
     This may work as is or you might also need to reinstall the boot loader
    </para>
    <para>
-    And of course, if you're happy with NixOS and no longer need the old
-    distribution:
+    And of course, if you're happy with NixOS and no longer need the old distribution:
    </para>
 <screen>sudo rm -rf /old-root</screen>
   </listitem>
   <listitem>
    <para>
-    It's also worth noting that this whole process can be automated. This is
-    especially useful for Cloud VMs, where provider do not provide NixOS. For
-    instance,
-    <link
-                    xlink:href="https://github.com/elitak/nixos-infect">nixos-infect</link>
-    uses the lustrate process to convert Digital Ocean droplets to NixOS from
-    other distributions automatically.
+    It's also worth noting that this whole process can be automated. This is especially useful for Cloud VMs, where provider do not provide NixOS. For instance, <link
+                    xlink:href="https://github.com/elitak/nixos-infect">nixos-infect</link> uses the lustrate process to convert Digital Ocean droplets to NixOS from other distributions automatically.
    </para>
   </listitem>
  </orderedlist>
diff --git a/nixos/doc/manual/installation/installing-pxe.xml b/nixos/doc/manual/installation/installing-pxe.xml
index 94199e5e028..5ca320b5bb1 100644
--- a/nixos/doc/manual/installation/installing-pxe.xml
+++ b/nixos/doc/manual/installation/installing-pxe.xml
@@ -10,9 +10,7 @@
  </para>
 
  <para>
-  These instructions assume that you have an existing PXE or iPXE
-  infrastructure and simply want to add the NixOS installer as another option.
-  To build the necessary files from a recent version of nixpkgs, you can run:
+  These instructions assume that you have an existing PXE or iPXE infrastructure and simply want to add the NixOS installer as another option. To build the necessary files from a recent version of nixpkgs, you can run:
  </para>
 
 <programlisting>
@@ -20,31 +18,18 @@ nix-build -A netboot nixos/release.nix
 </programlisting>
 
  <para>
-  This will create a <literal>result</literal> directory containing: *
-  <literal>bzImage</literal> – the Linux kernel * <literal>initrd</literal>
-  – the initrd file * <literal>netboot.ipxe</literal> – an example ipxe
-  script demonstrating the appropriate kernel command line arguments for this
-  image
+  This will create a <literal>result</literal> directory containing: * <literal>bzImage</literal> – the Linux kernel * <literal>initrd</literal> – the initrd file * <literal>netboot.ipxe</literal> – an example ipxe script demonstrating the appropriate kernel command line arguments for this image
  </para>
 
  <para>
-  If you’re using plain PXE, configure your boot loader to use the
-  <literal>bzImage</literal> and <literal>initrd</literal> files and have it
-  provide the same kernel command line arguments found in
-  <literal>netboot.ipxe</literal>.
+  If you’re using plain PXE, configure your boot loader to use the <literal>bzImage</literal> and <literal>initrd</literal> files and have it provide the same kernel command line arguments found in <literal>netboot.ipxe</literal>.
  </para>
 
  <para>
-  If you’re using iPXE, depending on how your HTTP/FTP/etc. server is
-  configured you may be able to use <literal>netboot.ipxe</literal> unmodified,
-  or you may need to update the paths to the files to match your server’s
-  directory layout
+  If you’re using iPXE, depending on how your HTTP/FTP/etc. server is configured you may be able to use <literal>netboot.ipxe</literal> unmodified, or you may need to update the paths to the files to match your server’s directory layout
  </para>
 
  <para>
-  In the future we may begin making these files available as build products
-  from hydra at which point we will update this documentation with instructions
-  on how to obtain them either for placing on a dedicated TFTP server or to
-  boot them directly over the internet.
+  In the future we may begin making these files available as build products from hydra at which point we will update this documentation with instructions on how to obtain them either for placing on a dedicated TFTP server or to boot them directly over the internet.
  </para>
 </section>
diff --git a/nixos/doc/manual/installation/installing-usb.xml b/nixos/doc/manual/installation/installing-usb.xml
index 83598635acc..99c61511a59 100644
--- a/nixos/doc/manual/installation/installing-usb.xml
+++ b/nixos/doc/manual/installation/installing-usb.xml
@@ -6,12 +6,7 @@
  <title>Booting from a USB Drive</title>
 
  <para>
-  For systems without CD drive, the NixOS live CD can be booted from a USB
-  stick. You can use the <command>dd</command> utility to write the image:
-  <command>dd if=<replaceable>path-to-image</replaceable>
-  of=<replaceable>/dev/sdX</replaceable></command>. Be careful about specifying
-  the correct drive; you can use the <command>lsblk</command> command to get a
-  list of block devices.
+  For systems without CD drive, the NixOS live CD can be booted from a USB stick. You can use the <command>dd</command> utility to write the image: <command>dd if=<replaceable>path-to-image</replaceable> of=<replaceable>/dev/sdX</replaceable></command>. Be careful about specifying the correct drive; you can use the <command>lsblk</command> command to get a list of block devices.
   <note>
    <title>On macOS</title>
    <para>
@@ -25,16 +20,12 @@
 Unmount of all volumes on diskN was successful
 <prompt>$ </prompt>sudo dd if=nix.iso of=/dev/rdiskN
 </screen>
-    Using the 'raw' <command>rdiskN</command> device instead of
-    <command>diskN</command> completes in minutes instead of hours. After
-    <command>dd</command> completes, a GUI dialog "The disk you inserted was
-    not readable by this computer" will pop up, which can be ignored.
+    Using the 'raw' <command>rdiskN</command> device instead of <command>diskN</command> completes in minutes instead of hours. After <command>dd</command> completes, a GUI dialog "The disk you inserted was not readable by this computer" will pop up, which can be ignored.
    </para>
   </note>
  </para>
 
  <para>
-  The <command>dd</command> utility will write the image verbatim to the drive,
-  making it the recommended option for both UEFI and non-UEFI installations.
+  The <command>dd</command> utility will write the image verbatim to the drive, making it the recommended option for both UEFI and non-UEFI installations.
  </para>
 </section>
diff --git a/nixos/doc/manual/installation/installing-virtualbox-guest.xml b/nixos/doc/manual/installation/installing-virtualbox-guest.xml
index 5c86eacfbf4..f75a1cf0a9c 100644
--- a/nixos/doc/manual/installation/installing-virtualbox-guest.xml
+++ b/nixos/doc/manual/installation/installing-virtualbox-guest.xml
@@ -6,13 +6,8 @@
  <title>Installing in a VirtualBox guest</title>
 
  <para>
-  Installing NixOS into a VirtualBox guest is convenient for users who want to
-  try NixOS without installing it on bare metal. If you want to use a pre-made
-  VirtualBox appliance, it is available at
-  <link
-  xlink:href="https://nixos.org/nixos/download.html">the downloads
-  page</link>. If you want to set up a VirtualBox guest manually, follow these
-  instructions:
+  Installing NixOS into a VirtualBox guest is convenient for users who want to try NixOS without installing it on bare metal. If you want to use a pre-made VirtualBox appliance, it is available at <link
+  xlink:href="https://nixos.org/nixos/download.html">the downloads page</link>. If you want to set up a VirtualBox guest manually, follow these instructions:
  </para>
 
  <orderedlist>
@@ -43,21 +38,18 @@
   </listitem>
   <listitem>
    <para>
-    Click on Settings / System / Acceleration and enable "VT-x/AMD-V"
-    acceleration
+    Click on Settings / System / Acceleration and enable "VT-x/AMD-V" acceleration
    </para>
   </listitem>
   <listitem>
    <para>
-    Save the settings, start the virtual machine, and continue installation
-    like normal
+    Save the settings, start the virtual machine, and continue installation like normal
    </para>
   </listitem>
  </orderedlist>
 
  <para>
-  There are a few modifications you should make in configuration.nix. Enable
-  booting:
+  There are a few modifications you should make in configuration.nix. Enable booting:
  </para>
 
 <programlisting>
@@ -65,8 +57,7 @@
 </programlisting>
 
  <para>
-  Also remove the fsck that runs at startup. It will always fail to run,
-  stopping your boot until you press <literal>*</literal>.
+  Also remove the fsck that runs at startup. It will always fail to run, stopping your boot until you press <literal>*</literal>.
  </para>
 
 <programlisting>
@@ -74,13 +65,7 @@
 </programlisting>
 
  <para>
-  Shared folders can be given a name and a path in the host system in the
-  VirtualBox settings (Machine / Settings / Shared Folders, then click on the
-  "Add" icon). Add the following to the
-  <literal>/etc/nixos/configuration.nix</literal> to auto-mount them. If you do
-  not add <literal>"nofail"</literal>, the system will no boot properly. The
-  same goes for disabling <literal>rngd</literal> which is normally used to get
-  randomness but this does not work in virtual machines.
+  Shared folders can be given a name and a path in the host system in the VirtualBox settings (Machine / Settings / Shared Folders, then click on the "Add" icon). Add the following to the <literal>/etc/nixos/configuration.nix</literal> to auto-mount them. If you do not add <literal>"nofail"</literal>, the system will no boot properly. The same goes for disabling <literal>rngd</literal> which is normally used to get randomness but this does not work in virtual machines.
  </para>
 
 <programlisting>
diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml
index f1e1568c034..8049450c684 100644
--- a/nixos/doc/manual/installation/installing.xml
+++ b/nixos/doc/manual/installation/installing.xml
@@ -8,67 +8,46 @@
   <title>Booting the system</title>
 
   <para>
-   NixOS can be installed on BIOS or UEFI systems. The procedure for a UEFI
-   installation is by and large the same as a BIOS installation. The
-   differences are mentioned in the steps that follow.
+   NixOS can be installed on BIOS or UEFI systems. The procedure for a UEFI installation is by and large the same as a BIOS installation. The differences are mentioned in the steps that follow.
   </para>
 
   <para>
-   The installation media can be burned to a CD, or now more commonly, "burned"
-   to a USB drive (see <xref linkend="sec-booting-from-usb"/>).
+   The installation media can be burned to a CD, or now more commonly, "burned" to a USB drive (see <xref linkend="sec-booting-from-usb"/>).
   </para>
 
   <para>
-   The installation media contains a basic NixOS installation. When it’s
-   finished booting, it should have detected most of your hardware.
+   The installation media contains a basic NixOS installation. When it’s finished booting, it should have detected most of your hardware.
   </para>
 
   <para>
-   The NixOS manual is available on virtual console 8 (press Alt+F8 to access)
-   or by running <command>nixos-help</command>.
+   The NixOS manual is available on virtual console 8 (press Alt+F8 to access) or by running <command>nixos-help</command>.
   </para>
 
   <para>
-   You are logged-in automatically as <literal>nixos</literal>.
-   The <literal>nixos</literal> user account has an empty password so you
-   can use <command>sudo</command> without a password.
+   You are logged-in automatically as <literal>nixos</literal>. The <literal>nixos</literal> user account has an empty password so you can use <command>sudo</command> without a password.
   </para>
 
   <para>
-   If you downloaded the graphical ISO image, you can run <command>systemctl
-   start display-manager</command> to start the desktop environment. If you want to continue on the
-   terminal, you can use <command>loadkeys</command> to switch to your
-   preferred keyboard layout. (We even provide neo2 via <command>loadkeys de
-   neo</command>!)
+   If you downloaded the graphical ISO image, you can run <command>systemctl start display-manager</command> to start the desktop environment. If you want to continue on the terminal, you can use <command>loadkeys</command> to switch to your preferred keyboard layout. (We even provide neo2 via <command>loadkeys de neo</command>!)
   </para>
 
   <section xml:id="sec-installation-booting-networking">
    <title>Networking in the installer</title>
 
    <para>
-    The boot process should have brought up networking (check <command>ip
-    a</command>). Networking is necessary for the installer, since it will
-    download lots of stuff (such as source tarballs or Nixpkgs channel
-    binaries). It’s best if you have a DHCP server on your network. Otherwise
-    configure networking manually using <command>ifconfig</command>.
+    The boot process should have brought up networking (check <command>ip a</command>). Networking is necessary for the installer, since it will download lots of stuff (such as source tarballs or Nixpkgs channel binaries). It’s best if you have a DHCP server on your network. Otherwise configure networking manually using <command>ifconfig</command>.
    </para>
 
    <para>
-    To manually configure the network on the graphical installer, first disable
-    network-manager with <command>systemctl stop NetworkManager</command>.
+    To manually configure the network on the graphical installer, first disable network-manager with <command>systemctl stop NetworkManager</command>.
    </para>
 
    <para>
-    To manually configure the wifi on the minimal installer, run
-    <command>wpa_supplicant -B -i interface -c &lt;(wpa_passphrase 'SSID'
-    'key')</command>.
+    To manually configure the wifi on the minimal installer, run <command>wpa_supplicant -B -i interface -c &lt;(wpa_passphrase 'SSID' 'key')</command>.
    </para>
 
    <para>
-    If you would like to continue the installation from a different machine you
-    need to activate the SSH daemon via <command>systemctl start
-    sshd</command>. You then must set a password for either <literal>root</literal> or
-    <literal>nixos</literal> with <command>passwd></command> to be able to login.
+    If you would like to continue the installation from a different machine you need to activate the SSH daemon via <command>systemctl start sshd</command>. You then must set a password for either <literal>root</literal> or <literal>nixos</literal> with <command>passwd></command> to be able to login.
    </para>
   </section>
  </section>
@@ -76,32 +55,25 @@
   <title>Partitioning and formatting</title>
 
   <para>
-   The NixOS installer doesn’t do any partitioning or formatting, so you need
-   to do that yourself.
+   The NixOS installer doesn’t do any partitioning or formatting, so you need to do that yourself.
   </para>
 
   <para>
-   The NixOS installer ships with multiple partitioning tools. The examples
-   below use <command>parted</command>, but also provides
-   <command>fdisk</command>, <command>gdisk</command>,
-   <command>cfdisk</command>, and <command>cgdisk</command>.
+   The NixOS installer ships with multiple partitioning tools. The examples below use <command>parted</command>, but also provides <command>fdisk</command>, <command>gdisk</command>, <command>cfdisk</command>, and <command>cgdisk</command>.
   </para>
 
   <para>
-   The recommended partition scheme differs depending if the computer uses
-   <emphasis>Legacy Boot</emphasis> or <emphasis>UEFI</emphasis>.
+   The recommended partition scheme differs depending if the computer uses <emphasis>Legacy Boot</emphasis> or <emphasis>UEFI</emphasis>.
   </para>
 
   <section xml:id="sec-installation-partitioning-UEFI">
    <title>UEFI (GPT)</title>
 
    <para>
-    Here's an example partition scheme for UEFI, using
-    <filename>/dev/sda</filename> as the device.
+    Here's an example partition scheme for UEFI, using <filename>/dev/sda</filename> as the device.
     <note>
      <para>
-      You can safely ignore <command>parted</command>'s informational message
-      about needing to update /etc/fstab.
+      You can safely ignore <command>parted</command>'s informational message about needing to update /etc/fstab.
      </para>
     </note>
    </para>
@@ -116,31 +88,24 @@
      </listitem>
      <listitem>
       <para>
-       Add the <emphasis>root</emphasis> partition. This will fill the disk
-       except for the end part, where the swap will live, and the space left in
-       front (512MiB) which will be used by the boot partition.
+       Add the <emphasis>root</emphasis> partition. This will fill the disk except for the end part, where the swap will live, and the space left in front (512MiB) which will be used by the boot partition.
 <screen language="commands"><prompt># </prompt>parted /dev/sda -- mkpart primary 512MiB -8GiB</screen>
       </para>
      </listitem>
      <listitem>
       <para>
-       Next, add a <emphasis>swap</emphasis> partition. The size required will
-       vary according to needs, here a 8GiB one is created.
+       Next, add a <emphasis>swap</emphasis> partition. The size required will vary according to needs, here a 8GiB one is created.
 <screen language="commands"><prompt># </prompt>parted /dev/sda -- mkpart primary linux-swap -8GiB 100%</screen>
        <note>
         <para>
-         The swap partition size rules are no different than for other Linux
-         distributions.
+         The swap partition size rules are no different than for other Linux distributions.
         </para>
        </note>
       </para>
      </listitem>
      <listitem>
       <para>
-       Finally, the <emphasis>boot</emphasis> partition. NixOS by default uses
-       the ESP (EFI system partition) as its <emphasis>/boot</emphasis>
-       partition. It uses the initially reserved 512MiB at the start of the
-       disk.
+       Finally, the <emphasis>boot</emphasis> partition. NixOS by default uses the ESP (EFI system partition) as its <emphasis>/boot</emphasis> partition. It uses the initially reserved 512MiB at the start of the disk.
 <screen language="commands"><prompt># </prompt>parted /dev/sda -- mkpart ESP fat32 1MiB 512MiB
 <prompt># </prompt>parted /dev/sda -- set 3 boot on</screen>
       </para>
@@ -149,8 +114,7 @@
    </para>
 
    <para>
-    Once complete, you can follow with
-    <xref linkend="sec-installation-partitioning-formatting"/>.
+    Once complete, you can follow with <xref linkend="sec-installation-partitioning-formatting"/>.
    </para>
   </section>
 
@@ -158,12 +122,10 @@
    <title>Legacy Boot (MBR)</title>
 
    <para>
-    Here's an example partition scheme for Legacy Boot, using
-    <filename>/dev/sda</filename> as the device.
+    Here's an example partition scheme for Legacy Boot, using <filename>/dev/sda</filename> as the device.
     <note>
      <para>
-      You can safely ignore <command>parted</command>'s informational message
-      about needing to update /etc/fstab.
+      You can safely ignore <command>parted</command>'s informational message about needing to update /etc/fstab.
      </para>
     </note>
    </para>
@@ -178,20 +140,17 @@
      </listitem>
      <listitem>
       <para>
-       Add the <emphasis>root</emphasis> partition. This will fill the the disk
-       except for the end part, where the swap will live.
+       Add the <emphasis>root</emphasis> partition. This will fill the the disk except for the end part, where the swap will live.
 <screen language="commands"><prompt># </prompt>parted /dev/sda -- mkpart primary 1MiB -8GiB</screen>
       </para>
      </listitem>
      <listitem>
       <para>
-       Finally, add a <emphasis>swap</emphasis> partition. The size required
-       will vary according to needs, here a 8GiB one is created.
+       Finally, add a <emphasis>swap</emphasis> partition. The size required will vary according to needs, here a 8GiB one is created.
 <screen language="commands"><prompt># </prompt>parted /dev/sda -- mkpart primary linux-swap -8GiB 100%</screen>
        <note>
         <para>
-         The swap partition size rules are no different than for other Linux
-         distributions.
+         The swap partition size rules are no different than for other Linux distributions.
         </para>
        </note>
       </para>
@@ -200,8 +159,7 @@
    </para>
 
    <para>
-    Once complete, you can follow with
-    <xref linkend="sec-installation-partitioning-formatting"/>.
+    Once complete, you can follow with <xref linkend="sec-installation-partitioning-formatting"/>.
    </para>
   </section>
 
@@ -213,20 +171,14 @@
     <itemizedlist>
      <listitem>
       <para>
-       For initialising Ext4 partitions: <command>mkfs.ext4</command>. It is
-       recommended that you assign a unique symbolic label to the file system
-       using the option <option>-L <replaceable>label</replaceable></option>,
-       since this makes the file system configuration independent from device
-       changes. For example:
+       For initialising Ext4 partitions: <command>mkfs.ext4</command>. It is recommended that you assign a unique symbolic label to the file system using the option <option>-L <replaceable>label</replaceable></option>, since this makes the file system configuration independent from device changes. For example:
 <screen>
 <prompt># </prompt>mkfs.ext4 -L nixos /dev/sda1</screen>
       </para>
      </listitem>
      <listitem>
       <para>
-       For creating swap partitions: <command>mkswap</command>. Again it’s
-       recommended to assign a label to the swap partition: <option>-L
-       <replaceable>label</replaceable></option>. For example:
+       For creating swap partitions: <command>mkswap</command>. Again it’s recommended to assign a label to the swap partition: <option>-L <replaceable>label</replaceable></option>. For example:
 <screen>
 <prompt># </prompt>mkswap -L swap /dev/sda2</screen>
       </para>
@@ -239,9 +191,7 @@
         </term>
         <listitem>
          <para>
-          For creating boot partitions: <command>mkfs.fat</command>. Again
-          it’s recommended to assign a label to the boot partition:
-          <option>-n <replaceable>label</replaceable></option>. For example:
+          For creating boot partitions: <command>mkfs.fat</command>. Again it’s recommended to assign a label to the boot partition: <option>-n <replaceable>label</replaceable></option>. For example:
 <screen>
 <prompt># </prompt>mkfs.fat -F 32 -n boot /dev/sda3</screen>
          </para>
@@ -251,9 +201,7 @@
      </listitem>
      <listitem>
       <para>
-       For creating LVM volumes, the LVM commands, e.g.,
-       <command>pvcreate</command>, <command>vgcreate</command>, and
-       <command>lvcreate</command>.
+       For creating LVM volumes, the LVM commands, e.g., <command>pvcreate</command>, <command>vgcreate</command>, and <command>lvcreate</command>.
       </para>
      </listitem>
      <listitem>
@@ -271,8 +219,7 @@
   <orderedlist>
    <listitem>
     <para>
-     Mount the target file system on which NixOS should be installed on
-     <filename>/mnt</filename>, e.g.
+     Mount the target file system on which NixOS should be installed on <filename>/mnt</filename>, e.g.
 <screen>
 <prompt># </prompt>mount /dev/disk/by-label/nixos /mnt
 </screen>
@@ -298,44 +245,26 @@
    </listitem>
    <listitem>
     <para>
-     If your machine has a limited amount of memory, you may want to activate
-     swap devices now (<command>swapon
-     <replaceable>device</replaceable></command>). The installer (or rather,
-     the build actions that it may spawn) may need quite a bit of RAM,
-     depending on your configuration.
+     If your machine has a limited amount of memory, you may want to activate swap devices now (<command>swapon <replaceable>device</replaceable></command>). The installer (or rather, the build actions that it may spawn) may need quite a bit of RAM, depending on your configuration.
 <screen>
 <prompt># </prompt>swapon /dev/sda2</screen>
     </para>
    </listitem>
    <listitem>
     <para>
-     You now need to create a file
-     <filename>/mnt/etc/nixos/configuration.nix</filename> that specifies the
-     intended configuration of the system. This is because NixOS has a
-     <emphasis>declarative</emphasis> configuration model: you create or edit a
-     description of the desired configuration of your system, and then NixOS
-     takes care of making it happen. The syntax of the NixOS configuration file
-     is described in <xref linkend="sec-configuration-syntax"/>, while a list
-     of available configuration options appears in
-     <xref
-    linkend="ch-options"/>. A minimal example is shown in
-     <xref
+     You now need to create a file <filename>/mnt/etc/nixos/configuration.nix</filename> that specifies the intended configuration of the system. This is because NixOS has a <emphasis>declarative</emphasis> configuration model: you create or edit a description of the desired configuration of your system, and then NixOS takes care of making it happen. The syntax of the NixOS configuration file is described in <xref linkend="sec-configuration-syntax"/>, while a list of available configuration options appears in <xref
+    linkend="ch-options"/>. A minimal example is shown in <xref
     linkend="ex-config"/>.
     </para>
     <para>
-     The command <command>nixos-generate-config</command> can generate an
-     initial configuration file for you:
+     The command <command>nixos-generate-config</command> can generate an initial configuration file for you:
 <screen>
 <prompt># </prompt>nixos-generate-config --root /mnt</screen>
-     You should then edit <filename>/mnt/etc/nixos/configuration.nix</filename>
-     to suit your needs:
+     You should then edit <filename>/mnt/etc/nixos/configuration.nix</filename> to suit your needs:
 <screen>
 <prompt># </prompt>nano /mnt/etc/nixos/configuration.nix
 </screen>
-     If you’re using the graphical ISO image, other editors may be available
-     (such as <command>vim</command>). If you have network access, you can also
-     install other editors — for instance, you can install Emacs by running
-     <literal>nix-env -f '&lt;nixpkgs&gt;' -iA emacs</literal>.
+     If you’re using the graphical ISO image, other editors may be available (such as <command>vim</command>). If you have network access, you can also install other editors — for instance, you can install Emacs by running <literal>nix-env -f '&lt;nixpkgs&gt;' -iA emacs</literal>.
     </para>
     <variablelist>
      <varlistentry>
@@ -344,9 +273,7 @@
       </term>
       <listitem>
        <para>
-        You <emphasis>must</emphasis> set the option
-        <xref linkend="opt-boot.loader.grub.device"/> to specify on which disk
-        the GRUB boot loader is to be installed. Without it, NixOS cannot boot.
+        You <emphasis>must</emphasis> set the option <xref linkend="opt-boot.loader.grub.device"/> to specify on which disk the GRUB boot loader is to be installed. Without it, NixOS cannot boot.
        </para>
       </listitem>
      </varlistentry>
@@ -356,60 +283,26 @@
       </term>
       <listitem>
        <para>
-        You <emphasis>must</emphasis> set the option
-        <xref linkend="opt-boot.loader.systemd-boot.enable"/> to
-        <literal>true</literal>. <command>nixos-generate-config</command>
-        should do this automatically for new configurations when booted in UEFI
-        mode.
+        You <emphasis>must</emphasis> set the option <xref linkend="opt-boot.loader.systemd-boot.enable"/> to <literal>true</literal>. <command>nixos-generate-config</command> should do this automatically for new configurations when booted in UEFI mode.
        </para>
        <para>
-        You may want to look at the options starting with
-        <option><link linkend="opt-boot.loader.efi.canTouchEfiVariables">boot.loader.efi</link></option>
-        and
-        <option><link linkend="opt-boot.loader.systemd-boot.enable">boot.loader.systemd</link></option>
-        as well.
+        You may want to look at the options starting with <option><link linkend="opt-boot.loader.efi.canTouchEfiVariables">boot.loader.efi</link></option> and <option><link linkend="opt-boot.loader.systemd-boot.enable">boot.loader.systemd</link></option> as well.
        </para>
       </listitem>
      </varlistentry>
     </variablelist>
     <para>
-     If there are other operating systems running on the machine before
-     installing NixOS, the <xref linkend="opt-boot.loader.grub.useOSProber"/>
-     option can be set to <literal>true</literal> to automatically add them to
-     the grub menu.
+     If there are other operating systems running on the machine before installing NixOS, the <xref linkend="opt-boot.loader.grub.useOSProber"/> option can be set to <literal>true</literal> to automatically add them to the grub menu.
     </para>
     <para>
-     If you need to configure networking for your machine the configuration
-     options are described in <xref linkend="sec-networking"/>.
+     If you need to configure networking for your machine the configuration options are described in <xref linkend="sec-networking"/>.
     </para>
     <para>
-     Another critical option is <option>fileSystems</option>, specifying the
-     file systems that need to be mounted by NixOS. However, you typically
-     don’t need to set it yourself, because
-     <command>nixos-generate-config</command> sets it automatically in
-     <filename>/mnt/etc/nixos/hardware-configuration.nix</filename> from your
-     currently mounted file systems. (The configuration file
-     <filename>hardware-configuration.nix</filename> is included from
-     <filename>configuration.nix</filename> and will be overwritten by future
-     invocations of <command>nixos-generate-config</command>; thus, you
-     generally should not modify it.) Additionally, you may want to look at 
-     <link xlink:href="https://github.com/NixOS/nixos-hardware">Hardware
-     configuration for known-hardware</link> at this point or after
-     installation.
-      
+     Another critical option is <option>fileSystems</option>, specifying the file systems that need to be mounted by NixOS. However, you typically don’t need to set it yourself, because <command>nixos-generate-config</command> sets it automatically in <filename>/mnt/etc/nixos/hardware-configuration.nix</filename> from your currently mounted file systems. (The configuration file <filename>hardware-configuration.nix</filename> is included from <filename>configuration.nix</filename> and will be overwritten by future invocations of <command>nixos-generate-config</command>; thus, you generally should not modify it.) Additionally, you may want to look at <link xlink:href="https://github.com/NixOS/nixos-hardware">Hardware configuration for known-hardware</link> at this point or after installation.
     </para>
     <note>
      <para>
-      Depending on your hardware configuration or type of file system, you may
-      need to set the option <option>boot.initrd.kernelModules</option> to
-      include the kernel modules that are necessary for mounting the root file
-      system, otherwise the installed system will not be able to boot. (If this
-      happens, boot from the installation media again, mount the target file
-      system on <filename>/mnt</filename>, fix
-      <filename>/mnt/etc/nixos/configuration.nix</filename> and rerun
-      <filename>nixos-install</filename>.) In most cases,
-      <command>nixos-generate-config</command> will figure out the required
-      modules.
+      Depending on your hardware configuration or type of file system, you may need to set the option <option>boot.initrd.kernelModules</option> to include the kernel modules that are necessary for mounting the root file system, otherwise the installed system will not be able to boot. (If this happens, boot from the installation media again, mount the target file system on <filename>/mnt</filename>, fix <filename>/mnt/etc/nixos/configuration.nix</filename> and rerun <filename>nixos-install</filename>.) In most cases, <command>nixos-generate-config</command> will figure out the required modules.
      </para>
     </note>
    </listitem>
@@ -418,24 +311,17 @@
      Do the installation:
 <screen>
 <prompt># </prompt>nixos-install</screen>
-     Cross fingers. If this fails due to a temporary problem (such as a network
-     issue while downloading binaries from the NixOS binary cache), you can
-     just re-run <command>nixos-install</command>. Otherwise, fix your
-     <filename>configuration.nix</filename> and then re-run
-     <command>nixos-install</command>.
+     Cross fingers. If this fails due to a temporary problem (such as a network issue while downloading binaries from the NixOS binary cache), you can just re-run <command>nixos-install</command>. Otherwise, fix your <filename>configuration.nix</filename> and then re-run <command>nixos-install</command>.
     </para>
     <para>
-     As the last step, <command>nixos-install</command> will ask you to set the
-     password for the <literal>root</literal> user, e.g.
+     As the last step, <command>nixos-install</command> will ask you to set the password for the <literal>root</literal> user, e.g.
 <screen>
 setting root password...
 Enter new UNIX password: ***
 Retype new UNIX password: ***</screen>
      <note>
       <para>
-       For unattended installations, it is possible to use
-       <command>nixos-install --no-root-passwd</command> in order to disable
-       the password prompt entirely.
+       For unattended installations, it is possible to use <command>nixos-install --no-root-passwd</command> in order to disable the password prompt entirely.
       </para>
      </note>
     </para>
@@ -449,21 +335,14 @@ Retype new UNIX password: ***</screen>
    </listitem>
    <listitem>
     <para>
-     You should now be able to boot into the installed NixOS. The GRUB boot
-     menu shows a list of <emphasis>available configurations</emphasis>
-     (initially just one). Every time you change the NixOS configuration (see
-     <link
-        linkend="sec-changing-config">Changing Configuration</link>
-     ), a new item is added to the menu. This allows you to easily roll back to
-     a previous configuration if something goes wrong.
+     You should now be able to boot into the installed NixOS. The GRUB boot menu shows a list of <emphasis>available configurations</emphasis> (initially just one). Every time you change the NixOS configuration (see <link
+        linkend="sec-changing-config">Changing Configuration</link> ), a new item is added to the menu. This allows you to easily roll back to a previous configuration if something goes wrong.
     </para>
     <para>
-     You should log in and change the <literal>root</literal> password with
-     <command>passwd</command>.
+     You should log in and change the <literal>root</literal> password with <command>passwd</command>.
     </para>
     <para>
-     You’ll probably want to create some user accounts as well, which can be
-     done with <command>useradd</command>:
+     You’ll probably want to create some user accounts as well, which can be done with <command>useradd</command>:
 <screen>
 <prompt>$ </prompt>useradd -c 'Eelco Dolstra' -m eelco
 <prompt>$ </prompt>passwd eelco</screen>
@@ -484,11 +363,8 @@ Retype new UNIX password: ***</screen>
   <title>Installation summary</title>
 
   <para>
-   To summarise, <xref linkend="ex-install-sequence" /> shows a typical
-   sequence of commands for installing NixOS on an empty hard drive (here
-   <filename>/dev/sda</filename>). <xref linkend="ex-config"
-/> shows a
-   corresponding configuration Nix expression.
+   To summarise, <xref linkend="ex-install-sequence" /> shows a typical sequence of commands for installing NixOS on an empty hard drive (here <filename>/dev/sda</filename>). <xref linkend="ex-config"
+/> shows a corresponding configuration Nix expression.
   </para>
 
   <example xml:id="ex-partition-scheme-MBR">
diff --git a/nixos/doc/manual/installation/obtaining.xml b/nixos/doc/manual/installation/obtaining.xml
index 56af5c0e25a..902f99e1e25 100644
--- a/nixos/doc/manual/installation/obtaining.xml
+++ b/nixos/doc/manual/installation/obtaining.xml
@@ -5,48 +5,28 @@
          xml:id="sec-obtaining">
  <title>Obtaining NixOS</title>
  <para>
-  NixOS ISO images can be downloaded from the
-  <link
-xlink:href="http://nixos.org/nixos/download.html">NixOS download
-  page</link>. There are a number of installation options. If you happen to
-  have an optical drive and a spare CD, burning the image to CD and booting
-  from that is probably the easiest option. Most people will need to prepare a
-  USB stick to boot from. <xref linkend="sec-booting-from-usb"/> describes the
-  preferred method to prepare a USB stick. A number of alternative methods are
-  presented in the
-  <link
-xlink:href="https://nixos.wiki/wiki/NixOS_Installation_Guide#Making_the_installation_media">NixOS
-  Wiki</link>.
+  NixOS ISO images can be downloaded from the <link
+xlink:href="http://nixos.org/nixos/download.html">NixOS download page</link>. There are a number of installation options. If you happen to have an optical drive and a spare CD, burning the image to CD and booting from that is probably the easiest option. Most people will need to prepare a USB stick to boot from. <xref linkend="sec-booting-from-usb"/> describes the preferred method to prepare a USB stick. A number of alternative methods are presented in the <link
+xlink:href="https://nixos.wiki/wiki/NixOS_Installation_Guide#Making_the_installation_media">NixOS Wiki</link>.
  </para>
  <para>
-  As an alternative to installing NixOS yourself, you can get a running NixOS
-  system through several other means:
+  As an alternative to installing NixOS yourself, you can get a running NixOS system through several other means:
   <itemizedlist>
    <listitem>
     <para>
-     Using virtual appliances in Open Virtualization Format (OVF) that can be
-     imported into VirtualBox. These are available from the
-     <link xlink:href="http://nixos.org/nixos/download.html">NixOS download
-     page</link>.
+     Using virtual appliances in Open Virtualization Format (OVF) that can be imported into VirtualBox. These are available from the <link xlink:href="http://nixos.org/nixos/download.html">NixOS download page</link>.
     </para>
    </listitem>
    <listitem>
     <para>
-     Using AMIs for Amazon’s EC2. To find one for your region and instance
-     type, please refer to the
-     <link
-    xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/virtualisation/ec2-amis.nix">list
-     of most recent AMIs</link>.
+     Using AMIs for Amazon’s EC2. To find one for your region and instance type, please refer to the <link
+    xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/virtualisation/ec2-amis.nix">list of most recent AMIs</link>.
     </para>
    </listitem>
    <listitem>
     <para>
-     Using NixOps, the NixOS-based cloud deployment tool, which allows you to
-     provision VirtualBox and EC2 NixOS instances from declarative
-     specifications. Check out the
-     <link
-    xlink:href="https://nixos.org/nixops">NixOps homepage</link> for
-     details.
+     Using NixOps, the NixOS-based cloud deployment tool, which allows you to provision VirtualBox and EC2 NixOS instances from declarative specifications. Check out the <link
+    xlink:href="https://nixos.org/nixops">NixOps homepage</link> for details.
     </para>
    </listitem>
   </itemizedlist>
diff --git a/nixos/doc/manual/installation/upgrading.xml b/nixos/doc/manual/installation/upgrading.xml
index 35b4d266e12..d8b6cda2f2d 100644
--- a/nixos/doc/manual/installation/upgrading.xml
+++ b/nixos/doc/manual/installation/upgrading.xml
@@ -4,68 +4,33 @@
          xml:id="sec-upgrading">
  <title>Upgrading NixOS</title>
  <para>
-  The best way to keep your NixOS installation up to date is to use one of the
-  NixOS <emphasis>channels</emphasis>. A channel is a Nix mechanism for
-  distributing Nix expressions and associated binaries. The NixOS channels are
-  updated automatically from NixOS’s Git repository after certain tests have
-  passed and all packages have been built. These channels are:
+  The best way to keep your NixOS installation up to date is to use one of the NixOS <emphasis>channels</emphasis>. A channel is a Nix mechanism for distributing Nix expressions and associated binaries. The NixOS channels are updated automatically from NixOS’s Git repository after certain tests have passed and all packages have been built. These channels are:
   <itemizedlist>
    <listitem>
     <para>
-     <emphasis>Stable channels</emphasis>, such as
-     <literal
-    xlink:href="https://nixos.org/channels/nixos-19.03">nixos-19.03</literal>.
-     These only get conservative bug fixes and package upgrades. For instance,
-     a channel update may cause the Linux kernel on your system to be upgraded
-     from 4.19.34 to 4.19.38 (a minor bug fix), but not from
-     4.19.<replaceable>x</replaceable> to 4.20.<replaceable>x</replaceable> (a
-     major change that has the potential to break things). Stable channels are
-     generally maintained until the next stable branch is created.
+     <emphasis>Stable channels</emphasis>, such as <literal
+    xlink:href="https://nixos.org/channels/nixos-19.03">nixos-19.03</literal>. These only get conservative bug fixes and package upgrades. For instance, a channel update may cause the Linux kernel on your system to be upgraded from 4.19.34 to 4.19.38 (a minor bug fix), but not from 4.19.<replaceable>x</replaceable> to 4.20.<replaceable>x</replaceable> (a major change that has the potential to break things). Stable channels are generally maintained until the next stable branch is created.
     </para>
     <para></para>
    </listitem>
    <listitem>
     <para>
-     The <emphasis>unstable channel</emphasis>,
-     <literal
-    xlink:href="https://nixos.org/channels/nixos-unstable">nixos-unstable</literal>.
-     This corresponds to NixOS’s main development branch, and may thus see
-     radical changes between channel updates. It’s not recommended for
-     production systems.
+     The <emphasis>unstable channel</emphasis>, <literal
+    xlink:href="https://nixos.org/channels/nixos-unstable">nixos-unstable</literal>. This corresponds to NixOS’s main development branch, and may thus see radical changes between channel updates. It’s not recommended for production systems.
     </para>
    </listitem>
    <listitem>
     <para>
-     <emphasis>Small channels</emphasis>, such as
-     <literal
-    xlink:href="https://nixos.org/channels/nixos-19.03-small">nixos-19.03-small</literal>
-     or
-     <literal
-    xlink:href="https://nixos.org/channels/nixos-unstable-small">nixos-unstable-small</literal>.
-     These are identical to the stable and unstable channels described above,
-     except that they contain fewer binary packages. This means they get
-     updated faster than the regular channels (for instance, when a critical
-     security patch is committed to NixOS’s source tree), but may require
-     more packages to be built from source than usual. They’re mostly
-     intended for server environments and as such contain few GUI applications.
+     <emphasis>Small channels</emphasis>, such as <literal
+    xlink:href="https://nixos.org/channels/nixos-19.03-small">nixos-19.03-small</literal> or <literal
+    xlink:href="https://nixos.org/channels/nixos-unstable-small">nixos-unstable-small</literal>. These are identical to the stable and unstable channels described above, except that they contain fewer binary packages. This means they get updated faster than the regular channels (for instance, when a critical security patch is committed to NixOS’s source tree), but may require more packages to be built from source than usual. They’re mostly intended for server environments and as such contain few GUI applications.
     </para>
    </listitem>
   </itemizedlist>
-  To see what channels are available, go to
-  <link xlink:href="https://nixos.org/channels"/>. (Note that the URIs of the
-  various channels redirect to a directory that contains the channel’s latest
-  version and includes ISO images and VirtualBox appliances.) Please note that
-  during the release process, channels that are not yet released will be
-  present here as well. See the Getting NixOS page
-  <link xlink:href="https://nixos.org/nixos/download.html"/> to find the newest
-  supported stable release.
+  To see what channels are available, go to <link xlink:href="https://nixos.org/channels"/>. (Note that the URIs of the various channels redirect to a directory that contains the channel’s latest version and includes ISO images and VirtualBox appliances.) Please note that during the release process, channels that are not yet released will be present here as well. See the Getting NixOS page <link xlink:href="https://nixos.org/nixos/download.html"/> to find the newest supported stable release.
  </para>
  <para>
-  When you first install NixOS, you’re automatically subscribed to the NixOS
-  channel that corresponds to your installation source. For instance, if you
-  installed from a 19.03 ISO, you will be subscribed to the
-  <literal>nixos-19.03</literal> channel. To see which NixOS channel you’re
-  subscribed to, run the following as root:
+  When you first install NixOS, you’re automatically subscribed to the NixOS channel that corresponds to your installation source. For instance, if you installed from a 19.03 ISO, you will be subscribed to the <literal>nixos-19.03</literal> channel. To see which NixOS channel you’re subscribed to, run the following as root:
 <screen>
 # nix-channel --list | grep nixos
 nixos https://nixos.org/channels/nixos-unstable
@@ -74,8 +39,7 @@ nixos https://nixos.org/channels/nixos-unstable
 <screen>
 # nix-channel --add https://nixos.org/channels/<replaceable>channel-name</replaceable> nixos
 </screen>
-  (Be sure to include the <literal>nixos</literal> parameter at the end.) For
-  instance, to use the NixOS 19.03 stable channel:
+  (Be sure to include the <literal>nixos</literal> parameter at the end.) For instance, to use the NixOS 19.03 stable channel:
 <screen>
 # nix-channel --add https://nixos.org/channels/nixos-19.03 nixos
 </screen>
@@ -89,43 +53,31 @@ nixos https://nixos.org/channels/nixos-unstable
 </screen>
  </para>
  <para>
-  You can then upgrade NixOS to the latest version in your chosen channel by
-  running
+  You can then upgrade NixOS to the latest version in your chosen channel by running
 <screen>
 # nixos-rebuild switch --upgrade
 </screen>
-  which is equivalent to the more verbose <literal>nix-channel --update nixos;
-  nixos-rebuild switch</literal>.
+  which is equivalent to the more verbose <literal>nix-channel --update nixos; nixos-rebuild switch</literal>.
  </para>
  <note>
   <para>
-   Channels are set per user. This means that running <literal> nix-channel
-   --add</literal> as a non root user (or without sudo) will not affect
-   configuration in <literal>/etc/nixos/configuration.nix</literal>
+   Channels are set per user. This means that running <literal> nix-channel --add</literal> as a non root user (or without sudo) will not affect configuration in <literal>/etc/nixos/configuration.nix</literal>
   </para>
  </note>
  <warning>
   <para>
-   It is generally safe to switch back and forth between channels. The only
-   exception is that a newer NixOS may also have a newer Nix version, which may
-   involve an upgrade of Nix’s database schema. This cannot be undone easily,
-   so in that case you will not be able to go back to your original channel.
+   It is generally safe to switch back and forth between channels. The only exception is that a newer NixOS may also have a newer Nix version, which may involve an upgrade of Nix’s database schema. This cannot be undone easily, so in that case you will not be able to go back to your original channel.
   </para>
  </warning>
  <section xml:id="sec-upgrading-automatic">
   <title>Automatic Upgrades</title>
 
   <para>
-   You can keep a NixOS system up-to-date automatically by adding the following
-   to <filename>configuration.nix</filename>:
+   You can keep a NixOS system up-to-date automatically by adding the following to <filename>configuration.nix</filename>:
 <programlisting>
 <xref linkend="opt-system.autoUpgrade.enable"/> = true;
 </programlisting>
-   This enables a periodically executed systemd service named
-   <literal>nixos-upgrade.service</literal>. It runs <command>nixos-rebuild
-   switch --upgrade</command> to upgrade NixOS to the latest version in the
-   current channel. (To see when the service runs, see <command>systemctl
-   list-timers</command>.) You can also specify a channel explicitly, e.g.
+   This enables a periodically executed systemd service named <literal>nixos-upgrade.service</literal>. It runs <command>nixos-rebuild switch --upgrade</command> to upgrade NixOS to the latest version in the current channel. (To see when the service runs, see <command>systemctl list-timers</command>.) You can also specify a channel explicitly, e.g.
 <programlisting>
 <xref linkend="opt-system.autoUpgrade.channel"/> = https://nixos.org/channels/nixos-19.03;
 </programlisting>
diff --git a/nixos/doc/manual/man-configuration.xml b/nixos/doc/manual/man-configuration.xml
index 9f30b792510..c6cbaaee541 100644
--- a/nixos/doc/manual/man-configuration.xml
+++ b/nixos/doc/manual/man-configuration.xml
@@ -14,10 +14,7 @@
  <refsection>
   <title>Description</title>
   <para>
-   The file <filename>/etc/nixos/configuration.nix</filename> contains the
-   declarative specification of your NixOS system configuration. The command
-   <command>nixos-rebuild</command> takes this file and realises the system
-   configuration specified therein.
+   The file <filename>/etc/nixos/configuration.nix</filename> contains the declarative specification of your NixOS system configuration. The command <command>nixos-rebuild</command> takes this file and realises the system configuration specified therein.
   </para>
  </refsection>
  <refsection>
diff --git a/nixos/doc/manual/man-nixos-build-vms.xml b/nixos/doc/manual/man-nixos-build-vms.xml
index 7d6e04e0dd9..98f29436b2d 100644
--- a/nixos/doc/manual/man-nixos-build-vms.xml
+++ b/nixos/doc/manual/man-nixos-build-vms.xml
@@ -24,14 +24,12 @@
     
    <arg>
     <option>--help</option>
-  </arg>
-
-  <arg>
-    <option>--option</option>
-    <replaceable>name</replaceable>
-    <replaceable>value</replaceable>
-  </arg>
-
+   </arg>
+    
+   <arg>
+    <option>--option</option> <replaceable>name</replaceable> <replaceable>value</replaceable>
+   </arg>
+    
    <arg choice="plain">
     <replaceable>network.nix</replaceable>
    </arg>
@@ -40,11 +38,7 @@
  <refsection>
   <title>Description</title>
   <para>
-   This command builds a network of QEMU-KVM virtual machines of a Nix
-   expression specifying a network of NixOS machines. The virtual network can
-   be started by executing the <filename>bin/run-vms</filename> shell script
-   that is generated by this command. By default, a <filename>result</filename>
-   symlink is produced that points to the generated virtual network.
+   This command builds a network of QEMU-KVM virtual machines of a Nix expression specifying a network of NixOS machines. The virtual network can be started by executing the <filename>bin/run-vms</filename> shell script that is generated by this command. By default, a <filename>result</filename> symlink is produced that points to the generated virtual network.
   </para>
   <para>
    A network Nix expression has the following structure:
@@ -71,18 +65,7 @@
     };
 }
 </screen>
-   Each attribute in the expression represents a machine in the network (e.g.
-   <varname>test1</varname> and <varname>test2</varname>) referring to a
-   function defining a NixOS configuration. In each NixOS configuration, two
-   attributes have a special meaning. The
-   <varname>deployment.targetHost</varname> specifies the address (domain name
-   or IP address) of the system which is used by <command>ssh</command> to
-   perform remote deployment operations. The
-   <varname>nixpkgs.localSystem.system</varname> attribute can be used to
-   specify an architecture for the target machine, such as
-   <varname>i686-linux</varname> which builds a 32-bit NixOS configuration.
-   Omitting this property will build the configuration for the same
-   architecture as the host system.
+   Each attribute in the expression represents a machine in the network (e.g. <varname>test1</varname> and <varname>test2</varname>) referring to a function defining a NixOS configuration. In each NixOS configuration, two attributes have a special meaning. The <varname>deployment.targetHost</varname> specifies the address (domain name or IP address) of the system which is used by <command>ssh</command> to perform remote deployment operations. The <varname>nixpkgs.localSystem.system</varname> attribute can be used to specify an architecture for the target machine, such as <varname>i686-linux</varname> which builds a 32-bit NixOS configuration. Omitting this property will build the configuration for the same architecture as the host system.
   </para>
  </refsection>
  <refsection>
@@ -126,10 +109,10 @@
      <option>--option</option> <replaceable>name</replaceable> <replaceable>value</replaceable>
     </term>
     <listitem>
-     <para>Set the Nix configuration option
-      <replaceable>name</replaceable> to <replaceable>value</replaceable>.
-      This overrides settings in the Nix configuration file (see
-      <citerefentry><refentrytitle>nix.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>).
+     <para>
+      Set the Nix configuration option <replaceable>name</replaceable> to <replaceable>value</replaceable>. This overrides settings in the Nix configuration file (see <citerefentry>
+      <refentrytitle>nix.conf</refentrytitle>
+      <manvolnum>5</manvolnum></citerefentry>).
      </para>
     </listitem>
    </varlistentry>
diff --git a/nixos/doc/manual/man-nixos-enter.xml b/nixos/doc/manual/man-nixos-enter.xml
index 1481db46712..8cea628a694 100644
--- a/nixos/doc/manual/man-nixos-enter.xml
+++ b/nixos/doc/manual/man-nixos-enter.xml
@@ -34,7 +34,7 @@
     </arg>
      <replaceable>shell-command</replaceable>
    </arg>
-
+    
    <arg>
     <arg choice='plain'>
      <option>--silent</option>
@@ -58,9 +58,7 @@
  <refsection>
   <title>Description</title>
   <para>
-   This command runs a command in a NixOS chroot environment, that is, in a
-   filesystem hierarchy previously prepared using
-   <command>nixos-install</command>.
+   This command runs a command in a NixOS chroot environment, that is, in a filesystem hierarchy previously prepared using <command>nixos-install</command>.
   </para>
  </refsection>
  <refsection>
@@ -75,8 +73,7 @@
     </term>
     <listitem>
      <para>
-      The path to the NixOS system you want to enter. It defaults to
-      <filename>/mnt</filename>.
+      The path to the NixOS system you want to enter. It defaults to <filename>/mnt</filename>.
      </para>
     </listitem>
    </varlistentry>
@@ -86,10 +83,7 @@
     </term>
     <listitem>
      <para>
-      The NixOS system configuration to use. It defaults to
-      <filename>/nix/var/nix/profiles/system</filename>. You can enter a
-      previous NixOS configuration by specifying a path such as
-      <filename>/nix/var/nix/profiles/system-106-link</filename>.
+      The NixOS system configuration to use. It defaults to <filename>/nix/var/nix/profiles/system</filename>. You can enter a previous NixOS configuration by specifying a path such as <filename>/nix/var/nix/profiles/system-106-link</filename>.
      </para>
     </listitem>
    </varlistentry>
@@ -112,7 +106,7 @@
     </term>
     <listitem>
      <para>
-       Suppresses all output from the activation script of the target system.
+      Suppresses all output from the activation script of the target system.
      </para>
     </listitem>
    </varlistentry>
@@ -122,8 +116,7 @@
     </term>
     <listitem>
      <para>
-      Interpret the remaining arguments as the program name and arguments to be
-      invoked. The program is not executed in a shell.
+      Interpret the remaining arguments as the program name and arguments to be invoked. The program is not executed in a shell.
      </para>
     </listitem>
    </varlistentry>
@@ -132,8 +125,7 @@
  <refsection>
   <title>Examples</title>
   <para>
-   Start an interactive shell in the NixOS installation in
-   <filename>/mnt</filename>:
+   Start an interactive shell in the NixOS installation in <filename>/mnt</filename>:
   </para>
 <screen>
 # nixos-enter /mnt
diff --git a/nixos/doc/manual/man-nixos-generate-config.xml b/nixos/doc/manual/man-nixos-generate-config.xml
index 61531a8f01c..3ebfd50f036 100644
--- a/nixos/doc/manual/man-nixos-generate-config.xml
+++ b/nixos/doc/manual/man-nixos-generate-config.xml
@@ -13,18 +13,18 @@
  </refnamediv>
  <refsynopsisdiv>
   <cmdsynopsis>
-   <command>nixos-generate-config</command>
+   <command>nixos-generate-config</command> 
    <arg>
     <option>--force</option>
    </arg>
-
+    
    <arg>
     <arg choice='plain'>
      <option>--root</option>
     </arg>
      <replaceable>root</replaceable>
    </arg>
-
+    
    <arg>
     <arg choice='plain'>
      <option>--dir</option>
@@ -44,20 +44,10 @@
      </term>
      <listitem>
       <para>
-       This module sets NixOS configuration options based on your current
-       hardware configuration. In particular, it sets the
-       <option>fileSystem</option> option to reflect all currently mounted file
-       systems, the <option>swapDevices</option> option to reflect active swap
-       devices, and the <option>boot.initrd.*</option> options to ensure that
-       the initial ramdisk contains any kernel modules necessary for mounting
-       the root file system.
+       This module sets NixOS configuration options based on your current hardware configuration. In particular, it sets the <option>fileSystem</option> option to reflect all currently mounted file systems, the <option>swapDevices</option> option to reflect active swap devices, and the <option>boot.initrd.*</option> options to ensure that the initial ramdisk contains any kernel modules necessary for mounting the root file system.
       </para>
       <para>
-       If this file already exists, it is overwritten. Thus, you should not
-       modify it manually. Rather, you should include it from your
-       <filename>/etc/nixos/configuration.nix</filename>, and re-run
-       <command>nixos-generate-config</command> to update it whenever your
-       hardware configuration changes.
+       If this file already exists, it is overwritten. Thus, you should not modify it manually. Rather, you should include it from your <filename>/etc/nixos/configuration.nix</filename>, and re-run <command>nixos-generate-config</command> to update it whenever your hardware configuration changes.
       </para>
      </listitem>
     </varlistentry>
@@ -67,10 +57,7 @@
      </term>
      <listitem>
       <para>
-       This is the main NixOS system configuration module. If it already
-       exists, it’s left unchanged. Otherwise,
-       <command>nixos-generate-config</command> will write a template for you
-       to customise.
+       This is the main NixOS system configuration module. If it already exists, it’s left unchanged. Otherwise, <command>nixos-generate-config</command> will write a template for you to customise.
       </para>
      </listitem>
     </varlistentry>
@@ -89,12 +76,7 @@
     </term>
     <listitem>
      <para>
-      If this option is given, treat the directory
-      <replaceable>root</replaceable> as the root of the file system. This
-      means that configuration files will be written to
-      <filename><replaceable>root</replaceable>/etc/nixos</filename>, and that
-      any file systems outside of <replaceable>root</replaceable> are ignored
-      for the purpose of generating the <option>fileSystems</option> option.
+      If this option is given, treat the directory <replaceable>root</replaceable> as the root of the file system. This means that configuration files will be written to <filename><replaceable>root</replaceable>/etc/nixos</filename>, and that any file systems outside of <replaceable>root</replaceable> are ignored for the purpose of generating the <option>fileSystems</option> option.
      </para>
     </listitem>
    </varlistentry>
@@ -104,9 +86,7 @@
     </term>
     <listitem>
      <para>
-      If this option is given, write the configuration files to the directory
-      <replaceable>dir</replaceable> instead of
-      <filename>/etc/nixos</filename>.
+      If this option is given, write the configuration files to the directory <replaceable>dir</replaceable> instead of <filename>/etc/nixos</filename>.
      </para>
     </listitem>
    </varlistentry>
@@ -116,8 +96,7 @@
     </term>
     <listitem>
      <para>
-      Overwrite <filename>/etc/nixos/configuration.nix</filename> if it already
-      exists.
+      Overwrite <filename>/etc/nixos/configuration.nix</filename> if it already exists.
      </para>
     </listitem>
    </varlistentry>
@@ -127,8 +106,7 @@
     </term>
     <listitem>
      <para>
-      Omit everything concerning file systems and swap devices from the
-      hardware configuration.
+      Omit everything concerning file systems and swap devices from the hardware configuration.
      </para>
     </listitem>
    </varlistentry>
@@ -138,9 +116,7 @@
     </term>
     <listitem>
      <para>
-      Don't generate <filename>configuration.nix</filename> or
-      <filename>hardware-configuration.nix</filename> and print the hardware
-      configuration to stdout only.
+      Don't generate <filename>configuration.nix</filename> or <filename>hardware-configuration.nix</filename> and print the hardware configuration to stdout only.
      </para>
     </listitem>
    </varlistentry>
@@ -149,16 +125,11 @@
  <refsection>
   <title>Examples</title>
   <para>
-   This command is typically used during NixOS installation to write initial
-   configuration modules. For example, if you created and mounted the target
-   file systems on <filename>/mnt</filename> and
-   <filename>/mnt/boot</filename>, you would run:
+   This command is typically used during NixOS installation to write initial configuration modules. For example, if you created and mounted the target file systems on <filename>/mnt</filename> and <filename>/mnt/boot</filename>, you would run:
 <screen>
 <prompt>$ </prompt>nixos-generate-config --root /mnt
 </screen>
-   The resulting file
-   <filename>/mnt/etc/nixos/hardware-configuration.nix</filename> might look
-   like this:
+   The resulting file <filename>/mnt/etc/nixos/hardware-configuration.nix</filename> might look like this:
 <programlisting>
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
@@ -193,10 +164,7 @@
   nix.maxJobs = 8;
 }
 </programlisting>
-   It will also create a basic
-   <filename>/mnt/etc/nixos/configuration.nix</filename>, which you should edit
-   to customise the logical configuration of your system. This file includes
-   the result of the hardware scan as follows:
+   It will also create a basic <filename>/mnt/etc/nixos/configuration.nix</filename>, which you should edit to customise the logical configuration of your system. This file includes the result of the hardware scan as follows:
 <programlisting>
   imports = [ ./hardware-configuration.nix ];
 </programlisting>
@@ -206,9 +174,7 @@
 <screen>
 <prompt>$ </prompt>nixos-generate-config
 </screen>
-   to update <filename>/etc/nixos/hardware-configuration.nix</filename>. Your
-   <filename>/etc/nixos/configuration.nix</filename> will
-   <emphasis>not</emphasis> be overwritten.
+   to update <filename>/etc/nixos/hardware-configuration.nix</filename>. Your <filename>/etc/nixos/configuration.nix</filename> will <emphasis>not</emphasis> be overwritten.
   </para>
  </refsection>
 </refentry>
diff --git a/nixos/doc/manual/man-nixos-install.xml b/nixos/doc/manual/man-nixos-install.xml
index 4fb94ee7494..aec01b0ee3b 100644
--- a/nixos/doc/manual/man-nixos-install.xml
+++ b/nixos/doc/manual/man-nixos-install.xml
@@ -13,72 +13,72 @@
  </refnamediv>
  <refsynopsisdiv>
   <cmdsynopsis>
-   <command>nixos-install</command>
+   <command>nixos-install</command> 
    <arg>
     <arg choice='plain'>
      <option>-I</option>
     </arg>
      <replaceable>path</replaceable>
    </arg>
-
+    
    <arg>
     <arg choice='plain'>
      <option>--root</option>
     </arg>
      <replaceable>root</replaceable>
    </arg>
-
+    
    <arg>
     <arg choice='plain'>
      <option>--system</option>
     </arg>
      <replaceable>path</replaceable>
    </arg>
-
+    
    <arg>
     <arg choice='plain'>
      <option>--no-channel-copy</option>
     </arg>
    </arg>
-
+    
    <arg>
     <arg choice='plain'>
      <option>--no-root-passwd</option>
     </arg>
    </arg>
-
+    
    <arg>
     <arg choice='plain'>
      <option>--no-bootloader</option>
     </arg>
    </arg>
-
+    
    <arg>
-    <group choice='req'>
+    <group choice='req'> 
     <arg choice='plain'>
      <option>--max-jobs</option>
     </arg>
-
+     
     <arg choice='plain'>
      <option>-j</option>
     </arg>
      </group> <replaceable>number</replaceable>
    </arg>
-
+    
    <arg>
     <option>--cores</option> <replaceable>number</replaceable>
    </arg>
-
+    
    <arg>
     <option>--option</option> <replaceable>name</replaceable> <replaceable>value</replaceable>
    </arg>
-
+    
    <arg>
     <arg choice='plain'>
      <option>--show-trace</option>
     </arg>
    </arg>
-
+    
    <arg>
     <arg choice='plain'>
      <option>--help</option>
@@ -89,43 +89,32 @@
  <refsection>
   <title>Description</title>
   <para>
-   This command installs NixOS in the file system mounted on
-   <filename>/mnt</filename>, based on the NixOS configuration specified in
-   <filename>/mnt/etc/nixos/configuration.nix</filename>. It performs the
-   following steps:
+   This command installs NixOS in the file system mounted on <filename>/mnt</filename>, based on the NixOS configuration specified in <filename>/mnt/etc/nixos/configuration.nix</filename>. It performs the following steps:
    <itemizedlist>
     <listitem>
      <para>
-      It copies Nix and its dependencies to
-      <filename>/mnt/nix/store</filename>.
+      It copies Nix and its dependencies to <filename>/mnt/nix/store</filename>.
      </para>
     </listitem>
     <listitem>
      <para>
-      It runs Nix in <filename>/mnt</filename> to build the NixOS configuration
-      specified in <filename>/mnt/etc/nixos/configuration.nix</filename>.
+      It runs Nix in <filename>/mnt</filename> to build the NixOS configuration specified in <filename>/mnt/etc/nixos/configuration.nix</filename>.
      </para>
     </listitem>
     <listitem>
      <para>
-      It installs the GRUB boot loader on the device specified in the option
-      <option>boot.loader.grub.device</option> (unless
-      <option>--no-bootloader</option> is specified), and generates a GRUB
-      configuration file that boots into the NixOS configuration just
-      installed.
+      It installs the GRUB boot loader on the device specified in the option <option>boot.loader.grub.device</option> (unless <option>--no-bootloader</option> is specified), and generates a GRUB configuration file that boots into the NixOS configuration just installed.
      </para>
     </listitem>
     <listitem>
      <para>
-      It prompts you for a password for the root account (unless
-      <option>--no-root-passwd</option> is specified).
+      It prompts you for a password for the root account (unless <option>--no-root-passwd</option> is specified).
      </para>
     </listitem>
    </itemizedlist>
   </para>
   <para>
-   This command is idempotent: if it is interrupted or fails due to a temporary
-   problem (e.g. a network issue), you can safely re-run it.
+   This command is idempotent: if it is interrupted or fails due to a temporary problem (e.g. a network issue), you can safely re-run it.
   </para>
  </refsection>
  <refsection>
@@ -140,9 +129,7 @@
     </term>
     <listitem>
      <para>
-      Defaults to <filename>/mnt</filename>. If this option is given, treat the
-      directory <replaceable>root</replaceable> as the root of the NixOS
-      installation.
+      Defaults to <filename>/mnt</filename>. If this option is given, treat the directory <replaceable>root</replaceable> as the root of the NixOS installation.
      </para>
     </listitem>
    </varlistentry>
@@ -152,16 +139,10 @@
     </term>
     <listitem>
      <para>
-      If this option is provided, <command>nixos-install</command> will install
-      the specified closure rather than attempt to build one from
-      <filename>/mnt/etc/nixos/configuration.nix</filename>.
+      If this option is provided, <command>nixos-install</command> will install the specified closure rather than attempt to build one from <filename>/mnt/etc/nixos/configuration.nix</filename>.
      </para>
      <para>
-      The closure must be an appropriately configured NixOS system, with boot
-      loader and partition configuration that fits the target host. Such a
-      closure is typically obtained with a command such as <command>nix-build
-      -I nixos-config=./configuration.nix '&lt;nixos&gt;' -A system
-      --no-out-link</command>
+      The closure must be an appropriately configured NixOS system, with boot loader and partition configuration that fits the target host. Such a closure is typically obtained with a command such as <command>nix-build -I nixos-config=./configuration.nix '&lt;nixos&gt;' -A system --no-out-link</command>
      </para>
     </listitem>
    </varlistentry>
@@ -171,10 +152,7 @@
     </term>
     <listitem>
      <para>
-      Add a path to the Nix expression search path. This option may be given
-      multiple times. See the NIX_PATH environment variable for information on
-      the semantics of the Nix search path. Paths added through
-      <replaceable>-I</replaceable> take precedence over NIX_PATH.
+      Add a path to the Nix expression search path. This option may be given multiple times. See the NIX_PATH environment variable for information on the semantics of the Nix search path. Paths added through <replaceable>-I</replaceable> take precedence over NIX_PATH.
      </para>
     </listitem>
    </varlistentry>
@@ -187,9 +165,7 @@
     </term>
     <listitem>
      <para>
-      Sets the maximum number of build jobs that Nix will perform in parallel
-      to the specified number. The default is <literal>1</literal>. A higher
-      value is useful on SMP systems or to exploit I/O latency.
+      Sets the maximum number of build jobs that Nix will perform in parallel to the specified number. The default is <literal>1</literal>. A higher value is useful on SMP systems or to exploit I/O latency.
      </para>
     </listitem>
    </varlistentry>
@@ -199,15 +175,7 @@
     </term>
     <listitem>
      <para>
-      Sets the value of the <envar>NIX_BUILD_CORES</envar> environment variable
-      in the invocation of builders. Builders can use this variable at their
-      discretion to control the maximum amount of parallelism. For instance, in
-      Nixpkgs, if the derivation attribute
-      <varname>enableParallelBuilding</varname> is set to
-      <literal>true</literal>, the builder passes the
-      <option>-j<replaceable>N</replaceable></option> flag to GNU Make. The
-      value <literal>0</literal> means that the builder should use all
-      available CPU cores in the system.
+      Sets the value of the <envar>NIX_BUILD_CORES</envar> environment variable in the invocation of builders. Builders can use this variable at their discretion to control the maximum amount of parallelism. For instance, in Nixpkgs, if the derivation attribute <varname>enableParallelBuilding</varname> is set to <literal>true</literal>, the builder passes the <option>-j<replaceable>N</replaceable></option> flag to GNU Make. The value <literal>0</literal> means that the builder should use all available CPU cores in the system.
      </para>
     </listitem>
    </varlistentry>
@@ -217,8 +185,7 @@
     </term>
     <listitem>
      <para>
-      Set the Nix configuration option <replaceable>name</replaceable> to
-      <replaceable>value</replaceable>.
+      Set the Nix configuration option <replaceable>name</replaceable> to <replaceable>value</replaceable>.
      </para>
     </listitem>
    </varlistentry>
@@ -228,8 +195,7 @@
     </term>
     <listitem>
      <para>
-      Causes Nix to print out a stack trace in case of Nix expression
-      evaluation errors.
+      Causes Nix to print out a stack trace in case of Nix expression evaluation errors.
      </para>
     </listitem>
    </varlistentry>
@@ -248,12 +214,7 @@
  <refsection>
   <title>Examples</title>
   <para>
-   A typical NixOS installation is done by creating and mounting a file system
-   on <filename>/mnt</filename>, generating a NixOS configuration in
-   <filename>/mnt/etc/nixos/configuration.nix</filename>, and running
-   <command>nixos-install</command>. For instance, if we want to install NixOS
-   on an <literal>ext4</literal> file system created in
-   <filename>/dev/sda1</filename>:
+   A typical NixOS installation is done by creating and mounting a file system on <filename>/mnt</filename>, generating a NixOS configuration in <filename>/mnt/etc/nixos/configuration.nix</filename>, and running <command>nixos-install</command>. For instance, if we want to install NixOS on an <literal>ext4</literal> file system created in <filename>/dev/sda1</filename>:
 <screen>
 <prompt>$ </prompt>mkfs.ext4 /dev/sda1
 <prompt>$ </prompt>mount /dev/sda1 /mnt
diff --git a/nixos/doc/manual/man-nixos-option.xml b/nixos/doc/manual/man-nixos-option.xml
index 3e316e10d4e..29a6ca08205 100644
--- a/nixos/doc/manual/man-nixos-option.xml
+++ b/nixos/doc/manual/man-nixos-option.xml
@@ -13,19 +13,19 @@
  </refnamediv>
  <refsynopsisdiv>
   <cmdsynopsis>
-   <command>nixos-option</command>
+   <command>nixos-option</command> 
    <arg>
     <option>-I</option> <replaceable>path</replaceable>
    </arg>
-
+    
    <arg>
     <option>--verbose</option>
    </arg>
-
+    
    <arg>
     <option>--xml</option>
    </arg>
-
+    
    <arg choice="plain">
     <replaceable>option.name</replaceable>
    </arg>
@@ -34,13 +34,10 @@
  <refsection>
   <title>Description</title>
   <para>
-   This command evaluates the configuration specified in
-   <filename>/etc/nixos/configuration.nix</filename> and returns the properties
-   of the option name given as argument.
+   This command evaluates the configuration specified in <filename>/etc/nixos/configuration.nix</filename> and returns the properties of the option name given as argument.
   </para>
   <para>
-   When the option name is not an option, the command prints the list of
-   attributes contained in the attribute set.
+   When the option name is not an option, the command prints the list of attributes contained in the attribute set.
   </para>
  </refsection>
  <refsection>
@@ -55,8 +52,7 @@
     </term>
     <listitem>
      <para>
-      This option is passed to the underlying
-      <command>nix-instantiate</command> invocation.
+      This option is passed to the underlying <command>nix-instantiate</command> invocation.
      </para>
     </listitem>
    </varlistentry>
@@ -66,8 +62,7 @@
     </term>
     <listitem>
      <para>
-      This option enables verbose mode, which currently is just the Bash
-      <command>set</command> <option>-x</option> debug mode.
+      This option enables verbose mode, which currently is just the Bash <command>set</command> <option>-x</option> debug mode.
      </para>
     </listitem>
    </varlistentry>
@@ -92,8 +87,7 @@
     </term>
     <listitem>
      <para>
-      Path to the main NixOS configuration module. Defaults to
-      <filename>/etc/nixos/configuration.nix</filename>.
+      Path to the main NixOS configuration module. Defaults to <filename>/etc/nixos/configuration.nix</filename>.
      </para>
     </listitem>
    </varlistentry>
@@ -130,8 +124,7 @@ Defined by:
  <refsection>
   <title>Bugs</title>
   <para>
-   The author listed in the following section is wrong. If there is any other
-   bug, please report to Nicolas Pierron.
+   The author listed in the following section is wrong. If there is any other bug, please report to Nicolas Pierron.
   </para>
  </refsection>
 </refentry>
diff --git a/nixos/doc/manual/man-nixos-rebuild.xml b/nixos/doc/manual/man-nixos-rebuild.xml
index a83c4fb965e..85929bf1b15 100644
--- a/nixos/doc/manual/man-nixos-rebuild.xml
+++ b/nixos/doc/manual/man-nixos-rebuild.xml
@@ -7,47 +7,45 @@
   <refmiscinfo class="source">NixOS</refmiscinfo>
 <!-- <refmiscinfo class="version"><xi:include href="version.txt" parse="text"/></refmiscinfo> -->
  </refmeta>
-
  <refnamediv>
   <refname><command>nixos-rebuild</command>
   </refname><refpurpose>reconfigure a NixOS machine</refpurpose>
  </refnamediv>
-
  <refsynopsisdiv>
   <cmdsynopsis>
-   <command>nixos-rebuild</command><group choice='req'>
+   <command>nixos-rebuild</command><group choice='req'> 
    <arg choice='plain'>
     <option>switch</option>
    </arg>
-
+    
    <arg choice='plain'>
     <option>boot</option>
    </arg>
-
+    
    <arg choice='plain'>
     <option>test</option>
    </arg>
-
+    
    <arg choice='plain'>
     <option>build</option>
    </arg>
-
+    
    <arg choice='plain'>
     <option>dry-build</option>
    </arg>
-
+    
    <arg choice='plain'>
     <option>dry-activate</option>
    </arg>
-
+    
    <arg choice='plain'>
     <option>edit</option>
    </arg>
-
+    
    <arg choice='plain'>
     <option>build-vm</option>
    </arg>
-
+    
    <arg choice='plain'>
     <option>build-vm-with-bootloader</option>
    </arg>
@@ -56,34 +54,33 @@
    <arg>
     <option>--upgrade</option>
    </arg>
-
+    
    <arg>
     <option>--install-bootloader</option>
    </arg>
-
+    
    <arg>
     <option>--no-build-nix</option>
    </arg>
-
+    
    <arg>
     <option>--fast</option>
    </arg>
-
+    
    <arg>
     <option>--rollback</option>
    </arg>
-
+    
    <arg>
     <option>--builders</option> <replaceable>builder-spec</replaceable>
    </arg>
-
    <sbr />
    <arg>
-    <group choice='req'>
+    <group choice='req'> 
     <arg choice='plain'>
      <option>--profile-name</option>
     </arg>
-
+     
     <arg choice='plain'>
      <option>-p</option>
     </arg>
@@ -93,56 +90,67 @@
    <arg>
     <option>--show-trace</option>
    </arg>
+    
    <arg>
-    <option>-I</option>
-    <replaceable>path</replaceable>
+    <option>-I</option> <replaceable>path</replaceable>
    </arg>
+    
    <arg>
-    <group choice='req'>
-     <arg choice='plain'><option>--verbose</option></arg>
-     <arg choice='plain'><option>-v</option></arg>
-    </group>
+    <group choice='req'> 
+    <arg choice='plain'>
+     <option>--verbose</option>
+    </arg>
+     
+    <arg choice='plain'>
+     <option>-v</option>
+    </arg>
+     </group>
    </arg>
+    
    <arg>
-    <group choice='req'>
-     <arg choice='plain'><option>--max-jobs</option></arg>
-     <arg choice='plain'><option>-j</option></arg>
-    </group>
-    <replaceable>number</replaceable>
+    <group choice='req'> 
+    <arg choice='plain'>
+     <option>--max-jobs</option>
+    </arg>
+     
+    <arg choice='plain'>
+     <option>-j</option>
+    </arg>
+     </group> <replaceable>number</replaceable>
    </arg>
+    
    <arg>
-    <group choice='req'>
-     <arg choice='plain'><option>--keep-failed</option></arg>
-     <arg choice='plain'><option>-K</option></arg>
-    </group>
+    <group choice='req'> 
+    <arg choice='plain'>
+     <option>--keep-failed</option>
+    </arg>
+     
+    <arg choice='plain'>
+     <option>-K</option>
+    </arg>
+     </group>
    </arg>
+    
    <arg>
-    <group choice='req'>
-     <arg choice='plain'><option>--keep-going</option></arg>
-     <arg choice='plain'><option>-k</option></arg>
-    </group>
+    <group choice='req'> 
+    <arg choice='plain'>
+     <option>--keep-going</option>
+    </arg>
+     
+    <arg choice='plain'>
+     <option>-k</option>
+    </arg>
+     </group>
    </arg>
   </cmdsynopsis>
  </refsynopsisdiv>
-
  <refsection>
   <title>Description</title>
-
   <para>
-   This command updates the system so that it corresponds to the configuration
-   specified in <filename>/etc/nixos/configuration.nix</filename>. Thus, every
-   time you modify <filename>/etc/nixos/configuration.nix</filename> or any
-   NixOS module, you must run <command>nixos-rebuild</command> to make the
-   changes take effect. It builds the new system in
-   <filename>/nix/store</filename>, runs its activation script, and stop and
-   (re)starts any system services if needed. Please note that user services need
-   to be started manually as they aren't detected by the activation script at the moment.
+   This command updates the system so that it corresponds to the configuration specified in <filename>/etc/nixos/configuration.nix</filename>. Thus, every time you modify <filename>/etc/nixos/configuration.nix</filename> or any NixOS module, you must run <command>nixos-rebuild</command> to make the changes take effect. It builds the new system in <filename>/nix/store</filename>, runs its activation script, and stop and (re)starts any system services if needed. Please note that user services need to be started manually as they aren't detected by the activation script at the moment.
   </para>
-
   <para>
-   This command has one required argument, which specifies the desired
-   operation. It must be one of the following:
-
+   This command has one required argument, which specifies the desired operation. It must be one of the following:
    <variablelist>
     <varlistentry>
      <term>
@@ -150,91 +158,64 @@
      </term>
      <listitem>
       <para>
-       Build and activate the new configuration, and make it the boot default.
-       That is, the configuration is added to the GRUB boot menu as the default
-       menu entry, so that subsequent reboots will boot the system into the new
-       configuration. Previous configurations activated with
-       <command>nixos-rebuild switch</command> or <command>nixos-rebuild
-       boot</command> remain available in the GRUB menu.
+       Build and activate the new configuration, and make it the boot default. That is, the configuration is added to the GRUB boot menu as the default menu entry, so that subsequent reboots will boot the system into the new configuration. Previous configurations activated with <command>nixos-rebuild switch</command> or <command>nixos-rebuild boot</command> remain available in the GRUB menu.
       </para>
      </listitem>
     </varlistentry>
-
     <varlistentry>
      <term>
       <option>boot</option>
      </term>
      <listitem>
       <para>
-       Build the new configuration and make it the boot default (as with
-       <command>nixos-rebuild switch</command>), but do not activate it. That
-       is, the system continues to run the previous configuration until the
-       next reboot.
+       Build the new configuration and make it the boot default (as with <command>nixos-rebuild switch</command>), but do not activate it. That is, the system continues to run the previous configuration until the next reboot.
       </para>
      </listitem>
     </varlistentry>
-
     <varlistentry>
      <term>
       <option>test</option>
      </term>
      <listitem>
       <para>
-       Build and activate the new configuration, but do not add it to the GRUB
-       boot menu. Thus, if you reboot the system (or if it crashes), you will
-       automatically revert to the default configuration (i.e. the
-       configuration resulting from the last call to <command>nixos-rebuild
-       switch</command> or <command>nixos-rebuild boot</command>).
+       Build and activate the new configuration, but do not add it to the GRUB boot menu. Thus, if you reboot the system (or if it crashes), you will automatically revert to the default configuration (i.e. the configuration resulting from the last call to <command>nixos-rebuild switch</command> or <command>nixos-rebuild boot</command>).
       </para>
      </listitem>
     </varlistentry>
-
     <varlistentry>
      <term>
       <option>build</option>
      </term>
      <listitem>
       <para>
-       Build the new configuration, but neither activate it nor add it to the
-       GRUB boot menu. It leaves a symlink named <filename>result</filename> in
-       the current directory, which points to the output of the top-level
-       “system” derivation. This is essentially the same as doing
+       Build the new configuration, but neither activate it nor add it to the GRUB boot menu. It leaves a symlink named <filename>result</filename> in the current directory, which points to the output of the top-level “system” derivation. This is essentially the same as doing
 <screen>
 <prompt>$ </prompt>nix-build /path/to/nixpkgs/nixos -A system
 </screen>
-       Note that you do not need to be <literal>root</literal> to run
-       <command>nixos-rebuild build</command>.
+       Note that you do not need to be <literal>root</literal> to run <command>nixos-rebuild build</command>.
       </para>
      </listitem>
     </varlistentry>
-
     <varlistentry>
      <term>
       <option>dry-build</option>
      </term>
      <listitem>
       <para>
-       Show what store paths would be built or downloaded by any of the
-       operations above, but otherwise do nothing.
+       Show what store paths would be built or downloaded by any of the operations above, but otherwise do nothing.
       </para>
      </listitem>
     </varlistentry>
-
     <varlistentry>
      <term>
       <option>dry-activate</option>
      </term>
      <listitem>
       <para>
-       Build the new configuration, but instead of activating it, show what
-       changes would be performed by the activation (i.e. by
-       <command>nixos-rebuild test</command>). For instance, this command will
-       print which systemd units would be restarted. The list of changes is not
-       guaranteed to be complete.
+       Build the new configuration, but instead of activating it, show what changes would be performed by the activation (i.e. by <command>nixos-rebuild test</command>). For instance, this command will print which systemd units would be restarted. The list of changes is not guaranteed to be complete.
       </para>
      </listitem>
     </varlistentry>
-
     <varlistentry>
      <term>
       <option>edit</option>
@@ -245,80 +226,49 @@
       </para>
      </listitem>
     </varlistentry>
-
     <varlistentry>
      <term>
       <option>build-vm</option>
      </term>
      <listitem>
       <para>
-       Build a script that starts a NixOS virtual machine with the desired
-       configuration. It leaves a symlink <filename>result</filename> in the
-       current directory that points (under
-       <filename>result/bin/run-<replaceable>hostname</replaceable>-vm</filename>)
-       at the script that starts the VM. Thus, to test a NixOS configuration in
-       a virtual machine, you should do the following:
+       Build a script that starts a NixOS virtual machine with the desired configuration. It leaves a symlink <filename>result</filename> in the current directory that points (under <filename>result/bin/run-<replaceable>hostname</replaceable>-vm</filename>) at the script that starts the VM. Thus, to test a NixOS configuration in a virtual machine, you should do the following:
 <screen>
 <prompt>$ </prompt>nixos-rebuild build-vm
 <prompt>$ </prompt>./result/bin/run-*-vm
 </screen>
       </para>
-
       <para>
-       The VM is implemented using the <literal>qemu</literal> package. For
-       best performance, you should load the <literal>kvm-intel</literal> or
-       <literal>kvm-amd</literal> kernel modules to get hardware
-       virtualisation.
+       The VM is implemented using the <literal>qemu</literal> package. For best performance, you should load the <literal>kvm-intel</literal> or <literal>kvm-amd</literal> kernel modules to get hardware virtualisation.
       </para>
-
       <para>
-       The VM mounts the Nix store of the host through the 9P file system. The
-       host Nix store is read-only, so Nix commands that modify the Nix store
-       will not work in the VM. This includes commands such as
-       <command>nixos-rebuild</command>; to change the VM’s configuration,
-       you must halt the VM and re-run the commands above.
+       The VM mounts the Nix store of the host through the 9P file system. The host Nix store is read-only, so Nix commands that modify the Nix store will not work in the VM. This includes commands such as <command>nixos-rebuild</command>; to change the VM’s configuration, you must halt the VM and re-run the commands above.
       </para>
-
       <para>
-       The VM has its own <literal>ext3</literal> root file system, which is
-       automatically created when the VM is first started, and is persistent
-       across reboots of the VM. It is stored in
-       <literal>./<replaceable>hostname</replaceable>.qcow2</literal>.
+       The VM has its own <literal>ext3</literal> root file system, which is automatically created when the VM is first started, and is persistent across reboots of the VM. It is stored in <literal>./<replaceable>hostname</replaceable>.qcow2</literal>.
 <!-- The entire file system hierarchy of the host is available in
       the VM under <filename>/hostfs</filename>.-->
       </para>
      </listitem>
     </varlistentry>
-
     <varlistentry>
      <term>
       <option>build-vm-with-bootloader</option>
      </term>
      <listitem>
       <para>
-       Like <option>build-vm</option>, but boots using the regular boot loader
-       of your configuration (e.g., GRUB 1 or 2), rather than booting directly
-       into the kernel and initial ramdisk of the system. This allows you to
-       test whether the boot loader works correctly. However, it does not
-       guarantee that your NixOS configuration will boot successfully on the
-       host hardware (i.e., after running <command>nixos-rebuild
-       switch</command>), because the hardware and boot loader configuration in
-       the VM are different. The boot loader is installed on an automatically
-       generated virtual disk containing a <filename>/boot</filename>
-       partition, which is mounted read-only in the VM.
+       Like <option>build-vm</option>, but boots using the regular boot loader of your configuration (e.g., GRUB 1 or 2), rather than booting directly into the kernel and initial ramdisk of the system. This allows you to test whether the boot loader works correctly. However, it does not guarantee that your NixOS configuration will boot successfully on the host hardware (i.e., after running <command>nixos-rebuild switch</command>), because the hardware and boot loader configuration in the VM are different. The boot loader is installed on an automatically generated virtual disk containing a <filename>/boot</filename> partition, which is mounted read-only in the VM.
       </para>
      </listitem>
     </varlistentry>
    </variablelist>
   </para>
  </refsection>
-
  <refsection>
   <title>Options</title>
   <para>
    This command accepts the following options:
   </para>
-
   <variablelist>
    <varlistentry>
     <term>
@@ -330,84 +280,56 @@
      </para>
     </listitem>
    </varlistentry>
-
    <varlistentry>
     <term>
      <option>--install-bootloader</option>
     </term>
     <listitem>
      <para>
-      Causes the boot loader to be (re)installed on the device specified by the
-      relevant configuration options.
+      Causes the boot loader to be (re)installed on the device specified by the relevant configuration options.
      </para>
     </listitem>
    </varlistentry>
-
    <varlistentry>
     <term>
      <option>--no-build-nix</option>
     </term>
     <listitem>
      <para>
-      Normally, <command>nixos-rebuild</command> first builds the
-      <varname>nixUnstable</varname> attribute in Nixpkgs, and uses the
-      resulting instance of the Nix package manager to build the new system
-      configuration. This is necessary if the NixOS modules use features not
-      provided by the currently installed version of Nix. This option disables
-      building a new Nix.
+      Normally, <command>nixos-rebuild</command> first builds the <varname>nixUnstable</varname> attribute in Nixpkgs, and uses the resulting instance of the Nix package manager to build the new system configuration. This is necessary if the NixOS modules use features not provided by the currently installed version of Nix. This option disables building a new Nix.
      </para>
     </listitem>
    </varlistentry>
-
    <varlistentry>
     <term>
      <option>--fast</option>
     </term>
     <listitem>
      <para>
-      Equivalent to <option>--no-build-nix</option>
-      <option>--show-trace</option>. This option is useful if you call
-      <command>nixos-rebuild</command> frequently (e.g. if you’re hacking on
-      a NixOS module).
+      Equivalent to <option>--no-build-nix</option> <option>--show-trace</option>. This option is useful if you call <command>nixos-rebuild</command> frequently (e.g. if you’re hacking on a NixOS module).
      </para>
     </listitem>
    </varlistentry>
-
    <varlistentry>
     <term>
      <option>--rollback</option>
     </term>
     <listitem>
      <para>
-      Instead of building a new configuration as specified by
-      <filename>/etc/nixos/configuration.nix</filename>, roll back to the
-      previous configuration. (The previous configuration is defined as the one
-      before the “current” generation of the Nix profile
-      <filename>/nix/var/nix/profiles/system</filename>.)
+      Instead of building a new configuration as specified by <filename>/etc/nixos/configuration.nix</filename>, roll back to the previous configuration. (The previous configuration is defined as the one before the “current” generation of the Nix profile <filename>/nix/var/nix/profiles/system</filename>.)
      </para>
     </listitem>
    </varlistentry>
-
    <varlistentry>
     <term>
      <option>--builders</option> <replaceable>builder-spec</replaceable>
     </term>
     <listitem>
      <para>
-      Allow ad-hoc remote builders for building the new system. This requires
-      the user executing <command>nixos-rebuild</command> (usually root) to be
-      configured as a trusted user in the Nix daemon. This can be achieved by
-      using the <literal>nix.trustedUsers</literal> NixOS option. Examples
-      values for that option are described in the <literal>Remote builds
-      chapter</literal> in the Nix manual, (i.e. <command>--builders
-      "ssh://bigbrother x86_64-linux"</command>). By specifying an empty string
-      existing builders specified in <filename>/etc/nix/machines</filename> can
-      be ignored: <command>--builders ""</command> for example when they are
-      not reachable due to network connectivity.
+      Allow ad-hoc remote builders for building the new system. This requires the user executing <command>nixos-rebuild</command> (usually root) to be configured as a trusted user in the Nix daemon. This can be achieved by using the <literal>nix.trustedUsers</literal> NixOS option. Examples values for that option are described in the <literal>Remote builds chapter</literal> in the Nix manual, (i.e. <command>--builders "ssh://bigbrother x86_64-linux"</command>). By specifying an empty string existing builders specified in <filename>/etc/nix/machines</filename> can be ignored: <command>--builders ""</command> for example when they are not reachable due to network connectivity.
      </para>
     </listitem>
    </varlistentry>
-
    <varlistentry>
     <term>
      <option>--profile-name</option>
@@ -417,97 +339,56 @@
     </term>
     <listitem>
      <para>
-      Instead of using the Nix profile
-      <filename>/nix/var/nix/profiles/system</filename> to keep track of the
-      current and previous system configurations, use
-      <filename>/nix/var/nix/profiles/system-profiles/<replaceable>name</replaceable></filename>.
-      When you use GRUB 2, for every system profile created with this flag,
-      NixOS will create a submenu named “NixOS - Profile
-      '<replaceable>name</replaceable>'” in GRUB’s boot menu, containing
-      the current and previous configurations of this profile.
+      Instead of using the Nix profile <filename>/nix/var/nix/profiles/system</filename> to keep track of the current and previous system configurations, use <filename>/nix/var/nix/profiles/system-profiles/<replaceable>name</replaceable></filename>. When you use GRUB 2, for every system profile created with this flag, NixOS will create a submenu named “NixOS - Profile '<replaceable>name</replaceable>'” in GRUB’s boot menu, containing the current and previous configurations of this profile.
      </para>
      <para>
-      For instance, if you want to test a configuration file named
-      <filename>test.nix</filename> without affecting the default system
-      profile, you would do:
+      For instance, if you want to test a configuration file named <filename>test.nix</filename> without affecting the default system profile, you would do:
 <screen>
 <prompt>$ </prompt>nixos-rebuild switch -p test -I nixos-config=./test.nix
 </screen>
-      The new configuration will appear in the GRUB 2 submenu “NixOS -
-      Profile 'test'”.
+      The new configuration will appear in the GRUB 2 submenu “NixOS - Profile 'test'”.
      </para>
     </listitem>
    </varlistentry>
-
    <varlistentry>
     <term>
      <option>--build-host</option>
     </term>
     <listitem>
      <para>
-      Instead of building the new configuration locally, use the specified host
-      to perform the build. The host needs to be accessible with ssh, and must
-      be able to perform Nix builds. If the option
-      <option>--target-host</option> is not set, the build will be copied back
-      to the local machine when done.
+      Instead of building the new configuration locally, use the specified host to perform the build. The host needs to be accessible with ssh, and must be able to perform Nix builds. If the option <option>--target-host</option> is not set, the build will be copied back to the local machine when done.
      </para>
      <para>
-      Note that, if <option>--no-build-nix</option> is not specified, Nix will
-      be built both locally and remotely. This is because the configuration
-      will always be evaluated locally even though the building might be
-      performed remotely.
+      Note that, if <option>--no-build-nix</option> is not specified, Nix will be built both locally and remotely. This is because the configuration will always be evaluated locally even though the building might be performed remotely.
      </para>
      <para>
-      You can include a remote user name in the host name
-      (<replaceable>user@host</replaceable>). You can also set ssh options by
-      defining the <envar>NIX_SSHOPTS</envar> environment variable.
+      You can include a remote user name in the host name (<replaceable>user@host</replaceable>). You can also set ssh options by defining the <envar>NIX_SSHOPTS</envar> environment variable.
      </para>
     </listitem>
    </varlistentry>
-
    <varlistentry>
     <term>
      <option>--target-host</option>
     </term>
     <listitem>
      <para>
-      Specifies the NixOS target host. By setting this to something other than
-      <replaceable>localhost</replaceable>, the system activation will happen
-      on the remote host instead of the local machine. The remote host needs to
-      be accessible over ssh, and for the commands <option>switch</option>,
-      <option>boot</option> and <option>test</option> you need root access.
+      Specifies the NixOS target host. By setting this to something other than <replaceable>localhost</replaceable>, the system activation will happen on the remote host instead of the local machine. The remote host needs to be accessible over ssh, and for the commands <option>switch</option>, <option>boot</option> and <option>test</option> you need root access.
      </para>
-
      <para>
-      If <option>--build-host</option> is not explicitly specified,
-      <option>--build-host</option> will implicitly be set to the same value as
-      <option>--target-host</option>. So, if you only specify
-      <option>--target-host</option> both building and activation will take
-      place remotely (and no build artifacts will be copied to the local
-      machine).
+      If <option>--build-host</option> is not explicitly specified, <option>--build-host</option> will implicitly be set to the same value as <option>--target-host</option>. So, if you only specify <option>--target-host</option> both building and activation will take place remotely (and no build artifacts will be copied to the local machine).
      </para>
-
      <para>
-      You can include a remote user name in the host name
-      (<replaceable>user@host</replaceable>). You can also set ssh options by
-      defining the <envar>NIX_SSHOPTS</envar> environment variable.
+      You can include a remote user name in the host name (<replaceable>user@host</replaceable>). You can also set ssh options by defining the <envar>NIX_SSHOPTS</envar> environment variable.
      </para>
     </listitem>
    </varlistentry>
   </variablelist>
-
   <para>
-   In addition, <command>nixos-rebuild</command> accepts various Nix-related
-   flags, including <option>--max-jobs</option> / <option>-j</option>,
-   <option>--show-trace</option>, <option>--keep-failed</option>,
-   <option>--keep-going</option> and <option>--verbose</option> /
-   <option>-v</option>. See the Nix manual for details.
+   In addition, <command>nixos-rebuild</command> accepts various Nix-related flags, including <option>--max-jobs</option> / <option>-j</option>, <option>--show-trace</option>, <option>--keep-failed</option>, <option>--keep-going</option> and <option>--verbose</option> / <option>-v</option>. See the Nix manual for details.
   </para>
  </refsection>
-
  <refsection>
   <title>Environment</title>
-
   <variablelist>
    <varlistentry>
     <term>
@@ -515,31 +396,25 @@
     </term>
     <listitem>
      <para>
-      Path to the main NixOS configuration module. Defaults to
-      <filename>/etc/nixos/configuration.nix</filename>.
+      Path to the main NixOS configuration module. Defaults to <filename>/etc/nixos/configuration.nix</filename>.
      </para>
     </listitem>
    </varlistentry>
-
    <varlistentry>
     <term>
      <envar>NIX_SSHOPTS</envar>
     </term>
     <listitem>
      <para>
-      Additional options to be passed to <command>ssh</command> on the command
-      line.
+      Additional options to be passed to <command>ssh</command> on the command line.
      </para>
     </listitem>
    </varlistentry>
   </variablelist>
  </refsection>
-
  <refsection>
   <title>Files</title>
-
   <variablelist>
-
    <varlistentry>
     <term>
      <filename>/run/current-system</filename>
@@ -550,22 +425,18 @@
      </para>
     </listitem>
    </varlistentry>
-
    <varlistentry>
     <term>
      <filename>/nix/var/nix/profiles/system</filename>
     </term>
     <listitem>
      <para>
-      The Nix profile that contains the current and previous system
-      configurations. Used to generate the GRUB boot menu.
+      The Nix profile that contains the current and previous system configurations. Used to generate the GRUB boot menu.
      </para>
     </listitem>
    </varlistentry>
-
   </variablelist>
  </refsection>
-
  <refsection>
   <title>Bugs</title>
   <para>
diff --git a/nixos/doc/manual/man-nixos-version.xml b/nixos/doc/manual/man-nixos-version.xml
index 931c4a5ad02..cb844da10f0 100644
--- a/nixos/doc/manual/man-nixos-version.xml
+++ b/nixos/doc/manual/man-nixos-version.xml
@@ -25,8 +25,7 @@
  <refsection>
   <title>Description</title>
   <para>
-   This command shows the version of the currently active NixOS configuration.
-   For example:
+   This command shows the version of the currently active NixOS configuration. For example:
 <screen>$ nixos-version
 16.03.1011.6317da4 (Emu)
 </screen>
@@ -38,8 +37,7 @@
      </term>
      <listitem>
       <para>
-       The NixOS release, indicating the year and month in which it was
-       released (e.g. March 2016).
+       The NixOS release, indicating the year and month in which it was released (e.g. March 2016).
       </para>
      </listitem>
     </varlistentry>
@@ -49,12 +47,7 @@
      </term>
      <listitem>
       <para>
-       The number of commits in the Nixpkgs Git repository between the start of
-       the release branch and the commit from which this version was built.
-       This ensures that NixOS versions are monotonically increasing. It is
-       <literal>git</literal> when the current NixOS configuration was built
-       from a checkout of the Nixpkgs Git repository rather than from a NixOS
-       channel.
+       The number of commits in the Nixpkgs Git repository between the start of the release branch and the commit from which this version was built. This ensures that NixOS versions are monotonically increasing. It is <literal>git</literal> when the current NixOS configuration was built from a checkout of the Nixpkgs Git repository rather than from a NixOS channel.
       </para>
      </listitem>
     </varlistentry>
@@ -64,8 +57,7 @@
      </term>
      <listitem>
       <para>
-       The first 7 characters of the commit in the Nixpkgs Git repository from
-       which this version was built.
+       The first 7 characters of the commit in the Nixpkgs Git repository from which this version was built.
       </para>
      </listitem>
     </varlistentry>
@@ -75,9 +67,7 @@
      </term>
      <listitem>
       <para>
-       The code name of the NixOS release. The first letter of the code name
-       indicates that this is the N'th stable NixOS release; for example, Emu
-       is the fifth release.
+       The code name of the NixOS release. The first letter of the code name indicates that this is the N'th stable NixOS release; for example, Emu is the fifth release.
       </para>
      </listitem>
     </varlistentry>
@@ -99,8 +89,7 @@
     </term>
     <listitem>
      <para>
-      Show the full SHA1 hash of the Git commit from which this configuration
-      was built, e.g.
+      Show the full SHA1 hash of the Git commit from which this configuration was built, e.g.
 <screen>$ nixos-version --hash
 6317da40006f6bc2480c6781999c52d88dde2acf
 </screen>
diff --git a/nixos/doc/manual/manual.xml b/nixos/doc/manual/manual.xml
index 12f52e1997c..9f7260b2495 100644
--- a/nixos/doc/manual/manual.xml
+++ b/nixos/doc/manual/manual.xml
@@ -11,26 +11,17 @@
  <preface xml:id="preface">
   <title>Preface</title>
   <para>
-   This manual describes how to install, use and extend NixOS, a Linux
-   distribution based on the purely functional package management system Nix.
+   This manual describes how to install, use and extend NixOS, a Linux distribution based on the purely functional package management system Nix.
   </para>
   <para>
-   If you encounter problems, please report them on the
-   <literal
-    xlink:href="https://discourse.nixos.org">Discourse</literal> or
-   on the <link
-    xlink:href="irc://irc.freenode.net/#nixos">
-   <literal>#nixos</literal> channel on Freenode</link>. Bugs should be
-   reported in
-   <link
-    xlink:href="https://github.com/NixOS/nixpkgs/issues">NixOS’
-   GitHub issue tracker</link>.
+   If you encounter problems, please report them on the <literal
+    xlink:href="https://discourse.nixos.org">Discourse</literal> or on the <link
+    xlink:href="irc://irc.freenode.net/#nixos"> <literal>#nixos</literal> channel on Freenode</link>. Bugs should be reported in <link
+    xlink:href="https://github.com/NixOS/nixpkgs/issues">NixOS’ GitHub issue tracker</link>.
   </para>
   <note>
    <para>
-    Commands prefixed with <literal>#</literal> have to be run as root, either
-    requiring to login as root user or temporarily switching to it using
-    <literal>sudo</literal> for example.
+    Commands prefixed with <literal>#</literal> have to be run as root, either requiring to login as root user or temporarily switching to it using <literal>sudo</literal> for example.
    </para>
   </note>
  </preface>
diff --git a/nixos/doc/manual/release-notes/release-notes.xml b/nixos/doc/manual/release-notes/release-notes.xml
index 444862c5739..198f8eb3481 100644
--- a/nixos/doc/manual/release-notes/release-notes.xml
+++ b/nixos/doc/manual/release-notes/release-notes.xml
@@ -5,8 +5,7 @@
           xml:id="ch-release-notes">
  <title>Release Notes</title>
  <para>
-  This section lists the release notes for each stable version of NixOS and
-  current unstable revision.
+  This section lists the release notes for each stable version of NixOS and current unstable revision.
  </para>
  <xi:include href="rl-2003.xml" />
  <xi:include href="rl-1909.xml" />
diff --git a/nixos/doc/manual/release-notes/rl-1404.xml b/nixos/doc/manual/release-notes/rl-1404.xml
index 8d8cea4303a..26dc5bb252e 100644
--- a/nixos/doc/manual/release-notes/rl-1404.xml
+++ b/nixos/doc/manual/release-notes/rl-1404.xml
@@ -6,23 +6,16 @@
  <title>Release 14.04 (“Baboon”, 2014/04/30)</title>
 
  <para>
-  This is the second stable release branch of NixOS. In addition to numerous
-  new and upgraded packages and modules, this release has the following
-  highlights:
+  This is the second stable release branch of NixOS. In addition to numerous new and upgraded packages and modules, this release has the following highlights:
   <itemizedlist>
    <listitem>
     <para>
-     Installation on UEFI systems is now supported. See
-     <xref linkend="sec-installation"/> for details.
+     Installation on UEFI systems is now supported. See <xref linkend="sec-installation"/> for details.
     </para>
    </listitem>
    <listitem>
     <para>
-     Systemd has been updated to version 212, which has
-     <link xlink:href="http://cgit.freedesktop.org/systemd/systemd/plain/NEWS?id=v212">numerous
-     improvements</link>. NixOS now automatically starts systemd user instances
-     when you log in. You can define global user units through the
-     <option>systemd.unit.*</option> options.
+     Systemd has been updated to version 212, which has <link xlink:href="http://cgit.freedesktop.org/systemd/systemd/plain/NEWS?id=v212">numerous improvements</link>. NixOS now automatically starts systemd user instances when you log in. You can define global user units through the <option>systemd.unit.*</option> options.
     </para>
    </listitem>
    <listitem>
@@ -47,47 +40,28 @@
    </listitem>
    <listitem>
     <para>
-     Nix has been updated to 1.7
-     (<link
+     Nix has been updated to 1.7 (<link
   xlink:href="http://nixos.org/nix/manual/#ssec-relnotes-1.7">details</link>).
     </para>
    </listitem>
    <listitem>
     <para>
-     NixOS now supports fully declarative management of users and groups. If
-     you set <option>users.mutableUsers</option> to <literal>false</literal>,
-     then the contents of <filename>/etc/passwd</filename> and
-     <filename>/etc/group</filename> will be
-     <link
-  xlink:href="https://www.usenix.org/legacy/event/lisa02/tech/full_papers/traugott/traugott_html/">congruent</link>
-     to your NixOS configuration. For instance, if you remove a user from
-     <option>users.extraUsers</option> and run
-     <command>nixos-rebuild</command>, the user account will cease to exist.
-     Also, imperative commands for managing users and groups, such as
-     <command>useradd</command>, are no longer available. If
-     <option>users.mutableUsers</option> is <literal>true</literal> (the
-     default), then behaviour is unchanged from NixOS 13.10.
+     NixOS now supports fully declarative management of users and groups. If you set <option>users.mutableUsers</option> to <literal>false</literal>, then the contents of <filename>/etc/passwd</filename> and <filename>/etc/group</filename> will be <link
+  xlink:href="https://www.usenix.org/legacy/event/lisa02/tech/full_papers/traugott/traugott_html/">congruent</link> to your NixOS configuration. For instance, if you remove a user from <option>users.extraUsers</option> and run <command>nixos-rebuild</command>, the user account will cease to exist. Also, imperative commands for managing users and groups, such as <command>useradd</command>, are no longer available. If <option>users.mutableUsers</option> is <literal>true</literal> (the default), then behaviour is unchanged from NixOS 13.10.
     </para>
    </listitem>
    <listitem>
     <para>
-     NixOS now has basic container support, meaning you can easily run a NixOS
-     instance as a container in a NixOS host system. These containers are
-     suitable for testing and experimentation but not production use, since
-     they’re not fully isolated from the host. See
-     <xref linkend="ch-containers"/> for details.
+     NixOS now has basic container support, meaning you can easily run a NixOS instance as a container in a NixOS host system. These containers are suitable for testing and experimentation but not production use, since they’re not fully isolated from the host. See <xref linkend="ch-containers"/> for details.
     </para>
    </listitem>
    <listitem>
     <para>
-     Systemd units provided by packages can now be overridden from the NixOS
-     configuration. For instance, if a package <literal>foo</literal> provides
-     systemd units, you can say:
+     Systemd units provided by packages can now be overridden from the NixOS configuration. For instance, if a package <literal>foo</literal> provides systemd units, you can say:
 <programlisting>
 systemd.packages = [ pkgs.foo ];
 </programlisting>
-     to enable those units. You can then set or override unit options in the
-     usual way, e.g.
+     to enable those units. You can then set or override unit options in the usual way, e.g.
 <programlisting>
 systemd.services.foo.wantedBy = [ "multi-user.target" ];
 systemd.services.foo.serviceConfig.MemoryLimit = "512M";
@@ -98,14 +72,11 @@ systemd.services.foo.serviceConfig.MemoryLimit = "512M";
  </para>
 
  <para>
-  When upgrading from a previous release, please be aware of the following
-  incompatible changes:
+  When upgrading from a previous release, please be aware of the following incompatible changes:
   <itemizedlist>
    <listitem>
     <para>
-     Nixpkgs no longer exposes unfree packages by default. If your NixOS
-     configuration requires unfree packages from Nixpkgs, you need to enable
-     support for them explicitly by setting:
+     Nixpkgs no longer exposes unfree packages by default. If your NixOS configuration requires unfree packages from Nixpkgs, you need to enable support for them explicitly by setting:
 <programlisting>
 nixpkgs.config.allowUnfree = true;
 </programlisting>
@@ -118,8 +89,7 @@ error: package ‘nvidia-x11-331.49-3.12.17’ in ‘…/nvidia-x11/default.nix:
    </listitem>
    <listitem>
     <para>
-     The Adobe Flash player is no longer enabled by default in the Firefox and
-     Chromium wrappers. To enable it, you must set:
+     The Adobe Flash player is no longer enabled by default in the Firefox and Chromium wrappers. To enable it, you must set:
 <programlisting>
 nixpkgs.config.allowUnfree = true;
 nixpkgs.config.firefox.enableAdobeFlash = true; # for Firefox
@@ -129,8 +99,7 @@ nixpkgs.config.chromium.enableAdobeFlash = true; # for Chromium
    </listitem>
    <listitem>
     <para>
-     The firewall is now enabled by default. If you don’t want this, you need
-     to disable it explicitly:
+     The firewall is now enabled by default. If you don’t want this, you need to disable it explicitly:
 <programlisting>
 networking.firewall.enable = false;
 </programlisting>
@@ -138,40 +107,22 @@ networking.firewall.enable = false;
    </listitem>
    <listitem>
     <para>
-     The option <option>boot.loader.grub.memtest86</option> has been renamed to
-     <option>boot.loader.grub.memtest86.enable</option>.
+     The option <option>boot.loader.grub.memtest86</option> has been renamed to <option>boot.loader.grub.memtest86.enable</option>.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>mysql55</literal> service has been merged into the
-     <literal>mysql</literal> service, which no longer sets a default for the
-     option <option>services.mysql.package</option>.
+     The <literal>mysql55</literal> service has been merged into the <literal>mysql</literal> service, which no longer sets a default for the option <option>services.mysql.package</option>.
     </para>
    </listitem>
    <listitem>
     <para>
-     Package variants are now differentiated by suffixing the name, rather than
-     the version. For instance, <filename>sqlite-3.8.4.3-interactive</filename>
-     is now called <filename>sqlite-interactive-3.8.4.3</filename>. This
-     ensures that <literal>nix-env -i sqlite</literal> is unambiguous, and that
-     <literal>nix-env -u</literal> won’t “upgrade”
-     <literal>sqlite</literal> to <literal>sqlite-interactive</literal> or vice
-     versa. Notably, this change affects the Firefox wrapper (which provides
-     plugins), as it is now called <literal>firefox-wrapper</literal>. So when
-     using <command>nix-env</command>, you should do <literal>nix-env -e
-     firefox; nix-env -i firefox-wrapper</literal> if you want to keep using
-     the wrapper. This change does not affect declarative package management,
-     since attribute names like <literal>pkgs.firefoxWrapper</literal> were
-     already unambiguous.
+     Package variants are now differentiated by suffixing the name, rather than the version. For instance, <filename>sqlite-3.8.4.3-interactive</filename> is now called <filename>sqlite-interactive-3.8.4.3</filename>. This ensures that <literal>nix-env -i sqlite</literal> is unambiguous, and that <literal>nix-env -u</literal> won’t “upgrade” <literal>sqlite</literal> to <literal>sqlite-interactive</literal> or vice versa. Notably, this change affects the Firefox wrapper (which provides plugins), as it is now called <literal>firefox-wrapper</literal>. So when using <command>nix-env</command>, you should do <literal>nix-env -e firefox; nix-env -i firefox-wrapper</literal> if you want to keep using the wrapper. This change does not affect declarative package management, since attribute names like <literal>pkgs.firefoxWrapper</literal> were already unambiguous.
     </para>
    </listitem>
    <listitem>
     <para>
-     The symlink <filename>/etc/ca-bundle.crt</filename> is gone. Programs
-     should instead use the environment variable
-     <envar>OPENSSL_X509_CERT_FILE</envar> (which points to
-     <filename>/etc/ssl/certs/ca-bundle.crt</filename>).
+     The symlink <filename>/etc/ca-bundle.crt</filename> is gone. Programs should instead use the environment variable <envar>OPENSSL_X509_CERT_FILE</envar> (which points to <filename>/etc/ssl/certs/ca-bundle.crt</filename>).
     </para>
    </listitem>
   </itemizedlist>
diff --git a/nixos/doc/manual/release-notes/rl-1412.xml b/nixos/doc/manual/release-notes/rl-1412.xml
index 139f61c2a55..af17e166322 100644
--- a/nixos/doc/manual/release-notes/rl-1412.xml
+++ b/nixos/doc/manual/release-notes/rl-1412.xml
@@ -6,19 +6,16 @@
  <title>Release 14.12 (“Caterpillar”, 2014/12/30)</title>
 
  <para>
-  In addition to numerous new and upgraded packages, this release has the
-  following highlights:
+  In addition to numerous new and upgraded packages, this release has the following highlights:
   <itemizedlist>
    <listitem>
     <para>
-     Systemd has been updated to version 217, which has numerous
-     <link xlink:href="http://lists.freedesktop.org/archives/systemd-devel/2014-October/024662.html">improvements.</link>
+     Systemd has been updated to version 217, which has numerous <link xlink:href="http://lists.freedesktop.org/archives/systemd-devel/2014-October/024662.html">improvements.</link>
     </para>
    </listitem>
    <listitem>
     <para>
-     <link xlink:href="https://www.mail-archive.com/nix-dev@lists.science.uu.nl/msg13957.html">
-     Nix has been updated to 1.8.</link>
+     <link xlink:href="https://www.mail-archive.com/nix-dev@lists.science.uu.nl/msg13957.html"> Nix has been updated to 1.8.</link>
     </para>
    </listitem>
    <listitem>
@@ -38,13 +35,7 @@
    </listitem>
    <listitem>
     <para>
-     If <option>users.mutableUsers</option> is enabled (the default), changes
-     made to the declaration of a user or group will be correctly realised when
-     running <command>nixos-rebuild</command>. For instance, removing a user
-     specification from <filename>configuration.nix</filename> will cause the
-     actual user account to be deleted. If <option>users.mutableUsers</option>
-     is disabled, it is no longer necessary to specify UIDs or GIDs; if
-     omitted, they are allocated dynamically.
+     If <option>users.mutableUsers</option> is enabled (the default), changes made to the declaration of a user or group will be correctly realised when running <command>nixos-rebuild</command>. For instance, removing a user specification from <filename>configuration.nix</filename> will cause the actual user account to be deleted. If <option>users.mutableUsers</option> is disabled, it is no longer necessary to specify UIDs or GIDs; if omitted, they are allocated dynamically.
     </para>
    </listitem>
   </itemizedlist>
@@ -362,18 +353,12 @@
  </para>
 
  <para>
-  When upgrading from a previous release, please be aware of the following
-  incompatible changes:
+  When upgrading from a previous release, please be aware of the following incompatible changes:
   <itemizedlist>
    <listitem>
     <para>
-     The default version of Apache httpd is now 2.4. If you use the
-     <option>extraConfig</option> option to pass literal Apache configuration
-     text, you may need to update it — see
-     <link
-xlink:href="http://httpd.apache.org/docs/2.4/upgrading.html">Apache’s
-     documentation</link> for details. If you wish to continue to use httpd
-     2.2, add the following line to your NixOS configuration:
+     The default version of Apache httpd is now 2.4. If you use the <option>extraConfig</option> option to pass literal Apache configuration text, you may need to update it — see <link
+xlink:href="http://httpd.apache.org/docs/2.4/upgrading.html">Apache’s documentation</link> for details. If you wish to continue to use httpd 2.2, add the following line to your NixOS configuration:
 <programlisting>
 services.httpd.package = pkgs.apacheHttpd_2_2;
 </programlisting>
@@ -381,85 +366,57 @@ services.httpd.package = pkgs.apacheHttpd_2_2;
    </listitem>
    <listitem>
     <para>
-     PHP 5.3 has been removed because it is no longer supported by the PHP
-     project. A <link
-xlink:href="http://php.net/migration54">migration
-     guide</link> is available.
+     PHP 5.3 has been removed because it is no longer supported by the PHP project. A <link
+xlink:href="http://php.net/migration54">migration guide</link> is available.
     </para>
    </listitem>
    <listitem>
     <para>
-     The host side of a container virtual Ethernet pair is now called
-     <literal>ve-<replaceable>container-name</replaceable></literal> rather
-     than <literal>c-<replaceable>container-name</replaceable></literal>.
+     The host side of a container virtual Ethernet pair is now called <literal>ve-<replaceable>container-name</replaceable></literal> rather than <literal>c-<replaceable>container-name</replaceable></literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     GNOME 3.10 support has been dropped. The default GNOME version is now
-     3.12.
+     GNOME 3.10 support has been dropped. The default GNOME version is now 3.12.
     </para>
    </listitem>
    <listitem>
     <para>
-     VirtualBox has been upgraded to 4.3.20 release. Users may be required to
-     run <command>rm -rf /tmp/.vbox*</command>. The line <literal>imports = [
-     &lt;nixpkgs/nixos/modules/programs/virtualbox.nix&gt; ]</literal> is no
-     longer necessary, use <literal>services.virtualboxHost.enable =
-     true</literal> instead.
+     VirtualBox has been upgraded to 4.3.20 release. Users may be required to run <command>rm -rf /tmp/.vbox*</command>. The line <literal>imports = [ &lt;nixpkgs/nixos/modules/programs/virtualbox.nix&gt; ]</literal> is no longer necessary, use <literal>services.virtualboxHost.enable = true</literal> instead.
     </para>
     <para>
-     Also, hardening mode is now enabled by default, which means that unless
-     you want to use USB support, you no longer need to be a member of the
-     <literal>vboxusers</literal> group.
+     Also, hardening mode is now enabled by default, which means that unless you want to use USB support, you no longer need to be a member of the <literal>vboxusers</literal> group.
     </para>
    </listitem>
    <listitem>
     <para>
-     Chromium has been updated to 39.0.2171.65.
-     <option>enablePepperPDF</option> is now enabled by default.
-     <literal>chromium*Wrapper</literal> packages no longer exist, because
-     upstream removed NSAPI support. <literal>chromium-stable</literal> has
-     been renamed to <literal>chromium</literal>.
+     Chromium has been updated to 39.0.2171.65. <option>enablePepperPDF</option> is now enabled by default. <literal>chromium*Wrapper</literal> packages no longer exist, because upstream removed NSAPI support. <literal>chromium-stable</literal> has been renamed to <literal>chromium</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     Python packaging documentation is now part of nixpkgs manual. To override
-     the python packages available to a custom python you now use
-     <literal>pkgs.pythonFull.buildEnv.override</literal> instead of
-     <literal>pkgs.pythonFull.override</literal>.
+     Python packaging documentation is now part of nixpkgs manual. To override the python packages available to a custom python you now use <literal>pkgs.pythonFull.buildEnv.override</literal> instead of <literal>pkgs.pythonFull.override</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>boot.resumeDevice = "8:6"</literal> is no longer supported. Most
-     users will want to leave it undefined, which takes the swap partitions
-     automatically. There is an evaluation assertion to ensure that the string
-     starts with a slash.
+     <literal>boot.resumeDevice = "8:6"</literal> is no longer supported. Most users will want to leave it undefined, which takes the swap partitions automatically. There is an evaluation assertion to ensure that the string starts with a slash.
     </para>
    </listitem>
    <listitem>
     <para>
-     The system-wide default timezone for NixOS installations changed from
-     <literal>CET</literal> to <literal>UTC</literal>. To choose a different
-     timezone for your system, configure <literal>time.timeZone</literal> in
-     <literal>configuration.nix</literal>. A fairly complete list of possible
-     values for that setting is available at
-     <link
+     The system-wide default timezone for NixOS installations changed from <literal>CET</literal> to <literal>UTC</literal>. To choose a different timezone for your system, configure <literal>time.timeZone</literal> in <literal>configuration.nix</literal>. A fairly complete list of possible values for that setting is available at <link
 xlink:href="https://en.wikipedia.org/wiki/List_of_tz_database_time_zones"/>.
     </para>
    </listitem>
    <listitem>
     <para>
-     GNU screen has been updated to 4.2.1, which breaks the ability to connect
-     to sessions created by older versions of screen.
+     GNU screen has been updated to 4.2.1, which breaks the ability to connect to sessions created by older versions of screen.
     </para>
    </listitem>
    <listitem>
     <para>
-     The Intel GPU driver was updated to the 3.x prerelease version (used by
-     most distributions) and supports DRI3 now.
+     The Intel GPU driver was updated to the 3.x prerelease version (used by most distributions) and supports DRI3 now.
     </para>
    </listitem>
   </itemizedlist>
diff --git a/nixos/doc/manual/release-notes/rl-1509.xml b/nixos/doc/manual/release-notes/rl-1509.xml
index 5c4d9970178..5e162c3f0f7 100644
--- a/nixos/doc/manual/release-notes/rl-1509.xml
+++ b/nixos/doc/manual/release-notes/rl-1509.xml
@@ -6,42 +6,23 @@
  <title>Release 15.09 (“Dingo”, 2015/09/30)</title>
 
  <para>
-  In addition to numerous new and upgraded packages, this release has the
-  following highlights:
+  In addition to numerous new and upgraded packages, this release has the following highlights:
  </para>
 
  <itemizedlist>
   <listitem>
    <para>
-    The <link xlink:href="http://haskell.org/">Haskell</link> packages
-    infrastructure has been re-designed from the ground up (&quot;Haskell
-    NG&quot;). NixOS now distributes the latest version of every single package
-    registered on
-    <link
-    xlink:href="http://hackage.haskell.org/">Hackage</link> -- well
-    in excess of 8,000 Haskell packages. Detailed instructions on how to use
-    that infrastructure can be found in the
-    <link
-    xlink:href="http://nixos.org/nixpkgs/manual/#users-guide-to-the-haskell-infrastructure">User's
-    Guide to the Haskell Infrastructure</link>. Users migrating from an earlier
-    release may find helpful information below, in the list of
-    backwards-incompatible changes. Furthermore, we distribute 51(!) additional
-    Haskell package sets that provide every single
-    <link
-    xlink:href="http://www.stackage.org/">LTS Haskell</link> release
-    since version 0.0 as well as the most recent
-    <link
-    xlink:href="http://www.stackage.org/">Stackage Nightly</link>
-    snapshot. The announcement
-    <link
-    xlink:href="https://nixos.org/nix-dev/2015-September/018138.html">&quot;Full
-    Stackage Support in Nixpkgs&quot;</link> gives additional details.
+    The <link xlink:href="http://haskell.org/">Haskell</link> packages infrastructure has been re-designed from the ground up (&quot;Haskell NG&quot;). NixOS now distributes the latest version of every single package registered on <link
+    xlink:href="http://hackage.haskell.org/">Hackage</link> -- well in excess of 8,000 Haskell packages. Detailed instructions on how to use that infrastructure can be found in the <link
+    xlink:href="http://nixos.org/nixpkgs/manual/#users-guide-to-the-haskell-infrastructure">User's Guide to the Haskell Infrastructure</link>. Users migrating from an earlier release may find helpful information below, in the list of backwards-incompatible changes. Furthermore, we distribute 51(!) additional Haskell package sets that provide every single <link
+    xlink:href="http://www.stackage.org/">LTS Haskell</link> release since version 0.0 as well as the most recent <link
+    xlink:href="http://www.stackage.org/">Stackage Nightly</link> snapshot. The announcement <link
+    xlink:href="https://nixos.org/nix-dev/2015-September/018138.html">&quot;Full Stackage Support in Nixpkgs&quot;</link> gives additional details.
    </para>
   </listitem>
   <listitem>
    <para>
-    Nix has been updated to version 1.10, which among other improvements
-    enables cryptographic signatures on binary caches for improved security.
+    Nix has been updated to version 1.10, which among other improvements enables cryptographic signatures on binary caches for improved security.
    </para>
   </listitem>
   <listitem>
@@ -50,8 +31,7 @@
 <programlisting>
 system.autoUpgrade.enable = true;
 </programlisting>
-    This will cause the system to periodically check for updates in your
-    current channel and run <command>nixos-rebuild</command>.
+    This will cause the system to periodically check for updates in your current channel and run <command>nixos-rebuild</command>.
    </para>
   </listitem>
   <listitem>
@@ -71,8 +51,7 @@ system.autoUpgrade.enable = true;
   </listitem>
   <listitem>
    <para>
-    KDE 5 has been upgraded to KDE Frameworks 5.10, Plasma 5.3.2 and
-    Applications 15.04.3. KDE 4 has been updated to kdelibs-4.14.10.
+    KDE 5 has been upgraded to KDE Frameworks 5.10, Plasma 5.3.2 and Applications 15.04.3. KDE 4 has been updated to kdelibs-4.14.10.
    </para>
   </listitem>
   <listitem>
@@ -424,93 +403,61 @@ system.autoUpgrade.enable = true;
  </para>
 
  <para>
-  When upgrading from a previous release, please be aware of the following
-  incompatible changes:
+  When upgrading from a previous release, please be aware of the following incompatible changes:
   <itemizedlist>
    <listitem>
     <para>
-     <command>sshd</command> no longer supports DSA and ECDSA host keys by
-     default. If you have existing systems with such host keys and want to
-     continue to use them, please set
+     <command>sshd</command> no longer supports DSA and ECDSA host keys by default. If you have existing systems with such host keys and want to continue to use them, please set
 <programlisting>
 system.stateVersion = "14.12";
 </programlisting>
-     The new option <option>system.stateVersion</option> ensures that certain
-     configuration changes that could break existing systems (such as the
-     <command>sshd</command> host key setting) will maintain compatibility with
-     the specified NixOS release. NixOps sets the state version of existing
-     deployments automatically.
+     The new option <option>system.stateVersion</option> ensures that certain configuration changes that could break existing systems (such as the <command>sshd</command> host key setting) will maintain compatibility with the specified NixOS release. NixOps sets the state version of existing deployments automatically.
     </para>
    </listitem>
    <listitem>
     <para>
-     <command>cron</command> is no longer enabled by default, unless you have a
-     non-empty <option>services.cron.systemCronJobs</option>. To force
-     <command>cron</command> to be enabled, set <option>services.cron.enable =
-     true</option>.
+     <command>cron</command> is no longer enabled by default, unless you have a non-empty <option>services.cron.systemCronJobs</option>. To force <command>cron</command> to be enabled, set <option>services.cron.enable = true</option>.
     </para>
    </listitem>
    <listitem>
     <para>
-     Nix now requires binary caches to be cryptographically signed. If you have
-     unsigned binary caches that you want to continue to use, you should set
-     <option>nix.requireSignedBinaryCaches = false</option>.
+     Nix now requires binary caches to be cryptographically signed. If you have unsigned binary caches that you want to continue to use, you should set <option>nix.requireSignedBinaryCaches = false</option>.
     </para>
    </listitem>
    <listitem>
     <para>
-     Steam now doesn't need root rights to work. Instead of using
-     <literal>*-steam-chrootenv</literal>, you should now just run
-     <literal>steam</literal>. <literal>steamChrootEnv</literal> package was
-     renamed to <literal>steam</literal>, and old <literal>steam</literal>
-     package -- to <literal>steamOriginal</literal>.
+     Steam now doesn't need root rights to work. Instead of using <literal>*-steam-chrootenv</literal>, you should now just run <literal>steam</literal>. <literal>steamChrootEnv</literal> package was renamed to <literal>steam</literal>, and old <literal>steam</literal> package -- to <literal>steamOriginal</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     CMPlayer has been renamed to bomi upstream. Package
-     <literal>cmplayer</literal> was accordingly renamed to
-     <literal>bomi</literal>
+     CMPlayer has been renamed to bomi upstream. Package <literal>cmplayer</literal> was accordingly renamed to <literal>bomi</literal>
     </para>
    </listitem>
    <listitem>
     <para>
-     Atom Shell has been renamed to Electron upstream. Package
-     <literal>atom-shell</literal> was accordingly renamed to
-     <literal>electron</literal>
+     Atom Shell has been renamed to Electron upstream. Package <literal>atom-shell</literal> was accordingly renamed to <literal>electron</literal>
     </para>
    </listitem>
    <listitem>
     <para>
-     Elm is not released on Hackage anymore. You should now use
-     <literal>elmPackages.elm</literal> which contains the latest Elm platform.
+     Elm is not released on Hackage anymore. You should now use <literal>elmPackages.elm</literal> which contains the latest Elm platform.
     </para>
    </listitem>
    <listitem>
     <para>
-     The CUPS printing service has been updated to version
-     <literal>2.0.2</literal>. Furthermore its systemd service has been renamed
-     to <literal>cups.service</literal>.
+     The CUPS printing service has been updated to version <literal>2.0.2</literal>. Furthermore its systemd service has been renamed to <literal>cups.service</literal>.
     </para>
     <para>
-     Local printers are no longer shared or advertised by default. This
-     behavior can be changed by enabling
-     <option>services.printing.defaultShared</option> or
-     <option>services.printing.browsing</option> respectively.
+     Local printers are no longer shared or advertised by default. This behavior can be changed by enabling <option>services.printing.defaultShared</option> or <option>services.printing.browsing</option> respectively.
     </para>
    </listitem>
    <listitem>
     <para>
-     The VirtualBox host and guest options have been named more consistently.
-     They can now found in <option>virtualisation.virtualbox.host.*</option>
-     instead of <option>services.virtualboxHost.*</option> and
-     <option>virtualisation.virtualbox.guest.*</option> instead of
-     <option>services.virtualboxGuest.*</option>.
+     The VirtualBox host and guest options have been named more consistently. They can now found in <option>virtualisation.virtualbox.host.*</option> instead of <option>services.virtualboxHost.*</option> and <option>virtualisation.virtualbox.guest.*</option> instead of <option>services.virtualboxGuest.*</option>.
     </para>
     <para>
-     Also, there now is support for the <literal>vboxsf</literal> file system
-     using the <option>fileSystems</option> configuration attribute. An example
-     of how this can be used in a configuration:
+     Also, there now is support for the <literal>vboxsf</literal> file system using the <option>fileSystems</option> configuration attribute. An example of how this can be used in a configuration:
 <programlisting>
 fileSystems."/shiny" = {
   device = "myshinysharedfolder";
@@ -521,15 +468,7 @@ fileSystems."/shiny" = {
    </listitem>
    <listitem>
     <para>
-     &quot;<literal>nix-env -qa</literal>&quot; no longer discovers Haskell
-     packages by name. The only packages visible in the global scope are
-     <literal>ghc</literal>, <literal>cabal-install</literal>, and
-     <literal>stack</literal>, but all other packages are hidden. The reason
-     for this inconvenience is the sheer size of the Haskell package set.
-     Name-based lookups are expensive, and most <literal>nix-env -qa</literal>
-     operations would become much slower if we'd add the entire Hackage
-     database into the top level attribute set. Instead, the list of Haskell
-     packages can be displayed by running:
+     &quot;<literal>nix-env -qa</literal>&quot; no longer discovers Haskell packages by name. The only packages visible in the global scope are <literal>ghc</literal>, <literal>cabal-install</literal>, and <literal>stack</literal>, but all other packages are hidden. The reason for this inconvenience is the sheer size of the Haskell package set. Name-based lookups are expensive, and most <literal>nix-env -qa</literal> operations would become much slower if we'd add the entire Hackage database into the top level attribute set. Instead, the list of Haskell packages can be displayed by running:
     </para>
 <programlisting>
 nix-env -f &quot;&lt;nixpkgs&gt;&quot; -qaP -A haskellPackages
@@ -541,91 +480,56 @@ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -qaP -A haskellPackages
 nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA haskellPackages.pandoc
 </programlisting>
     <para>
-     Installing Haskell <emphasis>libraries</emphasis> this way, however, is no
-     longer supported. See the next item for more details.
+     Installing Haskell <emphasis>libraries</emphasis> this way, however, is no longer supported. See the next item for more details.
     </para>
    </listitem>
    <listitem>
     <para>
-     Previous versions of NixOS came with a feature called
-     <literal>ghc-wrapper</literal>, a small script that allowed GHC to
-     transparently pick up on libraries installed in the user's profile. This
-     feature has been deprecated; <literal>ghc-wrapper</literal> was removed
-     from the distribution. The proper way to register Haskell libraries with
-     the compiler now is the <literal>haskellPackages.ghcWithPackages</literal>
-     function. The
-     <link
-    xlink:href="http://nixos.org/nixpkgs/manual/#users-guide-to-the-haskell-infrastructure">User's
-     Guide to the Haskell Infrastructure</link> provides more information about
-     this subject.
+     Previous versions of NixOS came with a feature called <literal>ghc-wrapper</literal>, a small script that allowed GHC to transparently pick up on libraries installed in the user's profile. This feature has been deprecated; <literal>ghc-wrapper</literal> was removed from the distribution. The proper way to register Haskell libraries with the compiler now is the <literal>haskellPackages.ghcWithPackages</literal> function. The <link
+    xlink:href="http://nixos.org/nixpkgs/manual/#users-guide-to-the-haskell-infrastructure">User's Guide to the Haskell Infrastructure</link> provides more information about this subject.
     </para>
    </listitem>
    <listitem>
     <para>
-     All Haskell builds that have been generated with version 1.x of the
-     <literal>cabal2nix</literal> utility are now invalid and need to be
-     re-generated with a current version of <literal>cabal2nix</literal> to
-     function. The most recent version of this tool can be installed by running
-     <literal>nix-env -i cabal2nix</literal>.
+     All Haskell builds that have been generated with version 1.x of the <literal>cabal2nix</literal> utility are now invalid and need to be re-generated with a current version of <literal>cabal2nix</literal> to function. The most recent version of this tool can be installed by running <literal>nix-env -i cabal2nix</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>haskellPackages</literal> set in Nixpkgs used to have a
-     function attribute called <literal>extension</literal> that users could
-     override in their <literal>~/.nixpkgs/config.nix</literal> files to
-     configure additional attributes, etc. That function still exists, but it's
-     now called <literal>overrides</literal>.
+     The <literal>haskellPackages</literal> set in Nixpkgs used to have a function attribute called <literal>extension</literal> that users could override in their <literal>~/.nixpkgs/config.nix</literal> files to configure additional attributes, etc. That function still exists, but it's now called <literal>overrides</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     The OpenBLAS library has been updated to version
-     <literal>0.2.14</literal>. Support for the
-     <literal>x86_64-darwin</literal> platform was added. Dynamic architecture
-     detection was enabled; OpenBLAS now selects microarchitecture-optimized
-     routines at runtime, so optimal performance is achieved without the need
-     to rebuild OpenBLAS locally. OpenBLAS has replaced ATLAS in most packages
-     which use an optimized BLAS or LAPACK implementation.
+     The OpenBLAS library has been updated to version <literal>0.2.14</literal>. Support for the <literal>x86_64-darwin</literal> platform was added. Dynamic architecture detection was enabled; OpenBLAS now selects microarchitecture-optimized routines at runtime, so optimal performance is achieved without the need to rebuild OpenBLAS locally. OpenBLAS has replaced ATLAS in most packages which use an optimized BLAS or LAPACK implementation.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>phpfpm</literal> is now using the default PHP version
-     (<literal>pkgs.php</literal>) instead of PHP 5.4
-     (<literal>pkgs.php54</literal>).
+     The <literal>phpfpm</literal> is now using the default PHP version (<literal>pkgs.php</literal>) instead of PHP 5.4 (<literal>pkgs.php54</literal>).
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>locate</literal> service no longer indexes the Nix store by
-     default, preventing packages with potentially numerous versions from
-     cluttering the output. Indexing the store can be activated by setting
-     <option>services.locate.includeStore = true</option>.
+     The <literal>locate</literal> service no longer indexes the Nix store by default, preventing packages with potentially numerous versions from cluttering the output. Indexing the store can be activated by setting <option>services.locate.includeStore = true</option>.
     </para>
    </listitem>
    <listitem>
     <para>
-     The Nix expression search path (<envar>NIX_PATH</envar>) no longer
-     contains <filename>/etc/nixos/nixpkgs</filename> by default. You can
-     override <envar>NIX_PATH</envar> by setting <option>nix.nixPath</option>.
+     The Nix expression search path (<envar>NIX_PATH</envar>) no longer contains <filename>/etc/nixos/nixpkgs</filename> by default. You can override <envar>NIX_PATH</envar> by setting <option>nix.nixPath</option>.
     </para>
    </listitem>
    <listitem>
     <para>
-     Python 2.6 has been marked as broken (as it no longer receives security
-     updates from upstream).
+     Python 2.6 has been marked as broken (as it no longer receives security updates from upstream).
     </para>
    </listitem>
    <listitem>
     <para>
-     Any use of module arguments such as <varname>pkgs</varname> to access
-     library functions, or to define <literal>imports</literal> attributes will
-     now lead to an infinite loop at the time of the evaluation.
+     Any use of module arguments such as <varname>pkgs</varname> to access library functions, or to define <literal>imports</literal> attributes will now lead to an infinite loop at the time of the evaluation.
     </para>
     <para>
-     In case of an infinite loop, use the <command>--show-trace</command>
-     command line argument and read the line just above the error message.
+     In case of an infinite loop, use the <command>--show-trace</command> command line argument and read the line just above the error message.
 <screen>
 <prompt>$ </prompt>nixos-rebuild build --show-trace
 …
@@ -634,9 +538,7 @@ infinite recursion encountered
 </screen>
     </para>
     <para>
-     Any use of <literal>pkgs.lib</literal>, should be replaced by
-     <varname>lib</varname>, after adding it as argument of the module. The
-     following module
+     Any use of <literal>pkgs.lib</literal>, should be replaced by <varname>lib</varname>, after adding it as argument of the module. The following module
 <programlisting>
 { config, pkgs, ... }:
 
@@ -664,9 +566,7 @@ with lib;
 </programlisting>
     </para>
     <para>
-     When <varname>pkgs</varname> is used to download other projects to import
-     their modules, and only in such cases, it should be replaced by
-     <literal>(import &lt;nixpkgs&gt; {})</literal>. The following module
+     When <varname>pkgs</varname> is used to download other projects to import their modules, and only in such cases, it should be replaced by <literal>(import &lt;nixpkgs&gt; {})</literal>. The following module
 <programlisting>
 { config, pkgs, ... }:
 
@@ -706,43 +606,25 @@ in
   <itemizedlist>
    <listitem>
     <para>
-     The nixos and nixpkgs channels were unified, so one
-     <emphasis>can</emphasis> use <literal>nix-env -iA nixos.bash</literal>
-     instead of <literal>nix-env -iA nixos.pkgs.bash</literal>. See
-     <link xlink:href="https://github.com/NixOS/nixpkgs/commit/2cd7c1f198">the
-     commit</link> for details.
+     The nixos and nixpkgs channels were unified, so one <emphasis>can</emphasis> use <literal>nix-env -iA nixos.bash</literal> instead of <literal>nix-env -iA nixos.pkgs.bash</literal>. See <link xlink:href="https://github.com/NixOS/nixpkgs/commit/2cd7c1f198">the commit</link> for details.
     </para>
    </listitem>
    <listitem>
     <para>
-     Users running an SSH server who worry about the quality of their
-     <literal>/etc/ssh/moduli</literal> file with respect to the
-     <link
-      xlink:href="https://stribika.github.io/2015/01/04/secure-secure-shell.html">vulnerabilities
-     discovered in the Diffie-Hellman key exchange</link> can now replace
-     OpenSSH's default version with one they generated themselves using the new
-     <option>services.openssh.moduliFile</option> option.
+     Users running an SSH server who worry about the quality of their <literal>/etc/ssh/moduli</literal> file with respect to the <link
+      xlink:href="https://stribika.github.io/2015/01/04/secure-secure-shell.html">vulnerabilities discovered in the Diffie-Hellman key exchange</link> can now replace OpenSSH's default version with one they generated themselves using the new <option>services.openssh.moduliFile</option> option.
     </para>
    </listitem>
    <listitem>
     <para>
-     A newly packaged TeX Live 2015 is provided in
-     <literal>pkgs.texlive</literal>, split into 6500 nix packages. For basic
-     user documentation see
-     <link xlink:href="https://github.com/NixOS/nixpkgs/blob/release-15.09/pkgs/tools/typesetting/tex/texlive/default.nix#L1"
-      >the
-     source</link>. Beware of
-     <link xlink:href="https://github.com/NixOS/nixpkgs/issues/9757"
-      >an
-     issue</link> when installing a too large package set. The plan is to
-     deprecate and maybe delete the original TeX packages until the next
-     release.
+     A newly packaged TeX Live 2015 is provided in <literal>pkgs.texlive</literal>, split into 6500 nix packages. For basic user documentation see <link xlink:href="https://github.com/NixOS/nixpkgs/blob/release-15.09/pkgs/tools/typesetting/tex/texlive/default.nix#L1"
+      >the source</link>. Beware of <link xlink:href="https://github.com/NixOS/nixpkgs/issues/9757"
+      >an issue</link> when installing a too large package set. The plan is to deprecate and maybe delete the original TeX packages until the next release.
     </para>
    </listitem>
    <listitem>
     <para>
-     <option>buildEnv.env</option> on all Python interpreters is now available
-     for nix-shell interoperability.
+     <option>buildEnv.env</option> on all Python interpreters is now available for nix-shell interoperability.
     </para>
    </listitem>
   </itemizedlist>
diff --git a/nixos/doc/manual/release-notes/rl-1603.xml b/nixos/doc/manual/release-notes/rl-1603.xml
index 9b512c4b1e5..94808b36076 100644
--- a/nixos/doc/manual/release-notes/rl-1603.xml
+++ b/nixos/doc/manual/release-notes/rl-1603.xml
@@ -6,17 +6,14 @@
  <title>Release 16.03 (“Emu”, 2016/03/31)</title>
 
  <para>
-  In addition to numerous new and upgraded packages, this release has the
-  following highlights:
+  In addition to numerous new and upgraded packages, this release has the following highlights:
  </para>
 
  <itemizedlist>
   <listitem>
    <para>
-    Systemd 229, bringing
-    <link
-    xlink:href="https://github.com/systemd/systemd/blob/v229/NEWS">numerous
-    improvements</link> over 217.
+    Systemd 229, bringing <link
+    xlink:href="https://github.com/systemd/systemd/blob/v229/NEWS">numerous improvements</link> over 217.
    </para>
   </listitem>
   <listitem>
@@ -26,11 +23,8 @@
   </listitem>
   <listitem>
    <para>
-    GCC 5.3 (was 4.9). Note that GCC 5
-    <link
-    xlink:href="https://gcc.gnu.org/onlinedocs/libstdc++/manual/using_dual_abi.html">changes
-    the C++ ABI in an incompatible way</link>; this may cause problems if you
-    try to link objects compiled with different versions of GCC.
+    GCC 5.3 (was 4.9). Note that GCC 5 <link
+    xlink:href="https://gcc.gnu.org/onlinedocs/libstdc++/manual/using_dual_abi.html">changes the C++ ABI in an incompatible way</link>; this may cause problems if you try to link objects compiled with different versions of GCC.
    </para>
   </listitem>
   <listitem>
@@ -45,20 +39,10 @@
   </listitem>
   <listitem>
    <para>
-    Improved support for ensuring
-    <link
-    xlink:href="https://reproducible-builds.org/">bitwise
-    reproducible builds</link>. For example, <literal>stdenv</literal> now sets
-    the environment variable
-    <envar
-    xlink:href="https://reproducible-builds.org/specs/source-date-epoch/">SOURCE_DATE_EPOCH</envar>
-    to a deterministic value, and Nix has
-    <link
-    xlink:href="http://nixos.org/nix/manual/#ssec-relnotes-1.11">gained
-    an option</link> to repeat a build a number of times to test determinism.
-    An ongoing project, the goal of exact reproducibility is to allow binaries
-    to be verified independently (e.g., a user might only trust binaries that
-    appear in three independent binary caches).
+    Improved support for ensuring <link
+    xlink:href="https://reproducible-builds.org/">bitwise reproducible builds</link>. For example, <literal>stdenv</literal> now sets the environment variable <envar
+    xlink:href="https://reproducible-builds.org/specs/source-date-epoch/">SOURCE_DATE_EPOCH</envar> to a deterministic value, and Nix has <link
+    xlink:href="http://nixos.org/nix/manual/#ssec-relnotes-1.11">gained an option</link> to repeat a build a number of times to test determinism. An ongoing project, the goal of exact reproducibility is to allow binaries to be verified independently (e.g., a user might only trust binaries that appear in three independent binary caches).
    </para>
   </listitem>
   <listitem>
@@ -335,56 +319,38 @@
  </para>
 
  <para>
-  When upgrading from a previous release, please be aware of the following
-  incompatible changes:
+  When upgrading from a previous release, please be aware of the following incompatible changes:
  </para>
 
  <itemizedlist>
   <listitem>
    <para>
-    We no longer produce graphical ISO images and VirtualBox images for
-    <literal>i686-linux</literal>. A minimal ISO image is still provided.
+    We no longer produce graphical ISO images and VirtualBox images for <literal>i686-linux</literal>. A minimal ISO image is still provided.
    </para>
   </listitem>
   <listitem>
    <para>
-    Firefox and similar browsers are now <emphasis>wrapped by
-    default</emphasis>. The package and attribute names are plain
-    <literal>firefox</literal> or <literal>midori</literal>, etc.
-    Backward-compatibility attributes were set up, but note that
-    <command>nix-env -u</command> will <emphasis>not</emphasis> update your
-    current <literal>firefox-with-plugins</literal>; you have to uninstall it
-    and install <literal>firefox</literal> instead.
+    Firefox and similar browsers are now <emphasis>wrapped by default</emphasis>. The package and attribute names are plain <literal>firefox</literal> or <literal>midori</literal>, etc. Backward-compatibility attributes were set up, but note that <command>nix-env -u</command> will <emphasis>not</emphasis> update your current <literal>firefox-with-plugins</literal>; you have to uninstall it and install <literal>firefox</literal> instead.
    </para>
   </listitem>
   <listitem>
    <para>
-    <command>wmiiSnap</command> has been replaced with
-    <command>wmii_hg</command>, but
-    <command>services.xserver.windowManager.wmii.enable</command> has been
-    updated respectively so this only affects you if you have explicitly
-    installed <command>wmiiSnap</command>.
+    <command>wmiiSnap</command> has been replaced with <command>wmii_hg</command>, but <command>services.xserver.windowManager.wmii.enable</command> has been updated respectively so this only affects you if you have explicitly installed <command>wmiiSnap</command>.
    </para>
   </listitem>
   <listitem>
    <para>
-    <literal>jobs</literal> NixOS option has been removed. It served as
-    compatibility layer between Upstart jobs and SystemD services. All services
-    have been rewritten to use <literal>systemd.services</literal>
+    <literal>jobs</literal> NixOS option has been removed. It served as compatibility layer between Upstart jobs and SystemD services. All services have been rewritten to use <literal>systemd.services</literal>
    </para>
   </listitem>
   <listitem>
    <para>
-    <command>wmiimenu</command> is removed, as it has been removed by the
-    developers upstream. Use <command>wimenu</command> from the
-    <command>wmii-hg</command> package.
+    <command>wmiimenu</command> is removed, as it has been removed by the developers upstream. Use <command>wimenu</command> from the <command>wmii-hg</command> package.
    </para>
   </listitem>
   <listitem>
    <para>
-    Gitit is no longer automatically added to the module list in NixOS and as
-    such there will not be any manual entries for it. You will need to add an
-    import statement to your NixOS configuration in order to use it, e.g.
+    Gitit is no longer automatically added to the module list in NixOS and as such there will not be any manual entries for it. You will need to add an import statement to your NixOS configuration in order to use it, e.g.
 <programlisting><![CDATA[
 {
   imports = [ <nixpkgs/nixos/modules/services/misc/gitit.nix> ];
@@ -395,10 +361,7 @@
   </listitem>
   <listitem>
    <para>
-    <command>nginx</command> does not accept flags for enabling and disabling
-    modules anymore. Instead it accepts <literal>modules</literal> argument,
-    which is a list of modules to be built in. All modules now reside in
-    <literal>nginxModules</literal> set. Example configuration:
+    <command>nginx</command> does not accept flags for enabling and disabling modules anymore. Instead it accepts <literal>modules</literal> argument, which is a list of modules to be built in. All modules now reside in <literal>nginxModules</literal> set. Example configuration:
 <programlisting><![CDATA[
 nginx.override {
   modules = [ nginxModules.rtmp nginxModules.dav nginxModules.moreheaders ];
@@ -408,66 +371,42 @@ nginx.override {
   </listitem>
   <listitem>
    <para>
-    <command>s3sync</command> is removed, as it hasn't been developed by
-    upstream for 4 years and only runs with ruby 1.8. For an actively-developer
-    alternative look at <command>tarsnap</command> and others.
+    <command>s3sync</command> is removed, as it hasn't been developed by upstream for 4 years and only runs with ruby 1.8. For an actively-developer alternative look at <command>tarsnap</command> and others.
    </para>
   </listitem>
   <listitem>
    <para>
-    <command>ruby_1_8</command> has been removed as it's not supported from
-    upstream anymore and probably contains security issues.
+    <command>ruby_1_8</command> has been removed as it's not supported from upstream anymore and probably contains security issues.
    </para>
   </listitem>
   <listitem>
    <para>
-    <literal>tidy-html5</literal> package is removed. Upstream only provided
-    <literal>(lib)tidy5</literal> during development, and now they went back to
-    <literal>(lib)tidy</literal> to work as a drop-in replacement of the
-    original package that has been unmaintained for years. You can (still) use
-    the <literal>html-tidy</literal> package, which got updated to a stable
-    release from this new upstream.
+    <literal>tidy-html5</literal> package is removed. Upstream only provided <literal>(lib)tidy5</literal> during development, and now they went back to <literal>(lib)tidy</literal> to work as a drop-in replacement of the original package that has been unmaintained for years. You can (still) use the <literal>html-tidy</literal> package, which got updated to a stable release from this new upstream.
    </para>
   </listitem>
   <listitem>
    <para>
-    <literal>extraDeviceOptions</literal> argument is removed from
-    <literal>bumblebee</literal> package. Instead there are now two separate
-    arguments: <literal>extraNvidiaDeviceOptions</literal> and
-    <literal>extraNouveauDeviceOptions</literal> for setting extra X11 options
-    for nvidia and nouveau drivers, respectively.
+    <literal>extraDeviceOptions</literal> argument is removed from <literal>bumblebee</literal> package. Instead there are now two separate arguments: <literal>extraNvidiaDeviceOptions</literal> and <literal>extraNouveauDeviceOptions</literal> for setting extra X11 options for nvidia and nouveau drivers, respectively.
    </para>
   </listitem>
   <listitem>
    <para>
-    The <literal>Ctrl+Alt+Backspace</literal> key combination no longer kills
-    the X server by default. There's a new option
-    <option>services.xserver.enableCtrlAltBackspace</option> allowing to enable
-    the combination again.
+    The <literal>Ctrl+Alt+Backspace</literal> key combination no longer kills the X server by default. There's a new option <option>services.xserver.enableCtrlAltBackspace</option> allowing to enable the combination again.
    </para>
   </listitem>
   <listitem>
    <para>
-    <literal>emacsPackagesNg</literal> now contains all packages from the ELPA,
-    MELPA, and MELPA Stable repositories.
+    <literal>emacsPackagesNg</literal> now contains all packages from the ELPA, MELPA, and MELPA Stable repositories.
    </para>
   </listitem>
   <listitem>
    <para>
-    Data directory for Postfix MTA server is moved from
-    <filename>/var/postfix</filename> to <filename>/var/lib/postfix</filename>.
-    Old configurations are migrated automatically.
-    <literal>service.postfix</literal> module has also received many
-    improvements, such as correct directories' access rights, new
-    <literal>aliasFiles</literal> and <literal>mapFiles</literal> options and
-    more.
+    Data directory for Postfix MTA server is moved from <filename>/var/postfix</filename> to <filename>/var/lib/postfix</filename>. Old configurations are migrated automatically. <literal>service.postfix</literal> module has also received many improvements, such as correct directories' access rights, new <literal>aliasFiles</literal> and <literal>mapFiles</literal> options and more.
    </para>
   </listitem>
   <listitem>
    <para>
-    Filesystem options should now be configured as a list of strings, not a
-    comma-separated string. The old style will continue to work, but print a
-    warning, until the 16.09 release. An example of the new style:
+    Filesystem options should now be configured as a list of strings, not a comma-separated string. The old style will continue to work, but print a warning, until the 16.09 release. An example of the new style:
 <programlisting>
 fileSystems."/example" = {
   device = "/dev/sdc";
@@ -479,44 +418,20 @@ fileSystems."/example" = {
   </listitem>
   <listitem>
    <para>
-    CUPS, installed by <literal>services.printing</literal> module, now has its
-    data directory in <filename>/var/lib/cups</filename>. Old configurations
-    from <filename>/etc/cups</filename> are moved there automatically, but
-    there might be problems. Also configuration options
-    <literal>services.printing.cupsdConf</literal> and
-    <literal>services.printing.cupsdFilesConf</literal> were removed because
-    they had been allowing one to override configuration variables required for
-    CUPS to work at all on NixOS. For most use cases,
-    <literal>services.printing.extraConf</literal> and new option
-    <literal>services.printing.extraFilesConf</literal> should be enough; if
-    you encounter a situation when they are not, please file a bug.
+    CUPS, installed by <literal>services.printing</literal> module, now has its data directory in <filename>/var/lib/cups</filename>. Old configurations from <filename>/etc/cups</filename> are moved there automatically, but there might be problems. Also configuration options <literal>services.printing.cupsdConf</literal> and <literal>services.printing.cupsdFilesConf</literal> were removed because they had been allowing one to override configuration variables required for CUPS to work at all on NixOS. For most use cases, <literal>services.printing.extraConf</literal> and new option <literal>services.printing.extraFilesConf</literal> should be enough; if you encounter a situation when they are not, please file a bug.
    </para>
    <para>
-    There are also Gutenprint improvements; in particular, a new option
-    <literal>services.printing.gutenprint</literal> is added to enable
-    automatic updating of Gutenprint PPMs; it's greatly recommended to enable
-    it instead of adding <literal>gutenprint</literal> to the
-    <literal>drivers</literal> list.
+    There are also Gutenprint improvements; in particular, a new option <literal>services.printing.gutenprint</literal> is added to enable automatic updating of Gutenprint PPMs; it's greatly recommended to enable it instead of adding <literal>gutenprint</literal> to the <literal>drivers</literal> list.
    </para>
   </listitem>
   <listitem>
    <para>
-    <literal>services.xserver.vaapiDrivers</literal> has been removed. Use
-    <literal>hardware.opengl.extraPackages{,32}</literal> instead. You can also
-    specify VDPAU drivers there.
+    <literal>services.xserver.vaapiDrivers</literal> has been removed. Use <literal>hardware.opengl.extraPackages{,32}</literal> instead. You can also specify VDPAU drivers there.
    </para>
   </listitem>
   <listitem>
    <para>
-    <literal>programs.ibus</literal> moved to
-    <literal>i18n.inputMethod.ibus</literal>. The option
-    <literal>programs.ibus.plugins</literal> changed to
-    <literal>i18n.inputMethod.ibus.engines</literal> and the option to enable
-    ibus changed from <literal>programs.ibus.enable</literal> to
-    <literal>i18n.inputMethod.enabled</literal>.
-    <literal>i18n.inputMethod.enabled</literal> should be set to the used input
-    method name, <literal>"ibus"</literal> for ibus. An example of the new
-    style:
+    <literal>programs.ibus</literal> moved to <literal>i18n.inputMethod.ibus</literal>. The option <literal>programs.ibus.plugins</literal> changed to <literal>i18n.inputMethod.ibus.engines</literal> and the option to enable ibus changed from <literal>programs.ibus.enable</literal> to <literal>i18n.inputMethod.enabled</literal>. <literal>i18n.inputMethod.enabled</literal> should be set to the used input method name, <literal>"ibus"</literal> for ibus. An example of the new style:
 <programlisting>
 i18n.inputMethod.enabled = "ibus";
 i18n.inputMethod.ibus.engines = with pkgs.ibus-engines; [ anthy mozc ];
@@ -530,26 +445,17 @@ programs.ibus.plugins = with pkgs; [ ibus-anthy mozc ];
   </listitem>
   <listitem>
    <para>
-    <literal>services.udev.extraRules</literal> option now writes rules to
-    <filename>99-local.rules</filename> instead of
-    <filename>10-local.rules</filename>. This makes all the user rules apply
-    after others, so their results wouldn't be overriden by anything else.
+    <literal>services.udev.extraRules</literal> option now writes rules to <filename>99-local.rules</filename> instead of <filename>10-local.rules</filename>. This makes all the user rules apply after others, so their results wouldn't be overriden by anything else.
    </para>
   </listitem>
   <listitem>
    <para>
-    Large parts of the <literal>services.gitlab</literal> module has been been
-    rewritten. There are new configuration options available. The
-    <literal>stateDir</literal> option was renamned to
-    <literal>statePath</literal> and the <literal>satellitesDir</literal>
-    option was removed. Please review the currently available options.
+    Large parts of the <literal>services.gitlab</literal> module has been been rewritten. There are new configuration options available. The <literal>stateDir</literal> option was renamned to <literal>statePath</literal> and the <literal>satellitesDir</literal> option was removed. Please review the currently available options.
    </para>
   </listitem>
   <listitem>
    <para>
-    The option <option>services.nsd.zones.&lt;name&gt;.data</option> no longer
-    interpret the dollar sign ($) as a shell variable, as such it should not be
-    escaped anymore. Thus the following zone data:
+    The option <option>services.nsd.zones.&lt;name&gt;.data</option> no longer interpret the dollar sign ($) as a shell variable, as such it should not be escaped anymore. Thus the following zone data:
    </para>
 <programlisting>
 \$ORIGIN example.com.
@@ -567,9 +473,7 @@ $TTL 1800
   </listitem>
   <listitem>
    <para>
-    <literal>service.syncthing.dataDir</literal> options now has to point to
-    exact folder where syncthing is writing to. Example configuration should
-    look something like:
+    <literal>service.syncthing.dataDir</literal> options now has to point to exact folder where syncthing is writing to. Example configuration should look something like:
    </para>
 <programlisting>
 services.syncthing = {
@@ -581,45 +485,24 @@ services.syncthing = {
   </listitem>
   <listitem>
    <para>
-    <literal>networking.firewall.allowPing</literal> is now enabled by default.
-    Users are encouraged to configure an appropriate rate limit for their
-    machines using the Kernel interface at
-    <filename>/proc/sys/net/ipv4/icmp_ratelimit</filename> and
-    <filename>/proc/sys/net/ipv6/icmp/ratelimit</filename> or using the
-    firewall itself, i.e. by setting the NixOS option
-    <literal>networking.firewall.pingLimit</literal>.
+    <literal>networking.firewall.allowPing</literal> is now enabled by default. Users are encouraged to configure an appropriate rate limit for their machines using the Kernel interface at <filename>/proc/sys/net/ipv4/icmp_ratelimit</filename> and <filename>/proc/sys/net/ipv6/icmp/ratelimit</filename> or using the firewall itself, i.e. by setting the NixOS option <literal>networking.firewall.pingLimit</literal>.
    </para>
   </listitem>
   <listitem>
    <para>
-    Systems with some broadcom cards used to result into a generated config
-    that is no longer accepted. If you get errors like
+    Systems with some broadcom cards used to result into a generated config that is no longer accepted. If you get errors like
 <screen>error: path ‘/nix/store/*-broadcom-sta-*’ does not exist and cannot be created</screen>
-    you should either re-run <command>nixos-generate-config</command> or
-    manually replace
-    <literal>"${config.boot.kernelPackages.broadcom_sta}"</literal> by
-    <literal>config.boot.kernelPackages.broadcom_sta</literal> in your
-    <filename>/etc/nixos/hardware-configuration.nix</filename>. More discussion
-    is on <link xlink:href="https://github.com/NixOS/nixpkgs/pull/12595"> the
-    github issue</link>.
+    you should either re-run <command>nixos-generate-config</command> or manually replace <literal>"${config.boot.kernelPackages.broadcom_sta}"</literal> by <literal>config.boot.kernelPackages.broadcom_sta</literal> in your <filename>/etc/nixos/hardware-configuration.nix</filename>. More discussion is on <link xlink:href="https://github.com/NixOS/nixpkgs/pull/12595"> the github issue</link>.
    </para>
   </listitem>
   <listitem>
    <para>
-    The <literal>services.xserver.startGnuPGAgent</literal> option has been
-    removed. GnuPG 2.1.x changed the way the gpg-agent works, and that new
-    approach no longer requires (or even supports) the "start everything as a
-    child of the agent" scheme we've implemented in NixOS for older versions.
-    To configure the gpg-agent for your X session, add the following code to
-    <filename>~/.bashrc</filename> or some file that’s sourced when your
-    shell is started:
+    The <literal>services.xserver.startGnuPGAgent</literal> option has been removed. GnuPG 2.1.x changed the way the gpg-agent works, and that new approach no longer requires (or even supports) the "start everything as a child of the agent" scheme we've implemented in NixOS for older versions. To configure the gpg-agent for your X session, add the following code to <filename>~/.bashrc</filename> or some file that’s sourced when your shell is started:
 <programlisting>
 GPG_TTY=$(tty)
 export GPG_TTY
     </programlisting>
-    If you want to use gpg-agent for SSH, too, add the following to your
-    session initialization (e.g.
-    <literal>displayManager.sessionCommands</literal>)
+    If you want to use gpg-agent for SSH, too, add the following to your session initialization (e.g. <literal>displayManager.sessionCommands</literal>)
 <programlisting>
 gpg-connect-agent /bye
 unset SSH_AGENT_PID
@@ -629,15 +512,11 @@ export SSH_AUTH_SOCK="''${HOME}/.gnupg/S.gpg-agent.ssh"
 <programlisting>
 enable-ssh-support
     </programlisting>
-    is included in your <filename>~/.gnupg/gpg-agent.conf</filename>. You will
-    need to use <command>ssh-add</command> to re-add your ssh keys. If gpg’s
-    automatic transformation of the private keys to the new format fails, you
-    will need to re-import your private keyring as well:
+    is included in your <filename>~/.gnupg/gpg-agent.conf</filename>. You will need to use <command>ssh-add</command> to re-add your ssh keys. If gpg’s automatic transformation of the private keys to the new format fails, you will need to re-import your private keyring as well:
 <programlisting>
 gpg --import ~/.gnupg/secring.gpg
     </programlisting>
-    The <command>gpg-agent(1)</command> man page has more details about this
-    subject, i.e. in the "EXAMPLES" section.
+    The <command>gpg-agent(1)</command> man page has more details about this subject, i.e. in the "EXAMPLES" section.
    </para>
   </listitem>
  </itemizedlist>
@@ -661,9 +540,7 @@ gpg --import ~/.gnupg/secring.gpg
    </listitem>
    <listitem>
     <para>
-     Input method support was improved. New NixOS modules (fcitx, nabi and
-     uim), fcitx engines (chewing, hangul, m17n, mozc and table-other) and ibus
-     engines (hangul and m17n) have been added.
+     Input method support was improved. New NixOS modules (fcitx, nabi and uim), fcitx engines (chewing, hangul, m17n, mozc and table-other) and ibus engines (hangul and m17n) have been added.
     </para>
    </listitem>
   </itemizedlist>
diff --git a/nixos/doc/manual/release-notes/rl-1609.xml b/nixos/doc/manual/release-notes/rl-1609.xml
index 4a2343edc97..95e8fe3abcb 100644
--- a/nixos/doc/manual/release-notes/rl-1609.xml
+++ b/nixos/doc/manual/release-notes/rl-1609.xml
@@ -6,48 +6,36 @@
  <title>Release 16.09 (“Flounder”, 2016/09/30)</title>
 
  <para>
-  In addition to numerous new and upgraded packages, this release has the
-  following highlights:
+  In addition to numerous new and upgraded packages, this release has the following highlights:
  </para>
 
  <itemizedlist>
   <listitem>
    <para>
-    Many NixOS configurations and Nix packages now use significantly less disk
-    space, thanks to the
-    <link
-    xlink:href="https://github.com/NixOS/nixpkgs/issues/7117">extensive
-    work on closure size reduction</link>. For example, the closure size of a
-    minimal NixOS container went down from ~424 MiB in 16.03 to ~212 MiB in
-    16.09, while the closure size of Firefox went from ~651 MiB to ~259 MiB.
+    Many NixOS configurations and Nix packages now use significantly less disk space, thanks to the <link
+    xlink:href="https://github.com/NixOS/nixpkgs/issues/7117">extensive work on closure size reduction</link>. For example, the closure size of a minimal NixOS container went down from ~424 MiB in 16.03 to ~212 MiB in 16.09, while the closure size of Firefox went from ~651 MiB to ~259 MiB.
    </para>
   </listitem>
   <listitem>
    <para>
-    To improve security, packages are now
-    <link
-    xlink:href="https://github.com/NixOS/nixpkgs/pull/12895">built
-    using various hardening features</link>. See the Nixpkgs manual for more
-    information.
+    To improve security, packages are now <link
+    xlink:href="https://github.com/NixOS/nixpkgs/pull/12895">built using various hardening features</link>. See the Nixpkgs manual for more information.
    </para>
   </listitem>
   <listitem>
    <para>
     Support for PXE netboot. See <xref
-    linkend="sec-booting-from-pxe" />
-    for documentation.
+    linkend="sec-booting-from-pxe" /> for documentation.
    </para>
   </listitem>
   <listitem>
    <para>
-    X.org server 1.18. If you use the <literal>ati_unfree</literal> driver,
-    1.17 is still used due to an ABI incompatibility.
+    X.org server 1.18. If you use the <literal>ati_unfree</literal> driver, 1.17 is still used due to an ABI incompatibility.
    </para>
   </listitem>
   <listitem>
    <para>
-    This release is based on Glibc 2.24, GCC 5.4.0 and systemd 231. The default
-    Linux kernel remains 4.4.
+    This release is based on Glibc 2.24, GCC 5.4.0 and systemd 231. The default Linux kernel remains 4.4.
    </para>
   </listitem>
  </itemizedlist>
@@ -65,122 +53,71 @@
  </itemizedlist>
 
  <para>
-  When upgrading from a previous release, please be aware of the following
-  incompatible changes:
+  When upgrading from a previous release, please be aware of the following incompatible changes:
  </para>
 
  <itemizedlist>
   <listitem>
    <para>
-    A large number of packages have been converted to use the multiple outputs
-    feature of Nix to greatly reduce the amount of required disk space, as
-    mentioned above. This may require changes to any custom packages to make
-    them build again; see the relevant chapter in the Nixpkgs manual for more
-    information. (Additional caveat to packagers: some packaging conventions
-    related to multiple-output packages
-    <link xlink:href="https://github.com/NixOS/nixpkgs/pull/14766">were
-    changed</link> late (August 2016) in the release cycle and differ from the
-    initial introduction of multiple outputs.)
+    A large number of packages have been converted to use the multiple outputs feature of Nix to greatly reduce the amount of required disk space, as mentioned above. This may require changes to any custom packages to make them build again; see the relevant chapter in the Nixpkgs manual for more information. (Additional caveat to packagers: some packaging conventions related to multiple-output packages <link xlink:href="https://github.com/NixOS/nixpkgs/pull/14766">were changed</link> late (August 2016) in the release cycle and differ from the initial introduction of multiple outputs.)
    </para>
   </listitem>
   <listitem>
    <para>
-    Previous versions of Nixpkgs had support for all versions of the LTS
-    Haskell package set. That support has been dropped. The previously provided
-    <literal>haskell.packages.lts-x_y</literal> package sets still exist in
-    name to aviod breaking user code, but these package sets don't actually
-    contain the versions mandated by the corresponding LTS release. Instead,
-    our package set it loosely based on the latest available LTS release, i.e.
-    LTS 7.x at the time of this writing. New releases of NixOS and Nixpkgs will
-    drop those old names entirely.
-    <link
-    xlink:href="https://nixos.org/nix-dev/2016-June/020585.html">The
-    motivation for this change</link> has been discussed at length on the
-    <literal>nix-dev</literal> mailing list and in
-    <link
-    xlink:href="https://github.com/NixOS/nixpkgs/issues/14897">Github
-    issue #14897</link>. Development strategies for Haskell hackers who want to
-    rely on Nix and NixOS have been described in
-    <link
-    xlink:href="https://nixos.org/nix-dev/2016-June/020642.html">another
-    nix-dev article</link>.
+    Previous versions of Nixpkgs had support for all versions of the LTS Haskell package set. That support has been dropped. The previously provided <literal>haskell.packages.lts-x_y</literal> package sets still exist in name to aviod breaking user code, but these package sets don't actually contain the versions mandated by the corresponding LTS release. Instead, our package set it loosely based on the latest available LTS release, i.e. LTS 7.x at the time of this writing. New releases of NixOS and Nixpkgs will drop those old names entirely. <link
+    xlink:href="https://nixos.org/nix-dev/2016-June/020585.html">The motivation for this change</link> has been discussed at length on the <literal>nix-dev</literal> mailing list and in <link
+    xlink:href="https://github.com/NixOS/nixpkgs/issues/14897">Github issue #14897</link>. Development strategies for Haskell hackers who want to rely on Nix and NixOS have been described in <link
+    xlink:href="https://nixos.org/nix-dev/2016-June/020642.html">another nix-dev article</link>.
    </para>
   </listitem>
   <listitem>
    <para>
-    Shell aliases for systemd sub-commands
-    <link xlink:href="https://github.com/NixOS/nixpkgs/pull/15598">were
-    dropped</link>: <command>start</command>, <command>stop</command>,
-    <command>restart</command>, <command>status</command>.
+    Shell aliases for systemd sub-commands <link xlink:href="https://github.com/NixOS/nixpkgs/pull/15598">were dropped</link>: <command>start</command>, <command>stop</command>, <command>restart</command>, <command>status</command>.
    </para>
   </listitem>
   <listitem>
    <para>
-    Redis now binds to 127.0.0.1 only instead of listening to all network
-    interfaces. This is the default behavior of Redis 3.2
+    Redis now binds to 127.0.0.1 only instead of listening to all network interfaces. This is the default behavior of Redis 3.2
    </para>
   </listitem>
   <listitem>
    <para>
-    <literal>/var/empty</literal> is now immutable. Activation script runs
-    <command>chattr +i</command> to forbid any modifications inside the folder.
-    See <link xlink:href="https://github.com/NixOS/nixpkgs/pull/18365"> the
-    pull request</link> for what bugs this caused.
+    <literal>/var/empty</literal> is now immutable. Activation script runs <command>chattr +i</command> to forbid any modifications inside the folder. See <link xlink:href="https://github.com/NixOS/nixpkgs/pull/18365"> the pull request</link> for what bugs this caused.
    </para>
   </listitem>
   <listitem>
    <para>
-    Gitlab's maintainance script <command>gitlab-runner</command> was removed
-    and split up into the more clearer <command>gitlab-run</command> and
-    <command>gitlab-rake</command> scripts, because
-    <command>gitlab-runner</command> is a component of Gitlab CI.
+    Gitlab's maintainance script <command>gitlab-runner</command> was removed and split up into the more clearer <command>gitlab-run</command> and <command>gitlab-rake</command> scripts, because <command>gitlab-runner</command> is a component of Gitlab CI.
    </para>
   </listitem>
   <listitem>
    <para>
-    <literal>services.xserver.libinput.accelProfile</literal> default changed
-    from <literal>flat</literal> to <literal>adaptive</literal>, as per
-    <link xlink:href="https://wayland.freedesktop.org/libinput/doc/latest/group__config.html#gad63796972347f318b180e322e35cee79">
-    official documentation</link>.
+    <literal>services.xserver.libinput.accelProfile</literal> default changed from <literal>flat</literal> to <literal>adaptive</literal>, as per <link xlink:href="https://wayland.freedesktop.org/libinput/doc/latest/group__config.html#gad63796972347f318b180e322e35cee79"> official documentation</link>.
    </para>
   </listitem>
   <listitem>
    <para>
-    <literal>fonts.fontconfig.ultimate.rendering</literal> was removed because
-    our presets were obsolete for some time. New presets are hardcoded into
-    FreeType; you can select a preset via
-    <literal>fonts.fontconfig.ultimate.preset</literal>. You can customize
-    those presets via ordinary environment variables, using
-    <literal>environment.variables</literal>.
+    <literal>fonts.fontconfig.ultimate.rendering</literal> was removed because our presets were obsolete for some time. New presets are hardcoded into FreeType; you can select a preset via <literal>fonts.fontconfig.ultimate.preset</literal>. You can customize those presets via ordinary environment variables, using <literal>environment.variables</literal>.
    </para>
   </listitem>
   <listitem>
    <para>
-    The <literal>audit</literal> service is no longer enabled by default. Use
-    <literal>security.audit.enable = true</literal> to explicitly enable it.
+    The <literal>audit</literal> service is no longer enabled by default. Use <literal>security.audit.enable = true</literal> to explicitly enable it.
    </para>
   </listitem>
   <listitem>
    <para>
-    <literal>pkgs.linuxPackages.virtualbox</literal> now contains only the
-    kernel modules instead of the VirtualBox user space binaries. If you want
-    to reference the user space binaries, you have to use the new
-    <literal>pkgs.virtualbox</literal> instead.
+    <literal>pkgs.linuxPackages.virtualbox</literal> now contains only the kernel modules instead of the VirtualBox user space binaries. If you want to reference the user space binaries, you have to use the new <literal>pkgs.virtualbox</literal> instead.
    </para>
   </listitem>
   <listitem>
    <para>
-    <literal>goPackages</literal> was replaced with separated Go applications
-    in appropriate <literal>nixpkgs</literal> categories. Each Go package uses
-    its own dependency set. There's also a new <literal>go2nix</literal> tool
-    introduced to generate a Go package definition from its Go source
-    automatically.
+    <literal>goPackages</literal> was replaced with separated Go applications in appropriate <literal>nixpkgs</literal> categories. Each Go package uses its own dependency set. There's also a new <literal>go2nix</literal> tool introduced to generate a Go package definition from its Go source automatically.
    </para>
   </listitem>
   <listitem>
    <para>
-    <literal>services.mongodb.extraConfig</literal> configuration format was
-    changed to YAML.
+    <literal>services.mongodb.extraConfig</literal> configuration format was changed to YAML.
    </para>
   </listitem>
   <listitem>
@@ -197,70 +134,42 @@
  <itemizedlist>
   <listitem>
    <para>
-    Revamped grsecurity/PaX support. There is now only a single general-purpose
-    distribution kernel and the configuration interface has been streamlined.
-    Desktop users should be able to simply set
+    Revamped grsecurity/PaX support. There is now only a single general-purpose distribution kernel and the configuration interface has been streamlined. Desktop users should be able to simply set
 <programlisting>security.grsecurity.enable = true</programlisting>
-    to get a reasonably secure system without having to sacrifice too much
-    functionality.
+    to get a reasonably secure system without having to sacrifice too much functionality.
    </para>
   </listitem>
   <listitem>
    <para>
-    Special filesystems, like <literal>/proc</literal>, <literal>/run</literal>
-    and others, now have the same mount options as recommended by systemd and
-    are unified across different places in NixOS. Mount options are updated
-    during <command>nixos-rebuild switch</command> if possible. One benefit
-    from this is improved security — most such filesystems are now mounted
-    with <literal>noexec</literal>, <literal>nodev</literal> and/or
-    <literal>nosuid</literal> options.
+    Special filesystems, like <literal>/proc</literal>, <literal>/run</literal> and others, now have the same mount options as recommended by systemd and are unified across different places in NixOS. Mount options are updated during <command>nixos-rebuild switch</command> if possible. One benefit from this is improved security — most such filesystems are now mounted with <literal>noexec</literal>, <literal>nodev</literal> and/or <literal>nosuid</literal> options.
    </para>
   </listitem>
   <listitem>
    <para>
-    The reverse path filter was interfering with DHCPv4 server operation in the
-    past. An exception for DHCPv4 and a new option to log packets that were
-    dropped due to the reverse path filter was added
-    (<literal>networking.firewall.logReversePathDrops</literal>) for easier
-    debugging.
+    The reverse path filter was interfering with DHCPv4 server operation in the past. An exception for DHCPv4 and a new option to log packets that were dropped due to the reverse path filter was added (<literal>networking.firewall.logReversePathDrops</literal>) for easier debugging.
    </para>
   </listitem>
   <listitem>
    <para>
-    Containers configuration within
-    <literal>containers.&lt;name&gt;.config</literal> is
-    <link
-  xlink:href="https://github.com/NixOS/nixpkgs/pull/17365">now
-    properly typed and checked</link>. In particular, partial configurations
-    are merged correctly.
+    Containers configuration within <literal>containers.&lt;name&gt;.config</literal> is <link
+  xlink:href="https://github.com/NixOS/nixpkgs/pull/17365">now properly typed and checked</link>. In particular, partial configurations are merged correctly.
    </para>
   </listitem>
   <listitem>
    <para>
-    The directory container setuid wrapper programs,
-    <filename>/var/setuid-wrappers</filename>,
-    <link
-    xlink:href="https://github.com/NixOS/nixpkgs/pull/18124">is now
-    updated atomically to prevent failures if the switch to a new configuration
-    is interrupted.</link>
+    The directory container setuid wrapper programs, <filename>/var/setuid-wrappers</filename>, <link
+    xlink:href="https://github.com/NixOS/nixpkgs/pull/18124">is now updated atomically to prevent failures if the switch to a new configuration is interrupted.</link>
    </para>
   </listitem>
   <listitem>
    <para>
-    <literal>services.xserver.startGnuPGAgent</literal> has been removed due to
-    GnuPG 2.1.x bump. See
-    <link
-        xlink:href="https://github.com/NixOS/nixpkgs/commit/5391882ebd781149e213e8817fba6ac3c503740c">
-    how to achieve similar behavior</link>. You might need to <literal>pkill
-    gpg-agent</literal> after the upgrade to prevent a stale agent being in the
-    way.
+    <literal>services.xserver.startGnuPGAgent</literal> has been removed due to GnuPG 2.1.x bump. See <link
+        xlink:href="https://github.com/NixOS/nixpkgs/commit/5391882ebd781149e213e8817fba6ac3c503740c"> how to achieve similar behavior</link>. You might need to <literal>pkill gpg-agent</literal> after the upgrade to prevent a stale agent being in the way.
    </para>
   </listitem>
   <listitem>
    <para>
-    <link xlink:href="https://github.com/NixOS/nixpkgs/commit/e561edc322d275c3687fec431935095cfc717147">
-    Declarative users could share the uid due to the bug in the script handling
-    conflict resolution. </link>
+    <link xlink:href="https://github.com/NixOS/nixpkgs/commit/e561edc322d275c3687fec431935095cfc717147"> Declarative users could share the uid due to the bug in the script handling conflict resolution. </link>
    </para>
   </listitem>
   <listitem>
diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml
index 14b31b232e9..49c364a103a 100644
--- a/nixos/doc/manual/release-notes/rl-1703.xml
+++ b/nixos/doc/manual/release-notes/rl-1703.xml
@@ -13,29 +13,24 @@
   <title>Highlights</title>
 
   <para>
-   In addition to numerous new and upgraded packages, this release has the
-   following highlights:
+   In addition to numerous new and upgraded packages, this release has the following highlights:
   </para>
 
   <itemizedlist>
    <listitem>
     <para>
-     Nixpkgs is now extensible through overlays. See the
-     <link
-    xlink:href="https://nixos.org/nixpkgs/manual/#sec-overlays-install">Nixpkgs
-     manual</link> for more information.
+     Nixpkgs is now extensible through overlays. See the <link
+    xlink:href="https://nixos.org/nixpkgs/manual/#sec-overlays-install">Nixpkgs manual</link> for more information.
     </para>
    </listitem>
    <listitem>
     <para>
-     This release is based on Glibc 2.25, GCC 5.4.0 and systemd 232. The
-     default Linux kernel is 4.9 and Nix is at 1.11.8.
+     This release is based on Glibc 2.25, GCC 5.4.0 and systemd 232. The default Linux kernel is 4.9 and Nix is at 1.11.8.
     </para>
    </listitem>
    <listitem>
     <para>
-     The default desktop environment now is KDE's Plasma 5. KDE 4 has been
-     removed
+     The default desktop environment now is KDE's Plasma 5. KDE 4 has been removed
     </para>
    </listitem>
    <listitem>
@@ -45,35 +40,24 @@
    </listitem>
    <listitem>
     <para>
-     X.org server uses branch 1.19. Due to ABI incompatibilities,
-     <literal>ati_unfree</literal> keeps forcing 1.17 and
-     <literal>amdgpu-pro</literal> starts forcing 1.18.
+     X.org server uses branch 1.19. Due to ABI incompatibilities, <literal>ati_unfree</literal> keeps forcing 1.17 and <literal>amdgpu-pro</literal> starts forcing 1.18.
     </para>
    </listitem>
    <listitem>
     <para>
-     Cross compilation has been rewritten. See the nixpkgs manual for details.
-     The most obvious breaking change is that in derivations there is no
-     <literal>.nativeDrv</literal> nor <literal>.crossDrv</literal> are now
-     cross by default, not native.
+     Cross compilation has been rewritten. See the nixpkgs manual for details. The most obvious breaking change is that in derivations there is no <literal>.nativeDrv</literal> nor <literal>.crossDrv</literal> are now cross by default, not native.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>overridePackages</literal> function has been rewritten to be
-     replaced by
-     <link
-    xlink:href="https://nixos.org/nixpkgs/manual/#sec-overlays-install">
-     overlays</link>
+     The <literal>overridePackages</literal> function has been rewritten to be replaced by <link
+    xlink:href="https://nixos.org/nixpkgs/manual/#sec-overlays-install"> overlays</link>
     </para>
    </listitem>
    <listitem>
     <para>
-     Packages in nixpkgs can be marked as insecure through listed
-     vulnerabilities. See the
-     <link
-    xlink:href="https://nixos.org/nixpkgs/manual/#sec-allow-insecure">Nixpkgs
-     manual</link> for more information.
+     Packages in nixpkgs can be marked as insecure through listed vulnerabilities. See the <link
+    xlink:href="https://nixos.org/nixpkgs/manual/#sec-allow-insecure">Nixpkgs manual</link> for more information.
     </para>
    </listitem>
    <listitem>
@@ -512,92 +496,64 @@
   <title>Backward Incompatibilities</title>
 
   <para>
-   When upgrading from a previous release, please be aware of the following
-   incompatible changes:
+   When upgrading from a previous release, please be aware of the following incompatible changes:
   </para>
 
   <itemizedlist>
    <listitem>
     <para>
-     Derivations have no <literal>.nativeDrv</literal> nor
-     <literal>.crossDrv</literal> and are now cross by default, not native.
+     Derivations have no <literal>.nativeDrv</literal> nor <literal>.crossDrv</literal> and are now cross by default, not native.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>stdenv.overrides</literal> is now expected to take
-     <literal>self</literal> and <literal>super</literal> arguments. See
-     <literal>lib.trivial.extends</literal> for what those parameters
-     represent.
+     <literal>stdenv.overrides</literal> is now expected to take <literal>self</literal> and <literal>super</literal> arguments. See <literal>lib.trivial.extends</literal> for what those parameters represent.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>ansible</literal> now defaults to ansible version 2 as version 1
-     has been removed due to a serious
-     <link
-      xlink:href="https://www.computest.nl/advisories/CT-2017-0109_Ansible.txt">
-     vulnerability</link> unpatched by upstream.
+     <literal>ansible</literal> now defaults to ansible version 2 as version 1 has been removed due to a serious <link
+      xlink:href="https://www.computest.nl/advisories/CT-2017-0109_Ansible.txt"> vulnerability</link> unpatched by upstream.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>gnome</literal> alias has been removed along with
-     <literal>gtk</literal>, <literal>gtkmm</literal> and several others. Now
-     you need to use versioned attributes, like <literal>gnome3</literal>.
+     <literal>gnome</literal> alias has been removed along with <literal>gtk</literal>, <literal>gtkmm</literal> and several others. Now you need to use versioned attributes, like <literal>gnome3</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     The attribute name of the Radicale daemon has been changed from
-     <literal>pythonPackages.radicale</literal> to <literal>radicale</literal>.
+     The attribute name of the Radicale daemon has been changed from <literal>pythonPackages.radicale</literal> to <literal>radicale</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>stripHash</literal> bash function in
-     <literal>stdenv</literal> changed according to its documentation; it now
-     outputs the stripped name to <literal>stdout</literal> instead of putting
-     it in the variable <literal>strippedName</literal>.
+     The <literal>stripHash</literal> bash function in <literal>stdenv</literal> changed according to its documentation; it now outputs the stripped name to <literal>stdout</literal> instead of putting it in the variable <literal>strippedName</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     PHP now scans for extra configuration .ini files in /etc/php.d instead of
-     /etc. This prevents accidentally loading non-PHP .ini files that may be in
-     /etc.
+     PHP now scans for extra configuration .ini files in /etc/php.d instead of /etc. This prevents accidentally loading non-PHP .ini files that may be in /etc.
     </para>
    </listitem>
    <listitem>
     <para>
-     Two lone top-level dict dbs moved into <literal>dictdDBs</literal>. This
-     affects: <literal>dictdWordnet</literal> which is now at
-     <literal>dictdDBs.wordnet</literal> and <literal>dictdWiktionary</literal>
-     which is now at <literal>dictdDBs.wiktionary</literal>
+     Two lone top-level dict dbs moved into <literal>dictdDBs</literal>. This affects: <literal>dictdWordnet</literal> which is now at <literal>dictdDBs.wordnet</literal> and <literal>dictdWiktionary</literal> which is now at <literal>dictdDBs.wiktionary</literal>
     </para>
    </listitem>
    <listitem>
     <para>
-     Parsoid service now uses YAML configuration format.
-     <literal>service.parsoid.interwikis</literal> is now called
-     <literal>service.parsoid.wikis</literal> and is a list of either API URLs
-     or attribute sets as specified in parsoid's documentation.
+     Parsoid service now uses YAML configuration format. <literal>service.parsoid.interwikis</literal> is now called <literal>service.parsoid.wikis</literal> and is a list of either API URLs or attribute sets as specified in parsoid's documentation.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>Ntpd</literal> was replaced by
-     <literal>systemd-timesyncd</literal> as the default service to synchronize
-     system time with a remote NTP server. The old behavior can be restored by
-     setting <literal>services.ntp.enable</literal> to <literal>true</literal>.
-     Upstream time servers for all NTP implementations are now configured using
-     <literal>networking.timeServers</literal>.
+     <literal>Ntpd</literal> was replaced by <literal>systemd-timesyncd</literal> as the default service to synchronize system time with a remote NTP server. The old behavior can be restored by setting <literal>services.ntp.enable</literal> to <literal>true</literal>. Upstream time servers for all NTP implementations are now configured using <literal>networking.timeServers</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>service.nylon</literal> is now declared using named instances. As
-     an example:
+     <literal>service.nylon</literal> is now declared using named instances. As an example:
 <programlisting>
   services.nylon = {
     enable = true;
@@ -620,11 +576,8 @@
    </listitem>
    <listitem>
     <para>
-     <literal>overridePackages</literal> function no longer exists. It is
-     replaced by
-     <link
-    xlink:href="https://nixos.org/nixpkgs/manual/#sec-overlays-install">
-     overlays</link>. For example, the following code:
+     <literal>overridePackages</literal> function no longer exists. It is replaced by <link
+    xlink:href="https://nixos.org/nixpkgs/manual/#sec-overlays-install"> overlays</link>. For example, the following code:
 <programlisting>
 let
   pkgs = import &lt;nixpkgs&gt; {};
@@ -642,72 +595,42 @@ in
    </listitem>
    <listitem>
     <para>
-     Autoloading connection tracking helpers is now disabled by default. This
-     default was also changed in the Linux kernel and is considered insecure if
-     not configured properly in your firewall. If you need connection tracking
-     helpers (i.e. for active FTP) please enable
-     <literal>networking.firewall.autoLoadConntrackHelpers</literal> and tune
-     <literal>networking.firewall.connectionTrackingModules</literal> to suit
-     your needs.
+     Autoloading connection tracking helpers is now disabled by default. This default was also changed in the Linux kernel and is considered insecure if not configured properly in your firewall. If you need connection tracking helpers (i.e. for active FTP) please enable <literal>networking.firewall.autoLoadConntrackHelpers</literal> and tune <literal>networking.firewall.connectionTrackingModules</literal> to suit your needs.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>local_recipient_maps</literal> is not set to empty value by
-     Postfix service. It's an insecure default as stated by Postfix
-     documentation. Those who want to retain this setting need to set it via
-     <literal>services.postfix.extraConfig</literal>.
+     <literal>local_recipient_maps</literal> is not set to empty value by Postfix service. It's an insecure default as stated by Postfix documentation. Those who want to retain this setting need to set it via <literal>services.postfix.extraConfig</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     Iputils no longer provide ping6 and traceroute6. The functionality of
-     these tools has been integrated into ping and traceroute respectively. To
-     enforce an address family the new flags <literal>-4</literal> and
-     <literal>-6</literal> have been added. One notable incompatibility is that
-     specifying an interface (for link-local IPv6 for instance) is no longer
-     done with the <literal>-I</literal> flag, but by encoding the interface
-     into the address (<literal>ping fe80::1%eth0</literal>).
+     Iputils no longer provide ping6 and traceroute6. The functionality of these tools has been integrated into ping and traceroute respectively. To enforce an address family the new flags <literal>-4</literal> and <literal>-6</literal> have been added. One notable incompatibility is that specifying an interface (for link-local IPv6 for instance) is no longer done with the <literal>-I</literal> flag, but by encoding the interface into the address (<literal>ping fe80::1%eth0</literal>).
     </para>
    </listitem>
    <listitem>
     <para>
-     The socket handling of the <literal>services.rmilter</literal> module has
-     been fixed and refactored. As rmilter doesn't support binding to more than
-     one socket, the options <literal>bindUnixSockets</literal> and
-     <literal>bindInetSockets</literal> have been replaced by
-     <literal>services.rmilter.bindSocket.*</literal>. The default is still a
-     unix socket in <literal>/run/rmilter/rmilter.sock</literal>. Refer to the
-     options documentation for more information.
+     The socket handling of the <literal>services.rmilter</literal> module has been fixed and refactored. As rmilter doesn't support binding to more than one socket, the options <literal>bindUnixSockets</literal> and <literal>bindInetSockets</literal> have been replaced by <literal>services.rmilter.bindSocket.*</literal>. The default is still a unix socket in <literal>/run/rmilter/rmilter.sock</literal>. Refer to the options documentation for more information.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>fetch*</literal> functions no longer support md5, please use
-     sha256 instead.
+     The <literal>fetch*</literal> functions no longer support md5, please use sha256 instead.
     </para>
    </listitem>
    <listitem>
     <para>
-     The dnscrypt-proxy module interface has been streamlined around the
-     <option>extraArgs</option> option. Where possible, legacy option
-     declarations are mapped to <option>extraArgs</option> but will emit
-     warnings. The <option>resolverList</option> has been outright removed: to
-     use an unlisted resolver, use the <option>customResolver</option> option.
+     The dnscrypt-proxy module interface has been streamlined around the <option>extraArgs</option> option. Where possible, legacy option declarations are mapped to <option>extraArgs</option> but will emit warnings. The <option>resolverList</option> has been outright removed: to use an unlisted resolver, use the <option>customResolver</option> option.
     </para>
    </listitem>
    <listitem>
     <para>
-     torbrowser now stores local state under
-     <filename>~/.local/share/tor-browser</filename> by default. Any browser
-     profile data from the old location, <filename>~/.torbrowser4</filename>,
-     must be migrated manually.
+     torbrowser now stores local state under <filename>~/.local/share/tor-browser</filename> by default. Any browser profile data from the old location, <filename>~/.torbrowser4</filename>, must be migrated manually.
     </para>
    </listitem>
    <listitem>
     <para>
-     The ihaskell, monetdb, offlineimap and sitecopy services have been
-     removed.
+     The ihaskell, monetdb, offlineimap and sitecopy services have been removed.
     </para>
    </listitem>
   </itemizedlist>
@@ -723,18 +646,12 @@ in
   <itemizedlist>
    <listitem>
     <para>
-     Module type system have a new extensible option types feature that allow
-     to extend certain types, such as enum, through multiple option
-     declarations of the same option across multiple modules.
+     Module type system have a new extensible option types feature that allow to extend certain types, such as enum, through multiple option declarations of the same option across multiple modules.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>jre</literal> now defaults to GTK UI by default. This improves
-     visual consistency and makes Java follow system font style, improving the
-     situation on HighDPI displays. This has a cost of increased closure size;
-     for server and other headless workloads it's recommended to use
-     <literal>jre_headless</literal>.
+     <literal>jre</literal> now defaults to GTK UI by default. This improves visual consistency and makes Java follow system font style, improving the situation on HighDPI displays. This has a cost of increased closure size; for server and other headless workloads it's recommended to use <literal>jre_headless</literal>.
     </para>
    </listitem>
    <listitem>
@@ -744,53 +661,37 @@ in
    </listitem>
    <listitem>
     <para>
-     The Python 2.7 interpreter does not use modules anymore. Instead, all
-     CPython interpreters now include the whole standard library except for
-     `tkinter`, which is available in the Python package set.
+     The Python 2.7 interpreter does not use modules anymore. Instead, all CPython interpreters now include the whole standard library except for `tkinter`, which is available in the Python package set.
     </para>
    </listitem>
    <listitem>
     <para>
-     Python 2.7, 3.5 and 3.6 are now built deterministically and 3.4 mostly.
-     Minor modifications had to be made to the interpreters in order to
-     generate deterministic bytecode. This has security implications and is
-     relevant for those using Python in a <literal>nix-shell</literal>. See the
-     Nixpkgs manual for details.
+     Python 2.7, 3.5 and 3.6 are now built deterministically and 3.4 mostly. Minor modifications had to be made to the interpreters in order to generate deterministic bytecode. This has security implications and is relevant for those using Python in a <literal>nix-shell</literal>. See the Nixpkgs manual for details.
     </para>
    </listitem>
    <listitem>
     <para>
-     The Python package sets now use a fixed-point combinator and the sets are
-     available as attributes of the interpreters.
+     The Python package sets now use a fixed-point combinator and the sets are available as attributes of the interpreters.
     </para>
    </listitem>
    <listitem>
     <para>
-     The Python function <literal>buildPythonPackage</literal> has been
-     improved and can be used to build from Setuptools source, Flit source, and
-     precompiled Wheels.
+     The Python function <literal>buildPythonPackage</literal> has been improved and can be used to build from Setuptools source, Flit source, and precompiled Wheels.
     </para>
    </listitem>
    <listitem>
     <para>
-     When adding new or updating current Python libraries, the expressions
-     should be put in separate files in
-     <literal>pkgs/development/python-modules</literal> and called from
-     <literal>python-packages.nix</literal>.
+     When adding new or updating current Python libraries, the expressions should be put in separate files in <literal>pkgs/development/python-modules</literal> and called from <literal>python-packages.nix</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     The dnscrypt-proxy service supports synchronizing the list of public
-     resolvers without working DNS resolution. This fixes issues caused by the
-     resolver list becoming outdated. It also improves the viability of
-     DNSCrypt only configurations.
+     The dnscrypt-proxy service supports synchronizing the list of public resolvers without working DNS resolution. This fixes issues caused by the resolver list becoming outdated. It also improves the viability of DNSCrypt only configurations.
     </para>
    </listitem>
    <listitem>
     <para>
-     Containers using bridged networking no longer lose their connection after
-     changes to the host networking.
+     Containers using bridged networking no longer lose their connection after changes to the host networking.
     </para>
    </listitem>
    <listitem>
@@ -800,16 +701,12 @@ in
    </listitem>
    <listitem>
     <para>
-     The bind DNS utilities (e.g. dig) have been split into their own output
-     and are now also available in <literal>pkgs.dnsutils</literal> and it is
-     no longer necessary to pull in all of <literal>bind</literal> to use them.
+     The bind DNS utilities (e.g. dig) have been split into their own output and are now also available in <literal>pkgs.dnsutils</literal> and it is no longer necessary to pull in all of <literal>bind</literal> to use them.
     </para>
    </listitem>
    <listitem>
     <para>
-     Per-user configuration was moved from <filename>~/.nixpkgs</filename> to
-     <filename>~/.config/nixpkgs</filename>. The former is still valid for
-     <filename>config.nix</filename> for backwards compatibility.
+     Per-user configuration was moved from <filename>~/.nixpkgs</filename> to <filename>~/.config/nixpkgs</filename>. The former is still valid for <filename>config.nix</filename> for backwards compatibility.
     </para>
    </listitem>
   </itemizedlist>
diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml
index 795c51d2923..ff70bb663a0 100644
--- a/nixos/doc/manual/release-notes/rl-1709.xml
+++ b/nixos/doc/manual/release-notes/rl-1709.xml
@@ -13,30 +13,23 @@
   <title>Highlights</title>
 
   <para>
-   In addition to numerous new and upgraded packages, this release has the
-   following highlights:
+   In addition to numerous new and upgraded packages, this release has the following highlights:
   </para>
 
   <itemizedlist>
    <listitem>
     <para>
-     The GNOME version is now 3.24. KDE Plasma was upgraded to 5.10, KDE
-     Applications to 17.08.1 and KDE Frameworks to 5.37.
+     The GNOME version is now 3.24. KDE Plasma was upgraded to 5.10, KDE Applications to 17.08.1 and KDE Frameworks to 5.37.
     </para>
    </listitem>
    <listitem>
     <para>
-     The user handling now keeps track of deallocated UIDs/GIDs. When a user or
-     group is revived, this allows it to be allocated the UID/GID it had
-     before. A consequence is that UIDs and GIDs are no longer reused.
+     The user handling now keeps track of deallocated UIDs/GIDs. When a user or group is revived, this allows it to be allocated the UID/GID it had before. A consequence is that UIDs and GIDs are no longer reused.
     </para>
    </listitem>
    <listitem>
     <para>
-     The module option <option>services.xserver.xrandrHeads</option> now causes
-     the first head specified in this list to be set as the primary head. Apart
-     from that, it's now possible to also set additional options by using an
-     attribute set, for example:
+     The module option <option>services.xserver.xrandrHeads</option> now causes the first head specified in this list to be set as the primary head. Apart from that, it's now possible to also set additional options by using an attribute set, for example:
 <programlisting>
 { services.xserver.xrandrHeads = [
     "HDMI-0"
@@ -50,36 +43,21 @@
   ];
 }
 </programlisting>
-     This will set the <literal>DVI-0</literal> output to be the primary head,
-     even though <literal>HDMI-0</literal> is the first head in the list.
+     This will set the <literal>DVI-0</literal> output to be the primary head, even though <literal>HDMI-0</literal> is the first head in the list.
     </para>
    </listitem>
    <listitem>
     <para>
-     The handling of SSL in the <literal>services.nginx</literal> module has
-     been cleaned up, renaming the misnamed <literal>enableSSL</literal> to
-     <literal>onlySSL</literal> which reflects its original intention. This is
-     not to be used with the already existing <literal>forceSSL</literal> which
-     creates a second non-SSL virtual host redirecting to the SSL virtual host.
-     This by chance had worked earlier due to specific implementation details.
-     In case you had specified both please remove the
-     <literal>enableSSL</literal> option to keep the previous behaviour.
+     The handling of SSL in the <literal>services.nginx</literal> module has been cleaned up, renaming the misnamed <literal>enableSSL</literal> to <literal>onlySSL</literal> which reflects its original intention. This is not to be used with the already existing <literal>forceSSL</literal> which creates a second non-SSL virtual host redirecting to the SSL virtual host. This by chance had worked earlier due to specific implementation details. In case you had specified both please remove the <literal>enableSSL</literal> option to keep the previous behaviour.
     </para>
     <para>
-     Another <literal>addSSL</literal> option has been introduced to configure
-     both a non-SSL virtual host and an SSL virtual host with the same
-     configuration.
+     Another <literal>addSSL</literal> option has been introduced to configure both a non-SSL virtual host and an SSL virtual host with the same configuration.
     </para>
     <para>
-     Options to configure <literal>resolver</literal> options and
-     <literal>upstream</literal> blocks have been introduced. See their
-     information for further details.
+     Options to configure <literal>resolver</literal> options and <literal>upstream</literal> blocks have been introduced. See their information for further details.
     </para>
     <para>
-     The <literal>port</literal> option has been replaced by a more generic
-     <literal>listen</literal> option which makes it possible to specify
-     multiple addresses, ports and SSL configs dependant on the new SSL
-     handling mentioned above.
+     The <literal>port</literal> option has been replaced by a more generic <literal>listen</literal> option which makes it possible to specify multiple addresses, ports and SSL configs dependant on the new SSL handling mentioned above.
     </para>
    </listitem>
   </itemizedlist>
@@ -468,47 +446,31 @@
   <title>Backward Incompatibilities</title>
 
   <para>
-   When upgrading from a previous release, please be aware of the following
-   incompatible changes:
+   When upgrading from a previous release, please be aware of the following incompatible changes:
   </para>
 
   <itemizedlist>
    <listitem>
     <para>
-     <emphasis role="strong"> In an Qemu-based virtualization environment, the
-     network interface names changed from i.e. <literal>enp0s3</literal> to
-     <literal>ens3</literal>. </emphasis>
+     <emphasis role="strong"> In an Qemu-based virtualization environment, the network interface names changed from i.e. <literal>enp0s3</literal> to <literal>ens3</literal>. </emphasis>
     </para>
     <para>
-     This is due to a kernel configuration change. The new naming is consistent
-     with those of other Linux distributions with systemd. See
-     <link xlink:href="https://github.com/NixOS/nixpkgs/issues/29197">#29197</link>
-     for more information.
+     This is due to a kernel configuration change. The new naming is consistent with those of other Linux distributions with systemd. See <link xlink:href="https://github.com/NixOS/nixpkgs/issues/29197">#29197</link> for more information.
     </para>
     <para>
-     A machine is affected if the <literal>virt-what</literal> tool either
-     returns <literal>qemu</literal> or <literal>kvm</literal>
-     <emphasis>and</emphasis> has interface names used in any part of its NixOS
-     configuration, in particular if a static network configuration with
-     <literal>networking.interfaces</literal> is used.
+     A machine is affected if the <literal>virt-what</literal> tool either returns <literal>qemu</literal> or <literal>kvm</literal> <emphasis>and</emphasis> has interface names used in any part of its NixOS configuration, in particular if a static network configuration with <literal>networking.interfaces</literal> is used.
     </para>
     <para>
      Before rebooting affected machines, please ensure:
      <itemizedlist>
       <listitem>
        <para>
-        Change the interface names in your NixOS configuration. The first
-        interface will be called <literal>ens3</literal>, the second one
-        <literal>ens8</literal> and starting from there incremented by 1.
+        Change the interface names in your NixOS configuration. The first interface will be called <literal>ens3</literal>, the second one <literal>ens8</literal> and starting from there incremented by 1.
        </para>
       </listitem>
       <listitem>
        <para>
-        After changing the interface names, rebuild your system with
-        <literal>nixos-rebuild boot</literal> to activate the new configuration
-        after a reboot. If you switch to the new configuration right away you
-        might lose network connectivity! If using <literal>nixops</literal>,
-        deploy with <literal>nixops deploy --force-reboot</literal>.
+        After changing the interface names, rebuild your system with <literal>nixos-rebuild boot</literal> to activate the new configuration after a reboot. If you switch to the new configuration right away you might lose network connectivity! If using <literal>nixops</literal>, deploy with <literal>nixops deploy --force-reboot</literal>.
        </para>
       </listitem>
      </itemizedlist>
@@ -516,88 +478,59 @@
    </listitem>
    <listitem>
     <para>
-     The following changes apply if the <literal>stateVersion</literal> is
-     changed to 17.09 or higher. For <literal>stateVersion = "17.03"</literal>
-     or lower the old behavior is preserved.
+     The following changes apply if the <literal>stateVersion</literal> is changed to 17.09 or higher. For <literal>stateVersion = "17.03"</literal> or lower the old behavior is preserved.
     </para>
     <itemizedlist>
      <listitem>
       <para>
-       The <literal>postgres</literal> default version was changed from 9.5 to
-       9.6.
+       The <literal>postgres</literal> default version was changed from 9.5 to 9.6.
       </para>
      </listitem>
      <listitem>
       <para>
-       The <literal>postgres</literal> superuser name has changed from
-       <literal>root</literal> to <literal>postgres</literal> to more closely
-       follow what other Linux distributions are doing.
+       The <literal>postgres</literal> superuser name has changed from <literal>root</literal> to <literal>postgres</literal> to more closely follow what other Linux distributions are doing.
       </para>
      </listitem>
      <listitem>
       <para>
-       The <literal>postgres</literal> default <literal>dataDir</literal> has
-       changed from <literal>/var/db/postgres</literal> to
-       <literal>/var/lib/postgresql/$psqlSchema</literal> where $psqlSchema is
-       9.6 for example.
+       The <literal>postgres</literal> default <literal>dataDir</literal> has changed from <literal>/var/db/postgres</literal> to <literal>/var/lib/postgresql/$psqlSchema</literal> where $psqlSchema is 9.6 for example.
       </para>
      </listitem>
      <listitem>
       <para>
-       The <literal>mysql</literal> default <literal>dataDir</literal> has
-       changed from <literal>/var/mysql</literal> to
-       <literal>/var/lib/mysql</literal>.
+       The <literal>mysql</literal> default <literal>dataDir</literal> has changed from <literal>/var/mysql</literal> to <literal>/var/lib/mysql</literal>.
       </para>
      </listitem>
      <listitem>
       <para>
-       Radicale's default package has changed from 1.x to 2.x. Instructions to
-       migrate can be found <link xlink:href="http://radicale.org/1to2/"> here
-       </link>. It is also possible to use the newer version by setting the
-       <literal>package</literal> to <literal>radicale2</literal>, which is
-       done automatically when <literal>stateVersion</literal> is 17.09 or
-       higher. The <literal>extraArgs</literal> option has been added to allow
-       passing the data migration arguments specified in the instructions; see
-       the
-       <filename xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/radicale.nix">radicale.nix</filename>
-       NixOS test for an example migration.
+       Radicale's default package has changed from 1.x to 2.x. Instructions to migrate can be found <link xlink:href="http://radicale.org/1to2/"> here </link>. It is also possible to use the newer version by setting the <literal>package</literal> to <literal>radicale2</literal>, which is done automatically when <literal>stateVersion</literal> is 17.09 or higher. The <literal>extraArgs</literal> option has been added to allow passing the data migration arguments specified in the instructions; see the <filename xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/radicale.nix">radicale.nix</filename> NixOS test for an example migration.
       </para>
      </listitem>
     </itemizedlist>
    </listitem>
    <listitem>
     <para>
-     The <literal>aiccu</literal> package was removed. This is due to SixXS
-     <link xlink:href="https://www.sixxs.net/main/"> sunsetting</link> its IPv6
-     tunnel.
+     The <literal>aiccu</literal> package was removed. This is due to SixXS <link xlink:href="https://www.sixxs.net/main/"> sunsetting</link> its IPv6 tunnel.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>fanctl</literal> package and <literal>fan</literal> module
-     have been removed due to the developers not upstreaming their iproute2
-     patches and lagging with compatibility to recent iproute2 versions.
+     The <literal>fanctl</literal> package and <literal>fan</literal> module have been removed due to the developers not upstreaming their iproute2 patches and lagging with compatibility to recent iproute2 versions.
     </para>
    </listitem>
    <listitem>
     <para>
-     Top-level <literal>idea</literal> package collection was renamed. All
-     JetBrains IDEs are now at <literal>jetbrains</literal>.
+     Top-level <literal>idea</literal> package collection was renamed. All JetBrains IDEs are now at <literal>jetbrains</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>flexget</literal>'s state database cannot be upgraded to its new
-     internal format, requiring removal of any existing
-     <literal>db-config.sqlite</literal> which will be automatically recreated.
+     <literal>flexget</literal>'s state database cannot be upgraded to its new internal format, requiring removal of any existing <literal>db-config.sqlite</literal> which will be automatically recreated.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>ipfs</literal> service now doesn't ignore the
-     <literal>dataDir</literal> option anymore. If you've ever set this option
-     to anything other than the default you'll have to either unset it (so the
-     default gets used) or migrate the old data manually with
+     The <literal>ipfs</literal> service now doesn't ignore the <literal>dataDir</literal> option anymore. If you've ever set this option to anything other than the default you'll have to either unset it (so the default gets used) or migrate the old data manually with
 <programlisting>
 dataDir=&lt;valueOfDataDir&gt;
 mv /var/lib/ipfs/.ipfs/* $dataDir
@@ -607,107 +540,66 @@ rmdir /var/lib/ipfs/.ipfs
    </listitem>
    <listitem>
     <para>
-     The <literal>caddy</literal> service was previously using an extra
-     <literal>.caddy</literal> directory in the data directory specified with
-     the <literal>dataDir</literal> option. The contents of the
-     <literal>.caddy</literal> directory are now expected to be in the
-     <literal>dataDir</literal>.
+     The <literal>caddy</literal> service was previously using an extra <literal>.caddy</literal> directory in the data directory specified with the <literal>dataDir</literal> option. The contents of the <literal>.caddy</literal> directory are now expected to be in the <literal>dataDir</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>ssh-agent</literal> user service is not started by default
-     anymore. Use <literal>programs.ssh.startAgent</literal> to enable it if
-     needed. There is also a new <literal>programs.gnupg.agent</literal> module
-     that creates a <literal>gpg-agent</literal> user service. It can also
-     serve as a SSH agent if <literal>enableSSHSupport</literal> is set.
+     The <literal>ssh-agent</literal> user service is not started by default anymore. Use <literal>programs.ssh.startAgent</literal> to enable it if needed. There is also a new <literal>programs.gnupg.agent</literal> module that creates a <literal>gpg-agent</literal> user service. It can also serve as a SSH agent if <literal>enableSSHSupport</literal> is set.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>services.tinc.networks.&lt;name&gt;.listenAddress</literal>
-     option had a misleading name that did not correspond to its behavior. It
-     now correctly defines the ip to listen for incoming connections on. To
-     keep the previous behaviour, use
-     <literal>services.tinc.networks.&lt;name&gt;.bindToAddress</literal>
-     instead. Refer to the description of the options for more details.
+     The <literal>services.tinc.networks.&lt;name&gt;.listenAddress</literal> option had a misleading name that did not correspond to its behavior. It now correctly defines the ip to listen for incoming connections on. To keep the previous behaviour, use <literal>services.tinc.networks.&lt;name&gt;.bindToAddress</literal> instead. Refer to the description of the options for more details.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>tlsdate</literal> package and module were removed. This is due to
-     the project being dead and not building with openssl 1.1.
+     <literal>tlsdate</literal> package and module were removed. This is due to the project being dead and not building with openssl 1.1.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>wvdial</literal> package and module were removed. This is due to
-     the project being dead and not building with openssl 1.1.
+     <literal>wvdial</literal> package and module were removed. This is due to the project being dead and not building with openssl 1.1.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>cc-wrapper</literal>'s setup-hook now exports a number of
-     environment variables corresponding to binutils binaries, (e.g.
-     <envar>LD</envar>, <envar>STRIP</envar>, <envar>RANLIB</envar>, etc). This
-     is done to prevent packages' build systems guessing, which is harder to
-     predict, especially when cross-compiling. However, some packages have
-     broken due to this—their build systems either not supporting, or
-     claiming to support without adequate testing, taking such environment
-     variables as parameters.
+     <literal>cc-wrapper</literal>'s setup-hook now exports a number of environment variables corresponding to binutils binaries, (e.g. <envar>LD</envar>, <envar>STRIP</envar>, <envar>RANLIB</envar>, etc). This is done to prevent packages' build systems guessing, which is harder to predict, especially when cross-compiling. However, some packages have broken due to this—their build systems either not supporting, or claiming to support without adequate testing, taking such environment variables as parameters.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>services.firefox.syncserver</literal> now runs by default as a
-     non-root user. To accomodate this change, the default sqlite database
-     location has also been changed. Migration should work automatically. Refer
-     to the description of the options for more details.
+     <literal>services.firefox.syncserver</literal> now runs by default as a non-root user. To accomodate this change, the default sqlite database location has also been changed. Migration should work automatically. Refer to the description of the options for more details.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>compiz</literal> window manager and package was removed. The
-     system support had been broken for several years.
+     The <literal>compiz</literal> window manager and package was removed. The system support had been broken for several years.
     </para>
    </listitem>
    <listitem>
     <para>
-     Touchpad support should now be enabled through <literal>libinput</literal>
-     as <literal>synaptics</literal> is now deprecated. See the option
-     <literal>services.xserver.libinput.enable</literal>.
+     Touchpad support should now be enabled through <literal>libinput</literal> as <literal>synaptics</literal> is now deprecated. See the option <literal>services.xserver.libinput.enable</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     grsecurity/PaX support has been dropped, following upstream's decision to
-     cease free support. See
-     <link xlink:href="https://grsecurity.net/passing_the_baton.php">
-     upstream's announcement</link> for more information. No complete
-     replacement for grsecurity/PaX is available presently.
+     grsecurity/PaX support has been dropped, following upstream's decision to cease free support. See <link xlink:href="https://grsecurity.net/passing_the_baton.php"> upstream's announcement</link> for more information. No complete replacement for grsecurity/PaX is available presently.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>services.mysql</literal> now has declarative configuration of
-     databases and users with the <literal>ensureDatabases</literal> and
-     <literal>ensureUsers</literal> options.
+     <literal>services.mysql</literal> now has declarative configuration of databases and users with the <literal>ensureDatabases</literal> and <literal>ensureUsers</literal> options.
     </para>
     <para>
-     These options will never delete existing databases and users, especially
-     not when the value of the options are changed.
+     These options will never delete existing databases and users, especially not when the value of the options are changed.
     </para>
     <para>
-     The MySQL users will be identified using
-     <link xlink:href="https://mariadb.com/kb/en/library/authentication-plugin-unix-socket/">
-     Unix socket authentication</link>. This authenticates the Unix user with
-     the same name only, and that without the need for a password.
+     The MySQL users will be identified using <link xlink:href="https://mariadb.com/kb/en/library/authentication-plugin-unix-socket/"> Unix socket authentication</link>. This authenticates the Unix user with the same name only, and that without the need for a password.
     </para>
     <para>
-     If you have previously created a MySQL <literal>root</literal> user
-     <emphasis>with a password</emphasis>, you will need to add
-     <literal>root</literal> user for unix socket authentication before using
-     the new options. This can be done by running the following SQL script:
+     If you have previously created a MySQL <literal>root</literal> user <emphasis>with a password</emphasis>, you will need to add <literal>root</literal> user for unix socket authentication before using the new options. This can be done by running the following SQL script:
 <programlisting language="sql">
 CREATE USER 'root'@'%' IDENTIFIED BY '';
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' WITH GRANT OPTION;
@@ -720,55 +612,38 @@ FLUSH PRIVILEGES;
    </listitem>
    <listitem>
     <para>
-     <literal>services.mysqlBackup</literal> now works by default without any
-     user setup, including for users other than <literal>mysql</literal>.
+     <literal>services.mysqlBackup</literal> now works by default without any user setup, including for users other than <literal>mysql</literal>.
     </para>
     <para>
-     By default, the <literal>mysql</literal> user is no longer the user which
-     performs the backup. Instead a system account
-     <literal>mysqlbackup</literal> is used.
+     By default, the <literal>mysql</literal> user is no longer the user which performs the backup. Instead a system account <literal>mysqlbackup</literal> is used.
     </para>
     <para>
-     The <literal>mysqlBackup</literal> service is also now using systemd
-     timers instead of <literal>cron</literal>.
+     The <literal>mysqlBackup</literal> service is also now using systemd timers instead of <literal>cron</literal>.
     </para>
     <para>
-     Therefore, the <literal>services.mysqlBackup.period</literal> option no
-     longer exists, and has been replaced with
-     <literal>services.mysqlBackup.calendar</literal>, which is in the format
-     of
-     <link
+     Therefore, the <literal>services.mysqlBackup.period</literal> option no longer exists, and has been replaced with <literal>services.mysqlBackup.calendar</literal>, which is in the format of <link
       xlink:href="https://www.freedesktop.org/software/systemd/man/systemd.time.html#Calendar%20Events">systemd.time(7)</link>.
     </para>
     <para>
-     If you expect to be sent an e-mail when the backup fails, consider using a
-     script which monitors the systemd journal for errors. Regretfully, at
-     present there is no built-in functionality for this.
+     If you expect to be sent an e-mail when the backup fails, consider using a script which monitors the systemd journal for errors. Regretfully, at present there is no built-in functionality for this.
     </para>
     <para>
-     You can check that backups still work by running <command>systemctl start
-     mysql-backup</command> then <command>systemctl status
-     mysql-backup</command>.
+     You can check that backups still work by running <command>systemctl start mysql-backup</command> then <command>systemctl status mysql-backup</command>.
     </para>
    </listitem>
    <listitem>
     <para>
-     Templated systemd services e.g <literal>container@name</literal> are now
-     handled currectly when switching to a new configuration, resulting in them
-     being reloaded.
+     Templated systemd services e.g <literal>container@name</literal> are now handled currectly when switching to a new configuration, resulting in them being reloaded.
     </para>
    </listitem>
    <listitem>
     <para>
-     Steam: the <literal>newStdcpp</literal> parameter was removed and should
-     not be needed anymore.
+     Steam: the <literal>newStdcpp</literal> parameter was removed and should not be needed anymore.
     </para>
    </listitem>
    <listitem>
     <para>
-     Redis has been updated to version 4 which mandates a cluster mass-restart,
-     due to changes in the network handling, in order to ensure compatibility
-     with networks NATing traffic.
+     Redis has been updated to version 4 which mandates a cluster mass-restart, due to changes in the network handling, in order to ensure compatibility with networks NATing traffic.
     </para>
    </listitem>
   </itemizedlist>
@@ -784,46 +659,28 @@ FLUSH PRIVILEGES;
   <itemizedlist>
    <listitem>
     <para>
-     Modules can now be disabled by using
-     <link
-      xlink:href="https://nixos.org/nixpkgs/manual/#sec-replace-modules">
-     disabledModules</link>, allowing another to take it's place. This can be
-     used to import a set of modules from another channel while keeping the
-     rest of the system on a stable release.
+     Modules can now be disabled by using <link
+      xlink:href="https://nixos.org/nixpkgs/manual/#sec-replace-modules"> disabledModules</link>, allowing another to take it's place. This can be used to import a set of modules from another channel while keeping the rest of the system on a stable release.
     </para>
    </listitem>
    <listitem>
     <para>
-     Updated to FreeType 2.7.1, including a new TrueType engine. The new engine
-     replaces the Infinality engine which was the default in NixOS. The default
-     font rendering settings are now provided by fontconfig-penultimate,
-     replacing fontconfig-ultimate; the new defaults are less invasive and
-     provide rendering that is more consistent with other systems and hopefully
-     with each font designer's intent. Some system-wide configuration has been
-     removed from the Fontconfig NixOS module where user Fontconfig settings
-     are available.
+     Updated to FreeType 2.7.1, including a new TrueType engine. The new engine replaces the Infinality engine which was the default in NixOS. The default font rendering settings are now provided by fontconfig-penultimate, replacing fontconfig-ultimate; the new defaults are less invasive and provide rendering that is more consistent with other systems and hopefully with each font designer's intent. Some system-wide configuration has been removed from the Fontconfig NixOS module where user Fontconfig settings are available.
     </para>
    </listitem>
    <listitem>
     <para>
-     ZFS/SPL have been updated to 0.7.0, <literal>zfsUnstable,
-     splUnstable</literal> have therefore been removed.
+     ZFS/SPL have been updated to 0.7.0, <literal>zfsUnstable, splUnstable</literal> have therefore been removed.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <option>time.timeZone</option> option now allows the value
-     <literal>null</literal> in addition to timezone strings. This value allows
-     changing the timezone of a system imperatively using <command>timedatectl
-     set-timezone</command>. The default timezone is still UTC.
+     The <option>time.timeZone</option> option now allows the value <literal>null</literal> in addition to timezone strings. This value allows changing the timezone of a system imperatively using <command>timedatectl set-timezone</command>. The default timezone is still UTC.
     </para>
    </listitem>
    <listitem>
     <para>
-     Nixpkgs overlays may now be specified with a file as well as a directory.
-     The value of <literal>&lt;nixpkgs-overlays></literal> may be a file, and
-     <filename>~/.config/nixpkgs/overlays.nix</filename> can be used instead of
-     the <filename>~/.config/nixpkgs/overlays</filename> directory.
+     Nixpkgs overlays may now be specified with a file as well as a directory. The value of <literal>&lt;nixpkgs-overlays></literal> may be a file, and <filename>~/.config/nixpkgs/overlays.nix</filename> can be used instead of the <filename>~/.config/nixpkgs/overlays</filename> directory.
     </para>
     <para>
      See the overlays chapter of the Nixpkgs manual for more details.
@@ -831,67 +688,48 @@ FLUSH PRIVILEGES;
    </listitem>
    <listitem>
     <para>
-     Definitions for <filename>/etc/hosts</filename> can now be specified
-     declaratively with <literal>networking.hosts</literal>.
+     Definitions for <filename>/etc/hosts</filename> can now be specified declaratively with <literal>networking.hosts</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     Two new options have been added to the installer loader, in addition to
-     the default having changed. The kernel log verbosity has been lowered to
-     the upstream default for the default options, in order to not spam the
-     console when e.g. joining a network.
+     Two new options have been added to the installer loader, in addition to the default having changed. The kernel log verbosity has been lowered to the upstream default for the default options, in order to not spam the console when e.g. joining a network.
     </para>
     <para>
-     This therefore leads to adding a new <literal>debug</literal> option to
-     set the log level to the previous verbose mode, to make debugging easier,
-     but still accessible easily.
+     This therefore leads to adding a new <literal>debug</literal> option to set the log level to the previous verbose mode, to make debugging easier, but still accessible easily.
     </para>
     <para>
-     Additionally a <literal>copytoram</literal> option has been added, which
-     makes it possible to remove the install medium after booting. This allows
-     tethering from your phone after booting from it.
+     Additionally a <literal>copytoram</literal> option has been added, which makes it possible to remove the install medium after booting. This allows tethering from your phone after booting from it.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>services.gitlab-runner.configOptions</literal> has been added to
-     specify the configuration of gitlab-runners declaratively.
+     <literal>services.gitlab-runner.configOptions</literal> has been added to specify the configuration of gitlab-runners declaratively.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>services.jenkins.plugins</literal> has been added to install
-     plugins easily, this can be generated with jenkinsPlugins2nix.
+     <literal>services.jenkins.plugins</literal> has been added to install plugins easily, this can be generated with jenkinsPlugins2nix.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>services.postfix.config</literal> has been added to specify the
-     main.cf with NixOS options. Additionally other options have been added to
-     the postfix module and has been improved further.
+     <literal>services.postfix.config</literal> has been added to specify the main.cf with NixOS options. Additionally other options have been added to the postfix module and has been improved further.
     </para>
    </listitem>
    <listitem>
     <para>
-     The GitLab package and module have been updated to the latest 10.0
-     release.
+     The GitLab package and module have been updated to the latest 10.0 release.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>systemd-boot</literal> boot loader now lists the NixOS
-     version, kernel version and build date of all bootable generations.
+     The <literal>systemd-boot</literal> boot loader now lists the NixOS version, kernel version and build date of all bootable generations.
     </para>
    </listitem>
    <listitem>
     <para>
-     The dnscrypt-proxy service now defaults to using a random upstream
-     resolver, selected from the list of public non-logging resolvers with
-     DNSSEC support. Existing configurations can be migrated to this mode of
-     operation by omitting the
-     <option>services.dnscrypt-proxy.resolverName</option> option or setting it
-     to <literal>"random"</literal>.
+     The dnscrypt-proxy service now defaults to using a random upstream resolver, selected from the list of public non-logging resolvers with DNSSEC support. Existing configurations can be migrated to this mode of operation by omitting the <option>services.dnscrypt-proxy.resolverName</option> option or setting it to <literal>"random"</literal>.
     </para>
    </listitem>
   </itemizedlist>
diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml
index c14679eea07..2e39b990d9e 100644
--- a/nixos/doc/manual/release-notes/rl-1803.xml
+++ b/nixos/doc/manual/release-notes/rl-1803.xml
@@ -13,8 +13,7 @@
   <title>Highlights</title>
 
   <para>
-   In addition to numerous new and upgraded packages, this release has the
-   following highlights:
+   In addition to numerous new and upgraded packages, this release has the following highlights:
   </para>
 
   <itemizedlist>
@@ -25,48 +24,36 @@
    </listitem>
    <listitem>
     <para>
-     Platform support: x86_64-linux and x86_64-darwin since release time (the
-     latter isn't NixOS, really). Binaries for aarch64-linux are available, but
-     no channel exists yet, as it's waiting for some test fixes, etc.
+     Platform support: x86_64-linux and x86_64-darwin since release time (the latter isn't NixOS, really). Binaries for aarch64-linux are available, but no channel exists yet, as it's waiting for some test fixes, etc.
     </para>
    </listitem>
    <listitem>
     <para>
-     Nix now defaults to 2.0; see its
-     <link xlink:href="https://nixos.org/nix/manual/#ssec-relnotes-2.0">release
-     notes</link>.
+     Nix now defaults to 2.0; see its <link xlink:href="https://nixos.org/nix/manual/#ssec-relnotes-2.0">release notes</link>.
     </para>
    </listitem>
    <listitem>
     <para>
-     Core version changes: linux: 4.9 -> 4.14, glibc: 2.25 -> 2.26, gcc: 6 ->
-     7, systemd: 234 -> 237.
+     Core version changes: linux: 4.9 -> 4.14, glibc: 2.25 -> 2.26, gcc: 6 -> 7, systemd: 234 -> 237.
     </para>
    </listitem>
    <listitem>
     <para>
-     Desktop version changes: gnome: 3.24 -> 3.26, (KDE) plasma-desktop: 5.10
-     -> 5.12.
+     Desktop version changes: gnome: 3.24 -> 3.26, (KDE) plasma-desktop: 5.10 -> 5.12.
     </para>
    </listitem>
    <listitem>
     <para>
-     MariaDB 10.2, updated from 10.1, is now the default MySQL implementation.
-     While upgrading a few changes have been made to the infrastructure
-     involved:
+     MariaDB 10.2, updated from 10.1, is now the default MySQL implementation. While upgrading a few changes have been made to the infrastructure involved:
      <itemizedlist>
       <listitem>
        <para>
-        <literal>libmysql</literal> has been deprecated, please use
-        <literal>mysql.connector-c</literal> instead, a compatibility passthru
-        has been added to the MySQL packages.
+        <literal>libmysql</literal> has been deprecated, please use <literal>mysql.connector-c</literal> instead, a compatibility passthru has been added to the MySQL packages.
        </para>
       </listitem>
       <listitem>
        <para>
-        The <literal>mysql57</literal> package has a new
-        <literal>static</literal> output containing the static libraries
-        including <literal>libmysqld.a</literal>
+        The <literal>mysql57</literal> package has a new <literal>static</literal> output containing the static libraries including <literal>libmysqld.a</literal>
        </para>
       </listitem>
      </itemizedlist>
@@ -403,8 +390,7 @@
   <title>Backward Incompatibilities</title>
 
   <para>
-   When upgrading from a previous release, please be aware of the following
-   incompatible changes:
+   When upgrading from a previous release, please be aware of the following incompatible changes:
   </para>
 
   <itemizedlist>
@@ -415,39 +401,26 @@
    </listitem>
    <listitem>
     <para>
-     Dollar signs in options under <option>services.postfix</option> are passed
-     verbatim to Postfix, which will interpret them as the beginning of a
-     parameter expression. This was already true for string-valued options in
-     the previous release, but not for list-valued options. If you need to pass
-     literal dollar signs through Postfix, double them.
+     Dollar signs in options under <option>services.postfix</option> are passed verbatim to Postfix, which will interpret them as the beginning of a parameter expression. This was already true for string-valued options in the previous release, but not for list-valued options. If you need to pass literal dollar signs through Postfix, double them.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>postage</literal> package (for web-based PostgreSQL
-     administration) has been renamed to <literal>pgmanage</literal>. The
-     corresponding module has also been renamed. To migrate please rename all
-     <option>services.postage</option> options to
-     <option>services.pgmanage</option>.
+     The <literal>postage</literal> package (for web-based PostgreSQL administration) has been renamed to <literal>pgmanage</literal>. The corresponding module has also been renamed. To migrate please rename all <option>services.postage</option> options to <option>services.pgmanage</option>.
     </para>
    </listitem>
    <listitem>
     <para>
-     Package attributes starting with a digit have been prefixed with an
-     underscore sign. This is to avoid quoting in the configuration and other
-     issues with command-line tools like <literal>nix-env</literal>. The change
-     affects the following packages:
+     Package attributes starting with a digit have been prefixed with an underscore sign. This is to avoid quoting in the configuration and other issues with command-line tools like <literal>nix-env</literal>. The change affects the following packages:
      <itemizedlist>
       <listitem>
        <para>
-        <literal>2048-in-terminal</literal> →
-        <literal>_2048-in-terminal</literal>
+        <literal>2048-in-terminal</literal> → <literal>_2048-in-terminal</literal>
        </para>
       </listitem>
       <listitem>
        <para>
-        <literal>90secondportraits</literal> →
-        <literal>_90secondportraits</literal>
+        <literal>90secondportraits</literal> → <literal>_90secondportraits</literal>
        </para>
       </listitem>
       <listitem>
@@ -465,134 +438,77 @@
    </listitem>
    <listitem>
     <para>
-     <emphasis role="strong"> The OpenSSH service no longer enables support for
-     DSA keys by default, which could cause a system lock out. Update your keys
-     or, unfavorably, re-enable DSA support manually. </emphasis>
+     <emphasis role="strong"> The OpenSSH service no longer enables support for DSA keys by default, which could cause a system lock out. Update your keys or, unfavorably, re-enable DSA support manually. </emphasis>
     </para>
     <para>
-     DSA support was
-     <link xlink:href="https://www.openssh.com/legacy.html">deprecated in
-     OpenSSH 7.0</link>, due to it being too weak. To re-enable support, add
-     <literal>PubkeyAcceptedKeyTypes +ssh-dss</literal> to the end of your
-     <option>services.openssh.extraConfig</option>.
+     DSA support was <link xlink:href="https://www.openssh.com/legacy.html">deprecated in OpenSSH 7.0</link>, due to it being too weak. To re-enable support, add <literal>PubkeyAcceptedKeyTypes +ssh-dss</literal> to the end of your <option>services.openssh.extraConfig</option>.
     </para>
     <para>
-     After updating the keys to be stronger, anyone still on a pre-17.03
-     version is safe to jump to 17.03, as vetted
-     <link xlink:href="https://search.nix.gsc.io/?q=stateVersion">here</link>.
+     After updating the keys to be stronger, anyone still on a pre-17.03 version is safe to jump to 17.03, as vetted <link xlink:href="https://search.nix.gsc.io/?q=stateVersion">here</link>.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>openssh</literal> package now includes Kerberos support by
-     default; the <literal>openssh_with_kerberos</literal> package is now a
-     deprecated alias. If you do not want Kerberos support, you can do
-     <literal>openssh.override { withKerberos = false; }</literal>. Note, this
-     also applies to the <literal>openssh_hpn</literal> package.
+     The <literal>openssh</literal> package now includes Kerberos support by default; the <literal>openssh_with_kerberos</literal> package is now a deprecated alias. If you do not want Kerberos support, you can do <literal>openssh.override { withKerberos = false; }</literal>. Note, this also applies to the <literal>openssh_hpn</literal> package.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>cc-wrapper</literal> has been split in two; there is now also a
-     <literal>bintools-wrapper</literal>. The most commonly used files in
-     <filename>nix-support</filename> are now split between the two wrappers.
-     Some commonly used ones, like
-     <filename>nix-support/dynamic-linker</filename>, are duplicated for
-     backwards compatability, even though they rightly belong only in
-     <literal>bintools-wrapper</literal>. Other more obscure ones are just
-     moved.
+     <literal>cc-wrapper</literal> has been split in two; there is now also a <literal>bintools-wrapper</literal>. The most commonly used files in <filename>nix-support</filename> are now split between the two wrappers. Some commonly used ones, like <filename>nix-support/dynamic-linker</filename>, are duplicated for backwards compatability, even though they rightly belong only in <literal>bintools-wrapper</literal>. Other more obscure ones are just moved.
     </para>
    </listitem>
    <listitem>
     <para>
-     The propagation logic has been changed. The new logic, along with new
-     types of dependencies that go with, is thoroughly documented in the
-     "Specifying dependencies" section of the "Standard Environment" chapter of
-     the nixpkgs manual.
+     The propagation logic has been changed. The new logic, along with new types of dependencies that go with, is thoroughly documented in the "Specifying dependencies" section of the "Standard Environment" chapter of the nixpkgs manual.
 <!-- That's <xref linkend="ssec-stdenv-attributes"> were we to merge the manuals. -->
-     The old logic isn't but is easy to describe: dependencies were propagated
-     as the same type of dependency no matter what. In practice, that means
-     that many <function>propagatedNativeBuildInputs</function> should instead
-     be <function>propagatedBuildInputs</function>. Thankfully, that was and is
-     the least used type of dependency. Also, it means that some
-     <function>propagatedBuildInputs</function> should instead be
-     <function>depsTargetTargetPropagated</function>. Other types dependencies
-     should be unaffected.
+     The old logic isn't but is easy to describe: dependencies were propagated as the same type of dependency no matter what. In practice, that means that many <function>propagatedNativeBuildInputs</function> should instead be <function>propagatedBuildInputs</function>. Thankfully, that was and is the least used type of dependency. Also, it means that some <function>propagatedBuildInputs</function> should instead be <function>depsTargetTargetPropagated</function>. Other types dependencies should be unaffected.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>lib.addPassthru drv passthru</literal> is removed. Use
-     <literal>lib.extendDerivation true passthru drv</literal> instead.
+     <literal>lib.addPassthru drv passthru</literal> is removed. Use <literal>lib.extendDerivation true passthru drv</literal> instead.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>memcached</literal> service no longer accept dynamic socket
-     paths via <option>services.memcached.socket</option>. Unix sockets can be
-     still enabled by <option>services.memcached.enableUnixSocket</option> and
-     will be accessible at <literal>/run/memcached/memcached.sock</literal>.
+     The <literal>memcached</literal> service no longer accept dynamic socket paths via <option>services.memcached.socket</option>. Unix sockets can be still enabled by <option>services.memcached.enableUnixSocket</option> and will be accessible at <literal>/run/memcached/memcached.sock</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <varname>hardware.amdHybridGraphics.disable</varname> option was
-     removed for lack of a maintainer. If you still need this module, you may
-     wish to include a copy of it from an older version of nixos in your
-     imports.
+     The <varname>hardware.amdHybridGraphics.disable</varname> option was removed for lack of a maintainer. If you still need this module, you may wish to include a copy of it from an older version of nixos in your imports.
     </para>
    </listitem>
    <listitem>
     <para>
-     The merging of config options for
-     <varname>services.postfix.config</varname> was buggy. Previously, if other
-     options in the Postfix module like
-     <varname>services.postfix.useSrs</varname> were set and the user set
-     config options that were also set by such options, the resulting config
-     wouldn't include all options that were needed. They are now merged
-     correctly. If config options need to be overridden,
-     <literal>lib.mkForce</literal> or <literal>lib.mkOverride</literal> can be
-     used.
+     The merging of config options for <varname>services.postfix.config</varname> was buggy. Previously, if other options in the Postfix module like <varname>services.postfix.useSrs</varname> were set and the user set config options that were also set by such options, the resulting config wouldn't include all options that were needed. They are now merged correctly. If config options need to be overridden, <literal>lib.mkForce</literal> or <literal>lib.mkOverride</literal> can be used.
     </para>
    </listitem>
    <listitem>
     <para>
-     The following changes apply if the <literal>stateVersion</literal> is
-     changed to 18.03 or higher. For <literal>stateVersion = "17.09"</literal>
-     or lower the old behavior is preserved.
+     The following changes apply if the <literal>stateVersion</literal> is changed to 18.03 or higher. For <literal>stateVersion = "17.09"</literal> or lower the old behavior is preserved.
     </para>
     <itemizedlist>
      <listitem>
       <para>
-       <literal>matrix-synapse</literal> uses postgresql by default instead of
-       sqlite. Migration instructions can be found
-       <link xlink:href="https://github.com/matrix-org/synapse/blob/master/docs/postgres.rst#porting-from-sqlite">
-       here </link>.
+       <literal>matrix-synapse</literal> uses postgresql by default instead of sqlite. Migration instructions can be found <link xlink:href="https://github.com/matrix-org/synapse/blob/master/docs/postgres.rst#porting-from-sqlite"> here </link>.
       </para>
      </listitem>
     </itemizedlist>
    </listitem>
    <listitem>
     <para>
-     The <literal>jid</literal> package has been removed, due to maintenance
-     overhead of a go package having non-versioned dependencies.
+     The <literal>jid</literal> package has been removed, due to maintenance overhead of a go package having non-versioned dependencies.
     </para>
    </listitem>
    <listitem>
     <para>
-     When using <option>services.xserver.libinput</option> (enabled by default
-     in GNOME), it now handles all input devices, not just touchpads. As a
-     result, you might need to re-evaluate any custom Xorg configuration. In
-     particular, <literal>Option "XkbRules" "base"</literal> may result in
-     broken keyboard layout.
+     When using <option>services.xserver.libinput</option> (enabled by default in GNOME), it now handles all input devices, not just touchpads. As a result, you might need to re-evaluate any custom Xorg configuration. In particular, <literal>Option "XkbRules" "base"</literal> may result in broken keyboard layout.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>attic</literal> package was removed. A maintained fork called
-     <link xlink:href="https://www.borgbackup.org/">Borg</link> should be used
-     instead. Migration instructions can be found
-     <link xlink:href="http://borgbackup.readthedocs.io/en/stable/usage/upgrade.html#attic-and-borg-0-xx-to-borg-1-x">here</link>.
+     The <literal>attic</literal> package was removed. A maintained fork called <link xlink:href="https://www.borgbackup.org/">Borg</link> should be used instead. Migration instructions can be found <link xlink:href="http://borgbackup.readthedocs.io/en/stable/usage/upgrade.html#attic-and-borg-0-xx-to-borg-1-x">here</link>.
     </para>
    </listitem>
    <listitem>
@@ -601,52 +517,32 @@
      <itemizedlist>
       <listitem>
        <para>
-        The package <literal>pkgs.piwik</literal> was renamed to
-        <literal>pkgs.matomo</literal>.
+        The package <literal>pkgs.piwik</literal> was renamed to <literal>pkgs.matomo</literal>.
        </para>
       </listitem>
       <listitem>
        <para>
-        The service <literal>services.piwik</literal> was renamed to
-        <literal>services.matomo</literal>.
+        The service <literal>services.piwik</literal> was renamed to <literal>services.matomo</literal>.
        </para>
       </listitem>
       <listitem>
        <para>
-        The data directory <filename>/var/lib/piwik</filename> was renamed to
-        <filename>/var/lib/matomo</filename>. All files will be moved
-        automatically on first startup, but you might need to adjust your
-        backup scripts.
+        The data directory <filename>/var/lib/piwik</filename> was renamed to <filename>/var/lib/matomo</filename>. All files will be moved automatically on first startup, but you might need to adjust your backup scripts.
        </para>
       </listitem>
       <listitem>
        <para>
-        The default <option>serverName</option> for the nginx configuration
-        changed from <literal>piwik.${config.networking.hostName}</literal> to
-        <literal>matomo.${config.networking.hostName}.${config.networking.domain}</literal>
-        if <option>config.networking.domain</option> is set,
-        <literal>matomo.${config.networking.hostName}</literal> if it is not
-        set. If you change your <option>serverName</option>, remember you'll
-        need to update the <literal>trustedHosts[]</literal> array in
-        <filename>/var/lib/matomo/config/config.ini.php</filename> as well.
+        The default <option>serverName</option> for the nginx configuration changed from <literal>piwik.${config.networking.hostName}</literal> to <literal>matomo.${config.networking.hostName}.${config.networking.domain}</literal> if <option>config.networking.domain</option> is set, <literal>matomo.${config.networking.hostName}</literal> if it is not set. If you change your <option>serverName</option>, remember you'll need to update the <literal>trustedHosts[]</literal> array in <filename>/var/lib/matomo/config/config.ini.php</filename> as well.
        </para>
       </listitem>
       <listitem>
        <para>
-        The <literal>piwik</literal> user was renamed to
-        <literal>matomo</literal>. The service will adjust ownership
-        automatically for files in the data directory. If you use unix socket
-        authentication, remember to give the new <literal>matomo</literal> user
-        access to the database and to change the <literal>username</literal> to
-        <literal>matomo</literal> in the <literal>[database]</literal> section
-        of <filename>/var/lib/matomo/config/config.ini.php</filename>.
+        The <literal>piwik</literal> user was renamed to <literal>matomo</literal>. The service will adjust ownership automatically for files in the data directory. If you use unix socket authentication, remember to give the new <literal>matomo</literal> user access to the database and to change the <literal>username</literal> to <literal>matomo</literal> in the <literal>[database]</literal> section of <filename>/var/lib/matomo/config/config.ini.php</filename>.
        </para>
       </listitem>
       <listitem>
        <para>
-        If you named your database `piwik`, you might want to rename it to
-        `matomo` to keep things clean, but this is neither enforced nor
-        required.
+        If you named your database `piwik`, you might want to rename it to `matomo` to keep things clean, but this is neither enforced nor required.
        </para>
       </listitem>
      </itemizedlist>
@@ -654,59 +550,43 @@
    </listitem>
    <listitem>
     <para>
-     <literal>nodejs-4_x</literal> is end-of-life.
-     <literal>nodejs-4_x</literal>, <literal>nodejs-slim-4_x</literal> and
-     <literal>nodePackages_4_x</literal> are removed.
+     <literal>nodejs-4_x</literal> is end-of-life. <literal>nodejs-4_x</literal>, <literal>nodejs-slim-4_x</literal> and <literal>nodePackages_4_x</literal> are removed.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>pump.io</literal> NixOS module was removed. It is now
-     maintained as an
-     <link xlink:href="https://github.com/rvl/pump.io-nixos">external
-     module</link>.
+     The <literal>pump.io</literal> NixOS module was removed. It is now maintained as an <link xlink:href="https://github.com/rvl/pump.io-nixos">external module</link>.
     </para>
    </listitem>
    <listitem>
     <para>
-     The Prosody XMPP server has received a major update. The following modules
-     were renamed:
+     The Prosody XMPP server has received a major update. The following modules were renamed:
      <itemizedlist>
       <listitem>
        <para>
-        <option>services.prosody.modules.httpserver</option> is now
-        <option>services.prosody.modules.http_files</option>
+        <option>services.prosody.modules.httpserver</option> is now <option>services.prosody.modules.http_files</option>
        </para>
       </listitem>
       <listitem>
        <para>
-        <option>services.prosody.modules.console</option> is now
-        <option>services.prosody.modules.admin_telnet</option>
+        <option>services.prosody.modules.console</option> is now <option>services.prosody.modules.admin_telnet</option>
        </para>
       </listitem>
      </itemizedlist>
     </para>
     <para>
-     Many new modules are now core modules, most notably
-     <option>services.prosody.modules.carbons</option> and
-     <option>services.prosody.modules.mam</option>.
+     Many new modules are now core modules, most notably <option>services.prosody.modules.carbons</option> and <option>services.prosody.modules.mam</option>.
     </para>
     <para>
-     The better-performing <literal>libevent</literal> backend is now enabled
-     by default.
+     The better-performing <literal>libevent</literal> backend is now enabled by default.
     </para>
     <para>
-     <literal>withCommunityModules</literal> now passes through the modules to
-     <option>services.prosody.extraModules</option>. Use
-     <literal>withOnlyInstalledCommunityModules</literal> for modules that
-     should not be enabled directly, e.g <literal>lib_ldap</literal>.
+     <literal>withCommunityModules</literal> now passes through the modules to <option>services.prosody.extraModules</option>. Use <literal>withOnlyInstalledCommunityModules</literal> for modules that should not be enabled directly, e.g <literal>lib_ldap</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     All prometheus exporter modules are now defined as submodules. The
-     exporters are configured using
-     <literal>services.prometheus.exporters</literal>.
+     All prometheus exporter modules are now defined as submodules. The exporters are configured using <literal>services.prometheus.exporters</literal>.
     </para>
    </listitem>
   </itemizedlist>
@@ -722,24 +602,17 @@
   <itemizedlist>
    <listitem>
     <para>
-     ZNC option <option>services.znc.mutable</option> now defaults to
-     <literal>true</literal>. That means that old configuration is not
-     overwritten by default when update to the znc options are made.
+     ZNC option <option>services.znc.mutable</option> now defaults to <literal>true</literal>. That means that old configuration is not overwritten by default when update to the znc options are made.
     </para>
    </listitem>
    <listitem>
     <para>
-     The option <option>networking.wireless.networks.&lt;name&gt;.auth</option>
-     has been added for wireless networks with WPA-Enterprise authentication.
-     There is also a new <option>extraConfig</option> option to directly
-     configure <literal>wpa_supplicant</literal> and <option>hidden</option> to
-     connect to hidden networks.
+     The option <option>networking.wireless.networks.&lt;name&gt;.auth</option> has been added for wireless networks with WPA-Enterprise authentication. There is also a new <option>extraConfig</option> option to directly configure <literal>wpa_supplicant</literal> and <option>hidden</option> to connect to hidden networks.
     </para>
    </listitem>
    <listitem>
     <para>
-     In the module <option>networking.interfaces.&lt;name&gt;</option> the
-     following options have been removed:
+     In the module <option>networking.interfaces.&lt;name&gt;</option> the following options have been removed:
      <itemizedlist>
       <listitem>
        <para>
@@ -767,34 +640,22 @@
        </para>
       </listitem>
      </itemizedlist>
-     To assign static addresses to an interface the options
-     <option>ipv4.addresses</option> and <option>ipv6.addresses</option> should
-     be used instead. The options <option>ip4</option> and <option>ip6</option>
-     have been renamed to <option>ipv4.addresses</option>
-     <option>ipv6.addresses</option> respectively. The new options
-     <option>ipv4.routes</option> and <option>ipv6.routes</option> have been
-     added to set up static routing.
+     To assign static addresses to an interface the options <option>ipv4.addresses</option> and <option>ipv6.addresses</option> should be used instead. The options <option>ip4</option> and <option>ip6</option> have been renamed to <option>ipv4.addresses</option> <option>ipv6.addresses</option> respectively. The new options <option>ipv4.routes</option> and <option>ipv6.routes</option> have been added to set up static routing.
     </para>
    </listitem>
    <listitem>
     <para>
-     The option <option>services.logstash.listenAddress</option> is now
-     <literal>127.0.0.1</literal> by default. Previously the default behaviour
-     was to listen on all interfaces.
+     The option <option>services.logstash.listenAddress</option> is now <literal>127.0.0.1</literal> by default. Previously the default behaviour was to listen on all interfaces.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>services.btrfs.autoScrub</literal> has been added, to
-     periodically check btrfs filesystems for data corruption. If there's a
-     correct copy available, it will automatically repair corrupted blocks.
+     <literal>services.btrfs.autoScrub</literal> has been added, to periodically check btrfs filesystems for data corruption. If there's a correct copy available, it will automatically repair corrupted blocks.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>displayManager.lightdm.greeters.gtk.clock-format.</literal> has
-     been added, the clock format string (as expected by strftime, e.g.
-     <literal>%H:%M</literal>) to use with the lightdm gtk greeter panel.
+     <literal>displayManager.lightdm.greeters.gtk.clock-format.</literal> has been added, the clock format string (as expected by strftime, e.g. <literal>%H:%M</literal>) to use with the lightdm gtk greeter panel.
     </para>
     <para>
      If set to null the default clock format is used.
@@ -802,17 +663,10 @@
    </listitem>
    <listitem>
     <para>
-     <literal>displayManager.lightdm.greeters.gtk.indicators</literal> has been
-     added, a list of allowed indicator modules to use with the lightdm gtk
-     greeter panel.
+     <literal>displayManager.lightdm.greeters.gtk.indicators</literal> has been added, a list of allowed indicator modules to use with the lightdm gtk greeter panel.
     </para>
     <para>
-     Built-in indicators include <literal>~a11y</literal>,
-     <literal>~language</literal>, <literal>~session</literal>,
-     <literal>~power</literal>, <literal>~clock</literal>,
-     <literal>~host</literal>, <literal>~spacer</literal>. Unity indicators can
-     be represented by short name (e.g. <literal>sound</literal>,
-     <literal>power</literal>), service file name, or absolute path.
+     Built-in indicators include <literal>~a11y</literal>, <literal>~language</literal>, <literal>~session</literal>, <literal>~power</literal>, <literal>~clock</literal>, <literal>~host</literal>, <literal>~spacer</literal>. Unity indicators can be represented by short name (e.g. <literal>sound</literal>, <literal>power</literal>), service file name, or absolute path.
     </para>
     <para>
      If set to <literal>null</literal> the default indicators are used.
@@ -834,20 +688,12 @@
    </listitem>
    <listitem>
     <para>
-     The NixOS test driver supports user services declared by
-     <literal>systemd.user.services</literal>. The methods
-     <literal>waitForUnit</literal>, <literal>getUnitInfo</literal>,
-     <literal>startJob</literal> and <literal>stopJob</literal> provide an
-     optional <literal>$user</literal> argument for that purpose.
+     The NixOS test driver supports user services declared by <literal>systemd.user.services</literal>. The methods <literal>waitForUnit</literal>, <literal>getUnitInfo</literal>, <literal>startJob</literal> and <literal>stopJob</literal> provide an optional <literal>$user</literal> argument for that purpose.
     </para>
    </listitem>
    <listitem>
     <para>
-     Enabling bash completion on NixOS,
-     <literal>programs.bash.enableCompletion</literal>, will now also enable
-     completion for the Nix command line tools by installing the
-     <link xlink:href="https://github.com/hedning/nix-bash-completions">nix-bash-completions</link>
-     package.
+     Enabling bash completion on NixOS, <literal>programs.bash.enableCompletion</literal>, will now also enable completion for the Nix command line tools by installing the <link xlink:href="https://github.com/hedning/nix-bash-completions">nix-bash-completions</link> package.
     </para>
    </listitem>
   </itemizedlist>
diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml
index 3f10b26223d..df53c6f9dd9 100644
--- a/nixos/doc/manual/release-notes/rl-1809.xml
+++ b/nixos/doc/manual/release-notes/rl-1809.xml
@@ -13,8 +13,7 @@
   <title>Highlights</title>
 
   <para>
-   In addition to numerous new and upgraded packages, this release has the
-   following notable updates:
+   In addition to numerous new and upgraded packages, this release has the following notable updates:
   </para>
 
   <itemizedlist>
@@ -25,28 +24,22 @@
    </listitem>
    <listitem>
     <para>
-     Platform support: x86_64-linux and x86_64-darwin as always. Support for
-     aarch64-linux is as with the previous releases, not equivalent to the
-     x86-64-linux release, but with efforts to reach parity.
+     Platform support: x86_64-linux and x86_64-darwin as always. Support for aarch64-linux is as with the previous releases, not equivalent to the x86-64-linux release, but with efforts to reach parity.
     </para>
    </listitem>
    <listitem>
     <para>
-     Nix has been updated to 2.1; see its
-     <link xlink:href="https://nixos.org/nix/manual/#ssec-relnotes-2.1">release
-     notes</link>.
+     Nix has been updated to 2.1; see its <link xlink:href="https://nixos.org/nix/manual/#ssec-relnotes-2.1">release notes</link>.
     </para>
    </listitem>
    <listitem>
     <para>
-     Core versions: linux: 4.14 LTS (unchanged), glibc: 2.26 → 2.27, gcc: 7
-     (unchanged), systemd: 237 → 239.
+     Core versions: linux: 4.14 LTS (unchanged), glibc: 2.26 → 2.27, gcc: 7 (unchanged), systemd: 237 → 239.
     </para>
    </listitem>
    <listitem>
     <para>
-     Desktop version changes: gnome: 3.26 → 3.28, (KDE) plasma-desktop: 5.12
-     → 5.13.
+     Desktop version changes: gnome: 3.26 → 3.28, (KDE) plasma-desktop: 5.12 → 5.13.
     </para>
    </listitem>
   </itemizedlist>
@@ -58,8 +51,7 @@
   <itemizedlist>
    <listitem>
     <para>
-     Support for wrapping binaries using <literal>firejail</literal> has been
-     added through <varname>programs.firejail.wrappedBinaries</varname>.
+     Support for wrapping binaries using <literal>firejail</literal> has been added through <varname>programs.firejail.wrappedBinaries</varname>.
     </para>
     <para>
      For example
@@ -74,17 +66,12 @@ programs.firejail = {
 };
 </programlisting>
     <para>
-     This will place <literal>firefox</literal> and <literal>mpv</literal>
-     binaries in the global path wrapped by firejail.
+     This will place <literal>firefox</literal> and <literal>mpv</literal> binaries in the global path wrapped by firejail.
     </para>
    </listitem>
    <listitem>
     <para>
-     User channels are now in the default <literal>NIX_PATH</literal>, allowing
-     users to use their personal <command>nix-channel</command> defined
-     channels in <command>nix-build</command> and <command>nix-shell</command>
-     commands, as well as in imports like <code>import
-     &lt;mychannel&gt;</code>.
+     User channels are now in the default <literal>NIX_PATH</literal>, allowing users to use their personal <command>nix-channel</command> defined channels in <command>nix-build</command> and <command>nix-shell</command> commands, as well as in imports like <code>import &lt;mychannel&gt;</code>.
     </para>
     <para>
      For example
@@ -114,52 +101,31 @@ $ nix-instantiate -E '(import &lt;nixpkgsunstable&gt; {}).gitFull'
   <itemizedlist>
    <listitem>
     <para>
-     The <varname>services.cassandra</varname> module has been reworked and was
-     rewritten from scratch. The service has succeeding tests for the versions
-     2.1, 2.2, 3.0 and 3.11 of
-     <link
-     xlink:href="https://cassandra.apache.org/">Apache
-     Cassandra</link>.
+     The <varname>services.cassandra</varname> module has been reworked and was rewritten from scratch. The service has succeeding tests for the versions 2.1, 2.2, 3.0 and 3.11 of <link
+     xlink:href="https://cassandra.apache.org/">Apache Cassandra</link>.
     </para>
    </listitem>
    <listitem>
     <para>
-     There is a new <varname>services.foundationdb</varname> module for
-     deploying
-     <link xlink:href="https://www.foundationdb.org">FoundationDB</link>
-     clusters.
+     There is a new <varname>services.foundationdb</varname> module for deploying <link xlink:href="https://www.foundationdb.org">FoundationDB</link> clusters.
     </para>
    </listitem>
    <listitem>
     <para>
-     When enabled the <literal>iproute2</literal> will copy the files expected
-     by ip route (e.g., <filename>rt_tables</filename>) in
-     <filename>/etc/iproute2</filename>. This allows to write aliases for
-     routing tables for instance.
+     When enabled the <literal>iproute2</literal> will copy the files expected by ip route (e.g., <filename>rt_tables</filename>) in <filename>/etc/iproute2</filename>. This allows to write aliases for routing tables for instance.
     </para>
    </listitem>
    <listitem>
     <para>
-     <varname>services.strongswan-swanctl</varname> is a modern replacement for
-     <varname>services.strongswan</varname>. You can use either one of them to
-     setup IPsec VPNs but not both at the same time.
+     <varname>services.strongswan-swanctl</varname> is a modern replacement for <varname>services.strongswan</varname>. You can use either one of them to setup IPsec VPNs but not both at the same time.
     </para>
     <para>
-     <varname>services.strongswan-swanctl</varname> uses the
-     <link xlink:href="https://wiki.strongswan.org/projects/strongswan/wiki/swanctl">swanctl</link>
-     command which uses the modern
-     <link xlink:href="https://github.com/strongswan/strongswan/blob/master/src/libcharon/plugins/vici/README.md">vici</link>
-     <emphasis>Versatile IKE Configuration Interface</emphasis>. The deprecated
-     <literal>ipsec</literal> command used in
-     <varname>services.strongswan</varname> is using the legacy
-     <link xlink:href="https://github.com/strongswan/strongswan/blob/master/README_LEGACY.md">stroke
-     configuration interface</link>.
+     <varname>services.strongswan-swanctl</varname> uses the <link xlink:href="https://wiki.strongswan.org/projects/strongswan/wiki/swanctl">swanctl</link> command which uses the modern <link xlink:href="https://github.com/strongswan/strongswan/blob/master/src/libcharon/plugins/vici/README.md">vici</link> <emphasis>Versatile IKE Configuration Interface</emphasis>. The deprecated <literal>ipsec</literal> command used in <varname>services.strongswan</varname> is using the legacy <link xlink:href="https://github.com/strongswan/strongswan/blob/master/README_LEGACY.md">stroke configuration interface</link>.
     </para>
    </listitem>
    <listitem>
     <para>
-     The new <varname>services.elasticsearch-curator</varname> service
-     periodically curates or manages, your Elasticsearch indices and snapshots.
+     The new <varname>services.elasticsearch-curator</varname> service periodically curates or manages, your Elasticsearch indices and snapshots.
     </para>
    </listitem>
   </itemizedlist>
@@ -470,38 +436,32 @@ $ nix-instantiate -E '(import &lt;nixpkgsunstable&gt; {}).gitFull'
   <title>Backward Incompatibilities</title>
 
   <para>
-   When upgrading from a previous release, please be aware of the following
-   incompatible changes:
+   When upgrading from a previous release, please be aware of the following incompatible changes:
   </para>
 
   <itemizedlist>
    <listitem>
     <para>
-     Some licenses that were incorrectly not marked as unfree now are. This is
-     the case for:
+     Some licenses that were incorrectly not marked as unfree now are. This is the case for:
      <itemizedlist>
       <listitem>
        <para>
-        cc-by-nc-sa-20: Creative Commons Attribution Non Commercial Share Alike
-        2.0
+        cc-by-nc-sa-20: Creative Commons Attribution Non Commercial Share Alike 2.0
        </para>
       </listitem>
       <listitem>
        <para>
-        cc-by-nc-sa-25: Creative Commons Attribution Non Commercial Share Alike
-        2.5
+        cc-by-nc-sa-25: Creative Commons Attribution Non Commercial Share Alike 2.5
        </para>
       </listitem>
       <listitem>
        <para>
-        cc-by-nc-sa-30: Creative Commons Attribution Non Commercial Share Alike
-        3.0
+        cc-by-nc-sa-30: Creative Commons Attribution Non Commercial Share Alike 3.0
        </para>
       </listitem>
       <listitem>
        <para>
-        cc-by-nc-sa-40: Creative Commons Attribution Non Commercial Share Alike
-        4.0
+        cc-by-nc-sa-40: Creative Commons Attribution Non Commercial Share Alike 4.0
        </para>
       </listitem>
       <listitem>
@@ -519,128 +479,71 @@ $ nix-instantiate -E '(import &lt;nixpkgsunstable&gt; {}).gitFull'
    </listitem>
    <listitem>
     <para>
-     The deprecated <varname>services.cassandra</varname> module has seen a
-     complete rewrite. (See above.)
+     The deprecated <varname>services.cassandra</varname> module has seen a complete rewrite. (See above.)
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>lib.strict</literal> is removed. Use
-     <literal>builtins.seq</literal> instead.
+     <literal>lib.strict</literal> is removed. Use <literal>builtins.seq</literal> instead.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>clementine</literal> package points now to the free
-     derivation. <literal>clementineFree</literal> is removed now and
-     <literal>clementineUnfree</literal> points to the package which is bundled
-     with the unfree <literal>libspotify</literal> package.
+     The <literal>clementine</literal> package points now to the free derivation. <literal>clementineFree</literal> is removed now and <literal>clementineUnfree</literal> points to the package which is bundled with the unfree <literal>libspotify</literal> package.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>netcat</literal> package is now taken directly from OpenBSD's
-     <literal>libressl</literal>, instead of relying on Debian's fork. The new
-     version should be very close to the old version, but there are some minor
-     differences. Importantly, flags like -b, -q, -C, and -Z are no longer
-     accepted by the nc command.
+     The <literal>netcat</literal> package is now taken directly from OpenBSD's <literal>libressl</literal>, instead of relying on Debian's fork. The new version should be very close to the old version, but there are some minor differences. Importantly, flags like -b, -q, -C, and -Z are no longer accepted by the nc command.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <varname>services.docker-registry.extraConfig</varname> object doesn't
-     contain environment variables anymore. Instead it needs to provide an
-     object structure that can be mapped onto the YAML configuration defined in
-     <link xlink:href="https://github.com/docker/distribution/blob/v2.6.2/docs/configuration.md">the
-     <varname>docker/distribution</varname> docs</link>.
+     The <varname>services.docker-registry.extraConfig</varname> object doesn't contain environment variables anymore. Instead it needs to provide an object structure that can be mapped onto the YAML configuration defined in <link xlink:href="https://github.com/docker/distribution/blob/v2.6.2/docs/configuration.md">the <varname>docker/distribution</varname> docs</link>.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>gnucash</literal> has changed from version 2.4 to 3.x. If you've
-     been using <literal>gnucash</literal> (version 2.4) instead of
-     <literal>gnucash26</literal> (version 2.6) you must open your Gnucash data
-     file(s) with <literal>gnucash26</literal> and then save them to upgrade
-     the file format. Then you may use your data file(s) with Gnucash 3.x. See
-     the upgrade
-     <link xlink:href="https://wiki.gnucash.org/wiki/FAQ#Using_Different_Versions.2C_Up_And_Downgrade">documentation</link>.
-     Gnucash 2.4 is still available under the attribute
-     <literal>gnucash24</literal>.
+     <literal>gnucash</literal> has changed from version 2.4 to 3.x. If you've been using <literal>gnucash</literal> (version 2.4) instead of <literal>gnucash26</literal> (version 2.6) you must open your Gnucash data file(s) with <literal>gnucash26</literal> and then save them to upgrade the file format. Then you may use your data file(s) with Gnucash 3.x. See the upgrade <link xlink:href="https://wiki.gnucash.org/wiki/FAQ#Using_Different_Versions.2C_Up_And_Downgrade">documentation</link>. Gnucash 2.4 is still available under the attribute <literal>gnucash24</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     <varname>services.munge</varname> now runs as user (and group)
-     <literal>munge</literal> instead of root. Make sure the key file is
-     accessible to the daemon.
+     <varname>services.munge</varname> now runs as user (and group) <literal>munge</literal> instead of root. Make sure the key file is accessible to the daemon.
     </para>
    </listitem>
    <listitem>
     <para>
-     <varname>dockerTools.buildImage</varname> now uses <literal>null</literal>
-     as default value for <varname>tag</varname>, which indicates that the nix
-     output hash will be used as tag.
+     <varname>dockerTools.buildImage</varname> now uses <literal>null</literal> as default value for <varname>tag</varname>, which indicates that the nix output hash will be used as tag.
     </para>
    </listitem>
    <listitem>
     <para>
-     The ELK stack: <varname>elasticsearch</varname>,
-     <varname>logstash</varname> and <varname>kibana</varname> has been
-     upgraded from 2.* to 6.3.*. The 2.* versions have been
-     <link xlink:href="https://www.elastic.co/support/eol">unsupported since
-     last year</link> so they have been removed. You can still use the 5.*
-     versions under the names <varname>elasticsearch5</varname>,
-     <varname>logstash5</varname> and <varname>kibana5</varname>.
+     The ELK stack: <varname>elasticsearch</varname>, <varname>logstash</varname> and <varname>kibana</varname> has been upgraded from 2.* to 6.3.*. The 2.* versions have been <link xlink:href="https://www.elastic.co/support/eol">unsupported since last year</link> so they have been removed. You can still use the 5.* versions under the names <varname>elasticsearch5</varname>, <varname>logstash5</varname> and <varname>kibana5</varname>.
     </para>
     <para>
-     The elastic beats: <varname>filebeat</varname>,
-     <varname>heartbeat</varname>, <varname>metricbeat</varname> and
-     <varname>packetbeat</varname> have had the same treatment: they now target
-     6.3.* as well. The 5.* versions are available under the names:
-     <varname>filebeat5</varname>, <varname>heartbeat5</varname>,
-     <varname>metricbeat5</varname> and <varname>packetbeat5</varname>
+     The elastic beats: <varname>filebeat</varname>, <varname>heartbeat</varname>, <varname>metricbeat</varname> and <varname>packetbeat</varname> have had the same treatment: they now target 6.3.* as well. The 5.* versions are available under the names: <varname>filebeat5</varname>, <varname>heartbeat5</varname>, <varname>metricbeat5</varname> and <varname>packetbeat5</varname>
     </para>
     <para>
-     The ELK-6.3 stack now comes with
-     <link xlink:href="https://www.elastic.co/products/x-pack/open">X-Pack by
-     default</link>. Since X-Pack is licensed under the
-     <link xlink:href="https://github.com/elastic/elasticsearch/blob/master/licenses/ELASTIC-LICENSE.txt">Elastic
-     License</link> the ELK packages now have an unfree license. To use them
-     you need to specify <literal>allowUnfree = true;</literal> in your nixpkgs
-     configuration.
+     The ELK-6.3 stack now comes with <link xlink:href="https://www.elastic.co/products/x-pack/open">X-Pack by default</link>. Since X-Pack is licensed under the <link xlink:href="https://github.com/elastic/elasticsearch/blob/master/licenses/ELASTIC-LICENSE.txt">Elastic License</link> the ELK packages now have an unfree license. To use them you need to specify <literal>allowUnfree = true;</literal> in your nixpkgs configuration.
     </para>
     <para>
-     Fortunately there is also a free variant of the ELK stack without X-Pack.
-     The packages are available under the names:
-     <varname>elasticsearch-oss</varname>, <varname>logstash-oss</varname> and
-     <varname>kibana-oss</varname>.
+     Fortunately there is also a free variant of the ELK stack without X-Pack. The packages are available under the names: <varname>elasticsearch-oss</varname>, <varname>logstash-oss</varname> and <varname>kibana-oss</varname>.
     </para>
    </listitem>
    <listitem>
     <para>
-     Options
-     <literal>boot.initrd.luks.devices.<replaceable>name</replaceable>.yubikey.ramfsMountPoint</literal>
-     <literal>boot.initrd.luks.devices.<replaceable>name</replaceable>.yubikey.storage.mountPoint</literal>
-     were removed. <literal>luksroot.nix</literal> module never supported more
-     than one YubiKey at a time anyway, hence those options never had any
-     effect. You should be able to remove them from your config without any
-     issues.
+     Options <literal>boot.initrd.luks.devices.<replaceable>name</replaceable>.yubikey.ramfsMountPoint</literal> <literal>boot.initrd.luks.devices.<replaceable>name</replaceable>.yubikey.storage.mountPoint</literal> were removed. <literal>luksroot.nix</literal> module never supported more than one YubiKey at a time anyway, hence those options never had any effect. You should be able to remove them from your config without any issues.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>stdenv.system</literal> and <literal>system</literal> in nixpkgs
-     now refer to the host platform instead of the build platform. For native
-     builds this is not change, let alone a breaking one. For cross builds, it
-     is a breaking change, and <literal>stdenv.buildPlatform.system</literal>
-     can be used instead for the old behavior. They should be using that
-     anyways for clarity.
+     <literal>stdenv.system</literal> and <literal>system</literal> in nixpkgs now refer to the host platform instead of the build platform. For native builds this is not change, let alone a breaking one. For cross builds, it is a breaking change, and <literal>stdenv.buildPlatform.system</literal> can be used instead for the old behavior. They should be using that anyways for clarity.
     </para>
    </listitem>
    <listitem>
     <para>
-     Groups <literal>kvm</literal> and <literal>render</literal> are introduced
-     now, as systemd requires them.
+     Groups <literal>kvm</literal> and <literal>render</literal> are introduced now, as systemd requires them.
     </para>
    </listitem>
   </itemizedlist>
@@ -656,92 +559,69 @@ $ nix-instantiate -E '(import &lt;nixpkgsunstable&gt; {}).gitFull'
   <itemizedlist>
    <listitem>
     <para>
-     <literal>dockerTools.pullImage</literal> relies on image digest instead of
-     image tag to download the image. The <literal>sha256</literal> of a pulled
-     image has to be updated.
+     <literal>dockerTools.pullImage</literal> relies on image digest instead of image tag to download the image. The <literal>sha256</literal> of a pulled image has to be updated.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>lib.attrNamesToStr</literal> has been deprecated. Use more
-     specific concatenation (<literal>lib.concat(Map)StringsSep</literal>)
-     instead.
+     <literal>lib.attrNamesToStr</literal> has been deprecated. Use more specific concatenation (<literal>lib.concat(Map)StringsSep</literal>) instead.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>lib.addErrorContextToAttrs</literal> has been deprecated. Use
-     <literal>builtins.addErrorContext</literal> directly.
+     <literal>lib.addErrorContextToAttrs</literal> has been deprecated. Use <literal>builtins.addErrorContext</literal> directly.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>lib.showVal</literal> has been deprecated. Use
-     <literal>lib.traceSeqN</literal> instead.
+     <literal>lib.showVal</literal> has been deprecated. Use <literal>lib.traceSeqN</literal> instead.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>lib.traceXMLVal</literal> has been deprecated. Use
-     <literal>lib.traceValFn builtins.toXml</literal> instead.
+     <literal>lib.traceXMLVal</literal> has been deprecated. Use <literal>lib.traceValFn builtins.toXml</literal> instead.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>lib.traceXMLValMarked</literal> has been deprecated. Use
-     <literal>lib.traceValFn (x: str + builtins.toXML x)</literal> instead.
+     <literal>lib.traceXMLValMarked</literal> has been deprecated. Use <literal>lib.traceValFn (x: str + builtins.toXML x)</literal> instead.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>pkgs</literal> argument to NixOS modules can now be set
-     directly using <literal>nixpkgs.pkgs</literal>. Previously, only the
-     <literal>system</literal>, <literal>config</literal> and
-     <literal>overlays</literal> arguments could be used to influence
-     <literal>pkgs</literal>.
+     The <literal>pkgs</literal> argument to NixOS modules can now be set directly using <literal>nixpkgs.pkgs</literal>. Previously, only the <literal>system</literal>, <literal>config</literal> and <literal>overlays</literal> arguments could be used to influence <literal>pkgs</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     A NixOS system can now be constructed more easily based on a preexisting
-     invocation of Nixpkgs. For example:
+     A NixOS system can now be constructed more easily based on a preexisting invocation of Nixpkgs. For example:
 <programlisting>
 inherit (pkgs.nixos {
   boot.loader.grub.enable = false;
   fileSystems."/".device = "/dev/xvda1";
 }) toplevel kernel initialRamdisk manual;
       </programlisting>
-     This benefits evaluation performance, lets you write Nixpkgs packages that
-     depend on NixOS images and is consistent with a deployment architecture
-     that would be centered around Nixpkgs overlays.
+     This benefits evaluation performance, lets you write Nixpkgs packages that depend on NixOS images and is consistent with a deployment architecture that would be centered around Nixpkgs overlays.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>lib.traceValIfNot</literal> has been deprecated. Use
-     <literal>if/then/else</literal> and <literal>lib.traceValSeq</literal>
-     instead.
+     <literal>lib.traceValIfNot</literal> has been deprecated. Use <literal>if/then/else</literal> and <literal>lib.traceValSeq</literal> instead.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>lib.traceCallXml</literal> has been deprecated. Please complain
-     if you use the function regularly.
+     <literal>lib.traceCallXml</literal> has been deprecated. Please complain if you use the function regularly.
     </para>
    </listitem>
    <listitem>
     <para>
-     The attribute <literal>lib.nixpkgsVersion</literal> has been deprecated in
-     favor of <literal>lib.version</literal>. Please refer to the discussion in
-     <link xlink:href="https://github.com/NixOS/nixpkgs/pull/39416#discussion_r183845745">NixOS/nixpkgs#39416</link>
-     for further reference.
+     The attribute <literal>lib.nixpkgsVersion</literal> has been deprecated in favor of <literal>lib.version</literal>. Please refer to the discussion in <link xlink:href="https://github.com/NixOS/nixpkgs/pull/39416#discussion_r183845745">NixOS/nixpkgs#39416</link> for further reference.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>lib.recursiveUpdateUntil</literal> was not acting according to
-     its specification. It has been fixed to act according to the docstring,
-     and a test has been added.
+     <literal>lib.recursiveUpdateUntil</literal> was not acting according to its specification. It has been fixed to act according to the docstring, and a test has been added.
     </para>
    </listitem>
    <listitem>
@@ -755,9 +635,7 @@ inherit (pkgs.nixos {
       </term>
       <listitem>
        <para>
-        Puts the generated Diffie-Hellman parameters into the Nix store instead
-        of managing them in a stateful manner in
-        <filename class="directory">/var/lib/dhparams</filename>.
+        Puts the generated Diffie-Hellman parameters into the Nix store instead of managing them in a stateful manner in <filename class="directory">/var/lib/dhparams</filename>.
        </para>
       </listitem>
      </varlistentry>
@@ -767,27 +645,20 @@ inherit (pkgs.nixos {
       </term>
       <listitem>
        <para>
-        The default bit size to use for the generated Diffie-Hellman
-        parameters.
+        The default bit size to use for the generated Diffie-Hellman parameters.
        </para>
       </listitem>
      </varlistentry>
     </variablelist>
     <note>
      <para>
-      The path to the actual generated parameter files should now be queried
-      using
-      <literal>config.security.dhparams.params.<replaceable>name</replaceable>.path</literal>
-      because it might be either in the Nix store or in a directory configured
-      by <option>security.dhparams.path</option>.
+      The path to the actual generated parameter files should now be queried using <literal>config.security.dhparams.params.<replaceable>name</replaceable>.path</literal> because it might be either in the Nix store or in a directory configured by <option>security.dhparams.path</option>.
      </para>
     </note>
     <note>
      <title>For developers:</title>
      <para>
-      Module implementers should not set a specific bit size in order to let
-      users configure it by themselves if they want to have a different bit
-      size than the default (2048).
+      Module implementers should not set a specific bit size in order to let users configure it by themselves if they want to have a different bit size than the default (2048).
      </para>
      <para>
       An example usage of this would be:
@@ -806,126 +677,82 @@ inherit (pkgs.nixos {
    </listitem>
    <listitem>
     <para>
-     <literal>networking.networkmanager.useDnsmasq</literal> has been
-     deprecated. Use <literal>networking.networkmanager.dns</literal> instead.
+     <literal>networking.networkmanager.useDnsmasq</literal> has been deprecated. Use <literal>networking.networkmanager.dns</literal> instead.
     </para>
    </listitem>
    <listitem>
     <para>
-     The Kubernetes package has been bumped to major version 1.11. Please
-     consult the
-     <link xlink:href="https://github.com/kubernetes/kubernetes/blob/release-1.11/CHANGELOG-1.11.md">release
-     notes</link> for details on new features and api changes.
+     The Kubernetes package has been bumped to major version 1.11. Please consult the <link xlink:href="https://github.com/kubernetes/kubernetes/blob/release-1.11/CHANGELOG-1.11.md">release notes</link> for details on new features and api changes.
     </para>
    </listitem>
    <listitem>
     <para>
-     The option
-     <varname>services.kubernetes.apiserver.admissionControl</varname> was
-     renamed to
-     <varname>services.kubernetes.apiserver.enableAdmissionPlugins</varname>.
+     The option <varname>services.kubernetes.apiserver.admissionControl</varname> was renamed to <varname>services.kubernetes.apiserver.enableAdmissionPlugins</varname>.
     </para>
    </listitem>
    <listitem>
     <para>
-     Recommended way to access the Kubernetes Dashboard is via HTTPS (TLS)
-     Therefore; public service port for the dashboard has changed to 443
-     (container port 8443) and scheme to https.
+     Recommended way to access the Kubernetes Dashboard is via HTTPS (TLS) Therefore; public service port for the dashboard has changed to 443 (container port 8443) and scheme to https.
     </para>
    </listitem>
    <listitem>
     <para>
-     The option <varname>services.kubernetes.apiserver.address</varname> was
-     renamed to <varname>services.kubernetes.apiserver.bindAddress</varname>.
-     Note that the default value has changed from 127.0.0.1 to 0.0.0.0.
+     The option <varname>services.kubernetes.apiserver.address</varname> was renamed to <varname>services.kubernetes.apiserver.bindAddress</varname>. Note that the default value has changed from 127.0.0.1 to 0.0.0.0.
     </para>
    </listitem>
    <listitem>
     <para>
-     The option <varname>services.kubernetes.apiserver.publicAddress</varname>
-     was not used and thus has been removed.
+     The option <varname>services.kubernetes.apiserver.publicAddress</varname> was not used and thus has been removed.
     </para>
    </listitem>
    <listitem>
     <para>
-     The option
-     <varname>services.kubernetes.addons.dashboard.enableRBAC</varname> was
-     renamed to
-     <varname>services.kubernetes.addons.dashboard.rbac.enable</varname>.
+     The option <varname>services.kubernetes.addons.dashboard.enableRBAC</varname> was renamed to <varname>services.kubernetes.addons.dashboard.rbac.enable</varname>.
     </para>
    </listitem>
    <listitem>
     <para>
-     The Kubernetes Dashboard now has only minimal RBAC permissions by default.
-     If dashboard cluster-admin rights are desired, set
-     <varname>services.kubernetes.addons.dashboard.rbac.clusterAdmin</varname>
-     to true. On existing clusters, in order for the revocation of privileges
-     to take effect, the current ClusterRoleBinding for kubernetes-dashboard
-     must be manually removed: <literal>kubectl delete clusterrolebinding
-     kubernetes-dashboard</literal>
+     The Kubernetes Dashboard now has only minimal RBAC permissions by default. If dashboard cluster-admin rights are desired, set <varname>services.kubernetes.addons.dashboard.rbac.clusterAdmin</varname> to true. On existing clusters, in order for the revocation of privileges to take effect, the current ClusterRoleBinding for kubernetes-dashboard must be manually removed: <literal>kubectl delete clusterrolebinding kubernetes-dashboard</literal>
     </para>
    </listitem>
    <listitem>
     <para>
-     The <varname>programs.screen</varname> module provides allows to configure
-     <literal>/etc/screenrc</literal>, however the module behaved fairly
-     counterintuitive as the config exists, but the package wasn't available.
-     Since 18.09 <literal>pkgs.screen</literal> will be added to
-     <literal>environment.systemPackages</literal>.
+     The <varname>programs.screen</varname> module provides allows to configure <literal>/etc/screenrc</literal>, however the module behaved fairly counterintuitive as the config exists, but the package wasn't available. Since 18.09 <literal>pkgs.screen</literal> will be added to <literal>environment.systemPackages</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     The module <option>services.networking.hostapd</option> now uses WPA2 by
-     default.
+     The module <option>services.networking.hostapd</option> now uses WPA2 by default.
     </para>
    </listitem>
    <listitem>
     <para>
-     <varname>s6Dns</varname>, <varname>s6Networking</varname>,
-     <varname>s6LinuxUtils</varname> and <varname>s6PortableUtils</varname>
-     renamed to <varname>s6-dns</varname>, <varname>s6-networking</varname>,
-     <varname>s6-linux-utils</varname> and <varname>s6-portable-utils</varname>
-     respectively.
+     <varname>s6Dns</varname>, <varname>s6Networking</varname>, <varname>s6LinuxUtils</varname> and <varname>s6PortableUtils</varname> renamed to <varname>s6-dns</varname>, <varname>s6-networking</varname>, <varname>s6-linux-utils</varname> and <varname>s6-portable-utils</varname> respectively.
     </para>
    </listitem>
    <listitem>
     <para>
-     The module option <option>nix.useSandbox</option> is now defaulted to
-     <literal>true</literal>.
+     The module option <option>nix.useSandbox</option> is now defaulted to <literal>true</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     The config activation script of <literal>nixos-rebuild</literal> now
-     <link xlink:href="https://www.freedesktop.org/software/systemd/man/systemctl.html#Manager%20Lifecycle%20Commands">reloads</link>
-     all user units for each authenticated user.
+     The config activation script of <literal>nixos-rebuild</literal> now <link xlink:href="https://www.freedesktop.org/software/systemd/man/systemctl.html#Manager%20Lifecycle%20Commands">reloads</link> all user units for each authenticated user.
     </para>
    </listitem>
    <listitem>
     <para>
-     The default display manager is now LightDM. To use SLiM set
-     <literal>services.xserver.displayManager.slim.enable</literal> to
-     <literal>true</literal>.
+     The default display manager is now LightDM. To use SLiM set <literal>services.xserver.displayManager.slim.enable</literal> to <literal>true</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     NixOS option descriptions are now automatically broken up into individual
-     paragraphs if the text contains two consecutive newlines, so it's no
-     longer necessary to use <code>&lt;/para&gt;&lt;para&gt;</code> to start a
-     new paragraph.
+     NixOS option descriptions are now automatically broken up into individual paragraphs if the text contains two consecutive newlines, so it's no longer necessary to use <code>&lt;/para&gt;&lt;para&gt;</code> to start a new paragraph.
     </para>
    </listitem>
    <listitem>
     <para>
-     Top-level <literal>buildPlatform</literal>,
-     <literal>hostPlatform</literal>, and <literal>targetPlatform</literal> in
-     Nixpkgs are deprecated. Please use their equivalents in
-     <literal>stdenv</literal> instead:
-     <literal>stdenv.buildPlatform</literal>,
-     <literal>stdenv.hostPlatform</literal>, and
-     <literal>stdenv.targetPlatform</literal>.
+     Top-level <literal>buildPlatform</literal>, <literal>hostPlatform</literal>, and <literal>targetPlatform</literal> in Nixpkgs are deprecated. Please use their equivalents in <literal>stdenv</literal> instead: <literal>stdenv.buildPlatform</literal>, <literal>stdenv.hostPlatform</literal>, and <literal>stdenv.targetPlatform</literal>.
     </para>
    </listitem>
   </itemizedlist>
diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml
index 8ff1681d3b4..e270519932b 100644
--- a/nixos/doc/manual/release-notes/rl-1903.xml
+++ b/nixos/doc/manual/release-notes/rl-1903.xml
@@ -13,8 +13,7 @@
   <title>Highlights</title>
 
   <para>
-   In addition to numerous new and upgraded packages, this release has the
-   following highlights:
+   In addition to numerous new and upgraded packages, this release has the following highlights:
   </para>
 
   <itemizedlist>
@@ -25,53 +24,36 @@
    </listitem>
    <listitem>
     <para>
-     The default Python 3 interpreter is now CPython 3.7 instead of CPython
-     3.6.
+     The default Python 3 interpreter is now CPython 3.7 instead of CPython 3.6.
     </para>
    </listitem>
    <listitem>
     <para>
-     Added the Pantheon desktop environment. It can be enabled through
-     <varname>services.xserver.desktopManager.pantheon.enable</varname>.
+     Added the Pantheon desktop environment. It can be enabled through <varname>services.xserver.desktopManager.pantheon.enable</varname>.
     </para>
     <note>
      <para>
-      By default, <varname>services.xserver.desktopManager.pantheon</varname>
-      enables LightDM as a display manager, as pantheon's screen locking
-      implementation relies on it.
+      By default, <varname>services.xserver.desktopManager.pantheon</varname> enables LightDM as a display manager, as pantheon's screen locking implementation relies on it.
      </para>
      <para>
-      Because of that it is recommended to leave LightDM enabled. If you'd like
-      to disable it anyway, set
-      <option>services.xserver.displayManager.lightdm.enable</option> to
-      <literal>false</literal> and enable your preferred display manager.
+      Because of that it is recommended to leave LightDM enabled. If you'd like to disable it anyway, set <option>services.xserver.displayManager.lightdm.enable</option> to <literal>false</literal> and enable your preferred display manager.
      </para>
     </note>
     <para>
-     Also note that Pantheon's LightDM greeter is not enabled by default,
-     because it has numerous issues in NixOS and isn't optimal for use here
-     yet.
+     Also note that Pantheon's LightDM greeter is not enabled by default, because it has numerous issues in NixOS and isn't optimal for use here yet.
     </para>
    </listitem>
    <listitem>
     <para>
-     A major refactoring of the Kubernetes module has been completed.
-     Refactorings primarily focus on decoupling components and enhancing
-     security. Two-way TLS and RBAC has been enabled by default for all
-     components, which slightly changes the way the module is configured. See:
-     <xref linkend="sec-kubernetes"/> for details.
+     A major refactoring of the Kubernetes module has been completed. Refactorings primarily focus on decoupling components and enhancing security. Two-way TLS and RBAC has been enabled by default for all components, which slightly changes the way the module is configured. See: <xref linkend="sec-kubernetes"/> for details.
     </para>
    </listitem>
    <listitem>
-     <para>
-       There is now a set of <option>confinement</option> options for
-       <option>systemd.services</option>, which allows to restrict services
-       into a <citerefentry>
-        <refentrytitle>chroot</refentrytitle>
-        <manvolnum>2</manvolnum>
-      </citerefentry>ed environment that only contains the store paths from
-      the runtime closure of the service.
-     </para>
+    <para>
+     There is now a set of <option>confinement</option> options for <option>systemd.services</option>, which allows to restrict services into a <citerefentry>
+     <refentrytitle>chroot</refentrytitle>
+     <manvolnum>2</manvolnum> </citerefentry>ed environment that only contains the store paths from the runtime closure of the service.
+    </para>
    </listitem>
   </itemizedlist>
  </section>
@@ -95,12 +77,7 @@
    </listitem>
    <listitem>
     <para>
-     There is a new <varname>security.googleOsLogin</varname> module for using
-     <link xlink:href="https://cloud.google.com/compute/docs/instances/managing-instance-access">OS
-     Login</link> to manage SSH access to Google Compute Engine instances,
-     which supersedes the imperative and broken
-     <literal>google-accounts-daemon</literal> used in
-     <literal>nixos/modules/virtualisation/google-compute-config.nix</literal>.
+     There is a new <varname>security.googleOsLogin</varname> module for using <link xlink:href="https://cloud.google.com/compute/docs/instances/managing-instance-access">OS Login</link> to manage SSH access to Google Compute Engine instances, which supersedes the imperative and broken <literal>google-accounts-daemon</literal> used in <literal>nixos/modules/virtualisation/google-compute-config.nix</literal>.
     </para>
    </listitem>
    <listitem>
@@ -110,10 +87,7 @@
    </listitem>
    <listitem>
     <para>
-     There is a new <varname>services.cockroachdb</varname> module for running
-     CockroachDB databases. NixOS now ships with CockroachDB 2.1.x as well,
-     available on <literal>x86_64-linux</literal> and
-     <literal>aarch64-linux</literal>.
+     There is a new <varname>services.cockroachdb</varname> module for running CockroachDB databases. NixOS now ships with CockroachDB 2.1.x as well, available on <literal>x86_64-linux</literal> and <literal>aarch64-linux</literal>.
     </para>
    </listitem>
   </itemizedlist>
@@ -126,11 +100,7 @@
    </listitem>
    <listitem>
     <para>
-     The <link xlink:href="https://duo.com/docs/duounix">PAM module for Duo
-     Security</link> has been enabled for use. One can configure it using the
-     <option>security.duosec</option> options along with the corresponding PAM
-     option in
-     <option>security.pam.services.&lt;name?&gt;.duoSecurity.enable</option>.
+     The <link xlink:href="https://duo.com/docs/duounix">PAM module for Duo Security</link> has been enabled for use. One can configure it using the <option>security.duosec</option> options along with the corresponding PAM option in <option>security.pam.services.&lt;name?&gt;.duoSecurity.enable</option>.
     </para>
    </listitem>
   </itemizedlist>
@@ -144,8 +114,7 @@
   <title>Backward Incompatibilities</title>
 
   <para>
-   When upgrading from a previous release, please be aware of the following
-   incompatible changes:
+   When upgrading from a previous release, please be aware of the following incompatible changes:
   </para>
 
   <itemizedlist>
@@ -156,233 +125,131 @@
     <itemizedlist>
      <listitem>
       <para>
-       For users of NixOS 18.03 and 19.03, NixOS defaults to Nix 2.0, but
-       supports using Nix 1.11 by setting <literal>nix.package =
-       pkgs.nix1;</literal>. If this option is set to a Nix 1.11 package, you
-       will need to either unset the option or upgrade it to Nix 2.0.
+       For users of NixOS 18.03 and 19.03, NixOS defaults to Nix 2.0, but supports using Nix 1.11 by setting <literal>nix.package = pkgs.nix1;</literal>. If this option is set to a Nix 1.11 package, you will need to either unset the option or upgrade it to Nix 2.0.
       </para>
      </listitem>
      <listitem>
       <para>
-       For users of NixOS 17.09, you will first need to upgrade Nix by setting
-       <literal>nix.package = pkgs.nixStable2;</literal> and run
-       <command>nixos-rebuild switch</command> as the <literal>root</literal>
-       user.
+       For users of NixOS 17.09, you will first need to upgrade Nix by setting <literal>nix.package = pkgs.nixStable2;</literal> and run <command>nixos-rebuild switch</command> as the <literal>root</literal> user.
       </para>
      </listitem>
      <listitem>
       <para>
-       For users of a daemon-less Nix installation on Linux or macOS, you can
-       upgrade Nix by running <command>curl https://nixos.org/nix/install |
-       sh</command>, or prior to doing a channel update, running
-       <command>nix-env -iA nix</command>.
+       For users of a daemon-less Nix installation on Linux or macOS, you can upgrade Nix by running <command>curl https://nixos.org/nix/install | sh</command>, or prior to doing a channel update, running <command>nix-env -iA nix</command>.
       </para>
       <para>
-       If you have already run a channel update and Nix is no longer able to
-       evaluate Nixpkgs, the error message printed should provide adequate
-       directions for upgrading Nix.
+       If you have already run a channel update and Nix is no longer able to evaluate Nixpkgs, the error message printed should provide adequate directions for upgrading Nix.
       </para>
      </listitem>
      <listitem>
       <para>
-       For users of the Nix daemon on macOS, you can upgrade Nix by running
-       <command>sudo -i sh -c 'nix-channel --update &amp;&amp; nix-env -iA
-       nixpkgs.nix'; sudo launchctl stop org.nixos.nix-daemon; sudo launchctl
-       start org.nixos.nix-daemon</command>.
+       For users of the Nix daemon on macOS, you can upgrade Nix by running <command>sudo -i sh -c 'nix-channel --update &amp;&amp; nix-env -iA nixpkgs.nix'; sudo launchctl stop org.nixos.nix-daemon; sudo launchctl start org.nixos.nix-daemon</command>.
       </para>
      </listitem>
     </itemizedlist>
    </listitem>
    <listitem>
     <para>
-     The <varname>buildPythonPackage</varname> function now sets
-     <varname>strictDeps = true</varname> to help distinguish between native
-     and non-native dependencies in order to improve cross-compilation
-     compatibility. Note however that this may break user expressions.
+     The <varname>buildPythonPackage</varname> function now sets <varname>strictDeps = true</varname> to help distinguish between native and non-native dependencies in order to improve cross-compilation compatibility. Note however that this may break user expressions.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <varname>buildPythonPackage</varname> function now sets <varname>LANG
-     = C.UTF-8</varname> to enable Unicode support. The
-     <varname>glibcLocales</varname> package is no longer needed as a build
-     input.
+     The <varname>buildPythonPackage</varname> function now sets <varname>LANG = C.UTF-8</varname> to enable Unicode support. The <varname>glibcLocales</varname> package is no longer needed as a build input.
     </para>
    </listitem>
    <listitem>
     <para>
-     The Syncthing state and configuration data has been moved from
-     <varname>services.syncthing.dataDir</varname> to the newly defined
-     <varname>services.syncthing.configDir</varname>, which default to
-     <literal>/var/lib/syncthing/.config/syncthing</literal>. This change makes
-     possible to share synced directories using ACLs without Syncthing
-     resetting the permission on every start.
+     The Syncthing state and configuration data has been moved from <varname>services.syncthing.dataDir</varname> to the newly defined <varname>services.syncthing.configDir</varname>, which default to <literal>/var/lib/syncthing/.config/syncthing</literal>. This change makes possible to share synced directories using ACLs without Syncthing resetting the permission on every start.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>ntp</literal> module now has sane default restrictions. If
-     you're relying on the previous defaults, which permitted all queries and
-     commands from all firewall-permitted sources, you can set
-     <varname>services.ntp.restrictDefault</varname> and
-     <varname>services.ntp.restrictSource</varname> to <literal>[]</literal>.
+     The <literal>ntp</literal> module now has sane default restrictions. If you're relying on the previous defaults, which permitted all queries and commands from all firewall-permitted sources, you can set <varname>services.ntp.restrictDefault</varname> and <varname>services.ntp.restrictSource</varname> to <literal>[]</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     Package <varname>rabbitmq_server</varname> is renamed to
-     <varname>rabbitmq-server</varname>.
+     Package <varname>rabbitmq_server</varname> is renamed to <varname>rabbitmq-server</varname>.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>light</literal> module no longer uses setuid binaries, but
-     udev rules. As a consequence users of that module have to belong to the
-     <literal>video</literal> group in order to use the executable (i.e.
-     <literal>users.users.yourusername.extraGroups = ["video"];</literal>).
+     The <literal>light</literal> module no longer uses setuid binaries, but udev rules. As a consequence users of that module have to belong to the <literal>video</literal> group in order to use the executable (i.e. <literal>users.users.yourusername.extraGroups = ["video"];</literal>).
     </para>
    </listitem>
    <listitem>
     <para>
-     Buildbot now supports Python 3 and its packages have been moved to
-     <literal>pythonPackages</literal>. The options
-     <option>services.buildbot-master.package</option> and
-     <option>services.buildbot-worker.package</option> can be used to select
-     the Python 2 or 3 version of the package.
+     Buildbot now supports Python 3 and its packages have been moved to <literal>pythonPackages</literal>. The options <option>services.buildbot-master.package</option> and <option>services.buildbot-worker.package</option> can be used to select the Python 2 or 3 version of the package.
     </para>
    </listitem>
    <listitem>
     <para>
-     Options
-     <literal>services.znc.confOptions.networks.<replaceable>name</replaceable>.userName</literal>
-     and
-     <literal>services.znc.confOptions.networks.<replaceable>name</replaceable>.modulePackages</literal>
-     were removed. They were never used for anything and can therefore safely
-     be removed.
+     Options <literal>services.znc.confOptions.networks.<replaceable>name</replaceable>.userName</literal> and <literal>services.znc.confOptions.networks.<replaceable>name</replaceable>.modulePackages</literal> were removed. They were never used for anything and can therefore safely be removed.
     </para>
    </listitem>
    <listitem>
     <para>
-     Package <literal>wasm</literal> has been renamed
-     <literal>proglodyte-wasm</literal>. The package <literal>wasm</literal>
-     will be pointed to <literal>ocamlPackages.wasm</literal> in 19.09, so make
-     sure to update your configuration if you want to keep
-     <literal>proglodyte-wasm</literal>
+     Package <literal>wasm</literal> has been renamed <literal>proglodyte-wasm</literal>. The package <literal>wasm</literal> will be pointed to <literal>ocamlPackages.wasm</literal> in 19.09, so make sure to update your configuration if you want to keep <literal>proglodyte-wasm</literal>
     </para>
    </listitem>
    <listitem>
     <para>
-     When the <literal>nixpkgs.pkgs</literal> option is set, NixOS will no
-     longer ignore the <literal>nixpkgs.overlays</literal> option. The old
-     behavior can be recovered by setting <literal>nixpkgs.overlays =
-     lib.mkForce [];</literal>.
+     When the <literal>nixpkgs.pkgs</literal> option is set, NixOS will no longer ignore the <literal>nixpkgs.overlays</literal> option. The old behavior can be recovered by setting <literal>nixpkgs.overlays = lib.mkForce [];</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     OpenSMTPD has been upgraded to version 6.4.0p1. This release makes
-     backwards-incompatible changes to the configuration file format. See
-     <command>man smtpd.conf</command> for more information on the new file
-     format.
+     OpenSMTPD has been upgraded to version 6.4.0p1. This release makes backwards-incompatible changes to the configuration file format. See <command>man smtpd.conf</command> for more information on the new file format.
     </para>
    </listitem>
    <listitem>
     <para>
-     The versioned <varname>postgresql</varname> have been renamed to use
-     underscore number seperators. For example, <varname>postgresql96</varname>
-     has been renamed to <varname>postgresql_9_6</varname>.
+     The versioned <varname>postgresql</varname> have been renamed to use underscore number seperators. For example, <varname>postgresql96</varname> has been renamed to <varname>postgresql_9_6</varname>.
     </para>
    </listitem>
    <listitem>
     <para>
-     Package <literal>consul-ui</literal> and passthrough
-     <literal>consul.ui</literal> have been removed. The package
-     <literal>consul</literal> now uses upstream releases that vendor the UI
-     into the binary. See
-     <link xlink:href="https://github.com/NixOS/nixpkgs/pull/48714#issuecomment-433454834">#48714</link>
-     for details.
+     Package <literal>consul-ui</literal> and passthrough <literal>consul.ui</literal> have been removed. The package <literal>consul</literal> now uses upstream releases that vendor the UI into the binary. See <link xlink:href="https://github.com/NixOS/nixpkgs/pull/48714#issuecomment-433454834">#48714</link> for details.
     </para>
    </listitem>
    <listitem>
     <para>
-     Slurm introduces the new option
-     <literal>services.slurm.stateSaveLocation</literal>, which is now set to
-     <literal>/var/spool/slurm</literal> by default (instead of
-     <literal>/var/spool</literal>). Make sure to move all files to the new
-     directory or to set the option accordingly.
+     Slurm introduces the new option <literal>services.slurm.stateSaveLocation</literal>, which is now set to <literal>/var/spool/slurm</literal> by default (instead of <literal>/var/spool</literal>). Make sure to move all files to the new directory or to set the option accordingly.
     </para>
     <para>
-     The slurmctld now runs as user <literal>slurm</literal> instead of
-     <literal>root</literal>. If you want to keep slurmctld running as
-     <literal>root</literal>, set <literal>services.slurm.user =
-     root</literal>.
+     The slurmctld now runs as user <literal>slurm</literal> instead of <literal>root</literal>. If you want to keep slurmctld running as <literal>root</literal>, set <literal>services.slurm.user = root</literal>.
     </para>
     <para>
-     The options <literal>services.slurm.nodeName</literal> and
-     <literal>services.slurm.partitionName</literal> are now sets of strings to
-     correctly reflect that fact that each of these options can occour more
-     than once in the configuration.
+     The options <literal>services.slurm.nodeName</literal> and <literal>services.slurm.partitionName</literal> are now sets of strings to correctly reflect that fact that each of these options can occour more than once in the configuration.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>solr</literal> package has been upgraded from 4.10.3 to 7.5.0
-     and has undergone some major changes. The <literal>services.solr</literal>
-     module has been updated to reflect these changes. Please review
-     http://lucene.apache.org/solr/ carefully before upgrading.
+     The <literal>solr</literal> package has been upgraded from 4.10.3 to 7.5.0 and has undergone some major changes. The <literal>services.solr</literal> module has been updated to reflect these changes. Please review http://lucene.apache.org/solr/ carefully before upgrading.
     </para>
    </listitem>
    <listitem>
     <para>
-     Package <literal>ckb</literal> is renamed to <literal>ckb-next</literal>,
-     and options <literal>hardware.ckb.*</literal> are renamed to
-     <literal>hardware.ckb-next.*</literal>.
+     Package <literal>ckb</literal> is renamed to <literal>ckb-next</literal>, and options <literal>hardware.ckb.*</literal> are renamed to <literal>hardware.ckb-next.*</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     The option
-     <literal>services.xserver.displayManager.job.logToFile</literal> which was
-     previously set to <literal>true</literal> when using the display managers
-     <literal>lightdm</literal>, <literal>sddm</literal> or
-     <literal>xpra</literal> has been reset to the default value
-     (<literal>false</literal>).
+     The option <literal>services.xserver.displayManager.job.logToFile</literal> which was previously set to <literal>true</literal> when using the display managers <literal>lightdm</literal>, <literal>sddm</literal> or <literal>xpra</literal> has been reset to the default value (<literal>false</literal>).
     </para>
    </listitem>
    <listitem>
     <para>
-     Network interface indiscriminate NixOS firewall options
-     (<literal>networking.firewall.allow*</literal>) are now preserved when
-     also setting interface specific rules such as
-     <literal>networking.firewall.interfaces.en0.allow*</literal>. These rules
-     continue to use the pseudo device "default"
-     (<literal>networking.firewall.interfaces.default.*</literal>), and
-     assigning to this pseudo device will override the
-     (<literal>networking.firewall.allow*</literal>) options.
+     Network interface indiscriminate NixOS firewall options (<literal>networking.firewall.allow*</literal>) are now preserved when also setting interface specific rules such as <literal>networking.firewall.interfaces.en0.allow*</literal>. These rules continue to use the pseudo device "default" (<literal>networking.firewall.interfaces.default.*</literal>), and assigning to this pseudo device will override the (<literal>networking.firewall.allow*</literal>) options.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>nscd</literal> service now disables all caching of
-     <literal>passwd</literal> and <literal>group</literal> databases by
-     default. This was interferring with the correct functioning of the
-     <literal>libnss_systemd.so</literal> module which is used by
-     <literal>systemd</literal> to manage uids and usernames in the presence of
-     <literal>DynamicUser=</literal> in systemd services. This was already the
-     default behaviour in presence of <literal>services.sssd.enable =
-     true</literal> because nscd caching would interfere with
-     <literal>sssd</literal> in unpredictable ways as well. Because we're using
-     nscd not for caching, but for convincing glibc to find NSS modules in the
-     nix store instead of an absolute path, we have decided to disable caching
-     globally now, as it's usually not the behaviour the user wants and can
-     lead to surprising behaviour. Furthermore, negative caching of host
-     lookups is also disabled now by default. This should fix the issue of dns
-     lookups failing in the presence of an unreliable network.
+     The <literal>nscd</literal> service now disables all caching of <literal>passwd</literal> and <literal>group</literal> databases by default. This was interferring with the correct functioning of the <literal>libnss_systemd.so</literal> module which is used by <literal>systemd</literal> to manage uids and usernames in the presence of <literal>DynamicUser=</literal> in systemd services. This was already the default behaviour in presence of <literal>services.sssd.enable = true</literal> because nscd caching would interfere with <literal>sssd</literal> in unpredictable ways as well. Because we're using nscd not for caching, but for convincing glibc to find NSS modules in the nix store instead of an absolute path, we have decided to disable caching globally now, as it's usually not the behaviour the user wants and can lead to surprising behaviour. Furthermore, negative caching of host lookups is also disabled now by default. This should fix the issue of dns lookups failing in the presence of an unreliable network.
     </para>
     <para>
-     If the old behaviour is desired, this can be restored by setting the
-     <literal>services.nscd.config</literal> option with the desired caching
-     parameters.
+     If the old behaviour is desired, this can be restored by setting the <literal>services.nscd.config</literal> option with the desired caching parameters.
 <programlisting>
      services.nscd.config =
      ''
@@ -416,124 +283,65 @@
      shared                  hosts           yes
      '';
      </programlisting>
-     See
-     <link xlink:href="https://github.com/NixOS/nixpkgs/pull/50316">#50316</link>
-     for details.
+     See <link xlink:href="https://github.com/NixOS/nixpkgs/pull/50316">#50316</link> for details.
     </para>
    </listitem>
    <listitem>
     <para>
-     GitLab Shell previously used the nix store paths for the
-     <literal>gitlab-shell</literal> command in its
-     <literal>authorized_keys</literal> file, which might stop working after
-     garbage collection. To circumvent that, we regenerated that file on each
-     startup. As <literal>gitlab-shell</literal> has now been changed to use
-     <literal>/var/run/current-system/sw/bin/gitlab-shell</literal>, this is
-     not necessary anymore, but there might be leftover lines with a nix store
-     path. Regenerate the <literal>authorized_keys</literal> file via
-     <command>sudo -u git -H gitlab-rake gitlab:shell:setup</command> in that
-     case.
+     GitLab Shell previously used the nix store paths for the <literal>gitlab-shell</literal> command in its <literal>authorized_keys</literal> file, which might stop working after garbage collection. To circumvent that, we regenerated that file on each startup. As <literal>gitlab-shell</literal> has now been changed to use <literal>/var/run/current-system/sw/bin/gitlab-shell</literal>, this is not necessary anymore, but there might be leftover lines with a nix store path. Regenerate the <literal>authorized_keys</literal> file via <command>sudo -u git -H gitlab-rake gitlab:shell:setup</command> in that case.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>pam_unix</literal> account module is now loaded with its
-     control field set to <literal>required</literal> instead of
-     <literal>sufficient</literal>, so that later PAM account modules that
-     might do more extensive checks are being executed. Previously, the whole
-     account module verification was exited prematurely in case a nss module
-     provided the account name to <literal>pam_unix</literal>. The LDAP and
-     SSSD NixOS modules already add their NSS modules when enabled. In case
-     your setup breaks due to some later PAM account module previosuly
-     shadowed, or failing NSS lookups, please file a bug. You can get back the
-     old behaviour by manually setting <literal>
+     The <literal>pam_unix</literal> account module is now loaded with its control field set to <literal>required</literal> instead of <literal>sufficient</literal>, so that later PAM account modules that might do more extensive checks are being executed. Previously, the whole account module verification was exited prematurely in case a nss module provided the account name to <literal>pam_unix</literal>. The LDAP and SSSD NixOS modules already add their NSS modules when enabled. In case your setup breaks due to some later PAM account module previosuly shadowed, or failing NSS lookups, please file a bug. You can get back the old behaviour by manually setting <literal>
 <![CDATA[security.pam.services.<name?>.text]]>
      </literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>pam_unix</literal> password module is now loaded with its
-     control field set to <literal>sufficient</literal> instead of
-     <literal>required</literal>, so that password managed only by later PAM
-     password modules are being executed. Previously, for example, changing an
-     LDAP account's password through PAM was not possible: the whole password
-     module verification was exited prematurely by <literal>pam_unix</literal>,
-     preventing <literal>pam_ldap</literal> to manage the password as it
-     should.
+     The <literal>pam_unix</literal> password module is now loaded with its control field set to <literal>sufficient</literal> instead of <literal>required</literal>, so that password managed only by later PAM password modules are being executed. Previously, for example, changing an LDAP account's password through PAM was not possible: the whole password module verification was exited prematurely by <literal>pam_unix</literal>, preventing <literal>pam_ldap</literal> to manage the password as it should.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>fish</literal> has been upgraded to 3.0. It comes with a number
-     of improvements and backwards incompatible changes. See the
-     <literal>fish</literal>
-     <link xlink:href="https://github.com/fish-shell/fish-shell/releases/tag/3.0.0">release
-     notes</link> for more information.
+     <literal>fish</literal> has been upgraded to 3.0. It comes with a number of improvements and backwards incompatible changes. See the <literal>fish</literal> <link xlink:href="https://github.com/fish-shell/fish-shell/releases/tag/3.0.0">release notes</link> for more information.
     </para>
    </listitem>
    <listitem>
     <para>
-     The ibus-table input method has had a change in config format, which
-     causes all previous settings to be lost. See
-     <link xlink:href="https://github.com/mike-fabian/ibus-table/commit/f9195f877c5212fef0dfa446acb328c45ba5852b">this
-     commit message</link> for details.
+     The ibus-table input method has had a change in config format, which causes all previous settings to be lost. See <link xlink:href="https://github.com/mike-fabian/ibus-table/commit/f9195f877c5212fef0dfa446acb328c45ba5852b">this commit message</link> for details.
     </para>
    </listitem>
    <listitem>
     <para>
-     NixOS module system type <literal>types.optionSet</literal> and
-     <literal>lib.mkOption</literal> argument <literal>options</literal> are
-     deprecated. Use <literal>types.submodule</literal> instead.
-     (<link xlink:href="https://github.com/NixOS/nixpkgs/pull/54637">#54637</link>)
+     NixOS module system type <literal>types.optionSet</literal> and <literal>lib.mkOption</literal> argument <literal>options</literal> are deprecated. Use <literal>types.submodule</literal> instead. (<link xlink:href="https://github.com/NixOS/nixpkgs/pull/54637">#54637</link>)
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>matrix-synapse</literal> has been updated to version 0.99. It
-     will <link xlink:href="https://github.com/matrix-org/synapse/pull/4509">no
-     longer generate a self-signed certificate on first launch</link> and will
-     be
-     <link xlink:href="https://matrix.org/blog/2019/02/05/synapse-0-99-0/">the
-     last version to accept self-signed certificates</link>. As such, it is now
-     recommended to use a proper certificate verified by a root CA (for example
-     Let's Encrypt). The new <link linkend="module-services-matrix">manual
-     chapter on Matrix</link> contains a working example of using nginx as a
-     reverse proxy in front of <literal>matrix-synapse</literal>, using Let's
-     Encrypt certificates.
+     <literal>matrix-synapse</literal> has been updated to version 0.99. It will <link xlink:href="https://github.com/matrix-org/synapse/pull/4509">no longer generate a self-signed certificate on first launch</link> and will be <link xlink:href="https://matrix.org/blog/2019/02/05/synapse-0-99-0/">the last version to accept self-signed certificates</link>. As such, it is now recommended to use a proper certificate verified by a root CA (for example Let's Encrypt). The new <link linkend="module-services-matrix">manual chapter on Matrix</link> contains a working example of using nginx as a reverse proxy in front of <literal>matrix-synapse</literal>, using Let's Encrypt certificates.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>mailutils</literal> now works by default when
-     <literal>sendmail</literal> is not in a setuid wrapper. As a consequence,
-     the <literal>sendmailPath</literal> argument, having lost its main use,
-     has been removed.
+     <literal>mailutils</literal> now works by default when <literal>sendmail</literal> is not in a setuid wrapper. As a consequence, the <literal>sendmailPath</literal> argument, having lost its main use, has been removed.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>graylog</literal> has been upgraded from version 2.* to 3.*. Some
-     setups making use of extraConfig (especially those exposing Graylog via
-     reverse proxies) need to be updated as upstream removed/replaced some
-     settings. See
-     <link xlink:href="http://docs.graylog.org/en/3.0/pages/upgrade/graylog-3.0.html#simplified-http-interface-configuration">Upgrading
-     Graylog</link> for details.
+     <literal>graylog</literal> has been upgraded from version 2.* to 3.*. Some setups making use of extraConfig (especially those exposing Graylog via reverse proxies) need to be updated as upstream removed/replaced some settings. See <link xlink:href="http://docs.graylog.org/en/3.0/pages/upgrade/graylog-3.0.html#simplified-http-interface-configuration">Upgrading Graylog</link> for details.
     </para>
    </listitem>
    <listitem>
     <para>
-      The option <literal>users.ldap.bind.password</literal> was renamed to <literal>users.ldap.bind.passwordFile</literal>,
-      and needs to be readable by the <literal>nslcd</literal> user.
-      Same applies to the new <literal>users.ldap.daemon.rootpwmodpwFile</literal> option.
+     The option <literal>users.ldap.bind.password</literal> was renamed to <literal>users.ldap.bind.passwordFile</literal>, and needs to be readable by the <literal>nslcd</literal> user. Same applies to the new <literal>users.ldap.daemon.rootpwmodpwFile</literal> option.
     </para>
    </listitem>
    <listitem>
-     <para>
-       <literal>nodejs-6_x</literal> is end-of-life.
-       <literal>nodejs-6_x</literal>, <literal>nodejs-slim-6_x</literal> and
-       <literal>nodePackages_6_x</literal> are removed.
-     </para>
+    <para>
+     <literal>nodejs-6_x</literal> is end-of-life. <literal>nodejs-6_x</literal>, <literal>nodejs-slim-6_x</literal> and <literal>nodePackages_6_x</literal> are removed.
+    </para>
    </listitem>
   </itemizedlist>
  </section>
@@ -548,214 +356,122 @@
   <itemizedlist>
    <listitem>
     <para>
-     The <option>services.matomo</option> module gained the option
-     <option>services.matomo.package</option> which determines the used Matomo
-     version.
+     The <option>services.matomo</option> module gained the option <option>services.matomo.package</option> which determines the used Matomo version.
     </para>
     <para>
-     The Matomo module now also comes with the systemd service
-     <literal>matomo-archive-processing.service</literal> and a timer that
-     automatically triggers archive processing every hour. This means that you
-     can safely
-     <link xlink:href="https://matomo.org/docs/setup-auto-archiving/#disable-browser-triggers-for-matomo-archiving-and-limit-matomo-reports-to-updating-every-hour">
-     disable browser triggers for Matomo archiving </link> at
-     <literal>Administration > System > General Settings</literal>.
+     The Matomo module now also comes with the systemd service <literal>matomo-archive-processing.service</literal> and a timer that automatically triggers archive processing every hour. This means that you can safely <link xlink:href="https://matomo.org/docs/setup-auto-archiving/#disable-browser-triggers-for-matomo-archiving-and-limit-matomo-reports-to-updating-every-hour"> disable browser triggers for Matomo archiving </link> at <literal>Administration > System > General Settings</literal>.
     </para>
     <para>
-     Additionally, you can enable to
-     <link xlink:href="https://matomo.org/docs/privacy/#step-2-delete-old-visitors-logs">
-     delete old visitor logs </link> at <literal>Administration > System >
-     Privacy</literal>, but make sure that you run <literal>systemctl start
-     matomo-archive-processing.service</literal> at least once without errors
-     if you have already collected data before, so that the reports get
-     archived before the source data gets deleted.
+     Additionally, you can enable to <link xlink:href="https://matomo.org/docs/privacy/#step-2-delete-old-visitors-logs"> delete old visitor logs </link> at <literal>Administration > System > Privacy</literal>, but make sure that you run <literal>systemctl start matomo-archive-processing.service</literal> at least once without errors if you have already collected data before, so that the reports get archived before the source data gets deleted.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>composableDerivation</literal> along with supporting library
-     functions has been removed.
+     <literal>composableDerivation</literal> along with supporting library functions has been removed.
     </para>
    </listitem>
    <listitem>
     <para>
-     The deprecated <literal>truecrypt</literal> package has been removed and
-     <literal>truecrypt</literal> attribute is now an alias for
-     <literal>veracrypt</literal>. VeraCrypt is backward-compatible with
-     TrueCrypt volumes. Note that <literal>cryptsetup</literal> also supports
-     loading TrueCrypt volumes.
+     The deprecated <literal>truecrypt</literal> package has been removed and <literal>truecrypt</literal> attribute is now an alias for <literal>veracrypt</literal>. VeraCrypt is backward-compatible with TrueCrypt volumes. Note that <literal>cryptsetup</literal> also supports loading TrueCrypt volumes.
     </para>
    </listitem>
    <listitem>
     <para>
-     The Kubernetes DNS addons, kube-dns, has been replaced with CoreDNS. This
-     change is made in accordance with Kubernetes making CoreDNS the official
-     default starting from
-     <link xlink:href="https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.11.md#sig-cluster-lifecycle">Kubernetes
-     v1.11</link>. Please beware that upgrading DNS-addon on existing clusters
-     might induce minor downtime while the DNS-addon terminates and
-     re-initializes. Also note that the DNS-service now runs with 2 pod
-     replicas by default. The desired number of replicas can be configured
-     using: <option>services.kubernetes.addons.dns.replicas</option>.
+     The Kubernetes DNS addons, kube-dns, has been replaced with CoreDNS. This change is made in accordance with Kubernetes making CoreDNS the official default starting from <link xlink:href="https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.11.md#sig-cluster-lifecycle">Kubernetes v1.11</link>. Please beware that upgrading DNS-addon on existing clusters might induce minor downtime while the DNS-addon terminates and re-initializes. Also note that the DNS-service now runs with 2 pod replicas by default. The desired number of replicas can be configured using: <option>services.kubernetes.addons.dns.replicas</option>.
     </para>
    </listitem>
    <listitem>
     <para>
-     The quassel-webserver package and module was removed from nixpkgs due to
-     the lack of maintainers.
+     The quassel-webserver package and module was removed from nixpkgs due to the lack of maintainers.
     </para>
    </listitem>
    <listitem>
     <para>
-     The manual gained a <link linkend="module-services-matrix"> new chapter on
-     self-hosting <literal>matrix-synapse</literal> and
-     <literal>riot-web</literal> </link>, the most prevalent server and client
-     implementations for the
-     <link xlink:href="https://matrix.org/">Matrix</link> federated
-     communication network.
+     The manual gained a <link linkend="module-services-matrix"> new chapter on self-hosting <literal>matrix-synapse</literal> and <literal>riot-web</literal> </link>, the most prevalent server and client implementations for the <link xlink:href="https://matrix.org/">Matrix</link> federated communication network.
     </para>
    </listitem>
    <listitem>
     <para>
-     The astah-community package was removed from nixpkgs due to it being
-     discontinued and the downloads not being available anymore.
+     The astah-community package was removed from nixpkgs due to it being discontinued and the downloads not being available anymore.
     </para>
    </listitem>
    <listitem>
     <para>
-     The httpd service now saves log files with a .log file extension by
-     default for easier integration with the logrotate service.
+     The httpd service now saves log files with a .log file extension by default for easier integration with the logrotate service.
     </para>
    </listitem>
    <listitem>
     <para>
-     The owncloud server packages and httpd subservice module were removed from
-     nixpkgs due to the lack of maintainers.
+     The owncloud server packages and httpd subservice module were removed from nixpkgs due to the lack of maintainers.
     </para>
    </listitem>
    <listitem>
     <para>
-     It is possible now to uze ZRAM devices as general purpose ephemeral block
-     devices, not only as swap. Using more than 1 device as ZRAM swap is no
-     longer recommended, but is still possible by setting
-     <literal>zramSwap.swapDevices</literal> explicitly.
+     It is possible now to uze ZRAM devices as general purpose ephemeral block devices, not only as swap. Using more than 1 device as ZRAM swap is no longer recommended, but is still possible by setting <literal>zramSwap.swapDevices</literal> explicitly.
     </para>
     <para>
      ZRAM algorithm can be changed now.
     </para>
     <para>
-     Changes to ZRAM algorithm are applied during <literal>nixos-rebuild
-     switch</literal>, so make sure you have enough swap space on disk to
-     survive ZRAM device rebuild. Alternatively, use <literal>nixos-rebuild
-     boot; reboot</literal>.
+     Changes to ZRAM algorithm are applied during <literal>nixos-rebuild switch</literal>, so make sure you have enough swap space on disk to survive ZRAM device rebuild. Alternatively, use <literal>nixos-rebuild boot; reboot</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     Flat volumes are now disabled by default in
-     <literal>hardware.pulseaudio</literal>. This has been done to prevent
-     applications, which are unaware of this feature, setting their volumes to
-     100% on startup causing harm to your audio hardware and potentially your
-     ears.
+     Flat volumes are now disabled by default in <literal>hardware.pulseaudio</literal>. This has been done to prevent applications, which are unaware of this feature, setting their volumes to 100% on startup causing harm to your audio hardware and potentially your ears.
     </para>
     <note>
      <para>
-      With this change application specific volumes are relative to the master
-      volume which can be adjusted independently, whereas before they were
-      absolute; meaning that in effect, it scaled the device-volume with the
-      volume of the loudest application.
+      With this change application specific volumes are relative to the master volume which can be adjusted independently, whereas before they were absolute; meaning that in effect, it scaled the device-volume with the volume of the loudest application.
      </para>
     </note>
    </listitem>
    <listitem>
     <para>
-     The
-     <link xlink:href="https://github.com/DanielAdolfsson/ndppd"><literal>ndppd</literal></link>
-     module now supports <link linkend="opt-services.ndppd.enable">all config
-     options</link> provided by the current upstream version as service
-     options. Additionally the <literal>ndppd</literal> package doesn't contain
-     the systemd unit configuration from upstream anymore, the unit is
-     completely configured by the NixOS module now.
+     The <link xlink:href="https://github.com/DanielAdolfsson/ndppd"><literal>ndppd</literal></link> module now supports <link linkend="opt-services.ndppd.enable">all config options</link> provided by the current upstream version as service options. Additionally the <literal>ndppd</literal> package doesn't contain the systemd unit configuration from upstream anymore, the unit is completely configured by the NixOS module now.
     </para>
    </listitem>
    <listitem>
     <para>
-     New installs of NixOS will default to the Redmine 4.x series unless
-     otherwise specified in <literal>services.redmine.package</literal> while
-     existing installs of NixOS will default to the Redmine 3.x series.
+     New installs of NixOS will default to the Redmine 4.x series unless otherwise specified in <literal>services.redmine.package</literal> while existing installs of NixOS will default to the Redmine 3.x series.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <link linkend="opt-services.grafana.enable">Grafana module</link> now
-     supports declarative
-     <link xlink:href="http://docs.grafana.org/administration/provisioning/">datasource
-     and dashboard</link> provisioning.
+     The <link linkend="opt-services.grafana.enable">Grafana module</link> now supports declarative <link xlink:href="http://docs.grafana.org/administration/provisioning/">datasource and dashboard</link> provisioning.
     </para>
    </listitem>
    <listitem>
     <para>
-     The use of insecure ports on kubernetes has been deprecated. Thus options:
-     <varname>services.kubernetes.apiserver.port</varname> and
-     <varname>services.kubernetes.controllerManager.port</varname> has been
-     renamed to <varname>.insecurePort</varname>, and default of both options
-     has changed to 0 (disabled).
+     The use of insecure ports on kubernetes has been deprecated. Thus options: <varname>services.kubernetes.apiserver.port</varname> and <varname>services.kubernetes.controllerManager.port</varname> has been renamed to <varname>.insecurePort</varname>, and default of both options has changed to 0 (disabled).
     </para>
    </listitem>
    <listitem>
     <para>
-     Note that the default value of
-     <varname>services.kubernetes.apiserver.bindAddress</varname> has changed
-     from 127.0.0.1 to 0.0.0.0, allowing the apiserver to be accessible from
-     outside the master node itself. If the apiserver insecurePort is enabled,
-     it is strongly recommended to only bind on the loopback interface. See:
-     <varname>services.kubernetes.apiserver.insecurebindAddress</varname>.
+     Note that the default value of <varname>services.kubernetes.apiserver.bindAddress</varname> has changed from 127.0.0.1 to 0.0.0.0, allowing the apiserver to be accessible from outside the master node itself. If the apiserver insecurePort is enabled, it is strongly recommended to only bind on the loopback interface. See: <varname>services.kubernetes.apiserver.insecurebindAddress</varname>.
     </para>
    </listitem>
    <listitem>
     <para>
-     The option
-     <varname>services.kubernetes.apiserver.allowPrivileged</varname> and
-     <varname>services.kubernetes.kubelet.allowPrivileged</varname> now
-     defaults to false. Disallowing privileged containers on the cluster.
+     The option <varname>services.kubernetes.apiserver.allowPrivileged</varname> and <varname>services.kubernetes.kubelet.allowPrivileged</varname> now defaults to false. Disallowing privileged containers on the cluster.
     </para>
    </listitem>
    <listitem>
     <para>
-     The kubernetes module does no longer add the kubernetes package to
-     <varname>environment.systemPackages</varname> implicitly.
+     The kubernetes module does no longer add the kubernetes package to <varname>environment.systemPackages</varname> implicitly.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>intel</literal> driver has been removed from the default list
-     of <link linkend="opt-services.xserver.videoDrivers">X.org video
-     drivers</link>. The <literal>modesetting</literal> driver should take over
-     automatically, it is better maintained upstream and has less problems with
-     advanced X11 features. This can lead to a change in the output names used
-     by <literal>xrandr</literal>. Some performance regressions on some GPU
-     models might happen. Some OpenCL and VA-API applications might also break
-     (Beignet seems to provide OpenCL support with
-     <literal>modesetting</literal> driver, too). Kernel mode setting API does
-     not support backlight control, so <literal>xbacklight</literal> tool will
-     not work; backlight level can be controlled directly via
-     <literal>/sys/</literal> or with <literal>brightnessctl</literal>. Users
-     who need this functionality more than multi-output XRandR are advised to
-     add `intel` to `videoDrivers` and report an issue (or provide additional
-     details in an existing one)
+     The <literal>intel</literal> driver has been removed from the default list of <link linkend="opt-services.xserver.videoDrivers">X.org video drivers</link>. The <literal>modesetting</literal> driver should take over automatically, it is better maintained upstream and has less problems with advanced X11 features. This can lead to a change in the output names used by <literal>xrandr</literal>. Some performance regressions on some GPU models might happen. Some OpenCL and VA-API applications might also break (Beignet seems to provide OpenCL support with <literal>modesetting</literal> driver, too). Kernel mode setting API does not support backlight control, so <literal>xbacklight</literal> tool will not work; backlight level can be controlled directly via <literal>/sys/</literal> or with <literal>brightnessctl</literal>. Users who need this functionality more than multi-output XRandR are advised to add `intel` to `videoDrivers` and report an issue (or provide additional details in an existing one)
     </para>
    </listitem>
    <listitem>
     <para>
-     Openmpi has been updated to version 4.0.0, which removes some deprecated
-     MPI-1 symbols. This may break some older applications that still rely on
-     those symbols. An upgrade guide can be found
-     <link xlink:href="https://www.open-mpi.org/faq/?category=mpi-removed">here</link>.
+     Openmpi has been updated to version 4.0.0, which removes some deprecated MPI-1 symbols. This may break some older applications that still rely on those symbols. An upgrade guide can be found <link xlink:href="https://www.open-mpi.org/faq/?category=mpi-removed">here</link>.
     </para>
     <para>
-     The nginx package now relies on OpenSSL 1.1 and supports TLS 1.3 by
-     default. You can set the protocols used by the nginx service using
-     <xref linkend="opt-services.nginx.sslProtocols"/>.
+     The nginx package now relies on OpenSSL 1.1 and supports TLS 1.3 by default. You can set the protocols used by the nginx service using <xref linkend="opt-services.nginx.sslProtocols"/>.
     </para>
    </listitem>
    <listitem>
diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
index 58ab7207f53..92eae453924 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -13,8 +13,7 @@
   <title>Highlights</title>
 
   <para>
-   In addition to numerous new and upgraded packages, this release has the
-   following highlights:
+   In addition to numerous new and upgraded packages, this release has the following highlights:
   </para>
 
   <itemizedlist>
@@ -34,85 +33,155 @@
     </para>
    </listitem>
    <listitem>
-     <para>
-       The binfmt module is now easier to use. Additional systems can
-       be added through <option>boot.binfmt.emulatedSystems</option>.
-       For instance, <literal>boot.binfmt.emulatedSystems = [
-       "wasm32-wasi" "x86_64-windows" "aarch64-linux" ];</literal> will
-       set up binfmt interpreters for each of those listed systems.
-     </para>
+    <para>
+     The binfmt module is now easier to use. Additional systems can be added through <option>boot.binfmt.emulatedSystems</option>. For instance, <literal>boot.binfmt.emulatedSystems = [ "wasm32-wasi" "x86_64-windows" "aarch64-linux" ];</literal> will set up binfmt interpreters for each of those listed systems.
+    </para>
    </listitem>
    <listitem>
-     <para>
-     The installer now uses a less privileged <literal>nixos</literal> user whereas before we logged in as root.
-     To gain root privileges use <literal>sudo -i</literal> without a password.
+    <para>
+     The installer now uses a less privileged <literal>nixos</literal> user whereas before we logged in as root. To gain root privileges use <literal>sudo -i</literal> without a password.
     </para>
    </listitem>
    <listitem>
     <para>
-      We've updated to Xfce 4.14, which brings a new module <option>services.xserver.desktopManager.xfce4-14</option>.
-      If you'd like to upgrade, please switch from the <option>services.xserver.desktopManager.xfce</option> module as it
-      will be deprecated in a future release. They're incompatibilities with the current Xfce module; it doesn't support
-      <option>thunarPlugins</option> and it isn't recommended to use <option>services.xserver.desktopManager.xfce</option>
-      and <option>services.xserver.desktopManager.xfce4-14</option> simultaneously or to downgrade from Xfce 4.14 after upgrading.
+     We've updated to Xfce 4.14, which brings a new module <option>services.xserver.desktopManager.xfce4-14</option>. If you'd like to upgrade, please switch from the <option>services.xserver.desktopManager.xfce</option> module as it will be deprecated in a future release. They're incompatibilities with the current Xfce module; it doesn't support <option>thunarPlugins</option> and it isn't recommended to use <option>services.xserver.desktopManager.xfce</option> and <option>services.xserver.desktopManager.xfce4-14</option> simultaneously or to downgrade from Xfce 4.14 after upgrading.
     </para>
    </listitem>
    <listitem>
     <para>
-      The GNOME 3 desktop manager module sports an interface to enable/disable core services, applications, and optional GNOME packages
-      like games.
-      <itemizedlist>
-      <para>This can be achieved with the following options which the desktop manager default enables, excluding <literal>games</literal>.</para>
-      <listitem><para><xref linkend="opt-services.gnome3.core-os-services.enable"/></para></listitem>
-      <listitem><para><xref linkend="opt-services.gnome3.core-shell.enable"/></para></listitem>
-      <listitem><para><xref linkend="opt-services.gnome3.core-utilities.enable"/></para></listitem>
-      <listitem><para><xref linkend="opt-services.gnome3.games.enable"/></para></listitem>
-      </itemizedlist>
-      With these options we hope to give users finer grained control over their systems. Prior to this change you'd either have to manually
-      disable options or use <option>environment.gnome3.excludePackages</option> which only excluded the optional applications.
-      <option>environment.gnome3.excludePackages</option> is now unguarded, it can exclude any package installed with <option>environment.systemPackages</option>
-      in the GNOME 3 module.
+     The GNOME 3 desktop manager module sports an interface to enable/disable core services, applications, and optional GNOME packages like games.
+     <itemizedlist>
+      <para>
+       This can be achieved with the following options which the desktop manager default enables, excluding <literal>games</literal>.
+      </para>
+      <listitem>
+       <para>
+        <xref linkend="opt-services.gnome3.core-os-services.enable"/>
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        <xref linkend="opt-services.gnome3.core-shell.enable"/>
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        <xref linkend="opt-services.gnome3.core-utilities.enable"/>
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        <xref linkend="opt-services.gnome3.games.enable"/>
+       </para>
+      </listitem>
+     </itemizedlist>
+     With these options we hope to give users finer grained control over their systems. Prior to this change you'd either have to manually disable options or use <option>environment.gnome3.excludePackages</option> which only excluded the optional applications. <option>environment.gnome3.excludePackages</option> is now unguarded, it can exclude any package installed with <option>environment.systemPackages</option> in the GNOME 3 module.
     </para>
    </listitem>
    <listitem>
     <para>
-     Orthogonal to the previous changes to the GNOME 3 desktop manager module, we've updated all default services and applications
-     to match as close as possible to a default reference GNOME 3 experience.
+     Orthogonal to the previous changes to the GNOME 3 desktop manager module, we've updated all default services and applications to match as close as possible to a default reference GNOME 3 experience.
     </para>
-
-    <bridgehead>The following changes were enacted in <option>services.gnome3.core-utilities.enable</option></bridgehead>
-
+    <bridgehead>The following changes were enacted in <option>services.gnome3.core-utilities.enable</option>
+    </bridgehead>
     <itemizedlist>
      <title>Applications removed from defaults:</title>
-     <listitem><para><literal>accerciser</literal></para></listitem>
-     <listitem><para><literal>dconf-editor</literal></para></listitem>
-     <listitem><para><literal>evolution</literal></para></listitem>
-     <listitem><para><literal>gnome-documents</literal></para></listitem>
-     <listitem><para><literal>gnome-nettool</literal></para></listitem>
-     <listitem><para><literal>gnome-power-manager</literal></para></listitem>
-     <listitem><para><literal>gnome-todo</literal></para></listitem>
-     <listitem><para><literal>gnome-tweaks</literal></para></listitem>
-     <listitem><para><literal>gnome-usage</literal></para></listitem>
-     <listitem><para><literal>gucharmap</literal></para></listitem>
-     <listitem><para><literal>nautilus-sendto</literal></para></listitem>
-     <listitem><para><literal>vinagre</literal></para></listitem>
+     <listitem>
+      <para>
+       <literal>accerciser</literal>
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       <literal>dconf-editor</literal>
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       <literal>evolution</literal>
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       <literal>gnome-documents</literal>
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       <literal>gnome-nettool</literal>
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       <literal>gnome-power-manager</literal>
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       <literal>gnome-todo</literal>
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       <literal>gnome-tweaks</literal>
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       <literal>gnome-usage</literal>
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       <literal>gucharmap</literal>
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       <literal>nautilus-sendto</literal>
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       <literal>vinagre</literal>
+      </para>
+     </listitem>
     </itemizedlist>
     <itemizedlist>
      <title>Applications added to defaults:</title>
-     <listitem><para><literal>cheese</literal></para></listitem>
-     <listitem><para><literal>geary</literal></para></listitem>
+     <listitem>
+      <para>
+       <literal>cheese</literal>
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       <literal>geary</literal>
+      </para>
+     </listitem>
     </itemizedlist>
-
-    <bridgehead>The following changes were enacted in <option>services.gnome3.core-shell.enable</option></bridgehead>
-
+    <bridgehead>The following changes were enacted in <option>services.gnome3.core-shell.enable</option>
+    </bridgehead>
     <itemizedlist>
      <title>Applications added to defaults:</title>
-     <listitem><para><literal>gnome-color-manager</literal></para></listitem>
-     <listitem><para><literal>orca</literal></para></listitem>
+     <listitem>
+      <para>
+       <literal>gnome-color-manager</literal>
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       <literal>orca</literal>
+      </para>
+     </listitem>
     </itemizedlist>
     <itemizedlist>
      <title>Services enabled:</title>
-     <listitem><para><option>services.avahi.enable</option></para></listitem>
+     <listitem>
+      <para>
+       <option>services.avahi.enable</option>
+      </para>
+     </listitem>
     </itemizedlist>
    </listitem>
   </itemizedlist>
@@ -137,41 +206,43 @@
    </listitem>
    <listitem>
     <para>
-     The new <varname>hardware.printers</varname> module allows to declaratively configure CUPS printers
-     via the <varname>ensurePrinters</varname> and
-     <varname>ensureDefaultPrinter</varname> options.
-     <varname>ensurePrinters</varname> will never delete existing printers,
-     but will make sure that the given printers are configured as declared.
+     The new <varname>hardware.printers</varname> module allows to declaratively configure CUPS printers via the <varname>ensurePrinters</varname> and <varname>ensureDefaultPrinter</varname> options. <varname>ensurePrinters</varname> will never delete existing printers, but will make sure that the given printers are configured as declared.
     </para>
    </listitem>
    <listitem>
     <para>
-     There is a new <xref linkend="opt-services.system-config-printer.enable"/> and <xref linkend="opt-programs.system-config-printer.enable"/> module
-     for the program of the same name. If you previously had <literal>system-config-printer</literal> enabled through some other
-     means you should migrate to using one of these modules.
+     There is a new <xref linkend="opt-services.system-config-printer.enable"/> and <xref linkend="opt-programs.system-config-printer.enable"/> module for the program of the same name. If you previously had <literal>system-config-printer</literal> enabled through some other means you should migrate to using one of these modules.
     </para>
     <itemizedlist>
-     <para>If you're a user of the following desktopManager modules no action is needed:</para>
+     <para>
+      If you're a user of the following desktopManager modules no action is needed:
+     </para>
      <listitem>
-      <para><option>services.xserver.desktopManager.plasma5</option></para>
+      <para>
+       <option>services.xserver.desktopManager.plasma5</option>
+      </para>
      </listitem>
      <listitem>
-      <para><option>services.xserver.desktopManager.gnome3</option></para>
+      <para>
+       <option>services.xserver.desktopManager.gnome3</option>
+      </para>
      </listitem>
      <listitem>
-      <para><option>services.xserver.desktopManager.pantheon</option></para>
+      <para>
+       <option>services.xserver.desktopManager.pantheon</option>
+      </para>
      </listitem>
      <listitem>
-      <para><option>services.xserver.desktopManager.mate</option></para>
       <para>
-       Note Mate uses <literal>programs.system-config-printer</literal> as it doesn't
-       use it as a service, but its graphical interface directly.
+       <option>services.xserver.desktopManager.mate</option>
+      </para>
+      <para>
+       Note Mate uses <literal>programs.system-config-printer</literal> as it doesn't use it as a service, but its graphical interface directly.
       </para>
      </listitem>
     </itemizedlist>
    </listitem>
   </itemizedlist>
-
  </section>
 
  <section xmlns="http://docbook.org/ns/docbook"
@@ -182,26 +253,18 @@
   <title>Backward Incompatibilities</title>
 
   <para>
-   When upgrading from a previous release, please be aware of the following
-   incompatible changes:
+   When upgrading from a previous release, please be aware of the following incompatible changes:
   </para>
 
   <itemizedlist>
    <listitem>
     <para>
-     Buildbot no longer supports Python 2, as support was dropped upstream in
-     version 2.0.0. Configurations may need to be modified to make them
-     compatible with Python 3.
+     Buildbot no longer supports Python 2, as support was dropped upstream in version 2.0.0. Configurations may need to be modified to make them compatible with Python 3.
     </para>
    </listitem>
    <listitem>
     <para>
-     PostgreSQL now uses
-     <filename class="directory">/run/postgresql</filename> as its socket
-     directory instead of <filename class="directory">/tmp</filename>. So
-     if you run an application like eg. Nextcloud, where you need to use
-     the Unix socket path as the database host name, you need to change it
-     accordingly.
+     PostgreSQL now uses <filename class="directory">/run/postgresql</filename> as its socket directory instead of <filename class="directory">/tmp</filename>. So if you run an application like eg. Nextcloud, where you need to use the Unix socket path as the database host name, you need to change it accordingly.
     </para>
    </listitem>
    <listitem>
@@ -211,278 +274,212 @@
    </listitem>
    <listitem>
     <para>
-     The options <option>services.prometheus.alertmanager.user</option> and
-     <option>services.prometheus.alertmanager.group</option> have been removed
-     because the alertmanager service is now using systemd's <link
-     xlink:href="http://0pointer.net/blog/dynamic-users-with-systemd.html">
-     DynamicUser mechanism</link> which obviates these options.
+     The options <option>services.prometheus.alertmanager.user</option> and <option>services.prometheus.alertmanager.group</option> have been removed because the alertmanager service is now using systemd's <link
+     xlink:href="http://0pointer.net/blog/dynamic-users-with-systemd.html"> DynamicUser mechanism</link> which obviates these options.
     </para>
    </listitem>
    <listitem>
     <para>
-     The NetworkManager systemd unit was renamed back from network-manager.service to
-     NetworkManager.service for better compatibility with other applications expecting this name.
-     The same applies to ModemManager where modem-manager.service is now called ModemManager.service again.
+     The NetworkManager systemd unit was renamed back from network-manager.service to NetworkManager.service for better compatibility with other applications expecting this name. The same applies to ModemManager where modem-manager.service is now called ModemManager.service again.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <option>services.nzbget.configFile</option> and <option>services.nzbget.openFirewall</option>
-     options were removed as they are managed internally by the nzbget. The
-     <option>services.nzbget.dataDir</option> option hadn't actually been used by
-     the module for some time and so was removed as cleanup.
+     The <option>services.nzbget.configFile</option> and <option>services.nzbget.openFirewall</option> options were removed as they are managed internally by the nzbget. The <option>services.nzbget.dataDir</option> option hadn't actually been used by the module for some time and so was removed as cleanup.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <option>services.mysql.pidDir</option> option was removed, as it was only used by the wordpress
-     apache-httpd service to wait for mysql to have started up.
-     This can be accomplished by either describing a dependency on mysql.service (preferred)
-     or waiting for the (hardcoded) <filename>/run/mysqld/mysql.sock</filename> file to appear.
+     The <option>services.mysql.pidDir</option> option was removed, as it was only used by the wordpress apache-httpd service to wait for mysql to have started up. This can be accomplished by either describing a dependency on mysql.service (preferred) or waiting for the (hardcoded) <filename>/run/mysqld/mysql.sock</filename> file to appear.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <option>services.emby.enable</option> module has been removed, see
-     <option>services.jellyfin.enable</option> instead for a free software fork of Emby.
-
-     See the Jellyfin documentation:
-     <link xlink:href="https://jellyfin.readthedocs.io/en/latest/administrator-docs/migrate-from-emby/">
-       Migrating from Emby to Jellyfin
-     </link>
+     The <option>services.emby.enable</option> module has been removed, see <option>services.jellyfin.enable</option> instead for a free software fork of Emby. See the Jellyfin documentation: <link xlink:href="https://jellyfin.readthedocs.io/en/latest/administrator-docs/migrate-from-emby/"> Migrating from Emby to Jellyfin </link>
     </para>
    </listitem>
    <listitem>
-     <para>
-     IPv6 Privacy Extensions are now enabled by default for undeclared
-     interfaces. The previous behaviour was quite misleading — even though
-     the default value for
-     <option>networking.interfaces.*.preferTempAddress</option> was
-     <literal>true</literal>, undeclared interfaces would not prefer temporary
-     addresses. Now, interfaces not mentioned in the config will prefer
-     temporary addresses. EUI64 addresses can still be set as preferred by
-     explicitly setting the option to <literal>false</literal> for the
-     interface in question.
+    <para>
+     IPv6 Privacy Extensions are now enabled by default for undeclared interfaces. The previous behaviour was quite misleading — even though the default value for <option>networking.interfaces.*.preferTempAddress</option> was <literal>true</literal>, undeclared interfaces would not prefer temporary addresses. Now, interfaces not mentioned in the config will prefer temporary addresses. EUI64 addresses can still be set as preferred by explicitly setting the option to <literal>false</literal> for the interface in question.
     </para>
    </listitem>
    <listitem>
     <para>
-     Since Bittorrent Sync was superseded by Resilio Sync in 2016, the
-     <literal>bittorrentSync</literal>, <literal>bittorrentSync14</literal>,
-     and <literal>bittorrentSync16</literal> packages have been removed in
-     favor of <literal>resilio-sync</literal>.
+     Since Bittorrent Sync was superseded by Resilio Sync in 2016, the <literal>bittorrentSync</literal>, <literal>bittorrentSync14</literal>, and <literal>bittorrentSync16</literal> packages have been removed in favor of <literal>resilio-sync</literal>.
     </para>
     <para>
-     The corresponding module, <option>services.btsync</option> has been
-     replaced by the <option>services.resilio</option> module.
+     The corresponding module, <option>services.btsync</option> has been replaced by the <option>services.resilio</option> module.
     </para>
    </listitem>
    <listitem>
     <para>
-     The httpd service no longer attempts to start the postgresql service. If you have come to depend
-     on this behaviour then you can preserve the behavior with the following configuration:
-     <literal>systemd.services.httpd.after = [ "postgresql.service" ];</literal>
+     The httpd service no longer attempts to start the postgresql service. If you have come to depend on this behaviour then you can preserve the behavior with the following configuration: <literal>systemd.services.httpd.after = [ "postgresql.service" ];</literal>
     </para>
     <para>
-     The option <option>services.httpd.extraSubservices</option> has been
-     marked as deprecated. You may still use this feature, but it will be
-     removed in a future release of NixOS. You are encouraged to convert any
-     httpd subservices you may have written to a full NixOS module.
+     The option <option>services.httpd.extraSubservices</option> has been marked as deprecated. You may still use this feature, but it will be removed in a future release of NixOS. You are encouraged to convert any httpd subservices you may have written to a full NixOS module.
     </para>
     <para>
-     Most of the httpd subservices packaged with NixOS have been replaced with
-     full NixOS modules including LimeSurvey, WordPress, and Zabbix. These
-     modules can be enabled using the <option>services.limesurvey.enable</option>,
-     <option>services.mediawiki.enable</option>, <option>services.wordpress.enable</option>,
-     and <option>services.zabbixWeb.enable</option> options.
+     Most of the httpd subservices packaged with NixOS have been replaced with full NixOS modules including LimeSurvey, WordPress, and Zabbix. These modules can be enabled using the <option>services.limesurvey.enable</option>, <option>services.mediawiki.enable</option>, <option>services.wordpress.enable</option>, and <option>services.zabbixWeb.enable</option> options.
     </para>
    </listitem>
    <listitem>
     <para>
-     The option <option>systemd.network.networks.&lt;name&gt;.routes.*.routeConfig.GatewayOnlink</option>
-     was renamed to <option>systemd.network.networks.&lt;name&gt;.routes.*.routeConfig.GatewayOnLink</option>
-     (capital <literal>L</literal>). This follows
-     <link xlink:href="https://github.com/systemd/systemd/commit/9cb8c5593443d24c19e40bfd4fc06d672f8c554c">
-      upstreams renaming
-     </link> of the setting.
+     The option <option>systemd.network.networks.&lt;name&gt;.routes.*.routeConfig.GatewayOnlink</option> was renamed to <option>systemd.network.networks.&lt;name&gt;.routes.*.routeConfig.GatewayOnLink</option> (capital <literal>L</literal>). This follows <link xlink:href="https://github.com/systemd/systemd/commit/9cb8c5593443d24c19e40bfd4fc06d672f8c554c"> upstreams renaming </link> of the setting.
     </para>
    </listitem>
    <listitem>
     <para>
-     As of this release the NixOps feature <literal>autoLuks</literal> is deprecated. It no longer works
-     with our systemd version without manual intervention.
+     As of this release the NixOps feature <literal>autoLuks</literal> is deprecated. It no longer works with our systemd version without manual intervention.
     </para>
     <para>
-     Whenever the usage of the module is detected the evaluation will fail with a message
-     explaining why and how to deal with the situation.
+     Whenever the usage of the module is detected the evaluation will fail with a message explaining why and how to deal with the situation.
     </para>
     <para>
-     A new knob named <literal>nixops.enableDeprecatedAutoLuks</literal>
-     has been introduced to disable the eval failure and to acknowledge the notice was received and read.
-     If you plan on using the feature please note that it might break with subsequent updates.
+     A new knob named <literal>nixops.enableDeprecatedAutoLuks</literal> has been introduced to disable the eval failure and to acknowledge the notice was received and read. If you plan on using the feature please note that it might break with subsequent updates.
     </para>
     <para>
-     Make sure you set the <literal>_netdev</literal> option for each of the file systems referring to block
-     devices provided by the autoLuks module. Not doing this might render the system in a
-     state where it doesn't boot anymore.
+     Make sure you set the <literal>_netdev</literal> option for each of the file systems referring to block devices provided by the autoLuks module. Not doing this might render the system in a state where it doesn't boot anymore.
     </para>
     <para>
-     If you are actively using the <literal>autoLuks</literal> module please let us know in
-     <link xlink:href="https://github.com/NixOS/nixpkgs/issues/62211">issue #62211</link>.
+     If you are actively using the <literal>autoLuks</literal> module please let us know in <link xlink:href="https://github.com/NixOS/nixpkgs/issues/62211">issue #62211</link>.
     </para>
    </listitem>
    <listitem>
     <para>
-     The setopt declarations will be evaluated at the end of <literal>/etc/zshrc</literal>, so any code in <xref linkend="opt-programs.zsh.interactiveShellInit" />,
-     <xref linkend="opt-programs.zsh.loginShellInit" /> and <xref linkend="opt-programs.zsh.promptInit" /> may break if it relies on those options being set.
+     The setopt declarations will be evaluated at the end of <literal>/etc/zshrc</literal>, so any code in <xref linkend="opt-programs.zsh.interactiveShellInit" />, <xref linkend="opt-programs.zsh.loginShellInit" /> and <xref linkend="opt-programs.zsh.promptInit" /> may break if it relies on those options being set.
     </para>
    </listitem>
    <listitem>
     <para>
-      The <literal>prometheus-nginx-exporter</literal> package now uses the offical exporter provided by NGINX Inc.
-      Its metrics are differently structured and are incompatible to the old ones. For information about the metrics,
-      have a look at the <link xlink:href="https://github.com/nginxinc/nginx-prometheus-exporter">official repo</link>.
+     The <literal>prometheus-nginx-exporter</literal> package now uses the offical exporter provided by NGINX Inc. Its metrics are differently structured and are incompatible to the old ones. For information about the metrics, have a look at the <link xlink:href="https://github.com/nginxinc/nginx-prometheus-exporter">official repo</link>.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>shibboleth-sp</literal> package has been updated to version 3.
-     It is largely backward compatible, for further information refer to the
-     <link xlink:href="https://wiki.shibboleth.net/confluence/display/SP3/ReleaseNotes">release notes</link>
-     and <link xlink:href="https://wiki.shibboleth.net/confluence/display/SP3/UpgradingFromV2">upgrade guide</link>.
+     The <literal>shibboleth-sp</literal> package has been updated to version 3. It is largely backward compatible, for further information refer to the <link xlink:href="https://wiki.shibboleth.net/confluence/display/SP3/ReleaseNotes">release notes</link> and <link xlink:href="https://wiki.shibboleth.net/confluence/display/SP3/UpgradingFromV2">upgrade guide</link>.
+    </para>
+    <para>
+     Nodejs 8 is scheduled EOL under the lifetime of 19.09 and has been dropped.
     </para>
-     <para>
-       Nodejs 8 is scheduled EOL under the lifetime of 19.09 and has been dropped.
-     </para>
    </listitem>
    <listitem>
-     <para>
-       By default, prometheus exporters are now run with <literal>DynamicUser</literal> enabled.
-       Exporters that need a real user, now run under a seperate user and group which follow the pattern <literal>&lt;exporter-name&gt;-exporter</literal>, instead of the previous default <literal>nobody</literal> and <literal>nogroup</literal>.
-       Only some exporters are affected by the latter, namely the exporters <literal>dovecot</literal>, <literal>node</literal>, <literal>postfix</literal> and <literal>varnish</literal>.
-     </para>
+    <para>
+     By default, prometheus exporters are now run with <literal>DynamicUser</literal> enabled. Exporters that need a real user, now run under a seperate user and group which follow the pattern <literal>&lt;exporter-name&gt;-exporter</literal>, instead of the previous default <literal>nobody</literal> and <literal>nogroup</literal>. Only some exporters are affected by the latter, namely the exporters <literal>dovecot</literal>, <literal>node</literal>, <literal>postfix</literal> and <literal>varnish</literal>.
+    </para>
    </listitem>
    <listitem>
-     <para>
-       The <literal>ibus-qt</literal> package is not installed by default anymore when <xref linkend="opt-i18n.inputMethod.enabled" /> is set to <literal>ibus</literal>.
-       If IBus support in Qt 4.x applications is required, add the <literal>ibus-qt</literal> package to your <xref linkend="opt-environment.systemPackages" /> manually.
-     </para>
+    <para>
+     The <literal>ibus-qt</literal> package is not installed by default anymore when <xref linkend="opt-i18n.inputMethod.enabled" /> is set to <literal>ibus</literal>. If IBus support in Qt 4.x applications is required, add the <literal>ibus-qt</literal> package to your <xref linkend="opt-environment.systemPackages" /> manually.
+    </para>
    </listitem>
    <listitem>
-     <para>
-       The CUPS Printing service now uses socket-based activation by
-       default, only starting when needed. The previous behavior can
-       be restored by setting
-       <option>services.cups.startWhenNeeded</option> to
-       <literal>false</literal>.
-     </para>
+    <para>
+     The CUPS Printing service now uses socket-based activation by default, only starting when needed. The previous behavior can be restored by setting <option>services.cups.startWhenNeeded</option> to <literal>false</literal>.
+    </para>
    </listitem>
    <listitem>
-     <para>
-       The <option>services.systemhealth</option> module has been removed from nixpkgs due to lack of maintainer.
-     </para>
+    <para>
+     The <option>services.systemhealth</option> module has been removed from nixpkgs due to lack of maintainer.
+    </para>
    </listitem>
    <listitem>
-     <para>
-       The <option>services.mantisbt</option> module has been removed from nixpkgs due to lack of maintainer.
-     </para>
+    <para>
+     The <option>services.mantisbt</option> module has been removed from nixpkgs due to lack of maintainer.
+    </para>
    </listitem>
    <listitem>
-     <para>
-       Squid 3 has been removed and the <option>squid</option> derivation now refers to Squid 4.
-     </para>
+    <para>
+     Squid 3 has been removed and the <option>squid</option> derivation now refers to Squid 4.
+    </para>
    </listitem>
    <listitem>
-     <para>
-       The <option>services.pdns-recursor.extraConfig</option> option has been replaced by
-       <option>services.pdns-recursor.settings</option>. The new option allows setting extra
-       configuration while being better type-checked and mergeable.
-     </para>
+    <para>
+     The <option>services.pdns-recursor.extraConfig</option> option has been replaced by <option>services.pdns-recursor.settings</option>. The new option allows setting extra configuration while being better type-checked and mergeable.
+    </para>
    </listitem>
    <listitem>
     <para>
-     No service depends on <literal>keys.target</literal> anymore which is a systemd
-     target that indicates if all <link xlink:href="https://nixos.org/nixops/manual/#idm140737322342384">NixOps keys</link> were successfully uploaded.
-     Instead, <literal>&lt;key-name&gt;-key.service</literal> should be used to define
-     a dependency of a key in a service. The full issue behind the <literal>keys.target</literal>
-     dependency is described at <link xlink:href="https://github.com/NixOS/nixpkgs/issues/67265">NixOS/nixpkgs#67265</link>.
+     No service depends on <literal>keys.target</literal> anymore which is a systemd target that indicates if all <link xlink:href="https://nixos.org/nixops/manual/#idm140737322342384">NixOps keys</link> were successfully uploaded. Instead, <literal>&lt;key-name&gt;-key.service</literal> should be used to define a dependency of a key in a service. The full issue behind the <literal>keys.target</literal> dependency is described at <link xlink:href="https://github.com/NixOS/nixpkgs/issues/67265">NixOS/nixpkgs#67265</link>.
     </para>
     <para>
      The following services are affected by this:
      <itemizedlist>
-      <listitem><para><link linkend="opt-services.dovecot2.enable"><literal>services.dovecot2</literal></link></para></listitem>
-      <listitem><para><link linkend="opt-services.nsd.enable"><literal>services.nsd</literal></link></para></listitem>
-      <listitem><para><link linkend="opt-services.softether.enable"><literal>services.softether</literal></link></para></listitem>
-      <listitem><para><link linkend="opt-services.strongswan.enable"><literal>services.strongswan</literal></link></para></listitem>
-      <listitem><para><link linkend="opt-services.strongswan-swanctl.enable"><literal>services.strongswan-swanctl</literal></link></para></listitem>
-      <listitem><para><link linkend="opt-services.httpd.enable"><literal>services.httpd</literal></link></para></listitem>
+      <listitem>
+       <para>
+        <link linkend="opt-services.dovecot2.enable"><literal>services.dovecot2</literal></link>
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        <link linkend="opt-services.nsd.enable"><literal>services.nsd</literal></link>
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        <link linkend="opt-services.softether.enable"><literal>services.softether</literal></link>
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        <link linkend="opt-services.strongswan.enable"><literal>services.strongswan</literal></link>
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        <link linkend="opt-services.strongswan-swanctl.enable"><literal>services.strongswan-swanctl</literal></link>
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        <link linkend="opt-services.httpd.enable"><literal>services.httpd</literal></link>
+       </para>
+      </listitem>
      </itemizedlist>
     </para>
    </listitem>
    <listitem>
-     <para>
-       The <option>security.acme.directory</option> option has been replaced by a read-only <option>security.acme.certs.&lt;cert&gt;.directory</option> option for each certificate you define. This will be
-       a subdirectory of <literal>/var/lib/acme</literal>. You can use this read-only option to figure out where the certificates are stored for a specific certificate. For example,
-       the <option>services.nginx.virtualhosts.&lt;name&gt;.enableACME</option>  option will use this directory option to find the certs for the virtual host.
-     </para>
-     <para>
-       <option>security.acme.preDelay</option> and <option>security.acme.activationDelay</option> options have been removed. To execute a service before certificates
-       are provisioned or renewed add a <literal>RequiredBy=acme-${cert}.service</literal> to any service.
-     </para>
-     <para>
-       Furthermore, the acme module will not automatically add a dependency on <literal>lighttpd.service</literal> anymore. If you are using certficates provided by letsencrypt
-       for lighttpd, then you should depend on the certificate service <literal>acme-${cert}.service></literal> manually.
-     </para>
-     <para>
-       For nginx, the dependencies are still automatically managed when <option>services.nginx.virtualhosts.&lt;name&gt;.enableACME</option> is enabled just like before. What changed is that nginx now directly depends on the specific certificates that it needs,
-       instead of depending on the catch-all <literal>acme-certificates.target</literal>. This target unit was also removed from the codebase.
-       This will mean nginx will no longer depend on certificates it isn't explicitly managing and fixes a bug with certificate renewal
-       ordering racing with nginx restarting which could lead to nginx getting in a broken state as described at
-        <link xlink:href="https://github.com/NixOS/nixpkgs/issues/60180">NixOS/nixpkgs#60180</link>.
-     </para>
+    <para>
+     The <option>security.acme.directory</option> option has been replaced by a read-only <option>security.acme.certs.&lt;cert&gt;.directory</option> option for each certificate you define. This will be a subdirectory of <literal>/var/lib/acme</literal>. You can use this read-only option to figure out where the certificates are stored for a specific certificate. For example, the <option>services.nginx.virtualhosts.&lt;name&gt;.enableACME</option> option will use this directory option to find the certs for the virtual host.
+    </para>
+    <para>
+     <option>security.acme.preDelay</option> and <option>security.acme.activationDelay</option> options have been removed. To execute a service before certificates are provisioned or renewed add a <literal>RequiredBy=acme-${cert}.service</literal> to any service.
+    </para>
+    <para>
+     Furthermore, the acme module will not automatically add a dependency on <literal>lighttpd.service</literal> anymore. If you are using certficates provided by letsencrypt for lighttpd, then you should depend on the certificate service <literal>acme-${cert}.service></literal> manually.
+    </para>
+    <para>
+     For nginx, the dependencies are still automatically managed when <option>services.nginx.virtualhosts.&lt;name&gt;.enableACME</option> is enabled just like before. What changed is that nginx now directly depends on the specific certificates that it needs, instead of depending on the catch-all <literal>acme-certificates.target</literal>. This target unit was also removed from the codebase. This will mean nginx will no longer depend on certificates it isn't explicitly managing and fixes a bug with certificate renewal ordering racing with nginx restarting which could lead to nginx getting in a broken state as described at <link xlink:href="https://github.com/NixOS/nixpkgs/issues/60180">NixOS/nixpkgs#60180</link>.
+    </para>
    </listitem>
    <listitem>
-     <para>
-       The old deprecated <literal>emacs</literal> package sets have been dropped.
-       What used to be called <literal>emacsPackagesNg</literal> is now simply called <literal>emacsPackages</literal>.
-     </para>
+    <para>
+     The old deprecated <literal>emacs</literal> package sets have been dropped. What used to be called <literal>emacsPackagesNg</literal> is now simply called <literal>emacsPackages</literal>.
+    </para>
    </listitem>
    <listitem>
-     <para>
-       <option>services.xserver.desktopManager.xterm</option> is now disabled by default if <literal>stateVersion</literal> is 19.09 or higher.
-       Previously the xterm desktopManager was enabled when xserver was enabled, but it isn't useful for all people so it didn't make sense to
-       have any desktopManager enabled default.
-     </para>
+    <para>
+     <option>services.xserver.desktopManager.xterm</option> is now disabled by default if <literal>stateVersion</literal> is 19.09 or higher. Previously the xterm desktopManager was enabled when xserver was enabled, but it isn't useful for all people so it didn't make sense to have any desktopManager enabled default.
+    </para>
    </listitem>
    <listitem>
     <para>
-     The WeeChat plugin <literal>pkgs.weechatScripts.weechat-xmpp</literal> has been removed as it doesn't receive
-     any updates from upstream and depends on outdated Python2-based modules.
+     The WeeChat plugin <literal>pkgs.weechatScripts.weechat-xmpp</literal> has been removed as it doesn't receive any updates from upstream and depends on outdated Python2-based modules.
     </para>
    </listitem>
    <listitem>
     <para>
-     Old unsupported versions (<literal>logstash5</literal>,
-     <literal>kibana5</literal>,
-     <literal>filebeat5</literal>,
-     <literal>heartbeat5</literal>,
-     <literal>metricbeat5</literal>,
-     <literal>packetbeat5</literal>) of the ELK-stack and Elastic beats have been removed.
+     Old unsupported versions (<literal>logstash5</literal>, <literal>kibana5</literal>, <literal>filebeat5</literal>, <literal>heartbeat5</literal>, <literal>metricbeat5</literal>, <literal>packetbeat5</literal>) of the ELK-stack and Elastic beats have been removed.
     </para>
    </listitem>
    <listitem>
     <para>
-     For NixOS 19.03, both Prometheus 1 and 2 were available to allow for
-     a seamless transition from version 1 to 2 with existing setups.
-     Because Prometheus 1 is no longer developed, it was removed.
-     Prometheus 2 is now configured with <literal>services.prometheus</literal>.
+     For NixOS 19.03, both Prometheus 1 and 2 were available to allow for a seamless transition from version 1 to 2 with existing setups. Because Prometheus 1 is no longer developed, it was removed. Prometheus 2 is now configured with <literal>services.prometheus</literal>.
     </para>
    </listitem>
    <listitem>
-     <para>
-       Citrix Receiver (<literal>citrix_receiver</literal>) has been dropped in favor of Citrix Workspace
-       (<literal>citrix_workspace</literal>).
-     </para>
+    <para>
+     Citrix Receiver (<literal>citrix_receiver</literal>) has been dropped in favor of Citrix Workspace (<literal>citrix_workspace</literal>).
+    </para>
    </listitem>
   </itemizedlist>
  </section>
@@ -497,122 +494,74 @@
   <itemizedlist>
    <listitem>
     <para>
-     The <option>documentation</option> module gained an option named
-     <option>documentation.nixos.includeAllModules</option> which makes the
-     generated <citerefentry>
+     The <option>documentation</option> module gained an option named <option>documentation.nixos.includeAllModules</option> which makes the generated <citerefentry>
      <refentrytitle>configuration.nix</refentrytitle>
-     <manvolnum>5</manvolnum></citerefentry> manual page include all options
-     from all NixOS modules included in a given
-     <literal>configuration.nix</literal> configuration file. Currently, it is
-     set to <literal>false</literal> by default as enabling it frequently
-     prevents evaluation. But the plan is to eventually have it set to
-     <literal>true</literal> by default. Please set it to
-     <literal>true</literal> now in your <literal>configuration.nix</literal>
-     and fix all the bugs it uncovers.
+     <manvolnum>5</manvolnum></citerefentry> manual page include all options from all NixOS modules included in a given <literal>configuration.nix</literal> configuration file. Currently, it is set to <literal>false</literal> by default as enabling it frequently prevents evaluation. But the plan is to eventually have it set to <literal>true</literal> by default. Please set it to <literal>true</literal> now in your <literal>configuration.nix</literal> and fix all the bugs it uncovers.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>vlc</literal> package gained support for Chromecast
-     streaming, enabled by default. TCP port 8010 must be open for it to work,
-     so something like <literal>networking.firewall.allowedTCPPorts = [ 8010
-     ];</literal> may be required in your configuration. Also consider enabling
-     <link xlink:href="https://nixos.wiki/wiki/Accelerated_Video_Playback">
-     Accelerated Video Playback</link> for better transcoding performance.
+     The <literal>vlc</literal> package gained support for Chromecast streaming, enabled by default. TCP port 8010 must be open for it to work, so something like <literal>networking.firewall.allowedTCPPorts = [ 8010 ];</literal> may be required in your configuration. Also consider enabling <link xlink:href="https://nixos.wiki/wiki/Accelerated_Video_Playback"> Accelerated Video Playback</link> for better transcoding performance.
     </para>
    </listitem>
    <listitem>
     <para>
-     The following changes apply if the <literal>stateVersion</literal> is
-     changed to 19.09 or higher. For <literal>stateVersion = "19.03"</literal>
-     or lower the old behavior is preserved.
+     The following changes apply if the <literal>stateVersion</literal> is changed to 19.09 or higher. For <literal>stateVersion = "19.03"</literal> or lower the old behavior is preserved.
     </para>
     <itemizedlist>
      <listitem>
       <para>
-       <literal>solr.package</literal> defaults to
-       <literal>pkgs.solr_8</literal>.
+       <literal>solr.package</literal> defaults to <literal>pkgs.solr_8</literal>.
       </para>
      </listitem>
     </itemizedlist>
    </listitem>
    <listitem>
     <para>
-     The <literal>hunspellDicts.fr-any</literal> dictionary now ships with <literal>fr_FR.{aff,dic}</literal>
-     which is linked to <literal>fr-toutesvariantes.{aff,dic}</literal>.
+     The <literal>hunspellDicts.fr-any</literal> dictionary now ships with <literal>fr_FR.{aff,dic}</literal> which is linked to <literal>fr-toutesvariantes.{aff,dic}</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>mysql</literal> service now runs as <literal>mysql</literal>
-     user. Previously, systemd did execute it as root, and mysql dropped privileges
-     itself.
-     This includes <literal>ExecStartPre=</literal> and
-     <literal>ExecStartPost=</literal> phases.
-     To accomplish that, runtime and data directory setup was delegated to
-     RuntimeDirectory and tmpfiles.
+     The <literal>mysql</literal> service now runs as <literal>mysql</literal> user. Previously, systemd did execute it as root, and mysql dropped privileges itself. This includes <literal>ExecStartPre=</literal> and <literal>ExecStartPost=</literal> phases. To accomplish that, runtime and data directory setup was delegated to RuntimeDirectory and tmpfiles.
     </para>
    </listitem>
    <listitem>
     <para>
-     With the upgrade to systemd version 242 the <literal>systemd-timesyncd</literal>
-     service is no longer using <literal>DynamicUser=yes</literal>. In order for the
-     upgrade to work we rely on an activation script to move the state from the old
-     to the new directory. The older directory (prior <literal>19.09</literal>) was
-     <literal>/var/lib/private/systemd/timesync</literal>.
+     With the upgrade to systemd version 242 the <literal>systemd-timesyncd</literal> service is no longer using <literal>DynamicUser=yes</literal>. In order for the upgrade to work we rely on an activation script to move the state from the old to the new directory. The older directory (prior <literal>19.09</literal>) was <literal>/var/lib/private/systemd/timesync</literal>.
     </para>
     <para>
-     As long as the <literal>system.config.stateVersion</literal> is below
-     <literal>19.09</literal> the state folder will migrated to its proper location
-     (<literal>/var/lib/systemd/timesync</literal>), if required.
+     As long as the <literal>system.config.stateVersion</literal> is below <literal>19.09</literal> the state folder will migrated to its proper location (<literal>/var/lib/systemd/timesync</literal>), if required.
     </para>
    </listitem>
    <listitem>
     <para>
-     The package <literal>avahi</literal> is now built to look up service
-     definitions from <literal>/etc/avahi/services</literal> instead of its
-     output directory in the nix store. Accordingly the module
-     <option>avahi</option> now supports custom service definitions via
-     <option>services.avahi.extraServiceFiles</option>, which are then placed
-     in the aforementioned directory. See <citerefentry>
-     <refentrytitle>avahi.service</refentrytitle><manvolnum>5</manvolnum>
-     </citerefentry> for more information on custom service definitions.
+     The package <literal>avahi</literal> is now built to look up service definitions from <literal>/etc/avahi/services</literal> instead of its output directory in the nix store. Accordingly the module <option>avahi</option> now supports custom service definitions via <option>services.avahi.extraServiceFiles</option>, which are then placed in the aforementioned directory. See <citerefentry>
+     <refentrytitle>avahi.service</refentrytitle>
+     <manvolnum>5</manvolnum> </citerefentry> for more information on custom service definitions.
     </para>
    </listitem>
    <listitem>
     <para>
-     Since version 0.1.19, <literal>cargo-vendor</literal> honors package
-     includes that are specified in the <filename>Cargo.toml</filename>
-     file of Rust crates. <literal>rustPlatform.buildRustPackage</literal> uses
-     <literal>cargo-vendor</literal> to collect and build dependent crates.
-     Since this change in <literal>cargo-vendor</literal> changes the set of
-     vendored files for most Rust packages, the hash that use used to verify
-     the dependencies, <literal>cargoSha256</literal>, also changes.
+     Since version 0.1.19, <literal>cargo-vendor</literal> honors package includes that are specified in the <filename>Cargo.toml</filename> file of Rust crates. <literal>rustPlatform.buildRustPackage</literal> uses <literal>cargo-vendor</literal> to collect and build dependent crates. Since this change in <literal>cargo-vendor</literal> changes the set of vendored files for most Rust packages, the hash that use used to verify the dependencies, <literal>cargoSha256</literal>, also changes.
     </para>
     <para>
-     The <literal>cargoSha256</literal> hashes of all in-tree derivations that
-     use <literal>buildRustPackage</literal> have been updated to reflect this
-     change. However, third-party derivations that use
-     <literal>buildRustPackage</literal> may have to be updated as well.
+     The <literal>cargoSha256</literal> hashes of all in-tree derivations that use <literal>buildRustPackage</literal> have been updated to reflect this change. However, third-party derivations that use <literal>buildRustPackage</literal> may have to be updated as well.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>consul</literal> package was upgraded past version <literal>1.5</literal>,
-     so its deprecated legacy UI is no longer available.
+     The <literal>consul</literal> package was upgraded past version <literal>1.5</literal>, so its deprecated legacy UI is no longer available.
     </para>
    </listitem>
    <listitem>
     <para>
-     The default resample-method for PulseAudio has been changed from the upstream default <literal>speex-float-1</literal>
-     to <literal>speex-float-5</literal>. Be aware that low-powered ARM-based and MIPS-based boards will struggle with this
-     so you'll need to set <option>hardware.pulseaudio.daemon.config.resample-method</option> back to <literal>speex-float-1</literal>.
+     The default resample-method for PulseAudio has been changed from the upstream default <literal>speex-float-1</literal> to <literal>speex-float-5</literal>. Be aware that low-powered ARM-based and MIPS-based boards will struggle with this so you'll need to set <option>hardware.pulseaudio.daemon.config.resample-method</option> back to <literal>speex-float-1</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>phabricator</literal> package and associated <literal>httpd.extraSubservice</literal>, as well as the
-     <literal>phd</literal> service have been removed from nixpkgs due to lack of maintainer.
+     The <literal>phabricator</literal> package and associated <literal>httpd.extraSubservice</literal>, as well as the <literal>phd</literal> service have been removed from nixpkgs due to lack of maintainer.
     </para>
    </listitem>
    <listitem>
@@ -627,8 +576,7 @@
    </listitem>
    <listitem>
     <para>
-     The <literal>foswiki</literal> package and associated <literal>httpd.extraSubservice</literal> have been removed
-     from nixpkgs due to lack of maintainer.
+     The <literal>foswiki</literal> package and associated <literal>httpd.extraSubservice</literal> have been removed from nixpkgs due to lack of maintainer.
     </para>
    </listitem>
    <listitem>
@@ -638,155 +586,126 @@
    </listitem>
    <listitem>
     <para>
-     It's now possible to change configuration in
-     <link linkend="opt-services.nextcloud.enable">services.nextcloud</link> after the initial deploy
-     since all config parameters are persisted in an additional config file generated by the module.
-     Previously core configuration like database parameters were set using their imperative
-     installer after creating <literal>/var/lib/nextcloud</literal>.
+     It's now possible to change configuration in <link linkend="opt-services.nextcloud.enable">services.nextcloud</link> after the initial deploy since all config parameters are persisted in an additional config file generated by the module. Previously core configuration like database parameters were set using their imperative installer after creating <literal>/var/lib/nextcloud</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     There exists now <literal>lib.forEach</literal>, which is like <literal>map</literal>, but with
-     arguments flipped. When mapping function body spans many lines (or has nested
-     <literal>map</literal>s), it is often hard to follow which list is modified.
+     There exists now <literal>lib.forEach</literal>, which is like <literal>map</literal>, but with arguments flipped. When mapping function body spans many lines (or has nested <literal>map</literal>s), it is often hard to follow which list is modified.
     </para>
     <para>
-     Previous solution to this problem was either to use <literal>lib.flip map</literal>
-     idiom or extract that anonymous mapping function to a named one. Both can still be used
-     but <literal>lib.forEach</literal> is preferred over <literal>lib.flip map</literal>.
+     Previous solution to this problem was either to use <literal>lib.flip map</literal> idiom or extract that anonymous mapping function to a named one. Both can still be used but <literal>lib.forEach</literal> is preferred over <literal>lib.flip map</literal>.
     </para>
     <para>
-      The <literal>/etc/sysctl.d/nixos.conf</literal> file containing all the options set via
-      <link linkend="opt-boot.kernel.sysctl">boot.kernel.sysctl</link> was moved to
-      <literal>/etc/sysctl.d/60-nixos.conf</literal>, as
-      <citerefentry><refentrytitle>sysctl.d</refentrytitle><manvolnum>5</manvolnum></citerefentry>
-      recommends prefixing all filenames in <literal>/etc/sysctl.d</literal> with a
-      two-digit number and a dash to simplify the ordering of the files.
+     The <literal>/etc/sysctl.d/nixos.conf</literal> file containing all the options set via <link linkend="opt-boot.kernel.sysctl">boot.kernel.sysctl</link> was moved to <literal>/etc/sysctl.d/60-nixos.conf</literal>, as <citerefentry>
+     <refentrytitle>sysctl.d</refentrytitle>
+     <manvolnum>5</manvolnum></citerefentry> recommends prefixing all filenames in <literal>/etc/sysctl.d</literal> with a two-digit number and a dash to simplify the ordering of the files.
     </para>
    </listitem>
    <listitem>
     <para>
-      We now install the sysctl snippets shipped with systemd.
-    <itemizedlist>
-     <para>This enables:</para>
-     <listitem>
-      <para>Loose reverse path filtering</para>
-     </listitem>
-     <listitem>
-      <para>Source route filtering</para>
-     </listitem>
-     <listitem>
+     We now install the sysctl snippets shipped with systemd.
+     <itemizedlist>
       <para>
-       <literal>fq_codel</literal> as a packet scheduler (this helps to fight bufferbloat)
+       This enables:
       </para>
-     </listitem>
-    </itemizedlist>
-     This also configures the kernel to pass coredumps to <literal>systemd-coredump</literal>,
-     and restricts the SysRq key combinations to the sync command only.
-     These sysctl snippets can be found in <literal>/etc/sysctl.d/50-*.conf</literal>,
-     and overridden via <link linkend="opt-boot.kernel.sysctl">boot.kernel.sysctl</link>
-     (which will place the parameters in <literal>/etc/sysctl.d/60-nixos.conf</literal>).
-     </para>
+      <listitem>
+       <para>
+        Loose reverse path filtering
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        Source route filtering
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        <literal>fq_codel</literal> as a packet scheduler (this helps to fight bufferbloat)
+       </para>
+      </listitem>
+     </itemizedlist>
+     This also configures the kernel to pass coredumps to <literal>systemd-coredump</literal>, and restricts the SysRq key combinations to the sync command only. These sysctl snippets can be found in <literal>/etc/sysctl.d/50-*.conf</literal>, and overridden via <link linkend="opt-boot.kernel.sysctl">boot.kernel.sysctl</link> (which will place the parameters in <literal>/etc/sysctl.d/60-nixos.conf</literal>).
+    </para>
    </listitem>
    <listitem>
     <para>
-      Coredumps are now acquired by <literal>systemd-coredump</literal> by default.
-      <literal>systemd-coredump</literal> behaviour can still be modified via
-      <option>systemd.coredump.extraConfig</option>.
-      To stick to the old behaviour (having the kernel dump to a file called <literal>core</literal>
-      in the working directory), without piping it through <literal>systemd-coredump</literal>, set
-      <option>boot.kernel.sysctl."kernel.core_pattern"</option> to <literal>"core"</literal>.
+     Coredumps are now acquired by <literal>systemd-coredump</literal> by default. <literal>systemd-coredump</literal> behaviour can still be modified via <option>systemd.coredump.extraConfig</option>. To stick to the old behaviour (having the kernel dump to a file called <literal>core</literal> in the working directory), without piping it through <literal>systemd-coredump</literal>, set <option>boot.kernel.sysctl."kernel.core_pattern"</option> to <literal>"core"</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>systemd.packages</literal> option now also supports generators and
-     shutdown scripts. Old <literal>systemd.generator-packages</literal> option has
-     been removed.
+     <literal>systemd.packages</literal> option now also supports generators and shutdown scripts. Old <literal>systemd.generator-packages</literal> option has been removed.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>rmilter</literal> package was removed with associated module and options due deprecation by upstream developer.
-     Use <literal>rspamd</literal> in proxy mode instead.
+     The <literal>rmilter</literal> package was removed with associated module and options due deprecation by upstream developer. Use <literal>rspamd</literal> in proxy mode instead.
     </para>
    </listitem>
    <listitem>
     <para>
-      systemd cgroup accounting via the
-      <link linkend="opt-systemd.enableCgroupAccounting">systemd.enableCgroupAccounting</link>
-      option is now enabled by default. It now also enables the more recent Block IO and IP accounting
-      features.
+     systemd cgroup accounting via the <link linkend="opt-systemd.enableCgroupAccounting">systemd.enableCgroupAccounting</link> option is now enabled by default. It now also enables the more recent Block IO and IP accounting features.
     </para>
    </listitem>
    <listitem>
     <para>
-     We no longer enable custom font rendering settings with <option>fonts.fontconfig.penultimate.enable</option> by default.
-     The defaults from fontconfig are sufficient.
+     We no longer enable custom font rendering settings with <option>fonts.fontconfig.penultimate.enable</option> by default. The defaults from fontconfig are sufficient.
     </para>
    </listitem>
    <listitem>
     <para>
-      The <literal>crashplan</literal> package and the
-      <literal>crashplan</literal> service have been removed from nixpkgs due to
-      crashplan shutting down the service, while the <literal>crashplansb</literal>
-      package and <literal>crashplan-small-business</literal> service have been
-      removed from nixpkgs due to lack of maintainer.
+     The <literal>crashplan</literal> package and the <literal>crashplan</literal> service have been removed from nixpkgs due to crashplan shutting down the service, while the <literal>crashplansb</literal> package and <literal>crashplan-small-business</literal> service have been removed from nixpkgs due to lack of maintainer.
     </para>
     <para>
-      The <link linkend="opt-services.redis.enable">redis module</link> was hardcoded to use the <literal>redis</literal> user,
-      <filename class="directory">/run/redis</filename> as runtime directory and
-      <filename class="directory">/var/lib/redis</filename> as state directory.
-      Note that the NixOS module for Redis now disables kernel support for Transparent Huge Pages (THP),
-      because this features causes major performance problems for Redis,
-      e.g. (https://redis.io/topics/latency).
+     The <link linkend="opt-services.redis.enable">redis module</link> was hardcoded to use the <literal>redis</literal> user, <filename class="directory">/run/redis</filename> as runtime directory and <filename class="directory">/var/lib/redis</filename> as state directory. Note that the NixOS module for Redis now disables kernel support for Transparent Huge Pages (THP), because this features causes major performance problems for Redis, e.g. (https://redis.io/topics/latency).
     </para>
    </listitem>
    <listitem>
     <para>
      Using <option>fonts.enableDefaultFonts</option> adds a default emoji font <literal>noto-fonts-emoji</literal>.
      <itemizedlist>
-      <para>Users of the following options will have this enabled by default:</para>
+      <para>
+       Users of the following options will have this enabled by default:
+      </para>
       <listitem>
-       <para><option>services.xserver.enable</option></para>
+       <para>
+        <option>services.xserver.enable</option>
+       </para>
       </listitem>
       <listitem>
-       <para><option>programs.sway.enable</option></para>
+       <para>
+        <option>programs.sway.enable</option>
+       </para>
       </listitem>
       <listitem>
-       <para><option>programs.way-cooler.enable</option></para>
+       <para>
+        <option>programs.way-cooler.enable</option>
+       </para>
       </listitem>
       <listitem>
-       <para><option>services.xrdp.enable</option></para>
+       <para>
+        <option>services.xrdp.enable</option>
+       </para>
       </listitem>
      </itemizedlist>
     </para>
    </listitem>
    <listitem>
-     <para>
-       The <literal>altcoins</literal> categorization of packages has
-       been removed. You now access these packages at the top level,
-       ie. <literal>nix-shell -p dogecoin</literal> instead of
-       <literal>nix-shell -p altcoins.dogecoin</literal>, etc.
-     </para>
+    <para>
+     The <literal>altcoins</literal> categorization of packages has been removed. You now access these packages at the top level, ie. <literal>nix-shell -p dogecoin</literal> instead of <literal>nix-shell -p altcoins.dogecoin</literal>, etc.
+    </para>
    </listitem>
    <listitem>
-     <para>
-       Ceph has been upgraded to v14.2.1.
-       See the <link xlink:href="https://ceph.com/releases/v14-2-0-nautilus-released/">release notes</link> for details.
-       The mgr dashboard as well as osds backed by loop-devices is no longer explicitly supported by the package and module.
-       Note: There's been some issues with python-cherrypy, which is used by the dashboard
-       and prometheus mgr modules (and possibly others), hence 0000-dont-check-cherrypy-version.patch.
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      <literal>pkgs.weechat</literal> is now compiled against <literal>pkgs.python3</literal>.
-      Weechat also recommends <link xlink:href="https://weechat.org/scripts/python3/">to use Python3
-      in their docs.</link>
-     </para>
-    </listitem>
+    <para>
+     Ceph has been upgraded to v14.2.1. See the <link xlink:href="https://ceph.com/releases/v14-2-0-nautilus-released/">release notes</link> for details. The mgr dashboard as well as osds backed by loop-devices is no longer explicitly supported by the package and module. Note: There's been some issues with python-cherrypy, which is used by the dashboard and prometheus mgr modules (and possibly others), hence 0000-dont-check-cherrypy-version.patch.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>pkgs.weechat</literal> is now compiled against <literal>pkgs.python3</literal>. Weechat also recommends <link xlink:href="https://weechat.org/scripts/python3/">to use Python3 in their docs.</link>
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 </section>
diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml
index c84bc8dbb37..f10c0afd1db 100644
--- a/nixos/doc/manual/release-notes/rl-2003.xml
+++ b/nixos/doc/manual/release-notes/rl-2003.xml
@@ -13,8 +13,7 @@
   <title>Highlights</title>
 
   <para>
-   In addition to numerous new and upgraded packages, this release has the
-   following highlights:
+   In addition to numerous new and upgraded packages, this release has the following highlights:
   </para>
 
   <itemizedlist>
@@ -42,7 +41,6 @@
     <para />
    </listitem>
   </itemizedlist>
-
  </section>
 
  <section xmlns="http://docbook.org/ns/docbook"
@@ -53,8 +51,7 @@
   <title>Backward Incompatibilities</title>
 
   <para>
-   When upgrading from a previous release, please be aware of the following
-   incompatible changes:
+   When upgrading from a previous release, please be aware of the following incompatible changes:
   </para>
 
   <itemizedlist>
diff --git a/nixos/modules/i18n/input-method/default.xml b/nixos/modules/i18n/input-method/default.xml
index 117482fb0d5..830ef88d6d9 100644
--- a/nixos/modules/i18n/input-method/default.xml
+++ b/nixos/modules/i18n/input-method/default.xml
@@ -5,11 +5,7 @@
          xml:id="module-services-input-methods">
  <title>Input Methods</title>
  <para>
-  Input methods are an operating system component that allows any data, such as
-  keyboard strokes or mouse movements, to be received as input. In this way
-  users can enter characters and symbols not found on their input devices.
-  Using an input method is obligatory for any language that has more graphemes
-  than there are keys on the keyboard.
+  Input methods are an operating system component that allows any data, such as keyboard strokes or mouse movements, to be received as input. In this way users can enter characters and symbols not found on their input devices. Using an input method is obligatory for any language that has more graphemes than there are keys on the keyboard.
  </para>
  <para>
   The following input methods are available in NixOS:
@@ -40,8 +36,7 @@
   <title>IBus</title>
 
   <para>
-   IBus is an Intelligent Input Bus. It provides full featured and user
-   friendly input method user interface.
+   IBus is an Intelligent Input Bus. It provides full featured and user friendly input method user interface.
   </para>
 
   <para>
@@ -56,8 +51,7 @@ i18n.inputMethod = {
 </programlisting>
 
   <para>
-   <literal>i18n.inputMethod.ibus.engines</literal> is optional and can be used
-   to add extra IBus engines.
+   <literal>i18n.inputMethod.ibus.engines</literal> is optional and can be used to add extra IBus engines.
   </para>
 
   <para>
@@ -67,8 +61,7 @@ i18n.inputMethod = {
   <itemizedlist>
    <listitem>
     <para>
-     Anthy (<literal>ibus-engines.anthy</literal>): Anthy is a system for
-     Japanese input method. It converts Hiragana text to Kana Kanji mixed text.
+     Anthy (<literal>ibus-engines.anthy</literal>): Anthy is a system for Japanese input method. It converts Hiragana text to Kana Kanji mixed text.
     </para>
    </listitem>
    <listitem>
@@ -78,28 +71,22 @@ i18n.inputMethod = {
    </listitem>
    <listitem>
     <para>
-     m17n (<literal>ibus-engines.m17n</literal>): m17n is an input method that
-     uses input methods and corresponding icons in the m17n database.
+     m17n (<literal>ibus-engines.m17n</literal>): m17n is an input method that uses input methods and corresponding icons in the m17n database.
     </para>
    </listitem>
    <listitem>
     <para>
-     mozc (<literal>ibus-engines.mozc</literal>): A Japanese input method from
-     Google.
+     mozc (<literal>ibus-engines.mozc</literal>): A Japanese input method from Google.
     </para>
    </listitem>
    <listitem>
     <para>
-     Table (<literal>ibus-engines.table</literal>): An input method that load
-     tables of input methods.
+     Table (<literal>ibus-engines.table</literal>): An input method that load tables of input methods.
     </para>
    </listitem>
    <listitem>
     <para>
-     table-others (<literal>ibus-engines.table-others</literal>): Various
-     table-based input methods. To use this, and any other table-based input
-     methods, it must appear in the list of engines along with
-     <literal>table</literal>. For example:
+     table-others (<literal>ibus-engines.table-others</literal>): Various table-based input methods. To use this, and any other table-based input methods, it must appear in the list of engines along with <literal>table</literal>. For example:
 <programlisting>
 ibus.engines = with pkgs.ibus-engines; [ table table-others ];
 </programlisting>
@@ -108,22 +95,13 @@ ibus.engines = with pkgs.ibus-engines; [ table table-others ];
   </itemizedlist>
 
   <para>
-   To use any input method, the package must be added in the configuration, as
-   shown above, and also (after running <literal>nixos-rebuild</literal>) the
-   input method must be added from IBus' preference dialog.
+   To use any input method, the package must be added in the configuration, as shown above, and also (after running <literal>nixos-rebuild</literal>) the input method must be added from IBus' preference dialog.
   </para>
 
   <simplesect xml:id="module-services-input-methods-troubleshooting">
    <title>Troubleshooting</title>
    <para>
-    If IBus works in some applications but not others, a likely cause of this
-    is that IBus is depending on a different version of <literal>glib</literal>
-    to what the applications are depending on. This can be checked by running
-    <literal>nix-store -q --requisites &lt;path&gt; | grep glib</literal>,
-    where <literal>&lt;path&gt;</literal> is the path of either IBus or an
-    application in the Nix store. The <literal>glib</literal> packages must
-    match exactly. If they do not, uninstalling and reinstalling the
-    application is a likely fix.
+    If IBus works in some applications but not others, a likely cause of this is that IBus is depending on a different version of <literal>glib</literal> to what the applications are depending on. This can be checked by running <literal>nix-store -q --requisites &lt;path&gt; | grep glib</literal>, where <literal>&lt;path&gt;</literal> is the path of either IBus or an application in the Nix store. The <literal>glib</literal> packages must match exactly. If they do not, uninstalling and reinstalling the application is a likely fix.
    </para>
   </simplesect>
  </section>
@@ -131,8 +109,7 @@ ibus.engines = with pkgs.ibus-engines; [ table table-others ];
   <title>Fcitx</title>
 
   <para>
-   Fcitx is an input method framework with extension support. It has three
-   built-in Input Method Engine, Pinyin, QuWei and Table-based input methods.
+   Fcitx is an input method framework with extension support. It has three built-in Input Method Engine, Pinyin, QuWei and Table-based input methods.
   </para>
 
   <para>
@@ -147,8 +124,7 @@ i18n.inputMethod = {
 </programlisting>
 
   <para>
-   <literal>i18n.inputMethod.fcitx.engines</literal> is optional and can be
-   used to add extra Fcitx engines.
+   <literal>i18n.inputMethod.fcitx.engines</literal> is optional and can be used to add extra Fcitx engines.
   </para>
 
   <para>
@@ -158,15 +134,12 @@ i18n.inputMethod = {
   <itemizedlist>
    <listitem>
     <para>
-     Anthy (<literal>fcitx-engines.anthy</literal>): Anthy is a system for
-     Japanese input method. It converts Hiragana text to Kana Kanji mixed text.
+     Anthy (<literal>fcitx-engines.anthy</literal>): Anthy is a system for Japanese input method. It converts Hiragana text to Kana Kanji mixed text.
     </para>
    </listitem>
    <listitem>
     <para>
-     Chewing (<literal>fcitx-engines.chewing</literal>): Chewing is an
-     intelligent Zhuyin input method. It is one of the most popular input
-     methods among Traditional Chinese Unix users.
+     Chewing (<literal>fcitx-engines.chewing</literal>): Chewing is an intelligent Zhuyin input method. It is one of the most popular input methods among Traditional Chinese Unix users.
     </para>
    </listitem>
    <listitem>
@@ -181,20 +154,17 @@ i18n.inputMethod = {
    </listitem>
    <listitem>
     <para>
-     m17n (<literal>fcitx-engines.m17n</literal>): m17n is an input method that
-     uses input methods and corresponding icons in the m17n database.
+     m17n (<literal>fcitx-engines.m17n</literal>): m17n is an input method that uses input methods and corresponding icons in the m17n database.
     </para>
    </listitem>
    <listitem>
     <para>
-     mozc (<literal>fcitx-engines.mozc</literal>): A Japanese input method from
-     Google.
+     mozc (<literal>fcitx-engines.mozc</literal>): A Japanese input method from Google.
     </para>
    </listitem>
    <listitem>
     <para>
-     table-others (<literal>fcitx-engines.table-others</literal>): Various
-     table-based input methods.
+     table-others (<literal>fcitx-engines.table-others</literal>): Various table-based input methods.
     </para>
    </listitem>
   </itemizedlist>
@@ -203,9 +173,7 @@ i18n.inputMethod = {
   <title>Nabi</title>
 
   <para>
-   Nabi is an easy to use Korean X input method. It allows you to enter
-   phonetic Korean characters (hangul) and pictographic Korean characters
-   (hanja).
+   Nabi is an easy to use Korean X input method. It allows you to enter phonetic Korean characters (hangul) and pictographic Korean characters (hanja).
   </para>
 
   <para>
@@ -222,8 +190,7 @@ i18n.inputMethod = {
   <title>Uim</title>
 
   <para>
-   Uim (short for "universal input method") is a multilingual input method
-   framework. Applications can use it through so-called bridges.
+   Uim (short for "universal input method") is a multilingual input method framework. Applications can use it through so-called bridges.
   </para>
 
   <para>
@@ -237,8 +204,7 @@ i18n.inputMethod = {
 </programlisting>
 
   <para>
-   Note: The <xref linkend="opt-i18n.inputMethod.uim.toolbar"/> option can be
-   used to choose uim toolbar.
+   Note: The <xref linkend="opt-i18n.inputMethod.uim.toolbar"/> option can be used to choose uim toolbar.
   </para>
  </section>
 </chapter>
diff --git a/nixos/modules/programs/digitalbitbox/doc.xml b/nixos/modules/programs/digitalbitbox/doc.xml
index c63201628db..871abddca4c 100644
--- a/nixos/modules/programs/digitalbitbox/doc.xml
+++ b/nixos/modules/programs/digitalbitbox/doc.xml
@@ -8,37 +8,25 @@
   Digital Bitbox is a hardware wallet and second-factor authenticator.
  </para>
  <para>
-  The <literal>digitalbitbox</literal> programs module may be installed by
-  setting <literal>programs.digitalbitbox</literal> to <literal>true</literal>
-  in a manner similar to
+  The <literal>digitalbitbox</literal> programs module may be installed by setting <literal>programs.digitalbitbox</literal> to <literal>true</literal> in a manner similar to
 <programlisting>
 <xref linkend="opt-programs.digitalbitbox.enable"/> = true;
 </programlisting>
-  and bundles the <literal>digitalbitbox</literal> package (see
-  <xref
-      linkend="sec-digitalbitbox-package" />), which contains the
-  <literal>dbb-app</literal> and <literal>dbb-cli</literal> binaries, along
-  with the hardware module (see
-  <xref
-      linkend="sec-digitalbitbox-hardware-module" />) which sets up the
-  necessary udev rules to access the device.
+  and bundles the <literal>digitalbitbox</literal> package (see <xref
+      linkend="sec-digitalbitbox-package" />), which contains the <literal>dbb-app</literal> and <literal>dbb-cli</literal> binaries, along with the hardware module (see <xref
+      linkend="sec-digitalbitbox-hardware-module" />) which sets up the necessary udev rules to access the device.
  </para>
  <para>
-  Enabling the digitalbitbox module is pretty much the easiest way to get a
-  Digital Bitbox device working on your system.
+  Enabling the digitalbitbox module is pretty much the easiest way to get a Digital Bitbox device working on your system.
  </para>
  <para>
-  For more information, see
-  <link xlink:href="https://digitalbitbox.com/start_linux" />.
+  For more information, see <link xlink:href="https://digitalbitbox.com/start_linux" />.
  </para>
  <section xml:id="sec-digitalbitbox-package">
   <title>Package</title>
 
   <para>
-   The binaries, <literal>dbb-app</literal> (a GUI tool) and
-   <literal>dbb-cli</literal> (a CLI tool), are available through the
-   <literal>digitalbitbox</literal> package which could be installed as
-   follows:
+   The binaries, <literal>dbb-app</literal> (a GUI tool) and <literal>dbb-cli</literal> (a CLI tool), are available through the <literal>digitalbitbox</literal> package which could be installed as follows:
 <programlisting>
 <xref linkend="opt-environment.systemPackages"/> = [
   pkgs.digitalbitbox
@@ -50,17 +38,14 @@
   <title>Hardware</title>
 
   <para>
-   The digitalbitbox hardware package enables the udev rules for Digital Bitbox
-   devices and may be installed as follows:
+   The digitalbitbox hardware package enables the udev rules for Digital Bitbox devices and may be installed as follows:
 <programlisting>
 <xref linkend="opt-hardware.digitalbitbox.enable"/> = true;
 </programlisting>
   </para>
 
   <para>
-   In order to alter the udev rules, one may provide different values for the
-   <literal>udevRule51</literal> and <literal>udevRule52</literal> attributes
-   by means of overriding as follows:
+   In order to alter the udev rules, one may provide different values for the <literal>udevRule51</literal> and <literal>udevRule52</literal> attributes by means of overriding as follows:
 <programlisting>
 programs.digitalbitbox = {
   <link linkend="opt-programs.digitalbitbox.enable">enable</link> = true;
diff --git a/nixos/modules/programs/plotinus.xml b/nixos/modules/programs/plotinus.xml
index 8fc8c22c6d7..a0370f90a41 100644
--- a/nixos/modules/programs/plotinus.xml
+++ b/nixos/modules/programs/plotinus.xml
@@ -5,24 +5,19 @@
          xml:id="module-program-plotinus">
  <title>Plotinus</title>
  <para>
-  <emphasis>Source:</emphasis>
-  <filename>modules/programs/plotinus.nix</filename>
+  <emphasis>Source:</emphasis> <filename>modules/programs/plotinus.nix</filename>
  </para>
  <para>
-  <emphasis>Upstream documentation:</emphasis>
-  <link xlink:href="https://github.com/p-e-w/plotinus"/>
+  <emphasis>Upstream documentation:</emphasis> <link xlink:href="https://github.com/p-e-w/plotinus"/>
  </para>
  <para>
   Plotinus is a searchable command palette in every modern GTK application.
  </para>
  <para>
-  When in a GTK 3 application and Plotinus is enabled, you can press
-  <literal>Ctrl+Shift+P</literal> to open the command palette. The command
-  palette provides a searchable list of of all menu items in the application.
+  When in a GTK 3 application and Plotinus is enabled, you can press <literal>Ctrl+Shift+P</literal> to open the command palette. The command palette provides a searchable list of of all menu items in the application.
  </para>
  <para>
-  To enable Plotinus, add the following to your
-  <filename>configuration.nix</filename>:
+  To enable Plotinus, add the following to your <filename>configuration.nix</filename>:
 <programlisting>
 <xref linkend="opt-programs.plotinus.enable"/> = true;
 </programlisting>
diff --git a/nixos/modules/programs/zsh/oh-my-zsh.xml b/nixos/modules/programs/zsh/oh-my-zsh.xml
index 568c2de6557..c5202d818c9 100644
--- a/nixos/modules/programs/zsh/oh-my-zsh.xml
+++ b/nixos/modules/programs/zsh/oh-my-zsh.xml
@@ -5,18 +5,13 @@
          xml:id="module-programs-zsh-ohmyzsh">
  <title>Oh my ZSH</title>
  <para>
-  <literal><link xlink:href="https://ohmyz.sh/">oh-my-zsh</link></literal> is a
-  framework to manage your <link xlink:href="https://www.zsh.org/">ZSH</link>
-  configuration including completion scripts for several CLI tools or custom
-  prompt themes.
+  <literal><link xlink:href="https://ohmyz.sh/">oh-my-zsh</link></literal> is a framework to manage your <link xlink:href="https://www.zsh.org/">ZSH</link> configuration including completion scripts for several CLI tools or custom prompt themes.
  </para>
  <section xml:id="module-programs-oh-my-zsh-usage">
   <title>Basic usage</title>
 
   <para>
-   The module uses the <literal>oh-my-zsh</literal> package with all available
-   features. The initial setup using Nix expressions is fairly similar to the
-   configuration format of <literal>oh-my-zsh</literal>.
+   The module uses the <literal>oh-my-zsh</literal> package with all available features. The initial setup using Nix expressions is fairly similar to the configuration format of <literal>oh-my-zsh</literal>.
 <programlisting>
 {
   programs.zsh.ohMyZsh = {
@@ -26,25 +21,18 @@
   };
 }
 </programlisting>
-   For a detailed explanation of these arguments please refer to the
-   <link xlink:href="https://github.com/robbyrussell/oh-my-zsh/wiki"><literal>oh-my-zsh</literal>
-   docs</link>.
+   For a detailed explanation of these arguments please refer to the <link xlink:href="https://github.com/robbyrussell/oh-my-zsh/wiki"><literal>oh-my-zsh</literal> docs</link>.
   </para>
 
   <para>
-   The expression generates the needed configuration and writes it into your
-   <literal>/etc/zshrc</literal>.
+   The expression generates the needed configuration and writes it into your <literal>/etc/zshrc</literal>.
   </para>
  </section>
  <section xml:id="module-programs-oh-my-zsh-additions">
   <title>Custom additions</title>
 
   <para>
-   Sometimes third-party or custom scripts such as a modified theme may be
-   needed. <literal>oh-my-zsh</literal> provides the
-   <link xlink:href="https://github.com/robbyrussell/oh-my-zsh/wiki/Customization#overriding-internals"><literal>ZSH_CUSTOM</literal></link>
-   environment variable for this which points to a directory with additional
-   scripts.
+   Sometimes third-party or custom scripts such as a modified theme may be needed. <literal>oh-my-zsh</literal> provides the <link xlink:href="https://github.com/robbyrussell/oh-my-zsh/wiki/Customization#overriding-internals"><literal>ZSH_CUSTOM</literal></link> environment variable for this which points to a directory with additional scripts.
   </para>
 
   <para>
@@ -60,16 +48,11 @@
   <title>Custom environments</title>
 
   <para>
-   There are several extensions for <literal>oh-my-zsh</literal> packaged in
-   <literal>nixpkgs</literal>. One of them is
-   <link xlink:href="https://github.com/spwhitt/nix-zsh-completions">nix-zsh-completions</link>
-   which bundles completion scripts and a plugin for
-   <literal>oh-my-zsh</literal>.
+   There are several extensions for <literal>oh-my-zsh</literal> packaged in <literal>nixpkgs</literal>. One of them is <link xlink:href="https://github.com/spwhitt/nix-zsh-completions">nix-zsh-completions</link> which bundles completion scripts and a plugin for <literal>oh-my-zsh</literal>.
   </para>
 
   <para>
-   Rather than using a single mutable path for <literal>ZSH_CUSTOM</literal>,
-   it's also possible to generate this path from a list of Nix packages:
+   Rather than using a single mutable path for <literal>ZSH_CUSTOM</literal>, it's also possible to generate this path from a list of Nix packages:
 <programlisting>
 { pkgs, ... }:
 {
@@ -79,53 +62,34 @@
   ];
 }
 </programlisting>
-   Internally a single store path will be created using
-   <literal>buildEnv</literal>. Please refer to the docs of
-   <link xlink:href="https://nixos.org/nixpkgs/manual/#sec-building-environment"><literal>buildEnv</literal></link>
-   for further reference.
+   Internally a single store path will be created using <literal>buildEnv</literal>. Please refer to the docs of <link xlink:href="https://nixos.org/nixpkgs/manual/#sec-building-environment"><literal>buildEnv</literal></link> for further reference.
   </para>
 
   <para>
-   <emphasis>Please keep in mind that this is not compatible with
-   <literal>programs.zsh.ohMyZsh.custom</literal> as it requires an immutable
-   store path while <literal>custom</literal> shall remain mutable! An
-   evaluation failure will be thrown if both <literal>custom</literal> and
-   <literal>customPkgs</literal> are set.</emphasis>
+   <emphasis>Please keep in mind that this is not compatible with <literal>programs.zsh.ohMyZsh.custom</literal> as it requires an immutable store path while <literal>custom</literal> shall remain mutable! An evaluation failure will be thrown if both <literal>custom</literal> and <literal>customPkgs</literal> are set.</emphasis>
   </para>
  </section>
  <section xml:id="module-programs-oh-my-zsh-packaging-customizations">
   <title>Package your own customizations</title>
 
   <para>
-   If third-party customizations (e.g. new themes) are supposed to be added to
-   <literal>oh-my-zsh</literal> there are several pitfalls to keep in mind:
+   If third-party customizations (e.g. new themes) are supposed to be added to <literal>oh-my-zsh</literal> there are several pitfalls to keep in mind:
   </para>
 
   <itemizedlist>
    <listitem>
     <para>
-     To comply with the default structure of <literal>ZSH</literal> the entire
-     output needs to be written to <literal>$out/share/zsh.</literal>
+     To comply with the default structure of <literal>ZSH</literal> the entire output needs to be written to <literal>$out/share/zsh.</literal>
     </para>
    </listitem>
    <listitem>
     <para>
-     Completion scripts are supposed to be stored at
-     <literal>$out/share/zsh/site-functions</literal>. This directory is part
-     of the
-     <literal><link xlink:href="http://zsh.sourceforge.net/Doc/Release/Functions.html">fpath</link></literal>
-     and the package should be compatible with pure <literal>ZSH</literal>
-     setups. The module will automatically link the contents of
-     <literal>site-functions</literal> to completions directory in the proper
-     store path.
+     Completion scripts are supposed to be stored at <literal>$out/share/zsh/site-functions</literal>. This directory is part of the <literal><link xlink:href="http://zsh.sourceforge.net/Doc/Release/Functions.html">fpath</link></literal> and the package should be compatible with pure <literal>ZSH</literal> setups. The module will automatically link the contents of <literal>site-functions</literal> to completions directory in the proper store path.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>plugins</literal> directory needs the structure
-     <literal>pluginname/pluginname.plugin.zsh</literal> as structured in the
-     <link xlink:href="https://github.com/robbyrussell/oh-my-zsh/tree/91b771914bc7c43dd7c7a43b586c5de2c225ceb7/plugins">upstream
-     repo.</link>
+     The <literal>plugins</literal> directory needs the structure <literal>pluginname/pluginname.plugin.zsh</literal> as structured in the <link xlink:href="https://github.com/robbyrussell/oh-my-zsh/tree/91b771914bc7c43dd7c7a43b586c5de2c225ceb7/plugins">upstream repo.</link>
     </para>
    </listitem>
   </itemizedlist>
diff --git a/nixos/modules/security/acme.xml b/nixos/modules/security/acme.xml
index 9d0a1995e0f..182d6e0cd51 100644
--- a/nixos/modules/security/acme.xml
+++ b/nixos/modules/security/acme.xml
@@ -5,19 +5,13 @@
          xml:id="module-security-acme">
  <title>SSL/TLS Certificates with ACME</title>
  <para>
-  NixOS supports automatic domain validation &amp; certificate retrieval and
-  renewal using the ACME protocol. This is currently only implemented by and
-  for Let's Encrypt. The alternative ACME client <literal>simp_le</literal> is
-  used under the hood.
+  NixOS supports automatic domain validation &amp; certificate retrieval and renewal using the ACME protocol. This is currently only implemented by and for Let's Encrypt. The alternative ACME client <literal>simp_le</literal> is used under the hood.
  </para>
  <section xml:id="module-security-acme-prerequisites">
   <title>Prerequisites</title>
 
   <para>
-   You need to have a running HTTP server for verification. The server must
-   have a webroot defined that can serve
-   <filename>.well-known/acme-challenge</filename>. This directory must be
-   writeable by the user that will run the ACME client.
+   You need to have a running HTTP server for verification. The server must have a webroot defined that can serve <filename>.well-known/acme-challenge</filename>. This directory must be writeable by the user that will run the ACME client.
   </para>
 
   <para>
@@ -45,9 +39,7 @@ http {
   <title>Configuring</title>
 
   <para>
-   To enable ACME certificate retrieval &amp; renewal for a certificate for
-   <literal>foo.example.com</literal>, add the following in your
-   <filename>configuration.nix</filename>:
+   To enable ACME certificate retrieval &amp; renewal for a certificate for <literal>foo.example.com</literal>, add the following in your <filename>configuration.nix</filename>:
 <programlisting>
 <xref linkend="opt-security.acme.certs"/>."foo.example.com" = {
   <link linkend="opt-security.acme.certs._name_.webroot">webroot</link> = "/var/www/challenges";
@@ -57,26 +49,18 @@ http {
   </para>
 
   <para>
-   The private key <filename>key.pem</filename> and certificate
-   <filename>fullchain.pem</filename> will be put into
-   <filename>/var/lib/acme/foo.example.com</filename>.
+   The private key <filename>key.pem</filename> and certificate <filename>fullchain.pem</filename> will be put into <filename>/var/lib/acme/foo.example.com</filename>.
   </para>
+
   <para>
-   Refer to <xref linkend="ch-options" /> for all available configuration
-   options for the <link linkend="opt-security.acme.certs">security.acme</link>
-   module.
+   Refer to <xref linkend="ch-options" /> for all available configuration options for the <link linkend="opt-security.acme.certs">security.acme</link> module.
   </para>
  </section>
  <section xml:id="module-security-acme-nginx">
   <title>Using ACME certificates in Nginx</title>
 
   <para>
-   NixOS supports fetching ACME certificates for you by setting
-   <literal><link linkend="opt-services.nginx.virtualHosts._name_.enableACME">enableACME</link>
-   = true;</literal> in a virtualHost config. We first create self-signed
-   placeholder certificates in place of the real ACME certs. The placeholder
-   certs are overwritten when the ACME certs arrive. For
-   <literal>foo.example.com</literal> the config would look like.
+   NixOS supports fetching ACME certificates for you by setting <literal><link linkend="opt-services.nginx.virtualHosts._name_.enableACME">enableACME</link> = true;</literal> in a virtualHost config. We first create self-signed placeholder certificates in place of the real ACME certs. The placeholder certs are overwritten when the ACME certs arrive. For <literal>foo.example.com</literal> the config would look like.
   </para>
 
 <programlisting>
diff --git a/nixos/modules/security/hidepid.xml b/nixos/modules/security/hidepid.xml
index 5a17cb1da41..979d0215ab3 100644
--- a/nixos/modules/security/hidepid.xml
+++ b/nixos/modules/security/hidepid.xml
@@ -9,18 +9,13 @@
 <programlisting>
 <xref linkend="opt-security.hideProcessInformation"/> = true;
 </programlisting>
-  ensures that access to process information is restricted to the owning user.
-  This implies, among other things, that command-line arguments remain private.
-  Unless your deployment relies on unprivileged users being able to inspect the
-  process information of other users, this option should be safe to enable.
+  ensures that access to process information is restricted to the owning user. This implies, among other things, that command-line arguments remain private. Unless your deployment relies on unprivileged users being able to inspect the process information of other users, this option should be safe to enable.
  </para>
  <para>
-  Members of the <literal>proc</literal> group are exempt from process
-  information hiding.
+  Members of the <literal>proc</literal> group are exempt from process information hiding.
  </para>
  <para>
-  To allow a service <replaceable>foo</replaceable> to run without process
-  information hiding, set
+  To allow a service <replaceable>foo</replaceable> to run without process information hiding, set
 <programlisting>
 <link linkend="opt-systemd.services._name_.serviceConfig">systemd.services.<replaceable>foo</replaceable>.serviceConfig</link>.SupplementaryGroups = [ "proc" ];
 </programlisting>
diff --git a/nixos/modules/services/databases/foundationdb.xml b/nixos/modules/services/databases/foundationdb.xml
index b0b1ebeab45..33adfee3526 100644
--- a/nixos/modules/services/databases/foundationdb.xml
+++ b/nixos/modules/services/databases/foundationdb.xml
@@ -5,12 +5,10 @@
          xml:id="module-services-foundationdb">
  <title>FoundationDB</title>
  <para>
-  <emphasis>Source:</emphasis>
-  <filename>modules/services/databases/foundationdb.nix</filename>
+  <emphasis>Source:</emphasis> <filename>modules/services/databases/foundationdb.nix</filename>
  </para>
  <para>
-  <emphasis>Upstream documentation:</emphasis>
-  <link xlink:href="https://apple.github.io/foundationdb/"/>
+  <emphasis>Upstream documentation:</emphasis> <link xlink:href="https://apple.github.io/foundationdb/"/>
  </para>
  <para>
   <emphasis>Maintainer:</emphasis> Austin Seipp
@@ -19,15 +17,13 @@
   <emphasis>Available version(s):</emphasis> 5.1.x, 5.2.x, 6.0.x
  </para>
  <para>
-  FoundationDB (or "FDB") is an open source, distributed, transactional
-  key-value store.
+  FoundationDB (or "FDB") is an open source, distributed, transactional key-value store.
  </para>
  <section xml:id="module-services-foundationdb-configuring">
   <title>Configuring and basic setup</title>
 
   <para>
-   To enable FoundationDB, add the following to your
-   <filename>configuration.nix</filename>:
+   To enable FoundationDB, add the following to your <filename>configuration.nix</filename>:
 <programlisting>
 services.foundationdb.enable = true;
 services.foundationdb.package = pkgs.foundationdb52; # FoundationDB 5.2.x
@@ -35,18 +31,11 @@ services.foundationdb.package = pkgs.foundationdb52; # FoundationDB 5.2.x
   </para>
 
   <para>
-   The <option>services.foundationdb.package</option> option is required, and
-   must always be specified. Due to the fact FoundationDB network protocols and
-   on-disk storage formats may change between (major) versions, and upgrades
-   must be explicitly handled by the user, you must always manually specify
-   this yourself so that the NixOS module will use the proper version. Note
-   that minor, bugfix releases are always compatible.
+   The <option>services.foundationdb.package</option> option is required, and must always be specified. Due to the fact FoundationDB network protocols and on-disk storage formats may change between (major) versions, and upgrades must be explicitly handled by the user, you must always manually specify this yourself so that the NixOS module will use the proper version. Note that minor, bugfix releases are always compatible.
   </para>
 
   <para>
-   After running <command>nixos-rebuild</command>, you can verify whether
-   FoundationDB is running by executing <command>fdbcli</command> (which is
-   added to <option>environment.systemPackages</option>):
+   After running <command>nixos-rebuild</command>, you can verify whether FoundationDB is running by executing <command>fdbcli</command> (which is added to <option>environment.systemPackages</option>):
 <screen>
 <prompt>$ </prompt>sudo -u foundationdb fdbcli
 Using cluster file `/etc/foundationdb/fdb.cluster'.
@@ -77,11 +66,7 @@ Cluster:
   </para>
 
   <para>
-   You can also write programs using the available client libraries. For
-   example, the following Python program can be run in order to grab the
-   cluster status, as a quick example. (This example uses
-   <command>nix-shell</command> shebang support to automatically supply the
-   necessary Python modules).
+   You can also write programs using the available client libraries. For example, the following Python program can be run in order to grab the cluster status, as a quick example. (This example uses <command>nix-shell</command> shebang support to automatically supply the necessary Python modules).
 <screen>
 <prompt>a@link> </prompt>cat fdb-status.py
 #! /usr/bin/env nix-shell
@@ -111,91 +96,56 @@ FoundationDB available: True
   </para>
 
   <para>
-   FoundationDB is run under the <command>foundationdb</command> user and group
-   by default, but this may be changed in the NixOS configuration. The systemd
-   unit <command>foundationdb.service</command> controls the
-   <command>fdbmonitor</command> process.
+   FoundationDB is run under the <command>foundationdb</command> user and group by default, but this may be changed in the NixOS configuration. The systemd unit <command>foundationdb.service</command> controls the <command>fdbmonitor</command> process.
   </para>
 
   <para>
-   By default, the NixOS module for FoundationDB creates a single SSD-storage
-   based database for development and basic usage. This storage engine is
-   designed for SSDs and will perform poorly on HDDs; however it can handle far
-   more data than the alternative "memory" engine and is a better default
-   choice for most deployments. (Note that you can change the storage backend
-   on-the-fly for a given FoundationDB cluster using
-   <command>fdbcli</command>.)
+   By default, the NixOS module for FoundationDB creates a single SSD-storage based database for development and basic usage. This storage engine is designed for SSDs and will perform poorly on HDDs; however it can handle far more data than the alternative "memory" engine and is a better default choice for most deployments. (Note that you can change the storage backend on-the-fly for a given FoundationDB cluster using <command>fdbcli</command>.)
   </para>
 
   <para>
-   Furthermore, only 1 server process and 1 backup agent are started in the
-   default configuration. See below for more on scaling to increase this.
+   Furthermore, only 1 server process and 1 backup agent are started in the default configuration. See below for more on scaling to increase this.
   </para>
 
   <para>
-   FoundationDB stores all data for all server processes under
-   <filename>/var/lib/foundationdb</filename>. You can override this using
-   <option>services.foundationdb.dataDir</option>, e.g.
+   FoundationDB stores all data for all server processes under <filename>/var/lib/foundationdb</filename>. You can override this using <option>services.foundationdb.dataDir</option>, e.g.
 <programlisting>
 services.foundationdb.dataDir = "/data/fdb";
 </programlisting>
   </para>
 
   <para>
-   Similarly, logs are stored under <filename>/var/log/foundationdb</filename>
-   by default, and there is a corresponding
-   <option>services.foundationdb.logDir</option> as well.
+   Similarly, logs are stored under <filename>/var/log/foundationdb</filename> by default, and there is a corresponding <option>services.foundationdb.logDir</option> as well.
   </para>
  </section>
  <section xml:id="module-services-foundationdb-scaling">
   <title>Scaling processes and backup agents</title>
 
   <para>
-   Scaling the number of server processes is quite easy; simply specify
-   <option>services.foundationdb.serverProcesses</option> to be the number of
-   FoundationDB worker processes that should be started on the machine.
+   Scaling the number of server processes is quite easy; simply specify <option>services.foundationdb.serverProcesses</option> to be the number of FoundationDB worker processes that should be started on the machine.
   </para>
 
   <para>
-   FoundationDB worker processes typically require 4GB of RAM per-process at
-   minimum for good performance, so this option is set to 1 by default since
-   the maximum amount of RAM is unknown. You're advised to abide by this
-   restriction, so pick a number of processes so that each has 4GB or more.
+   FoundationDB worker processes typically require 4GB of RAM per-process at minimum for good performance, so this option is set to 1 by default since the maximum amount of RAM is unknown. You're advised to abide by this restriction, so pick a number of processes so that each has 4GB or more.
   </para>
 
   <para>
-   A similar option exists in order to scale backup agent processes,
-   <option>services.foundationdb.backupProcesses</option>. Backup agents are
-   not as performance/RAM sensitive, so feel free to experiment with the number
-   of available backup processes.
+   A similar option exists in order to scale backup agent processes, <option>services.foundationdb.backupProcesses</option>. Backup agents are not as performance/RAM sensitive, so feel free to experiment with the number of available backup processes.
   </para>
  </section>
  <section xml:id="module-services-foundationdb-clustering">
   <title>Clustering</title>
 
   <para>
-   FoundationDB on NixOS works similarly to other Linux systems, so this
-   section will be brief. Please refer to the full FoundationDB documentation
-   for more on clustering.
+   FoundationDB on NixOS works similarly to other Linux systems, so this section will be brief. Please refer to the full FoundationDB documentation for more on clustering.
   </para>
 
   <para>
-   FoundationDB organizes clusters using a set of
-   <emphasis>coordinators</emphasis>, which are just specially-designated
-   worker processes. By default, every installation of FoundationDB on NixOS
-   will start as its own individual cluster, with a single coordinator: the
-   first worker process on <command>localhost</command>.
+   FoundationDB organizes clusters using a set of <emphasis>coordinators</emphasis>, which are just specially-designated worker processes. By default, every installation of FoundationDB on NixOS will start as its own individual cluster, with a single coordinator: the first worker process on <command>localhost</command>.
   </para>
 
   <para>
-   Coordinators are specified globally using the
-   <command>/etc/foundationdb/fdb.cluster</command> file, which all servers and
-   client applications will use to find and join coordinators. Note that this
-   file <emphasis>can not</emphasis> be managed by NixOS so easily:
-   FoundationDB is designed so that it will rewrite the file at runtime for all
-   clients and nodes when cluster coordinators change, with clients
-   transparently handling this without intervention. It is fundamentally a
-   mutable file, and you should not try to manage it in any way in NixOS.
+   Coordinators are specified globally using the <command>/etc/foundationdb/fdb.cluster</command> file, which all servers and client applications will use to find and join coordinators. Note that this file <emphasis>can not</emphasis> be managed by NixOS so easily: FoundationDB is designed so that it will rewrite the file at runtime for all clients and nodes when cluster coordinators change, with clients transparently handling this without intervention. It is fundamentally a mutable file, and you should not try to manage it in any way in NixOS.
   </para>
 
   <para>
@@ -216,9 +166,7 @@ services.foundationdb.dataDir = "/data/fdb";
   </itemizedlist>
 
   <para>
-   A node must already be a member of the cluster in order to properly be
-   promoted to a coordinator, so you must always add it first if you wish to
-   promote it.
+   A node must already be a member of the cluster in order to properly be promoted to a coordinator, so you must always add it first if you wish to promote it.
   </para>
 
   <para>
@@ -233,37 +181,26 @@ services.foundationdb.dataDir = "/data/fdb";
    </listitem>
    <listitem>
     <para>
-     Copy the <command>/etc/foundationdb/fdb.cluster</command> file from this
-     server to all the other servers. Restart FoundationDB on all of these
-     other servers, so they join the cluster.
+     Copy the <command>/etc/foundationdb/fdb.cluster</command> file from this server to all the other servers. Restart FoundationDB on all of these other servers, so they join the cluster.
     </para>
    </listitem>
    <listitem>
     <para>
-     All of these servers are now connected and working together in the
-     cluster, under the chosen coordinator.
+     All of these servers are now connected and working together in the cluster, under the chosen coordinator.
     </para>
    </listitem>
   </itemizedlist>
 
   <para>
-   At this point, you can add as many nodes as you want by just repeating the
-   above steps. By default there will still be a single coordinator: you can
-   use <command>fdbcli</command> to change this and add new coordinators.
+   At this point, you can add as many nodes as you want by just repeating the above steps. By default there will still be a single coordinator: you can use <command>fdbcli</command> to change this and add new coordinators.
   </para>
 
   <para>
-   As a convenience, FoundationDB can automatically assign coordinators based
-   on the redundancy mode you wish to achieve for the cluster. Once all the
-   nodes have been joined, simply set the replication policy, and then issue
-   the <command>coordinators auto</command> command
+   As a convenience, FoundationDB can automatically assign coordinators based on the redundancy mode you wish to achieve for the cluster. Once all the nodes have been joined, simply set the replication policy, and then issue the <command>coordinators auto</command> command
   </para>
 
   <para>
-   For example, assuming we have 3 nodes available, we can enable double
-   redundancy mode, then auto-select coordinators. For double redundancy, 3
-   coordinators is ideal: therefore FoundationDB will make
-   <emphasis>every</emphasis> node a coordinator automatically:
+   For example, assuming we have 3 nodes available, we can enable double redundancy mode, then auto-select coordinators. For double redundancy, 3 coordinators is ideal: therefore FoundationDB will make <emphasis>every</emphasis> node a coordinator automatically:
   </para>
 
 <screen>
@@ -272,58 +209,33 @@ services.foundationdb.dataDir = "/data/fdb";
 </screen>
 
   <para>
-   This will transparently update all the servers within seconds, and
-   appropriately rewrite the <command>fdb.cluster</command> file, as well as
-   informing all client processes to do the same.
+   This will transparently update all the servers within seconds, and appropriately rewrite the <command>fdb.cluster</command> file, as well as informing all client processes to do the same.
   </para>
  </section>
  <section xml:id="module-services-foundationdb-connectivity">
   <title>Client connectivity</title>
 
   <para>
-   By default, all clients must use the current <command>fdb.cluster</command>
-   file to access a given FoundationDB cluster. This file is located by default
-   in <command>/etc/foundationdb/fdb.cluster</command> on all machines with the
-   FoundationDB service enabled, so you may copy the active one from your
-   cluster to a new node in order to connect, if it is not part of the cluster.
+   By default, all clients must use the current <command>fdb.cluster</command> file to access a given FoundationDB cluster. This file is located by default in <command>/etc/foundationdb/fdb.cluster</command> on all machines with the FoundationDB service enabled, so you may copy the active one from your cluster to a new node in order to connect, if it is not part of the cluster.
   </para>
  </section>
  <section xml:id="module-services-foundationdb-authorization">
   <title>Client authorization and TLS</title>
 
   <para>
-   By default, any user who can connect to a FoundationDB process with the
-   correct cluster configuration can access anything. FoundationDB uses a
-   pluggable design to transport security, and out of the box it supports a
-   LibreSSL-based plugin for TLS support. This plugin not only does in-flight
-   encryption, but also performs client authorization based on the given
-   endpoint's certificate chain. For example, a FoundationDB server may be
-   configured to only accept client connections over TLS, where the client TLS
-   certificate is from organization <emphasis>Acme Co</emphasis> in the
-   <emphasis>Research and Development</emphasis> unit.
+   By default, any user who can connect to a FoundationDB process with the correct cluster configuration can access anything. FoundationDB uses a pluggable design to transport security, and out of the box it supports a LibreSSL-based plugin for TLS support. This plugin not only does in-flight encryption, but also performs client authorization based on the given endpoint's certificate chain. For example, a FoundationDB server may be configured to only accept client connections over TLS, where the client TLS certificate is from organization <emphasis>Acme Co</emphasis> in the <emphasis>Research and Development</emphasis> unit.
   </para>
 
   <para>
-   Configuring TLS with FoundationDB is done using the
-   <option>services.foundationdb.tls</option> options in order to control the
-   peer verification string, as well as the certificate and its private key.
+   Configuring TLS with FoundationDB is done using the <option>services.foundationdb.tls</option> options in order to control the peer verification string, as well as the certificate and its private key.
   </para>
 
   <para>
-   Note that the certificate and its private key must be accessible to the
-   FoundationDB user account that the server runs under. These files are also
-   NOT managed by NixOS, as putting them into the store may reveal private
-   information.
+   Note that the certificate and its private key must be accessible to the FoundationDB user account that the server runs under. These files are also NOT managed by NixOS, as putting them into the store may reveal private information.
   </para>
 
   <para>
-   After you have a key and certificate file in place, it is not enough to
-   simply set the NixOS module options -- you must also configure the
-   <command>fdb.cluster</command> file to specify that a given set of
-   coordinators use TLS. This is as simple as adding the suffix
-   <command>:tls</command> to your cluster coordinator configuration, after the
-   port number. For example, assuming you have a coordinator on localhost with
-   the default configuration, simply specifying:
+   After you have a key and certificate file in place, it is not enough to simply set the NixOS module options -- you must also configure the <command>fdb.cluster</command> file to specify that a given set of coordinators use TLS. This is as simple as adding the suffix <command>:tls</command> to your cluster coordinator configuration, after the port number. For example, assuming you have a coordinator on localhost with the default configuration, simply specifying:
   </para>
 
 <programlisting>
@@ -338,36 +250,19 @@ XXXXXX:XXXXXX@127.0.0.1:4500:tls
   <title>Backups and Disaster Recovery</title>
 
   <para>
-   The usual rules for doing FoundationDB backups apply on NixOS as written in
-   the FoundationDB manual. However, one important difference is the security
-   profile for NixOS: by default, the <command>foundationdb</command> systemd
-   unit uses <emphasis>Linux namespaces</emphasis> to restrict write access to
-   the system, except for the log directory, data directory, and the
-   <command>/etc/foundationdb/</command> directory. This is enforced by default
-   and cannot be disabled.
+   The usual rules for doing FoundationDB backups apply on NixOS as written in the FoundationDB manual. However, one important difference is the security profile for NixOS: by default, the <command>foundationdb</command> systemd unit uses <emphasis>Linux namespaces</emphasis> to restrict write access to the system, except for the log directory, data directory, and the <command>/etc/foundationdb/</command> directory. This is enforced by default and cannot be disabled.
   </para>
 
   <para>
-   However, a side effect of this is that the <command>fdbbackup</command>
-   command doesn't work properly for local filesystem backups: FoundationDB
-   uses a server process alongside the database processes to perform backups
-   and copy the backups to the filesystem. As a result, this process is put
-   under the restricted namespaces above: the backup process can only write to
-   a limited number of paths.
+   However, a side effect of this is that the <command>fdbbackup</command> command doesn't work properly for local filesystem backups: FoundationDB uses a server process alongside the database processes to perform backups and copy the backups to the filesystem. As a result, this process is put under the restricted namespaces above: the backup process can only write to a limited number of paths.
   </para>
 
   <para>
-   In order to allow flexible backup locations on local disks, the FoundationDB
-   NixOS module supports a
-   <option>services.foundationdb.extraReadWritePaths</option> option. This
-   option takes a list of paths, and adds them to the systemd unit, allowing
-   the processes inside the service to write (and read) the specified
-   directories.
+   In order to allow flexible backup locations on local disks, the FoundationDB NixOS module supports a <option>services.foundationdb.extraReadWritePaths</option> option. This option takes a list of paths, and adds them to the systemd unit, allowing the processes inside the service to write (and read) the specified directories.
   </para>
 
   <para>
-   For example, to create backups in <command>/opt/fdb-backups</command>, first
-   set up the paths in the module options:
+   For example, to create backups in <command>/opt/fdb-backups</command>, first set up the paths in the module options:
   </para>
 
 <programlisting>
@@ -375,11 +270,7 @@ services.foundationdb.extraReadWritePaths = [ "/opt/fdb-backups" ];
 </programlisting>
 
   <para>
-   Restart the FoundationDB service, and it will now be able to write to this
-   directory (even if it does not yet exist.) Note: this path
-   <emphasis>must</emphasis> exist before restarting the unit. Otherwise,
-   systemd will not include it in the private FoundationDB namespace (and it
-   will not add it dynamically at runtime).
+   Restart the FoundationDB service, and it will now be able to write to this directory (even if it does not yet exist.) Note: this path <emphasis>must</emphasis> exist before restarting the unit. Otherwise, systemd will not include it in the private FoundationDB namespace (and it will not add it dynamically at runtime).
   </para>
 
   <para>
@@ -395,17 +286,13 @@ services.foundationdb.extraReadWritePaths = [ "/opt/fdb-backups" ];
   <title>Known limitations</title>
 
   <para>
-   The FoundationDB setup for NixOS should currently be considered beta.
-   FoundationDB is not new software, but the NixOS compilation and integration
-   has only undergone fairly basic testing of all the available functionality.
+   The FoundationDB setup for NixOS should currently be considered beta. FoundationDB is not new software, but the NixOS compilation and integration has only undergone fairly basic testing of all the available functionality.
   </para>
 
   <itemizedlist>
    <listitem>
     <para>
-     There is no way to specify individual parameters for individual
-     <command>fdbserver</command> processes. Currently, all server processes
-     inherit all the global <command>fdbmonitor</command> settings.
+     There is no way to specify individual parameters for individual <command>fdbserver</command> processes. Currently, all server processes inherit all the global <command>fdbmonitor</command> settings.
     </para>
    </listitem>
    <listitem>
@@ -424,20 +311,14 @@ services.foundationdb.extraReadWritePaths = [ "/opt/fdb-backups" ];
   <title>Options</title>
 
   <para>
-   NixOS's FoundationDB module allows you to configure all of the most relevant
-   configuration options for <command>fdbmonitor</command>, matching it quite
-   closely. A complete list of options for the FoundationDB module may be found
-   <link linkend="opt-services.foundationdb.enable">here</link>. You should
-   also read the FoundationDB documentation as well.
+   NixOS's FoundationDB module allows you to configure all of the most relevant configuration options for <command>fdbmonitor</command>, matching it quite closely. A complete list of options for the FoundationDB module may be found <link linkend="opt-services.foundationdb.enable">here</link>. You should also read the FoundationDB documentation as well.
   </para>
  </section>
  <section xml:id="module-services-foundationdb-full-docs">
   <title>Full documentation</title>
 
   <para>
-   FoundationDB is a complex piece of software, and requires careful
-   administration to properly use. Full documentation for administration can be
-   found here: <link xlink:href="https://apple.github.io/foundationdb/"/>.
+   FoundationDB is a complex piece of software, and requires careful administration to properly use. Full documentation for administration can be found here: <link xlink:href="https://apple.github.io/foundationdb/"/>.
   </para>
  </section>
 </chapter>
diff --git a/nixos/modules/services/databases/postgresql.xml b/nixos/modules/services/databases/postgresql.xml
index 72d4a8249a3..dc1bfb125a7 100644
--- a/nixos/modules/services/databases/postgresql.xml
+++ b/nixos/modules/services/databases/postgresql.xml
@@ -7,12 +7,10 @@
 <!-- FIXME: render nicely -->
 <!-- FIXME: source can be added automatically -->
  <para>
-  <emphasis>Source:</emphasis>
-  <filename>modules/services/databases/postgresql.nix</filename>
+  <emphasis>Source:</emphasis> <filename>modules/services/databases/postgresql.nix</filename>
  </para>
  <para>
-  <emphasis>Upstream documentation:</emphasis>
-  <link xlink:href="http://www.postgresql.org/docs/"/>
+  <emphasis>Upstream documentation:</emphasis> <link xlink:href="http://www.postgresql.org/docs/"/>
  </para>
 <!-- FIXME: more stuff, like maintainer? -->
  <para>
@@ -23,18 +21,12 @@
   <title>Configuring</title>
 
   <para>
-   To enable PostgreSQL, add the following to your
-   <filename>configuration.nix</filename>:
+   To enable PostgreSQL, add the following to your <filename>configuration.nix</filename>:
 <programlisting>
 <xref linkend="opt-services.postgresql.enable"/> = true;
 <xref linkend="opt-services.postgresql.package"/> = pkgs.postgresql_11;
 </programlisting>
-   Note that you are required to specify the desired version of PostgreSQL
-   (e.g. <literal>pkgs.postgresql_11</literal>). Since upgrading your
-   PostgreSQL version requires a database dump and reload (see below), NixOS
-   cannot provide a default value for
-   <xref linkend="opt-services.postgresql.package"/> such as the most recent
-   release of PostgreSQL.
+   Note that you are required to specify the desired version of PostgreSQL (e.g. <literal>pkgs.postgresql_11</literal>). Since upgrading your PostgreSQL version requires a database dump and reload (see below), NixOS cannot provide a default value for <xref linkend="opt-services.postgresql.package"/> such as the most recent release of PostgreSQL.
   </para>
 
 <!--
@@ -51,9 +43,7 @@ Type "help" for help.
 -->
 
   <para>
-   By default, PostgreSQL stores its databases in
-   <filename>/var/lib/postgresql/$psqlSchema</filename>. You can override this using
-   <xref linkend="opt-services.postgresql.dataDir"/>, e.g.
+   By default, PostgreSQL stores its databases in <filename>/var/lib/postgresql/$psqlSchema</filename>. You can override this using <xref linkend="opt-services.postgresql.dataDir"/>, e.g.
 <programlisting>
 <xref linkend="opt-services.postgresql.dataDir"/> = "/data/postgresql";
 </programlisting>
@@ -70,18 +60,14 @@ Type "help" for help.
   <title>Options</title>
 
   <para>
-   A complete list of options for the PostgreSQL module may be found
-   <link linkend="opt-services.postgresql.enable">here</link>.
+   A complete list of options for the PostgreSQL module may be found <link linkend="opt-services.postgresql.enable">here</link>.
   </para>
  </section>
  <section xml:id="module-services-postgres-plugins">
   <title>Plugins</title>
 
   <para>
-   Plugins collection for each PostgreSQL version can be accessed with
-   <literal>.pkgs</literal>. For example, for
-   <literal>pkgs.postgresql_11</literal> package, its plugin collection is
-   accessed by <literal>pkgs.postgresql_11.pkgs</literal>:
+   Plugins collection for each PostgreSQL version can be accessed with <literal>.pkgs</literal>. For example, for <literal>pkgs.postgresql_11</literal> package, its plugin collection is accessed by <literal>pkgs.postgresql_11.pkgs</literal>:
 <screen>
 <prompt>$ </prompt>nix repl '&lt;nixpkgs&gt;'
 
@@ -98,8 +84,9 @@ postgresql_11.pkgs.pg_partman        postgresql_11.pkgs.pgroonga
 ...
 </screen>
   </para>
+
   <para>
-    To add plugins via NixOS configuration, set <literal>services.postgresql.extraPlugins</literal>:
+   To add plugins via NixOS configuration, set <literal>services.postgresql.extraPlugins</literal>:
 <programlisting>
 <xref linkend="opt-services.postgresql.package"/> = pkgs.postgresql_11;
 <xref linkend="opt-services.postgresql.extraPlugins"/> = with pkgs.postgresql_11.pkgs; [
@@ -108,10 +95,9 @@ postgresql_11.pkgs.pg_partman        postgresql_11.pkgs.pgroonga
 ];
 </programlisting>
   </para>
+
   <para>
-   You can build custom PostgreSQL-with-plugins (to be used outside of NixOS) using
-   function <literal>.withPackages</literal>. For example, creating a custom
-   PostgreSQL package in an overlay can look like:
+   You can build custom PostgreSQL-with-plugins (to be used outside of NixOS) using function <literal>.withPackages</literal>. For example, creating a custom PostgreSQL package in an overlay can look like:
 <programlisting>
 self: super: {
   postgresql_custom = self.postgresql_11.withPackages (ps: [
@@ -121,8 +107,9 @@ self: super: {
 }
 </programlisting>
   </para>
+
   <para>
-    Here's a recipe on how to override a particular plugin through an overlay:
+   Here's a recipe on how to override a particular plugin through an overlay:
 <programlisting>
 self: super: {
   postgresql_11 = super.postgresql_11.override { this = self.postgresql_11; } // {
diff --git a/nixos/modules/services/desktops/flatpak.xml b/nixos/modules/services/desktops/flatpak.xml
index 8f080b25022..3b2ccd12cf5 100644
--- a/nixos/modules/services/desktops/flatpak.xml
+++ b/nixos/modules/services/desktops/flatpak.xml
@@ -5,44 +5,33 @@
          xml:id="module-services-flatpak">
  <title>Flatpak</title>
  <para>
-  <emphasis>Source:</emphasis>
-  <filename>modules/services/desktop/flatpak.nix</filename>
+  <emphasis>Source:</emphasis> <filename>modules/services/desktop/flatpak.nix</filename>
  </para>
  <para>
-  <emphasis>Upstream documentation:</emphasis>
-  <link xlink:href="https://github.com/flatpak/flatpak/wiki"/>
+  <emphasis>Upstream documentation:</emphasis> <link xlink:href="https://github.com/flatpak/flatpak/wiki"/>
  </para>
  <para>
-  Flatpak is a system for building, distributing, and running sandboxed desktop
-  applications on Linux.
+  Flatpak is a system for building, distributing, and running sandboxed desktop applications on Linux.
  </para>
  <para>
-  To enable Flatpak, add the following to your
-  <filename>configuration.nix</filename>:
+  To enable Flatpak, add the following to your <filename>configuration.nix</filename>:
 <programlisting>
   <xref linkend="opt-services.flatpak.enable"/> = true;
 </programlisting>
  </para>
  <para>
-  For the sandboxed apps to work correctly, desktop integration portals need to
-  be installed. If you run GNOME, this will be handled automatically for you;
-  in other cases, you will need to add something like the following to your
-  <filename>configuration.nix</filename>:
+  For the sandboxed apps to work correctly, desktop integration portals need to be installed. If you run GNOME, this will be handled automatically for you; in other cases, you will need to add something like the following to your <filename>configuration.nix</filename>:
 <programlisting>
   <xref linkend="opt-xdg.portal.extraPortals"/> = [ pkgs.xdg-desktop-portal-gtk ];
 </programlisting>
  </para>
  <para>
-  Then, you will need to add a repository, for example,
-  <link xlink:href="https://github.com/flatpak/flatpak/wiki">Flathub</link>,
-  either using the following commands:
+  Then, you will need to add a repository, for example, <link xlink:href="https://github.com/flatpak/flatpak/wiki">Flathub</link>, either using the following commands:
 <screen>
 <prompt>$ </prompt>flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
 <prompt>$ </prompt>flatpak update
 </screen>
-  or by opening the
-  <link xlink:href="https://flathub.org/repo/flathub.flatpakrepo">repository
-  file</link> in GNOME Software.
+  or by opening the <link xlink:href="https://flathub.org/repo/flathub.flatpakrepo">repository file</link> in GNOME Software.
  </para>
  <para>
   Finally, you can search and install programs:
diff --git a/nixos/modules/services/editors/emacs.xml b/nixos/modules/services/editors/emacs.xml
index 03483f69fa2..0213b8971c2 100644
--- a/nixos/modules/services/editors/emacs.xml
+++ b/nixos/modules/services/editors/emacs.xml
@@ -12,41 +12,26 @@
       Adam Hoese @adisbladis
   -->
  <para>
-  <link xlink:href="https://www.gnu.org/software/emacs/">Emacs</link> is an
-  extensible, customizable, self-documenting real-time display editor — and
-  more. At its core is an interpreter for Emacs Lisp, a dialect of the Lisp
-  programming language with extensions to support text editing.
+  <link xlink:href="https://www.gnu.org/software/emacs/">Emacs</link> is an extensible, customizable, self-documenting real-time display editor — and more. At its core is an interpreter for Emacs Lisp, a dialect of the Lisp programming language with extensions to support text editing.
  </para>
  <para>
-  Emacs runs within a graphical desktop environment using the X Window System,
-  but works equally well on a text terminal. Under
-  <productname>macOS</productname>, a "Mac port" edition is available, which
-  uses Apple's native GUI frameworks.
+  Emacs runs within a graphical desktop environment using the X Window System, but works equally well on a text terminal. Under <productname>macOS</productname>, a "Mac port" edition is available, which uses Apple's native GUI frameworks.
  </para>
  <para>
-  <productname>Nixpkgs</productname> provides a superior environment for
-  running <application>Emacs</application>. It's simple to create custom builds
-  by overriding the default packages. Chaotic collections of Emacs Lisp code
-  and extensions can be brought under control using declarative package
-  management. <productname>NixOS</productname> even provides a
-  <command>systemd</command> user service for automatically starting the Emacs
-  daemon.
+  <productname>Nixpkgs</productname> provides a superior environment for running <application>Emacs</application>. It's simple to create custom builds by overriding the default packages. Chaotic collections of Emacs Lisp code and extensions can be brought under control using declarative package management. <productname>NixOS</productname> even provides a <command>systemd</command> user service for automatically starting the Emacs daemon.
  </para>
  <section xml:id="module-services-emacs-installing">
   <title>Installing <application>Emacs</application></title>
 
   <para>
-   Emacs can be installed in the normal way for Nix (see
-   <xref linkend="sec-package-management" />). In addition, a NixOS
-   <emphasis>service</emphasis> can be enabled.
+   Emacs can be installed in the normal way for Nix (see <xref linkend="sec-package-management" />). In addition, a NixOS <emphasis>service</emphasis> can be enabled.
   </para>
 
   <section xml:id="module-services-emacs-releases">
    <title>The Different Releases of Emacs</title>
 
    <para>
-    <productname>Nixpkgs</productname> defines several basic Emacs packages.
-    The following are attributes belonging to the <varname>pkgs</varname> set:
+    <productname>Nixpkgs</productname> defines several basic Emacs packages. The following are attributes belonging to the <varname>pkgs</varname> set:
     <variablelist>
      <varlistentry>
       <term>
@@ -57,10 +42,8 @@
       </term>
       <listitem>
        <para>
-        The latest stable version of Emacs 25 using the
-        <link
-                xlink:href="http://www.gtk.org">GTK 2</link>
-        widget toolkit.
+        The latest stable version of Emacs 25 using the <link
+                xlink:href="http://www.gtk.org">GTK 2</link> widget toolkit.
        </para>
       </listitem>
      </varlistentry>
@@ -83,8 +66,7 @@
       </term>
       <listitem>
        <para>
-        Emacs 25 with the "Mac port" patches, providing a more native look and
-        feel under macOS.
+        Emacs 25 with the "Mac port" patches, providing a more native look and feel under macOS.
        </para>
       </listitem>
      </varlistentry>
@@ -92,12 +74,7 @@
    </para>
 
    <para>
-    If those aren't suitable, then the following imitation Emacs editors are
-    also available in Nixpkgs:
-    <link xlink:href="https://www.gnu.org/software/zile/">Zile</link>,
-    <link xlink:href="http://homepage.boetes.org/software/mg/">mg</link>,
-    <link xlink:href="http://yi-editor.github.io/">Yi</link>,
-    <link xlink:href="https://joe-editor.sourceforge.io/">jmacs</link>.
+    If those aren't suitable, then the following imitation Emacs editors are also available in Nixpkgs: <link xlink:href="https://www.gnu.org/software/zile/">Zile</link>, <link xlink:href="http://homepage.boetes.org/software/mg/">mg</link>, <link xlink:href="http://yi-editor.github.io/">Yi</link>, <link xlink:href="https://joe-editor.sourceforge.io/">jmacs</link>.
    </para>
   </section>
 
@@ -105,36 +82,20 @@
    <title>Adding Packages to Emacs</title>
 
    <para>
-    Emacs includes an entire ecosystem of functionality beyond text editing,
-    including a project planner, mail and news reader, debugger interface,
-    calendar, and more.
+    Emacs includes an entire ecosystem of functionality beyond text editing, including a project planner, mail and news reader, debugger interface, calendar, and more.
    </para>
 
    <para>
-    Most extensions are gotten with the Emacs packaging system
-    (<filename>package.el</filename>) from
-    <link
-        xlink:href="https://elpa.gnu.org/">Emacs Lisp Package Archive
-    (<acronym>ELPA</acronym>)</link>,
-    <link xlink:href="https://melpa.org/"><acronym>MELPA</acronym></link>,
-    <link xlink:href="https://stable.melpa.org/">MELPA Stable</link>, and
-    <link xlink:href="http://orgmode.org/elpa.html">Org ELPA</link>. Nixpkgs is
-    regularly updated to mirror all these archives.
+    Most extensions are gotten with the Emacs packaging system (<filename>package.el</filename>) from <link
+        xlink:href="https://elpa.gnu.org/">Emacs Lisp Package Archive (<acronym>ELPA</acronym>)</link>, <link xlink:href="https://melpa.org/"><acronym>MELPA</acronym></link>, <link xlink:href="https://stable.melpa.org/">MELPA Stable</link>, and <link xlink:href="http://orgmode.org/elpa.html">Org ELPA</link>. Nixpkgs is regularly updated to mirror all these archives.
    </para>
 
    <para>
-    Under NixOS, you can continue to use
-    <function>package-list-packages</function> and
-    <function>package-install</function> to install packages. You can also
-    declare the set of Emacs packages you need using the derivations from
-    Nixpkgs. The rest of this section discusses declarative installation of
-    Emacs packages through nixpkgs.
+    Under NixOS, you can continue to use <function>package-list-packages</function> and <function>package-install</function> to install packages. You can also declare the set of Emacs packages you need using the derivations from Nixpkgs. The rest of this section discusses declarative installation of Emacs packages through nixpkgs.
    </para>
 
    <para>
-    The first step to declare the list of packages you want in your Emacs
-    installation is to create a dedicated derivation. This can be done in a
-    dedicated <filename>emacs.nix</filename> file such as:
+    The first step to declare the list of packages you want in your Emacs installation is to create a dedicated derivation. This can be done in a dedicated <filename>emacs.nix</filename> file such as:
     <example xml:id="ex-emacsNix">
      <title>Nix expression to build Emacs with packages (<filename>emacs.nix</filename>)</title>
 <programlisting language="nix">
@@ -176,36 +137,27 @@ in
     <calloutlist>
      <callout arearefs="ex-emacsNix-1">
       <para>
-       The first non-comment line in this file (<literal>{ pkgs ? ...
-       }</literal>) indicates that the whole file represents a function.
+       The first non-comment line in this file (<literal>{ pkgs ? ... }</literal>) indicates that the whole file represents a function.
       </para>
      </callout>
      <callout arearefs="ex-emacsNix-2">
       <para>
-       The <varname>let</varname> expression below defines a
-       <varname>myEmacs</varname> binding pointing to the current stable
-       version of Emacs. This binding is here to separate the choice of the
-       Emacs binary from the specification of the required packages.
+       The <varname>let</varname> expression below defines a <varname>myEmacs</varname> binding pointing to the current stable version of Emacs. This binding is here to separate the choice of the Emacs binary from the specification of the required packages.
       </para>
      </callout>
      <callout arearefs="ex-emacsNix-3">
       <para>
-       This generates an <varname>emacsWithPackages</varname> function. It
-       takes a single argument: a function from a package set to a list of
-       packages (the packages that will be available in Emacs).
+       This generates an <varname>emacsWithPackages</varname> function. It takes a single argument: a function from a package set to a list of packages (the packages that will be available in Emacs).
       </para>
      </callout>
      <callout arearefs="ex-emacsNix-4">
       <para>
-       The rest of the file specifies the list of packages to install. In the
-       example, two packages (<varname>magit</varname> and
-       <varname>zerodark-theme</varname>) are taken from MELPA stable.
+       The rest of the file specifies the list of packages to install. In the example, two packages (<varname>magit</varname> and <varname>zerodark-theme</varname>) are taken from MELPA stable.
       </para>
      </callout>
      <callout arearefs="ex-emacsNix-5">
       <para>
-       Two packages (<varname>undo-tree</varname> and
-       <varname>zoom-frm</varname>) are taken from MELPA.
+       Two packages (<varname>undo-tree</varname> and <varname>zoom-frm</varname>) are taken from MELPA.
       </para>
      </callout>
      <callout arearefs="ex-emacsNix-6">
@@ -215,17 +167,14 @@ in
      </callout>
      <callout arearefs="ex-emacsNix-7">
       <para>
-       <varname>notmuch</varname> is taken from a nixpkgs derivation which
-       contains an Emacs mode.
+       <varname>notmuch</varname> is taken from a nixpkgs derivation which contains an Emacs mode.
       </para>
      </callout>
     </calloutlist>
    </para>
 
    <para>
-    The result of this configuration will be an <command>emacs</command>
-    command which launches Emacs with all of your chosen packages in the
-    <varname>load-path</varname>.
+    The result of this configuration will be an <command>emacs</command> command which launches Emacs with all of your chosen packages in the <varname>load-path</varname>.
    </para>
 
    <para>
@@ -234,23 +183,17 @@ in
 <prompt>$ </prompt>nix-build emacs.nix
 <prompt>$ </prompt>./result/bin/emacs -q
 </screen>
-    and then typing <literal>M-x package-initialize</literal>. Check that you
-    can use all the packages you want in this Emacs instance. For example, try
-    switching to the zerodark theme through <literal>M-x load-theme &lt;RET&gt;
-    zerodark &lt;RET&gt; y</literal>.
+    and then typing <literal>M-x package-initialize</literal>. Check that you can use all the packages you want in this Emacs instance. For example, try switching to the zerodark theme through <literal>M-x load-theme &lt;RET&gt; zerodark &lt;RET&gt; y</literal>.
    </para>
 
    <tip>
     <para>
-     A few popular extensions worth checking out are: auctex, company,
-     edit-server, flycheck, helm, iedit, magit, multiple-cursors, projectile,
-     and yasnippet.
+     A few popular extensions worth checking out are: auctex, company, edit-server, flycheck, helm, iedit, magit, multiple-cursors, projectile, and yasnippet.
     </para>
    </tip>
 
    <para>
-    The list of available packages in the various ELPA repositories can be seen
-    with the following commands:
+    The list of available packages in the various ELPA repositories can be seen with the following commands:
     <example xml:id="module-services-emacs-querying-packages">
      <title>Querying Emacs packages</title>
 <programlisting><![CDATA[
@@ -263,10 +206,7 @@ nix-env -f "<nixpkgs>" -qaP -A emacsPackages.orgPackages
    </para>
 
    <para>
-    If you are on NixOS, you can install this particular Emacs for all users by
-    adding it to the list of system packages (see
-    <xref linkend="sec-declarative-package-mgmt" />). Simply modify your file
-    <filename>configuration.nix</filename> to make it contain:
+    If you are on NixOS, you can install this particular Emacs for all users by adding it to the list of system packages (see <xref linkend="sec-declarative-package-mgmt" />). Simply modify your file <filename>configuration.nix</filename> to make it contain:
     <example xml:id="module-services-emacs-configuration-nix">
      <title>Custom Emacs in <filename>configuration.nix</filename></title>
 <programlisting><![CDATA[
@@ -281,9 +221,7 @@ nix-env -f "<nixpkgs>" -qaP -A emacsPackages.orgPackages
    </para>
 
    <para>
-    In this case, the next <command>nixos-rebuild switch</command> will take
-    care of adding your <command>emacs</command> to the <varname>PATH</varname>
-    environment variable (see <xref linkend="sec-changing-config" />).
+    In this case, the next <command>nixos-rebuild switch</command> will take care of adding your <command>emacs</command> to the <varname>PATH</varname> environment variable (see <xref linkend="sec-changing-config" />).
    </para>
 
 <!-- fixme: i think the following is better done with config.nix
@@ -291,11 +229,7 @@ https://nixos.org/nixpkgs/manual/#sec-modify-via-packageOverrides
 -->
 
    <para>
-    If you are not on NixOS or want to install this particular Emacs only for
-    yourself, you can do so by adding it to your
-    <filename>~/.config/nixpkgs/config.nix</filename> (see
-    <link xlink:href="http://nixos.org/nixpkgs/manual/#sec-modify-via-packageOverrides">Nixpkgs
-    manual</link>):
+    If you are not on NixOS or want to install this particular Emacs only for yourself, you can do so by adding it to your <filename>~/.config/nixpkgs/config.nix</filename> (see <link xlink:href="http://nixos.org/nixpkgs/manual/#sec-modify-via-packageOverrides">Nixpkgs manual</link>):
     <example xml:id="module-services-emacs-config-nix">
      <title>Custom Emacs in <filename>~/.config/nixpkgs/config.nix</filename></title>
 <programlisting><![CDATA[
@@ -309,9 +243,7 @@ https://nixos.org/nixpkgs/manual/#sec-modify-via-packageOverrides
    </para>
 
    <para>
-    In this case, the next <literal>nix-env -f '&lt;nixpkgs&gt;' -iA
-    myemacs</literal> will take care of adding your emacs to the
-    <varname>PATH</varname> environment variable.
+    In this case, the next <literal>nix-env -f '&lt;nixpkgs&gt;' -iA myemacs</literal> will take care of adding your emacs to the <varname>PATH</varname> environment variable.
    </para>
   </section>
 
@@ -319,12 +251,7 @@ https://nixos.org/nixpkgs/manual/#sec-modify-via-packageOverrides
    <title>Advanced Emacs Configuration</title>
 
    <para>
-    If you want, you can tweak the Emacs package itself from your
-    <filename>emacs.nix</filename>. For example, if you want to have a
-    GTK 3-based Emacs instead of the default GTK 2-based binary and remove the
-    automatically generated <filename>emacs.desktop</filename> (useful is you
-    only use <command>emacsclient</command>), you can change your file
-    <filename>emacs.nix</filename> in this way:
+    If you want, you can tweak the Emacs package itself from your <filename>emacs.nix</filename>. For example, if you want to have a GTK 3-based Emacs instead of the default GTK 2-based binary and remove the automatically generated <filename>emacs.desktop</filename> (useful is you only use <command>emacsclient</command>), you can change your file <filename>emacs.nix</filename> in this way:
    </para>
 
    <example xml:id="ex-emacsGtk3Nix">
@@ -348,8 +275,7 @@ in [...]
    </example>
 
    <para>
-    After building this file as shown in <xref linkend="ex-emacsNix" />, you
-    will get an GTK 3-based Emacs binary pre-loaded with your favorite packages.
+    After building this file as shown in <xref linkend="ex-emacsNix" />, you will get an GTK 3-based Emacs binary pre-loaded with your favorite packages.
    </para>
   </section>
  </section>
@@ -357,23 +283,18 @@ in [...]
   <title>Running Emacs as a Service</title>
 
   <para>
-   <productname>NixOS</productname> provides an optional
-   <command>systemd</command> service which launches
-   <link xlink:href="https://www.gnu.org/software/emacs/manual/html_node/emacs/Emacs-Server.html">
-   Emacs daemon </link> with the user's login session.
+   <productname>NixOS</productname> provides an optional <command>systemd</command> service which launches <link xlink:href="https://www.gnu.org/software/emacs/manual/html_node/emacs/Emacs-Server.html"> Emacs daemon </link> with the user's login session.
   </para>
 
   <para>
-   <emphasis>Source:</emphasis>
-   <filename>modules/services/editors/emacs.nix</filename>
+   <emphasis>Source:</emphasis> <filename>modules/services/editors/emacs.nix</filename>
   </para>
 
   <section xml:id="module-services-emacs-enabling">
    <title>Enabling the Service</title>
 
    <para>
-    To install and enable the <command>systemd</command> user service for Emacs
-    daemon, add the following to your <filename>configuration.nix</filename>:
+    To install and enable the <command>systemd</command> user service for Emacs daemon, add the following to your <filename>configuration.nix</filename>:
 <programlisting>
 <xref linkend="opt-services.emacs.enable"/> = true;
 <xref linkend="opt-services.emacs.package"/> = import /home/cassou/.emacs.d { pkgs = pkgs; };
@@ -381,16 +302,11 @@ in [...]
    </para>
 
    <para>
-    The <varname>services.emacs.package</varname> option allows a custom
-    derivation to be used, for example, one created by
-    <function>emacsWithPackages</function>.
+    The <varname>services.emacs.package</varname> option allows a custom derivation to be used, for example, one created by <function>emacsWithPackages</function>.
    </para>
 
    <para>
-    Ensure that the Emacs server is enabled for your user's Emacs
-    configuration, either by customizing the <varname>server-mode</varname>
-    variable, or by adding <literal>(server-start)</literal> to
-    <filename>~/.emacs.d/init.el</filename>.
+    Ensure that the Emacs server is enabled for your user's Emacs configuration, either by customizing the <varname>server-mode</varname> variable, or by adding <literal>(server-start)</literal> to <filename>~/.emacs.d/init.el</filename>.
    </para>
 
    <para>
@@ -408,9 +324,7 @@ in [...]
    <title>Starting the client</title>
 
    <para>
-    Ensure that the emacs server is enabled, either by customizing the
-    <varname>server-mode</varname> variable, or by adding
-    <literal>(server-start)</literal> to <filename>~/.emacs</filename>.
+    Ensure that the emacs server is enabled, either by customizing the <varname>server-mode</varname> variable, or by adding <literal>(server-start)</literal> to <filename>~/.emacs</filename>.
    </para>
 
    <para>
@@ -429,23 +343,15 @@ emacsclient --create-frame --tty  # opens a new frame on the current terminal
 <!--<title><command>emacsclient</command> as the Default Editor</title>-->
 
    <para>
-    If <xref linkend="opt-services.emacs.defaultEditor"/> is
-    <literal>true</literal>, the <varname>EDITOR</varname> variable will be set
-    to a wrapper script which launches <command>emacsclient</command>.
+    If <xref linkend="opt-services.emacs.defaultEditor"/> is <literal>true</literal>, the <varname>EDITOR</varname> variable will be set to a wrapper script which launches <command>emacsclient</command>.
    </para>
 
    <para>
-    Any setting of <varname>EDITOR</varname> in the shell config files will
-    override <varname>services.emacs.defaultEditor</varname>. To make sure
-    <varname>EDITOR</varname> refers to the Emacs wrapper script, remove any
-    existing <varname>EDITOR</varname> assignment from
-    <filename>.profile</filename>, <filename>.bashrc</filename>,
-    <filename>.zshenv</filename> or any other shell config file.
+    Any setting of <varname>EDITOR</varname> in the shell config files will override <varname>services.emacs.defaultEditor</varname>. To make sure <varname>EDITOR</varname> refers to the Emacs wrapper script, remove any existing <varname>EDITOR</varname> assignment from <filename>.profile</filename>, <filename>.bashrc</filename>, <filename>.zshenv</filename> or any other shell config file.
    </para>
 
    <para>
-    If you have formed certain bad habits when editing files, these can be
-    corrected with a shell alias to the wrapper script:
+    If you have formed certain bad habits when editing files, these can be corrected with a shell alias to the wrapper script:
 <programlisting>alias vi=$EDITOR</programlisting>
    </para>
   </section>
@@ -454,10 +360,7 @@ emacsclient --create-frame --tty  # opens a new frame on the current terminal
    <title>Per-User Enabling of the Service</title>
 
    <para>
-    In general, <command>systemd</command> user services are globally enabled
-    by symlinks in <filename>/etc/systemd/user</filename>. In the case where
-    Emacs daemon is not wanted for all users, it is possible to install the
-    service but not globally enable it:
+    In general, <command>systemd</command> user services are globally enabled by symlinks in <filename>/etc/systemd/user</filename>. In the case where Emacs daemon is not wanted for all users, it is possible to install the service but not globally enable it:
 <programlisting>
 <xref linkend="opt-services.emacs.enable"/> = false;
 <xref linkend="opt-services.emacs.install"/> = true;
@@ -465,11 +368,9 @@ emacsclient --create-frame --tty  # opens a new frame on the current terminal
    </para>
 
    <para>
-    To enable the <command>systemd</command> user service for just the
-    currently logged in user, run:
+    To enable the <command>systemd</command> user service for just the currently logged in user, run:
 <programlisting>systemctl --user enable emacs</programlisting>
-    This will add the symlink
-    <filename>~/.config/systemd/user/emacs.service</filename>.
+    This will add the symlink <filename>~/.config/systemd/user/emacs.service</filename>.
    </para>
   </section>
  </section>
@@ -477,8 +378,7 @@ emacsclient --create-frame --tty  # opens a new frame on the current terminal
   <title>Configuring Emacs</title>
 
   <para>
-   The Emacs init file should be changed to load the extension packages at
-   startup:
+   The Emacs init file should be changed to load the extension packages at startup:
    <example xml:id="module-services-emacs-package-initialisation">
     <title>Package initialization in <filename>.emacs</filename></title>
 <programlisting><![CDATA[
@@ -494,10 +394,7 @@ emacsclient --create-frame --tty  # opens a new frame on the current terminal
   </para>
 
   <para>
-   After the declarative emacs package configuration has been tested,
-   previously downloaded packages can be cleaned up by removing
-   <filename>~/.emacs.d/elpa</filename> (do make a backup first, in case you
-   forgot a package).
+   After the declarative emacs package configuration has been tested, previously downloaded packages can be cleaned up by removing <filename>~/.emacs.d/elpa</filename> (do make a backup first, in case you forgot a package).
   </para>
 
 <!--
@@ -509,9 +406,7 @@ emacsclient --create-frame --tty  # opens a new frame on the current terminal
    <title>A Major Mode for Nix Expressions</title>
 
    <para>
-    Of interest may be <varname>melpaPackages.nix-mode</varname>, which
-    provides syntax highlighting for the Nix language. This is particularly
-    convenient if you regularly edit Nix files.
+    Of interest may be <varname>melpaPackages.nix-mode</varname>, which provides syntax highlighting for the Nix language. This is particularly convenient if you regularly edit Nix files.
    </para>
   </section>
 
@@ -519,9 +414,7 @@ emacsclient --create-frame --tty  # opens a new frame on the current terminal
    <title>Accessing man pages</title>
 
    <para>
-    You can use <function>woman</function> to get completion of all available
-    man pages. For example, type <literal>M-x woman &lt;RET&gt; nixos-rebuild
-    &lt;RET&gt;.</literal>
+    You can use <function>woman</function> to get completion of all available man pages. For example, type <literal>M-x woman &lt;RET&gt; nixos-rebuild &lt;RET&gt;.</literal>
    </para>
   </section>
 
@@ -529,29 +422,17 @@ emacsclient --create-frame --tty  # opens a new frame on the current terminal
    <title>Editing DocBook 5 XML Documents</title>
 
    <para>
-    Emacs includes
-    <link
-      xlink:href="https://www.gnu.org/software/emacs/manual/html_node/nxml-mode/Introduction.html">nXML</link>,
-    a major-mode for validating and editing XML documents. When editing DocBook
-    5.0 documents, such as <link linkend="book-nixos-manual">this one</link>,
-    nXML needs to be configured with the relevant schema, which is not
-    included.
+    Emacs includes <link
+      xlink:href="https://www.gnu.org/software/emacs/manual/html_node/nxml-mode/Introduction.html">nXML</link>, a major-mode for validating and editing XML documents. When editing DocBook 5.0 documents, such as <link linkend="book-nixos-manual">this one</link>, nXML needs to be configured with the relevant schema, which is not included.
    </para>
 
    <para>
-    To install the DocBook 5.0 schemas, either add
-    <varname>pkgs.docbook5</varname> to
-    <xref linkend="opt-environment.systemPackages"/>
-    (<link
-      linkend="sec-declarative-package-mgmt">NixOS</link>), or run
-    <literal>nix-env -f '&lt;nixpkgs&gt;' -iA docbook5</literal>
-    (<link linkend="sec-ad-hoc-packages">Nix</link>).
+    To install the DocBook 5.0 schemas, either add <varname>pkgs.docbook5</varname> to <xref linkend="opt-environment.systemPackages"/> (<link
+      linkend="sec-declarative-package-mgmt">NixOS</link>), or run <literal>nix-env -f '&lt;nixpkgs&gt;' -iA docbook5</literal> (<link linkend="sec-ad-hoc-packages">Nix</link>).
    </para>
 
    <para>
-    Then customize the variable <varname>rng-schema-locating-files</varname> to
-    include <filename>~/.emacs.d/schemas.xml</filename> and put the following
-    text into that file:
+    Then customize the variable <varname>rng-schema-locating-files</varname> to include <filename>~/.emacs.d/schemas.xml</filename> and put the following text into that file:
     <example xml:id="ex-emacs-docbook-xml">
      <title>nXML Schema Configuration (<filename>~/.emacs.d/schemas.xml</filename>)</title>
 <programlisting language="xml"><![CDATA[
diff --git a/nixos/modules/services/hardware/trezord.xml b/nixos/modules/services/hardware/trezord.xml
index 972d409d9d0..4af6e1ad7cc 100644
--- a/nixos/modules/services/hardware/trezord.xml
+++ b/nixos/modules/services/hardware/trezord.xml
@@ -5,16 +5,10 @@
          xml:id="trezor">
  <title>Trezor</title>
  <para>
-  Trezor is an open-source cryptocurrency hardware wallet and security token
-  allowing secure storage of private keys.
+  Trezor is an open-source cryptocurrency hardware wallet and security token allowing secure storage of private keys.
  </para>
  <para>
-  It offers advanced features such U2F two-factor authorization, SSH login
-  through
-  <link xlink:href="https://wiki.trezor.io/Apps:SSH_agent">Trezor SSH agent</link>,
-  <link xlink:href="https://wiki.trezor.io/GPG">GPG</link> and a
-  <link xlink:href="https://wiki.trezor.io/Trezor_Password_Manager">password manager</link>.
-  For more information, guides and documentation, see <link xlink:href="https://wiki.trezor.io"/>.
+  It offers advanced features such U2F two-factor authorization, SSH login through <link xlink:href="https://wiki.trezor.io/Apps:SSH_agent">Trezor SSH agent</link>, <link xlink:href="https://wiki.trezor.io/GPG">GPG</link> and a <link xlink:href="https://wiki.trezor.io/Trezor_Password_Manager">password manager</link>. For more information, guides and documentation, see <link xlink:href="https://wiki.trezor.io"/>.
  </para>
  <para>
   To enable Trezor support, add the following to your <filename>configuration.nix</filename>:
diff --git a/nixos/modules/services/misc/gitlab.xml b/nixos/modules/services/misc/gitlab.xml
index b6171a9a194..a59f8919a47 100644
--- a/nixos/modules/services/misc/gitlab.xml
+++ b/nixos/modules/services/misc/gitlab.xml
@@ -11,14 +11,11 @@
   <title>Prerequisites</title>
 
   <para>
-   The gitlab service exposes only an Unix socket at
-   <literal>/run/gitlab/gitlab-workhorse.socket</literal>. You need to
-   configure a webserver to proxy HTTP requests to the socket.
+   The gitlab service exposes only an Unix socket at <literal>/run/gitlab/gitlab-workhorse.socket</literal>. You need to configure a webserver to proxy HTTP requests to the socket.
   </para>
 
   <para>
-   For instance, the following configuration could be used to use nginx as
-   frontend proxy:
+   For instance, the following configuration could be used to use nginx as frontend proxy:
 <programlisting>
 <link linkend="opt-services.nginx.enable">services.nginx</link> = {
   <link linkend="opt-services.nginx.enable">enable</link> = true;
@@ -39,14 +36,11 @@
   <title>Configuring</title>
 
   <para>
-   Gitlab depends on both PostgreSQL and Redis and will automatically enable
-   both services. In the case of PostgreSQL, a database and a role will be
-   created.
+   Gitlab depends on both PostgreSQL and Redis and will automatically enable both services. In the case of PostgreSQL, a database and a role will be created.
   </para>
 
   <para>
-   The default state dir is <literal>/var/gitlab/state</literal>. This is where
-   all data like the repositories and uploads will be stored.
+   The default state dir is <literal>/var/gitlab/state</literal>. This is where all data like the repositories and uploads will be stored.
   </para>
 
   <para>
@@ -85,31 +79,19 @@ services.gitlab = {
   </para>
 
   <para>
-   If you're setting up a new Gitlab instance, generate new
-   secrets. You for instance use <literal>tr -dc A-Za-z0-9 &lt;
-   /dev/urandom | head -c 128 &gt; /var/keys/gitlab/db</literal> to
-   generate a new db secret. Make sure the files can be read by, and
-   only by, the user specified by <link
-   linkend="opt-services.gitlab.user">services.gitlab.user</link>. Gitlab
-   encrypts sensitive data stored in the database. If you're restoring
-   an existing Gitlab instance, you must specify the secrets secret
-   from <literal>config/secrets.yml</literal> located in your Gitlab
-   state folder.
+   If you're setting up a new Gitlab instance, generate new secrets. You for instance use <literal>tr -dc A-Za-z0-9 &lt; /dev/urandom | head -c 128 &gt; /var/keys/gitlab/db</literal> to generate a new db secret. Make sure the files can be read by, and only by, the user specified by <link
+   linkend="opt-services.gitlab.user">services.gitlab.user</link>. Gitlab encrypts sensitive data stored in the database. If you're restoring an existing Gitlab instance, you must specify the secrets secret from <literal>config/secrets.yml</literal> located in your Gitlab state folder.
   </para>
 
   <para>
-   Refer to <xref linkend="ch-options" /> for all available configuration
-   options for the
-   <link linkend="opt-services.gitlab.enable">services.gitlab</link> module.
+   Refer to <xref linkend="ch-options" /> for all available configuration options for the <link linkend="opt-services.gitlab.enable">services.gitlab</link> module.
   </para>
  </section>
  <section xml:id="module-services-gitlab-maintenance">
   <title>Maintenance</title>
 
   <para>
-   You can run Gitlab's rake tasks with <literal>gitlab-rake</literal> which
-   will be available on the system when gitlab is enabled. You will have to run
-   the command as the user that you configured to run gitlab with.
+   You can run Gitlab's rake tasks with <literal>gitlab-rake</literal> which will be available on the system when gitlab is enabled. You will have to run the command as the user that you configured to run gitlab with.
   </para>
 
   <para>
diff --git a/nixos/modules/services/misc/taskserver/doc.xml b/nixos/modules/services/misc/taskserver/doc.xml
index 5656bb85b37..902ed14940e 100644
--- a/nixos/modules/services/misc/taskserver/doc.xml
+++ b/nixos/modules/services/misc/taskserver/doc.xml
@@ -4,87 +4,58 @@
     xml:id="module-taskserver">
  <title>Taskserver</title>
  <para>
-  Taskserver is the server component of
-  <link xlink:href="https://taskwarrior.org/">Taskwarrior</link>, a free and
-  open source todo list application.
+  Taskserver is the server component of <link xlink:href="https://taskwarrior.org/">Taskwarrior</link>, a free and open source todo list application.
  </para>
  <para>
-  <emphasis>Upstream documentation:</emphasis>
-  <link xlink:href="https://taskwarrior.org/docs/#taskd"/>
+  <emphasis>Upstream documentation:</emphasis> <link xlink:href="https://taskwarrior.org/docs/#taskd"/>
  </para>
  <section xml:id="module-services-taskserver-configuration">
   <title>Configuration</title>
 
   <para>
-   Taskserver does all of its authentication via TLS using client certificates,
-   so you either need to roll your own CA or purchase a certificate from a
-   known CA, which allows creation of client certificates. These certificates
-   are usually advertised as <quote>server certificates</quote>.
+   Taskserver does all of its authentication via TLS using client certificates, so you either need to roll your own CA or purchase a certificate from a known CA, which allows creation of client certificates. These certificates are usually advertised as <quote>server certificates</quote>.
   </para>
 
   <para>
-   So in order to make it easier to handle your own CA, there is a helper tool
-   called <command>nixos-taskserver</command> which manages the custom CA along
-   with Taskserver organisations, users and groups.
+   So in order to make it easier to handle your own CA, there is a helper tool called <command>nixos-taskserver</command> which manages the custom CA along with Taskserver organisations, users and groups.
   </para>
 
   <para>
-   While the client certificates in Taskserver only authenticate whether a user
-   is allowed to connect, every user has its own UUID which identifies it as an
-   entity.
+   While the client certificates in Taskserver only authenticate whether a user is allowed to connect, every user has its own UUID which identifies it as an entity.
   </para>
 
   <para>
-   With <command>nixos-taskserver</command> the client certificate is created
-   along with the UUID of the user, so it handles all of the credentials needed
-   in order to setup the Taskwarrior client to work with a Taskserver.
+   With <command>nixos-taskserver</command> the client certificate is created along with the UUID of the user, so it handles all of the credentials needed in order to setup the Taskwarrior client to work with a Taskserver.
   </para>
  </section>
  <section xml:id="module-services-taskserver-nixos-taskserver-tool">
   <title>The nixos-taskserver tool</title>
 
   <para>
-   Because Taskserver by default only provides scripts to setup users
-   imperatively, the <command>nixos-taskserver</command> tool is used for
-   addition and deletion of organisations along with users and groups defined
-   by <xref linkend="opt-services.taskserver.organisations"/> and as well for
-   imperative set up.
+   Because Taskserver by default only provides scripts to setup users imperatively, the <command>nixos-taskserver</command> tool is used for addition and deletion of organisations along with users and groups defined by <xref linkend="opt-services.taskserver.organisations"/> and as well for imperative set up.
   </para>
 
   <para>
-   The tool is designed to not interfere if the command is used to manually set
-   up some organisations, users or groups.
+   The tool is designed to not interfere if the command is used to manually set up some organisations, users or groups.
   </para>
 
   <para>
-   For example if you add a new organisation using <command>nixos-taskserver
-   org add foo</command>, the organisation is not modified and deleted no
-   matter what you define in
-   <option>services.taskserver.organisations</option>, even if you're adding
-   the same organisation in that option.
+   For example if you add a new organisation using <command>nixos-taskserver org add foo</command>, the organisation is not modified and deleted no matter what you define in <option>services.taskserver.organisations</option>, even if you're adding the same organisation in that option.
   </para>
 
   <para>
-   The tool is modelled to imitate the official <command>taskd</command>
-   command, documentation for each subcommand can be shown by using the
-   <option>--help</option> switch.
+   The tool is modelled to imitate the official <command>taskd</command> command, documentation for each subcommand can be shown by using the <option>--help</option> switch.
   </para>
  </section>
  <section xml:id="module-services-taskserver-declarative-ca-management">
   <title>Declarative/automatic CA management</title>
 
   <para>
-   Everything is done according to what you specify in the module options,
-   however in order to set up a Taskwarrior client for synchronisation with a
-   Taskserver instance, you have to transfer the keys and certificates to the
-   client machine.
+   Everything is done according to what you specify in the module options, however in order to set up a Taskwarrior client for synchronisation with a Taskserver instance, you have to transfer the keys and certificates to the client machine.
   </para>
 
   <para>
-   This is done using <command>nixos-taskserver user export $orgname
-   $username</command> which is printing a shell script fragment to stdout
-   which can either be used verbatim or adjusted to import the user on the
-   client machine.
+   This is done using <command>nixos-taskserver user export $orgname $username</command> which is printing a shell script fragment to stdout which can either be used verbatim or adjusted to import the user on the client machine.
   </para>
 
   <para>
@@ -97,39 +68,30 @@
   <link linkend="opt-services.taskserver.organisations._name_.users">services.taskserver.organisations.my-company.users</link> = [ "alice" ];
 }
 </screen>
-   This creates an organisation called <literal>my-company</literal> with the
-   user <literal>alice</literal>.
+   This creates an organisation called <literal>my-company</literal> with the user <literal>alice</literal>.
   </para>
 
   <para>
-   Now in order to import the <literal>alice</literal> user to another machine
-   <literal>alicebox</literal>, all we need to do is something like this:
+   Now in order to import the <literal>alice</literal> user to another machine <literal>alicebox</literal>, all we need to do is something like this:
 <screen>
 <prompt>$ </prompt>ssh server nixos-taskserver user export my-company alice | sh
 </screen>
-   Of course, if no SSH daemon is available on the server you can also copy
-   &amp; paste it directly into a shell.
+   Of course, if no SSH daemon is available on the server you can also copy &amp; paste it directly into a shell.
   </para>
 
   <para>
-   After this step the user should be set up and you can start synchronising
-   your tasks for the first time with <command>task sync init</command> on
-   <literal>alicebox</literal>.
+   After this step the user should be set up and you can start synchronising your tasks for the first time with <command>task sync init</command> on <literal>alicebox</literal>.
   </para>
 
   <para>
-   Subsequent synchronisation requests merely require the command <command>task
-   sync</command> after that stage.
+   Subsequent synchronisation requests merely require the command <command>task sync</command> after that stage.
   </para>
  </section>
  <section xml:id="module-services-taskserver-manual-ca-management">
   <title>Manual CA management</title>
 
   <para>
-   If you set any options within
-   <link linkend="opt-services.taskserver.pki.manual.ca.cert">service.taskserver.pki.manual</link>.*,
-   <command>nixos-taskserver</command> won't issue certificates, but you can
-   still use it for adding or removing user accounts.
+   If you set any options within <link linkend="opt-services.taskserver.pki.manual.ca.cert">service.taskserver.pki.manual</link>.*, <command>nixos-taskserver</command> won't issue certificates, but you can still use it for adding or removing user accounts.
   </para>
  </section>
 </chapter>
diff --git a/nixos/modules/services/misc/weechat.xml b/nixos/modules/services/misc/weechat.xml
index 7255edfb9da..34bfffe15d8 100644
--- a/nixos/modules/services/misc/weechat.xml
+++ b/nixos/modules/services/misc/weechat.xml
@@ -5,18 +5,13 @@
          xml:id="module-services-weechat">
  <title>WeeChat</title>
  <para>
-  <link xlink:href="https://weechat.org/">WeeChat</link> is a fast and
-  extensible IRC client.
+  <link xlink:href="https://weechat.org/">WeeChat</link> is a fast and extensible IRC client.
  </para>
  <section xml:id="module-services-weechat-basic-usage">
   <title>Basic Usage</title>
 
   <para>
-   By default, the module creates a
-   <literal><link xlink:href="https://www.freedesktop.org/wiki/Software/systemd/">systemd</link></literal>
-   unit which runs the chat client in a detached
-   <literal><link xlink:href="https://www.gnu.org/software/screen/">screen</link></literal>
-   session.
+   By default, the module creates a <literal><link xlink:href="https://www.freedesktop.org/wiki/Software/systemd/">systemd</link></literal> unit which runs the chat client in a detached <literal><link xlink:href="https://www.gnu.org/software/screen/">screen</link></literal> session.
   </para>
 
   <para>
@@ -31,19 +26,14 @@
   </para>
 
   <para>
-   The service is managed by a dedicated user named <literal>weechat</literal>
-   in the state directory <literal>/var/lib/weechat</literal>.
+   The service is managed by a dedicated user named <literal>weechat</literal> in the state directory <literal>/var/lib/weechat</literal>.
   </para>
  </section>
  <section xml:id="module-services-weechat-reattach">
   <title>Re-attaching to WeeChat</title>
 
   <para>
-   WeeChat runs in a screen session owned by a dedicated user. To explicitly
-   allow your another user to attach to this session, the
-   <literal>screenrc</literal> needs to be tweaked by adding
-   <link xlink:href="https://www.gnu.org/software/screen/manual/html_node/Multiuser.html#Multiuser">multiuser</link>
-   support:
+   WeeChat runs in a screen session owned by a dedicated user. To explicitly allow your another user to attach to this session, the <literal>screenrc</literal> needs to be tweaked by adding <link xlink:href="https://www.gnu.org/software/screen/manual/html_node/Multiuser.html#Multiuser">multiuser</link> support:
 <programlisting>
 {
   <link linkend="opt-programs.screen.screenrc">programs.screen.screenrc</link> = ''
@@ -59,8 +49,7 @@ screen -x weechat/weechat-screen
   </para>
 
   <para>
-   <emphasis>The session name can be changed using
-   <link linkend="opt-services.weechat.sessionName">services.weechat.sessionName.</link></emphasis>
+   <emphasis>The session name can be changed using <link linkend="opt-services.weechat.sessionName">services.weechat.sessionName.</link></emphasis>
   </para>
  </section>
 </chapter>
diff --git a/nixos/modules/services/monitoring/prometheus/exporters.xml b/nixos/modules/services/monitoring/prometheus/exporters.xml
index c2d4b05996a..814e7365584 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters.xml
+++ b/nixos/modules/services/monitoring/prometheus/exporters.xml
@@ -5,17 +5,13 @@
          xml:id="module-services-prometheus-exporters">
  <title>Prometheus exporters</title>
  <para>
-  Prometheus exporters provide metrics for the
-  <link xlink:href="https://prometheus.io">prometheus monitoring system</link>.
+  Prometheus exporters provide metrics for the <link xlink:href="https://prometheus.io">prometheus monitoring system</link>.
  </para>
  <section xml:id="module-services-prometheus-exporters-configuration">
   <title>Configuration</title>
 
   <para>
-   One of the most common exporters is the
-   <link xlink:href="https://github.com/prometheus/node_exporter">node
-   exporter</link>, it provides hardware and OS metrics from the host it's
-   running on. The exporter could be configured as follows:
+   One of the most common exporters is the <link xlink:href="https://github.com/prometheus/node_exporter">node exporter</link>, it provides hardware and OS metrics from the host it's running on. The exporter could be configured as follows:
 <programlisting>
   services.prometheus.exporters.node = {
     enable = true;
@@ -30,34 +26,20 @@
     firewallFilter = "-i br0 -p tcp -m tcp --dport 9100";
   };
 </programlisting>
-   It should now serve all metrics from the collectors that are explicitly
-   enabled and the ones that are
-   <link xlink:href="https://github.com/prometheus/node_exporter#enabled-by-default">enabled
-   by default</link>, via http under <literal>/metrics</literal>. In this
-   example the firewall should just allow incoming connections to the
-   exporter's port on the bridge interface <literal>br0</literal> (this would
-   have to be configured seperately of course). For more information about
-   configuration see <literal>man configuration.nix</literal> or search through
-   the
-   <link xlink:href="https://nixos.org/nixos/options.html#prometheus.exporters">available
-   options</link>.
+   It should now serve all metrics from the collectors that are explicitly enabled and the ones that are <link xlink:href="https://github.com/prometheus/node_exporter#enabled-by-default">enabled by default</link>, via http under <literal>/metrics</literal>. In this example the firewall should just allow incoming connections to the exporter's port on the bridge interface <literal>br0</literal> (this would have to be configured seperately of course). For more information about configuration see <literal>man configuration.nix</literal> or search through the <link xlink:href="https://nixos.org/nixos/options.html#prometheus.exporters">available options</link>.
   </para>
  </section>
  <section xml:id="module-services-prometheus-exporters-new-exporter">
   <title>Adding a new exporter</title>
 
   <para>
-   To add a new exporter, it has to be packaged first (see
-   <literal>nixpkgs/pkgs/servers/monitoring/prometheus/</literal> for
-   examples), then a module can be added. The postfix exporter is used in this
-   example:
+   To add a new exporter, it has to be packaged first (see <literal>nixpkgs/pkgs/servers/monitoring/prometheus/</literal> for examples), then a module can be added. The postfix exporter is used in this example:
   </para>
 
   <itemizedlist>
    <listitem>
     <para>
-     Some default options for all exporters are provided by
-     <literal>nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix</literal>:
+     Some default options for all exporters are provided by <literal>nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix</literal>:
     </para>
    </listitem>
    <listitem override='none'>
@@ -106,11 +88,7 @@
    </listitem>
    <listitem>
     <para>
-     As there is already a package available, the module can now be added. This
-     is accomplished by adding a new file to the
-     <literal>nixos/modules/services/monitoring/prometheus/exporters/</literal>
-     directory, which will be called postfix.nix and contains all exporter
-     specific options and configuration:
+     As there is already a package available, the module can now be added. This is accomplished by adding a new file to the <literal>nixos/modules/services/monitoring/prometheus/exporters/</literal> directory, which will be called postfix.nix and contains all exporter specific options and configuration:
 <programlisting>
 # nixpgs/nixos/modules/services/prometheus/exporters/postfix.nix
 { config, lib, pkgs, options }:
@@ -177,21 +155,16 @@ in
    </listitem>
    <listitem>
     <para>
-     This should already be enough for the postfix exporter. Additionally one
-     could now add assertions and conditional default values. This can be done
-     in the 'meta-module' that combines all exporter definitions and generates
-     the submodules:
-     <literal>nixpkgs/nixos/modules/services/prometheus/exporters.nix</literal>
+     This should already be enough for the postfix exporter. Additionally one could now add assertions and conditional default values. This can be done in the 'meta-module' that combines all exporter definitions and generates the submodules: <literal>nixpkgs/nixos/modules/services/prometheus/exporters.nix</literal>
     </para>
    </listitem>
   </itemizedlist>
  </section>
  <section xml:id="module-services-prometheus-exporters-update-exporter-module">
   <title>Updating an exporter module</title>
-   <para>
-     Should an exporter option change at some point, it is possible to add
-     information about the change to the exporter definition similar to
-     <literal>nixpkgs/nixos/modules/rename.nix</literal>:
+
+  <para>
+   Should an exporter option change at some point, it is possible to add information about the change to the exporter definition similar to <literal>nixpkgs/nixos/modules/rename.nix</literal>:
 <programlisting>
 { config, lib, pkgs, options }:
 
@@ -222,6 +195,6 @@ in
   ];
 }
 </programlisting>
-    </para>
-  </section>
+  </para>
+ </section>
 </chapter>
diff --git a/nixos/modules/services/networking/dnscrypt-proxy.xml b/nixos/modules/services/networking/dnscrypt-proxy.xml
index afc7880392a..04e2654d3cc 100644
--- a/nixos/modules/services/networking/dnscrypt-proxy.xml
+++ b/nixos/modules/services/networking/dnscrypt-proxy.xml
@@ -5,11 +5,7 @@
          xml:id="sec-dnscrypt-proxy">
  <title>DNSCrypt client proxy</title>
  <para>
-  The DNSCrypt client proxy relays DNS queries to a DNSCrypt enabled upstream
-  resolver. The traffic between the client and the upstream resolver is
-  encrypted and authenticated, mitigating the risk of MITM attacks, DNS
-  poisoning attacks, and third-party snooping (assuming the upstream is
-  trustworthy).
+  The DNSCrypt client proxy relays DNS queries to a DNSCrypt enabled upstream resolver. The traffic between the client and the upstream resolver is encrypted and authenticated, mitigating the risk of MITM attacks, DNS poisoning attacks, and third-party snooping (assuming the upstream is trustworthy).
  </para>
  <sect1 xml:id="sec-dnscrypt-proxy-configuration">
   <title>Basic configuration</title>
@@ -22,18 +18,14 @@
   </para>
 
   <para>
-   Enabling the client proxy does not alter the system nameserver; to relay
-   local queries, prepend <literal>127.0.0.1</literal> to
-   <option>networking.nameservers</option>.
+   Enabling the client proxy does not alter the system nameserver; to relay local queries, prepend <literal>127.0.0.1</literal> to <option>networking.nameservers</option>.
   </para>
  </sect1>
  <sect1 xml:id="sec-dnscrypt-proxy-forwarder">
   <title>As a forwarder for another DNS client</title>
 
   <para>
-   To run the DNSCrypt proxy client as a forwarder for another DNS client,
-   change the default proxy listening port to a non-standard value and point
-   the other client to it:
+   To run the DNSCrypt proxy client as a forwarder for another DNS client, change the default proxy listening port to a non-standard value and point the other client to it:
 <programlisting>
 <xref linkend="opt-services.dnscrypt-proxy.localPort"/> = 43;
 </programlisting>
diff --git a/nixos/modules/services/web-apps/matomo-doc.xml b/nixos/modules/services/web-apps/matomo-doc.xml
index 8485492c51c..2ab476f892c 100644
--- a/nixos/modules/services/web-apps/matomo-doc.xml
+++ b/nixos/modules/services/web-apps/matomo-doc.xml
@@ -5,21 +5,16 @@
          xml:id="module-services-matomo">
  <title>Matomo</title>
  <para>
-  Matomo is a real-time web analytics application. This module configures
-  php-fpm as backend for Matomo, optionally configuring an nginx vhost as well.
+  Matomo is a real-time web analytics application. This module configures php-fpm as backend for Matomo, optionally configuring an nginx vhost as well.
  </para>
  <para>
-  An automatic setup is not suported by Matomo, so you need to configure Matomo
-  itself in the browser-based Matomo setup.
+  An automatic setup is not suported by Matomo, so you need to configure Matomo itself in the browser-based Matomo setup.
  </para>
  <section xml:id="module-services-matomo-database-setup">
   <title>Database Setup</title>
 
   <para>
-   You also need to configure a MariaDB or MySQL database and -user for Matomo
-   yourself, and enter those credentials in your browser. You can use
-   passwordless database authentication via the UNIX_SOCKET authentication
-   plugin with the following SQL commands:
+   You also need to configure a MariaDB or MySQL database and -user for Matomo yourself, and enter those credentials in your browser. You can use passwordless database authentication via the UNIX_SOCKET authentication plugin with the following SQL commands:
 <programlisting>
 # For MariaDB
 INSTALL PLUGIN unix_socket SONAME 'auth_socket';
@@ -33,51 +28,29 @@ CREATE DATABASE matomo;
 CREATE USER 'matomo'@'localhost' IDENTIFIED WITH auth_socket;
 GRANT ALL PRIVILEGES ON matomo.* TO 'matomo'@'localhost';
 </programlisting>
-   Then fill in <literal>matomo</literal> as database user and database name,
-   and leave the password field blank. This authentication works by allowing
-   only the <literal>matomo</literal> unix user to authenticate as the
-   <literal>matomo</literal> database user (without needing a password), but no
-   other users. For more information on passwordless login, see
-   <link xlink:href="https://mariadb.com/kb/en/mariadb/unix_socket-authentication-plugin/" />.
+   Then fill in <literal>matomo</literal> as database user and database name, and leave the password field blank. This authentication works by allowing only the <literal>matomo</literal> unix user to authenticate as the <literal>matomo</literal> database user (without needing a password), but no other users. For more information on passwordless login, see <link xlink:href="https://mariadb.com/kb/en/mariadb/unix_socket-authentication-plugin/" />.
   </para>
 
   <para>
-   Of course, you can use password based authentication as well, e.g. when the
-   database is not on the same host.
+   Of course, you can use password based authentication as well, e.g. when the database is not on the same host.
   </para>
  </section>
  <section xml:id="module-services-matomo-archive-processing">
   <title>Archive Processing</title>
 
   <para>
-   This module comes with the systemd service
-   <literal>matomo-archive-processing.service</literal> and a timer that
-   automatically triggers archive processing every hour. This means that you
-   can safely
-   <link xlink:href="https://matomo.org/docs/setup-auto-archiving/#disable-browser-triggers-for-matomo-archiving-and-limit-matomo-reports-to-updating-every-hour">
-   disable browser triggers for Matomo archiving </link> at
-   <literal>Administration > System > General Settings</literal>.
+   This module comes with the systemd service <literal>matomo-archive-processing.service</literal> and a timer that automatically triggers archive processing every hour. This means that you can safely <link xlink:href="https://matomo.org/docs/setup-auto-archiving/#disable-browser-triggers-for-matomo-archiving-and-limit-matomo-reports-to-updating-every-hour"> disable browser triggers for Matomo archiving </link> at <literal>Administration > System > General Settings</literal>.
   </para>
 
   <para>
-   With automatic archive processing, you can now also enable to
-   <link xlink:href="https://matomo.org/docs/privacy/#step-2-delete-old-visitors-logs">
-   delete old visitor logs </link> at <literal>Administration > System >
-   Privacy</literal>, but make sure that you run <literal>systemctl start
-   matomo-archive-processing.service</literal> at least once without errors if
-   you have already collected data before, so that the reports get archived
-   before the source data gets deleted.
+   With automatic archive processing, you can now also enable to <link xlink:href="https://matomo.org/docs/privacy/#step-2-delete-old-visitors-logs"> delete old visitor logs </link> at <literal>Administration > System > Privacy</literal>, but make sure that you run <literal>systemctl start matomo-archive-processing.service</literal> at least once without errors if you have already collected data before, so that the reports get archived before the source data gets deleted.
   </para>
  </section>
  <section xml:id="module-services-matomo-backups">
   <title>Backup</title>
 
   <para>
-   You only need to take backups of your MySQL database and the
-   <filename>/var/lib/matomo/config/config.ini.php</filename> file. Use a user
-   in the <literal>matomo</literal> group or root to access the file. For more
-   information, see
-   <link xlink:href="https://matomo.org/faq/how-to-install/faq_138/" />.
+   You only need to take backups of your MySQL database and the <filename>/var/lib/matomo/config/config.ini.php</filename> file. Use a user in the <literal>matomo</literal> group or root to access the file. For more information, see <link xlink:href="https://matomo.org/faq/how-to-install/faq_138/" />.
   </para>
  </section>
  <section xml:id="module-services-matomo-issues">
@@ -86,15 +59,12 @@ GRANT ALL PRIVILEGES ON matomo.* TO 'matomo'@'localhost';
   <itemizedlist>
    <listitem>
     <para>
-     Matomo's file integrity check will warn you. This is due to the patches
-     necessary for NixOS, you can safely ignore this.
+     Matomo's file integrity check will warn you. This is due to the patches necessary for NixOS, you can safely ignore this.
     </para>
    </listitem>
    <listitem>
     <para>
-     Matomo will warn you that the JavaScript tracker is not writable. This is
-     because it's located in the read-only nix store. You can safely ignore
-     this, unless you need a plugin that needs JavaScript tracker access.
+     Matomo will warn you that the JavaScript tracker is not writable. This is because it's located in the read-only nix store. You can safely ignore this, unless you need a plugin that needs JavaScript tracker access.
     </para>
    </listitem>
   </itemizedlist>
@@ -103,11 +73,7 @@ GRANT ALL PRIVILEGES ON matomo.* TO 'matomo'@'localhost';
   <title>Using other Web Servers than nginx</title>
 
   <para>
-   You can use other web servers by forwarding calls for
-   <filename>index.php</filename> and <filename>piwik.php</filename> to the
-   <literal>/run/phpfpm-matomo.sock</literal> fastcgi unix socket. You can use
-   the nginx configuration in the module code as a reference to what else
-   should be configured.
+   You can use other web servers by forwarding calls for <filename>index.php</filename> and <filename>piwik.php</filename> to the <literal>/run/phpfpm-matomo.sock</literal> fastcgi unix socket. You can use the nginx configuration in the module code as a reference to what else should be configured.
   </para>
  </section>
 </chapter>
diff --git a/nixos/modules/services/web-apps/nextcloud.xml b/nixos/modules/services/web-apps/nextcloud.xml
index d66e0f0c299..4345c2b9810 100644
--- a/nixos/modules/services/web-apps/nextcloud.xml
+++ b/nixos/modules/services/web-apps/nextcloud.xml
@@ -5,21 +5,13 @@
          xml:id="module-services-nextcloud">
  <title>Nextcloud</title>
  <para>
-  <link xlink:href="https://nextcloud.com/">Nextcloud</link> is an open-source,
-  self-hostable cloud platform. The server setup can be automated using
-  <link linkend="opt-services.nextcloud.enable">services.nextcloud</link>. A
-  desktop client is packaged at <literal>pkgs.nextcloud-client</literal>.
+  <link xlink:href="https://nextcloud.com/">Nextcloud</link> is an open-source, self-hostable cloud platform. The server setup can be automated using <link linkend="opt-services.nextcloud.enable">services.nextcloud</link>. A desktop client is packaged at <literal>pkgs.nextcloud-client</literal>.
  </para>
  <section xml:id="module-services-nextcloud-basic-usage">
   <title>Basic usage</title>
 
   <para>
-   Nextcloud is a PHP-based application which requires an HTTP server
-   (<literal><link linkend="opt-services.nextcloud.enable">services.nextcloud</link></literal>
-   optionally supports
-   <literal><link linkend="opt-services.nginx.enable">services.nginx</link></literal>)
-   and a database (it's recommended to use
-   <literal><link linkend="opt-services.postgresql.enable">services.postgresql</link></literal>).
+   Nextcloud is a PHP-based application which requires an HTTP server (<literal><link linkend="opt-services.nextcloud.enable">services.nextcloud</link></literal> optionally supports <literal><link linkend="opt-services.nginx.enable">services.nginx</link></literal>) and a database (it's recommended to use <literal><link linkend="opt-services.postgresql.enable">services.postgresql</link></literal>).
   </para>
 
   <para>
@@ -61,57 +53,38 @@
   </para>
 
   <para>
-   The options <literal>hostName</literal> and <literal>nginx.enable</literal>
-   are used internally to configure an HTTP server using
-   <literal><link xlink:href="https://php-fpm.org/">PHP-FPM</link></literal>
-   and <literal>nginx</literal>. The <literal>config</literal> attribute set is
-   used by the imperative installer and all values are written to an additional file
-   to ensure that changes can be applied by changing the module's options.
+   The options <literal>hostName</literal> and <literal>nginx.enable</literal> are used internally to configure an HTTP server using <literal><link xlink:href="https://php-fpm.org/">PHP-FPM</link></literal> and <literal>nginx</literal>. The <literal>config</literal> attribute set is used by the imperative installer and all values are written to an additional file to ensure that changes can be applied by changing the module's options.
   </para>
 
   <para>
-   In case the application serves multiple domains (those are checked with
-   <literal><link xlink:href="http://php.net/manual/en/reserved.variables.server.php">$_SERVER['HTTP_HOST']</link></literal>)
-   it's needed to add them to
-   <literal><link linkend="opt-services.nextcloud.config.extraTrustedDomains">services.nextcloud.config.extraTrustedDomains</link></literal>.
+   In case the application serves multiple domains (those are checked with <literal><link xlink:href="http://php.net/manual/en/reserved.variables.server.php">$_SERVER['HTTP_HOST']</link></literal>) it's needed to add them to <literal><link linkend="opt-services.nextcloud.config.extraTrustedDomains">services.nextcloud.config.extraTrustedDomains</link></literal>.
   </para>
 
   <para>
-   Auto updates for Nextcloud apps can be enabled using
-   <literal><link linkend="opt-services.nextcloud.autoUpdateApps.enable">services.nextcloud.autoUpdateApps</link></literal>.
-</para>
-
+   Auto updates for Nextcloud apps can be enabled using <literal><link linkend="opt-services.nextcloud.autoUpdateApps.enable">services.nextcloud.autoUpdateApps</link></literal>.
+  </para>
  </section>
  <section xml:id="module-services-nextcloud-pitfalls-during-upgrade">
   <title>Pitfalls</title>
 
   <para>
-   Unfortunately Nextcloud appears to be very stateful when it comes to
-   managing its own configuration. The config file lives in the home directory
-   of the <literal>nextcloud</literal> user (by default
-   <literal>/var/lib/nextcloud/config/config.php</literal>) and is also used to
-   track several states of the application (e.g. whether installed or not).
+   Unfortunately Nextcloud appears to be very stateful when it comes to managing its own configuration. The config file lives in the home directory of the <literal>nextcloud</literal> user (by default <literal>/var/lib/nextcloud/config/config.php</literal>) and is also used to track several states of the application (e.g. whether installed or not).
   </para>
 
   <para>
-   All configuration parameters are also stored in
-   <literal>/var/lib/nextcloud/config/override.config.php</literal> which is generated by
-   the module and linked from the store to ensure that all values from <literal>config.php</literal>
-   can be modified by the module.
-   However <literal>config.php</literal> manages the application's state and shouldn't be touched
-   manually because of that.
+   All configuration parameters are also stored in <literal>/var/lib/nextcloud/config/override.config.php</literal> which is generated by the module and linked from the store to ensure that all values from <literal>config.php</literal> can be modified by the module. However <literal>config.php</literal> manages the application's state and shouldn't be touched manually because of that.
   </para>
 
   <warning>
-   <para>Don't delete <literal>config.php</literal>! This file
-   tracks the application's state and a deletion can cause unwanted
-   side-effects!</para>
+   <para>
+    Don't delete <literal>config.php</literal>! This file tracks the application's state and a deletion can cause unwanted side-effects!
+   </para>
   </warning>
 
   <warning>
-   <para>Don't rerun <literal>nextcloud-occ
-   maintenance:install</literal>! This command tries to install the application
-   and can cause unwanted side-effects!</para>
+   <para>
+    Don't rerun <literal>nextcloud-occ maintenance:install</literal>! This command tries to install the application and can cause unwanted side-effects!
+   </para>
   </warning>
  </section>
 </chapter>
-- 
GitLab


From 241e28e3d1e6d79136197a6c157f3284abb39e69 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 18 Sep 2019 22:28:24 +0200
Subject: [PATCH 0529/2254] emacs: use runCommand to generate wrapper

This removes the unnecessary compiler build dependency. We also set

    preferLocalBuild = true;
    allowSubstitutes = false;

to not farm out the build on a remote builder or bother with trying to
find a binary substitution.
---
 pkgs/build-support/emacs/wrapper.nix | 209 ++++++++++++++-------------
 pkgs/top-level/emacs-packages.nix    |   2 +-
 2 files changed, 107 insertions(+), 104 deletions(-)

diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix
index b242672df10..25f068cd3fa 100644
--- a/pkgs/build-support/emacs/wrapper.nix
+++ b/pkgs/build-support/emacs/wrapper.nix
@@ -32,7 +32,7 @@ in customEmacsPackages.emacsWithPackages (epkgs: [ epkgs.evil epkgs.magit ])
 
 */
 
-{ lib, lndir, makeWrapper, runCommand, stdenv }: self:
+{ lib, lndir, makeWrapper, runCommand }: self:
 
 with lib; let inherit (self) emacs; in
 
@@ -45,105 +45,110 @@ let
     else packagesFun;
 in
 
-stdenv.mkDerivation {
-  name = (appendToName "with-packages" emacs).name;
-  nativeBuildInputs = [ emacs lndir makeWrapper ];
-  inherit emacs explicitRequires;
-
-  # Store all paths we want to add to emacs here, so that we only need to add
-  # one path to the load lists
-  deps = runCommand "emacs-packages-deps"
-   { inherit explicitRequires lndir emacs; }
-   ''
-     findInputsOld() {
-         local pkg="$1"; shift
-         local var="$1"; shift
-         local propagatedBuildInputsFiles=("$@")
-
-         # TODO(@Ericson2314): Restore using associative array once Darwin
-         # nix-shell doesn't use impure bash. This should replace the O(n)
-         # case with an O(1) hash map lookup, assuming bash is implemented
-         # well :D.
-         local varSlice="$var[*]"
-         # ''${..-} to hack around old bash empty array problem
-         case "''${!varSlice-}" in
-             *" $pkg "*) return 0 ;;
-         esac
-         unset -v varSlice
-
-         eval "$var"'+=("$pkg")'
-
-         if ! [ -e "$pkg" ]; then
-             echo "build input $pkg does not exist" >&2
-             exit 1
-         fi
-
-         local file
-         for file in "''${propagatedBuildInputsFiles[@]}"; do
-             file="$pkg/nix-support/$file"
-             [[ -f "$file" ]] || continue
-
-             local pkgNext
-             for pkgNext in $(< "$file"); do
-                 findInputsOld "$pkgNext" "$var" "''${propagatedBuildInputsFiles[@]}"
-             done
-         done
-     }
-     mkdir -p $out/bin
-     mkdir -p $out/share/emacs/site-lisp
-
-     local requires
-     for pkg in $explicitRequires; do
-       findInputsOld $pkg requires propagated-user-env-packages
-     done
-     # requires now holds all requested packages and their transitive dependencies
-
-     linkPath() {
-       local pkg=$1
-       local origin_path=$2
-       local dest_path=$3
-
-       # Add the path to the search path list, but only if it exists
-       if [[ -d "$pkg/$origin_path" ]]; then
-         $lndir/bin/lndir -silent "$pkg/$origin_path" "$out/$dest_path"
-       fi
-     }
-
-     linkEmacsPackage() {
-       linkPath "$1" "bin" "bin"
-       linkPath "$1" "share/emacs/site-lisp" "share/emacs/site-lisp"
-     }
-
-     # Iterate over the array of inputs (avoiding nix's own interpolation)
-     for pkg in "''${requires[@]}"; do
-       linkEmacsPackage $pkg
-     done
-
-     siteStart="$out/share/emacs/site-lisp/site-start.el"
-     siteStartByteCompiled="$siteStart"c
-     subdirs="$out/share/emacs/site-lisp/subdirs.el"
-     subdirsByteCompiled="$subdirs"c
-
-     # A dependency may have brought the original siteStart or subdirs, delete
-     # it and create our own
-     # Begin the new site-start.el by loading the original, which sets some
-     # NixOS-specific paths. Paths are searched in the reverse of the order
-     # they are specified in, so user and system profile paths are searched last.
-     rm -f $siteStart $siteStartByteCompiled $subdirs $subdirsByteCompiled
-     cat >"$siteStart" <<EOF
-(load-file "$emacs/share/emacs/site-lisp/site-start.el")
-(add-to-list 'load-path "$out/share/emacs/site-lisp")
-(add-to-list 'exec-path "$out/bin")
-EOF
-      # Link subdirs.el from the emacs distribution
-      ln -s $emacs/share/emacs/site-lisp/subdirs.el -T $subdirs
-
-     # Byte-compiling improves start-up time only slightly, but costs nothing.
-     $emacs/bin/emacs --batch -f batch-byte-compile "$siteStart" "$subdirs"
-  '';
-
-  phases = [ "installPhase" ];
-  installPhase = ''
+runCommand
+  (appendToName "with-packages" emacs).name
+  {
+    nativeBuildInputs = [ emacs lndir makeWrapper ];
+    inherit emacs explicitRequires;
+
+    preferLocalBuild = true;
+    allowSubstitutes = false;
+
+    # Store all paths we want to add to emacs here, so that we only need to add
+    # one path to the load lists
+    deps = runCommand "emacs-packages-deps"
+      { inherit explicitRequires lndir emacs; }
+      ''
+        findInputsOld() {
+          local pkg="$1"; shift
+          local var="$1"; shift
+          local propagatedBuildInputsFiles=("$@")
+
+          # TODO(@Ericson2314): Restore using associative array once Darwin
+          # nix-shell doesn't use impure bash. This should replace the O(n)
+          # case with an O(1) hash map lookup, assuming bash is implemented
+          # well :D.
+          local varSlice="$var[*]"
+          # ''${..-} to hack around old bash empty array problem
+          case "''${!varSlice-}" in
+              *" $pkg "*) return 0 ;;
+          esac
+          unset -v varSlice
+
+          eval "$var"'+=("$pkg")'
+
+          if ! [ -e "$pkg" ]; then
+              echo "build input $pkg does not exist" >&2
+              exit 1
+          fi
+
+          local file
+          for file in "''${propagatedBuildInputsFiles[@]}"; do
+              file="$pkg/nix-support/$file"
+              [[ -f "$file" ]] || continue
+
+              local pkgNext
+              for pkgNext in $(< "$file"); do
+                  findInputsOld "$pkgNext" "$var" "''${propagatedBuildInputsFiles[@]}"
+              done
+          done
+        }
+        mkdir -p $out/bin
+        mkdir -p $out/share/emacs/site-lisp
+
+        local requires
+        for pkg in $explicitRequires; do
+          findInputsOld $pkg requires propagated-user-env-packages
+        done
+        # requires now holds all requested packages and their transitive dependencies
+
+        linkPath() {
+          local pkg=$1
+          local origin_path=$2
+          local dest_path=$3
+
+          # Add the path to the search path list, but only if it exists
+          if [[ -d "$pkg/$origin_path" ]]; then
+            $lndir/bin/lndir -silent "$pkg/$origin_path" "$out/$dest_path"
+          fi
+        }
+
+        linkEmacsPackage() {
+          linkPath "$1" "bin" "bin"
+          linkPath "$1" "share/emacs/site-lisp" "share/emacs/site-lisp"
+        }
+
+        # Iterate over the array of inputs (avoiding nix's own interpolation)
+        for pkg in "''${requires[@]}"; do
+          linkEmacsPackage $pkg
+        done
+
+        siteStart="$out/share/emacs/site-lisp/site-start.el"
+        siteStartByteCompiled="$siteStart"c
+        subdirs="$out/share/emacs/site-lisp/subdirs.el"
+        subdirsByteCompiled="$subdirs"c
+
+        # A dependency may have brought the original siteStart or subdirs, delete
+        # it and create our own
+        # Begin the new site-start.el by loading the original, which sets some
+        # NixOS-specific paths. Paths are searched in the reverse of the order
+        # they are specified in, so user and system profile paths are searched last.
+        rm -f $siteStart $siteStartByteCompiled $subdirs $subdirsByteCompiled
+        cat >"$siteStart" <<EOF
+        (load-file "$emacs/share/emacs/site-lisp/site-start.el")
+        (add-to-list 'load-path "$out/share/emacs/site-lisp")
+        (add-to-list 'exec-path "$out/bin")
+        EOF
+        # Link subdirs.el from the emacs distribution
+        ln -s $emacs/share/emacs/site-lisp/subdirs.el -T $subdirs
+
+        # Byte-compiling improves start-up time only slightly, but costs nothing.
+        $emacs/bin/emacs --batch -f batch-byte-compile "$siteStart" "$subdirs"
+      '';
+
+    inherit (emacs) meta;
+  }
+  ''
     mkdir -p "$out/bin"
 
     # Wrap emacs and friends so they find our site-start.el before the original.
@@ -172,6 +177,4 @@ EOF
     for dir in applications icons info man; do
       ln -s $emacs/share/$dir $out/share/$dir
     done
-  '';
-  inherit (emacs) meta;
-}
+  ''
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 0c85176acba..1853c7eb8ac 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -60,7 +60,7 @@ let
   };
 
   emacsWithPackages = import ../build-support/emacs/wrapper.nix {
-    inherit lib lndir makeWrapper stdenv runCommand;
+    inherit lib lndir makeWrapper runCommand;
   };
 
   mkManualPackages = import ../applications/editors/emacs-modes/manual-packages.nix {
-- 
GitLab


From b21a3356f01b59992432a907f17e66abc77f17a0 Mon Sep 17 00:00:00 2001
From: Johan Thomsen <jth@dbc.dk>
Date: Wed, 18 Sep 2019 22:38:10 +0200
Subject: [PATCH 0530/2254] kubernetes: 1.15.3 -> 1.15.4

---
 pkgs/applications/networking/cluster/kubernetes/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index cbe32e57f20..1ad7ad3e393 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -15,13 +15,13 @@ with lib;
 
 stdenv.mkDerivation rec {
   pname = "kubernetes";
-  version = "1.15.3";
+  version = "1.15.4";
 
   src = fetchFromGitHub {
     owner = "kubernetes";
     repo = "kubernetes";
     rev = "v${version}";
-    sha256 = "0vamr7m8i5svmvb0z01cngv3sffdfjj0bky2zalm7cfnapib8vz1";
+    sha256 = "18wpqrgb1ils4g8ggg217xq4jq30i4m7par2mdjk59pmz7ssm25p";
   };
 
   buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ];
-- 
GitLab


From d1e1b922fb1e4bf22f4e9f2db3db4bd21cb4139e Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 18 Sep 2019 15:38:29 -0500
Subject: [PATCH 0531/2254] microcodeIntel: 20190618 -> 20190918

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

diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix
index 07d6dcb4a5f..0196718cfd0 100644
--- a/pkgs/os-specific/linux/microcode/intel.nix
+++ b/pkgs/os-specific/linux/microcode/intel.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "microcode-intel";
-  version = "20190618";
+  version = "20190918";
 
   src = fetchFromGitHub {
     owner = "intel";
     repo = "Intel-Linux-Processor-Microcode-Data-Files";
     rev = "microcode-${version}";
-    sha256 = "0fdhrpxvsq0rm5mzj82gvmfb3lm7mhc9hwvimv7dl1jaidbp6lvs";
+    sha256 = "0v668mfqxn6wzyng68aqaffh75gc215k13n6d5g7zisivvv2bgdp";
   };
 
   nativeBuildInputs = [ iucode-tool libarchive ];
-- 
GitLab


From d57dab74c6894a734703321290b9ac04009cd214 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 18 Sep 2019 14:11:53 -0500
Subject: [PATCH 0532/2254] datamash: 1.4 -> 1.5

https://lists.gnu.org/archive/html/info-gnu/2019-09/msg00005.html
---
 pkgs/tools/misc/datamash/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/datamash/default.nix b/pkgs/tools/misc/datamash/default.nix
index efeb760e560..18e80ab6e4a 100644
--- a/pkgs/tools/misc/datamash/default.nix
+++ b/pkgs/tools/misc/datamash/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "datamash";
-  version = "1.4";
+  version = "1.5";
 
   src = fetchurl {
-    url = "mirror://gnu/datamash/${pname}-${version}.tar.gz";
-    sha256 = "fa44dd2d5456bcb94ef49dfc6cfe62c83fd53ac435119a85d34e6812f6e6472a";
+    url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
+    sha256 = "1b91pbdarnfmbhid8aa2f50k0fln8n7pg62782b4y0jlzvaljqi2";
   };
 
   meta = with stdenv.lib; {
-- 
GitLab


From 6429696f43ef261ecffef590fb51461c4075efbc Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 18 Sep 2019 12:59:48 -0500
Subject: [PATCH 0533/2254] libqalculate,qalculate-gtk: 3.3.0 -> 3.4.0

---
 pkgs/applications/science/math/qalculate-gtk/default.nix | 4 ++--
 pkgs/development/libraries/libqalculate/default.nix      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix
index b4d82b9583c..d0625201a37 100644
--- a/pkgs/applications/science/math/qalculate-gtk/default.nix
+++ b/pkgs/applications/science/math/qalculate-gtk/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "qalculate-gtk";
-  version = "3.3.0";
+  version = "3.4.0";
 
   src = fetchFromGitHub {
     owner = "qalculate";
     repo = "qalculate-gtk";
     rev = "v${version}";
-    sha256 = "1z2d32dcvdd66114j3km58xfk80hc5rd0zrh2fgz1azv8r4cqq1b";
+    sha256 = "11q9f4p67ckbxd962jchgmwqnbp7v9ghix88c5hn3vaxvgwiw5hl";
   };
 
   patchPhase = ''
diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix
index 1b73af7037b..894907c23fc 100644
--- a/pkgs/development/libraries/libqalculate/default.nix
+++ b/pkgs/development/libraries/libqalculate/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libqalculate";
-  version = "3.3.0";
+  version = "3.4.0";
 
   src = fetchFromGitHub {
     owner = "qalculate";
     repo = "libqalculate";
     rev = "v${version}";
-    sha256 = "1qgsngi9z1sr6pzgcq6kgng62arpc5xn2ai1ks69myzzmgwk8adp";
+    sha256 = "046fi8cqfqh0ila3kc4sg75yvg24wmghlja2fmhkj96fjjfkzsss";
   };
 
   outputs = [ "out" "dev" "doc" ];
-- 
GitLab


From e79d20c16e1bfc7b0d59f7ebca7b930dc529db63 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Wed, 18 Sep 2019 17:27:24 -0400
Subject: [PATCH 0534/2254] pantheon.elementary-greeter: 2019-09-10 -> 5.0

This wasn't mean't to be at unstable.
---
 .../pantheon/desktop/elementary-greeter/default.nix         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
index a72e0b6c223..963418feec0 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
@@ -27,15 +27,15 @@
 
 stdenv.mkDerivation rec {
   pname = "elementary-greeter";
-  version = "unstable-2019-09-10";
+  version = "5.0";
 
   repoName = "greeter";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = repoName;
-    rev = "cad7d28d2b40ed04f6ce49ab44408297b5c69468";
-    sha256 = "0m8iq04wdwgg6arm7dzwi7a0snxvss62zpnw2knpr6lp77vd7hqr";
+    rev = version;
+    sha256 = "01c8acarxwpakyq69xm4bjwppjf8v3ijmns8masd8raxligb2v8b";
   };
 
   passthru = {
-- 
GitLab


From c8663660dc8ff1a8a5aedbd5566f0a385ad22c51 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 18 Sep 2019 12:33:08 -0500
Subject: [PATCH 0535/2254] linuxPackages.fwts-efi-runtime: init

---
 pkgs/os-specific/linux/fwts/module.nix | 31 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/os-specific/linux/fwts/module.nix

diff --git a/pkgs/os-specific/linux/fwts/module.nix b/pkgs/os-specific/linux/fwts/module.nix
new file mode 100644
index 00000000000..ef90e0c303b
--- /dev/null
+++ b/pkgs/os-specific/linux/fwts/module.nix
@@ -0,0 +1,31 @@
+{ stdenv, fwts, kernel }:
+
+stdenv.mkDerivation rec {
+  pname = "fwts-efi-runtime";
+  version = "${fwts.version}-${kernel.version}";
+
+  inherit (fwts) src;
+
+  sourceRoot = "source/efi_runtime";
+
+  postPatch = ''
+    substituteInPlace Makefile --replace \
+      '/lib/modules/$(KVER)/build' \
+      '${kernel.dev}/lib/modules/${kernel.modDirVersion}/build'
+  '';
+
+  nativeBuildInputs = kernel.moduleBuildDependencies;
+
+  hardeningDisable = [ "pic" ];
+
+  makeFlags = [
+    "INSTALL_MOD_PATH=${placeholder "out"}"
+  ];
+
+  meta = with stdenv.lib; {
+    inherit (fwts.meta) homepage license;
+    description = fwts.meta.description + "(efi-runtime kernel module)";
+    maintainers = with maintainers; [ dtzWill ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 81fae113b0a..677aee15745 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15808,6 +15808,8 @@ in
 
     evdi = callPackage ../os-specific/linux/evdi { };
 
+    fwts-efi-runtime = callPackage ../os-specific/linux/fwts/module.nix { };
+
     hyperv-daemons = callPackage ../os-specific/linux/hyperv-daemons { };
 
     e1000e = if stdenv.lib.versionOlder kernel.version "4.10" then  callPackage ../os-specific/linux/e1000e {} else null;
-- 
GitLab


From 2e2a9ae22a775de500cdfafdace9d36c35fe8ac7 Mon Sep 17 00:00:00 2001
From: Ivan Kozik <ivan@ludios.org>
Date: Wed, 18 Sep 2019 21:02:31 +0000
Subject: [PATCH 0536/2254] chromium: 77.0.3865.75 -> 77.0.3865.90

CVE-2019-13685 CVE-2019-13688 CVE-2019-13687 CVE-2019-13686
---
 .../browsers/chromium/upstream-info.nix        | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index df2ce798f1f..b641d1163bc 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@@ -1,18 +1,18 @@
 # This file is autogenerated from update.sh in the same directory.
 {
   beta = {
-    sha256 = "12cp24h93b48pwfywf5b6qvjdlhxrhp87qdaqbfcn6g787r2z5gb";
-    sha256bin64 = "0d9w869qqwbmw3qjvxkfm37i7dvrgmrwm5y96sm1dg2jnxqj4bdz";
-    version = "77.0.3865.75";
+    sha256 = "1hzgzmrn0d6cqvqnqayl048zwlcx0f7azg2rhvm7p13lvyqzsk00";
+    sha256bin64 = "0p3275ii8800swlfmljbdrvyqjd5nlw0vgv2my4r8ccszgbhidbd";
+    version = "77.0.3865.90";
   };
   dev = {
-    sha256 = "0x5r6xqwiggwyzbinm252xc1n3f9r7cmmzj6assi4v1nsispdh2k";
-    sha256bin64 = "03yymhbpd1snycmcv7wkg5j6zbydvyc365gy5myp7wgas7cd0mb6";
-    version = "78.0.3887.7";
+    sha256 = "0zka01ml3hbximswzkkqbqq8wpiz8f4fq4wx5fys002hi69l296l";
+    sha256bin64 = "0nrip45s0ylri34vlpf16xlwv3ybmy2jg7dz8l9rvgbdwwdzdb75";
+    version = "78.0.3904.17";
   };
   stable = {
-    sha256 = "12cp24h93b48pwfywf5b6qvjdlhxrhp87qdaqbfcn6g787r2z5gb";
-    sha256bin64 = "1wp5g09czyslkkhw3nhbp39fxfcz0pprsgj8h0aggghpdbvzph3d";
-    version = "77.0.3865.75";
+    sha256 = "1hzgzmrn0d6cqvqnqayl048zwlcx0f7azg2rhvm7p13lvyqzsk00";
+    sha256bin64 = "1npx867j39mdyivf8nlkcfwgq7j34hl7s948vf6h2kqni0y50hzl";
+    version = "77.0.3865.90";
   };
 }
-- 
GitLab


From f343b11914c73fb44b4a4cc543fdcf96f8306456 Mon Sep 17 00:00:00 2001
From: Benjamin Asbach <asbachb@users.noreply.github.com>
Date: Wed, 18 Sep 2019 00:28:15 +0200
Subject: [PATCH 0537/2254] doc: replaced outdated config reference
 `build-use-sandbox` with `sandbox`

---
 doc/submitting-changes.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/submitting-changes.xml b/doc/submitting-changes.xml
index 9c98abbe87a..2c7defb8174 100644
--- a/doc/submitting-changes.xml
+++ b/doc/submitting-changes.xml
@@ -244,7 +244,7 @@ Additional information.
 
    <para>
     When sandbox builds are enabled, Nix will setup an isolated environment for each build process. It is used to remove further hidden dependencies set by the build environment to improve reproducibility. This includes access to the network during the build outside of <function>fetch*</function> functions and files outside the Nix store. Depending on the operating system access to other resources are blocked as well (ex. inter process communication is isolated on Linux); see <link
-      xlink:href="https://nixos.org/nix/manual/#description-45">build-use-sandbox</link> in Nix manual for details.
+      xlink:href="https://nixos.org/nix/manual/#conf-sandbox">sandbox</link> in Nix manual for details.
    </para>
 
    <para>
@@ -265,7 +265,7 @@ Additional information.
      <listitem>
       <para>
        <emphasis role="bold">Globally enable sandboxing on non-NixOS platforms</emphasis>: add the following to: <filename>/etc/nix/nix.conf</filename>
-<screen>build-use-sandbox = true</screen>
+<screen>sandbox = true</screen>
       </para>
      </listitem>
     </itemizedlist>
-- 
GitLab


From bc172c87800ab8f41865c5edd3496836b82678f5 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 18 Sep 2019 18:00:00 -0500
Subject: [PATCH 0538/2254] circleci-cli: 0.1.2569 -> 0.1.5879

---
 .../tools/misc/circleci-cli/default.nix       | 29 ++++++++++---------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix
index e1b89d07cdf..a590d4a6106 100644
--- a/pkgs/development/tools/misc/circleci-cli/default.nix
+++ b/pkgs/development/tools/misc/circleci-cli/default.nix
@@ -1,22 +1,26 @@
-{ stdenv, fetchFromGitHub, buildGoPackage }:
+{ stdenv, fetchFromGitHub, buildGoModule }:
 
-let
-  owner = "CircleCI-Public";
+buildGoModule rec {
   pname = "circleci-cli";
-  version = "0.1.2569";
-in
-buildGoPackage {
-  name = "${pname}-${version}";
-  inherit version;
+  version = "0.1.5879";
 
-  src =  fetchFromGitHub {
-    inherit owner;
+  src = fetchFromGitHub {
+    owner = "CircleCI-Public";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0ixiqx8rmia02r44zbhw149p5x9r9cv1fsnlhl8p2x5zd2bdr18x";
+    sha256 = "1471g56apaw0c5dpa0jrr7hvzh3kbwfr3yr0m4mz2dlf27d481ac";
   };
 
-  goPackagePath = "github.com/${owner}/${pname}";
+  modSha256 = "0cvmcsl00jfikpkw3f7k5zw65156z5g5l2b6s5803a2i9d613268";
+
+  preBuild = ''
+    substituteInPlace data/data.go \
+      --replace 'packr.New("circleci-cli-box", "../_data")' 'packr.New("circleci-cli-box", "${placeholder "out"}/share/circleci-cli")'
+  '';
+
+  postInstall = ''
+    install -Dm644 -t $out/share/circleci-cli _data/data.yml
+  '';
 
   meta = with stdenv.lib; {
     # Box blurb edited from the AUR package circleci-cli
@@ -25,7 +29,6 @@ buildGoPackage {
       run jobs as if they were running on the hosted CirleCI application.
     '';
     maintainers = with maintainers; [ synthetica ];
-    platforms = platforms.unix;
     license = licenses.mit;
     homepage = https://circleci.com/;
   };
-- 
GitLab


From 9b184c104d7509826c84b1fea55695964901aa85 Mon Sep 17 00:00:00 2001
From: Alexandre Esteves <alexandre.fmp.esteves@gmail.com>
Date: Thu, 19 Sep 2019 00:30:59 +0100
Subject: [PATCH 0539/2254] Fix example

---
 doc/cross-compilation.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/cross-compilation.xml b/doc/cross-compilation.xml
index f496fa3f896..93fe9095ce2 100644
--- a/doc/cross-compilation.xml
+++ b/doc/cross-compilation.xml
@@ -271,14 +271,14 @@
   <para>
    Nixpkgs can be instantiated with <varname>localSystem</varname> alone, in which case there is no cross-compiling and everything is built by and for that system, or also with <varname>crossSystem</varname>, in which case packages run on the latter, but all building happens on the former. Both parameters take the same schema as the 3 (build, host, and target) platforms defined in the previous section. As mentioned above, <literal>lib.systems.examples</literal> has some platforms which are used as arguments for these parameters in practice. You can use them programmatically, or on the command line:
 <programlisting>
-nix-build &lt;nixpkgs&gt; --arg crossSystem '(import &lt;nixpkgs/lib&gt;).systems.examples.fooBarBaz' -A whatever</programlisting>
+nix-build '&lt;nixpkgs&gt;' --arg crossSystem '(import &lt;nixpkgs/lib&gt;).systems.examples.fooBarBaz' -A whatever</programlisting>
   </para>
 
   <note>
    <para>
     Eventually we would like to make these platform examples an unnecessary convenience so that
 <programlisting>
-nix-build &lt;nixpkgs&gt; --arg crossSystem '{ config = "&lt;arch&gt;-&lt;os&gt;-&lt;vendor&gt;-&lt;abi&gt;"; }' -A whatever</programlisting>
+nix-build '&lt;nixpkgs&gt;' --arg crossSystem '{ config = "&lt;arch&gt;-&lt;os&gt;-&lt;vendor&gt;-&lt;abi&gt;"; }' -A whatever</programlisting>
     works in the vast majority of cases. The problem today is dependencies on other sorts of configuration which aren't given proper defaults. We rely on the examples to crudely to set those configuration parameters in some vaguely sane manner on the users behalf. Issue <link xlink:href="https://github.com/NixOS/nixpkgs/issues/34274">#34274</link> tracks this inconvenience along with its root cause in crufty configuration options.
    </para>
   </note>
-- 
GitLab


From 44957a9f3028edf538d5a70e58a736bc7026d3cb Mon Sep 17 00:00:00 2001
From: Ivan Kozik <ivan@ludios.org>
Date: Wed, 18 Sep 2019 23:24:57 +0000
Subject: [PATCH 0540/2254] chromiumDev: fix build by disabling jumbo

This fixes:

FAILED: obj/chrome/browser/ui/ui/ui_jumbo_3.o
../../third_party/llvm-build/Release+Asserts/bin/clang++ -MMD -MF obj/chrome/browser/ui/ui/ui_jumbo_3.o.d -DUSE_DBUS -DUSE_UDEV -DUSE_AURA=1 -DUSE_GLIB=1 -DUSE_NSS_CERTS=1 -DUSE_X11=1 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -DCR_CLANG_REVISION=\"371202-8455294f-1\" -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D_FORTIFY_SOURCE=2 -D_LIBCPP_ABI_UNSTABLE -D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS -D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS -D_LIBCPP_ENABLE_NODISCARD -DCR_LIBCXX_REVISION=361348 -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -DUSE_CUPS -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_32 -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_26 -DENABLE_IPC_FUZZER -DTOOLKIT_VIEWS=1 -DVK_NO_PROTOTYPES -DGL_GLEXT_PROTOTYPES -DUSE_GLX -DUSE_EGL -DSYNC_PASSWORD_REUSE_DETECTION_ENABLED -DON_FOCUS_PING_ENABLED -DEXPAT_RELATIVE_PATH -DGOOGLE_PROTOBUF_NO_RTTI -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DHAVE_PTHREAD -DLEVELDB_PLATFORM_CHROMIUM=1 -DLEVELDB_PLATFORM_CHROMIUM=1 -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DUSE_CHROMIUM_ICU=1 -DU_STATIC_IMPLEMENTATION -DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE -DUCHAR_TYPE=uint16_t -DWEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0 -DWEBRTC_CHROMIUM_BUILD -DWEBRTC_POSIX -DWEBRTC_LINUX -DABSL_ALLOCATOR_NOTHROW=1 -DNO_MAIN_THREAD_WRAPPING -DV8_USE_EXTERNAL_STARTUP_DATA -DSK_GL -DSK_HAS_PNG_LIBRARY -DSK_HAS_WEBP_LIBRARY -DSK_USER_CONFIG_HEADER=\"../../skia/config/SkUserConfig.h\" -DSK_HAS_JPEG_LIBRARY -DSK_VULKAN_HEADER=\"../../skia/config/SkVulkanConfig.h\" -DSK_VULKAN=1 -DSK_SUPPORT_GPU=1 -DSK_GPU_WORKAROUNDS_HEADER=\"gpu/config/gpu_driver_bug_workaround_autogen.h\" -DVK_NO_PROTOTYPES -DV8_DEPRECATION_WARNINGS -DI18N_ADDRESS_VALIDATION_DATA_URL=\"https://chromium-i18n.appspot.com/ssl-aggregate-address/\" -DPERFETTO_IMPLEMENTATION -I. -I../.. -Igen -Igen/shim_headers/snappy_shim -I../../third_party/libyuv/include -Igen/shim_headers/libpng_shim -Igen/shim_headers/libwebp_shim -I../../third_party/khronos -I../../gpu -I../../third_party/vulkan/include -Igen/shim_headers/opus_shim -Igen/third_party/dawn -I../../third_party/dawn/src/include -Igen/shim_headers/flac_shim -I../../third_party/protobuf/src -Igen/protoc_out -I../../third_party/protobuf/src -I../../third_party/boringssl/src/include -I../../third_party/cacheinvalidation/overrides -I../../third_party/cacheinvalidation/src -Igen/third_party/metrics_proto -I../../third_party/leveldatabase -I../../third_party/leveldatabase/src -I../../third_party/leveldatabase/src/include -I../../third_party/ced/src -I../../third_party/icu/source/common -I../../third_party/icu/source/i18n -I../../third_party/webrtc_overrides -I../../third_party/webrtc -Igen/third_party/webrtc -I../../third_party/abseil-cpp -I../../third_party/skia -I../../third_party/vulkan/include -I../../third_party/skia/third_party/vulkanmemoryallocator -I../../third_party/vulkan/include -I../../third_party/libwebm/source -I../../v8/include -Igen/v8/include -I../../third_party/perfetto/include -Igen/third_party/perfetto/build_config -Igen/third_party/perfetto -Igen/third_party/perfetto -Igen/third_party/perfetto -Igen/third_party/perfetto -Igen/third_party/perfetto -Igen/third_party/perfetto -I../../third_party/re2/src -I../../third_party/mesa_headers -Igen -Igen -Igen -Igen -I../../third_party/libaddressinput/src/cpp/include -Igen/components/sync/protocol -I../../third_party/flatbuffers/src/include -I../../third_party/perfetto -I../../third_party/perfetto/include -Igen/third_party/perfetto/build_config -I../../third_party/brotli/include -I../../third_party/zlib -I../../third_party/fontconfig/src -Igen -Igen -Igen -Igen -Igen -fno-strict-aliasing --param=ssp-buffer-size=4 -fstack-protector -funwind-tables -fPIC -pthread -fcolor-diagnostics -fmerge-all-constants -fcrash-diagnostics-dir=../../tools/clang/crashreports -Xclang -mllvm -Xclang -instcombine-lower-dbg-declare=0 -fcomplete-member-pointers -m64 -march=x86-64 -Wno-builtin-macro-redefined -D__DATE__= -D__TIME__= -D__TIMESTAMP__= -no-canonical-prefixes -Wall -Wextra -Wimplicit-fallthrough -Wthread-safety -Wextra-semi -Wno-missing-field-initializers -Wno-unused-parameter -Wno-c++11-narrowing -Wno-unneeded-internal-declaration -Wno-undefined-var-template -Wno-ignored-pragma-optimize -Wno-implicit-int-float-conversion -Wno-xor-used-as-pow -Wno-c99-designator -Wno-reorder-init-list -Wno-final-dtor-non-final-class -O2 -fno-ident -fdata-sections -ffunction-sections -fno-omit-frame-pointer -g0 -fvisibility=hidden -Wheader-hygiene -Wstring-conversion -Wtautological-overlap-compare -Wexit-time-destructors -I/nix/store/fn0ag3ahbrjjjbsqb2846x321zj4jika-glib-2.60.7-dev/include -I/nix/store/fn0ag3ahbrjjjbsqb2846x321zj4jika-glib-2.60.7-dev/include/glib-2.0 -I/nix/store/ilk1606qj4pqzsplnnzycsxpzl6pjss8-glib-2.60.7/lib/glib-2.0/include -Wno-shorten-64-to-32 -Wno-header-guard -I/nix/store/c3i4il1c0n9mjhzm1dsvcw8h8d973s0b-nspr-4.21-dev/include -I/nix/store/qk3racv0a2967wsk0g9ps9wlbfn17faj-nss-3.46-dev/include/nss -I/nix/store/v85mz845m1hv2xlhp0zvxv36pmsfbc3q-dbus-1.12.16-dev/include/dbus-1.0 -I/nix/store/j3sv2g9s6dnlh672rwx0mmlkcm37v1k8-dbus-1.12.16-lib/lib/dbus-1.0/include -std=c++14 -fno-exceptions -fno-rtti -nostdinc++ -isystem../../buildtools/third_party/libc++/trunk/include -isystem../../buildtools/third_party/libc++abi/trunk/include -fvisibility-inlines-hidden -c gen/chrome/browser/ui/ui_jumbo_3.cc -o obj/chrome/browser/ui/ui/ui_jumbo_3.o
warning: unknown warning option '-Wno-implicit-int-float-conversion'; did you mean '-Wno-implicit-float-conversion'? [-Wunknown-warning-option]
warning: unknown warning option '-Wno-xor-used-as-pow'; did you mean '-Wno-unused-macros'? [-Wunknown-warning-option]
warning: unknown warning option '-Wno-c99-designator'; did you mean '-Wno-gnu-designator'? [-Wunknown-warning-option]
warning: unknown warning option '-Wno-reorder-init-list'; did you mean '-Wno-empty-init-stmt'? [-Wunknown-warning-option]
warning: unknown warning option '-Wno-final-dtor-non-final-class'; did you mean '-Wno-abstract-final-class'? [-Wunknown-warning-option]
In file included from gen/chrome/browser/ui/ui_jumbo_3.cc:24:
./../../chrome/browser/ui/views/profiles/profile_menu_view.cc:68:25: error: redefinition of 'GetProfileAttributesEntry'
ProfileAttributesEntry* GetProfileAttributesEntry(Profile* profile) {
                        ^
./../../chrome/browser/ui/views/profiles/avatar_toolbar_button.cc:49:25: note: previous definition is here
ProfileAttributesEntry* GetProfileAttributesEntry(Profile* profile) {
                        ^
5 warnings and 1 error generated.
---
 pkgs/applications/networking/browsers/chromium/common.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 6d43c313cc0..c2434ed858f 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -227,8 +227,9 @@ let
       use_gold = true;
       gold_path = "${stdenv.cc}/bin";
       is_debug = false;
-      # at least 2X compilation speedup
-      use_jumbo_build = true;
+      # Use jumbo for a 2x (at least) compilation speedup, except where it is currently broken:
+      # https://gist.github.com/ivan/6fe7014c1b1cc35dec133fa6de0549d9
+      use_jumbo_build = (version != "78.0.3904.17");
 
       proprietary_codecs = false;
       use_sysroot = false;
-- 
GitLab


From 5456def6b33dd215043a8b710ee52384309a3833 Mon Sep 17 00:00:00 2001
From: Ivan Kozik <ivan@ludios.org>
Date: Wed, 18 Sep 2019 21:30:15 +0000
Subject: [PATCH 0541/2254] chromiumDev: fix widevine support

Upstream moved libwidevinecdm.so from
./opt/google/chrome-unstable/libwidevinecdm.so
to
./opt/google/chrome-unstable/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so
---
 .../networking/browsers/chromium/default.nix  | 44 ++++++++++++-------
 1 file changed, 29 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index f099ddbff73..5fb0d67a480 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -50,6 +50,7 @@ in let
   widevine = let upstream-info = chromium.upstream-info; in stdenv.mkDerivation {
     name = "chromium-binary-plugin-widevine";
 
+    # The .deb file for Google Chrome
     src = upstream-info.binary;
 
     nativeBuildInputs = [ patchelfUnstable ];
@@ -57,14 +58,21 @@ in let
     phases = [ "unpackPhase" "patchPhase" "installPhase" "checkPhase" ];
 
     unpackCmd = let
-      chan = if upstream-info.channel == "dev"    then "chrome-unstable"
-        else if upstream-info.channel == "stable" then "chrome"
-        else if upstream-info.channel == "beta" then "chrome-beta"
-        else throw "Unknown chromium channel.";
+      soPath =
+        if upstream-info.channel == "stable" then
+          "./opt/google/chrome/libwidevinecdm.so"
+        else if upstream-info.channel == "beta" then
+          "./opt/google/chrome-beta/libwidevinecdm.so"
+        else if upstream-info.channel == "dev" then
+          "./opt/google/chrome-unstable/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so"
+        else
+          throw "Unknown chromium channel.";
     in ''
       mkdir -p plugins
-      ar p "$src" data.tar.xz | tar xJ -C plugins --strip-components=4 \
-        ./opt/google/${chan}/libwidevinecdm.so
+      # Extract just libwidevinecdm.so from upstream's .deb file
+      ar p "$src" data.tar.xz | tar xJ -C plugins ${soPath}
+      mv plugins/${soPath} plugins/
+      rm -rf plugins/opt
     '';
 
     doCheck = true;
@@ -83,7 +91,10 @@ in let
         "$out/lib/libwidevinecdm.so"
     '';
 
-    meta.platforms = lib.platforms.x86_64;
+    meta = {
+      platforms = [ "x86_64-linux" ];
+      license = lib.licenses.unfree;
+    };
   };
 
   suffix = if channel != "stable" then "-" + channel else "";
@@ -92,18 +103,21 @@ in let
 
   version = chromium.browser.version;
 
-  # This is here because we want to add the widevine shared object at the last
-  # minute in order to avoid a full rebuild of chromium. Additionally, this
-  # isn't in `browser.nix` so we can avoid having to re-expose attributes of
-  # the chromium derivation (see above: we introspect `sandboxExecutableName`).
+  # We want users to be able to enableWideVine without rebuilding all of
+  # chromium, so we have a separate derivation here that copies chromium
+  # and adds the unfree libwidevinecdm.so.
   chromiumWV = let browser = chromium.browser; in if enableWideVine then
     runCommand (browser.name + "-wv") { version = browser.version; }
       ''
         mkdir -p $out
-        cp -R ${browser}/* $out/
-        chmod u+w $out/libexec/chromium*
-        cp ${widevine}/lib/libwidevinecdm.so $out/libexec/chromium/
-        # patchelf?
+        cp -a ${browser}/* $out/
+        chmod u+w $out/libexec/chromium
+        if [[ ${channel} != "dev" ]]; then
+          cp ${widevine}/lib/libwidevinecdm.so $out/libexec/chromium/
+        else
+          mkdir -p $out/libexec/chromium/WidevineCdm/_platform_specific/linux_x64
+          cp ${widevine}/lib/libwidevinecdm.so $out/libexec/chromium/WidevineCdm/_platform_specific/linux_x64/
+        fi
       ''
     else browser;
 in stdenv.mkDerivation {
-- 
GitLab


From 6605fffa17ed224d9ccbd1d4148fd9484d0064dc Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 19 Sep 2019 08:53:33 +0800
Subject: [PATCH 0542/2254] mosquitto: 1.6.5 -> 1.6.6

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

diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/servers/mqtt/mosquitto/default.nix
index 5a5342b91d3..5ecf34282d7 100644
--- a/pkgs/servers/mqtt/mosquitto/default.nix
+++ b/pkgs/servers/mqtt/mosquitto/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "mosquitto";
-  version = "1.6.5";
+  version = "1.6.6";
 
   src = fetchFromGitHub {
     owner  = "eclipse";
     repo   = "mosquitto";
     rev    = "v${version}";
-    sha256 = "0scgsi3rvs9s8vxv4r7d5d9ixbsfg4dwnjcy6zxwdz9dfn8qnngj";
+    sha256 = "01a1vf0rgncmhk7v9vnj4gdx0j8jfiy95f2hr4iwqdch7jy5q367";
   };
 
   postPatch = ''
-- 
GitLab


From 88aaa572960df081d230ecb3733c6026689f3598 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 18 Sep 2019 20:27:31 -0500
Subject: [PATCH 0543/2254] bind: 9.14.4 -> 9.14.6

9.14.5: https://gitlab.isc.org/isc-projects/bind9/blob/v9_14_5/CHANGES
9.14.6: https://gitlab.isc.org/isc-projects/bind9/blob/v9_14/CHANGES

9.14.6 above links to the 9.14 branch CHANGES, no tag yet.
ISC's website has 9.14.6, which is the authoritative source.
---
 pkgs/servers/dns/bind/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index af914ae6cd7..31e1ac50942 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -8,15 +8,13 @@
 assert enableSeccomp -> libseccomp != null;
 assert enablePython -> python3 != null;
 
-let version = "9.14.4"; in
-
 stdenv.mkDerivation rec {
   pname = "bind";
-  inherit version;
+  version = "9.14.6";
 
   src = fetchurl {
     url = "https://ftp.isc.org/isc/bind9/${version}/${pname}-${version}.tar.gz";
-    sha256 = "0gxqws7ml15lwkjw9mdcd759gv5kk3s9m17j3vrp9448ls1gnbii";
+    sha256 = "1zpd47ckn5lf4qbscfkj7krngwn2gwsp961v5401h3lhxm0a0rw9";
   };
 
   outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];
-- 
GitLab


From 319710d48c91c3ccb717e10ed266f2779a88f54e Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 18 Sep 2019 21:00:00 -0500
Subject: [PATCH 0544/2254] cascadia-code: init at 1909.16

---
 pkgs/data/fonts/cascadia-code/default.nix | 27 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/data/fonts/cascadia-code/default.nix

diff --git a/pkgs/data/fonts/cascadia-code/default.nix b/pkgs/data/fonts/cascadia-code/default.nix
new file mode 100644
index 00000000000..ddb214c49e1
--- /dev/null
+++ b/pkgs/data/fonts/cascadia-code/default.nix
@@ -0,0 +1,27 @@
+{ lib, fetchurl }:
+
+let
+  pname = "cascadia-code";
+  version = "1909.16";
+in
+fetchurl {
+  name = "${pname}-${version}";
+  url = "https://github.com/microsoft/cascadia-code/releases/download/v${version}/Cascadia.ttf";
+
+  downloadToTemp = true;
+  recursiveHash = true;
+
+  postFetch = ''
+    install -Dm444 $downloadedFile $out/share/fonts/truetype/Cascadia.ttf
+  '';
+
+  sha256 = "0nckczvak3pd1h3fiz0j827pm87px9swx60q07lc2jnjlxcghgl2";
+
+  meta = with lib; {
+    description = "Monospaced font that includes programming ligatures and is designed to enhance the modern look and feel of the Windows Terminal";
+    homepage = "https://github.com/microsoft/cascadia-code";
+    license = licenses.ofl;
+    maintainers = [ maintainers.marsam ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 81fae113b0a..e5d65e47895 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16593,6 +16593,8 @@ in
 
   carlito = callPackage ../data/fonts/carlito {};
 
+  cascadia-code = callPackage ../data/fonts/cascadia-code { };
+
   charis-sil = callPackage ../data/fonts/charis-sil { };
 
   cherry = callPackage ../data/fonts/cherry { };
-- 
GitLab


From 5cc70a7b6bbdc9c2ae3e7e849fa80f155ea735d4 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 18 Sep 2019 21:44:55 -0500
Subject: [PATCH 0545/2254] terra: touchups

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/compilers/terra/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/terra/default.nix b/pkgs/development/compilers/terra/default.nix
index dea6df1b7aa..c4e697f2f1e 100644
--- a/pkgs/development/compilers/terra/default.nix
+++ b/pkgs/development/compilers/terra/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchFromGitHub, fetchurl, llvmPackages, ncurses, lua }:
+{ stdenv, fetchurl, fetchFromGitHub
+, llvmPackages, ncurses, lua
+}:
 
 let
   luajitArchive = "LuaJIT-2.0.5.tar.gz";
@@ -49,9 +51,9 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A low-level counterpart to Lua";
-    homepage = http://terralang.org/;
-    platforms = platforms.x86_64;
-    maintainers = with maintainers; [ jb55 ];
-    license = licenses.mit;
+    homepage    = http://terralang.org/;
+    platforms   = platforms.x86_64;
+    maintainers = with maintainers; [ jb55 thoughtpolice ];
+    license     = licenses.mit;
   };
 }
-- 
GitLab


From 3288d3670feaec0d1d9cc2d95fca6a76301474db Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 18 Sep 2019 21:44:55 -0500
Subject: [PATCH 0546/2254] terra: patch to use NIX_CFLAGS_COMPILE for includes

Terra heavily depends on its ability to interface with C APIs, but
without scanning NIX_CFLAGS_COMPILE, it's awkward and annoying to set up
imports correctly (by scanning and adding the flags yourself) in every
single project.

Luckily most of the Clang initialization is hidden away, but the Lua
code for the Terra library handles all the high-level stuff, so we patch
it in there.

This allows simple examples like:

    C = terralib.includec("zlib.h")

to work instantly, provided `zlib` is a Nix dependency.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/compilers/terra/default.nix  |  2 ++
 .../compilers/terra/nix-cflags.patch          | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/development/compilers/terra/nix-cflags.patch

diff --git a/pkgs/development/compilers/terra/default.nix b/pkgs/development/compilers/terra/default.nix
index c4e697f2f1e..371009af5ff 100644
--- a/pkgs/development/compilers/terra/default.nix
+++ b/pkgs/development/compilers/terra/default.nix
@@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
 
   outputs = [ "bin" "dev" "out" "static" ];
 
+  patches = [ ./nix-cflags.patch ];
+
   postPatch = ''
     substituteInPlace Makefile --replace \
       '-lcurses' '-lncurses'
diff --git a/pkgs/development/compilers/terra/nix-cflags.patch b/pkgs/development/compilers/terra/nix-cflags.patch
new file mode 100644
index 00000000000..be9b6a61088
--- /dev/null
+++ b/pkgs/development/compilers/terra/nix-cflags.patch
@@ -0,0 +1,19 @@
+diff --git a/src/terralib.lua b/src/terralib.lua
+index 351238d..f26591b 100644
+--- a/src/terralib.lua
++++ b/src/terralib.lua
+@@ -3395,6 +3395,14 @@ function terra.includecstring(code,cargs,target)
+     	args:insert("-internal-isystem")
+     	args:insert(path)
+     end
++
++    -- NOTE(aseipp): include relevant Nix header files
++    local nix_cflags = os.getenv('NIX_CFLAGS_COMPILE')
++    if nix_cflags ~= nil then
++        for w in nix_cflags:gmatch("%S+") do
++          args:insert(w)
++        end
++    end
+     
+     if cargs then
+         args:insertall(cargs)
-- 
GitLab


From 52d3655c3d5fcb83b6dbb054b272007270849bb3 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 18 Sep 2019 22:13:18 -0500
Subject: [PATCH 0547/2254] terra: 1.0.0-beta1 -> 1.0.0pre1175_ef6a75f

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/compilers/terra/default.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/compilers/terra/default.nix b/pkgs/development/compilers/terra/default.nix
index 371009af5ff..edab1cb0df2 100644
--- a/pkgs/development/compilers/terra/default.nix
+++ b/pkgs/development/compilers/terra/default.nix
@@ -5,22 +5,24 @@
 let
   luajitArchive = "LuaJIT-2.0.5.tar.gz";
   luajitSrc = fetchurl {
-    url = "http://luajit.org/download/${luajitArchive}";
+    url    = "http://luajit.org/download/${luajitArchive}";
     sha256 = "0yg9q4q6v028bgh85317ykc9whgxgysp76qzaqgq55y6jy11yjw7";
   };
 in
 
 stdenv.mkDerivation rec {
-  pname = "terra-git";
-  version = "1.0.0-beta1";
+  pname = "terra";
+  version = "1.0.0pre1175_${builtins.substring 0 7 src.rev}";
 
   src = fetchFromGitHub {
-    owner = "zdevito";
-    repo = "terra";
-    rev = "release-${version}";
-    sha256 = "1blv3mbmlwb6fxkck6487ck4qq67cbwq6s1zlp86hy2wckgf8q2c";
+    owner  = "zdevito";
+    repo   = "terra";
+    rev    = "ef6a75ffee15a30f3c74f4e6943851cfbc0fec3d";
+    sha256 = "0aky17vbv3d9zng34hp17p9zb00dbzwhvzsdjzrrqvk9lmyvix0s";
   };
 
+  hardeningDisable = [ "fortify" ];
+
   outputs = [ "bin" "dev" "out" "static" ];
 
   patches = [ ./nix-cflags.patch ];
-- 
GitLab


From 0a784ab6aaf722856219fadba987254fd1eeecdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 19 Sep 2019 04:52:35 +0100
Subject: [PATCH 0548/2254] radare2: 3.8.0 -> 3.9.0

---
 .../development/tools/analysis/radare2/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix
index cd8ae42f20b..41949b0ad42 100644
--- a/pkgs/development/tools/analysis/radare2/default.nix
+++ b/pkgs/development/tools/analysis/radare2/default.nix
@@ -110,17 +110,17 @@ in {
   #<generated>
   # DO NOT EDIT! Automatically generated by ./update.py
   radare2 = generic {
-    version_commit = "22646";
-    gittap = "3.8.0";
-    gittip = "b4860e4eecad2053202965926f16296864b2f1e5";
-    rev = "3.8.0";
-    version = "3.8.0";
-    sha256 = "0rx6az2vpqy12lvzpxx9pappqj84d88daj8bis3zsffqgmhsafcd";
+    version_commit = "22775";
+    gittap = "3.9.0";
+    gittip = "2afe613741d07f35a5d80bc4e2dade2113ae6a74";
+    rev = "3.9.0";
+    version = "3.9.0";
+    sha256 = "0jzz3fzcr9xm8q6n86mhrf30h6cbh147ss9h993cm34fd4d5z7ah";
     cs_ver = "4.0.1";
     cs_sha256 = "0ijwxxk71nr9z91yxw20zfj4bbsbrgvixps5c7cpj163xlzlwba6";
   };
   r2-for-cutter = generic {
-    version_commit = "22265";
+    version_commit = "22775";
     gittap = "3.6.0";
     gittip = "ff3bb6e3b2e6a519b4c975d05758c171a5186389";
     rev = "ff3bb6e3b2e6a519b4c975d05758c171a5186389";
-- 
GitLab


From 454b052450ce91ddbf950cad2cc1ccd715f50141 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 19 Sep 2019 11:42:23 +0800
Subject: [PATCH 0549/2254] librecad: 2.1.3 -> 2.2.0-rc1

rc1 is considered stable by upstream.
---
 pkgs/applications/misc/librecad/default.nix   | 70 ++++++++++++-------
 .../misc/librecad/fix_qt_5_11_build.patch     | 36 ++++++++++
 pkgs/top-level/all-packages.nix               |  2 +-
 3 files changed, 83 insertions(+), 25 deletions(-)
 create mode 100644 pkgs/applications/misc/librecad/fix_qt_5_11_build.patch

diff --git a/pkgs/applications/misc/librecad/default.nix b/pkgs/applications/misc/librecad/default.nix
index 09089a072b3..142dafe38eb 100644
--- a/pkgs/applications/misc/librecad/default.nix
+++ b/pkgs/applications/misc/librecad/default.nix
@@ -1,42 +1,64 @@
-{ stdenv, fetchurl, qt4, qmake4Hook, muparser, which, boost, pkgconfig }:
+{ mkDerivation, lib, fetchFromGitHub, installShellFiles, pkgconfig, runtimeShell
+, qtbase, qtsvg, qttools, qmake
+, boost, muparser }:
 
-stdenv.mkDerivation rec {
-  version = "2.1.3";
+mkDerivation rec {
   pname = "librecad";
+  version = "2.2.0-rc1";
 
-  src = fetchurl {
-    url = "https://github.com/LibreCAD/LibreCAD/tarball/${version}";
-    name = "${pname}-${version}" + ".tar.gz";
-    sha256 = "1czp8bja61hfav2m7184cq1np1n76w3w6vn0hlkp81hhz9zc62sx";
+  src = fetchFromGitHub {
+    owner = "LibreCAD";
+    repo = "LibreCAD";
+    rev = version;
+    sha256 = "0kwj838hqzbw95gl4x6scli9gj3gs72hdmrrkzwq5rjxam18k3f3";
   };
 
-  patchPhase = ''
-    sed -i -e s,/bin/bash,`type -P bash`, scripts/postprocess-unix.sh
-    sed -i -e s,/usr/share,$out/share, librecad/src/lib/engine/rs_system.cpp
+  patches = [ ./fix_qt_5_11_build.patch ];
+
+  postPatch = ''
+    substituteInPlace scripts/postprocess-unix.sh \
+      --replace /bin/sh ${runtimeShell}
+
+    substituteInPlace librecad/src/lib/engine/rs_system.cpp \
+      --replace /usr/share $out/share
+
+    substituteInPlace librecad/src/main/qc_applicationwindow.cpp \
+      --replace __DATE__ 0
   '';
 
-  qmakeFlags = [ "MUPARSER_DIR=${muparser}" "BOOST_DIR=${boost.dev}" ];
+  qmakeFlags = [
+    "MUPARSER_DIR=${muparser}"
+    "BOOST_DIR=${boost.dev}"
+  ];
 
   installPhase = ''
-    install -m 555 -D unix/librecad $out/bin/librecad
-    install -m 444 -D desktop/librecad.desktop $out/share/applications/librecad.desktop
-    install -m 444 -D desktop/librecad.sharedmimeinfo $out/share/mime/packages/librecad.xml
-    install -m 444 -D desktop/graphics_icons_and_splash/Icon\ LibreCAD/Icon_Librecad.svg \
+    runHook preInstall
+
+    install -Dm555 -t $out/bin                unix/{librecad,ttf2lff}
+    install -Dm444 -t $out/share/applications desktop/librecad.desktop
+    install -Dm644 -t $out/share/pixmaps      librecad/res/main/librecad.png
+    install -Dm444 desktop/librecad.sharedmimeinfo $out/share/mime/packages/librecad.xml
+    install -Dm444 desktop/graphics_icons_and_splash/Icon\ LibreCAD/Icon_Librecad.svg \
       $out/share/icons/hicolor/scalable/apps/librecad.svg
+
+    installManPage desktop/librecad.?
+
     cp -R unix/resources $out/share/librecad
+
+    runHook postInstall
   '';
 
-  buildInputs = [ qt4 muparser which boost ];
-  nativeBuildInputs = [ pkgconfig qmake4Hook ];
+  buildInputs = [ boost muparser qtbase qtsvg ];
+
+  nativeBuildInputs = [ installShellFiles pkgconfig qmake qttools ];
 
   enableParallelBuilding = true;
 
-  meta = {
-    description = "A 2D CAD package based upon Qt";
-    homepage = https://librecad.org;
-    repositories.git = git://github.com/LibreCAD/LibreCAD.git;
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
+  meta = with lib; {
+    description = "2D CAD package based on Qt";
+    homepage = "https://librecad.org";
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ viric ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/misc/librecad/fix_qt_5_11_build.patch b/pkgs/applications/misc/librecad/fix_qt_5_11_build.patch
new file mode 100644
index 00000000000..04701e5ab1e
--- /dev/null
+++ b/pkgs/applications/misc/librecad/fix_qt_5_11_build.patch
@@ -0,0 +1,36 @@
+diff --git a/librecad/src/ui/forms/qg_commandwidget.cpp b/librecad/src/ui/forms/qg_commandwidget.cpp
+index 835e47d..2c878e8 100644
+--- a/librecad/src/ui/forms/qg_commandwidget.cpp
++++ b/librecad/src/ui/forms/qg_commandwidget.cpp
+@@ -27,6 +27,7 @@
+ 
+ #include <algorithm>
+ 
++#include <QAction>
+ #include <QKeyEvent>
+ #include <QFileDialog>
+ #include <QSettings>
+diff --git a/librecad/src/ui/generic/colorwizard.cpp b/librecad/src/ui/generic/colorwizard.cpp
+index 2beaceb..84068ad 100644
+--- a/librecad/src/ui/generic/colorwizard.cpp
++++ b/librecad/src/ui/generic/colorwizard.cpp
+@@ -27,6 +27,7 @@
+ #include "colorwizard.h"
+ #include "ui_colorwizard.h"
+ 
++#include <QAction>
+ #include <QColorDialog>
+ #include <QLineEdit>
+ #include <QListWidget>
+diff --git a/librecad/src/ui/generic/widgetcreator.cpp b/librecad/src/ui/generic/widgetcreator.cpp
+index 7c35144..0e394f2 100644
+--- a/librecad/src/ui/generic/widgetcreator.cpp
++++ b/librecad/src/ui/generic/widgetcreator.cpp
+@@ -27,6 +27,7 @@
+ #include "widgetcreator.h"
+ #include "ui_widgetcreator.h"
+ 
++#include <QActionGroup>
+ #include <QSettings>
+ #include <QLineEdit>
+ #include <QPushButton>
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 81fae113b0a..22ad0d41f18 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19120,7 +19120,7 @@ in
 
   libowfat = callPackage ../development/libraries/libowfat { };
 
-  librecad = callPackage ../applications/misc/librecad { };
+  librecad = libsForQt5.callPackage ../applications/misc/librecad { };
 
   libreoffice = hiPrio libreoffice-still;
   libreoffice-unwrapped = libreoffice.libreoffice;
-- 
GitLab


From d5e1d57ceeb06f9d4b465453116c5911264310cd Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 19 Sep 2019 00:26:48 -0500
Subject: [PATCH 0550/2254] terra: include libc headers by default, run tests

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/compilers/terra/default.nix  | 19 ++++++++++++-------
 .../compilers/terra/nix-cflags.patch          |  7 +++++--
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/compilers/terra/default.nix b/pkgs/development/compilers/terra/default.nix
index edab1cb0df2..6d87d4bbd49 100644
--- a/pkgs/development/compilers/terra/default.nix
+++ b/pkgs/development/compilers/terra/default.nix
@@ -9,7 +9,6 @@ let
     sha256 = "0yg9q4q6v028bgh85317ykc9whgxgysp76qzaqgq55y6jy11yjw7";
   };
 in
-
 stdenv.mkDerivation rec {
   pname = "terra";
   version = "1.0.0pre1175_${builtins.substring 0 7 src.rev}";
@@ -21,15 +20,21 @@ stdenv.mkDerivation rec {
     sha256 = "0aky17vbv3d9zng34hp17p9zb00dbzwhvzsdjzrrqvk9lmyvix0s";
   };
 
-  hardeningDisable = [ "fortify" ];
+  nativeBuildInputs = [ lua ];
+  buildInputs = with llvmPackages; [ llvm clang-unwrapped ncurses ];
 
+  doCheck = true;
+  enableParallelBuilding = true;
+  hardeningDisable = [ "fortify" ];
   outputs = [ "bin" "dev" "out" "static" ];
 
   patches = [ ./nix-cflags.patch ];
-
   postPatch = ''
-    substituteInPlace Makefile --replace \
-      '-lcurses' '-lncurses'
+    substituteInPlace Makefile \
+      --replace '-lcurses' '-lncurses'
+
+    substituteInPlace src/terralib.lua \
+      --subst-var-by NIX_LIBC_INCLUDE ${stdenv.cc.libc.dev}/include
   '';
 
   preBuild = ''
@@ -42,6 +47,8 @@ stdenv.mkDerivation rec {
     cp ${luajitSrc} build/${luajitArchive}
   '';
 
+  checkPhase = "(cd tests && ../terra run)";
+
   installPhase = ''
     install -Dm755 -t $bin/bin release/bin/terra
     install -Dm755 -t $out/lib release/lib/terra${stdenv.hostPlatform.extensions.sharedLibrary}
@@ -51,8 +58,6 @@ stdenv.mkDerivation rec {
     cp -rv release/include/terra $dev/include
   '';
 
-  buildInputs = with llvmPackages; [ lua llvm clang-unwrapped ncurses ];
-
   meta = with stdenv.lib; {
     description = "A low-level counterpart to Lua";
     homepage    = http://terralang.org/;
diff --git a/pkgs/development/compilers/terra/nix-cflags.patch b/pkgs/development/compilers/terra/nix-cflags.patch
index be9b6a61088..339ae23cef6 100644
--- a/pkgs/development/compilers/terra/nix-cflags.patch
+++ b/pkgs/development/compilers/terra/nix-cflags.patch
@@ -1,13 +1,16 @@
 diff --git a/src/terralib.lua b/src/terralib.lua
-index 351238d..f26591b 100644
+index 351238d..e638c90 100644
 --- a/src/terralib.lua
 +++ b/src/terralib.lua
-@@ -3395,6 +3395,14 @@ function terra.includecstring(code,cargs,target)
+@@ -3395,6 +3395,17 @@ function terra.includecstring(code,cargs,target)
      	args:insert("-internal-isystem")
      	args:insert(path)
      end
 +
 +    -- NOTE(aseipp): include relevant Nix header files
++    args:insert("-isystem")
++    args:insert("@NIX_LIBC_INCLUDE@")
++
 +    local nix_cflags = os.getenv('NIX_CFLAGS_COMPILE')
 +    if nix_cflags ~= nil then
 +        for w in nix_cflags:gmatch("%S+") do
-- 
GitLab


From aa413a0ce3b3f36c4ac880f12775a1f800476936 Mon Sep 17 00:00:00 2001
From: Lily Ballard <lily@sb.org>
Date: Wed, 18 Sep 2019 22:54:37 -0700
Subject: [PATCH 0551/2254] jazzy: 0.11.0 -> 0.11.1

---
 pkgs/development/tools/jazzy/Gemfile.lock |  6 +++---
 pkgs/development/tools/jazzy/gemset.nix   | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/tools/jazzy/Gemfile.lock b/pkgs/development/tools/jazzy/Gemfile.lock
index 45b6a14eb08..28bd27ecc76 100644
--- a/pkgs/development/tools/jazzy/Gemfile.lock
+++ b/pkgs/development/tools/jazzy/Gemfile.lock
@@ -51,7 +51,7 @@ GEM
     gh_inspector (1.1.3)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    jazzy (0.11.0)
+    jazzy (0.11.1)
       cocoapods (~> 1.5)
       mustache (~> 1.1)
       open4
@@ -69,9 +69,9 @@ GEM
     netrc (0.11.0)
     open4 (1.3.4)
     redcarpet (3.5.0)
-    rouge (3.10.0)
+    rouge (3.11.0)
     ruby-macho (1.4.0)
-    sassc (2.2.0)
+    sassc (2.2.1)
       ffi (~> 1.9)
     sqlite3 (1.4.1)
     thread_safe (0.3.6)
diff --git a/pkgs/development/tools/jazzy/gemset.nix b/pkgs/development/tools/jazzy/gemset.nix
index dada7f43073..19ec06b6a2b 100644
--- a/pkgs/development/tools/jazzy/gemset.nix
+++ b/pkgs/development/tools/jazzy/gemset.nix
@@ -209,10 +209,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0cwsmijhb845lrkwq1gxwa6a698vp47gdxcpav30dghrf1ikyzqm";
+      sha256 = "0kdja4bhzak79xvfpwwakqsjw07vfg458d62k08a416im7xcfcmc";
       type = "gem";
     };
-    version = "0.11.0";
+    version = "0.11.1";
   };
   liferaft = {
     source = {
@@ -301,10 +301,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "07j29vbgsi9v7kpx4lqpmh0hx59i420jig73dy46wx3id1i7vdqz";
+      sha256 = "1zsyv6abqrk7lpql5f1ja4m88bfy9qndi8xykpss6cpvjdmi3ydb";
       type = "gem";
     };
-    version = "3.10.0";
+    version = "3.11.0";
   };
   ruby-macho = {
     groups = ["default"];
@@ -322,10 +322,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "178iflma5z4qk2lfzlxk8kh942skj45q6v6xwllkqng9xbjlyzkf";
+      sha256 = "09bnid7r5z5hcin5hykvpvv8xig27wbbckxwis60z2aaxq4j9siz";
       type = "gem";
     };
-    version = "2.2.0";
+    version = "2.2.1";
   };
   sqlite3 = {
     groups = ["default"];
-- 
GitLab


From c4486a084f718b7813352d5a77d9b219ec44f99c Mon Sep 17 00:00:00 2001
From: Claudio Bley <cbley@exa-online.de>
Date: Thu, 19 Sep 2019 09:02:15 +0200
Subject: [PATCH 0552/2254] ntopng: Add patch needed to build with newer
 libpcap

Fixes build errors for the third-party mongoose module:
```
In file included from
/nix/store/r5s3w32ahjzdlzsfrhybc3l2qcpi6yb2-libpcap-1.9.0/include/pcap.h:43,
                 from /build/ntopng-2.0/include/ntop_includes.h:93,
                                  from src/HTTPserver.cpp:22:
/nix/store/r5s3w32ahjzdlzsfrhybc3l2qcpi6yb2-libpcap-1.9.0/include/pcap/pcap.h:958: note: this is the location of the previous definition
   #define INVALID_SOCKET -1

src/../third-party/mongoose/mongoose.c:270:13: error: multiple types in one declaration
 typedef int SOCKET;
             ^~~~~~
```
---
 .../0003-New-libpcap-defines-SOCKET.patch     | 34 +++++++++++++++++++
 pkgs/tools/networking/ntopng/default.nix      |  1 +
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/tools/networking/ntopng/0003-New-libpcap-defines-SOCKET.patch

diff --git a/pkgs/tools/networking/ntopng/0003-New-libpcap-defines-SOCKET.patch b/pkgs/tools/networking/ntopng/0003-New-libpcap-defines-SOCKET.patch
new file mode 100644
index 00000000000..51c9a706f89
--- /dev/null
+++ b/pkgs/tools/networking/ntopng/0003-New-libpcap-defines-SOCKET.patch
@@ -0,0 +1,34 @@
+From 9cb650ea96c0e5063775071cfdae072e92c553b8 Mon Sep 17 00:00:00 2001
+From: emanuele-f <faranda@ntop.org>
+Date: Tue, 18 Sep 2018 12:49:57 +0200
+Subject: [PATCH] Compilation fix with new libpcap
+
+SOCKET and INVALID_SOCKET are now defined in pcap.h
+---
+ third-party/mongoose/mongoose.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/third-party/mongoose/mongoose.c b/third-party/mongoose/mongoose.c
+index 6a61cea9b..634c142e3 100644
+--- a/third-party/mongoose/mongoose.c
++++ b/third-party/mongoose/mongoose.c
+@@ -247,7 +247,9 @@ struct pollfd {
+ #define mg_rename(x, y) rename(x, y)
+ #define mg_sleep(x) usleep((x) * 1000)
+ #define ERRNO errno
++#ifndef INVALID_SOCKET
+ #define INVALID_SOCKET (-1)
++#endif
+ 
+ /* ntop */
+ #if ((ULONG_MAX) == (UINT_MAX))
+@@ -270,7 +272,9 @@ struct pollfd {
+ #endif
+ 
+ //#define INT64_FMT PRId64
++#ifndef SOCKET
+ typedef int SOCKET;
++#endif
+ #define WINCDECL
+ 
+ #endif // End of Windows and UNIX specific includes
diff --git a/pkgs/tools/networking/ntopng/default.nix b/pkgs/tools/networking/ntopng/default.nix
index d745ba8d14d..98d97fbb7d7 100644
--- a/pkgs/tools/networking/ntopng/default.nix
+++ b/pkgs/tools/networking/ntopng/default.nix
@@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
   patches = [
     ./0001-Undo-weird-modification-of-data_dir.patch
     ./0002-Remove-requirement-to-have-writeable-callback-dir.patch
+    ./0003-New-libpcap-defines-SOCKET.patch
   ];
 
   buildInputs = [ libpcap/* gnutls libgcrypt*/ libxml2 glib geoip geolite-legacy
-- 
GitLab


From 283cf085761b2cc838d0173c76ef1e9dabab038e Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Thu, 19 Sep 2019 10:51:35 +0200
Subject: [PATCH 0553/2254] jormungandr: 0.3.3 -> 0.3.1415

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

diff --git a/pkgs/applications/blockchains/jormungandr/default.nix b/pkgs/applications/blockchains/jormungandr/default.nix
index 8c276d6bb80..541ef49ef5a 100644
--- a/pkgs/applications/blockchains/jormungandr/default.nix
+++ b/pkgs/applications/blockchains/jormungandr/default.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "jormungandr";
-  version = "0.3.3";
+  version = "0.3.1415";
 
   src = fetchgit {
     url = "https://github.com/input-output-hk/${pname}";
     rev = "v${version}";
-    sha256 = "1fw3cl2rxnw9mww1b1z96x2iapwbpdgyp4ra19dhvfzmlvaiml5j";
+    sha256 = "1kg20570ri3bj99gicpp2z272igj9s7m2qw0z1ndk60bxcyghi2x";
     fetchSubmodules = true;
   };
 
-  cargoSha256 = "1ilp9ffaz3njv38mnqics4b5d7wh52mj4rwi71h5c0wzx4ww3zal";
+  cargoSha256 = "0b5phmvwv5cyjawlxd9rmlc403lxzm4gnw0mclq70g5g0msqzd9m";
 
   nativeBuildInputs = [ pkgconfig protobuf ];
   buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
-- 
GitLab


From 0358bc174b17aeaadfd7cc5c073c18b0b1ccf6e0 Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Thu, 19 Sep 2019 10:51:59 +0200
Subject: [PATCH 0554/2254] nixos/jormungandr: moving to a new section
 topics_of_interest

---
 nixos/modules/services/networking/jormungandr.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/networking/jormungandr.nix b/nixos/modules/services/networking/jormungandr.nix
index 85e804d6cf2..152cceb4bf9 100644
--- a/nixos/modules/services/networking/jormungandr.nix
+++ b/nixos/modules/services/networking/jormungandr.nix
@@ -14,8 +14,10 @@ let
     storage = dataDir;
     p2p = {
       public_address = "/ip4/127.0.0.1/tcp/8299";
-      messages = "high";
-      blocks = "high";
+      topics_of_interest = {
+        messages = "high";
+        blocks = "high";
+      };
     };
     rest = {
       listen = "127.0.0.1:8607";
-- 
GitLab


From ad4a3074c0b35ff8c414b4794f6e2f179e6b15e9 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@gmail.com>
Date: Thu, 19 Sep 2019 10:04:54 +0300
Subject: [PATCH 0555/2254] qtcreator: use Qt mkDerivation

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

diff --git a/pkgs/development/tools/qtcreator/default.nix b/pkgs/development/tools/qtcreator/default.nix
index c8f7ccb18d5..7e592bf060a 100644
--- a/pkgs/development/tools/qtcreator/default.nix
+++ b/pkgs/development/tools/qtcreator/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl, fetchgit, fetchpatch, makeWrapper
+{ mkDerivation, lib, fetchurl, fetchgit, fetchpatch
 , qtbase, qtquickcontrols, qtscript, qtdeclarative, qmake, llvmPackages_8
 , withDocumentation ? false
 }:
 
-with stdenv.lib;
+with lib;
 
 let
   baseVersion = "4.9";
@@ -21,7 +21,7 @@ let
   });
 in
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   pname = "qtcreator";
   version = "${baseVersion}.${revision}";
 
-- 
GitLab


From 17287938abbcc914b685377d2c931f2529b8e659 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 18 Sep 2019 17:20:20 -0700
Subject: [PATCH 0556/2254] pythonPackages.premailer: fix build

---
 .../python-modules/premailer/default.nix         | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/premailer/default.nix b/pkgs/development/python-modules/premailer/default.nix
index 14fa0d2f59d..f19f2dfe265 100644
--- a/pkgs/development/python-modules/premailer/default.nix
+++ b/pkgs/development/python-modules/premailer/default.nix
@@ -1,22 +1,22 @@
 { lib, buildPythonPackage, fetchPypi,
-  cssselect, cssutils, lxml, mock, nose, requests
+  cssselect, cssutils, lxml, mock, nose, requests, cachetools
 }:
 
 buildPythonPackage rec {
   pname = "premailer";
   version = "3.3.0";
 
-  meta = {
-    description = "Turns CSS blocks into style attributes ";
-    homepage = https://github.com/peterbe/premailer;
-    license = lib.licenses.bsd3;
-  };
-
   src = fetchPypi {
     inherit pname version;
     sha256 = "93be4f197e9d2a87a8fe6b5b6a79b64070dbb523108dfaf2a415b4558fc78ec1";
   };
 
   buildInputs = [ mock nose ];
-  propagatedBuildInputs = [ cssselect cssutils lxml requests ];
+  propagatedBuildInputs = [ cachetools cssselect cssutils lxml requests ];
+
+  meta = {
+    description = "Turns CSS blocks into style attributes ";
+    homepage = https://github.com/peterbe/premailer;
+    license = lib.licenses.bsd3;
+  };
 }
-- 
GitLab


From 7b449bcf039cc75b0479dfe46767ef4bb82adfd7 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 18 Sep 2019 12:54:48 -0500
Subject: [PATCH 0557/2254] openttd: 1.9.2 -> 1.9.3

https://www.openttd.org/news/2019/09/16/openttd-1-9-3.html
---
 pkgs/games/openttd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix
index e3c23ad2671..d0828b8811b 100644
--- a/pkgs/games/openttd/default.nix
+++ b/pkgs/games/openttd/default.nix
@@ -29,11 +29,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "openttd";
-  version = "1.9.2";
+  version = "1.9.3";
 
   src = fetchurl {
     url = "https://proxy.binaries.openttd.org/openttd-releases/${version}/${pname}-${version}-source.tar.xz";
-    sha256 = "0jjnnzp1a2l8j1cla28pr460lx6cg4ql3acqfxhxv8a5a4jqrzzr";
+    sha256 = "0ijq72kgx997ggw40i5f4a3nf7y2g72z37l47i18yjvgbdzy320r";
   };
 
   nativeBuildInputs = [ pkgconfig makeWrapper ];
-- 
GitLab


From 3b437ebe591b641a60bb07f6d048caa8c2000c18 Mon Sep 17 00:00:00 2001
From: Claudio Bley <cbley@exa-online.de>
Date: Thu, 19 Sep 2019 12:18:20 +0200
Subject: [PATCH 0558/2254] ntopng: Remove `broken = true`

---
 pkgs/tools/networking/ntopng/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/tools/networking/ntopng/default.nix b/pkgs/tools/networking/ntopng/default.nix
index 98d97fbb7d7..0c693ac6288 100644
--- a/pkgs/tools/networking/ntopng/default.nix
+++ b/pkgs/tools/networking/ntopng/default.nix
@@ -63,6 +63,5 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3Plus;
     platforms = platforms.linux ++ platforms.darwin;
     maintainers = [ maintainers.bjornfor ];
-    broken = true;  # broken since commit "libpcap: 1.8.1 -> 1.9.0"
   };
 }
-- 
GitLab


From 0d67be04168552eef267c66f4c41169261fd8feb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 12 Sep 2019 02:30:52 +0200
Subject: [PATCH 0559/2254] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.14.4-9-g449ad2b from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/ed250ead255d7a1f3a30cfeabd57d620ee313398.
---
 .../haskell-modules/hackage-packages.nix      | 2942 ++++++++++++-----
 1 file changed, 2104 insertions(+), 838 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 3b91b02ffad..d71a1c65a24 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -6440,10 +6440,8 @@ self: {
      }:
      mkDerivation {
        pname = "GLFW-b";
-       version = "3.2.1.0";
-       sha256 = "19mngkprzlm322pfyljvm4lyk1j7j8ss50m5kzzmkwk3mph25h1i";
-       revision = "2";
-       editedCabalFile = "0xlby7483dv33c13f44kkvmai186g72jhxmcq8749s1hyxi6fqnb";
+       version = "3.2.1.1";
+       sha256 = "1rjfdbx4pv7knlm4g8rh90jndc2a8zjmrdmfm2wvwna08h385g5g";
        libraryHaskellDepends = [ base bindings-GLFW deepseq ];
        testHaskellDepends = [
          base bindings-GLFW deepseq HUnit test-framework
@@ -10514,10 +10512,8 @@ self: {
     ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }:
      mkDerivation {
        pname = "HsOpenSSL";
-       version = "0.11.4.16";
-       sha256 = "1jbbrhbvl3y1l0g1wv5h7l59bj7w8ajl8bfpxfwjypgmqlrlks19";
-       revision = "2";
-       editedCabalFile = "1cg28q793cg4w8c574yzzfxcn1r8595vs77mlrkw68j8hzgs6lj3";
+       version = "0.11.4.17";
+       sha256 = "0qivl9clmybfglwxqp2sq308rv4ia4rhwshcsc8b029bvpp0mpsi";
        setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [ base bytestring network time ];
        librarySystemDepends = [ openssl ];
@@ -10764,8 +10760,8 @@ self: {
      }:
      mkDerivation {
        pname = "I1M";
-       version = "0.0.2";
-       sha256 = "0f9pl46m05izxhychf7j8pd9rfx8bqw13735xvq602iyszng8pa4";
+       version = "0.0.3";
+       sha256 = "0lk34g47iid2cfcj9zfdwbkpvhfhanh83jzh64r9sdrqgw9p25w3";
        libraryHaskellDepends = [ array base QuickCheck ];
        testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
        description = "Code for the Haskell course taught at the University of Seville";
@@ -19159,8 +19155,8 @@ self: {
      }:
      mkDerivation {
        pname = "TotalMap";
-       version = "0.1.0.0";
-       sha256 = "0k495j5akabp93zq3jm6vi1y1pz1dmvysbxxp0x4fj28yj7svs3d";
+       version = "0.1.1.1";
+       sha256 = "1415xyh354i7d5y7c2g2k1gyd3knkdx97gxa1z8bjn9ah5qvd8mw";
        libraryHaskellDepends = [
          adjunctions base distributive generics-sop lens
        ];
@@ -20202,8 +20198,8 @@ self: {
      }:
      mkDerivation {
        pname = "Win32-errors";
-       version = "0.2.2.4";
-       sha256 = "1iziwz05s1rvq3xhidkciwyb39fbyn6bqqzn6g2m12pi0xjfzgc2";
+       version = "0.2.2.5";
+       sha256 = "08gbvlsf37nx982qs19pb9qc5sxi6493f02d3afjsyxqvalfbijy";
        libraryHaskellDepends = [ base template-haskell text Win32 ];
        testHaskellDepends = [ base hspec QuickCheck Win32 ];
        description = "Alternative error handling for Win32 foreign calls";
@@ -21801,12 +21797,15 @@ self: {
      }:
      mkDerivation {
        pname = "acid-state";
-       version = "0.15.0";
-       sha256 = "0x1w7da9bcr23v97zri9bz5iw3hzy1x55b4i2di1cswnp50qxz60";
+       version = "0.15.1";
+       sha256 = "0dhzi1f951q2csi8rk393rg81jpd8w9vxwlmg638dknh4i35zg35";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          array base bytestring cereal containers directory filelock filepath
          mtl network safecopy stm template-haskell th-expand-syns unix
        ];
+       executableHaskellDepends = [ base directory ];
        testHaskellDepends = [
          base cereal containers deepseq directory hedgehog hspec
          hspec-discover mtl network safecopy template-haskell text time
@@ -22970,40 +22969,6 @@ self: {
      }) {};
 
   "aeson" = callPackage
-    ({ mkDerivation, attoparsec, base, base-compat, base-orphans
-     , base16-bytestring, bytestring, containers, deepseq, Diff
-     , directory, dlist, filepath, generic-deriving, ghc-prim, hashable
-     , hashable-time, integer-logarithms, primitive, QuickCheck
-     , quickcheck-instances, scientific, tagged, tasty, tasty-golden
-     , tasty-hunit, tasty-quickcheck, template-haskell, text
-     , th-abstraction, time, time-compat, unordered-containers
-     , uuid-types, vector
-     }:
-     mkDerivation {
-       pname = "aeson";
-       version = "1.4.4.0";
-       sha256 = "0bjdgr6wjq6cci5hxb63i18yrg66p892n6xj23rih7k5rbd7rihp";
-       revision = "1";
-       editedCabalFile = "1mn7ws8v5zsm9fy9ndvb0rygchjbwnnxyyxpl63cf9lmzzffvxd6";
-       libraryHaskellDepends = [
-         attoparsec base base-compat bytestring containers deepseq dlist
-         ghc-prim hashable primitive scientific tagged template-haskell text
-         th-abstraction time time-compat unordered-containers uuid-types
-         vector
-       ];
-       testHaskellDepends = [
-         attoparsec base base-compat base-orphans base16-bytestring
-         bytestring containers Diff directory dlist filepath
-         generic-deriving ghc-prim hashable hashable-time integer-logarithms
-         QuickCheck quickcheck-instances scientific tagged tasty
-         tasty-golden tasty-hunit tasty-quickcheck template-haskell text
-         time time-compat unordered-containers uuid-types vector
-       ];
-       description = "Fast JSON parsing and encoding";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "aeson_1_4_5_0" = callPackage
     ({ mkDerivation, attoparsec, base, base-compat, base-orphans
      , base16-bytestring, bytestring, containers, deepseq, Diff
      , directory, dlist, filepath, generic-deriving, ghc-prim, hashable
@@ -23033,7 +22998,6 @@ self: {
        ];
        description = "Fast JSON parsing and encoding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aeson-applicative" = callPackage
@@ -23439,6 +23403,25 @@ self: {
        broken = true;
      }) {};
 
+  "aeson-optics" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring
+     , optics-core, optics-extra, scientific, text, unordered-containers
+     , vector
+     }:
+     mkDerivation {
+       pname = "aeson-optics";
+       version = "1.1";
+       sha256 = "0cyhlhks1zq1h7f49qi1xk094j7zhqfz8p0dpyg18qghppzhlyd8";
+       revision = "1";
+       editedCabalFile = "1ql2zqjcwy744qzydj3gk4qgnj4nzba6j2d5fvi31i5va7vqad2d";
+       libraryHaskellDepends = [
+         aeson attoparsec base base-compat bytestring optics-core
+         optics-extra scientific text unordered-containers vector
+       ];
+       description = "Law-abiding optics for aeson";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "aeson-options" = callPackage
     ({ mkDerivation, aeson, base }:
      mkDerivation {
@@ -28107,15 +28090,15 @@ self: {
      }:
      mkDerivation {
        pname = "amqp-utils";
-       version = "0.3.6.0";
-       sha256 = "0jv89pnap0ja39cmc2hri3npyz3sihc5xzdwargvrkavf4x1ij80";
+       version = "0.3.7.1";
+       sha256 = "1z7jf7ai7r2rlnwylqs60pqcz0h4dxj4g372c919lcvinmql1yfx";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          amqp base bytestring connection containers data-default-class
          hinotify magic process text time tls unix x509-system
        ];
-       description = "Generic Haskell AMQP Consumer";
+       description = "Generic Haskell AMQP tools";
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
@@ -28867,12 +28850,12 @@ self: {
 
   "antiope-athena" = callPackage
     ({ mkDerivation, amazonka, amazonka-athena, amazonka-core, base
-     , lens, resourcet, text, unliftio-core
+     , hspec-discover, lens, resourcet, text, unliftio-core
      }:
      mkDerivation {
        pname = "antiope-athena";
-       version = "7.3.0";
-       sha256 = "1ixrpfc1yrvzigv5mid12s9yill5x0yvr5xfzwl9plm9jpzjjvv9";
+       version = "7.3.4";
+       sha256 = "1d4pm1fb8iwfhb2f57n6kkzm27nj9fqgn3m14zzdbxk2l63q41h3";
        libraryHaskellDepends = [
          amazonka amazonka-athena amazonka-core base lens resourcet text
          unliftio-core
@@ -28881,6 +28864,7 @@ self: {
          amazonka amazonka-athena amazonka-core base lens resourcet text
          unliftio-core
        ];
+       testToolDepends = [ hspec-discover ];
        description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -28891,8 +28875,8 @@ self: {
     ({ mkDerivation, aeson, antiope-s3, avro, base, bytestring, text }:
      mkDerivation {
        pname = "antiope-contract";
-       version = "7.3.0";
-       sha256 = "0alg9nfwgyrvwxi8syrarqhf8din9dayvvll2078zl82r1x8hmgb";
+       version = "7.3.4";
+       sha256 = "0006g261khirldmsbnggnb9fmn9z6m9j7hi9cggpgmxc5ird16p6";
        libraryHaskellDepends = [
          aeson antiope-s3 avro base bytestring text
        ];
@@ -28905,13 +28889,13 @@ self: {
   "antiope-core" = callPackage
     ({ mkDerivation, aeson, aeson-lens, amazonka, amazonka-core, base
      , bytestring, exceptions, generic-lens, hedgehog, hspec
-     , http-client, http-types, hw-hspec-hedgehog, lens, mtl, resourcet
-     , scientific, text, transformers, unliftio-core
+     , hspec-discover, http-client, http-types, hw-hspec-hedgehog, lens
+     , mtl, resourcet, scientific, text, transformers, unliftio-core
      }:
      mkDerivation {
        pname = "antiope-core";
-       version = "7.3.0";
-       sha256 = "0x2lz5ljxdd2d0fv3srn6v6az1dacb83n16fshnm27z9vgnzvfjc";
+       version = "7.3.4";
+       sha256 = "07zf2a0vpzcn5f9rr0k13w2pljybb8glc149wymhkjjfhhgb2ylh";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core base bytestring exceptions
          generic-lens http-client http-types lens mtl resourcet text
@@ -28923,6 +28907,7 @@ self: {
          hw-hspec-hedgehog lens mtl resourcet scientific text transformers
          unliftio-core
        ];
+       testToolDepends = [ hspec-discover ];
        description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -28931,13 +28916,13 @@ self: {
 
   "antiope-dynamodb" = callPackage
     ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-dynamodb
-     , antiope-core, base, generic-lens, lens, text, unliftio-core
-     , unordered-containers
+     , antiope-core, base, generic-lens, hspec-discover, lens, text
+     , unliftio-core, unordered-containers
      }:
      mkDerivation {
        pname = "antiope-dynamodb";
-       version = "7.3.0";
-       sha256 = "04izlg44mz7xv529q2m6j47hcxfca1zrk1fl11rcixdfi3iwfmvf";
+       version = "7.3.4";
+       sha256 = "0smsb7s7ymsdhkvawlbv9j67i1vr9i58qad9m4d5ir43pxi1bmvh";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core amazonka-dynamodb antiope-core base
          generic-lens lens text unliftio-core unordered-containers
@@ -28946,6 +28931,7 @@ self: {
          amazonka amazonka-core amazonka-dynamodb antiope-core base
          generic-lens lens text unliftio-core unordered-containers
        ];
+       testToolDepends = [ hspec-discover ];
        description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -28954,14 +28940,14 @@ self: {
 
   "antiope-messages" = callPackage
     ({ mkDerivation, aeson, amazonka, amazonka-core, base, bytestring
-     , generic-lens, hedgehog, hspec, hw-hspec-hedgehog, lens
-     , lens-aeson, monad-loops, network-uri, scientific, text
+     , generic-lens, hedgehog, hspec, hspec-discover, hw-hspec-hedgehog
+     , lens, lens-aeson, monad-loops, network-uri, scientific, text
      , unliftio-core
      }:
      mkDerivation {
        pname = "antiope-messages";
-       version = "7.3.0";
-       sha256 = "13mm39hbwmlhg1qv61nv0rs6kvw784k2ynrfd9yi1zlr5zycgwlm";
+       version = "7.3.4";
+       sha256 = "0n9s18fmqp22r857yybd3ddm5m6ijr0a1vydll9qqaia951s2a6a";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core base bytestring generic-lens lens
          lens-aeson monad-loops network-uri text unliftio-core
@@ -28971,6 +28957,7 @@ self: {
          hspec hw-hspec-hedgehog lens lens-aeson monad-loops network-uri
          scientific text unliftio-core
        ];
+       testToolDepends = [ hspec-discover ];
        description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -28979,12 +28966,13 @@ self: {
 
   "antiope-optparse-applicative" = callPackage
     ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3, base
-     , hedgehog, hspec, hw-hspec-hedgehog, optparse-applicative, text
+     , hedgehog, hspec, hspec-discover, hw-hspec-hedgehog
+     , optparse-applicative, text
      }:
      mkDerivation {
        pname = "antiope-optparse-applicative";
-       version = "7.3.0";
-       sha256 = "1qgd4mb99vpjswxca6l10ghg3d63vlqj3wc87afdcddfwa50f1zr";
+       version = "7.3.4";
+       sha256 = "1l21xgis1rzzbziz403wl4inilnn52ly4w1lp1cbcj7hnykaxa1i";
        libraryHaskellDepends = [
          amazonka amazonka-core amazonka-s3 base optparse-applicative text
        ];
@@ -28992,6 +28980,7 @@ self: {
          aeson amazonka amazonka-core amazonka-s3 base hedgehog hspec
          hw-hspec-hedgehog
        ];
+       testToolDepends = [ hspec-discover ];
        description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -29002,13 +28991,13 @@ self: {
     ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3
      , antiope-core, antiope-messages, attoparsec, base, bytestring
      , conduit, conduit-extra, exceptions, generic-lens, hedgehog, hspec
-     , http-types, hw-hspec-hedgehog, lens, mtl, network-uri, resourcet
-     , text, time, unliftio-core
+     , hspec-discover, http-types, hw-hspec-hedgehog, lens, mtl
+     , network-uri, resourcet, text, time, unliftio-core
      }:
      mkDerivation {
        pname = "antiope-s3";
-       version = "7.3.0";
-       sha256 = "03qkvaz95qfqrildz92qhrnrny4i00p2l89j5p7miwxbdfzy7ga9";
+       version = "7.3.4";
+       sha256 = "14k5w7s30rqygf6df309h90p9d5fgvw9wxwgz0sisi1mzvbb7wry";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core amazonka-s3 antiope-core
          antiope-messages attoparsec base bytestring conduit conduit-extra
@@ -29021,6 +29010,7 @@ self: {
          hedgehog hspec http-types hw-hspec-hedgehog lens mtl network-uri
          resourcet text time unliftio-core
        ];
+       testToolDepends = [ hspec-discover ];
        description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -29029,13 +29019,13 @@ self: {
 
   "antiope-sns" = callPackage
     ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sns, base
-     , bytestring, generic-lens, hedgehog, hspec, hw-hspec-hedgehog
-     , lens, text, time, unliftio-core
+     , bytestring, generic-lens, hedgehog, hspec, hspec-discover
+     , hw-hspec-hedgehog, lens, text, time, unliftio-core
      }:
      mkDerivation {
        pname = "antiope-sns";
-       version = "7.3.0";
-       sha256 = "066ryids04k0sixn9yf0h70jfj55z2g2xkrpqhxnr54sk2jr4njy";
+       version = "7.3.4";
+       sha256 = "0vcns4p0agni4afdw4cr3hz2xq54d3wam6mkaggd5zyf974x7c7c";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core amazonka-sns base bytestring
          generic-lens lens text time unliftio-core
@@ -29045,6 +29035,7 @@ self: {
          generic-lens hedgehog hspec hw-hspec-hedgehog lens text time
          unliftio-core
        ];
+       testToolDepends = [ hspec-discover ];
        description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -29054,14 +29045,14 @@ self: {
   "antiope-sqs" = callPackage
     ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sqs, base
      , bytestring, conduit, generic-lens, hedgehog, hspec
-     , hw-hspec-hedgehog, lens, lens-aeson, monad-loops, mtl
-     , network-uri, split, text, time, unliftio-core
+     , hspec-discover, hw-hspec-hedgehog, lens, lens-aeson, monad-loops
+     , mtl, network-uri, split, text, time, unliftio-core
      , unordered-containers
      }:
      mkDerivation {
        pname = "antiope-sqs";
-       version = "7.3.0";
-       sha256 = "1nhs4v0h0hqjv6ncfy1wpsdsxkbbb0gz45rhf8swm8h2zfv9rqxl";
+       version = "7.3.4";
+       sha256 = "1y1kgppnc47wprd3sjw8qbjh5dvfr4i7mczi70s88i8apkqlxrbn";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core amazonka-sqs base bytestring conduit
          generic-lens lens lens-aeson monad-loops mtl network-uri split text
@@ -29072,6 +29063,7 @@ self: {
          generic-lens hedgehog hspec hw-hspec-hedgehog lens lens-aeson
          monad-loops mtl network-uri text time unliftio-core
        ];
+       testToolDepends = [ hspec-discover ];
        description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -29080,14 +29072,15 @@ self: {
 
   "antiope-swf" = callPackage
     ({ mkDerivation, amazonka-swf, base, hedgehog, hspec
-     , hw-hspec-hedgehog, lens, text
+     , hspec-discover, hw-hspec-hedgehog, lens, text
      }:
      mkDerivation {
        pname = "antiope-swf";
-       version = "7.3.0";
-       sha256 = "1jqhq0ifdv8dqsnqsyb814nqq987fvng04gg8sbz5cjds7nm1c0m";
+       version = "7.3.4";
+       sha256 = "1rn31vdjfs7jrx87a44vg36kwkcxx7sp3mx54f494srwa3cv1di5";
        libraryHaskellDepends = [ amazonka-swf base lens text ];
        testHaskellDepends = [ base hedgehog hspec hw-hspec-hedgehog ];
+       testToolDepends = [ hspec-discover ];
        description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -30250,8 +30243,8 @@ self: {
      }:
      mkDerivation {
        pname = "approximate";
-       version = "0.3.1";
-       sha256 = "18ifmp1c2km3ssp51m94vxqzx7yx6c21ychp7ajnhgg7v4bgfdyq";
+       version = "0.3.2";
+       sha256 = "016i37c5imb0n8gsk7gzyiq8dhkjv0xnn5315kmn6lnrhpfm7yyk";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base binary bytes cereal comonad deepseq ghc-prim hashable lens
@@ -31057,15 +31050,31 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "array-builder" = callPackage
+    ({ mkDerivation, array-chunks, base, primitive, run-st, tasty
+     , tasty-hunit
+     }:
+     mkDerivation {
+       pname = "array-builder";
+       version = "0.1.0.0";
+       sha256 = "0wh1x3hywb0jaqxa7kdh3x3w0mqa4dwq2wdc70fvgmlijm6pyqw9";
+       libraryHaskellDepends = [ array-chunks base primitive run-st ];
+       testHaskellDepends = [ base tasty tasty-hunit ];
+       description = "Builders for arrays";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "array-chunks" = callPackage
     ({ mkDerivation, base, primitive, QuickCheck, quickcheck-classes
-     , tasty, tasty-hunit, tasty-quickcheck
+     , run-st, tasty, tasty-hunit, tasty-quickcheck
      }:
      mkDerivation {
        pname = "array-chunks";
-       version = "0.1.0.0";
-       sha256 = "15x8l8m953ws3253zvxg4q0q0qqcc34wawijnzmq87y39g9ghlag";
-       libraryHaskellDepends = [ base primitive ];
+       version = "0.1.1.0";
+       sha256 = "0lx33cyqv5b5iyxy4v18dxs1zb0j72kxnlckhcckjvncg8lyf413";
+       libraryHaskellDepends = [ base primitive run-st ];
        testHaskellDepends = [
          base primitive QuickCheck quickcheck-classes tasty tasty-hunit
          tasty-quickcheck
@@ -31961,6 +31970,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "astar-monad" = callPackage
+    ({ mkDerivation, base, hspec, lens, logict, mtl }:
+     mkDerivation {
+       pname = "astar-monad";
+       version = "0.3.0.0";
+       sha256 = "1df99k3c299nzfxbqnzkqggagf7l8p2fwa9igxy9ydg8b0rqc6xf";
+       libraryHaskellDepends = [ base logict mtl ];
+       testHaskellDepends = [ base hspec lens logict mtl ];
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "astrds" = callPackage
     ({ mkDerivation, base, containers, directory, MonadRandom, mtl
      , OpenGL, random, SDL, SDL-image, SDL-mixer, SDL-ttf, unix
@@ -34590,35 +34610,52 @@ self: {
      }) {};
 
   "axel" = callPackage
-    ({ mkDerivation, base, bytestring, containers, directory, filepath
-     , freer-simple, ghcid, haskell-src-exts, hedgehog, lens, lens-aeson
-     , optparse-applicative, parsec, process, regex-pcre, singletons
-     , split, strict, tasty, tasty-discover, tasty-golden
-     , tasty-hedgehog, tasty-hspec, template-haskell, text, transformers
-     , typed-process, vector, yaml
+    ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers
+     , directory, filepath, freer-simple, ghcid, hashable
+     , haskell-src-exts, hedgehog, hpack, lens, lens-aeson, megaparsec
+     , mono-traversable, optparse-applicative, polysemy, polysemy-plugin
+     , prettyprinter, process, profunctors, random, singletons, split
+     , tasty, tasty-discover, tasty-golden, tasty-hedgehog, tasty-hspec
+     , tasty-hunit, template-haskell, text, time, transformers
+     , typed-process, uniplate, vector, yaml
      }:
      mkDerivation {
        pname = "axel";
-       version = "0.0.9";
-       sha256 = "0kr7iblj23dlfjzym2ndrns2x7z65sdn2pz8dwxsqvn8jhh24p7f";
+       version = "0.0.11";
+       sha256 = "1qygq82v70lizbpxmvj1c81qhb9jrmzgi603g03wa41las0sfamy";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         base bytestring containers directory filepath freer-simple ghcid
-         haskell-src-exts lens lens-aeson optparse-applicative parsec
-         process regex-pcre singletons strict template-haskell text
-         typed-process vector yaml
+         aeson ansi-terminal base bytestring containers directory filepath
+         freer-simple ghcid hashable haskell-src-exts hedgehog hpack lens
+         lens-aeson megaparsec mono-traversable optparse-applicative
+         polysemy polysemy-plugin prettyprinter process profunctors random
+         singletons split tasty tasty-discover tasty-golden tasty-hedgehog
+         tasty-hspec tasty-hunit template-haskell text time transformers
+         typed-process uniplate vector yaml
        ];
+       libraryToolDepends = [ hpack tasty-discover ];
        executableHaskellDepends = [
-         base containers freer-simple optparse-applicative
+         aeson ansi-terminal base bytestring containers directory filepath
+         freer-simple ghcid hashable haskell-src-exts hedgehog hpack lens
+         lens-aeson megaparsec mono-traversable optparse-applicative
+         polysemy polysemy-plugin prettyprinter process profunctors random
+         singletons split tasty tasty-discover tasty-golden tasty-hedgehog
+         tasty-hspec tasty-hunit template-haskell text time transformers
+         typed-process uniplate vector yaml
        ];
+       executableToolDepends = [ hpack tasty-discover ];
        testHaskellDepends = [
-         base bytestring containers filepath freer-simple hedgehog lens
-         split tasty tasty-discover tasty-golden tasty-hedgehog tasty-hspec
-         transformers
+         aeson ansi-terminal base bytestring containers directory filepath
+         freer-simple ghcid hashable haskell-src-exts hedgehog hpack lens
+         lens-aeson megaparsec mono-traversable optparse-applicative
+         polysemy polysemy-plugin prettyprinter process profunctors random
+         singletons split tasty tasty-discover tasty-golden tasty-hedgehog
+         tasty-hspec tasty-hunit template-haskell text time transformers
+         typed-process uniplate vector yaml
        ];
-       testToolDepends = [ tasty-discover ];
+       testToolDepends = [ hpack tasty-discover ];
        description = "The Axel programming language";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -38014,6 +38051,8 @@ self: {
        pname = "binary-tagged";
        version = "0.2";
        sha256 = "1pgb2p0kdh9vkmgn509c2v3h9dnhl9vyq2gyisfqvn27g2422c0j";
+       revision = "1";
+       editedCabalFile = "0chv885zl8m7c6281sz8kfr2p7hgcl7xj0yjajjyr9whwfnylfj0";
        libraryHaskellDepends = [
          aeson array base base16-bytestring binary bytestring containers
          cryptohash-sha1 generics-sop hashable scientific tagged text time
@@ -38224,6 +38263,32 @@ self: {
          inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr; 
          inherit (pkgs.xorg) libXxf86vm;};
 
+  "bindings-GLFW_3_3_0_0" = callPackage
+    ({ mkDerivation, base, bindings-DSL, HUnit, libGL, libX11
+     , libXcursor, libXext, libXfixes, libXi, libXinerama, libXrandr
+     , libXxf86vm, test-framework, test-framework-hunit
+     }:
+     mkDerivation {
+       pname = "bindings-GLFW";
+       version = "3.3.0.0";
+       sha256 = "0ns5dhww9s4sbss57jlys9wmjik2i0xa1b4g6i0k15r7mhrnanx7";
+       libraryHaskellDepends = [ base bindings-DSL ];
+       librarySystemDepends = [
+         libGL libX11 libXcursor libXext libXfixes libXi libXinerama
+         libXrandr libXxf86vm
+       ];
+       testHaskellDepends = [
+         base HUnit test-framework test-framework-hunit
+       ];
+       description = "Low-level bindings to GLFW OpenGL library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; 
+         inherit (pkgs.xorg) libXcursor; inherit (pkgs.xorg) libXext; 
+         inherit (pkgs.xorg) libXfixes; inherit (pkgs.xorg) libXi; 
+         inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr; 
+         inherit (pkgs.xorg) libXxf86vm;};
+
   "bindings-K8055" = callPackage
     ({ mkDerivation, base, K8055D }:
      mkDerivation {
@@ -39017,6 +39082,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "binsm" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, base, bytestring
+     , optparse-applicative, parsec
+     }:
+     mkDerivation {
+       pname = "binsm";
+       version = "0.1.1";
+       sha256 = "1wiqslvf21xm15rf161lzffk5zzivbxs9sa9v7d257cx4d9qvy15";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         ansi-wl-pprint base bytestring optparse-applicative parsec
+       ];
+       description = "binary files splitter and merger";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "bio" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
      , directory, mtl, parallel, parsec, QuickCheck, random, tagsoup
@@ -42334,7 +42417,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "brick_0_49" = callPackage
+  "brick_0_50" = callPackage
     ({ mkDerivation, base, bytestring, config-ini, containers
      , contravariant, data-clist, deepseq, directory, dlist, filepath
      , microlens, microlens-mtl, microlens-th, QuickCheck, stm
@@ -42343,8 +42426,8 @@ self: {
      }:
      mkDerivation {
        pname = "brick";
-       version = "0.49";
-       sha256 = "1jlxzizxgmdsjd0x146kcmp92x7gjn0vkj0lc5dplbgshlg5hfhd";
+       version = "0.50";
+       sha256 = "0g2c420zpvjv8v3y5l4jhmml279d920k9d92yga8d86jymanbvy9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -43209,8 +43292,8 @@ self: {
     ({ mkDerivation, base, mtl, multiset, random, template-haskell }:
      mkDerivation {
        pname = "buffon-machines";
-       version = "1.1.1.0";
-       sha256 = "0985xh66j3f8p352gsq9balndwrsnylqilnnbk2sfb535jyh84dh";
+       version = "1.1.1.1";
+       sha256 = "19qidzwg6mq8g2czzfqky7kh13jscsxc52ymfj8wlkngkciwvv5s";
        libraryHaskellDepends = [
          base mtl multiset random template-haskell
        ];
@@ -43339,6 +43422,20 @@ self: {
        broken = true;
      }) {};
 
+  "builder" = callPackage
+    ({ mkDerivation, base, byte-order, primitive, primitive-unaligned
+     }:
+     mkDerivation {
+       pname = "builder";
+       version = "0.2";
+       sha256 = "04pcqxk9snlvm5kixqyz5aq0pxjlcvfxj403dxgyr3ch2zjx3n6l";
+       libraryHaskellDepends = [
+         base byte-order primitive primitive-unaligned
+       ];
+       description = "bounded ByteArray builder type";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "buildwrapper" = callPackage
     ({ mkDerivation, aeson, async, attoparsec, base, bytestring, Cabal
      , cmdargs, conduit, conduit-extra, containers, cpphs, deepseq
@@ -43935,12 +44032,17 @@ self: {
      }) {};
 
   "byteslice" = callPackage
-    ({ mkDerivation, base, primitive, primitive-addr, run-st }:
+    ({ mkDerivation, base, primitive, primitive-addr, run-st, tasty
+     , tasty-hunit, tasty-quickcheck
+     }:
      mkDerivation {
        pname = "byteslice";
-       version = "0.1.2.0";
-       sha256 = "0bivb6gn3kfzi2rxvrf3klsgzj6p864vcxr2hnrdkr16qp1x8ysv";
+       version = "0.1.3.0";
+       sha256 = "0lx69pcac7p20zs790x6ygqlgc3vljn4wjjp1jlcnp1jv6nhfwgf";
        libraryHaskellDepends = [ base primitive primitive-addr run-st ];
+       testHaskellDepends = [
+         base primitive tasty tasty-hunit tasty-quickcheck
+       ];
        description = "Slicing managed and unmanaged memory";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -44842,6 +44944,8 @@ self: {
        pname = "cabal-cache";
        version = "1.0.1.1";
        sha256 = "1yb3wvjqqmkm4aysfyx4zf1z88453ywfc4czb4zvghfdgd95d0rx";
+       revision = "1";
+       editedCabalFile = "054xaxj0cf8cdd2l5jp3p4s3ar8ncq92cw3s0912vd85kw2bw3rl";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -45367,30 +45471,28 @@ self: {
 
   "cabal-plan" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, base, base-compat
-     , base-orphans, base16-bytestring, bytestring, containers
-     , directory, filepath, mtl, optparse-applicative, parsec, text
-     , vector
+     , base16-bytestring, bytestring, containers, directory, filepath
+     , lens, mtl, optparse-applicative, parsec, semialign
+     , singleton-bool, text, these, topograph, transformers, vector
      }:
      mkDerivation {
        pname = "cabal-plan";
-       version = "0.5.0.0";
-       sha256 = "1vfa4lwfjhv4nyl1rwm7i99zdkwriighlhfcz0rgjwzgg56wrihq";
-       revision = "1";
-       editedCabalFile = "0nnh6qq36cpfwzqrv1i1cn93n6n32nbl6ddp0y22jmmxnx9xsrvp";
+       version = "0.6.0.0";
+       sha256 = "0yhczs9qc6vy1g0jgj6hb23g4f92qnwq325zxlazsghcvxjrxhx2";
        configureFlags = [ "-fexe" ];
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base base-compat base-orphans base16-bytestring bytestring
-         containers directory filepath text vector
+         aeson base base16-bytestring bytestring containers directory
+         filepath text
        ];
        executableHaskellDepends = [
-         ansi-terminal base base-compat bytestring containers directory mtl
-         optparse-applicative parsec text vector
+         ansi-terminal base base-compat bytestring containers directory lens
+         mtl optparse-applicative parsec semialign singleton-bool text these
+         topograph transformers vector
        ];
-       doHaddock = false;
        description = "Library and utility for processing cabal's plan.json file";
-       license = "GPL-2.0-or-later AND BSD-3-Clause";
+       license = stdenv.lib.licenses.gpl2Plus;
      }) {};
 
   "cabal-progdeps" = callPackage
@@ -46017,10 +46119,10 @@ self: {
      }) {};
 
   "cachix" = callPackage
-    ({ mkDerivation, async, base, base64-bytestring, bytestring
-     , cachix-api, conduit, conduit-extra, containers, cookie
-     , cryptonite, dhall, directory, ed25519, filepath, fsnotify, here
-     , hnix-store-core, hspec, hspec-discover, http-client
+    ({ mkDerivation, async, base, base64-bytestring, boost_context
+     , bytestring, cachix-api, conduit, conduit-extra, containers
+     , cookie, cryptonite, dhall, directory, ed25519, filepath, fsnotify
+     , here, hnix-store-core, hspec, hspec-discover, http-client
      , http-client-tls, http-conduit, http-types, inline-c, inline-c-cpp
      , lzma-conduit, megaparsec, memory, mmorph, netrc, nix
      , optparse-applicative, process, protolude, resourcet, retry
@@ -46030,8 +46132,8 @@ self: {
      }:
      mkDerivation {
        pname = "cachix";
-       version = "0.3.0";
-       sha256 = "0s22p9dwqw4pqlrqfqspdsiiw2k5zwzzdxc6ha6f4fxa4wa2w5dm";
+       version = "0.3.2";
+       sha256 = "0i0p5cp6g5ai2xxdkr0bbdlf469b52lp3fh37rq075zaw94f6qr8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -46044,6 +46146,7 @@ self: {
          servant-auth-client servant-client servant-client-core
          servant-conduit text unix uri-bytestring versions
        ];
+       librarySystemDepends = [ boost_context ];
        libraryPkgconfigDepends = [ nix ];
        executableHaskellDepends = [ base cachix-api ];
        executableToolDepends = [ hspec-discover ];
@@ -46052,7 +46155,7 @@ self: {
        ];
        description = "Command line client for Nix binary cache hosting https://cachix.org";
        license = stdenv.lib.licenses.asl20;
-     }) {inherit (pkgs) nix;};
+     }) {boost_context = null; inherit (pkgs) nix;};
 
   "cachix-api" = callPackage
     ({ mkDerivation, aeson, base, base16-bytestring, bytestring
@@ -46791,6 +46894,8 @@ self: {
        pname = "cantor-pairing";
        version = "0.1.1.0";
        sha256 = "03vl7qd5962kr0mi4ymgmh667948rzqiq9f1ixcvycyjz8hz0yqw";
+       revision = "1";
+       editedCabalFile = "1rl4zjxwiys9mf75bvw363ydpr3nwvi6d77p19rwnmxc9k5spap6";
        libraryHaskellDepends = [
          arithmoi base containers integer-gmp integer-logarithms
        ];
@@ -48255,8 +48360,8 @@ self: {
      }:
      mkDerivation {
        pname = "cdeps";
-       version = "0.1.2.3";
-       sha256 = "16w16sysk0g9capl45v8pzyfg38mw2xnkj8dh5fghlc9vzfdgc53";
+       version = "0.1.2.4";
+       sha256 = "1ijfgs03zs6cj87s7sck4md1qmfavcmgnfz8asw8yf6bf0rk6qfl";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -50004,6 +50109,8 @@ self: {
        pname = "chronos";
        version = "1.0.7";
        sha256 = "0yqk43ax20sk3rpxd5s857ivbgigvd5qdq4axawzmqr2na6jlikx";
+       revision = "1";
+       editedCabalFile = "0rf2rcdx7cvx1aa6yb9khbgkrh08v4l52sg1w89qz0245dalw14r";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring clock hashable primitive
          semigroups text torsor vector
@@ -54581,8 +54688,8 @@ self: {
      }:
      mkDerivation {
        pname = "compensated";
-       version = "0.7.2";
-       sha256 = "1qna4g1zcc89r1ambswrq65pql6k6g3dv0ivlgnhswl6lm3vzyf7";
+       version = "0.7.3";
+       sha256 = "089xj9j3gznxz66ywapjd9kasjcnv197ipj4azgjfbpl2y11l8dg";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base bifunctors binary bytes cereal comonad deepseq distributive
@@ -56469,10 +56576,8 @@ self: {
      }:
      mkDerivation {
        pname = "config-schema";
-       version = "1.1.0.0";
-       sha256 = "1nr1jyrgvvm1zlzvlfpz35zb5iydn1mpk89kljp0h1cvkl35mjkl";
-       revision = "1";
-       editedCabalFile = "0h828xld2dfjj43jwq1f98wd21nzvhn74wsx586a0kcd6q41pcs5";
+       version = "1.2.0.0";
+       sha256 = "0lz9y2qnjc576mbl3qnhyf4c1y5f71q7f5jgv8rj7vsg855q99hm";
        libraryHaskellDepends = [
          base config-value containers free kan-extensions pretty
          semigroupoids text transformers
@@ -56503,12 +56608,11 @@ self: {
     ({ mkDerivation, alex, array, base, happy, pretty, text }:
      mkDerivation {
        pname = "config-value";
-       version = "0.6.3.1";
-       sha256 = "0gfr9qcw8a7y1y9cn6635y8fgvrpkmcqx31bn2a070rbrmk3757z";
-       revision = "2";
-       editedCabalFile = "037hi6hrd3kk2zjsi8ly9jj4gc8xq5vnn8p09dm0hshd31fyhl52";
+       version = "0.7.0.1";
+       sha256 = "0r7qylqmdvif75ylb0d0zryl2ghxl3ip9a2jhyq70aqxwdjh18g4";
        libraryHaskellDepends = [ array base pretty text ];
        libraryToolDepends = [ alex happy ];
+       testHaskellDepends = [ base text ];
        description = "Simple, layout-based value language similar to YAML or JSON";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -57831,6 +57935,18 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "control-monad-omega_0_3_2" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "control-monad-omega";
+       version = "0.3.2";
+       sha256 = "1zx92zyvv10w61rzwhn1d4kggzmi9hggsyjcdav424280x31wb7n";
+       libraryHaskellDepends = [ base ];
+       description = "A breadth-first list monad";
+       license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "control-monad-queue" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -58814,22 +58930,20 @@ self: {
     ({ mkDerivation, base, binary, bytestring, bzlib
      , composition-prelude, containers, cpphs, dhall, dir-traverse
      , directory, filemanip, filepath, hashable, hspec, hspec-megaparsec
-     , http-client, http-client-tls, libarchive, lzma, megaparsec
+     , http-client, http-client-tls, libarchive, lzlib, lzma, megaparsec
      , microlens, mtl, network-uri, optparse-applicative, prettyprinter
      , process, recursion, tar, temporary, text, zip-archive, zlib
      }:
      mkDerivation {
        pname = "cpkg";
-       version = "0.2.3.1";
-       sha256 = "0nw1h6zgx3dizx92nwzdf9ny8bzyfa2n28lpv34xvw38fz9yq16w";
-       revision = "2";
-       editedCabalFile = "15bn9c0zvr8xdhq4hgnq3hhqwvv8pc5a7bdvw58psn7dwhcac6nh";
+       version = "0.2.3.2";
+       sha256 = "0dwcahc8m2mj3jm0hwx13wzhlnyiby4sds8pc70fv54zp0ccbq6r";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base binary bytestring bzlib composition-prelude containers dhall
          dir-traverse directory filemanip filepath hashable http-client
-         http-client-tls libarchive lzma megaparsec microlens mtl
+         http-client-tls libarchive lzlib lzma megaparsec microlens mtl
          network-uri prettyprinter process recursion tar temporary text
          zip-archive zlib
        ];
@@ -66029,8 +66143,8 @@ self: {
        pname = "deepseq-generics";
        version = "0.2.0.0";
        sha256 = "17bwghc15mc9pchfd1w46jh2p3wzc86aj6a537wqwxn08rayzcxh";
-       revision = "3";
-       editedCabalFile = "0734x6dm7ny1422n5ik4agzmjybvd3yybj1mnrc8z0kb89xdprcs";
+       revision = "4";
+       editedCabalFile = "0928s2qnbqsjzrm94x88rvmvbigfmhcyp4m73gw6asinp2qg1kii";
        libraryHaskellDepends = [ base deepseq ghc-prim ];
        testHaskellDepends = [
          base deepseq ghc-prim HUnit test-framework test-framework-hunit
@@ -66776,23 +66890,6 @@ self: {
      }) {};
 
   "deque" = callPackage
-    ({ mkDerivation, base, mtl, QuickCheck, quickcheck-instances
-     , rerebase, strict-list, tasty, tasty-hunit, tasty-quickcheck
-     }:
-     mkDerivation {
-       pname = "deque";
-       version = "0.4.2.3";
-       sha256 = "18j4pqqn65nh4wp3fkw4bd10x1gxnv5zfkzan02fqvdg1ljk9sq0";
-       libraryHaskellDepends = [ base mtl strict-list ];
-       testHaskellDepends = [
-         QuickCheck quickcheck-instances rerebase tasty tasty-hunit
-         tasty-quickcheck
-       ];
-       description = "Double-ended queues";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "deque_0_4_3" = callPackage
     ({ mkDerivation, base, hashable, mtl, QuickCheck
      , quickcheck-instances, rerebase, strict-list, tasty, tasty-hunit
      , tasty-quickcheck
@@ -66808,7 +66905,6 @@ self: {
        ];
        description = "Double-ended queues";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dequeue" = callPackage
@@ -67487,43 +67583,43 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "dhall_1_25_0" = callPackage
+  "dhall_1_26_0" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base
      , bytestring, case-insensitive, cborg, cborg-json, containers
-     , contravariant, cryptonite, deepseq, Diff, directory, doctest
-     , dotgen, either, exceptions, filepath, foldl, gauge, haskeline
-     , http-client, http-client-tls, http-types, lens-family-core
-     , megaparsec, memory, mockery, mtl, optparse-applicative, parsers
-     , prettyprinter, prettyprinter-ansi-terminal, profunctors
-     , QuickCheck, quickcheck-instances, repline, scientific, semigroups
-     , serialise, spoon, tasty, tasty-hunit, tasty-quickcheck
-     , template-haskell, text, th-lift-instances, transformers
-     , transformers-compat, turtle, unordered-containers, uri-encode
-     , vector
+     , contravariant, cryptonite, data-fix, deepseq, Diff, directory
+     , doctest, dotgen, either, exceptions, filepath, foldl, gauge
+     , generic-random, haskeline, http-client, http-client-tls
+     , http-types, lens-family-core, megaparsec, memory, mockery, mtl
+     , network-uri, optparse-applicative, parsers, prettyprinter
+     , prettyprinter-ansi-terminal, profunctors, QuickCheck
+     , quickcheck-instances, repline, scientific, semigroups, serialise
+     , spoon, tasty, tasty-expected-failure, tasty-hunit
+     , tasty-quickcheck, template-haskell, text, th-lift-instances
+     , transformers, transformers-compat, turtle, unordered-containers
+     , uri-encode, vector
      }:
      mkDerivation {
        pname = "dhall";
-       version = "1.25.0";
-       sha256 = "0d8qx4fawvxykig628jfgqpa660mzzicysa7g3mda6zni9j4yq0h";
-       revision = "2";
-       editedCabalFile = "00jb0n07sa6v5ynzlyz39gc6zc0s0jlfck5w64pya1nmdbiijizz";
+       version = "1.26.0";
+       sha256 = "1jk8zfdbvgp2ipkmhx5m1n467c1k6g24kgi295lcbyvlwahv9l7j";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson aeson-pretty ansi-terminal base bytestring case-insensitive
-         cborg cborg-json containers contravariant cryptonite deepseq Diff
-         directory dotgen either exceptions filepath haskeline http-client
-         http-client-tls http-types lens-family-core megaparsec memory mtl
-         optparse-applicative parsers prettyprinter
+         cborg cborg-json containers contravariant cryptonite data-fix
+         deepseq Diff directory dotgen either exceptions filepath haskeline
+         http-client http-client-tls http-types lens-family-core megaparsec
+         memory mtl network-uri optparse-applicative parsers prettyprinter
          prettyprinter-ansi-terminal profunctors repline scientific
          serialise template-haskell text th-lift-instances transformers
          transformers-compat unordered-containers uri-encode vector
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [
-         base bytestring cborg containers deepseq directory doctest filepath
-         foldl lens-family-core megaparsec mockery prettyprinter QuickCheck
-         quickcheck-instances semigroups serialise spoon tasty tasty-hunit
+         base bytestring cborg containers data-fix deepseq directory doctest
+         filepath foldl generic-random lens-family-core megaparsec mockery
+         prettyprinter QuickCheck quickcheck-instances scientific semigroups
+         serialise spoon tasty tasty-expected-failure tasty-hunit
          tasty-quickcheck text transformers turtle vector
        ];
        benchmarkHaskellDepends = [
@@ -67555,14 +67651,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "dhall-bash_1_0_22" = callPackage
+  "dhall-bash_1_0_23" = callPackage
     ({ mkDerivation, base, bytestring, containers, dhall
      , neat-interpolation, optparse-generic, shell-escape, text
      }:
      mkDerivation {
        pname = "dhall-bash";
-       version = "1.0.22";
-       sha256 = "1qxcf3f8a390znwkbhcirlgqpgg0ssc3bnwdml7wkv8k0qwqq57j";
+       version = "1.0.23";
+       sha256 = "0nd8bziymkv2wdham8jg2wcsksnnby0pkvak7aknzf8z9s4mb74x";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -67626,23 +67722,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "dhall-json_1_4_0" = callPackage
+  "dhall-json_1_4_1" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base
-     , bytestring, containers, dhall, exceptions, libyaml
+     , bytestring, containers, dhall, exceptions, filepath, libyaml
      , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal
      , scientific, tasty, tasty-hunit, text, unordered-containers
      , vector, yaml
      }:
      mkDerivation {
        pname = "dhall-json";
-       version = "1.4.0";
-       sha256 = "0kxb71m1rf6y7z3wx4yx5ks0p5vhnlpgchsih3mfn9ygppc2z0ri";
+       version = "1.4.1";
+       sha256 = "1widvpgrswj6bz9330i2xyxv1h6asw0pm5rrwdhyf926qgag83pp";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson aeson-pretty base bytestring containers dhall exceptions
-         libyaml optparse-applicative scientific text unordered-containers
-         vector yaml
+         filepath libyaml optparse-applicative prettyprinter scientific text
+         unordered-containers vector yaml
        ];
        executableHaskellDepends = [
          aeson aeson-pretty ansi-terminal base bytestring dhall exceptions
@@ -67677,32 +67773,27 @@ self: {
 
   "dhall-lsp-server" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
-     , cryptonite, data-default, dhall, dhall-json, directory, doctest
-     , dotgen, filepath, haskell-lsp, hslogger, lens, lens-family-core
-     , megaparsec, mtl, network-uri, optparse-applicative, prettyprinter
-     , sorted-list, stm, text, transformers, unordered-containers
-     , uri-encode, yi-rope
+     , data-default, dhall, dhall-json, directory, doctest, filepath
+     , haskell-lsp, hslogger, lens, lens-family-core, megaparsec, mtl
+     , network-uri, optparse-applicative, prettyprinter
+     , rope-utf16-splay, text, transformers, unordered-containers
+     , uri-encode
      }:
      mkDerivation {
        pname = "dhall-lsp-server";
-       version = "1.0.0";
-       sha256 = "1i4bx8qiy1hbs6bm50fixj1ipkd9rm6y6z3bci8ngh1rhy5v51x1";
+       version = "1.0.1";
+       sha256 = "04x56r7wlnnks31mjis1f2688c7azimkww04qkvm7l1s0qprn1lz";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson aeson-pretty base bytestring containers cryptonite
-         data-default dhall dhall-json dotgen filepath haskell-lsp hslogger
-         lens lens-family-core megaparsec mtl network-uri
-         optparse-applicative prettyprinter sorted-list stm text
-         transformers unordered-containers uri-encode yi-rope
-       ];
-       executableHaskellDepends = [
-         aeson base containers data-default dhall filepath haskell-lsp
-         hslogger lens lens-family-core megaparsec mtl optparse-applicative
-         prettyprinter sorted-list stm text transformers
-         unordered-containers yi-rope
+         aeson aeson-pretty base bytestring containers data-default dhall
+         dhall-json directory filepath haskell-lsp hslogger lens
+         lens-family-core megaparsec mtl network-uri prettyprinter
+         rope-utf16-splay text transformers unordered-containers uri-encode
        ];
+       executableHaskellDepends = [ base optparse-applicative ];
        testHaskellDepends = [ base directory doctest filepath ];
+       description = "Language Server Protocol (LSP) server for Dhall";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
@@ -67714,8 +67805,8 @@ self: {
      }:
      mkDerivation {
        pname = "dhall-nix";
-       version = "1.1.7";
-       sha256 = "0axg7qq8rfy5qsffiw57lll40mw7bxgk67g7lgdb5vbri69xj3is";
+       version = "1.1.8";
+       sha256 = "0ky10j2718hva1xz4snwbnm0adpp1l7spxpzg7x3a7x67gnaanyh";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -69648,19 +69739,21 @@ self: {
      }) {};
 
   "dirtree" = callPackage
-    ({ mkDerivation, base, containers, deepseq, directory, filepath
-     , hspec, hspec-discover, hspec-expectations-pretty-diff, lens
+    ({ mkDerivation, base, bytestring, containers, deepseq, directory
+     , filepath, hspec, hspec-discover, hspec-expectations-pretty-diff
+     , lens, unix, zip-archive
      }:
      mkDerivation {
        pname = "dirtree";
-       version = "0.0.1";
-       sha256 = "0i7prw2bzf5yjk42y1zvpjph8s5a73x1rj3dgba4mzdx3qpcs1gj";
+       version = "0.1.0";
+       sha256 = "0hyvaf17rfaqjag6qg3pfhbhjnhrd4xdknvn0k494vi3wd1ddzap";
        libraryHaskellDepends = [
-         base containers deepseq directory filepath lens
+         base bytestring containers deepseq directory filepath lens unix
+         zip-archive
        ];
        testHaskellDepends = [
-         base containers deepseq directory filepath hspec hspec-discover
-         hspec-expectations-pretty-diff lens
+         base bytestring containers deepseq directory filepath hspec
+         hspec-discover hspec-expectations-pretty-diff lens unix zip-archive
        ];
        testToolDepends = [ hspec-discover ];
        description = "A small library for working with directories";
@@ -69743,8 +69836,8 @@ self: {
      }:
      mkDerivation {
        pname = "discord-haskell";
-       version = "1.1.0";
-       sha256 = "16n78p6g0rh670zy2pbk59c8nkg5srkhlbya0aknpz2s4smpn891";
+       version = "1.1.2";
+       sha256 = "1dwsg3q9jdq58pchc0aylg8acshfjmdidpr09818jr4aawvdn3xr";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -70969,15 +71062,15 @@ self: {
        broken = true;
      }) {};
 
-  "dl-fedora_0_6" = callPackage
+  "dl-fedora_0_7" = callPackage
     ({ mkDerivation, base, bytestring, directory, filepath
      , http-directory, http-types, optparse-applicative, regex-posix
      , simple-cmd, simple-cmd-args, text, unix, xdg-userdirs
      }:
      mkDerivation {
        pname = "dl-fedora";
-       version = "0.6";
-       sha256 = "1kq9hhpgh24kfgf9b25zppmfbylcqx0scs96dp0nbyj3rp6yl8rh";
+       version = "0.7";
+       sha256 = "00fkjlggax5l9qk2dlgh3plkqrvxrwfipdcfpq8d5kfw7l5wdxsv";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -75710,15 +75803,15 @@ self: {
        license = stdenv.lib.licenses.mpl20;
      }) {};
 
-  "elm-street_0_1_0_1" = callPackage
+  "elm-street_0_1_0_2" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, filepath
      , hspec, prettyprinter, servant, servant-server, text, time, wai
      , warp
      }:
      mkDerivation {
        pname = "elm-street";
-       version = "0.1.0.1";
-       sha256 = "1n02bxyva732dbnrzc6n6v8rsgpbjb6ndh4szwqj8zckj694mc77";
+       version = "0.1.0.2";
+       sha256 = "1ccrlcy8k2ppy20jns0rfms11ha7mpqgh6hwcpjkycmninhdb2gp";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -75879,6 +75972,80 @@ self: {
        broken = true;
      }) {};
 
+  "elynx-seq" = callPackage
+    ({ mkDerivation, async, base, bytestring, containers
+     , data-memocombinators, elynx-tools, elynx-tree, hmatrix, hspec
+     , hspec-megaparsec, integration, lens, math-functions, matrices
+     , megaparsec, mwc-random, optparse-applicative, parallel, primitive
+     , statistics, transformers, vector, vector-th-unbox, word8
+     }:
+     mkDerivation {
+       pname = "elynx-seq";
+       version = "0.0.1";
+       sha256 = "0v43nqpx17zbqv0537jrikkfnvadcmfc5byxh8lk369ma76029y7";
+       libraryHaskellDepends = [
+         async base bytestring containers data-memocombinators elynx-tools
+         elynx-tree hmatrix integration lens math-functions matrices
+         megaparsec mwc-random optparse-applicative parallel primitive
+         statistics transformers vector vector-th-unbox word8
+       ];
+       testHaskellDepends = [
+         async base bytestring containers data-memocombinators elynx-tools
+         elynx-tree hmatrix hspec hspec-megaparsec integration lens
+         math-functions matrices megaparsec mwc-random optparse-applicative
+         parallel primitive statistics transformers vector vector-th-unbox
+         word8
+       ];
+       description = "Handle molecular sequences";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
+  "elynx-tools" = callPackage
+    ({ mkDerivation, base, bytestring, containers, fast-logger, hmatrix
+     , lifted-base, matrices, megaparsec, monad-control, monad-logger
+     , mwc-random, optparse-applicative, parallel, primitive
+     , template-haskell, text, time, transformers, transformers-base
+     , vector, zlib
+     }:
+     mkDerivation {
+       pname = "elynx-tools";
+       version = "0.0.1";
+       sha256 = "17h6rncyb4insjarss4a8467d4mybmwa9dwgjrw7sb66y301xy8w";
+       libraryHaskellDepends = [
+         base bytestring containers fast-logger hmatrix lifted-base matrices
+         megaparsec monad-control monad-logger mwc-random
+         optparse-applicative parallel primitive template-haskell text time
+         transformers transformers-base vector zlib
+       ];
+       description = "Tools for ELynx";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
+  "elynx-tree" = callPackage
+    ({ mkDerivation, base, bytestring, containers, elynx-tools, hspec
+     , hspec-megaparsec, lifted-async, math-functions, megaparsec
+     , mwc-random, optparse-applicative, parallel, primitive, QuickCheck
+     , quickcheck-instances, statistics, transformers, vector
+     }:
+     mkDerivation {
+       pname = "elynx-tree";
+       version = "0.0.1";
+       sha256 = "0gd14cshy143q7gdxfkb0laxbramkxlqnr2s15z89rbs75hfgqa9";
+       libraryHaskellDepends = [
+         base bytestring containers elynx-tools lifted-async math-functions
+         megaparsec mwc-random optparse-applicative parallel primitive
+         QuickCheck quickcheck-instances statistics transformers vector
+       ];
+       testHaskellDepends = [
+         base bytestring containers elynx-tools hspec hspec-megaparsec
+         lifted-async math-functions megaparsec mwc-random
+         optparse-applicative parallel primitive QuickCheck
+         quickcheck-instances statistics transformers vector
+       ];
+       description = "Handle phylogenetic trees";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "emacs-keys" = callPackage
     ({ mkDerivation, base, doctest, split, tasty, tasty-hspec
      , tasty-quickcheck, template-haskell, th-lift, xkbcommon
@@ -77775,8 +77942,8 @@ self: {
      }:
      mkDerivation {
        pname = "essence-of-live-coding";
-       version = "0.1.0.1";
-       sha256 = "0804zqbl2w8cvj4n9y2qx9wdmigmw56fxdzkqrw6x2szl2qvsfjz";
+       version = "0.1.0.2";
+       sha256 = "1z65vm457af7ffiih8yzgds059kamaiskvjfl72qqb24fmgj9jxm";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -78594,8 +78761,8 @@ self: {
      }:
      mkDerivation {
        pname = "eventlog2html";
-       version = "0.3.0";
-       sha256 = "1vg94x1f5wh20dvnqil3b3ipd8kajyplv7sv9f7zmrl73m5cgg9s";
+       version = "0.4.0";
+       sha256 = "09gsxzqrbjksi5gnwf7b4d2ry0cj4gqzzbpbrb404lkd5v0z1sh1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -78745,8 +78912,8 @@ self: {
      }:
      mkDerivation {
        pname = "eventstore";
-       version = "1.3.0";
-       sha256 = "0smn5ygshmxcd8zz7zg81y4dcqysawznv3222kbj5c1gwx80lm7c";
+       version = "1.3.1";
+       sha256 = "1mpwd6bwyzzmg2mzbkllf2f05dsi17da5i3clvakjj9yv8dpxj3q";
        libraryHaskellDepends = [
          aeson array base bifunctors bytestring cereal clock connection
          containers dns dotnet-timespan ekg-core exceptions fast-logger
@@ -80503,6 +80670,37 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fakedata_0_3_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, deepseq, directory
+     , exceptions, filepath, gauge, hashable, hspec, hspec-discover
+     , random, template-haskell, text, time, unordered-containers
+     , vector, yaml
+     }:
+     mkDerivation {
+       pname = "fakedata";
+       version = "0.3.0";
+       sha256 = "11g3vja4kw7ms5bvccl4hpzvd59v2m60sk6ycx9calw13b65ix4p";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base bytestring containers directory exceptions filepath hashable
+         random template-haskell text time unordered-containers vector yaml
+       ];
+       testHaskellDepends = [
+         base bytestring containers directory exceptions filepath hashable
+         hspec hspec-discover random template-haskell text time
+         unordered-containers vector yaml
+       ];
+       testToolDepends = [ hspec-discover ];
+       benchmarkHaskellDepends = [
+         base bytestring containers deepseq directory exceptions filepath
+         gauge hashable random template-haskell text time
+         unordered-containers vector yaml
+       ];
+       description = "Library for producing fake data";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "fakefs" = callPackage
     ({ mkDerivation, base, containers, hspec, mtl, QuickCheck }:
      mkDerivation {
@@ -80671,6 +80869,27 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "fast-builder_0_1_2_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, criterion
+     , deepseq, ghc-prim, process, QuickCheck, scientific, stm
+     , template-haskell, text, true-name, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "fast-builder";
+       version = "0.1.2.0";
+       sha256 = "1aa3v14nlcq4ql3f07lan9kg21dqp009yzgb96bxznyigxwf67rp";
+       libraryHaskellDepends = [ base bytestring ghc-prim ];
+       testHaskellDepends = [ base bytestring process QuickCheck stm ];
+       benchmarkHaskellDepends = [
+         aeson base bytestring containers criterion deepseq ghc-prim
+         scientific template-haskell text true-name unordered-containers
+         vector
+       ];
+       description = "Fast ByteString Builder";
+       license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "fast-combinatorics" = callPackage
     ({ mkDerivation, base, Cabal, composition-prelude, criterion
      , directory, hspec, http-client, http-client-tls, tar, zlib
@@ -81824,6 +82043,141 @@ self: {
        broken = true;
      }) {};
 
+  "fei-base" = callPackage
+    ({ mkDerivation, base, c2hs, c2hs-extra, constraints, directory
+     , filepath, haskell-src-exts, hslogger, mtl, mxnet
+     , optparse-applicative, repa, text, tuple-ops, vector
+     }:
+     mkDerivation {
+       pname = "fei-base";
+       version = "0.2.0.0";
+       sha256 = "0blgzr1iy7d2cp370rankkldakkryysikh1rd039s7anq5l21rsg";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base c2hs-extra constraints repa tuple-ops vector
+       ];
+       librarySystemDepends = [ mxnet ];
+       libraryToolDepends = [ c2hs ];
+       executableHaskellDepends = [
+         base directory filepath haskell-src-exts hslogger mtl
+         optparse-applicative text
+       ];
+       executableSystemDepends = [ mxnet ];
+       description = "FFI to MXNet";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {inherit (pkgs) mxnet;};
+
+  "fei-cocoapi" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, c2hs, conduit
+     , containers, criterion, directory, exceptions, fei-base
+     , fei-dataiter, filepath, JuicyPixels, JuicyPixels-extra
+     , JuicyPixels-repa, lens, mtl, random-fu, repa, storable-tuple
+     , store, time, transformers-base, vector
+     }:
+     mkDerivation {
+       pname = "fei-cocoapi";
+       version = "0.2.0";
+       sha256 = "0sk3h94vlykq6x4nk25scb7jwhgi9rlk66xhy09wbz1a1n398j5z";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring conduit containers directory
+         exceptions fei-base fei-dataiter filepath JuicyPixels
+         JuicyPixels-extra JuicyPixels-repa lens mtl random-fu repa
+         storable-tuple store time transformers-base vector
+       ];
+       libraryToolDepends = [ c2hs ];
+       executableHaskellDepends = [
+         aeson base bytestring containers criterion JuicyPixels
+         JuicyPixels-repa lens repa store vector
+       ];
+       description = "Cocodataset with cocoapi";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "fei-dataiter" = callPackage
+    ({ mkDerivation, base, conduit, conduit-combinators, directory
+     , fei-base, fei-nn, filepath, haskell-src-exts, hslogger, hspec
+     , mtl, mxnet, optparse-applicative, streaming, template-haskell
+     , text
+     }:
+     mkDerivation {
+       pname = "fei-dataiter";
+       version = "0.2.0.0";
+       sha256 = "01iia8m5wq8yzmzl3dmsd5v01yq07ig6bg93h00mxyjpf1ai9kvk";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base conduit conduit-combinators fei-base fei-nn streaming
+         template-haskell
+       ];
+       executableHaskellDepends = [
+         base directory fei-base filepath haskell-src-exts hslogger mtl
+         optparse-applicative text
+       ];
+       executableSystemDepends = [ mxnet ];
+       testHaskellDepends = [ base fei-base hspec streaming ];
+       description = "mxnet dataiters";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {inherit (pkgs) mxnet;};
+
+  "fei-examples" = callPackage
+    ({ mkDerivation, attoparsec, base, conduit, directory, fei-base
+     , fei-cocoapi, fei-dataiter, fei-nn, lens, mtl
+     , optparse-applicative, random-fu, repa, text, unordered-containers
+     , vector
+     }:
+     mkDerivation {
+       pname = "fei-examples";
+       version = "0.3.0";
+       sha256 = "1yplcfls0c22h1808ky64ifdxswq60dq5l0qw0kmg452517xb2yx";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         attoparsec base conduit directory fei-base fei-cocoapi fei-dataiter
+         fei-nn lens mtl optparse-applicative random-fu repa text
+         unordered-containers vector
+       ];
+       description = "fei examples";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "fei-nn" = callPackage
+    ({ mkDerivation, aeson, attoparsec, attoparsec-binary, base
+     , bytestring, containers, exceptions, fei-base, ghc-prim, graphviz
+     , lens, mmorph, mtl, resourcet, template-haskell, text, time
+     , transformers-base, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "fei-nn";
+       version = "0.2.0";
+       sha256 = "08zdp0h87cddrwb7wrbk341k7v8hhriqp1jhgf6nmkjgqlwspk0m";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers exceptions fei-base graphviz lens
+         mtl resourcet template-haskell text time transformers-base
+         unordered-containers vector
+       ];
+       executableHaskellDepends = [
+         attoparsec attoparsec-binary base bytestring exceptions fei-base
+         ghc-prim mmorph mtl resourcet unordered-containers vector
+       ];
+       description = "Train a neural network with MXNet in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "feldspar-compiler" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, criterion
      , data-default, deepseq, directory, feldspar-language, filepath
@@ -82994,15 +83348,17 @@ self: {
   "finitary" = callPackage
     ({ mkDerivation, base, bitvec, coercible-utils, finite-typelits
      , ghc-typelits-knownnat, ghc-typelits-natnormalise, hedgehog
-     , monad-loops, mtl, template-haskell, vector-sized
+     , monad-loops, mtl, primitive, template-haskell, typelits-witnesses
+     , vector, vector-sized
      }:
      mkDerivation {
        pname = "finitary";
-       version = "0.1.0.0";
-       sha256 = "0s42ja10hnv1czy75wh8bkz3mj9qwy0bsa90bnwnazf9q6xn9lyv";
+       version = "1.0.0.1";
+       sha256 = "1va895ijk7sb5zn6zf1bfi8w0bqxjx4631iwnijh9f4d3dsnpqcv";
        libraryHaskellDepends = [
          base bitvec coercible-utils finite-typelits ghc-typelits-knownnat
-         ghc-typelits-natnormalise mtl template-haskell vector-sized
+         ghc-typelits-natnormalise mtl primitive template-haskell
+         typelits-witnesses vector vector-sized
        ];
        testHaskellDepends = [
          base bitvec finite-typelits hedgehog monad-loops vector-sized
@@ -83011,6 +83367,30 @@ self: {
        license = stdenv.lib.licenses.gpl3Plus;
      }) {};
 
+  "finitary-derive" = callPackage
+    ({ mkDerivation, base, binary, coercible-utils, deepseq, finitary
+     , finite-typelits, ghc-typelits-extra, ghc-typelits-knownnat
+     , hashable, hedgehog, hedgehog-classes, monad-loops, mtl, vector
+     , vector-sized
+     }:
+     mkDerivation {
+       pname = "finitary-derive";
+       version = "1.0.0.0";
+       sha256 = "0ns61aylidrkdf4qkfz1r1vjfzlmgbqar1dq068xg1pvnkpsrvlc";
+       libraryHaskellDepends = [
+         base binary coercible-utils deepseq finitary finite-typelits
+         ghc-typelits-extra ghc-typelits-knownnat hashable mtl vector
+         vector-sized
+       ];
+       testHaskellDepends = [
+         base finitary finite-typelits hedgehog hedgehog-classes monad-loops
+       ];
+       description = "Easy and efficient Unbox, Storable, Binary and Hashable instances for Finitary types";
+       license = stdenv.lib.licenses.gpl3Plus;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "finite-field" = callPackage
     ({ mkDerivation, base, containers, deepseq, hashable, primes
      , QuickCheck, singletons, tasty, tasty-hunit, tasty-quickcheck
@@ -83133,6 +83513,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "first-class-families_0_6_0_0" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "first-class-families";
+       version = "0.6.0.0";
+       sha256 = "0a1f789d3lv8hvd3nidwglx11yvwiakvmabpz1hzgdjyfnrpg98n";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
+       description = "First class type families";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "first-class-patterns" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
@@ -88643,10 +89036,8 @@ self: {
      }:
      mkDerivation {
        pname = "gamgee";
-       version = "1.1.0";
-       sha256 = "0ip6y8l2dmw15494d77s771aqmn7awrqnlmbcc7dd2lqwq5s5wgr";
-       revision = "1";
-       editedCabalFile = "1lg04ps7m85x4py844vcc53a3r6ijaqzjrggrwp53iv2ga1m88sr";
+       version = "1.2.0";
+       sha256 = "0q7r4bspxsqaswcy9c90wl7bh19y0k1lds0rx1m0cla7rg5ixra4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -89931,6 +90322,17 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "generics-mrsop-gdiff" = callPackage
+    ({ mkDerivation, base, generics-mrsop }:
+     mkDerivation {
+       pname = "generics-mrsop-gdiff";
+       version = "0.0.0";
+       sha256 = "0a60q7g5x7kwd864dc7yz83kz83fxf4gpj7q5lj4f2fg69ih0ybm";
+       libraryHaskellDepends = [ base generics-mrsop ];
+       description = "Reimplementation of the `gdiff` algorithm for `generics-mrsop`";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "generics-sop" = callPackage
     ({ mkDerivation, base, criterion, deepseq, ghc-prim, sop-core
      , template-haskell
@@ -90419,6 +90821,28 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "genvalidity-mergeful" = callPackage
+    ({ mkDerivation, base, containers, genvalidity
+     , genvalidity-containers, genvalidity-hspec
+     , genvalidity-hspec-aeson, genvalidity-time, genvalidity-uuid
+     , hspec, mergeful, mtl, pretty-show, QuickCheck, random, time, uuid
+     }:
+     mkDerivation {
+       pname = "genvalidity-mergeful";
+       version = "0.0.0.0";
+       sha256 = "07j3dczqxmwri458r8nml3rn31ii14fdz3b2sc8g41f2czr6fa75";
+       libraryHaskellDepends = [
+         base containers genvalidity genvalidity-containers genvalidity-time
+         mergeful QuickCheck
+       ];
+       testHaskellDepends = [
+         base containers genvalidity-hspec genvalidity-hspec-aeson
+         genvalidity-uuid hspec mergeful mtl pretty-show QuickCheck random
+         time uuid
+       ];
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "genvalidity-mergeless" = callPackage
     ({ mkDerivation, base, containers, genvalidity
      , genvalidity-containers, genvalidity-hspec
@@ -91773,27 +92197,6 @@ self: {
      }) {};
 
   "ghc-prof" = callPackage
-    ({ mkDerivation, attoparsec, base, containers, directory, filepath
-     , process, scientific, tasty, tasty-hunit, temporary, text, time
-     }:
-     mkDerivation {
-       pname = "ghc-prof";
-       version = "1.4.1.5";
-       sha256 = "0cpyzfyfkq6c17xpccgibjpq8j0l4w33mbpivim3kha7k76ilbg4";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         attoparsec base containers scientific text time
-       ];
-       testHaskellDepends = [
-         attoparsec base containers directory filepath process tasty
-         tasty-hunit temporary text
-       ];
-       description = "Library for parsing GHC time and allocation profiling reports";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ghc-prof_1_4_1_6" = callPackage
     ({ mkDerivation, attoparsec, base, containers, directory, filepath
      , process, scientific, tasty, tasty-hunit, temporary, text, time
      }:
@@ -91812,7 +92215,6 @@ self: {
        ];
        description = "Library for parsing GHC time and allocation profiling reports";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-prof-aeson" = callPackage
@@ -92392,6 +92794,44 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ghcide" = callPackage
+    ({ mkDerivation, aeson, async, base, binary, bytestring, containers
+     , data-default, deepseq, directory, extra, filepath, ghc, ghc-boot
+     , ghc-boot-th, ghc-paths, hashable, haskell-lsp, haskell-lsp-types
+     , hie-bios, lens, lsp-test, mtl, network-uri, optparse-applicative
+     , parser-combinators, prettyprinter, prettyprinter-ansi-terminal
+     , rope-utf16-splay, safe-exceptions, shake, sorted-list, stm, syb
+     , tasty, tasty-hunit, text, time, transformers, unix
+     , unordered-containers, utf8-string
+     }:
+     mkDerivation {
+       pname = "ghcide";
+       version = "0.0.2";
+       sha256 = "0ivq4j4i7cb8k7h2rkc9kpki39zl1nc63ba6hpfdlyl5vg5x3qy7";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson async base binary bytestring containers data-default deepseq
+         directory extra filepath ghc ghc-boot ghc-boot-th hashable
+         haskell-lsp haskell-lsp-types mtl network-uri prettyprinter
+         prettyprinter-ansi-terminal rope-utf16-splay safe-exceptions shake
+         sorted-list stm syb text time transformers unix
+         unordered-containers utf8-string
+       ];
+       executableHaskellDepends = [
+         base containers data-default directory extra filepath ghc ghc-paths
+         haskell-lsp hie-bios optparse-applicative shake text
+       ];
+       testHaskellDepends = [
+         base containers extra filepath haskell-lsp-types lens lsp-test
+         parser-combinators tasty tasty-hunit text
+       ];
+       description = "The core of an IDE";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "ghcjs-ajax" = callPackage
     ({ mkDerivation, aeson, base, http-types, text }:
      mkDerivation {
@@ -93309,8 +93749,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gtk-declarative";
-       version = "0.5.0";
-       sha256 = "0nhacfja1wrz0sa5pbz069sbpyzp8jnlrp078gg9gydwhlmh2k2h";
+       version = "0.6.0";
+       sha256 = "1637w7vfzjxwqgwfan793j03h7g39xci4v1vg54y9ar05pp0ggv8";
        libraryHaskellDepends = [
          base data-default-class gi-glib gi-gobject gi-gtk haskell-gi
          haskell-gi-base haskell-gi-overloading mtl text
@@ -93333,8 +93773,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gtk-declarative-app-simple";
-       version = "0.5.0";
-       sha256 = "0vl9gqgdbqr4hipr7ka01hyvyz9n8by0ry890w4n2c5w9rghgvva";
+       version = "0.6.0";
+       sha256 = "0szfmpgsslq5cs5q8574gpmm897vvs51g4wvdinnkglbf70254kf";
        libraryHaskellDepends = [
          async base gi-gdk gi-glib gi-gobject gi-gtk gi-gtk-declarative
          haskell-gi haskell-gi-base haskell-gi-overloading pipes
@@ -94018,8 +94458,8 @@ self: {
      }:
      mkDerivation {
        pname = "git-annex";
-       version = "7.20190819";
-       sha256 = "1fvyxx47qx7yr8xfan398jlixbawblpz5h69kqsw1z7kh6plnycy";
+       version = "7.20190912";
+       sha256 = "1a3jvl5cx32v78s3015i10cx00jprm1391rpww4mzkk1vskzn9cv";
        configureFlags = [
          "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime"
          "-f-networkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser"
@@ -94517,6 +94957,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "githash_0_1_3_3" = callPackage
+    ({ mkDerivation, base, bytestring, directory, filepath, hspec
+     , process, template-haskell, temporary, unliftio
+     }:
+     mkDerivation {
+       pname = "githash";
+       version = "0.1.3.3";
+       sha256 = "19xhs2nzm1myyjx3nkc3invy15c19cfx790vbcrl050n9sb330jr";
+       libraryHaskellDepends = [
+         base bytestring directory filepath process template-haskell
+       ];
+       testHaskellDepends = [
+         base bytestring directory filepath hspec process template-haskell
+         temporary unliftio
+       ];
+       description = "Compile git revision info into Haskell projects";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "github" = callPackage
     ({ mkDerivation, aeson, base, base-compat, base16-bytestring
      , binary, binary-instances, bytestring, containers, cryptohash-sha1
@@ -95502,8 +95962,8 @@ self: {
      }:
      mkDerivation {
        pname = "glirc";
-       version = "2.32";
-       sha256 = "0rlqmmjxvynd4a2kxjyw7dm5i2rd27jgj7sm57pbh2nig2rbbbyj";
+       version = "2.33";
+       sha256 = "14znjbgy67mh68hpbr2xxl1aff1b0bzmrwkknp402zq0y9p81iwy";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal filepath ];
@@ -95680,6 +96140,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "gloss_1_13_1_1" = callPackage
+    ({ mkDerivation, base, bmp, bytestring, containers, ghc-prim
+     , gloss-rendering, GLUT, OpenGL
+     }:
+     mkDerivation {
+       pname = "gloss";
+       version = "1.13.1.1";
+       sha256 = "1bmjwd2vfbxfypr2g23810yyp921m30wxbb6f3m0wkk65iypjnls";
+       libraryHaskellDepends = [
+         base bmp bytestring containers ghc-prim gloss-rendering GLUT OpenGL
+       ];
+       description = "Painless 2D vector graphics, animations and simulations";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gloss-accelerate" = callPackage
     ({ mkDerivation, accelerate, base, gloss, gloss-rendering }:
      mkDerivation {
@@ -95823,6 +96299,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "gloss-raster_1_13_1_1" = callPackage
+    ({ mkDerivation, base, containers, ghc-prim, gloss, gloss-rendering
+     , repa
+     }:
+     mkDerivation {
+       pname = "gloss-raster";
+       version = "1.13.1.1";
+       sha256 = "199b1avi4mils3x9xpk66992id40hdyk0lpjnyyxy8c22s0adgb9";
+       libraryHaskellDepends = [
+         base containers ghc-prim gloss gloss-rendering repa
+       ];
+       description = "Parallel rendering of raster images";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gloss-raster-accelerate" = callPackage
     ({ mkDerivation, accelerate, base, colour-accelerate, gloss
      , gloss-accelerate
@@ -99472,15 +99964,20 @@ self: {
      }) {};
 
   "grafana" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, text }:
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
+     , Diff, tasty, tasty-hunit, text
+     }:
      mkDerivation {
        pname = "grafana";
-       version = "0.1";
-       sha256 = "0k8a8bwyn9hvn4j3wn4crqdjg2xh36zxlka0ddx3qj6fmbfl1lps";
+       version = "0.2";
+       sha256 = "0aqg2ivbdm3459pa4077bhs6y3q9z3nwsajgp4b5ah3wnav1rn45";
        libraryHaskellDepends = [
-         aeson aeson-pretty base bytestring text
+         aeson aeson-pretty base bytestring containers text
        ];
-       description = "grafana datatypes for dashboards";
+       testHaskellDepends = [
+         aeson aeson-pretty base bytestring Diff tasty tasty-hunit
+       ];
+       description = "API for creating grafana dashboards represented as json";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -104284,8 +104781,8 @@ self: {
      }:
      mkDerivation {
        pname = "hakyll";
-       version = "4.13.0.0";
-       sha256 = "1a7g79j7ai5l46nz205rl6zr3f57m5ngd46v60wll3dj6wkiaw6b";
+       version = "4.13.0.1";
+       sha256 = "0728947np74z8dn1p55bqsv1bgx0ipaiajankwnnmp5mk0lkixd6";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -105970,8 +106467,8 @@ self: {
      }:
      mkDerivation {
        pname = "happstack-server";
-       version = "7.5.2";
-       sha256 = "1w5g5vf6jxb7fi3qg96x17y2i95mv5sbbzmjzy1m55qjqif568v1";
+       version = "7.5.3";
+       sha256 = "05ki6j3cc9pfqaf7qbr2g4z4kdn4zjrqd3n0n02n9297bcvcschp";
        libraryHaskellDepends = [
          base base64-bytestring blaze-html bytestring containers directory
          exceptions extensible-exceptions filepath hslogger html
@@ -106354,8 +106851,8 @@ self: {
      }:
      mkDerivation {
        pname = "harg";
-       version = "0.2.0.0";
-       sha256 = "0zdngzz1p73dpfx4klxf59yhk4qf0r4ming2nw4yqfsyxqfwgw1i";
+       version = "0.4.0.0";
+       sha256 = "0il36pwzmkc1dj39kybyp6hv4s7d60dl5rx1fkfm23dcg6a9r0dc";
        libraryHaskellDepends = [
          aeson barbies base bytestring directory higgledy
          optparse-applicative split text yaml
@@ -106560,8 +107057,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasbolt-extras";
-       version = "0.0.0.20";
-       sha256 = "0xqi3hb1xgbkkj8wmrvp39sh7zcj75v55xbha87nmkl2g56kaxw2";
+       version = "0.0.0.21";
+       sha256 = "1fq96j9hrfvjffjqz938fql40h15mb7dhfzjfbryd5qip4k45435";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -108081,10 +108578,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-lsp";
-       version = "0.15.0.1";
-       sha256 = "0l11psgknqppisn102h2392y5jiyz026rv8v2dpq4bk50zibb7qb";
-       revision = "1";
-       editedCabalFile = "0rk44rxal0sm1ci7c0phwl7fpcby1vys3n3vpp4bgla2hrc6pwba";
+       version = "0.15.0.0";
+       sha256 = "111c0hdlpnj979p3avlhswziyc6vh6apij5b2nhhi8wlfhqwrpcg";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -108162,10 +108657,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-lsp-types";
-       version = "0.15.0.1";
-       sha256 = "07195h5qdmnkrr7v1yx8l398vi4zbcawbh7k6slyj3xs3zq9s6kx";
-       revision = "1";
-       editedCabalFile = "06naxwj75jxy9xvvlc229m1jn9bandqsxaavzm7zj9vw8sxygr0h";
+       version = "0.15.0.0";
+       sha256 = "1ky20lpgbdiijh3z6ilf7jn7cyxl2kshqnm2p4dgabfh97gbf8bb";
        libraryHaskellDepends = [
          aeson base bytestring data-default deepseq filepath hashable lens
          network-uri scientific text unordered-containers
@@ -108750,8 +109243,10 @@ self: {
     ({ mkDerivation, base, haskell-src-exts }:
      mkDerivation {
        pname = "haskell-src-exts-simple";
-       version = "1.21.0.0";
-       sha256 = "0h8m1w995mpdca9is7lwv9n1w7khr5cnxzam21x7w47i546wm9rm";
+       version = "1.21.1.0";
+       sha256 = "1zw95fdbqgn9653fgbcpdc364ps07v0zgvwxng8yi2dhdnlhjqra";
+       revision = "1";
+       editedCabalFile = "0mc1n7bkwbykrw1wivj1mvm69a0j1089vbrg8vc1cfkmcdib3xdj";
        libraryHaskellDepends = [ base haskell-src-exts ];
        description = "A simplified view on the haskell-src-exts AST";
        license = stdenv.lib.licenses.mit;
@@ -111644,6 +112139,8 @@ self: {
        pname = "hasty-hamiltonian";
        version = "1.3.2";
        sha256 = "17nc33q9vkq13wp5dqrq2vq6bz408ll8h84fg7mapks5w5r9sag6";
+       revision = "1";
+       editedCabalFile = "1k883ziy63p3zmpyfzck5jw2143b6ijcsvwi704rp94pvh0vk02z";
        libraryHaskellDepends = [
          base kan-extensions lens mcmc-types mwc-probability pipes primitive
          transformers
@@ -112857,6 +113354,40 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) hdf5;};
 
+  "hdiff" = callPackage
+    ({ mkDerivation, base, bytestring, containers, cryptonite
+     , generics-mrsop, generics-mrsop-gdiff, gitrev, hspec, language-lua
+     , memory, mtl, optparse-applicative, parsec, prettyprinter
+     , prettyprinter-ansi-terminal, QuickCheck, text
+     }:
+     mkDerivation {
+       pname = "hdiff";
+       version = "0.0.0";
+       sha256 = "0vs55wrcip9djhdwd5wz44d8w5hfafdck4abhc488b23chdxxxi9";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring containers cryptonite generics-mrsop
+         generics-mrsop-gdiff hspec memory mtl prettyprinter
+         prettyprinter-ansi-terminal QuickCheck text
+       ];
+       executableHaskellDepends = [
+         base bytestring containers cryptonite generics-mrsop
+         generics-mrsop-gdiff gitrev hspec language-lua memory mtl
+         optparse-applicative parsec prettyprinter
+         prettyprinter-ansi-terminal QuickCheck text
+       ];
+       testHaskellDepends = [
+         base bytestring containers cryptonite generics-mrsop
+         generics-mrsop-gdiff hspec memory mtl prettyprinter
+         prettyprinter-ansi-terminal QuickCheck text
+       ];
+       description = "Pattern-Expression-based differencing of arbitrary types";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "hdigest" = callPackage
     ({ mkDerivation, base, cgi, Crypto, network, parsec, random, time
      }:
@@ -113345,6 +113876,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hedgehog_1_0_1" = callPackage
+    ({ mkDerivation, ansi-terminal, async, base, bytestring
+     , concurrent-output, containers, directory, exceptions, fail
+     , lifted-async, mmorph, monad-control, mtl, pretty-show, primitive
+     , random, resourcet, semigroups, stm, template-haskell, text, time
+     , transformers, transformers-base, wl-pprint-annotated
+     }:
+     mkDerivation {
+       pname = "hedgehog";
+       version = "1.0.1";
+       sha256 = "1qc7hkqbnsk3f5r26wc35r3qiy941nmcxhfqgcq9027kw4gs0bi0";
+       revision = "1";
+       editedCabalFile = "0dq3ry7py2wsiwxar11zbvm3xmifm92nx4bh61lqxzmpwyyiwnxn";
+       libraryHaskellDepends = [
+         ansi-terminal async base bytestring concurrent-output containers
+         directory exceptions fail lifted-async mmorph monad-control mtl
+         pretty-show primitive random resourcet semigroups stm
+         template-haskell text time transformers transformers-base
+         wl-pprint-annotated
+       ];
+       testHaskellDepends = [
+         base containers mmorph mtl pretty-show semigroups text transformers
+       ];
+       description = "Release with confidence";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hedgehog-checkers" = callPackage
     ({ mkDerivation, base, containers, either, hedgehog, semigroupoids
      , semigroups
@@ -114818,6 +115377,8 @@ self: {
        pname = "hexpat-lens";
        version = "0.1.8";
        sha256 = "05c5pjxxsivcbppbl2n8dwyv6zh7azc3l998s2rhgjja55cpfmg0";
+       revision = "1";
+       editedCabalFile = "0z7cqm5alscaspaiz5pgwlcn6njhggyizqb1v5ay4sbac7v8nqlx";
        libraryHaskellDepends = [
          base bytestring deepseq hexpat hexpat-tagsoup lens
        ];
@@ -115809,8 +116370,8 @@ self: {
      }:
      mkDerivation {
        pname = "hie-bios";
-       version = "0.1.1";
-       sha256 = "119rqh12bq5gq5y708hxr0zci1dq8wf44xzxgxhhx4sb5zgj1l2p";
+       version = "0.2.0";
+       sha256 = "0sr0drw0kyf4f77cg25x4scjzqg597yr5xl4dzqdnjz5vv0p1znm";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -117515,8 +118076,8 @@ self: {
        pname = "hledger-api";
        version = "1.14";
        sha256 = "18zpclm3nh2zq6cqa10vm232ndg22r8s4h3ffmn2m4fg05172ymd";
-       revision = "1";
-       editedCabalFile = "05jlbpp4p45q8bd3152l0fm4xz9yvz07ip2cd0kplzvwnmy8sfrg";
+       revision = "4";
+       editedCabalFile = "126l1d6dirg0kn5p5wdrjnkckn6jsycrvqsh63ysiwswn096gf4c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -119875,10 +120436,8 @@ self: {
      }:
      mkDerivation {
        pname = "hookup";
-       version = "0.2.3";
-       sha256 = "03svzlzkykz4yqwq4vfgwdq6jdz8zzqhy1ggz3wps9cbx6yrl4cj";
-       revision = "1";
-       editedCabalFile = "1pc0ijak6psp5db1q29nzhp8pw0h15y2g8ssa1xxmlfjdl1c509d";
+       version = "0.3";
+       sha256 = "08a10bmnr15bb6pdcq4hq3z4595spsq3g8879apcqb6qgbs6dlxb";
        libraryHaskellDepends = [
          attoparsec base bytestring HsOpenSSL HsOpenSSL-x509-system network
        ];
@@ -121884,6 +122443,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hs-ix" = callPackage
+    ({ mkDerivation, base, base-unicode-symbols, criterion, hs-functors
+     , smallcheck, tasty, tasty-smallcheck, util
+     }:
+     mkDerivation {
+       pname = "hs-ix";
+       version = "0.1.0.0";
+       sha256 = "1hn4i5j4wyi4n1cb7w9165k0dwkvzy4n9vi2j12p65m9bai8p4zm";
+       libraryHaskellDepends = [
+         base base-unicode-symbols hs-functors util
+       ];
+       testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
+       benchmarkHaskellDepends = [ base criterion ];
+       description = "Indexed monads";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hs-java" = callPackage
     ({ mkDerivation, array, base, binary, binary-state, bytestring
      , containers, control-monad-exception, data-binary-ieee754
@@ -123794,14 +124370,14 @@ self: {
      }) {};
 
   "hsimport" = callPackage
-    ({ mkDerivation, attoparsec, base, cmdargs, directory, dyre
-     , filepath, haskell-src-exts, ilist, microlens, mtl, split, tasty
-     , tasty-golden, text
+    ({ mkDerivation, attoparsec, base, bytestring, cmdargs, directory
+     , dyre, filepath, haskell-src-exts, ilist, microlens, mtl, split
+     , tasty, tasty-golden, text, utf8-string
      }:
      mkDerivation {
        pname = "hsimport";
-       version = "0.10.0";
-       sha256 = "0l98yylpmpnlq6ahicpz86p4khg02yjjcg19nyf9rgml3qdw6829";
+       version = "0.11.0";
+       sha256 = "1z55gpwyb2gwjlll2c32g9r4aqpdybjpnjy785z60wpjdl48qwaa";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -123810,7 +124386,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [
-         base filepath haskell-src-exts tasty tasty-golden
+         base bytestring filepath haskell-src-exts tasty tasty-golden
+         utf8-string
        ];
        doHaddock = false;
        description = "Extend the import list of a Haskell source file";
@@ -124699,17 +125276,17 @@ self: {
      }) {};
 
   "hspec-golden" = callPackage
-    ({ mkDerivation, base, directory, hspec, hspec-core, silently
-     , simple-get-opt
+    ({ mkDerivation, base, directory, hspec, hspec-core
+     , optparse-applicative, silently
      }:
      mkDerivation {
        pname = "hspec-golden";
-       version = "0.1.0.0";
-       sha256 = "191z6pxks4ic1b8lzyfd8f3kw3zwmywvj8psd17lb65z121grj46";
+       version = "0.1.0.1";
+       sha256 = "1h29jffq33r5ffcni50ypa03x7qvx8yymdrp5nck9q8ykiivry22";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base directory hspec-core ];
-       executableHaskellDepends = [ base directory simple-get-opt ];
+       executableHaskellDepends = [ base directory optparse-applicative ];
        testHaskellDepends = [ base directory hspec hspec-core silently ];
        description = "Golden tests for hspec";
        license = stdenv.lib.licenses.mit;
@@ -126646,6 +127223,8 @@ self: {
        pname = "htoml-megaparsec";
        version = "2.1.0.3";
        sha256 = "1fpvfrib4igcmwhfms1spxr2b78srhrh4hrflrlgdgdn9x1m5w1x";
+       revision = "1";
+       editedCabalFile = "07zw749vwqdr2lznxivfa22smq7k3h0innanl5wwyf29dq4gk464";
        libraryHaskellDepends = [
          base composition-prelude containers deepseq megaparsec mtl text
          time unordered-containers vector
@@ -128683,14 +129262,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hvega_0_4_0_0" = callPackage
+  "hvega_0_4_1_0" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
      , filepath, tasty, tasty-golden, text, unordered-containers, vector
      }:
      mkDerivation {
        pname = "hvega";
-       version = "0.4.0.0";
-       sha256 = "1clq31aq8vgvvc1mcrz4al3f7kfb6crs2nkc07n87xykmrcjkdyq";
+       version = "0.4.1.0";
+       sha256 = "1qjswpgn1ass1x4bk5zjv6vvw7vvsbzh00qc6jjfq3bnljrl4i75";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -128793,8 +129372,8 @@ self: {
        pname = "hw-bits";
        version = "0.7.0.6";
        sha256 = "0c3bfr4x52fvvp3yin54xbfxz7nq936v2ac89vcim1gscyw51hvm";
-       revision = "1";
-       editedCabalFile = "0yl5b2qcrb2bjncwv2k9j006582cwxmpfgsggcyk5vw7i6iwhmhb";
+       revision = "2";
+       editedCabalFile = "1lp2kbmdc5lq7xqi2ix7jccw1gmjxl1q01bflj8fzr2f713m9yrr";
        libraryHaskellDepends = [
          base bytestring hw-int hw-prim hw-string-parse safe vector
        ];
@@ -128966,6 +129545,8 @@ self: {
        pname = "hw-eliasfano";
        version = "0.1.1.0";
        sha256 = "0q3lrpw72krsbfbykjkkm55aca43ravyl4b1d3k0wgh5wv340a3v";
+       revision = "1";
+       editedCabalFile = "100fwgcby3nfmx2ailf8zggq0sbh5fm65x4dxyaayfzs8ngfi5is";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -129103,6 +129684,8 @@ self: {
        pname = "hw-ip";
        version = "2.3.4.1";
        sha256 = "023wv7dvpyw2nnlrdqhp3nqrbbh9af074fz12y8510br2gfdyamd";
+       revision = "1";
+       editedCabalFile = "0djvl3qvy4km5qxg5pakgck8vr5hh0md8h9h4sgsvjafcqjrza3x";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -129164,7 +129747,7 @@ self: {
        broken = true;
      }) {};
 
-  "hw-json_1_3_0_1" = callPackage
+  "hw-json_1_3_1_0" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base
      , bits-extra, bytestring, criterion, directory, dlist, generic-lens
      , hedgehog, hspec, hspec-discover, hw-balancedparens, hw-bits
@@ -129176,8 +129759,10 @@ self: {
      }:
      mkDerivation {
        pname = "hw-json";
-       version = "1.3.0.1";
-       sha256 = "10m4f4jv3wb4n4na1d1a26s81n7clxgmj2745xs9yrax1wvqnjg0";
+       version = "1.3.1.0";
+       sha256 = "0y5gxr4db381lndjr666l6vl022z9pnp5ypsmrwxcx53hv7glzwn";
+       revision = "1";
+       editedCabalFile = "1aw2sg7vchf9jd01dkvcbw33n6l5hgi4kyhjk4syr6cnyxysf187";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -129236,6 +129821,8 @@ self: {
        pname = "hw-json-simd";
        version = "0.1.0.2";
        sha256 = "13i41ppi3ncisfyl3jvpgf4cbx86gyy0maq1xm0jipplkr78844w";
+       revision = "1";
+       editedCabalFile = "1vbq16ik20yvipvlpf9jrdsv33ynm152rr7c67lcdv8nf4gg4mhq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring hw-prim lens vector ];
@@ -129259,6 +129846,8 @@ self: {
        pname = "hw-json-simple-cursor";
        version = "0.1.0.1";
        sha256 = "0asvkzz0dgcc5cjrn3wqhn3svxi13wfzxi0ggc8mzzmfci07jigy";
+       revision = "1";
+       editedCabalFile = "1cpmvmncn3w60lacx21yg9snrmaghn9icgb67g2lfviya6a5qgs8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -129455,6 +130044,8 @@ self: {
        pname = "hw-packed-vector";
        version = "0.2.0.0";
        sha256 = "1nspd5hwn32fjgxmg08bq8hmyxzh61gc72zgd24mcpy94kzq58xd";
+       revision = "1";
+       editedCabalFile = "0ilqka4s82kwqrp876gfv6wp7gvlxkfzgxdz23l937vwx988cf1z";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -129522,6 +130113,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hw-prim_0_6_2_32" = callPackage
+    ({ mkDerivation, base, bytestring, criterion, directory, exceptions
+     , ghc-prim, hedgehog, hspec, hspec-discover, hw-hspec-hedgehog
+     , mmap, QuickCheck, semigroups, transformers, unliftio-core, vector
+     }:
+     mkDerivation {
+       pname = "hw-prim";
+       version = "0.6.2.32";
+       sha256 = "0q65kivpxciqvknnradmpkaplrkfbckqv3xajk8h2dgas8r1m40l";
+       libraryHaskellDepends = [
+         base bytestring ghc-prim mmap semigroups transformers unliftio-core
+         vector
+       ];
+       testHaskellDepends = [
+         base bytestring directory exceptions hedgehog hspec
+         hw-hspec-hedgehog mmap QuickCheck semigroups transformers vector
+       ];
+       testToolDepends = [ hspec-discover ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion mmap semigroups transformers vector
+       ];
+       description = "Primitive functions and data types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hw-prim-bits" = callPackage
     ({ mkDerivation, base, criterion, hedgehog, hspec, hw-hedgehog
      , hw-hspec-hedgehog, QuickCheck, vector
@@ -129749,17 +130366,18 @@ self: {
   "hw-uri" = callPackage
     ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3
      , antiope-core, antiope-s3, base, bytestring, directory, exceptions
-     , filepath, hedgehog, hspec, hspec-discover, http-client
-     , http-types, hw-hspec-hedgehog, lens, mtl, resourcet, text
+     , filepath, generic-lens, hedgehog, hspec, hspec-discover
+     , http-client, http-types, hw-hspec-hedgehog, lens, mtl, resourcet
+     , text
      }:
      mkDerivation {
        pname = "hw-uri";
-       version = "0.1.1.0";
-       sha256 = "1f96632k6pcaxhy2nrm13s9kdb0dz3vsav6hzf94wlv7zdlncn8x";
+       version = "0.1.1.4";
+       sha256 = "1y3rf1npqx3y3pkaipbwhabszvp0427h3sa9f6a5dfy14c6vm88b";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core amazonka-s3 antiope-core antiope-s3
-         base bytestring directory exceptions filepath http-client
-         http-types lens mtl resourcet text
+         base bytestring directory exceptions filepath generic-lens
+         http-client http-types lens mtl resourcet text
        ];
        testHaskellDepends = [
          aeson antiope-core antiope-s3 base bytestring filepath hedgehog
@@ -130889,20 +131507,18 @@ self: {
     ({ mkDerivation, approximate, base, binary, bits, bytes, Cabal
      , cabal-doctest, cereal, cereal-vector, comonad, deepseq, directory
      , distributive, doctest, filepath, generic-deriving, hashable, lens
-     , reflection, safecopy, semigroupoids, semigroups, simple-reflect
-     , siphash, tagged, vector
+     , reflection, semigroupoids, semigroups, simple-reflect, siphash
+     , tagged, vector
      }:
      mkDerivation {
        pname = "hyperloglog";
-       version = "0.4.2";
-       sha256 = "0j0hbzpap3f92kvywsxjahxmqrdj51275jdv0h7f9lf9qby3rf7m";
-       revision = "1";
-       editedCabalFile = "1zh47rrwih6933hhq9vd0ly5s42w0bn196znkg9l8q6r6drl7xsf";
+       version = "0.4.3";
+       sha256 = "0r1zrhl81hm0sb9my32xyng0xdl2yzh1pdw2bqabzccrhyjk1fwd";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          approximate base binary bits bytes cereal cereal-vector comonad
-         deepseq distributive hashable lens reflection safecopy
-         semigroupoids semigroups siphash tagged vector
+         deepseq distributive hashable lens reflection semigroupoids
+         semigroups siphash tagged vector
        ];
        testHaskellDepends = [
          base directory doctest filepath generic-deriving semigroups
@@ -131459,16 +132075,16 @@ self: {
   "ideas" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive
      , containers, Diff, directory, filepath, HDBC, HDBC-sqlite3
-     , http-types, network, parsec, QuickCheck, random
+     , http-types, mtl, network, parsec, QuickCheck, random
      , streaming-commons, time, uniplate, wai, wl-pprint
      }:
      mkDerivation {
        pname = "ideas";
-       version = "1.7";
-       sha256 = "0blazd950wpxjg0mfcx64m32wgcgia34gki987xgqmgkqyc5y2hm";
+       version = "1.8";
+       sha256 = "0bkcn9rc2bwnfy7n7yja9dlzpjfyvbjj3i10h7clhz59k9x5d8km";
        libraryHaskellDepends = [
          base blaze-builder bytestring case-insensitive containers Diff
-         directory filepath HDBC HDBC-sqlite3 http-types network parsec
+         directory filepath HDBC HDBC-sqlite3 http-types mtl network parsec
          QuickCheck random streaming-commons time uniplate wai wl-pprint
        ];
        description = "Feedback services for intelligent tutoring systems";
@@ -131496,6 +132112,21 @@ self: {
        broken = true;
      }) {};
 
+  "ideas-math-types" = callPackage
+    ({ mkDerivation, base, containers, ideas, parsec, QuickCheck }:
+     mkDerivation {
+       pname = "ideas-math-types";
+       version = "1.0";
+       sha256 = "0r72ld0kvyqn21mndhv7gvaa43ydpyv5n6b4lhn9k0wzz2s5q8md";
+       libraryHaskellDepends = [
+         base containers ideas parsec QuickCheck
+       ];
+       description = "Common types for mathematical domain reasoners";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "idempotent" = callPackage
     ({ mkDerivation, base, containers, hspec, QuickCheck }:
      mkDerivation {
@@ -133331,6 +133962,8 @@ self: {
        pname = "indexed-list-literals";
        version = "0.2.1.2";
        sha256 = "043xl356q9n1nw2bw8a8msymy18d6f7nwcyrrpzak9qr75dsx5nq";
+       revision = "1";
+       editedCabalFile = "198hmw2m3539vmh3s58d33h6vl5d0fqpdms8rp8cwj196diipjlc";
        libraryHaskellDepends = [ base Only ];
        testHaskellDepends = [ base hspec ];
        description = "Type safe indexed list literals";
@@ -133554,33 +134187,6 @@ self: {
      }) {};
 
   "influxdb" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal
-     , cabal-doctest, clock, containers, doctest, foldl, http-client
-     , http-types, lens, network, optional-args, raw-strings-qq
-     , scientific, tagged, tasty, tasty-hunit, template-haskell, text
-     , time, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "influxdb";
-       version = "1.7.1";
-       sha256 = "1nny63rd9bw7ijg9l09cd467whfaa1n3ph8dqdy7bp6kcbvdwnzn";
-       isLibrary = true;
-       isExecutable = true;
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         aeson attoparsec base bytestring clock containers foldl http-client
-         http-types lens network optional-args scientific tagged text time
-         unordered-containers vector
-       ];
-       testHaskellDepends = [
-         base containers doctest raw-strings-qq tasty tasty-hunit
-         template-haskell time
-       ];
-       description = "Haskell client library for InfluxDB";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "influxdb_1_7_1_1" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal
      , cabal-doctest, clock, containers, doctest, foldl, http-client
      , http-types, lens, network, optional-args, raw-strings-qq
@@ -133605,7 +134211,6 @@ self: {
        ];
        description = "Haskell client library for InfluxDB";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "informative" = callPackage
@@ -136906,6 +137511,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) wirelesstools;};
 
+  "ix" = callPackage
+    ({ mkDerivation, base, base-unicode-symbols, criterion, smallcheck
+     , tasty, tasty-smallcheck, util
+     }:
+     mkDerivation {
+       pname = "ix";
+       version = "0.1.0.0";
+       sha256 = "135ksmyzk6d4sgw7na08cav56667hvlnpcvx14a5mf0ap89s63mg";
+       libraryHaskellDepends = [ base base-unicode-symbols util ];
+       testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
+       benchmarkHaskellDepends = [ base criterion ];
+       doHaddock = false;
+       description = "Indexed monads";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "ix-shapable" = callPackage
     ({ mkDerivation, array, base }:
      mkDerivation {
@@ -136974,6 +137595,8 @@ self: {
        pname = "ixset-typed";
        version = "0.4.0.1";
        sha256 = "135cfc8d39qv02sga03gsym1yfajf0l5ci1s6q9n1xpb9ignblx8";
+       revision = "1";
+       editedCabalFile = "0kfklsbjn4gmx76vl7vm1s149f13h2p537930yaq8s2671lzc79p";
        libraryHaskellDepends = [
          base containers deepseq safecopy syb template-haskell
        ];
@@ -137441,6 +138064,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "javascript-bridge" = callPackage
+    ({ mkDerivation, aeson, base, binary, containers, scotty, stm, text
+     , time, transformers, wai, wai-extra, wai-websockets, websockets
+     }:
+     mkDerivation {
+       pname = "javascript-bridge";
+       version = "0.2.0";
+       sha256 = "13k7rkvmgm3ajhjvxlkkbipsbkx01lbjwq2xgfyygbcb0lccjrd9";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson base binary containers stm text time transformers wai
+         wai-websockets websockets
+       ];
+       executableHaskellDepends = [ base scotty text ];
+       testHaskellDepends = [ aeson base scotty stm text time wai-extra ];
+       description = "Remote Monad for JavaScript on the browser";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "javascript-extras" = callPackage
     ({ mkDerivation, base, deepseq, ghcjs-base-stub, newtype-generics
      , parallel, text
@@ -137880,8 +138524,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "joint";
-       version = "0.1.1";
-       sha256 = "1iq29qyi4ij7ffshvz1x9rpbrbpd4088nccdpjzpzgza73w4bqmp";
+       version = "0.1.2";
+       sha256 = "0v646rwk7anvfxdj7bz9wann1gahcpfsmvsrkk5zbkjx0bw6pibv";
        libraryHaskellDepends = [ base ];
        description = "Trying to compose non-composable";
        license = stdenv.lib.licenses.bsd3;
@@ -139523,8 +140167,8 @@ self: {
      }:
      mkDerivation {
        pname = "jvm-binary";
-       version = "0.6.0";
-       sha256 = "1ipy0vy0pr9pbxjin0d86dwvdy70wxb1cmg1bqcdjdgrg2xbqxf8";
+       version = "0.6.1";
+       sha256 = "0pz7md5y422mh7lcsshllqwhk6zsxl2szqw44css4m40gr196wnx";
        libraryHaskellDepends = [
          attoparsec base binary bytestring containers data-binary-ieee754
          deepseq deriving-compat mtl template-haskell text vector
@@ -140956,8 +141600,8 @@ self: {
     ({ mkDerivation, base, transformers }:
      mkDerivation {
        pname = "key";
-       version = "0.1.1.0";
-       sha256 = "15n53kq13hhc659s1hq9wdr530da3h2mg5psncq1d2snkkdswqxf";
+       version = "0.1.2.0";
+       sha256 = "18wgalv0hr5ndr7mbywr7ilyc504kzf28xyymmkj1fm66wb93n4k";
        libraryHaskellDepends = [ base transformers ];
        description = "Type-safe unconstrained dynamic typing";
        license = stdenv.lib.licenses.bsd3;
@@ -141327,18 +141971,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "kind-generics-th_0_2_0_0" = callPackage
-    ({ mkDerivation, base, kind-generics, template-haskell
+  "kind-generics-th_0_2_1_0" = callPackage
+    ({ mkDerivation, base, ghc-prim, kind-generics, template-haskell
      , th-abstraction
      }:
      mkDerivation {
        pname = "kind-generics-th";
-       version = "0.2.0.0";
-       sha256 = "1vj2zbkv51fvcpjrkqqlsd685drnh2yalsplcb6sgrgq9dfdlw2h";
+       version = "0.2.1.0";
+       sha256 = "08mswzwm1byxx2hfc8h2b90pnn2p4y83kdrvl4mlcn6v488k2lkb";
        libraryHaskellDepends = [
-         base kind-generics template-haskell th-abstraction
+         base ghc-prim kind-generics template-haskell th-abstraction
        ];
-       testHaskellDepends = [ base kind-generics ];
+       testHaskellDepends = [ base kind-generics template-haskell ];
        description = "Template Haskell support for generating `GenericK` instances";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -141509,8 +142153,8 @@ self: {
      }:
      mkDerivation {
        pname = "knit-haskell";
-       version = "0.6.0.1";
-       sha256 = "0wsbi614sjn62ri4msdmav7kx9k11h35dkjpxsd2ndvky2njzi33";
+       version = "0.7.0.0";
+       sha256 = "06p802fx328hkl3d9rnbdvlmhh9fyx2l293hg65z5ad96c9xzwas";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson-pretty base base64-bytestring blaze-colonnade blaze-html
@@ -144788,8 +145432,8 @@ self: {
        pname = "lazy-hash";
        version = "0.1.0.0";
        sha256 = "1xa2c8gxk5l4njbs58zpq2ybdvjd4y214p71nfmfrzw0arwz49pa";
-       revision = "2";
-       editedCabalFile = "0j46blbddl9y4chccyns7cixbxb0a4pkmdkbd5z09510ddz3jqm3";
+       revision = "3";
+       editedCabalFile = "0l348ahsic2cd27haqgsbh35w1f1y92bf2jnb8hkvbwf04b7r4qw";
        libraryHaskellDepends = [
          base constrained-categories hashable haskell-src-meta tagged
          template-haskell vector-space
@@ -144809,8 +145453,8 @@ self: {
        pname = "lazy-hash-cache";
        version = "0.1.0.0";
        sha256 = "1bdq2fbxpmlva1qbxbiznnjmz7yv7qzcr8wdgds0rdzwhjn97mp4";
-       revision = "1";
-       editedCabalFile = "1m42wsj93vpb6v1dcj2lc5z04qc2np8i7n3w82jwwk4wbgl5q35j";
+       revision = "2";
+       editedCabalFile = "1w1g6h01pjvrqk3r0qknn0v0xidfdnbwm6kqvxax89r83i29pkv5";
        libraryHaskellDepends = [
          base base16-bytestring binary bytestring data-default-class
          directory filepath hashable lazy-hash microlens microlens-th
@@ -144846,6 +145490,22 @@ self: {
        broken = true;
      }) {};
 
+  "lazy-priority-queue" = callPackage
+    ({ mkDerivation, base, containers, doctest, lens, markdown-unlit }:
+     mkDerivation {
+       pname = "lazy-priority-queue";
+       version = "0.1";
+       sha256 = "0cjp9pvwrgldkrkg72xyq2mrr4yqzzsb4ng5as0b56zq4dgzvlib";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base containers ];
+       testHaskellDepends = [ base doctest lens ];
+       testToolDepends = [ markdown-unlit ];
+       description = "Lazy-Spined Monadic Priority Queues";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "lazy-search" = callPackage
     ({ mkDerivation, base, size-based }:
      mkDerivation {
@@ -145569,7 +146229,7 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
-  "lens_4_18" = callPackage
+  "lens_4_18_1" = callPackage
     ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring
      , Cabal, cabal-doctest, call-stack, comonad, containers
      , contravariant, criterion, deepseq, directory, distributive
@@ -145583,8 +146243,8 @@ self: {
      }:
      mkDerivation {
        pname = "lens";
-       version = "4.18";
-       sha256 = "0wldr36bmlxddc6d874lfl4hwnh5bq5k89v437d7xw5ldj0fgws6";
+       version = "4.18.1";
+       sha256 = "1lmxjaj32v06l12gy00rpjp2lk1cblh3k7kwklk655ss2vas61ri";
        setupHaskellDepends = [ base Cabal cabal-doctest filepath ];
        libraryHaskellDepends = [
          array base base-orphans bifunctors bytestring call-stack comonad
@@ -145630,8 +146290,8 @@ self: {
      }:
      mkDerivation {
        pname = "lens-action";
-       version = "0.2.3";
-       sha256 = "1q4q190lv6gh3bvdz9n177hwrckkkbfbwcw64b9ksz11gxn8m106";
+       version = "0.2.4";
+       sha256 = "06yg4ds0d4cfs3zl1fhc8865i5w6pwqhx9bxngfa8f9974mdiid3";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base comonad contravariant lens mtl profunctors semigroupoids
@@ -148225,8 +148885,8 @@ self: {
      }:
      mkDerivation {
        pname = "lingo";
-       version = "0.1.0.1";
-       sha256 = "1yany2pi06yvkmgz808gji6yk9v0wbl5vnaijhb8vqd152zmmzb4";
+       version = "0.2.0.0";
+       sha256 = "0wgrliwxgwsylga3hkikpjyf7a835n7y62kihj6glymim2xv1vdw";
        setupHaskellDepends = [
          base bytestring Cabal containers directory filepath text yaml
        ];
@@ -148370,8 +149030,8 @@ self: {
      }:
      mkDerivation {
        pname = "linnet";
-       version = "0.4.0.0";
-       sha256 = "0k64pnzs13rc68h4qpn0kd3qm3hsyzgd8d8r96vak8a0pbjkzgrq";
+       version = "0.4.0.1";
+       sha256 = "0bzss6a8fx8zw5q27m50nhqp8rb23v1cdxlck0hjr17h0fmxvwsm";
        libraryHaskellDepends = [
          base bytestring bytestring-conversion case-insensitive either
          exceptions http-media http-types mtl text time transformers
@@ -148393,8 +149053,8 @@ self: {
      }:
      mkDerivation {
        pname = "linnet-aeson";
-       version = "0.4.0.0";
-       sha256 = "1rpc3i32vywvhfndg9p3rd5qy1m1fv0zqxbhdyp36c8awm1q5086";
+       version = "0.4.0.1";
+       sha256 = "0lsrn9sxcr038vz7j112hmf5mc2027x808ndqxm4dx4m6ncji0a4";
        libraryHaskellDepends = [ aeson base bytestring linnet ];
        testHaskellDepends = [
          aeson base bytestring hspec linnet QuickCheck quickcheck-classes
@@ -148411,8 +149071,8 @@ self: {
      }:
      mkDerivation {
        pname = "linnet-conduit";
-       version = "0.4.0.0";
-       sha256 = "1a29sahlmhl8k6xqyfm9ixf64k2x0k631z5jixvg1x1s6xpq3hyi";
+       version = "0.4.0.1";
+       sha256 = "02ixcf0b1p2c7cyiaghx564lkyy2m48m8p1y6dxim9ygjgamhhl9";
        libraryHaskellDepends = [
          base bytestring conduit http-types linnet wai warp
        ];
@@ -148651,11 +149311,11 @@ self: {
     ({ mkDerivation, base, bytestring, containers, hashable }:
      mkDerivation {
        pname = "lio";
-       version = "0.11.6.0";
-       sha256 = "1lylxwcm0j9iyivi11h6wsq6xb4fn8k5bpbjj3694kcdby9b8hr6";
+       version = "0.11.7.0";
+       sha256 = "17ckrv1ksm2ab91x63h5ia65hckw0zcxfr2mdl6aa2xxscnm4k8h";
        libraryHaskellDepends = [ base bytestring containers hashable ];
        description = "Labeled IO Information Flow Control Library";
-       license = "GPL";
+       license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
      }) {};
@@ -149571,8 +150231,8 @@ self: {
     ({ mkDerivation, base, enumset, LLVM }:
      mkDerivation {
        pname = "llvm-ffi";
-       version = "3.8.1.1";
-       sha256 = "1l74yyxgi3ndj9ffjk46wnzifgcn39gj19h9rcsbb8zvbcxw0lw6";
+       version = "3.8.1.2";
+       sha256 = "04k2ag8nh54f9hh3blgyn1xa88hfv6c6ps51i5b84g4jdvja7f5v";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base enumset ];
@@ -150670,6 +151330,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "logging-effect_1_3_5" = callPackage
+    ({ mkDerivation, async, base, bytestring, criterion, exceptions
+     , fast-logger, free, lifted-async, monad-control, monad-logger, mtl
+     , prettyprinter, semigroups, stm, stm-delay, text, time
+     , transformers, transformers-base, unliftio-core
+     }:
+     mkDerivation {
+       pname = "logging-effect";
+       version = "1.3.5";
+       sha256 = "1ydkgjq3xpl7bqyax8ff6kvd9hjbyddgayrw43afdzbky1d0qawq";
+       libraryHaskellDepends = [
+         async base exceptions free monad-control mtl prettyprinter
+         semigroups stm stm-delay text time transformers transformers-base
+         unliftio-core
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion fast-logger lifted-async monad-logger
+         prettyprinter text time
+       ];
+       description = "A mtl-style monad transformer for general purpose & compositional logging";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "logging-effect-extra" = callPackage
     ({ mkDerivation, base, logging-effect, logging-effect-extra-file
      , logging-effect-extra-handler, prettyprinter
@@ -152270,6 +152954,37 @@ self: {
        broken = true;
      }) {};
 
+  "lzip" = callPackage
+    ({ mkDerivation, base, bytestring }:
+     mkDerivation {
+       pname = "lzip";
+       version = "0.0.0.0";
+       sha256 = "0ccwckq0gkrnahf224s59gsdd9baay1dfc8fh1kz2r87rbygzsk7";
+       libraryHaskellDepends = [ base bytestring ];
+       description = "Lzip compression / Lzlib bindings";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
+  "lzlib" = callPackage
+    ({ mkDerivation, base, bytestring, c2hs, criterion, directory
+     , filepath, hspec, temporary
+     }:
+     mkDerivation {
+       pname = "lzlib";
+       version = "0.2.0.0";
+       sha256 = "0m0kx2drrxy01rf7a231pjqk783gcqqkjn831bcx0dbqksaz6fvm";
+       revision = "1";
+       editedCabalFile = "0jjl1rdlh8cms7pbd9y258s817l77nql4ayq12qy8c9vvxdyamh8";
+       libraryHaskellDepends = [ base bytestring ];
+       libraryToolDepends = [ c2hs ];
+       testHaskellDepends = [ base bytestring directory hspec ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion filepath temporary
+       ];
+       description = "lzlib bindings";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "lzma" = callPackage
     ({ mkDerivation, base, bytestring, HUnit, lzma, QuickCheck, tasty
      , tasty-hunit, tasty-quickcheck
@@ -152353,8 +153068,8 @@ self: {
        pname = "lzma-streams";
        version = "0.1.0.0";
        sha256 = "1w8s0xvcz8c3s171gizjkc9iadccjznw7rnfq5wpydkc7x4hxjdn";
-       revision = "3";
-       editedCabalFile = "1zx9y1pls8mnad78ancf52kffyw6ixp9x9bbvp7qfmmi8dc8s90r";
+       revision = "4";
+       editedCabalFile = "02ipx7mf8mfc937wkdid6qkxxkb2qp7sx9g8bkk8wbvma77kkysg";
        libraryHaskellDepends = [ base bytestring io-streams lzma ];
        testHaskellDepends = [
          base bytestring HUnit io-streams QuickCheck test-framework
@@ -154341,6 +155056,19 @@ self: {
        broken = true;
      }) {};
 
+  "marshal-contt" = callPackage
+    ({ mkDerivation, base, bytestring, kan-extensions, lens, mtl }:
+     mkDerivation {
+       pname = "marshal-contt";
+       version = "0.2.0.0";
+       sha256 = "1dv2jl7gm3b3kcchgwz4v6rch5w50ak43gc6fjvpms81xkdjfzmb";
+       libraryHaskellDepends = [
+         base bytestring kan-extensions lens mtl
+       ];
+       description = "A ContT-based wrapper for Haskell-to-C marshalling functions";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "marvin" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, configurator
      , deepseq, directory, filepath, hashable, haskeline, hspec
@@ -154465,29 +155193,9 @@ self: {
        ];
        description = "Massiv (Массив) is an Array Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "massiv-io" = callPackage
-    ({ mkDerivation, base, bytestring, data-default, deepseq, directory
-     , filepath, JuicyPixels, massiv, netpbm, process, vector
-     }:
-     mkDerivation {
-       pname = "massiv-io";
-       version = "0.1.6.0";
-       sha256 = "0ggl24w7y9bhlf0dh379raiq8fi2gb29whypp3jy37h8m6ldsngn";
-       libraryHaskellDepends = [
-         base bytestring data-default deepseq directory filepath JuicyPixels
-         massiv netpbm process vector
-       ];
-       description = "Import/export of Image files into massiv Arrays";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "massiv-io_0_1_7_0" = callPackage
     ({ mkDerivation, base, bytestring, data-default-class, deepseq
      , directory, filepath, JuicyPixels, massiv, netpbm, process, vector
      }:
@@ -154501,8 +155209,6 @@ self: {
        ];
        description = "Import/export of Image files into massiv Arrays";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "massiv-scheduler" = callPackage
@@ -154544,8 +155250,6 @@ self: {
        ];
        description = "Library that contains generators, properties and tests for Massiv Array Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "master-plan" = callPackage
@@ -154653,27 +155357,6 @@ self: {
      }) {inherit (pkgs) pcre;};
 
   "math-functions" = callPackage
-    ({ mkDerivation, base, data-default-class, deepseq, erf, HUnit
-     , primitive, QuickCheck, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, vector, vector-th-unbox
-     }:
-     mkDerivation {
-       pname = "math-functions";
-       version = "0.3.2.0";
-       sha256 = "1798n8x3w3x4s058dph18g11k2hm7vcxkbr2rb2snlksjr59c2wa";
-       libraryHaskellDepends = [
-         base data-default-class deepseq primitive vector vector-th-unbox
-       ];
-       testHaskellDepends = [
-         base data-default-class deepseq erf HUnit primitive QuickCheck
-         test-framework test-framework-hunit test-framework-quickcheck2
-         vector vector-th-unbox
-       ];
-       description = "Collection of tools for numeric computations";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "math-functions_0_3_2_1" = callPackage
     ({ mkDerivation, base, data-default-class, deepseq, erf, HUnit
      , primitive, QuickCheck, test-framework, test-framework-hunit
      , test-framework-quickcheck2, vector, vector-th-unbox
@@ -154692,7 +155375,6 @@ self: {
        ];
        description = "Collection of tools for numeric computations";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "math-grads" = callPackage
@@ -155042,8 +155724,8 @@ self: {
      }:
      mkDerivation {
        pname = "matterhorn";
-       version = "50200.4.0";
-       sha256 = "0b4y48z3hn55y8q61l8zp7x8pf0fyps4inv1s52y1yg7b2rpyfzb";
+       version = "50200.5.0";
+       sha256 = "0ahlsyk21zm0h1ri0jwlhmqv90myn8x5xhjhpqxafsyjj8vhanpw";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -156064,6 +156746,8 @@ self: {
        pname = "membrain";
        version = "0.0.0.0";
        sha256 = "01wv5i3kgbpmwjnjk5xgkpm3j5wazlz1f05kmm523wf34xivp498";
+       revision = "1";
+       editedCabalFile = "1nkphzar8f1wyif3haz6i55jaapysz1xvf2w3ynmm49ibhsczvg3";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base doctest Glob hedgehog hspec type-spec
@@ -156446,8 +157130,8 @@ self: {
        pname = "mercury-api";
        version = "0.1.0.2";
        sha256 = "0ybpc1kai85rflgdr80jd8cvwxaxmbphv82nz2p17502jrmdfkhg";
-       revision = "3";
-       editedCabalFile = "0v0fag8y821nr825cn9bqpmrr55zr6dqiqg5q1rfvifflmq73d37";
+       revision = "4";
+       editedCabalFile = "1bx3xrafmf82b9wlvhggv87fwqgpgqxjdgkk9r5b323m9ci2gign";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -156483,6 +157167,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "mergeful" = callPackage
+    ({ mkDerivation, aeson, base, containers, mtl, text, time, validity
+     , validity-containers, validity-time
+     }:
+     mkDerivation {
+       pname = "mergeful";
+       version = "0.0.0.0";
+       sha256 = "1zvli3gqw5svr5k36yl420ih2x8drl1522khn8jmjp9n26hc080w";
+       libraryHaskellDepends = [
+         aeson base containers mtl text time validity validity-containers
+         validity-time
+       ];
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "mergeless" = callPackage
     ({ mkDerivation, aeson, base, containers, mtl, time, validity
      , validity-containers, validity-time
@@ -160518,10 +161217,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "monadLib";
-       version = "3.9";
-       sha256 = "1vibzls4ld4v7rib14nb9blni1c42csv4b1igaplks85xyr5grrm";
-       revision = "1";
-       editedCabalFile = "1vxd4ncwbg77vvny77b771lbh0xjdwim3lmpd14zcfqqpy0gn9bj";
+       version = "3.10";
+       sha256 = "18vvcq6s9aci314daqkniq9aj1wdqa7rd3v06vd506a98c7lwp31";
        libraryHaskellDepends = [ base ];
        description = "A collection of monad transformers";
        license = stdenv.lib.licenses.bsd3;
@@ -162356,8 +163053,8 @@ self: {
      }:
      mkDerivation {
        pname = "mssql-simple";
-       version = "0.5.0.1";
-       sha256 = "174qqm4y38b4x0nc4kfrafr0cqcqshdxgxj2amn58m5zvclhn3fs";
+       version = "0.6.0.0";
+       sha256 = "1ijaxamabxwabyvh30blscxxgpbmr55far373nhn98w224b1jddy";
        libraryHaskellDepends = [
          base binary bytestring hostname ms-tds mtl network template-haskell
          text time tls uuid-types
@@ -165343,6 +166040,8 @@ self: {
        pname = "natural";
        version = "0.3.0.4";
        sha256 = "0c5z5msb2nx648m07cjv9hwaycdhcwis9ac6n7qbyvhxsis84jlg";
+       revision = "1";
+       editedCabalFile = "1jn15nmrnkdwi1k76n5ghlazx3lqhacy5cxpkbqa8ypmwpx3i7jn";
        libraryHaskellDepends = [ base lens semigroupoids ];
        testHaskellDepends = [
          base checkers hedgehog lens QuickCheck tasty tasty-hedgehog
@@ -165927,29 +166626,29 @@ self: {
      }) {ghc-binary = null;};
 
   "net-mqtt" = callPackage
-    ({ mkDerivation, async, attoparsec, base, binary, bytestring
-     , conduit, conduit-extra, containers, HUnit, network-conduit-tls
-     , network-uri, QuickCheck, stm, tasty, tasty-hunit
-     , tasty-quickcheck, text
+    ({ mkDerivation, async, attoparsec, attoparsec-binary, base, binary
+     , bytestring, conduit, conduit-extra, containers, HUnit
+     , network-conduit-tls, network-uri, QuickCheck, stm, tasty
+     , tasty-hunit, tasty-quickcheck, text
      }:
      mkDerivation {
        pname = "net-mqtt";
-       version = "0.2.4.2";
-       sha256 = "1ygd0ncwzzy4i2m4n0ax02csyjdsn2y66amr9yilxn6x0yhbq9rj";
+       version = "0.5.0.2";
+       sha256 = "1dq1f9kkdrz8yf6yj9xzfyna6rnkzv0vmsrzg92vbkyqfhkw6fga";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         async attoparsec base binary bytestring conduit conduit-extra
-         containers network-conduit-tls network-uri stm text
+         async attoparsec attoparsec-binary base binary bytestring conduit
+         conduit-extra containers network-conduit-tls network-uri stm text
        ];
        executableHaskellDepends = [
-         async attoparsec base binary bytestring conduit conduit-extra
-         containers network-conduit-tls network-uri stm text
+         async attoparsec attoparsec-binary base binary bytestring conduit
+         conduit-extra containers network-conduit-tls network-uri stm text
        ];
        testHaskellDepends = [
-         async attoparsec base binary bytestring conduit conduit-extra
-         containers HUnit network-conduit-tls network-uri QuickCheck stm
-         tasty tasty-hunit tasty-quickcheck text
+         async attoparsec attoparsec-binary base binary bytestring conduit
+         conduit-extra containers HUnit network-conduit-tls network-uri
+         QuickCheck stm tasty tasty-hunit tasty-quickcheck text
        ];
        description = "An MQTT Protocol Implementation";
        license = stdenv.lib.licenses.bsd3;
@@ -166754,8 +167453,8 @@ self: {
     ({ mkDerivation, base, bytestring, doctest }:
      mkDerivation {
        pname = "network-byte-order";
-       version = "0.1.1.0";
-       sha256 = "16prqgaqxn1h56gw9r446cq5a4jyaiplg50pjy1ji4k7cvcpx5vk";
+       version = "0.1.1.1";
+       sha256 = "19cs6157amcc925vwr92q1azwwzkbam5g0k70i6qi80fhpikh37c";
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [ base bytestring doctest ];
        description = "Network byte order utilities";
@@ -166988,6 +167687,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "network-manager-tui" = callPackage
+    ({ mkDerivation, base, brick, hspec, microlens, process, split
+     , vector, vty
+     }:
+     mkDerivation {
+       pname = "network-manager-tui";
+       version = "1.0.0.0";
+       sha256 = "15xm6nsinf1a33h9wd06s7z8fvydn0jck6rzc5v69g51fdy8mjbg";
+       isLibrary = false;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base brick microlens process split vector vty
+       ];
+       executableHaskellDepends = [
+         base brick microlens process split vector vty
+       ];
+       testHaskellDepends = [
+         base brick hspec microlens process split vector vty
+       ];
+       doHaddock = false;
+       description = "network-manager tui";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "network-messagepack-rpc" = callPackage
     ({ mkDerivation, base, bytestring, data-msgpack, safe-exceptions
      , text, unordered-containers
@@ -167865,8 +168588,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "newtype";
-       version = "0.2.1.0";
-       sha256 = "03fr1yfip09dvwff87dssy7r0vrv4rv184flxnp9gjzbg6h9byvb";
+       version = "0.2.2.0";
+       sha256 = "1b7bamnd0p8vmxvlg39g5d4a2av49kx10rdyz04ixa28pg8zy01s";
        libraryHaskellDepends = [ base ];
        description = "A typeclass and set of functions for working with newtypes";
        license = stdenv.lib.licenses.bsd3;
@@ -167891,24 +168614,6 @@ self: {
      }) {};
 
   "newtype-generics" = callPackage
-    ({ mkDerivation, base, criterion, hspec, hspec-discover, semigroups
-     , transformers
-     }:
-     mkDerivation {
-       pname = "newtype-generics";
-       version = "0.5.3";
-       sha256 = "0igyisw2djg19v9vkna1rwf47k97mvkvk4bbkmswznvbm00z15gj";
-       revision = "1";
-       editedCabalFile = "1glnwq1lw7780qgahqvh1qfx6k2ciwmbhc2wcc78v3aa3s954c8v";
-       libraryHaskellDepends = [ base transformers ];
-       testHaskellDepends = [ base hspec ];
-       testToolDepends = [ hspec-discover ];
-       benchmarkHaskellDepends = [ base criterion semigroups ];
-       description = "A typeclass and set of functions for working with newtypes";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "newtype-generics_0_5_4" = callPackage
     ({ mkDerivation, base, gauge, hspec, hspec-discover, semigroups
      , transformers
      }:
@@ -167922,7 +168627,6 @@ self: {
        benchmarkHaskellDepends = [ base gauge semigroups ];
        description = "A typeclass and set of functions for working with newtypes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "newtype-th" = callPackage
@@ -171518,36 +172222,6 @@ self: {
      }) {};
 
   "opaleye" = callPackage
-    ({ mkDerivation, aeson, base, base16-bytestring, bytestring
-     , case-insensitive, containers, contravariant, dotenv, hspec
-     , hspec-discover, multiset, postgresql-simple, pretty
-     , product-profunctors, profunctors, QuickCheck, scientific
-     , semigroups, text, time, time-locale-compat, transformers, uuid
-     , void
-     }:
-     mkDerivation {
-       pname = "opaleye";
-       version = "0.6.7004.0";
-       sha256 = "1p897zswmxil3yrxgdnjszbafi01gib8rl0y9lay4vqj1mrwa14m";
-       revision = "1";
-       editedCabalFile = "0wxcygykflm06v7m0p3pi7i490c1mjbid8whc9dsc181hfzhr6wl";
-       libraryHaskellDepends = [
-         aeson base base16-bytestring bytestring case-insensitive
-         contravariant postgresql-simple pretty product-profunctors
-         profunctors scientific semigroups text time time-locale-compat
-         transformers uuid void
-       ];
-       testHaskellDepends = [
-         aeson base containers contravariant dotenv hspec hspec-discover
-         multiset postgresql-simple product-profunctors profunctors
-         QuickCheck semigroups text time transformers uuid
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "An SQL-generating DSL targeting PostgreSQL";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "opaleye_0_6_7004_1" = callPackage
     ({ mkDerivation, aeson, base, base16-bytestring, bytestring
      , case-insensitive, containers, contravariant, dotenv, hspec
      , hspec-discover, multiset, postgresql-simple, pretty
@@ -171573,7 +172247,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "An SQL-generating DSL targeting PostgreSQL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "opaleye-classy" = callPackage
@@ -172935,14 +173608,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "optparse-applicative_0_15_0_0" = callPackage
+  "optparse-applicative_0_15_1_0" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, bytestring, process
      , QuickCheck, transformers, transformers-compat
      }:
      mkDerivation {
        pname = "optparse-applicative";
-       version = "0.15.0.0";
-       sha256 = "0210rv7scp2063n8pr39bzy7dbl2777zwdnnx6kp3c34jilssjxg";
+       version = "0.15.1.0";
+       sha256 = "1ws6y3b3f6hsgv0ff0yp6lw4hba1rps4dnvry3yllng0s5gngcsd";
        libraryHaskellDepends = [
          ansi-wl-pprint base process transformers transformers-compat
        ];
@@ -173726,20 +174399,20 @@ self: {
 
   "overloaded" = callPackage
     ({ mkDerivation, base, bytestring, containers, fin, generic-lens
-     , ghc, HUnit, lens, sop-core, split, syb, symbols, tasty
-     , tasty-hunit, text, vec
+     , ghc, HUnit, lens, singleton-bool, sop-core, split, syb, symbols
+     , tasty, tasty-hunit, text, time, vec
      }:
      mkDerivation {
        pname = "overloaded";
-       version = "0.1";
-       sha256 = "0sb910gk8z3a97vqk9naa079sm84p24jh2jgm39lxagwhmz72w6a";
+       version = "0.1.1";
+       sha256 = "0palmwxknrc5pqwhlij3rfbzfz9csi5h41iild89bxkb3qj0x2z4";
        libraryHaskellDepends = [
          base bytestring containers fin ghc sop-core split syb symbols text
-         vec
+         time vec
        ];
        testHaskellDepends = [
-         base bytestring containers fin generic-lens HUnit lens sop-core
-         symbols tasty tasty-hunit text vec
+         base bytestring containers fin generic-lens HUnit lens
+         singleton-bool sop-core symbols tasty tasty-hunit text time vec
        ];
        description = "Overloaded pragmas as a plugin";
        license = stdenv.lib.licenses.bsd3;
@@ -176876,6 +177549,8 @@ self: {
        pname = "path-io";
        version = "1.4.2";
        sha256 = "0jqx3mi4an4kb3kg78n1p3xrz832yrfrnvj795b0xhkv6h1z5ir3";
+       revision = "1";
+       editedCabalFile = "02irjcw5rdcx9wvsb7mcanylp2bwaiacpfjjbcvqq1lhvqcyw73i";
        libraryHaskellDepends = [
          base containers directory dlist exceptions filepath path temporary
          time transformers unix-compat
@@ -176887,6 +177562,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "path-io_1_5_0" = callPackage
+    ({ mkDerivation, base, containers, directory, dlist, exceptions
+     , filepath, hspec, path, temporary, time, transformers, unix-compat
+     }:
+     mkDerivation {
+       pname = "path-io";
+       version = "1.5.0";
+       sha256 = "16zgi2a7g3mc9rslshjm86q4c3rr9vrd8qcjw753ndpar05j41bf";
+       revision = "1";
+       editedCabalFile = "127x8jhx2illj2r5x8f2g4yfl1idfngxmzphfr45abdf024n3pm8";
+       libraryHaskellDepends = [
+         base containers directory dlist exceptions filepath path temporary
+         time transformers unix-compat
+       ];
+       testHaskellDepends = [
+         base directory exceptions hspec path transformers unix-compat
+       ];
+       description = "Interface to ‘directory’ package for users of ‘path’";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "path-pieces" = callPackage
     ({ mkDerivation, base, hspec, HUnit, QuickCheck, text, time }:
      mkDerivation {
@@ -180445,8 +181142,8 @@ self: {
      }:
      mkDerivation {
        pname = "pinboard-notes-backup";
-       version = "1.0.4.1";
-       sha256 = "1a0lw43pjfz18aplm2frljwaww37pm2ashxi59j6l5n32lg5573j";
+       version = "1.0.5";
+       sha256 = "042zph3nisrmhkfk2h3fwh91dz1fp0wgff0hlnpd962i67fgpixx";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -182912,8 +183609,8 @@ self: {
      }:
      mkDerivation {
        pname = "pointfree";
-       version = "1.1.1.5";
-       sha256 = "1h5igixmn36k9b4mnc7lgalc4i88yg71h396wzqnh041jz28y6wc";
+       version = "1.1.1.6";
+       sha256 = "1rsr9vgqq10ydwan2qvghgfvff5m75ivl8md8r8yxffbw0spiwsv";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -182959,10 +183656,8 @@ self: {
      }:
      mkDerivation {
        pname = "pointful";
-       version = "1.0.11.0";
-       sha256 = "0kz786xp2sjl6ldbbfg3ln8l6nib6i8lw0d15hqr6yawrnf32qr2";
-       revision = "2";
-       editedCabalFile = "0zdhhflhz853iwlcjfxh57bx1wf8capij4b0ysjgmp7bi8hw5ww0";
+       version = "1.1.0.0";
+       sha256 = "1a6fy2m3cv1jn399vgl467nhc8vwlfcqly1mbzh5rjlsy7drjj3s";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -183386,7 +184081,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "polysemy_1_2_0_0" = callPackage
+  "polysemy_1_2_1_0" = callPackage
     ({ mkDerivation, async, base, containers, criterion, doctest
      , first-class-families, free, freer-simple, hspec, hspec-discover
      , inspection-testing, mtl, stm, syb, template-haskell
@@ -183395,8 +184090,8 @@ self: {
      }:
      mkDerivation {
        pname = "polysemy";
-       version = "1.2.0.0";
-       sha256 = "14cl4h78vhi83c3ccz3hy1cbh21a7ry7n5z2i7m3zm2cyj4sbw4q";
+       version = "1.2.1.0";
+       sha256 = "0apwnscl6falazh8w8vv7zm2rv60ls8syk06swjicm4vwxj7zdl4";
        libraryHaskellDepends = [
          async base containers first-class-families mtl stm syb
          template-haskell th-abstraction transformers type-errors
@@ -183425,8 +184120,8 @@ self: {
      }:
      mkDerivation {
        pname = "polysemy-RandomFu";
-       version = "0.3.0.0";
-       sha256 = "17qh2p7nh091kgywdzfd8ckzk6vczm9zxyp9vs94c1ld9qxrhkv8";
+       version = "0.4.0.0";
+       sha256 = "0l4jimvd3shvxwl0zrfxqp3hlkiqwzihljd07jdppchc41xq3aiz";
        libraryHaskellDepends = [
          base polysemy polysemy-plugin polysemy-zoo random-fu random-source
        ];
@@ -183488,15 +184183,15 @@ self: {
        broken = true;
      }) {};
 
-  "polysemy-zoo_0_6_0_0" = callPackage
+  "polysemy-zoo_0_6_0_1" = callPackage
     ({ mkDerivation, async, base, binary, bytestring, constraints
      , containers, contravariant, ghc-prim, hedis, hspec, hspec-discover
      , mtl, polysemy, polysemy-plugin, random, reflection, transformers
      }:
      mkDerivation {
        pname = "polysemy-zoo";
-       version = "0.6.0.0";
-       sha256 = "1d8h1hmq59b4igxdym83rd4ggcq45jb5zb0sdyvacqiicy5rnzhz";
+       version = "0.6.0.1";
+       sha256 = "1va72282ng2h15fpzi3az1cdl1717hyfsa1qfz9xl4lnaa4x8nwa";
        libraryHaskellDepends = [
          async base binary bytestring constraints containers contravariant
          ghc-prim hedis mtl polysemy polysemy-plugin random reflection
@@ -184208,6 +184903,23 @@ self: {
        broken = true;
      }) {};
 
+  "posplyu" = callPackage
+    ({ mkDerivation, base, directory, process, split, time, timerep
+     , transformers, unix, X11
+     }:
+     mkDerivation {
+       pname = "posplyu";
+       version = "0.1.0";
+       sha256 = "1whdihlfcgjy4na86qhhhixa0l494005shfxs5ns61qsdw7mwflk";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base directory process split time timerep transformers unix X11
+       ];
+       description = "Sleep tracker for X11, using XScreenSaver extension and manual input";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "possible" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -184471,6 +185183,8 @@ self: {
        pname = "postgresql-libpq";
        version = "0.9.4.2";
        sha256 = "1y86kysakfcf3zq252yl2llrx3765vxvkdwda4q5ql7ikv3m786f";
+       revision = "1";
+       editedCabalFile = "0hilyfb2gjh471ia2g8mwjs56ykrgl0qd06vpigwhc493ia7a9mv";
        setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [ base bytestring unix ];
        librarySystemDepends = [ postgresql ];
@@ -184605,8 +185319,8 @@ self: {
        pname = "postgresql-simple";
        version = "0.6.2";
        sha256 = "15pkflx48mgv4fjmnagyfh06q065k8m8c98bysc3gm6m4srz5ypv";
-       revision = "1";
-       editedCabalFile = "0v8a7ylnbl8iv6v3blahrsnggk3kldvrq2gpq1fxni8y2jmc96d6";
+       revision = "2";
+       editedCabalFile = "1rlawj79mfff915bz5fr62g5ig4pfh77m30xrq8q71s6ql0ly4bj";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring bytestring-builder
          case-insensitive containers hashable Only postgresql-libpq
@@ -184794,8 +185508,8 @@ self: {
        pname = "postgresql-simple-url";
        version = "0.2.1.0";
        sha256 = "1jg9gvpidrfy2hqixwqsym1l1mnkafmxwq58jpbzdmrbvryga1qk";
-       revision = "1";
-       editedCabalFile = "0ck0vrlsyj3vm8sk59jnyyqpvnv1l9mciifdnrzwr981pha147qp";
+       revision = "2";
+       editedCabalFile = "1nb1ks6hdfn16389f2yhf37qhjqd2y5wjc1dcp9bjhzd787z7ypr";
        libraryHaskellDepends = [
          base network-uri postgresql-simple split
        ];
@@ -186318,8 +187032,8 @@ self: {
        pname = "prettyprinter";
        version = "1.3.0";
        sha256 = "1dc43z53s8pbrv6wf2mq6zvggd67lk415zqg8q9bcd1ld5m9h2x4";
-       revision = "1";
-       editedCabalFile = "0i5m6x3xsph343w2902xvv91l1raak4nz4q1py7vf95p0hbb72qq";
+       revision = "2";
+       editedCabalFile = "044zsw0fykrf657s60wrn2798g6b3phis1d32f92zrrq7y2nscw3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base text ];
@@ -186899,6 +187613,20 @@ self: {
        broken = true;
      }) {};
 
+  "print-console-colors" = callPackage
+    ({ mkDerivation, ansi-terminal, base }:
+     mkDerivation {
+       pname = "print-console-colors";
+       version = "0.1.0.0";
+       sha256 = "12x1lbn8daq996pipnqd8g6mjpg85zj85zygbs547m9r27gf6j88";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ ansi-terminal base ];
+       executableHaskellDepends = [ base ];
+       description = "Print all ANSI console colors";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "print-debugger" = callPackage
     ({ mkDerivation, base, split }:
      mkDerivation {
@@ -187747,16 +188475,17 @@ self: {
      , hashable, hashable-time, haskeline, http-api-data, http-types
      , HUnit, list-t, megaparsec, monad-parallel, MonadRandom, mtl
      , network, network-transport, network-transport-tcp, old-locale
-     , optparse-applicative, parallel, path-pieces, QuickCheck
-     , quickcheck-instances, random, random-shuffle, resourcet, rset
-     , scotty, semigroups, stm, stm-containers, template-haskell
-     , temporary, text, time, transformers, unix, unordered-containers
-     , uuid, vector, vector-binary-instances, websockets, zlib
+     , optparse-applicative, parallel, parser-combinators, path-pieces
+     , QuickCheck, quickcheck-instances, random, random-shuffle
+     , resourcet, rset, scotty, semigroups, stm, stm-containers
+     , template-haskell, temporary, text, time, transformers, unix
+     , unordered-containers, uuid, vector, vector-binary-instances
+     , websockets, zlib
      }:
      mkDerivation {
        pname = "project-m36";
-       version = "0.6";
-       sha256 = "0ajxsgzbscg45c1dzhqassnga9k3i22f2l2w5kciina5q43ihla4";
+       version = "0.7";
+       sha256 = "1ahvnyrg28r16rw982bpawrmiikc121z7358y3gxzqxnv2cc9y65";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -187779,9 +188508,9 @@ self: {
          deepseq-generics directory either filepath ghc ghc-paths gnuplot
          hashable hashable-time haskeline http-api-data http-types HUnit
          list-t megaparsec MonadRandom mtl network-transport-tcp
-         optparse-applicative parallel path-pieces random scotty semigroups
-         stm stm-containers template-haskell temporary text time
-         transformers unordered-containers uuid vector
+         optparse-applicative parallel parser-combinators path-pieces random
+         scotty semigroups stm stm-containers template-haskell temporary
+         text time transformers unordered-containers uuid vector
          vector-binary-instances websockets
        ];
        testHaskellDepends = [
@@ -187790,8 +188519,8 @@ self: {
          directory either filepath gnuplot hashable hashable-time haskeline
          http-api-data HUnit list-t megaparsec MonadRandom mtl network
          network-transport network-transport-tcp optparse-applicative
-         parallel path-pieces random semigroups stm stm-containers
-         template-haskell temporary text time transformers
+         parallel parser-combinators path-pieces random semigroups stm
+         stm-containers template-haskell temporary text time transformers
          unordered-containers uuid vector vector-binary-instances websockets
        ];
        benchmarkHaskellDepends = [
@@ -188046,8 +188775,8 @@ self: {
      }:
      mkDerivation {
        pname = "prometheus-proc";
-       version = "0.1.1.0";
-       sha256 = "1mygx1kjjgrlqbi43g6867ylcynhqki52d9kjl4fi83smrjkhxa9";
+       version = "0.1.2.0";
+       sha256 = "0lia1r6bjh0m55s7nrfhn76v58yai8brlpi0q193wh0ypsg71j9l";
        libraryHaskellDepends = [
          base directory filepath prometheus-client regex-applicative text
          unix unix-memory
@@ -188766,8 +189495,8 @@ self: {
      }:
      mkDerivation {
        pname = "protocol-radius-test";
-       version = "0.1.0.0";
-       sha256 = "1zgfq76k86jf1jpm14mpb8iaiya0d6vz0lrmbwc0fn34hqhkcd88";
+       version = "0.1.0.1";
+       sha256 = "14npn49vj7a66pzvrdw0gj88h97vz11axq5i4k4nq0r156yb07pm";
        libraryHaskellDepends = [
          base bytestring cereal containers protocol-radius QuickCheck
          quickcheck-simple transformers
@@ -189969,8 +190698,8 @@ self: {
      }:
      mkDerivation {
        pname = "pusher-http-haskell";
-       version = "1.5.1.9";
-       sha256 = "020f7dxlamc02r312z3nkr9r4q69z5dw5ly3ilfy0mrzngi8dvg3";
+       version = "1.5.1.10";
+       sha256 = "0nif5b7slyr7ppm1igm06k1zjf0sninyrf0n8qkaw2kwhxgdsam2";
        libraryHaskellDepends = [
          aeson base base16-bytestring bytestring cryptonite hashable
          http-client http-types memory text time transformers
@@ -191174,7 +191903,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "quickcheck-classes_0_6_3_0" = callPackage
+  "quickcheck-classes_0_6_4_0" = callPackage
     ({ mkDerivation, aeson, base, base-orphans, bifunctors, containers
      , contravariant, fail, primitive, primitive-addr, QuickCheck
      , quickcheck-classes-base, semigroupoids, semigroups, semirings
@@ -191182,10 +191911,8 @@ self: {
      }:
      mkDerivation {
        pname = "quickcheck-classes";
-       version = "0.6.3.0";
-       sha256 = "0rbrxs79naffzp809523452xprh7z33j6p256qs0cnni9v9zfgjf";
-       revision = "1";
-       editedCabalFile = "1qm6zfmhil1wn1972hfdsvxlgzgps0ip8vdlgz3fz5a048l29ahq";
+       version = "0.6.4.0";
+       sha256 = "0qcxmkf9ig6jnfpd5slx2imzwmvvyqgvlif2940yzwam63m6anwg";
        libraryHaskellDepends = [
          aeson base base-orphans bifunctors containers contravariant fail
          primitive primitive-addr QuickCheck quickcheck-classes-base
@@ -194467,27 +195194,39 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
-  "reanimate-svg" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, containers, hspec
-     , JuicyPixels, lens, linear, mtl, scientific, svg-tree, text
-     , transformers, vector, xml
+  "reanimate_0_1_6_0" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, attoparsec, base
+     , base64-bytestring, bytestring, cassava, colour, containers
+     , cubicbezier, diagrams, diagrams-contrib, diagrams-core
+     , diagrams-lib, diagrams-svg, directory, filepath, fsnotify
+     , hashable, here, JuicyPixels, lens, linear, matrices, matrix, mtl
+     , open-browser, palette, parallel, process, QuickCheck
+     , random-shuffle, reanimate-svg, svg-builder, tasty, tasty-golden
+     , tasty-hunit, temporary, text, time, vector, websockets, xml
      }:
      mkDerivation {
-       pname = "reanimate-svg";
-       version = "0.9.1.0";
-       sha256 = "1hiinaz8swlg1lzm5narlwmkzqjxym4k3qn5izyhjjhx4ch0avr4";
+       pname = "reanimate";
+       version = "0.1.6.0";
+       sha256 = "10nivxmj8lkvr7g8fjnq7m7kxy3jmy9vka0lva6ahr91c9qk1fcz";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         attoparsec base bytestring containers JuicyPixels lens linear mtl
-         scientific text transformers vector xml
+         ansi-wl-pprint attoparsec base base64-bytestring bytestring cassava
+         colour containers cubicbezier diagrams diagrams-contrib
+         diagrams-core diagrams-lib diagrams-svg directory filepath fsnotify
+         hashable here JuicyPixels lens linear matrices matrix mtl
+         open-browser palette parallel process random-shuffle reanimate-svg
+         svg-builder temporary text time vector websockets xml
        ];
        testHaskellDepends = [
-         attoparsec base hspec linear scientific svg-tree
+         ansi-wl-pprint base bytestring directory filepath process
+         QuickCheck tasty tasty-golden tasty-hunit
        ];
-       description = "SVG file loader and serializer";
-       license = stdenv.lib.licenses.bsd3;
+       description = "Animation library based on SVGs";
+       license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "reanimate-svg_0_9_1_1" = callPackage
+  "reanimate-svg" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers, hspec
      , JuicyPixels, lens, linear, mtl, scientific, svg-tree, text
      , transformers, vector, xml
@@ -194505,7 +195244,6 @@ self: {
        ];
        description = "SVG file loader and serializer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reason-export" = callPackage
@@ -195338,13 +196076,13 @@ self: {
      }:
      mkDerivation {
        pname = "refined";
-       version = "0.4.2.2";
-       sha256 = "1gdfhmj8f1abxflxmqyfibz0hdaayr932f04vchygdvdb812av60";
+       version = "0.4.3";
+       sha256 = "1x6rz5hy6rnn46fjh20ppbkdaj3cn5bnlapbnvsw5h6s3bdic7p5";
        libraryHaskellDepends = [
          aeson base deepseq exceptions mtl prettyprinter QuickCheck
          template-haskell transformers
        ];
-       testHaskellDepends = [ base doctest ];
+       testHaskellDepends = [ base doctest QuickCheck ];
        description = "Refinement types with static and runtime checking";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -197063,16 +197801,17 @@ self: {
      }) {};
 
   "releaser" = callPackage
-    ({ mkDerivation, base, Cabal, pretty-terminal, process, regex-pcre
+    ({ mkDerivation, base, Cabal, pretty-terminal, process, regex-tdfa
+     , regex-tdfa-text, text
      }:
      mkDerivation {
        pname = "releaser";
-       version = "0.1.0.0";
-       sha256 = "04icyx42ya7l4h5923yji0170c3xl0gg9lvcmswh7lmrg8x9gvip";
+       version = "0.2.0.0";
+       sha256 = "1hh4z87rc11pgapbrz0sjcy21pvgnm201b85prn09kiwcqrawz8r";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base Cabal pretty-terminal process regex-pcre
+         base Cabal pretty-terminal process regex-tdfa regex-tdfa-text text
        ];
        executableHaskellDepends = [ base ];
        description = "Automation of Haskell package release process";
@@ -197775,8 +198514,8 @@ self: {
      }:
      mkDerivation {
        pname = "replace-attoparsec";
-       version = "1.0.0.0";
-       sha256 = "0cyaqdlhjmpmw51h8k93gi21d1wkyajd2zyzfk787kg8hby0hkzi";
+       version = "1.0.1.0";
+       sha256 = "12xwdaqi81ssc5536icl49bqdnc6hiss9xm4gx3m1m4nz70ivk6z";
        libraryHaskellDepends = [ attoparsec base bytestring text ];
        testHaskellDepends = [
          attoparsec base bytestring Cabal parsers text
@@ -197784,25 +198523,63 @@ self: {
        benchmarkHaskellDepends = [
          attoparsec base bytestring criterion text
        ];
-       description = "Stream editing with Attoparsec";
+       description = "Stream edit, find-and-replace with Attoparsec parsers";
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "replace-attoparsec_1_0_2_0" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, Cabal, criterion
+     , parsers, text
+     }:
+     mkDerivation {
+       pname = "replace-attoparsec";
+       version = "1.0.2.0";
+       sha256 = "13fri1sqvr9ldzbr7wif4fn5phjmca3pql10qzx049gyip1vfy8a";
+       libraryHaskellDepends = [ attoparsec base bytestring text ];
+       testHaskellDepends = [
+         attoparsec base bytestring Cabal parsers text
+       ];
+       benchmarkHaskellDepends = [
+         attoparsec base bytestring criterion text
+       ];
+       description = "Stream edit, find-and-replace with Attoparsec parsers";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "replace-megaparsec" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, criterion, megaparsec
      , text
      }:
      mkDerivation {
        pname = "replace-megaparsec";
-       version = "1.1.2.0";
-       sha256 = "154abc29xhc8qz3ilzrpnjn3a43rbiq7b60k4agv7zmsllihb0kk";
+       version = "1.1.3.0";
+       sha256 = "0nh14fk3wwwli9hh2wfj02zrgcsf0hia14cx22g9qvlym53ljg50";
+       libraryHaskellDepends = [ base megaparsec ];
+       testHaskellDepends = [ base bytestring Cabal megaparsec text ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion megaparsec text
+       ];
+       description = "Stream edit, find-and-replace with Megaparsec parsers";
+       license = stdenv.lib.licenses.bsd2;
+     }) {};
+
+  "replace-megaparsec_1_1_4_0" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, criterion, megaparsec
+     , text
+     }:
+     mkDerivation {
+       pname = "replace-megaparsec";
+       version = "1.1.4.0";
+       sha256 = "0mfxk03p6wwikyrra2r5zs06axl7v0da9ggv5ycd6mi4bc5hpj8r";
        libraryHaskellDepends = [ base megaparsec ];
        testHaskellDepends = [ base bytestring Cabal megaparsec text ];
        benchmarkHaskellDepends = [
          base bytestring criterion megaparsec text
        ];
-       description = "Stream editing with parsers";
+       description = "Stream edit, find-and-replace with Megaparsec parsers";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "replica" = callPackage
@@ -198168,6 +198945,38 @@ self: {
        broken = true;
      }) {};
 
+  "require_0_4_3" = callPackage
+    ({ mkDerivation, base, bytestring, criterion, directory, inliterate
+     , megaparsec, optparse-generic, tasty, tasty-hspec, text, universum
+     }:
+     mkDerivation {
+       pname = "require";
+       version = "0.4.3";
+       sha256 = "0j6dsyqx637b5p8jmk5h4b0qham0m8m74c8b8y1dywm0c5daayca";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring directory inliterate megaparsec optparse-generic
+         text universum
+       ];
+       executableHaskellDepends = [
+         base bytestring directory inliterate megaparsec optparse-generic
+         text universum
+       ];
+       testHaskellDepends = [
+         base bytestring directory inliterate megaparsec optparse-generic
+         tasty tasty-hspec text universum
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion directory inliterate megaparsec
+         optparse-generic text universum
+       ];
+       description = "Scrap your qualified import clutter";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "rerebase" = callPackage
     ({ mkDerivation, rebase }:
      mkDerivation {
@@ -199374,6 +200183,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "rhine_0_5_1_1" = callPackage
+    ({ mkDerivation, base, containers, deepseq, dunai, free
+     , MonadRandom, random, time, transformers, vector-sized
+     }:
+     mkDerivation {
+       pname = "rhine";
+       version = "0.5.1.1";
+       sha256 = "1f7sgdlnjf25znhnjdcq7yibxcfnjq7cldl6z9ydmg62az839ms2";
+       libraryHaskellDepends = [
+         base containers deepseq dunai free MonadRandom random time
+         transformers vector-sized
+       ];
+       description = "Functional Reactive Programming with type-level clocks";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "rhine-gloss" = callPackage
     ({ mkDerivation, base, dunai, gloss, rhine }:
      mkDerivation {
@@ -202295,6 +203121,30 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "safecopy_0_10_0" = callPackage
+    ({ mkDerivation, array, base, bytestring, cereal, containers
+     , generic-data, HUnit, lens, lens-action, old-time, QuickCheck
+     , quickcheck-instances, tasty, tasty-quickcheck, template-haskell
+     , text, time, transformers, vector
+     }:
+     mkDerivation {
+       pname = "safecopy";
+       version = "0.10.0";
+       sha256 = "0j5fa68symjqwphvin0nj524wnh3vmq34mlj6mfvl78by4pki0nv";
+       libraryHaskellDepends = [
+         array base bytestring cereal containers generic-data old-time
+         template-haskell text time transformers vector
+       ];
+       testHaskellDepends = [
+         array base bytestring cereal containers HUnit lens lens-action
+         QuickCheck quickcheck-instances tasty tasty-quickcheck
+         template-haskell time vector
+       ];
+       description = "Binary serialization with version control";
+       license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "safecopy-migrate" = callPackage
     ({ mkDerivation, base, base-prelude, cereal, containers, extra
      , haskell-src-meta, microlens, safecopy, template-haskell
@@ -203594,6 +204444,8 @@ self: {
        pname = "scanner";
        version = "0.3";
        sha256 = "0yshznbp784d4gk2qz5jlw5ikc1s1h58h7vck2yksi4ynm3m3y57";
+       revision = "1";
+       editedCabalFile = "1v64k5jn70ipv2yi81b0s8lkpdd8hx08gdix0ixnpfqdpkj7pzx2";
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [ base bytestring hspec ];
        benchmarkHaskellDepends = [
@@ -203603,6 +204455,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "scanner_0_3_1" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, cereal, criterion
+     , fail, hspec, text
+     }:
+     mkDerivation {
+       pname = "scanner";
+       version = "0.3.1";
+       sha256 = "1mhqh94qra08zidqfsq0gxi83cgflqldnk9rr53haynbgmd5y82k";
+       libraryHaskellDepends = [ base bytestring fail ];
+       testHaskellDepends = [ base bytestring hspec ];
+       benchmarkHaskellDepends = [
+         attoparsec base bytestring cereal criterion text
+       ];
+       description = "Fast non-backtracking incremental combinator parsing for bytestrings";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "scanner-attoparsec" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, hspec, scanner }:
      mkDerivation {
@@ -203769,8 +204639,6 @@ self: {
        ];
        description = "Work stealing scheduler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "schedyield" = callPackage
@@ -205283,8 +206151,8 @@ self: {
      }:
      mkDerivation {
        pname = "secp256k1-legacy";
-       version = "0.5.4";
-       sha256 = "1sm0w29iwlhd1596h4x8dcqv5jz0jk6vfc41iqikdhgbn89xv6sd";
+       version = "0.5.5";
+       sha256 = "1wqzv26zcbd9lxl8ifwwwnp7ikfd7rs8w784gdap963yk0k3692d";
        setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [
          base base16-bytestring bytestring cereal entropy mtl QuickCheck
@@ -205906,14 +206774,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "semirings_0_5" = callPackage
+  "semirings_0_5_1" = callPackage
     ({ mkDerivation, base, containers, hashable, integer-gmp
      , unordered-containers
      }:
      mkDerivation {
        pname = "semirings";
-       version = "0.5";
-       sha256 = "1xfmb017jjlas0lq4969d1dw7wifsym8m2qnadz7bywhjl96kzxh";
+       version = "0.5.1";
+       sha256 = "1nrz80hsc3sx7nhd1hd17pdhdxhlvc2ngkg8jy14r2y2fblxczgd";
        libraryHaskellDepends = [
          base containers hashable integer-gmp unordered-containers
        ];
@@ -206323,8 +207191,8 @@ self: {
      }:
      mkDerivation {
        pname = "sequence-formats";
-       version = "1.4.0.1";
-       sha256 = "1inw4agbm722zjbxi1ys73pssx76k8pg1s3cyxl5v1czqlyjxppy";
+       version = "1.4.1";
+       sha256 = "1162qvpaj8zs1510pkq9v6pdny51r0r5bhwnpmrv1a6c8vm723n3";
        libraryHaskellDepends = [
          attoparsec base bytestring containers errors exceptions foldl
          lens-family pipes pipes-attoparsec pipes-bytestring pipes-safe
@@ -206348,8 +207216,8 @@ self: {
      }:
      mkDerivation {
        pname = "sequenceTools";
-       version = "1.4.0.2";
-       sha256 = "1s6g5n9rb9yk2rzjc2dvmw14ncjfrf66lkla8bcacdvqwa8hl7kr";
+       version = "1.4.0.4";
+       sha256 = "13q9ypr4zxbxj0allkahcc4syvvmmplv2d3qj3mcz1p7704klga0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -206636,6 +207504,8 @@ self: {
        pname = "servant";
        version = "0.16.2";
        sha256 = "0yzl1yklbbymlh8jdc4ncrdxkalx2z349v4msbd6wxxrxfkxbz6n";
+       revision = "1";
+       editedCabalFile = "0v913vjklgwyfbn7k2v70943gy4i8ja3y6crpyrg5llxkb81jpbc";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          aeson attoparsec base base-compat bifunctors bytestring
@@ -207072,8 +207942,8 @@ self: {
        pname = "servant-cassava";
        version = "0.10";
        sha256 = "03jnyghwa5kjbl5j55njmp7as92flw91zs9cgdvb4jrsdy85sb4v";
-       revision = "5";
-       editedCabalFile = "1hidradrcdcchbr0hn9y7y1bc0i0gxzfbganyy7p2z8ip2czddvj";
+       revision = "6";
+       editedCabalFile = "17d6phknxh5cqslwcj3a4gfhsgm8bw4bf7mlpmfrrc6izwnm1q8v";
        libraryHaskellDepends = [
          base base-compat bytestring cassava http-media servant vector
        ];
@@ -207172,8 +208042,38 @@ self: {
        pname = "servant-client";
        version = "0.16";
        sha256 = "0641fqlvqkm5075pcgcg5q81j7jil79sjpifg1snagfisrsxifxj";
-       revision = "2";
-       editedCabalFile = "0xdrs79farfhw12azl9jmkwvqslassnrjqvbgz0xjnnqnb0b9l86";
+       revision = "4";
+       editedCabalFile = "0fa37fdas1dsgd6qkc5wzi9683l5xzzq1i705l3adiwkdfkcbjjf";
+       libraryHaskellDepends = [
+         base base-compat bytestring containers deepseq exceptions
+         http-client http-media http-types kan-extensions monad-control mtl
+         semigroupoids servant servant-client-core stm text time
+         transformers transformers-base transformers-compat
+       ];
+       testHaskellDepends = [
+         aeson base base-compat bytestring entropy hspec http-api-data
+         http-client http-types HUnit kan-extensions markdown-unlit mtl
+         network QuickCheck servant servant-client-core servant-server stm
+         tdigest text transformers transformers-compat wai warp
+       ];
+       testToolDepends = [ hspec-discover markdown-unlit ];
+       description = "Automatic derivation of querying functions for servant";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "servant-client_0_16_0_1" = callPackage
+    ({ mkDerivation, aeson, base, base-compat, bytestring, containers
+     , deepseq, entropy, exceptions, hspec, hspec-discover
+     , http-api-data, http-client, http-media, http-types, HUnit
+     , kan-extensions, markdown-unlit, monad-control, mtl, network
+     , QuickCheck, semigroupoids, servant, servant-client-core
+     , servant-server, stm, tdigest, text, time, transformers
+     , transformers-base, transformers-compat, wai, warp
+     }:
+     mkDerivation {
+       pname = "servant-client";
+       version = "0.16.0.1";
+       sha256 = "1w6rw1bdm5x8swi9dy70n86gq9v85wlgmm6pglfxqbv7bgzpql8c";
        libraryHaskellDepends = [
          base base-compat bytestring containers deepseq exceptions
          http-client http-media http-types kan-extensions monad-control mtl
@@ -207189,6 +208089,7 @@ self: {
        testToolDepends = [ hspec-discover markdown-unlit ];
        description = "Automatic derivation of querying functions for servant";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-client-core" = callPackage
@@ -207201,8 +208102,8 @@ self: {
        pname = "servant-client-core";
        version = "0.16";
        sha256 = "0cvv9a7z6ahwjp433c4sxa9i1ifabbih63bx71r9gvqzl85pb3dz";
-       revision = "1";
-       editedCabalFile = "1hanl8sz14z11441ng8vkzpxrl6igk3xzp6fcm6wg59fsb30fh29";
+       revision = "2";
+       editedCabalFile = "172diqnz0ddvlfznfjk0k1l02f1mb11i1dkzr6rizdmhb66qpqil";
        libraryHaskellDepends = [
          aeson base base-compat base64-bytestring bytestring containers
          deepseq exceptions free http-media http-types network-uri safe
@@ -207246,8 +208147,8 @@ self: {
        pname = "servant-conduit";
        version = "0.15";
        sha256 = "0mpnkqcls4mrxfd3ksy53k7vvm0hildj21b8mdy53z993wq1blfz";
-       revision = "1";
-       editedCabalFile = "0l6pv8bqca88k8wjx7qczagka6l99zd7xyz1ma95004665gc56x6";
+       revision = "2";
+       editedCabalFile = "1m5h5kwc9bjpc7ppdsxx8rr4906bl08np1kawzfvpr7qqy4s8j4q";
        libraryHaskellDepends = [
          base bytestring conduit mtl resourcet servant unliftio-core
        ];
@@ -207376,6 +208277,35 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-docs_0_11_4" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring
+     , case-insensitive, hashable, http-media, http-types, lens, servant
+     , string-conversions, tasty, tasty-golden, tasty-hunit, text
+     , transformers, universe-base, unordered-containers
+     }:
+     mkDerivation {
+       pname = "servant-docs";
+       version = "0.11.4";
+       sha256 = "1z35rr55mxwi761pmqy176liglms443ynk0sjh8v8hcyfciymq0d";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson aeson-pretty base base-compat bytestring case-insensitive
+         hashable http-media http-types lens servant string-conversions text
+         universe-base unordered-containers
+       ];
+       executableHaskellDepends = [
+         aeson base lens servant string-conversions text
+       ];
+       testHaskellDepends = [
+         aeson base base-compat lens servant string-conversions tasty
+         tasty-golden tasty-hunit transformers
+       ];
+       description = "generate API docs for your servant webservice";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-ede" = callPackage
     ({ mkDerivation, aeson, base, bytestring, ede, either, filepath
      , http-media, http-types, semigroups, servant, servant-server, text
@@ -207447,6 +208377,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-elm_0_7_0" = callPackage
+    ({ mkDerivation, aeson, base, Diff, directory, elm-bridge, hspec
+     , HUnit, lens, servant, servant-client, servant-foreign, text
+     , wl-pprint-text
+     }:
+     mkDerivation {
+       pname = "servant-elm";
+       version = "0.7.0";
+       sha256 = "1nnxz61hvrhjkkljpv445ib17ncpb0sp4hdaf7mqjrffr2yb155l";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base directory elm-bridge lens servant servant-foreign text
+         wl-pprint-text
+       ];
+       testHaskellDepends = [
+         aeson base Diff elm-bridge hspec HUnit servant servant-client text
+       ];
+       description = "Automatically derive Elm functions to query servant webservices";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-examples" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, either
      , http-types, js-jquery, lucid, random, servant, servant-client
@@ -207525,8 +208478,8 @@ self: {
        pname = "servant-foreign";
        version = "0.15";
        sha256 = "0wxx9drycam46vcmf3kxp2lq1drlpxb1b6fxbxyb6dd7349py6gi";
-       revision = "1";
-       editedCabalFile = "1amvhixa0zwjipmv6iv97pfzlr83p0b0kvxif2d2l7akcdgd2ddz";
+       revision = "2";
+       editedCabalFile = "0axz78g0vhasq5cvqg1lq0b2qanmb768f1bvzbfx58rn6arwflnj";
        libraryHaskellDepends = [
          base base-compat http-types lens servant text
        ];
@@ -207710,6 +208663,41 @@ self: {
        broken = true;
      }) {};
 
+  "servant-http-streams_0_16_0_1" = callPackage
+    ({ mkDerivation, aeson, base, base-compat, bytestring
+     , case-insensitive, containers, deepseq, entropy, exceptions, hspec
+     , hspec-discover, http-api-data, http-common, http-media
+     , http-streams, http-types, HUnit, io-streams, kan-extensions
+     , markdown-unlit, monad-control, mtl, network, QuickCheck
+     , semigroupoids, servant, servant-client-core, servant-server, stm
+     , tdigest, text, time, transformers, transformers-base
+     , transformers-compat, wai, warp
+     }:
+     mkDerivation {
+       pname = "servant-http-streams";
+       version = "0.16.0.1";
+       sha256 = "0nfwi8bnafv78lzxxi56i9pyk2rj0vkl5x193fixirw4fjvia3zg";
+       libraryHaskellDepends = [
+         base base-compat bytestring case-insensitive containers deepseq
+         exceptions http-common http-media http-streams http-types
+         io-streams kan-extensions monad-control mtl semigroupoids servant
+         servant-client-core text time transformers transformers-base
+         transformers-compat
+       ];
+       testHaskellDepends = [
+         aeson base base-compat bytestring deepseq entropy hspec
+         http-api-data http-streams http-types HUnit kan-extensions
+         markdown-unlit mtl network QuickCheck servant servant-client-core
+         servant-server stm tdigest text transformers transformers-compat
+         wai warp
+       ];
+       testToolDepends = [ hspec-discover markdown-unlit ];
+       description = "Automatic derivation of querying functions for servant";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "servant-http2-client" = callPackage
     ({ mkDerivation, aeson, async, base, binary, bytestring
      , case-insensitive, containers, data-default-class, exceptions
@@ -207783,8 +208771,8 @@ self: {
        pname = "servant-js";
        version = "0.9.4";
        sha256 = "041wigqgn5ygcs49ndc39rk66j5bcvgpihshxk678jk470ysfszq";
-       revision = "1";
-       editedCabalFile = "09nd1wlpaj20pyp6jzp2hsnyl02lvbi5vvvymhfhqf3rjxxpnyyr";
+       revision = "2";
+       editedCabalFile = "1x7f0dbqgzlwzmr20l6hln4s86kblak4j9h0p9igcqibmplc70zn";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -207832,8 +208820,8 @@ self: {
        pname = "servant-lucid";
        version = "0.9";
        sha256 = "1xamwcijd03cynml5c2hr577qairybyrqd90ixyb1a94lql6agbf";
-       revision = "2";
-       editedCabalFile = "17p1xxzmr3ya0k4cy9n5mqf356gm35jdcm8mw1cxg2v80sd6nr4j";
+       revision = "3";
+       editedCabalFile = "10j29y9zjflh88csvn7zi4pm8jr9dxsglin94wypjrhcwy7yj1ic";
        libraryHaskellDepends = [ base http-media lucid servant text ];
        testHaskellDepends = [ base lucid servant-server wai warp ];
        description = "Servant support for lucid";
@@ -207849,8 +208837,8 @@ self: {
        pname = "servant-machines";
        version = "0.15";
        sha256 = "137c0svvwvkh3ad8cc5q5vygci3c5951hbwlhk09znqaqycck35i";
-       revision = "2";
-       editedCabalFile = "0x7dw8mcvgaag53ai5c9nagc5dik4r06wxdhvp72q8f09pvabxxf";
+       revision = "3";
+       editedCabalFile = "10ifc1r10lmzvrxa79389bz5ydcmacyz8ga4x63fw7r1rbfml0jz";
        libraryHaskellDepends = [ base bytestring machines mtl servant ];
        testHaskellDepends = [
          base base-compat bytestring http-client http-media machines servant
@@ -207908,8 +208896,8 @@ self: {
        pname = "servant-mock";
        version = "0.8.5";
        sha256 = "10bvqwyp5ca53k47a1xfbihdv22gjlj97spr1bn5plf5vlk70m5f";
-       revision = "2";
-       editedCabalFile = "0269d0yr8sa043wc2ymg3fv60c9pr4jxfy9sar2qqccvngpa1vf5";
+       revision = "3";
+       editedCabalFile = "1137vz9xm8iwj6x8h1q1yify6c1lahy0dxj6hpbhgi4s3mqkhm2g";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -207938,8 +208926,8 @@ self: {
        pname = "servant-multipart";
        version = "0.11.4";
        sha256 = "0vcwrdzj1xyjg11yvfcds9rql3gcwgdcdq4z085g44fpabjxj50s";
-       revision = "1";
-       editedCabalFile = "0sf5vmzdcfzy01d65dd2f5l4k67znmjvp86d4xgkrmqsqmgxcgpg";
+       revision = "2";
+       editedCabalFile = "0pr0crsxc9m6p06m5qk39gzvqnj3hcxql0almpjfag0ifpviwkgk";
        libraryHaskellDepends = [
          base bytestring directory http-media lens resourcet servant
          servant-docs servant-foreign servant-server text transformers wai
@@ -208069,8 +209057,29 @@ self: {
        pname = "servant-pipes";
        version = "0.15";
        sha256 = "04ypy9vjrfggrk7dg3sxwj9nav50v85vpr5mnp5r2c9ka6xn4v90";
-       revision = "1";
-       editedCabalFile = "1q4w4fnvpi4m62yhv37pcg5sj21m4s02glsa5q56vc51bjbx8xi4";
+       revision = "2";
+       editedCabalFile = "0c3nyj2iwmhd3kmyv4q0ilzcwxr2dsg5lxvysbhh8048q90bm1nw";
+       libraryHaskellDepends = [
+         base bytestring monad-control mtl pipes pipes-safe servant
+       ];
+       testHaskellDepends = [
+         base base-compat bytestring http-client http-media pipes
+         pipes-bytestring pipes-safe servant servant-client servant-server
+         wai warp
+       ];
+       description = "Servant Stream support for pipes";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "servant-pipes_0_15_1" = callPackage
+    ({ mkDerivation, base, base-compat, bytestring, http-client
+     , http-media, monad-control, mtl, pipes, pipes-bytestring
+     , pipes-safe, servant, servant-client, servant-server, wai, warp
+     }:
+     mkDerivation {
+       pname = "servant-pipes";
+       version = "0.15.1";
+       sha256 = "1r2n7f8x7adl117zlswf4ji5yxib2v80wh7wbhwklvd86dbzyrby";
        libraryHaskellDepends = [
          base bytestring monad-control mtl pipes pipes-safe servant
        ];
@@ -208081,6 +209090,7 @@ self: {
        ];
        description = "Servant Stream support for pipes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-pool" = callPackage
@@ -208221,6 +209231,8 @@ self: {
        pname = "servant-quickcheck";
        version = "0.0.7.4";
        sha256 = "1z47fgzdwfqb0byr8wa0s9n3g8hcbf112nbgaifm0zmxx6w4jlcf";
+       revision = "1";
+       editedCabalFile = "1k2qcfg8vh8nj3j621hsi09q3lj6p9ahz7rgz89psm79j9ks10d9";
        libraryHaskellDepends = [
          aeson base base-compat-batteries bytestring case-insensitive clock
          data-default-class hspec http-client http-media http-types mtl
@@ -208395,6 +209407,8 @@ self: {
        pname = "servant-server";
        version = "0.16.2";
        sha256 = "1l4kgjg5z775bi76hy7cb70qwvmkai4rxqkgp0ildsjgsvf8qb80";
+       revision = "1";
+       editedCabalFile = "017aw6wyhi5g7zkk59yj44r1n02zzin2w9wdskwqys7iqkvnvczn";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal cabal-doctest ];
@@ -208530,8 +209544,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-static-th";
-       version = "0.2.2.0";
-       sha256 = "06vl8a9h5gzmfazj390fmxp6p4bwfdszqjdwnpivv03m80lh3v2v";
+       version = "0.2.2.1";
+       sha256 = "15i5sgi30m5y8capc10k4hsaldzglvmknfq6sr1mrrzc9z9c3lrm";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -208680,6 +209694,8 @@ self: {
        pname = "servant-swagger";
        version = "1.1.7.1";
        sha256 = "0vdjvn5bsd26q8wx1qdwn7vdfnd9jk8m9jzzm251gyn1ijxv8ild";
+       revision = "1";
+       editedCabalFile = "1wymxb7vi55rhk4kfbrxxv9dsxlxlam70mi9ldwnxp4xdf91ja2p";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          aeson aeson-pretty base base-compat bytestring hspec http-media
@@ -208722,6 +209738,8 @@ self: {
        pname = "servant-swagger-ui";
        version = "0.3.4.3.22.2";
        sha256 = "0ig05xzh4iybnwzh7bx8i7a337j0xfmsxbmfi9iaiz4g6f9s5clm";
+       revision = "1";
+       editedCabalFile = "084cqli1d30vz6mrj6l9cxlwmigqqiydkxdq90xvz3ffhs5cyq8p";
        libraryHaskellDepends = [
          base bytestring file-embed-lzma servant servant-server
          servant-swagger-ui-core swagger2 text
@@ -208739,6 +209757,8 @@ self: {
        pname = "servant-swagger-ui-core";
        version = "0.3.3";
        sha256 = "0gpdjnclbjjr6gwc0gyx1d4w06cjf6z5b2ngjfcgbn885wqllwh3";
+       revision = "1";
+       editedCabalFile = "07i6bcy0z1xa2m7cdaq37wi20plghrppbd1v58a1g23g54mf0dcm";
        libraryHaskellDepends = [
          base blaze-markup bytestring http-media servant servant-blaze
          servant-server swagger2 text transformers transformers-compat
@@ -208756,6 +209776,8 @@ self: {
        pname = "servant-swagger-ui-jensoleg";
        version = "0.3.3";
        sha256 = "02zwymqxq54xwc8wmzhbcfgx9plvk0n4kp1907sbl98mhh2frwrw";
+       revision = "1";
+       editedCabalFile = "0876wqw08fd39k4hc1739gf727ryq2w2w3sxvc89hp31zc2hm0fi";
        libraryHaskellDepends = [
          base bytestring file-embed-lzma servant servant-server
          servant-swagger-ui-core swagger2 text
@@ -208772,6 +209794,8 @@ self: {
        pname = "servant-swagger-ui-redoc";
        version = "0.3.3.1.22.2";
        sha256 = "0qkh4h5ijhizlnps79gg75jy533rpc1vcw7v7yxika585srndim1";
+       revision = "1";
+       editedCabalFile = "1qi389fjrlnqbsm7kw6rbyga19mw9286g5ibavi888jqyllpmi8f";
        libraryHaskellDepends = [
          base bytestring file-embed-lzma servant servant-server
          servant-swagger-ui-core swagger2 text
@@ -208883,8 +209907,8 @@ self: {
        pname = "servant-yaml";
        version = "0.1.0.1";
        sha256 = "00gnbdlcq6cvmhsga8h0csd35pnfib038rqlhm445l4wa0cp8m01";
-       revision = "2";
-       editedCabalFile = "0scpm5dshnb7izn1xx8q3xm1m5f52y1s7nzgp7sa7zcv3pp6n7lw";
+       revision = "3";
+       editedCabalFile = "1qq4sg2kmdh45f4cjf36ldkdmhzryd5npy5yp558snbks0358wgs";
        libraryHaskellDepends = [
          base bytestring http-media servant yaml
        ];
@@ -210408,8 +211432,8 @@ self: {
      }:
      mkDerivation {
        pname = "shakespeare-sass";
-       version = "0.1.0.3";
-       sha256 = "169jkazw4567hcm2gnlpa6jgkz7bn5b83nr0fkqf2bm72zq2g4hl";
+       version = "0.1.4.1";
+       sha256 = "0y4z898dkmkmvfv1lhsq5rgsda5dz6ginvp62hmshbml8yg8hps7";
        libraryHaskellDepends = [
          base hsass shakespeare template-haskell yesod yesod-core
        ];
@@ -210975,8 +211999,8 @@ self: {
      }:
      mkDerivation {
        pname = "shh";
-       version = "0.7.0.5";
-       sha256 = "119b9rvvdsw1al0i4lqa25z7ykwwqi46xz22az1b8fi3xiijprs3";
+       version = "0.7.0.6";
+       sha256 = "0whcynzjsm0agq456kv6dn6d4gk1k3vhvnbwvjar4sbn0yiz4if1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -211833,8 +212857,8 @@ self: {
     ({ mkDerivation, base, optparse-applicative }:
      mkDerivation {
        pname = "simple-cmd-args";
-       version = "0.1.2";
-       sha256 = "1vj5yvqvch8ckf1jzp77d7l6g89wxzb8ngqn6iw3m215f8xl77p8";
+       version = "0.1.3";
+       sha256 = "09cp664flacsq565pqva7vsqcq5ddndck4rh74y6n2j3xzl24a2k";
        libraryHaskellDepends = [ base optparse-applicative ];
        description = "Simple command args parsing and execution";
        license = stdenv.lib.licenses.bsd3;
@@ -213147,6 +214171,32 @@ self: {
        broken = true;
      }) {};
 
+  "sized-grid_0_2_0_1" = callPackage
+    ({ mkDerivation, adjunctions, aeson, ansi-terminal, base, comonad
+     , constraints, distributive, generics-sop, HUnit, lens
+     , markdown-unlit, mtl, QuickCheck, random, tasty, tasty-hunit
+     , tasty-quickcheck, vector, vector-space
+     }:
+     mkDerivation {
+       pname = "sized-grid";
+       version = "0.2.0.1";
+       sha256 = "15js3x76bz9p38bxk355kpp8aq0ns68yxqnc64bp956wqss69vgi";
+       libraryHaskellDepends = [
+         adjunctions aeson base comonad constraints distributive
+         generics-sop lens mtl random vector vector-space
+       ];
+       testHaskellDepends = [
+         adjunctions aeson ansi-terminal base comonad distributive
+         generics-sop HUnit lens markdown-unlit QuickCheck tasty tasty-hunit
+         tasty-quickcheck vector vector-space
+       ];
+       testToolDepends = [ markdown-unlit ];
+       description = "Multidimensional grids with sized specified at compile time";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "sized-types" = callPackage
     ({ mkDerivation, array, base, base-compat, containers, singletons
      }:
@@ -213754,21 +214804,18 @@ self: {
      }) {};
 
   "slick" = callPackage
-    ({ mkDerivation, aeson, base, binary, bytestring, containers, lens
-     , lens-aeson, mustache, pandoc, shake, text, time
+    ({ mkDerivation, aeson, base, bytestring, directory, extra
+     , mustache, pandoc, shake, text, unordered-containers
      }:
      mkDerivation {
        pname = "slick";
-       version = "0.2.0.0";
-       sha256 = "0pxbrqykf11nrdc6zyjxvfc57dfajp5nm4qpqyk26l2jh1gaklz7";
+       version = "1.0.0.0";
+       sha256 = "11wzfgxx5cjdkwgs23afidvjck8q8vs4p2qm7g9f2zxiq6706y89";
        libraryHaskellDepends = [
-         aeson base binary bytestring containers lens lens-aeson mustache
-         pandoc shake text time
-       ];
-       testHaskellDepends = [
-         aeson base binary bytestring containers lens lens-aeson mustache
-         pandoc shake text time
+         aeson base bytestring directory extra mustache pandoc shake text
+         unordered-containers
        ];
+       description = "A quick & easy static site builder built with shake and pandoc";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -213928,6 +214975,37 @@ self: {
        broken = true;
      }) {};
 
+  "slynx" = callPackage
+    ({ mkDerivation, async, base, bytestring, containers
+     , data-memocombinators, elynx-seq, elynx-tools, elynx-tree, hmatrix
+     , integration, lens, math-functions, matrices, megaparsec
+     , monad-logger, mwc-random, optparse-applicative, parallel
+     , primitive, statistics, text, transformers, vector
+     , vector-th-unbox, word8
+     }:
+     mkDerivation {
+       pname = "slynx";
+       version = "0.0.1";
+       sha256 = "1wwzgslhbdn5q5sd9706sbz2zjqk6dhch72jb43cqbfh4jkfr8r1";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         async base bytestring containers data-memocombinators elynx-seq
+         elynx-tools elynx-tree hmatrix integration lens math-functions
+         matrices megaparsec monad-logger mwc-random optparse-applicative
+         parallel primitive statistics text transformers vector
+         vector-th-unbox word8
+       ];
+       executableHaskellDepends = [
+         async base bytestring containers data-memocombinators elynx-seq
+         elynx-tools hmatrix integration lens math-functions matrices
+         megaparsec monad-logger mwc-random optparse-applicative parallel
+         primitive statistics text transformers vector vector-th-unbox word8
+       ];
+       description = "Handle molecular sequences";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "small-bytearray-builder" = callPackage
     ({ mkDerivation, base, byteslice, bytestring, gauge
      , natural-arithmetic, primitive, primitive-offset, QuickCheck
@@ -216654,6 +217732,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "some" = callPackage
+    ({ mkDerivation, base, deepseq }:
+     mkDerivation {
+       pname = "some";
+       version = "1.0.0.3";
+       sha256 = "0c2y51gw94faafa0jvb3awnsvj89saan4ryy0d5dwivp0zp9gg64";
+       libraryHaskellDepends = [ base deepseq ];
+       testHaskellDepends = [ base ];
+       description = "Existential type: Some";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "sonic-visualiser" = callPackage
     ({ mkDerivation, array, base, bytestring, bzlib, containers, mtl
      , pretty, utf8-string, xml
@@ -217273,8 +218363,8 @@ self: {
      }:
      mkDerivation {
        pname = "sparse-tensor";
-       version = "0.2.1.1";
-       sha256 = "1bjia89as14i2cif9nf7rsifazg305l7cl040gb7xbi3szlc621y";
+       version = "0.2.1.2";
+       sha256 = "0rkq0la7l12x9ck96ra8inlz81fcj5z8sxa90sgd082jhrq7jq94";
        setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [
          ad base bytestring cereal containers deepseq ghc-typelits-knownnat
@@ -218490,6 +219580,8 @@ self: {
        pname = "sqlite-simple";
        version = "0.4.16.0";
        sha256 = "1pih3nbfczyb91smci2dg9p1wvjsqiv5f5y97q6vqzlns64a3lk0";
+       revision = "1";
+       editedCabalFile = "123bykwxl3p6918bjxv073ksf8k1hn6s0rlph934h18400n51fdf";
        libraryHaskellDepends = [
          attoparsec base blaze-builder blaze-textual bytestring containers
          direct-sqlite Only semigroups template-haskell text time
@@ -220339,6 +221431,34 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "statistics_0_15_1_1" = callPackage
+    ({ mkDerivation, aeson, async, base, base-orphans, binary
+     , data-default-class, deepseq, dense-linear-algebra, erf, HUnit
+     , ieee754, math-functions, monad-par, mwc-random, primitive
+     , QuickCheck, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, vector, vector-algorithms
+     , vector-binary-instances, vector-th-unbox
+     }:
+     mkDerivation {
+       pname = "statistics";
+       version = "0.15.1.1";
+       sha256 = "015rn74f1glii26j4b2fh1fc63xvxzrh2xckiancz48kc8jdzabj";
+       libraryHaskellDepends = [
+         aeson async base base-orphans binary data-default-class deepseq
+         dense-linear-algebra math-functions monad-par mwc-random primitive
+         vector vector-algorithms vector-binary-instances vector-th-unbox
+       ];
+       testHaskellDepends = [
+         aeson base binary dense-linear-algebra erf HUnit ieee754
+         math-functions mwc-random primitive QuickCheck test-framework
+         test-framework-hunit test-framework-quickcheck2 vector
+         vector-algorithms
+       ];
+       description = "A library of statistical types, data, and functions";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "statistics-dirichlet" = callPackage
     ({ mkDerivation, base, deepseq, hmatrix-special
      , nonlinear-optimization, vector
@@ -222068,6 +223188,22 @@ self: {
        broken = true;
      }) {};
 
+  "streaming-events" = callPackage
+    ({ mkDerivation, attoparsec, base, binary, bytestring, http-client
+     , streaming, streaming-attoparsec, streaming-bytestring, wai-extra
+     }:
+     mkDerivation {
+       pname = "streaming-events";
+       version = "1.0.0";
+       sha256 = "12rbw1gvcfl2svlsm7x1v01j9bk0fdh6x7j1c0v6a9xjmwq2bgv6";
+       libraryHaskellDepends = [
+         attoparsec base binary bytestring http-client streaming
+         streaming-attoparsec streaming-bytestring wai-extra
+       ];
+       description = "Client-side consumption of a ServerEvent";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "streaming-eversion" = callPackage
     ({ mkDerivation, base, doctest, foldl, microlens, pipes
      , pipes-bytestring, pipes-text, streaming, tasty, tasty-hunit
@@ -222548,23 +223684,6 @@ self: {
      }) {};
 
   "strict-list" = callPackage
-    ({ mkDerivation, base, QuickCheck, quickcheck-instances, rerebase
-     , semigroupoids, tasty, tasty-hunit, tasty-quickcheck
-     }:
-     mkDerivation {
-       pname = "strict-list";
-       version = "0.1.4";
-       sha256 = "0jh158yjly9p54fgbxjxspdnicryik1ax3mlc6i7351v564yc7cz";
-       libraryHaskellDepends = [ base semigroupoids ];
-       testHaskellDepends = [
-         QuickCheck quickcheck-instances rerebase tasty tasty-hunit
-         tasty-quickcheck
-       ];
-       description = "Strict linked list";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "strict-list_0_1_5" = callPackage
     ({ mkDerivation, base, hashable, QuickCheck, quickcheck-instances
      , rerebase, semigroupoids, tasty, tasty-hunit, tasty-quickcheck
      }:
@@ -222579,7 +223698,6 @@ self: {
        ];
        description = "Strict linked list";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "strict-tuple" = callPackage
@@ -223931,8 +225049,8 @@ self: {
        pname = "summoner";
        version = "1.3.0.1";
        sha256 = "1m08n2ip9rjx06mcwcv636ncicmpxcmhx82i3p4yc5vylibxr57s";
-       revision = "4";
-       editedCabalFile = "1vjk95n2wqybigy8p55gs7qkiv5v1lwf8qmri1f9bk29599sh74k";
+       revision = "5";
+       editedCabalFile = "1fy1d12rq8cqafyr0yvwsnslmmvdhpjigjv2ppvhs4ihgghrrij3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -224827,6 +225945,8 @@ self: {
        pname = "swagger2";
        version = "2.4";
        sha256 = "0m08l7nz53h6ix6xgzynnh3cf6l61437da9swdbsz8avx0rq2wci";
+       revision = "1";
+       editedCabalFile = "02qlfsgqc5jmc616xn30hn213dwhsqlkrrk2pa6774f0dcn8rpiz";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          aeson base base-compat-batteries bytestring containers cookie
@@ -225352,8 +226472,8 @@ self: {
      }:
      mkDerivation {
        pname = "symbiote";
-       version = "0.0.0";
-       sha256 = "1p38lblwd8cxbypnqy7f71ab2s7ia00xv6ysy24lh9xaqns43ad4";
+       version = "0.0.0.1";
+       sha256 = "06341y9bfr6h9sf7llxm2zc36q0zabn2ildp0gyskspybibl1sdy";
        libraryHaskellDepends = [
          aeson async base bytestring cereal containers monad-control mtl
          QuickCheck stm text
@@ -226519,8 +227639,8 @@ self: {
      }:
      mkDerivation {
        pname = "table-layout";
-       version = "0.8.0.4";
-       sha256 = "160ns7fd3xivlfirir7lk0ghv1f63b6cyfvnk8p2cn3jjfdp9xb3";
+       version = "0.8.0.5";
+       sha256 = "1gvajqjw5i2l97zcx607xlc143xq1sli5i1321msgi585h7ksnd4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -227852,6 +228972,8 @@ self: {
        pname = "tasty-hedgehog";
        version = "1.0.0.1";
        sha256 = "1mbg5q0c0xfrk4npfj60pi693igb7r5l78x6xf9fk2jglw0nmxhz";
+       revision = "1";
+       editedCabalFile = "1n6797fm8swyrk8cw7zxz593gq82wx8dayvm204rmgcz75bslcpn";
        libraryHaskellDepends = [ base hedgehog tagged tasty ];
        testHaskellDepends = [
          base hedgehog tasty tasty-expected-failure
@@ -231978,6 +233100,27 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "th-printf_0_7" = callPackage
+    ({ mkDerivation, base, charset, containers, dlist, hspec, HUnit
+     , integer-logarithms, microlens-platform, mtl, parsec, QuickCheck
+     , semigroups, template-haskell, text, th-lift, transformers
+     }:
+     mkDerivation {
+       pname = "th-printf";
+       version = "0.7";
+       sha256 = "1f9lw0scm2bpnhmhgvywzphxn85ln3xcn8cjyvy8h4cn2ymw4aza";
+       libraryHaskellDepends = [
+         base charset containers dlist integer-logarithms microlens-platform
+         mtl parsec semigroups template-haskell text th-lift transformers
+       ];
+       testHaskellDepends = [
+         base hspec HUnit QuickCheck template-haskell text
+       ];
+       description = "Quasiquoters for printf";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "th-reify-compat" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
@@ -232813,6 +233956,24 @@ self: {
        broken = true;
      }) {};
 
+  "thumbnail-polish" = callPackage
+    ({ mkDerivation, base, bytestring, data-default, directory
+     , filepath, friday, friday-devil, nonce, resourcet, text
+     }:
+     mkDerivation {
+       pname = "thumbnail-polish";
+       version = "0.0.1.0";
+       sha256 = "09b5689anqbll8x7mwcwbcm5qwsxvayglfk3k3p55jwp142z75ir";
+       libraryHaskellDepends = [
+         base bytestring data-default directory filepath friday friday-devil
+         nonce resourcet text
+       ];
+       description = "Image thumbnail creation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "thyme" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal
      , containers, cpphs, criterion, deepseq, directory, filepath, mtl
@@ -232889,6 +234050,8 @@ self: {
        pname = "tibetan-utils";
        version = "0.1.1.10";
        sha256 = "11bzcan2vfhdz6lwfvfgiyycqf30p4kdkzn47pm4ydr6bbpz8aia";
+       revision = "1";
+       editedCabalFile = "0gm271p3m3y0x9lfi5yviznqfr65f0if553z6h977dqk3f3psyfd";
        libraryHaskellDepends = [
          base composition-prelude megaparsec text
        ];
@@ -234484,6 +235647,35 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tlynx" = callPackage
+    ({ mkDerivation, base, bytestring, containers, elynx-seq
+     , elynx-tools, elynx-tree, lifted-async, math-functions, megaparsec
+     , monad-logger, mwc-random, optparse-applicative, parallel
+     , primitive, QuickCheck, quickcheck-instances, statistics, text
+     , transformers, vector
+     }:
+     mkDerivation {
+       pname = "tlynx";
+       version = "0.0.1";
+       sha256 = "0acgwn0czk3kpsnsrlkmxrm7cc0mv6wwx75nr5v3hc1ir1hais6n";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring containers elynx-seq elynx-tools elynx-tree
+         lifted-async math-functions megaparsec monad-logger mwc-random
+         optparse-applicative parallel primitive QuickCheck
+         quickcheck-instances statistics text transformers vector
+       ];
+       executableHaskellDepends = [
+         base bytestring containers elynx-tools elynx-tree lifted-async
+         math-functions megaparsec monad-logger mwc-random
+         optparse-applicative parallel primitive QuickCheck
+         quickcheck-instances statistics text transformers vector
+       ];
+       description = "Handle phylogenetic trees";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "tmapchan" = callPackage
     ({ mkDerivation, base, containers, hashable, stm
      , unordered-containers
@@ -236692,18 +237884,18 @@ self: {
 
   "tree-sitter" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, directory
-     , filepath, fused-effects, hedgehog, hspec, split, template-haskell
-     , text, unordered-containers
+     , filepath, fused-effects, hedgehog, split, template-haskell, text
+     , unordered-containers
      }:
      mkDerivation {
        pname = "tree-sitter";
-       version = "0.2.0.0";
-       sha256 = "03xdyvmnpjswh0rkn718n1w8kqvly86s6k3cwqgb6r1ygd6kqmim";
+       version = "0.3.0.0";
+       sha256 = "1ai587a8m67j0rjg1gbhxnv1kl4awpcr7jvh4qnlvx91g7s1gq2g";
        libraryHaskellDepends = [
          aeson base bytestring containers directory filepath fused-effects
-         hedgehog split template-haskell text unordered-containers
+         split template-haskell text unordered-containers
        ];
-       testHaskellDepends = [ base hedgehog hspec ];
+       testHaskellDepends = [ base hedgehog ];
        description = "Unstable bindings for the tree-sitter parsing library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -236714,10 +237906,8 @@ self: {
     ({ mkDerivation, base, template-haskell, tree-sitter }:
      mkDerivation {
        pname = "tree-sitter-go";
-       version = "0.1.0.0";
-       sha256 = "0lpj6sphc8gfyy8yz4pkrykwvrly3vdhy7j9n7jiacjsxnbw33ag";
-       revision = "1";
-       editedCabalFile = "04cq0vlwk4b0kyjsdc8aykm2m173wxzlvm3pjwfshcg2d5kqcn8a";
+       version = "0.2.0.0";
+       sha256 = "1yrhn025rdllfcmlcaiz6idxhxqh02qjpw71dm3zynmnmgmpqcc0";
        libraryHaskellDepends = [ base template-haskell tree-sitter ];
        doHaddock = false;
        description = "Tree-sitter grammar/parser for Go";
@@ -236730,10 +237920,10 @@ self: {
     ({ mkDerivation, base, template-haskell, tree-sitter }:
      mkDerivation {
        pname = "tree-sitter-haskell";
-       version = "0.1.0.0";
-       sha256 = "0jglvy6p4xwdwpk7jn9sh83j0zv51crvzfc45l10s8lflprydk1m";
+       version = "0.2.0.0";
+       sha256 = "0cds6xmps88vx3x7ifkpjbbbgvnbc22hxam6qdwy2m1njbff3wad";
        revision = "1";
-       editedCabalFile = "0326iz5r9bz4qsmqpiih1h28hbr10lhfy810b4p1bwianj7735bp";
+       editedCabalFile = "07kgsp70bwggcnxh9229dvbfysc9s4ykzir4973pn02qs5l7kb6y";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base template-haskell tree-sitter ];
@@ -236748,10 +237938,8 @@ self: {
     ({ mkDerivation, base, template-haskell, tree-sitter }:
      mkDerivation {
        pname = "tree-sitter-java";
-       version = "0.1.0.0";
-       sha256 = "1npa7i8c24hb0ds52cphfhn5cw087f8iq5w56x5wsjkvm531zblr";
-       revision = "1";
-       editedCabalFile = "07b2pwnfn2smaq4x9zhh721r2vqf8ipcgr3m19s9bnsyd7pbqyiy";
+       version = "0.2.0.0";
+       sha256 = "1gayg7ln4iy56a4pl3dqrl2iq689b1a8z2n59dnrhmzhq87lzx7y";
        libraryHaskellDepends = [ base template-haskell tree-sitter ];
        doHaddock = false;
        description = "Tree-sitter grammar/parser for Java";
@@ -236764,10 +237952,8 @@ self: {
     ({ mkDerivation, base, template-haskell, tree-sitter }:
      mkDerivation {
        pname = "tree-sitter-json";
-       version = "0.1.0.0";
-       sha256 = "0agmr5nj4rjdlwcf64ijjwbmkpgl10gbgg26v8bpnx84cxhfjpa3";
-       revision = "1";
-       editedCabalFile = "14gyys09392bf46vnhv4skc817ghka0bbqzrzr6lamaszk9a02ax";
+       version = "0.2.0.0";
+       sha256 = "0x30pwmganjabzkgqgrkk249r8v4frag9ww64j4sfq6r2vbfc7l3";
        libraryHaskellDepends = [ base template-haskell tree-sitter ];
        doHaddock = false;
        description = "Tree-sitter grammar/parser for JSON";
@@ -236780,8 +237966,8 @@ self: {
     ({ mkDerivation, base, template-haskell, tree-sitter }:
      mkDerivation {
        pname = "tree-sitter-php";
-       version = "0.1.0.1";
-       sha256 = "1wbslim9ps3pf29445cxjr5kb4haidb43zl3a87pk5gfbr2wj0r0";
+       version = "0.2.0.0";
+       sha256 = "0wdyppjp879wb3m73kczsa78c0lyqvpnkvsh13bh22vw66jypj6x";
        libraryHaskellDepends = [ base template-haskell tree-sitter ];
        doHaddock = false;
        description = "Tree-sitter grammar/parser for PHP";
@@ -236796,8 +237982,8 @@ self: {
      }:
      mkDerivation {
        pname = "tree-sitter-python";
-       version = "0.2.0.0";
-       sha256 = "1grkz8i3d37cci1w4i1lvdr2bjp7ddhq1fbyf240132rbhx67pg8";
+       version = "0.4.0.0";
+       sha256 = "02i12ys845j4n0j7a1qpdlbx9ia51m7ab9lhk7d4028ysx82crn9";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base directory filepath template-haskell tree-sitter
@@ -236814,10 +238000,8 @@ self: {
     ({ mkDerivation, base, template-haskell, tree-sitter }:
      mkDerivation {
        pname = "tree-sitter-ruby";
-       version = "0.1.0.0";
-       sha256 = "1rcaqib1ly4p54vqwm2mivijqirc031w18hgkccrnyv97yxrbhw9";
-       revision = "1";
-       editedCabalFile = "0vwhd6g77s0y0wxflsfvhxcb4hg527nm0h92xxkxk3f50rf2rp0z";
+       version = "0.2.0.0";
+       sha256 = "0n2ls3mkinqv0h2h05pmi8scmgr70bpg3pdg9wnid1gdpcwn07qx";
        libraryHaskellDepends = [ base template-haskell tree-sitter ];
        doHaddock = false;
        description = "Tree-sitter grammar/parser for Ruby";
@@ -236830,10 +238014,8 @@ self: {
     ({ mkDerivation, base, template-haskell, tree-sitter }:
      mkDerivation {
        pname = "tree-sitter-tsx";
-       version = "0.1.0.0";
-       sha256 = "0jsc5kx5dw4b686dfs7n3vdafyg8mpf94cq2mscwmcyv9w1f3gma";
-       revision = "1";
-       editedCabalFile = "0hfghgxa138m4krml12yf9s3zqnad14ryynzmyqdwb9j25302hb6";
+       version = "0.2.0.0";
+       sha256 = "16ql8b2dcp461182rsj2fdgz3z82jh351n436hl61jfja8dc15m8";
        libraryHaskellDepends = [ base template-haskell tree-sitter ];
        doHaddock = false;
        description = "Tree-sitter grammar/parser for TSX";
@@ -236846,10 +238028,8 @@ self: {
     ({ mkDerivation, base, template-haskell, tree-sitter }:
      mkDerivation {
        pname = "tree-sitter-typescript";
-       version = "0.1.0.0";
-       sha256 = "1mpk1vhahbva8733anx624vl66fg3h6l9lsby87kf98yrp55ycbn";
-       revision = "1";
-       editedCabalFile = "0ahjxiz4jgym12490xmh2vsyvxly5gza01aasxblncf1h2q1nggi";
+       version = "0.2.0.0";
+       sha256 = "0pcxxgqz0w58fnfy1cbqwj7mmqj8nnkm2rkpp6h6agawsiswi8kz";
        libraryHaskellDepends = [ base template-haskell tree-sitter ];
        doHaddock = false;
        description = "Tree-sitter grammar/parser for TypeScript";
@@ -237854,8 +239034,8 @@ self: {
     ({ mkDerivation, base, type-combinators }:
      mkDerivation {
        pname = "tuple-ops";
-       version = "0.0.0.2";
-       sha256 = "05hmw9s4bync4j9sr8cs9nknkgpzwqd55aiw5s3iax4qnbxsccyp";
+       version = "0.0.0.3";
+       sha256 = "09993bfndv2iljq6sspihysv22d2f8g0lar03p7ghiyp81m6j0ax";
        libraryHaskellDepends = [ base type-combinators ];
        description = "various operations on n-ary tuples via GHC.Generics";
        license = stdenv.lib.licenses.bsd3;
@@ -238851,6 +240031,8 @@ self: {
        pname = "type-combinators";
        version = "0.2.4.3";
        sha256 = "1xip4gav1fn3ip62mrlbr7p6i1254fa1q542cmp6ffzm55lwn30z";
+       revision = "1";
+       editedCabalFile = "1m975zq2mxlzk5h4nzrkaxjx5w79p3ws3yli3m6cn3245pjygv5w";
        libraryHaskellDepends = [ base ];
        description = "A collection of data types for type-level programming";
        license = stdenv.lib.licenses.bsd3;
@@ -240600,8 +241782,8 @@ self: {
      }:
      mkDerivation {
        pname = "unbound-kind-generics";
-       version = "0.2.0.0";
-       sha256 = "1hn78dixgd1p0pabh7pg0c7q607irs68vs3ggay8i1s72nc9lvj8";
+       version = "0.2.1.0";
+       sha256 = "01xfgjgjnv302dy4w7c8z727ppfr30f1h8y0vhxiy296rzzkdwfm";
        libraryHaskellDepends = [
          base kind-generics kind-generics-th unbound-generics
        ];
@@ -241542,10 +242724,8 @@ self: {
      }:
      mkDerivation {
        pname = "universe";
-       version = "1.1";
-       sha256 = "0zghqcv6jyl9x3qfmbnqyfvr4pkf3m6lil0vg66m16xlrgz68hds";
-       revision = "1";
-       editedCabalFile = "0639gsf8irhpgcp69lq9l7987lsh4wnw3z9ai0dqrvx5ixpg3k5h";
+       version = "1.1.1";
+       sha256 = "0jm5wi5blc21jn5hfgmx13ra006dc08dvl1sx7ciq8id87kwvxzg";
        libraryHaskellDepends = [
          universe-base universe-dependent-sum universe-instances-extended
          universe-reverse-instances
@@ -241554,17 +242734,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "universe_1_1_1" = callPackage
-    ({ mkDerivation, universe-base, universe-dependent-sum
-     , universe-instances-extended, universe-reverse-instances
+  "universe_1_2" = callPackage
+    ({ mkDerivation, universe-base, universe-instances-extended
+     , universe-reverse-instances, universe-some
      }:
      mkDerivation {
        pname = "universe";
-       version = "1.1.1";
-       sha256 = "0jm5wi5blc21jn5hfgmx13ra006dc08dvl1sx7ciq8id87kwvxzg";
+       version = "1.2";
+       sha256 = "0l8g583pgbklxgv7fjb1bdhf1a09wmj8fc59siknqwlankln84qs";
        libraryHaskellDepends = [
-         universe-base universe-dependent-sum universe-instances-extended
-         universe-reverse-instances
+         universe-base universe-instances-extended
+         universe-reverse-instances universe-some
        ];
        description = "A class for finite and recursively enumerable types";
        license = stdenv.lib.licenses.bsd3;
@@ -241607,6 +242787,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "universe-dependent-sum_1_2" = callPackage
+    ({ mkDerivation, base, dependent-sum, some, universe-base
+     , universe-some
+     }:
+     mkDerivation {
+       pname = "universe-dependent-sum";
+       version = "1.2";
+       sha256 = "1xjw6mhlj1vyw6m4b4j0k81p86hls9031sfv59zgiq5y0ngm1f07";
+       libraryHaskellDepends = [
+         base dependent-sum some universe-base universe-some
+       ];
+       description = "Universe instances for types from dependent-sum";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "universe-instances-base" = callPackage
     ({ mkDerivation, base, universe-base }:
      mkDerivation {
@@ -241621,19 +242817,6 @@ self: {
      }) {};
 
   "universe-instances-extended" = callPackage
-    ({ mkDerivation, adjunctions, base, comonad, universe-base }:
-     mkDerivation {
-       pname = "universe-instances-extended";
-       version = "1.1";
-       sha256 = "12ads0n5md27wznrv7ah668ip2pp3gryn8d6my74kyhsz6g2fn5q";
-       revision = "1";
-       editedCabalFile = "02267na4xac77q4rnsy53h8nh0gfcmjzkb89qmi4qmvpps8h15y5";
-       libraryHaskellDepends = [ adjunctions base comonad universe-base ];
-       description = "Universe instances for types from selected extra packages";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "universe-instances-extended_1_1_1" = callPackage
     ({ mkDerivation, adjunctions, base, comonad, containers
      , contravariant, universe-base
      }:
@@ -241646,7 +242829,6 @@ self: {
        ];
        description = "Universe instances for types from selected extra packages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "universe-instances-trans" = callPackage
@@ -241675,6 +242857,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "universe-some" = callPackage
+    ({ mkDerivation, base, some, template-haskell, th-abstraction
+     , transformers, universe-base
+     }:
+     mkDerivation {
+       pname = "universe-some";
+       version = "1.2";
+       sha256 = "1c9pdk682xdzscq77c006x052c9jizpgja3xk0ym8n421h0k8zlh";
+       libraryHaskellDepends = [
+         base some template-haskell th-abstraction transformers
+         universe-base
+       ];
+       testHaskellDepends = [ base some template-haskell universe-base ];
+       description = "Universe instances for Some from some";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "universe-th" = callPackage
     ({ mkDerivation, base, checkers, composition, DebugTraceHelpers
      , HUnit, mtl, QuickCheck, template-haskell, test-framework
@@ -242578,17 +243777,15 @@ self: {
      }) {};
 
   "urbit-hob" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, containers, murmur3
-     , text
+    ({ mkDerivation, base, bytestring, hspec, hspec-core, murmur3
+     , QuickCheck, text, vector
      }:
      mkDerivation {
        pname = "urbit-hob";
-       version = "0.1.0";
-       sha256 = "01mrj3irlsqfxvswm00k893n6wybc6wxcqddd645wb9q5mpzdsqi";
-       libraryHaskellDepends = [
-         base bytestring cereal containers murmur3 text
-       ];
-       testHaskellDepends = [ base ];
+       version = "0.2.0";
+       sha256 = "1wyvlwhc8pv4iv2dgkl5a7vz8pyykp42fmsr3ar08q58y7k269fg";
+       libraryHaskellDepends = [ base bytestring murmur3 text vector ];
+       testHaskellDepends = [ base hspec hspec-core QuickCheck text ];
        description = "Hoon-style atom manipulation and printing functions";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -244425,19 +245622,25 @@ self: {
      }) {};
 
   "varying" = callPackage
-    ({ mkDerivation, base, contravariant, criterion, hspec, QuickCheck
-     , time, transformers
+    ({ mkDerivation, base, contravariant, criterion, doctest, hspec
+     , QuickCheck, time, transformers
      }:
      mkDerivation {
        pname = "varying";
-       version = "0.7.1.1";
-       sha256 = "03k41nik9nl3qqb4xrwfrqwc58wpdcdfmjls84fp140n2pwgd5av";
+       version = "0.8.0.0";
+       sha256 = "1m71aqa34p1f95mn0mlcm4wq12x5axwhrqnyg4wbxhaz2cmxj4yh";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base contravariant transformers ];
-       executableHaskellDepends = [ base time transformers ];
-       testHaskellDepends = [ base hspec QuickCheck time transformers ];
-       benchmarkHaskellDepends = [ base criterion time transformers ];
+       executableHaskellDepends = [
+         base contravariant time transformers
+       ];
+       testHaskellDepends = [
+         base contravariant doctest hspec QuickCheck time transformers
+       ];
+       benchmarkHaskellDepends = [
+         base contravariant criterion time transformers
+       ];
        description = "FRP through value streams and monadic splines";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -245132,6 +246335,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "vector-sized_1_4_0_0" = callPackage
+    ({ mkDerivation, adjunctions, base, binary, comonad, deepseq
+     , distributive, finite-typelits, hashable, indexed-list-literals
+     , primitive, vector
+     }:
+     mkDerivation {
+       pname = "vector-sized";
+       version = "1.4.0.0";
+       sha256 = "1rh8jjbpw8c6mprwqzd8x7n1kcm5kld3ajrrsahnm91aaw9z1cy6";
+       libraryHaskellDepends = [
+         adjunctions base binary comonad deepseq distributive
+         finite-typelits hashable indexed-list-literals primitive vector
+       ];
+       description = "Size tagged vectors";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "vector-space" = callPackage
     ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }:
      mkDerivation {
@@ -245292,18 +246513,19 @@ self: {
      }) {};
 
   "vega-view" = callPackage
-    ({ mkDerivation, aeson, base, blaze-html, bytestring, directory
-     , filepath, http-types, scotty, text, unordered-containers
+    ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
+     , directory, filepath, http-types, scotty, text
+     , unordered-containers
      }:
      mkDerivation {
        pname = "vega-view";
-       version = "0.2.0.2";
-       sha256 = "0r9l77xx0bdrpn0jj432cdrw6xw9ni09f08n70kik57raay04bnq";
+       version = "0.3.1.5";
+       sha256 = "0f120aalldbcwyyjmm6chvqgyp70lifqbas7q442qqficw7yi6hg";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         aeson base blaze-html bytestring directory filepath http-types
-         scotty text unordered-containers
+         aeson base blaze-html blaze-markup bytestring directory filepath
+         http-types scotty text unordered-containers
        ];
        description = "Easily view Vega or Vega-Lite visualizations";
        license = stdenv.lib.licenses.bsd3;
@@ -245626,8 +246848,8 @@ self: {
      }:
      mkDerivation {
        pname = "viewprof";
-       version = "0.0.0.29";
-       sha256 = "1cy1p1dq6blval791x01rpf1ihqawyj1shfgz46hmmfx1f5dlcdv";
+       version = "0.0.0.30";
+       sha256 = "0l3hf7dj9y4zr6qzih3xl3yz56pjd4gy9jfk9aqypv2rcvwh1w17";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -245638,14 +246860,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "viewprof_0_0_0_30" = callPackage
+  "viewprof_0_0_0_31" = callPackage
     ({ mkDerivation, base, brick, containers, directory, ghc-prof, lens
      , scientific, text, vector, vector-algorithms, vty
      }:
      mkDerivation {
        pname = "viewprof";
-       version = "0.0.0.30";
-       sha256 = "0l3hf7dj9y4zr6qzih3xl3yz56pjd4gy9jfk9aqypv2rcvwh1w17";
+       version = "0.0.0.31";
+       sha256 = "0qw2r89ghyxcyzl360i3h0iwfgp1cmsb5pn0kw9nprqpa2flwfdj";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -248582,23 +249804,18 @@ self: {
        broken = true;
      }) {};
 
-  "warp-tls" = callPackage
-    ({ mkDerivation, base, bytestring, cryptonite, data-default-class
-     , network, streaming-commons, tls, tls-session-manager, wai, warp
-     }:
+  "warp-systemd" = callPackage
+    ({ mkDerivation, base, network, systemd, unix, wai, warp }:
      mkDerivation {
-       pname = "warp-tls";
-       version = "3.2.7";
-       sha256 = "1h6m9jhvk4ai945p5s6sa9lxq40cn00gjfj4yiqhj2q5ymxfgfba";
-       libraryHaskellDepends = [
-         base bytestring cryptonite data-default-class network
-         streaming-commons tls tls-session-manager wai warp
-       ];
-       description = "HTTP over TLS support for Warp via the TLS package";
-       license = stdenv.lib.licenses.mit;
+       pname = "warp-systemd";
+       version = "0.1.0.0";
+       sha256 = "1cfm70dapcxd7ddxs7x0qqlv5w5kr3hasspvg292ik5f5bn40m91";
+       libraryHaskellDepends = [ base network systemd unix wai warp ];
+       description = "Socket activation and other systemd integration for the Warp web server (WAI)";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "warp-tls_3_2_8" = callPackage
+  "warp-tls" = callPackage
     ({ mkDerivation, base, bytestring, cryptonite, data-default-class
      , network, streaming-commons, tls, tls-session-manager, wai, warp
      }:
@@ -248612,7 +249829,6 @@ self: {
        ];
        description = "HTTP over TLS support for Warp via the TLS package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "warp-tls-uid" = callPackage
@@ -250389,6 +251605,27 @@ self: {
        broken = true;
      }) {};
 
+  "wide-word_0_1_0_9" = callPackage
+    ({ mkDerivation, base, bytestring, deepseq, ghc-prim, hedgehog
+     , primitive, QuickCheck, quickcheck-classes, semirings
+     }:
+     mkDerivation {
+       pname = "wide-word";
+       version = "0.1.0.9";
+       sha256 = "0k8v6iggsrbmmq82b4zziyg9arh6fvwqsfid15nnycdfgsaafph3";
+       revision = "1";
+       editedCabalFile = "1d9ahyjh7wjpr7llmvj2r7y6c0gl91yq501aj9c5qfpyhbc59jzl";
+       libraryHaskellDepends = [ base deepseq primitive ];
+       testHaskellDepends = [
+         base bytestring ghc-prim hedgehog primitive QuickCheck
+         quickcheck-classes semirings
+       ];
+       description = "Data types for large but fixed width signed and unsigned integers";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "wigner-symbols" = callPackage
     ({ mkDerivation, base, bytestring, criterion, cryptonite, primitive
      , random, vector
@@ -250761,8 +251998,8 @@ self: {
      }:
      mkDerivation {
        pname = "withdependencies";
-       version = "0.2.4.3";
-       sha256 = "1km9mrasxpzpkrm1cb5s06iwmqd33dmiwld8syx1f7rq9l3pk8d7";
+       version = "0.2.5";
+       sha256 = "13xdcn9fp1nc5378vmjbjwpw4n19bnnfrgr729yh5s366f2cfiv1";
        libraryHaskellDepends = [
          base conduit containers mtl profunctors
        ];
@@ -256907,28 +258144,6 @@ self: {
      }) {};
 
   "yesod-form" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html
-     , blaze-markup, byteable, bytestring, containers, data-default
-     , email-validate, hspec, network-uri, persistent, resourcet
-     , semigroups, shakespeare, text, time, transformers, wai
-     , xss-sanitize, yesod-core, yesod-persistent
-     }:
-     mkDerivation {
-       pname = "yesod-form";
-       version = "1.6.6";
-       sha256 = "16m7m7yixsnka926znjy0xn0kp30mbvjq2f46rh987kdr28dks9p";
-       libraryHaskellDepends = [
-         aeson attoparsec base blaze-builder blaze-html blaze-markup
-         byteable bytestring containers data-default email-validate
-         network-uri persistent resourcet semigroups shakespeare text time
-         transformers wai xss-sanitize yesod-core yesod-persistent
-       ];
-       testHaskellDepends = [ base hspec text time ];
-       description = "Form handling support for Yesod Web Framework";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-form_1_6_7" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html
      , blaze-markup, byteable, bytestring, containers, data-default
      , email-validate, hspec, network-uri, persistent, resourcet
@@ -256948,7 +258163,6 @@ self: {
        testHaskellDepends = [ base hspec text time ];
        description = "Form handling support for Yesod Web Framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-form-bootstrap4" = callPackage
@@ -260379,4 +261593,56 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "zxcvbn-dvorak" = callPackage
+    ({ mkDerivation, base, base64-bytestring, binary, binary-instances
+     , containers, lens, text, unordered-containers, zlib, zxcvbn-hs
+     }:
+     mkDerivation {
+       pname = "zxcvbn-dvorak";
+       version = "0.1.0.0";
+       sha256 = "07sz5vwgh7vxlr0z2v7bml8j2gy0l2pl62frgl8r211dzjmd7q8m";
+       libraryHaskellDepends = [
+         base base64-bytestring binary binary-instances containers lens text
+         unordered-containers zlib zxcvbn-hs
+       ];
+       description = "Password strength estimation based on zxcvbn";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "zxcvbn-hs" = callPackage
+    ({ mkDerivation, attoparsec, base, base64-bytestring, binary
+     , binary-instances, containers, criterion, fgl, hedgehog, lens
+     , math-functions, tasty, tasty-hedgehog, tasty-hunit, text, time
+     , unordered-containers, vector, zlib
+     }:
+     mkDerivation {
+       pname = "zxcvbn-hs";
+       version = "0.2.0.0";
+       sha256 = "1524j8mgvp26cz4n4cd1vyslniw0xbw9ngrgkcyj3jmkh6p53ngh";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         attoparsec base base64-bytestring binary binary-instances
+         containers fgl lens math-functions text time unordered-containers
+         vector zlib
+       ];
+       executableHaskellDepends = [
+         attoparsec base base64-bytestring binary binary-instances
+         containers fgl lens math-functions text time unordered-containers
+         vector zlib
+       ];
+       testHaskellDepends = [
+         attoparsec base base64-bytestring binary binary-instances
+         containers fgl hedgehog lens math-functions tasty tasty-hedgehog
+         tasty-hunit text time unordered-containers vector zlib
+       ];
+       benchmarkHaskellDepends = [
+         attoparsec base base64-bytestring binary binary-instances
+         containers criterion fgl lens math-functions text time
+         unordered-containers vector zlib
+       ];
+       description = "Password strength estimation based on zxcvbn";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
 }
-- 
GitLab


From 742348dff5d3704190754820b482aac4a3a1a52e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Sep 2019 18:18:06 +0200
Subject: [PATCH 0560/2254] git-annex: update sha256 hash for new release
 7.20190912

---
 pkgs/development/haskell-modules/configuration-common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index a3cffdb8a1d..6dab3cee350 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -69,7 +69,7 @@ self: super: {
       name = "git-annex-${super.git-annex.version}-src";
       url = "git://git-annex.branchable.com/";
       rev = "refs/tags/" + super.git-annex.version;
-      sha256 = "1795sad0jr2da2pn28nbqsvpld6zw8gf9yscywixkbabf7ls66fn";
+      sha256 = "1ackqjkwkfm3kazlyy4nwdjf6wwjlajql1hrznaki5138nw4gxs4";
     };
   }).override {
     dbus = if pkgs.stdenv.isLinux then self.dbus else null;
-- 
GitLab


From 43dc5c0e8f775e182fbdaa70ffe2fa46cb531c1a Mon Sep 17 00:00:00 2001
From: talyz <kim.lindberger@gmail.com>
Date: Thu, 19 Sep 2019 13:15:22 +0200
Subject: [PATCH 0561/2254] nomachine-client: 6.7.6 -> 6.8.1

---
 pkgs/tools/admin/nomachine-client/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/admin/nomachine-client/default.nix b/pkgs/tools/admin/nomachine-client/default.nix
index bc9aa6bf379..e8efc7d9cfe 100644
--- a/pkgs/tools/admin/nomachine-client/default.nix
+++ b/pkgs/tools/admin/nomachine-client/default.nix
@@ -1,10 +1,10 @@
 { stdenv, file, fetchurl, makeWrapper,
   autoPatchelfHook, jsoncpp, libpulseaudio }:
 let
-  versionMajor = "6.7";
-  versionMinor = "6";
-  versionBuild_x86_64 = "11";
-  versionBuild_i686 = "11";
+  versionMajor = "6.8";
+  versionMinor = "1";
+  versionBuild_x86_64 = "1";
+  versionBuild_i686 = "1";
 in
   stdenv.mkDerivation rec {
     pname = "nomachine-client";
@@ -14,12 +14,12 @@ in
       if stdenv.hostPlatform.system == "x86_64-linux" then
         fetchurl {
           url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_x86_64}_x86_64.tar.gz";
-          sha256 = "1mka0a7p03y53zsf0srrcj4f7sigda5vndrwqhr0vncc2qws03k0";
+          sha256 = "07330sxqjmzdn8kwxn9r49j28lsbp7mmrsxcyl8r32c3g355wskl";
         }
       else if stdenv.hostPlatform.system == "i686-linux" then
         fetchurl {
           url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_i686}_i686.tar.gz";
-          sha256 = "1g94s65bp99nfmzvwv1wasvjhgjbfg9jkc089qimi0lvr8ajabkx";
+          sha256 = "03b2648nzmc2amgrqflsxihx5yjp7rz906g655az4j2hl7y0b0bs";
         }
       else
         throw "NoMachine client is not supported on ${stdenv.hostPlatform.system}";
-- 
GitLab


From cf56cefd95eb6f0ead3856ed69299b8ae7153712 Mon Sep 17 00:00:00 2001
From: Alex Rice <alexrice999@hotmail.co.uk>
Date: Thu, 19 Sep 2019 12:27:05 +0100
Subject: [PATCH 0562/2254] xterm: Set default to xserver.enable

---
 nixos/modules/services/x11/desktop-managers/xterm.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/desktop-managers/xterm.nix b/nixos/modules/services/x11/desktop-managers/xterm.nix
index 1408df31295..f76db278a92 100644
--- a/nixos/modules/services/x11/desktop-managers/xterm.nix
+++ b/nixos/modules/services/x11/desktop-managers/xterm.nix
@@ -5,6 +5,7 @@ with lib;
 let
 
   cfg = config.services.xserver.desktopManager.xterm;
+  xSessionEnabled = config.services.xserver.enable;
 
 in
 
@@ -13,7 +14,8 @@ in
 
     services.xserver.desktopManager.xterm.enable = mkOption {
       type = types.bool;
-      default = (versionOlder config.system.stateVersion "19.09");
+      default = (versionOlder config.system.stateVersion "19.09") && xSessionEnabled;
+      defaultText = if versionOlder config.system.stateVersion "19.09" then "config.services.xserver.enable" else "false";
       description = "Enable a xterm terminal as a desktop manager.";
     };
 
-- 
GitLab


From b08ced9110398606f5d9881bc2bc4fd2f2e24404 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 19 Sep 2019 13:45:42 +0200
Subject: [PATCH 0563/2254] haskell-cabal-plan: add override to fix the build

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 6dab3cee350..dde4092327b 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1228,4 +1228,7 @@ self: super: {
     '';
   });
 
+  # The LTS-14.x version of optparse-applicative is too old.
+  cabal-plan = super.cabal-plan.override { optparse-applicative = self.optparse-applicative_0_15_1_0; };
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
-- 
GitLab


From 55bf3b482cf6ca9b7c417217d5255873a65a9b6b Mon Sep 17 00:00:00 2001
From: Georges Dubus <georges.dubus@gmail.com>
Date: Thu, 19 Sep 2019 13:47:06 +0200
Subject: [PATCH 0564/2254] httpie: add missing 'setuptools' to
 propagatedBuildInputs

As a side-effect of f7e28bf, the build no longer propagated 'setuptools', which
is a run-time dependency. See #68314 for further details.
---
 pkgs/tools/networking/httpie/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/httpie/default.nix b/pkgs/tools/networking/httpie/default.nix
index 6395fcf09eb..09a9ade75ce 100644
--- a/pkgs/tools/networking/httpie/default.nix
+++ b/pkgs/tools/networking/httpie/default.nix
@@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication rec {
     sha256 = "103fcigpxf4nqmrdqjnyz7d9n4n16906slwmmqqc0gkxv8hnw6vd";
   };
 
-  propagatedBuildInputs = with pythonPackages; [ pygments requests ];
+  propagatedBuildInputs = with pythonPackages; [ pygments requests setuptools ];
 
   doCheck = false;
 
-- 
GitLab


From 4e626be87de81fb20a30853a38736be7f0ed4fcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maxime=20D=C3=A9n=C3=A8s?= <maxime.denes@inria.fr>
Date: Thu, 19 Sep 2019 10:34:27 +0200
Subject: [PATCH 0565/2254] ocamlPackages.ppx_deriving_yojson: 3.3 -> 3.5.1

---
 .../development/ocaml-modules/ppx_deriving_yojson/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix
index 53e8265c3a7..d8a8f22ae70 100644
--- a/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix
@@ -4,7 +4,7 @@
 
 buildDunePackage rec {
   pname = "ppx_deriving_yojson";
-  version = "3.3";
+  version = "3.5.1";
 
   minimumOCamlVersion = "4.04";
 
@@ -12,7 +12,7 @@ buildDunePackage rec {
     owner = "ocaml-ppx";
     repo = "ppx_deriving_yojson";
     rev = "v${version}";
-    sha256 = "1gbfziw03r9azqlsmyn6izrgrf1xc30s88jgdany1kblpgq41rsz";
+    sha256 = "13nscby635vab9jf5pl1wgmdmqw192nf2r26m3gr01hp3bpn38zh";
   };
 
   buildInputs = [ ppxfind ounit ];
-- 
GitLab


From 0c00a15e75327b5eb40650f9c66858b466a91113 Mon Sep 17 00:00:00 2001
From: Tobias Happ <tobias.happ@gmx.de>
Date: Sat, 10 Aug 2019 11:59:26 +0200
Subject: [PATCH 0566/2254] liquidprompt: init at 2018-05-21

---
 pkgs/shells/liquidprompt/default.nix | 32 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/shells/liquidprompt/default.nix

diff --git a/pkgs/shells/liquidprompt/default.nix b/pkgs/shells/liquidprompt/default.nix
new file mode 100644
index 00000000000..62efabb022c
--- /dev/null
+++ b/pkgs/shells/liquidprompt/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  pname = "liquidprompt";
+  version = "unstable-2018-05-21";
+
+  src = fetchFromGitHub {
+    owner = "nojhan";
+    repo = pname;
+    rev = "eda83efe4e0044f880370ed5e92aa7e3fdbef971";
+    sha256 = "1p7ah3x850ajpq07xvxxd7fx2i67cf0n71ww085g32k9fwij4rd4";
+  };
+
+  installPhase = ''
+    install -D -m 0444 liquidprompt $out/bin/liquidprompt
+    install -D -m 0444 liquidpromptrc-dist $out/share/doc/liquidprompt/liquidpromptrc-dist
+    install -D -m 0444 liquid.theme $out/share/doc/liquidprompt/liquid.theme
+
+    install -D -m 0444 liquidprompt.plugin.zsh \
+      $out/share/zsh/plugins/liquidprompt/liquidprompt.plugin.zsh
+    install -D -m 0444 liquidprompt \
+      $out/share/zsh/plugins/liquidprompt/liquidprompt
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A full-featured & carefully designed adaptive prompt for Bash & Zsh";
+    homepage = https://github.com/nojhan/liquidprompt;
+    license = licenses.agpl3;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ gerschtli ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6c7873b23be..052eec299d7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7177,6 +7177,8 @@ in
 
   ksh = callPackage ../shells/ksh { };
 
+  liquidprompt = callPackage ../shells/liquidprompt { };
+
   mksh = callPackage ../shells/mksh { };
 
   oh = callPackage ../shells/oh { };
-- 
GitLab


From 727aaae1bb3125b97dc20267bbd2e27f09ffc200 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Thu, 19 Sep 2019 14:13:04 +0200
Subject: [PATCH 0567/2254] python3Packages.python-language-server: add
 setuptools as a dependency

---
 .../python-modules/python-language-server/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-language-server/default.nix b/pkgs/development/python-modules/python-language-server/default.nix
index 6b25ba93ef9..76508d1ec96 100644
--- a/pkgs/development/python-modules/python-language-server/default.nix
+++ b/pkgs/development/python-modules/python-language-server/default.nix
@@ -1,6 +1,6 @@
 { stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, isPy27
 , backports_functools_lru_cache, configparser, futures, future, jedi, pluggy, python-jsonrpc-server
-, pytest, mock, pytestcov, coverage
+, pytest, mock, pytestcov, coverage, setuptools
 , # Allow building a limited set of providers, e.g. ["pycodestyle"].
   providers ? ["*"]
   # The following packages are optional and
@@ -44,7 +44,7 @@ buildPythonPackage rec {
     HOME=$TEMPDIR pytest
   '';
 
-  propagatedBuildInputs = [ jedi pluggy future python-jsonrpc-server ]
+  propagatedBuildInputs = [ setuptools jedi pluggy future python-jsonrpc-server ]
     ++ stdenv.lib.optional (withProvider "autopep8") autopep8
     ++ stdenv.lib.optional (withProvider "mccabe") mccabe
     ++ stdenv.lib.optional (withProvider "pycodestyle") pycodestyle
-- 
GitLab


From ae20db1f21cb215c22e277c6a6462f34513feaf9 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Thu, 19 Sep 2019 21:43:32 +0900
Subject: [PATCH 0568/2254] firefox-bin: 69.0 -> 69.0.1

---
 .../browsers/firefox-bin/release_sources.nix  | 746 +++++++++---------
 1 file changed, 373 insertions(+), 373 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index 38670735110..93259332bfb 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,935 +1,935 @@
 {
-  version = "69.0";
+  version = "69.0.1";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ach/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ach/firefox-69.0.1.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "300639491b6ca69d7f594df35fbaae3f0e452f8c5280aee71f64ebfdb2592f3948ea2b936f04f01660e3b296e07650b72c583771a90902e62ca3efaea67d291e";
+      sha512 = "100d7c9523102d3c4fc07ccb3950a9bf6caa096061c9b5e49d960f89ad6e2a8aa032e8a91ddd4bdda1d4eb8442ceb393dc6b31da11c5a86bfe9c7907bdf3a566";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/af/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/af/firefox-69.0.1.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "5da9dee3ec659045f282dd76c821cc62ac20fda014ce04fdd756ad0ebbba73f054f520f89e227c5b6590255e275d0cdece2c2c16e42733c7395ecde18f42f2f4";
+      sha512 = "ed6e066bd58d84d8e9a240e02b984ab7a52e1646dc4bad7470666e26aebb004b6ef5d43397457c82b4a7b0fa04ad0cc7dcbb662ad721e3c82563104955502627";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/an/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/an/firefox-69.0.1.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "7ef4a311136988c57194e9388862f68b30cc4e5f9c4303da4105389188abb4453f592e9d0819b337e7ef9b482a76df19a9d84a06eeb287f93dbc7e43a41bda15";
+      sha512 = "7b75c42de08df56741778a0b01345238fa276ef2012b06cdfa54159b8559b37910b50277335d68d7b0870de36a04c24fcd83132999faa9d7c4e089511018acce";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ar/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ar/firefox-69.0.1.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "a16636cfced17bccf2932e14c6b4c2260c713c538d774802c1dc8598bc47635238549a4332c4cf69b3d3946397bc8f2ba5b330be5716dbb8a81570bea1acc5e1";
+      sha512 = "7f0266be9bb2b34189ee2891be11907720a248fbd11855d5a99bf54ef439756ecbd201a4d52a21b24b89ec23f1254b4ab15fd02d7511fcfb7d71eca9adf3a852";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ast/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ast/firefox-69.0.1.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "2239a47cd8869cb7cd50820e1faef0eae66245f04cab81e36250b4be1ae3e7619a994b68c2256777636f8da8fb10aee781715b11bbd7ea857300b7a5afcb085f";
+      sha512 = "d4681a2280549b3fb0384b5ae6a98ad9785921fa65d4a83fa967fe2d05363ed0ba8348a7621c0cc104a2da9efd97feddb38ef1ac6901c08ae3d9dd649e5ad30b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/az/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/az/firefox-69.0.1.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "d79ad1be25e9eb3123ba89a5589abfdc58e161bf3ab0c90ff3306639f1a43bd80b9175695f7d5a24aad7c3fb16a616bb90eeb67d2f3f820db5b5b5556e774cf8";
+      sha512 = "c19cedc18719ad6d5723a546be1e9d3aac2e408fcb94fba28aec9e1856250257422407cb945cf516bd0f86ebc1ebd1c06c28713cc6ff49691542fde660fab53b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/be/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/be/firefox-69.0.1.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "38b340353be185502214945665b846ca73f1ace1528f0426ae702d8dda88a104f79a879e99873bc9f418a753572ab3bd597a9f820f0e0e94daeb21e05793b90a";
+      sha512 = "e6e4ae0eae225ff64595df0c7038c750c8b3b245c9aa76afdf3e8a2ad9fbb6e324630c73801974f515ccbe315fffe797df3e087412c46e2507507c88311c8a82";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/bg/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/bg/firefox-69.0.1.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "addf46d8ac6a823d9f1a00e55bd814abb27732484560399aacc7f704fcfbc7d239380c0857df7a4d445fac8724caada49981c2dd4ee288f47c63a7613aefed9a";
+      sha512 = "4d2869b82e4f577acc0933e828f72856c55c4d0771bd938a888cbcb6af5ca319f03510cc96249f220d31b6786426c40726e1509beb40633d995bcdeae8299c7b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/bn/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/bn/firefox-69.0.1.tar.bz2";
       locale = "bn";
       arch = "linux-x86_64";
-      sha512 = "3d0e90b85b5d91f01ae4e84182d071f9b07436a3d9f088ca9178a72140a7d3fcd6c1506b7899ec7bc6ef82a6dd132ea5345c2c8b41c1e2977a5d1aa95f916453";
+      sha512 = "b01ecf839f6c1e028593c0338132931b39af29b2cbb414d08b29379832300abf4a423566935946b52d4ad4aa04d9d670e41cc11f1989b1e913201f8bc631f786";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/br/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/br/firefox-69.0.1.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "aae8493b79569b0e096193c05de56197e01c9f8f7e89b8db2d021bed6ab6e553af4e44c36ad66d427e80840e631d7b85f8c9d1c5ca17fd0bb94a0bfdaab94d7d";
+      sha512 = "62e0603e9fec08ff0babf25ad38aad703806b43f8b1aa4b986f41a74623fd59dc18b6b230219ac93767924264a45f7ffdc6c41243e888bef786e0e14d6631718";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/bs/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/bs/firefox-69.0.1.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "19efd698f911401b32b3affa6e5a371566eca8aaafde96e38704e48871f69d4e6c4c3a8f189519f8b8022ad2782ea5076e53e75db9c1c12e504eb31c827c243a";
+      sha512 = "c2020ea412b0852f7904ea9371bd3851bda9e0cf006a582a1427e8c9e412991bce7a0a6febf0632ee58a9da10c7b329cafc30caa8dcb5a2b12837465886be175";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ca/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ca/firefox-69.0.1.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "527d672c469bbea18d727e276fd53ca26d65a169f665b32190c6db47c549e7e3155dd04c65fb2720e1d45658a3c8c1f2567f62fc807a8993bf00a2cf280db548";
+      sha512 = "35c4a61866b37d7afb1cb5e78997b5467bf1d9810db7d4b651d4144132c6b52b6dc5091217787a6a71088b814c3454757eb4f741ec3c3c24462892da77600f73";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/cak/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/cak/firefox-69.0.1.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "def5f01b180c354ecf2248d36f12778a2dbb5df8e376bc1eff4eefe3cb3b383cdb1b03b7a83784325ecbef330e5449687b36cbd239090973f1bb3098717bc2ff";
+      sha512 = "273c8f0e40187f88368e4049a66052b230594939c85ee00e48dfd7760a4093735f91bf4e3eeb14d1c92266068c9994599d3a3cc271206e449e715c1c3d038aad";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/cs/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/cs/firefox-69.0.1.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "5490aff5d9c693e22104607dd8ef342fb3ed79905995854930c7eee876cb2da3f940bf339570b68f008557ea16312af614ef65895a6831c22849e9818ea91b52";
+      sha512 = "3dc3657c494f3b954236dd330e2c2137b5500bea5a0b4ef2052c7050c0ab23e9b773090843d459c9c259d0eceae0524b0e4ebf6f02883d8419bd05901943d9f0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/cy/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/cy/firefox-69.0.1.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "9b5e9518f89a9777150fecb25951ca02c232b526784161a8b55aa09b4cab9ed23743dbf62c5f365802beffab4c62d5991da83b138889d7894e5f1b1dc2edcb17";
+      sha512 = "9ba021a9df417c36b8ee10afaa95595d19897d11485407e9e3fb446c16a1cd31c683014917da608a721a583efd008c0771d13c642c8d94913bcc21227966ae6e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/da/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/da/firefox-69.0.1.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "9482ccaa5e3ab92522f60a28571c020c3acce55acbd7c38d7d4f7559396cb71ea96a47210213d1ff15a0d97fbb1a3b6e07453d09ace9cdbee13381fb68829bed";
+      sha512 = "c6eb2a98e0dd59dfe196d0b8f149aff109e1272199e215fd09d14a614697bc8652fb0442505cfae8a9f2bc0dbeec00bbbe73a7bc737e534f2f230a356137835b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/de/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/de/firefox-69.0.1.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "055948aa2b9ef551d0348b4a24437648cf7613446cabf1290ce429c0ed70c7f2b81ca82f0dbbe9359a0bdb6cce673f9472a3fe74e1ef8359ff3fb8903763a7a3";
+      sha512 = "a689581f54c278d217c7ae12d770ad1caa686db1fb5138ab3a34c14848b717256d0f09ba8cb5bbcb2472fec73b01e0a5aa4d5b869c7a2f388d8d54b2216b68da";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/dsb/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/dsb/firefox-69.0.1.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "a19cc34132f07635eebfc0d521c0177cd24f8c800f9be2750e2e653e8732fb93b39343eceefffacfbebed5656ad4ba0fb05557bd55e993f27c3327b171020f81";
+      sha512 = "d33f730bb3727756f982bdcd35e0858cd0d5252594e14ed670324c9d5a1b4a87aa1391bf1e58759a0adf9fae896aa8de7a3258267b40dd96e957efaeeb9abd4b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/el/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/el/firefox-69.0.1.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "f70a195f748c546fd76f5f2e73a379eda8a079475b3e03e67af41c8b0da1ddeb70c335ffa3f6019b406e49944c329eee1ac600d8fcd2daf393d0348d8bbb8048";
+      sha512 = "4d040b92aa3f06e718ffe0f2dcd477d915dd3959087d0e98bffa7b14fcdd86a74b50be23df1f47ceb4ff9c63564d09a22217bb91f4eb3419b77c0dca12a1bebf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/en-CA/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/en-CA/firefox-69.0.1.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha512 = "eac808b225a6ef8162ddf82d8f975d8c0c77a4f8aec110fec017dad38ee4070d4a754f74566cbfe4d8dbbd65a022e1f168c2ffbac3f8ce84f10fb3eafcd114e8";
+      sha512 = "390700c7d7fb2c38d6082e91b6c5ad4d1cc4912eb88ae3f207745e88c72ca6a169612be19d984438dd784e8b2e56ca2ea6ab9a3fa1fe6e8253f3e96278eb3dd3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/en-GB/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/en-GB/firefox-69.0.1.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "ba5d57b5596aef987b07354db04bd930fee66a58672c246c9769b2205f96f8d80360d1d212e560a7897ecca95f0b10385eb9d947c4b71126cae5d4893a2a7a47";
+      sha512 = "d719c4c84a62fbaac67ee90812e6922f5b5b7ba08916740d06bf4780d818698a3c46e82c483d0ecd8b4ea040c53a69aebf31ce8c8c4e68dc32e0e27032704c74";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/en-US/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/en-US/firefox-69.0.1.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "f4f57ec920bed699a986512dac01adff30fa446ffc35b50039f9b321d4c5a1ede9ccd311f81aa3b7a0ed844a5ba4de1e676ce50bfe138f69f786e6d86afa790f";
+      sha512 = "ccf48f7ef61bebabe3e583e2d08a5c9ced3ea4c10b7d4febd64108cb89c9905076d69482056ee5a20dcc6c2e9bba9fee6d3f02eb54a390f0df444e24b3fd8443";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/eo/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/eo/firefox-69.0.1.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "0697adf7b3b68b1b11018c690868a28389c2579f96886d5e2d70c7a66abd14778291e2f7efacb3467022dfcb0368bd2d04814aadc7356a536791e0613026db2e";
+      sha512 = "4ddb06d38c53e24fba796a16676b85d74713a3c324b8f44bc66cd2ab8d3a26204627e0be0b0fddb27ff414360330fba78dcba2ee0cc9691621a1e4ccd7a3d046";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/es-AR/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/es-AR/firefox-69.0.1.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "0adc717397ddac8b49e5d86bbd702d122ce0f09add74b2246a98d2b686cdebfecef1011dfca5b54752671c7019b153ef9994e983cdcb78023b35e166177bd6c0";
+      sha512 = "e00e8bccd62a45ea959d0d826dc814964b4953343284e4d54d0acb4623d2369e7efdc96cf61028f8309bfcddb9deec4ce20ba10c3613e4a6e686ded9617ec1bc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/es-CL/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/es-CL/firefox-69.0.1.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "fa5fbee9d58121faeb0d3a2d17375410e7eea9e7a92b0f803c7b922c936b78cb8db55f9dc6745d9fbe12474a5baba5e7c11e2a83426b19c29bad0262cd046fd3";
+      sha512 = "63bbce2c62e331ac92c7501e80d661edd686ff7feae714c32e1dcb8afec829bbfb0ed188138b5655ce5ba479767a58ffae1a367703f80c683c371f707286623e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/es-ES/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/es-ES/firefox-69.0.1.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "40d61b149da156b3008b131a9a4cb46a00c05a700e72a84575ce33f0b6dcf0bf317f64f54c1b0a0e6b03e817afdead048c530ff068da3cf8cb4ef53d60e57ea9";
+      sha512 = "90c11f172ecb14a38e851558ace78ffd81a0ad10966e9b338c2394485c6460f81ab9f83824e204cab212d77cc56d066d8ddfd9686a3f6791ae9a8d99009d6b0b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/es-MX/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/es-MX/firefox-69.0.1.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "518bec00e953c8adb7f5c7a0ea460b9d92b0b001f960e31ca5ef1771e74309782056760593f7f976795acfe020498b67d94f80f87fab37469b0c219e86c0158e";
+      sha512 = "13660d6449512791b4e8cf2b5d7f658d5716c1de5ae80f43893be351ee0de71ad21b135902056422325f9367e778ee31006f9120bbaeed19e9e3af36a20a7a4c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/et/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/et/firefox-69.0.1.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "7a5fd6b36dee306446d94d33150004115da55002ee11ba1daebc6cef7d1485e023dc08d9cfdc419d76b7c1335bd7e0f24f3cf197a31003c71569111f5edcc316";
+      sha512 = "db6ae24e866a32802e9ba9fd35b5fb7bdb63e1f0c8c3aa74d97d6d3e732123a10260794e03af30bac13c71d82b71d72057c0c32697f5efb78d35f55c088f6514";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/eu/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/eu/firefox-69.0.1.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "5ac8e602ee20afaba5b7501ecb3af0cc4358d61a729299eb6189a932af19d86f409b66853576ae4c259bb14df43003b395dae7f713572babce62bc549b7ef0e6";
+      sha512 = "da166bd2be438b767af8c3566a7721a50df66572182c5504654be234b486027e1044186e3d2dcb43b2505ccb989f91556d19228f5e30ff4a05beb6f18911cb3a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/fa/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/fa/firefox-69.0.1.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "7e0e98538caae2345b88e9e9921b1eb3e8d4e226950aebe6a9b6d927aab47d40e59ef93fa33b0b175460db44e906e64e3f4974706ec0b3d85a3e6ed1adc99a52";
+      sha512 = "c05f526f70225dd91bd38b1d74fbf0217b12919173582262739fbd97b4b556c3d820ee38bb0c33da37cfb26996a882ebc3498faa21141290722eb07dc586b878";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ff/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ff/firefox-69.0.1.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "02cfea4fe949c4105d5cf2836de867c21c9ca8fb73cf0b3702493d409cb36a70f9f195c53d755840d7696500ea7e1a03f4bdeeafaa67833ff60aa96d854b14c1";
+      sha512 = "15385e03ad168f2be63fc30c871617d7d673b53181bea0d592b48d52c172d74b978e84cf1403272e5fa9fe03900f8d1118f9ccf1dd70cf0a7da7af7ddd6fad4a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/fi/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/fi/firefox-69.0.1.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "470e499c26f9120d68904775e9ec2396020b91dfae504bdd6219d2932e5588240f9f25458425895c2d74fd6aa4c9c525f117f0a0f69adf98703af2570cec40b5";
+      sha512 = "fca2397499ab573ff33f14dc2ad61ccd4d0ca711493545e39fba143e65e2d883d9b7317330ca8b8bc7345d74ee5eaea277cef5f1b88b1456b99c8b5f6bc5ad52";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/fr/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/fr/firefox-69.0.1.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "44f4df351b0a34bd3126753a785f9a36856686d9df9648c9a3a1f678dcbca9585c19b576d6deb31967aa9448ef45aaf602558e87040ef19d1cb812d42c5894d1";
+      sha512 = "262f3abd56f9f5b1b6a90f779c1ec233c684a1a71b783eb8fdace2bcd323fa8328dff5312e43458be1418d77109f7e677e9442dc10289064179955015f076fb4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/fy-NL/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/fy-NL/firefox-69.0.1.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "1f336759e304747cfb6932dd433c31123b153a04b4600952d0dc622b442901e1642acba220508373b915caff68e87e026ef54e24eb5c001a1e6e3f4d1b9736d7";
+      sha512 = "3159e601d22b6b3f5e0d80d0950d03f9f707903a378abe622acc88c1dfccd7bb3d439b370d186460ad4197dade467fa153573da2efef31825f757bc5f5aa1912";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ga-IE/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ga-IE/firefox-69.0.1.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "dc0109a75094fe53caa78bb5c02257118aa9c992b4633cecf8a6e60a5daf4fdf488aa5e5309233aa1882bf69e3c8a01a527c2e2878ab9655c4810b3e54244ba9";
+      sha512 = "46ac2bd25b600d801d2ff34b9b802a5830ec69fa69315c98217350462104eb73215ef8130f2987fdf8900ef45c91ea0618ba40ee8916406fb579b41462dc1a26";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/gd/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/gd/firefox-69.0.1.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "69362cd2b58066646dc62ad0022d82ce6b010ade0abbf779d7d3ed7b9bf6ee808c848a9404c3beb966751d3aed0d3a5da2be3f2b262580e8b6211a3f8444727d";
+      sha512 = "ad36cd4d42a29c9ab9d9e7e15e1827fd2ee7799f0484698c62bfba5acd2b0db89f66f7d40a5cf55012708e756cee43653211dff95c28a5a04173c83c45b0e4e1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/gl/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/gl/firefox-69.0.1.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "787a3a454d59daabd81cc734f15232622f3e2cd0253c98c10fcfc5eb47b8d329f89740474f7f754ab6f17bcb50e1fee38012df9183e061629490582c677da68f";
+      sha512 = "46ce314704d19f6572568b3a01e975a01c63bb075f8d99c7e04ae01982ac42d61cde92619beb30c04a778f009c56f98e2c05d7549d4ab9843349f85321532755";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/gn/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/gn/firefox-69.0.1.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "cf05696e4b0e3ba6c9316166f56e99505d4419062d77cc0438d0fbb66729d354c59026018828ec7d46db4f99e6367dea9911d4bdf7e80ba68fe32f8e0d5c09c3";
+      sha512 = "ec4afbcb087157ee7c0b487ba72fbc3469e53522cee6a3e53d0dd88bb063d2ba6811da51dcefc696924ad79bb352440d2c5d91fecd87a72436508ad37ba9e86b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/gu-IN/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/gu-IN/firefox-69.0.1.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "0b38a698358012e0cc3ff1091b82d1eb82673f124b34ee4156cc36bb49d5d69efc32874de2a2050339e73d6f386f6d4a468e6d906be0b22567b867dde7e0ff9c";
+      sha512 = "a736f01bad98b99efb41d7d516f156ff6806b5e1489cbaf799c651efe641b5191742c1372459081abfc8e75c63d0832ab33037e3ef7a5fd07d943a02af60aa4e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/he/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/he/firefox-69.0.1.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "8250cf4c8b18edb35e8c601cb6df8bc7825a96064064b6d46a6dfb77e297c64dcc7a2f7937750d4734ab56f843a65b6174b4c9d523f9b5877e0e26ce9fecae01";
+      sha512 = "73a56b235d0c5a7c69e51a52ded8477b606c2a3eca9686f1f07a2407de1c3e00ea06364912b8f8f90734a33d7d6f68b64b7693876b1b47426713bc49355cbf86";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/hi-IN/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/hi-IN/firefox-69.0.1.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "a0262214be3ebae877300b54720b4b74defe46bb641b989a1d65df02c62d78d51274386b0997a45189fa86d5974e56670a852d24d76a655baebd3c5aad8149db";
+      sha512 = "1d531f68e03763d49c03308d2cd04a84ad36afb3d19f7abed8528c39e7ac089912e569e20d3f6e177db5b17344d7c5389b7f0b2c9cdea5cc1be03983b2016c4b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/hr/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/hr/firefox-69.0.1.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "a5254f81f1ae432b50ac9b0a1732134b32bd460502baf51eef7242c37b37f2a6f0cfb6ce9c10bc3ce6ce509287fde824bede15534b010ab2f55721e43d85a8f0";
+      sha512 = "cef89e675a547a753db64861e4d6c65ca6faf87e573099907aabbc6f7fa1a4b9f8e3fcb0de44956fc95ae95a9bab98432879c3273c800ed4cc5e363cbbfe5e02";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/hsb/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/hsb/firefox-69.0.1.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "7081a889a6689e2d6fb4550474840085724cb4a583a9618a03a88ebca706ebdd32ccadd64ec8491332e342293634903ee52122ec9a5e49efb0f3cc8c09ac891c";
+      sha512 = "f038d4752c3eee035cb95a657ce4588c20ac32438d578ecc86520f3a0da6f89135a55b3afccb7aca833a9845742ef7cfed7638a4954697b3826fc97582190de8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/hu/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/hu/firefox-69.0.1.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "0a6bd225ee22562da294a0a6753949f6e627d1076579c514b4c93719cd0acfab90ce28c241d05cfa58a9b723610169f7e3a8b65dcf3bce7615e56cede10f0064";
+      sha512 = "e66afc6d0108a36081f18d18c59f87b529ecad7d97b14916f2bcf38f19edfd61d6bae7c0c7fcee211484abe9ab003f432b7c56be32889c129fcace827e592c03";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/hy-AM/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/hy-AM/firefox-69.0.1.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "dc21bc95a2ef7e66b04fe9900458754db5fe51047b3e166a48bfc1c6c7d8048846049356778515556be0184b5f40a08b29bffb27eca2d85cf90e47c42a9ff086";
+      sha512 = "6ed9a940ed6c5c699b0647ff340f3b81a68cd99c3c8e6acaa7f0b7c2f35a9eb41402951834769426cafecfc44f5e3b66d21f046ac470b43d2507165d01c7ec3a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ia/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ia/firefox-69.0.1.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "b2ab4096778dab01ec722c90daabdd8b0a892de1cd01ffc2bf5b6c403a74bbb6ab1180b1331635861c29b05db9662ec1d973d8506170c7227d574848a6281678";
+      sha512 = "f617f7077ed05f72c1eae5677691e5a62e6728d1c9d4fc92684306c072d96b6459eb014e23738e589d132f1e798ef36356fc40ce1f55972f43205a332a0e173e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/id/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/id/firefox-69.0.1.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "a416e7ff14facaf80a8edec2b1100f65bd4ca13b6ba10ebd8ca181c65683deba962c276b4b32372f9d8aca33213ffdc882ede3c8bf6dac883c819b85ae84789a";
+      sha512 = "8d08c251b0890b378fe46c2527a089ad80b33e550ad3e91e2461d6de11e3f7c00959350cf9b61baefbfb8f663064ccc6ffb489ec65ae7f05cae8995b388fa6c3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/is/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/is/firefox-69.0.1.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "f5b0e2b1bf63db7a3e4bb14b0332d5b365be87f7c256c7c4a34dc4d4107a139bbe0415c757d7274209e82a1219863db3862426621cd2453d24864776c0ffbd83";
+      sha512 = "ac4500d36d78330f569287a48197c927ebb8b73ad295d035137f682a7e51dbd58e6b7da7fe76997f538de71c0175627128e8860ec690c7e34d9e05027ad6b2a4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/it/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/it/firefox-69.0.1.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "655def933c7a17d5417fd319158a3a8f21a0263bb7aa539641b1f3d3eb0087148198975a9961a789b3e944c812c857a35afd5e973018a82e409ae438c160aead";
+      sha512 = "7e848f6827d8d169d6f00bd9f74bd041a6f81cc9eb5c77658ba6ad66d2640bb3fc615a7b5aad867dfb55496f464ebca41c38fb59aa410bc6b7c7b76867531dec";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ja/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ja/firefox-69.0.1.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "19b9a42561727da209614222f618512a8ff714f0edb21baae1efab69fc384d3ba0766475fa76e0f1fb4cf298cfec01c0e3bf3879e1b730cd0254d6174f764df4";
+      sha512 = "45e31ec74e866bffe4fae630b8d2d183ba2caea16b53f3447e0ffbe6b24a1db35faf834c6dbba6d248713812d4023302bef4a815b050240a5995f1fb435cc0cc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ka/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ka/firefox-69.0.1.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "4949b620ef6ca2e23472d721bded35091028048633f8393ef9a68b780928e11e779527b8b62f02e27288456fd939a5d273dd3dc6096ead80107b3c4266deee2a";
+      sha512 = "10264908a24ffd4362e3ad0c766a60fa1eadf69c68e387482273427aacd19b2a2729cef28a2e32c99a924c31d88fb4b1642c570d7fe171f9475bf3ef9b9353b4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/kab/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/kab/firefox-69.0.1.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "a1e9f7afe4c09a1056ad0f9f81dd30af5c6a62582a19c5ab437e42281b312f8cbf9f3ddc5e4e9e6553d4c68ac268f5cfd6080d8aeeef51032387b8bf1915382d";
+      sha512 = "7ff9328a0d475d1134c511555e9f0e163506b86008b8bfd649b98edca4d62321f10990c3d71910d97d5cdd0f355f2ffd47907d120fe15b54a2f8ae153c489147";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/kk/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/kk/firefox-69.0.1.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "47b2963dbc9333b30627ef1583a87adb23962dbbd71e01be2b58f6ff7a6d226076f9193310038884000c6ff7a4f96bd1eaa33767bf96bea3ecbd0715ccdcfd37";
+      sha512 = "67d5394f0f2eb4621c830ba679e2957448862b616c625f47be89b951d387015049bf5fe100173480c6f12b9b60a7688388b9118422777ac1b082fbc510a874b0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/km/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/km/firefox-69.0.1.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "758c7dd7eb7a91e09bc7f921e0506a4e719ae818b5794abe7a090e9af230c6d5240ab7077a9ca4636599566faab83dac92c64e1f97bcd3515e27a2ccf4e9f6ab";
+      sha512 = "71b7d9cf1f161d2f3264c36872071751d19e15d71ab8b7fd4b34c4a3dccb24641de20ea202ab7f6bd34641f2e209c58b1b26425df4e24961e8b545ca274fa505";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/kn/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/kn/firefox-69.0.1.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "fe0c88f827e0b4581e3f72367c19ddf2396cb654eaf2d5457babcc1be8761ca6fd7a7cedc79c580abd7e9a336439ce24d84ad37a6f1d0907bbd548232a9c3d81";
+      sha512 = "e8babd31e5ba80af0c4bb397ad6cd995c7f7c3e5b9c07a14ee1b8fe707b7d1a92154cbb3ae9a4e0c4266e2fbd3497ee70ca854a417799a508e4453e28a06284b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ko/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ko/firefox-69.0.1.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "52d0cf33a3a6d083f63c03c5076be9e68829560ece3c5729c5694c989a1179df8ba6f9c5ad4c3d720394cae351ff078af13e07d194b175a364e3f529dd7983f3";
+      sha512 = "30db8bf846c844e3e246fab62aa35ce71a2762d2e364bc7d54e967ce970188dcef23dbb70f1e9d030b18e1fa3f20bd698fc9e1965d3acb46411430617304cb0c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/lij/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/lij/firefox-69.0.1.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "7acba227856b3bb015745f5239bbdd06a88e30ae7f17129e8b104ff800fe7b60f24646962348177e7efef71144a7cdf2415b6daebd2eb75574cd6ca6b708c892";
+      sha512 = "f76d3b05b31173cbff091a731513ff213ea0f6868352983b02d9495203d454478a3f78633e2a8452eee331157c759daae28295d77657faa9bee2a7053525cb7d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/lt/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/lt/firefox-69.0.1.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "0829cd18857660588330c306ec7db6e64d52346ead593ffc7e4022c25d8ea5451329e7bb70667645b0bc4894f20d8d6251111449dd3f48362165e9f583f89e92";
+      sha512 = "b941a48ae9dceb7689c82a670711cf37af0229d8472f6006887cb2adc519262ead9471b23ad1503a9d1be5096769a58894821ccc7ba72de0fa820df9df1d2449";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/lv/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/lv/firefox-69.0.1.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "3c19e724d31b20bbec4a9a4267c5cb9ce1e4aa5ff522beefdf35b468d220964eb547ed1b3a4354624cc653764f62d41a294eac10d90bdafacd290e192786a73a";
+      sha512 = "89da4afe8892513ec831bc8f565409513d65dc314ac1cdb6e267940de6e572e93b10859b3ea05558a1aa7732b94fedc37dec18a069d3498077dcd20a04fdecb6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/mk/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/mk/firefox-69.0.1.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "1223ff81d9162d87db9d71948d34b677eae86d3ea06953a939cd18836c8b820c0fcbc468d124a3b0ab37346716db06fec7a4510806b7f2f98caaa0a30642746b";
+      sha512 = "3d42d641ee18b664af649e16458984c13b61c7c208ece86035aba3f5f1165eaf074e17ea7030ac43c3603e55dfa8a739c6f4b7f482ef469577c420f732ee883a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/mr/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/mr/firefox-69.0.1.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "202bf4f9b7250a73f70f0503e53f1f55b9466d4daa13092d9674b21edfc61a0dc6af3daee4cc229372eb2e3e3d97e13f686d9f6d8d702f4dfdad19ff52792eb8";
+      sha512 = "fb71aae70bfa56a876f4d2d033f533087bf4da146245d8ec3601f340ccfbcf4c37d2c5a0702191c0f0f6337405f40b069c0fcde90e1bc208a1631cad78c251b8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ms/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ms/firefox-69.0.1.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "7c1e2b00ead7cb7b2a3ef516c0137f1cb2fcdc4fddd44c5b5887e949797b42218ae66fd58a4b207ec9519704ad8b26a71edd2fe3a36ae152e589fad48a4e2754";
+      sha512 = "d3cf1b0401cf0787240c39cd31f523d41272ceaced2c219a81173a2ab746d7b0003f919c43fbeae4aea187c0c048b8af71f9e338ca2f4e7049d65d767df950ec";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/my/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/my/firefox-69.0.1.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "bd92ec45173af70a10715f16e8043e7d41900607bbf2acbef566002f8ae8855cb604963d2cf2a1e5a9c610120c24b6d192c0e32c7ba29c635c2d92d1fe4b73bb";
+      sha512 = "10b4272df10d520202299702aff5a0075a51df982225d9e8c826c8822367de6d8598cccec394c057d18ea5e9b965a6d2b6bf3c4f11a52b142d6998c2690212fc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/nb-NO/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/nb-NO/firefox-69.0.1.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "c032c4d91c67d11ced6b47caad8ed04554e08fa78e7bb49c2ee1176ca192131b9372e35c121d5747f59672d1c9f8f1fd7f2d29ab24ce3b6e681eafae7a821e02";
+      sha512 = "e73d077e21bdd3305b85454a256fa07c481f377edcc4efb2b743d51ddd125bdc494d3741138e8b576ae1c155abc8ff7e059803df1566c49a269a522086e35e6c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ne-NP/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ne-NP/firefox-69.0.1.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "5c6a5e7cd3555bef6de3f02e566349a5e4797efed99c0b161e0de38f8391657c963446ab7e9b57a3728a81350bd98a7de66029bc0fcbe611b39f93e804cb1302";
+      sha512 = "63c0f1f8bad1dcf2dd1203383577923b9eb5e3dc87d4b1d7891fc93b145327eb538b7399994f6868e7c998acf58f2cf8ae69f57722bf68743900abe8c058f2f6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/nl/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/nl/firefox-69.0.1.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "a1ae9b567eb05c28443886b49351532c92d5e29d65386e3c3d0d842574be355f49544de1302a485d71b9962483eeba4d7f8c855089b5fb8fc3dd1b86e47f70c8";
+      sha512 = "a2b3c2e791dd9d984b1772cc5db4c492aa530b389c03f234604c592749f7e0e689f10f563c4b9b2daab0ac71361bc77258c8278c0de7703820ede4b130dd69f9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/nn-NO/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/nn-NO/firefox-69.0.1.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "3926a8efcbe5cf785cf687e10b5d7a846cafcc5e9a09fb77f517ec071c5b2afec954fa6f870c3688d07ecc17d64fd71080201b4646d8547cb3446201ffc30944";
+      sha512 = "8b348a4fac00a9490966032c425f469ead22af7eda989e49080ca548e875b24d050a2e0447ab75934a4440341edbf7d2ec8dd04dd227c1dcdc7099fa160e5a90";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/oc/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/oc/firefox-69.0.1.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "05ce37349d320e94547531cabd995d21107c64b87d52b0e08c465abc709526e4504019657ee2c49079fd8bef012f1ea7c55f595828602ca1d74f8a18940eee2a";
+      sha512 = "8a94a5a3753689c66cc103bcbc31c9c4e943414c27fae9c64390699eed8e00ce30c904a60b83e0c19ab2fe626d981a33f85bb473c3f54b19e1cc225eb122adc9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/pa-IN/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/pa-IN/firefox-69.0.1.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "48f6a34384b79b6a0104b33073c32589a9a66da64c83c0f205f7cdbf940ff75a162c9612ab7f457377f018c4508ff398c2410239efe0a22862d36aecc7b409af";
+      sha512 = "c1fa222416168e97452c0e50894d257f5e13b50728fd3cd53331043248b111961b9fc0f106f375295a79ea48af31f082a2463aa25eddb5f668258dde1c299480";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/pl/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/pl/firefox-69.0.1.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "912149f85fd055d5e9ee3ec9f40ce9308bef4580a265f6ff8a782b5db1dbc8e82bc6ab6cb40df14968b3d00e11aeb539c6768d755acc3e5a96bf2bb952b86f1a";
+      sha512 = "01ca1ee21d42f093e3d0393443a91e7c5cb92e6cd9f90889e1d68f0690514fb0bef6cc295299856a5f13a58cae396e80c970cdc55e90853593e4fba285c066d6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/pt-BR/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/pt-BR/firefox-69.0.1.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "e167770aa356ab88af89d1ff8de492ff0e31c9e45b64bcdbc3ed76749bf2027b70085c34b95490047f3a71f72fb29da5d771dddb7b445b70a2986d22088c7964";
+      sha512 = "341a9c074476fe17b917047a362775438dc5cce42a989d10695c248db5f1467f9a5dd41cd2ecc9b83132920bd85ba424bbeb5141597a95ab8098b6e6e3b0db05";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/pt-PT/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/pt-PT/firefox-69.0.1.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "a06e26bc1285a39ccc4399e98ba523c39b9f7573444f5793bc5278908454c717dc3198be5f3985280af4869bd68987f5cc0d4c4a4000eb65d6eff4c7d3e61a15";
+      sha512 = "4ff64a3091999d5171193be0022fc239fc61c0fbf4487754be4ef9b3f7f8f16055ce302617c68f66c8c0a0fcee5b8cdc5f91e5bbd0ffd9500809d1566436f2d9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/rm/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/rm/firefox-69.0.1.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "41e9519e6e10cbdf20eec17ccdcf7120417c477a3358a0fd0f6b770dce64b5528a51271b9257cf981ac21dd0e118e8193c0885c5039955b84d331d29e881455c";
+      sha512 = "b7d109e8bcf9eec1757c14ae1bf693ac7616296a112961cac39b5466609af5050cfc2dcb4b68801dca7a4a2b00f76c4b4f31bc325163aac88a012f0a318898b4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ro/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ro/firefox-69.0.1.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "63845db9011089101b6350e5b13c3e614a198ba24343d386e46b4219f0e006c346b6ef103791dbd5013a89138c1facfbd81b3e144e04cb8690c996969af6afe7";
+      sha512 = "e8eae3c374b4ea0940e256946a21ed7f317bd9e37115a0b471ff656f194eaef8bf8205a8385b1d5e22f3aefab1be67cfea314b77483c6d9facfe58d757932804";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ru/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ru/firefox-69.0.1.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "ba844bebc9469c2372815821d751fe3146d8f7d0c4c18002ae617f1d42a03369a13eb3a2cbe2087135164a30784bd476a4512867145a57613a8611f1af47227b";
+      sha512 = "567db4e146fde58297868a7ae7bbe55f658e49578951513d6e0728b82349ebb7b631bff8abe9ea2305ca0ff3f12d6c4b1507cb6df10b45f7763b3a505caf9ac1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/si/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/si/firefox-69.0.1.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "67df7f6a6d32c37db778237b2cde1418d8b4d19360f752960129c94dc3ed4736a8b1eeef73966b54a531e3e3c6ddceb5cab33d758124ba375a2a46a7768b99e8";
+      sha512 = "24db969220444eddd0251ec1f17ccb30ce73050f1efcffb5dff3475c69bbba46735236c41f1bf2910a4c283b1ffe8f0195894f57350031c7519c8080e6ab0958";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/sk/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/sk/firefox-69.0.1.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "5d748ec7f889e8465cfdf6304db6403a346ed6b9c433fa482365b82bdf39cd600a9926b5e3355e4e8cb911bfb03bb9ed14df83ac0b4cfc2019b71b2006e1ef51";
+      sha512 = "921d440d44adc69fde5a68e177b1d2cc7ba224e67f4688a4643887516ceaf713913bbab6e9b04a1ff01bf89f83a3b77709edcd603951f1a6d9b7b327a8c91152";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/sl/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/sl/firefox-69.0.1.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "f870acdda0da2fb373718d2218d0db79de90c6153d7dcab4163102b220c265d502691f525f9db77ab2403e528e578b9e45d839c2296f16665179c838703aef23";
+      sha512 = "9b56d90ff8b53615a0356fc593c236ee577b8fc2ed751345da4961ddeb10c039bd54285aaf72c193bb6deb27e4aa88960d61b68dda892acd4995c70c44e7c7ba";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/son/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/son/firefox-69.0.1.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "f8c702a54be2f9b15ffc183de2853b8da7d7809d2c02e3a7a2a2d001878236102c35383879c0f66ceeaefcd6a676adf23d766a80682af4122c82561fe7eaf36d";
+      sha512 = "3bf49dd6a56efd4e855170de6964181fa3cb6e43eee637bb8458d841f863043ce845d17683b1fb2ca6b906dcbd2c9f4acda733c7fcb48a6718fff2f11b38590e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/sq/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/sq/firefox-69.0.1.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "4da3b8e0c0a012e5f78ef1c10f9f462b9e5a716c95e9d8134da274dc1461d60d094af2de314987c6a68c1a50c17f09dc00ce9cd039553b406efc2306968b38a0";
+      sha512 = "da7d3a5c5615a187d4bd8f8eda41c42060038ee545a578b31d9f0f2cb2f77c4f36f1ef3911230c09dc2d995444aa2867190c2b95ff399caecefa2f29f5cc9be7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/sr/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/sr/firefox-69.0.1.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "1a41de2409ecf00fd94690c0f452395c3318590e9b9f2164f2d82112e51057680d2c758d1e0b9d9a372e3080afdb611d30a2c74b9bb6377da63352cdddcd1099";
+      sha512 = "753a31f6c534d7faeb775bac52087ca59321fb18d6c3c456e7d84ed67f81fdb12d666e5e481886aacf5e59b22249fb10ad75d2e149cc1f8307e6362058d00aa4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/sv-SE/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/sv-SE/firefox-69.0.1.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "f09d3024b2f9032512aa10ce9b5c72b44a673f324190e1e971ad3c09837545b79a784e6a10e5cd9997f701903c4445284f64a9eec7d40b857a8386b2b72eaeb1";
+      sha512 = "84ba83794b6d6be38f4268ed0c2d8e0dee4a543de1244f7ab88ea6944f1485d0f6383d029a24c5ec08a3d2e78174e6292ac5c641abdad5f452a95786636a7aec";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ta/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ta/firefox-69.0.1.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "60666bb1ec53979b6b614a4c31a04085b1542deec9908bd485db2e0f09ad833a2dbd81f84f483f24d73689cde5fdad2554079b3a54e4b98e148d3f6f144b8de0";
+      sha512 = "b9d10d22b3ddaeb9ca5536399494b8a51029dc37e04cbf352850122e988f8e04fe77e834f8cb0fb80ac1cad842ab1617207c8c643dceaedca07e23da44f38020";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/te/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/te/firefox-69.0.1.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "03fb5b9cb18402657b77cee2f7bfff3474a84c32204ce5163e028680cff75ad0faefc398975fb98378fbaaa86ad247cb43970cf86bfb383512fc4e890a928842";
+      sha512 = "76a2367fd1913a5ffcbc4072701448880ee5319e46b82bb99bc12b84649cbe09464447504f4a8ffe40695c1ae76a2e0bc6f46d797811592c2409e2acb95783c4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/th/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/th/firefox-69.0.1.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "53d525b0309e5f0d02314c0ceb568f067e858588befa64047a3163fc0623d0afbc05167df34fffbcf97b1f5fb127dcb8fb45c05ef117de42d42e8e7d37a04a6e";
+      sha512 = "41a16d4d1ebb7e12cf43c748aa6eb44069cdfd6bb10482518d23f5e4886b10b01c103a0c1b53210fdb86bcc369ad4e2451fab6b4a4d3810b8dd7b3e8059a9de6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/tr/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/tr/firefox-69.0.1.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "ef3c0a7f2ef67b92cf22bd6a69b237db8b9d1d85a018cc7c33f767fe71f483ab479bead36af874f4c6bdf99f7eb58b86b564825de897abbf8809aef41d95ff4a";
+      sha512 = "e0602d3b4ccaaed09fdc740b8d445cf4d9d4661bf8680c3ab8cbce002add211e2f64a127dfd010624ccb13fe81270ff8e1679ec6cc0b96b25c81b4fcd1a9314e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/uk/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/uk/firefox-69.0.1.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "bece51aaa6fa0131f55364b3a8079382db4d8415e19f3b5ee7333b4111ecd282012f55343b44df95cfe3006f3226c7ec6b6d4bc71d1f30aefbf203e24c282b5d";
+      sha512 = "bdda18234e4d38484746a06b254fef51139ef0022474b2bc3a21c8ddc0fef62d13ca6c7829d24605ad04aada6a6ed4e9e4e029014d6e6a4cc56b4256da443163";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ur/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ur/firefox-69.0.1.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "1f5373231283004843f8d87a53ee5eb92c7c79d4c15cdd611baaa5ec56ea6ba6eefc5ed63ad66e0a3b66b4748eb21af201fd98dea645754bcca3731e8643dec6";
+      sha512 = "7018f8f9c34e430acd461610e488968df3f0b0dd6ad53701582644413cf7e3efe0e83e04abeb6b931ce8755769baecb9cc25a2a94a4934f491079df968b824c9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/uz/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/uz/firefox-69.0.1.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "31708d41970b7184bca2686b8ee048afa732e24f05ed84bc7dfee1fa18c86ca8f3bfc27002f306bfd71423331567be2c952addd1af50ed85ca7377a87b1c91cd";
+      sha512 = "dcb88a105c8ed02534b4f54dc9265330035c0ebc3a34326c8a73acc96455a63956c665f4240589b10682e06acd0b4302c144045c77cd98484a35b273168f4a04";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/vi/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/vi/firefox-69.0.1.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "f1abfcf9142310c6362b429d8d58f370c3fa9af20d7261e0e3328b37d4cc33b88d764d108167ae9b3aea6dde7593bf92591d41e71eaa233cd01d8583e1d8542f";
+      sha512 = "43d695edaaa3c98e3607267115f1fec358c6b93bf79b2dbb5433ff98abadd6af54bc40f1fbe7e6fd7ee5a11558dc3266749b2cfaac47f8db818e554722052949";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/xh/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/xh/firefox-69.0.1.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "cbc4ec3f78d47276b1cc67948645b92fc891a0089bb81151d1b4ff8ec20b5ea7db714c7a386ef094a05040fb399d8de7a98d3c7ae7dc212c64955004474c4466";
+      sha512 = "ed78cda83cc9207a84a013c01535a423b8c315464b0339fa684fc0c3c64b4d014d097816b115a6d80c79c725f3b376bf996d980284b75a774418f9999dcf6e3c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/zh-CN/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/zh-CN/firefox-69.0.1.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "5ca30257e96e8e7770fe8a7d626433932a06e56789cf6d84a09b633348570c59cf904707a2c6737267d111929830df8b1556d84c6dbccd62e4146926a87e68d7";
+      sha512 = "079dec7bf78a3f1e8b3dc392cb30916f70fde6e1092a5fd4ac26719448a5ce8c3f3b86296b585c8d9c4941e5a106976967348021aefc37fc8b18e352091e0664";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/zh-TW/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/zh-TW/firefox-69.0.1.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "bd3ddc2e9da6f1e47648ac4054c6568e48e3c01422623947f745016bd624350885a194b7dad600fcdeb0fc64cebf10b8f694764da0575332618cc948dad33cce";
+      sha512 = "24a30c8a29ae61a3a3b96c68cc56086985be110da3cfc10210c3365fb6ead7dad9450888c15151fa782f0f47326fa3611478dc4ac265dad63bcaf3e1a654d20b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ach/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ach/firefox-69.0.1.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "9f5876b495e56d195c01a278fa602c7686c52c662145d46dd4e7a9ab143801a26822c5a084683b74819fec15d66b21644ab6adcf160deb1d48fcb381fb395187";
+      sha512 = "9523e53ce15887c713ed5664cafc89c41a9edb0430374cb7e15321e51f5f5f626e27f626f4a2475113f2c4dae9d3fefe18d498fb47166da59e7c4fbce7ae5bb5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/af/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/af/firefox-69.0.1.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "13516530c77ddd90e9a5380817acedd7d1843908f4cca8cbe523f2390236c7f37b50a5ea6286ed9a944a4de141d911af0ce425d557af338e8f7be20581717077";
+      sha512 = "2eb5ec7b08ab03d99e40b1147878211be92592213e568fe1770b8a1e570c012a43e60ebbf708012b138a615587dc28e12d9512b732b3434c6144c21ef30cae29";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/an/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/an/firefox-69.0.1.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "f947a2e74a8a1afcdfa64d4d70f123efc490403879037ac31bf082874a90cf4a40e143539bfdc5fed10a406cc1b446dfaa99e7c4c3c805ae37d23ebb420bbcfa";
+      sha512 = "5eb5a56a0171f4ca0430d453c797d0a5de608ef947d1be3a471df85572658c631be78c70d90542ceb488f6f23986439acf101ac35949b55994fba1d4b7f353d0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ar/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ar/firefox-69.0.1.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "d050acc7f518b00c231112364bc9a678c64905175c111380488adea3633945b3acd285195b10f6c7a0b624effb7006f742451df5ae95583e3e20990b9639145a";
+      sha512 = "9cbf0bb2f75426361a015bae999e86c4cf033136f86f942def26f05ee91bdda8552f93f3fccdedfc01f2ce3366adbe7a89a5a49dc99394f57d95dae658df18e4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ast/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ast/firefox-69.0.1.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "33b64ed51cbf24703433087bf869a3ecbf16591ea4d870b902bc775c0a9d027b91d3d161e11be075072363da178f7ed02103fd57915ba43c2f21904f32709f4f";
+      sha512 = "c7dbf2fa1e9dc77a57259678a09242dd17d5246afecb395406e0f11f4b3d00f899e331c8e8ffec8f1b8487c710ae8adbde5b57366c029d8d2aa53a73c07df38a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/az/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/az/firefox-69.0.1.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "5f281e9f1bcddf149c30266ebd80199c2c6c6645f5ac46c118f6aae13c87e61f34d84077f44bcc93fdf03d9c02fdf1e3e8c34fa124260e0b3da3cba7b02021f4";
+      sha512 = "de4deb88d31748410c77994091faee898d08ec211f2c55a92c7b2fc447758175311c6324f35e1753f483351a76616944392a5e9201fe03fbf50ed6e8f11ece5e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/be/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/be/firefox-69.0.1.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "e912b6e121cfc3702585a68e8140c0a9ccfccd2f2a614f3b72bba2ba0794d665c0cc2596bacd2ac64e30b87837551e1b7758554b379301af650df1929003dfa3";
+      sha512 = "64a94634bddda83e516586b89feb329f93dd26b98da690f46367c31f42b2b7cc6a9ccc3f339c4cfcfc507b8380b57bc81244db41cd07407acdc82ff455f84241";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/bg/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/bg/firefox-69.0.1.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "9f7c3afbda97498d2377ebcfd6417801054018a7752b7c0e4bc03fd349d80779d43202139423f48adc3af14d71fe8203a144d567bf5b051484847321ba223fea";
+      sha512 = "b1740cd77fe9871e580557c2d81ee6f8d944cd823f5949fc25685e7a7c886e960a70cf7f86d6404f4b33d5c1da4622ed452d217f7c8fd1cfcc2062531948f0a5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/bn/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/bn/firefox-69.0.1.tar.bz2";
       locale = "bn";
       arch = "linux-i686";
-      sha512 = "97f1e4bec660cd573717524b42490d84bbbc93976a973fba5dfe4ccf3a745b76a494f6386ffb3060e8bc0ede9a32e69a87fd28b9fef33bfae0294a4d8e08069a";
+      sha512 = "5a61525960b05d788b03f58445e78050680c7101b70c017d07f9144f911697f2cb113f0a99a6898ee738bb927bfbfdec73714b3e7820a3f5d10484f9526dce97";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/br/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/br/firefox-69.0.1.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "99e8bd11f12189b66e9f79c7b197b7b149d274e813a090e118e1823b159e87a335c890f3f257d39bc7ceab7089cf64d4665d2732919cd1ad29c7365ca2f5ca8e";
+      sha512 = "9791d88c4c3a3ccef9fc59e4ffe74ef4b16ff25866643cf1ad43cc727d3880568d1d76c1f5ef4598c3fafb83f9e1c53ca43fa614af572525351a46ba646c5c11";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/bs/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/bs/firefox-69.0.1.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "5b3947dafa7e7c1d0c7c47a1ee09de3b9cafb47bf39d4ffe536a9f35f56c7ca2a265289f1729b760f09cd3befef2fdedc1e5f7afbdabf03f3c3c0e553da8d925";
+      sha512 = "a75b91887962a52b9a24a7bd7d268baf54c5d65e03f444563f2d12af36f01fcf9ef3af17b642eb1a2dcb365ab58cc0c6e25bbbe94aee2c3c9ce487f57a0f5031";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ca/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ca/firefox-69.0.1.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "3d83e71c9f3acfe3ac2838eaeba4134ba8cf9ddd6c7be2218e5200ab2507228f3af5ab7930a6a08f368c1c3a31a22b9816803e9ee66f67c1dc0280a0f5f5e98b";
+      sha512 = "d5489feb1053c4f14481b8cbb3c55c9e6e99b970924caaf7ddda32d3274efdd24d4486ca46909bc469b3791ab7331b25a0eab476ac158d807948ea79aa8c4857";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/cak/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/cak/firefox-69.0.1.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "97b0761c67aca6f6ea89e88154ffea95651f98aa5341f155d8f7a25c40f109e5f5ecc4aa7242b8291cd5b28d5df676503cbb52da25f58de4e1274996b412213b";
+      sha512 = "ecfedf3b03bb6d52fd43e077d4caa1c09c4a3c43af99e0f5a4089840d507484d753e7a8f0a43bb35b73250d21ffe27f38126ca22b26a06eea494bf89627cc906";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/cs/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/cs/firefox-69.0.1.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "6404cb3cbf6b5850c08fa1e222101f340550a30398413ac49c1a498ffe8a73172a65da20d4c71bc66bad840ce5cbab12d93f9a5e47a2969024981b3e3a6c3594";
+      sha512 = "5ce4b41bbd50e3ef18364e32632eb39bb25750910d1f5792797cf6e20a11c7bcb65ccdb7b23d780af80552363e7502ea22076bf7b1e7664d7b46b5403e32ab2b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/cy/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/cy/firefox-69.0.1.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "2e2f45ab86409368d00af0e8684a2de8f779ae5ed21c4b7bfbbd9b1b6dd2c0cb89ef00ca0d678e2c2f8f0a946ee9576ae3a657e63188b357511da4e512ee0b15";
+      sha512 = "35ec97df8aec5981ca3edff177a83a8fa52816674d77a7f784cb9939ef65c797d196c7b6512d16307b9a3db8afbecfd958d4b296b72d93d36c01e372ab358175";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/da/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/da/firefox-69.0.1.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "f39a37f55d49e00074bafd58a1afff2b2fd2284eb14f43b78c1f0a63fede72458c61a34058a453bda0d537109914bf94ab3912d04cff91286bdddf76d0df9534";
+      sha512 = "ebae89079a202b95601d511d0052989bdf41f5dc7dd76037536982c12ff39f08ba4a9081d41fb0b9571ac5fda7fbe228154c4c437b66075bb1f27aaadc0adac4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/de/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/de/firefox-69.0.1.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "4db0be46edbd3443bbaf6d19f115a0dfd751dc08d55f22c905518f7e30fbdc9d765f905505a1908ab96baf16ac4a2f03b50230c565e278e75533c4379e39a0bb";
+      sha512 = "13bad87f6a65faf5f6ae95e613b199102fbd02204670952cde280dba7ecbc25a201c1a4c424f1ef1bec85a9af51b523bd82cdab612e0933c68b3e257c84a980a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/dsb/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/dsb/firefox-69.0.1.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "2901e1d382dcc9f67217e15ca2d2575c96be02af1d853e61d4885c3c546171f8da067223a73b53c1176eaa03cf7cdfa80fbe2c74ff20860a8d31642f79ed93de";
+      sha512 = "32f92a1d47e83f5f3b73b4284adabff6282e65a5df7a2f3e4c76e5e0adb7332ce071ce0b250346870b79df8ea6118b51bfde7604d054dab86f230ae261eea8e0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/el/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/el/firefox-69.0.1.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "a31c178ac0003f93ef62091bc1468f30814fd8919ac645b84e6ec5977d13ad983389d04ae7e986ddd0c31325e550c5f8593d64d48450fc50a2d37e32b785165a";
+      sha512 = "b524c8dd476df29526d030adace43660085b5ffff42f3508caf22a887e4664367606b57d6cf47911e0b61154df10c789b189ac897be80d994271a4464ad3de90";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/en-CA/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/en-CA/firefox-69.0.1.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha512 = "4ff8b109121ef8fd4f0a817a3d273e3a28ffb952faa072ed3d8822d48691de54035d45abf7fb84a7dfa6a0543c30281896a3eb840f64a658894b477918ecd902";
+      sha512 = "005808f2650cb486b718b2fe0e6fd28cfee8b7bc5cab336421cc6cab70a56b0362214853f51410a25680b2cf4d8f528a274ac79f19f6235caf073ade4b1f9882";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/en-GB/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/en-GB/firefox-69.0.1.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "c514432dcbc3529ae58b1896621765da05c8a0511461bf6a09015d5b8e7eb14f8873029947d4d7f17b975ed73982746de8d92b651db70f7c6f97530028c7bc7c";
+      sha512 = "f9162f83614e6f9ae9a471b92597ce10090577a0e76b10dad397b1222f0012c44dd8f2e3bb8b28f2475b0371ddde37874a24edd75740d0d0a812dd4b5760fc5d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/en-US/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/en-US/firefox-69.0.1.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "da231783ed7ef640d02fa7bea95191af2081f694594e08160b682bd2725a49db56b54eed868ce11aac6f664d81d588243987ac80adc71bf11f0d03d85e90e14b";
+      sha512 = "a7faa84a119abec0905718380bfc8d5853647d75b2d36e8bd7221b10868778eddccea5652f990a8626dc14da6b3402ca7adf5b7fa9789b13d6d460ee552d53d6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/eo/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/eo/firefox-69.0.1.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "599d9177a80ab92dcb0ed637f5b344d0e7c180985a04bfa213b5254dbaa932af7f920b8dc95a2a9ff2e276cc4ee8d22ac8ee84d9ae012ae085b59cbb6cc15ea8";
+      sha512 = "90f02c45bbe91a3fa830967b32776619a21066af4a4df8201ad60cb0bb8d092b814e0d44a40bfd047635740381c223b7f4d17814408983c2cc8f1577fea3c9cc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/es-AR/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/es-AR/firefox-69.0.1.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "01222211b16a3339bc56ead44cd8f9ef8035230c7f154d078ea444e07520d06add00ee100dc1b37af04ee444745cc9b514c90a8d18ff0af2a84276091c90bf0e";
+      sha512 = "a1d40686834a78b02d9ddb4b99d26f8d9c44ad5a7d36ac47652a013a430dd392db6270498eaff2eb7248808a8a23cc57572d6f4fa18f963587cc95381f75e7c9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/es-CL/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/es-CL/firefox-69.0.1.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "16652520468f1a58798cb1ab6580114449cd7116e9f5564f3c886cbce6bfcc21ae93e5f559f45faa6c273ac9e07b584eec7d3c940c50a84f9c02d6ba9d17f192";
+      sha512 = "761a6b16ce97e28edcc630f4edcee5636a0b112385956ddedfe2e18400207a149ae3d0275faf9f992ae0461108646f258e7ab75e93b9cb6f0c4900f61277c5a6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/es-ES/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/es-ES/firefox-69.0.1.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "cf96ec9a0f40d4178f0724ca62c9da5208bded775ff0a2ebdf9ff6f0ec7fc919f1450a221050706bb0490347ace75b7bc0e6652f6ff2ca9c5565e06c2b6d4706";
+      sha512 = "656e00db3eda337d6dc3e0bb69af70eada522cdaefbbb48dd211fb23df12c44bd48ab02e082ee711de746f2dafa52ed918b6fd13602a04b40eb58369b1a6fe11";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/es-MX/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/es-MX/firefox-69.0.1.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "771da7d61622787543371266527ba41a24022a278788ff585f76208beb9936a6aa9449adf1cced85952aaf2c04f8c6f2a08883071378c66f297d3cb73a53ee9d";
+      sha512 = "604e8397f07e1dd8337ea66fbcfa8c208ccc183d482881e4f7c2a9839ce6f9f14a89e6b981cf5ec4ca75332273af63458b0f716ad34a64b6db140db87159b85e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/et/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/et/firefox-69.0.1.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "babfb53e1f5a805013eb149bbabc9e9968423c138bed3f8d6146983928210d44c57565a6abaf1f97fd741fd328a3df60d502b1357ccadde79ec1a228147b9334";
+      sha512 = "d5371374a98c8a9d678c8d4b4f3d3af7152f461bb111e4451594570546acb5d94756eed0c6135b0d72e0c7f455f50c5654ac34275a06c60238749ea28104ed92";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/eu/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/eu/firefox-69.0.1.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "d88809fb0dae2034f36080bd117bec9d2192c3ddea337ca0012391ed6a17d8f09894d0a3799e712fb3c0fe1f6f88074b265366fff92ade0a5f2db8cb96ab0afe";
+      sha512 = "a5783b579317a49ee50a74c93b557a3acfe02911bf14e1a1efde185160a4658622ba635662530a4fd9e5c7251061f8eafd3d2421fb4f8eba19da5e0fabbfc8e4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/fa/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/fa/firefox-69.0.1.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "acef056f215e333a29bbf8c13e17036e50e7763cad2a0e46324326f25de38b0c0060cd1c313cc7c3fdd43ed537e913a0885c6fe1e474ab7746c82531d3e27b39";
+      sha512 = "70655dcc91e411d3c430e0def9d8b7730922ac4fab9b902fa08f791db6e7d3104fa46aec2b95b91b8e56654778400b3760c4399135ad008aa029daecadad57f3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ff/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ff/firefox-69.0.1.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "dd13224227e1dd82b0b5e153ec4e43e66308fc38e1c8b68402b0a931eccf0e23afd67215832cd01428d975a3dcb72a5e6f876ec3fec2c1641c2058a93e623d83";
+      sha512 = "d2ff78a9f318a9d0c74aff45d5559c605048bd3655ae4c0cae3018ff9c2f7c030ad5740c4010f1ba59c51633c35b2649f21d84a827900ef3fe277888042acd6d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/fi/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/fi/firefox-69.0.1.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "3681a99b3ffa8294a81683395ca158a93ec87484d1490ec55c24b34f24437b6e6ab89b3aaf0430c49cf29dbed5a92e605b4a5dc7cf3d2868eb8bb935b61ecad1";
+      sha512 = "9e8ca84d3e9642ee8950aa676182607d1c19b379389605f4b9311266e15c12d3dc6cac6baadad2f71d09e8acbe1a86ef029002fc46e39ce993370abeefca5eb8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/fr/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/fr/firefox-69.0.1.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "3bf864381286094a373ed77df37d116424f2297c9efcdaf8fd73190253b77701afdda32ee692292bb4889eeb87bba8c1d6aed3c961a58f717c3ecbddc8fe098c";
+      sha512 = "0d3810f2c00119277f1d7db396db85e8f82eaeec1db5d0bd7b10e106852140ddf704a02d4a93bd522c7a5b7f6f5e5b0457265cfde0f965e3442f42f55c6dd1c2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/fy-NL/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/fy-NL/firefox-69.0.1.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "9468187b6afed9e2fe02cc72e1bb88e06c312af13de59ef97b54f135853ba47916f65dee7543578e01d18352367f4d4ff9c035e4c43666c9510c23f7977fa6f5";
+      sha512 = "2fa52fb095b4c118404378cd1435058634c5dcd77b8cc76d9f9fdf7596006ace8bdbfcef3fb7355022e241c4e35029b0fc44b1284293bcf473a7fef0df36b0d9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ga-IE/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ga-IE/firefox-69.0.1.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "5135e19b3043ca9891af4035583f228d9a628f6b8717c124bbc9ffb6cb19866182521719e544555257a6921cdfd1619a67d21af8be327fe3f5582e39b9cd389a";
+      sha512 = "d2204a87685ab5bfb03bb553c18793de4774c563b40bfd13f8c7d50c088a6944e646d01fbacc0c16189da3f214a185bf82aa042de56d1d63ed020483744612d7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/gd/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/gd/firefox-69.0.1.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "a7d079d791fbde00d83981080694fe813bb2abcd03a014abca9fb9a9df5af9e1daaf4cc6b35b1eaa2359aa9caa317a4352db6ed40a3adbe6021ac76fc48529ee";
+      sha512 = "a0b6139fae5b0629f5263fae3175fb7a45218c82b1517f97d52d4e65e5381dc0a15e05c1bd1896352681520ba7f213df24ce4878c9b9d4254e17a5a903d6e9c1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/gl/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/gl/firefox-69.0.1.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "020c63d6ace98c964588040c15d0e8ecc6a74c63cfaf3e0e64b0bd42bcd2a4e7bf762ac93fc510beb1689203d56812e87be743886ca5eb6d1bafbbbc0fe56216";
+      sha512 = "6e8a7f461b5d5c20ce60c7308a44c19e76bddc8637be3b5b1d2083434c3e213d9f21f6596573503d4cf5fa105cf7a103c038892f052f5fb29b1d6c64d11b4bb0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/gn/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/gn/firefox-69.0.1.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "0681b4cc593d63f4244bbdd6009287d89acb3709741281c6604c5de57593e53876e9448da46a718d2fdfe369feffba1d5b115f5372b68433d5b05ce2d06c3647";
+      sha512 = "5288b63758ea97c3349a5e8a427479f2ecdc7f855790fd05ba1de662e1997352dff84103076a923caa67872e849b1af5c2c80168f52d258d1e3f0aea1937a0a3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/gu-IN/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/gu-IN/firefox-69.0.1.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "1e4afa88d7f153f2e653d754c71cfd960b51ecd016a533f868a96d3a4c076d5f0063d7aa169740c5f3c6e91c6c10f54edf1a4ad1829cda2fa83a462856d1f981";
+      sha512 = "4e354642853c537ca7dec9bbe184a64f575870d8017c295db053364635c54ac8cc8e64a9686625b567d99d9055149a9d053a44ae0d145f91b01610570080556f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/he/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/he/firefox-69.0.1.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "3ea8ff7b1397ca2e2c15cd1fbfa63542d5d31fbea6fe9fe0c11b8bea0d953c2c2e35afe336714bf76baf2f38ed3894d869e9b467fa98fcc38796f1a31c6a0d00";
+      sha512 = "e627e7d824cc8174430c8450e1224a61a50cbf7a2fe7ebc1cbd13449c155d2334e40201b5e4190fdf848d7e53edd177bc70caf3addb220dc03fe1c1bf0fdcd6a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/hi-IN/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/hi-IN/firefox-69.0.1.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "eed63dbb1d8a702cd755383f967d859015040db231b464c3691376b3cd6e8ba5b23bec3460bc0c7dd6b0798735a196525530a533caf68e4056d54d54bc4ae50c";
+      sha512 = "100c109d4668f1c5bd559bd539ee39a556eb03ac29cab0824a8d9f9121a210632d4fd6aa6e15f523df3bdaba637b5e13940e7afe25d1cccf85ad91eee693c89c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/hr/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/hr/firefox-69.0.1.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "e79b0398e4a57751c87f11574b9bf6d7b92cd578b41cb80cfceb2f515e01c58bc17426fd7b3668b4d5b48d17abc60009ce1539b2a57355a90a1394f742c8916d";
+      sha512 = "959573f7900c124dad817dcf526afbfe2a108305e96a94d20a763e19fd6c151b5544ab41191b731ed3881be38f78a29a747c9aba087b82ef29bf8f37eb3d57e7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/hsb/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/hsb/firefox-69.0.1.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "704dce04396b78070853cb2ea8a0d6c4bf1da489864f4575a5d98c953b765fd7660e5c75bd3506bb05d94f5eca12d37a50be351fdd189592315e32c3fc361dc1";
+      sha512 = "4832103eb5ac251f664fc68b044b1bad78260e90be1ae9d3c149cd4d36b98ab1dae3cd56f135e4a7f46bad65af4a368d77717c332476d0faa453655ad0ccc2c4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/hu/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/hu/firefox-69.0.1.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "613b525e8abc06e54dd985984b690c25e5c9ad8aa072cf5e48b20298b91853a8019696f7d7101d74efe200119a4a9d1196b71fc286bed7916d712dbf6c6b5686";
+      sha512 = "2f48f16eca53488b2d6a633913214d17f9be56ed84b86e2dd7d2134eb0950d3211e674ec836fee725d08d08042800fa72fd808dd1806b467a2559dd7113aa957";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/hy-AM/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/hy-AM/firefox-69.0.1.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "5d4088682997b0490ac49606dc8ad56158b3b7585ed4b89507a2596d119eae098d82fdf224eb047b6090572fd5b00cb95dfc5027afd6cea11b0f05e6d93ad439";
+      sha512 = "315c10ad3c3787e7d564ed563d03b86204e825c9e4a5651a47568a543feb7bbcd0a5243ee8878e7c60df410a578e2fa69552d43ab2aa819e43124b1ebcd66b86";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ia/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ia/firefox-69.0.1.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "7ddcddfe7e3baf0bae0bac901b503fca8c344bd02d6b52d90face8b8575318c8805db618e8591372c4c4c60e1092a842f2bb17a920d96e0f15a1491ac847305b";
+      sha512 = "376a0f09596165fc8c1f5c3624cab6b3ed0f512826504ec94e874b0f856ea3282673b99a6e84c0bf0a08ef76d9d11544c25cf501f3f2ca88cf3f6c00ca19874a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/id/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/id/firefox-69.0.1.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "90cf509c70963750a4bbe5029e5e0512e98c8c7286d80120e39e299920d9331cb72dc7f39f2906e9a5b331b54d2f282b46c4b7f69dde51ce2b06c39e2601d335";
+      sha512 = "7f2acc92f59bb0568b6ea96d5820441790b95377f56da5158bf41a311262ff90bee1259f3917454b11f61fc6e4b329ad938d1116e8940fb28c529c31898a483f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/is/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/is/firefox-69.0.1.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "ad4c03603a8a81dbdd968ce4831ea40effe90b4cb044315a3c0566b647854fd4e95cdf6c085da8a4f4d901ef671392237aee70e4604552381959b65ea6d32089";
+      sha512 = "4d714ca45d2d7bce2e2798c3fcfe7c876b024441a55c53e82c81cca572ebbbe172127ea005516c5729b49d4517fecef497946a45e2768e88f5b648cacbfc14a6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/it/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/it/firefox-69.0.1.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "04dcf6f3b9b3f22a44b74a2e9e20d6fa74a75707c3b3145d048fd9bc10eb4859127cff525367d0e7fdb8ba6d997a7ac1506e3611ddcb80256aa0cfb7d472d407";
+      sha512 = "57fb82bedb27d1928f5bbcbf5f0424966d1b7969df07fd6816d72976fa7a7ead07d2dbc644079672b5831fa1339104d5a9dc58f662b38dcc719e54cc5ce8e1e4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ja/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ja/firefox-69.0.1.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "d9d017a9279bafc6d7b440ea7b11ff945bd647601e85b395e0ac086684f58dfb15bfa18688748e934bd76ddb3729804e10a55ec3428f2e03413f9bce8921936f";
+      sha512 = "9b4bc5aa16bb05132de7b894cc118dd07166a5f8af603aa206f8e52aa8029532f4fea7236791ed1f0d8d43214240ffee6297969b030750379631bb55ea105609";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ka/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ka/firefox-69.0.1.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "513d865cbda546448b77e7adbc236d24dc1d379fd5c74ada7a8fe6667c61237428f0751e1a9c0e067c9ec5684ddb8b0fe8041b8eaa04e98c4690ca1486c20281";
+      sha512 = "d0b789fbb3fe72bc8e0f4eba595d8015ef6c66fdfd6e8d699ef15071b1e83ed4d5245f7513a6b7122f0852378241fc2ab01047f4d968dbcf40dde79a7524fa30";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/kab/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/kab/firefox-69.0.1.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "7747666dffb5a8836ee88669dfa7e5c848e27821911499c1b4d896172bc8f696dbb998c701b043177fe0370000529d8ef807cbebf9457e013ddd822faf4b7a19";
+      sha512 = "1aba37ef9fe09a5765ba3b4dae2165373b6fc0b1a10f6705835cf70af0797ef024256d42b7f67ee9b8eb2d93010bac165732d483928253d289d39260799cd450";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/kk/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/kk/firefox-69.0.1.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "badeb493bbcd591359a283e930d9f042c2c81af24b2824cc4559f1a10a5372dba3eff457121744f0e5a8bc78394215535524f440cfe7435853f4b97db03a05a9";
+      sha512 = "34be7310030481903c867e3d0ef69cf87dea784804190db89109703568515a933704d81d3aaae2e900be6b96a99a48c5d72ce860ece0418fee344b73d774fdea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/km/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/km/firefox-69.0.1.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "2e33e07d9a35eaff182ad012dbd2f59cfc70170cba518d066bb05bc4873867dc24dcd0dece4fabfc045cda6313d5aa86a31e4c5d42579eecd6a11596a8d806bd";
+      sha512 = "62209e5ec47160647d160a8c74ac63ccba4340704e6408cfe780ba6215a1228f994a6b3af5d7d44438effa778377fe31993e255bb6ec4e8eb622eda0f6e6eafe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/kn/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/kn/firefox-69.0.1.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "9ba5560db5f127018b3c365da5c18942da60ce609fbd5ea24c2eac75bb683a0853f212d8c46d7ddbd6190b6158d733d9f9dcd146188940e2705e9ca84caf1c33";
+      sha512 = "ac1fc4c0c3b8b6cead2eef3dffd208eee7cd215aad444f23e00acbf390b933486cfff9b26a34356c57b85963d546d2ebb01dd8e22615ce58df0e1aec83d7cdb7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ko/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ko/firefox-69.0.1.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "7f1ac38d2c303fa4d6ba628b3c57f5fbfde1b29e6830f5a2fc657f85d94f37d7474dd590e6b2933103cbabeefc5a51d6e59b434db7c8b422b8071b09a81e73fe";
+      sha512 = "a27d76e6acd03b1dafa9b3931a8906d456d35216947b37148eaf48736be18953d83e3fec01914812a8180017ece34662a877c2aeb218404ed3f1f75287b5427b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/lij/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/lij/firefox-69.0.1.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "9e8023da48c91b1e1eb5cd67ff661413a346fdd9a5062f71df712a4dd237c8b54ead00c49d03342eb32a614b85e55f6cc263a4968c8c6b09e307876483ce39ac";
+      sha512 = "c0dfb7d36b87250edf7eb2bb566bb46d9ba782d257e87f6e3d080972d2f1cca37b6c41201fea7fdac86db471eadd86c2e2d8a4f568c8d89e848653060e01dda3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/lt/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/lt/firefox-69.0.1.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "1d422bfdb4fcdaf791541a778bacd27753e154e6093e0f8e76146f0eda6cbaa40346c519590fc78954d6d88c7fb0bd1c23b0ac5e359dd7a052ec124072a63c1c";
+      sha512 = "9d0990670c808f2e0ea2d4033e4a33347653979d9eb228ba7811069c5e2559e66c50eb8b7c5e8e4ffbd7916f049813b52c3035907d15b8df9dfd266a31a92883";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/lv/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/lv/firefox-69.0.1.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "5168aef4edacf147f4f26f8f6c9f9b051339bf8b3910d8cda527321c0a6bb410a4cccc016c939de7d99a2db3b096ca2a14bd9eb5889f468d8aea27d2d96db1a8";
+      sha512 = "0369ff96b5b31795df415f9cb7009208a6e061acd384e0eae689b6cd40e74c737c3137c6de001f4149cdde7f6e6e3ee24eee5d69ffc83426285cd109a29b5441";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/mk/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/mk/firefox-69.0.1.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "af4d3216ac877e1fed003056ccb9ef502ee8ed9984df609043190946d7017f0e94838a00c1bbdaae9ff0078a8779bb3e0cef668e9f38dc94f546ef9cb4691e1b";
+      sha512 = "89f9401be25014c9b209fde3f2696462cfcb8b700163190c7c81548dc610c53d930cde00b8d3e25506a2e50d55cca401f856c5a80e2d2a1a1c25f4ab3c167e75";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/mr/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/mr/firefox-69.0.1.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "744196bffb399181b66ae4c192febdf595906809985807a596d2e482c2e1d519c0e3500ad98d04518b6f71dbdcbacfc481972bf2cf7802ad81f6627fe3b59877";
+      sha512 = "5fe5f6a7f498d0c287bebb9962843c8d94f1f07245f55c8c904e768ede8fa41ee8b63628d63f03f73c9b46f08c1a10344a5267737cd5d89b7667cce7359cf01f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ms/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ms/firefox-69.0.1.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "5d79b3b383d4163a4ae5ee84c28d8578b27e4fb42d09691fa7cd6fdf77e3a74e5e83c9bac581fa59e74b2aaaf8713f9f3b6b1d5ad778579f274d6f08fb4fc36c";
+      sha512 = "8e38689f618fb80958b8aa91ce83114f52542c4ad42483f694df1b3825a1dc3de2cc34d61cac5fc55b2b35f9dead7f31e7ddd631f9336c5cf711f02ebbe9a2ee";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/my/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/my/firefox-69.0.1.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "60b128b6d0cc632667b496f8b61e39fd14ad4c1544b4d0041cf739622c5c1b1cae539e848fd5944d0c3286f0b03dc2de46a156457ec6e2efa155e13cf7ce279d";
+      sha512 = "5a8c6ac58cfb35b12cacfcbcf933a7aeb5ed8a425e15f9953746e593c6b15b517305d7e721c89d8fd66967f4fb3de0a50f1b6fa7dc4010a120f9d93745aa4e7c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/nb-NO/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/nb-NO/firefox-69.0.1.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "32e52dc1b1221862c0e3243e29234b330d73cc99c4500faf785aa911c92019e655beaab6f79911a8661a5efbd1dc8784aa328216653c2a206e52f703057f15c8";
+      sha512 = "80cc7131d33cdbf49a346ced7f8a771e2df9078cfca926e1eca14e15464dc84d574efe9212031f986f8af7b339f0a16a31c0f492ea19b4f728763124b21b30a7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ne-NP/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ne-NP/firefox-69.0.1.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "04802130d9f08cfef7d0f5d29e0ed0b9757c3b7fbac001bd35431ea4851edd8c2e4837518fa893381f6c0c976684ffedeaa96b2bcdec3849cd2cca6bf170bdd3";
+      sha512 = "42cc3265931455e4be0c4c0a25e108d8af14d786feb232d2b5c66695a9f182fb7d93f604390620c211aae38ab7e9d76d6e498867d886badf19a4034ab08503b4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/nl/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/nl/firefox-69.0.1.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "fc02ea317fa90caf203608a31f2a188971bf5d6a900c8f03a422ffa76adb1eefd32c55f317c7c89c8443d11a79f0041a6a111a78519b441eaa7ec4832bd8ad38";
+      sha512 = "1062c28e1a5d8ea5aecbe1af1b4b70e0cafa362c5cae1a5f7000220acb2f658cd3c5ccef8ea5bb35d6b14ddb211b34bd3a0169baa9d02a37ddfc1feb90f61326";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/nn-NO/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/nn-NO/firefox-69.0.1.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "f7f1274605b79541ec6f93cc7f023fe437c93e969d3644c6867a7c2c448f5504f9a6fc29f47c4267f13187ff6eb1b240e32e17dd2e5d66afc96e0a3bbecd9922";
+      sha512 = "9c0b4f0ed5cf8ed2d8fcd71c6d72f09a736a339dd83318ea5368652a154e05a695254fd4e78a3e8a185e0c10362e649883e772ff7e64249c6c470d39cb690f50";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/oc/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/oc/firefox-69.0.1.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "ce1c1a35de6ac933192cbdd49370d5cbf90dfb993dcc8e3c739f2e3ff2023cc793f7ffeec40b3ba4093449dcd37e221932a6c3771f8f70ec074bf79e50320f69";
+      sha512 = "407ff179331cf0dc5ae6061f3f5e1f13ae7df5dd5d23b664bcaeebc95e35e6c3b5307a5575264cb0037cbb4561d37dc68dc69a5660729a18593f9e3ed25770e3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/pa-IN/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/pa-IN/firefox-69.0.1.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "50b4826d83cf08ebccae048c4dd3760f3ec639427d6354de398b77501e73df5062b8090590fcd74be54005a7df61a8cd7c2f4207142bdcd6468b1fbc126801a3";
+      sha512 = "c1efcb59556591fa2de0568fffd0b6e29835144ca6cda471153c2336b4500cac0d367de84ef345cdd6d995297ec854df97380592477f42cc3f197b1cca443fd6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/pl/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/pl/firefox-69.0.1.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "ae77877e1eb03174a1899b2b5d0820b367553d56febea14df4f1545a7f10de16c9f4401efad4334ae04a4a5c8abe49b2e24c09263bc002937576ad5ce622ed17";
+      sha512 = "881e8e438564eb7de648a2bb9c199e184edee3c97382cebb989734e0d6aeb5c213590d6ea04ea6dbbe31c085e62be18172e4dede07d8d8f067de0b2e52d709a5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/pt-BR/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/pt-BR/firefox-69.0.1.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "92cd33b35927dddc22e8a3ff3833ce2bb4913ae9ea12d4220d88861f7badcd69d1dd97be22cb6546a8f09b0e7620e17eedddee3d159660c9128c288e49a47dbf";
+      sha512 = "b45f8802d0a9a1967b17f09bc99bc6761befb676e901fd0b0dc891f0d222c8d860337c70931a082a8508c68cc8b259d460e0534bf9e276c70f69a092f70f49a2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/pt-PT/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/pt-PT/firefox-69.0.1.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "fb8d011fca706e6337e0b0b13b2e1ec619565b954c887c71720240905ec5c085aa7037b54e8b3df316c253483a3d3c7ad2182b27d8591d4e2840c6a4f9e39382";
+      sha512 = "2b04403601a5c43fd1e5f4f69f3cc5a3761b1d017c97f3b9997317bbc4cb0960aeaac4df1145a8e64b64aa2397d0042fdcf49b0f01d8403b5d63fd26812c85a1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/rm/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/rm/firefox-69.0.1.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "fbf0e34fbae7da291cc132697b6505f3213ad07c78a47171827a9bd6c22b674629cd21a9f47187173cf21f1b168baad0f058365a9ab24e274a2d3aff5acd0e38";
+      sha512 = "37f0c828559cb9afc157765ea87b3045f827eff59c2a1fea62fc75c3b28886191578bd81d2f44c9acd6d9da0e63e67cc155724759e424f7f2d91ec3256a7f899";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ro/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ro/firefox-69.0.1.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "cb712f917e0b70936ba1222f03c8874134e1cac6c901d94792aada224d894a607829b64993535f0cf61d8a2a050f488452c35404400587222418c8312e2b22f6";
+      sha512 = "23a8b2753dabbaf2e020c0cab2359dbfd99e260d17346de48275941b43134d1b6fe844498e4fda10e5323adfd459757d2a1da3c82b441ac099455b8e33f2cad8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ru/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ru/firefox-69.0.1.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "7ba048f533655e5802347a6d409ed6db4441b421cb81d66269eb610336f3fe2077a5bea405f235c167390f745762ef29863e83e6e704bdec17404d26a97f8ab1";
+      sha512 = "b8999174e73e0002c06077575ed9a2b8b1dbbcac162a8d53eccde1a3ec50ef5bb26a123e89a5f38029c379560c0b6c67e8da355aeb42d151504fdf3cbac5bfab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/si/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/si/firefox-69.0.1.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "ea59ce14e80132d96f0419981dda30184809542978d158b8894c77cb4622c3f0bfb9bbbc4d456b386a023d9856ff6b02e5388ddfb0aced2ca764991ba8bab48e";
+      sha512 = "8dcc78847797a853f78eaa100f5cba6da54f52e28e3bb92f64ec1187421c871a4f6fbbfa51971b90d7476703862fdaef241110648e031038cd4a3aa62d9eb74d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/sk/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/sk/firefox-69.0.1.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "4665b3b4b96a07ea0530acf4063dacfa48ff39a65d2e1da0f6d3f65703c3916ed65a8881d8a9d92109e252993f63edfec899d00a3559149a282b615624267431";
+      sha512 = "416bbffcfd8a32f1c3c22f28beaf3fa45df693e373552ecc78c921dfb010db79c8423251697daf7ea3038dad07ba168786168915a7c4ff844a62167e929da9cd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/sl/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/sl/firefox-69.0.1.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "f3d6486a3dfc435933871cc8abcd3a428d724dfccca26be63df29d9f5b34fec115bb6e185b2aaf839f428d0ab44d33583610bf9d1c7f02de442506d1fc06192d";
+      sha512 = "b99af009ca4c1c7a190a31146de0ff2975196e89687fc37ec9b8c506a18bd9f4ccb1820751f52c50acb3c808998dea08151de3a38b69f62b45d7c80f97b0b42e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/son/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/son/firefox-69.0.1.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "6486e2f291deb1fb241df996e7898a9d487889815195d01d77d6bfcab6e2cb4bdc24c7694b6b05a95758ef130cb3332842e36446ffc2a926940ded5031cfa13c";
+      sha512 = "5efab88af1ade7d8c7437c638282c9f1fe8490174cfaa47563b0eaae7fe8c4b35210f240e4154458adf054924780c2a8d91b49158cc693cc3773f18963551434";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/sq/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/sq/firefox-69.0.1.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "b111d30e2cb7fd5edadc68b9d25fd8970db62d721e903d9874afe6b875b313d039dc7c4e98e3de07a09fe84ca7d0ed10da2e74cf3cd4953b2c25252e16e01516";
+      sha512 = "4a6b10da6d0de76aae0e63a12c81369d8068689e23a3d289629b64350dc5fe191c42d91b58100206befe81a7bdf899c66bad78883605d020eb1e7559b9f9d237";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/sr/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/sr/firefox-69.0.1.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "14c98d156bcae234c12f28166ee5ffc7d034529efb76536ffb29ee8baf850cb3c934ba177956ceba9c4cde2481064c3a906515328d1d8b6f5d9258cc1d30da94";
+      sha512 = "3833a2db3d8c2a9ef616cb1679c07c71280b74330771d79579c414619e3517bfec56c90712529bffaaf99abb07a63547a8aff9fb376f1089b3964c8dd92e523d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/sv-SE/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/sv-SE/firefox-69.0.1.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "a196eb9ec6b667d04dd787aae47a1dd22a99f01fdcbf6b36e9946038dad52ddc3d215e2307641c3f539e476c9b8e3f9470d78b914a243b51595f7d75cad2e114";
+      sha512 = "8dd898b57cff3dc25a52a7693f8e62f130af23a9c1e7d74a4c36abc5c6249f7b142006601596bd1cdc65b04c5b3ce2d8dcfce6caf230db047d1e7dba127f47d0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ta/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ta/firefox-69.0.1.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "d76c3797cd752a2b8021694421c224c2e2afa2d1350cb86263b01a8efd84b49cbda40a5c6b64f981833865944798148508fd6ae3532e82b773d650b41980893f";
+      sha512 = "7fa1f1e7dc3099a44841db01ee2746f87eaa4e93a12a5ba909e428b0dd5f3386a35eb66650fbd4b8e160d0a4c48f5b98c19a44a16b48432e576fe32ac953ebd5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/te/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/te/firefox-69.0.1.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "8bf86410d1d73cf355ecc4c2ef3308c35a31d55f90bba1c942f915e8cedee919c80729271c2d9e3aecbf499ca711f36bcf74c8b41c50024161e567d395485477";
+      sha512 = "74a78995878c2c207fc02abf667ef744008fe544c5f594d69c5c4653cb2adc58d56973591b4c0264d77993d76a2802dee1ce9b10b8355848ab6c11d0cfa3cc47";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/th/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/th/firefox-69.0.1.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "c757659188b17cfad880e70eab772517128bfa7d1dcdb86f313a63fb46c3f3d3504d66bf3ac99d1058848264ee4458bc5b77bf78009e9a7216c1fa359714a3d6";
+      sha512 = "2fdda53cdea8a2a153b192a52f76e4a5b73dd128310d53ad26c59fadd54734b8d2a2f88b11087e18d6179d0b7fb1a9e87f722c5241544860be25ea14542d7da9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/tr/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/tr/firefox-69.0.1.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "635ad19f913a2d6dc46df50589229658dcea0bc570f45b7c5ff8eb6878b852ebde3a490512d679a6257c39b16fb986f40ea2894c08caed8c485a91e95f4addc3";
+      sha512 = "8cb6a590382c080a0b6ed81a566b385f07e909a86faab077d2f0027a05d2e985e9ab4eee0103cb30f9e88fde7e63c20250f4b2165824426c7a3956e69a448219";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/uk/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/uk/firefox-69.0.1.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "99a3410ea2caf11911e7613568f7522230b13dcef48ffe6b95206a6a6d9f43f396b37bda1fad62dc4db097da55f96b30683626031491d88d116797b605d3cd2c";
+      sha512 = "a9269d73bfdbaa9f9c9484588a0921003c7602732a78c8c5316b00d67ef6ae43836a1fb606988fe3bc2143fb6be55a677a1238da0ad9d3a531bfc19ad0e7d482";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ur/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ur/firefox-69.0.1.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "aeb60017d6ff2deb1675880c2358eb2a8561196e6148e8f796bc6964d26c303355339d7e6e4526be0814190a3bc4a98b48228457d6709a762e0e36bc83f6fb52";
+      sha512 = "38696e57487b19eccd4669ee7fc0159f13a91abe062e21657111f95d58cf3183fcba370af94156b350a87810f9d73492e8ad2bd8e48a6ed5e82a9a3e54373099";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/uz/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/uz/firefox-69.0.1.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "99d025db18d86f75818354abfa56bb13041832605f25e0b91c87e18bda06d059ba62aec8be7141c8c6cc5f34edfeb83bfcff9234222ec88121b51fafdeab7ca1";
+      sha512 = "c912f028950f78c3b4b34c0f40d4381ccd961199f606d4ff8ce75c260dbc04b4eb471985edd61b7c380471835072ff7d58149bd98d029741ddcb39ea082c90e5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/vi/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/vi/firefox-69.0.1.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "5e5a586ed274f112ca20d729c89b949c46eefdf2d993e4bc27ecc4a40530f89ab68838dc458e510cb5d862e63c1b7b6188657650599dea920070092f091d6a2e";
+      sha512 = "40b0dd2c70c647dfa3f73db24d17296e719f6dedbff24fe7465799b9ae1deeac61a394a11095a93f48b785e5645ca8f801312e965dadf7de4fb964c87b90b17a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xh/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xh/firefox-69.0.1.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "fbcf97c7235c0a765fa083893dbd1e82e6b9befd8266bc86c1b1ca7a5d1674af2cdd8c86d6f2087683823eac2774e0b8983c4da93c72115ea4d53e6b73815140";
+      sha512 = "35993045afc78623d4ba1fb4e30c3c6e595f2ef02e5720f435d541af510ea552c254209f67afdad8d228bbf4c557885b5a9e2b6579973b323000a796d7e1a4a4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/zh-CN/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/zh-CN/firefox-69.0.1.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "93cce943be38357705ce7d1d4c5d88e5256c34280479216a4f739b60665ba832ef7b18b23730256871ce3bbfcae744ec421ebd56aaa73acb6cee91de03d0abe9";
+      sha512 = "e1cbdd94cb9c608f4c85354a1c683058eced84e783e6a76c08906983aa8b879094978747898cefe995bca4855ff463599d6288863739305f6a0eac0b0d07cda2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/zh-TW/firefox-69.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/zh-TW/firefox-69.0.1.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "407014668d7fd6802c1966cb8ac8571c151877ae3a9841e581784987a0337cff5c5ff191d13f305c371c7880a269b8483ac96b08bfd9f04b8ee4747adca5715d";
+      sha512 = "307e82f9c1b68e916c4369f57c52158be4279a8a5017bcd6e1d5c50e93ce8c25ebf07b115937ae0bf809a8e5448486d0f951b2c426a318037388de6ff58a2b02";
     }
     ];
 }
-- 
GitLab


From 751b661a0981e292bb705f429b6be43078325baf Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 19 Sep 2019 20:45:35 +0800
Subject: [PATCH 0569/2254] hedgewars: 1.0.0-beta1 -> 1.0.0-beta2

---
 pkgs/games/hedgewars/default.nix | 81 +++++++++++++++++++-------------
 pkgs/top-level/all-packages.nix  |  3 +-
 2 files changed, 49 insertions(+), 35 deletions(-)

diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix
index b3764ea1efc..bac7bd345f9 100644
--- a/pkgs/games/hedgewars/default.nix
+++ b/pkgs/games/hedgewars/default.nix
@@ -1,54 +1,69 @@
-{ SDL2_image, SDL2_ttf, SDL2_net, fpc, qt5, ghcWithPackages, ffmpeg, freeglut
-, stdenv, makeWrapper, fetchhg, cmake, pkgconfig, lua5_1, SDL2, SDL2_mixer
-, zlib, libpng, libGLU_combined, physfs
+{ mkDerivation, SDL2_image, SDL2_ttf, SDL2_net, fpc, ghcWithPackages, ffmpeg, freeglut
+, lib, fetchhg, cmake, pkgconfig, lua5_1, SDL2, SDL2_mixer
+, zlib, libpng, libGL, libGLU, physfs
+, qtbase, qttools
+, withServer ? true
 }:
 
 let
   ghc = ghcWithPackages (pkgs: with pkgs; [
-          network vector utf8-string bytestring random hslogger
-          SHA entropy pkgs.zlib sandi regex-tdfa
+          SHA bytestring entropy hslogger network pkgs.zlib random
+          regex-tdfa sandi utf8-string vector
         ]);
+
 in
-stdenv.mkDerivation {
-  version = "1.0.0-beta1";
+mkDerivation rec {
   pname = "hedgewars";
+  version = "1.0.0-beta2";
+
+  # it's crazy slow to fetch the whole repo but the beta versions are not
+  # released as tarballs
   src = fetchhg {
     url = "https://hg.hedgewars.org/hedgewars/";
-    rev = "7ab5cf405686";
-    sha256 = "1yrspi82ym5zpavka4cv0vh86g3i2mbbg8ccfcsid4f38lgbb9y4";
+    rev = "dff37ac61dcf";
+    sha256 = "1dsq6wfv3d7jfnr068b7ixpnqp0h6mj7zgby6h1viwblgbirri78";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ cmake pkgconfig qttools ];
+
   buildInputs = [
-    SDL2_ttf SDL2_net cmake lua5_1 SDL2 SDL2_mixer SDL2_image fpc
-    ghc ffmpeg freeglut makeWrapper physfs
-    qt5.qttools qt5.qtbase
-  ];
+    SDL2_ttf SDL2_net SDL2 SDL2_mixer SDL2_image
+    fpc lua5_1
+    ffmpeg freeglut physfs
+    qtbase
+  ] ++ lib.optional withServer ghc;
 
   postPatch = ''
-    substituteInPlace gameServer/CMakeLists.txt --replace mask evaluate
+    substituteInPlace gameServer/CMakeLists.txt \
+      --replace mask evaluate
   '';
 
-  preBuild = ''
-    export NIX_LDFLAGS="$NIX_LDFLAGS -rpath ${SDL2_image}/lib
-                                     -rpath ${SDL2_mixer}/lib
-                                     -rpath ${SDL2_net}/lib
-                                     -rpath ${SDL2_ttf}/lib
-                                     -rpath ${SDL2.out}/lib
-                                     -rpath ${libpng.out}/lib
-                                     -rpath ${lua5_1}/lib
-                                     -rpath ${libGLU_combined}/lib
-                                     -rpath ${zlib.out}/lib
-                                     "
-  '';
+  cmakeFlags = [
+    "-DNOVERSIONINFOUPDATE=ON"
+    "-DNOSERVER=${if withServer then "OFF" else "ON"}"
+  ];
 
-  postInstall = ''
-    wrapProgram $out/bin/hwengine --prefix LD_LIBRARY_PATH : $LD_LIBRARY_PATH:${stdenv.lib.makeLibraryPath [ libGLU_combined freeglut physfs ]}
-  '';
+  NIX_LDFLAGS = lib.concatMapStringsSep " " (e: "-rpath ${e}/lib") [
+    SDL2.out
+    SDL2_image
+    SDL2_mixer
+    SDL2_net
+    SDL2_ttf
+    libGL
+    libGLU
+    libpng.out
+    lua5_1
+    physfs
+    zlib.out
+  ];
+
+  qtWrapperArgs = [
+    "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL libGLU freeglut physfs ]}"
+  ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Turn-based strategy artillery game similar to Worms";
-    homepage = http://hedgewars.org/;
+    homepage = "http://hedgewars.org/";
     license = licenses.gpl2;
     longDescription = ''
        Each player controls a team of several hedgehogs. During the course of
@@ -74,7 +89,7 @@ stdenv.mkDerivation {
        hedgehog or hedgehogs after a player's or CPU turn is shown only when
        all movement on the battlefield has ceased).'';
     maintainers = with maintainers; [ kragniz fpletz ];
-    platforms = ghc.meta.platforms;
+    inherit (ghc.meta) platforms;
     hydraPlatforms = [];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ca37025f7f3..1f671db03b1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22051,9 +22051,8 @@ in
 
   hawkthorne = callPackage ../games/hawkthorne { love = love_0_9; };
 
-  hedgewars = callPackage ../games/hedgewars {
+  hedgewars = libsForQt5.callPackage ../games/hedgewars {
     inherit (haskellPackages) ghcWithPackages;
-    ffmpeg = ffmpeg_2;
   };
 
   hexen = callPackage ../games/hexen { };
-- 
GitLab


From a4edff0fecf43997d4647b103ff1a5719b5e216d Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Thu, 19 Sep 2019 21:50:43 +0900
Subject: [PATCH 0570/2254] firefox: 69.0 -> 69.0.1

---
 pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 3e8cf4d66b9..6a5bcbfcdbe 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -17,10 +17,10 @@ rec {
 
   firefox = common rec {
     pname = "firefox";
-    ffversion = "69.0";
+    ffversion = "69.0.1";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
-      sha512 = "2q0gky7a6ayb6mw8bw3s35q3ggibf7vfyrxgggz1l4lpcv6dwjj01x45071h106jkvnh71hycvp1cywf98lkybjbfp8c9kd8sivkd43";
+      sha512 = "0zvjwn17accmp9m55a9s12mw3cflsplysizfrpa3hy02na20w39g974d42fmxpk4zq4zqy4m17v2rpibibb0g7giy9rywndhaw3xrl9";
     };
 
     patches = [
-- 
GitLab


From 1adcf500eff92e88869cbce806f6b9264dc2ca50 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 19 Sep 2019 09:52:12 -0400
Subject: [PATCH 0571/2254] scala: 2.13.0 -> 2.13.1

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

diff --git a/pkgs/development/compilers/scala/2.13.nix b/pkgs/development/compilers/scala/2.13.nix
index ab27d93a7cf..6bba11af9d4 100644
--- a/pkgs/development/compilers/scala/2.13.nix
+++ b/pkgs/development/compilers/scala/2.13.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }:
 
 stdenv.mkDerivation rec {
-  name = "scala-2.13.0";
+  name = "scala-2.13.1";
 
   src = fetchurl {
     url = "https://www.scala-lang.org/files/archive/${name}.tgz";
-    sha256 = "12g0a9i0xxqxxcvmimm5w2wgmrdhq80p8bsp52d6yldz4lrnbm7p";
+    sha256 = "1nq49acx3j6vnw0lhyrfqa23f671y3kc9lja4nki0j73jk2cq639";
   };
 
   propagatedBuildInputs = [ jre ] ;
-- 
GitLab


From e400278e027f7abf4b888044c385de2f9ebc48e4 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 19 Sep 2019 09:53:12 -0400
Subject: [PATCH 0572/2254] scala: 2.12.9 -> 2.12.10

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

diff --git a/pkgs/development/compilers/scala/2.12.nix b/pkgs/development/compilers/scala/2.12.nix
index 0e4207dccac..9e11daced4a 100644
--- a/pkgs/development/compilers/scala/2.12.nix
+++ b/pkgs/development/compilers/scala/2.12.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }:
 
 stdenv.mkDerivation rec {
-  name = "scala-2.12.9";
+  name = "scala-2.12.10";
 
   src = fetchurl {
     url = "https://www.scala-lang.org/files/archive/${name}.tgz";
-    sha256 = "0wpnxrhnhhscfk0k8yxk86akpvxbr5w1i8jb2igj2q4vax7h97sy";
+    sha256 = "0sk5n3ir5zkgr8jayq5pn4l87ia5zmjr2zzwchgxkv8g62ivs4iv";
   };
 
   propagatedBuildInputs = [ jre ] ;
-- 
GitLab


From 93519f46cda70712267a7f0e737604785c75056e Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 19 Sep 2019 09:54:18 -0400
Subject: [PATCH 0573/2254] linux: 4.14.144 -> 4.14.145

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index 290a17f69f6..c5931f2da11 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.14.144";
+  version = "4.14.145";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0m6a0ggg6sxhpzmmbczwxpil5s0ndlvf4bd6zx4v4q50bdkq92yb";
+    sha256 = "0aa9b7ni6wadm43260vidqy4ngvws25027psbdnkl9hkcy0ba1gb";
   };
 } // (args.argsOverride or {}))
-- 
GitLab


From 1cb7951beb18257c179741e4fa58ed2cfa366722 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 19 Sep 2019 09:54:31 -0400
Subject: [PATCH 0574/2254] linux: 4.19.73 -> 4.19.74

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix
index e1c1a260375..5e0e5f882e4 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.19.73";
+  version = "4.19.74";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1asz4zyfw7iyg68x3h8r5pgbqpk4vpblfzcb295xmn52y9zfgdbx";
+    sha256 = "10pfg5sijw9sx66ybrb06nlmlvj0sxxa1yjhg6qwdhi9sgm2yp29";
   };
 } // (args.argsOverride or {}))
-- 
GitLab


From d35cd45d9f28c9a1e6db69f67a659a08a6858eae Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 19 Sep 2019 09:55:34 -0400
Subject: [PATCH 0575/2254] linux: 5.2.15 -> 5.2.16

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

diff --git a/pkgs/os-specific/linux/kernel/linux-5.2.nix b/pkgs/os-specific/linux/kernel/linux-5.2.nix
index 27459e9ac6d..69cfada3422 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.2.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.2.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.2.15";
+  version = "5.2.16";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "0jhc70r2rygm91qifjagg1jgbpjwyyq6m8g1n5iv81l1v84i0mpb";
+    sha256 = "0xg5jnkmc7b552jrhi200ck7q4hql3az2fpjfwxj3ay8xp4n280c";
   };
 } // (args.argsOverride or {}))
-- 
GitLab


From b24afa92941a7e0dcde22e550a3f4a829f5929d8 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 19 Sep 2019 10:01:19 -0400
Subject: [PATCH 0576/2254] vivaldi: 2.7.1628.33-1 -> 2.8.1664.35-1

---
 pkgs/applications/networking/browsers/vivaldi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index 6483b6d03e3..d93c8f85925 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -17,11 +17,11 @@ let
   vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
 in stdenv.mkDerivation rec {
   pname = "vivaldi";
-  version = "2.7.1628.33-1";
+  version = "2.8.1664.35-1";
 
   src = fetchurl {
     url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb";
-    sha256 = "1km5ccxqyd5xgmzm42zca670jf7wd4j7c726fhyj4wjni71zar34";
+    sha256 = "0wrpn2figljvq9xldpqb1wf81fpwj91ppi2lzvcg5ycpl2a90x7j";
   };
 
   unpackPhase = ''
-- 
GitLab


From 855d3e7eaf95ed331413a360e8e9c5788c74a75d Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 19 Sep 2019 09:39:29 -0500
Subject: [PATCH 0577/2254] tor: 0.4.1.5 -> 0.4.1.6

https://blog.torproject.org/new-release-tor-0416
---
 pkgs/tools/security/tor/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix
index 249ff435c5f..527c8064bac 100644
--- a/pkgs/tools/security/tor/default.nix
+++ b/pkgs/tools/security/tor/default.nix
@@ -15,11 +15,11 @@
 
 stdenv.mkDerivation rec {
   pname = "tor";
-  version = "0.4.1.5";
+  version = "0.4.1.6";
 
   src = fetchurl {
     url = "https://dist.torproject.org/${pname}-${version}.tar.gz";
-    sha256 = "0984jb6hdcc10f7aq8xzl7l4jf93skp45wkv2v63z4zv0nvf0r58";
+    sha256 = "0wgdid8w7srd218hh4rwslzdx2ickxw1pg18p2wry1r6wi65521a";
   };
 
   outputs = [ "out" "geoip" ];
-- 
GitLab


From dcb86e88561f5760e2c58972cc9c9ca041f3704d Mon Sep 17 00:00:00 2001
From: Anton-Latukha <anton.latukha@gmail.com>
Date: Thu, 19 Sep 2019 05:28:56 +0300
Subject: [PATCH 0578/2254] qt-gstreamer: drop

(Progresses Qt4 cleaup #33248, gstreamer cleanup #39975)

This is legacy version of a newer and legacy unmaintained version.
It is Qt4 and gstreamer 0.10.
This is a GNOME-related project, so Qt support dropped.
qt-gstreamers legacy has no dependencies.
---
 .../legacy/qt-gstreamer/boost1.48.patch       | 49 -------------------
 .../gstreamer/legacy/qt-gstreamer/default.nix | 20 --------
 pkgs/top-level/aliases.nix                    |  3 +-
 pkgs/top-level/all-packages.nix               |  2 -
 4 files changed, 1 insertion(+), 73 deletions(-)
 delete mode 100644 pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/boost1.48.patch
 delete mode 100644 pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix

diff --git a/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/boost1.48.patch b/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/boost1.48.patch
deleted file mode 100644
index c48eec68a64..00000000000
--- a/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/boost1.48.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Description: Work around moc limitations
- Some parts of Boost, introduced in Boost 1.48 are not
- understood by the limited C++ parser of moc.  This
- patch defines header guards that prevent the troublesome boost
- headers from being processed.
-Bug-Debian: #653796
-Author: Tobias Frost <tobi@coldtobi.de>
-Reviewed-By: Steve Robbins <smr@debian.org>
-
---- a/src/QGlib/connect.h
-+++ b/src/QGlib/connect.h
-@@ -19,6 +19,11 @@
- #ifndef QGLIB_CONNECT_H
- #define QGLIB_CONNECT_H
- 
-+#ifdef Q_MOC_RUN
-+#define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED
-+#endif
-+
-+
- #include "global.h"
- #include "quark.h"
- #include <QtCore/QObject>
---- a/src/QGst/bin.h
-+++ b/src/QGst/bin.h
-@@ -19,6 +19,10 @@
- #ifndef QGST_BIN_H
- #define QGST_BIN_H
- 
-+#ifdef Q_MOC_RUN
-+#define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED
-+#endif
-+
- #include "element.h"
- #include "childproxy.h"
- 
---- a/src/QGst/Ui/videowidget.h
-+++ b/src/QGst/Ui/videowidget.h
-@@ -19,6 +19,10 @@
- #ifndef QGST_UI_VIDEOWIDGET_H
- #define QGST_UI_VIDEOWIDGET_H
- 
-+#ifdef Q_MOC_RUN
-+#define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED
-+#endif
-+
- #include "global.h"
- #include "../element.h"
- #include <QtGui/QWidget>
diff --git a/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix b/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix
deleted file mode 100644
index 9797f21c168..00000000000
--- a/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ stdenv, fetchurl, gstreamer, gst-plugins-base, boost155, glib, qt4, cmake
-, automoc4, flex, bison, pkgconfig }:
-
-stdenv.mkDerivation rec {
-  name = "${pname}-0.10.3";
-  pname = "qt-gstreamer";
-
-  src = fetchurl {
-    url = "https://gstreamer.freedesktop.org/src/${pname}/${name}.tar.bz2";
-    sha256 = "1pqg9sxzk8sdrf7pazb5v21hasqai9i4l203gbdqz29w2ll1ybsl";
-  };
-
-  buildInputs = [ gstreamer gst-plugins-base glib qt4 ];
-  propagatedBuildInputs = [ boost155 ];
-  nativeBuildInputs = [ cmake automoc4 flex bison pkgconfig ];
-
-  cmakeFlags = "-DUSE_QT_PLUGIN_DIR=OFF -DUSE_GST_PLUGIN_DIR=OFF";
-
-  patches = [ ./boost1.48.patch ];
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index d2d438cf099..6b2a0df9c06 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -291,7 +291,6 @@ mapAliases ({
   pyo3-pack = maturin;
   pulseaudioLight = pulseaudio; # added 2018-04-25
   qca-qt5 = libsForQt5.qca-qt5;  # added 2015-12-19
-  qt_gstreamer = qt-gstreamer;  # added 2017-02
   qt_gstreamer1 = qt-gstreamer1;  # added 2017-02
   quake3game = ioquake3; # added 2016-01-14
   qwt6 = libsForQt5.qwt;  # added 2015-12-19
@@ -426,7 +425,7 @@ mapAliases ({
     ocamlPackages_latest;
 
   gst_all = { # added 2018-04-25
-    inherit (pkgs) gstreamer gnonlin gst-python qt-gstreamer;
+    inherit (pkgs) gstreamer gnonlin gst-python;
     gstPluginsBase = pkgs.gst-plugins-base;
     gstPluginsBad = pkgs.gst-plugins-bad;
     gstPluginsGood = pkgs.gst-plugins-good;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 81fae113b0a..780fae106fa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11082,8 +11082,6 @@ in
 
   qt-mobility = callPackage ../development/libraries/qt-mobility {};
 
-  qt-gstreamer = callPackage ../development/libraries/gstreamer/legacy/qt-gstreamer {};
-
   qt-gstreamer1 = callPackage ../development/libraries/gstreamer/qt-gstreamer { boost = boost155; };
 
   qtstyleplugin-kvantum-qt4 = callPackage ../development/libraries/qtstyleplugin-kvantum-qt4 { };
-- 
GitLab


From 37de7c56ce02ca05f50d254a6558549230a7268e Mon Sep 17 00:00:00 2001
From: Anton-Latukha <anton.latukha@gmail.com>
Date: Thu, 19 Sep 2019 17:47:21 +0300
Subject: [PATCH 0579/2254] qt_gstreamer1: drop

If someone would be interested - last commit builds with {Qt5, Qt5 config flag}
---
 .../gstreamer/qt-gstreamer/default.nix        | 32 -------------------
 pkgs/top-level/aliases.nix                    |  1 -
 pkgs/top-level/all-packages.nix               |  1 -
 3 files changed, 34 deletions(-)
 delete mode 100644 pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix

diff --git a/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix b/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix
deleted file mode 100644
index a099643061a..00000000000
--- a/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ stdenv, fetchurl, fetchpatch, gst_all_1, boost, glib, qt4, cmake
-, automoc4, flex, bison, pkgconfig }:
-
-stdenv.mkDerivation rec {
-  name = "${pname}-1.2.0";
-  pname = "qt-gstreamer";
-
-  src = fetchurl {
-    url = "https://gstreamer.freedesktop.org/src/${pname}/${name}.tar.xz";
-    sha256 = "9f3b492b74cad9be918e4c4db96df48dab9c012f2ae5667f438b64a4d92e8fd4";
-  };
-
-  patches = [
-    (fetchpatch {
-      url = "https://cgit.freedesktop.org/gstreamer/qt-gstreamer/patch/?id=e2ca8094aa8d0eac1c3a98df66fe94ce0c754088";
-      sha256 = "1qps0nlc26d74wk8h96xl5s3d9qrdx6c0ph0zpl1dnc691lgyf6s";
-    })
-  ];
-
-  outputs = [ "out" "dev" ];
-
-  buildInputs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base glib qt4 ];
-  propagatedBuildInputs = [ boost ];
-  nativeBuildInputs = [ cmake automoc4 flex bison pkgconfig ];
-
-  cmakeFlags = "-DUSE_QT_PLUGIN_DIR=OFF -DUSE_GST_PLUGIN_DIR=OFF";
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    license = licenses.lgpl21;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 6b2a0df9c06..b19f185b4ae 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -291,7 +291,6 @@ mapAliases ({
   pyo3-pack = maturin;
   pulseaudioLight = pulseaudio; # added 2018-04-25
   qca-qt5 = libsForQt5.qca-qt5;  # added 2015-12-19
-  qt_gstreamer1 = qt-gstreamer1;  # added 2017-02
   quake3game = ioquake3; # added 2016-01-14
   qwt6 = libsForQt5.qwt;  # added 2015-12-19
   qtpfsgui = throw "Is now luminanceHDR"; # added 2019-06-26
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 780fae106fa..f3e5b2f44b9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11082,7 +11082,6 @@ in
 
   qt-mobility = callPackage ../development/libraries/qt-mobility {};
 
-  qt-gstreamer1 = callPackage ../development/libraries/gstreamer/qt-gstreamer { boost = boost155; };
 
   qtstyleplugin-kvantum-qt4 = callPackage ../development/libraries/qtstyleplugin-kvantum-qt4 { };
 
-- 
GitLab


From 2584e3328841372d25af366f1238bfcc9b865079 Mon Sep 17 00:00:00 2001
From: Jan Hrnko <jan.hrnko@satoshilabs.com>
Date: Thu, 19 Sep 2019 16:24:50 +0200
Subject: [PATCH 0580/2254] pdfsam-basic: init at 4.0.4

---
 .../misc/pdfsam-basic/default.nix             | 49 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 51 insertions(+)
 create mode 100644 pkgs/applications/misc/pdfsam-basic/default.nix

diff --git a/pkgs/applications/misc/pdfsam-basic/default.nix b/pkgs/applications/misc/pdfsam-basic/default.nix
new file mode 100644
index 00000000000..30e68a89a1c
--- /dev/null
+++ b/pkgs/applications/misc/pdfsam-basic/default.nix
@@ -0,0 +1,49 @@
+{ stdenv, makeDesktopItem, fetchurl, jdk11, wrapGAppsHook, glib }:
+
+stdenv.mkDerivation rec {
+  pname = "pdfsam-basic";
+  version = "4.0.4";
+
+  src = fetchurl {
+    url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam_${version}-1_amd64.deb";
+    sha256 = "17lhzxlgr4l4dljy0b0avfrgbj9rsfzk1dzg0abqvld4w4igkqbq";
+  };
+
+  unpackPhase = ''
+    ar vx ${src}
+    tar xvf data.tar.gz
+  '';
+
+  nativeBuildInputs = [ wrapGAppsHook ];
+  buildInputs = [ glib ];
+
+  preFixup = ''
+    gappsWrapperArgs+=(--set JAVA_HOME "${jdk11}" --set PDFSAM_JAVA_PATH "${jdk11}")
+  '';
+
+  installPhase = ''
+    cp -R opt/pdfsam-basic/ $out/
+    mkdir -p "$out"/share/icons
+    cp --recursive ${desktopItem}/share/applications $out/share
+    cp $out/icon.svg "$out"/share/icons/pdfsam-basic.svg
+  '';
+
+  desktopItem = makeDesktopItem {
+    name = pname;
+    exec = pname;
+    icon = pname;
+    comment = meta.description;
+    desktopName = "PDFsam Basic";
+    genericName = "PDF Split and Merge";
+    mimeType = "application/pdf;";
+    categories = "Office;Application;";
+  };
+
+  meta = with stdenv.lib; {
+      homepage = "https://github.com/torakiki/pdfsam";
+      description = "Multi-platform software designed to extract pages, split, merge, mix and rotate PDF files";
+      license = licenses.agpl3;
+      platforms = platforms.all;
+      maintainers = with maintainers; [ maintainers."1000101" ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3114319dec4..6f882dcef13 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19665,6 +19665,8 @@ in
 
   pdfdiff = callPackage ../applications/misc/pdfdiff { };
 
+  pdfsam-basic = callPackage ../applications/misc/pdfsam-basic { };
+
   mupdf = callPackage ../applications/misc/mupdf { };
 
   mystem = callPackage ../applications/misc/mystem { };
-- 
GitLab


From 1325976d745f3d077abbec51bc6440a9cf9f5228 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Thu, 19 Sep 2019 18:20:31 +0200
Subject: [PATCH 0581/2254] libfido2: 1.1.0 -> 1.2.0

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

diff --git a/pkgs/development/libraries/libfido2/default.nix b/pkgs/development/libraries/libfido2/default.nix
index b670172ce1e..5fefdad08e7 100644
--- a/pkgs/development/libraries/libfido2/default.nix
+++ b/pkgs/development/libraries/libfido2/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   pname = "libfido2";
-  version = "1.1.0";
+  version = "1.2.0";
   src = fetchurl {
     url = "https://developers.yubico.com/libfido2/Releases/libfido2-${version}.tar.gz";
-    sha256 = "1h51q9pgv54czf7k6v90b02gnvqw4dlxmz6vi0n06shpkdzv5jh1";
+    sha256 = "1pbllhzcrzkgxad00bai7lna8dpkwiv8khx8p20miy661abv956v";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];
-- 
GitLab


From 07d78691da23038caef6c7c23c6565c731c72cec Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 19 Sep 2019 12:46:15 -0400
Subject: [PATCH 0582/2254] stdenv/adapters.nix: remove static from
 makeStaticLibraries
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This logic should be in the pkgs/top-level/static.nix. We don’t want
to pollute Nixpkgs with =if stdenv.static=. Also, "static" is not
descriptive. We have two types of static stdenvs, ‘makeStaticLibaries’
and ‘makeStaticBinaries’. We shouldn’t rely on a static boolean like
this.
---
 pkgs/stdenv/adapters.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix
index 8f62bd24dda..041964bcacc 100644
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -62,7 +62,6 @@ rec {
         ];
         mesonFlags = (args.mesonFlags or []) ++ [ "-Ddefault_library=static" ];
       });
-      static = true;
     };
 
 
-- 
GitLab


From b0ccd6dd16909c8639c2d9bee7dd2a2a0ac74c30 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 19 Sep 2019 19:17:30 +0200
Subject: [PATCH 0583/2254] Revert "nixos/doc: re-format"

This reverts commit ea6e8775bd69e4676c623a85c39f1da540d29ad1. The new
format is not an improvement.
---
 .../manual/administration/boot-problems.xml   |  32 +-
 .../manual/administration/cleaning-store.xml  |  32 +-
 .../administration/container-networking.xml   |  26 +-
 .../doc/manual/administration/containers.xml  |  19 +-
 .../manual/administration/control-groups.xml  |  33 +-
 .../administration/declarative-containers.xml |  31 +-
 .../administration/imperative-containers.xml  |  57 +-
 nixos/doc/manual/administration/logging.xml   |  19 +-
 .../administration/maintenance-mode.xml       |   4 +-
 .../administration/network-problems.xml       |  13 +-
 nixos/doc/manual/administration/rebooting.xml |  11 +-
 nixos/doc/manual/administration/rollback.xml  |  15 +-
 nixos/doc/manual/administration/running.xml   |   3 +-
 .../manual/administration/service-mgmt.xml    |  26 +-
 .../administration/store-corruption.xml       |  17 +-
 .../manual/administration/troubleshooting.xml |   3 +-
 .../manual/administration/user-sessions.xml   |  15 +-
 .../doc/manual/configuration/abstractions.xml |  48 +-
 .../configuration/ad-hoc-network-config.xml   |   5 +-
 .../manual/configuration/ad-hoc-packages.xml  |  26 +-
 .../configuration/adding-custom-packages.xml  |  23 +-
 .../doc/manual/configuration/config-file.xml  |  71 +-
 .../manual/configuration/config-syntax.xml    |  14 +-
 .../manual/configuration/configuration.xml    |   6 +-
 .../configuration/customizing-packages.xml    |  54 +-
 .../configuration/declarative-packages.xml    |  23 +-
 .../doc/manual/configuration/file-systems.xml |  28 +-
 nixos/doc/manual/configuration/firewall.xml   |  15 +-
 .../doc/manual/configuration/ipv4-config.xml  |  15 +-
 .../doc/manual/configuration/ipv6-config.xml  |  13 +-
 nixos/doc/manual/configuration/kubernetes.xml |  74 +-
 .../doc/manual/configuration/linux-kernel.xml |  59 +-
 .../configuration/luks-file-systems.xml       |  12 +-
 nixos/doc/manual/configuration/matrix.xml     |  73 +-
 nixos/doc/manual/configuration/modularity.xml |  63 +-
 .../manual/configuration/network-manager.xml  |  22 +-
 nixos/doc/manual/configuration/networking.xml |   3 +-
 .../doc/manual/configuration/package-mgmt.xml |  13 +-
 nixos/doc/manual/configuration/profiles.xml   |  13 +-
 .../configuration/profiles/all-hardware.xml   |  10 +-
 .../manual/configuration/profiles/base.xml    |   6 +-
 .../configuration/profiles/clone-config.xml   |  10 +-
 .../manual/configuration/profiles/demo.xml    |   6 +-
 .../profiles/docker-container.xml             |   7 +-
 .../configuration/profiles/graphical.xml      |  11 +-
 .../configuration/profiles/hardened.xml       |  14 +-
 .../configuration/profiles/headless.xml       |   6 +-
 .../profiles/installation-device.xml          |  25 +-
 .../manual/configuration/profiles/minimal.xml |   8 +-
 .../configuration/profiles/qemu-guest.xml     |   7 +-
 nixos/doc/manual/configuration/ssh.xml        |   7 +-
 nixos/doc/manual/configuration/summary.xml    |   8 +-
 nixos/doc/manual/configuration/user-mgmt.xml  |  53 +-
 nixos/doc/manual/configuration/wireless.xml   |  18 +-
 nixos/doc/manual/configuration/x-windows.xml  | 151 +++-
 nixos/doc/manual/configuration/xfce.xml       |  21 +-
 nixos/doc/manual/development/assertions.xml   |  18 +-
 .../doc/manual/development/building-nixos.xml |  11 +-
 .../doc/manual/development/building-parts.xml |  31 +-
 .../manual/development/importing-modules.xml  |   7 +-
 .../manual/development/meta-attributes.xml    |  19 +-
 nixos/doc/manual/development/nixos-tests.xml  |   9 +-
 .../development/option-declarations.xml       |  80 +-
 nixos/doc/manual/development/option-def.xml   |  34 +-
 nixos/doc/manual/development/option-types.xml | 208 +++--
 nixos/doc/manual/development/releases.xml     | 126 +--
 .../manual/development/replace-modules.xml    |  22 +-
 .../running-nixos-tests-interactively.xml     |  14 +-
 .../development/running-nixos-tests.xml       |  13 +-
 nixos/doc/manual/development/sources.xml      |  48 +-
 .../manual/development/testing-installer.xml  |   6 +-
 .../development/writing-documentation.xml     |  74 +-
 .../manual/development/writing-modules.xml    |  69 +-
 .../development/writing-nixos-tests.xml       | 113 ++-
 .../manual/installation/changing-config.xml   |  53 +-
 .../doc/manual/installation/installation.xml  |   3 +-
 .../installing-behind-a-proxy.xml             |  15 +-
 .../installing-from-other-distro.xml          | 152 +++-
 .../manual/installation/installing-pxe.xml    |  25 +-
 .../manual/installation/installing-usb.xml    |  15 +-
 .../installing-virtualbox-guest.xml           |  29 +-
 nixos/doc/manual/installation/installing.xml  | 230 ++++--
 nixos/doc/manual/installation/obtaining.xml   |  38 +-
 nixos/doc/manual/installation/upgrading.xml   |  82 +-
 nixos/doc/manual/man-configuration.xml        |   5 +-
 nixos/doc/manual/man-nixos-build-vms.xml      |  41 +-
 nixos/doc/manual/man-nixos-enter.xml          |  22 +-
 .../doc/manual/man-nixos-generate-config.xml  |  64 +-
 nixos/doc/manual/man-nixos-install.xml        |  95 ++-
 nixos/doc/manual/man-nixos-option.xml         |  27 +-
 nixos/doc/manual/man-nixos-rebuild.xml        | 309 +++++---
 nixos/doc/manual/man-nixos-version.xml        |  23 +-
 nixos/doc/manual/manual.xml                   |  21 +-
 .../manual/release-notes/release-notes.xml    |   3 +-
 nixos/doc/manual/release-notes/rl-1404.xml    |  83 +-
 nixos/doc/manual/release-notes/rl-1412.xml    |  81 +-
 nixos/doc/manual/release-notes/rl-1509.xml    | 208 +++--
 nixos/doc/manual/release-notes/rl-1603.xml    | 205 ++++-
 nixos/doc/manual/release-notes/rl-1609.xml    | 161 +++-
 nixos/doc/manual/release-notes/rl-1703.xml    | 193 +++--
 nixos/doc/manual/release-notes/rl-1709.xml    | 292 +++++--
 nixos/doc/manual/release-notes/rl-1803.xml    | 266 +++++--
 nixos/doc/manual/release-notes/rl-1809.xml    | 311 ++++++--
 nixos/doc/manual/release-notes/rl-1903.xml    | 448 +++++++++--
 nixos/doc/manual/release-notes/rl-1909.xml    | 731 ++++++++++--------
 nixos/doc/manual/release-notes/rl-2003.xml    |   7 +-
 nixos/modules/i18n/input-method/default.xml   |  74 +-
 nixos/modules/programs/digitalbitbox/doc.xml  |  33 +-
 nixos/modules/programs/plotinus.xml           |  13 +-
 nixos/modules/programs/zsh/oh-my-zsh.xml      |  62 +-
 nixos/modules/security/acme.xml               |  30 +-
 nixos/modules/security/hidepid.xml            |  11 +-
 .../services/databases/foundationdb.xml       | 197 ++++-
 .../modules/services/databases/postgresql.xml |  39 +-
 nixos/modules/services/desktops/flatpak.xml   |  25 +-
 nixos/modules/services/editors/emacs.xml      | 221 ++++--
 nixos/modules/services/hardware/trezord.xml   |  10 +-
 nixos/modules/services/misc/gitlab.xml        |  34 +-
 .../modules/services/misc/taskserver/doc.xml  |  74 +-
 nixos/modules/services/misc/weechat.xml       |  21 +-
 .../monitoring/prometheus/exporters.xml       |  51 +-
 .../services/networking/dnscrypt-proxy.xml    |  14 +-
 .../modules/services/web-apps/matomo-doc.xml  |  56 +-
 nixos/modules/services/web-apps/nextcloud.xml |  55 +-
 124 files changed, 5663 insertions(+), 1894 deletions(-)

diff --git a/nixos/doc/manual/administration/boot-problems.xml b/nixos/doc/manual/administration/boot-problems.xml
index d6f9cb190fb..de3d8ac21ae 100644
--- a/nixos/doc/manual/administration/boot-problems.xml
+++ b/nixos/doc/manual/administration/boot-problems.xml
@@ -6,7 +6,12 @@
  <title>Boot Problems</title>
 
  <para>
-  If NixOS fails to boot, there are a number of kernel command line parameters that may help you to identify or fix the issue. You can add these parameters in the GRUB boot menu by pressing “e” to modify the selected boot entry and editing the line starting with <literal>linux</literal>. The following are some useful kernel command line parameters that are recognised by the NixOS boot scripts or by systemd:
+  If NixOS fails to boot, there are a number of kernel command line parameters
+  that may help you to identify or fix the issue. You can add these parameters
+  in the GRUB boot menu by pressing “e” to modify the selected boot entry
+  and editing the line starting with <literal>linux</literal>. The following
+  are some useful kernel command line parameters that are recognised by the
+  NixOS boot scripts or by systemd:
   <variablelist>
    <varlistentry>
     <term>
@@ -14,7 +19,9 @@
     </term>
     <listitem>
      <para>
-      Start a root shell if something goes wrong in stage 1 of the boot process (the initial ramdisk). This is disabled by default because there is no authentication for the root shell.
+      Start a root shell if something goes wrong in stage 1 of the boot process
+      (the initial ramdisk). This is disabled by default because there is no
+      authentication for the root shell.
      </para>
     </listitem>
    </varlistentry>
@@ -24,7 +31,10 @@
     </term>
     <listitem>
      <para>
-      Start an interactive shell in stage 1 before anything useful has been done. That is, no modules have been loaded and no file systems have been mounted, except for <filename>/proc</filename> and <filename>/sys</filename>.
+      Start an interactive shell in stage 1 before anything useful has been
+      done. That is, no modules have been loaded and no file systems have been
+      mounted, except for <filename>/proc</filename> and
+      <filename>/sys</filename>.
      </para>
     </listitem>
    </varlistentry>
@@ -44,7 +54,11 @@
     </term>
     <listitem>
      <para>
-      Boot into rescue mode (a.k.a. single user mode). This will cause systemd to start nothing but the unit <literal>rescue.target</literal>, which runs <command>sulogin</command> to prompt for the root password and start a root login shell. Exiting the shell causes the system to continue with the normal boot process.
+      Boot into rescue mode (a.k.a. single user mode). This will cause systemd
+      to start nothing but the unit <literal>rescue.target</literal>, which
+      runs <command>sulogin</command> to prompt for the root password and start
+      a root login shell. Exiting the shell causes the system to continue with
+      the normal boot process.
      </para>
     </listitem>
    </varlistentry>
@@ -54,7 +68,8 @@
     </term>
     <listitem>
      <para>
-      Make systemd very verbose and send log messages to the console instead of the journal.
+      Make systemd very verbose and send log messages to the console instead of
+      the journal.
      </para>
     </listitem>
    </varlistentry>
@@ -65,6 +80,11 @@
  </para>
 
  <para>
-  If no login prompts or X11 login screens appear (e.g. due to hanging dependencies), you can press Alt+ArrowUp. If you’re lucky, this will start rescue mode (described above). (Also note that since most units have a 90-second timeout before systemd gives up on them, the <command>agetty</command> login prompts should appear eventually unless something is very wrong.)
+  If no login prompts or X11 login screens appear (e.g. due to hanging
+  dependencies), you can press Alt+ArrowUp. If you’re lucky, this will start
+  rescue mode (described above). (Also note that since most units have a
+  90-second timeout before systemd gives up on them, the
+  <command>agetty</command> login prompts should appear eventually unless
+  something is very wrong.)
  </para>
 </section>
diff --git a/nixos/doc/manual/administration/cleaning-store.xml b/nixos/doc/manual/administration/cleaning-store.xml
index 3cbc022cd33..526803e429b 100644
--- a/nixos/doc/manual/administration/cleaning-store.xml
+++ b/nixos/doc/manual/administration/cleaning-store.xml
@@ -5,22 +5,31 @@
         xml:id="sec-nix-gc">
  <title>Cleaning the Nix Store</title>
  <para>
-  Nix has a purely functional model, meaning that packages are never upgraded in place. Instead new versions of packages end up in a different location in the Nix store (<filename>/nix/store</filename>). You should periodically run Nix’s <emphasis>garbage collector</emphasis> to remove old, unreferenced packages. This is easy:
+  Nix has a purely functional model, meaning that packages are never upgraded
+  in place. Instead new versions of packages end up in a different location in
+  the Nix store (<filename>/nix/store</filename>). You should periodically run
+  Nix’s <emphasis>garbage collector</emphasis> to remove old, unreferenced
+  packages. This is easy:
 <screen>
 <prompt>$ </prompt>nix-collect-garbage
 </screen>
-  Alternatively, you can use a systemd unit that does the same in the background:
+  Alternatively, you can use a systemd unit that does the same in the
+  background:
 <screen>
 <prompt># </prompt>systemctl start nix-gc.service
 </screen>
-  You can tell NixOS in <filename>configuration.nix</filename> to run this unit automatically at certain points in time, for instance, every night at 03:15:
+  You can tell NixOS in <filename>configuration.nix</filename> to run this unit
+  automatically at certain points in time, for instance, every night at 03:15:
 <programlisting>
 <xref linkend="opt-nix.gc.automatic"/> = true;
 <xref linkend="opt-nix.gc.dates"/> = "03:15";
 </programlisting>
  </para>
  <para>
-  The commands above do not remove garbage collector roots, such as old system configurations. Thus they do not remove the ability to roll back to previous configurations. The following command deletes old roots, removing the ability to roll back to them:
+  The commands above do not remove garbage collector roots, such as old system
+  configurations. Thus they do not remove the ability to roll back to previous
+  configurations. The following command deletes old roots, removing the ability
+  to roll back to them:
 <screen>
 <prompt>$ </prompt>nix-collect-garbage -d
 </screen>
@@ -28,20 +37,27 @@
 <screen>
 <prompt>$ </prompt>nix-env -p /nix/var/nix/profiles/per-user/eelco/profile --delete-generations old
 </screen>
-  Note that NixOS system configurations are stored in the profile <filename>/nix/var/nix/profiles/system</filename>.
+  Note that NixOS system configurations are stored in the profile
+  <filename>/nix/var/nix/profiles/system</filename>.
  </para>
  <para>
-  Another way to reclaim disk space (often as much as 40% of the size of the Nix store) is to run Nix’s store optimiser, which seeks out identical files in the store and replaces them with hard links to a single copy.
+  Another way to reclaim disk space (often as much as 40% of the size of the
+  Nix store) is to run Nix’s store optimiser, which seeks out identical files
+  in the store and replaces them with hard links to a single copy.
 <screen>
 <prompt>$ </prompt>nix-store --optimise
 </screen>
-  Since this command needs to read the entire Nix store, it can take quite a while to finish.
+  Since this command needs to read the entire Nix store, it can take quite a
+  while to finish.
  </para>
  <section xml:id="sect-nixos-gc-boot-entries">
   <title>NixOS Boot Entries</title>
 
   <para>
-   If your <filename>/boot</filename> partition runs out of space, after clearing old profiles you must rebuild your system with <literal>nixos-rebuild</literal> to update the <filename>/boot</filename> partition and clear space.
+   If your <filename>/boot</filename> partition runs out of space, after
+   clearing old profiles you must rebuild your system with
+   <literal>nixos-rebuild</literal> to update the <filename>/boot</filename>
+   partition and clear space.
   </para>
  </section>
 </chapter>
diff --git a/nixos/doc/manual/administration/container-networking.xml b/nixos/doc/manual/administration/container-networking.xml
index 745fa524916..42486f01fe8 100644
--- a/nixos/doc/manual/administration/container-networking.xml
+++ b/nixos/doc/manual/administration/container-networking.xml
@@ -6,7 +6,10 @@
  <title>Container Networking</title>
 
  <para>
-  When you create a container using <literal>nixos-container create</literal>, it gets it own private IPv4 address in the range <literal>10.233.0.0/16</literal>. You can get the container’s IPv4 address as follows:
+  When you create a container using <literal>nixos-container create</literal>,
+  it gets it own private IPv4 address in the range
+  <literal>10.233.0.0/16</literal>. You can get the container’s IPv4 address
+  as follows:
 <screen>
 <prompt># </prompt>nixos-container show-ip foo
 10.233.4.2
@@ -17,21 +20,34 @@
  </para>
 
  <para>
-  Networking is implemented using a pair of virtual Ethernet devices. The network interface in the container is called <literal>eth0</literal>, while the matching interface in the host is called <literal>ve-<replaceable>container-name</replaceable></literal> (e.g., <literal>ve-foo</literal>). The container has its own network namespace and the <literal>CAP_NET_ADMIN</literal> capability, so it can perform arbitrary network configuration such as setting up firewall rules, without affecting or having access to the host’s network.
+  Networking is implemented using a pair of virtual Ethernet devices. The
+  network interface in the container is called <literal>eth0</literal>, while
+  the matching interface in the host is called
+  <literal>ve-<replaceable>container-name</replaceable></literal> (e.g.,
+  <literal>ve-foo</literal>). The container has its own network namespace and
+  the <literal>CAP_NET_ADMIN</literal> capability, so it can perform arbitrary
+  network configuration such as setting up firewall rules, without affecting or
+  having access to the host’s network.
  </para>
 
  <para>
-  By default, containers cannot talk to the outside network. If you want that, you should set up Network Address Translation (NAT) rules on the host to rewrite container traffic to use your external IP address. This can be accomplished using the following configuration on the host:
+  By default, containers cannot talk to the outside network. If you want that,
+  you should set up Network Address Translation (NAT) rules on the host to
+  rewrite container traffic to use your external IP address. This can be
+  accomplished using the following configuration on the host:
 <programlisting>
 <xref linkend="opt-networking.nat.enable"/> = true;
 <xref linkend="opt-networking.nat.internalInterfaces"/> = ["ve-+"];
 <xref linkend="opt-networking.nat.externalInterface"/> = "eth0";
 </programlisting>
-  where <literal>eth0</literal> should be replaced with the desired external interface. Note that <literal>ve-+</literal> is a wildcard that matches all container interfaces.
+  where <literal>eth0</literal> should be replaced with the desired external
+  interface. Note that <literal>ve-+</literal> is a wildcard that matches all
+  container interfaces.
  </para>
 
  <para>
-  If you are using Network Manager, you need to explicitly prevent it from managing container interfaces:
+  If you are using Network Manager, you need to explicitly prevent it from
+  managing container interfaces:
 <programlisting>
 networking.networkmanager.unmanaged = [ "interface-name:ve-*" ];
 </programlisting>
diff --git a/nixos/doc/manual/administration/containers.xml b/nixos/doc/manual/administration/containers.xml
index 2d5a6dd46a3..0d3355e56a5 100644
--- a/nixos/doc/manual/administration/containers.xml
+++ b/nixos/doc/manual/administration/containers.xml
@@ -5,15 +5,28 @@
         xml:id="ch-containers">
  <title>Container Management</title>
  <para>
-  NixOS allows you to easily run other NixOS instances as <emphasis>containers</emphasis>. Containers are a light-weight approach to virtualisation that runs software in the container at the same speed as in the host system. NixOS containers share the Nix store of the host, making container creation very efficient.
+  NixOS allows you to easily run other NixOS instances as
+  <emphasis>containers</emphasis>. Containers are a light-weight approach to
+  virtualisation that runs software in the container at the same speed as in
+  the host system. NixOS containers share the Nix store of the host, making
+  container creation very efficient.
  </para>
  <warning>
   <para>
-   Currently, NixOS containers are not perfectly isolated from the host system. This means that a user with root access to the container can do things that affect the host. So you should not give container root access to untrusted users.
+   Currently, NixOS containers are not perfectly isolated from the host system.
+   This means that a user with root access to the container can do things that
+   affect the host. So you should not give container root access to untrusted
+   users.
   </para>
  </warning>
  <para>
-  NixOS containers can be created in two ways: imperatively, using the command <command>nixos-container</command>, and declaratively, by specifying them in your <filename>configuration.nix</filename>. The declarative approach implies that containers get upgraded along with your host system when you run <command>nixos-rebuild</command>, which is often not what you want. By contrast, in the imperative approach, containers are configured and updated independently from the host system.
+  NixOS containers can be created in two ways: imperatively, using the command
+  <command>nixos-container</command>, and declaratively, by specifying them in
+  your <filename>configuration.nix</filename>. The declarative approach implies
+  that containers get upgraded along with your host system when you run
+  <command>nixos-rebuild</command>, which is often not what you want. By
+  contrast, in the imperative approach, containers are configured and updated
+  independently from the host system.
  </para>
  <xi:include href="imperative-containers.xml" />
  <xi:include href="declarative-containers.xml" />
diff --git a/nixos/doc/manual/administration/control-groups.xml b/nixos/doc/manual/administration/control-groups.xml
index d6ae89da30c..16d03cc0d1a 100644
--- a/nixos/doc/manual/administration/control-groups.xml
+++ b/nixos/doc/manual/administration/control-groups.xml
@@ -5,10 +5,16 @@
         xml:id="sec-cgroups">
  <title>Control Groups</title>
  <para>
-  To keep track of the processes in a running system, systemd uses <emphasis>control groups</emphasis> (cgroups). A control group is a set of processes used to allocate resources such as CPU, memory or I/O bandwidth. There can be multiple control group hierarchies, allowing each kind of resource to be managed independently.
+  To keep track of the processes in a running system, systemd uses
+  <emphasis>control groups</emphasis> (cgroups). A control group is a set of
+  processes used to allocate resources such as CPU, memory or I/O bandwidth.
+  There can be multiple control group hierarchies, allowing each kind of
+  resource to be managed independently.
  </para>
  <para>
-  The command <command>systemd-cgls</command> lists all control groups in the <literal>systemd</literal> hierarchy, which is what systemd uses to keep track of the processes belonging to each service or user session:
+  The command <command>systemd-cgls</command> lists all control groups in the
+  <literal>systemd</literal> hierarchy, which is what systemd uses to keep
+  track of the processes belonging to each service or user session:
 <screen>
 <prompt>$ </prompt>systemd-cgls
 ├─user
@@ -26,19 +32,34 @@
   │ └─2376 dhcpcd --config /nix/store/f8dif8dsi2yaa70n03xir8r653776ka6-dhcpcd.conf
   └─ <replaceable>...</replaceable>
 </screen>
-  Similarly, <command>systemd-cgls cpu</command> shows the cgroups in the CPU hierarchy, which allows per-cgroup CPU scheduling priorities. By default, every systemd service gets its own CPU cgroup, while all user sessions are in the top-level CPU cgroup. This ensures, for instance, that a thousand run-away processes in the <literal>httpd.service</literal> cgroup cannot starve the CPU for one process in the <literal>postgresql.service</literal> cgroup. (By contrast, it they were in the same cgroup, then the PostgreSQL process would get 1/1001 of the cgroup’s CPU time.) You can limit a service’s CPU share in <filename>configuration.nix</filename>:
+  Similarly, <command>systemd-cgls cpu</command> shows the cgroups in the CPU
+  hierarchy, which allows per-cgroup CPU scheduling priorities. By default,
+  every systemd service gets its own CPU cgroup, while all user sessions are in
+  the top-level CPU cgroup. This ensures, for instance, that a thousand
+  run-away processes in the <literal>httpd.service</literal> cgroup cannot
+  starve the CPU for one process in the <literal>postgresql.service</literal>
+  cgroup. (By contrast, it they were in the same cgroup, then the PostgreSQL
+  process would get 1/1001 of the cgroup’s CPU time.) You can limit a
+  service’s CPU share in <filename>configuration.nix</filename>:
 <programlisting>
 <link linkend="opt-systemd.services._name_.serviceConfig">systemd.services.httpd.serviceConfig</link>.CPUShares = 512;
 </programlisting>
-  By default, every cgroup has 1024 CPU shares, so this will halve the CPU allocation of the <literal>httpd.service</literal> cgroup.
+  By default, every cgroup has 1024 CPU shares, so this will halve the CPU
+  allocation of the <literal>httpd.service</literal> cgroup.
  </para>
  <para>
-  There also is a <literal>memory</literal> hierarchy that controls memory allocation limits; by default, all processes are in the top-level cgroup, so any service or session can exhaust all available memory. Per-cgroup memory limits can be specified in <filename>configuration.nix</filename>; for instance, to limit <literal>httpd.service</literal> to 512 MiB of RAM (excluding swap):
+  There also is a <literal>memory</literal> hierarchy that controls memory
+  allocation limits; by default, all processes are in the top-level cgroup, so
+  any service or session can exhaust all available memory. Per-cgroup memory
+  limits can be specified in <filename>configuration.nix</filename>; for
+  instance, to limit <literal>httpd.service</literal> to 512 MiB of RAM
+  (excluding swap):
 <programlisting>
 <link linkend="opt-systemd.services._name_.serviceConfig">systemd.services.httpd.serviceConfig</link>.MemoryLimit = "512M";
 </programlisting>
  </para>
  <para>
-  The command <command>systemd-cgtop</command> shows a continuously updated list of all cgroups with their CPU and memory usage.
+  The command <command>systemd-cgtop</command> shows a continuously updated
+  list of all cgroups with their CPU and memory usage.
  </para>
 </chapter>
diff --git a/nixos/doc/manual/administration/declarative-containers.xml b/nixos/doc/manual/administration/declarative-containers.xml
index a463d201478..d03dbc4d705 100644
--- a/nixos/doc/manual/administration/declarative-containers.xml
+++ b/nixos/doc/manual/administration/declarative-containers.xml
@@ -6,7 +6,10 @@
  <title>Declarative Container Specification</title>
 
  <para>
-  You can also specify containers and their configuration in the host’s <filename>configuration.nix</filename>. For example, the following specifies that there shall be a container named <literal>database</literal> running PostgreSQL:
+  You can also specify containers and their configuration in the host’s
+  <filename>configuration.nix</filename>. For example, the following specifies
+  that there shall be a container named <literal>database</literal> running
+  PostgreSQL:
 <programlisting>
 containers.database =
   { config =
@@ -16,11 +19,18 @@ containers.database =
       };
   };
 </programlisting>
-  If you run <literal>nixos-rebuild switch</literal>, the container will be built. If the container was already running, it will be updated in place, without rebooting. The container can be configured to start automatically by setting <literal>containers.database.autoStart = true</literal> in its configuration.
+  If you run <literal>nixos-rebuild switch</literal>, the container will be
+  built. If the container was already running, it will be updated in place,
+  without rebooting. The container can be configured to start automatically by
+  setting <literal>containers.database.autoStart = true</literal> in its
+  configuration.
  </para>
 
  <para>
-  By default, declarative containers share the network namespace of the host, meaning that they can listen on (privileged) ports. However, they cannot change the network configuration. You can give a container its own network as follows:
+  By default, declarative containers share the network namespace of the host,
+  meaning that they can listen on (privileged) ports. However, they cannot
+  change the network configuration. You can give a container its own network as
+  follows:
 <programlisting>
 containers.database = {
   <link linkend="opt-containers._name_.privateNetwork">privateNetwork</link> = true;
@@ -28,14 +38,23 @@ containers.database = {
   <link linkend="opt-containers._name_.localAddress">localAddress</link> = "192.168.100.11";
 };
 </programlisting>
-  This gives the container a private virtual Ethernet interface with IP address <literal>192.168.100.11</literal>, which is hooked up to a virtual Ethernet interface on the host with IP address <literal>192.168.100.10</literal>. (See the next section for details on container networking.)
+  This gives the container a private virtual Ethernet interface with IP address
+  <literal>192.168.100.11</literal>, which is hooked up to a virtual Ethernet
+  interface on the host with IP address <literal>192.168.100.10</literal>. (See
+  the next section for details on container networking.)
  </para>
 
  <para>
-  To disable the container, just remove it from <filename>configuration.nix</filename> and run <literal>nixos-rebuild switch</literal>. Note that this will not delete the root directory of the container in <literal>/var/lib/containers</literal>. Containers can be destroyed using the imperative method: <literal>nixos-container destroy foo</literal>.
+  To disable the container, just remove it from
+  <filename>configuration.nix</filename> and run <literal>nixos-rebuild
+  switch</literal>. Note that this will not delete the root directory of the
+  container in <literal>/var/lib/containers</literal>. Containers can be
+  destroyed using the imperative method: <literal>nixos-container destroy
+  foo</literal>.
  </para>
 
  <para>
-  Declarative containers can be started and stopped using the corresponding systemd service, e.g. <literal>systemctl start container@database</literal>.
+  Declarative containers can be started and stopped using the corresponding
+  systemd service, e.g. <literal>systemctl start container@database</literal>.
  </para>
 </section>
diff --git a/nixos/doc/manual/administration/imperative-containers.xml b/nixos/doc/manual/administration/imperative-containers.xml
index d5da6bf2017..7ded0c11786 100644
--- a/nixos/doc/manual/administration/imperative-containers.xml
+++ b/nixos/doc/manual/administration/imperative-containers.xml
@@ -6,7 +6,9 @@
  <title>Imperative Container Management</title>
 
  <para>
-  We’ll cover imperative container management using <command>nixos-container</command> first. Be aware that container management is currently only possible as <literal>root</literal>.
+  We’ll cover imperative container management using
+  <command>nixos-container</command> first. Be aware that container management
+  is currently only possible as <literal>root</literal>.
  </para>
 
  <para>
@@ -14,14 +16,23 @@
 <screen>
 # nixos-container create foo
 </screen>
-  This creates the container’s root directory in <filename>/var/lib/containers/foo</filename> and a small configuration file in <filename>/etc/containers/foo.conf</filename>. It also builds the container’s initial system configuration and stores it in <filename>/nix/var/nix/profiles/per-container/foo/system</filename>. You can modify the initial configuration of the container on the command line. For instance, to create a container that has <command>sshd</command> running, with the given public key for <literal>root</literal>:
+  This creates the container’s root directory in
+  <filename>/var/lib/containers/foo</filename> and a small configuration file
+  in <filename>/etc/containers/foo.conf</filename>. It also builds the
+  container’s initial system configuration and stores it in
+  <filename>/nix/var/nix/profiles/per-container/foo/system</filename>. You can
+  modify the initial configuration of the container on the command line. For
+  instance, to create a container that has <command>sshd</command> running,
+  with the given public key for <literal>root</literal>:
 <screen>
 # nixos-container create foo --config '
   <xref linkend="opt-services.openssh.enable"/> = true;
   <link linkend="opt-users.users._name__.openssh.authorizedKeys.keys">users.users.root.openssh.authorizedKeys.keys</link> = ["ssh-dss AAAAB3N…"];
 '
 </screen>
-  By default the next free address in the <literal>10.233.0.0/16</literal> subnet will be chosen as container IP. This behavior can be altered by setting <literal>--host-address</literal> and <literal>--local-address</literal>:
+  By default the next free address in the <literal>10.233.0.0/16</literal> subnet will be chosen
+  as container IP. This behavior can be altered by setting <literal>--host-address</literal> and
+  <literal>--local-address</literal>:
 <screen>
 # nixos-container create test --config-file test-container.nix \
     --local-address 10.235.1.2 --host-address 10.235.1.1
@@ -33,25 +44,35 @@
 <screen>
 # nixos-container start foo
 </screen>
-  This command will return as soon as the container has booted and has reached <literal>multi-user.target</literal>. On the host, the container runs within a systemd unit called <literal>container@<replaceable>container-name</replaceable>.service</literal>. Thus, if something went wrong, you can get status info using <command>systemctl</command>:
+  This command will return as soon as the container has booted and has reached
+  <literal>multi-user.target</literal>. On the host, the container runs within
+  a systemd unit called
+  <literal>container@<replaceable>container-name</replaceable>.service</literal>.
+  Thus, if something went wrong, you can get status info using
+  <command>systemctl</command>:
 <screen>
 # systemctl status container@foo
 </screen>
  </para>
 
  <para>
-  If the container has started successfully, you can log in as root using the <command>root-login</command> operation:
+  If the container has started successfully, you can log in as root using the
+  <command>root-login</command> operation:
 <screen>
 # nixos-container root-login foo
 [root@foo:~]#
 </screen>
-  Note that only root on the host can do this (since there is no authentication). You can also get a regular login prompt using the <command>login</command> operation, which is available to all users on the host:
+  Note that only root on the host can do this (since there is no
+  authentication). You can also get a regular login prompt using the
+  <command>login</command> operation, which is available to all users on the
+  host:
 <screen>
 # nixos-container login foo
 foo login: alice
 Password: ***
 </screen>
-  With <command>nixos-container run</command>, you can execute arbitrary commands in the container:
+  With <command>nixos-container run</command>, you can execute arbitrary
+  commands in the container:
 <screen>
 # nixos-container run foo -- uname -a
 Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux
@@ -59,11 +80,15 @@ Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux
  </para>
 
  <para>
-  There are several ways to change the configuration of the container. First, on the host, you can edit <literal>/var/lib/container/<replaceable>name</replaceable>/etc/nixos/configuration.nix</literal>, and run
+  There are several ways to change the configuration of the container. First,
+  on the host, you can edit
+  <literal>/var/lib/container/<replaceable>name</replaceable>/etc/nixos/configuration.nix</literal>,
+  and run
 <screen>
 # nixos-container update foo
 </screen>
-  This will build and activate the new configuration. You can also specify a new configuration on the command line:
+  This will build and activate the new configuration. You can also specify a
+  new configuration on the command line:
 <screen>
 # nixos-container update foo --config '
   <xref linkend="opt-services.httpd.enable"/> = true;
@@ -74,15 +99,23 @@ Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux
 # curl http://$(nixos-container show-ip foo)/
 &lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">…
 </screen>
-  However, note that this will overwrite the container’s <filename>/etc/nixos/configuration.nix</filename>.
+  However, note that this will overwrite the container’s
+  <filename>/etc/nixos/configuration.nix</filename>.
  </para>
 
  <para>
-  Alternatively, you can change the configuration from within the container itself by running <command>nixos-rebuild switch</command> inside the container. Note that the container by default does not have a copy of the NixOS channel, so you should run <command>nix-channel --update</command> first.
+  Alternatively, you can change the configuration from within the container
+  itself by running <command>nixos-rebuild switch</command> inside the
+  container. Note that the container by default does not have a copy of the
+  NixOS channel, so you should run <command>nix-channel --update</command>
+  first.
  </para>
 
  <para>
-  Containers can be stopped and started using <literal>nixos-container stop</literal> and <literal>nixos-container start</literal>, respectively, or by using <command>systemctl</command> on the container’s service unit. To destroy a container, including its file system, do
+  Containers can be stopped and started using <literal>nixos-container
+  stop</literal> and <literal>nixos-container start</literal>, respectively, or
+  by using <command>systemctl</command> on the container’s service unit. To
+  destroy a container, including its file system, do
 <screen>
 # nixos-container destroy foo
 </screen>
diff --git a/nixos/doc/manual/administration/logging.xml b/nixos/doc/manual/administration/logging.xml
index 8089b457786..da4877fcdf0 100644
--- a/nixos/doc/manual/administration/logging.xml
+++ b/nixos/doc/manual/administration/logging.xml
@@ -5,11 +5,18 @@
         xml:id="sec-logging">
  <title>Logging</title>
  <para>
-  System-wide logging is provided by systemd’s <emphasis>journal</emphasis>, which subsumes traditional logging daemons such as syslogd and klogd. Log entries are kept in binary files in <filename>/var/log/journal/</filename>. The command <literal>journalctl</literal> allows you to see the contents of the journal. For example,
+  System-wide logging is provided by systemd’s <emphasis>journal</emphasis>,
+  which subsumes traditional logging daemons such as syslogd and klogd. Log
+  entries are kept in binary files in <filename>/var/log/journal/</filename>.
+  The command <literal>journalctl</literal> allows you to see the contents of
+  the journal. For example,
 <screen>
 <prompt>$ </prompt>journalctl -b
 </screen>
-  shows all journal entries since the last reboot. (The output of <command>journalctl</command> is piped into <command>less</command> by default.) You can use various options and match operators to restrict output to messages of interest. For instance, to get all messages from PostgreSQL:
+  shows all journal entries since the last reboot. (The output of
+  <command>journalctl</command> is piped into <command>less</command> by
+  default.) You can use various options and match operators to restrict output
+  to messages of interest. For instance, to get all messages from PostgreSQL:
 <screen>
 <prompt>$ </prompt>journalctl -u postgresql.service
 -- Logs begin at Mon, 2013-01-07 13:28:01 CET, end at Tue, 2013-01-08 01:09:57 CET. --
@@ -19,7 +26,8 @@ Jan 07 15:44:14 hagbard postgres[2681]: [2-1] LOG:  database system is shut down
 Jan 07 15:45:10 hagbard postgres[2532]: [1-1] LOG:  database system was shut down at 2013-01-07 15:44:14 CET
 Jan 07 15:45:13 hagbard postgres[2500]: [1-1] LOG:  database system is ready to accept connections
 </screen>
-  Or to get all messages since the last reboot that have at least a “critical” severity level:
+  Or to get all messages since the last reboot that have at least a
+  “critical” severity level:
 <screen>
 <prompt>$ </prompt>journalctl -b -p crit
 Dec 17 21:08:06 mandark sudo[3673]: pam_unix(sudo:auth): auth could not identify password for [alice]
@@ -27,6 +35,9 @@ Dec 29 01:30:22 mandark kernel[6131]: [1053513.909444] CPU6: Core temperature ab
 </screen>
  </para>
  <para>
-  The system journal is readable by root and by users in the <literal>wheel</literal> and <literal>systemd-journal</literal> groups. All users have a private journal that can be read using <command>journalctl</command>.
+  The system journal is readable by root and by users in the
+  <literal>wheel</literal> and <literal>systemd-journal</literal> groups. All
+  users have a private journal that can be read using
+  <command>journalctl</command>.
  </para>
 </chapter>
diff --git a/nixos/doc/manual/administration/maintenance-mode.xml b/nixos/doc/manual/administration/maintenance-mode.xml
index dc11316dc1a..71e3f9ea665 100644
--- a/nixos/doc/manual/administration/maintenance-mode.xml
+++ b/nixos/doc/manual/administration/maintenance-mode.xml
@@ -9,6 +9,8 @@
   You can enter rescue mode by running:
 <screen>
 # systemctl rescue</screen>
-  This will eventually give you a single-user root shell. Systemd will stop (almost) all system services. To get out of maintenance mode, just exit from the rescue shell.
+  This will eventually give you a single-user root shell. Systemd will stop
+  (almost) all system services. To get out of maintenance mode, just exit from
+  the rescue shell.
  </para>
 </section>
diff --git a/nixos/doc/manual/administration/network-problems.xml b/nixos/doc/manual/administration/network-problems.xml
index 1d41e5c2995..570f5835884 100644
--- a/nixos/doc/manual/administration/network-problems.xml
+++ b/nixos/doc/manual/administration/network-problems.xml
@@ -6,11 +6,20 @@
  <title>Network Problems</title>
 
  <para>
-  Nix uses a so-called <emphasis>binary cache</emphasis> to optimise building a package from source into downloading it as a pre-built binary. That is, whenever a command like <command>nixos-rebuild</command> needs a path in the Nix store, Nix will try to download that path from the Internet rather than build it from source. The default binary cache is <uri>https://cache.nixos.org/</uri>. If this cache is unreachable, Nix operations may take a long time due to HTTP connection timeouts. You can disable the use of the binary cache by adding <option>--option use-binary-caches false</option>, e.g.
+  Nix uses a so-called <emphasis>binary cache</emphasis> to optimise building a
+  package from source into downloading it as a pre-built binary. That is,
+  whenever a command like <command>nixos-rebuild</command> needs a path in the
+  Nix store, Nix will try to download that path from the Internet rather than
+  build it from source. The default binary cache is
+  <uri>https://cache.nixos.org/</uri>. If this cache is unreachable, Nix
+  operations may take a long time due to HTTP connection timeouts. You can
+  disable the use of the binary cache by adding <option>--option
+  use-binary-caches false</option>, e.g.
 <screen>
 # nixos-rebuild switch --option use-binary-caches false
 </screen>
-  If you have an alternative binary cache at your disposal, you can use it instead:
+  If you have an alternative binary cache at your disposal, you can use it
+  instead:
 <screen>
 # nixos-rebuild switch --option binary-caches http://my-cache.example.org/
 </screen>
diff --git a/nixos/doc/manual/administration/rebooting.xml b/nixos/doc/manual/administration/rebooting.xml
index 989712b20fa..a5abd6f0258 100644
--- a/nixos/doc/manual/administration/rebooting.xml
+++ b/nixos/doc/manual/administration/rebooting.xml
@@ -16,15 +16,20 @@
 <screen>
 # reboot
 </screen>
-  which is equivalent to <command>systemctl reboot</command>. Alternatively, you can quickly reboot the system using <literal>kexec</literal>, which bypasses the BIOS by directly loading the new kernel into memory:
+  which is equivalent to <command>systemctl reboot</command>. Alternatively,
+  you can quickly reboot the system using <literal>kexec</literal>, which
+  bypasses the BIOS by directly loading the new kernel into memory:
 <screen>
 # systemctl kexec
 </screen>
  </para>
  <para>
-  The machine can be suspended to RAM (if supported) using <command>systemctl suspend</command>, and suspended to disk using <command>systemctl hibernate</command>.
+  The machine can be suspended to RAM (if supported) using <command>systemctl
+  suspend</command>, and suspended to disk using <command>systemctl
+  hibernate</command>.
  </para>
  <para>
-  These commands can be run by any user who is logged in locally, i.e. on a virtual console or in X11; otherwise, the user is asked for authentication.
+  These commands can be run by any user who is logged in locally, i.e. on a
+  virtual console or in X11; otherwise, the user is asked for authentication.
  </para>
 </chapter>
diff --git a/nixos/doc/manual/administration/rollback.xml b/nixos/doc/manual/administration/rollback.xml
index aa6d3c95676..fb87810ba46 100644
--- a/nixos/doc/manual/administration/rollback.xml
+++ b/nixos/doc/manual/administration/rollback.xml
@@ -6,11 +6,19 @@
  <title>Rolling Back Configuration Changes</title>
 
  <para>
-  After running <command>nixos-rebuild</command> to switch to a new configuration, you may find that the new configuration doesn’t work very well. In that case, there are several ways to return to a previous configuration.
+  After running <command>nixos-rebuild</command> to switch to a new
+  configuration, you may find that the new configuration doesn’t work very
+  well. In that case, there are several ways to return to a previous
+  configuration.
  </para>
 
  <para>
-  First, the GRUB boot manager allows you to boot into any previous configuration that hasn’t been garbage-collected. These configurations can be found under the GRUB submenu “NixOS - All configurations”. This is especially useful if the new configuration fails to boot. After the system has booted, you can make the selected configuration the default for subsequent boots:
+  First, the GRUB boot manager allows you to boot into any previous
+  configuration that hasn’t been garbage-collected. These configurations can
+  be found under the GRUB submenu “NixOS - All configurations”. This is
+  especially useful if the new configuration fails to boot. After the system
+  has booted, you can make the selected configuration the default for
+  subsequent boots:
 <screen>
 # /run/current-system/bin/switch-to-configuration boot</screen>
  </para>
@@ -22,7 +30,8 @@
   This is equivalent to running:
 <screen>
 # /nix/var/nix/profiles/system-<replaceable>N</replaceable>-link/bin/switch-to-configuration switch</screen>
-  where <replaceable>N</replaceable> is the number of the NixOS system configuration. To get a list of the available configurations, do:
+  where <replaceable>N</replaceable> is the number of the NixOS system
+  configuration. To get a list of the available configurations, do:
 <screen>
 <prompt>$ </prompt>ls -l /nix/var/nix/profiles/system-*-link
 <replaceable>...</replaceable>
diff --git a/nixos/doc/manual/administration/running.xml b/nixos/doc/manual/administration/running.xml
index 12512a003c8..19bec1f7794 100644
--- a/nixos/doc/manual/administration/running.xml
+++ b/nixos/doc/manual/administration/running.xml
@@ -6,7 +6,8 @@
  <title>Administration</title>
  <partintro xml:id="ch-running-intro">
   <para>
-   This chapter describes various aspects of managing a running NixOS system, such as how to use the <command>systemd</command> service manager.
+   This chapter describes various aspects of managing a running NixOS system,
+   such as how to use the <command>systemd</command> service manager.
   </para>
  </partintro>
  <xi:include href="service-mgmt.xml" />
diff --git a/nixos/doc/manual/administration/service-mgmt.xml b/nixos/doc/manual/administration/service-mgmt.xml
index 4ad30ce55a8..1b9c745eb59 100644
--- a/nixos/doc/manual/administration/service-mgmt.xml
+++ b/nixos/doc/manual/administration/service-mgmt.xml
@@ -5,10 +5,21 @@
          xml:id="sec-systemctl">
  <title>Service Management</title>
  <para>
-  In NixOS, all system services are started and monitored using the systemd program. Systemd is the “init” process of the system (i.e. PID 1), the parent of all other processes. It manages a set of so-called “units”, which can be things like system services (programs), but also mount points, swap files, devices, targets (groups of units) and more. Units can have complex dependencies; for instance, one unit can require that another unit must be successfully started before the first unit can be started. When the system boots, it starts a unit named <literal>default.target</literal>; the dependencies of this unit cause all system services to be started, file systems to be mounted, swap files to be activated, and so on.
+  In NixOS, all system services are started and monitored using the systemd
+  program. Systemd is the “init” process of the system (i.e. PID 1), the
+  parent of all other processes. It manages a set of so-called “units”,
+  which can be things like system services (programs), but also mount points,
+  swap files, devices, targets (groups of units) and more. Units can have
+  complex dependencies; for instance, one unit can require that another unit
+  must be successfully started before the first unit can be started. When the
+  system boots, it starts a unit named <literal>default.target</literal>; the
+  dependencies of this unit cause all system services to be started, file
+  systems to be mounted, swap files to be activated, and so on.
  </para>
  <para>
-  The command <command>systemctl</command> is the main way to interact with <command>systemd</command>. Without any arguments, it shows the status of active units:
+  The command <command>systemctl</command> is the main way to interact with
+  <command>systemd</command>. Without any arguments, it shows the status of
+  active units:
 <screen>
 <prompt>$ </prompt>systemctl
 -.mount          loaded active mounted   /
@@ -19,7 +30,8 @@ graphical.target loaded active active    Graphical Interface
 </screen>
  </para>
  <para>
-  You can ask for detailed status information about a unit, for instance, the PostgreSQL database service:
+  You can ask for detailed status information about a unit, for instance, the
+  PostgreSQL database service:
 <screen>
 <prompt>$ </prompt>systemctl status postgresql.service
 postgresql.service - PostgreSQL Server
@@ -39,7 +51,9 @@ Jan 07 15:55:57 hagbard postgres[2390]: [1-1] LOG:  database system is ready to
 Jan 07 15:55:57 hagbard postgres[2420]: [1-1] LOG:  autovacuum launcher started
 Jan 07 15:55:57 hagbard systemd[1]: Started PostgreSQL Server.
 </screen>
-  Note that this shows the status of the unit (active and running), all the processes belonging to the service, as well as the most recent log messages from the service.
+  Note that this shows the status of the unit (active and running), all the
+  processes belonging to the service, as well as the most recent log messages
+  from the service.
  </para>
  <para>
   Units can be stopped, started or restarted:
@@ -48,7 +62,9 @@ Jan 07 15:55:57 hagbard systemd[1]: Started PostgreSQL Server.
 # systemctl start postgresql.service
 # systemctl restart postgresql.service
 </screen>
-  These operations are synchronous: they wait until the service has finished starting or stopping (or has failed). Starting a unit will cause the dependencies of that unit to be started as well (if necessary).
+  These operations are synchronous: they wait until the service has finished
+  starting or stopping (or has failed). Starting a unit will cause the
+  dependencies of that unit to be started as well (if necessary).
  </para>
 <!-- - cgroups: each service and user session is a cgroup
 
diff --git a/nixos/doc/manual/administration/store-corruption.xml b/nixos/doc/manual/administration/store-corruption.xml
index dc0a672d5bd..b9d11152d5e 100644
--- a/nixos/doc/manual/administration/store-corruption.xml
+++ b/nixos/doc/manual/administration/store-corruption.xml
@@ -6,15 +6,23 @@
  <title>Nix Store Corruption</title>
 
  <para>
-  After a system crash, it’s possible for files in the Nix store to become corrupted. (For instance, the Ext4 file system has the tendency to replace un-synced files with zero bytes.) NixOS tries hard to prevent this from happening: it performs a <command>sync</command> before switching to a new configuration, and Nix’s database is fully transactional. If corruption still occurs, you may be able to fix it automatically.
+  After a system crash, it’s possible for files in the Nix store to become
+  corrupted. (For instance, the Ext4 file system has the tendency to replace
+  un-synced files with zero bytes.) NixOS tries hard to prevent this from
+  happening: it performs a <command>sync</command> before switching to a new
+  configuration, and Nix’s database is fully transactional. If corruption
+  still occurs, you may be able to fix it automatically.
  </para>
 
  <para>
-  If the corruption is in a path in the closure of the NixOS system configuration, you can fix it by doing
+  If the corruption is in a path in the closure of the NixOS system
+  configuration, you can fix it by doing
 <screen>
 <prompt># </prompt>nixos-rebuild switch --repair
 </screen>
-  This will cause Nix to check every path in the closure, and if its cryptographic hash differs from the hash recorded in Nix’s database, the path is rebuilt or redownloaded.
+  This will cause Nix to check every path in the closure, and if its
+  cryptographic hash differs from the hash recorded in Nix’s database, the
+  path is rebuilt or redownloaded.
  </para>
 
  <para>
@@ -22,6 +30,7 @@
 <screen>
 <prompt># </prompt>nix-store --verify --check-contents --repair
 </screen>
-  Any corrupt paths will be redownloaded if they’re available in a binary cache; otherwise, they cannot be repaired.
+  Any corrupt paths will be redownloaded if they’re available in a binary
+  cache; otherwise, they cannot be repaired.
  </para>
 </section>
diff --git a/nixos/doc/manual/administration/troubleshooting.xml b/nixos/doc/manual/administration/troubleshooting.xml
index 923b1e96c7c..6496e7bde38 100644
--- a/nixos/doc/manual/administration/troubleshooting.xml
+++ b/nixos/doc/manual/administration/troubleshooting.xml
@@ -5,7 +5,8 @@
         xml:id="ch-troubleshooting">
  <title>Troubleshooting</title>
  <para>
-  This chapter describes solutions to common problems you might encounter when you manage your NixOS system.
+  This chapter describes solutions to common problems you might encounter when
+  you manage your NixOS system.
  </para>
  <xi:include href="boot-problems.xml" />
  <xi:include href="maintenance-mode.xml" />
diff --git a/nixos/doc/manual/administration/user-sessions.xml b/nixos/doc/manual/administration/user-sessions.xml
index c7969f4f0d6..80daf6bdbff 100644
--- a/nixos/doc/manual/administration/user-sessions.xml
+++ b/nixos/doc/manual/administration/user-sessions.xml
@@ -5,7 +5,10 @@
         xml:id="sec-user-sessions">
  <title>User Sessions</title>
  <para>
-  Systemd keeps track of all users who are logged into the system (e.g. on a virtual console or remotely via SSH). The command <command>loginctl</command> allows querying and manipulating user sessions. For instance, to list all user sessions:
+  Systemd keeps track of all users who are logged into the system (e.g. on a
+  virtual console or remotely via SSH). The command <command>loginctl</command>
+  allows querying and manipulating user sessions. For instance, to list all
+  user sessions:
 <screen>
 <prompt>$ </prompt>loginctl
    SESSION        UID USER             SEAT
@@ -13,7 +16,10 @@
         c3          0 root             seat0
         c4        500 alice
 </screen>
-  This shows that two users are logged in locally, while another is logged in remotely. (“Seats” are essentially the combinations of displays and input devices attached to the system; usually, there is only one seat.) To get information about a session:
+  This shows that two users are logged in locally, while another is logged in
+  remotely. (“Seats” are essentially the combinations of displays and input
+  devices attached to the system; usually, there is only one seat.) To get
+  information about a session:
 <screen>
 <prompt>$ </prompt>loginctl session-status c3
 c3 - root (0)
@@ -28,7 +34,10 @@ c3 - root (0)
                   ├─10339 -bash
                   └─10355 w3m nixos.org
 </screen>
-  This shows that the user is logged in on virtual console 3. It also lists the processes belonging to this session. Since systemd keeps track of this, you can terminate a session in a way that ensures that all the session’s processes are gone:
+  This shows that the user is logged in on virtual console 3. It also lists the
+  processes belonging to this session. Since systemd keeps track of this, you
+  can terminate a session in a way that ensures that all the session’s
+  processes are gone:
 <screen>
 # loginctl terminate-session c3
 </screen>
diff --git a/nixos/doc/manual/configuration/abstractions.xml b/nixos/doc/manual/configuration/abstractions.xml
index 6e6850769f5..5bf0635cc1a 100644
--- a/nixos/doc/manual/configuration/abstractions.xml
+++ b/nixos/doc/manual/configuration/abstractions.xml
@@ -6,7 +6,8 @@
  <title>Abstractions</title>
 
  <para>
-  If you find yourself repeating yourself over and over, it’s time to abstract. Take, for instance, this Apache HTTP Server configuration:
+  If you find yourself repeating yourself over and over, it’s time to
+  abstract. Take, for instance, this Apache HTTP Server configuration:
 <programlisting>
 {
   <xref linkend="opt-services.httpd.virtualHosts"/> =
@@ -26,7 +27,9 @@
     ];
 }
 </programlisting>
-  It defines two virtual hosts with nearly identical configuration; the only difference is that the second one has SSL enabled. To prevent this duplication, we can use a <literal>let</literal>:
+  It defines two virtual hosts with nearly identical configuration; the only
+  difference is that the second one has SSL enabled. To prevent this
+  duplication, we can use a <literal>let</literal>:
 <programlisting>
 let
   exampleOrgCommon =
@@ -47,11 +50,16 @@ in
     ];
 }
 </programlisting>
-  The <literal>let exampleOrgCommon = <replaceable>...</replaceable></literal> defines a variable named <literal>exampleOrgCommon</literal>. The <literal>//</literal> operator merges two attribute sets, so the configuration of the second virtual host is the set <literal>exampleOrgCommon</literal> extended with the SSL options.
+  The <literal>let exampleOrgCommon = <replaceable>...</replaceable></literal>
+  defines a variable named <literal>exampleOrgCommon</literal>. The
+  <literal>//</literal> operator merges two attribute sets, so the
+  configuration of the second virtual host is the set
+  <literal>exampleOrgCommon</literal> extended with the SSL options.
  </para>
 
  <para>
-  You can write a <literal>let</literal> wherever an expression is allowed. Thus, you also could have written:
+  You can write a <literal>let</literal> wherever an expression is allowed.
+  Thus, you also could have written:
 <programlisting>
 {
   <xref linkend="opt-services.httpd.virtualHosts"/> =
@@ -61,11 +69,16 @@ in
     ];
 }
 </programlisting>
-  but not <literal>{ let exampleOrgCommon = <replaceable>...</replaceable>; in <replaceable>...</replaceable>; }</literal> since attributes (as opposed to attribute values) are not expressions.
+  but not <literal>{ let exampleOrgCommon = <replaceable>...</replaceable>; in
+  <replaceable>...</replaceable>; }</literal> since attributes (as opposed to
+  attribute values) are not expressions.
  </para>
 
  <para>
-  <emphasis>Functions</emphasis> provide another method of abstraction. For instance, suppose that we want to generate lots of different virtual hosts, all with identical configuration except for the host name. This can be done as follows:
+  <emphasis>Functions</emphasis> provide another method of abstraction. For
+  instance, suppose that we want to generate lots of different virtual hosts,
+  all with identical configuration except for the host name. This can be done
+  as follows:
 <programlisting>
 {
   <xref linkend="opt-services.httpd.virtualHosts"/> =
@@ -83,11 +96,15 @@ in
       ];
 }
 </programlisting>
-  Here, <varname>makeVirtualHost</varname> is a function that takes a single argument <literal>name</literal> and returns the configuration for a virtual host. That function is then called for several names to produce the list of virtual host configurations.
+  Here, <varname>makeVirtualHost</varname> is a function that takes a single
+  argument <literal>name</literal> and returns the configuration for a virtual
+  host. That function is then called for several names to produce the list of
+  virtual host configurations.
  </para>
 
  <para>
-  We can further improve on this by using the function <varname>map</varname>, which applies another function to every element in a list:
+  We can further improve on this by using the function <varname>map</varname>,
+  which applies another function to every element in a list:
 <programlisting>
 {
   <xref linkend="opt-services.httpd.virtualHosts"/> =
@@ -97,11 +114,15 @@ in
       [ "example.org" "example.com" "example.gov" "example.nl" ];
 }
 </programlisting>
-  (The function <literal>map</literal> is called a <emphasis>higher-order function</emphasis> because it takes another function as an argument.)
+  (The function <literal>map</literal> is called a <emphasis>higher-order
+  function</emphasis> because it takes another function as an argument.)
  </para>
 
  <para>
-  What if you need more than one argument, for instance, if we want to use a different <literal>documentRoot</literal> for each virtual host? Then we can make <varname>makeVirtualHost</varname> a function that takes a <emphasis>set</emphasis> as its argument, like this:
+  What if you need more than one argument, for instance, if we want to use a
+  different <literal>documentRoot</literal> for each virtual host? Then we can
+  make <varname>makeVirtualHost</varname> a function that takes a
+  <emphasis>set</emphasis> as its argument, like this:
 <programlisting>
 {
   <xref linkend="opt-services.httpd.virtualHosts"/> =
@@ -119,7 +140,9 @@ in
       ];
 }
 </programlisting>
-  But in this case (where every root is a subdirectory of <filename>/sites</filename> named after the virtual host), it would have been shorter to define <varname>makeVirtualHost</varname> as
+  But in this case (where every root is a subdirectory of
+  <filename>/sites</filename> named after the virtual host), it would have been
+  shorter to define <varname>makeVirtualHost</varname> as
 <programlisting>
 makeVirtualHost = name:
   { hostName = name;
@@ -127,6 +150,7 @@ makeVirtualHost = name:
     adminAddr = "alice@example.org";
   };
 </programlisting>
-  Here, the construct <literal>${<replaceable>...</replaceable>}</literal> allows the result of an expression to be spliced into a string.
+  Here, the construct <literal>${<replaceable>...</replaceable>}</literal>
+  allows the result of an expression to be spliced into a string.
  </para>
 </section>
diff --git a/nixos/doc/manual/configuration/ad-hoc-network-config.xml b/nixos/doc/manual/configuration/ad-hoc-network-config.xml
index 97276e8a177..00e595c7cb7 100644
--- a/nixos/doc/manual/configuration/ad-hoc-network-config.xml
+++ b/nixos/doc/manual/configuration/ad-hoc-network-config.xml
@@ -6,7 +6,10 @@
  <title>Ad-Hoc Configuration</title>
 
  <para>
-  You can use <xref linkend="opt-networking.localCommands"/> to specify shell commands to be run at the end of <literal>network-setup.service</literal>. This is useful for doing network configuration not covered by the existing NixOS modules. For instance, to statically configure an IPv6 address:
+  You can use <xref linkend="opt-networking.localCommands"/> to specify shell
+  commands to be run at the end of <literal>network-setup.service</literal>.
+  This is useful for doing network configuration not covered by the existing
+  NixOS modules. For instance, to statically configure an IPv6 address:
 <programlisting>
 <xref linkend="opt-networking.localCommands"/> =
   ''
diff --git a/nixos/doc/manual/configuration/ad-hoc-packages.xml b/nixos/doc/manual/configuration/ad-hoc-packages.xml
index f15a22469a0..c7e882d846f 100644
--- a/nixos/doc/manual/configuration/ad-hoc-packages.xml
+++ b/nixos/doc/manual/configuration/ad-hoc-packages.xml
@@ -6,18 +6,33 @@
  <title>Ad-Hoc Package Management</title>
 
  <para>
-  With the command <command>nix-env</command>, you can install and uninstall packages from the command line. For instance, to install Mozilla Thunderbird:
+  With the command <command>nix-env</command>, you can install and uninstall
+  packages from the command line. For instance, to install Mozilla Thunderbird:
 <screen>
 <prompt>$ </prompt>nix-env -iA nixos.thunderbird</screen>
-  If you invoke this as root, the package is installed in the Nix profile <filename>/nix/var/nix/profiles/default</filename> and visible to all users of the system; otherwise, the package ends up in <filename>/nix/var/nix/profiles/per-user/<replaceable>username</replaceable>/profile</filename> and is not visible to other users. The <option>-A</option> flag specifies the package by its attribute name; without it, the package is installed by matching against its package name (e.g. <literal>thunderbird</literal>). The latter is slower because it requires matching against all available Nix packages, and is ambiguous if there are multiple matching packages.
+  If you invoke this as root, the package is installed in the Nix profile
+  <filename>/nix/var/nix/profiles/default</filename> and visible to all users
+  of the system; otherwise, the package ends up in
+  <filename>/nix/var/nix/profiles/per-user/<replaceable>username</replaceable>/profile</filename>
+  and is not visible to other users. The <option>-A</option> flag specifies the
+  package by its attribute name; without it, the package is installed by
+  matching against its package name (e.g. <literal>thunderbird</literal>). The
+  latter is slower because it requires matching against all available Nix
+  packages, and is ambiguous if there are multiple matching packages.
  </para>
 
  <para>
-  Packages come from the NixOS channel. You typically upgrade a package by updating to the latest version of the NixOS channel:
+  Packages come from the NixOS channel. You typically upgrade a package by
+  updating to the latest version of the NixOS channel:
 <screen>
 <prompt>$ </prompt>nix-channel --update nixos
 </screen>
-  and then running <literal>nix-env -i</literal> again. Other packages in the profile are <emphasis>not</emphasis> affected; this is the crucial difference with the declarative style of package management, where running <command>nixos-rebuild switch</command> causes all packages to be updated to their current versions in the NixOS channel. You can however upgrade all packages for which there is a newer version by doing:
+  and then running <literal>nix-env -i</literal> again. Other packages in the
+  profile are <emphasis>not</emphasis> affected; this is the crucial difference
+  with the declarative style of package management, where running
+  <command>nixos-rebuild switch</command> causes all packages to be updated to
+  their current versions in the NixOS channel. You can however upgrade all
+  packages for which there is a newer version by doing:
 <screen>
 <prompt>$ </prompt>nix-env -u '*'
 </screen>
@@ -38,7 +53,8 @@
  </para>
 
  <para>
-  <command>nix-env</command> has many more flags. For details, see the <citerefentry>
+  <command>nix-env</command> has many more flags. For details, see the
+  <citerefentry>
   <refentrytitle>nix-env</refentrytitle>
   <manvolnum>1</manvolnum></citerefentry> manpage or the Nix manual.
  </para>
diff --git a/nixos/doc/manual/configuration/adding-custom-packages.xml b/nixos/doc/manual/configuration/adding-custom-packages.xml
index 210a2aef37b..182641055e4 100644
--- a/nixos/doc/manual/configuration/adding-custom-packages.xml
+++ b/nixos/doc/manual/configuration/adding-custom-packages.xml
@@ -6,23 +6,33 @@
  <title>Adding Custom Packages</title>
 
  <para>
-  It’s possible that a package you need is not available in NixOS. In that case, you can do two things. First, you can clone the Nixpkgs repository, add the package to your clone, and (optionally) submit a patch or pull request to have it accepted into the main Nixpkgs repository. This is described in detail in the <link
-xlink:href="http://nixos.org/nixpkgs/manual">Nixpkgs manual</link>. In short, you clone Nixpkgs:
+  It’s possible that a package you need is not available in NixOS. In that
+  case, you can do two things. First, you can clone the Nixpkgs repository, add
+  the package to your clone, and (optionally) submit a patch or pull request to
+  have it accepted into the main Nixpkgs repository. This is described in
+  detail in the <link
+xlink:href="http://nixos.org/nixpkgs/manual">Nixpkgs
+  manual</link>. In short, you clone Nixpkgs:
 <screen>
 <prompt>$ </prompt>git clone https://github.com/NixOS/nixpkgs
 <prompt>$ </prompt>cd nixpkgs
 </screen>
-  Then you write and test the package as described in the Nixpkgs manual. Finally, you add it to <literal>environment.systemPackages</literal>, e.g.
+  Then you write and test the package as described in the Nixpkgs manual.
+  Finally, you add it to <literal>environment.systemPackages</literal>, e.g.
 <programlisting>
 <xref linkend="opt-environment.systemPackages"/> = [ pkgs.my-package ];
 </programlisting>
-  and you run <command>nixos-rebuild</command>, specifying your own Nixpkgs tree:
+  and you run <command>nixos-rebuild</command>, specifying your own Nixpkgs
+  tree:
 <screen>
 # nixos-rebuild switch -I nixpkgs=/path/to/my/nixpkgs</screen>
  </para>
 
  <para>
-  The second possibility is to add the package outside of the Nixpkgs tree. For instance, here is how you specify a build of the <link xlink:href="https://www.gnu.org/software/hello/">GNU Hello</link> package directly in <filename>configuration.nix</filename>:
+  The second possibility is to add the package outside of the Nixpkgs tree. For
+  instance, here is how you specify a build of the
+  <link xlink:href="https://www.gnu.org/software/hello/">GNU Hello</link>
+  package directly in <filename>configuration.nix</filename>:
 <programlisting>
 <xref linkend="opt-environment.systemPackages"/> =
   let
@@ -36,7 +46,8 @@ xlink:href="http://nixos.org/nixpkgs/manual">Nixpkgs manual</link>. In short, yo
   in
   [ my-hello ];
 </programlisting>
-  Of course, you can also move the definition of <literal>my-hello</literal> into a separate Nix expression, e.g.
+  Of course, you can also move the definition of <literal>my-hello</literal>
+  into a separate Nix expression, e.g.
 <programlisting>
 <xref linkend="opt-environment.systemPackages"/> = [ (import ./my-hello.nix) ];
 </programlisting>
diff --git a/nixos/doc/manual/configuration/config-file.xml b/nixos/doc/manual/configuration/config-file.xml
index 38296caaa9a..eadafb94b8f 100644
--- a/nixos/doc/manual/configuration/config-file.xml
+++ b/nixos/doc/manual/configuration/config-file.xml
@@ -13,7 +13,15 @@
 { <replaceable>option definitions</replaceable>
 }
 </programlisting>
-  The first line (<literal>{ config, pkgs, ... }:</literal>) denotes that this is actually a function that takes at least the two arguments <varname>config</varname> and <varname>pkgs</varname>. (These are explained later.) The function returns a <emphasis>set</emphasis> of option definitions (<literal>{ <replaceable>...</replaceable> }</literal>). These definitions have the form <literal><replaceable>name</replaceable> = <replaceable>value</replaceable></literal>, where <replaceable>name</replaceable> is the name of an option and <replaceable>value</replaceable> is its value. For example,
+  The first line (<literal>{ config, pkgs, ... }:</literal>) denotes that this
+  is actually a function that takes at least the two arguments
+  <varname>config</varname> and <varname>pkgs</varname>. (These are explained
+  later.) The function returns a <emphasis>set</emphasis> of option definitions
+  (<literal>{ <replaceable>...</replaceable> }</literal>). These definitions
+  have the form <literal><replaceable>name</replaceable> =
+  <replaceable>value</replaceable></literal>, where
+  <replaceable>name</replaceable> is the name of an option and
+  <replaceable>value</replaceable> is its value. For example,
 <programlisting>
 { config, pkgs, ... }:
 
@@ -22,11 +30,19 @@
   <xref linkend="opt-services.httpd.documentRoot"/> = "/webroot";
 }
 </programlisting>
-  defines a configuration with three option definitions that together enable the Apache HTTP Server with <filename>/webroot</filename> as the document root.
+  defines a configuration with three option definitions that together enable
+  the Apache HTTP Server with <filename>/webroot</filename> as the document
+  root.
  </para>
 
  <para>
-  Sets can be nested, and in fact dots in option names are shorthand for defining a set containing another set. For instance, <xref linkend="opt-services.httpd.enable"/> defines a set named <varname>services</varname> that contains a set named <varname>httpd</varname>, which in turn contains an option definition named <varname>enable</varname> with value <literal>true</literal>. This means that the example above can also be written as:
+  Sets can be nested, and in fact dots in option names are shorthand for
+  defining a set containing another set. For instance,
+  <xref linkend="opt-services.httpd.enable"/> defines a set named
+  <varname>services</varname> that contains a set named
+  <varname>httpd</varname>, which in turn contains an option definition named
+  <varname>enable</varname> with value <literal>true</literal>. This means that
+  the example above can also be written as:
 <programlisting>
 { config, pkgs, ... }:
 
@@ -39,15 +55,22 @@
   };
 }
 </programlisting>
-  which may be more convenient if you have lots of option definitions that share the same prefix (such as <literal>services.httpd</literal>).
+  which may be more convenient if you have lots of option definitions that
+  share the same prefix (such as <literal>services.httpd</literal>).
  </para>
 
  <para>
-  NixOS checks your option definitions for correctness. For instance, if you try to define an option that doesn’t exist (that is, doesn’t have a corresponding <emphasis>option declaration</emphasis>), <command>nixos-rebuild</command> will give an error like:
+  NixOS checks your option definitions for correctness. For instance, if you
+  try to define an option that doesn’t exist (that is, doesn’t have a
+  corresponding <emphasis>option declaration</emphasis>),
+  <command>nixos-rebuild</command> will give an error like:
 <screen>
 The option `services.httpd.enable' defined in `/etc/nixos/configuration.nix' does not exist.
 </screen>
-  Likewise, values in option definitions must have a correct type. For instance, <option>services.httpd.enable</option> must be a Boolean (<literal>true</literal> or <literal>false</literal>). Trying to give it a value of another type, such as a string, will cause an error:
+  Likewise, values in option definitions must have a correct type. For
+  instance, <option>services.httpd.enable</option> must be a Boolean
+  (<literal>true</literal> or <literal>false</literal>). Trying to give it a
+  value of another type, such as a string, will cause an error:
 <screen>
 The option value `services.httpd.enable' in `/etc/nixos/configuration.nix' is not a boolean.
 </screen>
@@ -66,10 +89,12 @@ The option value `services.httpd.enable' in `/etc/nixos/configuration.nix' is no
 <programlisting>
 <xref linkend="opt-networking.hostName"/> = "dexter";
 </programlisting>
-      Special characters can be escaped by prefixing them with a backslash (e.g. <literal>\"</literal>).
+      Special characters can be escaped by prefixing them with a backslash
+      (e.g. <literal>\"</literal>).
      </para>
      <para>
-      Multi-line strings can be enclosed in <emphasis>double single quotes</emphasis>, e.g.
+      Multi-line strings can be enclosed in <emphasis>double single
+      quotes</emphasis>, e.g.
 <programlisting>
 <xref linkend="opt-networking.extraHosts"/> =
   ''
@@ -77,7 +102,13 @@ The option value `services.httpd.enable' in `/etc/nixos/configuration.nix' is no
     10.0.0.1 server
   '';
 </programlisting>
-      The main difference is that it strips from each line a number of spaces equal to the minimal indentation of the string as a whole (disregarding the indentation of empty lines), and that characters like <literal>"</literal> and <literal>\</literal> are not special (making it more convenient for including things like shell code). See more info about this in the Nix manual <link
+      The main difference is that it strips from each line a number of spaces
+      equal to the minimal indentation of the string as a whole (disregarding
+      the indentation of empty lines), and that characters like
+      <literal>"</literal> and <literal>\</literal> are not special (making it
+      more convenient for including things like shell code). See more info
+      about this in the Nix manual
+      <link
       xlink:href="https://nixos.org/nix/manual/#ssec-values">here</link>.
      </para>
     </listitem>
@@ -106,7 +137,12 @@ The option value `services.httpd.enable' in `/etc/nixos/configuration.nix' is no
 <programlisting>
 <xref linkend="opt-boot.kernel.sysctl"/>."net.ipv4.tcp_keepalive_time" = 60;
 </programlisting>
-      (Note that here the attribute name <literal>net.ipv4.tcp_keepalive_time</literal> is enclosed in quotes to prevent it from being interpreted as a set named <literal>net</literal> containing a set named <literal>ipv4</literal>, and so on. This is because it’s not a NixOS option but the literal name of a Linux kernel setting.)
+      (Note that here the attribute name
+      <literal>net.ipv4.tcp_keepalive_time</literal> is enclosed in quotes to
+      prevent it from being interpreted as a set named <literal>net</literal>
+      containing a set named <literal>ipv4</literal>, and so on. This is
+      because it’s not a NixOS option but the literal name of a Linux kernel
+      setting.)
      </para>
     </listitem>
    </varlistentry>
@@ -116,7 +152,8 @@ The option value `services.httpd.enable' in `/etc/nixos/configuration.nix' is no
     </term>
     <listitem>
      <para>
-      Sets were introduced above. They are name/value pairs enclosed in braces, as in the option definition
+      Sets were introduced above. They are name/value pairs enclosed in braces,
+      as in the option definition
 <programlisting>
 <xref linkend="opt-fileSystems"/>."/boot" =
   { device = "/dev/sda1";
@@ -133,7 +170,8 @@ The option value `services.httpd.enable' in `/etc/nixos/configuration.nix' is no
     </term>
     <listitem>
      <para>
-      The important thing to note about lists is that list elements are separated by whitespace, like this:
+      The important thing to note about lists is that list elements are
+      separated by whitespace, like this:
 <programlisting>
 <xref linkend="opt-boot.kernelModules"/> = [ "fuse" "kvm-intel" "coretemp" ];
 </programlisting>
@@ -150,7 +188,9 @@ swapDevices = [ { device = "/dev/disk/by-label/swap"; } ];
     </term>
     <listitem>
      <para>
-      Usually, the packages you need are already part of the Nix Packages collection, which is a set that can be accessed through the function argument <varname>pkgs</varname>. Typical uses:
+      Usually, the packages you need are already part of the Nix Packages
+      collection, which is a set that can be accessed through the function
+      argument <varname>pkgs</varname>. Typical uses:
 <programlisting>
 <xref linkend="opt-environment.systemPackages"/> =
   [ pkgs.thunderbird
@@ -159,7 +199,10 @@ swapDevices = [ { device = "/dev/disk/by-label/swap"; } ];
 
 <xref linkend="opt-services.postgresql.package"/> = pkgs.postgresql_10;
 </programlisting>
-      The latter option definition changes the default PostgreSQL package used by NixOS’s PostgreSQL service to 10.x. For more information on packages, including how to add new ones, see <xref linkend="sec-custom-packages"/>.
+      The latter option definition changes the default PostgreSQL package used
+      by NixOS’s PostgreSQL service to 10.x. For more information on
+      packages, including how to add new ones, see
+      <xref linkend="sec-custom-packages"/>.
      </para>
     </listitem>
    </varlistentry>
diff --git a/nixos/doc/manual/configuration/config-syntax.xml b/nixos/doc/manual/configuration/config-syntax.xml
index 9de5c6f477b..5ef498cf9ae 100644
--- a/nixos/doc/manual/configuration/config-syntax.xml
+++ b/nixos/doc/manual/configuration/config-syntax.xml
@@ -5,8 +5,18 @@
          xml:id="sec-configuration-syntax">
  <title>Configuration Syntax</title>
  <para>
-  The NixOS configuration file <filename>/etc/nixos/configuration.nix</filename> is actually a <emphasis>Nix expression</emphasis>, which is the Nix package manager’s purely functional language for describing how to build packages and configurations. This means you have all the expressive power of that language at your disposal, including the ability to abstract over common patterns, which is very useful when managing complex systems. The syntax and semantics of the Nix language are fully described in the <link
-xlink:href="http://nixos.org/nix/manual/#chap-writing-nix-expressions">Nix manual</link>, but here we give a short overview of the most important constructs useful in NixOS configuration files.
+  The NixOS configuration file
+  <filename>/etc/nixos/configuration.nix</filename> is actually a <emphasis>Nix
+  expression</emphasis>, which is the Nix package manager’s purely functional
+  language for describing how to build packages and configurations. This means
+  you have all the expressive power of that language at your disposal,
+  including the ability to abstract over common patterns, which is very useful
+  when managing complex systems. The syntax and semantics of the Nix language
+  are fully described in the
+  <link
+xlink:href="http://nixos.org/nix/manual/#chap-writing-nix-expressions">Nix
+  manual</link>, but here we give a short overview of the most important
+  constructs useful in NixOS configuration files.
  </para>
  <xi:include href="config-file.xml" />
  <xi:include href="abstractions.xml" />
diff --git a/nixos/doc/manual/configuration/configuration.xml b/nixos/doc/manual/configuration/configuration.xml
index 0197eb9b3a2..5961209bc13 100644
--- a/nixos/doc/manual/configuration/configuration.xml
+++ b/nixos/doc/manual/configuration/configuration.xml
@@ -6,7 +6,11 @@
  <title>Configuration</title>
  <partintro xml:id="ch-configuration-intro">
   <para>
-   This chapter describes how to configure various aspects of a NixOS machine through the configuration file <filename>/etc/nixos/configuration.nix</filename>. As described in <xref linkend="sec-changing-config" />, changes to this file only take effect after you run <command>nixos-rebuild</command>.
+   This chapter describes how to configure various aspects of a NixOS machine
+   through the configuration file
+   <filename>/etc/nixos/configuration.nix</filename>. As described in
+   <xref linkend="sec-changing-config" />, changes to this file only take
+   effect after you run <command>nixos-rebuild</command>.
   </para>
  </partintro>
  <xi:include href="config-syntax.xml" />
diff --git a/nixos/doc/manual/configuration/customizing-packages.xml b/nixos/doc/manual/configuration/customizing-packages.xml
index 589db91e9b0..34e6ab4b24d 100644
--- a/nixos/doc/manual/configuration/customizing-packages.xml
+++ b/nixos/doc/manual/configuration/customizing-packages.xml
@@ -6,25 +6,47 @@
  <title>Customising Packages</title>
 
  <para>
-  Some packages in Nixpkgs have options to enable or disable optional functionality or change other aspects of the package. For instance, the Firefox wrapper package (which provides Firefox with a set of plugins such as the Adobe Flash player) has an option to enable the Google Talk plugin. It can be set in <filename>configuration.nix</filename> as follows: <filename> nixpkgs.config.firefox.enableGoogleTalkPlugin = true; </filename>
+  Some packages in Nixpkgs have options to enable or disable optional
+  functionality or change other aspects of the package. For instance, the
+  Firefox wrapper package (which provides Firefox with a set of plugins such as
+  the Adobe Flash player) has an option to enable the Google Talk plugin. It
+  can be set in <filename>configuration.nix</filename> as follows: <filename>
+  nixpkgs.config.firefox.enableGoogleTalkPlugin = true; </filename>
  </para>
 
  <warning>
   <para>
-   Unfortunately, Nixpkgs currently lacks a way to query available configuration options.
+   Unfortunately, Nixpkgs currently lacks a way to query available
+   configuration options.
   </para>
  </warning>
 
  <para>
-  Apart from high-level options, it’s possible to tweak a package in almost arbitrary ways, such as changing or disabling dependencies of a package. For instance, the Emacs package in Nixpkgs by default has a dependency on GTK 2. If you want to build it against GTK 3, you can specify that as follows:
+  Apart from high-level options, it’s possible to tweak a package in almost
+  arbitrary ways, such as changing or disabling dependencies of a package. For
+  instance, the Emacs package in Nixpkgs by default has a dependency on GTK 2.
+  If you want to build it against GTK 3, you can specify that as follows:
 <programlisting>
 <xref linkend="opt-environment.systemPackages"/> = [ (pkgs.emacs.override { gtk = pkgs.gtk3; }) ];
 </programlisting>
-  The function <varname>override</varname> performs the call to the Nix function that produces Emacs, with the original arguments amended by the set of arguments specified by you. So here the function argument <varname>gtk</varname> gets the value <literal>pkgs.gtk3</literal>, causing Emacs to depend on GTK 3. (The parentheses are necessary because in Nix, function application binds more weakly than list construction, so without them, <xref linkend="opt-environment.systemPackages"/> would be a list with two elements.)
+  The function <varname>override</varname> performs the call to the Nix
+  function that produces Emacs, with the original arguments amended by the set
+  of arguments specified by you. So here the function argument
+  <varname>gtk</varname> gets the value <literal>pkgs.gtk3</literal>, causing
+  Emacs to depend on GTK 3. (The parentheses are necessary because in Nix,
+  function application binds more weakly than list construction, so without
+  them, <xref linkend="opt-environment.systemPackages"/> would be a list with
+  two elements.)
  </para>
 
  <para>
-  Even greater customisation is possible using the function <varname>overrideAttrs</varname>. While the <varname>override</varname> mechanism above overrides the arguments of a package function, <varname>overrideAttrs</varname> allows changing the <emphasis>attributes</emphasis> passed to <literal>mkDerivation</literal>. This permits changing any aspect of the package, such as the source code. For instance, if you want to override the source code of Emacs, you can say:
+  Even greater customisation is possible using the function
+  <varname>overrideAttrs</varname>. While the <varname>override</varname>
+  mechanism above overrides the arguments of a package function,
+  <varname>overrideAttrs</varname> allows changing the
+  <emphasis>attributes</emphasis> passed to <literal>mkDerivation</literal>.
+  This permits changing any aspect of the package, such as the source code. For
+  instance, if you want to override the source code of Emacs, you can say:
 <programlisting>
 <xref linkend="opt-environment.systemPackages"/> = [
   (pkgs.emacs.overrideAttrs (oldAttrs: {
@@ -33,16 +55,32 @@
   }))
 ];
 </programlisting>
-  Here, <varname>overrideAttrs</varname> takes the Nix derivation specified by <varname>pkgs.emacs</varname> and produces a new derivation in which the original’s <literal>name</literal> and <literal>src</literal> attribute have been replaced by the given values by re-calling <literal>stdenv.mkDerivation</literal>. The original attributes are accessible via the function argument, which is conventionally named <varname>oldAttrs</varname>.
+  Here, <varname>overrideAttrs</varname> takes the Nix derivation specified by
+  <varname>pkgs.emacs</varname> and produces a new derivation in which the
+  original’s <literal>name</literal> and <literal>src</literal> attribute
+  have been replaced by the given values by re-calling
+  <literal>stdenv.mkDerivation</literal>. The original attributes are
+  accessible via the function argument, which is conventionally named
+  <varname>oldAttrs</varname>.
  </para>
 
  <para>
-  The overrides shown above are not global. They do not affect the original package; other packages in Nixpkgs continue to depend on the original rather than the customised package. This means that if another package in your system depends on the original package, you end up with two instances of the package. If you want to have everything depend on your customised instance, you can apply a <emphasis>global</emphasis> override as follows:
+  The overrides shown above are not global. They do not affect the original
+  package; other packages in Nixpkgs continue to depend on the original rather
+  than the customised package. This means that if another package in your
+  system depends on the original package, you end up with two instances of the
+  package. If you want to have everything depend on your customised instance,
+  you can apply a <emphasis>global</emphasis> override as follows:
 <screen>
 nixpkgs.config.packageOverrides = pkgs:
   { emacs = pkgs.emacs.override { gtk = pkgs.gtk3; };
   };
 </screen>
-  The effect of this definition is essentially equivalent to modifying the <literal>emacs</literal> attribute in the Nixpkgs source tree. Any package in Nixpkgs that depends on <literal>emacs</literal> will be passed your customised instance. (However, the value <literal>pkgs.emacs</literal> in <varname>nixpkgs.config.packageOverrides</varname> refers to the original rather than overridden instance, to prevent an infinite recursion.)
+  The effect of this definition is essentially equivalent to modifying the
+  <literal>emacs</literal> attribute in the Nixpkgs source tree. Any package in
+  Nixpkgs that depends on <literal>emacs</literal> will be passed your
+  customised instance. (However, the value <literal>pkgs.emacs</literal> in
+  <varname>nixpkgs.config.packageOverrides</varname> refers to the original
+  rather than overridden instance, to prevent an infinite recursion.)
  </para>
 </section>
diff --git a/nixos/doc/manual/configuration/declarative-packages.xml b/nixos/doc/manual/configuration/declarative-packages.xml
index 4b15e1ca42e..5fb3bcb9f8f 100644
--- a/nixos/doc/manual/configuration/declarative-packages.xml
+++ b/nixos/doc/manual/configuration/declarative-packages.xml
@@ -6,11 +6,17 @@
  <title>Declarative Package Management</title>
 
  <para>
-  With declarative package management, you specify which packages you want on your system by setting the option <xref linkend="opt-environment.systemPackages"/>. For instance, adding the following line to <filename>configuration.nix</filename> enables the Mozilla Thunderbird email application:
+  With declarative package management, you specify which packages you want on
+  your system by setting the option
+  <xref linkend="opt-environment.systemPackages"/>. For instance, adding the
+  following line to <filename>configuration.nix</filename> enables the Mozilla
+  Thunderbird email application:
 <programlisting>
 <xref linkend="opt-environment.systemPackages"/> = [ pkgs.thunderbird ];
 </programlisting>
-  The effect of this specification is that the Thunderbird package from Nixpkgs will be built or downloaded as part of the system when you run <command>nixos-rebuild switch</command>.
+  The effect of this specification is that the Thunderbird package from Nixpkgs
+  will be built or downloaded as part of the system when you run
+  <command>nixos-rebuild switch</command>.
  </para>
 
  <para>
@@ -20,15 +26,20 @@
 nixos.firefox   firefox-23.0   Mozilla Firefox - the browser, reloaded
 <replaceable>...</replaceable>
 </screen>
-  The first column in the output is the <emphasis>attribute name</emphasis>, such as <literal>nixos.thunderbird</literal>.
+  The first column in the output is the <emphasis>attribute name</emphasis>,
+  such as <literal>nixos.thunderbird</literal>.
  </para>
-
  <para>
-  Note: the <literal>nixos</literal> prefix tells us that we want to get the package from the <literal>nixos</literal> channel and works only in CLI tools. In declarative configuration use <literal>pkgs</literal> prefix (variable).
+  Note: the <literal>nixos</literal> prefix tells us that we want to get the
+  package from the <literal>nixos</literal> channel and works only in CLI tools.
+
+  In declarative configuration use <literal>pkgs</literal> prefix (variable).
  </para>
 
  <para>
-  To “uninstall” a package, simply remove it from <xref linkend="opt-environment.systemPackages"/> and run <command>nixos-rebuild switch</command>.
+  To “uninstall” a package, simply remove it from
+  <xref linkend="opt-environment.systemPackages"/> and run
+  <command>nixos-rebuild switch</command>.
  </para>
 
  <xi:include href="customizing-packages.xml" />
diff --git a/nixos/doc/manual/configuration/file-systems.xml b/nixos/doc/manual/configuration/file-systems.xml
index 1f762b2b00e..e4c03de71b7 100644
--- a/nixos/doc/manual/configuration/file-systems.xml
+++ b/nixos/doc/manual/configuration/file-systems.xml
@@ -5,21 +5,41 @@
          xml:id="ch-file-systems">
  <title>File Systems</title>
  <para>
-  You can define file systems using the <option>fileSystems</option> configuration option. For instance, the following definition causes NixOS to mount the Ext4 file system on device <filename>/dev/disk/by-label/data</filename> onto the mount point <filename>/data</filename>:
+  You can define file systems using the <option>fileSystems</option>
+  configuration option. For instance, the following definition causes NixOS to
+  mount the Ext4 file system on device
+  <filename>/dev/disk/by-label/data</filename> onto the mount point
+  <filename>/data</filename>:
 <programlisting>
 <xref linkend="opt-fileSystems"/>."/data" =
   { device = "/dev/disk/by-label/data";
     fsType = "ext4";
   };
 </programlisting>
-  Mount points are created automatically if they don’t already exist. For <option><link linkend="opt-fileSystems._name__.device">device</link></option>, it’s best to use the topology-independent device aliases in <filename>/dev/disk/by-label</filename> and <filename>/dev/disk/by-uuid</filename>, as these don’t change if the topology changes (e.g. if a disk is moved to another IDE controller).
+  Mount points are created automatically if they don’t already exist. For
+  <option><link linkend="opt-fileSystems._name__.device">device</link></option>,
+  it’s best to use the topology-independent device aliases in
+  <filename>/dev/disk/by-label</filename> and
+  <filename>/dev/disk/by-uuid</filename>, as these don’t change if the
+  topology changes (e.g. if a disk is moved to another IDE controller).
  </para>
  <para>
-  You can usually omit the file system type (<option><link linkend="opt-fileSystems._name__.fsType">fsType</link></option>), since <command>mount</command> can usually detect the type and load the necessary kernel module automatically. However, if the file system is needed at early boot (in the initial ramdisk) and is not <literal>ext2</literal>, <literal>ext3</literal> or <literal>ext4</literal>, then it’s best to specify <option>fsType</option> to ensure that the kernel module is available.
+  You can usually omit the file system type
+  (<option><link linkend="opt-fileSystems._name__.fsType">fsType</link></option>),
+  since <command>mount</command> can usually detect the type and load the
+  necessary kernel module automatically. However, if the file system is needed
+  at early boot (in the initial ramdisk) and is not <literal>ext2</literal>,
+  <literal>ext3</literal> or <literal>ext4</literal>, then it’s best to
+  specify <option>fsType</option> to ensure that the kernel module is
+  available.
  </para>
  <note>
   <para>
-   System startup will fail if any of the filesystems fails to mount, dropping you to the emergency shell. You can make a mount asynchronous and non-critical by adding <literal><link linkend="opt-fileSystems._name__.options">options</link> = [ "nofail" ];</literal>.
+   System startup will fail if any of the filesystems fails to mount, dropping
+   you to the emergency shell. You can make a mount asynchronous and
+   non-critical by adding
+   <literal><link linkend="opt-fileSystems._name__.options">options</link> = [
+   "nofail" ];</literal>.
   </para>
  </note>
  <xi:include href="luks-file-systems.xml" />
diff --git a/nixos/doc/manual/configuration/firewall.xml b/nixos/doc/manual/configuration/firewall.xml
index fbed9ac7c95..47a19ac82c0 100644
--- a/nixos/doc/manual/configuration/firewall.xml
+++ b/nixos/doc/manual/configuration/firewall.xml
@@ -6,15 +6,21 @@
  <title>Firewall</title>
 
  <para>
-  NixOS has a simple stateful firewall that blocks incoming connections and other unexpected packets. The firewall applies to both IPv4 and IPv6 traffic. It is enabled by default. It can be disabled as follows:
+  NixOS has a simple stateful firewall that blocks incoming connections and
+  other unexpected packets. The firewall applies to both IPv4 and IPv6 traffic.
+  It is enabled by default. It can be disabled as follows:
 <programlisting>
 <xref linkend="opt-networking.firewall.enable"/> = false;
 </programlisting>
-  If the firewall is enabled, you can open specific TCP ports to the outside world:
+  If the firewall is enabled, you can open specific TCP ports to the outside
+  world:
 <programlisting>
 <xref linkend="opt-networking.firewall.allowedTCPPorts"/> = [ 80 443 ];
 </programlisting>
-  Note that TCP port 22 (ssh) is opened automatically if the SSH daemon is enabled (<option><xref linkend="opt-services.openssh.enable"/> = true</option>). UDP ports can be opened through <xref linkend="opt-networking.firewall.allowedUDPPorts"/>.
+  Note that TCP port 22 (ssh) is opened automatically if the SSH daemon is
+  enabled (<option><xref linkend="opt-services.openssh.enable"/> =
+  true</option>). UDP ports can be opened through
+  <xref linkend="opt-networking.firewall.allowedUDPPorts"/>.
  </para>
 
  <para>
@@ -25,6 +31,7 @@
   { from = 8000; to = 8010; }
 ];
 </programlisting>
-  Similarly, UDP port ranges can be opened through <xref linkend="opt-networking.firewall.allowedUDPPortRanges"/>.
+  Similarly, UDP port ranges can be opened through
+  <xref linkend="opt-networking.firewall.allowedUDPPortRanges"/>.
  </para>
 </section>
diff --git a/nixos/doc/manual/configuration/ipv4-config.xml b/nixos/doc/manual/configuration/ipv4-config.xml
index 3ebde2193cb..71ddf41491b 100644
--- a/nixos/doc/manual/configuration/ipv4-config.xml
+++ b/nixos/doc/manual/configuration/ipv4-config.xml
@@ -6,14 +6,17 @@
  <title>IPv4 Configuration</title>
 
  <para>
-  By default, NixOS uses DHCP (specifically, <command>dhcpcd</command>) to automatically configure network interfaces. However, you can configure an interface manually as follows:
+  By default, NixOS uses DHCP (specifically, <command>dhcpcd</command>) to
+  automatically configure network interfaces. However, you can configure an
+  interface manually as follows:
 <programlisting>
 <link linkend="opt-networking.interfaces._name__.ipv4.addresses">networking.interfaces.eth0.ipv4.addresses</link> = [ {
   address = "192.168.1.2";
   prefixLength = 24;
 } ];
 </programlisting>
-  Typically you’ll also want to set a default gateway and set of name servers:
+  Typically you’ll also want to set a default gateway and set of name
+  servers:
 <programlisting>
 <xref linkend="opt-networking.defaultGateway"/> = "192.168.1.1";
 <xref linkend="opt-networking.nameservers"/> = [ "8.8.8.8" ];
@@ -22,7 +25,10 @@
 
  <note>
   <para>
-   Statically configured interfaces are set up by the systemd service <replaceable>interface-name</replaceable><literal>-cfg.service</literal>. The default gateway and name server configuration is performed by <literal>network-setup.service</literal>.
+   Statically configured interfaces are set up by the systemd service
+   <replaceable>interface-name</replaceable><literal>-cfg.service</literal>.
+   The default gateway and name server configuration is performed by
+   <literal>network-setup.service</literal>.
   </para>
  </note>
 
@@ -31,6 +37,7 @@
 <programlisting>
 <xref linkend="opt-networking.hostName"/> = "cartman";
 </programlisting>
-  The default host name is <literal>nixos</literal>. Set it to the empty string (<literal>""</literal>) to allow the DHCP server to provide the host name.
+  The default host name is <literal>nixos</literal>. Set it to the empty string
+  (<literal>""</literal>) to allow the DHCP server to provide the host name.
  </para>
 </section>
diff --git a/nixos/doc/manual/configuration/ipv6-config.xml b/nixos/doc/manual/configuration/ipv6-config.xml
index 690cfcca015..675a5d9a260 100644
--- a/nixos/doc/manual/configuration/ipv6-config.xml
+++ b/nixos/doc/manual/configuration/ipv6-config.xml
@@ -6,21 +6,25 @@
  <title>IPv6 Configuration</title>
 
  <para>
-  IPv6 is enabled by default. Stateless address autoconfiguration is used to automatically assign IPv6 addresses to all interfaces. You can disable IPv6 support globally by setting:
+  IPv6 is enabled by default. Stateless address autoconfiguration is used to
+  automatically assign IPv6 addresses to all interfaces. You can disable IPv6
+  support globally by setting:
 <programlisting>
 <xref linkend="opt-networking.enableIPv6"/> = false;
 </programlisting>
  </para>
 
  <para>
-  You can disable IPv6 on a single interface using a normal sysctl (in this example, we use interface <varname>eth0</varname>):
+  You can disable IPv6 on a single interface using a normal sysctl (in this
+  example, we use interface <varname>eth0</varname>):
 <programlisting>
 <xref linkend="opt-boot.kernel.sysctl"/>."net.ipv6.conf.eth0.disable_ipv6" = true;
 </programlisting>
  </para>
 
  <para>
-  As with IPv4 networking interfaces are automatically configured via DHCPv6. You can configure an interface manually:
+  As with IPv4 networking interfaces are automatically configured via DHCPv6.
+  You can configure an interface manually:
 <programlisting>
 <link linkend="opt-networking.interfaces._name__.ipv6.addresses">networking.interfaces.eth0.ipv6.addresses</link> = [ {
   address = "fe00:aa:bb:cc::2";
@@ -40,6 +44,7 @@
  </para>
 
  <para>
-  See <xref linkend='sec-ipv4' /> for similar examples and additional information.
+  See <xref linkend='sec-ipv4' /> for similar examples and additional
+  information.
  </para>
 </section>
diff --git a/nixos/doc/manual/configuration/kubernetes.xml b/nixos/doc/manual/configuration/kubernetes.xml
index de5ceb83e77..54a100e4479 100644
--- a/nixos/doc/manual/configuration/kubernetes.xml
+++ b/nixos/doc/manual/configuration/kubernetes.xml
@@ -5,10 +5,12 @@
          xml:id="sec-kubernetes">
  <title>Kubernetes</title>
  <para>
-  The NixOS Kubernetes module is a collective term for a handful of individual submodules implementing the Kubernetes cluster components.
+  The NixOS Kubernetes module is a collective term for a handful of individual
+  submodules implementing the Kubernetes cluster components.
  </para>
  <para>
-  There are generally two ways of enabling Kubernetes on NixOS. One way is to enable and configure cluster components appropriately by hand:
+  There are generally two ways of enabling Kubernetes on NixOS. One way is to
+  enable and configure cluster components appropriately by hand:
 <programlisting>
 services.kubernetes = {
   apiserver.enable = true;
@@ -19,7 +21,9 @@ services.kubernetes = {
   flannel.enable = true;
 };
 </programlisting>
-  Another way is to assign cluster roles ("master" and/or "node") to the host. This enables apiserver, controllerManager, scheduler, addonManager, kube-proxy and etcd:
+  Another way is to assign cluster roles ("master" and/or "node") to the host.
+  This enables apiserver, controllerManager, scheduler, addonManager,
+  kube-proxy and etcd:
 <programlisting>
 <xref linkend="opt-services.kubernetes.roles"/> = [ "master" ];
 </programlisting>
@@ -27,29 +31,66 @@ services.kubernetes = {
 <programlisting>
 <xref linkend="opt-services.kubernetes.roles"/> = [ "node" ];
 </programlisting>
-  Assigning both the master and node roles is usable if you want a single node Kubernetes cluster for dev or testing purposes:
+  Assigning both the master and node roles is usable if you want a single node
+  Kubernetes cluster for dev or testing purposes:
 <programlisting>
 <xref linkend="opt-services.kubernetes.roles"/> = [ "master" "node" ];
 </programlisting>
-  Note: Assigning either role will also default both <xref linkend="opt-services.kubernetes.flannel.enable"/> and <xref linkend="opt-services.kubernetes.easyCerts"/> to true. This sets up flannel as CNI and activates automatic PKI bootstrapping.
+  Note: Assigning either role will also default both
+  <xref linkend="opt-services.kubernetes.flannel.enable"/> and
+  <xref linkend="opt-services.kubernetes.easyCerts"/> to true. This sets up
+  flannel as CNI and activates automatic PKI bootstrapping.
  </para>
  <para>
-  As of kubernetes 1.10.X it has been deprecated to open non-tls-enabled ports on kubernetes components. Thus, from NixOS 19.03 all plain HTTP ports have been disabled by default. While opening insecure ports is still possible, it is recommended not to bind these to other interfaces than loopback. To re-enable the insecure port on the apiserver, see options: <xref linkend="opt-services.kubernetes.apiserver.insecurePort"/> and <xref linkend="opt-services.kubernetes.apiserver.insecureBindAddress"/>
+  As of kubernetes 1.10.X it has been deprecated to open non-tls-enabled ports
+  on kubernetes components. Thus, from NixOS 19.03 all plain HTTP ports have
+  been disabled by default. While opening insecure ports is still possible, it
+  is recommended not to bind these to other interfaces than loopback. To
+  re-enable the insecure port on the apiserver, see options:
+  <xref linkend="opt-services.kubernetes.apiserver.insecurePort"/> and
+  <xref linkend="opt-services.kubernetes.apiserver.insecureBindAddress"/>
  </para>
  <note>
   <para>
-   As of NixOS 19.03, it is mandatory to configure: <xref linkend="opt-services.kubernetes.masterAddress"/>. The masterAddress must be resolveable and routeable by all cluster nodes. In single node clusters, this can be set to <literal>localhost</literal>.
+   As of NixOS 19.03, it is mandatory to configure:
+   <xref linkend="opt-services.kubernetes.masterAddress"/>. The masterAddress
+   must be resolveable and routeable by all cluster nodes. In single node
+   clusters, this can be set to <literal>localhost</literal>.
   </para>
  </note>
  <para>
-  Role-based access control (RBAC) authorization mode is enabled by default. This means that anonymous requests to the apiserver secure port will expectedly cause a permission denied error. All cluster components must therefore be configured with x509 certificates for two-way tls communication. The x509 certificate subject section determines the roles and permissions granted by the apiserver to perform clusterwide or namespaced operations. See also: <link
-     xlink:href="https://kubernetes.io/docs/reference/access-authn-authz/rbac/"> Using RBAC Authorization</link>.
+  Role-based access control (RBAC) authorization mode is enabled by default.
+  This means that anonymous requests to the apiserver secure port will
+  expectedly cause a permission denied error. All cluster components must
+  therefore be configured with x509 certificates for two-way tls communication.
+  The x509 certificate subject section determines the roles and permissions
+  granted by the apiserver to perform clusterwide or namespaced operations. See
+  also:
+  <link
+     xlink:href="https://kubernetes.io/docs/reference/access-authn-authz/rbac/">
+  Using RBAC Authorization</link>.
  </para>
  <para>
-  The NixOS kubernetes module provides an option for automatic certificate bootstrapping and configuration, <xref linkend="opt-services.kubernetes.easyCerts"/>. The PKI bootstrapping process involves setting up a certificate authority (CA) daemon (cfssl) on the kubernetes master node. cfssl generates a CA-cert for the cluster, and uses the CA-cert for signing subordinate certs issued to each of the cluster components. Subsequently, the certmgr daemon monitors active certificates and renews them when needed. For single node Kubernetes clusters, setting <xref linkend="opt-services.kubernetes.easyCerts"/> = true is sufficient and no further action is required. For joining extra node machines to an existing cluster on the other hand, establishing initial trust is mandatory.
+  The NixOS kubernetes module provides an option for automatic certificate
+  bootstrapping and configuration,
+  <xref linkend="opt-services.kubernetes.easyCerts"/>. The PKI bootstrapping
+  process involves setting up a certificate authority (CA) daemon (cfssl) on
+  the kubernetes master node. cfssl generates a CA-cert for the cluster, and
+  uses the CA-cert for signing subordinate certs issued to each of the cluster
+  components. Subsequently, the certmgr daemon monitors active certificates and
+  renews them when needed. For single node Kubernetes clusters, setting
+  <xref linkend="opt-services.kubernetes.easyCerts"/> = true is sufficient and
+  no further action is required. For joining extra node machines to an existing
+  cluster on the other hand, establishing initial trust is mandatory.
  </para>
  <para>
-  To add new nodes to the cluster: On any (non-master) cluster node where <xref linkend="opt-services.kubernetes.easyCerts"/> is enabled, the helper script <literal>nixos-kubernetes-node-join</literal> is available on PATH. Given a token on stdin, it will copy the token to the kubernetes secrets directory and restart the certmgr service. As requested certificates are issued, the script will restart kubernetes cluster components as needed for them to pick up new keypairs.
+  To add new nodes to the cluster: On any (non-master) cluster node where
+  <xref linkend="opt-services.kubernetes.easyCerts"/> is enabled, the helper
+  script <literal>nixos-kubernetes-node-join</literal> is available on PATH.
+  Given a token on stdin, it will copy the token to the kubernetes secrets
+  directory and restart the certmgr service. As requested certificates are
+  issued, the script will restart kubernetes cluster components as needed for
+  them to pick up new keypairs.
  </para>
  <note>
   <para>
@@ -57,6 +98,15 @@ services.kubernetes = {
   </para>
  </note>
  <para>
-  In order to interact with an RBAC-enabled cluster as an administrator, one needs to have cluster-admin privileges. By default, when easyCerts is enabled, a cluster-admin kubeconfig file is generated and linked into <literal>/etc/kubernetes/cluster-admin.kubeconfig</literal> as determined by <xref linkend="opt-services.kubernetes.pki.etcClusterAdminKubeconfig"/>. <literal>export KUBECONFIG=/etc/kubernetes/cluster-admin.kubeconfig</literal> will make kubectl use this kubeconfig to access and authenticate the cluster. The cluster-admin kubeconfig references an auto-generated keypair owned by root. Thus, only root on the kubernetes master may obtain cluster-admin rights by means of this file.
+  In order to interact with an RBAC-enabled cluster as an administrator, one
+  needs to have cluster-admin privileges. By default, when easyCerts is
+  enabled, a cluster-admin kubeconfig file is generated and linked into
+  <literal>/etc/kubernetes/cluster-admin.kubeconfig</literal> as determined by
+  <xref linkend="opt-services.kubernetes.pki.etcClusterAdminKubeconfig"/>.
+  <literal>export KUBECONFIG=/etc/kubernetes/cluster-admin.kubeconfig</literal>
+  will make kubectl use this kubeconfig to access and authenticate the cluster.
+  The cluster-admin kubeconfig references an auto-generated keypair owned by
+  root. Thus, only root on the kubernetes master may obtain cluster-admin
+  rights by means of this file.
  </para>
 </chapter>
diff --git a/nixos/doc/manual/configuration/linux-kernel.xml b/nixos/doc/manual/configuration/linux-kernel.xml
index 7f757f287ce..644d3a33ffd 100644
--- a/nixos/doc/manual/configuration/linux-kernel.xml
+++ b/nixos/doc/manual/configuration/linux-kernel.xml
@@ -5,19 +5,27 @@
          xml:id="sec-kernel-config">
  <title>Linux Kernel</title>
  <para>
-  You can override the Linux kernel and associated packages using the option <option>boot.kernelPackages</option>. For instance, this selects the Linux 3.10 kernel:
+  You can override the Linux kernel and associated packages using the option
+  <option>boot.kernelPackages</option>. For instance, this selects the Linux
+  3.10 kernel:
 <programlisting>
 <xref linkend="opt-boot.kernelPackages"/> = pkgs.linuxPackages_3_10;
 </programlisting>
-  Note that this not only replaces the kernel, but also packages that are specific to the kernel version, such as the NVIDIA video drivers. This ensures that driver packages are consistent with the kernel.
+  Note that this not only replaces the kernel, but also packages that are
+  specific to the kernel version, such as the NVIDIA video drivers. This
+  ensures that driver packages are consistent with the kernel.
  </para>
  <para>
-  The default Linux kernel configuration should be fine for most users. You can see the configuration of your current kernel with the following command:
+  The default Linux kernel configuration should be fine for most users. You can
+  see the configuration of your current kernel with the following command:
 <programlisting>
 zcat /proc/config.gz
 </programlisting>
-  If you want to change the kernel configuration, you can use the <option>packageOverrides</option> feature (see <xref
-linkend="sec-customising-packages" />). For instance, to enable support for the kernel debugger KGDB:
+  If you want to change the kernel configuration, you can use the
+  <option>packageOverrides</option> feature (see
+  <xref
+linkend="sec-customising-packages" />). For instance, to enable support
+  for the kernel debugger KGDB:
 <programlisting>
 nixpkgs.config.packageOverrides = pkgs:
   { linux_3_4 = pkgs.linux_3_4.override {
@@ -28,31 +36,44 @@ nixpkgs.config.packageOverrides = pkgs:
     };
   };
 </programlisting>
-  <varname>extraConfig</varname> takes a list of Linux kernel configuration options, one per line. The name of the option should not include the prefix <literal>CONFIG_</literal>. The option value is typically <literal>y</literal>, <literal>n</literal> or <literal>m</literal> (to build something as a kernel module).
+  <varname>extraConfig</varname> takes a list of Linux kernel configuration
+  options, one per line. The name of the option should not include the prefix
+  <literal>CONFIG_</literal>. The option value is typically
+  <literal>y</literal>, <literal>n</literal> or <literal>m</literal> (to build
+  something as a kernel module).
  </para>
  <para>
-  Kernel modules for hardware devices are generally loaded automatically by <command>udev</command>. You can force a module to be loaded via <xref linkend="opt-boot.kernelModules"/>, e.g.
+  Kernel modules for hardware devices are generally loaded automatically by
+  <command>udev</command>. You can force a module to be loaded via
+  <xref linkend="opt-boot.kernelModules"/>, e.g.
 <programlisting>
 <xref linkend="opt-boot.kernelModules"/> = [ "fuse" "kvm-intel" "coretemp" ];
 </programlisting>
-  If the module is required early during the boot (e.g. to mount the root file system), you can use <xref linkend="opt-boot.initrd.kernelModules"/>:
+  If the module is required early during the boot (e.g. to mount the root file
+  system), you can use <xref linkend="opt-boot.initrd.kernelModules"/>:
 <programlisting>
 <xref linkend="opt-boot.initrd.kernelModules"/> = [ "cifs" ];
 </programlisting>
-  This causes the specified modules and their dependencies to be added to the initial ramdisk.
+  This causes the specified modules and their dependencies to be added to the
+  initial ramdisk.
  </para>
  <para>
-  Kernel runtime parameters can be set through <xref linkend="opt-boot.kernel.sysctl"/>, e.g.
+  Kernel runtime parameters can be set through
+  <xref linkend="opt-boot.kernel.sysctl"/>, e.g.
 <programlisting>
 <xref linkend="opt-boot.kernel.sysctl"/>."net.ipv4.tcp_keepalive_time" = 120;
 </programlisting>
-  sets the kernel’s TCP keepalive time to 120 seconds. To see the available parameters, run <command>sysctl -a</command>.
+  sets the kernel’s TCP keepalive time to 120 seconds. To see the available
+  parameters, run <command>sysctl -a</command>.
  </para>
  <section xml:id="sec-linux-config-customizing">
   <title>Customize your kernel</title>
 
   <para>
-   The first step before compiling the kernel is to generate an appropriate <literal>.config</literal> configuration. Either you pass your own config via the <literal>configfile</literal> setting of <literal>linuxManualConfig</literal>:
+   The first step before compiling the kernel is to generate an appropriate
+   <literal>.config</literal> configuration. Either you pass your own config
+   via the <literal>configfile</literal> setting of
+   <literal>linuxManualConfig</literal>:
 <screen><![CDATA[
   custom-kernel = super.linuxManualConfig {
     inherit (super) stdenv hostPlatform;
@@ -63,11 +84,17 @@ nixpkgs.config.packageOverrides = pkgs:
     allowImportFromDerivation = true;
   };
   ]]></screen>
-   You can edit the config with this snippet (by default <command>make menuconfig</command> won't work out of the box on nixos):
+   You can edit the config with this snippet (by default <command>make
+   menuconfig</command> won't work out of the box on nixos):
 <screen><![CDATA[
       nix-shell -E 'with import <nixpkgs> {}; kernelToOverride.overrideAttrs (o: {nativeBuildInputs=o.nativeBuildInputs ++ [ pkgconfig ncurses ];})'
   ]]></screen>
-   or you can let nixpkgs generate the configuration. Nixpkgs generates it via answering the interactive kernel utility <command>make config</command>. The answers depend on parameters passed to <filename>pkgs/os-specific/linux/kernel/generic.nix</filename> (which you can influence by overriding <literal>extraConfig, autoModules, modDirVersion, preferBuiltin, extraConfig</literal>).
+   or you can let nixpkgs generate the configuration. Nixpkgs generates it via
+   answering the interactive kernel utility <command>make config</command>. The
+   answers depend on parameters passed to
+   <filename>pkgs/os-specific/linux/kernel/generic.nix</filename> (which you
+   can influence by overriding <literal>extraConfig, autoModules,
+   modDirVersion, preferBuiltin, extraConfig</literal>).
 <screen><![CDATA[
 
   mptcp93.override ({
@@ -94,7 +121,9 @@ nixpkgs.config.packageOverrides = pkgs:
   <title>Developing kernel modules</title>
 
   <para>
-   When developing kernel modules it's often convenient to run edit-compile-run loop as quickly as possible. See below snippet as an example of developing <literal>mellanox</literal> drivers.
+   When developing kernel modules it's often convenient to run edit-compile-run
+   loop as quickly as possible. See below snippet as an example of developing
+   <literal>mellanox</literal> drivers.
   </para>
 
 <screen><![CDATA[
diff --git a/nixos/doc/manual/configuration/luks-file-systems.xml b/nixos/doc/manual/configuration/luks-file-systems.xml
index d57fd256b2e..8a2b107e0ee 100644
--- a/nixos/doc/manual/configuration/luks-file-systems.xml
+++ b/nixos/doc/manual/configuration/luks-file-systems.xml
@@ -6,7 +6,10 @@
  <title>LUKS-Encrypted File Systems</title>
 
  <para>
-  NixOS supports file systems that are encrypted using <emphasis>LUKS</emphasis> (Linux Unified Key Setup). For example, here is how you create an encrypted Ext4 file system on the device <filename>/dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d</filename>:
+  NixOS supports file systems that are encrypted using
+  <emphasis>LUKS</emphasis> (Linux Unified Key Setup). For example, here is how
+  you create an encrypted Ext4 file system on the device
+  <filename>/dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d</filename>:
 <screen>
 # cryptsetup luksFormat /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d
 
@@ -23,12 +26,15 @@ Enter passphrase for /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d: ***
 
 # mkfs.ext4 /dev/mapper/crypted
 </screen>
-  To ensure that this file system is automatically mounted at boot time as <filename>/</filename>, add the following to <filename>configuration.nix</filename>:
+  To ensure that this file system is automatically mounted at boot time as
+  <filename>/</filename>, add the following to
+  <filename>configuration.nix</filename>:
 <programlisting>
 <link linkend="opt-boot.initrd.luks.devices._name__.device">boot.initrd.luks.devices.crypted.device</link> = "/dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d";
 <xref linkend="opt-fileSystems"/>."/".device = "/dev/mapper/crypted";
 </programlisting>
-  Should grub be used as bootloader, and <filename>/boot</filename> is located on an encrypted partition, it is necessary to add the following grub option:
+  Should grub be used as bootloader, and <filename>/boot</filename> is located
+  on an encrypted partition, it is necessary to add the following grub option:
 <programlisting><xref linkend="opt-boot.loader.grub.enableCryptodisk"/> = true;</programlisting>
  </para>
 </section>
diff --git a/nixos/doc/manual/configuration/matrix.xml b/nixos/doc/manual/configuration/matrix.xml
index c7c7e4e5491..ef8d5cbda88 100644
--- a/nixos/doc/manual/configuration/matrix.xml
+++ b/nixos/doc/manual/configuration/matrix.xml
@@ -5,16 +5,33 @@
          xml:id="module-services-matrix">
  <title>Matrix</title>
  <para>
-  <link xlink:href="https://matrix.org/">Matrix</link> is an open standard for interoperable, decentralised, real-time communication over IP. It can be used to power Instant Messaging, VoIP/WebRTC signalling, Internet of Things communication - or anywhere you need a standard HTTP API for publishing and subscribing to data whilst tracking the conversation history.
+  <link xlink:href="https://matrix.org/">Matrix</link> is an open standard for
+  interoperable, decentralised, real-time communication over IP. It can be used
+  to power Instant Messaging, VoIP/WebRTC signalling, Internet of Things
+  communication - or anywhere you need a standard HTTP API for publishing and
+  subscribing to data whilst tracking the conversation history.
  </para>
  <para>
-  This chapter will show you how to set up your own, self-hosted Matrix homeserver using the Synapse reference homeserver, and how to serve your own copy of the Riot web client. See the <link xlink:href="https://matrix.org/docs/projects/try-matrix-now.html">Try Matrix Now!</link> overview page for links to Riot Apps for Android and iOS, desktop clients, as well as bridges to other networks and other projects around Matrix.
+  This chapter will show you how to set up your own, self-hosted Matrix
+  homeserver using the Synapse reference homeserver, and how to serve your own
+  copy of the Riot web client. See the
+  <link xlink:href="https://matrix.org/docs/projects/try-matrix-now.html">Try
+  Matrix Now!</link> overview page for links to Riot Apps for Android and iOS,
+  desktop clients, as well as bridges to other networks and other projects
+  around Matrix.
  </para>
  <section xml:id="module-services-matrix-synapse">
   <title>Synapse Homeserver</title>
 
   <para>
-   <link xlink:href="https://github.com/matrix-org/synapse">Synapse</link> is the reference homeserver implementation of Matrix from the core development team at matrix.org. The following configuration example will set up a synapse server for the <literal>example.org</literal> domain, served from the host <literal>myhostname.example.org</literal>. For more information, please refer to the <link xlink:href="https://github.com/matrix-org/synapse#synapse-installation"> installation instructions of Synapse </link>.
+   <link xlink:href="https://github.com/matrix-org/synapse">Synapse</link> is
+   the reference homeserver implementation of Matrix from the core development
+   team at matrix.org. The following configuration example will set up a
+   synapse server for the <literal>example.org</literal> domain, served from
+   the host <literal>myhostname.example.org</literal>. For more information,
+   please refer to the
+   <link xlink:href="https://github.com/matrix-org/synapse#synapse-installation">
+   installation instructions of Synapse </link>.
 <programlisting>
 let
   fqdn =
@@ -104,11 +121,26 @@ in {
   </para>
 
   <para>
-   If the <code>A</code> and <code>AAAA</code> DNS records on <literal>example.org</literal> do not point on the same host as the records for <code>myhostname.example.org</code>, you can easily move the <code>/.well-known</code> virtualHost section of the code to the host that is serving <literal>example.org</literal>, while the rest stays on <literal>myhostname.example.org</literal> with no other changes required. This pattern also allows to seamlessly move the homeserver from <literal>myhostname.example.org</literal> to <literal>myotherhost.example.org</literal> by only changing the <code>/.well-known</code> redirection target.
+   If the <code>A</code> and <code>AAAA</code> DNS records on
+   <literal>example.org</literal> do not point on the same host as the records
+   for <code>myhostname.example.org</code>, you can easily move the
+   <code>/.well-known</code> virtualHost section of the code to the host that
+   is serving <literal>example.org</literal>, while the rest stays on
+   <literal>myhostname.example.org</literal> with no other changes required.
+   This pattern also allows to seamlessly move the homeserver from
+   <literal>myhostname.example.org</literal> to
+   <literal>myotherhost.example.org</literal> by only changing the
+   <code>/.well-known</code> redirection target.
   </para>
 
   <para>
-   If you want to run a server with public registration by anybody, you can then enable <option>services.matrix-synapse.enable_registration = true;</option>. Otherwise, or you can generate a registration secret with <command>pwgen -s 64 1</command> and set it with <option>services.matrix-synapse.registration_shared_secret</option>. To create a new user or admin, run the following after you have set the secret and have rebuilt NixOS:
+   If you want to run a server with public registration by anybody, you can
+   then enable <option>services.matrix-synapse.enable_registration =
+   true;</option>. Otherwise, or you can generate a registration secret with
+   <command>pwgen -s 64 1</command> and set it with
+   <option>services.matrix-synapse.registration_shared_secret</option>. To
+   create a new user or admin, run the following after you have set the secret
+   and have rebuilt NixOS:
 <screen>
 <prompt>$ </prompt>nix run nixpkgs.matrix-synapse
 <prompt>$ </prompt>register_new_matrix_user -k <replaceable>your-registration-shared-secret</replaceable> http://localhost:8008
@@ -118,14 +150,32 @@ in {
 <prompt>Make admin [no]:</prompt>
 Success!
 </screen>
-   In the example, this would create a user with the Matrix Identifier <literal>@your-username:example.org</literal>. Note that the registration secret ends up in the nix store and therefore is world-readable by any user on your machine, so it makes sense to only temporarily activate the <option>registration_shared_secret</option> option until a better solution for NixOS is in place.
+   In the example, this would create a user with the Matrix Identifier
+   <literal>@your-username:example.org</literal>. Note that the registration
+   secret ends up in the nix store and therefore is world-readable by any user
+   on your machine, so it makes sense to only temporarily activate the
+   <option>registration_shared_secret</option> option until a better solution
+   for NixOS is in place.
   </para>
  </section>
  <section xml:id="module-services-matrix-riot-web">
   <title>Riot Web Client</title>
 
   <para>
-   <link xlink:href="https://github.com/vector-im/riot-web/">Riot Web</link> is the reference web client for Matrix and developed by the core team at matrix.org. The following snippet can be optionally added to the code before to complete the synapse installation with a web client served at <code>https://riot.myhostname.example.org</code> and <code>https://riot.example.org</code>. Alternatively, you can use the hosted copy at <link xlink:href="https://riot.im/app">https://riot.im/app</link>, or use other web clients or native client applications. Due to the <literal>/.well-known</literal> urls set up done above, many clients should fill in the required connection details automatically when you enter your Matrix Identifier. See <link xlink:href="https://matrix.org/docs/projects/try-matrix-now.html">Try Matrix Now!</link> for a list of existing clients and their supported featureset.
+   <link xlink:href="https://github.com/vector-im/riot-web/">Riot Web</link> is
+   the reference web client for Matrix and developed by the core team at
+   matrix.org. The following snippet can be optionally added to the code before
+   to complete the synapse installation with a web client served at
+   <code>https://riot.myhostname.example.org</code> and
+   <code>https://riot.example.org</code>. Alternatively, you can use the hosted
+   copy at <link xlink:href="https://riot.im/app">https://riot.im/app</link>,
+   or use other web clients or native client applications. Due to the
+   <literal>/.well-known</literal> urls set up done above, many clients should
+   fill in the required connection details automatically when you enter your
+   Matrix Identifier. See
+   <link xlink:href="https://matrix.org/docs/projects/try-matrix-now.html">Try
+   Matrix Now!</link> for a list of existing clients and their supported
+   featureset.
 <programlisting>
 services.nginx.virtualHosts."riot.${fqdn}" = {
   enableACME = true;
@@ -140,7 +190,14 @@ services.nginx.virtualHosts."riot.${fqdn}" = {
   </para>
 
   <para>
-   Note that the Riot developers do not recommend running Riot and your Matrix homeserver on the same fully-qualified domain name for security reasons. In the example, this means that you should not reuse the <literal>myhostname.example.org</literal> virtualHost to also serve Riot, but instead serve it on a different subdomain, like <literal>riot.example.org</literal> in the example. See the <link xlink:href="https://github.com/vector-im/riot-web#important-security-note">Riot Important Security Notes</link> for more information on this subject.
+   Note that the Riot developers do not recommend running Riot and your Matrix
+   homeserver on the same fully-qualified domain name for security reasons. In
+   the example, this means that you should not reuse the
+   <literal>myhostname.example.org</literal> virtualHost to also serve Riot,
+   but instead serve it on a different subdomain, like
+   <literal>riot.example.org</literal> in the example. See the
+   <link xlink:href="https://github.com/vector-im/riot-web#important-security-note">Riot
+   Important Security Notes</link> for more information on this subject.
   </para>
  </section>
 </chapter>
diff --git a/nixos/doc/manual/configuration/modularity.xml b/nixos/doc/manual/configuration/modularity.xml
index b485ff1ebf6..7ad0ae80a48 100644
--- a/nixos/doc/manual/configuration/modularity.xml
+++ b/nixos/doc/manual/configuration/modularity.xml
@@ -6,11 +6,18 @@
  <title>Modularity</title>
 
  <para>
-  The NixOS configuration mechanism is modular. If your <filename>configuration.nix</filename> becomes too big, you can split it into multiple files. Likewise, if you have multiple NixOS configurations (e.g. for different computers) with some commonality, you can move the common configuration into a shared file.
+  The NixOS configuration mechanism is modular. If your
+  <filename>configuration.nix</filename> becomes too big, you can split it into
+  multiple files. Likewise, if you have multiple NixOS configurations (e.g. for
+  different computers) with some commonality, you can move the common
+  configuration into a shared file.
  </para>
 
  <para>
-  Modules have exactly the same syntax as <filename>configuration.nix</filename>. In fact, <filename>configuration.nix</filename> is itself a module. You can use other modules by including them from <filename>configuration.nix</filename>, e.g.:
+  Modules have exactly the same syntax as
+  <filename>configuration.nix</filename>. In fact,
+  <filename>configuration.nix</filename> is itself a module. You can use other
+  modules by including them from <filename>configuration.nix</filename>, e.g.:
 <programlisting>
 { config, pkgs, ... }:
 
@@ -20,7 +27,9 @@
   <replaceable>...</replaceable>
 }
 </programlisting>
-  Here, we include two modules from the same directory, <filename>vpn.nix</filename> and <filename>kde.nix</filename>. The latter might look like this:
+  Here, we include two modules from the same directory,
+  <filename>vpn.nix</filename> and <filename>kde.nix</filename>. The latter
+  might look like this:
 <programlisting>
 { config, pkgs, ... }:
 
@@ -29,32 +38,55 @@
   <xref linkend="opt-services.xserver.desktopManager.plasma5.enable"/> = true;
 }
 </programlisting>
-  Note that both <filename>configuration.nix</filename> and <filename>kde.nix</filename> define the option <xref linkend="opt-environment.systemPackages"/>. When multiple modules define an option, NixOS will try to <emphasis>merge</emphasis> the definitions. In the case of <xref linkend="opt-environment.systemPackages"/>, that’s easy: the lists of packages can simply be concatenated. The value in <filename>configuration.nix</filename> is merged last, so for list-type options, it will appear at the end of the merged list. If you want it to appear first, you can use <varname>mkBefore</varname>:
+  Note that both <filename>configuration.nix</filename> and
+  <filename>kde.nix</filename> define the option
+  <xref linkend="opt-environment.systemPackages"/>. When multiple modules
+  define an option, NixOS will try to <emphasis>merge</emphasis> the
+  definitions. In the case of <xref linkend="opt-environment.systemPackages"/>,
+  that’s easy: the lists of packages can simply be concatenated. The value in
+  <filename>configuration.nix</filename> is merged last, so for list-type
+  options, it will appear at the end of the merged list. If you want it to
+  appear first, you can use <varname>mkBefore</varname>:
 <programlisting>
 <xref linkend="opt-boot.kernelModules"/> = mkBefore [ "kvm-intel" ];
 </programlisting>
-  This causes the <literal>kvm-intel</literal> kernel module to be loaded before any other kernel modules.
+  This causes the <literal>kvm-intel</literal> kernel module to be loaded
+  before any other kernel modules.
  </para>
 
  <para>
-  For other types of options, a merge may not be possible. For instance, if two modules define <xref linkend="opt-services.httpd.adminAddr"/>, <command>nixos-rebuild</command> will give an error:
+  For other types of options, a merge may not be possible. For instance, if two
+  modules define <xref linkend="opt-services.httpd.adminAddr"/>,
+  <command>nixos-rebuild</command> will give an error:
 <screen>
 The unique option `services.httpd.adminAddr' is defined multiple times, in `/etc/nixos/httpd.nix' and `/etc/nixos/configuration.nix'.
 </screen>
-  When that happens, it’s possible to force one definition take precedence over the others:
+  When that happens, it’s possible to force one definition take precedence
+  over the others:
 <programlisting>
 <xref linkend="opt-services.httpd.adminAddr"/> = pkgs.lib.mkForce "bob@example.org";
 </programlisting>
  </para>
 
  <para>
-  When using multiple modules, you may need to access configuration values defined in other modules. This is what the <varname>config</varname> function argument is for: it contains the complete, merged system configuration. That is, <varname>config</varname> is the result of combining the configurations returned by every module
+  When using multiple modules, you may need to access configuration values
+  defined in other modules. This is what the <varname>config</varname> function
+  argument is for: it contains the complete, merged system configuration. That
+  is, <varname>config</varname> is the result of combining the configurations
+  returned by every module
   <footnote xml:id="footnote-nix-is-lazy">
    <para>
-    If you’re wondering how it’s possible that the (indirect) <emphasis>result</emphasis> of a function is passed as an <emphasis>input</emphasis> to that same function: that’s because Nix is a “lazy” language — it only computes values when they are needed. This works as long as no individual configuration value depends on itself.
+    If you’re wondering how it’s possible that the (indirect)
+    <emphasis>result</emphasis> of a function is passed as an
+    <emphasis>input</emphasis> to that same function: that’s because Nix is a
+    “lazy” language — it only computes values when they are needed. This
+    works as long as no individual configuration value depends on itself.
    </para>
   </footnote>
-  . For example, here is a module that adds some packages to <xref linkend="opt-environment.systemPackages"/> only if <xref linkend="opt-services.xserver.enable"/> is set to <literal>true</literal> somewhere else:
+  . For example, here is a module that adds some packages to
+  <xref linkend="opt-environment.systemPackages"/> only if
+  <xref linkend="opt-services.xserver.enable"/> is set to
+  <literal>true</literal> somewhere else:
 <programlisting>
 { config, pkgs, ... }:
 
@@ -70,7 +102,9 @@ The unique option `services.httpd.adminAddr' is defined multiple times, in `/etc
  </para>
 
  <para>
-  With multiple modules, it may not be obvious what the final value of a configuration option is. The command <option>nixos-option</option> allows you to find out:
+  With multiple modules, it may not be obvious what the final value of a
+  configuration option is. The command <option>nixos-option</option> allows you
+  to find out:
 <screen>
 <prompt>$ </prompt>nixos-option <xref linkend="opt-services.xserver.enable"/>
 true
@@ -78,7 +112,8 @@ true
 <prompt>$ </prompt>nixos-option <xref linkend="opt-boot.kernelModules"/>
 [ "tun" "ipv6" "loop" <replaceable>...</replaceable> ]
 </screen>
-  Interactive exploration of the configuration is possible using <command>nix repl</command>, a read-eval-print loop for Nix expressions. A typical use:
+  Interactive exploration of the configuration is possible using <command>nix
+  repl</command>, a read-eval-print loop for Nix expressions. A typical use:
 <screen>
 <prompt>$ </prompt>nix repl '&lt;nixpkgs/nixos>'
 
@@ -91,7 +126,9 @@ true
  </para>
 
  <para>
-  While abstracting your configuration, you may find it useful to generate modules using code, instead of writing files. The example below would have the same effect as importing a file which sets those options.
+  While abstracting your configuration, you may find it useful to generate
+  modules using code, instead of writing files. The example below would have
+  the same effect as importing a file which sets those options.
 <programlisting>
 { config, pkgs, ... }:
 
diff --git a/nixos/doc/manual/configuration/network-manager.xml b/nixos/doc/manual/configuration/network-manager.xml
index fb06d60b487..d103ee24978 100644
--- a/nixos/doc/manual/configuration/network-manager.xml
+++ b/nixos/doc/manual/configuration/network-manager.xml
@@ -6,27 +6,39 @@
  <title>NetworkManager</title>
 
  <para>
-  To facilitate network configuration, some desktop environments use NetworkManager. You can enable NetworkManager by setting:
+  To facilitate network configuration, some desktop environments use
+  NetworkManager. You can enable NetworkManager by setting:
 <programlisting>
 <xref linkend="opt-networking.networkmanager.enable"/> = true;
 </programlisting>
-  some desktop managers (e.g., GNOME) enable NetworkManager automatically for you.
+  some desktop managers (e.g., GNOME) enable NetworkManager automatically for
+  you.
  </para>
 
  <para>
-  All users that should have permission to change network settings must belong to the <code>networkmanager</code> group:
+  All users that should have permission to change network settings must belong
+  to the <code>networkmanager</code> group:
 <programlisting>
 <link linkend="opt-users.users._name__.extraGroups">users.users.alice.extraGroups</link> = [ "networkmanager" ];
 </programlisting>
  </para>
 
  <para>
-  NetworkManager is controlled using either <command>nmcli</command> or <command>nmtui</command> (curses-based terminal user interface). See their manual pages for details on their usage. Some desktop environments (GNOME, KDE) have their own configuration tools for NetworkManager. On XFCE, there is no configuration tool for NetworkManager by default: by adding <code>networkmanagerapplet</code> to the list of system packages, the graphical applet will be installed and will launch automatically when XFCE is starting (and will show in the status tray).
+  NetworkManager is controlled using either <command>nmcli</command> or
+  <command>nmtui</command> (curses-based terminal user interface). See their
+  manual pages for details on their usage. Some desktop environments (GNOME,
+  KDE) have their own configuration tools for NetworkManager. On XFCE, there is
+  no configuration tool for NetworkManager by default: by adding
+  <code>networkmanagerapplet</code> to the list of system packages, the
+  graphical applet will be installed and will launch automatically when XFCE is
+  starting (and will show in the status tray).
  </para>
 
  <note>
   <para>
-   <code>networking.networkmanager</code> and <code>networking.wireless</code> (WPA Supplicant) cannot be enabled at the same time: you can still connect to the wireless networks using NetworkManager.
+   <code>networking.networkmanager</code> and <code>networking.wireless</code>
+   (WPA Supplicant) cannot be enabled at the same time: you can still connect
+   to the wireless networks using NetworkManager.
   </para>
  </note>
 </section>
diff --git a/nixos/doc/manual/configuration/networking.xml b/nixos/doc/manual/configuration/networking.xml
index 10eeebadb62..02cf811e0bd 100644
--- a/nixos/doc/manual/configuration/networking.xml
+++ b/nixos/doc/manual/configuration/networking.xml
@@ -5,7 +5,8 @@
          xml:id="sec-networking">
  <title>Networking</title>
  <para>
-  This section describes how to configure networking components on your NixOS machine.
+  This section describes how to configure networking components on your NixOS
+  machine.
  </para>
  <xi:include href="network-manager.xml" />
  <xi:include href="ssh.xml" />
diff --git a/nixos/doc/manual/configuration/package-mgmt.xml b/nixos/doc/manual/configuration/package-mgmt.xml
index 6abb83fedcc..e8ac5d0681a 100644
--- a/nixos/doc/manual/configuration/package-mgmt.xml
+++ b/nixos/doc/manual/configuration/package-mgmt.xml
@@ -5,16 +5,23 @@
          xml:id="sec-package-management">
  <title>Package Management</title>
  <para>
-  This section describes how to add additional packages to your system. NixOS has two distinct styles of package management:
+  This section describes how to add additional packages to your system. NixOS
+  has two distinct styles of package management:
   <itemizedlist>
    <listitem>
     <para>
-     <emphasis>Declarative</emphasis>, where you declare what packages you want in your <filename>configuration.nix</filename>. Every time you run <command>nixos-rebuild</command>, NixOS will ensure that you get a consistent set of binaries corresponding to your specification.
+     <emphasis>Declarative</emphasis>, where you declare what packages you want
+     in your <filename>configuration.nix</filename>. Every time you run
+     <command>nixos-rebuild</command>, NixOS will ensure that you get a
+     consistent set of binaries corresponding to your specification.
     </para>
    </listitem>
    <listitem>
     <para>
-     <emphasis>Ad hoc</emphasis>, where you install, upgrade and uninstall packages via the <command>nix-env</command> command. This style allows mixing packages from different Nixpkgs versions. It’s the only choice for non-root users.
+     <emphasis>Ad hoc</emphasis>, where you install, upgrade and uninstall
+     packages via the <command>nix-env</command> command. This style allows
+     mixing packages from different Nixpkgs versions. It’s the only choice
+     for non-root users.
     </para>
    </listitem>
   </itemizedlist>
diff --git a/nixos/doc/manual/configuration/profiles.xml b/nixos/doc/manual/configuration/profiles.xml
index 94a61229398..9d08f7f7bed 100644
--- a/nixos/doc/manual/configuration/profiles.xml
+++ b/nixos/doc/manual/configuration/profiles.xml
@@ -5,7 +5,12 @@
          xml:id="ch-profiles">
  <title>Profiles</title>
  <para>
-  In some cases, it may be desirable to take advantage of commonly-used, predefined configurations provided by nixpkgs, but different from those that come as default. This is a role fulfilled by NixOS's Profiles, which come as files living in <filename>&lt;nixpkgs/nixos/modules/profiles&gt;</filename>. That is to say, expected usage is to add them to the imports list of your <filename>/etc/configuration.nix</filename> as such:
+  In some cases, it may be desirable to take advantage of commonly-used,
+  predefined configurations provided by nixpkgs, but different from those that
+  come as default. This is a role fulfilled by NixOS's Profiles, which come as
+  files living in <filename>&lt;nixpkgs/nixos/modules/profiles&gt;</filename>.
+  That is to say, expected usage is to add them to the imports list of your
+  <filename>/etc/configuration.nix</filename> as such:
  </para>
 <programlisting>
   imports = [
@@ -13,10 +18,12 @@
   ];
 </programlisting>
  <para>
-  Even if some of these profiles seem only useful in the context of install media, many are actually intended to be used in real installs.
+  Even if some of these profiles seem only useful in the context of install
+  media, many are actually intended to be used in real installs.
  </para>
  <para>
-  What follows is a brief explanation on the purpose and use-case for each profile. Detailing each option configured by each one is out of scope.
+  What follows is a brief explanation on the purpose and use-case for each
+  profile. Detailing each option configured by each one is out of scope.
  </para>
  <xi:include href="profiles/all-hardware.xml" />
  <xi:include href="profiles/base.xml" />
diff --git a/nixos/doc/manual/configuration/profiles/all-hardware.xml b/nixos/doc/manual/configuration/profiles/all-hardware.xml
index 41593432d81..2936f71069d 100644
--- a/nixos/doc/manual/configuration/profiles/all-hardware.xml
+++ b/nixos/doc/manual/configuration/profiles/all-hardware.xml
@@ -6,10 +6,16 @@
  <title>All Hardware</title>
 
  <para>
-  Enables all hardware supported by NixOS: i.e., all firmware is included, and all devices from which one may boot are enabled in the initrd. Its primary use is in the NixOS installation CDs.
+  Enables all hardware supported by NixOS: i.e., all firmware is included, and
+  all devices from which one may boot are enabled in the initrd. Its primary
+  use is in the NixOS installation CDs.
  </para>
 
  <para>
-  The enabled kernel modules include support for SATA and PATA, SCSI (partially), USB, Firewire (untested), Virtio (QEMU, KVM, etc.), VMware, and Hyper-V. Additionally, <xref linkend="opt-hardware.enableAllFirmware"/> is enabled, and the firmware for the ZyDAS ZD1211 chipset is specifically installed.
+  The enabled kernel modules include support for SATA and PATA, SCSI
+  (partially), USB, Firewire (untested), Virtio (QEMU, KVM, etc.), VMware, and
+  Hyper-V. Additionally, <xref linkend="opt-hardware.enableAllFirmware"/> is
+  enabled, and the firmware for the ZyDAS ZD1211 chipset is specifically
+  installed.
  </para>
 </section>
diff --git a/nixos/doc/manual/configuration/profiles/base.xml b/nixos/doc/manual/configuration/profiles/base.xml
index 31e10ebca55..b75f6ba25b4 100644
--- a/nixos/doc/manual/configuration/profiles/base.xml
+++ b/nixos/doc/manual/configuration/profiles/base.xml
@@ -6,6 +6,10 @@
  <title>Base</title>
 
  <para>
-  Defines the software packages included in the "minimal" installation CD. It installs several utilities useful in a simple recovery or install media, such as a text-mode web browser, and tools for manipulating block devices, networking, hardware diagnostics, and filesystems (with their respective kernel modules).
+  Defines the software packages included in the "minimal" installation CD. It
+  installs several utilities useful in a simple recovery or install media, such
+  as a text-mode web browser, and tools for manipulating block devices,
+  networking, hardware diagnostics, and filesystems (with their respective
+  kernel modules).
  </para>
 </section>
diff --git a/nixos/doc/manual/configuration/profiles/clone-config.xml b/nixos/doc/manual/configuration/profiles/clone-config.xml
index 95a4d292c40..04fa1643d0f 100644
--- a/nixos/doc/manual/configuration/profiles/clone-config.xml
+++ b/nixos/doc/manual/configuration/profiles/clone-config.xml
@@ -6,10 +6,16 @@
  <title>Clone Config</title>
 
  <para>
-  This profile is used in installer images. It provides an editable configuration.nix that imports all the modules that were also used when creating the image in the first place. As a result it allows users to edit and rebuild the live-system.
+  This profile is used in installer images. It provides an editable
+  configuration.nix that imports all the modules that were also used when
+  creating the image in the first place. As a result it allows users to edit
+  and rebuild the live-system.
  </para>
 
  <para>
-  On images where the installation media also becomes an installation target, copying over <literal>configuration.nix</literal> should be disabled by setting <literal>installer.cloneConfig</literal> to <literal>false</literal>. For example, this is done in <literal>sd-image-aarch64.nix</literal>.
+  On images where the installation media also becomes an installation target,
+  copying over <literal>configuration.nix</literal> should be disabled by
+  setting <literal>installer.cloneConfig</literal> to <literal>false</literal>.
+  For example, this is done in <literal>sd-image-aarch64.nix</literal>.
  </para>
 </section>
diff --git a/nixos/doc/manual/configuration/profiles/demo.xml b/nixos/doc/manual/configuration/profiles/demo.xml
index 9e9694c19ab..395a5ec357c 100644
--- a/nixos/doc/manual/configuration/profiles/demo.xml
+++ b/nixos/doc/manual/configuration/profiles/demo.xml
@@ -6,6 +6,10 @@
  <title>Demo</title>
 
  <para>
-  This profile just enables a <systemitem class="username">demo</systemitem> user, with password <literal>demo</literal>, uid <literal>1000</literal>, <systemitem class="groupname">wheel</systemitem> group and <link linkend="opt-services.xserver.displayManager.sddm.autoLogin"> autologin in the SDDM display manager</link>.
+  This profile just enables a <systemitem class="username">demo</systemitem>
+  user, with password <literal>demo</literal>, uid <literal>1000</literal>,
+  <systemitem class="groupname">wheel</systemitem> group and
+  <link linkend="opt-services.xserver.displayManager.sddm.autoLogin"> autologin
+  in the SDDM display manager</link>.
  </para>
 </section>
diff --git a/nixos/doc/manual/configuration/profiles/docker-container.xml b/nixos/doc/manual/configuration/profiles/docker-container.xml
index b57020ebb78..efa7b8f24c4 100644
--- a/nixos/doc/manual/configuration/profiles/docker-container.xml
+++ b/nixos/doc/manual/configuration/profiles/docker-container.xml
@@ -6,6 +6,11 @@
  <title>Docker Container</title>
 
  <para>
-  This is the profile from which the Docker images are generated. It prepares a working system by importing the <link linkend="sec-profile-minimal">Minimal</link> and <link linkend="sec-profile-clone-config">Clone Config</link> profiles, and setting appropriate configuration options that are useful inside a container context, like <xref linkend="opt-boot.isContainer"/>.
+  This is the profile from which the Docker images are generated. It prepares a
+  working system by importing the
+  <link linkend="sec-profile-minimal">Minimal</link> and
+  <link linkend="sec-profile-clone-config">Clone Config</link> profiles, and
+  setting appropriate configuration options that are useful inside a container
+  context, like <xref linkend="opt-boot.isContainer"/>.
  </para>
 </section>
diff --git a/nixos/doc/manual/configuration/profiles/graphical.xml b/nixos/doc/manual/configuration/profiles/graphical.xml
index 1dfd9d642e2..73e3abc59d0 100644
--- a/nixos/doc/manual/configuration/profiles/graphical.xml
+++ b/nixos/doc/manual/configuration/profiles/graphical.xml
@@ -6,10 +6,17 @@
  <title>Graphical</title>
 
  <para>
-  Defines a NixOS configuration with the Plasma 5 desktop. It's used by the graphical installation CD.
+  Defines a NixOS configuration with the Plasma 5 desktop. It's used by the
+  graphical installation CD.
  </para>
 
  <para>
-  It sets <xref linkend="opt-services.xserver.enable"/>, <xref linkend="opt-services.xserver.displayManager.sddm.enable"/>, <xref linkend="opt-services.xserver.desktopManager.plasma5.enable"/> ( <link linkend="opt-services.xserver.desktopManager.plasma5.enableQt4Support"> without Qt4 Support</link>), and <xref linkend="opt-services.xserver.libinput.enable"/> to true. It also includes glxinfo and firefox in the system packages list.
+  It sets <xref linkend="opt-services.xserver.enable"/>,
+  <xref linkend="opt-services.xserver.displayManager.sddm.enable"/>,
+  <xref linkend="opt-services.xserver.desktopManager.plasma5.enable"/> (
+  <link linkend="opt-services.xserver.desktopManager.plasma5.enableQt4Support">
+  without Qt4 Support</link>), and
+  <xref linkend="opt-services.xserver.libinput.enable"/> to true. It also
+  includes glxinfo and firefox in the system packages list.
  </para>
 </section>
diff --git a/nixos/doc/manual/configuration/profiles/hardened.xml b/nixos/doc/manual/configuration/profiles/hardened.xml
index 2cb23f6d5d0..dc83fc837e2 100644
--- a/nixos/doc/manual/configuration/profiles/hardened.xml
+++ b/nixos/doc/manual/configuration/profiles/hardened.xml
@@ -6,11 +6,19 @@
  <title>Hardened</title>
 
  <para>
-  A profile with most (vanilla) hardening options enabled by default, potentially at the cost of features and performance.
+  A profile with most (vanilla) hardening options enabled by default,
+  potentially at the cost of features and performance.
  </para>
 
  <para>
-  This includes a hardened kernel, and limiting the system information available to processes through the <filename>/sys</filename> and <filename>/proc</filename> filesystems. It also disables the User Namespaces feature of the kernel, which stops Nix from being able to build anything (this particular setting can be overriden via <xref linkend="opt-security.allowUserNamespaces"/>). See the <literal
-   xlink:href="https://github.com/nixos/nixpkgs/tree/master/nixos/modules/profiles/hardened.nix"> profile source</literal> for further detail on which settings are altered.
+  This includes a hardened kernel, and limiting the system information
+  available to processes through the <filename>/sys</filename> and
+  <filename>/proc</filename> filesystems. It also disables the User Namespaces
+  feature of the kernel, which stops Nix from being able to build anything
+  (this particular setting can be overriden via
+  <xref linkend="opt-security.allowUserNamespaces"/>). See the
+  <literal
+   xlink:href="https://github.com/nixos/nixpkgs/tree/master/nixos/modules/profiles/hardened.nix">
+  profile source</literal> for further detail on which settings are altered.
  </para>
 </section>
diff --git a/nixos/doc/manual/configuration/profiles/headless.xml b/nixos/doc/manual/configuration/profiles/headless.xml
index 3fceb6f912b..1b64497ebf7 100644
--- a/nixos/doc/manual/configuration/profiles/headless.xml
+++ b/nixos/doc/manual/configuration/profiles/headless.xml
@@ -10,6 +10,10 @@
  </para>
 
  <para>
-  Disables <link linkend="opt-sound.enable">sound</link>, <link linkend="opt-boot.vesa">vesa</link>, serial consoles, <link linkend="opt-systemd.enableEmergencyMode">emergency mode</link>, <link linkend="opt-boot.loader.grub.splashImage">grub splash images</link> and configures the kernel to reboot automatically on panic.
+  Disables <link linkend="opt-sound.enable">sound</link>,
+  <link linkend="opt-boot.vesa">vesa</link>, serial consoles,
+  <link linkend="opt-systemd.enableEmergencyMode">emergency mode</link>,
+  <link linkend="opt-boot.loader.grub.splashImage">grub splash images</link>
+  and configures the kernel to reboot automatically on panic.
  </para>
 </section>
diff --git a/nixos/doc/manual/configuration/profiles/installation-device.xml b/nixos/doc/manual/configuration/profiles/installation-device.xml
index af9f551fa98..192ae955b68 100644
--- a/nixos/doc/manual/configuration/profiles/installation-device.xml
+++ b/nixos/doc/manual/configuration/profiles/installation-device.xml
@@ -6,18 +6,31 @@
  <title>Installation Device</title>
 
  <para>
-  Provides a basic configuration for installation devices like CDs. This enables redistributable firmware, includes the <link linkend="sec-profile-clone-config">Clone Config profile</link> and a copy of the Nixpkgs channel, so <command>nixos-install</command> works out of the box.
+  Provides a basic configuration for installation devices like CDs.
+  This enables redistributable firmware, includes the
+  <link linkend="sec-profile-clone-config">Clone Config profile</link>
+  and a copy of the Nixpkgs channel, so <command>nixos-install</command>
+  works out of the box.
  </para>
-
  <para>
-  Documentation for <link linkend="opt-documentation.enable">Nixpkgs</link> and <link linkend="opt-documentation.nixos.enable">NixOS</link> are forcefully enabled (to override the <link linkend="sec-profile-minimal">Minimal profile</link> preference); the NixOS manual is shown automatically on TTY 8, udisks is disabled. Autologin is enabled as <literal>nixos</literal> user, while passwordless login as both <literal>root</literal> and <literal>nixos</literal> is possible. Passwordless <command>sudo</command> is enabled too. <link linkend="opt-networking.wireless.enable">wpa_supplicant</link> is enabled, but configured to not autostart.
+  Documentation for <link linkend="opt-documentation.enable">Nixpkgs</link>
+  and <link linkend="opt-documentation.nixos.enable">NixOS</link> are
+  forcefully enabled (to override the
+  <link linkend="sec-profile-minimal">Minimal profile</link> preference); the
+  NixOS manual is shown automatically on TTY 8, udisks is disabled.
+  Autologin is enabled as <literal>nixos</literal> user, while passwordless
+  login as both <literal>root</literal> and <literal>nixos</literal> is possible.
+  Passwordless <command>sudo</command> is enabled too.
+  <link linkend="opt-networking.wireless.enable">wpa_supplicant</link> is
+  enabled, but configured to not autostart.
  </para>
-
  <para>
-  It is explained how to login, start the ssh server, and if available, how to start the display manager.
+  It is explained how to login, start the ssh server, and if available,
+  how to start the display manager.
  </para>
 
  <para>
-  Several settings are tweaked so that the installer has a better chance of succeeding under low-memory environments.
+  Several settings are tweaked so that the installer has a better chance of
+  succeeding under low-memory environments.
  </para>
 </section>
diff --git a/nixos/doc/manual/configuration/profiles/minimal.xml b/nixos/doc/manual/configuration/profiles/minimal.xml
index 82aa15c174a..179f2d0be64 100644
--- a/nixos/doc/manual/configuration/profiles/minimal.xml
+++ b/nixos/doc/manual/configuration/profiles/minimal.xml
@@ -6,6 +6,12 @@
  <title>Minimal</title>
 
  <para>
-  This profile defines a small NixOS configuration. It does not contain any graphical stuff. It's a very short file that enables <link linkend="opt-environment.noXlibs">noXlibs</link>, sets <link linkend="opt-i18n.supportedLocales">i18n.supportedLocales</link> to only support the user-selected locale, <link linkend="opt-documentation.enable">disables packages' documentation </link>, and <link linkend="opt-sound.enable">disables sound</link>.
+  This profile defines a small NixOS configuration. It does not contain any
+  graphical stuff. It's a very short file that enables
+  <link linkend="opt-environment.noXlibs">noXlibs</link>, sets
+  <link linkend="opt-i18n.supportedLocales">i18n.supportedLocales</link> to
+  only support the user-selected locale,
+  <link linkend="opt-documentation.enable">disables packages' documentation
+  </link>, and <link linkend="opt-sound.enable">disables sound</link>.
  </para>
 </section>
diff --git a/nixos/doc/manual/configuration/profiles/qemu-guest.xml b/nixos/doc/manual/configuration/profiles/qemu-guest.xml
index 265f2746f3c..5d055c45d2d 100644
--- a/nixos/doc/manual/configuration/profiles/qemu-guest.xml
+++ b/nixos/doc/manual/configuration/profiles/qemu-guest.xml
@@ -6,10 +6,13 @@
  <title>QEMU Guest</title>
 
  <para>
-  This profile contains common configuration for virtual machines running under QEMU (using virtio).
+  This profile contains common configuration for virtual machines running under
+  QEMU (using virtio).
  </para>
 
  <para>
-  It makes virtio modules available on the initrd, sets the system time from the hardware clock to work around a bug in qemu-kvm, and <link linkend="opt-security.rngd.enable">enables rngd</link>.
+  It makes virtio modules available on the initrd, sets the system time from
+  the hardware clock to work around a bug in qemu-kvm, and
+  <link linkend="opt-security.rngd.enable">enables rngd</link>.
  </para>
 </section>
diff --git a/nixos/doc/manual/configuration/ssh.xml b/nixos/doc/manual/configuration/ssh.xml
index 9e5c0c1dbdb..a4af1b96583 100644
--- a/nixos/doc/manual/configuration/ssh.xml
+++ b/nixos/doc/manual/configuration/ssh.xml
@@ -10,11 +10,14 @@
 <programlisting>
 <xref linkend="opt-services.openssh.enable"/> = true;
 </programlisting>
-  By default, root logins using a password are disallowed. They can be disabled entirely by setting <xref linkend="opt-services.openssh.permitRootLogin"/> to <literal>"no"</literal>.
+  By default, root logins using a password are disallowed. They can be disabled
+  entirely by setting <xref linkend="opt-services.openssh.permitRootLogin"/> to
+  <literal>"no"</literal>.
  </para>
 
  <para>
-  You can declaratively specify authorised RSA/DSA public keys for a user as follows:
+  You can declaratively specify authorised RSA/DSA public keys for a user as
+  follows:
 <!-- FIXME: this might not work if the user is unmanaged. -->
 <programlisting>
 <link linkend="opt-users.users._name__.openssh.authorizedKeys.keys">users.users.alice.openssh.authorizedKeys.keys</link> =
diff --git a/nixos/doc/manual/configuration/summary.xml b/nixos/doc/manual/configuration/summary.xml
index c9c8b67b0cf..ea980254a8f 100644
--- a/nixos/doc/manual/configuration/summary.xml
+++ b/nixos/doc/manual/configuration/summary.xml
@@ -6,8 +6,12 @@
  <title>Syntax Summary</title>
 
  <para>
-  Below is a summary of the most important syntactic constructs in the Nix expression language. It’s not complete. In particular, there are many other built-in functions. See the <link
-xlink:href="http://nixos.org/nix/manual/#chap-writing-nix-expressions">Nix manual</link> for the rest.
+  Below is a summary of the most important syntactic constructs in the Nix
+  expression language. It’s not complete. In particular, there are many other
+  built-in functions. See the
+  <link
+xlink:href="http://nixos.org/nix/manual/#chap-writing-nix-expressions">Nix
+  manual</link> for the rest.
  </para>
 
  <informaltable frame='none'>
diff --git a/nixos/doc/manual/configuration/user-mgmt.xml b/nixos/doc/manual/configuration/user-mgmt.xml
index db8323ec4d4..4b1710f3a2b 100644
--- a/nixos/doc/manual/configuration/user-mgmt.xml
+++ b/nixos/doc/manual/configuration/user-mgmt.xml
@@ -5,7 +5,10 @@
          xml:id="sec-user-management">
  <title>User Management</title>
  <para>
-  NixOS supports both declarative and imperative styles of user management. In the declarative style, users are specified in <filename>configuration.nix</filename>. For instance, the following states that a user account named <literal>alice</literal> shall exist:
+  NixOS supports both declarative and imperative styles of user management. In
+  the declarative style, users are specified in
+  <filename>configuration.nix</filename>. For instance, the following states
+  that a user account named <literal>alice</literal> shall exist:
 <programlisting>
 <xref linkend="opt-users.users"/>.alice = {
   <link linkend="opt-users.users._name__.isNormalUser">isNormalUser</link> = true;
@@ -15,33 +18,60 @@
   <link linkend="opt-users.users._name__.openssh.authorizedKeys.keys">openssh.authorizedKeys.keys</link> = [ "ssh-dss AAAAB3Nza... alice@foobar" ];
 };
 </programlisting>
-  Note that <literal>alice</literal> is a member of the <literal>wheel</literal> and <literal>networkmanager</literal> groups, which allows her to use <command>sudo</command> to execute commands as <literal>root</literal> and to configure the network, respectively. Also note the SSH public key that allows remote logins with the corresponding private key. Users created in this way do not have a password by default, so they cannot log in via mechanisms that require a password. However, you can use the <command>passwd</command> program to set a password, which is retained across invocations of <command>nixos-rebuild</command>.
+  Note that <literal>alice</literal> is a member of the
+  <literal>wheel</literal> and <literal>networkmanager</literal> groups, which
+  allows her to use <command>sudo</command> to execute commands as
+  <literal>root</literal> and to configure the network, respectively. Also note
+  the SSH public key that allows remote logins with the corresponding private
+  key. Users created in this way do not have a password by default, so they
+  cannot log in via mechanisms that require a password. However, you can use
+  the <command>passwd</command> program to set a password, which is retained
+  across invocations of <command>nixos-rebuild</command>.
  </para>
  <para>
-  If you set <xref linkend="opt-users.mutableUsers"/> to false, then the contents of <literal>/etc/passwd</literal> and <literal>/etc/group</literal> will be congruent to your NixOS configuration. For instance, if you remove a user from <xref linkend="opt-users.users"/> and run nixos-rebuild, the user account will cease to exist. Also, imperative commands for managing users and groups, such as useradd, are no longer available. Passwords may still be assigned by setting the user's <link linkend="opt-users.users._name__.hashedPassword">hashedPassword</link> option. A hashed password can be generated using <command>mkpasswd -m sha-512</command> after installing the <literal>mkpasswd</literal> package.
+  If you set <xref linkend="opt-users.mutableUsers"/> to false, then the
+  contents of <literal>/etc/passwd</literal> and <literal>/etc/group</literal>
+  will be congruent to your NixOS configuration. For instance, if you remove a
+  user from <xref linkend="opt-users.users"/> and run nixos-rebuild, the user
+  account will cease to exist. Also, imperative commands for managing users and
+  groups, such as useradd, are no longer available. Passwords may still be
+  assigned by setting the user's
+  <link linkend="opt-users.users._name__.hashedPassword">hashedPassword</link>
+  option. A hashed password can be generated using <command>mkpasswd -m
+  sha-512</command> after installing the <literal>mkpasswd</literal> package.
  </para>
  <para>
-  A user ID (uid) is assigned automatically. You can also specify a uid manually by adding
+  A user ID (uid) is assigned automatically. You can also specify a uid
+  manually by adding
 <programlisting>
 uid = 1000;
 </programlisting>
   to the user specification.
  </para>
  <para>
-  Groups can be specified similarly. The following states that a group named <literal>students</literal> shall exist:
+  Groups can be specified similarly. The following states that a group named
+  <literal>students</literal> shall exist:
 <programlisting>
 <xref linkend="opt-users.groups"/>.students.gid = 1000;
 </programlisting>
-  As with users, the group ID (gid) is optional and will be assigned automatically if it’s missing.
+  As with users, the group ID (gid) is optional and will be assigned
+  automatically if it’s missing.
  </para>
  <para>
-  In the imperative style, users and groups are managed by commands such as <command>useradd</command>, <command>groupmod</command> and so on. For instance, to create a user account named <literal>alice</literal>:
+  In the imperative style, users and groups are managed by commands such as
+  <command>useradd</command>, <command>groupmod</command> and so on. For
+  instance, to create a user account named <literal>alice</literal>:
 <screen>
 # useradd -m alice</screen>
-  To make all nix tools available to this new user use `su - USER` which opens a login shell (==shell that loads the profile) for given user. This will create the ~/.nix-defexpr symlink. So run:
+  To make all nix tools available to this new user use `su - USER` which opens
+  a login shell (==shell that loads the profile) for given user. This will
+  create the ~/.nix-defexpr symlink. So run:
 <screen>
 # su - alice -c "true"</screen>
-  The flag <option>-m</option> causes the creation of a home directory for the new user, which is generally what you want. The user does not have an initial password and therefore cannot log in. A password can be set using the <command>passwd</command> utility:
+  The flag <option>-m</option> causes the creation of a home directory for the
+  new user, which is generally what you want. The user does not have an initial
+  password and therefore cannot log in. A password can be set using the
+  <command>passwd</command> utility:
 <screen>
 # passwd alice
 Enter new UNIX password: ***
@@ -50,6 +80,9 @@ Retype new UNIX password: ***
   A user can be deleted using <command>userdel</command>:
 <screen>
 # userdel -r alice</screen>
-  The flag <option>-r</option> deletes the user’s home directory. Accounts can be modified using <command>usermod</command>. Unix groups can be managed using <command>groupadd</command>, <command>groupmod</command> and <command>groupdel</command>.
+  The flag <option>-r</option> deletes the user’s home directory. Accounts
+  can be modified using <command>usermod</command>. Unix groups can be managed
+  using <command>groupadd</command>, <command>groupmod</command> and
+  <command>groupdel</command>.
  </para>
 </chapter>
diff --git a/nixos/doc/manual/configuration/wireless.xml b/nixos/doc/manual/configuration/wireless.xml
index 5c203423997..9c0e3a8d7aa 100644
--- a/nixos/doc/manual/configuration/wireless.xml
+++ b/nixos/doc/manual/configuration/wireless.xml
@@ -6,7 +6,9 @@
  <title>Wireless Networks</title>
 
  <para>
-  For a desktop installation using NetworkManager (e.g., GNOME), you just have to make sure the user is in the <code>networkmanager</code> group and you can skip the rest of this section on wireless networks.
+  For a desktop installation using NetworkManager (e.g., GNOME), you just have
+  to make sure the user is in the <code>networkmanager</code> group and you can
+  skip the rest of this section on wireless networks.
  </para>
 
  <para>
@@ -23,13 +25,17 @@
   "free.wifi" = {};
 };
 </programlisting>
-  Be aware that keys will be written to the nix store in plaintext! When no networks are set, it will default to using a configuration file at <literal>/etc/wpa_supplicant.conf</literal>. You should edit this file yourself to define wireless networks, WPA keys and so on (see <citerefentry>
+  Be aware that keys will be written to the nix store in plaintext! When no
+  networks are set, it will default to using a configuration file at
+  <literal>/etc/wpa_supplicant.conf</literal>. You should edit this file
+  yourself to define wireless networks, WPA keys and so on (see <citerefentry>
   <refentrytitle>wpa_supplicant.conf</refentrytitle>
   <manvolnum>5</manvolnum> </citerefentry>).
  </para>
 
  <para>
-  If you are using WPA2 you can generate pskRaw key using <command>wpa_passphrase</command>:
+  If you are using WPA2 you can generate pskRaw key using
+  <command>wpa_passphrase</command>:
 <screen>
 <prompt>$ </prompt>wpa_passphrase ESSID PSK
 network={
@@ -45,10 +51,12 @@ network={
   };
 }
 </programlisting>
-  or you can use it to directly generate the <literal>wpa_supplicant.conf</literal>:
+  or you can use it to directly generate the
+  <literal>wpa_supplicant.conf</literal>:
 <screen>
 <prompt># </prompt>wpa_passphrase ESSID PSK > /etc/wpa_supplicant.conf</screen>
-  After you have edited the <literal>wpa_supplicant.conf</literal>, you need to restart the wpa_supplicant service.
+  After you have edited the <literal>wpa_supplicant.conf</literal>, you need to
+  restart the wpa_supplicant service.
 <screen>
 <prompt># </prompt>systemctl restart wpa_supplicant.service</screen>
  </para>
diff --git a/nixos/doc/manual/configuration/x-windows.xml b/nixos/doc/manual/configuration/x-windows.xml
index 2d65ba479aa..f6f659b02af 100644
--- a/nixos/doc/manual/configuration/x-windows.xml
+++ b/nixos/doc/manual/configuration/x-windows.xml
@@ -5,18 +5,23 @@
          xml:id="sec-x11">
  <title>X Window System</title>
  <para>
-  The X Window System (X11) provides the basis of NixOS’ graphical user interface. It can be enabled as follows:
+  The X Window System (X11) provides the basis of NixOS’ graphical user
+  interface. It can be enabled as follows:
 <programlisting>
 <xref linkend="opt-services.xserver.enable"/> = true;
 </programlisting>
-  The X server will automatically detect and use the appropriate video driver from a set of X.org drivers (such as <literal>vesa</literal> and <literal>intel</literal>). You can also specify a driver manually, e.g.
+  The X server will automatically detect and use the appropriate video driver
+  from a set of X.org drivers (such as <literal>vesa</literal> and
+  <literal>intel</literal>). You can also specify a driver manually, e.g.
 <programlisting>
 <xref linkend="opt-services.xserver.videoDrivers"/> = [ "r128" ];
 </programlisting>
   to enable X.org’s <literal>xf86-video-r128</literal> driver.
  </para>
  <para>
-  You also need to enable at least one desktop or window manager. Otherwise, you can only log into a plain undecorated <command>xterm</command> window. Thus you should pick one or more of the following lines:
+  You also need to enable at least one desktop or window manager. Otherwise,
+  you can only log into a plain undecorated <command>xterm</command> window.
+  Thus you should pick one or more of the following lines:
 <programlisting>
 <xref linkend="opt-services.xserver.desktopManager.plasma5.enable"/> = true;
 <xref linkend="opt-services.xserver.desktopManager.xfce.enable"/> = true;
@@ -29,7 +34,9 @@
 </programlisting>
  </para>
  <para>
-  NixOS’s default <emphasis>display manager</emphasis> (the program that provides a graphical login prompt and manages the X server) is LightDM. You can select an alternative one by picking one of the following lines:
+  NixOS’s default <emphasis>display manager</emphasis> (the program that
+  provides a graphical login prompt and manages the X server) is LightDM. You
+  can select an alternative one by picking one of the following lines:
 <programlisting>
 <xref linkend="opt-services.xserver.displayManager.sddm.enable"/> = true;
 <xref linkend="opt-services.xserver.displayManager.slim.enable"/> = true;
@@ -43,7 +50,8 @@
 </programlisting>
  </para>
  <para>
-  The X server is started automatically at boot time. If you don’t want this to happen, you can set:
+  The X server is started automatically at boot time. If you don’t want this
+  to happen, you can set:
 <programlisting>
 <xref linkend="opt-services.xserver.autorun"/> = false;
 </programlisting>
@@ -53,7 +61,8 @@
 </screen>
  </para>
  <para>
-  On 64-bit systems, if you want OpenGL for 32-bit programs such as in Wine, you should also set the following:
+  On 64-bit systems, if you want OpenGL for 32-bit programs such as in Wine,
+  you should also set the following:
 <programlisting>
 <xref linkend="opt-hardware.opengl.driSupport32Bit"/> = true;
 </programlisting>
@@ -61,18 +70,23 @@
  <simplesect xml:id="sec-x11-auto-login">
   <title>Auto-login</title>
   <para>
-   The x11 login screen can be skipped entirely, automatically logging you into your window manager and desktop environment when you boot your computer.
+  The x11 login screen can be skipped entirely, automatically logging you into
+  your window manager and desktop environment when you boot your computer.
   </para>
   <para>
-   This is especially helpful if you have disk encryption enabled. Since you already have to provide a password to decrypt your disk, entering a second password to login can be redundant.
+  This is especially helpful if you have disk encryption enabled. Since you
+  already have to provide a password to decrypt your disk, entering a second
+  password to login can be redundant.
   </para>
   <para>
-   To enable auto-login, you need to define your default window manager and desktop environment. If you wanted no desktop environment and i3 as your your window manager, you'd define:
+  To enable auto-login, you need to define your default window manager and
+  desktop environment. If you wanted no desktop environment and i3 as your your
+  window manager, you'd define:
 <programlisting>
 <xref linkend="opt-services.xserver.desktopManager.default"/> = "none";
 <xref linkend="opt-services.xserver.windowManager.default"/> = "i3";
 </programlisting>
-   And, finally, to enable auto-login for a user <literal>johndoe</literal>:
+  And, finally, to enable auto-login for a user <literal>johndoe</literal>:
 <programlisting>
 <xref linkend="opt-services.xserver.displayManager.auto.enable"/> = true;
 <xref linkend="opt-services.xserver.displayManager.auto.user"/> = "johndoe";
@@ -82,7 +96,9 @@
  <simplesect xml:id="sec-x11-graphics-cards-nvidia">
   <title>Proprietary NVIDIA drivers</title>
   <para>
-   NVIDIA provides a proprietary driver for its graphics cards that has better 3D performance than the X.org drivers. It is not enabled by default because it’s not free software. You can enable it as follows:
+   NVIDIA provides a proprietary driver for its graphics cards that has better
+   3D performance than the X.org drivers. It is not enabled by default because
+   it’s not free software. You can enable it as follows:
 <programlisting>
 <xref linkend="opt-services.xserver.videoDrivers"/> = [ "nvidia" ];
 </programlisting>
@@ -93,51 +109,76 @@
 <xref linkend="opt-services.xserver.videoDrivers"/> = [ "nvidiaLegacy304" ];
 <xref linkend="opt-services.xserver.videoDrivers"/> = [ "nvidiaLegacy173" ];
 </programlisting>
-   You may need to reboot after enabling this driver to prevent a clash with other kernel modules.
+   You may need to reboot after enabling this driver to prevent a clash with
+   other kernel modules.
   </para>
  </simplesect>
  <simplesect xml:id="sec-x11--graphics-cards-amd">
   <title>Proprietary AMD drivers</title>
   <para>
-   AMD provides a proprietary driver for its graphics cards that has better 3D performance than the X.org drivers. It is not enabled by default because it’s not free software. You can enable it as follows:
+   AMD provides a proprietary driver for its graphics cards that has better 3D
+   performance than the X.org drivers. It is not enabled by default because
+   it’s not free software. You can enable it as follows:
 <programlisting>
 <xref linkend="opt-services.xserver.videoDrivers"/> = [ "ati_unfree" ];
 </programlisting>
-   You will need to reboot after enabling this driver to prevent a clash with other kernel modules.
+   You will need to reboot after enabling this driver to prevent a clash with
+   other kernel modules.
   </para>
   <note>
-   <para>
-    For recent AMD GPUs you most likely want to keep either the defaults or <literal>"amdgpu"</literal> (both free).
-   </para>
+  <para>
+   For recent AMD GPUs you most likely want to keep either the defaults
+   or <literal>"amdgpu"</literal> (both free).
+  </para>
   </note>
  </simplesect>
  <simplesect xml:id="sec-x11-touchpads">
   <title>Touchpads</title>
   <para>
-   Support for Synaptics touchpads (found in many laptops such as the Dell Latitude series) can be enabled as follows:
+   Support for Synaptics touchpads (found in many laptops such as the Dell
+   Latitude series) can be enabled as follows:
 <programlisting>
 <xref linkend="opt-services.xserver.libinput.enable"/> = true;
 </programlisting>
-   The driver has many options (see <xref linkend="ch-options"/>). For instance, the following disables tap-to-click behavior:
+   The driver has many options (see <xref linkend="ch-options"/>). For
+   instance, the following disables tap-to-click behavior:
 <programlisting>
 <xref linkend="opt-services.xserver.libinput.tapping"/> = false;
 </programlisting>
-   Note: the use of <literal>services.xserver.synaptics</literal> is deprecated since NixOS 17.09.
+   Note: the use of <literal>services.xserver.synaptics</literal> is deprecated
+   since NixOS 17.09.
   </para>
  </simplesect>
  <simplesect xml:id="sec-x11-gtk-and-qt-themes">
   <title>GTK/Qt themes</title>
   <para>
-   GTK themes can be installed either to user profile or system-wide (via <literal>environment.systemPackages</literal>). To make Qt 5 applications look similar to GTK2 ones, you can install <literal>qt5.qtbase.gtk</literal> package into your system environment. It should work for all Qt 5 library versions.
+   GTK themes can be installed either to user profile or system-wide (via
+   <literal>environment.systemPackages</literal>). To make Qt 5 applications
+   look similar to GTK2 ones, you can install <literal>qt5.qtbase.gtk</literal>
+   package into your system environment. It should work for all Qt 5 library
+   versions.
   </para>
  </simplesect>
  <simplesect xml:id="custom-xkb-layouts">
   <title>Custom XKB layouts</title>
   <para>
-   It is possible to install custom <link xlink:href="https://en.wikipedia.org/wiki/X_keyboard_extension"> XKB </link> keyboard layouts using the option <option> <link linkend="opt-services.xserver.extraLayouts"> services.xserver.extraLayouts </link> </option>. As a first example, we are going to create a layout based on the basic US layout, with an additional layer to type some greek symbols by pressing the right-alt key.
+   It is possible to install custom
+   <link xlink:href="https://en.wikipedia.org/wiki/X_keyboard_extension">
+    XKB
+   </link>
+   keyboard layouts using the option
+   <option>
+    <link linkend="opt-services.xserver.extraLayouts">
+     services.xserver.extraLayouts
+    </link>
+   </option>.
+   As a first example, we are going to create a layout based on the basic US
+   layout, with an additional layer to type some greek symbols by pressing the
+   right-alt key.
   </para>
   <para>
-   To do this we are going to create a <literal>us-greek</literal> file with a <literal>xkb_symbols</literal> section.
+   To do this we are going to create a <literal>us-greek</literal> file
+   with a <literal>xkb_symbols</literal> section.
   </para>
 <programlisting>
 xkb_symbols &quot;us-greek&quot;
@@ -153,7 +194,8 @@ xkb_symbols &quot;us-greek&quot;
 };
 </programlisting>
   <para>
-   To install the layout, the filepath, a description and the list of languages must be given:
+   To install the layout, the filepath, a description and the list of
+   languages must be given:
   </para>
 <programlisting>
 <xref linkend="opt-services.xserver.extraLayouts"/>.us-greek = {
@@ -163,18 +205,32 @@ xkb_symbols &quot;us-greek&quot;
 }
 </programlisting>
   <note>
-   <para>
-    The name should match the one given to the <literal>xkb_symbols</literal> block.
-   </para>
+  <para>
+   The name should match the one given to the
+   <literal>xkb_symbols</literal> block.
+  </para>
   </note>
   <para>
-   The layout should now be installed and ready to use: try it by running <literal>setxkbmap us-greek</literal> and type <literal>&lt;alt&gt;+a</literal>. To change the default the usual <option> <link linkend="opt-services.xserver.layout"> services.xserver.layout </link> </option> option can still be used.
+   The layout should now be installed and ready to use: try it by
+   running <literal>setxkbmap us-greek</literal> and type
+   <literal>&lt;alt&gt;+a</literal>. To change the default the usual
+   <option>
+    <link linkend="opt-services.xserver.layout">
+     services.xserver.layout
+    </link>
+   </option>
+   option can still be used.
   </para>
   <para>
-   A layout can have several other components besides <literal>xkb_symbols</literal>, for example we will define new keycodes for some multimedia key and bind these to some symbol.
+   A layout can have several other components besides
+   <literal>xkb_symbols</literal>, for example we will define new
+   keycodes for some multimedia key and bind these to some symbol.
   </para>
   <para>
-   Use the <emphasis>xev</emphasis> utility from <literal>pkgs.xorg.xev</literal> to find the codes of the keys of interest, then create a <literal>media-key</literal> file to hold the keycodes definitions
+   Use the <emphasis>xev</emphasis> utility from
+   <literal>pkgs.xorg.xev</literal> to find the codes of the keys of
+   interest, then create a <literal>media-key</literal> file to hold
+   the keycodes definitions
   </para>
 <programlisting>
 xkb_keycodes &quot;media&quot;
@@ -184,7 +240,7 @@ xkb_keycodes &quot;media&quot;
 }
 </programlisting>
   <para>
-   Now use the newly define keycodes in <literal>media-sym</literal>:
+    Now use the newly define keycodes in <literal>media-sym</literal>:
   </para>
 <programlisting>
 xkb_symbols &quot;media&quot;
@@ -195,7 +251,7 @@ xkb_symbols &quot;media&quot;
 }
 </programlisting>
   <para>
-   As before, to install the layout do
+    As before, to install the layout do
   </para>
 <programlisting>
 <xref linkend="opt-services.xserver.extraLayouts"/>.media = {
@@ -206,22 +262,37 @@ xkb_symbols &quot;media&quot;
 };
 </programlisting>
   <note>
-   <para>
-    The function <literal>pkgs.writeText &lt;filename&gt; &lt;content&gt; </literal> can be useful if you prefer to keep the layout definitions inside the NixOS configuration.
-   </para>
+  <para>
+   The function <literal>pkgs.writeText &lt;filename&gt; &lt;content&gt;
+   </literal> can be useful if you prefer to keep the layout definitions
+   inside the NixOS configuration.
+  </para>
   </note>
   <para>
-   Unfortunately, the Xorg server does not (currently) support setting a keymap directly but relies instead on XKB rules to select the matching components (keycodes, types, ...) of a layout. This means that components other than symbols won't be loaded by default. As a workaround, you can set the keymap using <literal>setxkbmap</literal> at the start of the session with:
+    Unfortunately, the Xorg server does not (currently) support setting a
+    keymap directly but relies instead on XKB rules to select the matching
+    components (keycodes, types, ...) of a layout. This means that components
+    other than symbols won't be loaded by default. As a workaround, you
+    can set the keymap using <literal>setxkbmap</literal> at the start of the
+    session with:
   </para>
 <programlisting>
 <xref linkend="opt-services.xserver.displayManager.sessionCommands"/> = "setxkbmap -keycodes media";
 </programlisting>
   <para>
-   If you are manually starting the X server, you should set the argument <literal>-xkbdir /etc/X11/xkb</literal>, otherwise X won't find your layout files. For example with <command>xinit</command> run
-<screen><prompt>$ </prompt>xinit -- -xkbdir /etc/X11/xkb</screen>
+    If you are manually starting the X server, you should set the argument
+    <literal>-xkbdir /etc/X11/xkb</literal>, otherwise X won't find your layout files.
+    For example with <command>xinit</command> run
+    <screen><prompt>$ </prompt>xinit -- -xkbdir /etc/X11/xkb</screen>
   </para>
   <para>
-   To learn how to write layouts take a look at the XKB <link xlink:href="https://www.x.org/releases/current/doc/xorg-docs/input/XKB-Enhancing.html#Defining_New_Layouts"> documentation </link>. More example layouts can also be found <link xlink:href="https://wiki.archlinux.org/index.php/X_KeyBoard_extension#Basic_examples"> here </link>.
+   To learn how to write layouts take a look at the XKB
+  <link xlink:href="https://www.x.org/releases/current/doc/xorg-docs/input/XKB-Enhancing.html#Defining_New_Layouts">
+   documentation
+  </link>. More example layouts can also be found
+  <link xlink:href="https://wiki.archlinux.org/index.php/X_KeyBoard_extension#Basic_examples">
+   here
+  </link>.
   </para>
- </simplesect>
+</simplesect>
 </chapter>
diff --git a/nixos/doc/manual/configuration/xfce.xml b/nixos/doc/manual/configuration/xfce.xml
index 7a93a452fd9..6ac99c6b2be 100644
--- a/nixos/doc/manual/configuration/xfce.xml
+++ b/nixos/doc/manual/configuration/xfce.xml
@@ -14,7 +14,8 @@
 </programlisting>
  </para>
  <para>
-  Optionally, <emphasis>compton</emphasis> can be enabled for nice graphical effects, some example settings:
+  Optionally, <emphasis>compton</emphasis> can be enabled for nice graphical
+  effects, some example settings:
 <programlisting>
 <link linkend="opt-services.compton.enable">services.compton</link> = {
   <link linkend="opt-services.compton.enable">enable</link>          = true;
@@ -26,7 +27,9 @@
 </programlisting>
  </para>
  <para>
-  Some Xfce programs are not installed automatically. To install them manually (system wide), put them into your <xref linkend="opt-environment.systemPackages"/>.
+  Some Xfce programs are not installed automatically. To install them manually
+  (system wide), put them into your
+  <xref linkend="opt-environment.systemPackages"/>.
  </para>
  <simplesect xml:id="sec-xfce-thunar-volumes">
   <title>Thunar Volume Support</title>
@@ -41,17 +44,25 @@
  <simplesect xml:id="sec-xfce-polkit">
   <title>Polkit Authentication Agent</title>
   <para>
-   There is no authentication agent automatically installed alongside Xfce. To allow mounting of local (non-removable) filesystems, you will need to install one. Installing <emphasis>polkit_gnome</emphasis>, a rebuild, logout and login did the trick.
+   There is no authentication agent automatically installed alongside Xfce. To
+   allow mounting of local (non-removable) filesystems, you will need to
+   install one. Installing <emphasis>polkit_gnome</emphasis>, a rebuild, logout
+   and login did the trick.
   </para>
  </simplesect>
  <simplesect xml:id="sec-xfce-troubleshooting">
   <title>Troubleshooting</title>
   <para>
-   Even after enabling udisks2, volume management might not work. Thunar and/or the desktop takes time to show up. Thunar will spit out this kind of message on start (look at <command>journalctl --user -b</command>).
+   Even after enabling udisks2, volume management might not work. Thunar and/or
+   the desktop takes time to show up. Thunar will spit out this kind of message
+   on start (look at <command>journalctl --user -b</command>).
 <programlisting>
 Thunar:2410): GVFS-RemoteVolumeMonitor-WARNING **: remote volume monitor with dbus name org.gtk.Private.UDisks2VolumeMonitor is not supported
 </programlisting>
-   This is caused by some needed GNOME services not running. This is all fixed by enabling "Launch GNOME services on startup" in the Advanced tab of the Session and Startup settings panel. Alternatively, you can run this command to do the same thing.
+   This is caused by some needed GNOME services not running. This is all fixed
+   by enabling "Launch GNOME services on startup" in the Advanced tab of the
+   Session and Startup settings panel. Alternatively, you can run this command
+   to do the same thing.
 <programlisting>
 <prompt>$ </prompt>xfconf-query -c xfce4-session -p /compat/LaunchGNOME -s true
 </programlisting>
diff --git a/nixos/doc/manual/development/assertions.xml b/nixos/doc/manual/development/assertions.xml
index c7d5b960aa6..32f90cf2e7c 100644
--- a/nixos/doc/manual/development/assertions.xml
+++ b/nixos/doc/manual/development/assertions.xml
@@ -6,11 +6,18 @@
  <title>Warnings and Assertions</title>
 
  <para>
-  When configuration problems are detectable in a module, it is a good idea to write an assertion or warning. Doing so provides clear feedback to the user and prevents errors after the build.
+  When configuration problems are detectable in a module, it is a good idea to
+  write an assertion or warning. Doing so provides clear feedback to the user
+  and prevents errors after the build.
  </para>
 
  <para>
-  Although Nix has the <literal>abort</literal> and <literal>builtins.trace</literal> <link xlink:href="https://nixos.org/nix/manual/#ssec-builtins">functions</link> to perform such tasks, they are not ideally suited for NixOS modules. Instead of these functions, you can declare your warnings and assertions using the NixOS module system.
+  Although Nix has the <literal>abort</literal> and
+  <literal>builtins.trace</literal>
+  <link xlink:href="https://nixos.org/nix/manual/#ssec-builtins">functions</link>
+  to perform such tasks, they are not ideally suited for NixOS modules. Instead
+  of these functions, you can declare your warnings and assertions using the
+  NixOS module system.
  </para>
 
  <section xml:id="sec-assertions-warnings">
@@ -41,7 +48,12 @@
   <title>Assertions</title>
 
   <para>
-   This example, extracted from the <link xlink:href="https://github.com/NixOS/nixpkgs/blob/release-17.09/nixos/modules/services/logging/syslogd.nix"> <literal>syslogd</literal> module </link> shows how to use <literal>assertions</literal>. Since there can only be one active syslog daemon at a time, an assertion is useful to prevent such a broken system from being built.
+   This example, extracted from the
+   <link xlink:href="https://github.com/NixOS/nixpkgs/blob/release-17.09/nixos/modules/services/logging/syslogd.nix">
+   <literal>syslogd</literal> module </link> shows how to use
+   <literal>assertions</literal>. Since there can only be one active syslog
+   daemon at a time, an assertion is useful to prevent such a broken system
+   from being built.
   </para>
 
 <programlisting>
diff --git a/nixos/doc/manual/development/building-nixos.xml b/nixos/doc/manual/development/building-nixos.xml
index a4bb18656e0..56a596baed0 100644
--- a/nixos/doc/manual/development/building-nixos.xml
+++ b/nixos/doc/manual/development/building-nixos.xml
@@ -5,17 +5,22 @@
         xml:id="sec-building-cd">
  <title>Building Your Own NixOS CD</title>
  <para>
-  Building a NixOS CD is as easy as configuring your own computer. The idea is to use another module which will replace your <filename>configuration.nix</filename> to configure the system that would be installed on the CD.
+  Building a NixOS CD is as easy as configuring your own computer. The idea is
+  to use another module which will replace your
+  <filename>configuration.nix</filename> to configure the system that would be
+  installed on the CD.
  </para>
  <para>
-  Default CD/DVD configurations are available inside <filename>nixos/modules/installer/cd-dvd</filename>.
+  Default CD/DVD configurations are available inside
+  <filename>nixos/modules/installer/cd-dvd</filename>.
 <screen>
 <prompt>$ </prompt>git clone https://github.com/NixOS/nixpkgs.git
 <prompt>$ </prompt>cd nixpkgs/nixos
 <prompt>$ </prompt>nix-build -A config.system.build.isoImage -I nixos-config=modules/installer/cd-dvd/installation-cd-minimal.nix default.nix</screen>
  </para>
  <para>
-  Before burning your CD/DVD, you can check the content of the image by mounting anywhere like suggested by the following command:
+  Before burning your CD/DVD, you can check the content of the image by
+  mounting anywhere like suggested by the following command:
 <screen>
 <prompt># </prompt>mount -o loop -t iso9660 ./result/iso/cd.iso /mnt/iso</screen>
  </para>
diff --git a/nixos/doc/manual/development/building-parts.xml b/nixos/doc/manual/development/building-parts.xml
index e05a1342b7a..88369fb891b 100644
--- a/nixos/doc/manual/development/building-parts.xml
+++ b/nixos/doc/manual/development/building-parts.xml
@@ -5,11 +5,14 @@
         xml:id="sec-building-parts">
  <title>Building Specific Parts of NixOS</title>
  <para>
-  With the command <command>nix-build</command>, you can build specific parts of your NixOS configuration. This is done as follows:
+  With the command <command>nix-build</command>, you can build specific parts
+  of your NixOS configuration. This is done as follows:
 <screen>
 <prompt>$ </prompt>cd <replaceable>/path/to/nixpkgs/nixos</replaceable>
 <prompt>$ </prompt>nix-build -A config.<replaceable>option</replaceable></screen>
-  where <replaceable>option</replaceable> is a NixOS option with type “derivation” (i.e. something that can be built). Attributes of interest include:
+  where <replaceable>option</replaceable> is a NixOS option with type
+  “derivation” (i.e. something that can be built). Attributes of interest
+  include:
   <variablelist>
    <varlistentry>
     <term>
@@ -17,7 +20,10 @@
     </term>
     <listitem>
      <para>
-      The top-level option that builds the entire NixOS system. Everything else in your configuration is indirectly pulled in by this option. This is what <command>nixos-rebuild</command> builds and what <filename>/run/current-system</filename> points to afterwards.
+      The top-level option that builds the entire NixOS system. Everything else
+      in your configuration is indirectly pulled in by this option. This is
+      what <command>nixos-rebuild</command> builds and what
+      <filename>/run/current-system</filename> points to afterwards.
      </para>
      <para>
       A shortcut to build this is:
@@ -42,7 +48,8 @@
     </term>
     <listitem>
      <para>
-      A tree of symlinks that form the static parts of <filename>/etc</filename>.
+      A tree of symlinks that form the static parts of
+      <filename>/etc</filename>.
      </para>
     </listitem>
    </varlistentry>
@@ -55,7 +62,9 @@
     </term>
     <listitem>
      <para>
-      The initial ramdisk and kernel of the system. This allows a quick way to test whether the kernel and the initial ramdisk boot correctly, by using QEMU’s <option>-kernel</option> and <option>-initrd</option> options:
+      The initial ramdisk and kernel of the system. This allows a quick way to
+      test whether the kernel and the initial ramdisk boot correctly, by using
+      QEMU’s <option>-kernel</option> and <option>-initrd</option> options:
 <screen>
 <prompt>$ </prompt>nix-build -A config.system.build.initialRamdisk -o initrd
 <prompt>$ </prompt>nix-build -A config.system.build.kernel -o kernel
@@ -86,18 +95,24 @@
     </term>
     <listitem>
      <para>
-      This builds the unit with the specified name. Note that since unit names contain dots (e.g. <literal>httpd.service</literal>), you need to put them between quotes, like this:
+      This builds the unit with the specified name. Note that since unit names
+      contain dots (e.g. <literal>httpd.service</literal>), you need to put
+      them between quotes, like this:
 <screen>
 <prompt>$ </prompt>nix-build -A 'config.systemd.units."httpd.service".unit'
 </screen>
-      You can also test individual units, without rebuilding the whole system, by putting them in <filename>/run/systemd/system</filename>:
+      You can also test individual units, without rebuilding the whole system,
+      by putting them in <filename>/run/systemd/system</filename>:
 <screen>
 <prompt>$ </prompt>cp $(nix-build -A 'config.systemd.units."httpd.service".unit')/httpd.service \
     /run/systemd/system/tmp-httpd.service
 <prompt># </prompt>systemctl daemon-reload
 <prompt># </prompt>systemctl start tmp-httpd.service
 </screen>
-      Note that the unit must not have the same name as any unit in <filename>/etc/systemd/system</filename> since those take precedence over <filename>/run/systemd/system</filename>. That’s why the unit is installed as <filename>tmp-httpd.service</filename> here.
+      Note that the unit must not have the same name as any unit in
+      <filename>/etc/systemd/system</filename> since those take precedence over
+      <filename>/run/systemd/system</filename>. That’s why the unit is
+      installed as <filename>tmp-httpd.service</filename> here.
      </para>
     </listitem>
    </varlistentry>
diff --git a/nixos/doc/manual/development/importing-modules.xml b/nixos/doc/manual/development/importing-modules.xml
index 0d57681783e..1c6a5671eda 100644
--- a/nixos/doc/manual/development/importing-modules.xml
+++ b/nixos/doc/manual/development/importing-modules.xml
@@ -6,7 +6,8 @@
  <title>Importing Modules</title>
 
  <para>
-  Sometimes NixOS modules need to be used in configuration but exist outside of Nixpkgs. These modules can be imported:
+  Sometimes NixOS modules need to be used in configuration but exist outside of
+  Nixpkgs. These modules can be imported:
  </para>
 
 <programlisting>
@@ -24,7 +25,9 @@
 </programlisting>
 
  <para>
-  The environment variable <literal>NIXOS_EXTRA_MODULE_PATH</literal> is an absolute path to a NixOS module that is included alongside the Nixpkgs NixOS modules. Like any NixOS module, this module can import additional modules:
+  The environment variable <literal>NIXOS_EXTRA_MODULE_PATH</literal> is an
+  absolute path to a NixOS module that is included alongside the Nixpkgs NixOS
+  modules. Like any NixOS module, this module can import additional modules:
  </para>
 
 <programlisting>
diff --git a/nixos/doc/manual/development/meta-attributes.xml b/nixos/doc/manual/development/meta-attributes.xml
index fd15bd3638f..3d019a4987e 100644
--- a/nixos/doc/manual/development/meta-attributes.xml
+++ b/nixos/doc/manual/development/meta-attributes.xml
@@ -6,12 +6,18 @@
  <title>Meta Attributes</title>
 
  <para>
-  Like Nix packages, NixOS modules can declare meta-attributes to provide extra information. Module meta attributes are defined in the <filename
-    xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/misc/meta.nix">meta.nix</filename> special module.
+  Like Nix packages, NixOS modules can declare meta-attributes to provide extra
+  information. Module meta attributes are defined in the
+  <filename
+    xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/misc/meta.nix">meta.nix</filename>
+  special module.
  </para>
 
  <para>
-  <literal>meta</literal> is a top level attribute like <literal>options</literal> and <literal>config</literal>. Available meta-attributes are <literal>maintainers</literal> and <literal>doc</literal>.
+  <literal>meta</literal> is a top level attribute like
+  <literal>options</literal> and <literal>config</literal>. Available
+  meta-attributes are <literal>maintainers</literal> and
+  <literal>doc</literal>.
  </para>
 
  <para>
@@ -45,8 +51,11 @@
   </callout>
   <callout arearefs='modules-meta-2'>
    <para>
-    <varname>doc</varname> points to a valid DocBook file containing the module documentation. Its contents is automatically added to <xref
-      linkend="ch-configuration"/>. Changes to a module documentation have to be checked to not break building the NixOS manual:
+    <varname>doc</varname> points to a valid DocBook file containing the module
+    documentation. Its contents is automatically added to
+    <xref
+      linkend="ch-configuration"/>. Changes to a module documentation
+    have to be checked to not break building the NixOS manual:
    </para>
 <programlisting>$ nix-build nixos/release.nix -A manual</programlisting>
   </callout>
diff --git a/nixos/doc/manual/development/nixos-tests.xml b/nixos/doc/manual/development/nixos-tests.xml
index aedc40e93a6..2695082e386 100644
--- a/nixos/doc/manual/development/nixos-tests.xml
+++ b/nixos/doc/manual/development/nixos-tests.xml
@@ -5,8 +5,13 @@
         xml:id="sec-nixos-tests">
  <title>NixOS Tests</title>
  <para>
-  When you add some feature to NixOS, you should write a test for it. NixOS tests are kept in the directory <filename
-xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/tests">nixos/tests</filename>, and are executed (using Nix) by a testing framework that automatically starts one or more virtual machines containing the NixOS system(s) required for the test.
+  When you add some feature to NixOS, you should write a test for it. NixOS
+  tests are kept in the directory
+  <filename
+xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/tests">nixos/tests</filename>,
+  and are executed (using Nix) by a testing framework that automatically starts
+  one or more virtual machines containing the NixOS system(s) required for the
+  test.
  </para>
  <xi:include href="writing-nixos-tests.xml" />
  <xi:include href="running-nixos-tests.xml" />
diff --git a/nixos/doc/manual/development/option-declarations.xml b/nixos/doc/manual/development/option-declarations.xml
index d6fb3f8f687..eee81bf6426 100644
--- a/nixos/doc/manual/development/option-declarations.xml
+++ b/nixos/doc/manual/development/option-declarations.xml
@@ -6,7 +6,9 @@
  <title>Option Declarations</title>
 
  <para>
-  An option declaration specifies the name, type and description of a NixOS configuration option. It is invalid to define an option that hasn’t been declared in any module. An option declaration generally looks like this:
+  An option declaration specifies the name, type and description of a NixOS
+  configuration option. It is invalid to define an option that hasn’t been
+  declared in any module. An option declaration generally looks like this:
 <programlisting>
 options = {
   <replaceable>name</replaceable> = mkOption {
@@ -17,8 +19,13 @@ options = {
   };
 };
 </programlisting>
-  The attribute names within the <replaceable>name</replaceable> attribute path must be camel cased in general but should, as an exception, match the <link
-xlink:href="https://nixos.org/nixpkgs/manual/#sec-package-naming"> package attribute name</link> when referencing a Nixpkgs package. For example, the option <varname>services.nix-serve.bindAddress</varname> references the <varname>nix-serve</varname> Nixpkgs package.
+  The attribute names within the <replaceable>name</replaceable> attribute path
+  must be camel cased in general but should, as an exception, match the
+  <link
+xlink:href="https://nixos.org/nixpkgs/manual/#sec-package-naming">
+  package attribute name</link> when referencing a Nixpkgs package. For
+  example, the option <varname>services.nix-serve.bindAddress</varname>
+  references the <varname>nix-serve</varname> Nixpkgs package.
  </para>
 
  <para>
@@ -30,7 +37,9 @@ xlink:href="https://nixos.org/nixpkgs/manual/#sec-package-naming"> package attri
     </term>
     <listitem>
      <para>
-      The type of the option (see <xref linkend='sec-option-types' />). It may be omitted, but that’s not advisable since it may lead to errors that are hard to diagnose.
+      The type of the option (see <xref linkend='sec-option-types' />). It may
+      be omitted, but that’s not advisable since it may lead to errors that
+      are hard to diagnose.
      </para>
     </listitem>
    </varlistentry>
@@ -40,7 +49,10 @@ xlink:href="https://nixos.org/nixpkgs/manual/#sec-package-naming"> package attri
     </term>
     <listitem>
      <para>
-      The default value used if no value is defined by any module. A default is not required; but if a default is not given, then users of the module will have to define the value of the option, otherwise an error will be thrown.
+      The default value used if no value is defined by any module. A default is
+      not required; but if a default is not given, then users of the module
+      will have to define the value of the option, otherwise an error will be
+      thrown.
      </para>
     </listitem>
    </varlistentry>
@@ -60,7 +72,8 @@ xlink:href="https://nixos.org/nixpkgs/manual/#sec-package-naming"> package attri
     </term>
     <listitem>
      <para>
-      A textual description of the option, in DocBook format, that will be included in the NixOS manual.
+      A textual description of the option, in DocBook format, that will be
+      included in the NixOS manual.
      </para>
     </listitem>
    </varlistentry>
@@ -71,15 +84,22 @@ xlink:href="https://nixos.org/nixpkgs/manual/#sec-package-naming"> package attri
   <title>Extensible Option Types</title>
 
   <para>
-   Extensible option types is a feature that allow to extend certain types declaration through multiple module files. This feature only work with a restricted set of types, namely <literal>enum</literal> and <literal>submodules</literal> and any composed forms of them.
+   Extensible option types is a feature that allow to extend certain types
+   declaration through multiple module files. This feature only work with a
+   restricted set of types, namely <literal>enum</literal> and
+   <literal>submodules</literal> and any composed forms of them.
   </para>
 
   <para>
-   Extensible option types can be used for <literal>enum</literal> options that affects multiple modules, or as an alternative to related <literal>enable</literal> options.
+   Extensible option types can be used for <literal>enum</literal> options that
+   affects multiple modules, or as an alternative to related
+   <literal>enable</literal> options.
   </para>
 
   <para>
-   As an example, we will take the case of display managers. There is a central display manager module for generic display manager options and a module file per display manager backend (slim, sddm, gdm ...).
+   As an example, we will take the case of display managers. There is a central
+   display manager module for generic display manager options and a module file
+   per display manager backend (slim, sddm, gdm ...).
   </para>
 
   <para>
@@ -87,12 +107,14 @@ xlink:href="https://nixos.org/nixpkgs/manual/#sec-package-naming"> package attri
    <itemizedlist>
     <listitem>
      <para>
-      Managing the display managers independently by adding an enable option to every display manager module backend. (NixOS)
+      Managing the display managers independently by adding an enable option to
+      every display manager module backend. (NixOS)
      </para>
     </listitem>
     <listitem>
      <para>
-      Managing the display managers in the central module by adding an option to select which display manager backend to use.
+      Managing the display managers in the central module by adding an option
+      to select which display manager backend to use.
      </para>
     </listitem>
    </itemizedlist>
@@ -103,22 +125,37 @@ xlink:href="https://nixos.org/nixpkgs/manual/#sec-package-naming"> package attri
   </para>
 
   <para>
-   Making backends independent can quickly become hard to manage. For display managers, there can be only one enabled at a time, but the type system can not enforce this restriction as there is no relation between each backend <literal>enable</literal> option. As a result, this restriction has to be done explicitely by adding assertions in each display manager backend module.
+   Making backends independent can quickly become hard to manage. For display
+   managers, there can be only one enabled at a time, but the type system can
+   not enforce this restriction as there is no relation between each backend
+   <literal>enable</literal> option. As a result, this restriction has to be
+   done explicitely by adding assertions in each display manager backend
+   module.
   </para>
 
   <para>
-   On the other hand, managing the display managers backends in the central module will require to change the central module option every time a new backend is added or removed.
+   On the other hand, managing the display managers backends in the central
+   module will require to change the central module option every time a new
+   backend is added or removed.
   </para>
 
   <para>
-   By using extensible option types, it is possible to create a placeholder option in the central module (<xref linkend='ex-option-declaration-eot-service'
-      />), and to extend it in each backend module (<xref
-      linkend='ex-option-declaration-eot-backend-slim' />, <xref
+   By using extensible option types, it is possible to create a placeholder
+   option in the central module
+   (<xref linkend='ex-option-declaration-eot-service'
+      />), and to extend
+   it in each backend module
+   (<xref
+      linkend='ex-option-declaration-eot-backend-slim' />,
+   <xref
       linkend='ex-option-declaration-eot-backend-sddm' />).
   </para>
 
   <para>
-   As a result, <literal>displayManager.enable</literal> option values can be added without changing the main service module file and the type system automatically enforce that there can only be a single display manager enabled.
+   As a result, <literal>displayManager.enable</literal> option values can be
+   added without changing the main service module file and the type system
+   automatically enforce that there can only be a single display manager
+   enabled.
   </para>
 
   <example xml:id='ex-option-declaration-eot-service'>
@@ -147,11 +184,16 @@ services.xserver.displayManager.enable = mkOption {
   </example>
 
   <para>
-   The placeholder declaration is a standard <literal>mkOption</literal> declaration, but it is important that extensible option declarations only use the <literal>type</literal> argument.
+   The placeholder declaration is a standard <literal>mkOption</literal>
+   declaration, but it is important that extensible option declarations only
+   use the <literal>type</literal> argument.
   </para>
 
   <para>
-   Extensible option types work with any of the composed variants of <literal>enum</literal> such as <literal>with types; nullOr (enum [ "foo" "bar" ])</literal> or <literal>with types; listOf (enum [ "foo" "bar" ])</literal>.
+   Extensible option types work with any of the composed variants of
+   <literal>enum</literal> such as <literal>with types; nullOr (enum [ "foo"
+   "bar" ])</literal> or <literal>with types; listOf (enum [ "foo" "bar"
+   ])</literal>.
   </para>
  </section>
 </section>
diff --git a/nixos/doc/manual/development/option-def.xml b/nixos/doc/manual/development/option-def.xml
index 883778c7eb9..50a705d0cb8 100644
--- a/nixos/doc/manual/development/option-def.xml
+++ b/nixos/doc/manual/development/option-def.xml
@@ -6,26 +6,33 @@
  <title>Option Definitions</title>
 
  <para>
-  Option definitions are generally straight-forward bindings of values to option names, like
+  Option definitions are generally straight-forward bindings of values to
+  option names, like
 <programlisting>
 config = {
   services.httpd.enable = true;
 };
 </programlisting>
-  However, sometimes you need to wrap an option definition or set of option definitions in a <emphasis>property</emphasis> to achieve certain effects:
+  However, sometimes you need to wrap an option definition or set of option
+  definitions in a <emphasis>property</emphasis> to achieve certain effects:
  </para>
 
  <simplesect xml:id="sec-option-definitions-delaying-conditionals">
   <title>Delaying Conditionals</title>
   <para>
-   If a set of option definitions is conditional on the value of another option, you may need to use <varname>mkIf</varname>. Consider, for instance:
+   If a set of option definitions is conditional on the value of another
+   option, you may need to use <varname>mkIf</varname>. Consider, for instance:
 <programlisting>
 config = if config.services.httpd.enable then {
   environment.systemPackages = [ <replaceable>...</replaceable> ];
   <replaceable>...</replaceable>
 } else {};
 </programlisting>
-   This definition will cause Nix to fail with an “infinite recursion” error. Why? Because the value of <option>config.services.httpd.enable</option> depends on the value being constructed here. After all, you could also write the clearly circular and contradictory:
+   This definition will cause Nix to fail with an “infinite recursion”
+   error. Why? Because the value of
+   <option>config.services.httpd.enable</option> depends on the value being
+   constructed here. After all, you could also write the clearly circular and
+   contradictory:
 <programlisting>
 config = if config.services.httpd.enable then {
   services.httpd.enable = false;
@@ -40,7 +47,9 @@ config = mkIf config.services.httpd.enable {
   <replaceable>...</replaceable>
 };
 </programlisting>
-   The special function <varname>mkIf</varname> causes the evaluation of the conditional to be “pushed down” into the individual definitions, as if you had written:
+   The special function <varname>mkIf</varname> causes the evaluation of the
+   conditional to be “pushed down” into the individual definitions, as if
+   you had written:
 <programlisting>
 config = {
   environment.systemPackages = if config.services.httpd.enable then [ <replaceable>...</replaceable> ] else [];
@@ -53,18 +62,27 @@ config = {
  <simplesect xml:id="sec-option-definitions-setting-priorities">
   <title>Setting Priorities</title>
   <para>
-   A module can override the definitions of an option in other modules by setting a <emphasis>priority</emphasis>. All option definitions that do not have the lowest priority value are discarded. By default, option definitions have priority 1000. You can specify an explicit priority by using <varname>mkOverride</varname>, e.g.
+   A module can override the definitions of an option in other modules by
+   setting a <emphasis>priority</emphasis>. All option definitions that do not
+   have the lowest priority value are discarded. By default, option definitions
+   have priority 1000. You can specify an explicit priority by using
+   <varname>mkOverride</varname>, e.g.
 <programlisting>
 services.openssh.enable = mkOverride 10 false;
 </programlisting>
-   This definition causes all other definitions with priorities above 10 to be discarded. The function <varname>mkForce</varname> is equal to <varname>mkOverride 50</varname>.
+   This definition causes all other definitions with priorities above 10 to be
+   discarded. The function <varname>mkForce</varname> is equal to
+   <varname>mkOverride 50</varname>.
   </para>
  </simplesect>
 
  <simplesect xml:id="sec-option-definitions-merging">
   <title>Merging Configurations</title>
   <para>
-   In conjunction with <literal>mkIf</literal>, it is sometimes useful for a module to return multiple sets of option definitions, to be merged together as if they were declared in separate modules. This can be done using <varname>mkMerge</varname>:
+   In conjunction with <literal>mkIf</literal>, it is sometimes useful for a
+   module to return multiple sets of option definitions, to be merged together
+   as if they were declared in separate modules. This can be done using
+   <varname>mkMerge</varname>:
 <programlisting>
 config = mkMerge
   [ # Unconditional stuff.
diff --git a/nixos/doc/manual/development/option-types.xml b/nixos/doc/manual/development/option-types.xml
index 7cd26e4c937..8fcbb627342 100644
--- a/nixos/doc/manual/development/option-types.xml
+++ b/nixos/doc/manual/development/option-types.xml
@@ -6,14 +6,18 @@
  <title>Options Types</title>
 
  <para>
-  Option types are a way to put constraints on the values a module option can take. Types are also responsible of how values are merged in case of multiple value definitions.
+  Option types are a way to put constraints on the values a module option can
+  take. Types are also responsible of how values are merged in case of multiple
+  value definitions.
  </para>
 
  <section xml:id="sec-option-types-basic">
   <title>Basic Types</title>
 
   <para>
-   Basic types are the simplest available types in the module system. Basic types include multiple string types that mainly differ in how definition merging is handled.
+   Basic types are the simplest available types in the module system. Basic
+   types include multiple string types that mainly differ in how definition
+   merging is handled.
   </para>
 
   <variablelist>
@@ -33,7 +37,8 @@
     </term>
     <listitem>
      <para>
-      A boolean, its values can be <literal>true</literal> or <literal>false</literal>.
+      A boolean, its values can be <literal>true</literal> or
+      <literal>false</literal>.
      </para>
     </listitem>
    </varlistentry>
@@ -43,7 +48,9 @@
     </term>
     <listitem>
      <para>
-      A filesystem path, defined as anything that when coerced to a string starts with a slash. Even if derivations can be considered as path, the more specific <literal>types.package</literal> should be preferred.
+      A filesystem path, defined as anything that when coerced to a string
+      starts with a slash. Even if derivations can be considered as path, the
+      more specific <literal>types.package</literal> should be preferred.
      </para>
     </listitem>
    </varlistentry>
@@ -80,7 +87,12 @@
     </term>
     <listitem>
      <para>
-      Signed integers with a fixed length (8, 16 or 32 bits). They go from <inlineequation><mathphrase>−2<superscript>n</superscript>/2</mathphrase> </inlineequation> to <inlineequation> <mathphrase>2<superscript>n</superscript>/2−1</mathphrase> </inlineequation> respectively (e.g. <literal>−128</literal> to <literal>127</literal> for 8 bits).
+      Signed integers with a fixed length (8, 16 or 32 bits). They go from
+      <inlineequation><mathphrase>−2<superscript>n</superscript>/2</mathphrase>
+      </inlineequation> to <inlineequation>
+      <mathphrase>2<superscript>n</superscript>/2−1</mathphrase>
+      </inlineequation> respectively (e.g. <literal>−128</literal> to
+      <literal>127</literal> for 8 bits).
      </para>
     </listitem>
    </varlistentry>
@@ -100,7 +112,12 @@
     </term>
     <listitem>
      <para>
-      Unsigned integers with a fixed length (8, 16 or 32 bits). They go from <inlineequation><mathphrase>0</mathphrase></inlineequation> to <inlineequation> <mathphrase>2<superscript>n</superscript>−1</mathphrase> </inlineequation> respectively (e.g. <literal>0</literal> to <literal>255</literal> for 8 bits).
+      Unsigned integers with a fixed length (8, 16 or 32 bits). They go from
+      <inlineequation><mathphrase>0</mathphrase></inlineequation> to
+      <inlineequation>
+      <mathphrase>2<superscript>n</superscript>−1</mathphrase>
+      </inlineequation> respectively (e.g. <literal>0</literal> to
+      <literal>255</literal> for 8 bits).
      </para>
     </listitem>
    </varlistentry>
@@ -120,7 +137,8 @@
     </term>
     <listitem>
      <para>
-      A port number. This type is an alias to <link linkend='types.ints.ux'><varname>types.ints.u16</varname></link>.
+      A port number. This type is an alias to
+      <link linkend='types.ints.ux'><varname>types.ints.u16</varname></link>.
      </para>
     </listitem>
    </varlistentry>
@@ -147,7 +165,8 @@
     </term>
     <listitem>
      <para>
-      A string. Multiple definitions are concatenated with a new line <literal>"\n"</literal>.
+      A string. Multiple definitions are concatenated with a new line
+      <literal>"\n"</literal>.
      </para>
     </listitem>
    </varlistentry>
@@ -157,7 +176,8 @@
     </term>
     <listitem>
      <para>
-      A string. Multiple definitions are concatenated with a comma <literal>","</literal>.
+      A string. Multiple definitions are concatenated with a comma
+      <literal>","</literal>.
      </para>
     </listitem>
    </varlistentry>
@@ -167,7 +187,8 @@
     </term>
     <listitem>
      <para>
-      A string. Multiple definitions are concatenated with a collon <literal>":"</literal>.
+      A string. Multiple definitions are concatenated with a collon
+      <literal>":"</literal>.
      </para>
     </listitem>
    </varlistentry>
@@ -177,7 +198,9 @@
     </term>
     <listitem>
      <para>
-      A string matching a specific regular expression. Multiple definitions cannot be merged. The regular expression is processed using <literal>builtins.match</literal>.
+      A string matching a specific regular expression. Multiple definitions
+      cannot be merged. The regular expression is processed using
+      <literal>builtins.match</literal>.
      </para>
     </listitem>
    </varlistentry>
@@ -198,7 +221,9 @@
     </term>
     <listitem>
      <para>
-      One element of the list <replaceable>l</replaceable>, e.g. <literal>types.enum [ "left" "right" ]</literal>. Multiple definitions cannot be merged.
+      One element of the list <replaceable>l</replaceable>, e.g.
+      <literal>types.enum [ "left" "right" ]</literal>. Multiple definitions
+      cannot be merged.
      </para>
     </listitem>
    </varlistentry>
@@ -208,7 +233,8 @@
     </term>
     <listitem>
      <para>
-      A string with a custom separator <replaceable>sep</replaceable>, e.g. <literal>types.separatedString "|"</literal>.
+      A string with a custom separator <replaceable>sep</replaceable>, e.g.
+      <literal>types.separatedString "|"</literal>.
      </para>
     </listitem>
    </varlistentry>
@@ -218,7 +244,9 @@
     </term>
     <listitem>
      <para>
-      An integer between <replaceable>lowest</replaceable> and <replaceable>highest</replaceable> (both inclusive). Useful for creating types like <literal>types.port</literal>.
+      An integer between <replaceable>lowest</replaceable> and
+      <replaceable>highest</replaceable> (both inclusive). Useful for creating
+      types like <literal>types.port</literal>.
      </para>
     </listitem>
    </varlistentry>
@@ -228,7 +256,11 @@
     </term>
     <listitem>
      <para>
-      A set of sub options <replaceable>o</replaceable>. <replaceable>o</replaceable> can be an attribute set or a function returning an attribute set. Submodules are used in composed types to create modular options. Submodule are detailed in <xref
+      A set of sub options <replaceable>o</replaceable>.
+      <replaceable>o</replaceable> can be an attribute set or a function
+      returning an attribute set. Submodules are used in composed types to
+      create modular options. Submodule are detailed in
+      <xref
           linkend='section-option-types-submodule' />.
      </para>
     </listitem>
@@ -240,7 +272,9 @@
   <title>Composed Types</title>
 
   <para>
-   Composed types are types that take a type as parameter. <literal>listOf int</literal> and <literal>either int str</literal> are examples of composed types.
+   Composed types are types that take a type as parameter. <literal>listOf
+   int</literal> and <literal>either int str</literal> are examples of composed
+   types.
   </para>
 
   <variablelist>
@@ -250,7 +284,8 @@
     </term>
     <listitem>
      <para>
-      A list of <replaceable>t</replaceable> type, e.g. <literal>types.listOf int</literal>. Multiple definitions are merged with list concatenation.
+      A list of <replaceable>t</replaceable> type, e.g. <literal>types.listOf
+      int</literal>. Multiple definitions are merged with list concatenation.
      </para>
     </listitem>
    </varlistentry>
@@ -260,7 +295,9 @@
     </term>
     <listitem>
      <para>
-      An attribute set of where all the values are of <replaceable>t</replaceable> type. Multiple definitions result in the joined attribute set.
+      An attribute set of where all the values are of
+      <replaceable>t</replaceable> type. Multiple definitions result in the
+      joined attribute set.
      </para>
     </listitem>
    </varlistentry>
@@ -270,7 +307,8 @@
     </term>
     <listitem>
      <para>
-      An attribute set or a list of <replaceable>t</replaceable> type. Multiple definitions are merged according to the value.
+      An attribute set or a list of <replaceable>t</replaceable> type. Multiple
+      definitions are merged according to the value.
      </para>
     </listitem>
    </varlistentry>
@@ -280,7 +318,8 @@
     </term>
     <listitem>
      <para>
-      <literal>null</literal> or type <replaceable>t</replaceable>. Multiple definitions are merged according to type <replaceable>t</replaceable>.
+      <literal>null</literal> or type <replaceable>t</replaceable>. Multiple
+      definitions are merged according to type <replaceable>t</replaceable>.
      </para>
     </listitem>
    </varlistentry>
@@ -290,7 +329,8 @@
     </term>
     <listitem>
      <para>
-      Ensures that type <replaceable>t</replaceable> cannot be merged. It is used to ensure option definitions are declared only once.
+      Ensures that type <replaceable>t</replaceable> cannot be merged. It is
+      used to ensure option definitions are declared only once.
      </para>
     </listitem>
    </varlistentry>
@@ -300,7 +340,9 @@
     </term>
     <listitem>
      <para>
-      Type <replaceable>t1</replaceable> or type <replaceable>t2</replaceable>, e.g. <literal>with types; either int str</literal>. Multiple definitions cannot be merged.
+      Type <replaceable>t1</replaceable> or type <replaceable>t2</replaceable>,
+      e.g. <literal>with types; either int str</literal>. Multiple definitions
+      cannot be merged.
      </para>
     </listitem>
    </varlistentry>
@@ -310,7 +352,9 @@
     </term>
     <listitem>
      <para>
-      Type <replaceable>t1</replaceable> or type <replaceable>t2</replaceable> and so forth, e.g. <literal>with types; oneOf [ int str bool ]</literal>. Multiple definitions cannot be merged.
+      Type <replaceable>t1</replaceable> or type <replaceable>t2</replaceable> and so forth,
+      e.g. <literal>with types; oneOf [ int str bool ]</literal>. Multiple definitions
+      cannot be merged.
      </para>
     </listitem>
    </varlistentry>
@@ -320,7 +364,12 @@
     </term>
     <listitem>
      <para>
-      Type <replaceable>to</replaceable> or type <replaceable>from</replaceable> which will be coerced to type <replaceable>to</replaceable> using function <replaceable>f</replaceable> which takes an argument of type <replaceable>from</replaceable> and return a value of type <replaceable>to</replaceable>. Can be used to preserve backwards compatibility of an option if its type was changed.
+      Type <replaceable>to</replaceable> or type
+      <replaceable>from</replaceable> which will be coerced to type
+      <replaceable>to</replaceable> using function <replaceable>f</replaceable>
+      which takes an argument of type <replaceable>from</replaceable> and
+      return a value of type <replaceable>to</replaceable>. Can be used to
+      preserve backwards compatibility of an option if its type was changed.
      </para>
     </listitem>
    </varlistentry>
@@ -331,15 +380,22 @@
   <title>Submodule</title>
 
   <para>
-   <literal>submodule</literal> is a very powerful type that defines a set of sub-options that are handled like a separate module.
+   <literal>submodule</literal> is a very powerful type that defines a set of
+   sub-options that are handled like a separate module.
   </para>
 
   <para>
-   It takes a parameter <replaceable>o</replaceable>, that should be a set, or a function returning a set with an <literal>options</literal> key defining the sub-options. Submodule option definitions are type-checked accordingly to the <literal>options</literal> declarations. Of course, you can nest submodule option definitons for even higher modularity.
+   It takes a parameter <replaceable>o</replaceable>, that should be a set, or
+   a function returning a set with an <literal>options</literal> key defining
+   the sub-options. Submodule option definitions are type-checked accordingly
+   to the <literal>options</literal> declarations. Of course, you can nest
+   submodule option definitons for even higher modularity.
   </para>
 
   <para>
-   The option set can be defined directly (<xref linkend='ex-submodule-direct' />) or as reference (<xref linkend='ex-submodule-reference' />).
+   The option set can be defined directly
+   (<xref linkend='ex-submodule-direct' />) or as reference
+   (<xref linkend='ex-submodule-reference' />).
   </para>
 
   <example xml:id='ex-submodule-direct'>
@@ -382,7 +438,12 @@ options.mod = mkOption {
   </example>
 
   <para>
-   The <literal>submodule</literal> type is especially interesting when used with composed types like <literal>attrsOf</literal> or <literal>listOf</literal>. When composed with <literal>listOf</literal> (<xref linkend='ex-submodule-listof-declaration' />), <literal>submodule</literal> allows multiple definitions of the submodule option set (<xref linkend='ex-submodule-listof-definition' />).
+   The <literal>submodule</literal> type is especially interesting when used
+   with composed types like <literal>attrsOf</literal> or
+   <literal>listOf</literal>. When composed with <literal>listOf</literal>
+   (<xref linkend='ex-submodule-listof-declaration' />),
+   <literal>submodule</literal> allows multiple definitions of the submodule
+   option set (<xref linkend='ex-submodule-listof-definition' />).
   </para>
 
   <example xml:id='ex-submodule-listof-declaration'>
@@ -413,7 +474,10 @@ config.mod = [
   </example>
 
   <para>
-   When composed with <literal>attrsOf</literal> (<xref linkend='ex-submodule-attrsof-declaration' />), <literal>submodule</literal> allows multiple named definitions of the submodule option set (<xref linkend='ex-submodule-attrsof-definition' />).
+   When composed with <literal>attrsOf</literal>
+   (<xref linkend='ex-submodule-attrsof-declaration' />),
+   <literal>submodule</literal> allows multiple named definitions of the
+   submodule option set (<xref linkend='ex-submodule-attrsof-definition' />).
   </para>
 
   <example xml:id='ex-submodule-attrsof-declaration'>
@@ -446,7 +510,8 @@ config.mod.two = { foo = 2; bar = "two"; };</screen>
   <title>Extending types</title>
 
   <para>
-   Types are mainly characterized by their <literal>check</literal> and <literal>merge</literal> functions.
+   Types are mainly characterized by their <literal>check</literal> and
+   <literal>merge</literal> functions.
   </para>
 
   <variablelist>
@@ -456,8 +521,13 @@ config.mod.two = { foo = 2; bar = "two"; };</screen>
     </term>
     <listitem>
      <para>
-      The function to type check the value. Takes a value as parameter and return a boolean. It is possible to extend a type check with the <literal>addCheck</literal> function (<xref
-          linkend='ex-extending-type-check-1' />), or to fully override the check function (<xref linkend='ex-extending-type-check-2' />).
+      The function to type check the value. Takes a value as parameter and
+      return a boolean. It is possible to extend a type check with the
+      <literal>addCheck</literal> function
+      (<xref
+          linkend='ex-extending-type-check-1' />), or to fully
+      override the check function
+      (<xref linkend='ex-extending-type-check-2' />).
      </para>
      <example xml:id='ex-extending-type-check-1'>
       <title>Adding a type check</title>
@@ -485,7 +555,11 @@ nixThings = mkOption {
     </term>
     <listitem>
      <para>
-      Function to merge the options values when multiple values are set. The function takes two parameters, <literal>loc</literal> the option path as a list of strings, and <literal>defs</literal> the list of defined values as a list. It is possible to override a type merge function for custom needs.
+      Function to merge the options values when multiple values are set. The
+      function takes two parameters, <literal>loc</literal> the option path as
+      a list of strings, and <literal>defs</literal> the list of defined values
+      as a list. It is possible to override a type merge function for custom
+      needs.
      </para>
     </listitem>
    </varlistentry>
@@ -496,8 +570,12 @@ nixThings = mkOption {
   <title>Custom Types</title>
 
   <para>
-   Custom types can be created with the <literal>mkOptionType</literal> function. As type creation includes some more complex topics such as submodule handling, it is recommended to get familiar with <filename
-  xlink:href="https://github.com/NixOS/nixpkgs/blob/master/lib/types.nix">types.nix</filename> code before creating a new type.
+   Custom types can be created with the <literal>mkOptionType</literal>
+   function. As type creation includes some more complex topics such as
+   submodule handling, it is recommended to get familiar with
+   <filename
+  xlink:href="https://github.com/NixOS/nixpkgs/blob/master/lib/types.nix">types.nix</filename>
+   code before creating a new type.
   </para>
 
   <para>
@@ -521,7 +599,8 @@ nixThings = mkOption {
     </term>
     <listitem>
      <para>
-      Description of the type used in documentation. Give information of the type and any of its arguments.
+      Description of the type used in documentation. Give information of the
+      type and any of its arguments.
      </para>
     </listitem>
    </varlistentry>
@@ -531,7 +610,10 @@ nixThings = mkOption {
     </term>
     <listitem>
      <para>
-      A function to type check the definition value. Takes the definition value as a parameter and returns a boolean indicating the type check result, <literal>true</literal> for success and <literal>false</literal> for failure.
+      A function to type check the definition value. Takes the definition value
+      as a parameter and returns a boolean indicating the type check result,
+      <literal>true</literal> for success and <literal>false</literal> for
+      failure.
      </para>
     </listitem>
    </varlistentry>
@@ -550,7 +632,8 @@ nixThings = mkOption {
        </term>
        <listitem>
         <para>
-         The option path as a list of strings, e.g. <literal>["boot" "loader "grub" "enable"]</literal>.
+         The option path as a list of strings, e.g. <literal>["boot" "loader
+         "grub" "enable"]</literal>.
         </para>
        </listitem>
       </varlistentry>
@@ -560,7 +643,12 @@ nixThings = mkOption {
        </term>
        <listitem>
         <para>
-         The list of sets of defined <literal>value</literal> and <literal>file</literal> where the value was defined, e.g. <literal>[ { file = "/foo.nix"; value = 1; } { file = "/bar.nix"; value = 2 } ]</literal>. The <literal>merge</literal> function should return the merged value or throw an error in case the values are impossible or not meant to be merged.
+         The list of sets of defined <literal>value</literal> and
+         <literal>file</literal> where the value was defined, e.g. <literal>[ {
+         file = "/foo.nix"; value = 1; } { file = "/bar.nix"; value = 2 }
+         ]</literal>. The <literal>merge</literal> function should return the
+         merged value or throw an error in case the values are impossible or
+         not meant to be merged.
         </para>
        </listitem>
       </varlistentry>
@@ -573,7 +661,13 @@ nixThings = mkOption {
     </term>
     <listitem>
      <para>
-      For composed types that can take a submodule as type parameter, this function generate sub-options documentation. It takes the current option prefix as a list and return the set of sub-options. Usually defined in a recursive manner by adding a term to the prefix, e.g. <literal>prefix: elemType.getSubOptions (prefix ++ [<replaceable>"prefix"</replaceable>])</literal> where <replaceable>"prefix"</replaceable> is the newly added prefix.
+      For composed types that can take a submodule as type parameter, this
+      function generate sub-options documentation. It takes the current option
+      prefix as a list and return the set of sub-options. Usually defined in a
+      recursive manner by adding a term to the prefix, e.g. <literal>prefix:
+      elemType.getSubOptions (prefix ++
+      [<replaceable>"prefix"</replaceable>])</literal> where
+      <replaceable>"prefix"</replaceable> is the newly added prefix.
      </para>
     </listitem>
    </varlistentry>
@@ -583,7 +677,11 @@ nixThings = mkOption {
     </term>
     <listitem>
      <para>
-      For composed types that can take a submodule as type parameter, this function should return the type parameters submodules. If the type parameter is called <literal>elemType</literal>, the function should just recursively look into submodules by returning <literal>elemType.getSubModules;</literal>.
+      For composed types that can take a submodule as type parameter, this
+      function should return the type parameters submodules. If the type
+      parameter is called <literal>elemType</literal>, the function should just
+      recursively look into submodules by returning
+      <literal>elemType.getSubModules;</literal>.
      </para>
     </listitem>
    </varlistentry>
@@ -593,7 +691,14 @@ nixThings = mkOption {
     </term>
     <listitem>
      <para>
-      For composed types that can take a submodule as type parameter, this function can be used to substitute the parameter of a submodule type. It takes a module as parameter and return the type with the submodule options substituted. It is usually defined as a type function call with a recursive call to <literal>substSubModules</literal>, e.g for a type <literal>composedType</literal> that take an <literal>elemtype</literal> type parameter, this function should be defined as <literal>m: composedType (elemType.substSubModules m)</literal>.
+      For composed types that can take a submodule as type parameter, this
+      function can be used to substitute the parameter of a submodule type. It
+      takes a module as parameter and return the type with the submodule
+      options substituted. It is usually defined as a type function call with a
+      recursive call to <literal>substSubModules</literal>, e.g for a type
+      <literal>composedType</literal> that take an <literal>elemtype</literal>
+      type parameter, this function should be defined as <literal>m:
+      composedType (elemType.substSubModules m)</literal>.
      </para>
     </listitem>
    </varlistentry>
@@ -603,7 +708,9 @@ nixThings = mkOption {
     </term>
     <listitem>
      <para>
-      A function to merge multiple type declarations. Takes the type to merge <literal>functor</literal> as parameter. A <literal>null</literal> return value means that type cannot be merged.
+      A function to merge multiple type declarations. Takes the type to merge
+      <literal>functor</literal> as parameter. A <literal>null</literal> return
+      value means that type cannot be merged.
      </para>
      <variablelist>
       <varlistentry>
@@ -618,7 +725,8 @@ nixThings = mkOption {
       </varlistentry>
      </variablelist>
      <para>
-      Note: There is a generic <literal>defaultTypeMerge</literal> that work with most of value and composed types.
+      Note: There is a generic <literal>defaultTypeMerge</literal> that work
+      with most of value and composed types.
      </para>
     </listitem>
    </varlistentry>
@@ -628,7 +736,8 @@ nixThings = mkOption {
     </term>
     <listitem>
      <para>
-      An attribute set representing the type. It is used for type operations and has the following keys:
+      An attribute set representing the type. It is used for type operations
+      and has the following keys:
      </para>
      <variablelist>
       <varlistentry>
@@ -657,7 +766,10 @@ nixThings = mkOption {
        </term>
        <listitem>
         <para>
-         Holds the value parameter for value types. The types that have a <literal>payload</literal> are the <literal>enum</literal>, <literal>separatedString</literal> and <literal>submodule</literal> types.
+         Holds the value parameter for value types. The types that have a
+         <literal>payload</literal> are the <literal>enum</literal>,
+         <literal>separatedString</literal> and <literal>submodule</literal>
+         types.
         </para>
        </listitem>
       </varlistentry>
@@ -667,7 +779,9 @@ nixThings = mkOption {
        </term>
        <listitem>
         <para>
-         A binary operation that can merge the payloads of two same types. Defined as a function that take two payloads as parameters and return the payloads merged.
+         A binary operation that can merge the payloads of two same types.
+         Defined as a function that take two payloads as parameters and return
+         the payloads merged.
         </para>
        </listitem>
       </varlistentry>
diff --git a/nixos/doc/manual/development/releases.xml b/nixos/doc/manual/development/releases.xml
index 8cc4490ff54..1cdec64f69b 100755
--- a/nixos/doc/manual/development/releases.xml
+++ b/nixos/doc/manual/development/releases.xml
@@ -17,12 +17,15 @@
    <itemizedlist spacing="compact">
     <listitem>
      <para>
-      Send an email to the nix-devel mailinglist as a warning about upcoming beta "feature freeze" in a month.
+      Send an email to the nix-devel mailinglist as a warning about upcoming
+      beta "feature freeze" in a month.
      </para>
     </listitem>
     <listitem>
      <para>
-      Discuss with Eelco Dolstra and the community (via IRC, ML) about what will reach the deadline. Any issue or Pull Request targeting the release should be included in the release milestone.
+      Discuss with Eelco Dolstra and the community (via IRC, ML) about what
+      will reach the deadline. Any issue or Pull Request targeting the release
+      should be included in the release milestone.
      </para>
     </listitem>
    </itemizedlist>
@@ -34,32 +37,42 @@
    <itemizedlist spacing="compact">
     <listitem>
      <para>
-      <link xlink:href="https://github.com/NixOS/nixpkgs/issues/13559">Create an issue for tracking Zero Hydra Failures progress. ZHF is an effort to get build failures down to zero.</link>
+      <link xlink:href="https://github.com/NixOS/nixpkgs/issues/13559">Create
+      an issue for tracking Zero Hydra Failures progress. ZHF is an effort to
+      get build failures down to zero.</link>
      </para>
     </listitem>
     <listitem>
      <para>
-      <literal>git tag -a -s -m &quot;Release 17.09-beta&quot; 17.09-beta &amp;&amp; git push --tags</literal>
+      <literal>git tag -a -s -m &quot;Release 17.09-beta&quot; 17.09-beta
+      &amp;&amp; git push --tags</literal>
      </para>
     </listitem>
     <listitem>
      <para>
-      From the master branch run <literal>git checkout -B release-17.09</literal>.
+      From the master branch run <literal>git checkout -B
+      release-17.09</literal>.
      </para>
     </listitem>
     <listitem>
      <para>
-      <link xlink:href="https://github.com/NixOS/nixos-org-configurations/pull/18"> Make sure a channel is created at http://nixos.org/channels/. </link>
+      <link xlink:href="https://github.com/NixOS/nixos-org-configurations/pull/18">
+      Make sure a channel is created at http://nixos.org/channels/. </link>
      </para>
     </listitem>
     <listitem>
      <para>
-      <link xlink:href="https://github.com/NixOS/nixpkgs/compare/bdf161ed8d21...6b63c4616790"> Bump the <literal>system.defaultChannel</literal> attribute in <literal>nixos/modules/misc/version.nix</literal> </link>
+      <link xlink:href="https://github.com/NixOS/nixpkgs/compare/bdf161ed8d21...6b63c4616790">
+      Bump the <literal>system.defaultChannel</literal> attribute in
+      <literal>nixos/modules/misc/version.nix</literal> </link>
      </para>
     </listitem>
     <listitem>
      <para>
-      <link xlink:href="https://github.com/NixOS/nixpkgs/commit/d6b08acd1ccac0d9d502c4b635e00b04d3387f06"> Update <literal>versionSuffix</literal> in <literal>nixos/release.nix</literal></link>, use <literal>git log --format=%an|wc -l</literal> to get the commit count
+      <link xlink:href="https://github.com/NixOS/nixpkgs/commit/d6b08acd1ccac0d9d502c4b635e00b04d3387f06">
+      Update <literal>versionSuffix</literal> in
+      <literal>nixos/release.nix</literal></link>, use <literal>git log
+      --format=%an|wc -l</literal> to get the commit count
      </para>
     </listitem>
     <listitem>
@@ -69,32 +82,44 @@
     </listitem>
     <listitem>
      <para>
-      <link xlink:href="https://github.com/NixOS/nixpkgs/commit/b8a4095003e27659092892a4708bb3698231a842"> Pick a new name for the unstable branch. </link>
+      <link xlink:href="https://github.com/NixOS/nixpkgs/commit/b8a4095003e27659092892a4708bb3698231a842">
+      Pick a new name for the unstable branch. </link>
      </para>
     </listitem>
     <listitem>
      <para>
-      Create a new release notes file for the upcoming release + 1, in this case <literal>rl-1803.xml</literal>.
+      Create a new release notes file for the upcoming release + 1, in this
+      case <literal>rl-1803.xml</literal>.
      </para>
     </listitem>
     <listitem>
      <para>
-      Create two Hydra jobsets: release-17.09 and release-17.09-small with <literal>stableBranch</literal> set to false.
+      Create two Hydra jobsets: release-17.09 and release-17.09-small with
+      <literal>stableBranch</literal> set to false.
      </para>
     </listitem>
     <listitem>
      <para>
-      Remove attributes that we know we will not be able to support, especially if there is a stable alternative. E.g. Check that our Linux kernels' <link xlink:href="https://www.kernel.org/category/releases.html"> projected end-of-life</link> are after our release projected end-of-life
+      Remove attributes that we know we will not be able to support,
+      especially if there is a stable alternative. E.g. Check that our
+      Linux kernels'
+      <link xlink:href="https://www.kernel.org/category/releases.html">
+      projected end-of-life</link> are after our release projected
+      end-of-life
      </para>
     </listitem>
     <listitem>
      <para>
-      Edit changelog at <literal>nixos/doc/manual/release-notes/rl-1709.xml</literal> (double check desktop versions are noted)
+      Edit changelog at
+      <literal>nixos/doc/manual/release-notes/rl-1709.xml</literal> (double
+      check desktop versions are noted)
      </para>
      <itemizedlist spacing="compact">
       <listitem>
        <para>
-        Get all new NixOS modules <literal>git diff release-17.03..release-17.09 nixos/modules/module-list.nix|grep ^+</literal>
+        Get all new NixOS modules <literal>git diff
+        release-17.03..release-17.09 nixos/modules/module-list.nix|grep
+        ^+</literal>
        </para>
       </listitem>
       <listitem>
@@ -113,7 +138,8 @@
    <itemizedlist spacing="compact">
     <listitem>
      <para>
-      Monitor the master branch for bugfixes and minor updates and cherry-pick them to the release branch.
+      Monitor the master branch for bugfixes and minor updates and cherry-pick
+      them to the release branch.
      </para>
     </listitem>
    </itemizedlist>
@@ -130,17 +156,21 @@
     </listitem>
     <listitem>
      <para>
-      Release Nix (currently only Eelco Dolstra can do that). <link xlink:href="https://github.com/NixOS/nixpkgs/commit/53710c752a85f00658882531bc90a23a3d1287e4"> Make sure fallback is updated. </link>
+      Release Nix (currently only Eelco Dolstra can do that).
+      <link xlink:href="https://github.com/NixOS/nixpkgs/commit/53710c752a85f00658882531bc90a23a3d1287e4">
+      Make sure fallback is updated. </link>
      </para>
     </listitem>
     <listitem>
      <para>
-      <link xlink:href="https://github.com/NixOS/nixpkgs/commit/40fd9ae3ac8048758abdcfc7d28a78b5f22fe97e"> Update README.md with new stable NixOS version information. </link>
+      <link xlink:href="https://github.com/NixOS/nixpkgs/commit/40fd9ae3ac8048758abdcfc7d28a78b5f22fe97e">
+      Update README.md with new stable NixOS version information. </link>
      </para>
     </listitem>
     <listitem>
      <para>
-      Change <literal>stableBranch</literal> to true and wait for channel to update.
+      Change <literal>stableBranch</literal> to true and wait for channel to
+      update.
      </para>
     </listitem>
    </itemizedlist>
@@ -157,27 +187,34 @@
     </listitem>
     <listitem>
      <para>
-      Update "Chapter 4. Upgrading NixOS" section of the manual to match new stable release version.
+      Update "Chapter 4. Upgrading NixOS" section of the manual to match 
+      new stable release version.
      </para>
     </listitem>
     <listitem>
      <para>
-      Update http://nixos.org/nixos/download.html and http://nixos.org/nixos/manual in https://github.com/NixOS/nixos-org-configurations
+      Update http://nixos.org/nixos/download.html and
+      http://nixos.org/nixos/manual in
+      https://github.com/NixOS/nixos-org-configurations
      </para>
     </listitem>
     <listitem>
      <para>
-      Get number of commits for the release: <literal>git log release-14.04..release-14.12 --format=%an|wc -l</literal>
+      Get number of commits for the release: <literal>git log
+      release-14.04..release-14.12 --format=%an|wc -l</literal>
      </para>
     </listitem>
     <listitem>
      <para>
-      Commits by contributor: <literal>git log release-14.04..release-14.12 --format=%an|sort|uniq -c|sort -rn</literal>
+      Commits by contributor: <literal>git log release-14.04..release-14.12
+      --format=%an|sort|uniq -c|sort -rn</literal>
      </para>
     </listitem>
     <listitem>
      <para>
-      Send an email to nix-dev to announce the release with above information. Best to check how previous email was formulated to see what needs to be included.
+      Send an email to nix-dev to announce the release with above information.
+      Best to check how previous email was formulated to see what needs to be
+      included.
      </para>
     </listitem>
    </itemizedlist>
@@ -185,45 +222,26 @@
  </section>
  <section xml:id="release-managers">
   <title>Release Management Team</title>
-
   <para>
-   For each release there are two release managers. After each release the release manager having managed two releases steps down and the release management team of the last release appoints a new release manager.
+   For each release there are two release managers. After each release the
+   release manager having managed two releases steps down and the release
+   management team of the last release appoints a new release manager.
   </para>
-
   <para>
-   This makes sure a release management team always consists of one release manager who already has managed one release and one release manager being introduced to their role, making it easier to pass on knowledge and experience.
+   This makes sure a release management team always consists of one release
+   manager who already has managed one release and one release manager being
+   introduced to their role, making it easier to pass on knowledge and
+   experience.
   </para>
-
   <para>
    A release manager's role and responsibilities are:
   </para>
-
   <itemizedlist>
-   <listitem>
-    <para>
-     manage the release process
-    </para>
-   </listitem>
-   <listitem>
-    <para>
-     start discussions about features and changes for a given release
-    </para>
-   </listitem>
-   <listitem>
-    <para>
-     create a roadmap
-    </para>
-   </listitem>
-   <listitem>
-    <para>
-     release in cooperation with Eelco Dolstra
-    </para>
-   </listitem>
-   <listitem>
-    <para>
-     decide which bug fixes, features, etc... get backported after a release
-    </para>
-   </listitem>
+   <listitem><para>manage the release process</para></listitem>
+   <listitem><para>start discussions about features and changes for a given release</para></listitem>
+   <listitem><para>create a roadmap</para></listitem>
+   <listitem><para>release in cooperation with Eelco Dolstra</para></listitem>
+   <listitem><para>decide which bug fixes, features, etc... get backported after a release</para></listitem>
   </itemizedlist>
  </section>
  <section xml:id="release-schedule">
diff --git a/nixos/doc/manual/development/replace-modules.xml b/nixos/doc/manual/development/replace-modules.xml
index 9940143de8e..7b103c36d90 100644
--- a/nixos/doc/manual/development/replace-modules.xml
+++ b/nixos/doc/manual/development/replace-modules.xml
@@ -6,15 +6,27 @@
  <title>Replace Modules</title>
 
  <para>
-  Modules that are imported can also be disabled. The option declarations and config implementation of a disabled module will be ignored, allowing another to take it's place. This can be used to import a set of modules from another channel while keeping the rest of the system on a stable release.
+  Modules that are imported can also be disabled. The option declarations and
+  config implementation of a disabled module will be ignored, allowing another
+  to take it's place. This can be used to import a set of modules from another
+  channel while keeping the rest of the system on a stable release.
  </para>
 
  <para>
-  <literal>disabledModules</literal> is a top level attribute like <literal>imports</literal>, <literal>options</literal> and <literal>config</literal>. It contains a list of modules that will be disabled. This can either be the full path to the module or a string with the filename relative to the modules path (eg. &lt;nixpkgs/nixos/modules&gt; for nixos).
+  <literal>disabledModules</literal> is a top level attribute like
+  <literal>imports</literal>, <literal>options</literal> and
+  <literal>config</literal>. It contains a list of modules that will be
+  disabled. This can either be the full path to the module or a string with the
+  filename relative to the modules path (eg. &lt;nixpkgs/nixos/modules&gt; for
+  nixos).
  </para>
 
  <para>
-  This example will replace the existing postgresql module with the version defined in the nixos-unstable channel while keeping the rest of the modules and packages from the original nixos channel. This only overrides the module definition, this won't use postgresql from nixos-unstable unless explicitly configured to do so.
+  This example will replace the existing postgresql module with the version
+  defined in the nixos-unstable channel while keeping the rest of the modules
+  and packages from the original nixos channel. This only overrides the module
+  definition, this won't use postgresql from nixos-unstable unless explicitly
+  configured to do so.
  </para>
 
 <programlisting>
@@ -34,7 +46,9 @@
 </programlisting>
 
  <para>
-  This example shows how to define a custom module as a replacement for an existing module. Importing this module will disable the original module without having to know it's implementation details.
+  This example shows how to define a custom module as a replacement for an
+  existing module. Importing this module will disable the original module
+  without having to know it's implementation details.
  </para>
 
 <programlisting>
diff --git a/nixos/doc/manual/development/running-nixos-tests-interactively.xml b/nixos/doc/manual/development/running-nixos-tests-interactively.xml
index e4ded136ca6..e390d62fde2 100644
--- a/nixos/doc/manual/development/running-nixos-tests-interactively.xml
+++ b/nixos/doc/manual/development/running-nixos-tests-interactively.xml
@@ -6,7 +6,8 @@
  <title>Running Tests interactively</title>
 
  <para>
-  The test itself can be run interactively. This is particularly useful when developing or debugging a test:
+  The test itself can be run interactively. This is particularly useful when
+  developing or debugging a test:
 <screen>
 <prompt>$ </prompt>nix-build nixos/tests/login.nix -A driver
 <prompt>$ </prompt>./result/bin/nixos-test-driver
@@ -20,7 +21,10 @@ starting VDE switch for network 1
 <prompt>&gt;</prompt> $machine->succeed("touch /tmp/foo")
 <prompt>&gt;</prompt> print($machine->succeed("pwd")) # Show stdout of command
 </screen>
-  The function <command>testScript</command> executes the entire test script and drops you back into the test driver command line upon its completion. This allows you to inspect the state of the VMs after the test (e.g. to debug the test script).
+  The function <command>testScript</command> executes the entire test script
+  and drops you back into the test driver command line upon its completion.
+  This allows you to inspect the state of the VMs after the test (e.g. to debug
+  the test script).
  </para>
 
  <para>
@@ -29,10 +33,12 @@ starting VDE switch for network 1
 <prompt>$ </prompt>nix-build nixos/tests/login.nix -A driver
 <prompt>$ </prompt>./result/bin/nixos-run-vms
 </screen>
-  The script <command>nixos-run-vms</command> starts the virtual machines defined by test.
+  The script <command>nixos-run-vms</command> starts the virtual machines
+  defined by test.
  </para>
 
  <para>
-  The machine state is kept across VM restarts in <filename>/tmp/vm-state-</filename><varname>machinename</varname>.
+  The machine state is kept across VM restarts in
+  <filename>/tmp/vm-state-</filename><varname>machinename</varname>.
  </para>
 </section>
diff --git a/nixos/doc/manual/development/running-nixos-tests.xml b/nixos/doc/manual/development/running-nixos-tests.xml
index 7d81be9b1c6..13ae1ed9369 100644
--- a/nixos/doc/manual/development/running-nixos-tests.xml
+++ b/nixos/doc/manual/development/running-nixos-tests.xml
@@ -6,8 +6,11 @@
  <title>Running Tests</title>
 
  <para>
-  You can run tests using <command>nix-build</command>. For example, to run the test <filename
-xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/login.nix">login.nix</filename>, you just do:
+  You can run tests using <command>nix-build</command>. For example, to run the
+  test
+  <filename
+xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/login.nix">login.nix</filename>,
+  you just do:
 <screen>
 <prompt>$ </prompt>nix-build '&lt;nixpkgs/nixos/tests/login.nix>'
 </screen>
@@ -21,7 +24,11 @@ machine: QEMU running (pid 8841)
 …
 6 out of 6 tests succeeded
 </screen>
-  After building/downloading all required dependencies, this will perform a build that starts a QEMU/KVM virtual machine containing a NixOS system. The virtual machine mounts the Nix store of the host; this makes VM creation very fast, as no disk image needs to be created. Afterwards, you can view a pretty-printed log of the test:
+  After building/downloading all required dependencies, this will perform a
+  build that starts a QEMU/KVM virtual machine containing a NixOS system. The
+  virtual machine mounts the Nix store of the host; this makes VM creation very
+  fast, as no disk image needs to be created. Afterwards, you can view a
+  pretty-printed log of the test:
 <screen>
 <prompt>$ </prompt>firefox result/log.html
 </screen>
diff --git a/nixos/doc/manual/development/sources.xml b/nixos/doc/manual/development/sources.xml
index 71441feb1ff..3c30c782746 100644
--- a/nixos/doc/manual/development/sources.xml
+++ b/nixos/doc/manual/development/sources.xml
@@ -5,47 +5,77 @@
         xml:id="sec-getting-sources">
  <title>Getting the Sources</title>
  <para>
-  By default, NixOS’s <command>nixos-rebuild</command> command uses the NixOS and Nixpkgs sources provided by the <literal>nixos</literal> channel (kept in <filename>/nix/var/nix/profiles/per-user/root/channels/nixos</filename>). To modify NixOS, however, you should check out the latest sources from Git. This is as follows:
+  By default, NixOS’s <command>nixos-rebuild</command> command uses the NixOS
+  and Nixpkgs sources provided by the <literal>nixos</literal> channel (kept in
+  <filename>/nix/var/nix/profiles/per-user/root/channels/nixos</filename>). To
+  modify NixOS, however, you should check out the latest sources from Git. This
+  is as follows:
 <screen>
 <prompt>$ </prompt>git clone https://github.com/NixOS/nixpkgs
 <prompt>$ </prompt>cd nixpkgs
 <prompt>$ </prompt>git remote add channels https://github.com/NixOS/nixpkgs-channels
 <prompt>$ </prompt>git remote update channels
 </screen>
-  This will check out the latest Nixpkgs sources to <filename>./nixpkgs</filename> the NixOS sources to <filename>./nixpkgs/nixos</filename>. (The NixOS source tree lives in a subdirectory of the Nixpkgs repository.) The remote <literal>channels</literal> refers to a read-only repository that tracks the Nixpkgs/NixOS channels (see <xref linkend="sec-upgrading"/> for more information about channels). Thus, the Git branch <literal>channels/nixos-17.03</literal> will contain the latest built and tested version available in the <literal>nixos-17.03</literal> channel.
+  This will check out the latest Nixpkgs sources to
+  <filename>./nixpkgs</filename> the NixOS sources to
+  <filename>./nixpkgs/nixos</filename>. (The NixOS source tree lives in a
+  subdirectory of the Nixpkgs repository.) The remote
+  <literal>channels</literal> refers to a read-only repository that tracks the
+  Nixpkgs/NixOS channels (see <xref linkend="sec-upgrading"/> for more
+  information about channels). Thus, the Git branch
+  <literal>channels/nixos-17.03</literal> will contain the latest built and
+  tested version available in the <literal>nixos-17.03</literal> channel.
  </para>
  <para>
-  It’s often inconvenient to develop directly on the master branch, since if somebody has just committed (say) a change to GCC, then the binary cache may not have caught up yet and you’ll have to rebuild everything from source. So you may want to create a local branch based on your current NixOS version:
+  It’s often inconvenient to develop directly on the master branch, since if
+  somebody has just committed (say) a change to GCC, then the binary cache may
+  not have caught up yet and you’ll have to rebuild everything from source.
+  So you may want to create a local branch based on your current NixOS version:
 <screen>
 <prompt>$ </prompt>nixos-version
 17.09pre104379.6e0b727 (Hummingbird)
 
 <prompt>$ </prompt>git checkout -b local 6e0b727
 </screen>
-  Or, to base your local branch on the latest version available in a NixOS channel:
+  Or, to base your local branch on the latest version available in a NixOS
+  channel:
 <screen>
 <prompt>$ </prompt>git remote update channels
 <prompt>$ </prompt>git checkout -b local channels/nixos-17.03
 </screen>
-  (Replace <literal>nixos-17.03</literal> with the name of the channel you want to use.) You can use <command>git merge</command> or <command>git rebase</command> to keep your local branch in sync with the channel, e.g.
+  (Replace <literal>nixos-17.03</literal> with the name of the channel you want
+  to use.) You can use <command>git merge</command> or <command>git
+  rebase</command> to keep your local branch in sync with the channel, e.g.
 <screen>
 <prompt>$ </prompt>git remote update channels
 <prompt>$ </prompt>git merge channels/nixos-17.03
 </screen>
-  You can use <command>git cherry-pick</command> to copy commits from your local branch to the upstream branch.
+  You can use <command>git cherry-pick</command> to copy commits from your
+  local branch to the upstream branch.
  </para>
  <para>
-  If you want to rebuild your system using your (modified) sources, you need to tell <command>nixos-rebuild</command> about them using the <option>-I</option> flag:
+  If you want to rebuild your system using your (modified) sources, you need to
+  tell <command>nixos-rebuild</command> about them using the
+  <option>-I</option> flag:
 <screen>
 <prompt># </prompt>nixos-rebuild switch -I nixpkgs=<replaceable>/my/sources</replaceable>/nixpkgs
 </screen>
  </para>
  <para>
-  If you want <command>nix-env</command> to use the expressions in <replaceable>/my/sources</replaceable>, use <command>nix-env -f <replaceable>/my/sources</replaceable>/nixpkgs</command>, or change the default by adding a symlink in <filename>~/.nix-defexpr</filename>:
+  If you want <command>nix-env</command> to use the expressions in
+  <replaceable>/my/sources</replaceable>, use <command>nix-env -f
+  <replaceable>/my/sources</replaceable>/nixpkgs</command>, or change the
+  default by adding a symlink in <filename>~/.nix-defexpr</filename>:
 <screen>
 <prompt>$ </prompt>ln -s <replaceable>/my/sources</replaceable>/nixpkgs ~/.nix-defexpr/nixpkgs
 </screen>
-  You may want to delete the symlink <filename>~/.nix-defexpr/channels_root</filename> to prevent root’s NixOS channel from clashing with your own tree (this may break the command-not-found utility though). If you want to go back to the default state, you may just remove the <filename>~/.nix-defexpr</filename> directory completely, log out and log in again and it should have been recreated with a link to the root channels.
+  You may want to delete the symlink
+  <filename>~/.nix-defexpr/channels_root</filename> to prevent root’s NixOS
+  channel from clashing with your own tree (this may break the
+  command-not-found utility though). If you want to go back to the default
+  state, you may just remove the <filename>~/.nix-defexpr</filename> directory
+  completely, log out and log in again and it should have been recreated with a
+  link to the root channels.
  </para>
 <!-- FIXME: not sure what this means.
 <para>You should not pass the base directory
diff --git a/nixos/doc/manual/development/testing-installer.xml b/nixos/doc/manual/development/testing-installer.xml
index e1185e0926a..902f995fbc1 100644
--- a/nixos/doc/manual/development/testing-installer.xml
+++ b/nixos/doc/manual/development/testing-installer.xml
@@ -5,13 +5,15 @@
         xml:id="ch-testing-installer">
  <title>Testing the Installer</title>
  <para>
-  Building, burning, and booting from an installation CD is rather tedious, so here is a quick way to see if the installer works properly:
+  Building, burning, and booting from an installation CD is rather tedious, so
+  here is a quick way to see if the installer works properly:
 <screen>
 <prompt># </prompt>mount -t tmpfs none /mnt
 <prompt># </prompt>nixos-generate-config --root /mnt
 <prompt>$ </prompt>nix-build '&lt;nixpkgs/nixos>' -A config.system.build.nixos-install
 <prompt># </prompt>./result/bin/nixos-install</screen>
-  To start a login shell in the new NixOS installation in <filename>/mnt</filename>:
+  To start a login shell in the new NixOS installation in
+  <filename>/mnt</filename>:
 <screen>
 <prompt>$ </prompt>nix-build '&lt;nixpkgs/nixos>' -A config.system.build.nixos-enter
 <prompt># </prompt>./result/bin/nixos-enter
diff --git a/nixos/doc/manual/development/writing-documentation.xml b/nixos/doc/manual/development/writing-documentation.xml
index ffefa208f66..2183937ad0d 100644
--- a/nixos/doc/manual/development/writing-documentation.xml
+++ b/nixos/doc/manual/development/writing-documentation.xml
@@ -5,13 +5,18 @@
         xml:id="sec-writing-documentation">
  <title>Writing NixOS Documentation</title>
  <para>
-  As NixOS grows, so too does the need for a catalogue and explanation of its extensive functionality. Collecting pertinent information from disparate sources and presenting it in an accessible style would be a worthy contribution to the project.
+  As NixOS grows, so too does the need for a catalogue and explanation of its
+  extensive functionality. Collecting pertinent information from disparate
+  sources and presenting it in an accessible style would be a worthy
+  contribution to the project.
  </para>
  <section xml:id="sec-writing-docs-building-the-manual">
   <title>Building the Manual</title>
 
   <para>
-   The DocBook sources of the <xref linkend="book-nixos-manual"/> are in the <link xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/doc/manual"><filename>nixos/doc/manual</filename></link> subdirectory of the Nixpkgs repository.
+   The DocBook sources of the <xref linkend="book-nixos-manual"/> are in the
+   <link xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/doc/manual"><filename>nixos/doc/manual</filename></link>
+   subdirectory of the Nixpkgs repository.
   </para>
 
   <para>
@@ -24,45 +29,59 @@
 </screen>
 
   <para>
-   Once you are done making modifications to the manual, it's important to build it before committing. You can do that as follows:
+   Once you are done making modifications to the manual, it's important to
+   build it before committing. You can do that as follows:
   </para>
 
 <screen>nix-build nixos/release.nix -A manual.x86_64-linux</screen>
 
   <para>
-   When this command successfully finishes, it will tell you where the manual got generated. The HTML will be accessible through the <filename>result</filename> symlink at <filename>./result/share/doc/nixos/index.html</filename>.
+   When this command successfully finishes, it will tell you where the manual
+   got generated. The HTML will be accessible through the
+   <filename>result</filename> symlink at
+   <filename>./result/share/doc/nixos/index.html</filename>.
   </para>
  </section>
  <section xml:id="sec-writing-docs-editing-docbook-xml">
   <title>Editing DocBook XML</title>
 
   <para>
-   For general information on how to write in DocBook, see <link xlink:href="http://www.docbook.org/tdg5/en/html/docbook.html"> DocBook 5: The Definitive Guide</link>.
+   For general information on how to write in DocBook, see
+   <link xlink:href="http://www.docbook.org/tdg5/en/html/docbook.html"> DocBook
+   5: The Definitive Guide</link>.
   </para>
 
   <para>
-   Emacs nXML Mode is very helpful for editing DocBook XML because it validates the document as you write, and precisely locates errors. To use it, see <xref linkend="sec-emacs-docbook-xml"/>.
+   Emacs nXML Mode is very helpful for editing DocBook XML because it validates
+   the document as you write, and precisely locates errors. To use it, see
+   <xref linkend="sec-emacs-docbook-xml"/>.
   </para>
 
   <para>
-   <link xlink:href="http://pandoc.org">Pandoc</link> can generate DocBook XML from a multitude of formats, which makes a good starting point.
+   <link xlink:href="http://pandoc.org">Pandoc</link> can generate DocBook XML
+   from a multitude of formats, which makes a good starting point.
    <example xml:id="ex-pandoc-xml-conv">
     <title>Pandoc invocation to convert GitHub-Flavoured MarkDown to DocBook 5 XML</title>
 <screen>pandoc -f markdown_github -t docbook5 docs.md -o my-section.md</screen>
    </example>
-   Pandoc can also quickly convert a single <filename>section.xml</filename> to HTML, which is helpful when drafting.
+   Pandoc can also quickly convert a single <filename>section.xml</filename> to
+   HTML, which is helpful when drafting.
   </para>
 
   <para>
-   Sometimes writing valid DocBook is simply too difficult. In this case, submit your documentation updates in a <link
-  xlink:href="https://github.com/NixOS/nixpkgs/issues/new">GitHub Issue</link> and someone will handle the conversion to XML for you.
+   Sometimes writing valid DocBook is simply too difficult. In this case,
+   submit your documentation updates in a
+   <link
+  xlink:href="https://github.com/NixOS/nixpkgs/issues/new">GitHub
+   Issue</link> and someone will handle the conversion to XML for you.
   </para>
  </section>
  <section xml:id="sec-writing-docs-creating-a-topic">
   <title>Creating a Topic</title>
 
   <para>
-   You can use an existing topic as a basis for the new topic or create a topic from scratch.
+   You can use an existing topic as a basis for the new topic or create a topic
+   from scratch.
   </para>
 
   <para>
@@ -70,27 +89,40 @@
    <itemizedlist>
     <listitem>
      <para>
-      The NixOS <link xlink:href="http://www.docbook.org/tdg5/en/html/book.html"><tag>book</tag></link> element is in <filename>nixos/doc/manual/manual.xml</filename>. It includes several <link xlink:href="http://www.docbook.org/tdg5/en/html/book.html"><tag>part</tag>s</link> which are in subdirectories.
+      The NixOS
+      <link xlink:href="http://www.docbook.org/tdg5/en/html/book.html"><tag>book</tag></link>
+      element is in <filename>nixos/doc/manual/manual.xml</filename>. It
+      includes several
+      <link xlink:href="http://www.docbook.org/tdg5/en/html/book.html"><tag>part</tag>s</link>
+      which are in subdirectories.
      </para>
     </listitem>
     <listitem>
      <para>
-      Store the topic file in the same directory as the <tag>part</tag> to which it belongs. If your topic is about configuring a NixOS module, then the XML file can be stored alongside the module definition <filename>nix</filename> file.
+      Store the topic file in the same directory as the <tag>part</tag> to
+      which it belongs. If your topic is about configuring a NixOS module, then
+      the XML file can be stored alongside the module definition
+      <filename>nix</filename> file.
      </para>
     </listitem>
     <listitem>
      <para>
-      If you include multiple words in the file name, separate the words with a dash. For example: <filename>ipv6-config.xml</filename>.
+      If you include multiple words in the file name, separate the words with a
+      dash. For example: <filename>ipv6-config.xml</filename>.
      </para>
     </listitem>
     <listitem>
      <para>
-      Make sure that the <tag>xml:id</tag> value is unique. You can use abbreviations if the ID is too long. For example: <varname>nixos-config</varname>.
+      Make sure that the <tag>xml:id</tag> value is unique. You can use
+      abbreviations if the ID is too long. For example:
+      <varname>nixos-config</varname>.
      </para>
     </listitem>
     <listitem>
      <para>
-      Determine whether your topic is a chapter or a section. If you are unsure, open an existing topic file and check whether the main element is chapter or section.
+      Determine whether your topic is a chapter or a section. If you are
+      unsure, open an existing topic file and check whether the main element is
+      chapter or section.
      </para>
     </listitem>
    </itemizedlist>
@@ -100,11 +132,17 @@
   <title>Adding a Topic to the Book</title>
 
   <para>
-   Open the parent XML file and add an <varname>xi:include</varname> element to the list of chapters with the file name of the topic that you created. If you created a <tag>section</tag>, you add the file to the <tag>chapter</tag> file. If you created a <tag>chapter</tag>, you add the file to the <tag>part</tag> file.
+   Open the parent XML file and add an <varname>xi:include</varname> element to
+   the list of chapters with the file name of the topic that you created. If
+   you created a <tag>section</tag>, you add the file to the <tag>chapter</tag>
+   file. If you created a <tag>chapter</tag>, you add the file to the
+   <tag>part</tag> file.
   </para>
 
   <para>
-   If the topic is about configuring a NixOS module, it can be automatically included in the manual by using the <varname>meta.doc</varname> attribute. See <xref
+   If the topic is about configuring a NixOS module, it can be automatically
+   included in the manual by using the <varname>meta.doc</varname> attribute.
+   See <xref
   linkend="sec-meta-attributes"/> for an explanation.
   </para>
  </section>
diff --git a/nixos/doc/manual/development/writing-modules.xml b/nixos/doc/manual/development/writing-modules.xml
index 18088040bd6..bbf793bb0be 100644
--- a/nixos/doc/manual/development/writing-modules.xml
+++ b/nixos/doc/manual/development/writing-modules.xml
@@ -5,25 +5,49 @@
         xml:id="sec-writing-modules">
  <title>Writing NixOS Modules</title>
  <para>
-  NixOS has a modular system for declarative configuration. This system combines multiple <emphasis>modules</emphasis> to produce the full system configuration. One of the modules that constitute the configuration is <filename>/etc/nixos/configuration.nix</filename>. Most of the others live in the <link
-xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/modules"><filename>nixos/modules</filename></link> subdirectory of the Nixpkgs tree.
+  NixOS has a modular system for declarative configuration. This system
+  combines multiple <emphasis>modules</emphasis> to produce the full system
+  configuration. One of the modules that constitute the configuration is
+  <filename>/etc/nixos/configuration.nix</filename>. Most of the others live in
+  the
+  <link
+xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/modules"><filename>nixos/modules</filename></link>
+  subdirectory of the Nixpkgs tree.
  </para>
  <para>
-  Each NixOS module is a file that handles one logical aspect of the configuration, such as a specific kind of hardware, a service, or network settings. A module configuration does not have to handle everything from scratch; it can use the functionality provided by other modules for its implementation. Thus a module can <emphasis>declare</emphasis> options that can be used by other modules, and conversely can <emphasis>define</emphasis> options provided by other modules in its own implementation. For example, the module <link
-xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/security/pam.nix"><filename>pam.nix</filename></link> declares the option <option>security.pam.services</option> that allows other modules (e.g. <link
-xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/services/networking/ssh/sshd.nix"><filename>sshd.nix</filename></link>) to define PAM services; and it defines the option <option>environment.etc</option> (declared by <link
-xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/system/etc/etc.nix"><filename>etc.nix</filename></link>) to cause files to be created in <filename>/etc/pam.d</filename>.
+  Each NixOS module is a file that handles one logical aspect of the
+  configuration, such as a specific kind of hardware, a service, or network
+  settings. A module configuration does not have to handle everything from
+  scratch; it can use the functionality provided by other modules for its
+  implementation. Thus a module can <emphasis>declare</emphasis> options that
+  can be used by other modules, and conversely can <emphasis>define</emphasis>
+  options provided by other modules in its own implementation. For example, the
+  module
+  <link
+xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/security/pam.nix"><filename>pam.nix</filename></link>
+  declares the option <option>security.pam.services</option> that allows other
+  modules (e.g.
+  <link
+xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/services/networking/ssh/sshd.nix"><filename>sshd.nix</filename></link>)
+  to define PAM services; and it defines the option
+  <option>environment.etc</option> (declared by
+  <link
+xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/system/etc/etc.nix"><filename>etc.nix</filename></link>)
+  to cause files to be created in <filename>/etc/pam.d</filename>.
  </para>
  <para xml:id="para-module-syn">
   In <xref
-linkend="sec-configuration-syntax"/>, we saw the following structure of NixOS modules:
+linkend="sec-configuration-syntax"/>, we saw the following structure
+  of NixOS modules:
 <programlisting>
 { config, pkgs, ... }:
 
 { <replaceable>option definitions</replaceable>
 }
 </programlisting>
-  This is actually an <emphasis>abbreviated</emphasis> form of module that only defines options, but does not declare any. The structure of full NixOS modules is shown in <xref linkend='ex-module-syntax' />.
+  This is actually an <emphasis>abbreviated</emphasis> form of module that only
+  defines options, but does not declare any. The structure of full NixOS
+  modules is shown in <xref linkend='ex-module-syntax' />.
  </para>
  <example xml:id='ex-module-syntax'>
   <title>Structure of NixOS Modules</title>
@@ -49,28 +73,47 @@ linkend="sec-configuration-syntax"/>, we saw the following structure of NixOS mo
   <calloutlist>
    <callout arearefs='module-syntax-1'>
     <para>
-     This line makes the current Nix expression a function. The variable <varname>pkgs</varname> contains Nixpkgs, while <varname>config</varname> contains the full system configuration. This line can be omitted if there is no reference to <varname>pkgs</varname> and <varname>config</varname> inside the module.
+     This line makes the current Nix expression a function. The variable
+     <varname>pkgs</varname> contains Nixpkgs, while <varname>config</varname>
+     contains the full system configuration. This line can be omitted if there
+     is no reference to <varname>pkgs</varname> and <varname>config</varname>
+     inside the module.
     </para>
    </callout>
    <callout arearefs='module-syntax-2'>
     <para>
-     This list enumerates the paths to other NixOS modules that should be included in the evaluation of the system configuration. A default set of modules is defined in the file <filename>modules/module-list.nix</filename>. These don't need to be added in the import list.
+     This list enumerates the paths to other NixOS modules that should be
+     included in the evaluation of the system configuration. A default set of
+     modules is defined in the file
+     <filename>modules/module-list.nix</filename>. These don't need to be added
+     in the import list.
     </para>
    </callout>
    <callout arearefs='module-syntax-3'>
     <para>
-     The attribute <varname>options</varname> is a nested set of <emphasis>option declarations</emphasis> (described below).
+     The attribute <varname>options</varname> is a nested set of
+     <emphasis>option declarations</emphasis> (described below).
     </para>
    </callout>
    <callout arearefs='module-syntax-4'>
     <para>
-     The attribute <varname>config</varname> is a nested set of <emphasis>option definitions</emphasis> (also described below).
+     The attribute <varname>config</varname> is a nested set of
+     <emphasis>option definitions</emphasis> (also described below).
     </para>
    </callout>
   </calloutlist>
  </para>
  <para>
-  <xref linkend='locate-example' /> shows a module that handles the regular update of the “locate” database, an index of all files in the file system. This module declares two options that can be defined by other modules (typically the user’s <filename>configuration.nix</filename>): <option>services.locate.enable</option> (whether the database should be updated) and <option>services.locate.interval</option> (when the update should be done). It implements its functionality by defining two options declared by other modules: <option>systemd.services</option> (the set of all systemd services) and <option>systemd.timers</option> (the list of commands to be executed periodically by <command>systemd</command>).
+  <xref linkend='locate-example' /> shows a module that handles the regular
+  update of the “locate” database, an index of all files in the file
+  system. This module declares two options that can be defined by other modules
+  (typically the user’s <filename>configuration.nix</filename>):
+  <option>services.locate.enable</option> (whether the database should be
+  updated) and <option>services.locate.interval</option> (when the update
+  should be done). It implements its functionality by defining two options
+  declared by other modules: <option>systemd.services</option> (the set of all
+  systemd services) and <option>systemd.timers</option> (the list of commands
+  to be executed periodically by <command>systemd</command>).
  </para>
  <example xml:id='locate-example'>
   <title>NixOS Module for the “locate” Service</title>
diff --git a/nixos/doc/manual/development/writing-nixos-tests.xml b/nixos/doc/manual/development/writing-nixos-tests.xml
index 5df60e2ec82..6be2d0a4d23 100644
--- a/nixos/doc/manual/development/writing-nixos-tests.xml
+++ b/nixos/doc/manual/development/writing-nixos-tests.xml
@@ -31,9 +31,22 @@ import ./make-test.nix {
     '';
 }
 </programlisting>
-  The attribute <literal>testScript</literal> is a bit of Perl code that executes the test (described below). During the test, it will start one or more virtual machines, the configuration of which is described by the attribute <literal>machine</literal> (if you need only one machine in your test) or by the attribute <literal>nodes</literal> (if you need multiple machines). For instance, <filename
-xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/login.nix">login.nix</filename> only needs a single machine to test whether users can log in on the virtual console, whether device ownership is correctly maintained when switching between consoles, and so on. On the other hand, <filename
-xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/nfs.nix">nfs.nix</filename>, which tests NFS client and server functionality in the Linux kernel (including whether locks are maintained across server crashes), requires three machines: a server and two clients.
+  The attribute <literal>testScript</literal> is a bit of Perl code that
+  executes the test (described below). During the test, it will start one or
+  more virtual machines, the configuration of which is described by the
+  attribute <literal>machine</literal> (if you need only one machine in your
+  test) or by the attribute <literal>nodes</literal> (if you need multiple
+  machines). For instance,
+  <filename
+xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/login.nix">login.nix</filename>
+  only needs a single machine to test whether users can log in on the virtual
+  console, whether device ownership is correctly maintained when switching
+  between consoles, and so on. On the other hand,
+  <filename
+xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/nfs.nix">nfs.nix</filename>,
+  which tests NFS client and server functionality in the Linux kernel
+  (including whether locks are maintained across server crashes), requires
+  three machines: a server and two clients.
  </para>
 
  <para>
@@ -56,8 +69,10 @@ xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/nfs.nix">nf
     </term>
     <listitem>
      <para>
-      The virtual networks to which the VM is connected. See <filename
-    xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/nat.nix">nat.nix</filename> for an example.
+      The virtual networks to which the VM is connected. See
+      <filename
+    xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/nat.nix">nat.nix</filename>
+      for an example.
      </para>
     </listitem>
    </varlistentry>
@@ -67,23 +82,38 @@ xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/nfs.nix">nf
     </term>
     <listitem>
      <para>
-      By default, the Nix store in the VM is not writable. If you enable this option, a writable union file system is mounted on top of the Nix store to make it appear writable. This is necessary for tests that run Nix operations that modify the store.
+      By default, the Nix store in the VM is not writable. If you enable this
+      option, a writable union file system is mounted on top of the Nix store
+      to make it appear writable. This is necessary for tests that run Nix
+      operations that modify the store.
      </para>
     </listitem>
    </varlistentry>
   </variablelist>
-  For more options, see the module <filename
+  For more options, see the module
+  <filename
 xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/virtualisation/qemu-vm.nix">qemu-vm.nix</filename>.
  </para>
 
  <para>
-  The test script is a sequence of Perl statements that perform various actions, such as starting VMs, executing commands in the VMs, and so on. Each virtual machine is represented as an object stored in the variable <literal>$<replaceable>name</replaceable></literal>, where <replaceable>name</replaceable> is the identifier of the machine (which is just <literal>machine</literal> if you didn’t specify multiple machines using the <literal>nodes</literal> attribute). For instance, the following starts the machine, waits until it has finished booting, then executes a command and checks that the output is more-or-less correct:
+  The test script is a sequence of Perl statements that perform various
+  actions, such as starting VMs, executing commands in the VMs, and so on. Each
+  virtual machine is represented as an object stored in the variable
+  <literal>$<replaceable>name</replaceable></literal>, where
+  <replaceable>name</replaceable> is the identifier of the machine (which is
+  just <literal>machine</literal> if you didn’t specify multiple machines
+  using the <literal>nodes</literal> attribute). For instance, the following
+  starts the machine, waits until it has finished booting, then executes a
+  command and checks that the output is more-or-less correct:
 <programlisting>
 $machine->start;
 $machine->waitForUnit("default.target");
 $machine->succeed("uname") =~ /Linux/ or die;
 </programlisting>
-  The first line is actually unnecessary; machines are implicitly started when you first execute an action on them (such as <literal>waitForUnit</literal> or <literal>succeed</literal>). If you have multiple machines, you can speed up the test by starting them in parallel:
+  The first line is actually unnecessary; machines are implicitly started when
+  you first execute an action on them (such as <literal>waitForUnit</literal>
+  or <literal>succeed</literal>). If you have multiple machines, you can speed
+  up the test by starting them in parallel:
 <programlisting>
 startAll;
 </programlisting>
@@ -98,7 +128,8 @@ startAll;
     </term>
     <listitem>
      <para>
-      Start the virtual machine. This method is asynchronous — it does not wait for the machine to finish booting.
+      Start the virtual machine. This method is asynchronous — it does not
+      wait for the machine to finish booting.
      </para>
     </listitem>
    </varlistentry>
@@ -128,7 +159,8 @@ startAll;
     </term>
     <listitem>
      <para>
-      Simulate unplugging the Ethernet cable that connects the machine to the other machines.
+      Simulate unplugging the Ethernet cable that connects the machine to the
+      other machines.
      </para>
     </listitem>
    </varlistentry>
@@ -148,7 +180,8 @@ startAll;
     </term>
     <listitem>
      <para>
-      Take a picture of the display of the virtual machine, in PNG format. The screenshot is linked from the HTML log.
+      Take a picture of the display of the virtual machine, in PNG format. The
+      screenshot is linked from the HTML log.
      </para>
     </listitem>
    </varlistentry>
@@ -158,11 +191,13 @@ startAll;
     </term>
     <listitem>
      <para>
-      Return a textual representation of what is currently visible on the machine's screen using optical character recognition.
+      Return a textual representation of what is currently visible on the
+      machine's screen using optical character recognition.
      </para>
      <note>
       <para>
-       This requires passing <option>enableOCR</option> to the test attribute set.
+       This requires passing <option>enableOCR</option> to the test attribute
+       set.
       </para>
      </note>
     </listitem>
@@ -173,7 +208,8 @@ startAll;
     </term>
     <listitem>
      <para>
-      Send a command to the QEMU monitor. This is rarely used, but allows doing stuff such as attaching virtual USB disks to a running machine.
+      Send a command to the QEMU monitor. This is rarely used, but allows doing
+      stuff such as attaching virtual USB disks to a running machine.
      </para>
     </listitem>
    </varlistentry>
@@ -183,7 +219,8 @@ startAll;
     </term>
     <listitem>
      <para>
-      Simulate pressing keys on the virtual keyboard, e.g., <literal>sendKeys("ctrl-alt-delete")</literal>.
+      Simulate pressing keys on the virtual keyboard, e.g.,
+      <literal>sendKeys("ctrl-alt-delete")</literal>.
      </para>
     </listitem>
    </varlistentry>
@@ -193,7 +230,9 @@ startAll;
     </term>
     <listitem>
      <para>
-      Simulate typing a sequence of characters on the virtual keyboard, e.g., <literal>sendKeys("foobar\n")</literal> will type the string <literal>foobar</literal> followed by the Enter key.
+      Simulate typing a sequence of characters on the virtual keyboard, e.g.,
+      <literal>sendKeys("foobar\n")</literal> will type the string
+      <literal>foobar</literal> followed by the Enter key.
      </para>
     </listitem>
    </varlistentry>
@@ -203,7 +242,9 @@ startAll;
     </term>
     <listitem>
      <para>
-      Execute a shell command, returning a list <literal>(<replaceable>status</replaceable>, <replaceable>stdout</replaceable>)</literal>.
+      Execute a shell command, returning a list
+      <literal>(<replaceable>status</replaceable>,
+      <replaceable>stdout</replaceable>)</literal>.
      </para>
     </listitem>
    </varlistentry>
@@ -213,7 +254,8 @@ startAll;
     </term>
     <listitem>
      <para>
-      Execute a shell command, raising an exception if the exit status is not zero, otherwise returning the standard output.
+      Execute a shell command, raising an exception if the exit status is not
+      zero, otherwise returning the standard output.
      </para>
     </listitem>
    </varlistentry>
@@ -223,7 +265,8 @@ startAll;
     </term>
     <listitem>
      <para>
-      Like <methodname>succeed</methodname>, but raising an exception if the command returns a zero status.
+      Like <methodname>succeed</methodname>, but raising an exception if the
+      command returns a zero status.
      </para>
     </listitem>
    </varlistentry>
@@ -273,7 +316,8 @@ startAll;
     </term>
     <listitem>
      <para>
-      Wait until a process is listening on the given TCP port (on <literal>localhost</literal>, at least).
+      Wait until a process is listening on the given TCP port (on
+      <literal>localhost</literal>, at least).
      </para>
     </listitem>
    </varlistentry>
@@ -303,11 +347,14 @@ startAll;
     </term>
     <listitem>
      <para>
-      Wait until the supplied regular expressions matches the textual contents of the screen by using optical character recognition (see <methodname>getScreenText</methodname>).
+      Wait until the supplied regular expressions matches the textual contents
+      of the screen by using optical character recognition (see
+      <methodname>getScreenText</methodname>).
      </para>
      <note>
       <para>
-       This requires passing <option>enableOCR</option> to the test attribute set.
+       This requires passing <option>enableOCR</option> to the test attribute
+       set.
       </para>
      </note>
     </listitem>
@@ -318,7 +365,8 @@ startAll;
     </term>
     <listitem>
      <para>
-      Wait until an X11 window has appeared whose name matches the given regular expression, e.g., <literal>waitForWindow(qr/Terminal/)</literal>.
+      Wait until an X11 window has appeared whose name matches the given
+      regular expression, e.g., <literal>waitForWindow(qr/Terminal/)</literal>.
      </para>
     </listitem>
    </varlistentry>
@@ -328,10 +376,13 @@ startAll;
     </term>
     <listitem>
      <para>
-      Copies a file from host to machine, e.g., <literal>copyFileFromHost("myfile", "/etc/my/important/file")</literal>.
+      Copies a file from host to machine, e.g.,
+      <literal>copyFileFromHost("myfile", "/etc/my/important/file")</literal>.
      </para>
      <para>
-      The first argument is the file on the host. The file needs to be accessible while building the nix derivation. The second argument is the location of the file on the machine.
+      The first argument is the file on the host. The file needs to be
+      accessible while building the nix derivation. The second argument is the
+      location of the file on the machine.
      </para>
     </listitem>
    </varlistentry>
@@ -341,7 +392,8 @@ startAll;
     </term>
     <listitem>
      <para>
-      Runs <literal>systemctl</literal> commands with optional support for <literal>systemctl --user</literal>
+      Runs <literal>systemctl</literal> commands with optional support for
+      <literal>systemctl --user</literal>
      </para>
      <para>
 <programlisting>
@@ -355,12 +407,15 @@ $machine->systemctl("list-jobs --no-pager", "any-user"); // spawns a shell for `
  </para>
 
  <para>
-  To test user units declared by <literal>systemd.user.services</literal> the optional <literal>$user</literal> argument can be used:
+  To test user units declared by <literal>systemd.user.services</literal> the
+  optional <literal>$user</literal> argument can be used:
 <programlisting>
 $machine->start;
 $machine->waitForX;
 $machine->waitForUnit("xautolock.service", "x-session-user");
 </programlisting>
-  This applies to <literal>systemctl</literal>, <literal>getUnitInfo</literal>, <literal>waitForUnit</literal>, <literal>startJob</literal> and <literal>stopJob</literal>.
+  This applies to <literal>systemctl</literal>, <literal>getUnitInfo</literal>,
+  <literal>waitForUnit</literal>, <literal>startJob</literal> and
+  <literal>stopJob</literal>.
  </para>
 </section>
diff --git a/nixos/doc/manual/installation/changing-config.xml b/nixos/doc/manual/installation/changing-config.xml
index 65b384dd596..48193d986ab 100644
--- a/nixos/doc/manual/installation/changing-config.xml
+++ b/nixos/doc/manual/installation/changing-config.xml
@@ -4,20 +4,28 @@
          xml:id="sec-changing-config">
  <title>Changing the Configuration</title>
  <para>
-  The file <filename>/etc/nixos/configuration.nix</filename> contains the current configuration of your machine. Whenever you’ve <link linkend="ch-configuration">changed something</link> in that file, you should do
+  The file <filename>/etc/nixos/configuration.nix</filename> contains the
+  current configuration of your machine. Whenever you’ve
+  <link linkend="ch-configuration">changed something</link> in that file, you
+  should do
 <screen>
 <prompt># </prompt>nixos-rebuild switch
 </screen>
-  to build the new configuration, make it the default configuration for booting, and try to realise the configuration in the running system (e.g., by restarting system services).
+  to build the new configuration, make it the default configuration for
+  booting, and try to realise the configuration in the running system (e.g., by
+  restarting system services).
   <warning>
    <para>
-    This command doesn't start/stop <link linkend="opt-systemd.user.services">user services</link> automatically. <command>nixos-rebuild</command> only runs a <literal>daemon-reload</literal> for each user with running user services.
+    This command doesn't start/stop <link linkend="opt-systemd.user.services">user
+    services</link> automatically. <command>nixos-rebuild</command> only runs a
+    <literal>daemon-reload</literal> for each user with running user services.
    </para>
   </warning>
  </para>
  <warning>
   <para>
-   These commands must be executed as root, so you should either run them from a root shell or by prefixing them with <literal>sudo -i</literal>.
+   These commands must be executed as root, so you should either run them from
+   a root shell or by prefixing them with <literal>sudo -i</literal>.
   </para>
  </warning>
  <para>
@@ -25,44 +33,63 @@
 <screen>
 <prompt># </prompt>nixos-rebuild test
 </screen>
-  to build the configuration and switch the running system to it, but without making it the boot default. So if (say) the configuration locks up your machine, you can just reboot to get back to a working configuration.
+  to build the configuration and switch the running system to it, but without
+  making it the boot default. So if (say) the configuration locks up your
+  machine, you can just reboot to get back to a working configuration.
  </para>
  <para>
   There is also
 <screen>
 <prompt># </prompt>nixos-rebuild boot
 </screen>
-  to build the configuration and make it the boot default, but not switch to it now (so it will only take effect after the next reboot).
+  to build the configuration and make it the boot default, but not switch to it
+  now (so it will only take effect after the next reboot).
  </para>
  <para>
-  You can make your configuration show up in a different submenu of the GRUB 2 boot screen by giving it a different <emphasis>profile name</emphasis>, e.g.
+  You can make your configuration show up in a different submenu of the GRUB 2
+  boot screen by giving it a different <emphasis>profile name</emphasis>, e.g.
 <screen>
 <prompt># </prompt>nixos-rebuild switch -p test
 </screen>
-  which causes the new configuration (and previous ones created using <literal>-p test</literal>) to show up in the GRUB submenu “NixOS - Profile 'test'”. This can be useful to separate test configurations from “stable” configurations.
+  which causes the new configuration (and previous ones created using
+  <literal>-p test</literal>) to show up in the GRUB submenu “NixOS - Profile
+  'test'”. This can be useful to separate test configurations from
+  “stable” configurations.
  </para>
  <para>
   Finally, you can do
 <screen>
 <prompt>$ </prompt>nixos-rebuild build
 </screen>
-  to build the configuration but nothing more. This is useful to see whether everything compiles cleanly.
+  to build the configuration but nothing more. This is useful to see whether
+  everything compiles cleanly.
  </para>
  <para>
-  If you have a machine that supports hardware virtualisation, you can also test the new configuration in a sandbox by building and running a QEMU <emphasis>virtual machine</emphasis> that contains the desired configuration. Just do
+  If you have a machine that supports hardware virtualisation, you can also
+  test the new configuration in a sandbox by building and running a QEMU
+  <emphasis>virtual machine</emphasis> that contains the desired configuration.
+  Just do
 <screen>
 <prompt>$ </prompt>nixos-rebuild build-vm
 <prompt>$ </prompt>./result/bin/run-*-vm
 </screen>
-  The VM does not have any data from your host system, so your existing user accounts and home directories will not be available unless you have set <literal>mutableUsers = false</literal>. Another way is to temporarily add the following to your configuration:
+  The VM does not have any data from your host system, so your existing user
+  accounts and home directories will not be available unless you have set
+  <literal>mutableUsers = false</literal>. Another way is to temporarily add
+  the following to your configuration:
 <screen>
 <link linkend="opt-users.users._name__.initialHashedPassword">users.users.your-user.initialHashedPassword</link> = "test";
 </screen>
-  <emphasis>Important:</emphasis> delete the $hostname.qcow2 file if you have started the virtual machine at least once without the right users, otherwise the changes will not get picked up. You can forward ports on the host to the guest. For instance, the following will forward host port 2222 to guest port 22 (SSH):
+  <emphasis>Important:</emphasis> delete the $hostname.qcow2 file if you have
+  started the virtual machine at least once without the right users, otherwise
+  the changes will not get picked up. You can forward ports on the host to the
+  guest. For instance, the following will forward host port 2222 to guest port
+  22 (SSH):
 <screen>
 <prompt>$ </prompt>QEMU_NET_OPTS="hostfwd=tcp::2222-:22" ./result/bin/run-*-vm
 </screen>
-  allowing you to log in via SSH (assuming you have set the appropriate passwords or SSH authorized keys):
+  allowing you to log in via SSH (assuming you have set the appropriate
+  passwords or SSH authorized keys):
 <screen>
 <prompt>$ </prompt>ssh -p 2222 localhost
 </screen>
diff --git a/nixos/doc/manual/installation/installation.xml b/nixos/doc/manual/installation/installation.xml
index a9d2c74d115..2901f462dee 100644
--- a/nixos/doc/manual/installation/installation.xml
+++ b/nixos/doc/manual/installation/installation.xml
@@ -6,7 +6,8 @@
  <title>Installation</title>
  <partintro xml:id="ch-installation-intro">
   <para>
-   This section describes how to obtain, install, and configure NixOS for first-time use.
+   This section describes how to obtain, install, and configure NixOS for
+   first-time use.
   </para>
  </partintro>
  <xi:include href="obtaining.xml" />
diff --git a/nixos/doc/manual/installation/installing-behind-a-proxy.xml b/nixos/doc/manual/installation/installing-behind-a-proxy.xml
index 4f74f0b3029..8f9baff44b5 100644
--- a/nixos/doc/manual/installation/installing-behind-a-proxy.xml
+++ b/nixos/doc/manual/installation/installing-behind-a-proxy.xml
@@ -6,13 +6,16 @@
  <title>Installing behind a proxy</title>
 
  <para>
-  To install NixOS behind a proxy, do the following before running <literal>nixos-install</literal>.
+  To install NixOS behind a proxy, do the following before running
+  <literal>nixos-install</literal>.
  </para>
 
  <orderedlist numeration="arabic">
   <listitem>
    <para>
-    Update proxy configuration in <literal>/mnt/etc/nixos/configuration.nix</literal> to keep the internet accessible after reboot.
+    Update proxy configuration in
+    <literal>/mnt/etc/nixos/configuration.nix</literal> to keep the internet
+    accessible after reboot.
    </para>
 <programlisting>
 networking.proxy.default = &quot;http://user:password@proxy:port/&quot;;
@@ -21,7 +24,8 @@ networking.proxy.noProxy = &quot;127.0.0.1,localhost,internal.domain&quot;;
   </listitem>
   <listitem>
    <para>
-    Setup the proxy environment variables in the shell where you are running <literal>nixos-install</literal>.
+    Setup the proxy environment variables in the shell where you are running
+    <literal>nixos-install</literal>.
    </para>
 <programlisting>
 # proxy_url=&quot;http://user:password@proxy:port/&quot;
@@ -35,7 +39,10 @@ networking.proxy.noProxy = &quot;127.0.0.1,localhost,internal.domain&quot;;
 
  <note>
   <para>
-   If you are switching networks with different proxy configurations, use the <literal>nesting.clone</literal> option in <literal>configuration.nix</literal> to switch proxies at runtime. Refer to <xref linkend="ch-options" /> for more information.
+   If you are switching networks with different proxy configurations, use the
+   <literal>nesting.clone</literal> option in
+   <literal>configuration.nix</literal> to switch proxies at runtime. Refer to
+   <xref linkend="ch-options" /> for more information.
   </para>
  </note>
 </section>
diff --git a/nixos/doc/manual/installation/installing-from-other-distro.xml b/nixos/doc/manual/installation/installing-from-other-distro.xml
index 468757ed60b..8ed45899fd7 100644
--- a/nixos/doc/manual/installation/installing-from-other-distro.xml
+++ b/nixos/doc/manual/installation/installing-from-other-distro.xml
@@ -8,23 +8,28 @@
  <title>Installing from another Linux distribution</title>
 
  <para>
-  Because Nix (the package manager) &amp; Nixpkgs (the Nix packages collection) can both be installed on any (most?) Linux distributions, they can be used to install NixOS in various creative ways. You can, for instance:
+  Because Nix (the package manager) &amp; Nixpkgs (the Nix packages collection)
+  can both be installed on any (most?) Linux distributions, they can be used to
+  install NixOS in various creative ways. You can, for instance:
  </para>
 
  <orderedlist>
   <listitem>
    <para>
-    Install NixOS on another partition, from your existing Linux distribution (without the use of a USB or optical device!)
+    Install NixOS on another partition, from your existing Linux distribution
+    (without the use of a USB or optical device!)
    </para>
   </listitem>
   <listitem>
    <para>
-    Install NixOS on the same partition (in place!), from your existing non-NixOS Linux distribution using <literal>NIXOS_LUSTRATE</literal>.
+    Install NixOS on the same partition (in place!), from your existing
+    non-NixOS Linux distribution using <literal>NIXOS_LUSTRATE</literal>.
    </para>
   </listitem>
   <listitem>
    <para>
-    Install NixOS on your hard drive from the Live CD of any Linux distribution.
+    Install NixOS on your hard drive from the Live CD of any Linux
+    distribution.
    </para>
   </listitem>
  </orderedlist>
@@ -45,8 +50,10 @@
 <prompt>$ </prompt>curl https://nixos.org/nix/install | sh
 <prompt>$ </prompt>. $HOME/.nix-profile/etc/profile.d/nix.sh # …or open a fresh shell</screen>
    <para>
-    More details in the <link
-                    xlink:href="https://nixos.org/nix/manual/#chap-quick-start"> Nix manual</link>
+    More details in the
+    <link
+                    xlink:href="https://nixos.org/nix/manual/#chap-quick-start">
+    Nix manual</link>
    </para>
   </listitem>
   <listitem>
@@ -54,18 +61,21 @@
     Switch to the NixOS channel:
    </para>
    <para>
-    If you've just installed Nix on a non-NixOS distribution, you will be on the <literal>nixpkgs</literal> channel by default.
+    If you've just installed Nix on a non-NixOS distribution, you will be on
+    the <literal>nixpkgs</literal> channel by default.
    </para>
 <screen>
 <prompt>$ </prompt>nix-channel --list
 nixpkgs https://nixos.org/channels/nixpkgs-unstable</screen>
    <para>
-    As that channel gets released without running the NixOS tests, it will be safer to use the <literal>nixos-*</literal> channels instead:
+    As that channel gets released without running the NixOS tests, it will be
+    safer to use the <literal>nixos-*</literal> channels instead:
    </para>
 <screen>
 <prompt>$ </prompt>nix-channel --add https://nixos.org/channels/nixos-<replaceable>version</replaceable> nixpkgs</screen>
    <para>
-    You may want to throw in a <literal>nix-channel --update</literal> for good measure.
+    You may want to throw in a <literal>nix-channel --update</literal> for good
+    measure.
    </para>
   </listitem>
   <listitem>
@@ -73,24 +83,33 @@ nixpkgs https://nixos.org/channels/nixpkgs-unstable</screen>
     Install the NixOS installation tools:
    </para>
    <para>
-    You'll need <literal>nixos-generate-config</literal> and <literal>nixos-install</literal> and we'll throw in some man pages and <literal>nixos-enter</literal> just in case you want to chroot into your NixOS partition. They are installed by default on NixOS, but you don't have NixOS yet..
+    You'll need <literal>nixos-generate-config</literal> and
+    <literal>nixos-install</literal> and we'll throw in some man pages and
+    <literal>nixos-enter</literal> just in case you want to chroot into your
+    NixOS partition. They are installed by default on NixOS, but you don't have
+    NixOS yet..
    </para>
 <screen><prompt>$ </prompt>nix-env -iE "_: with import &lt;nixpkgs/nixos&gt; { configuration = {}; }; with config.system.build; [ nixos-generate-config nixos-install nixos-enter manual.manpages ]"</screen>
   </listitem>
   <listitem>
    <note>
     <para>
-     The following 5 steps are only for installing NixOS to another partition. For installing NixOS in place using <literal>NIXOS_LUSTRATE</literal>, skip ahead.
+     The following 5 steps are only for installing NixOS to another partition.
+     For installing NixOS in place using <literal>NIXOS_LUSTRATE</literal>,
+     skip ahead.
     </para>
    </note>
    <para>
     Prepare your target partition:
    </para>
    <para>
-    At this point it is time to prepare your target partition. Please refer to the partitioning, file-system creation, and mounting steps of <xref linkend="sec-installation" />
+    At this point it is time to prepare your target partition. Please refer to
+    the partitioning, file-system creation, and mounting steps of
+    <xref linkend="sec-installation" />
    </para>
    <para>
-    If you're about to install NixOS in place using <literal>NIXOS_LUSTRATE</literal> there is nothing to do for this step.
+    If you're about to install NixOS in place using
+    <literal>NIXOS_LUSTRATE</literal> there is nothing to do for this step.
    </para>
   </listitem>
   <listitem>
@@ -99,11 +118,17 @@ nixpkgs https://nixos.org/channels/nixpkgs-unstable</screen>
    </para>
 <screen><prompt>$ </prompt>sudo `which nixos-generate-config` --root /mnt</screen>
    <para>
-    You'll probably want to edit the configuration files. Refer to the <literal>nixos-generate-config</literal> step in <xref
-                    linkend="sec-installation" /> for more information.
+    You'll probably want to edit the configuration files. Refer to the
+    <literal>nixos-generate-config</literal> step in
+    <xref
+                    linkend="sec-installation" /> for more
+    information.
    </para>
    <para>
-    Consider setting up the NixOS bootloader to give you the ability to boot on your existing Linux partition. For instance, if you're using GRUB and your existing distribution is running Ubuntu, you may want to add something like this to your <literal>configuration.nix</literal>:
+    Consider setting up the NixOS bootloader to give you the ability to boot on
+    your existing Linux partition. For instance, if you're using GRUB and your
+    existing distribution is running Ubuntu, you may want to add something like
+    this to your <literal>configuration.nix</literal>:
    </para>
 <programlisting>
 <xref linkend="opt-boot.loader.grub.extraEntries"/> = ''
@@ -113,12 +138,14 @@ nixpkgs https://nixos.org/channels/nixpkgs-unstable</screen>
   }
 '';</programlisting>
    <para>
-    (You can find the appropriate UUID for your partition in <literal>/dev/disk/by-uuid</literal>)
+    (You can find the appropriate UUID for your partition in
+    <literal>/dev/disk/by-uuid</literal>)
    </para>
   </listitem>
   <listitem>
    <para>
-    Create the <literal>nixbld</literal> group and user on your original distribution:
+    Create the <literal>nixbld</literal> group and user on your original
+    distribution:
    </para>
 <screen>
 <prompt>$ </prompt>sudo groupadd -g 30000 nixbld
@@ -130,12 +157,14 @@ nixpkgs https://nixos.org/channels/nixpkgs-unstable</screen>
    </para>
    <warning>
     <para>
-     Once you complete this step, you might no longer be able to boot on existing systems without the help of a rescue USB drive or similar.
+     Once you complete this step, you might no longer be able to boot on
+     existing systems without the help of a rescue USB drive or similar.
     </para>
    </warning>
 <screen><prompt>$ </prompt>sudo PATH="$PATH" NIX_PATH="$NIX_PATH" `which nixos-install` --root /mnt</screen>
    <para>
-    Again, please refer to the <literal>nixos-install</literal> step in <xref linkend="sec-installation" /> for more information.
+    Again, please refer to the <literal>nixos-install</literal> step in
+    <xref linkend="sec-installation" /> for more information.
    </para>
    <para>
     That should be it for installation to another partition!
@@ -149,13 +178,16 @@ nixpkgs https://nixos.org/channels/nixpkgs-unstable</screen>
 <prompt>$ </prompt>sudo userdel nixbld
 <prompt>$ </prompt>sudo groupdel nixbld</screen>
    <para>
-    If you do not wish to keep the Nix package manager installed either, run something like <literal>sudo rm -rv ~/.nix-* /nix</literal> and remove the line that the Nix installer added to your <literal>~/.profile</literal>.
+    If you do not wish to keep the Nix package manager installed either, run
+    something like <literal>sudo rm -rv ~/.nix-* /nix</literal> and remove the
+    line that the Nix installer added to your <literal>~/.profile</literal>.
    </para>
   </listitem>
   <listitem>
    <note>
     <para>
-     The following steps are only for installing NixOS in place using <literal>NIXOS_LUSTRATE</literal>:
+     The following steps are only for installing NixOS in place using
+     <literal>NIXOS_LUSTRATE</literal>:
     </para>
    </note>
    <para>
@@ -163,11 +195,20 @@ nixpkgs https://nixos.org/channels/nixpkgs-unstable</screen>
    </para>
 <screen><prompt>$ </prompt>sudo `which nixos-generate-config` --root /</screen>
    <para>
-    Note that this will place the generated configuration files in <literal>/etc/nixos</literal>. You'll probably want to edit the configuration files. Refer to the <literal>nixos-generate-config</literal> step in <xref
-                    linkend="sec-installation" /> for more information.
+    Note that this will place the generated configuration files in
+    <literal>/etc/nixos</literal>. You'll probably want to edit the
+    configuration files. Refer to the <literal>nixos-generate-config</literal>
+    step in <xref
+                    linkend="sec-installation" /> for more
+    information.
    </para>
    <para>
-    You'll likely want to set a root password for your first boot using the configuration files because you won't have a chance to enter a password until after you reboot. You can initalize the root password to an empty one with this line: (and of course don't forget to set one once you've rebooted or to lock the account with <literal>sudo passwd -l root</literal> if you use <literal>sudo</literal>)
+    You'll likely want to set a root password for your first boot using the
+    configuration files because you won't have a chance to enter a password
+    until after you reboot. You can initalize the root password to an empty one
+    with this line: (and of course don't forget to set one once you've rebooted
+    or to lock the account with <literal>sudo passwd -l root</literal> if you
+    use <literal>sudo</literal>)
    </para>
 <programlisting>
 <link linkend="opt-users.users._name__.initialHashedPassword">users.users.root.initialHashedPassword</link> = "";
@@ -175,25 +216,34 @@ nixpkgs https://nixos.org/channels/nixpkgs-unstable</screen>
   </listitem>
   <listitem>
    <para>
-    Build the NixOS closure and install it in the <literal>system</literal> profile:
+    Build the NixOS closure and install it in the <literal>system</literal>
+    profile:
    </para>
 <screen><prompt>$ </prompt>nix-env -p /nix/var/nix/profiles/system -f '&lt;nixpkgs/nixos&gt;' -I nixos-config=/etc/nixos/configuration.nix -iA system</screen>
   </listitem>
   <listitem>
    <para>
-    Change ownership of the <literal>/nix</literal> tree to root (since your Nix install was probably single user):
+    Change ownership of the <literal>/nix</literal> tree to root (since your
+    Nix install was probably single user):
    </para>
 <screen><prompt>$ </prompt>sudo chown -R 0.0 /nix</screen>
   </listitem>
   <listitem>
    <para>
-    Set up the <literal>/etc/NIXOS</literal> and <literal>/etc/NIXOS_LUSTRATE</literal> files:
+    Set up the <literal>/etc/NIXOS</literal> and
+    <literal>/etc/NIXOS_LUSTRATE</literal> files:
    </para>
    <para>
-    <literal>/etc/NIXOS</literal> officializes that this is now a NixOS partition (the bootup scripts require its presence).
+    <literal>/etc/NIXOS</literal> officializes that this is now a NixOS
+    partition (the bootup scripts require its presence).
    </para>
    <para>
-    <literal>/etc/NIXOS_LUSTRATE</literal> tells the NixOS bootup scripts to move <emphasis>everything</emphasis> that's in the root partition to <literal>/old-root</literal>. This will move your existing distribution out of the way in the very early stages of the NixOS bootup. There are exceptions (we do need to keep NixOS there after all), so the NixOS lustrate process will not touch:
+    <literal>/etc/NIXOS_LUSTRATE</literal> tells the NixOS bootup scripts to
+    move <emphasis>everything</emphasis> that's in the root partition to
+    <literal>/old-root</literal>. This will move your existing distribution out
+    of the way in the very early stages of the NixOS bootup. There are
+    exceptions (we do need to keep NixOS there after all), so the NixOS
+    lustrate process will not touch:
    </para>
    <itemizedlist>
     <listitem>
@@ -208,19 +258,26 @@ nixpkgs https://nixos.org/channels/nixpkgs-unstable</screen>
     </listitem>
     <listitem>
      <para>
-      Any file or directory listed in <literal>/etc/NIXOS_LUSTRATE</literal> (one per line)
+      Any file or directory listed in <literal>/etc/NIXOS_LUSTRATE</literal>
+      (one per line)
      </para>
     </listitem>
    </itemizedlist>
    <note>
     <para>
-     Support for <literal>NIXOS_LUSTRATE</literal> was added in NixOS 16.09. The act of "lustrating" refers to the wiping of the existing distribution. Creating <literal>/etc/NIXOS_LUSTRATE</literal> can also be used on NixOS to remove all mutable files from your root partition (anything that's not in <literal>/nix</literal> or <literal>/boot</literal> gets "lustrated" on the next boot.
+     Support for <literal>NIXOS_LUSTRATE</literal> was added in NixOS 16.09.
+     The act of "lustrating" refers to the wiping of the existing distribution.
+     Creating <literal>/etc/NIXOS_LUSTRATE</literal> can also be used on NixOS
+     to remove all mutable files from your root partition (anything that's not
+     in <literal>/nix</literal> or <literal>/boot</literal> gets "lustrated" on
+     the next boot.
     </para>
     <para>
      lustrate /ˈlʌstreɪt/ verb.
     </para>
     <para>
-     purify by expiatory sacrifice, ceremonial washing, or some other ritual action.
+     purify by expiatory sacrifice, ceremonial washing, or some other ritual
+     action.
     </para>
    </note>
    <para>
@@ -231,7 +288,8 @@ nixpkgs https://nixos.org/channels/nixpkgs-unstable</screen>
 <prompt>$ </prompt>sudo touch /etc/NIXOS_LUSTRATE
 </screen>
    <para>
-    Let's also make sure the NixOS configuration files are kept once we reboot on NixOS:
+    Let's also make sure the NixOS configuration files are kept once we reboot
+    on NixOS:
    </para>
 <screen>
 <prompt>$ </prompt>echo etc/nixos | sudo tee -a /etc/NIXOS_LUSTRATE
@@ -239,11 +297,18 @@ nixpkgs https://nixos.org/channels/nixpkgs-unstable</screen>
   </listitem>
   <listitem>
    <para>
-    Finally, move the <literal>/boot</literal> directory of your current distribution out of the way (the lustrate process will take care of the rest once you reboot, but this one must be moved out now because NixOS needs to install its own boot files:
+    Finally, move the <literal>/boot</literal> directory of your current
+    distribution out of the way (the lustrate process will take care of the
+    rest once you reboot, but this one must be moved out now because NixOS
+    needs to install its own boot files:
    </para>
    <warning>
     <para>
-     Once you complete this step, your current distribution will no longer be bootable! If you didn't get all the NixOS configuration right, especially those settings pertaining to boot loading and root partition, NixOS may not be bootable either. Have a USB rescue device ready in case this happens.
+     Once you complete this step, your current distribution will no longer be
+     bootable! If you didn't get all the NixOS configuration right, especially
+     those settings pertaining to boot loading and root partition, NixOS may
+     not be bootable either. Have a USB rescue device ready in case this
+     happens.
     </para>
    </warning>
 <screen>
@@ -256,7 +321,8 @@ sudo /nix/var/nix/profiles/system/bin/switch-to-configuration boot
   </listitem>
   <listitem>
    <para>
-    If for some reason you want to revert to the old distribution, you'll need to boot on a USB rescue disk and do something along these lines:
+    If for some reason you want to revert to the old distribution, you'll need
+    to boot on a USB rescue disk and do something along these lines:
    </para>
 <screen>
 # mkdir root
@@ -271,14 +337,20 @@ sudo /nix/var/nix/profiles/system/bin/switch-to-configuration boot
     This may work as is or you might also need to reinstall the boot loader
    </para>
    <para>
-    And of course, if you're happy with NixOS and no longer need the old distribution:
+    And of course, if you're happy with NixOS and no longer need the old
+    distribution:
    </para>
 <screen>sudo rm -rf /old-root</screen>
   </listitem>
   <listitem>
    <para>
-    It's also worth noting that this whole process can be automated. This is especially useful for Cloud VMs, where provider do not provide NixOS. For instance, <link
-                    xlink:href="https://github.com/elitak/nixos-infect">nixos-infect</link> uses the lustrate process to convert Digital Ocean droplets to NixOS from other distributions automatically.
+    It's also worth noting that this whole process can be automated. This is
+    especially useful for Cloud VMs, where provider do not provide NixOS. For
+    instance,
+    <link
+                    xlink:href="https://github.com/elitak/nixos-infect">nixos-infect</link>
+    uses the lustrate process to convert Digital Ocean droplets to NixOS from
+    other distributions automatically.
    </para>
   </listitem>
  </orderedlist>
diff --git a/nixos/doc/manual/installation/installing-pxe.xml b/nixos/doc/manual/installation/installing-pxe.xml
index 5ca320b5bb1..94199e5e028 100644
--- a/nixos/doc/manual/installation/installing-pxe.xml
+++ b/nixos/doc/manual/installation/installing-pxe.xml
@@ -10,7 +10,9 @@
  </para>
 
  <para>
-  These instructions assume that you have an existing PXE or iPXE infrastructure and simply want to add the NixOS installer as another option. To build the necessary files from a recent version of nixpkgs, you can run:
+  These instructions assume that you have an existing PXE or iPXE
+  infrastructure and simply want to add the NixOS installer as another option.
+  To build the necessary files from a recent version of nixpkgs, you can run:
  </para>
 
 <programlisting>
@@ -18,18 +20,31 @@ nix-build -A netboot nixos/release.nix
 </programlisting>
 
  <para>
-  This will create a <literal>result</literal> directory containing: * <literal>bzImage</literal> – the Linux kernel * <literal>initrd</literal> – the initrd file * <literal>netboot.ipxe</literal> – an example ipxe script demonstrating the appropriate kernel command line arguments for this image
+  This will create a <literal>result</literal> directory containing: *
+  <literal>bzImage</literal> – the Linux kernel * <literal>initrd</literal>
+  – the initrd file * <literal>netboot.ipxe</literal> – an example ipxe
+  script demonstrating the appropriate kernel command line arguments for this
+  image
  </para>
 
  <para>
-  If you’re using plain PXE, configure your boot loader to use the <literal>bzImage</literal> and <literal>initrd</literal> files and have it provide the same kernel command line arguments found in <literal>netboot.ipxe</literal>.
+  If you’re using plain PXE, configure your boot loader to use the
+  <literal>bzImage</literal> and <literal>initrd</literal> files and have it
+  provide the same kernel command line arguments found in
+  <literal>netboot.ipxe</literal>.
  </para>
 
  <para>
-  If you’re using iPXE, depending on how your HTTP/FTP/etc. server is configured you may be able to use <literal>netboot.ipxe</literal> unmodified, or you may need to update the paths to the files to match your server’s directory layout
+  If you’re using iPXE, depending on how your HTTP/FTP/etc. server is
+  configured you may be able to use <literal>netboot.ipxe</literal> unmodified,
+  or you may need to update the paths to the files to match your server’s
+  directory layout
  </para>
 
  <para>
-  In the future we may begin making these files available as build products from hydra at which point we will update this documentation with instructions on how to obtain them either for placing on a dedicated TFTP server or to boot them directly over the internet.
+  In the future we may begin making these files available as build products
+  from hydra at which point we will update this documentation with instructions
+  on how to obtain them either for placing on a dedicated TFTP server or to
+  boot them directly over the internet.
  </para>
 </section>
diff --git a/nixos/doc/manual/installation/installing-usb.xml b/nixos/doc/manual/installation/installing-usb.xml
index 99c61511a59..83598635acc 100644
--- a/nixos/doc/manual/installation/installing-usb.xml
+++ b/nixos/doc/manual/installation/installing-usb.xml
@@ -6,7 +6,12 @@
  <title>Booting from a USB Drive</title>
 
  <para>
-  For systems without CD drive, the NixOS live CD can be booted from a USB stick. You can use the <command>dd</command> utility to write the image: <command>dd if=<replaceable>path-to-image</replaceable> of=<replaceable>/dev/sdX</replaceable></command>. Be careful about specifying the correct drive; you can use the <command>lsblk</command> command to get a list of block devices.
+  For systems without CD drive, the NixOS live CD can be booted from a USB
+  stick. You can use the <command>dd</command> utility to write the image:
+  <command>dd if=<replaceable>path-to-image</replaceable>
+  of=<replaceable>/dev/sdX</replaceable></command>. Be careful about specifying
+  the correct drive; you can use the <command>lsblk</command> command to get a
+  list of block devices.
   <note>
    <title>On macOS</title>
    <para>
@@ -20,12 +25,16 @@
 Unmount of all volumes on diskN was successful
 <prompt>$ </prompt>sudo dd if=nix.iso of=/dev/rdiskN
 </screen>
-    Using the 'raw' <command>rdiskN</command> device instead of <command>diskN</command> completes in minutes instead of hours. After <command>dd</command> completes, a GUI dialog "The disk you inserted was not readable by this computer" will pop up, which can be ignored.
+    Using the 'raw' <command>rdiskN</command> device instead of
+    <command>diskN</command> completes in minutes instead of hours. After
+    <command>dd</command> completes, a GUI dialog "The disk you inserted was
+    not readable by this computer" will pop up, which can be ignored.
    </para>
   </note>
  </para>
 
  <para>
-  The <command>dd</command> utility will write the image verbatim to the drive, making it the recommended option for both UEFI and non-UEFI installations.
+  The <command>dd</command> utility will write the image verbatim to the drive,
+  making it the recommended option for both UEFI and non-UEFI installations.
  </para>
 </section>
diff --git a/nixos/doc/manual/installation/installing-virtualbox-guest.xml b/nixos/doc/manual/installation/installing-virtualbox-guest.xml
index f75a1cf0a9c..5c86eacfbf4 100644
--- a/nixos/doc/manual/installation/installing-virtualbox-guest.xml
+++ b/nixos/doc/manual/installation/installing-virtualbox-guest.xml
@@ -6,8 +6,13 @@
  <title>Installing in a VirtualBox guest</title>
 
  <para>
-  Installing NixOS into a VirtualBox guest is convenient for users who want to try NixOS without installing it on bare metal. If you want to use a pre-made VirtualBox appliance, it is available at <link
-  xlink:href="https://nixos.org/nixos/download.html">the downloads page</link>. If you want to set up a VirtualBox guest manually, follow these instructions:
+  Installing NixOS into a VirtualBox guest is convenient for users who want to
+  try NixOS without installing it on bare metal. If you want to use a pre-made
+  VirtualBox appliance, it is available at
+  <link
+  xlink:href="https://nixos.org/nixos/download.html">the downloads
+  page</link>. If you want to set up a VirtualBox guest manually, follow these
+  instructions:
  </para>
 
  <orderedlist>
@@ -38,18 +43,21 @@
   </listitem>
   <listitem>
    <para>
-    Click on Settings / System / Acceleration and enable "VT-x/AMD-V" acceleration
+    Click on Settings / System / Acceleration and enable "VT-x/AMD-V"
+    acceleration
    </para>
   </listitem>
   <listitem>
    <para>
-    Save the settings, start the virtual machine, and continue installation like normal
+    Save the settings, start the virtual machine, and continue installation
+    like normal
    </para>
   </listitem>
  </orderedlist>
 
  <para>
-  There are a few modifications you should make in configuration.nix. Enable booting:
+  There are a few modifications you should make in configuration.nix. Enable
+  booting:
  </para>
 
 <programlisting>
@@ -57,7 +65,8 @@
 </programlisting>
 
  <para>
-  Also remove the fsck that runs at startup. It will always fail to run, stopping your boot until you press <literal>*</literal>.
+  Also remove the fsck that runs at startup. It will always fail to run,
+  stopping your boot until you press <literal>*</literal>.
  </para>
 
 <programlisting>
@@ -65,7 +74,13 @@
 </programlisting>
 
  <para>
-  Shared folders can be given a name and a path in the host system in the VirtualBox settings (Machine / Settings / Shared Folders, then click on the "Add" icon). Add the following to the <literal>/etc/nixos/configuration.nix</literal> to auto-mount them. If you do not add <literal>"nofail"</literal>, the system will no boot properly. The same goes for disabling <literal>rngd</literal> which is normally used to get randomness but this does not work in virtual machines.
+  Shared folders can be given a name and a path in the host system in the
+  VirtualBox settings (Machine / Settings / Shared Folders, then click on the
+  "Add" icon). Add the following to the
+  <literal>/etc/nixos/configuration.nix</literal> to auto-mount them. If you do
+  not add <literal>"nofail"</literal>, the system will no boot properly. The
+  same goes for disabling <literal>rngd</literal> which is normally used to get
+  randomness but this does not work in virtual machines.
  </para>
 
 <programlisting>
diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml
index 8049450c684..f1e1568c034 100644
--- a/nixos/doc/manual/installation/installing.xml
+++ b/nixos/doc/manual/installation/installing.xml
@@ -8,46 +8,67 @@
   <title>Booting the system</title>
 
   <para>
-   NixOS can be installed on BIOS or UEFI systems. The procedure for a UEFI installation is by and large the same as a BIOS installation. The differences are mentioned in the steps that follow.
+   NixOS can be installed on BIOS or UEFI systems. The procedure for a UEFI
+   installation is by and large the same as a BIOS installation. The
+   differences are mentioned in the steps that follow.
   </para>
 
   <para>
-   The installation media can be burned to a CD, or now more commonly, "burned" to a USB drive (see <xref linkend="sec-booting-from-usb"/>).
+   The installation media can be burned to a CD, or now more commonly, "burned"
+   to a USB drive (see <xref linkend="sec-booting-from-usb"/>).
   </para>
 
   <para>
-   The installation media contains a basic NixOS installation. When it’s finished booting, it should have detected most of your hardware.
+   The installation media contains a basic NixOS installation. When it’s
+   finished booting, it should have detected most of your hardware.
   </para>
 
   <para>
-   The NixOS manual is available on virtual console 8 (press Alt+F8 to access) or by running <command>nixos-help</command>.
+   The NixOS manual is available on virtual console 8 (press Alt+F8 to access)
+   or by running <command>nixos-help</command>.
   </para>
 
   <para>
-   You are logged-in automatically as <literal>nixos</literal>. The <literal>nixos</literal> user account has an empty password so you can use <command>sudo</command> without a password.
+   You are logged-in automatically as <literal>nixos</literal>.
+   The <literal>nixos</literal> user account has an empty password so you
+   can use <command>sudo</command> without a password.
   </para>
 
   <para>
-   If you downloaded the graphical ISO image, you can run <command>systemctl start display-manager</command> to start the desktop environment. If you want to continue on the terminal, you can use <command>loadkeys</command> to switch to your preferred keyboard layout. (We even provide neo2 via <command>loadkeys de neo</command>!)
+   If you downloaded the graphical ISO image, you can run <command>systemctl
+   start display-manager</command> to start the desktop environment. If you want to continue on the
+   terminal, you can use <command>loadkeys</command> to switch to your
+   preferred keyboard layout. (We even provide neo2 via <command>loadkeys de
+   neo</command>!)
   </para>
 
   <section xml:id="sec-installation-booting-networking">
    <title>Networking in the installer</title>
 
    <para>
-    The boot process should have brought up networking (check <command>ip a</command>). Networking is necessary for the installer, since it will download lots of stuff (such as source tarballs or Nixpkgs channel binaries). It’s best if you have a DHCP server on your network. Otherwise configure networking manually using <command>ifconfig</command>.
+    The boot process should have brought up networking (check <command>ip
+    a</command>). Networking is necessary for the installer, since it will
+    download lots of stuff (such as source tarballs or Nixpkgs channel
+    binaries). It’s best if you have a DHCP server on your network. Otherwise
+    configure networking manually using <command>ifconfig</command>.
    </para>
 
    <para>
-    To manually configure the network on the graphical installer, first disable network-manager with <command>systemctl stop NetworkManager</command>.
+    To manually configure the network on the graphical installer, first disable
+    network-manager with <command>systemctl stop NetworkManager</command>.
    </para>
 
    <para>
-    To manually configure the wifi on the minimal installer, run <command>wpa_supplicant -B -i interface -c &lt;(wpa_passphrase 'SSID' 'key')</command>.
+    To manually configure the wifi on the minimal installer, run
+    <command>wpa_supplicant -B -i interface -c &lt;(wpa_passphrase 'SSID'
+    'key')</command>.
    </para>
 
    <para>
-    If you would like to continue the installation from a different machine you need to activate the SSH daemon via <command>systemctl start sshd</command>. You then must set a password for either <literal>root</literal> or <literal>nixos</literal> with <command>passwd></command> to be able to login.
+    If you would like to continue the installation from a different machine you
+    need to activate the SSH daemon via <command>systemctl start
+    sshd</command>. You then must set a password for either <literal>root</literal> or
+    <literal>nixos</literal> with <command>passwd></command> to be able to login.
    </para>
   </section>
  </section>
@@ -55,25 +76,32 @@
   <title>Partitioning and formatting</title>
 
   <para>
-   The NixOS installer doesn’t do any partitioning or formatting, so you need to do that yourself.
+   The NixOS installer doesn’t do any partitioning or formatting, so you need
+   to do that yourself.
   </para>
 
   <para>
-   The NixOS installer ships with multiple partitioning tools. The examples below use <command>parted</command>, but also provides <command>fdisk</command>, <command>gdisk</command>, <command>cfdisk</command>, and <command>cgdisk</command>.
+   The NixOS installer ships with multiple partitioning tools. The examples
+   below use <command>parted</command>, but also provides
+   <command>fdisk</command>, <command>gdisk</command>,
+   <command>cfdisk</command>, and <command>cgdisk</command>.
   </para>
 
   <para>
-   The recommended partition scheme differs depending if the computer uses <emphasis>Legacy Boot</emphasis> or <emphasis>UEFI</emphasis>.
+   The recommended partition scheme differs depending if the computer uses
+   <emphasis>Legacy Boot</emphasis> or <emphasis>UEFI</emphasis>.
   </para>
 
   <section xml:id="sec-installation-partitioning-UEFI">
    <title>UEFI (GPT)</title>
 
    <para>
-    Here's an example partition scheme for UEFI, using <filename>/dev/sda</filename> as the device.
+    Here's an example partition scheme for UEFI, using
+    <filename>/dev/sda</filename> as the device.
     <note>
      <para>
-      You can safely ignore <command>parted</command>'s informational message about needing to update /etc/fstab.
+      You can safely ignore <command>parted</command>'s informational message
+      about needing to update /etc/fstab.
      </para>
     </note>
    </para>
@@ -88,24 +116,31 @@
      </listitem>
      <listitem>
       <para>
-       Add the <emphasis>root</emphasis> partition. This will fill the disk except for the end part, where the swap will live, and the space left in front (512MiB) which will be used by the boot partition.
+       Add the <emphasis>root</emphasis> partition. This will fill the disk
+       except for the end part, where the swap will live, and the space left in
+       front (512MiB) which will be used by the boot partition.
 <screen language="commands"><prompt># </prompt>parted /dev/sda -- mkpart primary 512MiB -8GiB</screen>
       </para>
      </listitem>
      <listitem>
       <para>
-       Next, add a <emphasis>swap</emphasis> partition. The size required will vary according to needs, here a 8GiB one is created.
+       Next, add a <emphasis>swap</emphasis> partition. The size required will
+       vary according to needs, here a 8GiB one is created.
 <screen language="commands"><prompt># </prompt>parted /dev/sda -- mkpart primary linux-swap -8GiB 100%</screen>
        <note>
         <para>
-         The swap partition size rules are no different than for other Linux distributions.
+         The swap partition size rules are no different than for other Linux
+         distributions.
         </para>
        </note>
       </para>
      </listitem>
      <listitem>
       <para>
-       Finally, the <emphasis>boot</emphasis> partition. NixOS by default uses the ESP (EFI system partition) as its <emphasis>/boot</emphasis> partition. It uses the initially reserved 512MiB at the start of the disk.
+       Finally, the <emphasis>boot</emphasis> partition. NixOS by default uses
+       the ESP (EFI system partition) as its <emphasis>/boot</emphasis>
+       partition. It uses the initially reserved 512MiB at the start of the
+       disk.
 <screen language="commands"><prompt># </prompt>parted /dev/sda -- mkpart ESP fat32 1MiB 512MiB
 <prompt># </prompt>parted /dev/sda -- set 3 boot on</screen>
       </para>
@@ -114,7 +149,8 @@
    </para>
 
    <para>
-    Once complete, you can follow with <xref linkend="sec-installation-partitioning-formatting"/>.
+    Once complete, you can follow with
+    <xref linkend="sec-installation-partitioning-formatting"/>.
    </para>
   </section>
 
@@ -122,10 +158,12 @@
    <title>Legacy Boot (MBR)</title>
 
    <para>
-    Here's an example partition scheme for Legacy Boot, using <filename>/dev/sda</filename> as the device.
+    Here's an example partition scheme for Legacy Boot, using
+    <filename>/dev/sda</filename> as the device.
     <note>
      <para>
-      You can safely ignore <command>parted</command>'s informational message about needing to update /etc/fstab.
+      You can safely ignore <command>parted</command>'s informational message
+      about needing to update /etc/fstab.
      </para>
     </note>
    </para>
@@ -140,17 +178,20 @@
      </listitem>
      <listitem>
       <para>
-       Add the <emphasis>root</emphasis> partition. This will fill the the disk except for the end part, where the swap will live.
+       Add the <emphasis>root</emphasis> partition. This will fill the the disk
+       except for the end part, where the swap will live.
 <screen language="commands"><prompt># </prompt>parted /dev/sda -- mkpart primary 1MiB -8GiB</screen>
       </para>
      </listitem>
      <listitem>
       <para>
-       Finally, add a <emphasis>swap</emphasis> partition. The size required will vary according to needs, here a 8GiB one is created.
+       Finally, add a <emphasis>swap</emphasis> partition. The size required
+       will vary according to needs, here a 8GiB one is created.
 <screen language="commands"><prompt># </prompt>parted /dev/sda -- mkpart primary linux-swap -8GiB 100%</screen>
        <note>
         <para>
-         The swap partition size rules are no different than for other Linux distributions.
+         The swap partition size rules are no different than for other Linux
+         distributions.
         </para>
        </note>
       </para>
@@ -159,7 +200,8 @@
    </para>
 
    <para>
-    Once complete, you can follow with <xref linkend="sec-installation-partitioning-formatting"/>.
+    Once complete, you can follow with
+    <xref linkend="sec-installation-partitioning-formatting"/>.
    </para>
   </section>
 
@@ -171,14 +213,20 @@
     <itemizedlist>
      <listitem>
       <para>
-       For initialising Ext4 partitions: <command>mkfs.ext4</command>. It is recommended that you assign a unique symbolic label to the file system using the option <option>-L <replaceable>label</replaceable></option>, since this makes the file system configuration independent from device changes. For example:
+       For initialising Ext4 partitions: <command>mkfs.ext4</command>. It is
+       recommended that you assign a unique symbolic label to the file system
+       using the option <option>-L <replaceable>label</replaceable></option>,
+       since this makes the file system configuration independent from device
+       changes. For example:
 <screen>
 <prompt># </prompt>mkfs.ext4 -L nixos /dev/sda1</screen>
       </para>
      </listitem>
      <listitem>
       <para>
-       For creating swap partitions: <command>mkswap</command>. Again it’s recommended to assign a label to the swap partition: <option>-L <replaceable>label</replaceable></option>. For example:
+       For creating swap partitions: <command>mkswap</command>. Again it’s
+       recommended to assign a label to the swap partition: <option>-L
+       <replaceable>label</replaceable></option>. For example:
 <screen>
 <prompt># </prompt>mkswap -L swap /dev/sda2</screen>
       </para>
@@ -191,7 +239,9 @@
         </term>
         <listitem>
          <para>
-          For creating boot partitions: <command>mkfs.fat</command>. Again it’s recommended to assign a label to the boot partition: <option>-n <replaceable>label</replaceable></option>. For example:
+          For creating boot partitions: <command>mkfs.fat</command>. Again
+          it’s recommended to assign a label to the boot partition:
+          <option>-n <replaceable>label</replaceable></option>. For example:
 <screen>
 <prompt># </prompt>mkfs.fat -F 32 -n boot /dev/sda3</screen>
          </para>
@@ -201,7 +251,9 @@
      </listitem>
      <listitem>
       <para>
-       For creating LVM volumes, the LVM commands, e.g., <command>pvcreate</command>, <command>vgcreate</command>, and <command>lvcreate</command>.
+       For creating LVM volumes, the LVM commands, e.g.,
+       <command>pvcreate</command>, <command>vgcreate</command>, and
+       <command>lvcreate</command>.
       </para>
      </listitem>
      <listitem>
@@ -219,7 +271,8 @@
   <orderedlist>
    <listitem>
     <para>
-     Mount the target file system on which NixOS should be installed on <filename>/mnt</filename>, e.g.
+     Mount the target file system on which NixOS should be installed on
+     <filename>/mnt</filename>, e.g.
 <screen>
 <prompt># </prompt>mount /dev/disk/by-label/nixos /mnt
 </screen>
@@ -245,26 +298,44 @@
    </listitem>
    <listitem>
     <para>
-     If your machine has a limited amount of memory, you may want to activate swap devices now (<command>swapon <replaceable>device</replaceable></command>). The installer (or rather, the build actions that it may spawn) may need quite a bit of RAM, depending on your configuration.
+     If your machine has a limited amount of memory, you may want to activate
+     swap devices now (<command>swapon
+     <replaceable>device</replaceable></command>). The installer (or rather,
+     the build actions that it may spawn) may need quite a bit of RAM,
+     depending on your configuration.
 <screen>
 <prompt># </prompt>swapon /dev/sda2</screen>
     </para>
    </listitem>
    <listitem>
     <para>
-     You now need to create a file <filename>/mnt/etc/nixos/configuration.nix</filename> that specifies the intended configuration of the system. This is because NixOS has a <emphasis>declarative</emphasis> configuration model: you create or edit a description of the desired configuration of your system, and then NixOS takes care of making it happen. The syntax of the NixOS configuration file is described in <xref linkend="sec-configuration-syntax"/>, while a list of available configuration options appears in <xref
-    linkend="ch-options"/>. A minimal example is shown in <xref
+     You now need to create a file
+     <filename>/mnt/etc/nixos/configuration.nix</filename> that specifies the
+     intended configuration of the system. This is because NixOS has a
+     <emphasis>declarative</emphasis> configuration model: you create or edit a
+     description of the desired configuration of your system, and then NixOS
+     takes care of making it happen. The syntax of the NixOS configuration file
+     is described in <xref linkend="sec-configuration-syntax"/>, while a list
+     of available configuration options appears in
+     <xref
+    linkend="ch-options"/>. A minimal example is shown in
+     <xref
     linkend="ex-config"/>.
     </para>
     <para>
-     The command <command>nixos-generate-config</command> can generate an initial configuration file for you:
+     The command <command>nixos-generate-config</command> can generate an
+     initial configuration file for you:
 <screen>
 <prompt># </prompt>nixos-generate-config --root /mnt</screen>
-     You should then edit <filename>/mnt/etc/nixos/configuration.nix</filename> to suit your needs:
+     You should then edit <filename>/mnt/etc/nixos/configuration.nix</filename>
+     to suit your needs:
 <screen>
 <prompt># </prompt>nano /mnt/etc/nixos/configuration.nix
 </screen>
-     If you’re using the graphical ISO image, other editors may be available (such as <command>vim</command>). If you have network access, you can also install other editors — for instance, you can install Emacs by running <literal>nix-env -f '&lt;nixpkgs&gt;' -iA emacs</literal>.
+     If you’re using the graphical ISO image, other editors may be available
+     (such as <command>vim</command>). If you have network access, you can also
+     install other editors — for instance, you can install Emacs by running
+     <literal>nix-env -f '&lt;nixpkgs&gt;' -iA emacs</literal>.
     </para>
     <variablelist>
      <varlistentry>
@@ -273,7 +344,9 @@
       </term>
       <listitem>
        <para>
-        You <emphasis>must</emphasis> set the option <xref linkend="opt-boot.loader.grub.device"/> to specify on which disk the GRUB boot loader is to be installed. Without it, NixOS cannot boot.
+        You <emphasis>must</emphasis> set the option
+        <xref linkend="opt-boot.loader.grub.device"/> to specify on which disk
+        the GRUB boot loader is to be installed. Without it, NixOS cannot boot.
        </para>
       </listitem>
      </varlistentry>
@@ -283,26 +356,60 @@
       </term>
       <listitem>
        <para>
-        You <emphasis>must</emphasis> set the option <xref linkend="opt-boot.loader.systemd-boot.enable"/> to <literal>true</literal>. <command>nixos-generate-config</command> should do this automatically for new configurations when booted in UEFI mode.
+        You <emphasis>must</emphasis> set the option
+        <xref linkend="opt-boot.loader.systemd-boot.enable"/> to
+        <literal>true</literal>. <command>nixos-generate-config</command>
+        should do this automatically for new configurations when booted in UEFI
+        mode.
        </para>
        <para>
-        You may want to look at the options starting with <option><link linkend="opt-boot.loader.efi.canTouchEfiVariables">boot.loader.efi</link></option> and <option><link linkend="opt-boot.loader.systemd-boot.enable">boot.loader.systemd</link></option> as well.
+        You may want to look at the options starting with
+        <option><link linkend="opt-boot.loader.efi.canTouchEfiVariables">boot.loader.efi</link></option>
+        and
+        <option><link linkend="opt-boot.loader.systemd-boot.enable">boot.loader.systemd</link></option>
+        as well.
        </para>
       </listitem>
      </varlistentry>
     </variablelist>
     <para>
-     If there are other operating systems running on the machine before installing NixOS, the <xref linkend="opt-boot.loader.grub.useOSProber"/> option can be set to <literal>true</literal> to automatically add them to the grub menu.
+     If there are other operating systems running on the machine before
+     installing NixOS, the <xref linkend="opt-boot.loader.grub.useOSProber"/>
+     option can be set to <literal>true</literal> to automatically add them to
+     the grub menu.
     </para>
     <para>
-     If you need to configure networking for your machine the configuration options are described in <xref linkend="sec-networking"/>.
+     If you need to configure networking for your machine the configuration
+     options are described in <xref linkend="sec-networking"/>.
     </para>
     <para>
-     Another critical option is <option>fileSystems</option>, specifying the file systems that need to be mounted by NixOS. However, you typically don’t need to set it yourself, because <command>nixos-generate-config</command> sets it automatically in <filename>/mnt/etc/nixos/hardware-configuration.nix</filename> from your currently mounted file systems. (The configuration file <filename>hardware-configuration.nix</filename> is included from <filename>configuration.nix</filename> and will be overwritten by future invocations of <command>nixos-generate-config</command>; thus, you generally should not modify it.) Additionally, you may want to look at <link xlink:href="https://github.com/NixOS/nixos-hardware">Hardware configuration for known-hardware</link> at this point or after installation.
+     Another critical option is <option>fileSystems</option>, specifying the
+     file systems that need to be mounted by NixOS. However, you typically
+     don’t need to set it yourself, because
+     <command>nixos-generate-config</command> sets it automatically in
+     <filename>/mnt/etc/nixos/hardware-configuration.nix</filename> from your
+     currently mounted file systems. (The configuration file
+     <filename>hardware-configuration.nix</filename> is included from
+     <filename>configuration.nix</filename> and will be overwritten by future
+     invocations of <command>nixos-generate-config</command>; thus, you
+     generally should not modify it.) Additionally, you may want to look at 
+     <link xlink:href="https://github.com/NixOS/nixos-hardware">Hardware
+     configuration for known-hardware</link> at this point or after
+     installation.
+      
     </para>
     <note>
      <para>
-      Depending on your hardware configuration or type of file system, you may need to set the option <option>boot.initrd.kernelModules</option> to include the kernel modules that are necessary for mounting the root file system, otherwise the installed system will not be able to boot. (If this happens, boot from the installation media again, mount the target file system on <filename>/mnt</filename>, fix <filename>/mnt/etc/nixos/configuration.nix</filename> and rerun <filename>nixos-install</filename>.) In most cases, <command>nixos-generate-config</command> will figure out the required modules.
+      Depending on your hardware configuration or type of file system, you may
+      need to set the option <option>boot.initrd.kernelModules</option> to
+      include the kernel modules that are necessary for mounting the root file
+      system, otherwise the installed system will not be able to boot. (If this
+      happens, boot from the installation media again, mount the target file
+      system on <filename>/mnt</filename>, fix
+      <filename>/mnt/etc/nixos/configuration.nix</filename> and rerun
+      <filename>nixos-install</filename>.) In most cases,
+      <command>nixos-generate-config</command> will figure out the required
+      modules.
      </para>
     </note>
    </listitem>
@@ -311,17 +418,24 @@
      Do the installation:
 <screen>
 <prompt># </prompt>nixos-install</screen>
-     Cross fingers. If this fails due to a temporary problem (such as a network issue while downloading binaries from the NixOS binary cache), you can just re-run <command>nixos-install</command>. Otherwise, fix your <filename>configuration.nix</filename> and then re-run <command>nixos-install</command>.
+     Cross fingers. If this fails due to a temporary problem (such as a network
+     issue while downloading binaries from the NixOS binary cache), you can
+     just re-run <command>nixos-install</command>. Otherwise, fix your
+     <filename>configuration.nix</filename> and then re-run
+     <command>nixos-install</command>.
     </para>
     <para>
-     As the last step, <command>nixos-install</command> will ask you to set the password for the <literal>root</literal> user, e.g.
+     As the last step, <command>nixos-install</command> will ask you to set the
+     password for the <literal>root</literal> user, e.g.
 <screen>
 setting root password...
 Enter new UNIX password: ***
 Retype new UNIX password: ***</screen>
      <note>
       <para>
-       For unattended installations, it is possible to use <command>nixos-install --no-root-passwd</command> in order to disable the password prompt entirely.
+       For unattended installations, it is possible to use
+       <command>nixos-install --no-root-passwd</command> in order to disable
+       the password prompt entirely.
       </para>
      </note>
     </para>
@@ -335,14 +449,21 @@ Retype new UNIX password: ***</screen>
    </listitem>
    <listitem>
     <para>
-     You should now be able to boot into the installed NixOS. The GRUB boot menu shows a list of <emphasis>available configurations</emphasis> (initially just one). Every time you change the NixOS configuration (see <link
-        linkend="sec-changing-config">Changing Configuration</link> ), a new item is added to the menu. This allows you to easily roll back to a previous configuration if something goes wrong.
+     You should now be able to boot into the installed NixOS. The GRUB boot
+     menu shows a list of <emphasis>available configurations</emphasis>
+     (initially just one). Every time you change the NixOS configuration (see
+     <link
+        linkend="sec-changing-config">Changing Configuration</link>
+     ), a new item is added to the menu. This allows you to easily roll back to
+     a previous configuration if something goes wrong.
     </para>
     <para>
-     You should log in and change the <literal>root</literal> password with <command>passwd</command>.
+     You should log in and change the <literal>root</literal> password with
+     <command>passwd</command>.
     </para>
     <para>
-     You’ll probably want to create some user accounts as well, which can be done with <command>useradd</command>:
+     You’ll probably want to create some user accounts as well, which can be
+     done with <command>useradd</command>:
 <screen>
 <prompt>$ </prompt>useradd -c 'Eelco Dolstra' -m eelco
 <prompt>$ </prompt>passwd eelco</screen>
@@ -363,8 +484,11 @@ Retype new UNIX password: ***</screen>
   <title>Installation summary</title>
 
   <para>
-   To summarise, <xref linkend="ex-install-sequence" /> shows a typical sequence of commands for installing NixOS on an empty hard drive (here <filename>/dev/sda</filename>). <xref linkend="ex-config"
-/> shows a corresponding configuration Nix expression.
+   To summarise, <xref linkend="ex-install-sequence" /> shows a typical
+   sequence of commands for installing NixOS on an empty hard drive (here
+   <filename>/dev/sda</filename>). <xref linkend="ex-config"
+/> shows a
+   corresponding configuration Nix expression.
   </para>
 
   <example xml:id="ex-partition-scheme-MBR">
diff --git a/nixos/doc/manual/installation/obtaining.xml b/nixos/doc/manual/installation/obtaining.xml
index 902f99e1e25..56af5c0e25a 100644
--- a/nixos/doc/manual/installation/obtaining.xml
+++ b/nixos/doc/manual/installation/obtaining.xml
@@ -5,28 +5,48 @@
          xml:id="sec-obtaining">
  <title>Obtaining NixOS</title>
  <para>
-  NixOS ISO images can be downloaded from the <link
-xlink:href="http://nixos.org/nixos/download.html">NixOS download page</link>. There are a number of installation options. If you happen to have an optical drive and a spare CD, burning the image to CD and booting from that is probably the easiest option. Most people will need to prepare a USB stick to boot from. <xref linkend="sec-booting-from-usb"/> describes the preferred method to prepare a USB stick. A number of alternative methods are presented in the <link
-xlink:href="https://nixos.wiki/wiki/NixOS_Installation_Guide#Making_the_installation_media">NixOS Wiki</link>.
+  NixOS ISO images can be downloaded from the
+  <link
+xlink:href="http://nixos.org/nixos/download.html">NixOS download
+  page</link>. There are a number of installation options. If you happen to
+  have an optical drive and a spare CD, burning the image to CD and booting
+  from that is probably the easiest option. Most people will need to prepare a
+  USB stick to boot from. <xref linkend="sec-booting-from-usb"/> describes the
+  preferred method to prepare a USB stick. A number of alternative methods are
+  presented in the
+  <link
+xlink:href="https://nixos.wiki/wiki/NixOS_Installation_Guide#Making_the_installation_media">NixOS
+  Wiki</link>.
  </para>
  <para>
-  As an alternative to installing NixOS yourself, you can get a running NixOS system through several other means:
+  As an alternative to installing NixOS yourself, you can get a running NixOS
+  system through several other means:
   <itemizedlist>
    <listitem>
     <para>
-     Using virtual appliances in Open Virtualization Format (OVF) that can be imported into VirtualBox. These are available from the <link xlink:href="http://nixos.org/nixos/download.html">NixOS download page</link>.
+     Using virtual appliances in Open Virtualization Format (OVF) that can be
+     imported into VirtualBox. These are available from the
+     <link xlink:href="http://nixos.org/nixos/download.html">NixOS download
+     page</link>.
     </para>
    </listitem>
    <listitem>
     <para>
-     Using AMIs for Amazon’s EC2. To find one for your region and instance type, please refer to the <link
-    xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/virtualisation/ec2-amis.nix">list of most recent AMIs</link>.
+     Using AMIs for Amazon’s EC2. To find one for your region and instance
+     type, please refer to the
+     <link
+    xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/virtualisation/ec2-amis.nix">list
+     of most recent AMIs</link>.
     </para>
    </listitem>
    <listitem>
     <para>
-     Using NixOps, the NixOS-based cloud deployment tool, which allows you to provision VirtualBox and EC2 NixOS instances from declarative specifications. Check out the <link
-    xlink:href="https://nixos.org/nixops">NixOps homepage</link> for details.
+     Using NixOps, the NixOS-based cloud deployment tool, which allows you to
+     provision VirtualBox and EC2 NixOS instances from declarative
+     specifications. Check out the
+     <link
+    xlink:href="https://nixos.org/nixops">NixOps homepage</link> for
+     details.
     </para>
    </listitem>
   </itemizedlist>
diff --git a/nixos/doc/manual/installation/upgrading.xml b/nixos/doc/manual/installation/upgrading.xml
index d8b6cda2f2d..35b4d266e12 100644
--- a/nixos/doc/manual/installation/upgrading.xml
+++ b/nixos/doc/manual/installation/upgrading.xml
@@ -4,33 +4,68 @@
          xml:id="sec-upgrading">
  <title>Upgrading NixOS</title>
  <para>
-  The best way to keep your NixOS installation up to date is to use one of the NixOS <emphasis>channels</emphasis>. A channel is a Nix mechanism for distributing Nix expressions and associated binaries. The NixOS channels are updated automatically from NixOS’s Git repository after certain tests have passed and all packages have been built. These channels are:
+  The best way to keep your NixOS installation up to date is to use one of the
+  NixOS <emphasis>channels</emphasis>. A channel is a Nix mechanism for
+  distributing Nix expressions and associated binaries. The NixOS channels are
+  updated automatically from NixOS’s Git repository after certain tests have
+  passed and all packages have been built. These channels are:
   <itemizedlist>
    <listitem>
     <para>
-     <emphasis>Stable channels</emphasis>, such as <literal
-    xlink:href="https://nixos.org/channels/nixos-19.03">nixos-19.03</literal>. These only get conservative bug fixes and package upgrades. For instance, a channel update may cause the Linux kernel on your system to be upgraded from 4.19.34 to 4.19.38 (a minor bug fix), but not from 4.19.<replaceable>x</replaceable> to 4.20.<replaceable>x</replaceable> (a major change that has the potential to break things). Stable channels are generally maintained until the next stable branch is created.
+     <emphasis>Stable channels</emphasis>, such as
+     <literal
+    xlink:href="https://nixos.org/channels/nixos-19.03">nixos-19.03</literal>.
+     These only get conservative bug fixes and package upgrades. For instance,
+     a channel update may cause the Linux kernel on your system to be upgraded
+     from 4.19.34 to 4.19.38 (a minor bug fix), but not from
+     4.19.<replaceable>x</replaceable> to 4.20.<replaceable>x</replaceable> (a
+     major change that has the potential to break things). Stable channels are
+     generally maintained until the next stable branch is created.
     </para>
     <para></para>
    </listitem>
    <listitem>
     <para>
-     The <emphasis>unstable channel</emphasis>, <literal
-    xlink:href="https://nixos.org/channels/nixos-unstable">nixos-unstable</literal>. This corresponds to NixOS’s main development branch, and may thus see radical changes between channel updates. It’s not recommended for production systems.
+     The <emphasis>unstable channel</emphasis>,
+     <literal
+    xlink:href="https://nixos.org/channels/nixos-unstable">nixos-unstable</literal>.
+     This corresponds to NixOS’s main development branch, and may thus see
+     radical changes between channel updates. It’s not recommended for
+     production systems.
     </para>
    </listitem>
    <listitem>
     <para>
-     <emphasis>Small channels</emphasis>, such as <literal
-    xlink:href="https://nixos.org/channels/nixos-19.03-small">nixos-19.03-small</literal> or <literal
-    xlink:href="https://nixos.org/channels/nixos-unstable-small">nixos-unstable-small</literal>. These are identical to the stable and unstable channels described above, except that they contain fewer binary packages. This means they get updated faster than the regular channels (for instance, when a critical security patch is committed to NixOS’s source tree), but may require more packages to be built from source than usual. They’re mostly intended for server environments and as such contain few GUI applications.
+     <emphasis>Small channels</emphasis>, such as
+     <literal
+    xlink:href="https://nixos.org/channels/nixos-19.03-small">nixos-19.03-small</literal>
+     or
+     <literal
+    xlink:href="https://nixos.org/channels/nixos-unstable-small">nixos-unstable-small</literal>.
+     These are identical to the stable and unstable channels described above,
+     except that they contain fewer binary packages. This means they get
+     updated faster than the regular channels (for instance, when a critical
+     security patch is committed to NixOS’s source tree), but may require
+     more packages to be built from source than usual. They’re mostly
+     intended for server environments and as such contain few GUI applications.
     </para>
    </listitem>
   </itemizedlist>
-  To see what channels are available, go to <link xlink:href="https://nixos.org/channels"/>. (Note that the URIs of the various channels redirect to a directory that contains the channel’s latest version and includes ISO images and VirtualBox appliances.) Please note that during the release process, channels that are not yet released will be present here as well. See the Getting NixOS page <link xlink:href="https://nixos.org/nixos/download.html"/> to find the newest supported stable release.
+  To see what channels are available, go to
+  <link xlink:href="https://nixos.org/channels"/>. (Note that the URIs of the
+  various channels redirect to a directory that contains the channel’s latest
+  version and includes ISO images and VirtualBox appliances.) Please note that
+  during the release process, channels that are not yet released will be
+  present here as well. See the Getting NixOS page
+  <link xlink:href="https://nixos.org/nixos/download.html"/> to find the newest
+  supported stable release.
  </para>
  <para>
-  When you first install NixOS, you’re automatically subscribed to the NixOS channel that corresponds to your installation source. For instance, if you installed from a 19.03 ISO, you will be subscribed to the <literal>nixos-19.03</literal> channel. To see which NixOS channel you’re subscribed to, run the following as root:
+  When you first install NixOS, you’re automatically subscribed to the NixOS
+  channel that corresponds to your installation source. For instance, if you
+  installed from a 19.03 ISO, you will be subscribed to the
+  <literal>nixos-19.03</literal> channel. To see which NixOS channel you’re
+  subscribed to, run the following as root:
 <screen>
 # nix-channel --list | grep nixos
 nixos https://nixos.org/channels/nixos-unstable
@@ -39,7 +74,8 @@ nixos https://nixos.org/channels/nixos-unstable
 <screen>
 # nix-channel --add https://nixos.org/channels/<replaceable>channel-name</replaceable> nixos
 </screen>
-  (Be sure to include the <literal>nixos</literal> parameter at the end.) For instance, to use the NixOS 19.03 stable channel:
+  (Be sure to include the <literal>nixos</literal> parameter at the end.) For
+  instance, to use the NixOS 19.03 stable channel:
 <screen>
 # nix-channel --add https://nixos.org/channels/nixos-19.03 nixos
 </screen>
@@ -53,31 +89,43 @@ nixos https://nixos.org/channels/nixos-unstable
 </screen>
  </para>
  <para>
-  You can then upgrade NixOS to the latest version in your chosen channel by running
+  You can then upgrade NixOS to the latest version in your chosen channel by
+  running
 <screen>
 # nixos-rebuild switch --upgrade
 </screen>
-  which is equivalent to the more verbose <literal>nix-channel --update nixos; nixos-rebuild switch</literal>.
+  which is equivalent to the more verbose <literal>nix-channel --update nixos;
+  nixos-rebuild switch</literal>.
  </para>
  <note>
   <para>
-   Channels are set per user. This means that running <literal> nix-channel --add</literal> as a non root user (or without sudo) will not affect configuration in <literal>/etc/nixos/configuration.nix</literal>
+   Channels are set per user. This means that running <literal> nix-channel
+   --add</literal> as a non root user (or without sudo) will not affect
+   configuration in <literal>/etc/nixos/configuration.nix</literal>
   </para>
  </note>
  <warning>
   <para>
-   It is generally safe to switch back and forth between channels. The only exception is that a newer NixOS may also have a newer Nix version, which may involve an upgrade of Nix’s database schema. This cannot be undone easily, so in that case you will not be able to go back to your original channel.
+   It is generally safe to switch back and forth between channels. The only
+   exception is that a newer NixOS may also have a newer Nix version, which may
+   involve an upgrade of Nix’s database schema. This cannot be undone easily,
+   so in that case you will not be able to go back to your original channel.
   </para>
  </warning>
  <section xml:id="sec-upgrading-automatic">
   <title>Automatic Upgrades</title>
 
   <para>
-   You can keep a NixOS system up-to-date automatically by adding the following to <filename>configuration.nix</filename>:
+   You can keep a NixOS system up-to-date automatically by adding the following
+   to <filename>configuration.nix</filename>:
 <programlisting>
 <xref linkend="opt-system.autoUpgrade.enable"/> = true;
 </programlisting>
-   This enables a periodically executed systemd service named <literal>nixos-upgrade.service</literal>. It runs <command>nixos-rebuild switch --upgrade</command> to upgrade NixOS to the latest version in the current channel. (To see when the service runs, see <command>systemctl list-timers</command>.) You can also specify a channel explicitly, e.g.
+   This enables a periodically executed systemd service named
+   <literal>nixos-upgrade.service</literal>. It runs <command>nixos-rebuild
+   switch --upgrade</command> to upgrade NixOS to the latest version in the
+   current channel. (To see when the service runs, see <command>systemctl
+   list-timers</command>.) You can also specify a channel explicitly, e.g.
 <programlisting>
 <xref linkend="opt-system.autoUpgrade.channel"/> = https://nixos.org/channels/nixos-19.03;
 </programlisting>
diff --git a/nixos/doc/manual/man-configuration.xml b/nixos/doc/manual/man-configuration.xml
index c6cbaaee541..9f30b792510 100644
--- a/nixos/doc/manual/man-configuration.xml
+++ b/nixos/doc/manual/man-configuration.xml
@@ -14,7 +14,10 @@
  <refsection>
   <title>Description</title>
   <para>
-   The file <filename>/etc/nixos/configuration.nix</filename> contains the declarative specification of your NixOS system configuration. The command <command>nixos-rebuild</command> takes this file and realises the system configuration specified therein.
+   The file <filename>/etc/nixos/configuration.nix</filename> contains the
+   declarative specification of your NixOS system configuration. The command
+   <command>nixos-rebuild</command> takes this file and realises the system
+   configuration specified therein.
   </para>
  </refsection>
  <refsection>
diff --git a/nixos/doc/manual/man-nixos-build-vms.xml b/nixos/doc/manual/man-nixos-build-vms.xml
index 98f29436b2d..7d6e04e0dd9 100644
--- a/nixos/doc/manual/man-nixos-build-vms.xml
+++ b/nixos/doc/manual/man-nixos-build-vms.xml
@@ -24,12 +24,14 @@
     
    <arg>
     <option>--help</option>
-   </arg>
-    
-   <arg>
-    <option>--option</option> <replaceable>name</replaceable> <replaceable>value</replaceable>
-   </arg>
-    
+  </arg>
+
+  <arg>
+    <option>--option</option>
+    <replaceable>name</replaceable>
+    <replaceable>value</replaceable>
+  </arg>
+
    <arg choice="plain">
     <replaceable>network.nix</replaceable>
    </arg>
@@ -38,7 +40,11 @@
  <refsection>
   <title>Description</title>
   <para>
-   This command builds a network of QEMU-KVM virtual machines of a Nix expression specifying a network of NixOS machines. The virtual network can be started by executing the <filename>bin/run-vms</filename> shell script that is generated by this command. By default, a <filename>result</filename> symlink is produced that points to the generated virtual network.
+   This command builds a network of QEMU-KVM virtual machines of a Nix
+   expression specifying a network of NixOS machines. The virtual network can
+   be started by executing the <filename>bin/run-vms</filename> shell script
+   that is generated by this command. By default, a <filename>result</filename>
+   symlink is produced that points to the generated virtual network.
   </para>
   <para>
    A network Nix expression has the following structure:
@@ -65,7 +71,18 @@
     };
 }
 </screen>
-   Each attribute in the expression represents a machine in the network (e.g. <varname>test1</varname> and <varname>test2</varname>) referring to a function defining a NixOS configuration. In each NixOS configuration, two attributes have a special meaning. The <varname>deployment.targetHost</varname> specifies the address (domain name or IP address) of the system which is used by <command>ssh</command> to perform remote deployment operations. The <varname>nixpkgs.localSystem.system</varname> attribute can be used to specify an architecture for the target machine, such as <varname>i686-linux</varname> which builds a 32-bit NixOS configuration. Omitting this property will build the configuration for the same architecture as the host system.
+   Each attribute in the expression represents a machine in the network (e.g.
+   <varname>test1</varname> and <varname>test2</varname>) referring to a
+   function defining a NixOS configuration. In each NixOS configuration, two
+   attributes have a special meaning. The
+   <varname>deployment.targetHost</varname> specifies the address (domain name
+   or IP address) of the system which is used by <command>ssh</command> to
+   perform remote deployment operations. The
+   <varname>nixpkgs.localSystem.system</varname> attribute can be used to
+   specify an architecture for the target machine, such as
+   <varname>i686-linux</varname> which builds a 32-bit NixOS configuration.
+   Omitting this property will build the configuration for the same
+   architecture as the host system.
   </para>
  </refsection>
  <refsection>
@@ -109,10 +126,10 @@
      <option>--option</option> <replaceable>name</replaceable> <replaceable>value</replaceable>
     </term>
     <listitem>
-     <para>
-      Set the Nix configuration option <replaceable>name</replaceable> to <replaceable>value</replaceable>. This overrides settings in the Nix configuration file (see <citerefentry>
-      <refentrytitle>nix.conf</refentrytitle>
-      <manvolnum>5</manvolnum></citerefentry>).
+     <para>Set the Nix configuration option
+      <replaceable>name</replaceable> to <replaceable>value</replaceable>.
+      This overrides settings in the Nix configuration file (see
+      <citerefentry><refentrytitle>nix.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>).
      </para>
     </listitem>
    </varlistentry>
diff --git a/nixos/doc/manual/man-nixos-enter.xml b/nixos/doc/manual/man-nixos-enter.xml
index 8cea628a694..1481db46712 100644
--- a/nixos/doc/manual/man-nixos-enter.xml
+++ b/nixos/doc/manual/man-nixos-enter.xml
@@ -34,7 +34,7 @@
     </arg>
      <replaceable>shell-command</replaceable>
    </arg>
-    
+
    <arg>
     <arg choice='plain'>
      <option>--silent</option>
@@ -58,7 +58,9 @@
  <refsection>
   <title>Description</title>
   <para>
-   This command runs a command in a NixOS chroot environment, that is, in a filesystem hierarchy previously prepared using <command>nixos-install</command>.
+   This command runs a command in a NixOS chroot environment, that is, in a
+   filesystem hierarchy previously prepared using
+   <command>nixos-install</command>.
   </para>
  </refsection>
  <refsection>
@@ -73,7 +75,8 @@
     </term>
     <listitem>
      <para>
-      The path to the NixOS system you want to enter. It defaults to <filename>/mnt</filename>.
+      The path to the NixOS system you want to enter. It defaults to
+      <filename>/mnt</filename>.
      </para>
     </listitem>
    </varlistentry>
@@ -83,7 +86,10 @@
     </term>
     <listitem>
      <para>
-      The NixOS system configuration to use. It defaults to <filename>/nix/var/nix/profiles/system</filename>. You can enter a previous NixOS configuration by specifying a path such as <filename>/nix/var/nix/profiles/system-106-link</filename>.
+      The NixOS system configuration to use. It defaults to
+      <filename>/nix/var/nix/profiles/system</filename>. You can enter a
+      previous NixOS configuration by specifying a path such as
+      <filename>/nix/var/nix/profiles/system-106-link</filename>.
      </para>
     </listitem>
    </varlistentry>
@@ -106,7 +112,7 @@
     </term>
     <listitem>
      <para>
-      Suppresses all output from the activation script of the target system.
+       Suppresses all output from the activation script of the target system.
      </para>
     </listitem>
    </varlistentry>
@@ -116,7 +122,8 @@
     </term>
     <listitem>
      <para>
-      Interpret the remaining arguments as the program name and arguments to be invoked. The program is not executed in a shell.
+      Interpret the remaining arguments as the program name and arguments to be
+      invoked. The program is not executed in a shell.
      </para>
     </listitem>
    </varlistentry>
@@ -125,7 +132,8 @@
  <refsection>
   <title>Examples</title>
   <para>
-   Start an interactive shell in the NixOS installation in <filename>/mnt</filename>:
+   Start an interactive shell in the NixOS installation in
+   <filename>/mnt</filename>:
   </para>
 <screen>
 # nixos-enter /mnt
diff --git a/nixos/doc/manual/man-nixos-generate-config.xml b/nixos/doc/manual/man-nixos-generate-config.xml
index 3ebfd50f036..61531a8f01c 100644
--- a/nixos/doc/manual/man-nixos-generate-config.xml
+++ b/nixos/doc/manual/man-nixos-generate-config.xml
@@ -13,18 +13,18 @@
  </refnamediv>
  <refsynopsisdiv>
   <cmdsynopsis>
-   <command>nixos-generate-config</command> 
+   <command>nixos-generate-config</command>
    <arg>
     <option>--force</option>
    </arg>
-    
+
    <arg>
     <arg choice='plain'>
      <option>--root</option>
     </arg>
      <replaceable>root</replaceable>
    </arg>
-    
+
    <arg>
     <arg choice='plain'>
      <option>--dir</option>
@@ -44,10 +44,20 @@
      </term>
      <listitem>
       <para>
-       This module sets NixOS configuration options based on your current hardware configuration. In particular, it sets the <option>fileSystem</option> option to reflect all currently mounted file systems, the <option>swapDevices</option> option to reflect active swap devices, and the <option>boot.initrd.*</option> options to ensure that the initial ramdisk contains any kernel modules necessary for mounting the root file system.
+       This module sets NixOS configuration options based on your current
+       hardware configuration. In particular, it sets the
+       <option>fileSystem</option> option to reflect all currently mounted file
+       systems, the <option>swapDevices</option> option to reflect active swap
+       devices, and the <option>boot.initrd.*</option> options to ensure that
+       the initial ramdisk contains any kernel modules necessary for mounting
+       the root file system.
       </para>
       <para>
-       If this file already exists, it is overwritten. Thus, you should not modify it manually. Rather, you should include it from your <filename>/etc/nixos/configuration.nix</filename>, and re-run <command>nixos-generate-config</command> to update it whenever your hardware configuration changes.
+       If this file already exists, it is overwritten. Thus, you should not
+       modify it manually. Rather, you should include it from your
+       <filename>/etc/nixos/configuration.nix</filename>, and re-run
+       <command>nixos-generate-config</command> to update it whenever your
+       hardware configuration changes.
       </para>
      </listitem>
     </varlistentry>
@@ -57,7 +67,10 @@
      </term>
      <listitem>
       <para>
-       This is the main NixOS system configuration module. If it already exists, it’s left unchanged. Otherwise, <command>nixos-generate-config</command> will write a template for you to customise.
+       This is the main NixOS system configuration module. If it already
+       exists, it’s left unchanged. Otherwise,
+       <command>nixos-generate-config</command> will write a template for you
+       to customise.
       </para>
      </listitem>
     </varlistentry>
@@ -76,7 +89,12 @@
     </term>
     <listitem>
      <para>
-      If this option is given, treat the directory <replaceable>root</replaceable> as the root of the file system. This means that configuration files will be written to <filename><replaceable>root</replaceable>/etc/nixos</filename>, and that any file systems outside of <replaceable>root</replaceable> are ignored for the purpose of generating the <option>fileSystems</option> option.
+      If this option is given, treat the directory
+      <replaceable>root</replaceable> as the root of the file system. This
+      means that configuration files will be written to
+      <filename><replaceable>root</replaceable>/etc/nixos</filename>, and that
+      any file systems outside of <replaceable>root</replaceable> are ignored
+      for the purpose of generating the <option>fileSystems</option> option.
      </para>
     </listitem>
    </varlistentry>
@@ -86,7 +104,9 @@
     </term>
     <listitem>
      <para>
-      If this option is given, write the configuration files to the directory <replaceable>dir</replaceable> instead of <filename>/etc/nixos</filename>.
+      If this option is given, write the configuration files to the directory
+      <replaceable>dir</replaceable> instead of
+      <filename>/etc/nixos</filename>.
      </para>
     </listitem>
    </varlistentry>
@@ -96,7 +116,8 @@
     </term>
     <listitem>
      <para>
-      Overwrite <filename>/etc/nixos/configuration.nix</filename> if it already exists.
+      Overwrite <filename>/etc/nixos/configuration.nix</filename> if it already
+      exists.
      </para>
     </listitem>
    </varlistentry>
@@ -106,7 +127,8 @@
     </term>
     <listitem>
      <para>
-      Omit everything concerning file systems and swap devices from the hardware configuration.
+      Omit everything concerning file systems and swap devices from the
+      hardware configuration.
      </para>
     </listitem>
    </varlistentry>
@@ -116,7 +138,9 @@
     </term>
     <listitem>
      <para>
-      Don't generate <filename>configuration.nix</filename> or <filename>hardware-configuration.nix</filename> and print the hardware configuration to stdout only.
+      Don't generate <filename>configuration.nix</filename> or
+      <filename>hardware-configuration.nix</filename> and print the hardware
+      configuration to stdout only.
      </para>
     </listitem>
    </varlistentry>
@@ -125,11 +149,16 @@
  <refsection>
   <title>Examples</title>
   <para>
-   This command is typically used during NixOS installation to write initial configuration modules. For example, if you created and mounted the target file systems on <filename>/mnt</filename> and <filename>/mnt/boot</filename>, you would run:
+   This command is typically used during NixOS installation to write initial
+   configuration modules. For example, if you created and mounted the target
+   file systems on <filename>/mnt</filename> and
+   <filename>/mnt/boot</filename>, you would run:
 <screen>
 <prompt>$ </prompt>nixos-generate-config --root /mnt
 </screen>
-   The resulting file <filename>/mnt/etc/nixos/hardware-configuration.nix</filename> might look like this:
+   The resulting file
+   <filename>/mnt/etc/nixos/hardware-configuration.nix</filename> might look
+   like this:
 <programlisting>
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
@@ -164,7 +193,10 @@
   nix.maxJobs = 8;
 }
 </programlisting>
-   It will also create a basic <filename>/mnt/etc/nixos/configuration.nix</filename>, which you should edit to customise the logical configuration of your system. This file includes the result of the hardware scan as follows:
+   It will also create a basic
+   <filename>/mnt/etc/nixos/configuration.nix</filename>, which you should edit
+   to customise the logical configuration of your system. This file includes
+   the result of the hardware scan as follows:
 <programlisting>
   imports = [ ./hardware-configuration.nix ];
 </programlisting>
@@ -174,7 +206,9 @@
 <screen>
 <prompt>$ </prompt>nixos-generate-config
 </screen>
-   to update <filename>/etc/nixos/hardware-configuration.nix</filename>. Your <filename>/etc/nixos/configuration.nix</filename> will <emphasis>not</emphasis> be overwritten.
+   to update <filename>/etc/nixos/hardware-configuration.nix</filename>. Your
+   <filename>/etc/nixos/configuration.nix</filename> will
+   <emphasis>not</emphasis> be overwritten.
   </para>
  </refsection>
 </refentry>
diff --git a/nixos/doc/manual/man-nixos-install.xml b/nixos/doc/manual/man-nixos-install.xml
index aec01b0ee3b..4fb94ee7494 100644
--- a/nixos/doc/manual/man-nixos-install.xml
+++ b/nixos/doc/manual/man-nixos-install.xml
@@ -13,72 +13,72 @@
  </refnamediv>
  <refsynopsisdiv>
   <cmdsynopsis>
-   <command>nixos-install</command> 
+   <command>nixos-install</command>
    <arg>
     <arg choice='plain'>
      <option>-I</option>
     </arg>
      <replaceable>path</replaceable>
    </arg>
-    
+
    <arg>
     <arg choice='plain'>
      <option>--root</option>
     </arg>
      <replaceable>root</replaceable>
    </arg>
-    
+
    <arg>
     <arg choice='plain'>
      <option>--system</option>
     </arg>
      <replaceable>path</replaceable>
    </arg>
-    
+
    <arg>
     <arg choice='plain'>
      <option>--no-channel-copy</option>
     </arg>
    </arg>
-    
+
    <arg>
     <arg choice='plain'>
      <option>--no-root-passwd</option>
     </arg>
    </arg>
-    
+
    <arg>
     <arg choice='plain'>
      <option>--no-bootloader</option>
     </arg>
    </arg>
-    
+
    <arg>
-    <group choice='req'> 
+    <group choice='req'>
     <arg choice='plain'>
      <option>--max-jobs</option>
     </arg>
-     
+
     <arg choice='plain'>
      <option>-j</option>
     </arg>
      </group> <replaceable>number</replaceable>
    </arg>
-    
+
    <arg>
     <option>--cores</option> <replaceable>number</replaceable>
    </arg>
-    
+
    <arg>
     <option>--option</option> <replaceable>name</replaceable> <replaceable>value</replaceable>
    </arg>
-    
+
    <arg>
     <arg choice='plain'>
      <option>--show-trace</option>
     </arg>
    </arg>
-    
+
    <arg>
     <arg choice='plain'>
      <option>--help</option>
@@ -89,32 +89,43 @@
  <refsection>
   <title>Description</title>
   <para>
-   This command installs NixOS in the file system mounted on <filename>/mnt</filename>, based on the NixOS configuration specified in <filename>/mnt/etc/nixos/configuration.nix</filename>. It performs the following steps:
+   This command installs NixOS in the file system mounted on
+   <filename>/mnt</filename>, based on the NixOS configuration specified in
+   <filename>/mnt/etc/nixos/configuration.nix</filename>. It performs the
+   following steps:
    <itemizedlist>
     <listitem>
      <para>
-      It copies Nix and its dependencies to <filename>/mnt/nix/store</filename>.
+      It copies Nix and its dependencies to
+      <filename>/mnt/nix/store</filename>.
      </para>
     </listitem>
     <listitem>
      <para>
-      It runs Nix in <filename>/mnt</filename> to build the NixOS configuration specified in <filename>/mnt/etc/nixos/configuration.nix</filename>.
+      It runs Nix in <filename>/mnt</filename> to build the NixOS configuration
+      specified in <filename>/mnt/etc/nixos/configuration.nix</filename>.
      </para>
     </listitem>
     <listitem>
      <para>
-      It installs the GRUB boot loader on the device specified in the option <option>boot.loader.grub.device</option> (unless <option>--no-bootloader</option> is specified), and generates a GRUB configuration file that boots into the NixOS configuration just installed.
+      It installs the GRUB boot loader on the device specified in the option
+      <option>boot.loader.grub.device</option> (unless
+      <option>--no-bootloader</option> is specified), and generates a GRUB
+      configuration file that boots into the NixOS configuration just
+      installed.
      </para>
     </listitem>
     <listitem>
      <para>
-      It prompts you for a password for the root account (unless <option>--no-root-passwd</option> is specified).
+      It prompts you for a password for the root account (unless
+      <option>--no-root-passwd</option> is specified).
      </para>
     </listitem>
    </itemizedlist>
   </para>
   <para>
-   This command is idempotent: if it is interrupted or fails due to a temporary problem (e.g. a network issue), you can safely re-run it.
+   This command is idempotent: if it is interrupted or fails due to a temporary
+   problem (e.g. a network issue), you can safely re-run it.
   </para>
  </refsection>
  <refsection>
@@ -129,7 +140,9 @@
     </term>
     <listitem>
      <para>
-      Defaults to <filename>/mnt</filename>. If this option is given, treat the directory <replaceable>root</replaceable> as the root of the NixOS installation.
+      Defaults to <filename>/mnt</filename>. If this option is given, treat the
+      directory <replaceable>root</replaceable> as the root of the NixOS
+      installation.
      </para>
     </listitem>
    </varlistentry>
@@ -139,10 +152,16 @@
     </term>
     <listitem>
      <para>
-      If this option is provided, <command>nixos-install</command> will install the specified closure rather than attempt to build one from <filename>/mnt/etc/nixos/configuration.nix</filename>.
+      If this option is provided, <command>nixos-install</command> will install
+      the specified closure rather than attempt to build one from
+      <filename>/mnt/etc/nixos/configuration.nix</filename>.
      </para>
      <para>
-      The closure must be an appropriately configured NixOS system, with boot loader and partition configuration that fits the target host. Such a closure is typically obtained with a command such as <command>nix-build -I nixos-config=./configuration.nix '&lt;nixos&gt;' -A system --no-out-link</command>
+      The closure must be an appropriately configured NixOS system, with boot
+      loader and partition configuration that fits the target host. Such a
+      closure is typically obtained with a command such as <command>nix-build
+      -I nixos-config=./configuration.nix '&lt;nixos&gt;' -A system
+      --no-out-link</command>
      </para>
     </listitem>
    </varlistentry>
@@ -152,7 +171,10 @@
     </term>
     <listitem>
      <para>
-      Add a path to the Nix expression search path. This option may be given multiple times. See the NIX_PATH environment variable for information on the semantics of the Nix search path. Paths added through <replaceable>-I</replaceable> take precedence over NIX_PATH.
+      Add a path to the Nix expression search path. This option may be given
+      multiple times. See the NIX_PATH environment variable for information on
+      the semantics of the Nix search path. Paths added through
+      <replaceable>-I</replaceable> take precedence over NIX_PATH.
      </para>
     </listitem>
    </varlistentry>
@@ -165,7 +187,9 @@
     </term>
     <listitem>
      <para>
-      Sets the maximum number of build jobs that Nix will perform in parallel to the specified number. The default is <literal>1</literal>. A higher value is useful on SMP systems or to exploit I/O latency.
+      Sets the maximum number of build jobs that Nix will perform in parallel
+      to the specified number. The default is <literal>1</literal>. A higher
+      value is useful on SMP systems or to exploit I/O latency.
      </para>
     </listitem>
    </varlistentry>
@@ -175,7 +199,15 @@
     </term>
     <listitem>
      <para>
-      Sets the value of the <envar>NIX_BUILD_CORES</envar> environment variable in the invocation of builders. Builders can use this variable at their discretion to control the maximum amount of parallelism. For instance, in Nixpkgs, if the derivation attribute <varname>enableParallelBuilding</varname> is set to <literal>true</literal>, the builder passes the <option>-j<replaceable>N</replaceable></option> flag to GNU Make. The value <literal>0</literal> means that the builder should use all available CPU cores in the system.
+      Sets the value of the <envar>NIX_BUILD_CORES</envar> environment variable
+      in the invocation of builders. Builders can use this variable at their
+      discretion to control the maximum amount of parallelism. For instance, in
+      Nixpkgs, if the derivation attribute
+      <varname>enableParallelBuilding</varname> is set to
+      <literal>true</literal>, the builder passes the
+      <option>-j<replaceable>N</replaceable></option> flag to GNU Make. The
+      value <literal>0</literal> means that the builder should use all
+      available CPU cores in the system.
      </para>
     </listitem>
    </varlistentry>
@@ -185,7 +217,8 @@
     </term>
     <listitem>
      <para>
-      Set the Nix configuration option <replaceable>name</replaceable> to <replaceable>value</replaceable>.
+      Set the Nix configuration option <replaceable>name</replaceable> to
+      <replaceable>value</replaceable>.
      </para>
     </listitem>
    </varlistentry>
@@ -195,7 +228,8 @@
     </term>
     <listitem>
      <para>
-      Causes Nix to print out a stack trace in case of Nix expression evaluation errors.
+      Causes Nix to print out a stack trace in case of Nix expression
+      evaluation errors.
      </para>
     </listitem>
    </varlistentry>
@@ -214,7 +248,12 @@
  <refsection>
   <title>Examples</title>
   <para>
-   A typical NixOS installation is done by creating and mounting a file system on <filename>/mnt</filename>, generating a NixOS configuration in <filename>/mnt/etc/nixos/configuration.nix</filename>, and running <command>nixos-install</command>. For instance, if we want to install NixOS on an <literal>ext4</literal> file system created in <filename>/dev/sda1</filename>:
+   A typical NixOS installation is done by creating and mounting a file system
+   on <filename>/mnt</filename>, generating a NixOS configuration in
+   <filename>/mnt/etc/nixos/configuration.nix</filename>, and running
+   <command>nixos-install</command>. For instance, if we want to install NixOS
+   on an <literal>ext4</literal> file system created in
+   <filename>/dev/sda1</filename>:
 <screen>
 <prompt>$ </prompt>mkfs.ext4 /dev/sda1
 <prompt>$ </prompt>mount /dev/sda1 /mnt
diff --git a/nixos/doc/manual/man-nixos-option.xml b/nixos/doc/manual/man-nixos-option.xml
index 29a6ca08205..3e316e10d4e 100644
--- a/nixos/doc/manual/man-nixos-option.xml
+++ b/nixos/doc/manual/man-nixos-option.xml
@@ -13,19 +13,19 @@
  </refnamediv>
  <refsynopsisdiv>
   <cmdsynopsis>
-   <command>nixos-option</command> 
+   <command>nixos-option</command>
    <arg>
     <option>-I</option> <replaceable>path</replaceable>
    </arg>
-    
+
    <arg>
     <option>--verbose</option>
    </arg>
-    
+
    <arg>
     <option>--xml</option>
    </arg>
-    
+
    <arg choice="plain">
     <replaceable>option.name</replaceable>
    </arg>
@@ -34,10 +34,13 @@
  <refsection>
   <title>Description</title>
   <para>
-   This command evaluates the configuration specified in <filename>/etc/nixos/configuration.nix</filename> and returns the properties of the option name given as argument.
+   This command evaluates the configuration specified in
+   <filename>/etc/nixos/configuration.nix</filename> and returns the properties
+   of the option name given as argument.
   </para>
   <para>
-   When the option name is not an option, the command prints the list of attributes contained in the attribute set.
+   When the option name is not an option, the command prints the list of
+   attributes contained in the attribute set.
   </para>
  </refsection>
  <refsection>
@@ -52,7 +55,8 @@
     </term>
     <listitem>
      <para>
-      This option is passed to the underlying <command>nix-instantiate</command> invocation.
+      This option is passed to the underlying
+      <command>nix-instantiate</command> invocation.
      </para>
     </listitem>
    </varlistentry>
@@ -62,7 +66,8 @@
     </term>
     <listitem>
      <para>
-      This option enables verbose mode, which currently is just the Bash <command>set</command> <option>-x</option> debug mode.
+      This option enables verbose mode, which currently is just the Bash
+      <command>set</command> <option>-x</option> debug mode.
      </para>
     </listitem>
    </varlistentry>
@@ -87,7 +92,8 @@
     </term>
     <listitem>
      <para>
-      Path to the main NixOS configuration module. Defaults to <filename>/etc/nixos/configuration.nix</filename>.
+      Path to the main NixOS configuration module. Defaults to
+      <filename>/etc/nixos/configuration.nix</filename>.
      </para>
     </listitem>
    </varlistentry>
@@ -124,7 +130,8 @@ Defined by:
  <refsection>
   <title>Bugs</title>
   <para>
-   The author listed in the following section is wrong. If there is any other bug, please report to Nicolas Pierron.
+   The author listed in the following section is wrong. If there is any other
+   bug, please report to Nicolas Pierron.
   </para>
  </refsection>
 </refentry>
diff --git a/nixos/doc/manual/man-nixos-rebuild.xml b/nixos/doc/manual/man-nixos-rebuild.xml
index 85929bf1b15..a83c4fb965e 100644
--- a/nixos/doc/manual/man-nixos-rebuild.xml
+++ b/nixos/doc/manual/man-nixos-rebuild.xml
@@ -7,45 +7,47 @@
   <refmiscinfo class="source">NixOS</refmiscinfo>
 <!-- <refmiscinfo class="version"><xi:include href="version.txt" parse="text"/></refmiscinfo> -->
  </refmeta>
+
  <refnamediv>
   <refname><command>nixos-rebuild</command>
   </refname><refpurpose>reconfigure a NixOS machine</refpurpose>
  </refnamediv>
+
  <refsynopsisdiv>
   <cmdsynopsis>
-   <command>nixos-rebuild</command><group choice='req'> 
+   <command>nixos-rebuild</command><group choice='req'>
    <arg choice='plain'>
     <option>switch</option>
    </arg>
-    
+
    <arg choice='plain'>
     <option>boot</option>
    </arg>
-    
+
    <arg choice='plain'>
     <option>test</option>
    </arg>
-    
+
    <arg choice='plain'>
     <option>build</option>
    </arg>
-    
+
    <arg choice='plain'>
     <option>dry-build</option>
    </arg>
-    
+
    <arg choice='plain'>
     <option>dry-activate</option>
    </arg>
-    
+
    <arg choice='plain'>
     <option>edit</option>
    </arg>
-    
+
    <arg choice='plain'>
     <option>build-vm</option>
    </arg>
-    
+
    <arg choice='plain'>
     <option>build-vm-with-bootloader</option>
    </arg>
@@ -54,33 +56,34 @@
    <arg>
     <option>--upgrade</option>
    </arg>
-    
+
    <arg>
     <option>--install-bootloader</option>
    </arg>
-    
+
    <arg>
     <option>--no-build-nix</option>
    </arg>
-    
+
    <arg>
     <option>--fast</option>
    </arg>
-    
+
    <arg>
     <option>--rollback</option>
    </arg>
-    
+
    <arg>
     <option>--builders</option> <replaceable>builder-spec</replaceable>
    </arg>
+
    <sbr />
    <arg>
-    <group choice='req'> 
+    <group choice='req'>
     <arg choice='plain'>
      <option>--profile-name</option>
     </arg>
-     
+
     <arg choice='plain'>
      <option>-p</option>
     </arg>
@@ -90,67 +93,56 @@
    <arg>
     <option>--show-trace</option>
    </arg>
-    
    <arg>
-    <option>-I</option> <replaceable>path</replaceable>
+    <option>-I</option>
+    <replaceable>path</replaceable>
    </arg>
-    
    <arg>
-    <group choice='req'> 
-    <arg choice='plain'>
-     <option>--verbose</option>
-    </arg>
-     
-    <arg choice='plain'>
-     <option>-v</option>
-    </arg>
-     </group>
+    <group choice='req'>
+     <arg choice='plain'><option>--verbose</option></arg>
+     <arg choice='plain'><option>-v</option></arg>
+    </group>
    </arg>
-    
    <arg>
-    <group choice='req'> 
-    <arg choice='plain'>
-     <option>--max-jobs</option>
-    </arg>
-     
-    <arg choice='plain'>
-     <option>-j</option>
-    </arg>
-     </group> <replaceable>number</replaceable>
+    <group choice='req'>
+     <arg choice='plain'><option>--max-jobs</option></arg>
+     <arg choice='plain'><option>-j</option></arg>
+    </group>
+    <replaceable>number</replaceable>
    </arg>
-    
    <arg>
-    <group choice='req'> 
-    <arg choice='plain'>
-     <option>--keep-failed</option>
-    </arg>
-     
-    <arg choice='plain'>
-     <option>-K</option>
-    </arg>
-     </group>
+    <group choice='req'>
+     <arg choice='plain'><option>--keep-failed</option></arg>
+     <arg choice='plain'><option>-K</option></arg>
+    </group>
    </arg>
-    
    <arg>
-    <group choice='req'> 
-    <arg choice='plain'>
-     <option>--keep-going</option>
-    </arg>
-     
-    <arg choice='plain'>
-     <option>-k</option>
-    </arg>
-     </group>
+    <group choice='req'>
+     <arg choice='plain'><option>--keep-going</option></arg>
+     <arg choice='plain'><option>-k</option></arg>
+    </group>
    </arg>
   </cmdsynopsis>
  </refsynopsisdiv>
+
  <refsection>
   <title>Description</title>
+
   <para>
-   This command updates the system so that it corresponds to the configuration specified in <filename>/etc/nixos/configuration.nix</filename>. Thus, every time you modify <filename>/etc/nixos/configuration.nix</filename> or any NixOS module, you must run <command>nixos-rebuild</command> to make the changes take effect. It builds the new system in <filename>/nix/store</filename>, runs its activation script, and stop and (re)starts any system services if needed. Please note that user services need to be started manually as they aren't detected by the activation script at the moment.
+   This command updates the system so that it corresponds to the configuration
+   specified in <filename>/etc/nixos/configuration.nix</filename>. Thus, every
+   time you modify <filename>/etc/nixos/configuration.nix</filename> or any
+   NixOS module, you must run <command>nixos-rebuild</command> to make the
+   changes take effect. It builds the new system in
+   <filename>/nix/store</filename>, runs its activation script, and stop and
+   (re)starts any system services if needed. Please note that user services need
+   to be started manually as they aren't detected by the activation script at the moment.
   </para>
+
   <para>
-   This command has one required argument, which specifies the desired operation. It must be one of the following:
+   This command has one required argument, which specifies the desired
+   operation. It must be one of the following:
+
    <variablelist>
     <varlistentry>
      <term>
@@ -158,64 +150,91 @@
      </term>
      <listitem>
       <para>
-       Build and activate the new configuration, and make it the boot default. That is, the configuration is added to the GRUB boot menu as the default menu entry, so that subsequent reboots will boot the system into the new configuration. Previous configurations activated with <command>nixos-rebuild switch</command> or <command>nixos-rebuild boot</command> remain available in the GRUB menu.
+       Build and activate the new configuration, and make it the boot default.
+       That is, the configuration is added to the GRUB boot menu as the default
+       menu entry, so that subsequent reboots will boot the system into the new
+       configuration. Previous configurations activated with
+       <command>nixos-rebuild switch</command> or <command>nixos-rebuild
+       boot</command> remain available in the GRUB menu.
       </para>
      </listitem>
     </varlistentry>
+
     <varlistentry>
      <term>
       <option>boot</option>
      </term>
      <listitem>
       <para>
-       Build the new configuration and make it the boot default (as with <command>nixos-rebuild switch</command>), but do not activate it. That is, the system continues to run the previous configuration until the next reboot.
+       Build the new configuration and make it the boot default (as with
+       <command>nixos-rebuild switch</command>), but do not activate it. That
+       is, the system continues to run the previous configuration until the
+       next reboot.
       </para>
      </listitem>
     </varlistentry>
+
     <varlistentry>
      <term>
       <option>test</option>
      </term>
      <listitem>
       <para>
-       Build and activate the new configuration, but do not add it to the GRUB boot menu. Thus, if you reboot the system (or if it crashes), you will automatically revert to the default configuration (i.e. the configuration resulting from the last call to <command>nixos-rebuild switch</command> or <command>nixos-rebuild boot</command>).
+       Build and activate the new configuration, but do not add it to the GRUB
+       boot menu. Thus, if you reboot the system (or if it crashes), you will
+       automatically revert to the default configuration (i.e. the
+       configuration resulting from the last call to <command>nixos-rebuild
+       switch</command> or <command>nixos-rebuild boot</command>).
       </para>
      </listitem>
     </varlistentry>
+
     <varlistentry>
      <term>
       <option>build</option>
      </term>
      <listitem>
       <para>
-       Build the new configuration, but neither activate it nor add it to the GRUB boot menu. It leaves a symlink named <filename>result</filename> in the current directory, which points to the output of the top-level “system” derivation. This is essentially the same as doing
+       Build the new configuration, but neither activate it nor add it to the
+       GRUB boot menu. It leaves a symlink named <filename>result</filename> in
+       the current directory, which points to the output of the top-level
+       “system” derivation. This is essentially the same as doing
 <screen>
 <prompt>$ </prompt>nix-build /path/to/nixpkgs/nixos -A system
 </screen>
-       Note that you do not need to be <literal>root</literal> to run <command>nixos-rebuild build</command>.
+       Note that you do not need to be <literal>root</literal> to run
+       <command>nixos-rebuild build</command>.
       </para>
      </listitem>
     </varlistentry>
+
     <varlistentry>
      <term>
       <option>dry-build</option>
      </term>
      <listitem>
       <para>
-       Show what store paths would be built or downloaded by any of the operations above, but otherwise do nothing.
+       Show what store paths would be built or downloaded by any of the
+       operations above, but otherwise do nothing.
       </para>
      </listitem>
     </varlistentry>
+
     <varlistentry>
      <term>
       <option>dry-activate</option>
      </term>
      <listitem>
       <para>
-       Build the new configuration, but instead of activating it, show what changes would be performed by the activation (i.e. by <command>nixos-rebuild test</command>). For instance, this command will print which systemd units would be restarted. The list of changes is not guaranteed to be complete.
+       Build the new configuration, but instead of activating it, show what
+       changes would be performed by the activation (i.e. by
+       <command>nixos-rebuild test</command>). For instance, this command will
+       print which systemd units would be restarted. The list of changes is not
+       guaranteed to be complete.
       </para>
      </listitem>
     </varlistentry>
+
     <varlistentry>
      <term>
       <option>edit</option>
@@ -226,49 +245,80 @@
       </para>
      </listitem>
     </varlistentry>
+
     <varlistentry>
      <term>
       <option>build-vm</option>
      </term>
      <listitem>
       <para>
-       Build a script that starts a NixOS virtual machine with the desired configuration. It leaves a symlink <filename>result</filename> in the current directory that points (under <filename>result/bin/run-<replaceable>hostname</replaceable>-vm</filename>) at the script that starts the VM. Thus, to test a NixOS configuration in a virtual machine, you should do the following:
+       Build a script that starts a NixOS virtual machine with the desired
+       configuration. It leaves a symlink <filename>result</filename> in the
+       current directory that points (under
+       <filename>result/bin/run-<replaceable>hostname</replaceable>-vm</filename>)
+       at the script that starts the VM. Thus, to test a NixOS configuration in
+       a virtual machine, you should do the following:
 <screen>
 <prompt>$ </prompt>nixos-rebuild build-vm
 <prompt>$ </prompt>./result/bin/run-*-vm
 </screen>
       </para>
+
       <para>
-       The VM is implemented using the <literal>qemu</literal> package. For best performance, you should load the <literal>kvm-intel</literal> or <literal>kvm-amd</literal> kernel modules to get hardware virtualisation.
+       The VM is implemented using the <literal>qemu</literal> package. For
+       best performance, you should load the <literal>kvm-intel</literal> or
+       <literal>kvm-amd</literal> kernel modules to get hardware
+       virtualisation.
       </para>
+
       <para>
-       The VM mounts the Nix store of the host through the 9P file system. The host Nix store is read-only, so Nix commands that modify the Nix store will not work in the VM. This includes commands such as <command>nixos-rebuild</command>; to change the VM’s configuration, you must halt the VM and re-run the commands above.
+       The VM mounts the Nix store of the host through the 9P file system. The
+       host Nix store is read-only, so Nix commands that modify the Nix store
+       will not work in the VM. This includes commands such as
+       <command>nixos-rebuild</command>; to change the VM’s configuration,
+       you must halt the VM and re-run the commands above.
       </para>
+
       <para>
-       The VM has its own <literal>ext3</literal> root file system, which is automatically created when the VM is first started, and is persistent across reboots of the VM. It is stored in <literal>./<replaceable>hostname</replaceable>.qcow2</literal>.
+       The VM has its own <literal>ext3</literal> root file system, which is
+       automatically created when the VM is first started, and is persistent
+       across reboots of the VM. It is stored in
+       <literal>./<replaceable>hostname</replaceable>.qcow2</literal>.
 <!-- The entire file system hierarchy of the host is available in
       the VM under <filename>/hostfs</filename>.-->
       </para>
      </listitem>
     </varlistentry>
+
     <varlistentry>
      <term>
       <option>build-vm-with-bootloader</option>
      </term>
      <listitem>
       <para>
-       Like <option>build-vm</option>, but boots using the regular boot loader of your configuration (e.g., GRUB 1 or 2), rather than booting directly into the kernel and initial ramdisk of the system. This allows you to test whether the boot loader works correctly. However, it does not guarantee that your NixOS configuration will boot successfully on the host hardware (i.e., after running <command>nixos-rebuild switch</command>), because the hardware and boot loader configuration in the VM are different. The boot loader is installed on an automatically generated virtual disk containing a <filename>/boot</filename> partition, which is mounted read-only in the VM.
+       Like <option>build-vm</option>, but boots using the regular boot loader
+       of your configuration (e.g., GRUB 1 or 2), rather than booting directly
+       into the kernel and initial ramdisk of the system. This allows you to
+       test whether the boot loader works correctly. However, it does not
+       guarantee that your NixOS configuration will boot successfully on the
+       host hardware (i.e., after running <command>nixos-rebuild
+       switch</command>), because the hardware and boot loader configuration in
+       the VM are different. The boot loader is installed on an automatically
+       generated virtual disk containing a <filename>/boot</filename>
+       partition, which is mounted read-only in the VM.
       </para>
      </listitem>
     </varlistentry>
    </variablelist>
   </para>
  </refsection>
+
  <refsection>
   <title>Options</title>
   <para>
    This command accepts the following options:
   </para>
+
   <variablelist>
    <varlistentry>
     <term>
@@ -280,56 +330,84 @@
      </para>
     </listitem>
    </varlistentry>
+
    <varlistentry>
     <term>
      <option>--install-bootloader</option>
     </term>
     <listitem>
      <para>
-      Causes the boot loader to be (re)installed on the device specified by the relevant configuration options.
+      Causes the boot loader to be (re)installed on the device specified by the
+      relevant configuration options.
      </para>
     </listitem>
    </varlistentry>
+
    <varlistentry>
     <term>
      <option>--no-build-nix</option>
     </term>
     <listitem>
      <para>
-      Normally, <command>nixos-rebuild</command> first builds the <varname>nixUnstable</varname> attribute in Nixpkgs, and uses the resulting instance of the Nix package manager to build the new system configuration. This is necessary if the NixOS modules use features not provided by the currently installed version of Nix. This option disables building a new Nix.
+      Normally, <command>nixos-rebuild</command> first builds the
+      <varname>nixUnstable</varname> attribute in Nixpkgs, and uses the
+      resulting instance of the Nix package manager to build the new system
+      configuration. This is necessary if the NixOS modules use features not
+      provided by the currently installed version of Nix. This option disables
+      building a new Nix.
      </para>
     </listitem>
    </varlistentry>
+
    <varlistentry>
     <term>
      <option>--fast</option>
     </term>
     <listitem>
      <para>
-      Equivalent to <option>--no-build-nix</option> <option>--show-trace</option>. This option is useful if you call <command>nixos-rebuild</command> frequently (e.g. if you’re hacking on a NixOS module).
+      Equivalent to <option>--no-build-nix</option>
+      <option>--show-trace</option>. This option is useful if you call
+      <command>nixos-rebuild</command> frequently (e.g. if you’re hacking on
+      a NixOS module).
      </para>
     </listitem>
    </varlistentry>
+
    <varlistentry>
     <term>
      <option>--rollback</option>
     </term>
     <listitem>
      <para>
-      Instead of building a new configuration as specified by <filename>/etc/nixos/configuration.nix</filename>, roll back to the previous configuration. (The previous configuration is defined as the one before the “current” generation of the Nix profile <filename>/nix/var/nix/profiles/system</filename>.)
+      Instead of building a new configuration as specified by
+      <filename>/etc/nixos/configuration.nix</filename>, roll back to the
+      previous configuration. (The previous configuration is defined as the one
+      before the “current” generation of the Nix profile
+      <filename>/nix/var/nix/profiles/system</filename>.)
      </para>
     </listitem>
    </varlistentry>
+
    <varlistentry>
     <term>
      <option>--builders</option> <replaceable>builder-spec</replaceable>
     </term>
     <listitem>
      <para>
-      Allow ad-hoc remote builders for building the new system. This requires the user executing <command>nixos-rebuild</command> (usually root) to be configured as a trusted user in the Nix daemon. This can be achieved by using the <literal>nix.trustedUsers</literal> NixOS option. Examples values for that option are described in the <literal>Remote builds chapter</literal> in the Nix manual, (i.e. <command>--builders "ssh://bigbrother x86_64-linux"</command>). By specifying an empty string existing builders specified in <filename>/etc/nix/machines</filename> can be ignored: <command>--builders ""</command> for example when they are not reachable due to network connectivity.
+      Allow ad-hoc remote builders for building the new system. This requires
+      the user executing <command>nixos-rebuild</command> (usually root) to be
+      configured as a trusted user in the Nix daemon. This can be achieved by
+      using the <literal>nix.trustedUsers</literal> NixOS option. Examples
+      values for that option are described in the <literal>Remote builds
+      chapter</literal> in the Nix manual, (i.e. <command>--builders
+      "ssh://bigbrother x86_64-linux"</command>). By specifying an empty string
+      existing builders specified in <filename>/etc/nix/machines</filename> can
+      be ignored: <command>--builders ""</command> for example when they are
+      not reachable due to network connectivity.
      </para>
     </listitem>
    </varlistentry>
+
    <varlistentry>
     <term>
      <option>--profile-name</option>
@@ -339,56 +417,97 @@
     </term>
     <listitem>
      <para>
-      Instead of using the Nix profile <filename>/nix/var/nix/profiles/system</filename> to keep track of the current and previous system configurations, use <filename>/nix/var/nix/profiles/system-profiles/<replaceable>name</replaceable></filename>. When you use GRUB 2, for every system profile created with this flag, NixOS will create a submenu named “NixOS - Profile '<replaceable>name</replaceable>'” in GRUB’s boot menu, containing the current and previous configurations of this profile.
+      Instead of using the Nix profile
+      <filename>/nix/var/nix/profiles/system</filename> to keep track of the
+      current and previous system configurations, use
+      <filename>/nix/var/nix/profiles/system-profiles/<replaceable>name</replaceable></filename>.
+      When you use GRUB 2, for every system profile created with this flag,
+      NixOS will create a submenu named “NixOS - Profile
+      '<replaceable>name</replaceable>'” in GRUB’s boot menu, containing
+      the current and previous configurations of this profile.
      </para>
      <para>
-      For instance, if you want to test a configuration file named <filename>test.nix</filename> without affecting the default system profile, you would do:
+      For instance, if you want to test a configuration file named
+      <filename>test.nix</filename> without affecting the default system
+      profile, you would do:
 <screen>
 <prompt>$ </prompt>nixos-rebuild switch -p test -I nixos-config=./test.nix
 </screen>
-      The new configuration will appear in the GRUB 2 submenu “NixOS - Profile 'test'”.
+      The new configuration will appear in the GRUB 2 submenu “NixOS -
+      Profile 'test'”.
      </para>
     </listitem>
    </varlistentry>
+
    <varlistentry>
     <term>
      <option>--build-host</option>
     </term>
     <listitem>
      <para>
-      Instead of building the new configuration locally, use the specified host to perform the build. The host needs to be accessible with ssh, and must be able to perform Nix builds. If the option <option>--target-host</option> is not set, the build will be copied back to the local machine when done.
+      Instead of building the new configuration locally, use the specified host
+      to perform the build. The host needs to be accessible with ssh, and must
+      be able to perform Nix builds. If the option
+      <option>--target-host</option> is not set, the build will be copied back
+      to the local machine when done.
      </para>
      <para>
-      Note that, if <option>--no-build-nix</option> is not specified, Nix will be built both locally and remotely. This is because the configuration will always be evaluated locally even though the building might be performed remotely.
+      Note that, if <option>--no-build-nix</option> is not specified, Nix will
+      be built both locally and remotely. This is because the configuration
+      will always be evaluated locally even though the building might be
+      performed remotely.
      </para>
      <para>
-      You can include a remote user name in the host name (<replaceable>user@host</replaceable>). You can also set ssh options by defining the <envar>NIX_SSHOPTS</envar> environment variable.
+      You can include a remote user name in the host name
+      (<replaceable>user@host</replaceable>). You can also set ssh options by
+      defining the <envar>NIX_SSHOPTS</envar> environment variable.
      </para>
     </listitem>
    </varlistentry>
+
    <varlistentry>
     <term>
      <option>--target-host</option>
     </term>
     <listitem>
      <para>
-      Specifies the NixOS target host. By setting this to something other than <replaceable>localhost</replaceable>, the system activation will happen on the remote host instead of the local machine. The remote host needs to be accessible over ssh, and for the commands <option>switch</option>, <option>boot</option> and <option>test</option> you need root access.
+      Specifies the NixOS target host. By setting this to something other than
+      <replaceable>localhost</replaceable>, the system activation will happen
+      on the remote host instead of the local machine. The remote host needs to
+      be accessible over ssh, and for the commands <option>switch</option>,
+      <option>boot</option> and <option>test</option> you need root access.
      </para>
+
      <para>
-      If <option>--build-host</option> is not explicitly specified, <option>--build-host</option> will implicitly be set to the same value as <option>--target-host</option>. So, if you only specify <option>--target-host</option> both building and activation will take place remotely (and no build artifacts will be copied to the local machine).
+      If <option>--build-host</option> is not explicitly specified,
+      <option>--build-host</option> will implicitly be set to the same value as
+      <option>--target-host</option>. So, if you only specify
+      <option>--target-host</option> both building and activation will take
+      place remotely (and no build artifacts will be copied to the local
+      machine).
      </para>
+
      <para>
-      You can include a remote user name in the host name (<replaceable>user@host</replaceable>). You can also set ssh options by defining the <envar>NIX_SSHOPTS</envar> environment variable.
+      You can include a remote user name in the host name
+      (<replaceable>user@host</replaceable>). You can also set ssh options by
+      defining the <envar>NIX_SSHOPTS</envar> environment variable.
      </para>
     </listitem>
    </varlistentry>
   </variablelist>
+
   <para>
-   In addition, <command>nixos-rebuild</command> accepts various Nix-related flags, including <option>--max-jobs</option> / <option>-j</option>, <option>--show-trace</option>, <option>--keep-failed</option>, <option>--keep-going</option> and <option>--verbose</option> / <option>-v</option>. See the Nix manual for details.
+   In addition, <command>nixos-rebuild</command> accepts various Nix-related
+   flags, including <option>--max-jobs</option> / <option>-j</option>,
+   <option>--show-trace</option>, <option>--keep-failed</option>,
+   <option>--keep-going</option> and <option>--verbose</option> /
+   <option>-v</option>. See the Nix manual for details.
   </para>
  </refsection>
+
  <refsection>
   <title>Environment</title>
+
   <variablelist>
    <varlistentry>
     <term>
@@ -396,25 +515,31 @@
     </term>
     <listitem>
      <para>
-      Path to the main NixOS configuration module. Defaults to <filename>/etc/nixos/configuration.nix</filename>.
+      Path to the main NixOS configuration module. Defaults to
+      <filename>/etc/nixos/configuration.nix</filename>.
      </para>
     </listitem>
    </varlistentry>
+
    <varlistentry>
     <term>
      <envar>NIX_SSHOPTS</envar>
     </term>
     <listitem>
      <para>
-      Additional options to be passed to <command>ssh</command> on the command line.
+      Additional options to be passed to <command>ssh</command> on the command
+      line.
      </para>
     </listitem>
    </varlistentry>
   </variablelist>
  </refsection>
+
  <refsection>
   <title>Files</title>
+
   <variablelist>
+
    <varlistentry>
     <term>
      <filename>/run/current-system</filename>
@@ -425,18 +550,22 @@
      </para>
     </listitem>
    </varlistentry>
+
    <varlistentry>
     <term>
      <filename>/nix/var/nix/profiles/system</filename>
     </term>
     <listitem>
      <para>
-      The Nix profile that contains the current and previous system configurations. Used to generate the GRUB boot menu.
+      The Nix profile that contains the current and previous system
+      configurations. Used to generate the GRUB boot menu.
      </para>
     </listitem>
    </varlistentry>
+
   </variablelist>
  </refsection>
+
  <refsection>
   <title>Bugs</title>
   <para>
diff --git a/nixos/doc/manual/man-nixos-version.xml b/nixos/doc/manual/man-nixos-version.xml
index cb844da10f0..931c4a5ad02 100644
--- a/nixos/doc/manual/man-nixos-version.xml
+++ b/nixos/doc/manual/man-nixos-version.xml
@@ -25,7 +25,8 @@
  <refsection>
   <title>Description</title>
   <para>
-   This command shows the version of the currently active NixOS configuration. For example:
+   This command shows the version of the currently active NixOS configuration.
+   For example:
 <screen>$ nixos-version
 16.03.1011.6317da4 (Emu)
 </screen>
@@ -37,7 +38,8 @@
      </term>
      <listitem>
       <para>
-       The NixOS release, indicating the year and month in which it was released (e.g. March 2016).
+       The NixOS release, indicating the year and month in which it was
+       released (e.g. March 2016).
       </para>
      </listitem>
     </varlistentry>
@@ -47,7 +49,12 @@
      </term>
      <listitem>
       <para>
-       The number of commits in the Nixpkgs Git repository between the start of the release branch and the commit from which this version was built. This ensures that NixOS versions are monotonically increasing. It is <literal>git</literal> when the current NixOS configuration was built from a checkout of the Nixpkgs Git repository rather than from a NixOS channel.
+       The number of commits in the Nixpkgs Git repository between the start of
+       the release branch and the commit from which this version was built.
+       This ensures that NixOS versions are monotonically increasing. It is
+       <literal>git</literal> when the current NixOS configuration was built
+       from a checkout of the Nixpkgs Git repository rather than from a NixOS
+       channel.
       </para>
      </listitem>
     </varlistentry>
@@ -57,7 +64,8 @@
      </term>
      <listitem>
       <para>
-       The first 7 characters of the commit in the Nixpkgs Git repository from which this version was built.
+       The first 7 characters of the commit in the Nixpkgs Git repository from
+       which this version was built.
       </para>
      </listitem>
     </varlistentry>
@@ -67,7 +75,9 @@
      </term>
      <listitem>
       <para>
-       The code name of the NixOS release. The first letter of the code name indicates that this is the N'th stable NixOS release; for example, Emu is the fifth release.
+       The code name of the NixOS release. The first letter of the code name
+       indicates that this is the N'th stable NixOS release; for example, Emu
+       is the fifth release.
       </para>
      </listitem>
     </varlistentry>
@@ -89,7 +99,8 @@
     </term>
     <listitem>
      <para>
-      Show the full SHA1 hash of the Git commit from which this configuration was built, e.g.
+      Show the full SHA1 hash of the Git commit from which this configuration
+      was built, e.g.
 <screen>$ nixos-version --hash
 6317da40006f6bc2480c6781999c52d88dde2acf
 </screen>
diff --git a/nixos/doc/manual/manual.xml b/nixos/doc/manual/manual.xml
index 9f7260b2495..12f52e1997c 100644
--- a/nixos/doc/manual/manual.xml
+++ b/nixos/doc/manual/manual.xml
@@ -11,17 +11,26 @@
  <preface xml:id="preface">
   <title>Preface</title>
   <para>
-   This manual describes how to install, use and extend NixOS, a Linux distribution based on the purely functional package management system Nix.
+   This manual describes how to install, use and extend NixOS, a Linux
+   distribution based on the purely functional package management system Nix.
   </para>
   <para>
-   If you encounter problems, please report them on the <literal
-    xlink:href="https://discourse.nixos.org">Discourse</literal> or on the <link
-    xlink:href="irc://irc.freenode.net/#nixos"> <literal>#nixos</literal> channel on Freenode</link>. Bugs should be reported in <link
-    xlink:href="https://github.com/NixOS/nixpkgs/issues">NixOS’ GitHub issue tracker</link>.
+   If you encounter problems, please report them on the
+   <literal
+    xlink:href="https://discourse.nixos.org">Discourse</literal> or
+   on the <link
+    xlink:href="irc://irc.freenode.net/#nixos">
+   <literal>#nixos</literal> channel on Freenode</link>. Bugs should be
+   reported in
+   <link
+    xlink:href="https://github.com/NixOS/nixpkgs/issues">NixOS’
+   GitHub issue tracker</link>.
   </para>
   <note>
    <para>
-    Commands prefixed with <literal>#</literal> have to be run as root, either requiring to login as root user or temporarily switching to it using <literal>sudo</literal> for example.
+    Commands prefixed with <literal>#</literal> have to be run as root, either
+    requiring to login as root user or temporarily switching to it using
+    <literal>sudo</literal> for example.
    </para>
   </note>
  </preface>
diff --git a/nixos/doc/manual/release-notes/release-notes.xml b/nixos/doc/manual/release-notes/release-notes.xml
index 198f8eb3481..444862c5739 100644
--- a/nixos/doc/manual/release-notes/release-notes.xml
+++ b/nixos/doc/manual/release-notes/release-notes.xml
@@ -5,7 +5,8 @@
           xml:id="ch-release-notes">
  <title>Release Notes</title>
  <para>
-  This section lists the release notes for each stable version of NixOS and current unstable revision.
+  This section lists the release notes for each stable version of NixOS and
+  current unstable revision.
  </para>
  <xi:include href="rl-2003.xml" />
  <xi:include href="rl-1909.xml" />
diff --git a/nixos/doc/manual/release-notes/rl-1404.xml b/nixos/doc/manual/release-notes/rl-1404.xml
index 26dc5bb252e..8d8cea4303a 100644
--- a/nixos/doc/manual/release-notes/rl-1404.xml
+++ b/nixos/doc/manual/release-notes/rl-1404.xml
@@ -6,16 +6,23 @@
  <title>Release 14.04 (“Baboon”, 2014/04/30)</title>
 
  <para>
-  This is the second stable release branch of NixOS. In addition to numerous new and upgraded packages and modules, this release has the following highlights:
+  This is the second stable release branch of NixOS. In addition to numerous
+  new and upgraded packages and modules, this release has the following
+  highlights:
   <itemizedlist>
    <listitem>
     <para>
-     Installation on UEFI systems is now supported. See <xref linkend="sec-installation"/> for details.
+     Installation on UEFI systems is now supported. See
+     <xref linkend="sec-installation"/> for details.
     </para>
    </listitem>
    <listitem>
     <para>
-     Systemd has been updated to version 212, which has <link xlink:href="http://cgit.freedesktop.org/systemd/systemd/plain/NEWS?id=v212">numerous improvements</link>. NixOS now automatically starts systemd user instances when you log in. You can define global user units through the <option>systemd.unit.*</option> options.
+     Systemd has been updated to version 212, which has
+     <link xlink:href="http://cgit.freedesktop.org/systemd/systemd/plain/NEWS?id=v212">numerous
+     improvements</link>. NixOS now automatically starts systemd user instances
+     when you log in. You can define global user units through the
+     <option>systemd.unit.*</option> options.
     </para>
    </listitem>
    <listitem>
@@ -40,28 +47,47 @@
    </listitem>
    <listitem>
     <para>
-     Nix has been updated to 1.7 (<link
+     Nix has been updated to 1.7
+     (<link
   xlink:href="http://nixos.org/nix/manual/#ssec-relnotes-1.7">details</link>).
     </para>
    </listitem>
    <listitem>
     <para>
-     NixOS now supports fully declarative management of users and groups. If you set <option>users.mutableUsers</option> to <literal>false</literal>, then the contents of <filename>/etc/passwd</filename> and <filename>/etc/group</filename> will be <link
-  xlink:href="https://www.usenix.org/legacy/event/lisa02/tech/full_papers/traugott/traugott_html/">congruent</link> to your NixOS configuration. For instance, if you remove a user from <option>users.extraUsers</option> and run <command>nixos-rebuild</command>, the user account will cease to exist. Also, imperative commands for managing users and groups, such as <command>useradd</command>, are no longer available. If <option>users.mutableUsers</option> is <literal>true</literal> (the default), then behaviour is unchanged from NixOS 13.10.
+     NixOS now supports fully declarative management of users and groups. If
+     you set <option>users.mutableUsers</option> to <literal>false</literal>,
+     then the contents of <filename>/etc/passwd</filename> and
+     <filename>/etc/group</filename> will be
+     <link
+  xlink:href="https://www.usenix.org/legacy/event/lisa02/tech/full_papers/traugott/traugott_html/">congruent</link>
+     to your NixOS configuration. For instance, if you remove a user from
+     <option>users.extraUsers</option> and run
+     <command>nixos-rebuild</command>, the user account will cease to exist.
+     Also, imperative commands for managing users and groups, such as
+     <command>useradd</command>, are no longer available. If
+     <option>users.mutableUsers</option> is <literal>true</literal> (the
+     default), then behaviour is unchanged from NixOS 13.10.
     </para>
    </listitem>
    <listitem>
     <para>
-     NixOS now has basic container support, meaning you can easily run a NixOS instance as a container in a NixOS host system. These containers are suitable for testing and experimentation but not production use, since they’re not fully isolated from the host. See <xref linkend="ch-containers"/> for details.
+     NixOS now has basic container support, meaning you can easily run a NixOS
+     instance as a container in a NixOS host system. These containers are
+     suitable for testing and experimentation but not production use, since
+     they’re not fully isolated from the host. See
+     <xref linkend="ch-containers"/> for details.
     </para>
    </listitem>
    <listitem>
     <para>
-     Systemd units provided by packages can now be overridden from the NixOS configuration. For instance, if a package <literal>foo</literal> provides systemd units, you can say:
+     Systemd units provided by packages can now be overridden from the NixOS
+     configuration. For instance, if a package <literal>foo</literal> provides
+     systemd units, you can say:
 <programlisting>
 systemd.packages = [ pkgs.foo ];
 </programlisting>
-     to enable those units. You can then set or override unit options in the usual way, e.g.
+     to enable those units. You can then set or override unit options in the
+     usual way, e.g.
 <programlisting>
 systemd.services.foo.wantedBy = [ "multi-user.target" ];
 systemd.services.foo.serviceConfig.MemoryLimit = "512M";
@@ -72,11 +98,14 @@ systemd.services.foo.serviceConfig.MemoryLimit = "512M";
  </para>
 
  <para>
-  When upgrading from a previous release, please be aware of the following incompatible changes:
+  When upgrading from a previous release, please be aware of the following
+  incompatible changes:
   <itemizedlist>
    <listitem>
     <para>
-     Nixpkgs no longer exposes unfree packages by default. If your NixOS configuration requires unfree packages from Nixpkgs, you need to enable support for them explicitly by setting:
+     Nixpkgs no longer exposes unfree packages by default. If your NixOS
+     configuration requires unfree packages from Nixpkgs, you need to enable
+     support for them explicitly by setting:
 <programlisting>
 nixpkgs.config.allowUnfree = true;
 </programlisting>
@@ -89,7 +118,8 @@ error: package ‘nvidia-x11-331.49-3.12.17’ in ‘…/nvidia-x11/default.nix:
    </listitem>
    <listitem>
     <para>
-     The Adobe Flash player is no longer enabled by default in the Firefox and Chromium wrappers. To enable it, you must set:
+     The Adobe Flash player is no longer enabled by default in the Firefox and
+     Chromium wrappers. To enable it, you must set:
 <programlisting>
 nixpkgs.config.allowUnfree = true;
 nixpkgs.config.firefox.enableAdobeFlash = true; # for Firefox
@@ -99,7 +129,8 @@ nixpkgs.config.chromium.enableAdobeFlash = true; # for Chromium
    </listitem>
    <listitem>
     <para>
-     The firewall is now enabled by default. If you don’t want this, you need to disable it explicitly:
+     The firewall is now enabled by default. If you don’t want this, you need
+     to disable it explicitly:
 <programlisting>
 networking.firewall.enable = false;
 </programlisting>
@@ -107,22 +138,40 @@ networking.firewall.enable = false;
    </listitem>
    <listitem>
     <para>
-     The option <option>boot.loader.grub.memtest86</option> has been renamed to <option>boot.loader.grub.memtest86.enable</option>.
+     The option <option>boot.loader.grub.memtest86</option> has been renamed to
+     <option>boot.loader.grub.memtest86.enable</option>.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>mysql55</literal> service has been merged into the <literal>mysql</literal> service, which no longer sets a default for the option <option>services.mysql.package</option>.
+     The <literal>mysql55</literal> service has been merged into the
+     <literal>mysql</literal> service, which no longer sets a default for the
+     option <option>services.mysql.package</option>.
     </para>
    </listitem>
    <listitem>
     <para>
-     Package variants are now differentiated by suffixing the name, rather than the version. For instance, <filename>sqlite-3.8.4.3-interactive</filename> is now called <filename>sqlite-interactive-3.8.4.3</filename>. This ensures that <literal>nix-env -i sqlite</literal> is unambiguous, and that <literal>nix-env -u</literal> won’t “upgrade” <literal>sqlite</literal> to <literal>sqlite-interactive</literal> or vice versa. Notably, this change affects the Firefox wrapper (which provides plugins), as it is now called <literal>firefox-wrapper</literal>. So when using <command>nix-env</command>, you should do <literal>nix-env -e firefox; nix-env -i firefox-wrapper</literal> if you want to keep using the wrapper. This change does not affect declarative package management, since attribute names like <literal>pkgs.firefoxWrapper</literal> were already unambiguous.
+     Package variants are now differentiated by suffixing the name, rather than
+     the version. For instance, <filename>sqlite-3.8.4.3-interactive</filename>
+     is now called <filename>sqlite-interactive-3.8.4.3</filename>. This
+     ensures that <literal>nix-env -i sqlite</literal> is unambiguous, and that
+     <literal>nix-env -u</literal> won’t “upgrade”
+     <literal>sqlite</literal> to <literal>sqlite-interactive</literal> or vice
+     versa. Notably, this change affects the Firefox wrapper (which provides
+     plugins), as it is now called <literal>firefox-wrapper</literal>. So when
+     using <command>nix-env</command>, you should do <literal>nix-env -e
+     firefox; nix-env -i firefox-wrapper</literal> if you want to keep using
+     the wrapper. This change does not affect declarative package management,
+     since attribute names like <literal>pkgs.firefoxWrapper</literal> were
+     already unambiguous.
     </para>
    </listitem>
    <listitem>
     <para>
-     The symlink <filename>/etc/ca-bundle.crt</filename> is gone. Programs should instead use the environment variable <envar>OPENSSL_X509_CERT_FILE</envar> (which points to <filename>/etc/ssl/certs/ca-bundle.crt</filename>).
+     The symlink <filename>/etc/ca-bundle.crt</filename> is gone. Programs
+     should instead use the environment variable
+     <envar>OPENSSL_X509_CERT_FILE</envar> (which points to
+     <filename>/etc/ssl/certs/ca-bundle.crt</filename>).
     </para>
    </listitem>
   </itemizedlist>
diff --git a/nixos/doc/manual/release-notes/rl-1412.xml b/nixos/doc/manual/release-notes/rl-1412.xml
index af17e166322..139f61c2a55 100644
--- a/nixos/doc/manual/release-notes/rl-1412.xml
+++ b/nixos/doc/manual/release-notes/rl-1412.xml
@@ -6,16 +6,19 @@
  <title>Release 14.12 (“Caterpillar”, 2014/12/30)</title>
 
  <para>
-  In addition to numerous new and upgraded packages, this release has the following highlights:
+  In addition to numerous new and upgraded packages, this release has the
+  following highlights:
   <itemizedlist>
    <listitem>
     <para>
-     Systemd has been updated to version 217, which has numerous <link xlink:href="http://lists.freedesktop.org/archives/systemd-devel/2014-October/024662.html">improvements.</link>
+     Systemd has been updated to version 217, which has numerous
+     <link xlink:href="http://lists.freedesktop.org/archives/systemd-devel/2014-October/024662.html">improvements.</link>
     </para>
    </listitem>
    <listitem>
     <para>
-     <link xlink:href="https://www.mail-archive.com/nix-dev@lists.science.uu.nl/msg13957.html"> Nix has been updated to 1.8.</link>
+     <link xlink:href="https://www.mail-archive.com/nix-dev@lists.science.uu.nl/msg13957.html">
+     Nix has been updated to 1.8.</link>
     </para>
    </listitem>
    <listitem>
@@ -35,7 +38,13 @@
    </listitem>
    <listitem>
     <para>
-     If <option>users.mutableUsers</option> is enabled (the default), changes made to the declaration of a user or group will be correctly realised when running <command>nixos-rebuild</command>. For instance, removing a user specification from <filename>configuration.nix</filename> will cause the actual user account to be deleted. If <option>users.mutableUsers</option> is disabled, it is no longer necessary to specify UIDs or GIDs; if omitted, they are allocated dynamically.
+     If <option>users.mutableUsers</option> is enabled (the default), changes
+     made to the declaration of a user or group will be correctly realised when
+     running <command>nixos-rebuild</command>. For instance, removing a user
+     specification from <filename>configuration.nix</filename> will cause the
+     actual user account to be deleted. If <option>users.mutableUsers</option>
+     is disabled, it is no longer necessary to specify UIDs or GIDs; if
+     omitted, they are allocated dynamically.
     </para>
    </listitem>
   </itemizedlist>
@@ -353,12 +362,18 @@
  </para>
 
  <para>
-  When upgrading from a previous release, please be aware of the following incompatible changes:
+  When upgrading from a previous release, please be aware of the following
+  incompatible changes:
   <itemizedlist>
    <listitem>
     <para>
-     The default version of Apache httpd is now 2.4. If you use the <option>extraConfig</option> option to pass literal Apache configuration text, you may need to update it — see <link
-xlink:href="http://httpd.apache.org/docs/2.4/upgrading.html">Apache’s documentation</link> for details. If you wish to continue to use httpd 2.2, add the following line to your NixOS configuration:
+     The default version of Apache httpd is now 2.4. If you use the
+     <option>extraConfig</option> option to pass literal Apache configuration
+     text, you may need to update it — see
+     <link
+xlink:href="http://httpd.apache.org/docs/2.4/upgrading.html">Apache’s
+     documentation</link> for details. If you wish to continue to use httpd
+     2.2, add the following line to your NixOS configuration:
 <programlisting>
 services.httpd.package = pkgs.apacheHttpd_2_2;
 </programlisting>
@@ -366,57 +381,85 @@ services.httpd.package = pkgs.apacheHttpd_2_2;
    </listitem>
    <listitem>
     <para>
-     PHP 5.3 has been removed because it is no longer supported by the PHP project. A <link
-xlink:href="http://php.net/migration54">migration guide</link> is available.
+     PHP 5.3 has been removed because it is no longer supported by the PHP
+     project. A <link
+xlink:href="http://php.net/migration54">migration
+     guide</link> is available.
     </para>
    </listitem>
    <listitem>
     <para>
-     The host side of a container virtual Ethernet pair is now called <literal>ve-<replaceable>container-name</replaceable></literal> rather than <literal>c-<replaceable>container-name</replaceable></literal>.
+     The host side of a container virtual Ethernet pair is now called
+     <literal>ve-<replaceable>container-name</replaceable></literal> rather
+     than <literal>c-<replaceable>container-name</replaceable></literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     GNOME 3.10 support has been dropped. The default GNOME version is now 3.12.
+     GNOME 3.10 support has been dropped. The default GNOME version is now
+     3.12.
     </para>
    </listitem>
    <listitem>
     <para>
-     VirtualBox has been upgraded to 4.3.20 release. Users may be required to run <command>rm -rf /tmp/.vbox*</command>. The line <literal>imports = [ &lt;nixpkgs/nixos/modules/programs/virtualbox.nix&gt; ]</literal> is no longer necessary, use <literal>services.virtualboxHost.enable = true</literal> instead.
+     VirtualBox has been upgraded to 4.3.20 release. Users may be required to
+     run <command>rm -rf /tmp/.vbox*</command>. The line <literal>imports = [
+     &lt;nixpkgs/nixos/modules/programs/virtualbox.nix&gt; ]</literal> is no
+     longer necessary, use <literal>services.virtualboxHost.enable =
+     true</literal> instead.
     </para>
     <para>
-     Also, hardening mode is now enabled by default, which means that unless you want to use USB support, you no longer need to be a member of the <literal>vboxusers</literal> group.
+     Also, hardening mode is now enabled by default, which means that unless
+     you want to use USB support, you no longer need to be a member of the
+     <literal>vboxusers</literal> group.
     </para>
    </listitem>
    <listitem>
     <para>
-     Chromium has been updated to 39.0.2171.65. <option>enablePepperPDF</option> is now enabled by default. <literal>chromium*Wrapper</literal> packages no longer exist, because upstream removed NSAPI support. <literal>chromium-stable</literal> has been renamed to <literal>chromium</literal>.
+     Chromium has been updated to 39.0.2171.65.
+     <option>enablePepperPDF</option> is now enabled by default.
+     <literal>chromium*Wrapper</literal> packages no longer exist, because
+     upstream removed NSAPI support. <literal>chromium-stable</literal> has
+     been renamed to <literal>chromium</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     Python packaging documentation is now part of nixpkgs manual. To override the python packages available to a custom python you now use <literal>pkgs.pythonFull.buildEnv.override</literal> instead of <literal>pkgs.pythonFull.override</literal>.
+     Python packaging documentation is now part of nixpkgs manual. To override
+     the python packages available to a custom python you now use
+     <literal>pkgs.pythonFull.buildEnv.override</literal> instead of
+     <literal>pkgs.pythonFull.override</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>boot.resumeDevice = "8:6"</literal> is no longer supported. Most users will want to leave it undefined, which takes the swap partitions automatically. There is an evaluation assertion to ensure that the string starts with a slash.
+     <literal>boot.resumeDevice = "8:6"</literal> is no longer supported. Most
+     users will want to leave it undefined, which takes the swap partitions
+     automatically. There is an evaluation assertion to ensure that the string
+     starts with a slash.
     </para>
    </listitem>
    <listitem>
     <para>
-     The system-wide default timezone for NixOS installations changed from <literal>CET</literal> to <literal>UTC</literal>. To choose a different timezone for your system, configure <literal>time.timeZone</literal> in <literal>configuration.nix</literal>. A fairly complete list of possible values for that setting is available at <link
+     The system-wide default timezone for NixOS installations changed from
+     <literal>CET</literal> to <literal>UTC</literal>. To choose a different
+     timezone for your system, configure <literal>time.timeZone</literal> in
+     <literal>configuration.nix</literal>. A fairly complete list of possible
+     values for that setting is available at
+     <link
 xlink:href="https://en.wikipedia.org/wiki/List_of_tz_database_time_zones"/>.
     </para>
    </listitem>
    <listitem>
     <para>
-     GNU screen has been updated to 4.2.1, which breaks the ability to connect to sessions created by older versions of screen.
+     GNU screen has been updated to 4.2.1, which breaks the ability to connect
+     to sessions created by older versions of screen.
     </para>
    </listitem>
    <listitem>
     <para>
-     The Intel GPU driver was updated to the 3.x prerelease version (used by most distributions) and supports DRI3 now.
+     The Intel GPU driver was updated to the 3.x prerelease version (used by
+     most distributions) and supports DRI3 now.
     </para>
    </listitem>
   </itemizedlist>
diff --git a/nixos/doc/manual/release-notes/rl-1509.xml b/nixos/doc/manual/release-notes/rl-1509.xml
index 5e162c3f0f7..5c4d9970178 100644
--- a/nixos/doc/manual/release-notes/rl-1509.xml
+++ b/nixos/doc/manual/release-notes/rl-1509.xml
@@ -6,23 +6,42 @@
  <title>Release 15.09 (“Dingo”, 2015/09/30)</title>
 
  <para>
-  In addition to numerous new and upgraded packages, this release has the following highlights:
+  In addition to numerous new and upgraded packages, this release has the
+  following highlights:
  </para>
 
  <itemizedlist>
   <listitem>
    <para>
-    The <link xlink:href="http://haskell.org/">Haskell</link> packages infrastructure has been re-designed from the ground up (&quot;Haskell NG&quot;). NixOS now distributes the latest version of every single package registered on <link
-    xlink:href="http://hackage.haskell.org/">Hackage</link> -- well in excess of 8,000 Haskell packages. Detailed instructions on how to use that infrastructure can be found in the <link
-    xlink:href="http://nixos.org/nixpkgs/manual/#users-guide-to-the-haskell-infrastructure">User's Guide to the Haskell Infrastructure</link>. Users migrating from an earlier release may find helpful information below, in the list of backwards-incompatible changes. Furthermore, we distribute 51(!) additional Haskell package sets that provide every single <link
-    xlink:href="http://www.stackage.org/">LTS Haskell</link> release since version 0.0 as well as the most recent <link
-    xlink:href="http://www.stackage.org/">Stackage Nightly</link> snapshot. The announcement <link
-    xlink:href="https://nixos.org/nix-dev/2015-September/018138.html">&quot;Full Stackage Support in Nixpkgs&quot;</link> gives additional details.
+    The <link xlink:href="http://haskell.org/">Haskell</link> packages
+    infrastructure has been re-designed from the ground up (&quot;Haskell
+    NG&quot;). NixOS now distributes the latest version of every single package
+    registered on
+    <link
+    xlink:href="http://hackage.haskell.org/">Hackage</link> -- well
+    in excess of 8,000 Haskell packages. Detailed instructions on how to use
+    that infrastructure can be found in the
+    <link
+    xlink:href="http://nixos.org/nixpkgs/manual/#users-guide-to-the-haskell-infrastructure">User's
+    Guide to the Haskell Infrastructure</link>. Users migrating from an earlier
+    release may find helpful information below, in the list of
+    backwards-incompatible changes. Furthermore, we distribute 51(!) additional
+    Haskell package sets that provide every single
+    <link
+    xlink:href="http://www.stackage.org/">LTS Haskell</link> release
+    since version 0.0 as well as the most recent
+    <link
+    xlink:href="http://www.stackage.org/">Stackage Nightly</link>
+    snapshot. The announcement
+    <link
+    xlink:href="https://nixos.org/nix-dev/2015-September/018138.html">&quot;Full
+    Stackage Support in Nixpkgs&quot;</link> gives additional details.
    </para>
   </listitem>
   <listitem>
    <para>
-    Nix has been updated to version 1.10, which among other improvements enables cryptographic signatures on binary caches for improved security.
+    Nix has been updated to version 1.10, which among other improvements
+    enables cryptographic signatures on binary caches for improved security.
    </para>
   </listitem>
   <listitem>
@@ -31,7 +50,8 @@
 <programlisting>
 system.autoUpgrade.enable = true;
 </programlisting>
-    This will cause the system to periodically check for updates in your current channel and run <command>nixos-rebuild</command>.
+    This will cause the system to periodically check for updates in your
+    current channel and run <command>nixos-rebuild</command>.
    </para>
   </listitem>
   <listitem>
@@ -51,7 +71,8 @@ system.autoUpgrade.enable = true;
   </listitem>
   <listitem>
    <para>
-    KDE 5 has been upgraded to KDE Frameworks 5.10, Plasma 5.3.2 and Applications 15.04.3. KDE 4 has been updated to kdelibs-4.14.10.
+    KDE 5 has been upgraded to KDE Frameworks 5.10, Plasma 5.3.2 and
+    Applications 15.04.3. KDE 4 has been updated to kdelibs-4.14.10.
    </para>
   </listitem>
   <listitem>
@@ -403,61 +424,93 @@ system.autoUpgrade.enable = true;
  </para>
 
  <para>
-  When upgrading from a previous release, please be aware of the following incompatible changes:
+  When upgrading from a previous release, please be aware of the following
+  incompatible changes:
   <itemizedlist>
    <listitem>
     <para>
-     <command>sshd</command> no longer supports DSA and ECDSA host keys by default. If you have existing systems with such host keys and want to continue to use them, please set
+     <command>sshd</command> no longer supports DSA and ECDSA host keys by
+     default. If you have existing systems with such host keys and want to
+     continue to use them, please set
 <programlisting>
 system.stateVersion = "14.12";
 </programlisting>
-     The new option <option>system.stateVersion</option> ensures that certain configuration changes that could break existing systems (such as the <command>sshd</command> host key setting) will maintain compatibility with the specified NixOS release. NixOps sets the state version of existing deployments automatically.
+     The new option <option>system.stateVersion</option> ensures that certain
+     configuration changes that could break existing systems (such as the
+     <command>sshd</command> host key setting) will maintain compatibility with
+     the specified NixOS release. NixOps sets the state version of existing
+     deployments automatically.
     </para>
    </listitem>
    <listitem>
     <para>
-     <command>cron</command> is no longer enabled by default, unless you have a non-empty <option>services.cron.systemCronJobs</option>. To force <command>cron</command> to be enabled, set <option>services.cron.enable = true</option>.
+     <command>cron</command> is no longer enabled by default, unless you have a
+     non-empty <option>services.cron.systemCronJobs</option>. To force
+     <command>cron</command> to be enabled, set <option>services.cron.enable =
+     true</option>.
     </para>
    </listitem>
    <listitem>
     <para>
-     Nix now requires binary caches to be cryptographically signed. If you have unsigned binary caches that you want to continue to use, you should set <option>nix.requireSignedBinaryCaches = false</option>.
+     Nix now requires binary caches to be cryptographically signed. If you have
+     unsigned binary caches that you want to continue to use, you should set
+     <option>nix.requireSignedBinaryCaches = false</option>.
     </para>
    </listitem>
    <listitem>
     <para>
-     Steam now doesn't need root rights to work. Instead of using <literal>*-steam-chrootenv</literal>, you should now just run <literal>steam</literal>. <literal>steamChrootEnv</literal> package was renamed to <literal>steam</literal>, and old <literal>steam</literal> package -- to <literal>steamOriginal</literal>.
+     Steam now doesn't need root rights to work. Instead of using
+     <literal>*-steam-chrootenv</literal>, you should now just run
+     <literal>steam</literal>. <literal>steamChrootEnv</literal> package was
+     renamed to <literal>steam</literal>, and old <literal>steam</literal>
+     package -- to <literal>steamOriginal</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     CMPlayer has been renamed to bomi upstream. Package <literal>cmplayer</literal> was accordingly renamed to <literal>bomi</literal>
+     CMPlayer has been renamed to bomi upstream. Package
+     <literal>cmplayer</literal> was accordingly renamed to
+     <literal>bomi</literal>
     </para>
    </listitem>
    <listitem>
     <para>
-     Atom Shell has been renamed to Electron upstream. Package <literal>atom-shell</literal> was accordingly renamed to <literal>electron</literal>
+     Atom Shell has been renamed to Electron upstream. Package
+     <literal>atom-shell</literal> was accordingly renamed to
+     <literal>electron</literal>
     </para>
    </listitem>
    <listitem>
     <para>
-     Elm is not released on Hackage anymore. You should now use <literal>elmPackages.elm</literal> which contains the latest Elm platform.
+     Elm is not released on Hackage anymore. You should now use
+     <literal>elmPackages.elm</literal> which contains the latest Elm platform.
     </para>
    </listitem>
    <listitem>
     <para>
-     The CUPS printing service has been updated to version <literal>2.0.2</literal>. Furthermore its systemd service has been renamed to <literal>cups.service</literal>.
+     The CUPS printing service has been updated to version
+     <literal>2.0.2</literal>. Furthermore its systemd service has been renamed
+     to <literal>cups.service</literal>.
     </para>
     <para>
-     Local printers are no longer shared or advertised by default. This behavior can be changed by enabling <option>services.printing.defaultShared</option> or <option>services.printing.browsing</option> respectively.
+     Local printers are no longer shared or advertised by default. This
+     behavior can be changed by enabling
+     <option>services.printing.defaultShared</option> or
+     <option>services.printing.browsing</option> respectively.
     </para>
    </listitem>
    <listitem>
     <para>
-     The VirtualBox host and guest options have been named more consistently. They can now found in <option>virtualisation.virtualbox.host.*</option> instead of <option>services.virtualboxHost.*</option> and <option>virtualisation.virtualbox.guest.*</option> instead of <option>services.virtualboxGuest.*</option>.
+     The VirtualBox host and guest options have been named more consistently.
+     They can now found in <option>virtualisation.virtualbox.host.*</option>
+     instead of <option>services.virtualboxHost.*</option> and
+     <option>virtualisation.virtualbox.guest.*</option> instead of
+     <option>services.virtualboxGuest.*</option>.
     </para>
     <para>
-     Also, there now is support for the <literal>vboxsf</literal> file system using the <option>fileSystems</option> configuration attribute. An example of how this can be used in a configuration:
+     Also, there now is support for the <literal>vboxsf</literal> file system
+     using the <option>fileSystems</option> configuration attribute. An example
+     of how this can be used in a configuration:
 <programlisting>
 fileSystems."/shiny" = {
   device = "myshinysharedfolder";
@@ -468,7 +521,15 @@ fileSystems."/shiny" = {
    </listitem>
    <listitem>
     <para>
-     &quot;<literal>nix-env -qa</literal>&quot; no longer discovers Haskell packages by name. The only packages visible in the global scope are <literal>ghc</literal>, <literal>cabal-install</literal>, and <literal>stack</literal>, but all other packages are hidden. The reason for this inconvenience is the sheer size of the Haskell package set. Name-based lookups are expensive, and most <literal>nix-env -qa</literal> operations would become much slower if we'd add the entire Hackage database into the top level attribute set. Instead, the list of Haskell packages can be displayed by running:
+     &quot;<literal>nix-env -qa</literal>&quot; no longer discovers Haskell
+     packages by name. The only packages visible in the global scope are
+     <literal>ghc</literal>, <literal>cabal-install</literal>, and
+     <literal>stack</literal>, but all other packages are hidden. The reason
+     for this inconvenience is the sheer size of the Haskell package set.
+     Name-based lookups are expensive, and most <literal>nix-env -qa</literal>
+     operations would become much slower if we'd add the entire Hackage
+     database into the top level attribute set. Instead, the list of Haskell
+     packages can be displayed by running:
     </para>
 <programlisting>
 nix-env -f &quot;&lt;nixpkgs&gt;&quot; -qaP -A haskellPackages
@@ -480,56 +541,91 @@ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -qaP -A haskellPackages
 nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA haskellPackages.pandoc
 </programlisting>
     <para>
-     Installing Haskell <emphasis>libraries</emphasis> this way, however, is no longer supported. See the next item for more details.
+     Installing Haskell <emphasis>libraries</emphasis> this way, however, is no
+     longer supported. See the next item for more details.
     </para>
    </listitem>
    <listitem>
     <para>
-     Previous versions of NixOS came with a feature called <literal>ghc-wrapper</literal>, a small script that allowed GHC to transparently pick up on libraries installed in the user's profile. This feature has been deprecated; <literal>ghc-wrapper</literal> was removed from the distribution. The proper way to register Haskell libraries with the compiler now is the <literal>haskellPackages.ghcWithPackages</literal> function. The <link
-    xlink:href="http://nixos.org/nixpkgs/manual/#users-guide-to-the-haskell-infrastructure">User's Guide to the Haskell Infrastructure</link> provides more information about this subject.
+     Previous versions of NixOS came with a feature called
+     <literal>ghc-wrapper</literal>, a small script that allowed GHC to
+     transparently pick up on libraries installed in the user's profile. This
+     feature has been deprecated; <literal>ghc-wrapper</literal> was removed
+     from the distribution. The proper way to register Haskell libraries with
+     the compiler now is the <literal>haskellPackages.ghcWithPackages</literal>
+     function. The
+     <link
+    xlink:href="http://nixos.org/nixpkgs/manual/#users-guide-to-the-haskell-infrastructure">User's
+     Guide to the Haskell Infrastructure</link> provides more information about
+     this subject.
     </para>
    </listitem>
    <listitem>
     <para>
-     All Haskell builds that have been generated with version 1.x of the <literal>cabal2nix</literal> utility are now invalid and need to be re-generated with a current version of <literal>cabal2nix</literal> to function. The most recent version of this tool can be installed by running <literal>nix-env -i cabal2nix</literal>.
+     All Haskell builds that have been generated with version 1.x of the
+     <literal>cabal2nix</literal> utility are now invalid and need to be
+     re-generated with a current version of <literal>cabal2nix</literal> to
+     function. The most recent version of this tool can be installed by running
+     <literal>nix-env -i cabal2nix</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>haskellPackages</literal> set in Nixpkgs used to have a function attribute called <literal>extension</literal> that users could override in their <literal>~/.nixpkgs/config.nix</literal> files to configure additional attributes, etc. That function still exists, but it's now called <literal>overrides</literal>.
+     The <literal>haskellPackages</literal> set in Nixpkgs used to have a
+     function attribute called <literal>extension</literal> that users could
+     override in their <literal>~/.nixpkgs/config.nix</literal> files to
+     configure additional attributes, etc. That function still exists, but it's
+     now called <literal>overrides</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     The OpenBLAS library has been updated to version <literal>0.2.14</literal>. Support for the <literal>x86_64-darwin</literal> platform was added. Dynamic architecture detection was enabled; OpenBLAS now selects microarchitecture-optimized routines at runtime, so optimal performance is achieved without the need to rebuild OpenBLAS locally. OpenBLAS has replaced ATLAS in most packages which use an optimized BLAS or LAPACK implementation.
+     The OpenBLAS library has been updated to version
+     <literal>0.2.14</literal>. Support for the
+     <literal>x86_64-darwin</literal> platform was added. Dynamic architecture
+     detection was enabled; OpenBLAS now selects microarchitecture-optimized
+     routines at runtime, so optimal performance is achieved without the need
+     to rebuild OpenBLAS locally. OpenBLAS has replaced ATLAS in most packages
+     which use an optimized BLAS or LAPACK implementation.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>phpfpm</literal> is now using the default PHP version (<literal>pkgs.php</literal>) instead of PHP 5.4 (<literal>pkgs.php54</literal>).
+     The <literal>phpfpm</literal> is now using the default PHP version
+     (<literal>pkgs.php</literal>) instead of PHP 5.4
+     (<literal>pkgs.php54</literal>).
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>locate</literal> service no longer indexes the Nix store by default, preventing packages with potentially numerous versions from cluttering the output. Indexing the store can be activated by setting <option>services.locate.includeStore = true</option>.
+     The <literal>locate</literal> service no longer indexes the Nix store by
+     default, preventing packages with potentially numerous versions from
+     cluttering the output. Indexing the store can be activated by setting
+     <option>services.locate.includeStore = true</option>.
     </para>
    </listitem>
    <listitem>
     <para>
-     The Nix expression search path (<envar>NIX_PATH</envar>) no longer contains <filename>/etc/nixos/nixpkgs</filename> by default. You can override <envar>NIX_PATH</envar> by setting <option>nix.nixPath</option>.
+     The Nix expression search path (<envar>NIX_PATH</envar>) no longer
+     contains <filename>/etc/nixos/nixpkgs</filename> by default. You can
+     override <envar>NIX_PATH</envar> by setting <option>nix.nixPath</option>.
     </para>
    </listitem>
    <listitem>
     <para>
-     Python 2.6 has been marked as broken (as it no longer receives security updates from upstream).
+     Python 2.6 has been marked as broken (as it no longer receives security
+     updates from upstream).
     </para>
    </listitem>
    <listitem>
     <para>
-     Any use of module arguments such as <varname>pkgs</varname> to access library functions, or to define <literal>imports</literal> attributes will now lead to an infinite loop at the time of the evaluation.
+     Any use of module arguments such as <varname>pkgs</varname> to access
+     library functions, or to define <literal>imports</literal> attributes will
+     now lead to an infinite loop at the time of the evaluation.
     </para>
     <para>
-     In case of an infinite loop, use the <command>--show-trace</command> command line argument and read the line just above the error message.
+     In case of an infinite loop, use the <command>--show-trace</command>
+     command line argument and read the line just above the error message.
 <screen>
 <prompt>$ </prompt>nixos-rebuild build --show-trace
 …
@@ -538,7 +634,9 @@ infinite recursion encountered
 </screen>
     </para>
     <para>
-     Any use of <literal>pkgs.lib</literal>, should be replaced by <varname>lib</varname>, after adding it as argument of the module. The following module
+     Any use of <literal>pkgs.lib</literal>, should be replaced by
+     <varname>lib</varname>, after adding it as argument of the module. The
+     following module
 <programlisting>
 { config, pkgs, ... }:
 
@@ -566,7 +664,9 @@ with lib;
 </programlisting>
     </para>
     <para>
-     When <varname>pkgs</varname> is used to download other projects to import their modules, and only in such cases, it should be replaced by <literal>(import &lt;nixpkgs&gt; {})</literal>. The following module
+     When <varname>pkgs</varname> is used to download other projects to import
+     their modules, and only in such cases, it should be replaced by
+     <literal>(import &lt;nixpkgs&gt; {})</literal>. The following module
 <programlisting>
 { config, pkgs, ... }:
 
@@ -606,25 +706,43 @@ in
   <itemizedlist>
    <listitem>
     <para>
-     The nixos and nixpkgs channels were unified, so one <emphasis>can</emphasis> use <literal>nix-env -iA nixos.bash</literal> instead of <literal>nix-env -iA nixos.pkgs.bash</literal>. See <link xlink:href="https://github.com/NixOS/nixpkgs/commit/2cd7c1f198">the commit</link> for details.
+     The nixos and nixpkgs channels were unified, so one
+     <emphasis>can</emphasis> use <literal>nix-env -iA nixos.bash</literal>
+     instead of <literal>nix-env -iA nixos.pkgs.bash</literal>. See
+     <link xlink:href="https://github.com/NixOS/nixpkgs/commit/2cd7c1f198">the
+     commit</link> for details.
     </para>
    </listitem>
    <listitem>
     <para>
-     Users running an SSH server who worry about the quality of their <literal>/etc/ssh/moduli</literal> file with respect to the <link
-      xlink:href="https://stribika.github.io/2015/01/04/secure-secure-shell.html">vulnerabilities discovered in the Diffie-Hellman key exchange</link> can now replace OpenSSH's default version with one they generated themselves using the new <option>services.openssh.moduliFile</option> option.
+     Users running an SSH server who worry about the quality of their
+     <literal>/etc/ssh/moduli</literal> file with respect to the
+     <link
+      xlink:href="https://stribika.github.io/2015/01/04/secure-secure-shell.html">vulnerabilities
+     discovered in the Diffie-Hellman key exchange</link> can now replace
+     OpenSSH's default version with one they generated themselves using the new
+     <option>services.openssh.moduliFile</option> option.
     </para>
    </listitem>
    <listitem>
     <para>
-     A newly packaged TeX Live 2015 is provided in <literal>pkgs.texlive</literal>, split into 6500 nix packages. For basic user documentation see <link xlink:href="https://github.com/NixOS/nixpkgs/blob/release-15.09/pkgs/tools/typesetting/tex/texlive/default.nix#L1"
-      >the source</link>. Beware of <link xlink:href="https://github.com/NixOS/nixpkgs/issues/9757"
-      >an issue</link> when installing a too large package set. The plan is to deprecate and maybe delete the original TeX packages until the next release.
+     A newly packaged TeX Live 2015 is provided in
+     <literal>pkgs.texlive</literal>, split into 6500 nix packages. For basic
+     user documentation see
+     <link xlink:href="https://github.com/NixOS/nixpkgs/blob/release-15.09/pkgs/tools/typesetting/tex/texlive/default.nix#L1"
+      >the
+     source</link>. Beware of
+     <link xlink:href="https://github.com/NixOS/nixpkgs/issues/9757"
+      >an
+     issue</link> when installing a too large package set. The plan is to
+     deprecate and maybe delete the original TeX packages until the next
+     release.
     </para>
    </listitem>
    <listitem>
     <para>
-     <option>buildEnv.env</option> on all Python interpreters is now available for nix-shell interoperability.
+     <option>buildEnv.env</option> on all Python interpreters is now available
+     for nix-shell interoperability.
     </para>
    </listitem>
   </itemizedlist>
diff --git a/nixos/doc/manual/release-notes/rl-1603.xml b/nixos/doc/manual/release-notes/rl-1603.xml
index 94808b36076..9b512c4b1e5 100644
--- a/nixos/doc/manual/release-notes/rl-1603.xml
+++ b/nixos/doc/manual/release-notes/rl-1603.xml
@@ -6,14 +6,17 @@
  <title>Release 16.03 (“Emu”, 2016/03/31)</title>
 
  <para>
-  In addition to numerous new and upgraded packages, this release has the following highlights:
+  In addition to numerous new and upgraded packages, this release has the
+  following highlights:
  </para>
 
  <itemizedlist>
   <listitem>
    <para>
-    Systemd 229, bringing <link
-    xlink:href="https://github.com/systemd/systemd/blob/v229/NEWS">numerous improvements</link> over 217.
+    Systemd 229, bringing
+    <link
+    xlink:href="https://github.com/systemd/systemd/blob/v229/NEWS">numerous
+    improvements</link> over 217.
    </para>
   </listitem>
   <listitem>
@@ -23,8 +26,11 @@
   </listitem>
   <listitem>
    <para>
-    GCC 5.3 (was 4.9). Note that GCC 5 <link
-    xlink:href="https://gcc.gnu.org/onlinedocs/libstdc++/manual/using_dual_abi.html">changes the C++ ABI in an incompatible way</link>; this may cause problems if you try to link objects compiled with different versions of GCC.
+    GCC 5.3 (was 4.9). Note that GCC 5
+    <link
+    xlink:href="https://gcc.gnu.org/onlinedocs/libstdc++/manual/using_dual_abi.html">changes
+    the C++ ABI in an incompatible way</link>; this may cause problems if you
+    try to link objects compiled with different versions of GCC.
    </para>
   </listitem>
   <listitem>
@@ -39,10 +45,20 @@
   </listitem>
   <listitem>
    <para>
-    Improved support for ensuring <link
-    xlink:href="https://reproducible-builds.org/">bitwise reproducible builds</link>. For example, <literal>stdenv</literal> now sets the environment variable <envar
-    xlink:href="https://reproducible-builds.org/specs/source-date-epoch/">SOURCE_DATE_EPOCH</envar> to a deterministic value, and Nix has <link
-    xlink:href="http://nixos.org/nix/manual/#ssec-relnotes-1.11">gained an option</link> to repeat a build a number of times to test determinism. An ongoing project, the goal of exact reproducibility is to allow binaries to be verified independently (e.g., a user might only trust binaries that appear in three independent binary caches).
+    Improved support for ensuring
+    <link
+    xlink:href="https://reproducible-builds.org/">bitwise
+    reproducible builds</link>. For example, <literal>stdenv</literal> now sets
+    the environment variable
+    <envar
+    xlink:href="https://reproducible-builds.org/specs/source-date-epoch/">SOURCE_DATE_EPOCH</envar>
+    to a deterministic value, and Nix has
+    <link
+    xlink:href="http://nixos.org/nix/manual/#ssec-relnotes-1.11">gained
+    an option</link> to repeat a build a number of times to test determinism.
+    An ongoing project, the goal of exact reproducibility is to allow binaries
+    to be verified independently (e.g., a user might only trust binaries that
+    appear in three independent binary caches).
    </para>
   </listitem>
   <listitem>
@@ -319,38 +335,56 @@
  </para>
 
  <para>
-  When upgrading from a previous release, please be aware of the following incompatible changes:
+  When upgrading from a previous release, please be aware of the following
+  incompatible changes:
  </para>
 
  <itemizedlist>
   <listitem>
    <para>
-    We no longer produce graphical ISO images and VirtualBox images for <literal>i686-linux</literal>. A minimal ISO image is still provided.
+    We no longer produce graphical ISO images and VirtualBox images for
+    <literal>i686-linux</literal>. A minimal ISO image is still provided.
    </para>
   </listitem>
   <listitem>
    <para>
-    Firefox and similar browsers are now <emphasis>wrapped by default</emphasis>. The package and attribute names are plain <literal>firefox</literal> or <literal>midori</literal>, etc. Backward-compatibility attributes were set up, but note that <command>nix-env -u</command> will <emphasis>not</emphasis> update your current <literal>firefox-with-plugins</literal>; you have to uninstall it and install <literal>firefox</literal> instead.
+    Firefox and similar browsers are now <emphasis>wrapped by
+    default</emphasis>. The package and attribute names are plain
+    <literal>firefox</literal> or <literal>midori</literal>, etc.
+    Backward-compatibility attributes were set up, but note that
+    <command>nix-env -u</command> will <emphasis>not</emphasis> update your
+    current <literal>firefox-with-plugins</literal>; you have to uninstall it
+    and install <literal>firefox</literal> instead.
    </para>
   </listitem>
   <listitem>
    <para>
-    <command>wmiiSnap</command> has been replaced with <command>wmii_hg</command>, but <command>services.xserver.windowManager.wmii.enable</command> has been updated respectively so this only affects you if you have explicitly installed <command>wmiiSnap</command>.
+    <command>wmiiSnap</command> has been replaced with
+    <command>wmii_hg</command>, but
+    <command>services.xserver.windowManager.wmii.enable</command> has been
+    updated respectively so this only affects you if you have explicitly
+    installed <command>wmiiSnap</command>.
    </para>
   </listitem>
   <listitem>
    <para>
-    <literal>jobs</literal> NixOS option has been removed. It served as compatibility layer between Upstart jobs and SystemD services. All services have been rewritten to use <literal>systemd.services</literal>
+    <literal>jobs</literal> NixOS option has been removed. It served as
+    compatibility layer between Upstart jobs and SystemD services. All services
+    have been rewritten to use <literal>systemd.services</literal>
    </para>
   </listitem>
   <listitem>
    <para>
-    <command>wmiimenu</command> is removed, as it has been removed by the developers upstream. Use <command>wimenu</command> from the <command>wmii-hg</command> package.
+    <command>wmiimenu</command> is removed, as it has been removed by the
+    developers upstream. Use <command>wimenu</command> from the
+    <command>wmii-hg</command> package.
    </para>
   </listitem>
   <listitem>
    <para>
-    Gitit is no longer automatically added to the module list in NixOS and as such there will not be any manual entries for it. You will need to add an import statement to your NixOS configuration in order to use it, e.g.
+    Gitit is no longer automatically added to the module list in NixOS and as
+    such there will not be any manual entries for it. You will need to add an
+    import statement to your NixOS configuration in order to use it, e.g.
 <programlisting><![CDATA[
 {
   imports = [ <nixpkgs/nixos/modules/services/misc/gitit.nix> ];
@@ -361,7 +395,10 @@
   </listitem>
   <listitem>
    <para>
-    <command>nginx</command> does not accept flags for enabling and disabling modules anymore. Instead it accepts <literal>modules</literal> argument, which is a list of modules to be built in. All modules now reside in <literal>nginxModules</literal> set. Example configuration:
+    <command>nginx</command> does not accept flags for enabling and disabling
+    modules anymore. Instead it accepts <literal>modules</literal> argument,
+    which is a list of modules to be built in. All modules now reside in
+    <literal>nginxModules</literal> set. Example configuration:
 <programlisting><![CDATA[
 nginx.override {
   modules = [ nginxModules.rtmp nginxModules.dav nginxModules.moreheaders ];
@@ -371,42 +408,66 @@ nginx.override {
   </listitem>
   <listitem>
    <para>
-    <command>s3sync</command> is removed, as it hasn't been developed by upstream for 4 years and only runs with ruby 1.8. For an actively-developer alternative look at <command>tarsnap</command> and others.
+    <command>s3sync</command> is removed, as it hasn't been developed by
+    upstream for 4 years and only runs with ruby 1.8. For an actively-developer
+    alternative look at <command>tarsnap</command> and others.
    </para>
   </listitem>
   <listitem>
    <para>
-    <command>ruby_1_8</command> has been removed as it's not supported from upstream anymore and probably contains security issues.
+    <command>ruby_1_8</command> has been removed as it's not supported from
+    upstream anymore and probably contains security issues.
    </para>
   </listitem>
   <listitem>
    <para>
-    <literal>tidy-html5</literal> package is removed. Upstream only provided <literal>(lib)tidy5</literal> during development, and now they went back to <literal>(lib)tidy</literal> to work as a drop-in replacement of the original package that has been unmaintained for years. You can (still) use the <literal>html-tidy</literal> package, which got updated to a stable release from this new upstream.
+    <literal>tidy-html5</literal> package is removed. Upstream only provided
+    <literal>(lib)tidy5</literal> during development, and now they went back to
+    <literal>(lib)tidy</literal> to work as a drop-in replacement of the
+    original package that has been unmaintained for years. You can (still) use
+    the <literal>html-tidy</literal> package, which got updated to a stable
+    release from this new upstream.
    </para>
   </listitem>
   <listitem>
    <para>
-    <literal>extraDeviceOptions</literal> argument is removed from <literal>bumblebee</literal> package. Instead there are now two separate arguments: <literal>extraNvidiaDeviceOptions</literal> and <literal>extraNouveauDeviceOptions</literal> for setting extra X11 options for nvidia and nouveau drivers, respectively.
+    <literal>extraDeviceOptions</literal> argument is removed from
+    <literal>bumblebee</literal> package. Instead there are now two separate
+    arguments: <literal>extraNvidiaDeviceOptions</literal> and
+    <literal>extraNouveauDeviceOptions</literal> for setting extra X11 options
+    for nvidia and nouveau drivers, respectively.
    </para>
   </listitem>
   <listitem>
    <para>
-    The <literal>Ctrl+Alt+Backspace</literal> key combination no longer kills the X server by default. There's a new option <option>services.xserver.enableCtrlAltBackspace</option> allowing to enable the combination again.
+    The <literal>Ctrl+Alt+Backspace</literal> key combination no longer kills
+    the X server by default. There's a new option
+    <option>services.xserver.enableCtrlAltBackspace</option> allowing to enable
+    the combination again.
    </para>
   </listitem>
   <listitem>
    <para>
-    <literal>emacsPackagesNg</literal> now contains all packages from the ELPA, MELPA, and MELPA Stable repositories.
+    <literal>emacsPackagesNg</literal> now contains all packages from the ELPA,
+    MELPA, and MELPA Stable repositories.
    </para>
   </listitem>
   <listitem>
    <para>
-    Data directory for Postfix MTA server is moved from <filename>/var/postfix</filename> to <filename>/var/lib/postfix</filename>. Old configurations are migrated automatically. <literal>service.postfix</literal> module has also received many improvements, such as correct directories' access rights, new <literal>aliasFiles</literal> and <literal>mapFiles</literal> options and more.
+    Data directory for Postfix MTA server is moved from
+    <filename>/var/postfix</filename> to <filename>/var/lib/postfix</filename>.
+    Old configurations are migrated automatically.
+    <literal>service.postfix</literal> module has also received many
+    improvements, such as correct directories' access rights, new
+    <literal>aliasFiles</literal> and <literal>mapFiles</literal> options and
+    more.
    </para>
   </listitem>
   <listitem>
    <para>
-    Filesystem options should now be configured as a list of strings, not a comma-separated string. The old style will continue to work, but print a warning, until the 16.09 release. An example of the new style:
+    Filesystem options should now be configured as a list of strings, not a
+    comma-separated string. The old style will continue to work, but print a
+    warning, until the 16.09 release. An example of the new style:
 <programlisting>
 fileSystems."/example" = {
   device = "/dev/sdc";
@@ -418,20 +479,44 @@ fileSystems."/example" = {
   </listitem>
   <listitem>
    <para>
-    CUPS, installed by <literal>services.printing</literal> module, now has its data directory in <filename>/var/lib/cups</filename>. Old configurations from <filename>/etc/cups</filename> are moved there automatically, but there might be problems. Also configuration options <literal>services.printing.cupsdConf</literal> and <literal>services.printing.cupsdFilesConf</literal> were removed because they had been allowing one to override configuration variables required for CUPS to work at all on NixOS. For most use cases, <literal>services.printing.extraConf</literal> and new option <literal>services.printing.extraFilesConf</literal> should be enough; if you encounter a situation when they are not, please file a bug.
+    CUPS, installed by <literal>services.printing</literal> module, now has its
+    data directory in <filename>/var/lib/cups</filename>. Old configurations
+    from <filename>/etc/cups</filename> are moved there automatically, but
+    there might be problems. Also configuration options
+    <literal>services.printing.cupsdConf</literal> and
+    <literal>services.printing.cupsdFilesConf</literal> were removed because
+    they had been allowing one to override configuration variables required for
+    CUPS to work at all on NixOS. For most use cases,
+    <literal>services.printing.extraConf</literal> and new option
+    <literal>services.printing.extraFilesConf</literal> should be enough; if
+    you encounter a situation when they are not, please file a bug.
    </para>
    <para>
-    There are also Gutenprint improvements; in particular, a new option <literal>services.printing.gutenprint</literal> is added to enable automatic updating of Gutenprint PPMs; it's greatly recommended to enable it instead of adding <literal>gutenprint</literal> to the <literal>drivers</literal> list.
+    There are also Gutenprint improvements; in particular, a new option
+    <literal>services.printing.gutenprint</literal> is added to enable
+    automatic updating of Gutenprint PPMs; it's greatly recommended to enable
+    it instead of adding <literal>gutenprint</literal> to the
+    <literal>drivers</literal> list.
    </para>
   </listitem>
   <listitem>
    <para>
-    <literal>services.xserver.vaapiDrivers</literal> has been removed. Use <literal>hardware.opengl.extraPackages{,32}</literal> instead. You can also specify VDPAU drivers there.
+    <literal>services.xserver.vaapiDrivers</literal> has been removed. Use
+    <literal>hardware.opengl.extraPackages{,32}</literal> instead. You can also
+    specify VDPAU drivers there.
    </para>
   </listitem>
   <listitem>
    <para>
-    <literal>programs.ibus</literal> moved to <literal>i18n.inputMethod.ibus</literal>. The option <literal>programs.ibus.plugins</literal> changed to <literal>i18n.inputMethod.ibus.engines</literal> and the option to enable ibus changed from <literal>programs.ibus.enable</literal> to <literal>i18n.inputMethod.enabled</literal>. <literal>i18n.inputMethod.enabled</literal> should be set to the used input method name, <literal>"ibus"</literal> for ibus. An example of the new style:
+    <literal>programs.ibus</literal> moved to
+    <literal>i18n.inputMethod.ibus</literal>. The option
+    <literal>programs.ibus.plugins</literal> changed to
+    <literal>i18n.inputMethod.ibus.engines</literal> and the option to enable
+    ibus changed from <literal>programs.ibus.enable</literal> to
+    <literal>i18n.inputMethod.enabled</literal>.
+    <literal>i18n.inputMethod.enabled</literal> should be set to the used input
+    method name, <literal>"ibus"</literal> for ibus. An example of the new
+    style:
 <programlisting>
 i18n.inputMethod.enabled = "ibus";
 i18n.inputMethod.ibus.engines = with pkgs.ibus-engines; [ anthy mozc ];
@@ -445,17 +530,26 @@ programs.ibus.plugins = with pkgs; [ ibus-anthy mozc ];
   </listitem>
   <listitem>
    <para>
-    <literal>services.udev.extraRules</literal> option now writes rules to <filename>99-local.rules</filename> instead of <filename>10-local.rules</filename>. This makes all the user rules apply after others, so their results wouldn't be overriden by anything else.
+    <literal>services.udev.extraRules</literal> option now writes rules to
+    <filename>99-local.rules</filename> instead of
+    <filename>10-local.rules</filename>. This makes all the user rules apply
+    after others, so their results wouldn't be overriden by anything else.
    </para>
   </listitem>
   <listitem>
    <para>
-    Large parts of the <literal>services.gitlab</literal> module has been been rewritten. There are new configuration options available. The <literal>stateDir</literal> option was renamned to <literal>statePath</literal> and the <literal>satellitesDir</literal> option was removed. Please review the currently available options.
+    Large parts of the <literal>services.gitlab</literal> module has been been
+    rewritten. There are new configuration options available. The
+    <literal>stateDir</literal> option was renamned to
+    <literal>statePath</literal> and the <literal>satellitesDir</literal>
+    option was removed. Please review the currently available options.
    </para>
   </listitem>
   <listitem>
    <para>
-    The option <option>services.nsd.zones.&lt;name&gt;.data</option> no longer interpret the dollar sign ($) as a shell variable, as such it should not be escaped anymore. Thus the following zone data:
+    The option <option>services.nsd.zones.&lt;name&gt;.data</option> no longer
+    interpret the dollar sign ($) as a shell variable, as such it should not be
+    escaped anymore. Thus the following zone data:
    </para>
 <programlisting>
 \$ORIGIN example.com.
@@ -473,7 +567,9 @@ $TTL 1800
   </listitem>
   <listitem>
    <para>
-    <literal>service.syncthing.dataDir</literal> options now has to point to exact folder where syncthing is writing to. Example configuration should look something like:
+    <literal>service.syncthing.dataDir</literal> options now has to point to
+    exact folder where syncthing is writing to. Example configuration should
+    look something like:
    </para>
 <programlisting>
 services.syncthing = {
@@ -485,24 +581,45 @@ services.syncthing = {
   </listitem>
   <listitem>
    <para>
-    <literal>networking.firewall.allowPing</literal> is now enabled by default. Users are encouraged to configure an appropriate rate limit for their machines using the Kernel interface at <filename>/proc/sys/net/ipv4/icmp_ratelimit</filename> and <filename>/proc/sys/net/ipv6/icmp/ratelimit</filename> or using the firewall itself, i.e. by setting the NixOS option <literal>networking.firewall.pingLimit</literal>.
+    <literal>networking.firewall.allowPing</literal> is now enabled by default.
+    Users are encouraged to configure an appropriate rate limit for their
+    machines using the Kernel interface at
+    <filename>/proc/sys/net/ipv4/icmp_ratelimit</filename> and
+    <filename>/proc/sys/net/ipv6/icmp/ratelimit</filename> or using the
+    firewall itself, i.e. by setting the NixOS option
+    <literal>networking.firewall.pingLimit</literal>.
    </para>
   </listitem>
   <listitem>
    <para>
-    Systems with some broadcom cards used to result into a generated config that is no longer accepted. If you get errors like
+    Systems with some broadcom cards used to result into a generated config
+    that is no longer accepted. If you get errors like
 <screen>error: path ‘/nix/store/*-broadcom-sta-*’ does not exist and cannot be created</screen>
-    you should either re-run <command>nixos-generate-config</command> or manually replace <literal>"${config.boot.kernelPackages.broadcom_sta}"</literal> by <literal>config.boot.kernelPackages.broadcom_sta</literal> in your <filename>/etc/nixos/hardware-configuration.nix</filename>. More discussion is on <link xlink:href="https://github.com/NixOS/nixpkgs/pull/12595"> the github issue</link>.
+    you should either re-run <command>nixos-generate-config</command> or
+    manually replace
+    <literal>"${config.boot.kernelPackages.broadcom_sta}"</literal> by
+    <literal>config.boot.kernelPackages.broadcom_sta</literal> in your
+    <filename>/etc/nixos/hardware-configuration.nix</filename>. More discussion
+    is on <link xlink:href="https://github.com/NixOS/nixpkgs/pull/12595"> the
+    github issue</link>.
    </para>
   </listitem>
   <listitem>
    <para>
-    The <literal>services.xserver.startGnuPGAgent</literal> option has been removed. GnuPG 2.1.x changed the way the gpg-agent works, and that new approach no longer requires (or even supports) the "start everything as a child of the agent" scheme we've implemented in NixOS for older versions. To configure the gpg-agent for your X session, add the following code to <filename>~/.bashrc</filename> or some file that’s sourced when your shell is started:
+    The <literal>services.xserver.startGnuPGAgent</literal> option has been
+    removed. GnuPG 2.1.x changed the way the gpg-agent works, and that new
+    approach no longer requires (or even supports) the "start everything as a
+    child of the agent" scheme we've implemented in NixOS for older versions.
+    To configure the gpg-agent for your X session, add the following code to
+    <filename>~/.bashrc</filename> or some file that’s sourced when your
+    shell is started:
 <programlisting>
 GPG_TTY=$(tty)
 export GPG_TTY
     </programlisting>
-    If you want to use gpg-agent for SSH, too, add the following to your session initialization (e.g. <literal>displayManager.sessionCommands</literal>)
+    If you want to use gpg-agent for SSH, too, add the following to your
+    session initialization (e.g.
+    <literal>displayManager.sessionCommands</literal>)
 <programlisting>
 gpg-connect-agent /bye
 unset SSH_AGENT_PID
@@ -512,11 +629,15 @@ export SSH_AUTH_SOCK="''${HOME}/.gnupg/S.gpg-agent.ssh"
 <programlisting>
 enable-ssh-support
     </programlisting>
-    is included in your <filename>~/.gnupg/gpg-agent.conf</filename>. You will need to use <command>ssh-add</command> to re-add your ssh keys. If gpg’s automatic transformation of the private keys to the new format fails, you will need to re-import your private keyring as well:
+    is included in your <filename>~/.gnupg/gpg-agent.conf</filename>. You will
+    need to use <command>ssh-add</command> to re-add your ssh keys. If gpg’s
+    automatic transformation of the private keys to the new format fails, you
+    will need to re-import your private keyring as well:
 <programlisting>
 gpg --import ~/.gnupg/secring.gpg
     </programlisting>
-    The <command>gpg-agent(1)</command> man page has more details about this subject, i.e. in the "EXAMPLES" section.
+    The <command>gpg-agent(1)</command> man page has more details about this
+    subject, i.e. in the "EXAMPLES" section.
    </para>
   </listitem>
  </itemizedlist>
@@ -540,7 +661,9 @@ gpg --import ~/.gnupg/secring.gpg
    </listitem>
    <listitem>
     <para>
-     Input method support was improved. New NixOS modules (fcitx, nabi and uim), fcitx engines (chewing, hangul, m17n, mozc and table-other) and ibus engines (hangul and m17n) have been added.
+     Input method support was improved. New NixOS modules (fcitx, nabi and
+     uim), fcitx engines (chewing, hangul, m17n, mozc and table-other) and ibus
+     engines (hangul and m17n) have been added.
     </para>
    </listitem>
   </itemizedlist>
diff --git a/nixos/doc/manual/release-notes/rl-1609.xml b/nixos/doc/manual/release-notes/rl-1609.xml
index 95e8fe3abcb..4a2343edc97 100644
--- a/nixos/doc/manual/release-notes/rl-1609.xml
+++ b/nixos/doc/manual/release-notes/rl-1609.xml
@@ -6,36 +6,48 @@
  <title>Release 16.09 (“Flounder”, 2016/09/30)</title>
 
  <para>
-  In addition to numerous new and upgraded packages, this release has the following highlights:
+  In addition to numerous new and upgraded packages, this release has the
+  following highlights:
  </para>
 
  <itemizedlist>
   <listitem>
    <para>
-    Many NixOS configurations and Nix packages now use significantly less disk space, thanks to the <link
-    xlink:href="https://github.com/NixOS/nixpkgs/issues/7117">extensive work on closure size reduction</link>. For example, the closure size of a minimal NixOS container went down from ~424 MiB in 16.03 to ~212 MiB in 16.09, while the closure size of Firefox went from ~651 MiB to ~259 MiB.
+    Many NixOS configurations and Nix packages now use significantly less disk
+    space, thanks to the
+    <link
+    xlink:href="https://github.com/NixOS/nixpkgs/issues/7117">extensive
+    work on closure size reduction</link>. For example, the closure size of a
+    minimal NixOS container went down from ~424 MiB in 16.03 to ~212 MiB in
+    16.09, while the closure size of Firefox went from ~651 MiB to ~259 MiB.
    </para>
   </listitem>
   <listitem>
    <para>
-    To improve security, packages are now <link
-    xlink:href="https://github.com/NixOS/nixpkgs/pull/12895">built using various hardening features</link>. See the Nixpkgs manual for more information.
+    To improve security, packages are now
+    <link
+    xlink:href="https://github.com/NixOS/nixpkgs/pull/12895">built
+    using various hardening features</link>. See the Nixpkgs manual for more
+    information.
    </para>
   </listitem>
   <listitem>
    <para>
     Support for PXE netboot. See <xref
-    linkend="sec-booting-from-pxe" /> for documentation.
+    linkend="sec-booting-from-pxe" />
+    for documentation.
    </para>
   </listitem>
   <listitem>
    <para>
-    X.org server 1.18. If you use the <literal>ati_unfree</literal> driver, 1.17 is still used due to an ABI incompatibility.
+    X.org server 1.18. If you use the <literal>ati_unfree</literal> driver,
+    1.17 is still used due to an ABI incompatibility.
    </para>
   </listitem>
   <listitem>
    <para>
-    This release is based on Glibc 2.24, GCC 5.4.0 and systemd 231. The default Linux kernel remains 4.4.
+    This release is based on Glibc 2.24, GCC 5.4.0 and systemd 231. The default
+    Linux kernel remains 4.4.
    </para>
   </listitem>
  </itemizedlist>
@@ -53,71 +65,122 @@
  </itemizedlist>
 
  <para>
-  When upgrading from a previous release, please be aware of the following incompatible changes:
+  When upgrading from a previous release, please be aware of the following
+  incompatible changes:
  </para>
 
  <itemizedlist>
   <listitem>
    <para>
-    A large number of packages have been converted to use the multiple outputs feature of Nix to greatly reduce the amount of required disk space, as mentioned above. This may require changes to any custom packages to make them build again; see the relevant chapter in the Nixpkgs manual for more information. (Additional caveat to packagers: some packaging conventions related to multiple-output packages <link xlink:href="https://github.com/NixOS/nixpkgs/pull/14766">were changed</link> late (August 2016) in the release cycle and differ from the initial introduction of multiple outputs.)
+    A large number of packages have been converted to use the multiple outputs
+    feature of Nix to greatly reduce the amount of required disk space, as
+    mentioned above. This may require changes to any custom packages to make
+    them build again; see the relevant chapter in the Nixpkgs manual for more
+    information. (Additional caveat to packagers: some packaging conventions
+    related to multiple-output packages
+    <link xlink:href="https://github.com/NixOS/nixpkgs/pull/14766">were
+    changed</link> late (August 2016) in the release cycle and differ from the
+    initial introduction of multiple outputs.)
    </para>
   </listitem>
   <listitem>
    <para>
-    Previous versions of Nixpkgs had support for all versions of the LTS Haskell package set. That support has been dropped. The previously provided <literal>haskell.packages.lts-x_y</literal> package sets still exist in name to aviod breaking user code, but these package sets don't actually contain the versions mandated by the corresponding LTS release. Instead, our package set it loosely based on the latest available LTS release, i.e. LTS 7.x at the time of this writing. New releases of NixOS and Nixpkgs will drop those old names entirely. <link
-    xlink:href="https://nixos.org/nix-dev/2016-June/020585.html">The motivation for this change</link> has been discussed at length on the <literal>nix-dev</literal> mailing list and in <link
-    xlink:href="https://github.com/NixOS/nixpkgs/issues/14897">Github issue #14897</link>. Development strategies for Haskell hackers who want to rely on Nix and NixOS have been described in <link
-    xlink:href="https://nixos.org/nix-dev/2016-June/020642.html">another nix-dev article</link>.
+    Previous versions of Nixpkgs had support for all versions of the LTS
+    Haskell package set. That support has been dropped. The previously provided
+    <literal>haskell.packages.lts-x_y</literal> package sets still exist in
+    name to aviod breaking user code, but these package sets don't actually
+    contain the versions mandated by the corresponding LTS release. Instead,
+    our package set it loosely based on the latest available LTS release, i.e.
+    LTS 7.x at the time of this writing. New releases of NixOS and Nixpkgs will
+    drop those old names entirely.
+    <link
+    xlink:href="https://nixos.org/nix-dev/2016-June/020585.html">The
+    motivation for this change</link> has been discussed at length on the
+    <literal>nix-dev</literal> mailing list and in
+    <link
+    xlink:href="https://github.com/NixOS/nixpkgs/issues/14897">Github
+    issue #14897</link>. Development strategies for Haskell hackers who want to
+    rely on Nix and NixOS have been described in
+    <link
+    xlink:href="https://nixos.org/nix-dev/2016-June/020642.html">another
+    nix-dev article</link>.
    </para>
   </listitem>
   <listitem>
    <para>
-    Shell aliases for systemd sub-commands <link xlink:href="https://github.com/NixOS/nixpkgs/pull/15598">were dropped</link>: <command>start</command>, <command>stop</command>, <command>restart</command>, <command>status</command>.
+    Shell aliases for systemd sub-commands
+    <link xlink:href="https://github.com/NixOS/nixpkgs/pull/15598">were
+    dropped</link>: <command>start</command>, <command>stop</command>,
+    <command>restart</command>, <command>status</command>.
    </para>
   </listitem>
   <listitem>
    <para>
-    Redis now binds to 127.0.0.1 only instead of listening to all network interfaces. This is the default behavior of Redis 3.2
+    Redis now binds to 127.0.0.1 only instead of listening to all network
+    interfaces. This is the default behavior of Redis 3.2
    </para>
   </listitem>
   <listitem>
    <para>
-    <literal>/var/empty</literal> is now immutable. Activation script runs <command>chattr +i</command> to forbid any modifications inside the folder. See <link xlink:href="https://github.com/NixOS/nixpkgs/pull/18365"> the pull request</link> for what bugs this caused.
+    <literal>/var/empty</literal> is now immutable. Activation script runs
+    <command>chattr +i</command> to forbid any modifications inside the folder.
+    See <link xlink:href="https://github.com/NixOS/nixpkgs/pull/18365"> the
+    pull request</link> for what bugs this caused.
    </para>
   </listitem>
   <listitem>
    <para>
-    Gitlab's maintainance script <command>gitlab-runner</command> was removed and split up into the more clearer <command>gitlab-run</command> and <command>gitlab-rake</command> scripts, because <command>gitlab-runner</command> is a component of Gitlab CI.
+    Gitlab's maintainance script <command>gitlab-runner</command> was removed
+    and split up into the more clearer <command>gitlab-run</command> and
+    <command>gitlab-rake</command> scripts, because
+    <command>gitlab-runner</command> is a component of Gitlab CI.
    </para>
   </listitem>
   <listitem>
    <para>
-    <literal>services.xserver.libinput.accelProfile</literal> default changed from <literal>flat</literal> to <literal>adaptive</literal>, as per <link xlink:href="https://wayland.freedesktop.org/libinput/doc/latest/group__config.html#gad63796972347f318b180e322e35cee79"> official documentation</link>.
+    <literal>services.xserver.libinput.accelProfile</literal> default changed
+    from <literal>flat</literal> to <literal>adaptive</literal>, as per
+    <link xlink:href="https://wayland.freedesktop.org/libinput/doc/latest/group__config.html#gad63796972347f318b180e322e35cee79">
+    official documentation</link>.
    </para>
   </listitem>
   <listitem>
    <para>
-    <literal>fonts.fontconfig.ultimate.rendering</literal> was removed because our presets were obsolete for some time. New presets are hardcoded into FreeType; you can select a preset via <literal>fonts.fontconfig.ultimate.preset</literal>. You can customize those presets via ordinary environment variables, using <literal>environment.variables</literal>.
+    <literal>fonts.fontconfig.ultimate.rendering</literal> was removed because
+    our presets were obsolete for some time. New presets are hardcoded into
+    FreeType; you can select a preset via
+    <literal>fonts.fontconfig.ultimate.preset</literal>. You can customize
+    those presets via ordinary environment variables, using
+    <literal>environment.variables</literal>.
    </para>
   </listitem>
   <listitem>
    <para>
-    The <literal>audit</literal> service is no longer enabled by default. Use <literal>security.audit.enable = true</literal> to explicitly enable it.
+    The <literal>audit</literal> service is no longer enabled by default. Use
+    <literal>security.audit.enable = true</literal> to explicitly enable it.
    </para>
   </listitem>
   <listitem>
    <para>
-    <literal>pkgs.linuxPackages.virtualbox</literal> now contains only the kernel modules instead of the VirtualBox user space binaries. If you want to reference the user space binaries, you have to use the new <literal>pkgs.virtualbox</literal> instead.
+    <literal>pkgs.linuxPackages.virtualbox</literal> now contains only the
+    kernel modules instead of the VirtualBox user space binaries. If you want
+    to reference the user space binaries, you have to use the new
+    <literal>pkgs.virtualbox</literal> instead.
    </para>
   </listitem>
   <listitem>
    <para>
-    <literal>goPackages</literal> was replaced with separated Go applications in appropriate <literal>nixpkgs</literal> categories. Each Go package uses its own dependency set. There's also a new <literal>go2nix</literal> tool introduced to generate a Go package definition from its Go source automatically.
+    <literal>goPackages</literal> was replaced with separated Go applications
+    in appropriate <literal>nixpkgs</literal> categories. Each Go package uses
+    its own dependency set. There's also a new <literal>go2nix</literal> tool
+    introduced to generate a Go package definition from its Go source
+    automatically.
    </para>
   </listitem>
   <listitem>
    <para>
-    <literal>services.mongodb.extraConfig</literal> configuration format was changed to YAML.
+    <literal>services.mongodb.extraConfig</literal> configuration format was
+    changed to YAML.
    </para>
   </listitem>
   <listitem>
@@ -134,42 +197,70 @@
  <itemizedlist>
   <listitem>
    <para>
-    Revamped grsecurity/PaX support. There is now only a single general-purpose distribution kernel and the configuration interface has been streamlined. Desktop users should be able to simply set
+    Revamped grsecurity/PaX support. There is now only a single general-purpose
+    distribution kernel and the configuration interface has been streamlined.
+    Desktop users should be able to simply set
 <programlisting>security.grsecurity.enable = true</programlisting>
-    to get a reasonably secure system without having to sacrifice too much functionality.
+    to get a reasonably secure system without having to sacrifice too much
+    functionality.
    </para>
   </listitem>
   <listitem>
    <para>
-    Special filesystems, like <literal>/proc</literal>, <literal>/run</literal> and others, now have the same mount options as recommended by systemd and are unified across different places in NixOS. Mount options are updated during <command>nixos-rebuild switch</command> if possible. One benefit from this is improved security — most such filesystems are now mounted with <literal>noexec</literal>, <literal>nodev</literal> and/or <literal>nosuid</literal> options.
+    Special filesystems, like <literal>/proc</literal>, <literal>/run</literal>
+    and others, now have the same mount options as recommended by systemd and
+    are unified across different places in NixOS. Mount options are updated
+    during <command>nixos-rebuild switch</command> if possible. One benefit
+    from this is improved security — most such filesystems are now mounted
+    with <literal>noexec</literal>, <literal>nodev</literal> and/or
+    <literal>nosuid</literal> options.
    </para>
   </listitem>
   <listitem>
    <para>
-    The reverse path filter was interfering with DHCPv4 server operation in the past. An exception for DHCPv4 and a new option to log packets that were dropped due to the reverse path filter was added (<literal>networking.firewall.logReversePathDrops</literal>) for easier debugging.
+    The reverse path filter was interfering with DHCPv4 server operation in the
+    past. An exception for DHCPv4 and a new option to log packets that were
+    dropped due to the reverse path filter was added
+    (<literal>networking.firewall.logReversePathDrops</literal>) for easier
+    debugging.
    </para>
   </listitem>
   <listitem>
    <para>
-    Containers configuration within <literal>containers.&lt;name&gt;.config</literal> is <link
-  xlink:href="https://github.com/NixOS/nixpkgs/pull/17365">now properly typed and checked</link>. In particular, partial configurations are merged correctly.
+    Containers configuration within
+    <literal>containers.&lt;name&gt;.config</literal> is
+    <link
+  xlink:href="https://github.com/NixOS/nixpkgs/pull/17365">now
+    properly typed and checked</link>. In particular, partial configurations
+    are merged correctly.
    </para>
   </listitem>
   <listitem>
    <para>
-    The directory container setuid wrapper programs, <filename>/var/setuid-wrappers</filename>, <link
-    xlink:href="https://github.com/NixOS/nixpkgs/pull/18124">is now updated atomically to prevent failures if the switch to a new configuration is interrupted.</link>
+    The directory container setuid wrapper programs,
+    <filename>/var/setuid-wrappers</filename>,
+    <link
+    xlink:href="https://github.com/NixOS/nixpkgs/pull/18124">is now
+    updated atomically to prevent failures if the switch to a new configuration
+    is interrupted.</link>
    </para>
   </listitem>
   <listitem>
    <para>
-    <literal>services.xserver.startGnuPGAgent</literal> has been removed due to GnuPG 2.1.x bump. See <link
-        xlink:href="https://github.com/NixOS/nixpkgs/commit/5391882ebd781149e213e8817fba6ac3c503740c"> how to achieve similar behavior</link>. You might need to <literal>pkill gpg-agent</literal> after the upgrade to prevent a stale agent being in the way.
+    <literal>services.xserver.startGnuPGAgent</literal> has been removed due to
+    GnuPG 2.1.x bump. See
+    <link
+        xlink:href="https://github.com/NixOS/nixpkgs/commit/5391882ebd781149e213e8817fba6ac3c503740c">
+    how to achieve similar behavior</link>. You might need to <literal>pkill
+    gpg-agent</literal> after the upgrade to prevent a stale agent being in the
+    way.
    </para>
   </listitem>
   <listitem>
    <para>
-    <link xlink:href="https://github.com/NixOS/nixpkgs/commit/e561edc322d275c3687fec431935095cfc717147"> Declarative users could share the uid due to the bug in the script handling conflict resolution. </link>
+    <link xlink:href="https://github.com/NixOS/nixpkgs/commit/e561edc322d275c3687fec431935095cfc717147">
+    Declarative users could share the uid due to the bug in the script handling
+    conflict resolution. </link>
    </para>
   </listitem>
   <listitem>
diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml
index 49c364a103a..14b31b232e9 100644
--- a/nixos/doc/manual/release-notes/rl-1703.xml
+++ b/nixos/doc/manual/release-notes/rl-1703.xml
@@ -13,24 +13,29 @@
   <title>Highlights</title>
 
   <para>
-   In addition to numerous new and upgraded packages, this release has the following highlights:
+   In addition to numerous new and upgraded packages, this release has the
+   following highlights:
   </para>
 
   <itemizedlist>
    <listitem>
     <para>
-     Nixpkgs is now extensible through overlays. See the <link
-    xlink:href="https://nixos.org/nixpkgs/manual/#sec-overlays-install">Nixpkgs manual</link> for more information.
+     Nixpkgs is now extensible through overlays. See the
+     <link
+    xlink:href="https://nixos.org/nixpkgs/manual/#sec-overlays-install">Nixpkgs
+     manual</link> for more information.
     </para>
    </listitem>
    <listitem>
     <para>
-     This release is based on Glibc 2.25, GCC 5.4.0 and systemd 232. The default Linux kernel is 4.9 and Nix is at 1.11.8.
+     This release is based on Glibc 2.25, GCC 5.4.0 and systemd 232. The
+     default Linux kernel is 4.9 and Nix is at 1.11.8.
     </para>
    </listitem>
    <listitem>
     <para>
-     The default desktop environment now is KDE's Plasma 5. KDE 4 has been removed
+     The default desktop environment now is KDE's Plasma 5. KDE 4 has been
+     removed
     </para>
    </listitem>
    <listitem>
@@ -40,24 +45,35 @@
    </listitem>
    <listitem>
     <para>
-     X.org server uses branch 1.19. Due to ABI incompatibilities, <literal>ati_unfree</literal> keeps forcing 1.17 and <literal>amdgpu-pro</literal> starts forcing 1.18.
+     X.org server uses branch 1.19. Due to ABI incompatibilities,
+     <literal>ati_unfree</literal> keeps forcing 1.17 and
+     <literal>amdgpu-pro</literal> starts forcing 1.18.
     </para>
    </listitem>
    <listitem>
     <para>
-     Cross compilation has been rewritten. See the nixpkgs manual for details. The most obvious breaking change is that in derivations there is no <literal>.nativeDrv</literal> nor <literal>.crossDrv</literal> are now cross by default, not native.
+     Cross compilation has been rewritten. See the nixpkgs manual for details.
+     The most obvious breaking change is that in derivations there is no
+     <literal>.nativeDrv</literal> nor <literal>.crossDrv</literal> are now
+     cross by default, not native.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>overridePackages</literal> function has been rewritten to be replaced by <link
-    xlink:href="https://nixos.org/nixpkgs/manual/#sec-overlays-install"> overlays</link>
+     The <literal>overridePackages</literal> function has been rewritten to be
+     replaced by
+     <link
+    xlink:href="https://nixos.org/nixpkgs/manual/#sec-overlays-install">
+     overlays</link>
     </para>
    </listitem>
    <listitem>
     <para>
-     Packages in nixpkgs can be marked as insecure through listed vulnerabilities. See the <link
-    xlink:href="https://nixos.org/nixpkgs/manual/#sec-allow-insecure">Nixpkgs manual</link> for more information.
+     Packages in nixpkgs can be marked as insecure through listed
+     vulnerabilities. See the
+     <link
+    xlink:href="https://nixos.org/nixpkgs/manual/#sec-allow-insecure">Nixpkgs
+     manual</link> for more information.
     </para>
    </listitem>
    <listitem>
@@ -496,64 +512,92 @@
   <title>Backward Incompatibilities</title>
 
   <para>
-   When upgrading from a previous release, please be aware of the following incompatible changes:
+   When upgrading from a previous release, please be aware of the following
+   incompatible changes:
   </para>
 
   <itemizedlist>
    <listitem>
     <para>
-     Derivations have no <literal>.nativeDrv</literal> nor <literal>.crossDrv</literal> and are now cross by default, not native.
+     Derivations have no <literal>.nativeDrv</literal> nor
+     <literal>.crossDrv</literal> and are now cross by default, not native.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>stdenv.overrides</literal> is now expected to take <literal>self</literal> and <literal>super</literal> arguments. See <literal>lib.trivial.extends</literal> for what those parameters represent.
+     <literal>stdenv.overrides</literal> is now expected to take
+     <literal>self</literal> and <literal>super</literal> arguments. See
+     <literal>lib.trivial.extends</literal> for what those parameters
+     represent.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>ansible</literal> now defaults to ansible version 2 as version 1 has been removed due to a serious <link
-      xlink:href="https://www.computest.nl/advisories/CT-2017-0109_Ansible.txt"> vulnerability</link> unpatched by upstream.
+     <literal>ansible</literal> now defaults to ansible version 2 as version 1
+     has been removed due to a serious
+     <link
+      xlink:href="https://www.computest.nl/advisories/CT-2017-0109_Ansible.txt">
+     vulnerability</link> unpatched by upstream.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>gnome</literal> alias has been removed along with <literal>gtk</literal>, <literal>gtkmm</literal> and several others. Now you need to use versioned attributes, like <literal>gnome3</literal>.
+     <literal>gnome</literal> alias has been removed along with
+     <literal>gtk</literal>, <literal>gtkmm</literal> and several others. Now
+     you need to use versioned attributes, like <literal>gnome3</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     The attribute name of the Radicale daemon has been changed from <literal>pythonPackages.radicale</literal> to <literal>radicale</literal>.
+     The attribute name of the Radicale daemon has been changed from
+     <literal>pythonPackages.radicale</literal> to <literal>radicale</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>stripHash</literal> bash function in <literal>stdenv</literal> changed according to its documentation; it now outputs the stripped name to <literal>stdout</literal> instead of putting it in the variable <literal>strippedName</literal>.
+     The <literal>stripHash</literal> bash function in
+     <literal>stdenv</literal> changed according to its documentation; it now
+     outputs the stripped name to <literal>stdout</literal> instead of putting
+     it in the variable <literal>strippedName</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     PHP now scans for extra configuration .ini files in /etc/php.d instead of /etc. This prevents accidentally loading non-PHP .ini files that may be in /etc.
+     PHP now scans for extra configuration .ini files in /etc/php.d instead of
+     /etc. This prevents accidentally loading non-PHP .ini files that may be in
+     /etc.
     </para>
    </listitem>
    <listitem>
     <para>
-     Two lone top-level dict dbs moved into <literal>dictdDBs</literal>. This affects: <literal>dictdWordnet</literal> which is now at <literal>dictdDBs.wordnet</literal> and <literal>dictdWiktionary</literal> which is now at <literal>dictdDBs.wiktionary</literal>
+     Two lone top-level dict dbs moved into <literal>dictdDBs</literal>. This
+     affects: <literal>dictdWordnet</literal> which is now at
+     <literal>dictdDBs.wordnet</literal> and <literal>dictdWiktionary</literal>
+     which is now at <literal>dictdDBs.wiktionary</literal>
     </para>
    </listitem>
    <listitem>
     <para>
-     Parsoid service now uses YAML configuration format. <literal>service.parsoid.interwikis</literal> is now called <literal>service.parsoid.wikis</literal> and is a list of either API URLs or attribute sets as specified in parsoid's documentation.
+     Parsoid service now uses YAML configuration format.
+     <literal>service.parsoid.interwikis</literal> is now called
+     <literal>service.parsoid.wikis</literal> and is a list of either API URLs
+     or attribute sets as specified in parsoid's documentation.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>Ntpd</literal> was replaced by <literal>systemd-timesyncd</literal> as the default service to synchronize system time with a remote NTP server. The old behavior can be restored by setting <literal>services.ntp.enable</literal> to <literal>true</literal>. Upstream time servers for all NTP implementations are now configured using <literal>networking.timeServers</literal>.
+     <literal>Ntpd</literal> was replaced by
+     <literal>systemd-timesyncd</literal> as the default service to synchronize
+     system time with a remote NTP server. The old behavior can be restored by
+     setting <literal>services.ntp.enable</literal> to <literal>true</literal>.
+     Upstream time servers for all NTP implementations are now configured using
+     <literal>networking.timeServers</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>service.nylon</literal> is now declared using named instances. As an example:
+     <literal>service.nylon</literal> is now declared using named instances. As
+     an example:
 <programlisting>
   services.nylon = {
     enable = true;
@@ -576,8 +620,11 @@
    </listitem>
    <listitem>
     <para>
-     <literal>overridePackages</literal> function no longer exists. It is replaced by <link
-    xlink:href="https://nixos.org/nixpkgs/manual/#sec-overlays-install"> overlays</link>. For example, the following code:
+     <literal>overridePackages</literal> function no longer exists. It is
+     replaced by
+     <link
+    xlink:href="https://nixos.org/nixpkgs/manual/#sec-overlays-install">
+     overlays</link>. For example, the following code:
 <programlisting>
 let
   pkgs = import &lt;nixpkgs&gt; {};
@@ -595,42 +642,72 @@ in
    </listitem>
    <listitem>
     <para>
-     Autoloading connection tracking helpers is now disabled by default. This default was also changed in the Linux kernel and is considered insecure if not configured properly in your firewall. If you need connection tracking helpers (i.e. for active FTP) please enable <literal>networking.firewall.autoLoadConntrackHelpers</literal> and tune <literal>networking.firewall.connectionTrackingModules</literal> to suit your needs.
+     Autoloading connection tracking helpers is now disabled by default. This
+     default was also changed in the Linux kernel and is considered insecure if
+     not configured properly in your firewall. If you need connection tracking
+     helpers (i.e. for active FTP) please enable
+     <literal>networking.firewall.autoLoadConntrackHelpers</literal> and tune
+     <literal>networking.firewall.connectionTrackingModules</literal> to suit
+     your needs.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>local_recipient_maps</literal> is not set to empty value by Postfix service. It's an insecure default as stated by Postfix documentation. Those who want to retain this setting need to set it via <literal>services.postfix.extraConfig</literal>.
+     <literal>local_recipient_maps</literal> is not set to empty value by
+     Postfix service. It's an insecure default as stated by Postfix
+     documentation. Those who want to retain this setting need to set it via
+     <literal>services.postfix.extraConfig</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     Iputils no longer provide ping6 and traceroute6. The functionality of these tools has been integrated into ping and traceroute respectively. To enforce an address family the new flags <literal>-4</literal> and <literal>-6</literal> have been added. One notable incompatibility is that specifying an interface (for link-local IPv6 for instance) is no longer done with the <literal>-I</literal> flag, but by encoding the interface into the address (<literal>ping fe80::1%eth0</literal>).
+     Iputils no longer provide ping6 and traceroute6. The functionality of
+     these tools has been integrated into ping and traceroute respectively. To
+     enforce an address family the new flags <literal>-4</literal> and
+     <literal>-6</literal> have been added. One notable incompatibility is that
+     specifying an interface (for link-local IPv6 for instance) is no longer
+     done with the <literal>-I</literal> flag, but by encoding the interface
+     into the address (<literal>ping fe80::1%eth0</literal>).
     </para>
    </listitem>
    <listitem>
     <para>
-     The socket handling of the <literal>services.rmilter</literal> module has been fixed and refactored. As rmilter doesn't support binding to more than one socket, the options <literal>bindUnixSockets</literal> and <literal>bindInetSockets</literal> have been replaced by <literal>services.rmilter.bindSocket.*</literal>. The default is still a unix socket in <literal>/run/rmilter/rmilter.sock</literal>. Refer to the options documentation for more information.
+     The socket handling of the <literal>services.rmilter</literal> module has
+     been fixed and refactored. As rmilter doesn't support binding to more than
+     one socket, the options <literal>bindUnixSockets</literal> and
+     <literal>bindInetSockets</literal> have been replaced by
+     <literal>services.rmilter.bindSocket.*</literal>. The default is still a
+     unix socket in <literal>/run/rmilter/rmilter.sock</literal>. Refer to the
+     options documentation for more information.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>fetch*</literal> functions no longer support md5, please use sha256 instead.
+     The <literal>fetch*</literal> functions no longer support md5, please use
+     sha256 instead.
     </para>
    </listitem>
    <listitem>
     <para>
-     The dnscrypt-proxy module interface has been streamlined around the <option>extraArgs</option> option. Where possible, legacy option declarations are mapped to <option>extraArgs</option> but will emit warnings. The <option>resolverList</option> has been outright removed: to use an unlisted resolver, use the <option>customResolver</option> option.
+     The dnscrypt-proxy module interface has been streamlined around the
+     <option>extraArgs</option> option. Where possible, legacy option
+     declarations are mapped to <option>extraArgs</option> but will emit
+     warnings. The <option>resolverList</option> has been outright removed: to
+     use an unlisted resolver, use the <option>customResolver</option> option.
     </para>
    </listitem>
    <listitem>
     <para>
-     torbrowser now stores local state under <filename>~/.local/share/tor-browser</filename> by default. Any browser profile data from the old location, <filename>~/.torbrowser4</filename>, must be migrated manually.
+     torbrowser now stores local state under
+     <filename>~/.local/share/tor-browser</filename> by default. Any browser
+     profile data from the old location, <filename>~/.torbrowser4</filename>,
+     must be migrated manually.
     </para>
    </listitem>
    <listitem>
     <para>
-     The ihaskell, monetdb, offlineimap and sitecopy services have been removed.
+     The ihaskell, monetdb, offlineimap and sitecopy services have been
+     removed.
     </para>
    </listitem>
   </itemizedlist>
@@ -646,12 +723,18 @@ in
   <itemizedlist>
    <listitem>
     <para>
-     Module type system have a new extensible option types feature that allow to extend certain types, such as enum, through multiple option declarations of the same option across multiple modules.
+     Module type system have a new extensible option types feature that allow
+     to extend certain types, such as enum, through multiple option
+     declarations of the same option across multiple modules.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>jre</literal> now defaults to GTK UI by default. This improves visual consistency and makes Java follow system font style, improving the situation on HighDPI displays. This has a cost of increased closure size; for server and other headless workloads it's recommended to use <literal>jre_headless</literal>.
+     <literal>jre</literal> now defaults to GTK UI by default. This improves
+     visual consistency and makes Java follow system font style, improving the
+     situation on HighDPI displays. This has a cost of increased closure size;
+     for server and other headless workloads it's recommended to use
+     <literal>jre_headless</literal>.
     </para>
    </listitem>
    <listitem>
@@ -661,37 +744,53 @@ in
    </listitem>
    <listitem>
     <para>
-     The Python 2.7 interpreter does not use modules anymore. Instead, all CPython interpreters now include the whole standard library except for `tkinter`, which is available in the Python package set.
+     The Python 2.7 interpreter does not use modules anymore. Instead, all
+     CPython interpreters now include the whole standard library except for
+     `tkinter`, which is available in the Python package set.
     </para>
    </listitem>
    <listitem>
     <para>
-     Python 2.7, 3.5 and 3.6 are now built deterministically and 3.4 mostly. Minor modifications had to be made to the interpreters in order to generate deterministic bytecode. This has security implications and is relevant for those using Python in a <literal>nix-shell</literal>. See the Nixpkgs manual for details.
+     Python 2.7, 3.5 and 3.6 are now built deterministically and 3.4 mostly.
+     Minor modifications had to be made to the interpreters in order to
+     generate deterministic bytecode. This has security implications and is
+     relevant for those using Python in a <literal>nix-shell</literal>. See the
+     Nixpkgs manual for details.
     </para>
    </listitem>
    <listitem>
     <para>
-     The Python package sets now use a fixed-point combinator and the sets are available as attributes of the interpreters.
+     The Python package sets now use a fixed-point combinator and the sets are
+     available as attributes of the interpreters.
     </para>
    </listitem>
    <listitem>
     <para>
-     The Python function <literal>buildPythonPackage</literal> has been improved and can be used to build from Setuptools source, Flit source, and precompiled Wheels.
+     The Python function <literal>buildPythonPackage</literal> has been
+     improved and can be used to build from Setuptools source, Flit source, and
+     precompiled Wheels.
     </para>
    </listitem>
    <listitem>
     <para>
-     When adding new or updating current Python libraries, the expressions should be put in separate files in <literal>pkgs/development/python-modules</literal> and called from <literal>python-packages.nix</literal>.
+     When adding new or updating current Python libraries, the expressions
+     should be put in separate files in
+     <literal>pkgs/development/python-modules</literal> and called from
+     <literal>python-packages.nix</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     The dnscrypt-proxy service supports synchronizing the list of public resolvers without working DNS resolution. This fixes issues caused by the resolver list becoming outdated. It also improves the viability of DNSCrypt only configurations.
+     The dnscrypt-proxy service supports synchronizing the list of public
+     resolvers without working DNS resolution. This fixes issues caused by the
+     resolver list becoming outdated. It also improves the viability of
+     DNSCrypt only configurations.
     </para>
    </listitem>
    <listitem>
     <para>
-     Containers using bridged networking no longer lose their connection after changes to the host networking.
+     Containers using bridged networking no longer lose their connection after
+     changes to the host networking.
     </para>
    </listitem>
    <listitem>
@@ -701,12 +800,16 @@ in
    </listitem>
    <listitem>
     <para>
-     The bind DNS utilities (e.g. dig) have been split into their own output and are now also available in <literal>pkgs.dnsutils</literal> and it is no longer necessary to pull in all of <literal>bind</literal> to use them.
+     The bind DNS utilities (e.g. dig) have been split into their own output
+     and are now also available in <literal>pkgs.dnsutils</literal> and it is
+     no longer necessary to pull in all of <literal>bind</literal> to use them.
     </para>
    </listitem>
    <listitem>
     <para>
-     Per-user configuration was moved from <filename>~/.nixpkgs</filename> to <filename>~/.config/nixpkgs</filename>. The former is still valid for <filename>config.nix</filename> for backwards compatibility.
+     Per-user configuration was moved from <filename>~/.nixpkgs</filename> to
+     <filename>~/.config/nixpkgs</filename>. The former is still valid for
+     <filename>config.nix</filename> for backwards compatibility.
     </para>
    </listitem>
   </itemizedlist>
diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml
index ff70bb663a0..795c51d2923 100644
--- a/nixos/doc/manual/release-notes/rl-1709.xml
+++ b/nixos/doc/manual/release-notes/rl-1709.xml
@@ -13,23 +13,30 @@
   <title>Highlights</title>
 
   <para>
-   In addition to numerous new and upgraded packages, this release has the following highlights:
+   In addition to numerous new and upgraded packages, this release has the
+   following highlights:
   </para>
 
   <itemizedlist>
    <listitem>
     <para>
-     The GNOME version is now 3.24. KDE Plasma was upgraded to 5.10, KDE Applications to 17.08.1 and KDE Frameworks to 5.37.
+     The GNOME version is now 3.24. KDE Plasma was upgraded to 5.10, KDE
+     Applications to 17.08.1 and KDE Frameworks to 5.37.
     </para>
    </listitem>
    <listitem>
     <para>
-     The user handling now keeps track of deallocated UIDs/GIDs. When a user or group is revived, this allows it to be allocated the UID/GID it had before. A consequence is that UIDs and GIDs are no longer reused.
+     The user handling now keeps track of deallocated UIDs/GIDs. When a user or
+     group is revived, this allows it to be allocated the UID/GID it had
+     before. A consequence is that UIDs and GIDs are no longer reused.
     </para>
    </listitem>
    <listitem>
     <para>
-     The module option <option>services.xserver.xrandrHeads</option> now causes the first head specified in this list to be set as the primary head. Apart from that, it's now possible to also set additional options by using an attribute set, for example:
+     The module option <option>services.xserver.xrandrHeads</option> now causes
+     the first head specified in this list to be set as the primary head. Apart
+     from that, it's now possible to also set additional options by using an
+     attribute set, for example:
 <programlisting>
 { services.xserver.xrandrHeads = [
     "HDMI-0"
@@ -43,21 +50,36 @@
   ];
 }
 </programlisting>
-     This will set the <literal>DVI-0</literal> output to be the primary head, even though <literal>HDMI-0</literal> is the first head in the list.
+     This will set the <literal>DVI-0</literal> output to be the primary head,
+     even though <literal>HDMI-0</literal> is the first head in the list.
     </para>
    </listitem>
    <listitem>
     <para>
-     The handling of SSL in the <literal>services.nginx</literal> module has been cleaned up, renaming the misnamed <literal>enableSSL</literal> to <literal>onlySSL</literal> which reflects its original intention. This is not to be used with the already existing <literal>forceSSL</literal> which creates a second non-SSL virtual host redirecting to the SSL virtual host. This by chance had worked earlier due to specific implementation details. In case you had specified both please remove the <literal>enableSSL</literal> option to keep the previous behaviour.
+     The handling of SSL in the <literal>services.nginx</literal> module has
+     been cleaned up, renaming the misnamed <literal>enableSSL</literal> to
+     <literal>onlySSL</literal> which reflects its original intention. This is
+     not to be used with the already existing <literal>forceSSL</literal> which
+     creates a second non-SSL virtual host redirecting to the SSL virtual host.
+     This by chance had worked earlier due to specific implementation details.
+     In case you had specified both please remove the
+     <literal>enableSSL</literal> option to keep the previous behaviour.
     </para>
     <para>
-     Another <literal>addSSL</literal> option has been introduced to configure both a non-SSL virtual host and an SSL virtual host with the same configuration.
+     Another <literal>addSSL</literal> option has been introduced to configure
+     both a non-SSL virtual host and an SSL virtual host with the same
+     configuration.
     </para>
     <para>
-     Options to configure <literal>resolver</literal> options and <literal>upstream</literal> blocks have been introduced. See their information for further details.
+     Options to configure <literal>resolver</literal> options and
+     <literal>upstream</literal> blocks have been introduced. See their
+     information for further details.
     </para>
     <para>
-     The <literal>port</literal> option has been replaced by a more generic <literal>listen</literal> option which makes it possible to specify multiple addresses, ports and SSL configs dependant on the new SSL handling mentioned above.
+     The <literal>port</literal> option has been replaced by a more generic
+     <literal>listen</literal> option which makes it possible to specify
+     multiple addresses, ports and SSL configs dependant on the new SSL
+     handling mentioned above.
     </para>
    </listitem>
   </itemizedlist>
@@ -446,31 +468,47 @@
   <title>Backward Incompatibilities</title>
 
   <para>
-   When upgrading from a previous release, please be aware of the following incompatible changes:
+   When upgrading from a previous release, please be aware of the following
+   incompatible changes:
   </para>
 
   <itemizedlist>
    <listitem>
     <para>
-     <emphasis role="strong"> In an Qemu-based virtualization environment, the network interface names changed from i.e. <literal>enp0s3</literal> to <literal>ens3</literal>. </emphasis>
+     <emphasis role="strong"> In an Qemu-based virtualization environment, the
+     network interface names changed from i.e. <literal>enp0s3</literal> to
+     <literal>ens3</literal>. </emphasis>
     </para>
     <para>
-     This is due to a kernel configuration change. The new naming is consistent with those of other Linux distributions with systemd. See <link xlink:href="https://github.com/NixOS/nixpkgs/issues/29197">#29197</link> for more information.
+     This is due to a kernel configuration change. The new naming is consistent
+     with those of other Linux distributions with systemd. See
+     <link xlink:href="https://github.com/NixOS/nixpkgs/issues/29197">#29197</link>
+     for more information.
     </para>
     <para>
-     A machine is affected if the <literal>virt-what</literal> tool either returns <literal>qemu</literal> or <literal>kvm</literal> <emphasis>and</emphasis> has interface names used in any part of its NixOS configuration, in particular if a static network configuration with <literal>networking.interfaces</literal> is used.
+     A machine is affected if the <literal>virt-what</literal> tool either
+     returns <literal>qemu</literal> or <literal>kvm</literal>
+     <emphasis>and</emphasis> has interface names used in any part of its NixOS
+     configuration, in particular if a static network configuration with
+     <literal>networking.interfaces</literal> is used.
     </para>
     <para>
      Before rebooting affected machines, please ensure:
      <itemizedlist>
       <listitem>
        <para>
-        Change the interface names in your NixOS configuration. The first interface will be called <literal>ens3</literal>, the second one <literal>ens8</literal> and starting from there incremented by 1.
+        Change the interface names in your NixOS configuration. The first
+        interface will be called <literal>ens3</literal>, the second one
+        <literal>ens8</literal> and starting from there incremented by 1.
        </para>
       </listitem>
       <listitem>
        <para>
-        After changing the interface names, rebuild your system with <literal>nixos-rebuild boot</literal> to activate the new configuration after a reboot. If you switch to the new configuration right away you might lose network connectivity! If using <literal>nixops</literal>, deploy with <literal>nixops deploy --force-reboot</literal>.
+        After changing the interface names, rebuild your system with
+        <literal>nixos-rebuild boot</literal> to activate the new configuration
+        after a reboot. If you switch to the new configuration right away you
+        might lose network connectivity! If using <literal>nixops</literal>,
+        deploy with <literal>nixops deploy --force-reboot</literal>.
        </para>
       </listitem>
      </itemizedlist>
@@ -478,59 +516,88 @@
    </listitem>
    <listitem>
     <para>
-     The following changes apply if the <literal>stateVersion</literal> is changed to 17.09 or higher. For <literal>stateVersion = "17.03"</literal> or lower the old behavior is preserved.
+     The following changes apply if the <literal>stateVersion</literal> is
+     changed to 17.09 or higher. For <literal>stateVersion = "17.03"</literal>
+     or lower the old behavior is preserved.
     </para>
     <itemizedlist>
      <listitem>
       <para>
-       The <literal>postgres</literal> default version was changed from 9.5 to 9.6.
+       The <literal>postgres</literal> default version was changed from 9.5 to
+       9.6.
       </para>
      </listitem>
      <listitem>
       <para>
-       The <literal>postgres</literal> superuser name has changed from <literal>root</literal> to <literal>postgres</literal> to more closely follow what other Linux distributions are doing.
+       The <literal>postgres</literal> superuser name has changed from
+       <literal>root</literal> to <literal>postgres</literal> to more closely
+       follow what other Linux distributions are doing.
       </para>
      </listitem>
      <listitem>
       <para>
-       The <literal>postgres</literal> default <literal>dataDir</literal> has changed from <literal>/var/db/postgres</literal> to <literal>/var/lib/postgresql/$psqlSchema</literal> where $psqlSchema is 9.6 for example.
+       The <literal>postgres</literal> default <literal>dataDir</literal> has
+       changed from <literal>/var/db/postgres</literal> to
+       <literal>/var/lib/postgresql/$psqlSchema</literal> where $psqlSchema is
+       9.6 for example.
       </para>
      </listitem>
      <listitem>
       <para>
-       The <literal>mysql</literal> default <literal>dataDir</literal> has changed from <literal>/var/mysql</literal> to <literal>/var/lib/mysql</literal>.
+       The <literal>mysql</literal> default <literal>dataDir</literal> has
+       changed from <literal>/var/mysql</literal> to
+       <literal>/var/lib/mysql</literal>.
       </para>
      </listitem>
      <listitem>
       <para>
-       Radicale's default package has changed from 1.x to 2.x. Instructions to migrate can be found <link xlink:href="http://radicale.org/1to2/"> here </link>. It is also possible to use the newer version by setting the <literal>package</literal> to <literal>radicale2</literal>, which is done automatically when <literal>stateVersion</literal> is 17.09 or higher. The <literal>extraArgs</literal> option has been added to allow passing the data migration arguments specified in the instructions; see the <filename xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/radicale.nix">radicale.nix</filename> NixOS test for an example migration.
+       Radicale's default package has changed from 1.x to 2.x. Instructions to
+       migrate can be found <link xlink:href="http://radicale.org/1to2/"> here
+       </link>. It is also possible to use the newer version by setting the
+       <literal>package</literal> to <literal>radicale2</literal>, which is
+       done automatically when <literal>stateVersion</literal> is 17.09 or
+       higher. The <literal>extraArgs</literal> option has been added to allow
+       passing the data migration arguments specified in the instructions; see
+       the
+       <filename xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/radicale.nix">radicale.nix</filename>
+       NixOS test for an example migration.
       </para>
      </listitem>
     </itemizedlist>
    </listitem>
    <listitem>
     <para>
-     The <literal>aiccu</literal> package was removed. This is due to SixXS <link xlink:href="https://www.sixxs.net/main/"> sunsetting</link> its IPv6 tunnel.
+     The <literal>aiccu</literal> package was removed. This is due to SixXS
+     <link xlink:href="https://www.sixxs.net/main/"> sunsetting</link> its IPv6
+     tunnel.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>fanctl</literal> package and <literal>fan</literal> module have been removed due to the developers not upstreaming their iproute2 patches and lagging with compatibility to recent iproute2 versions.
+     The <literal>fanctl</literal> package and <literal>fan</literal> module
+     have been removed due to the developers not upstreaming their iproute2
+     patches and lagging with compatibility to recent iproute2 versions.
     </para>
    </listitem>
    <listitem>
     <para>
-     Top-level <literal>idea</literal> package collection was renamed. All JetBrains IDEs are now at <literal>jetbrains</literal>.
+     Top-level <literal>idea</literal> package collection was renamed. All
+     JetBrains IDEs are now at <literal>jetbrains</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>flexget</literal>'s state database cannot be upgraded to its new internal format, requiring removal of any existing <literal>db-config.sqlite</literal> which will be automatically recreated.
+     <literal>flexget</literal>'s state database cannot be upgraded to its new
+     internal format, requiring removal of any existing
+     <literal>db-config.sqlite</literal> which will be automatically recreated.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>ipfs</literal> service now doesn't ignore the <literal>dataDir</literal> option anymore. If you've ever set this option to anything other than the default you'll have to either unset it (so the default gets used) or migrate the old data manually with
+     The <literal>ipfs</literal> service now doesn't ignore the
+     <literal>dataDir</literal> option anymore. If you've ever set this option
+     to anything other than the default you'll have to either unset it (so the
+     default gets used) or migrate the old data manually with
 <programlisting>
 dataDir=&lt;valueOfDataDir&gt;
 mv /var/lib/ipfs/.ipfs/* $dataDir
@@ -540,66 +607,107 @@ rmdir /var/lib/ipfs/.ipfs
    </listitem>
    <listitem>
     <para>
-     The <literal>caddy</literal> service was previously using an extra <literal>.caddy</literal> directory in the data directory specified with the <literal>dataDir</literal> option. The contents of the <literal>.caddy</literal> directory are now expected to be in the <literal>dataDir</literal>.
+     The <literal>caddy</literal> service was previously using an extra
+     <literal>.caddy</literal> directory in the data directory specified with
+     the <literal>dataDir</literal> option. The contents of the
+     <literal>.caddy</literal> directory are now expected to be in the
+     <literal>dataDir</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>ssh-agent</literal> user service is not started by default anymore. Use <literal>programs.ssh.startAgent</literal> to enable it if needed. There is also a new <literal>programs.gnupg.agent</literal> module that creates a <literal>gpg-agent</literal> user service. It can also serve as a SSH agent if <literal>enableSSHSupport</literal> is set.
+     The <literal>ssh-agent</literal> user service is not started by default
+     anymore. Use <literal>programs.ssh.startAgent</literal> to enable it if
+     needed. There is also a new <literal>programs.gnupg.agent</literal> module
+     that creates a <literal>gpg-agent</literal> user service. It can also
+     serve as a SSH agent if <literal>enableSSHSupport</literal> is set.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>services.tinc.networks.&lt;name&gt;.listenAddress</literal> option had a misleading name that did not correspond to its behavior. It now correctly defines the ip to listen for incoming connections on. To keep the previous behaviour, use <literal>services.tinc.networks.&lt;name&gt;.bindToAddress</literal> instead. Refer to the description of the options for more details.
+     The <literal>services.tinc.networks.&lt;name&gt;.listenAddress</literal>
+     option had a misleading name that did not correspond to its behavior. It
+     now correctly defines the ip to listen for incoming connections on. To
+     keep the previous behaviour, use
+     <literal>services.tinc.networks.&lt;name&gt;.bindToAddress</literal>
+     instead. Refer to the description of the options for more details.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>tlsdate</literal> package and module were removed. This is due to the project being dead and not building with openssl 1.1.
+     <literal>tlsdate</literal> package and module were removed. This is due to
+     the project being dead and not building with openssl 1.1.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>wvdial</literal> package and module were removed. This is due to the project being dead and not building with openssl 1.1.
+     <literal>wvdial</literal> package and module were removed. This is due to
+     the project being dead and not building with openssl 1.1.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>cc-wrapper</literal>'s setup-hook now exports a number of environment variables corresponding to binutils binaries, (e.g. <envar>LD</envar>, <envar>STRIP</envar>, <envar>RANLIB</envar>, etc). This is done to prevent packages' build systems guessing, which is harder to predict, especially when cross-compiling. However, some packages have broken due to this—their build systems either not supporting, or claiming to support without adequate testing, taking such environment variables as parameters.
+     <literal>cc-wrapper</literal>'s setup-hook now exports a number of
+     environment variables corresponding to binutils binaries, (e.g.
+     <envar>LD</envar>, <envar>STRIP</envar>, <envar>RANLIB</envar>, etc). This
+     is done to prevent packages' build systems guessing, which is harder to
+     predict, especially when cross-compiling. However, some packages have
+     broken due to this—their build systems either not supporting, or
+     claiming to support without adequate testing, taking such environment
+     variables as parameters.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>services.firefox.syncserver</literal> now runs by default as a non-root user. To accomodate this change, the default sqlite database location has also been changed. Migration should work automatically. Refer to the description of the options for more details.
+     <literal>services.firefox.syncserver</literal> now runs by default as a
+     non-root user. To accomodate this change, the default sqlite database
+     location has also been changed. Migration should work automatically. Refer
+     to the description of the options for more details.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>compiz</literal> window manager and package was removed. The system support had been broken for several years.
+     The <literal>compiz</literal> window manager and package was removed. The
+     system support had been broken for several years.
     </para>
    </listitem>
    <listitem>
     <para>
-     Touchpad support should now be enabled through <literal>libinput</literal> as <literal>synaptics</literal> is now deprecated. See the option <literal>services.xserver.libinput.enable</literal>.
+     Touchpad support should now be enabled through <literal>libinput</literal>
+     as <literal>synaptics</literal> is now deprecated. See the option
+     <literal>services.xserver.libinput.enable</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     grsecurity/PaX support has been dropped, following upstream's decision to cease free support. See <link xlink:href="https://grsecurity.net/passing_the_baton.php"> upstream's announcement</link> for more information. No complete replacement for grsecurity/PaX is available presently.
+     grsecurity/PaX support has been dropped, following upstream's decision to
+     cease free support. See
+     <link xlink:href="https://grsecurity.net/passing_the_baton.php">
+     upstream's announcement</link> for more information. No complete
+     replacement for grsecurity/PaX is available presently.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>services.mysql</literal> now has declarative configuration of databases and users with the <literal>ensureDatabases</literal> and <literal>ensureUsers</literal> options.
+     <literal>services.mysql</literal> now has declarative configuration of
+     databases and users with the <literal>ensureDatabases</literal> and
+     <literal>ensureUsers</literal> options.
     </para>
     <para>
-     These options will never delete existing databases and users, especially not when the value of the options are changed.
+     These options will never delete existing databases and users, especially
+     not when the value of the options are changed.
     </para>
     <para>
-     The MySQL users will be identified using <link xlink:href="https://mariadb.com/kb/en/library/authentication-plugin-unix-socket/"> Unix socket authentication</link>. This authenticates the Unix user with the same name only, and that without the need for a password.
+     The MySQL users will be identified using
+     <link xlink:href="https://mariadb.com/kb/en/library/authentication-plugin-unix-socket/">
+     Unix socket authentication</link>. This authenticates the Unix user with
+     the same name only, and that without the need for a password.
     </para>
     <para>
-     If you have previously created a MySQL <literal>root</literal> user <emphasis>with a password</emphasis>, you will need to add <literal>root</literal> user for unix socket authentication before using the new options. This can be done by running the following SQL script:
+     If you have previously created a MySQL <literal>root</literal> user
+     <emphasis>with a password</emphasis>, you will need to add
+     <literal>root</literal> user for unix socket authentication before using
+     the new options. This can be done by running the following SQL script:
 <programlisting language="sql">
 CREATE USER 'root'@'%' IDENTIFIED BY '';
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' WITH GRANT OPTION;
@@ -612,38 +720,55 @@ FLUSH PRIVILEGES;
    </listitem>
    <listitem>
     <para>
-     <literal>services.mysqlBackup</literal> now works by default without any user setup, including for users other than <literal>mysql</literal>.
+     <literal>services.mysqlBackup</literal> now works by default without any
+     user setup, including for users other than <literal>mysql</literal>.
     </para>
     <para>
-     By default, the <literal>mysql</literal> user is no longer the user which performs the backup. Instead a system account <literal>mysqlbackup</literal> is used.
+     By default, the <literal>mysql</literal> user is no longer the user which
+     performs the backup. Instead a system account
+     <literal>mysqlbackup</literal> is used.
     </para>
     <para>
-     The <literal>mysqlBackup</literal> service is also now using systemd timers instead of <literal>cron</literal>.
+     The <literal>mysqlBackup</literal> service is also now using systemd
+     timers instead of <literal>cron</literal>.
     </para>
     <para>
-     Therefore, the <literal>services.mysqlBackup.period</literal> option no longer exists, and has been replaced with <literal>services.mysqlBackup.calendar</literal>, which is in the format of <link
+     Therefore, the <literal>services.mysqlBackup.period</literal> option no
+     longer exists, and has been replaced with
+     <literal>services.mysqlBackup.calendar</literal>, which is in the format
+     of
+     <link
       xlink:href="https://www.freedesktop.org/software/systemd/man/systemd.time.html#Calendar%20Events">systemd.time(7)</link>.
     </para>
     <para>
-     If you expect to be sent an e-mail when the backup fails, consider using a script which monitors the systemd journal for errors. Regretfully, at present there is no built-in functionality for this.
+     If you expect to be sent an e-mail when the backup fails, consider using a
+     script which monitors the systemd journal for errors. Regretfully, at
+     present there is no built-in functionality for this.
     </para>
     <para>
-     You can check that backups still work by running <command>systemctl start mysql-backup</command> then <command>systemctl status mysql-backup</command>.
+     You can check that backups still work by running <command>systemctl start
+     mysql-backup</command> then <command>systemctl status
+     mysql-backup</command>.
     </para>
    </listitem>
    <listitem>
     <para>
-     Templated systemd services e.g <literal>container@name</literal> are now handled currectly when switching to a new configuration, resulting in them being reloaded.
+     Templated systemd services e.g <literal>container@name</literal> are now
+     handled currectly when switching to a new configuration, resulting in them
+     being reloaded.
     </para>
    </listitem>
    <listitem>
     <para>
-     Steam: the <literal>newStdcpp</literal> parameter was removed and should not be needed anymore.
+     Steam: the <literal>newStdcpp</literal> parameter was removed and should
+     not be needed anymore.
     </para>
    </listitem>
    <listitem>
     <para>
-     Redis has been updated to version 4 which mandates a cluster mass-restart, due to changes in the network handling, in order to ensure compatibility with networks NATing traffic.
+     Redis has been updated to version 4 which mandates a cluster mass-restart,
+     due to changes in the network handling, in order to ensure compatibility
+     with networks NATing traffic.
     </para>
    </listitem>
   </itemizedlist>
@@ -659,28 +784,46 @@ FLUSH PRIVILEGES;
   <itemizedlist>
    <listitem>
     <para>
-     Modules can now be disabled by using <link
-      xlink:href="https://nixos.org/nixpkgs/manual/#sec-replace-modules"> disabledModules</link>, allowing another to take it's place. This can be used to import a set of modules from another channel while keeping the rest of the system on a stable release.
+     Modules can now be disabled by using
+     <link
+      xlink:href="https://nixos.org/nixpkgs/manual/#sec-replace-modules">
+     disabledModules</link>, allowing another to take it's place. This can be
+     used to import a set of modules from another channel while keeping the
+     rest of the system on a stable release.
     </para>
    </listitem>
    <listitem>
     <para>
-     Updated to FreeType 2.7.1, including a new TrueType engine. The new engine replaces the Infinality engine which was the default in NixOS. The default font rendering settings are now provided by fontconfig-penultimate, replacing fontconfig-ultimate; the new defaults are less invasive and provide rendering that is more consistent with other systems and hopefully with each font designer's intent. Some system-wide configuration has been removed from the Fontconfig NixOS module where user Fontconfig settings are available.
+     Updated to FreeType 2.7.1, including a new TrueType engine. The new engine
+     replaces the Infinality engine which was the default in NixOS. The default
+     font rendering settings are now provided by fontconfig-penultimate,
+     replacing fontconfig-ultimate; the new defaults are less invasive and
+     provide rendering that is more consistent with other systems and hopefully
+     with each font designer's intent. Some system-wide configuration has been
+     removed from the Fontconfig NixOS module where user Fontconfig settings
+     are available.
     </para>
    </listitem>
    <listitem>
     <para>
-     ZFS/SPL have been updated to 0.7.0, <literal>zfsUnstable, splUnstable</literal> have therefore been removed.
+     ZFS/SPL have been updated to 0.7.0, <literal>zfsUnstable,
+     splUnstable</literal> have therefore been removed.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <option>time.timeZone</option> option now allows the value <literal>null</literal> in addition to timezone strings. This value allows changing the timezone of a system imperatively using <command>timedatectl set-timezone</command>. The default timezone is still UTC.
+     The <option>time.timeZone</option> option now allows the value
+     <literal>null</literal> in addition to timezone strings. This value allows
+     changing the timezone of a system imperatively using <command>timedatectl
+     set-timezone</command>. The default timezone is still UTC.
     </para>
    </listitem>
    <listitem>
     <para>
-     Nixpkgs overlays may now be specified with a file as well as a directory. The value of <literal>&lt;nixpkgs-overlays></literal> may be a file, and <filename>~/.config/nixpkgs/overlays.nix</filename> can be used instead of the <filename>~/.config/nixpkgs/overlays</filename> directory.
+     Nixpkgs overlays may now be specified with a file as well as a directory.
+     The value of <literal>&lt;nixpkgs-overlays></literal> may be a file, and
+     <filename>~/.config/nixpkgs/overlays.nix</filename> can be used instead of
+     the <filename>~/.config/nixpkgs/overlays</filename> directory.
     </para>
     <para>
      See the overlays chapter of the Nixpkgs manual for more details.
@@ -688,48 +831,67 @@ FLUSH PRIVILEGES;
    </listitem>
    <listitem>
     <para>
-     Definitions for <filename>/etc/hosts</filename> can now be specified declaratively with <literal>networking.hosts</literal>.
+     Definitions for <filename>/etc/hosts</filename> can now be specified
+     declaratively with <literal>networking.hosts</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     Two new options have been added to the installer loader, in addition to the default having changed. The kernel log verbosity has been lowered to the upstream default for the default options, in order to not spam the console when e.g. joining a network.
+     Two new options have been added to the installer loader, in addition to
+     the default having changed. The kernel log verbosity has been lowered to
+     the upstream default for the default options, in order to not spam the
+     console when e.g. joining a network.
     </para>
     <para>
-     This therefore leads to adding a new <literal>debug</literal> option to set the log level to the previous verbose mode, to make debugging easier, but still accessible easily.
+     This therefore leads to adding a new <literal>debug</literal> option to
+     set the log level to the previous verbose mode, to make debugging easier,
+     but still accessible easily.
     </para>
     <para>
-     Additionally a <literal>copytoram</literal> option has been added, which makes it possible to remove the install medium after booting. This allows tethering from your phone after booting from it.
+     Additionally a <literal>copytoram</literal> option has been added, which
+     makes it possible to remove the install medium after booting. This allows
+     tethering from your phone after booting from it.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>services.gitlab-runner.configOptions</literal> has been added to specify the configuration of gitlab-runners declaratively.
+     <literal>services.gitlab-runner.configOptions</literal> has been added to
+     specify the configuration of gitlab-runners declaratively.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>services.jenkins.plugins</literal> has been added to install plugins easily, this can be generated with jenkinsPlugins2nix.
+     <literal>services.jenkins.plugins</literal> has been added to install
+     plugins easily, this can be generated with jenkinsPlugins2nix.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>services.postfix.config</literal> has been added to specify the main.cf with NixOS options. Additionally other options have been added to the postfix module and has been improved further.
+     <literal>services.postfix.config</literal> has been added to specify the
+     main.cf with NixOS options. Additionally other options have been added to
+     the postfix module and has been improved further.
     </para>
    </listitem>
    <listitem>
     <para>
-     The GitLab package and module have been updated to the latest 10.0 release.
+     The GitLab package and module have been updated to the latest 10.0
+     release.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>systemd-boot</literal> boot loader now lists the NixOS version, kernel version and build date of all bootable generations.
+     The <literal>systemd-boot</literal> boot loader now lists the NixOS
+     version, kernel version and build date of all bootable generations.
     </para>
    </listitem>
    <listitem>
     <para>
-     The dnscrypt-proxy service now defaults to using a random upstream resolver, selected from the list of public non-logging resolvers with DNSSEC support. Existing configurations can be migrated to this mode of operation by omitting the <option>services.dnscrypt-proxy.resolverName</option> option or setting it to <literal>"random"</literal>.
+     The dnscrypt-proxy service now defaults to using a random upstream
+     resolver, selected from the list of public non-logging resolvers with
+     DNSSEC support. Existing configurations can be migrated to this mode of
+     operation by omitting the
+     <option>services.dnscrypt-proxy.resolverName</option> option or setting it
+     to <literal>"random"</literal>.
     </para>
    </listitem>
   </itemizedlist>
diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml
index 2e39b990d9e..c14679eea07 100644
--- a/nixos/doc/manual/release-notes/rl-1803.xml
+++ b/nixos/doc/manual/release-notes/rl-1803.xml
@@ -13,7 +13,8 @@
   <title>Highlights</title>
 
   <para>
-   In addition to numerous new and upgraded packages, this release has the following highlights:
+   In addition to numerous new and upgraded packages, this release has the
+   following highlights:
   </para>
 
   <itemizedlist>
@@ -24,36 +25,48 @@
    </listitem>
    <listitem>
     <para>
-     Platform support: x86_64-linux and x86_64-darwin since release time (the latter isn't NixOS, really). Binaries for aarch64-linux are available, but no channel exists yet, as it's waiting for some test fixes, etc.
+     Platform support: x86_64-linux and x86_64-darwin since release time (the
+     latter isn't NixOS, really). Binaries for aarch64-linux are available, but
+     no channel exists yet, as it's waiting for some test fixes, etc.
     </para>
    </listitem>
    <listitem>
     <para>
-     Nix now defaults to 2.0; see its <link xlink:href="https://nixos.org/nix/manual/#ssec-relnotes-2.0">release notes</link>.
+     Nix now defaults to 2.0; see its
+     <link xlink:href="https://nixos.org/nix/manual/#ssec-relnotes-2.0">release
+     notes</link>.
     </para>
    </listitem>
    <listitem>
     <para>
-     Core version changes: linux: 4.9 -> 4.14, glibc: 2.25 -> 2.26, gcc: 6 -> 7, systemd: 234 -> 237.
+     Core version changes: linux: 4.9 -> 4.14, glibc: 2.25 -> 2.26, gcc: 6 ->
+     7, systemd: 234 -> 237.
     </para>
    </listitem>
    <listitem>
     <para>
-     Desktop version changes: gnome: 3.24 -> 3.26, (KDE) plasma-desktop: 5.10 -> 5.12.
+     Desktop version changes: gnome: 3.24 -> 3.26, (KDE) plasma-desktop: 5.10
+     -> 5.12.
     </para>
    </listitem>
    <listitem>
     <para>
-     MariaDB 10.2, updated from 10.1, is now the default MySQL implementation. While upgrading a few changes have been made to the infrastructure involved:
+     MariaDB 10.2, updated from 10.1, is now the default MySQL implementation.
+     While upgrading a few changes have been made to the infrastructure
+     involved:
      <itemizedlist>
       <listitem>
        <para>
-        <literal>libmysql</literal> has been deprecated, please use <literal>mysql.connector-c</literal> instead, a compatibility passthru has been added to the MySQL packages.
+        <literal>libmysql</literal> has been deprecated, please use
+        <literal>mysql.connector-c</literal> instead, a compatibility passthru
+        has been added to the MySQL packages.
        </para>
       </listitem>
       <listitem>
        <para>
-        The <literal>mysql57</literal> package has a new <literal>static</literal> output containing the static libraries including <literal>libmysqld.a</literal>
+        The <literal>mysql57</literal> package has a new
+        <literal>static</literal> output containing the static libraries
+        including <literal>libmysqld.a</literal>
        </para>
       </listitem>
      </itemizedlist>
@@ -390,7 +403,8 @@
   <title>Backward Incompatibilities</title>
 
   <para>
-   When upgrading from a previous release, please be aware of the following incompatible changes:
+   When upgrading from a previous release, please be aware of the following
+   incompatible changes:
   </para>
 
   <itemizedlist>
@@ -401,26 +415,39 @@
    </listitem>
    <listitem>
     <para>
-     Dollar signs in options under <option>services.postfix</option> are passed verbatim to Postfix, which will interpret them as the beginning of a parameter expression. This was already true for string-valued options in the previous release, but not for list-valued options. If you need to pass literal dollar signs through Postfix, double them.
+     Dollar signs in options under <option>services.postfix</option> are passed
+     verbatim to Postfix, which will interpret them as the beginning of a
+     parameter expression. This was already true for string-valued options in
+     the previous release, but not for list-valued options. If you need to pass
+     literal dollar signs through Postfix, double them.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>postage</literal> package (for web-based PostgreSQL administration) has been renamed to <literal>pgmanage</literal>. The corresponding module has also been renamed. To migrate please rename all <option>services.postage</option> options to <option>services.pgmanage</option>.
+     The <literal>postage</literal> package (for web-based PostgreSQL
+     administration) has been renamed to <literal>pgmanage</literal>. The
+     corresponding module has also been renamed. To migrate please rename all
+     <option>services.postage</option> options to
+     <option>services.pgmanage</option>.
     </para>
    </listitem>
    <listitem>
     <para>
-     Package attributes starting with a digit have been prefixed with an underscore sign. This is to avoid quoting in the configuration and other issues with command-line tools like <literal>nix-env</literal>. The change affects the following packages:
+     Package attributes starting with a digit have been prefixed with an
+     underscore sign. This is to avoid quoting in the configuration and other
+     issues with command-line tools like <literal>nix-env</literal>. The change
+     affects the following packages:
      <itemizedlist>
       <listitem>
        <para>
-        <literal>2048-in-terminal</literal> → <literal>_2048-in-terminal</literal>
+        <literal>2048-in-terminal</literal> →
+        <literal>_2048-in-terminal</literal>
        </para>
       </listitem>
       <listitem>
        <para>
-        <literal>90secondportraits</literal> → <literal>_90secondportraits</literal>
+        <literal>90secondportraits</literal> →
+        <literal>_90secondportraits</literal>
        </para>
       </listitem>
       <listitem>
@@ -438,77 +465,134 @@
    </listitem>
    <listitem>
     <para>
-     <emphasis role="strong"> The OpenSSH service no longer enables support for DSA keys by default, which could cause a system lock out. Update your keys or, unfavorably, re-enable DSA support manually. </emphasis>
+     <emphasis role="strong"> The OpenSSH service no longer enables support for
+     DSA keys by default, which could cause a system lock out. Update your keys
+     or, unfavorably, re-enable DSA support manually. </emphasis>
     </para>
     <para>
-     DSA support was <link xlink:href="https://www.openssh.com/legacy.html">deprecated in OpenSSH 7.0</link>, due to it being too weak. To re-enable support, add <literal>PubkeyAcceptedKeyTypes +ssh-dss</literal> to the end of your <option>services.openssh.extraConfig</option>.
+     DSA support was
+     <link xlink:href="https://www.openssh.com/legacy.html">deprecated in
+     OpenSSH 7.0</link>, due to it being too weak. To re-enable support, add
+     <literal>PubkeyAcceptedKeyTypes +ssh-dss</literal> to the end of your
+     <option>services.openssh.extraConfig</option>.
     </para>
     <para>
-     After updating the keys to be stronger, anyone still on a pre-17.03 version is safe to jump to 17.03, as vetted <link xlink:href="https://search.nix.gsc.io/?q=stateVersion">here</link>.
+     After updating the keys to be stronger, anyone still on a pre-17.03
+     version is safe to jump to 17.03, as vetted
+     <link xlink:href="https://search.nix.gsc.io/?q=stateVersion">here</link>.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>openssh</literal> package now includes Kerberos support by default; the <literal>openssh_with_kerberos</literal> package is now a deprecated alias. If you do not want Kerberos support, you can do <literal>openssh.override { withKerberos = false; }</literal>. Note, this also applies to the <literal>openssh_hpn</literal> package.
+     The <literal>openssh</literal> package now includes Kerberos support by
+     default; the <literal>openssh_with_kerberos</literal> package is now a
+     deprecated alias. If you do not want Kerberos support, you can do
+     <literal>openssh.override { withKerberos = false; }</literal>. Note, this
+     also applies to the <literal>openssh_hpn</literal> package.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>cc-wrapper</literal> has been split in two; there is now also a <literal>bintools-wrapper</literal>. The most commonly used files in <filename>nix-support</filename> are now split between the two wrappers. Some commonly used ones, like <filename>nix-support/dynamic-linker</filename>, are duplicated for backwards compatability, even though they rightly belong only in <literal>bintools-wrapper</literal>. Other more obscure ones are just moved.
+     <literal>cc-wrapper</literal> has been split in two; there is now also a
+     <literal>bintools-wrapper</literal>. The most commonly used files in
+     <filename>nix-support</filename> are now split between the two wrappers.
+     Some commonly used ones, like
+     <filename>nix-support/dynamic-linker</filename>, are duplicated for
+     backwards compatability, even though they rightly belong only in
+     <literal>bintools-wrapper</literal>. Other more obscure ones are just
+     moved.
     </para>
    </listitem>
    <listitem>
     <para>
-     The propagation logic has been changed. The new logic, along with new types of dependencies that go with, is thoroughly documented in the "Specifying dependencies" section of the "Standard Environment" chapter of the nixpkgs manual.
+     The propagation logic has been changed. The new logic, along with new
+     types of dependencies that go with, is thoroughly documented in the
+     "Specifying dependencies" section of the "Standard Environment" chapter of
+     the nixpkgs manual.
 <!-- That's <xref linkend="ssec-stdenv-attributes"> were we to merge the manuals. -->
-     The old logic isn't but is easy to describe: dependencies were propagated as the same type of dependency no matter what. In practice, that means that many <function>propagatedNativeBuildInputs</function> should instead be <function>propagatedBuildInputs</function>. Thankfully, that was and is the least used type of dependency. Also, it means that some <function>propagatedBuildInputs</function> should instead be <function>depsTargetTargetPropagated</function>. Other types dependencies should be unaffected.
+     The old logic isn't but is easy to describe: dependencies were propagated
+     as the same type of dependency no matter what. In practice, that means
+     that many <function>propagatedNativeBuildInputs</function> should instead
+     be <function>propagatedBuildInputs</function>. Thankfully, that was and is
+     the least used type of dependency. Also, it means that some
+     <function>propagatedBuildInputs</function> should instead be
+     <function>depsTargetTargetPropagated</function>. Other types dependencies
+     should be unaffected.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>lib.addPassthru drv passthru</literal> is removed. Use <literal>lib.extendDerivation true passthru drv</literal> instead.
+     <literal>lib.addPassthru drv passthru</literal> is removed. Use
+     <literal>lib.extendDerivation true passthru drv</literal> instead.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>memcached</literal> service no longer accept dynamic socket paths via <option>services.memcached.socket</option>. Unix sockets can be still enabled by <option>services.memcached.enableUnixSocket</option> and will be accessible at <literal>/run/memcached/memcached.sock</literal>.
+     The <literal>memcached</literal> service no longer accept dynamic socket
+     paths via <option>services.memcached.socket</option>. Unix sockets can be
+     still enabled by <option>services.memcached.enableUnixSocket</option> and
+     will be accessible at <literal>/run/memcached/memcached.sock</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <varname>hardware.amdHybridGraphics.disable</varname> option was removed for lack of a maintainer. If you still need this module, you may wish to include a copy of it from an older version of nixos in your imports.
+     The <varname>hardware.amdHybridGraphics.disable</varname> option was
+     removed for lack of a maintainer. If you still need this module, you may
+     wish to include a copy of it from an older version of nixos in your
+     imports.
     </para>
    </listitem>
    <listitem>
     <para>
-     The merging of config options for <varname>services.postfix.config</varname> was buggy. Previously, if other options in the Postfix module like <varname>services.postfix.useSrs</varname> were set and the user set config options that were also set by such options, the resulting config wouldn't include all options that were needed. They are now merged correctly. If config options need to be overridden, <literal>lib.mkForce</literal> or <literal>lib.mkOverride</literal> can be used.
+     The merging of config options for
+     <varname>services.postfix.config</varname> was buggy. Previously, if other
+     options in the Postfix module like
+     <varname>services.postfix.useSrs</varname> were set and the user set
+     config options that were also set by such options, the resulting config
+     wouldn't include all options that were needed. They are now merged
+     correctly. If config options need to be overridden,
+     <literal>lib.mkForce</literal> or <literal>lib.mkOverride</literal> can be
+     used.
     </para>
    </listitem>
    <listitem>
     <para>
-     The following changes apply if the <literal>stateVersion</literal> is changed to 18.03 or higher. For <literal>stateVersion = "17.09"</literal> or lower the old behavior is preserved.
+     The following changes apply if the <literal>stateVersion</literal> is
+     changed to 18.03 or higher. For <literal>stateVersion = "17.09"</literal>
+     or lower the old behavior is preserved.
     </para>
     <itemizedlist>
      <listitem>
       <para>
-       <literal>matrix-synapse</literal> uses postgresql by default instead of sqlite. Migration instructions can be found <link xlink:href="https://github.com/matrix-org/synapse/blob/master/docs/postgres.rst#porting-from-sqlite"> here </link>.
+       <literal>matrix-synapse</literal> uses postgresql by default instead of
+       sqlite. Migration instructions can be found
+       <link xlink:href="https://github.com/matrix-org/synapse/blob/master/docs/postgres.rst#porting-from-sqlite">
+       here </link>.
       </para>
      </listitem>
     </itemizedlist>
    </listitem>
    <listitem>
     <para>
-     The <literal>jid</literal> package has been removed, due to maintenance overhead of a go package having non-versioned dependencies.
+     The <literal>jid</literal> package has been removed, due to maintenance
+     overhead of a go package having non-versioned dependencies.
     </para>
    </listitem>
    <listitem>
     <para>
-     When using <option>services.xserver.libinput</option> (enabled by default in GNOME), it now handles all input devices, not just touchpads. As a result, you might need to re-evaluate any custom Xorg configuration. In particular, <literal>Option "XkbRules" "base"</literal> may result in broken keyboard layout.
+     When using <option>services.xserver.libinput</option> (enabled by default
+     in GNOME), it now handles all input devices, not just touchpads. As a
+     result, you might need to re-evaluate any custom Xorg configuration. In
+     particular, <literal>Option "XkbRules" "base"</literal> may result in
+     broken keyboard layout.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>attic</literal> package was removed. A maintained fork called <link xlink:href="https://www.borgbackup.org/">Borg</link> should be used instead. Migration instructions can be found <link xlink:href="http://borgbackup.readthedocs.io/en/stable/usage/upgrade.html#attic-and-borg-0-xx-to-borg-1-x">here</link>.
+     The <literal>attic</literal> package was removed. A maintained fork called
+     <link xlink:href="https://www.borgbackup.org/">Borg</link> should be used
+     instead. Migration instructions can be found
+     <link xlink:href="http://borgbackup.readthedocs.io/en/stable/usage/upgrade.html#attic-and-borg-0-xx-to-borg-1-x">here</link>.
     </para>
    </listitem>
    <listitem>
@@ -517,32 +601,52 @@
      <itemizedlist>
       <listitem>
        <para>
-        The package <literal>pkgs.piwik</literal> was renamed to <literal>pkgs.matomo</literal>.
+        The package <literal>pkgs.piwik</literal> was renamed to
+        <literal>pkgs.matomo</literal>.
        </para>
       </listitem>
       <listitem>
        <para>
-        The service <literal>services.piwik</literal> was renamed to <literal>services.matomo</literal>.
+        The service <literal>services.piwik</literal> was renamed to
+        <literal>services.matomo</literal>.
        </para>
       </listitem>
       <listitem>
        <para>
-        The data directory <filename>/var/lib/piwik</filename> was renamed to <filename>/var/lib/matomo</filename>. All files will be moved automatically on first startup, but you might need to adjust your backup scripts.
+        The data directory <filename>/var/lib/piwik</filename> was renamed to
+        <filename>/var/lib/matomo</filename>. All files will be moved
+        automatically on first startup, but you might need to adjust your
+        backup scripts.
        </para>
       </listitem>
       <listitem>
        <para>
-        The default <option>serverName</option> for the nginx configuration changed from <literal>piwik.${config.networking.hostName}</literal> to <literal>matomo.${config.networking.hostName}.${config.networking.domain}</literal> if <option>config.networking.domain</option> is set, <literal>matomo.${config.networking.hostName}</literal> if it is not set. If you change your <option>serverName</option>, remember you'll need to update the <literal>trustedHosts[]</literal> array in <filename>/var/lib/matomo/config/config.ini.php</filename> as well.
+        The default <option>serverName</option> for the nginx configuration
+        changed from <literal>piwik.${config.networking.hostName}</literal> to
+        <literal>matomo.${config.networking.hostName}.${config.networking.domain}</literal>
+        if <option>config.networking.domain</option> is set,
+        <literal>matomo.${config.networking.hostName}</literal> if it is not
+        set. If you change your <option>serverName</option>, remember you'll
+        need to update the <literal>trustedHosts[]</literal> array in
+        <filename>/var/lib/matomo/config/config.ini.php</filename> as well.
        </para>
       </listitem>
       <listitem>
        <para>
-        The <literal>piwik</literal> user was renamed to <literal>matomo</literal>. The service will adjust ownership automatically for files in the data directory. If you use unix socket authentication, remember to give the new <literal>matomo</literal> user access to the database and to change the <literal>username</literal> to <literal>matomo</literal> in the <literal>[database]</literal> section of <filename>/var/lib/matomo/config/config.ini.php</filename>.
+        The <literal>piwik</literal> user was renamed to
+        <literal>matomo</literal>. The service will adjust ownership
+        automatically for files in the data directory. If you use unix socket
+        authentication, remember to give the new <literal>matomo</literal> user
+        access to the database and to change the <literal>username</literal> to
+        <literal>matomo</literal> in the <literal>[database]</literal> section
+        of <filename>/var/lib/matomo/config/config.ini.php</filename>.
        </para>
       </listitem>
       <listitem>
        <para>
-        If you named your database `piwik`, you might want to rename it to `matomo` to keep things clean, but this is neither enforced nor required.
+        If you named your database `piwik`, you might want to rename it to
+        `matomo` to keep things clean, but this is neither enforced nor
+        required.
        </para>
       </listitem>
      </itemizedlist>
@@ -550,43 +654,59 @@
    </listitem>
    <listitem>
     <para>
-     <literal>nodejs-4_x</literal> is end-of-life. <literal>nodejs-4_x</literal>, <literal>nodejs-slim-4_x</literal> and <literal>nodePackages_4_x</literal> are removed.
+     <literal>nodejs-4_x</literal> is end-of-life.
+     <literal>nodejs-4_x</literal>, <literal>nodejs-slim-4_x</literal> and
+     <literal>nodePackages_4_x</literal> are removed.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>pump.io</literal> NixOS module was removed. It is now maintained as an <link xlink:href="https://github.com/rvl/pump.io-nixos">external module</link>.
+     The <literal>pump.io</literal> NixOS module was removed. It is now
+     maintained as an
+     <link xlink:href="https://github.com/rvl/pump.io-nixos">external
+     module</link>.
     </para>
    </listitem>
    <listitem>
     <para>
-     The Prosody XMPP server has received a major update. The following modules were renamed:
+     The Prosody XMPP server has received a major update. The following modules
+     were renamed:
      <itemizedlist>
       <listitem>
        <para>
-        <option>services.prosody.modules.httpserver</option> is now <option>services.prosody.modules.http_files</option>
+        <option>services.prosody.modules.httpserver</option> is now
+        <option>services.prosody.modules.http_files</option>
        </para>
       </listitem>
       <listitem>
        <para>
-        <option>services.prosody.modules.console</option> is now <option>services.prosody.modules.admin_telnet</option>
+        <option>services.prosody.modules.console</option> is now
+        <option>services.prosody.modules.admin_telnet</option>
        </para>
       </listitem>
      </itemizedlist>
     </para>
     <para>
-     Many new modules are now core modules, most notably <option>services.prosody.modules.carbons</option> and <option>services.prosody.modules.mam</option>.
+     Many new modules are now core modules, most notably
+     <option>services.prosody.modules.carbons</option> and
+     <option>services.prosody.modules.mam</option>.
     </para>
     <para>
-     The better-performing <literal>libevent</literal> backend is now enabled by default.
+     The better-performing <literal>libevent</literal> backend is now enabled
+     by default.
     </para>
     <para>
-     <literal>withCommunityModules</literal> now passes through the modules to <option>services.prosody.extraModules</option>. Use <literal>withOnlyInstalledCommunityModules</literal> for modules that should not be enabled directly, e.g <literal>lib_ldap</literal>.
+     <literal>withCommunityModules</literal> now passes through the modules to
+     <option>services.prosody.extraModules</option>. Use
+     <literal>withOnlyInstalledCommunityModules</literal> for modules that
+     should not be enabled directly, e.g <literal>lib_ldap</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     All prometheus exporter modules are now defined as submodules. The exporters are configured using <literal>services.prometheus.exporters</literal>.
+     All prometheus exporter modules are now defined as submodules. The
+     exporters are configured using
+     <literal>services.prometheus.exporters</literal>.
     </para>
    </listitem>
   </itemizedlist>
@@ -602,17 +722,24 @@
   <itemizedlist>
    <listitem>
     <para>
-     ZNC option <option>services.znc.mutable</option> now defaults to <literal>true</literal>. That means that old configuration is not overwritten by default when update to the znc options are made.
+     ZNC option <option>services.znc.mutable</option> now defaults to
+     <literal>true</literal>. That means that old configuration is not
+     overwritten by default when update to the znc options are made.
     </para>
    </listitem>
    <listitem>
     <para>
-     The option <option>networking.wireless.networks.&lt;name&gt;.auth</option> has been added for wireless networks with WPA-Enterprise authentication. There is also a new <option>extraConfig</option> option to directly configure <literal>wpa_supplicant</literal> and <option>hidden</option> to connect to hidden networks.
+     The option <option>networking.wireless.networks.&lt;name&gt;.auth</option>
+     has been added for wireless networks with WPA-Enterprise authentication.
+     There is also a new <option>extraConfig</option> option to directly
+     configure <literal>wpa_supplicant</literal> and <option>hidden</option> to
+     connect to hidden networks.
     </para>
    </listitem>
    <listitem>
     <para>
-     In the module <option>networking.interfaces.&lt;name&gt;</option> the following options have been removed:
+     In the module <option>networking.interfaces.&lt;name&gt;</option> the
+     following options have been removed:
      <itemizedlist>
       <listitem>
        <para>
@@ -640,22 +767,34 @@
        </para>
       </listitem>
      </itemizedlist>
-     To assign static addresses to an interface the options <option>ipv4.addresses</option> and <option>ipv6.addresses</option> should be used instead. The options <option>ip4</option> and <option>ip6</option> have been renamed to <option>ipv4.addresses</option> <option>ipv6.addresses</option> respectively. The new options <option>ipv4.routes</option> and <option>ipv6.routes</option> have been added to set up static routing.
+     To assign static addresses to an interface the options
+     <option>ipv4.addresses</option> and <option>ipv6.addresses</option> should
+     be used instead. The options <option>ip4</option> and <option>ip6</option>
+     have been renamed to <option>ipv4.addresses</option>
+     <option>ipv6.addresses</option> respectively. The new options
+     <option>ipv4.routes</option> and <option>ipv6.routes</option> have been
+     added to set up static routing.
     </para>
    </listitem>
    <listitem>
     <para>
-     The option <option>services.logstash.listenAddress</option> is now <literal>127.0.0.1</literal> by default. Previously the default behaviour was to listen on all interfaces.
+     The option <option>services.logstash.listenAddress</option> is now
+     <literal>127.0.0.1</literal> by default. Previously the default behaviour
+     was to listen on all interfaces.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>services.btrfs.autoScrub</literal> has been added, to periodically check btrfs filesystems for data corruption. If there's a correct copy available, it will automatically repair corrupted blocks.
+     <literal>services.btrfs.autoScrub</literal> has been added, to
+     periodically check btrfs filesystems for data corruption. If there's a
+     correct copy available, it will automatically repair corrupted blocks.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>displayManager.lightdm.greeters.gtk.clock-format.</literal> has been added, the clock format string (as expected by strftime, e.g. <literal>%H:%M</literal>) to use with the lightdm gtk greeter panel.
+     <literal>displayManager.lightdm.greeters.gtk.clock-format.</literal> has
+     been added, the clock format string (as expected by strftime, e.g.
+     <literal>%H:%M</literal>) to use with the lightdm gtk greeter panel.
     </para>
     <para>
      If set to null the default clock format is used.
@@ -663,10 +802,17 @@
    </listitem>
    <listitem>
     <para>
-     <literal>displayManager.lightdm.greeters.gtk.indicators</literal> has been added, a list of allowed indicator modules to use with the lightdm gtk greeter panel.
+     <literal>displayManager.lightdm.greeters.gtk.indicators</literal> has been
+     added, a list of allowed indicator modules to use with the lightdm gtk
+     greeter panel.
     </para>
     <para>
-     Built-in indicators include <literal>~a11y</literal>, <literal>~language</literal>, <literal>~session</literal>, <literal>~power</literal>, <literal>~clock</literal>, <literal>~host</literal>, <literal>~spacer</literal>. Unity indicators can be represented by short name (e.g. <literal>sound</literal>, <literal>power</literal>), service file name, or absolute path.
+     Built-in indicators include <literal>~a11y</literal>,
+     <literal>~language</literal>, <literal>~session</literal>,
+     <literal>~power</literal>, <literal>~clock</literal>,
+     <literal>~host</literal>, <literal>~spacer</literal>. Unity indicators can
+     be represented by short name (e.g. <literal>sound</literal>,
+     <literal>power</literal>), service file name, or absolute path.
     </para>
     <para>
      If set to <literal>null</literal> the default indicators are used.
@@ -688,12 +834,20 @@
    </listitem>
    <listitem>
     <para>
-     The NixOS test driver supports user services declared by <literal>systemd.user.services</literal>. The methods <literal>waitForUnit</literal>, <literal>getUnitInfo</literal>, <literal>startJob</literal> and <literal>stopJob</literal> provide an optional <literal>$user</literal> argument for that purpose.
+     The NixOS test driver supports user services declared by
+     <literal>systemd.user.services</literal>. The methods
+     <literal>waitForUnit</literal>, <literal>getUnitInfo</literal>,
+     <literal>startJob</literal> and <literal>stopJob</literal> provide an
+     optional <literal>$user</literal> argument for that purpose.
     </para>
    </listitem>
    <listitem>
     <para>
-     Enabling bash completion on NixOS, <literal>programs.bash.enableCompletion</literal>, will now also enable completion for the Nix command line tools by installing the <link xlink:href="https://github.com/hedning/nix-bash-completions">nix-bash-completions</link> package.
+     Enabling bash completion on NixOS,
+     <literal>programs.bash.enableCompletion</literal>, will now also enable
+     completion for the Nix command line tools by installing the
+     <link xlink:href="https://github.com/hedning/nix-bash-completions">nix-bash-completions</link>
+     package.
     </para>
    </listitem>
   </itemizedlist>
diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml
index df53c6f9dd9..3f10b26223d 100644
--- a/nixos/doc/manual/release-notes/rl-1809.xml
+++ b/nixos/doc/manual/release-notes/rl-1809.xml
@@ -13,7 +13,8 @@
   <title>Highlights</title>
 
   <para>
-   In addition to numerous new and upgraded packages, this release has the following notable updates:
+   In addition to numerous new and upgraded packages, this release has the
+   following notable updates:
   </para>
 
   <itemizedlist>
@@ -24,22 +25,28 @@
    </listitem>
    <listitem>
     <para>
-     Platform support: x86_64-linux and x86_64-darwin as always. Support for aarch64-linux is as with the previous releases, not equivalent to the x86-64-linux release, but with efforts to reach parity.
+     Platform support: x86_64-linux and x86_64-darwin as always. Support for
+     aarch64-linux is as with the previous releases, not equivalent to the
+     x86-64-linux release, but with efforts to reach parity.
     </para>
    </listitem>
    <listitem>
     <para>
-     Nix has been updated to 2.1; see its <link xlink:href="https://nixos.org/nix/manual/#ssec-relnotes-2.1">release notes</link>.
+     Nix has been updated to 2.1; see its
+     <link xlink:href="https://nixos.org/nix/manual/#ssec-relnotes-2.1">release
+     notes</link>.
     </para>
    </listitem>
    <listitem>
     <para>
-     Core versions: linux: 4.14 LTS (unchanged), glibc: 2.26 → 2.27, gcc: 7 (unchanged), systemd: 237 → 239.
+     Core versions: linux: 4.14 LTS (unchanged), glibc: 2.26 → 2.27, gcc: 7
+     (unchanged), systemd: 237 → 239.
     </para>
    </listitem>
    <listitem>
     <para>
-     Desktop version changes: gnome: 3.26 → 3.28, (KDE) plasma-desktop: 5.12 → 5.13.
+     Desktop version changes: gnome: 3.26 → 3.28, (KDE) plasma-desktop: 5.12
+     → 5.13.
     </para>
    </listitem>
   </itemizedlist>
@@ -51,7 +58,8 @@
   <itemizedlist>
    <listitem>
     <para>
-     Support for wrapping binaries using <literal>firejail</literal> has been added through <varname>programs.firejail.wrappedBinaries</varname>.
+     Support for wrapping binaries using <literal>firejail</literal> has been
+     added through <varname>programs.firejail.wrappedBinaries</varname>.
     </para>
     <para>
      For example
@@ -66,12 +74,17 @@ programs.firejail = {
 };
 </programlisting>
     <para>
-     This will place <literal>firefox</literal> and <literal>mpv</literal> binaries in the global path wrapped by firejail.
+     This will place <literal>firefox</literal> and <literal>mpv</literal>
+     binaries in the global path wrapped by firejail.
     </para>
    </listitem>
    <listitem>
     <para>
-     User channels are now in the default <literal>NIX_PATH</literal>, allowing users to use their personal <command>nix-channel</command> defined channels in <command>nix-build</command> and <command>nix-shell</command> commands, as well as in imports like <code>import &lt;mychannel&gt;</code>.
+     User channels are now in the default <literal>NIX_PATH</literal>, allowing
+     users to use their personal <command>nix-channel</command> defined
+     channels in <command>nix-build</command> and <command>nix-shell</command>
+     commands, as well as in imports like <code>import
+     &lt;mychannel&gt;</code>.
     </para>
     <para>
      For example
@@ -101,31 +114,52 @@ $ nix-instantiate -E '(import &lt;nixpkgsunstable&gt; {}).gitFull'
   <itemizedlist>
    <listitem>
     <para>
-     The <varname>services.cassandra</varname> module has been reworked and was rewritten from scratch. The service has succeeding tests for the versions 2.1, 2.2, 3.0 and 3.11 of <link
-     xlink:href="https://cassandra.apache.org/">Apache Cassandra</link>.
+     The <varname>services.cassandra</varname> module has been reworked and was
+     rewritten from scratch. The service has succeeding tests for the versions
+     2.1, 2.2, 3.0 and 3.11 of
+     <link
+     xlink:href="https://cassandra.apache.org/">Apache
+     Cassandra</link>.
     </para>
    </listitem>
    <listitem>
     <para>
-     There is a new <varname>services.foundationdb</varname> module for deploying <link xlink:href="https://www.foundationdb.org">FoundationDB</link> clusters.
+     There is a new <varname>services.foundationdb</varname> module for
+     deploying
+     <link xlink:href="https://www.foundationdb.org">FoundationDB</link>
+     clusters.
     </para>
    </listitem>
    <listitem>
     <para>
-     When enabled the <literal>iproute2</literal> will copy the files expected by ip route (e.g., <filename>rt_tables</filename>) in <filename>/etc/iproute2</filename>. This allows to write aliases for routing tables for instance.
+     When enabled the <literal>iproute2</literal> will copy the files expected
+     by ip route (e.g., <filename>rt_tables</filename>) in
+     <filename>/etc/iproute2</filename>. This allows to write aliases for
+     routing tables for instance.
     </para>
    </listitem>
    <listitem>
     <para>
-     <varname>services.strongswan-swanctl</varname> is a modern replacement for <varname>services.strongswan</varname>. You can use either one of them to setup IPsec VPNs but not both at the same time.
+     <varname>services.strongswan-swanctl</varname> is a modern replacement for
+     <varname>services.strongswan</varname>. You can use either one of them to
+     setup IPsec VPNs but not both at the same time.
     </para>
     <para>
-     <varname>services.strongswan-swanctl</varname> uses the <link xlink:href="https://wiki.strongswan.org/projects/strongswan/wiki/swanctl">swanctl</link> command which uses the modern <link xlink:href="https://github.com/strongswan/strongswan/blob/master/src/libcharon/plugins/vici/README.md">vici</link> <emphasis>Versatile IKE Configuration Interface</emphasis>. The deprecated <literal>ipsec</literal> command used in <varname>services.strongswan</varname> is using the legacy <link xlink:href="https://github.com/strongswan/strongswan/blob/master/README_LEGACY.md">stroke configuration interface</link>.
+     <varname>services.strongswan-swanctl</varname> uses the
+     <link xlink:href="https://wiki.strongswan.org/projects/strongswan/wiki/swanctl">swanctl</link>
+     command which uses the modern
+     <link xlink:href="https://github.com/strongswan/strongswan/blob/master/src/libcharon/plugins/vici/README.md">vici</link>
+     <emphasis>Versatile IKE Configuration Interface</emphasis>. The deprecated
+     <literal>ipsec</literal> command used in
+     <varname>services.strongswan</varname> is using the legacy
+     <link xlink:href="https://github.com/strongswan/strongswan/blob/master/README_LEGACY.md">stroke
+     configuration interface</link>.
     </para>
    </listitem>
    <listitem>
     <para>
-     The new <varname>services.elasticsearch-curator</varname> service periodically curates or manages, your Elasticsearch indices and snapshots.
+     The new <varname>services.elasticsearch-curator</varname> service
+     periodically curates or manages, your Elasticsearch indices and snapshots.
     </para>
    </listitem>
   </itemizedlist>
@@ -436,32 +470,38 @@ $ nix-instantiate -E '(import &lt;nixpkgsunstable&gt; {}).gitFull'
   <title>Backward Incompatibilities</title>
 
   <para>
-   When upgrading from a previous release, please be aware of the following incompatible changes:
+   When upgrading from a previous release, please be aware of the following
+   incompatible changes:
   </para>
 
   <itemizedlist>
    <listitem>
     <para>
-     Some licenses that were incorrectly not marked as unfree now are. This is the case for:
+     Some licenses that were incorrectly not marked as unfree now are. This is
+     the case for:
      <itemizedlist>
       <listitem>
        <para>
-        cc-by-nc-sa-20: Creative Commons Attribution Non Commercial Share Alike 2.0
+        cc-by-nc-sa-20: Creative Commons Attribution Non Commercial Share Alike
+        2.0
        </para>
       </listitem>
       <listitem>
        <para>
-        cc-by-nc-sa-25: Creative Commons Attribution Non Commercial Share Alike 2.5
+        cc-by-nc-sa-25: Creative Commons Attribution Non Commercial Share Alike
+        2.5
        </para>
       </listitem>
       <listitem>
        <para>
-        cc-by-nc-sa-30: Creative Commons Attribution Non Commercial Share Alike 3.0
+        cc-by-nc-sa-30: Creative Commons Attribution Non Commercial Share Alike
+        3.0
        </para>
       </listitem>
       <listitem>
        <para>
-        cc-by-nc-sa-40: Creative Commons Attribution Non Commercial Share Alike 4.0
+        cc-by-nc-sa-40: Creative Commons Attribution Non Commercial Share Alike
+        4.0
        </para>
       </listitem>
       <listitem>
@@ -479,71 +519,128 @@ $ nix-instantiate -E '(import &lt;nixpkgsunstable&gt; {}).gitFull'
    </listitem>
    <listitem>
     <para>
-     The deprecated <varname>services.cassandra</varname> module has seen a complete rewrite. (See above.)
+     The deprecated <varname>services.cassandra</varname> module has seen a
+     complete rewrite. (See above.)
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>lib.strict</literal> is removed. Use <literal>builtins.seq</literal> instead.
+     <literal>lib.strict</literal> is removed. Use
+     <literal>builtins.seq</literal> instead.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>clementine</literal> package points now to the free derivation. <literal>clementineFree</literal> is removed now and <literal>clementineUnfree</literal> points to the package which is bundled with the unfree <literal>libspotify</literal> package.
+     The <literal>clementine</literal> package points now to the free
+     derivation. <literal>clementineFree</literal> is removed now and
+     <literal>clementineUnfree</literal> points to the package which is bundled
+     with the unfree <literal>libspotify</literal> package.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>netcat</literal> package is now taken directly from OpenBSD's <literal>libressl</literal>, instead of relying on Debian's fork. The new version should be very close to the old version, but there are some minor differences. Importantly, flags like -b, -q, -C, and -Z are no longer accepted by the nc command.
+     The <literal>netcat</literal> package is now taken directly from OpenBSD's
+     <literal>libressl</literal>, instead of relying on Debian's fork. The new
+     version should be very close to the old version, but there are some minor
+     differences. Importantly, flags like -b, -q, -C, and -Z are no longer
+     accepted by the nc command.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <varname>services.docker-registry.extraConfig</varname> object doesn't contain environment variables anymore. Instead it needs to provide an object structure that can be mapped onto the YAML configuration defined in <link xlink:href="https://github.com/docker/distribution/blob/v2.6.2/docs/configuration.md">the <varname>docker/distribution</varname> docs</link>.
+     The <varname>services.docker-registry.extraConfig</varname> object doesn't
+     contain environment variables anymore. Instead it needs to provide an
+     object structure that can be mapped onto the YAML configuration defined in
+     <link xlink:href="https://github.com/docker/distribution/blob/v2.6.2/docs/configuration.md">the
+     <varname>docker/distribution</varname> docs</link>.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>gnucash</literal> has changed from version 2.4 to 3.x. If you've been using <literal>gnucash</literal> (version 2.4) instead of <literal>gnucash26</literal> (version 2.6) you must open your Gnucash data file(s) with <literal>gnucash26</literal> and then save them to upgrade the file format. Then you may use your data file(s) with Gnucash 3.x. See the upgrade <link xlink:href="https://wiki.gnucash.org/wiki/FAQ#Using_Different_Versions.2C_Up_And_Downgrade">documentation</link>. Gnucash 2.4 is still available under the attribute <literal>gnucash24</literal>.
+     <literal>gnucash</literal> has changed from version 2.4 to 3.x. If you've
+     been using <literal>gnucash</literal> (version 2.4) instead of
+     <literal>gnucash26</literal> (version 2.6) you must open your Gnucash data
+     file(s) with <literal>gnucash26</literal> and then save them to upgrade
+     the file format. Then you may use your data file(s) with Gnucash 3.x. See
+     the upgrade
+     <link xlink:href="https://wiki.gnucash.org/wiki/FAQ#Using_Different_Versions.2C_Up_And_Downgrade">documentation</link>.
+     Gnucash 2.4 is still available under the attribute
+     <literal>gnucash24</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     <varname>services.munge</varname> now runs as user (and group) <literal>munge</literal> instead of root. Make sure the key file is accessible to the daemon.
+     <varname>services.munge</varname> now runs as user (and group)
+     <literal>munge</literal> instead of root. Make sure the key file is
+     accessible to the daemon.
     </para>
    </listitem>
    <listitem>
     <para>
-     <varname>dockerTools.buildImage</varname> now uses <literal>null</literal> as default value for <varname>tag</varname>, which indicates that the nix output hash will be used as tag.
+     <varname>dockerTools.buildImage</varname> now uses <literal>null</literal>
+     as default value for <varname>tag</varname>, which indicates that the nix
+     output hash will be used as tag.
     </para>
    </listitem>
    <listitem>
     <para>
-     The ELK stack: <varname>elasticsearch</varname>, <varname>logstash</varname> and <varname>kibana</varname> has been upgraded from 2.* to 6.3.*. The 2.* versions have been <link xlink:href="https://www.elastic.co/support/eol">unsupported since last year</link> so they have been removed. You can still use the 5.* versions under the names <varname>elasticsearch5</varname>, <varname>logstash5</varname> and <varname>kibana5</varname>.
+     The ELK stack: <varname>elasticsearch</varname>,
+     <varname>logstash</varname> and <varname>kibana</varname> has been
+     upgraded from 2.* to 6.3.*. The 2.* versions have been
+     <link xlink:href="https://www.elastic.co/support/eol">unsupported since
+     last year</link> so they have been removed. You can still use the 5.*
+     versions under the names <varname>elasticsearch5</varname>,
+     <varname>logstash5</varname> and <varname>kibana5</varname>.
     </para>
     <para>
-     The elastic beats: <varname>filebeat</varname>, <varname>heartbeat</varname>, <varname>metricbeat</varname> and <varname>packetbeat</varname> have had the same treatment: they now target 6.3.* as well. The 5.* versions are available under the names: <varname>filebeat5</varname>, <varname>heartbeat5</varname>, <varname>metricbeat5</varname> and <varname>packetbeat5</varname>
+     The elastic beats: <varname>filebeat</varname>,
+     <varname>heartbeat</varname>, <varname>metricbeat</varname> and
+     <varname>packetbeat</varname> have had the same treatment: they now target
+     6.3.* as well. The 5.* versions are available under the names:
+     <varname>filebeat5</varname>, <varname>heartbeat5</varname>,
+     <varname>metricbeat5</varname> and <varname>packetbeat5</varname>
     </para>
     <para>
-     The ELK-6.3 stack now comes with <link xlink:href="https://www.elastic.co/products/x-pack/open">X-Pack by default</link>. Since X-Pack is licensed under the <link xlink:href="https://github.com/elastic/elasticsearch/blob/master/licenses/ELASTIC-LICENSE.txt">Elastic License</link> the ELK packages now have an unfree license. To use them you need to specify <literal>allowUnfree = true;</literal> in your nixpkgs configuration.
+     The ELK-6.3 stack now comes with
+     <link xlink:href="https://www.elastic.co/products/x-pack/open">X-Pack by
+     default</link>. Since X-Pack is licensed under the
+     <link xlink:href="https://github.com/elastic/elasticsearch/blob/master/licenses/ELASTIC-LICENSE.txt">Elastic
+     License</link> the ELK packages now have an unfree license. To use them
+     you need to specify <literal>allowUnfree = true;</literal> in your nixpkgs
+     configuration.
     </para>
     <para>
-     Fortunately there is also a free variant of the ELK stack without X-Pack. The packages are available under the names: <varname>elasticsearch-oss</varname>, <varname>logstash-oss</varname> and <varname>kibana-oss</varname>.
+     Fortunately there is also a free variant of the ELK stack without X-Pack.
+     The packages are available under the names:
+     <varname>elasticsearch-oss</varname>, <varname>logstash-oss</varname> and
+     <varname>kibana-oss</varname>.
     </para>
    </listitem>
    <listitem>
     <para>
-     Options <literal>boot.initrd.luks.devices.<replaceable>name</replaceable>.yubikey.ramfsMountPoint</literal> <literal>boot.initrd.luks.devices.<replaceable>name</replaceable>.yubikey.storage.mountPoint</literal> were removed. <literal>luksroot.nix</literal> module never supported more than one YubiKey at a time anyway, hence those options never had any effect. You should be able to remove them from your config without any issues.
+     Options
+     <literal>boot.initrd.luks.devices.<replaceable>name</replaceable>.yubikey.ramfsMountPoint</literal>
+     <literal>boot.initrd.luks.devices.<replaceable>name</replaceable>.yubikey.storage.mountPoint</literal>
+     were removed. <literal>luksroot.nix</literal> module never supported more
+     than one YubiKey at a time anyway, hence those options never had any
+     effect. You should be able to remove them from your config without any
+     issues.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>stdenv.system</literal> and <literal>system</literal> in nixpkgs now refer to the host platform instead of the build platform. For native builds this is not change, let alone a breaking one. For cross builds, it is a breaking change, and <literal>stdenv.buildPlatform.system</literal> can be used instead for the old behavior. They should be using that anyways for clarity.
+     <literal>stdenv.system</literal> and <literal>system</literal> in nixpkgs
+     now refer to the host platform instead of the build platform. For native
+     builds this is not change, let alone a breaking one. For cross builds, it
+     is a breaking change, and <literal>stdenv.buildPlatform.system</literal>
+     can be used instead for the old behavior. They should be using that
+     anyways for clarity.
     </para>
    </listitem>
    <listitem>
     <para>
-     Groups <literal>kvm</literal> and <literal>render</literal> are introduced now, as systemd requires them.
+     Groups <literal>kvm</literal> and <literal>render</literal> are introduced
+     now, as systemd requires them.
     </para>
    </listitem>
   </itemizedlist>
@@ -559,69 +656,92 @@ $ nix-instantiate -E '(import &lt;nixpkgsunstable&gt; {}).gitFull'
   <itemizedlist>
    <listitem>
     <para>
-     <literal>dockerTools.pullImage</literal> relies on image digest instead of image tag to download the image. The <literal>sha256</literal> of a pulled image has to be updated.
+     <literal>dockerTools.pullImage</literal> relies on image digest instead of
+     image tag to download the image. The <literal>sha256</literal> of a pulled
+     image has to be updated.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>lib.attrNamesToStr</literal> has been deprecated. Use more specific concatenation (<literal>lib.concat(Map)StringsSep</literal>) instead.
+     <literal>lib.attrNamesToStr</literal> has been deprecated. Use more
+     specific concatenation (<literal>lib.concat(Map)StringsSep</literal>)
+     instead.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>lib.addErrorContextToAttrs</literal> has been deprecated. Use <literal>builtins.addErrorContext</literal> directly.
+     <literal>lib.addErrorContextToAttrs</literal> has been deprecated. Use
+     <literal>builtins.addErrorContext</literal> directly.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>lib.showVal</literal> has been deprecated. Use <literal>lib.traceSeqN</literal> instead.
+     <literal>lib.showVal</literal> has been deprecated. Use
+     <literal>lib.traceSeqN</literal> instead.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>lib.traceXMLVal</literal> has been deprecated. Use <literal>lib.traceValFn builtins.toXml</literal> instead.
+     <literal>lib.traceXMLVal</literal> has been deprecated. Use
+     <literal>lib.traceValFn builtins.toXml</literal> instead.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>lib.traceXMLValMarked</literal> has been deprecated. Use <literal>lib.traceValFn (x: str + builtins.toXML x)</literal> instead.
+     <literal>lib.traceXMLValMarked</literal> has been deprecated. Use
+     <literal>lib.traceValFn (x: str + builtins.toXML x)</literal> instead.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>pkgs</literal> argument to NixOS modules can now be set directly using <literal>nixpkgs.pkgs</literal>. Previously, only the <literal>system</literal>, <literal>config</literal> and <literal>overlays</literal> arguments could be used to influence <literal>pkgs</literal>.
+     The <literal>pkgs</literal> argument to NixOS modules can now be set
+     directly using <literal>nixpkgs.pkgs</literal>. Previously, only the
+     <literal>system</literal>, <literal>config</literal> and
+     <literal>overlays</literal> arguments could be used to influence
+     <literal>pkgs</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     A NixOS system can now be constructed more easily based on a preexisting invocation of Nixpkgs. For example:
+     A NixOS system can now be constructed more easily based on a preexisting
+     invocation of Nixpkgs. For example:
 <programlisting>
 inherit (pkgs.nixos {
   boot.loader.grub.enable = false;
   fileSystems."/".device = "/dev/xvda1";
 }) toplevel kernel initialRamdisk manual;
       </programlisting>
-     This benefits evaluation performance, lets you write Nixpkgs packages that depend on NixOS images and is consistent with a deployment architecture that would be centered around Nixpkgs overlays.
+     This benefits evaluation performance, lets you write Nixpkgs packages that
+     depend on NixOS images and is consistent with a deployment architecture
+     that would be centered around Nixpkgs overlays.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>lib.traceValIfNot</literal> has been deprecated. Use <literal>if/then/else</literal> and <literal>lib.traceValSeq</literal> instead.
+     <literal>lib.traceValIfNot</literal> has been deprecated. Use
+     <literal>if/then/else</literal> and <literal>lib.traceValSeq</literal>
+     instead.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>lib.traceCallXml</literal> has been deprecated. Please complain if you use the function regularly.
+     <literal>lib.traceCallXml</literal> has been deprecated. Please complain
+     if you use the function regularly.
     </para>
    </listitem>
    <listitem>
     <para>
-     The attribute <literal>lib.nixpkgsVersion</literal> has been deprecated in favor of <literal>lib.version</literal>. Please refer to the discussion in <link xlink:href="https://github.com/NixOS/nixpkgs/pull/39416#discussion_r183845745">NixOS/nixpkgs#39416</link> for further reference.
+     The attribute <literal>lib.nixpkgsVersion</literal> has been deprecated in
+     favor of <literal>lib.version</literal>. Please refer to the discussion in
+     <link xlink:href="https://github.com/NixOS/nixpkgs/pull/39416#discussion_r183845745">NixOS/nixpkgs#39416</link>
+     for further reference.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>lib.recursiveUpdateUntil</literal> was not acting according to its specification. It has been fixed to act according to the docstring, and a test has been added.
+     <literal>lib.recursiveUpdateUntil</literal> was not acting according to
+     its specification. It has been fixed to act according to the docstring,
+     and a test has been added.
     </para>
    </listitem>
    <listitem>
@@ -635,7 +755,9 @@ inherit (pkgs.nixos {
       </term>
       <listitem>
        <para>
-        Puts the generated Diffie-Hellman parameters into the Nix store instead of managing them in a stateful manner in <filename class="directory">/var/lib/dhparams</filename>.
+        Puts the generated Diffie-Hellman parameters into the Nix store instead
+        of managing them in a stateful manner in
+        <filename class="directory">/var/lib/dhparams</filename>.
        </para>
       </listitem>
      </varlistentry>
@@ -645,20 +767,27 @@ inherit (pkgs.nixos {
       </term>
       <listitem>
        <para>
-        The default bit size to use for the generated Diffie-Hellman parameters.
+        The default bit size to use for the generated Diffie-Hellman
+        parameters.
        </para>
       </listitem>
      </varlistentry>
     </variablelist>
     <note>
      <para>
-      The path to the actual generated parameter files should now be queried using <literal>config.security.dhparams.params.<replaceable>name</replaceable>.path</literal> because it might be either in the Nix store or in a directory configured by <option>security.dhparams.path</option>.
+      The path to the actual generated parameter files should now be queried
+      using
+      <literal>config.security.dhparams.params.<replaceable>name</replaceable>.path</literal>
+      because it might be either in the Nix store or in a directory configured
+      by <option>security.dhparams.path</option>.
      </para>
     </note>
     <note>
      <title>For developers:</title>
      <para>
-      Module implementers should not set a specific bit size in order to let users configure it by themselves if they want to have a different bit size than the default (2048).
+      Module implementers should not set a specific bit size in order to let
+      users configure it by themselves if they want to have a different bit
+      size than the default (2048).
      </para>
      <para>
       An example usage of this would be:
@@ -677,82 +806,126 @@ inherit (pkgs.nixos {
    </listitem>
    <listitem>
     <para>
-     <literal>networking.networkmanager.useDnsmasq</literal> has been deprecated. Use <literal>networking.networkmanager.dns</literal> instead.
+     <literal>networking.networkmanager.useDnsmasq</literal> has been
+     deprecated. Use <literal>networking.networkmanager.dns</literal> instead.
     </para>
    </listitem>
    <listitem>
     <para>
-     The Kubernetes package has been bumped to major version 1.11. Please consult the <link xlink:href="https://github.com/kubernetes/kubernetes/blob/release-1.11/CHANGELOG-1.11.md">release notes</link> for details on new features and api changes.
+     The Kubernetes package has been bumped to major version 1.11. Please
+     consult the
+     <link xlink:href="https://github.com/kubernetes/kubernetes/blob/release-1.11/CHANGELOG-1.11.md">release
+     notes</link> for details on new features and api changes.
     </para>
    </listitem>
    <listitem>
     <para>
-     The option <varname>services.kubernetes.apiserver.admissionControl</varname> was renamed to <varname>services.kubernetes.apiserver.enableAdmissionPlugins</varname>.
+     The option
+     <varname>services.kubernetes.apiserver.admissionControl</varname> was
+     renamed to
+     <varname>services.kubernetes.apiserver.enableAdmissionPlugins</varname>.
     </para>
    </listitem>
    <listitem>
     <para>
-     Recommended way to access the Kubernetes Dashboard is via HTTPS (TLS) Therefore; public service port for the dashboard has changed to 443 (container port 8443) and scheme to https.
+     Recommended way to access the Kubernetes Dashboard is via HTTPS (TLS)
+     Therefore; public service port for the dashboard has changed to 443
+     (container port 8443) and scheme to https.
     </para>
    </listitem>
    <listitem>
     <para>
-     The option <varname>services.kubernetes.apiserver.address</varname> was renamed to <varname>services.kubernetes.apiserver.bindAddress</varname>. Note that the default value has changed from 127.0.0.1 to 0.0.0.0.
+     The option <varname>services.kubernetes.apiserver.address</varname> was
+     renamed to <varname>services.kubernetes.apiserver.bindAddress</varname>.
+     Note that the default value has changed from 127.0.0.1 to 0.0.0.0.
     </para>
    </listitem>
    <listitem>
     <para>
-     The option <varname>services.kubernetes.apiserver.publicAddress</varname> was not used and thus has been removed.
+     The option <varname>services.kubernetes.apiserver.publicAddress</varname>
+     was not used and thus has been removed.
     </para>
    </listitem>
    <listitem>
     <para>
-     The option <varname>services.kubernetes.addons.dashboard.enableRBAC</varname> was renamed to <varname>services.kubernetes.addons.dashboard.rbac.enable</varname>.
+     The option
+     <varname>services.kubernetes.addons.dashboard.enableRBAC</varname> was
+     renamed to
+     <varname>services.kubernetes.addons.dashboard.rbac.enable</varname>.
     </para>
    </listitem>
    <listitem>
     <para>
-     The Kubernetes Dashboard now has only minimal RBAC permissions by default. If dashboard cluster-admin rights are desired, set <varname>services.kubernetes.addons.dashboard.rbac.clusterAdmin</varname> to true. On existing clusters, in order for the revocation of privileges to take effect, the current ClusterRoleBinding for kubernetes-dashboard must be manually removed: <literal>kubectl delete clusterrolebinding kubernetes-dashboard</literal>
+     The Kubernetes Dashboard now has only minimal RBAC permissions by default.
+     If dashboard cluster-admin rights are desired, set
+     <varname>services.kubernetes.addons.dashboard.rbac.clusterAdmin</varname>
+     to true. On existing clusters, in order for the revocation of privileges
+     to take effect, the current ClusterRoleBinding for kubernetes-dashboard
+     must be manually removed: <literal>kubectl delete clusterrolebinding
+     kubernetes-dashboard</literal>
     </para>
    </listitem>
    <listitem>
     <para>
-     The <varname>programs.screen</varname> module provides allows to configure <literal>/etc/screenrc</literal>, however the module behaved fairly counterintuitive as the config exists, but the package wasn't available. Since 18.09 <literal>pkgs.screen</literal> will be added to <literal>environment.systemPackages</literal>.
+     The <varname>programs.screen</varname> module provides allows to configure
+     <literal>/etc/screenrc</literal>, however the module behaved fairly
+     counterintuitive as the config exists, but the package wasn't available.
+     Since 18.09 <literal>pkgs.screen</literal> will be added to
+     <literal>environment.systemPackages</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     The module <option>services.networking.hostapd</option> now uses WPA2 by default.
+     The module <option>services.networking.hostapd</option> now uses WPA2 by
+     default.
     </para>
    </listitem>
    <listitem>
     <para>
-     <varname>s6Dns</varname>, <varname>s6Networking</varname>, <varname>s6LinuxUtils</varname> and <varname>s6PortableUtils</varname> renamed to <varname>s6-dns</varname>, <varname>s6-networking</varname>, <varname>s6-linux-utils</varname> and <varname>s6-portable-utils</varname> respectively.
+     <varname>s6Dns</varname>, <varname>s6Networking</varname>,
+     <varname>s6LinuxUtils</varname> and <varname>s6PortableUtils</varname>
+     renamed to <varname>s6-dns</varname>, <varname>s6-networking</varname>,
+     <varname>s6-linux-utils</varname> and <varname>s6-portable-utils</varname>
+     respectively.
     </para>
    </listitem>
    <listitem>
     <para>
-     The module option <option>nix.useSandbox</option> is now defaulted to <literal>true</literal>.
+     The module option <option>nix.useSandbox</option> is now defaulted to
+     <literal>true</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     The config activation script of <literal>nixos-rebuild</literal> now <link xlink:href="https://www.freedesktop.org/software/systemd/man/systemctl.html#Manager%20Lifecycle%20Commands">reloads</link> all user units for each authenticated user.
+     The config activation script of <literal>nixos-rebuild</literal> now
+     <link xlink:href="https://www.freedesktop.org/software/systemd/man/systemctl.html#Manager%20Lifecycle%20Commands">reloads</link>
+     all user units for each authenticated user.
     </para>
    </listitem>
    <listitem>
     <para>
-     The default display manager is now LightDM. To use SLiM set <literal>services.xserver.displayManager.slim.enable</literal> to <literal>true</literal>.
+     The default display manager is now LightDM. To use SLiM set
+     <literal>services.xserver.displayManager.slim.enable</literal> to
+     <literal>true</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     NixOS option descriptions are now automatically broken up into individual paragraphs if the text contains two consecutive newlines, so it's no longer necessary to use <code>&lt;/para&gt;&lt;para&gt;</code> to start a new paragraph.
+     NixOS option descriptions are now automatically broken up into individual
+     paragraphs if the text contains two consecutive newlines, so it's no
+     longer necessary to use <code>&lt;/para&gt;&lt;para&gt;</code> to start a
+     new paragraph.
     </para>
    </listitem>
    <listitem>
     <para>
-     Top-level <literal>buildPlatform</literal>, <literal>hostPlatform</literal>, and <literal>targetPlatform</literal> in Nixpkgs are deprecated. Please use their equivalents in <literal>stdenv</literal> instead: <literal>stdenv.buildPlatform</literal>, <literal>stdenv.hostPlatform</literal>, and <literal>stdenv.targetPlatform</literal>.
+     Top-level <literal>buildPlatform</literal>,
+     <literal>hostPlatform</literal>, and <literal>targetPlatform</literal> in
+     Nixpkgs are deprecated. Please use their equivalents in
+     <literal>stdenv</literal> instead:
+     <literal>stdenv.buildPlatform</literal>,
+     <literal>stdenv.hostPlatform</literal>, and
+     <literal>stdenv.targetPlatform</literal>.
     </para>
    </listitem>
   </itemizedlist>
diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml
index e270519932b..8ff1681d3b4 100644
--- a/nixos/doc/manual/release-notes/rl-1903.xml
+++ b/nixos/doc/manual/release-notes/rl-1903.xml
@@ -13,7 +13,8 @@
   <title>Highlights</title>
 
   <para>
-   In addition to numerous new and upgraded packages, this release has the following highlights:
+   In addition to numerous new and upgraded packages, this release has the
+   following highlights:
   </para>
 
   <itemizedlist>
@@ -24,36 +25,53 @@
    </listitem>
    <listitem>
     <para>
-     The default Python 3 interpreter is now CPython 3.7 instead of CPython 3.6.
+     The default Python 3 interpreter is now CPython 3.7 instead of CPython
+     3.6.
     </para>
    </listitem>
    <listitem>
     <para>
-     Added the Pantheon desktop environment. It can be enabled through <varname>services.xserver.desktopManager.pantheon.enable</varname>.
+     Added the Pantheon desktop environment. It can be enabled through
+     <varname>services.xserver.desktopManager.pantheon.enable</varname>.
     </para>
     <note>
      <para>
-      By default, <varname>services.xserver.desktopManager.pantheon</varname> enables LightDM as a display manager, as pantheon's screen locking implementation relies on it.
+      By default, <varname>services.xserver.desktopManager.pantheon</varname>
+      enables LightDM as a display manager, as pantheon's screen locking
+      implementation relies on it.
      </para>
      <para>
-      Because of that it is recommended to leave LightDM enabled. If you'd like to disable it anyway, set <option>services.xserver.displayManager.lightdm.enable</option> to <literal>false</literal> and enable your preferred display manager.
+      Because of that it is recommended to leave LightDM enabled. If you'd like
+      to disable it anyway, set
+      <option>services.xserver.displayManager.lightdm.enable</option> to
+      <literal>false</literal> and enable your preferred display manager.
      </para>
     </note>
     <para>
-     Also note that Pantheon's LightDM greeter is not enabled by default, because it has numerous issues in NixOS and isn't optimal for use here yet.
+     Also note that Pantheon's LightDM greeter is not enabled by default,
+     because it has numerous issues in NixOS and isn't optimal for use here
+     yet.
     </para>
    </listitem>
    <listitem>
     <para>
-     A major refactoring of the Kubernetes module has been completed. Refactorings primarily focus on decoupling components and enhancing security. Two-way TLS and RBAC has been enabled by default for all components, which slightly changes the way the module is configured. See: <xref linkend="sec-kubernetes"/> for details.
+     A major refactoring of the Kubernetes module has been completed.
+     Refactorings primarily focus on decoupling components and enhancing
+     security. Two-way TLS and RBAC has been enabled by default for all
+     components, which slightly changes the way the module is configured. See:
+     <xref linkend="sec-kubernetes"/> for details.
     </para>
    </listitem>
    <listitem>
-    <para>
-     There is now a set of <option>confinement</option> options for <option>systemd.services</option>, which allows to restrict services into a <citerefentry>
-     <refentrytitle>chroot</refentrytitle>
-     <manvolnum>2</manvolnum> </citerefentry>ed environment that only contains the store paths from the runtime closure of the service.
-    </para>
+     <para>
+       There is now a set of <option>confinement</option> options for
+       <option>systemd.services</option>, which allows to restrict services
+       into a <citerefentry>
+        <refentrytitle>chroot</refentrytitle>
+        <manvolnum>2</manvolnum>
+      </citerefentry>ed environment that only contains the store paths from
+      the runtime closure of the service.
+     </para>
    </listitem>
   </itemizedlist>
  </section>
@@ -77,7 +95,12 @@
    </listitem>
    <listitem>
     <para>
-     There is a new <varname>security.googleOsLogin</varname> module for using <link xlink:href="https://cloud.google.com/compute/docs/instances/managing-instance-access">OS Login</link> to manage SSH access to Google Compute Engine instances, which supersedes the imperative and broken <literal>google-accounts-daemon</literal> used in <literal>nixos/modules/virtualisation/google-compute-config.nix</literal>.
+     There is a new <varname>security.googleOsLogin</varname> module for using
+     <link xlink:href="https://cloud.google.com/compute/docs/instances/managing-instance-access">OS
+     Login</link> to manage SSH access to Google Compute Engine instances,
+     which supersedes the imperative and broken
+     <literal>google-accounts-daemon</literal> used in
+     <literal>nixos/modules/virtualisation/google-compute-config.nix</literal>.
     </para>
    </listitem>
    <listitem>
@@ -87,7 +110,10 @@
    </listitem>
    <listitem>
     <para>
-     There is a new <varname>services.cockroachdb</varname> module for running CockroachDB databases. NixOS now ships with CockroachDB 2.1.x as well, available on <literal>x86_64-linux</literal> and <literal>aarch64-linux</literal>.
+     There is a new <varname>services.cockroachdb</varname> module for running
+     CockroachDB databases. NixOS now ships with CockroachDB 2.1.x as well,
+     available on <literal>x86_64-linux</literal> and
+     <literal>aarch64-linux</literal>.
     </para>
    </listitem>
   </itemizedlist>
@@ -100,7 +126,11 @@
    </listitem>
    <listitem>
     <para>
-     The <link xlink:href="https://duo.com/docs/duounix">PAM module for Duo Security</link> has been enabled for use. One can configure it using the <option>security.duosec</option> options along with the corresponding PAM option in <option>security.pam.services.&lt;name?&gt;.duoSecurity.enable</option>.
+     The <link xlink:href="https://duo.com/docs/duounix">PAM module for Duo
+     Security</link> has been enabled for use. One can configure it using the
+     <option>security.duosec</option> options along with the corresponding PAM
+     option in
+     <option>security.pam.services.&lt;name?&gt;.duoSecurity.enable</option>.
     </para>
    </listitem>
   </itemizedlist>
@@ -114,7 +144,8 @@
   <title>Backward Incompatibilities</title>
 
   <para>
-   When upgrading from a previous release, please be aware of the following incompatible changes:
+   When upgrading from a previous release, please be aware of the following
+   incompatible changes:
   </para>
 
   <itemizedlist>
@@ -125,131 +156,233 @@
     <itemizedlist>
      <listitem>
       <para>
-       For users of NixOS 18.03 and 19.03, NixOS defaults to Nix 2.0, but supports using Nix 1.11 by setting <literal>nix.package = pkgs.nix1;</literal>. If this option is set to a Nix 1.11 package, you will need to either unset the option or upgrade it to Nix 2.0.
+       For users of NixOS 18.03 and 19.03, NixOS defaults to Nix 2.0, but
+       supports using Nix 1.11 by setting <literal>nix.package =
+       pkgs.nix1;</literal>. If this option is set to a Nix 1.11 package, you
+       will need to either unset the option or upgrade it to Nix 2.0.
       </para>
      </listitem>
      <listitem>
       <para>
-       For users of NixOS 17.09, you will first need to upgrade Nix by setting <literal>nix.package = pkgs.nixStable2;</literal> and run <command>nixos-rebuild switch</command> as the <literal>root</literal> user.
+       For users of NixOS 17.09, you will first need to upgrade Nix by setting
+       <literal>nix.package = pkgs.nixStable2;</literal> and run
+       <command>nixos-rebuild switch</command> as the <literal>root</literal>
+       user.
       </para>
      </listitem>
      <listitem>
       <para>
-       For users of a daemon-less Nix installation on Linux or macOS, you can upgrade Nix by running <command>curl https://nixos.org/nix/install | sh</command>, or prior to doing a channel update, running <command>nix-env -iA nix</command>.
+       For users of a daemon-less Nix installation on Linux or macOS, you can
+       upgrade Nix by running <command>curl https://nixos.org/nix/install |
+       sh</command>, or prior to doing a channel update, running
+       <command>nix-env -iA nix</command>.
       </para>
       <para>
-       If you have already run a channel update and Nix is no longer able to evaluate Nixpkgs, the error message printed should provide adequate directions for upgrading Nix.
+       If you have already run a channel update and Nix is no longer able to
+       evaluate Nixpkgs, the error message printed should provide adequate
+       directions for upgrading Nix.
       </para>
      </listitem>
      <listitem>
       <para>
-       For users of the Nix daemon on macOS, you can upgrade Nix by running <command>sudo -i sh -c 'nix-channel --update &amp;&amp; nix-env -iA nixpkgs.nix'; sudo launchctl stop org.nixos.nix-daemon; sudo launchctl start org.nixos.nix-daemon</command>.
+       For users of the Nix daemon on macOS, you can upgrade Nix by running
+       <command>sudo -i sh -c 'nix-channel --update &amp;&amp; nix-env -iA
+       nixpkgs.nix'; sudo launchctl stop org.nixos.nix-daemon; sudo launchctl
+       start org.nixos.nix-daemon</command>.
       </para>
      </listitem>
     </itemizedlist>
    </listitem>
    <listitem>
     <para>
-     The <varname>buildPythonPackage</varname> function now sets <varname>strictDeps = true</varname> to help distinguish between native and non-native dependencies in order to improve cross-compilation compatibility. Note however that this may break user expressions.
+     The <varname>buildPythonPackage</varname> function now sets
+     <varname>strictDeps = true</varname> to help distinguish between native
+     and non-native dependencies in order to improve cross-compilation
+     compatibility. Note however that this may break user expressions.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <varname>buildPythonPackage</varname> function now sets <varname>LANG = C.UTF-8</varname> to enable Unicode support. The <varname>glibcLocales</varname> package is no longer needed as a build input.
+     The <varname>buildPythonPackage</varname> function now sets <varname>LANG
+     = C.UTF-8</varname> to enable Unicode support. The
+     <varname>glibcLocales</varname> package is no longer needed as a build
+     input.
     </para>
    </listitem>
    <listitem>
     <para>
-     The Syncthing state and configuration data has been moved from <varname>services.syncthing.dataDir</varname> to the newly defined <varname>services.syncthing.configDir</varname>, which default to <literal>/var/lib/syncthing/.config/syncthing</literal>. This change makes possible to share synced directories using ACLs without Syncthing resetting the permission on every start.
+     The Syncthing state and configuration data has been moved from
+     <varname>services.syncthing.dataDir</varname> to the newly defined
+     <varname>services.syncthing.configDir</varname>, which default to
+     <literal>/var/lib/syncthing/.config/syncthing</literal>. This change makes
+     possible to share synced directories using ACLs without Syncthing
+     resetting the permission on every start.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>ntp</literal> module now has sane default restrictions. If you're relying on the previous defaults, which permitted all queries and commands from all firewall-permitted sources, you can set <varname>services.ntp.restrictDefault</varname> and <varname>services.ntp.restrictSource</varname> to <literal>[]</literal>.
+     The <literal>ntp</literal> module now has sane default restrictions. If
+     you're relying on the previous defaults, which permitted all queries and
+     commands from all firewall-permitted sources, you can set
+     <varname>services.ntp.restrictDefault</varname> and
+     <varname>services.ntp.restrictSource</varname> to <literal>[]</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     Package <varname>rabbitmq_server</varname> is renamed to <varname>rabbitmq-server</varname>.
+     Package <varname>rabbitmq_server</varname> is renamed to
+     <varname>rabbitmq-server</varname>.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>light</literal> module no longer uses setuid binaries, but udev rules. As a consequence users of that module have to belong to the <literal>video</literal> group in order to use the executable (i.e. <literal>users.users.yourusername.extraGroups = ["video"];</literal>).
+     The <literal>light</literal> module no longer uses setuid binaries, but
+     udev rules. As a consequence users of that module have to belong to the
+     <literal>video</literal> group in order to use the executable (i.e.
+     <literal>users.users.yourusername.extraGroups = ["video"];</literal>).
     </para>
    </listitem>
    <listitem>
     <para>
-     Buildbot now supports Python 3 and its packages have been moved to <literal>pythonPackages</literal>. The options <option>services.buildbot-master.package</option> and <option>services.buildbot-worker.package</option> can be used to select the Python 2 or 3 version of the package.
+     Buildbot now supports Python 3 and its packages have been moved to
+     <literal>pythonPackages</literal>. The options
+     <option>services.buildbot-master.package</option> and
+     <option>services.buildbot-worker.package</option> can be used to select
+     the Python 2 or 3 version of the package.
     </para>
    </listitem>
    <listitem>
     <para>
-     Options <literal>services.znc.confOptions.networks.<replaceable>name</replaceable>.userName</literal> and <literal>services.znc.confOptions.networks.<replaceable>name</replaceable>.modulePackages</literal> were removed. They were never used for anything and can therefore safely be removed.
+     Options
+     <literal>services.znc.confOptions.networks.<replaceable>name</replaceable>.userName</literal>
+     and
+     <literal>services.znc.confOptions.networks.<replaceable>name</replaceable>.modulePackages</literal>
+     were removed. They were never used for anything and can therefore safely
+     be removed.
     </para>
    </listitem>
    <listitem>
     <para>
-     Package <literal>wasm</literal> has been renamed <literal>proglodyte-wasm</literal>. The package <literal>wasm</literal> will be pointed to <literal>ocamlPackages.wasm</literal> in 19.09, so make sure to update your configuration if you want to keep <literal>proglodyte-wasm</literal>
+     Package <literal>wasm</literal> has been renamed
+     <literal>proglodyte-wasm</literal>. The package <literal>wasm</literal>
+     will be pointed to <literal>ocamlPackages.wasm</literal> in 19.09, so make
+     sure to update your configuration if you want to keep
+     <literal>proglodyte-wasm</literal>
     </para>
    </listitem>
    <listitem>
     <para>
-     When the <literal>nixpkgs.pkgs</literal> option is set, NixOS will no longer ignore the <literal>nixpkgs.overlays</literal> option. The old behavior can be recovered by setting <literal>nixpkgs.overlays = lib.mkForce [];</literal>.
+     When the <literal>nixpkgs.pkgs</literal> option is set, NixOS will no
+     longer ignore the <literal>nixpkgs.overlays</literal> option. The old
+     behavior can be recovered by setting <literal>nixpkgs.overlays =
+     lib.mkForce [];</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     OpenSMTPD has been upgraded to version 6.4.0p1. This release makes backwards-incompatible changes to the configuration file format. See <command>man smtpd.conf</command> for more information on the new file format.
+     OpenSMTPD has been upgraded to version 6.4.0p1. This release makes
+     backwards-incompatible changes to the configuration file format. See
+     <command>man smtpd.conf</command> for more information on the new file
+     format.
     </para>
    </listitem>
    <listitem>
     <para>
-     The versioned <varname>postgresql</varname> have been renamed to use underscore number seperators. For example, <varname>postgresql96</varname> has been renamed to <varname>postgresql_9_6</varname>.
+     The versioned <varname>postgresql</varname> have been renamed to use
+     underscore number seperators. For example, <varname>postgresql96</varname>
+     has been renamed to <varname>postgresql_9_6</varname>.
     </para>
    </listitem>
    <listitem>
     <para>
-     Package <literal>consul-ui</literal> and passthrough <literal>consul.ui</literal> have been removed. The package <literal>consul</literal> now uses upstream releases that vendor the UI into the binary. See <link xlink:href="https://github.com/NixOS/nixpkgs/pull/48714#issuecomment-433454834">#48714</link> for details.
+     Package <literal>consul-ui</literal> and passthrough
+     <literal>consul.ui</literal> have been removed. The package
+     <literal>consul</literal> now uses upstream releases that vendor the UI
+     into the binary. See
+     <link xlink:href="https://github.com/NixOS/nixpkgs/pull/48714#issuecomment-433454834">#48714</link>
+     for details.
     </para>
    </listitem>
    <listitem>
     <para>
-     Slurm introduces the new option <literal>services.slurm.stateSaveLocation</literal>, which is now set to <literal>/var/spool/slurm</literal> by default (instead of <literal>/var/spool</literal>). Make sure to move all files to the new directory or to set the option accordingly.
+     Slurm introduces the new option
+     <literal>services.slurm.stateSaveLocation</literal>, which is now set to
+     <literal>/var/spool/slurm</literal> by default (instead of
+     <literal>/var/spool</literal>). Make sure to move all files to the new
+     directory or to set the option accordingly.
     </para>
     <para>
-     The slurmctld now runs as user <literal>slurm</literal> instead of <literal>root</literal>. If you want to keep slurmctld running as <literal>root</literal>, set <literal>services.slurm.user = root</literal>.
+     The slurmctld now runs as user <literal>slurm</literal> instead of
+     <literal>root</literal>. If you want to keep slurmctld running as
+     <literal>root</literal>, set <literal>services.slurm.user =
+     root</literal>.
     </para>
     <para>
-     The options <literal>services.slurm.nodeName</literal> and <literal>services.slurm.partitionName</literal> are now sets of strings to correctly reflect that fact that each of these options can occour more than once in the configuration.
+     The options <literal>services.slurm.nodeName</literal> and
+     <literal>services.slurm.partitionName</literal> are now sets of strings to
+     correctly reflect that fact that each of these options can occour more
+     than once in the configuration.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>solr</literal> package has been upgraded from 4.10.3 to 7.5.0 and has undergone some major changes. The <literal>services.solr</literal> module has been updated to reflect these changes. Please review http://lucene.apache.org/solr/ carefully before upgrading.
+     The <literal>solr</literal> package has been upgraded from 4.10.3 to 7.5.0
+     and has undergone some major changes. The <literal>services.solr</literal>
+     module has been updated to reflect these changes. Please review
+     http://lucene.apache.org/solr/ carefully before upgrading.
     </para>
    </listitem>
    <listitem>
     <para>
-     Package <literal>ckb</literal> is renamed to <literal>ckb-next</literal>, and options <literal>hardware.ckb.*</literal> are renamed to <literal>hardware.ckb-next.*</literal>.
+     Package <literal>ckb</literal> is renamed to <literal>ckb-next</literal>,
+     and options <literal>hardware.ckb.*</literal> are renamed to
+     <literal>hardware.ckb-next.*</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     The option <literal>services.xserver.displayManager.job.logToFile</literal> which was previously set to <literal>true</literal> when using the display managers <literal>lightdm</literal>, <literal>sddm</literal> or <literal>xpra</literal> has been reset to the default value (<literal>false</literal>).
+     The option
+     <literal>services.xserver.displayManager.job.logToFile</literal> which was
+     previously set to <literal>true</literal> when using the display managers
+     <literal>lightdm</literal>, <literal>sddm</literal> or
+     <literal>xpra</literal> has been reset to the default value
+     (<literal>false</literal>).
     </para>
    </listitem>
    <listitem>
     <para>
-     Network interface indiscriminate NixOS firewall options (<literal>networking.firewall.allow*</literal>) are now preserved when also setting interface specific rules such as <literal>networking.firewall.interfaces.en0.allow*</literal>. These rules continue to use the pseudo device "default" (<literal>networking.firewall.interfaces.default.*</literal>), and assigning to this pseudo device will override the (<literal>networking.firewall.allow*</literal>) options.
+     Network interface indiscriminate NixOS firewall options
+     (<literal>networking.firewall.allow*</literal>) are now preserved when
+     also setting interface specific rules such as
+     <literal>networking.firewall.interfaces.en0.allow*</literal>. These rules
+     continue to use the pseudo device "default"
+     (<literal>networking.firewall.interfaces.default.*</literal>), and
+     assigning to this pseudo device will override the
+     (<literal>networking.firewall.allow*</literal>) options.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>nscd</literal> service now disables all caching of <literal>passwd</literal> and <literal>group</literal> databases by default. This was interferring with the correct functioning of the <literal>libnss_systemd.so</literal> module which is used by <literal>systemd</literal> to manage uids and usernames in the presence of <literal>DynamicUser=</literal> in systemd services. This was already the default behaviour in presence of <literal>services.sssd.enable = true</literal> because nscd caching would interfere with <literal>sssd</literal> in unpredictable ways as well. Because we're using nscd not for caching, but for convincing glibc to find NSS modules in the nix store instead of an absolute path, we have decided to disable caching globally now, as it's usually not the behaviour the user wants and can lead to surprising behaviour. Furthermore, negative caching of host lookups is also disabled now by default. This should fix the issue of dns lookups failing in the presence of an unreliable network.
+     The <literal>nscd</literal> service now disables all caching of
+     <literal>passwd</literal> and <literal>group</literal> databases by
+     default. This was interferring with the correct functioning of the
+     <literal>libnss_systemd.so</literal> module which is used by
+     <literal>systemd</literal> to manage uids and usernames in the presence of
+     <literal>DynamicUser=</literal> in systemd services. This was already the
+     default behaviour in presence of <literal>services.sssd.enable =
+     true</literal> because nscd caching would interfere with
+     <literal>sssd</literal> in unpredictable ways as well. Because we're using
+     nscd not for caching, but for convincing glibc to find NSS modules in the
+     nix store instead of an absolute path, we have decided to disable caching
+     globally now, as it's usually not the behaviour the user wants and can
+     lead to surprising behaviour. Furthermore, negative caching of host
+     lookups is also disabled now by default. This should fix the issue of dns
+     lookups failing in the presence of an unreliable network.
     </para>
     <para>
-     If the old behaviour is desired, this can be restored by setting the <literal>services.nscd.config</literal> option with the desired caching parameters.
+     If the old behaviour is desired, this can be restored by setting the
+     <literal>services.nscd.config</literal> option with the desired caching
+     parameters.
 <programlisting>
      services.nscd.config =
      ''
@@ -283,65 +416,124 @@
      shared                  hosts           yes
      '';
      </programlisting>
-     See <link xlink:href="https://github.com/NixOS/nixpkgs/pull/50316">#50316</link> for details.
+     See
+     <link xlink:href="https://github.com/NixOS/nixpkgs/pull/50316">#50316</link>
+     for details.
     </para>
    </listitem>
    <listitem>
     <para>
-     GitLab Shell previously used the nix store paths for the <literal>gitlab-shell</literal> command in its <literal>authorized_keys</literal> file, which might stop working after garbage collection. To circumvent that, we regenerated that file on each startup. As <literal>gitlab-shell</literal> has now been changed to use <literal>/var/run/current-system/sw/bin/gitlab-shell</literal>, this is not necessary anymore, but there might be leftover lines with a nix store path. Regenerate the <literal>authorized_keys</literal> file via <command>sudo -u git -H gitlab-rake gitlab:shell:setup</command> in that case.
+     GitLab Shell previously used the nix store paths for the
+     <literal>gitlab-shell</literal> command in its
+     <literal>authorized_keys</literal> file, which might stop working after
+     garbage collection. To circumvent that, we regenerated that file on each
+     startup. As <literal>gitlab-shell</literal> has now been changed to use
+     <literal>/var/run/current-system/sw/bin/gitlab-shell</literal>, this is
+     not necessary anymore, but there might be leftover lines with a nix store
+     path. Regenerate the <literal>authorized_keys</literal> file via
+     <command>sudo -u git -H gitlab-rake gitlab:shell:setup</command> in that
+     case.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>pam_unix</literal> account module is now loaded with its control field set to <literal>required</literal> instead of <literal>sufficient</literal>, so that later PAM account modules that might do more extensive checks are being executed. Previously, the whole account module verification was exited prematurely in case a nss module provided the account name to <literal>pam_unix</literal>. The LDAP and SSSD NixOS modules already add their NSS modules when enabled. In case your setup breaks due to some later PAM account module previosuly shadowed, or failing NSS lookups, please file a bug. You can get back the old behaviour by manually setting <literal>
+     The <literal>pam_unix</literal> account module is now loaded with its
+     control field set to <literal>required</literal> instead of
+     <literal>sufficient</literal>, so that later PAM account modules that
+     might do more extensive checks are being executed. Previously, the whole
+     account module verification was exited prematurely in case a nss module
+     provided the account name to <literal>pam_unix</literal>. The LDAP and
+     SSSD NixOS modules already add their NSS modules when enabled. In case
+     your setup breaks due to some later PAM account module previosuly
+     shadowed, or failing NSS lookups, please file a bug. You can get back the
+     old behaviour by manually setting <literal>
 <![CDATA[security.pam.services.<name?>.text]]>
      </literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>pam_unix</literal> password module is now loaded with its control field set to <literal>sufficient</literal> instead of <literal>required</literal>, so that password managed only by later PAM password modules are being executed. Previously, for example, changing an LDAP account's password through PAM was not possible: the whole password module verification was exited prematurely by <literal>pam_unix</literal>, preventing <literal>pam_ldap</literal> to manage the password as it should.
+     The <literal>pam_unix</literal> password module is now loaded with its
+     control field set to <literal>sufficient</literal> instead of
+     <literal>required</literal>, so that password managed only by later PAM
+     password modules are being executed. Previously, for example, changing an
+     LDAP account's password through PAM was not possible: the whole password
+     module verification was exited prematurely by <literal>pam_unix</literal>,
+     preventing <literal>pam_ldap</literal> to manage the password as it
+     should.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>fish</literal> has been upgraded to 3.0. It comes with a number of improvements and backwards incompatible changes. See the <literal>fish</literal> <link xlink:href="https://github.com/fish-shell/fish-shell/releases/tag/3.0.0">release notes</link> for more information.
+     <literal>fish</literal> has been upgraded to 3.0. It comes with a number
+     of improvements and backwards incompatible changes. See the
+     <literal>fish</literal>
+     <link xlink:href="https://github.com/fish-shell/fish-shell/releases/tag/3.0.0">release
+     notes</link> for more information.
     </para>
    </listitem>
    <listitem>
     <para>
-     The ibus-table input method has had a change in config format, which causes all previous settings to be lost. See <link xlink:href="https://github.com/mike-fabian/ibus-table/commit/f9195f877c5212fef0dfa446acb328c45ba5852b">this commit message</link> for details.
+     The ibus-table input method has had a change in config format, which
+     causes all previous settings to be lost. See
+     <link xlink:href="https://github.com/mike-fabian/ibus-table/commit/f9195f877c5212fef0dfa446acb328c45ba5852b">this
+     commit message</link> for details.
     </para>
    </listitem>
    <listitem>
     <para>
-     NixOS module system type <literal>types.optionSet</literal> and <literal>lib.mkOption</literal> argument <literal>options</literal> are deprecated. Use <literal>types.submodule</literal> instead. (<link xlink:href="https://github.com/NixOS/nixpkgs/pull/54637">#54637</link>)
+     NixOS module system type <literal>types.optionSet</literal> and
+     <literal>lib.mkOption</literal> argument <literal>options</literal> are
+     deprecated. Use <literal>types.submodule</literal> instead.
+     (<link xlink:href="https://github.com/NixOS/nixpkgs/pull/54637">#54637</link>)
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>matrix-synapse</literal> has been updated to version 0.99. It will <link xlink:href="https://github.com/matrix-org/synapse/pull/4509">no longer generate a self-signed certificate on first launch</link> and will be <link xlink:href="https://matrix.org/blog/2019/02/05/synapse-0-99-0/">the last version to accept self-signed certificates</link>. As such, it is now recommended to use a proper certificate verified by a root CA (for example Let's Encrypt). The new <link linkend="module-services-matrix">manual chapter on Matrix</link> contains a working example of using nginx as a reverse proxy in front of <literal>matrix-synapse</literal>, using Let's Encrypt certificates.
+     <literal>matrix-synapse</literal> has been updated to version 0.99. It
+     will <link xlink:href="https://github.com/matrix-org/synapse/pull/4509">no
+     longer generate a self-signed certificate on first launch</link> and will
+     be
+     <link xlink:href="https://matrix.org/blog/2019/02/05/synapse-0-99-0/">the
+     last version to accept self-signed certificates</link>. As such, it is now
+     recommended to use a proper certificate verified by a root CA (for example
+     Let's Encrypt). The new <link linkend="module-services-matrix">manual
+     chapter on Matrix</link> contains a working example of using nginx as a
+     reverse proxy in front of <literal>matrix-synapse</literal>, using Let's
+     Encrypt certificates.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>mailutils</literal> now works by default when <literal>sendmail</literal> is not in a setuid wrapper. As a consequence, the <literal>sendmailPath</literal> argument, having lost its main use, has been removed.
+     <literal>mailutils</literal> now works by default when
+     <literal>sendmail</literal> is not in a setuid wrapper. As a consequence,
+     the <literal>sendmailPath</literal> argument, having lost its main use,
+     has been removed.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>graylog</literal> has been upgraded from version 2.* to 3.*. Some setups making use of extraConfig (especially those exposing Graylog via reverse proxies) need to be updated as upstream removed/replaced some settings. See <link xlink:href="http://docs.graylog.org/en/3.0/pages/upgrade/graylog-3.0.html#simplified-http-interface-configuration">Upgrading Graylog</link> for details.
+     <literal>graylog</literal> has been upgraded from version 2.* to 3.*. Some
+     setups making use of extraConfig (especially those exposing Graylog via
+     reverse proxies) need to be updated as upstream removed/replaced some
+     settings. See
+     <link xlink:href="http://docs.graylog.org/en/3.0/pages/upgrade/graylog-3.0.html#simplified-http-interface-configuration">Upgrading
+     Graylog</link> for details.
     </para>
    </listitem>
    <listitem>
     <para>
-     The option <literal>users.ldap.bind.password</literal> was renamed to <literal>users.ldap.bind.passwordFile</literal>, and needs to be readable by the <literal>nslcd</literal> user. Same applies to the new <literal>users.ldap.daemon.rootpwmodpwFile</literal> option.
+      The option <literal>users.ldap.bind.password</literal> was renamed to <literal>users.ldap.bind.passwordFile</literal>,
+      and needs to be readable by the <literal>nslcd</literal> user.
+      Same applies to the new <literal>users.ldap.daemon.rootpwmodpwFile</literal> option.
     </para>
    </listitem>
    <listitem>
-    <para>
-     <literal>nodejs-6_x</literal> is end-of-life. <literal>nodejs-6_x</literal>, <literal>nodejs-slim-6_x</literal> and <literal>nodePackages_6_x</literal> are removed.
-    </para>
+     <para>
+       <literal>nodejs-6_x</literal> is end-of-life.
+       <literal>nodejs-6_x</literal>, <literal>nodejs-slim-6_x</literal> and
+       <literal>nodePackages_6_x</literal> are removed.
+     </para>
    </listitem>
   </itemizedlist>
  </section>
@@ -356,122 +548,214 @@
   <itemizedlist>
    <listitem>
     <para>
-     The <option>services.matomo</option> module gained the option <option>services.matomo.package</option> which determines the used Matomo version.
+     The <option>services.matomo</option> module gained the option
+     <option>services.matomo.package</option> which determines the used Matomo
+     version.
     </para>
     <para>
-     The Matomo module now also comes with the systemd service <literal>matomo-archive-processing.service</literal> and a timer that automatically triggers archive processing every hour. This means that you can safely <link xlink:href="https://matomo.org/docs/setup-auto-archiving/#disable-browser-triggers-for-matomo-archiving-and-limit-matomo-reports-to-updating-every-hour"> disable browser triggers for Matomo archiving </link> at <literal>Administration > System > General Settings</literal>.
+     The Matomo module now also comes with the systemd service
+     <literal>matomo-archive-processing.service</literal> and a timer that
+     automatically triggers archive processing every hour. This means that you
+     can safely
+     <link xlink:href="https://matomo.org/docs/setup-auto-archiving/#disable-browser-triggers-for-matomo-archiving-and-limit-matomo-reports-to-updating-every-hour">
+     disable browser triggers for Matomo archiving </link> at
+     <literal>Administration > System > General Settings</literal>.
     </para>
     <para>
-     Additionally, you can enable to <link xlink:href="https://matomo.org/docs/privacy/#step-2-delete-old-visitors-logs"> delete old visitor logs </link> at <literal>Administration > System > Privacy</literal>, but make sure that you run <literal>systemctl start matomo-archive-processing.service</literal> at least once without errors if you have already collected data before, so that the reports get archived before the source data gets deleted.
+     Additionally, you can enable to
+     <link xlink:href="https://matomo.org/docs/privacy/#step-2-delete-old-visitors-logs">
+     delete old visitor logs </link> at <literal>Administration > System >
+     Privacy</literal>, but make sure that you run <literal>systemctl start
+     matomo-archive-processing.service</literal> at least once without errors
+     if you have already collected data before, so that the reports get
+     archived before the source data gets deleted.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>composableDerivation</literal> along with supporting library functions has been removed.
+     <literal>composableDerivation</literal> along with supporting library
+     functions has been removed.
     </para>
    </listitem>
    <listitem>
     <para>
-     The deprecated <literal>truecrypt</literal> package has been removed and <literal>truecrypt</literal> attribute is now an alias for <literal>veracrypt</literal>. VeraCrypt is backward-compatible with TrueCrypt volumes. Note that <literal>cryptsetup</literal> also supports loading TrueCrypt volumes.
+     The deprecated <literal>truecrypt</literal> package has been removed and
+     <literal>truecrypt</literal> attribute is now an alias for
+     <literal>veracrypt</literal>. VeraCrypt is backward-compatible with
+     TrueCrypt volumes. Note that <literal>cryptsetup</literal> also supports
+     loading TrueCrypt volumes.
     </para>
    </listitem>
    <listitem>
     <para>
-     The Kubernetes DNS addons, kube-dns, has been replaced with CoreDNS. This change is made in accordance with Kubernetes making CoreDNS the official default starting from <link xlink:href="https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.11.md#sig-cluster-lifecycle">Kubernetes v1.11</link>. Please beware that upgrading DNS-addon on existing clusters might induce minor downtime while the DNS-addon terminates and re-initializes. Also note that the DNS-service now runs with 2 pod replicas by default. The desired number of replicas can be configured using: <option>services.kubernetes.addons.dns.replicas</option>.
+     The Kubernetes DNS addons, kube-dns, has been replaced with CoreDNS. This
+     change is made in accordance with Kubernetes making CoreDNS the official
+     default starting from
+     <link xlink:href="https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.11.md#sig-cluster-lifecycle">Kubernetes
+     v1.11</link>. Please beware that upgrading DNS-addon on existing clusters
+     might induce minor downtime while the DNS-addon terminates and
+     re-initializes. Also note that the DNS-service now runs with 2 pod
+     replicas by default. The desired number of replicas can be configured
+     using: <option>services.kubernetes.addons.dns.replicas</option>.
     </para>
    </listitem>
    <listitem>
     <para>
-     The quassel-webserver package and module was removed from nixpkgs due to the lack of maintainers.
+     The quassel-webserver package and module was removed from nixpkgs due to
+     the lack of maintainers.
     </para>
    </listitem>
    <listitem>
     <para>
-     The manual gained a <link linkend="module-services-matrix"> new chapter on self-hosting <literal>matrix-synapse</literal> and <literal>riot-web</literal> </link>, the most prevalent server and client implementations for the <link xlink:href="https://matrix.org/">Matrix</link> federated communication network.
+     The manual gained a <link linkend="module-services-matrix"> new chapter on
+     self-hosting <literal>matrix-synapse</literal> and
+     <literal>riot-web</literal> </link>, the most prevalent server and client
+     implementations for the
+     <link xlink:href="https://matrix.org/">Matrix</link> federated
+     communication network.
     </para>
    </listitem>
    <listitem>
     <para>
-     The astah-community package was removed from nixpkgs due to it being discontinued and the downloads not being available anymore.
+     The astah-community package was removed from nixpkgs due to it being
+     discontinued and the downloads not being available anymore.
     </para>
    </listitem>
    <listitem>
     <para>
-     The httpd service now saves log files with a .log file extension by default for easier integration with the logrotate service.
+     The httpd service now saves log files with a .log file extension by
+     default for easier integration with the logrotate service.
     </para>
    </listitem>
    <listitem>
     <para>
-     The owncloud server packages and httpd subservice module were removed from nixpkgs due to the lack of maintainers.
+     The owncloud server packages and httpd subservice module were removed from
+     nixpkgs due to the lack of maintainers.
     </para>
    </listitem>
    <listitem>
     <para>
-     It is possible now to uze ZRAM devices as general purpose ephemeral block devices, not only as swap. Using more than 1 device as ZRAM swap is no longer recommended, but is still possible by setting <literal>zramSwap.swapDevices</literal> explicitly.
+     It is possible now to uze ZRAM devices as general purpose ephemeral block
+     devices, not only as swap. Using more than 1 device as ZRAM swap is no
+     longer recommended, but is still possible by setting
+     <literal>zramSwap.swapDevices</literal> explicitly.
     </para>
     <para>
      ZRAM algorithm can be changed now.
     </para>
     <para>
-     Changes to ZRAM algorithm are applied during <literal>nixos-rebuild switch</literal>, so make sure you have enough swap space on disk to survive ZRAM device rebuild. Alternatively, use <literal>nixos-rebuild boot; reboot</literal>.
+     Changes to ZRAM algorithm are applied during <literal>nixos-rebuild
+     switch</literal>, so make sure you have enough swap space on disk to
+     survive ZRAM device rebuild. Alternatively, use <literal>nixos-rebuild
+     boot; reboot</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     Flat volumes are now disabled by default in <literal>hardware.pulseaudio</literal>. This has been done to prevent applications, which are unaware of this feature, setting their volumes to 100% on startup causing harm to your audio hardware and potentially your ears.
+     Flat volumes are now disabled by default in
+     <literal>hardware.pulseaudio</literal>. This has been done to prevent
+     applications, which are unaware of this feature, setting their volumes to
+     100% on startup causing harm to your audio hardware and potentially your
+     ears.
     </para>
     <note>
      <para>
-      With this change application specific volumes are relative to the master volume which can be adjusted independently, whereas before they were absolute; meaning that in effect, it scaled the device-volume with the volume of the loudest application.
+      With this change application specific volumes are relative to the master
+      volume which can be adjusted independently, whereas before they were
+      absolute; meaning that in effect, it scaled the device-volume with the
+      volume of the loudest application.
      </para>
     </note>
    </listitem>
    <listitem>
     <para>
-     The <link xlink:href="https://github.com/DanielAdolfsson/ndppd"><literal>ndppd</literal></link> module now supports <link linkend="opt-services.ndppd.enable">all config options</link> provided by the current upstream version as service options. Additionally the <literal>ndppd</literal> package doesn't contain the systemd unit configuration from upstream anymore, the unit is completely configured by the NixOS module now.
+     The
+     <link xlink:href="https://github.com/DanielAdolfsson/ndppd"><literal>ndppd</literal></link>
+     module now supports <link linkend="opt-services.ndppd.enable">all config
+     options</link> provided by the current upstream version as service
+     options. Additionally the <literal>ndppd</literal> package doesn't contain
+     the systemd unit configuration from upstream anymore, the unit is
+     completely configured by the NixOS module now.
     </para>
    </listitem>
    <listitem>
     <para>
-     New installs of NixOS will default to the Redmine 4.x series unless otherwise specified in <literal>services.redmine.package</literal> while existing installs of NixOS will default to the Redmine 3.x series.
+     New installs of NixOS will default to the Redmine 4.x series unless
+     otherwise specified in <literal>services.redmine.package</literal> while
+     existing installs of NixOS will default to the Redmine 3.x series.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <link linkend="opt-services.grafana.enable">Grafana module</link> now supports declarative <link xlink:href="http://docs.grafana.org/administration/provisioning/">datasource and dashboard</link> provisioning.
+     The <link linkend="opt-services.grafana.enable">Grafana module</link> now
+     supports declarative
+     <link xlink:href="http://docs.grafana.org/administration/provisioning/">datasource
+     and dashboard</link> provisioning.
     </para>
    </listitem>
    <listitem>
     <para>
-     The use of insecure ports on kubernetes has been deprecated. Thus options: <varname>services.kubernetes.apiserver.port</varname> and <varname>services.kubernetes.controllerManager.port</varname> has been renamed to <varname>.insecurePort</varname>, and default of both options has changed to 0 (disabled).
+     The use of insecure ports on kubernetes has been deprecated. Thus options:
+     <varname>services.kubernetes.apiserver.port</varname> and
+     <varname>services.kubernetes.controllerManager.port</varname> has been
+     renamed to <varname>.insecurePort</varname>, and default of both options
+     has changed to 0 (disabled).
     </para>
    </listitem>
    <listitem>
     <para>
-     Note that the default value of <varname>services.kubernetes.apiserver.bindAddress</varname> has changed from 127.0.0.1 to 0.0.0.0, allowing the apiserver to be accessible from outside the master node itself. If the apiserver insecurePort is enabled, it is strongly recommended to only bind on the loopback interface. See: <varname>services.kubernetes.apiserver.insecurebindAddress</varname>.
+     Note that the default value of
+     <varname>services.kubernetes.apiserver.bindAddress</varname> has changed
+     from 127.0.0.1 to 0.0.0.0, allowing the apiserver to be accessible from
+     outside the master node itself. If the apiserver insecurePort is enabled,
+     it is strongly recommended to only bind on the loopback interface. See:
+     <varname>services.kubernetes.apiserver.insecurebindAddress</varname>.
     </para>
    </listitem>
    <listitem>
     <para>
-     The option <varname>services.kubernetes.apiserver.allowPrivileged</varname> and <varname>services.kubernetes.kubelet.allowPrivileged</varname> now defaults to false. Disallowing privileged containers on the cluster.
+     The option
+     <varname>services.kubernetes.apiserver.allowPrivileged</varname> and
+     <varname>services.kubernetes.kubelet.allowPrivileged</varname> now
+     defaults to false. Disallowing privileged containers on the cluster.
     </para>
    </listitem>
    <listitem>
     <para>
-     The kubernetes module does no longer add the kubernetes package to <varname>environment.systemPackages</varname> implicitly.
+     The kubernetes module does no longer add the kubernetes package to
+     <varname>environment.systemPackages</varname> implicitly.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>intel</literal> driver has been removed from the default list of <link linkend="opt-services.xserver.videoDrivers">X.org video drivers</link>. The <literal>modesetting</literal> driver should take over automatically, it is better maintained upstream and has less problems with advanced X11 features. This can lead to a change in the output names used by <literal>xrandr</literal>. Some performance regressions on some GPU models might happen. Some OpenCL and VA-API applications might also break (Beignet seems to provide OpenCL support with <literal>modesetting</literal> driver, too). Kernel mode setting API does not support backlight control, so <literal>xbacklight</literal> tool will not work; backlight level can be controlled directly via <literal>/sys/</literal> or with <literal>brightnessctl</literal>. Users who need this functionality more than multi-output XRandR are advised to add `intel` to `videoDrivers` and report an issue (or provide additional details in an existing one)
+     The <literal>intel</literal> driver has been removed from the default list
+     of <link linkend="opt-services.xserver.videoDrivers">X.org video
+     drivers</link>. The <literal>modesetting</literal> driver should take over
+     automatically, it is better maintained upstream and has less problems with
+     advanced X11 features. This can lead to a change in the output names used
+     by <literal>xrandr</literal>. Some performance regressions on some GPU
+     models might happen. Some OpenCL and VA-API applications might also break
+     (Beignet seems to provide OpenCL support with
+     <literal>modesetting</literal> driver, too). Kernel mode setting API does
+     not support backlight control, so <literal>xbacklight</literal> tool will
+     not work; backlight level can be controlled directly via
+     <literal>/sys/</literal> or with <literal>brightnessctl</literal>. Users
+     who need this functionality more than multi-output XRandR are advised to
+     add `intel` to `videoDrivers` and report an issue (or provide additional
+     details in an existing one)
     </para>
    </listitem>
    <listitem>
     <para>
-     Openmpi has been updated to version 4.0.0, which removes some deprecated MPI-1 symbols. This may break some older applications that still rely on those symbols. An upgrade guide can be found <link xlink:href="https://www.open-mpi.org/faq/?category=mpi-removed">here</link>.
+     Openmpi has been updated to version 4.0.0, which removes some deprecated
+     MPI-1 symbols. This may break some older applications that still rely on
+     those symbols. An upgrade guide can be found
+     <link xlink:href="https://www.open-mpi.org/faq/?category=mpi-removed">here</link>.
     </para>
     <para>
-     The nginx package now relies on OpenSSL 1.1 and supports TLS 1.3 by default. You can set the protocols used by the nginx service using <xref linkend="opt-services.nginx.sslProtocols"/>.
+     The nginx package now relies on OpenSSL 1.1 and supports TLS 1.3 by
+     default. You can set the protocols used by the nginx service using
+     <xref linkend="opt-services.nginx.sslProtocols"/>.
     </para>
    </listitem>
    <listitem>
diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
index 92eae453924..58ab7207f53 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -13,7 +13,8 @@
   <title>Highlights</title>
 
   <para>
-   In addition to numerous new and upgraded packages, this release has the following highlights:
+   In addition to numerous new and upgraded packages, this release has the
+   following highlights:
   </para>
 
   <itemizedlist>
@@ -33,155 +34,85 @@
     </para>
    </listitem>
    <listitem>
-    <para>
-     The binfmt module is now easier to use. Additional systems can be added through <option>boot.binfmt.emulatedSystems</option>. For instance, <literal>boot.binfmt.emulatedSystems = [ "wasm32-wasi" "x86_64-windows" "aarch64-linux" ];</literal> will set up binfmt interpreters for each of those listed systems.
-    </para>
+     <para>
+       The binfmt module is now easier to use. Additional systems can
+       be added through <option>boot.binfmt.emulatedSystems</option>.
+       For instance, <literal>boot.binfmt.emulatedSystems = [
+       "wasm32-wasi" "x86_64-windows" "aarch64-linux" ];</literal> will
+       set up binfmt interpreters for each of those listed systems.
+     </para>
    </listitem>
    <listitem>
-    <para>
-     The installer now uses a less privileged <literal>nixos</literal> user whereas before we logged in as root. To gain root privileges use <literal>sudo -i</literal> without a password.
+     <para>
+     The installer now uses a less privileged <literal>nixos</literal> user whereas before we logged in as root.
+     To gain root privileges use <literal>sudo -i</literal> without a password.
     </para>
    </listitem>
    <listitem>
     <para>
-     We've updated to Xfce 4.14, which brings a new module <option>services.xserver.desktopManager.xfce4-14</option>. If you'd like to upgrade, please switch from the <option>services.xserver.desktopManager.xfce</option> module as it will be deprecated in a future release. They're incompatibilities with the current Xfce module; it doesn't support <option>thunarPlugins</option> and it isn't recommended to use <option>services.xserver.desktopManager.xfce</option> and <option>services.xserver.desktopManager.xfce4-14</option> simultaneously or to downgrade from Xfce 4.14 after upgrading.
+      We've updated to Xfce 4.14, which brings a new module <option>services.xserver.desktopManager.xfce4-14</option>.
+      If you'd like to upgrade, please switch from the <option>services.xserver.desktopManager.xfce</option> module as it
+      will be deprecated in a future release. They're incompatibilities with the current Xfce module; it doesn't support
+      <option>thunarPlugins</option> and it isn't recommended to use <option>services.xserver.desktopManager.xfce</option>
+      and <option>services.xserver.desktopManager.xfce4-14</option> simultaneously or to downgrade from Xfce 4.14 after upgrading.
     </para>
    </listitem>
    <listitem>
     <para>
-     The GNOME 3 desktop manager module sports an interface to enable/disable core services, applications, and optional GNOME packages like games.
-     <itemizedlist>
-      <para>
-       This can be achieved with the following options which the desktop manager default enables, excluding <literal>games</literal>.
-      </para>
-      <listitem>
-       <para>
-        <xref linkend="opt-services.gnome3.core-os-services.enable"/>
-       </para>
-      </listitem>
-      <listitem>
-       <para>
-        <xref linkend="opt-services.gnome3.core-shell.enable"/>
-       </para>
-      </listitem>
-      <listitem>
-       <para>
-        <xref linkend="opt-services.gnome3.core-utilities.enable"/>
-       </para>
-      </listitem>
-      <listitem>
-       <para>
-        <xref linkend="opt-services.gnome3.games.enable"/>
-       </para>
-      </listitem>
-     </itemizedlist>
-     With these options we hope to give users finer grained control over their systems. Prior to this change you'd either have to manually disable options or use <option>environment.gnome3.excludePackages</option> which only excluded the optional applications. <option>environment.gnome3.excludePackages</option> is now unguarded, it can exclude any package installed with <option>environment.systemPackages</option> in the GNOME 3 module.
+      The GNOME 3 desktop manager module sports an interface to enable/disable core services, applications, and optional GNOME packages
+      like games.
+      <itemizedlist>
+      <para>This can be achieved with the following options which the desktop manager default enables, excluding <literal>games</literal>.</para>
+      <listitem><para><xref linkend="opt-services.gnome3.core-os-services.enable"/></para></listitem>
+      <listitem><para><xref linkend="opt-services.gnome3.core-shell.enable"/></para></listitem>
+      <listitem><para><xref linkend="opt-services.gnome3.core-utilities.enable"/></para></listitem>
+      <listitem><para><xref linkend="opt-services.gnome3.games.enable"/></para></listitem>
+      </itemizedlist>
+      With these options we hope to give users finer grained control over their systems. Prior to this change you'd either have to manually
+      disable options or use <option>environment.gnome3.excludePackages</option> which only excluded the optional applications.
+      <option>environment.gnome3.excludePackages</option> is now unguarded, it can exclude any package installed with <option>environment.systemPackages</option>
+      in the GNOME 3 module.
     </para>
    </listitem>
    <listitem>
     <para>
-     Orthogonal to the previous changes to the GNOME 3 desktop manager module, we've updated all default services and applications to match as close as possible to a default reference GNOME 3 experience.
+     Orthogonal to the previous changes to the GNOME 3 desktop manager module, we've updated all default services and applications
+     to match as close as possible to a default reference GNOME 3 experience.
     </para>
-    <bridgehead>The following changes were enacted in <option>services.gnome3.core-utilities.enable</option>
-    </bridgehead>
+
+    <bridgehead>The following changes were enacted in <option>services.gnome3.core-utilities.enable</option></bridgehead>
+
     <itemizedlist>
      <title>Applications removed from defaults:</title>
-     <listitem>
-      <para>
-       <literal>accerciser</literal>
-      </para>
-     </listitem>
-     <listitem>
-      <para>
-       <literal>dconf-editor</literal>
-      </para>
-     </listitem>
-     <listitem>
-      <para>
-       <literal>evolution</literal>
-      </para>
-     </listitem>
-     <listitem>
-      <para>
-       <literal>gnome-documents</literal>
-      </para>
-     </listitem>
-     <listitem>
-      <para>
-       <literal>gnome-nettool</literal>
-      </para>
-     </listitem>
-     <listitem>
-      <para>
-       <literal>gnome-power-manager</literal>
-      </para>
-     </listitem>
-     <listitem>
-      <para>
-       <literal>gnome-todo</literal>
-      </para>
-     </listitem>
-     <listitem>
-      <para>
-       <literal>gnome-tweaks</literal>
-      </para>
-     </listitem>
-     <listitem>
-      <para>
-       <literal>gnome-usage</literal>
-      </para>
-     </listitem>
-     <listitem>
-      <para>
-       <literal>gucharmap</literal>
-      </para>
-     </listitem>
-     <listitem>
-      <para>
-       <literal>nautilus-sendto</literal>
-      </para>
-     </listitem>
-     <listitem>
-      <para>
-       <literal>vinagre</literal>
-      </para>
-     </listitem>
+     <listitem><para><literal>accerciser</literal></para></listitem>
+     <listitem><para><literal>dconf-editor</literal></para></listitem>
+     <listitem><para><literal>evolution</literal></para></listitem>
+     <listitem><para><literal>gnome-documents</literal></para></listitem>
+     <listitem><para><literal>gnome-nettool</literal></para></listitem>
+     <listitem><para><literal>gnome-power-manager</literal></para></listitem>
+     <listitem><para><literal>gnome-todo</literal></para></listitem>
+     <listitem><para><literal>gnome-tweaks</literal></para></listitem>
+     <listitem><para><literal>gnome-usage</literal></para></listitem>
+     <listitem><para><literal>gucharmap</literal></para></listitem>
+     <listitem><para><literal>nautilus-sendto</literal></para></listitem>
+     <listitem><para><literal>vinagre</literal></para></listitem>
     </itemizedlist>
     <itemizedlist>
      <title>Applications added to defaults:</title>
-     <listitem>
-      <para>
-       <literal>cheese</literal>
-      </para>
-     </listitem>
-     <listitem>
-      <para>
-       <literal>geary</literal>
-      </para>
-     </listitem>
+     <listitem><para><literal>cheese</literal></para></listitem>
+     <listitem><para><literal>geary</literal></para></listitem>
     </itemizedlist>
-    <bridgehead>The following changes were enacted in <option>services.gnome3.core-shell.enable</option>
-    </bridgehead>
+
+    <bridgehead>The following changes were enacted in <option>services.gnome3.core-shell.enable</option></bridgehead>
+
     <itemizedlist>
      <title>Applications added to defaults:</title>
-     <listitem>
-      <para>
-       <literal>gnome-color-manager</literal>
-      </para>
-     </listitem>
-     <listitem>
-      <para>
-       <literal>orca</literal>
-      </para>
-     </listitem>
+     <listitem><para><literal>gnome-color-manager</literal></para></listitem>
+     <listitem><para><literal>orca</literal></para></listitem>
     </itemizedlist>
     <itemizedlist>
      <title>Services enabled:</title>
-     <listitem>
-      <para>
-       <option>services.avahi.enable</option>
-      </para>
-     </listitem>
+     <listitem><para><option>services.avahi.enable</option></para></listitem>
     </itemizedlist>
    </listitem>
   </itemizedlist>
@@ -206,43 +137,41 @@
    </listitem>
    <listitem>
     <para>
-     The new <varname>hardware.printers</varname> module allows to declaratively configure CUPS printers via the <varname>ensurePrinters</varname> and <varname>ensureDefaultPrinter</varname> options. <varname>ensurePrinters</varname> will never delete existing printers, but will make sure that the given printers are configured as declared.
+     The new <varname>hardware.printers</varname> module allows to declaratively configure CUPS printers
+     via the <varname>ensurePrinters</varname> and
+     <varname>ensureDefaultPrinter</varname> options.
+     <varname>ensurePrinters</varname> will never delete existing printers,
+     but will make sure that the given printers are configured as declared.
     </para>
    </listitem>
    <listitem>
     <para>
-     There is a new <xref linkend="opt-services.system-config-printer.enable"/> and <xref linkend="opt-programs.system-config-printer.enable"/> module for the program of the same name. If you previously had <literal>system-config-printer</literal> enabled through some other means you should migrate to using one of these modules.
+     There is a new <xref linkend="opt-services.system-config-printer.enable"/> and <xref linkend="opt-programs.system-config-printer.enable"/> module
+     for the program of the same name. If you previously had <literal>system-config-printer</literal> enabled through some other
+     means you should migrate to using one of these modules.
     </para>
     <itemizedlist>
-     <para>
-      If you're a user of the following desktopManager modules no action is needed:
-     </para>
+     <para>If you're a user of the following desktopManager modules no action is needed:</para>
      <listitem>
-      <para>
-       <option>services.xserver.desktopManager.plasma5</option>
-      </para>
+      <para><option>services.xserver.desktopManager.plasma5</option></para>
      </listitem>
      <listitem>
-      <para>
-       <option>services.xserver.desktopManager.gnome3</option>
-      </para>
+      <para><option>services.xserver.desktopManager.gnome3</option></para>
      </listitem>
      <listitem>
-      <para>
-       <option>services.xserver.desktopManager.pantheon</option>
-      </para>
+      <para><option>services.xserver.desktopManager.pantheon</option></para>
      </listitem>
      <listitem>
+      <para><option>services.xserver.desktopManager.mate</option></para>
       <para>
-       <option>services.xserver.desktopManager.mate</option>
-      </para>
-      <para>
-       Note Mate uses <literal>programs.system-config-printer</literal> as it doesn't use it as a service, but its graphical interface directly.
+       Note Mate uses <literal>programs.system-config-printer</literal> as it doesn't
+       use it as a service, but its graphical interface directly.
       </para>
      </listitem>
     </itemizedlist>
    </listitem>
   </itemizedlist>
+
  </section>
 
  <section xmlns="http://docbook.org/ns/docbook"
@@ -253,18 +182,26 @@
   <title>Backward Incompatibilities</title>
 
   <para>
-   When upgrading from a previous release, please be aware of the following incompatible changes:
+   When upgrading from a previous release, please be aware of the following
+   incompatible changes:
   </para>
 
   <itemizedlist>
    <listitem>
     <para>
-     Buildbot no longer supports Python 2, as support was dropped upstream in version 2.0.0. Configurations may need to be modified to make them compatible with Python 3.
+     Buildbot no longer supports Python 2, as support was dropped upstream in
+     version 2.0.0. Configurations may need to be modified to make them
+     compatible with Python 3.
     </para>
    </listitem>
    <listitem>
     <para>
-     PostgreSQL now uses <filename class="directory">/run/postgresql</filename> as its socket directory instead of <filename class="directory">/tmp</filename>. So if you run an application like eg. Nextcloud, where you need to use the Unix socket path as the database host name, you need to change it accordingly.
+     PostgreSQL now uses
+     <filename class="directory">/run/postgresql</filename> as its socket
+     directory instead of <filename class="directory">/tmp</filename>. So
+     if you run an application like eg. Nextcloud, where you need to use
+     the Unix socket path as the database host name, you need to change it
+     accordingly.
     </para>
    </listitem>
    <listitem>
@@ -274,212 +211,278 @@
    </listitem>
    <listitem>
     <para>
-     The options <option>services.prometheus.alertmanager.user</option> and <option>services.prometheus.alertmanager.group</option> have been removed because the alertmanager service is now using systemd's <link
-     xlink:href="http://0pointer.net/blog/dynamic-users-with-systemd.html"> DynamicUser mechanism</link> which obviates these options.
+     The options <option>services.prometheus.alertmanager.user</option> and
+     <option>services.prometheus.alertmanager.group</option> have been removed
+     because the alertmanager service is now using systemd's <link
+     xlink:href="http://0pointer.net/blog/dynamic-users-with-systemd.html">
+     DynamicUser mechanism</link> which obviates these options.
     </para>
    </listitem>
    <listitem>
     <para>
-     The NetworkManager systemd unit was renamed back from network-manager.service to NetworkManager.service for better compatibility with other applications expecting this name. The same applies to ModemManager where modem-manager.service is now called ModemManager.service again.
+     The NetworkManager systemd unit was renamed back from network-manager.service to
+     NetworkManager.service for better compatibility with other applications expecting this name.
+     The same applies to ModemManager where modem-manager.service is now called ModemManager.service again.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <option>services.nzbget.configFile</option> and <option>services.nzbget.openFirewall</option> options were removed as they are managed internally by the nzbget. The <option>services.nzbget.dataDir</option> option hadn't actually been used by the module for some time and so was removed as cleanup.
+     The <option>services.nzbget.configFile</option> and <option>services.nzbget.openFirewall</option>
+     options were removed as they are managed internally by the nzbget. The
+     <option>services.nzbget.dataDir</option> option hadn't actually been used by
+     the module for some time and so was removed as cleanup.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <option>services.mysql.pidDir</option> option was removed, as it was only used by the wordpress apache-httpd service to wait for mysql to have started up. This can be accomplished by either describing a dependency on mysql.service (preferred) or waiting for the (hardcoded) <filename>/run/mysqld/mysql.sock</filename> file to appear.
+     The <option>services.mysql.pidDir</option> option was removed, as it was only used by the wordpress
+     apache-httpd service to wait for mysql to have started up.
+     This can be accomplished by either describing a dependency on mysql.service (preferred)
+     or waiting for the (hardcoded) <filename>/run/mysqld/mysql.sock</filename> file to appear.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <option>services.emby.enable</option> module has been removed, see <option>services.jellyfin.enable</option> instead for a free software fork of Emby. See the Jellyfin documentation: <link xlink:href="https://jellyfin.readthedocs.io/en/latest/administrator-docs/migrate-from-emby/"> Migrating from Emby to Jellyfin </link>
+     The <option>services.emby.enable</option> module has been removed, see
+     <option>services.jellyfin.enable</option> instead for a free software fork of Emby.
+
+     See the Jellyfin documentation:
+     <link xlink:href="https://jellyfin.readthedocs.io/en/latest/administrator-docs/migrate-from-emby/">
+       Migrating from Emby to Jellyfin
+     </link>
     </para>
    </listitem>
    <listitem>
-    <para>
-     IPv6 Privacy Extensions are now enabled by default for undeclared interfaces. The previous behaviour was quite misleading — even though the default value for <option>networking.interfaces.*.preferTempAddress</option> was <literal>true</literal>, undeclared interfaces would not prefer temporary addresses. Now, interfaces not mentioned in the config will prefer temporary addresses. EUI64 addresses can still be set as preferred by explicitly setting the option to <literal>false</literal> for the interface in question.
+     <para>
+     IPv6 Privacy Extensions are now enabled by default for undeclared
+     interfaces. The previous behaviour was quite misleading — even though
+     the default value for
+     <option>networking.interfaces.*.preferTempAddress</option> was
+     <literal>true</literal>, undeclared interfaces would not prefer temporary
+     addresses. Now, interfaces not mentioned in the config will prefer
+     temporary addresses. EUI64 addresses can still be set as preferred by
+     explicitly setting the option to <literal>false</literal> for the
+     interface in question.
     </para>
    </listitem>
    <listitem>
     <para>
-     Since Bittorrent Sync was superseded by Resilio Sync in 2016, the <literal>bittorrentSync</literal>, <literal>bittorrentSync14</literal>, and <literal>bittorrentSync16</literal> packages have been removed in favor of <literal>resilio-sync</literal>.
+     Since Bittorrent Sync was superseded by Resilio Sync in 2016, the
+     <literal>bittorrentSync</literal>, <literal>bittorrentSync14</literal>,
+     and <literal>bittorrentSync16</literal> packages have been removed in
+     favor of <literal>resilio-sync</literal>.
     </para>
     <para>
-     The corresponding module, <option>services.btsync</option> has been replaced by the <option>services.resilio</option> module.
+     The corresponding module, <option>services.btsync</option> has been
+     replaced by the <option>services.resilio</option> module.
     </para>
    </listitem>
    <listitem>
     <para>
-     The httpd service no longer attempts to start the postgresql service. If you have come to depend on this behaviour then you can preserve the behavior with the following configuration: <literal>systemd.services.httpd.after = [ "postgresql.service" ];</literal>
+     The httpd service no longer attempts to start the postgresql service. If you have come to depend
+     on this behaviour then you can preserve the behavior with the following configuration:
+     <literal>systemd.services.httpd.after = [ "postgresql.service" ];</literal>
     </para>
     <para>
-     The option <option>services.httpd.extraSubservices</option> has been marked as deprecated. You may still use this feature, but it will be removed in a future release of NixOS. You are encouraged to convert any httpd subservices you may have written to a full NixOS module.
+     The option <option>services.httpd.extraSubservices</option> has been
+     marked as deprecated. You may still use this feature, but it will be
+     removed in a future release of NixOS. You are encouraged to convert any
+     httpd subservices you may have written to a full NixOS module.
     </para>
     <para>
-     Most of the httpd subservices packaged with NixOS have been replaced with full NixOS modules including LimeSurvey, WordPress, and Zabbix. These modules can be enabled using the <option>services.limesurvey.enable</option>, <option>services.mediawiki.enable</option>, <option>services.wordpress.enable</option>, and <option>services.zabbixWeb.enable</option> options.
+     Most of the httpd subservices packaged with NixOS have been replaced with
+     full NixOS modules including LimeSurvey, WordPress, and Zabbix. These
+     modules can be enabled using the <option>services.limesurvey.enable</option>,
+     <option>services.mediawiki.enable</option>, <option>services.wordpress.enable</option>,
+     and <option>services.zabbixWeb.enable</option> options.
     </para>
    </listitem>
    <listitem>
     <para>
-     The option <option>systemd.network.networks.&lt;name&gt;.routes.*.routeConfig.GatewayOnlink</option> was renamed to <option>systemd.network.networks.&lt;name&gt;.routes.*.routeConfig.GatewayOnLink</option> (capital <literal>L</literal>). This follows <link xlink:href="https://github.com/systemd/systemd/commit/9cb8c5593443d24c19e40bfd4fc06d672f8c554c"> upstreams renaming </link> of the setting.
+     The option <option>systemd.network.networks.&lt;name&gt;.routes.*.routeConfig.GatewayOnlink</option>
+     was renamed to <option>systemd.network.networks.&lt;name&gt;.routes.*.routeConfig.GatewayOnLink</option>
+     (capital <literal>L</literal>). This follows
+     <link xlink:href="https://github.com/systemd/systemd/commit/9cb8c5593443d24c19e40bfd4fc06d672f8c554c">
+      upstreams renaming
+     </link> of the setting.
     </para>
    </listitem>
    <listitem>
     <para>
-     As of this release the NixOps feature <literal>autoLuks</literal> is deprecated. It no longer works with our systemd version without manual intervention.
+     As of this release the NixOps feature <literal>autoLuks</literal> is deprecated. It no longer works
+     with our systemd version without manual intervention.
     </para>
     <para>
-     Whenever the usage of the module is detected the evaluation will fail with a message explaining why and how to deal with the situation.
+     Whenever the usage of the module is detected the evaluation will fail with a message
+     explaining why and how to deal with the situation.
     </para>
     <para>
-     A new knob named <literal>nixops.enableDeprecatedAutoLuks</literal> has been introduced to disable the eval failure and to acknowledge the notice was received and read. If you plan on using the feature please note that it might break with subsequent updates.
+     A new knob named <literal>nixops.enableDeprecatedAutoLuks</literal>
+     has been introduced to disable the eval failure and to acknowledge the notice was received and read.
+     If you plan on using the feature please note that it might break with subsequent updates.
     </para>
     <para>
-     Make sure you set the <literal>_netdev</literal> option for each of the file systems referring to block devices provided by the autoLuks module. Not doing this might render the system in a state where it doesn't boot anymore.
+     Make sure you set the <literal>_netdev</literal> option for each of the file systems referring to block
+     devices provided by the autoLuks module. Not doing this might render the system in a
+     state where it doesn't boot anymore.
     </para>
     <para>
-     If you are actively using the <literal>autoLuks</literal> module please let us know in <link xlink:href="https://github.com/NixOS/nixpkgs/issues/62211">issue #62211</link>.
+     If you are actively using the <literal>autoLuks</literal> module please let us know in
+     <link xlink:href="https://github.com/NixOS/nixpkgs/issues/62211">issue #62211</link>.
     </para>
    </listitem>
    <listitem>
     <para>
-     The setopt declarations will be evaluated at the end of <literal>/etc/zshrc</literal>, so any code in <xref linkend="opt-programs.zsh.interactiveShellInit" />, <xref linkend="opt-programs.zsh.loginShellInit" /> and <xref linkend="opt-programs.zsh.promptInit" /> may break if it relies on those options being set.
+     The setopt declarations will be evaluated at the end of <literal>/etc/zshrc</literal>, so any code in <xref linkend="opt-programs.zsh.interactiveShellInit" />,
+     <xref linkend="opt-programs.zsh.loginShellInit" /> and <xref linkend="opt-programs.zsh.promptInit" /> may break if it relies on those options being set.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>prometheus-nginx-exporter</literal> package now uses the offical exporter provided by NGINX Inc. Its metrics are differently structured and are incompatible to the old ones. For information about the metrics, have a look at the <link xlink:href="https://github.com/nginxinc/nginx-prometheus-exporter">official repo</link>.
+      The <literal>prometheus-nginx-exporter</literal> package now uses the offical exporter provided by NGINX Inc.
+      Its metrics are differently structured and are incompatible to the old ones. For information about the metrics,
+      have a look at the <link xlink:href="https://github.com/nginxinc/nginx-prometheus-exporter">official repo</link>.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>shibboleth-sp</literal> package has been updated to version 3. It is largely backward compatible, for further information refer to the <link xlink:href="https://wiki.shibboleth.net/confluence/display/SP3/ReleaseNotes">release notes</link> and <link xlink:href="https://wiki.shibboleth.net/confluence/display/SP3/UpgradingFromV2">upgrade guide</link>.
-    </para>
-    <para>
-     Nodejs 8 is scheduled EOL under the lifetime of 19.09 and has been dropped.
+     The <literal>shibboleth-sp</literal> package has been updated to version 3.
+     It is largely backward compatible, for further information refer to the
+     <link xlink:href="https://wiki.shibboleth.net/confluence/display/SP3/ReleaseNotes">release notes</link>
+     and <link xlink:href="https://wiki.shibboleth.net/confluence/display/SP3/UpgradingFromV2">upgrade guide</link>.
     </para>
+     <para>
+       Nodejs 8 is scheduled EOL under the lifetime of 19.09 and has been dropped.
+     </para>
    </listitem>
    <listitem>
-    <para>
-     By default, prometheus exporters are now run with <literal>DynamicUser</literal> enabled. Exporters that need a real user, now run under a seperate user and group which follow the pattern <literal>&lt;exporter-name&gt;-exporter</literal>, instead of the previous default <literal>nobody</literal> and <literal>nogroup</literal>. Only some exporters are affected by the latter, namely the exporters <literal>dovecot</literal>, <literal>node</literal>, <literal>postfix</literal> and <literal>varnish</literal>.
-    </para>
+     <para>
+       By default, prometheus exporters are now run with <literal>DynamicUser</literal> enabled.
+       Exporters that need a real user, now run under a seperate user and group which follow the pattern <literal>&lt;exporter-name&gt;-exporter</literal>, instead of the previous default <literal>nobody</literal> and <literal>nogroup</literal>.
+       Only some exporters are affected by the latter, namely the exporters <literal>dovecot</literal>, <literal>node</literal>, <literal>postfix</literal> and <literal>varnish</literal>.
+     </para>
    </listitem>
    <listitem>
-    <para>
-     The <literal>ibus-qt</literal> package is not installed by default anymore when <xref linkend="opt-i18n.inputMethod.enabled" /> is set to <literal>ibus</literal>. If IBus support in Qt 4.x applications is required, add the <literal>ibus-qt</literal> package to your <xref linkend="opt-environment.systemPackages" /> manually.
-    </para>
+     <para>
+       The <literal>ibus-qt</literal> package is not installed by default anymore when <xref linkend="opt-i18n.inputMethod.enabled" /> is set to <literal>ibus</literal>.
+       If IBus support in Qt 4.x applications is required, add the <literal>ibus-qt</literal> package to your <xref linkend="opt-environment.systemPackages" /> manually.
+     </para>
    </listitem>
    <listitem>
-    <para>
-     The CUPS Printing service now uses socket-based activation by default, only starting when needed. The previous behavior can be restored by setting <option>services.cups.startWhenNeeded</option> to <literal>false</literal>.
-    </para>
+     <para>
+       The CUPS Printing service now uses socket-based activation by
+       default, only starting when needed. The previous behavior can
+       be restored by setting
+       <option>services.cups.startWhenNeeded</option> to
+       <literal>false</literal>.
+     </para>
    </listitem>
    <listitem>
-    <para>
-     The <option>services.systemhealth</option> module has been removed from nixpkgs due to lack of maintainer.
-    </para>
+     <para>
+       The <option>services.systemhealth</option> module has been removed from nixpkgs due to lack of maintainer.
+     </para>
    </listitem>
    <listitem>
-    <para>
-     The <option>services.mantisbt</option> module has been removed from nixpkgs due to lack of maintainer.
-    </para>
+     <para>
+       The <option>services.mantisbt</option> module has been removed from nixpkgs due to lack of maintainer.
+     </para>
    </listitem>
    <listitem>
-    <para>
-     Squid 3 has been removed and the <option>squid</option> derivation now refers to Squid 4.
-    </para>
+     <para>
+       Squid 3 has been removed and the <option>squid</option> derivation now refers to Squid 4.
+     </para>
    </listitem>
    <listitem>
-    <para>
-     The <option>services.pdns-recursor.extraConfig</option> option has been replaced by <option>services.pdns-recursor.settings</option>. The new option allows setting extra configuration while being better type-checked and mergeable.
-    </para>
+     <para>
+       The <option>services.pdns-recursor.extraConfig</option> option has been replaced by
+       <option>services.pdns-recursor.settings</option>. The new option allows setting extra
+       configuration while being better type-checked and mergeable.
+     </para>
    </listitem>
    <listitem>
     <para>
-     No service depends on <literal>keys.target</literal> anymore which is a systemd target that indicates if all <link xlink:href="https://nixos.org/nixops/manual/#idm140737322342384">NixOps keys</link> were successfully uploaded. Instead, <literal>&lt;key-name&gt;-key.service</literal> should be used to define a dependency of a key in a service. The full issue behind the <literal>keys.target</literal> dependency is described at <link xlink:href="https://github.com/NixOS/nixpkgs/issues/67265">NixOS/nixpkgs#67265</link>.
+     No service depends on <literal>keys.target</literal> anymore which is a systemd
+     target that indicates if all <link xlink:href="https://nixos.org/nixops/manual/#idm140737322342384">NixOps keys</link> were successfully uploaded.
+     Instead, <literal>&lt;key-name&gt;-key.service</literal> should be used to define
+     a dependency of a key in a service. The full issue behind the <literal>keys.target</literal>
+     dependency is described at <link xlink:href="https://github.com/NixOS/nixpkgs/issues/67265">NixOS/nixpkgs#67265</link>.
     </para>
     <para>
      The following services are affected by this:
      <itemizedlist>
-      <listitem>
-       <para>
-        <link linkend="opt-services.dovecot2.enable"><literal>services.dovecot2</literal></link>
-       </para>
-      </listitem>
-      <listitem>
-       <para>
-        <link linkend="opt-services.nsd.enable"><literal>services.nsd</literal></link>
-       </para>
-      </listitem>
-      <listitem>
-       <para>
-        <link linkend="opt-services.softether.enable"><literal>services.softether</literal></link>
-       </para>
-      </listitem>
-      <listitem>
-       <para>
-        <link linkend="opt-services.strongswan.enable"><literal>services.strongswan</literal></link>
-       </para>
-      </listitem>
-      <listitem>
-       <para>
-        <link linkend="opt-services.strongswan-swanctl.enable"><literal>services.strongswan-swanctl</literal></link>
-       </para>
-      </listitem>
-      <listitem>
-       <para>
-        <link linkend="opt-services.httpd.enable"><literal>services.httpd</literal></link>
-       </para>
-      </listitem>
+      <listitem><para><link linkend="opt-services.dovecot2.enable"><literal>services.dovecot2</literal></link></para></listitem>
+      <listitem><para><link linkend="opt-services.nsd.enable"><literal>services.nsd</literal></link></para></listitem>
+      <listitem><para><link linkend="opt-services.softether.enable"><literal>services.softether</literal></link></para></listitem>
+      <listitem><para><link linkend="opt-services.strongswan.enable"><literal>services.strongswan</literal></link></para></listitem>
+      <listitem><para><link linkend="opt-services.strongswan-swanctl.enable"><literal>services.strongswan-swanctl</literal></link></para></listitem>
+      <listitem><para><link linkend="opt-services.httpd.enable"><literal>services.httpd</literal></link></para></listitem>
      </itemizedlist>
     </para>
    </listitem>
    <listitem>
-    <para>
-     The <option>security.acme.directory</option> option has been replaced by a read-only <option>security.acme.certs.&lt;cert&gt;.directory</option> option for each certificate you define. This will be a subdirectory of <literal>/var/lib/acme</literal>. You can use this read-only option to figure out where the certificates are stored for a specific certificate. For example, the <option>services.nginx.virtualhosts.&lt;name&gt;.enableACME</option> option will use this directory option to find the certs for the virtual host.
-    </para>
-    <para>
-     <option>security.acme.preDelay</option> and <option>security.acme.activationDelay</option> options have been removed. To execute a service before certificates are provisioned or renewed add a <literal>RequiredBy=acme-${cert}.service</literal> to any service.
-    </para>
-    <para>
-     Furthermore, the acme module will not automatically add a dependency on <literal>lighttpd.service</literal> anymore. If you are using certficates provided by letsencrypt for lighttpd, then you should depend on the certificate service <literal>acme-${cert}.service></literal> manually.
-    </para>
-    <para>
-     For nginx, the dependencies are still automatically managed when <option>services.nginx.virtualhosts.&lt;name&gt;.enableACME</option> is enabled just like before. What changed is that nginx now directly depends on the specific certificates that it needs, instead of depending on the catch-all <literal>acme-certificates.target</literal>. This target unit was also removed from the codebase. This will mean nginx will no longer depend on certificates it isn't explicitly managing and fixes a bug with certificate renewal ordering racing with nginx restarting which could lead to nginx getting in a broken state as described at <link xlink:href="https://github.com/NixOS/nixpkgs/issues/60180">NixOS/nixpkgs#60180</link>.
-    </para>
+     <para>
+       The <option>security.acme.directory</option> option has been replaced by a read-only <option>security.acme.certs.&lt;cert&gt;.directory</option> option for each certificate you define. This will be
+       a subdirectory of <literal>/var/lib/acme</literal>. You can use this read-only option to figure out where the certificates are stored for a specific certificate. For example,
+       the <option>services.nginx.virtualhosts.&lt;name&gt;.enableACME</option>  option will use this directory option to find the certs for the virtual host.
+     </para>
+     <para>
+       <option>security.acme.preDelay</option> and <option>security.acme.activationDelay</option> options have been removed. To execute a service before certificates
+       are provisioned or renewed add a <literal>RequiredBy=acme-${cert}.service</literal> to any service.
+     </para>
+     <para>
+       Furthermore, the acme module will not automatically add a dependency on <literal>lighttpd.service</literal> anymore. If you are using certficates provided by letsencrypt
+       for lighttpd, then you should depend on the certificate service <literal>acme-${cert}.service></literal> manually.
+     </para>
+     <para>
+       For nginx, the dependencies are still automatically managed when <option>services.nginx.virtualhosts.&lt;name&gt;.enableACME</option> is enabled just like before. What changed is that nginx now directly depends on the specific certificates that it needs,
+       instead of depending on the catch-all <literal>acme-certificates.target</literal>. This target unit was also removed from the codebase.
+       This will mean nginx will no longer depend on certificates it isn't explicitly managing and fixes a bug with certificate renewal
+       ordering racing with nginx restarting which could lead to nginx getting in a broken state as described at
+        <link xlink:href="https://github.com/NixOS/nixpkgs/issues/60180">NixOS/nixpkgs#60180</link>.
+     </para>
    </listitem>
    <listitem>
-    <para>
-     The old deprecated <literal>emacs</literal> package sets have been dropped. What used to be called <literal>emacsPackagesNg</literal> is now simply called <literal>emacsPackages</literal>.
-    </para>
+     <para>
+       The old deprecated <literal>emacs</literal> package sets have been dropped.
+       What used to be called <literal>emacsPackagesNg</literal> is now simply called <literal>emacsPackages</literal>.
+     </para>
    </listitem>
    <listitem>
-    <para>
-     <option>services.xserver.desktopManager.xterm</option> is now disabled by default if <literal>stateVersion</literal> is 19.09 or higher. Previously the xterm desktopManager was enabled when xserver was enabled, but it isn't useful for all people so it didn't make sense to have any desktopManager enabled default.
-    </para>
+     <para>
+       <option>services.xserver.desktopManager.xterm</option> is now disabled by default if <literal>stateVersion</literal> is 19.09 or higher.
+       Previously the xterm desktopManager was enabled when xserver was enabled, but it isn't useful for all people so it didn't make sense to
+       have any desktopManager enabled default.
+     </para>
    </listitem>
    <listitem>
     <para>
-     The WeeChat plugin <literal>pkgs.weechatScripts.weechat-xmpp</literal> has been removed as it doesn't receive any updates from upstream and depends on outdated Python2-based modules.
+     The WeeChat plugin <literal>pkgs.weechatScripts.weechat-xmpp</literal> has been removed as it doesn't receive
+     any updates from upstream and depends on outdated Python2-based modules.
     </para>
    </listitem>
    <listitem>
     <para>
-     Old unsupported versions (<literal>logstash5</literal>, <literal>kibana5</literal>, <literal>filebeat5</literal>, <literal>heartbeat5</literal>, <literal>metricbeat5</literal>, <literal>packetbeat5</literal>) of the ELK-stack and Elastic beats have been removed.
+     Old unsupported versions (<literal>logstash5</literal>,
+     <literal>kibana5</literal>,
+     <literal>filebeat5</literal>,
+     <literal>heartbeat5</literal>,
+     <literal>metricbeat5</literal>,
+     <literal>packetbeat5</literal>) of the ELK-stack and Elastic beats have been removed.
     </para>
    </listitem>
    <listitem>
     <para>
-     For NixOS 19.03, both Prometheus 1 and 2 were available to allow for a seamless transition from version 1 to 2 with existing setups. Because Prometheus 1 is no longer developed, it was removed. Prometheus 2 is now configured with <literal>services.prometheus</literal>.
+     For NixOS 19.03, both Prometheus 1 and 2 were available to allow for
+     a seamless transition from version 1 to 2 with existing setups.
+     Because Prometheus 1 is no longer developed, it was removed.
+     Prometheus 2 is now configured with <literal>services.prometheus</literal>.
     </para>
    </listitem>
    <listitem>
-    <para>
-     Citrix Receiver (<literal>citrix_receiver</literal>) has been dropped in favor of Citrix Workspace (<literal>citrix_workspace</literal>).
-    </para>
+     <para>
+       Citrix Receiver (<literal>citrix_receiver</literal>) has been dropped in favor of Citrix Workspace
+       (<literal>citrix_workspace</literal>).
+     </para>
    </listitem>
   </itemizedlist>
  </section>
@@ -494,74 +497,122 @@
   <itemizedlist>
    <listitem>
     <para>
-     The <option>documentation</option> module gained an option named <option>documentation.nixos.includeAllModules</option> which makes the generated <citerefentry>
+     The <option>documentation</option> module gained an option named
+     <option>documentation.nixos.includeAllModules</option> which makes the
+     generated <citerefentry>
      <refentrytitle>configuration.nix</refentrytitle>
-     <manvolnum>5</manvolnum></citerefentry> manual page include all options from all NixOS modules included in a given <literal>configuration.nix</literal> configuration file. Currently, it is set to <literal>false</literal> by default as enabling it frequently prevents evaluation. But the plan is to eventually have it set to <literal>true</literal> by default. Please set it to <literal>true</literal> now in your <literal>configuration.nix</literal> and fix all the bugs it uncovers.
+     <manvolnum>5</manvolnum></citerefentry> manual page include all options
+     from all NixOS modules included in a given
+     <literal>configuration.nix</literal> configuration file. Currently, it is
+     set to <literal>false</literal> by default as enabling it frequently
+     prevents evaluation. But the plan is to eventually have it set to
+     <literal>true</literal> by default. Please set it to
+     <literal>true</literal> now in your <literal>configuration.nix</literal>
+     and fix all the bugs it uncovers.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>vlc</literal> package gained support for Chromecast streaming, enabled by default. TCP port 8010 must be open for it to work, so something like <literal>networking.firewall.allowedTCPPorts = [ 8010 ];</literal> may be required in your configuration. Also consider enabling <link xlink:href="https://nixos.wiki/wiki/Accelerated_Video_Playback"> Accelerated Video Playback</link> for better transcoding performance.
+     The <literal>vlc</literal> package gained support for Chromecast
+     streaming, enabled by default. TCP port 8010 must be open for it to work,
+     so something like <literal>networking.firewall.allowedTCPPorts = [ 8010
+     ];</literal> may be required in your configuration. Also consider enabling
+     <link xlink:href="https://nixos.wiki/wiki/Accelerated_Video_Playback">
+     Accelerated Video Playback</link> for better transcoding performance.
     </para>
    </listitem>
    <listitem>
     <para>
-     The following changes apply if the <literal>stateVersion</literal> is changed to 19.09 or higher. For <literal>stateVersion = "19.03"</literal> or lower the old behavior is preserved.
+     The following changes apply if the <literal>stateVersion</literal> is
+     changed to 19.09 or higher. For <literal>stateVersion = "19.03"</literal>
+     or lower the old behavior is preserved.
     </para>
     <itemizedlist>
      <listitem>
       <para>
-       <literal>solr.package</literal> defaults to <literal>pkgs.solr_8</literal>.
+       <literal>solr.package</literal> defaults to
+       <literal>pkgs.solr_8</literal>.
       </para>
      </listitem>
     </itemizedlist>
    </listitem>
    <listitem>
     <para>
-     The <literal>hunspellDicts.fr-any</literal> dictionary now ships with <literal>fr_FR.{aff,dic}</literal> which is linked to <literal>fr-toutesvariantes.{aff,dic}</literal>.
+     The <literal>hunspellDicts.fr-any</literal> dictionary now ships with <literal>fr_FR.{aff,dic}</literal>
+     which is linked to <literal>fr-toutesvariantes.{aff,dic}</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>mysql</literal> service now runs as <literal>mysql</literal> user. Previously, systemd did execute it as root, and mysql dropped privileges itself. This includes <literal>ExecStartPre=</literal> and <literal>ExecStartPost=</literal> phases. To accomplish that, runtime and data directory setup was delegated to RuntimeDirectory and tmpfiles.
+     The <literal>mysql</literal> service now runs as <literal>mysql</literal>
+     user. Previously, systemd did execute it as root, and mysql dropped privileges
+     itself.
+     This includes <literal>ExecStartPre=</literal> and
+     <literal>ExecStartPost=</literal> phases.
+     To accomplish that, runtime and data directory setup was delegated to
+     RuntimeDirectory and tmpfiles.
     </para>
    </listitem>
    <listitem>
     <para>
-     With the upgrade to systemd version 242 the <literal>systemd-timesyncd</literal> service is no longer using <literal>DynamicUser=yes</literal>. In order for the upgrade to work we rely on an activation script to move the state from the old to the new directory. The older directory (prior <literal>19.09</literal>) was <literal>/var/lib/private/systemd/timesync</literal>.
+     With the upgrade to systemd version 242 the <literal>systemd-timesyncd</literal>
+     service is no longer using <literal>DynamicUser=yes</literal>. In order for the
+     upgrade to work we rely on an activation script to move the state from the old
+     to the new directory. The older directory (prior <literal>19.09</literal>) was
+     <literal>/var/lib/private/systemd/timesync</literal>.
     </para>
     <para>
-     As long as the <literal>system.config.stateVersion</literal> is below <literal>19.09</literal> the state folder will migrated to its proper location (<literal>/var/lib/systemd/timesync</literal>), if required.
+     As long as the <literal>system.config.stateVersion</literal> is below
+     <literal>19.09</literal> the state folder will migrated to its proper location
+     (<literal>/var/lib/systemd/timesync</literal>), if required.
     </para>
    </listitem>
    <listitem>
     <para>
-     The package <literal>avahi</literal> is now built to look up service definitions from <literal>/etc/avahi/services</literal> instead of its output directory in the nix store. Accordingly the module <option>avahi</option> now supports custom service definitions via <option>services.avahi.extraServiceFiles</option>, which are then placed in the aforementioned directory. See <citerefentry>
-     <refentrytitle>avahi.service</refentrytitle>
-     <manvolnum>5</manvolnum> </citerefentry> for more information on custom service definitions.
+     The package <literal>avahi</literal> is now built to look up service
+     definitions from <literal>/etc/avahi/services</literal> instead of its
+     output directory in the nix store. Accordingly the module
+     <option>avahi</option> now supports custom service definitions via
+     <option>services.avahi.extraServiceFiles</option>, which are then placed
+     in the aforementioned directory. See <citerefentry>
+     <refentrytitle>avahi.service</refentrytitle><manvolnum>5</manvolnum>
+     </citerefentry> for more information on custom service definitions.
     </para>
    </listitem>
    <listitem>
     <para>
-     Since version 0.1.19, <literal>cargo-vendor</literal> honors package includes that are specified in the <filename>Cargo.toml</filename> file of Rust crates. <literal>rustPlatform.buildRustPackage</literal> uses <literal>cargo-vendor</literal> to collect and build dependent crates. Since this change in <literal>cargo-vendor</literal> changes the set of vendored files for most Rust packages, the hash that use used to verify the dependencies, <literal>cargoSha256</literal>, also changes.
+     Since version 0.1.19, <literal>cargo-vendor</literal> honors package
+     includes that are specified in the <filename>Cargo.toml</filename>
+     file of Rust crates. <literal>rustPlatform.buildRustPackage</literal> uses
+     <literal>cargo-vendor</literal> to collect and build dependent crates.
+     Since this change in <literal>cargo-vendor</literal> changes the set of
+     vendored files for most Rust packages, the hash that use used to verify
+     the dependencies, <literal>cargoSha256</literal>, also changes.
     </para>
     <para>
-     The <literal>cargoSha256</literal> hashes of all in-tree derivations that use <literal>buildRustPackage</literal> have been updated to reflect this change. However, third-party derivations that use <literal>buildRustPackage</literal> may have to be updated as well.
+     The <literal>cargoSha256</literal> hashes of all in-tree derivations that
+     use <literal>buildRustPackage</literal> have been updated to reflect this
+     change. However, third-party derivations that use
+     <literal>buildRustPackage</literal> may have to be updated as well.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>consul</literal> package was upgraded past version <literal>1.5</literal>, so its deprecated legacy UI is no longer available.
+     The <literal>consul</literal> package was upgraded past version <literal>1.5</literal>,
+     so its deprecated legacy UI is no longer available.
     </para>
    </listitem>
    <listitem>
     <para>
-     The default resample-method for PulseAudio has been changed from the upstream default <literal>speex-float-1</literal> to <literal>speex-float-5</literal>. Be aware that low-powered ARM-based and MIPS-based boards will struggle with this so you'll need to set <option>hardware.pulseaudio.daemon.config.resample-method</option> back to <literal>speex-float-1</literal>.
+     The default resample-method for PulseAudio has been changed from the upstream default <literal>speex-float-1</literal>
+     to <literal>speex-float-5</literal>. Be aware that low-powered ARM-based and MIPS-based boards will struggle with this
+     so you'll need to set <option>hardware.pulseaudio.daemon.config.resample-method</option> back to <literal>speex-float-1</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>phabricator</literal> package and associated <literal>httpd.extraSubservice</literal>, as well as the <literal>phd</literal> service have been removed from nixpkgs due to lack of maintainer.
+     The <literal>phabricator</literal> package and associated <literal>httpd.extraSubservice</literal>, as well as the
+     <literal>phd</literal> service have been removed from nixpkgs due to lack of maintainer.
     </para>
    </listitem>
    <listitem>
@@ -576,7 +627,8 @@
    </listitem>
    <listitem>
     <para>
-     The <literal>foswiki</literal> package and associated <literal>httpd.extraSubservice</literal> have been removed from nixpkgs due to lack of maintainer.
+     The <literal>foswiki</literal> package and associated <literal>httpd.extraSubservice</literal> have been removed
+     from nixpkgs due to lack of maintainer.
     </para>
    </listitem>
    <listitem>
@@ -586,126 +638,155 @@
    </listitem>
    <listitem>
     <para>
-     It's now possible to change configuration in <link linkend="opt-services.nextcloud.enable">services.nextcloud</link> after the initial deploy since all config parameters are persisted in an additional config file generated by the module. Previously core configuration like database parameters were set using their imperative installer after creating <literal>/var/lib/nextcloud</literal>.
+     It's now possible to change configuration in
+     <link linkend="opt-services.nextcloud.enable">services.nextcloud</link> after the initial deploy
+     since all config parameters are persisted in an additional config file generated by the module.
+     Previously core configuration like database parameters were set using their imperative
+     installer after creating <literal>/var/lib/nextcloud</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     There exists now <literal>lib.forEach</literal>, which is like <literal>map</literal>, but with arguments flipped. When mapping function body spans many lines (or has nested <literal>map</literal>s), it is often hard to follow which list is modified.
+     There exists now <literal>lib.forEach</literal>, which is like <literal>map</literal>, but with
+     arguments flipped. When mapping function body spans many lines (or has nested
+     <literal>map</literal>s), it is often hard to follow which list is modified.
     </para>
     <para>
-     Previous solution to this problem was either to use <literal>lib.flip map</literal> idiom or extract that anonymous mapping function to a named one. Both can still be used but <literal>lib.forEach</literal> is preferred over <literal>lib.flip map</literal>.
+     Previous solution to this problem was either to use <literal>lib.flip map</literal>
+     idiom or extract that anonymous mapping function to a named one. Both can still be used
+     but <literal>lib.forEach</literal> is preferred over <literal>lib.flip map</literal>.
     </para>
     <para>
-     The <literal>/etc/sysctl.d/nixos.conf</literal> file containing all the options set via <link linkend="opt-boot.kernel.sysctl">boot.kernel.sysctl</link> was moved to <literal>/etc/sysctl.d/60-nixos.conf</literal>, as <citerefentry>
-     <refentrytitle>sysctl.d</refentrytitle>
-     <manvolnum>5</manvolnum></citerefentry> recommends prefixing all filenames in <literal>/etc/sysctl.d</literal> with a two-digit number and a dash to simplify the ordering of the files.
+      The <literal>/etc/sysctl.d/nixos.conf</literal> file containing all the options set via
+      <link linkend="opt-boot.kernel.sysctl">boot.kernel.sysctl</link> was moved to
+      <literal>/etc/sysctl.d/60-nixos.conf</literal>, as
+      <citerefentry><refentrytitle>sysctl.d</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+      recommends prefixing all filenames in <literal>/etc/sysctl.d</literal> with a
+      two-digit number and a dash to simplify the ordering of the files.
     </para>
    </listitem>
    <listitem>
     <para>
-     We now install the sysctl snippets shipped with systemd.
-     <itemizedlist>
+      We now install the sysctl snippets shipped with systemd.
+    <itemizedlist>
+     <para>This enables:</para>
+     <listitem>
+      <para>Loose reverse path filtering</para>
+     </listitem>
+     <listitem>
+      <para>Source route filtering</para>
+     </listitem>
+     <listitem>
       <para>
-       This enables:
+       <literal>fq_codel</literal> as a packet scheduler (this helps to fight bufferbloat)
       </para>
-      <listitem>
-       <para>
-        Loose reverse path filtering
-       </para>
-      </listitem>
-      <listitem>
-       <para>
-        Source route filtering
-       </para>
-      </listitem>
-      <listitem>
-       <para>
-        <literal>fq_codel</literal> as a packet scheduler (this helps to fight bufferbloat)
-       </para>
-      </listitem>
-     </itemizedlist>
-     This also configures the kernel to pass coredumps to <literal>systemd-coredump</literal>, and restricts the SysRq key combinations to the sync command only. These sysctl snippets can be found in <literal>/etc/sysctl.d/50-*.conf</literal>, and overridden via <link linkend="opt-boot.kernel.sysctl">boot.kernel.sysctl</link> (which will place the parameters in <literal>/etc/sysctl.d/60-nixos.conf</literal>).
-    </para>
+     </listitem>
+    </itemizedlist>
+     This also configures the kernel to pass coredumps to <literal>systemd-coredump</literal>,
+     and restricts the SysRq key combinations to the sync command only.
+     These sysctl snippets can be found in <literal>/etc/sysctl.d/50-*.conf</literal>,
+     and overridden via <link linkend="opt-boot.kernel.sysctl">boot.kernel.sysctl</link>
+     (which will place the parameters in <literal>/etc/sysctl.d/60-nixos.conf</literal>).
+     </para>
    </listitem>
    <listitem>
     <para>
-     Coredumps are now acquired by <literal>systemd-coredump</literal> by default. <literal>systemd-coredump</literal> behaviour can still be modified via <option>systemd.coredump.extraConfig</option>. To stick to the old behaviour (having the kernel dump to a file called <literal>core</literal> in the working directory), without piping it through <literal>systemd-coredump</literal>, set <option>boot.kernel.sysctl."kernel.core_pattern"</option> to <literal>"core"</literal>.
+      Coredumps are now acquired by <literal>systemd-coredump</literal> by default.
+      <literal>systemd-coredump</literal> behaviour can still be modified via
+      <option>systemd.coredump.extraConfig</option>.
+      To stick to the old behaviour (having the kernel dump to a file called <literal>core</literal>
+      in the working directory), without piping it through <literal>systemd-coredump</literal>, set
+      <option>boot.kernel.sysctl."kernel.core_pattern"</option> to <literal>"core"</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>systemd.packages</literal> option now also supports generators and shutdown scripts. Old <literal>systemd.generator-packages</literal> option has been removed.
+     <literal>systemd.packages</literal> option now also supports generators and
+     shutdown scripts. Old <literal>systemd.generator-packages</literal> option has
+     been removed.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>rmilter</literal> package was removed with associated module and options due deprecation by upstream developer. Use <literal>rspamd</literal> in proxy mode instead.
+     The <literal>rmilter</literal> package was removed with associated module and options due deprecation by upstream developer.
+     Use <literal>rspamd</literal> in proxy mode instead.
     </para>
    </listitem>
    <listitem>
     <para>
-     systemd cgroup accounting via the <link linkend="opt-systemd.enableCgroupAccounting">systemd.enableCgroupAccounting</link> option is now enabled by default. It now also enables the more recent Block IO and IP accounting features.
+      systemd cgroup accounting via the
+      <link linkend="opt-systemd.enableCgroupAccounting">systemd.enableCgroupAccounting</link>
+      option is now enabled by default. It now also enables the more recent Block IO and IP accounting
+      features.
     </para>
    </listitem>
    <listitem>
     <para>
-     We no longer enable custom font rendering settings with <option>fonts.fontconfig.penultimate.enable</option> by default. The defaults from fontconfig are sufficient.
+     We no longer enable custom font rendering settings with <option>fonts.fontconfig.penultimate.enable</option> by default.
+     The defaults from fontconfig are sufficient.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>crashplan</literal> package and the <literal>crashplan</literal> service have been removed from nixpkgs due to crashplan shutting down the service, while the <literal>crashplansb</literal> package and <literal>crashplan-small-business</literal> service have been removed from nixpkgs due to lack of maintainer.
+      The <literal>crashplan</literal> package and the
+      <literal>crashplan</literal> service have been removed from nixpkgs due to
+      crashplan shutting down the service, while the <literal>crashplansb</literal>
+      package and <literal>crashplan-small-business</literal> service have been
+      removed from nixpkgs due to lack of maintainer.
     </para>
     <para>
-     The <link linkend="opt-services.redis.enable">redis module</link> was hardcoded to use the <literal>redis</literal> user, <filename class="directory">/run/redis</filename> as runtime directory and <filename class="directory">/var/lib/redis</filename> as state directory. Note that the NixOS module for Redis now disables kernel support for Transparent Huge Pages (THP), because this features causes major performance problems for Redis, e.g. (https://redis.io/topics/latency).
+      The <link linkend="opt-services.redis.enable">redis module</link> was hardcoded to use the <literal>redis</literal> user,
+      <filename class="directory">/run/redis</filename> as runtime directory and
+      <filename class="directory">/var/lib/redis</filename> as state directory.
+      Note that the NixOS module for Redis now disables kernel support for Transparent Huge Pages (THP),
+      because this features causes major performance problems for Redis,
+      e.g. (https://redis.io/topics/latency).
     </para>
    </listitem>
    <listitem>
     <para>
      Using <option>fonts.enableDefaultFonts</option> adds a default emoji font <literal>noto-fonts-emoji</literal>.
      <itemizedlist>
-      <para>
-       Users of the following options will have this enabled by default:
-      </para>
+      <para>Users of the following options will have this enabled by default:</para>
       <listitem>
-       <para>
-        <option>services.xserver.enable</option>
-       </para>
+       <para><option>services.xserver.enable</option></para>
       </listitem>
       <listitem>
-       <para>
-        <option>programs.sway.enable</option>
-       </para>
+       <para><option>programs.sway.enable</option></para>
       </listitem>
       <listitem>
-       <para>
-        <option>programs.way-cooler.enable</option>
-       </para>
+       <para><option>programs.way-cooler.enable</option></para>
       </listitem>
       <listitem>
-       <para>
-        <option>services.xrdp.enable</option>
-       </para>
+       <para><option>services.xrdp.enable</option></para>
       </listitem>
      </itemizedlist>
     </para>
    </listitem>
    <listitem>
-    <para>
-     The <literal>altcoins</literal> categorization of packages has been removed. You now access these packages at the top level, ie. <literal>nix-shell -p dogecoin</literal> instead of <literal>nix-shell -p altcoins.dogecoin</literal>, etc.
-    </para>
-   </listitem>
-   <listitem>
-    <para>
-     Ceph has been upgraded to v14.2.1. See the <link xlink:href="https://ceph.com/releases/v14-2-0-nautilus-released/">release notes</link> for details. The mgr dashboard as well as osds backed by loop-devices is no longer explicitly supported by the package and module. Note: There's been some issues with python-cherrypy, which is used by the dashboard and prometheus mgr modules (and possibly others), hence 0000-dont-check-cherrypy-version.patch.
-    </para>
+     <para>
+       The <literal>altcoins</literal> categorization of packages has
+       been removed. You now access these packages at the top level,
+       ie. <literal>nix-shell -p dogecoin</literal> instead of
+       <literal>nix-shell -p altcoins.dogecoin</literal>, etc.
+     </para>
    </listitem>
    <listitem>
-    <para>
-     <literal>pkgs.weechat</literal> is now compiled against <literal>pkgs.python3</literal>. Weechat also recommends <link xlink:href="https://weechat.org/scripts/python3/">to use Python3 in their docs.</link>
-    </para>
-   </listitem>
+     <para>
+       Ceph has been upgraded to v14.2.1.
+       See the <link xlink:href="https://ceph.com/releases/v14-2-0-nautilus-released/">release notes</link> for details.
+       The mgr dashboard as well as osds backed by loop-devices is no longer explicitly supported by the package and module.
+       Note: There's been some issues with python-cherrypy, which is used by the dashboard
+       and prometheus mgr modules (and possibly others), hence 0000-dont-check-cherrypy-version.patch.
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      <literal>pkgs.weechat</literal> is now compiled against <literal>pkgs.python3</literal>.
+      Weechat also recommends <link xlink:href="https://weechat.org/scripts/python3/">to use Python3
+      in their docs.</link>
+     </para>
+    </listitem>
   </itemizedlist>
  </section>
 </section>
diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml
index f10c0afd1db..c84bc8dbb37 100644
--- a/nixos/doc/manual/release-notes/rl-2003.xml
+++ b/nixos/doc/manual/release-notes/rl-2003.xml
@@ -13,7 +13,8 @@
   <title>Highlights</title>
 
   <para>
-   In addition to numerous new and upgraded packages, this release has the following highlights:
+   In addition to numerous new and upgraded packages, this release has the
+   following highlights:
   </para>
 
   <itemizedlist>
@@ -41,6 +42,7 @@
     <para />
    </listitem>
   </itemizedlist>
+
  </section>
 
  <section xmlns="http://docbook.org/ns/docbook"
@@ -51,7 +53,8 @@
   <title>Backward Incompatibilities</title>
 
   <para>
-   When upgrading from a previous release, please be aware of the following incompatible changes:
+   When upgrading from a previous release, please be aware of the following
+   incompatible changes:
   </para>
 
   <itemizedlist>
diff --git a/nixos/modules/i18n/input-method/default.xml b/nixos/modules/i18n/input-method/default.xml
index 830ef88d6d9..117482fb0d5 100644
--- a/nixos/modules/i18n/input-method/default.xml
+++ b/nixos/modules/i18n/input-method/default.xml
@@ -5,7 +5,11 @@
          xml:id="module-services-input-methods">
  <title>Input Methods</title>
  <para>
-  Input methods are an operating system component that allows any data, such as keyboard strokes or mouse movements, to be received as input. In this way users can enter characters and symbols not found on their input devices. Using an input method is obligatory for any language that has more graphemes than there are keys on the keyboard.
+  Input methods are an operating system component that allows any data, such as
+  keyboard strokes or mouse movements, to be received as input. In this way
+  users can enter characters and symbols not found on their input devices.
+  Using an input method is obligatory for any language that has more graphemes
+  than there are keys on the keyboard.
  </para>
  <para>
   The following input methods are available in NixOS:
@@ -36,7 +40,8 @@
   <title>IBus</title>
 
   <para>
-   IBus is an Intelligent Input Bus. It provides full featured and user friendly input method user interface.
+   IBus is an Intelligent Input Bus. It provides full featured and user
+   friendly input method user interface.
   </para>
 
   <para>
@@ -51,7 +56,8 @@ i18n.inputMethod = {
 </programlisting>
 
   <para>
-   <literal>i18n.inputMethod.ibus.engines</literal> is optional and can be used to add extra IBus engines.
+   <literal>i18n.inputMethod.ibus.engines</literal> is optional and can be used
+   to add extra IBus engines.
   </para>
 
   <para>
@@ -61,7 +67,8 @@ i18n.inputMethod = {
   <itemizedlist>
    <listitem>
     <para>
-     Anthy (<literal>ibus-engines.anthy</literal>): Anthy is a system for Japanese input method. It converts Hiragana text to Kana Kanji mixed text.
+     Anthy (<literal>ibus-engines.anthy</literal>): Anthy is a system for
+     Japanese input method. It converts Hiragana text to Kana Kanji mixed text.
     </para>
    </listitem>
    <listitem>
@@ -71,22 +78,28 @@ i18n.inputMethod = {
    </listitem>
    <listitem>
     <para>
-     m17n (<literal>ibus-engines.m17n</literal>): m17n is an input method that uses input methods and corresponding icons in the m17n database.
+     m17n (<literal>ibus-engines.m17n</literal>): m17n is an input method that
+     uses input methods and corresponding icons in the m17n database.
     </para>
    </listitem>
    <listitem>
     <para>
-     mozc (<literal>ibus-engines.mozc</literal>): A Japanese input method from Google.
+     mozc (<literal>ibus-engines.mozc</literal>): A Japanese input method from
+     Google.
     </para>
    </listitem>
    <listitem>
     <para>
-     Table (<literal>ibus-engines.table</literal>): An input method that load tables of input methods.
+     Table (<literal>ibus-engines.table</literal>): An input method that load
+     tables of input methods.
     </para>
    </listitem>
    <listitem>
     <para>
-     table-others (<literal>ibus-engines.table-others</literal>): Various table-based input methods. To use this, and any other table-based input methods, it must appear in the list of engines along with <literal>table</literal>. For example:
+     table-others (<literal>ibus-engines.table-others</literal>): Various
+     table-based input methods. To use this, and any other table-based input
+     methods, it must appear in the list of engines along with
+     <literal>table</literal>. For example:
 <programlisting>
 ibus.engines = with pkgs.ibus-engines; [ table table-others ];
 </programlisting>
@@ -95,13 +108,22 @@ ibus.engines = with pkgs.ibus-engines; [ table table-others ];
   </itemizedlist>
 
   <para>
-   To use any input method, the package must be added in the configuration, as shown above, and also (after running <literal>nixos-rebuild</literal>) the input method must be added from IBus' preference dialog.
+   To use any input method, the package must be added in the configuration, as
+   shown above, and also (after running <literal>nixos-rebuild</literal>) the
+   input method must be added from IBus' preference dialog.
   </para>
 
   <simplesect xml:id="module-services-input-methods-troubleshooting">
    <title>Troubleshooting</title>
    <para>
-    If IBus works in some applications but not others, a likely cause of this is that IBus is depending on a different version of <literal>glib</literal> to what the applications are depending on. This can be checked by running <literal>nix-store -q --requisites &lt;path&gt; | grep glib</literal>, where <literal>&lt;path&gt;</literal> is the path of either IBus or an application in the Nix store. The <literal>glib</literal> packages must match exactly. If they do not, uninstalling and reinstalling the application is a likely fix.
+    If IBus works in some applications but not others, a likely cause of this
+    is that IBus is depending on a different version of <literal>glib</literal>
+    to what the applications are depending on. This can be checked by running
+    <literal>nix-store -q --requisites &lt;path&gt; | grep glib</literal>,
+    where <literal>&lt;path&gt;</literal> is the path of either IBus or an
+    application in the Nix store. The <literal>glib</literal> packages must
+    match exactly. If they do not, uninstalling and reinstalling the
+    application is a likely fix.
    </para>
   </simplesect>
  </section>
@@ -109,7 +131,8 @@ ibus.engines = with pkgs.ibus-engines; [ table table-others ];
   <title>Fcitx</title>
 
   <para>
-   Fcitx is an input method framework with extension support. It has three built-in Input Method Engine, Pinyin, QuWei and Table-based input methods.
+   Fcitx is an input method framework with extension support. It has three
+   built-in Input Method Engine, Pinyin, QuWei and Table-based input methods.
   </para>
 
   <para>
@@ -124,7 +147,8 @@ i18n.inputMethod = {
 </programlisting>
 
   <para>
-   <literal>i18n.inputMethod.fcitx.engines</literal> is optional and can be used to add extra Fcitx engines.
+   <literal>i18n.inputMethod.fcitx.engines</literal> is optional and can be
+   used to add extra Fcitx engines.
   </para>
 
   <para>
@@ -134,12 +158,15 @@ i18n.inputMethod = {
   <itemizedlist>
    <listitem>
     <para>
-     Anthy (<literal>fcitx-engines.anthy</literal>): Anthy is a system for Japanese input method. It converts Hiragana text to Kana Kanji mixed text.
+     Anthy (<literal>fcitx-engines.anthy</literal>): Anthy is a system for
+     Japanese input method. It converts Hiragana text to Kana Kanji mixed text.
     </para>
    </listitem>
    <listitem>
     <para>
-     Chewing (<literal>fcitx-engines.chewing</literal>): Chewing is an intelligent Zhuyin input method. It is one of the most popular input methods among Traditional Chinese Unix users.
+     Chewing (<literal>fcitx-engines.chewing</literal>): Chewing is an
+     intelligent Zhuyin input method. It is one of the most popular input
+     methods among Traditional Chinese Unix users.
     </para>
    </listitem>
    <listitem>
@@ -154,17 +181,20 @@ i18n.inputMethod = {
    </listitem>
    <listitem>
     <para>
-     m17n (<literal>fcitx-engines.m17n</literal>): m17n is an input method that uses input methods and corresponding icons in the m17n database.
+     m17n (<literal>fcitx-engines.m17n</literal>): m17n is an input method that
+     uses input methods and corresponding icons in the m17n database.
     </para>
    </listitem>
    <listitem>
     <para>
-     mozc (<literal>fcitx-engines.mozc</literal>): A Japanese input method from Google.
+     mozc (<literal>fcitx-engines.mozc</literal>): A Japanese input method from
+     Google.
     </para>
    </listitem>
    <listitem>
     <para>
-     table-others (<literal>fcitx-engines.table-others</literal>): Various table-based input methods.
+     table-others (<literal>fcitx-engines.table-others</literal>): Various
+     table-based input methods.
     </para>
    </listitem>
   </itemizedlist>
@@ -173,7 +203,9 @@ i18n.inputMethod = {
   <title>Nabi</title>
 
   <para>
-   Nabi is an easy to use Korean X input method. It allows you to enter phonetic Korean characters (hangul) and pictographic Korean characters (hanja).
+   Nabi is an easy to use Korean X input method. It allows you to enter
+   phonetic Korean characters (hangul) and pictographic Korean characters
+   (hanja).
   </para>
 
   <para>
@@ -190,7 +222,8 @@ i18n.inputMethod = {
   <title>Uim</title>
 
   <para>
-   Uim (short for "universal input method") is a multilingual input method framework. Applications can use it through so-called bridges.
+   Uim (short for "universal input method") is a multilingual input method
+   framework. Applications can use it through so-called bridges.
   </para>
 
   <para>
@@ -204,7 +237,8 @@ i18n.inputMethod = {
 </programlisting>
 
   <para>
-   Note: The <xref linkend="opt-i18n.inputMethod.uim.toolbar"/> option can be used to choose uim toolbar.
+   Note: The <xref linkend="opt-i18n.inputMethod.uim.toolbar"/> option can be
+   used to choose uim toolbar.
   </para>
  </section>
 </chapter>
diff --git a/nixos/modules/programs/digitalbitbox/doc.xml b/nixos/modules/programs/digitalbitbox/doc.xml
index 871abddca4c..c63201628db 100644
--- a/nixos/modules/programs/digitalbitbox/doc.xml
+++ b/nixos/modules/programs/digitalbitbox/doc.xml
@@ -8,25 +8,37 @@
   Digital Bitbox is a hardware wallet and second-factor authenticator.
  </para>
  <para>
-  The <literal>digitalbitbox</literal> programs module may be installed by setting <literal>programs.digitalbitbox</literal> to <literal>true</literal> in a manner similar to
+  The <literal>digitalbitbox</literal> programs module may be installed by
+  setting <literal>programs.digitalbitbox</literal> to <literal>true</literal>
+  in a manner similar to
 <programlisting>
 <xref linkend="opt-programs.digitalbitbox.enable"/> = true;
 </programlisting>
-  and bundles the <literal>digitalbitbox</literal> package (see <xref
-      linkend="sec-digitalbitbox-package" />), which contains the <literal>dbb-app</literal> and <literal>dbb-cli</literal> binaries, along with the hardware module (see <xref
-      linkend="sec-digitalbitbox-hardware-module" />) which sets up the necessary udev rules to access the device.
+  and bundles the <literal>digitalbitbox</literal> package (see
+  <xref
+      linkend="sec-digitalbitbox-package" />), which contains the
+  <literal>dbb-app</literal> and <literal>dbb-cli</literal> binaries, along
+  with the hardware module (see
+  <xref
+      linkend="sec-digitalbitbox-hardware-module" />) which sets up the
+  necessary udev rules to access the device.
  </para>
  <para>
-  Enabling the digitalbitbox module is pretty much the easiest way to get a Digital Bitbox device working on your system.
+  Enabling the digitalbitbox module is pretty much the easiest way to get a
+  Digital Bitbox device working on your system.
  </para>
  <para>
-  For more information, see <link xlink:href="https://digitalbitbox.com/start_linux" />.
+  For more information, see
+  <link xlink:href="https://digitalbitbox.com/start_linux" />.
  </para>
  <section xml:id="sec-digitalbitbox-package">
   <title>Package</title>
 
   <para>
-   The binaries, <literal>dbb-app</literal> (a GUI tool) and <literal>dbb-cli</literal> (a CLI tool), are available through the <literal>digitalbitbox</literal> package which could be installed as follows:
+   The binaries, <literal>dbb-app</literal> (a GUI tool) and
+   <literal>dbb-cli</literal> (a CLI tool), are available through the
+   <literal>digitalbitbox</literal> package which could be installed as
+   follows:
 <programlisting>
 <xref linkend="opt-environment.systemPackages"/> = [
   pkgs.digitalbitbox
@@ -38,14 +50,17 @@
   <title>Hardware</title>
 
   <para>
-   The digitalbitbox hardware package enables the udev rules for Digital Bitbox devices and may be installed as follows:
+   The digitalbitbox hardware package enables the udev rules for Digital Bitbox
+   devices and may be installed as follows:
 <programlisting>
 <xref linkend="opt-hardware.digitalbitbox.enable"/> = true;
 </programlisting>
   </para>
 
   <para>
-   In order to alter the udev rules, one may provide different values for the <literal>udevRule51</literal> and <literal>udevRule52</literal> attributes by means of overriding as follows:
+   In order to alter the udev rules, one may provide different values for the
+   <literal>udevRule51</literal> and <literal>udevRule52</literal> attributes
+   by means of overriding as follows:
 <programlisting>
 programs.digitalbitbox = {
   <link linkend="opt-programs.digitalbitbox.enable">enable</link> = true;
diff --git a/nixos/modules/programs/plotinus.xml b/nixos/modules/programs/plotinus.xml
index a0370f90a41..8fc8c22c6d7 100644
--- a/nixos/modules/programs/plotinus.xml
+++ b/nixos/modules/programs/plotinus.xml
@@ -5,19 +5,24 @@
          xml:id="module-program-plotinus">
  <title>Plotinus</title>
  <para>
-  <emphasis>Source:</emphasis> <filename>modules/programs/plotinus.nix</filename>
+  <emphasis>Source:</emphasis>
+  <filename>modules/programs/plotinus.nix</filename>
  </para>
  <para>
-  <emphasis>Upstream documentation:</emphasis> <link xlink:href="https://github.com/p-e-w/plotinus"/>
+  <emphasis>Upstream documentation:</emphasis>
+  <link xlink:href="https://github.com/p-e-w/plotinus"/>
  </para>
  <para>
   Plotinus is a searchable command palette in every modern GTK application.
  </para>
  <para>
-  When in a GTK 3 application and Plotinus is enabled, you can press <literal>Ctrl+Shift+P</literal> to open the command palette. The command palette provides a searchable list of of all menu items in the application.
+  When in a GTK 3 application and Plotinus is enabled, you can press
+  <literal>Ctrl+Shift+P</literal> to open the command palette. The command
+  palette provides a searchable list of of all menu items in the application.
  </para>
  <para>
-  To enable Plotinus, add the following to your <filename>configuration.nix</filename>:
+  To enable Plotinus, add the following to your
+  <filename>configuration.nix</filename>:
 <programlisting>
 <xref linkend="opt-programs.plotinus.enable"/> = true;
 </programlisting>
diff --git a/nixos/modules/programs/zsh/oh-my-zsh.xml b/nixos/modules/programs/zsh/oh-my-zsh.xml
index c5202d818c9..568c2de6557 100644
--- a/nixos/modules/programs/zsh/oh-my-zsh.xml
+++ b/nixos/modules/programs/zsh/oh-my-zsh.xml
@@ -5,13 +5,18 @@
          xml:id="module-programs-zsh-ohmyzsh">
  <title>Oh my ZSH</title>
  <para>
-  <literal><link xlink:href="https://ohmyz.sh/">oh-my-zsh</link></literal> is a framework to manage your <link xlink:href="https://www.zsh.org/">ZSH</link> configuration including completion scripts for several CLI tools or custom prompt themes.
+  <literal><link xlink:href="https://ohmyz.sh/">oh-my-zsh</link></literal> is a
+  framework to manage your <link xlink:href="https://www.zsh.org/">ZSH</link>
+  configuration including completion scripts for several CLI tools or custom
+  prompt themes.
  </para>
  <section xml:id="module-programs-oh-my-zsh-usage">
   <title>Basic usage</title>
 
   <para>
-   The module uses the <literal>oh-my-zsh</literal> package with all available features. The initial setup using Nix expressions is fairly similar to the configuration format of <literal>oh-my-zsh</literal>.
+   The module uses the <literal>oh-my-zsh</literal> package with all available
+   features. The initial setup using Nix expressions is fairly similar to the
+   configuration format of <literal>oh-my-zsh</literal>.
 <programlisting>
 {
   programs.zsh.ohMyZsh = {
@@ -21,18 +26,25 @@
   };
 }
 </programlisting>
-   For a detailed explanation of these arguments please refer to the <link xlink:href="https://github.com/robbyrussell/oh-my-zsh/wiki"><literal>oh-my-zsh</literal> docs</link>.
+   For a detailed explanation of these arguments please refer to the
+   <link xlink:href="https://github.com/robbyrussell/oh-my-zsh/wiki"><literal>oh-my-zsh</literal>
+   docs</link>.
   </para>
 
   <para>
-   The expression generates the needed configuration and writes it into your <literal>/etc/zshrc</literal>.
+   The expression generates the needed configuration and writes it into your
+   <literal>/etc/zshrc</literal>.
   </para>
  </section>
  <section xml:id="module-programs-oh-my-zsh-additions">
   <title>Custom additions</title>
 
   <para>
-   Sometimes third-party or custom scripts such as a modified theme may be needed. <literal>oh-my-zsh</literal> provides the <link xlink:href="https://github.com/robbyrussell/oh-my-zsh/wiki/Customization#overriding-internals"><literal>ZSH_CUSTOM</literal></link> environment variable for this which points to a directory with additional scripts.
+   Sometimes third-party or custom scripts such as a modified theme may be
+   needed. <literal>oh-my-zsh</literal> provides the
+   <link xlink:href="https://github.com/robbyrussell/oh-my-zsh/wiki/Customization#overriding-internals"><literal>ZSH_CUSTOM</literal></link>
+   environment variable for this which points to a directory with additional
+   scripts.
   </para>
 
   <para>
@@ -48,11 +60,16 @@
   <title>Custom environments</title>
 
   <para>
-   There are several extensions for <literal>oh-my-zsh</literal> packaged in <literal>nixpkgs</literal>. One of them is <link xlink:href="https://github.com/spwhitt/nix-zsh-completions">nix-zsh-completions</link> which bundles completion scripts and a plugin for <literal>oh-my-zsh</literal>.
+   There are several extensions for <literal>oh-my-zsh</literal> packaged in
+   <literal>nixpkgs</literal>. One of them is
+   <link xlink:href="https://github.com/spwhitt/nix-zsh-completions">nix-zsh-completions</link>
+   which bundles completion scripts and a plugin for
+   <literal>oh-my-zsh</literal>.
   </para>
 
   <para>
-   Rather than using a single mutable path for <literal>ZSH_CUSTOM</literal>, it's also possible to generate this path from a list of Nix packages:
+   Rather than using a single mutable path for <literal>ZSH_CUSTOM</literal>,
+   it's also possible to generate this path from a list of Nix packages:
 <programlisting>
 { pkgs, ... }:
 {
@@ -62,34 +79,53 @@
   ];
 }
 </programlisting>
-   Internally a single store path will be created using <literal>buildEnv</literal>. Please refer to the docs of <link xlink:href="https://nixos.org/nixpkgs/manual/#sec-building-environment"><literal>buildEnv</literal></link> for further reference.
+   Internally a single store path will be created using
+   <literal>buildEnv</literal>. Please refer to the docs of
+   <link xlink:href="https://nixos.org/nixpkgs/manual/#sec-building-environment"><literal>buildEnv</literal></link>
+   for further reference.
   </para>
 
   <para>
-   <emphasis>Please keep in mind that this is not compatible with <literal>programs.zsh.ohMyZsh.custom</literal> as it requires an immutable store path while <literal>custom</literal> shall remain mutable! An evaluation failure will be thrown if both <literal>custom</literal> and <literal>customPkgs</literal> are set.</emphasis>
+   <emphasis>Please keep in mind that this is not compatible with
+   <literal>programs.zsh.ohMyZsh.custom</literal> as it requires an immutable
+   store path while <literal>custom</literal> shall remain mutable! An
+   evaluation failure will be thrown if both <literal>custom</literal> and
+   <literal>customPkgs</literal> are set.</emphasis>
   </para>
  </section>
  <section xml:id="module-programs-oh-my-zsh-packaging-customizations">
   <title>Package your own customizations</title>
 
   <para>
-   If third-party customizations (e.g. new themes) are supposed to be added to <literal>oh-my-zsh</literal> there are several pitfalls to keep in mind:
+   If third-party customizations (e.g. new themes) are supposed to be added to
+   <literal>oh-my-zsh</literal> there are several pitfalls to keep in mind:
   </para>
 
   <itemizedlist>
    <listitem>
     <para>
-     To comply with the default structure of <literal>ZSH</literal> the entire output needs to be written to <literal>$out/share/zsh.</literal>
+     To comply with the default structure of <literal>ZSH</literal> the entire
+     output needs to be written to <literal>$out/share/zsh.</literal>
     </para>
    </listitem>
    <listitem>
     <para>
-     Completion scripts are supposed to be stored at <literal>$out/share/zsh/site-functions</literal>. This directory is part of the <literal><link xlink:href="http://zsh.sourceforge.net/Doc/Release/Functions.html">fpath</link></literal> and the package should be compatible with pure <literal>ZSH</literal> setups. The module will automatically link the contents of <literal>site-functions</literal> to completions directory in the proper store path.
+     Completion scripts are supposed to be stored at
+     <literal>$out/share/zsh/site-functions</literal>. This directory is part
+     of the
+     <literal><link xlink:href="http://zsh.sourceforge.net/Doc/Release/Functions.html">fpath</link></literal>
+     and the package should be compatible with pure <literal>ZSH</literal>
+     setups. The module will automatically link the contents of
+     <literal>site-functions</literal> to completions directory in the proper
+     store path.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>plugins</literal> directory needs the structure <literal>pluginname/pluginname.plugin.zsh</literal> as structured in the <link xlink:href="https://github.com/robbyrussell/oh-my-zsh/tree/91b771914bc7c43dd7c7a43b586c5de2c225ceb7/plugins">upstream repo.</link>
+     The <literal>plugins</literal> directory needs the structure
+     <literal>pluginname/pluginname.plugin.zsh</literal> as structured in the
+     <link xlink:href="https://github.com/robbyrussell/oh-my-zsh/tree/91b771914bc7c43dd7c7a43b586c5de2c225ceb7/plugins">upstream
+     repo.</link>
     </para>
    </listitem>
   </itemizedlist>
diff --git a/nixos/modules/security/acme.xml b/nixos/modules/security/acme.xml
index 182d6e0cd51..9d0a1995e0f 100644
--- a/nixos/modules/security/acme.xml
+++ b/nixos/modules/security/acme.xml
@@ -5,13 +5,19 @@
          xml:id="module-security-acme">
  <title>SSL/TLS Certificates with ACME</title>
  <para>
-  NixOS supports automatic domain validation &amp; certificate retrieval and renewal using the ACME protocol. This is currently only implemented by and for Let's Encrypt. The alternative ACME client <literal>simp_le</literal> is used under the hood.
+  NixOS supports automatic domain validation &amp; certificate retrieval and
+  renewal using the ACME protocol. This is currently only implemented by and
+  for Let's Encrypt. The alternative ACME client <literal>simp_le</literal> is
+  used under the hood.
  </para>
  <section xml:id="module-security-acme-prerequisites">
   <title>Prerequisites</title>
 
   <para>
-   You need to have a running HTTP server for verification. The server must have a webroot defined that can serve <filename>.well-known/acme-challenge</filename>. This directory must be writeable by the user that will run the ACME client.
+   You need to have a running HTTP server for verification. The server must
+   have a webroot defined that can serve
+   <filename>.well-known/acme-challenge</filename>. This directory must be
+   writeable by the user that will run the ACME client.
   </para>
 
   <para>
@@ -39,7 +45,9 @@ http {
   <title>Configuring</title>
 
   <para>
-   To enable ACME certificate retrieval &amp; renewal for a certificate for <literal>foo.example.com</literal>, add the following in your <filename>configuration.nix</filename>:
+   To enable ACME certificate retrieval &amp; renewal for a certificate for
+   <literal>foo.example.com</literal>, add the following in your
+   <filename>configuration.nix</filename>:
 <programlisting>
 <xref linkend="opt-security.acme.certs"/>."foo.example.com" = {
   <link linkend="opt-security.acme.certs._name_.webroot">webroot</link> = "/var/www/challenges";
@@ -49,18 +57,26 @@ http {
   </para>
 
   <para>
-   The private key <filename>key.pem</filename> and certificate <filename>fullchain.pem</filename> will be put into <filename>/var/lib/acme/foo.example.com</filename>.
+   The private key <filename>key.pem</filename> and certificate
+   <filename>fullchain.pem</filename> will be put into
+   <filename>/var/lib/acme/foo.example.com</filename>.
   </para>
-
   <para>
-   Refer to <xref linkend="ch-options" /> for all available configuration options for the <link linkend="opt-security.acme.certs">security.acme</link> module.
+   Refer to <xref linkend="ch-options" /> for all available configuration
+   options for the <link linkend="opt-security.acme.certs">security.acme</link>
+   module.
   </para>
  </section>
  <section xml:id="module-security-acme-nginx">
   <title>Using ACME certificates in Nginx</title>
 
   <para>
-   NixOS supports fetching ACME certificates for you by setting <literal><link linkend="opt-services.nginx.virtualHosts._name_.enableACME">enableACME</link> = true;</literal> in a virtualHost config. We first create self-signed placeholder certificates in place of the real ACME certs. The placeholder certs are overwritten when the ACME certs arrive. For <literal>foo.example.com</literal> the config would look like.
+   NixOS supports fetching ACME certificates for you by setting
+   <literal><link linkend="opt-services.nginx.virtualHosts._name_.enableACME">enableACME</link>
+   = true;</literal> in a virtualHost config. We first create self-signed
+   placeholder certificates in place of the real ACME certs. The placeholder
+   certs are overwritten when the ACME certs arrive. For
+   <literal>foo.example.com</literal> the config would look like.
   </para>
 
 <programlisting>
diff --git a/nixos/modules/security/hidepid.xml b/nixos/modules/security/hidepid.xml
index 979d0215ab3..5a17cb1da41 100644
--- a/nixos/modules/security/hidepid.xml
+++ b/nixos/modules/security/hidepid.xml
@@ -9,13 +9,18 @@
 <programlisting>
 <xref linkend="opt-security.hideProcessInformation"/> = true;
 </programlisting>
-  ensures that access to process information is restricted to the owning user. This implies, among other things, that command-line arguments remain private. Unless your deployment relies on unprivileged users being able to inspect the process information of other users, this option should be safe to enable.
+  ensures that access to process information is restricted to the owning user.
+  This implies, among other things, that command-line arguments remain private.
+  Unless your deployment relies on unprivileged users being able to inspect the
+  process information of other users, this option should be safe to enable.
  </para>
  <para>
-  Members of the <literal>proc</literal> group are exempt from process information hiding.
+  Members of the <literal>proc</literal> group are exempt from process
+  information hiding.
  </para>
  <para>
-  To allow a service <replaceable>foo</replaceable> to run without process information hiding, set
+  To allow a service <replaceable>foo</replaceable> to run without process
+  information hiding, set
 <programlisting>
 <link linkend="opt-systemd.services._name_.serviceConfig">systemd.services.<replaceable>foo</replaceable>.serviceConfig</link>.SupplementaryGroups = [ "proc" ];
 </programlisting>
diff --git a/nixos/modules/services/databases/foundationdb.xml b/nixos/modules/services/databases/foundationdb.xml
index 33adfee3526..b0b1ebeab45 100644
--- a/nixos/modules/services/databases/foundationdb.xml
+++ b/nixos/modules/services/databases/foundationdb.xml
@@ -5,10 +5,12 @@
          xml:id="module-services-foundationdb">
  <title>FoundationDB</title>
  <para>
-  <emphasis>Source:</emphasis> <filename>modules/services/databases/foundationdb.nix</filename>
+  <emphasis>Source:</emphasis>
+  <filename>modules/services/databases/foundationdb.nix</filename>
  </para>
  <para>
-  <emphasis>Upstream documentation:</emphasis> <link xlink:href="https://apple.github.io/foundationdb/"/>
+  <emphasis>Upstream documentation:</emphasis>
+  <link xlink:href="https://apple.github.io/foundationdb/"/>
  </para>
  <para>
   <emphasis>Maintainer:</emphasis> Austin Seipp
@@ -17,13 +19,15 @@
   <emphasis>Available version(s):</emphasis> 5.1.x, 5.2.x, 6.0.x
  </para>
  <para>
-  FoundationDB (or "FDB") is an open source, distributed, transactional key-value store.
+  FoundationDB (or "FDB") is an open source, distributed, transactional
+  key-value store.
  </para>
  <section xml:id="module-services-foundationdb-configuring">
   <title>Configuring and basic setup</title>
 
   <para>
-   To enable FoundationDB, add the following to your <filename>configuration.nix</filename>:
+   To enable FoundationDB, add the following to your
+   <filename>configuration.nix</filename>:
 <programlisting>
 services.foundationdb.enable = true;
 services.foundationdb.package = pkgs.foundationdb52; # FoundationDB 5.2.x
@@ -31,11 +35,18 @@ services.foundationdb.package = pkgs.foundationdb52; # FoundationDB 5.2.x
   </para>
 
   <para>
-   The <option>services.foundationdb.package</option> option is required, and must always be specified. Due to the fact FoundationDB network protocols and on-disk storage formats may change between (major) versions, and upgrades must be explicitly handled by the user, you must always manually specify this yourself so that the NixOS module will use the proper version. Note that minor, bugfix releases are always compatible.
+   The <option>services.foundationdb.package</option> option is required, and
+   must always be specified. Due to the fact FoundationDB network protocols and
+   on-disk storage formats may change between (major) versions, and upgrades
+   must be explicitly handled by the user, you must always manually specify
+   this yourself so that the NixOS module will use the proper version. Note
+   that minor, bugfix releases are always compatible.
   </para>
 
   <para>
-   After running <command>nixos-rebuild</command>, you can verify whether FoundationDB is running by executing <command>fdbcli</command> (which is added to <option>environment.systemPackages</option>):
+   After running <command>nixos-rebuild</command>, you can verify whether
+   FoundationDB is running by executing <command>fdbcli</command> (which is
+   added to <option>environment.systemPackages</option>):
 <screen>
 <prompt>$ </prompt>sudo -u foundationdb fdbcli
 Using cluster file `/etc/foundationdb/fdb.cluster'.
@@ -66,7 +77,11 @@ Cluster:
   </para>
 
   <para>
-   You can also write programs using the available client libraries. For example, the following Python program can be run in order to grab the cluster status, as a quick example. (This example uses <command>nix-shell</command> shebang support to automatically supply the necessary Python modules).
+   You can also write programs using the available client libraries. For
+   example, the following Python program can be run in order to grab the
+   cluster status, as a quick example. (This example uses
+   <command>nix-shell</command> shebang support to automatically supply the
+   necessary Python modules).
 <screen>
 <prompt>a@link> </prompt>cat fdb-status.py
 #! /usr/bin/env nix-shell
@@ -96,56 +111,91 @@ FoundationDB available: True
   </para>
 
   <para>
-   FoundationDB is run under the <command>foundationdb</command> user and group by default, but this may be changed in the NixOS configuration. The systemd unit <command>foundationdb.service</command> controls the <command>fdbmonitor</command> process.
+   FoundationDB is run under the <command>foundationdb</command> user and group
+   by default, but this may be changed in the NixOS configuration. The systemd
+   unit <command>foundationdb.service</command> controls the
+   <command>fdbmonitor</command> process.
   </para>
 
   <para>
-   By default, the NixOS module for FoundationDB creates a single SSD-storage based database for development and basic usage. This storage engine is designed for SSDs and will perform poorly on HDDs; however it can handle far more data than the alternative "memory" engine and is a better default choice for most deployments. (Note that you can change the storage backend on-the-fly for a given FoundationDB cluster using <command>fdbcli</command>.)
+   By default, the NixOS module for FoundationDB creates a single SSD-storage
+   based database for development and basic usage. This storage engine is
+   designed for SSDs and will perform poorly on HDDs; however it can handle far
+   more data than the alternative "memory" engine and is a better default
+   choice for most deployments. (Note that you can change the storage backend
+   on-the-fly for a given FoundationDB cluster using
+   <command>fdbcli</command>.)
   </para>
 
   <para>
-   Furthermore, only 1 server process and 1 backup agent are started in the default configuration. See below for more on scaling to increase this.
+   Furthermore, only 1 server process and 1 backup agent are started in the
+   default configuration. See below for more on scaling to increase this.
   </para>
 
   <para>
-   FoundationDB stores all data for all server processes under <filename>/var/lib/foundationdb</filename>. You can override this using <option>services.foundationdb.dataDir</option>, e.g.
+   FoundationDB stores all data for all server processes under
+   <filename>/var/lib/foundationdb</filename>. You can override this using
+   <option>services.foundationdb.dataDir</option>, e.g.
 <programlisting>
 services.foundationdb.dataDir = "/data/fdb";
 </programlisting>
   </para>
 
   <para>
-   Similarly, logs are stored under <filename>/var/log/foundationdb</filename> by default, and there is a corresponding <option>services.foundationdb.logDir</option> as well.
+   Similarly, logs are stored under <filename>/var/log/foundationdb</filename>
+   by default, and there is a corresponding
+   <option>services.foundationdb.logDir</option> as well.
   </para>
  </section>
  <section xml:id="module-services-foundationdb-scaling">
   <title>Scaling processes and backup agents</title>
 
   <para>
-   Scaling the number of server processes is quite easy; simply specify <option>services.foundationdb.serverProcesses</option> to be the number of FoundationDB worker processes that should be started on the machine.
+   Scaling the number of server processes is quite easy; simply specify
+   <option>services.foundationdb.serverProcesses</option> to be the number of
+   FoundationDB worker processes that should be started on the machine.
   </para>
 
   <para>
-   FoundationDB worker processes typically require 4GB of RAM per-process at minimum for good performance, so this option is set to 1 by default since the maximum amount of RAM is unknown. You're advised to abide by this restriction, so pick a number of processes so that each has 4GB or more.
+   FoundationDB worker processes typically require 4GB of RAM per-process at
+   minimum for good performance, so this option is set to 1 by default since
+   the maximum amount of RAM is unknown. You're advised to abide by this
+   restriction, so pick a number of processes so that each has 4GB or more.
   </para>
 
   <para>
-   A similar option exists in order to scale backup agent processes, <option>services.foundationdb.backupProcesses</option>. Backup agents are not as performance/RAM sensitive, so feel free to experiment with the number of available backup processes.
+   A similar option exists in order to scale backup agent processes,
+   <option>services.foundationdb.backupProcesses</option>. Backup agents are
+   not as performance/RAM sensitive, so feel free to experiment with the number
+   of available backup processes.
   </para>
  </section>
  <section xml:id="module-services-foundationdb-clustering">
   <title>Clustering</title>
 
   <para>
-   FoundationDB on NixOS works similarly to other Linux systems, so this section will be brief. Please refer to the full FoundationDB documentation for more on clustering.
+   FoundationDB on NixOS works similarly to other Linux systems, so this
+   section will be brief. Please refer to the full FoundationDB documentation
+   for more on clustering.
   </para>
 
   <para>
-   FoundationDB organizes clusters using a set of <emphasis>coordinators</emphasis>, which are just specially-designated worker processes. By default, every installation of FoundationDB on NixOS will start as its own individual cluster, with a single coordinator: the first worker process on <command>localhost</command>.
+   FoundationDB organizes clusters using a set of
+   <emphasis>coordinators</emphasis>, which are just specially-designated
+   worker processes. By default, every installation of FoundationDB on NixOS
+   will start as its own individual cluster, with a single coordinator: the
+   first worker process on <command>localhost</command>.
   </para>
 
   <para>
-   Coordinators are specified globally using the <command>/etc/foundationdb/fdb.cluster</command> file, which all servers and client applications will use to find and join coordinators. Note that this file <emphasis>can not</emphasis> be managed by NixOS so easily: FoundationDB is designed so that it will rewrite the file at runtime for all clients and nodes when cluster coordinators change, with clients transparently handling this without intervention. It is fundamentally a mutable file, and you should not try to manage it in any way in NixOS.
+   Coordinators are specified globally using the
+   <command>/etc/foundationdb/fdb.cluster</command> file, which all servers and
+   client applications will use to find and join coordinators. Note that this
+   file <emphasis>can not</emphasis> be managed by NixOS so easily:
+   FoundationDB is designed so that it will rewrite the file at runtime for all
+   clients and nodes when cluster coordinators change, with clients
+   transparently handling this without intervention. It is fundamentally a
+   mutable file, and you should not try to manage it in any way in NixOS.
   </para>
 
   <para>
@@ -166,7 +216,9 @@ services.foundationdb.dataDir = "/data/fdb";
   </itemizedlist>
 
   <para>
-   A node must already be a member of the cluster in order to properly be promoted to a coordinator, so you must always add it first if you wish to promote it.
+   A node must already be a member of the cluster in order to properly be
+   promoted to a coordinator, so you must always add it first if you wish to
+   promote it.
   </para>
 
   <para>
@@ -181,26 +233,37 @@ services.foundationdb.dataDir = "/data/fdb";
    </listitem>
    <listitem>
     <para>
-     Copy the <command>/etc/foundationdb/fdb.cluster</command> file from this server to all the other servers. Restart FoundationDB on all of these other servers, so they join the cluster.
+     Copy the <command>/etc/foundationdb/fdb.cluster</command> file from this
+     server to all the other servers. Restart FoundationDB on all of these
+     other servers, so they join the cluster.
     </para>
    </listitem>
    <listitem>
     <para>
-     All of these servers are now connected and working together in the cluster, under the chosen coordinator.
+     All of these servers are now connected and working together in the
+     cluster, under the chosen coordinator.
     </para>
    </listitem>
   </itemizedlist>
 
   <para>
-   At this point, you can add as many nodes as you want by just repeating the above steps. By default there will still be a single coordinator: you can use <command>fdbcli</command> to change this and add new coordinators.
+   At this point, you can add as many nodes as you want by just repeating the
+   above steps. By default there will still be a single coordinator: you can
+   use <command>fdbcli</command> to change this and add new coordinators.
   </para>
 
   <para>
-   As a convenience, FoundationDB can automatically assign coordinators based on the redundancy mode you wish to achieve for the cluster. Once all the nodes have been joined, simply set the replication policy, and then issue the <command>coordinators auto</command> command
+   As a convenience, FoundationDB can automatically assign coordinators based
+   on the redundancy mode you wish to achieve for the cluster. Once all the
+   nodes have been joined, simply set the replication policy, and then issue
+   the <command>coordinators auto</command> command
   </para>
 
   <para>
-   For example, assuming we have 3 nodes available, we can enable double redundancy mode, then auto-select coordinators. For double redundancy, 3 coordinators is ideal: therefore FoundationDB will make <emphasis>every</emphasis> node a coordinator automatically:
+   For example, assuming we have 3 nodes available, we can enable double
+   redundancy mode, then auto-select coordinators. For double redundancy, 3
+   coordinators is ideal: therefore FoundationDB will make
+   <emphasis>every</emphasis> node a coordinator automatically:
   </para>
 
 <screen>
@@ -209,33 +272,58 @@ services.foundationdb.dataDir = "/data/fdb";
 </screen>
 
   <para>
-   This will transparently update all the servers within seconds, and appropriately rewrite the <command>fdb.cluster</command> file, as well as informing all client processes to do the same.
+   This will transparently update all the servers within seconds, and
+   appropriately rewrite the <command>fdb.cluster</command> file, as well as
+   informing all client processes to do the same.
   </para>
  </section>
  <section xml:id="module-services-foundationdb-connectivity">
   <title>Client connectivity</title>
 
   <para>
-   By default, all clients must use the current <command>fdb.cluster</command> file to access a given FoundationDB cluster. This file is located by default in <command>/etc/foundationdb/fdb.cluster</command> on all machines with the FoundationDB service enabled, so you may copy the active one from your cluster to a new node in order to connect, if it is not part of the cluster.
+   By default, all clients must use the current <command>fdb.cluster</command>
+   file to access a given FoundationDB cluster. This file is located by default
+   in <command>/etc/foundationdb/fdb.cluster</command> on all machines with the
+   FoundationDB service enabled, so you may copy the active one from your
+   cluster to a new node in order to connect, if it is not part of the cluster.
   </para>
  </section>
  <section xml:id="module-services-foundationdb-authorization">
   <title>Client authorization and TLS</title>
 
   <para>
-   By default, any user who can connect to a FoundationDB process with the correct cluster configuration can access anything. FoundationDB uses a pluggable design to transport security, and out of the box it supports a LibreSSL-based plugin for TLS support. This plugin not only does in-flight encryption, but also performs client authorization based on the given endpoint's certificate chain. For example, a FoundationDB server may be configured to only accept client connections over TLS, where the client TLS certificate is from organization <emphasis>Acme Co</emphasis> in the <emphasis>Research and Development</emphasis> unit.
+   By default, any user who can connect to a FoundationDB process with the
+   correct cluster configuration can access anything. FoundationDB uses a
+   pluggable design to transport security, and out of the box it supports a
+   LibreSSL-based plugin for TLS support. This plugin not only does in-flight
+   encryption, but also performs client authorization based on the given
+   endpoint's certificate chain. For example, a FoundationDB server may be
+   configured to only accept client connections over TLS, where the client TLS
+   certificate is from organization <emphasis>Acme Co</emphasis> in the
+   <emphasis>Research and Development</emphasis> unit.
   </para>
 
   <para>
-   Configuring TLS with FoundationDB is done using the <option>services.foundationdb.tls</option> options in order to control the peer verification string, as well as the certificate and its private key.
+   Configuring TLS with FoundationDB is done using the
+   <option>services.foundationdb.tls</option> options in order to control the
+   peer verification string, as well as the certificate and its private key.
   </para>
 
   <para>
-   Note that the certificate and its private key must be accessible to the FoundationDB user account that the server runs under. These files are also NOT managed by NixOS, as putting them into the store may reveal private information.
+   Note that the certificate and its private key must be accessible to the
+   FoundationDB user account that the server runs under. These files are also
+   NOT managed by NixOS, as putting them into the store may reveal private
+   information.
   </para>
 
   <para>
-   After you have a key and certificate file in place, it is not enough to simply set the NixOS module options -- you must also configure the <command>fdb.cluster</command> file to specify that a given set of coordinators use TLS. This is as simple as adding the suffix <command>:tls</command> to your cluster coordinator configuration, after the port number. For example, assuming you have a coordinator on localhost with the default configuration, simply specifying:
+   After you have a key and certificate file in place, it is not enough to
+   simply set the NixOS module options -- you must also configure the
+   <command>fdb.cluster</command> file to specify that a given set of
+   coordinators use TLS. This is as simple as adding the suffix
+   <command>:tls</command> to your cluster coordinator configuration, after the
+   port number. For example, assuming you have a coordinator on localhost with
+   the default configuration, simply specifying:
   </para>
 
 <programlisting>
@@ -250,19 +338,36 @@ XXXXXX:XXXXXX@127.0.0.1:4500:tls
   <title>Backups and Disaster Recovery</title>
 
   <para>
-   The usual rules for doing FoundationDB backups apply on NixOS as written in the FoundationDB manual. However, one important difference is the security profile for NixOS: by default, the <command>foundationdb</command> systemd unit uses <emphasis>Linux namespaces</emphasis> to restrict write access to the system, except for the log directory, data directory, and the <command>/etc/foundationdb/</command> directory. This is enforced by default and cannot be disabled.
+   The usual rules for doing FoundationDB backups apply on NixOS as written in
+   the FoundationDB manual. However, one important difference is the security
+   profile for NixOS: by default, the <command>foundationdb</command> systemd
+   unit uses <emphasis>Linux namespaces</emphasis> to restrict write access to
+   the system, except for the log directory, data directory, and the
+   <command>/etc/foundationdb/</command> directory. This is enforced by default
+   and cannot be disabled.
   </para>
 
   <para>
-   However, a side effect of this is that the <command>fdbbackup</command> command doesn't work properly for local filesystem backups: FoundationDB uses a server process alongside the database processes to perform backups and copy the backups to the filesystem. As a result, this process is put under the restricted namespaces above: the backup process can only write to a limited number of paths.
+   However, a side effect of this is that the <command>fdbbackup</command>
+   command doesn't work properly for local filesystem backups: FoundationDB
+   uses a server process alongside the database processes to perform backups
+   and copy the backups to the filesystem. As a result, this process is put
+   under the restricted namespaces above: the backup process can only write to
+   a limited number of paths.
   </para>
 
   <para>
-   In order to allow flexible backup locations on local disks, the FoundationDB NixOS module supports a <option>services.foundationdb.extraReadWritePaths</option> option. This option takes a list of paths, and adds them to the systemd unit, allowing the processes inside the service to write (and read) the specified directories.
+   In order to allow flexible backup locations on local disks, the FoundationDB
+   NixOS module supports a
+   <option>services.foundationdb.extraReadWritePaths</option> option. This
+   option takes a list of paths, and adds them to the systemd unit, allowing
+   the processes inside the service to write (and read) the specified
+   directories.
   </para>
 
   <para>
-   For example, to create backups in <command>/opt/fdb-backups</command>, first set up the paths in the module options:
+   For example, to create backups in <command>/opt/fdb-backups</command>, first
+   set up the paths in the module options:
   </para>
 
 <programlisting>
@@ -270,7 +375,11 @@ services.foundationdb.extraReadWritePaths = [ "/opt/fdb-backups" ];
 </programlisting>
 
   <para>
-   Restart the FoundationDB service, and it will now be able to write to this directory (even if it does not yet exist.) Note: this path <emphasis>must</emphasis> exist before restarting the unit. Otherwise, systemd will not include it in the private FoundationDB namespace (and it will not add it dynamically at runtime).
+   Restart the FoundationDB service, and it will now be able to write to this
+   directory (even if it does not yet exist.) Note: this path
+   <emphasis>must</emphasis> exist before restarting the unit. Otherwise,
+   systemd will not include it in the private FoundationDB namespace (and it
+   will not add it dynamically at runtime).
   </para>
 
   <para>
@@ -286,13 +395,17 @@ services.foundationdb.extraReadWritePaths = [ "/opt/fdb-backups" ];
   <title>Known limitations</title>
 
   <para>
-   The FoundationDB setup for NixOS should currently be considered beta. FoundationDB is not new software, but the NixOS compilation and integration has only undergone fairly basic testing of all the available functionality.
+   The FoundationDB setup for NixOS should currently be considered beta.
+   FoundationDB is not new software, but the NixOS compilation and integration
+   has only undergone fairly basic testing of all the available functionality.
   </para>
 
   <itemizedlist>
    <listitem>
     <para>
-     There is no way to specify individual parameters for individual <command>fdbserver</command> processes. Currently, all server processes inherit all the global <command>fdbmonitor</command> settings.
+     There is no way to specify individual parameters for individual
+     <command>fdbserver</command> processes. Currently, all server processes
+     inherit all the global <command>fdbmonitor</command> settings.
     </para>
    </listitem>
    <listitem>
@@ -311,14 +424,20 @@ services.foundationdb.extraReadWritePaths = [ "/opt/fdb-backups" ];
   <title>Options</title>
 
   <para>
-   NixOS's FoundationDB module allows you to configure all of the most relevant configuration options for <command>fdbmonitor</command>, matching it quite closely. A complete list of options for the FoundationDB module may be found <link linkend="opt-services.foundationdb.enable">here</link>. You should also read the FoundationDB documentation as well.
+   NixOS's FoundationDB module allows you to configure all of the most relevant
+   configuration options for <command>fdbmonitor</command>, matching it quite
+   closely. A complete list of options for the FoundationDB module may be found
+   <link linkend="opt-services.foundationdb.enable">here</link>. You should
+   also read the FoundationDB documentation as well.
   </para>
  </section>
  <section xml:id="module-services-foundationdb-full-docs">
   <title>Full documentation</title>
 
   <para>
-   FoundationDB is a complex piece of software, and requires careful administration to properly use. Full documentation for administration can be found here: <link xlink:href="https://apple.github.io/foundationdb/"/>.
+   FoundationDB is a complex piece of software, and requires careful
+   administration to properly use. Full documentation for administration can be
+   found here: <link xlink:href="https://apple.github.io/foundationdb/"/>.
   </para>
  </section>
 </chapter>
diff --git a/nixos/modules/services/databases/postgresql.xml b/nixos/modules/services/databases/postgresql.xml
index dc1bfb125a7..72d4a8249a3 100644
--- a/nixos/modules/services/databases/postgresql.xml
+++ b/nixos/modules/services/databases/postgresql.xml
@@ -7,10 +7,12 @@
 <!-- FIXME: render nicely -->
 <!-- FIXME: source can be added automatically -->
  <para>
-  <emphasis>Source:</emphasis> <filename>modules/services/databases/postgresql.nix</filename>
+  <emphasis>Source:</emphasis>
+  <filename>modules/services/databases/postgresql.nix</filename>
  </para>
  <para>
-  <emphasis>Upstream documentation:</emphasis> <link xlink:href="http://www.postgresql.org/docs/"/>
+  <emphasis>Upstream documentation:</emphasis>
+  <link xlink:href="http://www.postgresql.org/docs/"/>
  </para>
 <!-- FIXME: more stuff, like maintainer? -->
  <para>
@@ -21,12 +23,18 @@
   <title>Configuring</title>
 
   <para>
-   To enable PostgreSQL, add the following to your <filename>configuration.nix</filename>:
+   To enable PostgreSQL, add the following to your
+   <filename>configuration.nix</filename>:
 <programlisting>
 <xref linkend="opt-services.postgresql.enable"/> = true;
 <xref linkend="opt-services.postgresql.package"/> = pkgs.postgresql_11;
 </programlisting>
-   Note that you are required to specify the desired version of PostgreSQL (e.g. <literal>pkgs.postgresql_11</literal>). Since upgrading your PostgreSQL version requires a database dump and reload (see below), NixOS cannot provide a default value for <xref linkend="opt-services.postgresql.package"/> such as the most recent release of PostgreSQL.
+   Note that you are required to specify the desired version of PostgreSQL
+   (e.g. <literal>pkgs.postgresql_11</literal>). Since upgrading your
+   PostgreSQL version requires a database dump and reload (see below), NixOS
+   cannot provide a default value for
+   <xref linkend="opt-services.postgresql.package"/> such as the most recent
+   release of PostgreSQL.
   </para>
 
 <!--
@@ -43,7 +51,9 @@ Type "help" for help.
 -->
 
   <para>
-   By default, PostgreSQL stores its databases in <filename>/var/lib/postgresql/$psqlSchema</filename>. You can override this using <xref linkend="opt-services.postgresql.dataDir"/>, e.g.
+   By default, PostgreSQL stores its databases in
+   <filename>/var/lib/postgresql/$psqlSchema</filename>. You can override this using
+   <xref linkend="opt-services.postgresql.dataDir"/>, e.g.
 <programlisting>
 <xref linkend="opt-services.postgresql.dataDir"/> = "/data/postgresql";
 </programlisting>
@@ -60,14 +70,18 @@ Type "help" for help.
   <title>Options</title>
 
   <para>
-   A complete list of options for the PostgreSQL module may be found <link linkend="opt-services.postgresql.enable">here</link>.
+   A complete list of options for the PostgreSQL module may be found
+   <link linkend="opt-services.postgresql.enable">here</link>.
   </para>
  </section>
  <section xml:id="module-services-postgres-plugins">
   <title>Plugins</title>
 
   <para>
-   Plugins collection for each PostgreSQL version can be accessed with <literal>.pkgs</literal>. For example, for <literal>pkgs.postgresql_11</literal> package, its plugin collection is accessed by <literal>pkgs.postgresql_11.pkgs</literal>:
+   Plugins collection for each PostgreSQL version can be accessed with
+   <literal>.pkgs</literal>. For example, for
+   <literal>pkgs.postgresql_11</literal> package, its plugin collection is
+   accessed by <literal>pkgs.postgresql_11.pkgs</literal>:
 <screen>
 <prompt>$ </prompt>nix repl '&lt;nixpkgs&gt;'
 
@@ -84,9 +98,8 @@ postgresql_11.pkgs.pg_partman        postgresql_11.pkgs.pgroonga
 ...
 </screen>
   </para>
-
   <para>
-   To add plugins via NixOS configuration, set <literal>services.postgresql.extraPlugins</literal>:
+    To add plugins via NixOS configuration, set <literal>services.postgresql.extraPlugins</literal>:
 <programlisting>
 <xref linkend="opt-services.postgresql.package"/> = pkgs.postgresql_11;
 <xref linkend="opt-services.postgresql.extraPlugins"/> = with pkgs.postgresql_11.pkgs; [
@@ -95,9 +108,10 @@ postgresql_11.pkgs.pg_partman        postgresql_11.pkgs.pgroonga
 ];
 </programlisting>
   </para>
-
   <para>
-   You can build custom PostgreSQL-with-plugins (to be used outside of NixOS) using function <literal>.withPackages</literal>. For example, creating a custom PostgreSQL package in an overlay can look like:
+   You can build custom PostgreSQL-with-plugins (to be used outside of NixOS) using
+   function <literal>.withPackages</literal>. For example, creating a custom
+   PostgreSQL package in an overlay can look like:
 <programlisting>
 self: super: {
   postgresql_custom = self.postgresql_11.withPackages (ps: [
@@ -107,9 +121,8 @@ self: super: {
 }
 </programlisting>
   </para>
-
   <para>
-   Here's a recipe on how to override a particular plugin through an overlay:
+    Here's a recipe on how to override a particular plugin through an overlay:
 <programlisting>
 self: super: {
   postgresql_11 = super.postgresql_11.override { this = self.postgresql_11; } // {
diff --git a/nixos/modules/services/desktops/flatpak.xml b/nixos/modules/services/desktops/flatpak.xml
index 3b2ccd12cf5..8f080b25022 100644
--- a/nixos/modules/services/desktops/flatpak.xml
+++ b/nixos/modules/services/desktops/flatpak.xml
@@ -5,33 +5,44 @@
          xml:id="module-services-flatpak">
  <title>Flatpak</title>
  <para>
-  <emphasis>Source:</emphasis> <filename>modules/services/desktop/flatpak.nix</filename>
+  <emphasis>Source:</emphasis>
+  <filename>modules/services/desktop/flatpak.nix</filename>
  </para>
  <para>
-  <emphasis>Upstream documentation:</emphasis> <link xlink:href="https://github.com/flatpak/flatpak/wiki"/>
+  <emphasis>Upstream documentation:</emphasis>
+  <link xlink:href="https://github.com/flatpak/flatpak/wiki"/>
  </para>
  <para>
-  Flatpak is a system for building, distributing, and running sandboxed desktop applications on Linux.
+  Flatpak is a system for building, distributing, and running sandboxed desktop
+  applications on Linux.
  </para>
  <para>
-  To enable Flatpak, add the following to your <filename>configuration.nix</filename>:
+  To enable Flatpak, add the following to your
+  <filename>configuration.nix</filename>:
 <programlisting>
   <xref linkend="opt-services.flatpak.enable"/> = true;
 </programlisting>
  </para>
  <para>
-  For the sandboxed apps to work correctly, desktop integration portals need to be installed. If you run GNOME, this will be handled automatically for you; in other cases, you will need to add something like the following to your <filename>configuration.nix</filename>:
+  For the sandboxed apps to work correctly, desktop integration portals need to
+  be installed. If you run GNOME, this will be handled automatically for you;
+  in other cases, you will need to add something like the following to your
+  <filename>configuration.nix</filename>:
 <programlisting>
   <xref linkend="opt-xdg.portal.extraPortals"/> = [ pkgs.xdg-desktop-portal-gtk ];
 </programlisting>
  </para>
  <para>
-  Then, you will need to add a repository, for example, <link xlink:href="https://github.com/flatpak/flatpak/wiki">Flathub</link>, either using the following commands:
+  Then, you will need to add a repository, for example,
+  <link xlink:href="https://github.com/flatpak/flatpak/wiki">Flathub</link>,
+  either using the following commands:
 <screen>
 <prompt>$ </prompt>flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
 <prompt>$ </prompt>flatpak update
 </screen>
-  or by opening the <link xlink:href="https://flathub.org/repo/flathub.flatpakrepo">repository file</link> in GNOME Software.
+  or by opening the
+  <link xlink:href="https://flathub.org/repo/flathub.flatpakrepo">repository
+  file</link> in GNOME Software.
  </para>
  <para>
   Finally, you can search and install programs:
diff --git a/nixos/modules/services/editors/emacs.xml b/nixos/modules/services/editors/emacs.xml
index 0213b8971c2..03483f69fa2 100644
--- a/nixos/modules/services/editors/emacs.xml
+++ b/nixos/modules/services/editors/emacs.xml
@@ -12,26 +12,41 @@
       Adam Hoese @adisbladis
   -->
  <para>
-  <link xlink:href="https://www.gnu.org/software/emacs/">Emacs</link> is an extensible, customizable, self-documenting real-time display editor — and more. At its core is an interpreter for Emacs Lisp, a dialect of the Lisp programming language with extensions to support text editing.
+  <link xlink:href="https://www.gnu.org/software/emacs/">Emacs</link> is an
+  extensible, customizable, self-documenting real-time display editor — and
+  more. At its core is an interpreter for Emacs Lisp, a dialect of the Lisp
+  programming language with extensions to support text editing.
  </para>
  <para>
-  Emacs runs within a graphical desktop environment using the X Window System, but works equally well on a text terminal. Under <productname>macOS</productname>, a "Mac port" edition is available, which uses Apple's native GUI frameworks.
+  Emacs runs within a graphical desktop environment using the X Window System,
+  but works equally well on a text terminal. Under
+  <productname>macOS</productname>, a "Mac port" edition is available, which
+  uses Apple's native GUI frameworks.
  </para>
  <para>
-  <productname>Nixpkgs</productname> provides a superior environment for running <application>Emacs</application>. It's simple to create custom builds by overriding the default packages. Chaotic collections of Emacs Lisp code and extensions can be brought under control using declarative package management. <productname>NixOS</productname> even provides a <command>systemd</command> user service for automatically starting the Emacs daemon.
+  <productname>Nixpkgs</productname> provides a superior environment for
+  running <application>Emacs</application>. It's simple to create custom builds
+  by overriding the default packages. Chaotic collections of Emacs Lisp code
+  and extensions can be brought under control using declarative package
+  management. <productname>NixOS</productname> even provides a
+  <command>systemd</command> user service for automatically starting the Emacs
+  daemon.
  </para>
  <section xml:id="module-services-emacs-installing">
   <title>Installing <application>Emacs</application></title>
 
   <para>
-   Emacs can be installed in the normal way for Nix (see <xref linkend="sec-package-management" />). In addition, a NixOS <emphasis>service</emphasis> can be enabled.
+   Emacs can be installed in the normal way for Nix (see
+   <xref linkend="sec-package-management" />). In addition, a NixOS
+   <emphasis>service</emphasis> can be enabled.
   </para>
 
   <section xml:id="module-services-emacs-releases">
    <title>The Different Releases of Emacs</title>
 
    <para>
-    <productname>Nixpkgs</productname> defines several basic Emacs packages. The following are attributes belonging to the <varname>pkgs</varname> set:
+    <productname>Nixpkgs</productname> defines several basic Emacs packages.
+    The following are attributes belonging to the <varname>pkgs</varname> set:
     <variablelist>
      <varlistentry>
       <term>
@@ -42,8 +57,10 @@
       </term>
       <listitem>
        <para>
-        The latest stable version of Emacs 25 using the <link
-                xlink:href="http://www.gtk.org">GTK 2</link> widget toolkit.
+        The latest stable version of Emacs 25 using the
+        <link
+                xlink:href="http://www.gtk.org">GTK 2</link>
+        widget toolkit.
        </para>
       </listitem>
      </varlistentry>
@@ -66,7 +83,8 @@
       </term>
       <listitem>
        <para>
-        Emacs 25 with the "Mac port" patches, providing a more native look and feel under macOS.
+        Emacs 25 with the "Mac port" patches, providing a more native look and
+        feel under macOS.
        </para>
       </listitem>
      </varlistentry>
@@ -74,7 +92,12 @@
    </para>
 
    <para>
-    If those aren't suitable, then the following imitation Emacs editors are also available in Nixpkgs: <link xlink:href="https://www.gnu.org/software/zile/">Zile</link>, <link xlink:href="http://homepage.boetes.org/software/mg/">mg</link>, <link xlink:href="http://yi-editor.github.io/">Yi</link>, <link xlink:href="https://joe-editor.sourceforge.io/">jmacs</link>.
+    If those aren't suitable, then the following imitation Emacs editors are
+    also available in Nixpkgs:
+    <link xlink:href="https://www.gnu.org/software/zile/">Zile</link>,
+    <link xlink:href="http://homepage.boetes.org/software/mg/">mg</link>,
+    <link xlink:href="http://yi-editor.github.io/">Yi</link>,
+    <link xlink:href="https://joe-editor.sourceforge.io/">jmacs</link>.
    </para>
   </section>
 
@@ -82,20 +105,36 @@
    <title>Adding Packages to Emacs</title>
 
    <para>
-    Emacs includes an entire ecosystem of functionality beyond text editing, including a project planner, mail and news reader, debugger interface, calendar, and more.
+    Emacs includes an entire ecosystem of functionality beyond text editing,
+    including a project planner, mail and news reader, debugger interface,
+    calendar, and more.
    </para>
 
    <para>
-    Most extensions are gotten with the Emacs packaging system (<filename>package.el</filename>) from <link
-        xlink:href="https://elpa.gnu.org/">Emacs Lisp Package Archive (<acronym>ELPA</acronym>)</link>, <link xlink:href="https://melpa.org/"><acronym>MELPA</acronym></link>, <link xlink:href="https://stable.melpa.org/">MELPA Stable</link>, and <link xlink:href="http://orgmode.org/elpa.html">Org ELPA</link>. Nixpkgs is regularly updated to mirror all these archives.
+    Most extensions are gotten with the Emacs packaging system
+    (<filename>package.el</filename>) from
+    <link
+        xlink:href="https://elpa.gnu.org/">Emacs Lisp Package Archive
+    (<acronym>ELPA</acronym>)</link>,
+    <link xlink:href="https://melpa.org/"><acronym>MELPA</acronym></link>,
+    <link xlink:href="https://stable.melpa.org/">MELPA Stable</link>, and
+    <link xlink:href="http://orgmode.org/elpa.html">Org ELPA</link>. Nixpkgs is
+    regularly updated to mirror all these archives.
    </para>
 
    <para>
-    Under NixOS, you can continue to use <function>package-list-packages</function> and <function>package-install</function> to install packages. You can also declare the set of Emacs packages you need using the derivations from Nixpkgs. The rest of this section discusses declarative installation of Emacs packages through nixpkgs.
+    Under NixOS, you can continue to use
+    <function>package-list-packages</function> and
+    <function>package-install</function> to install packages. You can also
+    declare the set of Emacs packages you need using the derivations from
+    Nixpkgs. The rest of this section discusses declarative installation of
+    Emacs packages through nixpkgs.
    </para>
 
    <para>
-    The first step to declare the list of packages you want in your Emacs installation is to create a dedicated derivation. This can be done in a dedicated <filename>emacs.nix</filename> file such as:
+    The first step to declare the list of packages you want in your Emacs
+    installation is to create a dedicated derivation. This can be done in a
+    dedicated <filename>emacs.nix</filename> file such as:
     <example xml:id="ex-emacsNix">
      <title>Nix expression to build Emacs with packages (<filename>emacs.nix</filename>)</title>
 <programlisting language="nix">
@@ -137,27 +176,36 @@ in
     <calloutlist>
      <callout arearefs="ex-emacsNix-1">
       <para>
-       The first non-comment line in this file (<literal>{ pkgs ? ... }</literal>) indicates that the whole file represents a function.
+       The first non-comment line in this file (<literal>{ pkgs ? ...
+       }</literal>) indicates that the whole file represents a function.
       </para>
      </callout>
      <callout arearefs="ex-emacsNix-2">
       <para>
-       The <varname>let</varname> expression below defines a <varname>myEmacs</varname> binding pointing to the current stable version of Emacs. This binding is here to separate the choice of the Emacs binary from the specification of the required packages.
+       The <varname>let</varname> expression below defines a
+       <varname>myEmacs</varname> binding pointing to the current stable
+       version of Emacs. This binding is here to separate the choice of the
+       Emacs binary from the specification of the required packages.
       </para>
      </callout>
      <callout arearefs="ex-emacsNix-3">
       <para>
-       This generates an <varname>emacsWithPackages</varname> function. It takes a single argument: a function from a package set to a list of packages (the packages that will be available in Emacs).
+       This generates an <varname>emacsWithPackages</varname> function. It
+       takes a single argument: a function from a package set to a list of
+       packages (the packages that will be available in Emacs).
       </para>
      </callout>
      <callout arearefs="ex-emacsNix-4">
       <para>
-       The rest of the file specifies the list of packages to install. In the example, two packages (<varname>magit</varname> and <varname>zerodark-theme</varname>) are taken from MELPA stable.
+       The rest of the file specifies the list of packages to install. In the
+       example, two packages (<varname>magit</varname> and
+       <varname>zerodark-theme</varname>) are taken from MELPA stable.
       </para>
      </callout>
      <callout arearefs="ex-emacsNix-5">
       <para>
-       Two packages (<varname>undo-tree</varname> and <varname>zoom-frm</varname>) are taken from MELPA.
+       Two packages (<varname>undo-tree</varname> and
+       <varname>zoom-frm</varname>) are taken from MELPA.
       </para>
      </callout>
      <callout arearefs="ex-emacsNix-6">
@@ -167,14 +215,17 @@ in
      </callout>
      <callout arearefs="ex-emacsNix-7">
       <para>
-       <varname>notmuch</varname> is taken from a nixpkgs derivation which contains an Emacs mode.
+       <varname>notmuch</varname> is taken from a nixpkgs derivation which
+       contains an Emacs mode.
       </para>
      </callout>
     </calloutlist>
    </para>
 
    <para>
-    The result of this configuration will be an <command>emacs</command> command which launches Emacs with all of your chosen packages in the <varname>load-path</varname>.
+    The result of this configuration will be an <command>emacs</command>
+    command which launches Emacs with all of your chosen packages in the
+    <varname>load-path</varname>.
    </para>
 
    <para>
@@ -183,17 +234,23 @@ in
 <prompt>$ </prompt>nix-build emacs.nix
 <prompt>$ </prompt>./result/bin/emacs -q
 </screen>
-    and then typing <literal>M-x package-initialize</literal>. Check that you can use all the packages you want in this Emacs instance. For example, try switching to the zerodark theme through <literal>M-x load-theme &lt;RET&gt; zerodark &lt;RET&gt; y</literal>.
+    and then typing <literal>M-x package-initialize</literal>. Check that you
+    can use all the packages you want in this Emacs instance. For example, try
+    switching to the zerodark theme through <literal>M-x load-theme &lt;RET&gt;
+    zerodark &lt;RET&gt; y</literal>.
    </para>
 
    <tip>
     <para>
-     A few popular extensions worth checking out are: auctex, company, edit-server, flycheck, helm, iedit, magit, multiple-cursors, projectile, and yasnippet.
+     A few popular extensions worth checking out are: auctex, company,
+     edit-server, flycheck, helm, iedit, magit, multiple-cursors, projectile,
+     and yasnippet.
     </para>
    </tip>
 
    <para>
-    The list of available packages in the various ELPA repositories can be seen with the following commands:
+    The list of available packages in the various ELPA repositories can be seen
+    with the following commands:
     <example xml:id="module-services-emacs-querying-packages">
      <title>Querying Emacs packages</title>
 <programlisting><![CDATA[
@@ -206,7 +263,10 @@ nix-env -f "<nixpkgs>" -qaP -A emacsPackages.orgPackages
    </para>
 
    <para>
-    If you are on NixOS, you can install this particular Emacs for all users by adding it to the list of system packages (see <xref linkend="sec-declarative-package-mgmt" />). Simply modify your file <filename>configuration.nix</filename> to make it contain:
+    If you are on NixOS, you can install this particular Emacs for all users by
+    adding it to the list of system packages (see
+    <xref linkend="sec-declarative-package-mgmt" />). Simply modify your file
+    <filename>configuration.nix</filename> to make it contain:
     <example xml:id="module-services-emacs-configuration-nix">
      <title>Custom Emacs in <filename>configuration.nix</filename></title>
 <programlisting><![CDATA[
@@ -221,7 +281,9 @@ nix-env -f "<nixpkgs>" -qaP -A emacsPackages.orgPackages
    </para>
 
    <para>
-    In this case, the next <command>nixos-rebuild switch</command> will take care of adding your <command>emacs</command> to the <varname>PATH</varname> environment variable (see <xref linkend="sec-changing-config" />).
+    In this case, the next <command>nixos-rebuild switch</command> will take
+    care of adding your <command>emacs</command> to the <varname>PATH</varname>
+    environment variable (see <xref linkend="sec-changing-config" />).
    </para>
 
 <!-- fixme: i think the following is better done with config.nix
@@ -229,7 +291,11 @@ https://nixos.org/nixpkgs/manual/#sec-modify-via-packageOverrides
 -->
 
    <para>
-    If you are not on NixOS or want to install this particular Emacs only for yourself, you can do so by adding it to your <filename>~/.config/nixpkgs/config.nix</filename> (see <link xlink:href="http://nixos.org/nixpkgs/manual/#sec-modify-via-packageOverrides">Nixpkgs manual</link>):
+    If you are not on NixOS or want to install this particular Emacs only for
+    yourself, you can do so by adding it to your
+    <filename>~/.config/nixpkgs/config.nix</filename> (see
+    <link xlink:href="http://nixos.org/nixpkgs/manual/#sec-modify-via-packageOverrides">Nixpkgs
+    manual</link>):
     <example xml:id="module-services-emacs-config-nix">
      <title>Custom Emacs in <filename>~/.config/nixpkgs/config.nix</filename></title>
 <programlisting><![CDATA[
@@ -243,7 +309,9 @@ https://nixos.org/nixpkgs/manual/#sec-modify-via-packageOverrides
    </para>
 
    <para>
-    In this case, the next <literal>nix-env -f '&lt;nixpkgs&gt;' -iA myemacs</literal> will take care of adding your emacs to the <varname>PATH</varname> environment variable.
+    In this case, the next <literal>nix-env -f '&lt;nixpkgs&gt;' -iA
+    myemacs</literal> will take care of adding your emacs to the
+    <varname>PATH</varname> environment variable.
    </para>
   </section>
 
@@ -251,7 +319,12 @@ https://nixos.org/nixpkgs/manual/#sec-modify-via-packageOverrides
    <title>Advanced Emacs Configuration</title>
 
    <para>
-    If you want, you can tweak the Emacs package itself from your <filename>emacs.nix</filename>. For example, if you want to have a GTK 3-based Emacs instead of the default GTK 2-based binary and remove the automatically generated <filename>emacs.desktop</filename> (useful is you only use <command>emacsclient</command>), you can change your file <filename>emacs.nix</filename> in this way:
+    If you want, you can tweak the Emacs package itself from your
+    <filename>emacs.nix</filename>. For example, if you want to have a
+    GTK 3-based Emacs instead of the default GTK 2-based binary and remove the
+    automatically generated <filename>emacs.desktop</filename> (useful is you
+    only use <command>emacsclient</command>), you can change your file
+    <filename>emacs.nix</filename> in this way:
    </para>
 
    <example xml:id="ex-emacsGtk3Nix">
@@ -275,7 +348,8 @@ in [...]
    </example>
 
    <para>
-    After building this file as shown in <xref linkend="ex-emacsNix" />, you will get an GTK 3-based Emacs binary pre-loaded with your favorite packages.
+    After building this file as shown in <xref linkend="ex-emacsNix" />, you
+    will get an GTK 3-based Emacs binary pre-loaded with your favorite packages.
    </para>
   </section>
  </section>
@@ -283,18 +357,23 @@ in [...]
   <title>Running Emacs as a Service</title>
 
   <para>
-   <productname>NixOS</productname> provides an optional <command>systemd</command> service which launches <link xlink:href="https://www.gnu.org/software/emacs/manual/html_node/emacs/Emacs-Server.html"> Emacs daemon </link> with the user's login session.
+   <productname>NixOS</productname> provides an optional
+   <command>systemd</command> service which launches
+   <link xlink:href="https://www.gnu.org/software/emacs/manual/html_node/emacs/Emacs-Server.html">
+   Emacs daemon </link> with the user's login session.
   </para>
 
   <para>
-   <emphasis>Source:</emphasis> <filename>modules/services/editors/emacs.nix</filename>
+   <emphasis>Source:</emphasis>
+   <filename>modules/services/editors/emacs.nix</filename>
   </para>
 
   <section xml:id="module-services-emacs-enabling">
    <title>Enabling the Service</title>
 
    <para>
-    To install and enable the <command>systemd</command> user service for Emacs daemon, add the following to your <filename>configuration.nix</filename>:
+    To install and enable the <command>systemd</command> user service for Emacs
+    daemon, add the following to your <filename>configuration.nix</filename>:
 <programlisting>
 <xref linkend="opt-services.emacs.enable"/> = true;
 <xref linkend="opt-services.emacs.package"/> = import /home/cassou/.emacs.d { pkgs = pkgs; };
@@ -302,11 +381,16 @@ in [...]
    </para>
 
    <para>
-    The <varname>services.emacs.package</varname> option allows a custom derivation to be used, for example, one created by <function>emacsWithPackages</function>.
+    The <varname>services.emacs.package</varname> option allows a custom
+    derivation to be used, for example, one created by
+    <function>emacsWithPackages</function>.
    </para>
 
    <para>
-    Ensure that the Emacs server is enabled for your user's Emacs configuration, either by customizing the <varname>server-mode</varname> variable, or by adding <literal>(server-start)</literal> to <filename>~/.emacs.d/init.el</filename>.
+    Ensure that the Emacs server is enabled for your user's Emacs
+    configuration, either by customizing the <varname>server-mode</varname>
+    variable, or by adding <literal>(server-start)</literal> to
+    <filename>~/.emacs.d/init.el</filename>.
    </para>
 
    <para>
@@ -324,7 +408,9 @@ in [...]
    <title>Starting the client</title>
 
    <para>
-    Ensure that the emacs server is enabled, either by customizing the <varname>server-mode</varname> variable, or by adding <literal>(server-start)</literal> to <filename>~/.emacs</filename>.
+    Ensure that the emacs server is enabled, either by customizing the
+    <varname>server-mode</varname> variable, or by adding
+    <literal>(server-start)</literal> to <filename>~/.emacs</filename>.
    </para>
 
    <para>
@@ -343,15 +429,23 @@ emacsclient --create-frame --tty  # opens a new frame on the current terminal
 <!--<title><command>emacsclient</command> as the Default Editor</title>-->
 
    <para>
-    If <xref linkend="opt-services.emacs.defaultEditor"/> is <literal>true</literal>, the <varname>EDITOR</varname> variable will be set to a wrapper script which launches <command>emacsclient</command>.
+    If <xref linkend="opt-services.emacs.defaultEditor"/> is
+    <literal>true</literal>, the <varname>EDITOR</varname> variable will be set
+    to a wrapper script which launches <command>emacsclient</command>.
    </para>
 
    <para>
-    Any setting of <varname>EDITOR</varname> in the shell config files will override <varname>services.emacs.defaultEditor</varname>. To make sure <varname>EDITOR</varname> refers to the Emacs wrapper script, remove any existing <varname>EDITOR</varname> assignment from <filename>.profile</filename>, <filename>.bashrc</filename>, <filename>.zshenv</filename> or any other shell config file.
+    Any setting of <varname>EDITOR</varname> in the shell config files will
+    override <varname>services.emacs.defaultEditor</varname>. To make sure
+    <varname>EDITOR</varname> refers to the Emacs wrapper script, remove any
+    existing <varname>EDITOR</varname> assignment from
+    <filename>.profile</filename>, <filename>.bashrc</filename>,
+    <filename>.zshenv</filename> or any other shell config file.
    </para>
 
    <para>
-    If you have formed certain bad habits when editing files, these can be corrected with a shell alias to the wrapper script:
+    If you have formed certain bad habits when editing files, these can be
+    corrected with a shell alias to the wrapper script:
 <programlisting>alias vi=$EDITOR</programlisting>
    </para>
   </section>
@@ -360,7 +454,10 @@ emacsclient --create-frame --tty  # opens a new frame on the current terminal
    <title>Per-User Enabling of the Service</title>
 
    <para>
-    In general, <command>systemd</command> user services are globally enabled by symlinks in <filename>/etc/systemd/user</filename>. In the case where Emacs daemon is not wanted for all users, it is possible to install the service but not globally enable it:
+    In general, <command>systemd</command> user services are globally enabled
+    by symlinks in <filename>/etc/systemd/user</filename>. In the case where
+    Emacs daemon is not wanted for all users, it is possible to install the
+    service but not globally enable it:
 <programlisting>
 <xref linkend="opt-services.emacs.enable"/> = false;
 <xref linkend="opt-services.emacs.install"/> = true;
@@ -368,9 +465,11 @@ emacsclient --create-frame --tty  # opens a new frame on the current terminal
    </para>
 
    <para>
-    To enable the <command>systemd</command> user service for just the currently logged in user, run:
+    To enable the <command>systemd</command> user service for just the
+    currently logged in user, run:
 <programlisting>systemctl --user enable emacs</programlisting>
-    This will add the symlink <filename>~/.config/systemd/user/emacs.service</filename>.
+    This will add the symlink
+    <filename>~/.config/systemd/user/emacs.service</filename>.
    </para>
   </section>
  </section>
@@ -378,7 +477,8 @@ emacsclient --create-frame --tty  # opens a new frame on the current terminal
   <title>Configuring Emacs</title>
 
   <para>
-   The Emacs init file should be changed to load the extension packages at startup:
+   The Emacs init file should be changed to load the extension packages at
+   startup:
    <example xml:id="module-services-emacs-package-initialisation">
     <title>Package initialization in <filename>.emacs</filename></title>
 <programlisting><![CDATA[
@@ -394,7 +494,10 @@ emacsclient --create-frame --tty  # opens a new frame on the current terminal
   </para>
 
   <para>
-   After the declarative emacs package configuration has been tested, previously downloaded packages can be cleaned up by removing <filename>~/.emacs.d/elpa</filename> (do make a backup first, in case you forgot a package).
+   After the declarative emacs package configuration has been tested,
+   previously downloaded packages can be cleaned up by removing
+   <filename>~/.emacs.d/elpa</filename> (do make a backup first, in case you
+   forgot a package).
   </para>
 
 <!--
@@ -406,7 +509,9 @@ emacsclient --create-frame --tty  # opens a new frame on the current terminal
    <title>A Major Mode for Nix Expressions</title>
 
    <para>
-    Of interest may be <varname>melpaPackages.nix-mode</varname>, which provides syntax highlighting for the Nix language. This is particularly convenient if you regularly edit Nix files.
+    Of interest may be <varname>melpaPackages.nix-mode</varname>, which
+    provides syntax highlighting for the Nix language. This is particularly
+    convenient if you regularly edit Nix files.
    </para>
   </section>
 
@@ -414,7 +519,9 @@ emacsclient --create-frame --tty  # opens a new frame on the current terminal
    <title>Accessing man pages</title>
 
    <para>
-    You can use <function>woman</function> to get completion of all available man pages. For example, type <literal>M-x woman &lt;RET&gt; nixos-rebuild &lt;RET&gt;.</literal>
+    You can use <function>woman</function> to get completion of all available
+    man pages. For example, type <literal>M-x woman &lt;RET&gt; nixos-rebuild
+    &lt;RET&gt;.</literal>
    </para>
   </section>
 
@@ -422,17 +529,29 @@ emacsclient --create-frame --tty  # opens a new frame on the current terminal
    <title>Editing DocBook 5 XML Documents</title>
 
    <para>
-    Emacs includes <link
-      xlink:href="https://www.gnu.org/software/emacs/manual/html_node/nxml-mode/Introduction.html">nXML</link>, a major-mode for validating and editing XML documents. When editing DocBook 5.0 documents, such as <link linkend="book-nixos-manual">this one</link>, nXML needs to be configured with the relevant schema, which is not included.
+    Emacs includes
+    <link
+      xlink:href="https://www.gnu.org/software/emacs/manual/html_node/nxml-mode/Introduction.html">nXML</link>,
+    a major-mode for validating and editing XML documents. When editing DocBook
+    5.0 documents, such as <link linkend="book-nixos-manual">this one</link>,
+    nXML needs to be configured with the relevant schema, which is not
+    included.
    </para>
 
    <para>
-    To install the DocBook 5.0 schemas, either add <varname>pkgs.docbook5</varname> to <xref linkend="opt-environment.systemPackages"/> (<link
-      linkend="sec-declarative-package-mgmt">NixOS</link>), or run <literal>nix-env -f '&lt;nixpkgs&gt;' -iA docbook5</literal> (<link linkend="sec-ad-hoc-packages">Nix</link>).
+    To install the DocBook 5.0 schemas, either add
+    <varname>pkgs.docbook5</varname> to
+    <xref linkend="opt-environment.systemPackages"/>
+    (<link
+      linkend="sec-declarative-package-mgmt">NixOS</link>), or run
+    <literal>nix-env -f '&lt;nixpkgs&gt;' -iA docbook5</literal>
+    (<link linkend="sec-ad-hoc-packages">Nix</link>).
    </para>
 
    <para>
-    Then customize the variable <varname>rng-schema-locating-files</varname> to include <filename>~/.emacs.d/schemas.xml</filename> and put the following text into that file:
+    Then customize the variable <varname>rng-schema-locating-files</varname> to
+    include <filename>~/.emacs.d/schemas.xml</filename> and put the following
+    text into that file:
     <example xml:id="ex-emacs-docbook-xml">
      <title>nXML Schema Configuration (<filename>~/.emacs.d/schemas.xml</filename>)</title>
 <programlisting language="xml"><![CDATA[
diff --git a/nixos/modules/services/hardware/trezord.xml b/nixos/modules/services/hardware/trezord.xml
index 4af6e1ad7cc..972d409d9d0 100644
--- a/nixos/modules/services/hardware/trezord.xml
+++ b/nixos/modules/services/hardware/trezord.xml
@@ -5,10 +5,16 @@
          xml:id="trezor">
  <title>Trezor</title>
  <para>
-  Trezor is an open-source cryptocurrency hardware wallet and security token allowing secure storage of private keys.
+  Trezor is an open-source cryptocurrency hardware wallet and security token
+  allowing secure storage of private keys.
  </para>
  <para>
-  It offers advanced features such U2F two-factor authorization, SSH login through <link xlink:href="https://wiki.trezor.io/Apps:SSH_agent">Trezor SSH agent</link>, <link xlink:href="https://wiki.trezor.io/GPG">GPG</link> and a <link xlink:href="https://wiki.trezor.io/Trezor_Password_Manager">password manager</link>. For more information, guides and documentation, see <link xlink:href="https://wiki.trezor.io"/>.
+  It offers advanced features such U2F two-factor authorization, SSH login
+  through
+  <link xlink:href="https://wiki.trezor.io/Apps:SSH_agent">Trezor SSH agent</link>,
+  <link xlink:href="https://wiki.trezor.io/GPG">GPG</link> and a
+  <link xlink:href="https://wiki.trezor.io/Trezor_Password_Manager">password manager</link>.
+  For more information, guides and documentation, see <link xlink:href="https://wiki.trezor.io"/>.
  </para>
  <para>
   To enable Trezor support, add the following to your <filename>configuration.nix</filename>:
diff --git a/nixos/modules/services/misc/gitlab.xml b/nixos/modules/services/misc/gitlab.xml
index a59f8919a47..b6171a9a194 100644
--- a/nixos/modules/services/misc/gitlab.xml
+++ b/nixos/modules/services/misc/gitlab.xml
@@ -11,11 +11,14 @@
   <title>Prerequisites</title>
 
   <para>
-   The gitlab service exposes only an Unix socket at <literal>/run/gitlab/gitlab-workhorse.socket</literal>. You need to configure a webserver to proxy HTTP requests to the socket.
+   The gitlab service exposes only an Unix socket at
+   <literal>/run/gitlab/gitlab-workhorse.socket</literal>. You need to
+   configure a webserver to proxy HTTP requests to the socket.
   </para>
 
   <para>
-   For instance, the following configuration could be used to use nginx as frontend proxy:
+   For instance, the following configuration could be used to use nginx as
+   frontend proxy:
 <programlisting>
 <link linkend="opt-services.nginx.enable">services.nginx</link> = {
   <link linkend="opt-services.nginx.enable">enable</link> = true;
@@ -36,11 +39,14 @@
   <title>Configuring</title>
 
   <para>
-   Gitlab depends on both PostgreSQL and Redis and will automatically enable both services. In the case of PostgreSQL, a database and a role will be created.
+   Gitlab depends on both PostgreSQL and Redis and will automatically enable
+   both services. In the case of PostgreSQL, a database and a role will be
+   created.
   </para>
 
   <para>
-   The default state dir is <literal>/var/gitlab/state</literal>. This is where all data like the repositories and uploads will be stored.
+   The default state dir is <literal>/var/gitlab/state</literal>. This is where
+   all data like the repositories and uploads will be stored.
   </para>
 
   <para>
@@ -79,19 +85,31 @@ services.gitlab = {
   </para>
 
   <para>
-   If you're setting up a new Gitlab instance, generate new secrets. You for instance use <literal>tr -dc A-Za-z0-9 &lt; /dev/urandom | head -c 128 &gt; /var/keys/gitlab/db</literal> to generate a new db secret. Make sure the files can be read by, and only by, the user specified by <link
-   linkend="opt-services.gitlab.user">services.gitlab.user</link>. Gitlab encrypts sensitive data stored in the database. If you're restoring an existing Gitlab instance, you must specify the secrets secret from <literal>config/secrets.yml</literal> located in your Gitlab state folder.
+   If you're setting up a new Gitlab instance, generate new
+   secrets. You for instance use <literal>tr -dc A-Za-z0-9 &lt;
+   /dev/urandom | head -c 128 &gt; /var/keys/gitlab/db</literal> to
+   generate a new db secret. Make sure the files can be read by, and
+   only by, the user specified by <link
+   linkend="opt-services.gitlab.user">services.gitlab.user</link>. Gitlab
+   encrypts sensitive data stored in the database. If you're restoring
+   an existing Gitlab instance, you must specify the secrets secret
+   from <literal>config/secrets.yml</literal> located in your Gitlab
+   state folder.
   </para>
 
   <para>
-   Refer to <xref linkend="ch-options" /> for all available configuration options for the <link linkend="opt-services.gitlab.enable">services.gitlab</link> module.
+   Refer to <xref linkend="ch-options" /> for all available configuration
+   options for the
+   <link linkend="opt-services.gitlab.enable">services.gitlab</link> module.
   </para>
  </section>
  <section xml:id="module-services-gitlab-maintenance">
   <title>Maintenance</title>
 
   <para>
-   You can run Gitlab's rake tasks with <literal>gitlab-rake</literal> which will be available on the system when gitlab is enabled. You will have to run the command as the user that you configured to run gitlab with.
+   You can run Gitlab's rake tasks with <literal>gitlab-rake</literal> which
+   will be available on the system when gitlab is enabled. You will have to run
+   the command as the user that you configured to run gitlab with.
   </para>
 
   <para>
diff --git a/nixos/modules/services/misc/taskserver/doc.xml b/nixos/modules/services/misc/taskserver/doc.xml
index 902ed14940e..5656bb85b37 100644
--- a/nixos/modules/services/misc/taskserver/doc.xml
+++ b/nixos/modules/services/misc/taskserver/doc.xml
@@ -4,58 +4,87 @@
     xml:id="module-taskserver">
  <title>Taskserver</title>
  <para>
-  Taskserver is the server component of <link xlink:href="https://taskwarrior.org/">Taskwarrior</link>, a free and open source todo list application.
+  Taskserver is the server component of
+  <link xlink:href="https://taskwarrior.org/">Taskwarrior</link>, a free and
+  open source todo list application.
  </para>
  <para>
-  <emphasis>Upstream documentation:</emphasis> <link xlink:href="https://taskwarrior.org/docs/#taskd"/>
+  <emphasis>Upstream documentation:</emphasis>
+  <link xlink:href="https://taskwarrior.org/docs/#taskd"/>
  </para>
  <section xml:id="module-services-taskserver-configuration">
   <title>Configuration</title>
 
   <para>
-   Taskserver does all of its authentication via TLS using client certificates, so you either need to roll your own CA or purchase a certificate from a known CA, which allows creation of client certificates. These certificates are usually advertised as <quote>server certificates</quote>.
+   Taskserver does all of its authentication via TLS using client certificates,
+   so you either need to roll your own CA or purchase a certificate from a
+   known CA, which allows creation of client certificates. These certificates
+   are usually advertised as <quote>server certificates</quote>.
   </para>
 
   <para>
-   So in order to make it easier to handle your own CA, there is a helper tool called <command>nixos-taskserver</command> which manages the custom CA along with Taskserver organisations, users and groups.
+   So in order to make it easier to handle your own CA, there is a helper tool
+   called <command>nixos-taskserver</command> which manages the custom CA along
+   with Taskserver organisations, users and groups.
   </para>
 
   <para>
-   While the client certificates in Taskserver only authenticate whether a user is allowed to connect, every user has its own UUID which identifies it as an entity.
+   While the client certificates in Taskserver only authenticate whether a user
+   is allowed to connect, every user has its own UUID which identifies it as an
+   entity.
   </para>
 
   <para>
-   With <command>nixos-taskserver</command> the client certificate is created along with the UUID of the user, so it handles all of the credentials needed in order to setup the Taskwarrior client to work with a Taskserver.
+   With <command>nixos-taskserver</command> the client certificate is created
+   along with the UUID of the user, so it handles all of the credentials needed
+   in order to setup the Taskwarrior client to work with a Taskserver.
   </para>
  </section>
  <section xml:id="module-services-taskserver-nixos-taskserver-tool">
   <title>The nixos-taskserver tool</title>
 
   <para>
-   Because Taskserver by default only provides scripts to setup users imperatively, the <command>nixos-taskserver</command> tool is used for addition and deletion of organisations along with users and groups defined by <xref linkend="opt-services.taskserver.organisations"/> and as well for imperative set up.
+   Because Taskserver by default only provides scripts to setup users
+   imperatively, the <command>nixos-taskserver</command> tool is used for
+   addition and deletion of organisations along with users and groups defined
+   by <xref linkend="opt-services.taskserver.organisations"/> and as well for
+   imperative set up.
   </para>
 
   <para>
-   The tool is designed to not interfere if the command is used to manually set up some organisations, users or groups.
+   The tool is designed to not interfere if the command is used to manually set
+   up some organisations, users or groups.
   </para>
 
   <para>
-   For example if you add a new organisation using <command>nixos-taskserver org add foo</command>, the organisation is not modified and deleted no matter what you define in <option>services.taskserver.organisations</option>, even if you're adding the same organisation in that option.
+   For example if you add a new organisation using <command>nixos-taskserver
+   org add foo</command>, the organisation is not modified and deleted no
+   matter what you define in
+   <option>services.taskserver.organisations</option>, even if you're adding
+   the same organisation in that option.
   </para>
 
   <para>
-   The tool is modelled to imitate the official <command>taskd</command> command, documentation for each subcommand can be shown by using the <option>--help</option> switch.
+   The tool is modelled to imitate the official <command>taskd</command>
+   command, documentation for each subcommand can be shown by using the
+   <option>--help</option> switch.
   </para>
  </section>
  <section xml:id="module-services-taskserver-declarative-ca-management">
   <title>Declarative/automatic CA management</title>
 
   <para>
-   Everything is done according to what you specify in the module options, however in order to set up a Taskwarrior client for synchronisation with a Taskserver instance, you have to transfer the keys and certificates to the client machine.
+   Everything is done according to what you specify in the module options,
+   however in order to set up a Taskwarrior client for synchronisation with a
+   Taskserver instance, you have to transfer the keys and certificates to the
+   client machine.
   </para>
 
   <para>
-   This is done using <command>nixos-taskserver user export $orgname $username</command> which is printing a shell script fragment to stdout which can either be used verbatim or adjusted to import the user on the client machine.
+   This is done using <command>nixos-taskserver user export $orgname
+   $username</command> which is printing a shell script fragment to stdout
+   which can either be used verbatim or adjusted to import the user on the
+   client machine.
   </para>
 
   <para>
@@ -68,30 +97,39 @@
   <link linkend="opt-services.taskserver.organisations._name_.users">services.taskserver.organisations.my-company.users</link> = [ "alice" ];
 }
 </screen>
-   This creates an organisation called <literal>my-company</literal> with the user <literal>alice</literal>.
+   This creates an organisation called <literal>my-company</literal> with the
+   user <literal>alice</literal>.
   </para>
 
   <para>
-   Now in order to import the <literal>alice</literal> user to another machine <literal>alicebox</literal>, all we need to do is something like this:
+   Now in order to import the <literal>alice</literal> user to another machine
+   <literal>alicebox</literal>, all we need to do is something like this:
 <screen>
 <prompt>$ </prompt>ssh server nixos-taskserver user export my-company alice | sh
 </screen>
-   Of course, if no SSH daemon is available on the server you can also copy &amp; paste it directly into a shell.
+   Of course, if no SSH daemon is available on the server you can also copy
+   &amp; paste it directly into a shell.
   </para>
 
   <para>
-   After this step the user should be set up and you can start synchronising your tasks for the first time with <command>task sync init</command> on <literal>alicebox</literal>.
+   After this step the user should be set up and you can start synchronising
+   your tasks for the first time with <command>task sync init</command> on
+   <literal>alicebox</literal>.
   </para>
 
   <para>
-   Subsequent synchronisation requests merely require the command <command>task sync</command> after that stage.
+   Subsequent synchronisation requests merely require the command <command>task
+   sync</command> after that stage.
   </para>
  </section>
  <section xml:id="module-services-taskserver-manual-ca-management">
   <title>Manual CA management</title>
 
   <para>
-   If you set any options within <link linkend="opt-services.taskserver.pki.manual.ca.cert">service.taskserver.pki.manual</link>.*, <command>nixos-taskserver</command> won't issue certificates, but you can still use it for adding or removing user accounts.
+   If you set any options within
+   <link linkend="opt-services.taskserver.pki.manual.ca.cert">service.taskserver.pki.manual</link>.*,
+   <command>nixos-taskserver</command> won't issue certificates, but you can
+   still use it for adding or removing user accounts.
   </para>
  </section>
 </chapter>
diff --git a/nixos/modules/services/misc/weechat.xml b/nixos/modules/services/misc/weechat.xml
index 34bfffe15d8..7255edfb9da 100644
--- a/nixos/modules/services/misc/weechat.xml
+++ b/nixos/modules/services/misc/weechat.xml
@@ -5,13 +5,18 @@
          xml:id="module-services-weechat">
  <title>WeeChat</title>
  <para>
-  <link xlink:href="https://weechat.org/">WeeChat</link> is a fast and extensible IRC client.
+  <link xlink:href="https://weechat.org/">WeeChat</link> is a fast and
+  extensible IRC client.
  </para>
  <section xml:id="module-services-weechat-basic-usage">
   <title>Basic Usage</title>
 
   <para>
-   By default, the module creates a <literal><link xlink:href="https://www.freedesktop.org/wiki/Software/systemd/">systemd</link></literal> unit which runs the chat client in a detached <literal><link xlink:href="https://www.gnu.org/software/screen/">screen</link></literal> session.
+   By default, the module creates a
+   <literal><link xlink:href="https://www.freedesktop.org/wiki/Software/systemd/">systemd</link></literal>
+   unit which runs the chat client in a detached
+   <literal><link xlink:href="https://www.gnu.org/software/screen/">screen</link></literal>
+   session.
   </para>
 
   <para>
@@ -26,14 +31,19 @@
   </para>
 
   <para>
-   The service is managed by a dedicated user named <literal>weechat</literal> in the state directory <literal>/var/lib/weechat</literal>.
+   The service is managed by a dedicated user named <literal>weechat</literal>
+   in the state directory <literal>/var/lib/weechat</literal>.
   </para>
  </section>
  <section xml:id="module-services-weechat-reattach">
   <title>Re-attaching to WeeChat</title>
 
   <para>
-   WeeChat runs in a screen session owned by a dedicated user. To explicitly allow your another user to attach to this session, the <literal>screenrc</literal> needs to be tweaked by adding <link xlink:href="https://www.gnu.org/software/screen/manual/html_node/Multiuser.html#Multiuser">multiuser</link> support:
+   WeeChat runs in a screen session owned by a dedicated user. To explicitly
+   allow your another user to attach to this session, the
+   <literal>screenrc</literal> needs to be tweaked by adding
+   <link xlink:href="https://www.gnu.org/software/screen/manual/html_node/Multiuser.html#Multiuser">multiuser</link>
+   support:
 <programlisting>
 {
   <link linkend="opt-programs.screen.screenrc">programs.screen.screenrc</link> = ''
@@ -49,7 +59,8 @@ screen -x weechat/weechat-screen
   </para>
 
   <para>
-   <emphasis>The session name can be changed using <link linkend="opt-services.weechat.sessionName">services.weechat.sessionName.</link></emphasis>
+   <emphasis>The session name can be changed using
+   <link linkend="opt-services.weechat.sessionName">services.weechat.sessionName.</link></emphasis>
   </para>
  </section>
 </chapter>
diff --git a/nixos/modules/services/monitoring/prometheus/exporters.xml b/nixos/modules/services/monitoring/prometheus/exporters.xml
index 814e7365584..c2d4b05996a 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters.xml
+++ b/nixos/modules/services/monitoring/prometheus/exporters.xml
@@ -5,13 +5,17 @@
          xml:id="module-services-prometheus-exporters">
  <title>Prometheus exporters</title>
  <para>
-  Prometheus exporters provide metrics for the <link xlink:href="https://prometheus.io">prometheus monitoring system</link>.
+  Prometheus exporters provide metrics for the
+  <link xlink:href="https://prometheus.io">prometheus monitoring system</link>.
  </para>
  <section xml:id="module-services-prometheus-exporters-configuration">
   <title>Configuration</title>
 
   <para>
-   One of the most common exporters is the <link xlink:href="https://github.com/prometheus/node_exporter">node exporter</link>, it provides hardware and OS metrics from the host it's running on. The exporter could be configured as follows:
+   One of the most common exporters is the
+   <link xlink:href="https://github.com/prometheus/node_exporter">node
+   exporter</link>, it provides hardware and OS metrics from the host it's
+   running on. The exporter could be configured as follows:
 <programlisting>
   services.prometheus.exporters.node = {
     enable = true;
@@ -26,20 +30,34 @@
     firewallFilter = "-i br0 -p tcp -m tcp --dport 9100";
   };
 </programlisting>
-   It should now serve all metrics from the collectors that are explicitly enabled and the ones that are <link xlink:href="https://github.com/prometheus/node_exporter#enabled-by-default">enabled by default</link>, via http under <literal>/metrics</literal>. In this example the firewall should just allow incoming connections to the exporter's port on the bridge interface <literal>br0</literal> (this would have to be configured seperately of course). For more information about configuration see <literal>man configuration.nix</literal> or search through the <link xlink:href="https://nixos.org/nixos/options.html#prometheus.exporters">available options</link>.
+   It should now serve all metrics from the collectors that are explicitly
+   enabled and the ones that are
+   <link xlink:href="https://github.com/prometheus/node_exporter#enabled-by-default">enabled
+   by default</link>, via http under <literal>/metrics</literal>. In this
+   example the firewall should just allow incoming connections to the
+   exporter's port on the bridge interface <literal>br0</literal> (this would
+   have to be configured seperately of course). For more information about
+   configuration see <literal>man configuration.nix</literal> or search through
+   the
+   <link xlink:href="https://nixos.org/nixos/options.html#prometheus.exporters">available
+   options</link>.
   </para>
  </section>
  <section xml:id="module-services-prometheus-exporters-new-exporter">
   <title>Adding a new exporter</title>
 
   <para>
-   To add a new exporter, it has to be packaged first (see <literal>nixpkgs/pkgs/servers/monitoring/prometheus/</literal> for examples), then a module can be added. The postfix exporter is used in this example:
+   To add a new exporter, it has to be packaged first (see
+   <literal>nixpkgs/pkgs/servers/monitoring/prometheus/</literal> for
+   examples), then a module can be added. The postfix exporter is used in this
+   example:
   </para>
 
   <itemizedlist>
    <listitem>
     <para>
-     Some default options for all exporters are provided by <literal>nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix</literal>:
+     Some default options for all exporters are provided by
+     <literal>nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix</literal>:
     </para>
    </listitem>
    <listitem override='none'>
@@ -88,7 +106,11 @@
    </listitem>
    <listitem>
     <para>
-     As there is already a package available, the module can now be added. This is accomplished by adding a new file to the <literal>nixos/modules/services/monitoring/prometheus/exporters/</literal> directory, which will be called postfix.nix and contains all exporter specific options and configuration:
+     As there is already a package available, the module can now be added. This
+     is accomplished by adding a new file to the
+     <literal>nixos/modules/services/monitoring/prometheus/exporters/</literal>
+     directory, which will be called postfix.nix and contains all exporter
+     specific options and configuration:
 <programlisting>
 # nixpgs/nixos/modules/services/prometheus/exporters/postfix.nix
 { config, lib, pkgs, options }:
@@ -155,16 +177,21 @@ in
    </listitem>
    <listitem>
     <para>
-     This should already be enough for the postfix exporter. Additionally one could now add assertions and conditional default values. This can be done in the 'meta-module' that combines all exporter definitions and generates the submodules: <literal>nixpkgs/nixos/modules/services/prometheus/exporters.nix</literal>
+     This should already be enough for the postfix exporter. Additionally one
+     could now add assertions and conditional default values. This can be done
+     in the 'meta-module' that combines all exporter definitions and generates
+     the submodules:
+     <literal>nixpkgs/nixos/modules/services/prometheus/exporters.nix</literal>
     </para>
    </listitem>
   </itemizedlist>
  </section>
  <section xml:id="module-services-prometheus-exporters-update-exporter-module">
   <title>Updating an exporter module</title>
-
-  <para>
-   Should an exporter option change at some point, it is possible to add information about the change to the exporter definition similar to <literal>nixpkgs/nixos/modules/rename.nix</literal>:
+   <para>
+     Should an exporter option change at some point, it is possible to add
+     information about the change to the exporter definition similar to
+     <literal>nixpkgs/nixos/modules/rename.nix</literal>:
 <programlisting>
 { config, lib, pkgs, options }:
 
@@ -195,6 +222,6 @@ in
   ];
 }
 </programlisting>
-  </para>
- </section>
+    </para>
+  </section>
 </chapter>
diff --git a/nixos/modules/services/networking/dnscrypt-proxy.xml b/nixos/modules/services/networking/dnscrypt-proxy.xml
index 04e2654d3cc..afc7880392a 100644
--- a/nixos/modules/services/networking/dnscrypt-proxy.xml
+++ b/nixos/modules/services/networking/dnscrypt-proxy.xml
@@ -5,7 +5,11 @@
          xml:id="sec-dnscrypt-proxy">
  <title>DNSCrypt client proxy</title>
  <para>
-  The DNSCrypt client proxy relays DNS queries to a DNSCrypt enabled upstream resolver. The traffic between the client and the upstream resolver is encrypted and authenticated, mitigating the risk of MITM attacks, DNS poisoning attacks, and third-party snooping (assuming the upstream is trustworthy).
+  The DNSCrypt client proxy relays DNS queries to a DNSCrypt enabled upstream
+  resolver. The traffic between the client and the upstream resolver is
+  encrypted and authenticated, mitigating the risk of MITM attacks, DNS
+  poisoning attacks, and third-party snooping (assuming the upstream is
+  trustworthy).
  </para>
  <sect1 xml:id="sec-dnscrypt-proxy-configuration">
   <title>Basic configuration</title>
@@ -18,14 +22,18 @@
   </para>
 
   <para>
-   Enabling the client proxy does not alter the system nameserver; to relay local queries, prepend <literal>127.0.0.1</literal> to <option>networking.nameservers</option>.
+   Enabling the client proxy does not alter the system nameserver; to relay
+   local queries, prepend <literal>127.0.0.1</literal> to
+   <option>networking.nameservers</option>.
   </para>
  </sect1>
  <sect1 xml:id="sec-dnscrypt-proxy-forwarder">
   <title>As a forwarder for another DNS client</title>
 
   <para>
-   To run the DNSCrypt proxy client as a forwarder for another DNS client, change the default proxy listening port to a non-standard value and point the other client to it:
+   To run the DNSCrypt proxy client as a forwarder for another DNS client,
+   change the default proxy listening port to a non-standard value and point
+   the other client to it:
 <programlisting>
 <xref linkend="opt-services.dnscrypt-proxy.localPort"/> = 43;
 </programlisting>
diff --git a/nixos/modules/services/web-apps/matomo-doc.xml b/nixos/modules/services/web-apps/matomo-doc.xml
index 2ab476f892c..8485492c51c 100644
--- a/nixos/modules/services/web-apps/matomo-doc.xml
+++ b/nixos/modules/services/web-apps/matomo-doc.xml
@@ -5,16 +5,21 @@
          xml:id="module-services-matomo">
  <title>Matomo</title>
  <para>
-  Matomo is a real-time web analytics application. This module configures php-fpm as backend for Matomo, optionally configuring an nginx vhost as well.
+  Matomo is a real-time web analytics application. This module configures
+  php-fpm as backend for Matomo, optionally configuring an nginx vhost as well.
  </para>
  <para>
-  An automatic setup is not suported by Matomo, so you need to configure Matomo itself in the browser-based Matomo setup.
+  An automatic setup is not suported by Matomo, so you need to configure Matomo
+  itself in the browser-based Matomo setup.
  </para>
  <section xml:id="module-services-matomo-database-setup">
   <title>Database Setup</title>
 
   <para>
-   You also need to configure a MariaDB or MySQL database and -user for Matomo yourself, and enter those credentials in your browser. You can use passwordless database authentication via the UNIX_SOCKET authentication plugin with the following SQL commands:
+   You also need to configure a MariaDB or MySQL database and -user for Matomo
+   yourself, and enter those credentials in your browser. You can use
+   passwordless database authentication via the UNIX_SOCKET authentication
+   plugin with the following SQL commands:
 <programlisting>
 # For MariaDB
 INSTALL PLUGIN unix_socket SONAME 'auth_socket';
@@ -28,29 +33,51 @@ CREATE DATABASE matomo;
 CREATE USER 'matomo'@'localhost' IDENTIFIED WITH auth_socket;
 GRANT ALL PRIVILEGES ON matomo.* TO 'matomo'@'localhost';
 </programlisting>
-   Then fill in <literal>matomo</literal> as database user and database name, and leave the password field blank. This authentication works by allowing only the <literal>matomo</literal> unix user to authenticate as the <literal>matomo</literal> database user (without needing a password), but no other users. For more information on passwordless login, see <link xlink:href="https://mariadb.com/kb/en/mariadb/unix_socket-authentication-plugin/" />.
+   Then fill in <literal>matomo</literal> as database user and database name,
+   and leave the password field blank. This authentication works by allowing
+   only the <literal>matomo</literal> unix user to authenticate as the
+   <literal>matomo</literal> database user (without needing a password), but no
+   other users. For more information on passwordless login, see
+   <link xlink:href="https://mariadb.com/kb/en/mariadb/unix_socket-authentication-plugin/" />.
   </para>
 
   <para>
-   Of course, you can use password based authentication as well, e.g. when the database is not on the same host.
+   Of course, you can use password based authentication as well, e.g. when the
+   database is not on the same host.
   </para>
  </section>
  <section xml:id="module-services-matomo-archive-processing">
   <title>Archive Processing</title>
 
   <para>
-   This module comes with the systemd service <literal>matomo-archive-processing.service</literal> and a timer that automatically triggers archive processing every hour. This means that you can safely <link xlink:href="https://matomo.org/docs/setup-auto-archiving/#disable-browser-triggers-for-matomo-archiving-and-limit-matomo-reports-to-updating-every-hour"> disable browser triggers for Matomo archiving </link> at <literal>Administration > System > General Settings</literal>.
+   This module comes with the systemd service
+   <literal>matomo-archive-processing.service</literal> and a timer that
+   automatically triggers archive processing every hour. This means that you
+   can safely
+   <link xlink:href="https://matomo.org/docs/setup-auto-archiving/#disable-browser-triggers-for-matomo-archiving-and-limit-matomo-reports-to-updating-every-hour">
+   disable browser triggers for Matomo archiving </link> at
+   <literal>Administration > System > General Settings</literal>.
   </para>
 
   <para>
-   With automatic archive processing, you can now also enable to <link xlink:href="https://matomo.org/docs/privacy/#step-2-delete-old-visitors-logs"> delete old visitor logs </link> at <literal>Administration > System > Privacy</literal>, but make sure that you run <literal>systemctl start matomo-archive-processing.service</literal> at least once without errors if you have already collected data before, so that the reports get archived before the source data gets deleted.
+   With automatic archive processing, you can now also enable to
+   <link xlink:href="https://matomo.org/docs/privacy/#step-2-delete-old-visitors-logs">
+   delete old visitor logs </link> at <literal>Administration > System >
+   Privacy</literal>, but make sure that you run <literal>systemctl start
+   matomo-archive-processing.service</literal> at least once without errors if
+   you have already collected data before, so that the reports get archived
+   before the source data gets deleted.
   </para>
  </section>
  <section xml:id="module-services-matomo-backups">
   <title>Backup</title>
 
   <para>
-   You only need to take backups of your MySQL database and the <filename>/var/lib/matomo/config/config.ini.php</filename> file. Use a user in the <literal>matomo</literal> group or root to access the file. For more information, see <link xlink:href="https://matomo.org/faq/how-to-install/faq_138/" />.
+   You only need to take backups of your MySQL database and the
+   <filename>/var/lib/matomo/config/config.ini.php</filename> file. Use a user
+   in the <literal>matomo</literal> group or root to access the file. For more
+   information, see
+   <link xlink:href="https://matomo.org/faq/how-to-install/faq_138/" />.
   </para>
  </section>
  <section xml:id="module-services-matomo-issues">
@@ -59,12 +86,15 @@ GRANT ALL PRIVILEGES ON matomo.* TO 'matomo'@'localhost';
   <itemizedlist>
    <listitem>
     <para>
-     Matomo's file integrity check will warn you. This is due to the patches necessary for NixOS, you can safely ignore this.
+     Matomo's file integrity check will warn you. This is due to the patches
+     necessary for NixOS, you can safely ignore this.
     </para>
    </listitem>
    <listitem>
     <para>
-     Matomo will warn you that the JavaScript tracker is not writable. This is because it's located in the read-only nix store. You can safely ignore this, unless you need a plugin that needs JavaScript tracker access.
+     Matomo will warn you that the JavaScript tracker is not writable. This is
+     because it's located in the read-only nix store. You can safely ignore
+     this, unless you need a plugin that needs JavaScript tracker access.
     </para>
    </listitem>
   </itemizedlist>
@@ -73,7 +103,11 @@ GRANT ALL PRIVILEGES ON matomo.* TO 'matomo'@'localhost';
   <title>Using other Web Servers than nginx</title>
 
   <para>
-   You can use other web servers by forwarding calls for <filename>index.php</filename> and <filename>piwik.php</filename> to the <literal>/run/phpfpm-matomo.sock</literal> fastcgi unix socket. You can use the nginx configuration in the module code as a reference to what else should be configured.
+   You can use other web servers by forwarding calls for
+   <filename>index.php</filename> and <filename>piwik.php</filename> to the
+   <literal>/run/phpfpm-matomo.sock</literal> fastcgi unix socket. You can use
+   the nginx configuration in the module code as a reference to what else
+   should be configured.
   </para>
  </section>
 </chapter>
diff --git a/nixos/modules/services/web-apps/nextcloud.xml b/nixos/modules/services/web-apps/nextcloud.xml
index 4345c2b9810..d66e0f0c299 100644
--- a/nixos/modules/services/web-apps/nextcloud.xml
+++ b/nixos/modules/services/web-apps/nextcloud.xml
@@ -5,13 +5,21 @@
          xml:id="module-services-nextcloud">
  <title>Nextcloud</title>
  <para>
-  <link xlink:href="https://nextcloud.com/">Nextcloud</link> is an open-source, self-hostable cloud platform. The server setup can be automated using <link linkend="opt-services.nextcloud.enable">services.nextcloud</link>. A desktop client is packaged at <literal>pkgs.nextcloud-client</literal>.
+  <link xlink:href="https://nextcloud.com/">Nextcloud</link> is an open-source,
+  self-hostable cloud platform. The server setup can be automated using
+  <link linkend="opt-services.nextcloud.enable">services.nextcloud</link>. A
+  desktop client is packaged at <literal>pkgs.nextcloud-client</literal>.
  </para>
  <section xml:id="module-services-nextcloud-basic-usage">
   <title>Basic usage</title>
 
   <para>
-   Nextcloud is a PHP-based application which requires an HTTP server (<literal><link linkend="opt-services.nextcloud.enable">services.nextcloud</link></literal> optionally supports <literal><link linkend="opt-services.nginx.enable">services.nginx</link></literal>) and a database (it's recommended to use <literal><link linkend="opt-services.postgresql.enable">services.postgresql</link></literal>).
+   Nextcloud is a PHP-based application which requires an HTTP server
+   (<literal><link linkend="opt-services.nextcloud.enable">services.nextcloud</link></literal>
+   optionally supports
+   <literal><link linkend="opt-services.nginx.enable">services.nginx</link></literal>)
+   and a database (it's recommended to use
+   <literal><link linkend="opt-services.postgresql.enable">services.postgresql</link></literal>).
   </para>
 
   <para>
@@ -53,38 +61,57 @@
   </para>
 
   <para>
-   The options <literal>hostName</literal> and <literal>nginx.enable</literal> are used internally to configure an HTTP server using <literal><link xlink:href="https://php-fpm.org/">PHP-FPM</link></literal> and <literal>nginx</literal>. The <literal>config</literal> attribute set is used by the imperative installer and all values are written to an additional file to ensure that changes can be applied by changing the module's options.
+   The options <literal>hostName</literal> and <literal>nginx.enable</literal>
+   are used internally to configure an HTTP server using
+   <literal><link xlink:href="https://php-fpm.org/">PHP-FPM</link></literal>
+   and <literal>nginx</literal>. The <literal>config</literal> attribute set is
+   used by the imperative installer and all values are written to an additional file
+   to ensure that changes can be applied by changing the module's options.
   </para>
 
   <para>
-   In case the application serves multiple domains (those are checked with <literal><link xlink:href="http://php.net/manual/en/reserved.variables.server.php">$_SERVER['HTTP_HOST']</link></literal>) it's needed to add them to <literal><link linkend="opt-services.nextcloud.config.extraTrustedDomains">services.nextcloud.config.extraTrustedDomains</link></literal>.
+   In case the application serves multiple domains (those are checked with
+   <literal><link xlink:href="http://php.net/manual/en/reserved.variables.server.php">$_SERVER['HTTP_HOST']</link></literal>)
+   it's needed to add them to
+   <literal><link linkend="opt-services.nextcloud.config.extraTrustedDomains">services.nextcloud.config.extraTrustedDomains</link></literal>.
   </para>
 
   <para>
-   Auto updates for Nextcloud apps can be enabled using <literal><link linkend="opt-services.nextcloud.autoUpdateApps.enable">services.nextcloud.autoUpdateApps</link></literal>.
-  </para>
+   Auto updates for Nextcloud apps can be enabled using
+   <literal><link linkend="opt-services.nextcloud.autoUpdateApps.enable">services.nextcloud.autoUpdateApps</link></literal>.
+</para>
+
  </section>
  <section xml:id="module-services-nextcloud-pitfalls-during-upgrade">
   <title>Pitfalls</title>
 
   <para>
-   Unfortunately Nextcloud appears to be very stateful when it comes to managing its own configuration. The config file lives in the home directory of the <literal>nextcloud</literal> user (by default <literal>/var/lib/nextcloud/config/config.php</literal>) and is also used to track several states of the application (e.g. whether installed or not).
+   Unfortunately Nextcloud appears to be very stateful when it comes to
+   managing its own configuration. The config file lives in the home directory
+   of the <literal>nextcloud</literal> user (by default
+   <literal>/var/lib/nextcloud/config/config.php</literal>) and is also used to
+   track several states of the application (e.g. whether installed or not).
   </para>
 
   <para>
-   All configuration parameters are also stored in <literal>/var/lib/nextcloud/config/override.config.php</literal> which is generated by the module and linked from the store to ensure that all values from <literal>config.php</literal> can be modified by the module. However <literal>config.php</literal> manages the application's state and shouldn't be touched manually because of that.
+   All configuration parameters are also stored in
+   <literal>/var/lib/nextcloud/config/override.config.php</literal> which is generated by
+   the module and linked from the store to ensure that all values from <literal>config.php</literal>
+   can be modified by the module.
+   However <literal>config.php</literal> manages the application's state and shouldn't be touched
+   manually because of that.
   </para>
 
   <warning>
-   <para>
-    Don't delete <literal>config.php</literal>! This file tracks the application's state and a deletion can cause unwanted side-effects!
-   </para>
+   <para>Don't delete <literal>config.php</literal>! This file
+   tracks the application's state and a deletion can cause unwanted
+   side-effects!</para>
   </warning>
 
   <warning>
-   <para>
-    Don't rerun <literal>nextcloud-occ maintenance:install</literal>! This command tries to install the application and can cause unwanted side-effects!
-   </para>
+   <para>Don't rerun <literal>nextcloud-occ
+   maintenance:install</literal>! This command tries to install the application
+   and can cause unwanted side-effects!</para>
   </warning>
  </section>
 </chapter>
-- 
GitLab


From 36c772b5f3b79c6831427edb3bc4e61c72316bec Mon Sep 17 00:00:00 2001
From: Serhii Khoma <srghma@gmail.com>
Date: Thu, 19 Sep 2019 20:26:50 +0300
Subject: [PATCH 0584/2254] dropbox: 73.4.118 -> 81.4.195

---
 pkgs/applications/networking/dropbox/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index 9a05a92cfb3..01707f12da2 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -7,7 +7,7 @@ assert lib.elem stdenv.hostPlatform.system platforms;
 # Dropbox client to bootstrap installation.
 # The client is self-updating, so the actual version may be newer.
 let
-  version = "73.4.118";
+  version = "81.4.195";
 
   arch = {
     x86_64-linux = "x86_64";
-- 
GitLab


From 9f508e8ebaf2b88c4766bd299bea18b014a174c0 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sat, 7 Sep 2019 20:47:40 +0300
Subject: [PATCH 0585/2254] cpp-utilities: 4.17.1 -> 5.0.0

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

diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix
index cd16dea56b1..c7f94945570 100644
--- a/pkgs/development/libraries/cpp-utilities/default.nix
+++ b/pkgs/development/libraries/cpp-utilities/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cpp-utilities";
-  version = "4.17.1";
+  version = "5.0.0";
 
   src = fetchFromGitHub {
     owner = "Martchus";
     repo = pname;
     rev = "v${version}";
-    sha256 = "12088cwg3jbqipmbn4843w1cgxi1q6vwx47gy042rkfvbk6azhxl";
+    sha256 = "031kiawmrp40sqgd9g5qd82ljglcm9xvynicsn4n8n4ngfgbnc0m";
   };
 
   nativeBuildInputs = [ cmake ];
-- 
GitLab


From 9552213d07304ad8909af4a8da6a528f8f998349 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 19 Sep 2019 13:19:41 -0500
Subject: [PATCH 0586/2254] llvmPackages_9: copy llvmPackages_8

---
 .../development/compilers/llvm/9/bintools.nix |  19 +
 .../compilers/llvm/9/clang/clang-xpc.patch    |  41 ++
 .../llvm/9/clang/compiler-rt-baremetal.patch  |  53 ++
 .../compilers/llvm/9/clang/default.nix        | 126 ++++
 .../compilers/llvm/9/clang/purity.patch       |  30 +
 .../compilers/llvm/9/clang/static-pie.patch   | 157 +++++
 .../compilers/llvm/9/clang/unwindlib.patch    | 372 +++++++++++
 .../llvm/9/compiler-rt-codesign.patch         |  33 +
 .../compilers/llvm/9/compiler-rt.nix          |  70 +++
 .../compilers/llvm/9/crtbegin-and-end.patch   | 595 ++++++++++++++++++
 pkgs/development/compilers/llvm/9/default.nix | 197 ++++++
 .../compilers/llvm/9/libc++/default.nix       |  59 ++
 .../compilers/llvm/9/libc++/setup-hook.sh     |   6 +
 .../compilers/llvm/9/libc++abi.nix            |  67 ++
 .../llvm/9/libcxxabi-no-threads.patch         |  12 +
 .../compilers/llvm/9/libcxxabi-wasm.patch     |  16 +
 .../compilers/llvm/9/libunwind.nix            |  25 +
 pkgs/development/compilers/llvm/9/lld.nix     |  33 +
 pkgs/development/compilers/llvm/9/lldb.nix    |  61 ++
 .../compilers/llvm/9/llvm-outputs.patch       |  26 +
 pkgs/development/compilers/llvm/9/llvm.nix    | 173 +++++
 pkgs/development/compilers/llvm/9/openmp.nix  |  26 +
 .../compilers/llvm/9/sanitizers-nongnu.patch  | 412 ++++++++++++
 23 files changed, 2609 insertions(+)
 create mode 100644 pkgs/development/compilers/llvm/9/bintools.nix
 create mode 100644 pkgs/development/compilers/llvm/9/clang/clang-xpc.patch
 create mode 100644 pkgs/development/compilers/llvm/9/clang/compiler-rt-baremetal.patch
 create mode 100644 pkgs/development/compilers/llvm/9/clang/default.nix
 create mode 100644 pkgs/development/compilers/llvm/9/clang/purity.patch
 create mode 100644 pkgs/development/compilers/llvm/9/clang/static-pie.patch
 create mode 100644 pkgs/development/compilers/llvm/9/clang/unwindlib.patch
 create mode 100644 pkgs/development/compilers/llvm/9/compiler-rt-codesign.patch
 create mode 100644 pkgs/development/compilers/llvm/9/compiler-rt.nix
 create mode 100644 pkgs/development/compilers/llvm/9/crtbegin-and-end.patch
 create mode 100644 pkgs/development/compilers/llvm/9/default.nix
 create mode 100644 pkgs/development/compilers/llvm/9/libc++/default.nix
 create mode 100644 pkgs/development/compilers/llvm/9/libc++/setup-hook.sh
 create mode 100644 pkgs/development/compilers/llvm/9/libc++abi.nix
 create mode 100644 pkgs/development/compilers/llvm/9/libcxxabi-no-threads.patch
 create mode 100644 pkgs/development/compilers/llvm/9/libcxxabi-wasm.patch
 create mode 100644 pkgs/development/compilers/llvm/9/libunwind.nix
 create mode 100644 pkgs/development/compilers/llvm/9/lld.nix
 create mode 100644 pkgs/development/compilers/llvm/9/lldb.nix
 create mode 100644 pkgs/development/compilers/llvm/9/llvm-outputs.patch
 create mode 100644 pkgs/development/compilers/llvm/9/llvm.nix
 create mode 100644 pkgs/development/compilers/llvm/9/openmp.nix
 create mode 100644 pkgs/development/compilers/llvm/9/sanitizers-nongnu.patch

diff --git a/pkgs/development/compilers/llvm/9/bintools.nix b/pkgs/development/compilers/llvm/9/bintools.nix
new file mode 100644
index 00000000000..72a2a733193
--- /dev/null
+++ b/pkgs/development/compilers/llvm/9/bintools.nix
@@ -0,0 +1,19 @@
+{ runCommand, stdenv, llvm, lld, version }:
+
+let
+  prefix =
+    if stdenv.hostPlatform != stdenv.targetPlatform
+    then "${stdenv.targetPlatform.config}-"
+    else "";
+in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } ''
+   mkdir -p $out/bin
+   for prog in ${lld}/bin/*; do
+     ln -s $prog $out/bin/${prefix}$(basename $prog)
+   done
+   for prog in ${llvm}/bin/*; do
+     ln -s $prog $out/bin/${prefix}$(echo $(basename $prog) | sed -e "s|llvm-||")
+     ln -sf $prog $out/bin/${prefix}$(basename $prog)
+   done
+   rm -f $out/bin/${prefix}cat
+   ln -s ${lld}/bin/lld $out/bin/${prefix}ld
+''
diff --git a/pkgs/development/compilers/llvm/9/clang/clang-xpc.patch b/pkgs/development/compilers/llvm/9/clang/clang-xpc.patch
new file mode 100644
index 00000000000..eb57d345822
--- /dev/null
+++ b/pkgs/development/compilers/llvm/9/clang/clang-xpc.patch
@@ -0,0 +1,41 @@
+From 61c9b97d7b81cc2c013b423bf1763a92b14fcae3 Mon Sep 17 00:00:00 2001
+From: Jan Korous <jkorous@apple.com>
+Date: Tue, 26 Mar 2019 03:48:25 +0000
+Subject: [PATCH] [clangd][xpc][cmake] Respect explicit value of
+ CLANGD_BUILD_XPC
+
+We shouldn't prevent user from disabling XPC framework build on Darwin.
+However, by keeping it on by default our CI systems also test
+it by default on macOS.
+
+Based on user request:
+http://lists.llvm.org/pipermail/cfe-dev/2019-March/061778.html
+
+Differential Revision: https://reviews.llvm.org/D59808
+
+git-svn-id: https://llvm.org/svn/llvm-project/clang-tools-extra/trunk@356974 91177308-0d34-0410-b5e6-96231b3b80d8
+---
+ CMakeLists.txt | 13 ++++++++++---
+ 1 file changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 66ebeaeeaa..514b17fb3c 100644
+--- a/tools/extra/CMakeLists.txt
++++ b/tools/extra/CMakeLists.txt
+@@ -1,6 +1,13 @@
+-option(CLANGD_BUILD_XPC "Build XPC Support For Clangd." OFF)
+-if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+-  set(CLANGD_BUILD_XPC ON CACHE BOOL "" FORCE)
++if (NOT DEFINED CLANGD_BUILD_XPC)
++  if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
++    set(CLANGD_BUILD_XPC_DEFAULT ON)
++  else ()
++    set(CLANGD_BUILD_XPC_DEFAULT OFF)
++  endif ()
++
++  set(CLANGD_BUILD_XPC ${CLANGD_BUILD_XPC_DEFAULT} CACHE BOOL "Build XPC Support For Clangd." FORCE)
++
++  unset(CLANGD_BUILD_XPC_DEFAULT)
+ endif ()
+ 
+ add_subdirectory(clang-apply-replacements)
\ No newline at end of file
diff --git a/pkgs/development/compilers/llvm/9/clang/compiler-rt-baremetal.patch b/pkgs/development/compilers/llvm/9/clang/compiler-rt-baremetal.patch
new file mode 100644
index 00000000000..a4a0f21b0fc
--- /dev/null
+++ b/pkgs/development/compilers/llvm/9/clang/compiler-rt-baremetal.patch
@@ -0,0 +1,53 @@
+Index: lib/Driver/ToolChains/BareMetal.cpp
+===================================================================
+--- a/lib/Driver/ToolChains/BareMetal.cpp
++++ b/lib/Driver/ToolChains/BareMetal.cpp
+@@ -157,7 +157,7 @@
+ void BareMetal::AddLinkRuntimeLib(const ArgList &Args,
+                                   ArgStringList &CmdArgs) const {
+   CmdArgs.push_back(Args.MakeArgString("-lclang_rt.builtins-" +
+-                                       getTriple().getArchName() + ".a"));
++                                       getTriple().getArchName()));
+ }
+ 
+ void baremetal::Linker::ConstructJob(Compilation &C, const JobAction &JA,
+Index: test/Driver/baremetal.cpp
+===================================================================
+--- a/test/Driver/baremetal.cpp
++++ b/test/Driver/baremetal.cpp
+@@ -13,7 +13,7 @@
+ // CHECK-V6M-C-NEXT: "{{[^"]*}}ld{{(\.(lld|bfd|gold))?}}{{(\.exe)?}}" "{{.*}}.o" "-Bstatic"
+ // CHECK-V6M-C-SAME: "-L[[RESOURCE_DIR:[^"]+]]{{[/\\]+}}lib{{[/\\]+}}baremetal"
+ // CHECK-V6M-C-SAME: "-T" "semihosted.lds" "-Lsome{{[/\\]+}}directory{{[/\\]+}}user{{[/\\]+}}asked{{[/\\]+}}for"
+-// CHECK-V6M-C-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m.a"
++// CHECK-V6M-C-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m"
+ // CHECK-V6M-C-SAME: "-o" "{{.*}}.o"
+ 
+ // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+@@ -35,7 +35,7 @@
+ // CHECK-V6M-DEFAULTCXX: "{{[^"]*}}ld{{(\.(lld|bfd|gold))?}}{{(\.exe)?}}" "{{.*}}.o" "-Bstatic"
+ // CHECK-V6M-DEFAULTCXX-SAME: "-L{{[^"]*}}{{[/\\]+}}lib{{(64)?}}{{[/\\]+}}clang{{[/\\]+}}{{.*}}{{[/\\]+}}lib{{[/\\]+}}baremetal"
+ // CHECK-V6M-DEFAULTCXX-SAME: "-lc++" "-lc++abi" "-lunwind"
+-// CHECK-V6M-DEFAULTCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m.a"
++// CHECK-V6M-DEFAULTCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m"
+ // CHECK-V6M-DEFAULTCXX-SAME: "-o" "{{.*}}.o"
+ 
+ // RUN: %clangxx -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+@@ -48,7 +48,7 @@
+ // CHECK-V6M-LIBCXX: "{{[^"]*}}ld{{(\.(lld|bfd|gold))?}}{{(\.exe)?}}" "{{.*}}.o" "-Bstatic"
+ // CHECK-V6M-LIBCXX-SAME: "-L{{[^"]*}}{{[/\\]+}}lib{{(64)?}}{{[/\\]+}}clang{{[/\\]+}}{{.*}}{{[/\\]+}}lib{{[/\\]+}}baremetal"
+ // CHECK-V6M-LIBCXX-SAME: "-lc++" "-lc++abi" "-lunwind"
+-// CHECK-V6M-LIBCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m.a"
++// CHECK-V6M-LIBCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m"
+ // CHECK-V6M-LIBCXX-SAME: "-o" "{{.*}}.o"
+ 
+ // RUN: %clangxx -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+@@ -61,7 +61,7 @@
+ // CHECK-V6M-LIBSTDCXX: "{{[^"]*}}ld{{(\.(lld|bfd|gold))?}}{{(\.exe)?}}" "{{.*}}.o" "-Bstatic"
+ // CHECK-V6M-LIBSTDCXX-SAME: "-L{{[^"]*}}{{[/\\]+}}lib{{(64)?}}{{[/\\]+}}clang{{[/\\]+}}{{.*}}{{[/\\]+}}lib{{[/\\]+}}baremetal"
+ // CHECK-V6M-LIBSTDCXX-SAME: "-lstdc++" "-lsupc++" "-lunwind"
+-// CHECK-V6M-LIBSTDCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m.a"
++// CHECK-V6M-LIBSTDCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m"
+ // CHECK-V6M-LIBSTDCXX-SAME: "-o" "{{.*}}.o"
+ 
+ // RUN: %clangxx -no-canonical-prefixes %s -### -o %t.o 2>&1 \
diff --git a/pkgs/development/compilers/llvm/9/clang/default.nix b/pkgs/development/compilers/llvm/9/clang/default.nix
new file mode 100644
index 00000000000..6911089250e
--- /dev/null
+++ b/pkgs/development/compilers/llvm/9/clang/default.nix
@@ -0,0 +1,126 @@
+{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python
+, fixDarwinDylibNames
+, enableManpages ? false
+, enablePolly ? false # TODO: get this info from llvm (passthru?)
+}:
+
+let
+  self = stdenv.mkDerivation ({
+    name = "clang-${version}";
+
+    src = fetch "cfe" "0ihnbdl058gvl2wdy45p5am55bq8ifx8m9mhcsgj9ax8yxlzvvvh";
+
+    unpackPhase = ''
+      unpackFile $src
+      mv cfe-${version}* clang
+      sourceRoot=$PWD/clang
+      unpackFile ${clang-tools-extra_src}
+      mv clang-tools-extra-* $sourceRoot/tools/extra
+    '';
+
+    nativeBuildInputs = [ cmake python ]
+      ++ stdenv.lib.optional enableManpages python.pkgs.sphinx;
+
+    buildInputs = [ libxml2 llvm ]
+      ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
+
+    cmakeFlags = [
+      "-DCMAKE_CXX_FLAGS=-std=c++11"
+      "-DCLANGD_BUILD_XPC=OFF"
+    ] ++ stdenv.lib.optionals enableManpages [
+      "-DCLANG_INCLUDE_DOCS=ON"
+      "-DLLVM_ENABLE_SPHINX=ON"
+      "-DSPHINX_OUTPUT_MAN=ON"
+      "-DSPHINX_OUTPUT_HTML=OFF"
+      "-DSPHINX_WARNINGS_AS_ERRORS=OFF"
+    ] ++ stdenv.lib.optionals enablePolly [
+      "-DWITH_POLLY=ON"
+      "-DLINK_POLLY_INTO_TOOLS=ON"
+    ];
+
+    patches = [
+      ./purity.patch
+      ./clang-xpc.patch
+      # Backport for -static-pie, which the latter touches, and which is nice in
+      # its own right.
+      ./static-pie.patch
+      # Backport for the `--unwindlib=[libgcc|compiler-rt]` flag, which is
+      # needed for our bootstrapping to not interfere with C.
+      ./unwindlib.patch
+      # https://reviews.llvm.org/D51899
+      ./compiler-rt-baremetal.patch
+    ];
+
+    postPatch = ''
+      sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' \
+             -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' \
+             lib/Driver/ToolChains/*.cpp
+
+      # Patch for standalone doc building
+      sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt
+    '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+      sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp
+    '' + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
+      substituteInPlace tools/extra/clangd/CMakeLists.txt \
+        --replace "NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB" FALSE
+    '';
+
+    outputs = [ "out" "lib" "python" ];
+
+    # Clang expects to find LLVMgold in its own prefix
+    postInstall = ''
+      if [ -e ${llvm}/lib/LLVMgold.so ]; then
+        ln -sv ${llvm}/lib/LLVMgold.so $out/lib
+      fi
+
+      ln -sv $out/bin/clang $out/bin/cpp
+
+      # Move libclang to 'lib' output
+      moveToOutput "lib/libclang.*" "$lib"
+      substituteInPlace $out/lib/cmake/clang/ClangTargets-release.cmake \
+          --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang."
+
+      mkdir -p $python/bin $python/share/clang/
+      mv $out/bin/{git-clang-format,scan-view} $python/bin
+      if [ -e $out/bin/set-xcode-analyzer ]; then
+        mv $out/bin/set-xcode-analyzer $python/bin
+      fi
+      mv $out/share/clang/*.py $python/share/clang
+      rm $out/bin/c-index-test
+    '';
+
+    enableParallelBuilding = true;
+
+    passthru = {
+      isClang = true;
+      inherit llvm;
+    } // stdenv.lib.optionalAttrs (stdenv.targetPlatform.isLinux || (stdenv.cc.isGNU && stdenv.cc.cc ? gcc)) {
+      gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
+    };
+
+    meta = {
+      description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler";
+      homepage    = http://llvm.org/;
+      license     = stdenv.lib.licenses.ncsa;
+      platforms   = stdenv.lib.platforms.all;
+    };
+  } // stdenv.lib.optionalAttrs enableManpages {
+    name = "clang-manpages-${version}";
+
+    buildPhase = ''
+      make docs-clang-man
+    '';
+
+    installPhase = ''
+      mkdir -p $out/share/man/man1
+      # Manually install clang manpage
+      cp docs/man/*.1 $out/share/man/man1/
+    '';
+
+    outputs = [ "out" ];
+
+    doCheck = false;
+
+    meta.description = "man page for Clang ${version}";
+  });
+in self
diff --git a/pkgs/development/compilers/llvm/9/clang/purity.patch b/pkgs/development/compilers/llvm/9/clang/purity.patch
new file mode 100644
index 00000000000..b30d0d0b5d5
--- /dev/null
+++ b/pkgs/development/compilers/llvm/9/clang/purity.patch
@@ -0,0 +1,30 @@
+From 4add81bba40dcec62c4ea4481be8e35ac53e89d8 Mon Sep 17 00:00:00 2001
+From: Will Dietz <w@wdtz.org>
+Date: Thu, 18 May 2017 11:56:12 -0500
+Subject: [PATCH] "purity" patch for 5.0
+
+---
+ lib/Driver/ToolChains/Gnu.cpp | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp
+index fe3c0191bb..c6a482bece 100644
+--- a/lib/Driver/ToolChains/Gnu.cpp
++++ b/lib/Driver/ToolChains/Gnu.cpp
+@@ -494,13 +494,6 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
+   if (!Args.hasArg(options::OPT_static)) {
+     if (Args.hasArg(options::OPT_rdynamic))
+       CmdArgs.push_back("-export-dynamic");
+-
+-    if (!Args.hasArg(options::OPT_shared)) {
+-      const std::string Loader =
+-          D.DyldPrefix + ToolChain.getDynamicLinker(Args);
+-      CmdArgs.push_back("-dynamic-linker");
+-      CmdArgs.push_back(Args.MakeArgString(Loader));
+-    }
+   }
+ 
+   CmdArgs.push_back("-o");
+-- 
+2.11.0
+
diff --git a/pkgs/development/compilers/llvm/9/clang/static-pie.patch b/pkgs/development/compilers/llvm/9/clang/static-pie.patch
new file mode 100644
index 00000000000..d1f86a16232
--- /dev/null
+++ b/pkgs/development/compilers/llvm/9/clang/static-pie.patch
@@ -0,0 +1,157 @@
+commit 7a9842bc92921e79b84630045276861be90b2d47
+Author: Siva Chandra <sivachandra@google.com>
+Date:   Wed Feb 20 19:07:04 2019 +0000
+
+    [Clang Driver] Add support for "-static-pie" argument to the Clang driver.
+    
+    Summary: This change mimics GCC's support for the "-static-pie" argument.
+    
+    Subscribers: cfe-commits
+    
+    Tags: #clang
+    
+    Differential Revision: https://reviews.llvm.org/D58307
+    
+    git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@354502 91177308-0d34-0410-b5e6-96231b3b80d8
+    (cherry picked from commit 7d6cd7825e6883f8650e32b07f3750824c2cef62)
+
+diff --git a/include/clang/Driver/Options.td b/include/clang/Driver/Options.td
+index d02d9744d7..75a21e66c7 100644
+--- a/include/clang/Driver/Options.td
++++ b/include/clang/Driver/Options.td
+@@ -2502,6 +2502,7 @@ def pthread : Flag<["-"], "pthread">, Flags<[CC1Option]>,
+ def no_pthread : Flag<["-"], "no-pthread">, Flags<[CC1Option]>;
+ def p : Flag<["-"], "p">;
+ def pie : Flag<["-"], "pie">;
++def static_pie : Flag<["-"], "static-pie">;
+ def read__only__relocs : Separate<["-"], "read_only_relocs">;
+ def remap : Flag<["-"], "remap">;
+ def rewrite_objc : Flag<["-"], "rewrite-objc">, Flags<[DriverOption,CC1Option]>,
+diff --git a/lib/Driver/ToolChains/CommonArgs.cpp b/lib/Driver/ToolChains/CommonArgs.cpp
+index d7e316befa..85ffc1618d 100644
+--- a/lib/Driver/ToolChains/CommonArgs.cpp
++++ b/lib/Driver/ToolChains/CommonArgs.cpp
+@@ -1138,19 +1138,22 @@ static void AddLibgcc(const llvm::Triple &Triple, const Driver &D,
+   bool isCygMing = Triple.isOSCygMing();
+   bool IsIAMCU = Triple.isOSIAMCU();
+   bool StaticLibgcc = Args.hasArg(options::OPT_static_libgcc) ||
+-                      Args.hasArg(options::OPT_static);
++                      Args.hasArg(options::OPT_static) ||
++                      Args.hasArg(options::OPT_static_pie);
+ 
+   bool SharedLibgcc = Args.hasArg(options::OPT_shared_libgcc);
+   bool UnspecifiedLibgcc = !StaticLibgcc && !SharedLibgcc;
+ 
+   // Gcc adds libgcc arguments in various ways:
+   //
+-  // gcc <none>: -lgcc --as-needed -lgcc_s --no-as-needed
+-  // g++ <none>:                   -lgcc_s               -lgcc
+-  // gcc shared:                   -lgcc_s               -lgcc
+-  // g++ shared:                   -lgcc_s               -lgcc
+-  // gcc static: -lgcc             -lgcc_eh
+-  // g++ static: -lgcc             -lgcc_eh
++  // gcc <none>:     -lgcc --as-needed -lgcc_s --no-as-needed
++  // g++ <none>:                       -lgcc_s               -lgcc
++  // gcc shared:                       -lgcc_s               -lgcc
++  // g++ shared:                       -lgcc_s               -lgcc
++  // gcc static:     -lgcc             -lgcc_eh
++  // g++ static:     -lgcc             -lgcc_eh
++  // gcc static-pie: -lgcc             -lgcc_eh
++  // g++ static-pie: -lgcc             -lgcc_eh
+   //
+   // Also, certain targets need additional adjustments.
+ 
+diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp
+index 69dba8fec8..0faa0bb473 100644
+--- a/lib/Driver/ToolChains/Gnu.cpp
++++ b/lib/Driver/ToolChains/Gnu.cpp
+@@ -334,6 +334,7 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
+   const bool isAndroid = ToolChain.getTriple().isAndroid();
+   const bool IsIAMCU = ToolChain.getTriple().isOSIAMCU();
+   const bool IsPIE = getPIE(Args, ToolChain);
++  const bool IsStaticPIE = Args.hasArg(options::OPT_static_pie);
+   const bool HasCRTBeginEndFiles =
+       ToolChain.getTriple().hasEnvironment() ||
+       (ToolChain.getTriple().getVendor() != llvm::Triple::MipsTechnologies);
+@@ -354,6 +355,12 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
+   if (IsPIE)
+     CmdArgs.push_back("-pie");
+ 
++  if (IsStaticPIE) {
++    CmdArgs.push_back("-static");
++    CmdArgs.push_back("-pie");
++    CmdArgs.push_back("--no-dynamic-linker");
++  }
++
+   if (Args.hasArg(options::OPT_rdynamic))
+     CmdArgs.push_back("-export-dynamic");
+ 
+@@ -415,6 +422,8 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
+           crt1 = "gcrt1.o";
+         else if (IsPIE)
+           crt1 = "Scrt1.o";
++        else if (IsStaticPIE)
++          crt1 = "rcrt1.o";
+         else
+           crt1 = "crt1.o";
+       }
+@@ -432,7 +441,7 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
+         crtbegin = isAndroid ? "crtbegin_static.o" : "crtbeginT.o";
+       else if (Args.hasArg(options::OPT_shared))
+         crtbegin = isAndroid ? "crtbegin_so.o" : "crtbeginS.o";
+-      else if (IsPIE)
++      else if (IsPIE || IsStaticPIE)
+         crtbegin = isAndroid ? "crtbegin_dynamic.o" : "crtbeginS.o";
+       else
+         crtbegin = isAndroid ? "crtbegin_dynamic.o" : "crtbegin.o";
+@@ -483,7 +492,7 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
+ 
+   if (!Args.hasArg(options::OPT_nostdlib)) {
+     if (!Args.hasArg(options::OPT_nodefaultlibs)) {
+-      if (Args.hasArg(options::OPT_static))
++      if (Args.hasArg(options::OPT_static) || IsStaticPIE)
+         CmdArgs.push_back("--start-group");
+ 
+       if (NeedsSanitizerDeps)
+@@ -518,7 +527,7 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
+       if (IsIAMCU)
+         CmdArgs.push_back("-lgloss");
+ 
+-      if (Args.hasArg(options::OPT_static))
++      if (Args.hasArg(options::OPT_static) || IsStaticPIE)
+         CmdArgs.push_back("--end-group");
+       else
+         AddRunTimeLibs(ToolChain, D, CmdArgs, Args);
+@@ -535,7 +544,7 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
+       const char *crtend;
+       if (Args.hasArg(options::OPT_shared))
+         crtend = isAndroid ? "crtend_so.o" : "crtendS.o";
+-      else if (IsPIE)
++      else if (IsPIE || IsStaticPIE)
+         crtend = isAndroid ? "crtend_android.o" : "crtendS.o";
+       else
+         crtend = isAndroid ? "crtend_android.o" : "crtend.o";
+diff --git a/test/Driver/linux-ld.c b/test/Driver/linux-ld.c
+index 3ab81be490..800f782523 100644
+--- a/test/Driver/linux-ld.c
++++ b/test/Driver/linux-ld.c
+@@ -176,6 +176,19 @@
+ // CHECK-CLANG-NO-LIBGCC-STATIC: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
+ // CHECK-CLANG-NO-LIBGCC-STATIC: "--start-group" "-lgcc" "-lgcc_eh" "-lc" "--end-group"
+ //
++// RUN: %clang -static-pie -no-canonical-prefixes %s -### -o %t.o 2>&1 \
++// RUN:     --target=x86_64-unknown-linux -rtlib=platform \
++// RUN:     --gcc-toolchain="" \
++// RUN:     --sysroot=%S/Inputs/basic_linux_tree \
++// RUN:   | FileCheck --check-prefix=CHECK-CLANG-LD-STATIC-PIE %s
++// CHECK-CLANG-LD-STATIC-PIE: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
++// CHECK-CLANG-LD-STATIC-PIE: "-static"
++// CHECK-CLANG-LD-STATIC-PIE: "-pie"
++// CHECK-CLANG-LD-STATIC-PIE: "--no-dynamic-linker"
++// CHECK-CLANG-LD-STATIC-PIE: "-m" "elf_x86_64"
++// CHECK-CLANG-LD-STATIC-PIE: "{{.*}}rcrt1.o"
++// CHECK-CLANG-LD-STATIC-PIE: "--start-group" "-lgcc" "-lgcc_eh" "-lc" "--end-group"
++//
+ // RUN: %clang -dynamic -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+ // RUN:     --target=x86_64-unknown-linux -rtlib=platform \
+ // RUN:     --gcc-toolchain="" \
diff --git a/pkgs/development/compilers/llvm/9/clang/unwindlib.patch b/pkgs/development/compilers/llvm/9/clang/unwindlib.patch
new file mode 100644
index 00000000000..6958fce60ce
--- /dev/null
+++ b/pkgs/development/compilers/llvm/9/clang/unwindlib.patch
@@ -0,0 +1,372 @@
+commit cd5603a4767277a29d3e67a9c3f2a5d2129cd973
+Author: Sterling Augustine <saugustine@google.com>
+Date:   Tue Mar 19 20:01:59 2019 +0000
+
+    Add --unwindlib=[libgcc|compiler-rt] to parallel --rtlib= [take 2]
+    
+    "clang++ hello.cc --rtlib=compiler-rt"
+    
+    now can works without specifying additional unwind or exception
+    handling libraries.
+    
+    This reworked version of the feature no longer modifies today's default
+    unwind library for compiler-rt: which is nothing. Rather, a user
+    can specify -DCLANG_DEFAULT_UNWINDLIB=libunwind when configuring
+    the compiler.
+    
+    This should address the issues from the previous version.
+    
+    Update tests for new --unwindlib semantics.
+    
+    Differential Revision: https://reviews.llvm.org/D59109
+    
+    git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@356508 91177308-0d34-0410-b5e6-96231b3b80d8
+    (cherry picked from commit 344aa82a52f2fae527f58284567ae305a314f7a8)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c2016a45ca..edeb2b66a1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -261,6 +261,24 @@ if (NOT(CLANG_DEFAULT_RTLIB STREQUAL "" OR
+     "Default runtime library to use (\"libgcc\" or \"compiler-rt\", empty for platform default)" FORCE)
+ endif()
+ 
++set(CLANG_DEFAULT_UNWINDLIB "" CACHE STRING
++  "Default unwind library to use (\"none\" \"libgcc\" or \"libunwind\", empty to match runtime library.)")
++if (CLANG_DEFAULT_UNWINDLIB STREQUAL "")
++  if (CLANG_DEFAULT_RTLIB STREQUAL "libgcc")
++    set (CLANG_DEFAULT_UNWINDLIB "libgcc" CACHE STRING "" FORCE)
++  elseif (CLANG_DEFAULT_RTLIBS STREQUAL "libunwind")
++    set (CLANG_DEFAULT_UNWINDLIB "none" CACHE STRING "" FORCE)
++  endif()
++endif()
++
++if (NOT(CLANG_DEFAULT_UNWINDLIB STREQUAL "none" OR
++        CLANG_DEFAULT_UNWINDLIB STREQUAL "libgcc" OR
++        CLANG_DEFAULT_UNWINDLIB STREQUAL "libunwind"))
++  message(WARNING "Resetting default unwindlib to use platform default")
++  set(CLANG_DEFAULT_UNWINDLIB "" CACHE STRING
++    "Default unwind library to use (\"none\" \"libgcc\" or \"libunwind\", empty for none)" FORCE)
++endif()
++
+ set(CLANG_DEFAULT_OBJCOPY "objcopy" CACHE STRING
+   "Default objcopy executable to use.")
+ 
+diff --git a/include/clang/Basic/DiagnosticDriverKinds.td b/include/clang/Basic/DiagnosticDriverKinds.td
+index 5475e28ed7..15971210e4 100644
+--- a/include/clang/Basic/DiagnosticDriverKinds.td
++++ b/include/clang/Basic/DiagnosticDriverKinds.td
+@@ -52,6 +52,10 @@ def err_drv_invalid_rtlib_name : Error<
+   "invalid runtime library name in argument '%0'">;
+ def err_drv_unsupported_rtlib_for_platform : Error<
+   "unsupported runtime library '%0' for platform '%1'">;
++def err_drv_invalid_unwindlib_name : Error<
++  "invalid unwind library name in argument '%0'">;
++def err_drv_incompatible_unwindlib : Error<
++  "--rtlib=libgcc requires --unwindlib=libgcc">;
+ def err_drv_invalid_stdlib_name : Error<
+   "invalid library name in argument '%0'">;
+ def err_drv_invalid_output_with_multiple_archs : Error<
+diff --git a/include/clang/Config/config.h.cmake b/include/clang/Config/config.h.cmake
+index 1d624450b9..2d4cb747e8 100644
+--- a/include/clang/Config/config.h.cmake
++++ b/include/clang/Config/config.h.cmake
+@@ -23,6 +23,9 @@
+ /* Default runtime library to use. */
+ #define CLANG_DEFAULT_RTLIB "${CLANG_DEFAULT_RTLIB}"
+ 
++/* Default unwind library to use. */
++#define CLANG_DEFAULT_UNWINDLIB "${CLANG_DEFAULT_UNWINDLIB}"
++
+ /* Default objcopy to use */
+ #define CLANG_DEFAULT_OBJCOPY "${CLANG_DEFAULT_OBJCOPY}"
+ 
+diff --git a/include/clang/Driver/Options.td b/include/clang/Driver/Options.td
+index 75a21e66c7..4da0e54965 100644
+--- a/include/clang/Driver/Options.td
++++ b/include/clang/Driver/Options.td
+@@ -2570,6 +2570,8 @@ def std_EQ : Joined<["-", "--"], "std=">, Flags<[CC1Option]>,
+   }]>;
+ def stdlib_EQ : Joined<["-", "--"], "stdlib=">, Flags<[CC1Option]>,
+   HelpText<"C++ standard library to use">, Values<"libc++,libstdc++,platform">;
++def unwindlib_EQ : Joined<["-", "--"], "unwindlib=">, Flags<[CC1Option]>,
++  HelpText<"Unwind library to use">, Values<"libgcc,unwindlib,platform">;
+ def sub__library : JoinedOrSeparate<["-"], "sub_library">;
+ def sub__umbrella : JoinedOrSeparate<["-"], "sub_umbrella">;
+ def system_header_prefix : Joined<["--"], "system-header-prefix=">,
+diff --git a/include/clang/Driver/ToolChain.h b/include/clang/Driver/ToolChain.h
+index d5f75b8271..4bedf760eb 100644
+--- a/include/clang/Driver/ToolChain.h
++++ b/include/clang/Driver/ToolChain.h
+@@ -100,6 +100,12 @@ public:
+     RLT_Libgcc
+   };
+ 
++  enum UnwindLibType {
++    UNW_None,
++    UNW_CompilerRT,
++    UNW_Libgcc
++  };
++
+   enum RTTIMode {
+     RM_Enabled,
+     RM_Disabled,
+@@ -368,6 +374,10 @@ public:
+     return ToolChain::CST_Libstdcxx;
+   }
+ 
++  virtual UnwindLibType GetDefaultUnwindLibType() const {
++    return ToolChain::UNW_None;
++  }
++
+   virtual std::string getCompilerRTPath() const;
+ 
+   virtual std::string getCompilerRT(const llvm::opt::ArgList &Args,
+@@ -512,6 +522,10 @@ public:
+   // given compilation arguments.
+   virtual CXXStdlibType GetCXXStdlibType(const llvm::opt::ArgList &Args) const;
+ 
++  // GetUnwindLibType - Determine the unwind library type to use with the
++  // given compilation arguments.
++  virtual UnwindLibType GetUnwindLibType(const llvm::opt::ArgList &Args) const;
++
+   /// AddClangCXXStdlibIncludeArgs - Add the clang -cc1 level arguments to set
+   /// the include paths to use for the given C++ standard library type.
+   virtual void
+diff --git a/lib/Driver/ToolChain.cpp b/lib/Driver/ToolChain.cpp
+index 88a627eab6..d82423f4a8 100644
+--- a/lib/Driver/ToolChain.cpp
++++ b/lib/Driver/ToolChain.cpp
+@@ -680,6 +680,33 @@ ToolChain::RuntimeLibType ToolChain::GetRuntimeLibType(
+   return GetDefaultRuntimeLibType();
+ }
+ 
++ToolChain::UnwindLibType ToolChain::GetUnwindLibType(
++    const ArgList &Args) const {
++  const Arg *A = Args.getLastArg(options::OPT_unwindlib_EQ);
++  StringRef LibName = A ? A->getValue() : CLANG_DEFAULT_UNWINDLIB;
++
++  if (LibName == "none")
++    return ToolChain::UNW_None;
++  else if (LibName == "platform" || LibName == "") {
++    ToolChain::RuntimeLibType RtLibType = GetRuntimeLibType(Args);
++    if (RtLibType == ToolChain::RLT_CompilerRT)
++      return ToolChain::UNW_None;
++    else if (RtLibType == ToolChain::RLT_Libgcc)
++      return ToolChain::UNW_Libgcc;
++  } else if (LibName == "libunwind") {
++    if (GetRuntimeLibType(Args) == RLT_Libgcc)
++      getDriver().Diag(diag::err_drv_incompatible_unwindlib);
++    return ToolChain::UNW_CompilerRT;
++  } else if (LibName == "libgcc")
++    return ToolChain::UNW_Libgcc;
++
++  if (A)
++    getDriver().Diag(diag::err_drv_invalid_unwindlib_name)
++        << A->getAsString(Args);
++
++  return GetDefaultUnwindLibType();
++}
++
+ ToolChain::CXXStdlibType ToolChain::GetCXXStdlibType(const ArgList &Args) const{
+   const Arg *A = Args.getLastArg(options::OPT_stdlib_EQ);
+   StringRef LibName = A ? A->getValue() : CLANG_DEFAULT_CXX_STDLIB;
+diff --git a/lib/Driver/ToolChains/CommonArgs.cpp b/lib/Driver/ToolChains/CommonArgs.cpp
+index 85ffc1618d..9fd29726a4 100644
+--- a/lib/Driver/ToolChains/CommonArgs.cpp
++++ b/lib/Driver/ToolChains/CommonArgs.cpp
+@@ -1132,47 +1132,80 @@ bool tools::isObjCAutoRefCount(const ArgList &Args) {
+   return Args.hasFlag(options::OPT_fobjc_arc, options::OPT_fno_objc_arc, false);
+ }
+ 
+-static void AddLibgcc(const llvm::Triple &Triple, const Driver &D,
+-                      ArgStringList &CmdArgs, const ArgList &Args) {
+-  bool isAndroid = Triple.isAndroid();
+-  bool isCygMing = Triple.isOSCygMing();
+-  bool IsIAMCU = Triple.isOSIAMCU();
+-  bool StaticLibgcc = Args.hasArg(options::OPT_static_libgcc) ||
+-                      Args.hasArg(options::OPT_static) ||
+-                      Args.hasArg(options::OPT_static_pie);
+-
+-  bool SharedLibgcc = Args.hasArg(options::OPT_shared_libgcc);
+-  bool UnspecifiedLibgcc = !StaticLibgcc && !SharedLibgcc;
+-
+-  // Gcc adds libgcc arguments in various ways:
+-  //
+-  // gcc <none>:     -lgcc --as-needed -lgcc_s --no-as-needed
+-  // g++ <none>:                       -lgcc_s               -lgcc
+-  // gcc shared:                       -lgcc_s               -lgcc
+-  // g++ shared:                       -lgcc_s               -lgcc
+-  // gcc static:     -lgcc             -lgcc_eh
+-  // g++ static:     -lgcc             -lgcc_eh
+-  // gcc static-pie: -lgcc             -lgcc_eh
+-  // g++ static-pie: -lgcc             -lgcc_eh
+-  //
+-  // Also, certain targets need additional adjustments.
++enum class LibGccType { UnspecifiedLibGcc, StaticLibGcc, SharedLibGcc };
++
++static LibGccType getLibGccType(const ArgList &Args) {
++  bool Static = Args.hasArg(options::OPT_static_libgcc) ||
++                Args.hasArg(options::OPT_static) ||
++                Args.hasArg(options::OPT_static_pie);
++
++  bool Shared = Args.hasArg(options::OPT_shared_libgcc);
++  if (Shared)
++    return LibGccType::SharedLibGcc;
++  if (Static)
++    return LibGccType::StaticLibGcc;
++  return LibGccType::UnspecifiedLibGcc;
++}
+ 
+-  bool LibGccFirst = (D.CCCIsCC() && UnspecifiedLibgcc) || StaticLibgcc;
+-  if (LibGccFirst)
+-    CmdArgs.push_back("-lgcc");
++// Gcc adds libgcc arguments in various ways:
++//
++// gcc <none>:     -lgcc --as-needed -lgcc_s --no-as-needed
++// g++ <none>:                       -lgcc_s               -lgcc
++// gcc shared:                       -lgcc_s               -lgcc
++// g++ shared:                       -lgcc_s               -lgcc
++// gcc static:     -lgcc             -lgcc_eh
++// g++ static:     -lgcc             -lgcc_eh
++// gcc static-pie: -lgcc             -lgcc_eh
++// g++ static-pie: -lgcc             -lgcc_eh
++//
++// Also, certain targets need additional adjustments.
++
++static void AddUnwindLibrary(const ToolChain &TC, const Driver &D,
++                             ArgStringList &CmdArgs, const ArgList &Args) {
++  ToolChain::UnwindLibType UNW = TC.GetUnwindLibType(Args);
++  // Targets that don't use unwind libraries.
++  if (TC.getTriple().isAndroid() || TC.getTriple().isOSIAMCU() ||
++      TC.getTriple().isOSBinFormatWasm() ||
++      UNW == ToolChain::UNW_None)
++    return;
+ 
+-  bool AsNeeded = D.CCCIsCC() && UnspecifiedLibgcc && !isAndroid && !isCygMing;
++  LibGccType LGT = getLibGccType(Args);
++  bool AsNeeded = D.CCCIsCC() && LGT == LibGccType::UnspecifiedLibGcc &&
++                  !TC.getTriple().isAndroid() && !TC.getTriple().isOSCygMing();
+   if (AsNeeded)
+     CmdArgs.push_back("--as-needed");
+ 
+-  if ((UnspecifiedLibgcc || SharedLibgcc) && !isAndroid)
+-    CmdArgs.push_back("-lgcc_s");
+-
+-  else if (StaticLibgcc && !isAndroid && !IsIAMCU)
+-    CmdArgs.push_back("-lgcc_eh");
++  switch (UNW) {
++  case ToolChain::UNW_None:
++    return;
++  case ToolChain::UNW_Libgcc: {
++    LibGccType LGT = getLibGccType(Args);
++    if (LGT == LibGccType::UnspecifiedLibGcc || LGT == LibGccType::SharedLibGcc)
++      CmdArgs.push_back("-lgcc_s");
++    else if (LGT == LibGccType::StaticLibGcc)
++      CmdArgs.push_back("-lgcc_eh");
++    break;
++  }
++  case ToolChain::UNW_CompilerRT:
++    CmdArgs.push_back("-lunwind");
++    break;
++  }
+ 
+   if (AsNeeded)
+     CmdArgs.push_back("--no-as-needed");
++}
++
++static void AddLibgcc(const ToolChain &TC, const Driver &D,
++                      ArgStringList &CmdArgs, const ArgList &Args) {
++  bool isAndroid = TC.getTriple().isAndroid();
++
++  LibGccType LGT = getLibGccType(Args);
++  bool LibGccFirst = (D.CCCIsCC() && LGT == LibGccType::UnspecifiedLibGcc) ||
++                     LGT == LibGccType::StaticLibGcc;
++  if (LibGccFirst)
++    CmdArgs.push_back("-lgcc");
++
++  AddUnwindLibrary(TC, D, CmdArgs, Args);
+ 
+   if (!LibGccFirst)
+     CmdArgs.push_back("-lgcc");
+@@ -1182,7 +1215,7 @@ static void AddLibgcc(const llvm::Triple &Triple, const Driver &D,
+   //
+   // NOTE: This fixes a link error on Android MIPS as well.  The non-static
+   // libgcc for MIPS relies on _Unwind_Find_FDE and dl_iterate_phdr from libdl.
+-  if (isAndroid && !StaticLibgcc)
++  if (isAndroid && getLibGccType(Args) != LibGccType::StaticLibGcc)
+     CmdArgs.push_back("-ldl");
+ }
+ 
+@@ -1194,6 +1227,7 @@ void tools::AddRunTimeLibs(const ToolChain &TC, const Driver &D,
+   switch (RLT) {
+   case ToolChain::RLT_CompilerRT:
+     CmdArgs.push_back(TC.getCompilerRTArgString(Args, "builtins"));
++    AddUnwindLibrary(TC, D, CmdArgs, Args);
+     break;
+   case ToolChain::RLT_Libgcc:
+     // Make sure libgcc is not used under MSVC environment by default
+@@ -1205,7 +1239,7 @@ void tools::AddRunTimeLibs(const ToolChain &TC, const Driver &D,
+             << Args.getLastArg(options::OPT_rtlib_EQ)->getValue() << "MSVC";
+       }
+     } else
+-      AddLibgcc(TC.getTriple(), D, CmdArgs, Args);
++      AddLibgcc(TC, D, CmdArgs, Args);
+     break;
+   }
+ }
+diff --git a/test/Driver/compiler-rt-unwind.c b/test/Driver/compiler-rt-unwind.c
+new file mode 100644
+index 0000000000..00024dfa7e
+--- /dev/null
++++ b/test/Driver/compiler-rt-unwind.c
+@@ -0,0 +1,49 @@
++// General tests that the driver handles combinations of --rtlib=XXX and
++// --unwindlib=XXX properly.
++//
++// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
++// RUN:     --target=x86_64-unknown-linux \
++// RUN:     --gcc-toolchain="" \
++// RUN:   | FileCheck --check-prefix=RTLIB-EMPTY %s
++// RTLIB-EMPTY: "{{.*}}lgcc"
++// RTLIB-EMPTY: "{{.*}}-lgcc_s"
++//
++// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
++// RUN:     --target=x86_64-unknown-linux -rtlib=libgcc \
++// RUN:     --gcc-toolchain="" \
++// RUN:   | FileCheck --check-prefix=RTLIB-GCC %s
++// RTLIB-GCC: "{{.*}}lgcc"
++// RTLIB-GCC: "{{.*}}lgcc_s"
++//
++// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
++// RUN:     --target=x86_64-unknown-linux -rtlib=libgcc --unwindlib=libunwind \
++// RUN:     --gcc-toolchain="" \
++// RUN:   | FileCheck --check-prefix=RTLIB-GCC-UNWINDLIB-COMPILER-RT %s
++// RTLIB-GCC-UNWINDLIB-COMPILER-RT: "{{.*}}lgcc"
++// RTLIB-GCC-UNWINDLIB-COMPILER-RT: "{{.*}}lunwind"
++//
++// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1   \
++// RUN:     --target=x86_64-unknown-linux -rtlib=compiler-rt \
++// RUN:     --gcc-toolchain="" \
++// RUN:   | FileCheck --check-prefix=RTLIB-COMPILER-RT %s
++// RTLIB-COMPILER-RT: "{{.*}}libclang_rt.builtins-x86_64.a"
++//
++// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1   \
++// RUN:     --target=x86_64-unknown-linux -rtlib=compiler-rt --unwindlib=libgcc \
++// RUN:     --gcc-toolchain="" \
++// RUN:   | FileCheck --check-prefix=RTLIB-COMPILER-RT-UNWINDLIB-GCC %s
++// RTLIB-COMPILER-RT-UNWINDLIB-GCC: "{{.*}}libclang_rt.builtins-x86_64.a"
++// RTLIB-COMPILER-RT-UNWINDLIB-GCC: "{{.*}}lgcc_s"
++//
++// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1              \
++// RUN:     --target=x86_64-unknown-linux -rtlib=compiler-rt --unwindlib=libgcc \
++// RUN:     -static --gcc-toolchain="" \
++// RUN:   | FileCheck --check-prefix=RTLIB-COMPILER-RT-UNWINDLIB-GCC-STATIC %s
++// RTLIB-COMPILER-RT-UNWINDLIB-GCC-STATIC: "{{.*}}libclang_rt.builtins-x86_64.a"
++// RTLIB-COMPILER-RT-UNWINDLIB-GCC-STATIC: "{{.*}}lgcc_eh"
++//
++// RUN: not %clang -no-canonical-prefixes %s -o %t.o 2> %t.err              \
++// RUN:     --target=x86_64-unknown-linux -rtlib=libgcc --unwindlib=libunwind \
++// RUN:     --gcc-toolchain="" \
++// RUN: FileCheck --input-file=%t.err --check-prefix=RTLIB-GCC-UNWINDLIB-COMPILER_RT %s
++// RTLIB-GCC-UNWINDLIB-COMPILER_RT: "{{[.|\\\n]*}}--rtlib=libgcc requires --unwindlib=libgcc"
diff --git a/pkgs/development/compilers/llvm/9/compiler-rt-codesign.patch b/pkgs/development/compilers/llvm/9/compiler-rt-codesign.patch
new file mode 100644
index 00000000000..3cc12b94b20
--- /dev/null
+++ b/pkgs/development/compilers/llvm/9/compiler-rt-codesign.patch
@@ -0,0 +1,33 @@
+From 3dec5f3475a26aeb4678627795c4b67c6b7b4785 Mon Sep 17 00:00:00 2001
+From: Will Dietz <w@wdtz.org>
+Date: Tue, 19 Sep 2017 13:13:06 -0500
+Subject: [PATCH] remove codesign use on Apple, disable ios sim testing that
+ needs it
+
+---
+ cmake/Modules/AddCompilerRT.cmake |  8 ------
+ test/asan/CMakeLists.txt          | 52 ---------------------------------------
+ test/tsan/CMakeLists.txt          | 47 -----------------------------------
+ 3 files changed, 107 deletions(-)
+
+diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake
+index bc5fb9ff7..b64eb4246 100644
+--- a/cmake/Modules/AddCompilerRT.cmake
++++ b/cmake/Modules/AddCompilerRT.cmake
+@@ -210,14 +210,6 @@ function(add_compiler_rt_runtime name type)
+         set_target_properties(${libname} PROPERTIES IMPORT_PREFIX "")
+         set_target_properties(${libname} PROPERTIES IMPORT_SUFFIX ".lib")
+       endif()
+-      if(APPLE)
+-        # Ad-hoc sign the dylibs
+-        add_custom_command(TARGET ${libname}
+-          POST_BUILD  
+-          COMMAND codesign --sign - $<TARGET_FILE:${libname}>
+-          WORKING_DIRECTORY ${COMPILER_RT_LIBRARY_OUTPUT_DIR}
+-        )
+-      endif()
+     endif()
+     install(TARGETS ${libname}
+       ARCHIVE DESTINATION ${COMPILER_RT_LIBRARY_INSTALL_DIR}
+2.14.1
+
diff --git a/pkgs/development/compilers/llvm/9/compiler-rt.nix b/pkgs/development/compilers/llvm/9/compiler-rt.nix
new file mode 100644
index 00000000000..936c877d58c
--- /dev/null
+++ b/pkgs/development/compilers/llvm/9/compiler-rt.nix
@@ -0,0 +1,70 @@
+{ stdenv, version, fetch, cmake, python, llvm, libcxxabi }:
+stdenv.mkDerivation {
+  pname = "compiler-rt";
+  inherit version;
+  src = fetch "compiler-rt" "0dqqf8f930l8gag4d9qjgn1n0pj0nbv2anviqqhdi1rkhas8z0hi";
+
+  nativeBuildInputs = [ cmake python llvm ];
+  buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
+
+  cmakeFlags = [
+    "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON"
+    "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}"
+    "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}"
+  ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    "-DCMAKE_C_FLAGS=-nodefaultlibs"
+    "-DCMAKE_CXX_COMPILER_WORKS=ON"
+    "-DCOMPILER_RT_BUILD_SANITIZERS=OFF"
+    "-DCOMPILER_RT_BUILD_XRAY=OFF"
+    "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF"
+    "-DCOMPILER_RT_BUILD_PROFILE=OFF"
+    "-DCOMPILER_RT_BAREMETAL_BUILD=ON"
+    #https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program
+    "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY"
+    "-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}"
+  ] ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [
+    "-DCOMPILER_RT_BUILD_SANITIZERS=OFF"
+    "-DCOMPILER_RT_BUILD_XRAY=OFF"
+    "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF"
+    "-DCOMPILER_RT_BUILD_PROFILE=OFF"
+  ] ++ stdenv.lib.optionals (stdenv.hostPlatform.parsed.kernel.name == "none") [
+    "-DCOMPILER_RT_BAREMETAL_BUILD=ON"
+    "-DCOMPILER_RT_OS_DIR=baremetal"
+  ];
+
+  outputs = [ "out" "dev" ];
+
+  patches = [
+    ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory
+  ]# ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
+    ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./crtbegin-and-end.patch;
+
+  # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
+  # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra
+  # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd
+  # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by
+  # a flag and turn the flag off during the stdenv build.
+  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+    substituteInPlace cmake/config-ix.cmake \
+      --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)'
+  '' + stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+    substituteInPlace lib/builtins/int_util.c \
+      --replace "#include <stdlib.h>" ""
+    substituteInPlace lib/builtins/clear_cache.c \
+      --replace "#include <assert.h>" ""
+    substituteInPlace lib/builtins/cpu_model.c \
+      --replace "#include <assert.h>" ""
+  '';
+
+  # Hack around weird upsream RPATH bug
+  postInstall = stdenv.lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) ''
+    ln -s "$out/lib"/*/* "$out/lib"
+  '' + stdenv.lib.optionalString (stdenv.hostPlatform.useLLVM or false) ''
+    ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/crtbegin.o
+    ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/crtend.o
+    ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/crtbeginS.o
+    ln -s $out/lib/*/clang_rt.crtend_shared-*.o $out/lib/crtendS.o
+  '';
+
+  enableParallelBuilding = true;
+}
diff --git a/pkgs/development/compilers/llvm/9/crtbegin-and-end.patch b/pkgs/development/compilers/llvm/9/crtbegin-and-end.patch
new file mode 100644
index 00000000000..e63be181f95
--- /dev/null
+++ b/pkgs/development/compilers/llvm/9/crtbegin-and-end.patch
@@ -0,0 +1,595 @@
+Get crtbegin and crtend without compiler GCC! PR is at https://reviews.llvm.org/D28791
+
+Index: compiler-rt/CMakeLists.txt
+===================================================================
+--- compiler-rt/CMakeLists.txt
++++ compiler-rt/CMakeLists.txt
+@@ -29,6 +29,8 @@
+ 
+ option(COMPILER_RT_BUILD_BUILTINS "Build builtins" ON)
+ mark_as_advanced(COMPILER_RT_BUILD_BUILTINS)
++option(COMPILER_RT_BUILD_CRT "Build crtbegin.o/crtend.o" ON)
++mark_as_advanced(COMPILER_RT_BUILD_CRT)
+ option(COMPILER_RT_BUILD_SANITIZERS "Build sanitizers" ON)
+ mark_as_advanced(COMPILER_RT_BUILD_SANITIZERS)
+ option(COMPILER_RT_BUILD_XRAY "Build xray" ON)
+Index: compiler-rt/cmake/Modules/AddCompilerRT.cmake
+===================================================================
+--- compiler-rt/cmake/Modules/AddCompilerRT.cmake
++++ compiler-rt/cmake/Modules/AddCompilerRT.cmake
+@@ -132,7 +132,7 @@
+ # Adds static or shared runtime for a list of architectures and operating
+ # systems and puts it in the proper directory in the build and install trees.
+ # add_compiler_rt_runtime(<name>
+-#                         {STATIC|SHARED}
++#                         {OBJECT|STATIC|SHARED}
+ #                         ARCHS <architectures>
+ #                         OS <os list>
+ #                         SOURCES <source files>
+@@ -144,8 +144,8 @@
+ #                         PARENT_TARGET <convenience parent target>
+ #                         ADDITIONAL_HEADERS <header files>)
+ function(add_compiler_rt_runtime name type)
+-  if(NOT type MATCHES "^(STATIC|SHARED)$")
+-    message(FATAL_ERROR "type argument must be STATIC or SHARED")
++  if(NOT type MATCHES "^(OBJECT|STATIC|SHARED)$")
++    message(FATAL_ERROR "type argument must be OBJECT, STATIC or SHARED")
+     return()
+   endif()
+   cmake_parse_arguments(LIB
+@@ -204,7 +204,10 @@
+         message(FATAL_ERROR "Architecture ${arch} can't be targeted")
+         return()
+       endif()
+-      if(type STREQUAL "STATIC")
++      if(type STREQUAL "OBJECT")
++        set(libname "${name}-${arch}")
++        set(output_name_${libname} ${libname}${COMPILER_RT_OS_SUFFIX})
++      elseif(type STREQUAL "STATIC")
+         set(libname "${name}-${arch}")
+         set_output_name(output_name_${libname} ${name} ${arch})
+       else()
+@@ -270,12 +273,34 @@
+       set(COMPONENT_OPTION COMPONENT ${libname})
+     endif()
+ 
+-    add_library(${libname} ${type} ${sources_${libname}})
+-    set_target_compile_flags(${libname} ${extra_cflags_${libname}})
+-    set_target_link_flags(${libname} ${extra_link_flags_${libname}})
+-    set_property(TARGET ${libname} APPEND PROPERTY
+-                COMPILE_DEFINITIONS ${LIB_DEFS})
+-    set_target_output_directories(${libname} ${output_dir_${libname}})
++    if(type STREQUAL "OBJECT")
++      string(TOUPPER ${CMAKE_BUILD_TYPE} config)
++      get_property(cflags SOURCE ${sources_${libname}} PROPERTY COMPILE_FLAGS)
++      separate_arguments(cflags)
++      add_custom_command(
++          OUTPUT ${output_dir_${libname}}/${libname}.o
++          COMMAND ${CMAKE_C_COMPILER} ${sources_${libname}} ${cflags} ${extra_cflags_${libname}} -c -o ${output_dir_${libname}}/${libname}.o
++          DEPENDS ${sources_${libname}}
++          COMMENT "Building C object ${libname}.o")
++      add_custom_target(${libname} DEPENDS ${output_dir_${libname}}/${libname}.o)
++      install(FILES ${output_dir_${libname}}/${libname}.o
++        DESTINATION ${install_dir_${libname}}
++        ${COMPONENT_OPTION})
++    else()
++      add_library(${libname} ${type} ${sources_${libname}})
++      set_target_compile_flags(${libname} ${extra_cflags_${libname}})
++      set_target_link_flags(${libname} ${extra_link_flags_${libname}})
++      set_property(TARGET ${libname} APPEND PROPERTY
++                   COMPILE_DEFINITIONS ${LIB_DEFS})
++      set_target_output_directories(${libname} ${output_dir_${libname}})
++      install(TARGETS ${libname}
++        ARCHIVE DESTINATION ${install_dir_${libname}}
++                ${COMPONENT_OPTION}
++        LIBRARY DESTINATION ${install_dir_${libname}}
++                ${COMPONENT_OPTION}
++        RUNTIME DESTINATION ${install_dir_${libname}}
++                ${COMPONENT_OPTION})
++    endif()
+     set_target_properties(${libname} PROPERTIES
+         OUTPUT_NAME ${output_name_${libname}})
+     set_target_properties(${libname} PROPERTIES FOLDER "Compiler-RT Runtime")
+@@ -299,13 +324,6 @@
+         )
+       endif()
+     endif()
+-    install(TARGETS ${libname}
+-      ARCHIVE DESTINATION ${install_dir_${libname}}
+-              ${COMPONENT_OPTION}
+-      LIBRARY DESTINATION ${install_dir_${libname}}
+-              ${COMPONENT_OPTION}
+-      RUNTIME DESTINATION ${install_dir_${libname}}
+-              ${COMPONENT_OPTION})
+ 
+     # We only want to generate per-library install targets if you aren't using
+     # an IDE because the extra targets get cluttered in IDEs.
+Index: compiler-rt/cmake/config-ix.cmake
+===================================================================
+--- compiler-rt/cmake/config-ix.cmake
++++ compiler-rt/cmake/config-ix.cmake
+@@ -227,6 +227,7 @@
+     ${ARM32} ${ARM64} ${MIPS32} ${MIPS64} ${S390X})
+ set(ALL_ASAN_SUPPORTED_ARCH ${X86} ${X86_64} ${ARM32} ${ARM64}
+     ${MIPS32} ${MIPS64} ${PPC64} ${S390X})
++set(ALL_CRT_SUPPORTED_ARCH ${X86} ${X86_64} ${ARM32} ${ARM64})
+ set(ALL_DFSAN_SUPPORTED_ARCH ${X86_64} ${MIPS64} ${ARM64})
+ set(ALL_FUZZER_SUPPORTED_ARCH ${X86_64} ${ARM64})
+ 
+@@ -474,6 +475,7 @@
+     SANITIZER_COMMON_SUPPORTED_ARCH)
+ 
+ else()
++  filter_available_targets(CRT_SUPPORTED_ARCH ${ALL_CRT_SUPPORTED_ARCH})
+   # Architectures supported by compiler-rt libraries.
+   filter_available_targets(SANITIZER_COMMON_SUPPORTED_ARCH
+     ${ALL_SANITIZER_COMMON_SUPPORTED_ARCH})
+@@ -563,6 +565,12 @@
+ 
+ # TODO: Add builtins support.
+ 
++if (CRT_SUPPORTED_ARCH AND OS_NAME MATCHES "Linux")
++  set(COMPILER_RT_HAS_CRT TRUE)
++else()
++  set(COMPILER_RT_HAS_CRT FALSE)
++endif()
++
+ if (COMPILER_RT_HAS_SANITIZER_COMMON AND DFSAN_SUPPORTED_ARCH AND
+     OS_NAME MATCHES "Linux")
+   set(COMPILER_RT_HAS_DFSAN TRUE)
+Index: compiler-rt/lib/CMakeLists.txt
+===================================================================
+--- compiler-rt/lib/CMakeLists.txt
++++ compiler-rt/lib/CMakeLists.txt
+@@ -17,6 +17,10 @@
+   add_subdirectory(builtins)
+ endif()
+ 
++if(COMPILER_RT_BUILD_CRT)
++  add_subdirectory(crt)
++endif()
++
+ function(compiler_rt_build_runtime runtime)
+   string(TOUPPER ${runtime} runtime_uppercase)
+   if(COMPILER_RT_HAS_${runtime_uppercase})
+Index: compiler-rt/lib/crt/CMakeLists.txt
+===================================================================
+--- /dev/null
++++ compiler-rt/lib/crt/CMakeLists.txt
+@@ -0,0 +1,102 @@
++add_compiler_rt_component(crt)
++
++function(check_cxx_section_exists section output)
++  cmake_parse_arguments(ARG "" "" "SOURCE;FLAGS" ${ARGN})
++  if(NOT ARG_SOURCE)
++    set(ARG_SOURCE "int main() { return 0; }\n")
++  endif()
++
++  string(RANDOM TARGET_NAME)
++  set(TARGET_NAME "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/cmTC_${TARGET_NAME}.dir")
++  file(MAKE_DIRECTORY ${TARGET_NAME})
++
++  file(WRITE "${TARGET_NAME}/CheckSectionExists.c" "${ARG_SOURCE}\n")
++
++  string(REGEX MATCHALL "<[A-Za-z0-9_]*>" substitutions
++         ${CMAKE_C_COMPILE_OBJECT})
++
++  set(try_compile_flags "${ARG_FLAGS}")
++  if(CMAKE_C_COMPILER_ID MATCHES Clang AND CMAKE_C_COMPILER_TARGET)
++    list(APPEND try_compile_flags "-target ${CMAKE_C_COMPILER_TARGET}")
++  endif()
++
++  string(REPLACE ";" " " extra_flags "${try_compile_flags}")
++
++  set(test_compile_command "${CMAKE_C_COMPILE_OBJECT}")
++  foreach(substitution ${substitutions})
++    if(substitution STREQUAL "<CMAKE_C_COMPILER>")
++      string(REPLACE "<CMAKE_C_COMPILER>"
++             "${CMAKE_C_COMPILER}" test_compile_command ${test_compile_command})
++    elseif(substitution STREQUAL "<OBJECT>")
++      string(REPLACE "<OBJECT>" "${TARGET_NAME}/CheckSectionExists.o"
++             test_compile_command ${test_compile_command})
++    elseif(substitution STREQUAL "<SOURCE>")
++      string(REPLACE "<SOURCE>" "${TARGET_NAME}/CheckSectionExists.c"
++             test_compile_command ${test_compile_command})
++    elseif(substitution STREQUAL "<FLAGS>")
++      string(REPLACE "<FLAGS>" "${CMAKE_C_FLAGS} ${extra_flags}"
++             test_compile_command ${test_compile_command})
++    else()
++      string(REPLACE "${substitution}" "" test_compile_command
++             ${test_compile_command})
++    endif()
++  endforeach()
++
++  string(REPLACE " " ";" test_compile_command "${test_compile_command}")
++
++  execute_process(
++    COMMAND ${test_compile_command}
++    RESULT_VARIABLE TEST_RESULT
++    OUTPUT_VARIABLE TEST_OUTPUT
++    ERROR_VARIABLE TEST_ERROR
++  )
++
++  execute_process(
++    COMMAND ${CMAKE_OBJDUMP} -h "${TARGET_NAME}/CheckSectionExists.o"
++    RESULT_VARIABLE CHECK_RESULT
++    OUTPUT_VARIABLE CHECK_OUTPUT
++    ERROR_VARIABLE CHECK_ERROR
++  )
++  string(FIND "${CHECK_OUTPUT}" "${section}" SECTION_FOUND)
++
++  if(NOT SECTION_FOUND EQUAL -1)
++    set(${output} TRUE PARENT_SCOPE)
++  else()
++    set(${output} FALSE PARENT_SCOPE)
++  endif()
++
++  file(REMOVE_RECURSE ${TARGET_NAME})
++endfunction()
++
++check_cxx_section_exists(".init_array" COMPILER_RT_HAS_INITFINI_ARRAY
++  SOURCE "__attribute__((constructor)) void f() {}\nint main() { return 0; }\n")
++
++append_list_if(COMPILER_RT_HAS_INITFINI_ARRAY -DCRT_HAS_INITFINI_ARRAY CRT_CFLAGS)
++append_list_if(COMPILER_RT_HAS_FPIC_FLAG -fPIC CRT_CFLAGS)
++
++foreach(arch ${CRT_SUPPORTED_ARCH})
++  add_compiler_rt_runtime(clang_rt.crtbegin
++    OBJECT
++    ARCHS ${arch}
++    SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/crtbegin.c
++    CFLAGS ${CRT_CFLAGS}
++    PARENT_TARGET crt)
++  add_compiler_rt_runtime(clang_rt.crtbegin_shared
++    OBJECT
++    ARCHS ${arch}
++    SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/crtbegin.c
++    CFLAGS ${CRT_CFLAGS} -DCRT_SHARED
++    PARENT_TARGET crt)
++  add_compiler_rt_runtime(clang_rt.crtend
++    OBJECT
++    ARCHS ${arch}
++    SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/crtend.c
++    CFLAGS ${CRT_CFLAGS}
++    PARENT_TARGET crt)
++  add_compiler_rt_runtime(clang_rt.crtend_shared
++    OBJECT
++    ARCHS ${arch}
++    SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/crtend.c
++    CFLAGS ${CRT_CFLAGS} -DCRT_SHARED
++    PARENT_TARGET crt)
++endforeach()
+Index: compiler-rt/lib/crt/crtbegin.c
+===================================================================
+--- /dev/null
++++ compiler-rt/lib/crt/crtbegin.c
+@@ -0,0 +1,108 @@
++/* ===-- crtbegin.c - Start of constructors and destructors ----------------===
++ *
++ *      	       The LLVM Compiler Infrastructure
++ *
++ * This file is dual licensed under the MIT and the University of Illinois Open
++ * Source Licenses. See LICENSE.TXT for details.
++ *
++ * ===----------------------------------------------------------------------===
++ */
++
++#include <stddef.h>
++
++__attribute__((visibility("hidden")))
++#ifdef CRT_SHARED
++void *__dso_handle = &__dso_handle;
++#else
++void *__dso_handle = (void *)0;
++#endif
++
++static long __EH_FRAME_LIST__[]
++    __attribute__((section(".eh_frame"), aligned(sizeof(void *)))) = {};
++
++extern void __register_frame_info(const void *, void *) __attribute__((weak));
++extern void *__deregister_frame_info(const void *) __attribute__((weak));
++
++#ifndef CRT_HAS_INITFINI_ARRAY
++typedef void (*fp)(void);
++
++static fp __CTOR_LIST__[]
++    __attribute__((section(".ctors"), aligned(sizeof(fp)), used)) = {(fp)-1};
++extern fp __CTOR_LIST_END__[];
++#endif
++
++#ifdef CRT_SHARED
++extern void __cxa_finalize(void *) __attribute__((weak));
++#endif
++
++static void __attribute__((used)) __do_init() {
++  static _Bool __initialized;
++  if (__builtin_expect(__initialized, 0))
++    return;
++  __initialized = 1;
++
++  static struct { void *p[8]; } __object;
++  if (__register_frame_info)
++    __register_frame_info(__EH_FRAME_LIST__, &__object);
++
++#ifndef CRT_HAS_INITFINI_ARRAY
++  const size_t n = __CTOR_LIST_END__ - __CTOR_LIST__ - 1;
++  for (size_t i = n; i >= 1; i--) __CTOR_LIST__[i]();
++#endif
++}
++
++#ifdef CRT_HAS_INITFINI_ARRAY
++__attribute__((section(".init_array"),
++               used)) static void (*__init)(void) = __do_init;
++#else  // CRT_HAS_INITFINI_ARRAY
++#if defined(__i386__) || defined(__x86_64__)
++asm(".pushsection .init,\"ax\",@progbits\n\t"
++    "call " __USER_LABEL_PREFIX__ "__do_init\n\t"
++    ".popsection");
++#elif defined(__arm__)
++asm(".pushsection .init,\"ax\",%progbits\n\t"
++    "bl " __USER_LABEL_PREFIX__ "__do_init\n\t"
++    ".popsection");
++#endif  // CRT_HAS_INITFINI_ARRAY
++#endif
++
++#ifndef CRT_HAS_INITFINI_ARRAY
++static fp __DTOR_LIST__[]
++    __attribute__((section(".dtors"), aligned(sizeof(fp)), used)) = {(fp)-1};
++extern fp __DTOR_LIST_END__[];
++#endif
++
++static void __attribute__((used)) __do_fini() {
++  static _Bool __finalized;
++  if (__builtin_expect(__finalized, 0))
++    return;
++  __finalized = 1;
++
++#ifdef CRT_SHARED
++  if (__cxa_finalize)
++    __cxa_finalize(__dso_handle);
++#endif
++
++#ifndef CRT_HAS_INITFINI_ARRAY
++  if (__deregister_frame_info)
++    __deregister_frame_info(__EH_FRAME_LIST__);
++
++  const size_t n = __DTOR_LIST_END__ - __DTOR_LIST__ - 1;
++  for (size_t i = 1; i < n; i++) __DTOR_LIST__[i]();
++#endif
++}
++
++#ifdef CRT_HAS_INITFINI_ARRAY
++__attribute__((section(".fini_array"),
++               used)) static void (*__fini)(void) = __do_fini;
++#else  // CRT_HAS_INITFINI_ARRAY
++#if defined(__i386__) || defined(__x86_64__)
++asm(".pushsection .fini,\"ax\",@progbits\n\t"
++    "call " __USER_LABEL_PREFIX__ "__do_fini\n\t"
++    ".popsection");
++#elif defined(__arm__)
++asm(".pushsection .fini,\"ax\",%progbits\n\t"
++    "bl " __USER_LABEL_PREFIX__ "__do_fini\n\t"
++    ".popsection");
++#endif
++#endif  // CRT_HAS_INIT_FINI_ARRAY
+Index: compiler-rt/lib/crt/crtend.c
+===================================================================
+--- /dev/null
++++ compiler-rt/lib/crt/crtend.c
+@@ -0,0 +1,24 @@
++/* ===-- crtend.c - End of constructors and destructors --------------------===
++ *
++ *      	       The LLVM Compiler Infrastructure
++ *
++ * This file is dual licensed under the MIT and the University of Illinois Open
++ * Source Licenses. See LICENSE.TXT for details.
++ *
++ * ===----------------------------------------------------------------------===
++ */
++
++#include <stdint.h>
++
++// Put 4-byte zero which is the length field in FDE at the end as a terminator.
++const int32_t __EH_FRAME_LIST_END__[]
++    __attribute__((section(".eh_frame"), aligned(sizeof(int32_t)),
++                   visibility("hidden"), used)) = {0};
++
++#ifndef CRT_HAS_INITFINI_ARRAY
++typedef void (*fp)(void);
++fp __CTOR_LIST_END__[]
++    __attribute__((section(".ctors"), visibility("hidden"), used)) = {0};
++fp __DTOR_LIST_END__[]
++    __attribute__((section(".dtors"), visibility("hidden"), used)) = {0};
++#endif
+Index: compiler-rt/test/CMakeLists.txt
+===================================================================
+--- compiler-rt/test/CMakeLists.txt
++++ compiler-rt/test/CMakeLists.txt
+@@ -73,6 +73,9 @@
+   if(COMPILER_RT_BUILD_XRAY)
+     compiler_rt_test_runtime(xray)
+   endif()
++  if(COMPILER_RT_HAS_CRT)
++    add_subdirectory(crt)
++  endif()
+   # ShadowCallStack does not yet provide a runtime with compiler-rt, the tests
+   # include their own minimal runtime
+   add_subdirectory(shadowcallstack)
+Index: compiler-rt/test/crt/CMakeLists.txt
+===================================================================
+--- /dev/null
++++ compiler-rt/test/crt/CMakeLists.txt
+@@ -0,0 +1,31 @@
++set(CRT_LIT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
++
++set(CRT_TESTSUITES)
++
++set(CRT_TEST_DEPS "")
++
++if(NOT COMPILER_RT_STANDALONE_BUILD AND COMPILER_RT_BUILD_CRT AND
++   COMPILER_RT_HAS_CRT)
++  list(APPEND CRT_TEST_DEPS crt)
++endif()
++
++set(CRT_TEST_ARCH ${CRT_SUPPORTED_ARCH})
++if (COMPILER_RT_BUILD_CRT AND COMPILER_RT_HAS_CRT)
++  foreach(arch ${CRT_TEST_ARCH})
++    set(CRT_TEST_TARGET_ARCH ${arch})
++    string(TOLOWER "-${arch}-${OS_NAME}" CRT_TEST_CONFIG_SUFFIX)
++    get_test_cc_for_arch(${arch} CRT_TEST_TARGET_CC CRT_TEST_TARGET_CFLAGS)
++    string(TOUPPER ${arch} ARCH_UPPER_CASE)
++    set(CONFIG_NAME ${ARCH_UPPER_CASE}${OS_NAME}Config)
++
++    configure_lit_site_cfg(
++      ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
++      ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg)
++    list(APPEND CRT_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME})
++  endforeach()
++endif()
++
++add_lit_testsuite(check-crt "Running the CRT tests"
++  ${CRT_TESTSUITES}
++  DEPENDS ${CRT_TEST_DEPS})
++set_target_properties(check-crt PROPERTIES FOLDER "Compiler-RT Misc")
+Index: compiler-rt/test/crt/dso_handle.cpp
+===================================================================
+--- /dev/null
++++ compiler-rt/test/crt/dso_handle.cpp
+@@ -0,0 +1,33 @@
++// RUN: %clangxx -g -DCRT_SHARED -c %s -fPIC -o %tshared.o
++// RUN: %clangxx -g -c %s -fPIC -o %t.o
++// RUN: %clangxx -g -shared -o %t.so -nostdlib %crti %shared_crtbegin %tshared.o %libstdcxx -lc -lm -lgcc_s %shared_crtend %crtn
++// RUN: %clangxx -g -o %t -nostdlib %crt1 %crti %crtbegin %t.o %libstdcxx -lc -lm %libgcc %t.so %crtend %crtn
++// RUN: %run %t 2>&1 | FileCheck %s
++
++#include <stdio.h>
++
++// CHECK: 1
++// CHECK-NEXT: ~A()
++
++#ifdef CRT_SHARED
++bool G;
++void C() {
++  printf("%d\n", G);
++}
++
++struct A {
++  A() { G = true; }
++  ~A() {
++    printf("~A()\n");
++  }
++};
++
++A a;
++#else
++void C();
++
++int main() {
++  C();
++  return 0;
++}
++#endif
+Index: compiler-rt/test/crt/lit.cfg
+===================================================================
+--- /dev/null
++++ compiler-rt/test/crt/lit.cfg
+@@ -0,0 +1,80 @@
++# -*- Python -*-
++
++import os
++import subprocess
++
++# Setup config name.
++config.name = 'CRT' + config.name_suffix
++
++# Setup source root.
++config.test_source_root = os.path.dirname(__file__)
++
++
++def get_library_path(file):
++    cmd = subprocess.Popen([config.clang.strip(),
++                            config.target_cflags.strip(),
++                            '-print-file-name=%s' % file],
++                           stdout=subprocess.PIPE,
++                           env=config.environment)
++    if not cmd.stdout:
++      lit_config.fatal("Couldn't find the library path for '%s'" % file)
++    dir = cmd.stdout.read().strip()
++    if sys.platform in ['win32'] and execute_external:
++        # Don't pass dosish path separator to msys bash.exe.
++        dir = dir.replace('\\', '/')
++    # Ensure the result is an ascii string, across Python2.5+ - Python3.
++    return str(dir.decode('ascii'))
++
++
++def get_libgcc_file_name():
++    cmd = subprocess.Popen([config.clang.strip(),
++                            config.target_cflags.strip(),
++                            '-print-libgcc-file-name'],
++                           stdout=subprocess.PIPE,
++                           env=config.environment)
++    if not cmd.stdout:
++      lit_config.fatal("Couldn't find the library path for '%s'" % file)
++    dir = cmd.stdout.read().strip()
++    if sys.platform in ['win32'] and execute_external:
++        # Don't pass dosish path separator to msys bash.exe.
++        dir = dir.replace('\\', '/')
++    # Ensure the result is an ascii string, across Python2.5+ - Python3.
++    return str(dir.decode('ascii'))
++
++
++def build_invocation(compile_flags):
++    return ' ' + ' '.join([config.clang] + compile_flags) + ' '
++
++
++# Setup substitutions.
++config.substitutions.append(
++    ('%clang ', build_invocation([config.target_cflags])))
++config.substitutions.append(
++    ('%clangxx ',
++     build_invocation(config.cxx_mode_flags + [config.target_cflags])))
++
++base_lib = os.path.join(
++    config.compiler_rt_libdir, "clang_rt.%%s-%s.o" % config.target_arch)
++config.substitutions.append(('%crtbegin', base_lib % "crtbegin"))
++config.substitutions.append(('%shared_crtbegin', base_lib % "crtbegin_shared"))
++config.substitutions.append(('%crtend', base_lib % "crtend"))
++config.substitutions.append(('%shared_crtend', base_lib % "crtend_shared"))
++
++config.substitutions.append(
++    ('%crt1', get_library_path('crt1.o')))
++config.substitutions.append(
++    ('%crti', get_library_path('crti.o')))
++config.substitutions.append(
++    ('%crtn', get_library_path('crtn.o')))
++
++config.substitutions.append(
++    ('%libgcc', get_libgcc_file_name()))
++
++config.substitutions.append(
++    ('%libstdcxx', '-l' + config.sanitizer_cxx_lib.lstrip('lib')))
++
++# Default test suffixes.
++config.suffixes = ['.c', '.cc', '.cpp']
++
++if config.host_os not in ['Linux']:
++    config.unsupported = True
+Index: compiler-rt/test/crt/lit.site.cfg.in
+===================================================================
+--- /dev/null
++++ compiler-rt/test/crt/lit.site.cfg.in
+@@ -0,0 +1,14 @@
++@LIT_SITE_CFG_IN_HEADER@
++
++# Tool-specific config options.
++config.name_suffix = "@CRT_TEST_CONFIG_SUFFIX@"
++config.crt_lit_source_dir = "@CRT_LIT_SOURCE_DIR@"
++config.target_cflags = "@CRT_TEST_TARGET_CFLAGS@"
++config.target_arch = "@CRT_TEST_TARGET_ARCH@"
++config.sanitizer_cxx_lib = "@SANITIZER_TEST_CXX_LIBNAME@"
++
++# Load common config for all compiler-rt lit tests
++lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured")
++
++# Load tool-specific config that would do the real work.
++lit_config.load_config(config, "@CRT_LIT_SOURCE_DIR@/lit.cfg")
diff --git a/pkgs/development/compilers/llvm/9/default.nix b/pkgs/development/compilers/llvm/9/default.nix
new file mode 100644
index 00000000000..36d7a14142b
--- /dev/null
+++ b/pkgs/development/compilers/llvm/9/default.nix
@@ -0,0 +1,197 @@
+{ lowPrio, newScope, pkgs, stdenv, cmake, libstdcxxHook
+, libxml2, python, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith
+, buildLlvmTools # tools, but from the previous stage, for cross
+, targetLlvmLibraries # libraries, but from the next stage, for cross
+}:
+
+let
+  release_version = "8.0.1";
+  version = release_version; # differentiating these is important for rc's
+
+  fetch = name: sha256: fetchurl {
+    url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${release_version}/${name}-${version}.src.tar.xz";
+    inherit sha256;
+  };
+
+  clang-tools-extra_src = fetch "clang-tools-extra" "1qf3097bc5ia8p6cpmbx985rjr3yaah5s8fc0nv7pw742yv7jw8q";
+
+  tools = stdenv.lib.makeExtensible (tools: let
+    callPackage = newScope (tools // { inherit stdenv cmake libxml2 python isl release_version version fetch; });
+    mkExtraBuildCommands = cc: ''
+      rsrc="$out/resource-root"
+      mkdir "$rsrc"
+      ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc"
+      ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib"
+      echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
+    '' + stdenv.lib.optionalString (stdenv.targetPlatform.isLinux && tools.clang-unwrapped ? gcc && !(stdenv.targetPlatform.useLLVM or false)) ''
+      echo "--gcc-toolchain=${tools.clang-unwrapped.gcc}" >> $out/nix-support/cc-cflags
+    '';
+  in {
+
+    llvm = callPackage ./llvm.nix { };
+    llvm-polly = callPackage ./llvm.nix { enablePolly = true; };
+
+    clang-unwrapped = callPackage ./clang {
+      inherit clang-tools-extra_src;
+    };
+    clang-polly-unwrapped = callPackage ./clang {
+      inherit clang-tools-extra_src;
+      llvm = tools.llvm-polly;
+      enablePolly = true;
+    };
+
+    llvm-manpages = lowPrio (tools.llvm.override {
+      enableManpages = true;
+      python = pkgs.python;  # don't use python-boot
+    });
+
+    clang-manpages = lowPrio (tools.clang-unwrapped.override {
+      enableManpages = true;
+      python = pkgs.python;  # don't use python-boot
+    });
+
+    libclang = tools.clang-unwrapped.lib;
+
+    clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang;
+
+    libstdcxxClang = wrapCCWith rec {
+      cc = tools.clang-unwrapped;
+      extraPackages = [
+        libstdcxxHook
+        targetLlvmLibraries.compiler-rt
+      ];
+      extraBuildCommands = mkExtraBuildCommands cc;
+    };
+
+    libcxxClang = wrapCCWith rec {
+      cc = tools.clang-unwrapped;
+      libcxx = targetLlvmLibraries.libcxx;
+      extraPackages = [
+        targetLlvmLibraries.libcxx
+        targetLlvmLibraries.libcxxabi
+        targetLlvmLibraries.compiler-rt
+      ];
+      extraBuildCommands = mkExtraBuildCommands cc;
+    };
+
+    lld = callPackage ./lld.nix {};
+
+    lldb = callPackage ./lldb.nix {};
+
+    # Below, is the LLVM bootstrapping logic. It handles building a
+    # fully LLVM toolchain from scratch. No GCC toolchain should be
+    # pulled in. As a consequence, it is very quick to build different
+    # targets provided by LLVM and we can also build for what GCC
+    # doesn’t support like LLVM. Probably we should move to some other
+    # file.
+
+    bintools = callPackage ./bintools.nix {};
+
+    lldClang = wrapCCWith rec {
+      cc = tools.clang-unwrapped;
+      libcxx = targetLlvmLibraries.libcxx;
+      bintools = wrapBintoolsWith {
+        inherit (tools) bintools;
+      };
+      extraPackages = [
+        targetLlvmLibraries.libcxx
+        targetLlvmLibraries.libcxxabi
+        targetLlvmLibraries.compiler-rt
+      ] ++ stdenv.lib.optionals (!stdenv.targetPlatform.isWasm) [
+        targetLlvmLibraries.libunwind
+      ];
+      extraBuildCommands = ''
+        echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags
+        echo "-rtlib=compiler-rt -Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags
+        echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags
+      '' + stdenv.lib.optionalString (!stdenv.targetPlatform.isWasm) ''
+        echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags
+      '' + stdenv.lib.optionalString stdenv.targetPlatform.isWasm ''
+        echo "-fno-exceptions" >> $out/nix-support/cc-cflags
+      '' + mkExtraBuildCommands cc;
+    };
+
+    lldClangNoLibcxx = wrapCCWith rec {
+      cc = tools.clang-unwrapped;
+      libcxx = null;
+      bintools = wrapBintoolsWith {
+        inherit (tools) bintools;
+      };
+      extraPackages = [
+        targetLlvmLibraries.compiler-rt
+      ];
+      extraBuildCommands = ''
+        echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags
+        echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags
+        echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags
+        echo "-nostdlib++" >> $out/nix-support/cc-cflags
+      '' + mkExtraBuildCommands cc;
+    };
+
+    lldClangNoLibc = wrapCCWith rec {
+      cc = tools.clang-unwrapped;
+      libcxx = null;
+      bintools = wrapBintoolsWith {
+        inherit (tools) bintools;
+        libc = null;
+      };
+      extraPackages = [
+        targetLlvmLibraries.compiler-rt
+      ];
+      extraBuildCommands = ''
+        echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags
+        echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags
+        echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags
+      '' + mkExtraBuildCommands cc;
+    };
+
+    lldClangNoCompilerRt = wrapCCWith {
+      cc = tools.clang-unwrapped;
+      libcxx = null;
+      bintools = wrapBintoolsWith {
+        inherit (tools) bintools;
+        libc = null;
+      };
+      extraPackages = [ ];
+      extraBuildCommands = ''
+        echo "-nostartfiles" >> $out/nix-support/cc-cflags
+        echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags
+      '';
+    };
+
+  });
+
+  libraries = stdenv.lib.makeExtensible (libraries: let
+    callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python isl release_version version fetch; });
+  in {
+
+    compiler-rt = callPackage ./compiler-rt.nix ({} //
+      (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
+        stdenv = overrideCC stdenv buildLlvmTools.lldClangNoCompilerRt;
+      }));
+
+    stdenv = overrideCC stdenv buildLlvmTools.clang;
+
+    libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
+
+    libcxx = callPackage ./libc++ ({} //
+      (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
+        stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
+      }));
+
+    libcxxabi = callPackage ./libc++abi.nix ({} //
+      (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
+        stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
+        libunwind = libraries.libunwind;
+      }));
+
+    openmp = callPackage ./openmp.nix {};
+
+    libunwind = callPackage ./libunwind.nix ({} //
+      (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
+        stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
+      }));
+
+  });
+
+in { inherit tools libraries; } // libraries // tools
diff --git a/pkgs/development/compilers/llvm/9/libc++/default.nix b/pkgs/development/compilers/llvm/9/libc++/default.nix
new file mode 100644
index 00000000000..8ec1c419748
--- /dev/null
+++ b/pkgs/development/compilers/llvm/9/libc++/default.nix
@@ -0,0 +1,59 @@
+{ lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version
+, enableShared ? true }:
+
+stdenv.mkDerivation {
+  pname = "libc++";
+  inherit version;
+
+  src = fetch "libcxx" "0y4vc9z36c1zlq15cnibdzxnc1xi5glbc6klnm8a41q3db4541kz";
+
+  postUnpack = ''
+    unpackFile ${libcxxabi.src}
+    export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include"
+  '';
+
+  patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ../../libcxx-0001-musl-hacks.patch;
+
+  prePatch = ''
+    substituteInPlace lib/CMakeLists.txt --replace "/usr/lib/libc++" "\''${LIBCXX_LIBCXXABI_LIB_PATH}/libc++"
+  '';
+
+  preConfigure = ''
+    # Get headers from the cxxabi source so we can see private headers not installed by the cxxabi package
+    cmakeFlagsArray=($cmakeFlagsArray -DLIBCXX_CXX_ABI_INCLUDE_PATHS="$LIBCXXABI_INCLUDE_DIR")
+  '' + lib.optionalString stdenv.hostPlatform.isMusl ''
+    patchShebangs utils/cat_files.py
+  '';
+  nativeBuildInputs = [ cmake ]
+    ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python;
+
+  buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
+
+  cmakeFlags = [
+    "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib"
+    "-DLIBCXX_LIBCPPABI_VERSION=2"
+    "-DLIBCXX_CXX_ABI=libcxxabi"
+  ] ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1"
+    ++ stdenv.lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON"
+    ++ stdenv.lib.optional stdenv.hostPlatform.isWasm [
+      "-DLIBCXX_ENABLE_THREADS=OFF"
+      "-DLIBCXX_ENABLE_FILESYSTEM=OFF"
+      "-DLIBCXX_ENABLE_EXCEPTIONS=OFF"
+    ] ++ stdenv.lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF";
+
+  enableParallelBuilding = true;
+
+  linkCxxAbi = stdenv.isLinux;
+
+  setupHooks = [
+    ../../../../../build-support/setup-hooks/role.bash
+    ./setup-hook.sh
+  ];
+
+  meta = {
+    homepage = http://libcxx.llvm.org/;
+    description = "A new implementation of the C++ standard library, targeting C++11";
+    license = with stdenv.lib.licenses; [ ncsa mit ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/development/compilers/llvm/9/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/9/libc++/setup-hook.sh
new file mode 100644
index 00000000000..6611259165a
--- /dev/null
+++ b/pkgs/development/compilers/llvm/9/libc++/setup-hook.sh
@@ -0,0 +1,6 @@
+# See pkgs/build-support/setup-hooks/role.bash
+getHostRole
+
+linkCxxAbi="@linkCxxAbi@"
+export NIX_${role_pre}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1"
+export NIX_${role_pre}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}"
diff --git a/pkgs/development/compilers/llvm/9/libc++abi.nix b/pkgs/development/compilers/llvm/9/libc++abi.nix
new file mode 100644
index 00000000000..58a1241d823
--- /dev/null
+++ b/pkgs/development/compilers/llvm/9/libc++abi.nix
@@ -0,0 +1,67 @@
+{ stdenv, cmake, fetch, libcxx, libunwind, llvm, version
+, enableShared ? true }:
+
+stdenv.mkDerivation {
+  pname = "libc++abi";
+  inherit version;
+
+  src = fetch "libcxxabi" "1vznz8n1z1h8af0ga451m98lc2hjnv4fyzl71napsvjhvk4g6nxp";
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind;
+
+  cmakeFlags = stdenv.lib.optionals (stdenv.hostPlatform.useLLVM or false) [
+    "-DLLVM_ENABLE_LIBCXX=ON"
+    "-DLIBCXXABI_USE_LLVM_UNWINDER=ON"
+  ] ++ stdenv.lib.optionals stdenv.hostPlatform.isWasm [
+    "-DLIBCXXABI_ENABLE_THREADS=OFF"
+    "-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF"
+  ] ++ stdenv.lib.optionals (!enableShared) [
+    "-DLIBCXXABI_ENABLE_SHARED=OFF"
+  ];
+
+  patches = [ ./libcxxabi-no-threads.patch ];
+
+  postUnpack = ''
+    unpackFile ${libcxx.src}
+    unpackFile ${llvm.src}
+    cmakeFlags+=" -DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_PATH=$PWD/$(ls -d libcxx-*)"
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    export TRIPLE=x86_64-apple-darwin
+  '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+    patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch}
+  '' + stdenv.lib.optionalString stdenv.hostPlatform.isWasm ''
+    patch -p1 -d $(ls -d llvm-*) -i ${./libcxxabi-wasm.patch}
+  '';
+
+  installPhase = if stdenv.isDarwin
+    then ''
+      for file in lib/*.dylib; do
+        # this should be done in CMake, but having trouble figuring out
+        # the magic combination of necessary CMake variables
+        # if you fancy a try, take a look at
+        # http://www.cmake.org/Wiki/CMake_RPATH_handling
+        install_name_tool -id $out/$file $file
+      done
+      make install
+      install -d 755 $out/include
+      install -m 644 ../include/*.h $out/include
+    ''
+    else ''
+      install -d -m 755 $out/include $out/lib
+      install -m 644 lib/libc++abi.a $out/lib
+      install -m 644 ../include/cxxabi.h $out/include
+    '' + stdenv.lib.optionalString enableShared ''
+      install -m 644 lib/libc++abi.so.1.0 $out/lib
+      ln -s libc++abi.so.1.0 $out/lib/libc++abi.so
+      ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1
+    '';
+
+  meta = {
+    homepage = http://libcxxabi.llvm.org/;
+    description = "A new implementation of low level support for a standard C++ library";
+    license = with stdenv.lib.licenses; [ ncsa mit ];
+    maintainers = with stdenv.lib.maintainers; [ vlstill ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/development/compilers/llvm/9/libcxxabi-no-threads.patch b/pkgs/development/compilers/llvm/9/libcxxabi-no-threads.patch
new file mode 100644
index 00000000000..787f3e16500
--- /dev/null
+++ b/pkgs/development/compilers/llvm/9/libcxxabi-no-threads.patch
@@ -0,0 +1,12 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4138acf..41b4763 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -362,6 +362,7 @@ if (NOT LIBCXXABI_ENABLE_THREADS)
+                         " is also set to ON.")
+   endif()
+   add_definitions(-D_LIBCXXABI_HAS_NO_THREADS)
++  add_definitions(-D_LIBCPP_HAS_NO_THREADS)
+ endif()
+ 
+ if (LIBCXXABI_HAS_EXTERNAL_THREAD_API)
diff --git a/pkgs/development/compilers/llvm/9/libcxxabi-wasm.patch b/pkgs/development/compilers/llvm/9/libcxxabi-wasm.patch
new file mode 100644
index 00000000000..4ebfe46aa81
--- /dev/null
+++ b/pkgs/development/compilers/llvm/9/libcxxabi-wasm.patch
@@ -0,0 +1,16 @@
+diff --git a/cmake/modules/HandleLLVMOptions.cmake b/cmake/modules/HandleLLVMOptions.cmake
+index 15497d405e0..33f7f18193a 100644
+--- a/cmake/modules/HandleLLVMOptions.cmake
++++ b/cmake/modules/HandleLLVMOptions.cmake
+@@ -127,7 +127,10 @@ else(WIN32)
+       set(LLVM_HAVE_LINK_VERSION_SCRIPT 1)
+     endif()
+   else(FUCHSIA OR UNIX)
+-    MESSAGE(SEND_ERROR "Unable to determine platform")
++    if(${CMAKE_SYSTEM_NAME} MATCHES "Wasi")
++    else()
++      MESSAGE(SEND_ERROR "Unable to determine platform")
++    endif()
+   endif(FUCHSIA OR UNIX)
+ endif(WIN32)
+ 
diff --git a/pkgs/development/compilers/llvm/9/libunwind.nix b/pkgs/development/compilers/llvm/9/libunwind.nix
new file mode 100644
index 00000000000..646cd3c3ca4
--- /dev/null
+++ b/pkgs/development/compilers/llvm/9/libunwind.nix
@@ -0,0 +1,25 @@
+{ stdenv, version, fetch, cmake, fetchpatch, enableShared ? true }:
+
+stdenv.mkDerivation {
+  pname = "libunwind";
+  inherit version;
+
+  src = fetch "libunwind" "0vhgcgzsb33l83qaikrkj87ypqb48mi607rccczccwiiv8ficw0q";
+
+  nativeBuildInputs = [ cmake ];
+
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/llvm-mirror/libunwind/commit/34a45c630d4c79af403661d267db42fbe7de1178.patch";
+      sha256 = "0n0pv6jvcky8pn3srhrf9x5kbnd0d2kia9xlx2g590f5q0bgwfhv";
+    })
+    (fetchpatch {
+      url = "https://github.com/llvm-mirror/libunwind/commit/e050272d2eb57eb4e56a37b429a61df2ebb8aa3e.patch";
+      sha256 = "1sxyx5xnax8k713jjcxgq3jq3cpnxygs2rcdf5vfja0f2k9jzldl";
+    })
+  ];
+
+  enableParallelBuilding = true;
+
+  cmakeFlags = stdenv.lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF";
+}
diff --git a/pkgs/development/compilers/llvm/9/lld.nix b/pkgs/development/compilers/llvm/9/lld.nix
new file mode 100644
index 00000000000..fc52d691d03
--- /dev/null
+++ b/pkgs/development/compilers/llvm/9/lld.nix
@@ -0,0 +1,33 @@
+{ stdenv
+, fetch
+, cmake
+, libxml2
+, llvm
+, version
+}:
+
+stdenv.mkDerivation {
+  pname = "lld";
+  inherit version;
+
+  src = fetch "lld" "121xhxrlvwy3k5nf6p1wv31whxlb635ssfkci8z93mwv4ja1xflz";
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ llvm libxml2 ];
+
+  outputs = [ "out" "dev" ];
+
+  enableParallelBuilding = true;
+
+  postInstall = ''
+    moveToOutput include "$dev"
+    moveToOutput lib "$dev"
+  '';
+
+  meta = {
+    description = "The LLVM Linker";
+    homepage    = http://lld.llvm.org/;
+    license     = stdenv.lib.licenses.ncsa;
+    platforms   = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/development/compilers/llvm/9/lldb.nix b/pkgs/development/compilers/llvm/9/lldb.nix
new file mode 100644
index 00000000000..254933c82a0
--- /dev/null
+++ b/pkgs/development/compilers/llvm/9/lldb.nix
@@ -0,0 +1,61 @@
+{ stdenv
+, fetch
+, cmake
+, zlib
+, ncurses
+, swig
+, which
+, libedit
+, libxml2
+, llvm
+, clang-unwrapped
+, python
+, version
+, darwin
+}:
+
+stdenv.mkDerivation {
+  pname = "lldb";
+  inherit version;
+
+  src = fetch "lldb" "1mriw4adrwm6kzabrjr7yqmdiylxd6glf6samd80dp8idnm9p9z8";
+
+  postPatch = ''
+    # Fix up various paths that assume llvm and clang are installed in the same place
+    sed -i 's,".*ClangConfig.cmake","${clang-unwrapped}/lib/cmake/clang/ClangConfig.cmake",' \
+      cmake/modules/LLDBStandalone.cmake
+    sed -i 's,".*tools/clang/include","${clang-unwrapped}/include",' \
+      cmake/modules/LLDBStandalone.cmake
+    sed -i 's,"$.LLVM_LIBRARY_DIR.",${llvm}/lib ${clang-unwrapped}/lib,' \
+      cmake/modules/LLDBStandalone.cmake
+  '';
+
+  nativeBuildInputs = [ cmake python which swig ];
+  buildInputs = [ ncurses zlib libedit libxml2 llvm ]
+    ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ];
+
+  CXXFLAGS = "-fno-rtti";
+  hardeningDisable = [ "format" ];
+
+  cmakeFlags = [
+    "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic
+  ];
+
+  enableParallelBuilding = true;
+
+  postInstall = ''
+    mkdir -p $out/share/man/man1
+    cp ../docs/lldb.1 $out/share/man/man1/
+
+    install -D ../tools/lldb-vscode/package.json $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/package.json
+    mkdir $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin
+    ln -s $out/bin/lldb-vscode $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A next-generation high-performance debugger";
+    homepage    = http://llvm.org/;
+    license     = licenses.ncsa;
+    platforms   = platforms.all;
+  };
+}
diff --git a/pkgs/development/compilers/llvm/9/llvm-outputs.patch b/pkgs/development/compilers/llvm/9/llvm-outputs.patch
new file mode 100644
index 00000000000..40096fa3497
--- /dev/null
+++ b/pkgs/development/compilers/llvm/9/llvm-outputs.patch
@@ -0,0 +1,26 @@
+diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp
+index 94d426b..37f7794 100644
+--- a/tools/llvm-config/llvm-config.cpp
++++ b/tools/llvm-config/llvm-config.cpp
+@@ -333,6 +333,21 @@ int main(int argc, char **argv) {
+     ActiveIncludeOption = "-I" + ActiveIncludeDir;
+   }
+ 
++  /// Nix-specific multiple-output handling: override ActiveLibDir if --link-shared
++  if (!IsInDevelopmentTree) {
++    bool WantShared = true;
++    for (int i = 1; i < argc; ++i) {
++      StringRef Arg = argv[i];
++      if (Arg == "--link-shared")
++        WantShared = true;
++      else if (Arg == "--link-static")
++        WantShared = false; // the last one wins
++    }
++
++    if (WantShared)
++      ActiveLibDir = std::string("@lib@") + "/lib" + LLVM_LIBDIR_SUFFIX;
++  }
++
+   /// We only use `shared library` mode in cases where the static library form
+   /// of the components provided are not available; note however that this is
+   /// skipped if we're run from within the build dir. However, once installed,
diff --git a/pkgs/development/compilers/llvm/9/llvm.nix b/pkgs/development/compilers/llvm/9/llvm.nix
new file mode 100644
index 00000000000..70e666ba27d
--- /dev/null
+++ b/pkgs/development/compilers/llvm/9/llvm.nix
@@ -0,0 +1,173 @@
+{ stdenv
+, fetch
+, cmake
+, python
+, libffi
+, libbfd
+, libpfm
+, libxml2
+, ncurses
+, version
+, release_version
+, zlib
+, buildPackages
+, debugVersion ? false
+, enableManpages ? false
+, enableSharedLibraries ? true
+, enablePFM ? !(stdenv.isDarwin
+  || stdenv.isAarch64 # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245
+)
+, enablePolly ? false
+}:
+
+let
+  inherit (stdenv.lib) optional optionals optionalString;
+
+  # Used when creating a version-suffixed symlink of libLLVM.dylib
+  shortVersion = with stdenv.lib;
+    concatStringsSep "." (take 1 (splitString "." release_version));
+
+in stdenv.mkDerivation ({
+  name = "llvm-${version}";
+
+  src = fetch "llvm" "1rvm5gqp5v8hfn17kqws3zhk94w4kxndal12bqa0y57p09nply24";
+  polly_src = fetch "polly" "1lfjdz3ilj5xmjxvicd8f5ykybks67ry2pdb777352r3mzlgg8g8";
+
+  unpackPhase = ''
+    unpackFile $src
+    mv llvm-${version}* llvm
+    sourceRoot=$PWD/llvm
+  '' + optionalString enablePolly ''
+    unpackFile $polly_src
+    mv polly-* $sourceRoot/tools/polly
+  '';
+
+  outputs = [ "out" "python" ]
+    ++ optional enableSharedLibraries "lib";
+
+  nativeBuildInputs = [ cmake python ]
+    ++ optionals enableManpages [ python.pkgs.sphinx python.pkgs.recommonmark ];
+
+  buildInputs = [ libxml2 libffi ]
+    ++ optional enablePFM libpfm; # exegesis
+
+  propagatedBuildInputs = [ ncurses zlib ];
+
+  postPatch = optionalString stdenv.isDarwin ''
+    substituteInPlace cmake/modules/AddLLVM.cmake \
+      --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \
+      --replace 'set(_install_rpath "@loader_path/../lib" ''${extra_libdir})' ""
+  ''
+  # Patch llvm-config to return correct library path based on --link-{shared,static}.
+  + optionalString (enableSharedLibraries) ''
+    substitute '${./llvm-outputs.patch}' ./llvm-outputs.patch --subst-var lib
+    patch -p1 < ./llvm-outputs.patch
+  '' + ''
+    # FileSystem permissions tests fail with various special bits
+    substituteInPlace unittests/Support/CMakeLists.txt \
+      --replace "Path.cpp" ""
+    rm unittests/Support/Path.cpp
+  '' + optionalString stdenv.hostPlatform.isMusl ''
+    patch -p1 -i ${../TLI-musl.patch}
+    substituteInPlace unittests/Support/CMakeLists.txt \
+      --replace "add_subdirectory(DynamicLibrary)" ""
+    rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp
+    # valgrind unhappy with musl or glibc, but fails w/musl only
+    rm test/CodeGen/AArch64/wineh4.mir
+  '' + ''
+    patchShebangs test/BugPoint/compile-custom.ll.py
+  '';
+
+  # hacky fix: created binaries need to be run before installation
+  preBuild = ''
+    mkdir -p $out/
+    ln -sv $PWD/lib $out
+  '';
+
+  cmakeFlags = with stdenv; [
+    "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}"
+    "-DLLVM_INSTALL_UTILS=ON"  # Needed by rustc
+    "-DLLVM_BUILD_TESTS=ON"
+    "-DLLVM_ENABLE_FFI=ON"
+    "-DLLVM_ENABLE_RTTI=ON"
+    "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
+    "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}"
+    "-DLLVM_ENABLE_DUMP=ON"
+  ] ++ optionals enableSharedLibraries [
+    "-DLLVM_LINK_LLVM_DYLIB=ON"
+  ] ++ optionals enableManpages [
+    "-DLLVM_BUILD_DOCS=ON"
+    "-DLLVM_ENABLE_SPHINX=ON"
+    "-DSPHINX_OUTPUT_MAN=ON"
+    "-DSPHINX_OUTPUT_HTML=OFF"
+    "-DSPHINX_WARNINGS_AS_ERRORS=OFF"
+  ] ++ optionals (!isDarwin) [
+    "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include"
+  ] ++ optionals (isDarwin) [
+    "-DLLVM_ENABLE_LIBCXX=ON"
+    "-DCAN_TARGET_i386=false"
+  ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    "-DCMAKE_CROSSCOMPILING=True"
+    "-DLLVM_TABLEGEN=${buildPackages.llvm_7}/bin/llvm-tblgen"
+  ];
+
+  postBuild = ''
+    rm -fR $out
+  '';
+
+  preCheck = ''
+    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib
+  '';
+
+  postInstall = ''
+    mkdir -p $python/share
+    mv $out/share/opt-viewer $python/share/opt-viewer
+  ''
+  + optionalString enableSharedLibraries ''
+    moveToOutput "lib/libLLVM-*" "$lib"
+    moveToOutput "lib/libLLVM${stdenv.hostPlatform.extensions.sharedLibrary}" "$lib"
+    substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \
+      --replace "\''${_IMPORT_PREFIX}/lib/libLLVM-" "$lib/lib/libLLVM-"
+  ''
+  + optionalString (stdenv.isDarwin && enableSharedLibraries) ''
+    substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \
+      --replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib"
+    ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib
+    ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib
+  '';
+
+  doCheck = stdenv.isLinux && (!stdenv.isx86_32);
+
+  checkTarget = "check-all";
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "Collection of modular and reusable compiler and toolchain technologies";
+    homepage    = http://llvm.org/;
+    license     = stdenv.lib.licenses.ncsa;
+    maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ];
+    platforms   = stdenv.lib.platforms.all;
+  };
+} // stdenv.lib.optionalAttrs enableManpages {
+  name = "llvm-manpages-${version}";
+
+  buildPhase = ''
+    make docs-llvm-man
+  '';
+
+  propagatedBuildInputs = [];
+
+  installPhase = ''
+    make -C docs install
+  '';
+
+  postPatch = null;
+  postInstall = null;
+
+  outputs = [ "out" ];
+
+  doCheck = false;
+
+  meta.description = "man pages for LLVM ${version}";
+})
diff --git a/pkgs/development/compilers/llvm/9/openmp.nix b/pkgs/development/compilers/llvm/9/openmp.nix
new file mode 100644
index 00000000000..166e7f68eb3
--- /dev/null
+++ b/pkgs/development/compilers/llvm/9/openmp.nix
@@ -0,0 +1,26 @@
+{ stdenv
+, fetch
+, cmake
+, llvm
+, perl
+, version
+}:
+
+stdenv.mkDerivation {
+  pname = "openmp";
+  inherit version;
+
+  src = fetch "openmp" "0b3jlxhqbpyd1nqkpxjfggm5d9va5qpyf7d4i5y7n4a1mlydv19y";
+
+  nativeBuildInputs = [ cmake perl ];
+  buildInputs = [ llvm ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "Components required to build an executable OpenMP program";
+    homepage    = http://openmp.llvm.org/;
+    license     = stdenv.lib.licenses.mit;
+    platforms   = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/development/compilers/llvm/9/sanitizers-nongnu.patch b/pkgs/development/compilers/llvm/9/sanitizers-nongnu.patch
new file mode 100644
index 00000000000..1f2ac97818e
--- /dev/null
+++ b/pkgs/development/compilers/llvm/9/sanitizers-nongnu.patch
@@ -0,0 +1,412 @@
+From f7a253f8f85d0f49df6b73996737a3e84ac64236 Mon Sep 17 00:00:00 2001
+From: Will Dietz <w@wdtz.org>
+Date: Mon, 24 Sep 2018 11:17:25 -0500
+Subject: [PATCH] Ported to 7.0, taken from gentoo-musl project.
+
+------
+Ported to compiler-rt-sanitizers-5.0.0. Taken from
+
+https://gist.githubusercontent.com/pwaller/2337f3290f12634cad3e3730cff0a6c1/raw/83c87a8585e2f9662494db5662e5361beb093c26/nongnu.patch
+Signed-off-by: Jory A. Pratt <anarchy@gentoo.org>
+
+Taken from gentoo-musl project, with a few additional minor fixes.
+---
+ lib/asan/asan_linux.cc                        |  4 +-
+ lib/interception/interception_linux.cc        |  2 +-
+ lib/interception/interception_linux.h         |  2 +-
+ lib/msan/msan_linux.cc                        |  2 +-
+ lib/sanitizer_common/sanitizer_allocator.cc   |  2 +-
+ .../sanitizer_common_interceptors_ioctl.inc   |  4 +-
+ .../sanitizer_common_syscalls.inc             |  2 +-
+ lib/sanitizer_common/sanitizer_linux.cc       |  8 +++-
+ .../sanitizer_linux_libcdep.cc                | 10 ++---
+ lib/sanitizer_common/sanitizer_platform.h     |  6 +++
+ .../sanitizer_platform_interceptors.h         |  4 +-
+ .../sanitizer_platform_limits_posix.cc        | 37 +++++++++++--------
+ lib/tsan/rtl/tsan_platform_linux.cc           |  2 +-
+ 13 files changed, 51 insertions(+), 34 deletions(-)
+
+diff --git a/lib/asan/asan_linux.cc b/lib/asan/asan_linux.cc
+index 625f32d40..73cf77aca 100644
+--- a/lib/asan/asan_linux.cc
++++ b/lib/asan/asan_linux.cc
+@@ -46,7 +46,7 @@
+ #include <link.h>
+ #endif
+ 
+-#if SANITIZER_ANDROID || SANITIZER_FREEBSD || SANITIZER_SOLARIS
++#if SANITIZER_ANDROID || SANITIZER_FREEBSD || SANITIZER_SOLARIS || SANITIZER_NONGNU
+ #include <ucontext.h>
+ extern "C" void* _DYNAMIC;
+ #elif SANITIZER_NETBSD
+@@ -139,7 +139,7 @@ void AsanApplyToGlobals(globals_op_fptr op, const void *needle) {
+   UNIMPLEMENTED();
+ }
+ 
+-#if SANITIZER_ANDROID
++#if SANITIZER_ANDROID || SANITIZER_NONGNU
+ // FIXME: should we do anything for Android?
+ void AsanCheckDynamicRTPrereqs() {}
+ void AsanCheckIncompatibleRT() {}
+diff --git a/lib/interception/interception_linux.cc b/lib/interception/interception_linux.cc
+index 26bfcd8f6..529b234f7 100644
+--- a/lib/interception/interception_linux.cc
++++ b/lib/interception/interception_linux.cc
+@@ -43,7 +43,7 @@ bool GetRealFunctionAddress(const char *func_name, uptr *func_addr,
+ }
+ 
+ // Android and Solaris do not have dlvsym
+-#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD
++#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD && !SANITIZER_NONGNU
+ void *GetFuncAddrVer(const char *func_name, const char *ver) {
+   return dlvsym(RTLD_NEXT, func_name, ver);
+ }
+diff --git a/lib/interception/interception_linux.h b/lib/interception/interception_linux.h
+index 942c25609..24a4d5080 100644
+--- a/lib/interception/interception_linux.h
++++ b/lib/interception/interception_linux.h
+@@ -36,7 +36,7 @@ void *GetFuncAddrVer(const char *func_name, const char *ver);
+       (::__interception::uptr) & WRAP(func))
+ 
+ // Android,  Solaris and OpenBSD do not have dlvsym
+-#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD
++#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD && !SANITIZER_NONGNU
+ #define INTERCEPT_FUNCTION_VER_LINUX_OR_FREEBSD(func, symver) \
+   (::__interception::real_##func = (func##_f)(                \
+        unsigned long)::__interception::GetFuncAddrVer(#func, symver))
+diff --git a/lib/msan/msan_linux.cc b/lib/msan/msan_linux.cc
+index 385a650c4..6e30a8ce9 100644
+--- a/lib/msan/msan_linux.cc
++++ b/lib/msan/msan_linux.cc
+@@ -13,7 +13,7 @@
+ //===----------------------------------------------------------------------===//
+ 
+ #include "sanitizer_common/sanitizer_platform.h"
+-#if SANITIZER_FREEBSD || SANITIZER_LINUX || SANITIZER_NETBSD
++#if SANITIZER_FREEBSD || (SANITIZER_LINUX && !SANITIZER_NONGNU) || SANITIZER_NETBSD
+ 
+ #include "msan.h"
+ #include "msan_report.h"
+diff --git a/lib/sanitizer_common/sanitizer_allocator.cc b/lib/sanitizer_common/sanitizer_allocator.cc
+index 6bfd5e5ee..048f6154f 100644
+--- a/lib/sanitizer_common/sanitizer_allocator.cc
++++ b/lib/sanitizer_common/sanitizer_allocator.cc
+@@ -27,7 +27,7 @@ const char *SecondaryAllocatorName = "LargeMmapAllocator";
+ 
+ // ThreadSanitizer for Go uses libc malloc/free.
+ #if SANITIZER_GO || defined(SANITIZER_USE_MALLOC)
+-# if SANITIZER_LINUX && !SANITIZER_ANDROID
++# if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ extern "C" void *__libc_malloc(uptr size);
+ #  if !SANITIZER_GO
+ extern "C" void *__libc_memalign(uptr alignment, uptr size);
+diff --git a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
+index 2d633c173..b6eb23116 100644
+--- a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
++++ b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
+@@ -104,7 +104,7 @@ static void ioctl_table_fill() {
+   _(SIOCGETVIFCNT, WRITE, struct_sioc_vif_req_sz);
+ #endif
+ 
+-#if SANITIZER_LINUX
++#if SANITIZER_LINUX && !SANITIZER_NONGNU
+   // Conflicting request ids.
+   // _(CDROMAUDIOBUFSIZ, NONE, 0);
+   // _(SNDCTL_TMR_CONTINUE, NONE, 0);
+@@ -365,7 +365,7 @@ static void ioctl_table_fill() {
+   _(VT_WAITACTIVE, NONE, 0);
+ #endif
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+   // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE
+   _(CYGETDEFTHRESH, WRITE, sizeof(int));
+   _(CYGETDEFTIMEOUT, WRITE, sizeof(int));
+diff --git a/lib/sanitizer_common/sanitizer_common_syscalls.inc b/lib/sanitizer_common/sanitizer_common_syscalls.inc
+index 469c8eb7e..24f87867d 100644
+--- a/lib/sanitizer_common/sanitizer_common_syscalls.inc
++++ b/lib/sanitizer_common/sanitizer_common_syscalls.inc
+@@ -2038,7 +2038,7 @@ POST_SYSCALL(setrlimit)(long res, long resource, void *rlim) {
+   }
+ }
+ 
+-#if !SANITIZER_ANDROID
++#if !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ PRE_SYSCALL(prlimit64)(long pid, long resource, const void *new_rlim,
+                        void *old_rlim) {
+   if (new_rlim) PRE_READ(new_rlim, struct_rlimit64_sz);
+diff --git a/lib/sanitizer_common/sanitizer_linux.cc b/lib/sanitizer_common/sanitizer_linux.cc
+index 96d6c1eff..9e2b7fb9d 100644
+--- a/lib/sanitizer_common/sanitizer_linux.cc
++++ b/lib/sanitizer_common/sanitizer_linux.cc
+@@ -541,13 +541,13 @@ const char *GetEnv(const char *name) {
+ #endif
+ }
+ 
+-#if !SANITIZER_FREEBSD && !SANITIZER_NETBSD && !SANITIZER_OPENBSD
++#if !SANITIZER_FREEBSD && !SANITIZER_NETBSD && !SANITIZER_OPENBSD && !SANITIZER_NONGNU
+ extern "C" {
+ SANITIZER_WEAK_ATTRIBUTE extern void *__libc_stack_end;
+ }
+ #endif
+ 
+-#if !SANITIZER_GO && !SANITIZER_FREEBSD && !SANITIZER_NETBSD &&                \
++#if (!SANITIZER_GO || SANITIZER_NONGNU) && !SANITIZER_FREEBSD && !SANITIZER_NETBSD &&                \
+     !SANITIZER_OPENBSD
+ static void ReadNullSepFileToArray(const char *path, char ***arr,
+                                    int arr_size) {
+@@ -590,6 +590,10 @@ static void GetArgsAndEnv(char ***argv, char ***envp) {
+ #elif SANITIZER_NETBSD
+   *argv = __ps_strings->ps_argvstr;
+   *envp = __ps_strings->ps_envstr;
++#elif SANITIZER_NONGNU
++    static const int kMaxArgv = 2000, kMaxEnvp = 2000;
++    ReadNullSepFileToArray("/proc/self/cmdline", argv, kMaxArgv);
++    ReadNullSepFileToArray("/proc/self/environ", envp, kMaxEnvp);
+ #else // SANITIZER_FREEBSD
+ #if !SANITIZER_GO
+   if (&__libc_stack_end) {
+diff --git a/lib/sanitizer_common/sanitizer_linux_libcdep.cc b/lib/sanitizer_common/sanitizer_linux_libcdep.cc
+index 4962ff832..438f94dbe 100644
+--- a/lib/sanitizer_common/sanitizer_linux_libcdep.cc
++++ b/lib/sanitizer_common/sanitizer_linux_libcdep.cc
+@@ -179,7 +179,7 @@ __attribute__((unused)) static bool GetLibcVersion(int *major, int *minor,
+ }
+ 
+ #if !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO &&               \
+-    !SANITIZER_NETBSD && !SANITIZER_OPENBSD && !SANITIZER_SOLARIS
++    !SANITIZER_NETBSD && !SANITIZER_OPENBSD && !SANITIZER_SOLARIS && !SANITIZER_NONGNU
+ static uptr g_tls_size;
+ 
+ #ifdef __i386__
+@@ -261,7 +261,7 @@ void InitTlsSize() { }
+ #if (defined(__x86_64__) || defined(__i386__) || defined(__mips__) ||          \
+      defined(__aarch64__) || defined(__powerpc64__) || defined(__s390__) ||    \
+      defined(__arm__)) &&                                                      \
+-    SANITIZER_LINUX && !SANITIZER_ANDROID
++    SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ // sizeof(struct pthread) from glibc.
+ static atomic_uintptr_t thread_descriptor_size;
+ 
+@@ -426,7 +426,7 @@ int GetSizeFromHdr(struct dl_phdr_info *info, size_t size, void *data) {
+ 
+ #if !SANITIZER_GO
+ static void GetTls(uptr *addr, uptr *size) {
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ # if defined(__x86_64__) || defined(__i386__) || defined(__s390__)
+   *addr = ThreadSelf();
+   *size = GetTlsSize();
+@@ -470,7 +470,7 @@ static void GetTls(uptr *addr, uptr *size) {
+ #elif SANITIZER_OPENBSD
+   *addr = 0;
+   *size = 0;
+-#elif SANITIZER_ANDROID
++#elif SANITIZER_ANDROID || SANITIZER_NONGNU
+   *addr = 0;
+   *size = 0;
+ #elif SANITIZER_SOLARIS
+@@ -486,7 +486,7 @@ static void GetTls(uptr *addr, uptr *size) {
+ #if !SANITIZER_GO
+ uptr GetTlsSize() {
+ #if SANITIZER_FREEBSD || SANITIZER_ANDROID || SANITIZER_NETBSD ||              \
+-    SANITIZER_OPENBSD || SANITIZER_SOLARIS
++    SANITIZER_OPENBSD || SANITIZER_SOLARIS || SANITIZER_NONGNU
+   uptr addr, size;
+   GetTls(&addr, &size);
+   return size;
+diff --git a/lib/sanitizer_common/sanitizer_platform.h b/lib/sanitizer_common/sanitizer_platform.h
+index d81e25580..e10680ac8 100644
+--- a/lib/sanitizer_common/sanitizer_platform.h
++++ b/lib/sanitizer_common/sanitizer_platform.h
+@@ -208,6 +208,12 @@
+ # define SANITIZER_SOLARIS32 0
+ #endif
+ 
++#if defined(__linux__) && !defined(__GLIBC__)
++# define SANITIZER_NONGNU 1
++#else
++# define SANITIZER_NONGNU 0
++#endif
++
+ #if defined(__myriad2__)
+ # define SANITIZER_MYRIAD2 1
+ #else
+diff --git a/lib/sanitizer_common/sanitizer_platform_interceptors.h b/lib/sanitizer_common/sanitizer_platform_interceptors.h
+index f95539a73..6c53b3415 100644
+--- a/lib/sanitizer_common/sanitizer_platform_interceptors.h
++++ b/lib/sanitizer_common/sanitizer_platform_interceptors.h
+@@ -39,7 +39,7 @@
+ # include "sanitizer_platform_limits_solaris.h"
+ #endif
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ # define SI_LINUX_NOT_ANDROID 1
+ #else
+ # define SI_LINUX_NOT_ANDROID 0
+@@ -322,7 +322,7 @@
+ #define SANITIZER_INTERCEPT_ETHER_R (SI_FREEBSD || SI_LINUX_NOT_ANDROID)
+ #define SANITIZER_INTERCEPT_SHMCTL          \
+   (SI_NETBSD || SI_OPENBSD || SI_SOLARIS || \
+-  ((SI_FREEBSD || SI_LINUX_NOT_ANDROID) && \
++  ((SI_FREEBSD || SI_LINUX_NOT_ANDROID || SANITIZER_NONGNU) && \
+     SANITIZER_WORDSIZE == 64))  // NOLINT
+ #define SANITIZER_INTERCEPT_RANDOM_R SI_LINUX_NOT_ANDROID
+ #define SANITIZER_INTERCEPT_PTHREAD_ATTR_GET SI_POSIX
+diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
+index 54da635d7..2f6ff69c3 100644
+--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
++++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
+@@ -14,6 +14,9 @@
+ 
+ #include "sanitizer_platform.h"
+ 
++// Workaround musl <--> linux conflicting definition of 'struct sysinfo'
++#define _LINUX_SYSINFO_H
++
+ #if SANITIZER_LINUX || SANITIZER_FREEBSD || SANITIZER_MAC
+ // Tests in this file assume that off_t-dependent data structures match the
+ // libc ABI. For example, struct dirent here is what readdir() function (as
+@@ -138,12 +141,14 @@ typedef struct user_fpregs elf_fpregset_t;
+ 
+ #if SANITIZER_LINUX && !SANITIZER_ANDROID
+ #include <glob.h>
+-#include <obstack.h>
++#  if !SANITIZER_NONGNU
++#    include <obstack.h>
++#  endif
+ #include <mqueue.h>
+-#include <net/if_ppp.h>
+-#include <netax25/ax25.h>
+-#include <netipx/ipx.h>
+-#include <netrom/netrom.h>
++#include <linux/if_ppp.h>
++#include <linux/ax25.h>
++#include <linux/ipx.h>
++#include <linux/netrom.h>
+ #if HAVE_RPC_XDR_H
+ # include <rpc/xdr.h>
+ #elif HAVE_TIRPC_RPC_XDR_H
+@@ -251,7 +256,7 @@ namespace __sanitizer {
+   unsigned struct_itimerspec_sz = sizeof(struct itimerspec);
+ #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+   // Use pre-computed size of struct ustat to avoid <sys/ustat.h> which
+   // has been removed from glibc 2.28.
+ #if defined(__aarch64__) || defined(__s390x__) || defined (__mips64) \
+@@ -322,7 +327,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(ElfW(Phdr));
+ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
+ #endif
+ 
+-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+   int glob_nomatch = GLOB_NOMATCH;
+   int glob_altdirfunc = GLOB_ALTDIRFUNC;
+ #endif
+@@ -416,7 +421,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
+   unsigned struct_termios_sz = sizeof(struct termios);
+   unsigned struct_winsize_sz = sizeof(struct winsize);
+ 
+-#if SANITIZER_LINUX
++#if SANITIZER_LINUX && !SANITIZER_NONGNU
+   unsigned struct_arpreq_sz = sizeof(struct arpreq);
+   unsigned struct_cdrom_msf_sz = sizeof(struct cdrom_msf);
+   unsigned struct_cdrom_multisession_sz = sizeof(struct cdrom_multisession);
+@@ -466,7 +471,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
+   unsigned struct_vt_mode_sz = sizeof(struct vt_mode);
+ #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+   unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct);
+   unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor);
+ #if EV_VERSION > (0x010000)
+@@ -834,7 +839,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
+   unsigned IOCTL_VT_WAITACTIVE = VT_WAITACTIVE;
+ #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+   unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH;
+   unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT;
+   unsigned IOCTL_CYGETMON = CYGETMON;
+@@ -989,7 +994,7 @@ CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phdr);
+ CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phnum);
+ #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
+ 
+-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ CHECK_TYPE_SIZE(glob_t);
+ CHECK_SIZE_AND_OFFSET(glob_t, gl_pathc);
+ CHECK_SIZE_AND_OFFSET(glob_t, gl_pathv);
+@@ -1023,6 +1028,7 @@ CHECK_TYPE_SIZE(iovec);
+ CHECK_SIZE_AND_OFFSET(iovec, iov_base);
+ CHECK_SIZE_AND_OFFSET(iovec, iov_len);
+ 
++#if !SANITIZER_NONGNU
+ CHECK_TYPE_SIZE(msghdr);
+ CHECK_SIZE_AND_OFFSET(msghdr, msg_name);
+ CHECK_SIZE_AND_OFFSET(msghdr, msg_namelen);
+@@ -1036,6 +1042,7 @@ CHECK_TYPE_SIZE(cmsghdr);
+ CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_len);
+ CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_level);
+ CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_type);
++#endif
+ 
+ #ifndef __GLIBC_PREREQ
+ #define __GLIBC_PREREQ(x, y) 0
+@@ -1145,7 +1152,7 @@ CHECK_SIZE_AND_OFFSET(mntent, mnt_passno);
+ 
+ CHECK_TYPE_SIZE(ether_addr);
+ 
+-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ CHECK_TYPE_SIZE(ipc_perm);
+ # if SANITIZER_FREEBSD
+ CHECK_SIZE_AND_OFFSET(ipc_perm, key);
+@@ -1206,7 +1213,7 @@ CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_dstaddr);
+ CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_data);
+ #endif
+ 
+-#if SANITIZER_LINUX
++#if SANITIZER_LINUX && !SANITIZER_NONGNU
+ COMPILER_CHECK(sizeof(__sanitizer_mallinfo) == sizeof(struct mallinfo));
+ #endif
+ 
+@@ -1256,7 +1263,7 @@ COMPILER_CHECK(__sanitizer_XDR_DECODE == XDR_DECODE);
+ COMPILER_CHECK(__sanitizer_XDR_FREE == XDR_FREE);
+ #endif
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ COMPILER_CHECK(sizeof(__sanitizer_FILE) <= sizeof(FILE));
+ CHECK_SIZE_AND_OFFSET(FILE, _flags);
+ CHECK_SIZE_AND_OFFSET(FILE, _IO_read_ptr);
+@@ -1275,7 +1282,7 @@ CHECK_SIZE_AND_OFFSET(FILE, _chain);
+ CHECK_SIZE_AND_OFFSET(FILE, _fileno);
+ #endif
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ COMPILER_CHECK(sizeof(__sanitizer__obstack_chunk) <= sizeof(_obstack_chunk));
+ CHECK_SIZE_AND_OFFSET(_obstack_chunk, limit);
+ CHECK_SIZE_AND_OFFSET(_obstack_chunk, prev);
+diff --git a/lib/tsan/rtl/tsan_platform_linux.cc b/lib/tsan/rtl/tsan_platform_linux.cc
+index de989b780..51a97b554 100644
+--- a/lib/tsan/rtl/tsan_platform_linux.cc
++++ b/lib/tsan/rtl/tsan_platform_linux.cc
+@@ -294,7 +294,7 @@ void InitializePlatform() {
+ // This is required to properly "close" the fds, because we do not see internal
+ // closes within glibc. The code is a pure hack.
+ int ExtractResolvFDs(void *state, int *fds, int nfd) {
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+   int cnt = 0;
+   struct __res_state *statp = (struct __res_state*)state;
+   for (int i = 0; i < MAXNS && cnt < nfd; i++) {
+-- 
+2.19.0
+
-- 
GitLab


From 99eeff0f69c527b1cf4b7eb49388955eaab9723f Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 19 Sep 2019 13:24:37 -0500
Subject: [PATCH 0587/2254] llvmPackages_9: hashes, pname-ification

---
 .../compilers/llvm/9/clang/default.nix        |  7 +++--
 .../compilers/llvm/9/compiler-rt.nix          |  4 +--
 pkgs/development/compilers/llvm/9/default.nix |  4 +--
 .../compilers/llvm/9/libc++/default.nix       |  6 +---
 .../compilers/llvm/9/libc++abi.nix            |  2 +-
 .../compilers/llvm/9/libunwind.nix            | 15 ++-------
 pkgs/development/compilers/llvm/9/lld.nix     |  4 +--
 .../compilers/llvm/9/lldb-procfs.patch        | 31 +++++++++++++++++++
 pkgs/development/compilers/llvm/9/lldb.nix    |  6 ++--
 pkgs/development/compilers/llvm/9/llvm.nix    | 11 ++++---
 pkgs/development/compilers/llvm/9/openmp.nix  |  4 +--
 11 files changed, 57 insertions(+), 37 deletions(-)
 create mode 100644 pkgs/development/compilers/llvm/9/lldb-procfs.patch

diff --git a/pkgs/development/compilers/llvm/9/clang/default.nix b/pkgs/development/compilers/llvm/9/clang/default.nix
index 6911089250e..43788977f10 100644
--- a/pkgs/development/compilers/llvm/9/clang/default.nix
+++ b/pkgs/development/compilers/llvm/9/clang/default.nix
@@ -6,9 +6,10 @@
 
 let
   self = stdenv.mkDerivation ({
-    name = "clang-${version}";
+    pname = "clang";
+    inherit version;
 
-    src = fetch "cfe" "0ihnbdl058gvl2wdy45p5am55bq8ifx8m9mhcsgj9ax8yxlzvvvh";
+    src = fetch "cfe" "0426ma80i41qsgzm1qdz81mjskck426diygxi2k5vji2gkpixa3v";
 
     unpackPhase = ''
       unpackFile $src
@@ -105,7 +106,7 @@ let
       platforms   = stdenv.lib.platforms.all;
     };
   } // stdenv.lib.optionalAttrs enableManpages {
-    name = "clang-manpages-${version}";
+    pname = "clang-manpages";
 
     buildPhase = ''
       make docs-clang-man
diff --git a/pkgs/development/compilers/llvm/9/compiler-rt.nix b/pkgs/development/compilers/llvm/9/compiler-rt.nix
index 936c877d58c..2dbade74af5 100644
--- a/pkgs/development/compilers/llvm/9/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/9/compiler-rt.nix
@@ -1,8 +1,8 @@
 { stdenv, version, fetch, cmake, python, llvm, libcxxabi }:
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "compiler-rt";
   inherit version;
-  src = fetch "compiler-rt" "0dqqf8f930l8gag4d9qjgn1n0pj0nbv2anviqqhdi1rkhas8z0hi";
+  src = fetch pname "03ni43lbkp63lr3p6sc94dphqmvnz5av5mml0xmk930xvnbcvr2n";
 
   nativeBuildInputs = [ cmake python llvm ];
   buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
diff --git a/pkgs/development/compilers/llvm/9/default.nix b/pkgs/development/compilers/llvm/9/default.nix
index 36d7a14142b..4970fa1b4cb 100644
--- a/pkgs/development/compilers/llvm/9/default.nix
+++ b/pkgs/development/compilers/llvm/9/default.nix
@@ -5,7 +5,7 @@
 }:
 
 let
-  release_version = "8.0.1";
+  release_version = "9.0.0";
   version = release_version; # differentiating these is important for rc's
 
   fetch = name: sha256: fetchurl {
@@ -13,7 +13,7 @@ let
     inherit sha256;
   };
 
-  clang-tools-extra_src = fetch "clang-tools-extra" "1qf3097bc5ia8p6cpmbx985rjr3yaah5s8fc0nv7pw742yv7jw8q";
+  clang-tools-extra_src = fetch "clang-tools-extra" "045cldmcfd8s33wyjlviifgpnw52yqicd6v4ysvdg4i96p78c77a";
 
   tools = stdenv.lib.makeExtensible (tools: let
     callPackage = newScope (tools // { inherit stdenv cmake libxml2 python isl release_version version fetch; });
diff --git a/pkgs/development/compilers/llvm/9/libc++/default.nix b/pkgs/development/compilers/llvm/9/libc++/default.nix
index 8ec1c419748..daf8ed5a9ae 100644
--- a/pkgs/development/compilers/llvm/9/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/9/libc++/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   pname = "libc++";
   inherit version;
 
-  src = fetch "libcxx" "0y4vc9z36c1zlq15cnibdzxnc1xi5glbc6klnm8a41q3db4541kz";
+  src = fetch "libcxx" "136j3v7il9aq8wyp48klx6sifnl5asj4lf5c8yx08cjx5fbn4h9w";
 
   postUnpack = ''
     unpackFile ${libcxxabi.src}
@@ -14,10 +14,6 @@ stdenv.mkDerivation {
 
   patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ../../libcxx-0001-musl-hacks.patch;
 
-  prePatch = ''
-    substituteInPlace lib/CMakeLists.txt --replace "/usr/lib/libc++" "\''${LIBCXX_LIBCXXABI_LIB_PATH}/libc++"
-  '';
-
   preConfigure = ''
     # Get headers from the cxxabi source so we can see private headers not installed by the cxxabi package
     cmakeFlagsArray=($cmakeFlagsArray -DLIBCXX_CXX_ABI_INCLUDE_PATHS="$LIBCXXABI_INCLUDE_DIR")
diff --git a/pkgs/development/compilers/llvm/9/libc++abi.nix b/pkgs/development/compilers/llvm/9/libc++abi.nix
index 58a1241d823..7afff991e75 100644
--- a/pkgs/development/compilers/llvm/9/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/9/libc++abi.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   pname = "libc++abi";
   inherit version;
 
-  src = fetch "libcxxabi" "1vznz8n1z1h8af0ga451m98lc2hjnv4fyzl71napsvjhvk4g6nxp";
+  src = fetch "libcxxabi" "1s9haplqv8ashlsdx2psxiqxh50gqk2jp2vz5yn0djb56mw42l37";
 
   nativeBuildInputs = [ cmake ];
   buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind;
diff --git a/pkgs/development/compilers/llvm/9/libunwind.nix b/pkgs/development/compilers/llvm/9/libunwind.nix
index 646cd3c3ca4..5eba9e03c78 100644
--- a/pkgs/development/compilers/llvm/9/libunwind.nix
+++ b/pkgs/development/compilers/llvm/9/libunwind.nix
@@ -1,24 +1,13 @@
 { stdenv, version, fetch, cmake, fetchpatch, enableShared ? true }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "libunwind";
   inherit version;
 
-  src = fetch "libunwind" "0vhgcgzsb33l83qaikrkj87ypqb48mi607rccczccwiiv8ficw0q";
+  src = fetch pname "1chd1nz4bscrs6qa7p8sqgk5df86ll0frv0f451vhks2w44qsslp";
 
   nativeBuildInputs = [ cmake ];
 
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/llvm-mirror/libunwind/commit/34a45c630d4c79af403661d267db42fbe7de1178.patch";
-      sha256 = "0n0pv6jvcky8pn3srhrf9x5kbnd0d2kia9xlx2g590f5q0bgwfhv";
-    })
-    (fetchpatch {
-      url = "https://github.com/llvm-mirror/libunwind/commit/e050272d2eb57eb4e56a37b429a61df2ebb8aa3e.patch";
-      sha256 = "1sxyx5xnax8k713jjcxgq3jq3cpnxygs2rcdf5vfja0f2k9jzldl";
-    })
-  ];
-
   enableParallelBuilding = true;
 
   cmakeFlags = stdenv.lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF";
diff --git a/pkgs/development/compilers/llvm/9/lld.nix b/pkgs/development/compilers/llvm/9/lld.nix
index fc52d691d03..c5baef4357e 100644
--- a/pkgs/development/compilers/llvm/9/lld.nix
+++ b/pkgs/development/compilers/llvm/9/lld.nix
@@ -6,11 +6,11 @@
 , version
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "lld";
   inherit version;
 
-  src = fetch "lld" "121xhxrlvwy3k5nf6p1wv31whxlb635ssfkci8z93mwv4ja1xflz";
+  src = fetch pname "14cgd34gr826qpxzhrkbz6qgm8ymds0hrsiznwzp42ax4f5p9iii";
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [ llvm libxml2 ];
diff --git a/pkgs/development/compilers/llvm/9/lldb-procfs.patch b/pkgs/development/compilers/llvm/9/lldb-procfs.patch
new file mode 100644
index 00000000000..b075dbaeee0
--- /dev/null
+++ b/pkgs/development/compilers/llvm/9/lldb-procfs.patch
@@ -0,0 +1,31 @@
+--- a/source/Plugins/Process/Linux/Procfs.h
++++ b/source/Plugins/Process/Linux/Procfs.h
+@@ -11,21 +11,12 @@
+ // sys/procfs.h on Android/Linux for all supported architectures.
+ 
+ #include <sys/ptrace.h>
++#include <asm/ptrace.h>
+ 
+-#ifdef __ANDROID__
+-#if defined(__arm64__) || defined(__aarch64__)
+-typedef unsigned long elf_greg_t;
+-typedef elf_greg_t
+-    elf_gregset_t[(sizeof(struct user_pt_regs) / sizeof(elf_greg_t))];
+-typedef struct user_fpsimd_state elf_fpregset_t;
+-#ifndef NT_FPREGSET
+-#define NT_FPREGSET NT_PRFPREG
+-#endif // NT_FPREGSET
+-#elif defined(__mips__)
+-#ifndef NT_FPREGSET
+-#define NT_FPREGSET NT_PRFPREG
+-#endif // NT_FPREGSET
+-#endif
+-#else // __ANDROID__
++#if !defined(__GLIBC__) && defined(__powerpc__)
++#define pt_regs musl_pt_regs
++#include <sys/procfs.h>
++#undef pt_regs
++#else
+ #include <sys/procfs.h>
+-#endif // __ANDROID__
++#endif
diff --git a/pkgs/development/compilers/llvm/9/lldb.nix b/pkgs/development/compilers/llvm/9/lldb.nix
index 254933c82a0..915a422fd56 100644
--- a/pkgs/development/compilers/llvm/9/lldb.nix
+++ b/pkgs/development/compilers/llvm/9/lldb.nix
@@ -14,11 +14,11 @@
 , darwin
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "lldb";
   inherit version;
 
-  src = fetch "lldb" "1mriw4adrwm6kzabrjr7yqmdiylxd6glf6samd80dp8idnm9p9z8";
+  src = fetch pname "1507dl0xw03nppxpz2xsq4s30jdbkplx4w14za54ngqm3xm2yk0y";
 
   postPatch = ''
     # Fix up various paths that assume llvm and clang are installed in the same place
@@ -30,6 +30,8 @@ stdenv.mkDerivation {
       cmake/modules/LLDBStandalone.cmake
   '';
 
+  patches = [ ./lldb-procfs.patch ];
+
   nativeBuildInputs = [ cmake python which swig ];
   buildInputs = [ ncurses zlib libedit libxml2 llvm ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ];
diff --git a/pkgs/development/compilers/llvm/9/llvm.nix b/pkgs/development/compilers/llvm/9/llvm.nix
index 70e666ba27d..6d80718c837 100644
--- a/pkgs/development/compilers/llvm/9/llvm.nix
+++ b/pkgs/development/compilers/llvm/9/llvm.nix
@@ -27,11 +27,12 @@ let
   shortVersion = with stdenv.lib;
     concatStringsSep "." (take 1 (splitString "." release_version));
 
-in stdenv.mkDerivation ({
-  name = "llvm-${version}";
+in stdenv.mkDerivation (rec {
+  pname = "llvm";
+  inherit version;
 
-  src = fetch "llvm" "1rvm5gqp5v8hfn17kqws3zhk94w4kxndal12bqa0y57p09nply24";
-  polly_src = fetch "polly" "1lfjdz3ilj5xmjxvicd8f5ykybks67ry2pdb777352r3mzlgg8g8";
+  src = fetch pname "117ymdz1by2nkfq1c2p9m4050dp848kbjbiv6nsfj8hzy9f5d86n";
+  polly_src = fetch "polly" "0cyl2gsibf1dhqvkyw1qb0f8q58ib6cihzyh4f9kj9g77ll95ym4";
 
   unpackPhase = ''
     unpackFile $src
@@ -150,7 +151,7 @@ in stdenv.mkDerivation ({
     platforms   = stdenv.lib.platforms.all;
   };
 } // stdenv.lib.optionalAttrs enableManpages {
-  name = "llvm-manpages-${version}";
+  pname = "llvm-manpages";
 
   buildPhase = ''
     make docs-llvm-man
diff --git a/pkgs/development/compilers/llvm/9/openmp.nix b/pkgs/development/compilers/llvm/9/openmp.nix
index 166e7f68eb3..a511aed2eb8 100644
--- a/pkgs/development/compilers/llvm/9/openmp.nix
+++ b/pkgs/development/compilers/llvm/9/openmp.nix
@@ -6,11 +6,11 @@
 , version
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "openmp";
   inherit version;
 
-  src = fetch "openmp" "0b3jlxhqbpyd1nqkpxjfggm5d9va5qpyf7d4i5y7n4a1mlydv19y";
+  src = fetch pname "0nrv9np134b7c483jnq786spy3hbpj11d7g21g67cqq66c8ynycr";
 
   nativeBuildInputs = [ cmake perl ];
   buildInputs = [ llvm ];
-- 
GitLab


From 70299a0a0aa00badca62bdc1b019a2061be79b34 Mon Sep 17 00:00:00 2001
From: babariviere <babathriviere@gmail.com>
Date: Thu, 19 Sep 2019 20:28:59 +0200
Subject: [PATCH 0588/2254] maintainer: update email

---
 maintainers/maintainer-list.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 058561eb624..3cb0cd3fa99 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -693,7 +693,7 @@
     name = "Aycan iRiCAN";
   };
   babariviere = {
-    email = "babariviere@protonmail.com";
+    email = "babathriviere@gmail.com";
     github = "babariviere";
     githubId = 12128029;
     name = "babariviere";
-- 
GitLab


From 75b5ac394cf5b5c4e2352506ce00f9c1594643c1 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 19 Sep 2019 13:38:45 -0500
Subject: [PATCH 0589/2254] top-level: add llvmPackages_9 and the usual
 variants

* Bump llvmPackages_latest to llvmPackages_9,
  since it's the latest ;)
* Leave llvmPackages = llvmPackages_7.... for now.
---
 pkgs/top-level/all-packages.nix | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 66649dcd26a..f04af40a3d2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7412,6 +7412,7 @@ in
   llvm-polly = llvmPackages_latest.llvm-polly;
   clang-polly = llvmPackages_latest.clang.override { cc = llvmPackages_latest.clang-polly-unwrapped; };
 
+  clang_9  = llvmPackages_9.clang;
   clang_8  = llvmPackages_8.clang;
   clang_7  = llvmPackages_7.clang;
   clang_6  = llvmPackages_6.clang;
@@ -8093,6 +8094,7 @@ in
   lld_6 = llvmPackages_6.lld;
   lld_7 = llvmPackages_7.lld;
   lld_8 = llvmPackages_8.lld;
+  lld_9 = llvmPackages_9.lld;
 
   lldb = llvmPackages.lldb;
   lldb_4 = llvmPackages_4.lldb;
@@ -8100,10 +8102,12 @@ in
   lldb_6 = llvmPackages_6.lldb;
   lldb_7 = llvmPackages_7.lldb;
   lldb_8 = llvmPackages_8.lldb;
+  lldb_9 = llvmPackages_9.lldb;
 
   llvm = llvmPackages.llvm;
   llvm-manpages = llvmPackages.llvm-manpages;
 
+  llvm_9  = llvmPackages_9.llvm;
   llvm_8  = llvmPackages_8.llvm;
   llvm_7  = llvmPackages_7.llvm;
   llvm_6  = llvmPackages_6.llvm;
@@ -8170,7 +8174,15 @@ in
     stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4'
   });
 
-  llvmPackages_latest = llvmPackages_8;
+  llvmPackages_9 = callPackage ../development/compilers/llvm/9 ({
+    inherit (stdenvAdapters) overrideCC;
+    buildLlvmTools = buildPackages.llvmPackages_9.tools;
+    targetLlvmLibraries = targetPackages.llvmPackages_9.libraries;
+  } // stdenv.lib.optionalAttrs (buildPackages.stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
+    stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4'
+  });
+
+  llvmPackages_latest = llvmPackages_9;
 
   lorri = throw "lorri is not stable yet. Please go to https://github.com/target/lorri and follow the installation instructions there, for the time being.";
 
-- 
GitLab


From 640f2dbbaf7c70594906fab04a719abfbe35832a Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Thu, 19 Sep 2019 20:47:51 +0200
Subject: [PATCH 0590/2254] plex: 1.16.5.1554 -> 1.16.6.1592

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

diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix
index cbe0dae3e14..b617fe6fa0e 100644
--- a/pkgs/servers/plex/raw.nix
+++ b/pkgs/servers/plex/raw.nix
@@ -8,13 +8,13 @@
 # server, and the FHS userenv and corresponding NixOS module should
 # automatically pick up the changes.
 stdenv.mkDerivation rec {
-  version = "1.16.5.1554-1e5ff713d";
+  version = "1.16.6.1592-b9d49bdb7";
   pname = "plexmediaserver";
 
   # Fetch the source
   src = fetchurl {
     url = "https://downloads.plex.tv/plex-media-server-new/${version}/redhat/plexmediaserver-${version}.x86_64.rpm";
-    sha256 = "1h2f8dgwz9bnvj7h4nk61a5rpl62918nwq6v85d97miwjfc1mv6n";
+    sha256 = "12wff06nlvcssa6sf6vhxajfd1dnr9870xn9fac4q7gf0yayj27j";
   };
 
   outputs = [ "out" "basedb" ];
-- 
GitLab


From f52b3afc8d9132327d44b56b46b11b212b370d29 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 19 Sep 2019 14:06:36 -0500
Subject: [PATCH 0591/2254] clang_9: wiggle the purity.patch so it applies

---
 pkgs/development/compilers/llvm/9/clang/purity.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/llvm/9/clang/purity.patch b/pkgs/development/compilers/llvm/9/clang/purity.patch
index b30d0d0b5d5..a6729a9b004 100644
--- a/pkgs/development/compilers/llvm/9/clang/purity.patch
+++ b/pkgs/development/compilers/llvm/9/clang/purity.patch
@@ -12,11 +12,11 @@ index fe3c0191bb..c6a482bece 100644
 --- a/lib/Driver/ToolChains/Gnu.cpp
 +++ b/lib/Driver/ToolChains/Gnu.cpp
 @@ -494,13 +494,6 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
-   if (!Args.hasArg(options::OPT_static)) {
+   if (!IsStatic) {
      if (Args.hasArg(options::OPT_rdynamic))
        CmdArgs.push_back("-export-dynamic");
 -
--    if (!Args.hasArg(options::OPT_shared)) {
+-    if (!Args.hasArg(options::OPT_shared) && !IsStaticPIE) {
 -      const std::string Loader =
 -          D.DyldPrefix + ToolChain.getDynamicLinker(Args);
 -      CmdArgs.push_back("-dynamic-linker");
-- 
GitLab


From 74b529b43e745d8c6166c8cfec940ec1c8d5e442 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 19 Sep 2019 14:27:42 -0500
Subject: [PATCH 0592/2254] llvm_9: fix utf8 test by using builtin locale
 C.UTF-8

---
 pkgs/development/compilers/llvm/9/llvm.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/compilers/llvm/9/llvm.nix b/pkgs/development/compilers/llvm/9/llvm.nix
index 6d80718c837..5dfe6847b8c 100644
--- a/pkgs/development/compilers/llvm/9/llvm.nix
+++ b/pkgs/development/compilers/llvm/9/llvm.nix
@@ -77,6 +77,10 @@ in stdenv.mkDerivation (rec {
     rm test/CodeGen/AArch64/wineh4.mir
   '' + ''
     patchShebangs test/BugPoint/compile-custom.ll.py
+
+    # Fix test so that no extra locale files are needed
+    substituteInPlace test/tools/llvm-ar/mri-utf8.test \
+      --replace en_US.UTF-8 C.UTF-8
   '';
 
   # hacky fix: created binaries need to be run before installation
-- 
GitLab


From a4d1e97e3d248a7322652667e724a62db401790c Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 19 Sep 2019 15:03:09 -0500
Subject: [PATCH 0593/2254] tests.cc-wrapper-{clang,libcxx}-{8,9}: add stdenv
 tests for LLVM 8, 9

---
 pkgs/test/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix
index 793229f8bbb..eb0711b8885 100644
--- a/pkgs/test/default.nix
+++ b/pkgs/test/default.nix
@@ -20,6 +20,10 @@ with pkgs;
   cc-wrapper-libcxx-6 = callPackage ./cc-wrapper { stdenv = llvmPackages_6.libcxxStdenv; };
   cc-wrapper-clang-7 = callPackage ./cc-wrapper { stdenv = llvmPackages_7.stdenv; };
   cc-wrapper-libcxx-7 = callPackage ./cc-wrapper { stdenv = llvmPackages_7.libcxxStdenv; };
+  cc-wrapper-clang-8 = callPackage ./cc-wrapper { stdenv = llvmPackages_8.stdenv; };
+  cc-wrapper-libcxx-8 = callPackage ./cc-wrapper { stdenv = llvmPackages_8.libcxxStdenv; };
+  cc-wrapper-clang-9 = callPackage ./cc-wrapper { stdenv = llvmPackages_9.stdenv; };
+  cc-wrapper-libcxx-9 = callPackage ./cc-wrapper { stdenv = llvmPackages_9.libcxxStdenv; };
   stdenv-inputs = callPackage ./stdenv-inputs { };
 
   cc-multilib-gcc = callPackage ./cc-wrapper/multilib.nix { stdenv = gccMultiStdenv; };
-- 
GitLab


From 1c7d3389e43b2836a8f5de10f648833d610e86b2 Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Tue, 10 Sep 2019 22:16:33 +0200
Subject: [PATCH 0594/2254] next: init at 1.3.1

---
 .../browsers/next-gtk-webkit/default.nix      | 25 ++++++
 .../networking/browsers/next/default.nix      | 80 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +
 3 files changed, 109 insertions(+)
 create mode 100644 pkgs/applications/networking/browsers/next-gtk-webkit/default.nix
 create mode 100644 pkgs/applications/networking/browsers/next/default.nix

diff --git a/pkgs/applications/networking/browsers/next-gtk-webkit/default.nix b/pkgs/applications/networking/browsers/next-gtk-webkit/default.nix
new file mode 100644
index 00000000000..6ab53376310
--- /dev/null
+++ b/pkgs/applications/networking/browsers/next-gtk-webkit/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, gcc7, pkg-config
+, next
+, webkitgtk, gsettings-desktop-schemas
+}:
+
+stdenv.mkDerivation rec {
+  pname = "next-gtk-webkit";
+  inherit (next) src version;
+
+  makeFlags = [ "gtk-webkit" "PREFIX=$(out)" ];
+  installTargets = "install-gtk-webkit";
+
+  nativeBuildInputs = [ gcc7 pkg-config ];
+  buildInputs = [
+    webkitgtk
+    gsettings-desktop-schemas
+  ];
+  meta = with stdenv.lib; {
+    description = "Infinitely extensible web-browser (user interface only)";
+    homepage = https://next.atlas.engineer;
+    license = licenses.bsd3;
+    maintainers = [ maintainers.lewo ];
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/applications/networking/browsers/next/default.nix b/pkgs/applications/networking/browsers/next/default.nix
new file mode 100644
index 00000000000..2b2e173342c
--- /dev/null
+++ b/pkgs/applications/networking/browsers/next/default.nix
@@ -0,0 +1,80 @@
+{ pkgs, stdenv, fetchFromGitHub
+, gcc7, pkg-config, makeWrapper
+, glib-networking
+, next-gtk-webkit
+, lispPackages
+, sbcl
+}:
+
+stdenv.mkDerivation rec {
+    pname = "next";
+    version = "1.3.1";
+
+    src = fetchFromGitHub {
+      owner = "atlas-engineer";
+      repo = "next";
+      rev = version;
+      sha256 = "01fn1f080ydk0wj1bwkyakqz93bdq9xb5x8qz820jpl9id17bqgj";
+    };
+
+    # Stripping destroys the generated SBCL image
+    dontStrip = true;
+
+    prePatch = ''
+      substituteInPlace source/ports/gtk-webkit.lisp \
+        --replace "next-gtk-webkit" "${next-gtk-webkit}/bin/next-gtk-webkit"
+    '';
+
+    nativeBuildInputs = [ sbcl makeWrapper ];
+    buildInputs = with lispPackages; [
+      trivial-features
+      trivial-garbage
+      alexandria
+      bordeaux-threads
+      cl-json
+      cl-markup
+      cl-ppcre
+      cl-ppcre-unicode
+      closer-mop
+      dexador
+      ironclad
+      lparallel
+      parenscript
+      quri
+      cl-css
+      log4cl
+      mk-string-metrics
+      sqlite
+      str
+      swank
+      trivia
+      trivial-clipboard
+      unix-opts
+      dbus
+    ];
+    propagatedBuildInputs = [ next-gtk-webkit ];
+
+    buildPhase = ''
+      common-lisp.sh --eval "(require :asdf)" \
+                     --eval "(asdf:load-asd (truename \"next.asd\") :name \"next\")" \
+                     --eval '(asdf:make :next)' \
+                     --quit
+    '';
+
+    installPhase = ''
+      install -D -m0755 next $out/bin/next
+    '';
+
+    preFixup = ''
+      wrapProgram $out/bin/next \
+        --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules"
+    '';
+
+    meta = with stdenv.lib; {
+      description = "Infinitely extensible web-browser (with Lisp development files)";
+      homepage = https://next.atlas.engineer;
+      license = licenses.bsd3;
+      maintainers = [ maintainers.lewo ];
+      platforms = [ "x86_64-linux" ];
+    };
+  }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 98e13c2bbf7..9cdb550e962 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4421,6 +4421,10 @@ in
 
   netsniff-ng = callPackage ../tools/networking/netsniff-ng { };
 
+  next = callPackage ../applications/networking/browsers/next { };
+
+  next-gtk-webkit = callPackage ../applications/networking/browsers/next-gtk-webkit { };
+
   nfpm = callPackage ../tools/package-management/nfpm { };
 
   nginx-config-formatter = callPackage ../tools/misc/nginx-config-formatter { };
-- 
GitLab


From fb9b7446ee0f2e57e6819982121ac01fa15d9601 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 19 Sep 2019 22:09:57 +0200
Subject: [PATCH 0595/2254] piper: temporarily propagate gobject-introspection

On startup piper would be unable to find Pango:
> ImportError: Typelib file for namespace 'Pango', version '1.0' not found

Workaround for #56943
---
 pkgs/os-specific/linux/piper/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/piper/default.nix b/pkgs/os-specific/linux/piper/default.nix
index e177b284bbd..be3a5612a29 100644
--- a/pkgs/os-specific/linux/piper/default.nix
+++ b/pkgs/os-specific/linux/piper/default.nix
@@ -16,8 +16,12 @@ python3.pkgs.buildPythonApplication rec {
   };
 
   nativeBuildInputs = [ meson ninja gettext pkgconfig wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ];
-  buildInputs = [ gtk3 glib gnome3.adwaita-icon-theme python3 ];
-  propagatedBuildInputs = with python3.pkgs; [ lxml evdev pygobject3 ];
+  buildInputs = [
+    gtk3 glib gnome3.adwaita-icon-theme python3
+  ];
+  propagatedBuildInputs = with python3.pkgs; [ lxml evdev pygobject3 ] ++ [
+    gobject-introspection # fixes https://github.com/NixOS/nixpkgs/issues/56943 for now
+  ];
 
   postPatch = ''
     chmod +x meson_install.sh # patchShebangs requires executable file
-- 
GitLab


From 67844e82be499d823022aa1a742a1187800195c4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 19 Sep 2019 22:16:27 +0200
Subject: [PATCH 0596/2254] piper: 0.2.903 -> 0.3

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

diff --git a/pkgs/os-specific/linux/piper/default.nix b/pkgs/os-specific/linux/piper/default.nix
index be3a5612a29..1229c442fa2 100644
--- a/pkgs/os-specific/linux/piper/default.nix
+++ b/pkgs/os-specific/linux/piper/default.nix
@@ -4,7 +4,7 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "piper";
-  version = "0.2.903";
+  version = "0.3";
 
   format = "other";
 
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
     owner  = "libratbag";
     repo   = "piper";
     rev    =  version;
-    sha256 = "0zh4lm074x5gwvx663bapdyv8lf84yjwfg8cpf77rszyja1hx13a";
+    sha256 = "1vz7blhx6qsfrk5znwr0fj1k8vahnlaz6rn7ifcgxmq398mmz8z7";
   };
 
   nativeBuildInputs = [ meson ninja gettext pkgconfig wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ];
-- 
GitLab


From d0f19f960958c5263af661c2b4604d704a9b8cb0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 19 Sep 2019 22:00:55 +0200
Subject: [PATCH 0597/2254] libratbag: 0.9.905 -> 0.10

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

diff --git a/pkgs/os-specific/linux/libratbag/default.nix b/pkgs/os-specific/linux/libratbag/default.nix
index a09bb2a6ceb..f2bf5c94970 100644
--- a/pkgs/os-specific/linux/libratbag/default.nix
+++ b/pkgs/os-specific/linux/libratbag/default.nix
@@ -1,15 +1,16 @@
 { stdenv, fetchFromGitHub, meson, ninja, pkgconfig
-, glib, systemd, udev, libevdev, gitMinimal, check, valgrind, swig, python3 }:
+, glib, systemd, udev, libevdev, gitMinimal, check, valgrind, swig, python3
+, json-glib, libunistring }:
 
 stdenv.mkDerivation rec {
   pname = "libratbag";
-  version = "0.9.905";
+  version = "0.10";
 
   src = fetchFromGitHub {
     owner  = "libratbag";
     repo   = "libratbag";
     rev    = "v${version}";
-    sha256 = "0bh1nf9sv7wka0vh5bz9krf2cfxz0rr64hrpdm7imsb6cn39k01y";
+    sha256 = "10hahpv2n48b5z35d2draka7cz1a9vw53rvwfmpp5dibwnmi81jb";
   };
 
   nativeBuildInputs = [
@@ -17,7 +18,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    glib systemd udev libevdev
+    glib systemd udev libevdev json-glib libunistring
     (python3.withPackages (ps: with ps; [ evdev pygobject3 ]))
   ];
 
-- 
GitLab


From 60f4d2f660fd067f3dd2f8079486e1fc5dda88e0 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 19 Sep 2019 15:34:08 -0500
Subject: [PATCH 0598/2254] clang_9: drop included patches

---
 .../compilers/llvm/9/clang/clang-xpc.patch    |  41 --
 .../compilers/llvm/9/clang/default.nix        |   7 -
 .../compilers/llvm/9/clang/static-pie.patch   | 157 --------
 .../compilers/llvm/9/clang/unwindlib.patch    | 372 ------------------
 4 files changed, 577 deletions(-)
 delete mode 100644 pkgs/development/compilers/llvm/9/clang/clang-xpc.patch
 delete mode 100644 pkgs/development/compilers/llvm/9/clang/static-pie.patch
 delete mode 100644 pkgs/development/compilers/llvm/9/clang/unwindlib.patch

diff --git a/pkgs/development/compilers/llvm/9/clang/clang-xpc.patch b/pkgs/development/compilers/llvm/9/clang/clang-xpc.patch
deleted file mode 100644
index eb57d345822..00000000000
--- a/pkgs/development/compilers/llvm/9/clang/clang-xpc.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 61c9b97d7b81cc2c013b423bf1763a92b14fcae3 Mon Sep 17 00:00:00 2001
-From: Jan Korous <jkorous@apple.com>
-Date: Tue, 26 Mar 2019 03:48:25 +0000
-Subject: [PATCH] [clangd][xpc][cmake] Respect explicit value of
- CLANGD_BUILD_XPC
-
-We shouldn't prevent user from disabling XPC framework build on Darwin.
-However, by keeping it on by default our CI systems also test
-it by default on macOS.
-
-Based on user request:
-http://lists.llvm.org/pipermail/cfe-dev/2019-March/061778.html
-
-Differential Revision: https://reviews.llvm.org/D59808
-
-git-svn-id: https://llvm.org/svn/llvm-project/clang-tools-extra/trunk@356974 91177308-0d34-0410-b5e6-96231b3b80d8
----
- CMakeLists.txt | 13 ++++++++++---
- 1 file changed, 10 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 66ebeaeeaa..514b17fb3c 100644
---- a/tools/extra/CMakeLists.txt
-+++ b/tools/extra/CMakeLists.txt
-@@ -1,6 +1,13 @@
--option(CLANGD_BUILD_XPC "Build XPC Support For Clangd." OFF)
--if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
--  set(CLANGD_BUILD_XPC ON CACHE BOOL "" FORCE)
-+if (NOT DEFINED CLANGD_BUILD_XPC)
-+  if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-+    set(CLANGD_BUILD_XPC_DEFAULT ON)
-+  else ()
-+    set(CLANGD_BUILD_XPC_DEFAULT OFF)
-+  endif ()
-+
-+  set(CLANGD_BUILD_XPC ${CLANGD_BUILD_XPC_DEFAULT} CACHE BOOL "Build XPC Support For Clangd." FORCE)
-+
-+  unset(CLANGD_BUILD_XPC_DEFAULT)
- endif ()
- 
- add_subdirectory(clang-apply-replacements)
\ No newline at end of file
diff --git a/pkgs/development/compilers/llvm/9/clang/default.nix b/pkgs/development/compilers/llvm/9/clang/default.nix
index 43788977f10..df6b916e87f 100644
--- a/pkgs/development/compilers/llvm/9/clang/default.nix
+++ b/pkgs/development/compilers/llvm/9/clang/default.nix
@@ -41,13 +41,6 @@ let
 
     patches = [
       ./purity.patch
-      ./clang-xpc.patch
-      # Backport for -static-pie, which the latter touches, and which is nice in
-      # its own right.
-      ./static-pie.patch
-      # Backport for the `--unwindlib=[libgcc|compiler-rt]` flag, which is
-      # needed for our bootstrapping to not interfere with C.
-      ./unwindlib.patch
       # https://reviews.llvm.org/D51899
       ./compiler-rt-baremetal.patch
     ];
diff --git a/pkgs/development/compilers/llvm/9/clang/static-pie.patch b/pkgs/development/compilers/llvm/9/clang/static-pie.patch
deleted file mode 100644
index d1f86a16232..00000000000
--- a/pkgs/development/compilers/llvm/9/clang/static-pie.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-commit 7a9842bc92921e79b84630045276861be90b2d47
-Author: Siva Chandra <sivachandra@google.com>
-Date:   Wed Feb 20 19:07:04 2019 +0000
-
-    [Clang Driver] Add support for "-static-pie" argument to the Clang driver.
-    
-    Summary: This change mimics GCC's support for the "-static-pie" argument.
-    
-    Subscribers: cfe-commits
-    
-    Tags: #clang
-    
-    Differential Revision: https://reviews.llvm.org/D58307
-    
-    git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@354502 91177308-0d34-0410-b5e6-96231b3b80d8
-    (cherry picked from commit 7d6cd7825e6883f8650e32b07f3750824c2cef62)
-
-diff --git a/include/clang/Driver/Options.td b/include/clang/Driver/Options.td
-index d02d9744d7..75a21e66c7 100644
---- a/include/clang/Driver/Options.td
-+++ b/include/clang/Driver/Options.td
-@@ -2502,6 +2502,7 @@ def pthread : Flag<["-"], "pthread">, Flags<[CC1Option]>,
- def no_pthread : Flag<["-"], "no-pthread">, Flags<[CC1Option]>;
- def p : Flag<["-"], "p">;
- def pie : Flag<["-"], "pie">;
-+def static_pie : Flag<["-"], "static-pie">;
- def read__only__relocs : Separate<["-"], "read_only_relocs">;
- def remap : Flag<["-"], "remap">;
- def rewrite_objc : Flag<["-"], "rewrite-objc">, Flags<[DriverOption,CC1Option]>,
-diff --git a/lib/Driver/ToolChains/CommonArgs.cpp b/lib/Driver/ToolChains/CommonArgs.cpp
-index d7e316befa..85ffc1618d 100644
---- a/lib/Driver/ToolChains/CommonArgs.cpp
-+++ b/lib/Driver/ToolChains/CommonArgs.cpp
-@@ -1138,19 +1138,22 @@ static void AddLibgcc(const llvm::Triple &Triple, const Driver &D,
-   bool isCygMing = Triple.isOSCygMing();
-   bool IsIAMCU = Triple.isOSIAMCU();
-   bool StaticLibgcc = Args.hasArg(options::OPT_static_libgcc) ||
--                      Args.hasArg(options::OPT_static);
-+                      Args.hasArg(options::OPT_static) ||
-+                      Args.hasArg(options::OPT_static_pie);
- 
-   bool SharedLibgcc = Args.hasArg(options::OPT_shared_libgcc);
-   bool UnspecifiedLibgcc = !StaticLibgcc && !SharedLibgcc;
- 
-   // Gcc adds libgcc arguments in various ways:
-   //
--  // gcc <none>: -lgcc --as-needed -lgcc_s --no-as-needed
--  // g++ <none>:                   -lgcc_s               -lgcc
--  // gcc shared:                   -lgcc_s               -lgcc
--  // g++ shared:                   -lgcc_s               -lgcc
--  // gcc static: -lgcc             -lgcc_eh
--  // g++ static: -lgcc             -lgcc_eh
-+  // gcc <none>:     -lgcc --as-needed -lgcc_s --no-as-needed
-+  // g++ <none>:                       -lgcc_s               -lgcc
-+  // gcc shared:                       -lgcc_s               -lgcc
-+  // g++ shared:                       -lgcc_s               -lgcc
-+  // gcc static:     -lgcc             -lgcc_eh
-+  // g++ static:     -lgcc             -lgcc_eh
-+  // gcc static-pie: -lgcc             -lgcc_eh
-+  // g++ static-pie: -lgcc             -lgcc_eh
-   //
-   // Also, certain targets need additional adjustments.
- 
-diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp
-index 69dba8fec8..0faa0bb473 100644
---- a/lib/Driver/ToolChains/Gnu.cpp
-+++ b/lib/Driver/ToolChains/Gnu.cpp
-@@ -334,6 +334,7 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
-   const bool isAndroid = ToolChain.getTriple().isAndroid();
-   const bool IsIAMCU = ToolChain.getTriple().isOSIAMCU();
-   const bool IsPIE = getPIE(Args, ToolChain);
-+  const bool IsStaticPIE = Args.hasArg(options::OPT_static_pie);
-   const bool HasCRTBeginEndFiles =
-       ToolChain.getTriple().hasEnvironment() ||
-       (ToolChain.getTriple().getVendor() != llvm::Triple::MipsTechnologies);
-@@ -354,6 +355,12 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
-   if (IsPIE)
-     CmdArgs.push_back("-pie");
- 
-+  if (IsStaticPIE) {
-+    CmdArgs.push_back("-static");
-+    CmdArgs.push_back("-pie");
-+    CmdArgs.push_back("--no-dynamic-linker");
-+  }
-+
-   if (Args.hasArg(options::OPT_rdynamic))
-     CmdArgs.push_back("-export-dynamic");
- 
-@@ -415,6 +422,8 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
-           crt1 = "gcrt1.o";
-         else if (IsPIE)
-           crt1 = "Scrt1.o";
-+        else if (IsStaticPIE)
-+          crt1 = "rcrt1.o";
-         else
-           crt1 = "crt1.o";
-       }
-@@ -432,7 +441,7 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
-         crtbegin = isAndroid ? "crtbegin_static.o" : "crtbeginT.o";
-       else if (Args.hasArg(options::OPT_shared))
-         crtbegin = isAndroid ? "crtbegin_so.o" : "crtbeginS.o";
--      else if (IsPIE)
-+      else if (IsPIE || IsStaticPIE)
-         crtbegin = isAndroid ? "crtbegin_dynamic.o" : "crtbeginS.o";
-       else
-         crtbegin = isAndroid ? "crtbegin_dynamic.o" : "crtbegin.o";
-@@ -483,7 +492,7 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
- 
-   if (!Args.hasArg(options::OPT_nostdlib)) {
-     if (!Args.hasArg(options::OPT_nodefaultlibs)) {
--      if (Args.hasArg(options::OPT_static))
-+      if (Args.hasArg(options::OPT_static) || IsStaticPIE)
-         CmdArgs.push_back("--start-group");
- 
-       if (NeedsSanitizerDeps)
-@@ -518,7 +527,7 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
-       if (IsIAMCU)
-         CmdArgs.push_back("-lgloss");
- 
--      if (Args.hasArg(options::OPT_static))
-+      if (Args.hasArg(options::OPT_static) || IsStaticPIE)
-         CmdArgs.push_back("--end-group");
-       else
-         AddRunTimeLibs(ToolChain, D, CmdArgs, Args);
-@@ -535,7 +544,7 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
-       const char *crtend;
-       if (Args.hasArg(options::OPT_shared))
-         crtend = isAndroid ? "crtend_so.o" : "crtendS.o";
--      else if (IsPIE)
-+      else if (IsPIE || IsStaticPIE)
-         crtend = isAndroid ? "crtend_android.o" : "crtendS.o";
-       else
-         crtend = isAndroid ? "crtend_android.o" : "crtend.o";
-diff --git a/test/Driver/linux-ld.c b/test/Driver/linux-ld.c
-index 3ab81be490..800f782523 100644
---- a/test/Driver/linux-ld.c
-+++ b/test/Driver/linux-ld.c
-@@ -176,6 +176,19 @@
- // CHECK-CLANG-NO-LIBGCC-STATIC: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
- // CHECK-CLANG-NO-LIBGCC-STATIC: "--start-group" "-lgcc" "-lgcc_eh" "-lc" "--end-group"
- //
-+// RUN: %clang -static-pie -no-canonical-prefixes %s -### -o %t.o 2>&1 \
-+// RUN:     --target=x86_64-unknown-linux -rtlib=platform \
-+// RUN:     --gcc-toolchain="" \
-+// RUN:     --sysroot=%S/Inputs/basic_linux_tree \
-+// RUN:   | FileCheck --check-prefix=CHECK-CLANG-LD-STATIC-PIE %s
-+// CHECK-CLANG-LD-STATIC-PIE: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
-+// CHECK-CLANG-LD-STATIC-PIE: "-static"
-+// CHECK-CLANG-LD-STATIC-PIE: "-pie"
-+// CHECK-CLANG-LD-STATIC-PIE: "--no-dynamic-linker"
-+// CHECK-CLANG-LD-STATIC-PIE: "-m" "elf_x86_64"
-+// CHECK-CLANG-LD-STATIC-PIE: "{{.*}}rcrt1.o"
-+// CHECK-CLANG-LD-STATIC-PIE: "--start-group" "-lgcc" "-lgcc_eh" "-lc" "--end-group"
-+//
- // RUN: %clang -dynamic -no-canonical-prefixes %s -### -o %t.o 2>&1 \
- // RUN:     --target=x86_64-unknown-linux -rtlib=platform \
- // RUN:     --gcc-toolchain="" \
diff --git a/pkgs/development/compilers/llvm/9/clang/unwindlib.patch b/pkgs/development/compilers/llvm/9/clang/unwindlib.patch
deleted file mode 100644
index 6958fce60ce..00000000000
--- a/pkgs/development/compilers/llvm/9/clang/unwindlib.patch
+++ /dev/null
@@ -1,372 +0,0 @@
-commit cd5603a4767277a29d3e67a9c3f2a5d2129cd973
-Author: Sterling Augustine <saugustine@google.com>
-Date:   Tue Mar 19 20:01:59 2019 +0000
-
-    Add --unwindlib=[libgcc|compiler-rt] to parallel --rtlib= [take 2]
-    
-    "clang++ hello.cc --rtlib=compiler-rt"
-    
-    now can works without specifying additional unwind or exception
-    handling libraries.
-    
-    This reworked version of the feature no longer modifies today's default
-    unwind library for compiler-rt: which is nothing. Rather, a user
-    can specify -DCLANG_DEFAULT_UNWINDLIB=libunwind when configuring
-    the compiler.
-    
-    This should address the issues from the previous version.
-    
-    Update tests for new --unwindlib semantics.
-    
-    Differential Revision: https://reviews.llvm.org/D59109
-    
-    git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@356508 91177308-0d34-0410-b5e6-96231b3b80d8
-    (cherry picked from commit 344aa82a52f2fae527f58284567ae305a314f7a8)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c2016a45ca..edeb2b66a1 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -261,6 +261,24 @@ if (NOT(CLANG_DEFAULT_RTLIB STREQUAL "" OR
-     "Default runtime library to use (\"libgcc\" or \"compiler-rt\", empty for platform default)" FORCE)
- endif()
- 
-+set(CLANG_DEFAULT_UNWINDLIB "" CACHE STRING
-+  "Default unwind library to use (\"none\" \"libgcc\" or \"libunwind\", empty to match runtime library.)")
-+if (CLANG_DEFAULT_UNWINDLIB STREQUAL "")
-+  if (CLANG_DEFAULT_RTLIB STREQUAL "libgcc")
-+    set (CLANG_DEFAULT_UNWINDLIB "libgcc" CACHE STRING "" FORCE)
-+  elseif (CLANG_DEFAULT_RTLIBS STREQUAL "libunwind")
-+    set (CLANG_DEFAULT_UNWINDLIB "none" CACHE STRING "" FORCE)
-+  endif()
-+endif()
-+
-+if (NOT(CLANG_DEFAULT_UNWINDLIB STREQUAL "none" OR
-+        CLANG_DEFAULT_UNWINDLIB STREQUAL "libgcc" OR
-+        CLANG_DEFAULT_UNWINDLIB STREQUAL "libunwind"))
-+  message(WARNING "Resetting default unwindlib to use platform default")
-+  set(CLANG_DEFAULT_UNWINDLIB "" CACHE STRING
-+    "Default unwind library to use (\"none\" \"libgcc\" or \"libunwind\", empty for none)" FORCE)
-+endif()
-+
- set(CLANG_DEFAULT_OBJCOPY "objcopy" CACHE STRING
-   "Default objcopy executable to use.")
- 
-diff --git a/include/clang/Basic/DiagnosticDriverKinds.td b/include/clang/Basic/DiagnosticDriverKinds.td
-index 5475e28ed7..15971210e4 100644
---- a/include/clang/Basic/DiagnosticDriverKinds.td
-+++ b/include/clang/Basic/DiagnosticDriverKinds.td
-@@ -52,6 +52,10 @@ def err_drv_invalid_rtlib_name : Error<
-   "invalid runtime library name in argument '%0'">;
- def err_drv_unsupported_rtlib_for_platform : Error<
-   "unsupported runtime library '%0' for platform '%1'">;
-+def err_drv_invalid_unwindlib_name : Error<
-+  "invalid unwind library name in argument '%0'">;
-+def err_drv_incompatible_unwindlib : Error<
-+  "--rtlib=libgcc requires --unwindlib=libgcc">;
- def err_drv_invalid_stdlib_name : Error<
-   "invalid library name in argument '%0'">;
- def err_drv_invalid_output_with_multiple_archs : Error<
-diff --git a/include/clang/Config/config.h.cmake b/include/clang/Config/config.h.cmake
-index 1d624450b9..2d4cb747e8 100644
---- a/include/clang/Config/config.h.cmake
-+++ b/include/clang/Config/config.h.cmake
-@@ -23,6 +23,9 @@
- /* Default runtime library to use. */
- #define CLANG_DEFAULT_RTLIB "${CLANG_DEFAULT_RTLIB}"
- 
-+/* Default unwind library to use. */
-+#define CLANG_DEFAULT_UNWINDLIB "${CLANG_DEFAULT_UNWINDLIB}"
-+
- /* Default objcopy to use */
- #define CLANG_DEFAULT_OBJCOPY "${CLANG_DEFAULT_OBJCOPY}"
- 
-diff --git a/include/clang/Driver/Options.td b/include/clang/Driver/Options.td
-index 75a21e66c7..4da0e54965 100644
---- a/include/clang/Driver/Options.td
-+++ b/include/clang/Driver/Options.td
-@@ -2570,6 +2570,8 @@ def std_EQ : Joined<["-", "--"], "std=">, Flags<[CC1Option]>,
-   }]>;
- def stdlib_EQ : Joined<["-", "--"], "stdlib=">, Flags<[CC1Option]>,
-   HelpText<"C++ standard library to use">, Values<"libc++,libstdc++,platform">;
-+def unwindlib_EQ : Joined<["-", "--"], "unwindlib=">, Flags<[CC1Option]>,
-+  HelpText<"Unwind library to use">, Values<"libgcc,unwindlib,platform">;
- def sub__library : JoinedOrSeparate<["-"], "sub_library">;
- def sub__umbrella : JoinedOrSeparate<["-"], "sub_umbrella">;
- def system_header_prefix : Joined<["--"], "system-header-prefix=">,
-diff --git a/include/clang/Driver/ToolChain.h b/include/clang/Driver/ToolChain.h
-index d5f75b8271..4bedf760eb 100644
---- a/include/clang/Driver/ToolChain.h
-+++ b/include/clang/Driver/ToolChain.h
-@@ -100,6 +100,12 @@ public:
-     RLT_Libgcc
-   };
- 
-+  enum UnwindLibType {
-+    UNW_None,
-+    UNW_CompilerRT,
-+    UNW_Libgcc
-+  };
-+
-   enum RTTIMode {
-     RM_Enabled,
-     RM_Disabled,
-@@ -368,6 +374,10 @@ public:
-     return ToolChain::CST_Libstdcxx;
-   }
- 
-+  virtual UnwindLibType GetDefaultUnwindLibType() const {
-+    return ToolChain::UNW_None;
-+  }
-+
-   virtual std::string getCompilerRTPath() const;
- 
-   virtual std::string getCompilerRT(const llvm::opt::ArgList &Args,
-@@ -512,6 +522,10 @@ public:
-   // given compilation arguments.
-   virtual CXXStdlibType GetCXXStdlibType(const llvm::opt::ArgList &Args) const;
- 
-+  // GetUnwindLibType - Determine the unwind library type to use with the
-+  // given compilation arguments.
-+  virtual UnwindLibType GetUnwindLibType(const llvm::opt::ArgList &Args) const;
-+
-   /// AddClangCXXStdlibIncludeArgs - Add the clang -cc1 level arguments to set
-   /// the include paths to use for the given C++ standard library type.
-   virtual void
-diff --git a/lib/Driver/ToolChain.cpp b/lib/Driver/ToolChain.cpp
-index 88a627eab6..d82423f4a8 100644
---- a/lib/Driver/ToolChain.cpp
-+++ b/lib/Driver/ToolChain.cpp
-@@ -680,6 +680,33 @@ ToolChain::RuntimeLibType ToolChain::GetRuntimeLibType(
-   return GetDefaultRuntimeLibType();
- }
- 
-+ToolChain::UnwindLibType ToolChain::GetUnwindLibType(
-+    const ArgList &Args) const {
-+  const Arg *A = Args.getLastArg(options::OPT_unwindlib_EQ);
-+  StringRef LibName = A ? A->getValue() : CLANG_DEFAULT_UNWINDLIB;
-+
-+  if (LibName == "none")
-+    return ToolChain::UNW_None;
-+  else if (LibName == "platform" || LibName == "") {
-+    ToolChain::RuntimeLibType RtLibType = GetRuntimeLibType(Args);
-+    if (RtLibType == ToolChain::RLT_CompilerRT)
-+      return ToolChain::UNW_None;
-+    else if (RtLibType == ToolChain::RLT_Libgcc)
-+      return ToolChain::UNW_Libgcc;
-+  } else if (LibName == "libunwind") {
-+    if (GetRuntimeLibType(Args) == RLT_Libgcc)
-+      getDriver().Diag(diag::err_drv_incompatible_unwindlib);
-+    return ToolChain::UNW_CompilerRT;
-+  } else if (LibName == "libgcc")
-+    return ToolChain::UNW_Libgcc;
-+
-+  if (A)
-+    getDriver().Diag(diag::err_drv_invalid_unwindlib_name)
-+        << A->getAsString(Args);
-+
-+  return GetDefaultUnwindLibType();
-+}
-+
- ToolChain::CXXStdlibType ToolChain::GetCXXStdlibType(const ArgList &Args) const{
-   const Arg *A = Args.getLastArg(options::OPT_stdlib_EQ);
-   StringRef LibName = A ? A->getValue() : CLANG_DEFAULT_CXX_STDLIB;
-diff --git a/lib/Driver/ToolChains/CommonArgs.cpp b/lib/Driver/ToolChains/CommonArgs.cpp
-index 85ffc1618d..9fd29726a4 100644
---- a/lib/Driver/ToolChains/CommonArgs.cpp
-+++ b/lib/Driver/ToolChains/CommonArgs.cpp
-@@ -1132,47 +1132,80 @@ bool tools::isObjCAutoRefCount(const ArgList &Args) {
-   return Args.hasFlag(options::OPT_fobjc_arc, options::OPT_fno_objc_arc, false);
- }
- 
--static void AddLibgcc(const llvm::Triple &Triple, const Driver &D,
--                      ArgStringList &CmdArgs, const ArgList &Args) {
--  bool isAndroid = Triple.isAndroid();
--  bool isCygMing = Triple.isOSCygMing();
--  bool IsIAMCU = Triple.isOSIAMCU();
--  bool StaticLibgcc = Args.hasArg(options::OPT_static_libgcc) ||
--                      Args.hasArg(options::OPT_static) ||
--                      Args.hasArg(options::OPT_static_pie);
--
--  bool SharedLibgcc = Args.hasArg(options::OPT_shared_libgcc);
--  bool UnspecifiedLibgcc = !StaticLibgcc && !SharedLibgcc;
--
--  // Gcc adds libgcc arguments in various ways:
--  //
--  // gcc <none>:     -lgcc --as-needed -lgcc_s --no-as-needed
--  // g++ <none>:                       -lgcc_s               -lgcc
--  // gcc shared:                       -lgcc_s               -lgcc
--  // g++ shared:                       -lgcc_s               -lgcc
--  // gcc static:     -lgcc             -lgcc_eh
--  // g++ static:     -lgcc             -lgcc_eh
--  // gcc static-pie: -lgcc             -lgcc_eh
--  // g++ static-pie: -lgcc             -lgcc_eh
--  //
--  // Also, certain targets need additional adjustments.
-+enum class LibGccType { UnspecifiedLibGcc, StaticLibGcc, SharedLibGcc };
-+
-+static LibGccType getLibGccType(const ArgList &Args) {
-+  bool Static = Args.hasArg(options::OPT_static_libgcc) ||
-+                Args.hasArg(options::OPT_static) ||
-+                Args.hasArg(options::OPT_static_pie);
-+
-+  bool Shared = Args.hasArg(options::OPT_shared_libgcc);
-+  if (Shared)
-+    return LibGccType::SharedLibGcc;
-+  if (Static)
-+    return LibGccType::StaticLibGcc;
-+  return LibGccType::UnspecifiedLibGcc;
-+}
- 
--  bool LibGccFirst = (D.CCCIsCC() && UnspecifiedLibgcc) || StaticLibgcc;
--  if (LibGccFirst)
--    CmdArgs.push_back("-lgcc");
-+// Gcc adds libgcc arguments in various ways:
-+//
-+// gcc <none>:     -lgcc --as-needed -lgcc_s --no-as-needed
-+// g++ <none>:                       -lgcc_s               -lgcc
-+// gcc shared:                       -lgcc_s               -lgcc
-+// g++ shared:                       -lgcc_s               -lgcc
-+// gcc static:     -lgcc             -lgcc_eh
-+// g++ static:     -lgcc             -lgcc_eh
-+// gcc static-pie: -lgcc             -lgcc_eh
-+// g++ static-pie: -lgcc             -lgcc_eh
-+//
-+// Also, certain targets need additional adjustments.
-+
-+static void AddUnwindLibrary(const ToolChain &TC, const Driver &D,
-+                             ArgStringList &CmdArgs, const ArgList &Args) {
-+  ToolChain::UnwindLibType UNW = TC.GetUnwindLibType(Args);
-+  // Targets that don't use unwind libraries.
-+  if (TC.getTriple().isAndroid() || TC.getTriple().isOSIAMCU() ||
-+      TC.getTriple().isOSBinFormatWasm() ||
-+      UNW == ToolChain::UNW_None)
-+    return;
- 
--  bool AsNeeded = D.CCCIsCC() && UnspecifiedLibgcc && !isAndroid && !isCygMing;
-+  LibGccType LGT = getLibGccType(Args);
-+  bool AsNeeded = D.CCCIsCC() && LGT == LibGccType::UnspecifiedLibGcc &&
-+                  !TC.getTriple().isAndroid() && !TC.getTriple().isOSCygMing();
-   if (AsNeeded)
-     CmdArgs.push_back("--as-needed");
- 
--  if ((UnspecifiedLibgcc || SharedLibgcc) && !isAndroid)
--    CmdArgs.push_back("-lgcc_s");
--
--  else if (StaticLibgcc && !isAndroid && !IsIAMCU)
--    CmdArgs.push_back("-lgcc_eh");
-+  switch (UNW) {
-+  case ToolChain::UNW_None:
-+    return;
-+  case ToolChain::UNW_Libgcc: {
-+    LibGccType LGT = getLibGccType(Args);
-+    if (LGT == LibGccType::UnspecifiedLibGcc || LGT == LibGccType::SharedLibGcc)
-+      CmdArgs.push_back("-lgcc_s");
-+    else if (LGT == LibGccType::StaticLibGcc)
-+      CmdArgs.push_back("-lgcc_eh");
-+    break;
-+  }
-+  case ToolChain::UNW_CompilerRT:
-+    CmdArgs.push_back("-lunwind");
-+    break;
-+  }
- 
-   if (AsNeeded)
-     CmdArgs.push_back("--no-as-needed");
-+}
-+
-+static void AddLibgcc(const ToolChain &TC, const Driver &D,
-+                      ArgStringList &CmdArgs, const ArgList &Args) {
-+  bool isAndroid = TC.getTriple().isAndroid();
-+
-+  LibGccType LGT = getLibGccType(Args);
-+  bool LibGccFirst = (D.CCCIsCC() && LGT == LibGccType::UnspecifiedLibGcc) ||
-+                     LGT == LibGccType::StaticLibGcc;
-+  if (LibGccFirst)
-+    CmdArgs.push_back("-lgcc");
-+
-+  AddUnwindLibrary(TC, D, CmdArgs, Args);
- 
-   if (!LibGccFirst)
-     CmdArgs.push_back("-lgcc");
-@@ -1182,7 +1215,7 @@ static void AddLibgcc(const llvm::Triple &Triple, const Driver &D,
-   //
-   // NOTE: This fixes a link error on Android MIPS as well.  The non-static
-   // libgcc for MIPS relies on _Unwind_Find_FDE and dl_iterate_phdr from libdl.
--  if (isAndroid && !StaticLibgcc)
-+  if (isAndroid && getLibGccType(Args) != LibGccType::StaticLibGcc)
-     CmdArgs.push_back("-ldl");
- }
- 
-@@ -1194,6 +1227,7 @@ void tools::AddRunTimeLibs(const ToolChain &TC, const Driver &D,
-   switch (RLT) {
-   case ToolChain::RLT_CompilerRT:
-     CmdArgs.push_back(TC.getCompilerRTArgString(Args, "builtins"));
-+    AddUnwindLibrary(TC, D, CmdArgs, Args);
-     break;
-   case ToolChain::RLT_Libgcc:
-     // Make sure libgcc is not used under MSVC environment by default
-@@ -1205,7 +1239,7 @@ void tools::AddRunTimeLibs(const ToolChain &TC, const Driver &D,
-             << Args.getLastArg(options::OPT_rtlib_EQ)->getValue() << "MSVC";
-       }
-     } else
--      AddLibgcc(TC.getTriple(), D, CmdArgs, Args);
-+      AddLibgcc(TC, D, CmdArgs, Args);
-     break;
-   }
- }
-diff --git a/test/Driver/compiler-rt-unwind.c b/test/Driver/compiler-rt-unwind.c
-new file mode 100644
-index 0000000000..00024dfa7e
---- /dev/null
-+++ b/test/Driver/compiler-rt-unwind.c
-@@ -0,0 +1,49 @@
-+// General tests that the driver handles combinations of --rtlib=XXX and
-+// --unwindlib=XXX properly.
-+//
-+// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
-+// RUN:     --target=x86_64-unknown-linux \
-+// RUN:     --gcc-toolchain="" \
-+// RUN:   | FileCheck --check-prefix=RTLIB-EMPTY %s
-+// RTLIB-EMPTY: "{{.*}}lgcc"
-+// RTLIB-EMPTY: "{{.*}}-lgcc_s"
-+//
-+// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
-+// RUN:     --target=x86_64-unknown-linux -rtlib=libgcc \
-+// RUN:     --gcc-toolchain="" \
-+// RUN:   | FileCheck --check-prefix=RTLIB-GCC %s
-+// RTLIB-GCC: "{{.*}}lgcc"
-+// RTLIB-GCC: "{{.*}}lgcc_s"
-+//
-+// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
-+// RUN:     --target=x86_64-unknown-linux -rtlib=libgcc --unwindlib=libunwind \
-+// RUN:     --gcc-toolchain="" \
-+// RUN:   | FileCheck --check-prefix=RTLIB-GCC-UNWINDLIB-COMPILER-RT %s
-+// RTLIB-GCC-UNWINDLIB-COMPILER-RT: "{{.*}}lgcc"
-+// RTLIB-GCC-UNWINDLIB-COMPILER-RT: "{{.*}}lunwind"
-+//
-+// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1   \
-+// RUN:     --target=x86_64-unknown-linux -rtlib=compiler-rt \
-+// RUN:     --gcc-toolchain="" \
-+// RUN:   | FileCheck --check-prefix=RTLIB-COMPILER-RT %s
-+// RTLIB-COMPILER-RT: "{{.*}}libclang_rt.builtins-x86_64.a"
-+//
-+// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1   \
-+// RUN:     --target=x86_64-unknown-linux -rtlib=compiler-rt --unwindlib=libgcc \
-+// RUN:     --gcc-toolchain="" \
-+// RUN:   | FileCheck --check-prefix=RTLIB-COMPILER-RT-UNWINDLIB-GCC %s
-+// RTLIB-COMPILER-RT-UNWINDLIB-GCC: "{{.*}}libclang_rt.builtins-x86_64.a"
-+// RTLIB-COMPILER-RT-UNWINDLIB-GCC: "{{.*}}lgcc_s"
-+//
-+// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1              \
-+// RUN:     --target=x86_64-unknown-linux -rtlib=compiler-rt --unwindlib=libgcc \
-+// RUN:     -static --gcc-toolchain="" \
-+// RUN:   | FileCheck --check-prefix=RTLIB-COMPILER-RT-UNWINDLIB-GCC-STATIC %s
-+// RTLIB-COMPILER-RT-UNWINDLIB-GCC-STATIC: "{{.*}}libclang_rt.builtins-x86_64.a"
-+// RTLIB-COMPILER-RT-UNWINDLIB-GCC-STATIC: "{{.*}}lgcc_eh"
-+//
-+// RUN: not %clang -no-canonical-prefixes %s -o %t.o 2> %t.err              \
-+// RUN:     --target=x86_64-unknown-linux -rtlib=libgcc --unwindlib=libunwind \
-+// RUN:     --gcc-toolchain="" \
-+// RUN: FileCheck --input-file=%t.err --check-prefix=RTLIB-GCC-UNWINDLIB-COMPILER_RT %s
-+// RTLIB-GCC-UNWINDLIB-COMPILER_RT: "{{[.|\\\n]*}}--rtlib=libgcc requires --unwindlib=libgcc"
-- 
GitLab


From d8e35fdbf97e8e1295f6dbe6f3a9403d8adff188 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 19 Sep 2019 22:38:31 +0200
Subject: [PATCH 0599/2254] vista-fonts: Use new download location

---
 pkgs/data/fonts/vista-fonts/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/fonts/vista-fonts/default.nix b/pkgs/data/fonts/vista-fonts/default.nix
index e8784d90e7f..59cff1b0f47 100644
--- a/pkgs/data/fonts/vista-fonts/default.nix
+++ b/pkgs/data/fonts/vista-fonts/default.nix
@@ -3,7 +3,7 @@
 fetchzip {
   name = "vista-fonts-1";
 
-  url = http://download.microsoft.com/download/f/5/a/f5a3df76-d856-4a61-a6bd-722f52a5be26/PowerPointViewer.exe;
+  url = https://web.archive.org/web/20171225132744/http://download.microsoft.com/download/E/6/7/E675FFFC-2A6D-4AB0-B3EB-27C9F8C8F696/PowerPointViewer.exe;
 
   postFetch = ''
     ${cabextract}/bin/cabextract --lowercase --filter ppviewer.cab $downloadedFile
@@ -21,7 +21,7 @@ fetchzip {
     done
   '';
 
-  sha256 = "1q2d24c203vkl6pwk86frmaj6jra49hr9mydq7cnlx4hilqslw3g";
+  sha256 = "1l27zg5jraa16zm11d3qz1w7m6f1ih3xy5avww454ylm50fw6z11";
 
   meta = {
     description = "Some TrueType fonts from Microsoft Windows Vista (Calibri, Cambria, Candara, Consolas, Constantia, Corbel)";
@@ -31,6 +31,5 @@ fetchzip {
     # Set a non-zero priority to allow easy overriding of the
     # fontconfig configuration files.
     priority = 5;
-    broken = true; # source url is 404
   };
 }
-- 
GitLab


From 889537352b5e208017dad66dd51b3923b7f2d23f Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 19 Sep 2019 18:11:55 -0500
Subject: [PATCH 0600/2254] h2o: 2.2.6 -> 2.3.0-beta2, enable multi-output

This also lets us remove a hack for supporting LibreSSL 2.7, since we're
now using 2.9 by default, anyway.

Finally, use Ninja to run the CMake build instead of Make -- speeds
things up for me by a few seconds.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/servers/http/h2o/default.nix | 31 +++++++++++--------------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/pkgs/servers/http/h2o/default.nix b/pkgs/servers/http/h2o/default.nix
index 26c320499e5..a8de0d7e084 100644
--- a/pkgs/servers/http/h2o/default.nix
+++ b/pkgs/servers/http/h2o/default.nix
@@ -1,39 +1,30 @@
 { stdenv, fetchFromGitHub
-, pkgconfig, cmake
+, pkgconfig, cmake, ninja
 , libressl, libuv, zlib
 }:
 
-with builtins;
-
 stdenv.mkDerivation rec {
-  pname = "h2o";
-  version = "2.2.6";
+  pname   = "h2o";
+  version = "2.3.0-beta2";
 
   src = fetchFromGitHub {
     owner  = "h2o";
     repo   = "h2o";
     rev    = "refs/tags/v${version}";
-    sha256 = "0qni676wqvxx0sl0pw9j0ph7zf2krrzqc1zwj73mgpdnsr8rsib7";
+    sha256 = "0lwg5sfsr7fw7cfy0hrhadgixm35b5cgcvlhwhbk89j72y1bqi6n";
   };
 
-  # We have to fix up some function prototypes, because despite upstream h2o
-  # issue #1705 (https://github.com/h2o/h2o/issues/1706), libressl 2.7+ doesn't
-  # seem to work
-  patchPhase = ''
-    substituteInPlace ./deps/neverbleed/neverbleed.c \
-      --replace 'static void RSA_' 'void RSA_' \
-      --replace 'static int RSA_'  'int RSA_'
-  '';
+  outputs = [ "out" "man" "dev" "lib" ];
 
-  nativeBuildInputs = [ pkgconfig cmake ];
-  buildInputs = [ libressl libuv zlib ];
   enableParallelBuilding = true;
+  nativeBuildInputs = [ pkgconfig cmake ninja ];
+  buildInputs = [ libressl libuv zlib ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Optimized HTTP/1 and HTTP/2 server";
     homepage    = https://h2o.examp1e.net;
-    license     = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
-    platforms   = stdenv.lib.platforms.linux;
+    license     = licenses.mit;
+    maintainers = with maintainers; [ thoughtpolice ];
+    platforms   = platforms.linux;
   };
 }
-- 
GitLab


From 73b11eb566be2c9eb60e6f5eb5e162bcfb786cac Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 19 Sep 2019 18:39:03 -0500
Subject: [PATCH 0601/2254] llvmPackages_9: fetch from releases.llvm.org ("for
 now")

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

diff --git a/pkgs/development/compilers/llvm/9/default.nix b/pkgs/development/compilers/llvm/9/default.nix
index 4970fa1b4cb..1590d180c3f 100644
--- a/pkgs/development/compilers/llvm/9/default.nix
+++ b/pkgs/development/compilers/llvm/9/default.nix
@@ -9,7 +9,7 @@ let
   version = release_version; # differentiating these is important for rc's
 
   fetch = name: sha256: fetchurl {
-    url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${release_version}/${name}-${version}.src.tar.xz";
+    url = "https://releases.llvm.org/${release_version}/${name}-${version}.src.tar.xz";
     inherit sha256;
   };
 
-- 
GitLab


From 9943cb0fa12fc72201da08fa689c5e345bd47530 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 19 Sep 2019 18:40:47 -0500
Subject: [PATCH 0602/2254] lldb_9: fix build, nixpkgs-fmt

---
 pkgs/development/compilers/llvm/9/lldb.nix | 45 +++++++++++++---------
 1 file changed, 27 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/compilers/llvm/9/lldb.nix b/pkgs/development/compilers/llvm/9/lldb.nix
index 915a422fd56..ee281384c40 100644
--- a/pkgs/development/compilers/llvm/9/lldb.nix
+++ b/pkgs/development/compilers/llvm/9/lldb.nix
@@ -12,6 +12,7 @@
 , python
 , version
 , darwin
+, lit
 }:
 
 stdenv.mkDerivation rec {
@@ -20,44 +21,52 @@ stdenv.mkDerivation rec {
 
   src = fetch pname "1507dl0xw03nppxpz2xsq4s30jdbkplx4w14za54ngqm3xm2yk0y";
 
-  postPatch = ''
-    # Fix up various paths that assume llvm and clang are installed in the same place
-    sed -i 's,".*ClangConfig.cmake","${clang-unwrapped}/lib/cmake/clang/ClangConfig.cmake",' \
-      cmake/modules/LLDBStandalone.cmake
-    sed -i 's,".*tools/clang/include","${clang-unwrapped}/include",' \
-      cmake/modules/LLDBStandalone.cmake
-    sed -i 's,"$.LLVM_LIBRARY_DIR.",${llvm}/lib ${clang-unwrapped}/lib,' \
-      cmake/modules/LLDBStandalone.cmake
-  '';
-
   patches = [ ./lldb-procfs.patch ];
 
-  nativeBuildInputs = [ cmake python which swig ];
-  buildInputs = [ ncurses zlib libedit libxml2 llvm ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ];
+  nativeBuildInputs = [ cmake python which swig lit ];
+  buildInputs = [
+    ncurses
+    zlib
+    libedit
+    libxml2
+    llvm
+  ]
+  ++ stdenv.lib.optionals stdenv.isDarwin [
+    darwin.libobjc
+    darwin.apple_sdk.libs.xpc
+    darwin.apple_sdk.frameworks.Foundation
+    darwin.bootstrap_cmds
+    darwin.apple_sdk.frameworks.Carbon
+    darwin.apple_sdk.frameworks.Cocoa
+  ];
 
   CXXFLAGS = "-fno-rtti";
   hardeningDisable = [ "format" ];
 
   cmakeFlags = [
     "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic
+    "-DClang_DIR=${clang-unwrapped}/lib/cmake"
+    "-DLLVM_EXTERNAL_LIT=${lit}/bin/lit"
   ];
 
   enableParallelBuilding = true;
 
   postInstall = ''
+    # man page
     mkdir -p $out/share/man/man1
-    cp ../docs/lldb.1 $out/share/man/man1/
+    install ../docs/lldb.1 -t $out/share/man/man1/
 
+    # Editor support
+    # vscode:
     install -D ../tools/lldb-vscode/package.json $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/package.json
-    mkdir $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin
+    mkdir -p $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin
     ln -s $out/bin/lldb-vscode $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin
   '';
 
   meta = with stdenv.lib; {
     description = "A next-generation high-performance debugger";
-    homepage    = http://llvm.org/;
-    license     = licenses.ncsa;
-    platforms   = platforms.all;
+    homepage = http://llvm.org/;
+    license = licenses.ncsa;
+    platforms = platforms.all;
   };
 }
-- 
GitLab


From 011dd72d6a792e1992e3b1166bee7e59b598b260 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 20 Sep 2019 05:28:52 +0000
Subject: [PATCH 0603/2254] =?UTF-8?q?ocamlPackages.mdx:=20disable=20tests?=
 =?UTF-8?q?=20for=20OCaml=20=E2=89=A5=204.08?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Don’t strip for OCaml 4.04
---
 pkgs/development/ocaml-modules/mdx/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/ocaml-modules/mdx/default.nix b/pkgs/development/ocaml-modules/mdx/default.nix
index 29fee1b6318..0b43cf461e0 100644
--- a/pkgs/development/ocaml-modules/mdx/default.nix
+++ b/pkgs/development/ocaml-modules/mdx/default.nix
@@ -1,11 +1,9 @@
-{ stdenv, fetchFromGitHub, buildDunePackage, astring, cmdliner, cppo, fmt, logs, ocaml-migrate-parsetree, ocaml_lwt, pandoc, re }:
+{ lib, fetchFromGitHub, buildDunePackage, ocaml, astring, cmdliner, cppo, fmt, logs, ocaml-migrate-parsetree, ocaml_lwt, pandoc, re }:
 
 buildDunePackage rec {
   pname = "mdx";
   version = "1.4.0";
 
-  minimumOCamlVersion = "4.05";
-
   src = fetchFromGitHub {
     owner = "realworldocaml";
     repo = pname;
@@ -15,14 +13,16 @@ buildDunePackage rec {
 
   nativeBuildInputs = [ cppo ];
   buildInputs = [ astring cmdliner fmt logs ocaml-migrate-parsetree re ];
-  checkInputs = [ ocaml_lwt pandoc ];
+  checkInputs = lib.optionals doCheck [ ocaml_lwt pandoc ];
+
+  doCheck = !lib.versionAtLeast ocaml.version "4.08";
 
-  doCheck = true;
+  dontStrip = lib.versions.majorMinor ocaml.version == "4.04";
 
   meta = {
     homepage = https://github.com/realworldocaml/mdx;
     description = "Executable OCaml code blocks inside markdown files";
-    license = stdenv.lib.licenses.isc;
-    maintainers = [ stdenv.lib.maintainers.romildo ];
+    license = lib.licenses.isc;
+    maintainers = [ lib.maintainers.romildo ];
   };
 }
-- 
GitLab


From 59a07abdb2ce466d37c745e3daa19649e35c2f86 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 20 Sep 2019 05:28:59 +0000
Subject: [PATCH 0604/2254] =?UTF-8?q?ocamlPackages.printbox:=20disable=20t?=
 =?UTF-8?q?ests=20for=20OCaml=20=E2=89=A5=204.08?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/ocaml-modules/printbox/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/ocaml-modules/printbox/default.nix b/pkgs/development/ocaml-modules/printbox/default.nix
index b4b733ed7d8..50866e1d969 100644
--- a/pkgs/development/ocaml-modules/printbox/default.nix
+++ b/pkgs/development/ocaml-modules/printbox/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildDunePackage, mdx }:
+{ lib, fetchFromGitHub, buildDunePackage, ocaml, mdx }:
 
 buildDunePackage rec {
   pname = "printbox";
@@ -13,14 +13,14 @@ buildDunePackage rec {
     sha256 = "16nwwpp13hzlcm9xqfxc558afm3i5s802dkj69l9s2vp04lgms5n";
   };
 
-  checkInputs = [ mdx ];
+  checkInputs = lib.optional doCheck mdx;
 
-  doCheck = true;
+  doCheck = !lib.versionAtLeast ocaml.version "4.08";
 
   meta = {
     homepage = https://github.com/c-cube/printbox/;
     description = "Allows to print nested boxes, lists, arrays, tables in several formats";
-    license = stdenv.lib.licenses.isc;
-    maintainers = [ stdenv.lib.maintainers.romildo ];
+    license = lib.licenses.isc;
+    maintainers = [ lib.maintainers.romildo ];
   };
 }
-- 
GitLab


From 424c20414a310fbefa0c32fe5341bc38aa4134d2 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 20 Sep 2019 05:29:05 +0000
Subject: [PATCH 0605/2254] =?UTF-8?q?ocamlPackages.containers:=201.4=20?=
 =?UTF-8?q?=E2=86=92=202.6.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

ocamlPackages.sequence/iter: 1.1 → 1.2.1

Ensures compatibility with OCaml 4.08
---
 .../ocaml-modules/containers/default.nix      | 54 +++++--------------
 .../{sequence => iter}/default.nix            | 16 +++---
 pkgs/top-level/ocaml-packages.nix             |  4 +-
 3 files changed, 22 insertions(+), 52 deletions(-)
 rename pkgs/development/ocaml-modules/{sequence => iter}/default.nix (65%)

diff --git a/pkgs/development/ocaml-modules/containers/default.nix b/pkgs/development/ocaml-modules/containers/default.nix
index 98fd7fc46cf..1b465c2984e 100644
--- a/pkgs/development/ocaml-modules/containers/default.nix
+++ b/pkgs/development/ocaml-modules/containers/default.nix
@@ -1,53 +1,26 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, cppo, gen, sequence, qtest, ounit, result
-, qcheck }:
+{ lib, fetchFromGitHub, buildDunePackage, ocaml
+, iter, result, uchar
+, gen, mdx, ounit, qcheck, uutf
+}:
 
-let
-
-  mkpath = p:
-      "${p}/lib/ocaml/${ocaml.version}/site-lib";
-
-  version = "1.4";
-
-in
-
-stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-containers-${version}";
+buildDunePackage rec {
+  version = "2.6.1";
+  pname = "containers";
 
   src = fetchFromGitHub {
     owner = "c-cube";
     repo = "ocaml-containers";
     rev = version;
-    sha256 = "1wbarxphdrxvy7qsdp4p837h1zrv0z83pgs5lbz2h3kdnyvz2f1i";
+    sha256 = "02iq01pq6047hab5s8zpprwr21cygvzfcfj2lpsyj823f28crhmv";
   };
 
-  buildInputs = [ ocaml findlib ocamlbuild cppo gen sequence qtest ounit qcheck ];
-
-  propagatedBuildInputs = [ result ];
-
-  preConfigure = ''
-    # The following is done so that the '#use "topfind"' directive works in the ocaml top-level
-    export HOME="$(mktemp -d)"
-    export OCAML_TOPLEVEL_PATH="${mkpath findlib}"
-    cat <<EOF > $HOME/.ocamlinit
-let () =
-  try Topdirs.dir_directory (Sys.getenv "OCAML_TOPLEVEL_PATH")
-  with Not_found -> ()
-;;
-EOF
-  '';
+  buildInputs = [ iter ];
 
-  configureFlags = [
-    "--enable-unix"
-    "--enable-thread"
-    "--enable-tests"
-    "--enable-docs"
-    "--disable-bench"
-  ];
+  checkInputs = lib.optionals doCheck [ gen mdx ounit qcheck uutf ];
 
-  doCheck = true;
-  checkTarget = "test";
+  propagatedBuildInputs = [ result uchar ];
 
-  createFindlibDestdir = true;
+  doCheck = !lib.versionAtLeast ocaml.version "4.08";
 
   meta = {
     homepage = https://github.com/c-cube/ocaml-containers;
@@ -62,7 +35,6 @@ EOF
       It also features optional libraries for dealing with strings, and
       helpers for unix and threads.
     '';
-    license = stdenv.lib.licenses.bsd2;
-    platforms = ocaml.meta.platforms or [];
+    license = lib.licenses.bsd2;
   };
 }
diff --git a/pkgs/development/ocaml-modules/sequence/default.nix b/pkgs/development/ocaml-modules/iter/default.nix
similarity index 65%
rename from pkgs/development/ocaml-modules/sequence/default.nix
rename to pkgs/development/ocaml-modules/iter/default.nix
index e5ead36d1c1..eb2ca1409ab 100644
--- a/pkgs/development/ocaml-modules/sequence/default.nix
+++ b/pkgs/development/ocaml-modules/iter/default.nix
@@ -1,22 +1,20 @@
-{ stdenv, fetchFromGitHub, buildDunePackage, qtest, result }:
+{ lib, fetchFromGitHub, buildDunePackage, ocaml, mdx, qtest, result }:
 
 buildDunePackage rec {
-  pname = "sequence";
-  version = "1.1";
-
-  minimumOCamlVersion = "4.02";
+  pname = "iter";
+  version = "1.2.1";
 
   src = fetchFromGitHub {
     owner = "c-cube";
     repo = pname;
     rev = version;
-    sha256 = "08j37nldw47syq3yw4mzhhvya43knl0d7biddp0q9hwbaxhzgi44";
+    sha256 = "0j2sg50byn0ppmf6l36ksip7zx1d3gv7sc4hbbxs2rmx39jr7vxh";
   };
 
-  buildInputs = [ qtest ];
+  buildInputs = lib.optionals doCheck [ mdx qtest ];
   propagatedBuildInputs = [ result ];
 
-  doCheck = true;
+  doCheck = lib.versionAtLeast ocaml.version "4.04";
 
   meta = {
     homepage = https://github.com/c-cube/sequence;
@@ -27,6 +25,6 @@ buildDunePackage rec {
       like `filter`, `map`, `take`, `drop` and `append` can be performed before the
       sequence is iterated/folded on.
     '';
-    license = stdenv.lib.licenses.bsd2;
+    license = lib.licenses.bsd2;
   };
 }
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 728f6f7712d..66e92f47d11 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -304,6 +304,8 @@ let
 
     iso8601 = callPackage ../development/ocaml-modules/iso8601 { };
 
+    iter = callPackage ../development/ocaml-modules/iter { };
+
     javalib = callPackage ../development/ocaml-modules/javalib {
       extlib = ocaml_extlib;
     };
@@ -621,8 +623,6 @@ let
 
     seq = callPackage ../development/ocaml-modules/seq { };
 
-    sequence = callPackage ../development/ocaml-modules/sequence { };
-
     spacetime_lib = callPackage ../development/ocaml-modules/spacetime_lib { };
 
     sqlexpr = callPackage ../development/ocaml-modules/sqlexpr { };
-- 
GitLab


From fac7453117bfbe56c0b3ea96a558505844caa27a Mon Sep 17 00:00:00 2001
From: Vasiliy Yorkin <vasiliy.yorkin@gmail.com>
Date: Fri, 20 Sep 2019 08:53:30 +0300
Subject: [PATCH 0606/2254] ocamlPackages.ocaml-protoc: init at 1.2.0 (#68962)

---
 .../ocaml-modules/ocaml-protoc/default.nix    | 38 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 +
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/ocaml-protoc/default.nix

diff --git a/pkgs/development/ocaml-modules/ocaml-protoc/default.nix b/pkgs/development/ocaml-modules/ocaml-protoc/default.nix
new file mode 100644
index 00000000000..1ef7b6c2d40
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ocaml-protoc/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, ocaml, fetchFromGitHub, ocamlbuild, findlib, ppx_deriving_protobuf }:
+
+stdenv.mkDerivation rec {
+  name = "ocaml${ocaml.version}-ocaml-protoc-${version}";
+  version = "1.2.0";
+
+  minimumOCamlVersion = "4.02";
+
+  src = fetchFromGitHub {
+    owner = "mransan";
+    repo = "ocaml-protoc";
+    rev = "60d2d4dd55f73830e1bed603cc44d3420430632c";
+    sha256 = "1d1p8ch723z2qa9azmmnhbcpwxbpzk3imh1cgkjjq4p5jwzj8amj";
+  };
+
+  installPhase = ''
+    mkdir -p tmp/bin
+    export PREFIX=`pwd`/tmp
+    make all.install.build
+    make check_install
+    make lib.install
+    make bin.install
+  '';
+
+  buildInputs = [ ocaml findlib ocamlbuild ];
+  propagatedBuildInputs = [ ppx_deriving_protobuf ];
+
+  createFindlibDestdir = true;
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/mransan/ocaml-protoc";
+    description = "A Protobuf Compiler for OCaml";
+    license = licenses.mit;
+    maintainers = [ maintainers.vyorkin ];
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 728f6f7712d..087adee735a 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -664,6 +664,8 @@ let
       then sexplib_108_08_00
       else null;
 
+    ocaml-protoc = callPackage ../development/ocaml-modules/ocaml-protoc { };
+
     ocaml_extlib = callPackage ../development/ocaml-modules/extlib { };
 
     ocb-stubblr = callPackage ../development/ocaml-modules/ocb-stubblr { };
-- 
GitLab


From d69bc56e693f1189ef6f05fa7e40140e8ff1bb95 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Fri, 20 Sep 2019 07:51:19 +0200
Subject: [PATCH 0607/2254] ip2unix: 2.1.0 -> 2.1.1

This is just a small bugfix release (essentially adds two lines of code)
which fixes a segfault if using with a program that doesn't pass a
sockaddr buffer to accept() or accept4().

Signed-off-by: aszlig <aszlig@nix.build>
---
 pkgs/tools/networking/ip2unix/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/ip2unix/default.nix b/pkgs/tools/networking/ip2unix/default.nix
index ab09399cd8e..d2dbd235e11 100644
--- a/pkgs/tools/networking/ip2unix/default.nix
+++ b/pkgs/tools/networking/ip2unix/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ip2unix";
-  version = "2.1.0";
+  version = "2.1.1";
 
   src = fetchFromGitHub {
     owner = "nixcloud";
     repo = "ip2unix";
     rev = "v${version}";
-    sha256 = "1hbc7csicgza1w43aq1q189w8gzwkc2v5mxpnhaiwggwsa5vvkl0";
+    sha256 = "121ygj50i7ja9bv76y51qsjbjmmydhpi0sd3xb6pysmlzv0bxn17";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From 0cf81af50c25d4aac9d839e3f0d63854a382153c Mon Sep 17 00:00:00 2001
From: Vasiliy Yorkin <vasiliy.yorkin@gmail.com>
Date: Wed, 18 Sep 2019 09:42:41 +0300
Subject: [PATCH 0608/2254] ocamlPackages.ppx_deriving_rpc: init at 5.9.0

---
 .../ocaml-modules/ppx_deriving_rpc/default.nix | 18 ++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix              |  2 ++
 2 files changed, 20 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix

diff --git a/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix
new file mode 100644
index 00000000000..7746200d4ff
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix
@@ -0,0 +1,18 @@
+{ lib, buildDunePackage, rpclib, ppxfind, ppx_deriving, cppo }:
+
+buildDunePackage rec {
+  pname = "ppx_deriving_rpc";
+
+  inherit (rpclib) version src;
+
+  buildInputs = [ ppxfind cppo ];
+
+  propagatedBuildInputs = [ rpclib ppx_deriving ];
+
+  meta = with lib; {
+    homepage = "https://github.com/mirage/ocaml-rpc";
+    description = "Ppx deriver for ocaml-rpc";
+    license = licenses.isc;
+    maintainers = [ maintainers.vyorkin ];
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 087adee735a..ba3f37cd428 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -698,6 +698,8 @@ let
 
     ppx_deriving_protobuf = callPackage ../development/ocaml-modules/ppx_deriving_protobuf {};
 
+    ppx_deriving_rpc = callPackage ../development/ocaml-modules/ppx_deriving_rpc {};
+
     ppx_deriving_yojson = callPackage ../development/ocaml-modules/ppx_deriving_yojson {};
 
     ppx_gen_rec = callPackage ../development/ocaml-modules/ppx_gen_rec {};
-- 
GitLab


From 5af0d0b5da476e37630532f5122cc81e7e40e5f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Mon, 16 Sep 2019 16:59:44 +0200
Subject: [PATCH 0609/2254] kicad: fix build

Fix configure time error:
  ...
  ImportError: No module named wx
  CMake Error at CMakeModules/FindwxPython.cmake:52 (message):
    wxPython/Phoenix does not appear to be installed on the system

Only build tested.

Fixes: f7e28bf5d818 ("Split buildPythonPackage into setup hooks")
---
 pkgs/applications/science/electronics/kicad/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix
index 3d169f50104..f31dd0daa5c 100644
--- a/pkgs/applications/science/electronics/kicad/default.nix
+++ b/pkgs/applications/science/electronics/kicad/default.nix
@@ -65,7 +65,7 @@ in stdenv.mkDerivation rec {
   buildInputs = [
     libGLU_combined zlib libX11 wxGTK pcre libXdmcp glew glm libpthreadstubs
     cairo curl openssl boost
-    swig python
+    swig (python.withPackages (ps: with ps; [ wxPython ]))
   ] ++ optional (oceSupport) opencascade
     ++ optional (ngspiceSupport) libngspice;
 
-- 
GitLab


From c4f5faa2c061ab30e1d636949781ea077367326e Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 20 Sep 2019 10:40:22 +0300
Subject: [PATCH 0610/2254] imapfilter: 2.6.12 -> 2.6.13

---
 pkgs/applications/networking/mailreaders/imapfilter.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/imapfilter.nix b/pkgs/applications/networking/mailreaders/imapfilter.nix
index 78b1aad03fb..7d7972c3e58 100644
--- a/pkgs/applications/networking/mailreaders/imapfilter.nix
+++ b/pkgs/applications/networking/mailreaders/imapfilter.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "imapfilter";
-  version = "2.6.12";
+  version = "2.6.13";
 
   src = fetchFromGitHub {
     owner = "lefcha";
     repo = "imapfilter";
     rev = "v${version}";
-    sha256 = "0vzpc54fjf5vb5vx5w0fl20xvx1k9cg6a3hbl86mm8kwsqf3wrab";
+    sha256 = "02997rnnvid3rfkxmlgjpbspi4svdmq8r8wd2zvf25iadim3hxqi";
   };
 
   makeFlagsArray = "PREFIX=$(out)";
-- 
GitLab


From a7f002ac41dd4127e811df8bc4edfbb034aa2861 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 20 Sep 2019 10:04:18 +0200
Subject: [PATCH 0611/2254] httpie: use python3 by default

This package is intended to be used as application and supports
python3[1] (and is about to deprecated python2.7 support[2]),
so there's no reason to not use it in 2019.

[1] https://github.com/jakubroztocil/httpie/tree/1.0.3#python-version
[2] https://github.com/jakubroztocil/httpie/commit/b3d2c1876e23e7de7afe588e4f64160d17201b45
---
 pkgs/tools/networking/httpie/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/httpie/default.nix b/pkgs/tools/networking/httpie/default.nix
index 09a9ade75ce..cf3c173e1b2 100644
--- a/pkgs/tools/networking/httpie/default.nix
+++ b/pkgs/tools/networking/httpie/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchurl, pythonPackages }:
+{ stdenv, fetchurl, python3Packages }:
 
-pythonPackages.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "httpie";
   version = "1.0.3";
 
-  src = pythonPackages.fetchPypi {
+  src = python3Packages.fetchPypi {
     inherit pname version;
     sha256 = "103fcigpxf4nqmrdqjnyz7d9n4n16906slwmmqqc0gkxv8hnw6vd";
   };
 
-  propagatedBuildInputs = with pythonPackages; [ pygments requests setuptools ];
+  propagatedBuildInputs = with python3Packages; [ pygments requests setuptools ];
 
   doCheck = false;
 
-- 
GitLab


From a203ba2bf104697e9489d77791d3b3a5105efb81 Mon Sep 17 00:00:00 2001
From: Jan Hrnko <jan.hrnko@satoshilabs.com>
Date: Fri, 20 Sep 2019 10:34:00 +0200
Subject: [PATCH 0612/2254] prometheus-apcupsd-exporter: init at
 unstable-2019-03-14

---
 .../prometheus/apcupsd-exporter.nix           | 27 ++++++
 .../prometheus/apcupsd-exporter_deps.nix      | 93 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 3 files changed, 121 insertions(+)
 create mode 100644 pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix
 create mode 100644 pkgs/servers/monitoring/prometheus/apcupsd-exporter_deps.nix

diff --git a/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix b/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix
new file mode 100644
index 00000000000..c1d7f792830
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix
@@ -0,0 +1,27 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  pname = "apcupsd-exporter";
+  version = "unstable-2019-03-14";
+
+  goPackagePath = "github.com/mdlayher/apcupsd_exporter";
+
+  goDeps = ./apcupsd-exporter_deps.nix;
+
+  src = fetchFromGitHub {
+    owner = "mdlayher";
+    repo = "apcupsd_exporter";
+    rev = "cbd49be";
+    sha256 = "1h5z295m9bddch5bc8fppn02b31h370yns6026a1d4ygfy3w46y0";
+  };
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    description = "Provides a Prometheus exporter for the apcupsd Network Information Server (NIS)";
+    homepage = "https://github.com/mdlayher/apcupsd_exporter";
+    license = licenses.mit;
+    maintainers = with maintainers; [ maintainers."1000101" ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/servers/monitoring/prometheus/apcupsd-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/apcupsd-exporter_deps.nix
new file mode 100644
index 00000000000..3950ae89bf2
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/apcupsd-exporter_deps.nix
@@ -0,0 +1,93 @@
+# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
+[
+  {
+    goPackagePath = "github.com/beorn7/perks";
+    fetch = {
+      type = "git";
+      url = "https://github.com/beorn7/perks";
+      rev = "3a771d992973";
+      sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3";
+    };
+  }
+  {
+    goPackagePath = "github.com/golang/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/protobuf";
+      rev = "v1.2.0";
+      sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab";
+    };
+  }
+  {
+    goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
+    fetch = {
+      type = "git";
+      url = "https://github.com/matttproud/golang_protobuf_extensions";
+      rev = "v1.0.1";
+      sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya";
+    };
+  }
+  {
+    goPackagePath = "github.com/mdlayher/apcupsd";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mdlayher/apcupsd";
+      rev = "eb3dd99a75fe";
+      sha256 = "0s1m6l4pnazqiymb8y89ajbxfl2cn0ahvhws10nvxvc4jjivlbbq";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/client_golang";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/client_golang";
+      rev = "v0.9.2";
+      sha256 = "02b4yg6rfag0m3j0i39sillcm5xczwv8h133vn12yr8qw04cnigs";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/client_model";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/client_model";
+      rev = "5c3871d89910";
+      sha256 = "04psf81l9fjcwascsys428v03fx4fi894h7fhrj2vvcz723q57k0";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/common";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/common";
+      rev = "4724e9255275";
+      sha256 = "0pcx8hlnrxx5nnmpk786cn99rsgqk1jrd3c9f6fsx8qd8y5iwjy6";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/procfs";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/procfs";
+      rev = "1dc9a6cbc91a";
+      sha256 = "1zlv1x30xp7z5c3vn5vp870v4bjim0zcidzc3mr2l3xhazc0svab";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/net";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/net";
+      rev = "351d144fa1fc";
+      sha256 = "1c5x25qjyz83y92bq0lll5kmznyi3m02wd4c54scgf0866gy938k";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/sync";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sync";
+      rev = "42b317875d0f";
+      sha256 = "0mrjhk7al7yyh76x9flvxy4jm5jyqh2fxbxagpaazxn1xdgkaif3";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9addf12a7e7..dc846d45762 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15003,6 +15003,7 @@ in
   prom2json = callPackage ../servers/monitoring/prometheus/prom2json.nix { };
   prometheus = callPackage ../servers/monitoring/prometheus { };
   prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager.nix { };
+  prometheus-apcupsd-exporter = callPackage ../servers/monitoring/prometheus/apcupsd-exporter.nix { };
   prometheus-aws-s3-exporter = callPackage ../servers/monitoring/prometheus/aws-s3-exporter.nix { };
   prometheus-bind-exporter = callPackage ../servers/monitoring/prometheus/bind-exporter.nix { };
   prometheus-blackbox-exporter = callPackage ../servers/monitoring/prometheus/blackbox-exporter.nix { };
-- 
GitLab


From ce6145dedcee72d9c918ca5c6e0b216c191793d2 Mon Sep 17 00:00:00 2001
From: Ruud van Asseldonk <dev@veniogames.com>
Date: Fri, 20 Sep 2019 11:03:18 +0200
Subject: [PATCH 0613/2254] python37Packages.sentry-sdk: Fix tests

The tests depend on many third-party libraries, presumably because
Sentry offers integration for each of them. I added these as build
inputs but not propagated build inputs, because they are only needed for
the tests.
---
 pkgs/development/python-modules/sentry-sdk/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix
index 503b899ec22..1e24f953d34 100644
--- a/pkgs/development/python-modules/sentry-sdk/default.nix
+++ b/pkgs/development/python-modules/sentry-sdk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, urllib3, certifi }:
+{ stdenv, buildPythonPackage, fetchPypi, urllib3, certifi, django, flask, tornado, sanic, aiohttp, bottle, rq, falcon, pyramid, celery }:
 
 buildPythonPackage rec {
   pname = "sentry-sdk";
@@ -9,6 +9,8 @@ buildPythonPackage rec {
     sha256 = "f5819df450d7b0696be69a0c6d70a09e4890a3844ee8ccb7a461794135bd5965";
   };
 
+  buildInputs = [ django flask tornado sanic aiohttp bottle rq falcon pyramid celery ];
+
   propagatedBuildInputs = [ urllib3 certifi ];
 
   meta = with stdenv.lib; {
-- 
GitLab


From 550d67cc0b379ddfb148052e51537b2b2e4d0b36 Mon Sep 17 00:00:00 2001
From: Nathan van Doorn <nathan@myrtlesoftware.com>
Date: Fri, 20 Sep 2019 10:17:53 +0100
Subject: [PATCH 0614/2254] kexi: patch error due to Qt 5.13

---
 pkgs/applications/office/kexi/default.nix | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/office/kexi/default.nix b/pkgs/applications/office/kexi/default.nix
index adad5c8680f..83515de4990 100644
--- a/pkgs/applications/office/kexi/default.nix
+++ b/pkgs/applications/office/kexi/default.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation, lib, fetchurl, extra-cmake-modules, kdoctools,
+  mkDerivation, lib, fetchurl, fetchpatch, extra-cmake-modules, kdoctools,
   boost, qttools, qtwebkit,
   breeze-icons, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets, kcoreaddons,
   kcrash, kguiaddons, ki18n, kiconthemes, kitemviews, kio, ktexteditor, ktextwidgets,
@@ -28,6 +28,17 @@ mkDerivation rec {
 
   propagatedUserEnvPkgs = [ kproperty ];
 
+  patches = [
+    # Changes in Qt 5.13 mean that QDate isn't exported from certain places,
+    # which the build was relying on. This patch explicitly imports QDate where
+    # needed.
+    # Should be unnecessary with kexi >= 3.3
+    (fetchpatch {
+      url = "https://cgit.kde.org/kexi.git/patch/src/plugins/forms/widgets/kexidbdatepicker.cpp?id=511d99b7745a6ce87a208bdbf69e631f1f136d53";
+      sha256 = "0m5cwq2v46gb1b12p7acck6dadvn7sw4xf8lkqikj9hvzq3r1dnj";
+    })
+  ];
+
   meta = with lib; {
     description = "A open source visual database applications creator, a long-awaited competitor for programs like MS Access or Filemaker";
     longDescription = ''
-- 
GitLab


From 33821c59bb34694745fdbfc25e6f181f0c01e703 Mon Sep 17 00:00:00 2001
From: Uri Baghin <uri@canva.com>
Date: Fri, 20 Sep 2019 19:58:20 +1000
Subject: [PATCH 0615/2254] pythonPackages.typed-ast: 1.3.5 -> 1.4.0

---
 .../development/python-modules/typed-ast/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/typed-ast/default.nix b/pkgs/development/python-modules/typed-ast/default.nix
index f540cf72877..0514be0fb4d 100644
--- a/pkgs/development/python-modules/typed-ast/default.nix
+++ b/pkgs/development/python-modules/typed-ast/default.nix
@@ -1,10 +1,12 @@
-{ buildPythonPackage, fetchPypi, lib, pythonOlder }:
+{ buildPythonPackage, fetchFromGitHub, lib, pythonOlder }:
 buildPythonPackage rec {
   pname = "typed-ast";
-  version = "1.3.5";
-  src = fetchPypi{
-    inherit pname version;
-    sha256 = "1m7pr6qpana3cvqwiw7mlvrgvmw27ch5mx1592572xhlki8g85ak";
+  version = "1.4.0";
+  src = fetchFromGitHub{
+    owner = "python";
+    repo = "typed_ast";
+    rev = version;
+    sha256 = "0l0hz809f7i356kmqkvfsaswiidb98j9hs9rrjnfawzqcbffzgyb";
   };
   # Only works with Python 3.3 and newer;
   disabled = pythonOlder "3.3";
-- 
GitLab


From 2b36da89917e4e313a6c5099b8f244e2b6f910db Mon Sep 17 00:00:00 2001
From: Uri Baghin <uri@canva.com>
Date: Fri, 20 Sep 2019 19:57:44 +1000
Subject: [PATCH 0616/2254] pythonPackages.mypy: 0.701 -> 0.711

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

diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix
index c5ca8e1f4b5..d4361baf903 100644
--- a/pkgs/development/python-modules/mypy/default.nix
+++ b/pkgs/development/python-modules/mypy/default.nix
@@ -3,14 +3,14 @@
 
 buildPythonPackage rec {
   pname = "mypy";
-  version = "0.701";
+  version = "0.711";
 
   # Tests not included in pip package.
   doCheck = false;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "05479r3gbq17r22hyhxjg49smx5q864pgx8ayy23rsdj4w6z2r2p";
+    sha256 = "0s1kwi1dhrv55v0c9w7c1g6mq5d2dpw7x1jj5mcnniw77mclmvdv";
   };
 
   disabled = !isPy3k;
-- 
GitLab


From eef06df7f5285c551521907c70126aa8a92de982 Mon Sep 17 00:00:00 2001
From: Pierre Bourdon <delroth@gmail.com>
Date: Fri, 20 Sep 2019 12:10:43 +0200
Subject: [PATCH 0617/2254] mcomix: add missing setuptools dependency

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

diff --git a/pkgs/applications/graphics/mcomix/default.nix b/pkgs/applications/graphics/mcomix/default.nix
index 7ae5286f762..7130d21b8ef 100644
--- a/pkgs/applications/graphics/mcomix/default.nix
+++ b/pkgs/applications/graphics/mcomix/default.nix
@@ -9,7 +9,7 @@ python27Packages.buildPythonApplication rec {
       sha256 = "0fzsf9pklhfs1rzwzj64c0v30b74nk94p93h371rpg45qnfiahvy";
     };
 
-    propagatedBuildInputs = with python27Packages; [ pygtk pillow ];
+    propagatedBuildInputs = with python27Packages; [ pygtk pillow setuptools ];
 
     doCheck = false;
 
-- 
GitLab


From dd5eb4dbc2d34f8ef2e4c85286e43bcd7cc003f9 Mon Sep 17 00:00:00 2001
From: Pierre Bourdon <delroth@gmail.com>
Date: Fri, 20 Sep 2019 13:28:34 +0200
Subject: [PATCH 0618/2254] libgdiplus: split package to reduce dependencies
 closure size

nix path-info -rSh on mono:

Before: /nix/store/p7zix8ypkqdwz86jvirzn0hmqhkbfhf7-mono-5.20.1.27                 1.2G
After:  /nix/store/zwg8d5m2d7hbi1ylh6rq00wyghyyzpsp-mono-5.20.1.27               881.3M

Mostly due to not dragging in cairo-dev, mesa-dev, etc.
---
 pkgs/development/libraries/libgdiplus/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix
index 9ba3cdbd09a..558da91fcbf 100644
--- a/pkgs/development/libraries/libgdiplus/default.nix
+++ b/pkgs/development/libraries/libgdiplus/default.nix
@@ -29,6 +29,8 @@ stdenv.mkDerivation {
     })
   ];
 
+  outputs = [ "out" "dev" ];
+
   hardeningDisable = [ "format" ];
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
-- 
GitLab


From fe740624a7752d814f9569f6b178c4de13c8b66b Mon Sep 17 00:00:00 2001
From: Jos van Bakel <jos@codeaddict.org>
Date: Sat, 14 Sep 2019 18:21:56 +0200
Subject: [PATCH 0619/2254] osmid: init at 0.6.8

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

diff --git a/pkgs/applications/audio/osmid/default.nix b/pkgs/applications/audio/osmid/default.nix
new file mode 100644
index 00000000000..7e49b872a6a
--- /dev/null
+++ b/pkgs/applications/audio/osmid/default.nix
@@ -0,0 +1,37 @@
+{ stdenv
+, fetchFromGitHub
+, cmake
+, alsaLib
+, libX11
+}:
+
+stdenv.mkDerivation rec {
+  pname = "osmid";
+  version = "0.6.8";
+
+  src = fetchFromGitHub {
+    owner = "llloret";
+    repo = "osmid";
+    rev = "v${version}";
+    sha256 = "1yl25abf343yvd49nfsgxsz7jf956zrsi5n4xyqb5ldlp2hifk15";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  buildInputs = [ alsaLib libX11 ];
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/bin
+    cp {m2o,o2m} $out/bin/
+    runHook postInstall
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/llloret/osmid";
+    description = "A lightweight, portable, easy to use tool to convert MIDI to OSC and OSC to MIDI";
+    license = licenses.mit;
+    maintainers = with maintainers; [ c0deaddict ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 45a36c274c6..766713369c7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12949,6 +12949,8 @@ in
 
   osm-gps-map = callPackage ../development/libraries/osm-gps-map { };
 
+  osmid = callPackage ../applications/audio/osmid {};
+
   osinfo-db = callPackage ../data/misc/osinfo-db { };
   osinfo-db-tools = callPackage ../tools/misc/osinfo-db-tools { };
 
-- 
GitLab


From 21c92c4a1d6031121b2cf705d14230ca0feb4c23 Mon Sep 17 00:00:00 2001
From: Pierre Bourdon <delroth@gmail.com>
Date: Fri, 20 Sep 2019 13:43:51 +0200
Subject: [PATCH 0620/2254] mono-zeroconf: remove broken package

No dependencies within nixpkgs, and the package has not built
successfully since 2018-04-29 according to Hydra[1].

[1] https://hydra.nixos.org/build/100604053
---
 .../libraries/mono-zeroconf/default.nix       | 25 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 --
 3 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 pkgs/development/libraries/mono-zeroconf/default.nix

diff --git a/pkgs/development/libraries/mono-zeroconf/default.nix b/pkgs/development/libraries/mono-zeroconf/default.nix
deleted file mode 100644
index 89db7344f99..00000000000
--- a/pkgs/development/libraries/mono-zeroconf/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchurl, which, pkgconfig, mono }:
-
-stdenv.mkDerivation rec {
-  pname = "mono-zeroconf";
-  version = "0.9.0";
-
-  src = fetchurl {
-    url = "http://download.banshee-project.org/mono-zeroconf/mono-zeroconf-${version}.tar.bz2";
-    sha256 = "1qfp4qvsx7rc2shj1chi2y7fxn10rwi70rw2y54b2i8a4jq7gpkb";
-  };
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ which mono ];
-
-  dontStrip = true;
-
-  configureFlags = [ "--disable-docs" ];
-
-  meta = with stdenv.lib; {
-    description = "A cross platform Zero Configuration Networking library for Mono and .NET";
-    homepage = https://www.mono-project.com/archived/monozeroconf/;
-    platforms = platforms.linux;
-    license = licenses.mit;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 36b6efe191d..a837336740b 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -217,6 +217,7 @@ mapAliases ({
   mlt-qt5 = libsForQt5.mlt;  # added 2015-12-19
   mobile_broadband_provider_info = mobile-broadband-provider-info; # added 2018-02-25
   module_init_tools = kmod; # added 2016-04-22
+  mono-zeroconf = throw "deprecated 2019-09-20: abandoned by upstream.";
   mpich2 = mpich;  # added 2018-08-06
   msf = metasploit; # added 2018-04-25
   libmsgpack = msgpack; # added 2018-08-17
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dc846d45762..490d52ed8e9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12691,8 +12691,6 @@ in
 
   mono-addins = callPackage ../development/libraries/mono-addins { };
 
-  mono-zeroconf = callPackage ../development/libraries/mono-zeroconf { };
-
   movit = callPackage ../development/libraries/movit { };
 
   mosquitto = callPackage ../servers/mqtt/mosquitto { };
-- 
GitLab


From b22d36f7683cc318879864f982568d722c80935e Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 20 Sep 2019 10:55:57 +0300
Subject: [PATCH 0621/2254] onedrive: init at 2.3.9

---
 .../networking/sync/onedrive/default.nix      | 35 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/applications/networking/sync/onedrive/default.nix

diff --git a/pkgs/applications/networking/sync/onedrive/default.nix b/pkgs/applications/networking/sync/onedrive/default.nix
new file mode 100644
index 00000000000..ceaddeb3d44
--- /dev/null
+++ b/pkgs/applications/networking/sync/onedrive/default.nix
@@ -0,0 +1,35 @@
+{ stdenv
+, fetchFromGitHub
+, dmd
+, pkgconfig
+, curl
+, sqlite
+}:
+
+stdenv.mkDerivation rec {
+  pname = "onedrive";
+  version = "2.3.9";
+
+  src = fetchFromGitHub {
+    owner = "abraunegg";
+    repo = "onedrive";
+    rev = "v${version}";
+    sha256 = "0fg2zzhhd1wl8z416px432xynx6whnzdamzdckc8rmm1cvghgb0f";
+  };
+
+  nativeBuildInputs = [
+    dmd
+    pkgconfig
+  ];
+  buildInputs = [
+    curl
+    sqlite
+  ];
+  meta = with stdenv.lib; {
+    description = "A complete tool to interact with OneDrive on Linux";
+    homepage = "https://github.com/abraunegg/onedrive";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ doronbehar ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9addf12a7e7..d26aa107070 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12846,6 +12846,8 @@ in
 
   one_gadget = callPackage ../development/tools/misc/one_gadget { };
 
+  onedrive = callPackage ../applications/networking/sync/onedrive { };
+
   oneko = callPackage ../applications/misc/oneko { };
 
   oniguruma = callPackage ../development/libraries/oniguruma { };
-- 
GitLab


From dc5085e6b06b5b05f66b8ebc8bfb7f308ccf5258 Mon Sep 17 00:00:00 2001
From: Pierre Bourdon <delroth@gmail.com>
Date: Fri, 20 Sep 2019 15:25:27 +0200
Subject: [PATCH 0622/2254] mono: remove dontStrip from derivation

This was introduced in 2010 in 9e16b812 and as far as I can tell the
issue mentioned in the comment does not exist anymore. In a stripped
mono build, I was able to:

- Run "mcs --version" without trouble (original test case)
- Run "keepass" (mono app)
- Build packages that depend on mono (e.g. f# and others).

$ nix path-info -sh
Before: 537.8M
After:  304.3M

$ nix path-info -Sh
Before: 1.2G
After:  867.0M

(Transitive closure size decreases more than the package size itself
because mono ended up depending on gcc through leaked paths in .so files
before.)
---
 pkgs/development/compilers/mono/generic.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix
index 9a2f01b9f3d..e0cfe247b23 100644
--- a/pkgs/development/compilers/mono/generic.nix
+++ b/pkgs/development/compilers/mono/generic.nix
@@ -42,10 +42,6 @@ stdenv.mkDerivation rec {
     ./autogen.sh --prefix $out $configureFlags
   '';
 
-  # Attempt to fix this error when running "mcs --version":
-  # The file /nix/store/xxx-mono-2.4.2.1/lib/mscorlib.dll is an invalid CIL image
-  dontStrip = true;
-
   # We want pkg-config to take priority over the dlls in the Mono framework and the GAC
   # because we control pkg-config
   patches = [ ./pkgconfig-before-gac.patch ];
-- 
GitLab


From 22d77d950dc7b655cfd74907b2452dd623bb64d9 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 20 Sep 2019 08:30:00 -0500
Subject: [PATCH 0623/2254] pgformatter: 4.0 -> 4.1

Changelog: https://github.com/darold/pgFormatter/releases/tag/v4.1
---
 pkgs/development/tools/pgformatter/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/pgformatter/default.nix b/pkgs/development/tools/pgformatter/default.nix
index 5d8376acdb3..dfdd453cb4e 100644
--- a/pkgs/development/tools/pgformatter/default.nix
+++ b/pkgs/development/tools/pgformatter/default.nix
@@ -2,13 +2,13 @@
 
 perlPackages.buildPerlPackage rec {
   pname = "pgformatter";
-  version = "4.0";
+  version = "4.1";
 
   src = fetchFromGitHub {
     owner = "darold";
     repo = "pgFormatter";
     rev = "v${version}";
-    sha256 = "09p242s406mf469p66zp1jmp9pxcim2vk1v6qsxnrbzicchsn5i2";
+    sha256 = "1xp26p70zn7mh4qg4w74a690ww43b1csgl92ak9fg8kidgwcbprd";
   };
 
   outputs = [ "out" ];
-- 
GitLab


From 861840baf63be3294220b5557aba49eb43e6f800 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 20 Sep 2019 09:48:17 -0400
Subject: [PATCH 0624/2254] oh-my-zsh: 2019-09-13 -> 2019-09-20

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

diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix
index eea0c818920..7df43f7dab4 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -4,13 +4,13 @@
 { stdenv, fetchgit }:
 
 stdenv.mkDerivation rec {
-  version = "2019-09-13";
+  version = "2019-09-20";
   pname = "oh-my-zsh";
-  rev = "32338fd40cae45c775dadc34ae05476811a3834b";
+  rev = "6cfaa076272e08b6a81b6358b78d020e48f8a4a6";
 
   src = fetchgit { inherit rev;
     url = "https://github.com/robbyrussell/oh-my-zsh";
-    sha256 = "0fp1hzxmml14ds12751icbsm2v3rhwm2vf5qzc65722fvvb98p0p";
+    sha256 = "0i1mlw42g2w5pbg6zsl48pdwv1hy5zrwx9kq4w04mynwg7mc9hs5";
   };
 
   pathsToLink = [ "/share/oh-my-zsh" ];
-- 
GitLab


From c48083f0aa80b848d0fc523e96116b9fb9a2fc11 Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Fri, 20 Sep 2019 17:13:24 +0200
Subject: [PATCH 0625/2254] jormungandr: 0.3.1415 -> 0.3.9999

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

diff --git a/pkgs/applications/blockchains/jormungandr/default.nix b/pkgs/applications/blockchains/jormungandr/default.nix
index 541ef49ef5a..0bc766a43bb 100644
--- a/pkgs/applications/blockchains/jormungandr/default.nix
+++ b/pkgs/applications/blockchains/jormungandr/default.nix
@@ -10,12 +10,12 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "jormungandr";
-  version = "0.3.1415";
+  version = "0.3.9999";
 
   src = fetchgit {
     url = "https://github.com/input-output-hk/${pname}";
     rev = "v${version}";
-    sha256 = "1kg20570ri3bj99gicpp2z272igj9s7m2qw0z1ndk60bxcyghi2x";
+    sha256 = "11lr533fpispwbk4vsq9bnv40gkpybvpa7ajwczv9ky6afh8np5b";
     fetchSubmodules = true;
   };
 
-- 
GitLab


From cc7952401a333a92f83bb9fd095652a18f9bc3cc Mon Sep 17 00:00:00 2001
From: Anton-Latukha <anton.latukha@gmail.com>
Date: Thu, 19 Sep 2019 02:15:17 +0300
Subject: [PATCH 0626/2254] djview: {adopt, clean-up, doc, Qt(4 -> 5), add
 features}

djview: adopt

djview: upd description

djview: add longDescription

djview: upd to Qt5, use Qt5's mkDerivation

djview: add configureFlags (enabling couple features)

upd longDescription

djview: upd clean-up
---
 pkgs/applications/graphics/djview/default.nix | 64 ++++++++++++++++---
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 55 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/graphics/djview/default.nix b/pkgs/applications/graphics/djview/default.nix
index 1917640fd2e..4d09f2ad5fe 100644
--- a/pkgs/applications/graphics/djview/default.nix
+++ b/pkgs/applications/graphics/djview/default.nix
@@ -1,8 +1,16 @@
-{ stdenv, fetchurl, pkgconfig
-, djvulibre, qt4, xorg, libtiff
-, darwin }:
+{ stdenv
+, mkDerivation
+, fetchurl
+, pkgconfig
+, djvulibre
+, qtbase
+, qttools
+, xorg
+, libtiff
+, darwin
+}:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   pname = "djview";
   version = "4.10.6";
 
@@ -11,20 +19,56 @@ stdenv.mkDerivation rec {
     sha256 = "08bwv8ppdzhryfcnifgzgdilb12jcnivl4ig6hd44f12d76z6il4";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [
+    pkgconfig
+    qttools
+  ];
 
-  buildInputs = [ djvulibre qt4 xorg.libXt libtiff ]
-  ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AGL ];
+  buildInputs = [
+    djvulibre
+    qtbase
+    xorg.libXt
+    libtiff
+  ] ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.AGL;
+
+  configureFlags = [
+    "--disable-silent-rules"
+    "--disable-dependency-tracking"
+    "--with-x"
+    "--with-tiff"
+    # NOTE: 2019-09-19: experimental "--enable-npdjvu" fails
+  ] ++ stdenv.lib.optional stdenv.isDarwin "--enable-mac";
 
   passthru = {
     mozillaPlugin = "/lib/mozilla/plugins";
   };
 
   meta = with stdenv.lib; {
-    homepage = http://djvu.sourceforge.net/djview4.html;
-    description = "A portable DjVu viewer and browser plugin";
+    description = "A portable DjVu viewer (Qt5) and browser (nsdejavu) plugin";
+    homepage = "http://djvu.sourceforge.net/djview4.html";
     license = licenses.gpl2;
     platforms = platforms.unix;
-    maintainers = [ ];
+    maintainers = with maintainers; [ Anton-Latukha ];
+    longDescription = ''
+      The portable DjVu viewer (Qt5) and browser (nsdejavu) plugin.
+
+      Djview highlights:
+        - entirely based on the public DjVulibre api.
+        - entirely written in portable Qt5.
+        - works natively under Unix/X11, MS Windows, and macOS X.
+        - continuous scrolling of pages
+        - side-by-side display of pages
+        - ability to specify a url to the djview command
+        - all plugin and cgi options available from the command line
+        - all silly annotations implemented
+        - display thumbnails as a grid
+        - display outlines
+        - page names supported (see djvused command set-page-title)
+        - metadata dialog (see djvused command set-meta)
+        - implemented as reusable Qt widgets
+
+      nsdejavu: browser plugin for DjVu. It internally uses djview.
+      Has CGI-style arguments to configure the view of document (see man).
+    '';
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 81fae113b0a..1332f45060e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17780,7 +17780,7 @@ in
 
   djvu2pdf = callPackage ../tools/typesetting/djvu2pdf { };
 
-  djview = callPackage ../applications/graphics/djview { };
+  djview = libsForQt5.callPackage ../applications/graphics/djview { };
   djview4 = pkgs.djview;
 
   dmenu = callPackage ../applications/misc/dmenu { };
-- 
GitLab


From c5f38519097c6110baa43fa03e1892e8b42f358b Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 20 Sep 2019 10:37:03 +0300
Subject: [PATCH 0627/2254] neovim-remote: 2.2.0 -> 2.2.1

---
 pkgs/applications/editors/neovim/neovim-remote.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/neovim/neovim-remote.nix b/pkgs/applications/editors/neovim/neovim-remote.nix
index 92ff745d1a6..6ad3983a531 100644
--- a/pkgs/applications/editors/neovim/neovim-remote.nix
+++ b/pkgs/applications/editors/neovim/neovim-remote.nix
@@ -4,14 +4,14 @@ with stdenv.lib;
 
 pythonPackages.buildPythonApplication rec {
   pname = "neovim-remote";
-  version = "2.2.0";
+  version = "2.2.1";
   disabled = !pythonPackages.isPy3k;
 
   src = fetchFromGitHub {
     owner = "mhinz";
     repo = "neovim-remote";
     rev = "v${version}";
-    sha256 = "0vvwygyar835z947d5zgjywyhl7ajj63z0l8sb7w9kj1w5snb43x";
+    sha256 = "0f9x053yr8wq35l2s2dsnb0iygd4g4yya2h3iv0yh3440jjj5vfj";
   };
 
   propagatedBuildInputs = with pythonPackages; [ pynvim psutil ];
-- 
GitLab


From 827f62ef01f263802f99a3fa5bdc716756d3e796 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 14 Sep 2019 08:23:18 +0000
Subject: [PATCH 0628/2254] ocamlPackages.optint: 0.0.2 -> 0.0.3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Ensures compatibility with OCaml ≥ 4.08
---
 .../ocaml-modules/optint/default.nix          | 28 ++++++-------------
 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/ocaml-modules/optint/default.nix b/pkgs/development/ocaml-modules/optint/default.nix
index 613973200d2..508bbfba605 100644
--- a/pkgs/development/ocaml-modules/optint/default.nix
+++ b/pkgs/development/ocaml-modules/optint/default.nix
@@ -1,28 +1,18 @@
-{ stdenv, fetchurl, ocaml, findlib, dune }:
+{ lib, buildDunePackage, fetchurl }:
 
-if !stdenv.lib.versionAtLeast ocaml.version "4.02"
-then throw "optint is not available for OCaml ${ocaml.version}"
-else
-
-stdenv.mkDerivation rec {
-  version = "0.0.2";
-  name = "ocaml${ocaml.version}-optint-${version}";
+buildDunePackage rec {
+  minimumOCamlVersion = "4.03";
+  version = "0.0.3";
+  pname = "optint";
   src = fetchurl {
-    url = "https://github.com/mirage/optint/releases/download/v0.0.2/optint-v0.0.2.tbz";
-    sha256 = "1lmb7nycmkr05y93slqi98i1lcs1w4kcngjzjwz7i230qqjpw9w1";
+    url = "https://github.com/mirage/optint/releases/download/v${version}/optint-v${version}.tbz";
+    sha256 = "0c7r3s6lal9xkixngkj25nqncj4s33ka40bjdi7fz7mly08djycj";
   };
 
-  buildInputs = [ ocaml findlib dune ];
-
-  buildPhase = "dune build";
-
-  inherit (dune) installPhase;
-
   meta = {
     homepage = "https://github.com/mirage/optint";
     description = "Abstract type of integer between x64 and x86 architecture";
-    license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.vbgl ];
-    inherit (ocaml.meta) platforms;
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.vbgl ];
   };
 }
-- 
GitLab


From b3dec4fa26ad34d524cfa510ce225f95b1dc11f3 Mon Sep 17 00:00:00 2001
From: Nazarii Bardiuk <nazarii@bardiuk.com>
Date: Thu, 19 Sep 2019 19:23:56 +0100
Subject: [PATCH 0629/2254] vimPlugins.LanguageClient-neovim: 0.1.146->0.1.154

---
 pkgs/misc/vim-plugins/overrides.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
index d5a1ed67665..5fff24e9e5f 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -49,16 +49,16 @@ self: super: {
   };
 
   LanguageClient-neovim = let
-    version = "0.1.146";
+    version = "0.1.154";
     LanguageClient-neovim-src = fetchurl {
       url = "https://github.com/autozimu/LanguageClient-neovim/archive/${version}.tar.gz";
-      sha256 = "1xm98pyzf2dlh04ijjf3nkh37lyqspbbjddkjny1g06xxb4kfxnk";
+      sha256 = "03sp643nihj9p2s9cx2dcazhz68s30qx7igqprgsmr1040rhg2py";
     };
     LanguageClient-neovim-bin = rustPlatform.buildRustPackage {
       name = "LanguageClient-neovim-bin";
       src = LanguageClient-neovim-src;
 
-      cargoSha256 = "0dixvmwq611wg2g3rp1n1gqali46904fnhb90gcpl9a1diqb34sh";
+      cargoSha256 = "1bvbls2l1xa0s3k11crvd98il4i20z5sn0hqmsc1b915k03qq4zj";
       buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ];
 
       # FIXME: Use impure version of CoreFoundation because of missing symbols.
-- 
GitLab


From 5acd6681f253c22ea58f63a38c41d1b338ed3105 Mon Sep 17 00:00:00 2001
From: Artemis Tosini <me@artem.ist>
Date: Fri, 20 Sep 2019 17:29:06 +0000
Subject: [PATCH 0630/2254] linuxPackages_5_3.openafs_1_8: fix build

This update cherry-picks patches necessary to build the OpenAFS kernel
module from the OpenAFS master branch. This commit does not fix OpenAFS
1.6.
---
 pkgs/servers/openafs/1.8/module.nix | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix
index 95084458f47..d58d2bff813 100644
--- a/pkgs/servers/openafs/1.8/module.nix
+++ b/pkgs/servers/openafs/1.8/module.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, which, autoconf, automake, flex, yacc
-, kernel, glibc, perl, libtool_2, kerberos }:
+, kernel, glibc, perl, libtool_2, kerberos, fetchpatch }:
 
 with (import ./srcs.nix { inherit fetchurl; });
 
@@ -11,6 +11,20 @@ in stdenv.mkDerivation {
   name = "openafs-${version}-${kernel.modDirVersion}";
   inherit version src;
 
+  patches = [
+    # Linux 5.3
+    (fetchpatch {
+      name = "openafs_1_8-recurse-keyring_search.patch";
+      url = "http://git.openafs.org/?p=openafs.git;a=patch;h=02d82275c17284d04629282aa374bb39f511c989";
+      sha256 = "03pkldwf6i67yf6i1705qp18rx5b0b342ryda8vfjw9lnvpinygs";
+    })
+    (fetchpatch {
+      name = "openafs_1_8-send-sig.patch";
+      url = "http://git.openafs.org/?p=openafs.git;a=patch;h=2b7af1243f46496c0b5973b3fa2a6396243f7613";
+      sha256 = "13gyh5ncpp15dl7056gdzl5xhp2bmafc557bd2a4bwx9nyj53bag";
+    })
+  ];
+
   nativeBuildInputs = [ autoconf automake flex libtool_2 perl which yacc ]
     ++ kernel.moduleBuildDependencies;
 
-- 
GitLab


From 7cff0bc3eedb909d62d1dad79e71b37285fd9271 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 20 Sep 2019 14:38:28 -0400
Subject: [PATCH 0631/2254] zfs: Incompatibility with kernel 5.3

Enable the warning that ZFS is currently
incompatible with 5.3 kernels
---
 pkgs/os-specific/linux/zfs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index 1b9b5a3ba51..d02a01fc93f 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -151,7 +151,7 @@ in {
   # to be adapted
   zfsStable = common {
     # comment/uncomment if breaking kernel versions are known
-    # incompatibleKernelVersion = "4.20";
+    incompatibleKernelVersion = "5.3";
 
     # this package should point to the latest release.
     version = "0.8.1";
@@ -165,7 +165,7 @@ in {
 
   zfsUnstable = common {
     # comment/uncomment if breaking kernel versions are known
-    # incompatibleKernelVersion = "4.19";
+    incompatibleKernelVersion = "5.3";
 
     # this package should point to a version / git revision compatible with the latest kernel release
     version = "0.8.1";
-- 
GitLab


From a19182309643e83aee1012d81b93dc75082c9520 Mon Sep 17 00:00:00 2001
From: "eyjhbb@gmail.com" <eyjhbb@gmail.com>
Date: Sun, 15 Sep 2019 17:33:17 +0200
Subject: [PATCH 0632/2254] purple-slack: Init at 2019-08-18

---
 .../pidgin-plugins/purple-slack/default.nix   | 28 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-slack/default.nix

diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-slack/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-slack/default.nix
new file mode 100644
index 00000000000..10973345dec
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-slack/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, pidgin, pkgconfig }:
+
+stdenv.mkDerivation {
+  pname = "purple-slack-unstable";
+  version = "2019-08-18";
+
+  src = fetchFromGitHub {
+    owner = "dylex";
+    repo = "slack-libpurple";
+    rev = "be97802c7fd0b611722d2f551756e2a2672f6084";
+    sha256 = "0l6hwnnv6zzszxkk0a3nli88w5gijvlc9qgkkai0sb4v4c504y5v";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ pidgin ];
+
+  PKG_CONFIG_PURPLE_PLUGINDIR = "${placeholder "out"}/lib/purple-2";
+  PKG_CONFIG_PURPLE_DATAROOTDIR = "${placeholder "out"}/share";
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/dylex/slack-libpurple;
+    description = "Slack plugin for Pidgin";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ eyjhb ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index db16c9d5143..f016e1e4c6b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19944,6 +19944,8 @@ in
 
   purple-plugin-pack = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack { };
 
+  purple-slack = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-slack { };
+
   purple-vk-plugin = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin { };
 
   purple-xmpp-http-upload = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload { };
-- 
GitLab


From dfc7bdb1a350a735a0d57d741ade1196652884e3 Mon Sep 17 00:00:00 2001
From: Sirio Balmelli <sirio@b-ad.ch>
Date: Fri, 20 Sep 2019 15:23:09 +0200
Subject: [PATCH 0633/2254] ycmd: install phase copies all dirs below
 'third_party'

Copy _all_ of 'third_party'.
Cherry-picking the contents of this dir is a fragile approach as
they change in later commits (breaking this build).

This approach continues to work on the current build,
and will not break with later versions of the project.

Signed-off-by: Sirio Balmelli <sirio@b-ad.ch>
---
 pkgs/development/tools/misc/ycmd/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix
index 12f0b13a660..61f529e1108 100644
--- a/pkgs/development/tools/misc/ycmd/default.nix
+++ b/pkgs/development/tools/misc/ycmd/default.nix
@@ -51,16 +51,17 @@ stdenv.mkDerivation {
 
     mkdir -p $out/lib/ycmd/third_party/{gocode,godef,racerd/target/release}
 
-    for p in jedi waitress frozendict bottle parso python-future requests; do
-      cp -r third_party/$p $out/lib/ycmd/third_party
-    done
+    # Copy everything: the structure of third_party has been known to change.
+    # When linking our own libraries below, do so with '-f'
+    # to clobber anything we may have copied here.
+    cp -r third_party/* $out/lib/ycmd/third_party/
 
   '' + lib.optionalString (gocode != null) ''
-    ln -s ${gocode}/bin/gocode $out/lib/ycmd/third_party/gocode
+    ln -sf ${gocode}/bin/gocode $out/lib/ycmd/third_party/gocode
   '' + lib.optionalString (godef != null) ''
-    ln -s ${godef}/bin/godef $out/lib/ycmd/third_party/godef
+    ln -sf ${godef}/bin/godef $out/lib/ycmd/third_party/godef
   '' + lib.optionalString (rustracerd != null) ''
-    ln -s ${rustracerd}/bin/racerd $out/lib/ycmd/third_party/racerd/target/release
+    ln -sf ${rustracerd}/bin/racerd $out/lib/ycmd/third_party/racerd/target/release
   '';
 
   # fixup the argv[0] and replace __file__ with the corresponding path so
-- 
GitLab


From 7d21d6a680ba42cdba181bd727f1935073e75b83 Mon Sep 17 00:00:00 2001
From: Sirio Balmelli <sirio@b-ad.ch>
Date: Fri, 20 Sep 2019 15:29:38 +0200
Subject: [PATCH 0634/2254] ycmd: update build to 2019-09-19

Signed-off-by: Sirio Balmelli <sirio@b-ad.ch>
---
 pkgs/development/tools/misc/ycmd/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix
index 61f529e1108..f4cb84beb8d 100644
--- a/pkgs/development/tools/misc/ycmd/default.nix
+++ b/pkgs/development/tools/misc/ycmd/default.nix
@@ -7,12 +7,12 @@
 
 stdenv.mkDerivation {
   pname = "ycmd";
-  version = "2018-09-20";
+  version = "2019-09-19";
 
   src = fetchgit {
     url = "https://github.com/Valloric/ycmd.git";
-    rev = "bf658fd78722c517674c0aaf2381e199bca8f163";
-    sha256 = "1lwa8xr76vapfpncvp81cn3m9219yw14fl7fzk5gnly60zkphbbl";
+    rev = "c6d360775b0c5c82e2513dce7b625f8bf3812702";
+    sha256 = "19rxlval20gg65xc5p7q9cnzfm9zw2j0m6vxxk0vqlalcyh0rnzd";
   };
 
   nativeBuildInputs = [ cmake ];
-- 
GitLab


From dee0cb7be53647613281c9bb95e94c8703af98f3 Mon Sep 17 00:00:00 2001
From: Sirio Balmelli <sirio@b-ad.ch>
Date: Fri, 20 Sep 2019 20:22:09 +0200
Subject: [PATCH 0635/2254] ycmd: add gopls completer

ycmd gives 'no completer support' because of missing 'gopls'.
Add this as a conditional dependency.

Refactor the 'mkdir -p' step to be conditional per-dependency,
and placed just before the link step.
This is mostly for legibility but also pedantic correctness:
do not create a directory unless it will be used.

Signed-off-by: Sirio Balmelli <sirio@b-ad.ch>
---
 pkgs/development/tools/misc/ycmd/default.nix | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix
index f4cb84beb8d..eac81aa7f17 100644
--- a/pkgs/development/tools/misc/ycmd/default.nix
+++ b/pkgs/development/tools/misc/ycmd/default.nix
@@ -1,6 +1,7 @@
 { stdenv, lib, fetchgit, cmake, llvmPackages, boost, python
 , gocode ? null
 , godef ? null
+, gotools ? null
 , rustracerd ? null
 , fixDarwinDylibNames, Cocoa ? null
 }:
@@ -49,19 +50,28 @@ stdenv.mkDerivation {
     mkdir -p $out/bin
     ln -s $out/lib/ycmd/ycmd/__main__.py $out/bin/ycmd
 
-    mkdir -p $out/lib/ycmd/third_party/{gocode,godef,racerd/target/release}
-
     # Copy everything: the structure of third_party has been known to change.
     # When linking our own libraries below, do so with '-f'
     # to clobber anything we may have copied here.
+    mkdir -p $out/lib/ycmd/third_party
     cp -r third_party/* $out/lib/ycmd/third_party/
 
   '' + lib.optionalString (gocode != null) ''
-    ln -sf ${gocode}/bin/gocode $out/lib/ycmd/third_party/gocode
+    TARGET=$out/lib/ycmd/third_party/gocode
+    mkdir -p $TARGET
+    ln -sf ${gocode}/bin/gocode $TARGET
   '' + lib.optionalString (godef != null) ''
-    ln -sf ${godef}/bin/godef $out/lib/ycmd/third_party/godef
+    TARGET=$out/lib/ycmd/third_party/godef
+    mkdir -p $TARGET
+    ln -sf ${godef}/bin/godef $TARGET
+  '' + lib.optionalString (gotools != null) ''
+    TARGET=$out/lib/ycmd/third_party/go/src/golang.org/x/tools/cmd/gopls
+    mkdir -p $TARGET
+    ln -sf ${gotools}/bin/gopls $TARGET
   '' + lib.optionalString (rustracerd != null) ''
-    ln -sf ${rustracerd}/bin/racerd $out/lib/ycmd/third_party/racerd/target/release
+    TARGET=$out/lib/ycmd/third_party/racerd/target/release
+    mkdir -p $TARGET
+    ln -sf ${rustracerd}/bin/racerd $TARGET
   '';
 
   # fixup the argv[0] and replace __file__ with the corresponding path so
-- 
GitLab


From 19f88062a6d055d00d76dc963b47aab93164188b Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 20 Sep 2019 10:11:00 +0200
Subject: [PATCH 0636/2254] openjdk8: add `setJavaClassPath`-hook to jdk as
 well

This hook got removed from JDK[1], however without this hook,
the classpath in a Java-build isn't created anymore which caused
several[2][3] broken packages.

[1] https://github.com/NixOS/nixpkgs/pull/65247/files#r324459267
[2] https://hydra.nixos.org/build/100896633
[3] https://hydra.nixos.org/build/100895668

ZHF #68361
---
 pkgs/development/compilers/openjdk/8.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix
index 1d356945a4f..1a5848cd1a6 100644
--- a/pkgs/development/compilers/openjdk/8.nix
+++ b/pkgs/development/compilers/openjdk/8.nix
@@ -219,6 +219,8 @@ let
       ln -s $jre/lib/openjdk/jre $out/jre
     '';
 
+    propagatedBuildInputs = [ setJavaClassPath ];
+
     preFixup = ''
       # Propagate the setJavaClassPath setup hook from the JRE so that
       # any package that depends on the JRE has $CLASSPATH set up
-- 
GitLab


From 817e74524f5582de19e94bd348a91aa5466a6faa Mon Sep 17 00:00:00 2001
From: jD91mZM2 <me@krake.one>
Date: Sun, 8 Sep 2019 12:16:41 +0200
Subject: [PATCH 0637/2254] yaru-theme: init at 19.10.2

---
 pkgs/data/themes/yaru/default.nix | 29 +++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/data/themes/yaru/default.nix

diff --git a/pkgs/data/themes/yaru/default.nix b/pkgs/data/themes/yaru/default.nix
new file mode 100644
index 00000000000..2302aa301e3
--- /dev/null
+++ b/pkgs/data/themes/yaru/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, meson, sassc, pkg-config, glib, ninja,
+  python3, gtk3, gnome3, gtk-engine-murrine }:
+
+stdenv.mkDerivation rec {
+  pname = "yaru";
+  version = "19.10.2";
+
+  src = fetchFromGitHub {
+    owner = "ubuntu";
+    repo = "yaru";
+    rev = version;
+    sha256 = "1azyn8pr0kpbq4wlz91f5amqyxqq0x2mxkglzl488sf39fl0gnbj";
+  };
+
+  nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ];
+  buildInputs = [ gtk3 gnome3.gnome-themes-extra ];
+
+  propagatedUserEnvPkgs = [ gtk-engine-murrine ];
+
+  postPatch = "patchShebangs .";
+
+  meta = with stdenv.lib; {
+    description = "Ubuntu community theme 'yaru' - default Ubuntu theme since 18.10";
+    homepage = https://github.com/ubuntu/yaru;
+    license = with licenses; [ cc-by-sa-40 gpl3 ];
+    platforms = platforms.linux;
+    maintainers = [ maintainers.jD91mZM2 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d27cccbc9c9..c806d75e403 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17194,6 +17194,8 @@ in
 
   yanone-kaffeesatz = callPackage ../data/fonts/yanone-kaffeesatz {};
 
+  yaru-theme = callPackage ../data/themes/yaru {};
+
   zafiro-icons = callPackage ../data/icons/zafiro-icons { };
 
   zeal = libsForQt5.callPackage ../data/documentation/zeal { };
-- 
GitLab


From 219ddc54e498cb875b2dd7ac37036e5cb6bf8a3d Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Fri, 20 Sep 2019 22:05:30 +0200
Subject: [PATCH 0638/2254] bup: 0.29.2 -> 0.29.3

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

diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix
index 3097756ddf8..3ff7aed74f5 100644
--- a/pkgs/tools/backup/bup/default.nix
+++ b/pkgs/tools/backup/bup/default.nix
@@ -5,7 +5,7 @@
 
 assert par2Support -> par2cmdline != null;
 
-let version = "0.29.2"; in
+let version = "0.29.3"; in
 
 with stdenv.lib;
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
     repo = "bup";
     owner = "bup";
     rev = version;
-    sha256 = "17lpbyhf43gcln5s43m2zzgichcx7jq6ragcawfklw6svg1vnj89";
+    sha256 = "1b5ynljd9gs1vzbsa0kggw32s3r4zhbprc2clvjm5qmvnx23hxh8";
   };
 
   buildInputs = [
-- 
GitLab


From 7b3e8159e9bab97c2c82b31345bce89368f060a8 Mon Sep 17 00:00:00 2001
From: Bruno Bigras <bigras.bruno@gmail.com>
Date: Fri, 20 Sep 2019 16:20:46 -0400
Subject: [PATCH 0639/2254] starship: 0.17.0 -> 0.18.0

---
 pkgs/tools/misc/starship/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix
index 5d571e0c022..8685bf7139e 100644
--- a/pkgs/tools/misc/starship/default.nix
+++ b/pkgs/tools/misc/starship/default.nix
@@ -1,20 +1,19 @@
-{ stdenv, fetchFromGitHub, rustPlatform, openssl, pkgconfig, libiconv, darwin }:
+{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, libiconv, darwin }:
 
 rustPlatform.buildRustPackage rec {
   pname = "starship";
-  version = "0.17.0";
+  version = "0.18.0";
 
   src = fetchFromGitHub {
     owner = "starship";
     repo = "starship";
     rev = "v${version}";
-    sha256 = "0vlpvacay25dzb5wix9jd91j0j1nrwz4k8zglj7210mhabfpnxvb";
+    sha256 = "1xin821lgrdxb50i9p9ya3yfi64l4byf9il4jiijgsjckinxyflj";
   };
 
-  buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ];
-  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ];
 
-  cargoSha256 = "0p16pa9psbj9126b4p61l0skmmasp2ms6c6r5rh3dfr8gg77qzpa";
+  cargoSha256 = "12yswvhgcmqz0nyarva27pjc4xqqqn3m31y04r3l7ldbzgikn8k6";
   checkPhase = "cargo test -- --skip directory::home_directory --skip directory::directory_in_root";
 
   meta = with stdenv.lib; {
-- 
GitLab


From ad4b97a2331e39481194124d1db9bc8bed3489ed Mon Sep 17 00:00:00 2001
From: Pierre Bourdon <delroth@gmail.com>
Date: Fri, 20 Sep 2019 22:30:50 +0200
Subject: [PATCH 0640/2254] redo-apenwarr: fix source URL

---
 .../tools/build-managers/redo-apenwarr/default.nix          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/build-managers/redo-apenwarr/default.nix b/pkgs/development/tools/build-managers/redo-apenwarr/default.nix
index d25367c3e57..f08a2e56342 100644
--- a/pkgs/development/tools/build-managers/redo-apenwarr/default.nix
+++ b/pkgs/development/tools/build-managers/redo-apenwarr/default.nix
@@ -17,10 +17,10 @@ in stdenv.mkDerivation rec {
   pname = "redo-apenwarr";
   version = "0.42";
 
-  src = fetchFromGitHub {
+  src = fetchFromGitHub rec {
     owner = "apenwarr";
-    repo = pname;
-    rev = "${pname}-${version}";
+    repo = "redo";
+    rev = "${repo}-${version}";
     sha256 = "1060yb7hrxm8c7bfvb0y4j0acpxsj6hbykw1d9549zpkxxr9nsgm";
   };
 
-- 
GitLab


From 477776c52152b0fcd8f8a2f77f50d11e8986e676 Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Fri, 20 Sep 2019 22:44:57 +0200
Subject: [PATCH 0641/2254] jormungandr: adding jormungandr-scenario-tests

---
 pkgs/applications/blockchains/jormungandr/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/blockchains/jormungandr/default.nix b/pkgs/applications/blockchains/jormungandr/default.nix
index 0bc766a43bb..06400af679f 100644
--- a/pkgs/applications/blockchains/jormungandr/default.nix
+++ b/pkgs/applications/blockchains/jormungandr/default.nix
@@ -32,6 +32,7 @@ rustPlatform.buildRustPackage rec {
     install -d $out/bin $out/templates
     install -m755 target/*/release/jormungandr $out/bin/
     install -m755 target/*/release/jcli $out/bin/
+    install -m755 target/*/release/jormungandr-scenario-tests	$out/bin/
     install -m755 scripts/send-transaction $out/templates
     install -m755 scripts/jcli-helpers $out/bin/
     install -m755 scripts/bootstrap $out/bin/jormungandr-bootstrap
-- 
GitLab


From ae293ad45eb8ccbe4da7cbac8fabdf88000c39b0 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 20 Sep 2019 23:35:14 +0200
Subject: [PATCH 0642/2254] mautrix-telegram: 0.6.0 -> 0.6.1

https://github.com/tulir/mautrix-telegram/releases/tag/v0.6.1
---
 pkgs/servers/mautrix-telegram/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix
index 5ee491a0b8a..2908c14b4e0 100644
--- a/pkgs/servers/mautrix-telegram/default.nix
+++ b/pkgs/servers/mautrix-telegram/default.nix
@@ -4,11 +4,11 @@ with python3.pkgs;
 
 buildPythonPackage rec {
   pname = "mautrix-telegram";
-  version = "0.6.0";
+  version = "0.6.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "fbed41838e1ef7e43f6e47ff38f9906cb311cfc5b3b6bc6f704babd7c83b193d";
+    sha256 = "1lsi6x5yr8f9yjxsh1rmcd6wnxr6s6rpr720lg7sq629m42d9p1d";
   };
 
   postPatch = ''
-- 
GitLab


From 15e99a06a8d06f992ff4b148ee2cbeaf763a674f Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Fri, 20 Sep 2019 19:10:02 -0400
Subject: [PATCH 0643/2254] wrapQtAppsHook: correct skip directories heuristic

---
 pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh b/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh
index d7a44cace03..d2aadbd956a 100644
--- a/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh
+++ b/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh
@@ -80,7 +80,7 @@ wrapQtAppsHook() {
     do
         [ -d "$targetDir" ] || continue
 
-        find "$targetDir" -type f -executable -print0 | while IFS= read -r -d '' file
+        find "$targetDir" ! -type d -executable -print0 | while IFS= read -r -d '' file
         do
             patchelf --print-interpreter "$file" >/dev/null 2>&1 || continue
 
-- 
GitLab


From 72340af11195e4bac462b9da908c710b93bb2a97 Mon Sep 17 00:00:00 2001
From: Hugo Reeves <hugolreeves@gmail.com>
Date: Sat, 21 Sep 2019 11:32:47 +1200
Subject: [PATCH 0644/2254] croc: 6.1.1 -> 6.1.3

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

diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix
index 160b5840cf5..5ed2d5a1cb1 100644
--- a/pkgs/tools/networking/croc/default.nix
+++ b/pkgs/tools/networking/croc/default.nix
@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   pname = "croc";
-  version = "6.1.1";
+  version = "6.1.3";
 
   goPackagePath = "github.com/schollz/croc";
 
@@ -10,10 +10,10 @@ buildGoModule rec {
     owner = "schollz";
     repo = pname;
     rev = "v${version}";
-    sha256 = "08gkwllk3m5hpkr1iwabvs739rvl6rzdnra2v040dzdj6zgyd12r";
+    sha256 = "1qc655y1vvz0bk4rk78fl33s3dqz196zn08aczrb4ipbbj7hp8x8";
   };
 
-  modSha256 = "026m3hc2imna7bf4jpqm7yq6mr4l5is2crsx1vxdpr4h0n6z0v3i";
+  modSha256 = "00bnf4dc3i41s9wjpbc59nn7jwlhvp2zhdrjhjn5fwbc95pm4gm0";
   subPackages = [ "." ];
 
   meta = with stdenv.lib; {
-- 
GitLab


From 18b607b71b061e4468d1e089b70e12db50a51d5a Mon Sep 17 00:00:00 2001
From: Pierre Bourdon <delroth@gmail.com>
Date: Sat, 21 Sep 2019 03:45:15 +0200
Subject: [PATCH 0645/2254] zbar: disable Qt assertions

Greatly decreases zbar-lib transitive closure size: assertion messages
contain paths to Qt header files, causing zbar-lib to depend on
qtbase-dev.

The Qt specific mkDerivation normally does this automatically, but we
can't use it here due to having only a small part of the project being
Qt related.
---
 pkgs/tools/graphics/zbar/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix
index cb5ea25211c..6423a84badc 100644
--- a/pkgs/tools/graphics/zbar/default.nix
+++ b/pkgs/tools/graphics/zbar/default.nix
@@ -50,6 +50,9 @@ stdenv.mkDerivation rec {
     qtx11extras
   ];
 
+  # Disable assertions which include -dev QtBase file paths.
+  NIX_CFLAGS_COMPILE = [ "-DQT_NO_DEBUG" ];
+
   configureFlags = [
     "--without-python"
   ] ++ (if enableDbus then [
-- 
GitLab


From 7b58739e2c193b984d1352041863d2f3935694d7 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 20 Sep 2019 22:37:00 -0400
Subject: [PATCH 0646/2254] gcc: fix mising avr limits.h

Fixes #69172
---
 pkgs/development/compilers/gcc/8/default.nix | 7 ++++++-
 pkgs/development/compilers/gcc/9/default.nix | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix
index 129ca72251f..e25c7b6016a 100644
--- a/pkgs/development/compilers/gcc/8/default.nix
+++ b/pkgs/development/compilers/gcc/8/default.nix
@@ -186,7 +186,12 @@ stdenv.mkDerivation ({
             sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR'
         ''
         )
-    else "");
+    else "")
+      + stdenv.lib.optionalString targetPlatform.isAvr ''
+	        makeFlagsArray+=(
+	           'LIMITS_H_TEST=false'
+	        )
+	      '';
 
   inherit noSysDirs staticCompiler crossStageStatic
     libcCross crossMingw;
diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix
index 506cfee7f49..de4d893b99e 100644
--- a/pkgs/development/compilers/gcc/9/default.nix
+++ b/pkgs/development/compilers/gcc/9/default.nix
@@ -185,7 +185,12 @@ stdenv.mkDerivation ({
             sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR'
         ''
         )
-    else "");
+    else "")
+      + stdenv.lib.optionalString targetPlatform.isAvr ''
+	        makeFlagsArray+=(
+	           'LIMITS_H_TEST=false'
+	        )
+	      '';
 
   inherit noSysDirs staticCompiler crossStageStatic
     libcCross crossMingw;
-- 
GitLab


From 233ba4052a2bfebcc6514c255f54cbfb02305a92 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 20 Sep 2019 21:59:28 -0500
Subject: [PATCH 0647/2254] llvm_9: fix test failing on non-x86, such as our
 aarch64

---
 .../9/fix-test-on-non-x86-like-others.patch   | 23 +++++++++++++++++++
 pkgs/development/compilers/llvm/9/llvm.nix    |  4 ++++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/compilers/llvm/9/fix-test-on-non-x86-like-others.patch

diff --git a/pkgs/development/compilers/llvm/9/fix-test-on-non-x86-like-others.patch b/pkgs/development/compilers/llvm/9/fix-test-on-non-x86-like-others.patch
new file mode 100644
index 00000000000..e6c2f040684
--- /dev/null
+++ b/pkgs/development/compilers/llvm/9/fix-test-on-non-x86-like-others.patch
@@ -0,0 +1,23 @@
+Index: test/tools/gold/X86/linkonce_odr_unnamed_addr.ll
+===================================================================
+diff --git a/test/tools/gold/X86/linkonce_odr_unnamed_addr.ll b/llvm/trunk/test/tools/gold/X86/linkonce_odr_unnamed_addr.ll
+--- a/test/tools/gold/X86/linkonce_odr_unnamed_addr.ll	(revision 372333)
++++ b/test/tools/gold/X86/linkonce_odr_unnamed_addr.ll	(working copy)
+@@ -3,7 +3,7 @@
+ 
+ ; RUN: opt -module-summary %s -o %t.o
+ ; RUN: opt -module-summary %p/Inputs/linkonce_odr_unnamed_addr.ll -o %t2.o
+-; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
++; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext \
+ ; RUN:    --plugin-opt=save-temps \
+ ; RUN:    %t.o %t2.o -o %t3.o
+ ; RUN: llvm-dis %t.o.1.promote.bc -o - | FileCheck %s
+@@ -11,7 +11,7 @@
+ ; Now test when one module is a native object. In that case we must be
+ ; conservative and not auto hide.
+ ; RUN: llc %p/Inputs/linkonce_odr_unnamed_addr.ll -o %t2native.o -filetype=obj
+-; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
++; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext \
+ ; RUN:    --plugin-opt=save-temps \
+ ; RUN:    %t.o %t2native.o -o %t3.o
+ ; RUN: llvm-dis %t.o.1.promote.bc -o - | FileCheck %s --check-prefix=NOSUMMARY
diff --git a/pkgs/development/compilers/llvm/9/llvm.nix b/pkgs/development/compilers/llvm/9/llvm.nix
index 5dfe6847b8c..9bc7e1fc20b 100644
--- a/pkgs/development/compilers/llvm/9/llvm.nix
+++ b/pkgs/development/compilers/llvm/9/llvm.nix
@@ -81,6 +81,10 @@ in stdenv.mkDerivation (rec {
     # Fix test so that no extra locale files are needed
     substituteInPlace test/tools/llvm-ar/mri-utf8.test \
       --replace en_US.UTF-8 C.UTF-8
+
+    # Fix x86 gold test on non-x86 platforms
+    # (similar fix made to others in this directory previously, FWIW)
+    patch -p1 -i  ${./fix-test-on-non-x86-like-others.patch}
   '';
 
   # hacky fix: created binaries need to be run before installation
-- 
GitLab


From d8adf06d355e9f49c86089c7231202094f4ede05 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 8 Mar 2019 20:06:22 -0500
Subject: [PATCH 0648/2254] release.nix: remove firefox-unwrapped from
 darwin-tested
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Unfortunately it is broken and I won’t have time to fix right now.
Most likely we will have to wait until the macOS 10.12 update to get
this one working again.

(cherry picked from commit 70f1335f8d64d1f8451b891d4fca4af08e607d09)
---
 pkgs/top-level/release.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index da81a696337..f832268899d 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -62,7 +62,7 @@ let
               jobs.vim.x86_64-darwin
 
               # UI apps
-              jobs.firefox-unwrapped.x86_64-darwin
+              # jobs.firefox-unwrapped.x86_64-darwin
               jobs.qt5.qtmultimedia.x86_64-darwin
               jobs.inkscape.x86_64-darwin
               jobs.gimp.x86_64-darwin
-- 
GitLab


From abbb9ea8485aa375be1c8c68916df7ca8aab5f40 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 20 Sep 2019 23:20:32 -0400
Subject: [PATCH 0649/2254] firefox: mark broken on darwin

this has been broken for a while, best to not make hydra keep building it.
---
 pkgs/applications/networking/browsers/firefox/packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 3e8cf4d66b9..51ad984f88e 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -32,6 +32,7 @@ rec {
       homepage = http://www.mozilla.com/en-US/firefox/;
       maintainers = with lib.maintainers; [ eelco andir ];
       platforms = lib.platforms.unix;
+      badPlatforms = lib.platforms.darwin;
       license = lib.licenses.mpl20;
     };
     updateScript = callPackage ./update.nix {
-- 
GitLab


From 0c0e63d211dff458040ec40b357f12ef41d74bc1 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 21 Sep 2019 03:35:39 +0000
Subject: [PATCH 0650/2254] =?UTF-8?q?ocamlPackages.camlp5:=207.08=20?=
 =?UTF-8?q?=E2=86=92=207.10?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix
index 19432843218..4dd21671325 100644
--- a/pkgs/development/tools/ocaml/camlp5/default.nix
+++ b/pkgs/development/tools/ocaml/camlp5/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation {
 
-  name = "camlp5-7.08";
+  name = "camlp5-7.10";
 
   src = fetchzip {
-    url = "https://github.com/camlp5/camlp5/archive/rel708.tar.gz";
-    sha256 = "0b39bvr1aa7kzjhbyycmvcrwil2yjbxc84cb43zfzahx4p2aqr76";
+    url = "https://github.com/camlp5/camlp5/archive/rel710.tar.gz";
+    sha256 = "1a1lgsc8350afdwmsznsys7m0c0cks4nw6irqz2f92g8g4vkk9b7";
   };
 
   buildInputs = [ ocaml ];
-- 
GitLab


From 53e1d838eb29f4988b6d13b1626ea13f39d2150e Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 20 Sep 2019 23:58:46 -0400
Subject: [PATCH 0651/2254] Revert "zfs: Incompatibility with kernel 5.3"

This reverts commit 7cff0bc3eedb909d62d1dad79e71b37285fd9271.

The assertion is eagerly evaluated and prevents builds for kernels
that do not even use zfs
---
 pkgs/os-specific/linux/zfs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index d02a01fc93f..1b9b5a3ba51 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -151,7 +151,7 @@ in {
   # to be adapted
   zfsStable = common {
     # comment/uncomment if breaking kernel versions are known
-    incompatibleKernelVersion = "5.3";
+    # incompatibleKernelVersion = "4.20";
 
     # this package should point to the latest release.
     version = "0.8.1";
@@ -165,7 +165,7 @@ in {
 
   zfsUnstable = common {
     # comment/uncomment if breaking kernel versions are known
-    incompatibleKernelVersion = "5.3";
+    # incompatibleKernelVersion = "4.19";
 
     # this package should point to a version / git revision compatible with the latest kernel release
     version = "0.8.1";
-- 
GitLab


From a5deef685a63974d9e78329e5d8f129891ca60de Mon Sep 17 00:00:00 2001
From: yvt <i@yvt.jp>
Date: Sat, 21 Sep 2019 02:33:50 +0900
Subject: [PATCH 0652/2254] maintainer: Add yvt

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 3cb0cd3fa99..bb27e110844 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -7064,6 +7064,11 @@
     githubId = 1866448;
     name = "Eric Bailey";
   };
+  yvt = {
+    email = "i@yvt.jp";
+    github = "yvt";
+    name = "yvt";
+  };
   z77z = {
     email = "maggesi@math.unifi.it";
     github = "maggesi";
-- 
GitLab


From 5ef5852b30aa775d6b17e5895c7df917de472477 Mon Sep 17 00:00:00 2001
From: yvt <i@yvt.jp>
Date: Sat, 21 Sep 2019 03:00:41 +0900
Subject: [PATCH 0653/2254] do-agent: init at 3.5.6

---
 pkgs/servers/monitoring/do-agent/default.nix | 31 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/servers/monitoring/do-agent/default.nix

diff --git a/pkgs/servers/monitoring/do-agent/default.nix b/pkgs/servers/monitoring/do-agent/default.nix
new file mode 100644
index 00000000000..b1b3160bc5b
--- /dev/null
+++ b/pkgs/servers/monitoring/do-agent/default.nix
@@ -0,0 +1,31 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+  name = "do-agent-${version}";
+  version = "3.5.6";
+
+  src = fetchFromGitHub {
+    owner = "digitalocean";
+    repo = "do-agent";
+    rev = "${version}";
+    sha256 = "1gl034cslqa30fqy2p9rymgx398s1rcgbmfvzk5zjlrw47327k8i";
+  };
+
+  buildFlagsArray = ''
+    -ldflags=
+      -X main.version=${version}
+  '';
+
+  modSha256 = "0ydjwxdkcz0blpzwapiaq66vh7nrcg4j91z6h7v4ynnw2rgp7pmy";
+
+  meta = with lib; {
+    description = ''
+      Collects system metrics from a DigitalOcean Droplet (on which the program
+      runs) and sends them to DigitalOcean
+    '';
+    homepage = https://github.com/digitalocean/do-agent;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ yvt ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 30944855831..51f4ad7a3f9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14581,6 +14581,8 @@ in
 
   dkimproxy = callPackage ../servers/mail/dkimproxy { };
 
+  do-agent = callPackage ../servers/monitoring/do-agent { };
+
   dovecot = callPackage ../servers/mail/dovecot { };
   dovecot_pigeonhole = callPackage ../servers/mail/dovecot/plugins/pigeonhole { };
 
-- 
GitLab


From 832ede6514d2242e93085c0eda0e065c66bdd262 Mon Sep 17 00:00:00 2001
From: yvt <i@yvt.jp>
Date: Sat, 21 Sep 2019 03:00:48 +0900
Subject: [PATCH 0654/2254] nixos/do-agent: init

---
 nixos/modules/module-list.nix                 |  1 +
 .../modules/services/monitoring/do-agent.nix  | 53 +++++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 nixos/modules/services/monitoring/do-agent.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index fb8453f1d53..d25836c2d8d 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -502,6 +502,7 @@
   ./services/monitoring/das_watchdog.nix
   ./services/monitoring/datadog-agent.nix
   ./services/monitoring/dd-agent/dd-agent.nix
+  ./services/monitoring/do-agent.nix
   ./services/monitoring/fusion-inventory.nix
   ./services/monitoring/grafana.nix
   ./services/monitoring/grafana-reporter.nix
diff --git a/nixos/modules/services/monitoring/do-agent.nix b/nixos/modules/services/monitoring/do-agent.nix
new file mode 100644
index 00000000000..a03c3330348
--- /dev/null
+++ b/nixos/modules/services/monitoring/do-agent.nix
@@ -0,0 +1,53 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.do-agent;
+in
+{
+  options.services.do-agent = {
+    enable = mkEnableOption "do-agent, the DigitalOcean droplet metrics agent";
+
+    user = mkOption {
+      type = types.str;
+      default = "do-agent";
+      description = "User account under which do-agent runs.";
+    };
+
+    group = mkOption {
+      type = types.str;
+      default = "do-agent";
+      description = "Group account under which do-agent runs.";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    environment.systemPackages = [ pkgs.do-agent ];
+
+    systemd.services.do-agent = {
+      description = "DigitalOcean Droplet Metrics Agent";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" ];
+      serviceConfig = {
+        ExecStart = "${pkgs.do-agent}/bin/do-agent --syslog";
+        Restart = "always";
+        OOMScoreAdjust = -900;
+        SyslogIdentifier = "DigitalOceanAgent";
+        PrivateTmp = "yes";
+        ProtectSystem = "full";
+        ProtectHome = "yes";
+        NoNewPrivileges = "yes";
+      };
+    };
+
+    users.users = optionalAttrs (cfg.user == "do-agent") (singleton
+      { name = "do-agent";
+        group = cfg.group;
+      });
+
+    users.groups = optionalAttrs (cfg.group == "do-agent") (singleton
+      { name = "do-agent";
+      });
+  };
+}
-- 
GitLab


From 7e43b4d0aee408c3742b84e89749c2c494f16cfe Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 21 Sep 2019 00:14:30 -0400
Subject: [PATCH 0655/2254] mariadb: disable auth_pam plugin on darwin
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #69034

This plugin doesn’t work right for us now, needs to be disabled. It
was added first in 10.3.18:

https://github.com/MariaDB/server/commit/91fdb931fa2f734d54acadeb3e9c860a26543f04#diff-7cea40646c6b8df9a67a3eac4eec9bc6
---
 pkgs/servers/sql/mariadb/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index b188b2295a8..15553055457 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -48,6 +48,9 @@ common = rec { # attributes common to both builds
 
   prePatch = ''
     sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt
+  '' + optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace cmake/build_configurations/mysql_release.cmake \
+      --replace "SET(PLUGIN_AUTH_PAM YES)" ""
   '';
 
   patches = [
-- 
GitLab


From 60c62446e7ebb54adb221cac5b9db2b262166ea6 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 20 Sep 2019 23:17:57 -0400
Subject: [PATCH 0656/2254] libproxy: only wrap when pxgsettings exists

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

diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix
index 844d626f49e..773acd03535 100644
--- a/pkgs/development/libraries/libproxy/default.nix
+++ b/pkgs/development/libraries/libproxy/default.nix
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  postFixup = ''
+  postFixup = stdenv.lib.optionalString stdenv.isLinux ''
     # config_gnome3 uses the helper to find GNOME proxy settings
     wrapProgram $out/libexec/pxgsettings --prefix XDG_DATA_DIRS : "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}"
   '';
-- 
GitLab


From 7ffeba43154cd8e899a4e70df0c01a0fb6bf674e Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Sep 2019 00:00:00 -0500
Subject: [PATCH 0657/2254] flow: 0.107.0 -> 0.108.0

Changelog: https://github.com/facebook/flow/releases/tag/v0.108.0
---
 pkgs/development/tools/analysis/flow/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix
index f4c7047e8de..2d7d99bb393 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "flow";
-  version = "0.107.0";
+  version = "0.108.0";
 
   src = fetchFromGitHub {
     owner  = "facebook";
     repo   = "flow";
     rev    = "refs/tags/v${version}";
-    sha256 = "1in7a006lgw4v2p0gn5sx41cn3p259vncpq0l3rz52lyfpn7ai3b";
+    sha256 = "13irr1hkv7mxvq57pywmjmqdf5fv359vl5d19w3sra3rqg7vi3ws";
   };
 
   installPhase = ''
-- 
GitLab


From 5ee382a79add5bc48bc393f53e21b2f44c0e5ae1 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Sep 2019 00:00:00 -0500
Subject: [PATCH 0658/2254] tflint: 0.11.1 -> 0.11.2

Changelog: https://github.com/wata727/tflint/releases/tag/v0.11.2
---
 pkgs/development/tools/analysis/tflint/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix
index 8c47a8bc069..39e9830dd5d 100644
--- a/pkgs/development/tools/analysis/tflint/default.nix
+++ b/pkgs/development/tools/analysis/tflint/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "tflint";
-  version = "0.11.1";
+  version = "0.11.2";
 
   src = fetchFromGitHub {
     owner = "wata727";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0aw39xv6jpnhy201gp9jhz6cbz47k7qgxgcwsffak8janbk6bj2a";
+    sha256 = "1lhg81bsmzxs46329rlayf8k2y7fbjlmxj09rqbygr9f0693rzgy";
   };
 
-  modSha256 = "1facqppgpmmz2j7j77fa3mnjv2nzjxz4ya6xvyvyy92ma0ybclgh";
+  modSha256 = "10za02363yglhj0pbsd2591rflrrcq12gxx9d53pg9hb7lrxj9ij";
 
   subPackages = [ "." ];
 
-- 
GitLab


From 354b2ee01698e9b44b23e5786242b23f9ba442a0 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Sep 2019 00:00:00 -0500
Subject: [PATCH 0659/2254] terraform-lsp: 0.0.6 -> 0.0.9

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

diff --git a/pkgs/development/tools/misc/terraform-lsp/default.nix b/pkgs/development/tools/misc/terraform-lsp/default.nix
index 333e413a4c4..94492395a58 100644
--- a/pkgs/development/tools/misc/terraform-lsp/default.nix
+++ b/pkgs/development/tools/misc/terraform-lsp/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "terraform-lsp";
-  version = "0.0.6";
+  version = "0.0.9";
 
   src = fetchFromGitHub {
     owner = "juliosueiras";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1nalypaw64kdv5zmmb0xgkajhs2gf71ivbxvgwpgvlv2lyidawx5";
+    sha256 = "1m133fznf58fkjl5yx0gxa3cjfb0h8f9fv760c9h1d5cg279bghk";
   };
 
   modSha256 = "1mb3169vdlv4h10k15pg88s48s2b6y7v5frk9j9ahg52grygcqb2";
-- 
GitLab


From 22d7eb74d9b554fe6a18e6542ff85bc38f0bc923 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sat, 21 Sep 2019 08:41:10 +0200
Subject: [PATCH 0660/2254] libgdiplus: 5.6.1 -> 6.0.2

Fixes build error: undefined reference to `GifQuantizeBuffer'
that was most likely caused by giflib update in 3605f1285
ABI tracker didn't show removal of this symbol - I don't know,
perhaps we have different build setting, or something.

Here I found no NEWS, ABI tracker seems OK - only minor
incompatibilities in -private headers.  Mono stuff builds now.
---
 .../libraries/libgdiplus/default.nix          | 24 ++++---------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix
index 9ba3cdbd09a..ca65c3fdf8c 100644
--- a/pkgs/development/libraries/libgdiplus/default.nix
+++ b/pkgs/development/libraries/libgdiplus/default.nix
@@ -2,33 +2,19 @@
 , libtiff, giflib, libjpeg, libpng
 , libXrender, libexif, autoreconfHook, fetchpatch }:
 
-stdenv.mkDerivation {
-  name = "libgdiplus-5.6.1";
+stdenv.mkDerivation rec {
+  pname = "libgdiplus";
+  version = "6.0.2";
 
   src = fetchFromGitHub {
     owner = "mono";
     repo = "libgdiplus";
-    rev = "5.6.1";
-    sha256 = "023xf3l2s0mxcdbl2viglzrkhx3lwcrpm66fiq7cfdqz80d4vsj2";
+    rev = version;
+    sha256 = "07a3n7i35mn5j2djah64by785b1hzy8ckk1pz0xwvk716yzb7sxg";
   };
 
   NIX_LDFLAGS = "-lgif";
 
-  patches = [ # Series of patches cherry-picked from master, all fixes various sigsegv (or required by other patch)
-    (fetchpatch {
-          url = "https://github.com/mono/libgdiplus/commit/d33a2580a94701ff33abe28c22881d6173be57d0.patch";
-          sha256 = "0rr54jylscn4icqjprqhwrncyr92r0d7kmfrrq3myskplpqv1c11";
-    })
-    (fetchpatch {
-          url ="https://github.com/mono/libgdiplus/commit/aa6aa53906935572f52f519fe4ab9ebedc051d08.patch";
-          sha256 = "1wg0avm8qv5cb4vk80baflfzszm6q7ydhn89c3h6kq68hg6zsf1f";
-    })
-    (fetchpatch {
-          url = "https://github.com/mono/libgdiplus/commit/81e45a1d5a3ac3cf035bcc3fabb2859818b6cc04.patch";
-          sha256 = "07wmc88cd1lqifs5x6npryni65jyy9gi8lgr2i1lb7v0fhvlyswg";
-    })
-  ];
-
   hardeningDisable = [ "format" ];
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
-- 
GitLab


From 8a9ebc0b4bf3e029aef92df83e09bd2bf02b8fc5 Mon Sep 17 00:00:00 2001
From: Ruud van Asseldonk <dev@veniogames.com>
Date: Sat, 21 Sep 2019 09:02:20 +0200
Subject: [PATCH 0661/2254] python37Packages.sentry-sdk: use checkInputs

Instead of buildInputs, as there dependencies are only used in tests.
---
 pkgs/development/python-modules/sentry-sdk/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix
index 1e24f953d34..c3cc1baaf43 100644
--- a/pkgs/development/python-modules/sentry-sdk/default.nix
+++ b/pkgs/development/python-modules/sentry-sdk/default.nix
@@ -9,7 +9,7 @@ buildPythonPackage rec {
     sha256 = "f5819df450d7b0696be69a0c6d70a09e4890a3844ee8ccb7a461794135bd5965";
   };
 
-  buildInputs = [ django flask tornado sanic aiohttp bottle rq falcon pyramid celery ];
+  checkInputs = [ django flask tornado sanic aiohttp bottle rq falcon pyramid celery ];
 
   propagatedBuildInputs = [ urllib3 certifi ];
 
-- 
GitLab


From fb863fceeace07cf4ce8632ccdce6f3614ff9a9d Mon Sep 17 00:00:00 2001
From: danbst <abcz2.uprola@gmail.com>
Date: Sat, 21 Sep 2019 10:09:58 +0300
Subject: [PATCH 0662/2254] nixos/postgresql: switch default 9.6 -> 11

This is designed for 19.09 release.
---
 nixos/doc/manual/release-notes/rl-1909.xml      | 7 +++++++
 nixos/modules/services/databases/postgresql.nix | 3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
index 58ab7207f53..9aa992766a2 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -33,6 +33,13 @@
      PHP 7.1 is no longer supported due to upstream not supporting this version for the entire lifecycle of the 19.09 release.
     </para>
    </listitem>
+   <listitem>
+    <para>
+     Postgresql for NixOS service now defaults to v11. <literal>pkgs.postgresql</literal> is still 9.6, but
+     may be updated in future release. To prevent future update problems replace <literal>pkgs.postgresql</literal>
+     with an explicitly versioned <literal>pkgs.postgresql_9_6</literal>.
+    </para>
+   </listitem>
    <listitem>
      <para>
        The binfmt module is now easier to use. Additional systems can
diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index 7bba4dacddc..a19eb820a9c 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -226,7 +226,8 @@ in
       # Note: when changing the default, make it conditional on
       # ‘system.stateVersion’ to maintain compatibility with existing
       # systems!
-      mkDefault (if versionAtLeast config.system.stateVersion "17.09" then pkgs.postgresql_9_6
+      mkDefault (if versionAtLeast config.system.stateVersion "19.09" then pkgs.postgresql_11
+            else if versionAtLeast config.system.stateVersion "17.09" then pkgs.postgresql_9_6
             else if versionAtLeast config.system.stateVersion "16.03" then pkgs.postgresql_9_5
             else throw "postgresql_9_4 was removed, please upgrade your postgresql version.");
 
-- 
GitLab


From 86b83f37b8e70542287195a52dc1b3fd9c33143d Mon Sep 17 00:00:00 2001
From: Jos van Bakel <jos@codeaddict.org>
Date: Sat, 21 Sep 2019 09:28:53 +0200
Subject: [PATCH 0663/2254] nixos/gitea: fix dump

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

diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix
index 59c1c104b9b..4992b13c9d4 100644
--- a/nixos/modules/services/misc/gitea.nix
+++ b/nixos/modules/services/misc/gitea.nix
@@ -322,6 +322,7 @@ in
       "d '${cfg.stateDir}/conf' - ${cfg.user} gitea - -"
       "d '${cfg.stateDir}/custom' - ${cfg.user} gitea - -"
       "d '${cfg.stateDir}/custom/conf' - ${cfg.user} gitea - -"
+      "d '${cfg.stateDir}/log' - ${cfg.user} gitea - -"
       "d '${cfg.repositoryRoot}' - ${cfg.user} gitea - -"
       "Z '${cfg.stateDir}' - ${cfg.user} gitea - -"
 
-- 
GitLab


From 97c1065ae7acd4e762da66242272b7656ec8705a Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 20 Sep 2019 18:16:43 -0500
Subject: [PATCH 0664/2254] zsh-completions: 0.30.0 -> 0.31.0

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

diff --git a/pkgs/shells/zsh/zsh-completions/default.nix b/pkgs/shells/zsh/zsh-completions/default.nix
index 422294150e0..35355fe374d 100644
--- a/pkgs/shells/zsh/zsh-completions/default.nix
+++ b/pkgs/shells/zsh/zsh-completions/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "zsh-completions";
-  version = "0.30.0";
+  version = "0.31.0";
 
   src = fetchFromGitHub {
     owner = "zsh-users";
-    repo = "zsh-completions";
+    repo = pname;
     rev = version;
-    sha256 = "1yf4rz99acdsiy0y1v3bm65xvs2m0sl92ysz0rnnrlbd5amn283l";
+    sha256 = "0rw23m8cqxhcb4yjhbzb9lir60zn1xjy7hn3zv1fzz700f0i6fyk";
   };
 
   installPhase= ''
-- 
GitLab


From 39b4852972d959c0a4c61ace29e42cf4c0b9bdde Mon Sep 17 00:00:00 2001
From: Roman Volosatovs <rvolosatovs@riseup.net>
Date: Mon, 16 Sep 2019 22:57:29 +0200
Subject: [PATCH 0665/2254] grpcui: 0.2.0 -> 0.2.1

---
 pkgs/tools/networking/grpcui/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/grpcui/default.nix b/pkgs/tools/networking/grpcui/default.nix
index b256b5b37d9..58e698ed708 100644
--- a/pkgs/tools/networking/grpcui/default.nix
+++ b/pkgs/tools/networking/grpcui/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "grpcui";
-  version = "0.2.0";
+  version = "0.2.1";
 
   src = fetchFromGitHub {
     owner = "fullstorydev";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0h4xpyd6phj3svjzxh6nd98ym81x4a2v6jxcnqj4psjinwd4p3md";
+    sha256 = "0dcah6bamjqyp9354qrd1cykdr5k5l93hh7qcy5b4nkag9531gl0";
   };
-  
-  modSha256 = "1hsq2gfhscl4wvld346xrp018sb1g3xvga3d8chlbgw93rmhhszb";
+
+  modSha256 = "1yq8484cjxad72nqsrim3zppr8hmn7dc6f8rgkw8fg952lqy5jjb";
 
   meta = with lib; {
     description = "An interactive web UI for gRPC, along the lines of postman";
-- 
GitLab


From d3116ca29d80c0eaf8ef6cf0dabc603881b2fb11 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Sep 2019 04:20:00 -0500
Subject: [PATCH 0666/2254] vale: use buildGoPackage

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

diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix
index b73015dd19f..308f893e73b 100644
--- a/pkgs/tools/text/vale/default.nix
+++ b/pkgs/tools/text/vale/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
-buildGoModule rec {
+buildGoPackage rec {
   pname = "vale";
   version = "1.7.1";
 
@@ -13,7 +13,7 @@ buildGoModule rec {
     sha256 = "1qi3brjppiymk6as0xic2n3bhq8g8qw1z8d9a24w60x9gp52yq5m";
   };
 
-  modSha256 = "0av728w22rrlw2030d09q5dz9ks58p3n4g1hx4xcs0gi33sdsdb8";
+  goPackagePath = "github.com/errata-ai/vale";
 
   meta = with stdenv.lib; {
     homepage = https://errata-ai.github.io/vale/;
-- 
GitLab


From 0f1ce1787ff80b10d34d4708ce81fb6f1d895619 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Sep 2019 04:20:00 -0500
Subject: [PATCH 0667/2254] z-lua: wrap LUA_CPATH manually instead of
 lua.withPackages

We can't use lua.withPackages, because on darwin shebangs can't point to
interpreted (shebang'd) scripts. See https://github.com/NixOS/nixpkgs/issues/23018
---
 pkgs/tools/misc/z-lua/default.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/z-lua/default.nix b/pkgs/tools/misc/z-lua/default.nix
index adce403f35d..9c637d3ae80 100644
--- a/pkgs/tools/misc/z-lua/default.nix
+++ b/pkgs/tools/misc/z-lua/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, lua }:
+{ stdenv, fetchFromGitHub, lua52Packages, makeWrapper }:
 
 stdenv.mkDerivation rec {
   pname = "z-lua";
@@ -13,10 +13,17 @@ stdenv.mkDerivation rec {
 
   dontBuild = true;
 
-  buildInputs = [ (lua.withPackages (p: with p; [ luafilesystem ])) ];
+  nativeBuildInputs = [ makeWrapper ];
+
+  buildInputs = [ lua52Packages.lua ];
 
   installPhase = ''
+    runHook preInstall
+
     install -Dm755 z.lua $out/bin/z
+    wrapProgram $out/bin/z --set LUA_CPATH "${lua52Packages.luafilesystem}/lib/lua/5.2/lfs.so" --set _ZL_USE_LFS 1;
+
+    runHook postInstall
   '';
 
   meta = with stdenv.lib; {
-- 
GitLab


From 224dab14f33bc56d17f325693507a05f536087ff Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Sep 2019 04:21:00 -0500
Subject: [PATCH 0668/2254] cointop: use buildGoPackage

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

diff --git a/pkgs/applications/misc/cointop/default.nix b/pkgs/applications/misc/cointop/default.nix
index c29d8684c90..099b06c078d 100644
--- a/pkgs/applications/misc/cointop/default.nix
+++ b/pkgs/applications/misc/cointop/default.nix
@@ -1,6 +1,6 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
-buildGoModule rec {
+buildGoPackage rec {
   pname = "cointop";
   version = "1.3.4";
 
@@ -11,7 +11,7 @@ buildGoModule rec {
     sha256 = "0nw6vzp0c5r8bwnlvgzj4hzdah44p5pp03d2bcr1lkw8np8fy65n";
   };
 
-  modSha256 = "1fg5h689s6r79qa9qsmd8hcvyihfyzlvqrhhk0qyfl528ipi1zwg";
+  goPackagePath = "github.com/miguelmota/cointop";
 
   meta = with lib; {
     description = "The fastest and most interactive terminal based UI application for tracking cryptocurrencies";
-- 
GitLab


From 2f87a2ef7ef92a6cf1f1399db9eb03fe6bc22a19 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Sep 2019 04:22:00 -0500
Subject: [PATCH 0669/2254] kubeless: use buildGoPackage

---
 pkgs/applications/networking/cluster/kubeless/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/kubeless/default.nix b/pkgs/applications/networking/cluster/kubeless/default.nix
index a69dc8890a7..aaf183ad666 100644
--- a/pkgs/applications/networking/cluster/kubeless/default.nix
+++ b/pkgs/applications/networking/cluster/kubeless/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
-buildGoModule rec {
+buildGoPackage rec {
   pname = "kubeless";
   version = "1.0.4";
 
@@ -10,7 +10,8 @@ buildGoModule rec {
     rev = "v${version}";
     sha256 = "1f5w6kn9rsaxx9nf6kzyjkzm3s9ycy1c8h78hb61v4x915xd3040";
   };
-  modSha256 = "1pw4pwb8z2kq474jjipjdivlrin5zvw8d2if4317b0w0wyp6isgd";
+
+  goPackagePath = "github.com/kubeless/kubeless";
 
   subPackages = [ "cmd/kubeless" ];
 
-- 
GitLab


From a727f4795b2b2862f118c9a00358e3bdc9e352a8 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Sep 2019 04:23:00 -0500
Subject: [PATCH 0670/2254] rclone: use buildGoPackage

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

diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix
index aa0870ea858..5e9945492de 100644
--- a/pkgs/applications/networking/sync/rclone/default.nix
+++ b/pkgs/applications/networking/sync/rclone/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
-buildGoModule rec {
+buildGoPackage rec {
   pname = "rclone";
   version = "1.49.3";
 
@@ -11,11 +11,11 @@ buildGoModule rec {
     sha256 = "0dd5xrbf62n4y77zzaai1rc069ism1ikvcw43hzja3mzwfa0sqqa";
   };
 
-  modSha256 = "158mpmy8q67dk1ks9p926n1670gsk7rhd0vpjh44f4g64ddnhk03";
+  goPackagePath = "github.com/rclone/rclone";
 
   subPackages = [ "." ];
 
-  outputs = [ "out" "man" ];
+  outputs = [ "bin" "out" "man" ];
 
   postInstall = ''
     install -D -m644 $src/rclone.1 $man/share/man/man1/rclone.1
-- 
GitLab


From f6b9982ad642a325ae5269ef104970318d737c29 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Sep 2019 04:24:00 -0500
Subject: [PATCH 0671/2254] golangci-lint: use buildGoPackage

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

diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix
index 7a3d7882715..b8026a9f885 100644
--- a/pkgs/development/tools/golangci-lint/default.nix
+++ b/pkgs/development/tools/golangci-lint/default.nix
@@ -1,6 +1,6 @@
-{ buildGoModule, fetchFromGitHub, lib }:
+{ buildGoPackage, fetchFromGitHub, lib }:
 
-buildGoModule rec {
+buildGoPackage rec {
   pname = "golangci-lint";
   version = "1.17.1";
   goPackagePath = "github.com/golangci/golangci-lint";
@@ -14,8 +14,6 @@ buildGoModule rec {
     sha256 = "1hs24nimv11c63a90ds8ps1lli16m3apsbrd9vpbq2rmxdbpwqac";
   };
 
-  modSha256 = "0k0831rg6ygjffrq5y9488aiacskky7g6bvsfrgfz0g7i0mig1n6";
-
   meta = with lib; {
     description = "Linters Runner for Go. 5x faster than gometalinter. Nice colored output.";
     homepage = https://golangci.com/;
-- 
GitLab


From 04aee5f07006fcb46486404010de17ee693b9a35 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Sep 2019 04:25:00 -0500
Subject: [PATCH 0672/2254] mkcert: use buildGoPackage

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

diff --git a/pkgs/development/tools/misc/mkcert/default.nix b/pkgs/development/tools/misc/mkcert/default.nix
index 7a3ccaa9fbc..b9b1f83322d 100644
--- a/pkgs/development/tools/misc/mkcert/default.nix
+++ b/pkgs/development/tools/misc/mkcert/default.nix
@@ -1,6 +1,6 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
-buildGoModule rec {
+buildGoPackage rec {
   pname = "mkcert";
   version = "1.4.0";
 
@@ -11,7 +11,7 @@ buildGoModule rec {
     sha256 = "0xcmvzh5lq8vs3b0f1zw645fxdr8471v7prl1656q02v38f58ly7";
   };
 
-  modSha256 = "0an12l15a82mks6gipczdpcf2vklk14wjjnk0ccl3kdjwiw7f4wd";
+  goPackagePath = "github.com/FiloSottile/mkcert";
 
   meta = with lib; {
     homepage = https://github.com/FiloSottile/mkcert;
-- 
GitLab


From 9d74f420a191565687a6f2bbf299942a93e991ea Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Sep 2019 04:26:00 -0500
Subject: [PATCH 0673/2254] dex-oidc: use buildGoPackage

---
 pkgs/servers/dex/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/dex/default.nix b/pkgs/servers/dex/default.nix
index 21aa31d6235..799b73294e8 100644
--- a/pkgs/servers/dex/default.nix
+++ b/pkgs/servers/dex/default.nix
@@ -1,6 +1,6 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
-buildGoModule rec {
+buildGoPackage rec {
   pname = "dex";
   version = "2.17.0";
 
@@ -11,7 +11,7 @@ buildGoModule rec {
     sha256 = "1z94svpiwrs64m83gpfnniv0ac1fnmvywvl05f20ind1wlf8bvwn";
   };
 
-  modSha256 = "043sjq547nwg5v8708nhij0g7d2j28pyn676fgbnpps35ymnywfi";
+  goPackagePath = "github.com/dexidp/dex";
 
   subPackages = [
     "cmd/dex"
@@ -22,8 +22,8 @@ buildGoModule rec {
   ];
 
   postInstall = ''
-    mkdir -p $out/share
-    cp -r $src/web $out/share/web
+    mkdir -p $bin/share
+    cp -r $src/web $bin/share/web
   '';
 
   meta = with lib; {
-- 
GitLab


From 605f89305aa6095c0d59c4b43d29dbd4d083cb2d Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Sep 2019 04:27:00 -0500
Subject: [PATCH 0674/2254] certigo: use buildGoPackage

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

diff --git a/pkgs/tools/admin/certigo/default.nix b/pkgs/tools/admin/certigo/default.nix
index f53ef4a16fa..923344c6411 100644
--- a/pkgs/tools/admin/certigo/default.nix
+++ b/pkgs/tools/admin/certigo/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
-buildGoModule rec {
+buildGoPackage rec {
   pname = "certigo";
   version = "1.11.0";
 
@@ -11,7 +11,7 @@ buildGoModule rec {
     sha256 = "1vi4gn484kc7vyxnm2nislzy587h2h4gc8d197vslhyfygac9y7b";
   };
 
-  modSha256 = "0x0iq3w5310dg8lp2kkw82iryfhs9p4707538f5dcxjsllpqvcvj";
+  goPackagePath = "github.com/square/certigo";
 
   meta = with stdenv.lib; {
     description = "A utility to examine and validate certificates in a variety of formats";
-- 
GitLab


From 29a9c4fe918dd461a9a71008297e23706222ddfb Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Sep 2019 04:28:00 -0500
Subject: [PATCH 0675/2254] miniflux: use buildGoPackage

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

diff --git a/pkgs/servers/miniflux/default.nix b/pkgs/servers/miniflux/default.nix
index 1445d0b523c..df3022536ea 100644
--- a/pkgs/servers/miniflux/default.nix
+++ b/pkgs/servers/miniflux/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
-buildGoModule rec {
+buildGoPackage rec {
   pname = "miniflux";
   version = "2.0.17";
 
@@ -11,7 +11,7 @@ buildGoModule rec {
     sha256 = "0bvlsa3ymhdl35bkv2v8lzkbjanyg7y474kbpbabmhwh5lvzgxlm";
   };
 
-  modSha256 = "0060px0av7l9x4xgmkci9d8yl4lgxzqrikqagnz0f17a944p9xdr";
+  goPackagePath = "miniflux.app";
 
   doCheck = true;
 
@@ -20,7 +20,7 @@ buildGoModule rec {
   '';
 
   postInstall = ''
-    mv $out/bin/miniflux.app $out/bin/miniflux
+    mv $bin/bin/miniflux.app $bin/bin/miniflux
   '';
 
   meta = with stdenv.lib; {
-- 
GitLab


From 4a414f378bad44f24010fadc53404ad3247bdded Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Sep 2019 04:29:00 -0500
Subject: [PATCH 0676/2254] systemd-journal2gelf: use buildGoPackage

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

diff --git a/pkgs/tools/system/systemd-journal2gelf/default.nix b/pkgs/tools/system/systemd-journal2gelf/default.nix
index 0a2b7ab4f3b..3f23624071f 100644
--- a/pkgs/tools/system/systemd-journal2gelf/default.nix
+++ b/pkgs/tools/system/systemd-journal2gelf/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
-buildGoModule {
+buildGoPackage rec {
   pname = "SystemdJournal2Gelf-unstable";
   version = "20190702";
 
@@ -8,10 +8,11 @@ buildGoModule {
     rev = "b1aa5ff31307d11a3c9b4dd08c3cd6230d935ec5";
     owner = "parse-nl";
     repo = "SystemdJournal2Gelf";
-    sha256 = "0i2pv817fjm2xazxb01dk2gg1xb4d9b6743gqrbsyghbkm7krx29";
+    sha256 = "13jyh34wprjixinmh6l7wj7lr1f6qy6nrjcf8l29a74mczbphnvv";
+    fetchSubmodules = true;
   };
 
-  modSha256 = "0f66bjij3bkjs09xhhp26arivlqrd66z1j5ziy4lq4krg82krsdp";
+  goPackagePath = "github.com/parse-nl/SystemdJournal2Gelf";
 
   meta = with stdenv.lib; {
     description = "Export entries from systemd's journal and send them to a graylog server using gelf";
-- 
GitLab


From f14caea161057a9daf3690e81116a1f8d7f07215 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Sep 2019 04:30:00 -0500
Subject: [PATCH 0677/2254] wallutils: use buildGoPackage

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

diff --git a/pkgs/tools/graphics/wallutils/default.nix b/pkgs/tools/graphics/wallutils/default.nix
index 1b578628caf..80b90e8e6b2 100644
--- a/pkgs/tools/graphics/wallutils/default.nix
+++ b/pkgs/tools/graphics/wallutils/default.nix
@@ -1,8 +1,8 @@
-{ buildGoModule, fetchFromGitHub, lib
+{ buildGoPackage, fetchFromGitHub, lib
 , wayland, libX11, xbitmaps, libXcursor, libXmu, libXpm
 }:
 
-buildGoModule rec {
+buildGoPackage rec {
   pname = "wallutils";
   version = "5.8.2";
 
@@ -13,7 +13,7 @@ buildGoModule rec {
     sha256 = "1ghvcxsy5prj8l38r4lg39imsqbwmvn1zmiv7004j6skmgpaaawh";
   };
 
-  modSha256 = "0siw1g3fsk1xjri9k1pb03filax8an5sfza5db52krh80g9xasah";
+  goPackagePath = "github.com/xyproto/wallutils";
 
   patches = [ ./lscollection-Add-NixOS-paths-to-DefaultWallpaperDirectories.patch ];
 
-- 
GitLab


From ffc69d201992950ad37beb0a281fb73a5f5dcd69 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Sep 2019 04:31:00 -0500
Subject: [PATCH 0678/2254] lazydocker: use buildGoPackage

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

diff --git a/pkgs/tools/misc/lazydocker/default.nix b/pkgs/tools/misc/lazydocker/default.nix
index 9ee494e1f86..3d9111b6a61 100644
--- a/pkgs/tools/misc/lazydocker/default.nix
+++ b/pkgs/tools/misc/lazydocker/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
-buildGoModule rec {
+buildGoPackage rec {
   pname = "lazydocker";
   version = "0.7.4";
 
@@ -11,7 +11,7 @@ buildGoModule rec {
     sha256 = "03l6gs4p9p8g0ai6wqg9024rp0pd13m0b9y3sy1ww5afwxb82br6";
   };
 
-  modSha256 = "1hzrin8dfsfnxpc37szc1449s235w0dr24albswz06fjnl4bbs5y";
+  goPackagePath = "github.com/jesseduffield/lazydocker";
 
   subPackages = [ "." ];
 
-- 
GitLab


From 9db2a8154c5ae4447df7ea8ca517045c65fccb62 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Sep 2019 04:32:00 -0500
Subject: [PATCH 0679/2254] vault: use buildGoPackage

---
 pkgs/tools/security/vault/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix
index 7620fc9760d..4d47e5d4134 100644
--- a/pkgs/tools/security/vault/default.nix
+++ b/pkgs/tools/security/vault/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, buildGoModule }:
+{ stdenv, fetchFromGitHub, buildGoPackage }:
 
-buildGoModule rec {
+buildGoPackage rec {
   pname = "vault";
   version = "1.2.3";
 
@@ -11,7 +11,9 @@ buildGoModule rec {
     sha256 = "11zi12j09vi6j112a1n8f7sxwp15pbh0801bzh27ihcy01hlzdf8";
   };
 
-  modSha256 = "10pr3piv6hrsc562qagpn1h5wckiziyfqraj13172hdglz3n2i7q";
+  goPackagePath = "github.com/hashicorp/vault";
+
+  subPackages = [ "." ];
 
   buildFlagsArray = [
     "-tags='vault'"
@@ -19,8 +21,8 @@ buildGoModule rec {
   ];
 
   postInstall = ''
-    mkdir -p $out/share/bash-completion/completions
-    echo "complete -C $out/bin/vault vault" > $out/share/bash-completion/completions/vault
+    mkdir -p $bin/share/bash-completion/completions
+    echo "complete -C $bin/bin/vault vault" > $bin/share/bash-completion/completions/vault
   '';
 
   meta = with stdenv.lib; {
-- 
GitLab


From d02d88febabc96c83c2cc2e825ec61f36f52d3a3 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Sep 2019 04:33:00 -0500
Subject: [PATCH 0680/2254] elfinfo: use buildGoPackage

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

diff --git a/pkgs/development/tools/misc/elfinfo/default.nix b/pkgs/development/tools/misc/elfinfo/default.nix
index cb127906c0b..b1a51a77144 100644
--- a/pkgs/development/tools/misc/elfinfo/default.nix
+++ b/pkgs/development/tools/misc/elfinfo/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
-buildGoModule rec {
+buildGoPackage rec {
   pname = "elfinfo";
   version = "0.7.6";
 
@@ -12,8 +12,6 @@ buildGoModule rec {
     sha256 = "0f6ik4d157assxdfslnyc91mg70kfh396rapikfv473znx2v2pg9";
   };
 
-  modSha256 = "1xr0pylaqcb4f4g862120cgqdxp0bpwsk77zd6g7kk91lqdcvsdf";
-
   meta = with stdenv.lib; {
     description = "Small utility for showing information about ELF files";
     homepage = https://elfinfo.roboticoverlords.org/;
-- 
GitLab


From 9e968db302ebf3b4503a70cf202ba3aebf6d2649 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Sep 2019 04:34:00 -0500
Subject: [PATCH 0681/2254] git-lfs: use buildGoPackage

---
 .../version-management/git-lfs/default.nix      | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix
index 261ae3317f2..f2d87fd69dd 100644
--- a/pkgs/applications/version-management/git-lfs/default.nix
+++ b/pkgs/applications/version-management/git-lfs/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, buildGoModule, fetchFromGitHub, fetchpatch }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
-buildGoModule rec {
+buildGoPackage rec {
   pname = "git-lfs";
   version = "2.8.0";
 
@@ -11,21 +11,12 @@ buildGoModule rec {
     sha256 = "17x9q4g1acf51bxr9lfmd2ym7w740n4ghdi0ncmma77kwabw9d3x";
   };
 
-  modSha256 = "1rjscc52rh8kxa64canw3baljllp1c639nsn89hs5b86c8v1jav7";
-
-  patches = [
-    (fetchpatch {
-      # Build fails on v2.8.0 with go 1.13 due to invalid dependency version:
-      #   go: github.com/git-lfs/go-ntlm@v0.0.0-20190307203151-c5056e7fa066: invalid pseudo-version: does not match version-control timestamp (2019-04-01T17:57:52Z)
-      # TODO: Remove once https://github.com/git-lfs/git-lfs/commit/cd83f4224ce02398bdbf8b05830d92220d9b8e01 lands in a release.
-      url = "https://github.com/git-lfs/git-lfs/commit/cd83f4224ce02398bdbf8b05830d92220d9b8e01.patch";
-      sha256 = "17nmnlkknglqhzrky5caskbscrjp7kp9b5mfqznh1jx2hbxzlpbj";
-    })
-  ];
+  goPackagePath = "github.com/git-lfs/git-lfs";
 
   subPackages = [ "." ];
 
   preBuild = ''
+    cd go/src/${goPackagePath}
     go generate ./commands
   '';
 
-- 
GitLab


From 4f297c2b6fbe354ed78f4bc68b97314dd8967152 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Sat, 21 Sep 2019 11:43:17 +0200
Subject: [PATCH 0682/2254] cask: Fix cask usage
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Without python as a dependency I only get the following error:
/usr/bin/env: ‘python’: No such file or directory
---
 pkgs/development/tools/cask/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/cask/default.nix b/pkgs/development/tools/cask/default.nix
index 8ec2552aeff..f89bd1ddf02 100644
--- a/pkgs/development/tools/cask/default.nix
+++ b/pkgs/development/tools/cask/default.nix
@@ -10,10 +10,15 @@ stdenv.mkDerivation rec {
   };
 
   doCheck = true;
+
+  nativeBuildInputs = [ emacsPackages.emacs ];
   buildInputs = with emacsPackages; [
     s f dash ansi ecukes servant ert-runner el-mock
     noflet ert-async shell-split-string git package-build
+  ] ++ [
+    python
   ];
+
   buildPhase = ''
     emacs --batch -L . -f batch-byte-compile cask.el cask-cli.el
   '';
@@ -38,11 +43,9 @@ stdenv.mkDerivation rec {
       Cask can also be used to manage dependencies for your local Emacs configuration.
     '';
 
-    homepage = https://cask.readthedocs.io/en/latest/index.html;
+    homepage = "https://cask.readthedocs.io/en/latest/index.html";
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
     maintainers = [ maintainers.flexw ];
   };
-
-  nativeBuildInputs = [ emacsPackages.emacs python ];
 }
-- 
GitLab


From 0b990ec8c5bbb773a51fbe328e69c832041141db Mon Sep 17 00:00:00 2001
From: Uri Baghin <uri@canva.com>
Date: Fri, 20 Sep 2019 19:49:32 +1000
Subject: [PATCH 0683/2254] pythonPackages.algebraic-data-types: init at 0.1.1

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

diff --git a/pkgs/development/python-modules/algebraic-data-types/default.nix b/pkgs/development/python-modules/algebraic-data-types/default.nix
new file mode 100644
index 00000000000..4b4986795ce
--- /dev/null
+++ b/pkgs/development/python-modules/algebraic-data-types/default.nix
@@ -0,0 +1,28 @@
+{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, hypothesis, mypy }:
+
+buildPythonPackage rec {
+  pname = "algebraic-data-types";
+  version = "0.1.1";
+
+  src = fetchFromGitHub {
+    owner = "jspahrsummers";
+    repo = "adt";
+    rev = "v" + version;
+    sha256 = "1py94jsgh6wch59n9dxnwvk74psbpa1679zfmripa1qfc2218kqi";
+  };
+
+  disabled = pythonOlder "3.6";
+
+  checkInputs = [
+    hypothesis
+    mypy
+  ];
+
+  meta = with lib; {
+    description = "Algebraic data types for Python";
+    homepage = https://github.com/jspahrsummers/adt;
+    license = licenses.mit;
+    maintainers = with maintainers; [ uri-canva ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8f9f0d6627c..96da4d2de5c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1277,6 +1277,8 @@ in {
 
   addic7ed-cli = callPackage ../development/python-modules/addic7ed-cli { };
 
+  algebraic-data-types = callPackage ../development/python-modules/algebraic-data-types { };
+
   altair = callPackage ../development/python-modules/altair { };
 
   vega = callPackage ../development/python-modules/vega { };
-- 
GitLab


From 3a9cb10b2b88aefc6b6c25cdf14c206be174cc11 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar@redhat.com>
Date: Sat, 21 Sep 2019 05:36:23 -0700
Subject: [PATCH 0684/2254] turses: fix python3.7 support (#61984)

---
 .../instant-messengers/turses/default.nix           | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/turses/default.nix b/pkgs/applications/networking/instant-messengers/turses/default.nix
index a3f32bc8295..780dab79e99 100644
--- a/pkgs/applications/networking/instant-messengers/turses/default.nix
+++ b/pkgs/applications/networking/instant-messengers/turses/default.nix
@@ -1,9 +1,7 @@
-{ stdenv, fetchpatch, python36Packages }:
+{ stdenv, fetchpatch, python3Packages }:
 
 with stdenv.lib;
-
-# Needs Python <3.7 for now, see https://github.com/louipc/turses/issues/4
-with python36Packages;
+with python3Packages;
 
 buildPythonPackage rec {
   pname = "turses";
@@ -14,8 +12,6 @@ buildPythonPackage rec {
     sha256 = "15mkhm3b5ka42h8qph0mhh8izfc1200v7651c62k7ldcs50ib9j6";
   };
 
-  disabled = ! python36Packages.pythonOlder "3.7";
-
   checkInputs = [ mock pytest coverage tox ];
   propagatedBuildInputs = [ urwid tweepy future ];
 
@@ -24,6 +20,11 @@ buildPythonPackage rec {
       url = "https://github.com/louipc/turses/commit/be0961b51f502d49fd9e2e5253ac130e543a31c7.patch";
       sha256 = "17s1n0275mcj03vkf3n39dmc09niwv4y7ssrfk7k3vqx22kppzg3";
     })
+    # python 3.7+ support
+    (fetchpatch {
+      url = "https://github.com/booxter/turses/commit/e6e285eae50fc3d2042a476185fe60daef1e758e.patch";
+      sha256 = "0g2zsrny955viwgs2l6gpiiz8m67b5sgdcxkjmfimfvvih5sg79f";
+    })
   ];
 
   checkPhase = ''
-- 
GitLab


From 28b8d6b1720a4e9d845e3ee8a230651d2e3413a0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 21 Sep 2019 14:53:00 +0200
Subject: [PATCH 0685/2254] postgresql: bump the attribute from PostgreSQL 9.6
 to version 11

This change affects packages that refers to postgres in order to get access to
the client code, libpq, and these packages will now be compiled supporting the
latest version.

This change does not affect NixOS, i.e. people who want to run a PostgreSQL
server. The NixOS module always refers to specific versions of 'postgres', so
if you want to use the latest version there, too, then you'll have to configure
your system appropriately in configuration.nix.

See https://github.com/NixOS/nixpkgs/pull/69194 for an effort to update the
NixOS module, too.

Fixes https://github.com/NixOS/nixpkgs/issues/69141.
---
 pkgs/top-level/all-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 30944855831..0d9ddb6919e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14994,9 +14994,9 @@ in
     postgresql_10
     postgresql_11
   ;
-  postgresql = postgresql_9_6.override { this = postgresql; };
+  postgresql = postgresql_11.override { this = postgresql; };
   postgresqlPackages = recurseIntoAttrs postgresql.pkgs;
-  postgresql11Packages = recurseIntoAttrs postgresql_11.pkgs;
+  postgresql11Packages = pkgs.postgresqlPackages;
 
   postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { };
 
-- 
GitLab


From c6e002c0fc3d813099329ecf24ff72f0110219dc Mon Sep 17 00:00:00 2001
From: Yorick <yorick@yorickvanpelt.nl>
Date: Sat, 21 Sep 2019 15:10:41 +0200
Subject: [PATCH 0686/2254] pythonPackages.license-expression: fix build

---
 pkgs/development/python-modules/license-expression/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/license-expression/default.nix b/pkgs/development/python-modules/license-expression/default.nix
index 6d52e5f5c1f..12d26cf6dd0 100644
--- a/pkgs/development/python-modules/license-expression/default.nix
+++ b/pkgs/development/python-modules/license-expression/default.nix
@@ -12,6 +12,7 @@ buildPythonPackage rec {
     rev = "v${version}";
     sha256 = "0q8sha38w7ajg7ar0rmbqrwv0n58l8yzyl96cqwcbvp578fn3ir0";
   };
+  postPatch = "patchShebangs .";
 
   propagatedBuildInputs = [ boolean-py ];
 
-- 
GitLab


From bae10449e7f5afb3319d9a6869e8035619a6dfd7 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 21 Sep 2019 10:09:20 -0400
Subject: [PATCH 0687/2254] emacsPackages: Update melpa

Via `update-melpa` script
---
 .../emacs-modes/recipes-archive-melpa.json    | 3098 ++++++++++-------
 1 file changed, 1803 insertions(+), 1295 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json
index def54a99e68..3d0011eb0f0 100644
--- a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json
+++ b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json
@@ -31,11 +31,11 @@
   "url": "https://git.sr.ht/~zge/nullpointer-emacs",
   "unstable": {
    "version": [
-    20190819,
-    1232
+    20190902,
+    929
    ],
-   "commit": "9d195764bfd1f2da7dc50ed73e70f3e5ac8610f5",
-   "sha256": "1x99ifgsxb3xn18hihral1qc6c30w824blqjhr9kpx4shh42g9f5"
+   "commit": "87efcc058f40e8a38a613cb479a2affba9f0ebe5",
+   "sha256": "0cdh64z1mass9fl05n9xn1q82ka38iar27g5dsidkfhlg6wqxmlk"
   },
   "stable": {
    "version": [
@@ -442,27 +442,27 @@
   "repo": "atilaneves/ac-dcd",
   "unstable": {
    "version": [
-    20190425,
-    907
+    20190902,
+    1124
    ],
    "deps": [
     "auto-complete",
     "flycheck-dmd-dub"
    ],
-   "commit": "9d444523ffa92a763ea8f532b8001829a51a2557",
-   "sha256": "1fkpvr7mix9wvhd6pgbcj6mrmhrffvlh5sp8wp5m48j0qc3wx7mi"
+   "commit": "d378d33c7bedc6c108eda7f674bd0aa1d8664857",
+   "sha256": "1gpqxfc83p7gzjrhs95gimwg46v9pq58m81m0fhz6slk7i005mdl"
   },
   "stable": {
    "version": [
     0,
-    4
+    6
    ],
    "deps": [
     "auto-complete",
     "flycheck-dmd-dub"
    ],
-   "commit": "4cb14b1e9fcfc4bf4a084765bc1eb10abfbbbd49",
-   "sha256": "0a3s880nswc2s6yh2v5zsmws550q917i7av8nrxc5sp1d03xqwmn"
+   "commit": "d378d33c7bedc6c108eda7f674bd0aa1d8664857",
+   "sha256": "1gpqxfc83p7gzjrhs95gimwg46v9pq58m81m0fhz6slk7i005mdl"
   }
  },
  {
@@ -1065,8 +1065,8 @@
     "auto-complete",
     "rtags"
    ],
-   "commit": "6289e66a69d0d5ff20b12da91e735d3984ad6f88",
-   "sha256": "1ggdi4mgqw1cc0w6cijds7s4vb575v27g72h6md8h1jdsfv6pvrm"
+   "commit": "3543b8404640884d901c719bb83c5474056cf97f",
+   "sha256": "1k1d3llf150rih8dba2fg7xp9ksnbfzdsj01lziqz396p34sim0f"
   },
   "stable": {
    "version": [
@@ -1411,15 +1411,15 @@
   "repo": "cute-jumper/ace-pinyin",
   "unstable": {
    "version": [
-    20190123,
-    402
+    20190917,
+    318
    ],
    "deps": [
     "avy",
     "pinyinlib"
    ],
-   "commit": "4915b2413359d85002918e322dbc90c4984b4277",
-   "sha256": "1yv3445p6w10wj310ffla2ghh81fynwgmxpsfkwgbcsbcjx9hmsl"
+   "commit": "8b2e9335b02486730ea4ceee790130cc5328f9ea",
+   "sha256": "1p2h4bva0v8yad075is1zkhn69x78ddwa8ncdfm0zzysddw5w8bq"
   },
   "stable": {
    "version": [
@@ -1564,30 +1564,32 @@
   "repo": "pauldub/activity-watch-mode",
   "unstable": {
    "version": [
-    20190423,
-    1529
+    20190916,
+    1212
    ],
    "deps": [
-    "cl",
+    "cl-lib",
     "json",
     "projectile",
     "request"
    ],
-   "commit": "c2ad321952524d88dd34842a6989b6e2d8acb646",
-   "sha256": "1fan25w5zb33i8mbd06iwz8vjac0alcv1r73h9hyzdkn8ivl6k3s"
+   "commit": "fb7e415484fa65f03660f59e2799bc2bcb9441ff",
+   "sha256": "1dzla3j6s3s5fnh8y9xq0k869fbdmzvqgbbvk6dphhzwi1wwhlzm"
   },
   "stable": {
    "version": [
     1,
-    0,
-    2
+    1,
+    0
    ],
    "deps": [
+    "cl-lib",
+    "json",
     "projectile",
     "request"
    ],
-   "commit": "27a0841b32dfd2b691a1dcf3a4a50d74660676b1",
-   "sha256": "1hfmll3g33529pshzvh2gxqr0h53p1v68wq0zlq2h2wfml89bzr9"
+   "commit": "fb7e415484fa65f03660f59e2799bc2bcb9441ff",
+   "sha256": "1dzla3j6s3s5fnh8y9xq0k869fbdmzvqgbbvk6dphhzwi1wwhlzm"
   }
  },
  {
@@ -1857,11 +1859,11 @@
   "repo": "agriggio/ahg",
   "unstable": {
    "version": [
-    20190708,
-    1358
+    20190903,
+    1349
    ],
-   "commit": "f5ffd8f592ce9038f1dd30594124ad83e2976fdf",
-   "sha256": "06k7hyvizhg8xrlckxcgsd5lmlqk2skhah4z914n21759yhzvf61"
+   "commit": "c85d951d7376425156911e5f3cd7535b4ecfbfc3",
+   "sha256": "0j5h1yjhg7lj3zxznfzy7mqj2c2r4cwdg8xik3wlk2cnm27fhgz6"
   }
  },
  {
@@ -2144,8 +2146,8 @@
     "gntp",
     "log4e"
    ],
-   "commit": "95a735e6947b0d09dbf9b9a944a21e5f5c1e6ee1",
-   "sha256": "0dqk6jnmfqhxcy4hd9a09632c9gfl7hg4vksp6p0k6wrz9yx6qsf"
+   "commit": "b5ef49bbb871867ac03d2943a720576336cd7025",
+   "sha256": "00lhx0gd1myzjfp59hjk0z44xf0cr4njvzwjdacahim7gz3hhicd"
   },
   "stable": {
    "version": [
@@ -2507,8 +2509,8 @@
   "repo": "proofit404/anaconda-mode",
   "unstable": {
    "version": [
-    20190616,
-    1019
+    20190918,
+    353
    ],
    "deps": [
     "dash",
@@ -2516,8 +2518,8 @@
     "pythonic",
     "s"
    ],
-   "commit": "24aa81ba62f13d7bb505a03fe244181c461fec68",
-   "sha256": "166szgnm8mkw4gqcn87b6k4f2s1fv2k20zc9fkwif2mr2bk88c1v"
+   "commit": "d9c5ffdd12d8e81eb4e935e6a6523af8c80f0106",
+   "sha256": "0s0166qnzrxmxida8f80j2z2spfl10qcvbmddgvqaj8mr9f898bf"
   },
   "stable": {
    "version": [
@@ -2582,20 +2584,20 @@
   "repo": "remvee/android-mode",
   "unstable": {
    "version": [
-    20190109,
-    1014
+    20190903,
+    811
    ],
-   "commit": "d60c88bfbd2dc5122bd2fde7dc11ec1e6848a5db",
-   "sha256": "1hd7wxp8f67cnbyjs4bv9x18nvzn16qjy4pi7bkbcymfpwj33r38"
+   "commit": "d5332e339a1f5e30559a53feffb8442ca79265d6",
+   "sha256": "10jhnxmxcjv9jpnsz2hrfb3rdl8306m8j30aclhvrvh4gcy1vwck"
   },
   "stable": {
    "version": [
     0,
     5,
-    1
+    2
    ],
-   "commit": "f8cabafaa266b56fcf4b3c6942b3ae062735251a",
-   "sha256": "0npx54w565mkxkgkpv02dgmfc44i1256p0w331pf3nfxq145xh27"
+   "commit": "d5332e339a1f5e30559a53feffb8442ca79265d6",
+   "sha256": "10jhnxmxcjv9jpnsz2hrfb3rdl8306m8j30aclhvrvh4gcy1vwck"
   }
  },
  {
@@ -2722,6 +2724,36 @@
    "sha256": "0ryyyihvvrcipj2bkx24cx1ibgcymnsbn79ibvmhb3wbad3hr072"
   }
  },
+ {
+  "ename": "annalist",
+  "commit": "2298cf2894029267c77a8aa06f4fa8d9d7c3e4f0",
+  "sha256": "1102yd0vas3kyml8flf3mdswnc2kizbdq996740plzwnnnbw34vj",
+  "fetcher": "github",
+  "repo": "noctuid/annalist.el",
+  "unstable": {
+   "version": [
+    20190905,
+    5
+   ],
+   "deps": [
+    "cl-lib"
+   ],
+   "commit": "8f52a365b2876f034fbf9b335786fa6bafc9ac80",
+   "sha256": "0qscah37qs65wykkw9nc5n5xgd4fy8w1jv6mznk4fbpds6qaxrjh"
+  },
+  "stable": {
+   "version": [
+    1,
+    0,
+    0
+   ],
+   "deps": [
+    "cl-lib"
+   ],
+   "commit": "0da9812e419b1687cf1e7040384f983be32d5328",
+   "sha256": "1dws8r39asjnxzjq4ixlja1ih6kphw0w666k685m7ncq9jmr6jw6"
+  }
+ },
  {
   "ename": "annotate",
   "commit": "3aae88b8e3b080501195d291012deab31aaf35f7",
@@ -2730,11 +2762,11 @@
   "repo": "bastibe/annotate.el",
   "unstable": {
    "version": [
-    20190519,
-    706
+    20190918,
+    714
    ],
-   "commit": "09d0cd89e458779ca375ac28bc664ee2e20db530",
-   "sha256": "141pqfrrzbqaxxcr6m6ri9r6k1mg5i3cv8v2kili365cypnjdg1y"
+   "commit": "cb8de5081ab4adda81806a44ba91ba70d05d4ffb",
+   "sha256": "1xxx2iafl8fkp2mmdkl6l8f7bml6g1azc746vwwxsx0yiim48jm9"
   },
   "stable": {
    "version": [
@@ -3328,8 +3360,8 @@
     20190816,
     25
    ],
-   "commit": "90aeb73bedba63ac9efb9cad8e7444feb8b40261",
-   "sha256": "0hsmjmgbsvdim1vxzh0qh41f9vmpsh8rlsy2h508ydw82rpc2q6f"
+   "commit": "32e08d5a8ad2f305578e0f783e087c1d312238c7",
+   "sha256": "00135gq4xfblv50dwxq02dd1y18xv29lrl7iir3caq4pr3nhrshg"
   }
  },
  {
@@ -3489,6 +3521,21 @@
    "sha256": "15ismdk8fl6xjgkjh9nkn8kgg7rpy2ra7924r1iddlfs2q8l8p4w"
   }
  },
+ {
+  "ename": "asx",
+  "commit": "2eda72c3574c41184104532bb129cbe0efc8afd4",
+  "sha256": "0kijqfwkwm5kd1h3v0rab9fm8ivmqnmijy065iz5xhmi3yicx4aq",
+  "fetcher": "github",
+  "repo": "ragone/asx",
+  "unstable": {
+   "version": [
+    20190916,
+    2122
+   ],
+   "commit": "903e01d2856a95427bdf7d41d9628b3886e90867",
+   "sha256": "09dv2imw5mcpw3n42hgwiw7c3wb31f74ci7hbqa5rk140rrvhf8j"
+  }
+ },
  {
   "ename": "async",
   "commit": "855ea20024b606314f8590129259747cac0bcc97",
@@ -3610,8 +3657,8 @@
   "repo": "jyp/attrap",
   "unstable": {
    "version": [
-    20190805,
-    1829
+    20190918,
+    828
    ],
    "deps": [
     "dash",
@@ -3619,8 +3666,8 @@
     "flycheck",
     "s"
    ],
-   "commit": "25d34a6c5f13ee6de5da60f3dae25d7e4961d991",
-   "sha256": "0bvymi8cfalv64a5zh1ln641qfgrdmqvsfd0d9c82xjrz19ffnpm"
+   "commit": "18cd1f7832870a36c404e872fa83a271fe8e688d",
+   "sha256": "078391949h0fgmshin8f79a1a595m06ig577rkgjqgngcp0d61l9"
   },
   "stable": {
    "version": [
@@ -4196,11 +4243,11 @@
   "repo": "mattfidler/auto-indent-mode.el",
   "unstable": {
    "version": [
-    20171222,
-    506
+    20190917,
+    1430
    ],
-   "commit": "28069360a7f89ad0286fd6a53db550752ec58488",
-   "sha256": "14sqmv320ryfljpxbjw9xphj6bz1ccjk3ih4cm1r8aryyhxiacii"
+   "commit": "e6da518d5d8c3137b4f0a437a845401e34e6f193",
+   "sha256": "09dnhjd55pdpg3vvs6ygk7lfmimdc66dx2qfz8zbcqbz49j84kxi"
   },
   "stable": {
    "version": [
@@ -4470,15 +4517,15 @@
   "repo": "Fuco1/autobookmarks",
   "unstable": {
    "version": [
-    20180531,
-    1906
+    20190919,
+    841
    ],
    "deps": [
     "cl-lib",
     "dash"
    ],
-   "commit": "e971aa49d97da9f7ed760b37e0b674e45f1c5673",
-   "sha256": "04453h3s9g7ka028s4f97z606czq3vsvphrmba533jkl8lk3hpi8"
+   "commit": "224b24950d3ae57cd16d7417c07fda337fe0ea09",
+   "sha256": "0cfx447185shbiadhbar72bgqwzmbia82f8a2py215hgw9wrgqr9"
   }
  },
  {
@@ -4583,8 +4630,8 @@
     20190331,
     2230
    ],
-   "commit": "b959376241704cabdcf10a8d0d85e8061b5c6949",
-   "sha256": "0ryh0b6fg9s954dr0gmzfbrykhj8p4m1cjmcli85nympq4xymfbq"
+   "commit": "34eb4fe7d0a3380083e2e51627ae5968524d240b",
+   "sha256": "1yh02mrqkn9hp5l1kl4qj5g1jijjvbd77dcssp76gw7nm8dlsn8a"
   }
  },
  {
@@ -4861,6 +4908,21 @@
    "sha256": "1rzfzb19h5d0ikysxi0xcbyvv733kdmcmydpc7wwq9qkb31wck56"
   }
  },
+ {
+  "ename": "awscli-capf",
+  "commit": "286c5963541f099032890c6df3bbe39648fb8684",
+  "sha256": "1mggykjjdl74rbgnw4k0q01iqdhl09q9zgp51xakgy07vpjs49w0",
+  "fetcher": "github",
+  "repo": "sebasmonia/awscli-capf",
+  "unstable": {
+   "version": [
+    20190909,
+    1534
+   ],
+   "commit": "6670b4db6bd35f0ea9ede598a9c17384046f4400",
+   "sha256": "0pnz8jiapd8i8ya2j9lns22rg903iq65pby89wpmz7cidzg6lgf0"
+  }
+ },
  {
   "ename": "axiom-environment",
   "commit": "8b4c6b03c5ff78ce327dcf66b175e266bbc53dbf",
@@ -4961,11 +5023,11 @@
   "repo": "mschuldt/backlight.el",
   "unstable": {
    "version": [
-    20190821,
-    1808
+    20190905,
+    519
    ],
-   "commit": "5a7a9b70f368fc77bac2c9c2d10dee4ad9f03987",
-   "sha256": "0sbmvyf6y73c0rw5yi6rgri29qidr1hpwqlgdass9rrzdnq5i3zg"
+   "commit": "3e5b971b4ee89299240a89614db92d2c4034e954",
+   "sha256": "0hsb1vd1mk4mcgr4l93b81hz2bq7cpd7b3kdhabv9z489mxiy3fa"
   }
  },
  {
@@ -5096,6 +5158,21 @@
    "sha256": "0qja8xw2sk2wn7w6qa5zj2i0j5c8a7cnldrag99ip2b5m02f1z4l"
   }
  },
+ {
+  "ename": "balanced-windows",
+  "commit": "2dc9c15d14d4417df74b73cde983ef4f25eda363",
+  "sha256": "0y53als0cmd4h0z1w55f4z5w6zkk7ig0ygjrzjv2khwig8hl2b8h",
+  "fetcher": "github",
+  "repo": "wbolster/emacs-balanced-windows",
+  "unstable": {
+   "version": [
+    20190903,
+    1120
+   ],
+   "commit": "1da5354ad8a9235d13928e2ee0863f3642ccdd13",
+   "sha256": "1hsjg48jlfi6lc6izp9xcfqvxj7c0ivjrfsr2q3yv3s1iy2fz37l"
+  }
+ },
  {
   "ename": "bang",
   "commit": "d9830cce42339243091f4463490954a8a955c65f",
@@ -5735,11 +5812,11 @@
   "repo": "technomancy/better-defaults",
   "unstable": {
    "version": [
-    20190224,
-    1816
+    20190917,
+    1545
    ],
-   "commit": "0937ac9a813632c48d114cf959768cda9676db3a",
-   "sha256": "0zwixak4aysj6hckg7h7qj6ha6n7fb9v66drfpgjcg4ylg500anr"
+   "commit": "01b8f00235c37bddf3e1a949e943dc0c9980863a",
+   "sha256": "0qniwfdip1ksxwx52xwsx9sgy7vfcsixsccmx877w4rlv893plah"
   },
   "stable": {
    "version": [
@@ -5947,8 +6024,8 @@
     "a",
     "pdf-tools"
    ],
-   "commit": "f2fcfc0d4e7cdb1312c5c06fd5e1820788268de3",
-   "sha256": "14rfixf6948zf5ylplzmpqr15rn1kr1qc26055kbb13klyl0qj3y"
+   "commit": "ebb2778052aeaf737adebc003957cb48cb01135e",
+   "sha256": "0qlvdpa88ic9gnb0qhijfsc9i6l3ba2zrvk4r4li3qrx0i9rpz5c"
   }
  },
  {
@@ -6095,8 +6172,8 @@
     "bind-key",
     "key-chord"
    ],
-   "commit": "1d5ffb2e0d1427066ced58febbba68c1328bf001",
-   "sha256": "1a8zpi9pkgp8qkm6qxyzaj3k1s25z3x034mgjqp2mpd7ij76mk8v"
+   "commit": "4714d73b61bdb378f6e9e3f3838cae1abbf65ea0",
+   "sha256": "19m31nh2bd7rrlh53wy1hf6sxcqk4qn4wkm5w1c16314d5w56w5s"
   },
   "stable": {
    "version": [
@@ -6122,8 +6199,8 @@
     20180513,
     430
    ],
-   "commit": "1d5ffb2e0d1427066ced58febbba68c1328bf001",
-   "sha256": "1a8zpi9pkgp8qkm6qxyzaj3k1s25z3x034mgjqp2mpd7ij76mk8v"
+   "commit": "4714d73b61bdb378f6e9e3f3838cae1abbf65ea0",
+   "sha256": "19m31nh2bd7rrlh53wy1hf6sxcqk4qn4wkm5w1c16314d5w56w5s"
   },
   "stable": {
    "version": [
@@ -6304,8 +6381,8 @@
     20161216,
     656
    ],
-   "commit": "d8b984f2541bb86eb4363a2b4c94631e49843d4a",
-   "sha256": "1jh2960yab6rhdq7ci1slpmnr43619cza0g8bfbq759yz5b7xryh"
+   "commit": "7a0d79410feb728ff5cce75c140fadc19a3f9a6d",
+   "sha256": "00hws9fbf7hy11hnicgk2q3din0z8hdq7my00aaw7b8nnb8q4g89"
   },
   "stable": {
    "version": [
@@ -6324,11 +6401,11 @@
   "repo": "proofit404/blacken",
   "unstable": {
    "version": [
-    20190521,
-    841
+    20190917,
+    535
    ],
-   "commit": "1874018ae242176d0780cdcd0109e8f9a123a914",
-   "sha256": "1zgx7j4cp51r2cdlyf744jgfpid4lz7fwwjxbm6cvcp9hv57v7wz"
+   "commit": "9daacd1211b081e76f02d4ef128d7f44c88d8fd0",
+   "sha256": "0f6ji0gs6gb6kc931yv5j6hbvb5d405xxzsbrgkivc9wxpypcfwg"
   }
  },
  {
@@ -6649,8 +6726,8 @@
   "repo": "boogie-org/boogie-friends",
   "unstable": {
    "version": [
-    20190710,
-    2300
+    20190909,
+    1432
    ],
    "deps": [
     "cl-lib",
@@ -6659,8 +6736,8 @@
     "flycheck",
     "yasnippet"
    ],
-   "commit": "a7536291e4ef1e97d369b1b76b6a31906ef5e348",
-   "sha256": "1cq2dg71lavn4xp2pmvz784ir0lqyb4hhsj2893kllvm912hw3a6"
+   "commit": "45ee305eba1cce63f89e49daef9eaeaa90e34265",
+   "sha256": "0dnmg84ynxr4vhdgrzdvrq68jrrmp9vkz0lbwhlxpljckpmfdf03"
   }
  },
  {
@@ -6695,16 +6772,16 @@
   "repo": "jyp/boon",
   "unstable": {
    "version": [
-    20190828,
-    655
+    20190918,
+    601
    ],
    "deps": [
     "dash",
     "expand-region",
     "multiple-cursors"
    ],
-   "commit": "623174d015d4ba867e4decf0fcd439b51262f0a9",
-   "sha256": "19qm2i4pba9kbaw70cdchvmv9jgs2vxnlrz9jqpcn864z3k887iw"
+   "commit": "07534c76d6bd3cd9307cc53deb59f11746f91ecc",
+   "sha256": "16rzjr52g4jn96xsa6z1acl9zipq46pg8rhcgxri43cdanwkfqin"
   },
   "stable": {
    "version": [
@@ -6728,16 +6805,16 @@
   "repo": "emacscollective/borg",
   "unstable": {
    "version": [
-    20190802,
-    2023
+    20190902,
+    1510
    ],
    "deps": [
     "dash",
     "epkg",
     "magit"
    ],
-   "commit": "b338e13e8de7bb2e0eef093fdb79fb763910c7e8",
-   "sha256": "0ydj3xs856gbm559f20zrnag5rbhy9s60qs2x5kwwdn921mdcsgj"
+   "commit": "e4a53ec687a1e2f75276c2f2c2b568266887fe10",
+   "sha256": "1s01gwnpqrkr60r0xn27231854qpqqbqphiy200x7hmkq93wzlhv"
   },
   "stable": {
    "version": [
@@ -7005,8 +7082,8 @@
     20181023,
     1222
    ],
-   "commit": "8899f4f4a7faf0080977cd137e0ad7b00c40f1e8",
-   "sha256": "0ghq8n0lnidjz5m0i2wsmdrk2nwbwh6l8imxfhkva7qpaha4jqyq"
+   "commit": "6568844b83dc916a5d6aa69960cbc85ded5f7d73",
+   "sha256": "1b76hvk87p3glrlbm8gj4w6r7y7gqa5yq8hdxq31m2swqg8h3k52"
   }
  },
  {
@@ -7595,19 +7672,19 @@
   "repo": "jorgenschaefer/emacs-buttercup",
   "unstable": {
    "version": [
-    20190828,
-    2027
+    20190906,
+    1433
    ],
-   "commit": "9d172a74373916f571f6fe3292bdc66cd3f28779",
-   "sha256": "10xm856x58zgki2d9gr4rqqlkd3f8pl24z657qa7d3lkzs2av9a2"
+   "commit": "d2b6692d58828d0e604fa259cf484296795fb2a7",
+   "sha256": "0gb3d2039m71pi8m3n3mdncifljzq8qjvdg0j5gskx4shpg6k7jh"
   },
   "stable": {
    "version": [
     1,
-    16
+    17
    ],
-   "commit": "810fa6fb8dab06610dbf2b5ccbc64b4d0ecc7485",
-   "sha256": "0dckgcyzsav6ld78bcyrrygy1cz1jvqgav6vy8f6klpmk3r8xrl1"
+   "commit": "d2b6692d58828d0e604fa259cf484296795fb2a7",
+   "sha256": "0gb3d2039m71pi8m3n3mdncifljzq8qjvdg0j5gskx4shpg6k7jh"
   }
  },
  {
@@ -8219,15 +8296,15 @@
   "repo": "kwrooijen/cargo.el",
   "unstable": {
    "version": [
-    20190816,
-    1046
+    20190902,
+    754
    ],
    "deps": [
     "markdown-mode",
     "rust-mode"
    ],
-   "commit": "f70b060c97f0df6ec6487968dfdfae8ec97a080f",
-   "sha256": "1qaz6m34j4khw27nkb8yfcy1iprcldbl7jjwzsljw1i2yfc1xqj0"
+   "commit": "39a77e48a16d69b2e841084a3dbbbd083f166a21",
+   "sha256": "0wyqqc22my842ag999hnfijycfck888z1pbm6acaa6h6cczm1ya9"
   },
   "stable": {
    "version": [
@@ -8695,15 +8772,15 @@
   "repo": "ema2159/centaur-tabs",
   "unstable": {
    "version": [
-    20190812,
-    1915
+    20190919,
+    2028
    ],
    "deps": [
     "cl-lib",
     "powerline"
    ],
-   "commit": "de3738c14b8e73e135c16e26ca405f18459fbb20",
-   "sha256": "11w5nhiaz7wrb8kgkv832xg0fmm0251wy6klxrk5gsdjh2c5qf26"
+   "commit": "90220c26cbc77b121eeb065e30f6d7a395ef131f",
+   "sha256": "1hrrsz4pbblmxyhds3253sjpk3gqb4zwjwwdl8b3shgamrhwl7y3"
   }
  },
  {
@@ -8818,8 +8895,8 @@
     20171115,
     2108
    ],
-   "commit": "35d777b0fd54b574b42cf61c202bf077ed986e8f",
-   "sha256": "1p63w0i71vsysdp05mh05pvbpmhdvbjmiv3zgfdsim9k55lbn5pz"
+   "commit": "732b7da25a22c9846aca4badecee9b6d08c54c9b",
+   "sha256": "0w4qqwjxa5v48skq7xzb57fbdgjf2il5zs7650k0gz490rh50rwj"
   },
   "stable": {
    "version": [
@@ -9457,8 +9534,8 @@
   "repo": "clojure-emacs/cider",
   "unstable": {
    "version": [
-    20190829,
-    613
+    20190920,
+    850
    ],
    "deps": [
     "clojure-mode",
@@ -9469,25 +9546,26 @@
     "sesman",
     "spinner"
    ],
-   "commit": "f350c7431330ca7cd2f01a1fddefbb637d3e3493",
-   "sha256": "0zvk6kcs1v6gfv7d48inqqa7hwn5aghhkmycn0wdiarkcdhagjmi"
+   "commit": "b2449eca413c5800b0239588c5d4345d8381eff6",
+   "sha256": "1lrmzxhny6bldzvljqgd9hih7rg62fqdxv9dk65qnsm16vncmkgv"
   },
   "stable": {
    "version": [
     0,
-    21,
-    0
+    22,
+    1
    ],
    "deps": [
     "clojure-mode",
+    "parseedn",
     "pkg-info",
     "queue",
     "seq",
     "sesman",
     "spinner"
    ],
-   "commit": "200c88adb1314b5811ba749af42ffb6817c1ca1b",
-   "sha256": "0lbrwj67fnvynkdkzvnzp3p8vqlz0ldrcs317vg60bqfhx7hvqkj"
+   "commit": "8a1262dae8f86f03fa2ec0abdbced10ff7e5ee1e",
+   "sha256": "0pjp1gcvhmbdh10w2yall9a7bbprg2z2hmmkwhqxcalsaacwfz0x"
   }
  },
  {
@@ -9720,8 +9798,8 @@
   "repo": "andras-simonyi/citeproc-el",
   "unstable": {
    "version": [
-    20190422,
-    2017
+    20190914,
+    613
    ],
    "deps": [
     "dash",
@@ -9731,8 +9809,8 @@
     "s",
     "string-inflection"
    ],
-   "commit": "abab214473b7486f662c147f1c36b2a6b4b0302d",
-   "sha256": "0x4pjmjvi53ysfz1c0l1vi8fvd49fsdmn1j9g8zdry5b2kv36siw"
+   "commit": "fd2188e5d76ca78723567ae3b369ae542402e633",
+   "sha256": "0a924bpb15259dlv8ry5bhlq61yczy31fnsbvx2lhzf9r0i06vvc"
   },
   "stable": {
    "version": [
@@ -9958,14 +10036,14 @@
   "repo": "redguardtoo/cliphist",
   "unstable": {
    "version": [
-    20181229,
-    1411
+    20190920,
+    149
    ],
    "deps": [
     "ivy"
    ],
-   "commit": "232ab0b3f6d502de61ebe76681a6a04d4223b877",
-   "sha256": "0is772r0b7i8rvra9zb94g9aczv8b6q0dmdk67wbli5rv5drfjyq"
+   "commit": "3105e5c4b4d2d0338edb6effd9329426854b80b1",
+   "sha256": "0jbn2nczhsv9adhkc6mnrmxyjbpkbqq475gry0khhqlmzm49y618"
   },
   "stable": {
    "version": [
@@ -10223,11 +10301,11 @@
   "repo": "clojure-emacs/clojure-mode",
   "unstable": {
    "version": [
-    20190725,
-    654
+    20190914,
+    1029
    ],
-   "commit": "f23eb209a8bedec95e0ad0542762bd13998ba048",
-   "sha256": "1ighmb00qxk8fzc6g2n5pg4x7l079w9wazsd8kbvk6z09lpip5cs"
+   "commit": "147bf84189ef672161b2229ddc5c35713323ad59",
+   "sha256": "1m80pabpqc1lkc5zlcalqz6r6ppslj7zqx00b1c35innhzm7dzw0"
   },
   "stable": {
    "version": [
@@ -10253,8 +10331,8 @@
    "deps": [
     "clojure-mode"
    ],
-   "commit": "f23eb209a8bedec95e0ad0542762bd13998ba048",
-   "sha256": "1ighmb00qxk8fzc6g2n5pg4x7l079w9wazsd8kbvk6z09lpip5cs"
+   "commit": "147bf84189ef672161b2229ddc5c35713323ad59",
+   "sha256": "1m80pabpqc1lkc5zlcalqz6r6ppslj7zqx00b1c35innhzm7dzw0"
   },
   "stable": {
    "version": [
@@ -10418,11 +10496,11 @@
   "repo": "vallyscode/cloud-theme",
   "unstable": {
    "version": [
-    20190826,
-    2117
+    20190901,
+    1701
    ],
-   "commit": "9422a25a1d7e73176b0c8b81cf4be1f722d6304a",
-   "sha256": "085kj8wzm21fdli0ycdj117306pc9j0a6r17w9kzy7ckzax54zc6"
+   "commit": "08090f00738809306fa156aac60d85ad6be9e672",
+   "sha256": "17a5xdn2m7gdaw71b79xs1cprh4jqgwsfgmb52gz2yaxb20hg7xy"
   }
  },
  {
@@ -10556,17 +10634,21 @@
     20190710,
     1319
    ],
-   "commit": "c0d21d763b13e280ccf7a387ba690650db014646",
-   "sha256": "072m458y9sazjmp7z0i1c3wppnwqry1lb2crf6k0v9fk3l78zknz"
+   "commit": "ebb9346490741ddc2ce6f552bc1be57dfc730cfa",
+   "sha256": "17rn81cg9df4da6jw9xnq5ldk1a58hvql9xhs59n3cc8v21v81pd"
   },
   "stable": {
    "version": [
     3,
     15,
-    2
+    3
    ],
-   "commit": "40bbe50e23c06232ccf1c49589dde5dd84e1ac31",
-   "sha256": "006ziv2imzxpq646f3vq30ylbpp84l2hf7ki0l7s521g1ikh1dy0"
+   "commit": "26a0e200e5f4abe8268235c9fdb23a2612a1b3b1",
+   "error": [
+    "exited abnormally with code 1\n",
+    "",
+    "Initialized empty Git repository in /run/user/1000/git-checkout-tmp-2hzFmDuI/cmake-26a0e20/.git/\nfatal: invalid refspec '+refs/tags/v3.15.3^{}'\nfatal: write error: No space left on device\nfatal: index-pack failed\nUnable to checkout 26a0e200e5f4abe8268235c9fdb23a2612a1b3b1 from https://gitlab.kitware.com/cmake/cmake.git.\n"
+   ]
   }
  },
  {
@@ -10680,6 +10762,21 @@
    "sha256": "1sx8grp3j7zcma3nb7zj6kijkdqx166vw1qgmm29hvx48bys6vlp"
   }
  },
+ {
+  "ename": "codcut",
+  "commit": "0fcd1c7a483dd377674a71a07fd86297f05cc83b",
+  "sha256": "1pmbsv7pzmlbkfcw4ihpi5k7pgcrwlcg1hp0wkhkii8w61dq62x6",
+  "fetcher": "github",
+  "repo": "codcut/codcut-emacs",
+  "unstable": {
+   "version": [
+    20190915,
+    1009
+   ],
+   "commit": "bf07c3db3900e36b0b87423f3b715d6378f86393",
+   "sha256": "1wraxwnhf3xmlhc0ijh1ca9xqrxzxgih4dzca34smwp7dssz3xha"
+  }
+ },
  {
   "ename": "code-archive",
   "commit": "a8d0832eff966874d90e1d5ac1043c03e96b1c25",
@@ -11051,11 +11148,11 @@
   "repo": "purcell/color-theme-sanityinc-tomorrow",
   "unstable": {
    "version": [
-    20190826,
-    1340
+    20190904,
+    520
    ],
-   "commit": "2ef60a4de1d0973e53e97cc08db4c0a510a2669f",
-   "sha256": "1f0829zipvckcgnl5kv9msdpya8q67p72rlkg0hb6z5ik095n2yq"
+   "commit": "d43905165503bc5e3bf4c658b414884f5cb434e5",
+   "sha256": "0hzy863abchc46cpig8mnn4c885df02h8m2z7m257krkv5aggmif"
   },
   "stable": {
    "version": [
@@ -11165,11 +11262,11 @@
   "repo": "cyrus-and/comb",
   "unstable": {
    "version": [
-    20180831,
-    721
+    20190918,
+    14
    ],
-   "commit": "69d59284e19428794b5c0aaa9be0e7d2770cc846",
-   "sha256": "17kcj0bkarr9biyjf1kkj4l1n9qfh6lkhwfd32qlr5k7pnwnbirb"
+   "commit": "a68fd0274592e8dcca28a337c9ee913cb84efa9b",
+   "sha256": "1n2nk8nhvfiz8dw863q91k04jrmafirdi0mj88awq9ibpw453vzz"
   },
   "stable": {
    "version": [
@@ -11437,10 +11534,10 @@
   "repo": "company-mode/company-mode",
   "unstable": {
    "version": [
-    20190821,
-    658
+    20190907,
+    1149
    ],
-   "commit": "1120b56bd1154a17e4c0b950cbdba4c85be28e2a",
+   "commit": "f6974e3103497afe01da2ad4d2ea3668ad68bc27",
    "sha256": "0pi6n1ggxb2i8x8f2wf1il8wcm6rd6ilvgbbh7ni95by1c987vbp"
   },
   "stable": {
@@ -11471,8 +11568,8 @@
     "dash",
     "s"
    ],
-   "commit": "0ab70de1740e67cee451abcf3685c7525ff9e95a",
-   "sha256": "182cijh6l82jj1r7iwd93h3np9c8fvcibjhv7860rk9ik41n7wil"
+   "commit": "2cc1c98ab6fe1d908229a1e26adccf2c10da1ecc",
+   "sha256": "162dbc5rgwvvfqirn9pkrxc0cl1lbl56xb9hg3md48hpshpnwwba"
   },
   "stable": {
    "version": [
@@ -12213,8 +12310,8 @@
     "lean-mode",
     "s"
    ],
-   "commit": "9d6b8471e2044310b4cd7cd3213b1fc8f78ec499",
-   "sha256": "0r8vfklrdw3f11cpk279jg3mnfbqm60m6klisqndkvir7vsrshni"
+   "commit": "b5ba739f68ef731c03247bf6db2708502c8ac46c",
+   "sha256": "1dx0a76l7w3ck23sdjymigk1hycqiawfwv24yz6wqyy74f1pcyjf"
   }
  },
  {
@@ -12455,8 +12552,8 @@
     "company",
     "phpactor"
    ],
-   "commit": "299347fbe3dd8617a46e874ccb8511f6705c95e4",
-   "sha256": "0g5hidr0c3f83ml1b8wnkf1blvapkivxzr26amcv5ml0v5f6icjn"
+   "commit": "a12ec67ce9de9e96c89548052ae323a277cba846",
+   "sha256": "031i5s3cv9z2d6vnwbf91291fgafcqg61km9b3z7p9bk91vbkxsy"
   },
   "stable": {
    "version": [
@@ -12539,27 +12636,27 @@
   "repo": "raxod502/prescient.el",
   "unstable": {
    "version": [
-    20190706,
-    1917
+    20190921,
+    3
    ],
    "deps": [
     "company",
     "prescient"
    ],
-   "commit": "ea8e9fea4385272924d09c91220c7f2e9ac95b3f",
-   "sha256": "1apb9v31ajq586f7mqachv238yv40gacrjmh2s8mnk45xil72swy"
+   "commit": "2f01b640e3a487718dbc481d14406005c0212ed9",
+   "sha256": "1wqk1g8fjpcbpiz32k7arnisncd4n9zs84dn3qn9y8ggjzldqy91"
   },
   "stable": {
    "version": [
     3,
-    2
+    3
    ],
    "deps": [
     "company",
     "prescient"
    ],
-   "commit": "653ca4b66954b7f1b6e4635a574234dd316c11a3",
-   "sha256": "0d60h4rfm5jcf8cf11z91wjqp0xcrviskqzyqhfliqvy2i2yl6ks"
+   "commit": "2f01b640e3a487718dbc481d14406005c0212ed9",
+   "sha256": "1wqk1g8fjpcbpiz32k7arnisncd4n9zs84dn3qn9y8ggjzldqy91"
   }
  },
  {
@@ -12703,8 +12800,8 @@
     "company",
     "rtags"
    ],
-   "commit": "6289e66a69d0d5ff20b12da91e735d3984ad6f88",
-   "sha256": "1ggdi4mgqw1cc0w6cijds7s4vb575v27g72h6md8h1jdsfv6pvrm"
+   "commit": "3543b8404640884d901c719bb83c5474056cf97f",
+   "sha256": "1k1d3llf150rih8dba2fg7xp9ksnbfzdsj01lziqz396p34sim0f"
   },
   "stable": {
    "version": [
@@ -12735,8 +12832,8 @@
     "company",
     "dash"
    ],
-   "commit": "6ae625f80d90e0779c79de38e8f83a336c1d00fa",
-   "sha256": "0da9y7x1xvaahsslcmgji6hr3cbn779i504cfrmsabbr3wmkn3fy"
+   "commit": "52f3bf26b74adc30a275f5f4290a1fc72a6876ff",
+   "sha256": "0nv8vwmqgdb33cl1wfdbmncbrpfdciid48f6w8vmw39ks53i2z32"
   },
   "stable": {
    "version": [
@@ -12888,8 +12985,8 @@
     "s",
     "unicode-escape"
    ],
-   "commit": "2cbfea20d342d1a259b27b99185c2d822aba3094",
-   "sha256": "06vndicjzm19hk5kb7sxs3ljf559wfnvql1hlpfqlhhgjhgsw17c"
+   "commit": "81b7440a7253e1753cf41932237fd64c1c1e44b6",
+   "sha256": "15nmli9drrb25d5xn31v1ja2hmc9kgpn2hjj6b2azj391yw0q4a3"
   }
  },
  {
@@ -13084,11 +13181,11 @@
   "repo": "paldepind/composable.el",
   "unstable": {
    "version": [
-    20190728,
-    1527
+    20190904,
+    701
    ],
-   "commit": "b2139cd6f4434197ae0c678091c78b72fd022fed",
-   "sha256": "043g55gzvxvdplgxz1w1gl367k0nnblmi6ifdg98gl4z4xlqfc1j"
+   "commit": "46f82d86c285ceba3e0e46adf993a98cd8816390",
+   "sha256": "14n5sckdaxx291wmj7mnsn06sprpdxf6s44hgxdksv0pvln2m0wx"
   },
   "stable": {
    "version": [
@@ -13511,27 +13608,26 @@
   "repo": "zonuexe/emacs-copyit",
   "unstable": {
    "version": [
-    20161126,
-    1229
+    20190919,
+    1258
    ],
    "deps": [
-    "cl-lib",
     "s"
    ],
-   "commit": "f50d033b129d467fb517a351adf3f16cabd82a62",
-   "sha256": "1s1ddwxgvig7skibicm9j8jii651n1v5ivfj4j6d1kkc79lpq69n"
+   "commit": "c4f2c28e5b6270e8e3364341619f1154bb4e682e",
+   "sha256": "17xqpshwc48srwljpbad7vhx3rkxqav0ygp0ff4xh7wgy21fp2mp"
   },
   "stable": {
    "version": [
     0,
-    0,
-    2
+    1,
+    0
    ],
    "deps": [
-    "cl-lib"
+    "s"
    ],
-   "commit": "c973d3650208a033aaf845989d023f9c6e572ddd",
-   "sha256": "1fwndjbzwhl4dzrw5jxbq66yggxkl81ga3cnnl7rm3s63pkb6l3w"
+   "commit": "c4f2c28e5b6270e8e3364341619f1154bb4e682e",
+   "sha256": "17xqpshwc48srwljpbad7vhx3rkxqav0ygp0ff4xh7wgy21fp2mp"
   }
  },
  {
@@ -13542,28 +13638,28 @@
   "repo": "zonuexe/emacs-copyit",
   "unstable": {
    "version": [
-    20160624,
-    2028
+    20190919,
+    1258
    ],
    "deps": [
     "copyit",
     "pandoc"
    ],
-   "commit": "f50d033b129d467fb517a351adf3f16cabd82a62",
-   "sha256": "1s1ddwxgvig7skibicm9j8jii651n1v5ivfj4j6d1kkc79lpq69n"
+   "commit": "c4f2c28e5b6270e8e3364341619f1154bb4e682e",
+   "sha256": "17xqpshwc48srwljpbad7vhx3rkxqav0ygp0ff4xh7wgy21fp2mp"
   },
   "stable": {
    "version": [
     0,
-    0,
-    2
+    1,
+    0
    ],
    "deps": [
     "copyit",
     "pandoc"
    ],
-   "commit": "c973d3650208a033aaf845989d023f9c6e572ddd",
-   "sha256": "1fwndjbzwhl4dzrw5jxbq66yggxkl81ga3cnnl7rm3s63pkb6l3w"
+   "commit": "c4f2c28e5b6270e8e3364341619f1154bb4e682e",
+   "sha256": "17xqpshwc48srwljpbad7vhx3rkxqav0ygp0ff4xh7wgy21fp2mp"
   }
  },
  {
@@ -13818,15 +13914,15 @@
   "repo": "FelipeLema/emacs-counsel-gtags",
   "unstable": {
    "version": [
-    20190422,
-    1501
+    20190909,
+    1740
    ],
    "deps": [
     "counsel",
     "seq"
    ],
-   "commit": "3ebfd4159856e9dbd9531b2a43410f72175a90bb",
-   "sha256": "08n11nvf7p6clmha8r50r2fzp9f4nmrcm8j6byvn99vazdvych7p"
+   "commit": "13d4aed6d70d96b86f55ffa38e60540c14ef0ce3",
+   "sha256": "11nhmy2si0z7ppkmyq3fk9mfwbnsk9m9k6mdd6dc9x6r560f3hyj"
   },
   "stable": {
    "version": [
@@ -14806,19 +14902,19 @@
   "repo": "maurooaranda/ctune",
   "unstable": {
    "version": [
-    20190709,
-    1309
+    20190914,
+    1305
    ],
-   "commit": "ae298d617237c65ddebc52d236230be11fd4126d",
-   "sha256": "1w6rljq4aqr7m9j18s7zaw7alllxmk819938pzmgl9pkjscmva0k"
+   "commit": "d7643461f5aa33cc04e4d808123e4ed1d85500ee",
+   "sha256": "03gby644xqah7q9sjba9w6c7askc1s7ka4bx814x6vrlla6089h4"
   },
   "stable": {
    "version": [
     0,
-    1
+    2
    ],
-   "commit": "5633024d14957cd6eff03574b2044bb8e9b55710",
-   "sha256": "1gxhjgh4rs1gnva3a33wr2si594r4qywv20087hfbjlgli7114n0"
+   "commit": "d7643461f5aa33cc04e4d808123e4ed1d85500ee",
+   "sha256": "03gby644xqah7q9sjba9w6c7askc1s7ka4bx814x6vrlla6089h4"
   }
  },
  {
@@ -15131,8 +15227,8 @@
     20190111,
     2150
    ],
-   "commit": "00c1dc96af0e44741dc777f96a2eb5769f572bb3",
-   "sha256": "0hkh3844kaawhqh90cqpskh9ifm6cs6i3d2bwkbrrjrkyig9qp38"
+   "commit": "7e233ab00e117b2e7165c246941ac85a989be262",
+   "sha256": "1189hi8vp2albpvfz5b66327qizzkzkg9p9b6l8157jsm6a03y7p"
   },
   "stable": {
    "version": [
@@ -15339,8 +15435,8 @@
   "repo": "emacs-lsp/dap-mode",
   "unstable": {
    "version": [
-    20190823,
-    1240
+    20190917,
+    548
    ],
    "deps": [
     "bui",
@@ -15351,8 +15447,8 @@
     "s",
     "tree-mode"
    ],
-   "commit": "368a0ac922d03b6ad0d2d782823ef30b3072866a",
-   "sha256": "0zml4kskwz01myki3acbfrfqzgwyw1bsvppijmfi4d24jk04lydk"
+   "commit": "2e0f7dd70656aad5a70ce2b4f5375870084a02f3",
+   "sha256": "0hckyrv470j8zx5sr24h16fa9a3fxa8i7iwywxs15wwrwl6mqh9m"
   },
   "stable": {
    "version": [
@@ -15604,11 +15700,11 @@
   "repo": "magnars/dash.el",
   "unstable": {
    "version": [
-    20190814,
-    2006
+    20190920,
+    1035
    ],
-   "commit": "11907f4592ff1813536366d54245d3ecf6b99198",
-   "sha256": "0lzy7r5wvr1b4m3wg03l3q90wga8gl6j4gbmw66kq8pg8zg1rvqr"
+   "commit": "a743ae3da1d5869434c6f262bbe45ef30d87cb9c",
+   "sha256": "1ggd88i11dnvl8yxrzv41l66rj25zi66v82jsc0mb3fgh921hx7i"
   },
   "stable": {
    "version": [
@@ -15683,8 +15779,8 @@
    "deps": [
     "dash"
    ],
-   "commit": "11907f4592ff1813536366d54245d3ecf6b99198",
-   "sha256": "0lzy7r5wvr1b4m3wg03l3q90wga8gl6j4gbmw66kq8pg8zg1rvqr"
+   "commit": "a743ae3da1d5869434c6f262bbe45ef30d87cb9c",
+   "sha256": "1ggd88i11dnvl8yxrzv41l66rj25zi66v82jsc0mb3fgh921hx7i"
   },
   "stable": {
    "version": [
@@ -16554,14 +16650,14 @@
   "repo": "psibi/dhall-mode",
   "unstable": {
    "version": [
-    20190526,
-    2113
+    20190919,
+    2242
    ],
    "deps": [
     "reformatter"
    ],
-   "commit": "1b71e8e7123647761d8f35916c06b7280b2929ea",
-   "sha256": "12xpzaby75fczxj885ij9wgrc9pn05mg5s7abgfr1irvkq7s467n"
+   "commit": "57001a69917329e7933d80a7e21116fe11255ae7",
+   "sha256": "039lgmap36iawvw89jhkq25j9h2r9qb8s3612j5xhyzbbrg6q0pl"
   }
  },
  {
@@ -18011,6 +18107,21 @@
    "sha256": "0r560bpgw5p2pfcgkgcrlpp1bprv1f23dl4y5fjk06dg93fgaysa"
   }
  },
+ {
+  "ename": "dispwatch",
+  "commit": "580cee72ac9871f8f256069b371f7fb66367a048",
+  "sha256": "1cq5lbh3r9jjwixn2q30gryy4j4l8jb70nkhsjbaln1c3jdwrf9p",
+  "fetcher": "github",
+  "repo": "mnp/dispwatch",
+  "unstable": {
+   "version": [
+    20190903,
+    356
+   ],
+   "commit": "04e7ecb52636e27a8e2e670c6e8977c12ed989e6",
+   "sha256": "0yv4gl86z9wx81n1hadha01iqcinp2c3414hg5iypv2j7n129kri"
+  }
+ },
  {
   "ename": "dist-file-mode",
   "commit": "dd10fbed2810a642600dba9dfe320fa6299e6d34",
@@ -18358,14 +18469,14 @@
   "repo": "lujun9972/el-dmenu",
   "unstable": {
    "version": [
-    20190706,
-    951
+    20190908,
+    44
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "93c09c04441ad96902ba2aab2bdb556f7e34a53b",
-   "sha256": "0dm9z05980l7z2k4p0j5n6f4sis1va5am3hk1zsaa9z7fvhpbci3"
+   "commit": "e8cc9b27c79d3ecc252267c082ab8e9c82eab264",
+   "sha256": "098ncygms1r33zhjlq4fj2p4jc91v5whqrm3fazzdk7sd6dilf25"
   }
  },
  {
@@ -18703,30 +18814,30 @@
   "repo": "seagle0128/doom-modeline",
   "unstable": {
    "version": [
-    20190830,
-    1605
+    20190918,
+    1510
    ],
    "deps": [
     "all-the-icons",
     "dash",
     "shrink-path"
    ],
-   "commit": "b433d87f428061cc7477b444b7dc9101e575095d",
-   "sha256": "0k0kdr7alxwz0zf14zz92zhacza8izzc38117x4zcixx3yrsspnx"
+   "commit": "2690aa27892380b4e857efee4b7a76ff3a87e538",
+   "sha256": "020zwg15ww40mss7ndc56hji16rmpllab3rkm0k6z79h9jmmc01c"
   },
   "stable": {
    "version": [
     2,
-    5,
-    0
+    6,
+    1
    ],
    "deps": [
     "all-the-icons",
     "dash",
     "shrink-path"
    ],
-   "commit": "eb3258b50399ae7a2ed2edea797238a21352ea22",
-   "sha256": "1xx2zjksh93z6px89w4grycry9m8vh864m0p471q0g77r16z2prn"
+   "commit": "b117f2e86920c0bb3a61ce64c59a6f5db05a11e9",
+   "sha256": "1lzw3nfqrymrgc9vhd5zzffjy79sdfiihx3mphp5hny8f1nw912g"
   }
  },
  {
@@ -18737,14 +18848,14 @@
   "repo": "hlissner/emacs-doom-themes",
   "unstable": {
    "version": [
-    20190821,
-    2117
+    20190904,
+    2252
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "470dd52ec4761a0b2c1f2c0309233e1fba04e598",
-   "sha256": "1wj9f7rxr2330fqgwsaqhz5mp1247a1x3a7zr6jdnr6h819ji74p"
+   "commit": "1159463956223ae53df421bcd796e94610759c42",
+   "sha256": "0jacmhqvvsqy5w7zxsr5nxka1pxysz74zkv5lfvbqkay59asn95z"
   },
   "stable": {
    "version": [
@@ -19096,15 +19207,16 @@
   "repo": "pavpanchekha/dropbox.el",
   "unstable": {
    "version": [
-    20190714,
-    1721
+    20190918,
+    1629
    ],
    "deps": [
     "json",
-    "oauth"
+    "oauth",
+    "request"
    ],
-   "commit": "2a143087aff0a69a8ff4df40f87335501945346e",
-   "sha256": "0xf6lsrrv4n9acbglhccikv5lrgfqmkqvz7bbw91rmwx5wvjs1f7"
+   "commit": "5e0c954a6b819fd3a22b463cce3825984f9ef691",
+   "sha256": "0z1iw5rzdgipqhx4bvshjbrqqr3wyqy75frwmz34g7s6vll1ip0a"
   }
  },
  {
@@ -19302,8 +19414,8 @@
   "repo": "jacktasia/dumb-jump",
   "unstable": {
    "version": [
-    20190804,
-    533
+    20190920,
+    1531
    ],
    "deps": [
     "dash",
@@ -19311,14 +19423,14 @@
     "popup",
     "s"
    ],
-   "commit": "7ffa63cdc8481158a2dbfe4acc6719ebe7fff056",
-   "sha256": "1l682xjish7v8mdkfdjqbdz464hnif15xlyrq8il6pgcq12g2hl6"
+   "commit": "56e955b9c3619616c176e311f1b67811548ad4af",
+   "sha256": "01n4nv8f0zsfhzg7xqbv3zjvwdxk7nyq2h50gckm8mlx86f30kwj"
   },
   "stable": {
    "version": [
     0,
     5,
-    2
+    3
    ],
    "deps": [
     "dash",
@@ -19326,8 +19438,8 @@
     "popup",
     "s"
    ],
-   "commit": "260054500d4731c36574b6cbc519de29fdd22f43",
-   "sha256": "00ph85vp8sa3k99qrdxfz4l8zx121q9xf47vvspzg26bk9l4nwin"
+   "commit": "0319569f1332641057c3e23d1e3bffb2404435a8",
+   "sha256": "1njf60264snhxrd36m4z687lqfkis0p9mmrr7cf1c8l0lfdvawxi"
   }
  },
  {
@@ -19353,11 +19465,11 @@
   "repo": "ocaml/dune",
   "unstable": {
    "version": [
-    20190808,
-    345
+    20190911,
+    1607
    ],
-   "commit": "823a3c66d11b30333f511c03348bd4714e736f46",
-   "sha256": "1fdca3rk599xfq02cihk30p29v4ng3hn3dvdzq5l90kfigpanaz9"
+   "commit": "2aac0728daa65780df9187a409a1c166ff9ab6bf",
+   "sha256": "0y4zqmwrzabz1hcpn7wads7z7gacr3ry25pi8i0fka69hz3h4s9k"
   },
   "stable": {
    "version": [
@@ -19425,11 +19537,11 @@
   "repo": "dylan-lang/dylan-mode",
   "unstable": {
    "version": [
-    20190109,
-    300
+    20190831,
+    1910
    ],
-   "commit": "9a6ad5ff83f2dfc25ce3deee9d3ef71ed53964b5",
-   "sha256": "1d6krgiabkrj3mryaz79vmiqy0vkr5s8ji34yjd14v73ikzwxwkp"
+   "commit": "4801b7adcc984edfffa3f951e2c35329fae2b6e4",
+   "sha256": "1xm27fc98rj8fsfm9na1x3d7zgp8fkxf782ajvirzbbq5nj0lyma"
   }
  },
  {
@@ -20025,14 +20137,14 @@
   "repo": "joostkremers/ebib",
   "unstable": {
    "version": [
-    20190718,
-    2011
+    20190914,
+    753
    ],
    "deps": [
     "parsebib"
    ],
-   "commit": "603451582c3471c90fbf795baa2f53043ce5ddb0",
-   "sha256": "01s1aghyc83372nkccjfx3yn65hqx5hrxbsj1dcbb6z1y5aqbwdj"
+   "commit": "8b2019c4f25a80dfeddaa6d1e82c668a52ffba8d",
+   "sha256": "0r8lqa120kqxqaa465lm03rbakpq19dr7pmjp0gbgcbgm3r9pvn6"
   },
   "stable": {
    "version": [
@@ -20878,15 +20990,15 @@
   "repo": "joaotavora/eglot",
   "unstable": {
    "version": [
-    20190819,
-    9
+    20190910,
+    1347
    ],
    "deps": [
     "flymake",
     "jsonrpc"
    ],
-   "commit": "7a70c977fdb6a16182d375993edd528653a2cb5d",
-   "sha256": "0s48k733nyk21h22c98ckch0kcki3snn1dw5ymqx2n9gl0w18gkh"
+   "commit": "28ecd5df456fec6113751bd52816095e0be3e651",
+   "sha256": "1k2l77srl5j904x33sz7davfk1gmncpi87gj8yiavnyxml9snpcf"
   },
   "stable": {
    "version": [
@@ -21059,8 +21171,8 @@
   "repo": "kostafey/ejc-sql",
   "unstable": {
    "version": [
-    20190828,
-    919
+    20190914,
+    1925
    ],
    "deps": [
     "auto-complete",
@@ -21069,8 +21181,8 @@
     "direx",
     "spinner"
    ],
-   "commit": "5a2b3580e362841f51d262eeeeaa396fcceb4fe9",
-   "sha256": "1xgppkabl2lwfqrgylab25v4pqfkhfxy780hlmsys1yha2r1167l"
+   "commit": "a1e4d7c31c11f7c124c58408cebeb77e473fc535",
+   "sha256": "1zjx5n1gj0lvxzf47vv8bv87kbz1p6vnbgw31h3aarsdx0c09m3a"
   },
   "stable": {
    "version": [
@@ -21153,8 +21265,8 @@
     20181006,
     225
    ],
-   "commit": "e8bdc7be1a61faf61787d4a3c0b80dafc37d2ef4",
-   "sha256": "09mb43cdl711dva0hv7jln35nz0r4q0m6r3zbv563s8wnqpza7ig"
+   "commit": "156d1a0bbbf330b3f274b0afb7a8366d7f04b8c7",
+   "sha256": "1mm4xphk9h8p9f3pl4brqyksk3lmnw4cr78j933p28qcmgk8sr7w"
   },
   "stable": {
    "version": [
@@ -21725,11 +21837,11 @@
   "repo": "skeeto/elfeed",
   "unstable": {
    "version": [
-    20190824,
-    1213
+    20190903,
+    1137
    ],
-   "commit": "63b26ee83fd58afdf8f0b3d2c04cdc9cd956772c",
-   "sha256": "0m0a35210pb4yf6m8mzaq6nkl9x6fphjjqyl3dzygnmmzxkc8aw2"
+   "commit": "69b0320156cbf7e395efa670464d4651f708332f",
+   "sha256": "1nkd1ll8fjnnkqqz6x4yr7lij6kknh4mh30qf3g4kzg5gmwhbx6q"
   },
   "stable": {
    "version": [
@@ -21826,15 +21938,15 @@
   "repo": "skeeto/elfeed",
   "unstable": {
    "version": [
-    20190824,
-    1213
+    20190906,
+    2012
    ],
    "deps": [
     "elfeed",
     "simple-httpd"
    ],
-   "commit": "63b26ee83fd58afdf8f0b3d2c04cdc9cd956772c",
-   "sha256": "0m0a35210pb4yf6m8mzaq6nkl9x6fphjjqyl3dzygnmmzxkc8aw2"
+   "commit": "69b0320156cbf7e395efa670464d4651f708332f",
+   "sha256": "1nkd1ll8fjnnkqqz6x4yr7lij6kknh4mh30qf3g4kzg5gmwhbx6q"
   },
   "stable": {
    "version": [
@@ -21858,14 +21970,14 @@
   "repo": "TobiasZawada/elgrep",
   "unstable": {
    "version": [
-    20190729,
-    811
+    20190917,
+    2320
    ],
    "deps": [
     "async"
    ],
-   "commit": "7a4e8f3c99c8a50b92881f0bf0f29a3cd6098324",
-   "sha256": "0v6f91y43q4hfd4rhwgwh5wqw2hmzdf1rc4rkngg1qh554ml5glz"
+   "commit": "c644ed57337fdf117de5b7e342c2623d4f17e8f7",
+   "sha256": "1j757kclw54y3cn839jjdsbkydf3sc0bjkkii50gvy65kp46fqhp"
   },
   "stable": {
    "version": [
@@ -22106,14 +22218,14 @@
   "repo": "elixir-editors/emacs-elixir",
   "unstable": {
    "version": [
-    20190422,
-    155
+    20190831,
+    2225
    ],
    "deps": [
     "pkg-info"
    ],
-   "commit": "694d133e847e9a6db6abd1c19850cec6d867ccce",
-   "sha256": "0fl3i8cxnrn70l68328jyhabgccmqbislkgp4k4ih5yll3plz31n"
+   "commit": "5c50dcedd890f14e0ede33b74ddf86607b037239",
+   "sha256": "0hi8ly4jplhlh4mrmwlhz44w50ccjbc4w12jkacjc82gay8m8yfa"
   },
   "stable": {
    "version": [
@@ -22166,15 +22278,15 @@
   "repo": "walseb/ellocate",
   "unstable": {
    "version": [
-    20190819,
-    211
+    20190920,
+    1407
    ],
    "deps": [
     "f",
     "s"
    ],
-   "commit": "f5b222777d063d8ba3c851dcd9a132d6f74fbe08",
-   "sha256": "18cxqsxsgks7s31gmx9azsv26wdb979d24ypy44rhrwc5r4yk292"
+   "commit": "798c40de09ebfff40fd1aa5b996bd8390f803bdf",
+   "sha256": "1z1g1v3q5zdljkdziv8jnyjm2n4jxdfbds1qqwddlaz143b4h5zb"
   }
  },
  {
@@ -22467,20 +22579,20 @@
   "repo": "tgvaughan/elpher",
   "unstable": {
    "version": [
-    20190816,
-    1414
+    20190920,
+    1533
    ],
-   "commit": "40ec805063c480dfdc01c8328be12f7c8f823c9c",
-   "sha256": "0g36b7pil5vihwx2v55ga82k9l31wl3w0ba0s3af27wh058zz7bq"
+   "commit": "e2d59f11515f2879bdc2675528b74fbb9b802bea",
+   "sha256": "1ghjz22vyidgss430y6w4znvx135b0avdmk7hh7mx4vbnq0m1j07"
   },
   "stable": {
    "version": [
-    1,
-    4,
-    7
+    2,
+    3,
+    5
    ],
-   "commit": "e5471b9460610b3c3af3842c6ac009bcbf70ecac",
-   "sha256": "1sf91x2spk7nkpnn7ss2vkjfzvxw83z3pw7nyvra45gvq11vmy3c"
+   "commit": "c0ff9d26c2e5cf62ade93852e7eb8a0f081bf028",
+   "sha256": "0khgplpwm7dzsxfh43i1lgwrwskmyxaz9qcgzs0vx9c4vm8c1byk"
   }
  },
  {
@@ -22506,8 +22618,8 @@
   "repo": "jorgenschaefer/elpy",
   "unstable": {
    "version": [
-    20190725,
-    2259
+    20190913,
+    936
    ],
    "deps": [
     "company",
@@ -22517,14 +22629,14 @@
     "s",
     "yasnippet"
    ],
-   "commit": "7acdd14eaec4b123ae1c16ead59c91adcf7f9775",
-   "sha256": "182zs3b7s0n4wsz0k1wybmd3fa4x9m7q5j8n7jpbwa3m0v3vvyk7"
+   "commit": "370dd4ced755b668ce2d7c91f742cd09337d98c4",
+   "sha256": "0zji9p62wyan9z7l01q54j06xdscy27ll3c1mnlfxvb7n3v5xdya"
   },
   "stable": {
    "version": [
     1,
-    29,
-    1
+    31,
+    0
    ],
    "deps": [
     "company",
@@ -22534,8 +22646,8 @@
     "s",
     "yasnippet"
    ],
-   "commit": "d98ee26f564e33c9acf233862734e72200bd3703",
-   "sha256": "19sd5p03rkp5yibq1ilwisq8jlma02ks2kdc3swy6r27n4hy90xf"
+   "commit": "54ed6fe219689e187286c8808041b6f61718b025",
+   "sha256": "0bvmgqs3c80bhs9v5ymgadv7vk4iamha10y7rl09pixmjm4mzagk"
   }
  },
  {
@@ -22821,11 +22933,11 @@
   "repo": "emacscollective/elx",
   "unstable": {
    "version": [
-    20190710,
-    1415
+    20190904,
+    1331
    ],
-   "commit": "457fca9d4bb0429b08c8f4e675f8b1f3e48297e3",
-   "sha256": "0vpvdnmg95nk9bmrjysbpfwbyzxhipdqh9xfphxi2n63sd0vzk7z"
+   "commit": "aec740bb4453a8b671beccd31a583225fb2eb104",
+   "sha256": "144mh3klxqv70qz5qksj5dzgcczc6wwscwwi2mx07x6s3vbgmfal"
   },
   "stable": {
    "version": [
@@ -22898,20 +23010,20 @@
   "repo": "knu/emacsc",
   "unstable": {
    "version": [
-    20161028,
-    1706
+    20190917,
+    1102
    ],
-   "commit": "421e0c567358769e32f670ae8e949d99abae0c28",
-   "sha256": "0zmb1qdbdlrycari1r1g65c9px357wz4f2gvmcacg83504mmf3d8"
+   "commit": "57940b93881efabb375df18093b99800bfb5d5f7",
+   "sha256": "032g44dad90cas2b80cxhzbim2sxd8rliyxf65ccfrqi1xg3vkff"
   },
   "stable": {
    "version": [
     1,
-    2,
-    20131027
+    3,
+    20190917
    ],
-   "commit": "69607bdc3a0c070e924a3bcac93180f917992368",
-   "sha256": "1r6cpb7fck5znb7q7zrxcsjn7d3xiqhq8dp1ar1rsd6k4h05by4j"
+   "commit": "57940b93881efabb375df18093b99800bfb5d5f7",
+   "sha256": "032g44dad90cas2b80cxhzbim2sxd8rliyxf65ccfrqi1xg3vkff"
   }
  },
  {
@@ -23284,14 +23396,14 @@
   "url": "https://git.savannah.gnu.org/git/emms.git",
   "unstable": {
    "version": [
-    20190827,
-    1610
+    20190905,
+    2111
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "f209b44c76f4a8532783909384ae7492b8d9b6e7",
-   "sha256": "1m68vpsbkcmnlj35h31qikifvah8b9gazwk5yv4wafabpg3bdav2"
+   "commit": "2bad5e6cf7442cff492cafe896c47719ae77b8fb",
+   "sha256": "1bxaa1mzx5l1pp16j14y66cywpr174y6q7rhk5qr60lfjjfgj3h6"
   },
   "stable": {
    "version": [
@@ -24601,17 +24713,24 @@
     20190404,
     928
    ],
-   "commit": "a56c1dc1fb996040ab192b0c96dc32e5ebf47a06",
-   "sha256": "1dm7l2kizbg3d878b16hca5qyfaf2yvskhwlc3h2kldchw4xgrby"
+   "commit": "70a3e70ce4fec9e5d79929aa28aecf4a81980322",
+   "error": [
+    "exited abnormally with code 1\n",
+    "",
+    "unpacking...\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping1P12subsubCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping1P12subsubCAIPM5CRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping1P1CACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping1P1subCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping1P1subsubCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping5CACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping5subCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping5subsubCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping5subsubsubCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/keyUsageCriticalcRLSignFalseCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/keyUsageCriticalkeyCertSignFalseCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/keyUsageNotCriticalCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/keyUsageNotCriticalcRLSignFalseCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/keyUsageNotCriticalkeyCertSignFalseCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDN1CACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDN1subCA1CRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDN1subCA2CRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDN1subCA3CRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDN2CACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDN3CACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDN3subCA1CRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDN3subCA2CRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDN4CACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDN5CACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDNS1CACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDNS2CACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsRFC822CA1CRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsRFC822CA2CRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsRFC822CA3CRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsURI1CACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsURI2CACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlyContainsAttributeCertsCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlyContainsCACertsCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlyContainsUserCertsCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlySomeReasonsCA1compromiseCRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlySomeReasonsCA1otherreasonsCRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlySomeReasonsCA2CRL1.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlySomeReasonsCA2CRL2.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlySomeReasonsCA3compromiseCRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlySomeReasonsCA3otherreasonsCRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlySomeReasonsCA4compromiseCRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlySomeReasonsCA4otherreasonsCRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint0CACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint0subCA2CRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint0subCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint1CACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint1subCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint6CACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint6subCA0CRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint6subCA1CRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint6subCA4CRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint6subsubCA00CRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint6subsubCA11CRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint6subsubCA41CRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint6subsubsubCA11XCRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint6subsubsubCA41XCRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/pre2000CRLnextUpdateCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy0CACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy0subCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy0subsubCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy0subsubsubCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy10CACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy10subCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy10subsubCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy10subsubsubCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy2CACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy2subCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy4CACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy4subCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy4subsubCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy4subsubsubCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy5CACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy5subCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy5subsubCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy5subsubsubCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy7CACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy7subCARE2CRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy7subsubCARE2RE4CRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy7subsubsubCARE2RE4CRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/AllCertificatesNoPoliciesTest2EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/AllCertificatesSamePoliciesTest10EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/AllCertificatesSamePoliciesTest13EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/AllCertificatesanyPolicyTest11EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/AnyPolicyTest14EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/BadCRLIssuerNameCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/BadCRLSignatureCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/BadSignedCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/BadnotAfterDateCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/BadnotBeforeDateCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/BasicSelfIssuedCRLSigningKeyCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/BasicSelfIssuedCRLSigningKeyCRLCert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/BasicSelfIssuedNewKeyCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/BasicSelfIssuedNewKeyOldWithNewCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/BasicSelfIssuedOldKeyCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/BasicSelfIssuedOldKeyNewWithOldCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/CPSPointerQualifierTest20EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/DSACACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/DSAParametersInheritedCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/DifferentPoliciesTest12EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/DifferentPoliciesTest3EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/DifferentPoliciesTest4EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/DifferentPoliciesTest5EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/DifferentPoliciesTest7EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/DifferentPoliciesTest8EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/DifferentPoliciesTest9EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/GeneralizedTimeCRLnextUpdateCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/GoodCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/GoodsubCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/GoodsubCAPanyPolicyMapping1to2CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidBadCRLIssuerNameTest5EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidBadCRLSignatureTest4EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidBasicSelfIssuedCRLSigningKeyTest7EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidBasicSelfIssuedCRLSigningKeyTest8EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidBasicSelfIssuedNewWithOldTest5EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidBasicSelfIssuedOldWithNewTest2EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidCASignatureTest2EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidCAnotAfterDateTest5EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidCAnotBeforeDateTest1EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidDNSnameConstraintsTest31EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidDNSnameConstraintsTest33EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidDNSnameConstraintsTest38EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidDNandRFC822nameConstraintsTest28EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidDNandRFC822nameConstraintsTest29EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidDNnameConstraintsTest10EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidDNnameConstraintsTest12EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidDNnameConstraintsTest13EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidDNnameConstraintsTest15EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidDNnameConstraintsTest16EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidDNnameConstraintsTest17EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidDNnameConstraintsTest20EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidDNnameConstraintsTest2EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidDNnameConstraintsTest3EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidDNnameConstraintsTest7EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidDNnameConstraintsTest8EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidDNnameConstraintsTest9EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidDSASignatureTest6EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidEESignatureTest3EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidEEnotAfterDateTest6EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidEEnotBeforeDateTest2EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidIDPwithindirectCRLTest23EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidIDPwithindirectCRLTest26EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidLongSerialNumberTest18EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidMappingFromanyPolicyTest7EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidMappingToanyPolicyTest8EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidMissingCRLTest1EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidMissingbasicConstraintsTest1EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidNameChainingOrderTest2EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidNameChainingTest1EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidNegativeSerialNumberTest15EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidOldCRLnextUpdateTest11EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidPolicyMappingTest10EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidPolicyMappingTest2EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidPolicyMappingTest4EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidRFC822nameConstraintsTest22EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidRFC822nameConstraintsTest24EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidRFC822nameConstraintsTest26EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidRevokedCATest2EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidRevokedEETest3EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidSelfIssuedinhibitAnyPolicyTest10EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidSelfIssuedinhibitAnyPolicyTest8EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidSelfIssuedinhibitPolicyMappingTest10EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidSelfIssuedinhibitPolicyMappingTest11EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidSelfIssuedinhibitPolicyMappingTest8EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidSelfIssuedinhibitPolicyMappingTest9EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidSelfIssuedpathLenConstraintTest16EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidSelfIssuedrequireExplicitPolicyTest7EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidSelfIssuedrequireExplicitPolicyTest8EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidSeparateCertificateandCRLKeysTest20EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidSeparateCertificateandCRLKeysTest21EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidURInameConstraintsTest35EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidURInameConstraintsTest37EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidUnknownCRLEntryExtensionTest8EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidUnknownCRLExtensionTest10EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidUnknownCRLExtensionTest9EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidUnknownCriticalCertificateExtensionTest2EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidWrongCRLTest6EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidcAFalseTest2EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidcAFalseTest3EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidcRLIssuerTest27EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidcRLIssuerTest31EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidcRLIssuerTest32EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidcRLIssuerTest34EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidcRLIssuerTest35EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvaliddeltaCRLIndicatorNoBaseTest1EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvaliddeltaCRLTest10EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvaliddeltaCRLTest3EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvaliddeltaCRLTest4EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvaliddeltaCRLTest6EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvaliddeltaCRLTest9EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvaliddistributionPointTest2EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvaliddistributionPointTest3EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvaliddistributionPointTest6EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvaliddistributionPointTest8EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvaliddistributionPointTest9EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidinhibitAnyPolicyTest1EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidinhibitAnyPolicyTest4EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidinhibitAnyPolicyTest5EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidinhibitAnyPolicyTest6EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidinhibitPolicyMappingTest1EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidinhibitPolicyMappingTest3EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidinhibitPolicyMappingTest5EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidinhibitPolicyMappingTest6EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidkeyUsageCriticalcRLSignFalseTest4EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidkeyUsageCriticalkeyCertSignFalseTest1EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidkeyUsageNotCriticalcRLSignFalseTest5EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidkeyUsageNotCriticalkeyCertSignFalseTest2EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidonlyContainsAttributeCertsTest14EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidonlyContainsCACertsTest12EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidonlyContainsUserCertsTest11EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidonlySomeReasonsTest15EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidonlySomeReasonsTest16EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidonlySomeReasonsTest17EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidonlySomeReasonsTest20EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidonlySomeReasonsTest21EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidpathLenConstraintTest10EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidpathLenConstraintTest11EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidpathLenConstraintTest12EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidpathLenConstraintTest5EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidpathLenConstraintTest6EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidpathLenConstraintTest9EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/Invalidpre2000CRLnextUpdateTest12EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/Invalidpre2000UTCEEnotAfterDateTest7EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidrequireExplicitPolicyTest3EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidrequireExplicitPolicyTest5EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/LongSerialNumberCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/Mapping1to2CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/MappingFromanyPolicyCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/MappingToanyPolicyCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/MissingbasicConstraintsCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/NameOrderingCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/NegativeSerialNumberCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/NoCRLCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/NoPoliciesCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/NoissuingDistributionPointCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/OldCRLnextUpdateCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/OverlappingPoliciesTest6EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/P12Mapping1to3CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/P12Mapping1to3subCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/P12Mapping1to3subsubCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/P1Mapping1to234CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/P1Mapping1to234subCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/P1anyPolicyMapping1to2CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/PanyPolicyMapping1to2CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/PoliciesP1234CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/PoliciesP1234subCAP123Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/PoliciesP1234subsubCAP123P12Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/PoliciesP123CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/PoliciesP123subCAP12Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/PoliciesP123subsubCAP12P1Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/PoliciesP123subsubCAP12P2Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/PoliciesP123subsubsubCAP12P2P1Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/PoliciesP12CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/PoliciesP12subCAP1Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/PoliciesP12subsubCAP1P2Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/PoliciesP2subCA2Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/PoliciesP2subCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/PoliciesP3CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/RFC3280MandatoryAttributeTypesCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/RFC3280OptionalAttributeTypesCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/RevokedsubCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/RolloverfromPrintableStringtoUTF8StringCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/SeparateCertificateandCRLKeysCA2CRLSigningCert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/SeparateCertificateandCRLKeysCA2CertificateSigningCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/SeparateCertificateandCRLKeysCRLSigningCert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/SeparateCertificateandCRLKeysCertificateSigningCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/TrustAnchorRootCertificate.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/TwoCRLsCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/UIDCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/UTF8StringCaseInsensitiveMatchCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/UTF8StringEncodedNamesCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/UnknownCRLEntryExtensionCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/UnknownCRLExtensionCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/UserNoticeQualifierTest15EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/UserNoticeQualifierTest16EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/UserNoticeQualifierTest17EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/UserNoticeQualifierTest18EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/UserNoticeQualifierTest19EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidBasicSelfIssuedCRLSigningKeyTest6EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidBasicSelfIssuedNewWithOldTest3EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidBasicSelfIssuedNewWithOldTest4EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidBasicSelfIssuedOldWithNewTest1EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidCertificatePathTest1EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidDNSnameConstraintsTest30EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidDNSnameConstraintsTest32EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidDNandRFC822nameConstraintsTest27EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidDNnameConstraintsTest11EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidDNnameConstraintsTest14EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidDNnameConstraintsTest18EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidDNnameConstraintsTest19EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidDNnameConstraintsTest1EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidDNnameConstraintsTest4EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidDNnameConstraintsTest5EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidDNnameConstraintsTest6EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidDSAParameterInheritanceTest5EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidDSASignaturesTest4EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidGeneralizedTimeCRLnextUpdateTest13EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidGeneralizedTimenotAfterDateTest8EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidGeneralizedTimenotBeforeDateTest4EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidIDPwithindirectCRLTest22EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidIDPwithindirectCRLTest24EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidIDPwithindirectCRLTest25EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidLongSerialNumberTest16EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidLongSerialNumberTest17EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidNameChainingCapitalizationTest5EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidNameChainingWhitespaceTest3EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidNameChainingWhitespaceTest4EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidNameUIDsTest6EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidNegativeSerialNumberTest14EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidNoissuingDistributionPointTest10EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidPolicyMappingTest11EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidPolicyMappingTest12EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidPolicyMappingTest13EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidPolicyMappingTest14EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidPolicyMappingTest1EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidPolicyMappingTest3EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidPolicyMappingTest5EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidPolicyMappingTest6EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidPolicyMappingTest9EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidRFC3280MandatoryAttributeTypesTest7EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidRFC3280OptionalAttributeTypesTest8EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidRFC822nameConstraintsTest21EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidRFC822nameConstraintsTest23EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidRFC822nameConstraintsTest25EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidRolloverfromPrintableStringtoUTF8StringTest10EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidSelfIssuedinhibitAnyPolicyTest7EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidSelfIssuedinhibitAnyPolicyTest9EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidSelfIssuedinhibitPolicyMappingTest7EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidSelfIssuedpathLenConstraintTest15EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidSelfIssuedpathLenConstraintTest17EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidSelfIssuedrequireExplicitPolicyTest6EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidSeparateCertificateandCRLKeysTest19EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidTwoCRLsTest7EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidURInameConstraintsTest34EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidURInameConstraintsTest36EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidUTF8StringCaseInsensitiveMatchTest11EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidUTF8StringEncodedNamesTest9EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidUnknownNotCriticalCertificateExtensionTest1EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidbasicConstraintsNotCriticalTest4EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidcRLIssuerTest28EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidcRLIssuerTest29EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidcRLIssuerTest30EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidcRLIssuerTest33EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValiddeltaCRLTest2EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValiddeltaCRLTest5EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValiddeltaCRLTest7EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValiddeltaCRLTest8EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValiddistributionPointTest1EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValiddistributionPointTest4EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValiddistributionPointTest5EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValiddistributionPointTest7EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidinhibitAnyPolicyTest2EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidinhibitPolicyMappingTest2EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidinhibitPolicyMappingTest4EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidkeyUsageNotCriticalTest3EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidonlyContainsCACertsTest13EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidonlySomeReasonsTest18EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidonlySomeReasonsTest19EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidpathLenConstraintTest13EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidpathLenConstraintTest14EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidpathLenConstraintTest7EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidpathLenConstraintTest8EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/Validpre2000UTCnotBeforeDateTest3EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidrequireExplicitPolicyTest1EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidrequireExplicitPolicyTest2EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidrequireExplicitPolicyTest4EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/WrongCRLCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/anyPolicyCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/basicConstraintsCriticalcAFalseCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/basicConstraintsNotCriticalCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/basicConstraintsNotCriticalcAFalseCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/deltaCRLCA1Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/deltaCRLCA2Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/deltaCRLCA3Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/deltaCRLIndicatorNoBaseCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/distributionPoint1CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/distributionPoint2CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/indirectCRLCA1Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/indirectCRLCA2Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/indirectCRLCA3Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/indirectCRLCA3cRLIssuerCert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/indirectCRLCA4Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/indirectCRLCA4cRLIssuerCert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/indirectCRLCA5Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/indirectCRLCA6Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitAnyPolicy0CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitAnyPolicy1CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitAnyPolicy1SelfIssuedCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitAnyPolicy1SelfIssuedsubCA2Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitAnyPolicy1subCA1Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitAnyPolicy1subCA2Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitAnyPolicy1subCAIAP5Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitAnyPolicy1subsubCA2Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitAnyPolicy5CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitAnyPolicy5subCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitAnyPolicy5subsubCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitAnyPolicyTest3EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitPolicyMapping0CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitPolicyMapping0subCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitPolicyMapping1P12CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitPolicyMapping1P12subCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitPolicyMapping1P12subCAIPM5Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitPolicyMapping1P12subsubCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitPolicyMapping1P12subsubCAIPM5Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitPolicyMapping1P1CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitPolicyMapping1P1SelfIssuedCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitPolicyMapping1P1SelfIssuedsubCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitPolicyMapping1P1subCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitPolicyMapping1P1subsubCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitPolicyMapping5CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitPolicyMapping5subCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitPolicyMapping5subsubCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitPolicyMapping5subsubsubCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/keyUsageCriticalcRLSignFalseCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/keyUsageCriticalkeyCertSignFalseCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/keyUsageNotCriticalCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/keyUsageNotCriticalcRLSignFalseCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/keyUsageNotCriticalkeyCertSignFalseCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/nameConstraintsDN1CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/nameConstraintsDN1SelfIssuedCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/nameConstraintsDN1subCA1Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/nameConstraintsDN1subCA2Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/nameConstraintsDN1subCA3Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/nameConstraintsDN2CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/nameConstraintsDN3CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/nameConstraintsDN3subCA1Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/nameConstraintsDN3subCA2Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/nameConstraintsDN4CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/nameConstraintsDN5CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/nameConstraintsDNS1CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/nameConstraintsDNS2CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/nameConstraintsRFC822CA1Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/nameConstraintsRFC822CA2Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/nameConstraintsRFC822CA3Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/nameConstraintsURI1CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/nameConstraintsURI2CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/onlyContainsAttributeCertsCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/onlyContainsCACertsCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/onlyContainsUserCertsCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/onlySomeReasonsCA1Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/onlySomeReasonsCA2Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/onlySomeReasonsCA3Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/onlySomeReasonsCA4Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/pathLenConstraint0CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/pathLenConstraint0SelfIssuedCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/pathLenConstraint0subCA2Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/pathLenConstraint0subCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/pathLenConstraint1CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/pathLenConstraint1SelfIssuedCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/pathLenConstraint1SelfIssuedsubCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/pathLenConstraint1subCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/pathLenConstraint6CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/pathLenConstraint6subCA0Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/pathLenConstraint6subCA1Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/pathLenConstraint6subCA4Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/pathLenConstraint6subsubCA00Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/pathLenConstraint6subsubCA11Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/pathLenConstraint6subsubCA41Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/pathLenConstraint6subsubsubCA11XCert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/pathLenConstraint6subsubsubCA41XCert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/pre2000CRLnextUpdateCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy0CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy0subCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy0subsubCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy0subsubsubCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy10CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy10subCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy10subsubCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy10subsubsubCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy2CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy2SelfIssuedCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy2SelfIssuedsubCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy2subCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy4CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy4subCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy4subsubCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy4subsubsubCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy5CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy5subCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy5subsubCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy5subsubsubCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy7CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy7subCARE2Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy7subsubCARE2RE4Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy7subsubsubCARE2RE4Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key.cover: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key.spec: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/auth_keys: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/cacerts.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/client_cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/client_key.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/crl_signer.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/dh.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/dsa.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/dsa_ISO.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/dsa_key_pkcs8.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/dsa_pub.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/ec_key.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/ec_key2.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/ec_key_param0.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/ec_key_param1.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/ec_key_pkcs8.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/ec_pubkey.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/idp_cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/idp_crl.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/known_hosts: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/openssh_dsa_pub: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/openssh_dsa_with_comment_pub: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/openssh_ecdsa_pub: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/openssh_rsa_pub: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/pkcs7_cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/pkcs7_ext.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/pkix_verify_hostname_cn.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/pkix_verify_hostname_subjAltName.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/pkix_verify_hostname_subjAltName_IP.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/req.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/rsa.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/rsa_ISO.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/rsa_key_pkcs8.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/rsa_pub.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/rsa_pub_key.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/server_cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/server_key.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/ssh1_auth_keys: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/ssh1_known_hosts: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/ssh2_dsa_comment_pub: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/ssh2_dsa_pub: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/ssh2_ecdsa_pub: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/ssh2_rsa_comment_pub: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/ssh2_rsa_pub: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/ssh2_subject_pub: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/ssh_rsa_long_comment_pub: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/ssh_rsa_long_header_pub: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/verify_hostname.conf: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/verify_hostname_ip.conf: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/vsn.mk: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/AUTHORS: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/Makefile: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/bin/reltool.escript: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/doc/src/Makefile: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/doc/src/book.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/doc/src/files.mk: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/doc/src/notes.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/doc/src/part.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/doc/src/ref_man.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/doc/src/reltool.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/doc/src/reltool_examples.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/doc/src/reltool_intro.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/doc/src/reltool_usage.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/examples/Makefile: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/examples/display_args: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/examples/mnesia_core_dump_viewer: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/info: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/src/Makefile: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/src/files.mk: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/src/reltool.app.src: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/src/reltool.appup.src: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/src/reltool.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/src/reltool.hrl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/src/reltool_app_win.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/src/reltool_fgraph.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/src/reltool_fgraph.hrl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/src/reltool_fgraph_win.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/src/reltool_mod_win.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/src/reltool_server.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/src/reltool_sys_win.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/src/reltool_target.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/src/reltool_utils.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/Makefile: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/README: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool.cover: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool.spec: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_app_SUITE.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_manual_gui_SUITE.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_manual_gui_SUITE_data/Makefile.src: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_manual_gui_SUITE_data/dependencies/x-1.0/ebin/x.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_manual_gui_SUITE_data/dependencies/x-1.0/src/x1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_manual_gui_SUITE_data/dependencies/x-1.0/src/x2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_manual_gui_SUITE_data/dependencies/x-1.0/src/x3.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_manual_gui_SUITE_data/dependencies/y-1.0/ebin/y.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_manual_gui_SUITE_data/dependencies/y-1.0/src/y1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_manual_gui_SUITE_data/dependencies/y-1.0/src/y2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_manual_gui_SUITE_data/dependencies/y-1.0/src/y3.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_manual_gui_SUITE_data/dependencies/z-1.0/ebin/z.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_manual_gui_SUITE_data/dependencies/z-1.0/src/z1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_manual_gui_SUITE_data/faulty_app_file/a-1.0/ebin/a.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_manual_gui_SUITE_data/faulty_app_file/a-1.0/src/a.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_manual_gui_SUITE_data/faulty_app_file/a-1.0/src/a_sup.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/Makefile.src: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/dep_in_app_not_xref/x-1.0/ebin/x.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/dep_in_app_not_xref/x-1.0/src/x1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/dep_in_app_not_xref/y-1.0/ebin/y.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/dep_in_app_not_xref/y-1.0/src/y1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/dep_in_app_not_xref/z-1.0/ebin/z.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/dep_in_app_not_xref/z-1.0/src/z1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/dependencies/x-1.0/ebin/x.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/dependencies/x-1.0/src/x1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/dependencies/x-1.0/src/x2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/dependencies/x-1.0/src/x3.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/dependencies/y-1.0/ebin/y.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/dependencies/y-1.0/src/y0.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/dependencies/y-1.0/src/y1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/dependencies/y-1.0/src/y2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/dependencies/z-1.0/ebin/z.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/dependencies/z-1.0/src/z1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/dupl_mod/a-1.0/ebin/a.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/escript/someapp-1.0/ebin/someapp.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/escript/someapp-1.0/src/mymod.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/faulty_app_file/a-1.0/ebin/a.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/faulty_app_file/a-1.0/src/a.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/faulty_app_file/a-1.0/src/a_sup.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/non_standard_vsn_id/b-first/ebin/b.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/non_standard_vsn_id/b-first/src/b.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/non_standard_vsn_id/b-second/ebin/b.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/non_standard_vsn_id/b-second/src/b.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/otp_9229/x-1.0/ebin/x.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/otp_9229/x-1.0/src/mylib.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/otp_9229/x-1.0/src/x.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/otp_9229/y-1.0/ebin/y.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/otp_9229/y-1.0/src/mylib.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/otp_9229/y-1.0/src/y.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/slim/a-1.0/ebin/a.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/slim/a-1.0/src/a.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/slim/a-1.0/src/a_sup.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/sort_apps/x-1.0/ebin/x.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/sort_apps/y-1.0/ebin/y.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/sort_apps/z-1.0/ebin/z.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/unicode/ua-1.0/ebin/ua.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/use_selected_vsn/b-1.0/ebin/b.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/use_selected_vsn/b-1.0/src/b.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/use_selected_vsn/b-3.0/ebin/b.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/use_selected_vsn/b-3.0/src/b.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/use_selected_vsn/lib2/b-2.0/ebin/b.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/use_selected_vsn/lib2/b-2.0/src/b.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_test_lib.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_test_lib.hrl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_wx_SUITE.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/rtt: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/rtt.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/vsn.mk: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/AUTHORS: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/Makefile: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/c_src/Makefile: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/c_src/Makefile.in: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/c_src/dtrace_user.d: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/c_src/dyntrace.c: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/c_src/dyntrace_lttng.h: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/c_src/trace_file_drv.c: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/c_src/trace_ip_drv.c: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/doc/src/LTTng.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/doc/src/Makefile: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/doc/src/book.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/doc/src/dbg.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/doc/src/dyntrace.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/doc/src/erts_alloc_config.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/doc/src/msacc.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/doc/src/notes.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/doc/src/notes_history.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/doc/src/part.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/doc/src/ref_man.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/doc/src/runtime_tools_app.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/doc/src/scheduler.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/doc/src/specs.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/doc/src/system_information.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/dist.d: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/dist.systemtap: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/driver1.d: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/driver1.systemtap: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/function-calls.d: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/function-calls.systemtap: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/garbage-collection.d: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/garbage-collection.systemtap: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/memory1.d: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/memory1.systemtap: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/messages.d: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/messages.systemtap: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/port1.d: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/port1.systemtap: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/process-scheduling.d: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/process-scheduling.systemtap: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/spawn-exit.d: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/spawn-exit.systemtap: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/user-probe-n.d: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/user-probe-n.systemtap: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/user-probe.d: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/user-probe.systemtap: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/include/observer_backend.hrl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/info: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/src/Makefile: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/src/appmon_info.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/src/dbg.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/src/dyntrace.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/src/erts_alloc_config.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/src/msacc.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/src/observer_backend.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/src/runtime_tools.app.src: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/src/runtime_tools.appup.src: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/src/runtime_tools.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/src/runtime_tools_sup.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/src/scheduler.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/src/system_information.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/src/ttb_autostart.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/test/Makefile: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/test/dbg_SUITE.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/test/dbg_SUITE_data/Makefile.src: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/test/dbg_SUITE_data/dbg_SUITE.c: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/test/dbg_SUITE_data/dbg_test.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/test/dbg_SUITE_data/exref_td.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/test/dyntrace_SUITE.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/test/dyntrace_lttng_SUITE.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/test/erts_alloc_config_SUITE.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/test/msacc_SUITE.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/test/runtime_tools.cover: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/test/runtime_tools.spec: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/test/runtime_tools_SUITE.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/test/scheduler_SUITE.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/test/system_information_SUITE.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/test/system_information_SUITE_data/information_test_report.dat: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/test/zzz_SUITE.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/vsn.mk: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/AUTHORS: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/Makefile: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/Makefile: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/alarm_handler.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/appup.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/book.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/error_logging.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/notes.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/notes_history.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/part.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/rb.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/ref_man.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/rel.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/rel/bar.1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/rel/bar.2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/rel/ge_h.1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/rel/ge_h.2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/rel/gs1.1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/rel/gs1.2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/rel/gs1.3.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/rel/gs2.1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/rel/gs2.2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/rel/lists2.1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/rel/lists2.2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/rel/portc.1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/rel/portc.2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/rel/sp.1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/rel/sp.2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/rel/sup.1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/rel/sup.2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/release_handler.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/relup.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/sasl_app.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/sasl_intro.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/script.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/systools.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/examples/src/Makefile: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/examples/src/target_system.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/info: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/src/Makefile: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/src/alarm_handler.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/src/erlsrv.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/src/format_lib_supp.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/src/misc_supp.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/src/rb.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/src/rb_format_supp.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/src/release_handler.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/src/release_handler_1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/src/sasl.app.src: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/src/sasl.appup.src: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/src/sasl.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/src/sasl_report.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/src/sasl_report_file_h.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/src/sasl_report_tty_h.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/src/systools.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/src/systools.hrl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/src/systools_lib.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/src/systools_make.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/src/systools_rc.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/src/systools_relup.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/Makefile: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/alarm_handler_SUITE.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/installer.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/rb_SUITE.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/Makefile.src: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib1/app1-1.0/ebin/app1.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib1/app1-1.0/src/app1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib1/app1-1.0/src/app1_server.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib1/app1-1.0/src/app1_sup.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib1/app2-1.0/ebin/app2.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib1/app2-1.0/src/app2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib1/app2-1.0/src/app2_server.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib1/app2-1.0/src/app2_sup.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib2/app1-2.0/ebin/app1.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib2/app1-2.0/ebin/app1.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib2/app1-2.0/src/app1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib2/app1-2.0/src/app1_server.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib2/app1-2.0/src/app1_sup.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib2/app2-1.0/ebin/app2.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib2/app2-1.0/src/app2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib2/app2-1.0/src/app2_server.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib2/app2-1.0/src/app2_sup.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib3/app1-3.0/ebin/app1.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib3/app1-3.0/ebin/app1.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib3/app1-3.0/src/app1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib3/app1-3.0/src/app1_server.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib3/app1-3.0/src/app1_sup.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib4/app1-4.0/ebin/app1.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib4/app1-4.0/ebin/app1.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib4/app1-4.0/src/app1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib4/app1-4.0/src/app1_server.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib4/app1-4.0/src/app1_sup.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/c/aa.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/c/b.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/c/c.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/c/c_sup.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/erl.ini.src: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/heart_restart.bat: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/README: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/a-1.0/ebin/a.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/a-1.0/src/a.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/a-1.0/src/a_sup.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/a-1.1/ebin/a.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/a-1.1/ebin/a.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/a-1.1/src/a.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/a-1.1/src/a_sup.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/a-1.2/ebin/a.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/a-1.2/ebin/a.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/a-1.2/src/a.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/a-1.2/src/a_sup.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/a-9.0/ebin/a.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/a-9.0/ebin/a.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/a-9.0/src/a.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/a-9.0/src/a_sup.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/a-9.1/ebin/a.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/a-9.1/ebin/a.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/a-9.1/src/a.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/a-9.1/src/a_sup.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/b-1.0/ebin/b.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/b-1.0/src/b_lib.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/b-1.0/src/b_server.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/b-2.0/ebin/b.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/b-2.0/ebin/b.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/b-2.0/src/b_lib.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/b-2.0/src/b_server.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/installer-1.0/ebin/installer.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/ebin/many_mods.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m10.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m3.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m4.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m5.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m6.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m7.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m8.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m9.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/ebin/many_mods.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/ebin/many_mods.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m10.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m3.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m4.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m5.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m6.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m7.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m8.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m9.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-2.0/ebin/many_mods.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-2.0/ebin/many_mods.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-2.0/src/m.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/otp_2740/vsn_atom.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/otp_2740/vsn_list.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/otp_2740/vsn_numeric.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/otp_2740/vsn_string.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/otp_2740/vsn_tuple.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/regexp_appup/app1/ebin/app1.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/regexp_appup/app1/ebin/app1.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/release_handler_timeouts/dummy-0.1/ebin/dummy.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/release_handler_timeouts/dummy-0.1/src/dummy_app.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/release_handler_timeouts/dummy-0.1/src/dummy_server.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/release_handler_timeouts/dummy-0.1/src/dummy_sup.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/release_handler_timeouts/dummy-0.1/src/dummy_sup_2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/start: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/start_client: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/unicode/u-1.0/ebin/u.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/unicode/u-1.0/src/u.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/unicode/u-1.0/src/u_sup.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/unicode/u-1.1/ebin/u.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/unicode/u-1.1/ebin/u.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/unicode/u-1.1/src/u.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/unicode/u-1.1/src/u_sup.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/rh_test_lib.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/sasl.cover: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/sasl.spec: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/sasl_SUITE.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/sasl_report_SUITE.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/sasl_report_suite_supervisor.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/db-2.1/ebin/db.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/db-2.1/ebin/db.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/db-2.1/src/db1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/db-2.1/src/db2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/fe-3.1/ebin/fe.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/fe-3.1/ebin/fe.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/fe-3.1/src/fe1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/fe-3.1/src/fe2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/fe-3.1/src/fe3.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_bad_appup/lib/fe-2.1/ebin/fe.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_bad_appup/lib/fe-3.1/ebin/fe.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_bad_appup/lib/fe-3.1/ebin/fe.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/db-2.1/ebin/db.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/db-2.1/ebin/db.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/db-2.1/src/db1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/db-2.1/src/db2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/fe-3.1/ebin/fe.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/fe-3.1/ebin/fe.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/fe-3.1/src/fe1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/fe-3.1/src/fe2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/fe-3.1/src/fe3.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_duplicate_modules/lib/app1-1.0/ebin/app1.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_duplicate_modules/lib/app1-1.0/src/myapp.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_duplicate_modules/lib/app2-1.0/ebin/app2.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_duplicate_modules/lib/app2-1.0/src/myapp.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_links/lib/db-2.1/ebin/db.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_links/lib/db-2.1/ebin/db.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_links/lib/db-2.1/src/db2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_links/lib/db-2.1/src/db3.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_links/lib/fe-3.1/ebin/fe.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_links/lib/fe-3.1/src/fe1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_links/lib/fe-3.1/src/fe2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_links/lib/fe-3.1/src/fe3.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/db-2.1/ebin/db.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/db-2.1/ebin/db.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/db-2.1/src/db1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/db-2.1/src/db2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/fe-3.1/ebin/fe.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/fe-3.1/ebin/fe.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/fe-3.1/src/fe1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/fe-3.1/src/fe2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/fe-3.1/src/fe3.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_no_appup/lib/fe-2.1/ebin/fe.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_no_appup/lib/fe-2.1/ebin/fe.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_no_appup/lib/fe-3.1/ebin/fe.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_no_appup/lib/fe-500.18.7/ebin/fe.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-1.0/ebin/db.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-1.0/src/db1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-1.0/src/db2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-1.1/ebin/db.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-1.1/src/db1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-1.1/src/db2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-2.1/ebin/db.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-2.1/ebin/db.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-2.1/src/db1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-2.1/src/db2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-3.1/ebin/db.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-3.1/ebin/db.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-3.1/src/db1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-3.1/src/db2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1.1/ebin/fe.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1.1/src/fe1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1.1/src/fe2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1.1/src/fe3.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1/ebin/fe.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1/src/fe1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1/src/fe2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1/src/fe3.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-3.1/ebin/fe.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-3.1/ebin/fe.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-3.1/src/fe1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-3.1/src/fe2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-3.1/src/fe3.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_regexp_appup/lib/fe-2.1.1/ebin/fe.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_regexp_appup/lib/fe-2.1/ebin/fe.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_regexp_appup/lib/fe-3.1/ebin/fe.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_regexp_appup/lib/fe-3.1/ebin/fe.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_unicode/lib/ua-1.0/ebin/ua.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_unicode/lib/ua-1.0/src/ua1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/lib/kernel/ebin/kernel.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/lib/kernel/ebin/kernel.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/lib/sasl-9.9/ebin/sasl.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/lib/sasl-9.9/ebin/sasl.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/lib/sasl/ebin/sasl.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/lib/sasl/ebin/sasl.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/lib/stdlib/ebin/stdlib.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/lib/stdlib/ebin/stdlib.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_rc_SUITE.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/test_lib.hrl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/vsn.mk: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/AUTHORS: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/Makefile: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/bin/snmp-v2tov1.pl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/bin/snmp-v2tov1.sed: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/bin/snmp-v2tov1.src: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/configure.in: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/MIB_mechanism.fig: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/MIB_mechanism.gif: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/Makefile: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/book.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/files.mk: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/getnext1.gif: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/getnext2.gif: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/getnext3.gif: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/getnext4.gif: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/notes.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/notes_history.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/part.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/ref_man.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp-um-1-image-1.gif: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp-um-1-image-2.gif: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp-um-1-image-3.gif: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp-um-1-image-8.gif: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_advanced_agent.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_agent_config_files.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_agent_funct_descr.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_agent_netif.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_agent_netif_1.gif: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_app.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_app_a.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_app_b.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_audit_trail_log.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_community_mib.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_config.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_def_instr_functions.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_framework_mib.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_generic.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_impl_example_agent.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_impl_example_manager.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_index.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_instr_functions.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_intro.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_manager_config_files.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_manager_funct_descr.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_manager_netif.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_manager_netif_1.gif: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_mib_compiler.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_notification_mib.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_pdus.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_standard_mib.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_target_mib.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_user_based_sm_mib.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_view_based_acm_mib.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmpa.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmpa_conf.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmpa_discovery_handler.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmpa_error.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmpa_error_io.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmpa_error_logger.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmpa_error_report.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmpa_local_db.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmpa_mib_data.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmpa_mib_storage.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmpa_mpd.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmpa_network_interface.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmpa_network_interface_filter.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmpa_notification_delivery_info_receiver.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmpa_notification_filter.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmpa_supervisor.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmpc.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmpc_cmd.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmpm.xml: Cannot write: No space left on device\ntar: Exiting with failure status due to previous errors\nerror: program 'tar' failed with exit code 2\n"
+   ]
   },
   "stable": {
    "version": [
     22,
-    0,
-    7
+    1
    ],
-   "commit": "3967d28c05dae77db30b15e56eb4ececf4f1afef",
-   "sha256": "1jk78b674cvi6fh6fj5jqqnqv4452x9bn6h79yrdm5nws1nh84am"
+   "commit": "e62a389ce5dd27e7b26802243a5565ffd1feaef0",
+   "error": [
+    "exited abnormally with code 1\n",
+    "",
+    "unpacking...\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/src/erl_syntax_lib.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/src/erl_tidy.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/src/igor.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/src/merl.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/src/merl_tests.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/src/merl_transform.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/src/prettypr.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/src/syntax_tools.app.src: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/src/syntax_tools.appup.src: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/test/Makefile: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/test/merl_SUITE.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/test/syntax_tools.cover: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/test/syntax_tools.spec: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/test/syntax_tools_SUITE.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/test/syntax_tools_SUITE_data/empty.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/test/syntax_tools_SUITE_data/erl_tidy_tilde.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/test/syntax_tools_SUITE_data/igor_type_specs.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/test/syntax_tools_SUITE_data/m1.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/test/syntax_tools_SUITE_data/m2.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/test/syntax_tools_SUITE_data/specs_and_funs.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/test/syntax_tools_SUITE_data/syntax_tools_SUITE_test_module.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/test/syntax_tools_SUITE_data/syntax_tools_test.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/test/syntax_tools_SUITE_data/type_specs.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/vsn.mk: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/AUTHORS: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/Makefile: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/doc/src/Makefile: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/doc/src/book.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/doc/src/getting_started.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/doc/src/introduction.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/doc/src/notes.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/doc/src/ref_man.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/doc/src/tftp.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/doc/src/usersguide.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/info: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/src/Makefile: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/src/tftp.app.src: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/src/tftp.appup.src: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/src/tftp.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/src/tftp.hrl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/src/tftp_app.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/src/tftp_binary.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/src/tftp_engine.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/src/tftp_file.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/src/tftp_lib.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/src/tftp_logger.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/src/tftp_sup.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/test/Makefile: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/test/tftp.config: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/test/tftp.cover: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/test/tftp.spec: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/test/tftp_SUITE.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/test/tftp_bench.spec: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/test/tftp_test_lib.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/test/tftp_test_lib.hrl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/vsn.mk: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/AUTHORS: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/Makefile: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/c_src/Makefile: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/c_src/Makefile.in: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/c_src/depend.mk: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/c_src/erl_memory.c: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/c_src/erl_memory_trace_block_table.c: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/c_src/erl_memory_trace_block_table.h: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/Makefile: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/book.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/cover.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/cover_chapter.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/cprof.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/cprof_chapter.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/eprof.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/erlang_mode.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/erlang_mode_chapter.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/fprof.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/fprof_chapter.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/instrument.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/lcnt.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/lcnt_chapter.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/make.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/notes.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/notes_history.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/part.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/ref_man.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/specs.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/tags.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/venn1.fig: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/venn1.gif: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/venn2.fig: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/venn2.gif: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/xref.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/xref_chapter.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/emacs/AUTHORS: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/emacs/Makefile: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/emacs/README: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/emacs/erlang-edoc.el: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/emacs/erlang-eunit.el: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/emacs/erlang-flymake.el: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/emacs/erlang-pkg.el: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/emacs/erlang-skels-old.el: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/emacs/erlang-skels.el: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/emacs/erlang-start.el: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/emacs/erlang-test.el: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/emacs/erlang.el: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/emacs/erlang_appwiz.el: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/emacs/erldoc.el: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/emacs/internal_doc/emacs.sgml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/emacs/tags.3: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/emacs/vsn.mk: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/examples/Makefile: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/examples/xref_examples.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/info: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/priv/styles.css: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/src/Makefile: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/src/cover.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/src/cprof.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/src/eprof.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/src/fprof.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/src/instrument.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/src/lcnt.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/src/make.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/src/tags.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/src/tools.app.src: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/src/tools.appup.src: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/src/xref.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/src/xref.hrl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/src/xref_base.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/src/xref_compiler.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/src/xref_parser.yrl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/src/xref_reader.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/src/xref_scanner.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/src/xref_utils.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/Makefile: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cover_SUITE.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cover_SUITE_data/a.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cover_SUITE_data/b.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cover_SUITE_data/cc.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cover_SUITE_data/compile_beam/crypt.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cover_SUITE_data/compile_beam/d/y.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cover_SUITE_data/compile_beam/t.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cover_SUITE_data/compile_beam/v.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cover_SUITE_data/compile_beam/w.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cover_SUITE_data/compile_beam/x.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cover_SUITE_data/compile_beam/z.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cover_SUITE_data/d.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cover_SUITE_data/d1/e.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cover_SUITE_data/f.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cover_SUITE_data/include_eunit_hrl/cover_inc_eunit.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cover_SUITE_data/included_functions/cover_inc.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cover_SUITE_data/included_functions/cover_inc.hrl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cover_SUITE_data/otp_11439/t.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cover_SUITE_data/otp_6115/f1.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cover_SUITE_data/otp_6115/f2.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cprof_SUITE.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cprof_SUITE_data/cprof_SUITE_test.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/emacs_SUITE.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/emacs_SUITE_data/comments: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/emacs_SUITE_data/comprehensions: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/emacs_SUITE_data/funcs: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/emacs_SUITE_data/highlight: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/emacs_SUITE_data/icr: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/emacs_SUITE_data/macros: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/emacs_SUITE_data/records: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/emacs_SUITE_data/terms: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/emacs_SUITE_data/try_catch: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/emacs_SUITE_data/type_specs: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/emem_SUITE.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/eprof_SUITE.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/eprof_SUITE_data/ed.script: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/eprof_SUITE_data/eed.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/eprof_SUITE_data/eprof_suite_test.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/eprof_SUITE_data/eprof_test.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/fprof_SUITE.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/fprof_SUITE_data/foo.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/fprof_SUITE_data/fprof_unicode.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/ignore_cores.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/instrument_SUITE.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/lcnt_SUITE.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/lcnt_SUITE_data/big_bang_40.lcnt: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/lcnt_SUITE_data/ehb_3_3_hist.lcnt: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/make_SUITE.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/make_SUITE_data/Emakefile: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/make_SUITE_data/incl_src/test_incl2.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/make_SUITE_data/test1.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/make_SUITE_data/test2.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/make_SUITE_data/test3.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/make_SUITE_data/test4.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/make_SUITE_data/test5.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/make_SUITE_data/test_incl.hrl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/make_SUITE_data/test_incl1.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/prof_bench_SUITE.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/prof_bench_SUITE_data/sofs_copy.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/tools.cover: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/tools.spec: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/tools.spec.win: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/tools_SUITE.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/tools_bench.spec: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/xref_SUITE.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/xref_SUITE_data/depr_r9c.beam: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/xref_SUITE_data/dir/dir/dummy: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/xref_SUITE_data/fun_mfa_r14.beam: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/xref_SUITE_data/fun_mfa_r14.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/xref_SUITE_data/lib_test/cp.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/xref_SUITE_data/lib_test/lib1.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/xref_SUITE_data/lib_test/lib2.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/xref_SUITE_data/lib_test/lib3.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/xref_SUITE_data/lib_test/t.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/xref_SUITE_data/md/x__x.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/xref_SUITE_data/md/y__y.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/xref_SUITE_data/read/read.beam.v1: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/xref_SUITE_data/read/read.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/xref_SUITE_data/rel2/lib/app1-1.0/ebin/dummy: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/xref_SUITE_data/rel2/lib/app1-1.1/ebin/dummy: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/xref_SUITE_data/rel2/lib/app2-1.1/ebin/dummy: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/xref_SUITE_data/rel2/x.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/xref_SUITE_data/rel2/y.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/xref_SUITE_data/update/x.erl.1: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/xref_SUITE_data/update/x.erl.2: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/vsn.mk: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/AUTHORS: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/LICENSE.txt: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/Makefile: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/README: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/Makefile: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/README: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/gen_util.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/gl_doxygen.conf: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/gl_gen.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/gl_gen.hrl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/gl_gen_c.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/gl_gen_erl.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/gl_scan_doc.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/glapi.conf: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/wx_doxygen.conf: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/wx_extra/added_func.h: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/wx_extra/bugs.h: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/wx_extra/wxEvtHandler.c_src: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/wx_extra/wxEvtHandler.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/wx_extra/wxGraphicsRenderer.c_src: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/wx_extra/wxListCtrl.c_src: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/wx_extra/wxListCtrl.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/wx_extra/wxPrintout.c_src: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/wx_extra/wxPrintout.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/wx_extra/wxTreeCtrl.c_src: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/wx_extra/wxXmlResource.c_src: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/wx_extra/wxXmlResource.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/wx_extra/wxe_evth.h: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/wx_gen.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/wx_gen.hrl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/wx_gen_cpp.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/wx_gen_erl.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/wxapi.conf: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/Makefile.in: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/egl_impl.cpp: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/egl_impl.h: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/gen/gl_fdefs.h: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/gen/gl_finit.h: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/gen/gl_funcs.cpp: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/gen/glu_finit.h: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/gen/wxe_derived_dest.h: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/gen/wxe_events.cpp: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/gen/wxe_funcs.cpp: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/gen/wxe_init.cpp: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/gen/wxe_macros.h: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/wxe_callback_impl.cpp: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/wxe_callback_impl.h: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/wxe_driver.c: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/wxe_driver.h: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/wxe_events.h: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/wxe_gl.cpp: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/wxe_gl.h: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/wxe_helpers.cpp: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/wxe_helpers.h: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/wxe_impl.cpp: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/wxe_impl.h: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/wxe_main.cpp: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/wxe_memory.h: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/wxe_ps_init.c: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/wxe_return.cpp: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/wxe_return.h: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/wxe_win32.rc: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/config.mk.in: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/configure.in: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/doc/overview.edoc: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/doc/src/Makefile: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/doc/src/book.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/doc/src/notes.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/doc/src/part.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/doc/src/ref_man.xml.src: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/doc/src/specs.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/Makefile: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/Makefile: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/demo.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/demo_html_tagger.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/erlang.png: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_aui.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_button.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_canvas.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_canvas_paint.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_choices.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_cursor.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_dialogs.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_frame_utils.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_gauge.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_gl.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_graphicsContext.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_grid.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_htmlWindow.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_htmlWindow.html: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_listCtrl.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_notebook.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_pickers.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_popupMenu.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_radioBox.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_sashWindow.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_sizers.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_slider.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_splitterWindow.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_static.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_textCtrl.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_treeCtrl.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/image.jpg: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/simple/Makefile: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/simple/copy.xpm: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/simple/hello.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/simple/hello2.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/simple/menu.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/simple/minimal.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/simple/sample.xpm: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/sudoku/Makefile: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/sudoku/sudoku.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/sudoku/sudoku.hrl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/sudoku/sudoku_board.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/sudoku/sudoku_game.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/sudoku/sudoku_gui.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/appicon.ico: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/appicon.xpm: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/artprov.xpm: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/artprov.xrc: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/basicdlg.xpm: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/basicdlg.xrc: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/controls.xpm: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/controls.xrc: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/custclas.xpm: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/custclas.xrc: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/derivdlg.xpm: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/derivdlg.xrc: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/fileopen.gif: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/filesave.gif: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/frame.xrc: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/fuzzy.gif: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/menu.xrc: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/platform.xpm: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/platform.xrc: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/quotes.gif: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/resource.xrc: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/stop.xpm: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/throbber.gif: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/toolbar.xrc: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/uncenter.xpm: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/uncenter.xrc: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/update.gif: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/variable.xpm: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/variable.xrc: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/xrc.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/include/gl.hrl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/include/glu.hrl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/include/wx.hrl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/info: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/prebuild.skip: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/priv/erlang-logo128.png: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/priv/erlang-logo32.png: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/priv/erlang-logo64.png: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/Makefile: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/gl.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/glu.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxAcceleratorEntry.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxAcceleratorTable.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxActivateEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxArtProvider.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxAuiDockArt.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxAuiManager.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxAuiManagerEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxAuiNotebook.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxAuiNotebookEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxAuiPaneInfo.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxAuiSimpleTabArt.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxAuiTabArt.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxBitmap.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxBitmapButton.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxBitmapDataObject.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxBoxSizer.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxBrush.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxBufferedDC.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxBufferedPaintDC.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxButton.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxCalendarCtrl.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxCalendarDateAttr.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxCalendarEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxCaret.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxCheckBox.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxCheckListBox.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxChildFocusEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxChoice.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxChoicebook.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxClientDC.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxClipboard.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxClipboardTextEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxCloseEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxColourData.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxColourDialog.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxColourPickerCtrl.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxColourPickerEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxComboBox.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxCommandEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxContextMenuEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxControl.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxControlWithItems.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxCursor.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxDC.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxDCOverlay.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxDataObject.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxDateEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxDatePickerCtrl.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxDialog.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxDirDialog.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxDirPickerCtrl.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxDisplay.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxDisplayChangedEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxDropFilesEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxEraseEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxEvtHandler.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxFileDataObject.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxFileDialog.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxFileDirPickerEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxFilePickerCtrl.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxFindReplaceData.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxFindReplaceDialog.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxFlexGridSizer.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxFocusEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxFont.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxFontData.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxFontDialog.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxFontPickerCtrl.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxFontPickerEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxFrame.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGBSizerItem.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGCDC.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGLCanvas.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGauge.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGenericDirCtrl.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGraphicsBrush.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGraphicsContext.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGraphicsFont.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGraphicsMatrix.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGraphicsObject.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGraphicsPath.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGraphicsPen.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGraphicsRenderer.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGrid.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGridBagSizer.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGridCellAttr.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGridCellBoolEditor.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGridCellBoolRenderer.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGridCellChoiceEditor.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGridCellEditor.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGridCellFloatEditor.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGridCellFloatRenderer.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGridCellNumberEditor.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGridCellNumberRenderer.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGridCellRenderer.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGridCellStringRenderer.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGridCellTextEditor.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGridEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGridSizer.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxHelpEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxHtmlEasyPrinting.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxHtmlLinkEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxHtmlWindow.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxIcon.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxIconBundle.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxIconizeEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxIdleEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxImage.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxImageList.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxInitDialogEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxJoystickEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxKeyEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxLayoutAlgorithm.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxListBox.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxListCtrl.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxListEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxListItem.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxListItemAttr.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxListView.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxListbook.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxLocale.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxLogNull.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxMDIChildFrame.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxMDIClientWindow.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxMDIParentFrame.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxMask.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxMaximizeEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxMemoryDC.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxMenu.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxMenuBar.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxMenuEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxMenuItem.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxMessageDialog.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxMiniFrame.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxMirrorDC.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxMouseCaptureChangedEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxMouseCaptureLostEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxMouseEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxMoveEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxMultiChoiceDialog.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxNavigationKeyEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxNotebook.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxNotebookEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxNotifyEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxOverlay.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPageSetupDialog.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPageSetupDialogData.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPaintDC.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPaintEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPalette.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPaletteChangedEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPanel.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPasswordEntryDialog.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPen.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPickerBase.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPopupTransientWindow.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPopupWindow.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPostScriptDC.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPreviewCanvas.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPreviewControlBar.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPreviewFrame.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPrintData.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPrintDialog.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPrintDialogData.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPrintPreview.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPrinter.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPrintout.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxProgressDialog.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxQueryNewPaletteEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxRadioBox.erl: Cannot write: No space left on device\ntar: Exiting with failure status due to previous errors\nerror: program 'tar' failed with exit code 2\n"
+   ]
   }
  },
  {
@@ -24962,14 +25081,14 @@
   "repo": "tom-tan/esh-help",
   "unstable": {
    "version": [
-    20170830,
-    411
+    20190905,
+    22
    ],
    "deps": [
     "dash"
    ],
-   "commit": "8a8a9d4d9852f8bd96da3b94e95ff57097ac8ec6",
-   "sha256": "02fybhmqm2qmy5qdig7xvwxazqi499pw32kh5mrsbdr14srg9fhs"
+   "commit": "417673ed18a983930a66a6692dbfb288a995cb80",
+   "sha256": "0x7d51a6ljl014zy7mi27vzcqqbcwg9z4drq29fr2ajk82mqhlgd"
   },
   "stable": {
    "version": [
@@ -25252,14 +25371,14 @@
   "repo": "aaronjensen/eslintd-fix",
   "unstable": {
    "version": [
-    20180429,
-    1455
+    20190830,
+    2116
    ],
    "deps": [
     "dash"
    ],
-   "commit": "90e451af4daa190d6c0e29fb714b0501a7cce89a",
-   "sha256": "01jysgdd4im4kf4afzwd4mm8x9vlpibb1w4yi2jvc0hglqddnr2g"
+   "commit": "98c669e3653bf94c236c54946c6faba7f782ef0d",
+   "sha256": "1v4s3srn6cc4rbb8hg3wri8c3vnijkyz582qmpyf1vd44mldfq4x"
   },
   "stable": {
    "version": [
@@ -25402,14 +25521,14 @@
   "repo": "emacs-ess/ESS",
   "unstable": {
    "version": [
-    20190814,
-    1054
+    20190917,
+    917
    ],
    "deps": [
     "julia-mode"
    ],
-   "commit": "5b12e56a52144b2393858236e56e1c5ea828b753",
-   "sha256": "0gcz8r7mdjmrcrisqr1w4pmnyj4m76fc1qg773y2b1majkdv7rbj"
+   "commit": "8b48aae3567e7af6d8a84dfe3b017cb099d3414d",
+   "sha256": "0b8n2f7lkgxr498106lhwcldvq0xjhbxmh3xqgy4jp8v0rhh6rli"
   },
   "stable": {
    "version": [
@@ -26042,28 +26161,28 @@
   "repo": "emacs-evil/evil-collection",
   "unstable": {
    "version": [
-    20190828,
-    2159
+    20190916,
+    214
    ],
    "deps": [
     "cl-lib",
     "evil"
    ],
-   "commit": "da75a170ea5485b7c0083624ca4e6cacc6aaa028",
-   "sha256": "1s4sr8lfdd2k11588gzylwbwmyigs29jfmvv9h0mjmixhaz85z1w"
+   "commit": "74e098f79cfb9e8e6391c526154d881c602a90ae",
+   "sha256": "1gqwb9i0iy08gsp8yg75gmcdxmis102jcr1nsfszjv4zrmhiswnm"
   },
   "stable": {
    "version": [
     0,
     0,
-    1
+    2
    ],
    "deps": [
     "cl-lib",
     "evil"
    ],
-   "commit": "733f8d0d289fcbb58705acd1049b618826a3c011",
-   "sha256": "01hr5wf693s2djs6l83nfpq6wyyws99c5nwil6hpqhvrwp4f5h95"
+   "commit": "986ca7eb0b75eccd843bdad2f7fdb48f4ca6ac22",
+   "sha256": "172sx5w50x5wrs5w0sb6rkbj3q22s7mmsnk4c6pwknhbz3vwlvwz"
   }
  },
  {
@@ -26574,15 +26693,15 @@
   "repo": "emacs-evil/evil-magit",
   "unstable": {
    "version": [
-    20190620,
-    153
+    20190904,
+    1730
    ],
    "deps": [
     "evil",
     "magit"
    ],
-   "commit": "6a32e4359cbd2803bafb7134cb6df312644ac986",
-   "sha256": "0i8xpa6vr30vjy3iilcx9g65srrprg1igk3f4xp6lwcc6pkc2mbj"
+   "commit": "4b66a1db8285457147a5436f209391016a819ea1",
+   "sha256": "0kkmbswfh34k3amfl3v140vsnz1gq4n4mg9g4khjd9yjph3zms4h"
   },
   "stable": {
    "version": [
@@ -26636,26 +26755,26 @@
   "repo": "redguardtoo/evil-matchit",
   "unstable": {
    "version": [
-    20190808,
-    1056
+    20190920,
+    58
    ],
    "deps": [
     "evil"
    ],
-   "commit": "43be86d8c41841a20733718d177e8299d5379218",
-   "sha256": "04kllxd7vvziwqiff3vx60a0r6805wynsla73j8xkcz4yzk8q91r"
+   "commit": "1027459d44ced4daed84247770ce9ae2b5fd1993",
+   "sha256": "18824dx00w9wnbqsra3y18sxrr6r4vgj8h3mxa3n1dn14i72sjgm"
   },
   "stable": {
    "version": [
     2,
     3,
-    3
+    4
    ],
    "deps": [
     "evil"
    ],
-   "commit": "43be86d8c41841a20733718d177e8299d5379218",
-   "sha256": "04kllxd7vvziwqiff3vx60a0r6805wynsla73j8xkcz4yzk8q91r"
+   "commit": "5e92e374e6b46176d46323b884c25c44063331da",
+   "sha256": "1nflkmx08n3ya5vaipy1xg19hnqcp6f7ddsx9xjh5gl6ix2iz0az"
   }
  },
  {
@@ -26666,15 +26785,15 @@
   "repo": "gabesoft/evil-mc",
   "unstable": {
    "version": [
-    20190321,
-    1606
+    20190916,
+    348
    ],
    "deps": [
     "cl-lib",
     "evil"
    ],
-   "commit": "5205fe671803465149e578849bbbe803c23a8e4e",
-   "sha256": "03pxpjjxbai4dwp84bgxh52ahh0f6ac58xi2mds1kl4v93nm7v42"
+   "commit": "1cabb869fe70cef49f7dc06f015c3ade1a969c8c",
+   "sha256": "0p83p90faq1p02lmsfs7zrnky3cyzgy8z4m83a81r9kakjzhkrnb"
   },
   "stable": {
    "version": [
@@ -27522,14 +27641,14 @@
   "repo": "mamapanda/evil-traces",
   "unstable": {
    "version": [
-    20190818,
-    2331
+    20190906,
+    538
    ],
    "deps": [
     "evil"
    ],
-   "commit": "4eec121e2abc0dd8f32b3d7cbdbf676302c4904a",
-   "sha256": "0hqrw3jda7qci0f3xqc35x0dhc2hrkd8fddwvlgicdj628wsm7ng"
+   "commit": "1931e3ea2c64b4aec393a9c25063c330deff55e3",
+   "sha256": "12p9lfxscs182vbd4dy0m5gacs3d4kyprbz5yndpwvl8g2qsqplz"
   }
  },
  {
@@ -27731,11 +27850,19 @@
   "repo": "jjzmajic/ewal",
   "unstable": {
    "version": [
-    20190828,
-    1542
+    20190911,
+    1319
+   ],
+   "commit": "07793e2bd03ca3f473b1ecf6ed4637f7d2982ce0",
+   "sha256": "13zdsqnv6sasai8j7wlhlfp687s3a8yarrrwnxjvy5wbjjn604sk"
+  },
+  "stable": {
+   "version": [
+    0,
+    2
    ],
-   "commit": "62d0789cdcddd5bfcc85b37cf7398d616eecb8f5",
-   "sha256": "1b6sdz6y7iaah1nnbv5qwwkz9dgc6prp4y5gmgz4fw9w27b3lbgd"
+   "commit": "f822c0b26635c69a62e36cbc9696eb35b425ca61",
+   "sha256": "1qgb10mhjgpk51pwbd726pzcn48730kw9q7nfib8r4rqsgk1r9ar"
   }
  },
  {
@@ -27746,14 +27873,25 @@
   "repo": "jjzmajic/ewal",
   "unstable": {
    "version": [
-    20190825,
-    335
+    20190911,
+    1315
+   ],
+   "deps": [
+    "ewal"
+   ],
+   "commit": "07793e2bd03ca3f473b1ecf6ed4637f7d2982ce0",
+   "sha256": "13zdsqnv6sasai8j7wlhlfp687s3a8yarrrwnxjvy5wbjjn604sk"
+  },
+  "stable": {
+   "version": [
+    0,
+    2
    ],
    "deps": [
     "ewal"
    ],
-   "commit": "62d0789cdcddd5bfcc85b37cf7398d616eecb8f5",
-   "sha256": "1b6sdz6y7iaah1nnbv5qwwkz9dgc6prp4y5gmgz4fw9w27b3lbgd"
+   "commit": "f822c0b26635c69a62e36cbc9696eb35b425ca61",
+   "sha256": "1qgb10mhjgpk51pwbd726pzcn48730kw9q7nfib8r4rqsgk1r9ar"
   }
  },
  {
@@ -27764,15 +27902,27 @@
   "repo": "jjzmajic/ewal",
   "unstable": {
    "version": [
-    20190828,
-    1542
+    20190911,
+    1305
+   ],
+   "deps": [
+    "ewal",
+    "spacemacs-theme"
+   ],
+   "commit": "07793e2bd03ca3f473b1ecf6ed4637f7d2982ce0",
+   "sha256": "13zdsqnv6sasai8j7wlhlfp687s3a8yarrrwnxjvy5wbjjn604sk"
+  },
+  "stable": {
+   "version": [
+    0,
+    2
    ],
    "deps": [
     "ewal",
     "spacemacs-theme"
    ],
-   "commit": "62d0789cdcddd5bfcc85b37cf7398d616eecb8f5",
-   "sha256": "1b6sdz6y7iaah1nnbv5qwwkz9dgc6prp4y5gmgz4fw9w27b3lbgd"
+   "commit": "f822c0b26635c69a62e36cbc9696eb35b425ca61",
+   "sha256": "1qgb10mhjgpk51pwbd726pzcn48730kw9q7nfib8r4rqsgk1r9ar"
   }
  },
  {
@@ -28050,11 +28200,11 @@
   "repo": "extemporelang/extempore-emacs-mode",
   "unstable": {
    "version": [
-    20180105,
-    621
+    20190917,
+    1031
    ],
-   "commit": "ae5f40d4b0883a4519e460cd7720e5fcc3a68fa5",
-   "sha256": "1f888h7xv6zz6kq38ak1vpwjrjr2sqgwpfxwb9x0ldf3kkx4wf1w"
+   "commit": "848ad0084f27b92d1cf98dabffbad29f959a642d",
+   "sha256": "00wr025php7nl33x541s9rjm99hj0jbdcmnw9ljx5hqpm04aqm7c"
   }
  },
  {
@@ -28111,16 +28261,15 @@
   "repo": "ananthakumaran/exunit.el",
   "unstable": {
    "version": [
-    20190511,
-    614
+    20190919,
+    1238
    ],
    "deps": [
-    "dash",
     "f",
     "s"
    ],
-   "commit": "7aa008cb54e7935183a19d6b81d218de7ec38ca4",
-   "sha256": "0zp0sdnrb5mm6k1z6zqs7s042f6n24sg1y0wx6bw35za6r5f36cr"
+   "commit": "c77b0397b80d772c98fcc34c9ab131a8350fbf40",
+   "sha256": "08lhsjmibgvd4cjrvyxhwn7cqrpd83bgsvh2xqppi9mnw1xwgzd5"
   }
  },
  {
@@ -28274,14 +28423,14 @@
   "repo": "wasamasa/eyebrowse",
   "unstable": {
    "version": [
-    20190827,
-    1828
+    20190917,
+    1653
    ],
    "deps": [
     "dash"
    ],
-   "commit": "d75e37a048718d6981c366c431b93ccbe884f356",
-   "sha256": "08k6dcz2pzgv0n4rfpq0gmpzs9319h5jk5xznmh2s8y42imvp5l7"
+   "commit": "e0f6bdf3fc1eab2f036952721a7496e408ce860d",
+   "sha256": "10fwxryisgpyyxhcz8p2g3h085hd6j6qw1hi5pz70a94d3syr3ws"
   },
   "stable": {
    "version": [
@@ -28884,11 +29033,11 @@
   "repo": "technomancy/fennel-mode",
   "unstable": {
    "version": [
-    20190807,
-    17
+    20190921,
+    359
    ],
-   "commit": "7f146605feeeebdf5452450662e2f3bc1e435e6f",
-   "sha256": "0yr6f2gzgprkqhc22mq64mn119aljihziix712kk1vq59yx2l22f"
+   "commit": "686e4d28a8abeb1fa05cb21e14c4f0cc12217d63",
+   "sha256": "0wis927rya6v2mzyvsnjca1b2a1vrndlb7nskkgxs0ssvsvv68bn"
   }
  },
  {
@@ -29118,14 +29267,14 @@
   "repo": "technomancy/find-file-in-project",
   "unstable": {
    "version": [
-    20190720,
-    313
+    20190914,
+    524
    ],
    "deps": [
     "ivy"
    ],
-   "commit": "85f0fc4ab29e4339732c19be314a4920888803b2",
-   "sha256": "1skjbh7m0cck2rwmgzrrds51gipqf1jqghyfx15drc1n6kwivx3h"
+   "commit": "79baa7026803b3d877857493da3041ddf6eed050",
+   "sha256": "0q5lcfg7bpid8rl04c9qml062pyi6sqgdcvhrqxm9mcfyjq5zg72"
   },
   "stable": {
    "version": [
@@ -29373,11 +29522,11 @@
   "repo": "Ambrevar/emacs-fish-completion",
   "unstable": {
    "version": [
-    20190429,
-    822
+    20190904,
+    254
    ],
-   "commit": "e5b9b65a077319dfdb2faca9ef847db3ef55d0db",
-   "sha256": "1pjqnbyjmj64q5nwq1mrdxcls4fp5y0b6zqs785i0s6wdvrm4021"
+   "commit": "0a9a63e2cac24bfdf7dbedb5c6ab7faca23d3bfe",
+   "sha256": "1rp5y1hpdr08v374cvkqjb2i47lni0yl866wssm73ch9ql30y22n"
   },
   "stable": {
    "version": [
@@ -29882,11 +30031,11 @@
   "repo": "amake/flutter.el",
   "unstable": {
    "version": [
-    20190729,
-    444
+    20190919,
+    910
    ],
-   "commit": "a5de449cd10f98e7ea4340940b7726f299a0854a",
-   "sha256": "0v20yirkg04szaw0l7abq8qpqnhqlhgpm5hg5i8dks01dlczw29h"
+   "commit": "58ac1e19e50f9c65869c141ef9d44a70a36994bd",
+   "sha256": "024gwfjin41dxdfmx78s7w10sk4lqjlk8p5j7asddk426pmd2a14"
   }
  },
  {
@@ -29904,8 +30053,8 @@
     "flutter",
     "flycheck"
    ],
-   "commit": "a5de449cd10f98e7ea4340940b7726f299a0854a",
-   "sha256": "0v20yirkg04szaw0l7abq8qpqnhqlhgpm5hg5i8dks01dlczw29h"
+   "commit": "58ac1e19e50f9c65869c141ef9d44a70a36994bd",
+   "sha256": "024gwfjin41dxdfmx78s7w10sk4lqjlk8p5j7asddk426pmd2a14"
   }
  },
  {
@@ -30015,8 +30164,8 @@
   "repo": "flycheck/flycheck",
   "unstable": {
    "version": [
-    20190828,
-    1147
+    20190913,
+    1456
    ],
    "deps": [
     "dash",
@@ -30024,8 +30173,8 @@
     "pkg-info",
     "seq"
    ],
-   "commit": "ea176a4f6bfebd70b71a8a5e2988b49e1a58fe52",
-   "sha256": "0ys9cvhbxxq51sipk6ay13jcahgcbv869bxlhivdpjj7gmhzj5db"
+   "commit": "0006a59259ebd02c9199ddc87f0e3ce22793a2ea",
+   "sha256": "09q3h6ldpg528cfbmsbb1x2vf5hmzgm3fshqn6kdy144jxcdjlf1"
   },
   "stable": {
    "version": [
@@ -30910,8 +31059,8 @@
   "repo": "flycheck/flycheck-haskell",
   "unstable": {
    "version": [
-    20181207,
-    1646
+    20190907,
+    2035
    ],
    "deps": [
     "dash",
@@ -30920,8 +31069,8 @@
     "let-alist",
     "seq"
    ],
-   "commit": "32ddff87165a7d3a35e7318bee997b5b4bd41278",
-   "sha256": "10pgsbagq6qj4mshq5sypv0q0khck92b30sc793b4g1pfpsxvgjn"
+   "commit": "4b585264826a9f0f35d121dd52aa0e381f336d69",
+   "sha256": "1cz8yxb06acm77jlr0mk9kx79v6pnhb97p2601pik9rndr824c2a"
   },
   "stable": {
    "version": [
@@ -31541,14 +31690,14 @@
    "version": [
     0,
     3,
-    1
+    2
    ],
    "deps": [
     "flycheck",
     "phpstan"
    ],
-   "commit": "525792fc4a9ecb5dc577a7c416e298e0c45c6183",
-   "sha256": "02cgcqkgwl0rbxhndcyjd8fj57g84n8x4n9rkh671rg3r7p7c71j"
+   "commit": "de74ebfcbce53a08daf95d324d7447dede094222",
+   "sha256": "01x5gf7z0iqx601z3g4cdq6cv27aflxw5kmqrwrj0aijcb7nb9c6"
   }
  },
  {
@@ -31801,8 +31950,8 @@
     "flycheck",
     "rtags"
    ],
-   "commit": "6289e66a69d0d5ff20b12da91e735d3984ad6f88",
-   "sha256": "1ggdi4mgqw1cc0w6cijds7s4vb575v27g72h6md8h1jdsfv6pvrm"
+   "commit": "3543b8404640884d901c719bb83c5474056cf97f",
+   "sha256": "1k1d3llf150rih8dba2fg7xp9ksnbfzdsj01lziqz396p34sim0f"
   },
   "stable": {
    "version": [
@@ -33595,11 +33744,11 @@
   "repo": "cadadr/elisp",
   "unstable": {
    "version": [
-    20190829,
-    1514
+    20190904,
+    1257
    ],
-   "commit": "f2fcfc0d4e7cdb1312c5c06fd5e1820788268de3",
-   "sha256": "14rfixf6948zf5ylplzmpqr15rn1kr1qc26055kbb13klyl0qj3y"
+   "commit": "ebb2778052aeaf737adebc003957cb48cb01135e",
+   "sha256": "0qlvdpa88ic9gnb0qhijfsc9i6l3ba2zrvk4r4li3qrx0i9rpz5c"
   }
  },
  {
@@ -33676,8 +33825,8 @@
   "repo": "magit/forge",
   "unstable": {
    "version": [
-    20190820,
-    826
+    20190909,
+    2017
    ],
    "deps": [
     "closql",
@@ -33689,8 +33838,8 @@
     "markdown-mode",
     "transient"
    ],
-   "commit": "6c43971a78a08954c20992cb6b0e98a7e7295908",
-   "sha256": "1hlk6jmn4w7bq0x7syrxmk2gz4dn7iswi73dixcfkv3m97qiqxd1"
+   "commit": "4424101b416931abc1b838e48f5710bd933c2973",
+   "sha256": "0rbvmj265v75q76x1qvvyz313h6ww7kh3s8w318vghrnylj6za0y"
   },
   "stable": {
    "version": [
@@ -33745,14 +33894,14 @@
   "repo": "lassik/emacs-format-all-the-code",
   "unstable": {
    "version": [
-    20190830,
-    1152
+    20190911,
+    2017
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "15e9837a9e2d74bbb12fbaf1dcb400d0153754ba",
-   "sha256": "0bpz3i20vkd22y16cb7cllikj0sd91km2697wmix5wjsc370nimh"
+   "commit": "15a33a9b62d7ac0580c722ee4a7130bd67ba9b49",
+   "sha256": "16zka3dcxzn25ig8fg06lhiv453pnyqp791hald4r90v46p4x7qq"
   }
  },
  {
@@ -33868,6 +34017,30 @@
    "sha256": "1kiflisiabc39lxi5hcazfvcwrpasl01lqsi2sri6pyrcrjyh8mf"
   }
  },
+ {
+  "ename": "fountain-mode",
+  "commit": "12589d1eb14bfc87d2e6f2a5ff8f5fb66b574a56",
+  "sha256": "1i55gcjy8ycr1ww2fh1a2j0bchx1bsfs0zd6v4cv5zdgy7vw6840",
+  "fetcher": "github",
+  "repo": "rnkn/fountain-mode",
+  "unstable": {
+   "version": [
+    20190913,
+    637
+   ],
+   "commit": "f663ea2cfea24bf17ca539bd7ffe844351b7efe8",
+   "sha256": "0svmsia57dbakdcyjx3435n0vwlrh548j21d5mrgm788dkn668nv"
+  },
+  "stable": {
+   "version": [
+    2,
+    7,
+    3
+   ],
+   "commit": "5fe797ebea7544749bc212c77780942329a1ff70",
+   "sha256": "1ghck97vv2ygqbwgwxgbzb0wvf87w0i6vff47lzmmr2ig1ggw2yb"
+  }
+ },
  {
   "ename": "fraktur-mode",
   "commit": "855ea20024b606314f8590129259747cac0bcc97",
@@ -34060,6 +34233,25 @@
    "sha256": "051aihjdg3x22svaxhwylpi8i6s2x9j8syvsj1jgilgjjdy15l6j"
   }
  },
+ {
+  "ename": "frecentf",
+  "commit": "64d342c3814721f82dee8859d90b2da4192d8bc8",
+  "sha256": "1z20035iplkjan3nf3lr0jzdz6jh988rq281zbi4a5l271ll8lb9",
+  "fetcher": "git",
+  "url": "https://git.launchpad.net/frecentf.el",
+  "unstable": {
+   "version": [
+    20190903,
+    2109
+   ],
+   "deps": [
+    "frecency",
+    "persist"
+   ],
+   "commit": "b32eb159de14b2e0d1d1c763acd65cc6784756ae",
+   "sha256": "15pskn85dmm7dblp56b0zzby9wbc2kysb7n3q07yp8680z6lnxhg"
+  }
+ },
  {
   "ename": "free-keys",
   "commit": "55067e899ba618d4394ad9657322c92a667a0774",
@@ -34279,8 +34471,8 @@
    "deps": [
     "cl-lib"
    ],
-   "commit": "e6eb7be61c35d4a7b7d5eeb528b582639c57f08f",
-   "sha256": "10ndvjwg4c77qkh0a2ab7vdkz8z6fyk5ji7ra68cq75g7gclli77"
+   "commit": "5f1f2a00d61ea45c6114e6be333f4eeb3d85420c",
+   "sha256": "031rh3cqv3hmgf8jjgal9hnsj655bsrh4a2p0jr1fr9zvgzc7v27"
   },
   "stable": {
    "version": [
@@ -34454,8 +34646,8 @@
     20190810,
     507
    ],
-   "commit": "57b5d0df689dd7e0958e0eba1269ae32a172cd90",
-   "sha256": "1ivsy5yarapcaqrnhn6pkbipv0s83laxjlrdb3z055g0091zq8bs"
+   "commit": "f4e30922952470984460d6617e35939aa97640dd",
+   "sha256": "08dyp4z3yqc044wyff207z8bzj51z91yxfk92vv120cvach70k5z"
   },
   "stable": {
    "version": [
@@ -34816,11 +35008,11 @@
   "repo": "jaor/geiser",
   "unstable": {
    "version": [
-    20190826,
-    1736
+    20190905,
+    2337
    ],
-   "commit": "d7bcfde6303b420ca76d9364c6e8f2c6827112e6",
-   "sha256": "01n3vxczv02vj9h7w1syq62qpnaw44wryk17ssk72ihg3zrrri6v"
+   "commit": "f76340bd11dc6eb5cf6c22cb5f39e76d52b15d66",
+   "sha256": "0si9d2xcxwkf9l6sly3cckyzlrvr67ihijffjmaswbx7qkgb7gk1"
   },
   "stable": {
    "version": [
@@ -35498,8 +35690,8 @@
     "dash",
     "with-editor"
    ],
-   "commit": "bcd161d8ad3fcd80cbf69e7720c1d75a79415021",
-   "sha256": "06nxrnln7cas9sk0g7k88r9z2zbvm32ki3mab1yn9w3abgralfyc"
+   "commit": "5c424142704d481faafce7b834af67c1aca98e68",
+   "sha256": "0849yg97gkg3qp0xa67kxfq888i5nmmz0982zcvc3n4k6xswy52c"
   },
   "stable": {
    "version": [
@@ -37183,8 +37375,8 @@
     "cl-lib",
     "go-mode"
    ],
-   "commit": "9ab06b3deb1cbf00802d7824bf7107c31865f9fb",
-   "sha256": "13bz4cphm1f90bj08shbnk9556091hfv4fzpa1hkwlav09j5nk7q"
+   "commit": "1bbe1d0cb88564e6c5b74ccd78ab87a8b9998374",
+   "sha256": "1jrlcz940y8hpizsy7byimyc9drl3myfym1pg4sg374jrr1y8nz2"
   },
   "stable": {
    "version": [
@@ -37276,11 +37468,11 @@
   "repo": "dominikh/go-mode.el",
   "unstable": {
    "version": [
-    20190819,
-    2109
+    20190917,
+    1943
    ],
-   "commit": "9ab06b3deb1cbf00802d7824bf7107c31865f9fb",
-   "sha256": "13bz4cphm1f90bj08shbnk9556091hfv4fzpa1hkwlav09j5nk7q"
+   "commit": "1bbe1d0cb88564e6c5b74ccd78ab87a8b9998374",
+   "sha256": "1jrlcz940y8hpizsy7byimyc9drl3myfym1pg4sg374jrr1y8nz2"
   },
   "stable": {
    "version": [
@@ -37384,8 +37576,8 @@
    "deps": [
     "go-mode"
    ],
-   "commit": "9ab06b3deb1cbf00802d7824bf7107c31865f9fb",
-   "sha256": "13bz4cphm1f90bj08shbnk9556091hfv4fzpa1hkwlav09j5nk7q"
+   "commit": "1bbe1d0cb88564e6c5b74ccd78ab87a8b9998374",
+   "sha256": "1jrlcz940y8hpizsy7byimyc9drl3myfym1pg4sg374jrr1y8nz2"
   },
   "stable": {
    "version": [
@@ -37632,8 +37824,8 @@
     20180221,
     2015
    ],
-   "commit": "959b441ac422379a43da2230f62be024250818b0",
-   "sha256": "1mgcv5f00pkzsbwnq2y7vqvd1b4lr5a3s47cphh2qv4indfk7pck"
+   "commit": "414d861bb4acf565ff8cb05f9906a2283b7dc75a",
+   "sha256": "1ixb7c3vv8ky7gk9kpknv4hg0wgk6xfcbxxrmql9vc16g6jvcspy"
   }
  },
  {
@@ -37677,8 +37869,8 @@
     20180130,
     1736
    ],
-   "commit": "dceb47fb3ea99ad7cc4308fa2c9ecb0d012639e1",
-   "sha256": "184llmywxm3fi20lpyni3vx4wxg2z8aag8ahirka2ipnykl1z9id"
+   "commit": "5651966e0275572a9956199418d89c9ccc7b2b1a",
+   "sha256": "10lxzkz031lazd9zs3pwh2j7723gzpbhr564vsk1r4gdcbbbj2h3"
   }
  },
  {
@@ -38051,8 +38243,8 @@
     "magit-popup",
     "s"
    ],
-   "commit": "3e2022d00278b8d47ea40793d299365c5d7b53a1",
-   "sha256": "1gmfsqn46lb4anqzb0s8yr21kzg5k2arw1daz056vcspq4fy3ix1"
+   "commit": "31565d975e8c13d4577f4fa705d897ed5da2d524",
+   "sha256": "00sdbwgn4fqbkahwyys3ffdppckbd9pikwjdwh6bpm6s70lpkf98"
   },
   "stable": {
    "version": [
@@ -38665,20 +38857,20 @@
   "repo": "seagle0128/grip-mode",
   "unstable": {
    "version": [
-    20190820,
-    1726
+    20190909,
+    1939
    ],
-   "commit": "e3f5143d34ec47ee3c01a21e1d7c5dbf744bfe1a",
-   "sha256": "09ikf88nl7mig525m4432f8bjff4rdgiw3a5vjnmilmsx85n6gpd"
+   "commit": "eb574c874c76cd3e9b8ec39be04331eaeeac5f31",
+   "sha256": "1m7q1nbg3x6lgbrdsxnsbxchhfw5v0lf5dzix8lnw2wv1lsl51py"
   },
   "stable": {
    "version": [
     2,
-    0,
+    1,
     0
    ],
-   "commit": "7777b694751c0da754712b964052617de1740e42",
-   "sha256": "1kbyr3rfdbclpvxbbv66rirj7bn507izafjssvkwgjrrd6vfhdv2"
+   "commit": "eb574c874c76cd3e9b8ec39be04331eaeeac5f31",
+   "sha256": "1m7q1nbg3x6lgbrdsxnsbxchhfw5v0lf5dzix8lnw2wv1lsl51py"
   }
  },
  {
@@ -39032,8 +39224,8 @@
   "repo": "alezost/guix.el",
   "unstable": {
    "version": [
-    20190507,
-    1711
+    20190913,
+    1624
    ],
    "deps": [
     "bui",
@@ -39042,8 +39234,8 @@
     "geiser",
     "magit-popup"
    ],
-   "commit": "11e0dbf6491300d250efb3dc09d634b01e86b35b",
-   "sha256": "0j60v0h850cwxik1mhlnmqms47dkkqcnfx53qs66hi1zyp7pax5z"
+   "commit": "24918011d2f1a78d63f39bf0c462b7dab190629a",
+   "sha256": "1maag50nbgwygc6w7lbna1ml20f3k4dvxzjm3fgdqmfypi5ag891"
   },
   "stable": {
    "version": [
@@ -40001,16 +40193,16 @@
   "repo": "emacs-helm/helm",
   "unstable": {
    "version": [
-    20190830,
-    1604
+    20190920,
+    637
    ],
    "deps": [
     "async",
     "helm-core",
     "popup"
    ],
-   "commit": "c00b5826c1d5797debe92ed235d50b068a348c14",
-   "sha256": "0fzr08cln58j9d03c1znk29gw6qnj6a28z4i8p7szsifryrhy4vr"
+   "commit": "cfa42e9f94260887d5a54b3c2356d61903f424bc",
+   "sha256": "0lwhs7wlq2w698ipfjpfb0r2arkalrn8a21qdjnx3lvs4b2jj72l"
   },
   "stable": {
    "version": [
@@ -40267,8 +40459,8 @@
   "repo": "tmalsburg/helm-bibtex",
   "unstable": {
    "version": [
-    20190814,
-    1056
+    20190918,
+    1116
    ],
    "deps": [
     "biblio",
@@ -40279,8 +40471,8 @@
     "parsebib",
     "s"
    ],
-   "commit": "7e87161463c9c5ade3ed0e65aa3cde48c51b57de",
-   "sha256": "1krn85fvd0438iqs2af8vlqp8am39z6lbkda2b3hi01frp7g8sx6"
+   "commit": "5a26b35c3fa223d4c74262137f34bb2f325c4411",
+   "sha256": "0nw35f2qr5pqswz1rbkgwvd2wmvg8hzjf419w9iffx1m858k99rf"
   },
   "stable": {
    "version": [
@@ -40855,14 +41047,14 @@
   "repo": "emacs-helm/helm",
   "unstable": {
    "version": [
-    20190830,
-    635
+    20190917,
+    551
    ],
    "deps": [
     "async"
    ],
-   "commit": "c00b5826c1d5797debe92ed235d50b068a348c14",
-   "sha256": "0fzr08cln58j9d03c1znk29gw6qnj6a28z4i8p7szsifryrhy4vr"
+   "commit": "cfa42e9f94260887d5a54b3c2356d61903f424bc",
+   "sha256": "0lwhs7wlq2w698ipfjpfb0r2arkalrn8a21qdjnx3lvs4b2jj72l"
   },
   "stable": {
    "version": [
@@ -41400,14 +41592,14 @@
   "repo": "elpa-host/helm-file-preview",
   "unstable": {
    "version": [
-    20190825,
-    247
+    20190903,
+    331
    ],
    "deps": [
     "helm"
    ],
-   "commit": "7b332fc3ceb730d054bac464b78e4d6e009ff432",
-   "sha256": "0klcgqqyx4zkxy0vnqfkbydjv59za8g247x0rgk64iq62fsmm3k8"
+   "commit": "6ab26c5fb414a0c1232974fd3f888839b6844203",
+   "sha256": "0lsrcn03f4981762l2rq25ps1f2ka86q125jkh6nq7wzfb7pj71f"
   }
  },
  {
@@ -41444,8 +41636,8 @@
     "cl-lib",
     "helm"
    ],
-   "commit": "0ad34b7b5abc485a86cae6920c14de861cbeb085",
-   "sha256": "08mjsi2f9s29fkk35cj1rrparjnkm836qmbfdwdz7y51f9varjbs"
+   "commit": "b290734807ee68e7a7aface2af781d86e1fd5950",
+   "sha256": "02m05fy5qf5xfd5dh402pibbzwzmcfgqymqigkbdfyjbfbljl3zx"
   },
   "stable": {
    "version": [
@@ -41550,17 +41742,17 @@
  },
  {
   "ename": "helm-frame",
-  "commit": "febb2599e50518dadb30088bc9576aea2af092a7",
-  "sha256": "18wbwm4r3ra9214whhdbxnjrxzra4pn12wqgq5lxli1khylihm3i",
-  "fetcher": "gitlab",
+  "commit": "8bbb56b883658fdf91b984c01d2472bdf6787003",
+  "sha256": "1hmml0209z3ap35bqk9b1fh0lcfksysqszgj1ifh1mdjz81xx9sq",
+  "fetcher": "github",
   "repo": "chee/helm-frame",
   "unstable": {
    "version": [
-    20170515,
-    1950
+    20180604,
+    1005
    ],
-   "commit": "389e6461a423d649b7062ba99a2234bef7770059",
-   "sha256": "1z7iwgl1v8nkwyz3h610l97amgq9slrfxxiicsnigc9vgsqlh987"
+   "commit": "485e2a534b0de5e8dbeb144a9a60ceca00215a4a",
+   "sha256": "1hxqyyh8jzk83ppi1p5r9b9gy7k2hanh3xzp129iw9yqpmvwmsnq"
   }
  },
  {
@@ -41578,8 +41770,8 @@
     "fuz",
     "helm"
    ],
-   "commit": "57b5d0df689dd7e0958e0eba1269ae32a172cd90",
-   "sha256": "1ivsy5yarapcaqrnhn6pkbipv0s83laxjlrdb3z055g0091zq8bs"
+   "commit": "f4e30922952470984460d6617e35939aa97640dd",
+   "sha256": "08dyp4z3yqc044wyff207z8bzj51z91yxfk92vv120cvach70k5z"
   },
   "stable": {
    "version": [
@@ -41613,6 +41805,25 @@
    "sha256": "1250mh0ydap0sifcyrgs32dnr6c8d723v4c55yvwm23dzvzwycp8"
   }
  },
+ {
+  "ename": "helm-fuzzy",
+  "commit": "e0172c8a4e2393a0263373c80e6e7f654bf74dc6",
+  "sha256": "1f7lj9prgh0wpf8xmy5xi5rhs5pj3j4lz68apd95nv2idnbrrlb7",
+  "fetcher": "github",
+  "repo": "elpa-host/helm-fuzzy",
+  "unstable": {
+   "version": [
+    20190905,
+    526
+   ],
+   "deps": [
+    "flx",
+    "helm"
+   ],
+   "commit": "fc080a0b4be8a68944a64bc4fb5b38cd11a70bc7",
+   "sha256": "01632zrpl69b034srgsfidf62r1kwc8f4z8i48kz95g5n2ax1xk9"
+  }
+ },
  {
   "ename": "helm-fuzzy-find",
   "commit": "34f76bb377ed31aa42663858c407cc5476e6fe1f",
@@ -42331,8 +42542,8 @@
     "helm",
     "lean-mode"
    ],
-   "commit": "9d6b8471e2044310b4cd7cd3213b1fc8f78ec499",
-   "sha256": "0r8vfklrdw3f11cpk279jg3mnfbqm60m6klisqndkvir7vsrshni"
+   "commit": "b5ba739f68ef731c03247bf6db2708502c8ac46c",
+   "sha256": "1dx0a76l7w3ck23sdjymigk1hycqiawfwv24yz6wqyy74f1pcyjf"
   }
  },
  {
@@ -43514,8 +43725,8 @@
     "helm",
     "rtags"
    ],
-   "commit": "6289e66a69d0d5ff20b12da91e735d3984ad6f88",
-   "sha256": "1ggdi4mgqw1cc0w6cijds7s4vb575v27g72h6md8h1jdsfv6pvrm"
+   "commit": "3543b8404640884d901c719bb83c5474056cf97f",
+   "sha256": "1k1d3llf150rih8dba2fg7xp9ksnbfzdsj01lziqz396p34sim0f"
   },
   "stable": {
    "version": [
@@ -43792,15 +44003,15 @@
   "repo": "wandersoncferreira/helm-spotify-plus",
   "unstable": {
    "version": [
-    20190807,
-    2115
+    20190913,
+    2236
    ],
    "deps": [
     "helm",
     "multi"
    ],
-   "commit": "e52233523917596dd3862e1151a027ce89a80a38",
-   "sha256": "0h4lj18rvhwcsb0k7ckp81h1aank9pf0dsa3qb578n10i9p6bb4y"
+   "commit": "c3922ec368250965e483876cde5880d88a40a71b",
+   "sha256": "12zl775l7zikv268vypnb56ly2h0y3sf5wxv5rc2amnmwgrikvra"
   }
  },
  {
@@ -44149,14 +44360,14 @@
   "repo": "brotzeit/helm-xref",
   "unstable": {
    "version": [
-    20190821,
-    1252
+    20190916,
+    1544
    ],
    "deps": [
     "helm"
    ],
-   "commit": "5290e2a05209b742d7efcd3e03b5f51ac1eab6ad",
-   "sha256": "1jkjm43fnwc4n9h5rrpkb2sgs2k0nb5fmxxn08b4iyz992lgmk7b"
+   "commit": "316e1bdb877ec4634addc422cdb9572ee3e2afe0",
+   "sha256": "14zgww1qyk7cp80p6f3viljjbibm3h0c51alplrmjdng57xy0wgq"
   }
  },
  {
@@ -44327,25 +44538,26 @@
   "repo": "jjzmajic/hercules.el",
   "unstable": {
    "version": [
-    20190820,
-    1712
+    20190920,
+    518
    ],
    "deps": [
     "which-key"
    ],
-   "commit": "aace3409bc4d78fec3006b2906eb2ae99cadd9f4",
-   "sha256": "1s88hmw671in3lrmsbbc3w6fs1ccgzip8k46j79gyf50vzzfcpk7"
+   "commit": "e6fcb0df3fe877bec2d708f4d034da685d8a1081",
+   "sha256": "0i1bza4nj01z23ig340svyr0lcl284lcpg1lpnhc7cmybjlv27nl"
   },
   "stable": {
    "version": [
     0,
-    2
+    2,
+    1
    ],
    "deps": [
     "which-key"
    ],
-   "commit": "8d156df2b7ae2866bfe44ee1b9c038379524147a",
-   "sha256": "17izhdq6pgg25nkl1zlqri18dhjgxwkw95iy230adsbk8m0iys4g"
+   "commit": "489ed27f978c8ae7ce0587d4677ef14d59776008",
+   "sha256": "19939pf5d6p2facmfhpyghx0vipb5k6ry3bmkmjfkj1zp132zfqf"
   }
  },
  {
@@ -44576,17 +44788,17 @@
  },
  {
   "ename": "highlight",
-  "commit": "f0a8eb0eefe88b4ea683a4743c0f8393506e014b",
-  "sha256": "11icn6f46synw6xvs2a266g43fvpnz8i7d7dyr0iywzjpbpyhsd2",
-  "fetcher": "git",
-  "url": "https://framagit.org/steckerhalter/highlight.el.git",
+  "commit": "38433e95f73ab20f27254a084d0b245c6e62d882",
+  "sha256": "0ik2kci2y404zzvs78h74v21ssgi6f0jdzzbq45fhdhjra02kzzz",
+  "fetcher": "github",
+  "repo": "emacsmirror/highlight",
   "unstable": {
    "version": [
-    20181002,
-    1151
+    20190710,
+    1527
    ],
-   "commit": "ea733e17884aeae19172407e20559fc693fdd3a7",
-   "sha256": "13ajbhpwvdmk0mzaffj45gxqmq13b57d81iqdpg9q2l2wjk95jq7"
+   "commit": "9258a2b8362d737115cbd87618f947eadb140411",
+   "sha256": "0pbqzgbfkm8smi23j94hirxh2r1yc0ipyjbbv1y906br6bx5c1a8"
   }
  },
  {
@@ -45248,11 +45460,11 @@
   "repo": "tarsius/hl-todo",
   "unstable": {
    "version": [
-    20190807,
-    1831
+    20190918,
+    2149
    ],
-   "commit": "be57dbc5a4667e4a60b8249b53fa176db1019c8e",
-   "sha256": "12swld4a723wqkh5h9jf3l4lj5rsidgmna53n8g48w8qvi2gz8l8"
+   "commit": "d7673363ef318a417adc28e36cafb78d01a671af",
+   "sha256": "11d7kmgdpjmjlnfkhfhwvwjdjaag0iscscdbg6gf1hkch19055cp"
   },
   "stable": {
    "version": [
@@ -45557,6 +45769,26 @@
    "sha256": "01sj9c8mxqaif8wh6zz9v2czjaq7vcdi66drldyjmifkln6rg2v8"
   }
  },
+ {
+  "ename": "howdoyou",
+  "commit": "eb5356c3e094e93c09398bfd628b1594c7e3ec20",
+  "sha256": "0dnlhkpnjag6vk7qyfgzc7p0fs1b01pc3dnm6bgw19ghdp1wvp8y",
+  "fetcher": "github",
+  "repo": "thanhvg/emacs-howdoyou",
+  "unstable": {
+   "version": [
+    20190916,
+    1812
+   ],
+   "deps": [
+    "org",
+    "promise",
+    "request"
+   ],
+   "commit": "b84874a58c2301bc4c80155a9552eaad1e026b4b",
+   "sha256": "0ssx3zibsqf66biv7gypgi3i29pkmpgy8f5ydynl03m5ix3f2b86"
+  }
+ },
  {
   "ename": "howm",
   "commit": "0099a1f9b0efb3fc3a1420cfe71a647ec6458998",
@@ -45607,8 +45839,8 @@
    "deps": [
     "dash"
    ],
-   "commit": "a5a046e7c26fbcda0b757a64b30ca3e5b1cc6d69",
-   "sha256": "15vqnl72ahydj0qjg7y7na1i6n8800fl0na2glgrrwyhzy0z2sa2"
+   "commit": "3c1f3b527da6ad1b219d64957257acb22971cd73",
+   "sha256": "0mdg9v9vqjprqp6qbn8rk60b4dr6fam2p0g078zkw9092cvbzzmj"
   },
   "stable": {
    "version": [
@@ -45660,15 +45892,15 @@
   "repo": "plexus/html-to-hiccup",
   "unstable": {
    "version": [
-    20161028,
-    1401
+    20190909,
+    1549
    ],
    "deps": [
     "dash",
     "s"
    ],
-   "commit": "99217a5058626d253ed8ada51a7642071fe54ba5",
-   "sha256": "1cvlh1iqjdmgwbw254g0rfdshsj7dhqjjp56gwqhn2fqkga44a7i"
+   "commit": "50a52e2b0d13d865187acdf775b8203d5003f2f1",
+   "sha256": "1qi092mw2n08v6yr0j6hlpx0pnlcnhxjqbsrlw9pn4yin6zk91yp"
   }
  },
  {
@@ -46078,14 +46310,14 @@
   "repo": "ieure/hyperspace-el",
   "unstable": {
    "version": [
-    20190702,
-    2331
+    20190908,
+    550
    ],
    "deps": [
     "s"
    ],
-   "commit": "6441da7a816b4bf6faba21cb7b8cc1a1db6f35d5",
-   "sha256": "10l82fzp7m57bkzbqgmz1sp42mqkcmz4i6w9rv2hpzdp7ccgfr9v"
+   "commit": "825ac47887bf2f63e7dc2ecce264a52d9f0fae70",
+   "sha256": "00bjwgg67y6igm2k2rwrw4n35jiw5akhl01mhbggwy999gb01cg2"
   },
   "stable": {
    "version": [
@@ -46559,8 +46791,8 @@
     "memoize",
     "s"
    ],
-   "commit": "61c6fc60c2c7c70cf07fa533914bd2dae27c902a",
-   "sha256": "0qwi4prdx6flfzkzhqz15xbvlcxdb9gg3i1hz350p7h2kcfjkqpa"
+   "commit": "fcb6fa0c2f5989b2e79f2dc1ef57d03e455cce44",
+   "sha256": "1wq5gbr87f6c3bbsndkg50ndf6s21pzz49dmxaa4sckjs2ax9mzx"
   },
   "stable": {
    "version": [
@@ -47624,17 +47856,18 @@
   "repo": "NicolasPetton/Indium",
   "unstable": {
    "version": [
-    20190715,
-    1457
+    20190830,
+    2019
    ],
    "deps": [
     "company",
     "js2-mode",
     "js2-refactor",
+    "json-process-client",
     "seq"
    ],
-   "commit": "971e310b8eec87afbf1f9bf927e12848deb1c058",
-   "sha256": "1rllgalxa73dcgmakbly23m8iwhszq44hnjpkwx5hn11zfdgx0wx"
+   "commit": "ded54e3b278a9358a15927b3085ea64562fbf2e6",
+   "sha256": "1dmdlm913rkxvhqj42n2mnqyay73y8ka6xdrs0w8xgq1r508iqmn"
   },
   "stable": {
    "version": [
@@ -47991,11 +48224,11 @@
   "repo": "ideasman42/emacs-inkpot-theme",
   "unstable": {
    "version": [
-    20190816,
-    715
+    20190907,
+    1024
    ],
-   "commit": "54adc447d30e60b6e6c39220e8b36d93d63fecac",
-   "sha256": "0pk8wgbxrly5lz0xzbk0kf5rx8z3cbyv9wj6l8s1zdc0bzj7i1nk"
+   "commit": "f6f148eebef72939b90a1822c1c3a257e22f802e",
+   "sha256": "0jxh9plw699b7w6vi6km4154ixgn5w8a1hx9v99s0icf8rpvrcnw"
   }
  },
  {
@@ -48235,16 +48468,16 @@
   "repo": "commercialhaskell/intero",
   "unstable": {
    "version": [
-    20190530,
-    1308
+    20190919,
+    216
    ],
    "deps": [
     "company",
     "flycheck",
     "haskell-mode"
    ],
-   "commit": "61caa798bd385acf918b3639cf03f336b618e78b",
-   "sha256": "0s6ik53anwljd858xs69awx42v70ifl3pcq8njx0msfqd4qalhlx"
+   "commit": "bab8e85b1aea9b03dfe05048bcdc0395e05e9b20",
+   "sha256": "19zl7dydg2lf8msl2ls9r85f4xw3x2796w5j4h7dxxz6flljhhby"
   },
   "stable": {
    "version": [
@@ -48688,8 +48921,8 @@
    "deps": [
     "pythonic"
    ],
-   "commit": "4d8ecfcadf58ea51368e66ecf6f2a95a95953fcf",
-   "sha256": "0gslib1r9d9dqd9r89dfg8npkybjw2bjdrbs0z2qcnfa82x4fq4z"
+   "commit": "a0f6be09b92dff312b6ef9bec30f58cd8ada9623",
+   "sha256": "14hd6hbvsabrmqd44l2l598bib636wn2mzvpdwg61wjrbsd2czyy"
   }
  },
  {
@@ -48848,8 +49081,8 @@
   "repo": "tmalsburg/helm-bibtex",
   "unstable": {
    "version": [
-    20190814,
-    1056
+    20190918,
+    1116
    ],
    "deps": [
     "biblio",
@@ -48860,8 +49093,8 @@
     "s",
     "swiper"
    ],
-   "commit": "7e87161463c9c5ade3ed0e65aa3cde48c51b57de",
-   "sha256": "1krn85fvd0438iqs2af8vlqp8am39z6lbkda2b3hi01frp7g8sx6"
+   "commit": "5a26b35c3fa223d4c74262137f34bb2f325c4411",
+   "sha256": "0nw35f2qr5pqswz1rbkgwvd2wmvg8hzjf419w9iffx1m858k99rf"
   },
   "stable": {
    "version": [
@@ -48890,15 +49123,15 @@
   "repo": "wandersoncferreira/ivy-clojuredocs",
   "unstable": {
    "version": [
-    20190810,
-    258
+    20190907,
+    2053
    ],
    "deps": [
     "edn",
     "ivy"
    ],
-   "commit": "7af9cef998a608a7f505120af4754779f3014106",
-   "sha256": "1zg730gby1l0h1vrhbzwba2ybh1rk7n9gj1a369mcd2kkdlsvw2m"
+   "commit": "dd33a25f1de4339f75f05689ed60fe1b1c97f554",
+   "sha256": "0km1par5jhhbdbn1sccpsz0drqvmmjg1905xyc2bbfc2xx38cg1i"
   }
  },
  {
@@ -48942,8 +49175,8 @@
   "repo": "s-kostyaev/ivy-erlang-complete",
   "unstable": {
    "version": [
-    20190406,
-    1736
+    20190910,
+    426
    ],
    "deps": [
     "async",
@@ -48951,8 +49184,8 @@
     "erlang",
     "ivy"
    ],
-   "commit": "f3a7088ba62746932ac0084e254e4235b93febcc",
-   "sha256": "0sdxcx1ihb51khi5chdm80mzwh8ygfs86pndgh5gq8dzbqpi2ax4"
+   "commit": "fb2e31863cb0305bb3e16c094d29ff78a7414603",
+   "sha256": "0p16lxaana6zb2dlci3d6wwslcw4pifvnmhf3ymbhccmc36v5yqi"
   },
   "stable": {
    "version": [
@@ -48978,14 +49211,14 @@
   "repo": "clemera/ivy-explorer",
   "unstable": {
    "version": [
-    20190722,
-    845
+    20190909,
+    1921
    ],
    "deps": [
     "ivy"
    ],
-   "commit": "cb41a9e5df1cfad5877ab5429b9250e7ba082e4e",
-   "sha256": "0svlix3sr2jlr5awdvism1akmnca0vn0mq072s38w1q19q461cii"
+   "commit": "a413966cfbcecacc082d99297fa1abde0c10d3f3",
+   "sha256": "1720g8i6jq56myv8m9pnr0ab7wagsflm0jgkg7cl3av7zc90zq8r"
   },
   "stable": {
    "version": [
@@ -49279,27 +49512,27 @@
   "repo": "raxod502/prescient.el",
   "unstable": {
    "version": [
-    20190728,
-    1607
+    20190921,
+    3
    ],
    "deps": [
     "ivy",
     "prescient"
    ],
-   "commit": "ea8e9fea4385272924d09c91220c7f2e9ac95b3f",
-   "sha256": "1apb9v31ajq586f7mqachv238yv40gacrjmh2s8mnk45xil72swy"
+   "commit": "2f01b640e3a487718dbc481d14406005c0212ed9",
+   "sha256": "1wqk1g8fjpcbpiz32k7arnisncd4n9zs84dn3qn9y8ggjzldqy91"
   },
   "stable": {
    "version": [
     3,
-    2
+    3
    ],
    "deps": [
     "ivy",
     "prescient"
    ],
-   "commit": "653ca4b66954b7f1b6e4635a574234dd316c11a3",
-   "sha256": "0d60h4rfm5jcf8cf11z91wjqp0xcrviskqzyqhfliqvy2i2yl6ks"
+   "commit": "2f01b640e3a487718dbc481d14406005c0212ed9",
+   "sha256": "1wqk1g8fjpcbpiz32k7arnisncd4n9zs84dn3qn9y8ggjzldqy91"
   }
  },
  {
@@ -49378,8 +49611,8 @@
     "ivy",
     "rtags"
    ],
-   "commit": "6289e66a69d0d5ff20b12da91e735d3984ad6f88",
-   "sha256": "1ggdi4mgqw1cc0w6cijds7s4vb575v27g72h6md8h1jdsfv6pvrm"
+   "commit": "3543b8404640884d901c719bb83c5474056cf97f",
+   "sha256": "1k1d3llf150rih8dba2fg7xp9ksnbfzdsj01lziqz396p34sim0f"
   },
   "stable": {
    "version": [
@@ -49708,11 +49941,11 @@
   "repo": "ALSchwalm/janet-mode",
   "unstable": {
    "version": [
-    20190605,
-    443
+    20190917,
+    124
    ],
-   "commit": "d5555cc83c1893a1c0ea04d48857d5e71b138c06",
-   "sha256": "1lzs5zh4ipvyxi5vzbcpxrdjrrb0vddbcajzcbsi0784cs3ndzkk"
+   "commit": "349eba576455f1c8f40acaa77ef222bf6432c4e7",
+   "sha256": "0c0idb1rfp7n99jq1jmjvgmv77f38jrvxjy95lx27j743i8zkb7d"
   }
  },
  {
@@ -50311,14 +50544,14 @@
   "repo": "nyyManni/jiralib2",
   "unstable": {
    "version": [
-    20190720,
-    1329
+    20190917,
+    1733
    ],
    "deps": [
     "request"
    ],
-   "commit": "9e3c238d96a98d6d156dbb38dcbaecf1450b9d2e",
-   "sha256": "1332jnn63wl00l9701qvjx9z6sxisygvn9bz366yhiq2racfrgb4"
+   "commit": "3d3fb0a65260a267123cddf52ee100561ef504fd",
+   "sha256": "0a6x1d6h85b14wfhmnmss9cvbkalfjmybq7bm1187g3afg3ycy7g"
   }
  },
  {
@@ -50612,6 +50845,24 @@
    "sha256": "1fv8lpjanyn6chf502lz0j438hfxhqz1b0z2kxsd4jgy20ixchmg"
   }
  },
+ {
+  "ename": "js-react-redux-yasnippets",
+  "commit": "b5eef6590b2070ab46a5ab216cdcc6ab82174e47",
+  "sha256": "1mkcgpca4kzs31p0r5iwplwsm8jmf8w6h1v1a7qvpqan3gj7kidb",
+  "fetcher": "github",
+  "repo": "sooqua/js-react-redux-yasnippets",
+  "unstable": {
+   "version": [
+    20190911,
+    1259
+   ],
+   "deps": [
+    "yasnippet"
+   ],
+   "commit": "70785d126a28ffcb314fb4b354319418586e06b1",
+   "sha256": "0adlnjkcq0kpadc1dqwfzrrk0xd4jc0rc4k8hbj6nh4dhc7shnk0"
+  }
+ },
  {
   "ename": "js2-closure",
   "commit": "61bf3e70ae38a78184f0b373ff6f0db234f51cb2",
@@ -51121,20 +51372,20 @@
   "repo": "tpapp/julia-repl",
   "unstable": {
    "version": [
-    20190828,
-    1646
+    20190908,
+    1717
    ],
-   "commit": "94761603d368f05eaed3573312503db940f4edfe",
-   "sha256": "1h3h5s0ls3shwgg6fl3sk0iszqdd90nz2kl5cpj1bbqfgw0fivmj"
+   "commit": "b8155b8a1e23e1ad740fd7bd49b5d841b1365c7d",
+   "sha256": "0qdn70h6k03l3xmv4xmbvrs1lx632jihhmkvjxk5hp4nk5phh9rk"
   },
   "stable": {
    "version": [
     1,
-    1,
+    2,
     0
    ],
-   "commit": "6eb58ef8b2e922e042fb0aee399547291fce06a4",
-   "sha256": "05siwlyafga6ihksmd4v7dlhn1c3f6vg4ns255apm7vnmfryzvkf"
+   "commit": "b8155b8a1e23e1ad740fd7bd49b5d841b1365c7d",
+   "sha256": "0qdn70h6k03l3xmv4xmbvrs1lx632jihhmkvjxk5hp4nk5phh9rk"
   }
  },
  {
@@ -51287,8 +51538,8 @@
   "repo": "dzop/emacs-jupyter",
   "unstable": {
    "version": [
-    20190828,
-    2043
+    20190917,
+    1642
    ],
    "deps": [
     "cl-lib",
@@ -51296,8 +51547,8 @@
     "websocket",
     "zmq"
    ],
-   "commit": "aa9b634e7b26347a9b938da4cb97184b73651a64",
-   "sha256": "0k1piakj4rzygy73jd6wv9hd6nhci3d056xfiaaala6vywfllvxg"
+   "commit": "dcf80d51dbf9c8eea9679d5a54ca771221d6a1e0",
+   "sha256": "02zjnyw8x4dy9il9ans2c9mhz4lj6ni1s1brgbsbydkli1xavdhm"
   },
   "stable": {
    "version": [
@@ -51580,16 +51831,30 @@
   "repo": "magnars/kaocha-runner.el",
   "unstable": {
    "version": [
-    20190826,
-    916
+    20190904,
+    1950
+   ],
+   "deps": [
+    "cider",
+    "parseedn",
+    "s"
+   ],
+   "commit": "1376d50f1fc91f9345351aeb4960b54bf83be59e",
+   "sha256": "06zp5kshcsxf91d4as0nw1ncxx1a8ii6npzvk485sjrghnldsccm"
+  },
+  "stable": {
+   "version": [
+    0,
+    3,
+    0
    ],
    "deps": [
     "cider",
     "parseedn",
     "s"
    ],
-   "commit": "5973bf9619d8c8b8f69824246210f31ea644127b",
-   "sha256": "1sr7zbdbg3hkcbmpr7fwpw26d6j4vk0a3cxnlr2pq2f5zy9n0hax"
+   "commit": "c4ec9cdc817e5f4c3f8d6013e44ea2df8f3eb07f",
+   "sha256": "062c6j8l2vv2vc23z5iq4b50p92k6bni1rayhhd8j0h5bkiml4w3"
   }
  },
  {
@@ -51820,8 +52085,8 @@
     20190721,
     1357
    ],
-   "commit": "a243f0e0fdc9ee2b22ee19594de0c3b966b2445f",
-   "sha256": "0pzppcxzspx1k6r7vd88fn56r21d0g1jvq4w0ymlzm63vwda4p6i"
+   "commit": "f4a27da3c09dbee62d63dd756bc44652f6319692",
+   "sha256": "1bw3ywjv49bmkxkcjfr8pnshy2kxklfx253cd1qaplw1g28d0plb"
   }
  },
  {
@@ -52252,8 +52517,8 @@
     20180702,
     2029
    ],
-   "commit": "cefc5a72118021e01660734d08d1ad2433c7131e",
-   "sha256": "140h62p9i4h3jhf7rpsxn4ymg0dnxgf9kg070zc1fdvkj52gxxlw"
+   "commit": "72ac4e8f56a4ee432c9279cab044829beda22469",
+   "sha256": "0mvc71lxsx7wjkbravsj09zc5bhbq55hk1d0phwvzvjc271h38wy"
   },
   "stable": {
    "version": [
@@ -52273,14 +52538,14 @@
   "repo": "stardiviner/kiwix.el",
   "unstable": {
    "version": [
-    20190811,
-    1116
+    20190904,
+    1248
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "d2ae3386b52a25c080d8502fc19207d997676cd2",
-   "sha256": "0fsndh8nwpmnbv505r26cxxgxx8wlvx9h8pgb95im6q6pj2g7p9x"
+   "commit": "878b02be15ea9aebe939189fd10598b057b739af",
+   "sha256": "18g1jid2z6gls4ijgz3k8b5gaij3fs5rwrn0i8bgly6jmk6nx8rp"
   },
   "stable": {
    "version": [
@@ -52439,11 +52704,11 @@
   "repo": "Emacs-Kotlin-Mode-Maintainers/kotlin-mode",
   "unstable": {
    "version": [
-    20190116,
-    2055
+    20190917,
+    1807
    ],
-   "commit": "0e542ae2f78420618df8b0123dfe168a37dce333",
-   "sha256": "1rv3vxw3dx477sapfd0hj3pkl3x0sihdsyl671azbcr02z67xl6p"
+   "commit": "d6720fe9bc2ce447f213c470bd18fad8e04dc18b",
+   "sha256": "093yirwm3w0z2x0f07kggivkvgcaqhkar0fqbfagd9nly2f0jzr2"
   }
  },
  {
@@ -52695,8 +52960,8 @@
     20190320,
     1827
    ],
-   "commit": "d32477943ff6a2ea158c560a7b0c67537432bc2b",
-   "sha256": "1mlpdma7s4q54k54740q7r0ykkhkr3avxq8h5zmirc3lib7rrxv0"
+   "commit": "17a21954725eae3bf7b77f724d7783936eb33742",
+   "sha256": "0q1j5h4nxpckfd5apwl4iqhgdnjpy2fjf9kqfknyiz7c7h7424d0"
   }
  },
  {
@@ -53127,20 +53392,20 @@
   "repo": "conao3/leaf.el",
   "unstable": {
    "version": [
-    20190828,
-    1538
+    20190917,
+    1451
    ],
-   "commit": "daa8b5194f5a05b74a9eb46f6787f46ddfe5778d",
-   "sha256": "05f9vdbk31jpqpc5afnwpnzwaswmlrvz9cr09ncrbjwcap06705i"
+   "commit": "31df91362e8e14e51ba3c16ea17d914e7c3986e1",
+   "sha256": "1zl6qkn6cd5f85d7w03w3az7s7dmz0jp3g6w1pwwhdf76dcw3lhx"
   },
   "stable": {
    "version": [
     3,
-    3,
+    5,
     0
    ],
-   "commit": "cecaaed04bd0f756b3ac98922768d61229ed2322",
-   "sha256": "1d70dfqlr5j2d5ns16dbdibhyfm6ss0khcj7hang3rhyiyrhpkra"
+   "commit": "c8ca1ecc892229dc16019fe3a7eb98a7307e746f",
+   "sha256": "1rgd59146wad92yc64las0qgx67k2ifgsw1vwhp40xvkd7kb0r6d"
   }
  },
  {
@@ -53151,14 +53416,14 @@
   "repo": "conao3/leaf-keywords.el",
   "unstable": {
    "version": [
-    20190816,
-    1859
+    20190911,
+    1658
    ],
    "deps": [
     "leaf"
    ],
-   "commit": "c314c8295973f75034f0dc2946b18087d3408e66",
-   "sha256": "114g469016pjar5wmr126cpd6cfiliz4w0lmw1rlmafc53h3wbr7"
+   "commit": "29cae76ea7817fe3719f4ebf6751cf434567e4d0",
+   "sha256": "0qsmixhn7jjlzxnxjs77nmyzqh6q0q9ssgjj7gnp3i4llv2jlj3y"
   },
   "stable": {
    "version": [
@@ -53178,8 +53443,8 @@
   "repo": "leanprover/lean-mode",
   "unstable": {
    "version": [
-    20180906,
-    1645
+    20190914,
+    958
    ],
    "deps": [
     "dash",
@@ -53188,8 +53453,8 @@
     "flycheck",
     "s"
    ],
-   "commit": "9d6b8471e2044310b4cd7cd3213b1fc8f78ec499",
-   "sha256": "0r8vfklrdw3f11cpk279jg3mnfbqm60m6klisqndkvir7vsrshni"
+   "commit": "b5ba739f68ef731c03247bf6db2708502c8ac46c",
+   "sha256": "1dx0a76l7w3ck23sdjymigk1hycqiawfwv24yz6wqyy74f1pcyjf"
   }
  },
  {
@@ -53270,11 +53535,11 @@
   "repo": "ledger/ledger-mode",
   "unstable": {
    "version": [
-    20190811,
-    2340
+    20190901,
+    1439
    ],
-   "commit": "0114525803860b18a34624339825219bb6b8943e",
-   "sha256": "04di2f51i0gqvwj8x2wn1f85a4iyg6gf8hkig4z244j8jv489v6d"
+   "commit": "5067e40805c40e83424d206584838ffa8c8117c7",
+   "sha256": "093gbki5cvjscrl77nabh845axkxczqwbamwb4svc7wcky5xlpmx"
   },
   "stable": {
    "version": [
@@ -53309,16 +53574,17 @@
   "repo": "kaiwk/leetcode.el",
   "unstable": {
    "version": [
-    20190827,
-    1032
+    20190910,
+    221
    ],
    "deps": [
+    "aio",
+    "dash",
     "graphql",
-    "request-deferred",
     "spinner"
    ],
-   "commit": "2b2f44bbd46d3c8db23473833824a237073f6c23",
-   "sha256": "1bcknygmz1ay2j90cs6rmiax5gsdwrysvv2w13cmz601bv3prrgf"
+   "commit": "044fd1cd0bc727d888b424ffc5a81b22c7b802c1",
+   "sha256": "1i9wbbymdfjyz6z0vd5bl1c733pbfcf5cf1shl98s54sg5lq0p89"
   }
  },
  {
@@ -53492,11 +53758,11 @@
   "repo": "fniessen/emacs-leuven-theme",
   "unstable": {
    "version": [
-    20190829,
-    921
+    20190831,
+    1008
    ],
-   "commit": "69ab5c2db93cf58a57354a5d78e825d191109717",
-   "sha256": "1bsshad7y9yicbzp2fp53jv4kkli1slkyw7b15db4bgzj8br55s5"
+   "commit": "026da5d614864a60bb151f0e75240a938e41923b",
+   "sha256": "008ynbzcszsbyj3pi9cm6ig1ks059xprkyhd74dnw8grlddwfimd"
   }
  },
  {
@@ -53540,8 +53806,8 @@
     20170121,
     1254
    ],
-   "commit": "9d15bc75a34052f7f2749bd38b3d0297ed60b29a",
-   "sha256": "07ysaihl24fiqz8n6hvdvaj53nyalk68dsn073zb8q88sdmzf33w"
+   "commit": "a6c9922f31f59686bb48db1b8d5b75e74e79757a",
+   "sha256": "0wvk341hx0fsv4hihlr508grqzgzza0w3gfqh4c1f88mdpmm62if"
   },
   "stable": {
    "version": [
@@ -53552,6 +53818,36 @@
    "sha256": "0pgwi0h0d34353m39jin8dxw4yykgfcg90k6pc4qkjyrg40hh4l6"
   }
  },
+ {
+  "ename": "libbcel",
+  "commit": "31f4cbd89473f48ad6b4cc78028e8c51f1ee95a7",
+  "sha256": "03sfd2af54cm53hh8k3d0b9jy7cj4f1hgd93wqvqi7bbcz91krg2",
+  "fetcher": "github",
+  "repo": "DamienCassou/libbcel",
+  "unstable": {
+   "version": [
+    20190919,
+    1948
+   ],
+   "deps": [
+    "request"
+   ],
+   "commit": "f3eab975b7222eb4441743744eb8697bd82b57ec",
+   "sha256": "1sj2ijphaabkayiry0vzx0digrz5dkacl78agrv0lz51m8r5c4fd"
+  },
+  "stable": {
+   "version": [
+    0,
+    3,
+    0
+   ],
+   "deps": [
+    "request"
+   ],
+   "commit": "f3eab975b7222eb4441743744eb8697bd82b57ec",
+   "sha256": "1sj2ijphaabkayiry0vzx0digrz5dkacl78agrv0lz51m8r5c4fd"
+  }
+ },
  {
   "ename": "libelcouch",
   "commit": "209d5c507cfe42b152c21a4534c3ba549186420f",
@@ -53620,20 +53916,20 @@
   "repo": "mpdel/libmpdel",
   "unstable": {
    "version": [
-    20190827,
-    1905
+    20190918,
+    1609
    ],
-   "commit": "5045f33e270b07ba98ea876e9a31f1acdedc6cd9",
-   "sha256": "0l29q4f0qdkfadr0w7dz4cmv9psnpmf1vwqh1wzavp2g3jf038ln"
+   "commit": "5cec415bd9db566088ec44b8bb4dd0a9cc76ccdc",
+   "sha256": "0qx7h6y9ih6qkijspzpn8gfpxjb486qrp0g4b9fpfzp8igc2ddik"
   },
   "stable": {
    "version": [
     1,
     1,
-    0
+    1
    ],
-   "commit": "5045f33e270b07ba98ea876e9a31f1acdedc6cd9",
-   "sha256": "0l29q4f0qdkfadr0w7dz4cmv9psnpmf1vwqh1wzavp2g3jf038ln"
+   "commit": "5cec415bd9db566088ec44b8bb4dd0a9cc76ccdc",
+   "sha256": "0qx7h6y9ih6qkijspzpn8gfpxjb486qrp0g4b9fpfzp8igc2ddik"
   }
  },
  {
@@ -54042,8 +54338,8 @@
     "evil",
     "lispy"
    ],
-   "commit": "e5e6cddb2cff93ee19f34d5dde8f46d010a90dad",
-   "sha256": "1v07s2l3pww30rsmq4dp4nxwmkz7cvdgfbjsyfxkny4i87v5figz"
+   "commit": "56198f1c4488a52a0d0512c717dff36e8b9fbfd0",
+   "sha256": "1zrhn5pgjvwprwnsr85zs4rhs7mijyq3wbd5s0ff96m9n1dbj6vp"
   }
  },
  {
@@ -54974,8 +55270,8 @@
   "repo": "emacs-lsp/lsp-java",
   "unstable": {
    "version": [
-    20190817,
-    1436
+    20190918,
+    1601
    ],
    "deps": [
     "dash",
@@ -54986,8 +55282,8 @@
     "markdown-mode",
     "request"
    ],
-   "commit": "ccc40d3249c031e34fec13d4b82da694addb0274",
-   "sha256": "1nb40nnj7caz2mvfwnpwnicck1ippvnqhypqcglp6bvvz75h32z9"
+   "commit": "df3cfc30eaa9d7605ac3db5d17d8a02efaf50527",
+   "sha256": "0whybqasbi09ki9714k139vm0hmzvxrn0r20ibk8rfj6lxprkwl5"
   },
   "stable": {
    "version": [
@@ -55034,8 +55330,8 @@
   "repo": "emacs-lsp/lsp-mode",
   "unstable": {
    "version": [
-    20190828,
-    1641
+    20190918,
+    1903
    ],
    "deps": [
     "dash",
@@ -55045,8 +55341,8 @@
     "markdown-mode",
     "spinner"
    ],
-   "commit": "4835feb8189fab4b00ba54ba73837c931022931d",
-   "sha256": "0f859fhy245aq6r0w4ibyaqjr1i4s1f850w4867f9knfw67zj64h"
+   "commit": "9330d7c3f1431b38f84a2296572531f9574b7d6d",
+   "sha256": "1sy68585wp07av0z8aam93j4ywcz0b95zg1da59w86k54j6i27cj"
   },
   "stable": {
    "version": [
@@ -55139,8 +55435,8 @@
   "repo": "emacs-lsp/lsp-python-ms",
   "unstable": {
    "version": [
-    20190826,
-    1758
+    20190911,
+    1324
    ],
    "deps": [
     "cl-lib",
@@ -55148,8 +55444,8 @@
     "lsp-mode",
     "python"
    ],
-   "commit": "d2f9bddc3988a43e680b858e9da44f7b0a0eae55",
-   "sha256": "0hmmv8rjg89bgkhsf2wcllmz3rljhnnncg00wsiz6fiwh0dw8lpp"
+   "commit": "42222bacf09c4ca18302ac39d50ea09d196e2816",
+   "sha256": "09a8kjc47v5qcrd4p0b911idbhh760xdir2bgkn3gm2w5l4krfyj"
   }
  },
  {
@@ -55220,8 +55516,8 @@
   "repo": "emacs-lsp/lsp-ui",
   "unstable": {
    "version": [
-    20190823,
-    541
+    20190915,
+    856
    ],
    "deps": [
     "dash",
@@ -55229,8 +55525,8 @@
     "lsp-mode",
     "markdown-mode"
    ],
-   "commit": "845fbd40f20d63b9eff592ddefeefd2263f6b27c",
-   "sha256": "0z8cds09wv275ckx13dbw6z84lfldij2lfx0az7cj1hkfsrwhxd4"
+   "commit": "c8fa40c0f9c65877d1cabe1739e5f787adb24898",
+   "sha256": "040qzkd1zvyb0q3yxs2vd4f3qp37c8anr3zcmx96bjvj1v7pmpmn"
   },
   "stable": {
    "version": [
@@ -55663,8 +55959,8 @@
   "repo": "magit/magit",
   "unstable": {
    "version": [
-    20190825,
-    1416
+    20190906,
+    2217
    ],
    "deps": [
     "async",
@@ -55673,8 +55969,8 @@
     "transient",
     "with-editor"
    ],
-   "commit": "bcd161d8ad3fcd80cbf69e7720c1d75a79415021",
-   "sha256": "06nxrnln7cas9sk0g7k88r9z2zbvm32ki3mab1yn9w3abgralfyc"
+   "commit": "5c424142704d481faafce7b834af67c1aca98e68",
+   "sha256": "0849yg97gkg3qp0xa67kxfq888i5nmmz0982zcvc3n4k6xswy52c"
   },
   "stable": {
    "version": [
@@ -55962,15 +56258,28 @@
   "repo": "Ailrun/magit-lfs",
   "unstable": {
    "version": [
-    20190504,
-    1909
+    20190831,
+    118
    ],
    "deps": [
     "dash",
     "magit"
    ],
-   "commit": "5ff5648158413aec01ba178f349c33862e6e140a",
-   "sha256": "1g1hawsmx2j69n25n2ip1lb8x3lshcyrn7f5w83dw56i5ywmyr0v"
+   "commit": "75bf6d3310eae24889589a09e96a4a855e1a11c4",
+   "sha256": "0dy2p6wyp5xqx4jnh1sf3v47dv09k7vv3c9mhjapcr1jpbpqj87w"
+  },
+  "stable": {
+   "version": [
+    0,
+    4,
+    0
+   ],
+   "deps": [
+    "dash",
+    "magit"
+   ],
+   "commit": "75bf6d3310eae24889589a09e96a4a855e1a11c4",
+   "sha256": "0dy2p6wyp5xqx4jnh1sf3v47dv09k7vv3c9mhjapcr1jpbpqj87w"
   }
  },
  {
@@ -55988,8 +56297,8 @@
     "libgit",
     "magit"
    ],
-   "commit": "bcd161d8ad3fcd80cbf69e7720c1d75a79415021",
-   "sha256": "06nxrnln7cas9sk0g7k88r9z2zbvm32ki3mab1yn9w3abgralfyc"
+   "commit": "5c424142704d481faafce7b834af67c1aca98e68",
+   "sha256": "0849yg97gkg3qp0xa67kxfq888i5nmmz0982zcvc3n4k6xswy52c"
   }
  },
  {
@@ -56175,14 +56484,14 @@
   "repo": "magit/magit-tbdiff",
   "unstable": {
    "version": [
-    20190808,
-    1639
+    20190918,
+    6
    ],
    "deps": [
     "magit"
    ],
-   "commit": "49faa9b94c338c0d5aa064f41b3acd50e5943421",
-   "sha256": "0wznf26l8hvdp8p6nbvwbwg2v33yrms72nsw0gvyvnn5mqiw4v7b"
+   "commit": "2b08d93c5ead14f34f9cc3c3140ecf25b1531151",
+   "sha256": "1h5lnns6adpyah2i1k8fznbq4qf43sf64a4vp8s5h67q2ajlf52j"
   },
   "stable": {
    "version": [
@@ -56205,8 +56514,8 @@
   "repo": "alphapapa/magit-todos",
   "unstable": {
    "version": [
-    20190805,
-    552
+    20190907,
+    1321
    ],
    "deps": [
     "async",
@@ -56217,13 +56526,14 @@
     "pcre2el",
     "s"
    ],
-   "commit": "8a88171b2785acce59081d8b12649731e6cf20c0",
-   "sha256": "09pjb4k409gc0h51vb5az1shx02c1hx8cnvhi529n7dm4maildg5"
+   "commit": "a80dace2bf8bf3e697e3e8421189996adcecc900",
+   "sha256": "0qwzag9js6qy98m7c8gmaskg4qc82sf0aihcs5vcxdf8rgia2j9q"
   },
   "stable": {
    "version": [
     1,
-    4
+    4,
+    1
    ],
    "deps": [
     "async",
@@ -56234,8 +56544,8 @@
     "pcre2el",
     "s"
    ],
-   "commit": "8a88171b2785acce59081d8b12649731e6cf20c0",
-   "sha256": "09pjb4k409gc0h51vb5az1shx02c1hx8cnvhi529n7dm4maildg5"
+   "commit": "8557cf36260743674e7c3ecdb3038dca5106416b",
+   "sha256": "1rcl6j53yabxqk3jzgaxvm3wqq7rayf1hdib2v2fapw5b0layym6"
   }
  },
  {
@@ -57375,8 +57685,8 @@
    "deps": [
     "cl-lib"
    ],
-   "commit": "23078f2e59808890268401f294d860ba51bc71d9",
-   "sha256": "07b9w9vd22ma4s3qhplmg84sylihz920byyi9qa7dwj7b59d4avf"
+   "commit": "cec2140618692d5d8380151f570c2fac95deb6fb",
+   "sha256": "07bagma1kjirziyzgwmivf0j8fmdzia3d1a0npvyq0hkqnkwcn2a"
   },
   "stable": {
    "version": [
@@ -57679,11 +57989,11 @@
   "repo": "skeeto/emacs-memoize",
   "unstable": {
    "version": [
-    20180614,
-    1930
+    20190915,
+    37
    ],
-   "commit": "9a561268ffb550b257a08710489a95cd087998b6",
-   "sha256": "1hsw7pjdy3mksg343v400068b6x7s45gzg0l74h5i4nq8bacv8km"
+   "commit": "8c1e5569550e783dd7814735e22c935416c4462d",
+   "sha256": "1pa9f8ydkabbxx5szgmvl4mn85pk2bw878z81vlfwbcz4nv8fr1h"
   },
   "stable": {
    "version": [
@@ -57757,11 +58067,11 @@
   "repo": "ocaml/merlin",
   "unstable": {
    "version": [
-    20190718,
-    1023
+    20190920,
+    1510
    ],
-   "commit": "a2fff37a09159ce94a3229ce137bb4e6e552339f",
-   "sha256": "12786wl1zmhdj5kkvfm9zv02j0lnrja18yrbc286v33xa77lpiwc"
+   "commit": "91fc77b5d8e2612176684c12f2a3949b44bb27bf",
+   "sha256": "1wk49sjixx3q5iral9pn1nl4a1qv1hlpgadx49yp1d1qd2x8yy9k"
   },
   "stable": {
    "version": [
@@ -58006,8 +58316,8 @@
     20190324,
     1908
    ],
-   "commit": "b79e48dd775de3e1a08e445953243f1491e244cf",
-   "sha256": "0b4kmm09c70jsidrvpla99p9sy9n2d3x628fxrd2z0l6rfwpcyrj"
+   "commit": "9dae5ef83bf3739fba5366a252450c0fcb460b70",
+   "sha256": "0fy962z5jqgrpyjqp8hd1xrvghbnl692h4zyksl9d93fhlisa3bf"
   },
   "stable": {
    "version": [
@@ -58210,14 +58520,14 @@
   "repo": "kiennq/emacs-mini-modeline",
   "unstable": {
    "version": [
-    20190824,
-    1308
+    20190913,
+    221
    ],
    "deps": [
     "dash"
    ],
-   "commit": "d0ed5f1ac1ff5cdb1db5fb2a99f2a09b9bc6f089",
-   "sha256": "0i1b220b5kb0h0yhn5s3dgnlvf6r9hd0iazh9nqbnw28n92gvp01"
+   "commit": "65b5371cd0c35983e6badd6b51493d4fddb8d7b6",
+   "sha256": "0rcxzvr7qgkfpx6kpcxrky3dm9dh791rk4ks7prn0rsgcmsi34f4"
   }
  },
  {
@@ -58353,14 +58663,14 @@
   "repo": "tarsius/minions",
   "unstable": {
    "version": [
-    20181030,
-    2101
+    20190918,
+    2048
    ],
    "deps": [
     "dash"
    ],
-   "commit": "62f1d60a0852b4f83f64e6fc4c199eea967a34f7",
-   "sha256": "0q8py0v06sq9yy7f3w6m45q3nflnd3vppf3i53s0xib3izxl2vca"
+   "commit": "ca6a3e77ddbd19cdf363ea71ba357096395a5de5",
+   "sha256": "16rplpbfy3dnvqqgavk9jb1f1ihr5875zlixd4zxb1pqxs3jkgw3"
   },
   "stable": {
    "version": [
@@ -59087,11 +59397,11 @@
   "repo": "sanel/monroe",
   "unstable": {
    "version": [
-    20190109,
-    1347
+    20190912,
+    1624
    ],
-   "commit": "2f472fdc09c1b36c291ddb5ed9aecc331fd7e082",
-   "sha256": "1g9v7z2bk2vcknpff31y9pf6cw8xrb5hxsh8cjci7i5w2abp7qbj"
+   "commit": "508f5ed0f88b0b5e01a37d456186ea437f44d93c",
+   "sha256": "01dwnb7f6c49q8vr3qb9m5h1wh9h119axxalqa71wahi1ygrcydc"
   },
   "stable": {
    "version": [
@@ -59111,11 +59421,11 @@
   "repo": "jessieh/mood-line",
   "unstable": {
    "version": [
-    20190606,
-    1046
+    20190911,
+    2023
    ],
-   "commit": "3560d8aafd8c856a218ff8fab5a30e1aa0db25b6",
-   "sha256": "08qh8x0gd7byvfp03jpkd95h70djh8vrwpm451932zwf66j7fnay"
+   "commit": "29ba63795911bdd535d569f0cc4e9d18cc3ac8e4",
+   "sha256": "0sp6cgpqrab1cgqy4vhgdfavmfz73h57aw0fxvywf348kxbqf28s"
   },
   "stable": {
    "version": [
@@ -59135,11 +59445,11 @@
   "repo": "jessieh/mood-one-theme",
   "unstable": {
    "version": [
-    20190606,
-    1111
+    20190911,
+    2031
    ],
-   "commit": "47fc825547664c3e3eb8f47f1a9cf74b23efc2c6",
-   "sha256": "17zz3nc3r2cm4w99frzqxnh768vnmzs71p9zz9bj03wc222n1kv6"
+   "commit": "2f044f7b1f68d450fd4c3c67209c353401621277",
+   "sha256": "10x1a9r537qd80rzhhp99mxx08fp8gpd8knrbb0565iqi3czk1rz"
   },
   "stable": {
    "version": [
@@ -59159,11 +59469,11 @@
   "repo": "tarsius/moody",
   "unstable": {
    "version": [
-    20190203,
-    1747
+    20190831,
+    1058
    ],
-   "commit": "58af7973742bf381f5980413dfb21bf5f21b44f8",
-   "sha256": "11kahx0gzchmn3yh5n0cms58cmsbrhd2kj380qcnlqv390cknqvy"
+   "commit": "ac17d739075a571a086756fcaed482814888bf5c",
+   "sha256": "1yisg83khzfmdyqp450kfqgsy76wglb003j1bsann0z0xkw5pla3"
   },
   "stable": {
    "version": [
@@ -59585,15 +59895,15 @@
   "repo": "mpdel/mpdel",
   "unstable": {
    "version": [
-    20190827,
-    1854
+    20190911,
+    632
    ],
    "deps": [
     "libmpdel",
     "navigel"
    ],
-   "commit": "a16ff55e93109c37a204cde9a29699eb0b1d8e6f",
-   "sha256": "01kvgs4z4ppif339l8dq74ipjjyl8rdh0k03xy7zdivdna3mf06i"
+   "commit": "e09904bf31ed465ea93ef2c165e8a6f705229f57",
+   "sha256": "159nb9ws800d5lx5plh8y0mmjl1y6spwhaxm9f5kxs6psa89mckj"
   },
   "stable": {
    "version": [
@@ -60199,16 +60509,16 @@
   "repo": "Wilfred/mustache.el",
   "unstable": {
    "version": [
-    20170923,
-    1233
+    20190905,
+    2214
    ],
    "deps": [
     "dash",
     "ht",
     "s"
    ],
-   "commit": "5e39654b933a18131146a0f3b3e3dc55c5058124",
-   "sha256": "0ilsdrvqy9zn0yb1c8zh1zidag32rfb9xhm43qpfcg6n5w6c7r82"
+   "commit": "6443e1563ddf4eee2236ca1bb1fe87ddfde4b2bb",
+   "sha256": "0wbmknx4pjgfw6y1482a3y1fxv054r0k2qj3qzc47xrkdsjw47y8"
   },
   "stable": {
    "version": [
@@ -61492,11 +61802,11 @@
   "repo": "m-cat/nimbus-theme",
   "unstable": {
    "version": [
-    20190815,
-    1740
+    20190909,
+    1313
    ],
-   "commit": "d2e627024ab7ce608b5203d4084c6a1588621545",
-   "sha256": "12zdk161d18f1yl6linx2g4fw1p4x68n5fbikkklw0ssqj0liqy2"
+   "commit": "188af947416961b3ed86a7ac026952c8e530245d",
+   "sha256": "1bswdaxvx0f36zh9f8q343a8mr27g53jw5dxqpwk6x9ad7jiia83"
   }
  },
  {
@@ -61510,8 +61820,8 @@
     20181024,
     1439
    ],
-   "commit": "61f90e918b608413daf07ffcb5c5c0930416951a",
-   "sha256": "1wsq7ap7yn5lvvb52ggzh7qk8wr8s4lfiip9v2qp73q25mlqnxww"
+   "commit": "2321fd711c4bbe7bdc23060f3549f2aea9a95580",
+   "sha256": "1ak7hrm7wa8cdning4l8xh06p7kfdq1dz9r6svhbfqa9c7vb9zqy"
   },
   "stable": {
    "version": [
@@ -61594,11 +61904,11 @@
   "repo": "NixOS/nix-mode",
   "unstable": {
    "version": [
-    20190703,
-    526
+    20190904,
+    1440
    ],
-   "commit": "ddf091708b9069f1fe0979a7be4e719445eed918",
-   "sha256": "0s8ljr4d7kys2xqrhkvj75l7babvk60kxgy4vmyqfwj6xmcxi3ad"
+   "commit": "5b5961780f3b1c1b62453d2087f775298980f10d",
+   "sha256": "0lyf9vp6sivy321z8l8a2yf99kj5g15p6ly3f8gkyaf6dcq3jgnc"
   },
   "stable": {
    "version": [
@@ -62114,8 +62424,8 @@
     20190525,
     1602
    ],
-   "commit": "e13862f127394fd4addc5d2cf604b3af399c8377",
-   "sha256": "0w2jzv378bkkvwb6k7i6sfpis6hf8zpgwx8m2sa44ry3hixqmbgw"
+   "commit": "23bcd003637f091c88f7d0a601d5fee82bc8e936",
+   "sha256": "0n0pw2h3zc5an8xr5zv38cicwd9nk8klnrsihdkw0hvd7llmb3qf"
   },
   "stable": {
    "version": [
@@ -62500,8 +62810,8 @@
   "repo": "rejeep/nvm.el",
   "unstable": {
    "version": [
-    20190601,
-    813
+    20190912,
+    626
    ],
    "deps": [
     "dash",
@@ -62509,13 +62819,13 @@
     "f",
     "s"
    ],
-   "commit": "4aeb672d543ce2372dcca289719092aa4c38a6cd",
-   "sha256": "0phillz5dxpvhsi9rlah4988ksx2rcgagfw5iqf5lmfn7kp4604p"
+   "commit": "e93e5216e311c665c593ac68c5456d624120ea42",
+   "sha256": "11fa9g05gsh2yjvhy1xjc6hkby5z98mb2bmbshdp89fvlsdksv3i"
   },
   "stable": {
    "version": [
     0,
-    2,
+    3,
     0
    ],
    "deps": [
@@ -62524,8 +62834,8 @@
     "f",
     "s"
    ],
-   "commit": "d18b13e8275a57ee6c55dc71b671f02a8e6522ad",
-   "sha256": "1624jj922l0bbav1v8szdr0lpyx0ng959fg3sspg1j15kgkir8kf"
+   "commit": "e93e5216e311c665c593ac68c5456d624120ea42",
+   "sha256": "11fa9g05gsh2yjvhy1xjc6hkby5z98mb2bmbshdp89fvlsdksv3i"
   }
  },
  {
@@ -62663,16 +62973,16 @@
   "repo": "astahlman/ob-async",
   "unstable": {
    "version": [
-    20190220,
-    710
+    20190916,
+    1537
    ],
    "deps": [
     "async",
     "dash",
     "org"
    ],
-   "commit": "73e57a9297849bb50336799ae7858777b6b386ee",
-   "sha256": "1g2agc6qwklg5cxfgm28fc5swlw54sn66lqk7q0hjn1gdq9rdqdm"
+   "commit": "80a30b96a007d419ece12c976a81804ede340311",
+   "sha256": "0jhgzmqds73yc49hc4yarp1a25pci9qmsvnpcxd7kv5saha40hnn"
   },
   "stable": {
    "version": [
@@ -62756,11 +63066,11 @@
   "repo": "nickanderson/ob-cfengine3",
   "unstable": {
    "version": [
-    20190520,
-    1929
+    20190908,
+    1801
    ],
-   "commit": "4d4cd53ceaf8a756f48c02cb2e10476f3cda37c4",
-   "sha256": "0gmgx4ynbk6fvahaglj9m1gpz8d3b038zag4m7g7pmz0xv5s4p1w"
+   "commit": "d16fd0f1585d5f64dfae76498d43c764d81fc3f8",
+   "sha256": "1xv07hc2fcp9kvzmy5vdjwb6iq5mkj5vpxsnik0m68vcb2jnllbi"
   }
  },
  {
@@ -63402,14 +63712,14 @@
   "repo": "lurdan/ob-typescript",
   "unstable": {
    "version": [
-    20150804,
-    1230
+    20190910,
+    946
    ],
    "deps": [
     "org"
    ],
-   "commit": "9dcbd226cbfb75e790dd9de91d9401dde85a889a",
-   "sha256": "1ycqdjqn5361pcnc95hxhjqd3y96cjjnaylrnzwhmacl38jm3vai"
+   "commit": "0b2766b9d136cd6d81f4c15f1ad4b28542f484b9",
+   "sha256": "0crz6k41bva53x3qhvvzzdlml4v18f43fja8nkrlgwpn103d0x9h"
   }
  },
  {
@@ -63641,17 +63951,17 @@
     20190726,
     1452
    ],
-   "commit": "bdd84a71da8eac87447e35b55782ec07f0d2aead",
-   "sha256": "0cvfzz1i3lh9q5fl26sp98cqpv3mqjxlzlflv8hc3cdr8ascjm4g"
+   "commit": "daeb11532f846caa0e94b999dd2a413003a885b6",
+   "sha256": "01vw2r3xfjmsm6v5l7w7f2rlwl8qhs8fk5rp5j284db73gbqx61m"
   },
   "stable": {
    "version": [
     1,
-    7,
+    8,
     0
    ],
-   "commit": "6e6ff005fc1692489fa80767a23bc381ebc987e1",
-   "sha256": "006x3fsd61vxnxj4chlakyk3b2s10pb0bdl46g0ghf3j8h33x7hc"
+   "commit": "daeb11532f846caa0e94b999dd2a413003a885b6",
+   "sha256": "01vw2r3xfjmsm6v5l7w7f2rlwl8qhs8fk5rp5j284db73gbqx61m"
   }
  },
  {
@@ -63721,14 +64031,14 @@
   "repo": "oer/oer-reveal",
   "unstable": {
    "version": [
-    20190826,
-    718
+    20190916,
+    657
    ],
    "deps": [
     "org-re-reveal"
    ],
-   "commit": "f62fe1497be473d776d22094a02cfff381c61cfc",
-   "sha256": "088khyvflg4akdszkpalv2j49g25g10b0xzrjji2h2lgb1w5dg1m"
+   "commit": "b30cf2b16b4987152df8355beab8b8fdcbc22c1f",
+   "sha256": "1m6b5cg5rkimp03w1zgxfh2yycifyj89a5rripr2bic1wp6bifzw"
   }
  },
  {
@@ -63783,6 +64093,30 @@
    "sha256": "0y9fxrsxp1158fyjp4f69r7g2s7b6nbxlsmsb8clwqc8pmmg2z82"
   }
  },
+ {
+  "ename": "olivetti",
+  "commit": "10292536096e698f37e6ad81a4d5b6204beeb7cb",
+  "sha256": "0fkvw2y8r4ww2ar9505xls44j0rcrxc884p5srf1q47011v69mhd",
+  "fetcher": "github",
+  "repo": "rnkn/olivetti",
+  "unstable": {
+   "version": [
+    20190907,
+    2028
+   ],
+   "commit": "4bd3fb51961f8aacc3021bbaa9b39d90240f257d",
+   "sha256": "1wm1hhk08q6yvmy5aphd2msl9zj2basxc88ny2krjspbz3rcfnds"
+  },
+  "stable": {
+   "version": [
+    1,
+    8,
+    0
+   ],
+   "commit": "57dbb94384d0ad0addd9b30c2dcade0362aa1476",
+   "sha256": "0ba30swqxxbpa8866chymywnahby1hk670zzkz44q49328i2wksj"
+  }
+ },
  {
   "ename": "om-mode",
   "commit": "855ea20024b606314f8590129259747cac0bcc97",
@@ -63977,8 +64311,8 @@
   "repo": "OmniSharp/omnisharp-emacs",
   "unstable": {
    "version": [
-    20190809,
-    341
+    20190915,
+    1000
    ],
    "deps": [
     "auto-complete",
@@ -63990,8 +64324,8 @@
     "popup",
     "s"
    ],
-   "commit": "b5afa053c8d3771d5567538bae89a03cc66e826c",
-   "sha256": "0vhjfig0yx2ihqbq9ah6w7vs84lbnn5zlkjlda63kfs5cwwi43vp"
+   "commit": "c1dab2beae4b1e67f20f3e90cddeba81bd236fe5",
+   "sha256": "1pm8pv3iccpmyg0bs19d28g56gwfbkkp6d4i1qyxkf371d9w7r3w"
   },
   "stable": {
    "version": [
@@ -64454,20 +64788,20 @@
   "repo": "rksm/clj-org-analyzer",
   "unstable": {
    "version": [
-    20190827,
-    2211
+    20190914,
+    2215
    ],
-   "commit": "e55960609c1ccd5feda307e28e72eac1f07e8e28",
-   "sha256": "0y1x04046gifmky3i46i23anr6q2f7ynj7lxp18v2iah3ri99v8f"
+   "commit": "576e1fda552af0da4e64070e2b26303a913f17a9",
+   "sha256": "194vk80d2mzfb0fpkj19jhfsq916l9lkxxwaj0q30r3w6p8hplz4"
   },
   "stable": {
    "version": [
+    1,
     0,
-    3,
-    5
+    2
    ],
-   "commit": "10fe5da1bbad72093b784fb8c4c262e9daaa8b97",
-   "sha256": "0gf3bw8c5yll07mvh0ippvkqyf3m5bf36mwxabmmc64fpy0xb3jc"
+   "commit": "576e1fda552af0da4e64070e2b26303a913f17a9",
+   "sha256": "194vk80d2mzfb0fpkj19jhfsq916l9lkxxwaj0q30r3w6p8hplz4"
   }
  },
  {
@@ -64622,14 +64956,14 @@
   "repo": "Kungsgeten/org-brain",
   "unstable": {
    "version": [
-    20190830,
-    757
+    20190916,
+    619
    ],
    "deps": [
     "org"
    ],
-   "commit": "e8a0dd5dd04c17dbbc954f3f2ec985996a539f01",
-   "sha256": "05l2yy3886nvkplca09q45lpzpwzx8fxd7fr96b4nb5i1187bagx"
+   "commit": "3098a782d3add11795036f7894adcf73e3a9472b",
+   "sha256": "1crlh3a9glz29zwnsnv1i6ha15l39zmmbvbk85pk91da7ikjb0qr"
   }
  },
  {
@@ -64825,11 +65159,11 @@
   "repo": "mallt/org-clock-today-mode",
   "unstable": {
    "version": [
-    20161014,
-    920
+    20190915,
+    701
    ],
-   "commit": "02b8fd541a01040405a9a1400c46dcb68b7c2a3a",
-   "sha256": "1gbkrgbpsrwkjd199giffim8jvx1n4dqrsyk53sz1swj9dlhxgp9"
+   "commit": "18af3fede1aa0ccab83ce9195f94f9097f51c548",
+   "sha256": "0knjks1rzl7p38r36g7a186mlxsc5dr88a7q0mxjsgg86vjx1xwf"
   }
  },
  {
@@ -64976,15 +65310,15 @@
   "repo": "vapniks/org-dotemacs",
   "unstable": {
    "version": [
-    20190116,
-    2155
+    20190903,
+    2024
    ],
    "deps": [
     "cl-lib",
     "org"
    ],
-   "commit": "5f504f36af6bcb9dbe9869c7ed54851d3db742e7",
-   "sha256": "0pxphad9qxssqxr50g0mf20b7247xjp9a6fmb494bj8yv6wnn9m9"
+   "commit": "ee59739c2d59151fe7d7d3034e87c7691120a5be",
+   "sha256": "17xrjhfjahryawrmkd2p0yi7pfxfvgdfhh4n18jdmfkrr6gllavg"
   }
  },
  {
@@ -65274,17 +65608,16 @@
   "repo": "kidd/org-gcal.el",
   "unstable": {
    "version": [
-    20190826,
-    2152
+    20190902,
+    252
    ],
    "deps": [
     "alert",
-    "cl-lib",
-    "org",
+    "request",
     "request-deferred"
    ],
-   "commit": "149ea8ee6ce538742d65d5a7925ab4536f421b1d",
-   "sha256": "02myllpdlizaqxfa8c8dk14481ly3c1yzb79dg1acna132p6sn93"
+   "commit": "19ebbc647d8f4098cdda986aff2fea66e6da13ef",
+   "sha256": "1jvdwlqjgqic2v5nwkiz523nry4jphxg3wp9pin4vxw55vzm5ygb"
   },
   "stable": {
    "version": [
@@ -65384,11 +65717,11 @@
   "repo": "marcIhm/org-index",
   "unstable": {
    "version": [
-    20190829,
-    1443
+    20190920,
+    356
    ],
-   "commit": "687c10cb4a2c4a66730bdfce161068bc6b0d2fa2",
-   "sha256": "1nnj7zzcbrmlnnd6q6739pqm8jsmlik2ci6zlfpd05sj7kmg0l19"
+   "commit": "aba9b1ea49e83c541c544e4030fcc2e0a55c908b",
+   "sha256": "1rpbas9svwni6nz5jywvxxvan0lgrqi100aby1aivi3prsmh6jhy"
   },
   "stable": {
    "version": [
@@ -65463,11 +65796,11 @@
   "repo": "bastibe/org-journal",
   "unstable": {
    "version": [
-    20190826,
-    1919
+    20190914,
+    1643
    ],
-   "commit": "cb15adcec09a891911bd2a85cbbfd45502e65f00",
-   "sha256": "10daayd273fc1vz6zxzjbi2blww12y2vzg93awmhn9awy5plg75z"
+   "commit": "5481b6c7410cbc68f0966b5b5840c0048edc3fef",
+   "sha256": "1afjz5s7z0lfb67wsdckgsj2h9rr31gm8424v2w243xmz2lzgrjx"
   },
   "stable": {
    "version": [
@@ -65796,14 +66129,14 @@
   "repo": "jeremy-compostella/org-msg",
   "unstable": {
    "version": [
-    20190822,
-    2115
+    20190916,
+    2334
    ],
    "deps": [
     "htmlize"
    ],
-   "commit": "df89f46a86abed5c39d66ad35b47ab763dd27781",
-   "sha256": "1xm1ym4x1916h8nkm5zpj5q25sj2n9iawibmf2ifk0yr8faaz2jb"
+   "commit": "7616a9760bd1e3fb0e6a22f6e1cbc2bf71a733df",
+   "sha256": "0mccaw4wvh4624iyxfbv1jr01z7fkjg5mcl56scq164daznm200g"
   }
  },
  {
@@ -65864,15 +66197,15 @@
   "repo": "weirdNox/org-noter",
   "unstable": {
    "version": [
-    20190829,
-    2358
+    20190913,
+    1509
    ],
    "deps": [
     "cl-lib",
     "org"
    ],
-   "commit": "54e1bc5c1dbb291d4ed55c7961633b2977374055",
-   "sha256": "1kyxphldkqggn384mplvj8r3rbfwz7q8ba64i43b4j0ldglbvwgl"
+   "commit": "a926c1075964f4a972467c01b807d6a01fd5d0b1",
+   "sha256": "0fb5r5aslqkd48h2l502sq3hixwcy64m00p17znnagf699djfhfl"
   },
   "stable": {
    "version": [
@@ -66093,6 +66426,21 @@
    "sha256": "0lrcj3mcdfcdrndivhj5ds386zrsy78sfg0i8126wwwc5lfh48vq"
   }
  },
+ {
+  "ename": "org-picklink",
+  "commit": "c6c44a3e5a1c5e4acdf76c4d6f2f4b695aa6938e",
+  "sha256": "0gr4psgps9775hh0pvcyq3x2irrzkzpm5ghcnc9ddp5hn41yv57m",
+  "fetcher": "github",
+  "repo": "tumashu/org-picklink",
+  "unstable": {
+   "version": [
+    20190902,
+    654
+   ],
+   "commit": "e8c95e188b60ff84d794cbedbcce6732ccb82e4f",
+   "sha256": "05b488h1b5yvh0892358ndina2lywh67lhvqp180rp5ivz7zqm10"
+  }
+ },
  {
   "ename": "org-pivotal",
   "commit": "c1257d38bbd3a9944135b000e962f30ab28f5464",
@@ -66327,8 +66675,8 @@
   "repo": "alphapapa/org-ql",
   "unstable": {
    "version": [
-    20190830,
-    1527
+    20190918,
+    633
    ],
    "deps": [
     "dash",
@@ -66336,21 +66684,23 @@
     "s",
     "ts"
    ],
-   "commit": "58b298153c482e6517995bb94f28e03aaf9924bd",
-   "sha256": "0zkfczvmfwm09diihxr2yn1mdi7hxcd7p4hj4j0fkq6yrf296ca4"
+   "commit": "8f2a02264f1dcd45e0d060655bffc45a7bde8235",
+   "sha256": "12xqg8w52q2bnbrsl49r0ygnsx8014skhfqjsfz3s9v0myfhx0m1"
   },
   "stable": {
    "version": [
     0,
+    2,
     1
    ],
    "deps": [
     "dash",
     "org",
-    "s"
+    "s",
+    "ts"
    ],
-   "commit": "eb281fe34569901d84b502c1734d01cdb09246d8",
-   "sha256": "1nvzirn1lmgmgl7irbsc1n391a2cw8gmvwm3pa228l2c1gcx8kd8"
+   "commit": "55694f17fce4dc566f533b0b5f8cd60c4dad9670",
+   "sha256": "1xyabg9fhpip6426za6wjrn0msnaf10c5fzzaawwagk7zmjf9b48"
   }
  },
  {
@@ -66429,28 +66779,28 @@
   "repo": "oer/org-re-reveal",
   "unstable": {
    "version": [
-    20190826,
-    749
+    20190914,
+    1607
    ],
    "deps": [
     "htmlize",
     "org"
    ],
-   "commit": "84edfb6c359b4cdd489a92adf7e31c40a3c893e8",
-   "sha256": "0lz38sjkfja3f4szjw3gb15ckggkr4bjjyb3zdcfli89781zdjrq"
+   "commit": "07d4af7f601fb22d8ed74081c9f69ba9af61e474",
+   "sha256": "1zbz6hbddxbb264ibmhc04cmnpk17kb50jpn5l8878q4hxw5wwy2"
   },
   "stable": {
    "version": [
     2,
-    1,
-    0
+    5,
+    1
    ],
    "deps": [
     "htmlize",
     "org"
    ],
-   "commit": "6941394ce00f02a1fe8e7db99fe0c0bfc0a19824",
-   "sha256": "0bfbgjlp37ysik8y6a4gcqhbmy73i5p87lhjhp4d13f7dxq9q07p"
+   "commit": "07d4af7f601fb22d8ed74081c9f69ba9af61e474",
+   "sha256": "1zbz6hbddxbb264ibmhc04cmnpk17kb50jpn5l8878q4hxw5wwy2"
   }
  },
  {
@@ -66480,8 +66830,8 @@
   "repo": "alphapapa/org-recent-headings",
   "unstable": {
    "version": [
-    20190817,
-    624
+    20190909,
+    1618
    ],
    "deps": [
     "dash",
@@ -66490,8 +66840,8 @@
     "org",
     "s"
    ],
-   "commit": "6336a0c36ef1048ba1f4e07716a421dce106d082",
-   "sha256": "1lpkjvlm969pr64j25zkpmsacjnr7qbq9zfwwzb9xyqlhaf5zzz0"
+   "commit": "6430700dbe2ba34d852b36d56b3a879d71dabc9a",
+   "sha256": "0rl7f2dnwv90l7dnhgzaqnpmff0li366dmkiprjydxchkh1n7mic"
   },
   "stable": {
    "version": [
@@ -66548,8 +66898,8 @@
   "repo": "jkitchin/org-ref",
   "unstable": {
    "version": [
-    20190802,
-    1327
+    20190916,
+    1534
    ],
    "deps": [
     "dash",
@@ -66563,8 +66913,8 @@
     "pdf-tools",
     "s"
    ],
-   "commit": "9ab74270c1543e4743ca0436de567d8205403b43",
-   "sha256": "0ma9zaxzrd1dzmk8633bkw6wrp03wrm9bjhrgsp9qp7vhm597fdq"
+   "commit": "0831d2bfe5820d72121fe66e9e298cac04c23b71",
+   "sha256": "07wy73ybqd5zbi6qjvkqrag5jab1aswzrjvvajcips8ka849vsp5"
   },
   "stable": {
    "version": [
@@ -66619,14 +66969,14 @@
   "repo": "akirak/org-reverse-datetree",
   "unstable": {
    "version": [
-    20190806,
-    1412
+    20190914,
+    102
    ],
    "deps": [
     "dash"
    ],
-   "commit": "0c70a06474921638eba3c287472879ce903ee8b7",
-   "sha256": "0fdndpy7j8idbrqpn85hnwj8caf737hcind00blbvc5rka85vaq4"
+   "commit": "a3bc7846531b55337ec069d0696b8d8a04fad3de",
+   "sha256": "0xhsv46xx9bzakzpb9y133s9drj5vyg8wrm15llqhgnaygakpfj6"
   }
  },
  {
@@ -66769,15 +67119,15 @@
   "repo": "akirak/org-starter",
   "unstable": {
    "version": [
-    20190824,
-    814
+    20190907,
+    1859
    ],
    "deps": [
     "dash",
     "dash-functional"
    ],
-   "commit": "114cbaf359b5f08a23fbe5c199cf9df35d39d4ae",
-   "sha256": "1nmgbyv9lg1p9frs5mbfqnyblwb4f47kp972bavhni69qc6l33f1"
+   "commit": "ca166579a35dc671ad8f59dbc6dcf2a1eda94a20",
+   "sha256": "02ikg795jny9cddprbd9ipyiyg2gv6i4c6408qp94n3qmr9jcz48"
   }
  },
  {
@@ -66795,8 +67145,8 @@
     "org-starter",
     "swiper"
    ],
-   "commit": "114cbaf359b5f08a23fbe5c199cf9df35d39d4ae",
-   "sha256": "1nmgbyv9lg1p9frs5mbfqnyblwb4f47kp972bavhni69qc6l33f1"
+   "commit": "ca166579a35dc671ad8f59dbc6dcf2a1eda94a20",
+   "sha256": "02ikg795jny9cddprbd9ipyiyg2gv6i4c6408qp94n3qmr9jcz48"
   }
  },
  {
@@ -66807,11 +67157,11 @@
   "repo": "bastibe/org-static-blog",
   "unstable": {
    "version": [
-    20190619,
-    635
+    20190916,
+    1307
    ],
-   "commit": "a269b23e1b258b1cb9d80dfdc1d1d4c126f8241a",
-   "sha256": "019m07j6nfq18kv4gxsk99wb2wpisw0rywbx4xx63s8p3aaizv62"
+   "commit": "f01d3793c4f1ba7099e12e7ed6d1b9c14bd48152",
+   "sha256": "0bg3yhy7a80gak7c0ilki8mv46hdzqddps232ab9zr7z6k01kpzj"
   },
   "stable": {
    "version": [
@@ -66861,8 +67211,8 @@
   "repo": "alphapapa/org-super-agenda",
   "unstable": {
    "version": [
-    20190815,
-    2140
+    20190909,
+    2144
    ],
    "deps": [
     "dash",
@@ -66871,8 +67221,8 @@
     "s",
     "ts"
    ],
-   "commit": "f65ff8109c97368ad640a6a50aaebd24046ce54a",
-   "sha256": "08aqq5sgj6y8mdj244j8024ampij49q08maws2sb1s40f0a7s697"
+   "commit": "f0ee7ed9766d352d16a787707d35695b48cbf153",
+   "sha256": "1b1qi96x83acv2frl94i4frx46i82vipaa8mfwpzyj2gyq2bq5zf"
   },
   "stable": {
    "version": [
@@ -66973,14 +67323,14 @@
   "repo": "cute-jumper/org-table-sticky-header",
   "unstable": {
    "version": [
-    20190703,
-    405
+    20190906,
+    211
    ],
    "deps": [
     "org"
    ],
-   "commit": "2b0b36a075043ff426cca077bf4099b6ee4bf187",
-   "sha256": "08xd5qc19cc2000qgs5a5ywz5ykiwb0zhc0mghx599phvpprdfwz"
+   "commit": "7789e2064acef418d4959eb15ee2648227968c9d",
+   "sha256": "190465gxhx9hirxwnl9gm1awqv87l6rxdm34yjmkhpm1zaaykc4l"
   },
   "stable": {
    "version": [
@@ -66995,6 +67345,21 @@
    "sha256": "0az4lzd9qk4cx7jjfj36r2fvlkwyrhn3xqhha5d1pydglnhd9amy"
   }
  },
+ {
+  "ename": "org-tanglesync",
+  "commit": "9282e48b725e835fe8dfb226dacbea40257584c1",
+  "sha256": "1vyvy5l7bb8v7c190rzi7r1nz7vlq4yj2bskhcw35h6df3zy3j2y",
+  "fetcher": "github",
+  "repo": "mtekman/org-tanglesync.el",
+  "unstable": {
+   "version": [
+    20190916,
+    2055
+   ],
+   "commit": "1e26c3fa1fce8c16edcb7e53a90bc3c37603453e",
+   "sha256": "1mq63vq7f6v6x2j99dd4vpi0417rk5k9m8ggqzc1n22lnymzck2z"
+  }
+ },
  {
   "ename": "org-tfl",
   "commit": "d9e97f2fee577c7e3fb42e4ca9d4f422c8907faf",
@@ -67282,8 +67647,8 @@
     20190409,
     1815
    ],
-   "commit": "f2fcfc0d4e7cdb1312c5c06fd5e1820788268de3",
-   "sha256": "14rfixf6948zf5ylplzmpqr15rn1kr1qc26055kbb13klyl0qj3y"
+   "commit": "ebb2778052aeaf737adebc003957cb48cb01135e",
+   "sha256": "0qlvdpa88ic9gnb0qhijfsc9i6l3ba2zrvk4r4li3qrx0i9rpz5c"
   }
  },
  {
@@ -67701,15 +68066,15 @@
   "repo": "tarsius/orglink",
   "unstable": {
    "version": [
-    20190630,
-    1437
+    20190919,
+    1859
    ],
    "deps": [
     "dash",
     "org"
    ],
-   "commit": "30e27843fbe916c26b4fe15948415b9c44e9d153",
-   "sha256": "0dqm4i2ykzaxairbralz6b1h3gga7falvg5nvw3180mkkrkcjbx2"
+   "commit": "988ad54db45708b0fe835829d512eb6d5f6cf161",
+   "sha256": "1mswfbwz7fm9lriab365g7hq8hn85gxcsg8y41by9j0n8hb3hj5q"
   },
   "stable": {
    "version": [
@@ -68526,14 +68891,14 @@
   "repo": "kaushalmodi/ox-hugo",
   "unstable": {
    "version": [
-    20190830,
-    1623
+    20190905,
+    303
    ],
    "deps": [
     "org"
    ],
-   "commit": "a8e0c6e1ceeecebd5d2cd17dd3062b3e8aecbfcb",
-   "sha256": "0j2prlgb3gprdg9ynaka7y9390qdns6182zj6qpjvayvxkzfi0p5"
+   "commit": "b5672ea8925eaff93c4e17982b35acec302ba5e7",
+   "sha256": "1z9c85z55an38wrg6vmal8vp8k8qp1wkfxc9ijjlqsh0i2809x6b"
   },
   "stable": {
    "version": [
@@ -68837,14 +69202,14 @@
   "repo": "yjwen/org-reveal",
   "unstable": {
    "version": [
-    20190810,
-    1655
+    20190918,
+    1627
    ],
    "deps": [
     "org"
    ],
-   "commit": "4abd898da3b24530a80336327ec29d3ae6ad4ec9",
-   "sha256": "0ik5r99hv407yalvdwba62rppaf9g0r9qzyp4iz0i3n1mhcnv0h1"
+   "commit": "d692f2fae4b01bb10b47828692e1654fb339bbee",
+   "sha256": "1sia5ijs0alr64078bdiax3mzr8103kzs8ia6k4qbv3a1w5bzgyf"
   }
  },
  {
@@ -69265,14 +69630,14 @@
   "repo": "purcell/package-lint",
   "unstable": {
    "version": [
-    20190807,
-    1837
+    20190908,
+    2158
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "c5ba20dead0df743a699f502f5d034d03b367f65",
-   "sha256": "0pshjm6swgm6pfpx8ri8zfixazc7bjhdvy7md905lf8a8byr7zk2"
+   "commit": "6bee682fac762fd245f9156718393a4eb05c45ed",
+   "sha256": "0vc0d610q7wpyfvf395958njkwpl33bsfi288pi2qcvl6smr1hlh"
   },
   "stable": {
    "version": [
@@ -69300,8 +69665,8 @@
    "deps": [
     "package-lint"
    ],
-   "commit": "c5ba20dead0df743a699f502f5d034d03b367f65",
-   "sha256": "0pshjm6swgm6pfpx8ri8zfixazc7bjhdvy7md905lf8a8byr7zk2"
+   "commit": "6bee682fac762fd245f9156718393a4eb05c45ed",
+   "sha256": "0vc0d610q7wpyfvf395958njkwpl33bsfi288pi2qcvl6smr1hlh"
   },
   "stable": {
    "version": [
@@ -69428,11 +69793,11 @@
   "repo": "kadena-io/pact-mode",
   "unstable": {
    "version": [
-    20190710,
-    1817
+    20190903,
+    1542
    ],
-   "commit": "5df7032cf9b61ae5aff36ac7d2a23b2ab0e00904",
-   "sha256": "0hdg5b3mnld8pcfiawn51dc65dfws6gr7j4fvjc2gnhypy36l8xl"
+   "commit": "f836c376e142b372a92900b630511fde9937a51a",
+   "sha256": "00xp8j9hgqscz865pp4s5khngpsidad6arwybcxh1cfsncc6w8f2"
   },
   "stable": {
    "version": [
@@ -69594,11 +69959,11 @@
   "repo": "sebasmonia/panda",
   "unstable": {
    "version": [
-    20190801,
-    1622
+    20190907,
+    314
    ],
-   "commit": "30dac32f9b18fb225ade8e56f7d9242d6c8efb35",
-   "sha256": "1d6wykf2k5b0494l2l8p9p0hmq52jvcq534dz4piwgnngrjcbq8n"
+   "commit": "5a3da498a8ab8a60cef3a3a5e8f3e14dea9992dd",
+   "sha256": "04fa2895vr0z6y1w1mkpxhzx2q323vl7r3hayxr0vldd8mz8m0lw"
   }
  },
  {
@@ -69656,15 +70021,15 @@
   "repo": "joostkremers/pandoc-mode",
   "unstable": {
    "version": [
-    20190711,
-    2122
+    20190916,
+    1104
    ],
    "deps": [
     "dash",
     "hydra"
    ],
-   "commit": "7b9a19d8777a21431a819281a14201bfdf1dfdc1",
-   "sha256": "04bqc7mhgkfks3nsvimd3rrriv4nqbksmv5ahlbbd03aqa2b0vrv"
+   "commit": "554a942654f850077364d2358177f232cfa0f06d",
+   "sha256": "1va4yykj8sfvgx7f6v4vyxl316y58xgc6naglpjvq51jml1x1sss"
   },
   "stable": {
    "version": [
@@ -69691,8 +70056,8 @@
     20190823,
     401
    ],
-   "commit": "2e2dc6427b4427b045df37ba793884c6225c262e",
-   "sha256": "00zqb68vzcqd1mcxz3nsdydima14381dvqc4nncqm1l6hnapxf1h"
+   "commit": "f92898949ba3bf991fd229416f3bbb54e9c6c223",
+   "sha256": "0c8ad30313598mggjiq4szz1alc6kcswh7i8447kdci241rlyqrf"
   },
   "stable": {
    "version": [
@@ -69714,8 +70079,8 @@
     20190124,
     1828
    ],
-   "commit": "f2fcfc0d4e7cdb1312c5c06fd5e1820788268de3",
-   "sha256": "14rfixf6948zf5ylplzmpqr15rn1kr1qc26055kbb13klyl0qj3y"
+   "commit": "ebb2778052aeaf737adebc003957cb48cb01135e",
+   "sha256": "0qlvdpa88ic9gnb0qhijfsc9i6l3ba2zrvk4r4li3qrx0i9rpz5c"
   }
  },
  {
@@ -70101,6 +70466,19 @@
    ],
    "commit": "ddf824bc1df1585867cb7f27f2dd8ca8df760569",
    "sha256": "11wi3hwcgmy54p6ivpijqm7v0hj6j75a19qk5z779bqfrp79b4pc"
+  },
+  "stable": {
+   "version": [
+    0,
+    1,
+    0
+   ],
+   "deps": [
+    "a",
+    "parseclj"
+   ],
+   "commit": "ddf824bc1df1585867cb7f27f2dd8ca8df760569",
+   "sha256": "11wi3hwcgmy54p6ivpijqm7v0hj6j75a19qk5z779bqfrp79b4pc"
   }
  },
  {
@@ -70126,29 +70504,29 @@
   "repo": "NicolasPetton/pass",
   "unstable": {
    "version": [
-    20190715,
-    1509
+    20190830,
+    2017
    ],
    "deps": [
     "f",
     "password-store",
     "password-store-otp"
    ],
-   "commit": "ba6a3f695acb380e1457a29a0d13b22641f72c4f",
-   "sha256": "14g50fywwgf9bpqnl6bvq2k1czl9m2da43xcdrng2gpyrz3ns1w3"
+   "commit": "35e3f86e96878520e690513cdbc1b2753b173e72",
+   "sha256": "0jc8j421mlflspg24jvrqc2n3y5n3cpk3hjy560il8g36xi1049p"
   },
   "stable": {
    "version": [
-    1,
-    8
+    2,
+    0
    ],
    "deps": [
     "f",
     "password-store",
     "password-store-otp"
    ],
-   "commit": "cd79375005a1c1d8b45d38fefa91eef0bd23182c",
-   "sha256": "05h4hacv3yygyjcjj004qbyqjpkl4pyhwgp25gsz8mw5c66l70cx"
+   "commit": "35e3f86e96878520e690513cdbc1b2753b173e72",
+   "sha256": "0jc8j421mlflspg24jvrqc2n3y5n3cpk3hjy560il8g36xi1049p"
   }
  },
  {
@@ -70248,8 +70626,8 @@
   "repo": "zx2c4/password-store",
   "unstable": {
    "version": [
-    20190829,
-    1054
+    20190916,
+    2027
    ],
    "deps": [
     "auth-source-pass",
@@ -70257,8 +70635,8 @@
     "s",
     "with-editor"
    ],
-   "commit": "b87e91f984f45615b6459ff3829baa9130b8ef75",
-   "sha256": "1xgfw238ph6fa8inrwqzfzfzqi16w4rr5sg79djb7iqz8njczbn8"
+   "commit": "e74a1c738f7cda65c7a308e30e8d122f853d6f70",
+   "sha256": "07g2w57q9lvgf5wznyg2ybkrw6w1f5w4jqi8zbw9lzkvj4iz3rg7"
   },
   "stable": {
    "version": [
@@ -70773,15 +71151,15 @@
   "repo": "politza/pdf-tools",
   "unstable": {
    "version": [
-    20190701,
-    202
+    20190918,
+    1715
    ],
    "deps": [
     "let-alist",
     "tablist"
    ],
-   "commit": "db7de3901ae0e55f6ab8cf9baec257f706c3d16e",
-   "sha256": "1vvhgxxg5lpmh0kqjgy8x1scdaah3wb76h2zj7x99ayym2bxyigv"
+   "commit": "c851df842e05f353e4d249f2653f98418b3345d6",
+   "sha256": "1ij2w7lhwx2f88m35xp56risa29qrhh2p6xnvc3rnbb9iszajs3i"
   },
   "stable": {
    "version": [
@@ -70804,14 +71182,14 @@
   "repo": "007kevin/pdf-view-restore",
   "unstable": {
    "version": [
-    20190423,
-    1625
+    20190904,
+    1708
    ],
    "deps": [
     "pdf-tools"
    ],
-   "commit": "12d9734d2133dead548497193016c86ab28e9477",
-   "sha256": "1z5483jclfn1xrcdrvrw2c94fpnb1skv6c2ppi3w5nj4myny6nsv"
+   "commit": "5a1947c01a3edecc9e0fe7629041a2f53e0610c9",
+   "sha256": "1b9zzvfsprf7x0v7l4dabdh5qdfhl7mm30vvqah8l10jvlf2wlc7"
   }
  },
  {
@@ -70930,14 +71308,14 @@
   "repo": "sebasmonia/pepita",
   "unstable": {
    "version": [
-    20190731,
-    1610
+    20190907,
+    409
    ],
    "deps": [
     "csv"
    ],
-   "commit": "1d67dad08cb994dd2fa637ea591db14cbb00d644",
-   "sha256": "09lqjssg72bq437cvg15dxmy7j446raaknvkp7pl5357vgmqcdy0"
+   "commit": "489ddc2675906f9dd27bd4ec69ef140e52194952",
+   "sha256": "1k77c7zz73j2vais62qbymk246fyc6nw4jd1abdx2c9jjp3sn94k"
   }
  },
  {
@@ -71198,14 +71576,14 @@
   "repo": "nex3/perspective-el",
   "unstable": {
    "version": [
-    20181120,
-    114
+    20190915,
+    2104
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "2c8cf56d170c3eb1fcc1a8fe41026b780e0ffead",
-   "sha256": "0xlib2f8fjmwk8r0p6r8y5ni687xmixqp9s40rgxc15ikin54hhf"
+   "commit": "519838e2647268567c086b77158a55b01feb7f6c",
+   "sha256": "07bak10gy0ziy7zm9ha8sqfl564nxqhcaaicc35l8zk7qk11gj65"
   },
   "stable": {
    "version": [
@@ -71401,14 +71779,14 @@
   "repo": "zk-phi/phi-grep",
   "unstable": {
    "version": [
-    20170606,
-    807
+    20190920,
+    908
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "ab9bd8d25e751a9cbfa108b49839293230b6e8b5",
-   "sha256": "0p1i07dgaic0jnwdsnvsnib2913r9w8j98d1p5rx8db2nabjmzc0"
+   "commit": "06b740e3fb20074be9bae87530f5616a122c3aca",
+   "sha256": "0lwqlz6jp44dq7yhj5yvfrhnjlxlihkpqjil6d2ma20b2946n9ny"
   }
  },
  {
@@ -71667,14 +72045,11 @@
   "repo": "emacs-php/php-mode",
   "unstable": {
    "version": [
-    20190827,
-    1721
+    20190919,
+    1405
    ],
-   "deps": [
-    "cl-lib"
-   ],
-   "commit": "5a5b9073585b7afb679e32f1d61086d9122c8b3f",
-   "sha256": "1595ncllpfzgjwq8lwcpk8wxgjvcsigpppf6y5s8gj5g7rz4d45c"
+   "commit": "d144da948fed71c4fad3494de9e78e1a6fc96c6f",
+   "sha256": "0m1amqbwz63j6kimk2kj6p8ba30qnvby13dc6iszxf0p78hzdhrx"
   },
   "stable": {
    "version": [
@@ -71765,8 +72140,8 @@
   "repo": "emacs-php/phpactor.el",
   "unstable": {
    "version": [
-    20190824,
-    500
+    20190913,
+    1340
    ],
    "deps": [
     "async",
@@ -71775,8 +72150,8 @@
     "f",
     "php-runtime"
    ],
-   "commit": "299347fbe3dd8617a46e874ccb8511f6705c95e4",
-   "sha256": "0g5hidr0c3f83ml1b8wnkf1blvapkivxzr26amcv5ml0v5f6icjn"
+   "commit": "a12ec67ce9de9e96c89548052ae323a277cba846",
+   "sha256": "031i5s3cv9z2d6vnwbf91291fgafcqg61km9b3z7p9bk91vbkxsy"
   },
   "stable": {
    "version": [
@@ -71840,10 +72215,10 @@
    "version": [
     0,
     3,
-    1
+    2
    ],
-   "commit": "525792fc4a9ecb5dc577a7c416e298e0c45c6183",
-   "sha256": "02cgcqkgwl0rbxhndcyjd8fj57g84n8x4n9rkh671rg3r7p7c71j"
+   "commit": "de74ebfcbce53a08daf95d324d7447dede094222",
+   "sha256": "01x5gf7z0iqx601z3g4cdq6cv27aflxw5kmqrwrj0aijcb7nb9c6"
   }
  },
  {
@@ -71958,8 +72333,8 @@
     20190824,
     806
    ],
-   "commit": "7a487a56f22690eebe4f8b4fb628aab9cba95ab1",
-   "sha256": "121hwfckjvli7g7b2mvmi6m2xp5kk1040h4nripcwl3wp6j5w5w9"
+   "commit": "1ae7af6c310d20b31b8229dc8c1eedeb47aa3311",
+   "sha256": "0ziil73lfcvr3sih00n19jnmciddirwsjqci1im80qg7z268l6s3"
   }
  },
  {
@@ -72259,16 +72634,16 @@
   "repo": "pwalsh/pipenv.el",
   "unstable": {
    "version": [
-    20190522,
-    803
+    20190919,
+    2147
    ],
    "deps": [
     "f",
     "pyvenv",
     "s"
    ],
-   "commit": "03edaaa44a5a4212d2e5a14e3ae6303189d76703",
-   "sha256": "04y6p8gd20xhn7qkz2gp94yxizwl67yhi7qs0x6c8nrxpqd1y5y9"
+   "commit": "b730bb509e8b60af9f5ab1f1e6c3458d1d95d789",
+   "sha256": "0f2lihzzw9v91adx9v89crbsph4zjj0qrlb3a8fikbhd6jy8xpb8"
   }
  },
  {
@@ -72411,8 +72786,8 @@
     20171124,
     410
    ],
-   "commit": "a3d5389a44326314da21f147bad2ede60e2cf986",
-   "sha256": "0qik5478z49fpn9b37fxkybglvsgzbapl1dkam5prg0sxns98xha"
+   "commit": "48b37b9b19d8f1e0accbf930f30b5346cf7959fe",
+   "sha256": "0pi4sjp0aq279m449lw4rbppdivzkazd07bh9jqrmyrw9wib3hbl"
   },
   "stable": {
    "version": [
@@ -72460,26 +72835,26 @@
   "repo": "skuro/plantuml-mode",
   "unstable": {
    "version": [
-    20190822,
-    1403
+    20190905,
+    838
    ],
    "deps": [
     "dash"
    ],
-   "commit": "2f8170b30b9885b5a6992047662d5ba0f4ac2248",
-   "sha256": "0c9as4g2rc1py12wcmv4s4gn2cpsf55cm7b4yf8amld5viz7r7pg"
+   "commit": "1590a75da6c3e25b726bc5e3e12656faab968917",
+   "sha256": "0l20vkq4d673a12lf15m7zn2yzkzf0qkqmq35hi6kpy4bd3zar2v"
   },
   "stable": {
    "version": [
     1,
     4,
-    0
+    1
    ],
    "deps": [
     "dash"
    ],
-   "commit": "b39c310e9cb5a2e7aa72d143348362307d561f88",
-   "sha256": "03sdkjs7al2g6kqsxr8z53lqsnir6wk2a59kgi08lki049zim0a0"
+   "commit": "5889166b6cfe94a37532ea27fc8de13be2ebfd02",
+   "sha256": "0yp41d2dmf3sx7qnl5x0zdjcr9y71b2wwc9m0q31v22xqn938ipc"
   }
  },
  {
@@ -72658,11 +73033,11 @@
   "repo": "flexibeast/plisp-mode",
   "unstable": {
    "version": [
-    20190824,
-    541
+    20190914,
+    513
    ],
-   "commit": "7a487a56f22690eebe4f8b4fb628aab9cba95ab1",
-   "sha256": "121hwfckjvli7g7b2mvmi6m2xp5kk1040h4nripcwl3wp6j5w5w9"
+   "commit": "1ae7af6c310d20b31b8229dc8c1eedeb47aa3311",
+   "sha256": "0ziil73lfcvr3sih00n19jnmciddirwsjqci1im80qg7z268l6s3"
   }
  },
  {
@@ -72985,15 +73360,15 @@
   "repo": "galaunay/poetry.el",
   "unstable": {
    "version": [
-    20190706,
-    1141
+    20190905,
+    959
    ],
    "deps": [
     "pyvenv",
     "transient"
    ],
-   "commit": "0173c61dee6587d5898722df1e06d9c00bee4fd1",
-   "sha256": "1n3xzw204hy3l1kisjpgg01n12x1z01mxfqi3hyfw3w3hlxciw7b"
+   "commit": "9fcefd042355a0280b11ac61e45b52b9819e9c2a",
+   "sha256": "07vhgvpz35infidsw6bh0rxmfhyvmqn93vl9456lfhwyhwka366p"
   },
   "stable": {
    "version": [
@@ -73188,15 +73563,15 @@
   "repo": "polymode/poly-markdown",
   "unstable": {
    "version": [
-    20190715,
-    707
+    20190916,
+    702
    ],
    "deps": [
     "markdown-mode",
     "polymode"
    ],
-   "commit": "6fc4b26392f101494ceb176a8446b159c8a6ac29",
-   "sha256": "0jvn7l59z8ncbs6bwk3ka13gcmxq615w9qp9fam1fvmc3dykakn8"
+   "commit": "a867e5e5689f1e1a5bab5db57c7d39bac2448bcb",
+   "sha256": "1mrmrwmrv6xsafhn7ys3y8nbdqgzhkrb2mm0gir63g03kd6bn793"
   },
   "stable": {
    "version": [
@@ -73702,15 +74077,15 @@
   "repo": "kostafey/popup-switcher",
   "unstable": {
    "version": [
-    20171205,
-    851
+    20190917,
+    1634
    ],
    "deps": [
     "cl-lib",
     "popup"
    ],
-   "commit": "f5788a31918e37bb5c04139048c667bcec9f1b62",
-   "sha256": "0gfi8dlgynciv3q5a208c7gd66g2r99b3zn0i31ibpppjqy2vcsk"
+   "commit": "953f599c1fd9d6843ec9380cc0fc3f8248390d24",
+   "sha256": "1h0mxx1304fp4ilv4cz5mb65a7df1b3hi6n4dz6k9kkzbvihsacc"
   }
  },
  {
@@ -74055,19 +74430,19 @@
   "repo": "raxod502/prescient.el",
   "unstable": {
    "version": [
-    20190727,
-    2126
+    20190921,
+    3
    ],
-   "commit": "ea8e9fea4385272924d09c91220c7f2e9ac95b3f",
-   "sha256": "1apb9v31ajq586f7mqachv238yv40gacrjmh2s8mnk45xil72swy"
+   "commit": "2f01b640e3a487718dbc481d14406005c0212ed9",
+   "sha256": "1wqk1g8fjpcbpiz32k7arnisncd4n9zs84dn3qn9y8ggjzldqy91"
   },
   "stable": {
    "version": [
     3,
-    2
+    3
    ],
-   "commit": "653ca4b66954b7f1b6e4635a574234dd316c11a3",
-   "sha256": "0d60h4rfm5jcf8cf11z91wjqp0xcrviskqzyqhfliqvy2i2yl6ks"
+   "commit": "2f01b640e3a487718dbc481d14406005c0212ed9",
+   "sha256": "1wqk1g8fjpcbpiz32k7arnisncd4n9zs84dn3qn9y8ggjzldqy91"
   }
  },
  {
@@ -74235,6 +74610,24 @@
    "sha256": "1f00l9f6an1mh8yhf629mw0p37m4jcpl8giz47xbdyw1k6bqn830"
   }
  },
+ {
+  "ename": "prism",
+  "commit": "c8ee14b9d67a9703c25b508b324ad7dabaa4352d",
+  "sha256": "1prvvpwa10i260hcj59xfj1vynjv7gykxinqas2xhw6lq6lwrbjk",
+  "fetcher": "github",
+  "repo": "alphapapa/prism.el",
+  "unstable": {
+   "version": [
+    20190908,
+    1820
+   ],
+   "deps": [
+    "dash"
+   ],
+   "commit": "49c8b97b286c7403bf239645964416200ea82dd5",
+   "sha256": "0dcy032g4jc027mwq8dfadsc05bsi1k6yiab3rpdxwc17c9pg9x8"
+  }
+ },
  {
   "ename": "private",
   "commit": "6440f81aed1fcddcaf7afeedb74520e605211986",
@@ -74291,14 +74684,14 @@
   "repo": "travisjeffery/proced-narrow",
   "unstable": {
    "version": [
-    20190818,
-    1923
+    20190911,
+    1818
    ],
    "deps": [
     "seq"
    ],
-   "commit": "079a6834869638ae3586a68474149575d7623ef0",
-   "sha256": "0771n655f4bhvw6qdjkk0m8l5qwbqdyk28whp52bmx95j56yfkvx"
+   "commit": "0e2a4dfb072eb0369d0020b429e820ae620d325e",
+   "sha256": "0d1qq5606prls7mzy0iri41j2c14l4axz6kq629r4wjdqwshxkli"
   },
   "stable": {
    "version": [
@@ -74610,14 +75003,14 @@
   "repo": "bbatsov/projectile",
   "unstable": {
    "version": [
-    20190626,
-    1315
+    20190904,
+    1025
    ],
    "deps": [
     "pkg-info"
    ],
-   "commit": "71a01f409a319d57eb3832e93e8a412fbc9d7a65",
-   "sha256": "1qsm4kwydi56h7p0mdm7m8r6nhm4l7lp7snamcgjyfmja2w424fl"
+   "commit": "0707fc4fd6cb10959bede0d321a915a959c466aa",
+   "sha256": "14bz3jp0qvq36h70jrv7y18zfgrlh258v18r6sr8fm6pa05kchr8"
   },
   "stable": {
    "version": [
@@ -74731,8 +75124,8 @@
   "repo": "asok/projectile-rails",
   "unstable": {
    "version": [
-    20190706,
-    1231
+    20190913,
+    1003
    ],
    "deps": [
     "f",
@@ -74741,8 +75134,8 @@
     "projectile",
     "rake"
    ],
-   "commit": "b0c88a381cc15b0aaba2629949e10ae6373d209a",
-   "sha256": "0p33gmykri30csv9b214rmmcxm59c0lcwhbwala78a28y63mfcri"
+   "commit": "d31af287b2228f855e0bfbc5f985f999e5b5f811",
+   "sha256": "1r4ib96kkhy40m5jd63d9qml9k495zcjk12mwxcid8pk0f1s8l7d"
   },
   "stable": {
    "version": [
@@ -75149,17 +75542,19 @@
     20170526,
     1650
    ],
-   "commit": "36bdcb5a7a79aff977617bd1a83a7b25055e38bb",
-   "sha256": "00fgcysw557mgs0wfh095djnxd94qklf6h45bh8zw1dyhwfbmqpx"
+   "commit": "b9f405ae46036860a4e73e167bee3800dfe53a9e",
+   "sha256": "0q70rsi012ybyq7akanl2np4x0ajqcmjknwcwrk3issy24l9f9sq"
   },
   "stable": {
    "version": [
     3,
-    9,
+    10,
+    0,
+    -1,
     1
    ],
-   "commit": "655310ca192a6e3a050e0ca0b7084a2968072260",
-   "sha256": "0vv85xb65dx6fa76fsnyps13kaamvwfzd8hr6ii1payr73x4zy2h"
+   "commit": "ae1bcaad6ffcd04ca5d40f21dc3fab4f965e49cb",
+   "sha256": "0slzayqgda24z24470lx0iv0rqvvj0jg7g8izbgx2l5g04al0ihz"
   }
  },
  {
@@ -75428,8 +75823,8 @@
     20190828,
     1136
    ],
-   "commit": "c47ea8fca65c0f964365488a392e51798d698cdd",
-   "sha256": "0j861dp8jzkp6a6956x9jy00bc905bzf3rwylws2vvrz9wpzp7r3"
+   "commit": "1b844a9b21d549bfe767990b4c611de3bc4e2241",
+   "sha256": "0fz2ynxxgq3j7hvfmqq24gvbfpc08apz6zw9cjav08r5z04n1xr3"
   }
  },
  {
@@ -75892,8 +76287,8 @@
    "deps": [
     "pythonic"
    ],
-   "commit": "eabb1c66f9e0c0500fef4d089508aad246d81dc0",
-   "sha256": "1zmgm24d6s56jc4ix61058p1k0h95vdvdllr7fh1k3bq4mw22qn3"
+   "commit": "123facbaca9aa53dbf990348ea2780cbbdd0f96a",
+   "sha256": "0gwf5za48b20lfs3cm0syd2jmnnzgyqx5b4f4vvfiipyy8dqgxjf"
   },
   "stable": {
    "version": [
@@ -75971,8 +76366,8 @@
   "repo": "tumashu/pyim",
   "unstable": {
    "version": [
-    20190826,
-    51
+    20190906,
+    708
    ],
    "deps": [
     "async",
@@ -75980,8 +76375,8 @@
     "pyim-basedict",
     "xr"
    ],
-   "commit": "0b8a7ff8b0fcd1086ef938ae398c8efb4791e494",
-   "sha256": "0lac78442pyidlrnd8zy6c96adv1jdfismz0qd9a0rj4zyfnzp4r"
+   "commit": "8a14040b6b6f600c6e0df2455a19662c997a1768",
+   "sha256": "11ysppg9h2n2m9qi6ml5hi1lwqj7h21hdi4h50cw5b24k334dyyz"
   },
   "stable": {
    "version": [
@@ -76126,8 +76521,8 @@
     20170402,
     1255
    ],
-   "commit": "6b3afd4f6d75debd7f286f0d3c760ed10ab1e79f",
-   "sha256": "19rq53qmk3vzlh9l29f254jpvjbf28j6bzmhzakhy8sn1vchpqsq"
+   "commit": "de75ba13eedd6cb6e84a96e0b79765e890c46efe",
+   "sha256": "0z81z1j2qgpgbx4mjj57fkaxvxwbnzm2hrnaayi1nlkf72a6ccj9"
   }
  },
  {
@@ -76356,11 +76751,11 @@
   "repo": "python-mode-devs/python-mode",
   "unstable": {
    "version": [
-    20190819,
-    1244
+    20190912,
+    1653
    ],
-   "commit": "31603f1fc1d8a7568b7259d7ccfef58dde72430a",
-   "sha256": "17rb0427v6nwjxy7b2364ihhlzhnqib1xvb547x8kdl971hw3ngx"
+   "commit": "2fc13db9eb7652b3f6619fbd1a96073850ee6175",
+   "sha256": "0mw3hvslvvj6h56nc42my94vjci36k3yr44511635vdmfsmdzafl"
   },
   "stable": {
    "version": [
@@ -76487,8 +76882,8 @@
     "f",
     "s"
    ],
-   "commit": "1ba07048cffa0f95d7d1c75eab2d2be175e67cb6",
-   "sha256": "12dhh11q16crhb6dffwx3s7ncgbqsvc2dvpkzgllr58iwd8hs2kk"
+   "commit": "97135d933db4567fd817c51b3c93c94b2864395e",
+   "sha256": "08x5q7cgrgaamjidbzr65d0x5f0q1wmdzz4rlvw38mv6y30pifnr"
   },
   "stable": {
    "version": [
@@ -76514,11 +76909,11 @@
   "repo": "jorgenschaefer/pyvenv",
   "unstable": {
    "version": [
-    20181228,
-    1722
+    20190916,
+    1037
    ],
-   "commit": "fa6a028349733b0ecb407c4cfb3a715b71931eec",
-   "sha256": "1x052fsavb94x3scpqd6n9spqgzaahzbdxhg4qa5sy6hqsabn6zh"
+   "commit": "392e28dad42dc6cc9507e496391a32482f9f1881",
+   "sha256": "0kmzqinlv99wpm5q0lzwlzmjsc03m4z24pwz3zixldh76f7c2fmb"
   },
   "stable": {
    "version": [
@@ -76955,14 +77350,14 @@
   "repo": "greghendershott/racket-mode",
   "unstable": {
    "version": [
-    20190803,
-    1820
+    20190917,
+    1350
    ],
    "deps": [
     "faceup"
    ],
-   "commit": "5300aa004f08535c3fac99f1af78462f129aca81",
-   "sha256": "1gkpm4fl1ybsm9qqgrkwyjbd9znddy438x266k27fs90lkxrfray"
+   "commit": "8e2c6c5c7fc2677f18067f5f6ce4b1836d288352",
+   "sha256": "1iwsjdw52plkvivj79rk83d15l6wfxpg7l78hkbhzg3brxj0lg1l"
   }
  },
  {
@@ -77301,6 +77696,30 @@
    "sha256": "0jzhyf42m9gqcnsz9gxc9wk8bbb9a7fj78swwyj0wqn9jm8jxbra"
   }
  },
+ {
+  "ename": "rbtagger",
+  "commit": "2365f30d641474e121d64729e5f57641bbb44d17",
+  "sha256": "03f34vb6rks67mgxn0yk2imfsn9fsshi2j3fv4zilb4dav778n4y",
+  "fetcher": "github",
+  "repo": "thiagoa/rbtagger",
+  "unstable": {
+   "version": [
+    20190916,
+    1757
+   ],
+   "commit": "d82c64d01002077f6bd5fa9d78c35ab3d6ef63e0",
+   "sha256": "0azd15bpn8z7538fq2s577ljwj2r5b6qf511hrzr9791m8vnzb3h"
+  },
+  "stable": {
+   "version": [
+    0,
+    1,
+    3
+   ],
+   "commit": "dcc8ca8b9c1e42e637b9225b7ad8a3d50dd01be6",
+   "sha256": "0rrpjq3dczwp2vj4dclylid27hwd0am0l8p9kqy67wldkkcc0qz2"
+  }
+ },
  {
   "ename": "rc-mode",
   "commit": "d8062b2e5b2744a6e614b389cca7e7f21b582f6f",
@@ -77580,16 +77999,16 @@
   "repo": "realgud/realgud",
   "unstable": {
    "version": [
-    20190724,
-    2001
+    20190912,
+    744
    ],
    "deps": [
     "load-relative",
     "loc-changes",
     "test-simple"
    ],
-   "commit": "11c57cd2ea898c2167ad6c7f80eb1807109d8260",
-   "sha256": "0x5d2g18sywh36gp1l2pbjfx4qp3gpvgrkx8gvjsgjdfgmpiygag"
+   "commit": "cc5d1236879a2dcdd91c9a842987f2f5a3accd11",
+   "sha256": "0a27lmaqbhg227insacadrcxhzi6pi64hj4yx3mkppnhiyaasy6v"
   },
   "stable": {
    "version": [
@@ -77673,15 +78092,15 @@
   "repo": "realgud/realgud-lldb",
   "unstable": {
    "version": [
-    20190604,
-    702
+    20190912,
+    1335
    ],
    "deps": [
     "load-relative",
     "realgud"
    ],
-   "commit": "f2f77d6ddfa42430ead400eaf81c605c3a04dead",
-   "sha256": "0n8nagjhgyg2l0qymx4rjzigxnhhks86s8flpndsfyhzh98b8qbm"
+   "commit": "47cb0178fdde50a9d9151ab45806b41007cd758a",
+   "sha256": "11vaiq7c4iaypsgs4x4sdfycjailba36qh0pwgdprmiyf8swy8hq"
   },
   "stable": {
    "version": [
@@ -77805,15 +78224,15 @@
   "repo": "realgud/realgud-trepan-ni",
   "unstable": {
    "version": [
-    20190528,
-    2211
+    20190912,
+    1418
    ],
    "deps": [
     "load-relative",
     "realgud"
    ],
-   "commit": "4cd936edcc89324a819b21aa1afd331c02e6bd3e",
-   "sha256": "0h0d8566km6v7rgiqx54lwazwwl929npxicg8dx8qw12q13vkk31"
+   "commit": "6e9cac5e8097018aadf41c88de541168036cc227",
+   "sha256": "0xc80mhqk26vm1sv8xz0zw0pmbznvdpb8gla5bh3rnxpadpannc3"
   },
   "stable": {
    "version": [
@@ -77830,6 +78249,30 @@
    "sha256": "14sd9d0jzr0iiy4hzssabp08wifbnb4hh6xs5b2v8ch348kcwpwv"
   }
  },
+ {
+  "ename": "reaper",
+  "commit": "034737d27ad4305b526210e82fe320db4f72a84c",
+  "sha256": "0yr1nb550903g0i2x7arw155v0x5vi4hbdniddwaxa4v9712gphj",
+  "fetcher": "github",
+  "repo": "xendk/reaper",
+  "unstable": {
+   "version": [
+    20190920,
+    2209
+   ],
+   "commit": "1c58c96380b8dc31002bbc87100c3faecfa01f1b",
+   "sha256": "08yfwxpqsr0qvy8bhj650n2yd2dxs2miciszngbnplrkkvdy0v7g"
+  },
+  "stable": {
+   "version": [
+    1,
+    1,
+    0
+   ],
+   "commit": "1c58c96380b8dc31002bbc87100c3faecfa01f1b",
+   "sha256": "08yfwxpqsr0qvy8bhj650n2yd2dxs2miciszngbnplrkkvdy0v7g"
+  }
+ },
  {
   "ename": "reason-mode",
   "commit": "f9f1a18c13601f3a4fd7b1bbfe7d5da07746e492",
@@ -78350,11 +78793,11 @@
   "repo": "alvarogonzalezsotillo/region-occurrences-highlighter",
   "unstable": {
    "version": [
-    20190830,
-    1152
+    20190905,
+    730
    ],
-   "commit": "5f52084d77c22df3b57e96a7ce0dc69679088f4e",
-   "sha256": "1p0q7dgchh9cjj0rknas3g40d5lfcp9qrxfbpq6hqzz569f6pc2y"
+   "commit": "ee86d6a79342c6e4b3cfad5ec73cb0a40e18ae3d",
+   "sha256": "06y1hbqgdw2y0isn26wmwrqjxb1ypwrqhcjg4n69mdn74cwlk4jz"
   }
  },
  {
@@ -78421,8 +78864,8 @@
   "repo": "proofit404/relative-buffers",
   "unstable": {
    "version": [
-    20160221,
-    1923
+    20190914,
+    1042
    ],
    "deps": [
     "cl-lib",
@@ -78430,8 +78873,8 @@
     "f",
     "s"
    ],
-   "commit": "2547475084244d266b507e563c9b4034705cfeca",
-   "sha256": "16m4qyjg0ca1j944ra1qhhg9ks3sk0rv5ax59rqga20l8wf6k0jq"
+   "commit": "496fd31530adc455992b2bac535900fd29b9ad51",
+   "sha256": "14nqs14ml33wlrm268dpijs0n2b12yrlysk1qd62fc7k5hvz9wxl"
   }
  },
  {
@@ -78733,11 +79176,11 @@
   "repo": "tkf/emacs-request",
   "unstable": {
    "version": [
-    20190819,
-    1735
+    20190920,
+    1649
    ],
-   "commit": "f0aeeb5fc17ae270d9a109299edc48e8cf2bf2b6",
-   "sha256": "09kdi4mijv6wzcizh7f9lvdszb12csh52yy1r8y7njmma5hqfndp"
+   "commit": "b074594a8eafe8fbd2f97687ac396900e2fe57b9",
+   "sha256": "1pahi7vvffcpldc5x39brpvjfipyqzagjzmmmdg6mxk5hjw2dvyq"
   },
   "stable": {
    "version": [
@@ -78764,8 +79207,8 @@
     "deferred",
     "request"
    ],
-   "commit": "f0aeeb5fc17ae270d9a109299edc48e8cf2bf2b6",
-   "sha256": "09kdi4mijv6wzcizh7f9lvdszb12csh52yy1r8y7njmma5hqfndp"
+   "commit": "b074594a8eafe8fbd2f97687ac396900e2fe57b9",
+   "sha256": "1pahi7vvffcpldc5x39brpvjfipyqzagjzmmmdg6mxk5hjw2dvyq"
   },
   "stable": {
    "version": [
@@ -79078,21 +79521,21 @@
   "repo": "dajva/rg.el",
   "unstable": {
    "version": [
-    20190828,
-    1339
+    20190917,
+    1351
    ],
    "deps": [
     "cl-lib",
     "s",
     "wgrep"
    ],
-   "commit": "64f25282fbba3cb436dbaabe73f5a5417f2daaa8",
-   "sha256": "003da113ak5bx2jdcy0ffkm2ihg013m1vk9v7pc5k65xb262c5wz"
+   "commit": "316dd7e3e7d9fa1f55a5cc3233469970589a2dee",
+   "sha256": "0wc2qmzfc77ff25cml1fb1pdng57jnwj8gxkh67p0gh8irl62714"
   },
   "stable": {
    "version": [
     1,
-    7,
+    8,
     0
    ],
    "deps": [
@@ -79100,8 +79543,8 @@
     "s",
     "wgrep"
    ],
-   "commit": "77670a4bcdba138a0cef3fb12a20b1492dca902a",
-   "sha256": "0hpxkpyylzvzzvqc51ac0r89nv1jdymb8nmsb03sq1svsw5nyag9"
+   "commit": "df76c35a7c370f34e23f4ad20a22aacce5581165",
+   "sha256": "0p29hcf0gcswlsy4cy68byys459358v14fzdbz38j1diz5g5ac6p"
   }
  },
  {
@@ -79494,11 +79937,11 @@
   "repo": "DerBeutlin/ros.el",
   "unstable": {
    "version": [
-    20190720,
-    1439
+    20190919,
+    1939
    ],
-   "commit": "ef443866c2f9ad6b2099fe04552a71c654799808",
-   "sha256": "071k37019v7fx75ssw823rsgzgmicgpnm641qdfz47zagg9b1xg6"
+   "commit": "967963404824052f25913906f506b090ebba221a",
+   "sha256": "09p9dcybkabkrdvv0ss9jgbmn87zilgijpxhd0r18qpb5hipyr8g"
   }
  },
  {
@@ -79595,15 +80038,15 @@
   "repo": "pezra/rspec-mode",
   "unstable": {
    "version": [
-    20190609,
-    1123
+    20190912,
+    856
    ],
    "deps": [
     "cl-lib",
     "ruby-mode"
    ],
-   "commit": "bc2618a71e0bbef60258cf59bad0796f469a2685",
-   "sha256": "0ivcp2gvysr6lx0dv2d9g4bsc5sb6h6qjn5b0yr67lbs0r6wrvva"
+   "commit": "66ea7cc9699d6edc6115daa024818adbd85efc20",
+   "sha256": "0b11s8r0pi7ah54km4yg4fqff8wkk409d25qnlwm1l94pdwjd1c8"
   },
   "stable": {
    "version": [
@@ -79626,11 +80069,11 @@
   "repo": "Andersbakken/rtags",
   "unstable": {
    "version": [
-    20190820,
-    502
+    20190918,
+    505
    ],
-   "commit": "6289e66a69d0d5ff20b12da91e735d3984ad6f88",
-   "sha256": "1ggdi4mgqw1cc0w6cijds7s4vb575v27g72h6md8h1jdsfv6pvrm"
+   "commit": "3543b8404640884d901c719bb83c5474056cf97f",
+   "sha256": "1k1d3llf150rih8dba2fg7xp9ksnbfzdsj01lziqz396p34sim0f"
   },
   "stable": {
    "version": [
@@ -80101,8 +80544,8 @@
     20190517,
     2037
    ],
-   "commit": "48290d331d923031156bbbaf8360b774bf983d1e",
-   "sha256": "0xws8mrbrzhfy9kf2p68kwxvshayzbhrnqs6jjvv89h4aaj3630i"
+   "commit": "af84c0fe9ec13e45f6b7f07caf144607d0b82fca",
+   "sha256": "1b7lrbx5hk9vxr8zws8vcv3pfr3h0xjmc67kcw2njsjc83p4icwl"
   },
   "stable": {
    "version": [
@@ -80145,8 +80588,8 @@
   "repo": "brotzeit/rustic",
   "unstable": {
    "version": [
-    20190820,
-    1448
+    20190919,
+    1217
    ],
    "deps": [
     "dash",
@@ -80160,8 +80603,8 @@
     "spinner",
     "xterm-color"
    ],
-   "commit": "cb03a31bff0b1a13ff1ac90c1fd9bc89c55fbb0e",
-   "sha256": "0n0vrlv9l9d8qa4vrkvy5jaj6j4qvlqkjz1p5rya2vmiv4wb56ba"
+   "commit": "2f89af8886cfb346b136fe60c80e2f4e3de5bb0c",
+   "sha256": "1gggjg69c0jqyijqgmdbhvhpxspivxp3ljwj2ypzygx2xgmrih1h"
   }
  },
  {
@@ -80199,8 +80642,8 @@
     20190816,
     1209
    ],
-   "commit": "539abca4651dda2d667a44f172957df39fa76eb5",
-   "sha256": "1n3biqink9zfbj4r94519xn68xigkvx16caj35njfzc05pkmvawc"
+   "commit": "0bb210f37539e9d0c1e77ae286a0d7db79cf8edf",
+   "sha256": "1x093wq7srgby3608n3q1vkdfvx9b98q7mzfhxwmy3999y7qhsk5"
   }
  },
  {
@@ -80548,14 +80991,14 @@
   "repo": "clojure-emacs/sayid",
   "unstable": {
    "version": [
-    20190826,
-    1037
+    20190919,
+    654
    ],
    "deps": [
     "cider"
    ],
-   "commit": "6febf397d5d610d28100fb1381a82d5e77f0d261",
-   "sha256": "0ra8xjsmagjwa1qakr1x4f9l88f3zj686dyk88q9qj1bvyam8r33"
+   "commit": "277404a6bb0a979e195df5886fc143bb1d1f1e8c",
+   "sha256": "0whsfl6z39zhjm6b3wcliwfs70xz3pg9b1r6s2bcwnp5ld1v65m9"
   },
   "stable": {
    "version": [
@@ -80605,8 +81048,8 @@
     20190413,
     1246
    ],
-   "commit": "c060053d3b4818bf6d0620b0711be845795c4157",
-   "sha256": "0w3s32kk7mr9605mmssxrh4izq1wllxccd1hs4hcn2fz04igd9b7"
+   "commit": "497baa7a4f9e688b7c9eb6f16dd57e645202e041",
+   "sha256": "0ss7wkc46xmwgldhdygx0344zh2c51ny2xbj869sqpky1wi72z4c"
   }
  },
  {
@@ -80953,11 +81396,11 @@
   "repo": "emacs-pe/scribble-mode",
   "unstable": {
    "version": [
-    20181204,
-    325
+    20190912,
+    200
    ],
-   "commit": "217945d54de5e4bb207033f2116baa28f5c5ecf2",
-   "sha256": "1s5ccw1a5ack01wd94ywfcrar9j98agchwdh30q7iyxr0d2z4sii"
+   "commit": "5c3ea3cc9bbad585476eee41ea76dc056c2012bb",
+   "sha256": "0p7mch1z289hjxmdb4w04sdixkqqvjmrrw92yd6akr551yj0jbhx"
   }
  },
  {
@@ -81614,11 +82057,11 @@
   "repo": "vspinu/sesman",
   "unstable": {
    "version": [
-    20190623,
-    1123
+    20190909,
+    1754
    ],
-   "commit": "e8bfb0e37940bf5f370ae300b896dd04afbc63c8",
-   "sha256": "0p2hlrsy2s7pkqlsdicbv3jm2bg16nlrwpllqgnvbqss6jrasx17"
+   "commit": "edee869c209c016e5f0c5cbb8abb9f3ccd2d1e05",
+   "sha256": "16d4kkfmrzc4d0smk9m759mv11bvicixrvwh1za7c6avscg9lym2"
   },
   "stable": {
    "version": [
@@ -81784,11 +82227,11 @@
   "repo": "Shopify/shadowenv.el",
   "unstable": {
    "version": [
-    20190818,
-    2128
+    20190903,
+    1907
    ],
-   "commit": "1887f606db73846d7da6023cb8944efbc791377c",
-   "sha256": "1izivy5vz2x86yqbip69jz7sfrjwfm0gsya95ynic7q9qqnq7bmj"
+   "commit": "f3cbe25c82f99367ac009d67a2400eb6d56547ff",
+   "sha256": "10y7qcb61f0x17fy5h2flhvyyql99cshqmfy1varn1mgg2h36mn9"
   }
  },
  {
@@ -82130,8 +82573,8 @@
     20190826,
     741
    ],
-   "commit": "3e75463de69ce58ae57aca3b7f5e851a728c499c",
-   "sha256": "13a112i5dxsgmphdckzlfa2nys2pfs02ps8i3fas8vq04zk4314n"
+   "commit": "c9cdb7e3075ddfc9aef356d42b376ebbb039bc7e",
+   "sha256": "1vg43ln70kifk3h0rwmj7w85mksg1yl3z4kqfq9q5zalp9jgwfsh"
   }
  },
  {
@@ -82473,11 +82916,11 @@
   "repo": "rnkn/side-notes",
   "unstable": {
    "version": [
-    20190816,
-    303
+    20190903,
+    818
    ],
-   "commit": "96c4677ba4dc91c8100c93d3af6f165c21db3e05",
-   "sha256": "1gway2ljpi1ac0ssy9r11pvy50j6c5y10wfs4bizlqhzdpjfinh2"
+   "commit": "0d23b13938d4443463ee66956bf57e0a459cb166",
+   "sha256": "1mg0x390nzr844l4zlr4ismkxb9zyy35kg8zjlmy6pcggn7cf82c"
   },
   "stable": {
    "version": [
@@ -83072,15 +83515,15 @@
   "repo": "slime/slime",
   "unstable": {
    "version": [
-    20190818,
-    1634
+    20190920,
+    1906
    ],
    "deps": [
     "cl-lib",
     "macrostep"
    ],
-   "commit": "cbab3e9a1bc4f1a03ee21f392a499f01333af816",
-   "sha256": "0y645w8lp1f51xx0f36fv2fz1lgk2w1rk7v6brxfg44igbb4c6sv"
+   "commit": "ebf170aed587e98d9af75151df1d497e185f5ae0",
+   "sha256": "0mnw8s073am4inyg271xpsk79v5ha5bc646a9rd3b32152hlwnl7"
   },
   "stable": {
    "version": [
@@ -83750,11 +84193,11 @@
   "repo": "genehack/smart-tab",
   "unstable": {
    "version": [
-    20170902,
-    2107
+    20190916,
+    137
    ],
-   "commit": "76a8ec13384975d39aa1b25e5384a02558dba574",
-   "sha256": "02mj2is05adq5v64aahivbkx2kzrxmmg2va650hsvl4izj3dr2x3"
+   "commit": "0f6963ce4de403fa43f3db68b31ce059f6251c3a",
+   "sha256": "16rh9wwjnqjk7hf7npfvwf28wmhd7bwnsnfgh592gv70xkcwywaa"
   }
  },
  {
@@ -83806,15 +84249,15 @@
   "repo": "Fuco1/smartparens",
   "unstable": {
    "version": [
-    20190728,
-    2037
+    20190904,
+    1742
    ],
    "deps": [
     "cl-lib",
     "dash"
    ],
-   "commit": "7080e7fba9f478c2e5d4c18a325c3a5d60f6be76",
-   "sha256": "029hy609p74w36ivcnw40x6j2v6agjg5bha4k8wbch3wf9y823mz"
+   "commit": "12856838cf9b0e6a635a6ceb14a22fdc03b04728",
+   "sha256": "1252j96slvipjlixp9gzlsa5za7zx9a7piz661qmbv6pb812ibfr"
   },
   "stable": {
    "version": [
@@ -83924,11 +84367,11 @@
   "repo": "aaptel/smblog-mode",
   "unstable": {
    "version": [
-    20170419,
-    1021
+    20190920,
+    1823
    ],
-   "commit": "5245e7aeac20915121946f59bba30899305d950b",
-   "sha256": "0i5q29b3hk644dnc0d98d613l065p0k846ljg13vgawpiic6ld6b"
+   "commit": "fe866afbe19f804f80c37e077192576e4b0aad1a",
+   "sha256": "19zynq5izaafkj97a1f7dz8fljdr0mxsal8xcfa938clxihydaaz"
   }
  },
  {
@@ -84131,28 +84574,28 @@
   "repo": "kyleam/snakemake-mode",
   "unstable": {
    "version": [
-    20190412,
-    228
+    20190912,
+    308
    ],
    "deps": [
     "cl-lib",
     "magit-popup"
    ],
-   "commit": "d49c6580e5e01a5e80198f4026caf1d5a717f8a0",
-   "sha256": "0lxxd0a735sy4igncf6f0ljk2wy38x2pm1yq90gxymwi26j75ram"
+   "commit": "239b0c812b6963877d64c7051128353f2b9bcb55",
+   "sha256": "11p5gcpb4j5y1wbz212wi8nc7vznbxd70aafb1891q6bcli10g2c"
   },
   "stable": {
    "version": [
     1,
-    5,
+    6,
     0
    ],
    "deps": [
     "cl-lib",
     "magit-popup"
    ],
-   "commit": "0cadd2bbd20aae1555561e81ed72fec43ec7296e",
-   "sha256": "1i4cwdyhfyawfx07i63iqdx524mlphgbrl44wqqnnxrbdqm0h534"
+   "commit": "239b0c812b6963877d64c7051128353f2b9bcb55",
+   "sha256": "11p5gcpb4j5y1wbz212wi8nc7vznbxd70aafb1891q6bcli10g2c"
   }
  },
  {
@@ -85574,11 +86017,11 @@
   "repo": "srcery-colors/srcery-emacs",
   "unstable": {
    "version": [
-    20190526,
-    1227
+    20190909,
+    1149
    ],
-   "commit": "a47a40c7c5d39d251bf15e45f184565c5240b33e",
-   "sha256": "1i3c7y0a7dzvb3c8pk69gvh33945bhm00j0fwl49yh7hg2d9w118"
+   "commit": "0879e2fe1872fe11c3ddfab631987ed64bb5c437",
+   "sha256": "0mwy50rydy64zcy9g08b952vjd5ij9gwgcsl6ipaq52kjhs7x8l8"
   },
   "stable": {
    "version": [
@@ -85726,11 +86169,11 @@
   "repo": "cjohansson/emacs-ssh-deploy",
   "unstable": {
    "version": [
-    20190816,
-    2237
+    20190917,
+    530
    ],
-   "commit": "d0f7294d23380766dcabdb4ed21bc6a68e496110",
-   "sha256": "1w4zd38whpqidhfscbcns7y14ixw6lq2x6wirfjxybq3yilgz9j2"
+   "commit": "93a0e189a06d49b03627c65fe77652bee9f129d4",
+   "sha256": "1ijmnn3f6ymm04fbp6xmsvc1nrxgcj0k90462ffyl6adbzv4f82a"
   },
   "stable": {
    "version": [
@@ -85939,14 +86382,14 @@
   "repo": "Kungsgeten/steam.el",
   "unstable": {
    "version": [
-    20171109,
-    13
+    20190916,
+    627
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "d6ca2a828b0824da51978397e198bf91c51ce793",
-   "sha256": "16cxws1b3iwm9aqbiip298zsjm6gwjihpvkia4p0zvzynwhflw8q"
+   "commit": "f32951f4e0a4bc92813d0121d9df0257101b8992",
+   "sha256": "1fl4875992xxv0amcqj7b516f35k19h8fd7pij0by5b808k5ls6x"
   }
  },
  {
@@ -85990,8 +86433,8 @@
     20171130,
     1559
    ],
-   "commit": "143146feada95b8be228d339114f2c469a78bbb9",
-   "sha256": "0dknxxp320zy3zrrbqsgl4d8jj4i2xcmsa6n91zpvdnb035658pp"
+   "commit": "43559408e8340e8fac588c5711c40f7cdca48f96",
+   "sha256": "1w576zzb0dzffn59bxf14z32vy7rmdj4k8ms2dy7qn4vhmyr38jx"
   },
   "stable": {
    "version": [
@@ -86051,6 +86494,24 @@
    "sha256": "191sg32z1iagyxmbn49i1lpfihld9g9741cw2kj830s4vag4kinx"
   }
  },
+ {
+  "ename": "stock-tracker",
+  "commit": "5e959303b4c0a07c821252a913b578f70b5f41ad",
+  "sha256": "1gc4z980rp9s0nvbrbp792ckyw12ahfsk3a3whf12vb3anmmgd7b",
+  "fetcher": "github",
+  "repo": "beacoder/stock-tracker",
+  "unstable": {
+   "version": [
+    20190902,
+    812
+   ],
+   "deps": [
+    "dash"
+   ],
+   "commit": "c7455081fa78fd8ffa229dcf0c691f66bf2ece16",
+   "sha256": "19phvf5xcaiwlxx0s8p9ys6xrw6ljp9qxjik98v2ab6d8f2x123q"
+  }
+ },
  {
   "ename": "strace-mode",
   "commit": "9b2003bee9992d9e79124d95d30b573c8a6bdbfe",
@@ -86561,14 +87022,14 @@
   "repo": "aaronbieber/sunshine.el",
   "unstable": {
    "version": [
-    20181029,
-    1654
+    20190905,
+    1832
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "8959dea03377e61aaca0124ac8d2703daaae6b9a",
-   "sha256": "1shzhl5bi5dkmvc07mc7sknm5id89iivjkcxsrdcw004g08hr8y0"
+   "commit": "5e57899b2201dd36ae7242aa13ca82efcded3b7c",
+   "sha256": "1l7mls11k9v524c2f4d2xk6b8gydl5mgrpjf7vnngwz63mdy263n"
   }
  },
  {
@@ -87345,14 +87806,14 @@
   "repo": "emacs-berlin/syntactic-close",
   "unstable": {
    "version": [
-    20190513,
-    947
+    20190905,
+    619
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "2bd46845b664ae828c8b973839ef454cde501028",
-   "sha256": "1r1ia1yw43vvyk62d6r1k55zcz185777s10ix9bg3fllczdbyzcz"
+   "commit": "9bc6dd926bb879cd95ac0def484181f8c6b53419",
+   "sha256": "0bss78m7x46rdivdz74pygq5vdvsna1aabrdj081g4ay36n6grrj"
   }
  },
  {
@@ -87409,6 +87870,37 @@
    "sha256": "0v2andw08qawgbdzn0vplxd3drs41gqf2qbidhakmsssdd4nqiib"
   }
  },
+ {
+  "ename": "syslog-mode",
+  "commit": "44b28cc63352e4398a94338d885371226d1e81aa",
+  "sha256": "15kh2v8jsw04vyh2lmh1ndpxli3cwp6yq66hl8mwb1i3g429az19",
+  "fetcher": "github",
+  "repo": "vapniks/syslog-mode",
+  "unstable": {
+   "version": [
+    20190913,
+    2040
+   ],
+   "deps": [
+    "hide-lines",
+    "ov"
+   ],
+   "commit": "18f441bf57dd70cdd48a71f1f4566ab35facdb35",
+   "sha256": "1xl6immya0i5xjpls3vqdqj9rr5jxp5srny8l9j4qxf8kp75byqa"
+  },
+  "stable": {
+   "version": [
+    2,
+    3
+   ],
+   "deps": [
+    "hide-lines",
+    "ov"
+   ],
+   "commit": "18f441bf57dd70cdd48a71f1f4566ab35facdb35",
+   "sha256": "1xl6immya0i5xjpls3vqdqj9rr5jxp5srny8l9j4qxf8kp75byqa"
+  }
+ },
  {
   "ename": "system-packages",
   "commit": "7d3c7af03e0bca3f834c32827cbcca29e29ef4db",
@@ -87776,11 +88268,11 @@
   "repo": "saf-dmitry/taskpaper-mode",
   "unstable": {
    "version": [
-    20190805,
-    1153
+    20190919,
+    727
    ],
-   "commit": "3f5b0981a87f1c4895961f36e0a67b69ccbbb18d",
-   "sha256": "194m2rm1yv7jp6nb7mm3m4hyhj81i379ky7ifaisrvc1jm3dwp6n"
+   "commit": "c95fb2375b0c8d448a347241eb95f160e6880e99",
+   "sha256": "18qdnjxr4p4a2ds4k7sk5kkykyxcfri8zws3bhisfz1kayad1wlg"
   },
   "stable": {
    "version": [
@@ -87791,6 +88283,25 @@
    "sha256": "0mwd9i6mm0h18z7fiqla95bx6c0zb8x4f6380842hgzi9zrnghxi"
   }
  },
+ {
+  "ename": "taskrunner",
+  "commit": "f0e0354a4da2e675406068d158c7e532cd5ed083",
+  "sha256": "0dyqqlafzxn0irmqwfh9rjysn1vm0wxlapg3pzgqps1w4mkkvwc5",
+  "fetcher": "github",
+  "repo": "emacs-taskrunner/emacs-taskrunner",
+  "unstable": {
+   "version": [
+    20190916,
+    1608
+   ],
+   "deps": [
+    "async",
+    "projectile"
+   ],
+   "commit": "716323aff410b4d864d137c9ebe4bbb5b8587f5e",
+   "sha256": "03llmj09jg5cba927qbzkhld83k24yd1i95nfiq7q754a4y4iksn"
+  }
+ },
  {
   "ename": "tawny-mode",
   "commit": "ea9a114ff739f7d6f5d4c3167f5635ddf79bf60c",
@@ -87799,14 +88310,14 @@
   "repo": "phillord/tawny-owl",
   "unstable": {
    "version": [
-    20170422,
-    2202
+    20190912,
+    1357
    ],
    "deps": [
     "cider"
    ],
-   "commit": "1be07e047343a1bdbb1a8ca40ff6ed3fbb585dec",
-   "sha256": "1x6544hk87pxlvjv136wi3ixswpd621zjmv20c85bxj8zaasc80n"
+   "commit": "217ca22fdff89a2bbe23d67afd43c06f928de826",
+   "sha256": "0w16icw1g1naaasvnjaggjvqyfbbwmc4xlw928dnqyfyys2a4j60"
   },
   "stable": {
    "version": [
@@ -87957,26 +88468,26 @@
   "repo": "zevlg/telega.el",
   "unstable": {
    "version": [
-    20190830,
-    1446
+    20190920,
+    1329
    ],
    "deps": [
     "visual-fill-column"
    ],
-   "commit": "f8f28c739dcc8f52c3e66368b06c0cfcd48e83a9",
-   "sha256": "0ynhw9ai906y4405r8wdalx09hinfns9n01cg96nc4fgbqkhbpdw"
+   "commit": "54a340d891ce3c99d2eb51d43cdfe7531708128d",
+   "sha256": "0421xy85vzf443ildd6sn9srifw86kh7v2vn4wg1c91s0y3sq0y7"
   },
   "stable": {
    "version": [
     0,
     4,
-    0
+    4
    ],
    "deps": [
     "visual-fill-column"
    ],
-   "commit": "529003333797fade89a04a8b3fba9099f6585c08",
-   "sha256": "1a5fxix2zvs461vn6zn36qgpg65bl38gfb3ivr24wmxq1avja5s1"
+   "commit": "4457087e1e34e7340d3678714807335665d798d8",
+   "sha256": "0s2a9hwa775qyfad1zikah0vnpn9mbydzf8ipsyabns2hhjzf225"
   }
  },
  {
@@ -88409,8 +88920,8 @@
     "cl-lib",
     "json"
    ],
-   "commit": "9ddff4ca9bce7f46694b15c51799904ff41131b6",
-   "sha256": "1kbwaqhb86kidmygn9gcgskrkniqp3x71cl0qgrzgp1cjl0g9xcd"
+   "commit": "556f5559255518865456af0b228f86bfabd43e6b",
+   "sha256": "1dvdd4vzdfkgb9blc6f5402kknp3ppxjyd94cn696rlfrya58vmm"
   },
   "stable": {
    "version": [
@@ -88442,8 +88953,8 @@
     "cl-lib",
     "tern"
    ],
-   "commit": "9ddff4ca9bce7f46694b15c51799904ff41131b6",
-   "sha256": "1kbwaqhb86kidmygn9gcgskrkniqp3x71cl0qgrzgp1cjl0g9xcd"
+   "commit": "556f5559255518865456af0b228f86bfabd43e6b",
+   "sha256": "1dvdd4vzdfkgb9blc6f5402kknp3ppxjyd94cn696rlfrya58vmm"
   },
   "stable": {
    "version": [
@@ -88967,8 +89478,8 @@
     20180905,
     1050
    ],
-   "commit": "562e52d2ecc53b86c56c7ee4e88288b45fe2e4e3",
-   "sha256": "10hxy7iwz24qcagpmi6vvkw7zv04ly4r5ym3sw8wzhcsb1fslzgf"
+   "commit": "21ef6dc0625e6befbffbd5878265ee9985406151",
+   "sha256": "012kfjjb5jpzairp17cdafry8mw5v8w2dqplzhx41bw18y88qv67"
   },
   "stable": {
    "version": [
@@ -89416,11 +89927,11 @@
   "repo": "snosov1/toc-org",
   "unstable": {
    "version": [
-    20190603,
-    803
+    20190902,
+    1055
    ],
-   "commit": "2539b4be401d006e2752f6ad3b88e696889a7fc8",
-   "sha256": "1d9jj6vgz5f29xqbx1hh0nxkzbql66z3ygxrksry0xjyxabcmnc2"
+   "commit": "379b457fcff091d2fa47223ade58f457fd6eed28",
+   "sha256": "1pbc4ni9sw99r6z9zm1khlyvf1sxy1813ilv73ai7q2619y6njja"
   },
   "stable": {
    "version": [
@@ -89514,8 +90025,8 @@
    "deps": [
     "cl-lib"
    ],
-   "commit": "b959376241704cabdcf10a8d0d85e8061b5c6949",
-   "sha256": "0ryh0b6fg9s954dr0gmzfbrykhj8p4m1cjmcli85nympq4xymfbq"
+   "commit": "34eb4fe7d0a3380083e2e51627ae5968524d240b",
+   "sha256": "1yh02mrqkn9hp5l1kl4qj5g1jijjvbd77dcssp76gw7nm8dlsn8a"
   }
  },
  {
@@ -89900,14 +90411,14 @@
   "repo": "magit/transient",
   "unstable": {
    "version": [
-    20190812,
-    1336
+    20190905,
+    1138
    ],
    "deps": [
     "dash"
    ],
-   "commit": "9fb3f797f10fd069c2bffa7a3ead746aa53d1a25",
-   "sha256": "1xyj9ncqz0mrdgn6wg252p8kv2k9h391ni0bvkw8dqwz7xwgfl3g"
+   "commit": "7bf97594a5ec1b9a682ef5a1537a6b0ecc6d9dfb",
+   "sha256": "08crxnha8rwkv0npdb624v3xxy50bcb0s8pwm1vvz7ahpzyp7gza"
   },
   "stable": {
    "version": [
@@ -90042,8 +90553,8 @@
   "repo": "Alexander-Miller/treemacs",
   "unstable": {
    "version": [
-    20190826,
-    1125
+    20190916,
+    913
    ],
    "deps": [
     "ace-window",
@@ -90055,8 +90566,8 @@
     "pfuture",
     "s"
    ],
-   "commit": "48b3cad1a94ec94ecc1ee33a01fe85ef64e5249f",
-   "sha256": "09dm727sxjzhhc4s0phw9mf67jg5yp6c4qji0fp1ikz00hg3a359"
+   "commit": "dba721a03451802872cb783569a6782504a295c3",
+   "sha256": "1cqii0i8ka8n5nrxrid7rg2xdcq994sdaabbiy4lcs1dynwlyp9h"
   },
   "stable": {
    "version": [
@@ -90092,8 +90603,8 @@
     "evil",
     "treemacs"
    ],
-   "commit": "48b3cad1a94ec94ecc1ee33a01fe85ef64e5249f",
-   "sha256": "09dm727sxjzhhc4s0phw9mf67jg5yp6c4qji0fp1ikz00hg3a359"
+   "commit": "dba721a03451802872cb783569a6782504a295c3",
+   "sha256": "1cqii0i8ka8n5nrxrid7rg2xdcq994sdaabbiy4lcs1dynwlyp9h"
   },
   "stable": {
    "version": [
@@ -90123,8 +90634,8 @@
     "cl-lib",
     "treemacs"
    ],
-   "commit": "48b3cad1a94ec94ecc1ee33a01fe85ef64e5249f",
-   "sha256": "09dm727sxjzhhc4s0phw9mf67jg5yp6c4qji0fp1ikz00hg3a359"
+   "commit": "dba721a03451802872cb783569a6782504a295c3",
+   "sha256": "1cqii0i8ka8n5nrxrid7rg2xdcq994sdaabbiy4lcs1dynwlyp9h"
   },
   "stable": {
    "version": [
@@ -90155,8 +90666,8 @@
     "pfuture",
     "treemacs"
    ],
-   "commit": "48b3cad1a94ec94ecc1ee33a01fe85ef64e5249f",
-   "sha256": "09dm727sxjzhhc4s0phw9mf67jg5yp6c4qji0fp1ikz00hg3a359"
+   "commit": "dba721a03451802872cb783569a6782504a295c3",
+   "sha256": "1cqii0i8ka8n5nrxrid7rg2xdcq994sdaabbiy4lcs1dynwlyp9h"
   },
   "stable": {
    "version": [
@@ -90187,8 +90698,8 @@
     "projectile",
     "treemacs"
    ],
-   "commit": "48b3cad1a94ec94ecc1ee33a01fe85ef64e5249f",
-   "sha256": "09dm727sxjzhhc4s0phw9mf67jg5yp6c4qji0fp1ikz00hg3a359"
+   "commit": "dba721a03451802872cb783569a6782504a295c3",
+   "sha256": "1cqii0i8ka8n5nrxrid7rg2xdcq994sdaabbiy4lcs1dynwlyp9h"
   },
   "stable": {
    "version": [
@@ -90357,15 +90868,15 @@
   "repo": "alphapapa/ts.el",
   "unstable": {
    "version": [
-    20190819,
-    102
+    20190918,
+    241
    ],
    "deps": [
     "dash",
     "s"
    ],
-   "commit": "93c074f2895a204e003e8c7f3033c37d6486fac8",
-   "sha256": "0lpyv78k04vbp9glnv14dawcfgi3m49847wlgwfmkdq5cr3fn735"
+   "commit": "395649a2f2ba79028331bb1fa9ec08b218950ff6",
+   "sha256": "02603wv66fplsigxd87jy23hrb5g9vigszcpdqrdv0ypaqaxlr3a"
   },
   "stable": {
    "version": [
@@ -90714,11 +91225,11 @@
   "repo": "emacs-typescript/typescript.el",
   "unstable": {
    "version": [
-    20190710,
-    2011
+    20190918,
+    1042
    ],
-   "commit": "32146510b8ebb031e468c6c0898a9b253c73617e",
-   "sha256": "1yhzlgq73px45wy9pz9rx5al510mgzq2bz3rh4j50wpwvl13ja5r"
+   "commit": "1bafd279cf5161476aa540267ea0a45684749cbd",
+   "sha256": "04wm5rd8zjwd91k87l705f4icvvaiykb2fn3gfhpyglm1apfmcqp"
   },
   "stable": {
    "version": [
@@ -91037,11 +91548,11 @@
   "repo": "jackkamm/undo-propose-el",
   "unstable": {
    "version": [
-    20190824,
-    1554
+    20190909,
+    427
    ],
-   "commit": "21a5cdc8ebfe8113f7039867c4abb0197c0fe71c",
-   "sha256": "035hav4lfxwgikg3zpb4cz1nf08qfp27awl87dqbm2ly6d74lpny"
+   "commit": "47b7df0c97ad0099537d1ade21c4c52f0618a945",
+   "sha256": "078bs8lk9f0lklxqh15976fffayg5z5386y59nxxfhm27lmwgka9"
   }
  },
  {
@@ -91476,8 +91987,8 @@
    "deps": [
     "dash"
    ],
-   "commit": "c37728e11dedd29d849ba9523465b0cdaccea9d5",
-   "sha256": "0sp3kcqqj5km6nw6kinhg780vj3bjwf2zj52pmfwpfk8xiy6km5y"
+   "commit": "1e4b1e7f44f242a6cdcce0c157d07efe667b7bef",
+   "sha256": "16ic97lpw1d9bqcc0fvzv2n62xb5rlpi92cha3jpy7flbp8ys143"
   }
  },
  {
@@ -91592,8 +92103,8 @@
    "deps": [
     "bind-key"
    ],
-   "commit": "1d5ffb2e0d1427066ced58febbba68c1328bf001",
-   "sha256": "1a8zpi9pkgp8qkm6qxyzaj3k1s25z3x034mgjqp2mpd7ij76mk8v"
+   "commit": "4714d73b61bdb378f6e9e3f3838cae1abbf65ea0",
+   "sha256": "19m31nh2bd7rrlh53wy1hf6sxcqk4qn4wkm5w1c16314d5w56w5s"
   },
   "stable": {
    "version": [
@@ -91624,8 +92135,8 @@
     "key-chord",
     "use-package"
    ],
-   "commit": "1d5ffb2e0d1427066ced58febbba68c1328bf001",
-   "sha256": "1a8zpi9pkgp8qkm6qxyzaj3k1s25z3x034mgjqp2mpd7ij76mk8v"
+   "commit": "4714d73b61bdb378f6e9e3f3838cae1abbf65ea0",
+   "sha256": "19m31nh2bd7rrlh53wy1hf6sxcqk4qn4wkm5w1c16314d5w56w5s"
   },
   "stable": {
    "version": [
@@ -91686,8 +92197,8 @@
     "system-packages",
     "use-package"
    ],
-   "commit": "1d5ffb2e0d1427066ced58febbba68c1328bf001",
-   "sha256": "1a8zpi9pkgp8qkm6qxyzaj3k1s25z3x034mgjqp2mpd7ij76mk8v"
+   "commit": "4714d73b61bdb378f6e9e3f3838cae1abbf65ea0",
+   "sha256": "19m31nh2bd7rrlh53wy1hf6sxcqk4qn4wkm5w1c16314d5w56w5s"
   },
   "stable": {
    "version": [
@@ -91784,17 +92295,17 @@
     20190715,
     1836
    ],
-   "commit": "2405c8dd8f1cb995baeffb90324dc9c0e1966edc",
-   "sha256": "1jm3sagissbw8012mnppknsxl9dqd9514b891b64disqhdb5awg3"
+   "commit": "83ee76fc39b6cb394f5fb19063a3a7da09224339",
+   "sha256": "0z8klqwqmq5i111p4awzvlvirhm1dxp0mbfagwfiwq1wg72v6zdm"
   },
   "stable": {
    "version": [
     2,
     4,
-    1
+    2
    ],
-   "commit": "2405c8dd8f1cb995baeffb90324dc9c0e1966edc",
-   "sha256": "1jm3sagissbw8012mnppknsxl9dqd9514b891b64disqhdb5awg3"
+   "commit": "83ee76fc39b6cb394f5fb19063a3a7da09224339",
+   "sha256": "0z8klqwqmq5i111p4awzvlvirhm1dxp0mbfagwfiwq1wg72v6zdm"
   }
  },
  {
@@ -92052,20 +92563,19 @@
   "repo": "muffinmad/emacs-vc-hgcmd",
   "unstable": {
    "version": [
-    20190701,
-    1115
+    20190910,
+    2008
    ],
-   "commit": "dc7d629cec310e97ea195da1592a35f69aa66c66",
-   "sha256": "14c3hlzabiy113vzmlynd9fqhpakhmbgkjrx9i6c5mwf32hmw8p2"
+   "commit": "1515cd8cca0b749da482fa1af6e0576da98aa1ac",
+   "sha256": "19x2vdij1sd18g9gcx0vd9qyn37nq1p9dmyyskqlzqlbzxvhg0nm"
   },
   "stable": {
    "version": [
     1,
-    6,
-    9
+    8
    ],
-   "commit": "dc7d629cec310e97ea195da1592a35f69aa66c66",
-   "sha256": "14c3hlzabiy113vzmlynd9fqhpakhmbgkjrx9i6c5mwf32hmw8p2"
+   "commit": "1515cd8cca0b749da482fa1af6e0576da98aa1ac",
+   "sha256": "19x2vdij1sd18g9gcx0vd9qyn37nq1p9dmyyskqlzqlbzxvhg0nm"
   }
  },
  {
@@ -93076,11 +93586,11 @@
   "repo": "emacs-w3m/emacs-w3m",
   "unstable": {
    "version": [
-    20190830,
-    742
+    20190920,
+    1116
    ],
-   "commit": "3e75463de69ce58ae57aca3b7f5e851a728c499c",
-   "sha256": "13a112i5dxsgmphdckzlfa2nys2pfs02ps8i3fas8vq04zk4314n"
+   "commit": "c9cdb7e3075ddfc9aef356d42b376ebbb039bc7e",
+   "sha256": "1vg43ln70kifk3h0rwmj7w85mksg1yl3z4kqfq9q5zalp9jgwfsh"
   }
  },
  {
@@ -93168,11 +93678,11 @@
   "repo": "darkstego/wakib-keys",
   "unstable": {
    "version": [
-    20190828,
-    916
+    20190910,
+    1011
    ],
-   "commit": "4f3e2c10b8d3b0bd48afb4db9df93ff2ce61c2cd",
-   "sha256": "0dmcbv4d2h2jxxblq6kqqy4rs8aci1zxl8wccz6zi3v9si4f7sql"
+   "commit": "23237fc2c255de798b8d3fc2cb68c7c22b53caa9",
+   "sha256": "1s5n2gcldwj5srjn44pigd788x0hv4c7lz75krqyz1hysriydv9p"
   }
  },
  {
@@ -93253,14 +93763,14 @@
   "repo": "wanderlust/wanderlust",
   "unstable": {
    "version": [
-    20190812,
-    818
+    20190919,
+    859
    ],
    "deps": [
     "semi"
    ],
-   "commit": "ba07b99ee146c7945823874102e7db38e7aa8bd0",
-   "sha256": "14fp8s1baq3r6gxaf1c50zyk59bnzpnpbpxnp3lvcz1a1i5377ql"
+   "commit": "7a919e422a48f5021576e68282703de430558879",
+   "sha256": "0k2jklkpqm33bimxy4vnssdc9xa7wfnvay3ng0av1bwxfgxfrmdr"
   }
  },
  {
@@ -93497,11 +94007,11 @@
   "repo": "fxbois/web-mode",
   "unstable": {
    "version": [
-    20190625,
-    1951
+    20190916,
+    1858
    ],
-   "commit": "a723d3ecd3606d1c1948871f46fc8c8d7f879fe4",
-   "sha256": "1vsm95v47xk63gxg08w8bxlg91l2yqbgqwgaa5706x65q0rzv0xm"
+   "commit": "a31eb8592f09d789c4b08ccecfdaca6fd2f06a69",
+   "sha256": "1552wq8v4d0pj00kyhc05a4wq0p639r5yxa0rf6y3n4vy94190ql"
   },
   "stable": {
    "version": [
@@ -94094,20 +94604,20 @@
   "repo": "whizzml/whizzml-mode",
   "unstable": {
    "version": [
-    20190802,
-    1637
+    20190920,
+    2342
    ],
-   "commit": "fe8dd75941aac0749b97c9e4fd3709f828d784cd",
-   "sha256": "091gyi2qxx96hcq3r6rxkc9jdwmb5kbcsyp4cb6sm0rhiczvif79"
+   "commit": "5c5be351e11a71b31ede33ce941ce20ee0da75ed",
+   "sha256": "0i43l3fwdxvm7mrxpqlf3j06w7blcqp0jyz6jici4pyg0bdy4kd0"
   },
   "stable": {
    "version": [
     0,
-    34,
+    35,
     0
    ],
-   "commit": "fe8dd75941aac0749b97c9e4fd3709f828d784cd",
-   "sha256": "091gyi2qxx96hcq3r6rxkc9jdwmb5kbcsyp4cb6sm0rhiczvif79"
+   "commit": "5c5be351e11a71b31ede33ce941ce20ee0da75ed",
+   "sha256": "0i43l3fwdxvm7mrxpqlf3j06w7blcqp0jyz6jici4pyg0bdy4kd0"
   }
  },
  {
@@ -94549,15 +95059,15 @@
   "repo": "deb0ch/emacs-winum",
   "unstable": {
    "version": [
-    20181119,
-    1705
+    20190911,
+    1607
    ],
    "deps": [
     "cl-lib",
     "dash"
    ],
-   "commit": "247df36c03d70b453e9b912d6e1b7065644f639d",
-   "sha256": "0xbbf35cpbp5mayq5497g6m7l264vlf5p612mpz81yd55xs9pi7k"
+   "commit": "c5455e866e8a5f7eab6a7263e2057aff5f1118b9",
+   "sha256": "0lj4cp7ml7cjhkd66f6ivcl6sbfs2my8ajjlynzl3pm5qansfw5i"
   },
   "stable": {
    "version": [
@@ -94690,27 +95200,27 @@
   "repo": "DarwinAwardWinner/with-simulated-input",
   "unstable": {
    "version": [
-    20170821,
-    617
+    20190913,
+    1524
    ],
    "deps": [
     "s",
     "seq"
    ],
-   "commit": "af9a38ce28a741e6d8742750bef5d7b5afa13796",
-   "sha256": "0iann7zi9bgd3vmvxvg2n6x24hkyzbchbli1ymsmfrn8rif9byf7"
+   "commit": "3d881793521c5618cdb0968a85879e0e49da7fca",
+   "sha256": "12d3mhvzj74qwc4rdcb236jbqnf5lam8pk78j92kwbwjk1jaz2cf"
   },
   "stable": {
    "version": [
     2,
-    2
+    4
    ],
    "deps": [
     "s",
     "seq"
    ],
-   "commit": "9efeb236c8f6887a8591d6241962c37266d8e726",
-   "sha256": "1v8c85ahsk9pz3zndh0c9xba4c78f4b1j97hbv62jirvr75b079g"
+   "commit": "3d881793521c5618cdb0968a85879e0e49da7fca",
+   "sha256": "12d3mhvzj74qwc4rdcb236jbqnf5lam8pk78j92kwbwjk1jaz2cf"
   }
  },
  {
@@ -95760,25 +96270,25 @@
   "repo": "NicolasPetton/xref-js2",
   "unstable": {
    "version": [
-    20170530,
-    826
+    20190915,
+    2032
    ],
    "deps": [
     "js2-mode"
    ],
-   "commit": "d5f93605405989529c2f66b542def6c32429b927",
-   "sha256": "1vzsw257xkqwlgfj8d5hnrirjhxzzs9d8ms40ihb2zwsxn70im53"
+   "commit": "6f1ed5dae0c2485416196a51f2fa92f32e4b8262",
+   "sha256": "0pbnhliq3zivijksdhdqd7m3ndc3z7kw2g21zwihq28faps96ikj"
   },
   "stable": {
    "version": [
     1,
-    5
+    6
    ],
    "deps": [
     "js2-mode"
    ],
-   "commit": "7e2bc6a8dad08a493d11d3554f6374584846b9e6",
-   "sha256": "1mmd27miv32sl8cj7qhy09yfh7v1zgw7rv4fdwk96msvd4qfdkqd"
+   "commit": "d48253bf1999815329a294d09f0b1b744a6272ae",
+   "sha256": "0kg1vdyjd0n48cb8bvjqskzd79s3bgdcpzn80gm2y78m280kakn8"
   }
  },
  {
@@ -96131,11 +96641,11 @@
   "repo": "Kungsgeten/yankpad",
   "unstable": {
    "version": [
-    20190824,
-    1946
+    20190904,
+    1507
    ],
-   "commit": "c364607804e943b301ded8a30d7e19dda217568a",
-   "sha256": "0sqcli05kyafn2x9sd92az3hqc010pypr0dw31mv0vslg0rfkn8m"
+   "commit": "2f110f4aacb00c58439385cabb18cfaa8d759e64",
+   "sha256": "1hwmap0z4jjfs5lwmr0zrybzvx49qbqa957wg21l8h31pq40d3k5"
   },
   "stable": {
    "version": [
@@ -96328,14 +96838,14 @@
   "repo": "AndreaCrotti/yasnippet-snippets",
   "unstable": {
    "version": [
-    20190821,
-    901
+    20190908,
+    1137
    ],
    "deps": [
     "yasnippet"
    ],
-   "commit": "71ae4a665f0db13165f14687cf5828d4510ef557",
-   "sha256": "1gaycwqy1s2jvkqswjcbm49157ci5k8apsqlj2x5qs55w71zm5p8"
+   "commit": "676a6ddc190fb957dca3c42a777e34a623f15cbd",
+   "sha256": "14208jiymdz7pa6yx6is9fip3myhqgb7wjby7f27x73iv4rvkvkp"
   },
   "stable": {
    "version": [
@@ -96386,11 +96896,11 @@
   "url": "https://www.yatex.org/hgrepos/yatex",
   "unstable": {
    "version": [
-    20190525,
-    548
+    20190911,
+    27
    ],
-   "commit": "714f3527b4a16daf7a811dcc7b344ac989064f52",
-   "sha256": "12sqy2wrlgzi71vn3q5h47z1i6l6di3pnr4pmn0ixdp500gvy2fv"
+   "commit": "9e07513fc2efd1e60e00bff1832ca77ec644166c",
+   "sha256": "0bs1kizsn2cp26ssj84pk1xqabrvc5kpl4689sjxc4vihfayzd5l"
   }
  },
  {
@@ -96598,8 +97108,8 @@
   "repo": "xuchunyang/youdao-dictionary.el",
   "unstable": {
    "version": [
-    20180714,
-    414
+    20190916,
+    313
    ],
    "deps": [
     "chinese-word-at-point",
@@ -96607,8 +97117,8 @@
     "popup",
     "pos-tip"
    ],
-   "commit": "9496ea3ba8aa999db3dbde88d6aa37f3579d8dea",
-   "sha256": "0kn07ksjdrwl0m1wiac83ljg5drrmyf65gxm4m6r3iz1awd1akbb"
+   "commit": "c8c76a1584c9a39ab5df7bba3ba3c728cbd30bb2",
+   "sha256": "07vngrn17x91anhwvnaa7ryfipgszipaghnj1404yik9w9j9mff9"
   },
   "stable": {
    "version": [
@@ -96818,15 +97328,13 @@
   "stable": {
    "version": [
     4,
-    5
+    6
    ],
    "deps": [
-    "all-the-icons",
-    "flycheck",
-    "magit"
+    "all-the-icons"
    ],
-   "commit": "ceb46240636865e86f3fe26906957943ba7bd73c",
-   "sha256": "0nnlxzsmhsbszqigcyxak9i1a0digrd13gv6v18ck4h760mihh1m"
+   "commit": "df22536a244293591575e56970bf83814faa7c14",
+   "sha256": "0pfyd1iqs7l2ngwgvj9n0r9k1px7yl16h8n502xdyf0pprxcs4p6"
   }
  },
  {
@@ -97043,8 +97551,8 @@
     20190523,
     1300
    ],
-   "commit": "578295532fb1c4ad2a2e95894e65cce02f812b54",
-   "sha256": "1qcni15mps7w9waail21x0fy2rrd5y8cm4yzi8rs2ar4vqrjbyyp"
+   "commit": "e2aad25dfd334299a7e53df21796b8652142c5b5",
+   "sha256": "0nr21gmji24bn5j73hrl8qy9llv3cmc9w5j30pcnsi4zi2svh9gc"
   },
   "stable": {
    "version": [
-- 
GitLab


From 8317facd149833911b0b8e7081a35898b6eba5a0 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 21 Sep 2019 10:09:48 -0400
Subject: [PATCH 0688/2254] emacsPackages: Update elpa

Via `update-elpa` script
---
 .../editors/emacs-modes/elpa-generated.nix    | 58 +++++++++----------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index 7737034973a..9e5324b1041 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -636,16 +636,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    csv-mode = callPackage ({ elpaBuild, fetchurl, lib }:
+    csv-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "csv-mode";
         ename = "csv-mode";
-        version = "1.7";
+        version = "1.8";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/csv-mode-1.7.el";
-          sha256 = "0r4bip0w3h55i8h6sxh06czf294mrhavybz0zypzrjw91m1bi7z6";
+          url = "https://elpa.gnu.org/packages/csv-mode-1.8.el";
+          sha256 = "1ywgc61pnawiwfpjgxavfpfxqd3dm9niq6srbc70pd54ca6yqby6";
         };
-        packageRequires = [];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://elpa.gnu.org/packages/csv-mode.html";
           license = lib.licenses.free;
@@ -975,10 +975,10 @@
       elpaBuild {
         pname = "eev";
         ename = "eev";
-        version = "20190517";
+        version = "20190902";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/eev-20190517.tar";
-          sha256 = "0hgjdax0kg2w7bf3idl6mw6m8j2wkh1253px42v2lbaxp6897m07";
+          url = "https://elpa.gnu.org/packages/eev-20190902.tar";
+          sha256 = "09rk01ykvvmmzadkz8y064iil2sm6ql6qz0rj0jjlnyymi58lj69";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -1132,10 +1132,10 @@
       elpaBuild {
         pname = "exwm";
         ename = "exwm";
-        version = "0.22.1";
+        version = "0.23";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/exwm-0.22.1.tar";
-          sha256 = "1ggb8vgxxml8c5bvamv9jgz80gs6h9xirjgphq8gwkywwd5xyiq4";
+          url = "https://elpa.gnu.org/packages/exwm-0.23.tar";
+          sha256 = "05w1v3wrp1lzz20zd9lcvr5nhk809kgy6svvkbs15xhnr6x55ad5";
         };
         packageRequires = [ xelb ];
         meta = {
@@ -1282,10 +1282,10 @@
       elpaBuild {
         pname = "gited";
         ename = "gited";
-        version = "0.5.4";
+        version = "0.6.0";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/gited-0.5.4.tar";
-          sha256 = "07ckknggkqd733bnps21r46bacgyhd0v9wc0spid22hn0dnrfp12";
+          url = "https://elpa.gnu.org/packages/gited-0.6.0.tar";
+          sha256 = "187asqrxfpxv53hhnrcid1sy46vcy07qx5yqgnrczi54jpcc57j5";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -1327,10 +1327,10 @@
       elpaBuild {
         pname = "gnorb";
         ename = "gnorb";
-        version = "1.6.1";
+        version = "1.6.3";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/gnorb-1.6.1.tar";
-          sha256 = "0n4460hsmcc3l0y3nb3fysvh33cjwgv0a3mkc26xcx8v85zl7m63";
+          url = "https://elpa.gnu.org/packages/gnorb-1.6.3.tar";
+          sha256 = "14cdldlvq2fx0j9g1bbzb6dq7yp9rw6bv39sls67i2p35h3gc2gd";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -2220,10 +2220,10 @@
       elpaBuild {
         pname = "org";
         ename = "org";
-        version = "9.2.5";
+        version = "9.2.6";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/org-9.2.5.tar";
-          sha256 = "1pid1sykgz83i4ry5n8f270finag6sm7ckqxn5lkikyya43wlzx1";
+          url = "https://elpa.gnu.org/packages/org-9.2.6.tar";
+          sha256 = "0ikd78k4yw4sm5x7l3dsbvfcmvnv5qna2mxirr560gvcnzhr0zg4";
         };
         packageRequires = [];
         meta = {
@@ -2385,10 +2385,10 @@
       elpaBuild {
         pname = "phps-mode";
         ename = "phps-mode";
-        version = "0.2.8";
+        version = "0.3.1";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/phps-mode-0.2.8.tar";
-          sha256 = "16sdqh93d2i9dxjibbhx4afakn150qc6xy2ifd83kx85c67y95kl";
+          url = "https://elpa.gnu.org/packages/phps-mode-0.3.1.tar";
+          sha256 = "1h6s5k156mbbkaysb07vcb13k3izs91pwigzcfh6jvv3lak4azg5";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -3001,10 +3001,10 @@
       elpaBuild {
         pname = "ssh-deploy";
         ename = "ssh-deploy";
-        version = "3.1";
+        version = "3.1.10";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ssh-deploy-3.1.tar";
-          sha256 = "09m1ljp68rribypls5mzffmdv86jkg9wq4bdb7d1qkdjyr3f2hgn";
+          url = "https://elpa.gnu.org/packages/ssh-deploy-3.1.10.tar";
+          sha256 = "0gckc6yhgi8pn3s8vdyzz8x1s2d4wmsw6yjwsaqcr5nra50glbpg";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -3590,10 +3590,10 @@
       elpaBuild {
         pname = "xelb";
         ename = "xelb";
-        version = "0.17";
+        version = "0.18";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/xelb-0.17.tar";
-          sha256 = "0k98580vq253fjdgklgqlwl450saninfw39fbq8lv3xsnp3dcgml";
+          url = "https://elpa.gnu.org/packages/xelb-0.18.tar";
+          sha256 = "1fp5mzl63sh0h3ws4l5p4qgvi7ny8a3fj6k4dhqa98xgw2bx03v7";
         };
         packageRequires = [ cl-generic emacs ];
         meta = {
-- 
GitLab


From 2c3dcbb9d09a9757c26a1bc34ba5b8f263a7e554 Mon Sep 17 00:00:00 2001
From: Sascha Grunert <sgrunert@suse.com>
Date: Sat, 21 Sep 2019 16:18:42 +0200
Subject: [PATCH 0689/2254] Add cri-o service to modules (#68153)

Signed-off-by: Sascha Grunert <sgrunert@suse.com>
---
 nixos/modules/module-list.nix          |   1 +
 nixos/modules/virtualisation/cri-o.nix | 106 +++++++++++++++++++++++++
 2 files changed, 107 insertions(+)
 create mode 100644 nixos/modules/virtualisation/cri-o.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index fb8453f1d53..775cc05aa0a 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -938,6 +938,7 @@
   ./virtualisation/anbox.nix
   ./virtualisation/container-config.nix
   ./virtualisation/containers.nix
+  ./virtualisation/cri-o.nix
   ./virtualisation/docker.nix
   ./virtualisation/docker-containers.nix
   ./virtualisation/ecs-agent.nix
diff --git a/nixos/modules/virtualisation/cri-o.nix b/nixos/modules/virtualisation/cri-o.nix
new file mode 100644
index 00000000000..14a435f6c8b
--- /dev/null
+++ b/nixos/modules/virtualisation/cri-o.nix
@@ -0,0 +1,106 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.virtualisation.cri-o;
+in
+{
+  options.virtualisation.cri-o = {
+    enable = mkEnableOption "Container Runtime Interface for OCI (CRI-O)";
+
+    storageDriver = mkOption {
+      type = types.enum ["btrfs" "overlay" "vfs"];
+      default = "overlay";
+      description = "Storage driver to be used";
+    };
+
+    logLevel = mkOption {
+      type = types.enum ["trace" "debug" "info" "warn" "error" "fatal"];
+      default = "info";
+      description = "Log level to be used";
+    };
+
+    pauseImage = mkOption {
+      type = types.str;
+      default = "k8s.gcr.io/pause:3.1";
+      description = "Pause image for pod sandboxes to be used";
+    };
+
+    pauseCommand = mkOption {
+      type = types.str;
+      default = "/pause";
+      description = "Pause command to be executed";
+    };
+
+    registries = mkOption {
+      type = types.listOf types.str;
+      default = [ "docker.io" "quay.io" ];
+      description = "Registries to be configured for unqualified image pull";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    environment.systemPackages = with pkgs;
+      [ cri-o cri-tools conmon cni-plugins iptables runc utillinux ];
+    environment.etc."crictl.yaml".text = ''
+      runtime-endpoint: unix:///var/run/crio/crio.sock
+    '';
+    environment.etc."crio/crio.conf".text = ''
+      [crio]
+      storage_driver = "${cfg.storageDriver}"
+
+      [crio.image]
+      pause_image = "${cfg.pauseImage}"
+      pause_command = "${cfg.pauseCommand}"
+      registries = [
+        ${concatMapStringsSep ", " (x: "\"" + x + "\"") cfg.registries}
+      ]
+
+      [crio.runtime]
+      conmon = "${pkgs.conmon}/bin/conmon"
+      log_level = "${cfg.logLevel}"
+      manage_network_ns_lifecycle = true
+    '';
+    environment.etc."containers/policy.json".text = ''
+      {"default": [{"type": "insecureAcceptAnything"}]}
+    '';
+    environment.etc."cni/net.d/20-cri-o-bridge.conf".text = ''
+      {
+        "cniVersion": "0.3.1",
+        "name": "crio-bridge",
+        "type": "bridge",
+        "bridge": "cni0",
+        "isGateway": true,
+        "ipMasq": true,
+        "ipam": {
+          "type": "host-local",
+          "subnet": "10.88.0.0/16",
+          "routes": [
+              { "dst": "0.0.0.0/0" }
+          ]
+        }
+      }
+    '';
+
+    systemd.services.crio = {
+      description = "Container Runtime Interface for OCI (CRI-O)";
+      documentation = [ "https://github.com/cri-o/cri-o" ];
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" ];
+      path = [ pkgs.utillinux pkgs.runc pkgs.iptables ];
+      serviceConfig = {
+        Type = "notify";
+        ExecStart = "${pkgs.cri-o}/bin/crio";
+        ExecReload = "/bin/kill -s HUP $MAINPID";
+        TasksMax = "infinity";
+        LimitNOFILE = "1048576";
+        LimitNPROC = "1048576";
+        LimitCORE = "infinity";
+        OOMScoreAdjust = "-999";
+        TimeoutStartSec = "0";
+        Restart = "on-abnormal";
+      };
+    };
+  };
+}
-- 
GitLab


From 55ebe584622a40aae43b51eb1123178ddea2a090 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Thu, 19 Sep 2019 21:18:25 -0400
Subject: [PATCH 0690/2254] typora: allow pandoc to be in PATH

---
 pkgs/applications/editors/typora/default.nix | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix
index 7273b7252ca..09baf383f97 100644
--- a/pkgs/applications/editors/typora/default.nix
+++ b/pkgs/applications/editors/typora/default.nix
@@ -1,4 +1,16 @@
-{ stdenv, fetchurl, makeWrapper, electron_5, dpkg, gtk3, glib, gsettings-desktop-schemas, wrapGAppsHook }:
+{ stdenv
+, lib
+, fetchurl
+, makeWrapper
+, electron_5
+, dpkg
+, gtk3
+, glib
+, gsettings-desktop-schemas
+, wrapGAppsHook
+, withPandoc ? false
+, pandoc
+}:
 
 stdenv.mkDerivation rec {
   pname = "typora";
@@ -42,10 +54,11 @@ stdenv.mkDerivation rec {
     makeWrapper ${electron_5}/bin/electron $out/bin/typora \
       --add-flags $out/share/typora \
       "''${gappsWrapperArgs[@]}" \
-      --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}"
+      ${lib.optionalString withPandoc ''--prefix PATH : "${lib.makeBinPath [ pandoc ]}"''} \
+      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ]}"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A minimal Markdown reading & writing app";
     homepage = https://typora.io;
     license = licenses.unfree;
-- 
GitLab


From ea21278830bb2e5d6895df9784d848b0a38f23ad Mon Sep 17 00:00:00 2001
From: fuerbringer <severin@fuerbringer.info>
Date: Sat, 21 Sep 2019 18:15:08 +0200
Subject: [PATCH 0691/2254] diskus: 0.5.0 -> 0.6.0

---
 pkgs/tools/misc/diskus/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/diskus/default.nix b/pkgs/tools/misc/diskus/default.nix
index 591cd5fe040..7b1e5ed6c0a 100644
--- a/pkgs/tools/misc/diskus/default.nix
+++ b/pkgs/tools/misc/diskus/default.nix
@@ -2,18 +2,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "diskus";
-  version = "0.5.0";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "sharkdp";
     repo = "diskus";
     rev = "v${version}";
-    sha256 = "18scxspi5ncags8bnxq4ah9w8hrlwwlgpq7q9qfh4d81asmbyr8n";
+    sha256 = "087w58q5kd3r23a9qnhqgvq4vhv69b5a6a7n3kh09g5cjszy8s05";
   };
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
 
-  cargoSha256 = "13d4h6f3idwj2bxafqrjihgwwr8v3k158r7b569jp7q2v1msqqx1";
+  cargoSha256 = "07wsl1vw2aimgmrlri03pfcxv13klqxyvmmsbzgnq9sc9qzzy8gp";
 
   meta = with stdenv.lib; {
     description = "A minimal, fast alternative to 'du -sh'";
@@ -21,5 +21,9 @@ rustPlatform.buildRustPackage rec {
     license = with licenses; [ asl20 /* or */ mit ];
     maintainers = [ maintainers.fuerbringer ];
     platforms = platforms.unix;
+    longDescription = ''
+      diskus is a very simple program that computes the total size of the
+      current directory. It is a parallelized version of du -sh.
+    '';
   };
 }
-- 
GitLab


From 98a7d7990e6df67fc53fdb5f95fa841fa595fc95 Mon Sep 17 00:00:00 2001
From: Riley Inman <rileyminman@gmail.com>
Date: Sat, 21 Sep 2019 12:39:15 -0400
Subject: [PATCH 0692/2254] iosevka: Simplify custom build process

Although hopefully this can eventually be added to nodePackages, it uses
some devDependencies to build custom fonts. Node2nix doesn't currently
support enabling devDependencies for a single package.

- Got rid of redundant let-in statements.
- node-packages.json now only pulls in Iosevka.
- generate.sh
  * Uses a nix-shell shebang to ensure it builds using the current
    version of node2nix (the old version caused some issues due to the
    19.03 release version being 1.6.0 instead of 1.7.0).
  * Builds in development mode to fix the devDependencies issue.
- Use the tree of the built node package as sourceRoot instead of
  installing node dependencies manually. This means the source will have
  to be updated in both node-packages.json and default.nix, but to make
  things easier the derivation inherits the version number.
- Disparate build options now all live under privateBuildPlan, which is
  converted first with builtins.toJSON and then to TOML using remarshal
  (Unfortunately there is not currently a builtins.toTOML).
- Extra parameters can also be provided that will be converted to JSON
  then TOML. This will overwrite the default parameters.toml file.
---
 pkgs/data/fonts/iosevka/default.nix           |  109 +-
 pkgs/data/fonts/iosevka/generate.sh           |   14 +-
 .../fonts/iosevka/node-packages-generated.nix | 1596 ++++++-----------
 pkgs/data/fonts/iosevka/node-packages.json    |   19 +-
 4 files changed, 603 insertions(+), 1135 deletions(-)
 mode change 100644 => 100755 pkgs/data/fonts/iosevka/generate.sh

diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix
index 4864edde71d..10b0a0fd8f0 100644
--- a/pkgs/data/fonts/iosevka/default.nix
+++ b/pkgs/data/fonts/iosevka/default.nix
@@ -1,83 +1,60 @@
-{
-  stdenv, lib, pkgs,
-  fetchFromGitHub, fetchurl,
-  nodejs, ttfautohint-nox, otfcc,
+{ stdenv, lib, pkgs
+, nodejs, remarshal, ttfautohint-nox, otfcc
 
-  # Custom font set options.
-  # See https://github.com/be5invis/Iosevka#build-your-own-style
-  design ? [], upright ? [], italic ? [], oblique ? [],
-  family ? null, weights ? [],
-  # Custom font set name. Required if any custom settings above.
-  set ? null,
-  # Extra parameters. Can be used for ligature mapping.
-  extraParameters ? null
+# Custom font set options.
+# See https://github.com/be5invis/Iosevka#build-your-own-style
+, privateBuildPlan ? null
+# Extra parameters. Can be used for ligature mapping.
+, extraParameters ? null
+# Custom font set name. Required if any custom settings above.
+, set ? null
 }:
 
-assert (design != []) -> set != null;
-assert (upright != []) -> set != null;
-assert (italic != []) -> set != null;
-assert (oblique != []) -> set != null;
-assert (family != null) -> set != null;
-assert (weights != []) -> set != null;
+assert (privateBuildPlan != null) -> set != null;
 
 let
-  system = builtins.currentSystem;
-  nodePackages = import ./node-packages.nix { inherit pkgs system nodejs; };
-in
-
-let pname = if set != null then "iosevka-${set}" else "iosevka"; in
-
-let
-  version = "2.3.0";
-  name = "${pname}-${version}";
-  src = fetchFromGitHub {
-    owner = "be5invis";
-    repo ="Iosevka";
-    rev = "v${version}";
-    sha256 = "1qnbxhx9wvij9zia226mc3sy8j7bfsw5v1cvxvsbbwjskwqdamvv";
+  nodePackages = import ./node-packages.nix {
+    inherit pkgs nodejs;
+    inherit (stdenv.hostPlatform) system;
   };
 in
+stdenv.mkDerivation rec {
+  pname =
+    if set != null
+    then "iosevka-${set}"
+    else "iosevka";
 
-with lib;
-let quote = str: "\"" + str + "\""; in
-let toTomlList = list: "[" + (concatMapStringsSep ", " quote list) +"]"; in
-let unlines = concatStringsSep "\n"; in
-
-let
-  param = name: options:
-    if options != [] then "${name}=${toTomlList options}" else null;
-  config = unlines (lib.filter (x: x != null) [
-    "[buildPlans.${pname}]"
-    (param "design" design)
-    (param "upright" upright)
-    (param "italic" italic)
-    (param "oblique" oblique)
-    (if family != null then "family=\"${family}\"" else null)
-    (param "weights" weights)
-  ]);
-  installNodeModules = unlines (lib.mapAttrsToList
-    (name: value: "mkdir -p node_modules/${name}\n cp -r ${value.outPath}/lib/node_modules/. node_modules")
-    nodePackages);
-in
+  inherit (src) version;
 
-stdenv.mkDerivation {
-  inherit name pname version src;
+  src = nodePackages."iosevka-https://github.com/be5invis/Iosevka/archive/v2.3.0.tar.gz";
+  sourceRoot = "${src.name}/lib/node_modules/iosevka";
 
-  nativeBuildInputs = [ nodejs ttfautohint-nox otfcc ];
+  nativeBuildInputs = [
+    nodejs
+    remarshal
+    otfcc
+    ttfautohint-nox
+  ];
 
-  passAsFile = [ "config" "extraParameters" ];
-  config = config;
-  extraParameters = extraParameters;
+  privateBuildPlanJSON = builtins.toJSON { buildPlans.${pname} = privateBuildPlan; };
+  extraParametersJSON = builtins.toJSON { ${pname} = extraParameters; };
+  passAsFile = [ "privateBuildPlanJSON" "extraParametersJSON" ];
 
   configurePhase = ''
-    mkdir -p node_modules/.bin
-    ${installNodeModules}
-    ${optionalString (set != null) ''mv "$configPath" private-build-plans.toml''}
-    ${optionalString (extraParameters != null) ''cat "$extraParametersPath" >> parameters.toml''}
+    runHook preConfigure
+    ${lib.optionalString (privateBuildPlan != null) ''
+      remarshal -i "$privateBuildPlanJSONPath" -o private-build-plans.toml -if json -of toml
+    ''}
+    ${lib.optionalString (extraParameters != null) ''
+      remarshal -i "$extraParametersJSONPath" -o parameters.toml -if json -of toml
+    ''}
+    runHook postConfigure
   '';
 
   buildPhase = ''
-    npm run build -- ttf::${pname}
+    runHook preBuild
+    npm run build -- ttf::$pname
+    runHook postBuild
   '';
 
   installPhase = ''
@@ -89,8 +66,8 @@ stdenv.mkDerivation {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = https://be5invis.github.io/Iosevka/;
-    downloadPage = "https://github.com/be5invis/Iosevka/releases";
+    homepage = https://be5invis.github.io/Iosevka;
+    downloadPage = https://github.com/be5invis/Iosevka/releases;
     description = ''
       Slender monospace sans-serif and slab-serif typeface inspired by Pragmata
       Pro, M+ and PF DIN Mono, designed to be the ideal font for programming.
diff --git a/pkgs/data/fonts/iosevka/generate.sh b/pkgs/data/fonts/iosevka/generate.sh
old mode 100644
new mode 100755
index e7d675b9e76..878e0665163
--- a/pkgs/data/fonts/iosevka/generate.sh
+++ b/pkgs/data/fonts/iosevka/generate.sh
@@ -1,6 +1,10 @@
-#!/bin/sh
+#!/usr/bin/env nix-shell
+#! nix-shell -I nixpkgs=../../../.. -i bash -p nodePackages.node2nix
 
-node2nix --nodejs-10 --input node-packages.json \
-              --output node-packages-generated.nix \
-              --composition node-packages.nix \
-              --node-env ./../../../development/node-packages/node-env.nix
+node2nix \
+	--nodejs-10 \
+	--input node-packages.json \
+	--output node-packages-generated.nix \
+	--composition node-packages.nix \
+	--node-env ./../../../development/node-packages/node-env.nix \
+	--development
diff --git a/pkgs/data/fonts/iosevka/node-packages-generated.nix b/pkgs/data/fonts/iosevka/node-packages-generated.nix
index 310e0161628..29c3f2def25 100644
--- a/pkgs/data/fonts/iosevka/node-packages-generated.nix
+++ b/pkgs/data/fonts/iosevka/node-packages-generated.nix
@@ -40,13 +40,13 @@ let
         sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==";
       };
     };
-    "acorn-7.0.0" = {
+    "acorn-6.3.0" = {
       name = "acorn";
       packageName = "acorn";
-      version = "7.0.0";
+      version = "6.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-7.0.0.tgz";
-        sha512 = "PaF/MduxijYYt7unVGRuds1vBC9bFxbNf+VWqhOClfdgy7RlVkQqt610ig1/yxTgsDIfW1cWDel5EBbOy3jdtQ==";
+        url = "https://registry.npmjs.org/acorn/-/acorn-6.3.0.tgz";
+        sha512 = "/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA==";
       };
     };
     "acorn-jsx-5.0.2" = {
@@ -247,6 +247,15 @@ let
         sha512 = "p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==";
       };
     };
+    "block-stream-0.0.9" = {
+      name = "block-stream";
+      packageName = "block-stream";
+      version = "0.0.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz";
+        sha1 = "13ebfe778a03205cfe03751481ebb4b3300c126a";
+      };
+    };
     "bluebird-3.5.5" = {
       name = "bluebird";
       packageName = "bluebird";
@@ -265,13 +274,13 @@ let
         sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==";
       };
     };
-    "bufferstreams-2.0.1" = {
+    "bufferstreams-1.1.3" = {
       name = "bufferstreams";
       packageName = "bufferstreams";
-      version = "2.0.1";
+      version = "1.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bufferstreams/-/bufferstreams-2.0.1.tgz";
-        sha512 = "ZswyIoBfFb3cVDsnZLLj2IDJ/0ppYdil/v2EGlZXvoefO689FokEmFEldhN5dV7R2QBxFneqTJOMIpfqhj+n0g==";
+        url = "https://registry.npmjs.org/bufferstreams/-/bufferstreams-1.1.3.tgz";
+        sha512 = "HaJnVuslRF4g2kSDeyl++AaVizoitCpL9PglzCYwy0uHHyvWerfvEb8jWmYbF1z4kiVFolGomnxSGl+GUQp2jg==";
       };
     };
     "callsites-3.1.0" = {
@@ -310,6 +319,15 @@ let
         sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==";
       };
     };
+    "caryll-shapeops-0.3.1" = {
+      name = "caryll-shapeops";
+      packageName = "caryll-shapeops";
+      version = "0.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/caryll-shapeops/-/caryll-shapeops-0.3.1.tgz";
+        sha512 = "3TdH6DZGL08S6qEvCZLNaOHyFvmzQts8m+TyYEvc6/PiI+XgX5mIag1/CKczIM8e2QtDr8JKW8foo4VNOM8/Og==";
+      };
+    };
     "caseless-0.12.0" = {
       name = "caseless";
       packageName = "caseless";
@@ -346,15 +364,6 @@ let
         sha1 = "4730a11ef610fad450b8f223c79d31d7bdad8074";
       };
     };
-    "chownr-1.1.2" = {
-      name = "chownr";
-      packageName = "chownr";
-      version = "1.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/chownr/-/chownr-1.1.2.tgz";
-        sha512 = "GkfeAQh+QNy3wquu9oIZr6SS5x7wGdSgNQvD10X3r+AZr1Oys22HW8kAmDMvNg2+Dm0TeGaEuO8gFwdBXxwO8A==";
-      };
-    };
     "cli-cursor-2.1.0" = {
       name = "cli-cursor";
       packageName = "cli-cursor";
@@ -400,15 +409,6 @@ let
         sha512 = "4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==";
       };
     };
-    "cliui-5.0.0" = {
-      name = "cliui";
-      packageName = "cliui";
-      version = "5.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz";
-        sha512 = "PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==";
-      };
-    };
     "clone-2.1.2" = {
       name = "clone";
       packageName = "clone";
@@ -445,6 +445,15 @@ let
         sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25";
       };
     };
+    "colors-1.3.3" = {
+      name = "colors";
+      packageName = "colors";
+      version = "1.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/colors/-/colors-1.3.3.tgz";
+        sha512 = "mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==";
+      };
+    };
     "combined-stream-1.0.8" = {
       name = "combined-stream";
       packageName = "combined-stream";
@@ -715,13 +724,22 @@ let
         sha1 = "759dce8496c4248fec2d0caaf4108bcf3f1a7f5d";
       };
     };
-    "eslint-scope-5.0.0" = {
+    "eslint-5.16.0" = {
+      name = "eslint";
+      packageName = "eslint";
+      version = "5.16.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/eslint/-/eslint-5.16.0.tgz";
+        sha512 = "S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg==";
+      };
+    };
+    "eslint-scope-4.0.3" = {
       name = "eslint-scope";
       packageName = "eslint-scope";
-      version = "5.0.0";
+      version = "4.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.0.0.tgz";
-        sha512 = "oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw==";
+        url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz";
+        sha512 = "p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==";
       };
     };
     "eslint-utils-1.4.2" = {
@@ -751,13 +769,13 @@ let
         sha1 = "d9bb37b8f8eafbf4e6d4ed6b7aa2956abbd3c4c2";
       };
     };
-    "espree-6.1.1" = {
+    "espree-5.0.1" = {
       name = "espree";
       packageName = "espree";
-      version = "6.1.1";
+      version = "5.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/espree/-/espree-6.1.1.tgz";
-        sha512 = "EYbr8XZUhWbYCqQRW0duU5LxzL5bETN6AjKBGy1302qqzPaCH10QbRg3Wvco79Z8x9WbiE8HYB4e75xl6qUYvQ==";
+        url = "https://registry.npmjs.org/espree/-/espree-5.0.1.tgz";
+        sha512 = "qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A==";
       };
     };
     "esprima-1.1.1" = {
@@ -1084,15 +1102,6 @@ let
         sha512 = "GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==";
       };
     };
-    "fs-minipass-1.2.6" = {
-      name = "fs-minipass";
-      packageName = "fs-minipass";
-      version = "1.2.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.6.tgz";
-        sha512 = "crhvyXcMejjv3Z5d2Fa9sf5xLYVCF5O1c71QxbVnbLsmYMBEvDAftewesN/HhY03YRoA7zOMxjNGrF5svGaaeQ==";
-      };
-    };
     "fs.realpath-1.0.0" = {
       name = "fs.realpath";
       packageName = "fs.realpath";
@@ -1102,6 +1111,15 @@ let
         sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
       };
     };
+    "fstream-1.0.12" = {
+      name = "fstream";
+      packageName = "fstream";
+      version = "1.0.12";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz";
+        sha512 = "WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==";
+      };
+    };
     "functional-red-black-tree-1.0.1" = {
       name = "functional-red-black-tree";
       packageName = "functional-red-black-tree";
@@ -1129,15 +1147,6 @@ let
         sha512 = "3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==";
       };
     };
-    "get-caller-file-2.0.5" = {
-      name = "get-caller-file";
-      packageName = "get-caller-file";
-      version = "2.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz";
-        sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==";
-      };
-    };
     "get-stream-3.0.0" = {
       name = "get-stream";
       packageName = "get-stream";
@@ -1174,15 +1183,6 @@ let
         sha512 = "hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==";
       };
     };
-    "glob-parent-5.0.0" = {
-      name = "glob-parent";
-      packageName = "glob-parent";
-      version = "5.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.0.0.tgz";
-        sha512 = "Z2RwiujPRGluePM6j699ktJYxmPpJKCfpGA13jz2hmFZC7gKetzrWvg5KN3+OsIFmydGyZ1AVwERCq1w/ZZwRg==";
-      };
-    };
     "globals-11.12.0" = {
       name = "globals";
       packageName = "globals";
@@ -1345,15 +1345,6 @@ let
         sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d";
       };
     };
-    "is-extglob-2.1.1" = {
-      name = "is-extglob";
-      packageName = "is-extglob";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz";
-        sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2";
-      };
-    };
     "is-fullwidth-code-point-1.0.0" = {
       name = "is-fullwidth-code-point";
       packageName = "is-fullwidth-code-point";
@@ -1372,15 +1363,6 @@ let
         sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f";
       };
     };
-    "is-glob-4.0.1" = {
-      name = "is-glob";
-      packageName = "is-glob";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz";
-        sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==";
-      };
-    };
     "is-promise-2.1.0" = {
       name = "is-promise";
       packageName = "is-promise";
@@ -1588,6 +1570,15 @@ let
         sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee";
       };
     };
+    "libspiro-js-0.3.1" = {
+      name = "libspiro-js";
+      packageName = "libspiro-js";
+      version = "0.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/libspiro-js/-/libspiro-js-0.3.1.tgz";
+        sha1 = "86652b0009a6d84ea79a5320bdca5f00612ee439";
+      };
+    };
     "load-json-file-1.1.0" = {
       name = "load-json-file";
       packageName = "load-json-file";
@@ -1669,6 +1660,15 @@ let
         sha512 = "lZBSLMro+XYJIix9zCZ8N6nZgixpjUPkX6CKuh+Y9Wl9bir/2Fp27NWapA0cNQCPrzOOI9sAwxc4BI14aIdumw==";
       };
     };
+    "megaminx-0.9.0" = {
+      name = "megaminx";
+      packageName = "megaminx";
+      version = "0.9.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/megaminx/-/megaminx-0.9.0.tgz";
+        sha512 = "1UcxrUXXYboLWS3AJ2NuLckLi3YR7eJiO5LsYAWHZjYE0mmSqJ2ogSt6JrG8YINyogW9/TUWpL1ojwbRsSbyXw==";
+      };
+    };
     "mem-1.1.0" = {
       name = "mem";
       packageName = "mem";
@@ -1750,24 +1750,6 @@ let
         sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
       };
     };
-    "minipass-2.5.1" = {
-      name = "minipass";
-      packageName = "minipass";
-      version = "2.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minipass/-/minipass-2.5.1.tgz";
-        sha512 = "dmpSnLJtNQioZFI5HfQ55Ad0DzzsMAb+HfokwRTNXwEQjepbTkl5mtIlSVxGIkOkxlpX7wIn5ET/oAd9fZ/Y/Q==";
-      };
-    };
-    "minizlib-1.2.2" = {
-      name = "minizlib";
-      packageName = "minizlib";
-      version = "1.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minizlib/-/minizlib-1.2.2.tgz";
-        sha512 = "hR3At21uSrsjjDTWrbu0IMLTpnkpv8IIMFDFaoz43Tmu4LkmAXfH44vNNzpTnf+OAQQCHrb91y/wc2J4x5XgSQ==";
-      };
-    };
     "mkdirp-0.5.1" = {
       name = "mkdirp";
       packageName = "mkdirp";
@@ -1831,13 +1813,13 @@ let
         sha512 = "1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==";
       };
     };
-    "node-gyp-4.0.0" = {
+    "node-gyp-3.8.0" = {
       name = "node-gyp";
       packageName = "node-gyp";
-      version = "4.0.0";
+      version = "3.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-gyp/-/node-gyp-4.0.0.tgz";
-        sha512 = "2XiryJ8sICNo6ej8d0idXDEMKfVfFK7kekGCtJAuelGsYHQxhj13KTf95swTCN2dZ/4lTfZ84Fu31jqJEEgjWA==";
+        url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz";
+        sha512 = "3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==";
       };
     };
     "node-version-1.2.0" = {
@@ -2002,6 +1984,15 @@ let
         sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==";
       };
     };
+    "otfcc-ttcize-0.8.0" = {
+      name = "otfcc-ttcize";
+      packageName = "otfcc-ttcize";
+      version = "0.8.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/otfcc-ttcize/-/otfcc-ttcize-0.8.0.tgz";
+        sha512 = "0RFgy9TDsgTF/1UJ8bSQ4heTYRatDz3HOXXh8d3WyXReqeOU+edgkbG4ERMFPdzFnA+SgqKTnPRg+2pduZsmSQ==";
+      };
+    };
     "p-defer-1.0.0" = {
       name = "p-defer";
       packageName = "p-defer";
@@ -2110,6 +2101,15 @@ let
         sha1 = "f480f40434ef80741f8469099f8dea18f55a4dc9";
       };
     };
+    "patel-0.33.1" = {
+      name = "patel";
+      packageName = "patel";
+      version = "0.33.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/patel/-/patel-0.33.1.tgz";
+        sha512 = "zOv5DhGH2r4cRKnZfOlHmWqxBp9nMGnC3F/NZbUqFCYMA65RXiv8q1F96/6dm2ANR6xvCe+xLODQSb49IFoYQg==";
+      };
+    };
     "path-exists-2.1.0" = {
       name = "path-exists";
       packageName = "path-exists";
@@ -2137,6 +2137,15 @@ let
         sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f";
       };
     };
+    "path-is-inside-1.0.2" = {
+      name = "path-is-inside";
+      packageName = "path-is-inside";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz";
+        sha1 = "365417dede44430d1c11af61027facf074bdfc53";
+      };
+    };
     "path-key-2.0.1" = {
       name = "path-key";
       packageName = "path-key";
@@ -2236,6 +2245,15 @@ let
         sha1 = "21932a549f5e52ffd9a827f570e04be62a97da54";
       };
     };
+    "primitive-quadify-off-curves-0.4.1" = {
+      name = "primitive-quadify-off-curves";
+      packageName = "primitive-quadify-off-curves";
+      version = "0.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/primitive-quadify-off-curves/-/primitive-quadify-off-curves-0.4.1.tgz";
+        sha512 = "Kmn+IfF+hcARb1NX+XtoSQIxHS+WeOqqQ3YDihRe3KkvGkFxMrDQFFsDTXxwUOt9KmvD7FgWG6cO2ajZp4lEQg==";
+      };
+    };
     "process-nextick-args-2.0.1" = {
       name = "process-nextick-args";
       packageName = "process-nextick-args";
@@ -2407,15 +2425,6 @@ let
         sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1";
       };
     };
-    "require-main-filename-2.0.0" = {
-      name = "require-main-filename";
-      packageName = "require-main-filename";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz";
-        sha512 = "NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==";
-      };
-    };
     "resolve-1.12.0" = {
       name = "resolve";
       packageName = "resolve";
@@ -2488,15 +2497,6 @@ let
         sha512 = "mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==";
       };
     };
-    "rimraf-2.7.1" = {
-      name = "rimraf";
-      packageName = "rimraf";
-      version = "2.7.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz";
-        sha512 = "uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==";
-      };
-    };
     "run-async-2.3.0" = {
       name = "run-async";
       packageName = "run-async";
@@ -2857,13 +2857,22 @@ let
         sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf";
       };
     };
-    "strip-json-comments-3.0.1" = {
+    "strip-json-comments-2.0.1" = {
       name = "strip-json-comments";
       packageName = "strip-json-comments";
-      version = "3.0.1";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz";
+        sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a";
+      };
+    };
+    "stylus-0.54.7" = {
+      name = "stylus";
+      packageName = "stylus";
+      version = "0.54.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz";
-        sha512 = "VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==";
+        url = "https://registry.npmjs.org/stylus/-/stylus-0.54.7.tgz";
+        sha512 = "Yw3WMTzVwevT6ZTrLCYNHAFmanMxdylelL3hkWNgPMeTCpMwpV3nXjpOHuBXtFv7aiO2xRuQS6OoAdgkNcSNug==";
       };
     };
     "supports-color-5.5.0" = {
@@ -2884,13 +2893,13 @@ let
         sha512 = "wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==";
       };
     };
-    "tar-4.4.10" = {
+    "tar-2.2.2" = {
       name = "tar";
       packageName = "tar";
-      version = "4.4.10";
+      version = "2.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tar/-/tar-4.4.10.tgz";
-        sha512 = "g2SVs5QIxvo6OLp0GudTqEf05maawKUxXru104iaayWA09551tFCTI8f1Asb4lPfkBr91k07iL4c11XO3/b0tA==";
+        url = "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz";
+        sha512 = "FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==";
       };
     };
     "temp-0.8.3" = {
@@ -2938,6 +2947,24 @@ let
         sha512 = "jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==";
       };
     };
+    "toml-2.3.6" = {
+      name = "toml";
+      packageName = "toml";
+      version = "2.3.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/toml/-/toml-2.3.6.tgz";
+        sha512 = "gVweAectJU3ebq//Ferr2JUY4WKSDe5N+z0FvjDncLGyHmIDoxgY/2Ie4qfEIDm4IS7OA6Rmdm7pdEEdMcV/xQ==";
+      };
+    };
+    "topsort-0.0.2" = {
+      name = "topsort";
+      packageName = "topsort";
+      version = "0.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/topsort/-/topsort-0.0.2.tgz";
+        sha1 = "2e5e0ee8a1439417f101d5b9b2d035e620263321";
+      };
+    };
     "tough-cookie-2.4.3" = {
       name = "tough-cookie";
       packageName = "tough-cookie";
@@ -2956,15 +2983,6 @@ let
         sha512 = "6qWWz2HdFbD2uAfgS5t65Dd6HQKYjfra+YXQzKzxIG+RKTpoeDi+x+TW85SEF3cWUI2UecrOXJobvD+04MiTZg==";
       };
     };
-    "tslib-1.10.0" = {
-      name = "tslib";
-      packageName = "tslib";
-      version = "1.10.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz";
-        sha512 = "qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==";
-      };
-    };
     "tslib-1.9.3" = {
       name = "tslib";
       packageName = "tslib";
@@ -2974,6 +2992,24 @@ let
         sha512 = "4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==";
       };
     };
+    "ttf2woff-2.0.1" = {
+      name = "ttf2woff";
+      packageName = "ttf2woff";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ttf2woff/-/ttf2woff-2.0.1.tgz";
+        sha1 = "871832240024b09db9570904c7c1928b8057c969";
+      };
+    };
+    "ttf2woff2-2.0.3" = {
+      name = "ttf2woff2";
+      packageName = "ttf2woff2";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ttf2woff2/-/ttf2woff2-2.0.3.tgz";
+        sha1 = "5e020afe6e643287f3ad7687abed20fe654eb329";
+      };
+    };
     "tunnel-agent-0.6.0" = {
       name = "tunnel-agent";
       packageName = "tunnel-agent";
@@ -3028,6 +3064,15 @@ let
         sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==";
       };
     };
+    "unorm-1.6.0" = {
+      name = "unorm";
+      packageName = "unorm";
+      version = "1.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/unorm/-/unorm-1.6.0.tgz";
+        sha512 = "b2/KCUlYZUeA7JFUuRJZPUtr4gZvBh7tavtv4fvk4+KV9pfGiR6CQAQAWl49ZpR3ts2dk4FYkP7EIgDJoiOLDA==";
+      };
+    };
     "uri-js-4.2.2" = {
       name = "uri-js";
       packageName = "uri-js";
@@ -3064,15 +3109,6 @@ let
         sha512 = "pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==";
       };
     };
-    "v8-compile-cache-2.1.0" = {
-      name = "v8-compile-cache";
-      packageName = "v8-compile-cache";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz";
-        sha512 = "usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g==";
-      };
-    };
     "validate-npm-package-license-3.0.4" = {
       name = "validate-npm-package-license";
       packageName = "validate-npm-package-license";
@@ -3082,6 +3118,15 @@ let
         sha512 = "DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==";
       };
     };
+    "verda-1.0.0-4" = {
+      name = "verda";
+      packageName = "verda";
+      version = "1.0.0-4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/verda/-/verda-1.0.0-4.tgz";
+        sha512 = "DKr2WdWlPwJvmqCcjs6LPaBOacFQUdk6+u7tqwkxYKbHa0Touff7Y6x+YAWbnT1dace5Qlv/CRr6YBEaB08r3A==";
+      };
+    };
     "verror-1.10.0" = {
       name = "verror";
       packageName = "verror";
@@ -3154,15 +3199,6 @@ let
         sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85";
       };
     };
-    "wrap-ansi-5.1.0" = {
-      name = "wrap-ansi";
-      packageName = "wrap-ansi";
-      version = "5.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz";
-        sha512 = "QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==";
-      };
-    };
     "wrappy-1.0.2" = {
       name = "wrappy";
       packageName = "wrappy";
@@ -3190,15 +3226,6 @@ let
         sha1 = "6d15fba884c08679c0d77e88e7759e811e07fa41";
       };
     };
-    "y18n-4.0.0" = {
-      name = "y18n";
-      packageName = "y18n";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz";
-        sha512 = "r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==";
-      };
-    };
     "yallist-2.1.2" = {
       name = "yallist";
       packageName = "yallist";
@@ -3208,15 +3235,6 @@ let
         sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52";
       };
     };
-    "yallist-3.0.3" = {
-      name = "yallist";
-      packageName = "yallist";
-      version = "3.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz";
-        sha512 = "S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==";
-      };
-    };
     "yargs-12.0.5" = {
       name = "yargs";
       packageName = "yargs";
@@ -3253,15 +3271,6 @@ let
         sha512 = "C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==";
       };
     };
-    "yargs-parser-13.1.1" = {
-      name = "yargs-parser";
-      packageName = "yargs-parser";
-      version = "13.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz";
-        sha512 = "oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==";
-      };
-    };
     "yargs-parser-4.2.1" = {
       name = "yargs-parser";
       packageName = "yargs-parser";
@@ -3283,974 +3292,469 @@ let
   };
 in
 {
-  caryll-shapeops = nodeEnv.buildNodePackage {
-    name = "caryll-shapeops";
-    packageName = "caryll-shapeops";
-    version = "0.3.1";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/caryll-shapeops/-/caryll-shapeops-0.3.1.tgz";
-      sha512 = "3TdH6DZGL08S6qEvCZLNaOHyFvmzQts8m+TyYEvc6/PiI+XgX5mIag1/CKczIM8e2QtDr8JKW8foo4VNOM8/Og==";
-    };
-    dependencies = [
-      sources."bezier-js-2.4.3"
-      sources."clipper-lib-1.0.0"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Boolean operations and overlap removal for curves.";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
-  libspiro-js = nodeEnv.buildNodePackage {
-    name = "libspiro-js";
-    packageName = "libspiro-js";
-    version = "0.3.1";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/libspiro-js/-/libspiro-js-0.3.1.tgz";
-      sha1 = "86652b0009a6d84ea79a5320bdca5f00612ee439";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "JavaScript libspiro port";
-      homepage = https://github.com/be5invis/libspiro-js;
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
-  megaminx = nodeEnv.buildNodePackage {
-    name = "megaminx";
-    packageName = "megaminx";
-    version = "0.9.0";
+  "iosevka-https://github.com/be5invis/Iosevka/archive/v2.3.0.tar.gz" = nodeEnv.buildNodePackage {
+    name = "iosevka";
+    packageName = "iosevka";
+    version = "2.3.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/megaminx/-/megaminx-0.9.0.tgz";
-      sha512 = "1UcxrUXXYboLWS3AJ2NuLckLi3YR7eJiO5LsYAWHZjYE0mmSqJ2ogSt6JrG8YINyogW9/TUWpL1ojwbRsSbyXw==";
+      name = "iosevka-2.3.0.tar.gz";
+      url = https://codeload.github.com/be5invis/Iosevka/tar.gz/v2.3.0;
+      sha256 = "b10e45bc10f6cd5986e4b1f91db55879c66be390ba6643e5ad4755c3941f1d81";
     };
     dependencies = [
+      sources."@babel/code-frame-7.5.5"
+      sources."@babel/highlight-7.5.0"
       sources."JSONStream-1.3.5"
+      sources."abbrev-1.1.1"
+      sources."acorn-6.3.0"
+      sources."acorn-jsx-5.0.2"
+      sources."ajv-6.10.2"
+      sources."amdefine-1.0.1"
+      sources."ansi-escapes-3.2.0"
+      sources."ansi-regex-2.1.1"
+      sources."ansi-styles-3.2.1"
+      sources."aproba-1.2.0"
+      sources."are-we-there-yet-1.1.5"
+      sources."argparse-1.0.10"
+      sources."asn1-0.2.4"
+      sources."assert-plus-1.0.0"
+      sources."astral-regex-1.0.0"
+      sources."asynckit-0.4.0"
+      sources."atob-2.1.2"
+      sources."aws-sign2-0.7.0"
+      sources."aws4-1.8.0"
+      sources."balanced-match-1.0.0"
+      sources."bcrypt-pbkdf-1.0.2"
+      sources."bezier-js-2.4.3"
+      sources."bindings-1.5.0"
+      sources."block-stream-0.0.9"
+      sources."bluebird-3.5.5"
+      sources."brace-expansion-1.1.11"
+      sources."bufferstreams-1.1.3"
+      sources."callsites-3.1.0"
+      sources."camelcase-4.1.0"
+      sources."caryll-shapeops-0.3.1"
+      sources."caseless-0.12.0"
+      sources."chalk-2.4.2"
+      sources."chardet-0.7.0"
       sources."child-process-promise-2.2.1"
+      sources."cli-cursor-2.1.0"
+      sources."cli-width-2.2.0"
+      sources."clipper-lib-1.0.0"
+      (sources."cliui-3.2.0" // {
+        dependencies = [
+          sources."string-width-1.0.2"
+        ];
+      })
       sources."clone-2.1.2"
+      sources."code-point-at-1.1.0"
+      sources."color-convert-1.9.3"
+      sources."color-name-1.1.3"
+      sources."colors-1.3.3"
+      sources."combined-stream-1.0.8"
       sources."complex.js-2.0.11"
+      sources."concat-map-0.0.1"
+      sources."console-control-strings-1.1.0"
       sources."core-util-is-1.0.2"
       sources."cross-spawn-4.0.2"
+      sources."css-2.2.4"
+      sources."css-parse-2.0.0"
+      sources."cubic2quad-1.1.1"
+      sources."dashdash-1.14.1"
+      sources."debug-4.1.1"
+      sources."decamelize-1.2.0"
       sources."decimal.js-10.2.0"
+      sources."decode-uri-component-0.2.0"
+      sources."deep-is-0.1.3"
+      sources."delayed-stream-1.0.0"
+      sources."delegates-1.0.0"
+      sources."doctrine-3.0.0"
+      sources."ecc-jsbn-0.1.2"
+      sources."emoji-regex-7.0.3"
+      sources."end-of-stream-1.4.1"
+      sources."error-ex-1.3.2"
       sources."escape-latex-1.2.0"
-      sources."first-chunk-stream-2.0.0"
-      sources."fraction.js-4.0.12"
-      sources."fs-extra-3.0.1"
-      sources."graceful-fs-4.2.2"
-      sources."inherits-2.0.4"
-      sources."is-utf8-0.2.1"
-      sources."isarray-1.0.0"
-      sources."isexe-2.0.0"
-      sources."javascript-natural-sort-0.7.1"
-      sources."jsonfile-3.0.1"
-      sources."jsonparse-1.3.1"
-      sources."lru-cache-4.1.5"
-      sources."mathjs-5.10.3"
-      sources."node-version-1.2.0"
-      sources."process-nextick-args-2.0.1"
-      sources."promise-polyfill-6.1.0"
-      sources."pseudomap-1.0.2"
-      sources."readable-stream-2.3.6"
-      sources."safe-buffer-5.1.2"
-      sources."seed-random-2.2.0"
-      sources."string_decoder-1.1.1"
-      sources."strip-bom-buf-1.0.0"
-      sources."strip-bom-stream-3.0.0"
-      sources."through-2.3.8"
-      sources."tiny-emitter-2.1.0"
-      sources."tslib-1.9.3"
-      sources."typed-function-1.1.0"
-      sources."typo-geom-0.5.1"
-      sources."universalify-0.1.2"
-      sources."util-deprecate-1.0.2"
-      sources."which-1.3.1"
-      sources."yallist-2.1.2"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "A typeface manipulation toolkit";
-      homepage = "https://github.com/caryll/Megaminx#readme";
-      license = "Apache-2.0";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
-  object-assign = nodeEnv.buildNodePackage {
-    name = "object-assign";
-    packageName = "object-assign";
-    version = "4.1.1";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz";
-      sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "ES2015 `Object.assign()` ponyfill";
-      homepage = "https://github.com/sindresorhus/object-assign#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
-  otfcc-ttcize = nodeEnv.buildNodePackage {
-    name = "otfcc-ttcize";
-    packageName = "otfcc-ttcize";
-    version = "0.8.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/otfcc-ttcize/-/otfcc-ttcize-0.8.0.tgz";
-      sha512 = "0RFgy9TDsgTF/1UJ8bSQ4heTYRatDz3HOXXh8d3WyXReqeOU+edgkbG4ERMFPdzFnA+SgqKTnPRg+2pduZsmSQ==";
-    };
-    dependencies = [
-      sources."JSONStream-1.3.5"
-      sources."ansi-regex-2.1.1"
-      sources."camelcase-4.1.0"
-      sources."child-process-promise-2.2.1"
-      (sources."cliui-3.2.0" // {
-        dependencies = [
-          sources."string-width-1.0.2"
-        ];
-      })
-      sources."code-point-at-1.1.0"
-      sources."cross-spawn-4.0.2"
-      sources."cubic2quad-1.1.1"
-      sources."decamelize-1.2.0"
-      sources."error-ex-1.3.2"
-      (sources."execa-0.7.0" // {
-        dependencies = [
-          sources."cross-spawn-5.1.0"
-        ];
-      })
-      sources."find-up-2.1.0"
-      sources."fs-extra-4.0.3"
-      sources."get-caller-file-1.0.3"
-      sources."get-stream-3.0.0"
-      sources."graceful-fs-4.2.2"
-      sources."hosted-git-info-2.8.4"
-      sources."invert-kv-1.0.0"
-      sources."is-arrayish-0.2.1"
-      sources."is-fullwidth-code-point-1.0.0"
-      sources."is-stream-1.1.0"
-      sources."isexe-2.0.0"
-      sources."jsonfile-4.0.0"
-      sources."jsonparse-1.3.1"
-      sources."lcid-1.0.0"
-      sources."load-json-file-2.0.0"
-      sources."locate-path-2.0.0"
-      sources."lru-cache-4.1.5"
-      (sources."megaminx-0.3.3" // {
-        dependencies = [
-          sources."fs-extra-3.0.1"
-          sources."jsonfile-3.0.1"
-        ];
-      })
-      sources."mem-1.1.0"
-      sources."mimic-fn-1.2.0"
-      sources."node-version-1.2.0"
-      sources."normalize-package-data-2.5.0"
-      sources."npm-run-path-2.0.2"
-      sources."number-is-nan-1.0.1"
-      sources."os-locale-2.1.0"
-      sources."os-tmpdir-1.0.2"
-      sources."p-finally-1.0.0"
-      sources."p-limit-1.3.0"
-      sources."p-locate-2.0.0"
-      sources."p-try-1.0.0"
-      sources."parse-json-2.2.0"
-      sources."path-exists-3.0.0"
-      sources."path-key-2.0.1"
-      sources."path-parse-1.0.6"
-      sources."path-type-2.0.0"
-      sources."pify-2.3.0"
-      sources."promise-polyfill-6.1.0"
-      sources."pseudomap-1.0.2"
-      sources."read-pkg-2.0.0"
-      sources."read-pkg-up-2.0.0"
-      sources."require-directory-2.1.1"
-      sources."require-main-filename-1.0.1"
-      sources."resolve-1.12.0"
-      sources."rimraf-2.2.8"
-      sources."semver-5.7.1"
-      sources."set-blocking-2.0.0"
-      sources."shebang-command-1.2.0"
-      sources."shebang-regex-1.0.0"
-      sources."signal-exit-3.0.2"
-      sources."spdx-correct-3.1.0"
-      sources."spdx-exceptions-2.2.0"
-      sources."spdx-expression-parse-3.0.0"
-      sources."spdx-license-ids-3.0.5"
-      (sources."string-width-2.1.1" // {
-        dependencies = [
-          sources."ansi-regex-3.0.0"
-          sources."is-fullwidth-code-point-2.0.0"
-          sources."strip-ansi-4.0.0"
-        ];
-      })
-      sources."strip-ansi-3.0.1"
-      sources."strip-bom-3.0.0"
-      sources."strip-eof-1.0.0"
-      sources."temp-0.8.3"
-      sources."through-2.3.8"
-      sources."universalify-0.1.2"
-      sources."validate-npm-package-license-3.0.4"
-      sources."which-1.3.1"
-      sources."which-module-2.0.0"
-      (sources."wrap-ansi-2.1.0" // {
-        dependencies = [
-          sources."string-width-1.0.2"
-        ];
-      })
-      sources."y18n-3.2.1"
-      sources."yallist-2.1.2"
-      sources."yargs-8.0.2"
-      sources."yargs-parser-7.0.0"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      license = "Apache 2.0";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
-  primitive-quadify-off-curves = nodeEnv.buildNodePackage {
-    name = "primitive-quadify-off-curves";
-    packageName = "primitive-quadify-off-curves";
-    version = "0.6.3";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/primitive-quadify-off-curves/-/primitive-quadify-off-curves-0.6.3.tgz";
-      sha512 = "NlkjdjHbXycTBGo9SDozAvOdmFDDOXuy4/rgmHsg1AB11QUbujybclmYWx1uPEgAELnh23S16KL5sD5uw540Ww==";
-    };
-    dependencies = [
-      sources."complex.js-2.0.11"
-      sources."decimal.js-10.2.0"
-      sources."escape-latex-1.2.0"
-      sources."fraction.js-4.0.12"
-      sources."javascript-natural-sort-0.7.1"
-      sources."mathjs-5.10.3"
-      sources."seed-random-2.2.0"
-      sources."tiny-emitter-2.1.0"
-      sources."tslib-1.9.3"
-      sources."typed-function-1.1.0"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Quadify a Cubic with only off-curve points";
-      license = "APLv2";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
-  toml = nodeEnv.buildNodePackage {
-    name = "toml";
-    packageName = "toml";
-    version = "3.0.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/toml/-/toml-3.0.0.tgz";
-      sha512 = "y/mWCZinnvxjTKYhJ+pYxwD0mRLVvOtdS2Awbgxln6iEnt4rk0yBxeSBHkGJcPucRiG0e55mwWp+g/05rsrd6w==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "TOML parser for Node.js (parses TOML spec v0.4.0)";
-      homepage = "https://github.com/BinaryMuse/toml-node#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
-  topsort = nodeEnv.buildNodePackage {
-    name = "topsort";
-    packageName = "topsort";
-    version = "0.0.2";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/topsort/-/topsort-0.0.2.tgz";
-      sha1 = "2e5e0ee8a1439417f101d5b9b2d035e620263321";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Topological sort in JavaScript";
-      homepage = https://github.com/samuelneff/topsort;
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
-  ttf2woff = nodeEnv.buildNodePackage {
-    name = "ttf2woff";
-    packageName = "ttf2woff";
-    version = "2.0.1";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/ttf2woff/-/ttf2woff-2.0.1.tgz";
-      sha1 = "871832240024b09db9570904c7c1928b8057c969";
-    };
-    dependencies = [
-      sources."argparse-1.0.10"
-      sources."microbuffer-1.0.0"
-      sources."pako-1.0.10"
-      sources."sprintf-js-1.0.3"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Convert TTF font to WOFF";
-      homepage = "https://github.com/fontello/ttf2woff#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
-  ttf2woff2 = nodeEnv.buildNodePackage {
-    name = "ttf2woff2";
-    packageName = "ttf2woff2";
-    version = "3.0.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/ttf2woff2/-/ttf2woff2-3.0.0.tgz";
-      sha512 = "5/Web6B0lF/STNAQ0d5vAlRRquuWsNj8wOmKQ9ql9Bsgbx8MsLnNzaBG9vBcSE4s4Ry1QOr/MyUrDUIVgVPEfw==";
-    };
-    dependencies = [
-      sources."abbrev-1.1.1"
-      sources."ajv-6.10.2"
-      sources."ansi-regex-2.1.1"
-      sources."aproba-1.2.0"
-      sources."are-we-there-yet-1.1.5"
-      sources."asn1-0.2.4"
-      sources."assert-plus-1.0.0"
-      sources."asynckit-0.4.0"
-      sources."aws-sign2-0.7.0"
-      sources."aws4-1.8.0"
-      sources."balanced-match-1.0.0"
-      sources."bcrypt-pbkdf-1.0.2"
-      sources."bindings-1.5.0"
-      sources."brace-expansion-1.1.11"
-      sources."bufferstreams-2.0.1"
-      sources."caseless-0.12.0"
-      sources."chownr-1.1.2"
-      sources."code-point-at-1.1.0"
-      sources."combined-stream-1.0.8"
-      sources."concat-map-0.0.1"
-      sources."console-control-strings-1.1.0"
-      sources."core-util-is-1.0.2"
-      sources."dashdash-1.14.1"
-      sources."delayed-stream-1.0.0"
-      sources."delegates-1.0.0"
-      sources."ecc-jsbn-0.1.2"
-      sources."extend-3.0.2"
-      sources."extsprintf-1.3.0"
-      sources."fast-deep-equal-2.0.1"
-      sources."fast-json-stable-stringify-2.0.0"
-      sources."file-uri-to-path-1.0.0"
-      sources."forever-agent-0.6.1"
-      sources."form-data-2.3.3"
-      sources."fs-minipass-1.2.6"
-      sources."fs.realpath-1.0.0"
-      sources."gauge-2.7.4"
-      sources."getpass-0.1.7"
-      sources."glob-7.1.4"
-      sources."graceful-fs-4.2.2"
-      sources."har-schema-2.0.0"
-      sources."har-validator-5.1.3"
-      sources."has-unicode-2.0.1"
-      sources."http-signature-1.2.0"
-      sources."inflight-1.0.6"
-      sources."inherits-2.0.4"
-      sources."is-fullwidth-code-point-1.0.0"
-      sources."is-typedarray-1.0.0"
-      sources."isarray-1.0.0"
-      sources."isexe-2.0.0"
-      sources."isstream-0.1.2"
-      sources."jsbn-0.1.1"
-      sources."json-schema-0.2.3"
-      sources."json-schema-traverse-0.4.1"
-      sources."json-stringify-safe-5.0.1"
-      sources."jsprim-1.4.1"
-      sources."mime-db-1.40.0"
-      sources."mime-types-2.1.24"
-      sources."minimatch-3.0.4"
-      sources."minimist-0.0.8"
-      sources."minipass-2.5.1"
-      sources."minizlib-1.2.2"
-      sources."mkdirp-0.5.1"
-      sources."nan-2.14.0"
-      sources."node-gyp-4.0.0"
-      sources."nopt-3.0.6"
-      sources."npmlog-4.1.2"
-      sources."number-is-nan-1.0.1"
-      sources."oauth-sign-0.9.0"
-      sources."object-assign-4.1.1"
-      sources."once-1.4.0"
-      sources."os-homedir-1.0.2"
-      sources."os-tmpdir-1.0.2"
-      sources."osenv-0.1.5"
-      sources."path-is-absolute-1.0.1"
-      sources."performance-now-2.1.0"
-      sources."process-nextick-args-2.0.1"
-      sources."psl-1.4.0"
-      sources."punycode-2.1.1"
-      sources."qs-6.5.2"
-      sources."readable-stream-2.3.6"
-      sources."request-2.88.0"
-      sources."rimraf-2.7.1"
-      sources."safe-buffer-5.1.2"
-      sources."safer-buffer-2.1.2"
-      sources."semver-5.3.0"
-      sources."set-blocking-2.0.0"
-      sources."signal-exit-3.0.2"
-      sources."sshpk-1.16.1"
-      sources."string-width-1.0.2"
-      sources."string_decoder-1.1.1"
-      sources."strip-ansi-3.0.1"
-      sources."tar-4.4.10"
-      (sources."tough-cookie-2.4.3" // {
-        dependencies = [
-          sources."punycode-1.4.1"
-        ];
-      })
-      sources."tunnel-agent-0.6.0"
-      sources."tweetnacl-0.14.5"
-      sources."uri-js-4.2.2"
-      sources."util-deprecate-1.0.2"
-      sources."uuid-3.3.3"
-      sources."verror-1.10.0"
-      sources."which-1.3.1"
-      sources."wide-align-1.1.3"
-      sources."wrappy-1.0.2"
-      sources."yallist-3.0.3"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Convert TTF files to WOFF2 ones.";
-      homepage = https://github.com/nfroidure/ttf2woff2;
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
-  unorm = nodeEnv.buildNodePackage {
-    name = "unorm";
-    packageName = "unorm";
-    version = "1.6.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/unorm/-/unorm-1.6.0.tgz";
-      sha512 = "b2/KCUlYZUeA7JFUuRJZPUtr4gZvBh7tavtv4fvk4+KV9pfGiR6CQAQAWl49ZpR3ts2dk4FYkP7EIgDJoiOLDA==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "JavaScript Unicode 8.0 Normalization - NFC, NFD, NFKC, NFKD. Read <http://unicode.org/reports/tr15/> UAX #15 Unicode Normalization Forms.";
-      homepage = "https://github.com/walling/unorm#readme";
-      license = "MIT or GPL-2.0";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
-  verda = nodeEnv.buildNodePackage {
-    name = "verda";
-    packageName = "verda";
-    version = "1.0.0-4";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/verda/-/verda-1.0.0-4.tgz";
-      sha512 = "DKr2WdWlPwJvmqCcjs6LPaBOacFQUdk6+u7tqwkxYKbHa0Touff7Y6x+YAWbnT1dace5Qlv/CRr6YBEaB08r3A==";
-    };
-    dependencies = [
-      sources."ansi-regex-4.1.0"
-      sources."ansi-styles-3.2.1"
-      sources."bluebird-3.5.5"
-      sources."camelcase-5.3.1"
-      sources."chalk-2.4.2"
-      sources."cli-cursor-2.1.0"
-      (sources."cliui-4.1.0" // {
-        dependencies = [
-          sources."ansi-regex-3.0.0"
-          sources."strip-ansi-4.0.0"
-        ];
-      })
-      sources."code-point-at-1.1.0"
-      sources."color-convert-1.9.3"
-      sources."color-name-1.1.3"
-      sources."cross-spawn-6.0.5"
-      sources."decamelize-1.2.0"
-      sources."end-of-stream-1.4.1"
-      sources."escape-string-regexp-1.0.5"
-      sources."execa-1.0.0"
-      sources."fast-deep-equal-2.0.1"
-      sources."find-up-3.0.0"
-      sources."fs-extra-6.0.1"
-      sources."get-caller-file-1.0.3"
-      sources."get-stream-4.1.0"
-      sources."graceful-fs-4.2.2"
-      sources."has-flag-3.0.0"
-      sources."invert-kv-2.0.0"
-      sources."is-fullwidth-code-point-1.0.0"
-      sources."is-stream-1.1.0"
-      sources."isexe-2.0.0"
-      sources."jsonfile-4.0.0"
-      sources."lcid-2.0.0"
-      sources."locate-path-3.0.0"
-      sources."map-age-cleaner-0.1.3"
-      (sources."mem-4.3.0" // {
-        dependencies = [
-          sources."mimic-fn-2.1.0"
-        ];
-      })
-      sources."mimic-fn-1.2.0"
-      sources."nice-try-1.0.5"
-      sources."npm-run-path-2.0.2"
-      sources."number-is-nan-1.0.1"
-      sources."once-1.4.0"
-      sources."onetime-2.0.1"
-      sources."os-locale-3.1.0"
-      sources."p-defer-1.0.0"
-      sources."p-finally-1.0.0"
-      sources."p-is-promise-2.1.0"
-      sources."p-limit-2.2.1"
-      sources."p-locate-3.0.0"
-      sources."p-try-2.2.0"
-      sources."path-exists-3.0.0"
-      sources."path-key-2.0.1"
-      sources."path-parse-1.0.6"
-      sources."proper-lockfile-3.2.0"
-      sources."pump-3.0.0"
-      sources."require-directory-2.1.1"
-      sources."require-main-filename-1.0.1"
-      sources."resolve-1.12.0"
-      sources."restore-cursor-2.0.0"
-      sources."retry-0.12.0"
-      sources."semaphore-async-await-1.5.1"
-      sources."semver-5.7.1"
-      sources."set-blocking-2.0.0"
-      sources."shebang-command-1.2.0"
-      sources."shebang-regex-1.0.0"
-      sources."signal-exit-3.0.2"
-      sources."split-1.0.1"
-      sources."stack-trace-0.0.9"
-      (sources."string-width-2.1.1" // {
-        dependencies = [
-          sources."ansi-regex-3.0.0"
-          sources."is-fullwidth-code-point-2.0.0"
-          sources."strip-ansi-4.0.0"
-        ];
-      })
-      sources."strip-ansi-5.2.0"
-      sources."strip-eof-1.0.0"
-      sources."supports-color-5.5.0"
-      sources."through-2.3.8"
-      sources."ts-process-promises-1.0.2"
-      sources."tslib-1.10.0"
-      sources."universalify-0.1.2"
-      sources."which-1.3.1"
-      sources."which-module-2.0.0"
-      (sources."wrap-ansi-2.1.0" // {
-        dependencies = [
-          sources."ansi-regex-2.1.1"
-          sources."string-width-1.0.2"
-          sources."strip-ansi-3.0.1"
-        ];
-      })
-      sources."wrappy-1.0.2"
-      sources."y18n-4.0.0"
-      sources."yargs-12.0.5"
-      sources."yargs-parser-11.1.1"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Build Directly.";
-      license = "APLv2";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
-  yargs = nodeEnv.buildNodePackage {
-    name = "yargs";
-    packageName = "yargs";
-    version = "14.0.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/yargs/-/yargs-14.0.0.tgz";
-      sha512 = "ssa5JuRjMeZEUjg7bEL99AwpitxU/zWGAGpdj0di41pOEmJti8NR6kyUIJBkR78DTYNPZOU08luUo0GTHuB+ow==";
-    };
-    dependencies = [
-      sources."ansi-regex-4.1.0"
-      sources."ansi-styles-3.2.1"
-      sources."camelcase-5.3.1"
-      sources."cliui-5.0.0"
-      sources."color-convert-1.9.3"
-      sources."color-name-1.1.3"
-      sources."decamelize-1.2.0"
-      sources."emoji-regex-7.0.3"
-      sources."find-up-3.0.0"
-      sources."get-caller-file-2.0.5"
-      sources."is-fullwidth-code-point-2.0.0"
-      sources."locate-path-3.0.0"
-      sources."p-limit-2.2.1"
-      sources."p-locate-3.0.0"
-      sources."p-try-2.2.0"
-      sources."path-exists-3.0.0"
-      sources."require-directory-2.1.1"
-      sources."require-main-filename-2.0.0"
-      sources."set-blocking-2.0.0"
-      sources."string-width-3.1.0"
-      sources."strip-ansi-5.2.0"
-      sources."which-module-2.0.0"
-      sources."wrap-ansi-5.1.0"
-      sources."y18n-4.0.0"
-      sources."yargs-parser-13.1.1"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "yargs the modern, pirate-themed, successor to optimist.";
-      homepage = https://yargs.js.org/;
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
-  colors = nodeEnv.buildNodePackage {
-    name = "colors";
-    packageName = "colors";
-    version = "1.3.3";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/colors/-/colors-1.3.3.tgz";
-      sha512 = "mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "get colors in your node.js console";
-      homepage = https://github.com/Marak/colors.js;
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
-  patel = nodeEnv.buildNodePackage {
-    name = "patel";
-    packageName = "patel";
-    version = "0.33.1";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/patel/-/patel-0.33.1.tgz";
-      sha512 = "zOv5DhGH2r4cRKnZfOlHmWqxBp9nMGnC3F/NZbUqFCYMA65RXiv8q1F96/6dm2ANR6xvCe+xLODQSb49IFoYQg==";
-    };
-    dependencies = [
-      sources."amdefine-1.0.1"
-      sources."ansi-regex-2.1.1"
-      sources."camelcase-3.0.0"
-      sources."cliui-3.2.0"
-      sources."code-point-at-1.1.0"
-      sources."decamelize-1.2.0"
-      sources."deep-is-0.1.3"
-      sources."error-ex-1.3.2"
-      sources."escodegen-1.12.0"
-      (sources."escope-1.0.3" // {
-        dependencies = [
-          sources."estraverse-2.0.0"
-        ];
-      })
-      (sources."esmangle-1.0.1" // {
-        dependencies = [
-          sources."escodegen-1.3.3"
-          sources."esprima-1.1.1"
-          sources."estraverse-1.5.1"
-          sources."esutils-1.0.0"
-          sources."fast-levenshtein-1.0.7"
-          sources."levn-0.2.5"
-          sources."optionator-0.3.0"
-          sources."source-map-0.1.43"
-          sources."wordwrap-0.0.3"
-        ];
-      })
-      sources."esprima-3.1.3"
-      (sources."esshorten-1.1.1" // {
-        dependencies = [
-          sources."estraverse-4.1.1"
-        ];
-      })
-      sources."estraverse-4.3.0"
-      sources."esutils-2.0.3"
-      sources."fast-levenshtein-2.0.6"
-      sources."find-up-1.1.2"
-      sources."get-caller-file-1.0.3"
-      sources."graceful-fs-4.2.2"
-      sources."hosted-git-info-2.8.4"
-      sources."invert-kv-1.0.0"
-      sources."is-arrayish-0.2.1"
-      sources."is-fullwidth-code-point-1.0.0"
-      sources."is-utf8-0.2.1"
-      sources."lcid-1.0.0"
-      sources."levn-0.3.0"
-      sources."load-json-file-1.1.0"
-      sources."normalize-package-data-2.5.0"
-      sources."number-is-nan-1.0.1"
-      sources."optionator-0.8.2"
-      sources."os-locale-1.4.0"
-      sources."parse-json-2.2.0"
-      sources."path-exists-2.1.0"
-      sources."path-parse-1.0.6"
-      sources."path-type-1.1.0"
-      sources."patrisika-0.21.0"
-      sources."patrisika-scopes-0.11.1"
-      sources."pify-2.3.0"
-      sources."pinkie-2.0.4"
-      sources."pinkie-promise-2.0.1"
-      sources."prelude-ls-1.1.2"
-      sources."read-pkg-1.1.0"
-      sources."read-pkg-up-1.0.1"
-      sources."require-directory-2.1.1"
-      sources."require-main-filename-1.0.1"
-      sources."resolve-1.12.0"
-      sources."resumer-0.0.0"
-      sources."semver-5.7.1"
-      sources."set-blocking-2.0.0"
-      sources."source-map-0.6.1"
-      sources."spdx-correct-3.1.0"
-      sources."spdx-exceptions-2.2.0"
-      sources."spdx-expression-parse-3.0.0"
-      sources."spdx-license-ids-3.0.5"
-      sources."string-width-1.0.2"
-      sources."strip-ansi-3.0.1"
-      sources."strip-bom-2.0.0"
-      sources."through-2.3.8"
-      sources."type-check-0.3.2"
-      sources."validate-npm-package-license-3.0.4"
-      sources."which-module-1.0.0"
-      sources."wordwrap-1.0.0"
-      sources."wrap-ansi-2.1.0"
-      sources."y18n-3.2.1"
-      sources."yargs-6.6.0"
-      sources."yargs-parser-4.2.1"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "A Patrisika-based Example Language";
-      homepage = "https://github.com/be5invis/patel#readme";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
-  patrisika-scopes = nodeEnv.buildNodePackage {
-    name = "patrisika-scopes";
-    packageName = "patrisika-scopes";
-    version = "0.11.1";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/patrisika-scopes/-/patrisika-scopes-0.11.1.tgz";
-      sha512 = "UCIBMx1nzNaR5CcDoQ9/jtY5RlJqf2CrJYHiMZJhi15NPvsPKRfJT/DPZMkhCunexOKmH03EDZYZU1hGn7mL0w==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "patrisika-scopes ================ A library for Patrisika's scopes.";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
-  eslint = nodeEnv.buildNodePackage {
-    name = "eslint";
-    packageName = "eslint";
-    version = "6.4.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/eslint/-/eslint-6.4.0.tgz";
-      sha512 = "WTVEzK3lSFoXUovDHEbkJqCVPEPwbhCq4trDktNI6ygs7aO41d4cDT0JFAT5MivzZeVLWlg7vHL+bgrQv/t3vA==";
-    };
-    dependencies = [
-      sources."@babel/code-frame-7.5.5"
-      sources."@babel/highlight-7.5.0"
-      sources."acorn-7.0.0"
-      sources."acorn-jsx-5.0.2"
-      sources."ajv-6.10.2"
-      sources."ansi-escapes-3.2.0"
-      sources."ansi-regex-3.0.0"
-      sources."ansi-styles-3.2.1"
-      sources."argparse-1.0.10"
-      sources."astral-regex-1.0.0"
-      sources."balanced-match-1.0.0"
-      sources."brace-expansion-1.1.11"
-      sources."callsites-3.1.0"
-      sources."chalk-2.4.2"
-      sources."chardet-0.7.0"
-      sources."cli-cursor-2.1.0"
-      sources."cli-width-2.2.0"
-      sources."color-convert-1.9.3"
-      sources."color-name-1.1.3"
-      sources."concat-map-0.0.1"
-      (sources."cross-spawn-6.0.5" // {
+      sources."escape-string-regexp-1.0.5"
+      sources."escodegen-1.12.0"
+      (sources."escope-1.0.3" // {
         dependencies = [
-          sources."semver-5.7.1"
+          sources."estraverse-2.0.0"
         ];
       })
-      sources."debug-4.1.1"
-      sources."deep-is-0.1.3"
-      sources."doctrine-3.0.0"
-      sources."emoji-regex-7.0.3"
-      sources."escape-string-regexp-1.0.5"
-      sources."eslint-scope-5.0.0"
+      (sources."eslint-5.16.0" // {
+        dependencies = [
+          sources."ansi-regex-3.0.0"
+          sources."cross-spawn-6.0.5"
+          sources."strip-ansi-4.0.0"
+        ];
+      })
+      sources."eslint-scope-4.0.3"
       sources."eslint-utils-1.4.2"
       sources."eslint-visitor-keys-1.1.0"
-      sources."espree-6.1.1"
-      sources."esprima-4.0.1"
+      (sources."esmangle-1.0.1" // {
+        dependencies = [
+          sources."escodegen-1.3.3"
+          sources."esprima-1.1.1"
+          sources."estraverse-1.5.1"
+          sources."esutils-1.0.0"
+          sources."fast-levenshtein-1.0.7"
+          sources."levn-0.2.5"
+          sources."optionator-0.3.0"
+          sources."source-map-0.1.43"
+          sources."wordwrap-0.0.3"
+        ];
+      })
+      sources."espree-5.0.1"
+      sources."esprima-3.1.3"
       sources."esquery-1.0.1"
       sources."esrecurse-4.2.1"
+      (sources."esshorten-1.1.1" // {
+        dependencies = [
+          sources."estraverse-4.1.1"
+        ];
+      })
       sources."estraverse-4.3.0"
       sources."esutils-2.0.3"
+      (sources."execa-0.7.0" // {
+        dependencies = [
+          sources."cross-spawn-5.1.0"
+        ];
+      })
+      sources."extend-3.0.2"
       sources."external-editor-3.1.0"
+      sources."extsprintf-1.3.0"
       sources."fast-deep-equal-2.0.1"
       sources."fast-json-stable-stringify-2.0.0"
       sources."fast-levenshtein-2.0.6"
       sources."figures-2.0.0"
       sources."file-entry-cache-5.0.1"
-      sources."flat-cache-2.0.1"
+      sources."file-uri-to-path-1.0.0"
+      sources."find-up-2.1.0"
+      sources."first-chunk-stream-2.0.0"
+      (sources."flat-cache-2.0.1" // {
+        dependencies = [
+          sources."rimraf-2.6.3"
+        ];
+      })
       sources."flatted-2.0.1"
+      sources."forever-agent-0.6.1"
+      sources."form-data-2.3.3"
+      sources."fraction.js-4.0.12"
+      sources."fs-extra-3.0.1"
       sources."fs.realpath-1.0.0"
+      sources."fstream-1.0.12"
       sources."functional-red-black-tree-1.0.1"
+      (sources."gauge-2.7.4" // {
+        dependencies = [
+          sources."string-width-1.0.2"
+        ];
+      })
+      sources."get-caller-file-1.0.3"
+      sources."get-stream-3.0.0"
+      sources."getpass-0.1.7"
       sources."glob-7.1.4"
-      sources."glob-parent-5.0.0"
       sources."globals-11.12.0"
+      sources."graceful-fs-4.2.2"
+      sources."har-schema-2.0.0"
+      sources."har-validator-5.1.3"
       sources."has-flag-3.0.0"
+      sources."has-unicode-2.0.1"
+      sources."hosted-git-info-2.8.4"
+      sources."http-signature-1.2.0"
       sources."iconv-lite-0.4.24"
       sources."ignore-4.0.6"
       sources."import-fresh-3.1.0"
       sources."imurmurhash-0.1.4"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
-      sources."inquirer-6.5.2"
-      sources."is-extglob-2.1.1"
-      sources."is-fullwidth-code-point-2.0.0"
-      sources."is-glob-4.0.1"
+      (sources."inquirer-6.5.2" // {
+        dependencies = [
+          sources."ansi-regex-4.1.0"
+          sources."strip-ansi-5.2.0"
+        ];
+      })
+      sources."invert-kv-1.0.0"
+      sources."is-arrayish-0.2.1"
+      sources."is-fullwidth-code-point-1.0.0"
       sources."is-promise-2.1.0"
+      sources."is-stream-1.1.0"
+      sources."is-typedarray-1.0.0"
+      sources."is-utf8-0.2.1"
+      sources."isarray-1.0.0"
       sources."isexe-2.0.0"
+      sources."isstream-0.1.2"
+      sources."javascript-natural-sort-0.7.1"
       sources."js-tokens-4.0.0"
-      sources."js-yaml-3.13.1"
+      (sources."js-yaml-3.13.1" // {
+        dependencies = [
+          sources."esprima-4.0.1"
+        ];
+      })
+      sources."jsbn-0.1.1"
+      sources."json-schema-0.2.3"
       sources."json-schema-traverse-0.4.1"
       sources."json-stable-stringify-without-jsonify-1.0.1"
+      sources."json-stringify-safe-5.0.1"
+      sources."jsonfile-3.0.1"
+      sources."jsonparse-1.3.1"
+      sources."jsprim-1.4.1"
+      sources."lcid-1.0.0"
       sources."levn-0.3.0"
+      sources."libspiro-js-0.3.1"
+      sources."load-json-file-2.0.0"
+      sources."locate-path-2.0.0"
       sources."lodash-4.17.15"
+      sources."lru-cache-4.1.5"
+      sources."map-age-cleaner-0.1.3"
+      sources."mathjs-5.10.3"
+      sources."megaminx-0.9.0"
+      sources."mem-1.1.0"
+      sources."microbuffer-1.0.0"
+      sources."mime-db-1.40.0"
+      sources."mime-types-2.1.24"
       sources."mimic-fn-1.2.0"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
       sources."mkdirp-0.5.1"
       sources."ms-2.1.2"
       sources."mute-stream-0.0.7"
+      sources."nan-2.14.0"
       sources."natural-compare-1.4.0"
       sources."nice-try-1.0.5"
+      (sources."node-gyp-3.8.0" // {
+        dependencies = [
+          sources."semver-5.3.0"
+        ];
+      })
+      sources."node-version-1.2.0"
+      sources."nopt-3.0.6"
+      sources."normalize-package-data-2.5.0"
+      sources."npm-run-path-2.0.2"
+      sources."npmlog-4.1.2"
+      sources."number-is-nan-1.0.1"
+      sources."oauth-sign-0.9.0"
+      sources."object-assign-4.1.1"
       sources."once-1.4.0"
       sources."onetime-2.0.1"
       sources."optionator-0.8.2"
+      sources."os-homedir-1.0.2"
+      sources."os-locale-2.1.0"
       sources."os-tmpdir-1.0.2"
+      sources."osenv-0.1.5"
+      (sources."otfcc-ttcize-0.8.0" // {
+        dependencies = [
+          sources."fs-extra-4.0.3"
+          sources."jsonfile-4.0.0"
+          (sources."megaminx-0.3.3" // {
+            dependencies = [
+              sources."fs-extra-3.0.1"
+              sources."jsonfile-3.0.1"
+            ];
+          })
+          sources."yargs-8.0.2"
+        ];
+      })
+      sources."p-defer-1.0.0"
+      sources."p-finally-1.0.0"
+      sources."p-is-promise-2.1.0"
+      sources."p-limit-1.3.0"
+      sources."p-locate-2.0.0"
+      sources."p-try-1.0.0"
+      sources."pako-1.0.10"
       sources."parent-module-1.0.1"
+      sources."parse-json-2.2.0"
+      (sources."patel-0.33.1" // {
+        dependencies = [
+          sources."camelcase-3.0.0"
+          sources."find-up-1.1.2"
+          sources."load-json-file-1.1.0"
+          sources."os-locale-1.4.0"
+          sources."path-exists-2.1.0"
+          sources."path-type-1.1.0"
+          sources."read-pkg-1.1.0"
+          sources."read-pkg-up-1.0.1"
+          sources."string-width-1.0.2"
+          sources."strip-bom-2.0.0"
+          sources."which-module-1.0.0"
+          sources."yargs-6.6.0"
+          sources."yargs-parser-4.2.1"
+        ];
+      })
+      sources."path-exists-3.0.0"
       sources."path-is-absolute-1.0.1"
+      sources."path-is-inside-1.0.2"
       sources."path-key-2.0.1"
+      sources."path-parse-1.0.6"
+      sources."path-type-2.0.0"
+      sources."patrisika-0.21.0"
+      sources."patrisika-scopes-0.11.1"
+      sources."performance-now-2.1.0"
+      sources."pify-2.3.0"
+      sources."pinkie-2.0.4"
+      sources."pinkie-promise-2.0.1"
       sources."prelude-ls-1.1.2"
+      sources."primitive-quadify-off-curves-0.4.1"
+      sources."process-nextick-args-2.0.1"
       sources."progress-2.0.3"
+      sources."promise-polyfill-6.1.0"
+      sources."proper-lockfile-3.2.0"
+      sources."pseudomap-1.0.2"
+      sources."psl-1.4.0"
+      sources."pump-3.0.0"
       sources."punycode-2.1.1"
+      sources."qs-6.5.2"
+      sources."read-pkg-2.0.0"
+      sources."read-pkg-up-2.0.0"
+      sources."readable-stream-2.3.6"
       sources."regexpp-2.0.1"
+      sources."request-2.88.0"
+      sources."require-directory-2.1.1"
+      sources."require-main-filename-1.0.1"
+      sources."resolve-1.12.0"
       sources."resolve-from-4.0.0"
+      sources."resolve-url-0.2.1"
       sources."restore-cursor-2.0.0"
-      sources."rimraf-2.6.3"
+      sources."resumer-0.0.0"
+      sources."retry-0.12.0"
+      sources."rimraf-2.2.8"
       sources."run-async-2.3.0"
       sources."rxjs-6.5.3"
+      sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
-      sources."semver-6.3.0"
+      sources."sax-1.2.4"
+      sources."seed-random-2.2.0"
+      sources."semaphore-async-await-1.5.1"
+      sources."semver-5.7.1"
+      sources."set-blocking-2.0.0"
       sources."shebang-command-1.2.0"
       sources."shebang-regex-1.0.0"
       sources."signal-exit-3.0.2"
-      sources."slice-ansi-2.1.0"
+      (sources."slice-ansi-2.1.0" // {
+        dependencies = [
+          sources."is-fullwidth-code-point-2.0.0"
+        ];
+      })
+      sources."source-map-0.6.1"
+      sources."source-map-resolve-0.5.2"
+      sources."source-map-url-0.4.0"
+      sources."spdx-correct-3.1.0"
+      sources."spdx-exceptions-2.2.0"
+      sources."spdx-expression-parse-3.0.0"
+      sources."spdx-license-ids-3.0.5"
+      sources."split-1.0.1"
       sources."sprintf-js-1.0.3"
+      sources."sshpk-1.16.1"
+      sources."stack-trace-0.0.9"
       (sources."string-width-2.1.1" // {
         dependencies = [
+          sources."ansi-regex-3.0.0"
+          sources."is-fullwidth-code-point-2.0.0"
           sources."strip-ansi-4.0.0"
         ];
       })
-      (sources."strip-ansi-5.2.0" // {
+      sources."string_decoder-1.1.1"
+      sources."strip-ansi-3.0.1"
+      sources."strip-bom-3.0.0"
+      sources."strip-bom-buf-1.0.0"
+      sources."strip-bom-stream-3.0.0"
+      sources."strip-eof-1.0.0"
+      sources."strip-json-comments-2.0.1"
+      (sources."stylus-0.54.7" // {
         dependencies = [
-          sources."ansi-regex-4.1.0"
+          sources."debug-3.1.0"
+          sources."ms-2.0.0"
+          sources."semver-6.3.0"
+          sources."source-map-0.7.3"
         ];
       })
-      sources."strip-json-comments-3.0.1"
       sources."supports-color-5.5.0"
       (sources."table-5.4.6" // {
         dependencies = [
+          sources."ansi-regex-4.1.0"
+          sources."is-fullwidth-code-point-2.0.0"
           sources."string-width-3.1.0"
+          sources."strip-ansi-5.2.0"
         ];
       })
+      sources."tar-2.2.2"
+      sources."temp-0.8.3"
       sources."text-table-0.2.0"
       sources."through-2.3.8"
+      sources."tiny-emitter-2.1.0"
       sources."tmp-0.0.33"
-      sources."tslib-1.10.0"
+      sources."toml-2.3.6"
+      sources."topsort-0.0.2"
+      (sources."tough-cookie-2.4.3" // {
+        dependencies = [
+          sources."punycode-1.4.1"
+        ];
+      })
+      sources."ts-process-promises-1.0.2"
+      sources."tslib-1.9.3"
+      sources."ttf2woff-2.0.1"
+      sources."ttf2woff2-2.0.3"
+      sources."tunnel-agent-0.6.0"
+      sources."tweetnacl-0.14.5"
       sources."type-check-0.3.2"
+      sources."typed-function-1.1.0"
+      sources."typo-geom-0.5.1"
+      sources."universalify-0.1.2"
+      sources."unorm-1.6.0"
       sources."uri-js-4.2.2"
-      sources."v8-compile-cache-2.1.0"
+      sources."urix-0.1.0"
+      sources."util-deprecate-1.0.2"
+      sources."uuid-3.3.3"
+      sources."validate-npm-package-license-3.0.4"
+      (sources."verda-1.0.0-4" // {
+        dependencies = [
+          sources."ansi-regex-4.1.0"
+          sources."fs-extra-6.0.1"
+          sources."jsonfile-4.0.0"
+          sources."strip-ansi-5.2.0"
+        ];
+      })
+      sources."verror-1.10.0"
       sources."which-1.3.1"
+      sources."which-module-2.0.0"
+      sources."wide-align-1.1.3"
       sources."wordwrap-1.0.0"
+      (sources."wrap-ansi-2.1.0" // {
+        dependencies = [
+          sources."string-width-1.0.2"
+        ];
+      })
       sources."wrappy-1.0.2"
       sources."write-1.0.3"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "An AST-based pattern checker for JavaScript.";
-      homepage = https://eslint.org/;
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
-  stylus = nodeEnv.buildNodePackage {
-    name = "stylus";
-    packageName = "stylus";
-    version = "0.54.7";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/stylus/-/stylus-0.54.7.tgz";
-      sha512 = "Yw3WMTzVwevT6ZTrLCYNHAFmanMxdylelL3hkWNgPMeTCpMwpV3nXjpOHuBXtFv7aiO2xRuQS6OoAdgkNcSNug==";
-    };
-    dependencies = [
-      sources."atob-2.1.2"
-      sources."balanced-match-1.0.0"
-      sources."brace-expansion-1.1.11"
-      sources."concat-map-0.0.1"
-      (sources."css-2.2.4" // {
+      sources."y18n-3.2.1"
+      sources."yallist-2.1.2"
+      (sources."yargs-12.0.5" // {
         dependencies = [
-          sources."source-map-0.6.1"
+          sources."ansi-regex-3.0.0"
+          sources."camelcase-5.3.1"
+          sources."cliui-4.1.0"
+          sources."cross-spawn-6.0.5"
+          sources."execa-1.0.0"
+          sources."find-up-3.0.0"
+          sources."get-stream-4.1.0"
+          sources."invert-kv-2.0.0"
+          sources."lcid-2.0.0"
+          sources."locate-path-3.0.0"
+          sources."mem-4.3.0"
+          sources."mimic-fn-2.1.0"
+          sources."os-locale-3.1.0"
+          sources."p-limit-2.2.1"
+          sources."p-locate-3.0.0"
+          sources."p-try-2.2.0"
+          sources."strip-ansi-4.0.0"
+          sources."yargs-parser-11.1.1"
         ];
       })
-      sources."css-parse-2.0.0"
-      sources."debug-3.1.0"
-      sources."decode-uri-component-0.2.0"
-      sources."fs.realpath-1.0.0"
-      sources."glob-7.1.4"
-      sources."inflight-1.0.6"
-      sources."inherits-2.0.4"
-      sources."minimatch-3.0.4"
-      sources."minimist-0.0.8"
-      sources."mkdirp-0.5.1"
-      sources."ms-2.0.0"
-      sources."once-1.4.0"
-      sources."path-is-absolute-1.0.1"
-      sources."resolve-url-0.2.1"
-      sources."safer-buffer-2.1.2"
-      sources."sax-1.2.4"
-      sources."semver-6.3.0"
-      sources."source-map-0.7.3"
-      sources."source-map-resolve-0.5.2"
-      sources."source-map-url-0.4.0"
-      sources."urix-0.1.0"
-      sources."wrappy-1.0.2"
+      sources."yargs-parser-7.0.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
-      description = "Robust, expressive, and feature-rich CSS superset";
-      homepage = https://github.com/stylus/stylus;
-      license = "MIT";
     };
-    production = true;
+    production = false;
     bypassCache = true;
     reconstructLock = true;
   };
diff --git a/pkgs/data/fonts/iosevka/node-packages.json b/pkgs/data/fonts/iosevka/node-packages.json
index 468f788f9f3..bbbb0c0fc93 100644
--- a/pkgs/data/fonts/iosevka/node-packages.json
+++ b/pkgs/data/fonts/iosevka/node-packages.json
@@ -1,20 +1,3 @@
 [
-    "caryll-shapeops",
-    "libspiro-js",
-    "megaminx",
-    "object-assign",
-    "otfcc-ttcize",
-    "primitive-quadify-off-curves",
-    "toml",
-    "topsort",
-    "ttf2woff",
-    "ttf2woff2",
-    "unorm",
-    "verda",
-    "yargs",
-    "colors",
-    "patel",
-    "patrisika-scopes",
-    "eslint",
-    "stylus"
+  { "iosevka": "https://github.com/be5invis/Iosevka/archive/v2.3.0.tar.gz" }
 ]
-- 
GitLab


From 7406bd28e0994b78626d0a4b6200a03e43fbe87d Mon Sep 17 00:00:00 2001
From: Simon <code@chatts.net>
Date: Sat, 21 Sep 2019 17:58:23 +0100
Subject: [PATCH 0693/2254] Fix Python 3 support for pythonPackages.ncclient
 (#68226)

---
 pkgs/development/python-modules/lxml/default.nix     | 2 +-
 pkgs/development/python-modules/ncclient/default.nix | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix
index 816b3a67682..fca4366e8a0 100644
--- a/pkgs/development/python-modules/lxml/default.nix
+++ b/pkgs/development/python-modules/lxml/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   };
 
   nativeBuildInputs = [ libxml2.dev libxslt.dev ];
-  buildInputs = [ libxml2 libxslt ];
+  propagatedBuildInputs = [ libxml2 libxslt ];
 
   hardeningDisable = stdenv.lib.optional stdenv.isDarwin "format";
 
diff --git a/pkgs/development/python-modules/ncclient/default.nix b/pkgs/development/python-modules/ncclient/default.nix
index 10baadcab30..02e2a1b472a 100644
--- a/pkgs/development/python-modules/ncclient/default.nix
+++ b/pkgs/development/python-modules/ncclient/default.nix
@@ -4,8 +4,6 @@
 , paramiko
 , selectors2
 , lxml
-, libxml2
-, libxslt
 , nose
 , rednose
 }:
@@ -22,7 +20,7 @@ buildPythonPackage rec {
   checkInputs = [ nose rednose ];
 
   propagatedBuildInputs = [
-    paramiko lxml libxml2 libxslt selectors2
+    paramiko lxml selectors2
   ];
 
   checkPhase = ''
-- 
GitLab


From fefd4cb2b39e31f96ef62c20059939441856459b Mon Sep 17 00:00:00 2001
From: Henrik Jonsson <me@hkjn.me>
Date: Wed, 18 Sep 2019 15:52:37 +0200
Subject: [PATCH 0694/2254] pythonPackages.ledgerblue: 0.1.24 -> 0.1.28

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

diff --git a/pkgs/development/python-modules/ledgerblue/default.nix b/pkgs/development/python-modules/ledgerblue/default.nix
index 3f9f58b5203..3e2c1f1356a 100644
--- a/pkgs/development/python-modules/ledgerblue/default.nix
+++ b/pkgs/development/python-modules/ledgerblue/default.nix
@@ -1,18 +1,19 @@
 { stdenv, fetchPypi, buildPythonPackage, hidapi
 , pycrypto, pillow, protobuf, future, ecpy, python-u2flib-host, pycryptodomex
+, websocket_client
 }:
 
 buildPythonPackage rec {
   pname = "ledgerblue";
-  version = "0.1.24";
+  version = "0.1.28";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "fc111ed5db8da93f280928d966f9d87416b464f5f09cec80b60e88c4c1265026";
+    sha256 = "1jfh4gb3f16ga1ircwiyg7dldldmhn0a5slbpqsqr2g6mlqihpmd";
   };
 
   propagatedBuildInputs = [
-    hidapi pycrypto pillow protobuf future ecpy python-u2flib-host pycryptodomex
+    hidapi pycrypto pillow protobuf future ecpy python-u2flib-host pycryptodomex websocket_client
   ];
 
   # No tests
-- 
GitLab


From 1673f3d4585a15a3ec9b6a97da70b7097fc9146c Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Wed, 18 Sep 2019 10:36:16 +0000
Subject: [PATCH 0695/2254] ammonite: add scala-2.13 version

---
 pkgs/development/tools/ammonite/default.nix | 29 +++++++++++----------
 pkgs/top-level/all-packages.nix             |  5 +++-
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix
index ff630242c93..d44a6666ee9 100644
--- a/pkgs/development/tools/ammonite/default.nix
+++ b/pkgs/development/tools/ammonite/default.nix
@@ -1,30 +1,27 @@
-{ stdenv, lib, fetchurl, makeWrapper, jre, gnused
+{ stdenv, fetchurl, jre
 , disableRemoteLogging ? true
 }:
 
 with stdenv.lib;
+
+let
+common = { scalaVersion, sha256 }:
 stdenv.mkDerivation rec {
   pname = "ammonite";
   version = "1.7.1";
-  scalaVersion = "2.12";
 
   src = fetchurl {
     url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}";
-    sha256 = "0isg9flnzc2ldbx6q0lg0xyg9lnvqkd8qhgfln8p1hbzdq0n6jd0";
+    inherit sha256;
   };
 
-  propagatedBuildInputs = [ jre ] ;
-  buildInputs = [ makeWrapper gnused ] ;
-
   phases = "installPhase";
 
   installPhase = ''
-    mkdir -p $out/bin
-    cp ${src} $out/bin/amm
-    chmod +x $out/bin/amm
-    ${gnused}/bin/sed -i '0,/java/{s|java|${jre}/bin/java|}' $out/bin/amm
+    install -Dm755 ${src} $out/bin/amm
+    sed -i '0,/java/{s|java|${jre}/bin/java|}' $out/bin/amm
   '' + optionalString (disableRemoteLogging) ''
-    ${gnused}/bin/sed -i '0,/ammonite.Main/{s|ammonite.Main|ammonite.Main --no-remote-logging|}' $out/bin/amm
+    sed -i '0,/ammonite.Main/{s|ammonite.Main|ammonite.Main --no-remote-logging|}' $out/bin/amm
   '';
 
   meta = {
@@ -36,8 +33,12 @@ stdenv.mkDerivation rec {
         that may be familiar to people coming from IDEs or other REPLs such as IPython or Zsh.
     '';
     homepage = http://www.lihaoyi.com/Ammonite/;
-    license = lib.licenses.mit;
-    platforms = lib.platforms.all;
-    maintainers = [ lib.maintainers.nequissimus ];
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = [ maintainers.nequissimus ];
   };
+};
+in {
+  ammonite_2_12 = common { scalaVersion = "2.12"; sha256 = "0isg9flnzc2ldbx6q0lg0xyg9lnvqkd8qhgfln8p1hbzdq0n6jd0"; };
+  ammonite_2_13 = common { scalaVersion = "2.13"; sha256 = "01dyc6bilhcr1mwrpmhjc8nhzfqgjh44bx36gd3gk9mkvlbys5mp"; };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b3b38355671..b521af8e782 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -576,7 +576,10 @@ in
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  ammonite = callPackage ../development/tools/ammonite {};
+  inherit (callPackages ../development/tools/ammonite {})
+    ammonite_2_12
+    ammonite_2_13;
+  ammonite = if scala == scala_2_12 then ammonite_2_12 else ammonite_2_13;
 
   amp = callPackage ../applications/editors/amp {};
 
-- 
GitLab


From 9641405a4a5cbbfe9aed3b013a29e1cd4206f6b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Sat, 21 Sep 2019 19:41:38 +0200
Subject: [PATCH 0696/2254] consul: 1.6.0 -> 1.6.1

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

diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix
index b7c2e01e97a..e993f70b105 100644
--- a/pkgs/servers/consul/default.nix
+++ b/pkgs/servers/consul/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "consul";
-  version = "1.6.0";
+  version = "1.6.1";
   rev = "v${version}";
 
   goPackagePath = "github.com/hashicorp/consul";
@@ -19,7 +19,7 @@ buildGoPackage rec {
     owner = "hashicorp";
     repo = pname;
     inherit rev;
-    sha256 = "16rngyv9dp19gjbjwfvnmlfxbq67fxs55hgvvcyn9mplm1j0bb52";
+    sha256 = "00dvvxi7y80v2b6wzwyfzhxv1ksnl1m0nmdjl98dhq5ikb0v7p28";
   };
 
   preBuild = ''
-- 
GitLab


From 99aaf5ccb5d39268abb854783bb8ce1dc882584a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Sat, 21 Sep 2019 19:55:30 +0200
Subject: [PATCH 0697/2254] srt: 1.3.3 -> 1.4.0

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

diff --git a/pkgs/development/libraries/srt/default.nix b/pkgs/development/libraries/srt/default.nix
index 5edb2d92b55..74cdf90a156 100644
--- a/pkgs/development/libraries/srt/default.nix
+++ b/pkgs/development/libraries/srt/default.nix
@@ -4,13 +4,13 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   pname = "srt";
-  version = "1.3.3";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "Haivision";
     repo = "srt";
     rev = "v${version}";
-    sha256 = "1dwz7qrkdrbmsbh66rbdx36b60r8whkz0wvf47jfckzsj37d2w22";
+    sha256 = "1rmswx4x3p9pdgnd7vvl3vwgh9rynakjhv1mipy2yid5rb61ajlj";
   };
 
   nativeBuildInputs = [ cmake ];
-- 
GitLab


From f8a8fc6c7c079de430fa528f688ddac781bcef16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sat, 21 Sep 2019 20:05:09 +0200
Subject: [PATCH 0698/2254] Revert "Merge branch 'staging-next'"

This reverts commit 41af38f3728bd64b80721c44ed1fb019978cbc1b, reversing
changes made to f0fec244ca380b9d3e617ee7b419c59758c8b0f1.

Let's delay this.  We have some serious regressions.
---
 doc/languages-frameworks/gnome.xml            | 12 +--
 .../services/networking/networkmanager.nix    |  5 -
 pkgs/applications/gis/grass/default.nix       |  8 +-
 .../graphics/gnome-photos/default.nix         |  2 +-
 .../misc/mysql-workbench/default.nix          |  4 +-
 pkgs/applications/office/kexi/default.nix     |  4 +-
 .../office/libreoffice/default.nix            |  4 +-
 .../applications/office/libreoffice/still.nix |  4 +-
 .../science/electronics/kicad/default.nix     |  2 +-
 .../science/math/glsurf/default.nix           |  4 +-
 pkgs/applications/video/kodi/default.nix      |  4 +-
 .../setup-hooks/wrap-gapps-hook.sh            | 26 ++---
 pkgs/desktops/deepin/dde-daemon/default.nix   |  2 +-
 .../gnome-3/apps/gnome-characters/default.nix |  2 +-
 .../gnome-3/extensions/gsconnect/default.nix  |  4 +-
 pkgs/development/compilers/gerbil/build.nix   |  8 +-
 pkgs/development/compilers/hhvm/default.nix   |  4 +-
 pkgs/development/compilers/neko/default.nix   |  4 +-
 pkgs/development/compilers/urweb/default.nix  |  8 +-
 .../haskell-modules/configuration-nix.nix     |  2 +-
 .../interpreters/perl/sw_vers.patch           |  2 +-
 pkgs/development/interpreters/php/default.nix |  8 +-
 pkgs/development/libraries/cppdb/default.nix  |  6 +-
 pkgs/development/libraries/expat/default.nix  |  6 +-
 pkgs/development/libraries/gdal/2.4.0.nix     |  4 +-
 pkgs/development/libraries/gdal/default.nix   |  4 +-
 .../libraries/giflib/{default.nix => 5.1.nix} | 16 +--
 pkgs/development/libraries/kdb/default.nix    |  4 +-
 .../development/libraries/libagar/default.nix |  6 +-
 .../libraries/libdbi-drivers/default.nix      | 10 +-
 pkgs/development/libraries/libgda/default.nix |  6 +-
 .../libraries/libgdiplus/default.nix          | 24 ++++-
 pkgs/development/libraries/librdf/redland.nix |  4 +-
 .../development/libraries/opendbx/default.nix |  8 +-
 .../development/libraries/openssl/default.nix |  8 +-
 pkgs/development/libraries/poco/default.nix   |  6 +-
 pkgs/development/libraries/qt-3/default.nix   |  6 +-
 .../libraries/qt-4.x/4.8/default.nix          |  6 +-
 .../libraries/qt-5/modules/qtbase.nix         | 12 +--
 pkgs/development/libraries/tntdb/default.nix  |  4 +-
 .../libraries/unixODBCDrivers/default.nix     | 17 ++--
 pkgs/development/libraries/wt/default.nix     |  6 +-
 .../quicklisp-to-nix-overrides.nix            |  8 +-
 pkgs/development/lisp-modules/shell.nix       |  4 +-
 pkgs/development/lua-modules/overrides.nix    |  6 +-
 .../ocaml-modules/mysql/default.nix           |  4 +-
 .../perl-modules/DBD-mysql/default.nix        |  4 +-
 .../development/pure-modules/glpk/default.nix |  6 +-
 .../python-modules/cryptography/default.nix   | 11 +--
 .../python-modules/mysqlclient/default.nix    |  6 +-
 .../python-modules/pyopenssl/default.nix      |  3 +-
 pkgs/development/r-modules/default.nix        |  4 +-
 .../ruby-modules/gem-config/default.nix       |  6 +-
 .../tools/misc/patchelf/default.nix           | 19 +---
 .../tools/misc/patchelf/unstable.nix          | 26 +++--
 .../tools/misc/sysbench/default.nix           |  4 +-
 pkgs/development/tools/tora/default.nix       |  6 +-
 pkgs/games/zod/default.nix                    |  6 +-
 .../linux/firmware/fwupd/default.nix          |  6 +-
 pkgs/os-specific/linux/kexectools/default.nix |  2 +-
 pkgs/servers/clickhouse/default.nix           |  4 +-
 pkgs/servers/computing/slurm/default.nix      |  4 +-
 pkgs/servers/freeradius/default.nix           |  6 +-
 pkgs/servers/http/lighttpd/default.nix        |  6 +-
 pkgs/servers/mail/dovecot/default.nix         |  4 +-
 pkgs/servers/mail/exim/default.nix            | 12 +--
 pkgs/servers/mail/opensmtpd/extras.nix        |  6 +-
 pkgs/servers/mail/postfix/default.nix         |  6 +-
 pkgs/servers/monitoring/plugins/default.nix   |  4 +-
 pkgs/servers/monitoring/zabbix/proxy.nix      |  4 +-
 pkgs/servers/monitoring/zabbix/server.nix     |  4 +-
 pkgs/servers/sql/mariadb/connector-c/3_1.nix  |  6 --
 .../sql/mariadb/connector-c/default.nix       | 54 ----------
 pkgs/servers/sql/mariadb/default.nix          | 98 +++++++++++++++++++
 pkgs/servers/sql/mariadb/galera/25.nix        |  6 --
 pkgs/servers/sql/mariadb/galera/default.nix   | 63 ------------
 pkgs/servers/uwsgi/default.nix                |  4 +-
 pkgs/tools/backup/bareos/default.nix          |  8 +-
 pkgs/tools/backup/mydumper/default.nix        |  4 +-
 pkgs/tools/graphics/zbar/default.nix          |  4 +-
 pkgs/tools/networking/kea/default.nix         |  6 +-
 pkgs/tools/networking/mailutils/default.nix   |  8 +-
 pkgs/tools/networking/maxscale/default.nix    |  6 +-
 .../networking/modem-manager/default.nix      |  7 ++
 .../networking/network-manager/default.nix    |  5 +
 pkgs/tools/security/thc-hydra/default.nix     |  4 +-
 pkgs/tools/system/collectd/default.nix        |  4 +-
 pkgs/tools/system/rsyslog/default.nix         |  6 +-
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               | 24 ++---
 90 files changed, 367 insertions(+), 428 deletions(-)
 rename pkgs/development/libraries/giflib/{default.nix => 5.1.nix} (54%)
 delete mode 100644 pkgs/servers/sql/mariadb/connector-c/3_1.nix
 delete mode 100644 pkgs/servers/sql/mariadb/connector-c/default.nix
 delete mode 100644 pkgs/servers/sql/mariadb/galera/25.nix
 delete mode 100644 pkgs/servers/sql/mariadb/galera/default.nix

diff --git a/doc/languages-frameworks/gnome.xml b/doc/languages-frameworks/gnome.xml
index 8b3151d5bf9..9e0f21a6c74 100644
--- a/doc/languages-frameworks/gnome.xml
+++ b/doc/languages-frameworks/gnome.xml
@@ -210,7 +210,7 @@ mkDerivation {
   dontWrapGApps = true;
 
   # Arguments to be passed to `makeWrapper`, only used by qt5’s mkDerivation
-  qtWrapperArgs = [
+  qtWrapperArgs [
     "\${gappsWrapperArgs[@]}"
   ];
 }
@@ -258,16 +258,6 @@ mkDerivation {
      </para>
     </listitem>
    </varlistentry>
-   <varlistentry xml:id="ssec-gnome-common-issues-weird-location">
-    <term>
-     I need to wrap a binary outside <filename>bin</filename> and <filename>libexec</filename> directories.
-    </term>
-    <listitem>
-     <para>
-      You can manually trigger the wrapping with <function>wrapGApp</function> in <literal>preFixup</literal> phase. It takes a path to a program as a first argument; the remaining arguments are passed directly to <function xlink:href="#fun-wrapProgram">wrapProgram</function> function.
-     </para>
-    </listitem>
-   </varlistentry>
   </variablelist>
  </section>
 </section>
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index db047e6d0b8..db4d0e328e2 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -468,16 +468,12 @@ in {
         mkdir -m 700 -p /etc/ipsec.d
         mkdir -m 755 -p ${stateDirs}
       '';
-
-      aliases = [ "dbus-org.freedesktop.NetworkManager.service" ];
     };
 
     systemd.services.NetworkManager-wait-online = {
       wantedBy = [ "network-online.target" ];
     };
 
-    systemd.services.ModemManager.aliases = [ "dbus-org.freedesktop.ModemManager1.service" ];
-
     systemd.services.nm-setup-hostsdirs = mkIf dynamicHostsEnabled {
       wantedBy = [ "NetworkManager.service" ];
       before = [ "NetworkManager.service" ];
@@ -499,7 +495,6 @@ in {
 
       # useful binaries for user-specified hooks
       path = [ pkgs.iproute pkgs.utillinux pkgs.coreutils ];
-      aliases = [ "dbus-org.freedesktop.nm-dispatcher.service" ];
     };
 
     # Turn off NixOS' network management when networking is managed entirely by NetworkManager
diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix
index 562a5e616a3..360d94d1b82 100644
--- a/pkgs/applications/gis/grass/default.nix
+++ b/pkgs/applications/gis/grass/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, flex, bison, pkgconfig, zlib, libtiff, libpng, fftw
 , cairo, readline, ffmpeg, makeWrapper, wxGTK30, netcdf, blas
-, proj, gdal, geos, sqlite, postgresql, libmysqlclient, python2Packages, libLAS, proj-datumgrid
+, proj, gdal, geos, sqlite, postgresql, mysql, python2Packages, libLAS, proj-datumgrid
 }:
 
 stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite cairo proj
-  readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql libmysqlclient blas
+  readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql mysql.connector-c blas
   libLAS proj-datumgrid ]
     ++ (with python2Packages; [ python dateutil wxPython30 numpy ]);
 
@@ -37,8 +37,8 @@ stdenv.mkDerivation rec {
     "--with-postgres-libs=${postgresql.lib}/lib/"
     # it complains about missing libmysqld but doesn't really seem to need it
     "--with-mysql"
-    "--with-mysql-includes=${libmysqlclient}/include/mysql"
-    "--with-mysql-libs=${libmysqlclient}/lib/mysql"
+    "--with-mysql-includes=${mysql.connector-c}/include/mysql"
+    "--with-mysql-libs=${mysql.connector-c}/lib/mysql"
     "--with-blas"
     "--with-liblas=${libLAS}/bin/liblas-config"
   ];
diff --git a/pkgs/applications/graphics/gnome-photos/default.nix b/pkgs/applications/graphics/gnome-photos/default.nix
index ea4cf986f39..f591dd5a60d 100644
--- a/pkgs/applications/graphics/gnome-photos/default.nix
+++ b/pkgs/applications/graphics/gnome-photos/default.nix
@@ -102,7 +102,7 @@ stdenv.mkDerivation rec {
   '';
 
   postFixup = ''
-    wrapGApp "${placeholder "installedTests"}/libexec/installed-tests/gnome-photos/basic.py"
+    wrapProgram "${placeholder "installedTests"}/libexec/installed-tests/gnome-photos/basic.py" "''${gappsWrapperArgs[@]}"
   '';
 
   passthru = {
diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix
index 135745feec3..172f999223a 100644
--- a/pkgs/applications/misc/mysql-workbench/default.nix
+++ b/pkgs/applications/misc/mysql-workbench/default.nix
@@ -85,8 +85,8 @@ in stdenv.mkDerivation rec {
     find -L "$out/bin" -type f -executable -print0 \
       | while IFS= read -r -d ''' file; do
       if [[ "''${file}" != *-bin ]]; then
-        echo "Wrapping program $file"
-        wrapGApp "$file"
+        echo "Wrapping program ''${file}"
+        wrapProgram "''${file}" "''${gappsWrapperArgs[@]}"
       fi
     done
   '';
diff --git a/pkgs/applications/office/kexi/default.nix b/pkgs/applications/office/kexi/default.nix
index 8db7068f7cf..83515de4990 100644
--- a/pkgs/applications/office/kexi/default.nix
+++ b/pkgs/applications/office/kexi/default.nix
@@ -4,7 +4,7 @@
   breeze-icons, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets, kcoreaddons,
   kcrash, kguiaddons, ki18n, kiconthemes, kitemviews, kio, ktexteditor, ktextwidgets,
   kwidgetsaddons, kxmlgui,
-  kdb, kproperty, kreport, lcms2, libmysqlclient, marble, postgresql
+  kdb, kproperty, kreport, lcms2, mysql, marble, postgresql
 }:
 
 mkDerivation rec {
@@ -23,7 +23,7 @@ mkDerivation rec {
     breeze-icons karchive kcodecs kcompletion kconfig kconfigwidgets kcoreaddons
     kcrash kguiaddons ki18n kiconthemes kitemviews kio ktexteditor ktextwidgets
     kwidgetsaddons kxmlgui
-    kdb kproperty kreport lcms2 libmysqlclient marble postgresql
+    kdb kproperty kreport lcms2 mysql.connector-c marble postgresql
   ];
 
   propagatedUserEnvPkgs = [ kproperty ];
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index a459302177b..f5f53e10496 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -4,7 +4,7 @@
 , bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which
 , icu, boost, jdk, ant, cups, xorg, libcmis, fontforge
 , openssl, gperf, cppunit, GConf, ORBit2, poppler, utillinux
-, librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw, libmysqlclient
+, librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw, mysql
 , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
 , libwpg, dbus-glib, qt4, clucene_core, libcdr, lcms, vigra
 , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio
@@ -361,7 +361,7 @@ in stdenv.mkDerivation rec {
       libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11
       libXaw libXext libXi libXinerama libxml2 libxslt libXtst
       libXdmcp libpthreadstubs libGLU_combined mythes gst_all_1.gstreamer
-      gst_all_1.gst-plugins-base glib libmysqlclient
+      gst_all_1.gst-plugins-base glib mysql.connector-c
       neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler
       python3 sablotron sane-backends unzip vigra which zip zlib
       mdds bluez5 libcmis libwps libabw libzmf
diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix
index 4739d526558..eb774a30941 100644
--- a/pkgs/applications/office/libreoffice/still.nix
+++ b/pkgs/applications/office/libreoffice/still.nix
@@ -4,7 +4,7 @@
 , bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which
 , icu, boost, jdk, ant, cups, xorg, libcmis, fontforge
 , openssl, gperf, cppunit, GConf, ORBit2, poppler, utillinux
-, librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw, libmysqlclient
+, librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw, mysql
 , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
 , libwpg, dbus-glib, qt4, clucene_core, libcdr, lcms, vigra
 , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio
@@ -358,7 +358,7 @@ in stdenv.mkDerivation rec {
       libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11
       libXaw libXext libXi libXinerama libxml2 libxslt libXtst
       libXdmcp libpthreadstubs libGLU_combined mythes gst_all_1.gstreamer
-      gst_all_1.gst-plugins-base glib libmysqlclient
+      gst_all_1.gst-plugins-base glib mysql.connector-c
       neon nspr nss openldap openssl ORBit2 pam perl poppler
       python3 sablotron sane-backends unzip vigra which zip zlib
       mdds bluez5 libcmis libwps libabw libzmf
diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix
index bd57e355c75..f31dd0daa5c 100644
--- a/pkgs/applications/science/electronics/kicad/default.nix
+++ b/pkgs/applications/science/electronics/kicad/default.nix
@@ -107,7 +107,7 @@ in stdenv.mkDerivation rec {
     buildPythonPath "$out $pythonPath"
     gappsWrapperArgs+=(--set PYTHONPATH "$program_PYTHONPATH")
 
-    wrapGApp "$out/bin/kicad"
+    wrapProgram "$out/bin/kicad" "''${gappsWrapperArgs[@]}"
   '';
 
   meta = {
diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix
index 1cd5e364208..4de683cdce9 100644
--- a/pkgs/applications/science/math/glsurf/default.nix
+++ b/pkgs/applications/science/math/glsurf/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, ocamlPackages, libGLU_combined, freeglut
-, libmysqlclient, mpfr, gmp, libtiff, libjpeg, libpng, giflib
+, mysql, mpfr, gmp, libtiff, libjpeg, libpng, giflib
 }:
 
 stdenv.mkDerivation {
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
     sha256 = "0w8xxfnw2snflz8wdr2ca9f5g91w5vbyp1hwlx1v7vg83d4bwqs7";
   };
 
-  buildInputs = [ freeglut libGLU_combined libmysqlclient mpfr gmp
+  buildInputs = [ freeglut libGLU_combined mysql.connector-c mpfr gmp
     libtiff libjpeg libpng giflib ]
   ++ (with ocamlPackages; [
     ocaml findlib ocaml_mysql lablgl camlimages_4_0 mlgmpidl
diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index 7953cde2413..773c63b0036 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -13,7 +13,7 @@
 , libmpeg2, libsamplerate, libmad
 , libogg, libvorbis, flac, libxslt
 , lzo, libcdio, libmodplug, libass, libbluray
-, sqlite, libmysqlclient, nasm, gnutls, libva, libdrm
+, sqlite, mysql, nasm, gnutls, libva, libdrm
 , curl, bzip2, zip, unzip, glxinfo, xdpyinfo
 , libcec, libcec_platform, dcadec, libuuid
 , libcrossguid, libmicrohttpd
@@ -161,7 +161,7 @@ in stdenv.mkDerivation {
       libmpeg2 libsamplerate libmad
       libogg libvorbis flac libxslt systemd
       lzo libcdio libmodplug libass libbluray
-      sqlite libmysqlclient avahi lame
+      sqlite mysql.connector-c avahi lame
       curl bzip2 zip unzip glxinfo xdpyinfo
       libcec libcec_platform dcadec libuuid
       libgcrypt libgpgerror libunistring
diff --git a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
index 717740f1f20..906b1db9d10 100644
--- a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
+++ b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
@@ -1,19 +1,12 @@
-# shellcheck shell=bash
 gappsWrapperArgs=()
 
 find_gio_modules() {
-    if [ -d "$1/lib/gio/modules" ] && [ -n "$(ls -A "$1/lib/gio/modules")" ] ; then
+    if [ -d "$1"/lib/gio/modules ] && [ -n "$(ls -A $1/lib/gio/modules)" ] ; then
         gappsWrapperArgs+=(--prefix GIO_EXTRA_MODULES : "$1/lib/gio/modules")
     fi
 }
 
-addEnvHooks "${targetOffset:?}" find_gio_modules
-
-wrapGApp() {
-    local program="$1"
-    shift 1
-    wrapProgram "$program" "${gappsWrapperArgs[@]}" "$@"
-}
+addEnvHooks "$targetOffset" find_gio_modules
 
 # Note: $gappsWrapperArgs still gets defined even if $dontWrapGApps is set.
 wrapGAppsHook() {
@@ -33,19 +26,20 @@ wrapGAppsHook() {
     gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH")
   fi
 
-  if [ -d "${prefix:?}/share" ]; then
+  if [ -d "$prefix/share" ]; then
     gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$prefix/share")
   fi
 
-  if [ -d "$prefix/lib/gio/modules" ] && [ -n "$(ls -A "$prefix/lib/gio/modules")" ] ; then
+  if [ -d "$prefix/lib/gio/modules" ] && [ -n "$(ls -A $prefix/lib/gio/modules)" ] ; then
     gappsWrapperArgs+=(--prefix GIO_EXTRA_MODULES : "$prefix/lib/gio/modules")
   fi
 
-  for v in ${wrapPrefixVariables:-} GST_PLUGIN_SYSTEM_PATH_1_0 GI_TYPELIB_PATH GRL_PLUGIN_PATH; do
-    gappsWrapperArgs+=(--prefix "$v" : "${!v}")
+  for v in $wrapPrefixVariables GST_PLUGIN_SYSTEM_PATH_1_0 GI_TYPELIB_PATH GRL_PLUGIN_PATH; do
+    eval local dummy="\$$v"
+    gappsWrapperArgs+=(--prefix $v : "$dummy")
   done
 
-  if [[ -z "${dontWrapGApps:-}" ]]; then
+  if [[ -z "$dontWrapGApps" ]]; then
     targetDirsThatExist=()
     targetDirsRealPath=()
 
@@ -58,7 +52,7 @@ wrapGAppsHook() {
         find "${targetDir}" -type f -executable -print0 \
           | while IFS= read -r -d '' file; do
           echo "Wrapping program '${file}'"
-          wrapGApp "${file}"
+          wrapProgram "${file}" "${gappsWrapperArgs[@]}"
         done
       fi
     done
@@ -77,7 +71,7 @@ wrapGAppsHook() {
           fi
         done
         echo "Wrapping link: '$linkPath'"
-        wrapGApp "${linkPath}"
+        wrapProgram "${linkPath}" "${gappsWrapperArgs[@]}"
       done
     fi
   fi
diff --git a/pkgs/desktops/deepin/dde-daemon/default.nix b/pkgs/desktops/deepin/dde-daemon/default.nix
index da217186e27..19089a6b050 100644
--- a/pkgs/desktops/deepin/dde-daemon/default.nix
+++ b/pkgs/desktops/deepin/dde-daemon/default.nix
@@ -115,7 +115,7 @@ buildGoPackage rec {
   postFixup = ''
     # wrapGAppsHook does not work with binaries outside of $out/bin or $out/libexec
     for binary in $out/lib/deepin-daemon/*; do
-      wrapGApp "$binary"
+      wrapProgram $binary "''${gappsWrapperArgs[@]}"
     done
 
     searchHardCodedPaths $out  # debugging
diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
index 9e44573d2e3..ac1e9ee85c0 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
       sed -e $"2iimports.package._findEffectiveEntryPointName = () => \'$(basename $file)\' " \
         -i $file
 
-      wrapGApp "$file"
+      wrapProgram $file "''${gappsWrapperArgs[@]}"
     done
   '';
 
diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
index cef00513df1..cff0db665bb 100644
--- a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
@@ -76,8 +76,8 @@ stdenv.mkDerivation rec {
   postFixup = ''
     # Let’s wrap the daemons
     for file in $out/share/gnome-shell/extensions/gsconnect@andyholmes.github.io/service/{{daemon,nativeMessagingHost}.js,components/folks.py}; do
-      echo "Wrapping program $file"
-      wrapGApp "$file"
+      echo "Wrapping program ''${file}"
+      wrapProgram "''${file}" "''${gappsWrapperArgs[@]}"
     done
   '';
 
diff --git a/pkgs/development/compilers/gerbil/build.nix b/pkgs/development/compilers/gerbil/build.nix
index b5ccbca6f7e..9ef650c330f 100644
--- a/pkgs/development/compilers/gerbil/build.nix
+++ b/pkgs/development/compilers/gerbil/build.nix
@@ -1,6 +1,6 @@
 { stdenv, makeStaticLibraries,
   coreutils, rsync, bash,
-  openssl, zlib, sqlite, libxml2, libyaml, libmysqlclient, lmdb, leveldb, postgresql,
+  openssl, zlib, sqlite, libxml2, libyaml, mysql, lmdb, leveldb, postgresql,
   version, git-version, gambit, src }:
 
 # TODO: distinct packages for gerbil-release and gerbil-devel
@@ -12,13 +12,13 @@ stdenv.mkDerivation rec {
   inherit src;
 
   # Use makeStaticLibraries to enable creation of statically linked binaries
-  buildInputs_libraries = [ openssl zlib sqlite libxml2 libyaml libmysqlclient lmdb leveldb postgresql ];
+  buildInputs_libraries = [ openssl zlib sqlite libxml2 libyaml mysql.connector-c lmdb leveldb postgresql ];
   buildInputs_staticLibraries = map makeStaticLibraries buildInputs_libraries;
 
   buildInputs = [ gambit rsync bash ]
     ++ buildInputs_libraries ++ buildInputs_staticLibraries;
 
-  NIX_CFLAGS_COMPILE = [ "-I${libmysqlclient}/include/mysql" "-L${libmysqlclient}/lib/mysql" ];
+  NIX_CFLAGS_COMPILE = [ "-I${mysql.connector-c}/include/mysql" "-L${mysql.connector-c}/lib/mysql" ];
 
   postPatch = ''
     echo '(define (gerbil-version-string) "v${git-version}")' > src/gerbil/runtime/gx-version.scm
@@ -40,7 +40,7 @@ ZLIB=${makeStaticLibraries zlib}/lib/libz.a
 # SQLITE=${makeStaticLibraries sqlite}/lib/sqlite.a # MISSING!
 # LIBXML2=${makeStaticLibraries libxml2}/lib/libxml2.a # MISSING!
 # YAML=${makeStaticLibraries libyaml}/lib/libyaml.a # MISSING!
-MYSQL=${makeStaticLibraries libmysqlclient}/lib/mariadb/libmariadb.a
+MYSQL=${makeStaticLibraries mysql.connector-c}/lib/mariadb/libmariadb.a
 # LMDB=${makeStaticLibraries lmdb}/lib/mysql/libmysqlclient_r.a # MISSING!
 LEVELDB=${makeStaticLibraries lmdb}/lib/libleveldb.a
 EOF
diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix
index 7066744bb54..24e88f9ee2e 100644
--- a/pkgs/development/compilers/hhvm/default.nix
+++ b/pkgs/development/compilers/hhvm/default.nix
@@ -2,7 +2,7 @@
 , pcre, libevent, gd, curl, libxml2, icu, flex, bison, openssl, zlib, php
 , expat, libcap, oniguruma, libdwarf, libmcrypt, tbb, gperftools, glog, libkrb5
 , bzip2, openldap, readline, libelf, uwimap, binutils, cyrus_sasl, pam, libpng
-, libxslt, freetype, gdb, git, perl, libmysqlclient, gmp, libyaml, libedit
+, libxslt, freetype, gdb, git, perl, mysql, gmp, libyaml, libedit
 , libvpx, imagemagick, fribidi, gperf, which, ocamlPackages
 }:
 
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs =
-    [ cmake pkgconfig boost libunwind libmysqlclient libmemcached pcre gdb git perl
+    [ cmake pkgconfig boost libunwind mysql.connector-c libmemcached pcre gdb git perl
       libevent gd curl libxml2 icu flex bison openssl zlib php expat libcap
       oniguruma libdwarf libmcrypt tbb gperftools bzip2 openldap readline
       libelf uwimap binutils cyrus_sasl pam glog libpng libxslt libkrb5
diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/development/compilers/neko/default.nix
index 79c4aacbed5..74ccaac388f 100644
--- a/pkgs/development/compilers/neko/default.nix
+++ b/pkgs/development/compilers/neko/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, boehmgc, zlib, sqlite, pcre, cmake, pkgconfig
-, git, apacheHttpd, apr, aprutil, libmysqlclient, mbedtls, openssl, pkgs, gtk2, libpthreadstubs
+, git, apacheHttpd, apr, aprutil, mysql, mbedtls, openssl, pkgs, gtk2, libpthreadstubs
 }:
 
 stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake pkgconfig git ];
   buildInputs =
     [ boehmgc zlib sqlite pcre apacheHttpd apr aprutil
-      libmysqlclient mbedtls openssl libpthreadstubs ]
+      mysql.connector-c mbedtls openssl libpthreadstubs ]
       ++ stdenv.lib.optional stdenv.isLinux gtk2
       ++ stdenv.lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.Security
                                                 pkgs.darwin.apple_sdk.frameworks.Carbon];
diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix
index 31381aac741..01d4972a55d 100644
--- a/pkgs/development/compilers/urweb/default.nix
+++ b/pkgs/development/compilers/urweb/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, file, openssl, mlton
-, libmysqlclient, postgresql, sqlite, gcc, icu
+, mysql, postgresql, sqlite, gcc, icu
 }:
 
 stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "1cl0x0sy7w1lazszc8q06q3wx0x0rczxh27vimrsw54s6s9y096s";
   };
 
-  buildInputs = [ openssl mlton libmysqlclient postgresql sqlite icu ];
+  buildInputs = [ openssl mlton mysql.connector-c postgresql sqlite icu ];
 
   prePatch = ''
     sed -e 's@/usr/bin/file@${file}/bin/file@g' -i configure
@@ -21,13 +21,13 @@ stdenv.mkDerivation rec {
 
   preConfigure = ''
     export PGHEADER="${postgresql}/include/libpq-fe.h";
-    export MSHEADER="${libmysqlclient}/include/mysql/mysql.h";
+    export MSHEADER="${mysql.connector-c}/include/mysql/mysql.h";
     export SQHEADER="${sqlite.dev}/include/sqlite3.h";
 
     export CC="${gcc}/bin/gcc";
     export CCARGS="-I$out/include \
                    -L${openssl.out}/lib \
-                   -L${libmysqlclient}/lib \
+                   -L${mysql.connector-c}/lib \
                    -L${postgresql.lib}/lib \
                    -L${sqlite.out}/lib";
   '';
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 91fdb1ece27..5db25686fc6 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -53,7 +53,7 @@ self: super: builtins.intersectAttrs super {
 
   # Use the default version of mysql to build this package (which is actually mariadb).
   # test phase requires networking
-  mysql = dontCheck (super.mysql.override { mysql = pkgs.libmysqlclient; });
+  mysql = dontCheck (super.mysql.override { mysql = pkgs.mysql.connector-c; });
 
   # CUDA needs help finding the SDK headers and libraries.
   cuda = overrideCabal super.cuda (drv: {
diff --git a/pkgs/development/interpreters/perl/sw_vers.patch b/pkgs/development/interpreters/perl/sw_vers.patch
index 2e30dba9292..9d4cd75486e 100644
--- a/pkgs/development/interpreters/perl/sw_vers.patch
+++ b/pkgs/development/interpreters/perl/sw_vers.patch
@@ -7,7 +7,7 @@ index afadf53..80b7533 100644
      # "ProductVersion:    10.10.5"   "10.10"
      # "ProductVersion:    10.11"     "10.11"
 -        prodvers=`sw_vers|awk '/^ProductVersion:/{print $2}'|awk -F. '{print $1"."$2}'`
-+        prodvers="${MACOSX_DEPLOYMENT_TARGET:-10.12}"
++        prodvers="10.10"
      case "$prodvers" in
      10.*)
        add_macosx_version_min ccflags $prodvers
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 508339d0da6..9a82868b7b3 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -1,6 +1,6 @@
 # pcre functionality is tested in nixos/tests/php-pcre.nix
 { lib, stdenv, fetchurl, autoconf, bison, libtool, pkgconfig, re2c
-, libmysqlclient, libxml2, readline, zlib, curl, postgresql, gettext
+, mysql, libxml2, readline, zlib, curl, postgresql, gettext
 , openssl, pcre, pcre2, sqlite, config, libjpeg, libpng, freetype
 , libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, unixODBC
 , uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium, html-tidy, libargon2
@@ -64,7 +64,7 @@ let
   }:
 
     let
-      mysqlBuildInputs = optional (!mysqlndSupport) libmysqlclient;
+      mysqlBuildInputs = optional (!mysqlndSupport) mysql.connector-c;
       libmcrypt' = libmcrypt.override { disablePosixThreads = true; };
     in stdenv.mkDerivation {
 
@@ -149,9 +149,9 @@ let
       ++ optional postgresqlSupport "--with-pgsql=${postgresql}"
       ++ optional pdo_odbcSupport "--with-pdo-odbc=unixODBC,${unixODBC}"
       ++ optional pdo_pgsqlSupport "--with-pdo-pgsql=${postgresql}"
-      ++ optional pdo_mysqlSupport "--with-pdo-mysql=${if mysqlndSupport then "mysqlnd" else libmysqlclient}"
+      ++ optional pdo_mysqlSupport "--with-pdo-mysql=${if mysqlndSupport then "mysqlnd" else mysql.connector-c}"
       ++ optionals mysqliSupport [
-        "--with-mysqli=${if mysqlndSupport then "mysqlnd" else "${libmysqlclient}/bin/mysql_config"}"
+        "--with-mysqli=${if mysqlndSupport then "mysqlnd" else "${mysql.connector-c}/bin/mysql_config"}"
       ]
       ++ optional ( pdo_mysqlSupport || mysqliSupport ) "--with-mysql-sock=/run/mysqld/mysqld.sock"
       ++ optional bcmathSupport "--enable-bcmath"
diff --git a/pkgs/development/libraries/cppdb/default.nix b/pkgs/development/libraries/cppdb/default.nix
index a21b3cc93fa..737122c57bf 100644
--- a/pkgs/development/libraries/cppdb/default.nix
+++ b/pkgs/development/libraries/cppdb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, sqlite, libmysqlclient, postgresql, unixODBC }:
+{ stdenv, fetchurl, cmake, sqlite, mysql, postgresql, unixODBC }:
 
 stdenv.mkDerivation rec {
   pname = "cppdb";
@@ -11,10 +11,10 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  buildInputs = [ cmake sqlite libmysqlclient postgresql unixODBC ];
+  buildInputs = [ cmake sqlite mysql.connector-c postgresql unixODBC ];
 
   cmakeFlags = [ "--no-warn-unused-cli" ];
-  NIX_CFLAGS_COMPILE = [ "-I${libmysqlclient}/include/mysql" "-L${libmysqlclient}/lib/mysql" ];
+  NIX_CFLAGS_COMPILE = [ "-I${mysql.connector-c}/include/mysql" "-L${mysql.connector-c}/lib/mysql" ];
 
   meta = with stdenv.lib; {
     homepage = http://cppcms.com/sql/cppdb/;
diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix
index bb86ac57832..ef257401945 100644
--- a/pkgs/development/libraries/expat/default.nix
+++ b/pkgs/development/libraries/expat/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "expat-2.2.8";
+  name = "expat-2.2.7";
 
   src = fetchurl {
-    url = "https://github.com/libexpat/libexpat/releases/download/R_2_2_8/${name}.tar.xz";
-    sha256 = "16vpj5mk3lps3x7fr8cs03rffx3ir4jilyqw0frayn6q94daijk1";
+    url = "mirror://sourceforge/expat/${name}.tar.bz2";
+    sha256 = "067cfhqwiswm4zynw7xaxl59mrrimaiyjhnn8byxma1i98pi1jfb";
   };
 
   outputs = [ "out" "dev" ]; # TODO: fix referrers
diff --git a/pkgs/development/libraries/gdal/2.4.0.nix b/pkgs/development/libraries/gdal/2.4.0.nix
index d41b4c55f86..baf847d4e0a 100644
--- a/pkgs/development/libraries/gdal/2.4.0.nix
+++ b/pkgs/development/libraries/gdal/2.4.0.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchpatch, unzip, libjpeg, libtiff, zlib
-, postgresql, libmysqlclient, libgeotiff, pythonPackages, proj, geos, openssl
+, postgresql, mysql, libgeotiff, pythonPackages, proj, geos, openssl
 , libpng, sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat
 , libiconv, libxml2
 , netcdfSupport ? true, netcdf, hdf5, curl
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     "--with-poppler=${poppler.dev}" # optional
     "--with-libz=${zlib.dev}"       # optional
     "--with-pg=${postgresql}/bin/pg_config"
-    "--with-mysql=${libmysqlclient}/bin/mysql_config"
+    "--with-mysql=${mysql.connector-c or mysql}/bin/mysql_config"
     "--with-geotiff=${libgeotiff.dev}"
     "--with-sqlite3=${sqlite.dev}"
     "--with-spatialite=${libspatialite}"
diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix
index bb53277075f..413d4e19dde 100644
--- a/pkgs/development/libraries/gdal/default.nix
+++ b/pkgs/development/libraries/gdal/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, fetchpatch, unzip, libjpeg, libtiff, zlib
-, postgresql, libmysqlclient, libgeotiff, pythonPackages, proj, geos, openssl
+, postgresql, mysql, libgeotiff, pythonPackages, proj, geos, openssl
 , libpng, sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat
 , libiconv, libxml2, autoreconfHook
 , netcdfSupport ? true, netcdf, hdf5, curl
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     "--with-poppler=${poppler.dev}" # optional
     "--with-libz=${zlib.dev}"       # optional
     "--with-pg=${postgresql}/bin/pg_config"
-    "--with-mysql=${libmysqlclient}/bin/mysql_config"
+    "--with-mysql=${mysql.connector-c or mysql}/bin/mysql_config"
     "--with-geotiff=${libgeotiff}"
     "--with-sqlite3=${sqlite.dev}"
     "--with-spatialite=${libspatialite}"
diff --git a/pkgs/development/libraries/giflib/default.nix b/pkgs/development/libraries/giflib/5.1.nix
similarity index 54%
rename from pkgs/development/libraries/giflib/default.nix
rename to pkgs/development/libraries/giflib/5.1.nix
index d97477e3f3a..fee760b3ea2 100644
--- a/pkgs/development/libraries/giflib/default.nix
+++ b/pkgs/development/libraries/giflib/5.1.nix
@@ -1,24 +1,18 @@
 {stdenv, fetchurl, xmlto, docbook_xml_dtd_412, docbook_xsl, libxml2 }:
 
-stdenv.mkDerivation rec {
-  name = "giflib-5.2.1";
+stdenv.mkDerivation {
+  name = "giflib-5.1.4";
   src = fetchurl {
-    url = "mirror://sourceforge/giflib/${name}.tar.gz";
-    sha256 = "1gbrg03z1b6rlrvjyc6d41bc8j1bsr7rm8206gb1apscyii5bnii";
+    url = mirror://sourceforge/giflib/giflib-5.1.4.tar.bz2;
+    sha256 = "1md83dip8rf29y40cm5r7nn19705f54iraz6545zhwa6y8zyq9yz";
   };
 
-  postPatch = ''
-    substituteInPlace Makefile \
-      --replace 'PREFIX = /usr/local' 'PREFIX = ${builtins.placeholder "out"}'
-  '';
-
   buildInputs = [ xmlto docbook_xml_dtd_412 docbook_xsl libxml2 ];
-
   meta = {
     description = "A library for reading and writing gif images";
     platforms = stdenv.lib.platforms.unix;
     license = stdenv.lib.licenses.mit;
     maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
-    branch = "5.2";
+    branch = "5.1";
   };
 }
diff --git a/pkgs/development/libraries/kdb/default.nix b/pkgs/development/libraries/kdb/default.nix
index 03eabc6447b..4a403a19964 100644
--- a/pkgs/development/libraries/kdb/default.nix
+++ b/pkgs/development/libraries/kdb/default.nix
@@ -1,7 +1,7 @@
 {
   mkDerivation, lib, fetchurl,
   extra-cmake-modules,
-  qtbase, qttranslations, kcoreaddons, python2, sqlite, postgresql, libmysqlclient
+  qtbase, qttranslations, kcoreaddons, python2, sqlite, postgresql, mysql
 }:
 
 mkDerivation rec {
@@ -15,7 +15,7 @@ mkDerivation rec {
 
   nativeBuildInputs = [ extra-cmake-modules ];
 
-  buildInputs = [ qttranslations kcoreaddons python2 sqlite postgresql libmysqlclient ];
+  buildInputs = [ qttranslations kcoreaddons python2 sqlite postgresql mysql.connector-c ];
 
   propagatedBuildInputs = [ qtbase ];
 
diff --git a/pkgs/development/libraries/libagar/default.nix b/pkgs/development/libraries/libagar/default.nix
index 630b1712158..48fb0f1153e 100644
--- a/pkgs/development/libraries/libagar/default.nix
+++ b/pkgs/development/libraries/libagar/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, libtool, perl, bsdbuild, gettext, mandoc
 , libpng, libjpeg, xlibsWrapper, libXinerama, freetype, SDL, libGLU_combined
-, libsndfile, portaudio, libmysqlclient, fontconfig
+, libsndfile, portaudio, mysql, fontconfig
 }:
 
 let srcs = import ./srcs.nix { inherit fetchurl; }; in
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
     "--with-gettext=${gettext}"
     "--with-jpeg=${libjpeg.dev}"
     "--with-gl=${libGLU_combined}"
-    "--with-mysql=${libmysqlclient}"
+    "--with-mysql=${mysql.connector-c}"
     "--with-manpages=yes"
   ];
 
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ pkgconfig libtool gettext ];
 
   buildInputs = [
-    bsdbuild perl xlibsWrapper libXinerama SDL libGLU_combined libmysqlclient mandoc
+    bsdbuild perl xlibsWrapper libXinerama SDL libGLU_combined mysql.connector-c mandoc
     freetype.dev libpng libjpeg.dev fontconfig portaudio libsndfile
   ];
 
diff --git a/pkgs/development/libraries/libdbi-drivers/default.nix b/pkgs/development/libraries/libdbi-drivers/default.nix
index 52b8a32fab4..99cd636b03b 100644
--- a/pkgs/development/libraries/libdbi-drivers/default.nix
+++ b/pkgs/development/libraries/libdbi-drivers/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, libdbi
-, libmysqlclient ? null
+, mysql ? null
 , sqlite ? null
 , postgresql ? null
 }:
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "0m680h8cc4428xin4p733azysamzgzcmv4psjvraykrsaz6ymlj3";
   };
 
-  buildInputs = [ libdbi sqlite postgresql ] ++ optional (libmysqlclient != null) libmysqlclient;
+  buildInputs = [ libdbi sqlite postgresql ] ++ optional (mysql != null) mysql.connector-c;
 
   postPatch = ''
     sed -i '/SQLITE3_LIBS/ s/-lsqlite/-lsqlite3/' configure;
@@ -26,10 +26,10 @@ stdenv.mkDerivation rec {
     "--enable-libdbi"
     "--with-dbi-incdir=${libdbi}/include"
     "--with-dbi-libdir=${libdbi}/lib"
-  ] ++ optionals (libmysqlclient != null) [
+  ] ++ optionals (mysql != null) [
     "--with-mysql"
-    "--with-mysql-incdir=${libmysqlclient}/include/mysql"
-    "--with-mysql-libdir=${libmysqlclient}/lib/mysql"
+    "--with-mysql-incdir=${mysql.connector-c}/include/mysql"
+    "--with-mysql-libdir=${mysql.connector-c}/lib/mysql"
   ] ++ optionals (sqlite != null) [
     "--with-sqlite3"
     "--with-sqlite3-incdir=${sqlite.dev}/include/sqlite"
diff --git a/pkgs/development/libraries/libgda/default.nix b/pkgs/development/libraries/libgda/default.nix
index 27032607996..bb6402dc428 100644
--- a/pkgs/development/libraries/libgda/default.nix
+++ b/pkgs/development/libraries/libgda/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl, gnome3, gobject-introspection, vala, libgee
 , overrideCC, gcc6
-, mysqlSupport ? false, libmysqlclient ? null
+, mysqlSupport ? false, mysql ? null
 , postgresSupport ? false, postgresql ? null
 }:
 
-assert mysqlSupport -> libmysqlclient != null;
+assert mysqlSupport -> mysql != null;
 assert postgresSupport -> postgresql != null;
 
 (if stdenv.isAarch64 then overrideCC stdenv gcc6 else stdenv).mkDerivation rec {
@@ -25,7 +25,7 @@ assert postgresSupport -> postgresql != null;
 
   nativeBuildInputs = [ pkgconfig intltool itstool libxml2 gobject-introspection vala ];
   buildInputs = with stdenv.lib; [ gtk3 openssl libgee ]
-    ++ optional (mysqlSupport) libmysqlclient
+    ++ optional (mysqlSupport) mysql.connector-c
     ++ optional (postgresSupport) postgresql;
 
   passthru = {
diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix
index ca65c3fdf8c..9ba3cdbd09a 100644
--- a/pkgs/development/libraries/libgdiplus/default.nix
+++ b/pkgs/development/libraries/libgdiplus/default.nix
@@ -2,19 +2,33 @@
 , libtiff, giflib, libjpeg, libpng
 , libXrender, libexif, autoreconfHook, fetchpatch }:
 
-stdenv.mkDerivation rec {
-  pname = "libgdiplus";
-  version = "6.0.2";
+stdenv.mkDerivation {
+  name = "libgdiplus-5.6.1";
 
   src = fetchFromGitHub {
     owner = "mono";
     repo = "libgdiplus";
-    rev = version;
-    sha256 = "07a3n7i35mn5j2djah64by785b1hzy8ckk1pz0xwvk716yzb7sxg";
+    rev = "5.6.1";
+    sha256 = "023xf3l2s0mxcdbl2viglzrkhx3lwcrpm66fiq7cfdqz80d4vsj2";
   };
 
   NIX_LDFLAGS = "-lgif";
 
+  patches = [ # Series of patches cherry-picked from master, all fixes various sigsegv (or required by other patch)
+    (fetchpatch {
+          url = "https://github.com/mono/libgdiplus/commit/d33a2580a94701ff33abe28c22881d6173be57d0.patch";
+          sha256 = "0rr54jylscn4icqjprqhwrncyr92r0d7kmfrrq3myskplpqv1c11";
+    })
+    (fetchpatch {
+          url ="https://github.com/mono/libgdiplus/commit/aa6aa53906935572f52f519fe4ab9ebedc051d08.patch";
+          sha256 = "1wg0avm8qv5cb4vk80baflfzszm6q7ydhn89c3h6kq68hg6zsf1f";
+    })
+    (fetchpatch {
+          url = "https://github.com/mono/libgdiplus/commit/81e45a1d5a3ac3cf035bcc3fabb2859818b6cc04.patch";
+          sha256 = "07wmc88cd1lqifs5x6npryni65jyy9gi8lgr2i1lb7v0fhvlyswg";
+    })
+  ];
+
   hardeningDisable = [ "format" ];
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/development/libraries/librdf/redland.nix b/pkgs/development/libraries/librdf/redland.nix
index 8835490187d..30d8d8a94e9 100644
--- a/pkgs/development/libraries/librdf/redland.nix
+++ b/pkgs/development/libraries/librdf/redland.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, openssl, libxslt, perl
 , curl, pcre, libxml2, librdf_rasqal, gmp
-, libmysqlclient, withMysql ? false
+, mysql, withMysql ? false
 , postgresql, withPostgresql ? false
 , sqlite, withSqlite ? true
 , db, withBdb ? false
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ perl pkgconfig ];
 
   buildInputs = [ openssl libxslt curl pcre libxml2 gmp ]
-    ++ stdenv.lib.optional withMysql libmysqlclient
+    ++ stdenv.lib.optional withMysql mysql.connector-c
     ++ stdenv.lib.optional withSqlite sqlite
     ++ stdenv.lib.optional withPostgresql postgresql
     ++ stdenv.lib.optional withBdb db;
diff --git a/pkgs/development/libraries/opendbx/default.nix b/pkgs/development/libraries/opendbx/default.nix
index 16ec6a5c110..f954aaf7245 100644
--- a/pkgs/development/libraries/opendbx/default.nix
+++ b/pkgs/development/libraries/opendbx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, readline, libmysqlclient, postgresql, sqlite }:
+{ stdenv, fetchurl, readline, mysql, postgresql, sqlite }:
 
 stdenv.mkDerivation rec {
   name = "opendbx-1.4.6";
@@ -9,12 +9,12 @@ stdenv.mkDerivation rec {
   };
 
   preConfigure = ''
-    export CPPFLAGS="-I${libmysqlclient}/include/mysql"
-    export LDFLAGS="-L${libmysqlclient}/lib/mysql -L${postgresql}/lib"
+    export CPPFLAGS="-I${mysql.connector-c}/include/mysql"
+    export LDFLAGS="-L${mysql.connector-c}/lib/mysql -L${postgresql}/lib"
     configureFlagsArray=(--with-backends="mysql pgsql sqlite3")
   '';
 
-  buildInputs = [ readline libmysqlclient postgresql sqlite ];
+  buildInputs = [ readline mysql.connector-c postgresql sqlite ];
 
   meta = with stdenv.lib; {
     description = "Extremely lightweight but extensible database access library written in C";
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 0b026ae75f4..03082eab091 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -127,8 +127,8 @@ let
 in {
 
   openssl_1_0_2 = common {
-    version = "1.0.2t";
-    sha256 = "1g67ra0ph7gpz6fgvv1i96d792jmd6ymci5kk53vbikszr74djql";
+    version = "1.0.2s";
+    sha256 = "15mbmg8hf7s12vr3v2bdc0pi9y4pdbnsxhzk4fyyap42jaa5rgfa";
     patches = [
       ./1.0.2/nix-ssl-cert-file.patch
 
@@ -139,8 +139,8 @@ in {
   };
 
   openssl_1_1 = common {
-    version = "1.1.1d";
-    sha256 = "1whinyw402z3b9xlb3qaxv4b9sk4w1bgh9k0y8df1z4x3yy92fhy";
+    version = "1.1.1c";
+    sha256 = "142c7zdlz06hjrrvinb9f276czc78bnkyhd9xma621qmmmwk1yzn";
     patches = [
       ./1.1/nix-ssl-cert-file.patch
 
diff --git a/pkgs/development/libraries/poco/default.nix b/pkgs/development/libraries/poco/default.nix
index e69ed0236f4..c19e343f19a 100644
--- a/pkgs/development/libraries/poco/default.nix
+++ b/pkgs/development/libraries/poco/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, pkgconfig, zlib, pcre, expat, sqlite, openssl, unixODBC, libmysqlclient }:
+{ stdenv, fetchurl, cmake, pkgconfig, zlib, pcre, expat, sqlite, openssl, unixODBC, mysql }:
 
 stdenv.mkDerivation rec {
   pname = "poco";
@@ -12,9 +12,9 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake pkgconfig ];
 
-  buildInputs = [ zlib pcre expat sqlite openssl unixODBC libmysqlclient ];
+  buildInputs = [ zlib pcre expat sqlite openssl unixODBC mysql.connector-c ];
 
-  MYSQL_DIR = libmysqlclient;
+  MYSQL_DIR = mysql.connector-c;
   MYSQL_INCLUDE_DIR = "${MYSQL_DIR}/include/mysql";
 
   cmakeFlags = [
diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix
index a46dcec0312..3b3f406485c 100644
--- a/pkgs/development/libraries/qt-3/default.nix
+++ b/pkgs/development/libraries/qt-3/default.nix
@@ -5,7 +5,7 @@
 , xineramaSupport ? true, libXinerama ? null
 , cursorSupport ? true, libXcursor ? null
 , threadSupport ? true
-, mysqlSupport ? false, libmysqlclient ? null
+, mysqlSupport ? false, mysql ? null
 , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
 , openglSupport ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
 , libGLU_combined ? null, libXmu ? null
@@ -16,7 +16,7 @@ assert xftSupport -> libXft != null;
 assert xrenderSupport -> xftSupport && libXrender != null;
 assert xrandrSupport -> libXrandr != null;
 assert cursorSupport -> libXcursor != null;
-assert mysqlSupport -> libmysqlclient != null;
+assert mysqlSupport -> mysql != null;
 assert openglSupport -> libGLU_combined != null && libXmu != null;
 
 stdenv.mkDerivation {
@@ -62,7 +62,7 @@ stdenv.mkDerivation {
   ] ++ stdenv.lib.optionals cursorSupport [
     "-L${libXcursor.out}/lib -I${libXcursor.dev}/include"
   ] ++ stdenv.lib.optionals mysqlSupport [
-    "-qt-sql-mysql" "-L${libmysqlclient}/lib/mysql" "-I${libmysqlclient}/include/mysql"
+    "-qt-sql-mysql" "-L${mysql.connector-c}/lib/mysql" "-I${mysql.connector-c}/include/mysql"
   ] ++ stdenv.lib.optionals xftSupport [
     "-L${libXft.out}/lib" "-I${libXft.dev}/include"
     "-L${libXft.freetype.out}/lib" "-I${libXft.freetype.dev}/include"
diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix
index 7c7f8f51de7..b5a10e8f11a 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -2,7 +2,7 @@
 , libXrender, libXinerama, libXcursor, libXv, libXext
 , libXfixes, libXrandr, libSM, freetype, fontconfig, zlib, libjpeg, libpng
 , libmng, which, libGLU, openssl, dbus, cups, pkgconfig
-, libtiff, glib, icu, libmysqlclient, postgresql, sqlite, perl, coreutils, libXi
+, libtiff, glib, icu, mysql, postgresql, sqlite, perl, coreutils, libXi
 , buildMultimedia ? stdenv.isLinux, alsaLib, gstreamer, gst-plugins-base
 , buildWebkit ? (stdenv.isLinux || stdenv.isDarwin)
 , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
@@ -166,7 +166,7 @@ stdenv.mkDerivation rec {
     (mk (!stdenv.isFreeBSD) "opengl") "-xrender" "-xrandr" "-xinerama" "-xcursor" "-xinput" "-xfixes" "-fontconfig"
     "-qdbus" (mk (cups != null) "cups") "-glib" "-dbus-linked" "-openssl-linked"
 
-    "-${if libmysqlclient != null then "plugin" else "no"}-sql-mysql" "-system-sqlite"
+    "-${if mysql != null then "plugin" else "no"}-sql-mysql" "-system-sqlite"
 
     "-exceptions" "-xmlpatterns"
 
@@ -192,7 +192,7 @@ stdenv.mkDerivation rec {
   buildInputs =
     [ cups # Qt dlopen's libcups instead of linking to it
       postgresql sqlite libjpeg libmng libtiff icu ]
-    ++ lib.optionals (libmysqlclient != null) [ libmysqlclient ]
+    ++ lib.optionals (mysql != null) [ mysql.connector-c ]
     ++ lib.optionals gtkStyle [ gtk2 gdk-pixbuf ]
     ++ lib.optionals stdenv.isDarwin [ ApplicationServices OpenGL Cocoa AGL libcxx libobjc ];
 
diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix
index 8119513618b..e2c71a77062 100644
--- a/pkgs/development/libraries/qt-5/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix
@@ -14,7 +14,7 @@
   zlib,
 
   # optional dependencies
-  cups ? null, libmysqlclient ? null, postgresql ? null,
+  cups ? null, mysql ? null, postgresql ? null,
   withGtk3 ? false, dconf ? null, gtk3 ? null,
 
   # options
@@ -80,7 +80,7 @@ stdenv.mkDerivation {
     )
     ++ lib.optional developerBuild gdb
     ++ lib.optional (cups != null) cups
-    ++ lib.optional (libmysqlclient != null) libmysqlclient
+    ++ lib.optional (mysql != null) mysql.connector-c
     ++ lib.optional (postgresql != null) postgresql;
 
   nativeBuildInputs =
@@ -285,7 +285,7 @@ stdenv.mkDerivation {
       "-L" "${openssl.out}/lib"
       "-I" "${openssl.dev}/include"
       "-system-sqlite"
-      ''-${if libmysqlclient != null then "plugin" else "no"}-sql-mysql''
+      ''-${if mysql != null then "plugin" else "no"}-sql-mysql''
       ''-${if postgresql != null then "plugin" else "no"}-sql-psql''
 
       "-make libs"
@@ -349,9 +349,9 @@ stdenv.mkDerivation {
           "-L" "${cups.lib}/lib"
           "-I" "${cups.dev}/include"
         ]
-        ++ lib.optionals (libmysqlclient != null) [
-          "-L" "${libmysqlclient}/lib"
-          "-I" "${libmysqlclient}/include"
+        ++ lib.optionals (mysql != null) [
+          "-L" "${mysql.out}/lib"
+          "-I" "${mysql.out}/include"
         ]
     );
 
diff --git a/pkgs/development/libraries/tntdb/default.nix b/pkgs/development/libraries/tntdb/default.nix
index 2d6ae3f18ca..13b4e6b97a9 100644
--- a/pkgs/development/libraries/tntdb/default.nix
+++ b/pkgs/development/libraries/tntdb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cxxtools, postgresql, libmysqlclient, sqlite, zlib, openssl }:
+{ stdenv, fetchurl, cxxtools, postgresql, mysql, sqlite, zlib, openssl }:
 
 stdenv.mkDerivation rec {
   pname = "tntdb";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0js79dbvkic30bzw1pf26m64vs2ssw2sbj55w1dc0sy69dlv4fh9";
   };
 
-  buildInputs = [ cxxtools postgresql libmysqlclient sqlite zlib openssl ];
+  buildInputs = [ cxxtools postgresql mysql.connector-c sqlite zlib openssl ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix
index 44e7ed17f0c..b9aa1696d48 100644
--- a/pkgs/development/libraries/unixODBCDrivers/default.nix
+++ b/pkgs/development/libraries/unixODBCDrivers/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, unixODBC, cmake, postgresql, mysql, libmysqlclient, sqlite, zlib, libxml2, dpkg, lib, openssl, kerberos, curl, libuuid, autoPatchelfHook }:
+{ fetchurl, stdenv, unixODBC, cmake, postgresql, mysql, mariadb, sqlite, zlib, libxml2, dpkg, lib, kerberos, curl, libuuid, autoPatchelfHook }:
 
 # I haven't done any parameter tweaking.. So the defaults provided here might be bad
 
@@ -29,23 +29,18 @@
 
   mariadb = stdenv.mkDerivation rec {
     pname = "mariadb-connector-odbc";
-    version = "3.1.2";
+    version = "2.0.10";
 
     src = fetchurl {
-      url = "https://downloads.mariadb.org/interstitial/connector-odbc-${version}/${pname}-${version}-ga-src.tar.gz";
-      sha256 = "0iibly2mbqijqyq4pzpb6dh40clqhvqrhgnj8knm4bw3nlksd0d5";
+      url = "https://downloads.mariadb.org/interstitial/connector-odbc-${version}/src/${pname}-${version}-ga-src.tar.gz";
+      sha256 = "0b6ximy0dg0xhqbrm1l7pn8hjapgpmddi67kh54h6i9cq9hqfdvz";
     };
 
     nativeBuildInputs = [ cmake ];
-    buildInputs = [ unixODBC libmysqlclient openssl ];
+    buildInputs = [ unixODBC mariadb.connector-c ];
 
     cmakeFlags = [
-      "-DWITH_OPENSSL=ON"
-    ];
-
-   NIX_CFLAGS_COMPILE = [
-     "-I${libmysqlclient}/include/mysql"
-     "-L${libmysqlclient}/lib/mysql"
+      "-DMARIADB_INCLUDE_DIR=${mariadb.connector-c}/include/mariadb"
     ];
 
     passthru = {
diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix
index 31fa104fb05..319b0effc57 100644
--- a/pkgs/development/libraries/wt/default.nix
+++ b/pkgs/development/libraries/wt/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, cmake, boost, pkgconfig, doxygen, qt48Full, libharu
-, pango, fcgi, firebird, libmysqlclient, postgresql, graphicsmagick, glew, openssl
+, pango, fcgi, firebird, mysql, postgresql, graphicsmagick, glew, openssl
 , pcre, harfbuzz
 }:
 
@@ -22,7 +22,7 @@ let
       nativeBuildInputs = [ pkgconfig ];
       buildInputs = [
         cmake boost doxygen qt48Full libharu
-        pango fcgi firebird libmysqlclient postgresql graphicsmagick glew
+        pango fcgi firebird mysql.connector-c postgresql graphicsmagick glew
         openssl pcre
       ];
 
@@ -30,7 +30,7 @@ let
         "-DWT_WRASTERIMAGE_IMPLEMENTATION=GraphicsMagick"
         "-DWT_CPP_11_MODE=-std=c++11"
         "-DGM_PREFIX=${graphicsmagick}"
-        "-DMYSQL_PREFIX=${libmysqlclient}"
+        "-DMYSQL_PREFIX=${mysql.connector-c}"
         "-DHARFBUZZ_INCLUDE_DIR=${harfbuzz.dev}/include"
         "--no-warn-unused-cli"
       ];
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
index acc98215af0..052bfb11949 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
@@ -53,11 +53,11 @@ in
   cl-async-ssl = addNativeLibs [pkgs.openssl (import ./openssl-lib-marked.nix)];
   cl-async-test = addNativeLibs [pkgs.openssl];
   clsql = x: {
-    propagatedBuildInputs = with pkgs; [libmysqlclient postgresql sqlite zlib];
+    propagatedBuildInputs = with pkgs; [mysql.connector-c postgresql sqlite zlib];
     overrides = y: (x.overrides y) // {
       preConfigure = ((x.overrides y).preConfigure or "") + ''
-        export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.libmysqlclient}/include/mysql"
-        export NIX_LDFLAGS="$NIX_LDFLAGS -L${pkgs.libmysqlclient}/lib/mysql"
+        export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.mysql.connector-c}/include/mysql"
+        export NIX_LDFLAGS="$NIX_LDFLAGS -L${pkgs.mysql.connector-c}/lib/mysql"
       '';
     };
   };
@@ -77,7 +77,7 @@ $out/lib/common-lisp/query-fs"
     };
   };
   cffi = addNativeLibs [pkgs.libffi];
-  cl-mysql = addNativeLibs [pkgs.libmysqlclient];
+  cl-mysql = addNativeLibs [pkgs.mysql];
   cl-ppcre-template = x: {
     overrides = y: (x.overrides y) // {
       postPatch = ''
diff --git a/pkgs/development/lisp-modules/shell.nix b/pkgs/development/lisp-modules/shell.nix
index 4a1f9ded56c..b3d50b2fb07 100644
--- a/pkgs/development/lisp-modules/shell.nix
+++ b/pkgs/development/lisp-modules/shell.nix
@@ -6,11 +6,11 @@ self = rec {
   env = buildEnv { name = name; paths = buildInputs; };
   buildInputs = [
     gcc stdenv
-    openssl fuse libuv libmysqlclient libfixposix libev sqlite
+    openssl fuse libuv mysql.connector-c libfixposix libev sqlite
     freetds
     lispPackages.quicklisp-to-nix lispPackages.quicklisp-to-nix-system-info
   ];
   CPATH = "${libfixposix}/include";
-  LD_LIBRARY_PATH = "${openssl.out}/lib:${fuse}/lib:${libuv}/lib:${libev}/lib:${libmysqlclient}/lib:${libmysqlclient}/lib/mysql:${postgresql.lib}/lib:${sqlite.out}/lib:${libfixposix}/lib:${freetds}/lib:${openssl_lib_marked}/lib";
+  LD_LIBRARY_PATH = "${openssl.out}/lib:${fuse}/lib:${libuv}/lib:${libev}/lib:${mysql.connector-c}/lib:${mysql.connector-c}/lib/mysql:${postgresql.lib}/lib:${sqlite.out}/lib:${libfixposix}/lib:${freetds}/lib:${openssl_lib_marked}/lib";
 };
 in stdenv.mkDerivation self
diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix
index 41dae8347ee..233503c2eca 100644
--- a/pkgs/development/lua-modules/overrides.nix
+++ b/pkgs/development/lua-modules/overrides.nix
@@ -154,12 +154,12 @@ with super;
   luadbi-mysql = super.luadbi-mysql.override({
     extraVariables = ''
       -- Can't just be /include and /lib, unfortunately needs the trailing 'mysql'
-      MYSQL_INCDIR='${pkgs.libmysqlclient}/include/mysql';
-      MYSQL_LIBDIR='${pkgs.libmysqlclient}/lib/mysql';
+      MYSQL_INCDIR='${pkgs.mysql.connector-c}/include/mysql';
+      MYSQL_LIBDIR='${pkgs.mysql.connector-c}/lib/mysql';
     '';
     buildInputs = [
       pkgs.mysql.client
-      pkgs.libmysqlclient
+      pkgs.mysql.connector-c
     ];
   });
 
diff --git a/pkgs/development/ocaml-modules/mysql/default.nix b/pkgs/development/ocaml-modules/mysql/default.nix
index 9be5ebf8a7b..1986f7e48f6 100644
--- a/pkgs/development/ocaml-modules/mysql/default.nix
+++ b/pkgs/development/ocaml-modules/mysql/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, ocaml, findlib, libmysqlclient }:
+{ stdenv, fetchurl, fetchpatch, ocaml, findlib, mysql }:
 
 # TODO: la versione stabile da' un errore di compilazione dovuto a
 # qualche cambiamento negli header .h
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   createFindlibDestdir = true;
 
-  propagatedBuildInputs = [ libmysqlclient ];
+  propagatedBuildInputs = [ mysql.connector-c ];
 
   patches = [
     (fetchpatch {
diff --git a/pkgs/development/perl-modules/DBD-mysql/default.nix b/pkgs/development/perl-modules/DBD-mysql/default.nix
index eb539339603..6eed57c4e7c 100644
--- a/pkgs/development/perl-modules/DBD-mysql/default.nix
+++ b/pkgs/development/perl-modules/DBD-mysql/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, buildPerlPackage, DBI, DevelChecklib, libmysqlclient }:
+{ fetchurl, buildPerlPackage, DBI, DevelChecklib, mysql }:
 
 buildPerlPackage {
   pname = "DBD-mysql";
@@ -9,7 +9,7 @@ buildPerlPackage {
     sha256 = "0y4djb048i09dk19av7mzfb3khr72vw11p3ayw2p82jsy4gm8j2g";
   };
 
-  buildInputs = [ libmysqlclient DevelChecklib ] ;
+  buildInputs = [ mysql.connector-c DevelChecklib ] ;
   propagatedBuildInputs = [ DBI ];
 
   doCheck = false;
diff --git a/pkgs/development/pure-modules/glpk/default.nix b/pkgs/development/pure-modules/glpk/default.nix
index 34d12f1471f..7b615928da9 100644
--- a/pkgs/development/pure-modules/glpk/default.nix
+++ b/pkgs/development/pure-modules/glpk/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchurl,
-  pkgconfig, pure, glpk, gmp, libtool, libmysqlclient, libiodbc }:
+  pkgconfig, pure, glpk, gmp, libtool, mysql, libiodbc }:
 
 stdenv.mkDerivation rec {
   baseName = "glpk";
@@ -12,13 +12,13 @@ stdenv.mkDerivation rec {
   };
 
   glpkWithExtras = lib.overrideDerivation glpk (attrs: {
-    propagatedBuildInputs = [ gmp libtool libmysqlclient libiodbc ];
+    propagatedBuildInputs = [ gmp libtool mysql.connector-c libiodbc ];
 
     CPPFLAGS = "-I${gmp.dev}/include";
 
     preConfigure = ''
       substituteInPlace configure \
-        --replace /usr/include/mysql ${libmysqlclient}/include/mysql
+        --replace /usr/include/mysql ${mysql.connector-c}/include/mysql
     '';
     configureFlags = [ "--enable-dl"
                        "--enable-odbc"
diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix
index 2a5d4fa4757..6b20b4b570a 100644
--- a/pkgs/development/python-modules/cryptography/default.nix
+++ b/pkgs/development/python-modules/cryptography/default.nix
@@ -1,7 +1,6 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
-, fetchpatch
 , openssl
 , cryptography_vectors
 , darwin
@@ -50,18 +49,10 @@ buildPythonPackage rec {
     pytz
   ];
 
-  # remove when https://github.com/pyca/cryptography/issues/4998 is fixed
   checkPhase = ''
-    py.test --disable-pytest-warnings tests -k 'not load_ecdsa_no_named_curve'
+    py.test --disable-pytest-warnings tests
   '';
 
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/pyca/cryptography/commit/e575e3d482f976c4a1f3203d63ea0f5007a49a2a.patch";
-      sha256 = "0vg9prqsizd6gzh5j7lscsfxzxlhz7pacvzhgqmj1vhdhjwbblcp";
-    })
-  ];
-
   # IOKit's dependencies are inconsistent between OSX versions, so this is the best we
   # can do until nix 1.11's release
   __impureHostDeps = [ "/usr/lib" ];
diff --git a/pkgs/development/python-modules/mysqlclient/default.nix b/pkgs/development/python-modules/mysqlclient/default.nix
index b37f191286e..488f6f9a7bb 100644
--- a/pkgs/development/python-modules/mysqlclient/default.nix
+++ b/pkgs/development/python-modules/mysqlclient/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, buildPythonPackage, fetchPypi, libmysqlclient }:
+{ stdenv, buildPythonPackage, fetchPypi, mysql }:
 
 buildPythonPackage rec {
   pname = "mysqlclient";
   version = "1.4.4";
 
   nativeBuildInputs = [
-    libmysqlclient
+    mysql.connector-c
   ];
 
   buildInputs = [
-    libmysqlclient
+    mysql.connector-c
   ];
 
   # Tests need a MySQL database
diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix
index 018463ead54..ec17b77ba20 100644
--- a/pkgs/development/python-modules/pyopenssl/default.nix
+++ b/pkgs/development/python-modules/pyopenssl/default.nix
@@ -9,7 +9,6 @@
 , pretend
 , flaky
 , glibcLocales
-, six
 }:
 
 with stdenv.lib;
@@ -85,7 +84,7 @@ buildPythonPackage rec {
   doCheck = !stdenv.isDarwin;
 
   nativeBuildInputs = [ openssl ];
-  propagatedBuildInputs = [ cryptography pyasn1 idna six ];
+  propagatedBuildInputs = [ cryptography pyasn1 idna ];
 
   checkInputs = [ pytest pretend flaky glibcLocales ];
 }
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index cef7f0aecf2..1616eacffc6 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -325,7 +325,7 @@ let
     rmatio = [ pkgs.zlib.dev ];
     Rmpfr = [ pkgs.gmp pkgs.mpfr.dev ];
     Rmpi = [ pkgs.openmpi ];
-    RMySQL = [ pkgs.zlib pkgs.libmysqlclient pkgs.openssl.dev ];
+    RMySQL = [ pkgs.zlib pkgs.mysql.connector-c pkgs.openssl.dev ];
     RNetCDF = [ pkgs.netcdf pkgs.udunits ];
     RODBCext = [ pkgs.libiodbc ];
     RODBC = [ pkgs.libiodbc ];
@@ -810,7 +810,7 @@ let
     });
 
     RMySQL = old.RMySQL.overrideDerivation (attrs: {
-      MYSQL_DIR="${pkgs.libmysqlclient}";
+      MYSQL_DIR=pkgs.mysql.connector-c;
       preConfigure = ''
         patchShebangs configure
       '';
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index 157e15e375f..a03e40e8097 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -20,7 +20,7 @@
 { lib, fetchurl, writeScript, ruby, kerberos, libxml2, libxslt, python, stdenv, which
 , libiconv, postgresql, v8_3_16_14, clang, sqlite, zlib, imagemagick
 , pkgconfig , ncurses, xapian, gpgme, utillinux, tzdata, icu, libffi
-, cmake, libssh2, openssl, libmysqlclient, darwin, git, perl, pcre, gecode_3, curl
+, cmake, libssh2, openssl, mysql, darwin, git, perl, pcre, gecode_3, curl
 , msgpack, qt59, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem
 , cairo, re2, rake, gobject-introspection, gdk-pixbuf, zeromq, czmq, graphicsmagick, libcxx
 , file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz
@@ -349,11 +349,11 @@ in
   };
 
   mysql = attrs: {
-    buildInputs = [ libmysqlclient zlib openssl ];
+    buildInputs = [ mysql.connector-c zlib openssl ];
   };
 
   mysql2 = attrs: {
-    buildInputs = [ libmysqlclient zlib openssl ];
+    buildInputs = [ mysql.connector-c zlib openssl ];
   };
 
   ncursesw = attrs: {
diff --git a/pkgs/development/tools/misc/patchelf/default.nix b/pkgs/development/tools/misc/patchelf/default.nix
index db8bb4f4243..77d03f299f4 100644
--- a/pkgs/development/tools/misc/patchelf/default.nix
+++ b/pkgs/development/tools/misc/patchelf/default.nix
@@ -1,27 +1,16 @@
-{ stdenv, fetchurl, autoreconfHook }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "patchelf-${version}";
-  version = "0.10";
+  name = "patchelf-0.9";
 
   src = fetchurl {
     url = "https://nixos.org/releases/patchelf/${name}/${name}.tar.bz2";
-    sha256 = "1wzwvnlyf853hw9zgqq5522bvf8gqadk8icgqa41a5n7593csw7n";
+    sha256 = "a0f65c1ba148890e9f2f7823f4bedf7ecad5417772f64f994004f59a39014f83";
   };
 
-  # Drop test that fails on musl (?)
-  postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
-    substituteInPlace tests/Makefile.am \
-      --replace "set-rpath-library.sh" ""
-  '';
-
   setupHook = [ ./setup-hook.sh ];
 
-  nativeBuildInputs = [ autoreconfHook ];
-  buildInputs = [ ];
-
-  # if not Musl, fails 8 out of 25 tests, problems when loading libc.so.6
-  doCheck = stdenv.hostPlatform.isMusl;
+  doCheck = false; # fails 8 out of 24 tests, problems when loading libc.so.6
 
   meta = with stdenv.lib; {
     homepage = https://nixos.org/patchelf.html;
diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix
index f5ff1c74bcc..c673bd26109 100644
--- a/pkgs/development/tools/misc/patchelf/unstable.nix
+++ b/pkgs/development/tools/misc/patchelf/unstable.nix
@@ -1,18 +1,24 @@
-{ stdenv, fetchurl, autoreconfHook }:
+{ stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "patchelf-${version}";
-  version = "0.10";
+  pname = "patchelf";
+  version = "0.10-pre-20190328";
 
-  src = fetchurl {
-    url = "https://nixos.org/releases/patchelf/${name}/${name}.tar.bz2";
-    sha256 = "1wzwvnlyf853hw9zgqq5522bvf8gqadk8icgqa41a5n7593csw7n";
+  src = fetchFromGitHub {
+    owner = "NixOS";
+    repo = "patchelf";
+    rev = "e1e39f3639e39360ceebb2f7ed533cede4623070";
+    sha256 = "09q1b1yqfzg1ih51v7qjh55vxfdbd8x5anycl8sfz6qy107wr02k";
   };
 
   # Drop test that fails on musl (?)
   postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
     substituteInPlace tests/Makefile.am \
       --replace "set-rpath-library.sh" ""
+  '' +
+  # extend version identifier to more informative than "0.10".
+  ''
+    echo -n ${version} > version
   '';
 
   setupHook = [ ./setup-hook.sh ];
@@ -22,11 +28,11 @@ stdenv.mkDerivation rec {
 
   doCheck = !stdenv.isDarwin;
 
-  meta = with stdenv.lib; {
+  meta = {
     homepage = https://nixos.org/patchelf.html;
-    license = licenses.gpl3;
+    license = "GPL";
     description = "A small utility to modify the dynamic linker and RPATH of ELF executables";
-    maintainers = [ maintainers.eelco ];
-    platforms = platforms.all;
+    maintainers = [ stdenv.lib.maintainers.eelco ];
+    platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/tools/misc/sysbench/default.nix b/pkgs/development/tools/misc/sysbench/default.nix
index 8076925f29b..e2d507ab801 100644
--- a/pkgs/development/tools/misc/sysbench/default.nix
+++ b/pkgs/development/tools/misc/sysbench/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, vim, libmysqlclient
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, vim, mysql
 , libaio }:
 
 stdenv.mkDerivation {
   name = "sysbench-1.0.17";
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
-  buildInputs = [ vim libmysqlclient libaio ];
+  buildInputs = [ vim mysql.connector-c libaio ];
 
   src = fetchFromGitHub {
     owner = "akopytov";
diff --git a/pkgs/development/tools/tora/default.nix b/pkgs/development/tools/tora/default.nix
index 931c00ecce5..74f1f22426f 100644
--- a/pkgs/development/tools/tora/default.nix
+++ b/pkgs/development/tools/tora/default.nix
@@ -1,5 +1,5 @@
 { mkDerivation, lib, fetchFromGitHub, cmake, extra-cmake-modules, makeWrapper
-, boost, doxygen, openssl, libmysqlclient, postgresql, graphviz, loki
+, boost, doxygen, openssl, mysql, postgresql, graphviz, loki
 , qscintilla, qtbase, qttools }:
 
 mkDerivation {
@@ -16,7 +16,7 @@ mkDerivation {
   nativeBuildInputs = [ cmake extra-cmake-modules makeWrapper qttools ];
 
   buildInputs = [
-    boost doxygen graphviz loki libmysqlclient openssl postgresql qscintilla qtbase
+    boost doxygen graphviz loki mysql.connector-c openssl postgresql qscintilla qtbase
   ];
 
   preConfigure = ''
@@ -47,7 +47,7 @@ mkDerivation {
     "-lssl"
   ];
 
-  NIX_CFLAGS_COMPILE = [ "-L${libmysqlclient}/lib/mysql" "-I${libmysqlclient}/include/mysql" ];
+  NIX_CFLAGS_COMPILE = [ "-L${mysql.connector-c}/lib/mysql" "-I${mysql.connector-c}/include/mysql" ];
 
   qtWrapperArgs = [
     ''--prefix PATH : ${lib.getBin graphviz}/bin''
diff --git a/pkgs/games/zod/default.nix b/pkgs/games/zod/default.nix
index 888b7bd3d6a..c14eda2968e 100644
--- a/pkgs/games/zod/default.nix
+++ b/pkgs/games/zod/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, unrar, unzip, SDL, SDL_image, SDL_ttf, SDL_mixer
-, libmysqlclient, makeWrapper }:
+, mysql, makeWrapper }:
 
 stdenv.mkDerivation {
   name = "zod-engine-2011-03-18";
@@ -24,9 +24,9 @@ stdenv.mkDerivation {
     sourceRoot=`pwd`/src
   '';
 
-  buildInputs = [ unrar unzip SDL SDL_image SDL_ttf SDL_mixer libmysqlclient makeWrapper ];
+  buildInputs = [ unrar unzip SDL SDL_image SDL_ttf SDL_mixer mysql.connector-c makeWrapper ];
 
-  NIX_LDFLAGS = "-L${libmysqlclient}/lib/mysql";
+  NIX_LDFLAGS = "-L${mysql.connector-c}/lib/mysql";
 
   installPhase = ''
     mkdir -p $out/bin $out/share/zod
diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix
index 75144799d01..9fdf9ca0bc1 100644
--- a/pkgs/os-specific/linux/firmware/fwupd/default.nix
+++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix
@@ -237,9 +237,9 @@ stdenv.mkDerivation rec {
   postFixup = ''
     find -L "$out/bin" "$out/libexec" -type f -executable -print0 \
       | while IFS= read -r -d ''' file; do
-      if [[ "$file" != *.efi ]]; then
-        echo "Wrapping program $file"
-        wrapGApp "$file"
+      if [[ "''${file}" != *.efi ]]; then
+        echo "Wrapping program ''${file}"
+        wrapProgram "''${file}" "''${gappsWrapperArgs[@]}"
       fi
     done
   '';
diff --git a/pkgs/os-specific/linux/kexectools/default.nix b/pkgs/os-specific/linux/kexectools/default.nix
index 4e9007c7362..d6fd7346f4f 100644
--- a/pkgs/os-specific/linux/kexectools/default.nix
+++ b/pkgs/os-specific/linux/kexectools/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   depsBuildBuild = [ buildPackages.stdenv.cc ];
   buildInputs = [ zlib ];
 
-  patches = [
+  patches = stdenv.lib.optionals stdenv.hostPlatform.isi686 [
     # fix build on i686
     # See: https://src.fedoraproject.org/rpms/kexec-tools/c/cb1e5463b5298b064e9b6c86ad6fe3505fec9298
     (fetchpatch {
diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix
index ab2d44577c0..e48dec7d20c 100644
--- a/pkgs/servers/clickhouse/default.nix
+++ b/pkgs/servers/clickhouse/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, cmake, libtool
 , boost, capnproto, cctz, clang-unwrapped, double-conversion, gperftools, icu
-, libcpuid, libxml2, lld, llvm, lz4 , libmysqlclient, openssl, poco, re2, rdkafka
+, libcpuid, libxml2, lld, llvm, lz4 , mysql, openssl, poco, re2, rdkafka
 , readline, sparsehash, unixODBC, zstd, ninja, jemalloc, brotli, protobuf, xxHash
 }:
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake libtool ninja ];
   buildInputs = [
     boost capnproto cctz clang-unwrapped double-conversion gperftools icu
-    libcpuid libxml2 lld llvm lz4 libmysqlclient openssl poco re2 rdkafka
+    libcpuid libxml2 lld llvm lz4 mysql.connector-c openssl poco re2 rdkafka
     readline sparsehash unixODBC zstd jemalloc brotli protobuf xxHash
   ];
 
diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix
index 93e1a31abb1..c448e4936f6 100644
--- a/pkgs/servers/computing/slurm/default.nix
+++ b/pkgs/servers/computing/slurm/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, pkgconfig, libtool, curl
 , python, munge, perl, pam, openssl, zlib
-, ncurses, libmysqlclient, gtk2, lua, hwloc, numactl
+, ncurses, mysql, gtk2, lua, hwloc, numactl
 , readline, freeipmi, libssh2, xorg, lz4
 # enable internal X11 support via libssh2
 , enableX11 ? true
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig libtool ];
   buildInputs = [
     curl python munge perl pam openssl zlib
-      libmysqlclient ncurses gtk2 lz4
+      mysql.connector-c ncurses gtk2 lz4
       lua hwloc numactl readline freeipmi
   ] ++ stdenv.lib.optionals enableX11 [ libssh2 xorg.xauth ];
 
diff --git a/pkgs/servers/freeradius/default.nix b/pkgs/servers/freeradius/default.nix
index eeea3298ecd..6c6eb2b0c09 100644
--- a/pkgs/servers/freeradius/default.nix
+++ b/pkgs/servers/freeradius/default.nix
@@ -13,7 +13,7 @@
 , withMemcached ? false
 , hiredis
 , withRedis ? false
-, libmysqlclient
+, mysql
 , withMysql ? false
 , json_c
 , withJson ? false
@@ -31,7 +31,7 @@ assert withPcap -> libpcap != null;
 assert withCap -> libcap != null;
 assert withMemcached -> libmemcached != null;
 assert withRedis -> hiredis != null;
-assert withMysql -> libmysqlclient != null;
+assert withMysql -> mysql != null;
 assert withYubikey -> libyubikey != null;
 assert withCollectd -> collectd != null;
 assert withRest -> curl != null && withJson;
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
     ++ optional withCap libcap
     ++ optional withMemcached libmemcached
     ++ optional withRedis hiredis
-    ++ optional withMysql libmysqlclient
+    ++ optional withMysql mysql.connector-c
     ++ optional withJson json_c
     ++ optional withYubikey libyubikey
     ++ optional withCollectd collectd
diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix
index f67bc5b0045..7dacb997d47 100644
--- a/pkgs/servers/http/lighttpd/default.nix
+++ b/pkgs/servers/http/lighttpd/default.nix
@@ -1,6 +1,6 @@
 { stdenv, buildPackages, fetchurl, pkgconfig, pcre, libxml2, zlib, bzip2, which, file
 , openssl, enableMagnet ? false, lua5_1 ? null
-, enableMysql ? false, libmysqlclient ? null
+, enableMysql ? false, mysql ? null
 , enableLdap ? false, openldap ? null
 , enableWebDAV ? false, sqlite ? null, libuuid ? null
 , enableExtendedAttrs ? false, attr ? null
@@ -8,7 +8,7 @@
 }:
 
 assert enableMagnet -> lua5_1 != null;
-assert enableMysql -> libmysqlclient != null;
+assert enableMysql -> mysql != null;
 assert enableLdap -> openldap != null;
 assert enableWebDAV -> sqlite != null;
 assert enableWebDAV -> libuuid != null;
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ pcre pcre.dev libxml2 zlib bzip2 which file openssl ]
              ++ stdenv.lib.optional enableMagnet lua5_1
-             ++ stdenv.lib.optional enableMysql libmysqlclient
+             ++ stdenv.lib.optional enableMysql mysql.connector-c
              ++ stdenv.lib.optional enableLdap openldap
              ++ stdenv.lib.optional enableWebDAV sqlite
              ++ stdenv.lib.optional enableWebDAV libuuid;
diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix
index 4104b0443ff..e3afd1f9879 100644
--- a/pkgs/servers/mail/dovecot/default.nix
+++ b/pkgs/servers/mail/dovecot/default.nix
@@ -3,7 +3,7 @@
 , clucene_core_2, icu, openldap, libsodium, libstemmer, cyrus_sasl
 , nixosTests
 # Auth modules
-, withMySQL ? false, libmysqlclient
+, withMySQL ? false, mysql
 , withPgSQL ? false, postgresql
 , withSQLite ? true, sqlite
 }:
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   buildInputs =
     [ openssl bzip2 zlib lz4 clucene_core_2 icu openldap libsodium libstemmer cyrus_sasl.dev ]
     ++ lib.optionals (stdenv.isLinux) [ systemd pam libcap inotify-tools ]
-    ++ lib.optional withMySQL libmysqlclient
+    ++ lib.optional withMySQL mysql.connector-c
     ++ lib.optional withPgSQL postgresql
     ++ lib.optional withSQLite sqlite;
 
diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix
index 96c8ad4a383..fcafd5817d4 100644
--- a/pkgs/servers/mail/exim/default.nix
+++ b/pkgs/servers/mail/exim/default.nix
@@ -1,6 +1,6 @@
 { coreutils, db, fetchurl, openssl, pcre, perl, pkgconfig, stdenv
 , enableLDAP ? false, openldap
-, enableMySQL ? false, libmysqlclient, zlib
+, enableMySQL ? false, mysql, zlib
 , enableAuthDovecot ? false, dovecot
 , enablePAM ? false, pam
 , enableSPF ? true, libspf2
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ coreutils db openssl perl pcre ]
     ++ stdenv.lib.optional enableLDAP openldap
-    ++ stdenv.lib.optionals enableMySQL [ libmysqlclient zlib ]
+    ++ stdenv.lib.optionals enableMySQL [ mysql.connector-c zlib ]
     ++ stdenv.lib.optional enableAuthDovecot dovecot
     ++ stdenv.lib.optional enablePAM pam
     ++ stdenv.lib.optional enableSPF libspf2;
@@ -53,10 +53,10 @@ stdenv.mkDerivation rec {
       ''}
       ${stdenv.lib.optionalString enableMySQL ''
         s:^# \(LOOKUP_MYSQL=yes\)$:\1:
-        s:^# \(LOOKUP_MYSQL_PC=libmysqlclient\)$:\1:
-        s:^\(LOOKUP_LIBS\)=\(.*\):\1=\2 -lmysqlclient -L${libmysqlclient}/lib/mysql -lssl -ldl -lm -lpthread -lz:
-        s:^# \(LOOKUP_LIBS\)=.*:\1=-lmysqlclient -L${libmysqlclient}/lib/mysql -lssl -ldl -lm -lpthread -lz:
-        s:^# \(LOOKUP_INCLUDE\)=.*:\1=-I${libmysqlclient}/include/mysql/:
+        s:^# \(LOOKUP_MYSQL_PC=mysql.connector-c\)$:\1:
+        s:^\(LOOKUP_LIBS\)=\(.*\):\1=\2 -lmysqlclient -L${mysql.connector-c}/lib/mysql -lssl -ldl -lm -lpthread -lz:
+        s:^# \(LOOKUP_LIBS\)=.*:\1=-lmysqlclient -L${mysql.connector-c}/lib/mysql -lssl -ldl -lm -lpthread -lz:
+        s:^# \(LOOKUP_INCLUDE\)=.*:\1=-I${mysql.connector-c}/include/mysql/:
       ''}
       ${stdenv.lib.optionalString enableAuthDovecot ''
         s:^# \(AUTH_DOVECOT\)=.*:\1=yes:
diff --git a/pkgs/servers/mail/opensmtpd/extras.nix b/pkgs/servers/mail/opensmtpd/extras.nix
index f7ed6382a7b..71b27facbab 100644
--- a/pkgs/servers/mail/opensmtpd/extras.nix
+++ b/pkgs/servers/mail/opensmtpd/extras.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, openssl, libevent, libasr,
-  python2, pkgconfig, lua5, perl, libmysqlclient, postgresql, sqlite, hiredis,
+  python2, pkgconfig, lua5, perl, mysql, postgresql, sqlite, hiredis,
   enablePython ? true,
   enableLua ? true,
   enablePerl ? true,
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ openssl libevent
-    libasr python2 lua5 perl libmysqlclient postgresql sqlite hiredis ];
+    libasr python2 lua5 perl mysql.connector-c postgresql sqlite hiredis ];
 
   configureFlags = [
     "--sysconfdir=/etc"
@@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
     stdenv.lib.optional enableRedis
       "-I${hiredis}/include/hiredis -lhiredis"
     ++ stdenv.lib.optional enableMysql
-      "-L${libmysqlclient}/lib/mysql";
+      "-L${mysql.connector-c}/lib/mysql";
 
   meta = with stdenv.lib; {
     homepage = https://www.opensmtpd.org/;
diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix
index b299d212a18..39845f12f03 100644
--- a/pkgs/servers/mail/postfix/default.nix
+++ b/pkgs/servers/mail/postfix/default.nix
@@ -3,7 +3,7 @@
 , buildPackages
 , withLDAP ? true, openldap
 , withPgSQL ? false, postgresql
-, withMySQL ? false, libmysqlclient
+, withMySQL ? false, mysql
 , withSQLite ? false, sqlite
 }:
 
@@ -12,7 +12,7 @@ let
     "-DUSE_TLS" "-DUSE_SASL_AUTH" "-DUSE_CYRUS_SASL" "-I${cyrus_sasl.dev}/include/sasl"
     "-DHAS_DB_BYPASS_MAKEDEFS_CHECK"
    ] ++ lib.optional withPgSQL "-DHAS_PGSQL"
-     ++ lib.optionals withMySQL [ "-DHAS_MYSQL" "-I${libmysqlclient}/include/mysql" "-L${libmysqlclient}/lib/mysql" ]
+     ++ lib.optionals withMySQL [ "-DHAS_MYSQL" "-I${mysql.connector-c}/include/mysql" "-L${mysql.connector-c}/lib/mysql" ]
      ++ lib.optional withSQLite "-DHAS_SQLITE"
      ++ lib.optionals withLDAP ["-DHAS_LDAP" "-DUSE_LDAP_SASL"]);
    auxlibs = lib.concatStringsSep " " ([
@@ -36,7 +36,7 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = [ makeWrapper m4 ];
   buildInputs = [ db openssl cyrus_sasl icu libnsl pcre ]
                 ++ lib.optional withPgSQL postgresql
-                ++ lib.optional withMySQL libmysqlclient
+                ++ lib.optional withMySQL mysql.connector-c
                 ++ lib.optional withSQLite sqlite
                 ++ lib.optional withLDAP openldap;
 
diff --git a/pkgs/servers/monitoring/plugins/default.nix b/pkgs/servers/monitoring/plugins/default.nix
index 62f40b59d37..9f23cc3e54c 100644
--- a/pkgs/servers/monitoring/plugins/default.nix
+++ b/pkgs/servers/monitoring/plugins/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, fetchpatch, autoreconfHook
 , coreutils, gnugrep, gnused, lm_sensors, net_snmp, openssh, openssl, perl
-, dnsutils, libdbi, libmysqlclient, zlib, openldap, procps
+, dnsutils, libdbi, mysql, zlib, openldap, procps
 , runtimeShell }:
 
 with stdenv.lib;
@@ -48,7 +48,7 @@ in stdenv.mkDerivation {
   '';
 
   # !!! make openssh a runtime dependency only
-  buildInputs = [ dnsutils libdbi libmysqlclient net_snmp openldap openssh openssl perl procps zlib ];
+  buildInputs = [ dnsutils libdbi mysql net_snmp openldap openssh openssl perl procps zlib ];
 
   nativeBuildInputs = [ autoreconfHook ];
 
diff --git a/pkgs/servers/monitoring/zabbix/proxy.nix b/pkgs/servers/monitoring/zabbix/proxy.nix
index 53932af6a18..48b72dc0590 100644
--- a/pkgs/servers/monitoring/zabbix/proxy.nix
+++ b/pkgs/servers/monitoring/zabbix/proxy.nix
@@ -3,7 +3,7 @@
 , snmpSupport ? true, net_snmp
 , sshSupport ? true, libssh2
 , sqliteSupport ? false, sqlite
-, mysqlSupport ? false, libmysqlclient
+, mysqlSupport ? false, mysql
 , postgresqlSupport ? false, postgresql
 }:
 
@@ -37,7 +37,7 @@ in
       ++ optional snmpSupport net_snmp
       ++ optional sqliteSupport sqlite
       ++ optional sshSupport libssh2
-      ++ optional mysqlSupport libmysqlclient
+      ++ optional mysqlSupport mysql.connector-c
       ++ optional postgresqlSupport postgresql;
 
       configureFlags = [
diff --git a/pkgs/servers/monitoring/zabbix/server.nix b/pkgs/servers/monitoring/zabbix/server.nix
index ac5dcca901d..51ca38e8cfc 100644
--- a/pkgs/servers/monitoring/zabbix/server.nix
+++ b/pkgs/servers/monitoring/zabbix/server.nix
@@ -4,7 +4,7 @@
 , odbcSupport ? true, unixODBC
 , snmpSupport ? true, net_snmp
 , sshSupport ? true, libssh2
-, mysqlSupport ? false, libmysqlclient
+, mysqlSupport ? false, mysql
 , postgresqlSupport ? false, postgresql
 }:
 
@@ -40,7 +40,7 @@ in
       ++ optional ldapSupport openldap
       ++ optional snmpSupport net_snmp
       ++ optional sshSupport libssh2
-      ++ optional mysqlSupport libmysqlclient
+      ++ optional mysqlSupport mysql.connector-c
       ++ optional postgresqlSupport postgresql;
 
       configureFlags = [
diff --git a/pkgs/servers/sql/mariadb/connector-c/3_1.nix b/pkgs/servers/sql/mariadb/connector-c/3_1.nix
deleted file mode 100644
index c8bc4858f71..00000000000
--- a/pkgs/servers/sql/mariadb/connector-c/3_1.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ callPackage, ... } @ args:
-
-callPackage ./. (args // {
-  version = "3.1.2";
-  sha256 = "0pgz8m8d39mvj9wnjll6c83xvdl2h24273b3dkx0g5pxj7ga4shm";
-})
diff --git a/pkgs/servers/sql/mariadb/connector-c/default.nix b/pkgs/servers/sql/mariadb/connector-c/default.nix
deleted file mode 100644
index 0e030268540..00000000000
--- a/pkgs/servers/sql/mariadb/connector-c/default.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{ stdenv, fetchurl, cmake
-, curl, openssl, zlib
-, libiconv
-, version, sha256, ...
-}:
-
-with stdenv.lib;
-
-stdenv.mkDerivation {
-  pname = "mariadb-connector-c";
-  inherit version;
-
-  src = fetchurl {
-    urls = [
-      "https://downloads.mariadb.org/f/connector-c-${version}/mariadb-connector-c-${version}-src.tar.gz"
-      "https://downloads.mariadb.com/Connectors/c/connector-c-${version}/mariadb-connector-c-${version}-src.tar.gz"
-    ];
-    inherit sha256;
-  };
-
-  cmakeFlags = [
-    "-DWITH_EXTERNAL_ZLIB=ON"
-    "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock"
-    "-DWITH_CURL=ON"
-  ];
-
-  # The cmake setup-hook uses $out/lib by default, this is not the case here.
-  preConfigure = optionalString stdenv.isDarwin ''
-    cmakeFlagsArray+=("-DCMAKE_INSTALL_NAME_DIR=$out/lib/mariadb")
-  '';
-
-  nativeBuildInputs = [ cmake ];
-  propagatedBuildInputs = [ curl openssl zlib ];
-  buildInputs = [ libiconv ];
-
-  enableParallelBuilding = true;
-
-  postFixup = ''
-    ln -sv mariadb_config $out/bin/mysql_config
-    ln -sv mariadb $out/lib/mysql
-    ln -sv mariadb $out/include/mysql
-    ln -sv libmariadbclient.a $out/lib/mariadb/libmysqlclient.a
-    ln -sv libmariadbclient.a $out/lib/mariadb/libmysqlclient_r.a
-    ln -sv libmariadb.so $out/lib/mariadb/libmysqlclient.so
-    ln -sv libmariadb.so $out/lib/mariadb/libmysqlclient_r.so
-  '';
-
-  meta = {
-    description = "Client library that can be used to connect to MySQL or MariaDB";
-    license = licenses.lgpl21;
-    maintainers = with maintainers; [ globin ];
-    platforms = platforms.all;
-  };
-}
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index 2352d7c1088..15553055457 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -18,6 +18,13 @@ mytopEnv = perl.withPackages (p: with p; [ DataDumper DBDmysql DBI TermReadKey ]
 mariadb = server // {
   inherit client; # MariaDB Client
   server = server; # MariaDB Server
+  inherit connector-c; # libmysqlclient.so
+  inherit galera;
+};
+
+galeraLibs = buildEnv {
+  name = "galera-lib-inputs-united";
+  paths = [ openssl.out boost check ];
 };
 
 common = rec { # attributes common to both builds
@@ -211,4 +218,95 @@ server = stdenv.mkDerivation (common // {
 
   CXXFLAGS = optionalString stdenv.isi686 "-fpermissive";
 });
+
+connector-c = stdenv.mkDerivation rec {
+  pname = "mariadb-connector-c";
+  version = "2.3.7";
+
+  src = fetchurl {
+    url = "https://downloads.mariadb.org/interstitial/connector-c-${version}/mariadb-connector-c-${version}-src.tar.gz/from/http%3A//nyc2.mirrors.digitalocean.com/mariadb/";
+    sha256 = "13izi35vvxhiwl2dsnqrz75ciisy2s2k30giv7hrm01qlwnmiycl";
+    name   = "mariadb-connector-c-${version}-src.tar.gz";
+  };
+
+  # outputs = [ "dev" "out" ]; FIXME: cmake variables don't allow that < 3.0
+  cmakeFlags = [
+    "-DWITH_EXTERNAL_ZLIB=ON"
+    "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock"
+  ];
+
+  # The cmake setup-hook uses $out/lib by default, this is not the case here.
+  preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
+    cmakeFlagsArray+=("-DCMAKE_INSTALL_NAME_DIR=$out/lib/mariadb")
+  '';
+
+  nativeBuildInputs = [ cmake ];
+  propagatedBuildInputs = [ openssl zlib ];
+  buildInputs = [ libiconv ];
+
+  enableParallelBuilding = true;
+
+  postFixup = ''
+    ln -sv mariadb_config $out/bin/mysql_config
+    ln -sv mariadb $out/lib/mysql
+    ln -sv mariadb $out/include/mysql
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Client library that can be used to connect to MySQL or MariaDB";
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ globin ];
+    platforms = platforms.all;
+  };
+};
+
+galera = stdenv.mkDerivation rec {
+  pname = "mariadb-galera";
+  version = "25.3.26";
+
+  src = fetchFromGitHub {
+    owner = "codership";
+    repo = "galera";
+    rev = "release_${version}";
+    sha256 = "0fs0c1px9lknf1a5wwb12z1hj7j7b6hsfjddggikvkdkrnr2xs1f";
+    fetchSubmodules = true;
+  };
+
+  buildInputs = [ asio boost check openssl scons ];
+
+  postPatch = ''
+    substituteInPlace SConstruct \
+      --replace "boost_library_path = '''" "boost_library_path = '${boost}/lib'"
+  '';
+
+  preConfigure = ''
+    export CPPFLAGS="-I${asio}/include -I${boost.dev}/include -I${check}/include -I${openssl.dev}/include"
+    export LIBPATH="${galeraLibs}/lib"
+  '';
+
+  sconsFlags = "ssl=1 system_asio=0 strict_build_flags=0";
+
+  installPhase = ''
+    # copied with modifications from scripts/packages/freebsd.sh
+    GALERA_LICENSE_DIR="$share/licenses/${pname}-${version}"
+    install -d $out/{bin,lib/galera,share/doc/galera,$GALERA_LICENSE_DIR}
+    install -m 555 "garb/garbd"                       "$out/bin/garbd"
+    install -m 444 "libgalera_smm.so"                 "$out/lib/galera/libgalera_smm.so"
+    install -m 444 "scripts/packages/README"          "$out/share/doc/galera/"
+    install -m 444 "scripts/packages/README-MySQL"    "$out/share/doc/galera/"
+    install -m 444 "scripts/packages/freebsd/LICENSE" "$out/$GALERA_LICENSE_DIR"
+    install -m 444 "LICENSE"                          "$out/$GALERA_LICENSE_DIR/GPLv2"
+    install -m 444 "asio/LICENSE_1_0.txt"             "$out/$GALERA_LICENSE_DIR/LICENSE.asio"
+    install -m 444 "www.evanjones.ca/LICENSE"         "$out/$GALERA_LICENSE_DIR/LICENSE.crc32c"
+    install -m 444 "chromium/LICENSE"                 "$out/$GALERA_LICENSE_DIR/LICENSE.chromium"
+  '';
+
+  meta = {
+    description = "Galera 3 wsrep provider library";
+    homepage = http://galeracluster.com/;
+    license = licenses.lgpl2;
+    maintainers = with maintainers; [ izorkin ];
+    platforms = platforms.all;
+  };
+};
 in mariadb
diff --git a/pkgs/servers/sql/mariadb/galera/25.nix b/pkgs/servers/sql/mariadb/galera/25.nix
deleted file mode 100644
index 2772d60e398..00000000000
--- a/pkgs/servers/sql/mariadb/galera/25.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ callPackage, ... } @ args:
-
-callPackage ./. (args // {
-  version = "25.3.27";
-  sha256 = "143kzj0fmak1gdww4qkqmmliw8klxm6mwk5531748swlwm6gqr5q";
-})
diff --git a/pkgs/servers/sql/mariadb/galera/default.nix b/pkgs/servers/sql/mariadb/galera/default.nix
deleted file mode 100644
index 263a21983e2..00000000000
--- a/pkgs/servers/sql/mariadb/galera/default.nix
+++ /dev/null
@@ -1,63 +0,0 @@
-{ stdenv, fetchFromGitHub, buildEnv
-, asio, boost, check, openssl, scons
-, version, sha256, ...
-}:
-
-let
-  pname = "mariadb-galera";
-  galeraLibs = buildEnv {
-    name = "galera-lib-inputs-united";
-    paths = [ openssl.out boost check ];
-  };
-
-in stdenv.mkDerivation {
-  inherit pname;
-  inherit version;
-
-  src = fetchFromGitHub {
-    owner = "codership";
-    repo = "galera";
-    rev = "release_${version}";
-    inherit sha256;
-    fetchSubmodules = true;
-  };
-
-  buildInputs = [ asio boost check openssl scons ];
-
-  postPatch = ''
-    substituteInPlace SConstruct \
-      --replace "boost_library_path = '''" "boost_library_path = '${boost}/lib'"
-  '';
-
-  preConfigure = ''
-    export CPPFLAGS="-I${asio}/include -I${boost.dev}/include -I${check}/include -I${openssl.dev}/include"
-    export LIBPATH="${galeraLibs}/lib"
-  '';
-
-  sconsFlags = "ssl=1 system_asio=1 strict_build_flags=0";
-
-  enableParallelBuilding = true;
-
-  installPhase = ''
-    # copied with modifications from scripts/packages/freebsd.sh
-    GALERA_LICENSE_DIR="$share/licenses/${pname}"
-    install -d $out/{bin,lib/galera,share/doc/galera,$GALERA_LICENSE_DIR}
-    install -m 555 "garb/garbd"                       "$out/bin/garbd"
-    install -m 444 "libgalera_smm.so"                 "$out/lib/galera/libgalera_smm.so"
-    install -m 444 "scripts/packages/README"          "$out/share/doc/galera/"
-    install -m 444 "scripts/packages/README-MySQL"    "$out/share/doc/galera/"
-    install -m 444 "scripts/packages/freebsd/LICENSE" "$out/$GALERA_LICENSE_DIR"
-    install -m 444 "LICENSE"                          "$out/$GALERA_LICENSE_DIR/GPLv2"
-    install -m 444 "asio/LICENSE_1_0.txt"             "$out/$GALERA_LICENSE_DIR/LICENSE.asio"
-    install -m 444 "www.evanjones.ca/LICENSE"         "$out/$GALERA_LICENSE_DIR/LICENSE.crc32c"
-    install -m 444 "chromium/LICENSE"                 "$out/$GALERA_LICENSE_DIR/LICENSE.chromium"
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Galera 3 wsrep provider library";
-    homepage = http://galeracluster.com/;
-    license = licenses.lgpl2;
-    maintainers = with maintainers; [ izorkin ];
-    platforms = platforms.all;
-  };
-}
diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix
index 556c44b61a7..85fa6cd8006 100644
--- a/pkgs/servers/uwsgi/default.nix
+++ b/pkgs/servers/uwsgi/default.nix
@@ -4,7 +4,7 @@
 , pam, withPAM ? stdenv.isLinux
 , systemd, withSystemd ? stdenv.isLinux
 , python2, python3, ncurses
-, ruby, php-embed, libmysqlclient
+, ruby, php-embed, mysql
 }:
 
 let pythonPlugin = pkg : lib.nameValuePair "python${if pkg.isPy2 then "2" else "3"}" {
@@ -34,7 +34,7 @@ let pythonPlugin = pkg : lib.nameValuePair "python${if pkg.isPy2 then "2" else "
                     # usage: https://uwsgi-docs.readthedocs.io/en/latest/PHP.html#running-php-apps-with-nginx
                     path = "plugins/php";
                     inputs = [ php-embed ] ++ php-embed.buildInputs;
-                    NIX_CFLAGS_LINK = [ "-L${libmysqlclient}/lib/mysql" ];
+                    NIX_CFLAGS_LINK = [ "-L${mysql.connector-c}/lib/mysql" ];
                   })
                 ];
 
diff --git a/pkgs/tools/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix
index 949e45de5e1..79ae1e50ca2 100644
--- a/pkgs/tools/backup/bareos/default.nix
+++ b/pkgs/tools/backup/bareos/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchFromGitHub, pkgconfig, nettools, gettext, flex
 , readline ? null, openssl ? null, python2 ? null, ncurses ? null, rocksdb
-, sqlite ? null, postgresql ? null, libmysqlclient ? null, zlib ? null, lzo ? null
+, sqlite ? null, postgresql ? null, mysql ? null, zlib ? null, lzo ? null
 , jansson ? null, acl ? null, glusterfs ? null, libceph ? null, libcap ? null
 }:
 
-assert sqlite != null || postgresql != null || libmysqlclient != null;
+assert sqlite != null || postgresql != null || mysql != null;
 
 with stdenv.lib;
 let
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
     nettools gettext readline openssl python2 flex ncurses sqlite postgresql
-    libmysqlclient zlib lzo jansson acl glusterfs libceph libcap rocksdb
+    mysql.connector-c zlib lzo jansson acl glusterfs libceph libcap rocksdb
   ];
 
   postPatch = ''
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
     ++ optional (openssl != null) "--with-openssl=${openssl.dev}"
     ++ optional (sqlite != null) "--with-sqlite3=${sqlite.dev}"
     ++ optional (postgresql != null) "--with-postgresql=${postgresql}"
-    ++ optional (libmysqlclient != null) "--with-mysql=${libmysqlclient}"
+    ++ optional (mysql != null) "--with-mysql=${mysql.connector-c}"
     ++ optional (zlib != null) "--with-zlib=${zlib.dev}"
     ++ optional (lzo != null) "--with-lzo=${lzo}"
     ++ optional (jansson != null) "--with-jansson=${jansson}"
diff --git a/pkgs/tools/backup/mydumper/default.nix b/pkgs/tools/backup/mydumper/default.nix
index 7160e7f1950..5538b45c5f1 100644
--- a/pkgs/tools/backup/mydumper/default.nix
+++ b/pkgs/tools/backup/mydumper/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, cmake, pkgconfig
-, glib, zlib, pcre, libmysqlclient, libressl }:
+, glib, zlib, pcre, mysql, libressl }:
 
 stdenv.mkDerivation rec {
   version = "0.9.5";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake pkgconfig ];
 
-  buildInputs = [ glib zlib pcre libmysqlclient libressl ];
+  buildInputs = [ glib zlib pcre mysql.connector-c libressl ];
 
   meta = with stdenv.lib; {
     description = ''High-perfomance MySQL backup tool'';
diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix
index 687c4832e47..6423a84badc 100644
--- a/pkgs/tools/graphics/zbar/default.nix
+++ b/pkgs/tools/graphics/zbar/default.nix
@@ -8,7 +8,6 @@
 , qtbase
 , qtx11extras
 , wrapQtAppsHook
-, wrapGAppsHook
 , gtk3
 , xmlto
 , docbook_xsl
@@ -37,7 +36,6 @@ stdenv.mkDerivation rec {
     autoreconfHook
     docbook_xsl
     wrapQtAppsHook
-    wrapGAppsHook
   ];
 
   buildInputs = [
@@ -73,7 +71,7 @@ stdenv.mkDerivation rec {
   dontWrapGApps = true;
 
   postFixup = lib.optionalString enableVideo ''
-    wrapGApp "$out/bin/zbarcam-gtk"
+    wrapProgram "$out/bin/zbarcam-gtk" "''${gappsWrapperArgs[@]}"
     wrapQtApp "$out/bin/zbarcam-qt"
   '';
 
diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix
index 3986cadd08a..bc35a25cfde 100644
--- a/pkgs/tools/networking/kea/default.nix
+++ b/pkgs/tools/networking/kea/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, autoreconfHook, pkgconfig, openssl, botan2, log4cplus
-, boost, python3, postgresql, libmysqlclient, gmp, bzip2 }:
+, boost, python3, postgresql, mysql, gmp, bzip2 }:
 
 stdenv.mkDerivation rec {
   pname = "kea";
@@ -20,12 +20,12 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--localstatedir=/var"
     "--with-pgsql=${postgresql}/bin/pg_config"
-    "--with-mysql=${libmysqlclient}/bin/mysql_config"
+    "--with-mysql=${mysql.connector-c}/bin/mysql_config"
   ];
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
   buildInputs = [
-    openssl log4cplus boost python3 libmysqlclient
+    openssl log4cplus boost python3 mysql.connector-c
     botan2 gmp bzip2
   ];
 
diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix
index 40eeed7f050..f507e4dc287 100644
--- a/pkgs/tools/networking/mailutils/default.nix
+++ b/pkgs/tools/networking/mailutils/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, fetchpatch, autoreconfHook, dejagnu, gettext, pkgconfig
 , gdbm, pam, readline, ncurses, gnutls, guile, texinfo, gnum4, sasl, fribidi, nettools
-, python, gss, libmysqlclient, system-sendmail }:
+, python, gss, mysql, system-sendmail }:
 
 stdenv.mkDerivation rec {
   name = "${project}-${version}";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     sed -i -e '/chown root:mail/d' \
            -e 's/chmod [24]755/chmod 0755/' \
       */Makefile{.in,.am}
-    sed -i 's:/usr/lib/mysql:${libmysqlclient}/lib/mysql:' configure.ac
+    sed -i 's:/usr/lib/mysql:${mysql.connector-c}/lib/mysql:' configure.ac
     sed -i 's/0\.18/0.19/' configure.ac
     sed -i -e 's:mysql/mysql.h:mysql.h:' \
            -e 's:mysql/errmsg.h:errmsg.h:' \
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     gdbm pam readline ncurses gnutls guile texinfo gnum4 sasl fribidi nettools
-    gss libmysqlclient python
+    gss mysql.connector-c python
   ];
 
   patches = [
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
     (fetchurl { url = "${p}/weed.at"; sha256 = "1101xakhc99f5gb9cs3mmydn43ayli7b270pzbvh7f9rbvh0d0nh"; })
   ];
 
-  NIX_CFLAGS_COMPILE = "-L${libmysqlclient}/lib/mysql -I${libmysqlclient}/include/mysql";
+  NIX_CFLAGS_COMPILE = "-L${mysql.connector-c}/lib/mysql -I${mysql.connector-c}/include/mysql";
 
   checkInputs = [ dejagnu ];
   doCheck = false; # fails 1 out of a bunch of tests, looks like a bug
diff --git a/pkgs/tools/networking/maxscale/default.nix b/pkgs/tools/networking/maxscale/default.nix
index d047646fa71..32f6b11d77c 100644
--- a/pkgs/tools/networking/maxscale/default.nix
+++ b/pkgs/tools/networking/maxscale/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, cmake, pkgconfig, glibc
-, bison2, curl, flex, gperftools, jansson, jemalloc, kerberos, lua, libmysqlclient
+, bison2, curl, flex, gperftools, jansson, jemalloc, kerberos, lua, mariadb
 , ncurses, openssl, pcre, pcre2, perl, rabbitmq-c, sqlite, tcl
 , libaio, libedit, libtool, libui, libuuid, zlib
 }:
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake pkgconfig ];
 
   buildInputs = [
-    bison2 curl flex gperftools jansson jemalloc kerberos lua libmysqlclient
+    bison2 curl flex gperftools jansson jemalloc kerberos lua mariadb.connector-c
     ncurses openssl pcre pcre2 perl rabbitmq-c sqlite tcl
     libaio libedit libtool libui libuuid zlib
   ];
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
   postInstall = ''
     find $out/bin -type f -perm -0100 | while read f1; do
       patchelf \
-        --set-rpath "$(patchelf --print-rpath $f1):${libmysqlclient}/lib/mariadb:$out/lib/maxscale" \
+        --set-rpath "$(patchelf --print-rpath $f1):${mariadb.connector-c}/lib/mariadb:$out/lib/maxscale" \
         --set-interpreter "$(cat ${stdenv.cc}/nix-support/dynamic-linker)" $f1 \
         && patchelf --shrink-rpath $f1
     done
diff --git a/pkgs/tools/networking/modem-manager/default.nix b/pkgs/tools/networking/modem-manager/default.nix
index fedc8d4b71d..b2644d0c2a4 100644
--- a/pkgs/tools/networking/modem-manager/default.nix
+++ b/pkgs/tools/networking/modem-manager/default.nix
@@ -32,6 +32,13 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
+  postInstall = ''
+    # systemd in NixOS doesn't use `systemctl enable`, so we need to establish
+    # aliases ourselves.
+    ln -s $out/etc/systemd/system/ModemManager.service \
+      $out/etc/systemd/system/dbus-org.freedesktop.ModemManager1.service
+  '';
+
   meta = with stdenv.lib; {
     description = "WWAN modem manager, part of NetworkManager";
     homepage = https://www.freedesktop.org/wiki/Software/ModemManager/;
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index 490ebd0fa6b..5bc915caea6 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -97,6 +97,11 @@ in stdenv.mkDerivation rec {
   '';
 
   postInstall = ''
+    # systemd in NixOS doesn't use `systemctl enable`, so we need to establish
+    # aliases ourselves.
+    ln -s $out/etc/systemd/system/NetworkManager-dispatcher.service $out/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service
+    ln -s $out/etc/systemd/system/NetworkManager.service $out/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service
+
     # Add the legacy service name from before #51382 to prevent NetworkManager
     # from not starting back up:
     # TODO: remove this once 19.10 is released
diff --git a/pkgs/tools/security/thc-hydra/default.nix b/pkgs/tools/security/thc-hydra/default.nix
index 57deaaf0498..252d73b479b 100644
--- a/pkgs/tools/security/thc-hydra/default.nix
+++ b/pkgs/tools/security/thc-hydra/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, zlib, openssl, ncurses, libidn, pcre, libssh, libmysqlclient, postgresql
+{ stdenv, lib, fetchurl, zlib, openssl, ncurses, libidn, pcre, libssh, mysql, postgresql
 , withGUI ? false, makeWrapper, pkgconfig, gtk2 }:
 
 let
@@ -23,7 +23,7 @@ in stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = lib.optionals withGUI [ pkgconfig makeWrapper ];
-  buildInputs = [ zlib openssl ncurses libidn pcre libssh libmysqlclient postgresql ]
+  buildInputs = [ zlib openssl ncurses libidn pcre libssh mysql.connector-c postgresql ]
                 ++ lib.optional withGUI gtk2;
 
   postInstall = lib.optionalString withGUI ''
diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix
index 3e7e4e5969a..1df73e08d1e 100644
--- a/pkgs/tools/system/collectd/default.nix
+++ b/pkgs/tools/system/collectd/default.nix
@@ -22,7 +22,7 @@
 , libtool
 , lm_sensors
 , lvm2
-, libmysqlclient
+, mysql
 , numactl
 , postgresql
 , protobufc
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
     libxml2 postgresql protobufc rrdtool
     varnish yajl jdk libtool python hiredis libmicrohttpd
     riemann_c_client mosquitto rdkafka mongoc
-  ] ++ stdenv.lib.optionals (libmysqlclient != null) [ libmysqlclient
+  ] ++ stdenv.lib.optionals (mysql != null) [ mysql.connector-c
   ] ++ stdenv.lib.optionals stdenv.isLinux [
     iptables libatasmart libcredis libmodbus libsigrok
     lm_sensors lvm2 rabbitmq-c udev net_snmp libmnl
diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix
index 34b7b7d908a..2899837f3f8 100644
--- a/pkgs/tools/system/rsyslog/default.nix
+++ b/pkgs/tools/system/rsyslog/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, autoreconfHook, libestr, json_c, zlib, pythonPackages, fastJson
-, libkrb5 ? null, systemd ? null, jemalloc ? null, libmysqlclient ? null, postgresql ? null
+, libkrb5 ? null, systemd ? null, jemalloc ? null, mysql ? null, postgresql ? null
 , libdbi ? null, net_snmp ? null, libuuid ? null, curl ? null, gnutls ? null
 , libgcrypt ? null, liblognorm ? null, openssl ? null, librelp ? null, libksi ? null
 , libgt ? null, liblogging ? null, libnet ? null, hadoop ? null, rdkafka ? null
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     postgresql libdbi net_snmp libuuid curl gnutls libgcrypt liblognorm openssl
     librelp libgt libksi liblogging libnet hadoop rdkafka libmongo-client czmq
     rabbitmq-c hiredis mongoc
-  ] ++ stdenv.lib.optional (libmysqlclient != null) libmysqlclient
+  ] ++ stdenv.lib.optional (mysql != null) mysql.connector-c
     ++ stdenv.lib.optional stdenv.isLinux systemd;
 
   hardeningDisable = [ "format" ];
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
     (mkFlag false                     "valgrind")
     (mkFlag false                     "diagtools")
     (mkFlag true                      "usertools")
-    (mkFlag (libmysqlclient != null)  "mysql")
+    (mkFlag (mysql != null)           "mysql")
     (mkFlag (postgresql != null)      "pgsql")
     (mkFlag (libdbi != null)          "libdbi")
     (mkFlag (net_snmp != null)        "snmp")
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 38ca7129645..a837336740b 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -189,6 +189,7 @@ mapAliases ({
   libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux || stdenv.hostPlatform.libc != "glibc") gettext; # added 2018-03-14
   libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28
   liblapackWithoutAtlas = liblapack; # added 2018-11-05
+  libmysql = mysql.connector-c; # added # 2017-12-28, this was a misnomer refering to libmysqlclient
   libqrencode = qrencode;  # added 2019-01-01
   librecad2 = librecad;  # backwards compatibility alias, added 2015-10
   libsysfs = sysfsutils; # added 2018-04-25
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b521af8e782..830b1505370 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1966,7 +1966,7 @@ in
     libkrb5 = null;
     systemd = null;
     jemalloc = null;
-    libmysqlclient = null;
+    mysql = null;
     postgresql = null;
     libdbi = null;
     net_snmp = null;
@@ -11710,7 +11710,7 @@ in
   libdbi = callPackage ../development/libraries/libdbi { };
 
   libdbiDriversBase = libdbiDrivers.override {
-    libmysqlclient = null;
+    mysql = null;
     sqlite = null;
   };
 
@@ -12428,8 +12428,9 @@ in
 
   libwhereami = callPackage ../development/libraries/libwhereami { };
 
+  giflib = giflib_5_1;
   giflib_4_1 = callPackage ../development/libraries/giflib/4.1.nix { };
-  giflib     = callPackage ../development/libraries/giflib { };
+  giflib_5_1 = callPackage ../development/libraries/giflib/5.1.nix { };
 
   libunarr = callPackage ../development/libraries/libunarr { };
 
@@ -13138,7 +13139,7 @@ in
     cups = if stdenv.isLinux then cups else null;
 
     # XXX: mariadb doesn't built on fbsd as of nov 2015
-    libmysqlclient = if (!stdenv.isFreeBSD) then libmysqlclient else null;
+    mysql = if (!stdenv.isFreeBSD) then mysql else null;
 
     inherit (pkgs.darwin) libobjc;
     inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices OpenGL Cocoa AGL;
@@ -13897,7 +13898,7 @@ in
 
   unixODBC = callPackage ../development/libraries/unixODBC { };
 
-  unixODBCDrivers = recurseIntoAttrs (callPackages ../development/libraries/unixODBCDrivers { });
+  unixODBCDrivers = recurseIntoAttrs (callPackages ../development/libraries/unixODBCDrivers {});
 
   ustr = callPackage ../development/libraries/ustr { };
 
@@ -14885,17 +14886,8 @@ in
 
   rpcbind = callPackage ../servers/rpcbind { };
 
-  libmysqlclient = libmysqlclient_3_1;
-  libmysqlclient_3_1 = mariadb-connector-c_3_1;
-  mariadb-connector-c = mariadb-connector-c_3_1;
-  mariadb-connector-c_3_1 = callPackage ../servers/sql/mariadb/connector-c/3_1.nix { };
-
-  mariadb-galera = mariadb-galera_25;
-  mariadb-galera_25 = callPackage ../servers/sql/mariadb/galera/25.nix {
-    asio = asio_1_10;
-  };
-
   mariadb = callPackage ../servers/sql/mariadb {
+    asio = asio_1_10;
     # As per mariadb's cmake, "static jemalloc_pic.a can only be used up to jemalloc 4".
     # https://jira.mariadb.org/browse/MDEV-15034
     jemalloc = jemalloc450.override ({ disableInitExecTls = true; });
@@ -24163,7 +24155,7 @@ in
   mnemonicode = callPackage ../misc/mnemonicode { };
 
   mysql-workbench = callPackage ../applications/misc/mysql-workbench (let mysql = mysql57; in {
-    gdal = gdal.override {libmysqlclient = mysql // {lib = {dev = mysql;};};};
+    gdal = gdal.override {mysql = mysql // {lib = {dev = mysql;};};};
     mysql = mysql;
     pcre = pcre-cpp;
   });
-- 
GitLab


From e5f3951f620796fcc34b4e96d84d9dfeb42bef69 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 21 Sep 2019 20:13:32 +0200
Subject: [PATCH 0699/2254] androidStudioPackages.{dev,canary}: 3.6.0.11 ->
 3.6.0.12

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

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index 2a9129cfebf..b059747e052 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -14,9 +14,9 @@ let
   };
   betaVersion = stableVersion;
   latestVersion = { # canary & dev
-    version = "3.6.0.11"; # "Android Studio 3.6 Canary 11"
-    build = "192.5863777";
-    sha256Hash = "1wz4vcdj4225vffsq0ji4zgg9qaqlfd21x7c6nczhqvydbyrjzg8";
+    version = "3.6.0.12"; # "Android Studio 3.6 Canary 12"
+    build = "192.5871855";
+    sha256Hash = "0pxvpxqdxv37sl72p7gml70k6kl717k6avw9p0l00cys0zbvb3zq";
   };
 in {
   # Attributes are named by their corresponding release channels
-- 
GitLab


From 60a897d4c7f1d38ee2cf1cab00ad01de6ad9c0e9 Mon Sep 17 00:00:00 2001
From: millerjason <mailings-github@millerjason.com>
Date: Sat, 21 Sep 2019 14:48:48 -0400
Subject: [PATCH 0700/2254] vimPlugins.vim-gui-position: init at 2019-06-06
 (#68294)

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

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index c82e7dcf8d4..d6537ad820e 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -3466,6 +3466,17 @@ let
     };
   };
 
+  vim-gui-position = buildVimPluginFrom2Nix {
+    pname = "vim-gui-position";
+    version = "2019-06-06";
+    src = fetchFromGitHub {
+      owner = "brennanfee";
+      repo = "vim-gui-position";
+      rev = "065d0dcf96c28cfc0003d72c1b3c49203632f62a";
+      sha256 = "11kv9kkya9sybslg7lfhhcn2fi3n735zvprg8ch6kd58m82xr4n3";
+    };
+  };
+
   vim-gutentags = buildVimPluginFrom2Nix {
     pname = "vim-gutentags";
     version = "2019-05-06";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 67dd2db4a9f..9a177c91d29 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -23,6 +23,7 @@ bitc/vim-hdevtools
 bkad/camelcasemotion
 bling/vim-bufferline
 bogado/file-line
+brennanfee/vim-gui-position
 bronson/vim-trailing-whitespace
 brooth/far.vim
 carlitux/deoplete-ternjs
-- 
GitLab


From 96efeeac3073bfb6cfc7889cb53e2df15662d962 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Sat, 21 Sep 2019 20:56:45 +0200
Subject: [PATCH 0701/2254] vimPlugins: update

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

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index d6537ad820e..3489cac45b4 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -61,12 +61,12 @@ let
 
   ale = buildVimPluginFrom2Nix {
     pname = "ale";
-    version = "2019-09-12";
+    version = "2019-09-20";
     src = fetchFromGitHub {
       owner = "w0rp";
       repo = "ale";
-      rev = "61cfb3fefb0ebd8654be452046bd2ba24025311f";
-      sha256 = "11i5jr5zgvkl7wr99jjldyypbd5xsnyj8q9j379gl2xk5brjwbaf";
+      rev = "ab8e0433536dc6074c77f6ed1fa18325ea1be349";
+      sha256 = "0nlpcph9f0sfx50rvzdc2vz6b23x2hgx46ywjflfix54cmakpkl8";
     };
   };
 
@@ -83,12 +83,12 @@ let
 
   ansible-vim = buildVimPluginFrom2Nix {
     pname = "ansible-vim";
-    version = "2019-01-30";
+    version = "2019-09-15";
     src = fetchFromGitHub {
       owner = "pearofducks";
       repo = "ansible-vim";
-      rev = "dec377ddffd6616aa156029a5f065496582f697b";
-      sha256 = "1rmji65skhnf1658f67kaxbhfiwcc7yf91n96ni74djsp26mqfzm";
+      rev = "95531d40e5c5a6417aac53b7d4e8bd7130d5efe6";
+      sha256 = "1xa8hh95am0baxrjm411fdpzmf3mkkfcpb56cxr81n9idmq1qlqp";
     };
   };
 
@@ -138,12 +138,12 @@ let
 
   awesome-vim-colorschemes = buildVimPluginFrom2Nix {
     pname = "awesome-vim-colorschemes";
-    version = "2019-08-29";
+    version = "2019-09-21";
     src = fetchFromGitHub {
       owner = "rafi";
       repo = "awesome-vim-colorschemes";
-      rev = "112b534f5a2b3c919cd9aa04767827bceae9ed18";
-      sha256 = "09lhlllzapjawhhhsz5av11h1k944nq3bsg55xrfqsx8yghgdy7z";
+      rev = "21f5c63f22fe70b0fae3ff0fb9e55c602e622ea7";
+      sha256 = "1k7h8faz9qqyqzpkxxhsjsdqyah6amwk3rlhxygz9qg25mp558xf";
     };
   };
 
@@ -303,34 +303,34 @@ let
 
   coc-git = buildVimPluginFrom2Nix {
     pname = "coc-git";
-    version = "2019-09-10";
+    version = "2019-09-19";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-git";
-      rev = "c463de323cb7f162747e545bff694d6293a9be60";
-      sha256 = "15r8gwsk69gg1p68jgi3gw0m29lbfs7iddcmhgr5qkrvk8rhhi1j";
+      rev = "672beb8976e0a8fe0e5c52dc00263144077b659d";
+      sha256 = "0g6cwcbirkqqnljyhlpfdx2q09b5irrp39bqlgl9qb912sz90fqg";
     };
   };
 
   coc-go = buildVimPluginFrom2Nix {
     pname = "coc-go";
-    version = "2019-09-13";
+    version = "2019-09-16";
     src = fetchFromGitHub {
       owner = "josa42";
       repo = "coc-go";
-      rev = "059f6ecae0849024d299d9e744622d439c73ddca";
-      sha256 = "0n9ffsk9qds5ap3049kw05v167ialhmix28mwygdxgzjvr9qpd4q";
+      rev = "3c7954c3e167ca3785efb96d3e95563b7e0d4045";
+      sha256 = "0nir8yvqrz2a8zmjp8ny4s08qlcvy3ms6k55i21xvyjwyrmrknpq";
     };
   };
 
   coc-highlight = buildVimPluginFrom2Nix {
     pname = "coc-highlight";
-    version = "2019-08-03";
+    version = "2019-09-20";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-highlight";
-      rev = "b84cfa2738ab0843217c742eb69b4b6e630d45fa";
-      sha256 = "0yrl29fdn0hwyiz4z75km1gidc4bkx1ra6g1pfddlwbbjj32lbqp";
+      rev = "775dd5e0a2c8f6e3834e002ca855a305ca267422";
+      sha256 = "0dmzpfvxj8kw6knnsbfjzx1d3n9i5rff9nw7j9pl1brmgk2r5r77";
     };
   };
 
@@ -358,12 +358,12 @@ let
 
   coc-java = buildVimPluginFrom2Nix {
     pname = "coc-java";
-    version = "2019-07-17";
+    version = "2019-09-17";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-java";
-      rev = "50343bf5e965e311444aade22599f9d247902852";
-      sha256 = "08crsdw2cgn30j6mbkm74zsgi92khb1xdkx53gk1r33qcgbzi47y";
+      rev = "7e3bdee15b28f5d7f3b1654429c89cb0d93436e5";
+      sha256 = "0r17w00mbs1gshshm8c56cqi37z5i5vdk2sifs2clazlyn9rl6zm";
     };
   };
 
@@ -424,12 +424,12 @@ let
 
   coc-prettier = buildVimPluginFrom2Nix {
     pname = "coc-prettier";
-    version = "2019-09-10";
+    version = "2019-09-16";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-prettier";
-      rev = "b78dcb1000841a428d23d457ac93c190b98f7b35";
-      sha256 = "0krc9dnzglh8rff68xyp27qjdgmqhxvl94jy1x4asl5a5srzz7v7";
+      rev = "5b25fc3a4709c1e0e61f95ec82f039d1b8c426a3";
+      sha256 = "1j4whxna3gjjs29ndlfr9wpzylapa889831yf1pn7lz2847hnjdr";
     };
   };
 
@@ -766,12 +766,12 @@ let
 
   dart-vim-plugin = buildVimPluginFrom2Nix {
     pname = "dart-vim-plugin";
-    version = "2019-05-04";
+    version = "2019-09-20";
     src = fetchFromGitHub {
       owner = "dart-lang";
       repo = "dart-vim-plugin";
-      rev = "8ffc3e208c282f19afa237d343fa1533146bd2b4";
-      sha256 = "1ypcn3212d7gzfgvarrsma0pvaial692f3m2c0blyr1q83al1pm8";
+      rev = "27b3ebd24f1c5690700b7f94f112c06216a0dd76";
+      sha256 = "012vg71h0jijhj430dqd38xh2gq5k79zr1m59gvh004jjb8bh8c7";
     };
   };
 
@@ -810,12 +810,12 @@ let
 
   denite-nvim = buildVimPluginFrom2Nix {
     pname = "denite-nvim";
-    version = "2019-09-08";
+    version = "2019-09-19";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "denite.nvim";
-      rev = "dedeed5cb3fab46465a1f30efa4875c4937ed2f7";
-      sha256 = "1c65mhc4dw0zf1azqfnjf7l5gp2pxayq8qv0j1lvlqpn6q6gg1di";
+      rev = "a4969dfe9decc6184548b919379ec39027d627c6";
+      sha256 = "0crwjbvflvf5axgqqfj04q67ilgfnhchi0gxbxi152h6hm4f1wx3";
     };
   };
 
@@ -901,12 +901,12 @@ let
 
   deoplete-lsp = buildVimPluginFrom2Nix {
     pname = "deoplete-lsp";
-    version = "2019-09-11";
+    version = "2019-09-20";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "deoplete-lsp";
-      rev = "28b15222852a0668b25ce04b66302275ea8cd4c5";
-      sha256 = "05n1smyjlzzq428h5hfs0drifxwjbshc9csv8jx7yjwpm4gqy2md";
+      rev = "335e8a03d5741aa42bd7ce64d79e31d7de570ab5";
+      sha256 = "0jn4fn9vkxf3av6mdmzixz20l9ca8n2sql7j9mcmh06mn86949bs";
     };
   };
 
@@ -934,12 +934,12 @@ let
 
   deoplete-nvim = buildVimPluginFrom2Nix {
     pname = "deoplete-nvim";
-    version = "2019-09-14";
+    version = "2019-09-20";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "deoplete.nvim";
-      rev = "8df5ca1a9db11d919f3426f4d05b281be8913c89";
-      sha256 = "0c0g9h8fajmwb2snkqj093jwc8d1ypxcvmv7s80c90l635bks1yj";
+      rev = "7f1d4d8b1f5dbf344f2d0d1f4b8c5d6a0aaa24a6";
+      sha256 = "1i8964nwarq2hwbixbj74n5a5k8c27hn7srbf8bbckk12rh1rjkj";
     };
   };
 
@@ -1046,12 +1046,12 @@ let
 
   falcon = buildVimPluginFrom2Nix {
     pname = "falcon";
-    version = "2019-09-12";
+    version = "2019-09-17";
     src = fetchFromGitHub {
       owner = "fenetikm";
       repo = "falcon";
-      rev = "3ba858de194fc53b301fb640ab71b4263bc66175";
-      sha256 = "1vbzlq7k2l0yqhdcnldkliwyzqskf1bqjgxl2l4c0nj8rcjm5bw3";
+      rev = "a6ba8a5d6745d92a23eb8b95562bbd9f05f8de5f";
+      sha256 = "0in4fs2aycwyspi1yck36f6w6m9jmjm5ckdq5wxisvjncnzxblhs";
     };
   };
 
@@ -1388,12 +1388,12 @@ let
 
   jedi-vim = buildVimPluginFrom2Nix {
     pname = "jedi-vim";
-    version = "2019-08-18";
+    version = "2019-09-18";
     src = fetchFromGitHub {
       owner = "davidhalter";
       repo = "jedi-vim";
-      rev = "4f2499e4f2cb8bbecda6130a9dbb306fbb746ebe";
-      sha256 = "1gnyrfx0qbap7vm2rvg0w70ybjdny7c1ixzymqd1w9wv7krz5h8y";
+      rev = "89c995e7d964fb71c715e6f4ac330e4c59b44128";
+      sha256 = "02ks1bwrdw7zmnf9mipvfjla9cv6904sx18q9qnyrqbkclrpfn0y";
       fetchSubmodules = true;
     };
   };
@@ -1730,12 +1730,12 @@ let
 
   neomake = buildVimPluginFrom2Nix {
     pname = "neomake";
-    version = "2019-09-03";
+    version = "2019-09-19";
     src = fetchFromGitHub {
       owner = "neomake";
       repo = "neomake";
-      rev = "776a6f6e27330e38324b7ad4873329760adf72e3";
-      sha256 = "0lxqqknp1xmaa8ys5ck5m9pyxv0hbpaba1bsv6fx6j6jb71nz590";
+      rev = "ba38b8786ce68c36fc3cd2139a7820b25bea378a";
+      sha256 = "187zj4ircbbhn7gp3gabzrcnld3mz5g76ibp4wbcxngml60hhk9r";
     };
   };
 
@@ -1785,12 +1785,12 @@ let
 
   neoterm = buildVimPluginFrom2Nix {
     pname = "neoterm";
-    version = "2019-09-12";
+    version = "2019-09-21";
     src = fetchFromGitHub {
       owner = "kassio";
       repo = "neoterm";
-      rev = "511f6c64ca2530f4356e0b301ee0f34b956ac7aa";
-      sha256 = "1645q70jg81jy7gxdd8kr7i5pgkr2k7i71ijk4k23lxj0yd4fsim";
+      rev = "f6c22fda80455b52957b3fd11d94acc44db21250";
+      sha256 = "1r1fx958qhbs8xq31wrp5jyfvqjrs611xywv7avpwy9991rh33xv";
     };
   };
 
@@ -1818,23 +1818,23 @@ let
 
   nerdcommenter = buildVimPluginFrom2Nix {
     pname = "nerdcommenter";
-    version = "2019-09-13";
+    version = "2019-09-20";
     src = fetchFromGitHub {
       owner = "scrooloose";
       repo = "nerdcommenter";
-      rev = "8228c7b0a7aa46b7846f7bf21bcb89ce24b9c20e";
-      sha256 = "098alydvc9calcxkv77c8wkxw41p2az2dk70bx279ngz648i150c";
+      rev = "50f307bbf68e7402a1564689910ec65ae7ab1781";
+      sha256 = "0f3b9vx3lvq8612k1qnsdzbwp2drvy1vj3xqfxvxpzzsay10qcb1";
     };
   };
 
   nerdtree = buildVimPluginFrom2Nix {
     pname = "nerdtree";
-    version = "2019-09-13";
+    version = "2019-09-15";
     src = fetchFromGitHub {
       owner = "scrooloose";
       repo = "nerdtree";
-      rev = "60ec10b477eefc81eeafafa2a8c1b00046ee48fb";
-      sha256 = "1l9lz56cdkifp4arf05z298jg0yfvr2wvfbnzaff62yc38n4hb4b";
+      rev = "9193962ad88f15d9f426c3cfb8a274ff1dd0c5b2";
+      sha256 = "1mgi6k3q46za4c8z9nc4rn6pcj4bc9pkvfqbzymwn03pj4r6n8yp";
     };
   };
 
@@ -2005,12 +2005,12 @@ let
 
   psc-ide-vim = buildVimPluginFrom2Nix {
     pname = "psc-ide-vim";
-    version = "2018-03-11";
+    version = "2019-09-17";
     src = fetchFromGitHub {
       owner = "frigoeu";
       repo = "psc-ide-vim";
-      rev = "6d4a3cc27e9782b703f6dd61ef5fdf27054bac0f";
-      sha256 = "19w0cvrka3klxbh9z1yq873v92rhmxdj68bdnqxzwybf24hgsk9g";
+      rev = "5fb4e329e5c0c7d80f0356ab4028eee9c8bd3465";
+      sha256 = "0gzbxsq6wh8d9z9vyrff4hdpc66yg9y8hnxq4kjrz9qrccc75c1f";
     };
   };
 
@@ -2181,12 +2181,12 @@ let
 
   rust-vim = buildVimPluginFrom2Nix {
     pname = "rust-vim";
-    version = "2019-08-30";
+    version = "2019-09-20";
     src = fetchFromGitHub {
       owner = "rust-lang";
       repo = "rust.vim";
-      rev = "e99f3f5bc60e15c488989f6208769a271ccf0e9f";
-      sha256 = "1sq6z878llxx78x7b8y3g1z9w1c412kj7zv9kq50njff43rddjiy";
+      rev = "d0456774a8a9616fea9df66e5131d6428450ebed";
+      sha256 = "1zbd7gbiyx1lmr8kg70xwad88rrs18q7rgy7yv85l57zs71ffnib";
     };
   };
 
@@ -2203,12 +2203,12 @@ let
 
   semshi = buildVimPluginFrom2Nix {
     pname = "semshi";
-    version = "2019-09-12";
+    version = "2019-09-15";
     src = fetchFromGitHub {
       owner = "numirias";
       repo = "semshi";
-      rev = "741916c472adc40f82d191ec48e668e88251e626";
-      sha256 = "0ld4fk8a8k2mf8q32zjq3lbb8nhdg214n5kp221z0vw2a72zgkjn";
+      rev = "ca6b2c16dd374d672861b2c73c33f41c88e5cb39";
+      sha256 = "0nmywnfs8rm6vlcyycnk1zvpp044n1d714xw5sn4qpw4gz1acbm7";
     };
   };
 
@@ -2852,12 +2852,12 @@ let
 
   vim-airline-themes = buildVimPluginFrom2Nix {
     pname = "vim-airline-themes";
-    version = "2019-07-23";
+    version = "2019-09-18";
     src = fetchFromGitHub {
       owner = "vim-airline";
       repo = "vim-airline-themes";
-      rev = "b85165844240fe0b9121df487679a320e053abc7";
-      sha256 = "0yi381n7k3flcld66n8hhb3fzbqflif5d07qwn8f6zsg9n52dciw";
+      rev = "0d5c5c1e2995126e76606a628316c8e3f5efb37a";
+      sha256 = "1xra1yiz03pap18hsq00053s42xf185ls9qydrkgpyjypqdnm5bg";
     };
   };
 
@@ -2973,12 +2973,12 @@ let
 
   vim-choosewin = buildVimPluginFrom2Nix {
     pname = "vim-choosewin";
-    version = "2019-08-21";
+    version = "2019-09-17";
     src = fetchFromGitHub {
       owner = "t9md";
       repo = "vim-choosewin";
-      rev = "6da5c0b96e63f51f0801266b781dee0562e74da9";
-      sha256 = "0f1x57gzvv97h8maz8i1h5dmgxqvf4lwf1bza380l0nm7m5bdpg5";
+      rev = "f91cdb9be92ce3bb9bccba16e8c659d5e8d7454f";
+      sha256 = "1nq1vpwv6h5sc849y26nzkrmr9w3aj6w32apyih9kx0jh4ybv0xs";
     };
   };
 
@@ -3127,12 +3127,12 @@ let
 
   vim-devicons = buildVimPluginFrom2Nix {
     pname = "vim-devicons";
-    version = "2019-09-14";
+    version = "2019-09-17";
     src = fetchFromGitHub {
       owner = "ryanoasis";
       repo = "vim-devicons";
-      rev = "3e67b21c6e6f955ee5051608c559c2e91c2ce3e5";
-      sha256 = "0105s1d1pn1ga2zpqi1lgjnx36plgfsniqx1b560dvmg8wglzpwx";
+      rev = "0f9146e9fafe3317693ca214a3f68cd1e036424f";
+      sha256 = "086ng0gja855bmh99qcwwvchwk64dgz1kj1j24yapx2ab314w6g8";
     };
   };
 
@@ -3160,12 +3160,12 @@ let
 
   vim-dispatch = buildVimPluginFrom2Nix {
     pname = "vim-dispatch";
-    version = "2019-08-07";
+    version = "2019-09-20";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-dispatch";
-      rev = "a76bec9196fe27e195d167a5c2ee1da763d31b96";
-      sha256 = "0a9sxpdpll68drk3w98xvmv2z31q4afw70iwjrb7lmp8raxn0i2z";
+      rev = "1f39fa150fc9275ff264e1f8807fc6fcbbdae012";
+      sha256 = "0c1492hh0gldjyd8w3wsyz6py7qw4r2idfjh8klkk39pg9aajwjl";
     };
   };
 
@@ -3358,12 +3358,12 @@ let
 
   vim-fugitive = buildVimPluginFrom2Nix {
     pname = "vim-fugitive";
-    version = "2019-09-11";
+    version = "2019-09-19";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-fugitive";
-      rev = "26f6037de68254376cd062286aeeaa7db804a973";
-      sha256 = "0cza5v99493llr02all1zwjy3gk19hypngk6j3kcrg7530c9sq6n";
+      rev = "1d8c0a38b2fc4ce9ca4204676573b6335725ff75";
+      sha256 = "0ln11qdpsssgqd122zldfmjvwyvxild8a0yxgdazp720dypkvgjm";
     };
   };
 
@@ -3402,12 +3402,12 @@ let
 
   vim-gitgutter = buildVimPluginFrom2Nix {
     pname = "vim-gitgutter";
-    version = "2019-09-05";
+    version = "2019-09-19";
     src = fetchFromGitHub {
       owner = "airblade";
       repo = "vim-gitgutter";
-      rev = "b71ab64dc16a4665c3214f109000a11d30708079";
-      sha256 = "1pqd9zf311s0in5x3njzcxkw6zyqa2vpznl5ahd4b9hk4qvcm2v8";
+      rev = "76aa5920dba9b05991940f7dc29dc79ad7af0a3e";
+      sha256 = "0yazz5aqyfkwhx2x44pp8x81wswrh7sjgslbimwa9d67yvnh0bz6";
     };
   };
 
@@ -3435,12 +3435,12 @@ let
 
   vim-go = buildVimPluginFrom2Nix {
     pname = "vim-go";
-    version = "2019-09-13";
+    version = "2019-09-21";
     src = fetchFromGitHub {
       owner = "fatih";
       repo = "vim-go";
-      rev = "041ca9669bbbe4a50b382d8972a7191edf873f55";
-      sha256 = "1q3sca1gpxc7iqdk6wkdzndwpf8i8z69is4jwmnhr0sk0jrjby6q";
+      rev = "6904ded741573113c20408abdce455c5d3969e08";
+      sha256 = "12ill4rpfc3bzxa6s47mscvbclidnckxci3rdixzkvrmwsyyip6k";
     };
   };
 
@@ -3699,12 +3699,12 @@ let
 
   vim-javacomplete2 = buildVimPluginFrom2Nix {
     pname = "vim-javacomplete2";
-    version = "2019-02-07";
+    version = "2019-09-16";
     src = fetchFromGitHub {
       owner = "artur-shaik";
       repo = "vim-javacomplete2";
-      rev = "29fee1cb4554eef3e5a30984ac7a389766ee4da4";
-      sha256 = "1kzx80hz9n2bawrx9lgsfqmjkljbgc1lpl8abnhfzkyy9ax9svk3";
+      rev = "24e7908bae33df5851f7085f5ec3af0ca81f060c";
+      sha256 = "1bqrhkxk6f5ha7xlkgqrp96a1pfk9258x5b4iz3kbk2gqp6mcrmb";
     };
   };
 
@@ -3788,12 +3788,12 @@ let
 
   vim-jsx-pretty = buildVimPluginFrom2Nix {
     pname = "vim-jsx-pretty";
-    version = "2019-09-07";
+    version = "2019-09-18";
     src = fetchFromGitHub {
       owner = "MaxMEllon";
       repo = "vim-jsx-pretty";
-      rev = "6871eb1696478a8e295bab3e5ae7aae05faa2605";
-      sha256 = "0i80d5vdd5ycx0g0h00raa3g48xhgw3wf3blp1m3hwap6cxy9p8h";
+      rev = "89c30c0defe8ddb31bc0d3cfa5f22f3f6d8eb24f";
+      sha256 = "1l5cwlbmihzxldpxlvn5gc47s0awqs908skzq43cy44iql829hir";
     };
   };
 
@@ -4151,12 +4151,12 @@ let
 
   vim-parinfer = buildVimPluginFrom2Nix {
     pname = "vim-parinfer";
-    version = "2019-07-02";
+    version = "2019-09-19";
     src = fetchFromGitHub {
       owner = "bhurlow";
       repo = "vim-parinfer";
-      rev = "217255335414b3046f683bd3085fbf16b00bb090";
-      sha256 = "10jhcmkivspr15xmprdi484r8va7v8jqflx9xkxwficfjd52lvck";
+      rev = "eba349553e2438dcc9d37f3a6aff2807af731c3f";
+      sha256 = "07cppsywz60ss0af86z4ia9kbixnwf9bl437fxq7hwhx6wig0njq";
     };
   };
 
@@ -4261,12 +4261,12 @@ let
 
   vim-puppet = buildVimPluginFrom2Nix {
     pname = "vim-puppet";
-    version = "2019-04-23";
+    version = "2019-09-16";
     src = fetchFromGitHub {
       owner = "rodjek";
       repo = "vim-puppet";
-      rev = "b2ae19b3ef397ed7404bf15051cbc5ff655b893e";
-      sha256 = "1hidg2cqls9qy0lazahxi26gyj4lwncpc3vzy4m9xjd3y1lmlqri";
+      rev = "fc6e9efef797c505b2e67631ad2517d7d6e8f00d";
+      sha256 = "0a4qv8f74g6c2i9l6kv3zbcq9lskhdqg86w12f8hshw1vkfmfr4x";
     };
   };
 
@@ -4492,12 +4492,12 @@ let
 
   vim-snippets = buildVimPluginFrom2Nix {
     pname = "vim-snippets";
-    version = "2019-09-13";
+    version = "2019-09-19";
     src = fetchFromGitHub {
       owner = "honza";
       repo = "vim-snippets";
-      rev = "2221222df8cbc1a99c29f3e55a7c340f4d16b1ff";
-      sha256 = "0vjgxxg7aq5j7lxc0pn0fral5gjb4fpc42442q8mkik6cpkd92h0";
+      rev = "db67e54d5998dbfbe9fe4161a29d74323031b1fa";
+      sha256 = "1d5mynnb90fnc1w0glfg2m953iphmhxndd5gmflg25720n3msdls";
     };
   };
 
@@ -4547,12 +4547,12 @@ let
 
   vim-startify = buildVimPluginFrom2Nix {
     pname = "vim-startify";
-    version = "2019-08-27";
+    version = "2019-09-19";
     src = fetchFromGitHub {
       owner = "mhinz";
       repo = "vim-startify";
-      rev = "13b67af7aa6a454adbf1f0925bf41737889ed830";
-      sha256 = "015vak1awjzxwwrhkq6hdwf7wb7v0llswm95ky7zvkpqv8yncxhh";
+      rev = "9814df57c199271a9b2b70c75ebe4189dc96b126";
+      sha256 = "1rsss95six8f9w075k46318kq2sapijik13jzkakf5nfxlbi2raw";
     };
   };
 
@@ -4646,12 +4646,12 @@ let
 
   vim-terraform = buildVimPluginFrom2Nix {
     pname = "vim-terraform";
-    version = "2019-08-29";
+    version = "2019-09-15";
     src = fetchFromGitHub {
       owner = "hashivim";
       repo = "vim-terraform";
-      rev = "ed2b552cbf8d8c14a56f75d106a6efb4303f5233";
-      sha256 = "0a67ayc12l6gc4b80lxic1qvr2sfbgsa6bxshdsq9p661vsmym1p";
+      rev = "81dd8ea296660a51618cefed62462ddff56f22fa";
+      sha256 = "1im4klyfgz5ab98ygc0jw1h9gnylab8zvzm4pk2rga2zbz9ymkxj";
     };
   };
 
@@ -4965,12 +4965,12 @@ let
 
   vimtex = buildVimPluginFrom2Nix {
     pname = "vimtex";
-    version = "2019-09-13";
+    version = "2019-09-20";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "365e3d27d922036d5770a2591a3670cc5a3db777";
-      sha256 = "1rgafa05lfvyzznlq1y7cb3b3q3m2df5j82ggjwds7wfl4pm4zcz";
+      rev = "ece9f454ac2f590629ebbbbe4b0bb23deafdcb04";
+      sha256 = "05h1hya3c4k9z1x2k13k1a1zpq8lf7nr8ggg548mmayh0cv5qvqs";
     };
   };
 
@@ -5120,12 +5120,12 @@ let
 
   youcompleteme = buildVimPluginFrom2Nix {
     pname = "youcompleteme";
-    version = "2019-08-31";
+    version = "2019-09-18";
     src = fetchFromGitHub {
       owner = "valloric";
       repo = "youcompleteme";
-      rev = "5274b73fc26deb5704733e0efbb4b2d53dc6dc9c";
-      sha256 = "03kpq7mw4dimaahf9q6qm6nblzw7hr0p7i6m6x3b9ilkka5q13rz";
+      rev = "bdbfdd938fe711ff75155546fc0a0e0bebcb952a";
+      sha256 = "0dxip8xi6s74045hvbx6av16caid150lvywg2sn7kq5x6zcc9dgc";
       fetchSubmodules = true;
     };
   };
@@ -5154,23 +5154,23 @@ let
 
   zenburn = buildVimPluginFrom2Nix {
     pname = "zenburn";
-    version = "2019-09-13";
+    version = "2019-09-20";
     src = fetchFromGitHub {
       owner = "jnurmine";
       repo = "zenburn";
-      rev = "13254888f5ebe53c3d9276c8afc18efe6addec8e";
-      sha256 = "1xdi8q4cggv16bv71ap8y8xrmzb7pjvknrymrnab55fgbpkxhzaj";
+      rev = "d39461f7ad13814307cc0115122b32901662a86e";
+      sha256 = "1ww4irkl6h2q9p1y2gj87j4hy0rh2gkfz8nyzfn32z6rjsmj5n3c";
     };
   };
 
   zig-vim = buildVimPluginFrom2Nix {
     pname = "zig-vim";
-    version = "2019-09-05";
+    version = "2019-09-19";
     src = fetchFromGitHub {
       owner = "zig-lang";
       repo = "zig.vim";
-      rev = "06e918ba082bbe41544208430d6946b547ce3530";
-      sha256 = "1sfh1xmsf8smgr7vpj6r11gp3wmw5zzf095w2li9rw8l2g54cwql";
+      rev = "29d9358a825c56a31f6438ea93eb09f091998f0d";
+      sha256 = "1rah0fm3qxv3jjb0ma2pn5kvbg2fwg4p5ycgm6vjbq95j73f5aq1";
     };
   };
 
-- 
GitLab


From 53c3ad4fff823de3246bb37dda9e58c2d51613c5 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Sep 2019 02:00:00 -0500
Subject: [PATCH 0702/2254] spotifyd: 0.2.11 -> 0.2.14

---
 pkgs/applications/audio/spotifyd/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/audio/spotifyd/default.nix b/pkgs/applications/audio/spotifyd/default.nix
index 9035a2a73c5..7734a7f3067 100644
--- a/pkgs/applications/audio/spotifyd/default.nix
+++ b/pkgs/applications/audio/spotifyd/default.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "spotifyd";
-  version = "0.2.11";
+  version = "0.2.14";
 
   src = fetchFromGitHub {
     owner = "Spotifyd";
     repo = "spotifyd";
-    rev = version;
-    sha256 = "1iybk9xrrvhrcl2xl5r2xhyn1ydhrgwnnb8ldhsw5c16b32z03q1";
+    rev = "v${version}";
+    sha256 = "1hbcyc5rdrvdnvvsgaykqamq4i0yq8wqq5qjp6zjf4jlaxxif4nz";
   };
 
-  cargoSha256 = "1dzg4sb95ixjfhx6n4w2rgrq4481vw01nsdrbm746mz7nm71csk3";
+  cargoSha256 = "15gd8shg0mn4vsma2hckj6w8gkwr58iniyfw1vjrh4clw4x7ibb4";
 
   cargoBuildFlags = [
     "--no-default-features"
@@ -30,6 +30,8 @@ rustPlatform.buildRustPackage rec {
     ++ stdenv.lib.optional withPulseAudio libpulseaudio
     ++ stdenv.lib.optional withPortAudio portaudio;
 
+  doCheck = false;
+
   meta = with stdenv.lib; {
     description = "An open source Spotify client running as a UNIX daemon";
     homepage = "https://github.com/Spotifyd/spotifyd";
-- 
GitLab


From 695f04632d45518c6ce008ed05a3f18696b8d7c7 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Sep 2019 02:01:00 -0500
Subject: [PATCH 0703/2254] spotifyd: fix build on darwin

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 830b1505370..2d182586cec 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18735,7 +18735,7 @@ in
 
   spotifyd = callPackage ../applications/audio/spotifyd {
     withALSA = stdenv.isLinux;
-    withPulseAudio = config.pulseaudio or true;
+    withPulseAudio = config.pulseaudio or stdenv.isLinux;
     withPortAudio = stdenv.isDarwin;
   };
 
-- 
GitLab


From 54433c443bfe390d4e4ef27d2c3d5cb5ce02ffde Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Sep 2019 17:10:00 -0500
Subject: [PATCH 0704/2254] nixos/spotifyd: update spotifyd flags

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

diff --git a/nixos/modules/services/audio/spotifyd.nix b/nixos/modules/services/audio/spotifyd.nix
index e3556b2559c..4b74e753279 100644
--- a/nixos/modules/services/audio/spotifyd.nix
+++ b/nixos/modules/services/audio/spotifyd.nix
@@ -28,7 +28,7 @@ in
       after = [ "network-online.target" "sound.target" ];
       description = "spotifyd, a Spotify playing daemon";
       serviceConfig = {
-        ExecStart = "${pkgs.spotifyd}/bin/spotifyd --no-daemon --cache_path /var/cache/spotifyd --config ${spotifydConf}";
+        ExecStart = "${pkgs.spotifyd}/bin/spotifyd --no-daemon --cache-path /var/cache/spotifyd --config-path ${spotifydConf}";
         Restart = "always";
         RestartSec = 12;
         DynamicUser = true;
-- 
GitLab


From de627c704bc1c9946a2b3914f291151e81c0f7e5 Mon Sep 17 00:00:00 2001
From: Danielle Lancashire <dani@builds.terrible.systems>
Date: Sat, 21 Sep 2019 11:41:40 +0200
Subject: [PATCH 0705/2254] firecracker: 0.15.2 -> 0.18.0

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

diff --git a/pkgs/applications/virtualization/firecracker/default.nix b/pkgs/applications/virtualization/firecracker/default.nix
index 45ec7383fc8..53ace1b5d8b 100644
--- a/pkgs/applications/virtualization/firecracker/default.nix
+++ b/pkgs/applications/virtualization/firecracker/default.nix
@@ -1,7 +1,7 @@
 { fetchurl, stdenv }:
 
 let
-  version = "0.15.2";
+  version = "0.18.0";
   baseurl = "https://github.com/firecracker-microvm/firecracker/releases/download";
 
   fetchbin = name: sha256: fetchurl {
@@ -9,8 +9,8 @@ let
     inherit sha256;
   };
 
-  firecracker-bin = fetchbin "firecracker" "11g0iz1krsm6gzhvf0fb4101c6qyk6bl8j3kjidbb52x9i4aqsxk";
-  jailer-bin      = fetchbin "jailer"      "0j1gc1cdsfsi82fkvvxla25791lcvk6vmp46i82f0ms9xm7xhswz";
+  firecracker-bin = fetchbin "firecracker" "140g93z0k8yd9lr049ps4dj0psb9ac1v7g5zs7lzpws9rj8shmgh";
+  jailer-bin      = fetchbin "jailer"      "0sk1zm1fx0zdy5il8vyygzads72ni2lcil42wv59j8b2bg8p7fwd";
 in
 stdenv.mkDerivation {
   name = "firecracker-${version}";
-- 
GitLab


From 4c714c1f582d113778ca0a25e7a27646ba93312d Mon Sep 17 00:00:00 2001
From: Daniel Schaefer <git@danielschaefer.me>
Date: Fri, 13 Sep 2019 18:45:58 +0200
Subject: [PATCH 0706/2254] pythonPackages.astropy: Disable tests

A ton of tests fail and it's not obvious to me how to fix them.
Adding bleach to checkInputs fixes a tiny number of them, though.
---
 pkgs/development/python-modules/astropy/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix
index f46ca274f2e..35bb7b1aa59 100644
--- a/pkgs/development/python-modules/astropy/default.nix
+++ b/pkgs/development/python-modules/astropy/default.nix
@@ -39,6 +39,9 @@ buildPythonPackage rec {
     pytest
   '';
 
+  # 368 failed, 10889 passed, 978 skipped, 69 xfailed in 196.24s
+  doCheck = false;
+
   meta = {
     description = "Astronomy/Astrophysics library for Python";
     homepage = https://www.astropy.org;
-- 
GitLab


From 56d198b7757499e09140f9ee3c3d3dc3eb16c722 Mon Sep 17 00:00:00 2001
From: Colin L Rice <colin@daedrum.net>
Date: Sat, 21 Sep 2019 19:51:04 -0400
Subject: [PATCH 0707/2254] linux_rpi: copy dtb so raspberry pi 3a+ boots

---
 pkgs/os-specific/linux/kernel/linux-rpi.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix
index 1b4700a2e39..6c24311338a 100644
--- a/pkgs/os-specific/linux/kernel/linux-rpi.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix
@@ -54,6 +54,7 @@ lib.overrideDerivation (buildLinux (args // {
     copyDTB bcm2709-rpi-2-b.dtb bcm2836-rpi-2-b.dtb
   '' + lib.optionalString (lib.elem stdenv.hostPlatform.system ["armv7l-linux" "aarch64-linux"]) ''
     copyDTB bcm2710-rpi-3-b.dtb bcm2837-rpi-3-b.dtb
+    copyDTB bcm2710-rpi-3-b-plus.dtb bcm2837-rpi-3-a-plus.dtb
     copyDTB bcm2710-rpi-3-b-plus.dtb bcm2837-rpi-3-b-plus.dtb
     copyDTB bcm2710-rpi-cm3.dtb bcm2837-rpi-cm3.dtb
   '';
-- 
GitLab


From 4c1fa37cd31723a6458efe357bb3857d988b9ab0 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 21 Sep 2019 20:13:03 -0400
Subject: [PATCH 0708/2254] linux: 4.14.145 -> 4.14.146

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index c5931f2da11..07f5974a2fe 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.14.145";
+  version = "4.14.146";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0aa9b7ni6wadm43260vidqy4ngvws25027psbdnkl9hkcy0ba1gb";
+    sha256 = "1x9343pvlxdgx0zbsn12mcfhf6r8d9p57h6l5cw7krm3gs44pid3";
   };
 } // (args.argsOverride or {}))
-- 
GitLab


From 39907115e598e61cbcd02040f2456ce5f58d0c68 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 21 Sep 2019 20:14:02 -0400
Subject: [PATCH 0709/2254] linux: 4.19.74 -> 4.19.75

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix
index 5e0e5f882e4..a3d2235e9de 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.19.74";
+  version = "4.19.75";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "10pfg5sijw9sx66ybrb06nlmlvj0sxxa1yjhg6qwdhi9sgm2yp29";
+    sha256 = "0y0vcmxyfg98mm63vaqq6n2bmxkbmrnvigm5zdh1al74w53p2pnx";
   };
 } // (args.argsOverride or {}))
-- 
GitLab


From e82d83fa5a05d308f87a732fa12063f845f7a683 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 21 Sep 2019 20:14:40 -0400
Subject: [PATCH 0710/2254] linux: 4.4.193 -> 4.4.194

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index a256d406bbf..9ca235ae24c 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.4.193";
+  version = "4.4.194";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "13iy0xyrqqagnrk7msp1qfw6xsc0dlc74dpdzki9rfsxcildxz3a";
+    sha256 = "0kvlp2v4nvkilaanhpgwf8dkyfj24msaw0m38rbc4y51y69yhqvz";
   };
 } // (args.argsOverride or {}))
-- 
GitLab


From c147f9194df08cd6786b31da31aa086083c4a593 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 21 Sep 2019 20:15:15 -0400
Subject: [PATCH 0711/2254] linux: 4.9.193 -> 4.9.194

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index b43af36bca0..e5b2d0d386b 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.9.193";
+  version = "4.9.194";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "00gx2sg0zc1xz6gs1kdkkd35gn7kjq1bjp1ydc774szsq0f0ircv";
+    sha256 = "1qy20vw5bhnsfbh95sdhjbk6y94js8m4ryd3m7xg2qg4hisvpx6m";
   };
 } // (args.argsOverride or {}))
-- 
GitLab


From eb43234379c50e380db316093745c0c786de119f Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 21 Sep 2019 20:15:55 -0400
Subject: [PATCH 0712/2254] linux: 5.2.16 -> 5.2.17

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

diff --git a/pkgs/os-specific/linux/kernel/linux-5.2.nix b/pkgs/os-specific/linux/kernel/linux-5.2.nix
index 69cfada3422..34b86ddab9a 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.2.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.2.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.2.16";
+  version = "5.2.17";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "0xg5jnkmc7b552jrhi200ck7q4hql3az2fpjfwxj3ay8xp4n280c";
+    sha256 = "1y9d218w83qgd6wima6h6n4zbj1rxz15yb6hdlhv8dm9kv88lfvv";
   };
 } // (args.argsOverride or {}))
-- 
GitLab


From e331f65c9338945a8924c8e5e4fbd1ceb69aa698 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 21 Sep 2019 20:16:17 -0400
Subject: [PATCH 0713/2254] linux: 5.3 -> 5.3.1

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

diff --git a/pkgs/os-specific/linux/kernel/linux-5.3.nix b/pkgs/os-specific/linux/kernel/linux-5.3.nix
index e9cb412d8db..b3a96e356ba 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.3.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.3.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.3";
+  version = "5.3.1";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "1ck70ns130nqf6xy02bwm67y00yh46lhjzdajq7zzx1wa6bw7wvq";
+    sha256 = "0n7qjakglzh6rpbjdjqr4fgp8f8fd3qgb5as0hfj25nk16lvb44q";
   };
 } // (args.argsOverride or {}))
-- 
GitLab


From fd90f361f7df83406312fb25d3a6451763eae4f6 Mon Sep 17 00:00:00 2001
From: Lucio Delelis <ldelelis@est.frba.utn.edu.ar>
Date: Wed, 21 Aug 2019 01:23:49 -0300
Subject: [PATCH 0714/2254] vimPlugins.defx-nvim: init at 2019-08-19

---
 pkgs/misc/vim-plugins/generated.nix    | 11 +++++++++++
 pkgs/misc/vim-plugins/overrides.nix    |  4 ++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 3 files changed, 16 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index c82e7dcf8d4..401fa1eac80 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -775,6 +775,17 @@ let
     };
   };
 
+  defx-nvim = buildVimPluginFrom2Nix {
+    pname = "defx-nvim";
+    version = "2019-08-19";
+    src = fetchFromGitHub {
+      owner = "Shougo";
+      repo = "defx.nvim";
+      rev = "dbd2dceea914ecaa71d24a1d6036f1981becdca5";
+      sha256 = "1gl18s39v7k1p6z7hchq1k16f6f1i2ccq76as562c0nvn68jdqi8";
+    };
+  };
+
   delimitMate = buildVimPluginFrom2Nix {
     pname = "delimitMate";
     version = "2017-06-19";
diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
index d5a1ed67665..2b44d2a3b27 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -166,6 +166,10 @@ self: super: {
     '';
   });
 
+  defx-nvim = super.defx-nvim.overrideAttrs(old: {
+    dependencies = with super; [ nvim-yarp ];
+  });
+
   deoplete-fish = super.deoplete-fish.overrideAttrs(old: {
     dependencies = with super; [ deoplete-nvim vim-fish ];
   });
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 67dd2db4a9f..f3c7c7d4a0e 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -339,6 +339,7 @@ sebastianmarkow/deoplete-rust
 sheerun/vim-polyglot
 Shougo/context_filetype.vim
 Shougo/denite.nvim
+Shougo/defx.nvim
 Shougo/deol.nvim
 Shougo/deoplete-lsp
 Shougo/deoplete.nvim
-- 
GitLab


From 522f0c9cb59074e1c2e9369f49f02def0767b6f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Colisson?= <leo.colisson@ens-paris-saclay.fr>
Date: Tue, 9 Jul 2019 16:51:43 +0200
Subject: [PATCH 0715/2254] pythonPackages.picos: init at 1.2.0

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

diff --git a/pkgs/development/python-modules/picos/default.nix b/pkgs/development/python-modules/picos/default.nix
new file mode 100644
index 00000000000..57fbe099071
--- /dev/null
+++ b/pkgs/development/python-modules/picos/default.nix
@@ -0,0 +1,36 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitLab
+, numpy
+, cvxopt
+, python
+}:
+
+buildPythonPackage rec {
+  pname = "picos";
+  version = "1.2.0";
+
+  src = fetchFromGitLab {
+    owner = "picos-api";
+    repo = "picos";
+    rev = "v${version}";
+    sha256 = "018xhc7cb2crkk27lhl63c7h77w5wa37fg41i7nqr4xclr43cs9z";
+  };
+
+  propagatedBuildInputs = [
+    numpy
+    cvxopt
+  ];
+
+  checkPhase = ''
+    ${python.interpreter} test.py
+  '';
+  
+  meta = with lib; {
+    description = "A Python interface to conic optimization solvers";
+    homepage = https://gitlab.com/picos-api/picos;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ tobiasBora ];
+  };
+}
+
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 96da4d2de5c..3e40a1e6737 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4201,6 +4201,8 @@ in {
 
   pickleshare = callPackage ../development/python-modules/pickleshare { };
 
+  picos = callPackage ../development/python-modules/picos { };
+
   piep = callPackage ../development/python-modules/piep { };
 
   piexif = callPackage ../development/python-modules/piexif { };
-- 
GitLab


From 1c7aaf227ce8cd0613050a12bcdad37bea61e678 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 16 May 2016 20:27:56 +0800
Subject: [PATCH 0716/2254] nixos/networkmanager: tiny cleanups

These are the leftovers of an older PR.

a. Send messages to auditd if auditing is enabled.
b. Add missing dbus configuration if dnsmasq is used for DNS
---
 nixos/modules/services/networking/networkmanager.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index db4d0e328e2..887c89ddf3a 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -27,6 +27,7 @@ let
 
     [logging]
     level=${cfg.logLevel}
+    audit=${lib.boolToString config.security.audit.enable}
 
     [connection]
     ipv6.ip6-privacy=2
@@ -508,8 +509,9 @@ in {
 
     security.polkit.extraConfig = polkitConf;
 
-    services.dbus.packages =
-      optional cfg.enableStrongSwan pkgs.strongswanNM ++ cfg.packages;
+    services.dbus.packages = cfg.packages
+      ++ optional cfg.enableStrongSwan pkgs.strongswanNM
+      ++ optional (cfg.dns == "dnsmasq") pkgs.dnsmasq;
 
     services.udev.packages = cfg.packages;
   };
-- 
GitLab


From 8d49679f554b8147a8241606ac7944a87c5d5640 Mon Sep 17 00:00:00 2001
From: Vladyslav M <dywedir@gra.red>
Date: Sun, 22 Sep 2019 08:47:11 +0300
Subject: [PATCH 0717/2254] janet: 1.2.0 -> 1.3.1

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

diff --git a/pkgs/development/interpreters/janet/default.nix b/pkgs/development/interpreters/janet/default.nix
index 197127d8b6d..d00e37733f2 100644
--- a/pkgs/development/interpreters/janet/default.nix
+++ b/pkgs/development/interpreters/janet/default.nix
@@ -2,17 +2,17 @@
 
 stdenv.mkDerivation rec {
   pname = "janet";
-  version = "1.2.0";
+  version = "1.3.1";
 
   src = fetchFromGitHub {
     owner = "janet-lang";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1m34j4h8gh5d773hbw55gs1gimli7ccqpwddn4dd59hzhpihwgqz";
+    sha256 = "160wd3436cl50wkvqpaf6mbb69qlzzammcg5yb07wx9yw31g399p";
   };
 
   nativeBuildInputs = [ meson ninja ];
-  mesonFlags = ["-Dgit_hash=release"];
+  mesonFlags = [ "-Dgit_hash=release" ];
 
   doCheck = true;
 
-- 
GitLab


From b7efd50e837103e047021c22c42a5f52a402c11f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Sun, 22 Sep 2019 07:48:46 +0200
Subject: [PATCH 0718/2254] drawio: 11.1.4 -> 11.3.0

Changelogs:

https://github.com/jgraph/drawio-desktop/releases/tag/v11.3.0
https://github.com/jgraph/drawio-desktop/releases/tag/v11.3.0

Most salient change: fixes crash after print
---
 pkgs/applications/graphics/drawio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix
index 3f922530e73..88cff0035c7 100644
--- a/pkgs/applications/graphics/drawio/default.nix
+++ b/pkgs/applications/graphics/drawio/default.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation rec {
   pname = "drawio";
-  version = "11.1.4";
+  version = "11.3.0";
 
   src = fetchurl {
     url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/draw.io-x86_64-${version}.rpm";
-    sha256 = "0ca8wkkdr7kbb8il84nq05qgd5ykjq15fdv9432wr5p9xmqixz1q";
+    sha256 = "00xq2pi84nbdnlbsaj4k9i93skz1nknxvhd2f2cgdm0b3sp86qbk";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From b397fbc0aa3b9a315e7a1b58ca7f691a24ad2f74 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Sun, 22 Sep 2019 10:16:59 +0300
Subject: [PATCH 0719/2254] unit: 1.10.0 -> 1.11.0

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

diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix
index 8d015a92a8f..88a26a22917 100644
--- a/pkgs/servers/http/unit/default.nix
+++ b/pkgs/servers/http/unit/default.nix
@@ -14,14 +14,14 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "1.10.0";
+  version = "1.11.0";
   pname = "unit";
 
   src = fetchFromGitHub {
     owner = "nginx";
     repo = "unit";
     rev = version;
-    sha256 = "00y7hc6bzn38f9mcqxnzddnwwsiba4ss9vwd9vgc95sj0yvv885a";
+    sha256 = "05qplbwki8kcj0xy9d39gf8lhwwg2cx24waxd1q5cb0fq9a5hprm";
   };
 
   nativeBuildInputs = [ which ];
-- 
GitLab


From 22a216849bf82ec65e3de86b7ea30e9c6b11efa4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sun, 22 Sep 2019 09:38:09 +0200
Subject: [PATCH 0720/2254] Re-Revert "Merge branch 'staging-next'"

This reverts commit f8a8fc6c7c079de430fa528f688ddac781bcef16.
---
 doc/languages-frameworks/gnome.xml            | 12 ++-
 .../services/networking/networkmanager.nix    |  5 +
 pkgs/applications/gis/grass/default.nix       |  8 +-
 .../graphics/gnome-photos/default.nix         |  2 +-
 .../misc/mysql-workbench/default.nix          |  4 +-
 pkgs/applications/office/kexi/default.nix     |  4 +-
 .../office/libreoffice/default.nix            |  4 +-
 .../applications/office/libreoffice/still.nix |  4 +-
 .../science/electronics/kicad/default.nix     |  2 +-
 .../science/math/glsurf/default.nix           |  4 +-
 pkgs/applications/video/kodi/default.nix      |  4 +-
 .../setup-hooks/wrap-gapps-hook.sh            | 26 +++--
 pkgs/desktops/deepin/dde-daemon/default.nix   |  2 +-
 .../gnome-3/apps/gnome-characters/default.nix |  2 +-
 .../gnome-3/extensions/gsconnect/default.nix  |  4 +-
 pkgs/development/compilers/gerbil/build.nix   |  8 +-
 pkgs/development/compilers/hhvm/default.nix   |  4 +-
 pkgs/development/compilers/neko/default.nix   |  4 +-
 pkgs/development/compilers/urweb/default.nix  |  8 +-
 .../haskell-modules/configuration-nix.nix     |  2 +-
 .../interpreters/perl/sw_vers.patch           |  2 +-
 pkgs/development/interpreters/php/default.nix |  8 +-
 pkgs/development/libraries/cppdb/default.nix  |  6 +-
 pkgs/development/libraries/expat/default.nix  |  6 +-
 pkgs/development/libraries/gdal/2.4.0.nix     |  4 +-
 pkgs/development/libraries/gdal/default.nix   |  4 +-
 .../libraries/giflib/{5.1.nix => default.nix} | 16 ++-
 pkgs/development/libraries/kdb/default.nix    |  4 +-
 .../development/libraries/libagar/default.nix |  6 +-
 .../libraries/libdbi-drivers/default.nix      | 10 +-
 pkgs/development/libraries/libgda/default.nix |  6 +-
 .../libraries/libgdiplus/default.nix          | 24 +----
 pkgs/development/libraries/librdf/redland.nix |  4 +-
 .../development/libraries/opendbx/default.nix |  8 +-
 .../development/libraries/openssl/default.nix |  8 +-
 pkgs/development/libraries/poco/default.nix   |  6 +-
 pkgs/development/libraries/qt-3/default.nix   |  6 +-
 .../libraries/qt-4.x/4.8/default.nix          |  6 +-
 .../libraries/qt-5/modules/qtbase.nix         | 12 +--
 pkgs/development/libraries/tntdb/default.nix  |  4 +-
 .../libraries/unixODBCDrivers/default.nix     | 17 ++--
 pkgs/development/libraries/wt/default.nix     |  6 +-
 .../quicklisp-to-nix-overrides.nix            |  8 +-
 pkgs/development/lisp-modules/shell.nix       |  4 +-
 pkgs/development/lua-modules/overrides.nix    |  6 +-
 .../ocaml-modules/mysql/default.nix           |  4 +-
 .../perl-modules/DBD-mysql/default.nix        |  4 +-
 .../development/pure-modules/glpk/default.nix |  6 +-
 .../python-modules/cryptography/default.nix   | 11 ++-
 .../python-modules/mysqlclient/default.nix    |  6 +-
 .../python-modules/pyopenssl/default.nix      |  3 +-
 pkgs/development/r-modules/default.nix        |  4 +-
 .../ruby-modules/gem-config/default.nix       |  6 +-
 .../tools/misc/patchelf/default.nix           | 19 +++-
 .../tools/misc/patchelf/unstable.nix          | 26 ++---
 .../tools/misc/sysbench/default.nix           |  4 +-
 pkgs/development/tools/tora/default.nix       |  6 +-
 pkgs/games/zod/default.nix                    |  6 +-
 .../linux/firmware/fwupd/default.nix          |  6 +-
 pkgs/os-specific/linux/kexectools/default.nix |  2 +-
 pkgs/servers/clickhouse/default.nix           |  4 +-
 pkgs/servers/computing/slurm/default.nix      |  4 +-
 pkgs/servers/freeradius/default.nix           |  6 +-
 pkgs/servers/http/lighttpd/default.nix        |  6 +-
 pkgs/servers/mail/dovecot/default.nix         |  4 +-
 pkgs/servers/mail/exim/default.nix            | 12 +--
 pkgs/servers/mail/opensmtpd/extras.nix        |  6 +-
 pkgs/servers/mail/postfix/default.nix         |  6 +-
 pkgs/servers/monitoring/plugins/default.nix   |  4 +-
 pkgs/servers/monitoring/zabbix/proxy.nix      |  4 +-
 pkgs/servers/monitoring/zabbix/server.nix     |  4 +-
 pkgs/servers/sql/mariadb/connector-c/3_1.nix  |  6 ++
 .../sql/mariadb/connector-c/default.nix       | 54 ++++++++++
 pkgs/servers/sql/mariadb/default.nix          | 98 -------------------
 pkgs/servers/sql/mariadb/galera/25.nix        |  6 ++
 pkgs/servers/sql/mariadb/galera/default.nix   | 63 ++++++++++++
 pkgs/servers/uwsgi/default.nix                |  4 +-
 pkgs/tools/backup/bareos/default.nix          |  8 +-
 pkgs/tools/backup/mydumper/default.nix        |  4 +-
 pkgs/tools/graphics/zbar/default.nix          |  4 +-
 pkgs/tools/networking/kea/default.nix         |  6 +-
 pkgs/tools/networking/mailutils/default.nix   |  8 +-
 pkgs/tools/networking/maxscale/default.nix    |  6 +-
 .../networking/modem-manager/default.nix      |  7 --
 .../networking/network-manager/default.nix    |  5 -
 pkgs/tools/security/thc-hydra/default.nix     |  4 +-
 pkgs/tools/system/collectd/default.nix        |  4 +-
 pkgs/tools/system/rsyslog/default.nix         |  6 +-
 pkgs/top-level/aliases.nix                    |  1 -
 pkgs/top-level/all-packages.nix               | 24 +++--
 90 files changed, 428 insertions(+), 367 deletions(-)
 rename pkgs/development/libraries/giflib/{5.1.nix => default.nix} (54%)
 create mode 100644 pkgs/servers/sql/mariadb/connector-c/3_1.nix
 create mode 100644 pkgs/servers/sql/mariadb/connector-c/default.nix
 create mode 100644 pkgs/servers/sql/mariadb/galera/25.nix
 create mode 100644 pkgs/servers/sql/mariadb/galera/default.nix

diff --git a/doc/languages-frameworks/gnome.xml b/doc/languages-frameworks/gnome.xml
index 9e0f21a6c74..8b3151d5bf9 100644
--- a/doc/languages-frameworks/gnome.xml
+++ b/doc/languages-frameworks/gnome.xml
@@ -210,7 +210,7 @@ mkDerivation {
   dontWrapGApps = true;
 
   # Arguments to be passed to `makeWrapper`, only used by qt5’s mkDerivation
-  qtWrapperArgs [
+  qtWrapperArgs = [
     "\${gappsWrapperArgs[@]}"
   ];
 }
@@ -258,6 +258,16 @@ mkDerivation {
      </para>
     </listitem>
    </varlistentry>
+   <varlistentry xml:id="ssec-gnome-common-issues-weird-location">
+    <term>
+     I need to wrap a binary outside <filename>bin</filename> and <filename>libexec</filename> directories.
+    </term>
+    <listitem>
+     <para>
+      You can manually trigger the wrapping with <function>wrapGApp</function> in <literal>preFixup</literal> phase. It takes a path to a program as a first argument; the remaining arguments are passed directly to <function xlink:href="#fun-wrapProgram">wrapProgram</function> function.
+     </para>
+    </listitem>
+   </varlistentry>
   </variablelist>
  </section>
 </section>
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index db4d0e328e2..db047e6d0b8 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -468,12 +468,16 @@ in {
         mkdir -m 700 -p /etc/ipsec.d
         mkdir -m 755 -p ${stateDirs}
       '';
+
+      aliases = [ "dbus-org.freedesktop.NetworkManager.service" ];
     };
 
     systemd.services.NetworkManager-wait-online = {
       wantedBy = [ "network-online.target" ];
     };
 
+    systemd.services.ModemManager.aliases = [ "dbus-org.freedesktop.ModemManager1.service" ];
+
     systemd.services.nm-setup-hostsdirs = mkIf dynamicHostsEnabled {
       wantedBy = [ "NetworkManager.service" ];
       before = [ "NetworkManager.service" ];
@@ -495,6 +499,7 @@ in {
 
       # useful binaries for user-specified hooks
       path = [ pkgs.iproute pkgs.utillinux pkgs.coreutils ];
+      aliases = [ "dbus-org.freedesktop.nm-dispatcher.service" ];
     };
 
     # Turn off NixOS' network management when networking is managed entirely by NetworkManager
diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix
index 360d94d1b82..562a5e616a3 100644
--- a/pkgs/applications/gis/grass/default.nix
+++ b/pkgs/applications/gis/grass/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, flex, bison, pkgconfig, zlib, libtiff, libpng, fftw
 , cairo, readline, ffmpeg, makeWrapper, wxGTK30, netcdf, blas
-, proj, gdal, geos, sqlite, postgresql, mysql, python2Packages, libLAS, proj-datumgrid
+, proj, gdal, geos, sqlite, postgresql, libmysqlclient, python2Packages, libLAS, proj-datumgrid
 }:
 
 stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite cairo proj
-  readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql mysql.connector-c blas
+  readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql libmysqlclient blas
   libLAS proj-datumgrid ]
     ++ (with python2Packages; [ python dateutil wxPython30 numpy ]);
 
@@ -37,8 +37,8 @@ stdenv.mkDerivation rec {
     "--with-postgres-libs=${postgresql.lib}/lib/"
     # it complains about missing libmysqld but doesn't really seem to need it
     "--with-mysql"
-    "--with-mysql-includes=${mysql.connector-c}/include/mysql"
-    "--with-mysql-libs=${mysql.connector-c}/lib/mysql"
+    "--with-mysql-includes=${libmysqlclient}/include/mysql"
+    "--with-mysql-libs=${libmysqlclient}/lib/mysql"
     "--with-blas"
     "--with-liblas=${libLAS}/bin/liblas-config"
   ];
diff --git a/pkgs/applications/graphics/gnome-photos/default.nix b/pkgs/applications/graphics/gnome-photos/default.nix
index f591dd5a60d..ea4cf986f39 100644
--- a/pkgs/applications/graphics/gnome-photos/default.nix
+++ b/pkgs/applications/graphics/gnome-photos/default.nix
@@ -102,7 +102,7 @@ stdenv.mkDerivation rec {
   '';
 
   postFixup = ''
-    wrapProgram "${placeholder "installedTests"}/libexec/installed-tests/gnome-photos/basic.py" "''${gappsWrapperArgs[@]}"
+    wrapGApp "${placeholder "installedTests"}/libexec/installed-tests/gnome-photos/basic.py"
   '';
 
   passthru = {
diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix
index 172f999223a..135745feec3 100644
--- a/pkgs/applications/misc/mysql-workbench/default.nix
+++ b/pkgs/applications/misc/mysql-workbench/default.nix
@@ -85,8 +85,8 @@ in stdenv.mkDerivation rec {
     find -L "$out/bin" -type f -executable -print0 \
       | while IFS= read -r -d ''' file; do
       if [[ "''${file}" != *-bin ]]; then
-        echo "Wrapping program ''${file}"
-        wrapProgram "''${file}" "''${gappsWrapperArgs[@]}"
+        echo "Wrapping program $file"
+        wrapGApp "$file"
       fi
     done
   '';
diff --git a/pkgs/applications/office/kexi/default.nix b/pkgs/applications/office/kexi/default.nix
index 83515de4990..8db7068f7cf 100644
--- a/pkgs/applications/office/kexi/default.nix
+++ b/pkgs/applications/office/kexi/default.nix
@@ -4,7 +4,7 @@
   breeze-icons, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets, kcoreaddons,
   kcrash, kguiaddons, ki18n, kiconthemes, kitemviews, kio, ktexteditor, ktextwidgets,
   kwidgetsaddons, kxmlgui,
-  kdb, kproperty, kreport, lcms2, mysql, marble, postgresql
+  kdb, kproperty, kreport, lcms2, libmysqlclient, marble, postgresql
 }:
 
 mkDerivation rec {
@@ -23,7 +23,7 @@ mkDerivation rec {
     breeze-icons karchive kcodecs kcompletion kconfig kconfigwidgets kcoreaddons
     kcrash kguiaddons ki18n kiconthemes kitemviews kio ktexteditor ktextwidgets
     kwidgetsaddons kxmlgui
-    kdb kproperty kreport lcms2 mysql.connector-c marble postgresql
+    kdb kproperty kreport lcms2 libmysqlclient marble postgresql
   ];
 
   propagatedUserEnvPkgs = [ kproperty ];
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index f5f53e10496..a459302177b 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -4,7 +4,7 @@
 , bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which
 , icu, boost, jdk, ant, cups, xorg, libcmis, fontforge
 , openssl, gperf, cppunit, GConf, ORBit2, poppler, utillinux
-, librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw, mysql
+, librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw, libmysqlclient
 , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
 , libwpg, dbus-glib, qt4, clucene_core, libcdr, lcms, vigra
 , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio
@@ -361,7 +361,7 @@ in stdenv.mkDerivation rec {
       libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11
       libXaw libXext libXi libXinerama libxml2 libxslt libXtst
       libXdmcp libpthreadstubs libGLU_combined mythes gst_all_1.gstreamer
-      gst_all_1.gst-plugins-base glib mysql.connector-c
+      gst_all_1.gst-plugins-base glib libmysqlclient
       neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler
       python3 sablotron sane-backends unzip vigra which zip zlib
       mdds bluez5 libcmis libwps libabw libzmf
diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix
index eb774a30941..4739d526558 100644
--- a/pkgs/applications/office/libreoffice/still.nix
+++ b/pkgs/applications/office/libreoffice/still.nix
@@ -4,7 +4,7 @@
 , bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which
 , icu, boost, jdk, ant, cups, xorg, libcmis, fontforge
 , openssl, gperf, cppunit, GConf, ORBit2, poppler, utillinux
-, librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw, mysql
+, librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw, libmysqlclient
 , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
 , libwpg, dbus-glib, qt4, clucene_core, libcdr, lcms, vigra
 , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio
@@ -358,7 +358,7 @@ in stdenv.mkDerivation rec {
       libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11
       libXaw libXext libXi libXinerama libxml2 libxslt libXtst
       libXdmcp libpthreadstubs libGLU_combined mythes gst_all_1.gstreamer
-      gst_all_1.gst-plugins-base glib mysql.connector-c
+      gst_all_1.gst-plugins-base glib libmysqlclient
       neon nspr nss openldap openssl ORBit2 pam perl poppler
       python3 sablotron sane-backends unzip vigra which zip zlib
       mdds bluez5 libcmis libwps libabw libzmf
diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix
index f31dd0daa5c..bd57e355c75 100644
--- a/pkgs/applications/science/electronics/kicad/default.nix
+++ b/pkgs/applications/science/electronics/kicad/default.nix
@@ -107,7 +107,7 @@ in stdenv.mkDerivation rec {
     buildPythonPath "$out $pythonPath"
     gappsWrapperArgs+=(--set PYTHONPATH "$program_PYTHONPATH")
 
-    wrapProgram "$out/bin/kicad" "''${gappsWrapperArgs[@]}"
+    wrapGApp "$out/bin/kicad"
   '';
 
   meta = {
diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix
index 4de683cdce9..1cd5e364208 100644
--- a/pkgs/applications/science/math/glsurf/default.nix
+++ b/pkgs/applications/science/math/glsurf/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, ocamlPackages, libGLU_combined, freeglut
-, mysql, mpfr, gmp, libtiff, libjpeg, libpng, giflib
+, libmysqlclient, mpfr, gmp, libtiff, libjpeg, libpng, giflib
 }:
 
 stdenv.mkDerivation {
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
     sha256 = "0w8xxfnw2snflz8wdr2ca9f5g91w5vbyp1hwlx1v7vg83d4bwqs7";
   };
 
-  buildInputs = [ freeglut libGLU_combined mysql.connector-c mpfr gmp
+  buildInputs = [ freeglut libGLU_combined libmysqlclient mpfr gmp
     libtiff libjpeg libpng giflib ]
   ++ (with ocamlPackages; [
     ocaml findlib ocaml_mysql lablgl camlimages_4_0 mlgmpidl
diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index 773c63b0036..7953cde2413 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -13,7 +13,7 @@
 , libmpeg2, libsamplerate, libmad
 , libogg, libvorbis, flac, libxslt
 , lzo, libcdio, libmodplug, libass, libbluray
-, sqlite, mysql, nasm, gnutls, libva, libdrm
+, sqlite, libmysqlclient, nasm, gnutls, libva, libdrm
 , curl, bzip2, zip, unzip, glxinfo, xdpyinfo
 , libcec, libcec_platform, dcadec, libuuid
 , libcrossguid, libmicrohttpd
@@ -161,7 +161,7 @@ in stdenv.mkDerivation {
       libmpeg2 libsamplerate libmad
       libogg libvorbis flac libxslt systemd
       lzo libcdio libmodplug libass libbluray
-      sqlite mysql.connector-c avahi lame
+      sqlite libmysqlclient avahi lame
       curl bzip2 zip unzip glxinfo xdpyinfo
       libcec libcec_platform dcadec libuuid
       libgcrypt libgpgerror libunistring
diff --git a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
index 906b1db9d10..717740f1f20 100644
--- a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
+++ b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
@@ -1,12 +1,19 @@
+# shellcheck shell=bash
 gappsWrapperArgs=()
 
 find_gio_modules() {
-    if [ -d "$1"/lib/gio/modules ] && [ -n "$(ls -A $1/lib/gio/modules)" ] ; then
+    if [ -d "$1/lib/gio/modules" ] && [ -n "$(ls -A "$1/lib/gio/modules")" ] ; then
         gappsWrapperArgs+=(--prefix GIO_EXTRA_MODULES : "$1/lib/gio/modules")
     fi
 }
 
-addEnvHooks "$targetOffset" find_gio_modules
+addEnvHooks "${targetOffset:?}" find_gio_modules
+
+wrapGApp() {
+    local program="$1"
+    shift 1
+    wrapProgram "$program" "${gappsWrapperArgs[@]}" "$@"
+}
 
 # Note: $gappsWrapperArgs still gets defined even if $dontWrapGApps is set.
 wrapGAppsHook() {
@@ -26,20 +33,19 @@ wrapGAppsHook() {
     gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH")
   fi
 
-  if [ -d "$prefix/share" ]; then
+  if [ -d "${prefix:?}/share" ]; then
     gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$prefix/share")
   fi
 
-  if [ -d "$prefix/lib/gio/modules" ] && [ -n "$(ls -A $prefix/lib/gio/modules)" ] ; then
+  if [ -d "$prefix/lib/gio/modules" ] && [ -n "$(ls -A "$prefix/lib/gio/modules")" ] ; then
     gappsWrapperArgs+=(--prefix GIO_EXTRA_MODULES : "$prefix/lib/gio/modules")
   fi
 
-  for v in $wrapPrefixVariables GST_PLUGIN_SYSTEM_PATH_1_0 GI_TYPELIB_PATH GRL_PLUGIN_PATH; do
-    eval local dummy="\$$v"
-    gappsWrapperArgs+=(--prefix $v : "$dummy")
+  for v in ${wrapPrefixVariables:-} GST_PLUGIN_SYSTEM_PATH_1_0 GI_TYPELIB_PATH GRL_PLUGIN_PATH; do
+    gappsWrapperArgs+=(--prefix "$v" : "${!v}")
   done
 
-  if [[ -z "$dontWrapGApps" ]]; then
+  if [[ -z "${dontWrapGApps:-}" ]]; then
     targetDirsThatExist=()
     targetDirsRealPath=()
 
@@ -52,7 +58,7 @@ wrapGAppsHook() {
         find "${targetDir}" -type f -executable -print0 \
           | while IFS= read -r -d '' file; do
           echo "Wrapping program '${file}'"
-          wrapProgram "${file}" "${gappsWrapperArgs[@]}"
+          wrapGApp "${file}"
         done
       fi
     done
@@ -71,7 +77,7 @@ wrapGAppsHook() {
           fi
         done
         echo "Wrapping link: '$linkPath'"
-        wrapProgram "${linkPath}" "${gappsWrapperArgs[@]}"
+        wrapGApp "${linkPath}"
       done
     fi
   fi
diff --git a/pkgs/desktops/deepin/dde-daemon/default.nix b/pkgs/desktops/deepin/dde-daemon/default.nix
index 19089a6b050..da217186e27 100644
--- a/pkgs/desktops/deepin/dde-daemon/default.nix
+++ b/pkgs/desktops/deepin/dde-daemon/default.nix
@@ -115,7 +115,7 @@ buildGoPackage rec {
   postFixup = ''
     # wrapGAppsHook does not work with binaries outside of $out/bin or $out/libexec
     for binary in $out/lib/deepin-daemon/*; do
-      wrapProgram $binary "''${gappsWrapperArgs[@]}"
+      wrapGApp "$binary"
     done
 
     searchHardCodedPaths $out  # debugging
diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
index ac1e9ee85c0..9e44573d2e3 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
       sed -e $"2iimports.package._findEffectiveEntryPointName = () => \'$(basename $file)\' " \
         -i $file
 
-      wrapProgram $file "''${gappsWrapperArgs[@]}"
+      wrapGApp "$file"
     done
   '';
 
diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
index cff0db665bb..cef00513df1 100644
--- a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
@@ -76,8 +76,8 @@ stdenv.mkDerivation rec {
   postFixup = ''
     # Let’s wrap the daemons
     for file in $out/share/gnome-shell/extensions/gsconnect@andyholmes.github.io/service/{{daemon,nativeMessagingHost}.js,components/folks.py}; do
-      echo "Wrapping program ''${file}"
-      wrapProgram "''${file}" "''${gappsWrapperArgs[@]}"
+      echo "Wrapping program $file"
+      wrapGApp "$file"
     done
   '';
 
diff --git a/pkgs/development/compilers/gerbil/build.nix b/pkgs/development/compilers/gerbil/build.nix
index 9ef650c330f..b5ccbca6f7e 100644
--- a/pkgs/development/compilers/gerbil/build.nix
+++ b/pkgs/development/compilers/gerbil/build.nix
@@ -1,6 +1,6 @@
 { stdenv, makeStaticLibraries,
   coreutils, rsync, bash,
-  openssl, zlib, sqlite, libxml2, libyaml, mysql, lmdb, leveldb, postgresql,
+  openssl, zlib, sqlite, libxml2, libyaml, libmysqlclient, lmdb, leveldb, postgresql,
   version, git-version, gambit, src }:
 
 # TODO: distinct packages for gerbil-release and gerbil-devel
@@ -12,13 +12,13 @@ stdenv.mkDerivation rec {
   inherit src;
 
   # Use makeStaticLibraries to enable creation of statically linked binaries
-  buildInputs_libraries = [ openssl zlib sqlite libxml2 libyaml mysql.connector-c lmdb leveldb postgresql ];
+  buildInputs_libraries = [ openssl zlib sqlite libxml2 libyaml libmysqlclient lmdb leveldb postgresql ];
   buildInputs_staticLibraries = map makeStaticLibraries buildInputs_libraries;
 
   buildInputs = [ gambit rsync bash ]
     ++ buildInputs_libraries ++ buildInputs_staticLibraries;
 
-  NIX_CFLAGS_COMPILE = [ "-I${mysql.connector-c}/include/mysql" "-L${mysql.connector-c}/lib/mysql" ];
+  NIX_CFLAGS_COMPILE = [ "-I${libmysqlclient}/include/mysql" "-L${libmysqlclient}/lib/mysql" ];
 
   postPatch = ''
     echo '(define (gerbil-version-string) "v${git-version}")' > src/gerbil/runtime/gx-version.scm
@@ -40,7 +40,7 @@ ZLIB=${makeStaticLibraries zlib}/lib/libz.a
 # SQLITE=${makeStaticLibraries sqlite}/lib/sqlite.a # MISSING!
 # LIBXML2=${makeStaticLibraries libxml2}/lib/libxml2.a # MISSING!
 # YAML=${makeStaticLibraries libyaml}/lib/libyaml.a # MISSING!
-MYSQL=${makeStaticLibraries mysql.connector-c}/lib/mariadb/libmariadb.a
+MYSQL=${makeStaticLibraries libmysqlclient}/lib/mariadb/libmariadb.a
 # LMDB=${makeStaticLibraries lmdb}/lib/mysql/libmysqlclient_r.a # MISSING!
 LEVELDB=${makeStaticLibraries lmdb}/lib/libleveldb.a
 EOF
diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix
index 24e88f9ee2e..7066744bb54 100644
--- a/pkgs/development/compilers/hhvm/default.nix
+++ b/pkgs/development/compilers/hhvm/default.nix
@@ -2,7 +2,7 @@
 , pcre, libevent, gd, curl, libxml2, icu, flex, bison, openssl, zlib, php
 , expat, libcap, oniguruma, libdwarf, libmcrypt, tbb, gperftools, glog, libkrb5
 , bzip2, openldap, readline, libelf, uwimap, binutils, cyrus_sasl, pam, libpng
-, libxslt, freetype, gdb, git, perl, mysql, gmp, libyaml, libedit
+, libxslt, freetype, gdb, git, perl, libmysqlclient, gmp, libyaml, libedit
 , libvpx, imagemagick, fribidi, gperf, which, ocamlPackages
 }:
 
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs =
-    [ cmake pkgconfig boost libunwind mysql.connector-c libmemcached pcre gdb git perl
+    [ cmake pkgconfig boost libunwind libmysqlclient libmemcached pcre gdb git perl
       libevent gd curl libxml2 icu flex bison openssl zlib php expat libcap
       oniguruma libdwarf libmcrypt tbb gperftools bzip2 openldap readline
       libelf uwimap binutils cyrus_sasl pam glog libpng libxslt libkrb5
diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/development/compilers/neko/default.nix
index 74ccaac388f..79c4aacbed5 100644
--- a/pkgs/development/compilers/neko/default.nix
+++ b/pkgs/development/compilers/neko/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, boehmgc, zlib, sqlite, pcre, cmake, pkgconfig
-, git, apacheHttpd, apr, aprutil, mysql, mbedtls, openssl, pkgs, gtk2, libpthreadstubs
+, git, apacheHttpd, apr, aprutil, libmysqlclient, mbedtls, openssl, pkgs, gtk2, libpthreadstubs
 }:
 
 stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake pkgconfig git ];
   buildInputs =
     [ boehmgc zlib sqlite pcre apacheHttpd apr aprutil
-      mysql.connector-c mbedtls openssl libpthreadstubs ]
+      libmysqlclient mbedtls openssl libpthreadstubs ]
       ++ stdenv.lib.optional stdenv.isLinux gtk2
       ++ stdenv.lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.Security
                                                 pkgs.darwin.apple_sdk.frameworks.Carbon];
diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix
index 01d4972a55d..31381aac741 100644
--- a/pkgs/development/compilers/urweb/default.nix
+++ b/pkgs/development/compilers/urweb/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, file, openssl, mlton
-, mysql, postgresql, sqlite, gcc, icu
+, libmysqlclient, postgresql, sqlite, gcc, icu
 }:
 
 stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "1cl0x0sy7w1lazszc8q06q3wx0x0rczxh27vimrsw54s6s9y096s";
   };
 
-  buildInputs = [ openssl mlton mysql.connector-c postgresql sqlite icu ];
+  buildInputs = [ openssl mlton libmysqlclient postgresql sqlite icu ];
 
   prePatch = ''
     sed -e 's@/usr/bin/file@${file}/bin/file@g' -i configure
@@ -21,13 +21,13 @@ stdenv.mkDerivation rec {
 
   preConfigure = ''
     export PGHEADER="${postgresql}/include/libpq-fe.h";
-    export MSHEADER="${mysql.connector-c}/include/mysql/mysql.h";
+    export MSHEADER="${libmysqlclient}/include/mysql/mysql.h";
     export SQHEADER="${sqlite.dev}/include/sqlite3.h";
 
     export CC="${gcc}/bin/gcc";
     export CCARGS="-I$out/include \
                    -L${openssl.out}/lib \
-                   -L${mysql.connector-c}/lib \
+                   -L${libmysqlclient}/lib \
                    -L${postgresql.lib}/lib \
                    -L${sqlite.out}/lib";
   '';
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 5db25686fc6..91fdb1ece27 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -53,7 +53,7 @@ self: super: builtins.intersectAttrs super {
 
   # Use the default version of mysql to build this package (which is actually mariadb).
   # test phase requires networking
-  mysql = dontCheck (super.mysql.override { mysql = pkgs.mysql.connector-c; });
+  mysql = dontCheck (super.mysql.override { mysql = pkgs.libmysqlclient; });
 
   # CUDA needs help finding the SDK headers and libraries.
   cuda = overrideCabal super.cuda (drv: {
diff --git a/pkgs/development/interpreters/perl/sw_vers.patch b/pkgs/development/interpreters/perl/sw_vers.patch
index 9d4cd75486e..2e30dba9292 100644
--- a/pkgs/development/interpreters/perl/sw_vers.patch
+++ b/pkgs/development/interpreters/perl/sw_vers.patch
@@ -7,7 +7,7 @@ index afadf53..80b7533 100644
      # "ProductVersion:    10.10.5"   "10.10"
      # "ProductVersion:    10.11"     "10.11"
 -        prodvers=`sw_vers|awk '/^ProductVersion:/{print $2}'|awk -F. '{print $1"."$2}'`
-+        prodvers="10.10"
++        prodvers="${MACOSX_DEPLOYMENT_TARGET:-10.12}"
      case "$prodvers" in
      10.*)
        add_macosx_version_min ccflags $prodvers
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 9a82868b7b3..508339d0da6 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -1,6 +1,6 @@
 # pcre functionality is tested in nixos/tests/php-pcre.nix
 { lib, stdenv, fetchurl, autoconf, bison, libtool, pkgconfig, re2c
-, mysql, libxml2, readline, zlib, curl, postgresql, gettext
+, libmysqlclient, libxml2, readline, zlib, curl, postgresql, gettext
 , openssl, pcre, pcre2, sqlite, config, libjpeg, libpng, freetype
 , libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, unixODBC
 , uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium, html-tidy, libargon2
@@ -64,7 +64,7 @@ let
   }:
 
     let
-      mysqlBuildInputs = optional (!mysqlndSupport) mysql.connector-c;
+      mysqlBuildInputs = optional (!mysqlndSupport) libmysqlclient;
       libmcrypt' = libmcrypt.override { disablePosixThreads = true; };
     in stdenv.mkDerivation {
 
@@ -149,9 +149,9 @@ let
       ++ optional postgresqlSupport "--with-pgsql=${postgresql}"
       ++ optional pdo_odbcSupport "--with-pdo-odbc=unixODBC,${unixODBC}"
       ++ optional pdo_pgsqlSupport "--with-pdo-pgsql=${postgresql}"
-      ++ optional pdo_mysqlSupport "--with-pdo-mysql=${if mysqlndSupport then "mysqlnd" else mysql.connector-c}"
+      ++ optional pdo_mysqlSupport "--with-pdo-mysql=${if mysqlndSupport then "mysqlnd" else libmysqlclient}"
       ++ optionals mysqliSupport [
-        "--with-mysqli=${if mysqlndSupport then "mysqlnd" else "${mysql.connector-c}/bin/mysql_config"}"
+        "--with-mysqli=${if mysqlndSupport then "mysqlnd" else "${libmysqlclient}/bin/mysql_config"}"
       ]
       ++ optional ( pdo_mysqlSupport || mysqliSupport ) "--with-mysql-sock=/run/mysqld/mysqld.sock"
       ++ optional bcmathSupport "--enable-bcmath"
diff --git a/pkgs/development/libraries/cppdb/default.nix b/pkgs/development/libraries/cppdb/default.nix
index 737122c57bf..a21b3cc93fa 100644
--- a/pkgs/development/libraries/cppdb/default.nix
+++ b/pkgs/development/libraries/cppdb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, sqlite, mysql, postgresql, unixODBC }:
+{ stdenv, fetchurl, cmake, sqlite, libmysqlclient, postgresql, unixODBC }:
 
 stdenv.mkDerivation rec {
   pname = "cppdb";
@@ -11,10 +11,10 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  buildInputs = [ cmake sqlite mysql.connector-c postgresql unixODBC ];
+  buildInputs = [ cmake sqlite libmysqlclient postgresql unixODBC ];
 
   cmakeFlags = [ "--no-warn-unused-cli" ];
-  NIX_CFLAGS_COMPILE = [ "-I${mysql.connector-c}/include/mysql" "-L${mysql.connector-c}/lib/mysql" ];
+  NIX_CFLAGS_COMPILE = [ "-I${libmysqlclient}/include/mysql" "-L${libmysqlclient}/lib/mysql" ];
 
   meta = with stdenv.lib; {
     homepage = http://cppcms.com/sql/cppdb/;
diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix
index ef257401945..bb86ac57832 100644
--- a/pkgs/development/libraries/expat/default.nix
+++ b/pkgs/development/libraries/expat/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "expat-2.2.7";
+  name = "expat-2.2.8";
 
   src = fetchurl {
-    url = "mirror://sourceforge/expat/${name}.tar.bz2";
-    sha256 = "067cfhqwiswm4zynw7xaxl59mrrimaiyjhnn8byxma1i98pi1jfb";
+    url = "https://github.com/libexpat/libexpat/releases/download/R_2_2_8/${name}.tar.xz";
+    sha256 = "16vpj5mk3lps3x7fr8cs03rffx3ir4jilyqw0frayn6q94daijk1";
   };
 
   outputs = [ "out" "dev" ]; # TODO: fix referrers
diff --git a/pkgs/development/libraries/gdal/2.4.0.nix b/pkgs/development/libraries/gdal/2.4.0.nix
index baf847d4e0a..d41b4c55f86 100644
--- a/pkgs/development/libraries/gdal/2.4.0.nix
+++ b/pkgs/development/libraries/gdal/2.4.0.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchpatch, unzip, libjpeg, libtiff, zlib
-, postgresql, mysql, libgeotiff, pythonPackages, proj, geos, openssl
+, postgresql, libmysqlclient, libgeotiff, pythonPackages, proj, geos, openssl
 , libpng, sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat
 , libiconv, libxml2
 , netcdfSupport ? true, netcdf, hdf5, curl
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     "--with-poppler=${poppler.dev}" # optional
     "--with-libz=${zlib.dev}"       # optional
     "--with-pg=${postgresql}/bin/pg_config"
-    "--with-mysql=${mysql.connector-c or mysql}/bin/mysql_config"
+    "--with-mysql=${libmysqlclient}/bin/mysql_config"
     "--with-geotiff=${libgeotiff.dev}"
     "--with-sqlite3=${sqlite.dev}"
     "--with-spatialite=${libspatialite}"
diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix
index 413d4e19dde..bb53277075f 100644
--- a/pkgs/development/libraries/gdal/default.nix
+++ b/pkgs/development/libraries/gdal/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, fetchpatch, unzip, libjpeg, libtiff, zlib
-, postgresql, mysql, libgeotiff, pythonPackages, proj, geos, openssl
+, postgresql, libmysqlclient, libgeotiff, pythonPackages, proj, geos, openssl
 , libpng, sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat
 , libiconv, libxml2, autoreconfHook
 , netcdfSupport ? true, netcdf, hdf5, curl
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     "--with-poppler=${poppler.dev}" # optional
     "--with-libz=${zlib.dev}"       # optional
     "--with-pg=${postgresql}/bin/pg_config"
-    "--with-mysql=${mysql.connector-c or mysql}/bin/mysql_config"
+    "--with-mysql=${libmysqlclient}/bin/mysql_config"
     "--with-geotiff=${libgeotiff}"
     "--with-sqlite3=${sqlite.dev}"
     "--with-spatialite=${libspatialite}"
diff --git a/pkgs/development/libraries/giflib/5.1.nix b/pkgs/development/libraries/giflib/default.nix
similarity index 54%
rename from pkgs/development/libraries/giflib/5.1.nix
rename to pkgs/development/libraries/giflib/default.nix
index fee760b3ea2..d97477e3f3a 100644
--- a/pkgs/development/libraries/giflib/5.1.nix
+++ b/pkgs/development/libraries/giflib/default.nix
@@ -1,18 +1,24 @@
 {stdenv, fetchurl, xmlto, docbook_xml_dtd_412, docbook_xsl, libxml2 }:
 
-stdenv.mkDerivation {
-  name = "giflib-5.1.4";
+stdenv.mkDerivation rec {
+  name = "giflib-5.2.1";
   src = fetchurl {
-    url = mirror://sourceforge/giflib/giflib-5.1.4.tar.bz2;
-    sha256 = "1md83dip8rf29y40cm5r7nn19705f54iraz6545zhwa6y8zyq9yz";
+    url = "mirror://sourceforge/giflib/${name}.tar.gz";
+    sha256 = "1gbrg03z1b6rlrvjyc6d41bc8j1bsr7rm8206gb1apscyii5bnii";
   };
 
+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace 'PREFIX = /usr/local' 'PREFIX = ${builtins.placeholder "out"}'
+  '';
+
   buildInputs = [ xmlto docbook_xml_dtd_412 docbook_xsl libxml2 ];
+
   meta = {
     description = "A library for reading and writing gif images";
     platforms = stdenv.lib.platforms.unix;
     license = stdenv.lib.licenses.mit;
     maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
-    branch = "5.1";
+    branch = "5.2";
   };
 }
diff --git a/pkgs/development/libraries/kdb/default.nix b/pkgs/development/libraries/kdb/default.nix
index 4a403a19964..03eabc6447b 100644
--- a/pkgs/development/libraries/kdb/default.nix
+++ b/pkgs/development/libraries/kdb/default.nix
@@ -1,7 +1,7 @@
 {
   mkDerivation, lib, fetchurl,
   extra-cmake-modules,
-  qtbase, qttranslations, kcoreaddons, python2, sqlite, postgresql, mysql
+  qtbase, qttranslations, kcoreaddons, python2, sqlite, postgresql, libmysqlclient
 }:
 
 mkDerivation rec {
@@ -15,7 +15,7 @@ mkDerivation rec {
 
   nativeBuildInputs = [ extra-cmake-modules ];
 
-  buildInputs = [ qttranslations kcoreaddons python2 sqlite postgresql mysql.connector-c ];
+  buildInputs = [ qttranslations kcoreaddons python2 sqlite postgresql libmysqlclient ];
 
   propagatedBuildInputs = [ qtbase ];
 
diff --git a/pkgs/development/libraries/libagar/default.nix b/pkgs/development/libraries/libagar/default.nix
index 48fb0f1153e..630b1712158 100644
--- a/pkgs/development/libraries/libagar/default.nix
+++ b/pkgs/development/libraries/libagar/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, libtool, perl, bsdbuild, gettext, mandoc
 , libpng, libjpeg, xlibsWrapper, libXinerama, freetype, SDL, libGLU_combined
-, libsndfile, portaudio, mysql, fontconfig
+, libsndfile, portaudio, libmysqlclient, fontconfig
 }:
 
 let srcs = import ./srcs.nix { inherit fetchurl; }; in
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
     "--with-gettext=${gettext}"
     "--with-jpeg=${libjpeg.dev}"
     "--with-gl=${libGLU_combined}"
-    "--with-mysql=${mysql.connector-c}"
+    "--with-mysql=${libmysqlclient}"
     "--with-manpages=yes"
   ];
 
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ pkgconfig libtool gettext ];
 
   buildInputs = [
-    bsdbuild perl xlibsWrapper libXinerama SDL libGLU_combined mysql.connector-c mandoc
+    bsdbuild perl xlibsWrapper libXinerama SDL libGLU_combined libmysqlclient mandoc
     freetype.dev libpng libjpeg.dev fontconfig portaudio libsndfile
   ];
 
diff --git a/pkgs/development/libraries/libdbi-drivers/default.nix b/pkgs/development/libraries/libdbi-drivers/default.nix
index 99cd636b03b..52b8a32fab4 100644
--- a/pkgs/development/libraries/libdbi-drivers/default.nix
+++ b/pkgs/development/libraries/libdbi-drivers/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, libdbi
-, mysql ? null
+, libmysqlclient ? null
 , sqlite ? null
 , postgresql ? null
 }:
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "0m680h8cc4428xin4p733azysamzgzcmv4psjvraykrsaz6ymlj3";
   };
 
-  buildInputs = [ libdbi sqlite postgresql ] ++ optional (mysql != null) mysql.connector-c;
+  buildInputs = [ libdbi sqlite postgresql ] ++ optional (libmysqlclient != null) libmysqlclient;
 
   postPatch = ''
     sed -i '/SQLITE3_LIBS/ s/-lsqlite/-lsqlite3/' configure;
@@ -26,10 +26,10 @@ stdenv.mkDerivation rec {
     "--enable-libdbi"
     "--with-dbi-incdir=${libdbi}/include"
     "--with-dbi-libdir=${libdbi}/lib"
-  ] ++ optionals (mysql != null) [
+  ] ++ optionals (libmysqlclient != null) [
     "--with-mysql"
-    "--with-mysql-incdir=${mysql.connector-c}/include/mysql"
-    "--with-mysql-libdir=${mysql.connector-c}/lib/mysql"
+    "--with-mysql-incdir=${libmysqlclient}/include/mysql"
+    "--with-mysql-libdir=${libmysqlclient}/lib/mysql"
   ] ++ optionals (sqlite != null) [
     "--with-sqlite3"
     "--with-sqlite3-incdir=${sqlite.dev}/include/sqlite"
diff --git a/pkgs/development/libraries/libgda/default.nix b/pkgs/development/libraries/libgda/default.nix
index bb6402dc428..27032607996 100644
--- a/pkgs/development/libraries/libgda/default.nix
+++ b/pkgs/development/libraries/libgda/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl, gnome3, gobject-introspection, vala, libgee
 , overrideCC, gcc6
-, mysqlSupport ? false, mysql ? null
+, mysqlSupport ? false, libmysqlclient ? null
 , postgresSupport ? false, postgresql ? null
 }:
 
-assert mysqlSupport -> mysql != null;
+assert mysqlSupport -> libmysqlclient != null;
 assert postgresSupport -> postgresql != null;
 
 (if stdenv.isAarch64 then overrideCC stdenv gcc6 else stdenv).mkDerivation rec {
@@ -25,7 +25,7 @@ assert postgresSupport -> postgresql != null;
 
   nativeBuildInputs = [ pkgconfig intltool itstool libxml2 gobject-introspection vala ];
   buildInputs = with stdenv.lib; [ gtk3 openssl libgee ]
-    ++ optional (mysqlSupport) mysql.connector-c
+    ++ optional (mysqlSupport) libmysqlclient
     ++ optional (postgresSupport) postgresql;
 
   passthru = {
diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix
index 9ba3cdbd09a..ca65c3fdf8c 100644
--- a/pkgs/development/libraries/libgdiplus/default.nix
+++ b/pkgs/development/libraries/libgdiplus/default.nix
@@ -2,33 +2,19 @@
 , libtiff, giflib, libjpeg, libpng
 , libXrender, libexif, autoreconfHook, fetchpatch }:
 
-stdenv.mkDerivation {
-  name = "libgdiplus-5.6.1";
+stdenv.mkDerivation rec {
+  pname = "libgdiplus";
+  version = "6.0.2";
 
   src = fetchFromGitHub {
     owner = "mono";
     repo = "libgdiplus";
-    rev = "5.6.1";
-    sha256 = "023xf3l2s0mxcdbl2viglzrkhx3lwcrpm66fiq7cfdqz80d4vsj2";
+    rev = version;
+    sha256 = "07a3n7i35mn5j2djah64by785b1hzy8ckk1pz0xwvk716yzb7sxg";
   };
 
   NIX_LDFLAGS = "-lgif";
 
-  patches = [ # Series of patches cherry-picked from master, all fixes various sigsegv (or required by other patch)
-    (fetchpatch {
-          url = "https://github.com/mono/libgdiplus/commit/d33a2580a94701ff33abe28c22881d6173be57d0.patch";
-          sha256 = "0rr54jylscn4icqjprqhwrncyr92r0d7kmfrrq3myskplpqv1c11";
-    })
-    (fetchpatch {
-          url ="https://github.com/mono/libgdiplus/commit/aa6aa53906935572f52f519fe4ab9ebedc051d08.patch";
-          sha256 = "1wg0avm8qv5cb4vk80baflfzszm6q7ydhn89c3h6kq68hg6zsf1f";
-    })
-    (fetchpatch {
-          url = "https://github.com/mono/libgdiplus/commit/81e45a1d5a3ac3cf035bcc3fabb2859818b6cc04.patch";
-          sha256 = "07wmc88cd1lqifs5x6npryni65jyy9gi8lgr2i1lb7v0fhvlyswg";
-    })
-  ];
-
   hardeningDisable = [ "format" ];
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/development/libraries/librdf/redland.nix b/pkgs/development/libraries/librdf/redland.nix
index 30d8d8a94e9..8835490187d 100644
--- a/pkgs/development/libraries/librdf/redland.nix
+++ b/pkgs/development/libraries/librdf/redland.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, openssl, libxslt, perl
 , curl, pcre, libxml2, librdf_rasqal, gmp
-, mysql, withMysql ? false
+, libmysqlclient, withMysql ? false
 , postgresql, withPostgresql ? false
 , sqlite, withSqlite ? true
 , db, withBdb ? false
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ perl pkgconfig ];
 
   buildInputs = [ openssl libxslt curl pcre libxml2 gmp ]
-    ++ stdenv.lib.optional withMysql mysql.connector-c
+    ++ stdenv.lib.optional withMysql libmysqlclient
     ++ stdenv.lib.optional withSqlite sqlite
     ++ stdenv.lib.optional withPostgresql postgresql
     ++ stdenv.lib.optional withBdb db;
diff --git a/pkgs/development/libraries/opendbx/default.nix b/pkgs/development/libraries/opendbx/default.nix
index f954aaf7245..16ec6a5c110 100644
--- a/pkgs/development/libraries/opendbx/default.nix
+++ b/pkgs/development/libraries/opendbx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, readline, mysql, postgresql, sqlite }:
+{ stdenv, fetchurl, readline, libmysqlclient, postgresql, sqlite }:
 
 stdenv.mkDerivation rec {
   name = "opendbx-1.4.6";
@@ -9,12 +9,12 @@ stdenv.mkDerivation rec {
   };
 
   preConfigure = ''
-    export CPPFLAGS="-I${mysql.connector-c}/include/mysql"
-    export LDFLAGS="-L${mysql.connector-c}/lib/mysql -L${postgresql}/lib"
+    export CPPFLAGS="-I${libmysqlclient}/include/mysql"
+    export LDFLAGS="-L${libmysqlclient}/lib/mysql -L${postgresql}/lib"
     configureFlagsArray=(--with-backends="mysql pgsql sqlite3")
   '';
 
-  buildInputs = [ readline mysql.connector-c postgresql sqlite ];
+  buildInputs = [ readline libmysqlclient postgresql sqlite ];
 
   meta = with stdenv.lib; {
     description = "Extremely lightweight but extensible database access library written in C";
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 03082eab091..0b026ae75f4 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -127,8 +127,8 @@ let
 in {
 
   openssl_1_0_2 = common {
-    version = "1.0.2s";
-    sha256 = "15mbmg8hf7s12vr3v2bdc0pi9y4pdbnsxhzk4fyyap42jaa5rgfa";
+    version = "1.0.2t";
+    sha256 = "1g67ra0ph7gpz6fgvv1i96d792jmd6ymci5kk53vbikszr74djql";
     patches = [
       ./1.0.2/nix-ssl-cert-file.patch
 
@@ -139,8 +139,8 @@ in {
   };
 
   openssl_1_1 = common {
-    version = "1.1.1c";
-    sha256 = "142c7zdlz06hjrrvinb9f276czc78bnkyhd9xma621qmmmwk1yzn";
+    version = "1.1.1d";
+    sha256 = "1whinyw402z3b9xlb3qaxv4b9sk4w1bgh9k0y8df1z4x3yy92fhy";
     patches = [
       ./1.1/nix-ssl-cert-file.patch
 
diff --git a/pkgs/development/libraries/poco/default.nix b/pkgs/development/libraries/poco/default.nix
index c19e343f19a..e69ed0236f4 100644
--- a/pkgs/development/libraries/poco/default.nix
+++ b/pkgs/development/libraries/poco/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, pkgconfig, zlib, pcre, expat, sqlite, openssl, unixODBC, mysql }:
+{ stdenv, fetchurl, cmake, pkgconfig, zlib, pcre, expat, sqlite, openssl, unixODBC, libmysqlclient }:
 
 stdenv.mkDerivation rec {
   pname = "poco";
@@ -12,9 +12,9 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake pkgconfig ];
 
-  buildInputs = [ zlib pcre expat sqlite openssl unixODBC mysql.connector-c ];
+  buildInputs = [ zlib pcre expat sqlite openssl unixODBC libmysqlclient ];
 
-  MYSQL_DIR = mysql.connector-c;
+  MYSQL_DIR = libmysqlclient;
   MYSQL_INCLUDE_DIR = "${MYSQL_DIR}/include/mysql";
 
   cmakeFlags = [
diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix
index 3b3f406485c..a46dcec0312 100644
--- a/pkgs/development/libraries/qt-3/default.nix
+++ b/pkgs/development/libraries/qt-3/default.nix
@@ -5,7 +5,7 @@
 , xineramaSupport ? true, libXinerama ? null
 , cursorSupport ? true, libXcursor ? null
 , threadSupport ? true
-, mysqlSupport ? false, mysql ? null
+, mysqlSupport ? false, libmysqlclient ? null
 , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
 , openglSupport ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
 , libGLU_combined ? null, libXmu ? null
@@ -16,7 +16,7 @@ assert xftSupport -> libXft != null;
 assert xrenderSupport -> xftSupport && libXrender != null;
 assert xrandrSupport -> libXrandr != null;
 assert cursorSupport -> libXcursor != null;
-assert mysqlSupport -> mysql != null;
+assert mysqlSupport -> libmysqlclient != null;
 assert openglSupport -> libGLU_combined != null && libXmu != null;
 
 stdenv.mkDerivation {
@@ -62,7 +62,7 @@ stdenv.mkDerivation {
   ] ++ stdenv.lib.optionals cursorSupport [
     "-L${libXcursor.out}/lib -I${libXcursor.dev}/include"
   ] ++ stdenv.lib.optionals mysqlSupport [
-    "-qt-sql-mysql" "-L${mysql.connector-c}/lib/mysql" "-I${mysql.connector-c}/include/mysql"
+    "-qt-sql-mysql" "-L${libmysqlclient}/lib/mysql" "-I${libmysqlclient}/include/mysql"
   ] ++ stdenv.lib.optionals xftSupport [
     "-L${libXft.out}/lib" "-I${libXft.dev}/include"
     "-L${libXft.freetype.out}/lib" "-I${libXft.freetype.dev}/include"
diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix
index b5a10e8f11a..7c7f8f51de7 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -2,7 +2,7 @@
 , libXrender, libXinerama, libXcursor, libXv, libXext
 , libXfixes, libXrandr, libSM, freetype, fontconfig, zlib, libjpeg, libpng
 , libmng, which, libGLU, openssl, dbus, cups, pkgconfig
-, libtiff, glib, icu, mysql, postgresql, sqlite, perl, coreutils, libXi
+, libtiff, glib, icu, libmysqlclient, postgresql, sqlite, perl, coreutils, libXi
 , buildMultimedia ? stdenv.isLinux, alsaLib, gstreamer, gst-plugins-base
 , buildWebkit ? (stdenv.isLinux || stdenv.isDarwin)
 , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
@@ -166,7 +166,7 @@ stdenv.mkDerivation rec {
     (mk (!stdenv.isFreeBSD) "opengl") "-xrender" "-xrandr" "-xinerama" "-xcursor" "-xinput" "-xfixes" "-fontconfig"
     "-qdbus" (mk (cups != null) "cups") "-glib" "-dbus-linked" "-openssl-linked"
 
-    "-${if mysql != null then "plugin" else "no"}-sql-mysql" "-system-sqlite"
+    "-${if libmysqlclient != null then "plugin" else "no"}-sql-mysql" "-system-sqlite"
 
     "-exceptions" "-xmlpatterns"
 
@@ -192,7 +192,7 @@ stdenv.mkDerivation rec {
   buildInputs =
     [ cups # Qt dlopen's libcups instead of linking to it
       postgresql sqlite libjpeg libmng libtiff icu ]
-    ++ lib.optionals (mysql != null) [ mysql.connector-c ]
+    ++ lib.optionals (libmysqlclient != null) [ libmysqlclient ]
     ++ lib.optionals gtkStyle [ gtk2 gdk-pixbuf ]
     ++ lib.optionals stdenv.isDarwin [ ApplicationServices OpenGL Cocoa AGL libcxx libobjc ];
 
diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix
index e2c71a77062..8119513618b 100644
--- a/pkgs/development/libraries/qt-5/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix
@@ -14,7 +14,7 @@
   zlib,
 
   # optional dependencies
-  cups ? null, mysql ? null, postgresql ? null,
+  cups ? null, libmysqlclient ? null, postgresql ? null,
   withGtk3 ? false, dconf ? null, gtk3 ? null,
 
   # options
@@ -80,7 +80,7 @@ stdenv.mkDerivation {
     )
     ++ lib.optional developerBuild gdb
     ++ lib.optional (cups != null) cups
-    ++ lib.optional (mysql != null) mysql.connector-c
+    ++ lib.optional (libmysqlclient != null) libmysqlclient
     ++ lib.optional (postgresql != null) postgresql;
 
   nativeBuildInputs =
@@ -285,7 +285,7 @@ stdenv.mkDerivation {
       "-L" "${openssl.out}/lib"
       "-I" "${openssl.dev}/include"
       "-system-sqlite"
-      ''-${if mysql != null then "plugin" else "no"}-sql-mysql''
+      ''-${if libmysqlclient != null then "plugin" else "no"}-sql-mysql''
       ''-${if postgresql != null then "plugin" else "no"}-sql-psql''
 
       "-make libs"
@@ -349,9 +349,9 @@ stdenv.mkDerivation {
           "-L" "${cups.lib}/lib"
           "-I" "${cups.dev}/include"
         ]
-        ++ lib.optionals (mysql != null) [
-          "-L" "${mysql.out}/lib"
-          "-I" "${mysql.out}/include"
+        ++ lib.optionals (libmysqlclient != null) [
+          "-L" "${libmysqlclient}/lib"
+          "-I" "${libmysqlclient}/include"
         ]
     );
 
diff --git a/pkgs/development/libraries/tntdb/default.nix b/pkgs/development/libraries/tntdb/default.nix
index 13b4e6b97a9..2d6ae3f18ca 100644
--- a/pkgs/development/libraries/tntdb/default.nix
+++ b/pkgs/development/libraries/tntdb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cxxtools, postgresql, mysql, sqlite, zlib, openssl }:
+{ stdenv, fetchurl, cxxtools, postgresql, libmysqlclient, sqlite, zlib, openssl }:
 
 stdenv.mkDerivation rec {
   pname = "tntdb";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0js79dbvkic30bzw1pf26m64vs2ssw2sbj55w1dc0sy69dlv4fh9";
   };
 
-  buildInputs = [ cxxtools postgresql mysql.connector-c sqlite zlib openssl ];
+  buildInputs = [ cxxtools postgresql libmysqlclient sqlite zlib openssl ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix
index b9aa1696d48..44e7ed17f0c 100644
--- a/pkgs/development/libraries/unixODBCDrivers/default.nix
+++ b/pkgs/development/libraries/unixODBCDrivers/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, unixODBC, cmake, postgresql, mysql, mariadb, sqlite, zlib, libxml2, dpkg, lib, kerberos, curl, libuuid, autoPatchelfHook }:
+{ fetchurl, stdenv, unixODBC, cmake, postgresql, mysql, libmysqlclient, sqlite, zlib, libxml2, dpkg, lib, openssl, kerberos, curl, libuuid, autoPatchelfHook }:
 
 # I haven't done any parameter tweaking.. So the defaults provided here might be bad
 
@@ -29,18 +29,23 @@
 
   mariadb = stdenv.mkDerivation rec {
     pname = "mariadb-connector-odbc";
-    version = "2.0.10";
+    version = "3.1.2";
 
     src = fetchurl {
-      url = "https://downloads.mariadb.org/interstitial/connector-odbc-${version}/src/${pname}-${version}-ga-src.tar.gz";
-      sha256 = "0b6ximy0dg0xhqbrm1l7pn8hjapgpmddi67kh54h6i9cq9hqfdvz";
+      url = "https://downloads.mariadb.org/interstitial/connector-odbc-${version}/${pname}-${version}-ga-src.tar.gz";
+      sha256 = "0iibly2mbqijqyq4pzpb6dh40clqhvqrhgnj8knm4bw3nlksd0d5";
     };
 
     nativeBuildInputs = [ cmake ];
-    buildInputs = [ unixODBC mariadb.connector-c ];
+    buildInputs = [ unixODBC libmysqlclient openssl ];
 
     cmakeFlags = [
-      "-DMARIADB_INCLUDE_DIR=${mariadb.connector-c}/include/mariadb"
+      "-DWITH_OPENSSL=ON"
+    ];
+
+   NIX_CFLAGS_COMPILE = [
+     "-I${libmysqlclient}/include/mysql"
+     "-L${libmysqlclient}/lib/mysql"
     ];
 
     passthru = {
diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix
index 319b0effc57..31fa104fb05 100644
--- a/pkgs/development/libraries/wt/default.nix
+++ b/pkgs/development/libraries/wt/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, cmake, boost, pkgconfig, doxygen, qt48Full, libharu
-, pango, fcgi, firebird, mysql, postgresql, graphicsmagick, glew, openssl
+, pango, fcgi, firebird, libmysqlclient, postgresql, graphicsmagick, glew, openssl
 , pcre, harfbuzz
 }:
 
@@ -22,7 +22,7 @@ let
       nativeBuildInputs = [ pkgconfig ];
       buildInputs = [
         cmake boost doxygen qt48Full libharu
-        pango fcgi firebird mysql.connector-c postgresql graphicsmagick glew
+        pango fcgi firebird libmysqlclient postgresql graphicsmagick glew
         openssl pcre
       ];
 
@@ -30,7 +30,7 @@ let
         "-DWT_WRASTERIMAGE_IMPLEMENTATION=GraphicsMagick"
         "-DWT_CPP_11_MODE=-std=c++11"
         "-DGM_PREFIX=${graphicsmagick}"
-        "-DMYSQL_PREFIX=${mysql.connector-c}"
+        "-DMYSQL_PREFIX=${libmysqlclient}"
         "-DHARFBUZZ_INCLUDE_DIR=${harfbuzz.dev}/include"
         "--no-warn-unused-cli"
       ];
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
index 052bfb11949..acc98215af0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
@@ -53,11 +53,11 @@ in
   cl-async-ssl = addNativeLibs [pkgs.openssl (import ./openssl-lib-marked.nix)];
   cl-async-test = addNativeLibs [pkgs.openssl];
   clsql = x: {
-    propagatedBuildInputs = with pkgs; [mysql.connector-c postgresql sqlite zlib];
+    propagatedBuildInputs = with pkgs; [libmysqlclient postgresql sqlite zlib];
     overrides = y: (x.overrides y) // {
       preConfigure = ((x.overrides y).preConfigure or "") + ''
-        export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.mysql.connector-c}/include/mysql"
-        export NIX_LDFLAGS="$NIX_LDFLAGS -L${pkgs.mysql.connector-c}/lib/mysql"
+        export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.libmysqlclient}/include/mysql"
+        export NIX_LDFLAGS="$NIX_LDFLAGS -L${pkgs.libmysqlclient}/lib/mysql"
       '';
     };
   };
@@ -77,7 +77,7 @@ $out/lib/common-lisp/query-fs"
     };
   };
   cffi = addNativeLibs [pkgs.libffi];
-  cl-mysql = addNativeLibs [pkgs.mysql];
+  cl-mysql = addNativeLibs [pkgs.libmysqlclient];
   cl-ppcre-template = x: {
     overrides = y: (x.overrides y) // {
       postPatch = ''
diff --git a/pkgs/development/lisp-modules/shell.nix b/pkgs/development/lisp-modules/shell.nix
index b3d50b2fb07..4a1f9ded56c 100644
--- a/pkgs/development/lisp-modules/shell.nix
+++ b/pkgs/development/lisp-modules/shell.nix
@@ -6,11 +6,11 @@ self = rec {
   env = buildEnv { name = name; paths = buildInputs; };
   buildInputs = [
     gcc stdenv
-    openssl fuse libuv mysql.connector-c libfixposix libev sqlite
+    openssl fuse libuv libmysqlclient libfixposix libev sqlite
     freetds
     lispPackages.quicklisp-to-nix lispPackages.quicklisp-to-nix-system-info
   ];
   CPATH = "${libfixposix}/include";
-  LD_LIBRARY_PATH = "${openssl.out}/lib:${fuse}/lib:${libuv}/lib:${libev}/lib:${mysql.connector-c}/lib:${mysql.connector-c}/lib/mysql:${postgresql.lib}/lib:${sqlite.out}/lib:${libfixposix}/lib:${freetds}/lib:${openssl_lib_marked}/lib";
+  LD_LIBRARY_PATH = "${openssl.out}/lib:${fuse}/lib:${libuv}/lib:${libev}/lib:${libmysqlclient}/lib:${libmysqlclient}/lib/mysql:${postgresql.lib}/lib:${sqlite.out}/lib:${libfixposix}/lib:${freetds}/lib:${openssl_lib_marked}/lib";
 };
 in stdenv.mkDerivation self
diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix
index 233503c2eca..41dae8347ee 100644
--- a/pkgs/development/lua-modules/overrides.nix
+++ b/pkgs/development/lua-modules/overrides.nix
@@ -154,12 +154,12 @@ with super;
   luadbi-mysql = super.luadbi-mysql.override({
     extraVariables = ''
       -- Can't just be /include and /lib, unfortunately needs the trailing 'mysql'
-      MYSQL_INCDIR='${pkgs.mysql.connector-c}/include/mysql';
-      MYSQL_LIBDIR='${pkgs.mysql.connector-c}/lib/mysql';
+      MYSQL_INCDIR='${pkgs.libmysqlclient}/include/mysql';
+      MYSQL_LIBDIR='${pkgs.libmysqlclient}/lib/mysql';
     '';
     buildInputs = [
       pkgs.mysql.client
-      pkgs.mysql.connector-c
+      pkgs.libmysqlclient
     ];
   });
 
diff --git a/pkgs/development/ocaml-modules/mysql/default.nix b/pkgs/development/ocaml-modules/mysql/default.nix
index 1986f7e48f6..9be5ebf8a7b 100644
--- a/pkgs/development/ocaml-modules/mysql/default.nix
+++ b/pkgs/development/ocaml-modules/mysql/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, ocaml, findlib, mysql }:
+{ stdenv, fetchurl, fetchpatch, ocaml, findlib, libmysqlclient }:
 
 # TODO: la versione stabile da' un errore di compilazione dovuto a
 # qualche cambiamento negli header .h
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   createFindlibDestdir = true;
 
-  propagatedBuildInputs = [ mysql.connector-c ];
+  propagatedBuildInputs = [ libmysqlclient ];
 
   patches = [
     (fetchpatch {
diff --git a/pkgs/development/perl-modules/DBD-mysql/default.nix b/pkgs/development/perl-modules/DBD-mysql/default.nix
index 6eed57c4e7c..eb539339603 100644
--- a/pkgs/development/perl-modules/DBD-mysql/default.nix
+++ b/pkgs/development/perl-modules/DBD-mysql/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, buildPerlPackage, DBI, DevelChecklib, mysql }:
+{ fetchurl, buildPerlPackage, DBI, DevelChecklib, libmysqlclient }:
 
 buildPerlPackage {
   pname = "DBD-mysql";
@@ -9,7 +9,7 @@ buildPerlPackage {
     sha256 = "0y4djb048i09dk19av7mzfb3khr72vw11p3ayw2p82jsy4gm8j2g";
   };
 
-  buildInputs = [ mysql.connector-c DevelChecklib ] ;
+  buildInputs = [ libmysqlclient DevelChecklib ] ;
   propagatedBuildInputs = [ DBI ];
 
   doCheck = false;
diff --git a/pkgs/development/pure-modules/glpk/default.nix b/pkgs/development/pure-modules/glpk/default.nix
index 7b615928da9..34d12f1471f 100644
--- a/pkgs/development/pure-modules/glpk/default.nix
+++ b/pkgs/development/pure-modules/glpk/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchurl,
-  pkgconfig, pure, glpk, gmp, libtool, mysql, libiodbc }:
+  pkgconfig, pure, glpk, gmp, libtool, libmysqlclient, libiodbc }:
 
 stdenv.mkDerivation rec {
   baseName = "glpk";
@@ -12,13 +12,13 @@ stdenv.mkDerivation rec {
   };
 
   glpkWithExtras = lib.overrideDerivation glpk (attrs: {
-    propagatedBuildInputs = [ gmp libtool mysql.connector-c libiodbc ];
+    propagatedBuildInputs = [ gmp libtool libmysqlclient libiodbc ];
 
     CPPFLAGS = "-I${gmp.dev}/include";
 
     preConfigure = ''
       substituteInPlace configure \
-        --replace /usr/include/mysql ${mysql.connector-c}/include/mysql
+        --replace /usr/include/mysql ${libmysqlclient}/include/mysql
     '';
     configureFlags = [ "--enable-dl"
                        "--enable-odbc"
diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix
index 6b20b4b570a..2a5d4fa4757 100644
--- a/pkgs/development/python-modules/cryptography/default.nix
+++ b/pkgs/development/python-modules/cryptography/default.nix
@@ -1,6 +1,7 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
+, fetchpatch
 , openssl
 , cryptography_vectors
 , darwin
@@ -49,10 +50,18 @@ buildPythonPackage rec {
     pytz
   ];
 
+  # remove when https://github.com/pyca/cryptography/issues/4998 is fixed
   checkPhase = ''
-    py.test --disable-pytest-warnings tests
+    py.test --disable-pytest-warnings tests -k 'not load_ecdsa_no_named_curve'
   '';
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/pyca/cryptography/commit/e575e3d482f976c4a1f3203d63ea0f5007a49a2a.patch";
+      sha256 = "0vg9prqsizd6gzh5j7lscsfxzxlhz7pacvzhgqmj1vhdhjwbblcp";
+    })
+  ];
+
   # IOKit's dependencies are inconsistent between OSX versions, so this is the best we
   # can do until nix 1.11's release
   __impureHostDeps = [ "/usr/lib" ];
diff --git a/pkgs/development/python-modules/mysqlclient/default.nix b/pkgs/development/python-modules/mysqlclient/default.nix
index 488f6f9a7bb..b37f191286e 100644
--- a/pkgs/development/python-modules/mysqlclient/default.nix
+++ b/pkgs/development/python-modules/mysqlclient/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, buildPythonPackage, fetchPypi, mysql }:
+{ stdenv, buildPythonPackage, fetchPypi, libmysqlclient }:
 
 buildPythonPackage rec {
   pname = "mysqlclient";
   version = "1.4.4";
 
   nativeBuildInputs = [
-    mysql.connector-c
+    libmysqlclient
   ];
 
   buildInputs = [
-    mysql.connector-c
+    libmysqlclient
   ];
 
   # Tests need a MySQL database
diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix
index ec17b77ba20..018463ead54 100644
--- a/pkgs/development/python-modules/pyopenssl/default.nix
+++ b/pkgs/development/python-modules/pyopenssl/default.nix
@@ -9,6 +9,7 @@
 , pretend
 , flaky
 , glibcLocales
+, six
 }:
 
 with stdenv.lib;
@@ -84,7 +85,7 @@ buildPythonPackage rec {
   doCheck = !stdenv.isDarwin;
 
   nativeBuildInputs = [ openssl ];
-  propagatedBuildInputs = [ cryptography pyasn1 idna ];
+  propagatedBuildInputs = [ cryptography pyasn1 idna six ];
 
   checkInputs = [ pytest pretend flaky glibcLocales ];
 }
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 1616eacffc6..cef7f0aecf2 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -325,7 +325,7 @@ let
     rmatio = [ pkgs.zlib.dev ];
     Rmpfr = [ pkgs.gmp pkgs.mpfr.dev ];
     Rmpi = [ pkgs.openmpi ];
-    RMySQL = [ pkgs.zlib pkgs.mysql.connector-c pkgs.openssl.dev ];
+    RMySQL = [ pkgs.zlib pkgs.libmysqlclient pkgs.openssl.dev ];
     RNetCDF = [ pkgs.netcdf pkgs.udunits ];
     RODBCext = [ pkgs.libiodbc ];
     RODBC = [ pkgs.libiodbc ];
@@ -810,7 +810,7 @@ let
     });
 
     RMySQL = old.RMySQL.overrideDerivation (attrs: {
-      MYSQL_DIR=pkgs.mysql.connector-c;
+      MYSQL_DIR="${pkgs.libmysqlclient}";
       preConfigure = ''
         patchShebangs configure
       '';
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index a03e40e8097..157e15e375f 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -20,7 +20,7 @@
 { lib, fetchurl, writeScript, ruby, kerberos, libxml2, libxslt, python, stdenv, which
 , libiconv, postgresql, v8_3_16_14, clang, sqlite, zlib, imagemagick
 , pkgconfig , ncurses, xapian, gpgme, utillinux, tzdata, icu, libffi
-, cmake, libssh2, openssl, mysql, darwin, git, perl, pcre, gecode_3, curl
+, cmake, libssh2, openssl, libmysqlclient, darwin, git, perl, pcre, gecode_3, curl
 , msgpack, qt59, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem
 , cairo, re2, rake, gobject-introspection, gdk-pixbuf, zeromq, czmq, graphicsmagick, libcxx
 , file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz
@@ -349,11 +349,11 @@ in
   };
 
   mysql = attrs: {
-    buildInputs = [ mysql.connector-c zlib openssl ];
+    buildInputs = [ libmysqlclient zlib openssl ];
   };
 
   mysql2 = attrs: {
-    buildInputs = [ mysql.connector-c zlib openssl ];
+    buildInputs = [ libmysqlclient zlib openssl ];
   };
 
   ncursesw = attrs: {
diff --git a/pkgs/development/tools/misc/patchelf/default.nix b/pkgs/development/tools/misc/patchelf/default.nix
index 77d03f299f4..db8bb4f4243 100644
--- a/pkgs/development/tools/misc/patchelf/default.nix
+++ b/pkgs/development/tools/misc/patchelf/default.nix
@@ -1,16 +1,27 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "patchelf-0.9";
+  name = "patchelf-${version}";
+  version = "0.10";
 
   src = fetchurl {
     url = "https://nixos.org/releases/patchelf/${name}/${name}.tar.bz2";
-    sha256 = "a0f65c1ba148890e9f2f7823f4bedf7ecad5417772f64f994004f59a39014f83";
+    sha256 = "1wzwvnlyf853hw9zgqq5522bvf8gqadk8icgqa41a5n7593csw7n";
   };
 
+  # Drop test that fails on musl (?)
+  postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+    substituteInPlace tests/Makefile.am \
+      --replace "set-rpath-library.sh" ""
+  '';
+
   setupHook = [ ./setup-hook.sh ];
 
-  doCheck = false; # fails 8 out of 24 tests, problems when loading libc.so.6
+  nativeBuildInputs = [ autoreconfHook ];
+  buildInputs = [ ];
+
+  # if not Musl, fails 8 out of 25 tests, problems when loading libc.so.6
+  doCheck = stdenv.hostPlatform.isMusl;
 
   meta = with stdenv.lib; {
     homepage = https://nixos.org/patchelf.html;
diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix
index c673bd26109..f5ff1c74bcc 100644
--- a/pkgs/development/tools/misc/patchelf/unstable.nix
+++ b/pkgs/development/tools/misc/patchelf/unstable.nix
@@ -1,24 +1,18 @@
-{ stdenv, fetchFromGitHub, autoreconfHook }:
+{ stdenv, fetchurl, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  pname = "patchelf";
-  version = "0.10-pre-20190328";
+  name = "patchelf-${version}";
+  version = "0.10";
 
-  src = fetchFromGitHub {
-    owner = "NixOS";
-    repo = "patchelf";
-    rev = "e1e39f3639e39360ceebb2f7ed533cede4623070";
-    sha256 = "09q1b1yqfzg1ih51v7qjh55vxfdbd8x5anycl8sfz6qy107wr02k";
+  src = fetchurl {
+    url = "https://nixos.org/releases/patchelf/${name}/${name}.tar.bz2";
+    sha256 = "1wzwvnlyf853hw9zgqq5522bvf8gqadk8icgqa41a5n7593csw7n";
   };
 
   # Drop test that fails on musl (?)
   postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
     substituteInPlace tests/Makefile.am \
       --replace "set-rpath-library.sh" ""
-  '' +
-  # extend version identifier to more informative than "0.10".
-  ''
-    echo -n ${version} > version
   '';
 
   setupHook = [ ./setup-hook.sh ];
@@ -28,11 +22,11 @@ stdenv.mkDerivation rec {
 
   doCheck = !stdenv.isDarwin;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://nixos.org/patchelf.html;
-    license = "GPL";
+    license = licenses.gpl3;
     description = "A small utility to modify the dynamic linker and RPATH of ELF executables";
-    maintainers = [ stdenv.lib.maintainers.eelco ];
-    platforms = stdenv.lib.platforms.all;
+    maintainers = [ maintainers.eelco ];
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/tools/misc/sysbench/default.nix b/pkgs/development/tools/misc/sysbench/default.nix
index e2d507ab801..8076925f29b 100644
--- a/pkgs/development/tools/misc/sysbench/default.nix
+++ b/pkgs/development/tools/misc/sysbench/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, vim, mysql
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, vim, libmysqlclient
 , libaio }:
 
 stdenv.mkDerivation {
   name = "sysbench-1.0.17";
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
-  buildInputs = [ vim mysql.connector-c libaio ];
+  buildInputs = [ vim libmysqlclient libaio ];
 
   src = fetchFromGitHub {
     owner = "akopytov";
diff --git a/pkgs/development/tools/tora/default.nix b/pkgs/development/tools/tora/default.nix
index 74f1f22426f..931c00ecce5 100644
--- a/pkgs/development/tools/tora/default.nix
+++ b/pkgs/development/tools/tora/default.nix
@@ -1,5 +1,5 @@
 { mkDerivation, lib, fetchFromGitHub, cmake, extra-cmake-modules, makeWrapper
-, boost, doxygen, openssl, mysql, postgresql, graphviz, loki
+, boost, doxygen, openssl, libmysqlclient, postgresql, graphviz, loki
 , qscintilla, qtbase, qttools }:
 
 mkDerivation {
@@ -16,7 +16,7 @@ mkDerivation {
   nativeBuildInputs = [ cmake extra-cmake-modules makeWrapper qttools ];
 
   buildInputs = [
-    boost doxygen graphviz loki mysql.connector-c openssl postgresql qscintilla qtbase
+    boost doxygen graphviz loki libmysqlclient openssl postgresql qscintilla qtbase
   ];
 
   preConfigure = ''
@@ -47,7 +47,7 @@ mkDerivation {
     "-lssl"
   ];
 
-  NIX_CFLAGS_COMPILE = [ "-L${mysql.connector-c}/lib/mysql" "-I${mysql.connector-c}/include/mysql" ];
+  NIX_CFLAGS_COMPILE = [ "-L${libmysqlclient}/lib/mysql" "-I${libmysqlclient}/include/mysql" ];
 
   qtWrapperArgs = [
     ''--prefix PATH : ${lib.getBin graphviz}/bin''
diff --git a/pkgs/games/zod/default.nix b/pkgs/games/zod/default.nix
index c14eda2968e..888b7bd3d6a 100644
--- a/pkgs/games/zod/default.nix
+++ b/pkgs/games/zod/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, unrar, unzip, SDL, SDL_image, SDL_ttf, SDL_mixer
-, mysql, makeWrapper }:
+, libmysqlclient, makeWrapper }:
 
 stdenv.mkDerivation {
   name = "zod-engine-2011-03-18";
@@ -24,9 +24,9 @@ stdenv.mkDerivation {
     sourceRoot=`pwd`/src
   '';
 
-  buildInputs = [ unrar unzip SDL SDL_image SDL_ttf SDL_mixer mysql.connector-c makeWrapper ];
+  buildInputs = [ unrar unzip SDL SDL_image SDL_ttf SDL_mixer libmysqlclient makeWrapper ];
 
-  NIX_LDFLAGS = "-L${mysql.connector-c}/lib/mysql";
+  NIX_LDFLAGS = "-L${libmysqlclient}/lib/mysql";
 
   installPhase = ''
     mkdir -p $out/bin $out/share/zod
diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix
index 9fdf9ca0bc1..75144799d01 100644
--- a/pkgs/os-specific/linux/firmware/fwupd/default.nix
+++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix
@@ -237,9 +237,9 @@ stdenv.mkDerivation rec {
   postFixup = ''
     find -L "$out/bin" "$out/libexec" -type f -executable -print0 \
       | while IFS= read -r -d ''' file; do
-      if [[ "''${file}" != *.efi ]]; then
-        echo "Wrapping program ''${file}"
-        wrapProgram "''${file}" "''${gappsWrapperArgs[@]}"
+      if [[ "$file" != *.efi ]]; then
+        echo "Wrapping program $file"
+        wrapGApp "$file"
       fi
     done
   '';
diff --git a/pkgs/os-specific/linux/kexectools/default.nix b/pkgs/os-specific/linux/kexectools/default.nix
index d6fd7346f4f..4e9007c7362 100644
--- a/pkgs/os-specific/linux/kexectools/default.nix
+++ b/pkgs/os-specific/linux/kexectools/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   depsBuildBuild = [ buildPackages.stdenv.cc ];
   buildInputs = [ zlib ];
 
-  patches = stdenv.lib.optionals stdenv.hostPlatform.isi686 [
+  patches = [
     # fix build on i686
     # See: https://src.fedoraproject.org/rpms/kexec-tools/c/cb1e5463b5298b064e9b6c86ad6fe3505fec9298
     (fetchpatch {
diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix
index e48dec7d20c..ab2d44577c0 100644
--- a/pkgs/servers/clickhouse/default.nix
+++ b/pkgs/servers/clickhouse/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, cmake, libtool
 , boost, capnproto, cctz, clang-unwrapped, double-conversion, gperftools, icu
-, libcpuid, libxml2, lld, llvm, lz4 , mysql, openssl, poco, re2, rdkafka
+, libcpuid, libxml2, lld, llvm, lz4 , libmysqlclient, openssl, poco, re2, rdkafka
 , readline, sparsehash, unixODBC, zstd, ninja, jemalloc, brotli, protobuf, xxHash
 }:
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake libtool ninja ];
   buildInputs = [
     boost capnproto cctz clang-unwrapped double-conversion gperftools icu
-    libcpuid libxml2 lld llvm lz4 mysql.connector-c openssl poco re2 rdkafka
+    libcpuid libxml2 lld llvm lz4 libmysqlclient openssl poco re2 rdkafka
     readline sparsehash unixODBC zstd jemalloc brotli protobuf xxHash
   ];
 
diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix
index c448e4936f6..93e1a31abb1 100644
--- a/pkgs/servers/computing/slurm/default.nix
+++ b/pkgs/servers/computing/slurm/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, pkgconfig, libtool, curl
 , python, munge, perl, pam, openssl, zlib
-, ncurses, mysql, gtk2, lua, hwloc, numactl
+, ncurses, libmysqlclient, gtk2, lua, hwloc, numactl
 , readline, freeipmi, libssh2, xorg, lz4
 # enable internal X11 support via libssh2
 , enableX11 ? true
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig libtool ];
   buildInputs = [
     curl python munge perl pam openssl zlib
-      mysql.connector-c ncurses gtk2 lz4
+      libmysqlclient ncurses gtk2 lz4
       lua hwloc numactl readline freeipmi
   ] ++ stdenv.lib.optionals enableX11 [ libssh2 xorg.xauth ];
 
diff --git a/pkgs/servers/freeradius/default.nix b/pkgs/servers/freeradius/default.nix
index 6c6eb2b0c09..eeea3298ecd 100644
--- a/pkgs/servers/freeradius/default.nix
+++ b/pkgs/servers/freeradius/default.nix
@@ -13,7 +13,7 @@
 , withMemcached ? false
 , hiredis
 , withRedis ? false
-, mysql
+, libmysqlclient
 , withMysql ? false
 , json_c
 , withJson ? false
@@ -31,7 +31,7 @@ assert withPcap -> libpcap != null;
 assert withCap -> libcap != null;
 assert withMemcached -> libmemcached != null;
 assert withRedis -> hiredis != null;
-assert withMysql -> mysql != null;
+assert withMysql -> libmysqlclient != null;
 assert withYubikey -> libyubikey != null;
 assert withCollectd -> collectd != null;
 assert withRest -> curl != null && withJson;
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
     ++ optional withCap libcap
     ++ optional withMemcached libmemcached
     ++ optional withRedis hiredis
-    ++ optional withMysql mysql.connector-c
+    ++ optional withMysql libmysqlclient
     ++ optional withJson json_c
     ++ optional withYubikey libyubikey
     ++ optional withCollectd collectd
diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix
index 7dacb997d47..f67bc5b0045 100644
--- a/pkgs/servers/http/lighttpd/default.nix
+++ b/pkgs/servers/http/lighttpd/default.nix
@@ -1,6 +1,6 @@
 { stdenv, buildPackages, fetchurl, pkgconfig, pcre, libxml2, zlib, bzip2, which, file
 , openssl, enableMagnet ? false, lua5_1 ? null
-, enableMysql ? false, mysql ? null
+, enableMysql ? false, libmysqlclient ? null
 , enableLdap ? false, openldap ? null
 , enableWebDAV ? false, sqlite ? null, libuuid ? null
 , enableExtendedAttrs ? false, attr ? null
@@ -8,7 +8,7 @@
 }:
 
 assert enableMagnet -> lua5_1 != null;
-assert enableMysql -> mysql != null;
+assert enableMysql -> libmysqlclient != null;
 assert enableLdap -> openldap != null;
 assert enableWebDAV -> sqlite != null;
 assert enableWebDAV -> libuuid != null;
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ pcre pcre.dev libxml2 zlib bzip2 which file openssl ]
              ++ stdenv.lib.optional enableMagnet lua5_1
-             ++ stdenv.lib.optional enableMysql mysql.connector-c
+             ++ stdenv.lib.optional enableMysql libmysqlclient
              ++ stdenv.lib.optional enableLdap openldap
              ++ stdenv.lib.optional enableWebDAV sqlite
              ++ stdenv.lib.optional enableWebDAV libuuid;
diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix
index e3afd1f9879..4104b0443ff 100644
--- a/pkgs/servers/mail/dovecot/default.nix
+++ b/pkgs/servers/mail/dovecot/default.nix
@@ -3,7 +3,7 @@
 , clucene_core_2, icu, openldap, libsodium, libstemmer, cyrus_sasl
 , nixosTests
 # Auth modules
-, withMySQL ? false, mysql
+, withMySQL ? false, libmysqlclient
 , withPgSQL ? false, postgresql
 , withSQLite ? true, sqlite
 }:
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   buildInputs =
     [ openssl bzip2 zlib lz4 clucene_core_2 icu openldap libsodium libstemmer cyrus_sasl.dev ]
     ++ lib.optionals (stdenv.isLinux) [ systemd pam libcap inotify-tools ]
-    ++ lib.optional withMySQL mysql.connector-c
+    ++ lib.optional withMySQL libmysqlclient
     ++ lib.optional withPgSQL postgresql
     ++ lib.optional withSQLite sqlite;
 
diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix
index fcafd5817d4..96c8ad4a383 100644
--- a/pkgs/servers/mail/exim/default.nix
+++ b/pkgs/servers/mail/exim/default.nix
@@ -1,6 +1,6 @@
 { coreutils, db, fetchurl, openssl, pcre, perl, pkgconfig, stdenv
 , enableLDAP ? false, openldap
-, enableMySQL ? false, mysql, zlib
+, enableMySQL ? false, libmysqlclient, zlib
 , enableAuthDovecot ? false, dovecot
 , enablePAM ? false, pam
 , enableSPF ? true, libspf2
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ coreutils db openssl perl pcre ]
     ++ stdenv.lib.optional enableLDAP openldap
-    ++ stdenv.lib.optionals enableMySQL [ mysql.connector-c zlib ]
+    ++ stdenv.lib.optionals enableMySQL [ libmysqlclient zlib ]
     ++ stdenv.lib.optional enableAuthDovecot dovecot
     ++ stdenv.lib.optional enablePAM pam
     ++ stdenv.lib.optional enableSPF libspf2;
@@ -53,10 +53,10 @@ stdenv.mkDerivation rec {
       ''}
       ${stdenv.lib.optionalString enableMySQL ''
         s:^# \(LOOKUP_MYSQL=yes\)$:\1:
-        s:^# \(LOOKUP_MYSQL_PC=mysql.connector-c\)$:\1:
-        s:^\(LOOKUP_LIBS\)=\(.*\):\1=\2 -lmysqlclient -L${mysql.connector-c}/lib/mysql -lssl -ldl -lm -lpthread -lz:
-        s:^# \(LOOKUP_LIBS\)=.*:\1=-lmysqlclient -L${mysql.connector-c}/lib/mysql -lssl -ldl -lm -lpthread -lz:
-        s:^# \(LOOKUP_INCLUDE\)=.*:\1=-I${mysql.connector-c}/include/mysql/:
+        s:^# \(LOOKUP_MYSQL_PC=libmysqlclient\)$:\1:
+        s:^\(LOOKUP_LIBS\)=\(.*\):\1=\2 -lmysqlclient -L${libmysqlclient}/lib/mysql -lssl -ldl -lm -lpthread -lz:
+        s:^# \(LOOKUP_LIBS\)=.*:\1=-lmysqlclient -L${libmysqlclient}/lib/mysql -lssl -ldl -lm -lpthread -lz:
+        s:^# \(LOOKUP_INCLUDE\)=.*:\1=-I${libmysqlclient}/include/mysql/:
       ''}
       ${stdenv.lib.optionalString enableAuthDovecot ''
         s:^# \(AUTH_DOVECOT\)=.*:\1=yes:
diff --git a/pkgs/servers/mail/opensmtpd/extras.nix b/pkgs/servers/mail/opensmtpd/extras.nix
index 71b27facbab..f7ed6382a7b 100644
--- a/pkgs/servers/mail/opensmtpd/extras.nix
+++ b/pkgs/servers/mail/opensmtpd/extras.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, openssl, libevent, libasr,
-  python2, pkgconfig, lua5, perl, mysql, postgresql, sqlite, hiredis,
+  python2, pkgconfig, lua5, perl, libmysqlclient, postgresql, sqlite, hiredis,
   enablePython ? true,
   enableLua ? true,
   enablePerl ? true,
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ openssl libevent
-    libasr python2 lua5 perl mysql.connector-c postgresql sqlite hiredis ];
+    libasr python2 lua5 perl libmysqlclient postgresql sqlite hiredis ];
 
   configureFlags = [
     "--sysconfdir=/etc"
@@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
     stdenv.lib.optional enableRedis
       "-I${hiredis}/include/hiredis -lhiredis"
     ++ stdenv.lib.optional enableMysql
-      "-L${mysql.connector-c}/lib/mysql";
+      "-L${libmysqlclient}/lib/mysql";
 
   meta = with stdenv.lib; {
     homepage = https://www.opensmtpd.org/;
diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix
index 39845f12f03..b299d212a18 100644
--- a/pkgs/servers/mail/postfix/default.nix
+++ b/pkgs/servers/mail/postfix/default.nix
@@ -3,7 +3,7 @@
 , buildPackages
 , withLDAP ? true, openldap
 , withPgSQL ? false, postgresql
-, withMySQL ? false, mysql
+, withMySQL ? false, libmysqlclient
 , withSQLite ? false, sqlite
 }:
 
@@ -12,7 +12,7 @@ let
     "-DUSE_TLS" "-DUSE_SASL_AUTH" "-DUSE_CYRUS_SASL" "-I${cyrus_sasl.dev}/include/sasl"
     "-DHAS_DB_BYPASS_MAKEDEFS_CHECK"
    ] ++ lib.optional withPgSQL "-DHAS_PGSQL"
-     ++ lib.optionals withMySQL [ "-DHAS_MYSQL" "-I${mysql.connector-c}/include/mysql" "-L${mysql.connector-c}/lib/mysql" ]
+     ++ lib.optionals withMySQL [ "-DHAS_MYSQL" "-I${libmysqlclient}/include/mysql" "-L${libmysqlclient}/lib/mysql" ]
      ++ lib.optional withSQLite "-DHAS_SQLITE"
      ++ lib.optionals withLDAP ["-DHAS_LDAP" "-DUSE_LDAP_SASL"]);
    auxlibs = lib.concatStringsSep " " ([
@@ -36,7 +36,7 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = [ makeWrapper m4 ];
   buildInputs = [ db openssl cyrus_sasl icu libnsl pcre ]
                 ++ lib.optional withPgSQL postgresql
-                ++ lib.optional withMySQL mysql.connector-c
+                ++ lib.optional withMySQL libmysqlclient
                 ++ lib.optional withSQLite sqlite
                 ++ lib.optional withLDAP openldap;
 
diff --git a/pkgs/servers/monitoring/plugins/default.nix b/pkgs/servers/monitoring/plugins/default.nix
index 9f23cc3e54c..62f40b59d37 100644
--- a/pkgs/servers/monitoring/plugins/default.nix
+++ b/pkgs/servers/monitoring/plugins/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, fetchpatch, autoreconfHook
 , coreutils, gnugrep, gnused, lm_sensors, net_snmp, openssh, openssl, perl
-, dnsutils, libdbi, mysql, zlib, openldap, procps
+, dnsutils, libdbi, libmysqlclient, zlib, openldap, procps
 , runtimeShell }:
 
 with stdenv.lib;
@@ -48,7 +48,7 @@ in stdenv.mkDerivation {
   '';
 
   # !!! make openssh a runtime dependency only
-  buildInputs = [ dnsutils libdbi mysql net_snmp openldap openssh openssl perl procps zlib ];
+  buildInputs = [ dnsutils libdbi libmysqlclient net_snmp openldap openssh openssl perl procps zlib ];
 
   nativeBuildInputs = [ autoreconfHook ];
 
diff --git a/pkgs/servers/monitoring/zabbix/proxy.nix b/pkgs/servers/monitoring/zabbix/proxy.nix
index 48b72dc0590..53932af6a18 100644
--- a/pkgs/servers/monitoring/zabbix/proxy.nix
+++ b/pkgs/servers/monitoring/zabbix/proxy.nix
@@ -3,7 +3,7 @@
 , snmpSupport ? true, net_snmp
 , sshSupport ? true, libssh2
 , sqliteSupport ? false, sqlite
-, mysqlSupport ? false, mysql
+, mysqlSupport ? false, libmysqlclient
 , postgresqlSupport ? false, postgresql
 }:
 
@@ -37,7 +37,7 @@ in
       ++ optional snmpSupport net_snmp
       ++ optional sqliteSupport sqlite
       ++ optional sshSupport libssh2
-      ++ optional mysqlSupport mysql.connector-c
+      ++ optional mysqlSupport libmysqlclient
       ++ optional postgresqlSupport postgresql;
 
       configureFlags = [
diff --git a/pkgs/servers/monitoring/zabbix/server.nix b/pkgs/servers/monitoring/zabbix/server.nix
index 51ca38e8cfc..ac5dcca901d 100644
--- a/pkgs/servers/monitoring/zabbix/server.nix
+++ b/pkgs/servers/monitoring/zabbix/server.nix
@@ -4,7 +4,7 @@
 , odbcSupport ? true, unixODBC
 , snmpSupport ? true, net_snmp
 , sshSupport ? true, libssh2
-, mysqlSupport ? false, mysql
+, mysqlSupport ? false, libmysqlclient
 , postgresqlSupport ? false, postgresql
 }:
 
@@ -40,7 +40,7 @@ in
       ++ optional ldapSupport openldap
       ++ optional snmpSupport net_snmp
       ++ optional sshSupport libssh2
-      ++ optional mysqlSupport mysql.connector-c
+      ++ optional mysqlSupport libmysqlclient
       ++ optional postgresqlSupport postgresql;
 
       configureFlags = [
diff --git a/pkgs/servers/sql/mariadb/connector-c/3_1.nix b/pkgs/servers/sql/mariadb/connector-c/3_1.nix
new file mode 100644
index 00000000000..c8bc4858f71
--- /dev/null
+++ b/pkgs/servers/sql/mariadb/connector-c/3_1.nix
@@ -0,0 +1,6 @@
+{ callPackage, ... } @ args:
+
+callPackage ./. (args // {
+  version = "3.1.2";
+  sha256 = "0pgz8m8d39mvj9wnjll6c83xvdl2h24273b3dkx0g5pxj7ga4shm";
+})
diff --git a/pkgs/servers/sql/mariadb/connector-c/default.nix b/pkgs/servers/sql/mariadb/connector-c/default.nix
new file mode 100644
index 00000000000..0e030268540
--- /dev/null
+++ b/pkgs/servers/sql/mariadb/connector-c/default.nix
@@ -0,0 +1,54 @@
+{ stdenv, fetchurl, cmake
+, curl, openssl, zlib
+, libiconv
+, version, sha256, ...
+}:
+
+with stdenv.lib;
+
+stdenv.mkDerivation {
+  pname = "mariadb-connector-c";
+  inherit version;
+
+  src = fetchurl {
+    urls = [
+      "https://downloads.mariadb.org/f/connector-c-${version}/mariadb-connector-c-${version}-src.tar.gz"
+      "https://downloads.mariadb.com/Connectors/c/connector-c-${version}/mariadb-connector-c-${version}-src.tar.gz"
+    ];
+    inherit sha256;
+  };
+
+  cmakeFlags = [
+    "-DWITH_EXTERNAL_ZLIB=ON"
+    "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock"
+    "-DWITH_CURL=ON"
+  ];
+
+  # The cmake setup-hook uses $out/lib by default, this is not the case here.
+  preConfigure = optionalString stdenv.isDarwin ''
+    cmakeFlagsArray+=("-DCMAKE_INSTALL_NAME_DIR=$out/lib/mariadb")
+  '';
+
+  nativeBuildInputs = [ cmake ];
+  propagatedBuildInputs = [ curl openssl zlib ];
+  buildInputs = [ libiconv ];
+
+  enableParallelBuilding = true;
+
+  postFixup = ''
+    ln -sv mariadb_config $out/bin/mysql_config
+    ln -sv mariadb $out/lib/mysql
+    ln -sv mariadb $out/include/mysql
+    ln -sv libmariadbclient.a $out/lib/mariadb/libmysqlclient.a
+    ln -sv libmariadbclient.a $out/lib/mariadb/libmysqlclient_r.a
+    ln -sv libmariadb.so $out/lib/mariadb/libmysqlclient.so
+    ln -sv libmariadb.so $out/lib/mariadb/libmysqlclient_r.so
+  '';
+
+  meta = {
+    description = "Client library that can be used to connect to MySQL or MariaDB";
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ globin ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index 15553055457..2352d7c1088 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -18,13 +18,6 @@ mytopEnv = perl.withPackages (p: with p; [ DataDumper DBDmysql DBI TermReadKey ]
 mariadb = server // {
   inherit client; # MariaDB Client
   server = server; # MariaDB Server
-  inherit connector-c; # libmysqlclient.so
-  inherit galera;
-};
-
-galeraLibs = buildEnv {
-  name = "galera-lib-inputs-united";
-  paths = [ openssl.out boost check ];
 };
 
 common = rec { # attributes common to both builds
@@ -218,95 +211,4 @@ server = stdenv.mkDerivation (common // {
 
   CXXFLAGS = optionalString stdenv.isi686 "-fpermissive";
 });
-
-connector-c = stdenv.mkDerivation rec {
-  pname = "mariadb-connector-c";
-  version = "2.3.7";
-
-  src = fetchurl {
-    url = "https://downloads.mariadb.org/interstitial/connector-c-${version}/mariadb-connector-c-${version}-src.tar.gz/from/http%3A//nyc2.mirrors.digitalocean.com/mariadb/";
-    sha256 = "13izi35vvxhiwl2dsnqrz75ciisy2s2k30giv7hrm01qlwnmiycl";
-    name   = "mariadb-connector-c-${version}-src.tar.gz";
-  };
-
-  # outputs = [ "dev" "out" ]; FIXME: cmake variables don't allow that < 3.0
-  cmakeFlags = [
-    "-DWITH_EXTERNAL_ZLIB=ON"
-    "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock"
-  ];
-
-  # The cmake setup-hook uses $out/lib by default, this is not the case here.
-  preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
-    cmakeFlagsArray+=("-DCMAKE_INSTALL_NAME_DIR=$out/lib/mariadb")
-  '';
-
-  nativeBuildInputs = [ cmake ];
-  propagatedBuildInputs = [ openssl zlib ];
-  buildInputs = [ libiconv ];
-
-  enableParallelBuilding = true;
-
-  postFixup = ''
-    ln -sv mariadb_config $out/bin/mysql_config
-    ln -sv mariadb $out/lib/mysql
-    ln -sv mariadb $out/include/mysql
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Client library that can be used to connect to MySQL or MariaDB";
-    license = licenses.lgpl21;
-    maintainers = with maintainers; [ globin ];
-    platforms = platforms.all;
-  };
-};
-
-galera = stdenv.mkDerivation rec {
-  pname = "mariadb-galera";
-  version = "25.3.26";
-
-  src = fetchFromGitHub {
-    owner = "codership";
-    repo = "galera";
-    rev = "release_${version}";
-    sha256 = "0fs0c1px9lknf1a5wwb12z1hj7j7b6hsfjddggikvkdkrnr2xs1f";
-    fetchSubmodules = true;
-  };
-
-  buildInputs = [ asio boost check openssl scons ];
-
-  postPatch = ''
-    substituteInPlace SConstruct \
-      --replace "boost_library_path = '''" "boost_library_path = '${boost}/lib'"
-  '';
-
-  preConfigure = ''
-    export CPPFLAGS="-I${asio}/include -I${boost.dev}/include -I${check}/include -I${openssl.dev}/include"
-    export LIBPATH="${galeraLibs}/lib"
-  '';
-
-  sconsFlags = "ssl=1 system_asio=0 strict_build_flags=0";
-
-  installPhase = ''
-    # copied with modifications from scripts/packages/freebsd.sh
-    GALERA_LICENSE_DIR="$share/licenses/${pname}-${version}"
-    install -d $out/{bin,lib/galera,share/doc/galera,$GALERA_LICENSE_DIR}
-    install -m 555 "garb/garbd"                       "$out/bin/garbd"
-    install -m 444 "libgalera_smm.so"                 "$out/lib/galera/libgalera_smm.so"
-    install -m 444 "scripts/packages/README"          "$out/share/doc/galera/"
-    install -m 444 "scripts/packages/README-MySQL"    "$out/share/doc/galera/"
-    install -m 444 "scripts/packages/freebsd/LICENSE" "$out/$GALERA_LICENSE_DIR"
-    install -m 444 "LICENSE"                          "$out/$GALERA_LICENSE_DIR/GPLv2"
-    install -m 444 "asio/LICENSE_1_0.txt"             "$out/$GALERA_LICENSE_DIR/LICENSE.asio"
-    install -m 444 "www.evanjones.ca/LICENSE"         "$out/$GALERA_LICENSE_DIR/LICENSE.crc32c"
-    install -m 444 "chromium/LICENSE"                 "$out/$GALERA_LICENSE_DIR/LICENSE.chromium"
-  '';
-
-  meta = {
-    description = "Galera 3 wsrep provider library";
-    homepage = http://galeracluster.com/;
-    license = licenses.lgpl2;
-    maintainers = with maintainers; [ izorkin ];
-    platforms = platforms.all;
-  };
-};
 in mariadb
diff --git a/pkgs/servers/sql/mariadb/galera/25.nix b/pkgs/servers/sql/mariadb/galera/25.nix
new file mode 100644
index 00000000000..2772d60e398
--- /dev/null
+++ b/pkgs/servers/sql/mariadb/galera/25.nix
@@ -0,0 +1,6 @@
+{ callPackage, ... } @ args:
+
+callPackage ./. (args // {
+  version = "25.3.27";
+  sha256 = "143kzj0fmak1gdww4qkqmmliw8klxm6mwk5531748swlwm6gqr5q";
+})
diff --git a/pkgs/servers/sql/mariadb/galera/default.nix b/pkgs/servers/sql/mariadb/galera/default.nix
new file mode 100644
index 00000000000..263a21983e2
--- /dev/null
+++ b/pkgs/servers/sql/mariadb/galera/default.nix
@@ -0,0 +1,63 @@
+{ stdenv, fetchFromGitHub, buildEnv
+, asio, boost, check, openssl, scons
+, version, sha256, ...
+}:
+
+let
+  pname = "mariadb-galera";
+  galeraLibs = buildEnv {
+    name = "galera-lib-inputs-united";
+    paths = [ openssl.out boost check ];
+  };
+
+in stdenv.mkDerivation {
+  inherit pname;
+  inherit version;
+
+  src = fetchFromGitHub {
+    owner = "codership";
+    repo = "galera";
+    rev = "release_${version}";
+    inherit sha256;
+    fetchSubmodules = true;
+  };
+
+  buildInputs = [ asio boost check openssl scons ];
+
+  postPatch = ''
+    substituteInPlace SConstruct \
+      --replace "boost_library_path = '''" "boost_library_path = '${boost}/lib'"
+  '';
+
+  preConfigure = ''
+    export CPPFLAGS="-I${asio}/include -I${boost.dev}/include -I${check}/include -I${openssl.dev}/include"
+    export LIBPATH="${galeraLibs}/lib"
+  '';
+
+  sconsFlags = "ssl=1 system_asio=1 strict_build_flags=0";
+
+  enableParallelBuilding = true;
+
+  installPhase = ''
+    # copied with modifications from scripts/packages/freebsd.sh
+    GALERA_LICENSE_DIR="$share/licenses/${pname}"
+    install -d $out/{bin,lib/galera,share/doc/galera,$GALERA_LICENSE_DIR}
+    install -m 555 "garb/garbd"                       "$out/bin/garbd"
+    install -m 444 "libgalera_smm.so"                 "$out/lib/galera/libgalera_smm.so"
+    install -m 444 "scripts/packages/README"          "$out/share/doc/galera/"
+    install -m 444 "scripts/packages/README-MySQL"    "$out/share/doc/galera/"
+    install -m 444 "scripts/packages/freebsd/LICENSE" "$out/$GALERA_LICENSE_DIR"
+    install -m 444 "LICENSE"                          "$out/$GALERA_LICENSE_DIR/GPLv2"
+    install -m 444 "asio/LICENSE_1_0.txt"             "$out/$GALERA_LICENSE_DIR/LICENSE.asio"
+    install -m 444 "www.evanjones.ca/LICENSE"         "$out/$GALERA_LICENSE_DIR/LICENSE.crc32c"
+    install -m 444 "chromium/LICENSE"                 "$out/$GALERA_LICENSE_DIR/LICENSE.chromium"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Galera 3 wsrep provider library";
+    homepage = http://galeracluster.com/;
+    license = licenses.lgpl2;
+    maintainers = with maintainers; [ izorkin ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix
index 85fa6cd8006..556c44b61a7 100644
--- a/pkgs/servers/uwsgi/default.nix
+++ b/pkgs/servers/uwsgi/default.nix
@@ -4,7 +4,7 @@
 , pam, withPAM ? stdenv.isLinux
 , systemd, withSystemd ? stdenv.isLinux
 , python2, python3, ncurses
-, ruby, php-embed, mysql
+, ruby, php-embed, libmysqlclient
 }:
 
 let pythonPlugin = pkg : lib.nameValuePair "python${if pkg.isPy2 then "2" else "3"}" {
@@ -34,7 +34,7 @@ let pythonPlugin = pkg : lib.nameValuePair "python${if pkg.isPy2 then "2" else "
                     # usage: https://uwsgi-docs.readthedocs.io/en/latest/PHP.html#running-php-apps-with-nginx
                     path = "plugins/php";
                     inputs = [ php-embed ] ++ php-embed.buildInputs;
-                    NIX_CFLAGS_LINK = [ "-L${mysql.connector-c}/lib/mysql" ];
+                    NIX_CFLAGS_LINK = [ "-L${libmysqlclient}/lib/mysql" ];
                   })
                 ];
 
diff --git a/pkgs/tools/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix
index 79ae1e50ca2..949e45de5e1 100644
--- a/pkgs/tools/backup/bareos/default.nix
+++ b/pkgs/tools/backup/bareos/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchFromGitHub, pkgconfig, nettools, gettext, flex
 , readline ? null, openssl ? null, python2 ? null, ncurses ? null, rocksdb
-, sqlite ? null, postgresql ? null, mysql ? null, zlib ? null, lzo ? null
+, sqlite ? null, postgresql ? null, libmysqlclient ? null, zlib ? null, lzo ? null
 , jansson ? null, acl ? null, glusterfs ? null, libceph ? null, libcap ? null
 }:
 
-assert sqlite != null || postgresql != null || mysql != null;
+assert sqlite != null || postgresql != null || libmysqlclient != null;
 
 with stdenv.lib;
 let
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
     nettools gettext readline openssl python2 flex ncurses sqlite postgresql
-    mysql.connector-c zlib lzo jansson acl glusterfs libceph libcap rocksdb
+    libmysqlclient zlib lzo jansson acl glusterfs libceph libcap rocksdb
   ];
 
   postPatch = ''
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
     ++ optional (openssl != null) "--with-openssl=${openssl.dev}"
     ++ optional (sqlite != null) "--with-sqlite3=${sqlite.dev}"
     ++ optional (postgresql != null) "--with-postgresql=${postgresql}"
-    ++ optional (mysql != null) "--with-mysql=${mysql.connector-c}"
+    ++ optional (libmysqlclient != null) "--with-mysql=${libmysqlclient}"
     ++ optional (zlib != null) "--with-zlib=${zlib.dev}"
     ++ optional (lzo != null) "--with-lzo=${lzo}"
     ++ optional (jansson != null) "--with-jansson=${jansson}"
diff --git a/pkgs/tools/backup/mydumper/default.nix b/pkgs/tools/backup/mydumper/default.nix
index 5538b45c5f1..7160e7f1950 100644
--- a/pkgs/tools/backup/mydumper/default.nix
+++ b/pkgs/tools/backup/mydumper/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, cmake, pkgconfig
-, glib, zlib, pcre, mysql, libressl }:
+, glib, zlib, pcre, libmysqlclient, libressl }:
 
 stdenv.mkDerivation rec {
   version = "0.9.5";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake pkgconfig ];
 
-  buildInputs = [ glib zlib pcre mysql.connector-c libressl ];
+  buildInputs = [ glib zlib pcre libmysqlclient libressl ];
 
   meta = with stdenv.lib; {
     description = ''High-perfomance MySQL backup tool'';
diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix
index 6423a84badc..687c4832e47 100644
--- a/pkgs/tools/graphics/zbar/default.nix
+++ b/pkgs/tools/graphics/zbar/default.nix
@@ -8,6 +8,7 @@
 , qtbase
 , qtx11extras
 , wrapQtAppsHook
+, wrapGAppsHook
 , gtk3
 , xmlto
 , docbook_xsl
@@ -36,6 +37,7 @@ stdenv.mkDerivation rec {
     autoreconfHook
     docbook_xsl
     wrapQtAppsHook
+    wrapGAppsHook
   ];
 
   buildInputs = [
@@ -71,7 +73,7 @@ stdenv.mkDerivation rec {
   dontWrapGApps = true;
 
   postFixup = lib.optionalString enableVideo ''
-    wrapProgram "$out/bin/zbarcam-gtk" "''${gappsWrapperArgs[@]}"
+    wrapGApp "$out/bin/zbarcam-gtk"
     wrapQtApp "$out/bin/zbarcam-qt"
   '';
 
diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix
index bc35a25cfde..3986cadd08a 100644
--- a/pkgs/tools/networking/kea/default.nix
+++ b/pkgs/tools/networking/kea/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, autoreconfHook, pkgconfig, openssl, botan2, log4cplus
-, boost, python3, postgresql, mysql, gmp, bzip2 }:
+, boost, python3, postgresql, libmysqlclient, gmp, bzip2 }:
 
 stdenv.mkDerivation rec {
   pname = "kea";
@@ -20,12 +20,12 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--localstatedir=/var"
     "--with-pgsql=${postgresql}/bin/pg_config"
-    "--with-mysql=${mysql.connector-c}/bin/mysql_config"
+    "--with-mysql=${libmysqlclient}/bin/mysql_config"
   ];
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
   buildInputs = [
-    openssl log4cplus boost python3 mysql.connector-c
+    openssl log4cplus boost python3 libmysqlclient
     botan2 gmp bzip2
   ];
 
diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix
index f507e4dc287..40eeed7f050 100644
--- a/pkgs/tools/networking/mailutils/default.nix
+++ b/pkgs/tools/networking/mailutils/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, fetchpatch, autoreconfHook, dejagnu, gettext, pkgconfig
 , gdbm, pam, readline, ncurses, gnutls, guile, texinfo, gnum4, sasl, fribidi, nettools
-, python, gss, mysql, system-sendmail }:
+, python, gss, libmysqlclient, system-sendmail }:
 
 stdenv.mkDerivation rec {
   name = "${project}-${version}";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     sed -i -e '/chown root:mail/d' \
            -e 's/chmod [24]755/chmod 0755/' \
       */Makefile{.in,.am}
-    sed -i 's:/usr/lib/mysql:${mysql.connector-c}/lib/mysql:' configure.ac
+    sed -i 's:/usr/lib/mysql:${libmysqlclient}/lib/mysql:' configure.ac
     sed -i 's/0\.18/0.19/' configure.ac
     sed -i -e 's:mysql/mysql.h:mysql.h:' \
            -e 's:mysql/errmsg.h:errmsg.h:' \
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     gdbm pam readline ncurses gnutls guile texinfo gnum4 sasl fribidi nettools
-    gss mysql.connector-c python
+    gss libmysqlclient python
   ];
 
   patches = [
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
     (fetchurl { url = "${p}/weed.at"; sha256 = "1101xakhc99f5gb9cs3mmydn43ayli7b270pzbvh7f9rbvh0d0nh"; })
   ];
 
-  NIX_CFLAGS_COMPILE = "-L${mysql.connector-c}/lib/mysql -I${mysql.connector-c}/include/mysql";
+  NIX_CFLAGS_COMPILE = "-L${libmysqlclient}/lib/mysql -I${libmysqlclient}/include/mysql";
 
   checkInputs = [ dejagnu ];
   doCheck = false; # fails 1 out of a bunch of tests, looks like a bug
diff --git a/pkgs/tools/networking/maxscale/default.nix b/pkgs/tools/networking/maxscale/default.nix
index 32f6b11d77c..d047646fa71 100644
--- a/pkgs/tools/networking/maxscale/default.nix
+++ b/pkgs/tools/networking/maxscale/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, cmake, pkgconfig, glibc
-, bison2, curl, flex, gperftools, jansson, jemalloc, kerberos, lua, mariadb
+, bison2, curl, flex, gperftools, jansson, jemalloc, kerberos, lua, libmysqlclient
 , ncurses, openssl, pcre, pcre2, perl, rabbitmq-c, sqlite, tcl
 , libaio, libedit, libtool, libui, libuuid, zlib
 }:
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake pkgconfig ];
 
   buildInputs = [
-    bison2 curl flex gperftools jansson jemalloc kerberos lua mariadb.connector-c
+    bison2 curl flex gperftools jansson jemalloc kerberos lua libmysqlclient
     ncurses openssl pcre pcre2 perl rabbitmq-c sqlite tcl
     libaio libedit libtool libui libuuid zlib
   ];
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
   postInstall = ''
     find $out/bin -type f -perm -0100 | while read f1; do
       patchelf \
-        --set-rpath "$(patchelf --print-rpath $f1):${mariadb.connector-c}/lib/mariadb:$out/lib/maxscale" \
+        --set-rpath "$(patchelf --print-rpath $f1):${libmysqlclient}/lib/mariadb:$out/lib/maxscale" \
         --set-interpreter "$(cat ${stdenv.cc}/nix-support/dynamic-linker)" $f1 \
         && patchelf --shrink-rpath $f1
     done
diff --git a/pkgs/tools/networking/modem-manager/default.nix b/pkgs/tools/networking/modem-manager/default.nix
index b2644d0c2a4..fedc8d4b71d 100644
--- a/pkgs/tools/networking/modem-manager/default.nix
+++ b/pkgs/tools/networking/modem-manager/default.nix
@@ -32,13 +32,6 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  postInstall = ''
-    # systemd in NixOS doesn't use `systemctl enable`, so we need to establish
-    # aliases ourselves.
-    ln -s $out/etc/systemd/system/ModemManager.service \
-      $out/etc/systemd/system/dbus-org.freedesktop.ModemManager1.service
-  '';
-
   meta = with stdenv.lib; {
     description = "WWAN modem manager, part of NetworkManager";
     homepage = https://www.freedesktop.org/wiki/Software/ModemManager/;
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index 5bc915caea6..490ebd0fa6b 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -97,11 +97,6 @@ in stdenv.mkDerivation rec {
   '';
 
   postInstall = ''
-    # systemd in NixOS doesn't use `systemctl enable`, so we need to establish
-    # aliases ourselves.
-    ln -s $out/etc/systemd/system/NetworkManager-dispatcher.service $out/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service
-    ln -s $out/etc/systemd/system/NetworkManager.service $out/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service
-
     # Add the legacy service name from before #51382 to prevent NetworkManager
     # from not starting back up:
     # TODO: remove this once 19.10 is released
diff --git a/pkgs/tools/security/thc-hydra/default.nix b/pkgs/tools/security/thc-hydra/default.nix
index 252d73b479b..57deaaf0498 100644
--- a/pkgs/tools/security/thc-hydra/default.nix
+++ b/pkgs/tools/security/thc-hydra/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, zlib, openssl, ncurses, libidn, pcre, libssh, mysql, postgresql
+{ stdenv, lib, fetchurl, zlib, openssl, ncurses, libidn, pcre, libssh, libmysqlclient, postgresql
 , withGUI ? false, makeWrapper, pkgconfig, gtk2 }:
 
 let
@@ -23,7 +23,7 @@ in stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = lib.optionals withGUI [ pkgconfig makeWrapper ];
-  buildInputs = [ zlib openssl ncurses libidn pcre libssh mysql.connector-c postgresql ]
+  buildInputs = [ zlib openssl ncurses libidn pcre libssh libmysqlclient postgresql ]
                 ++ lib.optional withGUI gtk2;
 
   postInstall = lib.optionalString withGUI ''
diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix
index 1df73e08d1e..3e7e4e5969a 100644
--- a/pkgs/tools/system/collectd/default.nix
+++ b/pkgs/tools/system/collectd/default.nix
@@ -22,7 +22,7 @@
 , libtool
 , lm_sensors
 , lvm2
-, mysql
+, libmysqlclient
 , numactl
 , postgresql
 , protobufc
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
     libxml2 postgresql protobufc rrdtool
     varnish yajl jdk libtool python hiredis libmicrohttpd
     riemann_c_client mosquitto rdkafka mongoc
-  ] ++ stdenv.lib.optionals (mysql != null) [ mysql.connector-c
+  ] ++ stdenv.lib.optionals (libmysqlclient != null) [ libmysqlclient
   ] ++ stdenv.lib.optionals stdenv.isLinux [
     iptables libatasmart libcredis libmodbus libsigrok
     lm_sensors lvm2 rabbitmq-c udev net_snmp libmnl
diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix
index 2899837f3f8..34b7b7d908a 100644
--- a/pkgs/tools/system/rsyslog/default.nix
+++ b/pkgs/tools/system/rsyslog/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, autoreconfHook, libestr, json_c, zlib, pythonPackages, fastJson
-, libkrb5 ? null, systemd ? null, jemalloc ? null, mysql ? null, postgresql ? null
+, libkrb5 ? null, systemd ? null, jemalloc ? null, libmysqlclient ? null, postgresql ? null
 , libdbi ? null, net_snmp ? null, libuuid ? null, curl ? null, gnutls ? null
 , libgcrypt ? null, liblognorm ? null, openssl ? null, librelp ? null, libksi ? null
 , libgt ? null, liblogging ? null, libnet ? null, hadoop ? null, rdkafka ? null
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     postgresql libdbi net_snmp libuuid curl gnutls libgcrypt liblognorm openssl
     librelp libgt libksi liblogging libnet hadoop rdkafka libmongo-client czmq
     rabbitmq-c hiredis mongoc
-  ] ++ stdenv.lib.optional (mysql != null) mysql.connector-c
+  ] ++ stdenv.lib.optional (libmysqlclient != null) libmysqlclient
     ++ stdenv.lib.optional stdenv.isLinux systemd;
 
   hardeningDisable = [ "format" ];
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
     (mkFlag false                     "valgrind")
     (mkFlag false                     "diagtools")
     (mkFlag true                      "usertools")
-    (mkFlag (mysql != null)           "mysql")
+    (mkFlag (libmysqlclient != null)  "mysql")
     (mkFlag (postgresql != null)      "pgsql")
     (mkFlag (libdbi != null)          "libdbi")
     (mkFlag (net_snmp != null)        "snmp")
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index a837336740b..38ca7129645 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -189,7 +189,6 @@ mapAliases ({
   libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux || stdenv.hostPlatform.libc != "glibc") gettext; # added 2018-03-14
   libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28
   liblapackWithoutAtlas = liblapack; # added 2018-11-05
-  libmysql = mysql.connector-c; # added # 2017-12-28, this was a misnomer refering to libmysqlclient
   libqrencode = qrencode;  # added 2019-01-01
   librecad2 = librecad;  # backwards compatibility alias, added 2015-10
   libsysfs = sysfsutils; # added 2018-04-25
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2bd09af6ac3..0b232a97bdb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1966,7 +1966,7 @@ in
     libkrb5 = null;
     systemd = null;
     jemalloc = null;
-    mysql = null;
+    libmysqlclient = null;
     postgresql = null;
     libdbi = null;
     net_snmp = null;
@@ -11712,7 +11712,7 @@ in
   libdbi = callPackage ../development/libraries/libdbi { };
 
   libdbiDriversBase = libdbiDrivers.override {
-    mysql = null;
+    libmysqlclient = null;
     sqlite = null;
   };
 
@@ -12430,9 +12430,8 @@ in
 
   libwhereami = callPackage ../development/libraries/libwhereami { };
 
-  giflib = giflib_5_1;
   giflib_4_1 = callPackage ../development/libraries/giflib/4.1.nix { };
-  giflib_5_1 = callPackage ../development/libraries/giflib/5.1.nix { };
+  giflib     = callPackage ../development/libraries/giflib { };
 
   libunarr = callPackage ../development/libraries/libunarr { };
 
@@ -13141,7 +13140,7 @@ in
     cups = if stdenv.isLinux then cups else null;
 
     # XXX: mariadb doesn't built on fbsd as of nov 2015
-    mysql = if (!stdenv.isFreeBSD) then mysql else null;
+    libmysqlclient = if (!stdenv.isFreeBSD) then libmysqlclient else null;
 
     inherit (pkgs.darwin) libobjc;
     inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices OpenGL Cocoa AGL;
@@ -13900,7 +13899,7 @@ in
 
   unixODBC = callPackage ../development/libraries/unixODBC { };
 
-  unixODBCDrivers = recurseIntoAttrs (callPackages ../development/libraries/unixODBCDrivers {});
+  unixODBCDrivers = recurseIntoAttrs (callPackages ../development/libraries/unixODBCDrivers { });
 
   ustr = callPackage ../development/libraries/ustr { };
 
@@ -14888,8 +14887,17 @@ in
 
   rpcbind = callPackage ../servers/rpcbind { };
 
-  mariadb = callPackage ../servers/sql/mariadb {
+  libmysqlclient = libmysqlclient_3_1;
+  libmysqlclient_3_1 = mariadb-connector-c_3_1;
+  mariadb-connector-c = mariadb-connector-c_3_1;
+  mariadb-connector-c_3_1 = callPackage ../servers/sql/mariadb/connector-c/3_1.nix { };
+
+  mariadb-galera = mariadb-galera_25;
+  mariadb-galera_25 = callPackage ../servers/sql/mariadb/galera/25.nix {
     asio = asio_1_10;
+  };
+
+  mariadb = callPackage ../servers/sql/mariadb {
     # As per mariadb's cmake, "static jemalloc_pic.a can only be used up to jemalloc 4".
     # https://jira.mariadb.org/browse/MDEV-15034
     jemalloc = jemalloc450.override ({ disableInitExecTls = true; });
@@ -24157,7 +24165,7 @@ in
   mnemonicode = callPackage ../misc/mnemonicode { };
 
   mysql-workbench = callPackage ../applications/misc/mysql-workbench (let mysql = mysql57; in {
-    gdal = gdal.override {mysql = mysql // {lib = {dev = mysql;};};};
+    gdal = gdal.override {libmysqlclient = mysql // {lib = {dev = mysql;};};};
     mysql = mysql;
     pcre = pcre-cpp;
   });
-- 
GitLab


From 4e5b465052f4c41fba9d23827a7085dc3f9bc7ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sun, 22 Sep 2019 09:43:02 +0200
Subject: [PATCH 0721/2254] patchelf: 0.10 -> 0.9 (downgrade!)

This is a partial revert of #58715.  Bumping the default caused problems
described in #69213.  I tested that the vscode corruption happened even
with the 0.10 pre-release, so I'm keeping patchelfUnstable on 0.10
(patchelfUnstable shouldn't cause a large rebuild anyway)
---
 .../tools/misc/patchelf/default.nix           | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/tools/misc/patchelf/default.nix b/pkgs/development/tools/misc/patchelf/default.nix
index db8bb4f4243..77d03f299f4 100644
--- a/pkgs/development/tools/misc/patchelf/default.nix
+++ b/pkgs/development/tools/misc/patchelf/default.nix
@@ -1,27 +1,16 @@
-{ stdenv, fetchurl, autoreconfHook }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "patchelf-${version}";
-  version = "0.10";
+  name = "patchelf-0.9";
 
   src = fetchurl {
     url = "https://nixos.org/releases/patchelf/${name}/${name}.tar.bz2";
-    sha256 = "1wzwvnlyf853hw9zgqq5522bvf8gqadk8icgqa41a5n7593csw7n";
+    sha256 = "a0f65c1ba148890e9f2f7823f4bedf7ecad5417772f64f994004f59a39014f83";
   };
 
-  # Drop test that fails on musl (?)
-  postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
-    substituteInPlace tests/Makefile.am \
-      --replace "set-rpath-library.sh" ""
-  '';
-
   setupHook = [ ./setup-hook.sh ];
 
-  nativeBuildInputs = [ autoreconfHook ];
-  buildInputs = [ ];
-
-  # if not Musl, fails 8 out of 25 tests, problems when loading libc.so.6
-  doCheck = stdenv.hostPlatform.isMusl;
+  doCheck = false; # fails 8 out of 24 tests, problems when loading libc.so.6
 
   meta = with stdenv.lib; {
     homepage = https://nixos.org/patchelf.html;
-- 
GitLab


From 76b7dd1ba95c6cef48a2e71c427287a2d12c07ab Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 17 Sep 2019 13:06:53 -0400
Subject: [PATCH 0722/2254] Merge #68739: openconnect: 8.04 -> 8.05 (security!)

(cherry picked from commit 253f714f6b2cef8d465869bf2ff220a607823d30)
Forward-pick from staging to staging-next.  It's quite small rebuild,
compared to what's caused by the parent commit.
---
 pkgs/tools/networking/openconnect/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/openconnect/default.nix b/pkgs/tools/networking/openconnect/default.nix
index 7e614629484..7244653e493 100644
--- a/pkgs/tools/networking/openconnect/default.nix
+++ b/pkgs/tools/networking/openconnect/default.nix
@@ -4,13 +4,13 @@ assert (openssl != null) == (gnutls == null);
 
 stdenv.mkDerivation rec {
   pname = "openconnect";
-  version = "8.04";
+  version = "8.05";
 
   src = fetchurl {
     urls = [
       "ftp://ftp.infradead.org/pub/openconnect/${pname}-${version}.tar.gz"
     ];
-    sha256 = "07zqcl2ykdc4mgix9sbv4jgpg7cybifxfgrycvf99ckq7xp9r5wq";
+    sha256 = "14i9q727c2zc9xhzp1a9hz3gzb5lwgsslbhircm84dnbs192jp1k";
   };
 
   outputs = [ "out" "dev" ];
-- 
GitLab


From 2d1ee0e98122ccb9de87c171327cfb98c6320dc8 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Sun, 22 Sep 2019 10:13:26 +0200
Subject: [PATCH 0723/2254] mutt: 1.12.1 -> 1.12.2

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/applications/networking/mailreaders/mutt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix
index c694398bd7d..3af4c7f5e15 100644
--- a/pkgs/applications/networking/mailreaders/mutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/mutt/default.nix
@@ -27,11 +27,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "mutt";
-  version = "1.12.1";
+  version = "1.12.2";
 
   src = fetchurl {
     url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz";
-    sha256 = "0311sip2q90aqaxn7h3cck1zl98b4vifqi8bp5fsizy4dr06bi81";
+    sha256 = "10k8352s0z7yan6d4z2am80qd3bsaky4h89g72wl4xr3x067ahmw";
   };
 
   patches = optional smimeSupport (fetchpatch {
-- 
GitLab


From 67430e7a05bb2f7f3b98b30269b3fc740669c70d Mon Sep 17 00:00:00 2001
From: Tobias Happ <tobias.happ@gmx.de>
Date: Sun, 22 Sep 2019 10:38:09 +0200
Subject: [PATCH 0724/2254] pythonPackages.dependency-injector: 3.14.6 ->
 3.14.10

---
 .../python-modules/dependency-injector/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dependency-injector/default.nix b/pkgs/development/python-modules/dependency-injector/default.nix
index af2607bca14..e135d8c7bc6 100644
--- a/pkgs/development/python-modules/dependency-injector/default.nix
+++ b/pkgs/development/python-modules/dependency-injector/default.nix
@@ -9,11 +9,11 @@ in
 
 buildPythonPackage rec {
   pname = "dependency-injector";
-  version = "3.14.6";
+  version = "3.14.10";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2e1889a0981381f557b0d14cba900adf7476817c53c13bfb04e2a30b3db0f1d3";
+    sha256 = "1c475axh40f8s4n5dqm52qczx9g2g8b8wsy0qvghirk84ikpca5y";
   };
 
   propagatedBuildInputs = [ six ];
-- 
GitLab


From 76d78a4ff6a95e0efcd120e38257010495fb961c Mon Sep 17 00:00:00 2001
From: Tobias Happ <tobias.happ@gmx.de>
Date: Sun, 22 Sep 2019 10:39:13 +0200
Subject: [PATCH 0725/2254] pythonPackages.flask-jwt-extended: 3.17.0 -> 3.23.0

---
 .../python-modules/flask-jwt-extended/default.nix         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/flask-jwt-extended/default.nix b/pkgs/development/python-modules/flask-jwt-extended/default.nix
index d61f5a77600..693e733e73a 100644
--- a/pkgs/development/python-modules/flask-jwt-extended/default.nix
+++ b/pkgs/development/python-modules/flask-jwt-extended/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, buildPythonPackage, fetchPypi, flask, pyjwt, werkzeug, pytest }:
+{ stdenv, buildPythonPackage, fetchPypi, dateutil, flask, pyjwt, werkzeug, pytest }:
 
 buildPythonPackage rec {
   pname = "Flask-JWT-Extended";
-  version = "3.17.0";
+  version = "3.23.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "97c66f197b4b175173bf955b9a845d03d62e521e512e88f6abff707e6859e7c3";
+    sha256 = "05nf94dp80i68gs61pf67qj1y6i56jgdxmibqmns5wz6z33fi7wj";
   };
 
-  propagatedBuildInputs = [ flask pyjwt werkzeug ];
+  propagatedBuildInputs = [ dateutil flask pyjwt werkzeug ];
   checkInputs = [ pytest ];
 
   checkPhase = ''
-- 
GitLab


From 8769547280545e55b124cc98ad5bf17af15902bb Mon Sep 17 00:00:00 2001
From: Tobias Happ <tobias.happ@gmx.de>
Date: Sun, 22 Sep 2019 10:40:04 +0200
Subject: [PATCH 0726/2254] pythonPackages.flask_sqlalchemy: 2.3.2 -> 2.4.0

---
 .../python-modules/flask-sqlalchemy/default.nix           | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/flask-sqlalchemy/default.nix b/pkgs/development/python-modules/flask-sqlalchemy/default.nix
index aa7b40675b8..2ff84f2531b 100644
--- a/pkgs/development/python-modules/flask-sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/flask-sqlalchemy/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, buildPythonPackage, fetchPypi, flask, sqlalchemy, pytest }:
+{ stdenv, buildPythonPackage, fetchPypi, flask, mock, sqlalchemy, pytest }:
 
 buildPythonPackage rec {
   pname = "Flask-SQLAlchemy";
-  version = "2.3.2";
+  version = "2.4.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0lvfynbk9y0whpkhqz7kf3hk342sfa3lwqyv25gnb22q5f2vjwar";
+    sha256 = "0nnllf0ddbh9jlhngnyjj98lbxgxr1csaplllx0caw98syq0k5hc";
   };
 
   propagatedBuildInputs = [ flask sqlalchemy ];
-  checkInputs = [ pytest ];
+  checkInputs = [ mock pytest ];
 
   checkPhase = ''
     pytest
-- 
GitLab


From 7dfe7aa137b7239d888921ce0f5980b6fbc1901d Mon Sep 17 00:00:00 2001
From: Tobias Happ <tobias.happ@gmx.de>
Date: Sun, 22 Sep 2019 10:40:51 +0200
Subject: [PATCH 0727/2254] pythonPackages.pdf2image: 1.4.2 -> 1.9.0

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

diff --git a/pkgs/development/python-modules/pdf2image/default.nix b/pkgs/development/python-modules/pdf2image/default.nix
index 6d0cafd5f80..1fbddca8cc4 100644
--- a/pkgs/development/python-modules/pdf2image/default.nix
+++ b/pkgs/development/python-modules/pdf2image/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "pdf2image";
-  version = "1.4.2";
+  version = "1.9.0";
 
   propagatedBuildInputs = [ pillow poppler_utils ];
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "694f8014f4c3722e5913f1c378c7056b1330db070ff7cb8196a80d24b80fa61e";
+    sha256 = "186g36dcfv83iranyd8gqw2zinhpcvmq86zd7sbsn237gcqk43rn";
   };
 
   meta = with stdenv.lib; {
-- 
GitLab


From 08e1ce73f593d9caeacf7eb41ebb8805d66563e5 Mon Sep 17 00:00:00 2001
From: Tobias Happ <tobias.happ@gmx.de>
Date: Sun, 22 Sep 2019 10:41:51 +0200
Subject: [PATCH 0728/2254] cargo-release: 0.10.5 -> 0.12.4

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

diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/tools/package-management/cargo-release/default.nix
index 0251e6acf81..eb3977e84e6 100644
--- a/pkgs/tools/package-management/cargo-release/default.nix
+++ b/pkgs/tools/package-management/cargo-release/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-release";
-  version = "0.10.5";
+  version = "0.12.4";
 
   src = fetchFromGitHub {
     owner = "sunng87";
     repo = "cargo-release";
-    rev = version;
-    sha256 = "14l5znr1nl69v2v3mdrlas85krq9jn280ssflmd0dz7i4fxiaflc";
+    rev = "v${version}";
+    sha256 = "02rx25dd3klprwr1qmn5vn4vz4244amk2ky4nqfmi4vq3ygrhd1c";
   };
 
-  cargoSha256 = "1l1rvd3i3d7jn3crwc194i5qm3f0jaw7ksb4bvqn3v8rf44chmrs";
+  cargoSha256 = "18nbmq8j58jlka1lsrx2y0bhb9l5f3wyvcr1zmmda3hvc3vm7kla";
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
 
-- 
GitLab


From e557ad74ac725a56d736a2f900495278770e8fad Mon Sep 17 00:00:00 2001
From: danbst <abcz2.uprola@gmail.com>
Date: Sun, 22 Sep 2019 12:27:39 +0300
Subject: [PATCH 0729/2254] move from 19.09 to 20.03

---
 nixos/doc/manual/release-notes/rl-1909.xml      | 7 -------
 nixos/doc/manual/release-notes/rl-2003.xml      | 5 +++++
 nixos/modules/services/databases/postgresql.nix | 2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
index 9aa992766a2..58ab7207f53 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -33,13 +33,6 @@
      PHP 7.1 is no longer supported due to upstream not supporting this version for the entire lifecycle of the 19.09 release.
     </para>
    </listitem>
-   <listitem>
-    <para>
-     Postgresql for NixOS service now defaults to v11. <literal>pkgs.postgresql</literal> is still 9.6, but
-     may be updated in future release. To prevent future update problems replace <literal>pkgs.postgresql</literal>
-     with an explicitly versioned <literal>pkgs.postgresql_9_6</literal>.
-    </para>
-   </listitem>
    <listitem>
      <para>
        The binfmt module is now easier to use. Additional systems can
diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml
index c84bc8dbb37..004a4135913 100644
--- a/nixos/doc/manual/release-notes/rl-2003.xml
+++ b/nixos/doc/manual/release-notes/rl-2003.xml
@@ -23,6 +23,11 @@
      Support is planned until the end of October 2020, handing over to 20.09.
     </para>
    </listitem>
+   <listitem>
+    <para>
+     Postgresql for NixOS service now defaults to v11.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 
diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index a19eb820a9c..3bedfe96a18 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -226,7 +226,7 @@ in
       # Note: when changing the default, make it conditional on
       # ‘system.stateVersion’ to maintain compatibility with existing
       # systems!
-      mkDefault (if versionAtLeast config.system.stateVersion "19.09" then pkgs.postgresql_11
+      mkDefault (if versionAtLeast config.system.stateVersion "20.03" then pkgs.postgresql_11
             else if versionAtLeast config.system.stateVersion "17.09" then pkgs.postgresql_9_6
             else if versionAtLeast config.system.stateVersion "16.03" then pkgs.postgresql_9_5
             else throw "postgresql_9_4 was removed, please upgrade your postgresql version.");
-- 
GitLab


From 20de44845d3ec233e9a1d40579aef9e5108ca7d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20NICOLE?= <minijackson@users.noreply.github.com>
Date: Sun, 22 Sep 2019 10:54:45 +0000
Subject: [PATCH 0730/2254] bingrep: init at 0.7.0 (#69021)

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

diff --git a/pkgs/development/tools/analysis/bingrep/default.nix b/pkgs/development/tools/analysis/bingrep/default.nix
new file mode 100644
index 00000000000..5fd6b402e0b
--- /dev/null
+++ b/pkgs/development/tools/analysis/bingrep/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, rustPlatform, fetchFromGitHub }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "bingrep";
+  version = "0.7.0";
+
+  src = fetchFromGitHub {
+    owner = "m4b";
+    repo = pname;
+    # Currently doesn't tag versions so we're using the raw revision
+    rev = "33d56a4b020c4a3c111294fe41c613d5e8e9c7af";
+    sha256 = "0lg92wqknr584b44i5v4f97js56j89z7n8p2zpm8j1pfhjmgcigs";
+  };
+
+  cargoSha256 = "1yxm7waldhilx7wh1ag79rkp8kypb9k1px4ynmzq11r72yl2p4m7";
+
+  meta = with stdenv.lib; {
+    description = "Greps through binaries from various OSs and architectures, and colors them";
+    homepage = "https://github.com/m4b/bingrep";
+    license = licenses.mit;
+    maintainers = with maintainers; [ minijackson ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2874d1613fa..a2fbc80a9c6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9222,6 +9222,8 @@ in
 
   bin_replace_string = callPackage ../development/tools/misc/bin_replace_string { };
 
+  bingrep = callPackage ../development/tools/analysis/bingrep { };
+
   binutils-unwrapped = callPackage ../development/tools/misc/binutils {
     # FHS sys dirs presumably only have stuff for the build platform
     noSysDirs = (stdenv.targetPlatform != stdenv.hostPlatform) || noSysDirs;
-- 
GitLab


From 53489b496e313bd3ef3f6dd17ef4d28e278c3eb3 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Sat, 21 Sep 2019 21:23:48 -0400
Subject: [PATCH 0731/2254] dtc: fix Python support

---
 pkgs/development/compilers/dtc/default.nix | 8 ++++----
 pkgs/top-level/python-packages.nix         | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/compilers/dtc/default.nix b/pkgs/development/compilers/dtc/default.nix
index d92d712a3ff..eea75c5ace1 100644
--- a/pkgs/development/compilers/dtc/default.nix
+++ b/pkgs/development/compilers/dtc/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchgit, flex, bison, pkgconfig, which
-, pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform, python2, swig
+, pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform, python, swig
 }:
 
 stdenv.mkDerivation rec {
@@ -12,14 +12,14 @@ stdenv.mkDerivation rec {
     sha256 = "1jhhfrg22h53lvm2lqhd66pyk20pil08ry03wcwyx1c3ln27k73z";
   };
 
-  nativeBuildInputs = [ flex bison pkgconfig which ] ++ lib.optionals pythonSupport [ python2 swig ];
-  buildInputs = lib.optionals pythonSupport [ python2 ];
+  nativeBuildInputs = [ flex bison pkgconfig which ] ++ lib.optionals pythonSupport [ python swig ];
+  buildInputs = lib.optionals pythonSupport [ python ];
 
   postPatch = ''
     patchShebangs pylibfdt/
   '';
 
-  makeFlags = lib.optionals (!pythonSupport) [ "NO_PYTHON=1" ];
+  makeFlags = [ "PYTHON=python" ];
   installFlags = [ "INSTALL=install" "PREFIX=$(out)" "SETUP_PREFIX=$(out)" ];
 
   meta = with lib; {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3e40a1e6737..035d0d0aba2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2145,9 +2145,9 @@ in {
 
   libais = callPackage ../development/python-modules/libais { };
 
-  libfdt = disabledIf isPy3k (toPythonModule (pkgs.dtc.override {
-    python2 = python;
-  }));
+  libfdt = toPythonModule (pkgs.dtc.override {
+    inherit python;
+  });
 
   libtmux = callPackage ../development/python-modules/libtmux { };
 
-- 
GitLab


From 6ceb7a128582a851420524ccb200b69dc75ef217 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Giraudeau <jean-baptiste.giraudeau@iohk.io>
Date: Thu, 19 Sep 2019 13:52:14 +0200
Subject: [PATCH 0732/2254] haskellPackages: unbreak amazonka (and other
 packages that use it)

Closes https://github.com/NixOS/nixpkgs/pull/68944.
---
 .../haskell-modules/configuration-common.nix  |   6 +
 .../configuration-hackage2nix.yaml            | 147 ------------------
 .../amazonka-Allow-http-client-0.6.patch      |  24 +++
 .../amazonka-core-Allow-http-client-0.6.patch |  26 ++++
 4 files changed, 56 insertions(+), 147 deletions(-)
 create mode 100644 pkgs/development/haskell-modules/patches/amazonka-Allow-http-client-0.6.patch
 create mode 100644 pkgs/development/haskell-modules/patches/amazonka-core-Allow-http-client-0.6.patch

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index dde4092327b..294fd3949ad 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1231,4 +1231,10 @@ self: super: {
   # The LTS-14.x version of optparse-applicative is too old.
   cabal-plan = super.cabal-plan.override { optparse-applicative = self.optparse-applicative_0_15_1_0; };
 
+  # https://github.com/brendanhay/amazonka/commit/657b70d174fe5cb61e56cb8b9c5e57f1ec216f2b
+  amazonka = appendPatch super.amazonka ./patches/amazonka-Allow-http-client-0.6.patch;
+
+  # https://github.com/brendanhay/amazonka/commit/657b70d174fe5cb61e56cb8b9c5e57f1ec216f2b
+  amazonka-core = appendPatch super.amazonka-core ./patches/amazonka-core-Allow-http-client-0.6.patch;
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index dcfc40ef5ed..84ce4c156ee 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2871,146 +2871,6 @@ broken-packages:
   - amazon-emailer
   - amazon-emailer-client-snap
   - amazon-products
-  - amazonka
-  - amazonka-alexa-business
-  - amazonka-apigateway
-  - amazonka-application-autoscaling
-  - amazonka-appstream
-  - amazonka-appsync
-  - amazonka-athena
-  - amazonka-autoscaling
-  - amazonka-autoscaling-plans
-  - amazonka-batch
-  - amazonka-budgets
-  - amazonka-certificatemanager
-  - amazonka-certificatemanager-pca
-  - amazonka-cloud9
-  - amazonka-clouddirectory
-  - amazonka-cloudformation
-  - amazonka-cloudfront
-  - amazonka-cloudhsm
-  - amazonka-cloudhsmv2
-  - amazonka-cloudsearch
-  - amazonka-cloudsearch-domains
-  - amazonka-cloudtrail
-  - amazonka-cloudwatch
-  - amazonka-cloudwatch-events
-  - amazonka-cloudwatch-logs
-  - amazonka-codebuild
-  - amazonka-codecommit
-  - amazonka-codedeploy
-  - amazonka-codepipeline
-  - amazonka-codestar
-  - amazonka-cognito-identity
-  - amazonka-cognito-idp
-  - amazonka-cognito-sync
-  - amazonka-comprehend
-  - amazonka-config
-  - amazonka-connect
-  - amazonka-core
-  - amazonka-cost-explorer
-  - amazonka-cur
-  - amazonka-datapipeline
-  - amazonka-devicefarm
-  - amazonka-directconnect
-  - amazonka-discovery
-  - amazonka-dms
-  - amazonka-ds
-  - amazonka-dynamodb
-  - amazonka-dynamodb-dax
-  - amazonka-dynamodb-streams
-  - amazonka-ec2
-  - amazonka-ecr
-  - amazonka-ecs
-  - amazonka-efs
-  - amazonka-elasticache
-  - amazonka-elasticbeanstalk
-  - amazonka-elasticsearch
-  - amazonka-elastictranscoder
-  - amazonka-elb
-  - amazonka-elbv2
-  - amazonka-emr
-  - amazonka-fms
-  - amazonka-gamelift
-  - amazonka-glacier
-  - amazonka-glue
-  - amazonka-greengrass
-  - amazonka-guardduty
-  - amazonka-health
-  - amazonka-iam
-  - amazonka-importexport
-  - amazonka-inspector
-  - amazonka-iot
-  - amazonka-iot-analytics
-  - amazonka-iot-dataplane
-  - amazonka-iot-jobs-dataplane
-  - amazonka-kinesis
-  - amazonka-kinesis-analytics
-  - amazonka-kinesis-firehose
-  - amazonka-kinesis-video
-  - amazonka-kinesis-video-archived-media
-  - amazonka-kinesis-video-media
-  - amazonka-kms
-  - amazonka-lambda
-  - amazonka-lex-models
-  - amazonka-lex-runtime
-  - amazonka-lightsail
-  - amazonka-marketplace-analytics
-  - amazonka-marketplace-entitlement
-  - amazonka-marketplace-metering
-  - amazonka-mechanicalturk
-  - amazonka-mediaconvert
-  - amazonka-medialive
-  - amazonka-mediapackage
-  - amazonka-mediastore
-  - amazonka-mediastore-dataplane
-  - amazonka-migrationhub
-  - amazonka-ml
-  - amazonka-mobile
-  - amazonka-mq
-  - amazonka-opsworks
-  - amazonka-opsworks-cm
-  - amazonka-organizations
-  - amazonka-pinpoint
-  - amazonka-polly
-  - amazonka-pricing
-  - amazonka-rds
-  - amazonka-redshift
-  - amazonka-rekognition
-  - amazonka-resourcegroups
-  - amazonka-resourcegroupstagging
-  - amazonka-route53
-  - amazonka-route53-autonaming
-  - amazonka-route53-domains
-  - amazonka-s3
-  - amazonka-s3-streaming
-  - amazonka-sagemaker
-  - amazonka-sagemaker-runtime
-  - amazonka-sdb
-  - amazonka-secretsmanager
-  - amazonka-serverlessrepo
-  - amazonka-servicecatalog
-  - amazonka-ses
-  - amazonka-shield
-  - amazonka-sms
-  - amazonka-snowball
-  - amazonka-sns
-  - amazonka-sqs
-  - amazonka-ssm
-  - amazonka-stepfunctions
-  - amazonka-storagegateway
-  - amazonka-sts
-  - amazonka-support
-  - amazonka-swf
-  - amazonka-test
-  - amazonka-transcribe
-  - amazonka-translate
-  - amazonka-waf
-  - amazonka-waf-regional
-  - amazonka-workdocs
-  - amazonka-workmail
-  - amazonka-workspaces
-  - amazonka-xray
   - amby
   - AMI
   - ampersand
@@ -3211,7 +3071,6 @@ broken-packages:
   - aws-configuration-tools
   - aws-dynamodb-conduit
   - aws-dynamodb-streams
-  - aws-easy
   - aws-ec2
   - aws-ec2-knownhosts
   - aws-elastic-transcoder
@@ -3227,7 +3086,6 @@ broken-packages:
   - aws-sdk
   - aws-sdk-text-converter
   - aws-sdk-xml-unordered
-  - aws-ses-easy
   - aws-sign4
   - aws-simple
   - aws-sns
@@ -3933,7 +3791,6 @@ broken-packages:
   - conduit-throttle
   - conduit-tokenize-attoparsec
   - conf
-  - confcrypt
   - conffmt
   - confide
   - config-parser
@@ -4503,7 +4360,6 @@ broken-packages:
   - easyplot
   - ebeats
   - ebnf-bff
-  - ec2-unikernel
   - ecma262
   - ecu
   - eddie
@@ -4530,7 +4386,6 @@ broken-packages:
   - Eight-Ball-Pool-Hack-Cheats
   - either-list-functions
   - EitherT
-  - ekg-cloudwatch
   - ekg-elastic
   - ekg-elasticsearch
   - ekg-influxdb
@@ -5732,7 +5587,6 @@ broken-packages:
   - heartbeat-streams
   - heatitup
   - heatitup-complete
-  - heavy-logger-amazon
   - hecc
   - heckle
   - hedgehog-checkers
@@ -8848,7 +8702,6 @@ broken-packages:
   - servant-zeppelin-server
   - servant-zeppelin-swagger
   - server-generic
-  - serverless-haskell
   - serversession-backend-redis
   - serversession-frontend-snap
   - serversession-frontend-yesod
diff --git a/pkgs/development/haskell-modules/patches/amazonka-Allow-http-client-0.6.patch b/pkgs/development/haskell-modules/patches/amazonka-Allow-http-client-0.6.patch
new file mode 100644
index 00000000000..9e1eeb75160
--- /dev/null
+++ b/pkgs/development/haskell-modules/patches/amazonka-Allow-http-client-0.6.patch
@@ -0,0 +1,24 @@
+From 657b70d174fe5cb61e56cb8b9c5e57f1ec216f2b Mon Sep 17 00:00:00 2001
+From: Mikhail Glushenkov <mikhail.glushenkov@gmail.com>
+Date: Wed, 10 Apr 2019 17:42:57 +0100
+Subject: [PATCH] Allow http-client 0.6.*.
+
+Changelog doesn't list any silently breaking semantic changes.
+---
+ amazonka/amazonka.cabal  | 2 +-
+ core/amazonka-core.cabal | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/amazonka/amazonka.cabal b/amazonka/amazonka.cabal
+index e86713f11c..81c4cb7e48 100644
+--- a/amazonka.cabal
++++ b/amazonka.cabal
+@@ -67,7 +67,7 @@ library
+         , conduit-extra       >= 1.1
+         , directory           >= 1.2
+         , exceptions          >= 0.6
+-        , http-client         >= 0.4 && < 0.6
++        , http-client         >= 0.4 && < 0.7
+         , http-conduit        >= 2.1.7 && < 3
+         , http-types          >= 0.8
+         , ini                 >= 0.3.5
diff --git a/pkgs/development/haskell-modules/patches/amazonka-core-Allow-http-client-0.6.patch b/pkgs/development/haskell-modules/patches/amazonka-core-Allow-http-client-0.6.patch
new file mode 100644
index 00000000000..d99072d79c6
--- /dev/null
+++ b/pkgs/development/haskell-modules/patches/amazonka-core-Allow-http-client-0.6.patch
@@ -0,0 +1,26 @@
+From 657b70d174fe5cb61e56cb8b9c5e57f1ec216f2b Mon Sep 17 00:00:00 2001
+From: Mikhail Glushenkov <mikhail.glushenkov@gmail.com>
+Date: Wed, 10 Apr 2019 17:42:57 +0100
+Subject: [PATCH] Allow http-client 0.6.*.
+
+Changelog doesn't list any silently breaking semantic changes.
+---
+ amazonka/amazonka.cabal  | 2 +-
+ core/amazonka-core.cabal | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/core/amazonka-core.cabal b/core/amazonka-core.cabal
+index 9796e007cf..eccb24e5bd 100644
+--- a/amazonka-core.cabal
++++ b/amazonka-core.cabal
+@@ -90,7 +90,7 @@ library
+         , deepseq              >= 1.4
+         , exceptions           >= 0.6
+         , hashable             >= 1.2
+-        , http-client          >= 0.4 && < 0.6
++        , http-client          >= 0.4 && < 0.7
+         , http-conduit         >= 2.1.4 && < 3
+         , http-types           >= 0.8 && (<0.11 || >=0.12)
+         , lens                 >= 4.4
+--
+2.23.0
-- 
GitLab


From b5344ae807478cc0336bf14ca82284389aba6584 Mon Sep 17 00:00:00 2001
From: Luke Clifton <lukec@themk.net>
Date: Thu, 19 Sep 2019 19:11:35 +0800
Subject: [PATCH 0733/2254] haskellPackages.shh: mark not broken

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

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 84ce4c156ee..9eccd6e1e91 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -8758,8 +8758,6 @@ broken-packages:
   - shellish
   - shellmate
   - shellmate-extras
-  - shh
-  - shh-extras
   - shivers-cfg
   - shoap
   - shopify
-- 
GitLab


From 348656cea85d8e1f4df6429091ffb92cd05e92a3 Mon Sep 17 00:00:00 2001
From: Travis Whitaker <pi.boy.travis@gmail.com>
Date: Tue, 17 Sep 2019 15:16:11 -0700
Subject: [PATCH 0734/2254] haskell.compiler.ghcjs86: Bump ghc-8.6 branch, fix
 build.

---
 .../development/compilers/ghcjs-ng/8.6/dep-overrides.nix | 4 ++++
 pkgs/development/compilers/ghcjs-ng/8.6/git.json         | 4 ++--
 pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix       | 9 +++++----
 pkgs/development/compilers/ghcjs-ng/common-overrides.nix | 3 +--
 pkgs/development/compilers/ghcjs-ng/default.nix          | 1 -
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix b/pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix
index 53b6dd43134..c54c782fafa 100644
--- a/pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix
+++ b/pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix
@@ -2,6 +2,10 @@
 
 let inherit (haskellLib) doJailbreak dontHaddock;
 in self: super: {
+  ghc-api-ghcjs = super.ghc-api-ghcjs.override
+  {
+    happy = self.happy_1_19_5;
+  };
   haddock-library-ghcjs = doJailbreak super.haddock-library-ghcjs;
   haddock-api-ghcjs = doJailbreak (dontHaddock super.haddock-api-ghcjs);
 }
diff --git a/pkgs/development/compilers/ghcjs-ng/8.6/git.json b/pkgs/development/compilers/ghcjs-ng/8.6/git.json
index 37861b96e7a..1114e1a1290 100644
--- a/pkgs/development/compilers/ghcjs-ng/8.6/git.json
+++ b/pkgs/development/compilers/ghcjs-ng/8.6/git.json
@@ -1,6 +1,6 @@
 {
   "url": "https://github.com/ghcjs/ghcjs",
-  "rev": "75c61af32d73def4409d1fe7b64659c1d28cd075",
-  "sha256": "18pixn6xdz6qp941yhxfnmwi463jnpskmg473lv07vvgy4hpgjhj",
+  "rev": "e87195eaa2bc7e320e18cf10386802bc90b7c874",
+  "sha256": "02mwkf7aagxqi142gcmq048244apslrr72p568akcab9s0fn2gvy",
   "fetchSubmodules": true
 }
diff --git a/pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix b/pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix
index a89ab15c55f..b957a6aa9e1 100644
--- a/pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix
+++ b/pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix
@@ -59,20 +59,21 @@
     }) {};
 
   ghc-api-ghcjs = callPackage
-    ({ mkDerivation, array, base, binary, bytestring, containers
+    ({ mkDerivation, alex, array, base, binary, bytestring, containers
     , deepseq, directory, filepath, ghc-boot, ghc-boot-th, ghc-heap
-    , ghci-ghcjs, hpc, process, stdenv, template-haskell-ghcjs
+    , ghci-ghcjs, happy, hpc, process, stdenv, template-haskell-ghcjs
     , terminfo, time, transformers, unix
     }:
     mkDerivation {
       pname = "ghc-api-ghcjs";
-      version = "8.6.2";
+      version = "8.6.5";
       src = configuredSrc + /lib/ghc-api-ghcjs;
       libraryHaskellDepends = [
         array base binary bytestring containers deepseq directory filepath
         ghc-boot ghc-boot-th ghc-heap ghci-ghcjs hpc process
         template-haskell-ghcjs terminfo time transformers unix
       ];
+      libraryToolDepends = [ alex happy ];
       homepage = "http://www.haskell.org/ghc/";
       description = "The GHC API (customized for GHCJS)";
       license = stdenv.lib.licenses.bsd3;
@@ -107,7 +108,7 @@
         base binary bytestring containers ghc-prim ghci-ghcjs
         template-haskell-ghcjs
       ];
-      homepage = "https://github.com/ghcjs";
+      homepage = "http://github.com/ghcjs";
       license = stdenv.lib.licenses.mit;
     }) {};
 
diff --git a/pkgs/development/compilers/ghcjs-ng/common-overrides.nix b/pkgs/development/compilers/ghcjs-ng/common-overrides.nix
index 52f3ad497ad..00a071651ed 100644
--- a/pkgs/development/compilers/ghcjs-ng/common-overrides.nix
+++ b/pkgs/development/compilers/ghcjs-ng/common-overrides.nix
@@ -1,8 +1,7 @@
-{ haskellLib, alex, happy }:
+{ haskellLib }:
 
 let inherit (haskellLib) addBuildTools appendConfigureFlag dontHaddock doJailbreak;
 in self: super: {
-  ghc-api-ghcjs = addBuildTools super.ghc-api-ghcjs [alex happy];
   ghcjs = dontHaddock (appendConfigureFlag (doJailbreak super.ghcjs) "-fno-wrapper-install");
   haddock-library-ghcjs = dontHaddock super.haddock-library-ghcjs;
   system-fileio = doJailbreak super.system-fileio;
diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix
index 068d7b578df..e668be8e074 100644
--- a/pkgs/development/compilers/ghcjs-ng/default.nix
+++ b/pkgs/development/compilers/ghcjs-ng/default.nix
@@ -34,7 +34,6 @@ let
 
       (callPackage ./common-overrides.nix {
         inherit haskellLib;
-        inherit (bootPkgs) alex happy;
       })
       ghcjsDepOverrides
     ]);
-- 
GitLab


From d383a4cd9154f5952919feac86bb7fc0e566a245 Mon Sep 17 00:00:00 2001
From: Justin Humm <justin.humm@posteo.de>
Date: Sun, 15 Sep 2019 20:00:33 +0200
Subject: [PATCH 0735/2254] Revert "haskell-hakyll: patch Cabal file from
 upstream"

This reverts commit fe366d43e85df82739756ec16fcb5a0d3b77f681.
---
 .../development/haskell-modules/configuration-common.nix | 9 ++-------
 .../haskell-modules/configuration-hackage2nix.yaml       | 1 -
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 294fd3949ad..fd8bfef030a 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -146,16 +146,11 @@ self: super: {
     else super.halive;
 
   # Hakyll's tests are broken on Darwin (3 failures); and they require util-linux
-  hakyll = appendPatch
-    (if pkgs.stdenv.isDarwin
+  hakyll = if pkgs.stdenv.isDarwin
     then dontCheck (overrideCabal super.hakyll (drv: {
       testToolDepends = [];
     }))
-    else super.hakyll)
-    (pkgs.fetchpatch {
-      url = https://github.com/jaspervdj/hakyll/commit/25a4460b75b3c9f3ce339b3311b084d92994f5f1.patch;
-      sha256 = "sha256-F59WHt52LOKGsGoaD3LAIZFEMe9s9WHfGxQgSh9Q8uQ=";
-    });
+    else super.hakyll;
 
   double-conversion = if !pkgs.stdenv.isDarwin
     then super.double-conversion
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 9eccd6e1e91..d76fb9a9535 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -5236,7 +5236,6 @@ broken-packages:
   - hakismet
   - hakka
   - hako
-  - hakyll
   - hakyll-agda
   - hakyll-blaze-templates
   - hakyll-contrib
-- 
GitLab


From 27d01d77129af6ee19547fdfd9c7af7fc22bebe1 Mon Sep 17 00:00:00 2001
From: Benjamin Esham <benjamin@esham.io>
Date: Sat, 21 Sep 2019 08:58:44 -0700
Subject: [PATCH 0736/2254] haskellPackages.pinboard-notes-backup: mark not
 broken

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

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index d76fb9a9535..b56d2c7ae2d 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -7824,7 +7824,6 @@ broken-packages:
   - pier-core
   - piet
   - pig
-  - pinboard-notes-backup
   - pinchot
   - ping
   - pinpon
-- 
GitLab


From da2e9d26ef8383f0c170e39e0ca444fa89f4d52a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Sep 2019 15:13:27 +0000
Subject: [PATCH 0737/2254] haskell-HStringTemplate: jailbreak when building
 with ghc-8.8.x

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 41925d89550..9e613c6f933 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -163,4 +163,8 @@ self: super: {
     url = "https://github.com/simonmar/alex/commit/deaae6eddef5186bfd0e42e2c3ced39e26afa4d6.patch";
     sha256 = "1v40gmnw4lqyk271wngdwz8whpfdhmza58srbkka8icwwwrck3l5";
   });
+
+  # break out of 'time >=1.4.2 && <1.9'
+  HStringTemplate = doJailbreak super.HStringTemplate;
+
 }
-- 
GitLab


From fbd700b12824ea644801b4b709f2a6aac458e95e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Sep 2019 15:13:27 +0000
Subject: [PATCH 0738/2254] haskell-X11: patch the build to succeed with
 ghc-8.8.x

---
 .../development/haskell-modules/configuration-ghc-8.8.x.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 9e613c6f933..cead355b145 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -167,4 +167,10 @@ self: super: {
   # break out of 'time >=1.4.2 && <1.9'
   HStringTemplate = doJailbreak super.HStringTemplate;
 
+  # don't use obsolete "defaultUserHooks" in Setup.hs
+  X11 = appendPatch super.X11 (pkgs.fetchpatch {
+    url = "https://github.com/xmonad/X11/commit/8d817617afa1b54e6c50a9cc552dc1c0804c1794.patch";
+    sha256 = "0zsgzn0nvdxvqi5z0za3gzlhql2x5d5cr0kkr19j5c67fy177w6b";
+  });
+
 }
-- 
GitLab


From ec49ae6fe19785940424ba2e2ae00c50883b2d2f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Sep 2019 15:13:27 +0000
Subject: [PATCH 0739/2254] haskell-HStringTemplate: drop obsolete override

---
 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index cead355b145..aaef02f058f 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -164,9 +164,6 @@ self: super: {
     sha256 = "1v40gmnw4lqyk271wngdwz8whpfdhmza58srbkka8icwwwrck3l5";
   });
 
-  # break out of 'time >=1.4.2 && <1.9'
-  HStringTemplate = doJailbreak super.HStringTemplate;
-
   # don't use obsolete "defaultUserHooks" in Setup.hs
   X11 = appendPatch super.X11 (pkgs.fetchpatch {
     url = "https://github.com/xmonad/X11/commit/8d817617afa1b54e6c50a9cc552dc1c0804c1794.patch";
-- 
GitLab


From e3488760a10be1981c779325f4d033a7b93c341f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Sep 2019 15:13:27 +0000
Subject: [PATCH 0740/2254] hackage2nix: disable broken builds that cause
 evaluation errors on Hydra

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

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index b56d2c7ae2d..68a05ff9411 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2910,6 +2910,7 @@ broken-packages:
   - antiope-messages
   - antiope-optparse-applicative
   - antiope-s3
+  - antiope-shell
   - antiope-sns
   - antiope-sqs
   - antiope-swf
@@ -8610,6 +8611,7 @@ broken-packages:
   - selenium
   - selenium-server
   - selinux
+  - semantic-source
   - Semantique
   - semdoc
   - semi-iso
-- 
GitLab


From c464e35b69ac60fef29ed90e9499557c8e66856e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Sep 2019 15:13:27 +0000
Subject: [PATCH 0741/2254] haskell-lens: use the latest version when building
 with ghc-8.8.x

---
 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index aaef02f058f..3db1f35bf11 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -113,10 +113,7 @@ self: super: {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/socks-0.6.0.patch";
     sha256 = "1dsqmx0sw62x4glh43c0sbizd2y00v5xybiqadn96v6pmfrap5cp";
   });
-  lens = appendPatch (doJailbreak super.lens) (pkgs.fetchpatch {
-    url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/lens-4.17.1.patch";
-    sha256 = "0w89ipi6dfkx5vlw4a64hh6fd0bm9hg33mwpghliyyxik5jmilv1";
-  });
+  lens = self.lens_4_18_1;
   polyparse = appendPatch (doJailbreak super.polyparse) (pkgs.fetchpatch {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/polyparse-1.12.1.patch";
     sha256 = "01b2gnsq0x4fd9na8zpk6pajym55mbz64hgzawlwxdw0y6681kr5";
-- 
GitLab


From a0ac8c878465e34ca4576ca077ed78ebf3633387 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Sep 2019 15:13:27 +0000
Subject: [PATCH 0742/2254] haskell-xmonad-contrib: use the latest version when
 building with ghc-8.8.x

---
 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 3db1f35bf11..0e9097db5ce 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -114,6 +114,7 @@ self: super: {
     sha256 = "1dsqmx0sw62x4glh43c0sbizd2y00v5xybiqadn96v6pmfrap5cp";
   });
   lens = self.lens_4_18_1;
+  xmonad-contrib = self.xmonad-contrib_0_16;
   polyparse = appendPatch (doJailbreak super.polyparse) (pkgs.fetchpatch {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/polyparse-1.12.1.patch";
     sha256 = "01b2gnsq0x4fd9na8zpk6pajym55mbz64hgzawlwxdw0y6681kr5";
-- 
GitLab


From cab7cea53cae57a769fbf073dcf69fb40e6596d6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Sep 2019 15:13:27 +0000
Subject: [PATCH 0743/2254] haskell-cassava: use the latest version when
 building with ghc-8.8.x

---
 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 0e9097db5ce..8ff184cb280 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -101,10 +101,6 @@ self: super: {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-tdfa-1.2.3.1.patch";
     sha256 = "1lhas4s2ms666prb475gaw2bqw1v4y8cxi66sy20j727sx7ppjs7";
   });
-  cassava = appendPatch super.cassava (pkgs.fetchpatch {
-    url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/cassava-0.5.1.0.patch";
-    sha256 = "11scwwjp94si90vb8v5yr291g9qwv5l223z8y0g0lc63932bp63g";
-  });
   shakespeare = appendPatch super.shakespeare (pkgs.fetchpatch {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/shakespeare-2.0.20.patch";
     sha256 = "1dgx41ylahj4wk8r422aik0d7qdpawdga4gqz905nvlnhqjla58y";
-- 
GitLab


From 4f21e87fbe32f9aa260eb0cdf576e47d1e321892 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Sep 2019 15:13:27 +0000
Subject: [PATCH 0744/2254] haskell-aeson-diff: jailbreak when building with
 ghc-8.8.x

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 8ff184cb280..93dd837b106 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -164,4 +164,7 @@ self: super: {
     sha256 = "0zsgzn0nvdxvqi5z0za3gzlhql2x5d5cr0kkr19j5c67fy177w6b";
   });
 
+  # over-specified version constraints
+  aeson-diff = doJailbreak super.aeson-diff;
+
 }
-- 
GitLab


From a62a68e1253278f4a308861a4df677f74a66ec8c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Sep 2019 15:13:27 +0000
Subject: [PATCH 0745/2254] haskell-hpack: mark the build as broken when
 compiling with ghc-8.8.x

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 93dd837b106..314c11e245d 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -167,4 +167,7 @@ self: super: {
   # over-specified version constraints
   aeson-diff = doJailbreak super.aeson-diff;
 
+  # https://github.com/sol/hpack/issues/371
+  hpack = markBrokenVersion "0.32.0" super.hpack;
+
 }
-- 
GitLab


From 9b4cd7c36b8e9fb19bcfc21e48016eac6ab7174c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Sep 2019 15:13:27 +0000
Subject: [PATCH 0746/2254] haskell-csv: patch the build to succeed when
 compiling with ghc-8.8.x

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 314c11e245d..9626c9f8920 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -170,4 +170,7 @@ self: super: {
   # https://github.com/sol/hpack/issues/371
   hpack = markBrokenVersion "0.32.0" super.hpack;
 
+  # Upstream ships a broken Setup.hs file.
+  csv = overrideCabal super.csv (drv: { prePatch = "rm Setup.hs"; });
+
 }
-- 
GitLab


From 373796c4112fcacca3688f1825d327f012388328 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Sep 2019 15:13:27 +0000
Subject: [PATCH 0747/2254] haskell-shakespeare: drop obsolete patch to fix the
 build with ghc-8.8.x

---
 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 9626c9f8920..49ccfbaf8e5 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -101,10 +101,6 @@ self: super: {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-tdfa-1.2.3.1.patch";
     sha256 = "1lhas4s2ms666prb475gaw2bqw1v4y8cxi66sy20j727sx7ppjs7";
   });
-  shakespeare = appendPatch super.shakespeare (pkgs.fetchpatch {
-    url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/shakespeare-2.0.20.patch";
-    sha256 = "1dgx41ylahj4wk8r422aik0d7qdpawdga4gqz905nvlnhqjla58y";
-  });
   socks = appendPatch (doJailbreak super.socks) (pkgs.fetchpatch {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/socks-0.6.0.patch";
     sha256 = "1dsqmx0sw62x4glh43c0sbizd2y00v5xybiqadn96v6pmfrap5cp";
-- 
GitLab


From 7832aefa8064aeca26c0a2249897a785067d6aad Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Sep 2019 15:13:27 +0000
Subject: [PATCH 0748/2254] haskell-monad-par: disable the test suite when
 building with ghc-8.8.x

---
 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 49ccfbaf8e5..799f8cc37b4 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -147,6 +147,7 @@ self: super: {
   });
   tls = self.tls_1_5_1;
   vault = dontHaddock super.vault;
+  monad-par = dontCheck super.monad-par;   # test suite does not compile in monad-par-0.3.4.8
 
   # TODO dont fetch patch if https://github.com/simonmar/alex/issues/140 is resolved
   alex = appendPatch super.alex (pkgs.fetchpatch {
-- 
GitLab


From 666dac71ac18e313912525733a74d7c995dcdec6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Sep 2019 15:13:27 +0000
Subject: [PATCH 0749/2254] haskell-string-qq: patch the build to succeed when
 compiling with ghc-8.8.x

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 799f8cc37b4..143e7259d58 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -170,4 +170,14 @@ self: super: {
   # Upstream ships a broken Setup.hs file.
   csv = overrideCabal super.csv (drv: { prePatch = "rm Setup.hs"; });
 
+  # Upstream ships a broken Setup.hs file.
+  string-qq = overrideSrc (dontCheck super.string-qq) {
+    src = pkgs.fetchFromGitHub {
+      owner = "dmwit";
+      repo = "string-qq";
+      rev = "b396f5ef36a9b23f1d3fafcc91f2222cd1ad24fe";
+      sha256 = "1z2f1yry8wi0jb38dgz7rl89zl63fhngf7xk4ljw240vn315jj8s";
+    };
+  };
+
 }
-- 
GitLab


From ad9d8b7aad7fc609d64bb7e0dd1667046225ecb3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 19 Sep 2019 13:57:56 +0200
Subject: [PATCH 0750/2254] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.14.4-12-gd19721c from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/c0f0a4b290db5872b3d7e003af0cd0958a3d42f6.
---
 .../haskell-modules/hackage-packages.nix      | 1230 +++++++++++------
 1 file changed, 783 insertions(+), 447 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index d71a1c65a24..f929844f55b 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -4407,6 +4407,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Diff_0_4_0" = callPackage
+    ({ mkDerivation, array, base, directory, pretty, process
+     , QuickCheck, test-framework, test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "Diff";
+       version = "0.4.0";
+       sha256 = "1is9y5rlqyxacnj6kbi6h9laym5shp699r0hkj5p9d6qi84sr43j";
+       libraryHaskellDepends = [ array base pretty ];
+       testHaskellDepends = [
+         array base directory pretty process QuickCheck test-framework
+         test-framework-quickcheck2
+       ];
+       description = "O(ND) diff algorithm in haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "DifferenceLogic" = callPackage
     ({ mkDerivation, base, containers, fgl, FirstOrderTheory, HUnit }:
      mkDerivation {
@@ -9085,6 +9103,8 @@ self: {
        pname = "HStringTemplate";
        version = "0.8.7";
        sha256 = "03kbmyh0713j3qhhrl7jqbmsvyq1q82h2yxq45cc9rs55sma8kjg";
+       revision = "1";
+       editedCabalFile = "0s7y606q2q0vnbg9c51kypawyvapva60i2lw1dg1bij50aiv5d3i";
        libraryHaskellDepends = [
          array base blaze-builder bytestring containers deepseq directory
          filepath mtl old-locale parsec pretty semigroups syb
@@ -10617,6 +10637,28 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "HsYAML_0_2_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, deepseq, mtl, parsec
+     , QuickCheck, tasty, tasty-quickcheck, text
+     }:
+     mkDerivation {
+       pname = "HsYAML";
+       version = "0.2.0.0";
+       sha256 = "1x8zrnaqvfkap4q2gldj0y4q63kbjka8383s5k4mb0ka1n3dfqhq";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring containers deepseq mtl parsec text
+       ];
+       testHaskellDepends = [
+         base bytestring containers mtl QuickCheck tasty tasty-quickcheck
+         text
+       ];
+       description = "Pure Haskell YAML 1.2 processor";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "HsYAML-aeson" = callPackage
     ({ mkDerivation, aeson, base, bytestring, HsYAML, mtl, text, vector
      }:
@@ -12711,8 +12753,8 @@ self: {
      }:
      mkDerivation {
        pname = "Map";
-       version = "0.1.1.0";
-       sha256 = "0x5sy115f5yx580g8pl8jkjwzd0ih2n4fbvh5f5ch2i749l4dyq1";
+       version = "0.1.2.0";
+       sha256 = "1fvs9im82ylfij01cn2pb21wycvb6wsj8dayaj34g3av82g9dagw";
        libraryHaskellDepends = [
          base containers either-both filtrable util
        ];
@@ -21140,6 +21182,18 @@ self: {
        broken = true;
      }) {};
 
+  "abides" = callPackage
+    ({ mkDerivation, base, comonad, tasty, tasty-quickcheck }:
+     mkDerivation {
+       pname = "abides";
+       version = "0.0.0";
+       sha256 = "0bksprm776xqxvizmwxaq996kvwj4gvd4ckwalr72aa2082vzs17";
+       libraryHaskellDepends = [ base comonad ];
+       testHaskellDepends = [ base comonad tasty tasty-quickcheck ];
+       description = "Simple boolean tests to see if a value abides by certain properties";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "abnf" = callPackage
     ({ mkDerivation, attoparsec, base, containers, HUnit, megaparsec
      , tasty, tasty-hunit, test-framework, test-framework-hunit, text
@@ -23594,6 +23648,28 @@ self: {
        broken = true;
      }) {};
 
+  "aeson-schemas" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, first-class-families
+     , megaparsec, raw-strings-qq, tasty, tasty-golden, template-haskell
+     , text, th-test-utils, unordered-containers
+     }:
+     mkDerivation {
+       pname = "aeson-schemas";
+       version = "1.0.2";
+       sha256 = "1f75fk4775gri6qvgkcsfx9v7f832zy76z61wl63q8h0yh6lapxl";
+       libraryHaskellDepends = [
+         aeson base bytestring first-class-families megaparsec
+         template-haskell text unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson base bytestring first-class-families megaparsec
+         raw-strings-qq tasty tasty-golden template-haskell text
+         th-test-utils unordered-containers
+       ];
+       description = "Easily consume JSON data on-demand with type-safety";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "aeson-serialize" = callPackage
     ({ mkDerivation, aeson, base, cereal, hspec, HUnit }:
      mkDerivation {
@@ -25290,8 +25366,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Comprehensive Amazon Web Services SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-alexa-business" = callPackage
@@ -25309,8 +25383,6 @@ self: {
        ];
        description = "Amazon Alexa For Business SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-apigateway" = callPackage
@@ -25328,8 +25400,6 @@ self: {
        ];
        description = "Amazon API Gateway SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-application-autoscaling" = callPackage
@@ -25347,8 +25417,6 @@ self: {
        ];
        description = "Amazon Application Auto Scaling SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-appstream" = callPackage
@@ -25366,8 +25434,6 @@ self: {
        ];
        description = "Amazon AppStream SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-appsync" = callPackage
@@ -25385,8 +25451,6 @@ self: {
        ];
        description = "Amazon AppSync SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-athena" = callPackage
@@ -25404,8 +25468,6 @@ self: {
        ];
        description = "Amazon Athena SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-autoscaling" = callPackage
@@ -25423,8 +25485,6 @@ self: {
        ];
        description = "Amazon Auto Scaling SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-autoscaling-plans" = callPackage
@@ -25442,8 +25502,6 @@ self: {
        ];
        description = "Amazon Auto Scaling Plans SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-batch" = callPackage
@@ -25461,8 +25519,6 @@ self: {
        ];
        description = "Amazon Batch SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-budgets" = callPackage
@@ -25480,8 +25536,6 @@ self: {
        ];
        description = "Amazon Budgets SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-certificatemanager" = callPackage
@@ -25499,8 +25553,6 @@ self: {
        ];
        description = "Amazon Certificate Manager SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-certificatemanager-pca" = callPackage
@@ -25518,8 +25570,6 @@ self: {
        ];
        description = "Amazon Certificate Manager Private Certificate Authority SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-cloud9" = callPackage
@@ -25537,8 +25587,6 @@ self: {
        ];
        description = "Amazon Cloud9 SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-clouddirectory" = callPackage
@@ -25556,8 +25604,6 @@ self: {
        ];
        description = "Amazon CloudDirectory SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-cloudformation" = callPackage
@@ -25575,8 +25621,6 @@ self: {
        ];
        description = "Amazon CloudFormation SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-cloudfront" = callPackage
@@ -25594,8 +25638,6 @@ self: {
        ];
        description = "Amazon CloudFront SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-cloudhsm" = callPackage
@@ -25613,8 +25655,6 @@ self: {
        ];
        description = "Amazon CloudHSM SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-cloudhsmv2" = callPackage
@@ -25632,8 +25672,6 @@ self: {
        ];
        description = "Amazon CloudHSM V2 SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-cloudsearch" = callPackage
@@ -25651,8 +25689,6 @@ self: {
        ];
        description = "Amazon CloudSearch SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-cloudsearch-domains" = callPackage
@@ -25670,8 +25706,6 @@ self: {
        ];
        description = "Amazon CloudSearch Domain SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-cloudtrail" = callPackage
@@ -25689,8 +25723,6 @@ self: {
        ];
        description = "Amazon CloudTrail SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-cloudwatch" = callPackage
@@ -25708,8 +25740,6 @@ self: {
        ];
        description = "Amazon CloudWatch SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-cloudwatch-events" = callPackage
@@ -25727,8 +25757,6 @@ self: {
        ];
        description = "Amazon CloudWatch Events SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-cloudwatch-logs" = callPackage
@@ -25746,8 +25774,6 @@ self: {
        ];
        description = "Amazon CloudWatch Logs SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-codebuild" = callPackage
@@ -25765,8 +25791,6 @@ self: {
        ];
        description = "Amazon CodeBuild SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-codecommit" = callPackage
@@ -25784,8 +25808,6 @@ self: {
        ];
        description = "Amazon CodeCommit SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-codedeploy" = callPackage
@@ -25803,8 +25825,6 @@ self: {
        ];
        description = "Amazon CodeDeploy SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-codepipeline" = callPackage
@@ -25822,8 +25842,6 @@ self: {
        ];
        description = "Amazon CodePipeline SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-codestar" = callPackage
@@ -25841,8 +25859,6 @@ self: {
        ];
        description = "Amazon CodeStar SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-cognito-identity" = callPackage
@@ -25860,8 +25876,6 @@ self: {
        ];
        description = "Amazon Cognito Identity SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-cognito-idp" = callPackage
@@ -25879,8 +25893,6 @@ self: {
        ];
        description = "Amazon Cognito Identity Provider SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-cognito-sync" = callPackage
@@ -25898,8 +25910,6 @@ self: {
        ];
        description = "Amazon Cognito Sync SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-comprehend" = callPackage
@@ -25917,8 +25927,6 @@ self: {
        ];
        description = "Amazon Comprehend SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-config" = callPackage
@@ -25936,8 +25944,6 @@ self: {
        ];
        description = "Amazon Config SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-connect" = callPackage
@@ -25955,8 +25961,6 @@ self: {
        ];
        description = "Amazon Connect Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-core" = callPackage
@@ -25987,8 +25991,6 @@ self: {
        ];
        description = "Core data types and functionality for Amazonka libraries";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-cost-explorer" = callPackage
@@ -26006,8 +26008,6 @@ self: {
        ];
        description = "Amazon Cost Explorer Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-cur" = callPackage
@@ -26025,8 +26025,6 @@ self: {
        ];
        description = "Amazon Cost and Usage Report Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-datapipeline" = callPackage
@@ -26044,8 +26042,6 @@ self: {
        ];
        description = "Amazon Data Pipeline SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-devicefarm" = callPackage
@@ -26063,8 +26059,6 @@ self: {
        ];
        description = "Amazon Device Farm SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-directconnect" = callPackage
@@ -26082,8 +26076,6 @@ self: {
        ];
        description = "Amazon Direct Connect SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-discovery" = callPackage
@@ -26101,8 +26093,6 @@ self: {
        ];
        description = "Amazon Application Discovery Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-dms" = callPackage
@@ -26120,8 +26110,6 @@ self: {
        ];
        description = "Amazon Database Migration Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-ds" = callPackage
@@ -26139,8 +26127,6 @@ self: {
        ];
        description = "Amazon Directory Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-dynamodb" = callPackage
@@ -26158,8 +26144,6 @@ self: {
        ];
        description = "Amazon DynamoDB SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-dynamodb-dax" = callPackage
@@ -26177,8 +26161,6 @@ self: {
        ];
        description = "Amazon DynamoDB Accelerator (DAX) SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-dynamodb-streams" = callPackage
@@ -26196,8 +26178,6 @@ self: {
        ];
        description = "Amazon DynamoDB Streams SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-ec2" = callPackage
@@ -26215,8 +26195,6 @@ self: {
        ];
        description = "Amazon Elastic Compute Cloud SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-ecr" = callPackage
@@ -26234,8 +26212,6 @@ self: {
        ];
        description = "Amazon EC2 Container Registry SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-ecs" = callPackage
@@ -26253,8 +26229,6 @@ self: {
        ];
        description = "Amazon EC2 Container Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-efs" = callPackage
@@ -26272,8 +26246,6 @@ self: {
        ];
        description = "Amazon Elastic File System SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-elasticache" = callPackage
@@ -26291,8 +26263,6 @@ self: {
        ];
        description = "Amazon ElastiCache SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-elasticbeanstalk" = callPackage
@@ -26310,8 +26280,6 @@ self: {
        ];
        description = "Amazon Elastic Beanstalk SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-elasticsearch" = callPackage
@@ -26329,8 +26297,6 @@ self: {
        ];
        description = "Amazon Elasticsearch Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-elastictranscoder" = callPackage
@@ -26348,8 +26314,6 @@ self: {
        ];
        description = "Amazon Elastic Transcoder SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-elb" = callPackage
@@ -26367,8 +26331,6 @@ self: {
        ];
        description = "Amazon Elastic Load Balancing SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-elbv2" = callPackage
@@ -26386,8 +26348,6 @@ self: {
        ];
        description = "Amazon Elastic Load Balancing SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-emr" = callPackage
@@ -26405,8 +26365,6 @@ self: {
        ];
        description = "Amazon Elastic MapReduce SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-fms" = callPackage
@@ -26424,8 +26382,6 @@ self: {
        ];
        description = "Amazon Firewall Management Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-gamelift" = callPackage
@@ -26443,8 +26399,6 @@ self: {
        ];
        description = "Amazon GameLift SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-glacier" = callPackage
@@ -26462,8 +26416,6 @@ self: {
        ];
        description = "Amazon Glacier SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-glue" = callPackage
@@ -26481,8 +26433,6 @@ self: {
        ];
        description = "Amazon Glue SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-greengrass" = callPackage
@@ -26500,8 +26450,6 @@ self: {
        ];
        description = "Amazon Greengrass SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-guardduty" = callPackage
@@ -26519,8 +26467,6 @@ self: {
        ];
        description = "Amazon GuardDuty SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-health" = callPackage
@@ -26538,8 +26484,6 @@ self: {
        ];
        description = "Amazon Health APIs and Notifications SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-iam" = callPackage
@@ -26557,8 +26501,6 @@ self: {
        ];
        description = "Amazon Identity and Access Management SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-iam-policy" = callPackage
@@ -26597,8 +26539,6 @@ self: {
        ];
        description = "Amazon Import/Export SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-inspector" = callPackage
@@ -26616,8 +26556,6 @@ self: {
        ];
        description = "Amazon Inspector SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-iot" = callPackage
@@ -26635,8 +26573,6 @@ self: {
        ];
        description = "Amazon IoT SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-iot-analytics" = callPackage
@@ -26654,8 +26590,6 @@ self: {
        ];
        description = "Amazon IoT Analytics SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-iot-dataplane" = callPackage
@@ -26673,8 +26607,6 @@ self: {
        ];
        description = "Amazon IoT Data Plane SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-iot-jobs-dataplane" = callPackage
@@ -26692,8 +26624,6 @@ self: {
        ];
        description = "Amazon IoT Jobs Data Plane SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-kinesis" = callPackage
@@ -26711,8 +26641,6 @@ self: {
        ];
        description = "Amazon Kinesis SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-kinesis-analytics" = callPackage
@@ -26730,8 +26658,6 @@ self: {
        ];
        description = "Amazon Kinesis Analytics SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-kinesis-firehose" = callPackage
@@ -26749,8 +26675,6 @@ self: {
        ];
        description = "Amazon Kinesis Firehose SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-kinesis-video" = callPackage
@@ -26768,8 +26692,6 @@ self: {
        ];
        description = "Amazon Kinesis Video Streams SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-kinesis-video-archived-media" = callPackage
@@ -26787,8 +26709,6 @@ self: {
        ];
        description = "Amazon Kinesis Video Streams Archived Media SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-kinesis-video-media" = callPackage
@@ -26806,8 +26726,6 @@ self: {
        ];
        description = "Amazon Kinesis Video Streams Media SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-kms" = callPackage
@@ -26825,8 +26743,6 @@ self: {
        ];
        description = "Amazon Key Management Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-lambda" = callPackage
@@ -26844,8 +26760,6 @@ self: {
        ];
        description = "Amazon Lambda SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-lex-models" = callPackage
@@ -26863,8 +26777,6 @@ self: {
        ];
        description = "Amazon Lex Model Building Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-lex-runtime" = callPackage
@@ -26882,8 +26794,6 @@ self: {
        ];
        description = "Amazon Lex Runtime Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-lightsail" = callPackage
@@ -26901,8 +26811,6 @@ self: {
        ];
        description = "Amazon Lightsail SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-marketplace-analytics" = callPackage
@@ -26920,8 +26828,6 @@ self: {
        ];
        description = "Amazon Marketplace Commerce Analytics SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-marketplace-entitlement" = callPackage
@@ -26939,8 +26845,6 @@ self: {
        ];
        description = "Amazon Marketplace Entitlement Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-marketplace-metering" = callPackage
@@ -26958,8 +26862,6 @@ self: {
        ];
        description = "Amazon Marketplace Metering SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-mechanicalturk" = callPackage
@@ -26977,8 +26879,6 @@ self: {
        ];
        description = "Amazon Mechanical Turk SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-mediaconvert" = callPackage
@@ -26996,8 +26896,6 @@ self: {
        ];
        description = "Amazon Elemental MediaConvert SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-medialive" = callPackage
@@ -27015,8 +26913,6 @@ self: {
        ];
        description = "Amazon Elemental MediaLive SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-mediapackage" = callPackage
@@ -27034,8 +26930,6 @@ self: {
        ];
        description = "Amazon Elemental MediaPackage SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-mediastore" = callPackage
@@ -27053,8 +26947,6 @@ self: {
        ];
        description = "Amazon Elemental MediaStore SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-mediastore-dataplane" = callPackage
@@ -27072,8 +26964,6 @@ self: {
        ];
        description = "Amazon Elemental MediaStore Data Plane SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-migrationhub" = callPackage
@@ -27091,8 +26981,6 @@ self: {
        ];
        description = "Amazon Migration Hub SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-ml" = callPackage
@@ -27110,8 +26998,6 @@ self: {
        ];
        description = "Amazon Machine Learning SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-mobile" = callPackage
@@ -27129,8 +27015,6 @@ self: {
        ];
        description = "Amazon Mobile SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-mq" = callPackage
@@ -27148,8 +27032,6 @@ self: {
        ];
        description = "Amazon MQ SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-opsworks" = callPackage
@@ -27167,8 +27049,6 @@ self: {
        ];
        description = "Amazon OpsWorks SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-opsworks-cm" = callPackage
@@ -27186,8 +27066,6 @@ self: {
        ];
        description = "Amazon OpsWorks for Chef Automate SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-organizations" = callPackage
@@ -27205,8 +27083,6 @@ self: {
        ];
        description = "Amazon Organizations SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-pinpoint" = callPackage
@@ -27224,8 +27100,6 @@ self: {
        ];
        description = "Amazon Pinpoint SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-polly" = callPackage
@@ -27243,8 +27117,6 @@ self: {
        ];
        description = "Amazon Polly SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-pricing" = callPackage
@@ -27262,8 +27134,6 @@ self: {
        ];
        description = "Amazon Price List Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-rds" = callPackage
@@ -27281,8 +27151,6 @@ self: {
        ];
        description = "Amazon Relational Database Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-redshift" = callPackage
@@ -27300,8 +27168,6 @@ self: {
        ];
        description = "Amazon Redshift SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-rekognition" = callPackage
@@ -27319,8 +27185,6 @@ self: {
        ];
        description = "Amazon Rekognition SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-resourcegroups" = callPackage
@@ -27338,8 +27202,6 @@ self: {
        ];
        description = "Amazon Resource Groups SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-resourcegroupstagging" = callPackage
@@ -27357,8 +27219,6 @@ self: {
        ];
        description = "Amazon Resource Groups Tagging API SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-route53" = callPackage
@@ -27376,8 +27236,6 @@ self: {
        ];
        description = "Amazon Route 53 SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-route53-autonaming" = callPackage
@@ -27395,8 +27253,6 @@ self: {
        ];
        description = "Amazon Route 53 Auto Naming SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-route53-domains" = callPackage
@@ -27414,8 +27270,6 @@ self: {
        ];
        description = "Amazon Route 53 Domains SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-s3" = callPackage
@@ -27433,8 +27287,6 @@ self: {
        ];
        description = "Amazon Simple Storage Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-s3-streaming" = callPackage
@@ -27454,8 +27306,6 @@ self: {
        ];
        description = "Provides conduits to upload data to S3 using the Multipart API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-sagemaker" = callPackage
@@ -27473,8 +27323,6 @@ self: {
        ];
        description = "Amazon SageMaker Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-sagemaker-runtime" = callPackage
@@ -27492,8 +27340,6 @@ self: {
        ];
        description = "Amazon SageMaker Runtime SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-sdb" = callPackage
@@ -27511,8 +27357,6 @@ self: {
        ];
        description = "Amazon SimpleDB SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-secretsmanager" = callPackage
@@ -27530,8 +27374,6 @@ self: {
        ];
        description = "Amazon Secrets Manager SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-serverlessrepo" = callPackage
@@ -27549,8 +27391,6 @@ self: {
        ];
        description = "Amazon ServerlessApplicationRepository SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-servicecatalog" = callPackage
@@ -27568,8 +27408,6 @@ self: {
        ];
        description = "Amazon Service Catalog SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-ses" = callPackage
@@ -27587,8 +27425,6 @@ self: {
        ];
        description = "Amazon Simple Email Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-shield" = callPackage
@@ -27606,8 +27442,6 @@ self: {
        ];
        description = "Amazon Shield SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-sms" = callPackage
@@ -27625,8 +27459,6 @@ self: {
        ];
        description = "Amazon Server Migration Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-snowball" = callPackage
@@ -27644,8 +27476,6 @@ self: {
        ];
        description = "Amazon Import/Export Snowball SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-sns" = callPackage
@@ -27663,8 +27493,6 @@ self: {
        ];
        description = "Amazon Simple Notification Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-sqs" = callPackage
@@ -27682,8 +27510,6 @@ self: {
        ];
        description = "Amazon Simple Queue Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-ssm" = callPackage
@@ -27701,8 +27527,6 @@ self: {
        ];
        description = "Amazon Simple Systems Manager (SSM) SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-stepfunctions" = callPackage
@@ -27720,8 +27544,6 @@ self: {
        ];
        description = "Amazon Step Functions SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-storagegateway" = callPackage
@@ -27739,8 +27561,6 @@ self: {
        ];
        description = "Amazon Storage Gateway SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-sts" = callPackage
@@ -27758,8 +27578,6 @@ self: {
        ];
        description = "Amazon Security Token Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-support" = callPackage
@@ -27777,8 +27595,6 @@ self: {
        ];
        description = "Amazon Support SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-swf" = callPackage
@@ -27796,8 +27612,6 @@ self: {
        ];
        description = "Amazon Simple Workflow Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-test" = callPackage
@@ -27819,8 +27633,6 @@ self: {
        ];
        description = "Common functionality for Amazonka library test-suites";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-transcribe" = callPackage
@@ -27838,8 +27650,6 @@ self: {
        ];
        description = "Amazon Transcribe Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-translate" = callPackage
@@ -27857,8 +27667,6 @@ self: {
        ];
        description = "Amazon Translate SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-waf" = callPackage
@@ -27876,8 +27684,6 @@ self: {
        ];
        description = "Amazon WAF SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-waf-regional" = callPackage
@@ -27895,8 +27701,6 @@ self: {
        ];
        description = "Amazon WAF Regional SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-workdocs" = callPackage
@@ -27914,8 +27718,6 @@ self: {
        ];
        description = "Amazon WorkDocs SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-workmail" = callPackage
@@ -27933,8 +27735,6 @@ self: {
        ];
        description = "Amazon WorkMail SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-workspaces" = callPackage
@@ -27952,8 +27752,6 @@ self: {
        ];
        description = "Amazon WorkSpaces SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-xray" = callPackage
@@ -27971,8 +27769,6 @@ self: {
        ];
        description = "Amazon X-Ray SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amby" = callPackage
@@ -28854,8 +28650,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-athena";
-       version = "7.3.4";
-       sha256 = "1d4pm1fb8iwfhb2f57n6kkzm27nj9fqgn3m14zzdbxk2l63q41h3";
+       version = "7.4.2";
+       sha256 = "0mbxg2d5hwd7v17wdqdg61rkhag30pvp84a12bwhjr5ijqhfwbf8";
        libraryHaskellDepends = [
          amazonka amazonka-athena amazonka-core base lens resourcet text
          unliftio-core
@@ -28875,8 +28671,8 @@ self: {
     ({ mkDerivation, aeson, antiope-s3, avro, base, bytestring, text }:
      mkDerivation {
        pname = "antiope-contract";
-       version = "7.3.4";
-       sha256 = "0006g261khirldmsbnggnb9fmn9z6m9j7hi9cggpgmxc5ird16p6";
+       version = "7.4.2";
+       sha256 = "0p5lahs7vmah0ww87wxrd7pp579zijyb9n2wh4mys8i0qiqq7fq0";
        libraryHaskellDepends = [
          aeson antiope-s3 avro base bytestring text
        ];
@@ -28894,8 +28690,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-core";
-       version = "7.3.4";
-       sha256 = "07zf2a0vpzcn5f9rr0k13w2pljybb8glc149wymhkjjfhhgb2ylh";
+       version = "7.4.2";
+       sha256 = "13s6shrhm2d17dialmpyi40vrdq5qw1zy960hl0g8d1fyg954ipx";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core base bytestring exceptions
          generic-lens http-client http-types lens mtl resourcet text
@@ -28921,8 +28717,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-dynamodb";
-       version = "7.3.4";
-       sha256 = "0smsb7s7ymsdhkvawlbv9j67i1vr9i58qad9m4d5ir43pxi1bmvh";
+       version = "7.4.2";
+       sha256 = "1wmxq228wr18j4qpxqhrnv8y3yzhy3gpa1daa2zbq5zflbkxjcvf";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core amazonka-dynamodb antiope-core base
          generic-lens lens text unliftio-core unordered-containers
@@ -28946,8 +28742,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-messages";
-       version = "7.3.4";
-       sha256 = "0n9s18fmqp22r857yybd3ddm5m6ijr0a1vydll9qqaia951s2a6a";
+       version = "7.4.2";
+       sha256 = "0xlzz9dr06s03pqfra8agy80a3r8593kjcfs0w7b1v6m0ahwi9ip";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core base bytestring generic-lens lens
          lens-aeson monad-loops network-uri text unliftio-core
@@ -28971,8 +28767,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-optparse-applicative";
-       version = "7.3.4";
-       sha256 = "1l21xgis1rzzbziz403wl4inilnn52ly4w1lp1cbcj7hnykaxa1i";
+       version = "7.4.2";
+       sha256 = "0nvmv0db1v0iw446cy2hfczpsll2if3w0cjmhgr5zgj9l5ja9x1c";
        libraryHaskellDepends = [
          amazonka amazonka-core amazonka-s3 base optparse-applicative text
        ];
@@ -28996,8 +28792,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-s3";
-       version = "7.3.4";
-       sha256 = "14k5w7s30rqygf6df309h90p9d5fgvw9wxwgz0sisi1mzvbb7wry";
+       version = "7.4.2";
+       sha256 = "1gpsc6y18h63wwkawvzwz8qmpw21pqhgpvgnb7apl9jc06xp2v0h";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core amazonka-s3 antiope-core
          antiope-messages attoparsec base bytestring conduit conduit-extra
@@ -29017,6 +28813,37 @@ self: {
        broken = true;
      }) {};
 
+  "antiope-shell" = callPackage
+    ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3
+     , antiope-core, antiope-messages, antiope-s3, attoparsec, base
+     , bytestring, conduit, conduit-extra, exceptions, generic-lens
+     , hedgehog, hspec, hspec-discover, http-types, hw-hspec-hedgehog
+     , lens, mtl, network-uri, process, resourcet, text, time
+     , unliftio-core
+     }:
+     mkDerivation {
+       pname = "antiope-shell";
+       version = "7.4.2";
+       sha256 = "1xg98dg52qmp8sz2r4b0srh7kasvd411i6wl3cj9m3nngignbab8";
+       libraryHaskellDepends = [
+         aeson amazonka amazonka-core amazonka-s3 antiope-core
+         antiope-messages antiope-s3 attoparsec base bytestring exceptions
+         generic-lens http-types lens mtl network-uri process resourcet text
+         time unliftio-core
+       ];
+       testHaskellDepends = [
+         aeson amazonka amazonka-core amazonka-s3 antiope-core attoparsec
+         base bytestring conduit conduit-extra exceptions generic-lens
+         hedgehog hspec http-types hw-hspec-hedgehog lens mtl network-uri
+         resourcet text time unliftio-core
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "antiope-sns" = callPackage
     ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sns, base
      , bytestring, generic-lens, hedgehog, hspec, hspec-discover
@@ -29024,8 +28851,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-sns";
-       version = "7.3.4";
-       sha256 = "0vcns4p0agni4afdw4cr3hz2xq54d3wam6mkaggd5zyf974x7c7c";
+       version = "7.4.2";
+       sha256 = "09g6jsdi20xa43ipb31y5i3afn75gldm0xyr2mqkfyhb8ay6simx";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core amazonka-sns base bytestring
          generic-lens lens text time unliftio-core
@@ -29051,8 +28878,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-sqs";
-       version = "7.3.4";
-       sha256 = "1y1kgppnc47wprd3sjw8qbjh5dvfr4i7mczi70s88i8apkqlxrbn";
+       version = "7.4.2";
+       sha256 = "044sa2skvbr492bal52ncbsybr9wrkkq5kcvsdaiqwvkpfwq66v0";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core amazonka-sqs base bytestring conduit
          generic-lens lens lens-aeson monad-loops mtl network-uri split text
@@ -29076,8 +28903,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-swf";
-       version = "7.3.4";
-       sha256 = "1rn31vdjfs7jrx87a44vg36kwkcxx7sp3mx54f494srwa3cv1di5";
+       version = "7.4.2";
+       sha256 = "1zp63q8dd400ll6cl9wsp6rhghzm56rsak8sh5p860adlk49y9il";
        libraryHaskellDepends = [ amazonka-swf base lens text ];
        testHaskellDepends = [ base hedgehog hspec hw-hspec-hedgehog ];
        testToolDepends = [ hspec-discover ];
@@ -32672,12 +32499,13 @@ self: {
      , dependency, dhall, directory, file-embed, filemanip, filepath
      , http-client, http-client-tls, lzma, microlens, mtl
      , optparse-applicative, parallel-io, process, shake, shake-ats
-     , shake-c, shake-ext, tar, temporary, text, unix, zip-archive, zlib
+     , shake-c, shake-ext, tar, temporary, text, unix, unix-compat
+     , zip-archive, zlib
      }:
      mkDerivation {
        pname = "ats-pkg";
-       version = "3.2.5.18";
-       sha256 = "16v3308zap5jhpd9xsvjdgp28330iscaikdl76jqf5jhb175pxzr";
+       version = "3.2.6.0";
+       sha256 = "1jxs3rfv9nrigwnshanc90dm3nzimr7zmfln1la5nv098prdkakr";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -32686,7 +32514,7 @@ self: {
          composition-prelude containers dependency dhall directory
          file-embed filemanip filepath http-client http-client-tls lzma
          microlens mtl parallel-io process shake shake-ats shake-c shake-ext
-         tar text unix zip-archive zlib
+         tar text unix unix-compat zip-archive zlib
        ];
        libraryToolDepends = [ cpphs ];
        executableHaskellDepends = [
@@ -34109,8 +33937,6 @@ self: {
        ];
        description = "Helper function and types for working with amazonka";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aws-ec2" = callPackage
@@ -34536,8 +34362,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Wrapper over Amazonka's SES";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aws-sign4" = callPackage
@@ -37843,8 +37667,8 @@ self: {
        pname = "binary-orphans";
        version = "1.0.1";
        sha256 = "0gbmn5rpvyxhw5bxjmxwld6918lslv03b2f6hshssaw1il5x86j3";
-       revision = "1";
-       editedCabalFile = "0sww1904gn3sxvj94ac8l1g50v0j3fgpfiynbpvg0yhqsbfazi3n";
+       revision = "2";
+       editedCabalFile = "0b4fafgwhrp4i7vxcynzk5678kn6jvraanmbmf14mxlkipl2fff3";
        libraryHaskellDepends = [ base binary transformers ];
        testHaskellDepends = [
          base binary QuickCheck quickcheck-instances tagged tasty
@@ -45137,6 +44961,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cabal-flatpak" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, cabal-plan
+     , containers, http-client, http-client-tls, http-types
+     , optparse-applicative, pathtype, shell-utility, text, utility-ht
+     }:
+     mkDerivation {
+       pname = "cabal-flatpak";
+       version = "0.0";
+       sha256 = "0ci55nzlp1hqx31m7pw37ms8pb053gb85126pszpsd8n7yvlra9w";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         aeson aeson-pretty base bytestring cabal-plan containers
+         http-client http-client-tls http-types optparse-applicative
+         pathtype shell-utility text utility-ht
+       ];
+       description = "Generate a FlatPak manifest from a Cabal package description";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "cabal-fmt" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, directory
      , filepath, mtl, optparse-applicative, parsec, pretty, process
@@ -52911,8 +52755,8 @@ self: {
        pname = "co-log";
        version = "0.3.0.0";
        sha256 = "0rrxgc3qs10lj94d0v42fd6979znvmzxd7dmffp2lxpzmnymnsha";
-       revision = "2";
-       editedCabalFile = "12h6rgqgqd1wcm2ahl6b3wglsgq4ynjacrz9m0wkyry3k0jwzd8f";
+       revision = "3";
+       editedCabalFile = "0z2456b49k0qfd4fzvbwndvdvnwfvsmhyxd5gmbiz7l7b458dq3s";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -53841,18 +53685,17 @@ self: {
      }) {};
 
   "colour-space" = callPackage
-    ({ mkDerivation, base, colour, constrained-categories, JuicyPixels
-     , linear, linearmap-category, manifolds, semigroups, vector-space
+    ({ mkDerivation, base, call-stack, colour, constrained-categories
+     , JuicyPixels, lens, linear, linearmap-category, manifolds
+     , semigroups, vector-space
      }:
      mkDerivation {
        pname = "colour-space";
-       version = "0.1.4.0";
-       sha256 = "0sr341chqhngm7ihyy3ym3w345sk101gznw80iksjwxjg3iiqxmq";
-       revision = "2";
-       editedCabalFile = "0qldxm84rk344h4wgk3bqsxfhkmvj8psm0sqgfnjh34a4fy5hjzg";
+       version = "0.1.5.0";
+       sha256 = "13xmn8l11r06xna575sw6sdhp2rj25q8qd9ljbjpl37fr1qbc8xs";
        libraryHaskellDepends = [
-         base colour constrained-categories JuicyPixels linear
-         linearmap-category manifolds semigroups vector-space
+         base call-stack colour constrained-categories JuicyPixels lens
+         linear linearmap-category manifolds semigroups vector-space
        ];
        description = "Instances of the manifold-classes for colour types";
        license = stdenv.lib.licenses.gpl3;
@@ -55952,6 +55795,42 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "conduit-algorithms_0_0_11_0" = callPackage
+    ({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit
+     , conduit-combinators, conduit-extra, conduit-zstd, containers
+     , criterion, deepseq, directory, exceptions, HUnit, lzma-conduit
+     , monad-control, mtl, pqueue, resourcet, stm, stm-conduit
+     , streaming-commons, test-framework, test-framework-hunit
+     , test-framework-th, transformers, unliftio-core, vector
+     }:
+     mkDerivation {
+       pname = "conduit-algorithms";
+       version = "0.0.11.0";
+       sha256 = "0c1jwz30kkvimx7lb61782yk0kyfamrf5bqc3g1h7g51lk8bbv9i";
+       libraryHaskellDepends = [
+         async base bytestring bzlib-conduit conduit conduit-combinators
+         conduit-extra conduit-zstd containers deepseq exceptions
+         lzma-conduit monad-control mtl pqueue resourcet stm stm-conduit
+         streaming-commons transformers unliftio-core vector
+       ];
+       testHaskellDepends = [
+         async base bytestring bzlib-conduit conduit conduit-combinators
+         conduit-extra conduit-zstd containers deepseq directory exceptions
+         HUnit lzma-conduit monad-control mtl pqueue resourcet stm
+         stm-conduit streaming-commons test-framework test-framework-hunit
+         test-framework-th transformers unliftio-core vector
+       ];
+       benchmarkHaskellDepends = [
+         async base bytestring bzlib-conduit conduit conduit-combinators
+         conduit-extra conduit-zstd containers criterion deepseq exceptions
+         lzma-conduit monad-control mtl pqueue resourcet stm stm-conduit
+         streaming-commons transformers unliftio-core vector
+       ];
+       description = "Conduit-based algorithms";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "conduit-audio" = callPackage
     ({ mkDerivation, base, conduit, vector }:
      mkDerivation {
@@ -56439,8 +56318,6 @@ self: {
          text transformers
        ];
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "conferer" = callPackage
@@ -56449,8 +56326,8 @@ self: {
      }:
      mkDerivation {
        pname = "conferer";
-       version = "0.1.0.1";
-       sha256 = "1g5kyvy067lll181xqd1lxpzl5965yj847kh6z2r0wvq01i4k467";
+       version = "0.1.0.4";
+       sha256 = "0zzc6m52a3rsd6cs7ns95rk1bl1gf9dyrz7lx0kakibxpb11sgsy";
        libraryHaskellDepends = [
          base bytestring containers directory text
        ];
@@ -56461,6 +56338,71 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "conferer-hspec" = callPackage
+    ({ mkDerivation, base, conferer, hspec, hspec-core, text }:
+     mkDerivation {
+       pname = "conferer-hspec";
+       version = "0.1.0.1";
+       sha256 = "1wjn4my0grb62vkswvxa4674s0fid6kskvxz1qll14gqw6wlkx19";
+       libraryHaskellDepends = [ base conferer hspec-core text ];
+       testHaskellDepends = [ base conferer hspec hspec-core text ];
+       description = "conferer's FromConfig instances for hspec Config";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "conferer-provider-json" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, conferer, directory
+     , hspec, text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "conferer-provider-json";
+       version = "0.1.0.2";
+       sha256 = "1iww8w6d7710b58yqiap10jkbgb08ah3szc259p7wn4lnv96cic0";
+       libraryHaskellDepends = [
+         aeson base bytestring conferer directory text unordered-containers
+         vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring conferer directory hspec text
+         unordered-containers vector
+       ];
+       description = "Configuration for reading json files";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "conferer-snap" = callPackage
+    ({ mkDerivation, base, conferer, hspec, snap-core, snap-server
+     , text
+     }:
+     mkDerivation {
+       pname = "conferer-snap";
+       version = "0.1.0.3";
+       sha256 = "07x1grjqq5dsz7w8vrkzdaknfvqkvjqkmjwjiixn51jxfg6011zq";
+       libraryHaskellDepends = [
+         base conferer snap-core snap-server text
+       ];
+       testHaskellDepends = [
+         base conferer hspec snap-core snap-server text
+       ];
+       description = "conferer's FromConfig instances for snap Config";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "conferer-warp" = callPackage
+    ({ mkDerivation, base, conferer, hspec, http-types, text, wai, warp
+     }:
+     mkDerivation {
+       pname = "conferer-warp";
+       version = "0.1.0.1";
+       sha256 = "1alzbcm4bkp2a5p53b3vpnl0zgnz8bm2rpn2aljs24wz3vapgzsa";
+       libraryHaskellDepends = [ base conferer http-types text wai warp ];
+       testHaskellDepends = [
+         base conferer hspec http-types text wai warp
+       ];
+       description = "conferer's FromConfig instances for warp settings";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "confetti" = callPackage
     ({ mkDerivation, base, cmdargs, directory, filepath, MissingH
      , tasty, tasty-hunit, tasty-smallcheck, text, time, unix, yaml
@@ -58938,6 +58880,8 @@ self: {
        pname = "cpkg";
        version = "0.2.3.2";
        sha256 = "0dwcahc8m2mj3jm0hwx13wzhlnyiby4sds8pc70fv54zp0ccbq6r";
+       revision = "1";
+       editedCabalFile = "1c38aadl6lfnid8ipmpvm78mlvb0rgqr5sdjg86y1ks4q45nqw3g";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -70811,8 +70755,8 @@ self: {
      }:
      mkDerivation {
        pname = "distribution-nixpkgs";
-       version = "1.2";
-       sha256 = "0123plf001136q5gd9brq6vhpnx7db6gixx5sagp5l8jd2qpb244";
+       version = "1.3.0";
+       sha256 = "192r9aizcjvnm0s57v056x42mvlq79fk8630g73ps6qqnb2mjy9h";
        libraryHaskellDepends = [
          aeson base bytestring Cabal containers deepseq language-nix lens
          pretty process split
@@ -71071,6 +71015,8 @@ self: {
        pname = "dl-fedora";
        version = "0.7";
        sha256 = "00fkjlggax5l9qk2dlgh3plkqrvxrwfipdcfpq8d5kfw7l5wdxsv";
+       revision = "1";
+       editedCabalFile = "1njib3nnknqpa4kmrrrfabkrh1iaqx8xsw7jn4qrhlnqhh0mqwqd";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -74237,8 +74183,6 @@ self: {
        ];
        description = "A handy tool for uploading unikernels to Amazon's EC2";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "eccrypto" = callPackage
@@ -75105,8 +75049,6 @@ self: {
        ];
        description = "An ekg backend for Amazon Cloudwatch";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ekg-core" = callPackage
@@ -79341,8 +79283,8 @@ self: {
      }:
      mkDerivation {
        pname = "exhaustive";
-       version = "1.1.7";
-       sha256 = "02kv3vv7gz8lqwm5iz4nddyzxp17cgsb6j12lc5kf51l481vpb1z";
+       version = "1.1.8";
+       sha256 = "1nnylpjrrb6smmgl3d481wpkxpdw26yfa3jlw98p3xgm8k907486";
        libraryHaskellDepends = [
          base generics-sop template-haskell transformers
        ];
@@ -81634,10 +81576,8 @@ self: {
      }:
      mkDerivation {
        pname = "fcm-client";
-       version = "0.1.0.0";
-       sha256 = "1qv43pfwgi7d7bx445z3q3zr7szv6y7ky9gb6g7f1chxs4q6mcdl";
-       revision = "1";
-       editedCabalFile = "1rvb99gh2m1j2bd9x6vc58kvkwdcxl5wwypvnj3c62zcqmdln03l";
+       version = "0.2.0.0";
+       sha256 = "151lm6g08bwqfdi25zmsv99wri8x75fi1svwsgm2ar2hd8zjngnj";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -83353,8 +83293,8 @@ self: {
      }:
      mkDerivation {
        pname = "finitary";
-       version = "1.0.0.1";
-       sha256 = "1va895ijk7sb5zn6zf1bfi8w0bqxjx4631iwnijh9f4d3dsnpqcv";
+       version = "1.1.0.1";
+       sha256 = "13rvwymzsl91zwvc565ysakn8lznwwfnrg0d4vxvlqqrrkbkca1p";
        libraryHaskellDepends = [
          base bitvec coercible-utils finite-typelits ghc-typelits-knownnat
          ghc-typelits-natnormalise mtl primitive template-haskell
@@ -83375,8 +83315,8 @@ self: {
      }:
      mkDerivation {
        pname = "finitary-derive";
-       version = "1.0.0.0";
-       sha256 = "0ns61aylidrkdf4qkfz1r1vjfzlmgbqar1dq068xg1pvnkpsrvlc";
+       version = "1.0.0.1";
+       sha256 = "1wv9jjvv1jd5y39pybfawb19pxzwb6r3p69ajyh2f7m8nn81kcim";
        libraryHaskellDepends = [
          base binary coercible-utils deepseq finitary finite-typelits
          ghc-typelits-extra ghc-typelits-knownnat hashable mtl vector
@@ -88749,6 +88689,22 @@ self: {
        license = "GPL";
      }) {};
 
+  "fvars" = callPackage
+    ({ mkDerivation, async, base, exceptions, hspec, monad-control, mtl
+     , transformers
+     }:
+     mkDerivation {
+       pname = "fvars";
+       version = "1.0.0.0";
+       sha256 = "0iwlmr388wv98n244wdzwk5l7j6p669pq3vwavpnk37wfanahvxj";
+       libraryHaskellDepends = [
+         base exceptions monad-control mtl transformers
+       ];
+       testHaskellDepends = [ async base hspec ];
+       description = "Fast Mutable Vars";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "fwgl" = callPackage
     ({ mkDerivation, base, hashable, transformers, unordered-containers
      , vect, vector, Yampa
@@ -92806,8 +92762,8 @@ self: {
      }:
      mkDerivation {
        pname = "ghcide";
-       version = "0.0.2";
-       sha256 = "0ivq4j4i7cb8k7h2rkc9kpki39zl1nc63ba6hpfdlyl5vg5x3qy7";
+       version = "0.0.3";
+       sha256 = "0czmgw2wfsycxs3lbs838xmgdvk52ry0dnb0dgxmafqgdi0l7xi3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -92823,7 +92779,7 @@ self: {
          haskell-lsp hie-bios optparse-applicative shake text
        ];
        testHaskellDepends = [
-         base containers extra filepath haskell-lsp-types lens lsp-test
+         base containers extra filepath ghc haskell-lsp-types lens lsp-test
          parser-combinators tasty tasty-hunit text
        ];
        description = "The core of an IDE";
@@ -95211,6 +95167,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "github-webhooks_0_11_0" = callPackage
+    ({ mkDerivation, aeson, base, base16-bytestring, bytestring
+     , cryptonite, deepseq, deepseq-generics, hspec, memory, text, time
+     , vector
+     }:
+     mkDerivation {
+       pname = "github-webhooks";
+       version = "0.11.0";
+       sha256 = "1x9vwx7k8xyblfxqny7almqlzzncnm315x6dq6y2bzsl9sxwvnkg";
+       libraryHaskellDepends = [
+         aeson base base16-bytestring bytestring cryptonite deepseq
+         deepseq-generics memory text time vector
+       ];
+       testHaskellDepends = [ aeson base bytestring hspec text vector ];
+       description = "Aeson instances for GitHub Webhook payloads";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "githud" = callPackage
     ({ mkDerivation, base, bytestring, daemons, data-default, directory
      , mtl, network, parsec, process, tasty, tasty-hunit
@@ -100047,14 +100022,14 @@ self: {
 
   "grammatical-parsers" = callPackage
     ({ mkDerivation, base, checkers, containers, criterion, deepseq
-     , doctest, monoid-subclasses, parsers, QuickCheck, rank2classes
-     , size-based, tasty, tasty-quickcheck, testing-feat, text
-     , transformers
+     , doctest, markdown-unlit, monoid-subclasses, parsers, QuickCheck
+     , rank2classes, size-based, tasty, tasty-quickcheck, testing-feat
+     , text, transformers
      }:
      mkDerivation {
        pname = "grammatical-parsers";
-       version = "0.4";
-       sha256 = "0cn912rq65k234y12wwbh07wfps107i43s374lddajb853jq3wr6";
+       version = "0.4.0.1";
+       sha256 = "049xz8gscqxn5k5vy34zc97w4in4scv89jvd71kxf24yvxblzayz";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -100068,6 +100043,7 @@ self: {
          QuickCheck rank2classes size-based tasty tasty-quickcheck
          testing-feat
        ];
+       testToolDepends = [ markdown-unlit ];
        benchmarkHaskellDepends = [
          base containers criterion deepseq monoid-subclasses parsers
          rank2classes text
@@ -103598,6 +103574,8 @@ self: {
        pname = "hackage-db";
        version = "2.0.1";
        sha256 = "13ggj72i8dxwh3qwznnqxbr00nvsbapyyhzx5zybfacddnpw3aph";
+       revision = "1";
+       editedCabalFile = "0l2zdajacqibwkjs5pif6a3mxns9jpc6iry7xxqcfis4n9ks404a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -103609,6 +103587,28 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
+  "hackage-db_2_1_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, Cabal, containers
+     , directory, exceptions, filepath, tar, time, utf8-string
+     }:
+     mkDerivation {
+       pname = "hackage-db";
+       version = "2.1.0";
+       sha256 = "1vsc0lrbrb525frycqq0c5z846whymgcjl888gnlqd16nknbsn3l";
+       revision = "1";
+       editedCabalFile = "1h3x5a8xmqkkcd3h1m7z0il1vbsh2c77685y68zmyp21zb1y88hy";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring Cabal containers directory exceptions
+         filepath tar time utf8-string
+       ];
+       description = "Access cabal-install's Hackage database via Data.Map";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ peti ];
+     }) {};
+
   "hackage-diff" = callPackage
     ({ mkDerivation, ansi-terminal, async, attoparsec, base, Cabal
      , cpphs, directory, filepath, haskell-src-exts, HTTP, mtl, process
@@ -104803,8 +104803,6 @@ self: {
        testToolDepends = [ utillinux ];
        description = "A static website compiler library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) utillinux;};
 
   "hakyll-R" = callPackage
@@ -107057,8 +107055,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasbolt-extras";
-       version = "0.0.0.21";
-       sha256 = "1fq96j9hrfvjffjqz938fql40h15mb7dhfzjfbryd5qip4k45435";
+       version = "0.0.0.22";
+       sha256 = "06bad2hbzmrrav1f7fsszrspxghziy6jpmgr39nbs375fbqib4kp";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -110977,8 +110975,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskseg";
-       version = "0.1.0.1";
-       sha256 = "0m9226wwkkvfqr2nfhf2gxymav3fp6klvzilsrkx502dqlll25qc";
+       version = "0.1.0.2";
+       sha256 = "0p9z71gbrgssjs1zgbjfqn2g4k4i6ahs9lj1x82mjqppvc4gr0n3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -113778,8 +113776,6 @@ self: {
        ];
        description = "heavy-logger compatibility with amazonka-core logging";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "heavy-logger-instances" = callPackage
@@ -113849,6 +113845,35 @@ self: {
        broken = true;
      }) {};
 
+  "hedgehog_0_6_1" = callPackage
+    ({ mkDerivation, ansi-terminal, async, base, bytestring
+     , concurrent-output, containers, directory, exceptions
+     , lifted-async, mmorph, monad-control, mtl, pretty-show, primitive
+     , random, resourcet, semigroups, stm, template-haskell, text
+     , th-lift, time, transformers, transformers-base, unix
+     , wl-pprint-annotated
+     }:
+     mkDerivation {
+       pname = "hedgehog";
+       version = "0.6.1";
+       sha256 = "0xz10ycdm5vk9nrcym1fi83k19frfwqz18bz8bnpzwvaj0j41yfj";
+       revision = "5";
+       editedCabalFile = "0kwmxjb1y3gk85njacw5wcvmq3bzp1649dbjzgzpiba2w342f7il";
+       libraryHaskellDepends = [
+         ansi-terminal async base bytestring concurrent-output containers
+         directory exceptions lifted-async mmorph monad-control mtl
+         pretty-show primitive random resourcet semigroups stm
+         template-haskell text th-lift time transformers transformers-base
+         unix wl-pprint-annotated
+       ];
+       testHaskellDepends = [
+         base containers pretty-show semigroups text transformers
+       ];
+       description = "Hedgehog will eat all your bugs";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hedgehog" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, bytestring
      , concurrent-output, containers, directory, exceptions, fail
@@ -116370,8 +116395,8 @@ self: {
      }:
      mkDerivation {
        pname = "hie-bios";
-       version = "0.2.0";
-       sha256 = "0sr0drw0kyf4f77cg25x4scjzqg597yr5xl4dzqdnjz5vv0p1znm";
+       version = "0.2.1";
+       sha256 = "12gqchrqscf7qnmid3k8wizxax4157dggg6kr1dipbwn36dczhrv";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -119836,8 +119861,8 @@ self: {
        pname = "hoist-error";
        version = "0.2.1.0";
        sha256 = "028lczd80nhj3yj5dq9qixzdzkyisl34qpi6bb28r8b9nj2i2nss";
-       revision = "1";
-       editedCabalFile = "0abzpyxr46kk9vh5yxy8wawmyn1x1zrhl9mdxwfz0s938z4s7nr5";
+       revision = "2";
+       editedCabalFile = "1wk9a58ychqfabbrh8zdzzd7cfvwgf8xyfi6ynsckh1yb5xa4f7j";
        libraryHaskellDepends = [ base either mtl ];
        description = "Some convenience facilities for hoisting errors into a monad";
        license = stdenv.lib.licenses.mit;
@@ -122449,8 +122474,8 @@ self: {
      }:
      mkDerivation {
        pname = "hs-ix";
-       version = "0.1.0.0";
-       sha256 = "1hn4i5j4wyi4n1cb7w9165k0dwkvzy4n9vi2j12p65m9bai8p4zm";
+       version = "0.1.1.0";
+       sha256 = "1a1plgzbqk4jhf5lyfx82yillcmy38lzlqwsfhnlka5h6f9j10hx";
        libraryHaskellDepends = [
          base base-unicode-symbols hs-functors util
        ];
@@ -140167,8 +140192,8 @@ self: {
      }:
      mkDerivation {
        pname = "jvm-binary";
-       version = "0.6.1";
-       sha256 = "0pz7md5y422mh7lcsshllqwhk6zsxl2szqw44css4m40gr196wnx";
+       version = "0.7.0";
+       sha256 = "1ism2fq66qdh72nm9cq4km9yn7v79j2qq6glpyf9yk10549kv7dv";
        libraryHaskellDepends = [
          attoparsec base binary bytestring containers data-binary-ieee754
          deepseq deriving-compat mtl template-haskell text vector
@@ -143809,6 +143834,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "language-c_0_8_3" = callPackage
+    ({ mkDerivation, alex, array, base, bytestring, containers, deepseq
+     , directory, filepath, happy, pretty, process, syb
+     }:
+     mkDerivation {
+       pname = "language-c";
+       version = "0.8.3";
+       sha256 = "0bi02jdirkys8v7flf39vrpla2a74z1z0sdhy9lb9v7cmcc6rmpk";
+       libraryHaskellDepends = [
+         array base bytestring containers deepseq directory filepath pretty
+         process syb
+       ];
+       libraryToolDepends = [ alex happy ];
+       testHaskellDepends = [ base directory filepath process ];
+       description = "Analysis and generation of C code";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "language-c-comments" = callPackage
     ({ mkDerivation, alex, array, base, language-c }:
      mkDerivation {
@@ -144467,22 +144511,17 @@ self: {
      }) {};
 
   "language-nix" = callPackage
-    ({ mkDerivation, base, base-compat, Cabal, deepseq, doctest, lens
-     , pretty, QuickCheck
+    ({ mkDerivation, base, deepseq, lens, parsec-class, pretty
+     , QuickCheck
      }:
      mkDerivation {
        pname = "language-nix";
-       version = "2.1.0.1";
-       sha256 = "1kqsw0hk03wdn7mszyjgi38nxk1wmhbxfv6di3irrhsaf807657h";
-       revision = "1";
-       editedCabalFile = "1zv12p4ralrks0517zs52rzmzmsxxkcxkqz7zijfgcsvh6bsmafi";
+       version = "2.2.0";
+       sha256 = "1lq07311dg4a32zdp5bc20bw94g0c7pdzxdiwi2y4zbhd1944rzx";
        libraryHaskellDepends = [
-         base base-compat Cabal deepseq lens pretty QuickCheck
-       ];
-       testHaskellDepends = [
-         base base-compat Cabal deepseq doctest lens pretty QuickCheck
+         base deepseq lens parsec-class pretty QuickCheck
        ];
-       description = "Data types and useful functions to represent and manipulate the Nix language";
+       description = "Data types and functions to represent the Nix language";
        license = stdenv.lib.licenses.bsd3;
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
@@ -145483,6 +145522,8 @@ self: {
        pname = "lazy-io-streams";
        version = "0.1.0.0";
        sha256 = "022x0sikvdsvpp0gh7q82sdpd5kxd2zmprdpmf7z4c3hf4xk9vxy";
+       revision = "1";
+       editedCabalFile = "0pn446g45naqh92g9mib98fw5xznbp6r4x27acmnqrmlcqjz9jsm";
        libraryHaskellDepends = [ base bytestring io-streams ];
        description = "Get lazy with your io-streams";
        license = stdenv.lib.licenses.bsd3;
@@ -145494,8 +145535,8 @@ self: {
     ({ mkDerivation, base, containers, doctest, lens, markdown-unlit }:
      mkDerivation {
        pname = "lazy-priority-queue";
-       version = "0.1";
-       sha256 = "0cjp9pvwrgldkrkg72xyq2mrr4yqzzsb4ng5as0b56zq4dgzvlib";
+       version = "0.1.0.1";
+       sha256 = "1v0jxf56wxlncw0nppmnm89j14hn8a81swr1y2sbk7gsqf73qd8v";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -145503,7 +145544,7 @@ self: {
        testHaskellDepends = [ base doctest lens ];
        testToolDepends = [ markdown-unlit ];
        description = "Lazy-Spined Monadic Priority Queues";
-       license = stdenv.lib.licenses.gpl3;
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "lazy-search" = callPackage
@@ -146589,6 +146630,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lens-regex-pcre_1_0_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, gauge, hspec, lens, pcre-heavy
+     , template-haskell, text
+     }:
+     mkDerivation {
+       pname = "lens-regex-pcre";
+       version = "1.0.0.0";
+       sha256 = "02am0q60nhn93jlrxskcc33mcgn0la8y4074vv0rbxxshbxz6k4h";
+       libraryHaskellDepends = [
+         base bytestring lens pcre-heavy template-haskell text
+       ];
+       testHaskellDepends = [
+         base bytestring hspec lens pcre-heavy template-haskell text
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring gauge lens pcre-heavy template-haskell text
+       ];
+       description = "A lensy interface to regular expressions";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "lens-simple" = callPackage
     ({ mkDerivation, base, lens-family, lens-family-core
      , lens-family-th, mtl, transformers
@@ -147122,8 +147185,8 @@ self: {
        pname = "libarchive";
        version = "1.0.5.1";
        sha256 = "1fchnvs03hg513v7a45a3qbfr3kbh3nmqjqljzr2y1mg2ghkr7cz";
-       revision = "4";
-       editedCabalFile = "0wzw962gl9lm5faaa86z4q7s9cbzqn346cmlbhr518dbnw7nv31d";
+       revision = "5";
+       editedCabalFile = "1fmsrrg8q46fwv6zgg5afc5jyd9y1qz193ypyh2kb4zf9psl3bdc";
        libraryHaskellDepends = [
          base bytestring composition-prelude dlist filepath
        ];
@@ -151330,7 +151393,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "logging-effect_1_3_5" = callPackage
+  "logging-effect_1_3_6" = callPackage
     ({ mkDerivation, async, base, bytestring, criterion, exceptions
      , fast-logger, free, lifted-async, monad-control, monad-logger, mtl
      , prettyprinter, semigroups, stm, stm-delay, text, time
@@ -151338,8 +151401,8 @@ self: {
      }:
      mkDerivation {
        pname = "logging-effect";
-       version = "1.3.5";
-       sha256 = "1ydkgjq3xpl7bqyax8ff6kvd9hjbyddgayrw43afdzbky1d0qawq";
+       version = "1.3.6";
+       sha256 = "1bcc7m2r4hhl03s91qixfc5w26pbdb7hy9dp6lzdahw6q7pn0hkw";
        libraryHaskellDepends = [
          async base exceptions free monad-control mtl prettyprinter
          semigroups stm stm-delay text time transformers transformers-base
@@ -152122,6 +152185,19 @@ self: {
        broken = true;
      }) {};
 
+  "louis" = callPackage
+    ({ mkDerivation, base, bytestring, JuicyPixels, text, vector }:
+     mkDerivation {
+       pname = "louis";
+       version = "0.1.0.2";
+       sha256 = "0bw07idhhnyxfsry5qq8hs5fdbp810j7i2syd1vfqdsbm2krq816";
+       libraryHaskellDepends = [
+         base bytestring JuicyPixels text vector
+       ];
+       description = "Turning images into text using Braille font";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "loup" = callPackage
     ({ mkDerivation, aeson, amazonka, amazonka-swf, base, bytestring
      , conduit, lifted-async, lifted-base, optparse-generic, preamble
@@ -152971,10 +153047,8 @@ self: {
      }:
      mkDerivation {
        pname = "lzlib";
-       version = "0.2.0.0";
-       sha256 = "0m0kx2drrxy01rf7a231pjqk783gcqqkjn831bcx0dbqksaz6fvm";
-       revision = "1";
-       editedCabalFile = "0jjl1rdlh8cms7pbd9y258s817l77nql4ayq12qy8c9vvxdyamh8";
+       version = "0.2.0.1";
+       sha256 = "0cp33l990na6wz9yb0kx2nzq3hqxpyc7s47xg0bvia8sajrkzdw6";
        libraryHaskellDepends = [ base bytestring ];
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [ base bytestring directory hspec ];
@@ -156891,6 +156965,8 @@ self: {
        pname = "meminfo";
        version = "0.2.0.0";
        sha256 = "1mxk57qr4d1k6sz4qld09d61nc15hixggc5klfj5xr0n8rw1za3x";
+       revision = "1";
+       editedCabalFile = "10r7ji1xb8zv7a1ilyp626chly9y8m1i67adxqrj8lwgkqxpl8nk";
        libraryHaskellDepends = [ attoparsec base bytestring containers ];
        description = "Library for reading `/proc/meminfo`";
        license = stdenv.lib.licenses.bsd3;
@@ -159461,6 +159537,17 @@ self: {
        broken = true;
      }) {};
 
+  "mm2" = callPackage
+    ({ mkDerivation, base, vector }:
+     mkDerivation {
+       pname = "mm2";
+       version = "0.1.1.0";
+       sha256 = "0zn629lm41z6b59snnjkqdk41ryimjhd5yapiwykl5fg0f7wmap3";
+       libraryHaskellDepends = [ base vector ];
+       description = "The library that can be used for optimization of multiple (Ord a) => a -> b transformations";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "mmap" = callPackage
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
@@ -161813,8 +161900,10 @@ self: {
      }:
      mkDerivation {
        pname = "monoid-statistics";
-       version = "1.0.0";
-       sha256 = "0n3q8izk197lrkvm6hmdzg7dl1mzji2z09b1wkz02pm4y0gganv3";
+       version = "1.0.1.0";
+       sha256 = "1krgyvshvw28ld89hb1qpjx8jiz40a8yq2q3zglrir4vfch5cyx9";
+       revision = "1";
+       editedCabalFile = "14p36fz2yssx92imqggv5xrsnqqhhh3xj2ba96v47fm2dglgfsrv";
        libraryHaskellDepends = [
          base math-functions vector vector-th-unbox
        ];
@@ -166633,17 +166722,19 @@ self: {
      }:
      mkDerivation {
        pname = "net-mqtt";
-       version = "0.5.0.2";
-       sha256 = "1dq1f9kkdrz8yf6yj9xzfyna6rnkzv0vmsrzg92vbkyqfhkw6fga";
+       version = "0.5.1.0";
+       sha256 = "0wqrzp39d9c04j1lqsk8kn727bymcq8jk12v330l527lm5g76adj";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          async attoparsec attoparsec-binary base binary bytestring conduit
-         conduit-extra containers network-conduit-tls network-uri stm text
+         conduit-extra containers network-conduit-tls network-uri QuickCheck
+         stm text
        ];
        executableHaskellDepends = [
          async attoparsec attoparsec-binary base binary bytestring conduit
-         conduit-extra containers network-conduit-tls network-uri stm text
+         conduit-extra containers network-conduit-tls network-uri QuickCheck
+         stm text
        ];
        testHaskellDepends = [
          async attoparsec attoparsec-binary base binary bytestring conduit
@@ -168647,6 +168738,21 @@ self: {
        broken = true;
      }) {};
 
+  "newtype-zoo" = callPackage
+    ({ mkDerivation, base, data-default, deepseq, pointed, profunctors
+     , QuickCheck, random
+     }:
+     mkDerivation {
+       pname = "newtype-zoo";
+       version = "1.1.0.0";
+       sha256 = "0sw476mmczq6gfgbbbrybrna472p5bjrimsbblw9rlyzcg2szqrp";
+       libraryHaskellDepends = [
+         base data-default deepseq pointed profunctors QuickCheck random
+       ];
+       description = "Newtype Wrapper Zoo";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "newtyper" = callPackage
     ({ mkDerivation, base, Kleislify, newtype }:
      mkDerivation {
@@ -174301,29 +174407,26 @@ self: {
      }) {};
 
   "otp-authenticator" = callPackage
-    ({ mkDerivation, aeson, base, bifunctors, binary, bytestring
+    ({ mkDerivation, aeson, base, base-compat, binary, bytestring
      , containers, cryptonite, dependent-sum, filepath, h-gpgme
-     , haskeline, microlens, one-time-password, optparse-applicative
-     , sandi, singletons, text, time, transformers, trifecta
-     , type-combinators, unix, uri-encode, witherable, yaml
+     , haskeline, megaparsec, microlens, optparse-applicative, sandi
+     , text, time, transformers, unix, uri-encode, vinyl, yaml
      }:
      mkDerivation {
        pname = "otp-authenticator";
-       version = "0.1.0.1";
-       sha256 = "1f30mr512rwbx58wkfqk3cyw471mw1lyz0jmcjj4lhknhf0agvhm";
+       version = "0.1.1.0";
+       sha256 = "0hmyq7ris01gnkydxi9i2p5v2c5cps4mg4zmxbzlyjrkyn7d5la4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base bifunctors binary bytestring containers cryptonite
-         dependent-sum filepath h-gpgme haskeline microlens
-         one-time-password optparse-applicative sandi singletons text time
-         transformers trifecta type-combinators unix uri-encode witherable
-         yaml
+         aeson base base-compat binary bytestring containers cryptonite
+         dependent-sum filepath h-gpgme haskeline megaparsec microlens
+         optparse-applicative sandi text time transformers unix uri-encode
+         vinyl yaml
        ];
        executableHaskellDepends = [
          aeson base binary bytestring h-gpgme text yaml
        ];
-       testHaskellDepends = [ base ];
        description = "OTP Authenticator (a la google) command line client";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -178776,14 +178879,14 @@ self: {
      }) {};
 
   "perceptual-hash" = callPackage
-    ({ mkDerivation, base, containers, cpphs, criterion, filepath, hip
-     , hspec, optparse-applicative, par-traverse, primitive, repa, stm
-     , vector, vector-algorithms
+    ({ mkDerivation, base, containers, cpphs, criterion, deepseq
+     , filepath, hip, hspec, optparse-applicative, par-traverse
+     , primitive, repa, stm, vector, vector-algorithms
      }:
      mkDerivation {
        pname = "perceptual-hash";
-       version = "0.1.2.0";
-       sha256 = "0wj5bnm4f2n2fd1ykf0n5cbf974x34nzy16dh7z2wxv2yn7b4f9r";
+       version = "0.1.3.0";
+       sha256 = "1g7hp5ijfqc2b3jacgabhq1mza9lqlxid309cvcm0jgppm4lvdpp";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -178794,7 +178897,7 @@ self: {
          base containers filepath optparse-applicative par-traverse stm
        ];
        testHaskellDepends = [ base hspec ];
-       benchmarkHaskellDepends = [ base criterion filepath ];
+       benchmarkHaskellDepends = [ base criterion deepseq filepath ];
        benchmarkToolDepends = [ cpphs ];
        description = "Find duplicate images";
        license = stdenv.lib.licenses.bsd3;
@@ -181153,8 +181256,6 @@ self: {
        ];
        description = "Back up the notes you've saved to Pinboard";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pinch" = callPackage
@@ -190333,8 +190434,8 @@ self: {
      }:
      mkDerivation {
        pname = "purebred-email";
-       version = "0.2.0.0";
-       sha256 = "1jjdia8qlwdibmfrqasyvm6qq01pxc9r66qmbyjmhz9bhdkqdd61";
+       version = "0.3.0.0";
+       sha256 = "0c2qmw29pbnh5kz9pkl7h4gvcs0nc671y2pjfdj3vsj0av3xqz9n";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -193737,6 +193838,27 @@ self: {
        broken = true;
      }) {};
 
+  "rank2classes_1_3_1" = callPackage
+    ({ mkDerivation, base, distributive, doctest, markdown-unlit, tasty
+     , tasty-hunit, template-haskell, transformers
+     }:
+     mkDerivation {
+       pname = "rank2classes";
+       version = "1.3.1";
+       sha256 = "07ykacy93c1rgh9a5ndkkhaviyfr61xfhi430rpwamk4h6i6qiy3";
+       libraryHaskellDepends = [
+         base distributive template-haskell transformers
+       ];
+       testHaskellDepends = [
+         base distributive doctest tasty tasty-hunit
+       ];
+       testToolDepends = [ markdown-unlit ];
+       description = "standard type constructor class hierarchy, only with methods of rank 2 types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "rapid" = callPackage
     ({ mkDerivation, async, base, containers, foreign-store, stm }:
      mkDerivation {
@@ -195246,6 +195368,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "reanimate-svg_0_9_2_1" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, containers, hspec
+     , JuicyPixels, lens, linear, mtl, scientific, svg-tree, text
+     , transformers, vector, xml
+     }:
+     mkDerivation {
+       pname = "reanimate-svg";
+       version = "0.9.2.1";
+       sha256 = "018jkgiry2yaq7nl8sks4ahjdx5pjgdj99gc6k4l3rfmd1zxvsng";
+       libraryHaskellDepends = [
+         attoparsec base bytestring containers JuicyPixels lens linear mtl
+         scientific text transformers vector xml
+       ];
+       testHaskellDepends = [
+         attoparsec base hspec linear scientific svg-tree
+       ];
+       description = "SVG file loader and serializer";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "reason-export" = callPackage
     ({ mkDerivation, base, bytestring, containers, Diff, directory
      , formatting, hashable, hspec, hspec-core, HUnit, mtl, QuickCheck
@@ -203108,6 +203251,8 @@ self: {
        pname = "safecopy";
        version = "0.9.4.3";
        sha256 = "020z2cdarpy8crz6b871lprgacwi6zsmmwml35ban93hdfjv2zbq";
+       revision = "1";
+       editedCabalFile = "060yxbk2fy5gddnpf6kxppc9fwkhiyldm39bj7873wggnpdc2xds";
        libraryHaskellDepends = [
          array base bytestring cereal containers old-time template-haskell
          text time vector
@@ -206144,6 +206289,30 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {inherit (pkgs) secp256k1;};
 
+  "secp256k1-haskell_0_1_5" = callPackage
+    ({ mkDerivation, base, base16-bytestring, bytestring, cereal
+     , entropy, hashable, hspec, hspec-discover, HUnit, mtl, QuickCheck
+     , secp256k1, string-conversions
+     }:
+     mkDerivation {
+       pname = "secp256k1-haskell";
+       version = "0.1.5";
+       sha256 = "1s989dk7zncz68zl3k13dk8ap7dq5k4m2kwimpbicizxfnl7gzfg";
+       libraryHaskellDepends = [
+         base base16-bytestring bytestring cereal entropy hashable
+         QuickCheck string-conversions
+       ];
+       librarySystemDepends = [ secp256k1 ];
+       testHaskellDepends = [
+         base base16-bytestring bytestring cereal entropy hashable hspec
+         HUnit mtl QuickCheck string-conversions
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Bindings for secp256k1 library from Bitcoin Core";
+       license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) secp256k1;};
+
   "secp256k1-legacy" = callPackage
     ({ mkDerivation, base, base16-bytestring, bytestring, Cabal, cereal
      , cryptohash, entropy, HUnit, mtl, QuickCheck, string-conversions
@@ -206298,6 +206467,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "selda_0_5_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, exceptions, mtl
+     , random, text, time, uuid-types
+     }:
+     mkDerivation {
+       pname = "selda";
+       version = "0.5.0.0";
+       sha256 = "1dsyc69fvqqhq9a9n97dnp81vvxxpf4dg4f5yan3fdr7zn9qgx3f";
+       libraryHaskellDepends = [
+         base bytestring containers exceptions mtl random text time
+         uuid-types
+       ];
+       description = "Multi-backend, high-level EDSL for interacting with SQL databases";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "selda-json" = callPackage
     ({ mkDerivation, aeson, base, bytestring, selda, text }:
      mkDerivation {
@@ -206311,6 +206497,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "selda-json_0_1_1_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, selda, text }:
+     mkDerivation {
+       pname = "selda-json";
+       version = "0.1.1.0";
+       sha256 = "1ai24qmz5nkpqx0zd24ix0ci5aqiccfy57fkf8f87swrv28101l8";
+       libraryHaskellDepends = [ aeson base bytestring selda text ];
+       description = "JSON support for the Selda database library";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "selda-postgresql" = callPackage
     ({ mkDerivation, base, bytestring, exceptions, postgresql-binary
      , postgresql-libpq, selda, selda-json, text, time, uuid-types
@@ -206489,6 +206687,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "semantic-source" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, deepseq, doctest
+     , generic-monoid, hashable, hedgehog, QuickCheck, semilattices
+     , tasty, tasty-hedgehog, tasty-hunit, text
+     }:
+     mkDerivation {
+       pname = "semantic-source";
+       version = "0.0.0.0";
+       sha256 = "1zvqr8a5pm32hcwxxgnbyp773ld4c29m20v7hghcmkgfdayps5r1";
+       libraryHaskellDepends = [
+         aeson base bytestring deepseq generic-monoid hashable semilattices
+         text
+       ];
+       testHaskellDepends = [
+         base doctest hedgehog QuickCheck tasty tasty-hedgehog tasty-hunit
+         text
+       ];
+       description = "Types and functionality for working with source code";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "semaphore-plus" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -210032,8 +210253,8 @@ self: {
      }:
      mkDerivation {
        pname = "serverless-haskell";
-       version = "0.8.10";
-       sha256 = "1gvswqkdk5awnvjqzvhbrvdmsyj73kiph872fvplmmdyvq8hb8gy";
+       version = "0.8.11";
+       sha256 = "1jvfjq7qlyqyprvhlk0licr8mrnc7xn5l4g3l95g3x4qii48j4s0";
        libraryHaskellDepends = [
          aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis
          amazonka-s3 base bytestring case-insensitive http-types iproute
@@ -210048,8 +210269,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Deploying Haskell code onto AWS Lambda using Serverless";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "serversession" = callPackage
@@ -210511,6 +210730,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "setlocale_1_0_0_9" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "setlocale";
+       version = "1.0.0.9";
+       sha256 = "18b6xafspzxrmz5m9r9nzy3z053crqi59xc8n8aqd4gw0pvqdcrv";
+       revision = "1";
+       editedCabalFile = "01i087l8v129q90jf09khaw5p4iqix5s17gzgfz2pbi030zhb82h";
+       libraryHaskellDepends = [ base ];
+       description = "Haskell bindings to setlocale";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "setoid" = callPackage
     ({ mkDerivation, base, containers, mtl, smallcheck, tasty
      , tasty-discover, tasty-hunit, tasty-quickcheck, tasty-smallcheck
@@ -212017,8 +212250,6 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "Simple shell scripting from Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shh-extras" = callPackage
@@ -212031,8 +212262,6 @@ self: {
        testHaskellDepends = [ base tasty ];
        description = "Utility functions for using shh";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shift" = callPackage
@@ -212258,6 +212487,8 @@ self: {
        pname = "show-combinators";
        version = "0.1.1.0";
        sha256 = "02h2fvmw22v1mpxlxn9c6p7as3xspvspdphybxapac4s50mvyfnm";
+       revision = "1";
+       editedCabalFile = "1zr6xw4fvgx187yiqy7n0r9mnasyv1hxg2q9xzw3lmsf4z3xz6y7";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Combinators to write Show instances";
@@ -213402,8 +213633,8 @@ self: {
     ({ mkDerivation, base, mtl, parsec, pretty, tasty, tasty-hunit }:
      mkDerivation {
        pname = "simple-sql-parser";
-       version = "0.5.0";
-       sha256 = "0d063wyrz8qynngy499i00hjkacd0xg01qni1wx2cbrcxg0xwcpd";
+       version = "0.6.0";
+       sha256 = "11jpqh00nfdldpanrcy01jd6xyg4xvz3b8g4csc8kswc47wff82i";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base mtl parsec pretty ];
@@ -225676,6 +225907,8 @@ self: {
        pname = "svfactor";
        version = "0.1";
        sha256 = "1vjdv7xgd33z3iwwlh8xwp9za06jvqxpbssc4m5bmcx1wihsnn35";
+       revision = "1";
+       editedCabalFile = "1ffm727zmg402s0v2mbcxjng6b0s1idci6x01njfw4s6zwl144fv";
        libraryHaskellDepends = [
          attoparsec base bifunctors bytestring charset deepseq lens parsec
          parsers semigroupoids semigroups text transformers trifecta
@@ -231793,16 +232026,19 @@ self: {
      }) {};
 
   "text-format-heavy" = callPackage
-    ({ mkDerivation, base, bytestring, containers, data-default, parsec
-     , text, time
+    ({ mkDerivation, base, bytestring, containers, data-default, hspec
+     , labels, parsec, template-haskell, text, th-lift
+     , th-lift-instances, time
      }:
      mkDerivation {
        pname = "text-format-heavy";
-       version = "0.1.5.2";
-       sha256 = "1rzzdbi16zndbsbsc83zd24ni2z1g6ndvjn3ylwagxr9xhh0iwp5";
+       version = "0.1.5.3";
+       sha256 = "00fz6s190jpqffx2i89rbmmc7959gh70bk3w8wcflcxkzcmf3wiv";
        libraryHaskellDepends = [
-         base bytestring containers data-default parsec text time
+         base bytestring containers data-default labels parsec
+         template-haskell text th-lift th-lift-instances time
        ];
+       testHaskellDepends = [ base hspec time ];
        description = "Full-weight string formatting library, analog of Python's string.format";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -238014,8 +238250,8 @@ self: {
     ({ mkDerivation, base, template-haskell, tree-sitter }:
      mkDerivation {
        pname = "tree-sitter-tsx";
-       version = "0.2.0.0";
-       sha256 = "16ql8b2dcp461182rsj2fdgz3z82jh351n436hl61jfja8dc15m8";
+       version = "0.2.1.0";
+       sha256 = "1lj2mmgqkswn8n5p4j4zdd0fw3syvg8v4d0ahnipvv1b05g1y1f4";
        libraryHaskellDepends = [ base template-haskell tree-sitter ];
        doHaddock = false;
        description = "Tree-sitter grammar/parser for TSX";
@@ -238028,8 +238264,8 @@ self: {
     ({ mkDerivation, base, template-haskell, tree-sitter }:
      mkDerivation {
        pname = "tree-sitter-typescript";
-       version = "0.2.0.0";
-       sha256 = "0pcxxgqz0w58fnfy1cbqwj7mmqj8nnkm2rkpp6h6agawsiswi8kz";
+       version = "0.2.1.0";
+       sha256 = "1dgb5b1yhpwrr8qd18l4jlxx3g5c34zaxffh934pssyldckfbid6";
        libraryHaskellDepends = [ base template-haskell tree-sitter ];
        doHaddock = false;
        description = "Tree-sitter grammar/parser for TypeScript";
@@ -238800,6 +239036,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ttl-hashtables_1_4_0_0" = callPackage
+    ({ mkDerivation, base, clock, containers, data-default, failable
+     , hashable, hashtables, hspec, mtl, transformers
+     }:
+     mkDerivation {
+       pname = "ttl-hashtables";
+       version = "1.4.0.0";
+       sha256 = "0s8ia8sd3j5k05gv57agbxar6bnpigwcy53ypz3j3pml90sdm820";
+       libraryHaskellDepends = [
+         base clock containers data-default failable hashable hashtables mtl
+         transformers
+       ];
+       testHaskellDepends = [
+         base clock containers data-default failable hashable hashtables
+         hspec mtl transformers
+       ];
+       description = "Extends hashtables so that entries added can be expired after a TTL";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ttn" = callPackage
     ({ mkDerivation, aeson, base, bytestring, hspec, hspec-expectations
      , raw-strings-qq, text, time, timerep
@@ -239226,6 +239483,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "turtle_1_5_15" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
+     , containers, criterion, directory, doctest, exceptions, fail
+     , foldl, hostname, managed, optional-args, optparse-applicative
+     , process, semigroups, stm, streaming-commons, system-fileio
+     , system-filepath, temporary, text, time, transformers, unix
+     , unix-compat
+     }:
+     mkDerivation {
+       pname = "turtle";
+       version = "1.5.15";
+       sha256 = "0yckgsc2a4g5x867gni80ldp226bsnhncfbil4ql6v2zwm4r8p7f";
+       libraryHaskellDepends = [
+         ansi-wl-pprint async base bytestring clock containers directory
+         exceptions foldl hostname managed optional-args
+         optparse-applicative process semigroups stm streaming-commons
+         system-fileio system-filepath temporary text time transformers unix
+         unix-compat
+       ];
+       testHaskellDepends = [
+         base doctest fail system-filepath temporary
+       ];
+       benchmarkHaskellDepends = [ base criterion text ];
+       description = "Shell programming, Haskell-style";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "turtle-options" = callPackage
     ({ mkDerivation, base, HUnit, optional-args, parsec, text, turtle
      }:
@@ -243777,15 +244062,16 @@ self: {
      }) {};
 
   "urbit-hob" = callPackage
-    ({ mkDerivation, base, bytestring, hspec, hspec-core, murmur3
-     , QuickCheck, text, vector
+    ({ mkDerivation, base, bytestring, criterion, deepseq, hspec
+     , hspec-core, murmur3, QuickCheck, text, vector
      }:
      mkDerivation {
        pname = "urbit-hob";
-       version = "0.2.0";
-       sha256 = "1wyvlwhc8pv4iv2dgkl5a7vz8pyykp42fmsr3ar08q58y7k269fg";
+       version = "0.3.0";
+       sha256 = "00ldbja79h5alf1wwxvrsah9v8fxam47cm2ypap9sni4w9kan5gk";
        libraryHaskellDepends = [ base bytestring murmur3 text vector ];
        testHaskellDepends = [ base hspec hspec-core QuickCheck text ];
+       benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "Hoon-style atom manipulation and printing functions";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -247726,8 +248012,8 @@ self: {
      }:
      mkDerivation {
        pname = "waargonaut";
-       version = "0.8.0.0";
-       sha256 = "1pvs379s1w5nzr5hb1c5fbbbjgvsnvggj3l1l5j6klm0zf1y7x4h";
+       version = "0.8.0.1";
+       sha256 = "1rfmj9c87ql6mfqspx58qpqx6k1pvvfvgngzbjfpdx62xknxflkf";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          attoparsec base bifunctors bytestring containers contravariant
@@ -249710,7 +249996,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "warp_3_3_1" = callPackage
+  "warp_3_3_2" = callPackage
     ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked
      , bytestring, case-insensitive, containers, directory, gauge
      , ghc-prim, hashable, hspec, http-client, http-date, http-types
@@ -249720,8 +250006,8 @@ self: {
      }:
      mkDerivation {
        pname = "warp";
-       version = "3.3.1";
-       sha256 = "0qay9h5cby5vcb1nkbrn4ch5xmj2i01g8f3psmvbgs854w2x0ygn";
+       version = "3.3.2";
+       sha256 = "1sh1jp27azf8zdzhaqg5ab8mky4wgdacwd5cd9zrk3dbbarkf94i";
        libraryHaskellDepends = [
          array async auto-update base bsb-http-chunked bytestring
          case-insensitive containers ghc-prim hashable http-date http-types
@@ -250561,8 +250847,8 @@ self: {
      }:
      mkDerivation {
        pname = "webby";
-       version = "0.1.1";
-       sha256 = "0415vhp8h3lr8wlfkg6a7njq19ka1wyi9klcmsd117phd9m46whb";
+       version = "0.1.3";
+       sha256 = "1ry3cbi9awpxvj8f84b65ml9f73n5c1nw0ckc32hg55cq84yva9f";
        libraryHaskellDepends = [
          aeson base binary bytestring fast-logger formatting http-api-data
          http-types monad-logger protolude resourcet text unliftio
@@ -252027,6 +252313,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "witherable_0_3_4" = callPackage
+    ({ mkDerivation, base, base-orphans, containers, hashable, lens
+     , monoidal-containers, transformers, transformers-compat
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "witherable";
+       version = "0.3.4";
+       sha256 = "19qkb8ww3vp446jr1yd4x4wxqm725lc6n2f3d1n3hb925x2djcd6";
+       libraryHaskellDepends = [
+         base base-orphans containers hashable lens monoidal-containers
+         transformers transformers-compat unordered-containers vector
+       ];
+       description = "filterable traversable";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "witness" = callPackage
     ({ mkDerivation, base, constraints, semigroupoids, transformers }:
      mkDerivation {
@@ -252290,6 +252594,17 @@ self: {
        broken = true;
      }) {};
 
+  "woe" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "woe";
+       version = "0.1.0.3";
+       sha256 = "0f0pa2vlp56j35llhzq1qqkwkfpm7r96av8jw22jngd0kcpc185b";
+       libraryHaskellDepends = [ base ];
+       description = "Convenient typeclass for defining arbitrary-index enums";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "woffex" = callPackage
     ({ mkDerivation, base, binary, bytestring, filepath, zlib }:
      mkDerivation {
@@ -255426,6 +255741,27 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
+  "xmonad-contrib_0_16" = callPackage
+    ({ mkDerivation, base, bytestring, containers, directory
+     , extensible-exceptions, filepath, mtl, old-locale, old-time
+     , process, random, semigroups, unix, utf8-string, X11, X11-xft
+     , xmonad
+     }:
+     mkDerivation {
+       pname = "xmonad-contrib";
+       version = "0.16";
+       sha256 = "1pddgkvnbww28wykncc7j0yb0lv15bk7xnnhdcbrwkxzw66w6wmd";
+       libraryHaskellDepends = [
+         base bytestring containers directory extensible-exceptions filepath
+         mtl old-locale old-time process random semigroups unix utf8-string
+         X11 X11-xft xmonad
+       ];
+       description = "Third party extensions for xmonad";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ peti ];
+     }) {};
+
   "xmonad-contrib-bluetilebranch" = callPackage
     ({ mkDerivation, base, containers, directory, extensible-exceptions
      , mtl, old-locale, old-time, process, random, unix, utf8-string
-- 
GitLab


From 38a0df1867f7ad330741fee9d2386feb67bc740a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Sep 2019 15:13:27 +0000
Subject: [PATCH 0751/2254] haskell-easytest: mark the build as broken when
 compiling with ghc-8.8.x

---
 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 143e7259d58..a233185cf4b 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -96,7 +96,8 @@ self: super: {
     url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/hedgehog-1.0.patch";
     sha256 = "16gadh1hb74jqvzc9c893sffb1y2vjglblyrqjwp7xfhccq7g8yw";
   });
-  easytest = self.easytest_0_3;
+  easytest = markBroken super.easytest;
+  easytest_0_3 = markBroken super.easytest_0_3;
   regex-tdfa = appendPatch super.regex-tdfa (pkgs.fetchpatch {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-tdfa-1.2.3.1.patch";
     sha256 = "1lhas4s2ms666prb475gaw2bqw1v4y8cxi66sy20j727sx7ppjs7";
-- 
GitLab


From 67202a95bafe821402b6b0c6486059faf2a0b2cb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 22 Sep 2019 14:09:50 +0200
Subject: [PATCH 0752/2254] python-mailmanclient: this package builds only with
 Python 3.x

(cherry picked from commit df74899305f863ba4f2956ebf64a9e84687aaaa7)
---
 pkgs/top-level/python-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 035d0d0aba2..6cc85b1e855 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -721,7 +721,7 @@ in {
 
   mailman-web = disabledIf (!isPy3k) (callPackage ../servers/mail/mailman/web.nix { });
 
-  mailmanclient = callPackage ../development/python-modules/mailmanclient { };
+  mailmanclient = disabledIf (!isPy3k) (callPackage ../development/python-modules/mailmanclient { });
 
   mailman-hyperkitty = callPackage ../development/python-modules/mailman-hyperkitty { };
 
-- 
GitLab


From 6a42202beb2637a9c2f70f2a1e462e9a53c9a496 Mon Sep 17 00:00:00 2001
From: Martin Milata <martin@martinmilata.cz>
Date: Sun, 22 Sep 2019 13:35:24 +0200
Subject: [PATCH 0753/2254] wordpress: 5.2.2 -> 5.2.3

https://wordpress.org/news/2019/09/wordpress-5-2-3-security-and-maintenance-release/
---
 pkgs/servers/web-apps/wordpress/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix
index 4a9af9d329c..9dbf060aa9a 100644
--- a/pkgs/servers/web-apps/wordpress/default.nix
+++ b/pkgs/servers/web-apps/wordpress/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "wordpress";
-  version = "5.2.2";
+  version = "5.2.3";
 
   src = fetchurl {
     url = "https://wordpress.org/${pname}-${version}.tar.gz";
-    sha256 = "08iilbvf1gam2nmacj0a8fgldnd2gighmslf9sny8dsdlqlwjgvq";
+    sha256 = "07gqdzhnqivyfah386lwyz984y9k2bc0hmji1y2pbvv0a60r63wr";
   };
 
   installPhase = ''
-- 
GitLab


From 2adb03fdaea6186299c6ff578bb6814d8f3bb30b Mon Sep 17 00:00:00 2001
From: Martin Milata <martin@martinmilata.cz>
Date: Sun, 22 Sep 2019 13:29:03 +0200
Subject: [PATCH 0754/2254] nixos/wordpress: generate secrets locally

Use /dev/urandom to generate keys and salts instead of downloading them
from https://api.wordpress.org/secret-key/1.1/salt/
---
 nixos/modules/services/web-apps/wordpress.nix | 22 ++++++++++++-------
 nixos/tests/wordpress.nix                     | 11 +++++-----
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/nixos/modules/services/web-apps/wordpress.nix b/nixos/modules/services/web-apps/wordpress.nix
index 88475437058..e311dd917dd 100644
--- a/nixos/modules/services/web-apps/wordpress.nix
+++ b/nixos/modules/services/web-apps/wordpress.nix
@@ -61,6 +61,19 @@ let
     ?>
   '';
 
+  secretsVars = [ "AUTH_KEY" "SECURE_AUTH_KEY" "LOOGGED_IN_KEY" "NONCE_KEY" "AUTH_SALT" "SECURE_AUTH_SALT" "LOGGED_IN_SALT" "NONCE_SALT" ];
+  secretsScript = hostStateDir: ''
+    if ! test -e "${hostStateDir}/secret-keys.php"; then
+      umask 0177
+      echo "<?php" >> "${hostStateDir}/secret-keys.php"
+      ${concatMapStringsSep "\n" (var: ''
+        echo "define('${var}', '`tr -dc a-zA-Z0-9 </dev/urandom | head -c 64`');" >> "${hostStateDir}/secret-keys.php"
+      '') secretsVars}
+      echo "?>" >> "${hostStateDir}/secret-keys.php"
+      chmod 440 "${hostStateDir}/secret-keys.php"
+    fi
+  '';
+
   siteOpts = { lib, name, ... }:
     {
       options = {
@@ -340,14 +353,7 @@ in
           wantedBy = [ "multi-user.target" ];
           before = [ "phpfpm-wordpress-${hostName}.service" ];
           after = optional cfg.database.createLocally "mysql.service";
-          script = ''
-            if ! test -e "${stateDir hostName}/secret-keys.php"; then
-              echo "<?php" >> "${stateDir hostName}/secret-keys.php"
-              ${pkgs.curl}/bin/curl -s https://api.wordpress.org/secret-key/1.1/salt/ >> "${stateDir hostName}/secret-keys.php"
-              echo "?>" >> "${stateDir hostName}/secret-keys.php"
-              chmod 440 "${stateDir hostName}/secret-keys.php"
-            fi
-          '';
+          script = secretsScript (stateDir hostName);
 
           serviceConfig = {
             Type = "oneshot";
diff --git a/nixos/tests/wordpress.nix b/nixos/tests/wordpress.nix
index 774ef6293b5..c6acfa6c1f3 100644
--- a/nixos/tests/wordpress.nix
+++ b/nixos/tests/wordpress.nix
@@ -20,12 +20,6 @@ import ./make-test.nix ({ pkgs, ... }:
       };
 
       networking.hosts."127.0.0.1" = [ "site1.local" "site2.local" ];
-
-      # required for wordpress-init.service to succeed
-      systemd.tmpfiles.rules = [
-        "F /var/lib/wordpress/site1.local/secret-keys.php 0440 wordpress wwwrun - -"
-        "F /var/lib/wordpress/site2.local/secret-keys.php 0440 wordpress wwwrun - -"
-      ];
     };
 
   testScript = ''
@@ -37,6 +31,11 @@ import ./make-test.nix ({ pkgs, ... }:
 
     $machine->succeed("curl -L site1.local | grep 'Welcome to the famous'");
     $machine->succeed("curl -L site2.local | grep 'Welcome to the famous'");
+
+    $machine->succeed("systemctl --no-pager show wordpress-init-site1.local.service | grep 'ExecStart=.*status=0'");
+    $machine->succeed("systemctl --no-pager show wordpress-init-site2.local.service | grep 'ExecStart=.*status=0'");
+    $machine->succeed("grep -E '^define.*NONCE_SALT.{64,};\$' /var/lib/wordpress/site1.local/secret-keys.php");
+    $machine->succeed("grep -E '^define.*NONCE_SALT.{64,};\$' /var/lib/wordpress/site2.local/secret-keys.php");
   '';
 
 })
-- 
GitLab


From acd7c02ea9d913dd6275e6b0c4d4ff28fbe804aa Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sun, 22 Sep 2019 16:09:08 +0200
Subject: [PATCH 0755/2254] afew: propagate setuptools

---
 pkgs/applications/networking/mailreaders/afew/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/mailreaders/afew/default.nix b/pkgs/applications/networking/mailreaders/afew/default.nix
index cd512e77613..85b73141966 100644
--- a/pkgs/applications/networking/mailreaders/afew/default.nix
+++ b/pkgs/applications/networking/mailreaders/afew/default.nix
@@ -12,7 +12,7 @@ pythonPackages.buildPythonApplication rec {
   nativeBuildInputs = with pythonPackages; [ sphinx setuptools_scm ];
 
   propagatedBuildInputs = with pythonPackages; [
-    pythonPackages.notmuch chardet dkimpy
+    pythonPackages.setuptools pythonPackages.notmuch chardet dkimpy
   ] ++ stdenv.lib.optional (!pythonPackages.isPy3k) subprocess32;
 
   makeWrapperArgs = [
-- 
GitLab


From 82c316e952e85c377a777aaf509004e54408516a Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sun, 22 Sep 2019 15:58:42 +0200
Subject: [PATCH 0756/2254] radeon-profile: use Qt mkDerivation

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

diff --git a/pkgs/tools/misc/radeon-profile/default.nix b/pkgs/tools/misc/radeon-profile/default.nix
index 613ad263ed3..e687b30e834 100644
--- a/pkgs/tools/misc/radeon-profile/default.nix
+++ b/pkgs/tools/misc/radeon-profile/default.nix
@@ -1,6 +1,8 @@
-{ stdenv, fetchFromGitHub, qtbase, qtcharts, qmake, libXrandr, libdrm }:
+{ lib, mkDerivation, fetchFromGitHub
+, qtbase, qtcharts, qmake, libXrandr, libdrm
+}:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
 
   pname = "radeon-profile";
   version = "20170714";
@@ -20,7 +22,7 @@ stdenv.mkDerivation rec {
     cp ./radeon-profile $out/bin/radeon-profile
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Application to read current clocks of AMD Radeon cards";
     homepage    = https://github.com/marazmista/radeon-profile;
     license     = licenses.gpl2Plus;
-- 
GitLab


From f7e046831cfc2192f393a3bf3778d009362dd4f0 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sun, 22 Sep 2019 16:11:30 +0200
Subject: [PATCH 0757/2254] radeon-profile: 20170714 -> 20190903

---
 pkgs/tools/misc/radeon-profile/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/misc/radeon-profile/default.nix b/pkgs/tools/misc/radeon-profile/default.nix
index e687b30e834..90498767c99 100644
--- a/pkgs/tools/misc/radeon-profile/default.nix
+++ b/pkgs/tools/misc/radeon-profile/default.nix
@@ -5,7 +5,7 @@
 mkDerivation rec {
 
   pname = "radeon-profile";
-  version = "20170714";
+  version = "20190903";
 
   nativeBuildInputs = [ qmake ];
   buildInputs = [ qtbase qtcharts libXrandr libdrm ];
@@ -14,12 +14,12 @@ mkDerivation rec {
     owner  = "marazmista";
     repo   = "radeon-profile";
     rev    = version;
-    sha256 = "08fv824iq00zbl9xk9zsfs8gkk8rsy6jlxbmszrjfx7ji28hansd";
+    sha256 = "0ax5417q03xjwi3pn7yyjdb90ssaygdprfgb1pz9nkyk6773ckx5";
   }) + "/radeon-profile";
 
-  postInstall = ''
-    mkdir -p $out/bin
-    cp ./radeon-profile $out/bin/radeon-profile
+  preConfigure = ''
+    substituteInPlace radeon-profile.pro \
+      --replace "/usr/" "$out/"
   '';
 
   meta = with lib; {
-- 
GitLab


From fe5c9079fd15825a47fbc8afaa644c0dc8623064 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 22 Sep 2019 15:29:56 +0100
Subject: [PATCH 0758/2254] python.pkgs.flask_oauthlib: remove

deprecated by upstream & broken: https://github.com/lepture/flask-oauthlib
---
 .../python-modules/flask-oauthlib/default.nix | 29 -------------------
 pkgs/top-level/python-packages.nix            |  2 --
 2 files changed, 31 deletions(-)
 delete mode 100644 pkgs/development/python-modules/flask-oauthlib/default.nix

diff --git a/pkgs/development/python-modules/flask-oauthlib/default.nix b/pkgs/development/python-modules/flask-oauthlib/default.nix
deleted file mode 100644
index 58705751415..00000000000
--- a/pkgs/development/python-modules/flask-oauthlib/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub
-, flask, oauthlib, requests_oauthlib, flask_sqlalchemy
-, mock, nose}:
-buildPythonPackage rec {
-  pname = "Flask-OAuthlib";
-  version = "0.9.5";
-
-  src = fetchFromGitHub {
-    owner = "lepture";
-    repo = "flask-oauthlib";
-    rev = "v${version}";
-    sha256 = "1l82niwrpm7411xvwh65bj263si90kcbrbfg5fa52mpixhxcp40f";
-  };
-
-  buildInputs = [ mock nose ];
-  propagatedBuildInputs = [
-    flask flask_sqlalchemy oauthlib requests_oauthlib
-  ];
-
-  checkPhase = "nosetests -d";
-  doCheck = false; # request mocking fails
-
-  meta = with stdenv.lib; {
-    description = "OAuthlib implementation for Flask";
-    license = licenses.mit;
-    maintainers = [ maintainers.mic92 ];
-    homepage = https://github.com/lepture/flask-oauthlib;
-  };
-}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6cc85b1e855..59b0819eb36 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3113,8 +3113,6 @@ in {
 
   flask_migrate = callPackage ../development/python-modules/flask-migrate { };
 
-  flask_oauthlib = callPackage ../development/python-modules/flask-oauthlib { };
-
   flask-paginate = callPackage ../development/python-modules/flask-paginate { };
 
   flask_principal = callPackage ../development/python-modules/flask-principal { };
-- 
GitLab


From 083c3b9251f2fcd41d3081f3185731e1f231c9f1 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 22 Sep 2019 16:43:57 +0100
Subject: [PATCH 0759/2254] cask: Use generated src/version from Melpa

---
 pkgs/development/tools/cask/default.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/development/tools/cask/default.nix b/pkgs/development/tools/cask/default.nix
index f89bd1ddf02..71050356069 100644
--- a/pkgs/development/tools/cask/default.nix
+++ b/pkgs/development/tools/cask/default.nix
@@ -2,12 +2,8 @@
 
 stdenv.mkDerivation rec {
   pname = "cask";
-  version = "0.8.4";
 
-  src = fetchurl {
-    url = "https://github.com/cask/cask/archive/v${version}.tar.gz";
-    sha256 = "02f8bb20b33b23fb11e7d2a1d282519dfdb8b3090b9672448b8c2c2cacd3e478";
-  };
+  inherit (emacsPackages.melpaStablePackages.cask) src version;
 
   doCheck = true;
 
-- 
GitLab


From 7ff2638b7f6a72e47055173269ef00fd624a1d38 Mon Sep 17 00:00:00 2001
From: Dima <dgoldin+github@protonmail.ch>
Date: Sun, 22 Sep 2019 16:27:36 +0200
Subject: [PATCH 0760/2254] pythonPackages.cairocffi: v1.0.2 -> v.1.1.0

The tests were failing due the switch to pytest5.
This issue has been addressed upstream in
https://github.com/Kozea/cairocffi/commit/a500f208660ba9861828a2a92b32c33565ee18fd
which is included in v.1.1.0, so bumping the version and
updating the old patch.

Hydra log of the failure:
https://hydra.nixos.org/build/100785460/nixlog/6
---
 .../python-modules/cairocffi/default.nix      |  4 +-
 .../cairocffi/dlopen-paths.patch              | 73 +++++++++++--------
 2 files changed, 46 insertions(+), 31 deletions(-)

diff --git a/pkgs/development/python-modules/cairocffi/default.nix b/pkgs/development/python-modules/cairocffi/default.nix
index f91b33d2010..574aeefa7fc 100644
--- a/pkgs/development/python-modules/cairocffi/default.nix
+++ b/pkgs/development/python-modules/cairocffi/default.nix
@@ -19,8 +19,8 @@
 }@args:
 
 import ./generic.nix ({
-  version = "1.0.2";
-  sha256 = "01ac51ae12c4324ca5809ce270f9dd1b67f5166fe63bd3e497e9ea3ca91946ff";
+  version = "1.1.0";
+  sha256 = "1nq53f5jipgy9jgyfxp43j40qfbmrhgn1cj8bp5rrb3liy3wbh7i";
   dlopen_patch = ./dlopen-paths.patch;
   disabled = pythonOlder "3.5";
   inherit withXcffib;
diff --git a/pkgs/development/python-modules/cairocffi/dlopen-paths.patch b/pkgs/development/python-modules/cairocffi/dlopen-paths.patch
index 10e2294981d..6542b4367eb 100644
--- a/pkgs/development/python-modules/cairocffi/dlopen-paths.patch
+++ b/pkgs/development/python-modules/cairocffi/dlopen-paths.patch
@@ -1,46 +1,61 @@
-commit 0435bc2577d4b18f54b78b2f5185abb2b2005982
-Author: Alexander V. Nikolaev <avn@avnik.info>
-Date:   Sat Feb 6 08:09:06 2016 +0200
+Patch dlopen() to allow direct paths to all required libs
 
-    Patch dlopen() to allow direct paths to all required libs
+This is an update of the patch submitted in
+https://github.com/NixOS/nixpkgs/commit/b13e44e094989d3a902f8c73b22e8d3c0cc7acf4
+by Alexander V. Nikolaev <avn@avnik.info>
 
-    This patch is NixOS specific
+---
+ cairocffi/__init__.py | 34 ++++++++++++++++------------------
+ 1 file changed, 16 insertions(+), 18 deletions(-)
 
 diff --git a/cairocffi/__init__.py b/cairocffi/__init__.py
-index 6061973..3538a58 100644
+index 307d58c..43c29e3 100644
 --- a/cairocffi/__init__.py
 +++ b/cairocffi/__init__.py
-@@ -21,19 +21,22 @@ VERSION = __version__ = (Path(__file__).parent / 'VERSION').read_text().strip()
- version = '1.16.0'
- version_info = (1, 16, 0)
+@@ -21,28 +21,26 @@ VERSION = __version__ = (Path(__file__).parent / 'VERSION').read_text().strip()
+ version = '1.17.2'
+ version_info = (1, 17, 2)
 
-+# Use hardcoded soname, because ctypes.util use gcc/objdump which shouldn't be required for runtime
++# Use hardcoded soname, because ctypes.util use gcc/objdump which shouldn't be
++# required for runtime
 +_LIBS = {
 +    'cairo': '@cairo@/lib/libcairo@ext@',
 +    'glib-2.0': '@glib@/lib/libglib-2.0@ext@',
 +    'gobject-2.0': '@glib@/lib/libgobject-2.0@ext@',
 +    'gdk_pixbuf-2.0': '@gdk_pixbuf@/lib/libgdk_pixbuf-2.0@ext@',
 +}
++
 
--def dlopen(ffi, *names):
-+def dlopen(ffi, name, *names):
+ def dlopen(ffi, library_names, filenames):
      """Try various names for the same library, for different platforms."""
--    for name in names:
--        for lib_name in (name, 'lib' + name):
--            try:
--                path = ctypes.util.find_library(lib_name)
--                lib = ffi.dlopen(path or lib_name)
--                if lib:
--                    return lib
--            except OSError:
--                pass
--    raise OSError("dlopen() failed to load a library: %s" % ' / '.join(names))
-+    path = _LIBS.get(name, None)
-+    if path:
-+        lib = ffi.dlopen(path)
-+        if lib:
-+            return lib
-+    raise OSError("dlopen() failed to load a library: %s as %s" % (name, path))
+-    exceptions = []
+-
+     for library_name in library_names:
+-        library_filename = find_library(library_name)
+-        if library_filename:
+-            filenames = (library_filename,) + filenames
+-        else:
+-            exceptions.append(
+-                'no library called "{}" was found'.format(library_name))
+-
+-    for filename in filenames:
+-        try:
+-            return ffi.dlopen(filename)
+-        except OSError as exception:  # pragma: no cover
+-            exceptions.append(exception)
+-
+-    error_message = '\n'.join(  # pragma: no cover
+-        str(exception) for exception in exceptions)
+-    raise OSError(error_message)  # pragma: no cover
++        path = _LIBS.get(library_name, None)
++        if path:
++            lib = ffi.dlopen(path)
++            if lib:
++                return lib
++
++    raise OSError("dlopen() failed to load a library: %s as %s" % (library_name, path))
 
 
- cairo = dlopen(ffi, 'cairo', 'cairo-2', 'cairo-gobject-2', 'cairo.so.2')
+ cairo = dlopen(
+--
+2.19.2
-- 
GitLab


From 8bfb67929dfeb48181c99f1b2d0fc09c0e6d9304 Mon Sep 17 00:00:00 2001
From: Riley Inman <rileyminman@gmail.com>
Date: Sun, 22 Sep 2019 14:04:58 -0400
Subject: [PATCH 0761/2254] iosevka: Append extraParameters instead of
 overwriting

---
 pkgs/data/fonts/iosevka/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix
index 10b0a0fd8f0..77946bd4133 100644
--- a/pkgs/data/fonts/iosevka/default.nix
+++ b/pkgs/data/fonts/iosevka/default.nix
@@ -46,7 +46,8 @@ stdenv.mkDerivation rec {
       remarshal -i "$privateBuildPlanJSONPath" -o private-build-plans.toml -if json -of toml
     ''}
     ${lib.optionalString (extraParameters != null) ''
-      remarshal -i "$extraParametersJSONPath" -o parameters.toml -if json -of toml
+      echo -e "\n" >> parameters.toml
+      remarshal -i "$extraParametersJSONPath" -if json -of toml >> parameters.toml
     ''}
     runHook postConfigure
   '';
-- 
GitLab


From e1ace0f772181f2f9cf8b728fb761f4f489d592a Mon Sep 17 00:00:00 2001
From: Riley Inman <rileyminman@gmail.com>
Date: Sun, 22 Sep 2019 14:07:10 -0400
Subject: [PATCH 0762/2254] iosevka: Add self as maintainer

---
 maintainers/maintainer-list.nix     | 6 ++++++
 pkgs/data/fonts/iosevka/default.nix | 8 +++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 3cb0cd3fa99..9e5138497ef 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5370,6 +5370,12 @@
     github = "rickynils";
     name = "Rickard Nilsson";
   };
+  rileyinman = {
+    email = "rileyminman@gmail.com";
+    github = "rileyinman";
+    githubId = 37246692;
+    name = "Riley Inman";
+  };
   ris = {
     email = "code@humanleg.org.uk";
     github = "risicle";
diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix
index 77946bd4133..9903cf72884 100644
--- a/pkgs/data/fonts/iosevka/default.nix
+++ b/pkgs/data/fonts/iosevka/default.nix
@@ -75,6 +75,12 @@ stdenv.mkDerivation rec {
     '';
     license = licenses.ofl;
     platforms = platforms.all;
-    maintainers = with maintainers; [ cstrahan jfrankenau ttuegel babariviere ];
+    maintainers = with maintainers; [
+      cstrahan
+      jfrankenau
+      ttuegel
+      babariviere
+      rileyinman
+    ];
   };
 }
-- 
GitLab


From 0ef7d0d90874ae61ae64c5184bb08c76ec6449a0 Mon Sep 17 00:00:00 2001
From: Riley Inman <rileyminman@gmail.com>
Date: Sun, 22 Sep 2019 14:10:04 -0400
Subject: [PATCH 0763/2254] iosevka: Declare version in mkDerivation

---
 pkgs/data/fonts/iosevka/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix
index 9903cf72884..0d0f76a943b 100644
--- a/pkgs/data/fonts/iosevka/default.nix
+++ b/pkgs/data/fonts/iosevka/default.nix
@@ -24,9 +24,9 @@ stdenv.mkDerivation rec {
     then "iosevka-${set}"
     else "iosevka";
 
-  inherit (src) version;
+  version = "2.3.0";
 
-  src = nodePackages."iosevka-https://github.com/be5invis/Iosevka/archive/v2.3.0.tar.gz";
+  src = nodePackages."iosevka-https://github.com/be5invis/Iosevka/archive/v${version}.tar.gz";
   sourceRoot = "${src.name}/lib/node_modules/iosevka";
 
   nativeBuildInputs = [
-- 
GitLab


From 3c10b93320b69fdb3df24e3f0fbcbe939bf0ead3 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sat, 21 Sep 2019 17:40:14 -0500
Subject: [PATCH 0764/2254] k9s: 0.7.13 -> 0.8.4

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/applications/networking/cluster/k9s/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix
index 5c0adbdc548..73d82207daf 100644
--- a/pkgs/applications/networking/cluster/k9s/default.nix
+++ b/pkgs/applications/networking/cluster/k9s/default.nix
@@ -2,18 +2,17 @@
 
 buildGoModule rec {
   pname = "k9s";
-  version = "0.7.13";
+  version = "0.8.4";
 
   src = fetchFromGitHub {
-    owner = "derailed";
-    repo = "k9s";
-    rev = version;
+    owner  = "derailed";
+    repo   = "k9s";
+    rev    = version;
     sha256 = "0wsj6wc2qi5708cg47l2qblq1cg8fcwxdygpkayib9hapx6lc6f8";
   };
 
   modSha256 = "1ia9wx6yd9mdr981lcw58xv39iqzz25r03bmn1c6byxmq2xpcjq8";
 
-
   meta = with stdenv.lib; {
     description = "Kubernetes CLI To Manage Your Clusters In Style.";
     homepage = https://github.com/derailed/k9s;
-- 
GitLab


From 96ffba10f5c959656314998f667f4999406b4144 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <sander.van.der.burg@mendix.com>
Date: Sun, 22 Sep 2019 21:18:54 +0200
Subject: [PATCH 0765/2254] daemon: init at 0.6.4

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

diff --git a/pkgs/tools/system/daemon/default.nix b/pkgs/tools/system/daemon/default.nix
new file mode 100644
index 00000000000..9bc6ecc6ddf
--- /dev/null
+++ b/pkgs/tools/system/daemon/default.nix
@@ -0,0 +1,25 @@
+{stdenv, fetchurl, perl}:
+
+stdenv.mkDerivation {
+  name = "daemon-0.6.4";
+  src = fetchurl {
+    url = http://libslack.org/daemon/download/daemon-0.6.4.tar.gz;
+    sha256 = "18aw0f8k3j30xqwv4z03962kdpqd10nf1w9liihylmadlx5fmff4";
+  };
+  makeFlags = "PREFIX=$(out)";
+  buildInputs = [ perl ];
+
+  meta = {
+    description = "Daemon turns other process into daemons";
+    longDescription = ''
+      Daemon turns other process into daemons. There are many tasks that need
+      to be performed to correctly set up a daemon process. This can be tedious.
+      Daemon performs these tasks for other processes. This is useful for
+      writing daemons in languages other than C, C++ or Perl (e.g. /bin/sh,
+      Java).
+    '';
+    license = stdenv.lib.licenses.gpl2Plus;
+    maintainers = [ stdenv.lib.maintainers.sander ];
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a2fbc80a9c6..d87090210ea 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2520,6 +2520,8 @@ in
 
   dadadodo = callPackage ../tools/text/dadadodo { };
 
+  daemon = callPackage ../tools/system/daemon { };
+
   daemonize = callPackage ../tools/system/daemonize { };
 
   daq = callPackage ../applications/networking/ids/daq { };
-- 
GitLab


From fa435f229182b9ec0237dfab28539826a4988222 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D1=83=D1=85=D0=B0=D1=80=D0=B8=D0=BA?=
 <suhr@i2pmail.org>
Date: Sun, 22 Sep 2019 22:24:03 +0300
Subject: [PATCH 0766/2254] kvirc: use qt5.mkDerivation

---
 pkgs/applications/networking/irc/kvirc/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/irc/kvirc/default.nix b/pkgs/applications/networking/irc/kvirc/default.nix
index bd38855109a..6fd66096b5b 100644
--- a/pkgs/applications/networking/irc/kvirc/default.nix
+++ b/pkgs/applications/networking/irc/kvirc/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchFromGitHub
+{ lib, mkDerivation, fetchFromGitHub
 , qtbase, qtmultimedia, qtsvg, qtx11extras
 , pkgconfig, cmake, gettext
 }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   pname = "kvirc";
   version = "5.0.0";
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     pkgconfig cmake gettext
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Advanced IRC Client";
     homepage = "http://www.kvirc.net/";
     license = licenses.gpl2;
-- 
GitLab


From 6c038cd4094fa6f581234b51ee5515a1484c1d49 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sun, 22 Sep 2019 19:49:26 +0000
Subject: [PATCH 0767/2254] nixos/mailcatcher: add bind capabilities

---
 nixos/modules/services/mail/mailcatcher.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/mail/mailcatcher.nix b/nixos/modules/services/mail/mailcatcher.nix
index fa8d41e918d..f5b4508b335 100644
--- a/nixos/modules/services/mail/mailcatcher.nix
+++ b/nixos/modules/services/mail/mailcatcher.nix
@@ -3,7 +3,7 @@
 let
   cfg = config.services.mailcatcher;
 
-  inherit (lib) mkEnableOption mkIf mkOption types;
+  inherit (lib) mkEnableOption mkIf mkOption types optionalString;
 in
 {
   # interface
@@ -54,6 +54,7 @@ in
         DynamicUser = true;
         Restart = "always";
         ExecStart = "${pkgs.mailcatcher}/bin/mailcatcher --foreground --no-quit --http-ip ${cfg.http.ip} --http-port ${toString cfg.http.port} --smtp-ip ${cfg.smtp.ip} --smtp-port ${toString cfg.smtp.port}";
+        AmbientCapabilities = optionalString (cfg.http.port < 1024 || cfg.smtp.port < 1024) "cap_net_bind_service";
       };
     };
   };
-- 
GitLab


From 8109be4859615f624c16d1de8502eb7367434cc9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Sun, 22 Sep 2019 22:01:35 +0200
Subject: [PATCH 0768/2254] nixFlakes: 2.4pre20190913_a25c022 ->
 2.4pre20190922_382aa05

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

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 4d4f73ad7c2..518c1baad5a 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -201,12 +201,12 @@ in rec {
 
   nixFlakes = lib.lowPrio (callPackage common rec {
     name = "nix-2.4${suffix}";
-    suffix = "pre20190913_a25c022";
+    suffix = "pre20190922_382aa05";
     src = fetchFromGitHub {
       owner = "NixOS";
       repo = "nix";
-      rev = "a25c022af3fa0a35be406942869edae1bdff2cf8";
-      hash = "sha256-HIvgrkXxQ57TPcf2pn9PkSDzM4XOCwXa1zYyIvcAdpg=";
+      rev = "382aa05ff71b61379f5c2792eaf517bdf4a5c5bf";
+      hash = "sha256-k4vV3Q1YVmLd+49AETnsSGetpDjD6sdd9yBrnpi8Q3g=";
     };
     fromGit = true;
 
-- 
GitLab


From 162351011984d4698d478fb91ce67a3c4c4e29c0 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 16 Sep 2019 06:29:15 +0000
Subject: [PATCH 0769/2254] ocamlPackages.owee: 0.2 -> 0.3

Ensures compatibility with OCaml 4.08
---
 .../ocaml-modules/owee/default.nix            | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/ocaml-modules/owee/default.nix b/pkgs/development/ocaml-modules/owee/default.nix
index 7ac6af3edd9..9eb81003d47 100644
--- a/pkgs/development/ocaml-modules/owee/default.nix
+++ b/pkgs/development/ocaml-modules/owee/default.nix
@@ -1,25 +1,21 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib }:
+{ lib, buildDunePackage, fetchFromGitHub }:
 
-stdenv.mkDerivation rec {
-  name = "ocaml${ocaml.version}-owee-${version}";
-  version = "0.2";
+buildDunePackage rec {
+  minimumOCamlVersion = "4.06";
+  pname = "owee";
+  version = "0.3";
 
   src = fetchFromGitHub {
     owner = "let-def";
     repo = "owee";
     rev = "v${version}";
-    sha256 = "025a8sm03mm9qr7grdmdhzx7pyrd0dr7ndr5mbj5baalc0al132z";
+    sha256 = "0jp8ca57488d7sj2nqy4yxcdpda6sxx51yyi8k6888hbinhyqp0j";
   };
 
-  buildInputs = [ ocaml findlib ];
-
-  createFindlibDestdir = true;
-
   meta = {
     description = "An experimental OCaml library to work with DWARF format";
     inherit (src.meta) homepage;
-    inherit (ocaml.meta) platforms;
-    license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.vbgl ];
   };
 }
-- 
GitLab


From 8e3d4ec5800ebf50ad7c5039fe973f3bcfad91e4 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 16 Sep 2019 06:29:43 +0000
Subject: [PATCH 0770/2254] ocamlPackages.spacetime_lib: 0.1.0 -> 0.3.0

Ensures compatibility with OCaml 4.08
---
 .../ocaml-modules/spacetime_lib/default.nix   | 22 ++++++-------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/ocaml-modules/spacetime_lib/default.nix b/pkgs/development/ocaml-modules/spacetime_lib/default.nix
index 1eb789ec269..6b1b45cb2fb 100644
--- a/pkgs/development/ocaml-modules/spacetime_lib/default.nix
+++ b/pkgs/development/ocaml-modules/spacetime_lib/default.nix
@@ -1,30 +1,22 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, owee }:
+{ lib, fetchFromGitHub, buildDunePackage, owee }:
 
-if !stdenv.lib.versionAtLeast ocaml.version "4.04"
-then throw "spacetime_lib is not available for OCaml ${ocaml.version}" else
-
-stdenv.mkDerivation rec {
-  name = "ocaml${ocaml.version}-spacetime_lib-${version}";
-  version = "0.1.0";
+buildDunePackage rec {
+  pname = "spacetime_lib";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "lpw25";
     repo = "spacetime_lib";
     rev = version;
-    sha256 = "1g91y6wl3z18jhaz2q03wn54zj6xk1qcjidr1nc6nq9a8906lcq5";
+    sha256 = "0biisgbycr5v3nm5jp8i0h6vq76vzasdjkcgh8yr7fhxc81jgv3p";
   };
 
-  buildInputs = [ ocaml findlib ];
-
   propagatedBuildInputs = [ owee ];
 
-  createFindlibDestdir = true;
-
   meta = {
     description = "An OCaml library providing some simple operations for handling OCaml “spacetime” profiles";
     inherit (src.meta) homepage;
-    inherit (ocaml.meta) platforms;
-    license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.vbgl ];
   };
 }
-- 
GitLab


From 698b06dfe4ae4cd2ade23ca5a07cb7bdf2398067 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sun, 22 Sep 2019 20:21:27 +0000
Subject: [PATCH 0771/2254] qhull: specify spdx license

---
 lib/licenses.nix                             | 5 +++++
 pkgs/development/libraries/qhull/default.nix | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/licenses.nix b/lib/licenses.nix
index 83e1ec7748d..236250c8b9f 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -613,6 +613,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) {
     url = https://enterprise.dejacode.com/licenses/public/purdue-bsd;
   };
 
+  qhull = spdx {
+    spdxId = "Qhull";
+    fullName = "Qhull License";
+  };
+
   qpl = spdx {
     spdxId = "QPL-1.0";
     fullName = "Q Public License 1.0";
diff --git a/pkgs/development/libraries/qhull/default.nix b/pkgs/development/libraries/qhull/default.nix
index 92f927ee398..323171212be 100644
--- a/pkgs/development/libraries/qhull/default.nix
+++ b/pkgs/development/libraries/qhull/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   meta = with stdenv.lib; {
     homepage = http://www.qhull.org/;
     description = "Compute the convex hull, Delaunay triangulation, Voronoi diagram and more";
-    license = licenses.free;
+    license = licenses.qhull;
     platforms = platforms.unix;
     maintainers = with maintainers; [ orivej ];
   };
-- 
GitLab


From 8bec8df663f3ee78c7e023766f86c70cb188f563 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sun, 22 Sep 2019 20:33:44 +0000
Subject: [PATCH 0772/2254] licenses: refer to curl using spdx

---
 lib/licenses.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/licenses.nix b/lib/licenses.nix
index 236250c8b9f..986b7fa1fdd 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -218,9 +218,9 @@ lib.mapAttrs (n: v: v // { shortName = n; }) {
     fullName = "Common Public License 1.0";
   };
 
-  curl = {
-    fullName = "MIT/X11 derivate";
-    url = "https://curl.haxx.se/docs/copyright.html";
+  curl = spdx {
+    spdxId = "curl";
+    fullName = "curl License";
   };
 
   doc = spdx {
-- 
GitLab


From ac6521cdc93f0ae631dec9d669eceb26b6899adb Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sun, 22 Sep 2019 20:42:24 +0000
Subject: [PATCH 0773/2254] libipt: set platforms to unix

It builds on Darwin.
---
 pkgs/development/libraries/libipt/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libipt/default.nix b/pkgs/development/libraries/libipt/default.nix
index c61053ff693..792a74da581 100644
--- a/pkgs/development/libraries/libipt/default.nix
+++ b/pkgs/development/libraries/libipt/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     description = "Intel Processor Trace decoder library";
     homepage = https://github.com/intel/libipt;
     license = licenses.bsd3;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = with maintainers; [ orivej ];
   };
 }
-- 
GitLab


From 696b36f92851cda13da47df030bb2fbc65a52f8d Mon Sep 17 00:00:00 2001
From: Eric Ren <546296+rencire@users.noreply.github.com>
Date: Sun, 22 Sep 2019 14:18:08 -0700
Subject: [PATCH 0774/2254] lefthook: init at 0.6.3 (#69233)

lefthook: init at 0.6.3
---
 .../git-and-tools/default.nix                 |  2 ++
 .../git-and-tools/lefthook/default.nix        | 22 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 26 insertions(+)
 create mode 100644 pkgs/applications/version-management/git-and-tools/lefthook/default.nix

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index e64254ed29f..a0f39bad363 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -147,6 +147,8 @@ let
 
   lab = callPackage ./lab { };
 
+  lefthook = callPackage ./lefthook { };
+
   pre-commit = pkgs.python3Packages.toPythonApplication pkgs.python3Packages.pre-commit;
 
   pass-git-helper = python3Packages.callPackage ./pass-git-helper { };
diff --git a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix
new file mode 100644
index 00000000000..04ba4c7c48f
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+  pname = "lefthook";
+  version = "0.6.3";
+
+  src = fetchFromGitHub {
+    rev = "v${version}";
+    owner = "Arkweid";
+    repo = "lefthook";
+    sha256 = "01zvlw2yyxjg92d1qag1b42kc2kd68h4fmrv9y6ar7z0rw3p9a5d";
+  };
+
+  modSha256 = "0mjhw778x40c2plmjlkiry4rwvr9xkz65b88a61j86liv2plbmq2";
+
+  meta = with stdenv.lib; {
+    description = "Fast and powerful Git hooks manager for any type of projects";
+    homepage = "https://github.com/Arkweid/lefthook";
+    license = licenses.mit;
+    maintainers = with maintainers; [ rencire ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d87090210ea..02ab3c812b6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4227,6 +4227,8 @@ in
 
   lbreakout2 = callPackage ../games/lbreakout2 { };
 
+  lefthook = gitAndTools.lefthook;
+
   lego = callPackage ../tools/admin/lego { };
 
   leocad = callPackage ../applications/graphics/leocad { };
-- 
GitLab


From dfbbdfd387cbe951342694a8bed2a375a130d7ad Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 22 Sep 2019 16:20:00 -0500
Subject: [PATCH 0775/2254] xprite-editor: init at 2019-09-22

---
 pkgs/tools/misc/xprite-editor/default.nix | 43 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  4 +++
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/tools/misc/xprite-editor/default.nix

diff --git a/pkgs/tools/misc/xprite-editor/default.nix b/pkgs/tools/misc/xprite-editor/default.nix
new file mode 100644
index 00000000000..e2615bef6ce
--- /dev/null
+++ b/pkgs/tools/misc/xprite-editor/default.nix
@@ -0,0 +1,43 @@
+{ stdenv
+, fetchFromGitHub
+, rustPlatform
+, gtk3
+, AppKit
+, pkg-config
+, python3
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "xprite-editor-unstable";
+  version = "2019-09-22";
+
+  src = fetchFromGitHub {
+    owner = "rickyhan";
+    repo = "xprite-editor";
+    rev = "7f899dff982642927024540e4bafd74e4ea5e52a";
+    sha256 = "1k6k8y8gg1vdmyjz27q689q9rliw0rrnzwlpjcd4vlc6swaq9ahx";
+    fetchSubmodules = true;
+    # Rename unicode file name which leads to different checksums on HFS+
+    # vs. other filesystems because of unicode normalization.
+    postFetch = ''
+      mv $out/config/palettes/Sweet\ Guaran*.hex $out/config/palettes/Sweet\ Guarana.hex
+    '';
+  };
+
+  buildInputs = stdenv.lib.optionals stdenv.isLinux [ gtk3 ]
+    ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit ];
+
+  nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config python3 ];
+
+  cargoSha256 = "0cd58888l7pjmghin31ha780yhs2pz67b10jysyasdw0a88m0dwy";
+
+  cargoBuildFlags = [ "--bin" "xprite-native" ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/rickyhan/xprite-editor";
+    description = "Pixel art editor";
+    license = licenses.gpl3;
+    maintainers = [ maintainers.marsam ];
+    platforms = platforms.linux ++ platforms.darwin;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3fa376c4512..93b6ecc3314 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7130,6 +7130,10 @@ in
 
   xorriso = callPackage ../tools/cd-dvd/xorriso { };
 
+  xprite-editor = callPackage ../tools/misc/xprite-editor {
+    inherit (darwin.apple_sdk.frameworks) AppKit;
+  };
+
   xpf = callPackage ../tools/text/xml/xpf {
     libxml2 = libxml2Python;
   };
-- 
GitLab


From 067b4dbb931bec94976a7660353ce8617d558b29 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 22 Sep 2019 17:31:22 -0400
Subject: [PATCH 0776/2254] mariadb: add patch for missing libcrypt on darwin

Really fixes #69034
---
 pkgs/servers/sql/mariadb/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index 15553055457..b0fdd333238 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -3,7 +3,7 @@
 , libaio, libevent, jemalloc, cracklib, systemd, numactl, perl
 , fixDarwinDylibNames, cctools, CoreServices
 , asio, buildEnv, check, scons
-, less
+, less, fetchpatch
 , withoutClient ? false
 }:
 
@@ -56,7 +56,12 @@ common = rec { # attributes common to both builds
   patches = [
     ./cmake-includedir.patch
     ./cmake-libmariadb-includedir.patch
-  ];
+  ] ++ optional stdenv.hostPlatform.isDarwin (fetchpatch {
+    url = "https://github.com/MariaDB/mariadb-connector-c/commit/ee91b2c98a63acb787114dee4f2694e154630928.patch";
+    extraPrefix = "libmariadb/";
+    sha256 = "06i865zwyhs9fvrgmargzn09pbg1cmably3c4wifd241bj8ig8qk";
+    stripLen = 1;
+  });
 
   cmakeFlags = [
     "-DBUILD_CONFIG=mysql_release"
-- 
GitLab


From de15e981f61f7eedebf97a14e7ee82aac3f4f297 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 22 Sep 2019 17:36:14 -0400
Subject: [PATCH 0777/2254] dolphin: add baloo to propagatedUseEnvPkgs

This is needed for "Search for..." feature in dolphin.

Fixes #68174
---
 pkgs/applications/kde/dolphin.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/kde/dolphin.nix b/pkgs/applications/kde/dolphin.nix
index 241bb71983a..76d4e989e8c 100644
--- a/pkgs/applications/kde/dolphin.nix
+++ b/pkgs/applications/kde/dolphin.nix
@@ -15,6 +15,7 @@ mkDerivation {
     maintainers = [ lib.maintainers.ttuegel ];
   };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  propagatedUserEnvPkgs = [ baloo ];
   propagatedBuildInputs = [
     baloo baloo-widgets kactivities kbookmarks kcmutils kcompletion kconfig
     kcoreaddons kdelibs4support kdbusaddons kfilemetadata ki18n kiconthemes
-- 
GitLab


From 980c80c08d81d1647f3b80ba9369d437c52191e4 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 22 Sep 2019 17:39:21 -0400
Subject: [PATCH 0778/2254] aws-sdk-cpp: fix libatomic detection

Needed for https://hydra.nixos.org/build/100470050

/cc @lopsided98
---
 pkgs/development/libraries/aws-sdk-cpp/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix
index 1cc65b53b3e..6bfb80d3a17 100644
--- a/pkgs/development/libraries/aws-sdk-cpp/default.nix
+++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, curl, openssl, zlib
+{ lib, stdenv, fetchFromGitHub, cmake, curl, openssl, zlib, fetchpatch
 , aws-c-common, aws-c-event-stream, aws-checksums
 , CoreAudio, AudioToolbox
 , # Allow building a limited set of APIs, e.g. ["s3" "ec2"].
@@ -50,6 +50,13 @@ stdenv.mkDerivation rec {
 
   __darwinAllowLocalNetworking = true;
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/aws/aws-sdk-cpp/commit/42991ab549087c81cb630e5d3d2413e8a9cf8a97.patch";
+      sha256 = "0myq5cm3lvl5r56hg0sc0zyn1clbkd9ys0wr95ghw6bhwpvfv8gr";
+    })
+  ];
+
   meta = with lib; {
     description = "A C++ interface for Amazon Web Services";
     homepage = https://github.com/awslabs/aws-sdk-cpp;
-- 
GitLab


From 23399ff0127093081f51100068b1e412617a48e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Mon, 12 Aug 2019 02:26:04 +0200
Subject: [PATCH 0779/2254] libdrm: Add patch to fix musl build. Fixes #66441

(cherry picked from commit b577340eb5bc3b72549f0544b50e2e37df78bf12)

Co-authored-by: Matthew Bauer <mjbauer95@gmail.com>
---
 pkgs/development/libraries/libdrm/default.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
index 11fb21fe52e..d5cbbccba01 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchurl, pkgconfig, meson, ninja, libpthreadstubs, libpciaccess
-, withValgrind ? valgrind-light.meta.available, valgrind-light
+, withValgrind ? valgrind-light.meta.available, valgrind-light, fetchpatch
 }:
 
 stdenv.mkDerivation rec {
@@ -17,7 +17,15 @@ stdenv.mkDerivation rec {
   buildInputs = [ libpthreadstubs libpciaccess ]
     ++ lib.optional withValgrind valgrind-light;
 
-  patches = [ ./cross-build-nm-path.patch ];
+  patches = [ ./cross-build-nm-path.patch ] ++
+    lib.optionals stdenv.hostPlatform.isMusl [
+      # Fix tests not building on musl because they use the glibc-specific
+      # (non-POSIX) `ioctl()` type signature. See #66441.
+      (fetchpatch {
+        url = "https://raw.githubusercontent.com/openembedded/openembedded-core/30a2af80f5f8c8ddf0f619e4f50451b02baa22dd/meta/recipes-graphics/drm/libdrm/musl-ioctl.patch";
+        sha256 = "0rdmh4k5kb80hhk1sdhlil30yf0s8d8w0fnq0hzyvw3ir1mki3by";
+      })
+    ];
 
   postPatch = ''
     for a in */*-symbol-check ; do
-- 
GitLab


From ad22b9084df5c8f436f1b7b17e80e21e24d8ab4b Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 22 Sep 2019 20:14:05 -0400
Subject: [PATCH 0780/2254] treewide: replace daemon with enableDaemon

broken with the introducation of "daemon" in

https://github.com/NixOS/nixpkgs/commit/96ffba10f5c959656314998f667f4999406b4144
---
 pkgs/applications/networking/irc/quassel/default.nix | 12 ++++++------
 pkgs/tools/networking/p2p/amule/default.nix          |  4 ++--
 pkgs/top-level/all-packages.nix                      |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix
index 6aacdde544b..6addd66ac63 100644
--- a/pkgs/applications/networking/irc/quassel/default.nix
+++ b/pkgs/applications/networking/irc/quassel/default.nix
@@ -1,5 +1,5 @@
 { monolithic ? true # build monolithic Quassel
-, daemon ? false # build Quassel daemon
+, enableDaemon ? false # build Quassel daemon
 , client ? false # build Quassel client
 , tag ? "-kf5" # tag added to the package name
 , static ? false # link statically
@@ -21,11 +21,11 @@
 
 let
     buildClient = monolithic || client;
-    buildCore = monolithic || daemon;
+    buildCore = monolithic || enableDaemon;
 in
 
-assert monolithic -> !client && !daemon;
-assert client || daemon -> !monolithic;
+assert monolithic -> !client && !enableDaemon;
+assert client || enableDaemon -> !monolithic;
 assert !buildClient -> !withKDE; # KDE is used by the client only
 
 let
@@ -63,12 +63,12 @@ in with stdenv; mkDerivation rec {
   ]
     ++ edf static "STATIC"
     ++ edf monolithic "WANT_MONO"
-    ++ edf daemon "WANT_CORE"
+    ++ edf enableDaemon "WANT_CORE"
     ++ edf client "WANT_QTCLIENT"
     ++ edf withKDE "WITH_KDE";
 
   preFixup =
-    lib.optionalString daemon ''
+    lib.optionalString enableDaemon ''
         wrapProgram "$out/bin/quasselcore" --suffix PATH : "${qtbase.bin}/bin"
     '' +
     lib.optionalString buildClient ''
diff --git a/pkgs/tools/networking/p2p/amule/default.nix b/pkgs/tools/networking/p2p/amule/default.nix
index b9a4360abfb..0a240248806 100644
--- a/pkgs/tools/networking/p2p/amule/default.nix
+++ b/pkgs/tools/networking/p2p/amule/default.nix
@@ -1,5 +1,5 @@
 { monolithic ? true # build monolithic amule
-, daemon ? false # build amule daemon
+, enableDaemon ? false # build amule daemon
 , httpServer ? false # build web interface for the daemon
 , client ? false # build amule remote gui
 , fetchurl, stdenv, zlib, wxGTK, perl, cryptopp, libupnp, gettext, libpng ? null
@@ -32,7 +32,7 @@ mkDerivation rec {
     "--disable-debug"
     "--enable-optimize"
     (stdenv.lib.enableFeature monolithic "monolithic")
-    (stdenv.lib.enableFeature daemon "amule-daemon")
+    (stdenv.lib.enableFeature enableDaemon "amule-daemon")
     (stdenv.lib.enableFeature client "amule-gui")
     (stdenv.lib.enableFeature httpServer "webserver")
   ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 02ab3c812b6..c6a018f7f2b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -716,7 +716,7 @@ in
 
   amuleDaemon = appendToName "daemon" (amule.override {
     monolithic = false;
-    daemon = true;
+    enableDaemon = true;
   });
 
   amuleGui = appendToName "gui" (amule.override {
@@ -20192,7 +20192,7 @@ in
 
   quasselDaemon = quassel.override {
     monolithic = false;
-    daemon = true;
+    enableDaemon = true;
     withKDE = false;
     tag = "-daemon-qt5";
   };
-- 
GitLab


From aed74e828479fcdc16593ca983ade1adff4a675e Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 22 Sep 2019 20:20:20 -0500
Subject: [PATCH 0781/2254] cargo-vendor: drop

Cargo 1.37 imported `cargo-vendor` as built-in command [1]

[1] https://github.com/rust-lang/cargo/pull/6869
---
 .../rust/cargo-vendor/cargo-vendor.nix        | 693 ------------------
 .../rust/cargo-vendor/default.nix             |  10 -
 .../rust/default-crate-overrides.nix          |   5 -
 pkgs/build-support/rust/fetchcargo.nix        |   4 +-
 pkgs/top-level/all-packages.nix               |   1 -
 5 files changed, 2 insertions(+), 711 deletions(-)
 delete mode 100644 pkgs/build-support/rust/cargo-vendor/cargo-vendor.nix
 delete mode 100644 pkgs/build-support/rust/cargo-vendor/default.nix

diff --git a/pkgs/build-support/rust/cargo-vendor/cargo-vendor.nix b/pkgs/build-support/rust/cargo-vendor/cargo-vendor.nix
deleted file mode 100644
index 9af5cbe652c..00000000000
--- a/pkgs/build-support/rust/cargo-vendor/cargo-vendor.nix
+++ /dev/null
@@ -1,693 +0,0 @@
-# Generated by carnix 0.10.0: carnix generate-nix --src .
-{ lib, buildPlatform, buildRustCrate, buildRustCrateHelpers, cratesIO, fetchgit }:
-with buildRustCrateHelpers;
-let inherit (lib.lists) fold;
-    inherit (lib.attrsets) recursiveUpdate;
-in
-rec {
-  crates = cratesIO // rec {
-# cargo-vendor-0.1.23
-
-    crates.cargo_vendor."0.1.23" = deps: { features?(features_.cargo_vendor."0.1.23" deps {}) }: buildRustCrate {
-      crateName = "cargo-vendor";
-      version = "0.1.23";
-      description = "A Cargo subcommand to vendor all crates.io dependencies onto the local\nfilesystem.\n";
-      authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
-      edition = "2018";
-      src = exclude [ ".git" "target" ] ./.;
-      dependencies = mapFeatures features ([
-        (cratesIO.crates."cargo"."${deps."cargo_vendor"."0.1.23"."cargo"}" deps)
-        (cratesIO.crates."docopt"."${deps."cargo_vendor"."0.1.23"."docopt"}" deps)
-        (cratesIO.crates."env_logger"."${deps."cargo_vendor"."0.1.23"."env_logger"}" deps)
-        (cratesIO.crates."failure"."${deps."cargo_vendor"."0.1.23"."failure"}" deps)
-        (cratesIO.crates."serde"."${deps."cargo_vendor"."0.1.23"."serde"}" deps)
-        (cratesIO.crates."serde_json"."${deps."cargo_vendor"."0.1.23"."serde_json"}" deps)
-        (cratesIO.crates."toml"."${deps."cargo_vendor"."0.1.23"."toml"}" deps)
-      ]
-        ++ (if features.cargo_vendor."0.1.23".openssl or false then [ (cratesIO.crates.openssl."${deps."cargo_vendor"."0.1.23".openssl}" deps) ] else []));
-      features = mkFeatures (features."cargo_vendor"."0.1.23" or {});
-    };
-    features_.cargo_vendor."0.1.23" = deps: f: updateFeatures f (rec {
-      cargo."${deps.cargo_vendor."0.1.23".cargo}".default = true;
-      cargo_vendor."0.1.23".default = (f.cargo_vendor."0.1.23".default or true);
-      docopt."${deps.cargo_vendor."0.1.23".docopt}".default = true;
-      env_logger."${deps.cargo_vendor."0.1.23".env_logger}".default = true;
-      failure."${deps.cargo_vendor."0.1.23".failure}".default = true;
-      openssl = fold recursiveUpdate {} [
-        { "${deps.cargo_vendor."0.1.23".openssl}"."vendored" =
-          (f.openssl."${deps.cargo_vendor."0.1.23".openssl}"."vendored" or false) ||
-          (cargo_vendor."0.1.23"."vendored-openssl" or false) ||
-          (f."cargo_vendor"."0.1.23"."vendored-openssl" or false); }
-        { "${deps.cargo_vendor."0.1.23".openssl}".default = true; }
-      ];
-      serde = fold recursiveUpdate {} [
-        { "${deps.cargo_vendor."0.1.23".serde}"."derive" = true; }
-        { "${deps.cargo_vendor."0.1.23".serde}".default = true; }
-      ];
-      serde_json."${deps.cargo_vendor."0.1.23".serde_json}".default = true;
-      toml."${deps.cargo_vendor."0.1.23".toml}".default = true;
-    }) [
-      (cratesIO.features_.cargo."${deps."cargo_vendor"."0.1.23"."cargo"}" deps)
-      (cratesIO.features_.docopt."${deps."cargo_vendor"."0.1.23"."docopt"}" deps)
-      (cratesIO.features_.env_logger."${deps."cargo_vendor"."0.1.23"."env_logger"}" deps)
-      (cratesIO.features_.failure."${deps."cargo_vendor"."0.1.23"."failure"}" deps)
-      (cratesIO.features_.openssl."${deps."cargo_vendor"."0.1.23"."openssl"}" deps)
-      (cratesIO.features_.serde."${deps."cargo_vendor"."0.1.23"."serde"}" deps)
-      (cratesIO.features_.serde_json."${deps."cargo_vendor"."0.1.23"."serde_json"}" deps)
-      (cratesIO.features_.toml."${deps."cargo_vendor"."0.1.23"."toml"}" deps)
-    ];
-
-
-# end
-
-  };
-
-  cargo_vendor = crates.crates.cargo_vendor."0.1.23" deps;
-  __all = [ (cargo_vendor {}) ];
-  deps.adler32."1.0.3" = {};
-  deps.aho_corasick."0.7.3" = {
-    memchr = "2.2.0";
-  };
-  deps.ansi_term."0.11.0" = {
-    winapi = "0.3.7";
-  };
-  deps.atty."0.2.11" = {
-    termion = "1.5.1";
-    libc = "0.2.51";
-    winapi = "0.3.7";
-  };
-  deps.autocfg."0.1.2" = {};
-  deps.backtrace."0.3.15" = {
-    cfg_if = "0.1.7";
-    rustc_demangle = "0.1.14";
-    autocfg = "0.1.2";
-    backtrace_sys = "0.1.28";
-    libc = "0.2.51";
-    winapi = "0.3.7";
-  };
-  deps.backtrace_sys."0.1.28" = {
-    libc = "0.2.51";
-    cc = "1.0.35";
-  };
-  deps.bitflags."1.0.4" = {};
-  deps.bstr."0.1.2" = {
-    memchr = "2.2.0";
-  };
-  deps.build_const."0.2.1" = {};
-  deps.byteorder."1.3.1" = {};
-  deps.bytes."0.4.12" = {
-    byteorder = "1.3.1";
-    iovec = "0.1.2";
-  };
-  deps.bytesize."1.0.0" = {};
-  deps.cargo."0.35.0" = {
-    atty = "0.2.11";
-    byteorder = "1.3.1";
-    bytesize = "1.0.0";
-    clap = "2.33.0";
-    crates_io = "0.23.0";
-    crossbeam_utils = "0.6.5";
-    crypto_hash = "0.3.3";
-    curl = "0.4.21";
-    curl_sys = "0.4.18";
-    env_logger = "0.6.1";
-    failure = "0.1.5";
-    filetime = "0.2.4";
-    flate2 = "1.0.7";
-    fs2 = "0.4.3";
-    git2 = "0.8.0";
-    git2_curl = "0.9.0";
-    glob = "0.2.11";
-    hex = "0.3.2";
-    home = "0.3.4";
-    ignore = "0.4.7";
-    im_rc = "12.3.4";
-    jobserver = "0.1.13";
-    lazy_static = "1.3.0";
-    lazycell = "1.2.1";
-    libc = "0.2.51";
-    libgit2_sys = "0.7.11";
-    log = "0.4.6";
-    num_cpus = "1.10.0";
-    opener = "0.3.2";
-    rustc_workspace_hack = "1.0.0";
-    rustfix = "0.4.5";
-    same_file = "1.0.4";
-    semver = "0.9.0";
-    serde = "1.0.90";
-    serde_ignored = "0.0.4";
-    serde_json = "1.0.39";
-    shell_escape = "0.1.4";
-    tar = "0.4.22";
-    tempfile = "3.0.7";
-    termcolor = "1.0.4";
-    toml = "0.4.10";
-    unicode_width = "0.1.5";
-    url = "1.7.2";
-    url_serde = "0.2.0";
-    core_foundation = "0.6.4";
-    fwdansi = "1.0.1";
-    miow = "0.3.3";
-    winapi = "0.3.7";
-  };
-  deps.cargo_vendor."0.1.23" = {
-    cargo = "0.35.0";
-    docopt = "1.1.0";
-    env_logger = "0.6.1";
-    failure = "0.1.5";
-    openssl = "0.10.20";
-    serde = "1.0.90";
-    serde_json = "1.0.39";
-    toml = "0.5.0";
-  };
-  deps.cc."1.0.35" = {};
-  deps.cfg_if."0.1.7" = {};
-  deps.clap."2.33.0" = {
-    atty = "0.2.11";
-    bitflags = "1.0.4";
-    strsim = "0.8.0";
-    textwrap = "0.11.0";
-    unicode_width = "0.1.5";
-    vec_map = "0.8.1";
-    ansi_term = "0.11.0";
-  };
-  deps.cloudabi."0.0.3" = {
-    bitflags = "1.0.4";
-  };
-  deps.commoncrypto."0.2.0" = {
-    commoncrypto_sys = "0.2.0";
-  };
-  deps.commoncrypto_sys."0.2.0" = {
-    libc = "0.2.51";
-  };
-  deps.core_foundation."0.6.4" = {
-    core_foundation_sys = "0.6.2";
-    libc = "0.2.51";
-  };
-  deps.core_foundation_sys."0.6.2" = {};
-  deps.crates_io."0.23.0" = {
-    curl = "0.4.21";
-    failure = "0.1.5";
-    http = "0.1.17";
-    serde = "1.0.90";
-    serde_derive = "1.0.90";
-    serde_json = "1.0.39";
-    url = "1.7.2";
-  };
-  deps.crc."1.8.1" = {
-    build_const = "0.2.1";
-  };
-  deps.crc32fast."1.2.0" = {
-    cfg_if = "0.1.7";
-  };
-  deps.crossbeam_channel."0.3.8" = {
-    crossbeam_utils = "0.6.5";
-    smallvec = "0.6.9";
-  };
-  deps.crossbeam_utils."0.6.5" = {
-    cfg_if = "0.1.7";
-    lazy_static = "1.3.0";
-  };
-  deps.crypto_hash."0.3.3" = {
-    hex = "0.3.2";
-    commoncrypto = "0.2.0";
-    openssl = "0.10.20";
-    winapi = "0.3.7";
-  };
-  deps.curl."0.4.21" = {
-    curl_sys = "0.4.18";
-    libc = "0.2.51";
-    socket2 = "0.3.8";
-    openssl_probe = "0.1.2";
-    openssl_sys = "0.9.43";
-    kernel32_sys = "0.2.2";
-    schannel = "0.1.15";
-    winapi = "0.2.8";
-  };
-  deps.curl_sys."0.4.18" = {
-    libc = "0.2.51";
-    libnghttp2_sys = "0.1.1";
-    libz_sys = "1.0.25";
-    cc = "1.0.35";
-    pkg_config = "0.3.14";
-    openssl_sys = "0.9.43";
-    winapi = "0.3.7";
-  };
-  deps.docopt."1.1.0" = {
-    lazy_static = "1.3.0";
-    regex = "1.1.6";
-    serde = "1.0.90";
-    strsim = "0.9.1";
-  };
-  deps.either."1.5.2" = {};
-  deps.env_logger."0.6.1" = {
-    atty = "0.2.11";
-    humantime = "1.2.0";
-    log = "0.4.6";
-    regex = "1.1.6";
-    termcolor = "1.0.4";
-  };
-  deps.failure."0.1.5" = {
-    backtrace = "0.3.15";
-    failure_derive = "0.1.5";
-  };
-  deps.failure_derive."0.1.5" = {
-    proc_macro2 = "0.4.27";
-    quote = "0.6.12";
-    syn = "0.15.32";
-    synstructure = "0.10.1";
-  };
-  deps.filetime."0.2.4" = {
-    cfg_if = "0.1.7";
-    redox_syscall = "0.1.54";
-    libc = "0.2.51";
-  };
-  deps.flate2."1.0.7" = {
-    crc32fast = "1.2.0";
-    libc = "0.2.51";
-    libz_sys = "1.0.25";
-    miniz_sys = "0.1.11";
-    miniz_oxide_c_api = "0.2.1";
-  };
-  deps.fnv."1.0.6" = {};
-  deps.foreign_types."0.3.2" = {
-    foreign_types_shared = "0.1.1";
-  };
-  deps.foreign_types_shared."0.1.1" = {};
-  deps.fs2."0.4.3" = {
-    libc = "0.2.51";
-    winapi = "0.3.7";
-  };
-  deps.fuchsia_cprng."0.1.1" = {};
-  deps.fwdansi."1.0.1" = {
-    memchr = "2.2.0";
-    termcolor = "1.0.4";
-  };
-  deps.git2."0.8.0" = {
-    bitflags = "1.0.4";
-    libc = "0.2.51";
-    libgit2_sys = "0.7.11";
-    log = "0.4.6";
-    url = "1.7.2";
-    openssl_probe = "0.1.2";
-    openssl_sys = "0.9.43";
-  };
-  deps.git2_curl."0.9.0" = {
-    curl = "0.4.21";
-    git2 = "0.8.0";
-    log = "0.4.6";
-    url = "1.7.2";
-  };
-  deps.glob."0.2.11" = {};
-  deps.globset."0.4.3" = {
-    aho_corasick = "0.7.3";
-    bstr = "0.1.2";
-    fnv = "1.0.6";
-    log = "0.4.6";
-    regex = "1.1.6";
-  };
-  deps.hashbrown."0.1.8" = {
-    byteorder = "1.3.1";
-    scopeguard = "0.3.3";
-  };
-  deps.hex."0.3.2" = {};
-  deps.home."0.3.4" = {
-    scopeguard = "0.3.3";
-    winapi = "0.3.7";
-  };
-  deps.http."0.1.17" = {
-    bytes = "0.4.12";
-    fnv = "1.0.6";
-    itoa = "0.4.3";
-  };
-  deps.humantime."1.2.0" = {
-    quick_error = "1.2.2";
-  };
-  deps.idna."0.1.5" = {
-    matches = "0.1.8";
-    unicode_bidi = "0.3.4";
-    unicode_normalization = "0.1.8";
-  };
-  deps.ignore."0.4.7" = {
-    crossbeam_channel = "0.3.8";
-    globset = "0.4.3";
-    lazy_static = "1.3.0";
-    log = "0.4.6";
-    memchr = "2.2.0";
-    regex = "1.1.6";
-    same_file = "1.0.4";
-    thread_local = "0.3.6";
-    walkdir = "2.2.7";
-    winapi_util = "0.1.2";
-  };
-  deps.im_rc."12.3.4" = {
-    sized_chunks = "0.1.3";
-    typenum = "1.10.0";
-    rustc_version = "0.2.3";
-  };
-  deps.iovec."0.1.2" = {
-    libc = "0.2.51";
-    winapi = "0.2.8";
-  };
-  deps.itertools."0.7.11" = {
-    either = "1.5.2";
-  };
-  deps.itoa."0.4.3" = {};
-  deps.jobserver."0.1.13" = {
-    log = "0.4.6";
-    libc = "0.2.51";
-    rand = "0.6.5";
-  };
-  deps.kernel32_sys."0.2.2" = {
-    winapi = "0.2.8";
-    winapi_build = "0.1.1";
-  };
-  deps.lazy_static."1.3.0" = {};
-  deps.lazycell."1.2.1" = {};
-  deps.libc."0.2.51" = {};
-  deps.libgit2_sys."0.7.11" = {
-    curl_sys = "0.4.18";
-    libc = "0.2.51";
-    libssh2_sys = "0.2.11";
-    libz_sys = "1.0.25";
-    cc = "1.0.35";
-    pkg_config = "0.3.14";
-    openssl_sys = "0.9.43";
-  };
-  deps.libnghttp2_sys."0.1.1" = {
-    libc = "0.2.51";
-    cc = "1.0.35";
-  };
-  deps.libssh2_sys."0.2.11" = {
-    libc = "0.2.51";
-    libz_sys = "1.0.25";
-    cc = "1.0.35";
-    pkg_config = "0.3.14";
-    openssl_sys = "0.9.43";
-  };
-  deps.libz_sys."1.0.25" = {
-    libc = "0.2.51";
-    cc = "1.0.35";
-    pkg_config = "0.3.14";
-  };
-  deps.lock_api."0.1.5" = {
-    scopeguard = "0.3.3";
-  };
-  deps.log."0.4.6" = {
-    cfg_if = "0.1.7";
-  };
-  deps.matches."0.1.8" = {};
-  deps.matrixmultiply."0.1.15" = {
-    rawpointer = "0.1.0";
-  };
-  deps.memchr."2.2.0" = {};
-  deps.miniz_sys."0.1.11" = {
-    libc = "0.2.51";
-    cc = "1.0.35";
-  };
-  deps.miniz_oxide."0.2.1" = {
-    adler32 = "1.0.3";
-  };
-  deps.miniz_oxide_c_api."0.2.1" = {
-    crc = "1.8.1";
-    libc = "0.2.51";
-    miniz_oxide = "0.2.1";
-    cc = "1.0.35";
-  };
-  deps.miow."0.3.3" = {
-    socket2 = "0.3.8";
-    winapi = "0.3.7";
-  };
-  deps.ndarray."0.12.1" = {
-    itertools = "0.7.11";
-    matrixmultiply = "0.1.15";
-    num_complex = "0.2.1";
-    num_traits = "0.2.6";
-  };
-  deps.num_complex."0.2.1" = {
-    num_traits = "0.2.6";
-  };
-  deps.num_traits."0.2.6" = {};
-  deps.num_cpus."1.10.0" = {
-    libc = "0.2.51";
-  };
-  deps.once_cell."0.1.8" = {
-    parking_lot = "0.7.1";
-  };
-  deps.opener."0.3.2" = {
-    failure = "0.1.5";
-    failure_derive = "0.1.5";
-    winapi = "0.3.7";
-  };
-  deps.openssl."0.10.20" = {
-    bitflags = "1.0.4";
-    cfg_if = "0.1.7";
-    foreign_types = "0.3.2";
-    lazy_static = "1.3.0";
-    libc = "0.2.51";
-    openssl_sys = "0.9.43";
-  };
-  deps.openssl_probe."0.1.2" = {};
-  deps.openssl_src."111.2.1+1.1.1b" = {
-    cc = "1.0.35";
-  };
-  deps.openssl_sys."0.9.43" = {
-    libc = "0.2.51";
-    cc = "1.0.35";
-    openssl_src = "111.2.1+1.1.1b";
-    pkg_config = "0.3.14";
-    rustc_version = "0.2.3";
-  };
-  deps.parking_lot."0.7.1" = {
-    lock_api = "0.1.5";
-    parking_lot_core = "0.4.0";
-  };
-  deps.parking_lot_core."0.4.0" = {
-    rand = "0.6.5";
-    smallvec = "0.6.9";
-    rustc_version = "0.2.3";
-    libc = "0.2.51";
-    winapi = "0.3.7";
-  };
-  deps.percent_encoding."1.0.1" = {};
-  deps.pkg_config."0.3.14" = {};
-  deps.proc_macro2."0.4.27" = {
-    unicode_xid = "0.1.0";
-  };
-  deps.quick_error."1.2.2" = {};
-  deps.quote."0.6.12" = {
-    proc_macro2 = "0.4.27";
-  };
-  deps.rand."0.6.5" = {
-    rand_chacha = "0.1.1";
-    rand_core = "0.4.0";
-    rand_hc = "0.1.0";
-    rand_isaac = "0.1.1";
-    rand_jitter = "0.1.3";
-    rand_os = "0.1.3";
-    rand_pcg = "0.1.2";
-    rand_xorshift = "0.1.1";
-    autocfg = "0.1.2";
-    libc = "0.2.51";
-    winapi = "0.3.7";
-  };
-  deps.rand_chacha."0.1.1" = {
-    rand_core = "0.3.1";
-    autocfg = "0.1.2";
-  };
-  deps.rand_core."0.3.1" = {
-    rand_core = "0.4.0";
-  };
-  deps.rand_core."0.4.0" = {};
-  deps.rand_hc."0.1.0" = {
-    rand_core = "0.3.1";
-  };
-  deps.rand_isaac."0.1.1" = {
-    rand_core = "0.3.1";
-  };
-  deps.rand_jitter."0.1.3" = {
-    rand_core = "0.4.0";
-    libc = "0.2.51";
-    winapi = "0.3.7";
-  };
-  deps.rand_os."0.1.3" = {
-    rand_core = "0.4.0";
-    rdrand = "0.4.0";
-    cloudabi = "0.0.3";
-    fuchsia_cprng = "0.1.1";
-    libc = "0.2.51";
-    winapi = "0.3.7";
-  };
-  deps.rand_pcg."0.1.2" = {
-    rand_core = "0.4.0";
-    autocfg = "0.1.2";
-  };
-  deps.rand_xorshift."0.1.1" = {
-    rand_core = "0.3.1";
-  };
-  deps.rawpointer."0.1.0" = {};
-  deps.rdrand."0.4.0" = {
-    rand_core = "0.3.1";
-  };
-  deps.redox_syscall."0.1.54" = {};
-  deps.redox_termios."0.1.1" = {
-    redox_syscall = "0.1.54";
-  };
-  deps.regex."1.1.6" = {
-    aho_corasick = "0.7.3";
-    memchr = "2.2.0";
-    regex_syntax = "0.6.6";
-    thread_local = "0.3.6";
-    utf8_ranges = "1.0.2";
-  };
-  deps.regex_syntax."0.6.6" = {
-    ucd_util = "0.1.3";
-  };
-  deps.remove_dir_all."0.5.1" = {
-    winapi = "0.3.7";
-  };
-  deps.rustc_demangle."0.1.14" = {};
-  deps.rustc_workspace_hack."1.0.0" = {};
-  deps.rustc_version."0.2.3" = {
-    semver = "0.9.0";
-  };
-  deps.rustfix."0.4.5" = {
-    failure = "0.1.5";
-    log = "0.4.6";
-    serde = "1.0.90";
-    serde_derive = "1.0.90";
-    serde_json = "1.0.39";
-  };
-  deps.ryu."0.2.7" = {};
-  deps.same_file."1.0.4" = {
-    winapi_util = "0.1.2";
-  };
-  deps.schannel."0.1.15" = {
-    lazy_static = "1.3.0";
-    winapi = "0.3.7";
-  };
-  deps.scopeguard."0.3.3" = {};
-  deps.semver."0.9.0" = {
-    semver_parser = "0.7.0";
-    serde = "1.0.90";
-  };
-  deps.semver_parser."0.7.0" = {};
-  deps.serde."1.0.90" = {
-    serde_derive = "1.0.90";
-  };
-  deps.serde_derive."1.0.90" = {
-    proc_macro2 = "0.4.27";
-    quote = "0.6.12";
-    syn = "0.15.32";
-  };
-  deps.serde_ignored."0.0.4" = {
-    serde = "1.0.90";
-  };
-  deps.serde_json."1.0.39" = {
-    itoa = "0.4.3";
-    ryu = "0.2.7";
-    serde = "1.0.90";
-  };
-  deps.shell_escape."0.1.4" = {};
-  deps.sized_chunks."0.1.3" = {
-    typenum = "1.10.0";
-  };
-  deps.smallvec."0.6.9" = {};
-  deps.socket2."0.3.8" = {
-    cfg_if = "0.1.7";
-    libc = "0.2.51";
-    redox_syscall = "0.1.54";
-    winapi = "0.3.7";
-  };
-  deps.strsim."0.8.0" = {};
-  deps.strsim."0.9.1" = {
-    hashbrown = "0.1.8";
-    ndarray = "0.12.1";
-  };
-  deps.syn."0.15.32" = {
-    proc_macro2 = "0.4.27";
-    quote = "0.6.12";
-    unicode_xid = "0.1.0";
-  };
-  deps.synstructure."0.10.1" = {
-    proc_macro2 = "0.4.27";
-    quote = "0.6.12";
-    syn = "0.15.32";
-    unicode_xid = "0.1.0";
-  };
-  deps.tar."0.4.22" = {
-    filetime = "0.2.4";
-    redox_syscall = "0.1.54";
-    libc = "0.2.51";
-  };
-  deps.tempfile."3.0.7" = {
-    cfg_if = "0.1.7";
-    rand = "0.6.5";
-    remove_dir_all = "0.5.1";
-    redox_syscall = "0.1.54";
-    libc = "0.2.51";
-    winapi = "0.3.7";
-  };
-  deps.termcolor."1.0.4" = {
-    wincolor = "1.0.1";
-  };
-  deps.termion."1.5.1" = {
-    libc = "0.2.51";
-    redox_syscall = "0.1.54";
-    redox_termios = "0.1.1";
-  };
-  deps.textwrap."0.11.0" = {
-    unicode_width = "0.1.5";
-  };
-  deps.thread_local."0.3.6" = {
-    lazy_static = "1.3.0";
-  };
-  deps.toml."0.4.10" = {
-    serde = "1.0.90";
-  };
-  deps.toml."0.5.0" = {
-    serde = "1.0.90";
-  };
-  deps.typenum."1.10.0" = {};
-  deps.ucd_util."0.1.3" = {};
-  deps.unicode_bidi."0.3.4" = {
-    matches = "0.1.8";
-  };
-  deps.unicode_normalization."0.1.8" = {
-    smallvec = "0.6.9";
-  };
-  deps.unicode_width."0.1.5" = {};
-  deps.unicode_xid."0.1.0" = {};
-  deps.url."1.7.2" = {
-    idna = "0.1.5";
-    matches = "0.1.8";
-    percent_encoding = "1.0.1";
-  };
-  deps.url_serde."0.2.0" = {
-    serde = "1.0.90";
-    url = "1.7.2";
-  };
-  deps.utf8_ranges."1.0.2" = {};
-  deps.vcpkg."0.2.6" = {};
-  deps.vec_map."0.8.1" = {};
-  deps.walkdir."2.2.7" = {
-    same_file = "1.0.4";
-    winapi = "0.3.7";
-    winapi_util = "0.1.2";
-  };
-  deps.winapi."0.2.8" = {};
-  deps.winapi."0.3.7" = {
-    winapi_i686_pc_windows_gnu = "0.4.0";
-    winapi_x86_64_pc_windows_gnu = "0.4.0";
-  };
-  deps.winapi_build."0.1.1" = {};
-  deps.winapi_i686_pc_windows_gnu."0.4.0" = {};
-  deps.winapi_util."0.1.2" = {
-    winapi = "0.3.7";
-  };
-  deps.winapi_x86_64_pc_windows_gnu."0.4.0" = {};
-  deps.wincolor."1.0.1" = {
-    winapi = "0.3.7";
-    winapi_util = "0.1.2";
-  };
-}
diff --git a/pkgs/build-support/rust/cargo-vendor/default.nix b/pkgs/build-support/rust/cargo-vendor/default.nix
deleted file mode 100644
index f252c6a6cb1..00000000000
--- a/pkgs/build-support/rust/cargo-vendor/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ callPackage, fetchFromGitHub }:
-
-((callPackage ./cargo-vendor.nix {}).cargo_vendor {}).overrideAttrs (attrs: {
-  src = fetchFromGitHub {
-    owner = "alexcrichton";
-    repo = "cargo-vendor";
-    rev = "9355661303ce2870d68a69d99953fce22581e31e";
-    sha256 = "0d4j3r09am3ynwhczimzv39264f5xz37jxa9js123y46w5by3wd2";
-  };
-})
diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix
index b3ab9f5ba78..1c4fe9daead 100644
--- a/pkgs/build-support/rust/default-crate-overrides.nix
+++ b/pkgs/build-support/rust/default-crate-overrides.nix
@@ -15,11 +15,6 @@ in
       ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security libiconv ];
   };
 
-  cargo-vendor = attrs: {
-    buildInputs = [ openssl zlib curl ]
-      ++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
-  };
-
   libz-sys = attrs: {
     buildInputs = [ pkgconfig zlib ];
     extraLinkFlags = ["-L${zlib.out}/lib"];
diff --git a/pkgs/build-support/rust/fetchcargo.nix b/pkgs/build-support/rust/fetchcargo.nix
index 4e6058383d4..bc80db0947b 100644
--- a/pkgs/build-support/rust/fetchcargo.nix
+++ b/pkgs/build-support/rust/fetchcargo.nix
@@ -1,4 +1,4 @@
-{ stdenv, cacert, git, cargo, cargo-vendor, python3 }:
+{ stdenv, cacert, git, cargo, python3 }:
 let cargo-vendor-normalise = stdenv.mkDerivation {
   name = "cargo-vendor-normalise";
   src = ./cargo-vendor-normalise.py;
@@ -20,7 +20,7 @@ in
 { name ? "cargo-deps", src, srcs, patches, sourceRoot, sha256, cargoUpdateHook ? "" }:
 stdenv.mkDerivation {
   name = "${name}-vendor";
-  nativeBuildInputs = [ cacert cargo-vendor git cargo-vendor-normalise cargo ];
+  nativeBuildInputs = [ cacert git cargo-vendor-normalise cargo ];
   inherit src srcs patches sourceRoot;
 
   phases = "unpackPhase patchPhase installPhase";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c6a018f7f2b..d9d1693aa9f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8319,7 +8319,6 @@ in
   buildRustCrateHelpers = callPackage ../build-support/rust/build-rust-crate/helpers.nix { };
   buildRustCrateTests = recurseIntoAttrs (callPackage ../build-support/rust/build-rust-crate/test { }).tests;
   cratesIO = callPackage ../build-support/rust/crates-io.nix { };
-  cargo-vendor = callPackage ../build-support/rust/cargo-vendor { };
 
   cargo-web = callPackage ../development/tools/cargo-web {
     inherit (darwin.apple_sdk.frameworks) CoreServices Security;
-- 
GitLab


From 76dc4b668bf5065550e53e19d98974592b37fbb8 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 23 Sep 2019 11:05:43 +0800
Subject: [PATCH 0782/2254] amule: cleanup

---
 pkgs/tools/networking/p2p/amule/default.nix   |  81 +++---
 .../tools/networking/p2p/amule/upnp-1.8.patch | 230 ------------------
 2 files changed, 50 insertions(+), 261 deletions(-)
 delete mode 100644 pkgs/tools/networking/p2p/amule/upnp-1.8.patch

diff --git a/pkgs/tools/networking/p2p/amule/default.nix b/pkgs/tools/networking/p2p/amule/default.nix
index 0a240248806..7f6aeace7b8 100644
--- a/pkgs/tools/networking/p2p/amule/default.nix
+++ b/pkgs/tools/networking/p2p/amule/default.nix
@@ -2,28 +2,53 @@
 , enableDaemon ? false # build amule daemon
 , httpServer ? false # build web interface for the daemon
 , client ? false # build amule remote gui
-, fetchurl, stdenv, zlib, wxGTK, perl, cryptopp, libupnp, gettext, libpng ? null
-, pkgconfig, makeWrapper, libX11 ? null }:
+, fetchFromGitHub, fetchpatch, stdenv, lib, zlib, wxGTK, perl, cryptopp, libupnp, gettext, libpng ? null
+, autoreconfHook, pkgconfig, makeWrapper, libX11 ? null }:
 
 assert httpServer -> libpng != null;
 assert client -> libX11 != null;
-with stdenv;
 
-mkDerivation rec {
-  name = "aMule-2.3.2";
+stdenv.mkDerivation rec {
+  pname = "amule";
+  version = "2.3.2";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/amule/${name}.tar.xz";
-    sha256 = "0a1rd33hjl30qyzgb5y8m7dxs38asci3kjnlvims1ky6r3yj0izn";
+  src = fetchFromGitHub {
+    owner = "amule-project";
+    repo = "amule";
+    rev = version;
+    sha256 = "010wxm6g9f92x6fympj501zbnjka32rzbx0sk3a2y4zpih5d2nsn";
   };
 
-  buildInputs =
-    [ zlib wxGTK perl cryptopp libupnp gettext pkgconfig makeWrapper ]
-    ++ lib.optional httpServer libpng
-    ++ lib.optional client libX11;
+  patches = [
+    (fetchpatch {
+      url = "https://patch-diff.githubusercontent.com/raw/amule-project/amule/pull/135.patch";
+      sha256 = "1n24r1j28083b8ipbnh1nf6i4j6vx59pdkfl1c0g6bb4psx9wvvi";
+      name = "libupnp_18.patch";
+    })
+  ];
+
+  postPatch = ''
+    substituteInPlace src/libs/ec/file_generator.pl \
+      --replace /usr/bin/perl ${perl}/bin/perl
+
+    # autotools expects these to be in the root
+    cp docs/{AUTHORS,README} .
+    cp docs/Changelog ./ChangeLog
+    cp docs/Changelog ./NEWS
+  '';
+
+  preAutoreconf = ''
+    pushd src/pixmaps/flags_xpm >/dev/null
+    ./makeflags.sh
+    popd >/dev/null
+  '';
 
-  # See: https://github.com/amule-project/amule/issues/126
-  patches = [ ./upnp-1.8.patch ];
+  nativeBuildInputs = [ autoreconfHook gettext makeWrapper pkgconfig ];
+
+  buildInputs = [
+    zlib wxGTK perl cryptopp libupnp
+  ] ++ lib.optional httpServer libpng
+    ++ lib.optional client libX11;
 
   enableParallelBuilding = true;
 
@@ -31,27 +56,21 @@ mkDerivation rec {
     "--with-crypto-prefix=${cryptopp}"
     "--disable-debug"
     "--enable-optimize"
-    (stdenv.lib.enableFeature monolithic "monolithic")
-    (stdenv.lib.enableFeature enableDaemon "amule-daemon")
-    (stdenv.lib.enableFeature client "amule-gui")
-    (stdenv.lib.enableFeature httpServer "webserver")
+    (lib.enableFeature monolithic   "monolithic")
+    (lib.enableFeature enableDaemon "amule-daemon")
+    (lib.enableFeature client       "amule-gui")
+    (lib.enableFeature httpServer   "webserver")
   ];
 
-  postConfigure = ''
-    sed -i "src/libs/ec/file_generator.pl"     \
-        -es'|/usr/bin/perl|${perl}/bin/perl|g'
-  '';
-
   # aMule will try to `dlopen' libupnp and libixml, so help it
   # find them.
   postInstall = lib.optionalString monolithic ''
-    wrapProgram "$out/bin/amule" --prefix LD_LIBRARY_PATH ":" "${libupnp}/lib"
+    wrapProgram $out/bin/amule \
+      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libupnp ]}
   '';
 
-  meta = {
-    homepage = http://amule.org/;
+  meta = with lib; {
     description = "Peer-to-peer client for the eD2K and Kademlia networks";
-
     longDescription = ''
       aMule is an eMule-like client for the eD2k and Kademlia
       networks, supporting multiple platforms.  Currently aMule
@@ -63,9 +82,9 @@ mkDerivation rec {
       applications.
     '';
 
-    license = stdenv.lib.licenses.gpl2Plus;
-
-    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;  # arbitrary choice
-    maintainers = [ stdenv.lib.maintainers.phreedom ];
+    homepage = "https://amule.org/";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ phreedom ];
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/tools/networking/p2p/amule/upnp-1.8.patch b/pkgs/tools/networking/p2p/amule/upnp-1.8.patch
deleted file mode 100644
index 3f5502582a2..00000000000
--- a/pkgs/tools/networking/p2p/amule/upnp-1.8.patch
+++ /dev/null
@@ -1,230 +0,0 @@
---- a/src/UPnPBase.cpp
-+++ b/src/UPnPBase.cpp
-@@ -29,22 +29,12 @@
-
- #ifdef ENABLE_UPNP
-
--// check for broken Debian-hacked libUPnP
- #include <upnp.h>
--#ifdef STRING_H			// defined in UpnpString.h Yes, I would have liked UPNPSTRING_H much better.
--#define BROKEN_DEBIAN_LIBUPNP
--#endif
-
- #include "UPnPBase.h"
-
- #include <algorithm>		// For transform()
-
--#ifdef BROKEN_DEBIAN_LIBUPNP
--  #define GET_UPNP_STRING(a) UpnpString_get_String(a)
--#else
--  #define GET_UPNP_STRING(a) (a)
--#endif
--
- std::string stdEmptyString;
-
- const char s_argument[] = "argument";
-@@ -1127,7 +1117,7 @@
-
-
- // This function is static
--int CUPnPControlPoint::Callback(Upnp_EventType EventType, void *Event, void * /*Cookie*/)
-+int CUPnPControlPoint::Callback(Upnp_EventType EventType, const void *Event, void * /*Cookie*/)
- {
- 	std::ostringstream msg;
- 	std::ostringstream msg2;
-@@ -1149,24 +1139,24 @@
- 		msg2<< "UPNP_DISCOVERY_SEARCH_RESULT: ";
- 		// UPnP Discovery
- upnpDiscovery:
--		struct Upnp_Discovery *d_event = (struct Upnp_Discovery *)Event;
-+		UpnpDiscovery *d_event = (UpnpDiscovery *)Event;
- 		IXML_Document *doc = NULL;
- 		int ret;
--		if (d_event->ErrCode != UPNP_E_SUCCESS) {
--			msg << UpnpGetErrorMessage(d_event->ErrCode) << ".";
-+		if (UpnpDiscovery_get_ErrCode(d_event) != UPNP_E_SUCCESS) {
-+			msg << UpnpGetErrorMessage(UpnpDiscovery_get_ErrCode(d_event)) << ".";
- 			AddDebugLogLineC(logUPnP, msg);
- 		}
- 		// Get the XML tree device description in doc
--		ret = UpnpDownloadXmlDoc(d_event->Location, &doc);
-+		ret = UpnpDownloadXmlDoc(UpnpDiscovery_get_Location_cstr(d_event), &doc);
- 		if (ret != UPNP_E_SUCCESS) {
- 			msg << "Error retrieving device description from " <<
--				d_event->Location << ": " <<
-+				UpnpDiscovery_get_Location_cstr(d_event) << ": " <<
- 				UpnpGetErrorMessage(ret) <<
- 				"(" << ret << ").";
- 			AddDebugLogLineC(logUPnP, msg);
- 		} else {
- 			msg2 << "Retrieving device description from " <<
--				d_event->Location << ".";
-+				UpnpDiscovery_get_Location_cstr(d_event) << ".";
- 			AddDebugLogLineN(logUPnP, msg2);
- 		}
- 		if (doc) {
-@@ -1195,7 +1185,7 @@
- 				}
- 				// Add the root device to our list
- 				upnpCP->AddRootDevice(rootDevice, urlBase,
--					d_event->Location, d_event->Expires);
-+					UpnpDiscovery_get_Location_cstr(d_event), UpnpDiscovery_get_Expires(d_event));
- 			}
- 			// Free the XML doc tree
- 			IXML::Document::Free(doc);
-@@ -1216,28 +1206,28 @@
- 	case UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE: {
- 		//fprintf(stderr, "Callback: UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE\n");
- 		// UPnP Device Removed
--		struct Upnp_Discovery *dab_event = (struct Upnp_Discovery *)Event;
--		if (dab_event->ErrCode != UPNP_E_SUCCESS) {
-+		UpnpDiscovery *dab_event = (UpnpDiscovery *)Event;
-+		if (UpnpDiscovery_get_ErrCode(dab_event) != UPNP_E_SUCCESS) {
- 			msg << "error(UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE): " <<
--				UpnpGetErrorMessage(dab_event->ErrCode) <<
-+				UpnpGetErrorMessage(UpnpDiscovery_get_ErrCode(dab_event)) <<
- 				".";
- 			AddDebugLogLineC(logUPnP, msg);
- 		}
--		std::string devType = dab_event->DeviceType;
-+		std::string devType = UpnpDiscovery_get_DeviceType_cstr(dab_event);
- 		// Check for an InternetGatewayDevice and removes it from the list
- 		std::transform(devType.begin(), devType.end(), devType.begin(), tolower);
- 		if (stdStringIsEqualCI(devType, UPnP::Device::IGW)) {
--			upnpCP->RemoveRootDevice(dab_event->DeviceId);
-+			upnpCP->RemoveRootDevice(UpnpDiscovery_get_DeviceID_cstr(dab_event));
- 		}
- 		break;
- 	}
- 	case UPNP_EVENT_RECEIVED: {
- 		//fprintf(stderr, "Callback: UPNP_EVENT_RECEIVED\n");
- 		// Event reveived
--		struct Upnp_Event *e_event = (struct Upnp_Event *)Event;
--		const std::string Sid = e_event->Sid;
-+		UpnpEvent *e_event = (UpnpEvent *)Event;
-+		const std::string Sid = UpnpEvent_get_SID_cstr(e_event);
- 		// Parses the event
--		upnpCP->OnEventReceived(Sid, e_event->EventKey, e_event->ChangedVariables);
-+		upnpCP->OnEventReceived(Sid, UpnpEvent_get_EventKey(e_event), UpnpEvent_get_ChangedVariables(e_event));
- 		break;
- 	}
- 	case UPNP_EVENT_SUBSCRIBE_COMPLETE:
-@@ -1252,16 +1242,15 @@
- 		//fprintf(stderr, "Callback: UPNP_EVENT_RENEWAL_COMPLETE\n");
- 		msg << "error(UPNP_EVENT_RENEWAL_COMPLETE): ";
- upnpEventRenewalComplete:
--		struct Upnp_Event_Subscribe *es_event =
--			(struct Upnp_Event_Subscribe *)Event;
--		if (es_event->ErrCode != UPNP_E_SUCCESS) {
-+		UpnpEventSubscribe *es_event = (UpnpEventSubscribe *)Event;
-+		if (UpnpEventSubscribe_get_ErrCode(es_event) != UPNP_E_SUCCESS) {
- 			msg << "Error in Event Subscribe Callback";
- 			UPnP::ProcessErrorMessage(
--				msg.str(), es_event->ErrCode, NULL, NULL);
-+				msg.str(), UpnpEventSubscribe_get_ErrCode(es_event), NULL, NULL);
- 		} else {
- #if 0
- 			TvCtrlPointHandleSubscribeUpdate(
--				GET_UPNP_STRING(es_event->PublisherUrl),
-+				UpnpEventSubscribe_get_PublisherUrl_cstr(es_event),
- 				es_event->Sid,
- 				es_event->TimeOut );
- #endif
-@@ -1280,29 +1269,29 @@
- 		msg << "error(UPNP_EVENT_SUBSCRIPTION_EXPIRED): ";
- 		msg2 << "UPNP_EVENT_SUBSCRIPTION_EXPIRED: ";
- upnpEventSubscriptionExpired:
--		struct Upnp_Event_Subscribe *es_event =
--			(struct Upnp_Event_Subscribe *)Event;
-+		UpnpEventSubscribe *es_event = (UpnpEventSubscribe *)Event;
- 		Upnp_SID newSID;
- 		memset(newSID, 0, sizeof(Upnp_SID));
- 		int TimeOut = 1801;
- 		int ret = UpnpSubscribe(
- 			upnpCP->m_UPnPClientHandle,
--			GET_UPNP_STRING(es_event->PublisherUrl),
-+
-+			UpnpEventSubscribe_get_PublisherUrl_cstr(es_event),
- 			&TimeOut,
- 			newSID);
- 		if (ret != UPNP_E_SUCCESS) {
- 			msg << "Error Subscribing to EventURL";
- 			UPnP::ProcessErrorMessage(
--				msg.str(), es_event->ErrCode, NULL, NULL);
-+				msg.str(), UpnpEventSubscribe_get_ErrCode(es_event), NULL, NULL);
- 		} else {
- 			ServiceMap::iterator it =
--				upnpCP->m_ServiceMap.find(GET_UPNP_STRING(es_event->PublisherUrl));
-+				upnpCP->m_ServiceMap.find(UpnpEventSubscribe_get_PublisherUrl_cstr(es_event));
- 			if (it != upnpCP->m_ServiceMap.end()) {
- 				CUPnPService &service = *(it->second);
- 				service.SetTimeout(TimeOut);
- 				service.SetSID(newSID);
- 				msg2 << "Re-subscribed to EventURL '" <<
--					GET_UPNP_STRING(es_event->PublisherUrl) <<
-+					UpnpEventSubscribe_get_PublisherUrl_cstr(es_event) <<
- 					"' with SID == '" <<
- 					newSID << "'.";
- 				AddDebugLogLineC(logUPnP, msg2);
-@@ -1321,17 +1310,16 @@
- 	case UPNP_CONTROL_ACTION_COMPLETE: {
- 		//fprintf(stderr, "Callback: UPNP_CONTROL_ACTION_COMPLETE\n");
- 		// This is here if we choose to do this asynchronously
--		struct Upnp_Action_Complete *a_event =
--			(struct Upnp_Action_Complete *)Event;
--		if (a_event->ErrCode != UPNP_E_SUCCESS) {
-+		UpnpActionComplete *a_event = (UpnpActionComplete *)Event;
-+		if (UpnpActionComplete_get_ErrCode(a_event) != UPNP_E_SUCCESS) {
- 			UPnP::ProcessErrorMessage(
- 				"UpnpSendActionAsync",
--				a_event->ErrCode, NULL,
--				a_event->ActionResult);
-+				UpnpActionComplete_get_ErrCode(a_event), NULL,
-+				UpnpActionComplete_get_ActionResult(a_event));
- 		} else {
- 			// Check the response document
- 			UPnP::ProcessActionResponse(
--				a_event->ActionResult,
-+				UpnpActionComplete_get_ActionResult(a_event),
- 				"<UpnpSendActionAsync>");
- 		}
- 		/* No need for any processing here, just print out results.
-@@ -1342,12 +1330,11 @@
- 	case UPNP_CONTROL_GET_VAR_COMPLETE: {
- 		//fprintf(stderr, "Callback: UPNP_CONTROL_GET_VAR_COMPLETE\n");
- 		msg << "error(UPNP_CONTROL_GET_VAR_COMPLETE): ";
--		struct Upnp_State_Var_Complete *sv_event =
--			(struct Upnp_State_Var_Complete *)Event;
--		if (sv_event->ErrCode != UPNP_E_SUCCESS) {
-+		UpnpStateVarComplete *sv_event = (UpnpStateVarComplete *)Event;
-+		if (UpnpStateVarComplete_get_ErrCode(sv_event) != UPNP_E_SUCCESS) {
- 			msg << "m_UpnpGetServiceVarStatusAsync";
- 			UPnP::ProcessErrorMessage(
--				msg.str(), sv_event->ErrCode, NULL, NULL);
-+				msg.str(), UpnpStateVarComplete_get_ErrCode(sv_event), NULL, NULL);
- 		} else {
- #if 0
- 			// Warning: The use of UpnpGetServiceVarStatus and
---- a/src/UPnPBase.h
-+++ b/src/UPnPBase.h
-@@ -490,9 +490,19 @@
- 	// Callback function
- 	static int Callback(
- 		Upnp_EventType EventType,
--		void* Event,
-+		const void* Event,
- 		void* Cookie);
-
-+#if UPNP_VERSION < 10800
-+	/* in libupnp 1.6 Event is not const */
-+	static int Callback(
-+		Upnp_EventType EventType,
-+		void* Event,
-+		void* Cookie) {
-+		return Callback(EventType, (const void *)Event, Cookie);
-+	}
-+#endif
-+
- private:
- 	void OnEventReceived(
- 		const std::string &Sid,
\ No newline at end of file
-- 
GitLab


From 4d178d9fd652a9a358654e0b1408a04d1eaf91d5 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 22 Sep 2019 22:22:22 -0500
Subject: [PATCH 0783/2254] caddy: 1.0.0 -> 1.0.3

---
 pkgs/servers/caddy/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix
index 675f1beb891..56fa95391cc 100644
--- a/pkgs/servers/caddy/default.nix
+++ b/pkgs/servers/caddy/default.nix
@@ -2,23 +2,23 @@
 
 buildGoModule rec {
   pname = "caddy";
-  version = "1.0.0";
+  version = "1.0.3";
 
-  goPackagePath = "github.com/mholt/caddy";
+  goPackagePath = "github.com/caddyserver/caddy";
 
   subPackages = [ "caddy" ];
 
   src = fetchFromGitHub {
-    owner = "mholt";
-    repo = "caddy";
+    owner = "caddyserver";
+    repo = pname;
     rev = "v${version}";
-    sha256 = "08hknms0lg5c6yhkz9g1i32d11xch2kqkjbk4w4kd1f1xpa6jvmz";
+    sha256 = "1n7i9w4vva5x5wry7gzkyfylk39x40ykv7ypf1ca3zbbk7w5x6mw";
   };
-  modSha256 = "02cb3swc180kh5vc2s5w8a6vidvw768l9bv5zg8zya183wzvfczs";
+  modSha256 = "0np0mbs0mrn8scqa0dgvi7ya1707b3883prdaf1whsqrcr71ig8q";
 
   buildFlagsArray = ''
     -ldflags=
-      -X github.com/mholt/caddy/caddy/caddymain.gitTag=v${version}
+      -s -w -X github.com/caddyserver/caddy/caddy/caddymain.gitTag=v${version}
   '';
 
   meta = with stdenv.lib; {
-- 
GitLab


From 239aafea69717489a7e0cd12acc0b572734a2f82 Mon Sep 17 00:00:00 2001
From: Bruno Bigras <bigras.bruno@gmail.com>
Date: Mon, 23 Sep 2019 00:23:56 -0400
Subject: [PATCH 0784/2254] beets: 1.4.7 -> 1.4.9

---
 pkgs/tools/audio/beets/default.nix | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix
index 21e748cc79d..241e552b05c 100644
--- a/pkgs/tools/audio/beets/default.nix
+++ b/pkgs/tools/audio/beets/default.nix
@@ -17,9 +17,12 @@
 , enableKeyfinder      ? true, keyfinder-cli ? null
 , enableKodiupdate     ? true
 , enableLastfm         ? true
+, enableLoadext        ? true
 , enableMpd            ? true
+, enablePlaylist       ? true
 , enableReplaygain     ? true, bs1770gain ? null
 , enableSonosUpdate    ? true
+, enableSubsonicupdate ? true
 , enableThumbnails     ? true
 , enableWeb            ? true
 
@@ -60,10 +63,13 @@ let
     kodiupdate = enableKodiupdate;
     lastgenre = enableLastfm;
     lastimport = enableLastfm;
+    loadext = enableLoadext;
     mpdstats = enableMpd;
     mpdupdate = enableMpd;
+    playlist = enablePlaylist;
     replaygain = enableReplaygain;
     sonosupdate = enableSonosUpdate;
+    subsonicupdate = enableSubsonicupdate;
     thumbnails = enableThumbnails;
     web = enableWeb;
   };
@@ -102,13 +108,13 @@ let
 
 in pythonPackages.buildPythonApplication rec {
   pname = "beets";
-  version = "1.4.7";
+  version = "1.4.9";
 
   src = fetchFromGitHub {
     owner = "beetbox";
     repo = "beets";
     rev = "v${version}";
-    sha256 = "17gfz0g7pqm6wha8zf63zpw07zgi787w1bjwdcxdh1l3z4m7jc9l";
+    sha256 = "1qxdqbzvz97zgykzdwn78g2xyxmg0q2jdb12dnjnrwvhmjv67vi8";
   };
 
   propagatedBuildInputs = [
@@ -127,6 +133,9 @@ in pythonPackages.buildPythonApplication rec {
     ++ optional (enableFetchart
               || enableEmbyupdate
               || enableKodiupdate
+              || enableLoadext
+              || enablePlaylist
+              || enableSubsonicupdate
               || enableAcousticbrainz)
                                     pythonPackages.requests
     ++ optional enableConvert       ffmpeg
@@ -160,14 +169,6 @@ in pythonPackages.buildPythonApplication rec {
   patches = [
     ./replaygain-default-bs1770gain.patch
     ./keyfinder-default-bin.patch
-
-    # Fix Python 3.7 compatibility
-    (fetchpatch {
-      url = "https://github.com/beetbox/beets/commit/"
-          + "15d44f02a391764da1ce1f239caef819f08beed8.patch";
-      sha256 = "12rjb4959nvnrm3fvvki7chxjkipa0cy8i0yi132xrcn8141dnpm";
-      excludes = [ "docs/changelog.rst" ];
-    })
   ];
 
   postPatch = ''
-- 
GitLab


From 97f2b7bfd7b0df4c005a47382232c3874b84a13c Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 13 Sep 2019 17:42:41 -0700
Subject: [PATCH 0785/2254] python.pkgs.pytest-check: init at 0.3.5

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

diff --git a/pkgs/development/python-modules/pytest-check/default.nix b/pkgs/development/python-modules/pytest-check/default.nix
new file mode 100644
index 00000000000..f91b8191eb1
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-check/default.nix
@@ -0,0 +1,29 @@
+{ stdenv
+, buildPythonPackage
+, fetchFromGitHub
+, pytest
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "pytest-check";
+  version = "0.3.5";
+
+  src = fetchFromGitHub {
+    owner = "okken";
+    repo = "pytest-check";
+    rev = version;
+    sha256 = "11wb4f4sp4cr5mzqdakrbycwgfr2p1sx1l91fa6525wnfvgc0qy3";
+  };
+
+  buildInputs = [ pytest ];
+
+  checkInputs = [ pytest pytestCheckHook ];
+
+  meta = with stdenv.lib; {
+    description = "pytest plugin allowing multiple failures per test";
+    homepage = https://github.com/okken/pytest-check;
+    license = licenses.mit;
+    maintainers = [ maintainers.flokli ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 96885a83ebb..d57b35db94a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1052,6 +1052,8 @@ in {
 
   pytest-click = callPackage ../development/python-modules/pytest-click { };
 
+  pytest-check = callPackage ../development/python-modules/pytest-check { };
+
   pytest-env = callPackage ../development/python-modules/pytest-env { };
 
   pytest-flask = callPackage ../development/python-modules/pytest-flask { };
-- 
GitLab


From 31aab48a0a2f8eef385e51bfd780f1af7cd2b952 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 23 Sep 2019 05:53:20 +0000
Subject: [PATCH 0786/2254] =?UTF-8?q?ocamlPackages.odoc:=201.3.0=20?=
 =?UTF-8?q?=E2=86=92=201.4.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Ensures compatibility with OCaml 4.08
---
 pkgs/development/ocaml-modules/odoc/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/ocaml-modules/odoc/default.nix b/pkgs/development/ocaml-modules/odoc/default.nix
index 0b342a654e6..75a2dab970e 100644
--- a/pkgs/development/ocaml-modules/odoc/default.nix
+++ b/pkgs/development/ocaml-modules/odoc/default.nix
@@ -1,22 +1,24 @@
-{ stdenv, fetchFromGitHub, buildDunePackage, cppo, bos, cmdliner, tyxml }:
+{ lib, fetchFromGitHub, buildDunePackage
+, astring, cmdliner, cppo, fpath, result, tyxml
+}:
 
 buildDunePackage rec {
   pname = "odoc";
-  version = "1.3.0";
+  version = "1.4.2";
 
   src = fetchFromGitHub {
     owner = "ocaml";
     repo = pname;
     rev = version;
-    sha256 = "0hjan5aj5zk8j8qyagv9r4hqm469mh207cv2m6kxwgnw0c3cz7sy";
+    sha256 = "0rvhx139jx6wmlfz355mja6mk03x4swq1xxvk5ky6jzhalq3cf5i";
   };
 
-  buildInputs = [ cppo bos cmdliner tyxml ];
+  buildInputs = [ astring cmdliner cppo fpath result tyxml ];
 
   meta = {
     description = "A documentation generator for OCaml";
-    license = stdenv.lib.licenses.isc;
-    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    license = lib.licenses.isc;
+    maintainers = [ lib.maintainers.vbgl ];
     inherit (src.meta) homepage;
   };
 }
-- 
GitLab


From 64accf2edf17efc6854792524557edc4f0f59b5f Mon Sep 17 00:00:00 2001
From: Riley Inman <rileyminman@gmail.com>
Date: Mon, 23 Sep 2019 02:03:10 -0400
Subject: [PATCH 0787/2254] iosevka: Merge node dependencies into nodePackages

---
 pkgs/data/fonts/iosevka/default.nix           |   20 +-
 pkgs/data/fonts/iosevka/generate.sh           |   10 -
 .../fonts/iosevka/node-packages-generated.nix | 3761 -----------------
 pkgs/data/fonts/iosevka/node-packages.json    |    3 -
 pkgs/data/fonts/iosevka/node-packages.nix     |   17 -
 pkgs/data/fonts/iosevka/package.json          |   26 +
 .../node-packages/node-packages-v10.json      |    1 +
 .../node-packages/node-packages-v10.nix       | 1869 ++++++--
 .../node-packages/node-packages-v12.nix       |   20 +-
 9 files changed, 1468 insertions(+), 4259 deletions(-)
 delete mode 100755 pkgs/data/fonts/iosevka/generate.sh
 delete mode 100644 pkgs/data/fonts/iosevka/node-packages-generated.nix
 delete mode 100644 pkgs/data/fonts/iosevka/node-packages.json
 delete mode 100644 pkgs/data/fonts/iosevka/node-packages.nix
 create mode 100644 pkgs/data/fonts/iosevka/package.json

diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix
index 0d0f76a943b..f8af1045652 100644
--- a/pkgs/data/fonts/iosevka/default.nix
+++ b/pkgs/data/fonts/iosevka/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, lib, pkgs
-, nodejs, remarshal, ttfautohint-nox, otfcc
+{ stdenv, lib, pkgs, fetchFromGitHub
+, nodejs, nodePackages, remarshal, ttfautohint-nox, otfcc
 
 # Custom font set options.
 # See https://github.com/be5invis/Iosevka#build-your-own-style
@@ -12,12 +12,6 @@
 
 assert (privateBuildPlan != null) -> set != null;
 
-let
-  nodePackages = import ./node-packages.nix {
-    inherit pkgs nodejs;
-    inherit (stdenv.hostPlatform) system;
-  };
-in
 stdenv.mkDerivation rec {
   pname =
     if set != null
@@ -26,11 +20,16 @@ stdenv.mkDerivation rec {
 
   version = "2.3.0";
 
-  src = nodePackages."iosevka-https://github.com/be5invis/Iosevka/archive/v${version}.tar.gz";
-  sourceRoot = "${src.name}/lib/node_modules/iosevka";
+  src = fetchFromGitHub {
+    owner = "be5invis";
+    repo = "Iosevka";
+    rev = version;
+    sha256 = "1qnbxhx9wvij9zia226mc3sy8j7bfsw5v1cvxvsbbwjskwqdamvv";
+  };
 
   nativeBuildInputs = [
     nodejs
+    nodePackages."iosevka-build-deps-../../data/fonts/iosevka"
     remarshal
     otfcc
     ttfautohint-nox
@@ -49,6 +48,7 @@ stdenv.mkDerivation rec {
       echo -e "\n" >> parameters.toml
       remarshal -i "$extraParametersJSONPath" -if json -of toml >> parameters.toml
     ''}
+    cp -r ${nodePackages."iosevka-build-deps-../../data/fonts/iosevka"}/lib/node_modules/iosevka-build-deps/* ./
     runHook postConfigure
   '';
 
diff --git a/pkgs/data/fonts/iosevka/generate.sh b/pkgs/data/fonts/iosevka/generate.sh
deleted file mode 100755
index 878e0665163..00000000000
--- a/pkgs/data/fonts/iosevka/generate.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env nix-shell
-#! nix-shell -I nixpkgs=../../../.. -i bash -p nodePackages.node2nix
-
-node2nix \
-	--nodejs-10 \
-	--input node-packages.json \
-	--output node-packages-generated.nix \
-	--composition node-packages.nix \
-	--node-env ./../../../development/node-packages/node-env.nix \
-	--development
diff --git a/pkgs/data/fonts/iosevka/node-packages-generated.nix b/pkgs/data/fonts/iosevka/node-packages-generated.nix
deleted file mode 100644
index 29c3f2def25..00000000000
--- a/pkgs/data/fonts/iosevka/node-packages-generated.nix
+++ /dev/null
@@ -1,3761 +0,0 @@
-# This file has been generated by node2nix 1.7.0. Do not edit!
-
-{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
-
-let
-  sources = {
-    "@babel/code-frame-7.5.5" = {
-      name = "_at_babel_slash_code-frame";
-      packageName = "@babel/code-frame";
-      version = "7.5.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz";
-        sha512 = "27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==";
-      };
-    };
-    "@babel/highlight-7.5.0" = {
-      name = "_at_babel_slash_highlight";
-      packageName = "@babel/highlight";
-      version = "7.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.5.0.tgz";
-        sha512 = "7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ==";
-      };
-    };
-    "JSONStream-1.3.5" = {
-      name = "JSONStream";
-      packageName = "JSONStream";
-      version = "1.3.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz";
-        sha512 = "E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==";
-      };
-    };
-    "abbrev-1.1.1" = {
-      name = "abbrev";
-      packageName = "abbrev";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz";
-        sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==";
-      };
-    };
-    "acorn-6.3.0" = {
-      name = "acorn";
-      packageName = "acorn";
-      version = "6.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-6.3.0.tgz";
-        sha512 = "/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA==";
-      };
-    };
-    "acorn-jsx-5.0.2" = {
-      name = "acorn-jsx";
-      packageName = "acorn-jsx";
-      version = "5.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.0.2.tgz";
-        sha512 = "tiNTrP1MP0QrChmD2DdupCr6HWSFeKVw5d/dHTu4Y7rkAkRhU/Dt7dphAfIUyxtHpl/eBVip5uTNSpQJHylpAw==";
-      };
-    };
-    "ajv-6.10.2" = {
-      name = "ajv";
-      packageName = "ajv";
-      version = "6.10.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz";
-        sha512 = "TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==";
-      };
-    };
-    "amdefine-1.0.1" = {
-      name = "amdefine";
-      packageName = "amdefine";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz";
-        sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5";
-      };
-    };
-    "ansi-escapes-3.2.0" = {
-      name = "ansi-escapes";
-      packageName = "ansi-escapes";
-      version = "3.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz";
-        sha512 = "cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==";
-      };
-    };
-    "ansi-regex-2.1.1" = {
-      name = "ansi-regex";
-      packageName = "ansi-regex";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz";
-        sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df";
-      };
-    };
-    "ansi-regex-3.0.0" = {
-      name = "ansi-regex";
-      packageName = "ansi-regex";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz";
-        sha1 = "ed0317c322064f79466c02966bddb605ab37d998";
-      };
-    };
-    "ansi-regex-4.1.0" = {
-      name = "ansi-regex";
-      packageName = "ansi-regex";
-      version = "4.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz";
-        sha512 = "1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==";
-      };
-    };
-    "ansi-styles-3.2.1" = {
-      name = "ansi-styles";
-      packageName = "ansi-styles";
-      version = "3.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz";
-        sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==";
-      };
-    };
-    "aproba-1.2.0" = {
-      name = "aproba";
-      packageName = "aproba";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz";
-        sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==";
-      };
-    };
-    "are-we-there-yet-1.1.5" = {
-      name = "are-we-there-yet";
-      packageName = "are-we-there-yet";
-      version = "1.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz";
-        sha512 = "5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==";
-      };
-    };
-    "argparse-1.0.10" = {
-      name = "argparse";
-      packageName = "argparse";
-      version = "1.0.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz";
-        sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==";
-      };
-    };
-    "asn1-0.2.4" = {
-      name = "asn1";
-      packageName = "asn1";
-      version = "0.2.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz";
-        sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==";
-      };
-    };
-    "assert-plus-1.0.0" = {
-      name = "assert-plus";
-      packageName = "assert-plus";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz";
-        sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525";
-      };
-    };
-    "astral-regex-1.0.0" = {
-      name = "astral-regex";
-      packageName = "astral-regex";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz";
-        sha512 = "+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==";
-      };
-    };
-    "asynckit-0.4.0" = {
-      name = "asynckit";
-      packageName = "asynckit";
-      version = "0.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz";
-        sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79";
-      };
-    };
-    "atob-2.1.2" = {
-      name = "atob";
-      packageName = "atob";
-      version = "2.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz";
-        sha512 = "Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==";
-      };
-    };
-    "aws-sign2-0.7.0" = {
-      name = "aws-sign2";
-      packageName = "aws-sign2";
-      version = "0.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz";
-        sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8";
-      };
-    };
-    "aws4-1.8.0" = {
-      name = "aws4";
-      packageName = "aws4";
-      version = "1.8.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz";
-        sha512 = "ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==";
-      };
-    };
-    "balanced-match-1.0.0" = {
-      name = "balanced-match";
-      packageName = "balanced-match";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz";
-        sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767";
-      };
-    };
-    "bcrypt-pbkdf-1.0.2" = {
-      name = "bcrypt-pbkdf";
-      packageName = "bcrypt-pbkdf";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz";
-        sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e";
-      };
-    };
-    "bezier-js-2.4.3" = {
-      name = "bezier-js";
-      packageName = "bezier-js";
-      version = "2.4.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bezier-js/-/bezier-js-2.4.3.tgz";
-        sha512 = "qAz1iAGoSE+kk5guAMyvoUgfHq+e5JwK5jRHh2/tuk4XDRUuECrrHLouN27jAzjhlJD2vAsBHofCi5sOn1jcbQ==";
-      };
-    };
-    "bindings-1.5.0" = {
-      name = "bindings";
-      packageName = "bindings";
-      version = "1.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz";
-        sha512 = "p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==";
-      };
-    };
-    "block-stream-0.0.9" = {
-      name = "block-stream";
-      packageName = "block-stream";
-      version = "0.0.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz";
-        sha1 = "13ebfe778a03205cfe03751481ebb4b3300c126a";
-      };
-    };
-    "bluebird-3.5.5" = {
-      name = "bluebird";
-      packageName = "bluebird";
-      version = "3.5.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz";
-        sha512 = "5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==";
-      };
-    };
-    "brace-expansion-1.1.11" = {
-      name = "brace-expansion";
-      packageName = "brace-expansion";
-      version = "1.1.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz";
-        sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==";
-      };
-    };
-    "bufferstreams-1.1.3" = {
-      name = "bufferstreams";
-      packageName = "bufferstreams";
-      version = "1.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bufferstreams/-/bufferstreams-1.1.3.tgz";
-        sha512 = "HaJnVuslRF4g2kSDeyl++AaVizoitCpL9PglzCYwy0uHHyvWerfvEb8jWmYbF1z4kiVFolGomnxSGl+GUQp2jg==";
-      };
-    };
-    "callsites-3.1.0" = {
-      name = "callsites";
-      packageName = "callsites";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz";
-        sha512 = "P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==";
-      };
-    };
-    "camelcase-3.0.0" = {
-      name = "camelcase";
-      packageName = "camelcase";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz";
-        sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a";
-      };
-    };
-    "camelcase-4.1.0" = {
-      name = "camelcase";
-      packageName = "camelcase";
-      version = "4.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz";
-        sha1 = "d545635be1e33c542649c69173e5de6acfae34dd";
-      };
-    };
-    "camelcase-5.3.1" = {
-      name = "camelcase";
-      packageName = "camelcase";
-      version = "5.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz";
-        sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==";
-      };
-    };
-    "caryll-shapeops-0.3.1" = {
-      name = "caryll-shapeops";
-      packageName = "caryll-shapeops";
-      version = "0.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/caryll-shapeops/-/caryll-shapeops-0.3.1.tgz";
-        sha512 = "3TdH6DZGL08S6qEvCZLNaOHyFvmzQts8m+TyYEvc6/PiI+XgX5mIag1/CKczIM8e2QtDr8JKW8foo4VNOM8/Og==";
-      };
-    };
-    "caseless-0.12.0" = {
-      name = "caseless";
-      packageName = "caseless";
-      version = "0.12.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz";
-        sha1 = "1b681c21ff84033c826543090689420d187151dc";
-      };
-    };
-    "chalk-2.4.2" = {
-      name = "chalk";
-      packageName = "chalk";
-      version = "2.4.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz";
-        sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==";
-      };
-    };
-    "chardet-0.7.0" = {
-      name = "chardet";
-      packageName = "chardet";
-      version = "0.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz";
-        sha512 = "mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==";
-      };
-    };
-    "child-process-promise-2.2.1" = {
-      name = "child-process-promise";
-      packageName = "child-process-promise";
-      version = "2.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/child-process-promise/-/child-process-promise-2.2.1.tgz";
-        sha1 = "4730a11ef610fad450b8f223c79d31d7bdad8074";
-      };
-    };
-    "cli-cursor-2.1.0" = {
-      name = "cli-cursor";
-      packageName = "cli-cursor";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz";
-        sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5";
-      };
-    };
-    "cli-width-2.2.0" = {
-      name = "cli-width";
-      packageName = "cli-width";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz";
-        sha1 = "ff19ede8a9a5e579324147b0c11f0fbcbabed639";
-      };
-    };
-    "clipper-lib-1.0.0" = {
-      name = "clipper-lib";
-      packageName = "clipper-lib";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/clipper-lib/-/clipper-lib-1.0.0.tgz";
-        sha1 = "e902ceb26e28ee5cfa6014abdf790a51efff4ecb";
-      };
-    };
-    "cliui-3.2.0" = {
-      name = "cliui";
-      packageName = "cliui";
-      version = "3.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz";
-        sha1 = "120601537a916d29940f934da3b48d585a39213d";
-      };
-    };
-    "cliui-4.1.0" = {
-      name = "cliui";
-      packageName = "cliui";
-      version = "4.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz";
-        sha512 = "4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==";
-      };
-    };
-    "clone-2.1.2" = {
-      name = "clone";
-      packageName = "clone";
-      version = "2.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz";
-        sha1 = "1b7f4b9f591f1e8f83670401600345a02887435f";
-      };
-    };
-    "code-point-at-1.1.0" = {
-      name = "code-point-at";
-      packageName = "code-point-at";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz";
-        sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77";
-      };
-    };
-    "color-convert-1.9.3" = {
-      name = "color-convert";
-      packageName = "color-convert";
-      version = "1.9.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz";
-        sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==";
-      };
-    };
-    "color-name-1.1.3" = {
-      name = "color-name";
-      packageName = "color-name";
-      version = "1.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz";
-        sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25";
-      };
-    };
-    "colors-1.3.3" = {
-      name = "colors";
-      packageName = "colors";
-      version = "1.3.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/colors/-/colors-1.3.3.tgz";
-        sha512 = "mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==";
-      };
-    };
-    "combined-stream-1.0.8" = {
-      name = "combined-stream";
-      packageName = "combined-stream";
-      version = "1.0.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz";
-        sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==";
-      };
-    };
-    "complex.js-2.0.11" = {
-      name = "complex.js";
-      packageName = "complex.js";
-      version = "2.0.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/complex.js/-/complex.js-2.0.11.tgz";
-        sha512 = "6IArJLApNtdg1P1dFtn3dnyzoZBEF0MwMnrfF1exSBRpZYoy4yieMkpZhQDC0uwctw48vii0CFVyHfpgZ/DfGw==";
-      };
-    };
-    "concat-map-0.0.1" = {
-      name = "concat-map";
-      packageName = "concat-map";
-      version = "0.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz";
-        sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b";
-      };
-    };
-    "console-control-strings-1.1.0" = {
-      name = "console-control-strings";
-      packageName = "console-control-strings";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz";
-        sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e";
-      };
-    };
-    "core-util-is-1.0.2" = {
-      name = "core-util-is";
-      packageName = "core-util-is";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz";
-        sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
-      };
-    };
-    "cross-spawn-4.0.2" = {
-      name = "cross-spawn";
-      packageName = "cross-spawn";
-      version = "4.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz";
-        sha1 = "7b9247621c23adfdd3856004a823cbe397424d41";
-      };
-    };
-    "cross-spawn-5.1.0" = {
-      name = "cross-spawn";
-      packageName = "cross-spawn";
-      version = "5.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz";
-        sha1 = "e8bd0efee58fcff6f8f94510a0a554bbfa235449";
-      };
-    };
-    "cross-spawn-6.0.5" = {
-      name = "cross-spawn";
-      packageName = "cross-spawn";
-      version = "6.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz";
-        sha512 = "eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==";
-      };
-    };
-    "css-2.2.4" = {
-      name = "css";
-      packageName = "css";
-      version = "2.2.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/css/-/css-2.2.4.tgz";
-        sha512 = "oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==";
-      };
-    };
-    "css-parse-2.0.0" = {
-      name = "css-parse";
-      packageName = "css-parse";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/css-parse/-/css-parse-2.0.0.tgz";
-        sha1 = "a468ee667c16d81ccf05c58c38d2a97c780dbfd4";
-      };
-    };
-    "cubic2quad-1.1.1" = {
-      name = "cubic2quad";
-      packageName = "cubic2quad";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cubic2quad/-/cubic2quad-1.1.1.tgz";
-        sha1 = "69b19c61a3f5b41ecf2f1d5fae8fb03415aa8b15";
-      };
-    };
-    "dashdash-1.14.1" = {
-      name = "dashdash";
-      packageName = "dashdash";
-      version = "1.14.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz";
-        sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0";
-      };
-    };
-    "debug-3.1.0" = {
-      name = "debug";
-      packageName = "debug";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz";
-        sha512 = "OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==";
-      };
-    };
-    "debug-4.1.1" = {
-      name = "debug";
-      packageName = "debug";
-      version = "4.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz";
-        sha512 = "pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==";
-      };
-    };
-    "decamelize-1.2.0" = {
-      name = "decamelize";
-      packageName = "decamelize";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz";
-        sha1 = "f6534d15148269b20352e7bee26f501f9a191290";
-      };
-    };
-    "decimal.js-10.2.0" = {
-      name = "decimal.js";
-      packageName = "decimal.js";
-      version = "10.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/decimal.js/-/decimal.js-10.2.0.tgz";
-        sha512 = "vDPw+rDgn3bZe1+F/pyEwb1oMG2XTlRVgAa6B4KccTEpYgF8w6eQllVbQcfIJnZyvzFtFpxnpGtx8dd7DJp/Rw==";
-      };
-    };
-    "decode-uri-component-0.2.0" = {
-      name = "decode-uri-component";
-      packageName = "decode-uri-component";
-      version = "0.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz";
-        sha1 = "eb3913333458775cb84cd1a1fae062106bb87545";
-      };
-    };
-    "deep-is-0.1.3" = {
-      name = "deep-is";
-      packageName = "deep-is";
-      version = "0.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz";
-        sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34";
-      };
-    };
-    "delayed-stream-1.0.0" = {
-      name = "delayed-stream";
-      packageName = "delayed-stream";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz";
-        sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619";
-      };
-    };
-    "delegates-1.0.0" = {
-      name = "delegates";
-      packageName = "delegates";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz";
-        sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a";
-      };
-    };
-    "doctrine-3.0.0" = {
-      name = "doctrine";
-      packageName = "doctrine";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz";
-        sha512 = "yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==";
-      };
-    };
-    "ecc-jsbn-0.1.2" = {
-      name = "ecc-jsbn";
-      packageName = "ecc-jsbn";
-      version = "0.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz";
-        sha1 = "3a83a904e54353287874c564b7549386849a98c9";
-      };
-    };
-    "emoji-regex-7.0.3" = {
-      name = "emoji-regex";
-      packageName = "emoji-regex";
-      version = "7.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz";
-        sha512 = "CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==";
-      };
-    };
-    "end-of-stream-1.4.1" = {
-      name = "end-of-stream";
-      packageName = "end-of-stream";
-      version = "1.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz";
-        sha512 = "1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==";
-      };
-    };
-    "error-ex-1.3.2" = {
-      name = "error-ex";
-      packageName = "error-ex";
-      version = "1.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz";
-        sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==";
-      };
-    };
-    "escape-latex-1.2.0" = {
-      name = "escape-latex";
-      packageName = "escape-latex";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/escape-latex/-/escape-latex-1.2.0.tgz";
-        sha512 = "nV5aVWW1K0wEiUIEdZ4erkGGH8mDxGyxSeqPzRNtWP7ataw+/olFObw7hujFWlVjNsaDFw5VZ5NzVSIqRgfTiw==";
-      };
-    };
-    "escape-string-regexp-1.0.5" = {
-      name = "escape-string-regexp";
-      packageName = "escape-string-regexp";
-      version = "1.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz";
-        sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4";
-      };
-    };
-    "escodegen-1.12.0" = {
-      name = "escodegen";
-      packageName = "escodegen";
-      version = "1.12.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/escodegen/-/escodegen-1.12.0.tgz";
-        sha512 = "TuA+EhsanGcme5T3R0L80u4t8CpbXQjegRmf7+FPTJrtCTErXFeelblRgHQa1FofEzqYYJmJ/OqjTwREp9qgmg==";
-      };
-    };
-    "escodegen-1.3.3" = {
-      name = "escodegen";
-      packageName = "escodegen";
-      version = "1.3.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/escodegen/-/escodegen-1.3.3.tgz";
-        sha1 = "f024016f5a88e046fd12005055e939802e6c5f23";
-      };
-    };
-    "escope-1.0.3" = {
-      name = "escope";
-      packageName = "escope";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/escope/-/escope-1.0.3.tgz";
-        sha1 = "759dce8496c4248fec2d0caaf4108bcf3f1a7f5d";
-      };
-    };
-    "eslint-5.16.0" = {
-      name = "eslint";
-      packageName = "eslint";
-      version = "5.16.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/eslint/-/eslint-5.16.0.tgz";
-        sha512 = "S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg==";
-      };
-    };
-    "eslint-scope-4.0.3" = {
-      name = "eslint-scope";
-      packageName = "eslint-scope";
-      version = "4.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz";
-        sha512 = "p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==";
-      };
-    };
-    "eslint-utils-1.4.2" = {
-      name = "eslint-utils";
-      packageName = "eslint-utils";
-      version = "1.4.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.2.tgz";
-        sha512 = "eAZS2sEUMlIeCjBeubdj45dmBHQwPHWyBcT1VSYB7o9x9WRRqKxyUoiXlRjyAwzN7YEzHJlYg0NmzDRWx6GP4Q==";
-      };
-    };
-    "eslint-visitor-keys-1.1.0" = {
-      name = "eslint-visitor-keys";
-      packageName = "eslint-visitor-keys";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz";
-        sha512 = "8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==";
-      };
-    };
-    "esmangle-1.0.1" = {
-      name = "esmangle";
-      packageName = "esmangle";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/esmangle/-/esmangle-1.0.1.tgz";
-        sha1 = "d9bb37b8f8eafbf4e6d4ed6b7aa2956abbd3c4c2";
-      };
-    };
-    "espree-5.0.1" = {
-      name = "espree";
-      packageName = "espree";
-      version = "5.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/espree/-/espree-5.0.1.tgz";
-        sha512 = "qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A==";
-      };
-    };
-    "esprima-1.1.1" = {
-      name = "esprima";
-      packageName = "esprima";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/esprima/-/esprima-1.1.1.tgz";
-        sha1 = "5b6f1547f4d102e670e140c509be6771d6aeb549";
-      };
-    };
-    "esprima-3.1.3" = {
-      name = "esprima";
-      packageName = "esprima";
-      version = "3.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz";
-        sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633";
-      };
-    };
-    "esprima-4.0.1" = {
-      name = "esprima";
-      packageName = "esprima";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz";
-        sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==";
-      };
-    };
-    "esquery-1.0.1" = {
-      name = "esquery";
-      packageName = "esquery";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz";
-        sha512 = "SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==";
-      };
-    };
-    "esrecurse-4.2.1" = {
-      name = "esrecurse";
-      packageName = "esrecurse";
-      version = "4.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz";
-        sha512 = "64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==";
-      };
-    };
-    "esshorten-1.1.1" = {
-      name = "esshorten";
-      packageName = "esshorten";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/esshorten/-/esshorten-1.1.1.tgz";
-        sha1 = "174f96b7cc267e46872d814e7db7c290bdff61a9";
-      };
-    };
-    "estraverse-1.5.1" = {
-      name = "estraverse";
-      packageName = "estraverse";
-      version = "1.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz";
-        sha1 = "867a3e8e58a9f84618afb6c2ddbcd916b7cbaf71";
-      };
-    };
-    "estraverse-2.0.0" = {
-      name = "estraverse";
-      packageName = "estraverse";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/estraverse/-/estraverse-2.0.0.tgz";
-        sha1 = "5ae46963243600206674ccb24a09e16674fcdca1";
-      };
-    };
-    "estraverse-4.1.1" = {
-      name = "estraverse";
-      packageName = "estraverse";
-      version = "4.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/estraverse/-/estraverse-4.1.1.tgz";
-        sha1 = "f6caca728933a850ef90661d0e17982ba47111a2";
-      };
-    };
-    "estraverse-4.3.0" = {
-      name = "estraverse";
-      packageName = "estraverse";
-      version = "4.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz";
-        sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==";
-      };
-    };
-    "esutils-1.0.0" = {
-      name = "esutils";
-      packageName = "esutils";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/esutils/-/esutils-1.0.0.tgz";
-        sha1 = "8151d358e20c8acc7fb745e7472c0025fe496570";
-      };
-    };
-    "esutils-2.0.3" = {
-      name = "esutils";
-      packageName = "esutils";
-      version = "2.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz";
-        sha512 = "kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==";
-      };
-    };
-    "execa-0.7.0" = {
-      name = "execa";
-      packageName = "execa";
-      version = "0.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz";
-        sha1 = "944becd34cc41ee32a63a9faf27ad5a65fc59777";
-      };
-    };
-    "execa-1.0.0" = {
-      name = "execa";
-      packageName = "execa";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz";
-        sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==";
-      };
-    };
-    "extend-3.0.2" = {
-      name = "extend";
-      packageName = "extend";
-      version = "3.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz";
-        sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==";
-      };
-    };
-    "external-editor-3.1.0" = {
-      name = "external-editor";
-      packageName = "external-editor";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz";
-        sha512 = "hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==";
-      };
-    };
-    "extsprintf-1.3.0" = {
-      name = "extsprintf";
-      packageName = "extsprintf";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz";
-        sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05";
-      };
-    };
-    "fast-deep-equal-2.0.1" = {
-      name = "fast-deep-equal";
-      packageName = "fast-deep-equal";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz";
-        sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49";
-      };
-    };
-    "fast-json-stable-stringify-2.0.0" = {
-      name = "fast-json-stable-stringify";
-      packageName = "fast-json-stable-stringify";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz";
-        sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2";
-      };
-    };
-    "fast-levenshtein-1.0.7" = {
-      name = "fast-levenshtein";
-      packageName = "fast-levenshtein";
-      version = "1.0.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.0.7.tgz";
-        sha1 = "0178dcdee023b92905193af0959e8a7639cfdcb9";
-      };
-    };
-    "fast-levenshtein-2.0.6" = {
-      name = "fast-levenshtein";
-      packageName = "fast-levenshtein";
-      version = "2.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz";
-        sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917";
-      };
-    };
-    "figures-2.0.0" = {
-      name = "figures";
-      packageName = "figures";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz";
-        sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962";
-      };
-    };
-    "file-entry-cache-5.0.1" = {
-      name = "file-entry-cache";
-      packageName = "file-entry-cache";
-      version = "5.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz";
-        sha512 = "bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==";
-      };
-    };
-    "file-uri-to-path-1.0.0" = {
-      name = "file-uri-to-path";
-      packageName = "file-uri-to-path";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz";
-        sha512 = "0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==";
-      };
-    };
-    "find-up-1.1.2" = {
-      name = "find-up";
-      packageName = "find-up";
-      version = "1.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz";
-        sha1 = "6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f";
-      };
-    };
-    "find-up-2.1.0" = {
-      name = "find-up";
-      packageName = "find-up";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz";
-        sha1 = "45d1b7e506c717ddd482775a2b77920a3c0c57a7";
-      };
-    };
-    "find-up-3.0.0" = {
-      name = "find-up";
-      packageName = "find-up";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz";
-        sha512 = "1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==";
-      };
-    };
-    "first-chunk-stream-2.0.0" = {
-      name = "first-chunk-stream";
-      packageName = "first-chunk-stream";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-2.0.0.tgz";
-        sha1 = "1bdecdb8e083c0664b91945581577a43a9f31d70";
-      };
-    };
-    "flat-cache-2.0.1" = {
-      name = "flat-cache";
-      packageName = "flat-cache";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz";
-        sha512 = "LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==";
-      };
-    };
-    "flatted-2.0.1" = {
-      name = "flatted";
-      packageName = "flatted";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/flatted/-/flatted-2.0.1.tgz";
-        sha512 = "a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==";
-      };
-    };
-    "forever-agent-0.6.1" = {
-      name = "forever-agent";
-      packageName = "forever-agent";
-      version = "0.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz";
-        sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91";
-      };
-    };
-    "form-data-2.3.3" = {
-      name = "form-data";
-      packageName = "form-data";
-      version = "2.3.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz";
-        sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==";
-      };
-    };
-    "fraction.js-4.0.12" = {
-      name = "fraction.js";
-      packageName = "fraction.js";
-      version = "4.0.12";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fraction.js/-/fraction.js-4.0.12.tgz";
-        sha512 = "8Z1K0VTG4hzYY7kA/1sj4/r1/RWLBD3xwReT/RCrUCbzPszjNQCCsy3ktkU/eaEqX3MYa4pY37a52eiBlPMlhA==";
-      };
-    };
-    "fs-extra-3.0.1" = {
-      name = "fs-extra";
-      packageName = "fs-extra";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz";
-        sha1 = "3794f378c58b342ea7dbbb23095109c4b3b62291";
-      };
-    };
-    "fs-extra-4.0.3" = {
-      name = "fs-extra";
-      packageName = "fs-extra";
-      version = "4.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz";
-        sha512 = "q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==";
-      };
-    };
-    "fs-extra-6.0.1" = {
-      name = "fs-extra";
-      packageName = "fs-extra";
-      version = "6.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-6.0.1.tgz";
-        sha512 = "GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==";
-      };
-    };
-    "fs.realpath-1.0.0" = {
-      name = "fs.realpath";
-      packageName = "fs.realpath";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz";
-        sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
-      };
-    };
-    "fstream-1.0.12" = {
-      name = "fstream";
-      packageName = "fstream";
-      version = "1.0.12";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz";
-        sha512 = "WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==";
-      };
-    };
-    "functional-red-black-tree-1.0.1" = {
-      name = "functional-red-black-tree";
-      packageName = "functional-red-black-tree";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz";
-        sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327";
-      };
-    };
-    "gauge-2.7.4" = {
-      name = "gauge";
-      packageName = "gauge";
-      version = "2.7.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz";
-        sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7";
-      };
-    };
-    "get-caller-file-1.0.3" = {
-      name = "get-caller-file";
-      packageName = "get-caller-file";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz";
-        sha512 = "3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==";
-      };
-    };
-    "get-stream-3.0.0" = {
-      name = "get-stream";
-      packageName = "get-stream";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz";
-        sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14";
-      };
-    };
-    "get-stream-4.1.0" = {
-      name = "get-stream";
-      packageName = "get-stream";
-      version = "4.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz";
-        sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==";
-      };
-    };
-    "getpass-0.1.7" = {
-      name = "getpass";
-      packageName = "getpass";
-      version = "0.1.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz";
-        sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa";
-      };
-    };
-    "glob-7.1.4" = {
-      name = "glob";
-      packageName = "glob";
-      version = "7.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz";
-        sha512 = "hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==";
-      };
-    };
-    "globals-11.12.0" = {
-      name = "globals";
-      packageName = "globals";
-      version = "11.12.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz";
-        sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==";
-      };
-    };
-    "graceful-fs-4.2.2" = {
-      name = "graceful-fs";
-      packageName = "graceful-fs";
-      version = "4.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz";
-        sha512 = "IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==";
-      };
-    };
-    "har-schema-2.0.0" = {
-      name = "har-schema";
-      packageName = "har-schema";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz";
-        sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92";
-      };
-    };
-    "har-validator-5.1.3" = {
-      name = "har-validator";
-      packageName = "har-validator";
-      version = "5.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz";
-        sha512 = "sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==";
-      };
-    };
-    "has-flag-3.0.0" = {
-      name = "has-flag";
-      packageName = "has-flag";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz";
-        sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd";
-      };
-    };
-    "has-unicode-2.0.1" = {
-      name = "has-unicode";
-      packageName = "has-unicode";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz";
-        sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9";
-      };
-    };
-    "hosted-git-info-2.8.4" = {
-      name = "hosted-git-info";
-      packageName = "hosted-git-info";
-      version = "2.8.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.4.tgz";
-        sha512 = "pzXIvANXEFrc5oFFXRMkbLPQ2rXRoDERwDLyrcUxGhaZhgP54BBSl9Oheh7Vv0T090cszWBxPjkQQ5Sq1PbBRQ==";
-      };
-    };
-    "http-signature-1.2.0" = {
-      name = "http-signature";
-      packageName = "http-signature";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz";
-        sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1";
-      };
-    };
-    "iconv-lite-0.4.24" = {
-      name = "iconv-lite";
-      packageName = "iconv-lite";
-      version = "0.4.24";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz";
-        sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==";
-      };
-    };
-    "ignore-4.0.6" = {
-      name = "ignore";
-      packageName = "ignore";
-      version = "4.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz";
-        sha512 = "cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==";
-      };
-    };
-    "import-fresh-3.1.0" = {
-      name = "import-fresh";
-      packageName = "import-fresh";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.1.0.tgz";
-        sha512 = "PpuksHKGt8rXfWEr9m9EHIpgyyaltBy8+eF6GJM0QCAxMgxCfucMF3mjecK2QsJr0amJW7gTqh5/wht0z2UhEQ==";
-      };
-    };
-    "imurmurhash-0.1.4" = {
-      name = "imurmurhash";
-      packageName = "imurmurhash";
-      version = "0.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz";
-        sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea";
-      };
-    };
-    "inflight-1.0.6" = {
-      name = "inflight";
-      packageName = "inflight";
-      version = "1.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz";
-        sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9";
-      };
-    };
-    "inherits-2.0.4" = {
-      name = "inherits";
-      packageName = "inherits";
-      version = "2.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz";
-        sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==";
-      };
-    };
-    "inquirer-6.5.2" = {
-      name = "inquirer";
-      packageName = "inquirer";
-      version = "6.5.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz";
-        sha512 = "cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==";
-      };
-    };
-    "invert-kv-1.0.0" = {
-      name = "invert-kv";
-      packageName = "invert-kv";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz";
-        sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6";
-      };
-    };
-    "invert-kv-2.0.0" = {
-      name = "invert-kv";
-      packageName = "invert-kv";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz";
-        sha512 = "wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==";
-      };
-    };
-    "is-arrayish-0.2.1" = {
-      name = "is-arrayish";
-      packageName = "is-arrayish";
-      version = "0.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz";
-        sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d";
-      };
-    };
-    "is-fullwidth-code-point-1.0.0" = {
-      name = "is-fullwidth-code-point";
-      packageName = "is-fullwidth-code-point";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz";
-        sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb";
-      };
-    };
-    "is-fullwidth-code-point-2.0.0" = {
-      name = "is-fullwidth-code-point";
-      packageName = "is-fullwidth-code-point";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz";
-        sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f";
-      };
-    };
-    "is-promise-2.1.0" = {
-      name = "is-promise";
-      packageName = "is-promise";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz";
-        sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa";
-      };
-    };
-    "is-stream-1.1.0" = {
-      name = "is-stream";
-      packageName = "is-stream";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz";
-        sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44";
-      };
-    };
-    "is-typedarray-1.0.0" = {
-      name = "is-typedarray";
-      packageName = "is-typedarray";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz";
-        sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a";
-      };
-    };
-    "is-utf8-0.2.1" = {
-      name = "is-utf8";
-      packageName = "is-utf8";
-      version = "0.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz";
-        sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72";
-      };
-    };
-    "isarray-1.0.0" = {
-      name = "isarray";
-      packageName = "isarray";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz";
-        sha1 = "bb935d48582cba168c06834957a54a3e07124f11";
-      };
-    };
-    "isexe-2.0.0" = {
-      name = "isexe";
-      packageName = "isexe";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz";
-        sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10";
-      };
-    };
-    "isstream-0.1.2" = {
-      name = "isstream";
-      packageName = "isstream";
-      version = "0.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz";
-        sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a";
-      };
-    };
-    "javascript-natural-sort-0.7.1" = {
-      name = "javascript-natural-sort";
-      packageName = "javascript-natural-sort";
-      version = "0.7.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz";
-        sha1 = "f9e2303d4507f6d74355a73664d1440fb5a0ef59";
-      };
-    };
-    "js-tokens-4.0.0" = {
-      name = "js-tokens";
-      packageName = "js-tokens";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz";
-        sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==";
-      };
-    };
-    "js-yaml-3.13.1" = {
-      name = "js-yaml";
-      packageName = "js-yaml";
-      version = "3.13.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz";
-        sha512 = "YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==";
-      };
-    };
-    "jsbn-0.1.1" = {
-      name = "jsbn";
-      packageName = "jsbn";
-      version = "0.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz";
-        sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513";
-      };
-    };
-    "json-schema-0.2.3" = {
-      name = "json-schema";
-      packageName = "json-schema";
-      version = "0.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz";
-        sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13";
-      };
-    };
-    "json-schema-traverse-0.4.1" = {
-      name = "json-schema-traverse";
-      packageName = "json-schema-traverse";
-      version = "0.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz";
-        sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==";
-      };
-    };
-    "json-stable-stringify-without-jsonify-1.0.1" = {
-      name = "json-stable-stringify-without-jsonify";
-      packageName = "json-stable-stringify-without-jsonify";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz";
-        sha1 = "9db7b59496ad3f3cfef30a75142d2d930ad72651";
-      };
-    };
-    "json-stringify-safe-5.0.1" = {
-      name = "json-stringify-safe";
-      packageName = "json-stringify-safe";
-      version = "5.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz";
-        sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
-      };
-    };
-    "jsonfile-3.0.1" = {
-      name = "jsonfile";
-      packageName = "jsonfile";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz";
-        sha1 = "a5ecc6f65f53f662c4415c7675a0331d0992ec66";
-      };
-    };
-    "jsonfile-4.0.0" = {
-      name = "jsonfile";
-      packageName = "jsonfile";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz";
-        sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb";
-      };
-    };
-    "jsonparse-1.3.1" = {
-      name = "jsonparse";
-      packageName = "jsonparse";
-      version = "1.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz";
-        sha1 = "3f4dae4a91fac315f71062f8521cc239f1366280";
-      };
-    };
-    "jsprim-1.4.1" = {
-      name = "jsprim";
-      packageName = "jsprim";
-      version = "1.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz";
-        sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2";
-      };
-    };
-    "lcid-1.0.0" = {
-      name = "lcid";
-      packageName = "lcid";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz";
-        sha1 = "308accafa0bc483a3867b4b6f2b9506251d1b835";
-      };
-    };
-    "lcid-2.0.0" = {
-      name = "lcid";
-      packageName = "lcid";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz";
-        sha512 = "avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==";
-      };
-    };
-    "levn-0.2.5" = {
-      name = "levn";
-      packageName = "levn";
-      version = "0.2.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/levn/-/levn-0.2.5.tgz";
-        sha1 = "ba8d339d0ca4a610e3a3f145b9caf48807155054";
-      };
-    };
-    "levn-0.3.0" = {
-      name = "levn";
-      packageName = "levn";
-      version = "0.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz";
-        sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee";
-      };
-    };
-    "libspiro-js-0.3.1" = {
-      name = "libspiro-js";
-      packageName = "libspiro-js";
-      version = "0.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/libspiro-js/-/libspiro-js-0.3.1.tgz";
-        sha1 = "86652b0009a6d84ea79a5320bdca5f00612ee439";
-      };
-    };
-    "load-json-file-1.1.0" = {
-      name = "load-json-file";
-      packageName = "load-json-file";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz";
-        sha1 = "956905708d58b4bab4c2261b04f59f31c99374c0";
-      };
-    };
-    "load-json-file-2.0.0" = {
-      name = "load-json-file";
-      packageName = "load-json-file";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz";
-        sha1 = "7947e42149af80d696cbf797bcaabcfe1fe29ca8";
-      };
-    };
-    "locate-path-2.0.0" = {
-      name = "locate-path";
-      packageName = "locate-path";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz";
-        sha1 = "2b568b265eec944c6d9c0de9c3dbbbca0354cd8e";
-      };
-    };
-    "locate-path-3.0.0" = {
-      name = "locate-path";
-      packageName = "locate-path";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz";
-        sha512 = "7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==";
-      };
-    };
-    "lodash-4.17.15" = {
-      name = "lodash";
-      packageName = "lodash";
-      version = "4.17.15";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz";
-        sha512 = "8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==";
-      };
-    };
-    "lru-cache-4.1.5" = {
-      name = "lru-cache";
-      packageName = "lru-cache";
-      version = "4.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz";
-        sha512 = "sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==";
-      };
-    };
-    "map-age-cleaner-0.1.3" = {
-      name = "map-age-cleaner";
-      packageName = "map-age-cleaner";
-      version = "0.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz";
-        sha512 = "bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==";
-      };
-    };
-    "mathjs-5.10.3" = {
-      name = "mathjs";
-      packageName = "mathjs";
-      version = "5.10.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mathjs/-/mathjs-5.10.3.tgz";
-        sha512 = "ySjg30BC3dYjQm73ILZtwcWzFJde0VU6otkXW/57IjjuYRa3Qaf0Kb8pydEuBZYtqW2OxreAtsricrAmOj3jIw==";
-      };
-    };
-    "megaminx-0.3.3" = {
-      name = "megaminx";
-      packageName = "megaminx";
-      version = "0.3.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/megaminx/-/megaminx-0.3.3.tgz";
-        sha512 = "lZBSLMro+XYJIix9zCZ8N6nZgixpjUPkX6CKuh+Y9Wl9bir/2Fp27NWapA0cNQCPrzOOI9sAwxc4BI14aIdumw==";
-      };
-    };
-    "megaminx-0.9.0" = {
-      name = "megaminx";
-      packageName = "megaminx";
-      version = "0.9.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/megaminx/-/megaminx-0.9.0.tgz";
-        sha512 = "1UcxrUXXYboLWS3AJ2NuLckLi3YR7eJiO5LsYAWHZjYE0mmSqJ2ogSt6JrG8YINyogW9/TUWpL1ojwbRsSbyXw==";
-      };
-    };
-    "mem-1.1.0" = {
-      name = "mem";
-      packageName = "mem";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz";
-        sha1 = "5edd52b485ca1d900fe64895505399a0dfa45f76";
-      };
-    };
-    "mem-4.3.0" = {
-      name = "mem";
-      packageName = "mem";
-      version = "4.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz";
-        sha512 = "qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==";
-      };
-    };
-    "microbuffer-1.0.0" = {
-      name = "microbuffer";
-      packageName = "microbuffer";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/microbuffer/-/microbuffer-1.0.0.tgz";
-        sha1 = "8b3832ed40c87d51f47bb234913a698a756d19d2";
-      };
-    };
-    "mime-db-1.40.0" = {
-      name = "mime-db";
-      packageName = "mime-db";
-      version = "1.40.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz";
-        sha512 = "jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==";
-      };
-    };
-    "mime-types-2.1.24" = {
-      name = "mime-types";
-      packageName = "mime-types";
-      version = "2.1.24";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz";
-        sha512 = "WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==";
-      };
-    };
-    "mimic-fn-1.2.0" = {
-      name = "mimic-fn";
-      packageName = "mimic-fn";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz";
-        sha512 = "jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==";
-      };
-    };
-    "mimic-fn-2.1.0" = {
-      name = "mimic-fn";
-      packageName = "mimic-fn";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz";
-        sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==";
-      };
-    };
-    "minimatch-3.0.4" = {
-      name = "minimatch";
-      packageName = "minimatch";
-      version = "3.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz";
-        sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==";
-      };
-    };
-    "minimist-0.0.8" = {
-      name = "minimist";
-      packageName = "minimist";
-      version = "0.0.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
-        sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
-      };
-    };
-    "mkdirp-0.5.1" = {
-      name = "mkdirp";
-      packageName = "mkdirp";
-      version = "0.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
-        sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
-      };
-    };
-    "ms-2.0.0" = {
-      name = "ms";
-      packageName = "ms";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz";
-        sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8";
-      };
-    };
-    "ms-2.1.2" = {
-      name = "ms";
-      packageName = "ms";
-      version = "2.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz";
-        sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==";
-      };
-    };
-    "mute-stream-0.0.7" = {
-      name = "mute-stream";
-      packageName = "mute-stream";
-      version = "0.0.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz";
-        sha1 = "3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab";
-      };
-    };
-    "nan-2.14.0" = {
-      name = "nan";
-      packageName = "nan";
-      version = "2.14.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz";
-        sha512 = "INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==";
-      };
-    };
-    "natural-compare-1.4.0" = {
-      name = "natural-compare";
-      packageName = "natural-compare";
-      version = "1.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz";
-        sha1 = "4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7";
-      };
-    };
-    "nice-try-1.0.5" = {
-      name = "nice-try";
-      packageName = "nice-try";
-      version = "1.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz";
-        sha512 = "1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==";
-      };
-    };
-    "node-gyp-3.8.0" = {
-      name = "node-gyp";
-      packageName = "node-gyp";
-      version = "3.8.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz";
-        sha512 = "3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==";
-      };
-    };
-    "node-version-1.2.0" = {
-      name = "node-version";
-      packageName = "node-version";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-version/-/node-version-1.2.0.tgz";
-        sha512 = "ma6oU4Sk0qOoKEAymVoTvk8EdXEobdS7m/mAGhDJ8Rouugho48crHBORAmy5BoOcv8wraPM6xumapQp5hl4iIQ==";
-      };
-    };
-    "nopt-3.0.6" = {
-      name = "nopt";
-      packageName = "nopt";
-      version = "3.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz";
-        sha1 = "c6465dbf08abcd4db359317f79ac68a646b28ff9";
-      };
-    };
-    "normalize-package-data-2.5.0" = {
-      name = "normalize-package-data";
-      packageName = "normalize-package-data";
-      version = "2.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz";
-        sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==";
-      };
-    };
-    "npm-run-path-2.0.2" = {
-      name = "npm-run-path";
-      packageName = "npm-run-path";
-      version = "2.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz";
-        sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f";
-      };
-    };
-    "npmlog-4.1.2" = {
-      name = "npmlog";
-      packageName = "npmlog";
-      version = "4.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz";
-        sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==";
-      };
-    };
-    "number-is-nan-1.0.1" = {
-      name = "number-is-nan";
-      packageName = "number-is-nan";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz";
-        sha1 = "097b602b53422a522c1afb8790318336941a011d";
-      };
-    };
-    "oauth-sign-0.9.0" = {
-      name = "oauth-sign";
-      packageName = "oauth-sign";
-      version = "0.9.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz";
-        sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==";
-      };
-    };
-    "object-assign-4.1.1" = {
-      name = "object-assign";
-      packageName = "object-assign";
-      version = "4.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz";
-        sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863";
-      };
-    };
-    "once-1.4.0" = {
-      name = "once";
-      packageName = "once";
-      version = "1.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz";
-        sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1";
-      };
-    };
-    "onetime-2.0.1" = {
-      name = "onetime";
-      packageName = "onetime";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz";
-        sha1 = "067428230fd67443b2794b22bba528b6867962d4";
-      };
-    };
-    "optionator-0.3.0" = {
-      name = "optionator";
-      packageName = "optionator";
-      version = "0.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/optionator/-/optionator-0.3.0.tgz";
-        sha1 = "9715a8b5f5e7586cff06c8249e039cd7364d3f54";
-      };
-    };
-    "optionator-0.8.2" = {
-      name = "optionator";
-      packageName = "optionator";
-      version = "0.8.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz";
-        sha1 = "364c5e409d3f4d6301d6c0b4c05bba50180aeb64";
-      };
-    };
-    "os-homedir-1.0.2" = {
-      name = "os-homedir";
-      packageName = "os-homedir";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz";
-        sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3";
-      };
-    };
-    "os-locale-1.4.0" = {
-      name = "os-locale";
-      packageName = "os-locale";
-      version = "1.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz";
-        sha1 = "20f9f17ae29ed345e8bde583b13d2009803c14d9";
-      };
-    };
-    "os-locale-2.1.0" = {
-      name = "os-locale";
-      packageName = "os-locale";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz";
-        sha512 = "3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==";
-      };
-    };
-    "os-locale-3.1.0" = {
-      name = "os-locale";
-      packageName = "os-locale";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz";
-        sha512 = "Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==";
-      };
-    };
-    "os-tmpdir-1.0.2" = {
-      name = "os-tmpdir";
-      packageName = "os-tmpdir";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz";
-        sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274";
-      };
-    };
-    "osenv-0.1.5" = {
-      name = "osenv";
-      packageName = "osenv";
-      version = "0.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz";
-        sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==";
-      };
-    };
-    "otfcc-ttcize-0.8.0" = {
-      name = "otfcc-ttcize";
-      packageName = "otfcc-ttcize";
-      version = "0.8.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/otfcc-ttcize/-/otfcc-ttcize-0.8.0.tgz";
-        sha512 = "0RFgy9TDsgTF/1UJ8bSQ4heTYRatDz3HOXXh8d3WyXReqeOU+edgkbG4ERMFPdzFnA+SgqKTnPRg+2pduZsmSQ==";
-      };
-    };
-    "p-defer-1.0.0" = {
-      name = "p-defer";
-      packageName = "p-defer";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz";
-        sha1 = "9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c";
-      };
-    };
-    "p-finally-1.0.0" = {
-      name = "p-finally";
-      packageName = "p-finally";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz";
-        sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae";
-      };
-    };
-    "p-is-promise-2.1.0" = {
-      name = "p-is-promise";
-      packageName = "p-is-promise";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz";
-        sha512 = "Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==";
-      };
-    };
-    "p-limit-1.3.0" = {
-      name = "p-limit";
-      packageName = "p-limit";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz";
-        sha512 = "vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==";
-      };
-    };
-    "p-limit-2.2.1" = {
-      name = "p-limit";
-      packageName = "p-limit";
-      version = "2.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz";
-        sha512 = "85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==";
-      };
-    };
-    "p-locate-2.0.0" = {
-      name = "p-locate";
-      packageName = "p-locate";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz";
-        sha1 = "20a0103b222a70c8fd39cc2e580680f3dde5ec43";
-      };
-    };
-    "p-locate-3.0.0" = {
-      name = "p-locate";
-      packageName = "p-locate";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz";
-        sha512 = "x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==";
-      };
-    };
-    "p-try-1.0.0" = {
-      name = "p-try";
-      packageName = "p-try";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz";
-        sha1 = "cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3";
-      };
-    };
-    "p-try-2.2.0" = {
-      name = "p-try";
-      packageName = "p-try";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz";
-        sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==";
-      };
-    };
-    "pako-1.0.10" = {
-      name = "pako";
-      packageName = "pako";
-      version = "1.0.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pako/-/pako-1.0.10.tgz";
-        sha512 = "0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==";
-      };
-    };
-    "parent-module-1.0.1" = {
-      name = "parent-module";
-      packageName = "parent-module";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz";
-        sha512 = "GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==";
-      };
-    };
-    "parse-json-2.2.0" = {
-      name = "parse-json";
-      packageName = "parse-json";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz";
-        sha1 = "f480f40434ef80741f8469099f8dea18f55a4dc9";
-      };
-    };
-    "patel-0.33.1" = {
-      name = "patel";
-      packageName = "patel";
-      version = "0.33.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/patel/-/patel-0.33.1.tgz";
-        sha512 = "zOv5DhGH2r4cRKnZfOlHmWqxBp9nMGnC3F/NZbUqFCYMA65RXiv8q1F96/6dm2ANR6xvCe+xLODQSb49IFoYQg==";
-      };
-    };
-    "path-exists-2.1.0" = {
-      name = "path-exists";
-      packageName = "path-exists";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz";
-        sha1 = "0feb6c64f0fc518d9a754dd5efb62c7022761f4b";
-      };
-    };
-    "path-exists-3.0.0" = {
-      name = "path-exists";
-      packageName = "path-exists";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz";
-        sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515";
-      };
-    };
-    "path-is-absolute-1.0.1" = {
-      name = "path-is-absolute";
-      packageName = "path-is-absolute";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz";
-        sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f";
-      };
-    };
-    "path-is-inside-1.0.2" = {
-      name = "path-is-inside";
-      packageName = "path-is-inside";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz";
-        sha1 = "365417dede44430d1c11af61027facf074bdfc53";
-      };
-    };
-    "path-key-2.0.1" = {
-      name = "path-key";
-      packageName = "path-key";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz";
-        sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40";
-      };
-    };
-    "path-parse-1.0.6" = {
-      name = "path-parse";
-      packageName = "path-parse";
-      version = "1.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz";
-        sha512 = "GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==";
-      };
-    };
-    "path-type-1.1.0" = {
-      name = "path-type";
-      packageName = "path-type";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz";
-        sha1 = "59c44f7ee491da704da415da5a4070ba4f8fe441";
-      };
-    };
-    "path-type-2.0.0" = {
-      name = "path-type";
-      packageName = "path-type";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz";
-        sha1 = "f012ccb8415b7096fc2daa1054c3d72389594c73";
-      };
-    };
-    "patrisika-0.21.0" = {
-      name = "patrisika";
-      packageName = "patrisika";
-      version = "0.21.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/patrisika/-/patrisika-0.21.0.tgz";
-        sha1 = "b82c27f7d4041522dc5c31b43b7c6efb19e47482";
-      };
-    };
-    "patrisika-scopes-0.11.1" = {
-      name = "patrisika-scopes";
-      packageName = "patrisika-scopes";
-      version = "0.11.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/patrisika-scopes/-/patrisika-scopes-0.11.1.tgz";
-        sha512 = "UCIBMx1nzNaR5CcDoQ9/jtY5RlJqf2CrJYHiMZJhi15NPvsPKRfJT/DPZMkhCunexOKmH03EDZYZU1hGn7mL0w==";
-      };
-    };
-    "performance-now-2.1.0" = {
-      name = "performance-now";
-      packageName = "performance-now";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz";
-        sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b";
-      };
-    };
-    "pify-2.3.0" = {
-      name = "pify";
-      packageName = "pify";
-      version = "2.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz";
-        sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c";
-      };
-    };
-    "pinkie-2.0.4" = {
-      name = "pinkie";
-      packageName = "pinkie";
-      version = "2.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz";
-        sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870";
-      };
-    };
-    "pinkie-promise-2.0.1" = {
-      name = "pinkie-promise";
-      packageName = "pinkie-promise";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz";
-        sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa";
-      };
-    };
-    "prelude-ls-1.1.2" = {
-      name = "prelude-ls";
-      packageName = "prelude-ls";
-      version = "1.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz";
-        sha1 = "21932a549f5e52ffd9a827f570e04be62a97da54";
-      };
-    };
-    "primitive-quadify-off-curves-0.4.1" = {
-      name = "primitive-quadify-off-curves";
-      packageName = "primitive-quadify-off-curves";
-      version = "0.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/primitive-quadify-off-curves/-/primitive-quadify-off-curves-0.4.1.tgz";
-        sha512 = "Kmn+IfF+hcARb1NX+XtoSQIxHS+WeOqqQ3YDihRe3KkvGkFxMrDQFFsDTXxwUOt9KmvD7FgWG6cO2ajZp4lEQg==";
-      };
-    };
-    "process-nextick-args-2.0.1" = {
-      name = "process-nextick-args";
-      packageName = "process-nextick-args";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz";
-        sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==";
-      };
-    };
-    "progress-2.0.3" = {
-      name = "progress";
-      packageName = "progress";
-      version = "2.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz";
-        sha512 = "7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==";
-      };
-    };
-    "promise-polyfill-6.1.0" = {
-      name = "promise-polyfill";
-      packageName = "promise-polyfill";
-      version = "6.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-6.1.0.tgz";
-        sha1 = "dfa96943ea9c121fca4de9b5868cb39d3472e057";
-      };
-    };
-    "proper-lockfile-3.2.0" = {
-      name = "proper-lockfile";
-      packageName = "proper-lockfile";
-      version = "3.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/proper-lockfile/-/proper-lockfile-3.2.0.tgz";
-        sha512 = "iMghHHXv2bsxl6NchhEaFck8tvX3F9cknEEh1SUpguUOBjN7PAAW9BLzmbc1g/mCD1gY3EE2EABBHPJfFdHFmA==";
-      };
-    };
-    "pseudomap-1.0.2" = {
-      name = "pseudomap";
-      packageName = "pseudomap";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz";
-        sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3";
-      };
-    };
-    "psl-1.4.0" = {
-      name = "psl";
-      packageName = "psl";
-      version = "1.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/psl/-/psl-1.4.0.tgz";
-        sha512 = "HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw==";
-      };
-    };
-    "pump-3.0.0" = {
-      name = "pump";
-      packageName = "pump";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz";
-        sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==";
-      };
-    };
-    "punycode-1.4.1" = {
-      name = "punycode";
-      packageName = "punycode";
-      version = "1.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz";
-        sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e";
-      };
-    };
-    "punycode-2.1.1" = {
-      name = "punycode";
-      packageName = "punycode";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz";
-        sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==";
-      };
-    };
-    "qs-6.5.2" = {
-      name = "qs";
-      packageName = "qs";
-      version = "6.5.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz";
-        sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==";
-      };
-    };
-    "read-pkg-1.1.0" = {
-      name = "read-pkg";
-      packageName = "read-pkg";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz";
-        sha1 = "f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28";
-      };
-    };
-    "read-pkg-2.0.0" = {
-      name = "read-pkg";
-      packageName = "read-pkg";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz";
-        sha1 = "8ef1c0623c6a6db0dc6713c4bfac46332b2368f8";
-      };
-    };
-    "read-pkg-up-1.0.1" = {
-      name = "read-pkg-up";
-      packageName = "read-pkg-up";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz";
-        sha1 = "9d63c13276c065918d57f002a57f40a1b643fb02";
-      };
-    };
-    "read-pkg-up-2.0.0" = {
-      name = "read-pkg-up";
-      packageName = "read-pkg-up";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz";
-        sha1 = "6b72a8048984e0c41e79510fd5e9fa99b3b549be";
-      };
-    };
-    "readable-stream-2.3.6" = {
-      name = "readable-stream";
-      packageName = "readable-stream";
-      version = "2.3.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz";
-        sha512 = "tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==";
-      };
-    };
-    "regexpp-2.0.1" = {
-      name = "regexpp";
-      packageName = "regexpp";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz";
-        sha512 = "lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==";
-      };
-    };
-    "request-2.88.0" = {
-      name = "request";
-      packageName = "request";
-      version = "2.88.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.88.0.tgz";
-        sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==";
-      };
-    };
-    "require-directory-2.1.1" = {
-      name = "require-directory";
-      packageName = "require-directory";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz";
-        sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42";
-      };
-    };
-    "require-main-filename-1.0.1" = {
-      name = "require-main-filename";
-      packageName = "require-main-filename";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz";
-        sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1";
-      };
-    };
-    "resolve-1.12.0" = {
-      name = "resolve";
-      packageName = "resolve";
-      version = "1.12.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz";
-        sha512 = "B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==";
-      };
-    };
-    "resolve-from-4.0.0" = {
-      name = "resolve-from";
-      packageName = "resolve-from";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz";
-        sha512 = "pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==";
-      };
-    };
-    "resolve-url-0.2.1" = {
-      name = "resolve-url";
-      packageName = "resolve-url";
-      version = "0.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz";
-        sha1 = "2c637fe77c893afd2a663fe21aa9080068e2052a";
-      };
-    };
-    "restore-cursor-2.0.0" = {
-      name = "restore-cursor";
-      packageName = "restore-cursor";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz";
-        sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf";
-      };
-    };
-    "resumer-0.0.0" = {
-      name = "resumer";
-      packageName = "resumer";
-      version = "0.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz";
-        sha1 = "f1e8f461e4064ba39e82af3cdc2a8c893d076759";
-      };
-    };
-    "retry-0.12.0" = {
-      name = "retry";
-      packageName = "retry";
-      version = "0.12.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz";
-        sha1 = "1b42a6266a21f07421d1b0b54b7dc167b01c013b";
-      };
-    };
-    "rimraf-2.2.8" = {
-      name = "rimraf";
-      packageName = "rimraf";
-      version = "2.2.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz";
-        sha1 = "e439be2aaee327321952730f99a8929e4fc50582";
-      };
-    };
-    "rimraf-2.6.3" = {
-      name = "rimraf";
-      packageName = "rimraf";
-      version = "2.6.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz";
-        sha512 = "mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==";
-      };
-    };
-    "run-async-2.3.0" = {
-      name = "run-async";
-      packageName = "run-async";
-      version = "2.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz";
-        sha1 = "0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0";
-      };
-    };
-    "rxjs-6.5.3" = {
-      name = "rxjs";
-      packageName = "rxjs";
-      version = "6.5.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/rxjs/-/rxjs-6.5.3.tgz";
-        sha512 = "wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA==";
-      };
-    };
-    "safe-buffer-5.1.2" = {
-      name = "safe-buffer";
-      packageName = "safe-buffer";
-      version = "5.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz";
-        sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==";
-      };
-    };
-    "safer-buffer-2.1.2" = {
-      name = "safer-buffer";
-      packageName = "safer-buffer";
-      version = "2.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz";
-        sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==";
-      };
-    };
-    "sax-1.2.4" = {
-      name = "sax";
-      packageName = "sax";
-      version = "1.2.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz";
-        sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==";
-      };
-    };
-    "seed-random-2.2.0" = {
-      name = "seed-random";
-      packageName = "seed-random";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/seed-random/-/seed-random-2.2.0.tgz";
-        sha1 = "2a9b19e250a817099231a5b99a4daf80b7fbed54";
-      };
-    };
-    "semaphore-async-await-1.5.1" = {
-      name = "semaphore-async-await";
-      packageName = "semaphore-async-await";
-      version = "1.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/semaphore-async-await/-/semaphore-async-await-1.5.1.tgz";
-        sha1 = "857bef5e3644601ca4b9570b87e9df5ca12974fa";
-      };
-    };
-    "semver-5.3.0" = {
-      name = "semver";
-      packageName = "semver";
-      version = "5.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz";
-        sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f";
-      };
-    };
-    "semver-5.7.1" = {
-      name = "semver";
-      packageName = "semver";
-      version = "5.7.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz";
-        sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==";
-      };
-    };
-    "semver-6.3.0" = {
-      name = "semver";
-      packageName = "semver";
-      version = "6.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz";
-        sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==";
-      };
-    };
-    "set-blocking-2.0.0" = {
-      name = "set-blocking";
-      packageName = "set-blocking";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz";
-        sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7";
-      };
-    };
-    "shebang-command-1.2.0" = {
-      name = "shebang-command";
-      packageName = "shebang-command";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz";
-        sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea";
-      };
-    };
-    "shebang-regex-1.0.0" = {
-      name = "shebang-regex";
-      packageName = "shebang-regex";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz";
-        sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3";
-      };
-    };
-    "signal-exit-3.0.2" = {
-      name = "signal-exit";
-      packageName = "signal-exit";
-      version = "3.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz";
-        sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d";
-      };
-    };
-    "slice-ansi-2.1.0" = {
-      name = "slice-ansi";
-      packageName = "slice-ansi";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz";
-        sha512 = "Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==";
-      };
-    };
-    "source-map-0.1.43" = {
-      name = "source-map";
-      packageName = "source-map";
-      version = "0.1.43";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz";
-        sha1 = "c24bc146ca517c1471f5dacbe2571b2b7f9e3346";
-      };
-    };
-    "source-map-0.6.1" = {
-      name = "source-map";
-      packageName = "source-map";
-      version = "0.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz";
-        sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==";
-      };
-    };
-    "source-map-0.7.3" = {
-      name = "source-map";
-      packageName = "source-map";
-      version = "0.7.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz";
-        sha512 = "CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==";
-      };
-    };
-    "source-map-resolve-0.5.2" = {
-      name = "source-map-resolve";
-      packageName = "source-map-resolve";
-      version = "0.5.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz";
-        sha512 = "MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==";
-      };
-    };
-    "source-map-url-0.4.0" = {
-      name = "source-map-url";
-      packageName = "source-map-url";
-      version = "0.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz";
-        sha1 = "3e935d7ddd73631b97659956d55128e87b5084a3";
-      };
-    };
-    "spdx-correct-3.1.0" = {
-      name = "spdx-correct";
-      packageName = "spdx-correct";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz";
-        sha512 = "lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==";
-      };
-    };
-    "spdx-exceptions-2.2.0" = {
-      name = "spdx-exceptions";
-      packageName = "spdx-exceptions";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz";
-        sha512 = "2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==";
-      };
-    };
-    "spdx-expression-parse-3.0.0" = {
-      name = "spdx-expression-parse";
-      packageName = "spdx-expression-parse";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz";
-        sha512 = "Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==";
-      };
-    };
-    "spdx-license-ids-3.0.5" = {
-      name = "spdx-license-ids";
-      packageName = "spdx-license-ids";
-      version = "3.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz";
-        sha512 = "J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==";
-      };
-    };
-    "split-1.0.1" = {
-      name = "split";
-      packageName = "split";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/split/-/split-1.0.1.tgz";
-        sha512 = "mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==";
-      };
-    };
-    "sprintf-js-1.0.3" = {
-      name = "sprintf-js";
-      packageName = "sprintf-js";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz";
-        sha1 = "04e6926f662895354f3dd015203633b857297e2c";
-      };
-    };
-    "sshpk-1.16.1" = {
-      name = "sshpk";
-      packageName = "sshpk";
-      version = "1.16.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz";
-        sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==";
-      };
-    };
-    "stack-trace-0.0.9" = {
-      name = "stack-trace";
-      packageName = "stack-trace";
-      version = "0.0.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz";
-        sha1 = "a8f6eaeca90674c333e7c43953f275b451510695";
-      };
-    };
-    "string-width-1.0.2" = {
-      name = "string-width";
-      packageName = "string-width";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz";
-        sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3";
-      };
-    };
-    "string-width-2.1.1" = {
-      name = "string-width";
-      packageName = "string-width";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz";
-        sha512 = "nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==";
-      };
-    };
-    "string-width-3.1.0" = {
-      name = "string-width";
-      packageName = "string-width";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz";
-        sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==";
-      };
-    };
-    "string_decoder-1.1.1" = {
-      name = "string_decoder";
-      packageName = "string_decoder";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz";
-        sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==";
-      };
-    };
-    "strip-ansi-3.0.1" = {
-      name = "strip-ansi";
-      packageName = "strip-ansi";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz";
-        sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf";
-      };
-    };
-    "strip-ansi-4.0.0" = {
-      name = "strip-ansi";
-      packageName = "strip-ansi";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz";
-        sha1 = "a8479022eb1ac368a871389b635262c505ee368f";
-      };
-    };
-    "strip-ansi-5.2.0" = {
-      name = "strip-ansi";
-      packageName = "strip-ansi";
-      version = "5.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz";
-        sha512 = "DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==";
-      };
-    };
-    "strip-bom-2.0.0" = {
-      name = "strip-bom";
-      packageName = "strip-bom";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz";
-        sha1 = "6219a85616520491f35788bdbf1447a99c7e6b0e";
-      };
-    };
-    "strip-bom-3.0.0" = {
-      name = "strip-bom";
-      packageName = "strip-bom";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz";
-        sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3";
-      };
-    };
-    "strip-bom-buf-1.0.0" = {
-      name = "strip-bom-buf";
-      packageName = "strip-bom-buf";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/strip-bom-buf/-/strip-bom-buf-1.0.0.tgz";
-        sha1 = "1cb45aaf57530f4caf86c7f75179d2c9a51dd572";
-      };
-    };
-    "strip-bom-stream-3.0.0" = {
-      name = "strip-bom-stream";
-      packageName = "strip-bom-stream";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-3.0.0.tgz";
-        sha1 = "956bcc5d84430f69256a90ed823765cd858e159c";
-      };
-    };
-    "strip-eof-1.0.0" = {
-      name = "strip-eof";
-      packageName = "strip-eof";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz";
-        sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf";
-      };
-    };
-    "strip-json-comments-2.0.1" = {
-      name = "strip-json-comments";
-      packageName = "strip-json-comments";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz";
-        sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a";
-      };
-    };
-    "stylus-0.54.7" = {
-      name = "stylus";
-      packageName = "stylus";
-      version = "0.54.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/stylus/-/stylus-0.54.7.tgz";
-        sha512 = "Yw3WMTzVwevT6ZTrLCYNHAFmanMxdylelL3hkWNgPMeTCpMwpV3nXjpOHuBXtFv7aiO2xRuQS6OoAdgkNcSNug==";
-      };
-    };
-    "supports-color-5.5.0" = {
-      name = "supports-color";
-      packageName = "supports-color";
-      version = "5.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz";
-        sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==";
-      };
-    };
-    "table-5.4.6" = {
-      name = "table";
-      packageName = "table";
-      version = "5.4.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/table/-/table-5.4.6.tgz";
-        sha512 = "wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==";
-      };
-    };
-    "tar-2.2.2" = {
-      name = "tar";
-      packageName = "tar";
-      version = "2.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz";
-        sha512 = "FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==";
-      };
-    };
-    "temp-0.8.3" = {
-      name = "temp";
-      packageName = "temp";
-      version = "0.8.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/temp/-/temp-0.8.3.tgz";
-        sha1 = "e0c6bc4d26b903124410e4fed81103014dfc1f59";
-      };
-    };
-    "text-table-0.2.0" = {
-      name = "text-table";
-      packageName = "text-table";
-      version = "0.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz";
-        sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4";
-      };
-    };
-    "through-2.3.8" = {
-      name = "through";
-      packageName = "through";
-      version = "2.3.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/through/-/through-2.3.8.tgz";
-        sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5";
-      };
-    };
-    "tiny-emitter-2.1.0" = {
-      name = "tiny-emitter";
-      packageName = "tiny-emitter";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz";
-        sha512 = "NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==";
-      };
-    };
-    "tmp-0.0.33" = {
-      name = "tmp";
-      packageName = "tmp";
-      version = "0.0.33";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz";
-        sha512 = "jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==";
-      };
-    };
-    "toml-2.3.6" = {
-      name = "toml";
-      packageName = "toml";
-      version = "2.3.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/toml/-/toml-2.3.6.tgz";
-        sha512 = "gVweAectJU3ebq//Ferr2JUY4WKSDe5N+z0FvjDncLGyHmIDoxgY/2Ie4qfEIDm4IS7OA6Rmdm7pdEEdMcV/xQ==";
-      };
-    };
-    "topsort-0.0.2" = {
-      name = "topsort";
-      packageName = "topsort";
-      version = "0.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/topsort/-/topsort-0.0.2.tgz";
-        sha1 = "2e5e0ee8a1439417f101d5b9b2d035e620263321";
-      };
-    };
-    "tough-cookie-2.4.3" = {
-      name = "tough-cookie";
-      packageName = "tough-cookie";
-      version = "2.4.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz";
-        sha512 = "Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==";
-      };
-    };
-    "ts-process-promises-1.0.2" = {
-      name = "ts-process-promises";
-      packageName = "ts-process-promises";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ts-process-promises/-/ts-process-promises-1.0.2.tgz";
-        sha512 = "6qWWz2HdFbD2uAfgS5t65Dd6HQKYjfra+YXQzKzxIG+RKTpoeDi+x+TW85SEF3cWUI2UecrOXJobvD+04MiTZg==";
-      };
-    };
-    "tslib-1.9.3" = {
-      name = "tslib";
-      packageName = "tslib";
-      version = "1.9.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz";
-        sha512 = "4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==";
-      };
-    };
-    "ttf2woff-2.0.1" = {
-      name = "ttf2woff";
-      packageName = "ttf2woff";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ttf2woff/-/ttf2woff-2.0.1.tgz";
-        sha1 = "871832240024b09db9570904c7c1928b8057c969";
-      };
-    };
-    "ttf2woff2-2.0.3" = {
-      name = "ttf2woff2";
-      packageName = "ttf2woff2";
-      version = "2.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ttf2woff2/-/ttf2woff2-2.0.3.tgz";
-        sha1 = "5e020afe6e643287f3ad7687abed20fe654eb329";
-      };
-    };
-    "tunnel-agent-0.6.0" = {
-      name = "tunnel-agent";
-      packageName = "tunnel-agent";
-      version = "0.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz";
-        sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd";
-      };
-    };
-    "tweetnacl-0.14.5" = {
-      name = "tweetnacl";
-      packageName = "tweetnacl";
-      version = "0.14.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz";
-        sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64";
-      };
-    };
-    "type-check-0.3.2" = {
-      name = "type-check";
-      packageName = "type-check";
-      version = "0.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz";
-        sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72";
-      };
-    };
-    "typed-function-1.1.0" = {
-      name = "typed-function";
-      packageName = "typed-function";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/typed-function/-/typed-function-1.1.0.tgz";
-        sha512 = "TuQzwiT4DDg19beHam3E66oRXhyqlyfgjHB/5fcvsRXbfmWPJfto9B4a0TBdTrQAPGlGmXh/k7iUI+WsObgORA==";
-      };
-    };
-    "typo-geom-0.5.1" = {
-      name = "typo-geom";
-      packageName = "typo-geom";
-      version = "0.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/typo-geom/-/typo-geom-0.5.1.tgz";
-        sha512 = "nj81m0eqRMpK6NcwkGlT9r3CbwjCQhsFU6SBUuYW9TDveqIdi/QUFGkikoImtE1C6OzY2LvuVMSG8rx/ZTCGtQ==";
-      };
-    };
-    "universalify-0.1.2" = {
-      name = "universalify";
-      packageName = "universalify";
-      version = "0.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz";
-        sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==";
-      };
-    };
-    "unorm-1.6.0" = {
-      name = "unorm";
-      packageName = "unorm";
-      version = "1.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/unorm/-/unorm-1.6.0.tgz";
-        sha512 = "b2/KCUlYZUeA7JFUuRJZPUtr4gZvBh7tavtv4fvk4+KV9pfGiR6CQAQAWl49ZpR3ts2dk4FYkP7EIgDJoiOLDA==";
-      };
-    };
-    "uri-js-4.2.2" = {
-      name = "uri-js";
-      packageName = "uri-js";
-      version = "4.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz";
-        sha512 = "KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==";
-      };
-    };
-    "urix-0.1.0" = {
-      name = "urix";
-      packageName = "urix";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz";
-        sha1 = "da937f7a62e21fec1fd18d49b35c2935067a6c72";
-      };
-    };
-    "util-deprecate-1.0.2" = {
-      name = "util-deprecate";
-      packageName = "util-deprecate";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz";
-        sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf";
-      };
-    };
-    "uuid-3.3.3" = {
-      name = "uuid";
-      packageName = "uuid";
-      version = "3.3.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz";
-        sha512 = "pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==";
-      };
-    };
-    "validate-npm-package-license-3.0.4" = {
-      name = "validate-npm-package-license";
-      packageName = "validate-npm-package-license";
-      version = "3.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz";
-        sha512 = "DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==";
-      };
-    };
-    "verda-1.0.0-4" = {
-      name = "verda";
-      packageName = "verda";
-      version = "1.0.0-4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/verda/-/verda-1.0.0-4.tgz";
-        sha512 = "DKr2WdWlPwJvmqCcjs6LPaBOacFQUdk6+u7tqwkxYKbHa0Touff7Y6x+YAWbnT1dace5Qlv/CRr6YBEaB08r3A==";
-      };
-    };
-    "verror-1.10.0" = {
-      name = "verror";
-      packageName = "verror";
-      version = "1.10.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz";
-        sha1 = "3a105ca17053af55d6e270c1f8288682e18da400";
-      };
-    };
-    "which-1.3.1" = {
-      name = "which";
-      packageName = "which";
-      version = "1.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/which/-/which-1.3.1.tgz";
-        sha512 = "HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==";
-      };
-    };
-    "which-module-1.0.0" = {
-      name = "which-module";
-      packageName = "which-module";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz";
-        sha1 = "bba63ca861948994ff307736089e3b96026c2a4f";
-      };
-    };
-    "which-module-2.0.0" = {
-      name = "which-module";
-      packageName = "which-module";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz";
-        sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a";
-      };
-    };
-    "wide-align-1.1.3" = {
-      name = "wide-align";
-      packageName = "wide-align";
-      version = "1.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz";
-        sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==";
-      };
-    };
-    "wordwrap-0.0.3" = {
-      name = "wordwrap";
-      packageName = "wordwrap";
-      version = "0.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz";
-        sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107";
-      };
-    };
-    "wordwrap-1.0.0" = {
-      name = "wordwrap";
-      packageName = "wordwrap";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz";
-        sha1 = "27584810891456a4171c8d0226441ade90cbcaeb";
-      };
-    };
-    "wrap-ansi-2.1.0" = {
-      name = "wrap-ansi";
-      packageName = "wrap-ansi";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz";
-        sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85";
-      };
-    };
-    "wrappy-1.0.2" = {
-      name = "wrappy";
-      packageName = "wrappy";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz";
-        sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f";
-      };
-    };
-    "write-1.0.3" = {
-      name = "write";
-      packageName = "write";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/write/-/write-1.0.3.tgz";
-        sha512 = "/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==";
-      };
-    };
-    "y18n-3.2.1" = {
-      name = "y18n";
-      packageName = "y18n";
-      version = "3.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz";
-        sha1 = "6d15fba884c08679c0d77e88e7759e811e07fa41";
-      };
-    };
-    "yallist-2.1.2" = {
-      name = "yallist";
-      packageName = "yallist";
-      version = "2.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz";
-        sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52";
-      };
-    };
-    "yargs-12.0.5" = {
-      name = "yargs";
-      packageName = "yargs";
-      version = "12.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz";
-        sha512 = "Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==";
-      };
-    };
-    "yargs-6.6.0" = {
-      name = "yargs";
-      packageName = "yargs";
-      version = "6.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz";
-        sha1 = "782ec21ef403345f830a808ca3d513af56065208";
-      };
-    };
-    "yargs-8.0.2" = {
-      name = "yargs";
-      packageName = "yargs";
-      version = "8.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz";
-        sha1 = "6299a9055b1cefc969ff7e79c1d918dceb22c360";
-      };
-    };
-    "yargs-parser-11.1.1" = {
-      name = "yargs-parser";
-      packageName = "yargs-parser";
-      version = "11.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz";
-        sha512 = "C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==";
-      };
-    };
-    "yargs-parser-4.2.1" = {
-      name = "yargs-parser";
-      packageName = "yargs-parser";
-      version = "4.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz";
-        sha1 = "29cceac0dc4f03c6c87b4a9f217dd18c9f74871c";
-      };
-    };
-    "yargs-parser-7.0.0" = {
-      name = "yargs-parser";
-      packageName = "yargs-parser";
-      version = "7.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz";
-        sha1 = "8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9";
-      };
-    };
-  };
-in
-{
-  "iosevka-https://github.com/be5invis/Iosevka/archive/v2.3.0.tar.gz" = nodeEnv.buildNodePackage {
-    name = "iosevka";
-    packageName = "iosevka";
-    version = "2.3.0";
-    src = fetchurl {
-      name = "iosevka-2.3.0.tar.gz";
-      url = https://codeload.github.com/be5invis/Iosevka/tar.gz/v2.3.0;
-      sha256 = "b10e45bc10f6cd5986e4b1f91db55879c66be390ba6643e5ad4755c3941f1d81";
-    };
-    dependencies = [
-      sources."@babel/code-frame-7.5.5"
-      sources."@babel/highlight-7.5.0"
-      sources."JSONStream-1.3.5"
-      sources."abbrev-1.1.1"
-      sources."acorn-6.3.0"
-      sources."acorn-jsx-5.0.2"
-      sources."ajv-6.10.2"
-      sources."amdefine-1.0.1"
-      sources."ansi-escapes-3.2.0"
-      sources."ansi-regex-2.1.1"
-      sources."ansi-styles-3.2.1"
-      sources."aproba-1.2.0"
-      sources."are-we-there-yet-1.1.5"
-      sources."argparse-1.0.10"
-      sources."asn1-0.2.4"
-      sources."assert-plus-1.0.0"
-      sources."astral-regex-1.0.0"
-      sources."asynckit-0.4.0"
-      sources."atob-2.1.2"
-      sources."aws-sign2-0.7.0"
-      sources."aws4-1.8.0"
-      sources."balanced-match-1.0.0"
-      sources."bcrypt-pbkdf-1.0.2"
-      sources."bezier-js-2.4.3"
-      sources."bindings-1.5.0"
-      sources."block-stream-0.0.9"
-      sources."bluebird-3.5.5"
-      sources."brace-expansion-1.1.11"
-      sources."bufferstreams-1.1.3"
-      sources."callsites-3.1.0"
-      sources."camelcase-4.1.0"
-      sources."caryll-shapeops-0.3.1"
-      sources."caseless-0.12.0"
-      sources."chalk-2.4.2"
-      sources."chardet-0.7.0"
-      sources."child-process-promise-2.2.1"
-      sources."cli-cursor-2.1.0"
-      sources."cli-width-2.2.0"
-      sources."clipper-lib-1.0.0"
-      (sources."cliui-3.2.0" // {
-        dependencies = [
-          sources."string-width-1.0.2"
-        ];
-      })
-      sources."clone-2.1.2"
-      sources."code-point-at-1.1.0"
-      sources."color-convert-1.9.3"
-      sources."color-name-1.1.3"
-      sources."colors-1.3.3"
-      sources."combined-stream-1.0.8"
-      sources."complex.js-2.0.11"
-      sources."concat-map-0.0.1"
-      sources."console-control-strings-1.1.0"
-      sources."core-util-is-1.0.2"
-      sources."cross-spawn-4.0.2"
-      sources."css-2.2.4"
-      sources."css-parse-2.0.0"
-      sources."cubic2quad-1.1.1"
-      sources."dashdash-1.14.1"
-      sources."debug-4.1.1"
-      sources."decamelize-1.2.0"
-      sources."decimal.js-10.2.0"
-      sources."decode-uri-component-0.2.0"
-      sources."deep-is-0.1.3"
-      sources."delayed-stream-1.0.0"
-      sources."delegates-1.0.0"
-      sources."doctrine-3.0.0"
-      sources."ecc-jsbn-0.1.2"
-      sources."emoji-regex-7.0.3"
-      sources."end-of-stream-1.4.1"
-      sources."error-ex-1.3.2"
-      sources."escape-latex-1.2.0"
-      sources."escape-string-regexp-1.0.5"
-      sources."escodegen-1.12.0"
-      (sources."escope-1.0.3" // {
-        dependencies = [
-          sources."estraverse-2.0.0"
-        ];
-      })
-      (sources."eslint-5.16.0" // {
-        dependencies = [
-          sources."ansi-regex-3.0.0"
-          sources."cross-spawn-6.0.5"
-          sources."strip-ansi-4.0.0"
-        ];
-      })
-      sources."eslint-scope-4.0.3"
-      sources."eslint-utils-1.4.2"
-      sources."eslint-visitor-keys-1.1.0"
-      (sources."esmangle-1.0.1" // {
-        dependencies = [
-          sources."escodegen-1.3.3"
-          sources."esprima-1.1.1"
-          sources."estraverse-1.5.1"
-          sources."esutils-1.0.0"
-          sources."fast-levenshtein-1.0.7"
-          sources."levn-0.2.5"
-          sources."optionator-0.3.0"
-          sources."source-map-0.1.43"
-          sources."wordwrap-0.0.3"
-        ];
-      })
-      sources."espree-5.0.1"
-      sources."esprima-3.1.3"
-      sources."esquery-1.0.1"
-      sources."esrecurse-4.2.1"
-      (sources."esshorten-1.1.1" // {
-        dependencies = [
-          sources."estraverse-4.1.1"
-        ];
-      })
-      sources."estraverse-4.3.0"
-      sources."esutils-2.0.3"
-      (sources."execa-0.7.0" // {
-        dependencies = [
-          sources."cross-spawn-5.1.0"
-        ];
-      })
-      sources."extend-3.0.2"
-      sources."external-editor-3.1.0"
-      sources."extsprintf-1.3.0"
-      sources."fast-deep-equal-2.0.1"
-      sources."fast-json-stable-stringify-2.0.0"
-      sources."fast-levenshtein-2.0.6"
-      sources."figures-2.0.0"
-      sources."file-entry-cache-5.0.1"
-      sources."file-uri-to-path-1.0.0"
-      sources."find-up-2.1.0"
-      sources."first-chunk-stream-2.0.0"
-      (sources."flat-cache-2.0.1" // {
-        dependencies = [
-          sources."rimraf-2.6.3"
-        ];
-      })
-      sources."flatted-2.0.1"
-      sources."forever-agent-0.6.1"
-      sources."form-data-2.3.3"
-      sources."fraction.js-4.0.12"
-      sources."fs-extra-3.0.1"
-      sources."fs.realpath-1.0.0"
-      sources."fstream-1.0.12"
-      sources."functional-red-black-tree-1.0.1"
-      (sources."gauge-2.7.4" // {
-        dependencies = [
-          sources."string-width-1.0.2"
-        ];
-      })
-      sources."get-caller-file-1.0.3"
-      sources."get-stream-3.0.0"
-      sources."getpass-0.1.7"
-      sources."glob-7.1.4"
-      sources."globals-11.12.0"
-      sources."graceful-fs-4.2.2"
-      sources."har-schema-2.0.0"
-      sources."har-validator-5.1.3"
-      sources."has-flag-3.0.0"
-      sources."has-unicode-2.0.1"
-      sources."hosted-git-info-2.8.4"
-      sources."http-signature-1.2.0"
-      sources."iconv-lite-0.4.24"
-      sources."ignore-4.0.6"
-      sources."import-fresh-3.1.0"
-      sources."imurmurhash-0.1.4"
-      sources."inflight-1.0.6"
-      sources."inherits-2.0.4"
-      (sources."inquirer-6.5.2" // {
-        dependencies = [
-          sources."ansi-regex-4.1.0"
-          sources."strip-ansi-5.2.0"
-        ];
-      })
-      sources."invert-kv-1.0.0"
-      sources."is-arrayish-0.2.1"
-      sources."is-fullwidth-code-point-1.0.0"
-      sources."is-promise-2.1.0"
-      sources."is-stream-1.1.0"
-      sources."is-typedarray-1.0.0"
-      sources."is-utf8-0.2.1"
-      sources."isarray-1.0.0"
-      sources."isexe-2.0.0"
-      sources."isstream-0.1.2"
-      sources."javascript-natural-sort-0.7.1"
-      sources."js-tokens-4.0.0"
-      (sources."js-yaml-3.13.1" // {
-        dependencies = [
-          sources."esprima-4.0.1"
-        ];
-      })
-      sources."jsbn-0.1.1"
-      sources."json-schema-0.2.3"
-      sources."json-schema-traverse-0.4.1"
-      sources."json-stable-stringify-without-jsonify-1.0.1"
-      sources."json-stringify-safe-5.0.1"
-      sources."jsonfile-3.0.1"
-      sources."jsonparse-1.3.1"
-      sources."jsprim-1.4.1"
-      sources."lcid-1.0.0"
-      sources."levn-0.3.0"
-      sources."libspiro-js-0.3.1"
-      sources."load-json-file-2.0.0"
-      sources."locate-path-2.0.0"
-      sources."lodash-4.17.15"
-      sources."lru-cache-4.1.5"
-      sources."map-age-cleaner-0.1.3"
-      sources."mathjs-5.10.3"
-      sources."megaminx-0.9.0"
-      sources."mem-1.1.0"
-      sources."microbuffer-1.0.0"
-      sources."mime-db-1.40.0"
-      sources."mime-types-2.1.24"
-      sources."mimic-fn-1.2.0"
-      sources."minimatch-3.0.4"
-      sources."minimist-0.0.8"
-      sources."mkdirp-0.5.1"
-      sources."ms-2.1.2"
-      sources."mute-stream-0.0.7"
-      sources."nan-2.14.0"
-      sources."natural-compare-1.4.0"
-      sources."nice-try-1.0.5"
-      (sources."node-gyp-3.8.0" // {
-        dependencies = [
-          sources."semver-5.3.0"
-        ];
-      })
-      sources."node-version-1.2.0"
-      sources."nopt-3.0.6"
-      sources."normalize-package-data-2.5.0"
-      sources."npm-run-path-2.0.2"
-      sources."npmlog-4.1.2"
-      sources."number-is-nan-1.0.1"
-      sources."oauth-sign-0.9.0"
-      sources."object-assign-4.1.1"
-      sources."once-1.4.0"
-      sources."onetime-2.0.1"
-      sources."optionator-0.8.2"
-      sources."os-homedir-1.0.2"
-      sources."os-locale-2.1.0"
-      sources."os-tmpdir-1.0.2"
-      sources."osenv-0.1.5"
-      (sources."otfcc-ttcize-0.8.0" // {
-        dependencies = [
-          sources."fs-extra-4.0.3"
-          sources."jsonfile-4.0.0"
-          (sources."megaminx-0.3.3" // {
-            dependencies = [
-              sources."fs-extra-3.0.1"
-              sources."jsonfile-3.0.1"
-            ];
-          })
-          sources."yargs-8.0.2"
-        ];
-      })
-      sources."p-defer-1.0.0"
-      sources."p-finally-1.0.0"
-      sources."p-is-promise-2.1.0"
-      sources."p-limit-1.3.0"
-      sources."p-locate-2.0.0"
-      sources."p-try-1.0.0"
-      sources."pako-1.0.10"
-      sources."parent-module-1.0.1"
-      sources."parse-json-2.2.0"
-      (sources."patel-0.33.1" // {
-        dependencies = [
-          sources."camelcase-3.0.0"
-          sources."find-up-1.1.2"
-          sources."load-json-file-1.1.0"
-          sources."os-locale-1.4.0"
-          sources."path-exists-2.1.0"
-          sources."path-type-1.1.0"
-          sources."read-pkg-1.1.0"
-          sources."read-pkg-up-1.0.1"
-          sources."string-width-1.0.2"
-          sources."strip-bom-2.0.0"
-          sources."which-module-1.0.0"
-          sources."yargs-6.6.0"
-          sources."yargs-parser-4.2.1"
-        ];
-      })
-      sources."path-exists-3.0.0"
-      sources."path-is-absolute-1.0.1"
-      sources."path-is-inside-1.0.2"
-      sources."path-key-2.0.1"
-      sources."path-parse-1.0.6"
-      sources."path-type-2.0.0"
-      sources."patrisika-0.21.0"
-      sources."patrisika-scopes-0.11.1"
-      sources."performance-now-2.1.0"
-      sources."pify-2.3.0"
-      sources."pinkie-2.0.4"
-      sources."pinkie-promise-2.0.1"
-      sources."prelude-ls-1.1.2"
-      sources."primitive-quadify-off-curves-0.4.1"
-      sources."process-nextick-args-2.0.1"
-      sources."progress-2.0.3"
-      sources."promise-polyfill-6.1.0"
-      sources."proper-lockfile-3.2.0"
-      sources."pseudomap-1.0.2"
-      sources."psl-1.4.0"
-      sources."pump-3.0.0"
-      sources."punycode-2.1.1"
-      sources."qs-6.5.2"
-      sources."read-pkg-2.0.0"
-      sources."read-pkg-up-2.0.0"
-      sources."readable-stream-2.3.6"
-      sources."regexpp-2.0.1"
-      sources."request-2.88.0"
-      sources."require-directory-2.1.1"
-      sources."require-main-filename-1.0.1"
-      sources."resolve-1.12.0"
-      sources."resolve-from-4.0.0"
-      sources."resolve-url-0.2.1"
-      sources."restore-cursor-2.0.0"
-      sources."resumer-0.0.0"
-      sources."retry-0.12.0"
-      sources."rimraf-2.2.8"
-      sources."run-async-2.3.0"
-      sources."rxjs-6.5.3"
-      sources."safe-buffer-5.1.2"
-      sources."safer-buffer-2.1.2"
-      sources."sax-1.2.4"
-      sources."seed-random-2.2.0"
-      sources."semaphore-async-await-1.5.1"
-      sources."semver-5.7.1"
-      sources."set-blocking-2.0.0"
-      sources."shebang-command-1.2.0"
-      sources."shebang-regex-1.0.0"
-      sources."signal-exit-3.0.2"
-      (sources."slice-ansi-2.1.0" // {
-        dependencies = [
-          sources."is-fullwidth-code-point-2.0.0"
-        ];
-      })
-      sources."source-map-0.6.1"
-      sources."source-map-resolve-0.5.2"
-      sources."source-map-url-0.4.0"
-      sources."spdx-correct-3.1.0"
-      sources."spdx-exceptions-2.2.0"
-      sources."spdx-expression-parse-3.0.0"
-      sources."spdx-license-ids-3.0.5"
-      sources."split-1.0.1"
-      sources."sprintf-js-1.0.3"
-      sources."sshpk-1.16.1"
-      sources."stack-trace-0.0.9"
-      (sources."string-width-2.1.1" // {
-        dependencies = [
-          sources."ansi-regex-3.0.0"
-          sources."is-fullwidth-code-point-2.0.0"
-          sources."strip-ansi-4.0.0"
-        ];
-      })
-      sources."string_decoder-1.1.1"
-      sources."strip-ansi-3.0.1"
-      sources."strip-bom-3.0.0"
-      sources."strip-bom-buf-1.0.0"
-      sources."strip-bom-stream-3.0.0"
-      sources."strip-eof-1.0.0"
-      sources."strip-json-comments-2.0.1"
-      (sources."stylus-0.54.7" // {
-        dependencies = [
-          sources."debug-3.1.0"
-          sources."ms-2.0.0"
-          sources."semver-6.3.0"
-          sources."source-map-0.7.3"
-        ];
-      })
-      sources."supports-color-5.5.0"
-      (sources."table-5.4.6" // {
-        dependencies = [
-          sources."ansi-regex-4.1.0"
-          sources."is-fullwidth-code-point-2.0.0"
-          sources."string-width-3.1.0"
-          sources."strip-ansi-5.2.0"
-        ];
-      })
-      sources."tar-2.2.2"
-      sources."temp-0.8.3"
-      sources."text-table-0.2.0"
-      sources."through-2.3.8"
-      sources."tiny-emitter-2.1.0"
-      sources."tmp-0.0.33"
-      sources."toml-2.3.6"
-      sources."topsort-0.0.2"
-      (sources."tough-cookie-2.4.3" // {
-        dependencies = [
-          sources."punycode-1.4.1"
-        ];
-      })
-      sources."ts-process-promises-1.0.2"
-      sources."tslib-1.9.3"
-      sources."ttf2woff-2.0.1"
-      sources."ttf2woff2-2.0.3"
-      sources."tunnel-agent-0.6.0"
-      sources."tweetnacl-0.14.5"
-      sources."type-check-0.3.2"
-      sources."typed-function-1.1.0"
-      sources."typo-geom-0.5.1"
-      sources."universalify-0.1.2"
-      sources."unorm-1.6.0"
-      sources."uri-js-4.2.2"
-      sources."urix-0.1.0"
-      sources."util-deprecate-1.0.2"
-      sources."uuid-3.3.3"
-      sources."validate-npm-package-license-3.0.4"
-      (sources."verda-1.0.0-4" // {
-        dependencies = [
-          sources."ansi-regex-4.1.0"
-          sources."fs-extra-6.0.1"
-          sources."jsonfile-4.0.0"
-          sources."strip-ansi-5.2.0"
-        ];
-      })
-      sources."verror-1.10.0"
-      sources."which-1.3.1"
-      sources."which-module-2.0.0"
-      sources."wide-align-1.1.3"
-      sources."wordwrap-1.0.0"
-      (sources."wrap-ansi-2.1.0" // {
-        dependencies = [
-          sources."string-width-1.0.2"
-        ];
-      })
-      sources."wrappy-1.0.2"
-      sources."write-1.0.3"
-      sources."y18n-3.2.1"
-      sources."yallist-2.1.2"
-      (sources."yargs-12.0.5" // {
-        dependencies = [
-          sources."ansi-regex-3.0.0"
-          sources."camelcase-5.3.1"
-          sources."cliui-4.1.0"
-          sources."cross-spawn-6.0.5"
-          sources."execa-1.0.0"
-          sources."find-up-3.0.0"
-          sources."get-stream-4.1.0"
-          sources."invert-kv-2.0.0"
-          sources."lcid-2.0.0"
-          sources."locate-path-3.0.0"
-          sources."mem-4.3.0"
-          sources."mimic-fn-2.1.0"
-          sources."os-locale-3.1.0"
-          sources."p-limit-2.2.1"
-          sources."p-locate-3.0.0"
-          sources."p-try-2.2.0"
-          sources."strip-ansi-4.0.0"
-          sources."yargs-parser-11.1.1"
-        ];
-      })
-      sources."yargs-parser-7.0.0"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-    };
-    production = false;
-    bypassCache = true;
-    reconstructLock = true;
-  };
-}
\ No newline at end of file
diff --git a/pkgs/data/fonts/iosevka/node-packages.json b/pkgs/data/fonts/iosevka/node-packages.json
deleted file mode 100644
index bbbb0c0fc93..00000000000
--- a/pkgs/data/fonts/iosevka/node-packages.json
+++ /dev/null
@@ -1,3 +0,0 @@
-[
-  { "iosevka": "https://github.com/be5invis/Iosevka/archive/v2.3.0.tar.gz" }
-]
diff --git a/pkgs/data/fonts/iosevka/node-packages.nix b/pkgs/data/fonts/iosevka/node-packages.nix
deleted file mode 100644
index 41e23864c44..00000000000
--- a/pkgs/data/fonts/iosevka/node-packages.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file has been generated by node2nix 1.7.0. Do not edit!
-
-{pkgs ? import <nixpkgs> {
-    inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}:
-
-let
-  nodeEnv = import ../../../development/node-packages/node-env.nix {
-    inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
-    inherit nodejs;
-    libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
-  };
-in
-import ./node-packages-generated.nix {
-  inherit (pkgs) fetchurl fetchgit;
-  inherit nodeEnv;
-}
\ No newline at end of file
diff --git a/pkgs/data/fonts/iosevka/package.json b/pkgs/data/fonts/iosevka/package.json
new file mode 100644
index 00000000000..ae162a97538
--- /dev/null
+++ b/pkgs/data/fonts/iosevka/package.json
@@ -0,0 +1,26 @@
+{
+	"name": "iosevka-build-deps",
+	"version": "2.3.0",
+	"scripts": {
+		"build": "verda -f verdafile.js"
+	},
+	"dependencies": {
+		"caryll-shapeops": "^0.3.1",
+		"colors": "^1.3.3",
+		"libspiro-js": "^0.3.1",
+		"megaminx": "^0.9.0",
+		"object-assign": "^4.1.1",
+		"otfcc-ttcize": "^0.8.0",
+		"patel": "^0.33.1",
+		"patrisika-scopes": "^0.11.1",
+		"primitive-quadify-off-curves": "^0.4.0",
+		"stylus": "^0.54.5",
+		"toml": "^2.3.2",
+		"topsort": "0.0.2",
+		"ttf2woff": "^2.0.1",
+		"ttf2woff2": "^2.0.3",
+		"unorm": "^1.4.1",
+		"verda": "^1.0.0-0",
+		"yargs": "^12.0.0"
+	}
+}
diff --git a/pkgs/development/node-packages/node-packages-v10.json b/pkgs/development/node-packages/node-packages-v10.json
index ef5afe37117..76bbedff120 100644
--- a/pkgs/development/node-packages/node-packages-v10.json
+++ b/pkgs/development/node-packages/node-packages-v10.json
@@ -56,6 +56,7 @@
 , "indium"
 , "ionic"
 , "ios-deploy"
+, { "iosevka-build-deps": "../../data/fonts/iosevka" }
 , "jake"
 , "javascript-typescript-langserver"
 , "joplin"
diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix
index 3f4c4d1b9b5..442d6ae383c 100644
--- a/pkgs/development/node-packages/node-packages-v10.nix
+++ b/pkgs/development/node-packages/node-packages-v10.nix
@@ -13,31 +13,31 @@ let
         sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ==";
       };
     };
-    "@angular-devkit/architect-0.803.4" = {
+    "@angular-devkit/architect-0.803.5" = {
       name = "_at_angular-devkit_slash_architect";
       packageName = "@angular-devkit/architect";
-      version = "0.803.4";
+      version = "0.803.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.803.4.tgz";
-        sha512 = "Ek+xb9GfzHLbD+ATmupbzTSNFGddkH6dbb36cB6gme+vnlBVfXP0dxOg5lRKZoUIFJyREl9jSrA5zUhVwXaoVg==";
+        url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.803.5.tgz";
+        sha512 = "hOcYF5fG3oieTc/C1QZqXsON8m8cpdtfdWhY7F7tmqqZ4JBR7igH4SSFQOoQwTj77rsqtkOLI9isVLpoSGX0DQ==";
       };
     };
-    "@angular-devkit/core-8.3.4" = {
+    "@angular-devkit/core-8.3.5" = {
       name = "_at_angular-devkit_slash_core";
       packageName = "@angular-devkit/core";
-      version = "8.3.4";
+      version = "8.3.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@angular-devkit/core/-/core-8.3.4.tgz";
-        sha512 = "QjUN9EakpQ+sFYeMfBMecxVhgI4Vdg0k20h6PZDjZ9lqYNXjpaQVtBo7qiPYHh5kQeJEvdrzca6yeYuCP3TvZw==";
+        url = "https://registry.npmjs.org/@angular-devkit/core/-/core-8.3.5.tgz";
+        sha512 = "ag7Nr94wQUqCFtZjw+rMET+djGBmLk989Id5lLWViW99g4XFeS+e45mJv3JYRzF218+6EdicZz0DGQRYHekVeg==";
       };
     };
-    "@angular-devkit/schematics-8.3.4" = {
+    "@angular-devkit/schematics-8.3.5" = {
       name = "_at_angular-devkit_slash_schematics";
       packageName = "@angular-devkit/schematics";
-      version = "8.3.4";
+      version = "8.3.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-8.3.4.tgz";
-        sha512 = "+QXhrAEcReQJL4fn+35NbcdW5d1vawqSZUokqga8E971YUVUk55mHpIQ39Vpj3S9jhTRYwxsHl+7v9N7UaREmg==";
+        url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-8.3.5.tgz";
+        sha512 = "RMtM10kS+Docg90jzFMa4HQ+UzX95Gi5rCT/kSydEkBhp+Jeu/B0K2y67Fm2/qTdVNRCujrCpEmtiRcp1qsOQg==";
       };
     };
     "@antora/asciidoc-loader-2.1.1" = {
@@ -1273,13 +1273,13 @@ let
         sha1 = "890ae7c5d8c877f6d384860215ace9d7ec945bda";
       };
     };
-    "@hapi/address-2.1.1" = {
+    "@hapi/address-2.1.2" = {
       name = "_at_hapi_slash_address";
       packageName = "@hapi/address";
-      version = "2.1.1";
+      version = "2.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@hapi/address/-/address-2.1.1.tgz";
-        sha512 = "DYuHzu978pP1XW1GD3HGvLnAFjbQTIgc2+V153FGkbS2pgo9haigCdwBnUDrbhaOkgiJlbZvoEqDrcxSLHpiWA==";
+        url = "https://registry.npmjs.org/@hapi/address/-/address-2.1.2.tgz";
+        sha512 = "O4QDrx+JoGKZc6aN64L04vqa7e41tIiLU+OvKdcYaEMP97UttL0f9GIi9/0A4WAMx0uBd6SidDIhktZhgOcN8Q==";
       };
     };
     "@hapi/bourne-1.3.2" = {
@@ -1309,13 +1309,13 @@ let
         sha512 = "entf8ZMOK8sc+8YfeOlM8pCfg3b5+WZIKBfUaaJT8UsjAAPjartzxIYm3TIbjvA4u+u++KbcXD38k682nVHDAQ==";
       };
     };
-    "@hapi/topo-3.1.3" = {
+    "@hapi/topo-3.1.4" = {
       name = "_at_hapi_slash_topo";
       packageName = "@hapi/topo";
-      version = "3.1.3";
+      version = "3.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@hapi/topo/-/topo-3.1.3.tgz";
-        sha512 = "JmS9/vQK6dcUYn7wc2YZTqzIKubAQcJKu2KCKAru6es482U5RT5fP1EXCPtlXpiK7PR0On/kpQKI4fRKkzpZBQ==";
+        url = "https://registry.npmjs.org/@hapi/topo/-/topo-3.1.4.tgz";
+        sha512 = "aVWQTOI9wBD6zawmOr6f+tdEIxQC8JXfQVLTjgGe8YEStAWGn/GNNVTobKJhbWKveQj2RyYF3oYbO9SC8/eOCA==";
       };
     };
     "@iarna/toml-2.2.3" = {
@@ -1327,94 +1327,94 @@ let
         sha512 = "FmuxfCuolpLl0AnQ2NHSzoUKWEJDFl63qXjzdoWBVyFCXzMGm1spBzk7LeHNoVCiWCF7mRVms9e6jEV9+MoPbg==";
       };
     };
-    "@ionic/cli-framework-2.1.6" = {
+    "@ionic/cli-framework-2.1.7" = {
       name = "_at_ionic_slash_cli-framework";
       packageName = "@ionic/cli-framework";
-      version = "2.1.6";
+      version = "2.1.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-2.1.6.tgz";
-        sha512 = "V0jkrOXfPes0N1ECmiWDgcRZSaWq7PUFCctMNNqe4xwbQ61aDNypEIQCvVdgIk16zVBKrMI4EP94Qplvi6CYGw==";
+        url = "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-2.1.7.tgz";
+        sha512 = "osuKbmCIzT0H+g39lDy+EmsP5RHc+aYOv+BN+IngsaxKb7ya0V/JlLO1vLkd7RYT+lmiQWiCi7RpHPeEgQJFtw==";
       };
     };
-    "@ionic/discover-2.0.5" = {
+    "@ionic/discover-2.0.6" = {
       name = "_at_ionic_slash_discover";
       packageName = "@ionic/discover";
-      version = "2.0.5";
+      version = "2.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ionic/discover/-/discover-2.0.5.tgz";
-        sha512 = "4gVq4UvCHzgQtE0Sffc6MZiwDE9XjWhYsKm81h85dz/iVT4sx0c5fFvJzGXg7OFHCsVN2PhmlIwdgmYetqB5Ow==";
+        url = "https://registry.npmjs.org/@ionic/discover/-/discover-2.0.6.tgz";
+        sha512 = "OEjUcVDliTqCWlFGFbD+msTLwQCXNHXUTdg6PQIjDn5RipVSWtpVB+DjLO+D1zYkY6TgD9mxBcIwiYJBRuw5dg==";
       };
     };
-    "@ionic/utils-array-1.2.0" = {
+    "@ionic/utils-array-1.2.1" = {
       name = "_at_ionic_slash_utils-array";
       packageName = "@ionic/utils-array";
-      version = "1.2.0";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ionic/utils-array/-/utils-array-1.2.0.tgz";
-        sha512 = "wJfshi287FRjZM43+w3OkMl4n7hDTmK/9Jxm9Ot5hBDgeLP6Fw/OBb6tt+nGjhRBJbk1oOi7ksJgyBw/+1ldzg==";
+        url = "https://registry.npmjs.org/@ionic/utils-array/-/utils-array-1.2.1.tgz";
+        sha512 = "t0/gXFf70oDPpviGUHpaDD9++zIx8nFXpPm8c3We8iH5dRwEJLSun+AJTqxO/XPzEhM24KBuj3rLY9bSYBadEg==";
       };
     };
-    "@ionic/utils-fs-2.0.6" = {
+    "@ionic/utils-fs-2.0.7" = {
       name = "_at_ionic_slash_utils-fs";
       packageName = "@ionic/utils-fs";
-      version = "2.0.6";
+      version = "2.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-2.0.6.tgz";
-        sha512 = "iU1UwU5NW2nlLvNNE3QoeH6I+wN3a4ypHFcS6Bp7qUDENeI+oTxHzVHKHM6qt7T/24TFLNcHVxcq/pGIt7vgOA==";
+        url = "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-2.0.7.tgz";
+        sha512 = "rXTKJD66qocDs8w72+z7yw6P8H095yexIMsUbNiJFjMm3Cx542i+Tw9gbGwYN356WrA/0EATXD/zVZDzvDsSKQ==";
       };
     };
-    "@ionic/utils-network-1.0.4" = {
+    "@ionic/utils-network-1.0.5" = {
       name = "_at_ionic_slash_utils-network";
       packageName = "@ionic/utils-network";
-      version = "1.0.4";
+      version = "1.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ionic/utils-network/-/utils-network-1.0.4.tgz";
-        sha512 = "VDWlschcLc6t71AAk54ywycVwahRv2qK82DOxdiN02YwurqXclcT2wmZCjnzAgBOPEepqmxj0mKozPA9YYWcbg==";
+        url = "https://registry.npmjs.org/@ionic/utils-network/-/utils-network-1.0.5.tgz";
+        sha512 = "seOoxQUKTugpNjQWYVAmylh6mfddPyE2EsWWyn6ojkp7HurMadvRZa9OQ/PrhMjkphHupPMyuIukaD7F2zMW9Q==";
       };
     };
-    "@ionic/utils-object-1.0.4" = {
+    "@ionic/utils-object-1.0.5" = {
       name = "_at_ionic_slash_utils-object";
       packageName = "@ionic/utils-object";
-      version = "1.0.4";
+      version = "1.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ionic/utils-object/-/utils-object-1.0.4.tgz";
-        sha512 = "B05kWS+Uj0rGrvG1RvAzDBuggstmWM0X4OUb3p9GhZJJQsNK2/0W03VfPOkNuaDi15NF/WFwLS7/yp7kM25mTw==";
+        url = "https://registry.npmjs.org/@ionic/utils-object/-/utils-object-1.0.5.tgz";
+        sha512 = "nyNH8EJcE/xl5G7Zyz5Thy5f1Otj+fhsXca3C5WsCG6y7yb2biDaaw3lgq/KtEYfXyH1znHsbs9hdJNLgCefGQ==";
       };
     };
-    "@ionic/utils-process-1.0.4" = {
+    "@ionic/utils-process-1.0.5" = {
       name = "_at_ionic_slash_utils-process";
       packageName = "@ionic/utils-process";
-      version = "1.0.4";
+      version = "1.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ionic/utils-process/-/utils-process-1.0.4.tgz";
-        sha512 = "F70r4Dup0yz03lDVCiRva2Qz7+VXNtUnfx7pfIFaDQv54sUem7ozG6zl4db5EE3a4RAJUCbM5YQFsAojnEUc+g==";
+        url = "https://registry.npmjs.org/@ionic/utils-process/-/utils-process-1.0.5.tgz";
+        sha512 = "zzDeLiz2lnpI9hKoMHbQiKfbnfFor9LXcW1ZWIKy9YkGOXv80UWbQq43CstMtnDtghcXLS02DaOVtcJPh47psw==";
       };
     };
-    "@ionic/utils-stream-2.0.3" = {
+    "@ionic/utils-stream-2.0.4" = {
       name = "_at_ionic_slash_utils-stream";
       packageName = "@ionic/utils-stream";
-      version = "2.0.3";
+      version = "2.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ionic/utils-stream/-/utils-stream-2.0.3.tgz";
-        sha512 = "Y1OAcJwP8uNCYQiRxywfo85jdOVbfdvRwjuvFVupFrLQet6kOBKh9wHHnivoS9du+Wlq4VjuFh03LmmAaHwenA==";
+        url = "https://registry.npmjs.org/@ionic/utils-stream/-/utils-stream-2.0.4.tgz";
+        sha512 = "qha4Msonb44++xvf8YppBR27dNBRuMLSty4/THH9uD6UEdjU2+23LWACKuqnQUSsZjQdvALVDMcRRWEIYEL2VQ==";
       };
     };
-    "@ionic/utils-subprocess-1.0.7" = {
+    "@ionic/utils-subprocess-1.0.8" = {
       name = "_at_ionic_slash_utils-subprocess";
       packageName = "@ionic/utils-subprocess";
-      version = "1.0.7";
+      version = "1.0.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ionic/utils-subprocess/-/utils-subprocess-1.0.7.tgz";
-        sha512 = "QXCqdwSSGiyxgs36faSbxiVIRCUBI6ckmCSWSLRGZAo4EZ7MuPQUqU+oVILkTWTOPAMWNcJtS67zJNMTccsSUg==";
+        url = "https://registry.npmjs.org/@ionic/utils-subprocess/-/utils-subprocess-1.0.8.tgz";
+        sha512 = "gfVCzccOQ3PVfY6d1hDZq1Qv7hOXAn3ZlepAEbUBOeFauIhXmwmwVdIRa9cfi3cESpDidNQ3dpmXyC+nKxv0Og==";
       };
     };
-    "@ionic/utils-terminal-1.0.4" = {
+    "@ionic/utils-terminal-1.0.5" = {
       name = "_at_ionic_slash_utils-terminal";
       packageName = "@ionic/utils-terminal";
-      version = "1.0.4";
+      version = "1.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ionic/utils-terminal/-/utils-terminal-1.0.4.tgz";
-        sha512 = "+iJbFff7mnJ6ROE465+/DG8eweFmINVy69Bdw9fr8Vcf8WhJWxMw0vd59J/gaUSsHuxoufZYftVXVoWUd8RfWA==";
+        url = "https://registry.npmjs.org/@ionic/utils-terminal/-/utils-terminal-1.0.5.tgz";
+        sha512 = "kaE/sKG3p6y9n73IfR0hU218YORS9P1sg4+GYCie+iGxSTixcKIX7yUBOCY1s2Oav0xS9mjGcpa6ppzANC70bw==";
       };
     };
     "@kbrandwijk/swagger-to-graphql-2.4.3" = {
@@ -2065,13 +2065,13 @@ let
         sha512 = "L4JaJDXn8SGT+5G0uX79rZLv0MNJmfGa4vb4vy1NnpjSnWDLJRy6m90udGwvMmavwsStgbv2QNkPzzTCMmL+ig==";
       };
     };
-    "@octokit/rest-16.28.9" = {
+    "@octokit/rest-16.30.0" = {
       name = "_at_octokit_slash_rest";
       packageName = "@octokit/rest";
-      version = "16.28.9";
+      version = "16.30.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@octokit/rest/-/rest-16.28.9.tgz";
-        sha512 = "IKGnX+Tvzt7XHhs8f4ajqxyJvYAMNX5nWfoJm4CQj8LZToMiaJgutf5KxxpxoC3y5w7JTJpW5rnWnF4TsIvCLA==";
+        url = "https://registry.npmjs.org/@octokit/rest/-/rest-16.30.0.tgz";
+        sha512 = "TN5MbqVuqxT/s87D6tGe3zsMvyHUQSkGFMBHuwBToPQGV3eG2a67rJW2rag2vJr7JusWyERDhQ4g/4HvFo9B1g==";
       };
     };
     "@parcel/fs-1.11.0" = {
@@ -2218,31 +2218,31 @@ let
         sha512 = "YXJqp9gdHcZKAmBY/WnwFpPtNQp2huD/ME2YMurH2YHJvxrVzYsmpKw/pb7yINArRpp8E++fwbQd3ajYXGA45Q==";
       };
     };
-    "@schematics/angular-8.3.4" = {
+    "@schematics/angular-8.3.5" = {
       name = "_at_schematics_slash_angular";
       packageName = "@schematics/angular";
-      version = "8.3.4";
+      version = "8.3.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@schematics/angular/-/angular-8.3.4.tgz";
-        sha512 = "/HO6vZosULsJnwZLG9JLePyaR2g4MePrk27c3H/WbFNN4ajBePe1Mj34q6HCzje30NduLV8B3SykPnG1CoNy5Q==";
+        url = "https://registry.npmjs.org/@schematics/angular/-/angular-8.3.5.tgz";
+        sha512 = "3YKurSNqUfjVrbENVlnTBNGYBWjdyjrWzJRlwWbCq+owQLhkZ/N5qVirt/SDw5T9hK2AEMOKjLkQYtpE+aOCgg==";
       };
     };
-    "@schematics/update-0.803.4" = {
+    "@schematics/update-0.803.5" = {
       name = "_at_schematics_slash_update";
       packageName = "@schematics/update";
-      version = "0.803.4";
+      version = "0.803.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@schematics/update/-/update-0.803.4.tgz";
-        sha512 = "ZLCUR7VpUkv3zjeOmcny3UAtwHbQLeBeDsoLYIVQZyepqk3kRPBGaW/xYwmNng04bVfMCtcTx9yrs7n4+Lt/Iw==";
+        url = "https://registry.npmjs.org/@schematics/update/-/update-0.803.5.tgz";
+        sha512 = "v2qU0ATb1jND8GIGQFnI1QLWoquUjJ2fJ37HoDSO3rmttZ/NvoV4sNDGhk/pPUcmeXa+prURfJCCCSeHZ/yKkw==";
       };
     };
-    "@serverless/cli-1.2.1" = {
+    "@serverless/cli-1.2.3" = {
       name = "_at_serverless_slash_cli";
       packageName = "@serverless/cli";
-      version = "1.2.1";
+      version = "1.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@serverless/cli/-/cli-1.2.1.tgz";
-        sha512 = "+Ip9UsmrH2e6Q36ZHmeEWu4ez36Srl1hgeaM6t6YPGJlNRNFw650Xt43K5EAZpWVvGJNYuNaQs9FZs4ZnakLgQ==";
+        url = "https://registry.npmjs.org/@serverless/cli/-/cli-1.2.3.tgz";
+        sha512 = "N/hsPZrE/zK8Iv98bdEG7J6ZhotWXwywjc/bKWcbhZeXENqbS7UD2qtyL/pfGuNodFVG587l8Cf+UvK8OcA6Qg==";
       };
     };
     "@serverless/component-metrics-1.0.8" = {
@@ -2263,13 +2263,13 @@ let
         sha512 = "XP5KXvEGlrNIOV/KJ0KKwzeov9MqZQ+Ck3z7JW/gtd8ryoKK+5+ah2WL77DXETeHeEwxZhJdrNatqc0FXauEiw==";
       };
     };
-    "@serverless/enterprise-plugin-2.0.0" = {
+    "@serverless/enterprise-plugin-3.0.0" = {
       name = "_at_serverless_slash_enterprise-plugin";
       packageName = "@serverless/enterprise-plugin";
-      version = "2.0.0";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-2.0.0.tgz";
-        sha512 = "jfTXC3eAFkgXbsHfDwLr6od3evwnmz0KhVs/p5HXXh37BGX8ETVFUoWsrIOf92flbGDPBEyzcHXX5cfNBlfNKA==";
+        url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-3.0.0.tgz";
+        sha512 = "+L+SeQV0MKQN9TBXC6Xmgcw7BVfW8Q3F/lMjB1MPsBd0RZPzYnVlWcVg4cA6tgvkpfdw8NVlh/QXFs+603zHrg==";
       };
     };
     "@serverless/event-mocks-1.1.1" = {
@@ -5845,13 +5845,13 @@ let
         sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3";
       };
     };
-    "aws-sdk-2.529.0" = {
+    "aws-sdk-2.533.0" = {
       name = "aws-sdk";
       packageName = "aws-sdk";
-      version = "2.529.0";
+      version = "2.533.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.529.0.tgz";
-        sha512 = "CtRxgI4ZVZ8cdFCddlIVIy06cEW5gzTJBpyouZ/ySgZ6BiYj+0e77LwoNsnQE2nUNWCbydTLn3dbz4ZZMDpuIg==";
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.533.0.tgz";
+        sha512 = "OSe7C0jnBdgfzedOtK+TgBEwtJaaZovm+Q2fbqIlfhUWg3rhhkt3oLyQ9bRD30/CFaunLhLr/8HAAN+/x+DWAA==";
       };
     };
     "aws-sign2-0.6.0" = {
@@ -6943,6 +6943,15 @@ let
         sha1 = "47688cb99bb6804f0e06d3e763b1c32e57d8e6b6";
       };
     };
+    "base64id-2.0.0" = {
+      name = "base64id";
+      packageName = "base64id";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/base64id/-/base64id-2.0.0.tgz";
+        sha512 = "lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==";
+      };
+    };
     "base64url-3.0.1" = {
       name = "base64url";
       packageName = "base64url";
@@ -7105,6 +7114,15 @@ let
         sha1 = "38f716b24c8cee07a262abc41c22c314e20e3869";
       };
     };
+    "bezier-js-2.4.3" = {
+      name = "bezier-js";
+      packageName = "bezier-js";
+      version = "2.4.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bezier-js/-/bezier-js-2.4.3.tgz";
+        sha512 = "qAz1iAGoSE+kk5guAMyvoUgfHq+e5JwK5jRHh2/tuk4XDRUuECrrHLouN27jAzjhlJD2vAsBHofCi5sOn1jcbQ==";
+      };
+    };
     "biased-opener-0.2.8" = {
       name = "biased-opener";
       packageName = "biased-opener";
@@ -7114,13 +7132,13 @@ let
         sha1 = "159a49b9a9714c1fb102f2e0ed1906fab6a450f4";
       };
     };
-    "big-integer-1.6.44" = {
+    "big-integer-1.6.45" = {
       name = "big-integer";
       packageName = "big-integer";
-      version = "1.6.44";
+      version = "1.6.45";
       src = fetchurl {
-        url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.44.tgz";
-        sha512 = "7MzElZPTyJ2fNvBkPxtFQ2fWIkVmuzw41+BZHSzpEq3ymB2MfeKp1+yXl/tS75xCx+WnyV+yb0kp+K1C3UNwmQ==";
+        url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.45.tgz";
+        sha512 = "nmb9E7oEtVJ7SmSCH/DeJobXyuRmaofkpoQSimMFu3HKJ5MADtM825SPLhDuWhZ6TElLAQtgJbQmBZuHIRlZoA==";
       };
     };
     "big.js-5.2.2" = {
@@ -7384,13 +7402,13 @@ let
         sha1 = "f962d687ec2c369570ae71af843256e6d0ca1129";
       };
     };
-    "blessed-contrib-4.8.16" = {
+    "blessed-contrib-4.8.17" = {
       name = "blessed-contrib";
       packageName = "blessed-contrib";
-      version = "4.8.16";
+      version = "4.8.17";
       src = fetchurl {
-        url = "https://registry.npmjs.org/blessed-contrib/-/blessed-contrib-4.8.16.tgz";
-        sha512 = "B1fEJTR+8IsimEvYQbvXCvnV0L674rFxy9yMwqibiRO2nxa5fzwnoKhJjRJFCBYH27ztW+b6jKvnOvetnj30WA==";
+        url = "https://registry.npmjs.org/blessed-contrib/-/blessed-contrib-4.8.17.tgz";
+        sha512 = "uhywRrzJQxtpkowgDHdejIE911Pgt0raYOQUoFC/qREyQvXsz5DMj2J2JVjwcx2bpzbDdHRoP/lcWLE1Ol3vCQ==";
       };
     };
     "blob-0.0.2" = {
@@ -8158,6 +8176,15 @@ let
         sha1 = "b24579c3bed4d6d396aeee6d9a8ae7f5482ab7bb";
       };
     };
+    "bufferstreams-1.1.3" = {
+      name = "bufferstreams";
+      packageName = "bufferstreams";
+      version = "1.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bufferstreams/-/bufferstreams-1.1.3.tgz";
+        sha512 = "HaJnVuslRF4g2kSDeyl++AaVizoitCpL9PglzCYwy0uHHyvWerfvEb8jWmYbF1z4kiVFolGomnxSGl+GUQp2jg==";
+      };
+    };
     "bufferutil-1.3.0" = {
       name = "bufferutil";
       packageName = "bufferutil";
@@ -8662,6 +8689,15 @@ let
         sha1 = "50e21c1b0aa37729f9377def196b5a9cec932ee9";
       };
     };
+    "caryll-shapeops-0.3.1" = {
+      name = "caryll-shapeops";
+      packageName = "caryll-shapeops";
+      version = "0.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/caryll-shapeops/-/caryll-shapeops-0.3.1.tgz";
+        sha512 = "3TdH6DZGL08S6qEvCZLNaOHyFvmzQts8m+TyYEvc6/PiI+XgX5mIag1/CKczIM8e2QtDr8JKW8foo4VNOM8/Og==";
+      };
+    };
     "caseless-0.11.0" = {
       name = "caseless";
       packageName = "caseless";
@@ -9004,6 +9040,15 @@ let
         sha512 = "pmmkpIQRcnDA7EawKcg9+ncSZNTYfXqDx+K3oqqYvpZlqVBChjTomTfw+hePnkqYR3Y013818c0R1Q5P/7PGrQ==";
       };
     };
+    "child-process-promise-2.2.1" = {
+      name = "child-process-promise";
+      packageName = "child-process-promise";
+      version = "2.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/child-process-promise/-/child-process-promise-2.2.1.tgz";
+        sha1 = "4730a11ef610fad450b8f223c79d31d7bdad8074";
+      };
+    };
     "chloride-2.2.14" = {
       name = "chloride";
       packageName = "chloride";
@@ -9067,13 +9112,13 @@ let
         sha512 = "c4PR2egjNjI1um6bamCQ6bUNPDiyofNQruHvKgHQ4gDUP/ITSVSzNsiI5OWtHOsX323i5ha/kk4YmOZ1Ktg7KA==";
       };
     };
-    "chokidar-3.1.0" = {
+    "chokidar-3.1.1" = {
       name = "chokidar";
       packageName = "chokidar";
-      version = "3.1.0";
+      version = "3.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chokidar/-/chokidar-3.1.0.tgz";
-        sha512 = "6vZfo+7W0EOlbSo0nhVKMz4yyssrwiPbBZ8wj1lq8/+l4ZhGZ2U4Md7PspvmijXp1a26D3B7AHEBmIB7aVtaOQ==";
+        url = "https://registry.npmjs.org/chokidar/-/chokidar-3.1.1.tgz";
+        sha512 = "df4o16uZmMHzVQwECZRHwfguOt5ixpuQVaZHjYMvYisgKhE+JXwcj/Tcr3+3bu/XeOJQ9ycYmzu7Mv8XrGxJDQ==";
       };
     };
     "chownr-0.0.2" = {
@@ -9481,6 +9526,15 @@ let
         sha512 = "2WNImOvCRe6r63Gk9pShfkwXsVtKCroMAevIbiae021mS850UkWPbevxsBz3tnvjZIEGvlwaqCPsw+4ulzNgJA==";
       };
     };
+    "clipper-lib-1.0.0" = {
+      name = "clipper-lib";
+      packageName = "clipper-lib";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/clipper-lib/-/clipper-lib-1.0.0.tgz";
+        sha1 = "e902ceb26e28ee5cfa6014abdf790a51efff4ecb";
+      };
+    };
     "cliss-0.0.2" = {
       name = "cliss";
       packageName = "cliss";
@@ -9976,6 +10030,15 @@ let
         sha512 = "mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==";
       };
     };
+    "colors-1.4.0" = {
+      name = "colors";
+      packageName = "colors";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz";
+        sha512 = "a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==";
+      };
+    };
     "colorspace-1.1.2" = {
       name = "colorspace";
       packageName = "colorspace";
@@ -10282,6 +10345,15 @@ let
         sha1 = "0162ec2d9351f5ddd59a9202cba935366a725080";
       };
     };
+    "complex.js-2.0.11" = {
+      name = "complex.js";
+      packageName = "complex.js";
+      version = "2.0.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/complex.js/-/complex.js-2.0.11.tgz";
+        sha512 = "6IArJLApNtdg1P1dFtn3dnyzoZBEF0MwMnrfF1exSBRpZYoy4yieMkpZhQDC0uwctw48vii0CFVyHfpgZ/DfGw==";
+      };
+    };
     "component-bind-1.0.0" = {
       name = "component-bind";
       packageName = "component-bind";
@@ -11290,6 +11362,15 @@ let
         sha512 = "eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==";
       };
     };
+    "cross-spawn-7.0.0" = {
+      name = "cross-spawn";
+      packageName = "cross-spawn";
+      version = "7.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.0.tgz";
+        sha512 = "6U/8SMK2FBNnB21oQ4+6Nsodxanw1gTkntYA2zBdkFYFu3ZDx65P2ONEXGSvob/QS6REjVHQ9zxzdOafwFdstw==";
+      };
+    };
     "cross-spawn-async-2.2.5" = {
       name = "cross-spawn-async";
       packageName = "cross-spawn-async";
@@ -11704,6 +11785,15 @@ let
         sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f";
       };
     };
+    "cubic2quad-1.1.1" = {
+      name = "cubic2quad";
+      packageName = "cubic2quad";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cubic2quad/-/cubic2quad-1.1.1.tgz";
+        sha1 = "69b19c61a3f5b41ecf2f1d5fae8fb03415aa8b15";
+      };
+    };
     "cucumber-html-reporter-3.0.4" = {
       name = "cucumber-html-reporter";
       packageName = "cucumber-html-reporter";
@@ -12271,6 +12361,15 @@ let
         sha1 = "80a4dd323748384bfa248083622aedec982adff3";
       };
     };
+    "decompress-response-4.2.1" = {
+      name = "decompress-response";
+      packageName = "decompress-response";
+      version = "4.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz";
+        sha512 = "jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==";
+      };
+    };
     "decompress-tar-4.1.1" = {
       name = "decompress-tar";
       packageName = "decompress-tar";
@@ -12541,13 +12640,13 @@ let
         sha1 = "2cef1f111e1c57870d8bbb8af2650e587cd2f5b4";
       };
     };
-    "deferred-leveldown-5.2.0" = {
+    "deferred-leveldown-5.2.1" = {
       name = "deferred-leveldown";
       packageName = "deferred-leveldown";
-      version = "5.2.0";
+      version = "5.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-5.2.0.tgz";
-        sha512 = "E1s224a+nv7nEZQL/s+q4ARzBhsfo3KiEjK3qdvDAvMfWE68GnGsMRYKanoZgYqq+LNgyRMYPzBgEmAXjM2i5g==";
+        url = "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-5.2.1.tgz";
+        sha512 = "PwXZRn5EmW+IKYVAYVc7G9FsRkShr0myPubPuq+mtLhDq9xSUqfvTlNZKoeQGeXACHXkeCFurKrz5oo6TZ3qwg==";
       };
     };
     "define-properties-1.1.3" = {
@@ -13801,13 +13900,13 @@ let
         sha512 = "kS/gEPzZs3Y1rRsbGX4UOSjtP/CeJP0CxSNZHYxGfVM/VgLcv0ZqM7C45YyTj2DI2g7+P9Dd24C+IMIg6D0nYQ==";
       };
     };
-    "electron-to-chromium-1.3.260" = {
+    "electron-to-chromium-1.3.264" = {
       name = "electron-to-chromium";
       packageName = "electron-to-chromium";
-      version = "1.3.260";
+      version = "1.3.264";
       src = fetchurl {
-        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.260.tgz";
-        sha512 = "wGt+OivF1C1MPwaSv3LJ96ebNbLAWlx3HndivDDWqwIVSQxmhL17Y/YmwUdEMtS/bPyommELt47Dct0/VZNQBQ==";
+        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.264.tgz";
+        sha512 = "z8E7WkrrquCuGYv+kKyybuZIbdms+4PeHp7Zm2uIgEhAigP0bOwqXILItwj0YO73o+QyHY/7XtEfP5DsHOWQgQ==";
       };
     };
     "elegant-spinner-1.0.1" = {
@@ -14081,6 +14180,15 @@ let
         sha512 = "AsaA9KG7cWPXWHp5FvHdDWY3AMWeZ8x+2pUVLcn71qE5AtAzgGbxuclOytygskw8XGmiQafTmnI9Bix3uihu2w==";
       };
     };
+    "engine.io-3.4.0" = {
+      name = "engine.io";
+      packageName = "engine.io";
+      version = "3.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/engine.io/-/engine.io-3.4.0.tgz";
+        sha512 = "XCyYVWzcHnK5cMz7G4VTu2W7zJS7SM1QkcelghyIk/FmobWBtXE7fwhBusEKvCSqc3bMh8fNFMlUkCKTFRxH2w==";
+      };
+    };
     "engine.io-client-1.3.1" = {
       name = "engine.io-client";
       packageName = "engine.io-client";
@@ -14108,6 +14216,15 @@ let
         sha512 = "y0CPINnhMvPuwtqXfsGuWE8BB66+B6wTtCofQDRecMQPYX3MYUZXFNKDhdrSe3EVjgOu4V3rxdeqN/Tr91IgbQ==";
       };
     };
+    "engine.io-client-3.4.0" = {
+      name = "engine.io-client";
+      packageName = "engine.io-client";
+      version = "3.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.4.0.tgz";
+        sha512 = "a4J5QO2k99CM2a0b12IznnyQndoEvtA4UAldhGzKqnHf42I3Qs2W5SPnDvatZRcMaNZs4IevVicBPayxYt6FwA==";
+      };
+    };
     "engine.io-parser-1.0.6" = {
       name = "engine.io-parser";
       packageName = "engine.io-parser";
@@ -14126,6 +14243,15 @@ let
         sha512 = "6HXPre2O4Houl7c4g7Ic/XzPnHBvaEmN90vtRO9uLmwtRqQmTOw0QMevL1TOfL2Cpu1VzsaTmMotQgMdkzGkVA==";
       };
     };
+    "engine.io-parser-2.2.0" = {
+      name = "engine.io-parser";
+      packageName = "engine.io-parser";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.2.0.tgz";
+        sha512 = "6I3qD9iUxotsC5HEMuuGsKA0cXerGz+4uGcXQEkfBidgKf0amsjrrtwcbwK/nzpZBxclXlV7gGl9dgWvu4LF6w==";
+      };
+    };
     "enhanced-resolve-2.3.0" = {
       name = "enhanced-resolve";
       packageName = "enhanced-resolve";
@@ -14495,6 +14621,15 @@ let
         sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988";
       };
     };
+    "escape-latex-1.2.0" = {
+      name = "escape-latex";
+      packageName = "escape-latex";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/escape-latex/-/escape-latex-1.2.0.tgz";
+        sha512 = "nV5aVWW1K0wEiUIEdZ4erkGGH8mDxGyxSeqPzRNtWP7ataw+/olFObw7hujFWlVjNsaDFw5VZ5NzVSIqRgfTiw==";
+      };
+    };
     "escape-regexp-component-1.0.2" = {
       name = "escape-regexp-component";
       packageName = "escape-regexp-component";
@@ -14540,6 +14675,15 @@ let
         sha512 = "TuA+EhsanGcme5T3R0L80u4t8CpbXQjegRmf7+FPTJrtCTErXFeelblRgHQa1FofEzqYYJmJ/OqjTwREp9qgmg==";
       };
     };
+    "escodegen-1.3.3" = {
+      name = "escodegen";
+      packageName = "escodegen";
+      version = "1.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/escodegen/-/escodegen-1.3.3.tgz";
+        sha1 = "f024016f5a88e046fd12005055e939802e6c5f23";
+      };
+    };
     "escodegen-1.9.1" = {
       name = "escodegen";
       packageName = "escodegen";
@@ -14549,6 +14693,15 @@ let
         sha512 = "6hTjO1NAWkHnDk3OqQ4YrCuwwmGHL9S3nPlzBOUG/R44rda3wLNrfvQ5fkSGjyhHFKM7ALPKcKGrwvCLe0lC7Q==";
       };
     };
+    "escope-1.0.3" = {
+      name = "escope";
+      packageName = "escope";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/escope/-/escope-1.0.3.tgz";
+        sha1 = "759dce8496c4248fec2d0caaf4108bcf3f1a7f5d";
+      };
+    };
     "escope-3.6.0" = {
       name = "escope";
       packageName = "escope";
@@ -14684,6 +14837,15 @@ let
         sha512 = "U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA==";
       };
     };
+    "esmangle-1.0.1" = {
+      name = "esmangle";
+      packageName = "esmangle";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/esmangle/-/esmangle-1.0.1.tgz";
+        sha1 = "d9bb37b8f8eafbf4e6d4ed6b7aa2956abbd3c4c2";
+      };
+    };
     "esniff-1.1.0" = {
       name = "esniff";
       packageName = "esniff";
@@ -14729,6 +14891,15 @@ let
         sha512 = "EYbr8XZUhWbYCqQRW0duU5LxzL5bETN6AjKBGy1302qqzPaCH10QbRg3Wvco79Z8x9WbiE8HYB4e75xl6qUYvQ==";
       };
     };
+    "esprima-1.1.1" = {
+      name = "esprima";
+      packageName = "esprima";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/esprima/-/esprima-1.1.1.tgz";
+        sha1 = "5b6f1547f4d102e670e140c509be6771d6aeb549";
+      };
+    };
     "esprima-2.0.0" = {
       name = "esprima";
       packageName = "esprima";
@@ -14792,6 +14963,42 @@ let
         sha512 = "64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==";
       };
     };
+    "esshorten-1.1.1" = {
+      name = "esshorten";
+      packageName = "esshorten";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/esshorten/-/esshorten-1.1.1.tgz";
+        sha1 = "174f96b7cc267e46872d814e7db7c290bdff61a9";
+      };
+    };
+    "estraverse-1.5.1" = {
+      name = "estraverse";
+      packageName = "estraverse";
+      version = "1.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz";
+        sha1 = "867a3e8e58a9f84618afb6c2ddbcd916b7cbaf71";
+      };
+    };
+    "estraverse-2.0.0" = {
+      name = "estraverse";
+      packageName = "estraverse";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/estraverse/-/estraverse-2.0.0.tgz";
+        sha1 = "5ae46963243600206674ccb24a09e16674fcdca1";
+      };
+    };
+    "estraverse-4.1.1" = {
+      name = "estraverse";
+      packageName = "estraverse";
+      version = "4.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/estraverse/-/estraverse-4.1.1.tgz";
+        sha1 = "f6caca728933a850ef90661d0e17982ba47111a2";
+      };
+    };
     "estraverse-4.3.0" = {
       name = "estraverse";
       packageName = "estraverse";
@@ -14819,6 +15026,15 @@ let
         sha512 = "SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==";
       };
     };
+    "esutils-1.0.0" = {
+      name = "esutils";
+      packageName = "esutils";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/esutils/-/esutils-1.0.0.tgz";
+        sha1 = "8151d358e20c8acc7fb745e7472c0025fe496570";
+      };
+    };
     "esutils-2.0.3" = {
       name = "esutils";
       packageName = "esutils";
@@ -15656,6 +15872,15 @@ let
         sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2";
       };
     };
+    "fast-levenshtein-1.0.7" = {
+      name = "fast-levenshtein";
+      packageName = "fast-levenshtein";
+      version = "1.0.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.0.7.tgz";
+        sha1 = "0178dcdee023b92905193af0959e8a7639cfdcb9";
+      };
+    };
     "fast-levenshtein-2.0.6" = {
       name = "fast-levenshtein";
       packageName = "fast-levenshtein";
@@ -16349,13 +16574,13 @@ let
         sha512 = "ougBA2q6Rn9sZrjZQ9r5pTFxCotlGouySpD2yRIuq5AYwwfIT8HHhVMeSwrN5qJayjHINLJyrnsSkkPCZyfMrQ==";
       };
     };
-    "flow-parser-0.107.0" = {
+    "flow-parser-0.108.0" = {
       name = "flow-parser";
       packageName = "flow-parser";
-      version = "0.107.0";
+      version = "0.108.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.107.0.tgz";
-        sha512 = "GtMCS8qzP0VskiE5qfN4zYiwjnClV/BxPZ4zUqMRUfyaF+gBuLHDTPqVLJ4ndGedrdv54510rsXDSbkCqUig+g==";
+        url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.108.0.tgz";
+        sha512 = "Ug8VuwlyDIZq5Xgrf+T7XLpKydhqYyNd8lmFtf7PZbu90T5LL+FeHjWzxyrBn35RCCZMw7pXrjCrHOSs+2zXyg==";
       };
     };
     "fluent-ffmpeg-2.1.2" = {
@@ -16700,6 +16925,15 @@ let
         sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84";
       };
     };
+    "fraction.js-4.0.12" = {
+      name = "fraction.js";
+      packageName = "fraction.js";
+      version = "4.0.12";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fraction.js/-/fraction.js-4.0.12.tgz";
+        sha512 = "8Z1K0VTG4hzYY7kA/1sj4/r1/RWLBD3xwReT/RCrUCbzPszjNQCCsy3ktkU/eaEqX3MYa4pY37a52eiBlPMlhA==";
+      };
+    };
     "fragment-cache-0.2.1" = {
       name = "fragment-cache";
       packageName = "fragment-cache";
@@ -16898,6 +17132,15 @@ let
         sha512 = "66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==";
       };
     };
+    "fs-extra-6.0.1" = {
+      name = "fs-extra";
+      packageName = "fs-extra";
+      version = "6.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-6.0.1.tgz";
+        sha512 = "GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==";
+      };
+    };
     "fs-extra-7.0.1" = {
       name = "fs-extra";
       packageName = "fs-extra";
@@ -17663,13 +17906,13 @@ let
         sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae";
       };
     };
-    "glob-parent-5.0.0" = {
+    "glob-parent-5.1.0" = {
       name = "glob-parent";
       packageName = "glob-parent";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.0.0.tgz";
-        sha512 = "Z2RwiujPRGluePM6j699ktJYxmPpJKCfpGA13jz2hmFZC7gKetzrWvg5KN3+OsIFmydGyZ1AVwERCq1w/ZZwRg==";
+        url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz";
+        sha512 = "qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==";
       };
     };
     "glob-stream-3.1.18" = {
@@ -17735,13 +17978,13 @@ let
         sha1 = "e76989268a6c74c38908b1305b10fc0e394e9d0f";
       };
     };
-    "global-agent-2.1.0" = {
+    "global-agent-2.1.1" = {
       name = "global-agent";
       packageName = "global-agent";
-      version = "2.1.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/global-agent/-/global-agent-2.1.0.tgz";
-        sha512 = "o5BKvbhjGKHFRMkw+xtZeTEyyHGDsdXaFvOHDQx6pzCURtIaznEL2URkXfp2xxzth8Y/6n9yysHXnjjLH6soBw==";
+        url = "https://registry.npmjs.org/global-agent/-/global-agent-2.1.1.tgz";
+        sha512 = "MjLP2o331SpSxBMBFSWxs5PaWDhjXxysHepQ/hmBCjhjw74cbO9R/IBCbaSJ4GLPKm01dRcgXBtRr7p7XZEnfg==";
       };
     };
     "global-dirs-0.1.1" = {
@@ -18060,6 +18303,15 @@ let
         sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658";
       };
     };
+    "graceful-fs-4.2.1" = {
+      name = "graceful-fs";
+      packageName = "graceful-fs";
+      version = "4.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.1.tgz";
+        sha512 = "b9usnbDGnD928gJB3LrCmxoibr3VE4U2SMo5PBuBnokWyDADTqDPXg4YpwKF1trpH+UbGp7QLicO3+aWEy0+mw==";
+      };
+    };
     "graceful-fs-4.2.2" = {
       name = "graceful-fs";
       packageName = "graceful-fs";
@@ -18132,13 +18384,13 @@ let
         sha512 = "QZ5BL8ZO/B20VA8APauGBg3GyEgZ19eduvpLWoq5x7gMmWnHoy8rlQWPLmWgFvo1yNgjSEFMesmS4R6pPr7xog==";
       };
     };
-    "graphql-14.5.6" = {
+    "graphql-14.5.7" = {
       name = "graphql";
       packageName = "graphql";
-      version = "14.5.6";
+      version = "14.5.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/graphql/-/graphql-14.5.6.tgz";
-        sha512 = "zJ6Oz8P1yptV4O4DYXdArSwvmirPetDOBnGFRBl0zQEC68vNW3Ny8qo8VzMgfr+iC8PKiRYJ+f2wub41oDCoQg==";
+        url = "https://registry.npmjs.org/graphql/-/graphql-14.5.7.tgz";
+        sha512 = "as410RMJSUFqF8RcH2QWxZ5ioqHzsH9VWnWbaU+UnDXJ/6azMDIYPrtXCBPXd8rlunEVb7W8z6fuUnNHMbFu9A==";
       };
     };
     "graphql-anywhere-4.2.4" = {
@@ -18456,13 +18708,13 @@ let
         sha1 = "e28c4d45d05ecbbed818363ce8f9c5926229ffe5";
       };
     };
-    "handlebars-4.2.0" = {
+    "handlebars-4.2.1" = {
       name = "handlebars";
       packageName = "handlebars";
-      version = "4.2.0";
+      version = "4.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/handlebars/-/handlebars-4.2.0.tgz";
-        sha512 = "Kb4xn5Qh1cxAKvQnzNWZ512DhABzyFNmsaJf3OAkWNa4NkaqWcNI8Tao8Tasi0/F4JD9oyG0YxuFyvyR57d+Gw==";
+        url = "https://registry.npmjs.org/handlebars/-/handlebars-4.2.1.tgz";
+        sha512 = "bqPIlDk06UWbVEIFoYj+LVo42WhK96J+b25l7hbFDpxrOXMphFM3fNIm+cluwg4Pk2jiLjWU5nHQY7igGE75NQ==";
       };
     };
     "har-schema-1.0.5" = {
@@ -19330,6 +19582,15 @@ let
         sha512 = "Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==";
       };
     };
+    "http-proxy-1.18.0" = {
+      name = "http-proxy";
+      packageName = "http-proxy";
+      version = "1.18.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.0.tgz";
+        sha512 = "84I2iJM/n1d4Hdgc6y2+qY5mDaz2PUVjlg9znE9byl+q0uC3DeByqBGReQu5tpLK0TAqTIXScRUV+dg7+bUPpQ==";
+      };
+    };
     "http-proxy-agent-2.1.0" = {
       name = "http-proxy-agent";
       packageName = "http-proxy-agent";
@@ -19609,15 +19870,6 @@ let
         sha512 = "4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==";
       };
     };
-    "ieee754-1.1.8" = {
-      name = "ieee754";
-      packageName = "ieee754";
-      version = "1.1.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz";
-        sha1 = "be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4";
-      };
-    };
     "iferr-0.1.5" = {
       name = "iferr";
       packageName = "iferr";
@@ -20095,6 +20347,15 @@ let
         sha512 = "cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==";
       };
     };
+    "inquirer-7.0.0" = {
+      name = "inquirer";
+      packageName = "inquirer";
+      version = "7.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/inquirer/-/inquirer-7.0.0.tgz";
+        sha512 = "rSdC7zelHdRQFkWnhsMu2+2SO41mpv2oF2zy4tMhmiLWkcKbOAs87fWAJhVXttKVwhdZvymvnuM95EyEXg2/tQ==";
+      };
+    };
     "inquirer-autocomplete-prompt-1.0.1" = {
       name = "inquirer-autocomplete-prompt";
       packageName = "inquirer-autocomplete-prompt";
@@ -21679,6 +21940,15 @@ let
         sha512 = "F4y4rQ7RTYFDu6QGsFXOnrZb2Pk6BvhnecOZQZvM+BmNahgE+5y9mfToMe4SsELuJ7NQM5JF+Oau1u/xwefr9A==";
       };
     };
+    "javascript-natural-sort-0.7.1" = {
+      name = "javascript-natural-sort";
+      packageName = "javascript-natural-sort";
+      version = "0.7.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz";
+        sha1 = "f9e2303d4507f6d74355a73664d1440fb5a0ef59";
+      };
+    };
     "javascript-stringify-1.6.0" = {
       name = "javascript-stringify";
       packageName = "javascript-stringify";
@@ -23084,13 +23354,13 @@ let
         sha512 = "SBSR60x+dghhwGUxPKS+BvV1xNqnwsEUBKmnFepPaHJ6VkBXyPK9SImGc3K2BkwBfpxlt7GKkBNlCnrdufsejA==";
       };
     };
-    "leveldown-5.2.0" = {
+    "leveldown-5.2.1" = {
       name = "leveldown";
       packageName = "leveldown";
-      version = "5.2.0";
+      version = "5.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/leveldown/-/leveldown-5.2.0.tgz";
-        sha512 = "Ml6mWFqhhyUbuJUVaOd6ZVBHA5T0XLOK0cwNRIBEDJCjBiJBM3fpi4gdTIhU5/tWqtxMFMQbmo/U7a9rbA1stg==";
+        url = "https://registry.npmjs.org/leveldown/-/leveldown-5.2.1.tgz";
+        sha512 = "369I1rGibXV7CIoLhsSpp/ExwQucI3xUe0RXQrMu4ji6OG9PFMVAQuzsEXKwAi3BWsjFzcFtodAP8MW5fmfung==";
       };
     };
     "levelup-0.19.1" = {
@@ -23129,6 +23399,15 @@ let
         sha1 = "3911737a9cb56da345d008f55782c6f138979ba3";
       };
     };
+    "levn-0.2.5" = {
+      name = "levn";
+      packageName = "levn";
+      version = "0.2.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/levn/-/levn-0.2.5.tgz";
+        sha1 = "ba8d339d0ca4a610e3a3f145b9caf48807155054";
+      };
+    };
     "levn-0.3.0" = {
       name = "levn";
       packageName = "levn";
@@ -23201,6 +23480,15 @@ let
         sha512 = "QE9Q+FxLLGdJRiJTuC2GB3LEHZeHX/VcbMQeNPdAixEKo86JPy6bOWND1XmMLu0tjWUu0xIY0YpJYQApxIZwbQ==";
       };
     };
+    "libspiro-js-0.3.1" = {
+      name = "libspiro-js";
+      packageName = "libspiro-js";
+      version = "0.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/libspiro-js/-/libspiro-js-0.3.1.tgz";
+        sha1 = "86652b0009a6d84ea79a5320bdca5f00612ee439";
+      };
+    };
     "lie-3.3.0" = {
       name = "lie";
       packageName = "lie";
@@ -25326,6 +25614,15 @@ let
         sha256 = "a4d1a272ec79367f3e4515d1cbd9bbe3f77687aa17443398288e91a6f23b1241";
       };
     };
+    "mathjs-5.10.3" = {
+      name = "mathjs";
+      packageName = "mathjs";
+      version = "5.10.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mathjs/-/mathjs-5.10.3.tgz";
+        sha512 = "ySjg30BC3dYjQm73ILZtwcWzFJde0VU6otkXW/57IjjuYRa3Qaf0Kb8pydEuBZYtqW2OxreAtsricrAmOj3jIw==";
+      };
+    };
     "md5-2.2.1" = {
       name = "md5";
       packageName = "md5";
@@ -25479,6 +25776,24 @@ let
         sha512 = "fqm86UwHvAnneIv40Uy1sDQaFtAByq/k0SQ3uCtbnEeSQNT1s5TDHCZOD1VmYCHwfY1jL2NjoZVwzZKYqy3L7A==";
       };
     };
+    "megaminx-0.3.3" = {
+      name = "megaminx";
+      packageName = "megaminx";
+      version = "0.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/megaminx/-/megaminx-0.3.3.tgz";
+        sha512 = "lZBSLMro+XYJIix9zCZ8N6nZgixpjUPkX6CKuh+Y9Wl9bir/2Fp27NWapA0cNQCPrzOOI9sAwxc4BI14aIdumw==";
+      };
+    };
+    "megaminx-0.9.0" = {
+      name = "megaminx";
+      packageName = "megaminx";
+      version = "0.9.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/megaminx/-/megaminx-0.9.0.tgz";
+        sha512 = "1UcxrUXXYboLWS3AJ2NuLckLi3YR7eJiO5LsYAWHZjYE0mmSqJ2ogSt6JrG8YINyogW9/TUWpL1ojwbRsSbyXw==";
+      };
+    };
     "mem-1.1.0" = {
       name = "mem";
       packageName = "mem";
@@ -25956,6 +26271,15 @@ let
         sha512 = "j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==";
       };
     };
+    "mimic-response-2.0.0" = {
+      name = "mimic-response";
+      packageName = "mimic-response";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mimic-response/-/mimic-response-2.0.0.tgz";
+        sha512 = "8ilDoEapqA4uQ3TwS0jakGONKXVJqpy+RpM+3b7pLdOjghCrEiGp9SRkFbUHAmZW9vdnrENWHjaweIoTIJExSQ==";
+      };
+    };
     "min-document-2.19.0" = {
       name = "min-document";
       packageName = "min-document";
@@ -26091,13 +26415,13 @@ let
         sha512 = "oP88Dw3LK/pdrKyMdlbmg3W50969UNr4ctISzJfPl+YPYHTAOrS+dihXnsgRNKSRIzDsrnV3eE2CCVlZbpOKdQ==";
       };
     };
-    "minipass-2.6.2" = {
+    "minipass-2.8.1" = {
       name = "minipass";
       packageName = "minipass";
-      version = "2.6.2";
+      version = "2.8.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minipass/-/minipass-2.6.2.tgz";
-        sha512 = "38Jwdc8AttUDaQAIRX8Iaw3QoCDWjAwKMGeGDF9JUi9QCPMjH5qAQg/hdO8o1nC7Nmh1/CqzMg5FQPEKuKwznQ==";
+        url = "https://registry.npmjs.org/minipass/-/minipass-2.8.1.tgz";
+        sha512 = "QCG523ParRcE2+9A6wYh9UI3uy2FFLw4DQaVYQrY5HPfszc5M6VDD+j0QCwHm19LI2imes4RB+NBD8cOJccyCg==";
       };
     };
     "minitouch-prebuilt-1.2.0" = {
@@ -27653,6 +27977,15 @@ let
         sha512 = "sol30LUpz1jQFBjOKwbjxijiE3b6pjd74YwfD0fJOKPjF+fONKb2Yg8rYgS6+bK6VDl+/wfr4IYpC7jDzLUIfw==";
       };
     };
+    "node-gyp-3.8.0" = {
+      name = "node-gyp";
+      packageName = "node-gyp";
+      version = "3.8.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz";
+        sha512 = "3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==";
+      };
+    };
     "node-gyp-5.0.3" = {
       name = "node-gyp";
       packageName = "node-gyp";
@@ -27914,6 +28247,15 @@ let
         sha1 = "b040eb0923968afabf8d32fb1f17f1167fdab907";
       };
     };
+    "node-version-1.2.0" = {
+      name = "node-version";
+      packageName = "node-version";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-version/-/node-version-1.2.0.tgz";
+        sha512 = "ma6oU4Sk0qOoKEAymVoTvk8EdXEobdS7m/mAGhDJ8Rouugho48crHBORAmy5BoOcv8wraPM6xumapQp5hl4iIQ==";
+      };
+    };
     "node-wsfederation-0.1.1" = {
       name = "node-wsfederation";
       packageName = "node-wsfederation";
@@ -28121,13 +28463,13 @@ let
         sha512 = "U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==";
       };
     };
-    "normalize-url-4.3.0" = {
+    "normalize-url-4.4.1" = {
       name = "normalize-url";
       packageName = "normalize-url";
-      version = "4.3.0";
+      version = "4.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/normalize-url/-/normalize-url-4.3.0.tgz";
-        sha512 = "0NLtR71o4k6GLP+mr6Ty34c5GA6CMoEsncKJxvQd8NzPxaHRJNnb5gZE8R1XF4CPIS7QPHLJ74IFszwtNVAHVQ==";
+        url = "https://registry.npmjs.org/normalize-url/-/normalize-url-4.4.1.tgz";
+        sha512 = "rjH3yRt0Ssx19mUwS0hrDUOdG9VI+oRLpLHJ7tXRdjcuQ7v7wo6qPvOZppHRrqfslTKr0L2yBhjj4UXd7c3cQg==";
       };
     };
     "now-and-later-2.0.1" = {
@@ -28184,13 +28526,13 @@ let
         sha1 = "99b85aec29fcb388d2dd351f0013bf5268787e67";
       };
     };
-    "npm-lifecycle-3.1.3" = {
+    "npm-lifecycle-3.1.4" = {
       name = "npm-lifecycle";
       packageName = "npm-lifecycle";
-      version = "3.1.3";
+      version = "3.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-lifecycle/-/npm-lifecycle-3.1.3.tgz";
-        sha512 = "M0QmmqbEHBXxDrmc6X3+eKjW9+F7Edg1ENau92WkYw1sox6wojHzEZJIRm1ItljEiaigZlKL8mXni/4ylAy1Dg==";
+        url = "https://registry.npmjs.org/npm-lifecycle/-/npm-lifecycle-3.1.4.tgz";
+        sha512 = "tgs1PaucZwkxECGKhC/stbEgFyc3TGh2TJcg2CDr6jbvQRdteHNhmMeljRzpe4wgFAXQADoy1cSqqi7mtiAa5A==";
       };
     };
     "npm-package-arg-6.1.0" = {
@@ -29085,6 +29427,15 @@ let
         sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686";
       };
     };
+    "optionator-0.3.0" = {
+      name = "optionator";
+      packageName = "optionator";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/optionator/-/optionator-0.3.0.tgz";
+        sha1 = "9715a8b5f5e7586cff06c8249e039cd7364d3f54";
+      };
+    };
     "optionator-0.8.2" = {
       name = "optionator";
       packageName = "optionator";
@@ -29274,6 +29625,15 @@ let
         sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==";
       };
     };
+    "otfcc-ttcize-0.8.0" = {
+      name = "otfcc-ttcize";
+      packageName = "otfcc-ttcize";
+      version = "0.8.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/otfcc-ttcize/-/otfcc-ttcize-0.8.0.tgz";
+        sha512 = "0RFgy9TDsgTF/1UJ8bSQ4heTYRatDz3HOXXh8d3WyXReqeOU+edgkbG4ERMFPdzFnA+SgqKTnPRg+2pduZsmSQ==";
+      };
+    };
     "p-any-1.1.0" = {
       name = "p-any";
       packageName = "p-any";
@@ -29490,13 +29850,13 @@ let
         sha512 = "88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==";
       };
     };
-    "p-timeout-3.1.0" = {
+    "p-timeout-3.2.0" = {
       name = "p-timeout";
       packageName = "p-timeout";
-      version = "3.1.0";
+      version = "3.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/p-timeout/-/p-timeout-3.1.0.tgz";
-        sha512 = "C27DYI+tCroT8J8cTEyySGydl2B7FlxrGNF5/wmMbl1V+jeehUCzEE/BVgzRebdm2K3ZitKOKx8YbdFumDyYmw==";
+        url = "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz";
+        sha512 = "rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==";
       };
     };
     "p-try-1.0.0" = {
@@ -29697,13 +30057,13 @@ let
         sha1 = "fedd4d2bf193a77745fe71e371d73c3307d9c751";
       };
     };
-    "parse-asn1-5.1.4" = {
+    "parse-asn1-5.1.5" = {
       name = "parse-asn1";
       packageName = "parse-asn1";
-      version = "5.1.4";
+      version = "5.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.4.tgz";
-        sha512 = "Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw==";
+        url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.5.tgz";
+        sha512 = "jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ==";
       };
     };
     "parse-english-4.1.2" = {
@@ -30111,6 +30471,15 @@ let
         sha1 = "fad9db6ae252f8b088e0c5decd20a7da0c5d9f1e";
       };
     };
+    "patel-0.33.1" = {
+      name = "patel";
+      packageName = "patel";
+      version = "0.33.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/patel/-/patel-0.33.1.tgz";
+        sha512 = "zOv5DhGH2r4cRKnZfOlHmWqxBp9nMGnC3F/NZbUqFCYMA65RXiv8q1F96/6dm2ANR6xvCe+xLODQSb49IFoYQg==";
+      };
+    };
     "path-browserify-0.0.1" = {
       name = "path-browserify";
       packageName = "path-browserify";
@@ -30210,6 +30579,15 @@ let
         sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40";
       };
     };
+    "path-key-3.1.0" = {
+      name = "path-key";
+      packageName = "path-key";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-key/-/path-key-3.1.0.tgz";
+        sha512 = "8cChqz0RP6SHJkMt48FW0A7+qUOn+OsnOsVtzI59tZ8m+5bCSk7hzwET0pulwOM2YMn9J1efb07KB9l9f30SGg==";
+      };
+    };
     "path-loader-1.0.10" = {
       name = "path-loader";
       packageName = "path-loader";
@@ -30336,6 +30714,24 @@ let
         sha1 = "b942e6d4bde653005ef6b71361def8727d0645e0";
       };
     };
+    "patrisika-0.21.0" = {
+      name = "patrisika";
+      packageName = "patrisika";
+      version = "0.21.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/patrisika/-/patrisika-0.21.0.tgz";
+        sha1 = "b82c27f7d4041522dc5c31b43b7c6efb19e47482";
+      };
+    };
+    "patrisika-scopes-0.11.1" = {
+      name = "patrisika-scopes";
+      packageName = "patrisika-scopes";
+      version = "0.11.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/patrisika-scopes/-/patrisika-scopes-0.11.1.tgz";
+        sha512 = "UCIBMx1nzNaR5CcDoQ9/jtY5RlJqf2CrJYHiMZJhi15NPvsPKRfJT/DPZMkhCunexOKmH03EDZYZU1hGn7mL0w==";
+      };
+    };
     "pause-0.0.1" = {
       name = "pause";
       packageName = "pause";
@@ -31363,6 +31759,15 @@ let
         sha512 = "G2gJwLzLcYS+2m6bTAe+CcDpwak9YpcvpScI0tE4WYb2O3lEZD/YywkMNpGqsSx5wttGvh2UXaKROTKKCyM2dw==";
       };
     };
+    "primitive-quadify-off-curves-0.4.1" = {
+      name = "primitive-quadify-off-curves";
+      packageName = "primitive-quadify-off-curves";
+      version = "0.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/primitive-quadify-off-curves/-/primitive-quadify-off-curves-0.4.1.tgz";
+        sha512 = "Kmn+IfF+hcARb1NX+XtoSQIxHS+WeOqqQ3YDihRe3KkvGkFxMrDQFFsDTXxwUOt9KmvD7FgWG6cO2ajZp4lEQg==";
+      };
+    };
     "printf-0.2.5" = {
       name = "printf";
       packageName = "printf";
@@ -31561,6 +31966,15 @@ let
         sha1 = "bbcfd248725259f2bb115a27bfa8d65dc420f931";
       };
     };
+    "promise-polyfill-6.1.0" = {
+      name = "promise-polyfill";
+      packageName = "promise-polyfill";
+      version = "6.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-6.1.0.tgz";
+        sha1 = "dfa96943ea9c121fca4de9b5868cb39d3472e057";
+      };
+    };
     "promise-queue-2.2.5" = {
       name = "promise-queue";
       packageName = "promise-queue";
@@ -31651,6 +32065,15 @@ let
         sha1 = "159fb06193d32003f4b3691dd2ec1a634aa80d1d";
       };
     };
+    "proper-lockfile-3.2.0" = {
+      name = "proper-lockfile";
+      packageName = "proper-lockfile";
+      version = "3.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/proper-lockfile/-/proper-lockfile-3.2.0.tgz";
+        sha512 = "iMghHHXv2bsxl6NchhEaFck8tvX3F9cknEEh1SUpguUOBjN7PAAW9BLzmbc1g/mCD1gY3EE2EABBHPJfFdHFmA==";
+      };
+    };
     "properties-1.2.1" = {
       name = "properties";
       packageName = "properties";
@@ -32722,13 +33145,13 @@ let
         sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==";
       };
     };
-    "qs-6.8.0" = {
+    "qs-6.9.0" = {
       name = "qs";
       packageName = "qs";
-      version = "6.8.0";
+      version = "6.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-6.8.0.tgz";
-        sha512 = "tPSkj8y92PfZVbinY1n84i1Qdx75lZjMQYx9WZhnkofyxzw2r7Ho39G3/aEvSUdebxpnnM4LZJCtvE/Aq3+s9w==";
+        url = "https://registry.npmjs.org/qs/-/qs-6.9.0.tgz";
+        sha512 = "27RP4UotQORTpmNQDX8BHPukOnBP3p1uUJY5UnDhaJB+rMt9iMsok724XL+UHU23bEFOHRMQ2ZhI99qOWUMGFA==";
       };
     };
     "query-string-1.0.1" = {
@@ -35170,6 +35593,15 @@ let
         sha1 = "f0c82d98a3b139a8776a8808050b824431087fca";
       };
     };
+    "seed-random-2.2.0" = {
+      name = "seed-random";
+      packageName = "seed-random";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/seed-random/-/seed-random-2.2.0.tgz";
+        sha1 = "2a9b19e250a817099231a5b99a4daf80b7fbed54";
+      };
+    };
     "seek-bzip-1.0.5" = {
       name = "seek-bzip";
       packageName = "seek-bzip";
@@ -35908,13 +36340,13 @@ let
         sha512 = "lSSHRSw3mQNUGPAYRqo7xy9dhKmxFXIjLjp4KHpf99GEH2VH7C3AM+Qfx6du6jhfUi6Vm7XnbEVEf7Wb6N8jRw==";
       };
     };
-    "simple-get-3.0.3" = {
+    "simple-get-3.1.0" = {
       name = "simple-get";
       packageName = "simple-get";
-      version = "3.0.3";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-get/-/simple-get-3.0.3.tgz";
-        sha512 = "Wvre/Jq5vgoz31Z9stYWPLn0PqRqmBDpFSdypAnHu5AvRVCYPRYGnvryNLiXu8GOBNDH82J2FRHUGMjjHUpXFw==";
+        url = "https://registry.npmjs.org/simple-get/-/simple-get-3.1.0.tgz";
+        sha512 = "bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA==";
       };
     };
     "simple-git-1.126.0" = {
@@ -35944,13 +36376,13 @@ let
         sha1 = "4e421f485ac7b13b08077a4476934d52c5ba3bb3";
       };
     };
-    "simple-peer-9.5.0" = {
+    "simple-peer-9.6.0" = {
       name = "simple-peer";
       packageName = "simple-peer";
-      version = "9.5.0";
+      version = "9.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-peer/-/simple-peer-9.5.0.tgz";
-        sha512 = "3tROq3nBo/CIZI8PWlXGbAxQIlQF6KQ/zcd4lQ2pAC4+rPiV7E721hI22nTO54uw/nzb2HKbvmDtZ4Wr173+vA==";
+        url = "https://registry.npmjs.org/simple-peer/-/simple-peer-9.6.0.tgz";
+        sha512 = "NYqSKPu75xhkZYKGJhCbLCG5kfBtDHf8U9ddk4EKFfYNU7XgIisov+V8wMbVVgyMCfn8pm8uOqQQmE50FPDFWA==";
       };
     };
     "simple-sha1-2.1.2" = {
@@ -36241,13 +36673,13 @@ let
         sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198";
       };
     };
-    "snyk-1.227.0" = {
+    "snyk-1.228.3" = {
       name = "snyk";
       packageName = "snyk";
-      version = "1.227.0";
+      version = "1.228.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk/-/snyk-1.227.0.tgz";
-        sha512 = "ejfq2FIca+b/zu4hkJwFUob1Emn+s9wXYw5VHJSS6BjiniNi6dIa24AARG3BWiVsN/3NvzCYAkcqhYGaJ6xyVw==";
+        url = "https://registry.npmjs.org/snyk/-/snyk-1.228.3.tgz";
+        sha512 = "TwyJcMXBvic1xJ+rVLdIYS1xDYuzcogIXdmyvGvXBZgwIQdjOVMnZBVxUo5igkOIntBL2sCynZiydQtGbe08JA==";
       };
     };
     "snyk-config-2.2.3" = {
@@ -36286,13 +36718,13 @@ let
         sha512 = "9hsGgloioGuey5hbZfv+MkFEslxXHyzUlaAazcR0NsY7VLyG/b2g3f88f/ZwCwlWaKL9LMv/ERIiey3oWAB/qg==";
       };
     };
-    "snyk-gradle-plugin-3.0.2" = {
+    "snyk-gradle-plugin-3.1.0" = {
       name = "snyk-gradle-plugin";
       packageName = "snyk-gradle-plugin";
-      version = "3.0.2";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.0.2.tgz";
-        sha512 = "9nyR03kHmePqBGaQiUeo3RD1YJ4qE5/V4tOmDQ8LNjHTQ54Xr8OXFC5xlJMV8FCtXrRXY0/WX8RMUPEUAm4c9g==";
+        url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.1.0.tgz";
+        sha512 = "789Rqyhv1+WYbfy1Qilgsw0FMccedSaCO5n+54CXXGVUZWMsVvqJj3T8k7+vis+9Eq+Sgbdzti8vDtApz6rWWQ==";
       };
     };
     "snyk-module-1.9.1" = {
@@ -36439,6 +36871,15 @@ let
         sha512 = "wxXrIuZ8AILcn+f1B4ez4hJTPG24iNgxBBDaJfT6MsyOhVYiTXWexGoPkd87ktJG8kQEcL/NBvRi64+9k4Kc0w==";
       };
     };
+    "socket.io-2.3.0" = {
+      name = "socket.io";
+      packageName = "socket.io";
+      version = "2.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socket.io/-/socket.io-2.3.0.tgz";
+        sha512 = "2A892lrj0GcgR/9Qk81EaY2gYhCBxurV0PfmmESO6p27QPrUK1J3zdns+5QPqvUYK2q657nSj0guoIil9+7eFg==";
+      };
+    };
     "socket.io-adapter-0.2.0" = {
       name = "socket.io-adapter";
       packageName = "socket.io-adapter";
@@ -36484,6 +36925,15 @@ let
         sha512 = "56ZrkTDbdTLmBIyfFYesgOxsjcLnwAKoN4CiPyTVkMQj3zTUh0QAx3GbvIvLpFEOvQWu92yyWICxB0u7wkVbYA==";
       };
     };
+    "socket.io-client-2.3.0" = {
+      name = "socket.io-client";
+      packageName = "socket.io-client";
+      version = "2.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.3.0.tgz";
+        sha512 = "cEQQf24gET3rfhxZ2jJ5xzAOo/xhZwK+mOqtGRg5IowZsMgwvHwnf/mCRapAAkadhM26y+iydgwsXGObBB5ZdA==";
+      };
+    };
     "socket.io-parser-2.1.2" = {
       name = "socket.io-parser";
       packageName = "socket.io-parser";
@@ -36520,6 +36970,15 @@ let
         sha512 = "hczmV6bDgdaEbVqhAeVMM/jfUfzuEZHsQg6eOmLgJht6G3mPKMxYm75w2+qhAQZ+4X+1+ATZ+QFKeOZD5riHng==";
       };
     };
+    "socket.io-parser-3.4.0" = {
+      name = "socket.io-parser";
+      packageName = "socket.io-parser";
+      version = "3.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.4.0.tgz";
+        sha512 = "/G/VOI+3DBp0+DJKW4KesGnQkQPFmUCbA/oO2QGT6CWxU7hLGWqU3tyuzeSK/dqcyeHsQg1vTe9jiZI8GU9SCQ==";
+      };
+    };
     "socks-2.3.2" = {
       name = "socks";
       packageName = "socks";
@@ -38329,6 +38788,15 @@ let
         sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3";
       };
     };
+    "strip-bom-buf-1.0.0" = {
+      name = "strip-bom-buf";
+      packageName = "strip-bom-buf";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-bom-buf/-/strip-bom-buf-1.0.0.tgz";
+        sha1 = "1cb45aaf57530f4caf86c7f75179d2c9a51dd572";
+      };
+    };
     "strip-bom-buf-2.0.0" = {
       name = "strip-bom-buf";
       packageName = "strip-bom-buf";
@@ -38347,6 +38815,15 @@ let
         sha1 = "f87db5ef2613f6968aa545abfe1ec728b6a829ca";
       };
     };
+    "strip-bom-stream-3.0.0" = {
+      name = "strip-bom-stream";
+      packageName = "strip-bom-stream";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-3.0.0.tgz";
+        sha1 = "956bcc5d84430f69256a90ed823765cd858e159c";
+      };
+    };
     "strip-bom-stream-4.0.0" = {
       name = "strip-bom-stream";
       packageName = "strip-bom-stream";
@@ -39059,13 +39536,13 @@ let
         sha512 = "FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==";
       };
     };
-    "tar-4.4.10" = {
+    "tar-4.4.11" = {
       name = "tar";
       packageName = "tar";
-      version = "4.4.10";
+      version = "4.4.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tar/-/tar-4.4.10.tgz";
-        sha512 = "g2SVs5QIxvo6OLp0GudTqEf05maawKUxXru104iaayWA09551tFCTI8f1Asb4lPfkBr91k07iL4c11XO3/b0tA==";
+        url = "https://registry.npmjs.org/tar/-/tar-4.4.11.tgz";
+        sha512 = "iI4zh3ktLJKaDNZKZc+fUONiQrSn9HkCFzamtb7k8FFmVilHVob7QsLX/VySAW8lAviMzMbFw4QtFb4errwgYA==";
       };
     };
     "tar-fs-2.0.0" = {
@@ -39581,13 +40058,13 @@ let
         sha1 = "f32eacac5a175bea25d7fab565ab3ed8741ef56f";
       };
     };
-    "timeout-refresh-1.0.0" = {
+    "timeout-refresh-1.0.1" = {
       name = "timeout-refresh";
       packageName = "timeout-refresh";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/timeout-refresh/-/timeout-refresh-1.0.0.tgz";
-        sha512 = "y5ajDPPtyhumr7xRnQgOMMVR5/EXMCVHPwM7RWnMUZx9UzT8FGRBtwG4/rh2AWHkDr7JR8dBHU6NDGx7tEiEAg==";
+        url = "https://registry.npmjs.org/timeout-refresh/-/timeout-refresh-1.0.1.tgz";
+        sha512 = "bW5oSShdwFCN9K7RpB5dkq5bqNlGt8Lwbfxr8vprysk8hDiK5yy7Mgf2Qlz2ssE0gfQfoYhk4VLY9Hhsnr9Ulw==";
       };
     };
     "timers-browserify-1.4.2" = {
@@ -40004,6 +40481,15 @@ let
         sha512 = "ePZfjs1ajL4b8jT4MeVId+9Ci5hJCzAtNIEXIHyFYmKmQuX+eHC/RNv6tuLMUhrGrhJ+sYWW/lBF/LKILHGZEA==";
       };
     };
+    "topsort-0.0.2" = {
+      name = "topsort";
+      packageName = "topsort";
+      version = "0.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/topsort/-/topsort-0.0.2.tgz";
+        sha1 = "2e5e0ee8a1439417f101d5b9b2d035e620263321";
+      };
+    };
     "torrent-discovery-5.4.0" = {
       name = "torrent-discovery";
       packageName = "torrent-discovery";
@@ -40355,6 +40841,15 @@ let
         sha512 = "5LpRN+mTiCs7lI5EtbXmF/HfMeCjzt7DH9CZwtkr6SywStrNQC723wG+aOWFiLNn7zT3kD/RnFqi3ZUfr4l5Qw==";
       };
     };
+    "ts-process-promises-1.0.2" = {
+      name = "ts-process-promises";
+      packageName = "ts-process-promises";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ts-process-promises/-/ts-process-promises-1.0.2.tgz";
+        sha512 = "6qWWz2HdFbD2uAfgS5t65Dd6HQKYjfra+YXQzKzxIG+RKTpoeDi+x+TW85SEF3cWUI2UecrOXJobvD+04MiTZg==";
+      };
+    };
     "tslib-1.10.0" = {
       name = "tslib";
       packageName = "tslib";
@@ -40400,6 +40895,24 @@ let
         sha512 = "g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==";
       };
     };
+    "ttf2woff-2.0.1" = {
+      name = "ttf2woff";
+      packageName = "ttf2woff";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ttf2woff/-/ttf2woff-2.0.1.tgz";
+        sha1 = "871832240024b09db9570904c7c1928b8057c969";
+      };
+    };
+    "ttf2woff2-2.0.3" = {
+      name = "ttf2woff2";
+      packageName = "ttf2woff2";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ttf2woff2/-/ttf2woff2-2.0.3.tgz";
+        sha1 = "5e020afe6e643287f3ad7687abed20fe654eb329";
+      };
+    };
     "ttl-1.3.1" = {
       name = "ttl";
       packageName = "ttl";
@@ -40535,13 +41048,13 @@ let
         sha512 = "/XrQjW0e5Z915m1A0qeXD9tSLDmz8zGjR6imhGDme6rMtXYudFpXXhaToKnM52nPPCNdCh6YQsLLkwbbkFvzVA==";
       };
     };
-    "type-1.0.3" = {
+    "type-1.2.0" = {
       name = "type";
       packageName = "type";
-      version = "1.0.3";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/type/-/type-1.0.3.tgz";
-        sha512 = "51IMtNfVcee8+9GJvj0spSuFcZHe9vSib6Xtgsny1Km9ugyz2mbS08I3rsUIRYgJohFRFU1160sgRodYz378Hg==";
+        url = "https://registry.npmjs.org/type/-/type-1.2.0.tgz";
+        sha512 = "+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==";
       };
     };
     "type-check-0.3.2" = {
@@ -40607,6 +41120,15 @@ let
         sha512 = "4LHc1KMNJ6NDGO+dSM/yNfZQRtp8NN7psYrPHUblD62Dvkwsp3VShsbM78kOgpcmMkRTgvwdKOTjctS+uMllgQ==";
       };
     };
+    "typed-function-1.1.0" = {
+      name = "typed-function";
+      packageName = "typed-function";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/typed-function/-/typed-function-1.1.0.tgz";
+        sha512 = "TuQzwiT4DDg19beHam3E66oRXhyqlyfgjHB/5fcvsRXbfmWPJfto9B4a0TBdTrQAPGlGmXh/k7iUI+WsObgORA==";
+      };
+    };
     "typedarray-0.0.6" = {
       name = "typedarray";
       packageName = "typedarray";
@@ -40706,6 +41228,15 @@ let
         sha1 = "5c080e5d661cbbe38259d2e70a3c7253e873881d";
       };
     };
+    "typo-geom-0.5.1" = {
+      name = "typo-geom";
+      packageName = "typo-geom";
+      version = "0.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/typo-geom/-/typo-geom-0.5.1.tgz";
+        sha512 = "nj81m0eqRMpK6NcwkGlT9r3CbwjCQhsFU6SBUuYW9TDveqIdi/QUFGkikoImtE1C6OzY2LvuVMSG8rx/ZTCGtQ==";
+      };
+    };
     "ua-parser-js-0.7.20" = {
       name = "ua-parser-js";
       packageName = "ua-parser-js";
@@ -41417,6 +41948,15 @@ let
         sha512 = "eUmNTPzdx+q/WvOHW0bgGYLWvWHNT3PTKEQLg0MAQhc0AHASHVHoP/9YytYd4RBVariqno/mEUhVZN98CmD7bg==";
       };
     };
+    "unorm-1.6.0" = {
+      name = "unorm";
+      packageName = "unorm";
+      version = "1.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/unorm/-/unorm-1.6.0.tgz";
+        sha512 = "b2/KCUlYZUeA7JFUuRJZPUtr4gZvBh7tavtv4fvk4+KV9pfGiR6CQAQAWl49ZpR3ts2dk4FYkP7EIgDJoiOLDA==";
+      };
+    };
     "unpack-string-0.0.2" = {
       name = "unpack-string";
       packageName = "unpack-string";
@@ -42272,6 +42812,15 @@ let
         sha512 = "fOi47nsJP5Wqefa43kyWSg80qF+Q3XA6MUkgi7Hp1HQaKDQW4cQrK2D0P7mmbFtsV1N89am55Yru/nyEwRubcw==";
       };
     };
+    "verda-1.0.0-4" = {
+      name = "verda";
+      packageName = "verda";
+      version = "1.0.0-4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/verda/-/verda-1.0.0-4.tgz";
+        sha512 = "DKr2WdWlPwJvmqCcjs6LPaBOacFQUdk6+u7tqwkxYKbHa0Touff7Y6x+YAWbnT1dace5Qlv/CRr6YBEaB08r3A==";
+      };
+    };
     "verror-1.1.0" = {
       name = "verror";
       packageName = "verror";
@@ -43019,13 +43568,13 @@ let
         sha512 = "5nIvteTDCUws2DVvP9Qe+JPla7kWPPIDFZv55To7IycHWZ+Z5qBdaBYPyuXWdhggTufZkQwfIK+5rKQTVovm2A==";
       };
     };
-    "webpack-cli-3.3.8" = {
+    "webpack-cli-3.3.9" = {
       name = "webpack-cli";
       packageName = "webpack-cli";
-      version = "3.3.8";
+      version = "3.3.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.8.tgz";
-        sha512 = "RANYSXwikSWINjHMd/mtesblNSpjpDLoYTBtP99n1RhXqVI/wxN40Auqy42I7y4xrbmRBoA5Zy5E0JSBD5XRhw==";
+        url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.9.tgz";
+        sha512 = "xwnSxWl8nZtBl/AFJCOn9pG7s5CYUYdZxmmukv+fAHLcBIHM36dImfpQg3WfShZXeArkWlf6QRw24Klcsv8a5A==";
       };
     };
     "webpack-core-0.6.9" = {
@@ -44592,17 +45141,17 @@ in
   "@angular/cli" = nodeEnv.buildNodePackage {
     name = "_at_angular_slash_cli";
     packageName = "@angular/cli";
-    version = "8.3.4";
+    version = "8.3.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/@angular/cli/-/cli-8.3.4.tgz";
-      sha512 = "5Jp7a1/Yepm2JkrMHY2Q7nO1FxlNvGp1Zc3m9dp4ydH08qO6/Z8WO0HF+/BxAsHZzB+XV91E1ZzbLR0RdsM8ag==";
+      url = "https://registry.npmjs.org/@angular/cli/-/cli-8.3.5.tgz";
+      sha512 = "gKzYV5YhypXKpt4vH/YJ/T7a72EqxTJynJ8dtoVsZw5YTdCzqa6APvObNs4lZaZ3pYxUOQr36W4Rz8Lv8CSBWA==";
     };
     dependencies = [
-      sources."@angular-devkit/architect-0.803.4"
-      sources."@angular-devkit/core-8.3.4"
-      sources."@angular-devkit/schematics-8.3.4"
-      sources."@schematics/angular-8.3.4"
-      sources."@schematics/update-0.803.4"
+      sources."@angular-devkit/architect-0.803.5"
+      sources."@angular-devkit/core-8.3.5"
+      sources."@angular-devkit/schematics-8.3.5"
+      sources."@schematics/angular-8.3.5"
+      sources."@schematics/update-0.803.5"
       sources."@yarnpkg/lockfile-1.1.0"
       sources."JSONStream-1.3.5"
       sources."agent-base-4.3.0"
@@ -44734,7 +45283,7 @@ in
       sources."mimic-fn-2.1.0"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
-      sources."minipass-2.6.2"
+      sources."minipass-2.8.1"
       sources."minizlib-1.2.2"
       sources."mississippi-3.0.0"
       sources."mkdirp-0.5.1"
@@ -44846,7 +45395,7 @@ in
       sources."strip-ansi-5.2.0"
       sources."supports-color-5.5.0"
       sources."symbol-observable-1.2.0"
-      sources."tar-4.4.10"
+      sources."tar-4.4.11"
       sources."through-2.3.8"
       sources."through2-2.0.5"
       sources."tmp-0.0.33"
@@ -44980,7 +45529,11 @@ in
       sources."clean-git-ref-1.0.3"
       sources."clone-2.1.2"
       sources."clone-buffer-1.0.0"
-      sources."clone-response-1.0.2"
+      (sources."clone-response-1.0.2" // {
+        dependencies = [
+          sources."mimic-response-1.0.1"
+        ];
+      })
       sources."clone-stats-1.0.0"
       (sources."cloneable-readable-1.1.3" // {
         dependencies = [
@@ -45000,7 +45553,7 @@ in
       sources."core-util-is-1.0.2"
       sources."crc-32-1.2.0"
       sources."decamelize-1.2.0"
-      sources."decompress-response-3.3.0"
+      sources."decompress-response-4.2.1"
       sources."deep-freeze-node-1.1.3"
       sources."defer-to-connect-1.0.2"
       sources."define-properties-1.1.3"
@@ -45059,7 +45612,12 @@ in
       })
       sources."globalyzer-0.1.4"
       sources."globrex-0.1.2"
-      sources."got-9.6.0"
+      (sources."got-9.6.0" // {
+        dependencies = [
+          sources."decompress-response-3.3.0"
+          sources."mimic-response-1.0.1"
+        ];
+      })
       sources."graceful-fs-4.2.2"
       (sources."gulp-vinyl-zip-2.1.2" // {
         dependencies = [
@@ -45069,7 +45627,7 @@ in
           sources."through2-2.0.5"
         ];
       })
-      sources."handlebars-4.2.0"
+      sources."handlebars-4.2.1"
       sources."has-symbols-1.0.0"
       sources."http-cache-semantics-4.0.3"
       sources."ignore-5.1.4"
@@ -45110,7 +45668,7 @@ in
       sources."matcher-2.0.0"
       sources."mime-db-1.40.0"
       sources."mime-types-2.1.24"
-      sources."mimic-response-1.0.1"
+      sources."mimic-response-2.0.0"
       sources."minimatch-3.0.4"
       sources."minimatch-all-1.1.0"
       sources."minimist-1.2.0"
@@ -45120,7 +45678,7 @@ in
       sources."neo-async-2.6.1"
       sources."nick-0.1.3"
       sources."normalize-path-2.1.1"
-      sources."normalize-url-4.3.0"
+      sources."normalize-url-4.4.1"
       sources."now-and-later-2.0.1"
       sources."object-keys-1.1.1"
       sources."object.assign-4.1.0"
@@ -45179,7 +45737,7 @@ in
       sources."safe-buffer-5.2.0"
       sources."sha.js-2.4.11"
       sources."simple-concat-1.0.0"
-      sources."simple-get-3.0.3"
+      sources."simple-get-3.1.0"
       sources."source-map-0.6.1"
       sources."split-0.3.3"
       sources."split2-3.1.1"
@@ -45347,11 +45905,11 @@ in
       sources."@babel/template-7.6.0"
       sources."@babel/traverse-7.6.0"
       sources."@babel/types-7.6.1"
-      sources."@hapi/address-2.1.1"
+      sources."@hapi/address-2.1.2"
       sources."@hapi/bourne-1.3.2"
       sources."@hapi/hoek-8.2.4"
       sources."@hapi/joi-15.1.1"
-      sources."@hapi/topo-3.1.3"
+      sources."@hapi/topo-3.1.4"
       sources."@mrmlnc/readdir-enhanced-2.2.1"
       sources."@nodelib/fs.stat-1.1.3"
       sources."@protobufjs/aspromise-1.1.2"
@@ -45531,7 +46089,7 @@ in
       sources."collection-visit-1.0.0"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
-      sources."colors-1.3.3"
+      sources."colors-1.4.0"
       sources."combined-stream-1.0.8"
       sources."commander-2.20.0"
       sources."commondir-1.0.1"
@@ -45618,7 +46176,7 @@ in
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
       sources."ejs-2.7.1"
-      sources."electron-to-chromium-1.3.260"
+      sources."electron-to-chromium-1.3.264"
       sources."encodeurl-1.0.2"
       sources."end-of-stream-1.4.1"
       sources."entities-1.1.2"
@@ -45699,7 +46257,7 @@ in
       })
       sources."find-up-3.0.0"
       sources."fkill-6.2.0"
-      sources."flow-parser-0.107.0"
+      sources."flow-parser-0.108.0"
       sources."for-in-1.0.2"
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.3"
@@ -45741,7 +46299,7 @@ in
       sources."got-6.7.1"
       sources."graceful-fs-4.2.2"
       sources."graceful-readlink-1.0.1"
-      sources."graphql-14.5.6"
+      sources."graphql-14.5.7"
       (sources."graphql-anywhere-4.2.4" // {
         dependencies = [
           sources."ts-invariant-0.3.3"
@@ -46583,7 +47141,7 @@ in
       sources."chmodr-1.2.0"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
-      sources."colors-1.3.3"
+      sources."colors-1.4.0"
       sources."commander-2.20.0"
       sources."concat-map-0.0.1"
       sources."convert-source-map-1.6.0"
@@ -47142,7 +47700,7 @@ in
       sources."agent-base-4.3.0"
       sources."ansi-styles-3.2.1"
       sources."balanced-match-1.0.0"
-      sources."big-integer-1.6.44"
+      sources."big-integer-1.6.45"
       sources."binary-0.3.0"
       sources."bluebird-3.4.7"
       sources."brace-expansion-1.1.11"
@@ -47253,7 +47811,7 @@ in
           sources."whatwg-url-7.0.0"
         ];
       })
-      sources."decompress-response-3.3.0"
+      sources."decompress-response-4.2.1"
       sources."deep-extend-0.6.0"
       sources."deep-is-0.1.3"
       sources."delayed-stream-1.0.0"
@@ -47305,7 +47863,7 @@ in
       sources."lodash.sortby-4.7.0"
       sources."mime-db-1.40.0"
       sources."mime-types-2.1.24"
-      sources."mimic-response-1.0.1"
+      sources."mimic-response-2.0.0"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
       (sources."mkdirp-0.5.1" // {
@@ -47351,7 +47909,7 @@ in
       sources."set-blocking-2.0.0"
       sources."signal-exit-3.0.2"
       sources."simple-concat-1.0.0"
-      sources."simple-get-3.0.3"
+      sources."simple-get-3.1.0"
       sources."source-map-0.6.1"
       sources."sshpk-1.16.1"
       sources."stealthy-require-1.1.1"
@@ -47672,7 +48230,7 @@ in
       sources."os-browserify-0.3.0"
       sources."pako-1.0.10"
       sources."parents-1.0.1"
-      sources."parse-asn1-5.1.4"
+      sources."parse-asn1-5.1.5"
       sources."path-browserify-0.0.1"
       sources."path-is-absolute-1.0.1"
       sources."path-parse-1.0.6"
@@ -48246,7 +48804,7 @@ in
       sources."code-point-at-1.1.0"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
-      sources."colors-1.3.3"
+      sources."colors-1.4.0"
       sources."commander-2.20.0"
       sources."debug-3.2.6"
       sources."escape-string-regexp-1.0.5"
@@ -48293,7 +48851,7 @@ in
       sources."color-name-1.1.3"
       sources."color-string-1.5.3"
       sources."colornames-1.1.1"
-      sources."colors-1.3.3"
+      sources."colors-1.4.0"
       sources."colorspace-1.1.2"
       sources."commander-2.19.0"
       sources."core-util-is-1.0.2"
@@ -48395,7 +48953,7 @@ in
       })
       sources."base64-js-1.3.1"
       sources."bcrypt-pbkdf-1.0.2"
-      sources."big-integer-1.6.44"
+      sources."big-integer-1.6.45"
       (sources."body-parser-1.19.0" // {
         dependencies = [
           sources."bytes-3.1.0"
@@ -49407,7 +49965,7 @@ in
       sources."performance-now-2.1.0"
       sources."process-nextick-args-2.0.1"
       sources."pseudomap-1.0.2"
-      sources."qs-6.8.0"
+      sources."qs-6.9.0"
       sources."quicktask-1.1.0"
       sources."raf-3.3.2"
       sources."readable-stream-2.3.6"
@@ -49437,7 +49995,7 @@ in
       sources."symbol-observable-1.2.0"
       sources."through-2.3.8"
       sources."tmp-0.0.33"
-      sources."type-1.0.3"
+      sources."type-1.2.0"
       sources."util-deprecate-1.0.2"
       (sources."variable-diff-1.1.0" // {
         dependencies = [
@@ -49461,10 +50019,10 @@ in
   create-react-app = nodeEnv.buildNodePackage {
     name = "create-react-app";
     packageName = "create-react-app";
-    version = "3.1.1";
+    version = "3.1.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/create-react-app/-/create-react-app-3.1.1.tgz";
-      sha512 = "EaK59gIwEsSZjjIN4MyG0DkXcatF3cEXYODIH7rDrlUremb7iwi5RzZGGISmPIrfywLC82Qom/8CXiT8hwixPQ==";
+      url = "https://registry.npmjs.org/create-react-app/-/create-react-app-3.1.2.tgz";
+      sha512 = "y5wgEQwt6IpUP1N64uorVavhp8NPUAamVqA/paZmpvPSrW3l2c5UhXRi5m61plBBzDde2WyDr+3vCwDsfaS03w==";
     };
     dependencies = [
       sources."ansi-escapes-3.2.0"
@@ -49761,7 +50319,7 @@ in
       sources."collection-visit-1.0.0"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
-      sources."colors-1.3.3"
+      sources."colors-1.4.0"
       sources."combined-stream-1.0.8"
       sources."component-emitter-1.3.0"
       sources."concat-map-0.0.1"
@@ -49796,7 +50354,7 @@ in
       sources."dat-swarm-defaults-1.0.2"
       sources."debug-4.1.1"
       sources."decode-uri-component-0.2.0"
-      sources."decompress-response-3.3.0"
+      sources."decompress-response-4.2.1"
       sources."deep-equal-0.2.2"
       sources."deep-extend-0.6.0"
       sources."define-properties-1.1.3"
@@ -50006,7 +50564,7 @@ in
       sources."mime-2.4.4"
       sources."mime-db-1.40.0"
       sources."mime-types-2.1.24"
-      sources."mimic-response-1.0.1"
+      sources."mimic-response-2.0.0"
       sources."min-document-2.19.0"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
@@ -50139,7 +50697,7 @@ in
         ];
       })
       sources."simple-concat-1.0.0"
-      sources."simple-get-3.0.3"
+      sources."simple-get-3.1.0"
       sources."simple-sha1-2.1.2"
       sources."siphash24-1.1.1"
       sources."slice-ansi-1.0.0"
@@ -50234,7 +50792,7 @@ in
       sources."throttle-1.0.3"
       sources."thunky-1.0.3"
       sources."timed-out-4.0.1"
-      sources."timeout-refresh-1.0.0"
+      sources."timeout-refresh-1.0.1"
       sources."to-buffer-1.1.1"
       (sources."to-object-path-0.3.0" // {
         dependencies = [
@@ -50494,10 +51052,10 @@ in
   elasticdump = nodeEnv.buildNodePackage {
     name = "elasticdump";
     packageName = "elasticdump";
-    version = "6.9.1";
+    version = "6.10.6";
     src = fetchurl {
-      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.9.1.tgz";
-      sha512 = "5nnktnPlrlJIMDlkgWrS64LUdT7VpPo5WgC1o2CMYSV7Bb0lxga6HotsEAMsiddwVT2wJg7tmAZQd6/Lz+N5Hg==";
+      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.10.6.tgz";
+      sha512 = "Zjrmui3KS2Fem8OyVNoN1pWOCvULJP88rl1RdnBA/lkBx7u15G0B7FIlzOwX7sjBuJcqb9G5K9FuJXPU3MEqZg==";
     };
     dependencies = [
       sources."JSONStream-1.3.5"
@@ -50506,7 +51064,7 @@ in
       sources."assert-plus-1.0.0"
       sources."async-2.6.3"
       sources."asynckit-0.4.0"
-      sources."aws-sdk-2.529.0"
+      sources."aws-sdk-2.533.0"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.8.0"
       sources."base64-js-1.3.1"
@@ -50534,7 +51092,7 @@ in
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.3"
       sources."http-signature-1.2.0"
-      sources."ieee754-1.1.8"
+      sources."ieee754-1.1.13"
       sources."inherits-2.0.4"
       sources."ini-1.3.5"
       (sources."ip-address-6.1.0" // {
@@ -50561,7 +51119,7 @@ in
       sources."optimist-0.6.1"
       sources."p-finally-1.0.0"
       sources."p-queue-6.1.1"
-      sources."p-timeout-3.1.0"
+      sources."p-timeout-3.2.0"
       sources."performance-now-2.1.0"
       sources."process-nextick-args-2.0.1"
       sources."psl-1.4.0"
@@ -50678,7 +51236,7 @@ in
       sources."fresh-0.5.2"
       sources."fsevents-2.0.7"
       sources."get-stream-4.1.0"
-      sources."glob-parent-5.0.0"
+      sources."glob-parent-5.1.0"
       sources."has-ansi-2.0.0"
       sources."http-errors-1.7.3"
       sources."http-proxy-1.17.0"
@@ -51085,7 +51643,7 @@ in
       sources."fs.realpath-1.0.0"
       sources."functional-red-black-tree-1.0.1"
       sources."glob-7.1.4"
-      sources."glob-parent-5.0.0"
+      sources."glob-parent-5.1.0"
       sources."globals-11.12.0"
       sources."has-flag-3.0.0"
       sources."iconv-lite-0.4.24"
@@ -51237,7 +51795,7 @@ in
       sources."fs.realpath-1.0.0"
       sources."functional-red-black-tree-1.0.1"
       sources."glob-7.1.4"
-      sources."glob-parent-5.0.0"
+      sources."glob-parent-5.1.0"
       sources."globals-11.12.0"
       sources."has-flag-3.0.0"
       sources."iconv-lite-0.4.24"
@@ -51962,7 +52520,7 @@ in
       sources."preserve-0.2.0"
       (sources."prettyjson-1.2.1" // {
         dependencies = [
-          sources."colors-1.3.3"
+          sources."colors-1.4.0"
           sources."minimist-1.2.0"
         ];
       })
@@ -52606,7 +53164,7 @@ in
           sources."ms-2.1.2"
         ];
       })
-      sources."graphql-14.5.6"
+      sources."graphql-14.5.7"
       (sources."graphql-cli-prepare-1.4.19" // {
         dependencies = [
           sources."chalk-2.3.1"
@@ -52756,7 +53314,7 @@ in
       sources."mimic-fn-1.2.0"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
-      (sources."minipass-2.6.2" // {
+      (sources."minipass-2.8.1" // {
         dependencies = [
           sources."yallist-3.0.3"
         ];
@@ -52924,7 +53482,7 @@ in
       sources."supports-color-5.5.0"
       sources."swap-case-1.1.2"
       sources."sync-exec-0.6.2"
-      (sources."tar-4.4.10" // {
+      (sources."tar-4.4.11" // {
         dependencies = [
           sources."yallist-3.0.3"
         ];
@@ -53298,7 +53856,7 @@ in
       sources."ansi-term-0.0.2"
       sources."ansicolors-0.2.1"
       sources."blessed-0.1.81"
-      sources."blessed-contrib-4.8.16"
+      sources."blessed-contrib-4.8.17"
       sources."bresenham-0.0.3"
       sources."buffers-0.1.1"
       sources."cardinal-1.0.0"
@@ -53335,7 +53893,7 @@ in
       sources."lodash.assign-4.2.0"
       sources."lodash.toarray-4.4.0"
       sources."map-canvas-0.1.5"
-      sources."marked-0.6.3"
+      sources."marked-0.7.0"
       sources."marked-terminal-1.7.0"
       sources."memory-streams-0.1.3"
       sources."memorystream-0.3.1"
@@ -53781,7 +54339,7 @@ in
       sources."to-regex-3.0.2"
       sources."to-regex-range-2.1.1"
       sources."to-through-2.0.0"
-      sources."type-1.0.3"
+      sources."type-1.2.0"
       sources."typedarray-0.0.6"
       sources."unc-path-regex-0.1.2"
       sources."undertaker-1.2.1"
@@ -54131,7 +54689,7 @@ in
       })
       sources."to-regex-3.0.2"
       sources."to-regex-range-2.1.1"
-      sources."type-1.0.3"
+      sources."type-1.2.0"
       sources."typedarray-0.0.6"
       sources."unc-path-regex-0.1.2"
       sources."union-value-1.0.1"
@@ -54334,10 +54892,10 @@ in
       sources."corser-2.0.1"
       sources."debug-3.2.6"
       sources."ecstatic-3.3.2"
-      sources."eventemitter3-3.1.2"
+      sources."eventemitter3-4.0.0"
       sources."follow-redirects-1.9.0"
       sources."he-1.2.0"
-      sources."http-proxy-1.17.0"
+      sources."http-proxy-1.18.0"
       sources."mime-1.6.0"
       sources."minimist-1.2.0"
       (sources."mkdirp-0.5.1" // {
@@ -54525,26 +55083,26 @@ in
   ionic = nodeEnv.buildNodePackage {
     name = "ionic";
     packageName = "ionic";
-    version = "5.2.8";
+    version = "5.4.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/ionic/-/ionic-5.2.8.tgz";
-      sha512 = "BeUquVJKI5CEqfyt1YlibDyvf/CyiXwg2957/vm6xkxp4At8D9tKJ3Ldb5e74SEgon5u1+mbcGNjDYB/OtTHgQ==";
+      url = "https://registry.npmjs.org/ionic/-/ionic-5.4.1.tgz";
+      sha512 = "z4Zdb1lEZoqx6HsURVgdqGw0INtDeNrbahTZacrqm3cNmjq6X4SOP+dILIeZoURq/V0KcyVcVQnssWRFbVd8TQ==";
     };
     dependencies = [
-      sources."@ionic/cli-framework-2.1.6"
-      sources."@ionic/discover-2.0.5"
-      sources."@ionic/utils-array-1.2.0"
-      sources."@ionic/utils-fs-2.0.6"
-      sources."@ionic/utils-network-1.0.4"
-      sources."@ionic/utils-object-1.0.4"
-      sources."@ionic/utils-process-1.0.4"
-      sources."@ionic/utils-stream-2.0.3"
-      sources."@ionic/utils-subprocess-1.0.7"
-      sources."@ionic/utils-terminal-1.0.4"
+      sources."@ionic/cli-framework-2.1.7"
+      sources."@ionic/discover-2.0.6"
+      sources."@ionic/utils-array-1.2.1"
+      sources."@ionic/utils-fs-2.0.7"
+      sources."@ionic/utils-network-1.0.5"
+      sources."@ionic/utils-object-1.0.5"
+      sources."@ionic/utils-process-1.0.5"
+      sources."@ionic/utils-stream-2.0.4"
+      sources."@ionic/utils-subprocess-1.0.8"
+      sources."@ionic/utils-terminal-1.0.5"
       sources."@types/node-8.10.54"
       sources."agent-base-4.3.0"
-      sources."ansi-escapes-3.2.0"
-      sources."ansi-regex-3.0.0"
+      sources."ansi-escapes-4.2.1"
+      sources."ansi-regex-4.1.0"
       sources."ansi-styles-3.2.1"
       sources."ast-types-0.13.2"
       sources."astral-regex-1.0.0"
@@ -54556,7 +55114,7 @@ in
       sources."chalk-2.4.2"
       sources."chardet-0.7.0"
       sources."chownr-1.1.2"
-      sources."cli-cursor-2.1.0"
+      sources."cli-cursor-3.1.0"
       sources."cli-width-2.2.0"
       sources."co-4.6.0"
       sources."color-convert-1.9.3"
@@ -54566,11 +55124,7 @@ in
       sources."concat-map-0.0.1"
       sources."cookiejar-2.1.2"
       sources."core-util-is-1.0.2"
-      (sources."cross-spawn-6.0.5" // {
-        dependencies = [
-          sources."semver-5.7.1"
-        ];
-      })
+      sources."cross-spawn-7.0.0"
       sources."data-uri-to-buffer-2.0.1"
       sources."debug-4.1.1"
       sources."deep-is-0.1.3"
@@ -54595,11 +55149,17 @@ in
       sources."esprima-3.1.3"
       sources."estraverse-4.3.0"
       sources."esutils-2.0.3"
-      sources."execa-1.0.0"
+      (sources."execa-1.0.0" // {
+        dependencies = [
+          sources."cross-spawn-6.0.5"
+          sources."path-key-2.0.1"
+          sources."semver-5.7.1"
+        ];
+      })
       sources."extend-3.0.2"
       sources."external-editor-3.1.0"
       sources."fast-levenshtein-2.0.6"
-      sources."figures-2.0.0"
+      sources."figures-3.0.0"
       sources."file-uri-to-path-1.0.0"
       sources."form-data-2.5.1"
       sources."formidable-1.2.1"
@@ -54634,15 +55194,7 @@ in
       sources."imurmurhash-0.1.4"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
-      (sources."inquirer-6.5.2" // {
-        dependencies = [
-          (sources."string-width-2.1.1" // {
-            dependencies = [
-              sources."strip-ansi-4.0.0"
-            ];
-          })
-        ];
-      })
+      sources."inquirer-7.0.0"
       sources."ip-1.1.5"
       sources."is-fullwidth-code-point-2.0.0"
       sources."is-promise-2.1.0"
@@ -54673,6 +55225,11 @@ in
       sources."lodash.restparam-3.6.1"
       (sources."log-update-3.3.0" // {
         dependencies = [
+          sources."ansi-escapes-3.2.0"
+          sources."cli-cursor-2.1.0"
+          sources."mimic-fn-1.2.0"
+          sources."onetime-2.0.1"
+          sources."restore-cursor-2.0.0"
           sources."string-width-3.1.0"
           sources."wrap-ansi-5.1.0"
         ];
@@ -54683,10 +55240,10 @@ in
       sources."mime-2.4.4"
       sources."mime-db-1.40.0"
       sources."mime-types-2.1.24"
-      sources."mimic-fn-1.2.0"
+      sources."mimic-fn-2.1.0"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
-      (sources."minipass-2.6.2" // {
+      (sources."minipass-2.8.1" // {
         dependencies = [
           sources."yallist-3.0.3"
         ];
@@ -54698,12 +55255,16 @@ in
         ];
       })
       sources."ms-2.1.2"
-      sources."mute-stream-0.0.7"
+      sources."mute-stream-0.0.8"
       sources."netmask-1.0.6"
       sources."nice-try-1.0.5"
-      sources."npm-run-path-2.0.2"
+      (sources."npm-run-path-2.0.2" // {
+        dependencies = [
+          sources."path-key-2.0.1"
+        ];
+      })
       sources."once-1.4.0"
-      sources."onetime-2.0.1"
+      sources."onetime-5.1.0"
       sources."open-6.4.0"
       sources."optionator-0.8.2"
       sources."os-name-3.1.0"
@@ -54716,7 +55277,7 @@ in
       })
       sources."pac-resolver-3.0.0"
       sources."path-is-absolute-1.0.1"
-      sources."path-key-2.0.1"
+      sources."path-key-3.1.0"
       sources."prelude-ls-1.1.2"
       sources."process-nextick-args-2.0.1"
       (sources."proxy-agent-3.1.0" // {
@@ -54727,10 +55288,10 @@ in
       sources."proxy-from-env-1.0.0"
       sources."pseudomap-1.0.2"
       sources."pump-3.0.0"
-      sources."qs-6.8.0"
+      sources."qs-6.9.0"
       sources."raw-body-2.4.1"
       sources."readable-stream-3.4.0"
-      sources."restore-cursor-2.0.0"
+      sources."restore-cursor-3.1.0"
       sources."rimraf-3.0.0"
       sources."rsvp-3.6.2"
       sources."run-async-2.3.0"
@@ -54769,11 +55330,7 @@ in
         ];
       })
       sources."string_decoder-1.3.0"
-      (sources."strip-ansi-5.2.0" // {
-        dependencies = [
-          sources."ansi-regex-4.1.0"
-        ];
-      })
+      sources."strip-ansi-5.2.0"
       sources."strip-eof-1.0.0"
       sources."superagent-4.1.0"
       (sources."superagent-proxy-2.0.0" // {
@@ -54782,7 +55339,7 @@ in
         ];
       })
       sources."supports-color-5.5.0"
-      (sources."tar-4.4.10" // {
+      (sources."tar-4.4.11" // {
         dependencies = [
           sources."yallist-3.0.3"
         ];
@@ -54795,6 +55352,7 @@ in
       sources."tree-kill-1.2.1"
       sources."tslib-1.10.0"
       sources."type-check-0.3.2"
+      sources."type-fest-0.5.2"
       sources."typedarray-to-buffer-3.1.5"
       sources."universalify-0.1.2"
       sources."unpipe-1.0.0"
@@ -54845,6 +55403,386 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
+  "iosevka-build-deps-../../data/fonts/iosevka" = nodeEnv.buildNodePackage {
+    name = "iosevka-build-deps";
+    packageName = "iosevka-build-deps";
+    version = "2.3.0";
+    src = ../../data/fonts/iosevka;
+    dependencies = [
+      sources."JSONStream-1.3.5"
+      sources."abbrev-1.1.1"
+      sources."ajv-6.10.2"
+      sources."amdefine-1.0.1"
+      sources."ansi-regex-2.1.1"
+      sources."ansi-styles-3.2.1"
+      sources."aproba-1.2.0"
+      sources."are-we-there-yet-1.1.5"
+      sources."argparse-1.0.10"
+      sources."asn1-0.2.4"
+      sources."assert-plus-1.0.0"
+      sources."asynckit-0.4.0"
+      sources."atob-2.1.2"
+      sources."aws-sign2-0.7.0"
+      sources."aws4-1.8.0"
+      sources."balanced-match-1.0.0"
+      sources."bcrypt-pbkdf-1.0.2"
+      sources."bezier-js-2.4.3"
+      sources."bindings-1.5.0"
+      sources."block-stream-0.0.9"
+      sources."bluebird-3.5.5"
+      sources."brace-expansion-1.1.11"
+      sources."bufferstreams-1.1.3"
+      sources."camelcase-4.1.0"
+      sources."caryll-shapeops-0.3.1"
+      sources."caseless-0.12.0"
+      sources."chalk-2.4.2"
+      sources."child-process-promise-2.2.1"
+      sources."cli-cursor-2.1.0"
+      sources."clipper-lib-1.0.0"
+      (sources."cliui-3.2.0" // {
+        dependencies = [
+          sources."string-width-1.0.2"
+        ];
+      })
+      sources."clone-2.1.2"
+      sources."code-point-at-1.1.0"
+      sources."color-convert-1.9.3"
+      sources."color-name-1.1.3"
+      sources."colors-1.4.0"
+      sources."combined-stream-1.0.8"
+      sources."complex.js-2.0.11"
+      sources."concat-map-0.0.1"
+      sources."console-control-strings-1.1.0"
+      sources."core-util-is-1.0.2"
+      sources."cross-spawn-4.0.2"
+      sources."css-2.2.4"
+      sources."css-parse-2.0.0"
+      sources."cubic2quad-1.1.1"
+      sources."dashdash-1.14.1"
+      sources."debug-3.1.0"
+      sources."decamelize-1.2.0"
+      sources."decimal.js-10.2.0"
+      sources."decode-uri-component-0.2.0"
+      sources."deep-is-0.1.3"
+      sources."delayed-stream-1.0.0"
+      sources."delegates-1.0.0"
+      sources."ecc-jsbn-0.1.2"
+      sources."end-of-stream-1.4.1"
+      sources."error-ex-1.3.2"
+      sources."escape-latex-1.2.0"
+      sources."escape-string-regexp-1.0.5"
+      sources."escodegen-1.12.0"
+      (sources."escope-1.0.3" // {
+        dependencies = [
+          sources."estraverse-2.0.0"
+        ];
+      })
+      (sources."esmangle-1.0.1" // {
+        dependencies = [
+          sources."escodegen-1.3.3"
+          sources."esprima-1.1.1"
+          sources."estraverse-1.5.1"
+          sources."esutils-1.0.0"
+          sources."fast-levenshtein-1.0.7"
+          sources."levn-0.2.5"
+          sources."optionator-0.3.0"
+          sources."source-map-0.1.43"
+          sources."wordwrap-0.0.3"
+        ];
+      })
+      sources."esprima-3.1.3"
+      (sources."esshorten-1.1.1" // {
+        dependencies = [
+          sources."estraverse-4.1.1"
+        ];
+      })
+      sources."estraverse-4.3.0"
+      sources."esutils-2.0.3"
+      (sources."execa-0.7.0" // {
+        dependencies = [
+          sources."cross-spawn-5.1.0"
+        ];
+      })
+      sources."extend-3.0.2"
+      sources."extsprintf-1.3.0"
+      sources."fast-deep-equal-2.0.1"
+      sources."fast-json-stable-stringify-2.0.0"
+      sources."fast-levenshtein-2.0.6"
+      sources."file-uri-to-path-1.0.0"
+      sources."find-up-2.1.0"
+      sources."first-chunk-stream-2.0.0"
+      sources."forever-agent-0.6.1"
+      sources."form-data-2.3.3"
+      sources."fraction.js-4.0.12"
+      sources."fs-extra-3.0.1"
+      sources."fs.realpath-1.0.0"
+      sources."fstream-1.0.12"
+      (sources."gauge-2.7.4" // {
+        dependencies = [
+          sources."string-width-1.0.2"
+        ];
+      })
+      sources."get-caller-file-1.0.3"
+      sources."get-stream-3.0.0"
+      sources."getpass-0.1.7"
+      sources."glob-7.1.4"
+      sources."graceful-fs-4.2.2"
+      sources."har-schema-2.0.0"
+      sources."har-validator-5.1.3"
+      sources."has-flag-3.0.0"
+      sources."has-unicode-2.0.1"
+      sources."hosted-git-info-2.8.4"
+      sources."http-signature-1.2.0"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.4"
+      sources."invert-kv-1.0.0"
+      sources."is-arrayish-0.2.1"
+      sources."is-fullwidth-code-point-1.0.0"
+      sources."is-stream-1.1.0"
+      sources."is-typedarray-1.0.0"
+      sources."is-utf8-0.2.1"
+      sources."isarray-1.0.0"
+      sources."isexe-2.0.0"
+      sources."isstream-0.1.2"
+      sources."javascript-natural-sort-0.7.1"
+      sources."jsbn-0.1.1"
+      sources."json-schema-0.2.3"
+      sources."json-schema-traverse-0.4.1"
+      sources."json-stringify-safe-5.0.1"
+      sources."jsonfile-3.0.1"
+      sources."jsonparse-1.3.1"
+      sources."jsprim-1.4.1"
+      sources."lcid-1.0.0"
+      sources."levn-0.3.0"
+      sources."libspiro-js-0.3.1"
+      sources."load-json-file-2.0.0"
+      sources."locate-path-2.0.0"
+      sources."lru-cache-4.1.5"
+      sources."map-age-cleaner-0.1.3"
+      sources."mathjs-5.10.3"
+      sources."megaminx-0.9.0"
+      sources."mem-1.1.0"
+      sources."microbuffer-1.0.0"
+      sources."mime-db-1.40.0"
+      sources."mime-types-2.1.24"
+      sources."mimic-fn-1.2.0"
+      sources."minimatch-3.0.4"
+      sources."minimist-0.0.8"
+      sources."mkdirp-0.5.1"
+      sources."ms-2.0.0"
+      sources."nan-2.14.0"
+      sources."nice-try-1.0.5"
+      (sources."node-gyp-3.8.0" // {
+        dependencies = [
+          sources."semver-5.3.0"
+        ];
+      })
+      sources."node-version-1.2.0"
+      sources."nopt-3.0.6"
+      sources."normalize-package-data-2.5.0"
+      sources."npm-run-path-2.0.2"
+      sources."npmlog-4.1.2"
+      sources."number-is-nan-1.0.1"
+      sources."oauth-sign-0.9.0"
+      sources."object-assign-4.1.1"
+      sources."once-1.4.0"
+      sources."onetime-2.0.1"
+      sources."optionator-0.8.2"
+      sources."os-homedir-1.0.2"
+      sources."os-locale-2.1.0"
+      sources."os-tmpdir-1.0.2"
+      sources."osenv-0.1.5"
+      (sources."otfcc-ttcize-0.8.0" // {
+        dependencies = [
+          sources."fs-extra-4.0.3"
+          sources."jsonfile-4.0.0"
+          (sources."megaminx-0.3.3" // {
+            dependencies = [
+              sources."fs-extra-3.0.1"
+              sources."jsonfile-3.0.1"
+            ];
+          })
+          sources."yargs-8.0.2"
+        ];
+      })
+      sources."p-defer-1.0.0"
+      sources."p-finally-1.0.0"
+      sources."p-is-promise-2.1.0"
+      sources."p-limit-1.3.0"
+      sources."p-locate-2.0.0"
+      sources."p-try-1.0.0"
+      sources."pako-1.0.10"
+      sources."parse-json-2.2.0"
+      (sources."patel-0.33.1" // {
+        dependencies = [
+          sources."camelcase-3.0.0"
+          sources."find-up-1.1.2"
+          sources."load-json-file-1.1.0"
+          sources."os-locale-1.4.0"
+          sources."path-exists-2.1.0"
+          sources."path-type-1.1.0"
+          sources."read-pkg-1.1.0"
+          sources."read-pkg-up-1.0.1"
+          sources."string-width-1.0.2"
+          sources."strip-bom-2.0.0"
+          sources."which-module-1.0.0"
+          sources."yargs-6.6.0"
+          sources."yargs-parser-4.2.1"
+        ];
+      })
+      sources."path-exists-3.0.0"
+      sources."path-is-absolute-1.0.1"
+      sources."path-key-2.0.1"
+      sources."path-parse-1.0.6"
+      sources."path-type-2.0.0"
+      sources."patrisika-0.21.0"
+      sources."patrisika-scopes-0.11.1"
+      sources."performance-now-2.1.0"
+      sources."pify-2.3.0"
+      sources."pinkie-2.0.4"
+      sources."pinkie-promise-2.0.1"
+      sources."prelude-ls-1.1.2"
+      sources."primitive-quadify-off-curves-0.4.1"
+      sources."process-nextick-args-2.0.1"
+      sources."promise-polyfill-6.1.0"
+      sources."proper-lockfile-3.2.0"
+      sources."pseudomap-1.0.2"
+      sources."psl-1.4.0"
+      sources."pump-3.0.0"
+      sources."punycode-2.1.1"
+      sources."qs-6.5.2"
+      sources."read-pkg-2.0.0"
+      sources."read-pkg-up-2.0.0"
+      sources."readable-stream-2.3.6"
+      sources."request-2.88.0"
+      sources."require-directory-2.1.1"
+      sources."require-main-filename-1.0.1"
+      sources."resolve-1.12.0"
+      sources."resolve-url-0.2.1"
+      sources."restore-cursor-2.0.0"
+      sources."resumer-0.0.0"
+      sources."retry-0.12.0"
+      sources."rimraf-2.2.8"
+      sources."safe-buffer-5.1.2"
+      sources."safer-buffer-2.1.2"
+      sources."sax-1.2.4"
+      sources."seed-random-2.2.0"
+      sources."semaphore-async-await-1.5.1"
+      sources."semver-5.7.1"
+      sources."set-blocking-2.0.0"
+      sources."shebang-command-1.2.0"
+      sources."shebang-regex-1.0.0"
+      sources."signal-exit-3.0.2"
+      sources."source-map-0.6.1"
+      sources."source-map-resolve-0.5.2"
+      sources."source-map-url-0.4.0"
+      sources."spdx-correct-3.1.0"
+      sources."spdx-exceptions-2.2.0"
+      sources."spdx-expression-parse-3.0.0"
+      sources."spdx-license-ids-3.0.5"
+      sources."split-1.0.1"
+      sources."sprintf-js-1.0.3"
+      sources."sshpk-1.16.1"
+      sources."stack-trace-0.0.9"
+      (sources."string-width-2.1.1" // {
+        dependencies = [
+          sources."ansi-regex-3.0.0"
+          sources."is-fullwidth-code-point-2.0.0"
+          sources."strip-ansi-4.0.0"
+        ];
+      })
+      sources."string_decoder-1.1.1"
+      sources."strip-ansi-3.0.1"
+      sources."strip-bom-3.0.0"
+      sources."strip-bom-buf-1.0.0"
+      sources."strip-bom-stream-3.0.0"
+      sources."strip-eof-1.0.0"
+      (sources."stylus-0.54.7" // {
+        dependencies = [
+          sources."semver-6.3.0"
+          sources."source-map-0.7.3"
+        ];
+      })
+      sources."supports-color-5.5.0"
+      sources."tar-2.2.2"
+      sources."temp-0.8.3"
+      sources."through-2.3.8"
+      sources."tiny-emitter-2.1.0"
+      sources."toml-2.3.6"
+      sources."topsort-0.0.2"
+      (sources."tough-cookie-2.4.3" // {
+        dependencies = [
+          sources."punycode-1.4.1"
+        ];
+      })
+      sources."ts-process-promises-1.0.2"
+      sources."tslib-1.9.3"
+      sources."ttf2woff-2.0.1"
+      sources."ttf2woff2-2.0.3"
+      sources."tunnel-agent-0.6.0"
+      sources."tweetnacl-0.14.5"
+      sources."type-check-0.3.2"
+      sources."typed-function-1.1.0"
+      sources."typo-geom-0.5.1"
+      sources."universalify-0.1.2"
+      sources."unorm-1.6.0"
+      sources."uri-js-4.2.2"
+      sources."urix-0.1.0"
+      sources."util-deprecate-1.0.2"
+      sources."uuid-3.3.3"
+      sources."validate-npm-package-license-3.0.4"
+      (sources."verda-1.0.0-4" // {
+        dependencies = [
+          sources."ansi-regex-4.1.0"
+          sources."fs-extra-6.0.1"
+          sources."jsonfile-4.0.0"
+          sources."strip-ansi-5.2.0"
+        ];
+      })
+      sources."verror-1.10.0"
+      sources."which-1.3.1"
+      sources."which-module-2.0.0"
+      sources."wide-align-1.1.3"
+      sources."wordwrap-1.0.0"
+      (sources."wrap-ansi-2.1.0" // {
+        dependencies = [
+          sources."string-width-1.0.2"
+        ];
+      })
+      sources."wrappy-1.0.2"
+      sources."y18n-3.2.1"
+      sources."yallist-2.1.2"
+      (sources."yargs-12.0.5" // {
+        dependencies = [
+          sources."ansi-regex-3.0.0"
+          sources."camelcase-5.3.1"
+          sources."cliui-4.1.0"
+          sources."cross-spawn-6.0.5"
+          sources."execa-1.0.0"
+          sources."find-up-3.0.0"
+          sources."get-stream-4.1.0"
+          sources."invert-kv-2.0.0"
+          sources."lcid-2.0.0"
+          sources."locate-path-3.0.0"
+          sources."mem-4.3.0"
+          sources."mimic-fn-2.1.0"
+          sources."os-locale-3.1.0"
+          sources."p-limit-2.2.1"
+          sources."p-locate-3.0.0"
+          sources."p-try-2.2.0"
+          sources."strip-ansi-4.0.0"
+          sources."yargs-parser-11.1.1"
+        ];
+      })
+      sources."yargs-parser-7.0.0"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
   jake = nodeEnv.buildNodePackage {
     name = "jake";
     packageName = "jake";
@@ -55056,7 +55994,7 @@ in
       })
       sources."debug-3.2.6"
       sources."decode-uri-component-0.2.0"
-      sources."decompress-response-3.3.0"
+      sources."decompress-response-4.2.1"
       sources."deep-extend-0.6.0"
       sources."deep-is-0.1.3"
       sources."deepmerge-2.2.1"
@@ -55229,10 +56167,10 @@ in
       sources."mime-2.4.4"
       sources."mime-db-1.40.0"
       sources."mime-types-2.1.24"
-      sources."mimic-response-1.0.1"
+      sources."mimic-response-2.0.0"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
-      sources."minipass-2.6.2"
+      sources."minipass-2.8.1"
       sources."minizlib-1.2.2"
       sources."mkdirp-0.5.1"
       sources."moment-2.24.0"
@@ -55348,7 +56286,7 @@ in
       sources."sharp-0.22.1"
       sources."signal-exit-3.0.2"
       sources."simple-concat-1.0.0"
-      sources."simple-get-3.0.3"
+      sources."simple-get-3.1.0"
       sources."simple-swizzle-0.2.2"
       (sources."slice-ansi-1.0.0" // {
         dependencies = [
@@ -55392,7 +56330,7 @@ in
       sources."symbol-tree-3.2.4"
       sources."syswide-cas-5.3.0"
       sources."table-layout-0.4.5"
-      sources."tar-4.4.10"
+      sources."tar-4.4.11"
       sources."tar-fs-2.0.0"
       (sources."tar-stream-2.1.0" // {
         dependencies = [
@@ -55721,7 +56659,7 @@ in
       sources."path-loader-1.0.10"
       sources."process-nextick-args-2.0.1"
       sources."punycode-2.1.1"
-      sources."qs-6.8.0"
+      sources."qs-6.9.0"
       sources."readable-stream-2.3.6"
       sources."safe-buffer-5.1.2"
       sources."slash-2.0.0"
@@ -55907,7 +56845,7 @@ in
       sources."ms-2.0.0"
       sources."nanoid-2.1.1"
       sources."negotiator-0.6.2"
-      sources."normalize-url-4.3.0"
+      sources."normalize-url-4.4.1"
       sources."npm-run-path-2.0.2"
       sources."oauth-sign-0.9.0"
       sources."object-assign-4.1.1"
@@ -56084,8 +57022,8 @@ in
       sources."buffer-fill-1.0.0"
       sources."bytes-3.1.0"
       sources."callsite-1.0.0"
-      sources."chokidar-3.1.0"
-      sources."colors-1.3.3"
+      sources."chokidar-3.1.1"
+      sources."colors-1.4.0"
       sources."component-bind-1.0.0"
       sources."component-emitter-1.2.1"
       sources."component-inherit-0.0.3"
@@ -56115,7 +57053,7 @@ in
       sources."engine.io-parser-2.1.3"
       sources."ent-2.2.0"
       sources."escape-html-1.0.3"
-      sources."eventemitter3-3.1.2"
+      sources."eventemitter3-4.0.0"
       sources."extend-3.0.2"
       sources."fill-range-7.0.1"
       sources."finalhandler-1.1.2"
@@ -56130,12 +57068,12 @@ in
       sources."fs.realpath-1.0.0"
       sources."fsevents-2.0.7"
       sources."glob-7.1.4"
-      sources."glob-parent-5.0.0"
+      sources."glob-parent-5.1.0"
       sources."graceful-fs-4.2.2"
       sources."has-binary2-1.0.3"
       sources."has-cors-1.1.0"
       sources."http-errors-1.7.2"
-      sources."http-proxy-1.17.0"
+      sources."http-proxy-1.18.0"
       sources."iconv-lite-0.4.24"
       sources."indexof-0.0.1"
       sources."inflight-1.0.6"
@@ -56372,7 +57310,7 @@ in
       sources."code-point-at-1.1.0"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
-      sources."colors-1.3.3"
+      sources."colors-1.4.0"
       sources."combined-stream-1.0.8"
       sources."concat-map-0.0.1"
       sources."core-util-is-1.0.2"
@@ -56709,7 +57647,7 @@ in
         ];
       })
       sources."@octokit/request-error-1.0.4"
-      sources."@octokit/rest-16.28.9"
+      sources."@octokit/rest-16.30.0"
       sources."@types/events-3.0.0"
       sources."@types/glob-7.1.1"
       sources."@types/minimatch-3.0.3"
@@ -57014,7 +57952,7 @@ in
       sources."git-url-parse-11.1.2"
       sources."gitconfiglocal-1.0.0"
       sources."glob-7.1.4"
-      sources."glob-parent-5.0.0"
+      sources."glob-parent-5.1.0"
       sources."glob-to-regexp-0.3.0"
       (sources."globby-9.2.0" // {
         dependencies = [
@@ -57022,7 +57960,7 @@ in
         ];
       })
       sources."graceful-fs-4.2.2"
-      (sources."handlebars-4.2.0" // {
+      (sources."handlebars-4.2.1" // {
         dependencies = [
           sources."source-map-0.6.1"
         ];
@@ -57163,7 +58101,7 @@ in
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
       sources."minimist-options-3.0.2"
-      sources."minipass-2.6.2"
+      sources."minipass-2.8.1"
       sources."minizlib-1.2.2"
       sources."mississippi-3.0.0"
       (sources."mixin-deep-1.3.2" // {
@@ -57197,7 +58135,7 @@ in
       })
       sources."normalize-url-3.3.0"
       sources."npm-bundled-1.0.6"
-      sources."npm-lifecycle-3.1.3"
+      sources."npm-lifecycle-3.1.4"
       (sources."npm-package-arg-6.1.1" // {
         dependencies = [
           sources."semver-5.7.1"
@@ -57448,7 +58386,7 @@ in
         ];
       })
       sources."supports-color-5.5.0"
-      sources."tar-4.4.10"
+      sources."tar-4.4.11"
       sources."temp-dir-1.0.0"
       sources."temp-write-3.4.0"
       sources."text-extensions-2.0.0"
@@ -57717,7 +58655,7 @@ in
         ];
       })
       sources."collection-visit-1.0.0"
-      sources."colors-1.3.3"
+      sources."colors-1.4.0"
       sources."component-emitter-1.3.0"
       sources."connect-3.7.0"
       sources."copy-descriptor-0.1.1"
@@ -58018,7 +58956,7 @@ in
         ];
       })
       sources."base64-arraybuffer-0.1.5"
-      sources."base64id-1.0.0"
+      sources."base64id-2.0.0"
       sources."bcrypt-pbkdf-1.0.2"
       sources."better-assert-1.0.2"
       sources."binary-extensions-1.13.1"
@@ -58078,19 +59016,22 @@ in
       sources."ee-first-1.1.1"
       sources."emoji-regex-6.1.1"
       sources."encodeurl-1.0.2"
-      (sources."engine.io-3.3.2" // {
+      (sources."engine.io-3.4.0" // {
         dependencies = [
           sources."cookie-0.3.1"
-          sources."debug-3.1.0"
+          sources."debug-4.1.1"
+          sources."ms-2.1.2"
         ];
       })
-      (sources."engine.io-client-3.3.2" // {
+      (sources."engine.io-client-3.4.0" // {
         dependencies = [
           sources."component-emitter-1.2.1"
-          sources."debug-3.1.0"
+          sources."debug-4.1.1"
+          sources."ms-2.1.2"
+          sources."ws-6.1.4"
         ];
       })
-      sources."engine.io-parser-2.1.3"
+      sources."engine.io-parser-2.2.0"
       sources."entities-1.1.2"
       sources."escape-html-1.0.3"
       sources."etag-1.8.1"
@@ -58384,24 +59325,33 @@ in
         ];
       })
       sources."snapdragon-util-3.0.1"
-      (sources."socket.io-2.2.0" // {
+      (sources."socket.io-2.3.0" // {
         dependencies = [
           sources."debug-4.1.1"
           sources."ms-2.1.2"
         ];
       })
       sources."socket.io-adapter-1.1.1"
-      (sources."socket.io-client-2.2.0" // {
+      (sources."socket.io-client-2.3.0" // {
         dependencies = [
           sources."component-emitter-1.2.1"
-          sources."debug-3.1.0"
+          sources."debug-4.1.1"
+          sources."isarray-2.0.1"
+          sources."ms-2.1.2"
+          (sources."socket.io-parser-3.3.0" // {
+            dependencies = [
+              sources."debug-3.1.0"
+              sources."ms-2.0.0"
+            ];
+          })
         ];
       })
-      (sources."socket.io-parser-3.3.0" // {
+      (sources."socket.io-parser-3.4.0" // {
         dependencies = [
           sources."component-emitter-1.2.1"
-          sources."debug-3.1.0"
+          sources."debug-4.1.1"
           sources."isarray-2.0.1"
+          sources."ms-2.1.2"
         ];
       })
       sources."source-map-0.5.7"
@@ -58468,7 +59418,7 @@ in
       sources."uuid-3.3.3"
       sources."vary-1.1.2"
       sources."verror-1.10.0"
-      sources."ws-6.1.4"
+      sources."ws-7.1.2"
       sources."xmlhttprequest-ssl-1.5.5"
       sources."yeast-0.1.2"
     ];
@@ -58949,7 +59899,7 @@ in
       })
       sources."duplexer3-0.1.4"
       sources."duplexify-3.7.1"
-      sources."electron-to-chromium-1.3.260"
+      sources."electron-to-chromium-1.3.264"
       sources."elliptic-6.5.1"
       sources."emoji-regex-7.0.3"
       sources."emojis-list-2.1.0"
@@ -59140,7 +60090,7 @@ in
           })
           sources."get-stream-4.1.0"
           sources."http-cache-semantics-4.0.3"
-          sources."normalize-url-4.3.0"
+          sources."normalize-url-4.4.1"
           sources."p-cancelable-1.1.0"
         ];
       })
@@ -59386,7 +60336,7 @@ in
       sources."pako-1.0.10"
       sources."parallel-transform-1.2.0"
       sources."paredit.js-0.3.4"
-      sources."parse-asn1-5.1.4"
+      sources."parse-asn1-5.1.5"
       sources."parse-glob-3.0.4"
       sources."parse-json-2.2.0"
       sources."parse-passwd-1.0.0"
@@ -59777,7 +60727,7 @@ in
           sources."ms-2.0.0"
         ];
       })
-      (sources."webpack-cli-3.3.8" // {
+      (sources."webpack-cli-3.3.9" // {
         dependencies = [
           sources."supports-color-6.1.0"
         ];
@@ -60662,7 +61612,7 @@ in
       sources."tough-cookie-2.3.4"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
-      sources."type-1.0.3"
+      sources."type-1.2.0"
       sources."typescript-3.5.3"
       (sources."uglify-js-3.4.9" // {
         dependencies = [
@@ -60918,7 +61868,7 @@ in
       sources."path-loader-1.0.10"
       sources."process-nextick-args-2.0.1"
       sources."punycode-2.1.1"
-      sources."qs-6.8.0"
+      sources."qs-6.9.0"
       sources."readable-stream-2.3.6"
       sources."safe-buffer-5.1.2"
       sources."slash-2.0.0"
@@ -61062,7 +62012,7 @@ in
       sources."mime-types-2.1.24"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
-      sources."minipass-2.6.2"
+      sources."minipass-2.8.1"
       sources."minizlib-1.2.2"
       sources."mkdirp-0.5.1"
       sources."nopt-3.0.6"
@@ -61089,7 +62039,7 @@ in
       sources."string-width-1.0.2"
       sources."string_decoder-1.1.1"
       sources."strip-ansi-3.0.1"
-      sources."tar-4.4.10"
+      sources."tar-4.4.11"
       (sources."tough-cookie-2.4.3" // {
         dependencies = [
           sources."punycode-1.4.1"
@@ -61162,7 +62112,7 @@ in
       sources."base64-js-0.0.8"
       sources."bcrypt-pbkdf-1.0.2"
       sources."biased-opener-0.2.8"
-      sources."big-integer-1.6.44"
+      sources."big-integer-1.6.45"
       sources."block-stream-0.0.9"
       sources."body-parser-1.19.0"
       sources."boom-2.10.1"
@@ -61471,7 +62421,7 @@ in
       sources."isarray-1.0.0"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
-      sources."minipass-2.6.2"
+      sources."minipass-2.8.1"
       sources."minizlib-1.2.2"
       sources."mkdirp-0.5.1"
       sources."ms-2.1.2"
@@ -61505,7 +62455,7 @@ in
       sources."string_decoder-1.1.1"
       sources."strip-ansi-3.0.1"
       sources."strip-json-comments-2.0.1"
-      sources."tar-4.4.10"
+      sources."tar-4.4.11"
       sources."util-deprecate-1.0.2"
       sources."wide-align-1.1.3"
       sources."wrappy-1.0.2"
@@ -61809,7 +62759,7 @@ in
       sources."mime-types-2.1.24"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
-      (sources."minipass-2.6.2" // {
+      (sources."minipass-2.8.1" // {
         dependencies = [
           sources."yallist-3.0.3"
         ];
@@ -61950,7 +62900,7 @@ in
       sources."strip-ansi-3.0.1"
       sources."strip-json-comments-2.0.1"
       sources."tail-2.0.3"
-      (sources."tar-4.4.10" // {
+      (sources."tar-4.4.11" // {
         dependencies = [
           sources."yallist-3.0.3"
         ];
@@ -61973,7 +62923,7 @@ in
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."twitter-ng-0.6.2"
-      sources."type-1.0.3"
+      sources."type-1.2.0"
       sources."type-is-1.6.18"
       sources."typedarray-0.0.6"
       sources."uc.micro-1.0.6"
@@ -62108,7 +63058,7 @@ in
       sources."mime-types-2.1.24"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
-      sources."minipass-2.6.2"
+      sources."minipass-2.8.1"
       sources."minizlib-1.2.2"
       sources."mkdirp-0.5.1"
       sources."ncp-0.4.2"
@@ -62181,7 +63131,7 @@ in
         ];
       })
       sources."strip-ansi-3.0.1"
-      sources."tar-4.4.10"
+      sources."tar-4.4.11"
       sources."temp-0.9.0"
       (sources."tough-cookie-2.4.3" // {
         dependencies = [
@@ -62740,7 +63690,7 @@ in
       sources."mimic-response-1.0.1"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
-      sources."minipass-2.6.2"
+      sources."minipass-2.8.1"
       sources."minizlib-1.2.2"
       sources."mississippi-3.0.0"
       sources."mkdirp-0.5.1"
@@ -62760,7 +63710,7 @@ in
           sources."semver-5.7.1"
         ];
       })
-      sources."normalize-url-4.3.0"
+      sources."normalize-url-4.4.1"
       sources."npm-bundled-1.0.6"
       (sources."npm-package-arg-6.1.1" // {
         dependencies = [
@@ -62886,7 +63836,7 @@ in
       sources."strip-eof-1.0.0"
       sources."strip-json-comments-2.0.1"
       sources."supports-color-5.5.0"
-      sources."tar-4.4.10"
+      sources."tar-4.4.11"
       sources."term-size-1.2.0"
       sources."through-2.3.8"
       sources."through2-2.0.5"
@@ -63528,7 +64478,7 @@ in
       sources."ecc-jsbn-0.1.2"
       sources."editorconfig-0.15.3"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.3.260"
+      sources."electron-to-chromium-1.3.264"
       sources."elliptic-6.5.1"
       sources."encodeurl-1.0.2"
       sources."entities-1.1.2"
@@ -63798,7 +64748,7 @@ in
       sources."os-tmpdir-1.0.2"
       sources."osenv-0.1.5"
       sources."pako-0.2.9"
-      sources."parse-asn1-5.1.4"
+      sources."parse-asn1-5.1.5"
       sources."parse-json-4.0.0"
       sources."parse5-5.1.0"
       sources."parseurl-1.3.3"
@@ -64146,7 +65096,7 @@ in
       sources."balanced-match-1.0.0"
       sources."base64-js-0.0.8"
       sources."bencode-2.0.1"
-      sources."big-integer-1.6.44"
+      sources."big-integer-1.6.45"
       sources."bitfield-0.1.0"
       (sources."bittorrent-dht-6.4.2" // {
         dependencies = [
@@ -64466,7 +65416,7 @@ in
       sources."balanced-match-1.0.0"
       sources."base64-arraybuffer-0.1.5"
       sources."base64-js-1.3.1"
-      sources."base64id-1.0.0"
+      sources."base64id-2.0.0"
       sources."basic-auth-2.0.1"
       sources."bcrypt-pbkdf-1.0.2"
       sources."bencode-0.7.0"
@@ -64535,18 +65485,21 @@ in
       sources."ee-first-1.1.1"
       sources."encodeurl-1.0.2"
       sources."end-of-stream-1.4.1"
-      (sources."engine.io-3.3.2" // {
+      (sources."engine.io-3.4.0" // {
         dependencies = [
           sources."cookie-0.3.1"
-          sources."debug-3.1.0"
+          sources."debug-4.1.1"
+          sources."ms-2.1.2"
         ];
       })
-      (sources."engine.io-client-3.3.2" // {
+      (sources."engine.io-client-3.4.0" // {
         dependencies = [
-          sources."debug-3.1.0"
+          sources."debug-4.1.1"
+          sources."ms-2.1.2"
+          sources."ws-6.1.4"
         ];
       })
-      sources."engine.io-parser-2.1.3"
+      sources."engine.io-parser-2.2.0"
       sources."escape-html-1.0.3"
       sources."etag-1.8.1"
       sources."express-4.17.1"
@@ -64719,22 +65672,31 @@ in
           sources."ws-2.3.1"
         ];
       })
-      (sources."socket.io-2.2.0" // {
+      (sources."socket.io-2.3.0" // {
         dependencies = [
           sources."debug-4.1.1"
           sources."ms-2.1.2"
         ];
       })
       sources."socket.io-adapter-1.1.1"
-      (sources."socket.io-client-2.2.0" // {
+      (sources."socket.io-client-2.3.0" // {
         dependencies = [
-          sources."debug-3.1.0"
+          sources."debug-4.1.1"
+          sources."isarray-2.0.1"
+          sources."ms-2.1.2"
+          (sources."socket.io-parser-3.3.0" // {
+            dependencies = [
+              sources."debug-3.1.0"
+              sources."ms-2.0.0"
+            ];
+          })
         ];
       })
-      (sources."socket.io-parser-3.3.0" // {
+      (sources."socket.io-parser-3.4.0" // {
         dependencies = [
-          sources."debug-3.1.0"
+          sources."debug-4.1.1"
           sources."isarray-2.0.1"
+          sources."ms-2.1.2"
         ];
       })
       sources."speedometer-0.1.4"
@@ -64777,7 +65739,7 @@ in
       sources."verror-1.10.0"
       sources."which-1.3.1"
       sources."wrappy-1.0.2"
-      sources."ws-6.1.4"
+      sources."ws-7.1.2"
       sources."xmlhttprequest-ssl-1.5.5"
       sources."xtend-4.0.2"
       sources."yeast-0.1.2"
@@ -64886,7 +65848,7 @@ in
       sources."builtin-status-codes-3.0.0"
       sources."cached-path-relative-1.0.2"
       sources."cipher-base-1.0.4"
-      sources."colors-1.3.3"
+      sources."colors-1.4.0"
       sources."combine-source-map-0.8.0"
       sources."concat-map-0.0.1"
       (sources."concat-stream-2.0.0" // {
@@ -64980,7 +65942,7 @@ in
       sources."os-browserify-0.3.0"
       sources."pako-1.0.10"
       sources."parents-1.0.1"
-      sources."parse-asn1-5.1.4"
+      sources."parse-asn1-5.1.5"
       sources."path-browserify-0.0.1"
       sources."path-is-absolute-1.0.1"
       sources."path-parse-1.0.6"
@@ -65483,13 +66445,13 @@ in
   serverless = nodeEnv.buildNodePackage {
     name = "serverless";
     packageName = "serverless";
-    version = "1.52.0";
+    version = "1.52.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/serverless/-/serverless-1.52.0.tgz";
-      sha512 = "No+hosiPng/0MKfFMNj6lfLmNmn5vzLduss55YkefQNKZ9oJEBeZqBDrUEZC9reTHUpilCx0ESiLqkMoPBst2g==";
+      url = "https://registry.npmjs.org/serverless/-/serverless-1.52.2.tgz";
+      sha512 = "JLRh52heei1kiTg/mdXdVeJXlB26nXI6uK3/jQvG2a16WwrXD+h033azkD9qqk7WgISLgDKPJbvlnsCAXLcX5Q==";
     };
     dependencies = [
-      sources."@serverless/cli-1.2.1"
+      sources."@serverless/cli-1.2.3"
       (sources."@serverless/component-metrics-1.0.8" // {
         dependencies = [
           sources."node-fetch-2.6.0"
@@ -65501,7 +66463,7 @@ in
           sources."semver-6.3.0"
         ];
       })
-      (sources."@serverless/enterprise-plugin-2.0.0" // {
+      (sources."@serverless/enterprise-plugin-3.0.0" // {
         dependencies = [
           sources."fs-extra-7.0.1"
           sources."node-fetch-2.6.0"
@@ -65549,10 +66511,9 @@ in
       sources."async-1.5.2"
       sources."asynckit-0.4.0"
       sources."atob-2.1.2"
-      (sources."aws-sdk-2.529.0" // {
+      (sources."aws-sdk-2.533.0" // {
         dependencies = [
           sources."buffer-4.9.1"
-          sources."ieee754-1.1.8"
           sources."uuid-3.3.2"
         ];
       })
@@ -65591,7 +66552,7 @@ in
       sources."caw-2.0.1"
       sources."chalk-2.4.2"
       sources."chardet-0.7.0"
-      sources."chokidar-3.1.0"
+      sources."chokidar-3.1.1"
       sources."ci-info-1.6.0"
       (sources."class-utils-0.3.6" // {
         dependencies = [
@@ -65753,11 +66714,11 @@ in
       sources."get-stream-4.1.0"
       sources."get-value-2.0.6"
       sources."glob-7.1.4"
-      sources."glob-parent-5.0.0"
+      sources."glob-parent-5.1.0"
       sources."global-dirs-0.1.1"
       sources."globby-6.1.0"
       sources."got-9.6.0"
-      sources."graceful-fs-4.2.2"
+      sources."graceful-fs-4.2.1"
       sources."graceful-readlink-1.0.1"
       sources."graphlib-2.1.7"
       (sources."has-ansi-2.0.0" // {
@@ -65908,7 +66869,7 @@ in
       sources."node-dir-0.1.17"
       sources."node-fetch-1.7.3"
       sources."normalize-path-3.0.0"
-      sources."normalize-url-4.3.0"
+      sources."normalize-url-4.4.1"
       (sources."npm-conf-1.1.3" // {
         dependencies = [
           sources."pify-3.0.0"
@@ -66155,7 +67116,7 @@ in
       sources."trim-repeated-1.0.0"
       sources."tslib-1.10.0"
       sources."tunnel-agent-0.6.0"
-      sources."type-1.0.3"
+      sources."type-1.2.0"
       sources."type-fest-0.5.2"
       sources."type-is-1.6.18"
       sources."typedarray-0.0.6"
@@ -66843,10 +67804,10 @@ in
   snyk = nodeEnv.buildNodePackage {
     name = "snyk";
     packageName = "snyk";
-    version = "1.227.0";
+    version = "1.228.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/snyk/-/snyk-1.227.0.tgz";
-      sha512 = "ejfq2FIca+b/zu4hkJwFUob1Emn+s9wXYw5VHJSS6BjiniNi6dIa24AARG3BWiVsN/3NvzCYAkcqhYGaJ6xyVw==";
+      url = "https://registry.npmjs.org/snyk/-/snyk-1.228.3.tgz";
+      sha512 = "TwyJcMXBvic1xJ+rVLdIYS1xDYuzcogIXdmyvGvXBZgwIQdjOVMnZBVxUo5igkOIntBL2sCynZiydQtGbe08JA==";
     };
     dependencies = [
       sources."@snyk/cli-interface-2.1.0"
@@ -67153,7 +68114,7 @@ in
           sources."debug-4.1.1"
         ];
       })
-      (sources."snyk-gradle-plugin-3.0.2" // {
+      (sources."snyk-gradle-plugin-3.1.0" // {
         dependencies = [
           sources."debug-4.1.1"
         ];
@@ -67286,10 +68247,10 @@ in
   "socket.io" = nodeEnv.buildNodePackage {
     name = "socket.io";
     packageName = "socket.io";
-    version = "2.2.0";
+    version = "2.3.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/socket.io/-/socket.io-2.2.0.tgz";
-      sha512 = "wxXrIuZ8AILcn+f1B4ez4hJTPG24iNgxBBDaJfT6MsyOhVYiTXWexGoPkd87ktJG8kQEcL/NBvRi64+9k4Kc0w==";
+      url = "https://registry.npmjs.org/socket.io/-/socket.io-2.3.0.tgz";
+      sha512 = "2A892lrj0GcgR/9Qk81EaY2gYhCBxurV0PfmmESO6p27QPrUK1J3zdns+5QPqvUYK2q657nSj0guoIil9+7eFg==";
     };
     dependencies = [
       sources."accepts-1.3.7"
@@ -67298,7 +68259,7 @@ in
       sources."async-limiter-1.0.1"
       sources."backo2-1.0.2"
       sources."base64-arraybuffer-0.1.5"
-      sources."base64id-1.0.0"
+      sources."base64id-2.0.0"
       sources."better-assert-1.0.2"
       sources."blob-0.0.5"
       sources."callsite-1.0.0"
@@ -67307,19 +68268,13 @@ in
       sources."component-inherit-0.0.3"
       sources."cookie-0.3.1"
       sources."debug-4.1.1"
-      (sources."engine.io-3.3.2" // {
+      sources."engine.io-3.4.0"
+      (sources."engine.io-client-3.4.0" // {
         dependencies = [
-          sources."debug-3.1.0"
-          sources."ms-2.0.0"
-        ];
-      })
-      (sources."engine.io-client-3.3.2" // {
-        dependencies = [
-          sources."debug-3.1.0"
-          sources."ms-2.0.0"
+          sources."ws-6.1.4"
         ];
       })
-      sources."engine.io-parser-2.1.3"
+      sources."engine.io-parser-2.2.0"
       sources."has-binary2-1.0.3"
       sources."has-cors-1.1.0"
       sources."indexof-0.0.1"
@@ -67332,20 +68287,19 @@ in
       sources."parseqs-0.0.5"
       sources."parseuri-0.0.5"
       sources."socket.io-adapter-1.1.1"
-      (sources."socket.io-client-2.2.0" // {
+      (sources."socket.io-client-2.3.0" // {
         dependencies = [
-          sources."debug-3.1.0"
-          sources."ms-2.0.0"
-        ];
-      })
-      (sources."socket.io-parser-3.3.0" // {
-        dependencies = [
-          sources."debug-3.1.0"
           sources."ms-2.0.0"
+          (sources."socket.io-parser-3.3.0" // {
+            dependencies = [
+              sources."debug-3.1.0"
+            ];
+          })
         ];
       })
+      sources."socket.io-parser-3.4.0"
       sources."to-array-0.1.4"
-      sources."ws-6.1.4"
+      sources."ws-7.1.2"
       sources."xmlhttprequest-ssl-1.5.5"
       sources."yeast-0.1.2"
     ];
@@ -67668,7 +68622,7 @@ in
       sources."decode-uri-component-0.2.0"
       sources."deep-equal-1.1.0"
       sources."deep-extend-0.6.0"
-      (sources."deferred-leveldown-5.2.0" // {
+      (sources."deferred-leveldown-5.2.1" // {
         dependencies = [
           sources."abstract-leveldown-6.1.1"
         ];
@@ -67865,7 +68819,7 @@ in
           sources."string_decoder-0.10.31"
         ];
       })
-      (sources."leveldown-5.2.0" // {
+      (sources."leveldown-5.2.1" // {
         dependencies = [
           sources."abstract-leveldown-6.1.1"
         ];
@@ -68429,7 +69383,7 @@ in
       sources."async-1.5.2"
       sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
-      (sources."aws-sdk-2.529.0" // {
+      (sources."aws-sdk-2.533.0" // {
         dependencies = [
           sources."uuid-3.3.2"
         ];
@@ -68449,7 +69403,7 @@ in
       sources."balanced-match-1.0.0"
       sources."base64-arraybuffer-0.1.5"
       sources."base64-js-1.3.1"
-      sources."base64id-1.0.0"
+      sources."base64id-2.0.0"
       sources."base64url-3.0.1"
       sources."basic-auth-1.1.0"
       sources."bcrypt-pbkdf-1.0.2"
@@ -68553,19 +69507,21 @@ in
       sources."ejs-0.8.8"
       sources."encodeurl-1.0.2"
       sources."end-of-stream-1.4.1"
-      (sources."engine.io-3.3.2" // {
+      (sources."engine.io-3.4.0" // {
         dependencies = [
-          sources."debug-3.1.0"
-          sources."ws-6.1.4"
+          sources."debug-4.1.1"
+          sources."ms-2.1.2"
+          sources."ws-7.1.2"
         ];
       })
-      (sources."engine.io-client-3.3.2" // {
+      (sources."engine.io-client-3.4.0" // {
         dependencies = [
-          sources."debug-3.1.0"
+          sources."debug-4.1.1"
+          sources."ms-2.1.2"
           sources."ws-6.1.4"
         ];
       })
-      sources."engine.io-parser-2.1.3"
+      sources."engine.io-parser-2.2.0"
       sources."error-ex-1.3.2"
       sources."escape-html-1.0.3"
       sources."escape-string-regexp-1.0.5"
@@ -68655,15 +69611,15 @@ in
           sources."inherits-2.0.3"
         ];
       })
-      (sources."http-proxy-1.17.0" // {
+      (sources."http-proxy-1.18.0" // {
         dependencies = [
-          sources."eventemitter3-3.1.2"
+          sources."eventemitter3-4.0.0"
         ];
       })
       sources."http-signature-1.1.1"
       sources."https-proxy-agent-1.0.0"
       sources."iconv-lite-0.4.24"
-      sources."ieee754-1.1.8"
+      sources."ieee754-1.1.13"
       sources."in-publish-2.0.0"
       sources."indexof-0.0.1"
       sources."inflight-1.0.6"
@@ -68952,22 +69908,31 @@ in
       sources."signal-exit-3.0.2"
       sources."slash-1.0.0"
       sources."sntp-1.0.9"
-      (sources."socket.io-2.2.0" // {
+      (sources."socket.io-2.3.0" // {
         dependencies = [
           sources."debug-4.1.1"
           sources."ms-2.1.2"
         ];
       })
       sources."socket.io-adapter-1.1.1"
-      (sources."socket.io-client-2.2.0" // {
+      (sources."socket.io-client-2.3.0" // {
         dependencies = [
-          sources."debug-3.1.0"
+          sources."debug-4.1.1"
+          sources."isarray-2.0.1"
+          sources."ms-2.1.2"
+          (sources."socket.io-parser-3.3.0" // {
+            dependencies = [
+              sources."debug-3.1.0"
+              sources."ms-2.0.0"
+            ];
+          })
         ];
       })
-      (sources."socket.io-parser-3.3.0" // {
+      (sources."socket.io-parser-3.4.0" // {
         dependencies = [
-          sources."debug-3.1.0"
+          sources."debug-4.1.1"
           sources."isarray-2.0.1"
+          sources."ms-2.1.2"
         ];
       })
       sources."source-map-0.6.1"
@@ -69012,7 +69977,7 @@ in
           sources."debug-3.2.6"
           sources."form-data-2.5.1"
           sources."ms-2.1.2"
-          sources."qs-6.8.0"
+          sources."qs-6.9.0"
           sources."readable-stream-2.3.6"
           sources."string_decoder-1.1.1"
         ];
@@ -69025,7 +69990,7 @@ in
           sources."esprima-4.0.1"
           sources."js-yaml-3.13.1"
           sources."lodash-3.10.1"
-          sources."qs-6.8.0"
+          sources."qs-6.9.0"
         ];
       })
       sources."swagger-schema-official-2.0.0-bab6bed"
@@ -69474,7 +70439,7 @@ in
         ];
       })
       sources."growl-1.9.2"
-      (sources."handlebars-4.2.0" // {
+      (sources."handlebars-4.2.1" // {
         dependencies = [
           sources."source-map-0.6.1"
         ];
@@ -69657,7 +70622,7 @@ in
         dependencies = [
           sources."debug-3.2.6"
           sources."ms-2.1.2"
-          sources."qs-6.8.0"
+          sources."qs-6.9.0"
           sources."superagent-3.8.3"
         ];
       })
@@ -71236,7 +72201,7 @@ in
       sources."minimalistic-assert-1.0.1"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
-      sources."minipass-2.6.2"
+      sources."minipass-2.8.1"
       sources."minizlib-1.2.2"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
@@ -71259,7 +72224,7 @@ in
         ];
       })
       sources."nopt-4.0.1"
-      sources."normalize-url-4.3.0"
+      sources."normalize-url-4.4.1"
       sources."npm-bundled-1.0.6"
       sources."npm-packlist-1.4.4"
       sources."npmlog-4.1.2"
@@ -71353,7 +72318,7 @@ in
       sources."strip-json-comments-2.0.1"
       sources."strip-outer-1.0.1"
       sources."supports-color-5.5.0"
-      sources."tar-4.4.10"
+      sources."tar-4.4.11"
       sources."thelounge-ldapjs-non-maintained-fork-1.0.4"
       sources."tlds-1.203.1"
       sources."to-array-0.1.4"
@@ -71781,7 +72746,7 @@ in
       sources."ansi-regex-2.1.1"
       sources."ansi-styles-2.2.1"
       sources."chalk-1.1.3"
-      sources."colors-1.3.3"
+      sources."colors-1.4.0"
       sources."diff-2.2.3"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
@@ -72524,7 +73489,7 @@ in
       sources."graceful-fs-4.2.2"
       sources."graceful-readlink-1.0.1"
       sources."gray-matter-2.1.1"
-      sources."handlebars-4.2.0"
+      sources."handlebars-4.2.1"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.3"
       (sources."has-ansi-2.0.0" // {
@@ -73820,7 +74785,7 @@ in
         dependencies = [
           sources."get-stream-5.1.0"
           sources."lowercase-keys-2.0.0"
-          sources."normalize-url-4.3.0"
+          sources."normalize-url-4.4.1"
         ];
       })
       (sources."caller-path-0.1.0" // {
@@ -74694,7 +75659,7 @@ in
         ];
       })
       sources."snapdragon-util-3.0.1"
-      (sources."snyk-1.227.0" // {
+      (sources."snyk-1.228.3" // {
         dependencies = [
           sources."ansi-regex-4.1.0"
           sources."debug-3.2.6"
@@ -74723,7 +75688,7 @@ in
           sources."tmp-0.0.33"
         ];
       })
-      (sources."snyk-gradle-plugin-3.0.2" // {
+      (sources."snyk-gradle-plugin-3.1.0" // {
         dependencies = [
           sources."debug-4.1.1"
           sources."ms-2.1.2"
@@ -74903,7 +75868,7 @@ in
       sources."tslib-1.10.0"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
-      sources."type-1.0.3"
+      sources."type-1.2.0"
       sources."type-check-0.3.2"
       sources."type-fest-0.3.1"
       sources."typedarray-0.0.6"
@@ -75321,7 +76286,7 @@ in
       sources."p-try-2.2.0"
       sources."pako-1.0.10"
       sources."parallel-transform-1.2.0"
-      sources."parse-asn1-5.1.4"
+      sources."parse-asn1-5.1.5"
       sources."pascalcase-0.1.1"
       sources."path-browserify-0.0.1"
       sources."path-dirname-1.0.2"
@@ -75509,10 +76474,10 @@ in
   webpack-cli = nodeEnv.buildNodePackage {
     name = "webpack-cli";
     packageName = "webpack-cli";
-    version = "3.3.8";
+    version = "3.3.9";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.8.tgz";
-      sha512 = "RANYSXwikSWINjHMd/mtesblNSpjpDLoYTBtP99n1RhXqVI/wxN40Auqy42I7y4xrbmRBoA5Zy5E0JSBD5XRhw==";
+      url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.9.tgz";
+      sha512 = "xwnSxWl8nZtBl/AFJCOn9pG7s5CYUYdZxmmukv+fAHLcBIHM36dImfpQg3WfShZXeArkWlf6QRw24Klcsv8a5A==";
     };
     dependencies = [
       sources."ansi-regex-4.1.0"
@@ -75879,8 +76844,10 @@ in
       (sources."bittorrent-tracker-9.14.4" // {
         dependencies = [
           sources."debug-4.1.1"
+          sources."decompress-response-4.2.1"
+          sources."mimic-response-2.0.0"
           sources."ms-2.1.2"
-          sources."simple-get-3.0.3"
+          sources."simple-get-3.1.0"
         ];
       })
       sources."blob-to-buffer-1.2.8"
@@ -75981,7 +76948,9 @@ in
       sources."last-one-wins-1.0.4"
       (sources."load-ip-set-2.1.0" // {
         dependencies = [
-          sources."simple-get-3.0.3"
+          sources."decompress-response-4.2.1"
+          sources."mimic-response-2.0.0"
+          sources."simple-get-3.1.0"
         ];
       })
       sources."long-4.0.0"
@@ -76026,7 +76995,9 @@ in
       sources."parse-numeric-range-0.0.2"
       (sources."parse-torrent-7.0.1" // {
         dependencies = [
-          sources."simple-get-3.0.3"
+          sources."decompress-response-4.2.1"
+          sources."mimic-response-2.0.0"
+          sources."simple-get-3.1.0"
         ];
       })
       sources."path-is-absolute-1.0.1"
@@ -76067,7 +77038,7 @@ in
       sources."semver-5.1.1"
       sources."simple-concat-1.0.0"
       sources."simple-get-2.8.1"
-      (sources."simple-peer-9.5.0" // {
+      (sources."simple-peer-9.6.0" // {
         dependencies = [
           sources."debug-4.1.1"
           sources."ms-2.1.2"
@@ -76123,8 +77094,10 @@ in
       (sources."webtorrent-0.107.16" // {
         dependencies = [
           sources."debug-4.1.1"
+          sources."decompress-response-4.2.1"
+          sources."mimic-response-2.0.0"
           sources."ms-2.1.2"
-          sources."simple-get-3.0.3"
+          sources."simple-get-3.1.0"
         ];
       })
       sources."winreg-1.2.4"
@@ -76431,7 +77404,7 @@ in
         ];
       })
       sources."glob-to-regexp-0.3.0"
-      (sources."global-agent-2.1.0" // {
+      (sources."global-agent-2.1.1" // {
         dependencies = [
           sources."semver-6.3.0"
         ];
diff --git a/pkgs/development/node-packages/node-packages-v12.nix b/pkgs/development/node-packages/node-packages-v12.nix
index 63b388f88eb..dcc1c73c0fc 100644
--- a/pkgs/development/node-packages/node-packages-v12.nix
+++ b/pkgs/development/node-packages/node-packages-v12.nix
@@ -1255,13 +1255,13 @@ let
         sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
       };
     };
-    "minipass-2.6.2" = {
+    "minipass-2.8.1" = {
       name = "minipass";
       packageName = "minipass";
-      version = "2.6.2";
+      version = "2.8.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minipass/-/minipass-2.6.2.tgz";
-        sha512 = "38Jwdc8AttUDaQAIRX8Iaw3QoCDWjAwKMGeGDF9JUi9QCPMjH5qAQg/hdO8o1nC7Nmh1/CqzMg5FQPEKuKwznQ==";
+        url = "https://registry.npmjs.org/minipass/-/minipass-2.8.1.tgz";
+        sha512 = "QCG523ParRcE2+9A6wYh9UI3uy2FFLw4DQaVYQrY5HPfszc5M6VDD+j0QCwHm19LI2imes4RB+NBD8cOJccyCg==";
       };
     };
     "minizlib-1.2.2" = {
@@ -2038,13 +2038,13 @@ let
         sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf";
       };
     };
-    "tar-4.4.10" = {
+    "tar-4.4.11" = {
       name = "tar";
       packageName = "tar";
-      version = "4.4.10";
+      version = "4.4.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tar/-/tar-4.4.10.tgz";
-        sha512 = "g2SVs5QIxvo6OLp0GudTqEf05maawKUxXru104iaayWA09551tFCTI8f1Asb4lPfkBr91k07iL4c11XO3/b0tA==";
+        url = "https://registry.npmjs.org/tar/-/tar-4.4.11.tgz";
+        sha512 = "iI4zh3ktLJKaDNZKZc+fUONiQrSn9HkCFzamtb7k8FFmVilHVob7QsLX/VySAW8lAviMzMbFw4QtFb4errwgYA==";
       };
     };
     "temp-0.9.0" = {
@@ -2675,7 +2675,7 @@ in
       sources."mime-types-2.1.24"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
-      sources."minipass-2.6.2"
+      sources."minipass-2.8.1"
       sources."minizlib-1.2.2"
       sources."mkdirp-0.5.1"
       sources."ncp-0.4.2"
@@ -2748,7 +2748,7 @@ in
         ];
       })
       sources."strip-ansi-3.0.1"
-      sources."tar-4.4.10"
+      sources."tar-4.4.11"
       sources."temp-0.9.0"
       (sources."tough-cookie-2.4.3" // {
         dependencies = [
-- 
GitLab


From 13beb8d753a854807b4f823ae37928e4b8cf91f6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 23 Sep 2019 09:55:57 +0200
Subject: [PATCH 0788/2254] firefox: Use default icu

---
 pkgs/top-level/all-packages.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 804cec67fb2..6e4e3ba468e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18300,7 +18300,6 @@ in
       libpng = libpng_apng;
       python = python2;
       gnused = gnused_422;
-      icu = icu63;
       inherit (darwin.apple_sdk.frameworks) CoreMedia ExceptionHandling
                                             Kerberos AVFoundation MediaToolbox
                                             CoreLocation Foundation AddressBook;
-- 
GitLab


From 74e1d473ede1447dc31530bc9dcbccfd29776e29 Mon Sep 17 00:00:00 2001
From: yvt <i@yvt.jp>
Date: Mon, 23 Sep 2019 17:17:58 +0900
Subject: [PATCH 0789/2254] do-agent: Use pname instead of name

---
 pkgs/servers/monitoring/do-agent/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/monitoring/do-agent/default.nix b/pkgs/servers/monitoring/do-agent/default.nix
index b1b3160bc5b..025aa2024d0 100644
--- a/pkgs/servers/monitoring/do-agent/default.nix
+++ b/pkgs/servers/monitoring/do-agent/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
-  name = "do-agent-${version}";
+  pname = "do-agent";
   version = "3.5.6";
 
   src = fetchFromGitHub {
-- 
GitLab


From 1745ab38a0189299f15d0b31a9d1ddf85d871d50 Mon Sep 17 00:00:00 2001
From: yvt <i@yvt.jp>
Date: Mon, 23 Sep 2019 17:22:22 +0900
Subject: [PATCH 0790/2254] nixos/do-agent: Update description

---
 pkgs/servers/monitoring/do-agent/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/monitoring/do-agent/default.nix b/pkgs/servers/monitoring/do-agent/default.nix
index 025aa2024d0..9a180b24383 100644
--- a/pkgs/servers/monitoring/do-agent/default.nix
+++ b/pkgs/servers/monitoring/do-agent/default.nix
@@ -19,9 +19,11 @@ buildGoModule rec {
   modSha256 = "0ydjwxdkcz0blpzwapiaq66vh7nrcg4j91z6h7v4ynnw2rgp7pmy";
 
   meta = with lib; {
-    description = ''
-      Collects system metrics from a DigitalOcean Droplet (on which the program
-      runs) and sends them to DigitalOcean
+    description = "DigitalOcean droplet system metrics agent";
+    longDescription = ''
+      do-agent is a program provided by DigitalOcean that collects system
+      metrics from a DigitalOcean Droplet (on which the program runs) and sends
+      them to DigitalOcean to provide resource usage graphs and alerting.
     '';
     homepage = https://github.com/digitalocean/do-agent;
     license = licenses.asl20;
-- 
GitLab


From 4235d8b07caec04acd50c887813b1d3541370b96 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 23 Sep 2019 10:34:49 +0200
Subject: [PATCH 0791/2254] brave: 0.68.131 -> 0.69.128

---
 pkgs/applications/networking/browsers/brave/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix
index 45fb820a076..ae3659a21fe 100644
--- a/pkgs/applications/networking/browsers/brave/default.nix
+++ b/pkgs/applications/networking/browsers/brave/default.nix
@@ -82,11 +82,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "brave";
-  version = "0.68.131";
+  version = "0.69.128";
 
   src = fetchurl {
     url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-    sha256 = "0syhwy1gxy82jbxbryi1n4zp1ya7wvm20g1vqvd2s7kqspprsi0l";
+    sha256 = "1w5p2hbn14k239fbqrbxkw9h3p8wm7cdyjcyvrsss57fj00j8s4r";
   };
 
   dontConfigure = true;
-- 
GitLab


From 6e7742cfe657690050a2e373bc3561b51c340854 Mon Sep 17 00:00:00 2001
From: Roman Volosatovs <rvolosatovs@riseup.net>
Date: Mon, 19 Aug 2019 01:11:34 +0200
Subject: [PATCH 0792/2254] nodePackages.dockerfile-language-server-nodejs:
 init at 0.0.21

---
 .../node-packages/node-packages-v10.json      |    1 +
 .../node-packages/node-packages-v10.nix       | 1162 ++++++++++-------
 .../node-packages/node-packages-v12.nix       |   20 +-
 3 files changed, 720 insertions(+), 463 deletions(-)

diff --git a/pkgs/development/node-packages/node-packages-v10.json b/pkgs/development/node-packages/node-packages-v10.json
index ef5afe37117..bcb72488a9e 100644
--- a/pkgs/development/node-packages/node-packages-v10.json
+++ b/pkgs/development/node-packages/node-packages-v10.json
@@ -30,6 +30,7 @@
 , "dat"
 , "dhcp"
 , "dnschain"
+, "dockerfile-language-server-nodejs"
 , "elasticdump"
 , "elm-live"
 , "elm-oracle"
diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix
index 3f4c4d1b9b5..300299a4d88 100644
--- a/pkgs/development/node-packages/node-packages-v10.nix
+++ b/pkgs/development/node-packages/node-packages-v10.nix
@@ -13,31 +13,31 @@ let
         sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ==";
       };
     };
-    "@angular-devkit/architect-0.803.4" = {
+    "@angular-devkit/architect-0.803.5" = {
       name = "_at_angular-devkit_slash_architect";
       packageName = "@angular-devkit/architect";
-      version = "0.803.4";
+      version = "0.803.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.803.4.tgz";
-        sha512 = "Ek+xb9GfzHLbD+ATmupbzTSNFGddkH6dbb36cB6gme+vnlBVfXP0dxOg5lRKZoUIFJyREl9jSrA5zUhVwXaoVg==";
+        url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.803.5.tgz";
+        sha512 = "hOcYF5fG3oieTc/C1QZqXsON8m8cpdtfdWhY7F7tmqqZ4JBR7igH4SSFQOoQwTj77rsqtkOLI9isVLpoSGX0DQ==";
       };
     };
-    "@angular-devkit/core-8.3.4" = {
+    "@angular-devkit/core-8.3.5" = {
       name = "_at_angular-devkit_slash_core";
       packageName = "@angular-devkit/core";
-      version = "8.3.4";
+      version = "8.3.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@angular-devkit/core/-/core-8.3.4.tgz";
-        sha512 = "QjUN9EakpQ+sFYeMfBMecxVhgI4Vdg0k20h6PZDjZ9lqYNXjpaQVtBo7qiPYHh5kQeJEvdrzca6yeYuCP3TvZw==";
+        url = "https://registry.npmjs.org/@angular-devkit/core/-/core-8.3.5.tgz";
+        sha512 = "ag7Nr94wQUqCFtZjw+rMET+djGBmLk989Id5lLWViW99g4XFeS+e45mJv3JYRzF218+6EdicZz0DGQRYHekVeg==";
       };
     };
-    "@angular-devkit/schematics-8.3.4" = {
+    "@angular-devkit/schematics-8.3.5" = {
       name = "_at_angular-devkit_slash_schematics";
       packageName = "@angular-devkit/schematics";
-      version = "8.3.4";
+      version = "8.3.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-8.3.4.tgz";
-        sha512 = "+QXhrAEcReQJL4fn+35NbcdW5d1vawqSZUokqga8E971YUVUk55mHpIQ39Vpj3S9jhTRYwxsHl+7v9N7UaREmg==";
+        url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-8.3.5.tgz";
+        sha512 = "RMtM10kS+Docg90jzFMa4HQ+UzX95Gi5rCT/kSydEkBhp+Jeu/B0K2y67Fm2/qTdVNRCujrCpEmtiRcp1qsOQg==";
       };
     };
     "@antora/asciidoc-loader-2.1.1" = {
@@ -1273,13 +1273,13 @@ let
         sha1 = "890ae7c5d8c877f6d384860215ace9d7ec945bda";
       };
     };
-    "@hapi/address-2.1.1" = {
+    "@hapi/address-2.1.2" = {
       name = "_at_hapi_slash_address";
       packageName = "@hapi/address";
-      version = "2.1.1";
+      version = "2.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@hapi/address/-/address-2.1.1.tgz";
-        sha512 = "DYuHzu978pP1XW1GD3HGvLnAFjbQTIgc2+V153FGkbS2pgo9haigCdwBnUDrbhaOkgiJlbZvoEqDrcxSLHpiWA==";
+        url = "https://registry.npmjs.org/@hapi/address/-/address-2.1.2.tgz";
+        sha512 = "O4QDrx+JoGKZc6aN64L04vqa7e41tIiLU+OvKdcYaEMP97UttL0f9GIi9/0A4WAMx0uBd6SidDIhktZhgOcN8Q==";
       };
     };
     "@hapi/bourne-1.3.2" = {
@@ -1309,13 +1309,13 @@ let
         sha512 = "entf8ZMOK8sc+8YfeOlM8pCfg3b5+WZIKBfUaaJT8UsjAAPjartzxIYm3TIbjvA4u+u++KbcXD38k682nVHDAQ==";
       };
     };
-    "@hapi/topo-3.1.3" = {
+    "@hapi/topo-3.1.4" = {
       name = "_at_hapi_slash_topo";
       packageName = "@hapi/topo";
-      version = "3.1.3";
+      version = "3.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@hapi/topo/-/topo-3.1.3.tgz";
-        sha512 = "JmS9/vQK6dcUYn7wc2YZTqzIKubAQcJKu2KCKAru6es482U5RT5fP1EXCPtlXpiK7PR0On/kpQKI4fRKkzpZBQ==";
+        url = "https://registry.npmjs.org/@hapi/topo/-/topo-3.1.4.tgz";
+        sha512 = "aVWQTOI9wBD6zawmOr6f+tdEIxQC8JXfQVLTjgGe8YEStAWGn/GNNVTobKJhbWKveQj2RyYF3oYbO9SC8/eOCA==";
       };
     };
     "@iarna/toml-2.2.3" = {
@@ -1327,94 +1327,94 @@ let
         sha512 = "FmuxfCuolpLl0AnQ2NHSzoUKWEJDFl63qXjzdoWBVyFCXzMGm1spBzk7LeHNoVCiWCF7mRVms9e6jEV9+MoPbg==";
       };
     };
-    "@ionic/cli-framework-2.1.6" = {
+    "@ionic/cli-framework-2.1.7" = {
       name = "_at_ionic_slash_cli-framework";
       packageName = "@ionic/cli-framework";
-      version = "2.1.6";
+      version = "2.1.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-2.1.6.tgz";
-        sha512 = "V0jkrOXfPes0N1ECmiWDgcRZSaWq7PUFCctMNNqe4xwbQ61aDNypEIQCvVdgIk16zVBKrMI4EP94Qplvi6CYGw==";
+        url = "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-2.1.7.tgz";
+        sha512 = "osuKbmCIzT0H+g39lDy+EmsP5RHc+aYOv+BN+IngsaxKb7ya0V/JlLO1vLkd7RYT+lmiQWiCi7RpHPeEgQJFtw==";
       };
     };
-    "@ionic/discover-2.0.5" = {
+    "@ionic/discover-2.0.6" = {
       name = "_at_ionic_slash_discover";
       packageName = "@ionic/discover";
-      version = "2.0.5";
+      version = "2.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ionic/discover/-/discover-2.0.5.tgz";
-        sha512 = "4gVq4UvCHzgQtE0Sffc6MZiwDE9XjWhYsKm81h85dz/iVT4sx0c5fFvJzGXg7OFHCsVN2PhmlIwdgmYetqB5Ow==";
+        url = "https://registry.npmjs.org/@ionic/discover/-/discover-2.0.6.tgz";
+        sha512 = "OEjUcVDliTqCWlFGFbD+msTLwQCXNHXUTdg6PQIjDn5RipVSWtpVB+DjLO+D1zYkY6TgD9mxBcIwiYJBRuw5dg==";
       };
     };
-    "@ionic/utils-array-1.2.0" = {
+    "@ionic/utils-array-1.2.1" = {
       name = "_at_ionic_slash_utils-array";
       packageName = "@ionic/utils-array";
-      version = "1.2.0";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ionic/utils-array/-/utils-array-1.2.0.tgz";
-        sha512 = "wJfshi287FRjZM43+w3OkMl4n7hDTmK/9Jxm9Ot5hBDgeLP6Fw/OBb6tt+nGjhRBJbk1oOi7ksJgyBw/+1ldzg==";
+        url = "https://registry.npmjs.org/@ionic/utils-array/-/utils-array-1.2.1.tgz";
+        sha512 = "t0/gXFf70oDPpviGUHpaDD9++zIx8nFXpPm8c3We8iH5dRwEJLSun+AJTqxO/XPzEhM24KBuj3rLY9bSYBadEg==";
       };
     };
-    "@ionic/utils-fs-2.0.6" = {
+    "@ionic/utils-fs-2.0.7" = {
       name = "_at_ionic_slash_utils-fs";
       packageName = "@ionic/utils-fs";
-      version = "2.0.6";
+      version = "2.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-2.0.6.tgz";
-        sha512 = "iU1UwU5NW2nlLvNNE3QoeH6I+wN3a4ypHFcS6Bp7qUDENeI+oTxHzVHKHM6qt7T/24TFLNcHVxcq/pGIt7vgOA==";
+        url = "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-2.0.7.tgz";
+        sha512 = "rXTKJD66qocDs8w72+z7yw6P8H095yexIMsUbNiJFjMm3Cx542i+Tw9gbGwYN356WrA/0EATXD/zVZDzvDsSKQ==";
       };
     };
-    "@ionic/utils-network-1.0.4" = {
+    "@ionic/utils-network-1.0.5" = {
       name = "_at_ionic_slash_utils-network";
       packageName = "@ionic/utils-network";
-      version = "1.0.4";
+      version = "1.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ionic/utils-network/-/utils-network-1.0.4.tgz";
-        sha512 = "VDWlschcLc6t71AAk54ywycVwahRv2qK82DOxdiN02YwurqXclcT2wmZCjnzAgBOPEepqmxj0mKozPA9YYWcbg==";
+        url = "https://registry.npmjs.org/@ionic/utils-network/-/utils-network-1.0.5.tgz";
+        sha512 = "seOoxQUKTugpNjQWYVAmylh6mfddPyE2EsWWyn6ojkp7HurMadvRZa9OQ/PrhMjkphHupPMyuIukaD7F2zMW9Q==";
       };
     };
-    "@ionic/utils-object-1.0.4" = {
+    "@ionic/utils-object-1.0.5" = {
       name = "_at_ionic_slash_utils-object";
       packageName = "@ionic/utils-object";
-      version = "1.0.4";
+      version = "1.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ionic/utils-object/-/utils-object-1.0.4.tgz";
-        sha512 = "B05kWS+Uj0rGrvG1RvAzDBuggstmWM0X4OUb3p9GhZJJQsNK2/0W03VfPOkNuaDi15NF/WFwLS7/yp7kM25mTw==";
+        url = "https://registry.npmjs.org/@ionic/utils-object/-/utils-object-1.0.5.tgz";
+        sha512 = "nyNH8EJcE/xl5G7Zyz5Thy5f1Otj+fhsXca3C5WsCG6y7yb2biDaaw3lgq/KtEYfXyH1znHsbs9hdJNLgCefGQ==";
       };
     };
-    "@ionic/utils-process-1.0.4" = {
+    "@ionic/utils-process-1.0.5" = {
       name = "_at_ionic_slash_utils-process";
       packageName = "@ionic/utils-process";
-      version = "1.0.4";
+      version = "1.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ionic/utils-process/-/utils-process-1.0.4.tgz";
-        sha512 = "F70r4Dup0yz03lDVCiRva2Qz7+VXNtUnfx7pfIFaDQv54sUem7ozG6zl4db5EE3a4RAJUCbM5YQFsAojnEUc+g==";
+        url = "https://registry.npmjs.org/@ionic/utils-process/-/utils-process-1.0.5.tgz";
+        sha512 = "zzDeLiz2lnpI9hKoMHbQiKfbnfFor9LXcW1ZWIKy9YkGOXv80UWbQq43CstMtnDtghcXLS02DaOVtcJPh47psw==";
       };
     };
-    "@ionic/utils-stream-2.0.3" = {
+    "@ionic/utils-stream-2.0.4" = {
       name = "_at_ionic_slash_utils-stream";
       packageName = "@ionic/utils-stream";
-      version = "2.0.3";
+      version = "2.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ionic/utils-stream/-/utils-stream-2.0.3.tgz";
-        sha512 = "Y1OAcJwP8uNCYQiRxywfo85jdOVbfdvRwjuvFVupFrLQet6kOBKh9wHHnivoS9du+Wlq4VjuFh03LmmAaHwenA==";
+        url = "https://registry.npmjs.org/@ionic/utils-stream/-/utils-stream-2.0.4.tgz";
+        sha512 = "qha4Msonb44++xvf8YppBR27dNBRuMLSty4/THH9uD6UEdjU2+23LWACKuqnQUSsZjQdvALVDMcRRWEIYEL2VQ==";
       };
     };
-    "@ionic/utils-subprocess-1.0.7" = {
+    "@ionic/utils-subprocess-1.0.8" = {
       name = "_at_ionic_slash_utils-subprocess";
       packageName = "@ionic/utils-subprocess";
-      version = "1.0.7";
+      version = "1.0.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ionic/utils-subprocess/-/utils-subprocess-1.0.7.tgz";
-        sha512 = "QXCqdwSSGiyxgs36faSbxiVIRCUBI6ckmCSWSLRGZAo4EZ7MuPQUqU+oVILkTWTOPAMWNcJtS67zJNMTccsSUg==";
+        url = "https://registry.npmjs.org/@ionic/utils-subprocess/-/utils-subprocess-1.0.8.tgz";
+        sha512 = "gfVCzccOQ3PVfY6d1hDZq1Qv7hOXAn3ZlepAEbUBOeFauIhXmwmwVdIRa9cfi3cESpDidNQ3dpmXyC+nKxv0Og==";
       };
     };
-    "@ionic/utils-terminal-1.0.4" = {
+    "@ionic/utils-terminal-1.0.5" = {
       name = "_at_ionic_slash_utils-terminal";
       packageName = "@ionic/utils-terminal";
-      version = "1.0.4";
+      version = "1.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ionic/utils-terminal/-/utils-terminal-1.0.4.tgz";
-        sha512 = "+iJbFff7mnJ6ROE465+/DG8eweFmINVy69Bdw9fr8Vcf8WhJWxMw0vd59J/gaUSsHuxoufZYftVXVoWUd8RfWA==";
+        url = "https://registry.npmjs.org/@ionic/utils-terminal/-/utils-terminal-1.0.5.tgz";
+        sha512 = "kaE/sKG3p6y9n73IfR0hU218YORS9P1sg4+GYCie+iGxSTixcKIX7yUBOCY1s2Oav0xS9mjGcpa6ppzANC70bw==";
       };
     };
     "@kbrandwijk/swagger-to-graphql-2.4.3" = {
@@ -2065,13 +2065,13 @@ let
         sha512 = "L4JaJDXn8SGT+5G0uX79rZLv0MNJmfGa4vb4vy1NnpjSnWDLJRy6m90udGwvMmavwsStgbv2QNkPzzTCMmL+ig==";
       };
     };
-    "@octokit/rest-16.28.9" = {
+    "@octokit/rest-16.30.0" = {
       name = "_at_octokit_slash_rest";
       packageName = "@octokit/rest";
-      version = "16.28.9";
+      version = "16.30.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@octokit/rest/-/rest-16.28.9.tgz";
-        sha512 = "IKGnX+Tvzt7XHhs8f4ajqxyJvYAMNX5nWfoJm4CQj8LZToMiaJgutf5KxxpxoC3y5w7JTJpW5rnWnF4TsIvCLA==";
+        url = "https://registry.npmjs.org/@octokit/rest/-/rest-16.30.0.tgz";
+        sha512 = "TN5MbqVuqxT/s87D6tGe3zsMvyHUQSkGFMBHuwBToPQGV3eG2a67rJW2rag2vJr7JusWyERDhQ4g/4HvFo9B1g==";
       };
     };
     "@parcel/fs-1.11.0" = {
@@ -2218,31 +2218,31 @@ let
         sha512 = "YXJqp9gdHcZKAmBY/WnwFpPtNQp2huD/ME2YMurH2YHJvxrVzYsmpKw/pb7yINArRpp8E++fwbQd3ajYXGA45Q==";
       };
     };
-    "@schematics/angular-8.3.4" = {
+    "@schematics/angular-8.3.5" = {
       name = "_at_schematics_slash_angular";
       packageName = "@schematics/angular";
-      version = "8.3.4";
+      version = "8.3.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@schematics/angular/-/angular-8.3.4.tgz";
-        sha512 = "/HO6vZosULsJnwZLG9JLePyaR2g4MePrk27c3H/WbFNN4ajBePe1Mj34q6HCzje30NduLV8B3SykPnG1CoNy5Q==";
+        url = "https://registry.npmjs.org/@schematics/angular/-/angular-8.3.5.tgz";
+        sha512 = "3YKurSNqUfjVrbENVlnTBNGYBWjdyjrWzJRlwWbCq+owQLhkZ/N5qVirt/SDw5T9hK2AEMOKjLkQYtpE+aOCgg==";
       };
     };
-    "@schematics/update-0.803.4" = {
+    "@schematics/update-0.803.5" = {
       name = "_at_schematics_slash_update";
       packageName = "@schematics/update";
-      version = "0.803.4";
+      version = "0.803.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@schematics/update/-/update-0.803.4.tgz";
-        sha512 = "ZLCUR7VpUkv3zjeOmcny3UAtwHbQLeBeDsoLYIVQZyepqk3kRPBGaW/xYwmNng04bVfMCtcTx9yrs7n4+Lt/Iw==";
+        url = "https://registry.npmjs.org/@schematics/update/-/update-0.803.5.tgz";
+        sha512 = "v2qU0ATb1jND8GIGQFnI1QLWoquUjJ2fJ37HoDSO3rmttZ/NvoV4sNDGhk/pPUcmeXa+prURfJCCCSeHZ/yKkw==";
       };
     };
-    "@serverless/cli-1.2.1" = {
+    "@serverless/cli-1.2.3" = {
       name = "_at_serverless_slash_cli";
       packageName = "@serverless/cli";
-      version = "1.2.1";
+      version = "1.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@serverless/cli/-/cli-1.2.1.tgz";
-        sha512 = "+Ip9UsmrH2e6Q36ZHmeEWu4ez36Srl1hgeaM6t6YPGJlNRNFw650Xt43K5EAZpWVvGJNYuNaQs9FZs4ZnakLgQ==";
+        url = "https://registry.npmjs.org/@serverless/cli/-/cli-1.2.3.tgz";
+        sha512 = "N/hsPZrE/zK8Iv98bdEG7J6ZhotWXwywjc/bKWcbhZeXENqbS7UD2qtyL/pfGuNodFVG587l8Cf+UvK8OcA6Qg==";
       };
     };
     "@serverless/component-metrics-1.0.8" = {
@@ -2263,13 +2263,13 @@ let
         sha512 = "XP5KXvEGlrNIOV/KJ0KKwzeov9MqZQ+Ck3z7JW/gtd8ryoKK+5+ah2WL77DXETeHeEwxZhJdrNatqc0FXauEiw==";
       };
     };
-    "@serverless/enterprise-plugin-2.0.0" = {
+    "@serverless/enterprise-plugin-3.0.0" = {
       name = "_at_serverless_slash_enterprise-plugin";
       packageName = "@serverless/enterprise-plugin";
-      version = "2.0.0";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-2.0.0.tgz";
-        sha512 = "jfTXC3eAFkgXbsHfDwLr6od3evwnmz0KhVs/p5HXXh37BGX8ETVFUoWsrIOf92flbGDPBEyzcHXX5cfNBlfNKA==";
+        url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-3.0.0.tgz";
+        sha512 = "+L+SeQV0MKQN9TBXC6Xmgcw7BVfW8Q3F/lMjB1MPsBd0RZPzYnVlWcVg4cA6tgvkpfdw8NVlh/QXFs+603zHrg==";
       };
     };
     "@serverless/event-mocks-1.1.1" = {
@@ -5845,13 +5845,13 @@ let
         sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3";
       };
     };
-    "aws-sdk-2.529.0" = {
+    "aws-sdk-2.533.0" = {
       name = "aws-sdk";
       packageName = "aws-sdk";
-      version = "2.529.0";
+      version = "2.533.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.529.0.tgz";
-        sha512 = "CtRxgI4ZVZ8cdFCddlIVIy06cEW5gzTJBpyouZ/ySgZ6BiYj+0e77LwoNsnQE2nUNWCbydTLn3dbz4ZZMDpuIg==";
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.533.0.tgz";
+        sha512 = "OSe7C0jnBdgfzedOtK+TgBEwtJaaZovm+Q2fbqIlfhUWg3rhhkt3oLyQ9bRD30/CFaunLhLr/8HAAN+/x+DWAA==";
       };
     };
     "aws-sign2-0.6.0" = {
@@ -6943,6 +6943,15 @@ let
         sha1 = "47688cb99bb6804f0e06d3e763b1c32e57d8e6b6";
       };
     };
+    "base64id-2.0.0" = {
+      name = "base64id";
+      packageName = "base64id";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/base64id/-/base64id-2.0.0.tgz";
+        sha512 = "lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==";
+      };
+    };
     "base64url-3.0.1" = {
       name = "base64url";
       packageName = "base64url";
@@ -7114,13 +7123,13 @@ let
         sha1 = "159a49b9a9714c1fb102f2e0ed1906fab6a450f4";
       };
     };
-    "big-integer-1.6.44" = {
+    "big-integer-1.6.45" = {
       name = "big-integer";
       packageName = "big-integer";
-      version = "1.6.44";
+      version = "1.6.45";
       src = fetchurl {
-        url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.44.tgz";
-        sha512 = "7MzElZPTyJ2fNvBkPxtFQ2fWIkVmuzw41+BZHSzpEq3ymB2MfeKp1+yXl/tS75xCx+WnyV+yb0kp+K1C3UNwmQ==";
+        url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.45.tgz";
+        sha512 = "nmb9E7oEtVJ7SmSCH/DeJobXyuRmaofkpoQSimMFu3HKJ5MADtM825SPLhDuWhZ6TElLAQtgJbQmBZuHIRlZoA==";
       };
     };
     "big.js-5.2.2" = {
@@ -7384,13 +7393,13 @@ let
         sha1 = "f962d687ec2c369570ae71af843256e6d0ca1129";
       };
     };
-    "blessed-contrib-4.8.16" = {
+    "blessed-contrib-4.8.17" = {
       name = "blessed-contrib";
       packageName = "blessed-contrib";
-      version = "4.8.16";
+      version = "4.8.17";
       src = fetchurl {
-        url = "https://registry.npmjs.org/blessed-contrib/-/blessed-contrib-4.8.16.tgz";
-        sha512 = "B1fEJTR+8IsimEvYQbvXCvnV0L674rFxy9yMwqibiRO2nxa5fzwnoKhJjRJFCBYH27ztW+b6jKvnOvetnj30WA==";
+        url = "https://registry.npmjs.org/blessed-contrib/-/blessed-contrib-4.8.17.tgz";
+        sha512 = "uhywRrzJQxtpkowgDHdejIE911Pgt0raYOQUoFC/qREyQvXsz5DMj2J2JVjwcx2bpzbDdHRoP/lcWLE1Ol3vCQ==";
       };
     };
     "blob-0.0.2" = {
@@ -9067,13 +9076,13 @@ let
         sha512 = "c4PR2egjNjI1um6bamCQ6bUNPDiyofNQruHvKgHQ4gDUP/ITSVSzNsiI5OWtHOsX323i5ha/kk4YmOZ1Ktg7KA==";
       };
     };
-    "chokidar-3.1.0" = {
+    "chokidar-3.1.1" = {
       name = "chokidar";
       packageName = "chokidar";
-      version = "3.1.0";
+      version = "3.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chokidar/-/chokidar-3.1.0.tgz";
-        sha512 = "6vZfo+7W0EOlbSo0nhVKMz4yyssrwiPbBZ8wj1lq8/+l4ZhGZ2U4Md7PspvmijXp1a26D3B7AHEBmIB7aVtaOQ==";
+        url = "https://registry.npmjs.org/chokidar/-/chokidar-3.1.1.tgz";
+        sha512 = "df4o16uZmMHzVQwECZRHwfguOt5ixpuQVaZHjYMvYisgKhE+JXwcj/Tcr3+3bu/XeOJQ9ycYmzu7Mv8XrGxJDQ==";
       };
     };
     "chownr-0.0.2" = {
@@ -9976,6 +9985,15 @@ let
         sha512 = "mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==";
       };
     };
+    "colors-1.4.0" = {
+      name = "colors";
+      packageName = "colors";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz";
+        sha512 = "a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==";
+      };
+    };
     "colorspace-1.1.2" = {
       name = "colorspace";
       packageName = "colorspace";
@@ -11290,6 +11308,15 @@ let
         sha512 = "eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==";
       };
     };
+    "cross-spawn-7.0.0" = {
+      name = "cross-spawn";
+      packageName = "cross-spawn";
+      version = "7.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.0.tgz";
+        sha512 = "6U/8SMK2FBNnB21oQ4+6Nsodxanw1gTkntYA2zBdkFYFu3ZDx65P2ONEXGSvob/QS6REjVHQ9zxzdOafwFdstw==";
+      };
+    };
     "cross-spawn-async-2.2.5" = {
       name = "cross-spawn-async";
       packageName = "cross-spawn-async";
@@ -12271,6 +12298,15 @@ let
         sha1 = "80a4dd323748384bfa248083622aedec982adff3";
       };
     };
+    "decompress-response-4.2.1" = {
+      name = "decompress-response";
+      packageName = "decompress-response";
+      version = "4.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz";
+        sha512 = "jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==";
+      };
+    };
     "decompress-tar-4.1.1" = {
       name = "decompress-tar";
       packageName = "decompress-tar";
@@ -12541,13 +12577,13 @@ let
         sha1 = "2cef1f111e1c57870d8bbb8af2650e587cd2f5b4";
       };
     };
-    "deferred-leveldown-5.2.0" = {
+    "deferred-leveldown-5.2.1" = {
       name = "deferred-leveldown";
       packageName = "deferred-leveldown";
-      version = "5.2.0";
+      version = "5.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-5.2.0.tgz";
-        sha512 = "E1s224a+nv7nEZQL/s+q4ARzBhsfo3KiEjK3qdvDAvMfWE68GnGsMRYKanoZgYqq+LNgyRMYPzBgEmAXjM2i5g==";
+        url = "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-5.2.1.tgz";
+        sha512 = "PwXZRn5EmW+IKYVAYVc7G9FsRkShr0myPubPuq+mtLhDq9xSUqfvTlNZKoeQGeXACHXkeCFurKrz5oo6TZ3qwg==";
       };
     };
     "define-properties-1.1.3" = {
@@ -13207,6 +13243,15 @@ let
         sha1 = "b91d806f5d27188e4ab3e7d107d881a1cc4642b6";
       };
     };
+    "dockerfile-ast-0.0.12" = {
+      name = "dockerfile-ast";
+      packageName = "dockerfile-ast";
+      version = "0.0.12";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.0.12.tgz";
+        sha512 = "cIV8oXkAxpIuN5XgG0TGg07nLDgrj4olkfrdT77OTA3VypscsYHBUg/FjHxW9K3oA+CyH4Th/qtoMgTVpzSobw==";
+      };
+    };
     "dockerfile-ast-0.0.16" = {
       name = "dockerfile-ast";
       packageName = "dockerfile-ast";
@@ -13216,6 +13261,33 @@ let
         sha512 = "+HZToHjjiLPl46TqBrok5dMrg5oCkZFPSROMQjRmvin0zG4FxK0DJXTpV/CUPYY2zpmEvVza55XLwSHFx/xZMw==";
       };
     };
+    "dockerfile-language-service-0.0.8" = {
+      name = "dockerfile-language-service";
+      packageName = "dockerfile-language-service";
+      version = "0.0.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dockerfile-language-service/-/dockerfile-language-service-0.0.8.tgz";
+        sha512 = "peko1rQtZ81e3QK3VLZgkCKkCMnuoSqZxCQuudyEbtYqqAe6jJ4r0bwOnWD9hyH/FMg7jMvI5uLsoo7/dHLNYw==";
+      };
+    };
+    "dockerfile-utils-0.0.11" = {
+      name = "dockerfile-utils";
+      packageName = "dockerfile-utils";
+      version = "0.0.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dockerfile-utils/-/dockerfile-utils-0.0.11.tgz";
+        sha512 = "LNdPIgcl58343dF4KNCHvFzUScUhgLI9BRAR+Vln6D1tVBGvv1k5/qHuxWRCAM2uyFbj73QVkKMScXPhY7TqfQ==";
+      };
+    };
+    "dockerfile-utils-0.0.13" = {
+      name = "dockerfile-utils";
+      packageName = "dockerfile-utils";
+      version = "0.0.13";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dockerfile-utils/-/dockerfile-utils-0.0.13.tgz";
+        sha512 = "+MAmhEnQ16B7+3C2UDWpmIS1D8EiKvpl4LDRjrMv94bOusaeRcLagRR0AvgV6NWT+oiRxDMLDyay6yjm6LESsw==";
+      };
+    };
     "doctrine-2.1.0" = {
       name = "doctrine";
       packageName = "doctrine";
@@ -13801,13 +13873,13 @@ let
         sha512 = "kS/gEPzZs3Y1rRsbGX4UOSjtP/CeJP0CxSNZHYxGfVM/VgLcv0ZqM7C45YyTj2DI2g7+P9Dd24C+IMIg6D0nYQ==";
       };
     };
-    "electron-to-chromium-1.3.260" = {
+    "electron-to-chromium-1.3.264" = {
       name = "electron-to-chromium";
       packageName = "electron-to-chromium";
-      version = "1.3.260";
+      version = "1.3.264";
       src = fetchurl {
-        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.260.tgz";
-        sha512 = "wGt+OivF1C1MPwaSv3LJ96ebNbLAWlx3HndivDDWqwIVSQxmhL17Y/YmwUdEMtS/bPyommELt47Dct0/VZNQBQ==";
+        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.264.tgz";
+        sha512 = "z8E7WkrrquCuGYv+kKyybuZIbdms+4PeHp7Zm2uIgEhAigP0bOwqXILItwj0YO73o+QyHY/7XtEfP5DsHOWQgQ==";
       };
     };
     "elegant-spinner-1.0.1" = {
@@ -14081,6 +14153,15 @@ let
         sha512 = "AsaA9KG7cWPXWHp5FvHdDWY3AMWeZ8x+2pUVLcn71qE5AtAzgGbxuclOytygskw8XGmiQafTmnI9Bix3uihu2w==";
       };
     };
+    "engine.io-3.4.0" = {
+      name = "engine.io";
+      packageName = "engine.io";
+      version = "3.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/engine.io/-/engine.io-3.4.0.tgz";
+        sha512 = "XCyYVWzcHnK5cMz7G4VTu2W7zJS7SM1QkcelghyIk/FmobWBtXE7fwhBusEKvCSqc3bMh8fNFMlUkCKTFRxH2w==";
+      };
+    };
     "engine.io-client-1.3.1" = {
       name = "engine.io-client";
       packageName = "engine.io-client";
@@ -14108,6 +14189,15 @@ let
         sha512 = "y0CPINnhMvPuwtqXfsGuWE8BB66+B6wTtCofQDRecMQPYX3MYUZXFNKDhdrSe3EVjgOu4V3rxdeqN/Tr91IgbQ==";
       };
     };
+    "engine.io-client-3.4.0" = {
+      name = "engine.io-client";
+      packageName = "engine.io-client";
+      version = "3.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.4.0.tgz";
+        sha512 = "a4J5QO2k99CM2a0b12IznnyQndoEvtA4UAldhGzKqnHf42I3Qs2W5SPnDvatZRcMaNZs4IevVicBPayxYt6FwA==";
+      };
+    };
     "engine.io-parser-1.0.6" = {
       name = "engine.io-parser";
       packageName = "engine.io-parser";
@@ -14126,6 +14216,15 @@ let
         sha512 = "6HXPre2O4Houl7c4g7Ic/XzPnHBvaEmN90vtRO9uLmwtRqQmTOw0QMevL1TOfL2Cpu1VzsaTmMotQgMdkzGkVA==";
       };
     };
+    "engine.io-parser-2.2.0" = {
+      name = "engine.io-parser";
+      packageName = "engine.io-parser";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.2.0.tgz";
+        sha512 = "6I3qD9iUxotsC5HEMuuGsKA0cXerGz+4uGcXQEkfBidgKf0amsjrrtwcbwK/nzpZBxclXlV7gGl9dgWvu4LF6w==";
+      };
+    };
     "enhanced-resolve-2.3.0" = {
       name = "enhanced-resolve";
       packageName = "enhanced-resolve";
@@ -16349,13 +16448,13 @@ let
         sha512 = "ougBA2q6Rn9sZrjZQ9r5pTFxCotlGouySpD2yRIuq5AYwwfIT8HHhVMeSwrN5qJayjHINLJyrnsSkkPCZyfMrQ==";
       };
     };
-    "flow-parser-0.107.0" = {
+    "flow-parser-0.108.0" = {
       name = "flow-parser";
       packageName = "flow-parser";
-      version = "0.107.0";
+      version = "0.108.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.107.0.tgz";
-        sha512 = "GtMCS8qzP0VskiE5qfN4zYiwjnClV/BxPZ4zUqMRUfyaF+gBuLHDTPqVLJ4ndGedrdv54510rsXDSbkCqUig+g==";
+        url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.108.0.tgz";
+        sha512 = "Ug8VuwlyDIZq5Xgrf+T7XLpKydhqYyNd8lmFtf7PZbu90T5LL+FeHjWzxyrBn35RCCZMw7pXrjCrHOSs+2zXyg==";
       };
     };
     "fluent-ffmpeg-2.1.2" = {
@@ -17663,13 +17762,13 @@ let
         sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae";
       };
     };
-    "glob-parent-5.0.0" = {
+    "glob-parent-5.1.0" = {
       name = "glob-parent";
       packageName = "glob-parent";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.0.0.tgz";
-        sha512 = "Z2RwiujPRGluePM6j699ktJYxmPpJKCfpGA13jz2hmFZC7gKetzrWvg5KN3+OsIFmydGyZ1AVwERCq1w/ZZwRg==";
+        url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz";
+        sha512 = "qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==";
       };
     };
     "glob-stream-3.1.18" = {
@@ -17735,13 +17834,13 @@ let
         sha1 = "e76989268a6c74c38908b1305b10fc0e394e9d0f";
       };
     };
-    "global-agent-2.1.0" = {
+    "global-agent-2.1.1" = {
       name = "global-agent";
       packageName = "global-agent";
-      version = "2.1.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/global-agent/-/global-agent-2.1.0.tgz";
-        sha512 = "o5BKvbhjGKHFRMkw+xtZeTEyyHGDsdXaFvOHDQx6pzCURtIaznEL2URkXfp2xxzth8Y/6n9yysHXnjjLH6soBw==";
+        url = "https://registry.npmjs.org/global-agent/-/global-agent-2.1.1.tgz";
+        sha512 = "MjLP2o331SpSxBMBFSWxs5PaWDhjXxysHepQ/hmBCjhjw74cbO9R/IBCbaSJ4GLPKm01dRcgXBtRr7p7XZEnfg==";
       };
     };
     "global-dirs-0.1.1" = {
@@ -18060,6 +18159,15 @@ let
         sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658";
       };
     };
+    "graceful-fs-4.2.1" = {
+      name = "graceful-fs";
+      packageName = "graceful-fs";
+      version = "4.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.1.tgz";
+        sha512 = "b9usnbDGnD928gJB3LrCmxoibr3VE4U2SMo5PBuBnokWyDADTqDPXg4YpwKF1trpH+UbGp7QLicO3+aWEy0+mw==";
+      };
+    };
     "graceful-fs-4.2.2" = {
       name = "graceful-fs";
       packageName = "graceful-fs";
@@ -18132,13 +18240,13 @@ let
         sha512 = "QZ5BL8ZO/B20VA8APauGBg3GyEgZ19eduvpLWoq5x7gMmWnHoy8rlQWPLmWgFvo1yNgjSEFMesmS4R6pPr7xog==";
       };
     };
-    "graphql-14.5.6" = {
+    "graphql-14.5.7" = {
       name = "graphql";
       packageName = "graphql";
-      version = "14.5.6";
+      version = "14.5.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/graphql/-/graphql-14.5.6.tgz";
-        sha512 = "zJ6Oz8P1yptV4O4DYXdArSwvmirPetDOBnGFRBl0zQEC68vNW3Ny8qo8VzMgfr+iC8PKiRYJ+f2wub41oDCoQg==";
+        url = "https://registry.npmjs.org/graphql/-/graphql-14.5.7.tgz";
+        sha512 = "as410RMJSUFqF8RcH2QWxZ5ioqHzsH9VWnWbaU+UnDXJ/6azMDIYPrtXCBPXd8rlunEVb7W8z6fuUnNHMbFu9A==";
       };
     };
     "graphql-anywhere-4.2.4" = {
@@ -18456,13 +18564,13 @@ let
         sha1 = "e28c4d45d05ecbbed818363ce8f9c5926229ffe5";
       };
     };
-    "handlebars-4.2.0" = {
+    "handlebars-4.2.1" = {
       name = "handlebars";
       packageName = "handlebars";
-      version = "4.2.0";
+      version = "4.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/handlebars/-/handlebars-4.2.0.tgz";
-        sha512 = "Kb4xn5Qh1cxAKvQnzNWZ512DhABzyFNmsaJf3OAkWNa4NkaqWcNI8Tao8Tasi0/F4JD9oyG0YxuFyvyR57d+Gw==";
+        url = "https://registry.npmjs.org/handlebars/-/handlebars-4.2.1.tgz";
+        sha512 = "bqPIlDk06UWbVEIFoYj+LVo42WhK96J+b25l7hbFDpxrOXMphFM3fNIm+cluwg4Pk2jiLjWU5nHQY7igGE75NQ==";
       };
     };
     "har-schema-1.0.5" = {
@@ -19330,6 +19438,15 @@ let
         sha512 = "Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==";
       };
     };
+    "http-proxy-1.18.0" = {
+      name = "http-proxy";
+      packageName = "http-proxy";
+      version = "1.18.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.0.tgz";
+        sha512 = "84I2iJM/n1d4Hdgc6y2+qY5mDaz2PUVjlg9znE9byl+q0uC3DeByqBGReQu5tpLK0TAqTIXScRUV+dg7+bUPpQ==";
+      };
+    };
     "http-proxy-agent-2.1.0" = {
       name = "http-proxy-agent";
       packageName = "http-proxy-agent";
@@ -19609,15 +19726,6 @@ let
         sha512 = "4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==";
       };
     };
-    "ieee754-1.1.8" = {
-      name = "ieee754";
-      packageName = "ieee754";
-      version = "1.1.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz";
-        sha1 = "be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4";
-      };
-    };
     "iferr-0.1.5" = {
       name = "iferr";
       packageName = "iferr";
@@ -20095,6 +20203,15 @@ let
         sha512 = "cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==";
       };
     };
+    "inquirer-7.0.0" = {
+      name = "inquirer";
+      packageName = "inquirer";
+      version = "7.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/inquirer/-/inquirer-7.0.0.tgz";
+        sha512 = "rSdC7zelHdRQFkWnhsMu2+2SO41mpv2oF2zy4tMhmiLWkcKbOAs87fWAJhVXttKVwhdZvymvnuM95EyEXg2/tQ==";
+      };
+    };
     "inquirer-autocomplete-prompt-1.0.1" = {
       name = "inquirer-autocomplete-prompt";
       packageName = "inquirer-autocomplete-prompt";
@@ -21427,13 +21544,13 @@ let
         sha1 = "1f16e4aa22b04d1336b66188a66af3c600c3a66d";
       };
     };
-    "is-wsl-2.1.0" = {
+    "is-wsl-2.1.1" = {
       name = "is-wsl";
       packageName = "is-wsl";
-      version = "2.1.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-wsl/-/is-wsl-2.1.0.tgz";
-        sha512 = "pFTjpv/x5HRj8kbZ/Msxi9VrvtOMRBqaDi3OIcbwPI3OuH+r3lLxVWukLITBaOGJIbA/w2+M1eVmVa4XNQlAmQ==";
+        url = "https://registry.npmjs.org/is-wsl/-/is-wsl-2.1.1.tgz";
+        sha512 = "umZHcSrwlDHo2TGMXv0DZ8dIUGunZ2Iv68YZnrmCiBPkZ4aaOhtv7pXJKeki9k3qJ3RJr0cDyitcl5wEH3AYog==";
       };
     };
     "is-yarn-global-0.3.0" = {
@@ -23084,13 +23201,13 @@ let
         sha512 = "SBSR60x+dghhwGUxPKS+BvV1xNqnwsEUBKmnFepPaHJ6VkBXyPK9SImGc3K2BkwBfpxlt7GKkBNlCnrdufsejA==";
       };
     };
-    "leveldown-5.2.0" = {
+    "leveldown-5.2.1" = {
       name = "leveldown";
       packageName = "leveldown";
-      version = "5.2.0";
+      version = "5.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/leveldown/-/leveldown-5.2.0.tgz";
-        sha512 = "Ml6mWFqhhyUbuJUVaOd6ZVBHA5T0XLOK0cwNRIBEDJCjBiJBM3fpi4gdTIhU5/tWqtxMFMQbmo/U7a9rbA1stg==";
+        url = "https://registry.npmjs.org/leveldown/-/leveldown-5.2.1.tgz";
+        sha512 = "369I1rGibXV7CIoLhsSpp/ExwQucI3xUe0RXQrMu4ji6OG9PFMVAQuzsEXKwAi3BWsjFzcFtodAP8MW5fmfung==";
       };
     };
     "levelup-0.19.1" = {
@@ -25956,6 +26073,15 @@ let
         sha512 = "j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==";
       };
     };
+    "mimic-response-2.0.0" = {
+      name = "mimic-response";
+      packageName = "mimic-response";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mimic-response/-/mimic-response-2.0.0.tgz";
+        sha512 = "8ilDoEapqA4uQ3TwS0jakGONKXVJqpy+RpM+3b7pLdOjghCrEiGp9SRkFbUHAmZW9vdnrENWHjaweIoTIJExSQ==";
+      };
+    };
     "min-document-2.19.0" = {
       name = "min-document";
       packageName = "min-document";
@@ -26091,13 +26217,13 @@ let
         sha512 = "oP88Dw3LK/pdrKyMdlbmg3W50969UNr4ctISzJfPl+YPYHTAOrS+dihXnsgRNKSRIzDsrnV3eE2CCVlZbpOKdQ==";
       };
     };
-    "minipass-2.6.2" = {
+    "minipass-2.8.1" = {
       name = "minipass";
       packageName = "minipass";
-      version = "2.6.2";
+      version = "2.8.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minipass/-/minipass-2.6.2.tgz";
-        sha512 = "38Jwdc8AttUDaQAIRX8Iaw3QoCDWjAwKMGeGDF9JUi9QCPMjH5qAQg/hdO8o1nC7Nmh1/CqzMg5FQPEKuKwznQ==";
+        url = "https://registry.npmjs.org/minipass/-/minipass-2.8.1.tgz";
+        sha512 = "QCG523ParRcE2+9A6wYh9UI3uy2FFLw4DQaVYQrY5HPfszc5M6VDD+j0QCwHm19LI2imes4RB+NBD8cOJccyCg==";
       };
     };
     "minitouch-prebuilt-1.2.0" = {
@@ -28121,13 +28247,13 @@ let
         sha512 = "U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==";
       };
     };
-    "normalize-url-4.3.0" = {
+    "normalize-url-4.4.1" = {
       name = "normalize-url";
       packageName = "normalize-url";
-      version = "4.3.0";
+      version = "4.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/normalize-url/-/normalize-url-4.3.0.tgz";
-        sha512 = "0NLtR71o4k6GLP+mr6Ty34c5GA6CMoEsncKJxvQd8NzPxaHRJNnb5gZE8R1XF4CPIS7QPHLJ74IFszwtNVAHVQ==";
+        url = "https://registry.npmjs.org/normalize-url/-/normalize-url-4.4.1.tgz";
+        sha512 = "rjH3yRt0Ssx19mUwS0hrDUOdG9VI+oRLpLHJ7tXRdjcuQ7v7wo6qPvOZppHRrqfslTKr0L2yBhjj4UXd7c3cQg==";
       };
     };
     "now-and-later-2.0.1" = {
@@ -28184,13 +28310,13 @@ let
         sha1 = "99b85aec29fcb388d2dd351f0013bf5268787e67";
       };
     };
-    "npm-lifecycle-3.1.3" = {
+    "npm-lifecycle-3.1.4" = {
       name = "npm-lifecycle";
       packageName = "npm-lifecycle";
-      version = "3.1.3";
+      version = "3.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-lifecycle/-/npm-lifecycle-3.1.3.tgz";
-        sha512 = "M0QmmqbEHBXxDrmc6X3+eKjW9+F7Edg1ENau92WkYw1sox6wojHzEZJIRm1ItljEiaigZlKL8mXni/4ylAy1Dg==";
+        url = "https://registry.npmjs.org/npm-lifecycle/-/npm-lifecycle-3.1.4.tgz";
+        sha512 = "tgs1PaucZwkxECGKhC/stbEgFyc3TGh2TJcg2CDr6jbvQRdteHNhmMeljRzpe4wgFAXQADoy1cSqqi7mtiAa5A==";
       };
     };
     "npm-package-arg-6.1.0" = {
@@ -29490,13 +29616,13 @@ let
         sha512 = "88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==";
       };
     };
-    "p-timeout-3.1.0" = {
+    "p-timeout-3.2.0" = {
       name = "p-timeout";
       packageName = "p-timeout";
-      version = "3.1.0";
+      version = "3.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/p-timeout/-/p-timeout-3.1.0.tgz";
-        sha512 = "C27DYI+tCroT8J8cTEyySGydl2B7FlxrGNF5/wmMbl1V+jeehUCzEE/BVgzRebdm2K3ZitKOKx8YbdFumDyYmw==";
+        url = "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz";
+        sha512 = "rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==";
       };
     };
     "p-try-1.0.0" = {
@@ -29697,13 +29823,13 @@ let
         sha1 = "fedd4d2bf193a77745fe71e371d73c3307d9c751";
       };
     };
-    "parse-asn1-5.1.4" = {
+    "parse-asn1-5.1.5" = {
       name = "parse-asn1";
       packageName = "parse-asn1";
-      version = "5.1.4";
+      version = "5.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.4.tgz";
-        sha512 = "Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw==";
+        url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.5.tgz";
+        sha512 = "jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ==";
       };
     };
     "parse-english-4.1.2" = {
@@ -30210,6 +30336,15 @@ let
         sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40";
       };
     };
+    "path-key-3.1.0" = {
+      name = "path-key";
+      packageName = "path-key";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-key/-/path-key-3.1.0.tgz";
+        sha512 = "8cChqz0RP6SHJkMt48FW0A7+qUOn+OsnOsVtzI59tZ8m+5bCSk7hzwET0pulwOM2YMn9J1efb07KB9l9f30SGg==";
+      };
+    };
     "path-loader-1.0.10" = {
       name = "path-loader";
       packageName = "path-loader";
@@ -32722,13 +32857,13 @@ let
         sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==";
       };
     };
-    "qs-6.8.0" = {
+    "qs-6.9.0" = {
       name = "qs";
       packageName = "qs";
-      version = "6.8.0";
+      version = "6.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-6.8.0.tgz";
-        sha512 = "tPSkj8y92PfZVbinY1n84i1Qdx75lZjMQYx9WZhnkofyxzw2r7Ho39G3/aEvSUdebxpnnM4LZJCtvE/Aq3+s9w==";
+        url = "https://registry.npmjs.org/qs/-/qs-6.9.0.tgz";
+        sha512 = "27RP4UotQORTpmNQDX8BHPukOnBP3p1uUJY5UnDhaJB+rMt9iMsok724XL+UHU23bEFOHRMQ2ZhI99qOWUMGFA==";
       };
     };
     "query-string-1.0.1" = {
@@ -35908,13 +36043,13 @@ let
         sha512 = "lSSHRSw3mQNUGPAYRqo7xy9dhKmxFXIjLjp4KHpf99GEH2VH7C3AM+Qfx6du6jhfUi6Vm7XnbEVEf7Wb6N8jRw==";
       };
     };
-    "simple-get-3.0.3" = {
+    "simple-get-3.1.0" = {
       name = "simple-get";
       packageName = "simple-get";
-      version = "3.0.3";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-get/-/simple-get-3.0.3.tgz";
-        sha512 = "Wvre/Jq5vgoz31Z9stYWPLn0PqRqmBDpFSdypAnHu5AvRVCYPRYGnvryNLiXu8GOBNDH82J2FRHUGMjjHUpXFw==";
+        url = "https://registry.npmjs.org/simple-get/-/simple-get-3.1.0.tgz";
+        sha512 = "bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA==";
       };
     };
     "simple-git-1.126.0" = {
@@ -35944,13 +36079,13 @@ let
         sha1 = "4e421f485ac7b13b08077a4476934d52c5ba3bb3";
       };
     };
-    "simple-peer-9.5.0" = {
+    "simple-peer-9.6.0" = {
       name = "simple-peer";
       packageName = "simple-peer";
-      version = "9.5.0";
+      version = "9.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-peer/-/simple-peer-9.5.0.tgz";
-        sha512 = "3tROq3nBo/CIZI8PWlXGbAxQIlQF6KQ/zcd4lQ2pAC4+rPiV7E721hI22nTO54uw/nzb2HKbvmDtZ4Wr173+vA==";
+        url = "https://registry.npmjs.org/simple-peer/-/simple-peer-9.6.0.tgz";
+        sha512 = "NYqSKPu75xhkZYKGJhCbLCG5kfBtDHf8U9ddk4EKFfYNU7XgIisov+V8wMbVVgyMCfn8pm8uOqQQmE50FPDFWA==";
       };
     };
     "simple-sha1-2.1.2" = {
@@ -36241,13 +36376,13 @@ let
         sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198";
       };
     };
-    "snyk-1.227.0" = {
+    "snyk-1.228.3" = {
       name = "snyk";
       packageName = "snyk";
-      version = "1.227.0";
+      version = "1.228.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk/-/snyk-1.227.0.tgz";
-        sha512 = "ejfq2FIca+b/zu4hkJwFUob1Emn+s9wXYw5VHJSS6BjiniNi6dIa24AARG3BWiVsN/3NvzCYAkcqhYGaJ6xyVw==";
+        url = "https://registry.npmjs.org/snyk/-/snyk-1.228.3.tgz";
+        sha512 = "TwyJcMXBvic1xJ+rVLdIYS1xDYuzcogIXdmyvGvXBZgwIQdjOVMnZBVxUo5igkOIntBL2sCynZiydQtGbe08JA==";
       };
     };
     "snyk-config-2.2.3" = {
@@ -36286,13 +36421,13 @@ let
         sha512 = "9hsGgloioGuey5hbZfv+MkFEslxXHyzUlaAazcR0NsY7VLyG/b2g3f88f/ZwCwlWaKL9LMv/ERIiey3oWAB/qg==";
       };
     };
-    "snyk-gradle-plugin-3.0.2" = {
+    "snyk-gradle-plugin-3.1.0" = {
       name = "snyk-gradle-plugin";
       packageName = "snyk-gradle-plugin";
-      version = "3.0.2";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.0.2.tgz";
-        sha512 = "9nyR03kHmePqBGaQiUeo3RD1YJ4qE5/V4tOmDQ8LNjHTQ54Xr8OXFC5xlJMV8FCtXrRXY0/WX8RMUPEUAm4c9g==";
+        url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.1.0.tgz";
+        sha512 = "789Rqyhv1+WYbfy1Qilgsw0FMccedSaCO5n+54CXXGVUZWMsVvqJj3T8k7+vis+9Eq+Sgbdzti8vDtApz6rWWQ==";
       };
     };
     "snyk-module-1.9.1" = {
@@ -36439,6 +36574,15 @@ let
         sha512 = "wxXrIuZ8AILcn+f1B4ez4hJTPG24iNgxBBDaJfT6MsyOhVYiTXWexGoPkd87ktJG8kQEcL/NBvRi64+9k4Kc0w==";
       };
     };
+    "socket.io-2.3.0" = {
+      name = "socket.io";
+      packageName = "socket.io";
+      version = "2.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socket.io/-/socket.io-2.3.0.tgz";
+        sha512 = "2A892lrj0GcgR/9Qk81EaY2gYhCBxurV0PfmmESO6p27QPrUK1J3zdns+5QPqvUYK2q657nSj0guoIil9+7eFg==";
+      };
+    };
     "socket.io-adapter-0.2.0" = {
       name = "socket.io-adapter";
       packageName = "socket.io-adapter";
@@ -36484,6 +36628,15 @@ let
         sha512 = "56ZrkTDbdTLmBIyfFYesgOxsjcLnwAKoN4CiPyTVkMQj3zTUh0QAx3GbvIvLpFEOvQWu92yyWICxB0u7wkVbYA==";
       };
     };
+    "socket.io-client-2.3.0" = {
+      name = "socket.io-client";
+      packageName = "socket.io-client";
+      version = "2.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.3.0.tgz";
+        sha512 = "cEQQf24gET3rfhxZ2jJ5xzAOo/xhZwK+mOqtGRg5IowZsMgwvHwnf/mCRapAAkadhM26y+iydgwsXGObBB5ZdA==";
+      };
+    };
     "socket.io-parser-2.1.2" = {
       name = "socket.io-parser";
       packageName = "socket.io-parser";
@@ -36520,6 +36673,15 @@ let
         sha512 = "hczmV6bDgdaEbVqhAeVMM/jfUfzuEZHsQg6eOmLgJht6G3mPKMxYm75w2+qhAQZ+4X+1+ATZ+QFKeOZD5riHng==";
       };
     };
+    "socket.io-parser-3.4.0" = {
+      name = "socket.io-parser";
+      packageName = "socket.io-parser";
+      version = "3.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.4.0.tgz";
+        sha512 = "/G/VOI+3DBp0+DJKW4KesGnQkQPFmUCbA/oO2QGT6CWxU7hLGWqU3tyuzeSK/dqcyeHsQg1vTe9jiZI8GU9SCQ==";
+      };
+    };
     "socks-2.3.2" = {
       name = "socks";
       packageName = "socks";
@@ -39059,13 +39221,13 @@ let
         sha512 = "FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==";
       };
     };
-    "tar-4.4.10" = {
+    "tar-4.4.11" = {
       name = "tar";
       packageName = "tar";
-      version = "4.4.10";
+      version = "4.4.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tar/-/tar-4.4.10.tgz";
-        sha512 = "g2SVs5QIxvo6OLp0GudTqEf05maawKUxXru104iaayWA09551tFCTI8f1Asb4lPfkBr91k07iL4c11XO3/b0tA==";
+        url = "https://registry.npmjs.org/tar/-/tar-4.4.11.tgz";
+        sha512 = "iI4zh3ktLJKaDNZKZc+fUONiQrSn9HkCFzamtb7k8FFmVilHVob7QsLX/VySAW8lAviMzMbFw4QtFb4errwgYA==";
       };
     };
     "tar-fs-2.0.0" = {
@@ -39581,13 +39743,13 @@ let
         sha1 = "f32eacac5a175bea25d7fab565ab3ed8741ef56f";
       };
     };
-    "timeout-refresh-1.0.0" = {
+    "timeout-refresh-1.0.1" = {
       name = "timeout-refresh";
       packageName = "timeout-refresh";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/timeout-refresh/-/timeout-refresh-1.0.0.tgz";
-        sha512 = "y5ajDPPtyhumr7xRnQgOMMVR5/EXMCVHPwM7RWnMUZx9UzT8FGRBtwG4/rh2AWHkDr7JR8dBHU6NDGx7tEiEAg==";
+        url = "https://registry.npmjs.org/timeout-refresh/-/timeout-refresh-1.0.1.tgz";
+        sha512 = "bW5oSShdwFCN9K7RpB5dkq5bqNlGt8Lwbfxr8vprysk8hDiK5yy7Mgf2Qlz2ssE0gfQfoYhk4VLY9Hhsnr9Ulw==";
       };
     };
     "timers-browserify-1.4.2" = {
@@ -40535,13 +40697,13 @@ let
         sha512 = "/XrQjW0e5Z915m1A0qeXD9tSLDmz8zGjR6imhGDme6rMtXYudFpXXhaToKnM52nPPCNdCh6YQsLLkwbbkFvzVA==";
       };
     };
-    "type-1.0.3" = {
+    "type-1.2.0" = {
       name = "type";
       packageName = "type";
-      version = "1.0.3";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/type/-/type-1.0.3.tgz";
-        sha512 = "51IMtNfVcee8+9GJvj0spSuFcZHe9vSib6Xtgsny1Km9ugyz2mbS08I3rsUIRYgJohFRFU1160sgRodYz378Hg==";
+        url = "https://registry.npmjs.org/type/-/type-1.2.0.tgz";
+        sha512 = "+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==";
       };
     };
     "type-check-0.3.2" = {
@@ -42758,6 +42920,15 @@ let
         sha512 = "IKIWTdUPBnOtwznIrhxKnjVZ7hYxEzwZ3M2xmDi7OjjexuOM6LnGtoo1Dv4wYSik4epK4STEib6e8da2GxUsJA==";
       };
     };
+    "vscode-languageserver-types-3.6.0" = {
+      name = "vscode-languageserver-types";
+      packageName = "vscode-languageserver-types";
+      version = "3.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.6.0.tgz";
+        sha512 = "GSgQtGmtza4PoNH0+iHWylWg/1sw2DODezqYWRxbN910dPchI3CQaSJN76csKcQGv55wsWgX82T6n74q8mFSpw==";
+      };
+    };
     "vscode-nls-3.2.5" = {
       name = "vscode-nls";
       packageName = "vscode-nls";
@@ -43019,13 +43190,13 @@ let
         sha512 = "5nIvteTDCUws2DVvP9Qe+JPla7kWPPIDFZv55To7IycHWZ+Z5qBdaBYPyuXWdhggTufZkQwfIK+5rKQTVovm2A==";
       };
     };
-    "webpack-cli-3.3.8" = {
+    "webpack-cli-3.3.9" = {
       name = "webpack-cli";
       packageName = "webpack-cli";
-      version = "3.3.8";
+      version = "3.3.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.8.tgz";
-        sha512 = "RANYSXwikSWINjHMd/mtesblNSpjpDLoYTBtP99n1RhXqVI/wxN40Auqy42I7y4xrbmRBoA5Zy5E0JSBD5XRhw==";
+        url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.9.tgz";
+        sha512 = "xwnSxWl8nZtBl/AFJCOn9pG7s5CYUYdZxmmukv+fAHLcBIHM36dImfpQg3WfShZXeArkWlf6QRw24Klcsv8a5A==";
       };
     };
     "webpack-core-0.6.9" = {
@@ -44592,17 +44763,17 @@ in
   "@angular/cli" = nodeEnv.buildNodePackage {
     name = "_at_angular_slash_cli";
     packageName = "@angular/cli";
-    version = "8.3.4";
+    version = "8.3.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/@angular/cli/-/cli-8.3.4.tgz";
-      sha512 = "5Jp7a1/Yepm2JkrMHY2Q7nO1FxlNvGp1Zc3m9dp4ydH08qO6/Z8WO0HF+/BxAsHZzB+XV91E1ZzbLR0RdsM8ag==";
+      url = "https://registry.npmjs.org/@angular/cli/-/cli-8.3.5.tgz";
+      sha512 = "gKzYV5YhypXKpt4vH/YJ/T7a72EqxTJynJ8dtoVsZw5YTdCzqa6APvObNs4lZaZ3pYxUOQr36W4Rz8Lv8CSBWA==";
     };
     dependencies = [
-      sources."@angular-devkit/architect-0.803.4"
-      sources."@angular-devkit/core-8.3.4"
-      sources."@angular-devkit/schematics-8.3.4"
-      sources."@schematics/angular-8.3.4"
-      sources."@schematics/update-0.803.4"
+      sources."@angular-devkit/architect-0.803.5"
+      sources."@angular-devkit/core-8.3.5"
+      sources."@angular-devkit/schematics-8.3.5"
+      sources."@schematics/angular-8.3.5"
+      sources."@schematics/update-0.803.5"
       sources."@yarnpkg/lockfile-1.1.0"
       sources."JSONStream-1.3.5"
       sources."agent-base-4.3.0"
@@ -44734,7 +44905,7 @@ in
       sources."mimic-fn-2.1.0"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
-      sources."minipass-2.6.2"
+      sources."minipass-2.8.1"
       sources."minizlib-1.2.2"
       sources."mississippi-3.0.0"
       sources."mkdirp-0.5.1"
@@ -44846,7 +45017,7 @@ in
       sources."strip-ansi-5.2.0"
       sources."supports-color-5.5.0"
       sources."symbol-observable-1.2.0"
-      sources."tar-4.4.10"
+      sources."tar-4.4.11"
       sources."through-2.3.8"
       sources."through2-2.0.5"
       sources."tmp-0.0.33"
@@ -44980,7 +45151,11 @@ in
       sources."clean-git-ref-1.0.3"
       sources."clone-2.1.2"
       sources."clone-buffer-1.0.0"
-      sources."clone-response-1.0.2"
+      (sources."clone-response-1.0.2" // {
+        dependencies = [
+          sources."mimic-response-1.0.1"
+        ];
+      })
       sources."clone-stats-1.0.0"
       (sources."cloneable-readable-1.1.3" // {
         dependencies = [
@@ -45000,7 +45175,7 @@ in
       sources."core-util-is-1.0.2"
       sources."crc-32-1.2.0"
       sources."decamelize-1.2.0"
-      sources."decompress-response-3.3.0"
+      sources."decompress-response-4.2.1"
       sources."deep-freeze-node-1.1.3"
       sources."defer-to-connect-1.0.2"
       sources."define-properties-1.1.3"
@@ -45059,7 +45234,12 @@ in
       })
       sources."globalyzer-0.1.4"
       sources."globrex-0.1.2"
-      sources."got-9.6.0"
+      (sources."got-9.6.0" // {
+        dependencies = [
+          sources."decompress-response-3.3.0"
+          sources."mimic-response-1.0.1"
+        ];
+      })
       sources."graceful-fs-4.2.2"
       (sources."gulp-vinyl-zip-2.1.2" // {
         dependencies = [
@@ -45069,7 +45249,7 @@ in
           sources."through2-2.0.5"
         ];
       })
-      sources."handlebars-4.2.0"
+      sources."handlebars-4.2.1"
       sources."has-symbols-1.0.0"
       sources."http-cache-semantics-4.0.3"
       sources."ignore-5.1.4"
@@ -45110,7 +45290,7 @@ in
       sources."matcher-2.0.0"
       sources."mime-db-1.40.0"
       sources."mime-types-2.1.24"
-      sources."mimic-response-1.0.1"
+      sources."mimic-response-2.0.0"
       sources."minimatch-3.0.4"
       sources."minimatch-all-1.1.0"
       sources."minimist-1.2.0"
@@ -45120,7 +45300,7 @@ in
       sources."neo-async-2.6.1"
       sources."nick-0.1.3"
       sources."normalize-path-2.1.1"
-      sources."normalize-url-4.3.0"
+      sources."normalize-url-4.4.1"
       sources."now-and-later-2.0.1"
       sources."object-keys-1.1.1"
       sources."object.assign-4.1.0"
@@ -45179,7 +45359,7 @@ in
       sources."safe-buffer-5.2.0"
       sources."sha.js-2.4.11"
       sources."simple-concat-1.0.0"
-      sources."simple-get-3.0.3"
+      sources."simple-get-3.1.0"
       sources."source-map-0.6.1"
       sources."split-0.3.3"
       sources."split2-3.1.1"
@@ -45347,11 +45527,11 @@ in
       sources."@babel/template-7.6.0"
       sources."@babel/traverse-7.6.0"
       sources."@babel/types-7.6.1"
-      sources."@hapi/address-2.1.1"
+      sources."@hapi/address-2.1.2"
       sources."@hapi/bourne-1.3.2"
       sources."@hapi/hoek-8.2.4"
       sources."@hapi/joi-15.1.1"
-      sources."@hapi/topo-3.1.3"
+      sources."@hapi/topo-3.1.4"
       sources."@mrmlnc/readdir-enhanced-2.2.1"
       sources."@nodelib/fs.stat-1.1.3"
       sources."@protobufjs/aspromise-1.1.2"
@@ -45531,7 +45711,7 @@ in
       sources."collection-visit-1.0.0"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
-      sources."colors-1.3.3"
+      sources."colors-1.4.0"
       sources."combined-stream-1.0.8"
       sources."commander-2.20.0"
       sources."commondir-1.0.1"
@@ -45618,7 +45798,7 @@ in
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
       sources."ejs-2.7.1"
-      sources."electron-to-chromium-1.3.260"
+      sources."electron-to-chromium-1.3.264"
       sources."encodeurl-1.0.2"
       sources."end-of-stream-1.4.1"
       sources."entities-1.1.2"
@@ -45699,7 +45879,7 @@ in
       })
       sources."find-up-3.0.0"
       sources."fkill-6.2.0"
-      sources."flow-parser-0.107.0"
+      sources."flow-parser-0.108.0"
       sources."for-in-1.0.2"
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.3"
@@ -45741,7 +45921,7 @@ in
       sources."got-6.7.1"
       sources."graceful-fs-4.2.2"
       sources."graceful-readlink-1.0.1"
-      sources."graphql-14.5.6"
+      sources."graphql-14.5.7"
       (sources."graphql-anywhere-4.2.4" // {
         dependencies = [
           sources."ts-invariant-0.3.3"
@@ -46583,7 +46763,7 @@ in
       sources."chmodr-1.2.0"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
-      sources."colors-1.3.3"
+      sources."colors-1.4.0"
       sources."commander-2.20.0"
       sources."concat-map-0.0.1"
       sources."convert-source-map-1.6.0"
@@ -47142,7 +47322,7 @@ in
       sources."agent-base-4.3.0"
       sources."ansi-styles-3.2.1"
       sources."balanced-match-1.0.0"
-      sources."big-integer-1.6.44"
+      sources."big-integer-1.6.45"
       sources."binary-0.3.0"
       sources."bluebird-3.4.7"
       sources."brace-expansion-1.1.11"
@@ -47253,7 +47433,7 @@ in
           sources."whatwg-url-7.0.0"
         ];
       })
-      sources."decompress-response-3.3.0"
+      sources."decompress-response-4.2.1"
       sources."deep-extend-0.6.0"
       sources."deep-is-0.1.3"
       sources."delayed-stream-1.0.0"
@@ -47305,7 +47485,7 @@ in
       sources."lodash.sortby-4.7.0"
       sources."mime-db-1.40.0"
       sources."mime-types-2.1.24"
-      sources."mimic-response-1.0.1"
+      sources."mimic-response-2.0.0"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
       (sources."mkdirp-0.5.1" // {
@@ -47351,7 +47531,7 @@ in
       sources."set-blocking-2.0.0"
       sources."signal-exit-3.0.2"
       sources."simple-concat-1.0.0"
-      sources."simple-get-3.0.3"
+      sources."simple-get-3.1.0"
       sources."source-map-0.6.1"
       sources."sshpk-1.16.1"
       sources."stealthy-require-1.1.1"
@@ -47672,7 +47852,7 @@ in
       sources."os-browserify-0.3.0"
       sources."pako-1.0.10"
       sources."parents-1.0.1"
-      sources."parse-asn1-5.1.4"
+      sources."parse-asn1-5.1.5"
       sources."path-browserify-0.0.1"
       sources."path-is-absolute-1.0.1"
       sources."path-parse-1.0.6"
@@ -48246,7 +48426,7 @@ in
       sources."code-point-at-1.1.0"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
-      sources."colors-1.3.3"
+      sources."colors-1.4.0"
       sources."commander-2.20.0"
       sources."debug-3.2.6"
       sources."escape-string-regexp-1.0.5"
@@ -48293,7 +48473,7 @@ in
       sources."color-name-1.1.3"
       sources."color-string-1.5.3"
       sources."colornames-1.1.1"
-      sources."colors-1.3.3"
+      sources."colors-1.4.0"
       sources."colorspace-1.1.2"
       sources."commander-2.19.0"
       sources."core-util-is-1.0.2"
@@ -48395,7 +48575,7 @@ in
       })
       sources."base64-js-1.3.1"
       sources."bcrypt-pbkdf-1.0.2"
-      sources."big-integer-1.6.44"
+      sources."big-integer-1.6.45"
       (sources."body-parser-1.19.0" // {
         dependencies = [
           sources."bytes-3.1.0"
@@ -49407,7 +49587,7 @@ in
       sources."performance-now-2.1.0"
       sources."process-nextick-args-2.0.1"
       sources."pseudomap-1.0.2"
-      sources."qs-6.8.0"
+      sources."qs-6.9.0"
       sources."quicktask-1.1.0"
       sources."raf-3.3.2"
       sources."readable-stream-2.3.6"
@@ -49437,7 +49617,7 @@ in
       sources."symbol-observable-1.2.0"
       sources."through-2.3.8"
       sources."tmp-0.0.33"
-      sources."type-1.0.3"
+      sources."type-1.2.0"
       sources."util-deprecate-1.0.2"
       (sources."variable-diff-1.1.0" // {
         dependencies = [
@@ -49461,10 +49641,10 @@ in
   create-react-app = nodeEnv.buildNodePackage {
     name = "create-react-app";
     packageName = "create-react-app";
-    version = "3.1.1";
+    version = "3.1.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/create-react-app/-/create-react-app-3.1.1.tgz";
-      sha512 = "EaK59gIwEsSZjjIN4MyG0DkXcatF3cEXYODIH7rDrlUremb7iwi5RzZGGISmPIrfywLC82Qom/8CXiT8hwixPQ==";
+      url = "https://registry.npmjs.org/create-react-app/-/create-react-app-3.1.2.tgz";
+      sha512 = "y5wgEQwt6IpUP1N64uorVavhp8NPUAamVqA/paZmpvPSrW3l2c5UhXRi5m61plBBzDde2WyDr+3vCwDsfaS03w==";
     };
     dependencies = [
       sources."ansi-escapes-3.2.0"
@@ -49761,7 +49941,7 @@ in
       sources."collection-visit-1.0.0"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
-      sources."colors-1.3.3"
+      sources."colors-1.4.0"
       sources."combined-stream-1.0.8"
       sources."component-emitter-1.3.0"
       sources."concat-map-0.0.1"
@@ -49796,7 +49976,7 @@ in
       sources."dat-swarm-defaults-1.0.2"
       sources."debug-4.1.1"
       sources."decode-uri-component-0.2.0"
-      sources."decompress-response-3.3.0"
+      sources."decompress-response-4.2.1"
       sources."deep-equal-0.2.2"
       sources."deep-extend-0.6.0"
       sources."define-properties-1.1.3"
@@ -50006,7 +50186,7 @@ in
       sources."mime-2.4.4"
       sources."mime-db-1.40.0"
       sources."mime-types-2.1.24"
-      sources."mimic-response-1.0.1"
+      sources."mimic-response-2.0.0"
       sources."min-document-2.19.0"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
@@ -50139,7 +50319,7 @@ in
         ];
       })
       sources."simple-concat-1.0.0"
-      sources."simple-get-3.0.3"
+      sources."simple-get-3.1.0"
       sources."simple-sha1-2.1.2"
       sources."siphash24-1.1.1"
       sources."slice-ansi-1.0.0"
@@ -50234,7 +50414,7 @@ in
       sources."throttle-1.0.3"
       sources."thunky-1.0.3"
       sources."timed-out-4.0.1"
-      sources."timeout-refresh-1.0.0"
+      sources."timeout-refresh-1.0.1"
       sources."to-buffer-1.1.1"
       (sources."to-object-path-0.3.0" // {
         dependencies = [
@@ -50491,13 +50671,54 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
+  dockerfile-language-server-nodejs = nodeEnv.buildNodePackage {
+    name = "dockerfile-language-server-nodejs";
+    packageName = "dockerfile-language-server-nodejs";
+    version = "0.0.21";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/dockerfile-language-server-nodejs/-/dockerfile-language-server-nodejs-0.0.21.tgz";
+      sha512 = "lZ7VFAlS4vTm5MvxmwpREcYMARB3RQaGX0OZdcY8oSytsu4i5mMGVa6mi9/pZ9soqcUC08uxEA8EcqIeL3lyAA==";
+    };
+    dependencies = [
+      sources."dockerfile-ast-0.0.16"
+      (sources."dockerfile-language-service-0.0.8" // {
+        dependencies = [
+          (sources."dockerfile-utils-0.0.13" // {
+            dependencies = [
+              sources."vscode-languageserver-types-3.6.0"
+            ];
+          })
+        ];
+      })
+      (sources."dockerfile-utils-0.0.11" // {
+        dependencies = [
+          sources."dockerfile-ast-0.0.12"
+          sources."vscode-languageserver-types-3.6.0"
+        ];
+      })
+      sources."vscode-jsonrpc-4.0.0"
+      sources."vscode-languageserver-5.2.1"
+      sources."vscode-languageserver-protocol-3.14.1"
+      sources."vscode-languageserver-types-3.14.0"
+      sources."vscode-uri-1.0.8"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "A language server for Dockerfiles powered by NodeJS, TypeScript, and VSCode technologies.";
+      homepage = "https://github.com/rcjsuen/dockerfile-language-server-nodejs#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
   elasticdump = nodeEnv.buildNodePackage {
     name = "elasticdump";
     packageName = "elasticdump";
-    version = "6.9.1";
+    version = "6.10.6";
     src = fetchurl {
-      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.9.1.tgz";
-      sha512 = "5nnktnPlrlJIMDlkgWrS64LUdT7VpPo5WgC1o2CMYSV7Bb0lxga6HotsEAMsiddwVT2wJg7tmAZQd6/Lz+N5Hg==";
+      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.10.6.tgz";
+      sha512 = "Zjrmui3KS2Fem8OyVNoN1pWOCvULJP88rl1RdnBA/lkBx7u15G0B7FIlzOwX7sjBuJcqb9G5K9FuJXPU3MEqZg==";
     };
     dependencies = [
       sources."JSONStream-1.3.5"
@@ -50506,7 +50727,7 @@ in
       sources."assert-plus-1.0.0"
       sources."async-2.6.3"
       sources."asynckit-0.4.0"
-      sources."aws-sdk-2.529.0"
+      sources."aws-sdk-2.533.0"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.8.0"
       sources."base64-js-1.3.1"
@@ -50534,7 +50755,7 @@ in
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.3"
       sources."http-signature-1.2.0"
-      sources."ieee754-1.1.8"
+      sources."ieee754-1.1.13"
       sources."inherits-2.0.4"
       sources."ini-1.3.5"
       (sources."ip-address-6.1.0" // {
@@ -50561,7 +50782,7 @@ in
       sources."optimist-0.6.1"
       sources."p-finally-1.0.0"
       sources."p-queue-6.1.1"
-      sources."p-timeout-3.1.0"
+      sources."p-timeout-3.2.0"
       sources."performance-now-2.1.0"
       sources."process-nextick-args-2.0.1"
       sources."psl-1.4.0"
@@ -50678,7 +50899,7 @@ in
       sources."fresh-0.5.2"
       sources."fsevents-2.0.7"
       sources."get-stream-4.1.0"
-      sources."glob-parent-5.0.0"
+      sources."glob-parent-5.1.0"
       sources."has-ansi-2.0.0"
       sources."http-errors-1.7.3"
       sources."http-proxy-1.17.0"
@@ -51085,7 +51306,7 @@ in
       sources."fs.realpath-1.0.0"
       sources."functional-red-black-tree-1.0.1"
       sources."glob-7.1.4"
-      sources."glob-parent-5.0.0"
+      sources."glob-parent-5.1.0"
       sources."globals-11.12.0"
       sources."has-flag-3.0.0"
       sources."iconv-lite-0.4.24"
@@ -51237,7 +51458,7 @@ in
       sources."fs.realpath-1.0.0"
       sources."functional-red-black-tree-1.0.1"
       sources."glob-7.1.4"
-      sources."glob-parent-5.0.0"
+      sources."glob-parent-5.1.0"
       sources."globals-11.12.0"
       sources."has-flag-3.0.0"
       sources."iconv-lite-0.4.24"
@@ -51962,7 +52183,7 @@ in
       sources."preserve-0.2.0"
       (sources."prettyjson-1.2.1" // {
         dependencies = [
-          sources."colors-1.3.3"
+          sources."colors-1.4.0"
           sources."minimist-1.2.0"
         ];
       })
@@ -52606,7 +52827,7 @@ in
           sources."ms-2.1.2"
         ];
       })
-      sources."graphql-14.5.6"
+      sources."graphql-14.5.7"
       (sources."graphql-cli-prepare-1.4.19" // {
         dependencies = [
           sources."chalk-2.3.1"
@@ -52756,7 +52977,7 @@ in
       sources."mimic-fn-1.2.0"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
-      (sources."minipass-2.6.2" // {
+      (sources."minipass-2.8.1" // {
         dependencies = [
           sources."yallist-3.0.3"
         ];
@@ -52924,7 +53145,7 @@ in
       sources."supports-color-5.5.0"
       sources."swap-case-1.1.2"
       sources."sync-exec-0.6.2"
-      (sources."tar-4.4.10" // {
+      (sources."tar-4.4.11" // {
         dependencies = [
           sources."yallist-3.0.3"
         ];
@@ -53298,7 +53519,7 @@ in
       sources."ansi-term-0.0.2"
       sources."ansicolors-0.2.1"
       sources."blessed-0.1.81"
-      sources."blessed-contrib-4.8.16"
+      sources."blessed-contrib-4.8.17"
       sources."bresenham-0.0.3"
       sources."buffers-0.1.1"
       sources."cardinal-1.0.0"
@@ -53335,7 +53556,7 @@ in
       sources."lodash.assign-4.2.0"
       sources."lodash.toarray-4.4.0"
       sources."map-canvas-0.1.5"
-      sources."marked-0.6.3"
+      sources."marked-0.7.0"
       sources."marked-terminal-1.7.0"
       sources."memory-streams-0.1.3"
       sources."memorystream-0.3.1"
@@ -53781,7 +54002,7 @@ in
       sources."to-regex-3.0.2"
       sources."to-regex-range-2.1.1"
       sources."to-through-2.0.0"
-      sources."type-1.0.3"
+      sources."type-1.2.0"
       sources."typedarray-0.0.6"
       sources."unc-path-regex-0.1.2"
       sources."undertaker-1.2.1"
@@ -54131,7 +54352,7 @@ in
       })
       sources."to-regex-3.0.2"
       sources."to-regex-range-2.1.1"
-      sources."type-1.0.3"
+      sources."type-1.2.0"
       sources."typedarray-0.0.6"
       sources."unc-path-regex-0.1.2"
       sources."union-value-1.0.1"
@@ -54334,10 +54555,10 @@ in
       sources."corser-2.0.1"
       sources."debug-3.2.6"
       sources."ecstatic-3.3.2"
-      sources."eventemitter3-3.1.2"
+      sources."eventemitter3-4.0.0"
       sources."follow-redirects-1.9.0"
       sources."he-1.2.0"
-      sources."http-proxy-1.17.0"
+      sources."http-proxy-1.18.0"
       sources."mime-1.6.0"
       sources."minimist-1.2.0"
       (sources."mkdirp-0.5.1" // {
@@ -54525,26 +54746,26 @@ in
   ionic = nodeEnv.buildNodePackage {
     name = "ionic";
     packageName = "ionic";
-    version = "5.2.8";
+    version = "5.4.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/ionic/-/ionic-5.2.8.tgz";
-      sha512 = "BeUquVJKI5CEqfyt1YlibDyvf/CyiXwg2957/vm6xkxp4At8D9tKJ3Ldb5e74SEgon5u1+mbcGNjDYB/OtTHgQ==";
+      url = "https://registry.npmjs.org/ionic/-/ionic-5.4.1.tgz";
+      sha512 = "z4Zdb1lEZoqx6HsURVgdqGw0INtDeNrbahTZacrqm3cNmjq6X4SOP+dILIeZoURq/V0KcyVcVQnssWRFbVd8TQ==";
     };
     dependencies = [
-      sources."@ionic/cli-framework-2.1.6"
-      sources."@ionic/discover-2.0.5"
-      sources."@ionic/utils-array-1.2.0"
-      sources."@ionic/utils-fs-2.0.6"
-      sources."@ionic/utils-network-1.0.4"
-      sources."@ionic/utils-object-1.0.4"
-      sources."@ionic/utils-process-1.0.4"
-      sources."@ionic/utils-stream-2.0.3"
-      sources."@ionic/utils-subprocess-1.0.7"
-      sources."@ionic/utils-terminal-1.0.4"
+      sources."@ionic/cli-framework-2.1.7"
+      sources."@ionic/discover-2.0.6"
+      sources."@ionic/utils-array-1.2.1"
+      sources."@ionic/utils-fs-2.0.7"
+      sources."@ionic/utils-network-1.0.5"
+      sources."@ionic/utils-object-1.0.5"
+      sources."@ionic/utils-process-1.0.5"
+      sources."@ionic/utils-stream-2.0.4"
+      sources."@ionic/utils-subprocess-1.0.8"
+      sources."@ionic/utils-terminal-1.0.5"
       sources."@types/node-8.10.54"
       sources."agent-base-4.3.0"
-      sources."ansi-escapes-3.2.0"
-      sources."ansi-regex-3.0.0"
+      sources."ansi-escapes-4.2.1"
+      sources."ansi-regex-4.1.0"
       sources."ansi-styles-3.2.1"
       sources."ast-types-0.13.2"
       sources."astral-regex-1.0.0"
@@ -54556,7 +54777,7 @@ in
       sources."chalk-2.4.2"
       sources."chardet-0.7.0"
       sources."chownr-1.1.2"
-      sources."cli-cursor-2.1.0"
+      sources."cli-cursor-3.1.0"
       sources."cli-width-2.2.0"
       sources."co-4.6.0"
       sources."color-convert-1.9.3"
@@ -54566,11 +54787,7 @@ in
       sources."concat-map-0.0.1"
       sources."cookiejar-2.1.2"
       sources."core-util-is-1.0.2"
-      (sources."cross-spawn-6.0.5" // {
-        dependencies = [
-          sources."semver-5.7.1"
-        ];
-      })
+      sources."cross-spawn-7.0.0"
       sources."data-uri-to-buffer-2.0.1"
       sources."debug-4.1.1"
       sources."deep-is-0.1.3"
@@ -54595,11 +54812,17 @@ in
       sources."esprima-3.1.3"
       sources."estraverse-4.3.0"
       sources."esutils-2.0.3"
-      sources."execa-1.0.0"
+      (sources."execa-1.0.0" // {
+        dependencies = [
+          sources."cross-spawn-6.0.5"
+          sources."path-key-2.0.1"
+          sources."semver-5.7.1"
+        ];
+      })
       sources."extend-3.0.2"
       sources."external-editor-3.1.0"
       sources."fast-levenshtein-2.0.6"
-      sources."figures-2.0.0"
+      sources."figures-3.0.0"
       sources."file-uri-to-path-1.0.0"
       sources."form-data-2.5.1"
       sources."formidable-1.2.1"
@@ -54634,15 +54857,7 @@ in
       sources."imurmurhash-0.1.4"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
-      (sources."inquirer-6.5.2" // {
-        dependencies = [
-          (sources."string-width-2.1.1" // {
-            dependencies = [
-              sources."strip-ansi-4.0.0"
-            ];
-          })
-        ];
-      })
+      sources."inquirer-7.0.0"
       sources."ip-1.1.5"
       sources."is-fullwidth-code-point-2.0.0"
       sources."is-promise-2.1.0"
@@ -54673,6 +54888,11 @@ in
       sources."lodash.restparam-3.6.1"
       (sources."log-update-3.3.0" // {
         dependencies = [
+          sources."ansi-escapes-3.2.0"
+          sources."cli-cursor-2.1.0"
+          sources."mimic-fn-1.2.0"
+          sources."onetime-2.0.1"
+          sources."restore-cursor-2.0.0"
           sources."string-width-3.1.0"
           sources."wrap-ansi-5.1.0"
         ];
@@ -54683,10 +54903,10 @@ in
       sources."mime-2.4.4"
       sources."mime-db-1.40.0"
       sources."mime-types-2.1.24"
-      sources."mimic-fn-1.2.0"
+      sources."mimic-fn-2.1.0"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
-      (sources."minipass-2.6.2" // {
+      (sources."minipass-2.8.1" // {
         dependencies = [
           sources."yallist-3.0.3"
         ];
@@ -54698,12 +54918,16 @@ in
         ];
       })
       sources."ms-2.1.2"
-      sources."mute-stream-0.0.7"
+      sources."mute-stream-0.0.8"
       sources."netmask-1.0.6"
       sources."nice-try-1.0.5"
-      sources."npm-run-path-2.0.2"
+      (sources."npm-run-path-2.0.2" // {
+        dependencies = [
+          sources."path-key-2.0.1"
+        ];
+      })
       sources."once-1.4.0"
-      sources."onetime-2.0.1"
+      sources."onetime-5.1.0"
       sources."open-6.4.0"
       sources."optionator-0.8.2"
       sources."os-name-3.1.0"
@@ -54716,7 +54940,7 @@ in
       })
       sources."pac-resolver-3.0.0"
       sources."path-is-absolute-1.0.1"
-      sources."path-key-2.0.1"
+      sources."path-key-3.1.0"
       sources."prelude-ls-1.1.2"
       sources."process-nextick-args-2.0.1"
       (sources."proxy-agent-3.1.0" // {
@@ -54727,10 +54951,10 @@ in
       sources."proxy-from-env-1.0.0"
       sources."pseudomap-1.0.2"
       sources."pump-3.0.0"
-      sources."qs-6.8.0"
+      sources."qs-6.9.0"
       sources."raw-body-2.4.1"
       sources."readable-stream-3.4.0"
-      sources."restore-cursor-2.0.0"
+      sources."restore-cursor-3.1.0"
       sources."rimraf-3.0.0"
       sources."rsvp-3.6.2"
       sources."run-async-2.3.0"
@@ -54769,11 +54993,7 @@ in
         ];
       })
       sources."string_decoder-1.3.0"
-      (sources."strip-ansi-5.2.0" // {
-        dependencies = [
-          sources."ansi-regex-4.1.0"
-        ];
-      })
+      sources."strip-ansi-5.2.0"
       sources."strip-eof-1.0.0"
       sources."superagent-4.1.0"
       (sources."superagent-proxy-2.0.0" // {
@@ -54782,7 +55002,7 @@ in
         ];
       })
       sources."supports-color-5.5.0"
-      (sources."tar-4.4.10" // {
+      (sources."tar-4.4.11" // {
         dependencies = [
           sources."yallist-3.0.3"
         ];
@@ -54795,6 +55015,7 @@ in
       sources."tree-kill-1.2.1"
       sources."tslib-1.10.0"
       sources."type-check-0.3.2"
+      sources."type-fest-0.5.2"
       sources."typedarray-to-buffer-3.1.5"
       sources."universalify-0.1.2"
       sources."unpipe-1.0.0"
@@ -55056,7 +55277,7 @@ in
       })
       sources."debug-3.2.6"
       sources."decode-uri-component-0.2.0"
-      sources."decompress-response-3.3.0"
+      sources."decompress-response-4.2.1"
       sources."deep-extend-0.6.0"
       sources."deep-is-0.1.3"
       sources."deepmerge-2.2.1"
@@ -55229,10 +55450,10 @@ in
       sources."mime-2.4.4"
       sources."mime-db-1.40.0"
       sources."mime-types-2.1.24"
-      sources."mimic-response-1.0.1"
+      sources."mimic-response-2.0.0"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
-      sources."minipass-2.6.2"
+      sources."minipass-2.8.1"
       sources."minizlib-1.2.2"
       sources."mkdirp-0.5.1"
       sources."moment-2.24.0"
@@ -55348,7 +55569,7 @@ in
       sources."sharp-0.22.1"
       sources."signal-exit-3.0.2"
       sources."simple-concat-1.0.0"
-      sources."simple-get-3.0.3"
+      sources."simple-get-3.1.0"
       sources."simple-swizzle-0.2.2"
       (sources."slice-ansi-1.0.0" // {
         dependencies = [
@@ -55392,7 +55613,7 @@ in
       sources."symbol-tree-3.2.4"
       sources."syswide-cas-5.3.0"
       sources."table-layout-0.4.5"
-      sources."tar-4.4.10"
+      sources."tar-4.4.11"
       sources."tar-fs-2.0.0"
       (sources."tar-stream-2.1.0" // {
         dependencies = [
@@ -55721,7 +55942,7 @@ in
       sources."path-loader-1.0.10"
       sources."process-nextick-args-2.0.1"
       sources."punycode-2.1.1"
-      sources."qs-6.8.0"
+      sources."qs-6.9.0"
       sources."readable-stream-2.3.6"
       sources."safe-buffer-5.1.2"
       sources."slash-2.0.0"
@@ -55907,7 +56128,7 @@ in
       sources."ms-2.0.0"
       sources."nanoid-2.1.1"
       sources."negotiator-0.6.2"
-      sources."normalize-url-4.3.0"
+      sources."normalize-url-4.4.1"
       sources."npm-run-path-2.0.2"
       sources."oauth-sign-0.9.0"
       sources."object-assign-4.1.1"
@@ -56084,8 +56305,8 @@ in
       sources."buffer-fill-1.0.0"
       sources."bytes-3.1.0"
       sources."callsite-1.0.0"
-      sources."chokidar-3.1.0"
-      sources."colors-1.3.3"
+      sources."chokidar-3.1.1"
+      sources."colors-1.4.0"
       sources."component-bind-1.0.0"
       sources."component-emitter-1.2.1"
       sources."component-inherit-0.0.3"
@@ -56115,7 +56336,7 @@ in
       sources."engine.io-parser-2.1.3"
       sources."ent-2.2.0"
       sources."escape-html-1.0.3"
-      sources."eventemitter3-3.1.2"
+      sources."eventemitter3-4.0.0"
       sources."extend-3.0.2"
       sources."fill-range-7.0.1"
       sources."finalhandler-1.1.2"
@@ -56130,12 +56351,12 @@ in
       sources."fs.realpath-1.0.0"
       sources."fsevents-2.0.7"
       sources."glob-7.1.4"
-      sources."glob-parent-5.0.0"
+      sources."glob-parent-5.1.0"
       sources."graceful-fs-4.2.2"
       sources."has-binary2-1.0.3"
       sources."has-cors-1.1.0"
       sources."http-errors-1.7.2"
-      sources."http-proxy-1.17.0"
+      sources."http-proxy-1.18.0"
       sources."iconv-lite-0.4.24"
       sources."indexof-0.0.1"
       sources."inflight-1.0.6"
@@ -56372,7 +56593,7 @@ in
       sources."code-point-at-1.1.0"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
-      sources."colors-1.3.3"
+      sources."colors-1.4.0"
       sources."combined-stream-1.0.8"
       sources."concat-map-0.0.1"
       sources."core-util-is-1.0.2"
@@ -56709,7 +56930,7 @@ in
         ];
       })
       sources."@octokit/request-error-1.0.4"
-      sources."@octokit/rest-16.28.9"
+      sources."@octokit/rest-16.30.0"
       sources."@types/events-3.0.0"
       sources."@types/glob-7.1.1"
       sources."@types/minimatch-3.0.3"
@@ -57014,7 +57235,7 @@ in
       sources."git-url-parse-11.1.2"
       sources."gitconfiglocal-1.0.0"
       sources."glob-7.1.4"
-      sources."glob-parent-5.0.0"
+      sources."glob-parent-5.1.0"
       sources."glob-to-regexp-0.3.0"
       (sources."globby-9.2.0" // {
         dependencies = [
@@ -57022,7 +57243,7 @@ in
         ];
       })
       sources."graceful-fs-4.2.2"
-      (sources."handlebars-4.2.0" // {
+      (sources."handlebars-4.2.1" // {
         dependencies = [
           sources."source-map-0.6.1"
         ];
@@ -57163,7 +57384,7 @@ in
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
       sources."minimist-options-3.0.2"
-      sources."minipass-2.6.2"
+      sources."minipass-2.8.1"
       sources."minizlib-1.2.2"
       sources."mississippi-3.0.0"
       (sources."mixin-deep-1.3.2" // {
@@ -57197,7 +57418,7 @@ in
       })
       sources."normalize-url-3.3.0"
       sources."npm-bundled-1.0.6"
-      sources."npm-lifecycle-3.1.3"
+      sources."npm-lifecycle-3.1.4"
       (sources."npm-package-arg-6.1.1" // {
         dependencies = [
           sources."semver-5.7.1"
@@ -57448,7 +57669,7 @@ in
         ];
       })
       sources."supports-color-5.5.0"
-      sources."tar-4.4.10"
+      sources."tar-4.4.11"
       sources."temp-dir-1.0.0"
       sources."temp-write-3.4.0"
       sources."text-extensions-2.0.0"
@@ -57717,7 +57938,7 @@ in
         ];
       })
       sources."collection-visit-1.0.0"
-      sources."colors-1.3.3"
+      sources."colors-1.4.0"
       sources."component-emitter-1.3.0"
       sources."connect-3.7.0"
       sources."copy-descriptor-0.1.1"
@@ -58018,7 +58239,7 @@ in
         ];
       })
       sources."base64-arraybuffer-0.1.5"
-      sources."base64id-1.0.0"
+      sources."base64id-2.0.0"
       sources."bcrypt-pbkdf-1.0.2"
       sources."better-assert-1.0.2"
       sources."binary-extensions-1.13.1"
@@ -58078,19 +58299,22 @@ in
       sources."ee-first-1.1.1"
       sources."emoji-regex-6.1.1"
       sources."encodeurl-1.0.2"
-      (sources."engine.io-3.3.2" // {
+      (sources."engine.io-3.4.0" // {
         dependencies = [
           sources."cookie-0.3.1"
-          sources."debug-3.1.0"
+          sources."debug-4.1.1"
+          sources."ms-2.1.2"
         ];
       })
-      (sources."engine.io-client-3.3.2" // {
+      (sources."engine.io-client-3.4.0" // {
         dependencies = [
           sources."component-emitter-1.2.1"
-          sources."debug-3.1.0"
+          sources."debug-4.1.1"
+          sources."ms-2.1.2"
+          sources."ws-6.1.4"
         ];
       })
-      sources."engine.io-parser-2.1.3"
+      sources."engine.io-parser-2.2.0"
       sources."entities-1.1.2"
       sources."escape-html-1.0.3"
       sources."etag-1.8.1"
@@ -58384,24 +58608,33 @@ in
         ];
       })
       sources."snapdragon-util-3.0.1"
-      (sources."socket.io-2.2.0" // {
+      (sources."socket.io-2.3.0" // {
         dependencies = [
           sources."debug-4.1.1"
           sources."ms-2.1.2"
         ];
       })
       sources."socket.io-adapter-1.1.1"
-      (sources."socket.io-client-2.2.0" // {
+      (sources."socket.io-client-2.3.0" // {
         dependencies = [
           sources."component-emitter-1.2.1"
-          sources."debug-3.1.0"
+          sources."debug-4.1.1"
+          sources."isarray-2.0.1"
+          sources."ms-2.1.2"
+          (sources."socket.io-parser-3.3.0" // {
+            dependencies = [
+              sources."debug-3.1.0"
+              sources."ms-2.0.0"
+            ];
+          })
         ];
       })
-      (sources."socket.io-parser-3.3.0" // {
+      (sources."socket.io-parser-3.4.0" // {
         dependencies = [
           sources."component-emitter-1.2.1"
-          sources."debug-3.1.0"
+          sources."debug-4.1.1"
           sources."isarray-2.0.1"
+          sources."ms-2.1.2"
         ];
       })
       sources."source-map-0.5.7"
@@ -58468,7 +58701,7 @@ in
       sources."uuid-3.3.3"
       sources."vary-1.1.2"
       sources."verror-1.10.0"
-      sources."ws-6.1.4"
+      sources."ws-7.1.2"
       sources."xmlhttprequest-ssl-1.5.5"
       sources."yeast-0.1.2"
     ];
@@ -58949,7 +59182,7 @@ in
       })
       sources."duplexer3-0.1.4"
       sources."duplexify-3.7.1"
-      sources."electron-to-chromium-1.3.260"
+      sources."electron-to-chromium-1.3.264"
       sources."elliptic-6.5.1"
       sources."emoji-regex-7.0.3"
       sources."emojis-list-2.1.0"
@@ -59140,7 +59373,7 @@ in
           })
           sources."get-stream-4.1.0"
           sources."http-cache-semantics-4.0.3"
-          sources."normalize-url-4.3.0"
+          sources."normalize-url-4.4.1"
           sources."p-cancelable-1.1.0"
         ];
       })
@@ -59386,7 +59619,7 @@ in
       sources."pako-1.0.10"
       sources."parallel-transform-1.2.0"
       sources."paredit.js-0.3.4"
-      sources."parse-asn1-5.1.4"
+      sources."parse-asn1-5.1.5"
       sources."parse-glob-3.0.4"
       sources."parse-json-2.2.0"
       sources."parse-passwd-1.0.0"
@@ -59777,7 +60010,7 @@ in
           sources."ms-2.0.0"
         ];
       })
-      (sources."webpack-cli-3.3.8" // {
+      (sources."webpack-cli-3.3.9" // {
         dependencies = [
           sources."supports-color-6.1.0"
         ];
@@ -60662,7 +60895,7 @@ in
       sources."tough-cookie-2.3.4"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
-      sources."type-1.0.3"
+      sources."type-1.2.0"
       sources."typescript-3.5.3"
       (sources."uglify-js-3.4.9" // {
         dependencies = [
@@ -60918,7 +61151,7 @@ in
       sources."path-loader-1.0.10"
       sources."process-nextick-args-2.0.1"
       sources."punycode-2.1.1"
-      sources."qs-6.8.0"
+      sources."qs-6.9.0"
       sources."readable-stream-2.3.6"
       sources."safe-buffer-5.1.2"
       sources."slash-2.0.0"
@@ -61062,7 +61295,7 @@ in
       sources."mime-types-2.1.24"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
-      sources."minipass-2.6.2"
+      sources."minipass-2.8.1"
       sources."minizlib-1.2.2"
       sources."mkdirp-0.5.1"
       sources."nopt-3.0.6"
@@ -61089,7 +61322,7 @@ in
       sources."string-width-1.0.2"
       sources."string_decoder-1.1.1"
       sources."strip-ansi-3.0.1"
-      sources."tar-4.4.10"
+      sources."tar-4.4.11"
       (sources."tough-cookie-2.4.3" // {
         dependencies = [
           sources."punycode-1.4.1"
@@ -61162,7 +61395,7 @@ in
       sources."base64-js-0.0.8"
       sources."bcrypt-pbkdf-1.0.2"
       sources."biased-opener-0.2.8"
-      sources."big-integer-1.6.44"
+      sources."big-integer-1.6.45"
       sources."block-stream-0.0.9"
       sources."body-parser-1.19.0"
       sources."boom-2.10.1"
@@ -61471,7 +61704,7 @@ in
       sources."isarray-1.0.0"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
-      sources."minipass-2.6.2"
+      sources."minipass-2.8.1"
       sources."minizlib-1.2.2"
       sources."mkdirp-0.5.1"
       sources."ms-2.1.2"
@@ -61505,7 +61738,7 @@ in
       sources."string_decoder-1.1.1"
       sources."strip-ansi-3.0.1"
       sources."strip-json-comments-2.0.1"
-      sources."tar-4.4.10"
+      sources."tar-4.4.11"
       sources."util-deprecate-1.0.2"
       sources."wide-align-1.1.3"
       sources."wrappy-1.0.2"
@@ -61809,7 +62042,7 @@ in
       sources."mime-types-2.1.24"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
-      (sources."minipass-2.6.2" // {
+      (sources."minipass-2.8.1" // {
         dependencies = [
           sources."yallist-3.0.3"
         ];
@@ -61950,7 +62183,7 @@ in
       sources."strip-ansi-3.0.1"
       sources."strip-json-comments-2.0.1"
       sources."tail-2.0.3"
-      (sources."tar-4.4.10" // {
+      (sources."tar-4.4.11" // {
         dependencies = [
           sources."yallist-3.0.3"
         ];
@@ -61973,7 +62206,7 @@ in
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."twitter-ng-0.6.2"
-      sources."type-1.0.3"
+      sources."type-1.2.0"
       sources."type-is-1.6.18"
       sources."typedarray-0.0.6"
       sources."uc.micro-1.0.6"
@@ -62108,7 +62341,7 @@ in
       sources."mime-types-2.1.24"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
-      sources."minipass-2.6.2"
+      sources."minipass-2.8.1"
       sources."minizlib-1.2.2"
       sources."mkdirp-0.5.1"
       sources."ncp-0.4.2"
@@ -62181,7 +62414,7 @@ in
         ];
       })
       sources."strip-ansi-3.0.1"
-      sources."tar-4.4.10"
+      sources."tar-4.4.11"
       sources."temp-0.9.0"
       (sources."tough-cookie-2.4.3" // {
         dependencies = [
@@ -62740,7 +62973,7 @@ in
       sources."mimic-response-1.0.1"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
-      sources."minipass-2.6.2"
+      sources."minipass-2.8.1"
       sources."minizlib-1.2.2"
       sources."mississippi-3.0.0"
       sources."mkdirp-0.5.1"
@@ -62760,7 +62993,7 @@ in
           sources."semver-5.7.1"
         ];
       })
-      sources."normalize-url-4.3.0"
+      sources."normalize-url-4.4.1"
       sources."npm-bundled-1.0.6"
       (sources."npm-package-arg-6.1.1" // {
         dependencies = [
@@ -62886,7 +63119,7 @@ in
       sources."strip-eof-1.0.0"
       sources."strip-json-comments-2.0.1"
       sources."supports-color-5.5.0"
-      sources."tar-4.4.10"
+      sources."tar-4.4.11"
       sources."term-size-1.2.0"
       sources."through-2.3.8"
       sources."through2-2.0.5"
@@ -63528,7 +63761,7 @@ in
       sources."ecc-jsbn-0.1.2"
       sources."editorconfig-0.15.3"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.3.260"
+      sources."electron-to-chromium-1.3.264"
       sources."elliptic-6.5.1"
       sources."encodeurl-1.0.2"
       sources."entities-1.1.2"
@@ -63798,7 +64031,7 @@ in
       sources."os-tmpdir-1.0.2"
       sources."osenv-0.1.5"
       sources."pako-0.2.9"
-      sources."parse-asn1-5.1.4"
+      sources."parse-asn1-5.1.5"
       sources."parse-json-4.0.0"
       sources."parse5-5.1.0"
       sources."parseurl-1.3.3"
@@ -64146,7 +64379,7 @@ in
       sources."balanced-match-1.0.0"
       sources."base64-js-0.0.8"
       sources."bencode-2.0.1"
-      sources."big-integer-1.6.44"
+      sources."big-integer-1.6.45"
       sources."bitfield-0.1.0"
       (sources."bittorrent-dht-6.4.2" // {
         dependencies = [
@@ -64466,7 +64699,7 @@ in
       sources."balanced-match-1.0.0"
       sources."base64-arraybuffer-0.1.5"
       sources."base64-js-1.3.1"
-      sources."base64id-1.0.0"
+      sources."base64id-2.0.0"
       sources."basic-auth-2.0.1"
       sources."bcrypt-pbkdf-1.0.2"
       sources."bencode-0.7.0"
@@ -64535,18 +64768,21 @@ in
       sources."ee-first-1.1.1"
       sources."encodeurl-1.0.2"
       sources."end-of-stream-1.4.1"
-      (sources."engine.io-3.3.2" // {
+      (sources."engine.io-3.4.0" // {
         dependencies = [
           sources."cookie-0.3.1"
-          sources."debug-3.1.0"
+          sources."debug-4.1.1"
+          sources."ms-2.1.2"
         ];
       })
-      (sources."engine.io-client-3.3.2" // {
+      (sources."engine.io-client-3.4.0" // {
         dependencies = [
-          sources."debug-3.1.0"
+          sources."debug-4.1.1"
+          sources."ms-2.1.2"
+          sources."ws-6.1.4"
         ];
       })
-      sources."engine.io-parser-2.1.3"
+      sources."engine.io-parser-2.2.0"
       sources."escape-html-1.0.3"
       sources."etag-1.8.1"
       sources."express-4.17.1"
@@ -64719,22 +64955,31 @@ in
           sources."ws-2.3.1"
         ];
       })
-      (sources."socket.io-2.2.0" // {
+      (sources."socket.io-2.3.0" // {
         dependencies = [
           sources."debug-4.1.1"
           sources."ms-2.1.2"
         ];
       })
       sources."socket.io-adapter-1.1.1"
-      (sources."socket.io-client-2.2.0" // {
+      (sources."socket.io-client-2.3.0" // {
         dependencies = [
-          sources."debug-3.1.0"
+          sources."debug-4.1.1"
+          sources."isarray-2.0.1"
+          sources."ms-2.1.2"
+          (sources."socket.io-parser-3.3.0" // {
+            dependencies = [
+              sources."debug-3.1.0"
+              sources."ms-2.0.0"
+            ];
+          })
         ];
       })
-      (sources."socket.io-parser-3.3.0" // {
+      (sources."socket.io-parser-3.4.0" // {
         dependencies = [
-          sources."debug-3.1.0"
+          sources."debug-4.1.1"
           sources."isarray-2.0.1"
+          sources."ms-2.1.2"
         ];
       })
       sources."speedometer-0.1.4"
@@ -64777,7 +65022,7 @@ in
       sources."verror-1.10.0"
       sources."which-1.3.1"
       sources."wrappy-1.0.2"
-      sources."ws-6.1.4"
+      sources."ws-7.1.2"
       sources."xmlhttprequest-ssl-1.5.5"
       sources."xtend-4.0.2"
       sources."yeast-0.1.2"
@@ -64886,7 +65131,7 @@ in
       sources."builtin-status-codes-3.0.0"
       sources."cached-path-relative-1.0.2"
       sources."cipher-base-1.0.4"
-      sources."colors-1.3.3"
+      sources."colors-1.4.0"
       sources."combine-source-map-0.8.0"
       sources."concat-map-0.0.1"
       (sources."concat-stream-2.0.0" // {
@@ -64980,7 +65225,7 @@ in
       sources."os-browserify-0.3.0"
       sources."pako-1.0.10"
       sources."parents-1.0.1"
-      sources."parse-asn1-5.1.4"
+      sources."parse-asn1-5.1.5"
       sources."path-browserify-0.0.1"
       sources."path-is-absolute-1.0.1"
       sources."path-parse-1.0.6"
@@ -65483,13 +65728,13 @@ in
   serverless = nodeEnv.buildNodePackage {
     name = "serverless";
     packageName = "serverless";
-    version = "1.52.0";
+    version = "1.52.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/serverless/-/serverless-1.52.0.tgz";
-      sha512 = "No+hosiPng/0MKfFMNj6lfLmNmn5vzLduss55YkefQNKZ9oJEBeZqBDrUEZC9reTHUpilCx0ESiLqkMoPBst2g==";
+      url = "https://registry.npmjs.org/serverless/-/serverless-1.52.2.tgz";
+      sha512 = "JLRh52heei1kiTg/mdXdVeJXlB26nXI6uK3/jQvG2a16WwrXD+h033azkD9qqk7WgISLgDKPJbvlnsCAXLcX5Q==";
     };
     dependencies = [
-      sources."@serverless/cli-1.2.1"
+      sources."@serverless/cli-1.2.3"
       (sources."@serverless/component-metrics-1.0.8" // {
         dependencies = [
           sources."node-fetch-2.6.0"
@@ -65501,7 +65746,7 @@ in
           sources."semver-6.3.0"
         ];
       })
-      (sources."@serverless/enterprise-plugin-2.0.0" // {
+      (sources."@serverless/enterprise-plugin-3.0.0" // {
         dependencies = [
           sources."fs-extra-7.0.1"
           sources."node-fetch-2.6.0"
@@ -65549,10 +65794,9 @@ in
       sources."async-1.5.2"
       sources."asynckit-0.4.0"
       sources."atob-2.1.2"
-      (sources."aws-sdk-2.529.0" // {
+      (sources."aws-sdk-2.533.0" // {
         dependencies = [
           sources."buffer-4.9.1"
-          sources."ieee754-1.1.8"
           sources."uuid-3.3.2"
         ];
       })
@@ -65591,7 +65835,7 @@ in
       sources."caw-2.0.1"
       sources."chalk-2.4.2"
       sources."chardet-0.7.0"
-      sources."chokidar-3.1.0"
+      sources."chokidar-3.1.1"
       sources."ci-info-1.6.0"
       (sources."class-utils-0.3.6" // {
         dependencies = [
@@ -65753,11 +65997,11 @@ in
       sources."get-stream-4.1.0"
       sources."get-value-2.0.6"
       sources."glob-7.1.4"
-      sources."glob-parent-5.0.0"
+      sources."glob-parent-5.1.0"
       sources."global-dirs-0.1.1"
       sources."globby-6.1.0"
       sources."got-9.6.0"
-      sources."graceful-fs-4.2.2"
+      sources."graceful-fs-4.2.1"
       sources."graceful-readlink-1.0.1"
       sources."graphlib-2.1.7"
       (sources."has-ansi-2.0.0" // {
@@ -65829,7 +66073,7 @@ in
       sources."is-retry-allowed-1.2.0"
       sources."is-stream-1.1.0"
       sources."is-windows-1.0.2"
-      sources."is-wsl-2.1.0"
+      sources."is-wsl-2.1.1"
       sources."isarray-1.0.0"
       sources."isexe-2.0.0"
       sources."iso8601-duration-1.2.0"
@@ -65908,7 +66152,7 @@ in
       sources."node-dir-0.1.17"
       sources."node-fetch-1.7.3"
       sources."normalize-path-3.0.0"
-      sources."normalize-url-4.3.0"
+      sources."normalize-url-4.4.1"
       (sources."npm-conf-1.1.3" // {
         dependencies = [
           sources."pify-3.0.0"
@@ -66155,7 +66399,7 @@ in
       sources."trim-repeated-1.0.0"
       sources."tslib-1.10.0"
       sources."tunnel-agent-0.6.0"
-      sources."type-1.0.3"
+      sources."type-1.2.0"
       sources."type-fest-0.5.2"
       sources."type-is-1.6.18"
       sources."typedarray-0.0.6"
@@ -66843,10 +67087,10 @@ in
   snyk = nodeEnv.buildNodePackage {
     name = "snyk";
     packageName = "snyk";
-    version = "1.227.0";
+    version = "1.228.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/snyk/-/snyk-1.227.0.tgz";
-      sha512 = "ejfq2FIca+b/zu4hkJwFUob1Emn+s9wXYw5VHJSS6BjiniNi6dIa24AARG3BWiVsN/3NvzCYAkcqhYGaJ6xyVw==";
+      url = "https://registry.npmjs.org/snyk/-/snyk-1.228.3.tgz";
+      sha512 = "TwyJcMXBvic1xJ+rVLdIYS1xDYuzcogIXdmyvGvXBZgwIQdjOVMnZBVxUo5igkOIntBL2sCynZiydQtGbe08JA==";
     };
     dependencies = [
       sources."@snyk/cli-interface-2.1.0"
@@ -67153,7 +67397,7 @@ in
           sources."debug-4.1.1"
         ];
       })
-      (sources."snyk-gradle-plugin-3.0.2" // {
+      (sources."snyk-gradle-plugin-3.1.0" // {
         dependencies = [
           sources."debug-4.1.1"
         ];
@@ -67286,10 +67530,10 @@ in
   "socket.io" = nodeEnv.buildNodePackage {
     name = "socket.io";
     packageName = "socket.io";
-    version = "2.2.0";
+    version = "2.3.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/socket.io/-/socket.io-2.2.0.tgz";
-      sha512 = "wxXrIuZ8AILcn+f1B4ez4hJTPG24iNgxBBDaJfT6MsyOhVYiTXWexGoPkd87ktJG8kQEcL/NBvRi64+9k4Kc0w==";
+      url = "https://registry.npmjs.org/socket.io/-/socket.io-2.3.0.tgz";
+      sha512 = "2A892lrj0GcgR/9Qk81EaY2gYhCBxurV0PfmmESO6p27QPrUK1J3zdns+5QPqvUYK2q657nSj0guoIil9+7eFg==";
     };
     dependencies = [
       sources."accepts-1.3.7"
@@ -67298,7 +67542,7 @@ in
       sources."async-limiter-1.0.1"
       sources."backo2-1.0.2"
       sources."base64-arraybuffer-0.1.5"
-      sources."base64id-1.0.0"
+      sources."base64id-2.0.0"
       sources."better-assert-1.0.2"
       sources."blob-0.0.5"
       sources."callsite-1.0.0"
@@ -67307,19 +67551,13 @@ in
       sources."component-inherit-0.0.3"
       sources."cookie-0.3.1"
       sources."debug-4.1.1"
-      (sources."engine.io-3.3.2" // {
+      sources."engine.io-3.4.0"
+      (sources."engine.io-client-3.4.0" // {
         dependencies = [
-          sources."debug-3.1.0"
-          sources."ms-2.0.0"
-        ];
-      })
-      (sources."engine.io-client-3.3.2" // {
-        dependencies = [
-          sources."debug-3.1.0"
-          sources."ms-2.0.0"
+          sources."ws-6.1.4"
         ];
       })
-      sources."engine.io-parser-2.1.3"
+      sources."engine.io-parser-2.2.0"
       sources."has-binary2-1.0.3"
       sources."has-cors-1.1.0"
       sources."indexof-0.0.1"
@@ -67332,20 +67570,19 @@ in
       sources."parseqs-0.0.5"
       sources."parseuri-0.0.5"
       sources."socket.io-adapter-1.1.1"
-      (sources."socket.io-client-2.2.0" // {
+      (sources."socket.io-client-2.3.0" // {
         dependencies = [
-          sources."debug-3.1.0"
-          sources."ms-2.0.0"
-        ];
-      })
-      (sources."socket.io-parser-3.3.0" // {
-        dependencies = [
-          sources."debug-3.1.0"
           sources."ms-2.0.0"
+          (sources."socket.io-parser-3.3.0" // {
+            dependencies = [
+              sources."debug-3.1.0"
+            ];
+          })
         ];
       })
+      sources."socket.io-parser-3.4.0"
       sources."to-array-0.1.4"
-      sources."ws-6.1.4"
+      sources."ws-7.1.2"
       sources."xmlhttprequest-ssl-1.5.5"
       sources."yeast-0.1.2"
     ];
@@ -67668,7 +67905,7 @@ in
       sources."decode-uri-component-0.2.0"
       sources."deep-equal-1.1.0"
       sources."deep-extend-0.6.0"
-      (sources."deferred-leveldown-5.2.0" // {
+      (sources."deferred-leveldown-5.2.1" // {
         dependencies = [
           sources."abstract-leveldown-6.1.1"
         ];
@@ -67865,7 +68102,7 @@ in
           sources."string_decoder-0.10.31"
         ];
       })
-      (sources."leveldown-5.2.0" // {
+      (sources."leveldown-5.2.1" // {
         dependencies = [
           sources."abstract-leveldown-6.1.1"
         ];
@@ -68429,7 +68666,7 @@ in
       sources."async-1.5.2"
       sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
-      (sources."aws-sdk-2.529.0" // {
+      (sources."aws-sdk-2.533.0" // {
         dependencies = [
           sources."uuid-3.3.2"
         ];
@@ -68449,7 +68686,7 @@ in
       sources."balanced-match-1.0.0"
       sources."base64-arraybuffer-0.1.5"
       sources."base64-js-1.3.1"
-      sources."base64id-1.0.0"
+      sources."base64id-2.0.0"
       sources."base64url-3.0.1"
       sources."basic-auth-1.1.0"
       sources."bcrypt-pbkdf-1.0.2"
@@ -68553,19 +68790,21 @@ in
       sources."ejs-0.8.8"
       sources."encodeurl-1.0.2"
       sources."end-of-stream-1.4.1"
-      (sources."engine.io-3.3.2" // {
+      (sources."engine.io-3.4.0" // {
         dependencies = [
-          sources."debug-3.1.0"
-          sources."ws-6.1.4"
+          sources."debug-4.1.1"
+          sources."ms-2.1.2"
+          sources."ws-7.1.2"
         ];
       })
-      (sources."engine.io-client-3.3.2" // {
+      (sources."engine.io-client-3.4.0" // {
         dependencies = [
-          sources."debug-3.1.0"
+          sources."debug-4.1.1"
+          sources."ms-2.1.2"
           sources."ws-6.1.4"
         ];
       })
-      sources."engine.io-parser-2.1.3"
+      sources."engine.io-parser-2.2.0"
       sources."error-ex-1.3.2"
       sources."escape-html-1.0.3"
       sources."escape-string-regexp-1.0.5"
@@ -68655,15 +68894,15 @@ in
           sources."inherits-2.0.3"
         ];
       })
-      (sources."http-proxy-1.17.0" // {
+      (sources."http-proxy-1.18.0" // {
         dependencies = [
-          sources."eventemitter3-3.1.2"
+          sources."eventemitter3-4.0.0"
         ];
       })
       sources."http-signature-1.1.1"
       sources."https-proxy-agent-1.0.0"
       sources."iconv-lite-0.4.24"
-      sources."ieee754-1.1.8"
+      sources."ieee754-1.1.13"
       sources."in-publish-2.0.0"
       sources."indexof-0.0.1"
       sources."inflight-1.0.6"
@@ -68952,22 +69191,31 @@ in
       sources."signal-exit-3.0.2"
       sources."slash-1.0.0"
       sources."sntp-1.0.9"
-      (sources."socket.io-2.2.0" // {
+      (sources."socket.io-2.3.0" // {
         dependencies = [
           sources."debug-4.1.1"
           sources."ms-2.1.2"
         ];
       })
       sources."socket.io-adapter-1.1.1"
-      (sources."socket.io-client-2.2.0" // {
+      (sources."socket.io-client-2.3.0" // {
         dependencies = [
-          sources."debug-3.1.0"
+          sources."debug-4.1.1"
+          sources."isarray-2.0.1"
+          sources."ms-2.1.2"
+          (sources."socket.io-parser-3.3.0" // {
+            dependencies = [
+              sources."debug-3.1.0"
+              sources."ms-2.0.0"
+            ];
+          })
         ];
       })
-      (sources."socket.io-parser-3.3.0" // {
+      (sources."socket.io-parser-3.4.0" // {
         dependencies = [
-          sources."debug-3.1.0"
+          sources."debug-4.1.1"
           sources."isarray-2.0.1"
+          sources."ms-2.1.2"
         ];
       })
       sources."source-map-0.6.1"
@@ -69012,7 +69260,7 @@ in
           sources."debug-3.2.6"
           sources."form-data-2.5.1"
           sources."ms-2.1.2"
-          sources."qs-6.8.0"
+          sources."qs-6.9.0"
           sources."readable-stream-2.3.6"
           sources."string_decoder-1.1.1"
         ];
@@ -69025,7 +69273,7 @@ in
           sources."esprima-4.0.1"
           sources."js-yaml-3.13.1"
           sources."lodash-3.10.1"
-          sources."qs-6.8.0"
+          sources."qs-6.9.0"
         ];
       })
       sources."swagger-schema-official-2.0.0-bab6bed"
@@ -69474,7 +69722,7 @@ in
         ];
       })
       sources."growl-1.9.2"
-      (sources."handlebars-4.2.0" // {
+      (sources."handlebars-4.2.1" // {
         dependencies = [
           sources."source-map-0.6.1"
         ];
@@ -69657,7 +69905,7 @@ in
         dependencies = [
           sources."debug-3.2.6"
           sources."ms-2.1.2"
-          sources."qs-6.8.0"
+          sources."qs-6.9.0"
           sources."superagent-3.8.3"
         ];
       })
@@ -71236,7 +71484,7 @@ in
       sources."minimalistic-assert-1.0.1"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
-      sources."minipass-2.6.2"
+      sources."minipass-2.8.1"
       sources."minizlib-1.2.2"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
@@ -71259,7 +71507,7 @@ in
         ];
       })
       sources."nopt-4.0.1"
-      sources."normalize-url-4.3.0"
+      sources."normalize-url-4.4.1"
       sources."npm-bundled-1.0.6"
       sources."npm-packlist-1.4.4"
       sources."npmlog-4.1.2"
@@ -71353,7 +71601,7 @@ in
       sources."strip-json-comments-2.0.1"
       sources."strip-outer-1.0.1"
       sources."supports-color-5.5.0"
-      sources."tar-4.4.10"
+      sources."tar-4.4.11"
       sources."thelounge-ldapjs-non-maintained-fork-1.0.4"
       sources."tlds-1.203.1"
       sources."to-array-0.1.4"
@@ -71781,7 +72029,7 @@ in
       sources."ansi-regex-2.1.1"
       sources."ansi-styles-2.2.1"
       sources."chalk-1.1.3"
-      sources."colors-1.3.3"
+      sources."colors-1.4.0"
       sources."diff-2.2.3"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
@@ -72524,7 +72772,7 @@ in
       sources."graceful-fs-4.2.2"
       sources."graceful-readlink-1.0.1"
       sources."gray-matter-2.1.1"
-      sources."handlebars-4.2.0"
+      sources."handlebars-4.2.1"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.3"
       (sources."has-ansi-2.0.0" // {
@@ -73820,7 +74068,7 @@ in
         dependencies = [
           sources."get-stream-5.1.0"
           sources."lowercase-keys-2.0.0"
-          sources."normalize-url-4.3.0"
+          sources."normalize-url-4.4.1"
         ];
       })
       (sources."caller-path-0.1.0" // {
@@ -74694,7 +74942,7 @@ in
         ];
       })
       sources."snapdragon-util-3.0.1"
-      (sources."snyk-1.227.0" // {
+      (sources."snyk-1.228.3" // {
         dependencies = [
           sources."ansi-regex-4.1.0"
           sources."debug-3.2.6"
@@ -74723,7 +74971,7 @@ in
           sources."tmp-0.0.33"
         ];
       })
-      (sources."snyk-gradle-plugin-3.0.2" // {
+      (sources."snyk-gradle-plugin-3.1.0" // {
         dependencies = [
           sources."debug-4.1.1"
           sources."ms-2.1.2"
@@ -74903,7 +75151,7 @@ in
       sources."tslib-1.10.0"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
-      sources."type-1.0.3"
+      sources."type-1.2.0"
       sources."type-check-0.3.2"
       sources."type-fest-0.3.1"
       sources."typedarray-0.0.6"
@@ -75321,7 +75569,7 @@ in
       sources."p-try-2.2.0"
       sources."pako-1.0.10"
       sources."parallel-transform-1.2.0"
-      sources."parse-asn1-5.1.4"
+      sources."parse-asn1-5.1.5"
       sources."pascalcase-0.1.1"
       sources."path-browserify-0.0.1"
       sources."path-dirname-1.0.2"
@@ -75509,10 +75757,10 @@ in
   webpack-cli = nodeEnv.buildNodePackage {
     name = "webpack-cli";
     packageName = "webpack-cli";
-    version = "3.3.8";
+    version = "3.3.9";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.8.tgz";
-      sha512 = "RANYSXwikSWINjHMd/mtesblNSpjpDLoYTBtP99n1RhXqVI/wxN40Auqy42I7y4xrbmRBoA5Zy5E0JSBD5XRhw==";
+      url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.9.tgz";
+      sha512 = "xwnSxWl8nZtBl/AFJCOn9pG7s5CYUYdZxmmukv+fAHLcBIHM36dImfpQg3WfShZXeArkWlf6QRw24Klcsv8a5A==";
     };
     dependencies = [
       sources."ansi-regex-4.1.0"
@@ -75879,8 +76127,10 @@ in
       (sources."bittorrent-tracker-9.14.4" // {
         dependencies = [
           sources."debug-4.1.1"
+          sources."decompress-response-4.2.1"
+          sources."mimic-response-2.0.0"
           sources."ms-2.1.2"
-          sources."simple-get-3.0.3"
+          sources."simple-get-3.1.0"
         ];
       })
       sources."blob-to-buffer-1.2.8"
@@ -75981,7 +76231,9 @@ in
       sources."last-one-wins-1.0.4"
       (sources."load-ip-set-2.1.0" // {
         dependencies = [
-          sources."simple-get-3.0.3"
+          sources."decompress-response-4.2.1"
+          sources."mimic-response-2.0.0"
+          sources."simple-get-3.1.0"
         ];
       })
       sources."long-4.0.0"
@@ -76026,7 +76278,9 @@ in
       sources."parse-numeric-range-0.0.2"
       (sources."parse-torrent-7.0.1" // {
         dependencies = [
-          sources."simple-get-3.0.3"
+          sources."decompress-response-4.2.1"
+          sources."mimic-response-2.0.0"
+          sources."simple-get-3.1.0"
         ];
       })
       sources."path-is-absolute-1.0.1"
@@ -76067,7 +76321,7 @@ in
       sources."semver-5.1.1"
       sources."simple-concat-1.0.0"
       sources."simple-get-2.8.1"
-      (sources."simple-peer-9.5.0" // {
+      (sources."simple-peer-9.6.0" // {
         dependencies = [
           sources."debug-4.1.1"
           sources."ms-2.1.2"
@@ -76123,8 +76377,10 @@ in
       (sources."webtorrent-0.107.16" // {
         dependencies = [
           sources."debug-4.1.1"
+          sources."decompress-response-4.2.1"
+          sources."mimic-response-2.0.0"
           sources."ms-2.1.2"
-          sources."simple-get-3.0.3"
+          sources."simple-get-3.1.0"
         ];
       })
       sources."winreg-1.2.4"
@@ -76431,7 +76687,7 @@ in
         ];
       })
       sources."glob-to-regexp-0.3.0"
-      (sources."global-agent-2.1.0" // {
+      (sources."global-agent-2.1.1" // {
         dependencies = [
           sources."semver-6.3.0"
         ];
diff --git a/pkgs/development/node-packages/node-packages-v12.nix b/pkgs/development/node-packages/node-packages-v12.nix
index 63b388f88eb..dcc1c73c0fc 100644
--- a/pkgs/development/node-packages/node-packages-v12.nix
+++ b/pkgs/development/node-packages/node-packages-v12.nix
@@ -1255,13 +1255,13 @@ let
         sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
       };
     };
-    "minipass-2.6.2" = {
+    "minipass-2.8.1" = {
       name = "minipass";
       packageName = "minipass";
-      version = "2.6.2";
+      version = "2.8.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minipass/-/minipass-2.6.2.tgz";
-        sha512 = "38Jwdc8AttUDaQAIRX8Iaw3QoCDWjAwKMGeGDF9JUi9QCPMjH5qAQg/hdO8o1nC7Nmh1/CqzMg5FQPEKuKwznQ==";
+        url = "https://registry.npmjs.org/minipass/-/minipass-2.8.1.tgz";
+        sha512 = "QCG523ParRcE2+9A6wYh9UI3uy2FFLw4DQaVYQrY5HPfszc5M6VDD+j0QCwHm19LI2imes4RB+NBD8cOJccyCg==";
       };
     };
     "minizlib-1.2.2" = {
@@ -2038,13 +2038,13 @@ let
         sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf";
       };
     };
-    "tar-4.4.10" = {
+    "tar-4.4.11" = {
       name = "tar";
       packageName = "tar";
-      version = "4.4.10";
+      version = "4.4.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tar/-/tar-4.4.10.tgz";
-        sha512 = "g2SVs5QIxvo6OLp0GudTqEf05maawKUxXru104iaayWA09551tFCTI8f1Asb4lPfkBr91k07iL4c11XO3/b0tA==";
+        url = "https://registry.npmjs.org/tar/-/tar-4.4.11.tgz";
+        sha512 = "iI4zh3ktLJKaDNZKZc+fUONiQrSn9HkCFzamtb7k8FFmVilHVob7QsLX/VySAW8lAviMzMbFw4QtFb4errwgYA==";
       };
     };
     "temp-0.9.0" = {
@@ -2675,7 +2675,7 @@ in
       sources."mime-types-2.1.24"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
-      sources."minipass-2.6.2"
+      sources."minipass-2.8.1"
       sources."minizlib-1.2.2"
       sources."mkdirp-0.5.1"
       sources."ncp-0.4.2"
@@ -2748,7 +2748,7 @@ in
         ];
       })
       sources."strip-ansi-3.0.1"
-      sources."tar-4.4.10"
+      sources."tar-4.4.11"
       sources."temp-0.9.0"
       (sources."tough-cookie-2.4.3" // {
         dependencies = [
-- 
GitLab


From 308617eb7e3e7d68891c877ceaf30dae9184377a Mon Sep 17 00:00:00 2001
From: Claudio Bley <cbley@exa-online.de>
Date: Mon, 23 Sep 2019 08:54:08 +0200
Subject: [PATCH 0793/2254] mucommander: 0.9.2 -> 0.9.3-3

Mucommander 0.9.3-3 was released in January 2019.

* comment out `proguard.enabled = ...` in build.gradle
* use Gradle 4.10 (upstream uses 4.8)
* fix version in build.gradle
---
 pkgs/applications/misc/mucommander/default.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/misc/mucommander/default.nix b/pkgs/applications/misc/mucommander/default.nix
index d6153d2268b..12a0720e447 100644
--- a/pkgs/applications/misc/mucommander/default.nix
+++ b/pkgs/applications/misc/mucommander/default.nix
@@ -1,21 +1,23 @@
-{ stdenv, fetchFromGitHub, gradle_3_5, perl, makeWrapper, jre, gsettings-desktop-schemas }:
+{ stdenv, fetchFromGitHub, gradle_4_10, perl, makeWrapper, jre, gsettings-desktop-schemas }:
 
 let
-  version = "0.9.2";
+  version = "0.9.3-3";
   name = "mucommander-${version}";
 
   src = fetchFromGitHub {
     owner = "mucommander";
     repo = "mucommander";
     rev = version;
-    sha256 = "1fvij0yjjz56hsyddznx7mdgq1zm25fkng3axl03iyrij976z7b8";
+    sha256 = "1zhglsx3b5k6np3ppfkkrqz9wg0j7ip598xxfgn75gjl020w0can";
   };
 
   postPatch = ''
     # there is no .git anyway
     substituteInPlace build.gradle \
       --replace "git = org.ajoberstar.grgit.Grgit.open(file('.'))"  "" \
-      --replace "revision = git.head().id"                          "revision = 'abcdefgh'"
+      --replace "revision = git.head().id"                          "revision = 'abcdefgh'" \
+      --replace "proguard.enabled =" "// proguard.enabled =" \
+      --replace "version = '0.9.4'" "version = '${version}'"
 
     # disable gradle plugins with native code and their targets
     perl -i.bak1 -pe "s#(^\s*id '.+' version '.+'$)#// \1#" build.gradle
@@ -34,7 +36,7 @@ let
   deps = stdenv.mkDerivation {
     name = "${name}-deps";
     inherit src postPatch;
-    nativeBuildInputs = [ gradle_3_5 perl ];
+    nativeBuildInputs = [ gradle_4_10 perl ];
     buildPhase = ''
       export GRADLE_USER_HOME=$(mktemp -d)
       gradle --no-daemon build
@@ -47,12 +49,12 @@ let
     '';
     outputHashAlgo = "sha256";
     outputHashMode = "recursive";
-    outputHash = "199a9rc1pp9jjwpy83743qhjczfz0d1mkbic6si9bh8l62nw8qc7";
+    outputHash = "1v5a76pvk7llbyv2rg50wlxc2wf468l2cslz1vi20aihycbyky7j";
   };
 
 in stdenv.mkDerivation {
   inherit name src postPatch;
-  nativeBuildInputs = [ gradle_3_5 perl makeWrapper ];
+  nativeBuildInputs = [ gradle_4_10 perl makeWrapper ];
 
   buildPhase = ''
     export GRADLE_USER_HOME=$(mktemp -d)
@@ -63,7 +65,7 @@ in stdenv.mkDerivation {
                                 repositories { mavenLocal(); maven { url '${deps}' } }
                                #" {} \;
 
-    gradle --offline --no-daemon build
+    gradle --offline --no-daemon distTar
   '';
 
   installPhase = ''
-- 
GitLab


From 3b7e00c776864e6f5b8d6fa59b9eb3c4bd3d59a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 23 Sep 2019 06:23:51 -0300
Subject: [PATCH 0794/2254] matcha: 2019-07 -> 2019-09-23

---
 pkgs/data/themes/matcha/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix
index bfbf98b508e..b9de3743daf 100644
--- a/pkgs/data/themes/matcha/default.nix
+++ b/pkgs/data/themes/matcha/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "matcha";
-  version = "2019-07";
+  version = "2019-09-23";
 
   src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1jv7qq4lsjpz40wchrqlzc8w4ggrmwjavy4ipzz11jal99skpv7i";
+    sha256 = "0fx6ksv9yb16drhx1sn4nq6jha36gha3cxnr1fjhj8dgarjqrg9k";
   };
 
   buildInputs = [ gdk-pixbuf librsvg ];
-- 
GitLab


From 841f3d031bae15d3819d25663304c89777496139 Mon Sep 17 00:00:00 2001
From: Guillaume Maudoux <guillaume.maudoux@uclouvain.be>
Date: Sat, 27 Oct 2018 16:56:25 +0200
Subject: [PATCH 0795/2254] mozart2: init at 2.0.1

---
 pkgs/development/compilers/mozart/default.nix | 89 +++++++++++++++++++
 pkgs/top-level/aliases.nix                    |  2 +
 pkgs/top-level/all-packages.nix               |  5 +-
 3 files changed, 94 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/compilers/mozart/default.nix

diff --git a/pkgs/development/compilers/mozart/default.nix b/pkgs/development/compilers/mozart/default.nix
new file mode 100644
index 00000000000..97634bca8ef
--- /dev/null
+++ b/pkgs/development/compilers/mozart/default.nix
@@ -0,0 +1,89 @@
+{ lib
+, fetchFromGitHub
+, fetchurl
+, cmake
+, unzip
+, makeWrapper
+, boost
+, llvmPackages
+, llvmPackages_4
+, gmp
+, emacs
+, emacs25-nox
+, jre_headless
+, tcl
+, tk
+}:
+
+let stdenv = llvmPackages.stdenv;
+
+in stdenv.mkDerivation rec {
+  pname = "mozart2";
+  version = "2.0.1";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/mozart/mozart2/releases/download/v${version}/${name}-Source.zip";
+    sha256 = "1mad9z5yzzix87cdb05lmif3960vngh180s2mb66cj5gwh5h9dll";
+  };
+
+  # This is a workaround to avoid using sbt.
+  # I guess it is acceptable to fetch the bootstrapping compiler in binary form.
+  bootcompiler = fetchurl {
+    url = "https://github.com/layus/mozart2/releases/download/v2.0.0-beta.1/bootcompiler.jar";
+    sha256 = "1hgh1a8hgzgr6781as4c4rc52m2wbazdlw3646s57c719g5xphjz";
+  };
+
+  postConfigure = ''
+    cp ${bootcompiler} bootcompiler/bootcompiler.jar
+  '';
+
+  nativeBuildInputs = [ cmake makeWrapper unzip ];
+
+  # We cannot compile with both gcc and clang, but we need clang during the
+  # process, so we compile everything with clang.
+  # BUT, we need clang4 for parsing, and a more recent clang for compiling.
+  cmakeFlags = [
+    "-DCMAKE_CXX_COMPILER=${llvmPackages.clang}/bin/clang++"
+    "-DCMAKE_C_COMPILER=${llvmPackages.clang}/bin/clang"
+    "-DBoost_USE_STATIC_LIBS=OFF"
+    "-DMOZART_BOOST_USE_STATIC_LIBS=OFF"
+    "-DCMAKE_PROGRAM_PATH=${llvmPackages_4.clang}/bin"
+    # Rationale: Nix's cc-wrapper needs to see a compile flag (like -c) to
+    # infer that it is not a linking call, and stop trashing the command line
+    # with linker flags.
+    # As it does not recognise -emit-ast, we pass -c immediately overridden
+    # by -emit-ast.
+    # The remaining is just the default flags that we cannot reuse and need
+    # to repeat here.
+    "-DMOZART_GENERATOR_FLAGS='-c;-emit-ast;--std=c++0x;-Wno-invalid-noreturn;-Wno-return-type;-Wno-braced-scalar-init'"
+    # We are building with clang, as nix does not support having clang and
+    # gcc together as compilers and we need clang for the sources generation.
+    # However, clang emits tons of warnings about gcc's atomic-base library.
+    "-DCMAKE_CXX_FLAGS=-Wno-braced-scalar-init"
+  ] ++ lib.optional stdenv.isDarwin "-DCMAKE_FIND_FRAMEWORK=LAST";
+
+  fixupPhase = ''
+    wrapProgram $out/bin/oz --set OZEMACS ${emacs}/bin/emacs
+  '';
+
+  buildInputs = [
+    boost
+    llvmPackages_4.llvm
+    llvmPackages_4.clang
+    llvmPackages_4.clang-unwrapped
+    gmp
+    emacs25-nox
+    jre_headless
+    tcl
+    tk
+  ];
+
+  meta = {
+    description = "An open source implementation of Oz 3.";
+    maintainers = [ lib.maintainers.layus ];
+    license = lib.licenses.bsd2;
+    homepage = "https://mozart.github.io";
+  };
+
+}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index a837336740b..3d4a77100d4 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -218,6 +218,8 @@ mapAliases ({
   mobile_broadband_provider_info = mobile-broadband-provider-info; # added 2018-02-25
   module_init_tools = kmod; # added 2016-04-22
   mono-zeroconf = throw "deprecated 2019-09-20: abandoned by upstream.";
+  mozart = mozart2-binary; # added 2019-09-23
+  mozart-binary = mozart2-binary; # added 2019-09-23
   mpich2 = mpich;  # added 2018-08-06
   msf = metasploit; # added 2018-04-25
   libmsgpack = msgpack; # added 2018-08-17
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6e4e3ba468e..37a209beb43 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8238,8 +8238,9 @@ in
 
   mosml = callPackage ../development/compilers/mosml { };
 
-  mozart-binary = callPackage ../development/compilers/mozart/binary.nix { };
-  mozart = mozart-binary;
+  mozart2 = callPackage ../development/compilers/mozart { };
+
+  mozart2-binary = callPackage ../development/compilers/mozart/binary.nix { };
 
   nim = callPackage ../development/compilers/nim { };
   nrpl = callPackage ../development/tools/nrpl { };
-- 
GitLab


From fe7f8abceed8764ef255913771ed6baf020d3290 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 23 Sep 2019 07:00:56 -0300
Subject: [PATCH 0796/2254] mate.caja: 1.22.1 -> 1.22.2

---
 pkgs/desktops/mate/caja/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix
index 667a73eb630..265b0b92222 100644
--- a/pkgs/desktops/mate/caja/default.nix
+++ b/pkgs/desktops/mate/caja/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "caja";
-  version = "1.22.1";
+  version = "1.22.2";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "10b7yjimblymp1fpsrl4jb2k7kbhla2izsj3njfmg2n6fv9fy9iv";
+    sha256 = "1c5yr4b8pzd7nz7g7ln9jwp4fx6qgq8vgbv4spfryy53il3gv75h";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From 5c4872d6e5ec5ddbd218d9c94311ff6490ee1d81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 23 Sep 2019 07:00:56 -0300
Subject: [PATCH 0797/2254] mate.caja-extensions: 1.22.0 -> 1.22.1

---
 pkgs/desktops/mate/caja-extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/caja-extensions/default.nix b/pkgs/desktops/mate/caja-extensions/default.nix
index ba21cb00d35..74b184d2cb0 100644
--- a/pkgs/desktops/mate/caja-extensions/default.nix
+++ b/pkgs/desktops/mate/caja-extensions/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "caja-extensions";
-  version = "1.22.0";
+  version = "1.22.1";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1h866jmdd3qpjzi7wjj11krwiaadnlf21844g1zqfb4jgrzj773p";
+    sha256 = "0xzhphzvaxbwyyp242pnhl5zjrkiznj90i0xjmy7pvi155pmp16h";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From 17b54d60f60d4998ad7cd66d64e180ec16d802ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 23 Sep 2019 07:00:56 -0300
Subject: [PATCH 0798/2254] mate.eom: 1.22.1 -> 1.22.2

---
 pkgs/desktops/mate/eom/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix
index cc683ab2db2..2d32d8301c9 100644
--- a/pkgs/desktops/mate/eom/default.nix
+++ b/pkgs/desktops/mate/eom/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "eom";
-  version = "1.22.1";
+  version = "1.22.2";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "03lpxqvyaqhz4wmi07nxcyn5q73ym3dzm41cdid53f2dp9lk1mv4";
+    sha256 = "0za1lw4awg1i0ls0r9iw0ail2hqa34y1dx65b50bw9kx9kbfyl9l";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From 1ab384a29994bbb3161f46bcc6dca9a1d1c63122 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 23 Sep 2019 07:00:57 -0300
Subject: [PATCH 0799/2254] mate.libmateweather: 1.22.0 -> 1.22.1

---
 pkgs/desktops/mate/libmateweather/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/libmateweather/default.nix b/pkgs/desktops/mate/libmateweather/default.nix
index e4976f71ae6..c22c849a165 100644
--- a/pkgs/desktops/mate/libmateweather/default.nix
+++ b/pkgs/desktops/mate/libmateweather/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libmateweather";
-  version = "1.22.0";
+  version = "1.22.1";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1ribgcwl4ncfbcf9bkcbxrgc7yzajdnxg12837psngymkqswlp6a";
+    sha256 = "1y3z82ymc7q6z8ly9f6nys0hbs373fjnvr6j7zwlgf6zc88f71h3";
   };
 
   nativeBuildInputs = [ pkgconfig intltool ];
-- 
GitLab


From 807c0c2ad1f051be1347b0710f38d84951d2e2bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 23 Sep 2019 07:00:57 -0300
Subject: [PATCH 0800/2254] mate.marco: 1.22.2 -> 1.22.3

---
 pkgs/desktops/mate/marco/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix
index 9899256018a..88dd9e79bc8 100644
--- a/pkgs/desktops/mate/marco/default.nix
+++ b/pkgs/desktops/mate/marco/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "marco";
-  version = "1.22.2";
+  version = "1.22.3";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0sc7x14229yj22ka1vlzbaqndwcgh6idypjmm9rydkj4n968jwry";
+    sha256 = "0faiqj9i1mqqy1v4jdcwy8nsbkkvs0cwd2dqypgscmcqpbq7jf8a";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From fe4a211d1e566294e1086e8467ad34e09f8ae5e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 23 Sep 2019 07:00:57 -0300
Subject: [PATCH 0801/2254] mate.mate-applets: 1.22.1 -> 1.22.2

---
 pkgs/desktops/mate/mate-applets/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix
index ec7ad2b4294..a99405d517a 100644
--- a/pkgs/desktops/mate/mate-applets/default.nix
+++ b/pkgs/desktops/mate/mate-applets/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mate-applets";
-  version = "1.22.1";
+  version = "1.22.2";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "19sjm2180ir8a264rz8m528qaqjpl3q3cq095ab0sbkp2igksrfx";
+    sha256 = "1c32rkkry6kka2arrx5psjj037j79icp5jr1s0qh596dvsgxciqc";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From d64c2c9622c602bd97a0dc8ef5c8625d5320459f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 23 Sep 2019 07:00:57 -0300
Subject: [PATCH 0802/2254] mate.mate-calc: 1.22.1 -> 1.22.2

---
 pkgs/desktops/mate/mate-calc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/mate-calc/default.nix b/pkgs/desktops/mate/mate-calc/default.nix
index 64ede5101c7..81cfd3201a6 100644
--- a/pkgs/desktops/mate/mate-calc/default.nix
+++ b/pkgs/desktops/mate/mate-calc/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mate-calc";
-  version = "1.22.1";
+  version = "1.22.2";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0zin3w03zrkpb12rvay23bfk9fnjpybkr5mqzkpn9xfnqamhk8ld";
+    sha256 = "1as4gshydcf84vynq8ijd9n8pslz5jpw6aj18ri4bdc91a6q3rpg";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From 0da3a6c16fb0c7d49db8075ff96dc538ed9c50f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 23 Sep 2019 07:00:57 -0300
Subject: [PATCH 0803/2254] mate.mate-control-center: 1.22.1 -> 1.22.2

---
 pkgs/desktops/mate/mate-control-center/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix
index a06c24b9c72..e16effed670 100644
--- a/pkgs/desktops/mate/mate-control-center/default.nix
+++ b/pkgs/desktops/mate/mate-control-center/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mate-control-center";
-  version = "1.22.1";
+  version = "1.22.2";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0w9w3wkxksbhzyd96y1x6yxb0q5lkp16y8i42564b6njvwqch5a0";
+    sha256 = "1ybdjibi6wgqn3587a66ckxp2qkvl4mcvv2smhflyxksl5djrjgh";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From 84addd7178c7dbfbcbb5563e8716c6fe56a2b83a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 23 Sep 2019 07:00:57 -0300
Subject: [PATCH 0804/2254] mate.mate-desktop: 1.22.1 -> 1.22.2

---
 pkgs/desktops/mate/mate-desktop/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix
index 58515a492b5..8d157a201be 100644
--- a/pkgs/desktops/mate/mate-desktop/default.nix
+++ b/pkgs/desktops/mate/mate-desktop/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mate-desktop";
-  version = "1.22.1";
+  version = "1.22.2";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1hr4r69855csqrcaqpbcyplsy4cwjfz7gabps2pzkh5132jycfr0";
+    sha256 = "18w5r9p3bqpvxqqy2am7z686xf65cz5vhj247kki8s2yvvap6rlh";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From a92cf520dd0362e462ecba569ac2a9cd2b922acc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 23 Sep 2019 07:00:57 -0300
Subject: [PATCH 0805/2254] mate.mate-icon-theme: 1.22.1 -> 1.22.2

---
 pkgs/desktops/mate/mate-icon-theme/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/pkgs/desktops/mate/mate-icon-theme/default.nix
index 9df0d0ce5a8..b3610c12de6 100644
--- a/pkgs/desktops/mate/mate-icon-theme/default.nix
+++ b/pkgs/desktops/mate/mate-icon-theme/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mate-icon-theme";
-  version = "1.22.1";
+  version = "1.22.2";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1pn1xbmr4w4mi45nwk1qh18z9rlngmkhp9bw671yn4k6sii8fi3k";
+    sha256 = "0r2bk4flb6kjj97badj2lnml4lfwpl2ym5hkf7r6f7cj8g6pzc4r";
   };
 
   nativeBuildInputs = [ pkgconfig intltool iconnamingutils ];
-- 
GitLab


From aa67dedb01a73955a7c12fdfccab8c417ecf1e64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 23 Sep 2019 07:00:57 -0300
Subject: [PATCH 0806/2254] mate.mate-indicator-applet: 1.22.0 -> 1.22.1

---
 pkgs/desktops/mate/mate-indicator-applet/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/mate-indicator-applet/default.nix b/pkgs/desktops/mate/mate-indicator-applet/default.nix
index e1a6e874d1d..9b471805ad3 100644
--- a/pkgs/desktops/mate/mate-indicator-applet/default.nix
+++ b/pkgs/desktops/mate/mate-indicator-applet/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mate-indicator-applet";
-  version = "1.22.0";
+  version = "1.22.1";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0zad81qvcin4m329hfxhv4a5j8gf4gj8944mvjrdgdh71bzan2x1";
+    sha256 = "05j5s6r4kx1rbz0j7a7xv38d0kbdi1r8iv8b6nx3lkbkdzq1x0w2";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From 04d27b9804652e499ce14149b85e10c79b212808 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 23 Sep 2019 07:00:57 -0300
Subject: [PATCH 0807/2254] mate.mate-media: 1.22.1 -> 1.22.2

---
 pkgs/desktops/mate/mate-media/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/mate-media/default.nix b/pkgs/desktops/mate/mate-media/default.nix
index 93c765a9953..ca1d7867807 100644
--- a/pkgs/desktops/mate/mate-media/default.nix
+++ b/pkgs/desktops/mate/mate-media/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mate-media";
-  version = "1.22.1";
+  version = "1.22.2";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "13g1n2ddgr1yxgl4fsqj3sgb9344b756kam9v3sq6vh0bxlr4yf2";
+    sha256 = "0m8q2rqbxzvh82yj63syd8sbfjrc8y4a8caa42zs66j9x60d1agw";
   };
 
   buildInputs = [
-- 
GitLab


From 7900da21b3eba4091c714daa481d25c2aa923b11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 23 Sep 2019 07:00:57 -0300
Subject: [PATCH 0808/2254] mate.mate-menus: 1.22.0 -> 1.22.1

---
 pkgs/desktops/mate/mate-menus/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/mate-menus/default.nix b/pkgs/desktops/mate/mate-menus/default.nix
index e37a270f9dc..3788c2d4894 100644
--- a/pkgs/desktops/mate/mate-menus/default.nix
+++ b/pkgs/desktops/mate/mate-menus/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mate-menus";
-  version = "1.22.0";
+  version = "1.22.1";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1lkakbf2f1815c146z4xp5f0h4lim6jzr02681wbvzalc6k97v5c";
+    sha256 = "0kh6y76f1rhp3nr22rp93bx77wcgqnygag2ir076cqkppayjc3c0";
   };
 
   nativeBuildInputs = [ pkgconfig intltool gobject-introspection ];
-- 
GitLab


From 2e0cf16f3a9c1a1390f12901aaaa7d52cc642084 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 23 Sep 2019 07:00:58 -0300
Subject: [PATCH 0809/2254] mate.mate-notification-daemon: 1.22.0 -> 1.22.1

---
 pkgs/desktops/mate/mate-notification-daemon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/mate-notification-daemon/default.nix b/pkgs/desktops/mate/mate-notification-daemon/default.nix
index d53ae8efa35..a44b73c81a3 100644
--- a/pkgs/desktops/mate/mate-notification-daemon/default.nix
+++ b/pkgs/desktops/mate/mate-notification-daemon/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mate-notification-daemon";
-  version = "1.22.0";
+  version = "1.22.1";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "06z3xczhz5diy4kk7b8lrzljrnql6fz0n1jyy916cf8pnnanpg0j";
+    sha256 = "0f8m3m94iqj2x61dzwwvwq2qlsl2ma8pqr6rfns5pzd0nj0waz0m";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From e713dc32033722a1c5f70cab0c41e7b9a2188474 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 23 Sep 2019 07:00:58 -0300
Subject: [PATCH 0810/2254] mate.mate-panel: 1.22.1 -> 1.22.2

---
 pkgs/desktops/mate/mate-panel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix
index 39d2c1812cb..db45dc9c472 100644
--- a/pkgs/desktops/mate/mate-panel/default.nix
+++ b/pkgs/desktops/mate/mate-panel/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mate-panel";
-  version = "1.22.1";
+  version = "1.22.2";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0pb9dpgsfjp6gsldg4ad2jz23xdvjfarmz4cjwkpakygkq5i6dma";
+    sha256 = "1sm0fniywcxg8rbakhhc37bamwq1x3jqqyaqcvqwxvm6jg1hc97y";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From a5dc2603286ebb6ec9454bb5cc44206d483d39d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 23 Sep 2019 07:00:58 -0300
Subject: [PATCH 0811/2254] mate.mate-power-manager: 1.22.1 -> 1.22.2

---
 pkgs/desktops/mate/mate-power-manager/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/desktops/mate/mate-power-manager/default.nix
index 6ba6ac205ce..df7223e2288 100644
--- a/pkgs/desktops/mate/mate-power-manager/default.nix
+++ b/pkgs/desktops/mate/mate-power-manager/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mate-power-manager";
-  version = "1.22.1";
+  version = "1.22.2";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "06vs2w44l1s25j0mifkid02yncw0nvdxw8r4pp2jm18kxan4frms";
+    sha256 = "12pnj7y01k1fhfhswxmf6q9yyb0772am5anm338hzfhjp0lcxlbn";
   };
 
   buildInputs = [
-- 
GitLab


From b18e3e4157c575ec6a769560953755b54cc60d23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 23 Sep 2019 07:00:58 -0300
Subject: [PATCH 0812/2254] mate.mate-screensaver: 1.22.1 -> 1.22.2

---
 pkgs/desktops/mate/mate-screensaver/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/mate-screensaver/default.nix b/pkgs/desktops/mate/mate-screensaver/default.nix
index d1c1e481d70..4a2c0a5e2b8 100644
--- a/pkgs/desktops/mate/mate-screensaver/default.nix
+++ b/pkgs/desktops/mate/mate-screensaver/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mate-screensaver";
-  version = "1.22.1";
+  version = "1.22.2";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0c4qq5szsbfrz8hgkmlby2k7f1qs8kgqf2shd63z0pc8p6f47vvc";
+    sha256 = "1y8828g4bys8y4r5y478z6i7dgdqm2wkymi5fq75vxx4lzq919cb";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From 97d5a2aebcc3d2793728103d5872d68eb7d0c612 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 23 Sep 2019 07:00:58 -0300
Subject: [PATCH 0813/2254] mate.mate-session-manager: 1.22.1 -> 1.22.2

---
 pkgs/desktops/mate/mate-session-manager/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix
index b7735ec77fe..fb9ea7699ac 100644
--- a/pkgs/desktops/mate/mate-session-manager/default.nix
+++ b/pkgs/desktops/mate/mate-session-manager/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mate-session-manager";
-  version = "1.22.1";
+  version = "1.22.2";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1ix8picxgc28m5zd0ww3zvzw6rz38wvzsrbqw28hghrfg926h6ig";
+    sha256 = "1v0a9jbsmf9axfqm2cnsqp5ihwffw7rl0z77dyw0m4j2pmyb0558";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From 4e245f9ea5a9249682d849832925a171b03c01d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 23 Sep 2019 07:00:58 -0300
Subject: [PATCH 0814/2254] mate.mate-settings-daemon: 1.22.0 -> 1.22.1

---
 pkgs/desktops/mate/mate-settings-daemon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix
index 5ee995402ec..10c77304a8f 100644
--- a/pkgs/desktops/mate/mate-settings-daemon/default.nix
+++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mate-settings-daemon";
-  version = "1.22.0";
+  version = "1.22.1";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0yr5v6b9hdk20j29smbw1k4fkyg82i5vlflmgly0vi5whgc74gym";
+    sha256 = "0idw02z0iig0pfxvlhc4dq4sr7kl1w50xscvg0jzzswnxid2l4ip";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From 5dec681720364cb0234cb5462c05cf261aa18f61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 23 Sep 2019 07:00:58 -0300
Subject: [PATCH 0815/2254] mate.mate-system-monitor: 1.22.1 -> 1.22.2

---
 pkgs/desktops/mate/mate-system-monitor/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/mate-system-monitor/default.nix b/pkgs/desktops/mate/mate-system-monitor/default.nix
index 6f5993cfc35..12818d206a8 100644
--- a/pkgs/desktops/mate/mate-system-monitor/default.nix
+++ b/pkgs/desktops/mate/mate-system-monitor/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mate-system-monitor";
-  version = "1.22.1";
+  version = "1.22.2";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0yh1sh5snd7ivchh6l9rbn1s7ia4j5ihhzhqkyjnhr8ln59dvcbm";
+    sha256 = "1d4l5rv01343jf8bk2j5hxvrbp3d705nd4v2pdrjn4h5dw8nxsl1";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From 0b3268026909dcfb9c58ef37a13f04ca8dab3ae9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 23 Sep 2019 07:00:58 -0300
Subject: [PATCH 0816/2254] mate.mate-user-guide: 1.22.2 -> 1.22.3

---
 pkgs/desktops/mate/mate-user-guide/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/mate-user-guide/default.nix b/pkgs/desktops/mate/mate-user-guide/default.nix
index a9a0e171231..72330317bc4 100644
--- a/pkgs/desktops/mate/mate-user-guide/default.nix
+++ b/pkgs/desktops/mate/mate-user-guide/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mate-user-guide";
-  version = "1.22.2";
+  version = "1.22.3";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "01kcszsjiriqp4hf1k4fhazi2yfqlkn415sfgx0jw0p821bzqf2h";
+    sha256 = "0zv8arsxnbab0qk3ck9i1wp3d4gfclcv6vq6nh5i8zjz6rpp9cjs";
   };
 
   nativeBuildInputs = [ itstool intltool libxml2 ];
-- 
GitLab


From c846b0a52fcde16daf498f9f5216c0677dcdad9a Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Mon, 23 Sep 2019 13:42:03 +0200
Subject: [PATCH 0817/2254] grafana: 6.3.5 -> 6.3.6

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

diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index 615edeb81ec..3d61961321d 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "grafana";
-  version = "6.3.5";
+  version = "6.3.6";
 
   goPackagePath = "github.com/grafana/grafana";
 
@@ -12,12 +12,12 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "grafana";
     repo = "grafana";
-    sha256 = "0qimqdlxkvh31n730gp1wl1va0bza69bw90nyzrmfb34733pmni2";
+    sha256 = "1dxsd32ny7wcpfyhhdf5m6anzgs0mkyvlrha7ps5pfyiix7brrlk";
   };
 
   srcStatic = fetchurl {
     url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
-    sha256 = "1rw2ws610ba2vl5kv3yay8s69xkqzisrl6q27zxa5kj48khvy101";
+    sha256 = "0cz6bg8q8lxxvqh9nb2b64rr5brkmbvpvvg4x7dykc04vcjivf6n";
   };
 
   postPatch = ''
-- 
GitLab


From b640dbd00877f51616750e347a32fbcb49d2968c Mon Sep 17 00:00:00 2001
From: Yorick <yorick@yorickvanpelt.nl>
Date: Mon, 23 Sep 2019 13:50:31 +0200
Subject: [PATCH 0818/2254] pythonPackages.license-expression: make
 patchShebangs more specific

---
 pkgs/development/python-modules/license-expression/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/license-expression/default.nix b/pkgs/development/python-modules/license-expression/default.nix
index 12d26cf6dd0..2bf204a9a62 100644
--- a/pkgs/development/python-modules/license-expression/default.nix
+++ b/pkgs/development/python-modules/license-expression/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     rev = "v${version}";
     sha256 = "0q8sha38w7ajg7ar0rmbqrwv0n58l8yzyl96cqwcbvp578fn3ir0";
   };
-  postPatch = "patchShebangs .";
+  postPatch = "patchShebangs ./configure";
 
   propagatedBuildInputs = [ boolean-py ];
 
-- 
GitLab


From 01f0c10ba229f281dcf7caa6e4cbaaade97f0197 Mon Sep 17 00:00:00 2001
From: Uri Baghin <uri@canva.com>
Date: Tue, 9 Jul 2019 16:48:26 +1000
Subject: [PATCH 0819/2254] jetbrains.idea-community: add darwin support

---
 pkgs/applications/editors/jetbrains/common.nix      |  6 +++---
 pkgs/applications/editors/jetbrains/default.nix     |  2 +-
 .../development/compilers/jetbrains-jdk/default.nix | 13 +++++++++----
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/common.nix b/pkgs/applications/editors/jetbrains/common.nix
index f535d7bff47..bca85c01016 100644
--- a/pkgs/applications/editors/jetbrains/common.nix
+++ b/pkgs/applications/editors/jetbrains/common.nix
@@ -1,4 +1,4 @@
-{ stdenv, makeDesktopItem, makeWrapper, patchelf, p7zip
+{ stdenv, lib, makeDesktopItem, makeWrapper, patchelf, p7zip
 , coreutils, gnugrep, which, git, unzip, libsecret, libnotify
 }:
 
@@ -28,7 +28,7 @@ with stdenv; lib.makeOverridable mkDerivation rec {
 
   nativeBuildInputs = [ makeWrapper patchelf p7zip unzip ];
 
-  patchPhase = ''
+  patchPhase = lib.optionalString (!stdenv.isDarwin) ''
       get_file_size() {
         local fname="$1"
         echo $(ls -l $fname | cut -d ' ' -f5)
@@ -63,7 +63,7 @@ with stdenv; lib.makeOverridable mkDerivation rec {
     item=${desktopItem}
 
     makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${execName}" \
-      --prefix PATH : "$out/libexec/${name}:${stdenv.lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \
+      --prefix PATH : "$out/libexec/${name}:${lib.optionalString (stdenv.isDarwin) "${jdk}/jdk/Contents/Home/bin:"}${stdenv.lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \
       --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [
         # Some internals want libstdc++.so.6
         stdenv.cc.cc.lib libsecret
diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index a302be304e5..16a1c01363d 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -134,7 +134,7 @@ let
           as IntelliJ.
         '';
         maintainers = with maintainers; [ edwtjo ];
-        platforms = platforms.linux;
+        platforms = platforms.linux ++ platforms.darwin;
       };
     });
 
diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix
index 1349b7f0ddd..a6e3dfff4e0 100644
--- a/pkgs/development/compilers/jetbrains-jdk/default.nix
+++ b/pkgs/development/compilers/jetbrains-jdk/default.nix
@@ -14,6 +14,11 @@ let drv = stdenv.mkDerivation rec {
       url = "https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrsdk-11_0_2-linux-x64-b${version}.tar.gz";
       sha256 = "121yzgvkfx7lq0k9s8wjnhz09a564br5y7zlkxgh191sbm2i7zdi";
     }
+  else if stdenv.hostPlatform.system == "x86_64-darwin" then
+    fetchurl {
+      url = "https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrsdk-11_0_2-osx-x64-b${version}.tar.gz";
+      sha256 = "1ly6kf59knvzbr2pjkc9fqyzfs28pdvnqg5pfffr8zp14xm44zmd";
+    }
   else
     throw "unsupported system: ${stdenv.hostPlatform.system}";
 
@@ -28,20 +33,20 @@ let drv = stdenv.mkDerivation rec {
     jrePath=$out/jre
   '';
 
-  postFixup = ''
+  postFixup = lib.optionalString (!stdenv.isDarwin) ''
     find $out -type f -perm -0100 \
         -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
         --set-rpath "$rpath" {} \;
     find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \;
   '';
 
-  rpath = lib.makeLibraryPath ([
+  rpath = lib.optionalString (!stdenv.isDarwin) (lib.makeLibraryPath ([
     stdenv.cc.cc stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt libGL
     alsaLib fontconfig freetype pango gtk2 cairo gdk-pixbuf atk zlib
     (placeholder "out")
   ] ++ (with xorg; [
     libX11 libXext libXtst libXi libXp libXt libXrender libXxf86vm
-  ])) + ":${placeholder "out"}/lib/jli";
+  ])) + ":${placeholder "out"}/lib/jli");
 
   passthru.home = drv;
 
@@ -61,6 +66,6 @@ let drv = stdenv.mkDerivation rec {
     homepage = "https://bintray.com/jetbrains/intellij-jdk/";
     license = licenses.gpl2;
     maintainers = with maintainers; [ edwtjo ];
-    platforms = with platforms; [ "x86_64-linux" ];
+    platforms = with platforms; [ "x86_64-linux" "x86_64-darwin" ];
   };
 }; in drv
-- 
GitLab


From 3f4a464efb326417cfc5c2067578fdb74954598e Mon Sep 17 00:00:00 2001
From: Robert Djubek <envy1988@gmail.com>
Date: Sun, 22 Sep 2019 21:02:48 +0000
Subject: [PATCH 0820/2254] simplenote: 1.1.3 -> 1.8.0

---
 pkgs/applications/misc/simplenote/default.nix | 121 ++++++++++--------
 1 file changed, 66 insertions(+), 55 deletions(-)

diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix
index 6a16741a06b..87125eb1b36 100644
--- a/pkgs/applications/misc/simplenote/default.nix
+++ b/pkgs/applications/misc/simplenote/default.nix
@@ -1,64 +1,75 @@
-{ fetchurl, stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig
-, libgnome-keyring3, gdk-pixbuf, cairo, cups, expat, libgpgerror, nspr
-, nss, xorg, libcap, systemd, libnotify ,libXScrnSaver, gnome2 }:
+{ atomEnv, autoPatchelfHook, dpkg, fetchurl, makeDesktopItem, makeWrapper
+, stdenv, udev, wrapGAppsHook }:
 
-stdenv.mkDerivation rec {
+let
+  inherit (stdenv.hostPlatform) system;
 
-  name = "simplenote-${pkgver}";
-  pkgver = "1.1.3";
+  pname = "simplenote";
 
-  src = fetchurl {
-    url = "https://github.com/Automattic/simplenote-electron/releases/download/v${pkgver}/Simplenote-linux-${pkgver}.tar.gz";
-    sha256 = "1z92yyjmg3bgfqfdpnysf98h9hhhnqzdqqigwlmdmn3d7fy49kcf";
-  };
+  version = "1.8.0";
 
-  buildCommand = let
-
-    packages = [
-      stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3
-      fontconfig gdk-pixbuf cairo cups expat libgpgerror alsaLib nspr nss
-      xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
-      xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr
-      xorg.libXcursor libcap systemd libnotify libXScrnSaver gnome2.GConf
-      xorg.libxcb
-    ];
-
-    libPathNative = lib.makeLibraryPath packages;
-    libPath64 = lib.makeSearchPathOutput "lib" "lib64" packages;
-    libPath = "${libPathNative}:${libPath64}";
-
-  in ''
-    mkdir -p $out/share/
-    mkdir -p $out/bin
-    tar xvzf $src -C $out/share/
-    mv $out/share/Simplenote-linux-x64 $out/share/simplenote
-    mv $out/share/simplenote/Simplenote $out/share/simplenote/simplenote
-    mkdir -p $out/share/applications
-
-    cat > $out/share/applications/simplenote.desktop << EOF
-    [Desktop Entry]
-    Name=Simplenote
-    Comment=Simplenote for Linux
-    Exec=$out/bin/simplenote
-    Icon=$out/share/simplenote/Simplenote.png
-    Type=Application
-    StartupNotify=true
-    Categories=Development;
-    EOF
-
-    fixupPhase
-
-    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-      --set-rpath "${libPath}:$out/share/simplenote" \
-      $out/share/simplenote/simplenote
-
-    ln -s $out/share/simplenote/simplenote $out/bin/simplenote
-  '';
+  sha256 = {
+    x86_64-linux = "066gr1awdj5nwdr1z57mmvx7dd1z19g0wzsgbnrrb89bqfj67ykl";
+  }.${system};
 
   meta = with stdenv.lib; {
     description = "The simplest way to keep notes";
-    homepage = https://github.com/Automattic/simplenote-electron;
-    license = licenses.lgpl2;
+    homepage = "https://github.com/Automattic/simplenote-electron";
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ kiwi ];
     platforms = [ "x86_64-linux" ];
   };
-}
+
+  linux = stdenv.mkDerivation rec {
+    inherit pname version meta;
+
+    src = fetchurl {
+      url =
+        "https://github.com/Automattic/simplenote-electron/releases/download/"
+        + "v${version}/Simplenote-linux-${version}-amd64.deb";
+      inherit sha256;
+    };
+
+    desktopItem = makeDesktopItem {
+      name = "simplenote";
+      comment = "Simplenote for Linux";
+      exec = "simplenote %U";
+      icon = "simplenote";
+      type = "Application";
+      startupNotify = "true";
+      desktopName = "Simplenote";
+      categories = "Development";
+    };
+
+    dontBuild = true;
+    dontConfigure = true;
+    dontPatchELF = true;
+    dontWrapGApps = true;
+
+    buildInputs = atomEnv.packages;
+
+    nativeBuildInputs = [ dpkg makeWrapper autoPatchelfHook wrapGAppsHook ];
+
+    unpackPhase = "dpkg-deb -x $src .";
+
+    installPhase = ''
+      mkdir -p "$out/bin"
+      cp -R "opt" "$out"
+      cp -R "usr/share" "$out/share"
+      chmod -R g-w "$out"
+
+      mkdir -p "$out/share/applications"
+      cp "${desktopItem}/share/applications/"* "$out/share/applications"
+    '';
+
+    runtimeDependencies = [ udev.lib ];
+
+    postFixup = ''
+      ls -ahl $out
+      makeWrapper $out/opt/Simplenote/simplenote $out/bin/simplenote \
+      "''${gappsWrapperArgs[@]}"
+    '';
+  };
+
+in
+  linux
-- 
GitLab


From d376787bef2250d341b1705188783a7adfbc16e8 Mon Sep 17 00:00:00 2001
From: Arnar Gauti Ingason <arnari@wuxinextcode.com>
Date: Tue, 10 Sep 2019 12:19:18 +0000
Subject: [PATCH 0821/2254] dante: add darwin support

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

diff --git a/pkgs/servers/dante/default.nix b/pkgs/servers/dante/default.nix
index 24e607f4b00..ae083f17ada 100644
--- a/pkgs/servers/dante/default.nix
+++ b/pkgs/servers/dante/default.nix
@@ -11,15 +11,15 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pam libkrb5 cyrus_sasl miniupnpc ];
 
-  configureFlags = [
-    "--with-libc=libc.so.6"
-  ];
+  configureFlags = ["--with-libc=libc${stdenv.targetPlatform.extensions.sharedLibrary}"];
+
+  dontAddDisableDepTrack = stdenv.isDarwin;
 
   meta = with stdenv.lib; {
     description = "A circuit-level SOCKS client/server that can be used to provide convenient and secure network connectivity.";
     homepage    = "https://www.inet.no/dante/";
     maintainers = [ maintainers.arobyn ];
     license     = licenses.bsdOriginal;
-    platforms   = platforms.linux;
+    platforms   = platforms.linux ++ platforms.darwin;
   };
 }
-- 
GitLab


From 5b5da3c2f2a6774837a5a999f18b69abf61f60a1 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 23 Sep 2019 14:20:28 +0200
Subject: [PATCH 0822/2254] miller: 5.5.0 -> 5.6.2

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

diff --git a/pkgs/tools/text/miller/default.nix b/pkgs/tools/text/miller/default.nix
index d271490ca1c..1fc462bad8b 100644
--- a/pkgs/tools/text/miller/default.nix
+++ b/pkgs/tools/text/miller/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
   pname = "miller";
 
-  version = "5.5.0";
+  version = "5.6.2";
 
   src = fetchFromGitHub {
     owner = "johnkerl";
     repo = "miller";
     rev = "v${version}";
-    sha256 = "1zkh87vq0gqcx6z6yzf1rq30jmdgdpp0rx5f0vvl0zcn0hc2smpz";
+    sha256 = "1xajaab02y9bysanfn4i5c77q1zfmjzdswyvw2mzbidsxnjsgn6l";
   };
 
   nativeBuildInputs = [ autoreconfHook flex libtool ];
-- 
GitLab


From cbe12344ca9315ee10fd0f7749561840921f1a00 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Mon, 23 Sep 2019 15:13:39 +0200
Subject: [PATCH 0823/2254] sage: add pager to environment

Temporary fixup while waiting for an upstream fix.
---
 pkgs/applications/science/math/sage/sage-env.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/science/math/sage/sage-env.nix b/pkgs/applications/science/math/sage/sage-env.nix
index 8fd69f62171..0b67b3cff12 100644
--- a/pkgs/applications/science/math/sage/sage-env.nix
+++ b/pkgs/applications/science/math/sage/sage-env.nix
@@ -44,6 +44,7 @@
 , gsl
 , ntl
 , jdk
+, less
 }:
 
 # This generates a `sage-env` shell file that will be sourced by sage on startup.
@@ -92,6 +93,7 @@ let
     rubiks
     flintqs
     jdk # only needed for `jmol` which may be replaced in the future
+    less # needed to prevent transient test errors until https://github.com/ipython/ipython/pull/11864 is resolved
   ]
   ));
 in
-- 
GitLab


From 0dc4fe0a44f16e730a422de21f8f5ebdf582f54a Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 23 Sep 2019 15:09:06 +0200
Subject: [PATCH 0824/2254] nixos/systemd: pick more upstream tmpfiles confs

In #68792 it was discovered that /dev/fuse doesn't have
wordl-read-writeable permissions anymore. The cause of this is that the
tmpfiles examples in systemd were reorganized and split into more files.
We thus lost some of the configuration we were depending on.

In this commit some of the new tmpfiles configuration that are
applicable to us are added which also makes wtmp/lastlog in the pam
module not necessary anymore.

Rationale for the new tmpfile configs:

  - `journal-nowcow.conf`: Contains chattr +C for journald logs which
  makes sense on copy-on-write filesystems like Btrfs. Other filesystems
  shouldn't do anything funny when that flag is set.

  - `static-nodes-permissions.conf`: Contains some permission overrides
  for some device nodes like audio, loop, tun, fuse and kvm.

  - `systemd-nspawn.conf`: Makes sure `/var/lib/machines` exists and old
  snapshots are properly removed.

  - `systemd-tmp.conf`: Removes systemd services related private tmp
  folders and temporary coredump files.

  - `var.conf`: Creates some useful directories in `/var` which we would
  create anyway at some point. Also includes
  `/var/log/{wtmp,btmp,lastlog}`.

Fixes #68792.
---
 nixos/modules/security/pam.nix        | 7 -------
 nixos/modules/system/boot/systemd.nix | 5 +++++
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index 3cf09611fba..a3eb12b0694 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -742,13 +742,6 @@ in
     environment.etc =
       mapAttrsToList (n: v: makePAMService v) config.security.pam.services;
 
-    systemd.tmpfiles.rules = optionals
-      (any (s: s.updateWtmp) (attrValues config.security.pam.services))
-      [
-        "f /var/log/wtmp"
-        "f /var/log/lastlog"
-      ];
-
     security.pam.services =
       { other.text =
           ''
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 2287a82418f..5cf437bfbcb 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -858,7 +858,12 @@ in
       "sysctl.d/50-coredump.conf".source = "${systemd}/example/sysctl.d/50-coredump.conf";
       "sysctl.d/50-default.conf".source = "${systemd}/example/sysctl.d/50-default.conf";
 
+      "tmpfiles.d/journal-nocow.conf".source = "${systemd}/example/tmpfiles.d/journal-nocow.conf";
+      "tmpfiles.d/static-nodes-permissions.conf".source = "${systemd}/example/tmpfiles.d/static-nodes-permissions.conf";
       "tmpfiles.d/systemd.conf".source = "${systemd}/example/tmpfiles.d/systemd.conf";
+      "tmpfiles.d/systemd-nspawn.conf".source = "${systemd}/example/tmpfiles.d/system-nspawn.conf";
+      "tmpfiles.d/systemd-tmp.conf".source = "${systemd}/example/tmpfiles.d/system-tmp.conf";
+      "tmpfiles.d/var.conf".source = "${systemd}/example/tmpfiles.d/var.conf";
       "tmpfiles.d/x11.conf".source = "${systemd}/example/tmpfiles.d/x11.conf";
 
       "tmpfiles.d/nixos.conf".text = ''
-- 
GitLab


From 32a38d50bb2c70358b2ccef901c174b93b5d4372 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Mon, 23 Sep 2019 09:35:51 -0400
Subject: [PATCH 0825/2254] nixos/zabbixServer: move pid file from default
 (/tmp) to /run/zabbix to avoid issues with PrivateTmp=true

---
 nixos/modules/services/monitoring/zabbix-server.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/monitoring/zabbix-server.nix b/nixos/modules/services/monitoring/zabbix-server.nix
index 4b4049ed360..e9f1590760a 100644
--- a/nixos/modules/services/monitoring/zabbix-server.nix
+++ b/nixos/modules/services/monitoring/zabbix-server.nix
@@ -30,6 +30,7 @@ let
     DBUser = ${cfg.database.user}
     ${optionalString (cfg.database.passwordFile != null) "Include ${passwordFile}"}
     ${optionalString (mysqlLocal && cfg.database.socket != null) "DBSocket = ${cfg.database.socket}"}
+    PidFile = ${runtimeDir}/zabbix_server.pid
     SocketDir = ${runtimeDir}
     FpingLocation = /run/wrappers/bin/fping
     ${optionalString (cfg.modules != {}) "LoadModulePath = ${moduleEnv}/lib"}
-- 
GitLab


From 434a69f5b59cc38d35bddbc5a68b3f69ebfb2d0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 23 Sep 2019 14:37:08 +0100
Subject: [PATCH 0826/2254] rtlwifi_new: 2018-02-17 -> 2019-08-21

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

diff --git a/pkgs/os-specific/linux/rtlwifi_new/default.nix b/pkgs/os-specific/linux/rtlwifi_new/default.nix
index 447f9127d60..94ba31d59e1 100644
--- a/pkgs/os-specific/linux/rtlwifi_new/default.nix
+++ b/pkgs/os-specific/linux/rtlwifi_new/default.nix
@@ -6,13 +6,13 @@ let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wi
 
 in stdenv.mkDerivation rec {
   pname = "rtlwifi_new";
-  version = "2018-02-17";
+  version = "2019-08-21";
 
   src = fetchFromGitHub {
     owner = "lwfinger";
     repo = "rtlwifi_new";
-    rev = "0588ac0cc5f530e7764705416370b70d3c2afedc";
-    sha256 = "1vs8rfw19lcs04bapa97zlnl5x0kf02sdw5ik0hdm27wgk0z969m";
+    rev = "a108e3de87c2ed30b71c3c4595b79ab7a2f9e348";
+    sha256 = "15kjs9i9vvmn1cdzccd5cljf3m45r4ssm65klkj2fdkf3kljj38k";
   };
 
   hardeningDisable = [ "pic" "format" ];
-- 
GitLab


From 639b8ec39276912706bbdcf1f847476a8bbf84f4 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sun, 29 Apr 2018 07:04:55 +0800
Subject: [PATCH 0827/2254] home-assistant: check config files on startup

-- 
GitLab


From e537a0a11e4535d8c410fd9de16a3d7dabc8f84f Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sun, 29 Apr 2018 07:06:20 +0800
Subject: [PATCH 0828/2254] home-assistant: set capabilities for bluetooth

---
 nixos/modules/services/misc/home-assistant.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix
index f1b35124674..74702c97f55 100644
--- a/nixos/modules/services/misc/home-assistant.nix
+++ b/nixos/modules/services/misc/home-assistant.nix
@@ -224,6 +224,7 @@ in {
         KillSignal = "SIGINT";
         PrivateTmp = true;
         RemoveIPC = true;
+        AmbientCapabilities = "cap_net_raw,cap_net_admin+eip";
       };
       path = [
         "/run/wrappers" # needed for ping
-- 
GitLab


From 8e255982d41108b3da6e09674f7bfcdcf5c6e611 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Mon, 23 Sep 2019 16:56:01 +0200
Subject: [PATCH 0829/2254] httpie: run tests

---
 pkgs/tools/networking/httpie/default.nix | 28 +++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/httpie/default.nix b/pkgs/tools/networking/httpie/default.nix
index cf3c173e1b2..4230762d946 100644
--- a/pkgs/tools/networking/httpie/default.nix
+++ b/pkgs/tools/networking/httpie/default.nix
@@ -1,17 +1,35 @@
-{ stdenv, fetchurl, python3Packages }:
+{ stdenv, fetchFromGitHub, python3Packages, docutils, }:
 
 python3Packages.buildPythonApplication rec {
   pname = "httpie";
   version = "1.0.3";
 
-  src = python3Packages.fetchPypi {
-    inherit pname version;
-    sha256 = "103fcigpxf4nqmrdqjnyz7d9n4n16906slwmmqqc0gkxv8hnw6vd";
+  src = fetchFromGitHub {
+    owner = "jakubroztocil";
+    repo = "httpie";
+    rev = version;
+    sha256 = "0y30sp0x3nmgzi4dqw1rc3705hnn36ij0zlyyx7g6fqdq8bd8p5q";
   };
 
   propagatedBuildInputs = with python3Packages; [ pygments requests setuptools ];
+  dontUseSetuptoolsCheck = true;
 
-  doCheck = false;
+  disabledTests = [
+    "test_current_version"
+    "test_error"
+  ];
+
+  checkInputs = with python3Packages; [
+    mock
+    pytest
+    pytest-httpbin
+    pytestCheckHook
+  ];
+
+  # the tests call rst2pseudoxml.py from docutils
+  preCheck = ''
+    export PATH=${docutils}/bin:$PATH
+  '';
 
   meta = {
     description = "A command line HTTP client whose goal is to make CLI human-friendly";
-- 
GitLab


From d70eba7ab354778ec292e06799fef2c8982e8952 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Thu, 22 Aug 2019 18:11:10 +0900
Subject: [PATCH 0830/2254] ns-3: 3.29 -> 3.30

Fixes python bindings.
---
 .../networking/{ns3 => ns-3}/default.nix      | 72 +++++++++++--------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 44 insertions(+), 30 deletions(-)
 rename pkgs/development/libraries/science/networking/{ns3 => ns-3}/default.nix (52%)

diff --git a/pkgs/development/libraries/science/networking/ns3/default.nix b/pkgs/development/libraries/science/networking/ns-3/default.nix
similarity index 52%
rename from pkgs/development/libraries/science/networking/ns3/default.nix
rename to pkgs/development/libraries/science/networking/ns-3/default.nix
index 5218de07509..73be2a8ca6c 100644
--- a/pkgs/development/libraries/science/networking/ns3/default.nix
+++ b/pkgs/development/libraries/science/networking/ns-3/default.nix
@@ -1,5 +1,5 @@
 { stdenv
-, fetchFromGitHub
+, fetchFromGitLab
 , python
 , wafHook
 
@@ -22,75 +22,89 @@
 , dia, tetex ? null, ghostscript ? null, texlive ? null
 
 # generates python bindings
-, generateBindings ? false, ncurses ? null
+, pythonSupport ? false, ncurses ? null
 
 # All modules can be enabled by choosing 'all_modules'.
 # we include here the DCE mandatory ones
 , modules ? [ "core" "network" "internet" "point-to-point" "fd-net-device" "netanim"]
-, gcc6
 , lib
 }:
 
 let
   pythonEnv = python.withPackages(ps:
     stdenv.lib.optional withManual ps.sphinx
-    ++ stdenv.lib.optionals generateBindings (with ps;[ pybindgen pygccxml ])
+    ++ stdenv.lib.optionals pythonSupport (with ps;[ pybindgen pygccxml ])
   );
 in
 stdenv.mkDerivation rec {
-
-  name = "ns-3.${version}";
-  version = "28";
-
-  # the all in one https://www.nsnam.org/release/ns-allinone-3.27.tar.bz2;
-  # fetches everything (netanim, etc), this package focuses on ns3-core
-  src = fetchFromGitHub {
-    owner  = "nsnam";
-    repo   = "ns-3-dev-git";
-    rev    = name;
-    sha256 = "17kzfjpgw2mvyx1c9bxccnvw67jpk09fxmcnlkqx9xisk10qnhng";
+  pname = "ns-3";
+  version = "30";
+
+  src = fetchFromGitLab {
+    owner = "nsnam";
+    repo   = "ns-3-dev";
+    rev    = "ns-3.${version}";
+    sha256 = "0smdi3gglmafpc7a20hj2lbmwks3d5fpsicpn39lmm3svazw0bvp";
   };
 
   nativeBuildInputs = [ wafHook ];
+
+  outputs = [ "out" ] ++ lib.optional pythonSupport "py";
+
   # ncurses is a hidden dependency of waf when checking python
-  buildInputs = lib.optionals generateBindings [ castxml ncurses ]
-    ++ stdenv.lib.optional enableDoxygen [ doxygen graphviz imagemagick ]
-    ++ stdenv.lib.optional withManual [ dia tetex ghostscript texlive.combined.scheme-medium ];
+  buildInputs = lib.optionals pythonSupport [ castxml ncurses ]
+    ++ lib.optional enableDoxygen [ doxygen graphviz imagemagick ]
+    ++ lib.optional withManual [ dia tetex ghostscript texlive.combined.scheme-medium ];
 
-  propagatedBuildInputs = [ gcc6 pythonEnv ];
+  propagatedBuildInputs = [ pythonEnv ];
 
   postPatch = ''
     patchShebangs doc/ns3_html_theme/get_version.sh
   '';
 
   wafConfigureFlags = with stdenv.lib; [
-      "--enable-modules=${stdenv.lib.concatStringsSep "," modules}"
+      "--enable-modules=${concatStringsSep "," modules}"
       "--with-python=${pythonEnv.interpreter}"
   ]
   ++ optional (build_profile != null) "--build-profile=${build_profile}"
-  ++ optional generateBindings [  ]
   ++ optional withExamples " --enable-examples "
   ++ optional doCheck " --enable-tests "
   ;
 
+  doCheck = true;
+
   buildTargets = "build"
     + lib.optionalString enableDoxygen " doxygen"
     + lib.optionalString withManual "sphinx";
 
-  doCheck = true;
+  # to prevent fatal error: 'backward_warning.h' file not found
+  CXXFLAGS = "-D_GLIBCXX_PERMIT_BACKWARD_HASH";
+
+  postBuild = with stdenv.lib; let flags = concatStringsSep ";" (
+      optional enableDoxygen "./waf doxygen"
+      ++ optional withManual "./waf sphinx"
+    );
+    in "${flags}"
+  ;
+
+  postInstall = ''
+    moveToOutput "${pythonEnv.libPrefix}" "$py"
+  '';
 
   # we need to specify the proper interpreter else ns3 can check against a
-  # different version even though we
+  # different version
   checkPhase =  ''
-    ${pythonEnv.interpreter} ./test.py
+    ${pythonEnv.interpreter} ./test.py --nowaf
   '';
 
-  hardeningDisable = [ "fortify" ];
+  # strictoverflow prevents clang from discovering pyembed when bindings
+  hardeningDisable = [ "fortify" "strictoverflow"];
 
-  meta = {
-    homepage = http://www.nsnam.org;
-    license = stdenv.lib.licenses.gpl3;
+  meta = with stdenv.lib; {
+    homepage = "http://www.nsnam.org";
+    license = licenses.gpl3;
     description = "A discrete time event network simulator";
-    platforms = with stdenv.lib.platforms; unix;
+    platforms = with platforms; unix;
+    maintainers = with maintainers; [ teto ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 023e2b334b1..4b95d340af8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23525,7 +23525,7 @@ in
 
   netlogo = callPackage ../applications/science/misc/netlogo { };
 
-  ns-3 = callPackage ../development/libraries/science/networking/ns3 { };
+  ns-3 = callPackage ../development/libraries/science/networking/ns-3 { python = python3; };
 
   root = callPackage ../applications/science/misc/root {
     inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL;
-- 
GitLab


From 7e325c2251cd9d21f5d7010add19c14f6b7badae Mon Sep 17 00:00:00 2001
From: talyz <kim.lindberger@gmail.com>
Date: Fri, 20 Sep 2019 18:00:36 +0200
Subject: [PATCH 0831/2254] nixos/gitlab: Mention secret option transition in
 release notes

Document the breaking secret option transition from literal secrets to
file-based ones.
---
 nixos/doc/manual/release-notes/rl-1909.xml | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
index 58ab7207f53..19062bbc9d8 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -484,6 +484,28 @@
        (<literal>citrix_workspace</literal>).
      </para>
    </listitem>
+   <listitem>
+     <para>
+       The <literal>services.gitlab</literal> module has had its literal secret options (<option>services.gitlab.smtp.password</option>,
+       <option>services.gitlab.databasePassword</option>,
+       <option>services.gitlab.initialRootPassword</option>,
+       <option>services.gitlab.secrets.secret</option>,
+       <option>services.gitlab.secrets.db</option>,
+       <option>services.gitlab.secrets.otp</option> and
+       <option>services.gitlab.secrets.jws</option>) replaced by file-based versions (<option>services.gitlab.smtp.passwordFile</option>,
+       <option>services.gitlab.databasePasswordFile</option>,
+       <option>services.gitlab.initialRootPasswordFile</option>,
+       <option>services.gitlab.secrets.secretFile</option>,
+       <option>services.gitlab.secrets.dbFile</option>,
+       <option>services.gitlab.secrets.otpFile</option> and
+       <option>services.gitlab.secrets.jwsFile</option>). This was done so that secrets aren't stored
+       in the world-readable nix store, but means that for each option you'll have to create a file with
+       the same exact string, add "File" to the end of the option name, and change the definition to a
+       string pointing to the corresponding file; e.g. <literal>services.gitlab.databasePassword = "supersecurepassword"</literal>
+       becomes <literal>services.gitlab.databasePasswordFile = "/path/to/secret_file"</literal> where the
+       file <literal>secret_file</literal> contains the string <literal>supersecurepassword</literal>.
+     </para>
+   </listitem>
   </itemizedlist>
  </section>
 
-- 
GitLab


From dfc43f7d0a6c22417b4522f42d9c4e196fdbe7f7 Mon Sep 17 00:00:00 2001
From: talyz <kim.lindberger@gmail.com>
Date: Fri, 20 Sep 2019 18:04:03 +0200
Subject: [PATCH 0832/2254] nixos/gitlab: Document the restriction introduced
 on statePath

The state path now, since the transition from initialization in
preStart to using systemd-tmpfiles, has the following restriction: no
parent directory can be owned by any other user than root or the user
specified in services.gitlab.user. This is a potentially breaking
change and the cause of the error isn't immediately obvious, so
document it both in the release notes and statePath description.
---
 nixos/doc/manual/release-notes/rl-1909.xml |  7 +++++++
 nixos/modules/services/misc/gitlab.nix     | 10 +++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
index 19062bbc9d8..e4dcc90cdd3 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -505,6 +505,13 @@
        becomes <literal>services.gitlab.databasePasswordFile = "/path/to/secret_file"</literal> where the
        file <literal>secret_file</literal> contains the string <literal>supersecurepassword</literal>.
      </para>
+     <para>
+       The state path (<option>services.gitlab.statePath</option>) now has the following restriction:
+       no parent directory can be owned by any other user than <literal>root</literal> or the user
+       specified in <option>services.gitlab.user</option>; i.e. if <option>services.gitlab.statePath</option>
+       is set to <literal>/var/lib/gitlab/state</literal>, <literal>gitlab</literal> and all parent directories
+       must be owned by either <literal>root</literal> or the user specified in <option>services.gitlab.user</option>.
+     </para>
    </listitem>
   </itemizedlist>
  </section>
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index 1e1eb0fd9a1..4c1ffead00c 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -223,7 +223,15 @@ in {
       statePath = mkOption {
         type = types.str;
         default = "/var/gitlab/state";
-        description = "Gitlab state directory, logs are stored here.";
+        description = ''
+          Gitlab state directory. Configuration, repositories and
+          logs, among other things, are stored here.
+
+          The directory will be created automatically if it doesn't
+          exist already. Its parent directories must be owned by
+          either <literal>root</literal> or the user set in
+          <option>services.gitlab.user</option>.
+        '';
       };
 
       backupPath = mkOption {
-- 
GitLab


From 7dcef37ef8e1551abbcfe4e926c38aa9cb91b6f3 Mon Sep 17 00:00:00 2001
From: Ambroz Bizjak <abizjak.pro@gmail.com>
Date: Mon, 23 Sep 2019 18:06:15 +0200
Subject: [PATCH 0833/2254] virtualboxGuestAdditions: Fix clipboard
 integration.

VBoxClient needs a RUNPATH entry to dlopen libXfixes successfully.

Fixes https://github.com/NixOS/nixpkgs/issues/65542
---
 .../virtualbox/guest-additions/default.nix    | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index ad860b07bdf..08b6fa63e84 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -12,9 +12,16 @@ let
   # It's likely to work again in some future update.
   xserverABI = let abi = xserverVListFunc 0 + xserverVListFunc 1;
     in if abi == "119" || abi == "120" then "118" else abi;
-in
 
-stdenv.mkDerivation {
+  # Specifies how to patch binaries to make sure that libraries loaded using
+  # dlopen are found. We grep binaries for specific library names and patch
+  # RUNPATH in matching binaries to contain the needed library paths.
+  dlopenLibs = [
+    { name = "libdbus-1.so"; pkg = dbus; }
+    { name = "libXfixes.so"; pkg = xorg.libXfixes; }
+  ];
+
+in stdenv.mkDerivation {
   name = "VirtualBox-GuestAdditions-${version}-${kernel.version}";
 
   src = fetchurl {
@@ -134,13 +141,13 @@ stdenv.mkDerivation {
   # Stripping breaks these binaries for some reason.
   dontStrip = true;
 
-  # Some code dlopen() libdbus, patch RUNPATH in fixupPhase so it isn't stripped.
-  postFixup = ''
-    for i in $(grep -F libdbus-1.so -l -r $out/{lib,bin}); do
+  # Patch RUNPATH according to dlopenLibs (see the comment there).
+  postFixup = lib.concatMapStrings (library: ''
+    for i in $(grep -F ${lib.escapeShellArg library.name} -l -r $out/{lib,bin}); do
       origRpath=$(patchelf --print-rpath "$i")
-      patchelf --set-rpath "$origRpath:${lib.makeLibraryPath [ dbus ]}" "$i"
+      patchelf --set-rpath "$origRpath:${lib.makeLibraryPath [ library.pkg ]}" "$i"
     done
-  '';
+  '') dlopenLibs;
 
   meta = {
     description = "Guest additions for VirtualBox";
-- 
GitLab


From 5aba3be6f913a9051adff85b0744d847b3fa2bb7 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Mon, 23 Sep 2019 18:50:59 +0200
Subject: [PATCH 0834/2254] sage: 8.9.beta8 -> 8.9.beta9

---
 pkgs/applications/science/math/sage/sage-src.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix
index 09edd2addfa..e85a1f7239d 100644
--- a/pkgs/applications/science/math/sage/sage-src.nix
+++ b/pkgs/applications/science/math/sage/sage-src.nix
@@ -10,14 +10,14 @@
 # all get the same sources with the same patches applied.
 
 stdenv.mkDerivation rec {
-  version = "8.9.beta8";
+  version = "8.9.beta9";
   pname = "sage-src";
 
   src = fetchFromGitHub {
     owner = "sagemath";
     repo = "sage";
     rev = version;
-    sha256 = "0aw19qx4z23vfqp5dyqsff5ng968ipjxsw1j45i9va3cpabm6j49";
+    sha256 = "0axiazlr24rc98784i68hzkzjx7rvrf3qiqz2g6w120a2ls7f1qm";
   };
 
   # Patches needed because of particularities of nix or the way this is packaged.
-- 
GitLab


From 9b775dfad9c2bb7f0468d43f446a4c2ace1f0944 Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Mon, 23 Sep 2019 18:54:59 +0200
Subject: [PATCH 0835/2254] jormungandr: 0.3.9999 -> 0.5.0

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

diff --git a/pkgs/applications/blockchains/jormungandr/default.nix b/pkgs/applications/blockchains/jormungandr/default.nix
index 06400af679f..bde73ec16c8 100644
--- a/pkgs/applications/blockchains/jormungandr/default.nix
+++ b/pkgs/applications/blockchains/jormungandr/default.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "jormungandr";
-  version = "0.3.9999";
+  version = "0.5.0";
 
   src = fetchgit {
     url = "https://github.com/input-output-hk/${pname}";
     rev = "v${version}";
-    sha256 = "11lr533fpispwbk4vsq9bnv40gkpybvpa7ajwczv9ky6afh8np5b";
+    sha256 = "19jqnja4mxyfgg79m4ak4815wjxvkg6qn04gk21c15xl3i8b4zf6";
     fetchSubmodules = true;
   };
 
-  cargoSha256 = "0b5phmvwv5cyjawlxd9rmlc403lxzm4gnw0mclq70g5g0msqzd9m";
+  cargoSha256 = "1grrxmczdmkf2sd0f0b2iblzzcp8qlrsad5dkm0r5vxch22rcx7d";
 
   nativeBuildInputs = [ pkgconfig protobuf ];
   buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
-- 
GitLab


From e25bf4c0facb64deb78dfa543aac61d4a2a53fd9 Mon Sep 17 00:00:00 2001
From: Tobias Happ <tobias.happ@gmx.de>
Date: Mon, 23 Sep 2019 19:04:38 +0200
Subject: [PATCH 0836/2254] dwm-status: 1.6.2 -> 1.6.3

---
 pkgs/applications/window-managers/dwm/dwm-status.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix
index 1787e40eb96..ecd792f74e7 100644
--- a/pkgs/applications/window-managers/dwm/dwm-status.nix
+++ b/pkgs/applications/window-managers/dwm/dwm-status.nix
@@ -9,19 +9,19 @@ in
 
 rustPlatform.buildRustPackage rec {
   pname = "dwm-status";
-  version = "1.6.2";
+  version = "1.6.3";
 
   src = fetchFromGitHub {
     owner = "Gerschtli";
     repo = "dwm-status";
     rev = version;
-    sha256 = "16vf7val1isc4227amng2ap9af34xa2va23dxv43px006xhrar78";
+    sha256 = "02sprsr7822ynkwpf3xdgmkdrgkw3vgijhlh65bayiv3b5lwb54n";
   };
 
   nativeBuildInputs = [ makeWrapper pkgconfig ];
   buildInputs = [ dbus gdk-pixbuf libnotify xorg.libX11 ];
 
-  cargoSha256 = "0pprf8509d321azg2l51lpxylgpk7290y38z9p5hxgkcwhrhrcss";
+  cargoSha256 = "0l6x59bzzilc78gsi5rlgq9zjvp8qjphfsds776ljzmkbdq8q4iz";
 
   postInstall = lib.optionalString (bins != [])  ''
     wrapProgram $out/bin/dwm-status --prefix "PATH" : "${stdenv.lib.makeBinPath bins}"
-- 
GitLab


From 711cbb9117144efad576167125c9f9e2e04065db Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 23 Sep 2019 18:51:56 +0200
Subject: [PATCH 0837/2254] rtl8812au, rtl8821au: Prevent runtime dependency on
 kernel.dev

---
 pkgs/os-specific/linux/rtl8812au/default.nix | 8 ++++++--
 pkgs/os-specific/linux/rtl8821au/default.nix | 8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix
index 81c1f8ab0f5..68364580346 100644
--- a/pkgs/os-specific/linux/rtl8812au/default.nix
+++ b/pkgs/os-specific/linux/rtl8812au/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, kernel, bc }:
+{ stdenv, fetchFromGitHub, kernel, bc, nukeReferences }:
 
 stdenv.mkDerivation rec {
   name = "rtl8812au-${kernel.version}-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "1fy0f8ihxd0i5kr8gmky8v8xl0ns6bhxfdn64c97c5irzdvg37sr";
   };
 
-  nativeBuildInputs = [ bc ];
+  nativeBuildInputs = [ bc nukeReferences ];
   buildInputs = kernel.moduleBuildDependencies;
 
   hardeningDisable = [ "pic" "format" ];
@@ -27,6 +27,10 @@ stdenv.mkDerivation rec {
     mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
   '';
 
+  postInstall = ''
+    nuke-refs $out/lib/modules/*/kernel/net/wireless/*.ko
+  '';
+
   meta = with stdenv.lib; {
     description = "Driver for Realtek 802.11ac, rtl8812au, provides the 8812au mod";
     homepage = https://github.com/zebulon2/rtl8812au-driver-5.2.20;
diff --git a/pkgs/os-specific/linux/rtl8821au/default.nix b/pkgs/os-specific/linux/rtl8821au/default.nix
index ca63c5c6a8d..1829bd6763f 100644
--- a/pkgs/os-specific/linux/rtl8821au/default.nix
+++ b/pkgs/os-specific/linux/rtl8821au/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, kernel, bc }:
+{ stdenv, fetchFromGitHub, kernel, bc, nukeReferences }:
 
 stdenv.mkDerivation rec {
   name = "rtl8821au-${kernel.version}-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "1kmdxgbh0s0v9809kdsi39p0jbm5cf10ivy40h8qj9hn70g1gw8q";
   };
 
-  nativeBuildInputs = [ bc ];
+  nativeBuildInputs = [ bc nukeReferences ];
   buildInputs = kernel.moduleBuildDependencies;
 
   hardeningDisable = [ "pic" "format" ];
@@ -30,6 +30,10 @@ stdenv.mkDerivation rec {
     mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
   '';
 
+  postInstall = ''
+    nuke-refs $out/lib/modules/*/kernel/net/wireless/*.ko
+  '';
+
   meta = with stdenv.lib; {
     description = "rtl8821AU, rtl8812AU and rtl8811AU chipset driver with firmware";
     homepage = https://github.com/zebulon2/rtl8812au;
-- 
GitLab


From 760bcf678e7ef36dd98c5d625bc13511cfcdef60 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 23 Sep 2019 19:03:13 +0200
Subject: [PATCH 0838/2254] libotr: Use multiple outputs

---
 pkgs/development/libraries/libotr/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libotr/default.nix b/pkgs/development/libraries/libotr/default.nix
index 080a1945215..db79bad745f 100644
--- a/pkgs/development/libraries/libotr/default.nix
+++ b/pkgs/development/libraries/libotr/default.nix
@@ -8,8 +8,9 @@ stdenv.mkDerivation rec {
     sha256 = "1x8rliydhbibmzwdbyr7pd7n87m2jmxnqkpvaalnf4154hj1hfwb";
   };
 
+  outputs = [ "bin" "out" "dev" ];
+
   nativeBuildInputs = [ autoreconfHook ];
-  buildInputs = [ ];
   propagatedBuildInputs = [ libgcrypt ];
 
   meta = with stdenv.lib; {
-- 
GitLab


From c8bc18bcc21c14e3d64f4c7b8f44c36e188efc1f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 23 Sep 2019 19:10:55 +0200
Subject: [PATCH 0839/2254] awscli: Get rid of runtime -dev dependencies

---
 pkgs/development/python-modules/botocore/default.nix   | 2 ++
 pkgs/development/python-modules/s3transfer/default.nix | 2 +-
 pkgs/development/python-modules/urllib3/default.nix    | 2 ++
 pkgs/tools/admin/awscli/default.nix                    | 6 +++++-
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix
index 5c8b00fc6c1..e1465e86b0e 100644
--- a/pkgs/development/python-modules/botocore/default.nix
+++ b/pkgs/development/python-modules/botocore/default.nix
@@ -19,6 +19,8 @@ buildPythonPackage rec {
     sha256 = "19ls7hdmcaqrrq8przqy05s8chsy8315ic2zg185k6m64pvr0qhd";
   };
 
+  outputs = [ "out" "dev" ];
+
   propagatedBuildInputs = [
     dateutil
     jmespath
diff --git a/pkgs/development/python-modules/s3transfer/default.nix b/pkgs/development/python-modules/s3transfer/default.nix
index 7589d0fce73..0c227bc6377 100644
--- a/pkgs/development/python-modules/s3transfer/default.nix
+++ b/pkgs/development/python-modules/s3transfer/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     sha256 = "f23d5cb7d862b104401d9021fc82e5fa0e0cf57b7660a1331425aab0c691d021";
   };
 
-  foo = 1;
+  outputs = [ "out" "dev" ];
 
   propagatedBuildInputs =
     [ botocore
diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix
index d951e436480..e50d90266bf 100644
--- a/pkgs/development/python-modules/urllib3/default.nix
+++ b/pkgs/development/python-modules/urllib3/default.nix
@@ -11,6 +11,8 @@ buildPythonPackage rec {
     sha256 = "2393a695cd12afedd0dcb26fe5d50d0cf248e5a66f75dbd89a3d4eb333a61af4";
   };
 
+  outputs = [ "out" "dev" ];
+
   NOSE_EXCLUDE = stdenv.lib.concatStringsSep "," [
     "test_headers" "test_headerdict" "test_can_validate_ip_san" "test_delayed_body_read_timeout"
     "test_timeout_errors_cause_retries" "test_select_multiple_interrupts_with_event"
diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix
index 33526ba11df..7e3e0c9fff0 100644
--- a/pkgs/tools/admin/awscli/default.nix
+++ b/pkgs/tools/admin/awscli/default.nix
@@ -38,7 +38,7 @@ in py.pkgs.buildPythonApplication rec {
   # No tests included
   doCheck = false;
 
-  propagatedBuildInputs = with py.pkgs; [
+  pythonPath = with py.pkgs; [
     botocore
     bcdoc
     s3transfer
@@ -49,6 +49,10 @@ in py.pkgs.buildPythonApplication rec {
     pyyaml
     groff
     less
+    urllib3
+    dateutil
+    jmespath
+    futures
   ];
 
   postInstall = ''
-- 
GitLab


From f089afe96539f90c24cdba9005e689d410a24e93 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 23 Sep 2019 13:40:45 -0400
Subject: [PATCH 0840/2254] androidndk: get correct libs for x86_64

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

diff --git a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
index 02aa6567c1a..6bcfcfc3023 100644
--- a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
+++ b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
@@ -103,6 +103,6 @@ rec {
     cp -r ${buildAndroidndk}/libexec/android-sdk/ndk-bundle/sysroot/usr/include $out/include
     chmod +w $out/include
     cp -r ${buildAndroidndk}/libexec/android-sdk/ndk-bundle/sysroot/usr/include/${targetInfo.triple}/* $out/include
-    ln -s ${buildAndroidndk}/libexec/android-sdk/ndk-bundle/platforms/android-${stdenv.hostPlatform.sdkVer}/arch-${hostInfo.arch}/usr/lib $out/lib
+    ln -s ${buildAndroidndk}/libexec/android-sdk/ndk-bundle/platforms/android-${stdenv.hostPlatform.sdkVer}/arch-${hostInfo.arch}/usr/${if hostInfo.arch == "x86_64" then "lib64" else "lib"} $out/lib
   '';
 }
-- 
GitLab


From 699fae259deb8ee121fc9e539e71285d60666126 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 23 Sep 2019 13:46:50 -0400
Subject: [PATCH 0841/2254] =?UTF-8?q?gmp:=20don=E2=80=99t=20disable=20asse?=
 =?UTF-8?q?mbly=20on=20x86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

this should always work, even on android / iOS toolchains
---
 pkgs/development/libraries/gmp/6.x.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix
index de31128e5a6..d9ea5a71dd3 100644
--- a/pkgs/development/libraries/gmp/6.x.nix
+++ b/pkgs/development/libraries/gmp/6.x.nix
@@ -37,7 +37,7 @@ let self = stdenv.mkDerivation rec {
     "--build=${stdenv.buildPlatform.config}"
   ] ++ optional (cxx && stdenv.isDarwin) "CPPFLAGS=-fexceptions"
     ++ optional (stdenv.isDarwin && stdenv.is64bit) "ABI=64"
-    ++ optional (with stdenv.hostPlatform; useAndroidPrebuilt || useiOSPrebuilt) "--disable-assembly"
+    ++ optional (with stdenv.hostPlatform; (useAndroidPrebuilt || useiOSPrebuilt) && !isx86) "--disable-assembly"
     ;
 
   doCheck = true; # not cross;
-- 
GitLab


From b3b95bc86d2640936d271c368a2cf721a226fd75 Mon Sep 17 00:00:00 2001
From: Enno Lohmeier <enno@nerdworks.de>
Date: Mon, 23 Sep 2019 20:19:50 +0200
Subject: [PATCH 0842/2254] goaccess: fix geoip database configuration

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

diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix
index 6fad9829d79..0fe9001fcdb 100644
--- a/pkgs/tools/misc/goaccess/default.nix
+++ b/pkgs/tools/misc/goaccess/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, geoipWithDatabase, ncurses, glib }:
+{ stdenv, fetchurl, pkgconfig, ncurses, glib, libmaxminddb }:
 
 stdenv.mkDerivation rec {
   version = "1.3";
@@ -10,13 +10,13 @@ stdenv.mkDerivation rec {
   };
 
   configureFlags = [
-    "--enable-geoip"
+    "--enable-geoip=mmdb"
     "--enable-utf8"
   ];
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
-    geoipWithDatabase
+    libmaxminddb
     ncurses
     glib
   ];
-- 
GitLab


From 5b6b92d15b0412eccc510a36d56ad379d87aa190 Mon Sep 17 00:00:00 2001
From: Paul Reimer <paul@p-rimes.net>
Date: Mon, 23 Sep 2019 11:33:57 -0700
Subject: [PATCH 0843/2254] vimPlugins.ShowMultiBase: init at 2010-10-18

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

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 4fee6d06f7e..93b22432ff3 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -2245,6 +2245,17 @@ let
     };
   };
 
+  ShowMultiBase = buildVimPluginFrom2Nix {
+    pname = "ShowMultiBase";
+    version = "2010-10-18";
+    src = fetchFromGitHub {
+      owner = "vim-scripts";
+      repo = "ShowMultiBase";
+      rev = "85a39fd12668ce973d3d9282263912b2b8f0d338";
+      sha256 = "0hg5352ahzgh2kwqha5v8ai024fld93xag93hb53wjf5b8nzsz8i";
+    };
+  };
+
   sky-color-clock-vim = buildVimPluginFrom2Nix {
     pname = "sky-color-clock-vim";
     version = "2018-11-03";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 926c509d12f..c8c4e867a46 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -445,6 +445,7 @@ vim-scripts/PreserveNoEOL
 vim-scripts/random.vim
 vim-scripts/Rename
 vim-scripts/ReplaceWithRegister
+vim-scripts/ShowMultiBase
 vim-scripts/tabmerge
 vim-scripts/taglist.vim
 vim-scripts/wombat256.vim
-- 
GitLab


From c847da5b8b8ae4dc6a7ea08957f07382c1db38a3 Mon Sep 17 00:00:00 2001
From: Riley Inman <rileyminman@gmail.com>
Date: Mon, 23 Sep 2019 15:08:54 -0400
Subject: [PATCH 0844/2254] iosevka: Fix rev typo, link node_modules instead of
 copy

---
 pkgs/data/fonts/iosevka/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix
index f8af1045652..274c4b188b5 100644
--- a/pkgs/data/fonts/iosevka/default.nix
+++ b/pkgs/data/fonts/iosevka/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "be5invis";
     repo = "Iosevka";
-    rev = version;
+    rev = "v${version}";
     sha256 = "1qnbxhx9wvij9zia226mc3sy8j7bfsw5v1cvxvsbbwjskwqdamvv";
   };
 
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
       echo -e "\n" >> parameters.toml
       remarshal -i "$extraParametersJSONPath" -if json -of toml >> parameters.toml
     ''}
-    cp -r ${nodePackages."iosevka-build-deps-../../data/fonts/iosevka"}/lib/node_modules/iosevka-build-deps/* ./
+    ln -s ${nodePackages."iosevka-build-deps-../../data/fonts/iosevka"}/lib/node_modules/iosevka-build-deps/node_modules .
     runHook postConfigure
   '';
 
-- 
GitLab


From 2f2da824edd957aabff97529d55cdfd8da6f8f72 Mon Sep 17 00:00:00 2001
From: William Kral <william.kral@gmail.com>
Date: Mon, 23 Sep 2019 12:28:21 -0700
Subject: [PATCH 0845/2254] virtualbox: Temporary fix for kernel >= 5.3

---
 .../virtualization/virtualbox/default.nix     |  3 +
 .../virtualbox/kernel-5.3-fix.patch           | 72 +++++++++++++++++++
 2 files changed, 75 insertions(+)
 create mode 100644 pkgs/applications/virtualization/virtualbox/kernel-5.3-fix.patch

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index ac52b83e43d..633f047be5a 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -92,6 +92,9 @@ in stdenv.mkDerivation {
     })
   ++ [
     ./qtx11extras.patch
+    # Kernel 5.3 fix, should be fixed with VirtualBox 6.0.14
+    # https://www.virtualbox.org/ticket/18911
+    ./kernel-5.3-fix.patch
   ];
 
   postPatch = ''
diff --git a/pkgs/applications/virtualization/virtualbox/kernel-5.3-fix.patch b/pkgs/applications/virtualization/virtualbox/kernel-5.3-fix.patch
new file mode 100644
index 00000000000..ba9c7c941db
--- /dev/null
+++ b/pkgs/applications/virtualization/virtualbox/kernel-5.3-fix.patch
@@ -0,0 +1,72 @@
+--- a/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
++++ b/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
+@@ -2123,7 +2123,9 @@
+ #endif
+     if (in_dev != NULL)
+     {
+-        for_ifa(in_dev) {
++        struct in_ifaddr *ifa;
++
++        for (ifa = in_dev->ifa_list; ifa; ifa = ifa->ifa_next) {
+             if (VBOX_IPV4_IS_LOOPBACK(ifa->ifa_address))
+                 return NOTIFY_OK;
+
+@@ -2137,7 +2139,7 @@
+
+             pThis->pSwitchPort->pfnNotifyHostAddress(pThis->pSwitchPort,
+                 /* :fAdded */ true, kIntNetAddrType_IPv4, &ifa->ifa_address);
+-        } endfor_ifa(in_dev);
++        }
+     }
+
+     /*
+--- a/src/VBox/Runtime/r0drv/linux/mp-r0drv-linux.c
++++ a/src/VBox/Runtime/r0drv/linux/mp-r0drv-linux.c
+@@ -283,12 +283,15 @@
+     if (RTCpuSetCount(&OnlineSet) > 1)
+     {
+         /* Fire the function on all other CPUs without waiting for completion. */
+-# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
++# if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0)
++        smp_call_function(rtmpLinuxAllWrapper, &Args, 0 /* wait */);
++# elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
+         int rc = smp_call_function(rtmpLinuxAllWrapper, &Args, 0 /* wait */);
++        Assert(!rc); NOREF(rc);
+ # else
+         int rc = smp_call_function(rtmpLinuxAllWrapper, &Args, 0 /* retry */, 0 /* wait */);
+-# endif
+         Assert(!rc); NOREF(rc);
++# endif
+     }
+ #endif
+
+@@ -326,7 +329,6 @@
+ {
+ #ifdef CONFIG_SMP
+     IPRT_LINUX_SAVE_EFL_AC();
+-    int rc;
+     RTMPARGS Args;
+
+     RTTHREADPREEMPTSTATE PreemptState = RTTHREADPREEMPTSTATE_INITIALIZER;
+@@ -337,14 +339,17 @@
+     Args.cHits = 0;
+
+     RTThreadPreemptDisable(&PreemptState);
+-# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
+-    rc = smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */);
++# if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0)
++    smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */);
++# elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
++    int rc = smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */);
++    Assert(rc == 0); NOREF(rc);
+ # else /* older kernels */
+-    rc = smp_call_function(rtmpLinuxWrapper, &Args, 0 /* retry */, 1 /* wait */);
++    int rc = smp_call_function(rtmpLinuxWrapper, &Args, 0 /* retry */, 1 /* wait */);
++    Assert(rc == 0); NOREF(rc);
+ # endif /* older kernels */
+     RTThreadPreemptRestore(&PreemptState);
+
+-    Assert(rc == 0); NOREF(rc);
+     IPRT_LINUX_RESTORE_EFL_AC();
+ #else
+     RT_NOREF(pfnWorker, pvUser1, pvUser2);
-- 
GitLab


From 981177e4ddaa8dfcb14e87285d8dfdce30d7daba Mon Sep 17 00:00:00 2001
From: Notkea <pacien@users.noreply.github.com>
Date: Mon, 23 Sep 2019 21:51:26 +0200
Subject: [PATCH 0846/2254] nixos/postgresql-wal-receiver: remove restart limit
 (#67857)

useful in case of network disruption
---
 nixos/modules/services/backup/postgresql-wal-receiver.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/backup/postgresql-wal-receiver.nix b/nixos/modules/services/backup/postgresql-wal-receiver.nix
index d9a37037992..3d9869d5343 100644
--- a/nixos/modules/services/backup/postgresql-wal-receiver.nix
+++ b/nixos/modules/services/backup/postgresql-wal-receiver.nix
@@ -169,13 +169,14 @@ in {
     systemd.services = with attrsets; mapAttrs' (name: config: nameValuePair "postgresql-wal-receiver-${name}" {
       description = "PostgreSQL WAL receiver (${name})";
       wantedBy = [ "multi-user.target" ];
+      startLimitIntervalSec = 0; # retry forever, useful in case of network disruption
 
       serviceConfig = {
         User = "postgres";
         Group = "postgres";
         KillSignal = "SIGINT";
         Restart = "always";
-        RestartSec = 30;
+        RestartSec = 60;
       };
 
       inherit (config) environment;
-- 
GitLab


From 09dac43f3271bbae6bece130b58423ef53baa26d Mon Sep 17 00:00:00 2001
From: Kevin Rauscher <kevin.rauscher@tomahna.fr>
Date: Mon, 23 Sep 2019 21:55:46 +0200
Subject: [PATCH 0847/2254] mopidy: add setuptools to propagatedBuildInputs

---
 pkgs/applications/audio/mopidy/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix
index c574c862f52..a5248e2a89e 100644
--- a/pkgs/applications/audio/mopidy/default.nix
+++ b/pkgs/applications/audio/mopidy/default.nix
@@ -21,7 +21,7 @@ pythonPackages.buildPythonApplication rec {
   ];
 
   propagatedBuildInputs = with pythonPackages; [
-    gst-python pygobject3 pykka tornado_4 requests
+    gst-python pygobject3 pykka tornado_4 requests setuptools
   ] ++ stdenv.lib.optional (!stdenv.isDarwin) dbus-python;
 
   # There are no tests
-- 
GitLab


From 49e52b7ba5e41573be9d07086d3f3e342cfbfd85 Mon Sep 17 00:00:00 2001
From: Kevin Rauscher <kevin.rauscher@tomahna.fr>
Date: Mon, 9 Sep 2019 15:20:48 +0200
Subject: [PATCH 0848/2254] mopidy-iris: 3.39.0 -> 3.40.0

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

diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix
index 3a663fd33c8..90b81e1163d 100644
--- a/pkgs/applications/audio/mopidy/iris.nix
+++ b/pkgs/applications/audio/mopidy/iris.nix
@@ -2,11 +2,11 @@
 
 pythonPackages.buildPythonApplication rec {
   pname = "Mopidy-Iris";
-  version = "3.39.0";
+  version = "3.40.0";
 
   src = pythonPackages.fetchPypi {
     inherit pname version;
-    sha256 = "1d2g66gvm7yaz4nbxlh23lj2xfkhi3hsg2k646m1za510f8dzlag";
+    sha256 = "1cn68zmyvig114dsw7vhx761v9c1za3wnbq4y2z0f0cbl958n49v";
   };
 
   propagatedBuildInputs = [
-- 
GitLab


From 995a728684f13c3e69b6b13e9bb5cf3910fc534b Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Mon, 23 Sep 2019 22:08:07 +0200
Subject: [PATCH 0849/2254] pynac: 0.7.25 -> 0.7.26

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

diff --git a/pkgs/applications/science/math/pynac/default.nix b/pkgs/applications/science/math/pynac/default.nix
index 05c0c0e8ec6..4022383dbc7 100644
--- a/pkgs/applications/science/math/pynac/default.nix
+++ b/pkgs/applications/science/math/pynac/default.nix
@@ -9,14 +9,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.25";
+  version = "0.7.26";
   pname = "pynac";
 
   src = fetchFromGitHub {
     owner = "pynac";
     repo = "pynac";
     rev = "pynac-${version}";
-    sha256 = "0nnifvg6kzx0lq6gz7znind8g30v3d2pjfwgsdiks3vv9kv9nbj3";
+    sha256 = "09d2p74x1arkydlxy6pw4p4byi7r8q7f29w373h4d8a215kadc6d";
   };
 
   buildInputs = [
-- 
GitLab


From b11e628738385d2b9e5d50064452724f1cd253ee Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jaka@x-truder.net>
Date: Mon, 5 Aug 2019 12:34:21 +0200
Subject: [PATCH 0850/2254] telepresence: fix package

---
 pkgs/tools/networking/telepresence/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/telepresence/default.nix b/pkgs/tools/networking/telepresence/default.nix
index 7c883ebdc55..6bee7734f5a 100644
--- a/pkgs/tools/networking/telepresence/default.nix
+++ b/pkgs/tools/networking/telepresence/default.nix
@@ -11,7 +11,7 @@ let
       leaveDotGit = true;
     };
 
-    buildInputs = p.buildInputs ++ [ git ];
+    nativeBuildInputs = p.nativeBuildInputs ++ [ git ];
     postPatch = "rm sshuttle/tests/client/test_methods_nat.py";
     postInstall = "mv $out/bin/sshuttle $out/bin/sshuttle-telepresence";
   });
-- 
GitLab


From 02a1182de3f3700b4602a91c0ac82de5ea8818fe Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jaka@x-truder.net>
Date: Mon, 5 Aug 2019 12:35:20 +0200
Subject: [PATCH 0851/2254] telepresence: 0.93 -> 0.101

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

diff --git a/pkgs/tools/networking/telepresence/default.nix b/pkgs/tools/networking/telepresence/default.nix
index 6bee7734f5a..e6d427b2bcb 100644
--- a/pkgs/tools/networking/telepresence/default.nix
+++ b/pkgs/tools/networking/telepresence/default.nix
@@ -8,22 +8,22 @@ let
       url = "https://github.com/datawire/sshuttle.git";
       rev = "32226ff14d98d58ccad2a699e10cdfa5d86d6269";
       sha256 = "1q20lnljndwcpgqv2qrf1k0lbvxppxf98a4g5r9zd566znhcdhx3";
-      leaveDotGit = true;
     };
 
     nativeBuildInputs = p.nativeBuildInputs ++ [ git ];
+
     postPatch = "rm sshuttle/tests/client/test_methods_nat.py";
     postInstall = "mv $out/bin/sshuttle $out/bin/sshuttle-telepresence";
   });
 in pythonPackages.buildPythonPackage rec {
   pname = "telepresence";
-  version = "0.93";
+  version = "0.101";
 
   src = fetchFromGitHub {
     owner = "datawire";
     repo = "telepresence";
     rev = version;
-    sha256 = "1x8yjcqj8v35a5pxy2rxaixbznb4vk8ll958b4l46gnkfxf1kh1d";
+    sha256 = "1rxq22vcrw29682g7pdcwcjyifcg61z8y4my1di7yw731aldk274";
   };
 
   buildInputs = [ makeWrapper ];
-- 
GitLab


From 8e9febbcbb73e69494c8694d472a9e5ca30daa41 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jaka@x-truder.net>
Date: Sun, 11 Aug 2019 21:55:36 +0200
Subject: [PATCH 0852/2254] yubikey-personalization-gui: install man, desktop
 files and icons

---
 .../yubikey-personalization-gui/default.nix   | 24 +++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/yubikey-personalization-gui/default.nix b/pkgs/tools/misc/yubikey-personalization-gui/default.nix
index 5b0ad830b19..59685aa721a 100644
--- a/pkgs/tools/misc/yubikey-personalization-gui/default.nix
+++ b/pkgs/tools/misc/yubikey-personalization-gui/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, mkDerivation, pkgconfig, yubikey-personalization, qtbase, qmake, libyubikey }:
+{ stdenv, fetchurl, mkDerivation, pkgconfig, qtbase, qmake, imagemagick
+, libyubikey, yubikey-personalization }:
 
 mkDerivation rec {
   name = "yubikey-personalization-gui-3.1.25";
@@ -8,12 +9,27 @@ mkDerivation rec {
     sha256 = "1knyv5yss8lhzaff6jpfqv12fjf1b8b21mfxzx3qi0hw4nl8n2v8";
   };
 
-  nativeBuildInputs = [ pkgconfig qmake ];
+  nativeBuildInputs = [ pkgconfig qmake imagemagick ];
   buildInputs = [ yubikey-personalization qtbase libyubikey ];
 
   installPhase = ''
-    mkdir -p $out/bin
-    cp build/release/yubikey-personalization-gui $out/bin
+    install -D -m0755 build/release/yubikey-personalization-gui "$out/bin/yubikey-personalization-gui"
+    install -D -m0644 resources/lin/yubikey-personalization-gui.1 "$out/share/man/man1/yubikey-personalization-gui.1"
+
+    # Desktop files
+    install -D -m0644 resources/lin/yubikey-personalization-gui.desktop "$out/share/applications/yubikey-personalization-gui.desktop"
+    install -D -m0644 resources/lin/yubikey-personalization-gui.desktop "$out/share/pixmaps/yubikey-personalization-gui.xpm"
+
+    # Icons
+    install -D -m0644 resources/lin/yubikey-personalization-gui.png "$out/share/icons/hicolor/128x128/apps/yubikey-personalization-gui.png"
+    for SIZE in 16 24 32 48 64 96; do
+      # set modify/create for reproducible builds
+      convert -scale ''${SIZE} +set date:create +set date:modify \
+        resources/lin/yubikey-personalization-gui.png \
+        yubikey-personalization-gui.png
+
+      install -D -m0644 yubikey-personalization-gui.png "$out/share/icons/hicolor/''${SIZE}x''${SIZE}/apps/yubikey-personalization-gui.png"
+    done
   '';
 
   meta = with stdenv.lib; {
-- 
GitLab


From fbd3e7b9e5d09c94d1ff44105770139e209ac538 Mon Sep 17 00:00:00 2001
From: Filipe Regadas <filiperegadas@gmail.com>
Date: Mon, 23 Sep 2019 22:22:55 +0100
Subject: [PATCH 0853/2254] Update sbt to 1.3.2

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

diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix
index d32eba51ce1..52c5f42c15d 100644
--- a/pkgs/development/tools/build-managers/sbt/default.nix
+++ b/pkgs/development/tools/build-managers/sbt/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   pname = "sbt";
-  version = "1.2.8";
+  version = "1.3.2";
 
   src = fetchurl {
     urls = [
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
       "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"
       "https://cocl.us/sbt-${version}.tgz"
     ];
-    sha256 = "0n7yghnb1q3lyjpv721znvslk5lwib7y84mxwz66yv8p84jj3fcv";
+    sha256 = "1ncjc4yrnhp2kc5xw3ismnyx5n71541760rzs81hxi8x8vi36x5b";
   };
 
   patchPhase = ''
-- 
GitLab


From c52f723d5e6edc77d37a837ea14ca7134090558d Mon Sep 17 00:00:00 2001
From: MetaDark <kira.bruneau@gmail.com>
Date: Mon, 23 Sep 2019 17:42:31 -0400
Subject: [PATCH 0854/2254] protontricks: 1.2.4 -> 1.2.5

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

diff --git a/pkgs/tools/package-management/protontricks/default.nix b/pkgs/tools/package-management/protontricks/default.nix
index 2683192c89e..24301fc76d8 100644
--- a/pkgs/tools/package-management/protontricks/default.nix
+++ b/pkgs/tools/package-management/protontricks/default.nix
@@ -4,13 +4,13 @@
 
 buildPythonApplication rec {
   pname = "protontricks";
-  version = "1.2.4";
+  version = "1.2.5";
 
   src = fetchFromGitHub {
     owner = "Matoking";
     repo = pname;
     rev = version;
-    sha256 = "0kwf2m62v4w7ds9y2fpcb8scazirkj114rn8y0ak62ph7lav8ma4";
+    sha256 = "1nkhp1mnvah7zkc1s55jji9lxxbph1miw8dfl9kb72khmaqfzsf0";
   };
 
   propagatedBuildInputs = [ vdf ];
-- 
GitLab


From 8df713999656f118a65a26275fea6b9143da0d76 Mon Sep 17 00:00:00 2001
From: Mitsuhiro Nakamura <m.nacamura@gmail.com>
Date: Tue, 24 Sep 2019 07:23:25 +0900
Subject: [PATCH 0855/2254] r-randomForest: fix build on Darwin

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 1616eacffc6..444a249d2c0 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -447,6 +447,7 @@ let
     mnormt = [ pkgs.libiconv ];
     phangorn = [ pkgs.libiconv ];
     quadprog = [ pkgs.libiconv ];
+    randomForest = [ pkgs.libiconv ];
     sundialr = [ pkgs.libiconv ];
   };
 
-- 
GitLab


From 3001a1f3ffe787b5dea79afdaf157c2772e564ef Mon Sep 17 00:00:00 2001
From: Mitsuhiro Nakamura <m.nacamura@gmail.com>
Date: Tue, 24 Sep 2019 07:59:04 +0900
Subject: [PATCH 0856/2254] r-pan: fix build on Darwin

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 1616eacffc6..f4c26d07322 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -445,6 +445,7 @@ let
     ape = [ pkgs.libiconv ];
     expm = [ pkgs.libiconv ];
     mnormt = [ pkgs.libiconv ];
+    pan = [ pkgs.libiconv ];
     phangorn = [ pkgs.libiconv ];
     quadprog = [ pkgs.libiconv ];
     sundialr = [ pkgs.libiconv ];
-- 
GitLab


From aefe6bc2e11da32172e44171127e7c7fc17de26a Mon Sep 17 00:00:00 2001
From: Mitsuhiro Nakamura <m.nacamura@gmail.com>
Date: Tue, 24 Sep 2019 08:06:26 +0900
Subject: [PATCH 0857/2254] r-minqa: fix build on Darwin

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 1616eacffc6..60ffe115c15 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -441,6 +441,7 @@ let
     nlme = [ pkgs.libiconv ];
     Matrix = [ pkgs.libiconv ];
     mgcv = [ pkgs.libiconv ];
+    minqa = [ pkgs.libiconv ];
     igraph = [ pkgs.libiconv ];
     ape = [ pkgs.libiconv ];
     expm = [ pkgs.libiconv ];
-- 
GitLab


From 544b85a49abb1dd4278c5f83ec9ce56bdeca459d Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 3 Jul 2019 21:36:26 -0500
Subject: [PATCH 0858/2254] mimalloc: init at 1.0.8

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../libraries/mimalloc/default.nix            | 46 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 48 insertions(+)
 create mode 100644 pkgs/development/libraries/mimalloc/default.nix

diff --git a/pkgs/development/libraries/mimalloc/default.nix b/pkgs/development/libraries/mimalloc/default.nix
new file mode 100644
index 00000000000..728b4117676
--- /dev/null
+++ b/pkgs/development/libraries/mimalloc/default.nix
@@ -0,0 +1,46 @@
+{ stdenv, fetchFromGitHub, cmake
+, secureBuild ? true
+}:
+
+let
+  soext = stdenv.hostPlatform.extensions.sharedLibrary;
+in
+stdenv.mkDerivation rec {
+  name    = "mimalloc-${version}";
+  version = "1.0.8";
+
+  src = fetchFromGitHub {
+    owner  = "microsoft";
+    repo   = "mimalloc";
+    rev    = "refs/tags/v${version}";
+    sha256 = "04k2d3x84q2jfqdjxngy98hlw6czmigsqlf7gi3mhs6682n127r5";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  enableParallelBuilding = true;
+
+  cmakeFlags = stdenv.lib.optional secureBuild [ "-DMI_SECURE=ON" ];
+
+  postInstall = ''
+    mkdir -p $dev
+    mv $out/lib/*/include $dev/include
+
+    rm -f $out/lib/libmimalloc*${soext} # weird duplicate
+
+    mv $out/lib/*/libmimalloc*${soext} $out/lib/libmimalloc${soext}
+    mv $out/lib/*/libmimalloc*.a       $out/lib/libmimalloc.a
+    mv $out/lib/*/mimalloc*.o          $out/lib/mimalloc.o
+
+    rm -rf $out/lib/mimalloc-*
+  '';
+
+  outputs = [ "out" "dev" ];
+
+  meta = with stdenv.lib; {
+    description = "Compact, fast, general-purpose memory allocator";
+    homepage    = "https://github.com/microsoft/mimalloc";
+    license     = licenses.bsd2;
+    platforms   = platforms.unix;
+    maintainers = with maintainers; [ thoughtpolice ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4b95d340af8..3fa376c4512 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12700,6 +12700,8 @@ in
 
   microsoft_gsl = callPackage ../development/libraries/microsoft_gsl { };
 
+  mimalloc = callPackage ../development/libraries/mimalloc { };
+
   minizip = callPackage ../development/libraries/minizip { };
 
   mkvtoolnix = libsForQt5.callPackage ../applications/video/mkvtoolnix { };
-- 
GitLab


From 8d64b03b0c8e9e65467a69b58a7895283495313e Mon Sep 17 00:00:00 2001
From: Mitsuhiro Nakamura <m.nacamura@gmail.com>
Date: Tue, 24 Sep 2019 09:36:22 +0900
Subject: [PATCH 0859/2254] r-ucminf: fix build on Darwin

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 1616eacffc6..35eddb6caca 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -448,6 +448,7 @@ let
     phangorn = [ pkgs.libiconv ];
     quadprog = [ pkgs.libiconv ];
     sundialr = [ pkgs.libiconv ];
+    ucminf = [ pkgs.libiconv ];
   };
 
   packagesRequireingX = [
-- 
GitLab


From 54c8da078781e9d85c395d0d2c05b215f7f7924f Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Tue, 24 Sep 2019 01:45:14 +0000
Subject: [PATCH 0860/2254] firefoxPackages.tor-browser: 8.5.4 -> 8.5.6

---
 .../networking/browsers/firefox/packages.nix         | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 3e8cf4d66b9..080e582cd4f 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -265,17 +265,17 @@ in rec {
     gtk3Support = false;
   };
 
-  tor-browser-8-5 = tbcommon {
-    ffversion = "60.8.0esr";
-    tbversion = "8.5.4";
+  tor-browser-8-5 = tbcommon rec {
+    ffversion = "60.9.0esr";
+    tbversion = "8.5.6";
 
     # FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb
     src = fetchFromGitHub {
       owner = "SLNOS";
       repo  = "tor-browser";
-      # branch "tor-browser-60.8.0esr-8.5-1-slnos"
-      rev   = "9ec7e4832a68ba3a77f5e8e21dc930a25757f55d";
-      sha256 = "10x9h2nm1p8cs0qnd8yjp7ly5raxagqyfjn4sj2y3i86ya5zygb9";
+      # branch "tor-browser-60.9.0esr-8.5-2-slnos"
+      rev   = "0489ae3158cd8c0e16c2e78b94083d8cbf0209dc";
+      sha256 = "0y5s7d8pg8ak990dp8d801j9823igaibfhv9hsa79nib5yllifzs";
     };
 
     patches = [
-- 
GitLab


From f82334b97f70bc4a84494c88a880655c879b6a8e Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 23 Sep 2019 16:49:22 +0800
Subject: [PATCH 0861/2254] pythonPackages.impacket: init at 0.9.15

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

diff --git a/pkgs/development/python-modules/impacket/default.nix b/pkgs/development/python-modules/impacket/default.nix
new file mode 100644
index 00000000000..e4e14cf7bbf
--- /dev/null
+++ b/pkgs/development/python-modules/impacket/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildPythonPackage, fetchPypi, isPy3k }:
+
+buildPythonPackage rec {
+  pname = "impacket";
+  version = "0.9.15";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1sq1698g7wqj731h24f7gr4lc0fz0mxrqv6mm3j4hm2j6h3rrbr6";
+  };
+
+  disabled = isPy3k;
+
+  # no tests
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Network protocols Constructors and Dissectors";
+    homepage = "https://github.com/CoreSecurity/impacket";
+    # Modified Apache Software License, Version 1.1
+    license = licenses.free;
+    maintainers = with maintainers; [ peterhoeg ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8f9f0d6627c..1c5aae216d0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1898,6 +1898,8 @@ in {
 
   eth-utils = callPackage ../development/python-modules/eth-utils { };
 
+  impacket = callPackage ../development/python-modules/impacket { };
+
   jsonrpc-async = callPackage ../development/python-modules/jsonrpc-async { };
 
   jsonrpc-base = callPackage ../development/python-modules/jsonrpc-base { };
-- 
GitLab


From ffe12af49a1dfa8a9b18cddb665b1b824736493d Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 19 Mar 2018 18:50:00 +0800
Subject: [PATCH 0862/2254] py-wmi-client: init at unstable-20160601

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

diff --git a/pkgs/tools/networking/py-wmi-client/default.nix b/pkgs/tools/networking/py-wmi-client/default.nix
new file mode 100644
index 00000000000..7a277400289
--- /dev/null
+++ b/pkgs/tools/networking/py-wmi-client/default.nix
@@ -0,0 +1,25 @@
+{ lib, pythonPackages, fetchFromGitHub }:
+
+pythonPackages.buildPythonApplication rec {
+  pname = "py-wmi-client";
+  version = "unstable-20160601";
+
+  src = fetchFromGitHub {
+    owner = "dlundgren";
+    repo = pname;
+    rev = "9702b036df85c3e0ecdde84a753b353069f58208";
+    sha256 = "1kd12gi1knqv477f1shzqr0h349s5336vzp3fpfp3xl0b502ld8d";
+  };
+
+  propagatedBuildInputs = with pythonPackages; [ impacket natsort pyasn1 pycrypto ];
+
+  # no tests
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Python WMI Client implementation";
+    homepage = "https://github.com/dlundgren/py-wmi-client";
+    license = licenses.mit;
+    maintainers = with maintainers; [ peterhoeg ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 69b87aaf383..2e58b34c01a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24211,6 +24211,8 @@ in
 
   qMasterPassword = libsForQt5.callPackage ../applications/misc/qMasterPassword { };
 
+  py-wmi-client = callPackage ../tools/networking/py-wmi-client { };
+
   redprl = callPackage ../applications/science/logic/redprl { };
 
   retroarchBare = callPackage ../misc/emulators/retroarch {
-- 
GitLab


From 7f0c4d326b858bb1c36f2172c8ebdc7d1a4d7ff6 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 23 Sep 2019 16:51:01 +0800
Subject: [PATCH 0863/2254] check-wmiplus: init at 1.64

---
 .../monitoring/plugins/wmiplus/default.nix    | 77 +++++++++++++++++++
 .../plugins/wmiplus/wmiplus_fix_manpage.patch | 40 ++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 119 insertions(+)
 create mode 100644 pkgs/servers/monitoring/plugins/wmiplus/default.nix
 create mode 100644 pkgs/servers/monitoring/plugins/wmiplus/wmiplus_fix_manpage.patch

diff --git a/pkgs/servers/monitoring/plugins/wmiplus/default.nix b/pkgs/servers/monitoring/plugins/wmiplus/default.nix
new file mode 100644
index 00000000000..9a4e5d706e9
--- /dev/null
+++ b/pkgs/servers/monitoring/plugins/wmiplus/default.nix
@@ -0,0 +1,77 @@
+{ stdenv, fetchFromGitHub, makeWrapper, perlPackages, txt2man
+, monitoring-plugins
+, wmic-bin ? null }:
+
+stdenv.mkDerivation rec {
+  pname = "check-wmiplus";
+  version = "1.64";
+
+  # We fetch from github.com instead of the proper upstream as nix-build errors
+  # out with 406 when trying to fetch the sources
+  src = fetchFromGitHub {
+    owner = "speartail";
+    repo = "checkwmiplus";
+    rev = "v${version}";
+    sha256 = "1m36rd2wnc5dk4mm9q4ch67w19144dl112p9s6lhc1sh6h25ln6r";
+  };
+
+  patches = [
+    ./wmiplus_fix_manpage.patch
+  ];
+
+  propagatedBuildInputs = with perlPackages; [
+    BHooksEndOfScope ClassDataInheritable ClassInspector ClassSingleton
+    ConfigIniFiles DateTime DateTimeLocale DateTimeTimeZone DevelStackTrace
+    EvalClosure ExceptionClass FileShareDir ModuleImplementation ModuleRuntime
+    MROCompat namespaceautoclean namespaceclean NumberFormat PackageStash
+    ParamsValidate ParamsValidationCompiler RoleTiny Specio
+    SubExporterProgressive SubIdentify TryTiny
+  ];
+
+  nativeBuildInputs = [ makeWrapper txt2man ];
+
+  dontConfigure = true;
+  dontBuild = true;
+  doCheck = false; # no checks
+
+  postPatch = ''
+    substituteInPlace check_wmi_plus.pl \
+      --replace /usr/bin/wmic                      ${wmic-bin}/bin/wmic \
+      --replace /etc/check_wmi_plus                $out/etc/check_wmi_plus \
+      --replace /opt/nagios/bin/plugins            $out/etc/check_wmi_plus \
+      --replace /usr/lib/nagios/plugins            ${monitoring-plugins}/libexec \
+      --replace '$base_dir/check_wmi_plus_help.pl' "$out/bin/check_wmi_plus_help.pl"
+
+    for f in *.pl ; do
+      substituteInPlace $f --replace /usr/bin/perl ${perlPackages.perl}/bin/perl
+    done
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm755 -t $out/bin *.pl
+    install -Dm644 -t $out/share/doc/${pname} *.txt
+    cp -r etc $out/
+
+    runHook postInstall
+  '';
+
+  # 1. we need to wait until the main binary has been fixed up with proper perl paths before we can run it to generate the man page
+  # 2. txt2man returns exit code 3 even if it works, so we add the || true bit
+  postFixup = ''
+    wrapProgram $out/bin/check_wmi_plus.pl \
+      --set PERL5LIB "${perlPackages.makePerlPath propagatedBuildInputs}"
+
+    mkdir -p $out/share/man/man1
+    $out/bin/check_wmi_plus.pl --help | txt2man -d 1970-01-01 -s 1 -t check_wmi_plus -r "Check WMI Plus ${version}" > $out/share/man/man1/check_wmi_plus.1 || true
+    gzip $out/share/man/man1/check_wmi_plus.1
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A sensu/nagios plugin using WMI to query Windows hosts";
+    homepage = "http://edcint.co.nz/checkwmiplus";
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ peterhoeg ];
+  };
+}
diff --git a/pkgs/servers/monitoring/plugins/wmiplus/wmiplus_fix_manpage.patch b/pkgs/servers/monitoring/plugins/wmiplus/wmiplus_fix_manpage.patch
new file mode 100644
index 00000000000..16e81d1014d
--- /dev/null
+++ b/pkgs/servers/monitoring/plugins/wmiplus/wmiplus_fix_manpage.patch
@@ -0,0 +1,40 @@
+diff --git a/check_wmi_plus.makeman.sh b/check_wmi_plus.makeman.sh
+index 38dc7a4..3fe4369 100755
+--- a/check_wmi_plus.makeman.sh
++++ b/check_wmi_plus.makeman.sh
+@@ -19,15 +19,6 @@ mkdir -p "$manpage_dir/man1"
+ # the full path to the manpage file
+ manfile="$manpage_dir/man1/check_wmi_plus.1"
+ 
+-# if we are not running in a terminal then only show the text-based help
+-if [ ! -t 0 ]; then
+-   # we are not running in a terminal
+-   echo "Not running in a terminal - showing text-based help"
+-   echo
+-   exec $check_wmi_plus_text_help
+-fi
+-
+-
+ usage()
+ {
+ cat << EOT
+diff --git a/check_wmi_plus_help.pl b/check_wmi_plus_help.pl
+index 3440db2..2982da2 100755
+--- a/check_wmi_plus_help.pl
++++ b/check_wmi_plus_help.pl
+@@ -24,7 +24,7 @@ if ($opt_help) {
+       # we have the script to make the manpage and have not been asked to show text only help
+       exec ("$make_manpage_script \"$0 --itexthelp\" \"$manpage_dir\"") or print STDERR "couldn't exec $make_manpage_script: $!";
+    } else {
+-      print "Warning: Can not access/execute Manpage script ($make_manpage_script).\nShowing help in text-only format.\n\n";
++     # print "Warning: Can not access/execute Manpage script ($make_manpage_script).\nShowing help in text-only format.\n\n";
+    }
+ }
+ 
+@@ -692,4 +692,4 @@ show_ini_help_overview(1);
+ finish_program($ERRORS{'UNKNOWN'});
+ }
+ 
+-1;
+\ No newline at end of file
++1;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6e4e3ba468e..65938b49bdd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15178,6 +15178,8 @@ in
     sensu-go-backend
     sensu-go-cli;
 
+  check-wmiplus = callPackage ../servers/monitoring/plugins/wmiplus { };
+
   uchiwa = callPackage ../servers/monitoring/uchiwa { };
 
   shishi = callPackage ../servers/shishi {
-- 
GitLab


From 5eded456d013b579dbb46005b4d3f8cd8119b1da Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sat, 21 Sep 2019 20:40:04 +0800
Subject: [PATCH 0864/2254] thc-hydra: 8.5 -> 9.0

---
 pkgs/tools/security/thc-hydra/default.nix | 39 +++++++++++++----------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/pkgs/tools/security/thc-hydra/default.nix b/pkgs/tools/security/thc-hydra/default.nix
index 252d73b479b..aa36901e46b 100644
--- a/pkgs/tools/security/thc-hydra/default.nix
+++ b/pkgs/tools/security/thc-hydra/default.nix
@@ -1,30 +1,37 @@
-{ stdenv, lib, fetchurl, zlib, openssl, ncurses, libidn, pcre, libssh, mysql, postgresql
+{ stdenv, lib, fetchFromGitHub, zlib, openssl, ncurses, libidn, pcre, libssh, libmysqlclient, postgresql
 , withGUI ? false, makeWrapper, pkgconfig, gtk2 }:
 
-let
-  makeDirs = output: subDir: pkgs: lib.concatStringsSep " " (map (path: lib.getOutput output path + "/" + subDir) pkgs);
-
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "thc-hydra";
-  version = "8.5";
+  version = "9.0";
 
-  src = fetchurl {
-    url = "http://www.thc.org/releases/hydra-${version}.tar.gz";
-    sha256 = "0vfx6xwmw0r7nd0s232y7rckcj58fc1iqjgp4s56rakpz22b4yjm";
+  src = fetchFromGitHub {
+    owner = "vanhauser-thc";
+    repo = "thc-hydra";
+    rev = "v${version}";
+    sha256 = "09d2f55wky1iabnl871d4r6dyyvr8zhp47d9j1p6d0pvdv93kl4z";
   };
 
-  preConfigure = ''
+  postPatch = let
+    makeDirs = output: subDir: lib.concatStringsSep " " (map (path: lib.getOutput output path + "/" + subDir) buildInputs);
+  in ''
     substituteInPlace configure \
-      --replace "\$LIBDIRS" "${makeDirs "lib" "lib" buildInputs}" \
-      --replace "\$INCDIRS" "${makeDirs "dev" "include" buildInputs}" \
+      --replace '$LIBDIRS' "${makeDirs "lib" "lib"}" \
+      --replace '$INCDIRS' "${makeDirs "dev" "include"}" \
       --replace "/usr/include/math.h" "${lib.getDev stdenv.cc.libc}/include/math.h" \
       --replace "libcurses.so" "libncurses.so" \
       --replace "-lcurses" "-lncurses"
   '';
 
   nativeBuildInputs = lib.optionals withGUI [ pkgconfig makeWrapper ];
-  buildInputs = [ zlib openssl ncurses libidn pcre libssh mysql.connector-c postgresql ]
-                ++ lib.optional withGUI gtk2;
+
+  buildInputs = [
+    zlib openssl ncurses libidn pcre libssh libmysqlclient postgresql
+  ] ++ lib.optional withGUI gtk2;
+
+  enableParallelBuilding = true;
+
+  DATADIR = "/share/${pname}";
 
   postInstall = lib.optionalString withGUI ''
     wrapProgram $out/bin/xhydra \
@@ -33,9 +40,9 @@ in stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A very fast network logon cracker which support many different services";
+    homepage = "https://www.thc.org/thc-hydra/";
     license = licenses.agpl3;
-    homepage = https://www.thc.org/thc-hydra/;
-    maintainers = with maintainers; [offline];
+    maintainers = with maintainers; [ offline ];
     platforms = platforms.linux;
   };
 }
-- 
GitLab


From a5872e8bde58efe529357260a083933fcac6ac39 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 28 May 2018 13:50:05 +0800
Subject: [PATCH 0865/2254] hyperv-daemons: fix binary location to stop error
 log spam

---
 .../linux/hyperv-daemons/default.nix          | 37 +++++++++++--------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/pkgs/os-specific/linux/hyperv-daemons/default.nix b/pkgs/os-specific/linux/hyperv-daemons/default.nix
index a209f1ab4bb..1a111a295a4 100644
--- a/pkgs/os-specific/linux/hyperv-daemons/default.nix
+++ b/pkgs/os-specific/linux/hyperv-daemons/default.nix
@@ -1,7 +1,10 @@
-{ stdenv, lib, python, kernel, makeWrapper, writeText }:
+{ stdenv, lib, python, kernel, makeWrapper, writeText
+, gawk, iproute }:
 
 let
-  daemons = stdenv.mkDerivation {
+  libexec = "libexec/hypervkvpd";
+
+  daemons = stdenv.mkDerivation rec {
     pname = "hyperv-daemons-bin";
     inherit (kernel) src version;
 
@@ -10,10 +13,15 @@ let
     # as of 4.9 compilation will fail due to -Werror=format-security
     hardeningDisable = [ "format" ];
 
-    preConfigure = ''
+    postPatch = ''
       cd tools/hv
+      substituteInPlace hv_kvp_daemon.c \
+        --replace /usr/libexec/hypervkvpd/ $out/${libexec}/
     '';
 
+    # We don't actually need the hv_get_{dhcp,dns}_info scripts on NixOS in
+    # their current incarnation but with them in place, we stop the spam of
+    # errors in the log.
     installPhase = ''
       runHook preInstall
 
@@ -21,7 +29,9 @@ let
         install -Dm755 hv_''${f}_daemon -t $out/bin
       done
 
-      install -Dm755 hv_get_dns_info.sh lsvmbus -t $out/bin
+      install -Dm755 lsvmbus             $out/bin/lsvmbus
+      install -Dm755 hv_get_dhcp_info.sh $out/${libexec}/hv_get_dhcp_info
+      install -Dm755 hv_get_dns_info.sh  $out/${libexec}/hv_get_dns_info
 
       # I don't know why this isn't being handled automatically by fixupPhase
       substituteInPlace $out/bin/lsvmbus \
@@ -31,8 +41,8 @@ let
     '';
 
     postFixup = ''
-      # kvp needs to be able to find the script(s)
-      wrapProgram $out/bin/hv_kvp_daemon --prefix PATH : $out/bin
+      wrapProgram $out/bin/hv_kvp_daemon \
+        --prefix PATH : $out/bin:${lib.makeBinPath [ gawk iproute ]}
     '';
   };
 
@@ -56,24 +66,19 @@ let
 
 in stdenv.mkDerivation {
   pname = "hyperv-daemons";
-
   inherit (kernel) version;
 
   # we just stick the bins into out as well as it requires "out"
   outputs = [ "bin" "lib" "out" ];
 
-  phases = [ "installPhase" ];
-
   buildInputs = [ daemons ];
 
-  installPhase = ''
+  buildCommand = ''
     system=$lib/lib/systemd/system
 
-    mkdir -p $system
-
-    cp ${service "fcopy" "file copy (FCOPY)" "hv_fcopy" } $system/hv-fcopy.service
-    cp ${service "kvp"   "key-value pair (KVP)"     ""  } $system/hv-kvp.service
-    cp ${service "vss"   "volume shadow copy (VSS)" ""  } $system/hv-vss.service
+    install -Dm444 ${service "fcopy" "file copy (FCOPY)" "hv_fcopy" } $system/hv-fcopy.service
+    install -Dm444 ${service "kvp"   "key-value pair (KVP)"     ""  } $system/hv-kvp.service
+    install -Dm444 ${service "vss"   "volume shadow copy (VSS)" ""  } $system/hv-vss.service
 
     cat > $system/hyperv-daemons.target <<EOF
     [Unit]
@@ -102,7 +107,7 @@ in stdenv.mkDerivation {
       Microsoft calls their guest agents "Integration Services" which is why
       we use that name here.
     '';
-    homepage = https://kernel.org;
+    homepage = "https://kernel.org";
     maintainers = with maintainers; [ peterhoeg ];
     platforms = kernel.meta.platforms;
   };
-- 
GitLab


From 9c427a0c1e5b0384fe02919c96bc3d3199cbd93e Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 24 Sep 2019 05:53:06 +0000
Subject: [PATCH 0866/2254] =?UTF-8?q?ocamlformat:=200.8=20=E2=86=92=200.11?=
 =?UTF-8?q?.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tools/ocaml/ocamlformat/default.nix       | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/tools/ocaml/ocamlformat/default.nix b/pkgs/development/tools/ocaml/ocamlformat/default.nix
index 694f4b6e89a..4eb1cc858ad 100644
--- a/pkgs/development/tools/ocaml/ocamlformat/default.nix
+++ b/pkgs/development/tools/ocaml/ocamlformat/default.nix
@@ -1,35 +1,33 @@
-{ stdenv, fetchFromGitHub, ocamlPackages }:
+{ lib, fetchFromGitHub, ocamlPackages }:
 
 with ocamlPackages; buildDunePackage rec {
   pname = "ocamlformat";
-  version = "0.8";
+  version = "0.11.0";
 
-  minimumOCamlVersion = "4.05";
+  minimumOCamlVersion = "4.06";
 
   src = fetchFromGitHub {
     owner = "ocaml-ppx";
     repo = pname;
     rev = version;
-    sha256 = "1i7rsbs00p43362yv7z7dw0qsnv7vjf630qk676qvfg7kg422w6j";
+    sha256 = "0zvjn71jd4d3znnpgh0yphb2w8ggs457b6bl6cg1fmpdgxnds6yx";
   };
 
   buildInputs = [
-    base
     cmdliner
     fpath
     ocaml-migrate-parsetree
+    odoc
+    re
     stdio
+    uuseg
+    uutf
   ];
 
-  configurePhase = ''
-    patchShebangs tools/gen_version.sh
-    tools/gen_version.sh src/Version.ml version
-  '';
-
   meta = {
     inherit (src.meta) homepage;
     description = "Auto-formatter for OCaml code";
-    maintainers = [ stdenv.lib.maintainers.Zimmi48 ];
-    license = stdenv.lib.licenses.mit;
+    maintainers = [ lib.maintainers.Zimmi48 ];
+    license = lib.licenses.mit;
   };
 }
-- 
GitLab


From afd04a49ed4d03923adf51352ce2bce1fa72455d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Tue, 24 Sep 2019 08:10:03 +0200
Subject: [PATCH 0867/2254] Revert "awscli: Get rid of runtime -dev
 dependencies"

This reverts commit c8bc18bcc21c14e3d64f4c7b8f44c36e188efc1f.
Moving to staging - it's quite a large rebuild (7-8k per platform),
which probably wasn't noticed; the change doesn't seem urgent.
---
 pkgs/development/python-modules/botocore/default.nix   | 2 --
 pkgs/development/python-modules/s3transfer/default.nix | 2 +-
 pkgs/development/python-modules/urllib3/default.nix    | 2 --
 pkgs/tools/admin/awscli/default.nix                    | 6 +-----
 4 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix
index e1465e86b0e..5c8b00fc6c1 100644
--- a/pkgs/development/python-modules/botocore/default.nix
+++ b/pkgs/development/python-modules/botocore/default.nix
@@ -19,8 +19,6 @@ buildPythonPackage rec {
     sha256 = "19ls7hdmcaqrrq8przqy05s8chsy8315ic2zg185k6m64pvr0qhd";
   };
 
-  outputs = [ "out" "dev" ];
-
   propagatedBuildInputs = [
     dateutil
     jmespath
diff --git a/pkgs/development/python-modules/s3transfer/default.nix b/pkgs/development/python-modules/s3transfer/default.nix
index 0c227bc6377..7589d0fce73 100644
--- a/pkgs/development/python-modules/s3transfer/default.nix
+++ b/pkgs/development/python-modules/s3transfer/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     sha256 = "f23d5cb7d862b104401d9021fc82e5fa0e0cf57b7660a1331425aab0c691d021";
   };
 
-  outputs = [ "out" "dev" ];
+  foo = 1;
 
   propagatedBuildInputs =
     [ botocore
diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix
index e50d90266bf..d951e436480 100644
--- a/pkgs/development/python-modules/urllib3/default.nix
+++ b/pkgs/development/python-modules/urllib3/default.nix
@@ -11,8 +11,6 @@ buildPythonPackage rec {
     sha256 = "2393a695cd12afedd0dcb26fe5d50d0cf248e5a66f75dbd89a3d4eb333a61af4";
   };
 
-  outputs = [ "out" "dev" ];
-
   NOSE_EXCLUDE = stdenv.lib.concatStringsSep "," [
     "test_headers" "test_headerdict" "test_can_validate_ip_san" "test_delayed_body_read_timeout"
     "test_timeout_errors_cause_retries" "test_select_multiple_interrupts_with_event"
diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix
index 7e3e0c9fff0..33526ba11df 100644
--- a/pkgs/tools/admin/awscli/default.nix
+++ b/pkgs/tools/admin/awscli/default.nix
@@ -38,7 +38,7 @@ in py.pkgs.buildPythonApplication rec {
   # No tests included
   doCheck = false;
 
-  pythonPath = with py.pkgs; [
+  propagatedBuildInputs = with py.pkgs; [
     botocore
     bcdoc
     s3transfer
@@ -49,10 +49,6 @@ in py.pkgs.buildPythonApplication rec {
     pyyaml
     groff
     less
-    urllib3
-    dateutil
-    jmespath
-    futures
   ];
 
   postInstall = ''
-- 
GitLab


From e4108becbe72070fa027dbe72ff1f704352d4139 Mon Sep 17 00:00:00 2001
From: Bruno Bzeznik <Bruno.Bzeznik@imag.fr>
Date: Fri, 14 Jun 2019 10:23:37 +0200
Subject: [PATCH 0868/2254] macse: init at 2.03

---
 .../science/biology/macse/default.nix         | 32 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/applications/science/biology/macse/default.nix

diff --git a/pkgs/applications/science/biology/macse/default.nix b/pkgs/applications/science/biology/macse/default.nix
new file mode 100644
index 00000000000..59938addbe8
--- /dev/null
+++ b/pkgs/applications/science/biology/macse/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, jre, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  pname = "macse";
+  version = "2.03";
+
+  src = fetchurl {
+    url = "https://bioweb.supagro.inra.fr/${pname}/releases/${pname}_v${version}.jar";
+    sha256 = "0jnjyz4f255glg37rawzdv4m6nfs7wfwc5dny7afvx4dz2sv4ssh";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  dontBuild = true;
+  unpackPhase = ":";
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/share/java
+    cp -s $src $out/share/java/macse.jar
+    makeWrapper ${jre}/bin/java $out/bin/macse --add-flags "-jar $out/share/java/macse.jar"
+    runHook postInstall
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Multiple alignment of coding sequences";
+    homepage = "https://bioweb.supagro.inra.fr/macse/";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.bzizou ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1a9a1c54b3a..6955aa8d79f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21898,6 +21898,8 @@ in
 
   kallisto = callPackage ../applications/science/biology/kallisto { };
 
+  macse = callPackage ../applications/science/biology/macse { };
+
   migrate = callPackage ../applications/science/biology/migrate { };
 
   mirtk = callPackage ../development/libraries/science/biology/mirtk { };
-- 
GitLab


From aad639d8f105639a6aafce252c4ae8126ef91130 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Tue, 24 Sep 2019 08:22:39 +0200
Subject: [PATCH 0869/2254] terra: fix evaluation on darwin

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

diff --git a/pkgs/development/compilers/terra/default.nix b/pkgs/development/compilers/terra/default.nix
index 6d87d4bbd49..63557d61019 100644
--- a/pkgs/development/compilers/terra/default.nix
+++ b/pkgs/development/compilers/terra/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
       --replace '-lcurses' '-lncurses'
 
     substituteInPlace src/terralib.lua \
-      --subst-var-by NIX_LIBC_INCLUDE ${stdenv.cc.libc.dev}/include
+      --subst-var-by NIX_LIBC_INCLUDE ${stdenv.lib.getDev stdenv.cc.libc}/include
   '';
 
   preBuild = ''
-- 
GitLab


From 5426932f7c664a8765d6904af20ef21310e95d4f Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Tue, 24 Sep 2019 14:53:21 +0800
Subject: [PATCH 0870/2254] check-openvpn: init at 0.0.1 (#69301)

* check-openvpn: init at 0.0.1
---
 pkgs/servers/monitoring/plugins/openvpn.nix | 22 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/servers/monitoring/plugins/openvpn.nix

diff --git a/pkgs/servers/monitoring/plugins/openvpn.nix b/pkgs/servers/monitoring/plugins/openvpn.nix
new file mode 100644
index 00000000000..2b7e69ab8f0
--- /dev/null
+++ b/pkgs/servers/monitoring/plugins/openvpn.nix
@@ -0,0 +1,22 @@
+{ lib, fetchFromGitHub, python3Packages }:
+
+python3Packages.buildPythonApplication rec {
+  pname = "check-openvpn";
+  version = "0.0.1";
+
+  src = fetchFromGitHub {
+    owner = "liquidat";
+    repo = "nagios-icinga-openvpn";
+    rev = version;
+    sha256 = "1vz3p7nckc5k5f06nm1xfzpykhyndh2dzyagmifrzg5k478p1lpm";
+  };
+
+  # no tests
+  doCheck = false;
+
+  meta = with lib; {
+    description = "A nagios/icinga/sensu check plugin for OpenVPN";
+    license = licenses.mit;
+    maintainers = with maintainers; [ peterhoeg ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 39b2490ad67..336408961b6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14967,6 +14967,8 @@ in
     check-nwc-health
     check-ups-health;
 
+  check-openvpn = callPackage ../servers/monitoring/plugins/openvpn.nix { };
+
   checkSSLCert = callPackage ../servers/monitoring/nagios/plugins/check_ssl_cert.nix { };
 
   neo4j = callPackage ../servers/nosql/neo4j { };
-- 
GitLab


From a3e2ab12dbef93475ce594856f7f6f919ed2b1bd Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 12 Sep 2019 16:59:14 +0800
Subject: [PATCH 0871/2254] trojita: 0.7 -> 0.7.20190618

---
 .../mailreaders/trojita/default.nix           | 35 +++++++++++++------
 pkgs/top-level/all-packages.nix               |  4 ++-
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/trojita/default.nix b/pkgs/applications/networking/mailreaders/trojita/default.nix
index 7f7296cd700..4b4c711042f 100644
--- a/pkgs/applications/networking/mailreaders/trojita/default.nix
+++ b/pkgs/applications/networking/mailreaders/trojita/default.nix
@@ -1,37 +1,50 @@
-{ mkDerivation
-, lib
-, fetchurl
+{ akonadi-contacts
 , cmake
+, fetchgit
+, gpgme
+, kcontacts
+, lib
+, mimetic
+, mkDerivation
+, pkgconfig
+, qgpgme
 , qtbase
-, qtwebkit
+, qtkeychain
 , qttools
+, qtwebkit
 }:
 
 mkDerivation rec {
   pname = "trojita";
-  version = "0.7";
+  version = "0.7.20190618";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/trojita/trojita/${pname}-${version}.tar.xz";
-    sha256 = "1n9n07md23ny6asyw0xpih37vlwzp7vawbkprl7a1bqwfa0si3g0";
+  src = fetchgit {
+    url = "https://anongit.kde.org/trojita.git";
+    rev = "90b417b131853553c94ff93aef62abaf301aa8f1";
+    sha256 = "0xpxq5bzqaa68lkz90wima5q2m0mdcn0rvnigb66lylb4n20mnql";
   };
 
   buildInputs = [
+    akonadi-contacts
+    gpgme
+    kcontacts
+    mimetic
+    qgpgme
     qtbase
+    qtkeychain
     qtwebkit
   ];
 
   nativeBuildInputs = [
     cmake
+    pkgconfig
     qttools
   ];
 
-
   meta = with lib; {
     description = "A Qt IMAP e-mail client";
-    homepage = http://trojita.flaska.net/;
+    homepage = "http://trojita.flaska.net/";
     license = with licenses; [ gpl2 gpl3 ];
     platforms = platforms.linux;
   };
-
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 69b87aaf383..1790dc04397 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20899,7 +20899,9 @@ in
 
   tribler = callPackage ../applications/networking/p2p/tribler { };
 
-  trojita = libsForQt5.callPackage ../applications/networking/mailreaders/trojita { };
+  trojita = libsForQt5.callPackage ../applications/networking/mailreaders/trojita {
+    inherit (kdeApplications) akonadi-contacts;
+  };
 
   tudu = callPackage ../applications/office/tudu { };
 
-- 
GitLab


From c26c6241eae93985c33590401fda971d7574c136 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 23 Sep 2019 16:37:58 +0200
Subject: [PATCH 0872/2254] networking.useDHCP: disallow for networkd

This setting will be removed with the switch to systemd-networkd. The
use of per interface config is encouraged instead.
---
 .../tasks/network-interfaces-systemd.nix      | 12 ++++++----
 nixos/tests/networking.nix                    | 23 +++++++++++++++----
 nixos/tests/predictable-interface-names.nix   |  1 +
 nixos/tests/systemd-networkd-wireguard.nix    |  1 +
 4 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix
index 34e27066715..605d00de58f 100644
--- a/nixos/modules/tasks/network-interfaces-systemd.nix
+++ b/nixos/modules/tasks/network-interfaces-systemd.nix
@@ -38,6 +38,12 @@ in
     } {
       assertion = cfg.defaultGateway6 == null || cfg.defaultGateway6.interface == null;
       message = "networking.defaultGateway6.interface is not supported by networkd.";
+    } {
+      assertion = cfg.useDHCP == false;
+      message = ''
+        networking.useDHCP is not supported by networkd.
+        Please use per interface configuration and set the global option to false.
+      '';
     } ] ++ flip mapAttrsToList cfg.bridges (n: { rstp, ... }: {
       assertion = !rstp;
       message = "networking.bridges.${n}.rstp is not supported by networkd.";
@@ -56,9 +62,7 @@ in
         genericNetwork = override:
           let gateway = optional (cfg.defaultGateway != null) cfg.defaultGateway.address
             ++ optional (cfg.defaultGateway6 != null) cfg.defaultGateway6.address;
-          in {
-            DHCP = override (dhcpStr cfg.useDHCP);
-          } // optionalAttrs (gateway != [ ]) {
+          in optionalAttrs (gateway != [ ]) {
             routes = override [
               {
                 routeConfig = {
@@ -97,7 +101,7 @@ in
         networks."40-${i.name}" = mkMerge [ (genericNetwork mkDefault) {
           name = mkDefault i.name;
           DHCP = mkForce (dhcpStr
-            (if i.useDHCP != null then i.useDHCP else cfg.useDHCP && interfaceIps i == [ ]));
+            (if i.useDHCP != null then i.useDHCP else false));
           address = forEach (interfaceIps i)
             (ip: "${ip.address}/${toString ip.prefixLength}");
           networkConfig.IPv6PrivacyExtensions = "kernel";
diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix
index 7452768033a..f12a5fc9ae5 100644
--- a/nixos/tests/networking.nix
+++ b/nixos/tests/networking.nix
@@ -72,6 +72,7 @@ let
   testCases = {
     loopback = {
       name = "Loopback";
+      machine.networking.useDHCP = false;
       machine.networking.useNetworkd = networkd;
       testScript = ''
         startAll;
@@ -139,14 +140,16 @@ let
         virtualisation.vlans = [ 1 2 ];
         networking = {
           useNetworkd = networkd;
-          useDHCP = true;
+          useDHCP = false;
           interfaces.eth1 = {
             ipv4.addresses = mkOverride 0 [ ];
             ipv6.addresses = mkOverride 0 [ ];
+            useDHCP = true;
           };
           interfaces.eth2 = {
             ipv4.addresses = mkOverride 0 [ ];
             ipv6.addresses = mkOverride 0 [ ];
+            useDHCP = true;
           };
         };
       };
@@ -320,13 +323,19 @@ let
         virtualisation.vlans = [ 1 ];
         networking = {
           useNetworkd = networkd;
+          useDHCP = false;
           firewall.logReversePathDrops = true; # to debug firewall rules
           # reverse path filtering rules for the macvlan interface seem
           # to be incorrect, causing the test to fail. Disable temporarily.
           firewall.checkReversePath = false;
-          useDHCP = true;
           macvlans.macvlan.interface = "eth1";
-          interfaces.eth1.ipv4.addresses = mkOverride 0 [ ];
+          interfaces.eth1 = {
+            ipv4.addresses = mkOverride 0 [ ];
+            useDHCP = true;
+          };
+          interfaces.macvlan = {
+            useDHCP = true;
+          };
         };
       };
       testScript = { ... }:
@@ -440,6 +449,7 @@ let
     virtual = {
       name = "Virtual";
       machine = {
+        networking.useNetworkd = networkd;
         networking.interfaces.tap0 = {
           ipv4.addresses = [ { address = "192.168.1.1"; prefixLength = 24; } ];
           ipv6.addresses = [ { address = "2001:1470:fffd:2096::"; prefixLength = 64; } ];
@@ -489,6 +499,7 @@ let
         boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = true;
         networking = {
           useNetworkd = networkd;
+          useDHCP = false;
           interfaces.eth1.ipv6.addresses = singleton {
             address = "fd00:1234:5678:1::1";
             prefixLength = 64;
@@ -514,11 +525,12 @@ let
         virtualisation.vlans = [ 1 ];
         networking = {
           useNetworkd = networkd;
-          useDHCP = true;
+          useDHCP = false;
           interfaces.eth1 = {
             preferTempAddress = true;
             ipv4.addresses = mkOverride 0 [ ];
             ipv6.addresses = mkOverride 0 [ ];
+            useDHCP = true;
           };
         };
       };
@@ -526,11 +538,12 @@ let
         virtualisation.vlans = [ 1 ];
         networking = {
           useNetworkd = networkd;
-          useDHCP = true;
+          useDHCP = false;
           interfaces.eth1 = {
             preferTempAddress = false;
             ipv4.addresses = mkOverride 0 [ ];
             ipv6.addresses = mkOverride 0 [ ];
+            useDHCP = true;
           };
         };
       };
diff --git a/nixos/tests/predictable-interface-names.nix b/nixos/tests/predictable-interface-names.nix
index 85047f66f23..194b4dafa77 100644
--- a/nixos/tests/predictable-interface-names.nix
+++ b/nixos/tests/predictable-interface-names.nix
@@ -16,6 +16,7 @@ in pkgs.lib.listToAttrs (pkgs.lib.crossLists (predictable: withNetworkd: {
       networking.usePredictableInterfaceNames = lib.mkForce predictable;
       networking.useNetworkd = withNetworkd;
       networking.dhcpcd.enable = !withNetworkd;
+      networking.useDHCP = !withNetworkd;
     };
 
     testScript = ''
diff --git a/nixos/tests/systemd-networkd-wireguard.nix b/nixos/tests/systemd-networkd-wireguard.nix
index f1ce1e791ce..aa0ac54e796 100644
--- a/nixos/tests/systemd-networkd-wireguard.nix
+++ b/nixos/tests/systemd-networkd-wireguard.nix
@@ -2,6 +2,7 @@ let generateNodeConf = { lib, pkgs, config, privkpath, pubk, peerId, nodeId, ...
       imports = [ common/user-account.nix ];
       systemd.services.systemd-networkd.environment.SYSTEMD_LOG_LEVEL = "debug";
       networking.useNetworkd = true;
+      networking.useDHCP = false;
       networking.firewall.enable = false;
       virtualisation.vlans = [ 1 ];
       environment.systemPackages = with pkgs; [ wireguard-tools ];
-- 
GitLab


From e862dd637350ddd1812a6c1fb5811c6464e74ff5 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 24 Sep 2019 09:36:49 +0200
Subject: [PATCH 0873/2254] networking.useDHCP: add release notes and docs

---
 nixos/doc/manual/release-notes/rl-1909.xml | 8 ++++++++
 nixos/modules/tasks/network-interfaces.nix | 5 +++++
 2 files changed, 13 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
index 58ab7207f53..012c2e4f992 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -484,6 +484,14 @@
        (<literal>citrix_workspace</literal>).
      </para>
    </listitem>
+   <listitem>
+    <para>
+      The <option>networking.useDHCP</option> option is unsupported in combination with
+      <option>networking.useNetworkd</option> in anticipation of defaulting to it by default.
+      It has to be set to <literal>false</literal> and enabled per
+      interface with <option>networking.interfaces.&lt;name&gt;.useDHCP = true;</option>
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 5bf7b0d227f..834ce758410 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -903,6 +903,11 @@ in
         Whether to use DHCP to obtain an IP address and other
         configuration for all network interfaces that are not manually
         configured.
+
+        Using this option is highly discouraged and also incompatible with
+        <option>networking.useNetworkd</option>. Please use
+        <option>networking.interfaces.&lt;name&gt;.useDHCP</option> instead
+        and set this to false.
       '';
     };
 
-- 
GitLab


From 4fd8034b7df499b444542a278576259a69b74962 Mon Sep 17 00:00:00 2001
From: yvt <i@yvt.jp>
Date: Tue, 24 Sep 2019 17:52:52 +0900
Subject: [PATCH 0874/2254] do-agent: Fix modSha256

---
 pkgs/servers/monitoring/do-agent/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/monitoring/do-agent/default.nix b/pkgs/servers/monitoring/do-agent/default.nix
index 9a180b24383..572535b7fcd 100644
--- a/pkgs/servers/monitoring/do-agent/default.nix
+++ b/pkgs/servers/monitoring/do-agent/default.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
       -X main.version=${version}
   '';
 
-  modSha256 = "0ydjwxdkcz0blpzwapiaq66vh7nrcg4j91z6h7v4ynnw2rgp7pmy";
+  modSha256 = "164bwqg996097db399j7lar6gj9xpshjdmyapvzg7zh655xlkf3d";
 
   meta = with lib; {
     description = "DigitalOcean droplet system metrics agent";
-- 
GitLab


From 9892d5ab2cda380f96e4c5b71d83c314fba48359 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Tue, 24 Sep 2019 11:13:58 +0200
Subject: [PATCH 0875/2254] jetbrains.rider: fail evaluation in a good way on
 non-Linux

The tarball job was broken because of this (darwin).
---
 pkgs/applications/editors/jetbrains/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 16a1c01363d..34981f7ec69 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -201,7 +201,7 @@ let
         platforms = platforms.linux;
       };
     }) (attrs: {
-      patchPhase = attrs.patchPhase + ''
+      patchPhase = assert stdenv.hostPlatform.isLinux; attrs.patchPhase + ''
         # Patch built-in mono for ReSharperHost to start successfully
         interpreter=$(echo ${stdenv.glibc.out}/lib/ld-linux*.so.2)
         patchelf --set-interpreter "$interpreter" lib/ReSharperHost/linux-x64/mono/bin/mono-sgen
-- 
GitLab


From 6e8db5d67f1c996b729bedfb96a74175ae064dbb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 24 Sep 2019 11:27:49 +0200
Subject: [PATCH 0876/2254] shotcut: improve VAAPI rendering auto-detection
 some more

https://github.com/mltframework/shotcut/issues/771#issuecomment-533842055
---
 pkgs/applications/video/shotcut/default.nix | 23 ++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix
index 3edee15db5f..4636ce48b1a 100644
--- a/pkgs/applications/video/shotcut/default.nix
+++ b/pkgs/applications/video/shotcut/default.nix
@@ -1,10 +1,23 @@
-{ stdenv, fetchFromGitHub, SDL2, frei0r, gettext, mlt, jack1, mkDerivation
-, pkgconfig, qtbase, qtmultimedia, qtwebkit, qtx11extras, qtwebsockets
-, qtquickcontrols, qtgraphicaleffects, libmlt, qmake, qttools }:
+{ stdenv, fetchFromGitHub, fetchpatch, mkDerivation, SDL2, frei0r, gettext, mlt
+, jack1, pkgconfig, qtbase, qtmultimedia, qtwebkit, qtx11extras, qtwebsockets
+, qtquickcontrols, qtgraphicaleffects, libmlt, qmake, qttools
+}:
 
 assert stdenv.lib.versionAtLeast libmlt.version "6.8.0";
 assert stdenv.lib.versionAtLeast mlt.version "6.8.0";
 
+let
+  # https://github.com/mltframework/shotcut/issues/771
+  fixVaapiRendering1 = fetchpatch {
+    url = "https://github.com/peti/shotcut/commit/038f6839298fc1e9e80ddf84fe168a78118bc625.patch";
+    sha256 = "153z1g6criszd6gdkw4f5zk0gmh0jar6l2g8fzwjhhcvkdz30vbp";
+  };
+  fixVaapiRendering2 = fetchpatch {
+    url = "https://github.com/peti/shotcut/commit/653c485f92d2847fdac517e3f797c9254826ffab.patch";
+    sha256 = "1qd0zgyahda72xh3avlg7lg0jq94wq5847154qlrgzj8b4n7vizw";
+  };
+in
+
 mkDerivation rec {
   pname = "shotcut";
   version = "19.09.14";
@@ -16,6 +29,8 @@ mkDerivation rec {
     sha256 = "1cl8ba1n0h450r4n5mfqmyjaxvczs3m19blwxslqskvmxy5my3cn";
   };
 
+  patches = [ fixVaapiRendering1 fixVaapiRendering2 ];
+
   enableParallelBuilding = true;
   nativeBuildInputs = [ pkgconfig qmake ];
   buildInputs = [
@@ -33,8 +48,6 @@ mkDerivation rec {
     sed 's_qApp->applicationDirPath(), "ffmpeg"_"${mlt.ffmpeg}/bin/ffmpeg"_' -i src/docks/encodedock.cpp
     NICE=$(type -P nice)
     sed "s_/usr/bin/nice_''${NICE}_" -i src/jobs/meltjob.cpp src/jobs/ffmpegjob.cpp
-    # Fix VAAPI auto-config: https://github.com/mltframework/shotcut/issues/771
-    sed 's#"-vaapi_device" << ":0"#"-vaapi_device" << "/dev/dri/renderD128"#' -i src/docks/encodedock.cpp
   '';
 
   qtWrapperArgs = [
-- 
GitLab


From a0a3675bdf2065a8305020f30dc157138bdfe4f1 Mon Sep 17 00:00:00 2001
From: Roman Volosatovs <rvolosatovs@riseup.net>
Date: Tue, 24 Sep 2019 11:33:31 +0200
Subject: [PATCH 0877/2254] nixos/network: replace deprecated DHCP=both by
 DHCP=yes

---
 nixos/modules/tasks/network-interfaces-systemd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix
index 34e27066715..7c6604922cf 100644
--- a/nixos/modules/tasks/network-interfaces-systemd.nix
+++ b/nixos/modules/tasks/network-interfaces-systemd.nix
@@ -12,7 +12,7 @@ let
     i.ipv4.addresses
     ++ optionals cfg.enableIPv6 i.ipv6.addresses;
 
-  dhcpStr = useDHCP: if useDHCP == true || useDHCP == null then "both" else "no";
+  dhcpStr = useDHCP: if useDHCP == true || useDHCP == null then "yes" else "no";
 
   slaves =
     concatLists (map (bond: bond.interfaces) (attrValues cfg.bonds))
-- 
GitLab


From ee49498004c133b09dc08843b250a8038a6981f2 Mon Sep 17 00:00:00 2001
From: Roman Volosatovs <rvolosatovs@riseup.net>
Date: Thu, 19 Sep 2019 19:40:14 +0200
Subject: [PATCH 0878/2254] all-packages: fix libcanberra-gtk{2,3}

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 336408961b6..ace21c49295 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11637,11 +11637,11 @@ in
   libcanberra = callPackage ../development/libraries/libcanberra {
     inherit (darwin.apple_sdk.frameworks) CoreServices;
   };
-  libcanberra-gtk3 = pkgs.libcanberra.override {
-    gtk = gtk3.override { x11Support = true; };
+  libcanberra-gtk2 = pkgs.libcanberra.override {
+    gtk = gtk2-x11;
   };
-  libcanberra-gtk2 = pkgs.libcanberra-gtk3.override {
-    gtk = gtk2.override { gdktarget = "x11"; };
+  libcanberra-gtk3 = pkgs.libcanberra.override {
+    gtk = gtk3-x11;
   };
 
   libcanberra_kde = if (config.kde_runtime.libcanberraWithoutGTK or true)
-- 
GitLab


From 5ee383ea8c31cd7c8489c2b076aac9c51f63b55c Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 24 Sep 2019 11:41:12 +0200
Subject: [PATCH 0879/2254] nixos-generate-config: add useDHCP per interface

This sets networking.useDHCP to false and for all interfaces found the
per-interface useDHCP to true. This replicates the current default
behaviour and prepares for the switch to networkd.
---
 .../installer/tools/nixos-generate-config.pl  | 20 +++++++++++++++++++
 nixos/modules/installer/tools/tools.nix       |  1 +
 2 files changed, 21 insertions(+)

diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index cfdbdaabf5c..f2ffe61c42c 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -563,6 +563,24 @@ $fsAndSwap
 ${\join "", (map { "  $_\n" } (uniq @attrs))}}
 EOF
 
+sub generateNetworkingDhcpConfig {
+    my $config = <<EOF;
+  # The global useDHCP flag is deprecated, therefore explicitly set to false here.
+  # Per-interface useDHCP will be mandatory in the future, so this generated config
+  # replicates the default behaviour.
+  networking.useDHCP = false;
+EOF
+
+    foreach my $path (glob "/sys/class/net/*") {
+        my $dev = basename($path);
+        if ($dev ne "lo") {
+            $config .= "  networking.interfaces.$dev.useDHCP = true;\n";
+        }
+    }
+
+    return $config;
+}
+
 
 if ($showHardwareConfig) {
     print STDOUT $hwConfig;
@@ -606,6 +624,8 @@ EOF
 EOF
         }
 
+        my $networkingDhcpConfig = generateNetworkingDhcpConfig();
+
         write_file($fn, <<EOF);
 @configuration@
 EOF
diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix
index 05add59117d..32926005959 100644
--- a/nixos/modules/installer/tools/tools.nix
+++ b/nixos/modules/installer/tools/tools.nix
@@ -96,6 +96,7 @@ in
         # networking.hostName = "nixos"; # Define your hostname.
         # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
 
+      $networkingDhcpConfig
         # Configure network proxy if necessary
         # networking.proxy.default = "http://user:password\@proxy:port/";
         # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
-- 
GitLab


From e702263b4a93bf8a33523e5f74fd3d734d495dd9 Mon Sep 17 00:00:00 2001
From: "Tristan Helmich (omniIT)" <tristan.helmich@omniit.de>
Date: Tue, 24 Sep 2019 10:07:48 +0000
Subject: [PATCH 0880/2254] graylog: 3.1.0 -> 3.1.2

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

diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix
index 0f448cc089c..52e712c5cb1 100644
--- a/pkgs/tools/misc/graylog/default.nix
+++ b/pkgs/tools/misc/graylog/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "graylog";
-  version = "3.1.0";
+  version = "3.1.2";
 
   src = fetchurl {
     url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz";
-    sha256 = "0zv64cnd5nrn2hgbjmcwjam8dx5y2a7gz5x7xb9kr134132dm0yd";
+    sha256 = "14zr1aln34j5wifhg6ak3f83l959vic8i11jr90ibmnxl5v4hcqp";
   };
 
   dontBuild = true;
-- 
GitLab


From 3649ee54913b7d646c026d478a3ead145eab148b Mon Sep 17 00:00:00 2001
From: "Tristan Helmich (omniIT)" <tristan.helmich@omniit.de>
Date: Tue, 24 Sep 2019 10:08:47 +0000
Subject: [PATCH 0881/2254] graylog-plugin-auth-sso: 3.0.0 -> 3.1.0

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

diff --git a/pkgs/tools/misc/graylog/plugins.nix b/pkgs/tools/misc/graylog/plugins.nix
index a8d571da7eb..e7d32dd4b37 100644
--- a/pkgs/tools/misc/graylog/plugins.nix
+++ b/pkgs/tools/misc/graylog/plugins.nix
@@ -38,10 +38,10 @@ in {
   auth_sso = glPlugin rec {
     name = "graylog-auth-sso-${version}";
     pluginName = "graylog-plugin-auth-sso";
-    version = "3.0.0";
+    version = "3.1.0";
     src = fetchurl {
       url = "https://github.com/Graylog2/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar";
-      sha256 = "09y1s71mk8fm6lsghla7mrh9z5y230r8zpv84klhavh2dacs8gq5";
+      sha256 = "0hwgpq1j3qk0j1zgap5f1avh2nvkcscgds81x8xr0gamphgps8y2";
     };
     meta = {
       homepage = https://github.com/Graylog2/graylog-plugin-auth-sso;
-- 
GitLab


From 1b0771ac42f43e88a0b73143fd5c1b13e40c1c0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Tue, 24 Sep 2019 12:55:48 +0200
Subject: [PATCH 0882/2254] knot-dns: 2.8.3 -> 2.8.4

https://gitlab.labs.nic.cz/knot/knot-dns/raw/v2.8.4/NEWS
---
 pkgs/servers/dns/knot-dns/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix
index 8191bf5acbf..ad1bb26a54d 100644
--- a/pkgs/servers/dns/knot-dns/default.nix
+++ b/pkgs/servers/dns/knot-dns/default.nix
@@ -7,11 +7,11 @@ let inherit (stdenv.lib) optional optionals; in
 # Note: ATM only the libraries have been tested in nixpkgs.
 stdenv.mkDerivation rec {
   pname = "knot-dns";
-  version = "2.8.3";
+  version = "2.8.4";
 
   src = fetchurl {
     url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
-    sha256 = "8a62d81e5cf3df938f469b60ed4e46d9161007c2b89fbf7ae07525fa68368bad";
+    sha256 = "541e7e43503765c91405c5797b3838103bb656154712e69b3f959c6ab0e700a9";
   };
 
   outputs = [ "bin" "out" "dev" ];
-- 
GitLab


From 336a2937ec7bc151fdbbf101c16a9cc260b97354 Mon Sep 17 00:00:00 2001
From: Uri Baghin <uri@canva.com>
Date: Tue, 24 Sep 2019 21:08:21 +1000
Subject: [PATCH 0883/2254] jetbrains.rider: fix on darwin

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 34981f7ec69..ebdfb09936a 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -201,11 +201,11 @@ let
         platforms = platforms.linux;
       };
     }) (attrs: {
-      patchPhase = assert stdenv.hostPlatform.isLinux; attrs.patchPhase + ''
+      patchPhase = lib.optionalString (!stdenv.isDarwin) (attrs.patchPhase + ''
         # Patch built-in mono for ReSharperHost to start successfully
         interpreter=$(echo ${stdenv.glibc.out}/lib/ld-linux*.so.2)
         patchelf --set-interpreter "$interpreter" lib/ReSharperHost/linux-x64/mono/bin/mono-sgen
-      '';
+      '');
     });
 
   buildRubyMine = { name, version, src, license, description, wmClass, ... }:
-- 
GitLab


From 400431a0de941c8dc12e2ff959bf5caef33c8a2c Mon Sep 17 00:00:00 2001
From: Nathan van Doorn <nathan@myrtlesoftware.com>
Date: Tue, 24 Sep 2019 12:21:38 +0100
Subject: [PATCH 0884/2254] manticore: 2018.09.29 -> 2019.09.20

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

diff --git a/pkgs/development/compilers/manticore/default.nix b/pkgs/development/compilers/manticore/default.nix
index 6e0716659c7..1e9b77cfb79 100644
--- a/pkgs/development/compilers/manticore/default.nix
+++ b/pkgs/development/compilers/manticore/default.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchFromGitHub, coreutils, autoreconfHook, smlnj }:
 
 let
-  rev= "47273c463fc3c5d0a0ae655cf75a4700bdb020b4";
+  rev= "4528ccacdfd53d36f5959c005b27cd7ab6175b83";
 in stdenv.mkDerivation {
   pname = "manticore";
-  version = "2018.09.29";
+  version = "2019.09.20";
  
   src = fetchFromGitHub {
     owner = "ManticoreProject";
     repo = "manticore";
-    sha256 = "1prrgp7ldkdnrdbj224qqkirw8bj72460ix97c96fy264j9c97cn";
+    sha256 = "1xz7msiq5x2c56zjxydbxlj6r001mm5zszcda6f6v5qfmmd1bakz";
     inherit rev;
   };
 
-- 
GitLab


From 5560b8bf840f20e02cf4e74a33364313c766378c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Tue, 24 Sep 2019 09:04:37 -0300
Subject: [PATCH 0885/2254] enlightenment.efl: 1.22.3 -> 1.22.5

---
 pkgs/desktops/enlightenment/efl.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix
index 1876cce6c8a..aa1bfcaba44 100644
--- a/pkgs/desktops/enlightenment/efl.nix
+++ b/pkgs/desktops/enlightenment/efl.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation rec {
   pname = "efl";
-  version = "1.22.3";
+  version = "1.22.5";
 
   src = fetchurl {
     url = "http://download.enlightenment.org/rel/libs/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "1j1i8cwq4ym9z34ikv35mdmv5q7q69hdp494mc6l03g9n6cl2yky";
+    sha256 = "1cjk56z0whpzcqwg3xdq23kyp1g83xa67m9dlp7ywmb36bn4ca59";
   };
 
   nativeBuildInputs = [ pkgconfig gtk3 ];
-- 
GitLab


From 887aa513dfc05ec4b2fbed0aa2d8d035b2c9bcf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Tue, 24 Sep 2019 09:35:05 -0300
Subject: [PATCH 0886/2254] enlightenment.efl: list dependencies in
 alphabetical order

---
 pkgs/desktops/enlightenment/efl.nix | 95 +++++++++++++++++++++++------
 1 file changed, 78 insertions(+), 17 deletions(-)

diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix
index aa1bfcaba44..5e3763c9a6d 100644
--- a/pkgs/desktops/enlightenment/efl.nix
+++ b/pkgs/desktops/enlightenment/efl.nix
@@ -1,9 +1,10 @@
-{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, lz4, freetype, fontconfig
-, fribidi, SDL2, SDL, libGL, giflib, libpng, libtiff, glib, gst_all_1, libpulseaudio
-, libsndfile, xorg, libdrm, libxkbcommon, udev, utillinux, bullet, luajit
-, python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg
-, dbus, alsaLib, poppler, ghostscript, libraw, libspectre, xineLib, libwebp
-, curl, libinput, systemd, mesa, writeText, gtk3
+{ stdenv, fetchurl, pkgconfig, SDL, SDL2, alsaLib, bullet, curl, dbus,
+  doxygen, expat, fontconfig, freetype, fribidi, ghostscript, giflib,
+  glib, gst_all_1, gtk3, harfbuzz, jbig2dec, libGL, libdrm, libinput,
+  libjpeg, libpng, libpulseaudio, libraw, librsvg, libsndfile,
+  libspectre, libtiff, libwebp, libxkbcommon, luajit, lz4, mesa,
+  openjpeg, openssl, poppler, python27Packages, systemd, udev,
+  utillinux, writeText, xineLib, xorg, zlib
 }:
 
 stdenv.mkDerivation rec {
@@ -15,19 +16,79 @@ stdenv.mkDerivation rec {
     sha256 = "1cjk56z0whpzcqwg3xdq23kyp1g83xa67m9dlp7ywmb36bn4ca59";
   };
 
-  nativeBuildInputs = [ pkgconfig gtk3 ];
+  nativeBuildInputs = [
+    gtk3
+    pkgconfig
+  ];
 
-  buildInputs = [ openssl zlib lz4 freetype fontconfig SDL libGL mesa
-    giflib libpng libtiff glib gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
-    gst_all_1.gst-libav libpulseaudio libsndfile xorg.libXcursor xorg.xorgproto
-    xorg.libX11 udev systemd ];
+  buildInputs = [
+    SDL
+    fontconfig
+    freetype
+    giflib
+    glib
+    gst_all_1.gst-libav
+    gst_all_1.gst-plugins-base
+    gst_all_1.gst-plugins-good
+    gst_all_1.gstreamer
+    libGL
+    libpng
+    libpulseaudio
+    libsndfile
+    libtiff
+    lz4
+    mesa
+    openssl
+    systemd
+    udev
+    xorg.libX11
+    xorg.libXcursor
+    xorg.xorgproto
+    zlib
+  ];
 
-  propagatedBuildInputs = [ libxkbcommon python27Packages.dbus-python dbus libjpeg xorg.libXcomposite
-    xorg.libXdamage xorg.libXinerama xorg.libXp xorg.libXtst xorg.libXi xorg.libXext
-    bullet xorg.libXScrnSaver xorg.libXrender xorg.libXfixes xorg.libXrandr
-    xorg.libxkbfile xorg.libxcb xorg.xcbutilkeysyms openjpeg doxygen expat luajit
-    harfbuzz jbig2dec librsvg dbus alsaLib poppler ghostscript libraw libspectre xineLib libwebp curl libdrm
-    libinput utillinux fribidi SDL2 ];
+  propagatedBuildInputs = [
+    SDL2
+    alsaLib
+    bullet
+    curl
+    dbus
+    dbus
+    doxygen
+    expat
+    fribidi
+    ghostscript
+    harfbuzz
+    jbig2dec
+    libdrm
+    libinput
+    libjpeg
+    libraw
+    librsvg
+    libspectre
+    libwebp
+    libxkbcommon
+    luajit
+    openjpeg
+    poppler
+    python27Packages.dbus-python
+    utillinux
+    xineLib
+    xorg.libXScrnSaver
+    xorg.libXcomposite
+    xorg.libXdamage
+    xorg.libXext
+    xorg.libXfixes
+    xorg.libXi
+    xorg.libXinerama
+    xorg.libXp
+    xorg.libXrandr
+    xorg.libXrender
+    xorg.libXtst
+    xorg.libxcb
+    xorg.libxkbfile
+    xorg.xcbutilkeysyms
+  ];
 
   # ac_ct_CXX must be set to random value, because then it skips some magic which does alternative searching for g++
   configureFlags = [
-- 
GitLab


From 0f5fc1e2d53ec16c4904f30c6584300b744fa549 Mon Sep 17 00:00:00 2001
From: Johannes Schleifenbaum <johannes@js-webcoding.de>
Date: Tue, 24 Sep 2019 14:57:32 +0200
Subject: [PATCH 0887/2254] dbeaver: 6.1.5 -> 6.2.1

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

diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix
index 2e821701216..ffa9b4d071b 100644
--- a/pkgs/applications/misc/dbeaver/default.nix
+++ b/pkgs/applications/misc/dbeaver/default.nix
@@ -7,7 +7,7 @@
 
 stdenv.mkDerivation rec {
   pname = "dbeaver-ce";
-  version = "6.1.5";
+  version = "6.2.1";
 
   desktopItem = makeDesktopItem {
     name = "dbeaver";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz";
-    sha256 = "0lkycm1152wd56i1hjq7q3sd05h51fyz99qr2n65lwi33vz2qk9m";
+    sha256 = "1ix6isahpk7zk741wdx5cf4i13wc5gp0j1gj4ja80bzfswbc38na";
   };
 
   installPhase = ''
-- 
GitLab


From ec958d46acf6ec6e544a0045fcc4c7e3ccd51d96 Mon Sep 17 00:00:00 2001
From: talyz <kim.lindberger@gmail.com>
Date: Tue, 24 Sep 2019 08:58:32 +0200
Subject: [PATCH 0888/2254] nixos/gitlab: Fix evaluation failure when
 postgresql is disabled

config.services.postgresql.package is only defined when the postgresql
service is activated, which means we fail to evaluate when
databaseCreateLocally == false. Fix this by using the default
postgresql package when the postgresql service is disabled.
---
 nixos/modules/services/misc/gitlab.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index 1e1eb0fd9a1..1b6002498c6 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -7,6 +7,11 @@ let
 
   ruby = cfg.packages.gitlab.ruby;
 
+  postgresqlPackage = if config.services.postgresql.enable then
+                        config.services.postgresql.package
+                      else
+                        pkgs.postgresql;
+
   gitlabSocket = "${cfg.statePath}/tmp/sockets/gitlab.socket";
   gitalySocket = "${cfg.statePath}/tmp/sockets/gitaly.socket";
   pathUrlQuote = url: replaceStrings ["/"] ["%2F"] url;
@@ -138,7 +143,7 @@ let
       mkdir -p $out/bin
       makeWrapper ${cfg.packages.gitlab.rubyEnv}/bin/rake $out/bin/gitlab-rake \
           ${concatStrings (mapAttrsToList (name: value: "--set ${name} '${value}' ") gitlabEnv)} \
-          --set PATH '${lib.makeBinPath [ pkgs.nodejs pkgs.gzip pkgs.git pkgs.gnutar config.services.postgresql.package pkgs.coreutils pkgs.procps ]}:$PATH' \
+          --set PATH '${lib.makeBinPath [ pkgs.nodejs pkgs.gzip pkgs.git pkgs.gnutar postgresqlPackage pkgs.coreutils pkgs.procps ]}:$PATH' \
           --set RAKEOPT '-f ${cfg.packages.gitlab}/share/gitlab/Rakefile' \
           --run 'cd ${cfg.packages.gitlab}/share/gitlab'
      '';
@@ -153,7 +158,7 @@ let
       mkdir -p $out/bin
       makeWrapper ${cfg.packages.gitlab.rubyEnv}/bin/rails $out/bin/gitlab-rails \
           ${concatStrings (mapAttrsToList (name: value: "--set ${name} '${value}' ") gitlabEnv)} \
-          --set PATH '${lib.makeBinPath [ pkgs.nodejs pkgs.gzip pkgs.git pkgs.gnutar config.services.postgresql.package pkgs.coreutils pkgs.procps ]}:$PATH' \
+          --set PATH '${lib.makeBinPath [ pkgs.nodejs pkgs.gzip pkgs.git pkgs.gnutar postgresqlPackage pkgs.coreutils pkgs.procps ]}:$PATH' \
           --run 'cd ${cfg.packages.gitlab}/share/gitlab'
      '';
   };
@@ -667,7 +672,7 @@ in {
       wantedBy = [ "multi-user.target" ];
       environment = gitlabEnv;
       path = with pkgs; [
-        config.services.postgresql.package
+        postgresqlPackage
         gitAndTools.git
         ruby
         openssh
@@ -748,7 +753,7 @@ in {
       wantedBy = [ "multi-user.target" ];
       environment = gitlabEnv;
       path = with pkgs; [
-        config.services.postgresql.package
+        postgresqlPackage
         gitAndTools.git
         openssh
         nodejs
-- 
GitLab


From 58a75024211a18870bffd33466b0d5aefa846d74 Mon Sep 17 00:00:00 2001
From: talyz <kim.lindberger@gmail.com>
Date: Tue, 17 Sep 2019 08:36:19 +0200
Subject: [PATCH 0889/2254] nixos/gitlab: Only create the database when
 databaseHost is unset

Make sure that we don't create a database if we're not going to
connect to it. Also, fix the assertion that usernames be equal to only
trig when peer authentication is used (databaseHost == "").
---
 nixos/modules/services/misc/gitlab.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index 1b6002498c6..26a01f6c61e 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -27,6 +27,9 @@ let
     } // cfg.extraDatabaseConfig;
   };
 
+  # We only want to create a database if we're actually going to connect to it.
+  databaseActuallyCreateLocally = cfg.databaseCreateLocally && cfg.databaseHost == "";
+
   gitalyToml = pkgs.writeText "gitaly.toml" ''
     socket_path = "${lib.escape ["\""] gitalySocket}"
     bin_dir = "${cfg.packages.gitaly}/bin"
@@ -263,8 +266,8 @@ in {
         description = ''
           Whether a database should be automatically created on the
           local host. Set this to <literal>false</literal> if you plan
-          on provisioning a local database yourself or use an external
-          one.
+          on provisioning a local database yourself. This has no effect
+          if <option>services.gitlab.databaseHost</option> is customized.
         '';
       };
 
@@ -554,8 +557,8 @@ in {
 
     assertions = [
       {
-        assertion = cfg.databaseCreateLocally -> (cfg.user == cfg.databaseUsername);
-        message = "For local automatic database provisioning services.gitlab.user and services.gitlab.databaseUsername should be identical.";
+        assertion = databaseActuallyCreateLocally -> (cfg.user == cfg.databaseUsername);
+        message = ''For local automatic database provisioning (services.gitlab.databaseCreateLocally == true) with peer authentication (services.gitlab.databaseHost == "") to work services.gitlab.user and services.gitlab.databaseUsername must be identical.'';
       }
       {
         assertion = (cfg.databaseHost != "") -> (cfg.databasePasswordFile != null);
@@ -589,14 +592,14 @@ in {
     services.redis.enable = mkDefault true;
 
     # We use postgres as the main data store.
-    services.postgresql = optionalAttrs cfg.databaseCreateLocally {
+    services.postgresql = optionalAttrs databaseActuallyCreateLocally {
       enable = true;
       ensureUsers = singleton { name = cfg.databaseUsername; };
     };
     # The postgresql module doesn't currently support concepts like
     # objects owners and extensions; for now we tack on what's needed
     # here.
-    systemd.services.postgresql.postStart = mkAfter (optionalString cfg.databaseCreateLocally ''
+    systemd.services.postgresql.postStart = mkAfter (optionalString databaseActuallyCreateLocally ''
       $PSQL -tAc "SELECT 1 FROM pg_database WHERE datname = '${cfg.databaseName}'" | grep -q 1 || $PSQL -tAc 'CREATE DATABASE "${cfg.databaseName}" OWNER "${cfg.databaseUsername}"'
       current_owner=$($PSQL -tAc "SELECT pg_catalog.pg_get_userbyid(datdba) FROM pg_catalog.pg_database WHERE datname = '${cfg.databaseName}'")
       if [[ "$current_owner" != "${cfg.databaseUsername}" ]]; then
-- 
GitLab


From 815d940e524624ec78651617b928ba58eecd6699 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kieran.meinhardt@gmail.com>
Date: Tue, 24 Sep 2019 15:25:43 +0200
Subject: [PATCH 0890/2254] tamarin-prover: mark as broken because upstream is
 broken

---
 pkgs/applications/science/logic/tamarin-prover/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/science/logic/tamarin-prover/default.nix b/pkgs/applications/science/logic/tamarin-prover/default.nix
index 40378f8c04d..9b87b8c899e 100644
--- a/pkgs/applications/science/logic/tamarin-prover/default.nix
+++ b/pkgs/applications/science/logic/tamarin-prover/default.nix
@@ -104,4 +104,6 @@ mkDerivation (common "tamarin-prover" src // {
           tamarin-prover-term
           tamarin-prover-theory
         ];
+
+  broken = true;
 })
-- 
GitLab


From a7e1051f62ed13f7147826f99e441183d17bb231 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 24 Sep 2019 08:45:44 -0400
Subject: [PATCH 0891/2254] vivaldi: 2.8.1664.35-1 -> 2.8.1664.38-1

---
 pkgs/applications/networking/browsers/vivaldi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index d93c8f85925..be08df3a704 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -17,11 +17,11 @@ let
   vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
 in stdenv.mkDerivation rec {
   pname = "vivaldi";
-  version = "2.8.1664.35-1";
+  version = "2.8.1664.38-1";
 
   src = fetchurl {
     url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb";
-    sha256 = "0wrpn2figljvq9xldpqb1wf81fpwj91ppi2lzvcg5ycpl2a90x7j";
+    sha256 = "1znhlwwgq4k0fplr4l8ixgn6g5k26ns77j2dm0pjg3a2jgjq6rdr";
   };
 
   unpackPhase = ''
-- 
GitLab


From 2d6fbcd94eef8857a7eb35947a5ac9b282186eaf Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 24 Sep 2019 15:57:05 +0200
Subject: [PATCH 0892/2254] vtk: build with system libtiff

fixes vtktiff, therefore at least gdcm
---
 pkgs/development/libraries/vtk/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix
index c0b8fd7d167..3cb8998485a 100644
--- a/pkgs/development/libraries/vtk/default.nix
+++ b/pkgs/development/libraries/vtk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, libGLU_combined, libX11, xorgproto, libXt
+{ stdenv, fetchurl, cmake, libGLU_combined, libX11, xorgproto, libXt, libtiff
 , qtLib ? null
 # Darwin support
 , Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL
@@ -20,7 +20,9 @@ stdenv.mkDerivation rec {
     sha256 = "0nm7xwwj7rnsxjdv2ssviys8nhci4n9iiiqm2y14s520hl2dsp1d";
   };
 
-  buildInputs = [ cmake ]
+  nativeBuildInputs = [ cmake ];
+
+  buildInputs = [ libtiff ]
     ++ optional (qtLib != null) qtLib
     ++ optionals stdenv.isLinux [ libGLU_combined libX11 xorgproto libXt ]
     ++ optionals stdenv.isDarwin [ xpc Cocoa CoreServices DiskArbitration IOKit
@@ -38,7 +40,7 @@ stdenv.mkDerivation rec {
   # built and requiring one of the shared objects.
   # At least, we use -fPIC for other packages to be able to use this in shared
   # objects.
-  cmakeFlags = [ "-DCMAKE_C_FLAGS=-fPIC" "-DCMAKE_CXX_FLAGS=-fPIC" ]
+  cmakeFlags = [ "-DCMAKE_C_FLAGS=-fPIC" "-DCMAKE_CXX_FLAGS=-fPIC" "-DVTK_USE_SYSTEM_TIFF=1" ]
     ++ optional (qtLib != null) [ "-DVTK_USE_QT:BOOL=ON" ]
     ++ optional stdenv.isDarwin "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks";
 
-- 
GitLab


From daa724ae5ad1f901820734079bfc588ea5313c87 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 24 Sep 2019 15:57:46 +0200
Subject: [PATCH 0893/2254] xtreemfs: mark as broken

does not support openssl 1.1
---
 pkgs/tools/filesystems/xtreemfs/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/filesystems/xtreemfs/default.nix b/pkgs/tools/filesystems/xtreemfs/default.nix
index ea25b302e35..436037245bb 100644
--- a/pkgs/tools/filesystems/xtreemfs/default.nix
+++ b/pkgs/tools/filesystems/xtreemfs/default.nix
@@ -66,5 +66,6 @@ stdenv.mkDerivation {
     maintainers = with lib.maintainers; [ raskin matejc ];
     platforms = lib.platforms.linux;
     license = lib.licenses.bsd3;
+    broken = true;  # does not support openssl 1.1
   };
 }
-- 
GitLab


From dd2f026780399cf11c47fcf6085145b25b14307e Mon Sep 17 00:00:00 2001
From: Riley Inman <rileyminman@gmail.com>
Date: Tue, 24 Sep 2019 10:34:17 -0400
Subject: [PATCH 0894/2254] iosevka: Add comment to document privateBuildPlan

---
 pkgs/data/fonts/iosevka/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix
index 274c4b188b5..a1461032f1b 100644
--- a/pkgs/data/fonts/iosevka/default.nix
+++ b/pkgs/data/fonts/iosevka/default.nix
@@ -3,6 +3,15 @@
 
 # Custom font set options.
 # See https://github.com/be5invis/Iosevka#build-your-own-style
+# Ex:
+# privateBuildPlan = {
+#   family = "Iosevka Expanded";
+#
+#   design = [
+#     "sans"
+#     "expanded"
+#   ];
+# };
 , privateBuildPlan ? null
 # Extra parameters. Can be used for ligature mapping.
 , extraParameters ? null
-- 
GitLab


From 7df8575a723abaac022fa6bbd77aba66b96631f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kieran.meinhardt@gmail.com>
Date: Tue, 24 Sep 2019 17:01:21 +0200
Subject: [PATCH 0895/2254] idrisPackages.heyting-algebra: mark as broken

The functionality provided by this package has been added to the Idris contrib library (module `Interfaces.Verified`).
Therefore identifiers cannot be disambiguated anymore.
---
 pkgs/development/idris-modules/heyting-algebra.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/idris-modules/heyting-algebra.nix b/pkgs/development/idris-modules/heyting-algebra.nix
index 3fa546466c8..e6656545cbe 100644
--- a/pkgs/development/idris-modules/heyting-algebra.nix
+++ b/pkgs/development/idris-modules/heyting-algebra.nix
@@ -22,4 +22,6 @@ build-idris-package  {
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.brainrape ];
   };
+
+  broken = true;
 }
-- 
GitLab


From a7bf8161fa834a602278c15fcbdd955656b3aed8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 24 Sep 2019 17:08:00 +0200
Subject: [PATCH 0896/2254] picard: 2.1.3 -> 2.2.1

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

diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix
index 04a62b5d159..f6eee17f834 100644
--- a/pkgs/applications/audio/picard/default.nix
+++ b/pkgs/applications/audio/picard/default.nix
@@ -4,13 +4,13 @@ let
   pythonPackages = python3Packages;
 in pythonPackages.buildPythonApplication rec {
   pname = "picard";
-  version = "2.1.3";
+  version = "2.2.1";
 
   src = fetchFromGitHub {
     owner = "metabrainz";
     repo = pname;
     rev = "release-${version}";
-    sha256 = "1armg8vpvnbpk7rrfk9q7nj5gm56rza00ni9qwdyqpxp1xaz6apj";
+    sha256 = "1g7pbicf65hswbqmhrwlba9jm4r2vnggy7vy75z4256y7qcpwdfd";
   };
 
   nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ];
-- 
GitLab


From 1797c9c295a1ffe53866fdfc379afdb37efef09e Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Tue, 24 Sep 2019 17:51:09 +0200
Subject: [PATCH 0897/2254] sage: 8.9.beta9 -> 8.9.rc0

Sage now by default expects the lcalc library to be named Lfunction
(instead of libLfunction). This could be changed by an environment
variable (https://trac.sagemath.org/ticket/28224), but various distros
seem to agree on this standard
(https://groups.google.com/forum/#!topic/sage-packaging/xvh55IxHTZg) so
it's best just to follow it. The old standard was set by sage anyway and
sage is the only consumer of lcalc in nixpkgs.
---
 pkgs/applications/science/math/sage/sage-src.nix             | 4 ++--
 pkgs/development/libraries/science/math/lcalc/makefile.patch | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix
index e85a1f7239d..cf333b31531 100644
--- a/pkgs/applications/science/math/sage/sage-src.nix
+++ b/pkgs/applications/science/math/sage/sage-src.nix
@@ -10,14 +10,14 @@
 # all get the same sources with the same patches applied.
 
 stdenv.mkDerivation rec {
-  version = "8.9.beta9";
+  version = "8.9.rc0";
   pname = "sage-src";
 
   src = fetchFromGitHub {
     owner = "sagemath";
     repo = "sage";
     rev = version;
-    sha256 = "0axiazlr24rc98784i68hzkzjx7rvrf3qiqz2g6w120a2ls7f1qm";
+    sha256 = "112lgdnl11azhpvr8xsrw848l7axijfklcnx19byb0f0vkqd1n3j";
   };
 
   # Patches needed because of particularities of nix or the way this is packaged.
diff --git a/pkgs/development/libraries/science/math/lcalc/makefile.patch b/pkgs/development/libraries/science/math/lcalc/makefile.patch
index f55bbe3f24f..5c22cf0b84e 100644
--- a/pkgs/development/libraries/science/math/lcalc/makefile.patch
+++ b/pkgs/development/libraries/science/math/lcalc/makefile.patch
@@ -104,10 +104,10 @@ index 84e4e88..56ca676 100644
 -	cp -rf ../include $(INSTALL_DIR)/include/Lfunction
 +	install -d $(INSTALL_DIR)/bin
 +	install -d $(INSTALL_DIR)/$(LIB_DIR)
-+	install -d $(INSTALL_DIR)/include/libLfunction
++	install -d $(INSTALL_DIR)/include/Lfunction
 +	install lcalc $(INSTALL_DIR)/bin
 +	install libLfunction.so $(INSTALL_DIR)/$(LIB_DIR)
-+	install -m 644 -t $(INSTALL_DIR)/include/libLfunction ../include/*.h
++	install -m 644 -t $(INSTALL_DIR)/include/Lfunction ../include/*.h
  
  
  SRCS = Lcommandline.cc Lcommandline_elliptic.cc Lcommandline_globals.cc Lcommandline_misc.cc Lcommandline_numbertheory.cc Lcommandline_twist.cc Lcommandline_values_zeros.cc Lgamma.cc Lglobals.cc Lmisc.cc Lriemannsiegel.cc Lriemannsiegel_blfi.cc cmdline.c
-- 
GitLab


From f626a71be4b18387db415f1e1848182008b76953 Mon Sep 17 00:00:00 2001
From: Andrey Golovizin <ag@sologoc.com>
Date: Tue, 24 Sep 2019 17:57:53 +0200
Subject: [PATCH 0898/2254] gajim: add missing setuptools dependency

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

diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix
index 6da7320e953..1fd8c47a99c 100644
--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@@ -44,7 +44,7 @@ python3.pkgs.buildPythonApplication rec {
   ];
 
   propagatedBuildInputs = with python3.pkgs; [
-    nbxmpp pyasn1 pygobject3 dbus-python pillow cssutils precis-i18n keyring
+    nbxmpp pyasn1 pygobject3 dbus-python pillow cssutils precis-i18n keyring setuptools
   ] ++ lib.optionals enableE2E [ pycrypto python-gnupg ]
     ++ lib.optional enableRST docutils
     ++ lib.optionals enableOmemoPluginDependencies [ python-axolotl qrcode ]
-- 
GitLab


From 8eb0413c05df225fa697d3d413bfa25158d753ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kieran.meinhardt@gmail.com>
Date: Tue, 24 Sep 2019 19:49:25 +0200
Subject: [PATCH 0899/2254] idrisPackages.heyting-algebra: remove

---
 pkgs/development/idris-modules/default.nix    |  2 --
 .../idris-modules/heyting-algebra.nix         | 27 -------------------
 2 files changed, 29 deletions(-)
 delete mode 100644 pkgs/development/idris-modules/heyting-algebra.nix

diff --git a/pkgs/development/idris-modules/default.nix b/pkgs/development/idris-modules/default.nix
index 47c6998a587..074a260b816 100644
--- a/pkgs/development/idris-modules/default.nix
+++ b/pkgs/development/idris-modules/default.nix
@@ -103,8 +103,6 @@
 
     html = callPackage ./html.nix {};
 
-    heyting-algebra = callPackage ./heyting-algebra.nix {};
-
     hezarfen = callPackage ./hezarfen.nix {};
 
     hrtime = callPackage ./hrtime.nix {};
diff --git a/pkgs/development/idris-modules/heyting-algebra.nix b/pkgs/development/idris-modules/heyting-algebra.nix
deleted file mode 100644
index e6656545cbe..00000000000
--- a/pkgs/development/idris-modules/heyting-algebra.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ build-idris-package
-, fetchFromGitHub
-, contrib
-, lib
-}:
-build-idris-package  {
-  name = "heyting-algebra";
-  version = "2017-08-18";
-
-  idrisDeps = [ contrib ];
-
-  src = fetchFromGitHub {
-    owner = "Risto-Stevcev";
-    repo = "idris-heyting-algebra";
-    rev = "2c814c48246a5e19bff66e64a753208c7d59d397";
-    sha256 = "199cvhxiimlhchvsc66zwn0dls78f9lamam256ad65mv4cjmxv40";
-  };
-
-  meta = {
-    description = "Interfaces for heyting algebras and verified bounded join and meet semilattices";
-    homepage = https://github.com/Risto-Stevcev/idris-heyting-algebra;
-    license = lib.licenses.mit;
-    maintainers = [ lib.maintainers.brainrape ];
-  };
-
-  broken = true;
-}
-- 
GitLab


From aa27c1c6644e4df5c8163ce3a735889443b4f963 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Janne=20He=C3=9F?= <janne@hess.ooo>
Date: Tue, 24 Sep 2019 20:10:19 +0200
Subject: [PATCH 0900/2254] nixos/memcached: Switch to a system user

---
 nixos/modules/services/databases/memcached.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/databases/memcached.nix b/nixos/modules/services/databases/memcached.nix
index 84d2c8674f4..d1dfdb41bf4 100644
--- a/nixos/modules/services/databases/memcached.nix
+++ b/nixos/modules/services/databases/memcached.nix
@@ -67,6 +67,7 @@ in
     users.users = optional (cfg.user == "memcached") {
       name = "memcached";
       description = "Memcached server user";
+      isSystemUser = true;
     };
 
     environment.systemPackages = [ memcached ];
-- 
GitLab


From 859b3b7f90d6072d962a6d7628349b2820eeb64b Mon Sep 17 00:00:00 2001
From: Andrey Ovcharov <sudormrfhalt@yandex.ru>
Date: Sat, 16 Feb 2019 17:51:59 +0700
Subject: [PATCH 0901/2254] thinkfan: 0.9.3 -> 1.0.1

---
 pkgs/tools/system/thinkfan/default.nix | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/system/thinkfan/default.nix b/pkgs/tools/system/thinkfan/default.nix
index 8c803400584..0310d6faf2e 100644
--- a/pkgs/tools/system/thinkfan/default.nix
+++ b/pkgs/tools/system/thinkfan/default.nix
@@ -1,18 +1,27 @@
-{ stdenv, fetchurl, cmake
+{ stdenv, fetchFromGitHub, cmakeCurses, libyamlcpp, pkgconfig
 , smartSupport ? false, libatasmart }:
 
 stdenv.mkDerivation rec {
   pname = "thinkfan";
-  version = "0.9.3";
+  version = "1.0.1";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/thinkfan/thinkfan-${version}.tar.gz";
-    sha256 = "0nz4c48f0i0dljpk5y33c188dnnwg8gz82s4grfl8l64jr4n675n";
+  src = fetchFromGitHub {
+    owner = "vmatare";
+    repo = "thinkfan";
+    rev = "${version}";
+    sha256 = "1983p8aryfgpyhflh5r5xz27y136a4vvm7plgrg44q4aicqbcp8j";
   };
 
-  nativeBuildInputs = [ cmake ];
+  configureFlags = [
+    "-DCMAKE_INSTALL_DOCDIR==share/doc/${pname}"
+    "-DUSE_NVML=OFF"
+    "-DUSE_ATASMART=ON"
+    "-DUSE_YAML=ON"
+  ];
 
-  buildInputs = stdenv.lib.optional smartSupport libatasmart;
+  nativeBuildInputs = [ cmakeCurses pkgconfig ];
+
+  buildInputs = [libyamlcpp] ++ stdenv.lib.optional smartSupport libatasmart;
 
   cmakeFlags = stdenv.lib.optional smartSupport "-DUSE_ATASMART=ON";
 
@@ -27,7 +36,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     license = stdenv.lib.licenses.gpl3;
-    homepage = http://thinkfan.sourceforge.net/;
+    homepage = https://github.com/vmatare/thinkfan;
     maintainers = with stdenv.lib.maintainers; [ domenkozar ];
     platforms = stdenv.lib.platforms.linux;
   };
-- 
GitLab


From 15f4112f53a0028e51d62fb7f9f06b7ec7491b10 Mon Sep 17 00:00:00 2001
From: Christine Koppelt <cko@users.noreply.github.com>
Date: Tue, 24 Sep 2019 21:00:03 +0200
Subject: [PATCH 0902/2254] fixing remarks from #55895 (thinkfan: 0.9.3 ->
 1.0.1)

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

diff --git a/pkgs/tools/system/thinkfan/default.nix b/pkgs/tools/system/thinkfan/default.nix
index 0310d6faf2e..22bee93cb95 100644
--- a/pkgs/tools/system/thinkfan/default.nix
+++ b/pkgs/tools/system/thinkfan/default.nix
@@ -8,12 +8,12 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vmatare";
     repo = "thinkfan";
-    rev = "${version}";
+    rev = version;
     sha256 = "1983p8aryfgpyhflh5r5xz27y136a4vvm7plgrg44q4aicqbcp8j";
   };
 
   configureFlags = [
-    "-DCMAKE_INSTALL_DOCDIR==share/doc/${pname}"
+    "-DCMAKE_INSTALL_DOCDIR=share/doc/${pname}"
     "-DUSE_NVML=OFF"
     "-DUSE_ATASMART=ON"
     "-DUSE_YAML=ON"
-- 
GitLab


From 482a9537b2718300455544ef482432501ba87fa0 Mon Sep 17 00:00:00 2001
From: Christine Koppelt <cko@users.noreply.github.com>
Date: Tue, 24 Sep 2019 21:22:55 +0200
Subject: [PATCH 0903/2254] thinkfan: 1.0.1 -> 1.0.2

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

diff --git a/pkgs/tools/system/thinkfan/default.nix b/pkgs/tools/system/thinkfan/default.nix
index 22bee93cb95..f5a8a48c9f2 100644
--- a/pkgs/tools/system/thinkfan/default.nix
+++ b/pkgs/tools/system/thinkfan/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "thinkfan";
-  version = "1.0.1";
+  version = "1.0.2";
 
   src = fetchFromGitHub {
     owner = "vmatare";
     repo = "thinkfan";
     rev = version;
-    sha256 = "1983p8aryfgpyhflh5r5xz27y136a4vvm7plgrg44q4aicqbcp8j";
+    sha256 = "107vw0962hrwva3wra9n3hxlbfzg82ldc10qssv3dspja88g8psr";
   };
 
   configureFlags = [
-- 
GitLab


From 40318362ebe957624c6d7dc02760c3719cebfecc Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Fri, 30 Aug 2019 12:39:47 -0700
Subject: [PATCH 0904/2254] python3Packages.dotnetcore2: init at 2.1.8.1

---
 .../python-modules/dotnetcore2/default.nix    | 59 +++++++++++++++++++
 .../python-modules/dotnetcore2/runtime.patch  | 19 ++++++
 pkgs/top-level/python-packages.nix            |  4 ++
 3 files changed, 82 insertions(+)
 create mode 100644 pkgs/development/python-modules/dotnetcore2/default.nix
 create mode 100644 pkgs/development/python-modules/dotnetcore2/runtime.patch

diff --git a/pkgs/development/python-modules/dotnetcore2/default.nix b/pkgs/development/python-modules/dotnetcore2/default.nix
new file mode 100644
index 00000000000..caafeb54740
--- /dev/null
+++ b/pkgs/development/python-modules/dotnetcore2/default.nix
@@ -0,0 +1,59 @@
+{ stdenv, lib, buildPythonPackage, fetchPypi, python, isPy27
+, dotnet-sdk
+, substituteAll
+, distro
+, unzip
+}:
+
+buildPythonPackage rec {
+  pname = "dotnetcore2";
+  version = "2.1.8.1";
+  format = "wheel";
+  disabled = isPy27;
+
+  src = fetchPypi {
+    inherit pname version format;
+    python = "py3";
+    platform = "manylinux1_x86_64";
+    sha256 = "13zrff5j767d3f8drl397sjhl28winsrfa8pa20svf00xfcsy34s";
+  };
+
+  nativeBuildInputs = [ unzip ];
+
+  propagatedBuildInputs = [ distro ];
+
+  # needed to apply patches
+  prePatch = ''
+    unzip dist/dotnet*
+  '';
+
+  patches = [
+    ( substituteAll {
+        src = ./runtime.patch;
+        dotnet = dotnet-sdk;
+      }
+    )
+  ];
+
+  # unfortunately the noraml pip install fails because the manylinux1 format check fails with NixOS
+  installPhase = ''
+    mkdir -p $out/${python.sitePackages}/${pname}
+    # copy metadata
+    cp -r dotnetcore2-2* $out/${python.sitePackages}
+    # copy non-dotnetcore related files
+    cp -r dotnetcore2/{__init__.py,runtime.py} $out/${python.sitePackages}/${pname}
+  '';
+
+  # no tests, ensure it's one useful function works
+  checkPhase = ''
+    ${python.interpreter} -c 'from dotnetcore2 import runtime; print(runtime.get_runtime_path())'
+  '';
+
+  meta = with lib; {
+    description = "DotNet Core runtime";
+    homepage = "https://github.com/dotnet/core";
+    license = licenses.mit;
+    platforms = [ "x86_64-linux" ];
+    maintainers = with maintainers; [ jonringer ];
+  };
+}
diff --git a/pkgs/development/python-modules/dotnetcore2/runtime.patch b/pkgs/development/python-modules/dotnetcore2/runtime.patch
new file mode 100644
index 00000000000..54322087a78
--- /dev/null
+++ b/pkgs/development/python-modules/dotnetcore2/runtime.patch
@@ -0,0 +1,19 @@
+diff a/dotnetcore2/runtime.py b/dotnetcore2/runtime.py
+--- a/dotnetcore2/runtime.py
++++ b/dotnetcore2/runtime.py
+@@ -39,13 +39,13 @@ def _get_bin_folder() -> str:
+ 
+ 
+ def get_runtime_path():
++    return "@dotnet@/dotnet"
+     search_string = os.path.join(_get_bin_folder(), 'dotnet*')
+     matches = [f for f in glob.glob(search_string, recursive=True)]
+     return matches[0]
+ 
+ def ensure_dependencies() -> Optional[str]:
+-    if dist is None:
+-        return None
++    return None
+ 
+     bin_folder = _get_bin_folder()
+     deps_path = os.path.join(bin_folder, 'deps')
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 654f1c50f40..0c155424463 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -523,6 +523,10 @@ in {
 
   dominate = callPackage ../development/python-modules/dominate { };
 
+  dotnetcore2 = callPackage ../development/python-modules/dotnetcore2 {
+    inherit (pkgs) substituteAll dotnet-sdk;
+  };
+
   emcee = callPackage ../development/python-modules/emcee { };
 
   emailthreads = callPackage ../development/python-modules/emailthreads { };
-- 
GitLab


From fe8b82f557a265c1069f8a48233e3aaf7c0df1dc Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 25 Sep 2019 04:12:05 +0800
Subject: [PATCH 0905/2254] dxx-rebirth: build with gcc6 as gcc8 is not
 supported

---
 pkgs/games/dxx-rebirth/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/games/dxx-rebirth/default.nix b/pkgs/games/dxx-rebirth/default.nix
index 518b63ed483..82806c7521c 100644
--- a/pkgs/games/dxx-rebirth/default.nix
+++ b/pkgs/games/dxx-rebirth/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, scons, pkgconfig
+{ gcc6Stdenv, fetchurl, fetchpatch, scons, pkgconfig
 , SDL, SDL_mixer, libGLU_combined, physfs
 }:
 
@@ -8,7 +8,7 @@ let
     sha256 = "05mz77vml396mff43dbs50524rlm4fyds6widypagfbh5hc55qdc";
   };
 
-in stdenv.mkDerivation rec {
+in gcc6Stdenv.mkDerivation rec {
   pname = "dxx-rebirth";
   version = "0.59.100";
 
@@ -44,9 +44,9 @@ in stdenv.mkDerivation rec {
     install -Dm644 -t $out/share/doc/dxx-rebirth *.txt
   '';
 
-  meta = with stdenv.lib; {
+  meta = with gcc6Stdenv.lib; {
     description = "Source Port of the Descent 1 and 2 engines";
-    homepage = https://www.dxx-rebirth.com/;
+    homepage = "https://www.dxx-rebirth.com/";
     license = licenses.free;
     maintainers = with maintainers; [ peterhoeg ];
     platforms = with platforms; linux;
-- 
GitLab


From cd7ed820a09a2de82e606beb6c51f010ca271d83 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Mon, 23 Sep 2019 10:14:25 -0400
Subject: [PATCH 0906/2254] perlPackages.StructDumb: init at 0.09

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 8b1e7943fb6..6bc878725d3 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -15736,6 +15736,20 @@ let
     };
   };
 
+  StructDumb = buildPerlModule {
+    pname = "Struct-Dumb";
+    version = "0.09";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/P/PE/PEVANS/Struct-Dumb-0.09.tar.gz;
+      sha256 = "0g9rziaqxkm00vh30g1yfwzq3b1xl23p8fbm4rszqsp641wr2z9k";
+    };
+    buildInputs = [ TestFatal ];
+    meta = {
+      description = "make simple lightweight record-like structures";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   SubExporter = buildPerlPackage {
     pname = "Sub-Exporter";
     version = "0.987";
-- 
GitLab


From 9005bdd4609dd26a49f7d08644f5685290d01fea Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Mon, 23 Sep 2019 10:30:03 -0400
Subject: [PATCH 0907/2254] perlPackages.NetPrometheus: init at 0.07

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 6bc878725d3..047ef07746a 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -12665,6 +12665,21 @@ let
     };
   };
 
+  NetPrometheus = buildPerlModule {
+    pname = "Net-Prometheus";
+    version = "0.07";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/P/PE/PEVANS/Net-Prometheus-0.07.tar.gz;
+      sha256 = "1dh498b26wdaip053hw52317jjmb2n2r5209a1zv5yfrlxpblqm7";
+    };
+    propagatedBuildInputs = [ RefUtil StructDumb ];
+    buildInputs = [ TestFatal ];
+    meta = {
+      description = "export monitoring metrics for F<prometheus>";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   NetSCP = buildPerlPackage {
     pname = "Net-SCP";
     version = "0.08.reprise";
-- 
GitLab


From a1c0e10564f9a6281e14d7a7279b8589521e2c48 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 25 Sep 2019 05:00:14 +0800
Subject: [PATCH 0908/2254] mysql

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

diff --git a/pkgs/tools/security/thc-hydra/default.nix b/pkgs/tools/security/thc-hydra/default.nix
index aa36901e46b..14fc89e9170 100644
--- a/pkgs/tools/security/thc-hydra/default.nix
+++ b/pkgs/tools/security/thc-hydra/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, zlib, openssl, ncurses, libidn, pcre, libssh, libmysqlclient, postgresql
+{ stdenv, lib, fetchFromGitHub, zlib, openssl, ncurses, libidn, pcre, libssh, mysql, postgresql
 , withGUI ? false, makeWrapper, pkgconfig, gtk2 }:
 
 stdenv.mkDerivation rec {
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = lib.optionals withGUI [ pkgconfig makeWrapper ];
 
   buildInputs = [
-    zlib openssl ncurses libidn pcre libssh libmysqlclient postgresql
+    zlib openssl ncurses libidn pcre libssh mysql.connector-c postgresql
   ] ++ lib.optional withGUI gtk2;
 
   enableParallelBuilding = true;
-- 
GitLab


From c3a562f3e2affed5b583230a63841fe9191cd193 Mon Sep 17 00:00:00 2001
From: Christine Koppelt <cko@users.noreply.github.com>
Date: Wed, 25 Sep 2019 00:33:22 +0200
Subject: [PATCH 0909/2254] addressing remarks from @peterhoeg ( thinkfan:
 0.9.3 -> 1.0.2)

---
 pkgs/tools/system/thinkfan/default.nix | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/pkgs/tools/system/thinkfan/default.nix b/pkgs/tools/system/thinkfan/default.nix
index f5a8a48c9f2..60d47dab20e 100644
--- a/pkgs/tools/system/thinkfan/default.nix
+++ b/pkgs/tools/system/thinkfan/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmakeCurses, libyamlcpp, pkgconfig
+{ stdenv, fetchFromGitHub, cmake, libyamlcpp, pkgconfig
 , smartSupport ? false, libatasmart }:
 
 stdenv.mkDerivation rec {
@@ -12,18 +12,14 @@ stdenv.mkDerivation rec {
     sha256 = "107vw0962hrwva3wra9n3hxlbfzg82ldc10qssv3dspja88g8psr";
   };
 
-  configureFlags = [
+  cmakeFlags = [
     "-DCMAKE_INSTALL_DOCDIR=share/doc/${pname}"
     "-DUSE_NVML=OFF"
-    "-DUSE_ATASMART=ON"
-    "-DUSE_YAML=ON"
-  ];
+  ] ++ stdenv.lib.optional smartSupport "-DUSE_ATASMART=ON";
 
-  nativeBuildInputs = [ cmakeCurses pkgconfig ];
+  nativeBuildInputs = [ cmake pkgconfig ];
 
-  buildInputs = [libyamlcpp] ++ stdenv.lib.optional smartSupport libatasmart;
-
-  cmakeFlags = stdenv.lib.optional smartSupport "-DUSE_ATASMART=ON";
+  buildInputs = [ libyamlcpp ] ++ stdenv.lib.optional smartSupport libatasmart;
 
   installPhase = ''
     install -Dm755 {.,$out/bin}/thinkfan
@@ -34,10 +30,10 @@ stdenv.mkDerivation rec {
     install -Dm644 {src,$out/share/man/man1}/thinkfan.1
   '';
 
-  meta = {
-    license = stdenv.lib.licenses.gpl3;
-    homepage = https://github.com/vmatare/thinkfan;
-    maintainers = with stdenv.lib.maintainers; [ domenkozar ];
-    platforms = stdenv.lib.platforms.linux;
+  meta = with stdenv.lib; {
+    license = licenses.gpl3;
+    homepage = "https://github.com/vmatare/thinkfan";
+    maintainers = with maintainers; [ domenkozar ];
+    platforms = platforms.linux;
   };
 }
-- 
GitLab


From 81cd220c67154ee7f7aaa4ea842a86fc39944d7f Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Fri, 5 Jul 2019 09:46:03 +0800
Subject: [PATCH 0910/2254] nixos/pymks: log to journal

---
 nixos/modules/rename.nix              |  2 ++
 nixos/modules/services/misc/pykms.nix | 39 ++++++++++++++++-----------
 2 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 0c7c45a4708..802ffcdc94e 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -66,6 +66,8 @@ with lib;
 
     (mkRenamedOptionModule [ "services" "clamav" "updater" "config" ] [ "services" "clamav" "updater" "extraConfig" ])
 
+    (mkRemovedOptionModule [ "services" "pykms" "verbose" ] "Use services.pykms.logLevel instead")
+
     (mkRemovedOptionModule [ "security" "setuidOwners" ] "Use security.wrappers instead")
     (mkRemovedOptionModule [ "security" "setuidPrograms" ] "Use security.wrappers instead")
 
diff --git a/nixos/modules/services/misc/pykms.nix b/nixos/modules/services/misc/pykms.nix
index ab00086e591..e2d1254602b 100644
--- a/nixos/modules/services/misc/pykms.nix
+++ b/nixos/modules/services/misc/pykms.nix
@@ -4,6 +4,7 @@ with lib;
 
 let
   cfg = config.services.pykms;
+  libDir = "/var/lib/pykms";
 
 in {
   meta.maintainers = with lib.maintainers; [ peterhoeg ];
@@ -28,12 +29,6 @@ in {
         description = "The port on which to listen.";
       };
 
-      verbose = mkOption {
-        type = types.bool;
-        default = false;
-        description = "Show verbose output.";
-      };
-
       openFirewallPort = mkOption {
         type = types.bool;
         default = false;
@@ -45,30 +40,44 @@ in {
         default = "64M";
         description = "How much memory to use at most.";
       };
+
+      logLevel = mkOption {
+        type = types.enum [ "CRITICAL" "ERROR" "WARNING" "INFO" "DEBUG" "MINI" ];
+        default = "INFO";
+        description = "How much to log";
+      };
+
+      extraArgs = mkOption {
+        type = types.listOf types.str;
+        default = [];
+        description = "Additional arguments";
+      };
     };
   };
 
   config = mkIf cfg.enable {
     networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewallPort [ cfg.port ];
 
-    systemd.services.pykms = let
-      home = "/var/lib/pykms";
-    in {
+    systemd.services.pykms = {
       description = "Python KMS";
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
       # python programs with DynamicUser = true require HOME to be set
-      environment.HOME = home;
+      environment.HOME = libDir;
       serviceConfig = with pkgs; {
         DynamicUser = true;
-        StateDirectory = baseNameOf home;
-        ExecStartPre = "${getBin pykms}/bin/create_pykms_db.sh ${home}/clients.db";
+        StateDirectory = baseNameOf libDir;
+        ExecStartPre = "${getBin pykms}/libexec/create_pykms_db.sh ${libDir}/clients.db";
         ExecStart = lib.concatStringsSep " " ([
-          "${getBin pykms}/bin/server.py"
+          "${getBin pykms}/bin/server"
+          "--logfile STDOUT"
+          "--loglevel ${cfg.logLevel}"
+        ] ++ cfg.extraArgs ++ [
           cfg.listenAddress
           (toString cfg.port)
-        ] ++ lib.optional cfg.verbose "--verbose");
-        WorkingDirectory = home;
+        ]);
+        ProtectHome = "tmpfs";
+        WorkingDirectory = libDir;
         Restart = "on-failure";
         MemoryLimit = cfg.memoryLimit;
       };
-- 
GitLab


From bf9cecf28d97b9cbcef5fc65cd8cbd297d405137 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Fri, 5 Jul 2019 09:46:13 +0800
Subject: [PATCH 0911/2254] pykms: 20180208 -> 20190611

New upstream.
---
 pkgs/tools/networking/pykms/default.nix | 54 ++++++++++++++-----------
 1 file changed, 31 insertions(+), 23 deletions(-)

diff --git a/pkgs/tools/networking/pykms/default.nix b/pkgs/tools/networking/pykms/default.nix
index fdfa0f808ec..e1a13b73120 100644
--- a/pkgs/tools/networking/pykms/default.nix
+++ b/pkgs/tools/networking/pykms/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchFromGitHub, python3Packages, writeText, writeScript
+{ stdenv, runtimeShell, fetchFromGitHub, python3, writeText, writeScript
 , coreutils, sqlite }:
 
-with python3Packages;
+with python3.pkgs;
 
 let
   dbSql = writeText "create_pykms_db.sql" ''
@@ -18,38 +18,45 @@ let
   '';
 
   dbScript = writeScript "create_pykms_db.sh" (with stdenv.lib; ''
-    #!${stdenv.shell} -eu
+    #!${runtimeShell}
 
-    db=$1
+    set -eEuo pipefail
 
-    ${getBin coreutils}/bin/install -d $(dirname $db)
+    db=$1
 
     if [ ! -e $db ] ; then
       ${getBin sqlite}/bin/sqlite3 $db < ${dbSql}
     fi
   '');
 
-in buildPythonApplication {
+in buildPythonApplication rec {
   pname = "pykms";
-  version = "20180208";
+  version = "20190611";
 
   src = fetchFromGitHub {
-    owner  = "ThunderEX";
+    owner  = "SystemRage";
     repo   = "py-kms";
-    rev    = "a1666a0ee5b404569a234afd05b164accc9a8845";
-    sha256 = "17yj5n8byxp09l5zkap73hpphjy35px84wy68ps824w8l0l8kcd4";
+    rev    = "dead208b1593655377fe8bc0d74cc4bead617103";
+    sha256 = "065qpkfqrahsam1rb43vnasmzrangan5z1pr3p6s0sqjz5l2jydp";
   };
 
-  propagatedBuildInputs = [ pytz ];
+  sourceRoot = "source/py-kms";
 
-  prePatch = ''
-    siteDir=$out/${python.sitePackages}
+  propagatedBuildInputs = [ systemd pytz tzlocal ];
 
-    substituteInPlace kmsBase.py \
+  postPatch = ''
+    siteDir=$out/${python3.sitePackages}
+
+    substituteInPlace pykms_DB2Dict.py \
       --replace "'KmsDataBase.xml'" "'$siteDir/KmsDataBase.xml'"
+
+    # we are logging to journal
+    sed -i pykms_Misc.py \
+      -e '6ifrom systemd import journal' \
+      -e 's/log_obj.addHandler(log_handler)/log_obj.addHandler(journal.JournalHandler())/'
   '';
 
-  dontBuild = true;
+  format = "other";
 
   # there are no tests
   doCheck = false;
@@ -57,18 +64,19 @@ in buildPythonApplication {
   installPhase = ''
     runHook preInstall
 
-    mkdir -p $out/{bin,share/doc/pykms} $siteDir
+    mkdir -p $siteDir
 
     mv * $siteDir
-    for b in client server ; do
-      makeWrapper ${python.interpreter} $out/bin/$b.py \
-        --argv0 $b \
-        --add-flags $siteDir/$b.py
+    for b in Client Server ; do
+      makeWrapper ${python.interpreter} $out/bin/''${b,,} \
+        --argv0 ''${b,,} \
+        --add-flags $siteDir/pykms_$b.py \
+        --prefix PYTHONPATH : "$(toPythonPath ${systemd})"
     done
 
-    install -m755 ${dbScript} $out/bin/create_pykms_db.sh
+    install -Dm755 ${dbScript} $out/libexec/create_pykms_db.sh
 
-    mv $siteDir/README.md $out/share/doc/pykms/
+    install -Dm644 ../README.md -t $out/share/doc/pykms
 
     ${python.interpreter} -m compileall $siteDir
 
@@ -77,7 +85,7 @@ in buildPythonApplication {
 
   meta = with stdenv.lib; {
     description = "Windows KMS (Key Management Service) server written in Python";
-    homepage    = https://github.com/ThunderEX/py-kms;
+    homepage    = "https://github.com/SystemRage/py-kms";
     license     = licenses.mit;
     maintainers = with maintainers; [ peterhoeg ];
   };
-- 
GitLab


From 1e2602780261fdbfb45e85b112a8ad41d5fbfe71 Mon Sep 17 00:00:00 2001
From: Daniel Albert <esclear@users.noreply.github.com>
Date: Wed, 25 Sep 2019 00:48:01 +0200
Subject: [PATCH 0912/2254] vlc: Add libssh2 as dependency to support sftp
 inputs

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

diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index a38076ca42b..2396a224d45 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -5,7 +5,7 @@
 , libvorbis, libtheora, speex, lua5, libgcrypt, libgpgerror, libupnp
 , libcaca, libpulseaudio, flac, schroedinger, libxml2, librsvg
 , mpeg2dec, systemd, gnutls, avahi, libcddb, libjack2, SDL, SDL_image
-, libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, liboggz
+, libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, libssh2, liboggz
 , libass, libva, libdvbpsi, libdc1394, libraw1394, libopus
 , libvdpau, libsamplerate, live555, fluidsynth, wayland, wayland-protocols
 , onlyLibVLC ? false
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
     libbluray dbus fribidi libvorbis libtheora speex lua5 libgcrypt libgpgerror
     libupnp libcaca libpulseaudio flac schroedinger libxml2 librsvg mpeg2dec
     systemd gnutls avahi libcddb SDL SDL_image libmtp unzip taglib libarchive
-    libkate libtiger libv4l samba liboggz libass libdvbpsi libva
+    libkate libtiger libv4l samba libssh2 liboggz libass libdvbpsi libva
     xorg.xlibsWrapper xorg.libXv xorg.libXvMC xorg.libXpm xorg.xcbutilkeysyms
     libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate
     fluidsynth wayland wayland-protocols
-- 
GitLab


From 892fff48fd4e7b3a03d3baebb0c27a94cd3842e0 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 25 Sep 2019 08:07:30 +0800
Subject: [PATCH 0913/2254] home-assistant: 0.96.2 -> 0.99.2

---
 .../home-assistant/component-packages.nix     | 37 ++++++++++++++-----
 pkgs/servers/home-assistant/default.nix       |  2 +-
 .../home-assistant/parse-requirements.py      |  4 +-
 3 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 104a11ad281..9ea2aa7ae8e 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
 # Do not edit!
 
 {
-  version = "0.96.2";
+  version = "0.99.2";
   components = {
     "abode" = ps: with ps; [  ];
     "acer_projector" = ps: with ps; [ pyserial ];
@@ -28,6 +28,7 @@
     "androidtv" = ps: with ps; [  ];
     "anel_pwrctrl" = ps: with ps; [  ];
     "anthemav" = ps: with ps; [  ];
+    "apache_kafka" = ps: with ps; [  ];
     "apcupsd" = ps: with ps; [  ];
     "api" = ps: with ps; [ aiohttp-cors ];
     "apns" = ps: with ps; [  ];
@@ -44,12 +45,14 @@
     "asterisk_cdr" = ps: with ps; [  ];
     "asterisk_mbox" = ps: with ps; [  ];
     "asuswrt" = ps: with ps; [  ];
+    "atome" = ps: with ps; [  ];
     "august" = ps: with ps; [  ];
     "aurora" = ps: with ps; [  ];
     "aurora_abb_powerone" = ps: with ps; [  ];
     "auth" = ps: with ps; [ aiohttp-cors ];
     "automatic" = ps: with ps; [ aiohttp-cors ];
     "automation" = ps: with ps; [ aiohttp-cors ];
+    "avea" = ps: with ps; [  ];
     "avion" = ps: with ps; [  ];
     "awair" = ps: with ps; [  ];
     "aws" = ps: with ps; [  ];
@@ -59,6 +62,7 @@
     "bayesian" = ps: with ps; [  ];
     "bbb_gpio" = ps: with ps; [  ];
     "bbox" = ps: with ps; [  ];
+    "beewi_smartclim" = ps: with ps; [  ];
     "bh1750" = ps: with ps; [  ];
     "binary_sensor" = ps: with ps; [  ];
     "bitcoin" = ps: with ps; [  ];
@@ -131,6 +135,7 @@
     "decora" = ps: with ps; [  ];
     "decora_wifi" = ps: with ps; [  ];
     "default_config" = ps: with ps; [ pynacl aiohttp-cors distro netdisco sqlalchemy zeroconf ];
+    "delijn" = ps: with ps; [  ];
     "deluge" = ps: with ps; [ deluge-client ];
     "demo" = ps: with ps; [ aiohttp-cors ];
     "denon" = ps: with ps; [  ];
@@ -173,7 +178,6 @@
     "ecovacs" = ps: with ps; [  ];
     "eddystone_temperature" = ps: with ps; [ construct ];
     "edimax" = ps: with ps; [  ];
-    "edp_redy" = ps: with ps; [  ];
     "ee_brightbox" = ps: with ps; [  ];
     "efergy" = ps: with ps; [  ];
     "egardia" = ps: with ps; [  ];
@@ -222,6 +226,7 @@
     "fints" = ps: with ps; [ fints ];
     "fitbit" = ps: with ps; [ aiohttp-cors fitbit ];
     "fixer" = ps: with ps; [  ];
+    "fleetgo" = ps: with ps; [  ];
     "flexit" = ps: with ps; [  ];
     "flic" = ps: with ps; [  ];
     "flock" = ps: with ps; [  ];
@@ -231,6 +236,8 @@
     "folder" = ps: with ps; [  ];
     "folder_watcher" = ps: with ps; [ watchdog ];
     "foobot" = ps: with ps; [  ];
+    "fortigate" = ps: with ps; [  ];
+    "fortios" = ps: with ps; [  ];
     "foscam" = ps: with ps; [  ];
     "foursquare" = ps: with ps; [ aiohttp-cors ];
     "free_mobile" = ps: with ps; [  ];
@@ -256,6 +263,7 @@
     "geo_location" = ps: with ps; [  ];
     "geo_rss_events" = ps: with ps; [  ];
     "geofency" = ps: with ps; [ aiohttp-cors ];
+    "geonetnz_quakes" = ps: with ps; [  ];
     "github" = ps: with ps; [ PyGithub ];
     "gitlab_ci" = ps: with ps; [ python-gitlab ];
     "gitter" = ps: with ps; [  ];
@@ -272,7 +280,6 @@
     "google_translate" = ps: with ps; [ gtts-token ];
     "google_travel_time" = ps: with ps; [  ];
     "google_wifi" = ps: with ps; [  ];
-    "googlehome" = ps: with ps; [  ];
     "gpmdp" = ps: with ps; [ websocket_client ];
     "gpsd" = ps: with ps; [  ];
     "gpslogger" = ps: with ps; [ aiohttp-cors ];
@@ -280,6 +287,7 @@
     "greeneye_monitor" = ps: with ps; [  ];
     "greenwave" = ps: with ps; [  ];
     "group" = ps: with ps; [  ];
+    "growatt_server" = ps: with ps; [  ];
     "gstreamer" = ps: with ps; [  ];
     "gtfs" = ps: with ps; [  ];
     "gtt" = ps: with ps; [  ];
@@ -323,6 +331,7 @@
     "hydroquebec" = ps: with ps; [  ];
     "hyperion" = ps: with ps; [  ];
     "ialarm" = ps: with ps; [  ];
+    "iaqualink" = ps: with ps; [  ];
     "icloud" = ps: with ps; [  ];
     "idteck_prox" = ps: with ps; [  ];
     "ifttt" = ps: with ps; [ aiohttp-cors pyfttt ];
@@ -357,6 +366,7 @@
     "joaoapps_join" = ps: with ps; [  ];
     "juicenet" = ps: with ps; [  ];
     "kankun" = ps: with ps; [  ];
+    "keba" = ps: with ps; [  ];
     "keenetic_ndms2" = ps: with ps; [  ];
     "keyboard" = ps: with ps; [  ];
     "keyboard_remote" = ps: with ps; [ evdev ];
@@ -402,7 +412,7 @@
     "london_underground" = ps: with ps; [  ];
     "loopenergy" = ps: with ps; [  ];
     "lovelace" = ps: with ps; [  ];
-    "luci" = ps: with ps; [  ];
+    "luci" = ps: with ps; [ packaging ];
     "luftdaten" = ps: with ps; [ luftdaten ];
     "lupusec" = ps: with ps; [  ];
     "lutron" = ps: with ps; [  ];
@@ -440,6 +450,7 @@
     "mikrotik" = ps: with ps; [  ];
     "mill" = ps: with ps; [  ];
     "min_max" = ps: with ps; [  ];
+    "minio" = ps: with ps; [ minio ];
     "mitemp_bt" = ps: with ps; [  ];
     "mjpeg" = ps: with ps; [  ];
     "mobile_app" = ps: with ps; [ pynacl aiohttp-cors ];
@@ -497,9 +508,11 @@
     "nuimo_controller" = ps: with ps; [  ];
     "nuki" = ps: with ps; [  ];
     "nut" = ps: with ps; [  ];
+    "nws" = ps: with ps; [  ];
     "nx584" = ps: with ps; [  ];
     "nzbget" = ps: with ps; [  ];
     "oasa_telematics" = ps: with ps; [  ];
+    "obihai" = ps: with ps; [  ];
     "octoprint" = ps: with ps; [  ];
     "oem" = ps: with ps; [  ];
     "ohmconnect" = ps: with ps; [ defusedxml ];
@@ -546,6 +559,7 @@
     "plaato" = ps: with ps; [ aiohttp-cors ];
     "plant" = ps: with ps; [  ];
     "plex" = ps: with ps; [  ];
+    "plugwise" = ps: with ps; [  ];
     "plum_lightpad" = ps: with ps; [  ];
     "pocketcasts" = ps: with ps; [  ];
     "point" = ps: with ps; [ aiohttp-cors ];
@@ -578,6 +592,7 @@
     "radiotherm" = ps: with ps; [  ];
     "rainbird" = ps: with ps; [  ];
     "raincloud" = ps: with ps; [  ];
+    "rainforest_eagle" = ps: with ps; [  ];
     "rainmachine" = ps: with ps; [  ];
     "random" = ps: with ps; [  ];
     "raspihats" = ps: with ps; [  ];
@@ -597,7 +612,6 @@
     "rfxtrx" = ps: with ps; [  ];
     "ring" = ps: with ps; [ ha-ffmpeg ];
     "ripple" = ps: with ps; [  ];
-    "ritassist" = ps: with ps; [  ];
     "rmvtransport" = ps: with ps; [  ];
     "rocketchat" = ps: with ps; [  ];
     "roku" = ps: with ps; [  ];
@@ -613,7 +627,6 @@
     "rtorrent" = ps: with ps; [  ];
     "russound_rio" = ps: with ps; [  ];
     "russound_rnet" = ps: with ps; [  ];
-    "ruter" = ps: with ps; [  ];
     "sabnzbd" = ps: with ps; [  ];
     "samsungtv" = ps: with ps; [ wakeonlan ];
     "satel_integra" = ps: with ps; [  ];
@@ -647,6 +660,7 @@
     "skybell" = ps: with ps; [  ];
     "slack" = ps: with ps; [  ];
     "sleepiq" = ps: with ps; [  ];
+    "slide" = ps: with ps; [  ];
     "sma" = ps: with ps; [  ];
     "smappee" = ps: with ps; [  ];
     "smarthab" = ps: with ps; [  ];
@@ -689,6 +703,7 @@
     "stream" = ps: with ps; [ aiohttp-cors av ];
     "streamlabswater" = ps: with ps; [  ];
     "stride" = ps: with ps; [  ];
+    "suez_water" = ps: with ps; [  ];
     "sun" = ps: with ps; [  ];
     "supervisord" = ps: with ps; [  ];
     "supla" = ps: with ps; [  ];
@@ -724,7 +739,7 @@
     "telnet" = ps: with ps; [  ];
     "temper" = ps: with ps; [  ];
     "template" = ps: with ps; [  ];
-    "tensorflow" = ps: with ps; [ numpy pillow protobuf ];
+    "tensorflow" = ps: with ps; [ numpy pillow protobuf tensorflow ];
     "tesla" = ps: with ps; [  ];
     "tfiac" = ps: with ps; [  ];
     "thermoworks_smoke" = ps: with ps; [ stringcase ];
@@ -748,7 +763,7 @@
     "touchline" = ps: with ps; [  ];
     "tplink" = ps: with ps; [  ];
     "tplink_lte" = ps: with ps; [  ];
-    "traccar" = ps: with ps; [ stringcase ];
+    "traccar" = ps: with ps; [ aiohttp-cors stringcase ];
     "trackr" = ps: with ps; [  ];
     "tradfri" = ps: with ps; [  ];
     "trafikverket_train" = ps: with ps; [  ];
@@ -759,6 +774,7 @@
     "trend" = ps: with ps; [ numpy ];
     "tts" = ps: with ps; [ aiohttp-cors mutagen ];
     "tuya" = ps: with ps; [  ];
+    "twentemilieu" = ps: with ps; [  ];
     "twilio" = ps: with ps; [ aiohttp-cors twilio ];
     "twilio_call" = ps: with ps; [ aiohttp-cors twilio ];
     "twilio_sms" = ps: with ps; [ aiohttp-cors twilio ];
@@ -771,7 +787,7 @@
     "unifi" = ps: with ps; [ aiounifi ];
     "unifi_direct" = ps: with ps; [ pexpect ];
     "universal" = ps: with ps; [  ];
-    "upc_connect" = ps: with ps; [ defusedxml ];
+    "upc_connect" = ps: with ps; [  ];
     "upcloud" = ps: with ps; [  ];
     "updater" = ps: with ps; [ distro ];
     "upnp" = ps: with ps; [  ];
@@ -794,6 +810,8 @@
     "version" = ps: with ps; [  ];
     "vesync" = ps: with ps; [  ];
     "viaggiatreno" = ps: with ps; [  ];
+    "vicare" = ps: with ps; [  ];
+    "vivotek" = ps: with ps; [  ];
     "vizio" = ps: with ps; [  ];
     "vlc" = ps: with ps; [  ];
     "vlc_telnet" = ps: with ps; [  ];
@@ -819,6 +837,7 @@
     "whois" = ps: with ps; [  ];
     "wink" = ps: with ps; [  ];
     "wirelesstag" = ps: with ps; [  ];
+    "withings" = ps: with ps; [ aiohttp-cors ];
     "workday" = ps: with ps; [  ];
     "worldclock" = ps: with ps; [  ];
     "worldtidesinfo" = ps: with ps; [  ];
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index c36388b26fc..f8eeb97849a 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -98,7 +98,7 @@ let
   extraBuildInputs = extraPackages py.pkgs;
 
   # Don't forget to run parse-requirements.py after updating
-  hassVersion = "0.96.2";
+  hassVersion = "0.99.2";
 
 in with py.pkgs; buildPythonApplication rec {
   pname = "homeassistant";
diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py
index a2cf2d0386a..647e4513de4 100755
--- a/pkgs/servers/home-assistant/parse-requirements.py
+++ b/pkgs/servers/home-assistant/parse-requirements.py
@@ -33,7 +33,9 @@ PKG_SET = 'python3Packages'
 # the following can be used to choose one of them
 PKG_PREFERENCES = {
     # Use python3Packages.youtube-dl-light instead of python3Packages.youtube-dl
-    'youtube-dl': 'youtube-dl-light'
+    'youtube-dl': 'youtube-dl-light',
+    'tensorflow-bin': 'tensorflow',
+    'tensorflowWithoutCuda': 'tensorflow'
 }
 
 def get_version():
-- 
GitLab


From 838902a82c2e9d1621474e2e5ae476f08372c81f Mon Sep 17 00:00:00 2001
From: edef <edef@edef.eu>
Date: Wed, 25 Sep 2019 00:44:24 +0000
Subject: [PATCH 0914/2254] nix-generate-from-cpan: use pname/version rather
 than version

The `name` parameter to buildPerlPackage is deprecated, and
everything currently in perl-packages.nix has already been
converted to use pname/version instead.

This also changes the URLs to be pure string literals,
matching the convention used in nixpkgs in practice.
---
 maintainers/scripts/nix-generate-from-cpan.pl | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/maintainers/scripts/nix-generate-from-cpan.pl b/maintainers/scripts/nix-generate-from-cpan.pl
index 2dda39fd12e..d54d1c9e625 100755
--- a/maintainers/scripts/nix-generate-from-cpan.pl
+++ b/maintainers/scripts/nix-generate-from-cpan.pl
@@ -226,7 +226,7 @@ sub pkg_to_attr {
 
 sub get_pkg_name {
     my ($module) = @_;
-    return $module->package_name . '-' . $module->package_version;
+    return ( $module->package_name, $module->package_version );
 }
 
 sub read_meta {
@@ -375,13 +375,13 @@ die "module $module_name not found\n" if scalar @modules == 0;
 die "multiple packages that match module $module_name\n" if scalar @modules > 1;
 my $module = $modules[0];
 
-my $pkg_name  = get_pkg_name $module;
+my ($pkg_name, $pkg_version) = get_pkg_name $module;
 my $attr_name = pkg_to_attr $module;
 
 INFO( "attribute name: ", $attr_name );
 INFO( "module: ",         $module->module );
 INFO( "version: ",        $module->version );
-INFO( "package: ", $module->package, " (", $pkg_name, ", ", $attr_name, ")" );
+INFO( "package: ", $module->package, " (", "$pkg_name-$pkg_version", ", ", $attr_name, ")" );
 INFO( "path: ",    $module->path );
 
 my $tar_path = $module->fetch();
@@ -436,10 +436,11 @@ my $build_fun = -e "$pkg_path/Build.PL"
 print STDERR "===\n";
 
 print <<EOF;
-  ${\(is_reserved($attr_name) ? "\"$attr_name\"" : $attr_name)} = $build_fun rec {
-    name = "$pkg_name";
+  ${\(is_reserved($attr_name) ? "\"$attr_name\"" : $attr_name)} = $build_fun {
+    pname = "$pkg_name";
+    version = "$pkg_version";
     src = fetchurl {
-      url = "mirror://cpan/${\$module->path}/\${name}.${\$module->package_extension}";
+      url = "mirror://cpan/${\$module->path}/${\$module->package}";
       sha256 = "${\$module->status->checksum_value}";
     };
 EOF
-- 
GitLab


From ac1fbe68bbdf7fdeba28603fc5ad2c144fb2c018 Mon Sep 17 00:00:00 2001
From: edef <edef@edef.eu>
Date: Wed, 25 Sep 2019 00:44:52 +0000
Subject: [PATCH 0915/2254] nix-generate-from-cpan: strip leading v from
 versions

Everything currently in perl-packages.nix already does this,
so we might as well automate it.
---
 maintainers/scripts/nix-generate-from-cpan.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintainers/scripts/nix-generate-from-cpan.pl b/maintainers/scripts/nix-generate-from-cpan.pl
index d54d1c9e625..e04d3713e9a 100755
--- a/maintainers/scripts/nix-generate-from-cpan.pl
+++ b/maintainers/scripts/nix-generate-from-cpan.pl
@@ -226,7 +226,7 @@ sub pkg_to_attr {
 
 sub get_pkg_name {
     my ($module) = @_;
-    return ( $module->package_name, $module->package_version );
+    return ( $module->package_name, $module->package_version =~ s/^v(\d)/$1/r );
 }
 
 sub read_meta {
-- 
GitLab


From 2202601623faf37a7ed31dfedf4c78ed3931cc7a Mon Sep 17 00:00:00 2001
From: edef <edef@edef.eu>
Date: Wed, 25 Sep 2019 01:02:33 +0000
Subject: [PATCH 0916/2254] perlPackages.MustacheSimple: init at 1.3.6

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 047ef07746a..eabcff964b9 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -12280,6 +12280,20 @@ let
     doCheck = false; # Test performs network access.
   };
 
+  MustacheSimple = buildPerlPackage {
+    pname = "Mustache-Simple";
+    version = "1.3.6";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/C/CM/CMS/Mustache-Simple-v1.3.6.tar.gz";
+      sha256 = "51db5d51ff4b25a670d8bfabe3902b6d45434ecf78b29bc1fff19af6e7383003";
+    };
+    propagatedBuildInputs = [ YAMLLibYAML ];
+    meta = {
+      description = "A simple Mustache Renderer";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   namespaceautoclean = buildPerlPackage {
     pname = "namespace-autoclean";
     version = "0.28";
-- 
GitLab


From 81b6dec3c8c576227463d7a45fced3e8c49ef1f2 Mon Sep 17 00:00:00 2001
From: Evils <evils.devils@protonmail.com>
Date: Wed, 25 Sep 2019 04:23:59 +0200
Subject: [PATCH 0917/2254] fancontrol service init

---
 nixos/modules/module-list.nix                 |  1 +
 .../modules/services/hardware/fancontrol.nix  | 39 +++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 nixos/modules/services/hardware/fancontrol.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 775cc05aa0a..a648eef46e5 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -328,6 +328,7 @@
   ./services/hardware/bluetooth.nix
   ./services/hardware/bolt.nix
   ./services/hardware/brltty.nix
+  ./services/hardware/fancontrol.nix
   ./services/hardware/freefall.nix
   ./services/hardware/fwupd.nix
   ./services/hardware/illum.nix
diff --git a/nixos/modules/services/hardware/fancontrol.nix b/nixos/modules/services/hardware/fancontrol.nix
new file mode 100644
index 00000000000..bd4938ab509
--- /dev/null
+++ b/nixos/modules/services/hardware/fancontrol.nix
@@ -0,0 +1,39 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.fancontrol;
+
+in {
+
+  options.services.fancontrol = {
+    enable = mkOption {
+      type = types.bool;
+      default = false;
+      example = true;
+      description = "Whether to enable fancontrol (requires a configuration file, see pwmconfig)";
+    };
+
+    configFile = mkOption {
+      type = types.str;
+      default = "/etc/fancontrol";
+      example = "/home/user/.config/fancontrol";
+      description = "Path to the configuration file, likely generated with pwmconfig.";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.services.fancontrol = {
+      description = "Fan speed control from lm_sensors";
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig = {
+        Type = "simple";
+        User = "root";
+        ExecStart = "${pkgs.lm_sensors}/bin/fancontrol ${cfg.configFile}";
+      };
+    };
+  };
+
+
+}
-- 
GitLab


From 3966d0d30091a9113f76f2e96e33196784c3caf0 Mon Sep 17 00:00:00 2001
From: Christine Koppelt <cko@users.noreply.github.com>
Date: Wed, 25 Sep 2019 08:57:10 +0200
Subject: [PATCH 0918/2254] addressing remarks from @peterhoeg ( thinkfan:
 0.9.3 -> 1.0.2)

---
 pkgs/tools/system/thinkfan/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/system/thinkfan/default.nix b/pkgs/tools/system/thinkfan/default.nix
index 60d47dab20e..e0a061a45b8 100644
--- a/pkgs/tools/system/thinkfan/default.nix
+++ b/pkgs/tools/system/thinkfan/default.nix
@@ -31,6 +31,9 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
+    description = "A minimalist fan control program. Originally designed
+specifically for IBM/Lenovo Thinkpads, it now supports any kind of system via
+the sysfs hwmon interface (/sys/class/hwmon).";
     license = licenses.gpl3;
     homepage = "https://github.com/vmatare/thinkfan";
     maintainers = with maintainers; [ domenkozar ];
-- 
GitLab


From f5867c346f90a4a9a67b3a72cdad8789e8f36716 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Wed, 25 Sep 2019 02:59:09 -0400
Subject: [PATCH 0919/2254] peek: 1.3.1 -> 1.4.0

* build with meson
* add gstreamer deps
  Needed for recording in GNOME shell
---
 pkgs/applications/video/peek/default.nix | 65 +++++++++++++++++-------
 1 file changed, 48 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/video/peek/default.nix b/pkgs/applications/video/peek/default.nix
index 374ea08816f..973df7363a2 100644
--- a/pkgs/applications/video/peek/default.nix
+++ b/pkgs/applications/video/peek/default.nix
@@ -1,45 +1,76 @@
-{ stdenv, fetchFromGitHub, cmake, gettext, libxml2, pkgconfig, txt2man, vala_0_40, wrapGAppsHook
-, gsettings-desktop-schemas, gtk3, keybinder3, ffmpeg
+{ stdenv
+, fetchFromGitHub
+, meson
+, ninja
+, gettext
+, desktop-file-utils
+, appstream-glib
+, pkgconfig
+, txt2man
+, gzip
+, vala
+, wrapGAppsHook
+, gsettings-desktop-schemas
+, gtk3
+, glib
+, cairo
+, keybinder3
+, ffmpeg
+, python3
+, libxml2
+, gst_all_1
 }:
 
 stdenv.mkDerivation rec {
   pname = "peek";
-  version = "1.3.1";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "phw";
-    repo = pname;
+    repo = "peek";
     rev = version;
-    sha256 = "1fnvlklmg6s5rs3ql74isa5fgdkqqrpsyf8k2spxj520239l4vgb";
+    sha256 = "0q70hz9anqywqgksd43i8v9ijwy6djyzwnzzd94j44xqwsk9zdbb";
   };
 
-  preConfigure = ''
-    gappsWrapperArgs+=(--prefix PATH : ${stdenv.lib.makeBinPath [ ffmpeg ]})
-  '';
-
   nativeBuildInputs = [
-    cmake
+    appstream-glib
+    desktop-file-utils
     gettext
+    gzip
+    meson
+    ninja
+    libxml2
     pkgconfig
-    libxml2.bin
     txt2man
-    vala_0_40 # See https://github.com/NixOS/nixpkgs/issues/58433
+    python3
+    vala
     wrapGAppsHook
   ];
 
   buildInputs = [
+    cairo
+    glib
     gsettings-desktop-schemas
     gtk3
+    gst_all_1.gstreamer
+    gst_all_1.gst-plugins-good
+    gst_all_1.gst-plugins-ugly
     keybinder3
   ];
 
-  enableParallelBuilding = true;
+  postPatch = ''
+    patchShebangs build-aux/meson/postinstall.py data/man/build_man.sh
+  '';
+
+  preFixup = ''
+    gappsWrapperArgs+=(--prefix PATH : ${stdenv.lib.makeBinPath [ ffmpeg ]})
+  '';
 
   meta = with stdenv.lib; {
-    homepage    = https://github.com/phw/peek;
+    homepage = https://github.com/phw/peek;
     description = "Simple animated GIF screen recorder with an easy to use interface";
-    license     = licenses.gpl3;
-    maintainers = with maintainers; [ puffnfresh ];
-    platforms   = platforms.linux;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ puffnfresh worldofpeace ];
+    platforms = platforms.linux;
   };
 }
-- 
GitLab


From f9edafb796752b4457ef2f0029491a817b94430d Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Wed, 25 Sep 2019 03:06:37 -0400
Subject: [PATCH 0920/2254] gifski: 0.8.7 -> 0.9.1

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

diff --git a/pkgs/tools/graphics/gifski/default.nix b/pkgs/tools/graphics/gifski/default.nix
index 5875f64f7ef..f5076801326 100644
--- a/pkgs/tools/graphics/gifski/default.nix
+++ b/pkgs/tools/graphics/gifski/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "gifski";
-  version = "0.8.7";
+  version = "0.9.1";
 
   src = fetchFromGitHub {
     owner = "ImageOptim";
     repo = "gifski";
     rev = version;
-    sha256 = "0x41gyc5jk45jlx0hcq80j5gj1f66lcmbclqyx70l43ggslsi26f";
+    sha256 = "0dl5725imb2a2s0fskdqlnh2207ryyi2v5gz37cr5mf6khz898p2";
   };
 
-  cargoSha256 = "1pik6jcxg3amb5widpxn8j9szghbrhl0wsxjisizas3033xzrhcf";
+  cargoSha256 = "0wngsd0pmmxlwzxmyp8pvphh1ijs5s9k1mkkv688xpc4b8w0z10j";
 
   nativeBuildInputs = [ pkgconfig ];
 
-- 
GitLab


From c5df3a63e3a90f8d8c13196ec5769f947149d949 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Wed, 25 Sep 2019 03:07:07 -0400
Subject: [PATCH 0921/2254] peek: add gifski support

This is an optional feature for gif post-processing.
It produces much better quality gif.

Also added which to PATH with the wrapper, as it's
needed to check for these types of programs [0].

[0]: https://github.com/phw/peek/blob/8b48e8847ad6e1c09fde12972b917bc975153c9c/src/utils.vala#L57
---
 pkgs/applications/video/peek/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/video/peek/default.nix b/pkgs/applications/video/peek/default.nix
index 973df7363a2..4872b5ec2eb 100644
--- a/pkgs/applications/video/peek/default.nix
+++ b/pkgs/applications/video/peek/default.nix
@@ -19,6 +19,8 @@
 , python3
 , libxml2
 , gst_all_1
+, which
+, gifski
 }:
 
 stdenv.mkDerivation rec {
@@ -63,7 +65,7 @@ stdenv.mkDerivation rec {
   '';
 
   preFixup = ''
-    gappsWrapperArgs+=(--prefix PATH : ${stdenv.lib.makeBinPath [ ffmpeg ]})
+    gappsWrapperArgs+=(--prefix PATH : ${stdenv.lib.makeBinPath [ which ffmpeg gifski ]})
   '';
 
   meta = with stdenv.lib; {
-- 
GitLab


From e3dc1865d4ef2e4aca7d69c336080fad4c6aa93a Mon Sep 17 00:00:00 2001
From: Christine Koppelt <cko@users.noreply.github.com>
Date: Wed, 25 Sep 2019 09:26:53 +0200
Subject: [PATCH 0922/2254] maven: 3.6.1 -> 3.6.2

---
 .../development/tools/build-managers/apache-maven/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/apache-maven/default.nix b/pkgs/development/tools/build-managers/apache-maven/default.nix
index ef339e658c1..89103ee540c 100644
--- a/pkgs/development/tools/build-managers/apache-maven/default.nix
+++ b/pkgs/development/tools/build-managers/apache-maven/default.nix
@@ -2,7 +2,7 @@
 
 assert jdk != null;
 
-let version = "3.6.1"; in
+let version = "3.6.2"; in
 stdenv.mkDerivation rec {
   pname = "apache-maven";
   inherit version;
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://apache/maven/maven-3/${version}/binaries/${pname}-${version}-bin.tar.gz";
-    sha256 = "1rv97g9qr6sifl88rxbsqnz5i79m6ifs36srri08j3y3k5dc6a15";
+    sha256 = "1p6z6bmjfzda8kxy73jjg03yfkbssbb3vgvzspxxd0hljv8r5g1z";
   };
 
   buildInputs = [ makeWrapper ];
-- 
GitLab


From 96b2c4c3951d7c7d89148cb13f4a6bfcf304cdd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Vask=C3=B3?= <vlaci@balabit.hu>
Date: Wed, 25 Sep 2019 08:51:46 +0200
Subject: [PATCH 0923/2254] IPMIView: fix indentation

---
 pkgs/applications/misc/ipmiview/default.nix | 42 ++++++++++-----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/applications/misc/ipmiview/default.nix
index 64e0f0d325b..991a706cc6a 100644
--- a/pkgs/applications/misc/ipmiview/default.nix
+++ b/pkgs/applications/misc/ipmiview/default.nix
@@ -1,33 +1,33 @@
 { stdenv, fetchurl, patchelf, makeWrapper, xorg, gcc, gcc-unwrapped }:
 
 stdenv.mkDerivation rec {
-   pname = "IPMIView";
-   version = "2.14.0";
-   buildVersion = "180213";
+  pname = "IPMIView";
+  version = "2.14.0";
+  buildVersion = "180213";
 
-   src = fetchurl {
+  src = fetchurl {
     url = "ftp://ftp.supermicro.com/utility/IPMIView/Linux/IPMIView_${version}_build.${buildVersion}_bundleJRE_Linux_x64.tar.gz";
     sha256 = "1wp22wm7smlsb25x0cck4p660cycfczxj381930crd1qrf68mw4h";
   };
 
-   nativeBuildInputs = [ patchelf makeWrapper ];
+  nativeBuildInputs = [ patchelf makeWrapper ];
 
-   buildPhase = with xorg; ''
-     patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ libX11 libXext libXrender libXtst libXi ]}" ./jre/lib/amd64/xawt/libmawt.so
-     patchelf --set-rpath "${gcc-unwrapped.lib}/lib" ./libiKVM64.so
-     patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ libXcursor libX11 libXext libXrender libXtst libXi ]}" --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./jre/bin/javaws
-     patchelf --set-rpath "${gcc.cc}/lib:$out/jre/lib/amd64/jli" --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./jre/bin/java
-   '';
+  buildPhase = with xorg; ''
+    patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ libX11 libXext libXrender libXtst libXi ]}" ./jre/lib/amd64/xawt/libmawt.so
+    patchelf --set-rpath "${gcc-unwrapped.lib}/lib" ./libiKVM64.so
+    patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ libXcursor libX11 libXext libXrender libXtst libXi ]}" --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./jre/bin/javaws
+    patchelf --set-rpath "${gcc.cc}/lib:$out/jre/lib/amd64/jli" --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./jre/bin/java
+  '';
 
-   installPhase = ''
-     mkdir -p $out/bin
-     cp -R . $out/
-     makeWrapper $out/jre/bin/java $out/bin/IPMIView \
-       --prefix PATH : "$out/jre/bin" \
-       --add-flags "-jar $out/IPMIView20.jar"
-   '';
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -R . $out/
+    makeWrapper $out/jre/bin/java $out/bin/IPMIView \
+      --prefix PATH : "$out/jre/bin" \
+      --add-flags "-jar $out/IPMIView20.jar"
+  '';
 
-   meta = with stdenv.lib; {
+  meta = with stdenv.lib; {
     license = licenses.unfree;
-   };
-  }
+  };
+}
-- 
GitLab


From 13cd9e1bf3fd12458d201f7908898b3ee7c5bb20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Vask=C3=B3?= <vlaci@balabit.hu>
Date: Wed, 25 Sep 2019 09:07:49 +0200
Subject: [PATCH 0924/2254] IPMIView: 2.14.0 --> 2.16.0

Notes:
 * Previous URL is no longer accesible
 * build has to be adjusted for the updated JRE bundle
---
 pkgs/applications/misc/ipmiview/default.nix | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/applications/misc/ipmiview/default.nix
index 991a706cc6a..17b552a141b 100644
--- a/pkgs/applications/misc/ipmiview/default.nix
+++ b/pkgs/applications/misc/ipmiview/default.nix
@@ -1,33 +1,37 @@
-{ stdenv, fetchurl, patchelf, makeWrapper, xorg, gcc, gcc-unwrapped }:
+{ stdenv, fetchurl, patchelf, makeWrapper, xorg, fontconfig, freetype, gcc, gcc-unwrapped }:
 
 stdenv.mkDerivation rec {
   pname = "IPMIView";
-  version = "2.14.0";
-  buildVersion = "180213";
+  version = "2.16.0";
+  buildVersion = "190815";
 
   src = fetchurl {
-    url = "ftp://ftp.supermicro.com/utility/IPMIView/Linux/IPMIView_${version}_build.${buildVersion}_bundleJRE_Linux_x64.tar.gz";
-    sha256 = "1wp22wm7smlsb25x0cck4p660cycfczxj381930crd1qrf68mw4h";
+    url = "https://www.supermicro.com/wftp/utility/IPMIView/Linux/IPMIView_${version}_build.${buildVersion}_bundleJRE_Linux_x64.tar.gz";
+    sha256 = "0qw9zfnj0cyvab7ndamlw2y0gpczjhh1jkz8340kl42r2xmhkvpl";
   };
 
   nativeBuildInputs = [ patchelf makeWrapper ];
 
   buildPhase = with xorg; ''
-    patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ libX11 libXext libXrender libXtst libXi ]}" ./jre/lib/amd64/xawt/libmawt.so
+    patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ libX11 libXext libXrender libXtst libXi ]}" ./jre/lib/amd64/libawt_xawt.so
+    patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ freetype ]}" ./jre/lib/amd64/libfontmanager.so
     patchelf --set-rpath "${gcc-unwrapped.lib}/lib" ./libiKVM64.so
-    patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ libXcursor libX11 libXext libXrender libXtst libXi ]}" --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./jre/bin/javaws
     patchelf --set-rpath "${gcc.cc}/lib:$out/jre/lib/amd64/jli" --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./jre/bin/java
   '';
 
   installPhase = ''
     mkdir -p $out/bin
     cp -R . $out/
+
+    # LD_LIBRARY_PATH: fontconfig is used from java code
     makeWrapper $out/jre/bin/java $out/bin/IPMIView \
+      --set LD_LIBRARY_PATH "${stdenv.lib.makeLibraryPath [ fontconfig ]}" \
       --prefix PATH : "$out/jre/bin" \
-      --add-flags "-jar $out/IPMIView20.jar"
+      --add-flags "-jar $out/IPMIView20.jar" \
   '';
 
   meta = with stdenv.lib; {
     license = licenses.unfree;
+    maintainers = with maintainers; [ vlaci ];
   };
 }
-- 
GitLab


From 15b847821191b5fe80c836cdf7146448603a8928 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Vask=C3=B3?= <vlaci@balabit.hu>
Date: Wed, 25 Sep 2019 09:10:41 +0200
Subject: [PATCH 0925/2254] IPMIView: fix iKVM console

This commit fixes #26650

The main problem was that the iKVM related libraries are always loaded
from the current working directory. The bundled wrapper script makes
sure to CD to the package root folder. This is a no-go in nix as the
application writes its settings in the current working directory and the
store is read-only.

Workaround: create a directory in the users home, where the required
binaries are symlinked and is writable for the current user.

There was an additional issue that for some BMCs IPMIView relies on
the bundled `stunnel` binary to wrap the iKVM traffic in a TLS tunnel.
Therefore it has to be patched to make it executable and the `killall`
command is needed on the PATH because it is used to terminate the
`stunnel` process upon exit.
---
 pkgs/applications/misc/ipmiview/default.nix | 32 ++++++++++++++++++---
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/applications/misc/ipmiview/default.nix
index 17b552a141b..774b84947da 100644
--- a/pkgs/applications/misc/ipmiview/default.nix
+++ b/pkgs/applications/misc/ipmiview/default.nix
@@ -1,4 +1,14 @@
-{ stdenv, fetchurl, patchelf, makeWrapper, xorg, fontconfig, freetype, gcc, gcc-unwrapped }:
+{ stdenv
+, fetchurl
+, makeWrapper
+, patchelf
+, fontconfig
+, freetype
+, gcc
+, gcc-unwrapped
+, iputils
+, psmisc
+, xorg }:
 
 stdenv.mkDerivation rec {
   pname = "IPMIView";
@@ -11,12 +21,18 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ patchelf makeWrapper ];
-
-  buildPhase = with xorg; ''
+  buildPhase = with xorg;
+    let
+      stunnelBinary = if stdenv.hostPlatform.system == "x86_64-linux" then "linux/stunnel64"
+      else if stdenv.hostPlatform.system == "i686-linux" then "linux/stunnel32"
+      else throw "IPMIView is not supported on this platform";
+    in
+  ''
     patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ libX11 libXext libXrender libXtst libXi ]}" ./jre/lib/amd64/libawt_xawt.so
     patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ freetype ]}" ./jre/lib/amd64/libfontmanager.so
     patchelf --set-rpath "${gcc-unwrapped.lib}/lib" ./libiKVM64.so
     patchelf --set-rpath "${gcc.cc}/lib:$out/jre/lib/amd64/jli" --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./jre/bin/java
+    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./BMCSecurity/${stunnelBinary}
   '';
 
   installPhase = ''
@@ -24,14 +40,22 @@ stdenv.mkDerivation rec {
     cp -R . $out/
 
     # LD_LIBRARY_PATH: fontconfig is used from java code
+    # PATH: iputils is used for ping, and psmisc is for killall
+    # WORK_DIR: unfortunately the ikvm related binaries are loaded from
+    #           and user configuration is written to files in the CWD
     makeWrapper $out/jre/bin/java $out/bin/IPMIView \
       --set LD_LIBRARY_PATH "${stdenv.lib.makeLibraryPath [ fontconfig ]}" \
-      --prefix PATH : "$out/jre/bin" \
+      --prefix PATH : "$out/jre/bin:${iputils}/bin:${psmisc}/bin" \
       --add-flags "-jar $out/IPMIView20.jar" \
+      --run 'WORK_DIR=''${XDG_DATA_HOME:-~/.local/share}/ipmiview
+             mkdir -p $WORK_DIR
+             ln -snf '$out'/iKVM.jar '$out'/libiKVM* '$out'/libSharedLibrary* $WORK_DIR
+             cd $WORK_DIR'
   '';
 
   meta = with stdenv.lib; {
     license = licenses.unfree;
     maintainers = with maintainers; [ vlaci ];
+    platforms = [ "x86_64-linux" "i686-linux" ];
   };
 }
-- 
GitLab


From 3848206bd22fc2e5ba1aa04389ae0517dfacb80c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Vask=C3=B3?= <vlaci@balabit.hu>
Date: Wed, 25 Sep 2019 09:59:02 +0200
Subject: [PATCH 0926/2254] IPMIView: create desktop file

---
 pkgs/applications/misc/ipmiview/default.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/applications/misc/ipmiview/default.nix
index 774b84947da..e46df5d59e0 100644
--- a/pkgs/applications/misc/ipmiview/default.nix
+++ b/pkgs/applications/misc/ipmiview/default.nix
@@ -1,5 +1,6 @@
 { stdenv
 , fetchurl
+, makeDesktopItem
 , makeWrapper
 , patchelf
 , fontconfig
@@ -35,10 +36,20 @@ stdenv.mkDerivation rec {
     patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./BMCSecurity/${stunnelBinary}
   '';
 
+  desktopItem = makeDesktopItem rec {
+    name = "IPMIView";
+    exec = "IPMIView";
+    desktopName = name;
+    genericName = "Supermicro BMC manager";
+    categories = "Network;Configuration";
+  };
+
   installPhase = ''
     mkdir -p $out/bin
     cp -R . $out/
 
+    ln -s ${desktopItem}/share $out/share
+
     # LD_LIBRARY_PATH: fontconfig is used from java code
     # PATH: iputils is used for ping, and psmisc is for killall
     # WORK_DIR: unfortunately the ikvm related binaries are loaded from
-- 
GitLab


From 78741fc40986746bed0f16d13a3f4a9e5738d35d Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Wed, 25 Sep 2019 10:19:04 +0200
Subject: [PATCH 0927/2254] sage: 8.9.rc0 -> 8.9.rc1

---
 pkgs/applications/science/math/sage/sage-src.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix
index cf333b31531..03c1e07439f 100644
--- a/pkgs/applications/science/math/sage/sage-src.nix
+++ b/pkgs/applications/science/math/sage/sage-src.nix
@@ -10,14 +10,14 @@
 # all get the same sources with the same patches applied.
 
 stdenv.mkDerivation rec {
-  version = "8.9.rc0";
+  version = "8.9.rc1";
   pname = "sage-src";
 
   src = fetchFromGitHub {
     owner = "sagemath";
     repo = "sage";
     rev = version;
-    sha256 = "112lgdnl11azhpvr8xsrw848l7axijfklcnx19byb0f0vkqd1n3j";
+    sha256 = "04ryxwgdrm2gwbwrcv7akm97933hlpvglywydy6q6gpy0dvshdah";
   };
 
   # Patches needed because of particularities of nix or the way this is packaged.
-- 
GitLab


From d7d54ac28a401dff4358d368374e5d1871e910c3 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Wed, 25 Sep 2019 10:56:53 +0200
Subject: [PATCH 0928/2254] home-manager: 2019-09-04 -> 2019-09-20

---
 pkgs/tools/package-management/home-manager/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/home-manager/default.nix b/pkgs/tools/package-management/home-manager/default.nix
index e1ae6bc88b8..90c7ae8ba34 100644
--- a/pkgs/tools/package-management/home-manager/default.nix
+++ b/pkgs/tools/package-management/home-manager/default.nix
@@ -6,13 +6,13 @@
 stdenv.mkDerivation rec {
 
   pname = "home-manager";
-  version = "2019-09-04";
+  version = "2019-09-20";
 
   src = fetchFromGitHub {
     owner = "rycee";
     repo = "home-manager";
-    rev = "1923ac3358cbd2d75352c2db2178314eb4623818";
-    sha256 = "1xdsz62sjh8j3p8jfz449gv9vl01adk3qdyjvbpgi7y5c09ymwg7";
+    rev = "3f4563018010e2ad180d99d9cd876187e2905cee";
+    sha256 = "1bj7i9yslynhbmn4w5ilm7554zn8pgd0npvy2b0z8n98hlc2d30c";
   };
 
   nativeBuildInputs = [ makeWrapper ];
-- 
GitLab


From a82ae1470a0f49bcb26fd97afbbb09753e3146b5 Mon Sep 17 00:00:00 2001
From: Christian Kampka <kampka@users.noreply.github.com>
Date: Wed, 25 Sep 2019 10:57:34 +0200
Subject: [PATCH 0929/2254] kops_1_13: 1.13.0 -> 1.13.1 (#69407)

---
 pkgs/applications/networking/cluster/kops/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix
index c8b95baf2f3..f7336c346bb 100644
--- a/pkgs/applications/networking/cluster/kops/default.nix
+++ b/pkgs/applications/networking/cluster/kops/default.nix
@@ -43,7 +43,7 @@ let
           description = "Easiest way to get a production Kubernetes up and running";
           homepage = https://github.com/kubernetes/kops;
           license = licenses.asl20;
-          maintainers = with maintainers; [offline zimbatm];
+          maintainers = with maintainers; [offline zimbatm kampka];
           platforms = platforms.unix;
         };
       } // attrs';
@@ -57,7 +57,7 @@ in rec {
   };
 
   kops_1_13 = mkKops {
-    version = "1.13.0";
-    sha256 = "04kbbg3gqzwzzzq1lmnpw2gqky3pfwfk7pc0laxv2yssk9wac5k1";
+    version = "1.13.1";
+    sha256 = "0knypbrpipxplgdg6r0r6ycsj7w46virmzwn5s4sdim0y8d2ppyb";
   };
 }
-- 
GitLab


From 47bdb5f2ee9a6093911f3b3c035f99e057811d68 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Wed, 25 Sep 2019 11:21:43 +0200
Subject: [PATCH 0930/2254] fflas-ffpack: disable all avx versions by default

To fix a transient failure on hydra. See
https://github.com/linbox-team/fflas-ffpack/issues/284 for more details.
---
 .../libraries/fflas-ffpack/default.nix          | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix
index d46d997f644..0636d2ecfc6 100644
--- a/pkgs/development/libraries/fflas-ffpack/default.nix
+++ b/pkgs/development/libraries/fflas-ffpack/default.nix
@@ -30,14 +30,15 @@ stdenv.mkDerivation rec {
     "--with-lapack-libs=-l${blas.linkName}"
   ] ++ stdenv.lib.optionals stdenv.isx86_64 {
     # disable SIMD instructions (which are enabled *when available* by default)
-    default        = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ];
-    westmere       = [                                                                        "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ];
-    sandybridge    = [                                                                                        "--disable-avx2" "--disable-fma" "--disable-fma4" ];
-    ivybridge      = [                                                                                        "--disable-avx2" "--disable-fma" "--disable-fma4" ];
-    haswell        = [                                                                                                                         "--disable-fma4" ];
-    broadwell      = [                                                                                                                         "--disable-fma4" ];
-    skylake        = [                                                                                                                         "--disable-fma4" ];
-    skylake-avx512 = [                                                                                                                         "--disable-fma4" ];
+    # for now we need to be careful to disable *all* relevant versions of an instruction set explicitly (https://github.com/linbox-team/fflas-ffpack/issues/284)
+    default        = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-avx512f" "--disable-avx512dq" "--disable-avx512vl" "--disable-fma" "--disable-fma4" ];
+    westmere       = [                                                                        "--disable-avx" "--disable-avx2" "--disable-avx512f" "--disable-avx512dq" "--disable-avx512vl" "--disable-fma" "--disable-fma4" ];
+    sandybridge    = [                                                                                        "--disable-avx2" "--disable-avx512f" "--disable-avx512dq" "--disable-avx512vl" "--disable-fma" "--disable-fma4" ];
+    ivybridge      = [                                                                                        "--disable-avx2" "--disable-avx512f" "--disable-avx512dq" "--disable-avx512vl" "--disable-fma" "--disable-fma4" ];
+    haswell        = [                                                                                                                                                                       "--disable-fma4" ];
+    broadwell      = [                                                                                                                                                                       "--disable-fma4" ];
+    skylake        = [                                                                                                                                                                       "--disable-fma4" ];
+    skylake-avx512 = [                                                                                                                                                                       "--disable-fma4" ];
   }.${stdenv.hostPlatform.platform.gcc.arch or "default"};
 
   doCheck = true;
-- 
GitLab


From fb6595eafdb90ef0bc7a31c2bfc9204e4cad11d9 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 25 Sep 2019 11:25:47 +0200
Subject: [PATCH 0931/2254] paulstretch: fix build

---
 pkgs/applications/audio/paulstretch/default.nix | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/paulstretch/default.nix b/pkgs/applications/audio/paulstretch/default.nix
index b2c049c9eee..b9a3f39affb 100644
--- a/pkgs/applications/audio/paulstretch/default.nix
+++ b/pkgs/applications/audio/paulstretch/default.nix
@@ -1,5 +1,7 @@
-{ stdenv, fetchFromGitHub, audiofile, libvorbis, fltk, fftw, fftwFloat,
-minixml, pkgconfig, libmad, libjack2, portaudio, libsamplerate }:
+{ stdenv, fetchFromGitHub, fetchpatch
+, audiofile, libvorbis, fltk, fftw, fftwFloat
+, minixml, pkgconfig, libmad, libjack2, portaudio, libsamplerate
+}:
 
 stdenv.mkDerivation {
   pname = "paulstretch";
@@ -27,6 +29,13 @@ stdenv.mkDerivation {
     libsamplerate
   ];
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/paulnasca/paulstretch_cpp/pull/12.patch";
+      sha256 = "0lx1rfrs53afkiz1drp456asqgj5yv6hx3lkc01165cv1jsbw6q4";
+    })
+  ];
+
   buildPhase = ''
     bash compile_linux_fftw_jack.sh
   '';
-- 
GitLab


From cc625cfba4359a35c21b3e74ad42391f4d56fc46 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Wed, 25 Sep 2019 11:29:19 +0200
Subject: [PATCH 0932/2254] fflas-ffpack: add timokau as a maintainer

I'm interested in this package as a dependency of sage and therefore
would like ofBorg to notify me on changes.
---
 pkgs/development/libraries/fflas-ffpack/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix
index 0636d2ecfc6..b7d5d79544e 100644
--- a/pkgs/development/libraries/fflas-ffpack/default.nix
+++ b/pkgs/development/libraries/fflas-ffpack/default.nix
@@ -43,12 +43,12 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     inherit version;
     description = ''Finite Field Linear Algebra Subroutines'';
-    license = stdenv.lib.licenses.lgpl21Plus;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.unix;
+    license = licenses.lgpl21Plus;
+    maintainers = with maintainers; [ raskin timokau ];
+    platforms = platforms.unix;
     homepage = https://linbox-team.github.io/fflas-ffpack/;
   };
 }
-- 
GitLab


From 030d44f6934767ffbb70e66cad06d6fd87f2dea0 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Wed, 25 Sep 2019 11:38:33 +0200
Subject: [PATCH 0933/2254] fflas-ffpack_1: remove

No longer used in nixpkgs, so we can clean it up.
---
 pkgs/development/libraries/fflas-ffpack/1.nix | 24 -------------------
 pkgs/top-level/all-packages.nix               |  1 -
 2 files changed, 25 deletions(-)
 delete mode 100644 pkgs/development/libraries/fflas-ffpack/1.nix

diff --git a/pkgs/development/libraries/fflas-ffpack/1.nix b/pkgs/development/libraries/fflas-ffpack/1.nix
deleted file mode 100644
index 4a276db12c0..00000000000
--- a/pkgs/development/libraries/fflas-ffpack/1.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{stdenv, fetchurl, autoreconfHook, givaro_3_7, pkgconfig, openblas, gmpxx}:
-stdenv.mkDerivation rec {
-  pname = "fflas-ffpack";
-  version = "1.6.0";
-  src = fetchurl {
-    url = "http://linalg.org/fflas-ffpack-${version}.tar.gz";
-    sha256 = "02fr675278c65hfiy1chb903j4ix9i8yni1xc2g5nmsjcaf9vra9";
-  };
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
-  buildInputs = [ givaro_3_7 openblas gmpxx];
-  configureFlags = [
-    "--with-blas=-lopenblas"
-    "--with-gmp=${gmpxx.dev}"
-    "--with-givaro=${givaro_3_7}"
-  ];
-  meta = {
-    inherit version;
-    description = ''Finite Field Linear Algebra Subroutines'';
-    license = stdenv.lib.licenses.lgpl21Plus;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
-    homepage = https://linbox-team.github.io/fflas-ffpack/;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cd3bc17f4f0..2d1df5b66dd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10715,7 +10715,6 @@ in
     blas = if stdenv.isDarwin then blas else openblas;
   };
 
-  fflas-ffpack_1 = callPackage ../development/libraries/fflas-ffpack/1.nix {};
   linbox = callPackage ../development/libraries/linbox {
     # We need to use blas instead of openblas on darwin, see
     # https://github.com/NixOS/nixpkgs/pull/45013 and
-- 
GitLab


From 5cd72ae5c4bf765eeaa986c5a715d7008563d68f Mon Sep 17 00:00:00 2001
From: Filipe Regadas <filiperegadas@gmail.com>
Date: Wed, 25 Sep 2019 10:50:02 +0100
Subject: [PATCH 0934/2254] Updated list of urls

---
 pkgs/development/tools/build-managers/sbt/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix
index 52c5f42c15d..7d5e6b7aa34 100644
--- a/pkgs/development/tools/build-managers/sbt/default.nix
+++ b/pkgs/development/tools/build-managers/sbt/default.nix
@@ -6,9 +6,8 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     urls = [
-      "https://dl.bintray.com/sbt/native-packages/sbt/${version}/${pname}-${version}.tgz"
+      "https://piccolo.link/sbt-${version}.tgz",
       "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"
-      "https://cocl.us/sbt-${version}.tgz"
     ];
     sha256 = "1ncjc4yrnhp2kc5xw3ismnyx5n71541760rzs81hxi8x8vi36x5b";
   };
-- 
GitLab


From f2b28387d0f93bedbc2d7141c9649916c58fe690 Mon Sep 17 00:00:00 2001
From: Daniel Schaefer <git@danielschaefer.me>
Date: Sat, 14 Sep 2019 16:33:29 +0200
Subject: [PATCH 0935/2254] pythonPackages.pycountry: 19.7.15 -> 19.8.18

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

diff --git a/pkgs/development/python-modules/pycountry/default.nix b/pkgs/development/python-modules/pycountry/default.nix
index 99ba6845fa0..aec477d36a0 100644
--- a/pkgs/development/python-modules/pycountry/default.nix
+++ b/pkgs/development/python-modules/pycountry/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "pycountry";
-  version = "19.7.15";
+  version = "19.8.18";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "15lhv18za0zv36laksr86rszjhp0slmqzcylm6ds9vpd7gyqprb8";
+    sha256 = "1jxkdjffrhn0il0nm14dlzxpd6f3v1hbxzxsprcksafgmm0almrw";
   };
 
   meta = with stdenv.lib; {
-- 
GitLab


From a73937384e8c8dfcdbeae8691c34dae353e1df88 Mon Sep 17 00:00:00 2001
From: Daniel Schaefer <git@danielschaefer.me>
Date: Sat, 14 Sep 2019 16:35:19 +0200
Subject: [PATCH 0936/2254] pythonPackages.cairosvg: 2.3.0 -> 2.4.2

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

diff --git a/pkgs/development/python-modules/cairosvg/default.nix b/pkgs/development/python-modules/cairosvg/default.nix
index beee8295049..77c5c21befe 100644
--- a/pkgs/development/python-modules/cairosvg/default.nix
+++ b/pkgs/development/python-modules/cairosvg/default.nix
@@ -4,24 +4,15 @@
 
 buildPythonPackage rec {
   pname = "CairoSVG";
-  version = "2.3.0";
+  version = "2.4.2";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "66f333ef5dc79fdfbd3bbe98adc791b1f854e0461067d202fa7b15de66d517ec";
+    sha256 = "1bb7irxbaxxb9ahm3z5wsx1q96mm5gzskc7b6q07h9ikcnb8yrjf";
   };
 
-  patches = [
-    # fix isort-check
-    (fetchpatch {
-      url = https://github.com/Kozea/CairoSVG/commit/b2534b0fc80b9f24a2bff2c938ac5da73ff1e478.patch;
-      excludes = [ "test_non_regression/__init__.py" ];
-      sha256 = "1bms75dd0fd978yhlr0k565zq45lzxf0vkihryb7gcwnd42bl6yf";
-    })
-  ];
-
   propagatedBuildInputs = [ cairocffi cssselect2 defusedxml pillow tinycss2 ];
 
   checkInputs = [ pytest pytestrunner pytestcov pytest-flake8 pytest-isort ];
-- 
GitLab


From d769048286c6cf0d4f00eb18f09aba8790750b89 Mon Sep 17 00:00:00 2001
From: Daniel Schaefer <git@danielschaefer.me>
Date: Sat, 14 Sep 2019 16:36:06 +0200
Subject: [PATCH 0937/2254] pythonPackages.dict2xml: init at 1.6.1

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

diff --git a/pkgs/development/python-modules/dict2xml/default.nix b/pkgs/development/python-modules/dict2xml/default.nix
new file mode 100644
index 00000000000..88cbee2649d
--- /dev/null
+++ b/pkgs/development/python-modules/dict2xml/default.nix
@@ -0,0 +1,20 @@
+{ lib, fetchPypi, buildPythonPackage, six }:
+
+buildPythonPackage rec {
+  pname = "dict2xml";
+  version = "1.6.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "17wsybqq0916i1yh7bpf2cmicldn7d0y2b9mzlgs503fkcpxda5w";
+  };
+
+  propagatedBuildInputs = [ six ];
+
+  meta = with lib; {
+    description = "Super simple library to convert a Python dictionary into an xml string";
+    homepage = "https://github.com/delfick/python-dict2xml";
+    license = licenses.mit;
+    maintainers = with maintainers; [ johnazoidberg ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 70c24129196..df85197fbbf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5727,6 +5727,8 @@ in {
 
   basemap = callPackage ../development/python-modules/basemap { };
 
+  dict2xml = callPackage ../development/python-modules/dict2xml { };
+
   dicttoxml = callPackage ../development/python-modules/dicttoxml { };
 
   markdown2 = callPackage ../development/python-modules/markdown2 { };
-- 
GitLab


From bf050e94562e75046892f4f86d624bfc7e60649e Mon Sep 17 00:00:00 2001
From: Daniel Schaefer <git@danielschaefer.me>
Date: Sat, 14 Sep 2019 17:07:30 +0200
Subject: [PATCH 0938/2254] pythonPackages.xml2rfc: 2.18.0 -> 2.27.1

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

diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix
index f737cf344b8..63bb594cd43 100644
--- a/pkgs/development/python-modules/xml2rfc/default.nix
+++ b/pkgs/development/python-modules/xml2rfc/default.nix
@@ -1,15 +1,15 @@
 { lib, fetchPypi, buildPythonPackage, intervaltree, pyflakes, requests, lxml, google-i18n-address
-, pycountry, html5lib, six
+, pycountry, html5lib, six, kitchen, pypdf2, dict2xml, weasyprint
 , stdenv
 }:
 
 buildPythonPackage rec {
   pname = "xml2rfc";
-  version = "2.18.0";
+  version = "2.27.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e192236798615f34479a9bb9f30df72ce0e5f319df75ecc0473d896713a17451";
+    sha256 = "00v5gsshy1rmjd334d2awh0mvri949lmyk8f02wfr20rq6fc3xqd";
   };
 
   propagatedBuildInputs = [
@@ -21,13 +21,18 @@ buildPythonPackage rec {
     pycountry
     html5lib
     six
+    kitchen
+    pypdf2
+    dict2xml
+    weasyprint
   ];
 
   preCheck = ''
     export HOME=$(mktemp -d)
   '';
 
-  doCheck = !stdenv.isDarwin;
+  # lxml tries to fetch from the internet
+  doCheck = false;
 
   meta = with lib; {
     description = "Tool generating IETF RFCs and drafts from XML sources";
-- 
GitLab


From 8fd8f3a44a3121cf67f55afebcd67452d9ebc7c4 Mon Sep 17 00:00:00 2001
From: Daniel Schaefer <git@danielschaefer.me>
Date: Sat, 14 Sep 2019 17:07:49 +0200
Subject: [PATCH 0939/2254] xml2rfc: Use pythonPackages.xml2rfc

---
 .../python-modules/xml2rfc/default.nix        |  2 +-
 pkgs/tools/typesetting/xml2rfc/default.nix    | 24 -------------------
 pkgs/top-level/all-packages.nix               |  2 +-
 3 files changed, 2 insertions(+), 26 deletions(-)
 delete mode 100644 pkgs/tools/typesetting/xml2rfc/default.nix

diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix
index 63bb594cd43..1a854845cc4 100644
--- a/pkgs/development/python-modules/xml2rfc/default.nix
+++ b/pkgs/development/python-modules/xml2rfc/default.nix
@@ -40,6 +40,6 @@ buildPythonPackage rec {
     # Well, parts might be considered unfree, if being strict; see:
     # http://metadata.ftp-master.debian.org/changelogs/non-free/x/xml2rfc/xml2rfc_2.9.6-1_copyright
     license = licenses.bsd3;
-    maintainers = [ maintainers.vcunat ];
+    maintainers = with maintainers; [ vcunat yrashk ];
   };
 }
diff --git a/pkgs/tools/typesetting/xml2rfc/default.nix b/pkgs/tools/typesetting/xml2rfc/default.nix
deleted file mode 100644
index 7fe0396ae44..00000000000
--- a/pkgs/tools/typesetting/xml2rfc/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ python, stdenv }:
-
-with python.pkgs;
-
-buildPythonPackage rec {
-  pname = "xml2rfc";
-  version = "2.9.8";
-
-  buildInputs = [ intervaltree lxml requests pyflakes ];
-  propagatedBuildInputs = [ intervaltree lxml requests six ];
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "b50ce2f98bc431cadbcef0523213497049b78c2829ee81c399976f1e4832afc6";
-  };
-
-  meta = with stdenv.lib; {
-    homepage = "https://xml2rfc.tools.ietf.org/";
-    license = licenses.bsdOriginal;
-    description = "Xml2rfc generates RFCs and IETF drafts from document source in XML according to the dtd in RFC2629.";
-    maintainers = [ maintainers.yrashk ];
-  };
-
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cd3bc17f4f0..b3df755dc93 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24803,7 +24803,7 @@ in
 
   diceware = callPackage ../tools/security/diceware { };
 
-  xml2rfc = callPackage ../tools/typesetting/xml2rfc { };
+  xml2rfc = with python3Packages; toPythonApplication xml2rfc;
 
   mmark = callPackage ../tools/typesetting/mmark { };
 
-- 
GitLab


From 5c65c2e329690ac8304f7426903e2f96691c8c1b Mon Sep 17 00:00:00 2001
From: Daniel Schaefer <git@danielschaefer.me>
Date: Sat, 14 Sep 2019 17:50:00 +0200
Subject: [PATCH 0940/2254] pythonPackages.qiskit: Mark as broken

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

diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix
index bb92fc9df9a..285f50e3cb3 100644
--- a/pkgs/development/python-modules/qiskit/default.nix
+++ b/pkgs/development/python-modules/qiskit/default.nix
@@ -59,5 +59,7 @@ buildPythonPackage rec {
     maintainers = with stdenv.lib.maintainers; [
       pandaman
     ];
+    # Needs to be updated and have its new dependencies added
+    broken = true;
   };
 }
-- 
GitLab


From cedb0ecf4da85ac6d3d084d344dcc5b87f4d1548 Mon Sep 17 00:00:00 2001
From: Daniel Schaefer <git@danielschaefer.me>
Date: Wed, 25 Sep 2019 09:08:06 +0200
Subject: [PATCH 0941/2254] pythonPackages.weasyprint: 47 -> 50

---
 .../python-modules/weasyprint/default.nix            | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix
index 7dc09d58aad..bac3e9b77b5 100644
--- a/pkgs/development/python-modules/weasyprint/default.nix
+++ b/pkgs/development/python-modules/weasyprint/default.nix
@@ -23,11 +23,15 @@
 
 buildPythonPackage rec {
   pname = "weasyprint";
-  version = "47";
+  version = "50";
   disabled = !isPy3k;
 
-  # ignore failing pytest
-  checkPhase = "pytest -k 'not test_font_stretch'";
+  # ignore failing test cases
+  checkPhase = ''
+    runHook preCheck
+    pytest -k 'not test_table_vertical_align and not test_text_overflow_ellipsis and not test_text_overflow_clip'
+    runHook postCheck
+  '';
 
   # ignore failing flake8-test
   prePatch = ''
@@ -55,7 +59,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit version;
     pname = "WeasyPrint";
-    sha256 = "0hd1zwrkfnj7g0jaaf6jvarlj6l5imar6ar78zxdgv17a3s3k3dg";
+    sha256 = "0invs96zvmcr6wh5klj52jrcnr9qg150v9wpmbhcsf3vv1d1hbcw";
   };
 
   meta = with stdenv.lib; {
-- 
GitLab


From 6d71209af30e6cde6d31a7539e44daa8397b96b9 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 25 Sep 2019 11:44:09 +0200
Subject: [PATCH 0942/2254] pythonPackages.weasyprint: disable test

Needs an extra font for that test
---
 pkgs/development/python-modules/weasyprint/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix
index bac3e9b77b5..f112d6f1555 100644
--- a/pkgs/development/python-modules/weasyprint/default.nix
+++ b/pkgs/development/python-modules/weasyprint/default.nix
@@ -26,10 +26,10 @@ buildPythonPackage rec {
   version = "50";
   disabled = !isPy3k;
 
-  # ignore failing test cases
+  # excluded test needs the Ahem font
   checkPhase = ''
     runHook preCheck
-    pytest -k 'not test_table_vertical_align and not test_text_overflow_ellipsis and not test_text_overflow_clip'
+    pytest -k 'not test_font_stretch'
     runHook postCheck
   '';
 
-- 
GitLab


From 6c19673fef1e97d99fbad879e28a4272a597ea26 Mon Sep 17 00:00:00 2001
From: Evils-Devils <30512529+Evils-Devils@users.noreply.github.com>
Date: Wed, 25 Sep 2019 13:28:16 +0200
Subject: [PATCH 0943/2254] Update
 nixos/modules/services/hardware/fancontrol.nix

Co-Authored-By: markuskowa <markus.kowalewski@gmail.com>
---
 nixos/modules/services/hardware/fancontrol.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/hardware/fancontrol.nix b/nixos/modules/services/hardware/fancontrol.nix
index bd4938ab509..79de0788cac 100644
--- a/nixos/modules/services/hardware/fancontrol.nix
+++ b/nixos/modules/services/hardware/fancontrol.nix
@@ -7,7 +7,7 @@ let
 
 in {
 
-  options.services.fancontrol = {
+  options.hardware.fancontrol = {
     enable = mkOption {
       type = types.bool;
       default = false;
-- 
GitLab


From 30f8bc974ce16f357f7f9d65ce4acd3b3cc8ae42 Mon Sep 17 00:00:00 2001
From: Evils <evils.devils@protonmail.com>
Date: Wed, 25 Sep 2019 13:43:06 +0200
Subject: [PATCH 0944/2254] update cfg to match section change

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

diff --git a/nixos/modules/services/hardware/fancontrol.nix b/nixos/modules/services/hardware/fancontrol.nix
index 79de0788cac..1376f7eaebd 100644
--- a/nixos/modules/services/hardware/fancontrol.nix
+++ b/nixos/modules/services/hardware/fancontrol.nix
@@ -3,7 +3,7 @@
 with lib;
 
 let
-  cfg = config.services.fancontrol;
+  cfg = config.hardware.fancontrol;
 
 in {
 
-- 
GitLab


From baa642e8b3742b6b1b38f6fee61acc290ee8191b Mon Sep 17 00:00:00 2001
From: Evils <evils.devils@protonmail.com>
Date: Wed, 25 Sep 2019 14:42:22 +0200
Subject: [PATCH 0945/2254] fancontrol: more cleanup

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

diff --git a/nixos/modules/services/hardware/fancontrol.nix b/nixos/modules/services/hardware/fancontrol.nix
index 1376f7eaebd..fe4ab1e4226 100644
--- a/nixos/modules/services/hardware/fancontrol.nix
+++ b/nixos/modules/services/hardware/fancontrol.nix
@@ -8,12 +8,7 @@ let
 in {
 
   options.hardware.fancontrol = {
-    enable = mkOption {
-      type = types.bool;
-      default = false;
-      example = true;
-      description = "Whether to enable fancontrol (requires a configuration file, see pwmconfig)";
-    };
+    enable = mkEnableOption "Whether to enable fancontrol (requires a configuration file, see pwmconfig)";
 
     configFile = mkOption {
       type = types.str;
@@ -29,7 +24,6 @@ in {
       wantedBy = [ "multi-user.target" ];
       serviceConfig = {
         Type = "simple";
-        User = "root";
         ExecStart = "${pkgs.lm_sensors}/bin/fancontrol ${cfg.configFile}";
       };
     };
-- 
GitLab


From 5fe72ee446dbaf08a14ae7172ee2e0fed2b3121b Mon Sep 17 00:00:00 2001
From: Evils-Devils <30512529+Evils-Devils@users.noreply.github.com>
Date: Wed, 25 Sep 2019 14:49:28 +0200
Subject: [PATCH 0946/2254] Update
 nixos/modules/services/hardware/fancontrol.nix

Co-Authored-By: markuskowa <markus.kowalewski@gmail.com>
---
 nixos/modules/services/hardware/fancontrol.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/hardware/fancontrol.nix b/nixos/modules/services/hardware/fancontrol.nix
index fe4ab1e4226..30074f81aed 100644
--- a/nixos/modules/services/hardware/fancontrol.nix
+++ b/nixos/modules/services/hardware/fancontrol.nix
@@ -8,7 +8,7 @@ let
 in {
 
   options.hardware.fancontrol = {
-    enable = mkEnableOption "Whether to enable fancontrol (requires a configuration file, see pwmconfig)";
+    enable = mkEnableOption "fancontrol (requires a configuration file, see pwmconfig)";
 
     configFile = mkOption {
       type = types.str;
-- 
GitLab


From 087e8fcf41a1d00f4fb88e61cd7d79068fe70513 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 24 Sep 2019 17:50:54 +0200
Subject: [PATCH 0947/2254] LTS Haskell 14.7

---
 .../configuration-hackage2nix.yaml            | 50 +++++++++----------
 1 file changed, 24 insertions(+), 26 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 68a05ff9411..06234bf5e6a 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -43,7 +43,7 @@ core-packages:
   - ghcjs-base-0
 
 default-package-overrides:
-  # LTS Haskell 14.6
+  # LTS Haskell 14.7
   - abstract-deque ==0.3
   - abstract-deque-tests ==0.3
   - abstract-par ==0.3.3
@@ -370,7 +370,7 @@ default-package-overrides:
   - concurrent-supply ==0.1.8
   - cond ==0.4.1.1
   - conduit ==1.3.1.1
-  - conduit-algorithms ==0.0.10.1
+  - conduit-algorithms ==0.0.11.0
   - conduit-combinators ==1.3.0
   - conduit-concurrent-map ==0.1.1
   - conduit-extra ==1.3.4
@@ -393,7 +393,7 @@ default-package-overrides:
   - control-bool ==0.2.1
   - control-dsl ==0.2.1.3
   - control-monad-free ==0.6.2
-  - control-monad-omega ==0.3.1
+  - control-monad-omega ==0.3.2
   - convertible ==1.1.1.0
   - cookie ==0.4.4
   - core-data ==0.2.0.0
@@ -646,7 +646,7 @@ default-package-overrides:
   - failable ==1.2.2.0
   - fakedata ==0.2.2
   - farmhash ==0.1.0.5
-  - fast-builder ==0.1.1.0
+  - fast-builder ==0.1.2.0
   - fast-digits ==0.2.1.0
   - fast-logger ==2.4.17
   - fast-math ==1.0.2
@@ -796,7 +796,7 @@ default-package-overrides:
   - ginger ==0.9.1.0
   - gingersnap ==0.3.1.0
   - gi-pango ==1.0.22
-  - githash ==0.1.3.2
+  - githash ==0.1.3.3
   - github-release ==1.2.4
   - github-types ==0.2.1
   - github-webhooks ==0.10.1
@@ -890,7 +890,7 @@ default-package-overrides:
   - heap ==1.0.4
   - heaps ==0.3.6.1
   - hebrew-time ==0.1.2
-  - hedgehog ==1.0
+  - hedgehog ==1.0.1
   - hedgehog-corpus ==0.1.0
   - hedgehog-fn ==1.0
   - hedis ==0.12.8
@@ -1045,7 +1045,7 @@ default-package-overrides:
   - hw-mquery ==0.2.0.1
   - hw-packed-vector ==0.0.0.3
   - hw-parser ==0.1.0.1
-  - hw-prim ==0.6.2.31
+  - hw-prim ==0.6.2.32
   - hw-rankselect ==0.13.0.0
   - hw-rankselect-base ==0.3.2.1
   - hw-simd ==0.1.1.4
@@ -1176,7 +1176,7 @@ default-package-overrides:
   - lackey ==1.0.9
   - LambdaHack ==0.9.5.0
   - lame ==0.2.0
-  - language-c ==0.8.2
+  - language-c ==0.8.3
   - language-c-quote ==0.12.2
   - language-docker ==8.0.2
   - language-ecmascript ==0.19
@@ -1250,7 +1250,7 @@ default-package-overrides:
   - log-domain ==0.12
   - logfloat ==0.13.3.3
   - logger-thread ==0.1.0.2
-  - logging-effect ==1.3.4
+  - logging-effect ==1.3.6
   - logging-facade ==0.3.0
   - logging-facade-syslog ==1
   - logict ==0.7.0.2
@@ -1714,7 +1714,7 @@ default-package-overrides:
   - Ranged-sets ==0.4.0
   - range-set-list ==0.1.3.1
   - rank1dynamic ==0.4.0
-  - rank2classes ==1.3
+  - rank2classes ==1.3.1
   - Rasterific ==0.7.4.4
   - rasterific-svg ==0.3.3.2
   - ratel ==1.0.8
@@ -1731,7 +1731,7 @@ default-package-overrides:
   - read-editor ==0.1.0.2
   - read-env-var ==1.0.0.0
   - reanimate ==0.1.5.0
-  - reanimate-svg ==0.9.1.1
+  - reanimate-svg ==0.9.2.1
   - rebase ==1.3.1.1
   - record-dot-preprocessor ==0.2
   - record-hasfield ==1.0
@@ -1767,12 +1767,10 @@ default-package-overrides:
   - repa ==3.4.1.4
   - repa-algorithms ==3.4.1.3
   - repa-io ==3.4.1.1
-  - replace-attoparsec ==1.0.1.0
-  - replace-megaparsec ==1.1.3.0
   - repline ==0.2.1.0
   - req ==2.1.0
   - req-conduit ==1.0.0
-  - require ==0.4.2
+  - require ==0.4.3
   - rerebase ==1.3.1.1
   - resistor-cube ==0.0.1.2
   - resource-pool ==0.2.3.2
@@ -1826,7 +1824,7 @@ default-package-overrides:
   - scalpel ==0.6.0
   - scalpel-core ==0.6.0
   - scanf ==0.1.0.0
-  - scanner ==0.3
+  - scanner ==0.3.1
   - scheduler ==1.4.2
   - scientific ==0.3.6.2
   - scotty ==0.11.5
@@ -1836,10 +1834,10 @@ default-package-overrides:
   - sdl2-image ==2.0.0
   - sdl2-mixer ==1.1.0
   - sdl2-ttf ==2.1.0
-  - secp256k1-haskell ==0.1.4
+  - secp256k1-haskell ==0.1.5
   - securemem ==0.1.10
   - selda ==0.4.0.0
-  - selda-json ==0.1.0.0
+  - selda-json ==0.1.1.0
   - selda-postgresql ==0.1.8.0
   - selda-sqlite ==0.1.7.0
   - selective ==0.3
@@ -1866,13 +1864,13 @@ default-package-overrides:
   - servant-checked-exceptions ==2.2.0.0
   - servant-checked-exceptions-core ==2.2.0.0
   - servant-cli ==0.1.0.1
-  - servant-client ==0.16
+  - servant-client ==0.16.0.1
   - servant-client-core ==0.16
   - servant-conduit ==0.15
-  - servant-docs ==0.11.3
-  - servant-elm ==0.6.0.2
+  - servant-docs ==0.11.4
+  - servant-elm ==0.6.1
   - servant-foreign ==0.15
-  - servant-http-streams ==0.16
+  - servant-http-streams ==0.16.0.1
   - servant-js ==0.9.4
   - servant-JuicyPixels ==0.3.0.4
   - servant-kotlin ==0.1.1.9
@@ -1880,7 +1878,7 @@ default-package-overrides:
   - servant-machines ==0.15
   - servant-mock ==0.8.5
   - servant-multipart ==0.11.4
-  - servant-pipes ==0.15
+  - servant-pipes ==0.15.1
   - servant-ruby ==0.9.0.0
   - servant-server ==0.16.2
   - servant-static-th ==0.2.2.1
@@ -1982,7 +1980,7 @@ default-package-overrides:
   - statestack ==0.2.0.5
   - StateVar ==1.2
   - static-text ==0.2.0.4
-  - statistics ==0.15.0.0
+  - statistics ==0.15.1.1
   - stb-image-redux ==0.2.1.2
   - step-function ==0.2
   - stm-chans ==3.0.0.4
@@ -2201,7 +2199,7 @@ default-package-overrides:
   - tuples-homogenous-h98 ==0.1.1.0
   - tuple-sop ==0.3.1.0
   - tuple-th ==0.2.5
-  - turtle ==1.5.14
+  - turtle ==1.5.15
   - TypeCompose ==0.9.14
   - typed-process ==0.2.6.0
   - type-errors ==0.2.0.0
@@ -2309,7 +2307,7 @@ default-package-overrides:
   - verbosity ==0.3.0.0
   - versions ==3.5.1.1
   - ViennaRNAParser ==1.3.3
-  - viewprof ==0.0.0.30
+  - viewprof ==0.0.0.31
   - vinyl ==0.11.0
   - vivid ==0.4.2.3
   - vivid-osc ==0.5.0.0
@@ -2355,7 +2353,7 @@ default-package-overrides:
   - websockets ==0.12.5.3
   - websockets-snap ==0.10.3.1
   - weigh ==0.0.14
-  - wide-word ==0.1.0.8
+  - wide-word ==0.1.0.9
   - wikicfp-scraper ==0.1.0.11
   - wild-bind ==0.1.2.4
   - wild-bind-x11 ==0.2.0.7
-- 
GitLab


From efb4f4817a11e612183930c340674417cf0e4e08 Mon Sep 17 00:00:00 2001
From: Guillaume Bouchard <guillaume.bouchard@tweag.io>
Date: Sun, 22 Sep 2019 11:00:00 +0200
Subject: [PATCH 0948/2254] haskellPackages.PyF: remove `broken` status

PyF builds perfectly with `haskellPackages.PyF`
---
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 06234bf5e6a..ce84a0c029f 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -8096,7 +8096,6 @@ broken-packages:
   - puzzle-draw
   - puzzle-draw-cmdline
   - pvd
-  - PyF
   - pyffi
   - pyfi
   - python-pickle
-- 
GitLab


From 50d128e16c1f79958deb1944fb8ca6ed29813933 Mon Sep 17 00:00:00 2001
From: Guillaume Bouchard <guillaume.bouchard@tweag.io>
Date: Sun, 22 Sep 2019 11:00:18 +0200
Subject: [PATCH 0949/2254] haskellPackages.MemoTrie: remove dontCheck and
 dontHaddock overrides.

It works fine with (at least):
  - haskellPackages.MemoTrie
  - haskellPackages.ghc844.MemoTrie
---
 pkgs/development/haskell-modules/configuration-common.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index fd8bfef030a..75ad9337b82 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -322,7 +322,6 @@ self: super: {
   lvmrun = disableHardening (dontCheck super.lvmrun) ["format"];
   matplotlib = dontCheck super.matplotlib;
   memcache = dontCheck super.memcache;
-  MemoTrie = dontHaddock (dontCheck super.MemoTrie);
   metrics = dontCheck super.metrics;
   milena = dontCheck super.milena;
   modular-arithmetic = dontCheck super.modular-arithmetic; # tests require a very old Glob (0.7.*)
-- 
GitLab


From 21977c055d3bed59a490cd06c5eb59660522c5b7 Mon Sep 17 00:00:00 2001
From: Olli Helenius <liff@iki.fi>
Date: Mon, 23 Sep 2019 20:50:32 +0300
Subject: [PATCH 0950/2254] haskellPackages.hadolint: fix build by disabling
 static linking

---
 .../haskell-modules/configuration-hackage2nix.yaml            | 1 -
 pkgs/development/haskell-modules/configuration-nix.nix        | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index ce84a0c029f..0c92abbd0a2 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -5218,7 +5218,6 @@ broken-packages:
   - haddock-leksah
   - haddock-test
   - haddocset
-  - hadolint
   - hadoop-formats
   - hadoop-rpc
   - hadoop-tools
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 5db25686fc6..795029402a4 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -593,4 +593,8 @@ self: super: builtins.intersectAttrs super {
   http-download = dontCheck super.http-download;
   pantry = dontCheck super.pantry;
 
+  # Hadolint wants to build a statically linked binary by default.
+  hadolint = overrideCabal super.hadolint (drv: {
+    preConfigure = "sed -i -e /ld-options:/d hadolint.cabal";
+  });
 }
-- 
GitLab


From b2c43483b0a4d2bbd1e4167c5221a3e05dfd004e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 24 Sep 2019 17:55:06 +0200
Subject: [PATCH 0951/2254] haskell-hpack: patch the build to make it succeed
 with ghc-8.8.1

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index a233185cf4b..c3d5c7a1510 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -166,7 +166,10 @@ self: super: {
   aeson-diff = doJailbreak super.aeson-diff;
 
   # https://github.com/sol/hpack/issues/371
-  hpack = markBrokenVersion "0.32.0" super.hpack;
+  hpack = appendPatch super.hpack (pkgs.fetchpatch {
+    url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/hpack-0.32.0.patch";
+    sha256 = "11ccl9f7vwbf5cpzknlyvrwgkzpajk4vq9jk9yb5f9la9ggwb244";
+  });
 
   # Upstream ships a broken Setup.hs file.
   csv = overrideCabal super.csv (drv: { prePatch = "rm Setup.hs"; });
-- 
GitLab


From e49df9257cc40358c3f4ce85475d6b487e250d79 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 24 Sep 2019 17:57:18 +0200
Subject: [PATCH 0952/2254] haskell-string-qq: use the latest version when
 compiling with ghc-8.8.1

---
 .../haskell-modules/configuration-ghc-8.8.x.nix | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index c3d5c7a1510..e446776b1d9 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -106,8 +106,6 @@ self: super: {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/socks-0.6.0.patch";
     sha256 = "1dsqmx0sw62x4glh43c0sbizd2y00v5xybiqadn96v6pmfrap5cp";
   });
-  lens = self.lens_4_18_1;
-  xmonad-contrib = self.xmonad-contrib_0_16;
   polyparse = appendPatch (doJailbreak super.polyparse) (pkgs.fetchpatch {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/polyparse-1.12.1.patch";
     sha256 = "01b2gnsq0x4fd9na8zpk6pajym55mbz64hgzawlwxdw0y6681kr5";
@@ -146,7 +144,6 @@ self: super: {
     url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/asn1-encoding-0.9.5.patch";
     sha256 = "0a3159rnaw6shjzdm46799crd4pxh33s23qy51xa7z6nv5q8wsb5";
   });
-  tls = self.tls_1_5_1;
   vault = dontHaddock super.vault;
   monad-par = dontCheck super.monad-par;   # test suite does not compile in monad-par-0.3.4.8
 
@@ -174,14 +171,10 @@ self: super: {
   # Upstream ships a broken Setup.hs file.
   csv = overrideCabal super.csv (drv: { prePatch = "rm Setup.hs"; });
 
-  # Upstream ships a broken Setup.hs file.
-  string-qq = overrideSrc (dontCheck super.string-qq) {
-    src = pkgs.fetchFromGitHub {
-      owner = "dmwit";
-      repo = "string-qq";
-      rev = "b396f5ef36a9b23f1d3fafcc91f2222cd1ad24fe";
-      sha256 = "1z2f1yry8wi0jb38dgz7rl89zl63fhngf7xk4ljw240vn315jj8s";
-    };
-  };
+  # use latest version to fix the build
+  lens = self.lens_4_18_1;
+  string-qq = self.string-qq_0_0_4;
+  tls = self.tls_1_5_1;
+  xmonad-contrib = self.xmonad-contrib_0_16;
 
 }
-- 
GitLab


From 17c3cfd9f0f9b6819cf78b867eb0e3caeda28113 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 24 Sep 2019 17:57:59 +0200
Subject: [PATCH 0953/2254] haskell-hackage-db: use the latest version when
 compiling with ghc-8.8.1

---
 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index e446776b1d9..68ce68c7d26 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -172,6 +172,7 @@ self: super: {
   csv = overrideCabal super.csv (drv: { prePatch = "rm Setup.hs"; });
 
   # use latest version to fix the build
+  hackage-db = self.hackage-db_2_1_0;
   lens = self.lens_4_18_1;
   string-qq = self.string-qq_0_0_4;
   tls = self.tls_1_5_1;
-- 
GitLab


From ba0b08074c08c2fa029f4e8dd0d7af68d5abb157 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 24 Sep 2019 17:59:43 +0200
Subject: [PATCH 0954/2254] haskell-shelly: use the latest version when
 compiling with ghc-8.8.1

---
 .../configuration-ghc-8.8.x.nix               | 21 +++++--------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 68ce68c7d26..1fda91d4e76 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -42,6 +42,7 @@ self: super: {
   xhtml = null;
 
   # Ignore overly restrictive upper version bounds.
+  aeson-diff = doJailbreak super.aeson-diff;
   async = doJailbreak super.async;
   cabal-install = doJailbreak super.cabal-install;
   ChasingBottoms = doJailbreak super.ChasingBottoms;
@@ -57,8 +58,11 @@ self: super: {
   quickcheck-instances = doJailbreak super.quickcheck-instances;
   setlocale = doJailbreak super.setlocale;
   split = doJailbreak super.split;
+  system-fileio = doJailbreak super.system-fileio;
   tasty-expected-failure = doJailbreak super.tasty-expected-failure;
+  tasty-hedgehog = doJailbreak super.tasty-hedgehog;
   test-framework = doJailbreak super.test-framework;
+  th-expand-syns = doJailbreak super.th-expand-syns;
 
   # These packages don't work and need patching and/or an update.
   primitive = overrideSrc (doJailbreak super.primitive) {
@@ -123,19 +127,6 @@ self: super: {
   chell = overrideCabal (doJailbreak super.chell) (_drv: {
     broken = false;
   });
-  th-expand-syns = doJailbreak super.th-expand-syns;
-  shelly = overrideCabal (appendPatch (doJailbreak super.shelly) (pkgs.fetchpatch {
-    url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/shelly-1.8.1.patch";
-    sha256 = "1kglbwrr4ra81v9x3bfsk5l6pyl0my2a1zkr3qjjx7acn0dfpgbc";
-  })) (drv: {
-    editedCabalFile = null;
-    preConfigure = ''
-      cp -v ${pkgs.fetchurl {url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/shelly-1.8.1.cabal"; sha256 = "0crf0m077wky76f5nav2p9q4fa5q4yhv5l4bq9hd073dzdaywhz0";}} shelly.cabal
-      sed -i -e 's/< 1.9,/< 2,/' shelly.cabal # bump time version
-    '';
-  });
-  system-fileio = doJailbreak super.system-fileio;
-  tasty-hedgehog = doJailbreak super.tasty-hedgehog;
   haskell-src-meta = appendPatch (dontCheck (doJailbreak super.haskell-src-meta)) (pkgs.fetchpatch {
     url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/haskell-src-meta-0.8.3.patch";
     sha256 = "1asl932mibr5y057xx8v1a7n3qy87lcnclsfh8pbxq1m3iwjkxy8";
@@ -159,9 +150,6 @@ self: super: {
     sha256 = "0zsgzn0nvdxvqi5z0za3gzlhql2x5d5cr0kkr19j5c67fy177w6b";
   });
 
-  # over-specified version constraints
-  aeson-diff = doJailbreak super.aeson-diff;
-
   # https://github.com/sol/hpack/issues/371
   hpack = appendPatch super.hpack (pkgs.fetchpatch {
     url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/hpack-0.32.0.patch";
@@ -177,5 +165,6 @@ self: super: {
   string-qq = self.string-qq_0_0_4;
   tls = self.tls_1_5_1;
   xmonad-contrib = self.xmonad-contrib_0_16;
+  shelly = self.shelly_1_9_0;
 
 }
-- 
GitLab


From 7321582c7d8eec5d3df45705a243b02380b51c42 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 24 Sep 2019 18:11:59 +0200
Subject: [PATCH 0955/2254] haskell-microlens: use the latest version when
 compiling with ghc-8.8.1

---
 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 1fda91d4e76..c0b500fdc3a 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -162,9 +162,10 @@ self: super: {
   # use latest version to fix the build
   hackage-db = self.hackage-db_2_1_0;
   lens = self.lens_4_18_1;
+  microlens = self.microlens_0_4_11_2;
+  shelly = self.shelly_1_9_0;
   string-qq = self.string-qq_0_0_4;
   tls = self.tls_1_5_1;
   xmonad-contrib = self.xmonad-contrib_0_16;
-  shelly = self.shelly_1_9_0;
 
 }
-- 
GitLab


From 4485fc595de2b72fb5bd46d0761beb661b709220 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 24 Sep 2019 18:12:46 +0200
Subject: [PATCH 0956/2254] haskell-memory: use the latest version when
 compiling with ghc-8.8.1

---
 .../haskell-modules/configuration-ghc-8.8.x.nix        | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index c0b500fdc3a..8e036e19584 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -115,15 +115,6 @@ self: super: {
     sha256 = "01b2gnsq0x4fd9na8zpk6pajym55mbz64hgzawlwxdw0y6681kr5";
   });
   foundation = dontCheck super.foundation;
-  memory = overrideCabal (appendPatch super.memory (pkgs.fetchpatch {
-    url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/memory-0.14.18.patch";
-    sha256 = "16ar8921s3bi31y1az9zgyg0iaxxc2wvvwqjnl11a17p03wi6b29";
-  })) (drv: {
-    editedCabalFile = null;
-    preConfigure = ''
-      cp -v ${pkgs.fetchurl {url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/memory-0.14.18.cabal"; sha256 = "1325wny0irnq51rz0f4xgkvm01p6n4z5jid2jgpkhjac8a2sdgwl";}} memory.cabal
-    '';
-  });
   chell = overrideCabal (doJailbreak super.chell) (_drv: {
     broken = false;
   });
@@ -162,6 +153,7 @@ self: super: {
   # use latest version to fix the build
   hackage-db = self.hackage-db_2_1_0;
   lens = self.lens_4_18_1;
+  memory = self.memory_0_15_0;
   microlens = self.microlens_0_4_11_2;
   shelly = self.shelly_1_9_0;
   string-qq = self.string-qq_0_0_4;
-- 
GitLab


From ab64a69b544d16c7487e3858f8da61e2010aa8b0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 24 Sep 2019 18:14:56 +0200
Subject: [PATCH 0957/2254] haskell-src: mark the package broken with ghc-8.8.x

---
 .../haskell-modules/configuration-ghc-8.8.x.nix            | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 8e036e19584..8b312f977b1 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -100,8 +100,6 @@ self: super: {
     url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/hedgehog-1.0.patch";
     sha256 = "16gadh1hb74jqvzc9c893sffb1y2vjglblyrqjwp7xfhccq7g8yw";
   });
-  easytest = markBroken super.easytest;
-  easytest_0_3 = markBroken super.easytest_0_3;
   regex-tdfa = appendPatch super.regex-tdfa (pkgs.fetchpatch {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-tdfa-1.2.3.1.patch";
     sha256 = "1lhas4s2ms666prb475gaw2bqw1v4y8cxi66sy20j727sx7ppjs7";
@@ -150,6 +148,11 @@ self: super: {
   # Upstream ships a broken Setup.hs file.
   csv = overrideCabal super.csv (drv: { prePatch = "rm Setup.hs"; });
 
+  # mark broken packages
+  easytest = markBroken super.easytest;
+  easytest_0_3 = markBroken super.easytest_0_3;
+  haskell-src = markBrokenVersion "1.0.3.0" super.haskell-src;
+
   # use latest version to fix the build
   hackage-db = self.hackage-db_2_1_0;
   lens = self.lens_4_18_1;
-- 
GitLab


From e234266c387f551d40d0cb359543efe4034d4c8a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 24 Sep 2019 18:30:55 +0200
Subject: [PATCH 0958/2254] haskell-bencode: mark the package broken with
 ghc-8.8.x

---
 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 8b312f977b1..2c4f3967a22 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -149,6 +149,7 @@ self: super: {
   csv = overrideCabal super.csv (drv: { prePatch = "rm Setup.hs"; });
 
   # mark broken packages
+  bencode = markBrokenVersion "0.6.0.0" super.bencode;
   easytest = markBroken super.easytest;
   easytest_0_3 = markBroken super.easytest_0_3;
   haskell-src = markBrokenVersion "1.0.3.0" super.haskell-src;
-- 
GitLab


From cfb580f6c509c282163fe7b349d44a4a561d4f50 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 24 Sep 2019 18:43:59 +0200
Subject: [PATCH 0959/2254] cabal2nix: switch default version to the one
 compiled by ghc-8.8.1

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b3df755dc93..d333251dd4d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1249,7 +1249,7 @@ in
 
   cue2pops = callPackage ../tools/cd-dvd/cue2pops { };
 
-  cabal2nix = haskell.lib.overrideCabal (haskell.lib.generateOptparseApplicativeCompletion "cabal2nix" haskellPackages.cabal2nix) (drv: {
+  cabal2nix = haskell.lib.overrideCabal (haskell.lib.generateOptparseApplicativeCompletion "cabal2nix" haskell.packages.ghc881.cabal2nix) (drv: {
     isLibrary = false;
     enableSharedExecutables = false;
     executableToolDepends = (drv.executableToolDepends or []) ++ [ makeWrapper ];
-- 
GitLab


From 933c88576167e0b0c7e0737a38bc1d7be4f15286 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 24 Sep 2019 18:46:39 +0200
Subject: [PATCH 0960/2254] cabal2nix: add override to keep the ghc-8.6.x
 version compiling

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
index d2e463b123c..455b2358da7 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -95,4 +95,7 @@ self: super: {
   # Newer versions don't compile.
   resolv = self.resolv_0_1_1_2;
 
+  # cabal2nix needs the latest version of Cabal.
+  cabal2nix = super.cabal2nix.overrideScope (self: super: { Cabal = self.Cabal_3_0_0_0; });
+
 }
-- 
GitLab


From 4f31c024d1e40b8e19badc832c8a99ce19143a5b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 23 Sep 2019 02:31:05 +0200
Subject: [PATCH 0961/2254] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.15.0 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/a1a41a1b563dac7202cc374ed4e831fd09a45d46.
---
 .../haskell-modules/hackage-packages.nix      | 1513 ++++++++---------
 1 file changed, 727 insertions(+), 786 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index d1217ea37df..2c3a304f2ca 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -6302,15 +6302,13 @@ self: {
      }:
      mkDerivation {
        pname = "Frames-map-reduce";
-       version = "0.1.0.1";
-       sha256 = "1m3ifx867hn4zhrj9xlars44w3sv1sp6ja38kb6f3lnhr86nf8g2";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.2.0.0";
+       sha256 = "1gdp4xi90vq6rdcvwk2b18ip6ba4rhkn8cv737w0m8j77vvb5plx";
        libraryHaskellDepends = [
          base containers foldl Frames hashable map-reduce-folds newtype
          profunctors vinyl
        ];
-       executableHaskellDepends = [ base foldl Frames random text vinyl ];
+       testHaskellDepends = [ base foldl Frames random text vinyl ];
        description = "Frames wrapper for map-reduce-folds and some extra folds helpers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -10660,16 +10658,16 @@ self: {
      }) {};
 
   "HsYAML-aeson" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, HsYAML, mtl, text, vector
+    ({ mkDerivation, aeson, base, bytestring, containers, HsYAML, mtl
+     , scientific, text, unordered-containers, vector
      }:
      mkDerivation {
        pname = "HsYAML-aeson";
-       version = "0.1.0.0";
-       sha256 = "1hf1gwa89ghd4aaim6g8dx9wppp6d1y0w1xiddm1r8lpfidca1nw";
-       revision = "1";
-       editedCabalFile = "1kf35mnvc2syly35c2ffl8xxcw4h6lxv9kqirzj2in1ms19df41y";
+       version = "0.2.0.0";
+       sha256 = "12sxww260pc0bbpiyirm7911haxhljdi2f08a9ddpbgw8d5n7ffg";
        libraryHaskellDepends = [
-         aeson base bytestring HsYAML mtl text vector
+         aeson base bytestring containers HsYAML mtl scientific text
+         unordered-containers vector
        ];
        description = "JSON to YAML Adapter";
        license = stdenv.lib.licenses.gpl2Plus;
@@ -15816,8 +15814,6 @@ self: {
        testToolDepends = [ python3 ];
        description = "Quasiquotations for a python like interpolated string formater";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) python3;};
 
   "QIO" = callPackage
@@ -21186,8 +21182,8 @@ self: {
     ({ mkDerivation, base, comonad, tasty, tasty-quickcheck }:
      mkDerivation {
        pname = "abides";
-       version = "0.0.0";
-       sha256 = "0bksprm776xqxvizmwxaq996kvwj4gvd4ckwalr72aa2082vzs17";
+       version = "0.0.1";
+       sha256 = "0qw4zlbz92j9m5wnnckmyc7vr5naq41zv1g648b02kb8zp94l7hf";
        libraryHaskellDepends = [ base comonad ];
        testHaskellDepends = [ base comonad tasty tasty-quickcheck ];
        description = "Simple boolean tests to see if a value abides by certain properties";
@@ -21851,8 +21847,8 @@ self: {
      }:
      mkDerivation {
        pname = "acid-state";
-       version = "0.15.1";
-       sha256 = "0dhzi1f951q2csi8rk393rg81jpd8w9vxwlmg638dknh4i35zg35";
+       version = "0.15.2";
+       sha256 = "08v807yxkd13m1zffw1yryifjgn7w28a31hb0sg0n3yw7vzk9ny3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -23464,10 +23460,8 @@ self: {
      }:
      mkDerivation {
        pname = "aeson-optics";
-       version = "1.1";
-       sha256 = "0cyhlhks1zq1h7f49qi1xk094j7zhqfz8p0dpyg18qghppzhlyd8";
-       revision = "1";
-       editedCabalFile = "1ql2zqjcwy744qzydj3gk4qgnj4nzba6j2d5fvi31i5va7vqad2d";
+       version = "1.1.0.1";
+       sha256 = "1pfi84cl7w5bp7dwdhcyi8kchvbfjybqcp0sifqrn70dj2b50mf7";
        libraryHaskellDepends = [
          aeson attoparsec base base-compat bytestring optics-core
          optics-extra scientific text unordered-containers vector
@@ -24061,6 +24055,8 @@ self: {
        pname = "aig";
        version = "0.2.6";
        sha256 = "1xcwchzsz6kxd6b0bqqmfhyrjsmqyikrf5qdry81y6p5bphk098i";
+       revision = "1";
+       editedCabalFile = "03i6jnmzjkzh7hwfy2r93dcz2b5vw5s9x3z8nzcicr729rp7mydp";
        libraryHaskellDepends = [ base base-compat mtl QuickCheck vector ];
        testHaskellDepends = [
          base QuickCheck tasty tasty-ant-xml tasty-quickcheck
@@ -24608,6 +24604,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "alg_0_2_11_0" = callPackage
+    ({ mkDerivation, base, util }:
+     mkDerivation {
+       pname = "alg";
+       version = "0.2.11.0";
+       sha256 = "0wvv5sa5imsl272k8nnbbyq9kjv7l9iwyr7mqf7m9yimknm2lnaf";
+       libraryHaskellDepends = [ base util ];
+       description = "Algebraic structures";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "alga" = callPackage
     ({ mkDerivation, aeson, base, containers, data-default, exceptions
      , file-embed, filepath, formatting, haskeline, hspec, hxt
@@ -30217,6 +30225,8 @@ self: {
        pname = "arbor-monad-logger";
        version = "0.1.1.1";
        sha256 = "13lgpr2j2vq2d4mbxl72h86iw5n028m5q0n2hbiz4hgk2yn2f2hs";
+       revision = "1";
+       editedCabalFile = "1ga2dl721zi4qz5f1qb6vqnjw7fa5x862xz2636jnidl03jh4rwv";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -30810,8 +30820,8 @@ self: {
        pname = "armor";
        version = "0.1";
        sha256 = "0jmq6lhi1byhjzgkvnn4p481z8wik93angx7sf6cjfj5j0kqzv71";
-       revision = "3";
-       editedCabalFile = "1aksr6s5hcvxjjxd95z4n0xadhdpvz8l75906v5f18p7gkk6sjm7";
+       revision = "4";
+       editedCabalFile = "1vnjq91pawr4r7parg2kxs01d47b3lp8jpsji270bbmimqa0nql9";
        libraryHaskellDepends = [
          base bytestring containers directory filepath HUnit lens
        ];
@@ -39059,27 +39069,27 @@ self: {
      , bytestring-lexing, case-insensitive, clustering, conduit
      , conduit-combinators, conduit-extra, containers, criterion
      , data-default-class, data-ordlist, double-conversion, hexpat
-     , HsHTSLib, http-conduit, IntervalMap, lens, math-functions
-     , matrices, mtl, parallel, primitive, random, split, statistics
-     , tasty, tasty-golden, tasty-hunit, text, transformers
+     , HsHTSLib, http-conduit, IntervalMap, math-functions, matrices
+     , microlens, microlens-th, mtl, parallel, primitive, random, split
+     , statistics, tasty, tasty-golden, tasty-hunit, text, transformers
      , unordered-containers, vector, vector-algorithms, word8
      }:
      mkDerivation {
        pname = "bioinformatics-toolkit";
-       version = "0.8.0";
-       sha256 = "0mkcxqnszkr9r8w2rqb79501wxfpgd2g17rn2lrjcqllmxdvkgwk";
+       version = "0.9.0";
+       sha256 = "035j0f3ay16ndqv7vcmq8rc6ah1ia56w6axglh9v4yk3n0cd2zvj";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson aeson-pretty attoparsec base bytestring bytestring-lexing
          case-insensitive clustering conduit conduit-extra containers
          data-default-class data-ordlist double-conversion hexpat HsHTSLib
-         http-conduit IntervalMap lens math-functions matrices mtl parallel
-         primitive split statistics text transformers unordered-containers
-         vector vector-algorithms word8
+         http-conduit IntervalMap math-functions matrices microlens
+         microlens-th mtl parallel primitive split statistics text
+         transformers unordered-containers vector vector-algorithms word8
        ];
        testHaskellDepends = [
-         base bytestring conduit conduit-combinators data-default-class lens
-         matrices mtl random tasty tasty-golden tasty-hunit
+         base bytestring conduit conduit-combinators data-default-class
+         matrices microlens mtl random tasty tasty-golden tasty-hunit
          unordered-containers vector
        ];
        benchmarkHaskellDepends = [
@@ -43874,13 +43884,23 @@ self: {
      }) {};
 
   "bytesmith" = callPackage
-    ({ mkDerivation, base, byteslice, primitive }:
+    ({ mkDerivation, base, byteslice, bytestring, contiguous, gauge
+     , primitive, run-st, tasty, tasty-hunit, tasty-quickcheck
+     , text-short
+     }:
      mkDerivation {
        pname = "bytesmith";
-       version = "0.1.0.0";
-       sha256 = "1jj2shy510r83r8nahf6lwjhwp73kbmla6mly4fzjza81syrwrm4";
-       libraryHaskellDepends = [ base byteslice primitive ];
-       testHaskellDepends = [ base byteslice primitive ];
+       version = "0.2.0.1";
+       sha256 = "1qscwrsn18fms4kkia9rw9nqm115if97n8vhk8c71ri1hjqxvmb1";
+       libraryHaskellDepends = [
+         base byteslice bytestring contiguous primitive run-st text-short
+       ];
+       testHaskellDepends = [
+         base byteslice primitive tasty tasty-hunit tasty-quickcheck
+       ];
+       benchmarkHaskellDepends = [
+         base byteslice bytestring gauge primitive
+       ];
        description = "Nonresumable byte parser";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -45670,8 +45690,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal2nix";
-       version = "2.14.4";
-       sha256 = "0pxqdwxqc5siqrp7mqvz6g380wx4xn3y3mph8vjywvycvpqg2gqh";
+       version = "2.15.0";
+       sha256 = "1xfskgmwr75f1lk8a6mllp2h62jdl7hkwb01r74gpi0n6h17p3nm";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -49591,17 +49611,15 @@ self: {
      }) {};
 
   "chiphunk" = callPackage
-    ({ mkDerivation, base, c2hs, safe-exceptions, StateVar
+    ({ mkDerivation, base, c2hs, hashable, safe-exceptions, StateVar
      , vector-space
      }:
      mkDerivation {
        pname = "chiphunk";
-       version = "0.1.0.3";
-       sha256 = "0a39x0v5pswaz4b9nbq1cmi172qglcfk54f5w7sb0ldx88qqi9d3";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.1.1.0";
+       sha256 = "0avh87427i06ds79kkiikf6czylgwscxim3hjaz0fbpgvsd9snrm";
        libraryHaskellDepends = [
-         base safe-exceptions StateVar vector-space
+         base hashable safe-exceptions StateVar vector-space
        ];
        libraryToolDepends = [ c2hs ];
        description = "Haskell bindings for Chipmunk2D physics engine";
@@ -53260,6 +53278,38 @@ self: {
        broken = true;
      }) {};
 
+  "coinbase-pro" = callPackage
+    ({ mkDerivation, aeson, aeson-casing, async, base, binary
+     , bytestring, containers, cryptonite, HsOpenSSL, http-api-data
+     , http-client, http-client-tls, http-streams, http-types
+     , io-streams, memory, network, servant, servant-client
+     , servant-client-core, text, time, transformers, unagi-streams
+     , unordered-containers, vector, websockets, wuss
+     }:
+     mkDerivation {
+       pname = "coinbase-pro";
+       version = "0.5.0.0";
+       sha256 = "1zwxim2kn4vcf49n3zff4avwlimlm20m6mggxjaw0r7bv1vn7ad8";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson aeson-casing async base binary bytestring containers
+         cryptonite HsOpenSSL http-api-data http-client http-client-tls
+         http-streams http-types io-streams memory network servant
+         servant-client servant-client-core text time transformers
+         unagi-streams unordered-containers vector websockets wuss
+       ];
+       executableHaskellDepends = [
+         aeson aeson-casing async base binary bytestring containers
+         cryptonite HsOpenSSL http-api-data http-client http-client-tls
+         http-streams http-types io-streams memory network servant
+         servant-client servant-client-core text time transformers
+         unagi-streams unordered-containers vector websockets wuss
+       ];
+       description = "Client for Coinbase Pro";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "coincident-root-loci" = callPackage
     ({ mkDerivation, array, base, combinat, containers, random, tasty
      , tasty-hunit, transformers
@@ -55761,41 +55811,6 @@ self: {
      }) {};
 
   "conduit-algorithms" = callPackage
-    ({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit
-     , conduit-combinators, conduit-extra, conduit-zstd, containers
-     , criterion, deepseq, directory, exceptions, HUnit, lzma-conduit
-     , monad-control, mtl, pqueue, resourcet, stm, stm-conduit
-     , streaming-commons, test-framework, test-framework-hunit
-     , test-framework-th, transformers, unliftio-core, vector
-     }:
-     mkDerivation {
-       pname = "conduit-algorithms";
-       version = "0.0.10.1";
-       sha256 = "0lil9krb1gj4lckyfqlf9jmdb21n3wrf00kiiwcv1qc277p39z6y";
-       libraryHaskellDepends = [
-         async base bytestring bzlib-conduit conduit conduit-combinators
-         conduit-extra conduit-zstd containers deepseq exceptions
-         lzma-conduit monad-control mtl pqueue resourcet stm stm-conduit
-         streaming-commons transformers unliftio-core vector
-       ];
-       testHaskellDepends = [
-         async base bytestring bzlib-conduit conduit conduit-combinators
-         conduit-extra conduit-zstd containers deepseq directory exceptions
-         HUnit lzma-conduit monad-control mtl pqueue resourcet stm
-         stm-conduit streaming-commons test-framework test-framework-hunit
-         test-framework-th transformers unliftio-core vector
-       ];
-       benchmarkHaskellDepends = [
-         async base bytestring bzlib-conduit conduit conduit-combinators
-         conduit-extra conduit-zstd containers criterion deepseq exceptions
-         lzma-conduit monad-control mtl pqueue resourcet stm stm-conduit
-         streaming-commons transformers unliftio-core vector
-       ];
-       description = "Conduit-based algorithms";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "conduit-algorithms_0_0_11_0" = callPackage
     ({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit
      , conduit-combinators, conduit-extra, conduit-zstd, containers
      , criterion, deepseq, directory, exceptions, HUnit, lzma-conduit
@@ -55828,7 +55843,6 @@ self: {
        ];
        description = "Conduit-based algorithms";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "conduit-audio" = callPackage
@@ -56552,6 +56566,8 @@ self: {
        pname = "config-value";
        version = "0.7.0.1";
        sha256 = "0r7qylqmdvif75ylb0d0zryl2ghxl3ip9a2jhyq70aqxwdjh18g4";
+       revision = "1";
+       editedCabalFile = "10rdyg984dkd0xq9z54300wkkgl7zfj4l8bi4vlplvw6jh65v36c";
        libraryHaskellDepends = [ array base pretty text ];
        libraryToolDepends = [ alex happy ];
        testHaskellDepends = [ base text ];
@@ -57166,8 +57182,8 @@ self: {
      }:
      mkDerivation {
        pname = "constraints-deriving";
-       version = "1.1.0.0";
-       sha256 = "15rspwn8i2rwmqsxb505087ars0i10licwj4adsgm89ajhgrqvp9";
+       version = "1.1.1.0";
+       sha256 = "1phgcib4bxbci2n4kh3r1iyp31bbzs6qpnvmxf373hglwyvj9pjy";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal ];
@@ -57865,19 +57881,6 @@ self: {
      }) {};
 
   "control-monad-omega" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "control-monad-omega";
-       version = "0.3.1";
-       sha256 = "11hirysr76i01qj8rm22xjcrv2qwxgwjlrqqyd1dsnnvypn9hfrq";
-       revision = "1";
-       editedCabalFile = "029v5j0mnlzzn6my7jgw26gdm5fbs2h7y395zk1q7r5bfar00q58";
-       libraryHaskellDepends = [ base ];
-       description = "A breadth-first list monad";
-       license = stdenv.lib.licenses.publicDomain;
-     }) {};
-
-  "control-monad-omega_0_3_2" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "control-monad-omega";
@@ -57886,7 +57889,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A breadth-first list monad";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "control-monad-queue" = callPackage
@@ -58878,10 +58880,10 @@ self: {
      }:
      mkDerivation {
        pname = "cpkg";
-       version = "0.2.3.2";
-       sha256 = "0dwcahc8m2mj3jm0hwx13wzhlnyiby4sds8pc70fv54zp0ccbq6r";
+       version = "0.2.3.3";
+       sha256 = "1wd53g5isk284im2vzyis9n38qchg6m62zb3x4gkmy21zrjh50f1";
        revision = "1";
-       editedCabalFile = "1c38aadl6lfnid8ipmpvm78mlvb0rgqr5sdjg86y1ks4q45nqw3g";
+       editedCabalFile = "1ihawlb4xkq5lhj56ry5n2mhykrkjnan33s577f6gzzmzyz0rd1h";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -59570,8 +59572,8 @@ self: {
      }:
      mkDerivation {
        pname = "crdt";
-       version = "10.4";
-       sha256 = "182lnbci8vdp7mc6mihap00ffv59xdnjhbbbx5pwjjhxwpavfvv6";
+       version = "10.5";
+       sha256 = "06ndalfz2j722ifblzz3pamb0fdyhs9pa0286kmx2dcrvw7kq1vy";
        libraryHaskellDepends = [
          base binary bytestring containers Diff hashable mtl network-info
          safe stm time vector
@@ -61776,8 +61778,8 @@ self: {
      }:
      mkDerivation {
        pname = "cursor";
-       version = "0.1.0.1";
-       sha256 = "1ipwk9lnazhkzy4fxdc4y0hqa1vdlgda43jdjnp9j00q5fgrhldz";
+       version = "0.2.0.0";
+       sha256 = "1haikdgyj7m6c7ihwvl4wy0za0nvrhh2bvqm1afa5465mcm5ynnw";
        libraryHaskellDepends = [
          base containers microlens text validity validity-containers
          validity-text
@@ -61804,8 +61806,8 @@ self: {
      }:
      mkDerivation {
        pname = "cursor-gen";
-       version = "0.1.0.0";
-       sha256 = "1f9s1da9vf8sr27aidk3rgvkn594pv94w4gqqyi6ikl5dx8yzqxn";
+       version = "0.2.0.0";
+       sha256 = "1i9ad6gmd4sqs3nbgij4jm509m6gx4v0pghsf4d3qn71hbxbxipc";
        libraryHaskellDepends = [
          base containers cursor genvalidity genvalidity-containers
          genvalidity-text QuickCheck text
@@ -68537,6 +68539,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "dialogflow-fulfillment" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
+     , directory, hspec, hspec-discover, text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "dialogflow-fulfillment";
+       version = "0.1.0.0";
+       sha256 = "0pz5qyz6sf00c5155mrraya7jr8sp99hmfm1642hv4zhj08ky0j7";
+       libraryHaskellDepends = [
+         aeson base bytestring containers text unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson aeson-pretty base bytestring containers directory hspec
+         hspec-discover
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "A Dialogflow Fulfillment library for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "dib" = callPackage
     ({ mkDerivation, ansi-terminal, base, bytestring, cereal
      , containers, digest, directory, filepath, mtl, process, text, time
@@ -70755,8 +70777,8 @@ self: {
      }:
      mkDerivation {
        pname = "distribution-nixpkgs";
-       version = "1.3.0";
-       sha256 = "192r9aizcjvnm0s57v056x42mvlq79fk8630g73ps6qqnb2mjy9h";
+       version = "1.3.1";
+       sha256 = "1113qizh931inpim0ajfwihcvlp26n1l4bf36v0jakd34k70mm8g";
        libraryHaskellDepends = [
          aeson base bytestring Cabal containers deepseq language-nix lens
          pretty process split
@@ -71205,6 +71227,8 @@ self: {
        pname = "dns";
        version = "4.0.0";
        sha256 = "0gq0y8pw4x8fja0f3hhwpbxh4rg2i8nzfnp2rxh2py49qfhg38mj";
+       revision = "1";
+       editedCabalFile = "0cg5jhn5g28qspkinx44zyz0yn08ddcsylhmvlpp4clyb9zlz1si";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          array async attoparsec auto-update base base16-bytestring
@@ -71551,7 +71575,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "doctemplates_0_6" = callPackage
+  "doctemplates_0_6_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, criterion
      , doclayout, filepath, Glob, mtl, parsec, safe, scientific, tasty
      , tasty-golden, tasty-hunit, temporary, text, unordered-containers
@@ -71559,8 +71583,8 @@ self: {
      }:
      mkDerivation {
        pname = "doctemplates";
-       version = "0.6";
-       sha256 = "1bimvksijpz3czx0si9wwiigi4knc3d4i7rl6fssmz3z9qs6rhxg";
+       version = "0.6.1";
+       sha256 = "0zarj24mq8qgj1b2njhwssqfhv652c1zi6xj0pcq0pazyj9n95d2";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base containers doclayout filepath mtl parsec safe scientific
@@ -76268,6 +76292,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "emd_0_1_6_0" = callPackage
+    ({ mkDerivation, base, binary, containers, criterion
+     , data-default-class, deepseq, finite-typelits
+     , ghc-typelits-knownnat, ghc-typelits-natnormalise, HUnit
+     , mwc-random, statistics, transformers, typelits-witnesses, vector
+     , vector-sized
+     }:
+     mkDerivation {
+       pname = "emd";
+       version = "0.1.6.0";
+       sha256 = "0x478z1j15swqj1y1knnf3q7z49hfxp86w37x4pd27pclhlx0hm5";
+       libraryHaskellDepends = [
+         base binary containers data-default-class deepseq finite-typelits
+         ghc-typelits-knownnat ghc-typelits-natnormalise transformers
+         typelits-witnesses vector vector-sized
+       ];
+       testHaskellDepends = [ base containers HUnit ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq ghc-typelits-knownnat mwc-random statistics
+         vector vector-sized
+       ];
+       description = "Empirical Mode Decomposition and Hilbert-Huang Transform";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "emgm" = callPackage
     ({ mkDerivation, base, HUnit, QuickCheck, syb }:
      mkDerivation {
@@ -78879,6 +78929,43 @@ self: {
        broken = true;
      }) {};
 
+  "eventstore_1_3_2" = callPackage
+    ({ mkDerivation, aeson, array, async, base, bifunctors, bytestring
+     , cereal, clock, connection, containers, dns, dotnet-timespan
+     , ekg-core, exceptions, fast-logger, file-embed, hashable
+     , http-client, interpolate, lifted-async, lifted-base
+     , monad-control, monad-logger, mono-traversable, mtl, protobuf
+     , random, safe, safe-exceptions, semigroups, stm, stm-chans
+     , streaming, tasty, tasty-hspec, tasty-hunit, text, time
+     , transformers-base, unordered-containers, uuid, vector
+     }:
+     mkDerivation {
+       pname = "eventstore";
+       version = "1.3.2";
+       sha256 = "1a5nxx9w56x1ddnncnc576x9282jlmksqn6gscmavmaj7i9nfplg";
+       libraryHaskellDepends = [
+         aeson array base bifunctors bytestring cereal clock connection
+         containers dns dotnet-timespan ekg-core exceptions fast-logger
+         hashable http-client interpolate lifted-async lifted-base
+         monad-control monad-logger mono-traversable mtl protobuf random
+         safe safe-exceptions semigroups stm stm-chans streaming text time
+         transformers-base unordered-containers uuid vector
+       ];
+       testHaskellDepends = [
+         aeson async base bytestring cereal connection containers
+         dotnet-timespan exceptions fast-logger file-embed hashable
+         lifted-async lifted-base monad-control mono-traversable protobuf
+         safe safe-exceptions semigroups stm stm-chans streaming tasty
+         tasty-hspec tasty-hunit text time transformers-base
+         unordered-containers uuid vector
+       ];
+       description = "EventStore TCP Client";
+       license = stdenv.lib.licenses.bsd3;
+       platforms = [ "x86_64-darwin" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "every" = callPackage
     ({ mkDerivation, async, base, stm }:
      mkDerivation {
@@ -80565,8 +80652,8 @@ self: {
        pname = "fake";
        version = "0.1.1.2";
        sha256 = "0jwndfsyc5p7da97658j14x5gynbifkx7ikg8k09ym9gizkrmdd2";
-       revision = "1";
-       editedCabalFile = "0gpqpb6vmskw7l6k3q18cfb670azxldiirj9sapz043sqd5wc3di";
+       revision = "2";
+       editedCabalFile = "17ggg7m04xr42353b2gyx965c8qgymd4nvlzcm5zyx2v7q9zwy8f";
        libraryHaskellDepends = [
          base containers generics-sop random text time
        ];
@@ -80792,26 +80879,6 @@ self: {
      }) {};
 
   "fast-builder" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, criterion
-     , deepseq, ghc-prim, process, QuickCheck, scientific, stm
-     , template-haskell, text, true-name, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "fast-builder";
-       version = "0.1.1.0";
-       sha256 = "024n5q1zsmd1va662sjdnc42w4qj6pmqg64fsfcn0jx5zvmg62d9";
-       libraryHaskellDepends = [ base bytestring ghc-prim ];
-       testHaskellDepends = [ base bytestring process QuickCheck stm ];
-       benchmarkHaskellDepends = [
-         aeson base bytestring containers criterion deepseq ghc-prim
-         scientific template-haskell text true-name unordered-containers
-         vector
-       ];
-       description = "Fast ByteString Builder";
-       license = stdenv.lib.licenses.publicDomain;
-     }) {};
-
-  "fast-builder_0_1_2_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, criterion
      , deepseq, ghc-prim, process, QuickCheck, scientific, stm
      , template-haskell, text, true-name, unordered-containers, vector
@@ -80829,7 +80896,6 @@ self: {
        ];
        description = "Fast ByteString Builder";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fast-combinatorics" = callPackage
@@ -84243,6 +84309,39 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "flatbuffers" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, binary, bytestring
+     , containers, criterion, directory, filepath, hedgehog, hspec
+     , hspec-core, hspec-expectations-pretty-diff, hspec-megaparsec
+     , http-client, http-types, HUnit, hw-hspec-hedgehog, megaparsec
+     , mtl, parser-combinators, process, raw-strings-qq, scientific
+     , template-haskell, text, text-manipulate, th-pprint, utf8-string
+     , vector
+     }:
+     mkDerivation {
+       pname = "flatbuffers";
+       version = "0.1.0.0";
+       sha256 = "0rmcq2wknsffvb5mzb7rin9wiksislm5gll4srkaijpz6mian2b0";
+       libraryHaskellDepends = [
+         base binary bytestring containers directory filepath megaparsec mtl
+         parser-combinators scientific template-haskell text text-manipulate
+       ];
+       testHaskellDepends = [
+         aeson aeson-pretty base binary bytestring containers directory
+         filepath hedgehog hspec hspec-core hspec-expectations-pretty-diff
+         hspec-megaparsec http-client http-types HUnit hw-hspec-hedgehog
+         megaparsec mtl parser-combinators process raw-strings-qq scientific
+         template-haskell text text-manipulate th-pprint utf8-string
+       ];
+       benchmarkHaskellDepends = [
+         aeson base binary bytestring containers criterion directory
+         filepath megaparsec mtl parser-combinators scientific
+         template-haskell text text-manipulate vector
+       ];
+       description = "Haskell implementation of the FlatBuffers protocol";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "flay" = callPackage
     ({ mkDerivation, base, constraints, tasty, tasty-quickcheck
      , transformers
@@ -87690,8 +87789,8 @@ self: {
      }:
      mkDerivation {
        pname = "ftp-client";
-       version = "0.5.1.1";
-       sha256 = "01f8d32f2nkqrf21p38zgzwmvl2pkpl9rx0c8a8ch6h56flzhck4";
+       version = "0.5.1.2";
+       sha256 = "0sgabysbwmavnl0asxr5xwgx5py7zpqjaair69867cnrqq3jwf4q";
        libraryHaskellDepends = [
          attoparsec base bytestring connection containers exceptions network
          transformers
@@ -87709,8 +87808,8 @@ self: {
      }:
      mkDerivation {
        pname = "ftp-client-conduit";
-       version = "0.5.0.4";
-       sha256 = "0w4sfa4qyclcfixxlam5djhv9hx0hzhfsvf2cabs6m8mgks8zidi";
+       version = "0.5.0.5";
+       sha256 = "0f5168z4k4j267whr0r5xlaqi8zzg1ihqfls6fjqicyqv37k8sj2";
        libraryHaskellDepends = [
          base bytestring conduit connection exceptions ftp-client resourcet
        ];
@@ -90597,6 +90696,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "genvalidity_0_9_0_0" = callPackage
+    ({ mkDerivation, base, hspec, hspec-core, QuickCheck, validity }:
+     mkDerivation {
+       pname = "genvalidity";
+       version = "0.9.0.0";
+       sha256 = "1q2ylz0id5b85ycqymrybpgczqmm9cc9yqzlg9lilhq8rnp0na0x";
+       libraryHaskellDepends = [ base QuickCheck validity ];
+       testHaskellDepends = [ base hspec hspec-core QuickCheck ];
+       description = "Testing utilities for the validity library";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "genvalidity-aeson" = callPackage
     ({ mkDerivation, aeson, base, genvalidity, genvalidity-hspec
      , genvalidity-scientific, genvalidity-text
@@ -90657,6 +90769,27 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "genvalidity-containers_0_8_0_0" = callPackage
+    ({ mkDerivation, base, containers, genvalidity, genvalidity-hspec
+     , genvalidity-property, hspec, QuickCheck, validity
+     , validity-containers
+     }:
+     mkDerivation {
+       pname = "genvalidity-containers";
+       version = "0.8.0.0";
+       sha256 = "1397i50dzd7jhq2ymzs2msgbgkih9dfn74bhl2va2rrgjhnypnw6";
+       libraryHaskellDepends = [
+         base containers genvalidity QuickCheck validity validity-containers
+       ];
+       testHaskellDepends = [
+         base containers genvalidity genvalidity-hspec genvalidity-property
+         hspec validity
+       ];
+       description = "GenValidity support for containers";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "genvalidity-hspec" = callPackage
     ({ mkDerivation, base, doctest, genvalidity, genvalidity-property
      , hspec, hspec-core, QuickCheck, transformers, validity
@@ -90677,6 +90810,27 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "genvalidity-hspec_0_7_0_2" = callPackage
+    ({ mkDerivation, base, doctest, genvalidity, genvalidity-property
+     , hspec, hspec-core, QuickCheck, transformers, validity
+     }:
+     mkDerivation {
+       pname = "genvalidity-hspec";
+       version = "0.7.0.2";
+       sha256 = "0xdp8wr5l4hhqa7p50i37jd9sgns9vlwsivz5ds6x4b86wnw8h4v";
+       libraryHaskellDepends = [
+         base genvalidity genvalidity-property hspec hspec-core QuickCheck
+         transformers validity
+       ];
+       testHaskellDepends = [
+         base doctest genvalidity genvalidity-property hspec hspec-core
+         QuickCheck validity
+       ];
+       description = "Standard spec's for GenValidity instances";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "genvalidity-hspec-aeson" = callPackage
     ({ mkDerivation, aeson, base, bytestring, deepseq, doctest
      , genvalidity, genvalidity-aeson, genvalidity-hspec
@@ -90858,6 +91012,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "genvalidity-property_0_5_0_1" = callPackage
+    ({ mkDerivation, base, directory, doctest, filepath, genvalidity
+     , hspec, pretty-show, QuickCheck, validity
+     }:
+     mkDerivation {
+       pname = "genvalidity-property";
+       version = "0.5.0.1";
+       sha256 = "0cvzc4z4771vpycwfgcj0yswyglzl6cl1h2wrfhs224nrcmk5a7z";
+       libraryHaskellDepends = [
+         base genvalidity hspec pretty-show QuickCheck validity
+       ];
+       testHaskellDepends = [ base directory doctest filepath ];
+       description = "Standard properties for functions on `Validity` types";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "genvalidity-scientific" = callPackage
     ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec
      , QuickCheck, scientific, validity, validity-scientific
@@ -94656,8 +94827,8 @@ self: {
      }:
      mkDerivation {
        pname = "git-lfs";
-       version = "1.0.0";
-       sha256 = "0ryxi43sng5nwb9brdirvvxcs2j6bmg1x9vdx9fq5r4dch62b1zy";
+       version = "1.1.0";
+       sha256 = "1llg50517xw4nccjik63gsg0nwkb4lhp0fs0lbi3q38xv9a3imyz";
        libraryHaskellDepends = [
          aeson base bytestring case-insensitive containers http-client
          http-types network-uri text
@@ -94895,25 +95066,6 @@ self: {
      }) {};
 
   "githash" = callPackage
-    ({ mkDerivation, base, bytestring, directory, filepath, hspec
-     , process, template-haskell, temporary, unliftio
-     }:
-     mkDerivation {
-       pname = "githash";
-       version = "0.1.3.2";
-       sha256 = "0wn0pr7idx6nb6d7nkjx6dfncz15c9wbhpg6s5395pa1s8q7fx3j";
-       libraryHaskellDepends = [
-         base bytestring directory filepath process template-haskell
-       ];
-       testHaskellDepends = [
-         base bytestring directory filepath hspec process template-haskell
-         temporary unliftio
-       ];
-       description = "Compile git revision info into Haskell projects";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "githash_0_1_3_3" = callPackage
     ({ mkDerivation, base, bytestring, directory, filepath, hspec
      , process, template-haskell, temporary, unliftio
      }:
@@ -94930,7 +95082,6 @@ self: {
        ];
        description = "Compile git revision info into Haskell projects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "github" = callPackage
@@ -95291,8 +95442,8 @@ self: {
      }:
      mkDerivation {
        pname = "gitlab-haskell";
-       version = "0.1.0.2";
-       sha256 = "16dj3m038fgxf8w69g8qldnsk2xrk83lkkgdapwv7qz9c9jd0nh1";
+       version = "0.1.1";
+       sha256 = "1h4cc3ay8bpc11ja2xsy6yxi7s7riscrnjcma4iwf2k35r9jnjxi";
        libraryHaskellDepends = [
          aeson base bytestring connection http-conduit http-types text
          transformers unliftio unliftio-core
@@ -103574,8 +103725,8 @@ self: {
        pname = "hackage-db";
        version = "2.0.1";
        sha256 = "13ggj72i8dxwh3qwznnqxbr00nvsbapyyhzx5zybfacddnpw3aph";
-       revision = "1";
-       editedCabalFile = "0l2zdajacqibwkjs5pif6a3mxns9jpc6iry7xxqcfis4n9ks404a";
+       revision = "2";
+       editedCabalFile = "0qscq4d3xwvjhqi1fiky7g12iwbkwn9qrypwzg9lx4p3c5xlwlvn";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -104328,8 +104479,6 @@ self: {
        ];
        description = "Dockerfile Linter JavaScript API";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hadoop-formats" = callPackage
@@ -104491,8 +104640,8 @@ self: {
      }:
      mkDerivation {
        pname = "haiji";
-       version = "0.3.0.0";
-       sha256 = "079q3m3c39ip86hpirq9c5l3b9hw030zd5slwi2bssbmq2bhfv5i";
+       version = "0.3.1.0";
+       sha256 = "0z0f6w4krfs220342v8sa2ylfk1qnd695pn0i9qxr7k0pwbph2wg";
        libraryHaskellDepends = [
          aeson attoparsec base data-default mtl scientific tagged
          template-haskell text transformers unordered-containers vector
@@ -104973,6 +105122,8 @@ self: {
        pname = "hakyll-dhall";
        version = "0.2.3.0";
        sha256 = "1a8aq1gmj6mwpv43s2vr7asp6v6bflms1vhd9dvs04jfnw3jbvpz";
+       revision = "1";
+       editedCabalFile = "1r2v4s90c3g9lhbrb9ps4za3k836brd0s41q8jimbiz7wrd0amy1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -113845,63 +113996,7 @@ self: {
        broken = true;
      }) {};
 
-  "hedgehog_0_6_1" = callPackage
-    ({ mkDerivation, ansi-terminal, async, base, bytestring
-     , concurrent-output, containers, directory, exceptions
-     , lifted-async, mmorph, monad-control, mtl, pretty-show, primitive
-     , random, resourcet, semigroups, stm, template-haskell, text
-     , th-lift, time, transformers, transformers-base, unix
-     , wl-pprint-annotated
-     }:
-     mkDerivation {
-       pname = "hedgehog";
-       version = "0.6.1";
-       sha256 = "0xz10ycdm5vk9nrcym1fi83k19frfwqz18bz8bnpzwvaj0j41yfj";
-       revision = "5";
-       editedCabalFile = "0kwmxjb1y3gk85njacw5wcvmq3bzp1649dbjzgzpiba2w342f7il";
-       libraryHaskellDepends = [
-         ansi-terminal async base bytestring concurrent-output containers
-         directory exceptions lifted-async mmorph monad-control mtl
-         pretty-show primitive random resourcet semigroups stm
-         template-haskell text th-lift time transformers transformers-base
-         unix wl-pprint-annotated
-       ];
-       testHaskellDepends = [
-         base containers pretty-show semigroups text transformers
-       ];
-       description = "Hedgehog will eat all your bugs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "hedgehog" = callPackage
-    ({ mkDerivation, ansi-terminal, async, base, bytestring
-     , concurrent-output, containers, directory, exceptions, fail
-     , lifted-async, mmorph, monad-control, mtl, pretty-show, primitive
-     , random, resourcet, semigroups, stm, template-haskell, text, time
-     , transformers, transformers-base, wl-pprint-annotated
-     }:
-     mkDerivation {
-       pname = "hedgehog";
-       version = "1.0";
-       sha256 = "1np9xg58x20kalfci9dxbd4wsg0sl3ka56ragzy3i9p0nx29pmns";
-       revision = "2";
-       editedCabalFile = "0sbw4hwcza5pb02cndl5f30cyqjl44mn5y3i72n4x8s8mknsy3a4";
-       libraryHaskellDepends = [
-         ansi-terminal async base bytestring concurrent-output containers
-         directory exceptions fail lifted-async mmorph monad-control mtl
-         pretty-show primitive random resourcet semigroups stm
-         template-haskell text time transformers transformers-base
-         wl-pprint-annotated
-       ];
-       testHaskellDepends = [
-         base containers mmorph mtl pretty-show semigroups text transformers
-       ];
-       description = "Release with confidence";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hedgehog_1_0_1" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, bytestring
      , concurrent-output, containers, directory, exceptions, fail
      , lifted-async, mmorph, monad-control, mtl, pretty-show, primitive
@@ -113926,7 +114021,6 @@ self: {
        ];
        description = "Release with confidence";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hedgehog-checkers" = callPackage
@@ -114271,6 +114365,8 @@ self: {
        pname = "heist";
        version = "1.1.0.1";
        sha256 = "1j4h9fwny4hl2m5lgsd257lvm9057fb0hmnaqjw8a9k4hyx7hmqq";
+       revision = "1";
+       editedCabalFile = "08ihm07rqkhaxgnxr4ix08chxpqs0gps2b5xv79lzbl6cn6rj63c";
        libraryHaskellDepends = [
          aeson attoparsec base blaze-builder blaze-html bytestring
          containers directory directory-tree dlist filepath hashable
@@ -117228,8 +117324,8 @@ self: {
      }:
      mkDerivation {
        pname = "hinterface";
-       version = "0.10.0";
-       sha256 = "0a89h3vn8arms93fj3p3ip208wamljkdxikkg7dlrf143iymcs8n";
+       version = "0.11.0";
+       sha256 = "1p878194kl4dma6xmp73j4m87yjs7lprjqm3pb81li222fcylz88";
        libraryHaskellDepends = [
          array async base binary bytestring containers cryptonite deepseq
          exceptions lifted-async lifted-base memory monad-control
@@ -128061,6 +128157,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "http-mock" = callPackage
+    ({ mkDerivation, async, base, directory, filepath, http-client
+     , network, random, wai, warp
+     }:
+     mkDerivation {
+       pname = "http-mock";
+       version = "0.1.0.0";
+       sha256 = "1zba8dyn6ww6qy7l1qxq5vh53l9jx5w7xb258lj0bwwqc32bks2y";
+       libraryHaskellDepends = [
+         async base directory filepath http-client network random wai warp
+       ];
+       testHaskellDepends = [ base ];
+       description = "HTTP mocking and expectations library for Haskell";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "http-monad" = callPackage
     ({ mkDerivation, base, bytestring, containers, explicit-exception
      , HTTP, lazyio, network, network-uri, parsec, semigroups
@@ -130120,8 +130232,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-prim";
-       version = "0.6.2.31";
-       sha256 = "00xfakvwnj3zys2ilpc9w9z5qzw1ng3cc65jfa1860z6yr7xdp59";
+       version = "0.6.2.32";
+       sha256 = "0q65kivpxciqvknnradmpkaplrkfbckqv3xajk8h2dgas8r1m40l";
        libraryHaskellDepends = [
          base bytestring ghc-prim mmap semigroups transformers unliftio-core
          vector
@@ -130138,15 +130250,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hw-prim_0_6_2_32" = callPackage
+  "hw-prim_0_6_2_33" = callPackage
     ({ mkDerivation, base, bytestring, criterion, directory, exceptions
      , ghc-prim, hedgehog, hspec, hspec-discover, hw-hspec-hedgehog
      , mmap, QuickCheck, semigroups, transformers, unliftio-core, vector
      }:
      mkDerivation {
        pname = "hw-prim";
-       version = "0.6.2.32";
-       sha256 = "0q65kivpxciqvknnradmpkaplrkfbckqv3xajk8h2dgas8r1m40l";
+       version = "0.6.2.33";
+       sha256 = "1n4bg5q8mdphsd9v7xgabks4r3vl70rlvfz4hj6kwcrqnamqdhl1";
        libraryHaskellDepends = [
          base bytestring ghc-prim mmap semigroups transformers unliftio-core
          vector
@@ -130431,38 +130543,38 @@ self: {
 
   "hw-xml" = callPackage
     ({ mkDerivation, ansi-wl-pprint, array, attoparsec, base
-     , bytestring, cereal, conduit, containers, criterion, deepseq
-     , ghc-prim, hspec, hspec-discover, hw-balancedparens, hw-bits
-     , hw-conduit, hw-parser, hw-prim, hw-rankselect, hw-rankselect-base
-     , lens, mmap, mtl, QuickCheck, resourcet, transformers, vector
-     , word8
+     , bytestring, cereal, containers, criterion, deepseq, generic-lens
+     , ghc-prim, hedgehog, hspec, hspec-discover, hw-balancedparens
+     , hw-bits, hw-hspec-hedgehog, hw-parser, hw-prim, hw-rankselect
+     , hw-rankselect-base, lens, mmap, mtl, optparse-applicative
+     , resourcet, text, transformers, vector, word8
      }:
      mkDerivation {
        pname = "hw-xml";
-       version = "0.3.0.0";
-       sha256 = "1f7q4vqrj5iv2c2dcgc6cld6zaqqp8d575fnali1lg3fv5n1g69k";
+       version = "0.4.0.0";
+       sha256 = "07mv58bwzafzcaddnahj6p1qvblm4fjrydrq1adi7slydmsxa61z";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         ansi-wl-pprint array attoparsec base bytestring cereal conduit
-         containers deepseq ghc-prim hw-balancedparens hw-bits hw-conduit
-         hw-parser hw-prim hw-rankselect hw-rankselect-base lens mtl
-         resourcet transformers vector word8
+         ansi-wl-pprint array attoparsec base bytestring cereal containers
+         deepseq ghc-prim hw-balancedparens hw-bits hw-parser hw-prim
+         hw-rankselect hw-rankselect-base lens mmap mtl resourcet
+         transformers vector word8
        ];
        executableHaskellDepends = [
-         base bytestring hw-balancedparens hw-bits hw-prim hw-rankselect
-         vector
+         attoparsec base bytestring generic-lens hw-balancedparens hw-bits
+         hw-prim hw-rankselect lens mmap mtl optparse-applicative resourcet
+         text vector
        ];
        testHaskellDepends = [
-         attoparsec base bytestring conduit hspec hw-balancedparens hw-bits
-         hw-conduit hw-prim hw-rankselect hw-rankselect-base QuickCheck
-         vector
+         attoparsec base bytestring hedgehog hspec hw-balancedparens hw-bits
+         hw-hspec-hedgehog hw-prim hw-rankselect hw-rankselect-base vector
        ];
        testToolDepends = [ hspec-discover ];
        benchmarkHaskellDepends = [
-         base bytestring conduit criterion hw-balancedparens hw-bits
-         hw-conduit hw-prim mmap resourcet vector
+         base bytestring criterion hw-balancedparens hw-bits hw-prim mmap
+         resourcet vector
        ];
        description = "Conduits for tokenizing streams";
        license = stdenv.lib.licenses.bsd3;
@@ -135863,6 +135975,8 @@ self: {
        pname = "io-streams";
        version = "1.5.1.0";
        sha256 = "1c7byr943x41nxpc3bnz152fvfbmakafq2958wyf9qiyp2pz18la";
+       revision = "1";
+       editedCabalFile = "0n0qs5lgryh3zxy73j3qbpnxand43yd2bj6pclvyii8apqqp901a";
        configureFlags = [ "-fNoInteractiveTests" ];
        libraryHaskellDepends = [
          attoparsec base bytestring bytestring-builder network primitive
@@ -135886,6 +136000,8 @@ self: {
        pname = "io-streams-haproxy";
        version = "1.0.1.0";
        sha256 = "1dcn5hd4fiwyq7m01r6fi93vfvygca5s6mz87c78m0zyj29clkmp";
+       revision = "1";
+       editedCabalFile = "00zbqcxfkrxidrli5qd8jvdw0jkyvcb3bwv29w8nbk9cr8vmmfl3";
        libraryHaskellDepends = [
          attoparsec base bytestring io-streams network transformers
        ];
@@ -143815,26 +143931,6 @@ self: {
      }) {};
 
   "language-c" = callPackage
-    ({ mkDerivation, alex, array, base, bytestring, containers, deepseq
-     , directory, filepath, happy, pretty, process, syb
-     }:
-     mkDerivation {
-       pname = "language-c";
-       version = "0.8.2";
-       sha256 = "05ff3ywh2lpxgd00nv6y3jnqpdl6bg0f2yn3csd043rv4srd6adp";
-       revision = "2";
-       editedCabalFile = "074mypdymg7543waq68c72viw912w94v94y1287sp67lzwpyiixd";
-       libraryHaskellDepends = [
-         array base bytestring containers deepseq directory filepath pretty
-         process syb
-       ];
-       libraryToolDepends = [ alex happy ];
-       testHaskellDepends = [ base directory filepath process ];
-       description = "Analysis and generation of C code";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "language-c_0_8_3" = callPackage
     ({ mkDerivation, alex, array, base, bytestring, containers, deepseq
      , directory, filepath, happy, pretty, process, syb
      }:
@@ -143850,7 +143946,6 @@ self: {
        testHaskellDepends = [ base directory filepath process ];
        description = "Analysis and generation of C code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-c-comments" = callPackage
@@ -146471,6 +146566,8 @@ self: {
        pname = "lens-family-th";
        version = "0.5.0.2";
        sha256 = "1rmhcnnlnll4mq7pqld5qg6crxh74gp0fqiwl6wn8l3ssgx5l9ww";
+       revision = "1";
+       editedCabalFile = "06sbynlrbqb51rn392w1q82qww1f6k8mmw1npgla2wc6s39k4977";
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base hspec template-haskell transformers ];
        description = "Generate lens-family style lenses";
@@ -149486,33 +149583,30 @@ self: {
 
   "liquid-fixpoint" = callPackage
     ({ mkDerivation, ansi-terminal, array, ascii-progress, async
-     , attoparsec, base, bifunctors, binary, boxes, bytestring, cereal
-     , cmdargs, containers, deepseq, directory, dotgen, fgl
-     , fgl-visualize, filemanip, filepath, ghc-prim, git, hashable
-     , intern, located-base, mtl, nettools, ocaml, parallel, parallel-io
-     , parsec, pretty, process, stm, syb, tasty, tasty-ant-xml
-     , tasty-hunit, tasty-rerun, text, text-format, time, transformers
-     , unordered-containers, z3
+     , attoparsec, base, binary, boxes, cereal, cmdargs, containers
+     , deepseq, directory, fgl, filepath, ghc-prim, git, hashable
+     , intern, mtl, nettools, ocaml, parallel, parsec, pretty, process
+     , stm, syb, tasty, tasty-ant-xml, tasty-hunit, tasty-rerun, text
+     , text-format, transformers, unordered-containers, z3
      }:
      mkDerivation {
        pname = "liquid-fixpoint";
-       version = "0.7.0.7";
-       sha256 = "1b1pf6cgbgnd0lqn1r4lb8y6hm7qybyc45rr51kxnvqryvb9g9cz";
+       version = "0.8.0.2";
+       sha256 = "1x8xbcf2xc9hwfpsl1s15qkmgdhr30fff4gp09dvnwi3z4mgi2wf";
        configureFlags = [ "-fbuild-external" ];
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         ansi-terminal array ascii-progress async attoparsec base bifunctors
-         binary boxes bytestring cereal cmdargs containers deepseq directory
-         dotgen fgl fgl-visualize filemanip filepath ghc-prim hashable
-         intern located-base mtl parallel parallel-io parsec pretty process
-         syb text text-format time transformers unordered-containers
+         ansi-terminal array ascii-progress async attoparsec base binary
+         boxes cereal cmdargs containers deepseq directory fgl filepath
+         ghc-prim hashable intern mtl parallel parsec pretty process syb
+         text text-format transformers unordered-containers
        ];
        executableHaskellDepends = [ base ];
        executableSystemDepends = [ ocaml ];
        testHaskellDepends = [
          base containers directory filepath mtl process stm tasty
-         tasty-ant-xml tasty-hunit tasty-rerun text transformers
+         tasty-ant-xml tasty-hunit tasty-rerun transformers
        ];
        testSystemDepends = [ git nettools z3 ];
        doCheck = false;
@@ -149523,40 +149617,34 @@ self: {
          inherit (pkgs) ocaml; inherit (pkgs) z3;};
 
   "liquidhaskell" = callPackage
-    ({ mkDerivation, aeson, array, base, bifunctors, binary, bytestring
-     , Cabal, cereal, cmdargs, containers, data-default, deepseq, Diff
-     , directory, exceptions, filepath, fingertree, ghc, ghc-boot
-     , ghc-paths, ghc-prim, gitrev, hashable, hpc, hscolour
-     , liquid-fixpoint, located-base, mtl, optparse-applicative
-     , optparse-simple, parsec, pretty, process, QuickCheck, stm, syb
-     , tagged, tasty, tasty-ant-xml, tasty-hunit, tasty-rerun
-     , template-haskell, temporary, text, text-format, th-lift, time
-     , transformers, unordered-containers, vector, z3
+    ({ mkDerivation, aeson, base, binary, bytestring, cereal, cmdargs
+     , containers, data-default, deepseq, Diff, directory, filepath
+     , fingertree, ghc, ghc-boot, ghc-paths, ghc-prim, githash, gitrev
+     , hashable, hscolour, liquid-fixpoint, mtl, optparse-applicative
+     , optparse-simple, parsec, pretty, process, stm, syb, tagged, tasty
+     , tasty-ant-xml, tasty-hunit, tasty-rerun, template-haskell
+     , temporary, text, time, transformers, unordered-containers, vector
+     , z3
      }:
      mkDerivation {
        pname = "liquidhaskell";
-       version = "0.8.2.4";
-       sha256 = "07cbw14301pa2h4faxrjb1kfp2r5zdwpv5slm491kldzm53y8ry3";
+       version = "0.8.6.2";
+       sha256 = "1hqs1zfcz4fprrrcwj3j731ksldviafivk0kv2hprslmz4m1kfb2";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         aeson array base bifunctors binary bytestring Cabal cereal cmdargs
-         containers data-default deepseq Diff directory exceptions filepath
-         fingertree ghc ghc-boot ghc-paths ghc-prim gitrev hashable hpc
-         hscolour liquid-fixpoint located-base mtl optparse-simple parsec
-         pretty process QuickCheck syb template-haskell temporary text
-         text-format th-lift time transformers unordered-containers vector
-       ];
-       executableHaskellDepends = [
-         base cmdargs deepseq ghc ghc-boot hpc liquid-fixpoint located-base
-         pretty process time
+         aeson base binary bytestring cereal cmdargs containers data-default
+         deepseq Diff directory filepath fingertree ghc ghc-boot ghc-paths
+         ghc-prim githash gitrev hashable hscolour liquid-fixpoint mtl
+         optparse-simple parsec pretty syb template-haskell temporary text
+         time transformers unordered-containers vector
        ];
+       executableHaskellDepends = [ base ];
        testHaskellDepends = [
-         array base bytestring containers directory filepath ghc ghc-boot
-         hpc liquid-fixpoint mtl optparse-applicative parsec process stm syb
-         tagged tasty tasty-ant-xml tasty-hunit tasty-rerun template-haskell
-         text time transformers
+         base containers directory filepath liquid-fixpoint mtl
+         optparse-applicative parsec process stm syb tagged tasty
+         tasty-ant-xml tasty-hunit tasty-rerun text transformers
        ];
        testSystemDepends = [ z3 ];
        description = "Liquid Types for Haskell";
@@ -151371,29 +151459,6 @@ self: {
      }) {};
 
   "logging-effect" = callPackage
-    ({ mkDerivation, async, base, bytestring, criterion, exceptions
-     , fast-logger, free, lifted-async, monad-control, monad-logger, mtl
-     , prettyprinter, semigroups, stm, stm-delay, text, time
-     , transformers, transformers-base, unliftio-core
-     }:
-     mkDerivation {
-       pname = "logging-effect";
-       version = "1.3.4";
-       sha256 = "10xgh61ghwri21j7jr6svkd24h2s9nmawc33xkzjc6d4nbg261jf";
-       libraryHaskellDepends = [
-         async base exceptions free monad-control mtl prettyprinter
-         semigroups stm stm-delay text time transformers transformers-base
-         unliftio-core
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring criterion fast-logger lifted-async monad-logger
-         prettyprinter text time
-       ];
-       description = "A mtl-style monad transformer for general purpose & compositional logging";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "logging-effect_1_3_6" = callPackage
     ({ mkDerivation, async, base, bytestring, criterion, exceptions
      , fast-logger, free, lifted-async, monad-control, monad-logger, mtl
      , prettyprinter, semigroups, stm, stm-delay, text, time
@@ -151414,7 +151479,6 @@ self: {
        ];
        description = "A mtl-style monad transformer for general purpose & compositional logging";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "logging-effect-extra" = callPackage
@@ -153047,8 +153111,8 @@ self: {
      }:
      mkDerivation {
        pname = "lzlib";
-       version = "0.2.0.1";
-       sha256 = "0cp33l990na6wz9yb0kx2nzq3hqxpyc7s47xg0bvia8sajrkzdw6";
+       version = "0.2.0.2";
+       sha256 = "1x0kd54klcai4lc2pv6dhq4pwfsf3s6mkdqhx7dfci84099pbksr";
        libraryHaskellDepends = [ base bytestring ];
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [ base bytestring directory hspec ];
@@ -155451,6 +155515,27 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "math-functions_0_3_3_0" = callPackage
+    ({ mkDerivation, base, data-default-class, deepseq, erf, primitive
+     , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, vector
+     , vector-th-unbox
+     }:
+     mkDerivation {
+       pname = "math-functions";
+       version = "0.3.3.0";
+       sha256 = "1s5nbs40sc3r4z08n0j8bw40cy0zkp03fjjn3p27zkd4fvm9kib3";
+       libraryHaskellDepends = [
+         base data-default-class deepseq primitive vector vector-th-unbox
+       ];
+       testHaskellDepends = [
+         base data-default-class deepseq erf primitive QuickCheck tasty
+         tasty-hunit tasty-quickcheck vector vector-th-unbox
+       ];
+       description = "Collection of tools for numeric computations";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "math-grads" = callPackage
     ({ mkDerivation, aeson, array, base, containers, hspec, linear
      , matrix, mtl, random, vector
@@ -159646,6 +159731,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "mmsyn2" = callPackage
+    ({ mkDerivation, base, vector }:
+     mkDerivation {
+       pname = "mmsyn2";
+       version = "0.1.2.0";
+       sha256 = "04ryfj058z6vkbfmvg4vvza36zj5m1akb64bfm61l4g2rxj7s3nv";
+       libraryHaskellDepends = [ base vector ];
+       description = "The library that can be used for optimization of multiple (Ord a) => a -> b transformations";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "mmtf" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
      , data-msgpack, deepseq, hspec, http-conduit, QuickCheck, text
@@ -161306,6 +161402,8 @@ self: {
        pname = "monadLib";
        version = "3.10";
        sha256 = "18vvcq6s9aci314daqkniq9aj1wdqa7rd3v06vd506a98c7lwp31";
+       revision = "1";
+       editedCabalFile = "072k4hnqkrfq80yh4qz2zw72fn43zm8l5rbjnckjaqdx4l315p11";
        libraryHaskellDepends = [ base ];
        description = "A collection of monad transformers";
        license = stdenv.lib.licenses.bsd3;
@@ -166814,15 +166912,16 @@ self: {
      }) {};
 
   "net-spider-rpl" = callPackage
-    ({ mkDerivation, aeson, base, greskell, hashable, hspec, ip
-     , net-spider, text, time
+    ({ mkDerivation, aeson, base, conduit, conduit-parse, greskell
+     , hashable, hspec, ip, mtl, net-spider, safe-exceptions, text, time
      }:
      mkDerivation {
        pname = "net-spider-rpl";
-       version = "0.2.1.0";
-       sha256 = "07f51ym5v1mpa1v6249sgkxqd8y52fdgs8l2r59mxil1ph6al7x1";
+       version = "0.2.3.0";
+       sha256 = "1nsx9y8g2fpqkh52wnlzpq6p9vsp8y3rcikin1gsf7fjs18n74k8";
        libraryHaskellDepends = [
-         aeson base greskell hashable ip net-spider text time
+         aeson base conduit conduit-parse greskell hashable ip mtl
+         net-spider safe-exceptions text time
        ];
        testHaskellDepends = [ base hspec net-spider text ];
        description = "NetSpider data model and utility for RPL networks";
@@ -166831,6 +166930,29 @@ self: {
        broken = true;
      }) {};
 
+  "net-spider-rpl-cli" = callPackage
+    ({ mkDerivation, base, greskell, hspec, ip, monad-logger
+     , net-spider, net-spider-cli, net-spider-rpl, optparse-applicative
+     , text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "net-spider-rpl-cli";
+       version = "0.1.1.0";
+       sha256 = "1qjh9bnhp94qkf94msqnaga6wlri5bc7n91jz3qxjkn6iczbznhw";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base greskell monad-logger net-spider net-spider-cli net-spider-rpl
+         optparse-applicative text time unordered-containers
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base hspec ip net-spider net-spider-rpl optparse-applicative
+       ];
+       description = "CLI executable of NetSpider.RPL.";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "netclock" = callPackage
     ({ mkDerivation, base, bytestring, hosc, network }:
      mkDerivation {
@@ -167314,14 +167436,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "network_3_1_0_1" = callPackage
+  "network_3_1_1_0" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, directory, hspec
      , hspec-discover, HUnit
      }:
      mkDerivation {
        pname = "network";
-       version = "3.1.0.1";
-       sha256 = "0r4x5ad7pl9fk7jknnv2wnizb83mi2ljambpavvarpj52b3mdwjs";
+       version = "3.1.1.0";
+       sha256 = "0gr99ksn7khijfjf0g4bkp13kb6jbxnq23b6pxflnvlsf5la8yks";
        libraryHaskellDepends = [ base bytestring deepseq ];
        testHaskellDepends = [ base bytestring directory hspec HUnit ];
        testToolDepends = [ hspec-discover ];
@@ -167818,6 +167940,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "network-messagepack-rpc_0_1_1_4" = callPackage
+    ({ mkDerivation, base, bytestring, data-msgpack, safe-exceptions
+     , text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "network-messagepack-rpc";
+       version = "0.1.1.4";
+       sha256 = "040kj2rs80kg7746rqrrsgpbi3vpbfg4c6r5n08nvqqslcx932xb";
+       libraryHaskellDepends = [
+         base bytestring data-msgpack safe-exceptions text
+         unordered-containers
+       ];
+       description = "MessagePack RPC";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "network-messagepack-rpc-websocket" = callPackage
     ({ mkDerivation, async, base, bytestring, data-msgpack, envy, hspec
      , network-messagepack-rpc, QuickCheck, skews, text, websockets
@@ -169121,26 +169260,30 @@ self: {
      }) {};
 
   "niv" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory
-     , file-embed, filepath, github, hashable, mtl, optparse-applicative
-     , process, string-qq, tasty, tasty-hunit, text, unliftio
+    ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base
+     , bytestring, directory, file-embed, filepath, hashable
+     , http-conduit, mtl, optparse-applicative, process, profunctors
+     , string-qq, tasty, tasty-hunit, text, unliftio
      , unordered-containers
      }:
      mkDerivation {
        pname = "niv";
-       version = "0.1.1";
-       sha256 = "1vrn5b753i949nf28g1wckqiax7pn4qx2xk5z7wdbx0w212nps8w";
+       version = "0.2.1";
+       sha256 = "18ym8zqxillqf0psc9xyjzgnxhfrfgy5sj3hvrdmggy4dlnn500j";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         aeson aeson-pretty base bytestring directory file-embed filepath
-         github hashable mtl optparse-applicative process string-qq tasty
-         tasty-hunit text unliftio unordered-containers
+         aeson aeson-pretty ansi-terminal base bytestring directory
+         file-embed filepath hashable http-conduit mtl optparse-applicative
+         process profunctors string-qq tasty tasty-hunit text unliftio
+         unordered-containers
        ];
        executableHaskellDepends = [
-         aeson aeson-pretty base bytestring directory file-embed filepath
-         github hashable mtl optparse-applicative process string-qq tasty
-         text unliftio unordered-containers
+         aeson aeson-pretty ansi-terminal base bytestring directory
+         file-embed filepath hashable http-conduit mtl optparse-applicative
+         process profunctors string-qq tasty text unliftio
+         unordered-containers
        ];
        description = "Easy dependency management for Nix projects";
        license = stdenv.lib.licenses.mit;
@@ -175581,6 +175724,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pandoc-types_1_17_6_1" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, criterion
+     , deepseq, ghc-prim, HUnit, QuickCheck, string-qq, syb
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , transformers
+     }:
+     mkDerivation {
+       pname = "pandoc-types";
+       version = "1.17.6.1";
+       sha256 = "1d6ygq991ddria71l7hg9yd7lq94sjy4m71rdws1v8hq943c4d0q";
+       libraryHaskellDepends = [
+         aeson base bytestring containers deepseq ghc-prim QuickCheck syb
+         transformers
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers HUnit QuickCheck string-qq syb
+         test-framework test-framework-hunit test-framework-quickcheck2
+       ];
+       benchmarkHaskellDepends = [ base criterion ];
+       description = "Types for representing a structured document";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pandoc-unlit" = callPackage
     ({ mkDerivation, base, pandoc }:
      mkDerivation {
@@ -180433,15 +180600,15 @@ self: {
        broken = true;
      }) {};
 
-  "pg-transact_0_2_0_1" = callPackage
+  "pg-transact_0_2_1_0" = callPackage
     ({ mkDerivation, base, bytestring, exceptions, hspec
      , hspec-discover, hspec-expectations-lifted, monad-control
      , postgresql-simple, tmp-postgres, transformers
      }:
      mkDerivation {
        pname = "pg-transact";
-       version = "0.2.0.1";
-       sha256 = "1abv2h52x624wsrm8lhafsjdsmldghqjksww12b0g119msbsbdq9";
+       version = "0.2.1.0";
+       sha256 = "1wh4qf00ggyx6ff3llpcbnlbhn61c3yqqd3ljjglwv2bfjhrgajh";
        libraryHaskellDepends = [
          base bytestring exceptions monad-control postgresql-simple
          transformers
@@ -183982,6 +184149,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "poly_0_3_2_0" = callPackage
+    ({ mkDerivation, base, deepseq, gauge, primitive, QuickCheck
+     , quickcheck-classes, semirings, tasty, tasty-quickcheck, vector
+     , vector-algorithms
+     }:
+     mkDerivation {
+       pname = "poly";
+       version = "0.3.2.0";
+       sha256 = "0liphgwfqnpsf410l1hldzqhgjg5p45nlcybyby1fk0ijx96yl5y";
+       libraryHaskellDepends = [
+         base deepseq primitive semirings vector vector-algorithms
+       ];
+       testHaskellDepends = [
+         base QuickCheck quickcheck-classes semirings tasty tasty-quickcheck
+         vector
+       ];
+       benchmarkHaskellDepends = [ base deepseq gauge semirings vector ];
+       description = "Polynomials";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "poly-arity" = callPackage
     ({ mkDerivation, base, constraints }:
      mkDerivation {
@@ -189856,6 +190045,8 @@ self: {
        pname = "psqueues";
        version = "0.2.7.2";
        sha256 = "1yckx2csqswghiy9nfj03cybmza8104nmnpbpcc9ngwlbmakn9i6";
+       revision = "1";
+       editedCabalFile = "0d0mm3c8x31dasfzp1884r2irkm3c9irvvbahjzfr1bzzxfb7vyv";
        libraryHaskellDepends = [ base deepseq ghc-prim hashable ];
        testHaskellDepends = [
          array base deepseq ghc-prim hashable HUnit QuickCheck tagged tasty
@@ -193819,26 +194010,6 @@ self: {
      }) {};
 
   "rank2classes" = callPackage
-    ({ mkDerivation, base, distributive, doctest, tasty, tasty-hunit
-     , template-haskell, transformers
-     }:
-     mkDerivation {
-       pname = "rank2classes";
-       version = "1.3";
-       sha256 = "1mwwismxafz43qjqh74gjd8d1hiflkilkxkwfvwhq0gx4h4i0rq1";
-       libraryHaskellDepends = [
-         base distributive template-haskell transformers
-       ];
-       testHaskellDepends = [
-         base distributive doctest tasty tasty-hunit
-       ];
-       description = "standard type constructor class hierarchy, only with methods of rank 2 types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "rank2classes_1_3_1" = callPackage
     ({ mkDerivation, base, distributive, doctest, markdown-unlit, tasty
      , tasty-hunit, template-haskell, transformers
      }:
@@ -194878,8 +195049,8 @@ self: {
      }:
      mkDerivation {
        pname = "reactive-banana-gi-gtk";
-       version = "0.4.0.1";
-       sha256 = "151vjqr2skdln4qh2swrkwwq1gafkldwnidkkpqh8j903kghrcqk";
+       version = "0.4.0.2";
+       sha256 = "136wzp6v9g6k5aa6w5wh0n96qcq9lm7h0lc87pk170ypymadp6ak";
        libraryHaskellDepends = [
          base gi-gtk haskell-gi-base reactive-banana text transformers
        ];
@@ -195349,26 +195520,6 @@ self: {
      }) {};
 
   "reanimate-svg" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, containers, hspec
-     , JuicyPixels, lens, linear, mtl, scientific, svg-tree, text
-     , transformers, vector, xml
-     }:
-     mkDerivation {
-       pname = "reanimate-svg";
-       version = "0.9.1.1";
-       sha256 = "1y2q6nljgs4h05ga0v713z5bcjd8xrxvg6sf81di65rhdkksidx7";
-       libraryHaskellDepends = [
-         attoparsec base bytestring containers JuicyPixels lens linear mtl
-         scientific text transformers vector xml
-       ];
-       testHaskellDepends = [
-         attoparsec base hspec linear scientific svg-tree
-       ];
-       description = "SVG file loader and serializer";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "reanimate-svg_0_9_2_1" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers, hspec
      , JuicyPixels, lens, linear, mtl, scientific, svg-tree, text
      , transformers, vector, xml
@@ -195386,7 +195537,6 @@ self: {
        ];
        description = "SVG file loader and serializer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reason-export" = callPackage
@@ -198652,25 +198802,6 @@ self: {
      }) {};
 
   "replace-attoparsec" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, Cabal, criterion
-     , parsers, text
-     }:
-     mkDerivation {
-       pname = "replace-attoparsec";
-       version = "1.0.1.0";
-       sha256 = "12xwdaqi81ssc5536icl49bqdnc6hiss9xm4gx3m1m4nz70ivk6z";
-       libraryHaskellDepends = [ attoparsec base bytestring text ];
-       testHaskellDepends = [
-         attoparsec base bytestring Cabal parsers text
-       ];
-       benchmarkHaskellDepends = [
-         attoparsec base bytestring criterion text
-       ];
-       description = "Stream edit, find-and-replace with Attoparsec parsers";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "replace-attoparsec_1_0_2_0" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, Cabal, criterion
      , parsers, text
      }:
@@ -198687,27 +198818,9 @@ self: {
        ];
        description = "Stream edit, find-and-replace with Attoparsec parsers";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "replace-megaparsec" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, criterion, megaparsec
-     , text
-     }:
-     mkDerivation {
-       pname = "replace-megaparsec";
-       version = "1.1.3.0";
-       sha256 = "0nh14fk3wwwli9hh2wfj02zrgcsf0hia14cx22g9qvlym53ljg50";
-       libraryHaskellDepends = [ base megaparsec ];
-       testHaskellDepends = [ base bytestring Cabal megaparsec text ];
-       benchmarkHaskellDepends = [
-         base bytestring criterion megaparsec text
-       ];
-       description = "Stream edit, find-and-replace with Megaparsec parsers";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "replace-megaparsec_1_1_4_0" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, criterion, megaparsec
      , text
      }:
@@ -198722,7 +198835,6 @@ self: {
        ];
        description = "Stream edit, find-and-replace with Megaparsec parsers";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "replica" = callPackage
@@ -199057,38 +199169,6 @@ self: {
      }) {};
 
   "require" = callPackage
-    ({ mkDerivation, base, bytestring, criterion, directory, inliterate
-     , megaparsec, optparse-generic, tasty, tasty-hspec, text, universum
-     }:
-     mkDerivation {
-       pname = "require";
-       version = "0.4.2";
-       sha256 = "03dhj1j9gp6mmgaxxkd1bf2i6hw78ql2qpi0qrdmx5dinclkidk7";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring directory inliterate megaparsec optparse-generic
-         text universum
-       ];
-       executableHaskellDepends = [
-         base bytestring directory inliterate megaparsec optparse-generic
-         text universum
-       ];
-       testHaskellDepends = [
-         base bytestring directory inliterate megaparsec optparse-generic
-         tasty tasty-hspec text universum
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring criterion directory inliterate megaparsec
-         optparse-generic text universum
-       ];
-       description = "Scrap your qualified import clutter";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "require_0_4_3" = callPackage
     ({ mkDerivation, base, bytestring, criterion, directory, inliterate
      , megaparsec, optparse-generic, tasty, tasty-hspec, text, universum
      }:
@@ -201581,6 +201661,8 @@ self: {
        pname = "ron-rdt";
        version = "0.9.1";
        sha256 = "1kx858d3pyj2dlpznd9n0aw6yhkq4ac9789kkan9yi8mf0vdbn3i";
+       revision = "1";
+       editedCabalFile = "0csy0sv9rg27ab2jpdpqnsvvs7jdq950vxf8x9in6ld2fjfrknj9";
        libraryHaskellDepends = [
          base containers Diff hashable integer-gmp mtl ron text time
          transformers unordered-containers
@@ -203266,7 +203348,7 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
-  "safecopy_0_10_0" = callPackage
+  "safecopy_0_10_1" = callPackage
     ({ mkDerivation, array, base, bytestring, cereal, containers
      , generic-data, HUnit, lens, lens-action, old-time, QuickCheck
      , quickcheck-instances, tasty, tasty-quickcheck, template-haskell
@@ -203274,8 +203356,8 @@ self: {
      }:
      mkDerivation {
        pname = "safecopy";
-       version = "0.10.0";
-       sha256 = "0j5fa68symjqwphvin0nj524wnh3vmq34mlj6mfvl78by4pki0nv";
+       version = "0.10.1";
+       sha256 = "173lkpp6mj0kaklkwx1vypi7bwxgjwrbc3zk9akyfh3f2mlz0wi0";
        libraryHaskellDepends = [
          array base bytestring cereal containers generic-data old-time
          template-haskell text time transformers vector
@@ -204582,25 +204664,6 @@ self: {
      }) {};
 
   "scanner" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, cereal, criterion
-     , hspec, text
-     }:
-     mkDerivation {
-       pname = "scanner";
-       version = "0.3";
-       sha256 = "0yshznbp784d4gk2qz5jlw5ikc1s1h58h7vck2yksi4ynm3m3y57";
-       revision = "1";
-       editedCabalFile = "1v64k5jn70ipv2yi81b0s8lkpdd8hx08gdix0ixnpfqdpkj7pzx2";
-       libraryHaskellDepends = [ base bytestring ];
-       testHaskellDepends = [ base bytestring hspec ];
-       benchmarkHaskellDepends = [
-         attoparsec base bytestring cereal criterion text
-       ];
-       description = "Fast non-backtracking incremental combinator parsing for bytestrings";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "scanner_0_3_1" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, cereal, criterion
      , fail, hspec, text
      }:
@@ -204615,7 +204678,6 @@ self: {
        ];
        description = "Fast non-backtracking incremental combinator parsing for bytestrings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scanner-attoparsec" = callPackage
@@ -205069,6 +205131,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "scientific-notation" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, byteslice, bytesmith
+     , bytestring, gauge, primitive, QuickCheck, run-st, scientific
+     , tasty, tasty-hunit, tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "scientific-notation";
+       version = "0.1.0.0";
+       sha256 = "0150krfwm5ya5ws6h39fngbgdhi5hd29jpci07ap3fbq27ygrds0";
+       libraryHaskellDepends = [ base bytesmith ];
+       testHaskellDepends = [
+         base byteslice bytesmith bytestring primitive QuickCheck tasty
+         tasty-hunit tasty-quickcheck
+       ];
+       benchmarkHaskellDepends = [
+         aeson attoparsec base byteslice bytesmith bytestring gauge
+         primitive run-st scientific
+       ];
+       description = "Scientific notation intended for tokenization";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "scion" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, directory
      , filepath, ghc, ghc-paths, ghc-syb, hslogger, json, multiset
@@ -206267,29 +206351,6 @@ self: {
      }) {inherit (pkgs) secp256k1;};
 
   "secp256k1-haskell" = callPackage
-    ({ mkDerivation, base, base16-bytestring, bytestring, cereal
-     , entropy, hashable, hspec, hspec-discover, HUnit, mtl, QuickCheck
-     , secp256k1, string-conversions
-     }:
-     mkDerivation {
-       pname = "secp256k1-haskell";
-       version = "0.1.4";
-       sha256 = "1vfbn0fvrbk4hmfhsm8gj3yxyijzfdqlywwir64zrafla4yry73l";
-       libraryHaskellDepends = [
-         base base16-bytestring bytestring cereal entropy hashable
-         QuickCheck string-conversions
-       ];
-       librarySystemDepends = [ secp256k1 ];
-       testHaskellDepends = [
-         base base16-bytestring bytestring cereal entropy hashable hspec
-         HUnit mtl QuickCheck string-conversions
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Bindings for secp256k1 library from Bitcoin Core";
-       license = stdenv.lib.licenses.publicDomain;
-     }) {inherit (pkgs) secp256k1;};
-
-  "secp256k1-haskell_0_1_5" = callPackage
     ({ mkDerivation, base, base16-bytestring, bytestring, cereal
      , entropy, hashable, hspec, hspec-discover, HUnit, mtl, QuickCheck
      , secp256k1, string-conversions
@@ -206310,7 +206371,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Bindings for secp256k1 library from Bitcoin Core";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) secp256k1;};
 
   "secp256k1-legacy" = callPackage
@@ -206485,19 +206545,6 @@ self: {
      }) {};
 
   "selda-json" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, selda, text }:
-     mkDerivation {
-       pname = "selda-json";
-       version = "0.1.0.0";
-       sha256 = "0m4qcnj7bplh1wpxnfx5mcpxyy2gpd00886lwmlxfdpch0qg2bd0";
-       revision = "1";
-       editedCabalFile = "1sgqscdibw80qsm02kxgx01rzh810rj3rwi1ksjq6d2j6yb1snaj";
-       libraryHaskellDepends = [ aeson base bytestring selda text ];
-       description = "JSON support for the Selda database library";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "selda-json_0_1_1_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, selda, text }:
      mkDerivation {
        pname = "selda-json";
@@ -206506,7 +206553,6 @@ self: {
        libraryHaskellDepends = [ aeson base bytestring selda text ];
        description = "JSON support for the Selda database library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "selda-postgresql" = callPackage
@@ -208251,38 +208297,6 @@ self: {
      }) {};
 
   "servant-client" = callPackage
-    ({ mkDerivation, aeson, base, base-compat, bytestring, containers
-     , deepseq, entropy, exceptions, hspec, hspec-discover
-     , http-api-data, http-client, http-media, http-types, HUnit
-     , kan-extensions, markdown-unlit, monad-control, mtl, network
-     , QuickCheck, semigroupoids, servant, servant-client-core
-     , servant-server, stm, tdigest, text, time, transformers
-     , transformers-base, transformers-compat, wai, warp
-     }:
-     mkDerivation {
-       pname = "servant-client";
-       version = "0.16";
-       sha256 = "0641fqlvqkm5075pcgcg5q81j7jil79sjpifg1snagfisrsxifxj";
-       revision = "4";
-       editedCabalFile = "0fa37fdas1dsgd6qkc5wzi9683l5xzzq1i705l3adiwkdfkcbjjf";
-       libraryHaskellDepends = [
-         base base-compat bytestring containers deepseq exceptions
-         http-client http-media http-types kan-extensions monad-control mtl
-         semigroupoids servant servant-client-core stm text time
-         transformers transformers-base transformers-compat
-       ];
-       testHaskellDepends = [
-         aeson base base-compat bytestring entropy hspec http-api-data
-         http-client http-types HUnit kan-extensions markdown-unlit mtl
-         network QuickCheck servant servant-client-core servant-server stm
-         tdigest text transformers transformers-compat wai warp
-       ];
-       testToolDepends = [ hspec-discover markdown-unlit ];
-       description = "Automatic derivation of querying functions for servant";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-client_0_16_0_1" = callPackage
     ({ mkDerivation, aeson, base, base-compat, bytestring, containers
      , deepseq, entropy, exceptions, hspec, hspec-discover
      , http-api-data, http-client, http-media, http-types, HUnit
@@ -208310,7 +208324,6 @@ self: {
        testToolDepends = [ hspec-discover markdown-unlit ];
        description = "Automatic derivation of querying functions for servant";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-client-core" = callPackage
@@ -208468,37 +208481,6 @@ self: {
      }) {};
 
   "servant-docs" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring
-     , case-insensitive, control-monad-omega, hashable, http-media
-     , http-types, lens, servant, string-conversions, tasty
-     , tasty-golden, tasty-hunit, text, transformers
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "servant-docs";
-       version = "0.11.3";
-       sha256 = "0cys1h3m0aq77aw0szj7k6p7zqcr8074zrxzsjp58lss1daqisq7";
-       revision = "3";
-       editedCabalFile = "0hknxp6vxjmc6d4acwfs8ic9n915ldldz4ja8d86pzwv8vh5jzfv";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson aeson-pretty base base-compat bytestring case-insensitive
-         control-monad-omega hashable http-media http-types lens servant
-         string-conversions text unordered-containers
-       ];
-       executableHaskellDepends = [
-         aeson base lens servant string-conversions text
-       ];
-       testHaskellDepends = [
-         aeson base base-compat lens servant string-conversions tasty
-         tasty-golden tasty-hunit transformers
-       ];
-       description = "generate API docs for your servant webservice";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-docs_0_11_4" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring
      , case-insensitive, hashable, http-media, http-types, lens, servant
      , string-conversions, tasty, tasty-golden, tasty-hunit, text
@@ -208524,7 +208506,6 @@ self: {
        ];
        description = "generate API docs for your servant webservice";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-ede" = callPackage
@@ -208583,8 +208564,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-elm";
-       version = "0.6.0.2";
-       sha256 = "1ayj0gdl8z9ns6agm64i37w0j8r51ydw4zxn8kcwsn1akswrzz3z";
+       version = "0.6.1";
+       sha256 = "0ajgb2srx2wlxn388wcijn7pb6lk48r84qvbbri7b77rbiav3ih2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -208848,43 +208829,6 @@ self: {
      }) {};
 
   "servant-http-streams" = callPackage
-    ({ mkDerivation, aeson, base, base-compat, bytestring
-     , case-insensitive, containers, deepseq, entropy, exceptions, hspec
-     , hspec-discover, http-api-data, http-common, http-media
-     , http-streams, http-types, HUnit, io-streams, kan-extensions
-     , markdown-unlit, monad-control, mtl, network, QuickCheck
-     , semigroupoids, servant, servant-client-core, servant-server, stm
-     , tdigest, text, time, transformers, transformers-base
-     , transformers-compat, wai, warp
-     }:
-     mkDerivation {
-       pname = "servant-http-streams";
-       version = "0.16";
-       sha256 = "1gkgk13zxi8y071i9dx0i1kbs14rgp8cfnfcd7rpg86pffxkx6cp";
-       revision = "2";
-       editedCabalFile = "10bpkdwlbg66zi9hzh7vbfwrcilvkav8rc0300xfmpbpw43z4iy0";
-       libraryHaskellDepends = [
-         base base-compat bytestring case-insensitive containers deepseq
-         exceptions http-common http-media http-streams http-types
-         io-streams kan-extensions monad-control mtl semigroupoids servant
-         servant-client-core text time transformers transformers-base
-         transformers-compat
-       ];
-       testHaskellDepends = [
-         aeson base base-compat bytestring deepseq entropy hspec
-         http-api-data http-streams http-types HUnit kan-extensions
-         markdown-unlit mtl network QuickCheck servant servant-client-core
-         servant-server stm tdigest text transformers transformers-compat
-         wai warp
-       ];
-       testToolDepends = [ hspec-discover markdown-unlit ];
-       description = "Automatic derivation of querying functions for servant";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "servant-http-streams_0_16_0_1" = callPackage
     ({ mkDerivation, aeson, base, base-compat, bytestring
      , case-insensitive, containers, deepseq, entropy, exceptions, hspec
      , hspec-discover, http-api-data, http-common, http-media
@@ -209270,29 +209214,6 @@ self: {
      }) {};
 
   "servant-pipes" = callPackage
-    ({ mkDerivation, base, base-compat, bytestring, http-client
-     , http-media, monad-control, mtl, pipes, pipes-bytestring
-     , pipes-safe, servant, servant-client, servant-server, wai, warp
-     }:
-     mkDerivation {
-       pname = "servant-pipes";
-       version = "0.15";
-       sha256 = "04ypy9vjrfggrk7dg3sxwj9nav50v85vpr5mnp5r2c9ka6xn4v90";
-       revision = "2";
-       editedCabalFile = "0c3nyj2iwmhd3kmyv4q0ilzcwxr2dsg5lxvysbhh8048q90bm1nw";
-       libraryHaskellDepends = [
-         base bytestring monad-control mtl pipes pipes-safe servant
-       ];
-       testHaskellDepends = [
-         base base-compat bytestring http-client http-media pipes
-         pipes-bytestring pipes-safe servant servant-client servant-server
-         wai warp
-       ];
-       description = "Servant Stream support for pipes";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-pipes_0_15_1" = callPackage
     ({ mkDerivation, base, base-compat, bytestring, http-client
      , http-media, monad-control, mtl, pipes, pipes-bytestring
      , pipes-safe, servant, servant-client, servant-server, wai, warp
@@ -209311,7 +209232,6 @@ self: {
        ];
        description = "Servant Stream support for pipes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-pool" = callPackage
@@ -215909,8 +215829,8 @@ self: {
        pname = "snap";
        version = "1.1.2.0";
        sha256 = "05da0dg0p6djcsinycih50hjnircibmicarwg2vr14a7zbrhynps";
-       revision = "1";
-       editedCabalFile = "07k5sq44w09cq7w8y128ifkm7837nyklgp9i1ydnavnhf044ah2n";
+       revision = "2";
+       editedCabalFile = "13hx2wghxrranxxv5qp8a5maqd203q15k3qg4fafjzhyh3wf6a67";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring cereal clientsession configurator
          containers directory directory-tree dlist fail filepath hashable
@@ -216037,6 +215957,8 @@ self: {
        pname = "snap-core";
        version = "1.0.4.0";
        sha256 = "0dklxgrbqhnb6bc4ic358g4fyj11ywmjrkxxhqcjmci2hhpn00mr";
+       revision = "1";
+       editedCabalFile = "1nw74vpfag6gdh66kq82a0kdb05c2xnwcfacwlcg77j24gxcgi6s";
        libraryHaskellDepends = [
          attoparsec base bytestring bytestring-builder case-insensitive
          containers directory filepath hashable HUnit io-streams lifted-base
@@ -216239,8 +216161,8 @@ self: {
        pname = "snap-server";
        version = "1.1.1.1";
        sha256 = "0lw475wp0lnrbgc3jcfif3qjjc3pmrh2k74d8cgpnc1304g6a2s5";
-       revision = "1";
-       editedCabalFile = "094b7ll47lxd4lvr6kd59jyw0vz686gw5cx16w758d6fli0cy3x3";
+       revision = "2";
+       editedCabalFile = "12yr0yc7xqxsia84756qalr96fa2lz0sd3mfww2i8784ndlbkfwf";
        configureFlags = [ "-fopenssl" ];
        isLibrary = true;
        isExecutable = true;
@@ -221636,33 +221558,6 @@ self: {
      }) {};
 
   "statistics" = callPackage
-    ({ mkDerivation, aeson, base, base-orphans, binary
-     , data-default-class, deepseq, dense-linear-algebra, erf, HUnit
-     , ieee754, math-functions, monad-par, mwc-random, primitive
-     , QuickCheck, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, vector, vector-algorithms
-     , vector-binary-instances, vector-th-unbox
-     }:
-     mkDerivation {
-       pname = "statistics";
-       version = "0.15.0.0";
-       sha256 = "0wk4pv4fjpqq49vf8zanb9801lbgcbbfhhvlpp3ka6p8jmfc9scm";
-       libraryHaskellDepends = [
-         aeson base base-orphans binary data-default-class deepseq
-         dense-linear-algebra math-functions monad-par mwc-random primitive
-         vector vector-algorithms vector-binary-instances vector-th-unbox
-       ];
-       testHaskellDepends = [
-         aeson base binary dense-linear-algebra erf HUnit ieee754
-         math-functions mwc-random primitive QuickCheck test-framework
-         test-framework-hunit test-framework-quickcheck2 vector
-         vector-algorithms
-       ];
-       description = "A library of statistical types, data, and functions";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "statistics_0_15_1_1" = callPackage
     ({ mkDerivation, aeson, async, base, base-orphans, binary
      , data-default-class, deepseq, dense-linear-algebra, erf, HUnit
      , ieee754, math-functions, monad-par, mwc-random, primitive
@@ -221687,7 +221582,6 @@ self: {
        ];
        description = "A library of statistical types, data, and functions";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "statistics-dirichlet" = callPackage
@@ -223189,6 +223083,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "streaming_0_2_3_0" = callPackage
+    ({ mkDerivation, base, containers, ghc-prim, mmorph, mtl
+     , transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "streaming";
+       version = "0.2.3.0";
+       sha256 = "0qpxz9hkk31k64w98pdnz8qjgxvcznzfwc8d7pvakrnf3zp8w05l";
+       libraryHaskellDepends = [
+         base containers ghc-prim mmorph mtl transformers transformers-base
+       ];
+       description = "an elementary streaming prelude and general stream type";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "streaming-attoparsec" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, streaming
      , streaming-bytestring, tasty, tasty-hunit
@@ -223717,6 +223627,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "streamly-cassava" = callPackage
+    ({ mkDerivation, base, bytestring, cassava, criterion, exceptions
+     , hspec, mtl, QuickCheck, quickcheck-instances, streaming
+     , streaming-bytestring, streaming-cassava, streaming-with, streamly
+     , text, vector, weigh
+     }:
+     mkDerivation {
+       pname = "streamly-cassava";
+       version = "0.1.1.0";
+       sha256 = "1mkqmaqzb252plx2cas2kqm82bddwqjk615n6paw035frgvbx9j9";
+       libraryHaskellDepends = [
+         base bytestring cassava exceptions mtl streamly
+       ];
+       testHaskellDepends = [
+         base bytestring cassava exceptions hspec mtl QuickCheck
+         quickcheck-instances streamly text vector
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring cassava criterion exceptions mtl streaming
+         streaming-bytestring streaming-cassava streaming-with streamly
+         vector weigh
+       ];
+       description = "CSV streaming support via cassava for the streamly ecosystem";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "streamproc" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -224134,6 +224070,19 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "string-qq_0_0_4" = callPackage
+    ({ mkDerivation, base, HUnit, template-haskell, text }:
+     mkDerivation {
+       pname = "string-qq";
+       version = "0.0.4";
+       sha256 = "0wfxkw4x6j6jq9nd82k83g2k3hskpsvk1dp4cpkshvjr4wg9qny8";
+       libraryHaskellDepends = [ base template-haskell ];
+       testHaskellDepends = [ base HUnit text ];
+       description = "QuasiQuoter for non-interpolated strings, texts and bytestrings";
+       license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "string-quote" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
@@ -229247,8 +229196,8 @@ self: {
        pname = "tasty-hspec";
        version = "1.1.5.1";
        sha256 = "0i9kdzjpk750sa078jj3iyhp72k0177zk7vxl131r6dkyz09x27y";
-       revision = "3";
-       editedCabalFile = "1wgz3z5bnq5qml8d0i18gvz30dmmax3686lmqz3vf4hxd3vqfkpj";
+       revision = "4";
+       editedCabalFile = "1yppwhs2r2rlwrzli9ccv5ldgl95h5p7pqhsr898r3das6daf6sk";
        libraryHaskellDepends = [
          base hspec hspec-core QuickCheck tasty tasty-quickcheck
          tasty-smallcheck
@@ -231824,6 +231773,29 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "texmath_0_11_2_3" = callPackage
+    ({ mkDerivation, base, bytestring, containers, directory, filepath
+     , mtl, pandoc-types, parsec, process, split, syb, temporary, text
+     , utf8-string, xml
+     }:
+     mkDerivation {
+       pname = "texmath";
+       version = "0.11.2.3";
+       sha256 = "0r9vcvx1ay8s9pgdwyv7ayh5zraa8rhlr2xk5ngds21za27jvyfp";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers mtl pandoc-types parsec syb xml
+       ];
+       testHaskellDepends = [
+         base bytestring directory filepath process split temporary text
+         utf8-string xml
+       ];
+       description = "Conversion between formats used to represent mathematics";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "texrunner" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, directory, filepath
      , HUnit, io-streams, lens, mtl, process, semigroups, temporary
@@ -238796,10 +238768,8 @@ self: {
     ({ mkDerivation, array, base, containers, random, stm }:
      mkDerivation {
        pname = "tskiplist";
-       version = "1.0.0";
-       sha256 = "0bayh8fl3wb98mifdiss8crb17jfqxxj0f1va5c2h4l7qwizh85a";
-       revision = "1";
-       editedCabalFile = "162s24i0n1pcgp8m4lqhs9vm3m78by88axdvn358zxjpfrpln817";
+       version = "1.0.1";
+       sha256 = "0fn02g963id0yzsd16lhriy78mwndl8jl7ry5q0v6a4d5xg2hjzp";
        libraryHaskellDepends = [ array base containers random stm ];
        description = "A Skip List Implementation in Software Transactional Memory (STM)";
        license = "LGPL";
@@ -239036,14 +239006,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "ttl-hashtables_1_4_0_0" = callPackage
+  "ttl-hashtables_1_4_1_0" = callPackage
     ({ mkDerivation, base, clock, containers, data-default, failable
      , hashable, hashtables, hspec, mtl, transformers
      }:
      mkDerivation {
        pname = "ttl-hashtables";
-       version = "1.4.0.0";
-       sha256 = "0s8ia8sd3j5k05gv57agbxar6bnpigwcy53ypz3j3pml90sdm820";
+       version = "1.4.1.0";
+       sha256 = "1y3wzb5fhdmyszr5902r01c6481nsaiw0y4imzppyqcap7ppl3fj";
        libraryHaskellDepends = [
          base clock containers data-default failable hashable hashtables mtl
          transformers
@@ -239459,31 +239429,6 @@ self: {
      }) {};
 
   "turtle" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
-     , containers, criterion, directory, doctest, exceptions, foldl
-     , hostname, managed, optional-args, optparse-applicative, process
-     , semigroups, stm, system-fileio, system-filepath, temporary, text
-     , time, transformers, unix, unix-compat
-     }:
-     mkDerivation {
-       pname = "turtle";
-       version = "1.5.14";
-       sha256 = "10sxbmis82z5r2ksfkik5kryz5i0xwihz9drc1dzz4fb76kkb67z";
-       revision = "3";
-       editedCabalFile = "0rmmfqsphhv7h72a8lbdbpqi3rc4k6k83x8p9mamh57108qrs3xy";
-       libraryHaskellDepends = [
-         ansi-wl-pprint async base bytestring clock containers directory
-         exceptions foldl hostname managed optional-args
-         optparse-applicative process semigroups stm system-fileio
-         system-filepath temporary text time transformers unix unix-compat
-       ];
-       testHaskellDepends = [ base doctest system-filepath temporary ];
-       benchmarkHaskellDepends = [ base criterion text ];
-       description = "Shell programming, Haskell-style";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "turtle_1_5_15" = callPackage
     ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
      , containers, criterion, directory, doctest, exceptions, fail
      , foldl, hostname, managed, optional-args, optparse-applicative
@@ -239508,7 +239453,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion text ];
        description = "Shell programming, Haskell-style";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "turtle-options" = callPackage
@@ -242838,8 +242782,8 @@ self: {
      }:
      mkDerivation {
        pname = "units";
-       version = "2.4.1.1";
-       sha256 = "0359h9pjjsw3ivl40kv51rd0pp0j1phyqqjfiv2bxa37mm3fxmr2";
+       version = "2.4.1.2";
+       sha256 = "0ipjkwcawchgfbldm56y6xb31qs6ifj7lvw4xabl2jjb6j5f0sr6";
        libraryHaskellDepends = [
          base containers deepseq lens linear mtl multimap singletons syb
          template-haskell th-desugar units-parser vector-space
@@ -245667,6 +245611,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "validity-containers_0_5_0_0" = callPackage
+    ({ mkDerivation, base, containers, validity }:
+     mkDerivation {
+       pname = "validity-containers";
+       version = "0.5.0.0";
+       sha256 = "0b1kwzgynq00mx563w9yfm6jmy268m5ylsdsibn3ymxf3h19px91";
+       libraryHaskellDepends = [ base containers validity ];
+       description = "Validity instances for containers";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "validity-path" = callPackage
     ({ mkDerivation, base, filepath, genvalidity-hspec, hspec, path
      , validity
@@ -246765,6 +246721,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "vector-th-unbox_0_2_1_7" = callPackage
+    ({ mkDerivation, base, data-default, template-haskell, vector }:
+     mkDerivation {
+       pname = "vector-th-unbox";
+       version = "0.2.1.7";
+       sha256 = "0q8dqnbv1c2gi7jjdhqj14abj1vik23ki6lq4iz2sz18yc7q69fi";
+       libraryHaskellDepends = [ base template-haskell vector ];
+       testHaskellDepends = [ base data-default vector ];
+       description = "Deriver for Data.Vector.Unboxed using Template Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "vectortiles" = callPackage
     ({ mkDerivation, base, bytestring, containers, criterion, deepseq
      , hashable, hex, microlens, microlens-platform, mtl
@@ -247017,6 +246986,18 @@ self: {
        broken = true;
      }) {};
 
+  "vformat" = callPackage
+    ({ mkDerivation, base, containers, hspec, QuickCheck, time }:
+     mkDerivation {
+       pname = "vformat";
+       version = "0.9.0.0";
+       sha256 = "01a6msv2iirrkxp950wvf28cvbl91kilffwavymll3l7wd3w1mb3";
+       libraryHaskellDepends = [ base containers time ];
+       testHaskellDepends = [ base containers hspec QuickCheck time ];
+       description = "A Python str.format() like formatter";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "vfr-waypoints" = callPackage
     ({ mkDerivation, base, containers, dimensional, fuzzy
      , geodetic-types, lens, monoid-subclasses, optparse-applicative
@@ -247129,24 +247110,6 @@ self: {
      }) {};
 
   "viewprof" = callPackage
-    ({ mkDerivation, base, brick, containers, directory, ghc-prof, lens
-     , scientific, text, vector, vector-algorithms, vty
-     }:
-     mkDerivation {
-       pname = "viewprof";
-       version = "0.0.0.30";
-       sha256 = "0l3hf7dj9y4zr6qzih3xl3yz56pjd4gy9jfk9aqypv2rcvwh1w17";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base brick containers directory ghc-prof lens scientific text
-         vector vector-algorithms vty
-       ];
-       description = "Text-based interactive GHC .prof viewer";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "viewprof_0_0_0_31" = callPackage
     ({ mkDerivation, base, brick, containers, directory, ghc-prof, lens
      , scientific, text, vector, vector-algorithms, vty
      }:
@@ -247162,7 +247125,6 @@ self: {
        ];
        description = "Text-based interactive GHC .prof viewer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "views" = callPackage
@@ -250840,24 +250802,24 @@ self: {
      }) {};
 
   "webby" = callPackage
-    ({ mkDerivation, aeson, base, binary, bytestring, fast-logger
-     , formatting, http-api-data, http-types, monad-logger, protolude
-     , resourcet, tasty, tasty-hunit, tasty-quickcheck, text, unliftio
-     , unordered-containers, wai
+    ({ mkDerivation, aeson, base-noprelude, binary, bytestring
+     , fast-logger, formatting, http-api-data, http-types, monad-logger
+     , relude, resourcet, tasty, tasty-hunit, tasty-quickcheck, text
+     , unliftio, unordered-containers, wai
      }:
      mkDerivation {
        pname = "webby";
-       version = "0.1.3";
-       sha256 = "1ry3cbi9awpxvj8f84b65ml9f73n5c1nw0ckc32hg55cq84yva9f";
+       version = "0.3.1";
+       sha256 = "05qz3h39nd3pxi000x00ynx5hf5v1yrxhwl0v4kb7sy1p0bhc3aa";
        libraryHaskellDepends = [
-         aeson base binary bytestring fast-logger formatting http-api-data
-         http-types monad-logger protolude resourcet text unliftio
-         unordered-containers wai
+         aeson base-noprelude binary bytestring fast-logger formatting
+         http-api-data http-types monad-logger relude resourcet text
+         unliftio unordered-containers wai
        ];
        testHaskellDepends = [
-         aeson base binary bytestring fast-logger formatting http-api-data
-         http-types monad-logger protolude resourcet tasty tasty-hunit
-         tasty-quickcheck text unliftio unordered-containers wai
+         aeson base-noprelude binary bytestring fast-logger formatting
+         http-api-data http-types monad-logger relude resourcet tasty
+         tasty-hunit tasty-quickcheck text unliftio unordered-containers wai
        ];
        description = "A super-simple web server framework";
        license = stdenv.lib.licenses.asl20;
@@ -251871,27 +251833,6 @@ self: {
      }) {};
 
   "wide-word" = callPackage
-    ({ mkDerivation, base, bytestring, deepseq, ghc-prim, hedgehog
-     , primitive, QuickCheck, quickcheck-classes, semirings
-     }:
-     mkDerivation {
-       pname = "wide-word";
-       version = "0.1.0.8";
-       sha256 = "1n6g9kn7k8gi2qi8fbik5pi2yj5mbzzj62512as1gjysv3y3l2dj";
-       revision = "1";
-       editedCabalFile = "189p1g51xx0a1lhxlhr0i8qv7mvr4zsjfdpb4i8ja2hfi0ssszdx";
-       libraryHaskellDepends = [ base deepseq primitive ];
-       testHaskellDepends = [
-         base bytestring ghc-prim hedgehog QuickCheck quickcheck-classes
-         semirings
-       ];
-       description = "Data types for large but fixed width signed and unsigned integers";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "wide-word_0_1_0_9" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, ghc-prim, hedgehog
      , primitive, QuickCheck, quickcheck-classes, semirings
      }:
@@ -253088,7 +253029,7 @@ self: {
          base containers exceptions free spiros split text transformers
        ];
        executableHaskellDepends = [ base ];
-       description = "Automate keyboard/mouse/clipboard/application interaction";
+       description = "Automate keyboard\\/mouse\\/clipboard\\/application interaction";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
@@ -255556,8 +255497,8 @@ self: {
        pname = "xmlhtml";
        version = "0.2.5.2";
        sha256 = "1p2v1cj9jjwbqyb0fyv2201zd7ljz5d46qg5kwy7rz2bchbqd0b4";
-       revision = "2";
-       editedCabalFile = "1d7q7acdv72zbbqq2n0swf3ia3lz1zplni6q5r97sp2w1a3xm6hf";
+       revision = "3";
+       editedCabalFile = "00a7ymnzf87p6dv6mphziycyx6p97xbbbvg8fzbqa6am4pvr029z";
        libraryHaskellDepends = [
          base blaze-builder blaze-html blaze-markup bytestring
          bytestring-builder containers parsec text unordered-containers
-- 
GitLab


From 92d5acb41ae7508b4af822952cfb424c32c6bca0 Mon Sep 17 00:00:00 2001
From: Max Wittig <max.wittig@siemens.com>
Date: Wed, 25 Sep 2019 15:53:55 +0200
Subject: [PATCH 0962/2254] gitlab-runner: 12.2.0 -> 12.3.0

---
 .../continuous-integration/gitlab-runner/default.nix      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
index d8b18fcd121..fbb7461bbc7 100644
--- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
+++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
@@ -1,16 +1,16 @@
 { lib, buildGoPackage, fetchFromGitLab, fetchurl }:
 
 let
-  version = "12.2.0";
+  version = "12.3.0";
   # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64
   docker_x86_64 = fetchurl {
     url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz";
-    sha256 = "0r0jy571dxcspsl0q31wyw4017rfq7i4rxsgf83jqdjqaigas8dk";
+    sha256 = "11xbz24811vi3l1dwhyqv3mypawrky85qjsg6aaigfv8zj9l2xmi";
   };
 
   docker_arm = fetchurl {
     url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz";
-    sha256 = "1pbzyfvfgwp9r67a148nr4gh2p9lrmnn4hxap37abb5q5209pjir";
+    sha256 = "04gfhlm32wrdq0s9blmfknpcnmr30vrnd7afib1lfbzbdl99g4sx";
   };
 in
 buildGoPackage rec {
@@ -29,7 +29,7 @@ buildGoPackage rec {
     owner = "gitlab-org";
     repo = "gitlab-runner";
     rev = "v${version}";
-    sha256 = "0id0ivysn0396dwi357iig28d4xr2wd7q05r6ksgml8xyfijdgd3";
+    sha256 = "155im9sybkldh0rx34j9fm3qg95dm5q3jcjjx635b7fwq1wyl7c7";
   };
 
   patches = [ ./fix-shell-path.patch ];
-- 
GitLab


From 0fe41d4a87a3e4f60053bd8798e7d89cdae364d2 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 25 Sep 2019 16:45:54 +0200
Subject: [PATCH 0963/2254] linuxPackages.jool: 4.0.0 -> 4.0.5

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

diff --git a/pkgs/os-specific/linux/jool/source.nix b/pkgs/os-specific/linux/jool/source.nix
index 0dd0eeed616..9e8de46edba 100644
--- a/pkgs/os-specific/linux/jool/source.nix
+++ b/pkgs/os-specific/linux/jool/source.nix
@@ -1,11 +1,11 @@
 { fetchFromGitHub }:
 
 rec {
-  version = "4.0.0";
+  version = "4.0.5";
   src = fetchFromGitHub {
     owner = "NICMx";
     repo = "Jool";
     rev = "v${version}";
-    sha256 = "1ivnx7ijqf41kxmi2bmsf9qfcv6b1rvag35754ddlndry3sgvimr";
+    sha256 = "0zfda8mbcg4mgg39shxdx5n2bq6zi9w3v8bcx03b3dp09lmq45y3";
   };
 }
-- 
GitLab


From 8fcbbc94ef2cf943622e8f15168ffeaafecfecea Mon Sep 17 00:00:00 2001
From: Albert Safin <xzfcpw@gmail.com>
Date: Tue, 24 Sep 2019 15:21:48 +0000
Subject: [PATCH 0964/2254] nim: 0.20.2 -> 1.0.0

---
 pkgs/development/compilers/nim/default.nix | 25 +++++++++++++++-------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix
index 4228c368e56..129b8ca4dd8 100644
--- a/pkgs/development/compilers/nim/default.nix
+++ b/pkgs/development/compilers/nim/default.nix
@@ -1,15 +1,15 @@
 # based on https://github.com/nim-lang/Nim/blob/v0.18.0/.travis.yml
 
-{ stdenv, lib, fetchurl, makeWrapper, nodejs-slim-11_x, openssl, pcre, readline,
+{ stdenv, lib, fetchurl, makeWrapper, nodejs-slim, openssl, pcre, readline,
   boehmgc, sfml, tzdata, coreutils, sqlite }:
 
 stdenv.mkDerivation rec {
   pname = "nim";
-  version = "0.20.2";
+  version = "1.0.0";
 
   src = fetchurl {
     url = "https://nim-lang.org/download/${pname}-${version}.tar.xz";
-    sha256 = "0pibil10x0c181kw705phlwk8bn8dy5ghqd9h9fm6i9afrz5ryp1";
+    sha256 = "1pg0lxahis8zfk6rdzdj281bahl8wglpjgngkc4vg1pc9p61fj03";
   };
 
   doCheck = !stdenv.isDarwin;
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   #    as part of building it, so it cannot be read-only
 
   checkInputs = [
-    nodejs-slim-11_x tzdata coreutils
+    nodejs-slim tzdata coreutils
   ];
 
   nativeBuildInputs = [
@@ -64,9 +64,6 @@ stdenv.mkDerivation rec {
       substituteInPlace ./tests/osproc/tworkingdir.nim --replace "/usr/bin" "${coreutils}/bin"
       substituteInPlace ./tests/stdlib/ttimes.nim --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
 
-      # reported upstream: https://github.com/nim-lang/Nim/issues/11435
-      ${disableTest} ./tests/misc/tstrace.nim
-
       # runs out of memory on a machine with 8GB RAM
       ${disableTest} ./tests/system/t7894.nim
 
@@ -80,11 +77,20 @@ stdenv.mkDerivation rec {
       ${disableCompile} ./lib/nimhcr.nim
       ${disableTest} ./tests/dll/nimhcr_unit.nim
       ${disableTest} ./tests/dll/nimhcr_integration.nim
+
+      # reported upstream: https://github.com/nim-lang/Nim/issues/12262
+      ${disableTest} ./tests/range/tcompiletime_range_checks.nim
+
+      # requires "immintrin.h" which is available only on x86
+      ${disableTest} ./tests/misc/tsizeof3.nim
     '';
 
   checkPhase = ''
     runHook preCheck
 
+    # Fortify hardening breaks tests
+    # https://github.com/nim-lang/Nim/issues/11435#issuecomment-534545696
+    NIX_HARDENING_ENABLE=''${NIX_HARDENING_ENABLE/fortify/} \
     ./koch tests --nim:bin/nim all
 
     runHook postCheck
@@ -97,7 +103,10 @@ stdenv.mkDerivation rec {
     ./koch install $out
     mv $out/nim/bin/* $out/bin/ && rmdir $out/nim/bin
     mv $out/nim/*     $out/     && rmdir $out/nim
+
+    # Fortify hardening appends -O2 to gcc flags which is unwanted for unoptimized nim builds.
     wrapProgram $out/bin/nim \
+      --run 'NIX_HARDENING_ENABLE=''${NIX_HARDENING_ENABLE/fortify/}' \
       --suffix PATH : ${lib.makeBinPath [ stdenv.cc ]}
 
     runHook postInstall
@@ -107,7 +116,7 @@ stdenv.mkDerivation rec {
     description = "Statically typed, imperative programming language";
     homepage = "https://nim-lang.org/";
     license = licenses.mit;
-    maintainers = with maintainers; [ ehmry peterhoeg ];
+    maintainers = with maintainers; [ ehmry ];
     platforms = with platforms; linux ++ darwin; # arbitrary
   };
 }
-- 
GitLab


From 401b0b0c7bcda99c5da5c448fb3f52bcee79a031 Mon Sep 17 00:00:00 2001
From: Evils <evils.devils@protonmail.com>
Date: Wed, 25 Sep 2019 17:03:56 +0200
Subject: [PATCH 0965/2254] fancontrol: load config from configuration.nix

---
 .../modules/services/hardware/fancontrol.nix  | 33 +++++++++++++------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/services/hardware/fancontrol.nix b/nixos/modules/services/hardware/fancontrol.nix
index 30074f81aed..1689b670b49 100644
--- a/nixos/modules/services/hardware/fancontrol.nix
+++ b/nixos/modules/services/hardware/fancontrol.nix
@@ -4,30 +4,43 @@ with lib;
 
 let
   cfg = config.hardware.fancontrol;
+  configFile = pkgs.writeText "fan.conf" cfg.config;
 
 in {
 
   options.hardware.fancontrol = {
-    enable = mkEnableOption "fancontrol (requires a configuration file, see pwmconfig)";
-
-    configFile = mkOption {
-      type = types.str;
-      default = "/etc/fancontrol";
-      example = "/home/user/.config/fancontrol";
-      description = "Path to the configuration file, likely generated with pwmconfig.";
+    enable = mkEnableOption "fancontrol (requires fancontrol.config)";
+
+    config = mkOption {
+      type = types.lines;
+      default = /etc/fancontrol;
+      example = ''
+        # Configuration file generated by pwmconfig
+        INTERVAL=1
+        DEVPATH=hwmon0=devices/platform/nct6775.656 hwmon1=devices/pci0000:00/0000:00:18.3
+        DEVNAME=hwmon0=nct6779 hwmon1=k10temp
+        FCTEMPS=hwmon0/pwm2=hwmon1/temp1_input
+        FCFANS=hwmon0/pwm2=hwmon0/fan2_input
+        MINTEMP=hwmon0/pwm2=25
+        MAXTEMP=hwmon0/pwm2=60
+        MINSTART=hwmon0/pwm2=25
+        MINSTOP=hwmon0/pwm2=10
+        MINPWM=hwmon0/pwm2=0
+        MAXPWM=hwmon0/pwm2=255
+      '';
+      description = "Configuration likely generated with pwmconfig.";
     };
   };
 
+
   config = mkIf cfg.enable {
     systemd.services.fancontrol = {
       description = "Fan speed control from lm_sensors";
       wantedBy = [ "multi-user.target" ];
       serviceConfig = {
         Type = "simple";
-        ExecStart = "${pkgs.lm_sensors}/bin/fancontrol ${cfg.configFile}";
+        ExecStart = "${pkgs.lm_sensors}/bin/fancontrol ${configFile}";
       };
     };
   };
-
-
 }
-- 
GitLab


From d4212d66a8c793413bdb317a3af5f70f10c1f60c Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 25 Sep 2019 17:09:26 +0200
Subject: [PATCH 0966/2254] linuxPackages.r8168: 8.046.00 -> 8.047.00

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

diff --git a/pkgs/os-specific/linux/r8168/default.nix b/pkgs/os-specific/linux/r8168/default.nix
index f2c87b97c4f..b3d8965704f 100644
--- a/pkgs/os-specific/linux/r8168/default.nix
+++ b/pkgs/os-specific/linux/r8168/default.nix
@@ -6,7 +6,7 @@ let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wi
 in stdenv.mkDerivation rec {
   name = "r8168-${kernel.version}-${version}";
   # on update please verify that the source matches the realtek version
-  version = "8.046.00";
+  version = "8.047.04";
 
   # This is a mirror. The original website[1] doesn't allow non-interactive
   # downloads, instead emailing you a download link.
@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
     owner = "mtorromeo";
     repo = "r8168";
     rev = version;
-    sha256 = "0y8w3biw5mshn5bvl24b9rybfh67f1s9gfzkcv9p4m7s7nchj2dg";
+    sha256 = "1rni8jimwdhyx75603mdcylrdxgfwfpyprf1lf5x5cli2i4bbijg";
   };
 
   hardeningDisable = [ "pic" ];
-- 
GitLab


From 44e2ff26b8c348bbbffe4a1996cad24cb0d34b30 Mon Sep 17 00:00:00 2001
From: Evils-Devils <30512529+Evils-Devils@users.noreply.github.com>
Date: Wed, 25 Sep 2019 17:24:49 +0200
Subject: [PATCH 0967/2254] Update
 nixos/modules/services/hardware/fancontrol.nix

Co-Authored-By: markuskowa <markus.kowalewski@gmail.com>
---
 nixos/modules/services/hardware/fancontrol.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/hardware/fancontrol.nix b/nixos/modules/services/hardware/fancontrol.nix
index 1689b670b49..32ba6072198 100644
--- a/nixos/modules/services/hardware/fancontrol.nix
+++ b/nixos/modules/services/hardware/fancontrol.nix
@@ -13,7 +13,7 @@ in {
 
     config = mkOption {
       type = types.lines;
-      default = /etc/fancontrol;
+      default = null;
       example = ''
         # Configuration file generated by pwmconfig
         INTERVAL=1
-- 
GitLab


From 6765f049f2ab8b2819b263a9a6de9fd1b03d7547 Mon Sep 17 00:00:00 2001
From: Evils-Devils <30512529+Evils-Devils@users.noreply.github.com>
Date: Wed, 25 Sep 2019 17:31:20 +0200
Subject: [PATCH 0968/2254] Update
 nixos/modules/services/hardware/fancontrol.nix

Co-Authored-By: markuskowa <markus.kowalewski@gmail.com>
---
 nixos/modules/services/hardware/fancontrol.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/hardware/fancontrol.nix b/nixos/modules/services/hardware/fancontrol.nix
index 32ba6072198..616e4add31e 100644
--- a/nixos/modules/services/hardware/fancontrol.nix
+++ b/nixos/modules/services/hardware/fancontrol.nix
@@ -28,7 +28,7 @@ in {
         MINPWM=hwmon0/pwm2=0
         MAXPWM=hwmon0/pwm2=255
       '';
-      description = "Configuration likely generated with pwmconfig.";
+      description = "Contents for configuration file. See <citerefentry><refentrytitle>pwmconfig</refentrytitle><manvolnum>8</manvolnum></citerefentry>.";
     };
   };
 
-- 
GitLab


From 429644bf4c1fe1f6ed5c618a98ce944f4d5f95a3 Mon Sep 17 00:00:00 2001
From: edef <edef@edef.eu>
Date: Wed, 25 Sep 2019 17:31:11 +0000
Subject: [PATCH 0969/2254] nixos/rabbitmq: use an attrset for example
 configItems

---
 nixos/modules/services/amqp/rabbitmq.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/amqp/rabbitmq.nix b/nixos/modules/services/amqp/rabbitmq.nix
index 302b94de196..38d10923494 100644
--- a/nixos/modules/services/amqp/rabbitmq.nix
+++ b/nixos/modules/services/amqp/rabbitmq.nix
@@ -80,12 +80,10 @@ in {
       configItems = mkOption {
         default = {};
         type = types.attrsOf types.str;
-        example = ''
-          {
-            "auth_backends.1.authn" = "rabbit_auth_backend_ldap";
-            "auth_backends.1.authz" = "rabbit_auth_backend_internal";
-          }
-        '';
+        example = {
+          "auth_backends.1.authn" = "rabbit_auth_backend_ldap";
+          "auth_backends.1.authz" = "rabbit_auth_backend_internal";
+        };
         description = ''
           Configuration options in RabbitMQ's new config file format,
           which is a simple key-value format that can not express nested
-- 
GitLab


From e1ff31dd911024f3d18659e2c7472e5451e00cce Mon Sep 17 00:00:00 2001
From: Sirio Balmelli <sirio@b-ad.ch>
Date: Wed, 25 Sep 2019 15:42:45 +0200
Subject: [PATCH 0970/2254] plantuml-syntax: add vim plugin

Add https://github.com/aklt/plantuml-syntax to vim-plugins

Signed-off-by: Sirio Balmelli <sirio@b-ad.ch>
---
 pkgs/misc/vim-plugins/generated.nix    | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 138feea39e1..be1e6427bee 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -2003,6 +2003,17 @@ let
     };
   };
 
+  plantuml-syntax = buildVimPluginFrom2Nix {
+    pname = "plantuml-syntax";
+    version = "2019-07-18";
+    src = fetchFromGitHub {
+      owner = "aklt";
+      repo = "plantuml-syntax";
+      rev = "0024021f01c349c2828aeb50a1e131997adea066";
+      sha256 = "1abqpbgz0d0ik4w5frha62i0s3f2w5xsgfa34c0jbwzzq0fkvkk7";
+    };
+  };
+
   pony-vim-syntax = buildVimPluginFrom2Nix {
     pname = "pony-vim-syntax";
     version = "2017-09-26";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 107105d6b72..59d1726820a 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -2,6 +2,7 @@
 airblade/vim-gitgutter
 airblade/vim-rooter
 ajh17/Spacegray.vim
+aklt/plantuml-syntax
 albfan/nerdtree-git-plugin
 altercation/vim-colors-solarized
 alvan/vim-closetag
-- 
GitLab


From cf72659ca08d2d1eee8aef859922172538ae31d2 Mon Sep 17 00:00:00 2001
From: Filipe Regadas <filiperegadas@gmail.com>
Date: Wed, 25 Sep 2019 20:08:50 +0100
Subject: [PATCH 0971/2254] fixup! Updated list of urls

---
 pkgs/development/tools/build-managers/sbt/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix
index 7d5e6b7aa34..01a003fb482 100644
--- a/pkgs/development/tools/build-managers/sbt/default.nix
+++ b/pkgs/development/tools/build-managers/sbt/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     urls = [
-      "https://piccolo.link/sbt-${version}.tgz",
+      "https://piccolo.link/sbt-${version}.tgz"
       "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"
     ];
     sha256 = "1ncjc4yrnhp2kc5xw3ismnyx5n71541760rzs81hxi8x8vi36x5b";
-- 
GitLab


From 7ddc19ba8cb57c5941827e0bd40d4418fb6d8d2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20M=C3=B6ller?= <fabianm88@gmail.com>
Date: Wed, 25 Sep 2019 21:36:39 +0200
Subject: [PATCH 0972/2254] teamspeak-client: fix stuck build

---
 .../networking/instant-messengers/teamspeak/client.nix    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
index 3c532fa506a..eaf9a8f47e5 100644
--- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
+++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, makeWrapper, makeDesktopItem, zlib, glib, libpng, freetype, openssl
 , xorg, fontconfig, qtbase, qtwebengine, qtwebchannel, qtsvg, xkeyboard_config, alsaLib
-, libpulseaudio ? null, libredirect, quazip, less, which, unzip, llvmPackages
+, libpulseaudio ? null, libredirect, quazip, which, unzip, llvmPackages, writeShellScriptBin
 }:
 
 let
@@ -26,6 +26,8 @@ let
     categories = "Network";
   };
 
+  fakeLess = writeShellScriptBin "less" "cat";
+
 in
 
 stdenv.mkDerivation rec {
@@ -46,11 +48,11 @@ stdenv.mkDerivation rec {
     sha256 = "1bywmdj54glzd0kffvr27r84n4dsd0pskkbmh59mllbxvj0qwy7f";
   };
 
-  buildInputs = [ makeWrapper less which unzip ];
+  nativeBuildInputs = [ makeWrapper fakeLess which unzip ];
 
   unpackPhase =
     ''
-      echo -e 'q\ny' | sh -xe $src
+      echo -e '\ny' | sh -xe $src
       cd TeamSpeak*
     '';
 
-- 
GitLab


From 841af89e3ccbccbc7715b8c95c158d386491c3e8 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 25 Sep 2019 17:37:23 +0200
Subject: [PATCH 0973/2254] clipman: init at 1.0.1

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

diff --git a/pkgs/tools/misc/clipman/default.nix b/pkgs/tools/misc/clipman/default.nix
new file mode 100644
index 00000000000..1dd2c16cb56
--- /dev/null
+++ b/pkgs/tools/misc/clipman/default.nix
@@ -0,0 +1,30 @@
+{ buildGoModule, fetchFromGitHub, lib, wl-clipboard, makeWrapper }:
+
+buildGoModule rec {
+  pname = "clipman";
+  version = "1.0.1";
+
+  src = fetchFromGitHub {
+    owner = "yory8";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1qv7mncb8ggyxrxqxax3gbcfxzk8b4zj2n8rp2xpghsynw4j740w";
+  };
+
+  modSha256 = "0qwrj6wqy32v65k3sbp24frhrcq6wfk38ckmy6wfmhgcix47fzj2";
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  postInstall = ''
+    wrapProgram $out/bin/clipman \
+      --prefix PATH : ${lib.makeBinPath [ wl-clipboard ]}
+  '';
+
+  meta = with lib; {
+    homepage = https://github.com/yory8/clipman;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ ma27 ];
+    description = "A simple clipboard manager for Wayland";
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d333251dd4d..2af50d1a76b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1401,6 +1401,8 @@ in
 
   chntpw = callPackage ../tools/security/chntpw { };
 
+  clipman = callPackage ../tools/misc/clipman { };
+
   clipster = callPackage ../tools/misc/clipster { };
 
   coprthr = callPackage ../development/libraries/coprthr { };
-- 
GitLab


From 99b12cfc0818892f74d2f7fe22b9f34b93014915 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 25 Sep 2019 22:07:41 +0200
Subject: [PATCH 0974/2254] prometheus-wireguard-exporter: 3.0.1 -> 3.1.0

Although this is a minor release, this only contains a single, but
improtant bugfix: https://github.com/MindFlavor/prometheus_wireguard_exporter/releases/tag/3.1.0
---
 pkgs/servers/monitoring/prometheus/wireguard-exporter.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix
index 80fe9b2357f..9b0d91747ad 100644
--- a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "wireguard-exporter";
-  version = "3.0.1";
+  version = "3.1.0";
 
   src = fetchFromGitHub {
     owner = "MindFlavor";
     repo = "prometheus_wireguard_exporter";
     rev = version;
-    sha256 = "0wfv54ny557mjajjdf0lyq5sbf9m7y50ggm7s2v30c639i0swyrc";
+    sha256 = "0hl82cg6cijk3xf35cgi4v14gmxk3fj4c3z1x5hrs2i0j1i26ilw";
   };
 
-  cargoSha256 = "06s9194lvwd7lynxnsrjfbjfj87ngvjbqjhx3idf7d1w9mgi4ysw";
+  cargoSha256 = "1ndb33bi08j40b4jkj4q7d3k0cw5fscz2gc2cc3134nbs2r7jamk";
 
   buildInputs = lib.optional stdenv.isDarwin Security;
 
-- 
GitLab


From 55e5c32425a47d7e8c68b4f840efea230cbb60fa Mon Sep 17 00:00:00 2001
From: Daniel Albert <esclear@users.noreply.github.com>
Date: Wed, 25 Sep 2019 22:50:56 +0200
Subject: [PATCH 0975/2254] curaengine: 4.2.1 -> 4.3.0

See https://ultimaker.com/learn/ultimaker-cura-4-3-available-now for
more info.
---
 pkgs/applications/misc/curaengine/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix
index 3e4c77aafc6..06c5d158565 100644
--- a/pkgs/applications/misc/curaengine/default.nix
+++ b/pkgs/applications/misc/curaengine/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "curaengine";
-  version = "4.2.0";
+  version = "4.3.0";
 
   src = fetchFromGitHub {
     owner = "Ultimaker";
     repo = "CuraEngine";
     rev = version;
-    sha256 = "13hbzsx4fwrbwviyhh8z04gs9b0m8fjl8a31ci7gr2dfdmgjs6pd";
+    sha256 = "074qcaj1v2ri9wppx9lr066nlidkrsp9m1rrrk2hs2b61x0340ff";
   };
 
   nativeBuildInputs = [ cmake ];
-- 
GitLab


From d27f4bf0a103b4a1aae6068df7bf5d1b8a585c85 Mon Sep 17 00:00:00 2001
From: Daniel Albert <esclear@users.noreply.github.com>
Date: Wed, 25 Sep 2019 22:52:03 +0200
Subject: [PATCH 0976/2254] cura: 4.2.1 -> 4.3.0

See https://ultimaker.com/learn/ultimaker-cura-4-3-available-now for
more info.
---
 pkgs/applications/misc/cura/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix
index 084881f75d9..04cf627b281 100644
--- a/pkgs/applications/misc/cura/default.nix
+++ b/pkgs/applications/misc/cura/default.nix
@@ -2,7 +2,7 @@
 
 mkDerivation rec {
   pname = "cura";
-  version = "4.2.1";
+  version = "4.3.0";
 
   src = fetchFromGitHub {
     owner = "Ultimaker";
@@ -14,8 +14,8 @@ mkDerivation rec {
   materials = fetchFromGitHub {
     owner = "Ultimaker";
     repo = "fdm_materials";
-    rev = "4.2.0"; # TODO: change back to `version` after 4.2.1
-    sha256 = "17x43v0np58qbdfk3wz1k7i9pl0plndx9gmf7y0n23nl9f1qzb0m";
+    rev = version;
+    sha256 = "141cv1f2pv2pznhgj32zg8bw3kmw9002g6rx16jq7lhclr0x3xls";
   };
 
   buildInputs = [ qtbase qtquickcontrols2 qtgraphicaleffects ];
-- 
GitLab


From 5641dedb3a2bececfdec2c50fb8498170667d172 Mon Sep 17 00:00:00 2001
From: Travis Whitaker <pi.boy.travis@gmail.com>
Date: Wed, 25 Sep 2019 17:03:36 -0700
Subject: [PATCH 0977/2254] GHCJS: Build on Hydra

---
 pkgs/development/compilers/ghcjs-ng/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix
index e668be8e074..747ea5cf77f 100644
--- a/pkgs/development/compilers/ghcjs-ng/default.nix
+++ b/pkgs/development/compilers/ghcjs-ng/default.nix
@@ -104,5 +104,4 @@ in stdenv.mkDerivation {
 
     meta.platforms = passthru.bootPkgs.ghc.meta.platforms;
     meta.maintainers = [lib.maintainers.elvishjerricco];
-    meta.hydraPlatforms = [];
   }
-- 
GitLab


From 920a2c406063f871726df06eafb9c8f4efea6ee3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 26 Sep 2019 02:30:51 +0200
Subject: [PATCH 0978/2254] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.15.0 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/43ab24038ab24393941e9cc4f06e628dd9183411.
---
 .../haskell-modules/hackage-packages.nix      | 302 +++++++++++++++---
 1 file changed, 252 insertions(+), 50 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 2c3a304f2ca..8f30f66974c 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -25365,6 +25365,8 @@ self: {
        pname = "amazonka";
        version = "1.6.1";
        sha256 = "104ifvmwdc1w3y42qcbq57v579zcnmlfv3f0bsazbcqdxnvr9dzd";
+       revision = "1";
+       editedCabalFile = "0xn4wy5gb1h4f4wd2h5ic17nb6ilikmsp1qip6xxc3img5rmaqyq";
        libraryHaskellDepends = [
          amazonka-core base bytestring conduit conduit-extra directory
          exceptions http-client http-conduit http-types ini mmorph
@@ -25985,6 +25987,8 @@ self: {
        pname = "amazonka-core";
        version = "1.6.1";
        sha256 = "0hx250dja1l4n4y5115w0qngzlqj8f6p861sdaykh0yjm4nzb621";
+       revision = "1";
+       editedCabalFile = "1656dyw6fk3gvph6v3xzvdp3p8xny3ji0gxg7qxvmvn60gj9ricv";
        libraryHaskellDepends = [
          aeson attoparsec base bifunctors bytestring case-insensitive
          conduit conduit-extra cryptonite deepseq exceptions hashable
@@ -39944,6 +39948,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bitvec_1_0_1_0" = callPackage
+    ({ mkDerivation, base, containers, deepseq, gauge, ghc-prim, gmp
+     , integer-gmp, primitive, quickcheck-classes, random, tasty
+     , tasty-hunit, tasty-quickcheck, vector
+     }:
+     mkDerivation {
+       pname = "bitvec";
+       version = "1.0.1.0";
+       sha256 = "171snhh25allsqpajl8anhy7bvri6hsszf734byd8xvwabia0416";
+       libraryHaskellDepends = [
+         base deepseq ghc-prim integer-gmp primitive vector
+       ];
+       librarySystemDepends = [ gmp ];
+       testHaskellDepends = [
+         base primitive quickcheck-classes tasty tasty-hunit
+         tasty-quickcheck vector
+       ];
+       benchmarkHaskellDepends = [ base containers gauge random vector ];
+       description = "Space-efficient bit vectors";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) gmp;};
+
   "bitwise" = callPackage
     ({ mkDerivation, array, base, bytestring, criterion, QuickCheck }:
      mkDerivation {
@@ -45996,8 +46023,8 @@ self: {
      }:
      mkDerivation {
        pname = "cachix";
-       version = "0.3.2";
-       sha256 = "0i0p5cp6g5ai2xxdkr0bbdlf469b52lp3fh37rq075zaw94f6qr8";
+       version = "0.3.3";
+       sha256 = "06jj961im8pavn7lay4kfn5dcs8pbd6adq8cmxalf4cm8gy77bxj";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -67529,7 +67556,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "dhall_1_26_0" = callPackage
+  "dhall_1_26_1" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base
      , bytestring, case-insensitive, cborg, cborg-json, containers
      , contravariant, cryptonite, data-fix, deepseq, Diff, directory
@@ -67546,8 +67573,8 @@ self: {
      }:
      mkDerivation {
        pname = "dhall";
-       version = "1.26.0";
-       sha256 = "1jk8zfdbvgp2ipkmhx5m1n467c1k6g24kgi295lcbyvlwahv9l7j";
+       version = "1.26.1";
+       sha256 = "1g0ynl3b1bgjwp1zk3xj9nr0x9m0n29vg82jabn01rl6z6vrw9pn";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -71028,23 +71055,21 @@ self: {
        broken = true;
      }) {};
 
-  "dl-fedora_0_7" = callPackage
+  "dl-fedora_0_7_1" = callPackage
     ({ mkDerivation, base, bytestring, directory, filepath
      , http-directory, http-types, optparse-applicative, regex-posix
-     , simple-cmd, simple-cmd-args, text, unix, xdg-userdirs
+     , simple-cmd, simple-cmd-args, text, time, unix, xdg-userdirs
      }:
      mkDerivation {
        pname = "dl-fedora";
-       version = "0.7";
-       sha256 = "00fkjlggax5l9qk2dlgh3plkqrvxrwfipdcfpq8d5kfw7l5wdxsv";
-       revision = "1";
-       editedCabalFile = "1njib3nnknqpa4kmrrrfabkrh1iaqx8xsw7jn4qrhlnqhh0mqwqd";
+       version = "0.7.1";
+       sha256 = "1wn4pmksamy3nqriv9c4fim2vwylf6x1n7r767lqdr637jww8yd4";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          base bytestring directory filepath http-directory http-types
          optparse-applicative regex-posix simple-cmd simple-cmd-args text
-         unix xdg-userdirs
+         time unix xdg-userdirs
        ];
        description = "Fedora image download tool";
        license = stdenv.lib.licenses.gpl3;
@@ -76292,21 +76317,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "emd_0_1_6_0" = callPackage
-    ({ mkDerivation, base, binary, containers, criterion
-     , data-default-class, deepseq, finite-typelits
+  "emd_0_1_7_0" = callPackage
+    ({ mkDerivation, array, base, binary, carray, containers, criterion
+     , data-default-class, deepseq, fft, finite-typelits
      , ghc-typelits-knownnat, ghc-typelits-natnormalise, HUnit
      , mwc-random, statistics, transformers, typelits-witnesses, vector
      , vector-sized
      }:
      mkDerivation {
        pname = "emd";
-       version = "0.1.6.0";
-       sha256 = "0x478z1j15swqj1y1knnf3q7z49hfxp86w37x4pd27pclhlx0hm5";
+       version = "0.1.7.0";
+       sha256 = "0r2c3awwy57mxac2imjhbss0kr63miblnz2d1a9bzriy035jwfl0";
        libraryHaskellDepends = [
-         base binary containers data-default-class deepseq finite-typelits
-         ghc-typelits-knownnat ghc-typelits-natnormalise transformers
-         typelits-witnesses vector vector-sized
+         array base binary carray containers data-default-class deepseq fft
+         finite-typelits ghc-typelits-knownnat ghc-typelits-natnormalise
+         transformers typelits-witnesses vector vector-sized
        ];
        testHaskellDepends = [ base containers HUnit ];
        benchmarkHaskellDepends = [
@@ -86535,6 +86560,28 @@ self: {
        broken = true;
      }) {};
 
+  "franz" = callPackage
+    ({ mkDerivation, base, bytestring, cereal, containers, cpu
+     , directory, fast-builder, filepath, fsnotify, network, process
+     , sendfile, stm, stm-delay, transformers, unordered-containers
+     , vector
+     }:
+     mkDerivation {
+       pname = "franz";
+       version = "0.2.1";
+       sha256 = "0azkvqy4xgrs4wac6rd23rqc051hmm2r3nmdhgk8p2fs5cdkhncx";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring cereal containers cpu directory fast-builder
+         filepath fsnotify network process sendfile stm stm-delay
+         transformers unordered-containers vector
+       ];
+       executableHaskellDepends = [ base bytestring network stm ];
+       description = "Append-only database";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "fraxl" = callPackage
     ({ mkDerivation, async, base, dependent-map, dependent-sum
      , exceptions, fastsum, free, mtl, time, transformers, type-aligned
@@ -116609,21 +116656,21 @@ self: {
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, cassava
      , clustering, containers, directory, fgl, filepath
      , hierarchical-clustering, hmatrix, lens, managed, modularity, mtl
-     , optparse-generic, safe, sparse-linear-algebra
+     , mwc-random, optparse-generic, safe, sparse-linear-algebra
      , spectral-clustering, streaming, streaming-bytestring
      , streaming-cassava, streaming-with, text, text-show, tree-fun
      , vector
      }:
      mkDerivation {
        pname = "hierarchical-spectral-clustering";
-       version = "0.4.1.3";
-       sha256 = "1vhndwkny2sjh7c7m8qym6iasqacsaim0rkihdq3x58mdm2848n7";
+       version = "0.5.0.0";
+       sha256 = "1x3n5z1gvn4ppcx7p1sgrx8xc9ln949q60d50vjz80ly08k7py8s";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base cassava clustering containers fgl
-         hierarchical-clustering hmatrix managed modularity mtl safe
-         sparse-linear-algebra spectral-clustering streaming
+         hierarchical-clustering hmatrix managed modularity mtl mwc-random
+         safe sparse-linear-algebra spectral-clustering streaming
          streaming-bytestring streaming-cassava streaming-with text tree-fun
          vector
        ];
@@ -130502,19 +130549,27 @@ self: {
 
   "hw-uri" = callPackage
     ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3
-     , antiope-core, antiope-s3, base, bytestring, directory, exceptions
-     , filepath, generic-lens, hedgehog, hspec, hspec-discover
-     , http-client, http-types, hw-hspec-hedgehog, lens, mtl, resourcet
-     , text
+     , antiope-core, antiope-optparse-applicative, antiope-s3, base
+     , bytestring, directory, exceptions, filepath, generic-lens
+     , hedgehog, hspec, hspec-discover, http-client, http-types
+     , hw-hspec-hedgehog, hw-prim, lens, mtl, optparse-applicative
+     , resourcet, text, unliftio-core
      }:
      mkDerivation {
        pname = "hw-uri";
-       version = "0.1.1.4";
-       sha256 = "1y3rf1npqx3y3pkaipbwhabszvp0427h3sa9f6a5dfy14c6vm88b";
+       version = "0.1.1.8";
+       sha256 = "09lkzl2338ah47zqbm28cf3pk1x3b3d0imbksf8995xixgvgf1vx";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson amazonka amazonka-core amazonka-s3 antiope-core antiope-s3
          base bytestring directory exceptions filepath generic-lens
-         http-client http-types lens mtl resourcet text
+         http-client http-types hw-prim lens mtl resourcet text
+         unliftio-core
+       ];
+       executableHaskellDepends = [
+         antiope-core antiope-optparse-applicative base bytestring
+         generic-lens lens mtl optparse-applicative resourcet text
        ];
        testHaskellDepends = [
          aeson antiope-core antiope-s3 base bytestring filepath hedgehog
@@ -181432,8 +181487,8 @@ self: {
      }:
      mkDerivation {
        pname = "pinch";
-       version = "0.3.4.1";
-       sha256 = "1yrw0g68j7jl9q19byq10nfg4rvn3wr49sganx8k4mr46j8pa0sk";
+       version = "0.3.5.0";
+       sha256 = "0bw7pfywa9qr6mrs340znqgzhg9yy8brh6v833wvk87sxjs8psdv";
        libraryHaskellDepends = [
          array base bytestring containers deepseq ghc-prim hashable
          semigroups text unordered-containers vector
@@ -197040,19 +197095,35 @@ self: {
        pname = "regex-base";
        version = "0.93.2";
        sha256 = "0y1j4h2pg12c853nzmczs263di7xkkmlnsq5dlp5wgbgl49mgp10";
-       revision = "1";
-       editedCabalFile = "1ijzh7yz7i6hvn8xlgyrc75l7zzn0z3kd4ks2yjfih4iir63y4ns";
+       revision = "2";
+       editedCabalFile = "0dks3m5xwcjqqlyyg7abh12ci3ap5qn6wz3bz80kr6rcfgk0fhvd";
        libraryHaskellDepends = [ array base bytestring containers mtl ];
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "regex-base_0_94_0_0" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, mtl, text }:
+     mkDerivation {
+       pname = "regex-base";
+       version = "0.94.0.0";
+       sha256 = "055rlq67xnbqv43fgrlw6d7s8nhyavahrp6blihwjmqizksq47y4";
+       libraryHaskellDepends = [
+         array base bytestring containers mtl text
+       ];
+       description = "Common \"Text.Regex.*\" API for Regex matching";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "regex-compat" = callPackage
     ({ mkDerivation, array, base, regex-base, regex-posix }:
      mkDerivation {
        pname = "regex-compat";
        version = "0.95.1";
        sha256 = "0fwmima3f04p9y4h3c23493n1xj629ia2dxaisqm6rynljjv2z6m";
+       revision = "1";
+       editedCabalFile = "0yg34p0rkql07y6rs6l70zlk8x51lra9vabkin921l581k6br498";
        libraryHaskellDepends = [ array base regex-base regex-posix ];
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
@@ -197235,6 +197306,8 @@ self: {
        pname = "regex-pcre";
        version = "0.94.4";
        sha256 = "1h16w994g9s62iwkdqa7bar2n9cfixmkzz2rm8svm960qr57valf";
+       revision = "1";
+       editedCabalFile = "0jk29n0may65ghixlx1wwfmfcabsm730y8ppry1qy4naywhi1vs7";
        libraryHaskellDepends = [
          array base bytestring containers regex-base
        ];
@@ -197296,6 +197369,8 @@ self: {
        pname = "regex-posix";
        version = "0.95.2";
        sha256 = "0gkhzhj8nvfn1ija31c7xnl6p0gadwii9ihyp219ck2arlhrj0an";
+       revision = "2";
+       editedCabalFile = "1zrlwmmrb3x3r3af1r42xwhwspzfgnzh4dw1158523sndsg8qn08";
        libraryHaskellDepends = [
          array base bytestring containers regex-base
        ];
@@ -197329,6 +197404,8 @@ self: {
        pname = "regex-tdfa";
        version = "1.2.3.2";
        sha256 = "03yhpqrqz977nwlnhnyz9dacnbzw8xb6j18h365rkgmbc05sb3hf";
+       revision = "1";
+       editedCabalFile = "03z5jmpkgyd6ydwmnxcmhysjfwb0m5ngfgvxzf4f1vx2qgifqm5i";
        libraryHaskellDepends = [
          array base bytestring containers ghc-prim mtl parsec regex-base
        ];
@@ -199143,8 +199220,8 @@ self: {
      }:
      mkDerivation {
        pname = "reqcatcher";
-       version = "0.1.2.0";
-       sha256 = "0vwk4cl3jcahwg9sggic1rac2l2ia3nv3f4ri8iv8qknwah8mf5n";
+       version = "0.2.0.0";
+       sha256 = "1wg4sfhzsl0dkwl5ldm9fk2y44jvbbagk34hgyh4dn5qc08rygw9";
        libraryHaskellDepends = [ base http-types network text wai warp ];
        testHaskellDepends = [
          base http-client http-types HUnit lens tasty tasty-hunit wai wreq
@@ -200555,8 +200632,8 @@ self: {
     ({ mkDerivation, base, Only, postgresql-simple, text, time }:
      mkDerivation {
        pname = "ribbit";
-       version = "0.3.0.1";
-       sha256 = "0n2xgwwff1bgpqza2l0d5j7agynkz2ps3vc0y73rrpxwc0kn8z3n";
+       version = "0.4.0.0";
+       sha256 = "0nmpsi8b6m88za9jxawz36jjhsybn39ldi503ap7m9wd765j1dbz";
        libraryHaskellDepends = [ base Only postgresql-simple text time ];
        description = "Type-level Relational DB combinators";
        license = stdenv.lib.licenses.mit;
@@ -203358,6 +203435,8 @@ self: {
        pname = "safecopy";
        version = "0.10.1";
        sha256 = "173lkpp6mj0kaklkwx1vypi7bwxgjwrbc3zk9akyfh3f2mlz0wi0";
+       revision = "1";
+       editedCabalFile = "0pgpnpg41p8gkq9l53bj4jj0hq863c5g0hzfjz9y5dqmjrwkvw8w";
        libraryHaskellDepends = [
          array base bytestring cereal containers generic-data old-time
          template-haskell text time transformers vector
@@ -204873,6 +204952,29 @@ self: {
        license = stdenv.lib.licenses.agpl3;
      }) {};
 
+  "schemas" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, bifunctors, bytestring
+     , free, generic-lens, generics-sop, hashable, hspec, lens
+     , lens-aeson, pretty-simple, profunctors, QuickCheck, scientific
+     , text, transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "schemas";
+       version = "0.1.0.0";
+       sha256 = "0kcvkwj7h8rra4rhc9cz1gkr2zss6ihm0vwdahxnl7pdyihi09ms";
+       libraryHaskellDepends = [
+         aeson aeson-pretty base bifunctors bytestring free generic-lens
+         generics-sop hashable lens lens-aeson pretty-simple profunctors
+         scientific text transformers unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson aeson-pretty base bytestring generic-lens generics-sop hspec
+         lens pretty-simple QuickCheck text
+       ];
+       description = "schema guided serialization";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "schematic" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, hjsonschema
      , hspec, hspec-core, hspec-discover, hspec-smallcheck, HUnit, lens
@@ -207812,6 +207914,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-JuicyPixels_0_3_0_5" = callPackage
+    ({ mkDerivation, base, bytestring, http-media, JuicyPixels, servant
+     , servant-server, wai, warp
+     }:
+     mkDerivation {
+       pname = "servant-JuicyPixels";
+       version = "0.3.0.5";
+       sha256 = "1lhxb6z8xypx48k8hwzqpp92qww8wxbp3a1ggik4dfrcxkcklmlx";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring http-media JuicyPixels servant
+       ];
+       executableHaskellDepends = [
+         base JuicyPixels servant servant-server wai warp
+       ];
+       description = "Servant support for JuicyPixels";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-aeson-specs" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory
      , doctest, filepath, hspec, hspec-core, hspec-golden-aeson, mockery
@@ -208952,6 +209075,47 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-jsonrpc" = callPackage
+    ({ mkDerivation, aeson, base, servant }:
+     mkDerivation {
+       pname = "servant-jsonrpc";
+       version = "1.0.0";
+       sha256 = "0kqs2bnkkhakg5401ylv3ys00p3s5w5r11spylkxgzi77l1q2vli";
+       libraryHaskellDepends = [ aeson base servant ];
+       description = "JSON-RPC messages and endpoints";
+       license = stdenv.lib.licenses.isc;
+     }) {};
+
+  "servant-jsonrpc-client" = callPackage
+    ({ mkDerivation, aeson, base, servant, servant-client-core
+     , servant-jsonrpc
+     }:
+     mkDerivation {
+       pname = "servant-jsonrpc-client";
+       version = "1.0.0";
+       sha256 = "0ir7lljaiczlfakzl95vpmzvx3z5n40agd0gwrscklqpdpc9n8lm";
+       libraryHaskellDepends = [
+         aeson base servant servant-client-core servant-jsonrpc
+       ];
+       description = "Generate JSON-RPC servant clients";
+       license = stdenv.lib.licenses.isc;
+     }) {};
+
+  "servant-jsonrpc-server" = callPackage
+    ({ mkDerivation, aeson, base, mtl, servant, servant-jsonrpc
+     , servant-server
+     }:
+     mkDerivation {
+       pname = "servant-jsonrpc-server";
+       version = "1.0.0";
+       sha256 = "13ryxq8y7mcmq70jnwd2gv3anq7k3p9vpi2vnp0kn4552332wpa4";
+       libraryHaskellDepends = [
+         aeson base mtl servant servant-jsonrpc servant-server
+       ];
+       description = "JSON-RPC servant servers";
+       license = stdenv.lib.licenses.isc;
+     }) {};
+
   "servant-kotlin" = callPackage
     ({ mkDerivation, aeson, base, containers, directory, formatting
      , hspec, http-api-data, lens, servant, servant-foreign, shelly
@@ -225730,8 +225894,8 @@ self: {
        pname = "sv";
        version = "1.4";
        sha256 = "02ymnnknfppx59b922y62grkmarwsyy77iv6bmyp2bzm8vbvnvd5";
-       revision = "1";
-       editedCabalFile = "0lzl0602dbq8nih9ylqk18vqg3xgj3bnf8c6hkxhbc2mryszrhyj";
+       revision = "2";
+       editedCabalFile = "0kacp654mmj9h038mrxnq69ln5ipbbp2ifvyzqixgjask2bf9f41";
        libraryHaskellDepends = [
          attoparsec base bifunctors bytestring contravariant hw-dsv
          semigroupoids sv-core transformers utf8-string validation
@@ -225810,8 +225974,8 @@ self: {
        pname = "sv-core";
        version = "0.5";
        sha256 = "1x5gmv2pbn3hx1dhpkigivjkbg6n6xy7lc36wmccsw2qqn9r5qxa";
-       revision = "1";
-       editedCabalFile = "1vsd3g5kh50c7vrx9y04crrw6pfs3g74z3sr9s1dbapa9411pif8";
+       revision = "2";
+       editedCabalFile = "066kpnyvpzl6bvc11ng6xq4mdd84lxjiif83i265mkjc8hq21xd4";
        libraryHaskellDepends = [
          attoparsec base bifunctors bytestring containers contravariant
          deepseq double-conversion lens mtl parsec profunctors readable
@@ -246990,8 +247154,8 @@ self: {
     ({ mkDerivation, base, containers, hspec, QuickCheck, time }:
      mkDerivation {
        pname = "vformat";
-       version = "0.9.0.0";
-       sha256 = "01a6msv2iirrkxp950wvf28cvbl91kilffwavymll3l7wd3w1mb3";
+       version = "0.9.1.0";
+       sha256 = "1bq7m1yjqkgqk1bxh28n67n04yfxvp2466xmrb83a93w22h98k7l";
        libraryHaskellDepends = [ base containers time ];
        testHaskellDepends = [ base containers hspec QuickCheck time ];
        description = "A Python str.format() like formatter";
@@ -252102,6 +252266,44 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "winery_1_1_3" = callPackage
+    ({ mkDerivation, aeson, base, binary, bytestring, cereal
+     , containers, cpu, deepseq, directory, fast-builder, gauge
+     , hashable, HUnit, megaparsec, mtl, prettyprinter
+     , prettyprinter-ansi-terminal, QuickCheck, quickcheck-instances
+     , scientific, semigroups, serialise, store, text, time
+     , transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "winery";
+       version = "1.1.3";
+       sha256 = "1qh2i6fwwgncmx15gp4h3cg04plff3h8252x66rzxnd22g1sk3d9";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers cpu fast-builder hashable HUnit
+         megaparsec mtl prettyprinter prettyprinter-ansi-terminal QuickCheck
+         scientific semigroups text time transformers unordered-containers
+         vector
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring megaparsec prettyprinter
+         prettyprinter-ansi-terminal text
+       ];
+       testHaskellDepends = [
+         base bytestring containers fast-builder QuickCheck
+         quickcheck-instances scientific text time unordered-containers
+         vector
+       ];
+       benchmarkHaskellDepends = [
+         aeson base binary bytestring cereal deepseq directory gauge
+         serialise store text
+       ];
+       description = "A compact, well-typed seralisation format for Haskell values";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "winio" = callPackage
     ({ mkDerivation, base, bytestring, extensible-exceptions, kernel32
      , network, winerror, ws2_32
@@ -261187,8 +261389,8 @@ self: {
        pname = "zip";
        version = "1.2.0";
        sha256 = "1jbxnbiizdklv0pw8f22h38xbmk6d4wggy27w8injdsfi18f27dn";
-       revision = "1";
-       editedCabalFile = "084dfylc1h45r4v2zyld1vvrxs6x1ljq8hzinqrkv2ii748cmzdb";
+       revision = "2";
+       editedCabalFile = "09ak8h11hm1jnpkvljradbj3a741s31k8cvyvwypr927khi5y9mp";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -261894,8 +262096,8 @@ self: {
      }:
      mkDerivation {
        pname = "zxcvbn-hs";
-       version = "0.2.0.0";
-       sha256 = "1524j8mgvp26cz4n4cd1vyslniw0xbw9ngrgkcyj3jmkh6p53ngh";
+       version = "0.2.1.0";
+       sha256 = "1gvarz005nlz9q5bkdwvplvsmwwchhx0arpq1grmh39r706lh4d8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-- 
GitLab


From 28a7e8fb753c82c579a6505053e2a683857c1a5c Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Wed, 25 Sep 2019 22:47:51 -0400
Subject: [PATCH 0979/2254] xfce4-14.tumbler: manually wrap

---
 pkgs/desktops/xfce4-14/tumbler/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/desktops/xfce4-14/tumbler/default.nix b/pkgs/desktops/xfce4-14/tumbler/default.nix
index ecbc62d8ffb..e99551bd8d2 100644
--- a/pkgs/desktops/xfce4-14/tumbler/default.nix
+++ b/pkgs/desktops/xfce4-14/tumbler/default.nix
@@ -27,4 +27,9 @@ mkXfceDerivation {
     libgsf
     poppler # technically the glib binding
   ];
+
+  # WrapGAppsHook won't touch this binary automatically, so we wrap manually.
+  postFixup = ''
+    wrapProgram $out/lib/tumbler-1/tumblerd "''${gappsWrapperArgs[@]}"
+  '';
 }
-- 
GitLab


From 71644b1594230b1f843a163558f8122194cd7589 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 25 Sep 2019 21:31:24 -0700
Subject: [PATCH 0980/2254] aravis: 0.6.3 -> 0.6.4

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/aravis/versions
---
 pkgs/development/libraries/aravis/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/aravis/default.nix b/pkgs/development/libraries/aravis/default.nix
index 9d506b10e35..eaeddbcad36 100644
--- a/pkgs/development/libraries/aravis/default.nix
+++ b/pkgs/development/libraries/aravis/default.nix
@@ -33,13 +33,13 @@ in
   stdenv.mkDerivation rec {
 
     pname = "aravis";
-    version = "0.6.3";
+    version = "0.6.4";
 
     src = fetchFromGitHub {
       owner = "AravisProject";
       repo = pname;
       rev= "ARAVIS_${builtins.replaceStrings ["."] ["_"] version}";
-      sha256 = "0lmgx854z522dwcxsg37bxdyiai9fnycpx1nvgayksj38h39kfn2";
+      sha256 = "18fnliks661kzc3g8v08hcaj18hjid8b180d6s9gwn0zgv4g374w";
     };
 
     outputs = [ "bin" "dev" "out" "lib" ];
-- 
GitLab


From ae09304f8c178fb39f0b4c6053b3e6cf1cdf79dc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 25 Sep 2019 21:34:38 -0700
Subject: [PATCH 0981/2254] python27Packages.addic7ed-cli: 1.4.5 -> 1.4.6

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/addic7ed-cli/versions
---
 pkgs/development/python-modules/addic7ed-cli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/addic7ed-cli/default.nix b/pkgs/development/python-modules/addic7ed-cli/default.nix
index a9720f45ef6..b87a084fd8c 100644
--- a/pkgs/development/python-modules/addic7ed-cli/default.nix
+++ b/pkgs/development/python-modules/addic7ed-cli/default.nix
@@ -2,11 +2,11 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "addic7ed-cli";
-  version = "1.4.5";
+  version = "1.4.6";
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "16nmyw7j2igx5dxflwiwblf421g69rxb879n1553wv6hxi4x27in";
+    sha256 = "182cpwxpdybsgl1nps850ysvvjbqlnx149kri4hxhgm58nqq0qf5";
   };
 
   propagatedBuildInputs = with python3Packages; [
-- 
GitLab


From 9864ef66a7a4f9e0cd045fa6916e6fa7d44fe014 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 25 Sep 2019 21:39:12 -0700
Subject: [PATCH 0982/2254] baresip: 0.6.3 -> 0.6.4

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/baresip/versions
---
 .../networking/instant-messengers/baresip/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix
index f01b8d387f8..f905f90aebd 100644
--- a/pkgs/applications/networking/instant-messengers/baresip/default.nix
+++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix
@@ -3,11 +3,11 @@
 , gsm, speex, portaudio, spandsp, libuuid, ccache, libvpx
 }:
 stdenv.mkDerivation rec {
-  version = "0.6.3";
+  version = "0.6.4";
   pname = "baresip";
   src=fetchurl {
     url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz";
-    sha256 = "031hjm30v45h1sfknrf2f2ci10n712bdkcyf92y2hzllnik58068";
+    sha256 = "10bmb7wiqzjdp51kjahmsp7gkvnqp91mfz0nmwgsw1n4pv8hnwb1";
   };
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [zlib openssl libre librem cairo mpg123
-- 
GitLab


From 3970bded3e16f91309a96e8309d790126ad7bd43 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 25 Sep 2019 22:01:15 -0700
Subject: [PATCH 0983/2254] amazon-ecs-cli: 1.15.1 -> 1.16.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/amazon-ecs-cli/versions
---
 pkgs/tools/virtualization/amazon-ecs-cli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/virtualization/amazon-ecs-cli/default.nix b/pkgs/tools/virtualization/amazon-ecs-cli/default.nix
index e7c391806aa..306bd0574c9 100644
--- a/pkgs/tools/virtualization/amazon-ecs-cli/default.nix
+++ b/pkgs/tools/virtualization/amazon-ecs-cli/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "amazon-ecs-cli";
-  version = "1.15.1";
+  version = "1.16.0";
 
   src = fetchurl {
     url = "https://s3.amazonaws.com/amazon-ecs-cli/ecs-cli-linux-amd64-v${version}";
-    sha256 = "0p0z12b6z00sxzjfsvb37czgczrsi61klr5azan0f8wf32x6wc28";
+    sha256 = "0mj0y2hrl7yp8mfjgi68gvbravgwp5v58hhcclr49mdjnr4v6i9x";
   };
 
   dontUnpack = true;
-- 
GitLab


From e7c4781662a5b0e4279e3936ed70442ec7298ae5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 25 Sep 2019 22:11:55 -0700
Subject: [PATCH 0984/2254] autoflake: 1.3 -> 1.3.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/autoflake/versions
---
 pkgs/development/tools/analysis/autoflake/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/analysis/autoflake/default.nix b/pkgs/development/tools/analysis/autoflake/default.nix
index 16b4be47d8b..7ae563c058b 100644
--- a/pkgs/development/tools/analysis/autoflake/default.nix
+++ b/pkgs/development/tools/analysis/autoflake/default.nix
@@ -3,11 +3,11 @@
 with python3Packages;
 buildPythonApplication rec {
   pname = "autoflake";
-  version = "1.3";
+  version = "1.3.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0wzrvrn6279fijg8jkqbs6313f7b5ll5d22pk5s0fc1fp2wyanbb";
+    sha256 = "0nzr057dbmgprp4a52ymafdkdd5zp2wcqf42913xc7hhvvdbj338";
   };
 
   propagatedBuildInputs = [ pyflakes ];
-- 
GitLab


From e9b8203a389e00005fe3649a711baf8808ab0be1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 25 Sep 2019 22:25:26 -0700
Subject: [PATCH 0985/2254] _2bwm: 0.2 -> 0.3

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/2bwm/versions
---
 pkgs/applications/window-managers/2bwm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/2bwm/default.nix b/pkgs/applications/window-managers/2bwm/default.nix
index 4b61fe3d7e6..cd1a3a4baf7 100644
--- a/pkgs/applications/window-managers/2bwm/default.nix
+++ b/pkgs/applications/window-managers/2bwm/default.nix
@@ -3,14 +3,14 @@
 , libX11, xcbutil, xcbutilxrm }:
 
 stdenv.mkDerivation rec {
-  version = "0.2";
+  version = "0.3";
   pname = "2bwm";
 
   src = fetchFromGitHub {
     owner  = "venam";
     repo   = "2bwm";
     rev    = "v${version}";
-    sha256 = "1la1ixpm5knsj2gvdcmxzj1jfbzxvhmgzps4f5kbvx5047xc6ici";
+    sha256 = "1xwib612ahv4rg9yl5injck89dlpyp5475xqgag0ydfd0r4sfld7";
   };
 
   # Allow users set their own list of patches
-- 
GitLab


From 24ee6a5bca595c8d3a1797f10cd211bac16e70f3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 25 Sep 2019 22:39:53 -0700
Subject: [PATCH 0986/2254] ansible-lint: 4.1.0 -> 4.1.1a0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/ansible-lint/versions
---
 pkgs/development/python-modules/ansible-lint/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ansible-lint/default.nix b/pkgs/development/python-modules/ansible-lint/default.nix
index ed5b35e8344..50addec97c2 100644
--- a/pkgs/development/python-modules/ansible-lint/default.nix
+++ b/pkgs/development/python-modules/ansible-lint/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "ansible-lint";
-  version = "4.1.0";
+  version = "4.1.1a0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9430ea6e654ba4bf5b9c6921efc040f46cda9c4fd2896a99ff71d21037bcb123";
+    sha256 = "00mw56a3lmdb5xvrzhahrzqv3wvxfz0mxl4n0qbkxzggf2pg0i8d";
   };
 
   nativeBuildInputs = [ setuptools_scm ];
-- 
GitLab


From e584eba7f8f2954dd53cca32e79634165f5333f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 24 Sep 2019 22:07:47 +0200
Subject: [PATCH 0987/2254] xdg-utils: add missing perl dependencies

Or else `xdg-screensaver suspend <WINDOW_ID>` fails with errors like:

  Can't locate Net/DBus.pm in @INC [...]

This increases the closure of xdg-utils from 53 MiB to 119 MiB.

(The issue was found when testing retroarch.)
---
 pkgs/tools/X11/xdg-utils/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix
index f1e6e28627c..e5c4a47b110 100644
--- a/pkgs/tools/X11/xdg-utils/default.nix
+++ b/pkgs/tools/X11/xdg-utils/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, fetchFromGitHub
 , file, libxslt, docbook_xml_dtd_412, docbook_xsl, xmlto
-, w3m, gnugrep, gnused, coreutils, xset
+, w3m, gnugrep, gnused, coreutils, xset, perlPackages
 , mimiSupport ? false, gawk ? null }:
 
 assert mimiSupport -> gawk != null;
@@ -13,6 +13,11 @@ let
     rev = "8e0070f17bcd3612ee83cb84e663e7c7fabcca3d";
     sha256 = "15gw2nyrqmdsdin8gzxihpn77grhk9l97jp7s7pr7sl4n9ya2rpj";
   };
+
+  perlPath = with perlPackages; makePerlPath [
+    NetDBus XMLTwig XMLParser X11Protocol
+  ];
+
 in
 
 stdenv.mkDerivation rec {
@@ -39,6 +44,7 @@ stdenv.mkDerivation rec {
     awk()   { ${gawk}/bin/awk       "$@"; }\
     sort()  { ${coreutils}/bin/sort "$@"; }\
     xset()  { ${xset}/bin/xset      "$@"; }\
+    perl()  { PERL5LIB=${perlPath} ${perlPackages.perl}/bin/perl "$@"; }\
     &#' -i "$out"/bin/*
 
     substituteInPlace $out/bin/xdg-open \
-- 
GitLab


From bf7a1d6afe7f4f50802748b7b8211a4006221e7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 24 Sep 2019 22:12:10 +0200
Subject: [PATCH 0988/2254] retroarch: 1.7.5 -> 1.7.8.4

Fixes missing GUI elements.
---
 pkgs/misc/emulators/retroarch/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix
index f26769cd28d..3b55c44d173 100644
--- a/pkgs/misc/emulators/retroarch/default.nix
+++ b/pkgs/misc/emulators/retroarch/default.nix
@@ -27,12 +27,12 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "retroarch-bare";
-  version = "1.7.5";
+  version = "1.7.8.4";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "RetroArch";
-    sha256 = "1jfpgl34jjxn3dvxd1kd564swkw7v98hnn562v998b7vllz3dxdm";
+    sha256 = "1i3i23xwvmck8k2fpalr49np7xjzfg507243mybqrljawlnbxvph";
     rev = "v${version}";
   };
 
-- 
GitLab


From a8dc4e39db34ab6ca196145539f7ab9327eab782 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 25 Sep 2019 23:24:40 -0700
Subject: [PATCH 0989/2254] atlassian-jira: 8.3.2 -> 8.4.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/atlassian-jira/versions
---
 pkgs/servers/atlassian/jira.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix
index 2b7117f419f..53b7b88d5b0 100644
--- a/pkgs/servers/atlassian/jira.nix
+++ b/pkgs/servers/atlassian/jira.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "atlassian-jira";
-  version = "8.3.2";
+  version = "8.4.0";
 
   src = fetchurl {
     url = "https://product-downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz";
-    sha256 = "0cqj7al9892psc5zqpfvj0gnjf8b4dpm2kx7sr21grczss1dkcs1";
+    sha256 = "1ckim2zv1i1986yciknb1c6gmj466slv38w053nnkm3nn85c5ksv";
   };
 
   phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ];
-- 
GitLab


From 839d86715d164f2a51976cac155eb5357da947b2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 25 Sep 2019 23:56:20 -0700
Subject: [PATCH 0990/2254] bird2: 2.0.5 -> 2.0.6

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/bird/versions
---
 pkgs/servers/bird/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix
index d4b4441408e..fbd08c45c3a 100644
--- a/pkgs/servers/bird/default.nix
+++ b/pkgs/servers/bird/default.nix
@@ -58,7 +58,7 @@ in
   };
 
   bird2 = generic {
-    version = "2.0.5";
-    sha256 = "1lr963ywy0mkrhgs5969wc354lizddsagrlbf8x84yb5s9pp6jsf";
+    version = "2.0.6";
+    sha256 = "1ankpxvmn12kzgv5vh7awnkj34jzjciy5baq3smkj079db74r4wh";
   };
 }
-- 
GitLab


From 1e4c57dbe1991c2dc6d4927d761d71a89b287a7c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 25 Sep 2019 23:59:53 -0700
Subject: [PATCH 0991/2254] armadillo: 9.600.6 -> 9.700.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/armadillo/versions
---
 pkgs/development/libraries/armadillo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix
index 127c2f3ae31..c2031f37263 100644
--- a/pkgs/development/libraries/armadillo/default.nix
+++ b/pkgs/development/libraries/armadillo/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "armadillo";
-  version = "9.600.6";
+  version = "9.700.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
-    sha256 = "0wlk1yv9531vpvgja4cpy0sxykrn0p5w376kx86vl45b50yamx7g";
+    sha256 = "1g88mizzkza91v51fz174gg0700f6y6snshplffpqw2gjx42ngwj";
   };
 
   nativeBuildInputs = [ cmake ];
-- 
GitLab


From 3c6eabdbe68ac55bf17579fa1e1f518b3eb6e641 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 00:06:02 -0700
Subject: [PATCH 0992/2254] avocode: 3.9.2 -> 3.9.3

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/avocode/versions
---
 pkgs/applications/graphics/avocode/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix
index 5e1cba31b7e..bb526b75ea4 100644
--- a/pkgs/applications/graphics/avocode/default.nix
+++ b/pkgs/applications/graphics/avocode/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "avocode";
-  version = "3.9.2";
+  version = "3.9.3";
 
   src = fetchurl {
     url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip";
-    sha256 = "18yzw7bss1dkmmd8lxr9x8s46qmpnqci202g16zrp6j9jdj094d3";
+    sha256 = "1ki2fpn70p1rzf52q8511a90n7y7dqi86fs2a48qhass1abxlpqx";
   };
 
   libPath = stdenv.lib.makeLibraryPath (with xorg; [
-- 
GitLab


From 252c71a35ec1fed44ea717cd36438ce7fe456ee5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 00:08:57 -0700
Subject: [PATCH 0993/2254] asunder: 2.9.3 -> 2.9.4

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/asunder/versions
---
 pkgs/applications/audio/asunder/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/asunder/default.nix b/pkgs/applications/audio/asunder/default.nix
index e4c145b35c7..e252635e953 100644
--- a/pkgs/applications/audio/asunder/default.nix
+++ b/pkgs/applications/audio/asunder/default.nix
@@ -12,11 +12,11 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "2.9.3";
+  version = "2.9.4";
   pname = "asunder";
   src = fetchurl {
     url = "http://littlesvr.ca/asunder/releases/${pname}-${version}.tar.bz2";
-    sha256 = "1630i1df06y840v3fgdf75jxw1s8kwbfn5bhi0686viah0scccw5";
+    sha256 = "1bwc9v9l1f3kqjd7wis6g2sv6ibc618ybh0gsb8mkkfhadp68w30";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From 7d070a3fbef8657dcf5a23d6e2d58be139d61af8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 00:26:30 -0700
Subject: [PATCH 0994/2254] babeld: 1.9.0 -> 1.9.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/babeld/versions
---
 pkgs/tools/networking/babeld/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/babeld/default.nix b/pkgs/tools/networking/babeld/default.nix
index e593bccbd1d..60b79220628 100644
--- a/pkgs/tools/networking/babeld/default.nix
+++ b/pkgs/tools/networking/babeld/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "babeld-1.9.0";
+  name = "babeld-1.9.1";
 
   src = fetchurl {
     url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/${name}.tar.gz";
-    sha256 = "0g7nhvd0hhb3jxdzpbqdxnb68375vm6apj2wslkxb70ip6rkk2hj";
+    sha256 = "1d503igqv9s5pgrhvxp1czjy2xfsjhagyyh2iny7g4cjvl0kq6qy";
   };
 
   preBuild = ''
-- 
GitLab


From 329c7f405f8beeff1cf44c7073d1e96e3700217e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 00:32:54 -0700
Subject: [PATCH 0995/2254] bitwarden: 1.15.2 -> 1.16.4

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/bitwarden/versions
---
 pkgs/tools/security/bitwarden/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix
index c67cc447431..f96501ddf77 100644
--- a/pkgs/tools/security/bitwarden/default.nix
+++ b/pkgs/tools/security/bitwarden/default.nix
@@ -16,11 +16,11 @@ let
   pname = "bitwarden";
 
   version = {
-    x86_64-linux = "1.15.2";
+    x86_64-linux = "1.16.4";
   }.${system} or "";
 
   sha256 = {
-    x86_64-linux = "0yz4hkqqwq2zrdjfxk5kybhs90n80k6bkn0625m47b09lwl2di4f";
+    x86_64-linux = "1g9ljxjqs7mx509lkfd7db7xvm9srzypbgv0qfzrr2flqbsfl06m";
   }.${system} or "";
 
   meta = with stdenv.lib; {
-- 
GitLab


From 1d542a7794f72b82268e58cb044cb7bf27555da2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 00:36:47 -0700
Subject: [PATCH 0996/2254] checkstyle: 8.23 -> 8.24

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/checkstyle/versions
---
 pkgs/development/tools/analysis/checkstyle/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix
index ac2c6795a42..3fdf6e9e3d0 100644
--- a/pkgs/development/tools/analysis/checkstyle/default.nix
+++ b/pkgs/development/tools/analysis/checkstyle/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, makeWrapper, jre }:
 
 stdenv.mkDerivation rec {
-  version = "8.23";
+  version = "8.24";
   pname = "checkstyle";
 
   src = fetchurl {
     url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar";
-    sha256 = "0k161c687q33rlm4r8h3f0ks5p2w8pj6kh258zdzk8kjfigfxkmx";
+    sha256 = "01h1xv6lqf1fhmzbghdj2dbygdspcb6dxk0fil16s2ggs3w62fmm";
   };
 
   nativeBuildInputs = [ makeWrapper ];
-- 
GitLab


From 38bff390bc8be578c2d258e9b4c34d9a8a3533dd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 01:00:08 -0700
Subject: [PATCH 0997/2254] btfs: 2.19 -> 2.20

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/btfs/versions
---
 pkgs/os-specific/linux/btfs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/btfs/default.nix b/pkgs/os-specific/linux/btfs/default.nix
index 27fa40887ed..f21c9dcad35 100644
--- a/pkgs/os-specific/linux/btfs/default.nix
+++ b/pkgs/os-specific/linux/btfs/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "btfs";
-  version = "2.19";
+  version = "2.20";
 
   src = fetchFromGitHub {
     owner  = "johang";
     repo   = pname;
     rev    = "v${version}";
-    sha256 = "1b58zqha2hpnk4ysp9870wd9pkyy6l106ghp0z0x655q70npj0wn";
+    sha256 = "1xil18nmivakdv6rz4sd3203gzfisdvj79spni59kv7dby64rxdz";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
-- 
GitLab


From f54eb7f1596aa797773dd7c8f9af3dc8932ff06e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 01:07:35 -0700
Subject: [PATCH 0998/2254] clingo: 5.3.0 -> 5.4.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/clingo/versions
---
 pkgs/applications/science/logic/potassco/clingo.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/logic/potassco/clingo.nix b/pkgs/applications/science/logic/potassco/clingo.nix
index 2b368a0e673..2b6955975e6 100644
--- a/pkgs/applications/science/logic/potassco/clingo.nix
+++ b/pkgs/applications/science/logic/potassco/clingo.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "clingo";
-  version = "5.3.0";
+  version = "5.4.0";
 
   src = fetchzip {
     url = "https://github.com/potassco/clingo/archive/v${version}.tar.gz";
-    sha256 = "01czx26p8gv81ahrh650x208hjhd8bx1kb688fmk1m4pw4yg5bfv";
+    sha256 = "0gfqlgwg3qx042w6hdc9qpmr50n4vci3p0ddk28f3kqacf6q9q7m";
   };
 
   buildInputs = [];
-- 
GitLab


From 2e3df3f1a9d7195a433af2e5ddf86b3d3a7604df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 26 Sep 2019 09:09:41 +0100
Subject: [PATCH 0999/2254] btfs: simplify shebang fixup

---
 pkgs/os-specific/linux/btfs/default.nix | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/btfs/default.nix b/pkgs/os-specific/linux/btfs/default.nix
index f21c9dcad35..d2e5d91e365 100644
--- a/pkgs/os-specific/linux/btfs/default.nix
+++ b/pkgs/os-specific/linux/btfs/default.nix
@@ -14,14 +14,9 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
   buildInputs = [
-    boost fuse libtorrentRasterbar curl
+    boost fuse libtorrentRasterbar curl python3
   ];
 
-  preInstall = ''
-    substituteInPlace scripts/btplay \
-      --replace "/usr/bin/env python" "${python3.interpreter}"
-  '';
-
   meta = with stdenv.lib; {
     description = "A bittorrent filesystem based on FUSE";
     homepage    = https://github.com/johang/btfs;
-- 
GitLab


From 76e11855b74ca7ca79065c3f3d8a363b9e989221 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 01:14:29 -0700
Subject: [PATCH 1000/2254] charybdis: 4.1.1 -> 4.1.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/charybdis/versions
---
 pkgs/servers/irc/charybdis/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/irc/charybdis/default.nix b/pkgs/servers/irc/charybdis/default.nix
index dc053f4581c..c6b2af3d387 100644
--- a/pkgs/servers/irc/charybdis/default.nix
+++ b/pkgs/servers/irc/charybdis/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub, autoreconfHook, bison, flex, openssl, gnutls }:
 
 stdenv.mkDerivation rec {
-  name = "charybdis-4.1.1";
+  name = "charybdis-4.1.2";
 
   src = fetchFromGitHub {
     owner = "charybdis-ircd";
     repo = "charybdis";
     rev = name;
-    sha256 = "0wvssc8b1xq6svcqrwxrpc1ga8ip0sksv73wwbk8na0pmysdvpg0";
+    sha256 = "1lndk0yp27qm8bds4jd204ynxcq92fqmpfb0kkcla5zgky3miks3";
   };
 
   postPatch = ''
-- 
GitLab


From 9a1b767a550be8b044b5db3f32dbb270973204c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 26 Sep 2019 09:16:23 +0100
Subject: [PATCH 1001/2254] treewide: remove empty buildInputs

---
 pkgs/applications/science/logic/potassco/clingo.nix    | 3 +--
 pkgs/applications/science/math/nauty/default.nix       | 1 -
 pkgs/development/libraries/safefile/default.nix        | 2 --
 pkgs/development/libraries/spandsp/default.nix         | 2 --
 pkgs/development/python-modules/graph_nets/default.nix | 2 --
 pkgs/development/python-modules/pulp/default.nix       | 1 -
 pkgs/tools/misc/clac/default.nix                       | 5 ++---
 7 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/science/logic/potassco/clingo.nix b/pkgs/applications/science/logic/potassco/clingo.nix
index 2b368a0e673..453ad4016a5 100644
--- a/pkgs/applications/science/logic/potassco/clingo.nix
+++ b/pkgs/applications/science/logic/potassco/clingo.nix
@@ -9,8 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "01czx26p8gv81ahrh650x208hjhd8bx1kb688fmk1m4pw4yg5bfv";
   };
 
-  buildInputs = [];
-  nativeBuildInputs = [cmake];
+  nativeBuildInputs = [ cmake ];
 
   cmakeFlags = [ "-DCLINGO_BUILD_WITH_PYTHON=OFF" ];
 
diff --git a/pkgs/applications/science/math/nauty/default.nix b/pkgs/applications/science/math/nauty/default.nix
index e9c8b688fb9..4efe8da1918 100644
--- a/pkgs/applications/science/math/nauty/default.nix
+++ b/pkgs/applications/science/math/nauty/default.nix
@@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
     sandybridge    = [ "--disable-clz" ];
     ivybridge      = [ "--disable-clz" ];
   }.${stdenv.hostPlatform.platform.gcc.arch or "default"} or [];
-  buildInputs = [];
   installPhase = ''
     mkdir -p "$out"/{bin,share/doc/nauty} "$dev"/{lib,include/nauty}
 
diff --git a/pkgs/development/libraries/safefile/default.nix b/pkgs/development/libraries/safefile/default.nix
index b69cd56d35d..5136bac2de0 100644
--- a/pkgs/development/libraries/safefile/default.nix
+++ b/pkgs/development/libraries/safefile/default.nix
@@ -8,8 +8,6 @@ stdenv.mkDerivation rec {
     sha256 = "1y0gikds2nr8jk8smhrl617njk23ymmpxyjb2j1xbj0k82xspv78";
   };
 
-  buildInputs = [];
-
   passthru = {
     updateScript = ''
       #!${runtimeShell}
diff --git a/pkgs/development/libraries/spandsp/default.nix b/pkgs/development/libraries/spandsp/default.nix
index c2dc20cc392..407e3d5e235 100644
--- a/pkgs/development/libraries/spandsp/default.nix
+++ b/pkgs/development/libraries/spandsp/default.nix
@@ -6,7 +6,6 @@ stdenv.mkDerivation rec {
     url = "https://www.soft-switch.org/downloads/spandsp/spandsp-${version}.tar.gz";
     sha256 = "0rclrkyspzk575v8fslzjpgp4y2s4x7xk3r55ycvpi4agv33l1fc";
   };
-  buildInputs = [];
   propagatedBuildInputs = [audiofile libtiff];
   meta = {
     homepage = http://www.creytiv.com/baresip.html;
@@ -18,4 +17,3 @@ stdenv.mkDerivation rec {
     updateWalker = true;
   };
 }
-
diff --git a/pkgs/development/python-modules/graph_nets/default.nix b/pkgs/development/python-modules/graph_nets/default.nix
index 41c13b1fbd4..c262331a6e1 100644
--- a/pkgs/development/python-modules/graph_nets/default.nix
+++ b/pkgs/development/python-modules/graph_nets/default.nix
@@ -20,8 +20,6 @@ buildPythonPackage rec {
     sha256 = "6f27f0358a477d4ec3ab300bf09944b4dfdd5c10b0a5f7ac06bcb32d1327ebe1";
   };
 
-  buildInputs = [];
-
   postPatch = ''
     # https://github.com/deepmind/graph_nets/issues/63
     sed -i 's/dm-sonnet==1.23/dm-sonnet/' setup.py
diff --git a/pkgs/development/python-modules/pulp/default.nix b/pkgs/development/python-modules/pulp/default.nix
index aacac72d2aa..09fddad0158 100644
--- a/pkgs/development/python-modules/pulp/default.nix
+++ b/pkgs/development/python-modules/pulp/default.nix
@@ -9,7 +9,6 @@ buildPythonPackage rec {
     sha256 = "1irzpfnnm5f0qf8y9ddxi489nwixyj0q4zlvqafm621bijkxdv6g";
   };
 
-  buildInputs = [];
   propagatedBuildInputs = [ pyparsing ];
 
   # only one test that requires an extra
diff --git a/pkgs/tools/misc/clac/default.nix b/pkgs/tools/misc/clac/default.nix
index f71faf6ab74..544379d8d21 100644
--- a/pkgs/tools/misc/clac/default.nix
+++ b/pkgs/tools/misc/clac/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub}:
+{ stdenv, fetchFromGitHub }:
 stdenv.mkDerivation rec {
   pname = "clac";
   version = "0.0.0.20170503";
@@ -10,8 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "0j8p1npgq32s377c9lw959h5i2csq4yb27cvg7av17bji46816bv";
   };
 
-  buildInputs = [];
-  makeFlags = ["PREFIX=$(out)"];
+  makeFlags = [ "PREFIX=$(out)" ];
 
   postInstall = ''
     mkdir -p "$out/share/doc/${pname}"
-- 
GitLab


From 485adfa7bdd8828aea1e7545e1322764c00e8f8e Mon Sep 17 00:00:00 2001
From: Jacek Generowicz <jacg@my-post-office.net>
Date: Thu, 19 Sep 2019 15:38:13 +0200
Subject: [PATCH 1002/2254] maintainers: add jacg

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 82100fe63af..f61144fa68e 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2808,6 +2808,11 @@
     githubId = 26877687;
     name = "Yurii Izorkin";
   };
+  jacg = {
+    name = "Jacek Generowicz";
+    email = "jacg@my-post-office.net";
+    githubId = "2570854";
+  };
   jasoncarr = {
     email = "jcarr250@gmail.com";
     github = "jasoncarr0";
-- 
GitLab


From bac244ab2fdc4400b8ca3c44df6cbffdf0d2cb98 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 01:23:35 -0700
Subject: [PATCH 1003/2254] btrfs-progs: 5.2.1 -> 5.2.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/btrfs-progs/versions
---
 pkgs/tools/filesystems/btrfs-progs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix
index f5588cc51ab..95fc1c1cd7a 100644
--- a/pkgs/tools/filesystems/btrfs-progs/default.nix
+++ b/pkgs/tools/filesystems/btrfs-progs/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "btrfs-progs";
-  version = "5.2.1";
+  version = "5.2.2";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
-    sha256 = "0crjv3i20nyj2dagfw6q7byshscpn6j7wlqch3apkzzzk00lmb1n";
+    sha256 = "1imivxjppi8zl27gn472pwpk8bg5dijkbyi340by31vhy7dj24w2";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From fae0694087cfdc1a65a1aafea4c285e9fa23a895 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 01:33:23 -0700
Subject: [PATCH 1004/2254] closurecompiler: 20190215 -> 20190909

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/closure-compiler/versions
---
 pkgs/development/compilers/closure/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix
index d9f2a588d8f..682a8aa4eed 100644
--- a/pkgs/development/compilers/closure/default.nix
+++ b/pkgs/development/compilers/closure/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "closure-compiler";
-  version = "20190215";
+  version = "20190909";
 
   src = fetchurl {
     url = "https://dl.google.com/closure-compiler/compiler-${version}.tar.gz";
-    sha256 = "16rpl7x90ganpxlz6v9292cwx7dnkhklqx1nn161yj7ypf9bzd4k";
+    sha256 = "0km45pz19dz1hi8vjj290hyxdhr379iixmml0rs8crr4gvs3685w";
   };
 
   sourceRoot = ".";
-- 
GitLab


From 65cc72ec26f039f942faddde37ad71893eee91aa Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Thu, 26 Sep 2019 17:37:57 +0900
Subject: [PATCH 1005/2254] thunderbird-bin: 68.1.0 -> 68.1.1

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

diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
index 2de09fc73f4..6dfb6780f0d 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
@@ -1,615 +1,615 @@
 {
-  version = "68.1.0";
+  version = "68.1.1";
   sources = [
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/ar/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/ar/thunderbird-68.1.1.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "b9bb22bdbe013358c03e804e3c51ad387dca503b9e0074db70494eb3f331d72bd8679db929972e75b39f2464d384753bcab9947d1a843a69167d7b3706952c35";
+      sha512 = "33accd6fe1f83fc47a34df038f4257571f42281a89f9aab2f54514443856b71aaa2ee81abe98331ecdbbf026a09eea31fb2c5eb72044347c54f51a6ac1e0bfd4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/ast/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/ast/thunderbird-68.1.1.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "e00382241343bbd8a86e31dfcf5bbb060b46e5db6211cfa54c7192361353e2c4fe3d0ad3f4e0319ec1a0dc1f4590b7bc0271e5658bc468986d8e27a64d9924da";
+      sha512 = "1e32c40cd198b51a5836c2ad9a6331c0b3028e57d62e5e057990a48ab80b9fd5bd1290a268da29dc5a45c61e712bf0345f85d0ca43c18b2236c0f4bac7b9328f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/be/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/be/thunderbird-68.1.1.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "f043c8aa5dac0d5e2f9da628d6659f654cc39726677424e4b5e5005e97bf202575f569ebdee346d37cc8d4d59da188e6cfe1bd6bf7df1acafe26b489242b4a9f";
+      sha512 = "0f86506a7cf72c75712f6b507fda6e39da9520865dea5eb4fbfdb78531dc88116d4e8227dd91e8f1fb4dff9ed3e4eb7e118b5a4dde3860ec00c3bca625478a21";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/bg/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/bg/thunderbird-68.1.1.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "61fcf864145fb4fd4a05bff47bd23a7be8444f9d067eec246399c3a7ce48db8744ba4a9cb42e28a215a5bb1b336a57c51d1a32e6564f42c8b9fd4dba5f629d9f";
+      sha512 = "f25c07ee41767fc1ec9381291662ce5bf269971f3542b4c2427da7240c13cfe44f006b8995e6474309bb6330e21626ca7e3e7463452ddd5d7e0128b799f6f566";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/br/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/br/thunderbird-68.1.1.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "1cdc9b2a8ee82bb087a51ac013644ff3da5f1e161fca23fb24feae8076cef6c5aff5316f83a8ecfa4f08c3a8642501a333d3ef95b46b8f899ce78b79d027af4c";
+      sha512 = "c57c207922aa0f1534fd6925305effdea2f09ee83ddfe7eed62d30b91494ddbf6ade0c0cba2e7332c876e10e15593ad985deaec769525fd3a19b21d048383690";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/ca/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/ca/thunderbird-68.1.1.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "1b73ca87f3067ec2a84990c7c58060b11286dd653f4b8b4c18a44f5540ea195d25f995539de39b6e1de6cbbe54c890bf30f6d88157e000e30c69f4d32a4ae8f0";
+      sha512 = "4fb66d8e9285cb40cf42f626d38eecabe489fa5311a25ce2e687483b6624819674b0b4a41f486a0ea98edbe27cea2f7f156368516f70afd4f78629aef93cb94f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/cak/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/cak/thunderbird-68.1.1.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "1b2ec85786a842c7554f52b1ff72c4e5611a76bca94c4b8e9a79604d6b85d7f2deba906bbeca355dfd0c5a6c241d9bd397f4e0dfebd802cdb0c35162a02fd879";
+      sha512 = "2c591767d09c3af59dcda7c44937f012cc14695a7744bca49d2b5788cd44953a85b8cc0005efa4db3daeb6c5f553ead9d15239af37b1c7686e5331cf9bb09ee5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/cs/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/cs/thunderbird-68.1.1.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "69df6542c5037815d3a80be764eaa809dd351f75417e4362a258df5e17e36aef6d8f8653429f4218f196ff096252e0304c2cca1cccbf8693d119bc05f1072067";
+      sha512 = "62d58fd817b235d8afea65212f527b99cf67d882a3fef592c2499881d659837ed90f5192111edef9b7d00e37ea5b1becc9fed00eb4af063ffa4ece160996a73b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/cy/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/cy/thunderbird-68.1.1.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "5dc63d2746475f0045f7749e45bbc3f755b187521b0ca877ffab9386bb1bbe9b4fd66f9cc6bdac516ba591e71d71f02a75b5c965a610a3efbee3b59815d8deda";
+      sha512 = "7df64966340aed43c1411abeef18ade4891c2d64361d3952967529ea487dbccf6ec4d824f85a740ed4d54bda188acf9992ba9623a72c139268f09efaaa27eb89";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/da/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/da/thunderbird-68.1.1.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "89427a2b66dbd71cdfbb299a14ce7ed61ab4836e473854ea8b2ec522de64870f8886f6ae86428c9b1c86733aaa4ac7c732a708fccdd70d3e112d2f651c0dc762";
+      sha512 = "7bc7c0b44e981f74119cb19f4d27e260a2df53b9188364c367752ca4fa461b1c003ea58d4eb14fd9d9b64ab1cec5cbef6e68080da180ca6e904bc6bed0dea924";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/de/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/de/thunderbird-68.1.1.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "34130ec994f6ee6a407313ccc61d43b0375046f59f75d4fb619776d5c880993802c16a3b8ec28dc7053b4ae89f91f1c2046da7d884d150aa7c3b65edd1650b21";
+      sha512 = "6879addb03511e1fa18696069251a3649865fa2410b2503f8588d06e3ad8fe9d127ef414cfa977a323468e037f7fa06d7dbf306bb98608ecc21acedb68e2784d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/dsb/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/dsb/thunderbird-68.1.1.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "0b9c02a1e31f8f3120fb9ed520c53505dc247440ba2e189cbc58569be5ce6e0c33de220ebda17754338aa680cf5c8aac3ad7f5da14e0cbefc29f32db2446618a";
+      sha512 = "ab82cc4b35e0bc9bca7611cc9b17cc383e7489f54e976074d34deca5ddf83d380b85ef3db5b35611d59500ba8c421848ca9d0e4e8dc4f8dbbd0b9fabfd13eada";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/el/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/el/thunderbird-68.1.1.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "1d8e2efc2c9a7375a2ce0f2137165756800a680209d18612420581963f13774fc7780ac0ccda24a485996531d1e82e027b42a671f1c8fce5e8ccf0887f72ac6f";
+      sha512 = "b8aba262bd82149ec9213d0a307ca6579c64b7afa084a251f35efb68384df55c220fe71bbef1741514ddd45c284e669fd4062ce5202f9ba91622b88dd48d5304";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/en-GB/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/en-GB/thunderbird-68.1.1.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "79684a833afe5d1025088d6f91e023c81832e9df83751926c5d9bc05fecb7f53d6efd096f55d65d45fa07309497cf5bed2e3b00cc4a80cc1e4ed2a0fe44d02a8";
+      sha512 = "b16a859480d9cc2f2ae2bf644bdff72e5b272a91cd311684012b4f364f7a06742ceac37a1821cd37e5749e6bc7c12b737e35f226c0694710140b154d931d5610";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/en-US/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/en-US/thunderbird-68.1.1.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "7a29cf0a238e44a2051b53e5476bc8f622dffd088251b66d951ad6874fba5fba180f440c80c7d5ae154c688d3e29fcc6c889f0031d81a018b7fd1dfd53f112a5";
+      sha512 = "3046e6826e5df839ec1e572784bf333f72c5deb3dd472a17f0fdae5ce33bad3980a7f39eddaf99e680084053d66dfe83dace788c392ef027116f03ef49e05d33";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/es-AR/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/es-AR/thunderbird-68.1.1.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "d9d62f94af40ba69240b792b3ef2d93efef20b01b4289e992f7d1192147029574f86fa21aed5ad54489d1e5ec1f3b80cd9601e71e2ba9c903582ccd7aed278a8";
+      sha512 = "8e7ddd969487ec21ec2b4ad50e0757595d05f44972427d6c7243da15a433d16b14dcf6128f9ef96711bf8ac5353df3c3fb7a844a8f69ceb3761b023b22728f7e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/es-ES/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/es-ES/thunderbird-68.1.1.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "d720320494b2c8431004e0d1ac24ff8fef83bc0977f44653d0fdab99fbc9a1aee6d5aecd7cbf6002e3746d04156f47aeb57367f2b30f4690efba36c3297fbeb0";
+      sha512 = "7e59701093cd6c34498b9439d50bb1d03a2089366e793ef3d205dedeb14427d0f2306d18c5c0423a3a7d349006e3986d2c4977a996b3ebe3fed5d79d4a00035d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/et/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/et/thunderbird-68.1.1.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "8d9ba13604fab4eb9a3dec8894b04d52f9677d5f82695512680ff03740a66e96786f69476071741c8086a09070fd03786e8fae7f94bb3bec9075331fe4dc144b";
+      sha512 = "851ed5a2289682a658eb69dbc2e5bab05199b08a3ee53a5d57bc8dbf0bc7882170697b1b382c9abc6f8fd6674c132bdf83f2b05aceeb4edeab57eb510f95f64a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/eu/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/eu/thunderbird-68.1.1.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "e40110a94b3d7fb42707287dc695ea09b082fa3262d05b39a0c09002c32722630711f1b0131441c919b23130ed133338239060726cfc9d6c0b49822558081313";
+      sha512 = "b006a9d2ca2510ce975509fa505200e3ad66dbc21a3e029007b01b60ea0021c34056b5972e7610ffbbd1d083e70745328ad36d7c64d97fab9973ffe2458d7c94";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/fi/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/fi/thunderbird-68.1.1.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "d8778ddba26f544a4721b9118ce5726b04fdf09758272b35ca16c14aea61d0b8271888344e742feb4d4e758182e97b01758acd53ad622a66117e3eb0d4a6d336";
+      sha512 = "c08b0567e22048a36ed6838464af84867cf6119130a5c1aa01e093bc7b564cc5d12d22bd530de6aab4e247ffdca1a3757b22dbe2be65edf846026733a8ab6cbb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/fr/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/fr/thunderbird-68.1.1.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "2cd546d40bedf09b58703b0b11a5c9349d702540ae714942e0152a19cbecee51f37c7e217fadfc719ecfebf914f9ffad6b3070bb6471d395e8f5ff8ada754551";
+      sha512 = "0dc66c2136f6bdd0d11d450603f13f9c3822f3a50ecfa0d8f0173475243ca145dd1082fac9f8b9a25e7e6d4e0f19cb127510c40c86bc721074b301536aa114df";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/fy-NL/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/fy-NL/thunderbird-68.1.1.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "03f52224f145917f64e8962b68bcf3810543b5bf0508dca7965c5a385c4f87bc7d236dac217594fdd2a10afe31da8aadc674eaf7b226e189b598011a8b9e223a";
+      sha512 = "685f664ebb6545f85d52604ea9e26477ba7ab6b36b2cb26fa81caccabe42e99c4cf57de40ce0615e830b0199b1317764e90f2d112fde42344606a39eaf454c1c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/ga-IE/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/ga-IE/thunderbird-68.1.1.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "931257466ce7134b9852c2627f34efebc031b3dfc9fb7b5e344665da7fa52ac1fcd12a8848fd9a264a900e98ee3383d3ee6c251de58c1432127a8ce8f1c100e1";
+      sha512 = "ecc63d373496bbef6992dd619d637956ce9d753f2eeadb0b2d45d11c11b71e9018c33d6deed7bddb1781285949dfa8f245b99d881126a8076db403e9036ac39c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/gd/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/gd/thunderbird-68.1.1.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "ee3573fe9af5fae39aa053061ef82207ae6669e6764637f6ddef5f8ee3cebf362dfecf5cf5e9e208392f3fe79a0c1a56aba28f372e2e279b33a1f1e3a58851f3";
+      sha512 = "9cc2e9a105b2e1d3410fbde8d06c3340ba2d50ef8790b31c928385607baa8735bfe02ff6010315c1068d7585ac94bd9fa002cdc27c30007e6be44b37a6ebb6e1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/gl/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/gl/thunderbird-68.1.1.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "73ba3965d522aac8f9d5af87856a7e2f71cb7ed850f240be56eab9426f91e5356810a12da7cb91bc223cb14eeae3ecb89a2afeca48641ce4debefdaed05aeed6";
+      sha512 = "223c36a2ac4b02e991b90134deb0ac6d2a18d77bf0e8b8627b0cc5c0af49e0d9b10b06c05efb31b93aad90a75792ecf4f803a2fc5471595612697f92e1d3aaf0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/he/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/he/thunderbird-68.1.1.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "abd4f47d571037c4340dd3118a517f3421a3e3597efa1ad7ab14cf537d4b4e226144beb0a6c54a45ec272ab428ee8ed95083d31554ef2aa0022712dd832a1585";
+      sha512 = "865fff7acc60d6b4c19bda1ea38e532e96e0cfde18c441970389c34dd1e6f90f635202f4d98457d2373d42cd47cb3462b2ce0a3d7a385593be654edc54f2b756";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/hr/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/hr/thunderbird-68.1.1.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "32a18d8666fc2b7566807a010d94bf5503b375c5330687aa58efc2bc6464e4f910947ea513a6ebb6b7eadef0e552138a5349583e6894b3166ef6f8d53d5cf67b";
+      sha512 = "34c410ab7a1b16c2c172a0c45fcf69d9e2b4462f98f926c391b71eacac351162dfb55f29728627ed2fef28ef7ba40530b899d637690926297e797a3a2be5ceb3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/hsb/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/hsb/thunderbird-68.1.1.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "58794aecdb5f3824e94f2bde4e4080d4922648bac632cfdffbc5304329af64f9e5ef01fc587c4e19e88f206004cc4254503513d7bfddecdb6778de89e4ca6bc5";
+      sha512 = "f885d2b366fdf1806dd8e882fdabf8994e56471cf01cc0c6ef6d1e1d4972186dc8ec5d35b18ceab8f7982d45724544f4f20afb4621499d9543eb98a3d87a9e43";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/hu/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/hu/thunderbird-68.1.1.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "c7881770fc75a6b1eecc5c481e2de134a241b7a497e19ff2abf08aaecf65006f054090a53b028202becf7776d3939742fa71156e6761f981ff7a00ca0d1d7d3f";
+      sha512 = "e66ac6ad21527936f65e82be605d061b9b93688e94ef35d85699e2ac03d639e00db07d113071af08f11ac1742d811d66048e1d6de4ecfc01e25e325788fdc208";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/hy-AM/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/hy-AM/thunderbird-68.1.1.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "80f5fd19da8e07a6d40c19c645eb8fd6964f9904cd14df36374170c4d395146d168728953d1619965f04b3f2295df3d379650e97f8320587816ee088e2f17a9e";
+      sha512 = "fa959b64625773fdca62414269f1b3d0eb369d1e4d3d45b260d4ebfc367a156f70bda5b13d30a0fb4d576ff96bea5712edde51eab62db211fe636340b73999e2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/id/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/id/thunderbird-68.1.1.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "efffdd32086ca57e93b1ebcb40484a3c2243d6b088c70d7b20bcdb38925e7fb64be4446c98980a53738f54dadb54a2d17016adc69bd2a47a9719bb7bb982f729";
+      sha512 = "b20294eb413344fc550200ecf6780c79a919e9d4498bfb97c660cffc14ef18e1d38ad5033b6ecca703467f832c40d4ed4022e335cf3e28e12b43e7c6321fc1a5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/is/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/is/thunderbird-68.1.1.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "277d1137675c6304b28f43273c5a3fbcdf0d2188cbaa38911d784df98b3429eb6d2667b818a292e4c3bd4019b2b682463c2d01faa0a034cb4fc1dd49ba8aab33";
+      sha512 = "99c70cf0baed763feaa41799a51a15ecac4190131d74996101b00e99c2b4b674cdcfd0896573bd5fe4e22a25067f6c0dc3c19ecdc2706e010719d19f97aef20f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/it/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/it/thunderbird-68.1.1.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "6932697d769f98dcd32f3dcda57dfa154314e29bfd2c1b11a2b9a8aeb8395f00fdb0d1c71b8e9d405d1540cde21547a910a55024b799e270759d8638a3d11512";
+      sha512 = "b711ad04c405b7cf0796f242bcc08cb5906a8b4fea4b2655251b135347a4539e974606f88626093376ce16a11995d23c6dfb16fbea38842a0b9dbcd8ce2a93a5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/ja/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/ja/thunderbird-68.1.1.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "034021e89c471429367807f04d79dbe877d0ebc94f584fa6c0bec3a29f279f1d6dfc85f709b26e9d11c8ebcc1f42adb9a458137c032a73ae2b69f7238d31ce76";
+      sha512 = "bad79952ae19ee63892c357ca2e55e0ee220532fa2d28836a15866f7549c82448196ddb51b91eb2abe75d87188fc1139c886c24f66a557f87253c843622fad64";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/ka/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/ka/thunderbird-68.1.1.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "7af1caeda9babac2a4c9b456233e86be32bcd14b6dd81cc18a1874dafe86c5b80099d0ce388a70fe6e74bb7b0d00d3b7ce810ffcbae143eadf6d8c4367567c27";
+      sha512 = "f129b230d2572b25e289a7b8c1f1b4be71a8f57b639d0264cc50068a2767af8fbb64ffc0c4ae7d50cb489015fe9a810e34682cf351f6711d40a333c2fcbf9493";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/kab/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/kab/thunderbird-68.1.1.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "d8e7e7d423f36d40ce05cf1378278c47049fca0ba415466028dd821b12970fb78fbadfbb7b7390ec446aede490f07f979b94ef890a43a710e3a1f66a0c68937a";
+      sha512 = "2346f5acab924faf1eda887f29777dbdccd4569a3163f385dbd3ff8fd7be9767df4c19496ac7a550426784a04f1cea6a4370288eb8d12e3cb93abf8b0726979d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/kk/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/kk/thunderbird-68.1.1.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "339c8e86693a34c8a2da5e47924e545f0fa55d5314db73c6bb23df3eabed29dd6cf47662a8c4e43c381ede5098aba72887739993b4e71db75e41de3d1d777c3a";
+      sha512 = "12a7dfe909bf22a2a2906cd749aa409e023a777defeab4a28d4456e76e84a24d10c8a6cd1dfe54371b110acbb04c89c3259341ebd6e0ad497d175d1f9eb8c871";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/ko/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/ko/thunderbird-68.1.1.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "ba80df01778f8fa95dd32bf0af55afe7fa828a489c4682e6a8891636281031170b9fff77ae4f2e4bbaae9124946b0429e55bbed741973d80da868d94e29991e8";
+      sha512 = "7a3ec307a546c9adbf56a0b41c7b900edb76b0e52a773b486997c1f294abfd7262208a9717936e4e6ccdf109d20cdacd4cc5b4aefec30e82e23c6080154174e9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/lt/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/lt/thunderbird-68.1.1.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "32e93ec3203b70c2dced59a376bf7379879b5361f55a396d533e1f10727482b357344c9890864279eff9aa6d75feb1b36a67f2293c51d3a3222183f62c51e477";
+      sha512 = "3f0cbd3e185594fb16694020788b22aec01c12682aea86ede1052d766da797b24b9b99b8ecb44dee008cfcd7a10ea36e7e1bbd39842fa416b8e69eea0bd831a4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/ms/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/ms/thunderbird-68.1.1.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "29190352e1bbfe30b1e98d2a7fa20268488d82aefbdb4de1f8c2e197ed9f196be8256050f48d71ec6475b707d93d0570002fb175cd88fac89aca5e7140a7cbfe";
+      sha512 = "cb70f35114b3fb3c0324b80ece639a4bf733abe15b74bf0f04201e272703eecdffe66a2cd50e66d986332b40d3ba7dee04cf7624cea48e9925294437def77853";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/nb-NO/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/nb-NO/thunderbird-68.1.1.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "8e076d0967b0b79ac2cc9ade63e1bea4d27db1c050f792f1d1da01758a576fad884fdda32a02d58d45cf4c615f38c44bebc80c6e864ee076212f280398602892";
+      sha512 = "3bd4914a8b0cad71622a79e34d182aa7c1aa115780980c29f732454ec219a19ca4d1af3f61693595842b27cac7c64138c094dbb13b0329950d79ef8674ea610d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/nl/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/nl/thunderbird-68.1.1.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "7bee338542f949d86700d9b67d26c059232ba96cba991e491e6380f1ef914e7ee2747c9c73907e393bcc83c7f05ec6e656d869980c2c03ba0a548ae120793030";
+      sha512 = "3335baf0974932247e73704a5272d3bb4b182908a76e9e3e0f15bc0c40fca7763a3fe1f4303b3f3374a0f758bb00d6639595b8cfe9c03999f3bfefd8b6f0153c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/nn-NO/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/nn-NO/thunderbird-68.1.1.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "33b67ce4100a61461a238189e06b623a067e5f1b550fe5f20b5686f597408f3d7eaf45c92bbf5ffe58ff96c99fac9b9e282b024e40829d4d9d4422e54cb7293b";
+      sha512 = "b9c93af9d330bec6f7182163fc680161a138a99691897263b74e81d9a30c6d892c4639aa28d0b311ac51800b72de9e092065ce03cd7683b86bd571c7e394a49b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/pl/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/pl/thunderbird-68.1.1.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "860c606fffb3ae85193b4c919783c94ea1a84c2579316cef98adc247d7d595b01dc6c2e84662641c7285dfc65097f710d7d2605efd960847739ab4acfc296836";
+      sha512 = "3f66d17f0e231c608b1f45dd51cdb231826a3159ce188e9036cae8f45486d38d95d9878429dc1f15a90df3a91069b4c4c5d64ba9d35ca071cc7c1383d6c89239";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/pt-BR/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/pt-BR/thunderbird-68.1.1.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "3093207072a79d9556c4e1ca2fa75d990a3952d583f0a4fe8c850a4911b1af19e3ac08a357d239d66b22c397f6722b8625fee03ca1f2b6a8f21dc61fca348541";
+      sha512 = "dfa439f4decb4bd22945584772d837acc79ac9227763ffe061a551d334b4ab5b8479516ece0c32ae5d7b05c7168c7ab32b390a83edb61f5d33e20cad965e6b75";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/pt-PT/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/pt-PT/thunderbird-68.1.1.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "5d29ed9a8e8c768a3749801dc191b27aecf7994a4afa02e70de823ed1eabe4e936bd7686830359aa48321681396aff29ead762ab28c7bda6f8aec36117e8cadc";
+      sha512 = "79dcbab7997b1610a33db0654d5e2a831e63dc1e5be7794105bf3d9739d749b75ee56a9892c112d1da5fa5c5bcd76b945b1fb7532ef2b075f1c09706abe64165";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/rm/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/rm/thunderbird-68.1.1.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "cf342acfbb9ab92b7bf483ad3227730dc3923ee107ae42a0fb05c6070256e43a4d3c1647c1fa2c4dec7adbc8c018a185bd3d91e598d09eac43ec679d3c25063b";
+      sha512 = "e79789f61bd59fcad82e25b62e4a324476d48297e826118352f9a8cbfb3b6807cf565fbcdc49fb1c90f22595f5d5e9b41c67b994d83a15f0bfd8b98645552b35";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/ro/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/ro/thunderbird-68.1.1.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "ae13fc229198a5c5327dd4d9d948f1a5eaf699877c48c1c961ca084e79075f479f4b270fed1c9ce22f420fecd4332a30594d4d2dc87bb114d1e3518e3a4a7071";
+      sha512 = "77e7deeb8e0fb2d77e7a672d0ef77acf171b602036fc14f8685c3b247b42d953dc18e816812067d025f17ec64daf1895508c11ce27de1f55cca7474377eadb6d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/ru/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/ru/thunderbird-68.1.1.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "f51b1f99c16af5f24702f0bfd433c71c7ae899ded5f101aea2dcdc16f1cc9e1b7b18f26a4fd0ca9296c5e9007067e35bd9cc322bddfe07f58795147547fc0c56";
+      sha512 = "74993af15f9afbe5034966d2c5ed17d1f1d43a47422acd7e671b4cbb8176ad845b1bf26d45d81a05e6cb4e6f7cb1be0dcec38d22ec4ef82aca45db49a22de1f8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/si/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/si/thunderbird-68.1.1.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "26bc664b1623523d644ee231666a4489421ba31d1f0b52b5f4a4164343672333070c3781c577e370e7d97d42b61783077c74d1f38d37565776c752a2310c3a1c";
+      sha512 = "a2feda066e1cac0e3d4e9ae5837cae50ec864190b9620694817eb7659a1292b488b820aefc2c3e11393ac52934827c368d379f9a74babe53dcbc48c447cfb538";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/sk/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/sk/thunderbird-68.1.1.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "46470afe078d1ef2e48b3732fdc02ff3c9104a727b4d94cae1b9c54f6d2b4771e5784cfb3e6350ab8a205f8ba010a82a2b2fe92313eb351496a19a99df75179a";
+      sha512 = "ecf370133d0fcda81c9caed13f5307bf27b50e85f255a5c13cb37da4466ca60cceceabe8463dbec3b2e4e7349c92c759803eb2ec01448dce1778d2bcfd2d9fac";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/sl/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/sl/thunderbird-68.1.1.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "9bb5b0c979fede4dfdaf8f4965bfed1ad78d14168efb797fc216ac2527434047c3e6b65eb9dd1e607f55b22f6f28e49b0ff58c272c0708cf5ae1f9ce96b2c796";
+      sha512 = "2fd49d0f88c145ab65ba3887363b969da2b6ca141de373fe7b3fe95cb1af27cd4fcc1e21b146e241c312862736aebeb8ddf813548e7e5e133188eaeb94933124";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/sq/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/sq/thunderbird-68.1.1.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "440870b75e47aa277c5453bd997709d2f9e59e0aa86e2fa7f5aa95ad39b139d8e9b7b8a7dd44765d8f8d5ec18c5ce6a284ab40d4aca01b251bcd9e2183be4976";
+      sha512 = "4adb9557d053c8485dd2abb89285c3559004653d4200025205758f54bf349d79f4a1db8229af5a2fbb7598554e47ebd7f6b1823f3a1cd0bff53a6080d17ed363";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/sr/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/sr/thunderbird-68.1.1.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "bced610dbc95e7cab982f40376fb7cce8e672f8533a66816f01667ba69d73dfcb00e95a80b42273c1ec7ada9cef8c14af1c426cda2f8425e3f77a3a0e393a611";
+      sha512 = "4132d8b2470b50d3565d4ab32ce23eae77874b6cba8451c06a10cf5e10d0f1d03170004985d61cc9d7ce4f1c5c31f017b7ed8392ac070e63227d996b0d9cabbf";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/sv-SE/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/sv-SE/thunderbird-68.1.1.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "af139912f563710b05c274d1b89012e27a3997b582d379e3561011fed7c77994447c3054433e0fd4b5db8417d5b43b63e840d313cef1fc7a8aa7baf0655982e1";
+      sha512 = "7d24c7ab6f7cb5fd6cfffa21b1d55040a626109ed2cff7859dc8c28b78b2dfc40b7b3c9a5ed12aafbc15368f294990a35d172bfa69aeddf8b65505f65f38898c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/tr/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/tr/thunderbird-68.1.1.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "50693e4638f8fea5a7f609924ef65c8d7ea4f4ffff79320651481e1a7f5cdf69edc2fd987137a0d655077959cbd8f32218d2f78fd55790084e2d46d3ecd70cf6";
+      sha512 = "17393c5c522cb0fb6de9c9fc13a2ed0743f995cb51d852ebffcaa03e59b39d93c2137e62aadc70131bc8fd61f2d6c3c70baddfae299e2244109f35b4f7443572";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/uk/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/uk/thunderbird-68.1.1.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "c24943567c110ce8cff6da066d0bd0081621d8c397e6569c57b63eef3098963a55215083aa655fa9c98adf9babfcedecfd72204c1a68604c851e1a5c1a1b0102";
+      sha512 = "e8dad1bfa1b118141e65198014cc405a3041fc552cd1bf4186b22877433805357fe39a5adc6cdb9b9afaa86493442bf32ee73bf2c2859f8ad535c7996744f60c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/uz/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/uz/thunderbird-68.1.1.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "e02a86c848a013a84824246db3e29e889e1f5cc1b743a3a9b567b914a46100a808779fc13b897b04e8c698e14cf474fcea907e25e937e5c8b4ccb997f06d8e85";
+      sha512 = "5a99a2ec1539f452db613f7fef10d180bb57c642e0098ecb234fe03521f1ac9c781cce50eb025d8a5adae280b466dbcdbc08be08a0106c6d8ad99ff250eec4e4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/vi/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/vi/thunderbird-68.1.1.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "de6d6794796f5b60cfffa9eee92906237fd692b21ffc3925c7866ea9660d26366f5fd3c847b2dfecc418b631c6241dad4e509e58e391c414a37587c6185c2655";
+      sha512 = "fc39ef4d2bdd5791cd8661a522f74b2a1f9f3b534968f10b3abfaaa287a160d01debc56c9cd416c35e50b38f80d2a1b5ba10f4134e9fac3ac32748e3891f4026";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/zh-CN/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/zh-CN/thunderbird-68.1.1.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "d5835538fe615544a07e93a2088b65eae6c3c36b75ca2b9f6605974d929a36dd226d848e2394611809538106f56c1703ebedb5c0776593e998935bd322a4e27d";
+      sha512 = "96e2cb653a93d788a7e721bf6677e7dd50ad67e4e173bcfc23dbf190440a35ec2349241adbe7bb1a74c4732f3990a15636a0563448cd90b7526c06bc106d083b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/zh-TW/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/zh-TW/thunderbird-68.1.1.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "9dfaa7dc83725fa795cf1b2e45e7af760dc6c38999b05a0968e46d4b5676a4b9f705ebb63ff400ec6600d83a6be26eb4c2638671a539b59b6ea37002ea9b97ac";
+      sha512 = "c9d720e70d55998343c4d20257a0385e3764da751e57eb992d7ddf2723f565099d6e8c880ec009f9ea71609ddbf172a8ee7f82e603f42529388d0627e882ce79";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/ar/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/ar/thunderbird-68.1.1.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "17733249e5c2c33899fde89a5b2dea2592fe0414419c235f4d853917990a05664d52a05f1f1a290ece4bdb3646008b0aa0af1e495e5b8af0c08f5b9962bed5aa";
+      sha512 = "79e4d01a88156ddbc1db2afd10b83e6e069a69df8cedfb0e247706aebbb8053ae68bf44b0ab1849e859ae15d8a6332c4e795033ce7e3385210cf9c12e4f3c37b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/ast/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/ast/thunderbird-68.1.1.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "95b40d08b988146db7175232c9d9be92175cc3fdd73ba5e205e6543dbdb9e6e33579edeec73b6961a7ace574d3466c162d0665ffbd3705de15b7ea4cf6d7b77d";
+      sha512 = "72f4ac14a13e364e4ab66d9659845abd4be47f07311cc79d71e05dedea1aa796a8e6d5772faef836e2eae410c1f8ea2b7b1bb460ccd60a0cd2bc7d48f511cd2b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/be/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/be/thunderbird-68.1.1.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "d2f4ad38d81306c1637ae8612221bb462409373b3cfa70a08d0f2872aceccd8087835eccc014f4009680e9e36b6cfecc9bcb95328dcb8f6c9ef11c432e2d3c6f";
+      sha512 = "aaef151a1ac5b0f4adcb1d708925f5d6452f04fe3f73617bd2a5fd0e2a54e48229c9fc27ec48d5d9ebe8db9e1925b2df7542cd543cf9f312ea7e65ece10d44ce";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/bg/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/bg/thunderbird-68.1.1.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "f2c74a0609eff929202d13719fce167577b2ae0e1a0c98b75b359bfcddcb531907a466e184ece24d904bd592ab41654f2dcc2500defece0aede3be3826dcc8eb";
+      sha512 = "28c9f71d5674a21785656309f40876917c27d979f082269f8b32f1600664fa10a3689abf856aa391cb42776fd2d2af18731e4af22fb1c5e75f3616c44772e54f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/br/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/br/thunderbird-68.1.1.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "1f1ff89743c398443a18230ec0eadeb51a8d57633bb7c242f7003e472b0ea206dde50a9d20880ddfbc9ee36a3ca28135662ed21d6e8cb779627120c70f0aedea";
+      sha512 = "08d2e1186d18f3dd80282597927c7c747152d13d2511eea5169b2b42eb4318a817261a2518509f8b26ac83d770d0e70e3ca0521fed8c3f253b5e6f211424ef6c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/ca/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/ca/thunderbird-68.1.1.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "608232b5bc7a93cd786d84662e59e3b186bb1de51cbe0f720cf4e80e65a93e09a24f06abfba63785c0cdba997a6fa871497998f1953f57a98ea6b9e224235ffe";
+      sha512 = "d6c0a548b4eaee0c0ab8f7f03e3cf329d353f7e0d2403796b7db8f1693afdcb8454715e4d0e0d2e1f074cd816b2c9ec9be5ccc76b4d7f0d00f8615bfce4f193b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/cak/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/cak/thunderbird-68.1.1.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "5e77fc07093e5b2cbb345f21b48415a5c7d987ab0a82540f398ef33c7051f1917fb448fe23401ec3683c87379aeecb287be5ffcf6a124df9a464401f242d1e3c";
+      sha512 = "3bd32854eccddf411c294bf0dee5f3d945a1016d1ede639ab8c1e2e86ca97b9866f1e4149f1fb0402fe3ebb148e8f34f7b12ede4853c6cd2edb87d9e822d1e27";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/cs/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/cs/thunderbird-68.1.1.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "036304985db3ecccbe50a9b3d8c19dcc269f7c6987c1101c9443ea5fb2d14e71390ccdf6f0000c972af631863398a02cba1c05566c6be4ab3e79396c049e0e16";
+      sha512 = "33c87e9a016097991fdee92d5f8813b4cdeab355ddd5d65d25a017640bd50dba94d5936148e0873ea596fdab2e214eb70bafeb5edb6576397ba300eacbd873c0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/cy/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/cy/thunderbird-68.1.1.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "4de3a065234e921f9ae7250409ba24bc54230af61b4993c3686a77e1e165874995f7c60b45ab136c6b3f3047461e86c19207952b870019df06dd164054b65dc2";
+      sha512 = "f28f46b5d8004ade5b91e3fa10659ab87c85f33faef90c534a5c4c0680d11dc0f013abc28003b1a7111b4f67040ba54a4616c85cf9c906e52048ceaf6d9de7b2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/da/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/da/thunderbird-68.1.1.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "69e190f9263438c88b445821b56b93c052613fd67a1f1918b135c719e4358bea46d3a79bc135d50b254fa686d8cba013daf89d40ccc5212062cb177bdab4d667";
+      sha512 = "21eafecbc13e8f63f36386a64fd947ca566ff6878e96a6ccbd124e1020a62ecede74f8578b56c66b13ef63a4197f527d406aaea6559b833017bb3e1931052dfa";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/de/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/de/thunderbird-68.1.1.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "ce4cf8c1e11f4813ce173bd08ceed9ef26b2117771ca87ef16c001e1a49f5385a6a3ecf4bf7561d48aa6c7e63d307c2fbde77ef8a51fa0aa9b66f4f98386bff3";
+      sha512 = "5c7c528fbff84823ffa46300081f2d5352bfc5316af574d39e020ca53e9b61b1c5784ec7b863fb095645d908ca18862610babf31f7e094d1e0280ce8069573bc";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/dsb/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/dsb/thunderbird-68.1.1.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "9007c92825220ff9685c599b1c6e39fe3e96888621ce5dd15f5ef9d812c09a29ef72a6eb2f68cd8eab78b5519b6c26cc957ed04f3c9798ea0305fa4f5c8bb962";
+      sha512 = "f18ab27c8bf26e2ee2feb2007cfab28622c9df0f03facb20f0ee581d6bc33c67227a2422f9bda7edd5cec8fc1ce0096764e26d35262559162a3a37481a92ac3f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/el/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/el/thunderbird-68.1.1.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "e619576813260ec68a26226a83a540c58aea7e87d3b0ca35f6ae7bd9e0dcaaf54ab12f57cebf669060191e3affc42df1585a3ce4aa18f82f6afe469b85de495c";
+      sha512 = "f3fb8cca78a51fa0b855c8e112625af364b59a6ef2c05c7712da6451790a8749f26260aec716943a785c6006582977ebd950f09cfee8ed9041a875f9ffb632f7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/en-GB/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/en-GB/thunderbird-68.1.1.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "0810f25326d8a08628aa55d5c15e6144f833454019087fa20f2c128bbaa4380f9f2a07714b0d8ac0f3fabb5b6065e7b2efe6e80975e5e47e81749da9f4e6be94";
+      sha512 = "5d53ae6575e6f3580dab921cc2ee11c00834fee39cd321c906b81103fa14b82e4e129d48642aa9b857921abb11a6877b774ad685069a921d417fd93d25ab2198";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/en-US/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/en-US/thunderbird-68.1.1.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "adc1dddf36116435b3948810cd9d647febfc97d62443032100b0f2d722913aa051d44244f057c29cb8c6cf494fc67b3044b83ebfd5eacbc36b6cd9c88361078e";
+      sha512 = "9a4ead1f16785db8778ead96eb4ed21c5d52e9d3669d2d3bbded0d616e6b57d0649347b067d48437b769c51093627b47503408aa109dc899d62ace8fed83f62f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/es-AR/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/es-AR/thunderbird-68.1.1.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "a9433a5de45477f432c6906b640909880650443e5e3a65a839e9c055d887befedc8c22c76675700886dc128ad190fa0ecdbbf2c5f18e650219b33a78105eac63";
+      sha512 = "15e85f3f51409fac915b095310158a5313dcd82f66470c85874e4306f1efa70e63bc4b39b615dd8e1eeda22b863c6fe0c5ba15bbc6dd94b6fb4a0859f22ceea3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/es-ES/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/es-ES/thunderbird-68.1.1.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "a128e46d7d2cce449a261f857a221232d2d89a7d999bc074ad5d1aec741f766516f3882cc2603d6284458208c2ed36dcb81e214039222c9c15450e96e73d0283";
+      sha512 = "b136302034d987594f65e68564eb1e6b1713d79be39e7b90f8ca73c74faba06d97afd60253ca34f15a415575c412be6ec1113598e86b0b7c4d8ddba35301cbe5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/et/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/et/thunderbird-68.1.1.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "521d004b432fd27ed6b167263253b3a3c89aa22ee5e06a4a434da6948a8c2af4fe27e17a1ef962e7caedf7d15ab27b98384545069abfaaf41871cd5878fdbf72";
+      sha512 = "5a344c70202d884827231d0a7ba06703c7a265fd3ad59f1442b7d4bdb57fed06b8d6aabff4a5d6193a7b62027e243cfd27cbcafcdc1ce97baa7e0f3317f64e49";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/eu/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/eu/thunderbird-68.1.1.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "df8afc11cddf0c06d05bee455833bc5d786789a709baeade7b64e8f815c42f399fca1442a8b64271fea7e45fed4408ee923293cec953e0406b093f0b94120861";
+      sha512 = "ae417ccef00a3c5a2fd33ca653d35575126d18cd991ae32e25bbcd8f6d8a85f282929c2f2c78ae0f12ccf85a418cbd9518f6d28f89d6bf38c41d3509801caf45";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/fi/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/fi/thunderbird-68.1.1.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "51e05f21e01dfa0fc3c5d0463d80e87a38e50dff612a7632f9a5cd440f037a438a555e3640cdddd794ebe04eb2cc15c549db7ac829c91ac488b73b66808496a9";
+      sha512 = "2046eda267c49edb5bdf268265dd02f638670c8d6f1310fcc496c1acab2c777e39c5a974dedbb7bb1305f7a9ecf11c64303f8857aa7fba66f76a62cb89e45b23";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/fr/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/fr/thunderbird-68.1.1.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "9448860f48fd93383a24fead6af1102af855270749e817f720e2afac152949e47fcc9ce6fd0d2c60d3dd958c855af47a54a38e85975acf05496a7f67d2af72fa";
+      sha512 = "f483c884064d13d11d4085a72c8805b5c10564f2926182c649c5422c31c8014a75948d2dbaa612f29b1f64b615e6e9bbdb2c4c1c406c8b57f13498ec1f29674d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/fy-NL/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/fy-NL/thunderbird-68.1.1.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "e9a27da8b86e2ec3593056a19001dd656b8bde07edc918ec18f266de377c697eb0ea3a10fedb223e58db53ae5970d2b9753b46fa87db938e5568283ba136bd2b";
+      sha512 = "b8fc327bb911c25be29c8ae5a664a2b000ee08183388dea6b75f56105365f541a5f81f6d00089868ad20037809c2e4a33dfcc988567fbec187f41abf66d4d6d6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/ga-IE/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/ga-IE/thunderbird-68.1.1.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "b346fe3863ab7944ac33a8204eea7a458a0131c879eae26be66928bed930aa29ba74a5b0e39aa939f0320fb8e5fb0a5e31599235daed526f920b92240763633f";
+      sha512 = "4c456ec8474109c7b136b14ba49ec8b155f6b7194ca4db618a3daa7affb7dab4b757a8536798cd59241425f4b2404a28f6f3d99969beeb9448192a8faf8fa324";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/gd/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/gd/thunderbird-68.1.1.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "e921a3c2720aad333febe7e1d69579eeda4f641fe32c1b6235fb6c01480ab7c87bcb47020b0dc2e4225746b277d8c6b288aaec86125ad48da9fbe3452f30e01a";
+      sha512 = "d126c7f9c29102392c8bf2643130f7cca7add29e60d540bdd344f54bc7535b10e70b224ff6adb0d1f8eebb86b933f1f232b768ce65cbb0cda68347dccd8fe373";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/gl/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/gl/thunderbird-68.1.1.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "dd581aab660e96d7b0283bacab74d5635610301fbf40e95bc85edb5e177492f2a9c786a4fa722024fd57e2f2158fa339c161fba605ae428b5c03fa983b70d176";
+      sha512 = "35c855e9d0df8030e455af1fc1c704ef12f598f598f15b2951b412f9147ad5f3dc129c7ce7b4d3757ab67773e9af75459bc4acc07fdd1390c0d080214840d903";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/he/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/he/thunderbird-68.1.1.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "2ab68acb57eadab585bedaef3f79369cd7a0c08030d24bc3361a0e08ff796f28f345cae15fbd78bd1fe2c275f8d4fb7058194ef44dcddd3e8f92b69f92482321";
+      sha512 = "361df030e5bd3e876865fe727e41885cc063f1091e0fb6ed71530aaf2cb88b8ed02c6d762939668cc2bd2fc7d861ef0e737dbd7c7ace9a859158c978f87fa6c3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/hr/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/hr/thunderbird-68.1.1.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "975be725774e200f39b77cbb16ad364fb5d901ef46a85da9f297b61140e5be61cbf48de9f2ea0236d4580a27be97e87c195b92d9286133ac5aac2a35b1b7e5f7";
+      sha512 = "92bc3303a6a0bfde8c287e98593f3a88ed1b44257dd660cfc418beae15780c06919509c48498633ee85fff990ae447f71916bffbdbd1a5eb691fe8d880052c4c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/hsb/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/hsb/thunderbird-68.1.1.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "5d501e9b7a39a518da0a82c1a89f398adaa449753b4dadc6ff8fa610bfc152016e6f70c1a944cc85e72fcaea5aba21a04d5abea2f2e045ca1c9212a37d31c461";
+      sha512 = "6a18e62fe60fe7694fbe305a65a497987934af299c83ea0410b08fd139cb988640f511595340b4522fa64550616864060df7423bb0e23696a29dcf274c5987af";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/hu/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/hu/thunderbird-68.1.1.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "4cf2c82e4d965c3ff51e40823f876811834cf7602d9cca30011346c2bdb6e222b7d37f28db79b6507350cd833db312aaf30c13ae245c93a6b1118d9abb132571";
+      sha512 = "f6a4e4844eb10964c95e0cd6a143128e970f40bda283d63ca542ad707c8818c47106e638fe2cd0e5c88420d31fcb7dd86888fa764ccf4d6de009841dd06bef65";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/hy-AM/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/hy-AM/thunderbird-68.1.1.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "d13d91b889903bdbbae1e12b96f07bfc6f5a6cb734a45fb87402ac44df9fcca703e067b1d1554a41c9b7e2e31703021eeeedd3ecd8b27536b548a3b2d89a1f27";
+      sha512 = "1ab27605d214695d3db36d337ecd33853cad37b2355c5a5a89da995c3fe655f25f3a1f7e01a9903e5628061bd65d0fe43c49e93558939d152449a81cc91916fc";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/id/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/id/thunderbird-68.1.1.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "7c199788cead727742dfebbcdf6ddfe4491be31a3f4dcc7ae05d25413101036cad7fae399f6b390002f55f60214ea66399d5bfdc515557351b309d174b83fa55";
+      sha512 = "330f0b9b8c854c37250679ce6e9cf3882153dec717b3b0e6a29524967c5e75c6c784547e9055aae232156c6e0aa0cf833060ea9e192746185c472b1289c662cf";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/is/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/is/thunderbird-68.1.1.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "33ac7dae65efc4792f92fed4eb0062302ef601f6bceef4d1eaa6b4a7fd75427607e8ebd7f6df70073bcbcc89f057b0689e365cea960428b5e57f9f1e810d6e48";
+      sha512 = "e8856b72d2950238ea82095fe96fb93872ff6ca8da2ccc666386ce08700f7fc137fb3957ac75c90872b7db3b15095892a3bf39d4169d364c93b79abffcec0588";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/it/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/it/thunderbird-68.1.1.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "231acc8648e2e377a8ca6d22c273957506fd1c21f226ddd681fd3a91940cb151df4f0eb05885ec0325629bb0cfdd3ed500af6047970b43b898a37586e4612502";
+      sha512 = "75c7cbd7659f5b2156ee6ff05fad47f8c0e9e41461a79ec1f9c35bf15d696f9526789a6192e3dc32b36851d17958351f65f76be50ab70309fd8bfedfcf579e64";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/ja/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/ja/thunderbird-68.1.1.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "90b8ca0d72fef8fbeae34027c95e3391452d72b53b40ecd59b1d2d2b07c6ef2e4d787bb2e927bf3d4b7837ea4cf2f10a0d3ccb0a6c98992e6fd857717c8ab04a";
+      sha512 = "ad790fdab0bed7a4828e3654999e3c3b04dc51f04ba4ca12e60d9c70b44236e6902b0dfaa70842db661c5fefc28eb7f2045d78ff5df82224d7e0550dca516f95";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/ka/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/ka/thunderbird-68.1.1.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "271415dafa136d326b89ea3a58b852e2526c86f45d63f383fa250ace14f71b1b915dac3810a04507d9ca4437c640065520f9f3d9d032cb7eb84aad1f7b3517ba";
+      sha512 = "371fb961b63f170ab0521bd2fd590244966a8ce9935f5352baaa244922425ddd46f40fc6f8d5512fb7b61c12d01e8d050fe53e77bd7c69f7b6a9135bdeb81e3d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/kab/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/kab/thunderbird-68.1.1.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "c0b4fe65e9937bf897e7512ff6f267993c324c772232317e1314ce035a282f313b8385eee8c13e7b131eb0fabaa1b62345fbcd6289a5172d78aa3abf7f716bb2";
+      sha512 = "a1e6fa908913e56e17272545765092f3cb32d6f5807db7b7bf02d3eaceac37a76136cbfdf0c11e274c7a59b8a1db8d8b54ddea6bdda75d0b1e9f869eb62d8fbe";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/kk/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/kk/thunderbird-68.1.1.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "b8c7ddd098540ef8354eda1f2a3a06987d11cb7e0c4af4e170d507ec540e743a7d2527188c18e045df99576ed44990a800e7f7ce212042eb03b02339be9f86af";
+      sha512 = "2953c0e23c7153e96cde831a607e688540522698649bed526066bdd527ab8024e6007842ce8cc2f6681ab6de81250e63f52c3a0bd51f9ce1a495d19f2446b2e0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/ko/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/ko/thunderbird-68.1.1.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "a33dbf6ef3aef69644261ea1c1cf3986fcda5c9d0b28996c46e3d8e53d3d7f8e9e6b62f1b03f2816267b483a84295ad99e888cf76c5c192e9a9dbadd78ce7d8b";
+      sha512 = "bbae4b68e771c5416285edf8bd5e8d9f117d5bb9b5da4b4d2d4a90e89dc74e0be32b53f123426bf356749dcb3077f3c28fff47037df2a4afde90d08899794e01";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/lt/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/lt/thunderbird-68.1.1.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "3bf1cd599707a2728fbf46beadb7d8d1832c0c271e98647ac7d2de1be78b8c1b5d0af4ac246af01eaf4b2a57154f6068065fbbb2019346b663cafeb40edd5b71";
+      sha512 = "a074abc38275119652bbd69765fa36d3865253f32ca7efaaf628aea94ba6316fb581d083eb0284eeba530bbbd8f2613ea43ef6cbec6090c377449e16a1cab272";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/ms/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/ms/thunderbird-68.1.1.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "563c413b21e2fda6f412a1826b1191097d4df1ade8d12e031522e122bedea6ae23a2d3b047e870030c9b4901a5869c9439107d8a7ebc6380c758bd741e0b4128";
+      sha512 = "a956870831e313917eb15e836aa1c3b5f774afce7a1962f0041c07008b627d5dc12821c091e4777181a15de94d62df565caff10c620cf48d08db0fe2391ec8d8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/nb-NO/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/nb-NO/thunderbird-68.1.1.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "c9062949faf5cbfe8bde2b0f330f76b438e1606360364a90f0e35026fd52952d6aff7c6925fd1ce569b24f41409d0b63540dbeb0ae82260604d5faaee723bc2e";
+      sha512 = "425ba2a0e7401d83a4f98389e108eeb85ffafe685a748526012a47c07768278879d0a9795da0bfca5a955f607afdfb5243a4a5980d85d0f827d0253c5f84daa8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/nl/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/nl/thunderbird-68.1.1.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "b8b385db8fd2385a88d12c1ba23bf812592beca14e44d9c33456ebad16a40db8e7d886779565a4d617fc56f7a6d651dc8da171b1c727481895d05777bc0eb3c1";
+      sha512 = "dd05524929e09c8459ea9bde675e645af56e516cfe087862d4b869401b54fea9766553de4edf340ae936d9db169861fe655b3e258cb2f824237de68ba087088e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/nn-NO/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/nn-NO/thunderbird-68.1.1.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "3c88ea8dffc71524402416d9222c859dafc5bd5799651a948bb318a7d2f91ca2c00fa4158e6019949f9a1d72a2d85a0c9d2a3c9a8caf052e8743fcb5dd0dccb6";
+      sha512 = "5d74324cdc78563e109f0dd151dd90133baa3d93ecd7c24e3ab8d0b36a402f524e97c58889a4d5ad2bbf5ca08d785b45c660099777b9706441bd7fe5b8c508d1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/pl/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/pl/thunderbird-68.1.1.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "c6ba1f98ebc44af63d8cd8052fd306d3a8920c33eb5b3be563c0fe203d5d07806bc5db7ff88847c3ee2d82c62d0811a086fa91e8253eec3a3977091569f40a20";
+      sha512 = "09521b3fb8f49631c318f6bd1e8bad27f9b75994c3b1e8b57014d9b290cf6cf338ea30ff46c6b07fb2dfd456fbca18cb609696341417bfb39740253be2a9f678";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/pt-BR/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/pt-BR/thunderbird-68.1.1.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "cbd4c0f1b14cb04b98ef6f2e4ce53d655b58ae9a11047eeb1959ac1c4ef4370507194dd1149372fd1dad4ceedf91c39f3bde4fdf07b5d925f27dc8eb5041be67";
+      sha512 = "9a5c096a5e2bf3d3446c0de33fb92995ca71e994e40fb5b66001f7afe5d0e196a7b3b0088b8e51fa8e079af42095c321ebf9acf367408d9c99c33ecdc90dd57b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/pt-PT/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/pt-PT/thunderbird-68.1.1.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "ec08c628708a7bbcb00df2122e5fc463e1b0e1c031e9130369ddfee12db3cfe9219f7939756fc47abab8514c6cea642bb653ee420818ad625a33caada7005993";
+      sha512 = "c19d39ace2beb65123f09129545cdddd303726c2efce12b57f5919435cd6d432c592c5fe48f86ede44a949edf1a1a995b3094f26266baf18cabb79188b00ad58";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/rm/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/rm/thunderbird-68.1.1.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "4520dfb1529220e40cf2e1aca44cbc2af750fcceee3639d7ef334e9488034b18bc6e73b5b7a37204346da53a44da099f4f7f65d5b3dbdeac6d6934918c02cca3";
+      sha512 = "839f4e56a788762578de09a74ce8974573b575eb0e0f641f36d2d6086eae08e2a0cb6a610f4ee2ce00db0b8f0549c9cdc3ea433ba3e0a1eb5f6a9093542b94d1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/ro/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/ro/thunderbird-68.1.1.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "49e54dd1cca8038ab6c34e9980b6b36117aa157b6555ba440f0d7c8c4d909253989b9a50d25c7c18529136fa26d0ff94474d17e43156afba171948c9c05e16a6";
+      sha512 = "0ae5d25b55971b41594676678dfeed2c5f0c89c3f4c8b2649ce2a1ae9183c1518a07410e46b9fa86d5f09f18f53f4a6c37ecf1e4e72d6414b065dbe3f46d0d6e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/ru/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/ru/thunderbird-68.1.1.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "6d297592bcf0c9b97c40f1053a95385e6c2510aa0ddfafd25085bc6a954fb5460f59f18f65477d8c93af829cd2a053b389b5dcec35a7ac7766d72c29064e5687";
+      sha512 = "fc00117c0caffb90ee70583692add1a0aadb8a03970c8cf501aeb248bf4abe1d8d8046c2c170b42248d0f1f11241067508e35aeb0db320579882905156827527";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/si/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/si/thunderbird-68.1.1.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "f602557748517324943b5ff276f4efdeca1c5083662bc9f0b0bdba8c10510cee834b3883870a98d51d406f58e338a09d0589b3bc0891bfbd88b895cca02fd360";
+      sha512 = "6345bfa3abf1ec899320696b10553f0a75b48f2f2dc317c5d6ac10ddaf09a7269353a73aec84ef4d7501d064e409d434054711441da3698f1ed5af653de4970f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/sk/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/sk/thunderbird-68.1.1.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "7b6980d2b5131bd9a43a29efa2f1e97c60e15410a63224d839548d777fd8b4c4d65ccfc7756227cf900f7420b12231c3d48f062133cb6f21bbdcdcdb179f2e47";
+      sha512 = "745514c55e85f71cf07bda02a842c8452c454a80a10bfea20e9c5750f1702809b4c589a2c1d3127c599a91ac0fab458de8c4d66afc8511e64278f02638fff63c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/sl/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/sl/thunderbird-68.1.1.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "ecc38fb4fde66b7b213b1cfeb8ab170b3e685d0a28c7e071e19a85509ec74e79fb6eb61104c47f0eef1a77e1e1a52b292469a364747eeccc701c522452c58351";
+      sha512 = "2449333ceec017fd3b6e3bf673c3aa553b9c52c07a09e02e773e42e2c6acec60573183d6a09c5c085ed9389c1d48c4f02acf50d83499421bedb3094823ddb34d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/sq/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/sq/thunderbird-68.1.1.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "3ff668c6ed28bdb2f3d388ab8ecb1bf3b2b38bb29046b8559f7b9f9c6fa32db226c4620f472ba5a982b473e3e3f4aee04aa3746e57738b512dcb37fdfd5ecfc5";
+      sha512 = "7a2ac8f6c04cbdbc222ea1218dcc64928b6d5038381a7655db34cd568717854197fe4b77645b2ea07b4b76a724c2e8196db693c5e367d09367edf1af471f358e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/sr/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/sr/thunderbird-68.1.1.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "4c71511375333802f903cb632963933054a969c02a3fb23f4416e0cb3c21e18147bbffb28572f8ac90aa5bc3c4138b25590c42610c20a14b5e8eddb1edf28c28";
+      sha512 = "06db22ff1ed32c1311d62d1cb860bb22686d5893985bf16fe2effaff864b4352788889d5e2f2ff6c450edd4be9d9c1f33ddcff513d5eb2cc3e88fe5e50c33485";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/sv-SE/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/sv-SE/thunderbird-68.1.1.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "5d7d569f4eb9ed738f54139a90e9a01e9e771a553af193357d45765bd54815a096ddc31ac69620d6f14516e8f41f1c0fb8f16a848e13273d0c18b9c047d85fb4";
+      sha512 = "f1a43a44dc155a01cda07041f554eb3474c35621ee8d8c7596aeee2746da12aa934d94f436014218a360b7848888d0e49285ca66cca8209b7b02d044c29571f4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/tr/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/tr/thunderbird-68.1.1.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "fc8892f85032d9fcce76c3fa971531f4039b8bb9e1812776bb3e7c5b68474543b5db4007f79e81abc1685c74f0574201236aab8a2df05ac10fcaade7c57ca3c2";
+      sha512 = "e430c26852fd2cc3b9afabe9f8c3e1480e3454614bd90c766dce2b2cf652fe526146f79bdc0e25a1ce4979c1e22c0af90540659df5fdae89b0498428a61e0d1b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/uk/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/uk/thunderbird-68.1.1.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "80335f326bde31f4b1e269cd756b4b41ff3a632023f09447abf6d1964381f8f9657a4f47ed6af63a3eb0cd4e84e5bced595eec07cc0a9e30ad8d3cf3d08026df";
+      sha512 = "d6717aee4e1367ba031d03a90fc46ef397f9bbe6ef1d2a5537df77dca1d042e83c6fb44baef9ab01dc47de0f481742186220542831bfb6670c7a756a77eddfad";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/uz/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/uz/thunderbird-68.1.1.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "2434a8a063b0d1019220579bc83160217d5c269b24ad83a9ed0969425a1fc9d9ed8b190c291d87c34379928aa6c2329d3b5ad287b44177dd61f680081cd7caf9";
+      sha512 = "58ba68d642eeb1700c6d0994260bb16028fd15b49697c6e99e61e73d90275e0e4d2e6957c2af60122ca7be8804c1ddeb15dc38090287335a674104da3cd1cb47";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/vi/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/vi/thunderbird-68.1.1.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "0e33f1a2f8cd67bdb523180af0b8afa5fbbb3628b0b9407f2a4ae609c7155b33fd85a1f23d9b74097fefb045fd0b437f58971cc4c4d5f391398d6ea7429b921e";
+      sha512 = "9968cf02fe2b58f21e228b9292b48fcf9df5beb805335e7c77332231690b2bfcea29a4abfe9e834a85c2e4f79fe55df4590a2ec17676712c1b30736f48704bf8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/zh-CN/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/zh-CN/thunderbird-68.1.1.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "27d1d9b3c30ab1dd863362139f91b79ffb7e36e87ff1f7f07162ea3e86a58962136e43cca3212e4263908f63dfe3a3c53bb3db3085e5b4bf07e0ff88408822d8";
+      sha512 = "41369b102e82285050147d0e883fc20c6b7d311a1a8cef2efd31480a6eeee8c3ea5e0a9e9968c3d903d1fd92aeec331ade3cbcedd16cb254a74c6049ec0ab410";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/zh-TW/thunderbird-68.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/zh-TW/thunderbird-68.1.1.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "2141f0ad5d11daf3a94f3a737801ec0234a7f2d869320d4859d771ab92a6e59bf13139b4048a7239640635051a9228e6cbf55746402ed35cb398d93a3d129439";
+      sha512 = "37e07f78c2ab67d040d6cd4a511fb3e6a641ca00dd659b51d5d320e79251bb2096dd6719da819c22306e10af9fc88389212129d20064ce110d06d49bf01545b5";
     }
     ];
 }
-- 
GitLab


From a3f9b8cd586ee61dd6be88ffb25d0b0cb83f8c20 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Thu, 26 Sep 2019 17:45:00 +0900
Subject: [PATCH 1006/2254] thunderbird: 68.1.0 -> 68.1.1

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

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 1617ccd7dd1..574c4895a64 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -25,11 +25,11 @@ let
   gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
 in stdenv.mkDerivation rec {
   pname = "thunderbird";
-  version = "68.1.0";
+  version = "68.1.1";
 
   src = fetchurl {
     url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
-    sha512 = "06036nawpm987q33567nhz55qybbcl55h5rdhjbhck5qmyj1qi383xqac5niwyk7c0gaq4ygwc5a24pysf85crjdway2zmqyjxp2apb";
+    sha512 = "2ng5wwd7fn9247ggzlxx96scc2nalaahzvxkzvb87mp9fbfcsi3v9dh370cm42px8hrknnsp2lrfk9hqx4287zyn9pl3k9vr6a9cswl";
   };
 
   # from firefox, but without sound libraries
-- 
GitLab


From 46dfb2d0904ecd1895af7e378b7d134f45c4e762 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 26 Sep 2019 10:07:35 +0100
Subject: [PATCH 1007/2254] nixos/sysctl: reduce prio of "kernel.kptr_restrict"
 to mkDefault

Users should be able to override this value without having to use mkForce.
---
 nixos/modules/config/sysctl.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/config/sysctl.nix b/nixos/modules/config/sysctl.nix
index fb2b58eed72..e59c7a32c28 100644
--- a/nixos/modules/config/sysctl.nix
+++ b/nixos/modules/config/sysctl.nix
@@ -54,7 +54,7 @@ in
 
     # Hide kernel pointers (e.g. in /proc/modules) for unprivileged
     # users as these make it easier to exploit kernel vulnerabilities.
-    boot.kernel.sysctl."kernel.kptr_restrict" = 1;
+    boot.kernel.sysctl."kernel.kptr_restrict" = mkDefault 1;
 
     # Disable YAMA by default to allow easy debugging.
     boot.kernel.sysctl."kernel.yama.ptrace_scope" = mkDefault 0;
-- 
GitLab


From 4f1a4ba3cbde04b36d988e1405572eacff047159 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 02:18:52 -0700
Subject: [PATCH 1008/2254] clib: 1.8.1 -> 1.11.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/clib/versions
---
 pkgs/tools/package-management/clib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/clib/default.nix b/pkgs/tools/package-management/clib/default.nix
index 60c77db44d8..eb8f5ef186f 100644
--- a/pkgs/tools/package-management/clib/default.nix
+++ b/pkgs/tools/package-management/clib/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, curl  }:
 
 stdenv.mkDerivation rec {
-  version = "1.8.1";
+  version = "1.11.2";
   pname = "clib";
 
   src = fetchFromGitHub {
     rev    = version;
     owner  = "clibs";
     repo   = "clib";
-    sha256 = "1kl8amlw0106jsvv71a7nifhff1jdvgsrxr7l7hfr75i506q8976";
+    sha256 = "03q5l873zc1dm478f35ibqandypakf47hzqb5gjpnpbcyb2m2jxz";
   };
 
   hardeningDisable = [ "fortify" ];
-- 
GitLab


From 7d7bd8aa331c4f2447649d12dbfc86a02d32c297 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Thu, 26 Sep 2019 15:57:34 +0900
Subject: [PATCH 1009/2254] pythonPackages.cmd2: 0.9.16 -> 0.9.17

Changelog https://github.com/python-cmd2/cmd2/blob/master/CHANGELOG.md
---
 pkgs/development/python-modules/cmd2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix
index 7d78abd075d..d2b3076d28e 100644
--- a/pkgs/development/python-modules/cmd2/default.nix
+++ b/pkgs/development/python-modules/cmd2/default.nix
@@ -6,11 +6,11 @@
 }:
 buildPythonPackage rec {
   pname = "cmd2";
-  version = "0.9.16";
+  version = "0.9.17";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0ggvh38mc1kkrlqdicjz5a16j5v6f6z0nwmcvv8i3y5gaffkfy2b";
+    sha256 = "0sp4m5xg8ms3ikps0c6qd51f9cab4ca9byl865bklm9vxc1adgkp";
   };
 
   LC_ALL="en_US.UTF-8";
-- 
GitLab


From 85f58c8aedf892a1b01c4d54c44e05dee12bdae9 Mon Sep 17 00:00:00 2001
From: David Wood <david@davidtw.co>
Date: Thu, 26 Sep 2019 10:51:28 +0100
Subject: [PATCH 1010/2254] pastel: 0.5.3 -> 0.6.1

Signed-off-by: David Wood <david@davidtw.co>
---
 pkgs/applications/misc/pastel/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/pastel/default.nix b/pkgs/applications/misc/pastel/default.nix
index eac6d131b35..8499ad0880c 100644
--- a/pkgs/applications/misc/pastel/default.nix
+++ b/pkgs/applications/misc/pastel/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "pastel";
-  version = "0.5.3";
+  version = "0.6.1";
 
   src = fetchFromGitHub {
     owner = "sharkdp";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0f54p3pzfp7xrwlqn61l7j41vmgcfph3bhq2khxh5apfwwdx9nng";
+    sha256 = "1c47bph1qraq3g0g5bp23jqlz7qdn4f8vh264y937jz17avvacx5";
   };
 
-  cargoSha256 = "05yvlm7z3zfn8qd8nb9zpch9xsfzidrpyrgg2vij3h3q095mdm66";
+  cargoSha256 = "1pfhwqj9kxm9p0mpdw7qyvivgby2bmah05kavf0a5zhzvq4v4sg0";
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
 
-- 
GitLab


From 4fb06f0916e992c49ff3f0ae6f35c52384f67a58 Mon Sep 17 00:00:00 2001
From: Nicolas Mattia <nicolas@nmattia.com>
Date: Thu, 26 Sep 2019 10:31:21 +0200
Subject: [PATCH 1011/2254] libpfm: enable static build

---
 pkgs/development/libraries/libpfm/default.nix | 8 ++++++--
 pkgs/top-level/static.nix                     | 3 +++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libpfm/default.nix b/pkgs/development/libraries/libpfm/default.nix
index d0572de537e..f48c605dafd 100644
--- a/pkgs/development/libraries/libpfm/default.nix
+++ b/pkgs/development/libraries/libpfm/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, enableShared ? true }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (rec {
   version = "4.10.1";
   pname = "libpfm";
 
@@ -30,4 +30,8 @@ stdenv.mkDerivation rec {
     maintainers = [ maintainers.pierron ];
     platforms = platforms.linux;
   };
+} // stdenv.lib.optionalAttrs ( ! enableShared )
+{
+  CONFIG_PFMLIB_SHARED = "n";
 }
+)
diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix
index bc6c3525f77..f3c524378ea 100644
--- a/pkgs/top-level/static.nix
+++ b/pkgs/top-level/static.nix
@@ -95,6 +95,9 @@ in {
   libiberty = super.libiberty.override {
     staticBuild = true;
   };
+  libpfm = super.libpfm.override {
+    enableShared = false;
+  };
   ipmitool = super.ipmitool.override {
     static = true;
   };
-- 
GitLab


From 28daf29df3cffaf00ea966098f7b5756e77c1247 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Thu, 26 Sep 2019 10:57:11 +0100
Subject: [PATCH 1012/2254] elpa-packages: 2019-09-26

---
 .../editors/emacs-modes/elpa-generated.nix    | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index 9e5324b1041..a8d9a38729f 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -636,16 +636,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    csv-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+    csv-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "csv-mode";
         ename = "csv-mode";
-        version = "1.8";
+        version = "1.9";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/csv-mode-1.8.el";
-          sha256 = "1ywgc61pnawiwfpjgxavfpfxqd3dm9niq6srbc70pd54ca6yqby6";
+          url = "https://elpa.gnu.org/packages/csv-mode-1.9.el";
+          sha256 = "0sdnyi9in904k49yy5imapypnmk75lv14k9c1yyjhjpalvvh6br1";
         };
-        packageRequires = [ emacs ];
+        packageRequires = [ cl-lib emacs ];
         meta = {
           homepage = "https://elpa.gnu.org/packages/csv-mode.html";
           license = lib.licenses.free;
@@ -720,10 +720,10 @@
       elpaBuild {
         pname = "debbugs";
         ename = "debbugs";
-        version = "0.19";
+        version = "0.20";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/debbugs-0.19.tar";
-          sha256 = "0cpby8f088cqb5mpd756a2mb706x763k15cg2xdmmsxl415k3yw4";
+          url = "https://elpa.gnu.org/packages/debbugs-0.20.tar";
+          sha256 = "03mmb1zvbqlsznl5agq8k3xrlcz310vnsa2zn0y8myanm4ra51zm";
         };
         packageRequires = [ cl-lib emacs soap-client ];
         meta = {
@@ -3327,10 +3327,10 @@
       elpaBuild {
         pname = "verilog-mode";
         ename = "verilog-mode";
-        version = "2019.6.21.103209889";
+        version = "2019.9.23.4801067";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/verilog-mode-2019.6.21.103209889.el";
-          sha256 = "0hlcp2jhm30bzx6iabdb31aqv0dmmim30g9z5kqb0hl1bd1dnm9m";
+          url = "https://elpa.gnu.org/packages/verilog-mode-2019.9.23.4801067.el";
+          sha256 = "0jaba2cqiiknjqc7qz6047hpjd87hznl6b154ai1900i52kjbs21";
         };
         packageRequires = [];
         meta = {
-- 
GitLab


From 3702a4b833db1d76fa4e4e9979b6812624ef83aa Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Thu, 26 Sep 2019 10:58:19 +0100
Subject: [PATCH 1013/2254] melpa-packages: 2019-09-26

---
 .../emacs-modes/recipes-archive-melpa.json    | 1451 ++++++++++-------
 1 file changed, 903 insertions(+), 548 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json
index 3d0011eb0f0..3cc5f4b7df0 100644
--- a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json
+++ b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json
@@ -961,8 +961,8 @@
     "auto-complete",
     "yasnippet"
    ],
-   "commit": "4490d168778a61a4ee8623defe760164cd9745b8",
-   "sha256": "1mkxayqrvz246gxr9wjabsn015hnjq96ys71syb6r4ykjn892a6m"
+   "commit": "131961b0476c6ee4d7bd07ce8d42d9e5a0dde38a",
+   "sha256": "0b3cfrhpzjh96kdgfv7r9p0ssd7qkn9kq69jkqjzrv23jr9y80fi"
   },
   "stable": {
    "version": [
@@ -987,8 +987,8 @@
   "repo": "xcwen/ac-php",
   "unstable": {
    "version": [
-    20190816,
-    548
+    20190922,
+    428
    ],
    "deps": [
     "dash",
@@ -998,8 +998,8 @@
     "s",
     "xcscope"
    ],
-   "commit": "4490d168778a61a4ee8623defe760164cd9745b8",
-   "sha256": "1mkxayqrvz246gxr9wjabsn015hnjq96ys71syb6r4ykjn892a6m"
+   "commit": "131961b0476c6ee4d7bd07ce8d42d9e5a0dde38a",
+   "sha256": "0b3cfrhpzjh96kdgfv7r9p0ssd7qkn9kq69jkqjzrv23jr9y80fi"
   },
   "stable": {
    "version": [
@@ -1065,8 +1065,8 @@
     "auto-complete",
     "rtags"
    ],
-   "commit": "3543b8404640884d901c719bb83c5474056cf97f",
-   "sha256": "1k1d3llf150rih8dba2fg7xp9ksnbfzdsj01lziqz396p34sim0f"
+   "commit": "d3d4bc9b7b829d39628a1af96f06eb23ba48670c",
+   "sha256": "0fgxrpqvqs988kjnkcc1lmyqnfc85ivhrarldl7iqgj25fvni6z1"
   },
   "stable": {
    "version": [
@@ -1851,6 +1851,21 @@
    "sha256": "0481zjrmg834d2ik0vpdan9l083q17ln13rcg4hnbhl1dmzz960p"
   }
  },
+ {
+  "ename": "ah",
+  "commit": "029c328e87ceb346e162c47162af727af22b65ac",
+  "sha256": "0h5kjf3sa17n8swkynb0fqk2jiwwgib3lzmrhwlk6k8pvzsgvlhj",
+  "fetcher": "github",
+  "repo": "takaxp/ah",
+  "unstable": {
+   "version": [
+    20190905,
+    1422
+   ],
+   "commit": "401135fd94c7f2df1ce23dbed32b4efd670689c7",
+   "sha256": "0n5g2fildhca5vlgpkzrhd8j60bvkfq74zzq4vzhqq7qflj17j3h"
+  }
+ },
  {
   "ename": "ahg",
   "commit": "5b7972602399f9df9139cff177e38653bb0f43ed",
@@ -2408,6 +2423,29 @@
    "sha256": "07207h1643amlairnmpf8lnnkgf69kc04z3ri9k6fm4gmh6c9dy0"
   }
  },
+ {
+  "ename": "amixer",
+  "commit": "ebb2d6c70b1fd2ddfb33d915c2ea01cc0d6da663",
+  "sha256": "17bf6asrx5q71m8ry9fkdb1lavj4slx995j1v0vny7wgijmcyhdf",
+  "fetcher": "github",
+  "repo": "remvee/amixer-el",
+  "unstable": {
+   "version": [
+    20190923,
+    607
+   ],
+   "commit": "51016256450996aad3ffc0f99129a98ff32059be",
+   "sha256": "1r07im2zd22a9f6dpxw6qrhbr773dyb6lfxcqsg7jjx55fa7xw3g"
+  },
+  "stable": {
+   "version": [
+    0,
+    1
+   ],
+   "commit": "052d5a2f91e43e7dfb7bf4e7c5537ce600ae1c4a",
+   "sha256": "0vmzca0pwdrqiysk5dbhmn02v2sqzs0qhi6987r1z6m9xzrwhmba"
+  }
+ },
  {
   "ename": "ammonite-term-repl",
   "commit": "cf0ece0efb1fcf0ea7364df0d35fca69862f5e9a",
@@ -2503,10 +2541,10 @@
  },
  {
   "ename": "anaconda-mode",
-  "commit": "e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8",
-  "sha256": "0gz16aam4zrm3s9ms13h4qcdflf55506kgkpyncq3bi54cvv8n1r",
+  "commit": "c756ccbae044bc23131060355532261aa9a12409",
+  "sha256": "1cr4qyk2brm1kvm7i9cmvihid8799df7yhmmdizv3sj5l6qnsyfr",
   "fetcher": "github",
-  "repo": "proofit404/anaconda-mode",
+  "repo": "pythonic-emacs/anaconda-mode",
   "unstable": {
    "version": [
     20190918,
@@ -2518,8 +2556,8 @@
     "pythonic",
     "s"
    ],
-   "commit": "d9c5ffdd12d8e81eb4e935e6a6523af8c80f0106",
-   "sha256": "0s0166qnzrxmxida8f80j2z2spfl10qcvbmddgvqaj8mr9f898bf"
+   "commit": "dc324ddea5d43e8f9a9d86936fc27ebfca8dac68",
+   "sha256": "0b8sdxdi9l78143mpachnm4wa6wivhx0q4kav801wxh0ncwfnk6i"
   },
   "stable": {
    "version": [
@@ -2678,15 +2716,15 @@
   "repo": "louietan/anki-editor",
   "unstable": {
    "version": [
-    20190608,
-    1621
+    20190922,
+    1223
    ],
    "deps": [
     "dash",
     "request"
    ],
-   "commit": "3e9f957ac59c19f1ca8c06d16c98a280a0c0474a",
-   "sha256": "1gkxpl4r4j547rwifp5597424arlya0k676sdkcz625b9jk65ypn"
+   "commit": "084ffad14fa700ad1ba95d8cbfe4a8f6052e2408",
+   "sha256": "0zjd5yid333shvjm4zy3p7zdpa09xcl96gc4wvi2paxjad6iqhwz"
   }
  },
  {
@@ -4243,11 +4281,11 @@
   "repo": "mattfidler/auto-indent-mode.el",
   "unstable": {
    "version": [
-    20190917,
-    1430
+    20190925,
+    231
    ],
-   "commit": "e6da518d5d8c3137b4f0a437a845401e34e6f193",
-   "sha256": "09dnhjd55pdpg3vvs6ygk7lfmimdc66dx2qfz8zbcqbz49j84kxi"
+   "commit": "8dffa08ab631bf9c388d076958f4da735eaa3e3a",
+   "sha256": "0y8k1mc7fk59j36khrrp9g65yaklp39s93gk9l1vmp33rclshqg8"
   },
   "stable": {
    "version": [
@@ -4737,14 +4775,14 @@
   "repo": "abo-abo/avy",
   "unstable": {
    "version": [
-    20190828,
-    951
+    20190925,
+    1054
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "034de4c0e900717ebcb6e19a973cf66beea54420",
-   "sha256": "0ssvnbvmdvjqpdswn68lwv2xi8mdfx8iyvs38mqc45f4502ahbjx"
+   "commit": "87394c9a880104a08d0f0e2d4149ac2d70cc192f",
+   "sha256": "1n1ngl9w8h889apkgvnz4z9lwks66qkwfb20jw5jh8p8kxyz7m16"
   },
   "stable": {
    "version": [
@@ -5273,11 +5311,11 @@
   "repo": "belak/base16-emacs",
   "unstable": {
    "version": [
-    20190722,
-    1950
+    20190924,
+    1827
    ],
-   "commit": "6e7d80859c364c74b6848c3f7679de53620daf43",
-   "sha256": "1dr1f9w1ysz40m0vra2ig6sr0wh6jbpcwwgnwf5rf5qi3d8g5nxi"
+   "commit": "4cee70262967efce31997443645f83b08aa33df1",
+   "sha256": "0q56qp1wrgcsabqi25npz0y3f7hw7w9zq8nkpvxhzgg105szgy17"
   },
   "stable": {
    "version": [
@@ -6395,17 +6433,17 @@
  },
  {
   "ename": "blacken",
-  "commit": "69d9802996a338be937d61678f2cadf3497f6b85",
-  "sha256": "16lbs76jkhcq0vg09x1n8mrd4pgz5bdjsprr9260xr7g3dx8xacc",
+  "commit": "c756ccbae044bc23131060355532261aa9a12409",
+  "sha256": "0lk7rhrzysdg4zmvv75bkpxcs6fcd6jaf0nh0bp15c3kp2v9zsn5",
   "fetcher": "github",
-  "repo": "proofit404/blacken",
+  "repo": "pythonic-emacs/blacken",
   "unstable": {
    "version": [
     20190917,
     535
    ],
-   "commit": "9daacd1211b081e76f02d4ef128d7f44c88d8fd0",
-   "sha256": "0f6ji0gs6gb6kc931yv5j6hbvb5d405xxzsbrgkivc9wxpypcfwg"
+   "commit": "5f30f17b048af1fe73ba710781650e3490a7be49",
+   "sha256": "151gxc3pi8jam8mcmbfgny519kk0vib0m2dm5b9hzf5nq0dx7r9x"
   }
  },
  {
@@ -8895,8 +8933,8 @@
     20171115,
     2108
    ],
-   "commit": "732b7da25a22c9846aca4badecee9b6d08c54c9b",
-   "sha256": "0w4qqwjxa5v48skq7xzb57fbdgjf2il5zs7650k0gz490rh50rwj"
+   "commit": "a886d605bc55f03250b12c45144aa4366ea5fb71",
+   "sha256": "10ppaz9lja7iipa2594ybfpq3cr593sq6xyy70gl8kb7wbxr7mig"
   },
   "stable": {
    "version": [
@@ -9534,8 +9572,8 @@
   "repo": "clojure-emacs/cider",
   "unstable": {
    "version": [
-    20190920,
-    850
+    20190923,
+    739
    ],
    "deps": [
     "clojure-mode",
@@ -9546,8 +9584,8 @@
     "sesman",
     "spinner"
    ],
-   "commit": "b2449eca413c5800b0239588c5d4345d8381eff6",
-   "sha256": "1lrmzxhny6bldzvljqgd9hih7rg62fqdxv9dk65qnsm16vncmkgv"
+   "commit": "c3c903adaa85d33c3935c7483f6d6c8c8ce73c41",
+   "sha256": "10vn4z578q3kiizbcx785jddpg5w0ssicc0n3qbpglik7sqdgp74"
   },
   "stable": {
    "version": [
@@ -9913,14 +9951,14 @@
   "repo": "emacsmirror/clang-format",
   "unstable": {
    "version": [
-    20180406,
-    1514
+    20190517,
+    722
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "1469728c61dcba8fa09c456e841f97e9eb75fa85",
-   "sha256": "0w6pd47pfs8jna076xjz0xz1f7bxdgvyglpllkm62fifiy2n994l"
+   "commit": "77ee89a0b6c1b956bc68d192527d1a0391fe5baa",
+   "sha256": "1xfhxn6pn0clxwlsd9pqyy8srbqvkr0wmbyxr2979zv2fxzn17kd"
   }
  },
  {
@@ -10417,16 +10455,16 @@
   "repo": "clojure-emacs/clomacs",
   "unstable": {
    "version": [
-    20190313,
-    1517
+    20190925,
+    1509
    ],
    "deps": [
     "cider",
     "s",
     "simple-httpd"
    ],
-   "commit": "461be59e5f480af292c84fd6f7d88f1f885371a5",
-   "sha256": "1kglhcid32vxs8nc7j2jjbd0cbwxx2rc0y2wlhmcxpd3gsk2lwp3"
+   "commit": "a953d882dd4e476e58b04fcb6bb08d101588a8d1",
+   "sha256": "0s5sqcn8dwysvzbpvphvr4165yqh4h02r17lsy8fp5ddaqpdy6aw"
   },
   "stable": {
    "version": [
@@ -10634,8 +10672,8 @@
     20190710,
     1319
    ],
-   "commit": "ebb9346490741ddc2ce6f552bc1be57dfc730cfa",
-   "sha256": "17rn81cg9df4da6jw9xnq5ldk1a58hvql9xhs59n3cc8v21v81pd"
+   "commit": "b42cb1ff80dc056da4036c7b65109d1a77d84bf4",
+   "sha256": "1lw7rj57pg27gs0yfqrln16hhrb7npslv26jkd0jh3k5whs0fska"
   },
   "stable": {
    "version": [
@@ -10644,11 +10682,7 @@
     3
    ],
    "commit": "26a0e200e5f4abe8268235c9fdb23a2612a1b3b1",
-   "error": [
-    "exited abnormally with code 1\n",
-    "",
-    "Initialized empty Git repository in /run/user/1000/git-checkout-tmp-2hzFmDuI/cmake-26a0e20/.git/\nfatal: invalid refspec '+refs/tags/v3.15.3^{}'\nfatal: write error: No space left on device\nfatal: index-pack failed\nUnable to checkout 26a0e200e5f4abe8268235c9fdb23a2612a1b3b1 from https://gitlab.kitware.com/cmake/cmake.git.\n"
-   ]
+   "sha256": "03qvdgfdxvbwwdipx8fbplnzrahf485w08j9fb0z1g27kq4wjjbb"
   }
  },
  {
@@ -11278,6 +11312,30 @@
    "sha256": "1hh1lkan1ch5xyzrpfgzibf8dxmvaa1jfwlxyyhpnfs5h69h3245"
   }
  },
+ {
+  "ename": "comint-hyperlink",
+  "commit": "3c3bc7c897bfc5fafcda33d9837e6f3ff4da3692",
+  "sha256": "17fvg00r2wjwxa747v8yvgv70rd287crhhxxmp6nchfklw408ai6",
+  "fetcher": "github",
+  "repo": "matthewbauer/comint-hyperlink",
+  "unstable": {
+   "version": [
+    20190907,
+    1856
+   ],
+   "commit": "7aae3ba615eec1d96f59a386a2fcf98d5b659707",
+   "sha256": "1r2rxda7jhb3rydzmwk9yxscmb6rj54jz9ihqsglfmlv8p2g8q6w"
+  },
+  "stable": {
+   "version": [
+    0,
+    1,
+    4
+   ],
+   "commit": "7aae3ba615eec1d96f59a386a2fcf98d5b659707",
+   "sha256": "1r2rxda7jhb3rydzmwk9yxscmb6rj54jz9ihqsglfmlv8p2g8q6w"
+  }
+ },
  {
   "ename": "comint-intercept",
   "commit": "7d38188ec2d6e16714de9bb24ebd1ea89c7df3da",
@@ -11552,10 +11610,10 @@
  },
  {
   "ename": "company-anaconda",
-  "commit": "0eb23a75c8b57b4af1737c0508f03e66430e6076",
-  "sha256": "1s7y47ghy7q35qpfqavh4p9wr91i6r579mdbpvv6h5by856yn4gl",
+  "commit": "c756ccbae044bc23131060355532261aa9a12409",
+  "sha256": "0kq8vh4i92n0b42jyy8a2ra2jk27l6hmzq8r2hsyl6zj7qqzymrx",
   "fetcher": "github",
-  "repo": "proofit404/company-anaconda",
+  "repo": "pythonic-emacs/company-anaconda",
   "unstable": {
    "version": [
     20181025,
@@ -11568,8 +11626,8 @@
     "dash",
     "s"
    ],
-   "commit": "2cc1c98ab6fe1d908229a1e26adccf2c10da1ecc",
-   "sha256": "162dbc5rgwvvfqirn9pkrxc0cl1lbl56xb9hg3md48hpshpnwwba"
+   "commit": "398fad19160cc1d0e31dcb1d4a3f88de7a2d355d",
+   "sha256": "182cijh6l82jj1r7iwd93h3np9c8fvcibjhv7860rk9ik41n7wil"
   },
   "stable": {
    "version": [
@@ -12519,8 +12577,8 @@
     "cl-lib",
     "company"
    ],
-   "commit": "4490d168778a61a4ee8623defe760164cd9745b8",
-   "sha256": "1mkxayqrvz246gxr9wjabsn015hnjq96ys71syb6r4ykjn892a6m"
+   "commit": "131961b0476c6ee4d7bd07ce8d42d9e5a0dde38a",
+   "sha256": "0b3cfrhpzjh96kdgfv7r9p0ssd7qkn9kq69jkqjzrv23jr9y80fi"
   },
   "stable": {
    "version": [
@@ -12800,8 +12858,8 @@
     "company",
     "rtags"
    ],
-   "commit": "3543b8404640884d901c719bb83c5474056cf97f",
-   "sha256": "1k1d3llf150rih8dba2fg7xp9ksnbfzdsj01lziqz396p34sim0f"
+   "commit": "d3d4bc9b7b829d39628a1af96f06eb23ba48670c",
+   "sha256": "0fgxrpqvqs988kjnkcc1lmyqnfc85ivhrarldl7iqgj25fvni6z1"
   },
   "stable": {
    "version": [
@@ -13235,6 +13293,24 @@
    "sha256": "0iqm8997pl3pni7a49igj8q6sp37bjdshjwl6d95bqrjkjf9ll08"
   }
  },
+ {
+  "ename": "comware-router-mode",
+  "commit": "47d74f54efc324d39b66d88051edbe6ff2cad9e0",
+  "sha256": "0i3isavwhdwzz8dzwkss4sajj9v3phk8hvq7cxrwrh09lwpp4kxs",
+  "fetcher": "github",
+  "repo": "daviderestivo/comware-router-mode",
+  "unstable": {
+   "version": [
+    20190923,
+    542
+   ],
+   "deps": [
+    "dash"
+   ],
+   "commit": "17d8bf8bcf2d7551480cd9a4785c3a6e832e6d8a",
+   "sha256": "0dm5gvaxgbn2flj0k6y6w0nw4ia02lhwpkh3iawv00lqndxqjrv6"
+  }
+ },
  {
   "ename": "concurrent",
   "commit": "8bc29a8d518ce7a584277089bd4654f52ac0f358",
@@ -13914,15 +13990,15 @@
   "repo": "FelipeLema/emacs-counsel-gtags",
   "unstable": {
    "version": [
-    20190909,
-    1740
+    20190923,
+    1842
    ],
    "deps": [
     "counsel",
     "seq"
    ],
-   "commit": "13d4aed6d70d96b86f55ffa38e60540c14ef0ce3",
-   "sha256": "11nhmy2si0z7ppkmyq3fk9mfwbnsk9m9k6mdd6dc9x6r560f3hyj"
+   "commit": "baac1a718aaa3ad6c439ab48903b12013de2cec0",
+   "sha256": "18bwis4j6j4plcdwxml3jdqzd9l8wi0k9kwmyqf9nbqx9f54klqr"
   },
   "stable": {
    "version": [
@@ -14689,8 +14765,8 @@
     20190717,
     1024
    ],
-   "commit": "e7e96e3b0cb69d98b4e12eda269719c9b23453ed",
-   "sha256": "0zpq404x8022rybfsmp5s1kvxfalfih6i9jjp9fnq0g8j6869qp8"
+   "commit": "30ae13607c9d8174ab488ff58cd0dfe4e5cbd0c2",
+   "sha256": "0wzrlda3nvrpzghb2nkh4apdbx9fbdq5sdbasz0ym0h9m0cbyc24"
   },
   "stable": {
    "version": [
@@ -15325,11 +15401,11 @@
   "repo": "cbowdon/daemons.el",
   "unstable": {
    "version": [
-    20190202,
-    1528
+    20190923,
+    1644
    ],
-   "commit": "fd7925b0c113e5bad2e4692430ce049405794910",
-   "sha256": "07l8k41ly92m3wkzlzyb9nmq4pd34xkpn7cjrdap7zfppd3iiq2r"
+   "commit": "fac6c8bdd295138ddfc830dd94637c3e45a0823e",
+   "sha256": "1mpbshib5il4sxricirqlx37cy2kcfmd3x1szg7xk7i3ghayp0df"
   },
   "stable": {
    "version": [
@@ -17036,6 +17112,21 @@
    "sha256": "0qpgfgp8hrzz4vdifxq8h25n0a0jlzgf7aa1fpy6r0080v5rqbb6"
   }
  },
+ {
+  "ename": "diminish-buffer",
+  "commit": "be1dc31aaad773f6504ded15d9ce2579fdf192af",
+  "sha256": "10rsdn2mlk3lnc9dc75zyphqckja7bzm5xgzjrbzvvbf4w87qa1f",
+  "fetcher": "github",
+  "repo": "elpa-host/diminish-buffer",
+  "unstable": {
+   "version": [
+    20190921,
+    1647
+   ],
+   "commit": "e137baa5e258a7938c713253fc9cc63f8674f841",
+   "sha256": "03068nyfb3cz0lz8z3qcwjlsvqaw9dfg3g8w13gmpwsmxaxlbv3i"
+  }
+ },
  {
   "ename": "dimmer",
   "commit": "8ae80e9202d69ed3214325dd15c4b2f114263954",
@@ -18360,10 +18451,10 @@
  },
  {
   "ename": "djangonaut",
-  "commit": "0c1281f59add99abf57bc858d6e0f9b2ae5b3c5c",
-  "sha256": "0038zqazzhxz82q8l1phxc3aiiwmzksz9c15by9v0apzwpmdkj38",
+  "commit": "c756ccbae044bc23131060355532261aa9a12409",
+  "sha256": "1ys0s8hx8a8zykwynpan1h95v9fl87m7hlh8zhcg42kzd7b09px2",
   "fetcher": "github",
-  "repo": "proofit404/djangonaut",
+  "repo": "pythonic-emacs/djangonaut",
   "unstable": {
    "version": [
     20180727,
@@ -18936,8 +19027,8 @@
     20190325,
     1917
    ],
-   "commit": "22937754c6c4f3cfc432175de86f70e826ae7470",
-   "sha256": "1pjmj0mkh0xiaggzp1xq84ckzq8hkvvmsxpvlnbsxngbz6k34sa5"
+   "commit": "166ca7f01a0c85faaa3f8d20dbb8f7c5e972eebb",
+   "sha256": "0nc0nvxmsjg7821c7jxzhzxnj9h00yc4i725a75qadqynmm60bq4"
   },
   "stable": {
    "version": [
@@ -19414,8 +19505,8 @@
   "repo": "jacktasia/dumb-jump",
   "unstable": {
    "version": [
-    20190920,
-    1531
+    20190923,
+    1849
    ],
    "deps": [
     "dash",
@@ -19423,8 +19514,8 @@
     "popup",
     "s"
    ],
-   "commit": "56e955b9c3619616c176e311f1b67811548ad4af",
-   "sha256": "01n4nv8f0zsfhzg7xqbv3zjvwdxk7nyq2h50gckm8mlx86f30kwj"
+   "commit": "d64ee2a31afa755d5b373ada2e8fea11149b44a3",
+   "sha256": "0jx0wsw99m9dwpfbssk9n4kpd08rzyhyhw5wjfwadapd2hhf11mw"
   },
   "stable": {
    "version": [
@@ -19468,8 +19559,8 @@
     20190911,
     1607
    ],
-   "commit": "2aac0728daa65780df9187a409a1c166ff9ab6bf",
-   "sha256": "0y4zqmwrzabz1hcpn7wads7z7gacr3ry25pi8i0fka69hz3h4s9k"
+   "commit": "27f97109256eb6336491536f2c62bf332716de03",
+   "sha256": "1llzmq56kvy8v1ijn62gyfr71g3z5s0svqcq4q4zan57rdhzchn0"
   },
   "stable": {
    "version": [
@@ -19935,8 +20026,8 @@
     "popup",
     "request"
    ],
-   "commit": "2e2eb5720792512bb8a2ab2a7d9eb9ce86de8df9",
-   "sha256": "0zram35da92gvv72fdj1mpyxasagvv0i20rrqilawyvah7kr1njg"
+   "commit": "00a7dfb19b6ee9e6a2993104400334ea2ebb39f1",
+   "sha256": "18sm2nsfidvbp7walf3wrfq9ra7l5ww0b5p4xglr1ch73m47gdzj"
   },
   "stable": {
    "version": [
@@ -20137,14 +20228,14 @@
   "repo": "joostkremers/ebib",
   "unstable": {
    "version": [
-    20190914,
-    753
+    20190922,
+    2000
    ],
    "deps": [
     "parsebib"
    ],
-   "commit": "8b2019c4f25a80dfeddaa6d1e82c668a52ffba8d",
-   "sha256": "0r8lqa120kqxqaa465lm03rbakpq19dr7pmjp0gbgcbgm3r9pvn6"
+   "commit": "b9c924d2a206f70caf714251a33bebcfef0c37c2",
+   "sha256": "18z58s3s1afr9spg57kpmpxfgkbwxdq7bv4rl5wk78rwj76bskpk"
   },
   "stable": {
    "version": [
@@ -20969,8 +21060,8 @@
     20190714,
     236
    ],
-   "commit": "9fbaf81114ffd3550801457257c983a077a7e17e",
-   "sha256": "0iz9hcx9s5l7c0y73ik6l7whjymgc0q4vfdr73y85cmnwfyi7fk5"
+   "commit": "20d33864e0e9d30edb0f146d89b6349776382bf3",
+   "sha256": "175mcx9hi6nnynamhj3pa9808wgpz2cxjs95b2ky8g6dfv07cmk6"
   },
   "stable": {
    "version": [
@@ -20990,15 +21081,15 @@
   "repo": "joaotavora/eglot",
   "unstable": {
    "version": [
-    20190910,
-    1347
+    20190924,
+    1547
    ],
    "deps": [
     "flymake",
     "jsonrpc"
    ],
-   "commit": "28ecd5df456fec6113751bd52816095e0be3e651",
-   "sha256": "1k2l77srl5j904x33sz7davfk1gmncpi87gj8yiavnyxml9snpcf"
+   "commit": "d7747541f3ee82fbc1b7ce3f9499737b4da9414b",
+   "sha256": "19jgmx9a1hmwcpix8dznjs6qscsn5x6z5jpcn7s6h47wfp470nav"
   },
   "stable": {
    "version": [
@@ -21104,7 +21195,7 @@
    "version": [
     0,
     16,
-    1
+    2
    ],
    "deps": [
     "auto-complete",
@@ -21117,8 +21208,8 @@
     "skewer-mode",
     "websocket"
    ],
-   "commit": "43107fc5c85722899534700daa7f5e73fe59a933",
-   "sha256": "05ns2ddr012dmw3x651lr4bhn9x0vrphivymdmhzc4bsxsisbd32"
+   "commit": "a2872eff6c18a0706c531e9316c792a9fb99826f",
+   "sha256": "0i182ic59wnhqmik15qsqjsqza5fn67qw18i5gvvj7dsn3v05vac"
   }
  },
  {
@@ -21171,8 +21262,8 @@
   "repo": "kostafey/ejc-sql",
   "unstable": {
    "version": [
-    20190914,
-    1925
+    20190924,
+    1423
    ],
    "deps": [
     "auto-complete",
@@ -21181,8 +21272,8 @@
     "direx",
     "spinner"
    ],
-   "commit": "a1e4d7c31c11f7c124c58408cebeb77e473fc535",
-   "sha256": "1zjx5n1gj0lvxzf47vv8bv87kbz1p6vnbgw31h3aarsdx0c09m3a"
+   "commit": "99f2928624e19efc4eb7736e0e722161d9781fc5",
+   "sha256": "0xqhma6l1zmmkxsb1b3pzdwjz95237r2ibkhqrqfys30wi5xkk1z"
   },
   "stable": {
    "version": [
@@ -22525,26 +22616,26 @@
   "repo": "dochang/elpa-clone",
   "unstable": {
    "version": [
-    20190109,
-    2340
+    20190922,
+    2302
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "5dddbab4c27ec6aca541a1f8e9792617f10fc325",
-   "sha256": "17lbdgwg97x8q8dbghylr2j0nwb72mpfl679qb0pl9184ih27qfc"
+   "commit": "777ac63fef531bdecf29cd3bf06e15dbe51e9d09",
+   "sha256": "1lrkmbspcwgh97b30i49nacfm5pjpkgk69z6qfkkmm6xvxx8wp7d"
   },
   "stable": {
    "version": [
     0,
     0,
-    7
+    8
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "5dddbab4c27ec6aca541a1f8e9792617f10fc325",
-   "sha256": "17lbdgwg97x8q8dbghylr2j0nwb72mpfl679qb0pl9184ih27qfc"
+   "commit": "777ac63fef531bdecf29cd3bf06e15dbe51e9d09",
+   "sha256": "1lrkmbspcwgh97b30i49nacfm5pjpkgk69z6qfkkmm6xvxx8wp7d"
   }
  },
  {
@@ -22579,11 +22670,11 @@
   "repo": "tgvaughan/elpher",
   "unstable": {
    "version": [
-    20190920,
-    1533
+    20190921,
+    2324
    ],
-   "commit": "e2d59f11515f2879bdc2675528b74fbb9b802bea",
-   "sha256": "1ghjz22vyidgss430y6w4znvx135b0avdmk7hh7mx4vbnq0m1j07"
+   "commit": "5b568bcfd841bcd8fa3972035f6bdff82cb5d3f0",
+   "sha256": "0wffrxc6k3pzh1r7hva6m16mrinf6365xzci452r33kdw1pj323h"
   },
   "stable": {
    "version": [
@@ -22618,8 +22709,8 @@
   "repo": "jorgenschaefer/elpy",
   "unstable": {
    "version": [
-    20190913,
-    936
+    20190925,
+    2241
    ],
    "deps": [
     "company",
@@ -22629,8 +22720,8 @@
     "s",
     "yasnippet"
    ],
-   "commit": "370dd4ced755b668ce2d7c91f742cd09337d98c4",
-   "sha256": "0zji9p62wyan9z7l01q54j06xdscy27ll3c1mnlfxvb7n3v5xdya"
+   "commit": "a1002f3682fe071652eb935e5c7c7de09c5ff2e1",
+   "sha256": "0r787z9xi821mhmh71wa73a3a0a9yl1jmmi3a9982rzv0xc1wpsa"
   },
   "stable": {
    "version": [
@@ -23155,6 +23246,24 @@
    "sha256": "1c84gxr1majqj4b59wgdy3lzm3ap66w9qsrnkx8hdbk9895ak81g"
   }
  },
+ {
+  "ename": "emacsql-sqlite3",
+  "commit": "5a25cf38b4f39b1c4d259143f1586fdad605b101",
+  "sha256": "06zm6vs6sry2lwksikxp0rjyvs1rgiqyapyw7m8hgy336h810v84",
+  "fetcher": "github",
+  "repo": "cireu/emacsql-sqlite3",
+  "unstable": {
+   "version": [
+    20190926,
+    452
+   ],
+   "deps": [
+    "emacsql"
+   ],
+   "commit": "4bd7ec90a8fd029a29034fca2f051a8bc6f8ae7d",
+   "sha256": "1jrwhflwrcijmfj0zvig4m2m4sr7h14ywz86rj2ld4vd0fsdx7qd"
+  }
+ },
  {
   "ename": "emacsshot",
   "commit": "d94b48f1d01c6f0e7bb2169a4a3181eae3f79c23",
@@ -24710,15 +24819,11 @@
   "repo": "erlang/otp",
   "unstable": {
    "version": [
-    20190404,
-    928
+    20190925,
+    1606
    ],
-   "commit": "70a3e70ce4fec9e5d79929aa28aecf4a81980322",
-   "error": [
-    "exited abnormally with code 1\n",
-    "",
-    "unpacking...\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping1P12subsubCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping1P12subsubCAIPM5CRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping1P1CACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping1P1subCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping1P1subsubCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping5CACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping5subCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping5subsubCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping5subsubsubCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/keyUsageCriticalcRLSignFalseCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/keyUsageCriticalkeyCertSignFalseCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/keyUsageNotCriticalCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/keyUsageNotCriticalcRLSignFalseCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/keyUsageNotCriticalkeyCertSignFalseCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDN1CACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDN1subCA1CRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDN1subCA2CRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDN1subCA3CRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDN2CACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDN3CACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDN3subCA1CRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDN3subCA2CRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDN4CACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDN5CACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDNS1CACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDNS2CACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsRFC822CA1CRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsRFC822CA2CRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsRFC822CA3CRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsURI1CACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsURI2CACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlyContainsAttributeCertsCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlyContainsCACertsCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlyContainsUserCertsCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlySomeReasonsCA1compromiseCRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlySomeReasonsCA1otherreasonsCRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlySomeReasonsCA2CRL1.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlySomeReasonsCA2CRL2.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlySomeReasonsCA3compromiseCRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlySomeReasonsCA3otherreasonsCRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlySomeReasonsCA4compromiseCRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlySomeReasonsCA4otherreasonsCRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint0CACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint0subCA2CRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint0subCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint1CACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint1subCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint6CACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint6subCA0CRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint6subCA1CRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint6subCA4CRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint6subsubCA00CRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint6subsubCA11CRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint6subsubCA41CRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint6subsubsubCA11XCRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint6subsubsubCA41XCRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/pre2000CRLnextUpdateCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy0CACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy0subCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy0subsubCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy0subsubsubCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy10CACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy10subCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy10subsubCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy10subsubsubCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy2CACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy2subCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy4CACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy4subCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy4subsubCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy4subsubsubCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy5CACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy5subCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy5subsubCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy5subsubsubCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy7CACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy7subCARE2CRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy7subsubCARE2RE4CRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy7subsubsubCARE2RE4CRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/AllCertificatesNoPoliciesTest2EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/AllCertificatesSamePoliciesTest10EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/AllCertificatesSamePoliciesTest13EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/AllCertificatesanyPolicyTest11EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/AnyPolicyTest14EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/BadCRLIssuerNameCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/BadCRLSignatureCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/BadSignedCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/BadnotAfterDateCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/BadnotBeforeDateCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/BasicSelfIssuedCRLSigningKeyCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/BasicSelfIssuedCRLSigningKeyCRLCert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/BasicSelfIssuedNewKeyCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/BasicSelfIssuedNewKeyOldWithNewCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/BasicSelfIssuedOldKeyCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/BasicSelfIssuedOldKeyNewWithOldCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/CPSPointerQualifierTest20EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/DSACACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/DSAParametersInheritedCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/DifferentPoliciesTest12EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/DifferentPoliciesTest3EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/DifferentPoliciesTest4EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/DifferentPoliciesTest5EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/DifferentPoliciesTest7EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/DifferentPoliciesTest8EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/DifferentPoliciesTest9EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/GeneralizedTimeCRLnextUpdateCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/GoodCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/GoodsubCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/GoodsubCAPanyPolicyMapping1to2CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidBadCRLIssuerNameTest5EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidBadCRLSignatureTest4EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidBasicSelfIssuedCRLSigningKeyTest7EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidBasicSelfIssuedCRLSigningKeyTest8EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidBasicSelfIssuedNewWithOldTest5EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidBasicSelfIssuedOldWithNewTest2EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidCASignatureTest2EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidCAnotAfterDateTest5EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidCAnotBeforeDateTest1EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidDNSnameConstraintsTest31EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidDNSnameConstraintsTest33EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidDNSnameConstraintsTest38EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidDNandRFC822nameConstraintsTest28EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidDNandRFC822nameConstraintsTest29EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidDNnameConstraintsTest10EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidDNnameConstraintsTest12EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidDNnameConstraintsTest13EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidDNnameConstraintsTest15EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidDNnameConstraintsTest16EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidDNnameConstraintsTest17EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidDNnameConstraintsTest20EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidDNnameConstraintsTest2EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidDNnameConstraintsTest3EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidDNnameConstraintsTest7EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidDNnameConstraintsTest8EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidDNnameConstraintsTest9EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidDSASignatureTest6EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidEESignatureTest3EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidEEnotAfterDateTest6EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidEEnotBeforeDateTest2EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidIDPwithindirectCRLTest23EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidIDPwithindirectCRLTest26EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidLongSerialNumberTest18EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidMappingFromanyPolicyTest7EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidMappingToanyPolicyTest8EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidMissingCRLTest1EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidMissingbasicConstraintsTest1EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidNameChainingOrderTest2EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidNameChainingTest1EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidNegativeSerialNumberTest15EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidOldCRLnextUpdateTest11EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidPolicyMappingTest10EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidPolicyMappingTest2EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidPolicyMappingTest4EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidRFC822nameConstraintsTest22EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidRFC822nameConstraintsTest24EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidRFC822nameConstraintsTest26EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidRevokedCATest2EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidRevokedEETest3EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidSelfIssuedinhibitAnyPolicyTest10EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidSelfIssuedinhibitAnyPolicyTest8EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidSelfIssuedinhibitPolicyMappingTest10EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidSelfIssuedinhibitPolicyMappingTest11EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidSelfIssuedinhibitPolicyMappingTest8EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidSelfIssuedinhibitPolicyMappingTest9EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidSelfIssuedpathLenConstraintTest16EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidSelfIssuedrequireExplicitPolicyTest7EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidSelfIssuedrequireExplicitPolicyTest8EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidSeparateCertificateandCRLKeysTest20EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidSeparateCertificateandCRLKeysTest21EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidURInameConstraintsTest35EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidURInameConstraintsTest37EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidUnknownCRLEntryExtensionTest8EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidUnknownCRLExtensionTest10EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidUnknownCRLExtensionTest9EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidUnknownCriticalCertificateExtensionTest2EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidWrongCRLTest6EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidcAFalseTest2EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidcAFalseTest3EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidcRLIssuerTest27EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidcRLIssuerTest31EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidcRLIssuerTest32EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidcRLIssuerTest34EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidcRLIssuerTest35EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvaliddeltaCRLIndicatorNoBaseTest1EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvaliddeltaCRLTest10EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvaliddeltaCRLTest3EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvaliddeltaCRLTest4EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvaliddeltaCRLTest6EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvaliddeltaCRLTest9EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvaliddistributionPointTest2EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvaliddistributionPointTest3EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvaliddistributionPointTest6EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvaliddistributionPointTest8EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvaliddistributionPointTest9EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidinhibitAnyPolicyTest1EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidinhibitAnyPolicyTest4EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidinhibitAnyPolicyTest5EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidinhibitAnyPolicyTest6EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidinhibitPolicyMappingTest1EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidinhibitPolicyMappingTest3EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidinhibitPolicyMappingTest5EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidinhibitPolicyMappingTest6EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidkeyUsageCriticalcRLSignFalseTest4EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidkeyUsageCriticalkeyCertSignFalseTest1EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidkeyUsageNotCriticalcRLSignFalseTest5EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidkeyUsageNotCriticalkeyCertSignFalseTest2EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidonlyContainsAttributeCertsTest14EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidonlyContainsCACertsTest12EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidonlyContainsUserCertsTest11EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidonlySomeReasonsTest15EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidonlySomeReasonsTest16EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidonlySomeReasonsTest17EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidonlySomeReasonsTest20EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidonlySomeReasonsTest21EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidpathLenConstraintTest10EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidpathLenConstraintTest11EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidpathLenConstraintTest12EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidpathLenConstraintTest5EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidpathLenConstraintTest6EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidpathLenConstraintTest9EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/Invalidpre2000CRLnextUpdateTest12EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/Invalidpre2000UTCEEnotAfterDateTest7EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidrequireExplicitPolicyTest3EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidrequireExplicitPolicyTest5EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/LongSerialNumberCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/Mapping1to2CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/MappingFromanyPolicyCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/MappingToanyPolicyCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/MissingbasicConstraintsCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/NameOrderingCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/NegativeSerialNumberCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/NoCRLCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/NoPoliciesCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/NoissuingDistributionPointCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/OldCRLnextUpdateCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/OverlappingPoliciesTest6EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/P12Mapping1to3CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/P12Mapping1to3subCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/P12Mapping1to3subsubCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/P1Mapping1to234CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/P1Mapping1to234subCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/P1anyPolicyMapping1to2CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/PanyPolicyMapping1to2CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/PoliciesP1234CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/PoliciesP1234subCAP123Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/PoliciesP1234subsubCAP123P12Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/PoliciesP123CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/PoliciesP123subCAP12Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/PoliciesP123subsubCAP12P1Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/PoliciesP123subsubCAP12P2Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/PoliciesP123subsubsubCAP12P2P1Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/PoliciesP12CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/PoliciesP12subCAP1Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/PoliciesP12subsubCAP1P2Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/PoliciesP2subCA2Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/PoliciesP2subCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/PoliciesP3CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/RFC3280MandatoryAttributeTypesCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/RFC3280OptionalAttributeTypesCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/RevokedsubCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/RolloverfromPrintableStringtoUTF8StringCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/SeparateCertificateandCRLKeysCA2CRLSigningCert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/SeparateCertificateandCRLKeysCA2CertificateSigningCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/SeparateCertificateandCRLKeysCRLSigningCert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/SeparateCertificateandCRLKeysCertificateSigningCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/TrustAnchorRootCertificate.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/TwoCRLsCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/UIDCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/UTF8StringCaseInsensitiveMatchCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/UTF8StringEncodedNamesCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/UnknownCRLEntryExtensionCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/UnknownCRLExtensionCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/UserNoticeQualifierTest15EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/UserNoticeQualifierTest16EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/UserNoticeQualifierTest17EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/UserNoticeQualifierTest18EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/UserNoticeQualifierTest19EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidBasicSelfIssuedCRLSigningKeyTest6EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidBasicSelfIssuedNewWithOldTest3EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidBasicSelfIssuedNewWithOldTest4EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidBasicSelfIssuedOldWithNewTest1EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidCertificatePathTest1EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidDNSnameConstraintsTest30EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidDNSnameConstraintsTest32EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidDNandRFC822nameConstraintsTest27EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidDNnameConstraintsTest11EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidDNnameConstraintsTest14EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidDNnameConstraintsTest18EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidDNnameConstraintsTest19EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidDNnameConstraintsTest1EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidDNnameConstraintsTest4EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidDNnameConstraintsTest5EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidDNnameConstraintsTest6EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidDSAParameterInheritanceTest5EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidDSASignaturesTest4EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidGeneralizedTimeCRLnextUpdateTest13EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidGeneralizedTimenotAfterDateTest8EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidGeneralizedTimenotBeforeDateTest4EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidIDPwithindirectCRLTest22EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidIDPwithindirectCRLTest24EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidIDPwithindirectCRLTest25EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidLongSerialNumberTest16EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidLongSerialNumberTest17EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidNameChainingCapitalizationTest5EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidNameChainingWhitespaceTest3EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidNameChainingWhitespaceTest4EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidNameUIDsTest6EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidNegativeSerialNumberTest14EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidNoissuingDistributionPointTest10EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidPolicyMappingTest11EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidPolicyMappingTest12EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidPolicyMappingTest13EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidPolicyMappingTest14EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidPolicyMappingTest1EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidPolicyMappingTest3EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidPolicyMappingTest5EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidPolicyMappingTest6EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidPolicyMappingTest9EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidRFC3280MandatoryAttributeTypesTest7EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidRFC3280OptionalAttributeTypesTest8EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidRFC822nameConstraintsTest21EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidRFC822nameConstraintsTest23EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidRFC822nameConstraintsTest25EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidRolloverfromPrintableStringtoUTF8StringTest10EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidSelfIssuedinhibitAnyPolicyTest7EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidSelfIssuedinhibitAnyPolicyTest9EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidSelfIssuedinhibitPolicyMappingTest7EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidSelfIssuedpathLenConstraintTest15EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidSelfIssuedpathLenConstraintTest17EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidSelfIssuedrequireExplicitPolicyTest6EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidSeparateCertificateandCRLKeysTest19EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidTwoCRLsTest7EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidURInameConstraintsTest34EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidURInameConstraintsTest36EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidUTF8StringCaseInsensitiveMatchTest11EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidUTF8StringEncodedNamesTest9EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidUnknownNotCriticalCertificateExtensionTest1EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidbasicConstraintsNotCriticalTest4EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidcRLIssuerTest28EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidcRLIssuerTest29EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidcRLIssuerTest30EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidcRLIssuerTest33EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValiddeltaCRLTest2EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValiddeltaCRLTest5EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValiddeltaCRLTest7EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValiddeltaCRLTest8EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValiddistributionPointTest1EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValiddistributionPointTest4EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValiddistributionPointTest5EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValiddistributionPointTest7EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidinhibitAnyPolicyTest2EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidinhibitPolicyMappingTest2EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidinhibitPolicyMappingTest4EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidkeyUsageNotCriticalTest3EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidonlyContainsCACertsTest13EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidonlySomeReasonsTest18EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidonlySomeReasonsTest19EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidpathLenConstraintTest13EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidpathLenConstraintTest14EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidpathLenConstraintTest7EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidpathLenConstraintTest8EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/Validpre2000UTCnotBeforeDateTest3EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidrequireExplicitPolicyTest1EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidrequireExplicitPolicyTest2EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidrequireExplicitPolicyTest4EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/WrongCRLCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/anyPolicyCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/basicConstraintsCriticalcAFalseCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/basicConstraintsNotCriticalCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/basicConstraintsNotCriticalcAFalseCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/deltaCRLCA1Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/deltaCRLCA2Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/deltaCRLCA3Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/deltaCRLIndicatorNoBaseCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/distributionPoint1CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/distributionPoint2CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/indirectCRLCA1Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/indirectCRLCA2Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/indirectCRLCA3Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/indirectCRLCA3cRLIssuerCert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/indirectCRLCA4Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/indirectCRLCA4cRLIssuerCert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/indirectCRLCA5Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/indirectCRLCA6Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitAnyPolicy0CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitAnyPolicy1CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitAnyPolicy1SelfIssuedCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitAnyPolicy1SelfIssuedsubCA2Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitAnyPolicy1subCA1Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitAnyPolicy1subCA2Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitAnyPolicy1subCAIAP5Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitAnyPolicy1subsubCA2Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitAnyPolicy5CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitAnyPolicy5subCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitAnyPolicy5subsubCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitAnyPolicyTest3EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitPolicyMapping0CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitPolicyMapping0subCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitPolicyMapping1P12CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitPolicyMapping1P12subCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitPolicyMapping1P12subCAIPM5Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitPolicyMapping1P12subsubCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitPolicyMapping1P12subsubCAIPM5Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitPolicyMapping1P1CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitPolicyMapping1P1SelfIssuedCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitPolicyMapping1P1SelfIssuedsubCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitPolicyMapping1P1subCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitPolicyMapping1P1subsubCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitPolicyMapping5CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitPolicyMapping5subCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitPolicyMapping5subsubCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitPolicyMapping5subsubsubCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/keyUsageCriticalcRLSignFalseCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/keyUsageCriticalkeyCertSignFalseCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/keyUsageNotCriticalCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/keyUsageNotCriticalcRLSignFalseCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/keyUsageNotCriticalkeyCertSignFalseCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/nameConstraintsDN1CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/nameConstraintsDN1SelfIssuedCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/nameConstraintsDN1subCA1Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/nameConstraintsDN1subCA2Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/nameConstraintsDN1subCA3Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/nameConstraintsDN2CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/nameConstraintsDN3CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/nameConstraintsDN3subCA1Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/nameConstraintsDN3subCA2Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/nameConstraintsDN4CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/nameConstraintsDN5CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/nameConstraintsDNS1CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/nameConstraintsDNS2CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/nameConstraintsRFC822CA1Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/nameConstraintsRFC822CA2Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/nameConstraintsRFC822CA3Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/nameConstraintsURI1CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/nameConstraintsURI2CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/onlyContainsAttributeCertsCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/onlyContainsCACertsCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/onlyContainsUserCertsCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/onlySomeReasonsCA1Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/onlySomeReasonsCA2Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/onlySomeReasonsCA3Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/onlySomeReasonsCA4Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/pathLenConstraint0CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/pathLenConstraint0SelfIssuedCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/pathLenConstraint0subCA2Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/pathLenConstraint0subCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/pathLenConstraint1CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/pathLenConstraint1SelfIssuedCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/pathLenConstraint1SelfIssuedsubCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/pathLenConstraint1subCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/pathLenConstraint6CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/pathLenConstraint6subCA0Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/pathLenConstraint6subCA1Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/pathLenConstraint6subCA4Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/pathLenConstraint6subsubCA00Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/pathLenConstraint6subsubCA11Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/pathLenConstraint6subsubCA41Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/pathLenConstraint6subsubsubCA11XCert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/pathLenConstraint6subsubsubCA41XCert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/pre2000CRLnextUpdateCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy0CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy0subCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy0subsubCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy0subsubsubCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy10CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy10subCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy10subsubCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy10subsubsubCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy2CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy2SelfIssuedCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy2SelfIssuedsubCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy2subCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy4CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy4subCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy4subsubCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy4subsubsubCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy5CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy5subCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy5subsubCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy5subsubsubCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy7CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy7subCARE2Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy7subsubCARE2RE4Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy7subsubsubCARE2RE4Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key.cover: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key.spec: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/auth_keys: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/cacerts.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/client_cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/client_key.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/crl_signer.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/dh.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/dsa.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/dsa_ISO.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/dsa_key_pkcs8.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/dsa_pub.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/ec_key.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/ec_key2.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/ec_key_param0.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/ec_key_param1.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/ec_key_pkcs8.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/ec_pubkey.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/idp_cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/idp_crl.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/known_hosts: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/openssh_dsa_pub: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/openssh_dsa_with_comment_pub: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/openssh_ecdsa_pub: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/openssh_rsa_pub: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/pkcs7_cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/pkcs7_ext.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/pkix_verify_hostname_cn.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/pkix_verify_hostname_subjAltName.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/pkix_verify_hostname_subjAltName_IP.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/req.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/rsa.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/rsa_ISO.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/rsa_key_pkcs8.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/rsa_pub.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/rsa_pub_key.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/server_cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/server_key.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/ssh1_auth_keys: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/ssh1_known_hosts: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/ssh2_dsa_comment_pub: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/ssh2_dsa_pub: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/ssh2_ecdsa_pub: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/ssh2_rsa_comment_pub: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/ssh2_rsa_pub: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/ssh2_subject_pub: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/ssh_rsa_long_comment_pub: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/ssh_rsa_long_header_pub: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/verify_hostname.conf: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/verify_hostname_ip.conf: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/vsn.mk: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/AUTHORS: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/Makefile: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/bin/reltool.escript: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/doc/src/Makefile: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/doc/src/book.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/doc/src/files.mk: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/doc/src/notes.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/doc/src/part.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/doc/src/ref_man.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/doc/src/reltool.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/doc/src/reltool_examples.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/doc/src/reltool_intro.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/doc/src/reltool_usage.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/examples/Makefile: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/examples/display_args: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/examples/mnesia_core_dump_viewer: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/info: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/src/Makefile: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/src/files.mk: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/src/reltool.app.src: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/src/reltool.appup.src: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/src/reltool.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/src/reltool.hrl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/src/reltool_app_win.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/src/reltool_fgraph.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/src/reltool_fgraph.hrl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/src/reltool_fgraph_win.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/src/reltool_mod_win.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/src/reltool_server.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/src/reltool_sys_win.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/src/reltool_target.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/src/reltool_utils.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/Makefile: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/README: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool.cover: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool.spec: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_app_SUITE.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_manual_gui_SUITE.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_manual_gui_SUITE_data/Makefile.src: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_manual_gui_SUITE_data/dependencies/x-1.0/ebin/x.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_manual_gui_SUITE_data/dependencies/x-1.0/src/x1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_manual_gui_SUITE_data/dependencies/x-1.0/src/x2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_manual_gui_SUITE_data/dependencies/x-1.0/src/x3.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_manual_gui_SUITE_data/dependencies/y-1.0/ebin/y.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_manual_gui_SUITE_data/dependencies/y-1.0/src/y1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_manual_gui_SUITE_data/dependencies/y-1.0/src/y2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_manual_gui_SUITE_data/dependencies/y-1.0/src/y3.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_manual_gui_SUITE_data/dependencies/z-1.0/ebin/z.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_manual_gui_SUITE_data/dependencies/z-1.0/src/z1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_manual_gui_SUITE_data/faulty_app_file/a-1.0/ebin/a.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_manual_gui_SUITE_data/faulty_app_file/a-1.0/src/a.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_manual_gui_SUITE_data/faulty_app_file/a-1.0/src/a_sup.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/Makefile.src: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/dep_in_app_not_xref/x-1.0/ebin/x.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/dep_in_app_not_xref/x-1.0/src/x1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/dep_in_app_not_xref/y-1.0/ebin/y.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/dep_in_app_not_xref/y-1.0/src/y1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/dep_in_app_not_xref/z-1.0/ebin/z.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/dep_in_app_not_xref/z-1.0/src/z1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/dependencies/x-1.0/ebin/x.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/dependencies/x-1.0/src/x1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/dependencies/x-1.0/src/x2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/dependencies/x-1.0/src/x3.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/dependencies/y-1.0/ebin/y.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/dependencies/y-1.0/src/y0.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/dependencies/y-1.0/src/y1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/dependencies/y-1.0/src/y2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/dependencies/z-1.0/ebin/z.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/dependencies/z-1.0/src/z1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/dupl_mod/a-1.0/ebin/a.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/escript/someapp-1.0/ebin/someapp.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/escript/someapp-1.0/src/mymod.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/faulty_app_file/a-1.0/ebin/a.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/faulty_app_file/a-1.0/src/a.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/faulty_app_file/a-1.0/src/a_sup.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/non_standard_vsn_id/b-first/ebin/b.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/non_standard_vsn_id/b-first/src/b.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/non_standard_vsn_id/b-second/ebin/b.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/non_standard_vsn_id/b-second/src/b.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/otp_9229/x-1.0/ebin/x.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/otp_9229/x-1.0/src/mylib.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/otp_9229/x-1.0/src/x.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/otp_9229/y-1.0/ebin/y.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/otp_9229/y-1.0/src/mylib.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/otp_9229/y-1.0/src/y.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/slim/a-1.0/ebin/a.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/slim/a-1.0/src/a.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/slim/a-1.0/src/a_sup.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/sort_apps/x-1.0/ebin/x.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/sort_apps/y-1.0/ebin/y.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/sort_apps/z-1.0/ebin/z.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/unicode/ua-1.0/ebin/ua.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/use_selected_vsn/b-1.0/ebin/b.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/use_selected_vsn/b-1.0/src/b.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/use_selected_vsn/b-3.0/ebin/b.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/use_selected_vsn/b-3.0/src/b.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/use_selected_vsn/lib2/b-2.0/ebin/b.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/use_selected_vsn/lib2/b-2.0/src/b.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_test_lib.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_test_lib.hrl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_wx_SUITE.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/rtt: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/rtt.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/vsn.mk: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/AUTHORS: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/Makefile: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/c_src/Makefile: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/c_src/Makefile.in: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/c_src/dtrace_user.d: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/c_src/dyntrace.c: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/c_src/dyntrace_lttng.h: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/c_src/trace_file_drv.c: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/c_src/trace_ip_drv.c: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/doc/src/LTTng.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/doc/src/Makefile: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/doc/src/book.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/doc/src/dbg.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/doc/src/dyntrace.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/doc/src/erts_alloc_config.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/doc/src/msacc.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/doc/src/notes.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/doc/src/notes_history.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/doc/src/part.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/doc/src/ref_man.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/doc/src/runtime_tools_app.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/doc/src/scheduler.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/doc/src/specs.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/doc/src/system_information.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/dist.d: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/dist.systemtap: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/driver1.d: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/driver1.systemtap: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/function-calls.d: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/function-calls.systemtap: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/garbage-collection.d: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/garbage-collection.systemtap: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/memory1.d: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/memory1.systemtap: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/messages.d: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/messages.systemtap: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/port1.d: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/port1.systemtap: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/process-scheduling.d: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/process-scheduling.systemtap: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/spawn-exit.d: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/spawn-exit.systemtap: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/user-probe-n.d: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/user-probe-n.systemtap: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/user-probe.d: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/user-probe.systemtap: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/include/observer_backend.hrl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/info: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/src/Makefile: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/src/appmon_info.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/src/dbg.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/src/dyntrace.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/src/erts_alloc_config.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/src/msacc.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/src/observer_backend.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/src/runtime_tools.app.src: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/src/runtime_tools.appup.src: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/src/runtime_tools.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/src/runtime_tools_sup.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/src/scheduler.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/src/system_information.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/src/ttb_autostart.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/test/Makefile: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/test/dbg_SUITE.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/test/dbg_SUITE_data/Makefile.src: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/test/dbg_SUITE_data/dbg_SUITE.c: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/test/dbg_SUITE_data/dbg_test.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/test/dbg_SUITE_data/exref_td.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/test/dyntrace_SUITE.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/test/dyntrace_lttng_SUITE.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/test/erts_alloc_config_SUITE.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/test/msacc_SUITE.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/test/runtime_tools.cover: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/test/runtime_tools.spec: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/test/runtime_tools_SUITE.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/test/scheduler_SUITE.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/test/system_information_SUITE.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/test/system_information_SUITE_data/information_test_report.dat: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/test/zzz_SUITE.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/vsn.mk: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/AUTHORS: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/Makefile: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/Makefile: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/alarm_handler.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/appup.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/book.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/error_logging.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/notes.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/notes_history.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/part.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/rb.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/ref_man.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/rel.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/rel/bar.1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/rel/bar.2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/rel/ge_h.1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/rel/ge_h.2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/rel/gs1.1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/rel/gs1.2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/rel/gs1.3.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/rel/gs2.1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/rel/gs2.2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/rel/lists2.1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/rel/lists2.2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/rel/portc.1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/rel/portc.2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/rel/sp.1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/rel/sp.2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/rel/sup.1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/rel/sup.2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/release_handler.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/relup.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/sasl_app.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/sasl_intro.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/script.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/systools.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/examples/src/Makefile: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/examples/src/target_system.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/info: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/src/Makefile: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/src/alarm_handler.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/src/erlsrv.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/src/format_lib_supp.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/src/misc_supp.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/src/rb.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/src/rb_format_supp.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/src/release_handler.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/src/release_handler_1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/src/sasl.app.src: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/src/sasl.appup.src: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/src/sasl.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/src/sasl_report.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/src/sasl_report_file_h.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/src/sasl_report_tty_h.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/src/systools.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/src/systools.hrl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/src/systools_lib.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/src/systools_make.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/src/systools_rc.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/src/systools_relup.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/Makefile: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/alarm_handler_SUITE.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/installer.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/rb_SUITE.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/Makefile.src: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib1/app1-1.0/ebin/app1.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib1/app1-1.0/src/app1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib1/app1-1.0/src/app1_server.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib1/app1-1.0/src/app1_sup.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib1/app2-1.0/ebin/app2.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib1/app2-1.0/src/app2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib1/app2-1.0/src/app2_server.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib1/app2-1.0/src/app2_sup.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib2/app1-2.0/ebin/app1.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib2/app1-2.0/ebin/app1.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib2/app1-2.0/src/app1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib2/app1-2.0/src/app1_server.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib2/app1-2.0/src/app1_sup.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib2/app2-1.0/ebin/app2.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib2/app2-1.0/src/app2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib2/app2-1.0/src/app2_server.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib2/app2-1.0/src/app2_sup.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib3/app1-3.0/ebin/app1.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib3/app1-3.0/ebin/app1.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib3/app1-3.0/src/app1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib3/app1-3.0/src/app1_server.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib3/app1-3.0/src/app1_sup.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib4/app1-4.0/ebin/app1.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib4/app1-4.0/ebin/app1.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib4/app1-4.0/src/app1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib4/app1-4.0/src/app1_server.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib4/app1-4.0/src/app1_sup.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/c/aa.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/c/b.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/c/c.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/c/c_sup.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/erl.ini.src: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/heart_restart.bat: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/README: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/a-1.0/ebin/a.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/a-1.0/src/a.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/a-1.0/src/a_sup.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/a-1.1/ebin/a.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/a-1.1/ebin/a.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/a-1.1/src/a.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/a-1.1/src/a_sup.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/a-1.2/ebin/a.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/a-1.2/ebin/a.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/a-1.2/src/a.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/a-1.2/src/a_sup.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/a-9.0/ebin/a.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/a-9.0/ebin/a.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/a-9.0/src/a.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/a-9.0/src/a_sup.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/a-9.1/ebin/a.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/a-9.1/ebin/a.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/a-9.1/src/a.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/a-9.1/src/a_sup.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/b-1.0/ebin/b.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/b-1.0/src/b_lib.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/b-1.0/src/b_server.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/b-2.0/ebin/b.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/b-2.0/ebin/b.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/b-2.0/src/b_lib.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/b-2.0/src/b_server.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/installer-1.0/ebin/installer.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/ebin/many_mods.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m10.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m3.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m4.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m5.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m6.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m7.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m8.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m9.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/ebin/many_mods.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/ebin/many_mods.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m10.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m3.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m4.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m5.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m6.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m7.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m8.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m9.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-2.0/ebin/many_mods.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-2.0/ebin/many_mods.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-2.0/src/m.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/otp_2740/vsn_atom.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/otp_2740/vsn_list.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/otp_2740/vsn_numeric.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/otp_2740/vsn_string.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/otp_2740/vsn_tuple.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/regexp_appup/app1/ebin/app1.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/regexp_appup/app1/ebin/app1.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/release_handler_timeouts/dummy-0.1/ebin/dummy.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/release_handler_timeouts/dummy-0.1/src/dummy_app.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/release_handler_timeouts/dummy-0.1/src/dummy_server.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/release_handler_timeouts/dummy-0.1/src/dummy_sup.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/release_handler_timeouts/dummy-0.1/src/dummy_sup_2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/start: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/start_client: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/unicode/u-1.0/ebin/u.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/unicode/u-1.0/src/u.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/unicode/u-1.0/src/u_sup.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/unicode/u-1.1/ebin/u.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/unicode/u-1.1/ebin/u.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/unicode/u-1.1/src/u.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/unicode/u-1.1/src/u_sup.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/rh_test_lib.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/sasl.cover: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/sasl.spec: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/sasl_SUITE.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/sasl_report_SUITE.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/sasl_report_suite_supervisor.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/db-2.1/ebin/db.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/db-2.1/ebin/db.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/db-2.1/src/db1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/db-2.1/src/db2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/fe-3.1/ebin/fe.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/fe-3.1/ebin/fe.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/fe-3.1/src/fe1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/fe-3.1/src/fe2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/fe-3.1/src/fe3.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_bad_appup/lib/fe-2.1/ebin/fe.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_bad_appup/lib/fe-3.1/ebin/fe.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_bad_appup/lib/fe-3.1/ebin/fe.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/db-2.1/ebin/db.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/db-2.1/ebin/db.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/db-2.1/src/db1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/db-2.1/src/db2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/fe-3.1/ebin/fe.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/fe-3.1/ebin/fe.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/fe-3.1/src/fe1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/fe-3.1/src/fe2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/fe-3.1/src/fe3.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_duplicate_modules/lib/app1-1.0/ebin/app1.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_duplicate_modules/lib/app1-1.0/src/myapp.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_duplicate_modules/lib/app2-1.0/ebin/app2.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_duplicate_modules/lib/app2-1.0/src/myapp.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_links/lib/db-2.1/ebin/db.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_links/lib/db-2.1/ebin/db.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_links/lib/db-2.1/src/db2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_links/lib/db-2.1/src/db3.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_links/lib/fe-3.1/ebin/fe.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_links/lib/fe-3.1/src/fe1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_links/lib/fe-3.1/src/fe2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_links/lib/fe-3.1/src/fe3.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/db-2.1/ebin/db.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/db-2.1/ebin/db.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/db-2.1/src/db1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/db-2.1/src/db2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/fe-3.1/ebin/fe.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/fe-3.1/ebin/fe.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/fe-3.1/src/fe1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/fe-3.1/src/fe2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/fe-3.1/src/fe3.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_no_appup/lib/fe-2.1/ebin/fe.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_no_appup/lib/fe-2.1/ebin/fe.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_no_appup/lib/fe-3.1/ebin/fe.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_no_appup/lib/fe-500.18.7/ebin/fe.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-1.0/ebin/db.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-1.0/src/db1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-1.0/src/db2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-1.1/ebin/db.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-1.1/src/db1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-1.1/src/db2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-2.1/ebin/db.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-2.1/ebin/db.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-2.1/src/db1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-2.1/src/db2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-3.1/ebin/db.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-3.1/ebin/db.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-3.1/src/db1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-3.1/src/db2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1.1/ebin/fe.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1.1/src/fe1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1.1/src/fe2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1.1/src/fe3.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1/ebin/fe.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1/src/fe1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1/src/fe2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1/src/fe3.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-3.1/ebin/fe.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-3.1/ebin/fe.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-3.1/src/fe1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-3.1/src/fe2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-3.1/src/fe3.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_regexp_appup/lib/fe-2.1.1/ebin/fe.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_regexp_appup/lib/fe-2.1/ebin/fe.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_regexp_appup/lib/fe-3.1/ebin/fe.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_regexp_appup/lib/fe-3.1/ebin/fe.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_unicode/lib/ua-1.0/ebin/ua.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_unicode/lib/ua-1.0/src/ua1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/lib/kernel/ebin/kernel.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/lib/kernel/ebin/kernel.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/lib/sasl-9.9/ebin/sasl.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/lib/sasl-9.9/ebin/sasl.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/lib/sasl/ebin/sasl.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/lib/sasl/ebin/sasl.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/lib/stdlib/ebin/stdlib.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/lib/stdlib/ebin/stdlib.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_rc_SUITE.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/test_lib.hrl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/vsn.mk: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/AUTHORS: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/Makefile: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/bin/snmp-v2tov1.pl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/bin/snmp-v2tov1.sed: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/bin/snmp-v2tov1.src: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/configure.in: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/MIB_mechanism.fig: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/MIB_mechanism.gif: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/Makefile: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/book.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/files.mk: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/getnext1.gif: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/getnext2.gif: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/getnext3.gif: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/getnext4.gif: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/notes.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/notes_history.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/part.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/ref_man.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp-um-1-image-1.gif: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp-um-1-image-2.gif: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp-um-1-image-3.gif: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp-um-1-image-8.gif: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_advanced_agent.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_agent_config_files.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_agent_funct_descr.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_agent_netif.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_agent_netif_1.gif: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_app.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_app_a.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_app_b.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_audit_trail_log.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_community_mib.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_config.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_def_instr_functions.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_framework_mib.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_generic.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_impl_example_agent.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_impl_example_manager.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_index.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_instr_functions.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_intro.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_manager_config_files.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_manager_funct_descr.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_manager_netif.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_manager_netif_1.gif: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_mib_compiler.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_notification_mib.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_pdus.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_standard_mib.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_target_mib.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_user_based_sm_mib.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_view_based_acm_mib.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmpa.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmpa_conf.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmpa_discovery_handler.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmpa_error.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmpa_error_io.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmpa_error_logger.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmpa_error_report.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmpa_local_db.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmpa_mib_data.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmpa_mib_storage.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmpa_mpd.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmpa_network_interface.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmpa_network_interface_filter.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmpa_notification_delivery_info_receiver.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmpa_notification_filter.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmpa_supervisor.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmpc.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmpc_cmd.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmpm.xml: Cannot write: No space left on device\ntar: Exiting with failure status due to previous errors\nerror: program 'tar' failed with exit code 2\n"
-   ]
+   "commit": "c3c731edfc64c00b03f9394bfdae4ae2b0063798",
+   "sha256": "0n5lvxb30s62n403pk3vmfwa6nr3zn59zlpwli5xmx30imh6dqmn"
   },
   "stable": {
    "version": [
@@ -24726,11 +24831,7 @@
     1
    ],
    "commit": "e62a389ce5dd27e7b26802243a5565ffd1feaef0",
-   "error": [
-    "exited abnormally with code 1\n",
-    "",
-    "unpacking...\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/src/erl_syntax_lib.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/src/erl_tidy.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/src/igor.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/src/merl.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/src/merl_tests.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/src/merl_transform.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/src/prettypr.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/src/syntax_tools.app.src: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/src/syntax_tools.appup.src: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/test/Makefile: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/test/merl_SUITE.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/test/syntax_tools.cover: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/test/syntax_tools.spec: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/test/syntax_tools_SUITE.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/test/syntax_tools_SUITE_data/empty.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/test/syntax_tools_SUITE_data/erl_tidy_tilde.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/test/syntax_tools_SUITE_data/igor_type_specs.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/test/syntax_tools_SUITE_data/m1.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/test/syntax_tools_SUITE_data/m2.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/test/syntax_tools_SUITE_data/specs_and_funs.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/test/syntax_tools_SUITE_data/syntax_tools_SUITE_test_module.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/test/syntax_tools_SUITE_data/syntax_tools_test.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/test/syntax_tools_SUITE_data/type_specs.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/vsn.mk: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/AUTHORS: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/Makefile: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/doc/src/Makefile: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/doc/src/book.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/doc/src/getting_started.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/doc/src/introduction.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/doc/src/notes.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/doc/src/ref_man.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/doc/src/tftp.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/doc/src/usersguide.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/info: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/src/Makefile: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/src/tftp.app.src: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/src/tftp.appup.src: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/src/tftp.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/src/tftp.hrl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/src/tftp_app.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/src/tftp_binary.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/src/tftp_engine.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/src/tftp_file.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/src/tftp_lib.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/src/tftp_logger.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/src/tftp_sup.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/test/Makefile: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/test/tftp.config: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/test/tftp.cover: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/test/tftp.spec: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/test/tftp_SUITE.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/test/tftp_bench.spec: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/test/tftp_test_lib.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/test/tftp_test_lib.hrl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/vsn.mk: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/AUTHORS: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/Makefile: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/c_src/Makefile: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/c_src/Makefile.in: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/c_src/depend.mk: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/c_src/erl_memory.c: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/c_src/erl_memory_trace_block_table.c: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/c_src/erl_memory_trace_block_table.h: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/Makefile: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/book.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/cover.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/cover_chapter.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/cprof.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/cprof_chapter.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/eprof.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/erlang_mode.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/erlang_mode_chapter.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/fprof.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/fprof_chapter.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/instrument.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/lcnt.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/lcnt_chapter.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/make.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/notes.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/notes_history.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/part.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/ref_man.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/specs.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/tags.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/venn1.fig: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/venn1.gif: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/venn2.fig: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/venn2.gif: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/xref.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/xref_chapter.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/emacs/AUTHORS: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/emacs/Makefile: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/emacs/README: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/emacs/erlang-edoc.el: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/emacs/erlang-eunit.el: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/emacs/erlang-flymake.el: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/emacs/erlang-pkg.el: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/emacs/erlang-skels-old.el: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/emacs/erlang-skels.el: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/emacs/erlang-start.el: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/emacs/erlang-test.el: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/emacs/erlang.el: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/emacs/erlang_appwiz.el: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/emacs/erldoc.el: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/emacs/internal_doc/emacs.sgml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/emacs/tags.3: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/emacs/vsn.mk: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/examples/Makefile: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/examples/xref_examples.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/info: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/priv/styles.css: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/src/Makefile: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/src/cover.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/src/cprof.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/src/eprof.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/src/fprof.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/src/instrument.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/src/lcnt.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/src/make.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/src/tags.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/src/tools.app.src: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/src/tools.appup.src: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/src/xref.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/src/xref.hrl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/src/xref_base.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/src/xref_compiler.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/src/xref_parser.yrl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/src/xref_reader.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/src/xref_scanner.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/src/xref_utils.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/Makefile: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cover_SUITE.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cover_SUITE_data/a.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cover_SUITE_data/b.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cover_SUITE_data/cc.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cover_SUITE_data/compile_beam/crypt.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cover_SUITE_data/compile_beam/d/y.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cover_SUITE_data/compile_beam/t.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cover_SUITE_data/compile_beam/v.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cover_SUITE_data/compile_beam/w.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cover_SUITE_data/compile_beam/x.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cover_SUITE_data/compile_beam/z.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cover_SUITE_data/d.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cover_SUITE_data/d1/e.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cover_SUITE_data/f.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cover_SUITE_data/include_eunit_hrl/cover_inc_eunit.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cover_SUITE_data/included_functions/cover_inc.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cover_SUITE_data/included_functions/cover_inc.hrl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cover_SUITE_data/otp_11439/t.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cover_SUITE_data/otp_6115/f1.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cover_SUITE_data/otp_6115/f2.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cprof_SUITE.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cprof_SUITE_data/cprof_SUITE_test.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/emacs_SUITE.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/emacs_SUITE_data/comments: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/emacs_SUITE_data/comprehensions: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/emacs_SUITE_data/funcs: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/emacs_SUITE_data/highlight: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/emacs_SUITE_data/icr: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/emacs_SUITE_data/macros: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/emacs_SUITE_data/records: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/emacs_SUITE_data/terms: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/emacs_SUITE_data/try_catch: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/emacs_SUITE_data/type_specs: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/emem_SUITE.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/eprof_SUITE.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/eprof_SUITE_data/ed.script: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/eprof_SUITE_data/eed.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/eprof_SUITE_data/eprof_suite_test.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/eprof_SUITE_data/eprof_test.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/fprof_SUITE.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/fprof_SUITE_data/foo.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/fprof_SUITE_data/fprof_unicode.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/ignore_cores.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/instrument_SUITE.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/lcnt_SUITE.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/lcnt_SUITE_data/big_bang_40.lcnt: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/lcnt_SUITE_data/ehb_3_3_hist.lcnt: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/make_SUITE.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/make_SUITE_data/Emakefile: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/make_SUITE_data/incl_src/test_incl2.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/make_SUITE_data/test1.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/make_SUITE_data/test2.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/make_SUITE_data/test3.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/make_SUITE_data/test4.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/make_SUITE_data/test5.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/make_SUITE_data/test_incl.hrl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/make_SUITE_data/test_incl1.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/prof_bench_SUITE.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/prof_bench_SUITE_data/sofs_copy.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/tools.cover: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/tools.spec: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/tools.spec.win: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/tools_SUITE.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/tools_bench.spec: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/xref_SUITE.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/xref_SUITE_data/depr_r9c.beam: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/xref_SUITE_data/dir/dir/dummy: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/xref_SUITE_data/fun_mfa_r14.beam: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/xref_SUITE_data/fun_mfa_r14.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/xref_SUITE_data/lib_test/cp.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/xref_SUITE_data/lib_test/lib1.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/xref_SUITE_data/lib_test/lib2.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/xref_SUITE_data/lib_test/lib3.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/xref_SUITE_data/lib_test/t.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/xref_SUITE_data/md/x__x.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/xref_SUITE_data/md/y__y.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/xref_SUITE_data/read/read.beam.v1: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/xref_SUITE_data/read/read.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/xref_SUITE_data/rel2/lib/app1-1.0/ebin/dummy: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/xref_SUITE_data/rel2/lib/app1-1.1/ebin/dummy: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/xref_SUITE_data/rel2/lib/app2-1.1/ebin/dummy: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/xref_SUITE_data/rel2/x.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/xref_SUITE_data/rel2/y.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/xref_SUITE_data/update/x.erl.1: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/xref_SUITE_data/update/x.erl.2: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/vsn.mk: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/AUTHORS: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/LICENSE.txt: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/Makefile: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/README: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/Makefile: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/README: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/gen_util.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/gl_doxygen.conf: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/gl_gen.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/gl_gen.hrl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/gl_gen_c.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/gl_gen_erl.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/gl_scan_doc.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/glapi.conf: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/wx_doxygen.conf: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/wx_extra/added_func.h: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/wx_extra/bugs.h: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/wx_extra/wxEvtHandler.c_src: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/wx_extra/wxEvtHandler.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/wx_extra/wxGraphicsRenderer.c_src: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/wx_extra/wxListCtrl.c_src: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/wx_extra/wxListCtrl.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/wx_extra/wxPrintout.c_src: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/wx_extra/wxPrintout.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/wx_extra/wxTreeCtrl.c_src: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/wx_extra/wxXmlResource.c_src: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/wx_extra/wxXmlResource.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/wx_extra/wxe_evth.h: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/wx_gen.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/wx_gen.hrl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/wx_gen_cpp.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/wx_gen_erl.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/wxapi.conf: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/Makefile.in: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/egl_impl.cpp: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/egl_impl.h: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/gen/gl_fdefs.h: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/gen/gl_finit.h: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/gen/gl_funcs.cpp: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/gen/glu_finit.h: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/gen/wxe_derived_dest.h: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/gen/wxe_events.cpp: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/gen/wxe_funcs.cpp: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/gen/wxe_init.cpp: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/gen/wxe_macros.h: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/wxe_callback_impl.cpp: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/wxe_callback_impl.h: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/wxe_driver.c: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/wxe_driver.h: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/wxe_events.h: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/wxe_gl.cpp: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/wxe_gl.h: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/wxe_helpers.cpp: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/wxe_helpers.h: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/wxe_impl.cpp: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/wxe_impl.h: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/wxe_main.cpp: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/wxe_memory.h: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/wxe_ps_init.c: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/wxe_return.cpp: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/wxe_return.h: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/wxe_win32.rc: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/config.mk.in: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/configure.in: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/doc/overview.edoc: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/doc/src/Makefile: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/doc/src/book.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/doc/src/notes.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/doc/src/part.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/doc/src/ref_man.xml.src: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/doc/src/specs.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/Makefile: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/Makefile: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/demo.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/demo_html_tagger.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/erlang.png: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_aui.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_button.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_canvas.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_canvas_paint.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_choices.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_cursor.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_dialogs.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_frame_utils.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_gauge.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_gl.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_graphicsContext.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_grid.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_htmlWindow.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_htmlWindow.html: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_listCtrl.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_notebook.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_pickers.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_popupMenu.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_radioBox.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_sashWindow.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_sizers.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_slider.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_splitterWindow.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_static.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_textCtrl.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_treeCtrl.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/image.jpg: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/simple/Makefile: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/simple/copy.xpm: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/simple/hello.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/simple/hello2.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/simple/menu.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/simple/minimal.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/simple/sample.xpm: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/sudoku/Makefile: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/sudoku/sudoku.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/sudoku/sudoku.hrl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/sudoku/sudoku_board.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/sudoku/sudoku_game.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/sudoku/sudoku_gui.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/appicon.ico: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/appicon.xpm: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/artprov.xpm: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/artprov.xrc: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/basicdlg.xpm: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/basicdlg.xrc: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/controls.xpm: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/controls.xrc: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/custclas.xpm: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/custclas.xrc: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/derivdlg.xpm: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/derivdlg.xrc: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/fileopen.gif: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/filesave.gif: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/frame.xrc: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/fuzzy.gif: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/menu.xrc: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/platform.xpm: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/platform.xrc: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/quotes.gif: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/resource.xrc: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/stop.xpm: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/throbber.gif: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/toolbar.xrc: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/uncenter.xpm: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/uncenter.xrc: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/update.gif: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/variable.xpm: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/variable.xrc: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/xrc.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/include/gl.hrl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/include/glu.hrl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/include/wx.hrl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/info: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/prebuild.skip: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/priv/erlang-logo128.png: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/priv/erlang-logo32.png: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/priv/erlang-logo64.png: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/Makefile: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/gl.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/glu.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxAcceleratorEntry.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxAcceleratorTable.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxActivateEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxArtProvider.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxAuiDockArt.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxAuiManager.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxAuiManagerEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxAuiNotebook.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxAuiNotebookEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxAuiPaneInfo.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxAuiSimpleTabArt.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxAuiTabArt.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxBitmap.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxBitmapButton.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxBitmapDataObject.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxBoxSizer.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxBrush.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxBufferedDC.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxBufferedPaintDC.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxButton.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxCalendarCtrl.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxCalendarDateAttr.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxCalendarEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxCaret.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxCheckBox.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxCheckListBox.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxChildFocusEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxChoice.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxChoicebook.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxClientDC.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxClipboard.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxClipboardTextEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxCloseEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxColourData.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxColourDialog.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxColourPickerCtrl.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxColourPickerEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxComboBox.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxCommandEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxContextMenuEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxControl.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxControlWithItems.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxCursor.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxDC.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxDCOverlay.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxDataObject.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxDateEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxDatePickerCtrl.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxDialog.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxDirDialog.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxDirPickerCtrl.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxDisplay.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxDisplayChangedEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxDropFilesEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxEraseEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxEvtHandler.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxFileDataObject.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxFileDialog.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxFileDirPickerEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxFilePickerCtrl.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxFindReplaceData.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxFindReplaceDialog.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxFlexGridSizer.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxFocusEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxFont.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxFontData.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxFontDialog.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxFontPickerCtrl.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxFontPickerEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxFrame.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGBSizerItem.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGCDC.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGLCanvas.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGauge.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGenericDirCtrl.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGraphicsBrush.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGraphicsContext.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGraphicsFont.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGraphicsMatrix.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGraphicsObject.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGraphicsPath.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGraphicsPen.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGraphicsRenderer.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGrid.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGridBagSizer.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGridCellAttr.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGridCellBoolEditor.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGridCellBoolRenderer.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGridCellChoiceEditor.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGridCellEditor.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGridCellFloatEditor.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGridCellFloatRenderer.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGridCellNumberEditor.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGridCellNumberRenderer.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGridCellRenderer.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGridCellStringRenderer.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGridCellTextEditor.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGridEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGridSizer.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxHelpEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxHtmlEasyPrinting.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxHtmlLinkEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxHtmlWindow.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxIcon.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxIconBundle.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxIconizeEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxIdleEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxImage.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxImageList.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxInitDialogEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxJoystickEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxKeyEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxLayoutAlgorithm.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxListBox.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxListCtrl.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxListEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxListItem.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxListItemAttr.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxListView.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxListbook.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxLocale.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxLogNull.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxMDIChildFrame.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxMDIClientWindow.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxMDIParentFrame.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxMask.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxMaximizeEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxMemoryDC.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxMenu.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxMenuBar.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxMenuEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxMenuItem.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxMessageDialog.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxMiniFrame.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxMirrorDC.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxMouseCaptureChangedEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxMouseCaptureLostEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxMouseEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxMoveEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxMultiChoiceDialog.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxNavigationKeyEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxNotebook.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxNotebookEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxNotifyEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxOverlay.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPageSetupDialog.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPageSetupDialogData.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPaintDC.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPaintEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPalette.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPaletteChangedEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPanel.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPasswordEntryDialog.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPen.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPickerBase.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPopupTransientWindow.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPopupWindow.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPostScriptDC.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPreviewCanvas.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPreviewControlBar.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPreviewFrame.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPrintData.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPrintDialog.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPrintDialogData.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPrintPreview.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPrinter.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPrintout.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxProgressDialog.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxQueryNewPaletteEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxRadioBox.erl: Cannot write: No space left on device\ntar: Exiting with failure status due to previous errors\nerror: program 'tar' failed with exit code 2\n"
-   ]
+   "sha256": "0p0lwajq5skbhrx1nw8ncphj409rl6wghjrgk7d3libz12hnwrpn"
   }
  },
  {
@@ -25521,14 +25622,14 @@
   "repo": "emacs-ess/ESS",
   "unstable": {
    "version": [
-    20190917,
-    917
+    20190921,
+    1258
    ],
    "deps": [
     "julia-mode"
    ],
-   "commit": "8b48aae3567e7af6d8a84dfe3b017cb099d3414d",
-   "sha256": "0b8n2f7lkgxr498106lhwcldvq0xjhbxmh3xqgy4jp8v0rhh6rli"
+   "commit": "9e522405814b3ae7a81853930d7c97d50cdadd4f",
+   "sha256": "0kfiyf5v66dbhwcpjj8ndc2ysnn767id5gws7gjng8q6wmkq97na"
   },
   "stable": {
    "version": [
@@ -26161,15 +26262,15 @@
   "repo": "emacs-evil/evil-collection",
   "unstable": {
    "version": [
-    20190916,
-    214
+    20190926,
+    221
    ],
    "deps": [
     "cl-lib",
     "evil"
    ],
-   "commit": "74e098f79cfb9e8e6391c526154d881c602a90ae",
-   "sha256": "1gqwb9i0iy08gsp8yg75gmcdxmis102jcr1nsfszjv4zrmhiswnm"
+   "commit": "492b20cc735a026a70c58f5438c341a112562e14",
+   "sha256": "1b2zcpfj7ivsn7hpnv9a11f22d6yqz48dqkf2xjmf7y2cq8fmi56"
   },
   "stable": {
    "version": [
@@ -26755,14 +26856,14 @@
   "repo": "redguardtoo/evil-matchit",
   "unstable": {
    "version": [
-    20190920,
-    58
+    20190924,
+    2348
    ],
    "deps": [
     "evil"
    ],
-   "commit": "1027459d44ced4daed84247770ce9ae2b5fd1993",
-   "sha256": "18824dx00w9wnbqsra3y18sxrr6r4vgj8h3mxa3n1dn14i72sjgm"
+   "commit": "ea1e867129174ef0d545574b883939fcc2019886",
+   "sha256": "0n0scxkp0c2a0b6n7jmcdj8xcsrfcxcp5hw6df4150bmmpwv7wkk"
   },
   "stable": {
    "version": [
@@ -28762,6 +28863,24 @@
    "sha256": "05lwcwf412m717yhwpjrswqkm8c3i7391rmiwv2k8xc1vk6dpp4g"
   }
  },
+ {
+  "ename": "fancy-dabbrev",
+  "commit": "1ac5a3797d9882235de984739d5a2bf122b64540",
+  "sha256": "038zyg8kmz7k2y2xfs5mmm4fh87a503yri990kyf82pqyrsj3yww",
+  "fetcher": "github",
+  "repo": "jrosdahl/fancy-dabbrev",
+  "unstable": {
+   "version": [
+    20190921,
+    1811
+   ],
+   "deps": [
+    "popup"
+   ],
+   "commit": "2d9c55ce0ef20cd405c597bbac8b204cfaeee77a",
+   "sha256": "0ap13sxycvwg5dxvm65qkp11816hz4vvw3828q730y9j30fizn0r"
+  }
+ },
  {
   "ename": "fancy-narrow",
   "commit": "1e6aed365c42987d64d0cd9a8a6178339b1b39e8",
@@ -28816,6 +28935,36 @@
    "sha256": "142zq0zz38j3akgc1gipqhgs05krlkig1i97pgzmi4jcqdgm3lx9"
   }
  },
+ {
+  "ename": "fast-scroll",
+  "commit": "1a06816fe50be692f971f08e76f687a3560baceb",
+  "sha256": "1ds8wjc2zdvr31c4c1dwrbf6al9ff3p4njli7mis85kb883k371c",
+  "fetcher": "github",
+  "repo": "ahungry/fast-scroll",
+  "unstable": {
+   "version": [
+    20190923,
+    310
+   ],
+   "deps": [
+    "cl-lib"
+   ],
+   "commit": "70a4d21638bf95646bd12ae9512dffbe1c4970d2",
+   "sha256": "1gbzwql0x6vmn8pip55qa31v4mrjw5wgcv1sx0hmwkrafji3mwjq"
+  },
+  "stable": {
+   "version": [
+    0,
+    0,
+    5
+   ],
+   "deps": [
+    "cl-lib"
+   ],
+   "commit": "0f78d1039e5394a6b57d186189a89937453c7002",
+   "sha256": "042dkz12rcj27ymla1lg70vwg3n7vb9i5908ga6vabn7q61bxbsh"
+  }
+ },
  {
   "ename": "fastdef",
   "commit": "f6effb2fbccc71e8a44c53138e3c21f10dc55fbc",
@@ -29545,20 +29694,20 @@
   "repo": "wwwjfy/emacs-fish",
   "unstable": {
    "version": [
-    20180827,
-    303
+    20190921,
+    526
    ],
-   "commit": "35fc7c1e243a7410823088a571ecf378e9f3efa6",
-   "sha256": "0rn08dm4gn0g0nz080zxm0am1z6hfkinvzqwqszv96qkxy250ghp"
+   "commit": "688c82decad108029b0434e3bce6c3d129ede6f3",
+   "sha256": "1s961nhwxpb9xyc26rxpn6hvwn63sng452l03mm2ply32b247f9p"
   },
   "stable": {
    "version": [
     0,
     1,
-    4
+    5
    ],
-   "commit": "bac709ac1235751952d6022dddc6307d9135d096",
-   "sha256": "0a74ghmjjrxfdhk4mvq6lar4w6l6lc4iilabs99smqr2fn5rsslq"
+   "commit": "688c82decad108029b0434e3bce6c3d129ede6f3",
+   "sha256": "1s961nhwxpb9xyc26rxpn6hvwn63sng452l03mm2ply32b247f9p"
   }
  },
  {
@@ -30031,11 +30180,11 @@
   "repo": "amake/flutter.el",
   "unstable": {
    "version": [
-    20190919,
-    910
+    20190924,
+    118
    ],
-   "commit": "58ac1e19e50f9c65869c141ef9d44a70a36994bd",
-   "sha256": "024gwfjin41dxdfmx78s7w10sk4lqjlk8p5j7asddk426pmd2a14"
+   "commit": "4d59cf0a08426c66c1d80c1a98d6245645b9a54d",
+   "sha256": "03x9cq4mah211379zx34dvmmdf86yc3wa9m71g7z1g1374pq036v"
   }
  },
  {
@@ -30053,8 +30202,8 @@
     "flutter",
     "flycheck"
    ],
-   "commit": "58ac1e19e50f9c65869c141ef9d44a70a36994bd",
-   "sha256": "024gwfjin41dxdfmx78s7w10sk4lqjlk8p5j7asddk426pmd2a14"
+   "commit": "4d59cf0a08426c66c1d80c1a98d6245645b9a54d",
+   "sha256": "03x9cq4mah211379zx34dvmmdf86yc3wa9m71g7z1g1374pq036v"
   }
  },
  {
@@ -30401,14 +30550,26 @@
   "repo": "ch1bo/flycheck-clang-tidy",
   "unstable": {
    "version": [
-    20171024,
-    808
+    20190925,
+    2345
    ],
    "deps": [
     "flycheck"
    ],
-   "commit": "b8ebd49693f67e08e420ba847cc88f6721ef9e3e",
-   "sha256": "0fnn1baw64f7x1zjb95adryr3mfynbblwppcd6ywh7pk0sq18b80"
+   "commit": "11535422f483ecfccb345c559e7309a81648f088",
+   "sha256": "1y38r98d4f3sdxndhd8p0k3acp7qhzi6vf2k0ph9rj59pp6bqkg7"
+  },
+  "stable": {
+   "version": [
+    0,
+    1,
+    0
+   ],
+   "deps": [
+    "flycheck"
+   ],
+   "commit": "0775e3cde31010820585bb6fdb1239d9b6af67e2",
+   "sha256": "1bjagdi4f4gardwqdfpz2jnyrsn717hhk7lmmwndjxfi1phbqdc4"
   }
  },
  {
@@ -31950,8 +32111,8 @@
     "flycheck",
     "rtags"
    ],
-   "commit": "3543b8404640884d901c719bb83c5474056cf97f",
-   "sha256": "1k1d3llf150rih8dba2fg7xp9ksnbfzdsj01lziqz396p34sim0f"
+   "commit": "d3d4bc9b7b829d39628a1af96f06eb23ba48670c",
+   "sha256": "0fgxrpqvqs988kjnkcc1lmyqnfc85ivhrarldl7iqgj25fvni6z1"
   },
   "stable": {
    "version": [
@@ -33825,8 +33986,8 @@
   "repo": "magit/forge",
   "unstable": {
    "version": [
-    20190909,
-    2017
+    20190924,
+    2125
    ],
    "deps": [
     "closql",
@@ -33838,8 +33999,8 @@
     "markdown-mode",
     "transient"
    ],
-   "commit": "4424101b416931abc1b838e48f5710bd933c2973",
-   "sha256": "0rbvmj265v75q76x1qvvyz313h6ww7kh3s8w318vghrnylj6za0y"
+   "commit": "b80e0988cc15d3f7e5754c05fc3ac9414cd97947",
+   "sha256": "0v8qqakv1bwn00b2kqcn8x87mfpnwdqik0573l4k9drvc3lax41q"
   },
   "stable": {
    "version": [
@@ -34471,8 +34632,8 @@
    "deps": [
     "cl-lib"
    ],
-   "commit": "5f1f2a00d61ea45c6114e6be333f4eeb3d85420c",
-   "sha256": "031rh3cqv3hmgf8jjgal9hnsj655bsrh4a2p0jr1fr9zvgzc7v27"
+   "commit": "0150e4c30390ecea135cdd2f859eb8b88421da6e",
+   "sha256": "1dfjni5f688kj223wvg0hhnw0b38241486p2bxbvr1gnwg3w47cx"
   },
   "stable": {
    "version": [
@@ -35690,8 +35851,8 @@
     "dash",
     "with-editor"
    ],
-   "commit": "5c424142704d481faafce7b834af67c1aca98e68",
-   "sha256": "0849yg97gkg3qp0xa67kxfq888i5nmmz0982zcvc3n4k6xswy52c"
+   "commit": "f788dd7f4730316378b8a222aa5d6b6f1efce94e",
+   "sha256": "1v2ml8nk7fkaapdcm88098wcc2mcgi0d3mil5dd57vhqmrn7d23z"
   },
   "stable": {
    "version": [
@@ -37375,8 +37536,8 @@
     "cl-lib",
     "go-mode"
    ],
-   "commit": "1bbe1d0cb88564e6c5b74ccd78ab87a8b9998374",
-   "sha256": "1jrlcz940y8hpizsy7byimyc9drl3myfym1pg4sg374jrr1y8nz2"
+   "commit": "2a1584f06f95792f2c5a84c523bccaafbc5dbbab",
+   "sha256": "06aig4r5a4sfdpwh58pikj9ij95iiy2hakqjgszg54wdv5rljwvd"
   },
   "stable": {
    "version": [
@@ -37471,8 +37632,8 @@
     20190917,
     1943
    ],
-   "commit": "1bbe1d0cb88564e6c5b74ccd78ab87a8b9998374",
-   "sha256": "1jrlcz940y8hpizsy7byimyc9drl3myfym1pg4sg374jrr1y8nz2"
+   "commit": "2a1584f06f95792f2c5a84c523bccaafbc5dbbab",
+   "sha256": "06aig4r5a4sfdpwh58pikj9ij95iiy2hakqjgszg54wdv5rljwvd"
   },
   "stable": {
    "version": [
@@ -37576,8 +37737,8 @@
    "deps": [
     "go-mode"
    ],
-   "commit": "1bbe1d0cb88564e6c5b74ccd78ab87a8b9998374",
-   "sha256": "1jrlcz940y8hpizsy7byimyc9drl3myfym1pg4sg374jrr1y8nz2"
+   "commit": "2a1584f06f95792f2c5a84c523bccaafbc5dbbab",
+   "sha256": "06aig4r5a4sfdpwh58pikj9ij95iiy2hakqjgszg54wdv5rljwvd"
   },
   "stable": {
    "version": [
@@ -38243,8 +38404,8 @@
     "magit-popup",
     "s"
    ],
-   "commit": "31565d975e8c13d4577f4fa705d897ed5da2d524",
-   "sha256": "00sdbwgn4fqbkahwyys3ffdppckbd9pikwjdwh6bpm6s70lpkf98"
+   "commit": "b51c3b036a2f375ef5b95de2d29f3792aad064d7",
+   "sha256": "05b6v6z6dxgpx9b2cp8k3d3fvj01l3smqymikri10ay975g3xawv"
   },
   "stable": {
    "version": [
@@ -39859,11 +40020,11 @@
   "repo": "haskell/haskell-mode",
   "unstable": {
    "version": [
-    20190801,
-    50
+    20190926,
+    313
    ],
-   "commit": "56d67ee282294c786a92e2d83c5bebf1a6d919c1",
-   "sha256": "1wschs4ny2b40bg8z86vc73zq32bv9mcxkyvgbmza44zvhqpdkwp"
+   "commit": "1bee161d3cea973d4ee3ff7acf980bf2cdeb83e2",
+   "sha256": "1vjxqqa08cxhsk69rcf0kn7bsfp6c5a9jax777h7ljc39fzcpf8q"
   },
   "stable": {
    "version": [
@@ -40193,16 +40354,16 @@
   "repo": "emacs-helm/helm",
   "unstable": {
    "version": [
-    20190920,
-    637
+    20190926,
+    609
    ],
    "deps": [
     "async",
     "helm-core",
     "popup"
    ],
-   "commit": "cfa42e9f94260887d5a54b3c2356d61903f424bc",
-   "sha256": "0lwhs7wlq2w698ipfjpfb0r2arkalrn8a21qdjnx3lvs4b2jj72l"
+   "commit": "72f68624b6f19ead155a7e1006a5550d92b8ec9f",
+   "sha256": "07sjy78yb8gclmvh8xjgkbh9gk06ns77g2z53wysf3markwg6pky"
   },
   "stable": {
    "version": [
@@ -41047,14 +41208,14 @@
   "repo": "emacs-helm/helm",
   "unstable": {
    "version": [
-    20190917,
-    551
+    20190924,
+    1617
    ],
    "deps": [
     "async"
    ],
-   "commit": "cfa42e9f94260887d5a54b3c2356d61903f424bc",
-   "sha256": "0lwhs7wlq2w698ipfjpfb0r2arkalrn8a21qdjnx3lvs4b2jj72l"
+   "commit": "72f68624b6f19ead155a7e1006a5550d92b8ec9f",
+   "sha256": "07sjy78yb8gclmvh8xjgkbh9gk06ns77g2z53wysf3markwg6pky"
   },
   "stable": {
    "version": [
@@ -41156,8 +41317,8 @@
     "dash-docs",
     "helm"
    ],
-   "commit": "6c76c794fec95586028633f24773451812af5df4",
-   "sha256": "0ajkflf6fzpxxgv2nzpxnc1d2rp32ba1lz9x4s2bini71krai88s"
+   "commit": "7f853bd34da666f0e9a883011c80f451b06f6c59",
+   "sha256": "0r192vzry1212ihabg9pgw9xar8zdgnbgy0vsgvfm8s5wj6ny7jp"
   },
   "stable": {
    "version": [
@@ -41584,6 +41745,36 @@
    "sha256": "11fyqk3h9cqynifc2zzqn0czrcj082wkdg1qhbj97nl4gcj787rl"
   }
  },
+ {
+  "ename": "helm-fd",
+  "commit": "ea8d504faa73bc0a649b13738ed7c6a76e2fad88",
+  "sha256": "1hlq0xxi616flykay9jr96rqgvs53dmlk50h25982jpl6xb63g9y",
+  "fetcher": "github",
+  "repo": "lerouxrgd/helm-fd",
+  "unstable": {
+   "version": [
+    20190923,
+    48
+   ],
+   "deps": [
+    "helm"
+   ],
+   "commit": "84a2aa656473f2921e35abad62b158b3813ee944",
+   "sha256": "14bdcr4db500sqv5p47jdkjp06hys35bpb07fp40v39r9pbzfdla"
+  },
+  "stable": {
+   "version": [
+    0,
+    1,
+    0
+   ],
+   "deps": [
+    "helm"
+   ],
+   "commit": "2891ca941b5a70facf35d5a8bbc791fc41ab0284",
+   "sha256": "16szlby36g393mwnywl59iyngrinnsd9xilsgadr6l9hngas4anm"
+  }
+ },
  {
   "ename": "helm-file-preview",
   "commit": "bf60b4c17c866cd89ff68b99aeb2941c6bc6d940",
@@ -42458,15 +42649,15 @@
   "repo": "torgeir/helm-js-codemod.el",
   "unstable": {
    "version": [
-    20171106,
-    1044
+    20190921,
+    942
    ],
    "deps": [
     "helm-core",
     "js-codemod"
    ],
-   "commit": "18503d94e64418e8ea5c5854f197ae9f3009cdbf",
-   "sha256": "0d5fsvfa017gda0jryjdvva1q04nry6grc1433gvgrqqp6vxayxc"
+   "commit": "29b1b3c441f0d7e450a3c65b5ff9e72023dc6314",
+   "sha256": "15lksdyk5z4xszfsdk290pm6ri5r9c2ki9jxmwppkqpd52w2dxck"
   }
  },
  {
@@ -43725,8 +43916,8 @@
     "helm",
     "rtags"
    ],
-   "commit": "3543b8404640884d901c719bb83c5474056cf97f",
-   "sha256": "1k1d3llf150rih8dba2fg7xp9ksnbfzdsj01lziqz396p34sim0f"
+   "commit": "d3d4bc9b7b829d39628a1af96f06eb23ba48670c",
+   "sha256": "0fgxrpqvqs988kjnkcc1lmyqnfc85ivhrarldl7iqgj25fvni6z1"
   },
   "stable": {
    "version": [
@@ -44731,20 +44922,20 @@
   "repo": "hlissner/emacs-hide-mode-line",
   "unstable": {
    "version": [
-    20180302,
-    1910
+    20190922,
+    115
    ],
-   "commit": "86b9057391edad75467261c2e579603567e608f9",
-   "sha256": "0qmjmwhmlm008r22n2mv7lir4v1lpfz1c3yvqlwjgv0glbyvqd88"
+   "commit": "88888825b5b27b300683e662fa3be88d954b1cea",
+   "sha256": "0dfzjgxfkcw4wisbyldsm1km18pfp9j8xgadn6qnsz11l55bpgyp"
   },
   "stable": {
    "version": [
     1,
     0,
-    1
+    2
    ],
-   "commit": "86b9057391edad75467261c2e579603567e608f9",
-   "sha256": "0qmjmwhmlm008r22n2mv7lir4v1lpfz1c3yvqlwjgv0glbyvqd88"
+   "commit": "88888825b5b27b300683e662fa3be88d954b1cea",
+   "sha256": "0dfzjgxfkcw4wisbyldsm1km18pfp9j8xgadn6qnsz11l55bpgyp"
   }
  },
  {
@@ -45547,6 +45738,26 @@
    "sha256": "0l4msj1i8amcn10dk1shcyh6hn49iphma1q03kp2h84ga79xdpi3"
   }
  },
+ {
+  "ename": "hnreader",
+  "commit": "65dc5e41f88158d7595aba7a66b791b205b929b7",
+  "sha256": "1y7ariri9q7dvda28rdp5i66c2xw74ap8cd7n6lskgnnxjk1yl8j",
+  "fetcher": "github",
+  "repo": "thanhvg/emacs-hnreader",
+  "unstable": {
+   "version": [
+    20190909,
+    258
+   ],
+   "deps": [
+    "org",
+    "promise",
+    "request"
+   ],
+   "commit": "7e68beff596a7c67ff436be5cc29660acd46f5df",
+   "sha256": "0yynfz8bw7nvzk05zxypn183y6hf243s55kxfiicnxx7shag217i"
+  }
+ },
  {
   "ename": "hoa-mode",
   "commit": "f8b91f35d06f9e7e17c9aaf2fb9ee43a77257113",
@@ -45777,16 +45988,16 @@
   "repo": "thanhvg/emacs-howdoyou",
   "unstable": {
    "version": [
-    20190916,
-    1812
+    20190921,
+    259
    ],
    "deps": [
     "org",
     "promise",
     "request"
    ],
-   "commit": "b84874a58c2301bc4c80155a9552eaad1e026b4b",
-   "sha256": "0ssx3zibsqf66biv7gypgi3i29pkmpgy8f5ydynl03m5ix3f2b86"
+   "commit": "8ebfcb2b8f708110040c5a3e6f4f0d46f33b025c",
+   "sha256": "1rsmz7av9ij11j307ncly78dhncyb7lxdcgpy0plfsyja3kw3m5q"
   }
  },
  {
@@ -45833,14 +46044,14 @@
   "repo": "Wilfred/ht.el",
   "unstable": {
    "version": [
-    20190830,
-    910
+    20190924,
+    704
    ],
    "deps": [
     "dash"
    ],
-   "commit": "3c1f3b527da6ad1b219d64957257acb22971cd73",
-   "sha256": "0mdg9v9vqjprqp6qbn8rk60b4dr6fam2p0g078zkw9092cvbzzmj"
+   "commit": "66c5f9131242697fabaede5566d87ecda4c14b1f",
+   "sha256": "0mip7v2w89wjs2nw4c198y7rpf9i7wsrjibmcnnzwxhcm1sidjnh"
   },
   "stable": {
    "version": [
@@ -46424,11 +46635,19 @@
   "repo": "muffinmad/emacs-ibuffer-project",
   "unstable": {
    "version": [
-    20181216,
-    2125
+    20190925,
+    1105
+   ],
+   "commit": "7de4f54a959de3254a98662777269ec7a08adbc9",
+   "sha256": "06p12hxnrbcjdwr8b1rmbm7b4hwkhp7lsrw4j6fnnf1hi27hngsq"
+  },
+  "stable": {
+   "version": [
+    1,
+    1
    ],
-   "commit": "7424e71062f2cb969c3e9951203022414dea37fb",
-   "sha256": "02rr81ddpand0hb3yaskklhpknnqfjkcqaa2w77xi4xlzjdima01"
+   "commit": "a29ed1f415902f21b5b17bf36ce1a0e46e29400c",
+   "sha256": "0b5d5gdqinnqfll82i994jmg6y4va2fallvh0d8g0978y3xx8vnp"
   }
  },
  {
@@ -47856,8 +48075,8 @@
   "repo": "NicolasPetton/Indium",
   "unstable": {
    "version": [
-    20190830,
-    2019
+    20190925,
+    1909
    ],
    "deps": [
     "company",
@@ -47866,23 +48085,24 @@
     "json-process-client",
     "seq"
    ],
-   "commit": "ded54e3b278a9358a15927b3085ea64562fbf2e6",
-   "sha256": "1dmdlm913rkxvhqj42n2mnqyay73y8ka6xdrs0w8xgq1r508iqmn"
+   "commit": "116d18c781eabf85bfc683e748a83f3c769a01ea",
+   "sha256": "0dsp614p827z7magdy7kn4acx6m9hzwwa3sd9zvarnrfymw9c5hi"
   },
   "stable": {
    "version": [
     2,
     1,
-    2
+    3
    ],
    "deps": [
     "company",
     "js2-mode",
     "js2-refactor",
+    "json-process-client",
     "seq"
    ],
-   "commit": "a55f3c2eaa6620c4ce2e61f1d1897db4080a2cd4",
-   "sha256": "07iah188fzmqyb3ag0rjygq68m317grpyibsgy64v8lzdrax0fbs"
+   "commit": "3895b0cfda53d33ef7e6819e745f0b1e158acbfa",
+   "sha256": "18wl3yxlqcvb03mb4wv6v20fpy24w9yqfgiva5jrp453bqhp3mfk"
   }
  },
  {
@@ -48909,10 +49129,10 @@
  },
  {
   "ename": "isortify",
-  "commit": "9d4ad18492e7f4a56a1515873bc0b66fa49829bb",
-  "sha256": "0nlpjd6mrhv8iccdny0x5lb41dpyp6l7kiax4xqra0rb2vq0chcs",
+  "commit": "c756ccbae044bc23131060355532261aa9a12409",
+  "sha256": "0bqs84prlwk94x543mv22wjnz0s7gqbdi7ryvdc20s7vdr18fn82",
   "fetcher": "github",
-  "repo": "proofit404/isortify",
+  "repo": "pythonic-emacs/isortify",
   "unstable": {
    "version": [
     20190315,
@@ -48921,8 +49141,8 @@
    "deps": [
     "pythonic"
    ],
-   "commit": "a0f6be09b92dff312b6ef9bec30f58cd8ada9623",
-   "sha256": "14hd6hbvsabrmqd44l2l598bib636wn2mzvpdwg61wjrbsd2czyy"
+   "commit": "ae7fb7163ce075209543f72953c9f431d103f6a3",
+   "sha256": "0gslib1r9d9dqd9r89dfg8npkybjw2bjdrbs0z2qcnfa82x4fq4z"
   }
  },
  {
@@ -49493,15 +49713,15 @@
   "repo": "tumashu/ivy-posframe",
   "unstable": {
    "version": [
-    20190819,
-    657
+    20190923,
+    2233
    ],
    "deps": [
     "ivy",
     "posframe"
    ],
-   "commit": "d9ceee94171767b4aba6c55ebe93e51ccbe0fa8a",
-   "sha256": "1ghn9n4lc50p94byi0z2vfgkwyh4q4i19j26dkqr2lyvfhsvvdwj"
+   "commit": "fc0a6a7a80d4396ea44d7ee08879f0f4b46d1b67",
+   "sha256": "150n1gdlnyhqkflhck4m1h0g01y9mppzs6j4dp1rhn2mhhf90hrc"
   }
  },
  {
@@ -49611,8 +49831,8 @@
     "ivy",
     "rtags"
    ],
-   "commit": "3543b8404640884d901c719bb83c5474056cf97f",
-   "sha256": "1k1d3llf150rih8dba2fg7xp9ksnbfzdsj01lziqz396p34sim0f"
+   "commit": "d3d4bc9b7b829d39628a1af96f06eb23ba48670c",
+   "sha256": "0fgxrpqvqs988kjnkcc1lmyqnfc85ivhrarldl7iqgj25fvni6z1"
   },
   "stable": {
    "version": [
@@ -50544,14 +50764,15 @@
   "repo": "nyyManni/jiralib2",
   "unstable": {
    "version": [
-    20190917,
-    1733
+    20190923,
+    1809
    ],
    "deps": [
+    "dash",
     "request"
    ],
-   "commit": "3d3fb0a65260a267123cddf52ee100561ef504fd",
-   "sha256": "0a6x1d6h85b14wfhmnmss9cvbkalfjmybq7bm1187g3afg3ycy7g"
+   "commit": "cb2bedb940afb7c163c5881f0cddc03d4a63c109",
+   "sha256": "16x1bwr9jwg8cfvn2vp8akqvl2j6q4pl8xkvpvimvvjv3girbq1a"
   }
  },
  {
@@ -50761,11 +50982,11 @@
   "repo": "torgeir/js-codemod.el",
   "unstable": {
    "version": [
-    20171104,
-    1154
+    20190921,
+    941
    ],
-   "commit": "014e56c846487d1eeaf8a91dd503b9d96eb1510a",
-   "sha256": "0s07ypjlqsx2pgq89wmr69w9p7ybc62abqp53kzf5gmdl6fdzgxq"
+   "commit": "056bdf3e5e0c807b8cf17edb5834179a90fb722b",
+   "sha256": "1s87jy1v7vjqpl09w2lafhliqhc5hm9061n7f2gfiw0hhv1xp6bw"
   }
  },
  {
@@ -51119,10 +51340,10 @@
  },
  {
   "ename": "json-process-client",
-  "commit": "38cf8baad750427268659c8b25d35270add18317",
-  "sha256": "0lv4xdihjphpg31zdzkzrhp715sj7y2sl87c6cz6akhlfz2mmm0h",
+  "commit": "a681f977631344190e2a35d9ac2cbb9a42402272",
+  "sha256": "0nf0lna15ymcn8wniz24ixxwr1qaznic9nym1q16ifwl72qryj79",
   "fetcher": "git",
-  "url": "https://gitlab.petton.fr/nico/json-process-client.git",
+  "url": "https://gitea.petton.fr/nico/json-process-client.git",
   "unstable": {
    "version": [
     20190827,
@@ -51538,8 +51759,8 @@
   "repo": "dzop/emacs-jupyter",
   "unstable": {
    "version": [
-    20190917,
-    1642
+    20190924,
+    143
    ],
    "deps": [
     "cl-lib",
@@ -51547,8 +51768,8 @@
     "websocket",
     "zmq"
    ],
-   "commit": "dcf80d51dbf9c8eea9679d5a54ca771221d6a1e0",
-   "sha256": "02zjnyw8x4dy9il9ans2c9mhz4lj6ni1s1brgbsbydkli1xavdhm"
+   "commit": "53da538b6634afe7e72b18b7b561afd9d2eeeb38",
+   "sha256": "0lbvi9sf7d02gzxhvn02w55bmcf7fv2lwmmgxv9vp3ya6dc03sya"
   },
   "stable": {
    "version": [
@@ -51865,15 +52086,15 @@
   "repo": "ogdenwebb/emacs-kaolin-themes",
   "unstable": {
    "version": [
-    20190812,
-    1835
+    20190921,
+    751
    ],
    "deps": [
     "autothemer",
     "cl-lib"
    ],
-   "commit": "9bc8dc1b69e6d858a523b98603201f60a51825fa",
-   "sha256": "0jb0z1p1n3fdmqlwrv7x0ndcccijdw6025gw6sm6qdyj09a241vw"
+   "commit": "97c8d71977f12e4b791bdd0646c3e128bbe9fc1b",
+   "sha256": "0jv817fpbvadqvl44xf9ai8iw2w6jhlc3gsvb9by6cr6rbqyz9js"
   },
   "stable": {
    "version": [
@@ -52517,8 +52738,8 @@
     20180702,
     2029
    ],
-   "commit": "72ac4e8f56a4ee432c9279cab044829beda22469",
-   "sha256": "0mvc71lxsx7wjkbravsj09zc5bhbq55hk1d0phwvzvjc271h38wy"
+   "commit": "0d1156a14f5fb59f420e67b1f3b899395cf595e0",
+   "sha256": "07i3jkvxja2a0bj7f7vlh2v2y2cialn4b4319r2kymaxlw5pmzk2"
   },
   "stable": {
    "version": [
@@ -53535,11 +53756,11 @@
   "repo": "ledger/ledger-mode",
   "unstable": {
    "version": [
-    20190901,
-    1439
+    20190925,
+    1300
    ],
-   "commit": "5067e40805c40e83424d206584838ffa8c8117c7",
-   "sha256": "093gbki5cvjscrl77nabh845axkxczqwbamwb4svc7wcky5xlpmx"
+   "commit": "129dfbab2f744c8d6b6bcd406001ff527c262aff",
+   "sha256": "09xq34q4zb6xq85nvp2aj56h96h8b3vy56ijn6i5zwrhlwwyj32i"
   },
   "stable": {
    "version": [
@@ -53574,8 +53795,8 @@
   "repo": "kaiwk/leetcode.el",
   "unstable": {
    "version": [
-    20190910,
-    221
+    20190924,
+    353
    ],
    "deps": [
     "aio",
@@ -53583,8 +53804,8 @@
     "graphql",
     "spinner"
    ],
-   "commit": "044fd1cd0bc727d888b424ffc5a81b22c7b802c1",
-   "sha256": "1i9wbbymdfjyz6z0vd5bl1c733pbfcf5cf1shl98s54sg5lq0p89"
+   "commit": "296a9dfba4f0cd55e27e5eea8a678d7084cff270",
+   "sha256": "0xcipajyii5l6lk4s30i7ninp08spq4vlg0smjp9rrcdilyfpnbn"
   }
  },
  {
@@ -54268,8 +54489,8 @@
   "repo": "abo-abo/lispy",
   "unstable": {
    "version": [
-    20190827,
-    1516
+    20190925,
+    1020
    ],
    "deps": [
     "ace-window",
@@ -54278,8 +54499,8 @@
     "iedit",
     "zoutline"
    ],
-   "commit": "7130b9d36f6d7eaed61e911772ba23e0c36659b3",
-   "sha256": "1swihyr4ir3a74kl8vppbl8s4yf3mwrvrjrpdfgvva0jys03bhsx"
+   "commit": "17cfa867ae81d2024a242b17d7b61f5840c22ec0",
+   "sha256": "1l13yja6s6jnsc00bv5axyfgwl6a5lvhmjjhm44fwi4rpjfl0rj4"
   },
   "stable": {
    "version": [
@@ -54567,14 +54788,14 @@
   "repo": "jingtaozf/literate-elisp",
   "unstable": {
    "version": [
-    20190804,
-    602
+    20190924,
+    526
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "1dd1aad8c4049423d1a7980191c25b4120681296",
-   "sha256": "07gp0l2y7ysl13n368jaqnj52fpqcirj0faz95rrzrysq9ap8xn8"
+   "commit": "039b94b08ff750fc5b8a5b0e051eec288627c545",
+   "sha256": "124m56rb2878gmlygcqpyyi18i3kn9xmpw72q6bjizjmakcpl30p"
   },
   "stable": {
    "version": [
@@ -55330,8 +55551,8 @@
   "repo": "emacs-lsp/lsp-mode",
   "unstable": {
    "version": [
-    20190918,
-    1903
+    20190926,
+    514
    ],
    "deps": [
     "dash",
@@ -55341,8 +55562,8 @@
     "markdown-mode",
     "spinner"
    ],
-   "commit": "9330d7c3f1431b38f84a2296572531f9574b7d6d",
-   "sha256": "1sy68585wp07av0z8aam93j4ywcz0b95zg1da59w86k54j6i27cj"
+   "commit": "0546d33e345c63265a6df812f2713e62dbe6a7ad",
+   "sha256": "1rp8abwx2pbm4zmsy13hkvhvxgpz876dnlfvxijvxchnf0dxwba4"
   },
   "stable": {
    "version": [
@@ -55493,8 +55714,8 @@
   "repo": "emacs-lsp/lsp-treemacs",
   "unstable": {
    "version": [
-    20190829,
-    2110
+    20190924,
+    1757
    ],
    "deps": [
     "dash",
@@ -55504,8 +55725,8 @@
     "lsp-mode",
     "treemacs"
    ],
-   "commit": "3adf416da2fcd7dd4eac33f87c3eff66d5b67624",
-   "sha256": "0dqa7ny01v7k16pjrb42393blccvck650803hbsf1bp40ainaks9"
+   "commit": "76c304df80256bb3314b177af3db27cf2f527b87",
+   "sha256": "0dai66jmpisf0h2qaiq32mzdzmnlzh5k2fi00wzg3l25vj13vvdr"
   }
  },
  {
@@ -55944,11 +56165,11 @@
   "repo": "roadrunner1776/magik",
   "unstable": {
    "version": [
-    20190730,
-    1911
+    20190922,
+    1727
    ],
-   "commit": "e7e32dc29382e1a59bb8963315d70fcc30473d6e",
-   "sha256": "1nhmd94x3h047r08wnl7nlrx0g6d17zwnj0km0gxlli9m61qwczs"
+   "commit": "e66f288844bbd4035a18da9444b2dc163faa8ed8",
+   "sha256": "1dpxihdq6ssqkgj2i6v1zcnk7hkpmk5fjvlwki7jamqlizzvy9is"
   }
  },
  {
@@ -55959,8 +56180,8 @@
   "repo": "magit/magit",
   "unstable": {
    "version": [
-    20190906,
-    2217
+    20190924,
+    2040
    ],
    "deps": [
     "async",
@@ -55969,8 +56190,8 @@
     "transient",
     "with-editor"
    ],
-   "commit": "5c424142704d481faafce7b834af67c1aca98e68",
-   "sha256": "0849yg97gkg3qp0xa67kxfq888i5nmmz0982zcvc3n4k6xswy52c"
+   "commit": "f788dd7f4730316378b8a222aa5d6b6f1efce94e",
+   "sha256": "1v2ml8nk7fkaapdcm88098wcc2mcgi0d3mil5dd57vhqmrn7d23z"
   },
   "stable": {
    "version": [
@@ -56297,8 +56518,8 @@
     "libgit",
     "magit"
    ],
-   "commit": "5c424142704d481faafce7b834af67c1aca98e68",
-   "sha256": "0849yg97gkg3qp0xa67kxfq888i5nmmz0982zcvc3n4k6xswy52c"
+   "commit": "f788dd7f4730316378b8a222aa5d6b6f1efce94e",
+   "sha256": "1v2ml8nk7fkaapdcm88098wcc2mcgi0d3mil5dd57vhqmrn7d23z"
   }
  },
  {
@@ -57679,26 +57900,26 @@
   "repo": "dochang/mb-url",
   "unstable": {
    "version": [
-    20181225,
-    1724
+    20190921,
+    2101
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "cec2140618692d5d8380151f570c2fac95deb6fb",
-   "sha256": "07bagma1kjirziyzgwmivf0j8fmdzia3d1a0npvyq0hkqnkwcn2a"
+   "commit": "d0165204f8c1195bbf77b615f9cefaa327973639",
+   "sha256": "08qj938b6fd97bxkc3fcrx0fa1d72vxxawa2z6g207cfv0b3i6im"
   },
   "stable": {
    "version": [
     0,
-    4,
+    5,
     0
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "23078f2e59808890268401f294d860ba51bc71d9",
-   "sha256": "07b9w9vd22ma4s3qhplmg84sylihz920byyi9qa7dwj7b59d4avf"
+   "commit": "d0165204f8c1195bbf77b615f9cefaa327973639",
+   "sha256": "08qj938b6fd97bxkc3fcrx0fa1d72vxxawa2z6g207cfv0b3i6im"
   }
  },
  {
@@ -58067,11 +58288,11 @@
   "repo": "ocaml/merlin",
   "unstable": {
    "version": [
-    20190920,
-    1510
+    20190922,
+    655
    ],
-   "commit": "91fc77b5d8e2612176684c12f2a3949b44bb27bf",
-   "sha256": "1wk49sjixx3q5iral9pn1nl4a1qv1hlpgadx49yp1d1qd2x8yy9k"
+   "commit": "b090fe2b058206566505287599116e32f6c373b7",
+   "sha256": "0l0bh14hwff75awjpivpar8b4zkbpf04crd212vivda1szrgy674"
   },
   "stable": {
    "version": [
@@ -58316,8 +58537,8 @@
     20190324,
     1908
    ],
-   "commit": "9dae5ef83bf3739fba5366a252450c0fcb460b70",
-   "sha256": "0fy962z5jqgrpyjqp8hd1xrvghbnl692h4zyksl9d93fhlisa3bf"
+   "commit": "89bdafacb8d7c65a0e4bbd2697b30d281e2b70ae",
+   "sha256": "0zlh241358p5jhmbdk9ias21jzrwxf7icn57ndx9714xvsxqzp3z"
   },
   "stable": {
    "version": [
@@ -58520,14 +58741,14 @@
   "repo": "kiennq/emacs-mini-modeline",
   "unstable": {
    "version": [
-    20190913,
-    221
+    20190925,
+    57
    ],
    "deps": [
     "dash"
    ],
-   "commit": "65b5371cd0c35983e6badd6b51493d4fddb8d7b6",
-   "sha256": "0rcxzvr7qgkfpx6kpcxrky3dm9dh791rk4ks7prn0rsgcmsi34f4"
+   "commit": "cee757ee72b9cf73fe87b5c472ac1edd823cd58a",
+   "sha256": "1pymxq18zijlvlwbf02bdk748g70zbxhf58c14sb2gbxy8p1j6hr"
   }
  },
  {
@@ -59343,11 +59564,11 @@
   "repo": "belak/emacs-monokai-pro-theme",
   "unstable": {
    "version": [
-    20190425,
-    2303
+    20190924,
+    2152
    ],
-   "commit": "747556c0cb38993c83ea8b6665869f42249d885a",
-   "sha256": "1xfc3v1bwxpn3j42h6b1vy6knjrlmskq95c9vgdlia9ffz5pg7r3"
+   "commit": "b5dcc197cf36b181362b468da48b67a5f2199cae",
+   "sha256": "1shpaglvwdhybpkfmigz8vvw5500kybl5mri05h8sfn3b8331kfc"
   }
  },
  {
@@ -61820,8 +62041,8 @@
     20181024,
     1439
    ],
-   "commit": "2321fd711c4bbe7bdc23060f3549f2aea9a95580",
-   "sha256": "1ak7hrm7wa8cdning4l8xh06p7kfdq1dz9r6svhbfqa9c7vb9zqy"
+   "commit": "21bd971ea9381e6c36d3a3be17a501899922ff73",
+   "sha256": "1vahangjygyx9y6blwml55l7anb74fa9malll7jirz9lxcah1mnv"
   },
   "stable": {
    "version": [
@@ -62051,6 +62272,27 @@
    "sha256": "1skbjmyikzyiic470sngskggs05r35m8vzm69wbmrjapczginnak"
   }
  },
+ {
+  "ename": "nnhackernews",
+  "commit": "40fec106c676f8207ec9c4553c3ec16c626b098c",
+  "sha256": "0nqbfzyb61a80900hg2sqimjvr765a3f94v07by55d1smifzwnff",
+  "fetcher": "github",
+  "repo": "dickmao/nnhackernews",
+  "unstable": {
+   "version": [
+    20190925,
+    1239
+   ],
+   "deps": [
+    "anaphora",
+    "dash",
+    "dash-functional",
+    "request"
+   ],
+   "commit": "2765b153a0a73b328d2a3a9ea3e3f5fbe6c2fd28",
+   "sha256": "1gip213471ni9yy0arvf7sii31a20q81mddmknlpmmvsx7raz6n8"
+  }
+ },
  {
   "ename": "nnir-est",
   "commit": "ca17de8cdd53bb32a9d3faaeb38f19f92b18ee38",
@@ -62074,8 +62316,8 @@
   "repo": "dickmao/nnreddit",
   "unstable": {
    "version": [
-    20190819,
-    2331
+    20190925,
+    1300
    ],
    "deps": [
     "anaphora",
@@ -62084,8 +62326,8 @@
     "request",
     "virtualenvwrapper"
    ],
-   "commit": "c16a75a6fd99f5c47f10b349131be1c3d85bbe9b",
-   "sha256": "0gabznnvg9gxd6rrvcik2iyrlmpl409vc5k37c3vfjrnjqnwk6ra"
+   "commit": "5081e2ab08a44a117a6d30cc046a972d37776d98",
+   "sha256": "1wjigf1w9nzm6lwf77v4d7myplci4456fd662lj5y8raxx6ygxgd"
   }
  },
  {
@@ -62424,8 +62666,8 @@
     20190525,
     1602
    ],
-   "commit": "23bcd003637f091c88f7d0a601d5fee82bc8e936",
-   "sha256": "0n0pw2h3zc5an8xr5zv38cicwd9nk8klnrsihdkw0hvd7llmb3qf"
+   "commit": "74a1b5ac65b31f7ebc1258b259b8c355023e21b4",
+   "sha256": "0gbfwh9sccykb84mrckz8lyk2h76p4g2di4j0jkhjf4lzy5q414r"
   },
   "stable": {
    "version": [
@@ -63622,6 +63864,30 @@
    "sha256": "1k2cfxaq38wv8s2x1c52v0bw55c12n399614l0dx1aqy2wh1afgi"
   }
  },
+ {
+  "ename": "ob-svgbob",
+  "commit": "77b7095d93730bfa193245df358fa50bef4faea6",
+  "sha256": "0746f70yswgqcx8awc7lfkh6r5982frlwirdij2pjb9ivw3a82h9",
+  "fetcher": "github",
+  "repo": "mgxm/ob-svgbob",
+  "unstable": {
+   "version": [
+    20190911,
+    300
+   ],
+   "commit": "5747f96fb4fdb8711546b3313df9412177eb3c1a",
+   "sha256": "1h60mzxp1wzd1kjkgligi04nb06mpkhij8imkva188inr0hzqlvm"
+  },
+  "stable": {
+   "version": [
+    0,
+    0,
+    1
+   ],
+   "commit": "9a930b1ed93e5ce1818029b2ec9e7662c098dbf4",
+   "sha256": "18c35xpllwv1zflinkh3ki00vclp4nk52sanfl2vppq6a6hyda8a"
+  }
+ },
  {
   "ename": "ob-swift",
   "commit": "b401383966398d3223032c59baa920ce594e5fef",
@@ -63951,17 +64217,17 @@
     20190726,
     1452
    ],
-   "commit": "daeb11532f846caa0e94b999dd2a413003a885b6",
-   "sha256": "01vw2r3xfjmsm6v5l7w7f2rlwl8qhs8fk5rp5j284db73gbqx61m"
+   "commit": "3ce84f2d009833883f908669a89a99c5274d01c3",
+   "sha256": "0hx7bfvqh5amsvsxx4qf6575k87n3xfj558a06sbrg0fnvg2vh1i"
   },
   "stable": {
    "version": [
     1,
     8,
-    0
+    1
    ],
-   "commit": "daeb11532f846caa0e94b999dd2a413003a885b6",
-   "sha256": "01vw2r3xfjmsm6v5l7w7f2rlwl8qhs8fk5rp5j284db73gbqx61m"
+   "commit": "3ce84f2d009833883f908669a89a99c5274d01c3",
+   "sha256": "0hx7bfvqh5amsvsxx4qf6575k87n3xfj558a06sbrg0fnvg2vh1i"
   }
  },
  {
@@ -64101,20 +64367,20 @@
   "repo": "rnkn/olivetti",
   "unstable": {
    "version": [
-    20190907,
-    2028
+    20190923,
+    840
    ],
-   "commit": "4bd3fb51961f8aacc3021bbaa9b39d90240f257d",
-   "sha256": "1wm1hhk08q6yvmy5aphd2msl9zj2basxc88ny2krjspbz3rcfnds"
+   "commit": "c7784fe2dccf676310a9a602b6eedc2a7b667499",
+   "sha256": "1fbj9s49y5yx5i429awv9rybacfgvhwp7v5h0zw67bpgx4qs44pa"
   },
   "stable": {
    "version": [
     1,
     8,
-    0
+    1
    ],
-   "commit": "57dbb94384d0ad0addd9b30c2dcade0362aa1476",
-   "sha256": "0ba30swqxxbpa8866chymywnahby1hk670zzkz44q49328i2wksj"
+   "commit": "c7784fe2dccf676310a9a602b6eedc2a7b667499",
+   "sha256": "1fbj9s49y5yx5i429awv9rybacfgvhwp7v5h0zw67bpgx4qs44pa"
   }
  },
  {
@@ -64651,11 +64917,11 @@
   "repo": "abo-abo/orca",
   "unstable": {
    "version": [
-    20190701,
-    1127
+    20190925,
+    915
    ],
-   "commit": "b07b69ba0052a0dd4ef59a20ec0e54f3c8cf137e",
-   "sha256": "12ahmqqvnl1vaf8qc4smsk6727bzmv3qja79kb00g3yf4k1r0nhk"
+   "commit": "68c9dbe235b1f97f12ff0f82878bb9e0ac971b1f",
+   "sha256": "0k5xsz0mlg4yhra80pixj10zl8dmy78r68hhd5q24dwqg6yic7f0"
   }
  },
  {
@@ -64956,14 +65222,14 @@
   "repo": "Kungsgeten/org-brain",
   "unstable": {
    "version": [
-    20190916,
-    619
+    20190922,
+    1414
    ],
    "deps": [
     "org"
    ],
-   "commit": "3098a782d3add11795036f7894adcf73e3a9472b",
-   "sha256": "1crlh3a9glz29zwnsnv1i6ha15l39zmmbvbk85pk91da7ikjb0qr"
+   "commit": "1f86e92c72cf52b75695c99572eeace7405caf96",
+   "sha256": "0vdpqg7jy60qlhsdbcfs592xfg32ybw71z1hhpabvhfms92sj2bx"
   }
  },
  {
@@ -66675,17 +66941,19 @@
   "repo": "alphapapa/org-ql",
   "unstable": {
    "version": [
-    20190918,
-    633
+    20190923,
+    2244
    ],
    "deps": [
     "dash",
     "org",
+    "org-super-agenda",
+    "ov",
     "s",
     "ts"
    ],
-   "commit": "8f2a02264f1dcd45e0d060655bffc45a7bde8235",
-   "sha256": "12xqg8w52q2bnbrsl49r0ygnsx8014skhfqjsfz3s9v0myfhx0m1"
+   "commit": "d33b2e0129cbf99df209e1a4d975cfa3d6d5c226",
+   "sha256": "02f5n0v3fq25vxhwsn21nv08s5ris5vq6l9ymsnpha6piqkd4h8d"
   },
   "stable": {
    "version": [
@@ -66779,15 +67047,15 @@
   "repo": "oer/org-re-reveal",
   "unstable": {
    "version": [
-    20190914,
-    1607
+    20190922,
+    1724
    ],
    "deps": [
     "htmlize",
     "org"
    ],
-   "commit": "07d4af7f601fb22d8ed74081c9f69ba9af61e474",
-   "sha256": "1zbz6hbddxbb264ibmhc04cmnpk17kb50jpn5l8878q4hxw5wwy2"
+   "commit": "db4848b2e24de71cf1c849ef05b36497ce4d40c1",
+   "sha256": "13zyf3mxaqqsdad1mm1cmqadwpm5b54wn3r0r1cavqv1hy104p6b"
   },
   "stable": {
    "version": [
@@ -66811,15 +67079,15 @@
   "repo": "oer/org-re-reveal-ref",
   "unstable": {
    "version": [
-    20190819,
-    921
+    20190921,
+    744
    ],
    "deps": [
     "org-re-reveal",
     "org-ref"
    ],
-   "commit": "12a85e3f6f1b2f4c9e0169c8642a78f71d933633",
-   "sha256": "0c03rd2rr43hbm4s9fd05qmhy98yvqdxg8da3dkwizkynr47f2yn"
+   "commit": "03aca420afeb6f701d2fae5d2add9eec19c89d10",
+   "sha256": "1r3daccda3km1s7r2bs03wivzczz07iyh8bbjsdf0fss2d8acdrg"
   }
  },
  {
@@ -66898,8 +67166,8 @@
   "repo": "jkitchin/org-ref",
   "unstable": {
    "version": [
-    20190916,
-    1534
+    20190921,
+    2346
    ],
    "deps": [
     "dash",
@@ -66913,8 +67181,8 @@
     "pdf-tools",
     "s"
    ],
-   "commit": "0831d2bfe5820d72121fe66e9e298cac04c23b71",
-   "sha256": "07wy73ybqd5zbi6qjvkqrag5jab1aswzrjvvajcips8ka849vsp5"
+   "commit": "0fa807ff6bdfce58bd9abec3d86a242dd76228e4",
+   "sha256": "1805klqzxvarjd499nb5184n60c7nxnnzyddwykvjy1add2jcvxa"
   },
   "stable": {
    "version": [
@@ -67069,6 +67337,45 @@
    "sha256": "1b721xp6dn54x2j73ysnzw9qxd9fxpvnqiy2y0issmz6xmccgzac"
   }
  },
+ {
+  "ename": "org-sidebar",
+  "commit": "fa65cb74eabe0c46094c64f1384e31b31a6a58e5",
+  "sha256": "0grzh47b6nnk1y7xqd1dfy2cyq688g589wfd5dp78g0wfqbmdl5c",
+  "fetcher": "github",
+  "repo": "alphapapa/org-sidebar",
+  "unstable": {
+   "version": [
+    20190923,
+    2231
+   ],
+   "deps": [
+    "dash",
+    "dash-functional",
+    "org",
+    "org-ql",
+    "org-super-agenda",
+    "s"
+   ],
+   "commit": "12df3c76e35de3e52b59678133e452785454f96b",
+   "sha256": "0vq3h1cnk1l0h66jrll4md3d6hrprjddl9fjx48dbdqq2zbly10b"
+  },
+  "stable": {
+   "version": [
+    0,
+    1
+   ],
+   "deps": [
+    "dash",
+    "org",
+    "org-ql",
+    "org-ql-agenda",
+    "org-super-agenda",
+    "s"
+   ],
+   "commit": "d55d0e8ddaba7843880a355daf6b33d6c0ed9bb8",
+   "sha256": "1zpjzlf372z68mqn3zfam1jfslnkx7hysxhpm2d77s63qbik0s21"
+  }
+ },
  {
   "ename": "org-snooze",
   "commit": "fd04816fb53fe01fa9924ec928c1dd41f2219d6a",
@@ -67157,11 +67464,11 @@
   "repo": "bastibe/org-static-blog",
   "unstable": {
    "version": [
-    20190916,
-    1307
+    20190924,
+    729
    ],
-   "commit": "f01d3793c4f1ba7099e12e7ed6d1b9c14bd48152",
-   "sha256": "0bg3yhy7a80gak7c0ilki8mv46hdzqddps232ab9zr7z6k01kpzj"
+   "commit": "9f1132fbb6f49609b61730e6769ee5c1d6542d82",
+   "sha256": "0pf7dm5yzy8as63sm5s3mn4npn5p39mvygvnz81jv4r922h9cici"
   },
   "stable": {
    "version": [
@@ -67211,8 +67518,8 @@
   "repo": "alphapapa/org-super-agenda",
   "unstable": {
    "version": [
-    20190909,
-    2144
+    20190925,
+    958
    ],
    "deps": [
     "dash",
@@ -67221,8 +67528,8 @@
     "s",
     "ts"
    ],
-   "commit": "f0ee7ed9766d352d16a787707d35695b48cbf153",
-   "sha256": "1b1qi96x83acv2frl94i4frx46i82vipaa8mfwpzyj2gyq2bq5zf"
+   "commit": "a87ca11fbbe72ab6c1c4c3b55ae9e1e93ebfb8ba",
+   "sha256": "08b7babdaqblb6jff57an4kbcxk6fkhf668620fipfjgbsnqv3ff"
   },
   "stable": {
    "version": [
@@ -67323,14 +67630,14 @@
   "repo": "cute-jumper/org-table-sticky-header",
   "unstable": {
    "version": [
-    20190906,
-    211
+    20190924,
+    506
    ],
    "deps": [
     "org"
    ],
-   "commit": "7789e2064acef418d4959eb15ee2648227968c9d",
-   "sha256": "190465gxhx9hirxwnl9gm1awqv87l6rxdm34yjmkhpm1zaaykc4l"
+   "commit": "b65442857128ab04724aaa301e60aa874a31a798",
+   "sha256": "1rnv7n444gidn2kqfbzc1wypj253nmlhn50x14pd8rdg4s3srpar"
   },
   "stable": {
    "version": [
@@ -67353,11 +67660,11 @@
   "repo": "mtekman/org-tanglesync.el",
   "unstable": {
    "version": [
-    20190916,
-    2055
+    20190924,
+    2040
    ],
-   "commit": "1e26c3fa1fce8c16edcb7e53a90bc3c37603453e",
-   "sha256": "1mq63vq7f6v6x2j99dd4vpi0417rk5k9m8ggqzc1n22lnymzck2z"
+   "commit": "9e6f074bae1ce7579f495b62fc6ee08f47b63e95",
+   "sha256": "0b6cx26fsqkp4r54k724v7klfczm40zn9hsb48wqiwc7v67qnka0"
   }
  },
  {
@@ -67788,8 +68095,8 @@
  },
  {
   "ename": "org2blog",
-  "commit": "6440f81aed1fcddcaf7afeedb74520e605211986",
-  "sha256": "15nr6f45z0i265llf8xs87958l5hvafh518k0s7jan7x1l6w5q33",
+  "commit": "781b2b45602cae8b972e5c8fd2b19bf7ee8133c6",
+  "sha256": "02gw1kjfm5v08bc1iwa029pk5v3jl277jiq62nmisxn8sd646f5s",
   "fetcher": "github",
   "repo": "org2blog/org2blog",
   "unstable": {
@@ -67965,11 +68272,11 @@
   "repo": "kostafey/organic-green-theme",
   "unstable": {
    "version": [
-    20190828,
-    922
+    20190923,
+    1308
    ],
-   "commit": "cde171651b08ef24326127a62992062e25c3e699",
-   "sha256": "0a970fv8y2pvbxw2iy09zyl70c2raacdsysdi6ywkxi63fid5l8r"
+   "commit": "f839bf213520d3736c3e3f712af3ca7ae5321411",
+   "sha256": "0xjn90wg0f7rich6yja9jm6h3104rihgizim59i1jq6rjngazwhv"
   }
  },
  {
@@ -67980,16 +68287,16 @@
   "repo": "elpa-host/organize-imports-java",
   "unstable": {
    "version": [
-    20190807,
-    1218
+    20190922,
+    1520
    ],
    "deps": [
     "cl-lib",
     "f",
     "s"
    ],
-   "commit": "df209ce7f8055bd9fbd93e7a03b42f1705a1933d",
-   "sha256": "1fx05xn22zj5dgdyxrz0ifzxwfpf1s5gcszkjyhzfg1g2r8kmf0v"
+   "commit": "de094d6d56c85aa9820c77055b54287ae6b46d20",
+   "sha256": "0hgdgz1jx292dfxcm1av4v9v6400jpnyp1j21d4fzfi0wj2srfrr"
   }
  },
  {
@@ -69208,8 +69515,8 @@
    "deps": [
     "org"
    ],
-   "commit": "d692f2fae4b01bb10b47828692e1654fb339bbee",
-   "sha256": "1sia5ijs0alr64078bdiax3mzr8103kzs8ia6k4qbv3a1w5bzgyf"
+   "commit": "00bef55f26eefb223662664f33f72810df1e8316",
+   "sha256": "0l6kgbfdqzg66c4qif7zablfk5mr0b0gh3jb24gih2ipxh67r76d"
   }
  },
  {
@@ -69220,14 +69527,14 @@
   "repo": "choppsv1/org-rfc-export",
   "unstable": {
    "version": [
-    20190429,
-    1133
+    20190923,
+    1004
    ],
    "deps": [
     "org"
    ],
-   "commit": "4cac33c387bc10e32f18940298aa5095d060ed3e",
-   "sha256": "0y442swdsh8fl3471bz9276r2srv6dp7j12y09s82xx5nm668nmb"
+   "commit": "8427bc0b680defd4276bfaa222136b9cbe1f96fc",
+   "sha256": "0ic7w7zgd5da487p8zra6vbv586f2rdhd5xqa6r1606cv203imbz"
   }
  },
  {
@@ -69630,14 +69937,14 @@
   "repo": "purcell/package-lint",
   "unstable": {
    "version": [
-    20190908,
-    2158
+    20190923,
+    8
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "6bee682fac762fd245f9156718393a4eb05c45ed",
-   "sha256": "0vc0d610q7wpyfvf395958njkwpl33bsfi288pi2qcvl6smr1hlh"
+   "commit": "f2899cac84689d687cf62c61ae9ec587febaf225",
+   "sha256": "1qkackrp6ch8p77j5iqh64qbp0kbi13aw26v4lg35dya2z6y6k3k"
   },
   "stable": {
    "version": [
@@ -69665,8 +69972,8 @@
    "deps": [
     "package-lint"
    ],
-   "commit": "6bee682fac762fd245f9156718393a4eb05c45ed",
-   "sha256": "0vc0d610q7wpyfvf395958njkwpl33bsfi288pi2qcvl6smr1hlh"
+   "commit": "f2899cac84689d687cf62c61ae9ec587febaf225",
+   "sha256": "1qkackrp6ch8p77j5iqh64qbp0kbi13aw26v4lg35dya2z6y6k3k"
   },
   "stable": {
    "version": [
@@ -70021,15 +70328,15 @@
   "repo": "joostkremers/pandoc-mode",
   "unstable": {
    "version": [
-    20190916,
-    1104
+    20190925,
+    822
    ],
    "deps": [
     "dash",
     "hydra"
    ],
-   "commit": "554a942654f850077364d2358177f232cfa0f06d",
-   "sha256": "1va4yykj8sfvgx7f6v4vyxl316y58xgc6naglpjvq51jml1x1sss"
+   "commit": "5b1275cbf5f6eb5617e1c7775c935fb1ddd6ae68",
+   "sha256": "10lk0f0wxjdyccp881x0j53g73cadjqdhny3qdmzbg8lblgl79gg"
   },
   "stable": {
    "version": [
@@ -70512,8 +70819,8 @@
     "password-store",
     "password-store-otp"
    ],
-   "commit": "35e3f86e96878520e690513cdbc1b2753b173e72",
-   "sha256": "0jc8j421mlflspg24jvrqc2n3y5n3cpk3hjy560il8g36xi1049p"
+   "commit": "919d8e3826d556433ab67d4ee21a509d209d1baa",
+   "sha256": "03cf7d51p7d5a9nmlzp1k0n68j4n0di0nmpmcx3vlfd62lk3rs2p"
   },
   "stable": {
    "version": [
@@ -71410,20 +71717,20 @@
   "repo": "Fanael/persistent-scratch",
   "unstable": {
    "version": [
-    20190128,
-    1843
+    20190922,
+    1046
    ],
-   "commit": "71371a7ce9846754276350fd577dc7543eb52878",
-   "sha256": "0n638krbrs2hx97cgkb5nc0fbrd8wsbmb7mz3ym5mx5pvdyxnlgv"
+   "commit": "fd690e138459e0b490f1fda469811a9cbcb34df7",
+   "sha256": "1nig9ja42sm3nkbi9wrsm86akrq0m85jfc65k9rmym13vrdpflvq"
   },
   "stable": {
    "version": [
     0,
     3,
-    3
+    4
    ],
-   "commit": "71371a7ce9846754276350fd577dc7543eb52878",
-   "sha256": "0n638krbrs2hx97cgkb5nc0fbrd8wsbmb7mz3ym5mx5pvdyxnlgv"
+   "commit": "fd690e138459e0b490f1fda469811a9cbcb34df7",
+   "sha256": "1nig9ja42sm3nkbi9wrsm86akrq0m85jfc65k9rmym13vrdpflvq"
   }
  },
  {
@@ -72048,8 +72355,8 @@
     20190919,
     1405
    ],
-   "commit": "d144da948fed71c4fad3494de9e78e1a6fc96c6f",
-   "sha256": "0m1amqbwz63j6kimk2kj6p8ba30qnvby13dc6iszxf0p78hzdhrx"
+   "commit": "ba45a54d45fbf0cb8dfcf8aaa62ae42d43d449bb",
+   "sha256": "12wmh5306xr5jl9l2v02bgswvxkn98pfhny2491mivhgsmra1svi"
   },
   "stable": {
    "version": [
@@ -72312,14 +72619,26 @@
   "repo": "ahungry/pickle-mode",
   "unstable": {
    "version": [
-    20190816,
-    341
+    20190923,
+    354
+   ],
+   "deps": [
+    "cl-lib"
+   ],
+   "commit": "3a0a717f2a24827667f34bc53830a3b81cd57460",
+   "sha256": "1r12r21882bq22w6cawf28ndf70nz2nd0f2wagdfr5a9ir9wchfy"
+  },
+  "stable": {
+   "version": [
+    0,
+    0,
+    3
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "0dab75b9f75dc2d0cf28f876cc9e2d127e6dca15",
-   "sha256": "03jp4nhca78k8kl6r5g8c2spjxsamhmqq5p3fqhiniqm3sz5v6cf"
+   "commit": "3a0a717f2a24827667f34bc53830a3b81cd57460",
+   "sha256": "1r12r21882bq22w6cawf28ndf70nz2nd0f2wagdfr5a9ir9wchfy"
   }
  },
  {
@@ -74197,11 +74516,11 @@
   "repo": "tumashu/posframe",
   "unstable": {
    "version": [
-    20190805,
-    956
+    20190924,
+    759
    ],
-   "commit": "bfd2e55219e0911980f4ea97b5995ce8553dce60",
-   "sha256": "19vvhx9x6646va4s4yy77inll9d2mhipakvz4pyz4pjw8pjcd94x"
+   "commit": "bb1393383d512d7358549c99f95b45e7d56d7d2c",
+   "sha256": "1xxq1jnzvms053k7n04mx9y7x68j1h9mij056ai31raxm751mr05"
   },
   "stable": {
    "version": [
@@ -76275,10 +76594,10 @@
  },
  {
   "ename": "pyenv-mode",
-  "commit": "acc9b816796b9f142c53f90593952b43c962d2d8",
-  "sha256": "00yqrk92knv9gq1m9xcg78gavv70jsjlwzkllzxl63iva9qrch59",
+  "commit": "c756ccbae044bc23131060355532261aa9a12409",
+  "sha256": "05rfppn75130m5zpg5yz9bz1r7wap05jmd9v08fbqjipv98ckpz3",
   "fetcher": "github",
-  "repo": "proofit404/pyenv-mode",
+  "repo": "pythonic-emacs/pyenv-mode",
   "unstable": {
    "version": [
     20170801,
@@ -76287,8 +76606,8 @@
    "deps": [
     "pythonic"
    ],
-   "commit": "123facbaca9aa53dbf990348ea2780cbbdd0f96a",
-   "sha256": "0gwf5za48b20lfs3cm0syd2jmnnzgyqx5b4f4vvfiipyy8dqgxjf"
+   "commit": "aec6f2aa289f6aed974f053c081143758dd142fb",
+   "sha256": "1zmgm24d6s56jc4ix61058p1k0h95vdvdllr7fh1k3bq4mw22qn3"
   },
   "stable": {
    "version": [
@@ -76366,8 +76685,8 @@
   "repo": "tumashu/pyim",
   "unstable": {
    "version": [
-    20190906,
-    708
+    20190925,
+    252
    ],
    "deps": [
     "async",
@@ -76375,8 +76694,8 @@
     "pyim-basedict",
     "xr"
    ],
-   "commit": "8a14040b6b6f600c6e0df2455a19662c997a1768",
-   "sha256": "11ysppg9h2n2m9qi6ml5hi1lwqj7h21hdi4h50cw5b24k334dyyz"
+   "commit": "172a099fe1212d560dab72569f3b0091735a8eb8",
+   "sha256": "0bjjphamw6n7fi86k24zx1wdm6i9hirnf100vkaiyjqmf34490dc"
   },
   "stable": {
    "version": [
@@ -76521,8 +76840,8 @@
     20170402,
     1255
    ],
-   "commit": "de75ba13eedd6cb6e84a96e0b79765e890c46efe",
-   "sha256": "0z81z1j2qgpgbx4mjj57fkaxvxwbnzm2hrnaayi1nlkf72a6ccj9"
+   "commit": "fde732e0e9a4f224c5ae48ad942c6d955aa0a8e6",
+   "sha256": "1wz5psdrpxi58vs2wpz9vagxdrzghc839whqvsa2y71ka3z923rk"
   }
  },
  {
@@ -76869,10 +77188,10 @@
  },
  {
   "ename": "pythonic",
-  "commit": "5589c55d459f15717914061d0f0f4caa32caa13c",
-  "sha256": "1hq0r3vg8vmgw89wfjdqknwm76pimlk0dy56wmh9vffh06gqsb51",
+  "commit": "c756ccbae044bc23131060355532261aa9a12409",
+  "sha256": "12yaxpir17bccj5zwd9lsm8dzd7qlflm8kcf8m1c0pxzgpsk0i5p",
   "fetcher": "github",
-  "repo": "proofit404/pythonic",
+  "repo": "pythonic-emacs/pythonic",
   "unstable": {
    "version": [
     20190725,
@@ -76882,8 +77201,8 @@
     "f",
     "s"
    ],
-   "commit": "97135d933db4567fd817c51b3c93c94b2864395e",
-   "sha256": "08x5q7cgrgaamjidbzr65d0x5f0q1wmdzz4rlvw38mv6y30pifnr"
+   "commit": "29f8049e56141805b0ee1a2c5fc62c3b027aa736",
+   "sha256": "12dhh11q16crhb6dffwx3s7ncgbqsvc2dvpkzgllr58iwd8hs2kk"
   },
   "stable": {
    "version": [
@@ -77350,14 +77669,14 @@
   "repo": "greghendershott/racket-mode",
   "unstable": {
    "version": [
-    20190917,
-    1350
+    20190925,
+    1446
    ],
    "deps": [
     "faceup"
    ],
-   "commit": "8e2c6c5c7fc2677f18067f5f6ce4b1836d288352",
-   "sha256": "1iwsjdw52plkvivj79rk83d15l6wfxpg7l78hkbhzg3brxj0lg1l"
+   "commit": "bf31305d903b375f2be88d99f87891843a604e5d",
+   "sha256": "0mq6x3sbhs83imj4g1p92739ldkhqv5g3bnnyzp7yhpcpjk1519n"
   }
  },
  {
@@ -77704,11 +78023,11 @@
   "repo": "thiagoa/rbtagger",
   "unstable": {
    "version": [
-    20190916,
-    1757
+    20190925,
+    2046
    ],
-   "commit": "d82c64d01002077f6bd5fa9d78c35ab3d6ef63e0",
-   "sha256": "0azd15bpn8z7538fq2s577ljwj2r5b6qf511hrzr9791m8vnzb3h"
+   "commit": "831041ea12bb4963fb72386f6c17faf9988013e8",
+   "sha256": "0ssyyw67pvl6py33gq9cfhqlpbsw5dwli130h6lqnjm6yy8li8z5"
   },
   "stable": {
    "version": [
@@ -79176,11 +79495,11 @@
   "repo": "tkf/emacs-request",
   "unstable": {
    "version": [
-    20190920,
-    1649
+    20190923,
+    1502
    ],
-   "commit": "b074594a8eafe8fbd2f97687ac396900e2fe57b9",
-   "sha256": "1pahi7vvffcpldc5x39brpvjfipyqzagjzmmmdg6mxk5hjw2dvyq"
+   "commit": "61b29734d7c44a594598a7674f2c6c575462dd4b",
+   "sha256": "1c8giy34pqzcdh3a7afp4308bj0764wk87c3smfkihfl3clc53ys"
   },
   "stable": {
    "version": [
@@ -79207,8 +79526,8 @@
     "deferred",
     "request"
    ],
-   "commit": "b074594a8eafe8fbd2f97687ac396900e2fe57b9",
-   "sha256": "1pahi7vvffcpldc5x39brpvjfipyqzagjzmmmdg6mxk5hjw2dvyq"
+   "commit": "61b29734d7c44a594598a7674f2c6c575462dd4b",
+   "sha256": "1c8giy34pqzcdh3a7afp4308bj0764wk87c3smfkihfl3clc53ys"
   },
   "stable": {
    "version": [
@@ -79521,16 +79840,17 @@
   "repo": "dajva/rg.el",
   "unstable": {
    "version": [
-    20190917,
-    1351
+    20190925,
+    543
    ],
    "deps": [
     "cl-lib",
     "s",
+    "transient",
     "wgrep"
    ],
-   "commit": "316dd7e3e7d9fa1f55a5cc3233469970589a2dee",
-   "sha256": "0wc2qmzfc77ff25cml1fb1pdng57jnwj8gxkh67p0gh8irl62714"
+   "commit": "d948457034527f1ed9d0d3b00ee81d7ff0abfc02",
+   "sha256": "1hqdhrzhr4yyn0n8pd7xxbj76ibzb6zb35yg8c3kwsba7m3sm6vi"
   },
   "stable": {
    "version": [
@@ -80072,8 +80392,8 @@
     20190918,
     505
    ],
-   "commit": "3543b8404640884d901c719bb83c5474056cf97f",
-   "sha256": "1k1d3llf150rih8dba2fg7xp9ksnbfzdsj01lziqz396p34sim0f"
+   "commit": "d3d4bc9b7b829d39628a1af96f06eb23ba48670c",
+   "sha256": "0fgxrpqvqs988kjnkcc1lmyqnfc85ivhrarldl7iqgj25fvni6z1"
   },
   "stable": {
    "version": [
@@ -80541,11 +80861,11 @@
   "repo": "rust-lang/rust-mode",
   "unstable": {
    "version": [
-    20190517,
-    2037
+    20190923,
+    2214
    ],
-   "commit": "af84c0fe9ec13e45f6b7f07caf144607d0b82fca",
-   "sha256": "1b7lrbx5hk9vxr8zws8vcv3pfr3h0xjmc67kcw2njsjc83p4icwl"
+   "commit": "295e234e5ceb62c047c50ff14bd6ab0a39499816",
+   "sha256": "0hm3mii2d6p93jf4ld8rkrk55pklzj7zlsy14rrc6xh02n2lzzi4"
   },
   "stable": {
    "version": [
@@ -80588,8 +80908,8 @@
   "repo": "brotzeit/rustic",
   "unstable": {
    "version": [
-    20190919,
-    1217
+    20190922,
+    930
    ],
    "deps": [
     "dash",
@@ -80603,8 +80923,8 @@
     "spinner",
     "xterm-color"
    ],
-   "commit": "2f89af8886cfb346b136fe60c80e2f4e3de5bb0c",
-   "sha256": "1gggjg69c0jqyijqgmdbhvhpxspivxp3ljwj2ypzygx2xgmrih1h"
+   "commit": "911676a82fb561cc59c9e54e87d566c5a23469f5",
+   "sha256": "1nlp7apy7d6dwxhn61awdy2vhckjjsps4wk0ffjrnjnjhypljwqn"
   }
  },
  {
@@ -82573,8 +82893,8 @@
     20190826,
     741
    ],
-   "commit": "c9cdb7e3075ddfc9aef356d42b376ebbb039bc7e",
-   "sha256": "1vg43ln70kifk3h0rwmj7w85mksg1yl3z4kqfq9q5zalp9jgwfsh"
+   "commit": "f5abefa599e63a769b08debf1aa8f13e77a2b1b4",
+   "sha256": "0kr136ya51iw5nv72jrkk2wn6m2zr86b19b93i1pplhvq465a9bm"
   }
  },
  {
@@ -82646,11 +82966,11 @@
   "repo": "elpa-host/show-eol",
   "unstable": {
    "version": [
-    20190517,
-    257
+    20190924,
+    621
    ],
-   "commit": "ea4d5253d2a9ee61f0e76898f0ab760b5574df43",
-   "sha256": "1nmx1nxwb6fqkl5h988cjs3yi5cp65wm50w2lbffjd15pswd9kyg"
+   "commit": "097a2a79e5bd7c297bcdc231559813056cd584ac",
+   "sha256": "0yhwd20azk6ib992fy3vzb9knqji3g6hz3ahz89sz71sjjvy1rrm"
   }
  },
  {
@@ -83515,15 +83835,15 @@
   "repo": "slime/slime",
   "unstable": {
    "version": [
-    20190920,
-    1906
+    20190925,
+    1213
    ],
    "deps": [
     "cl-lib",
     "macrostep"
    ],
-   "commit": "ebf170aed587e98d9af75151df1d497e185f5ae0",
-   "sha256": "0mnw8s073am4inyg271xpsk79v5ha5bc646a9rd3b32152hlwnl7"
+   "commit": "0bd5891373adf44ab453880dc5549ef53ffc9dba",
+   "sha256": "1dpl1xb5psm83ls5nsl34wiw5zz5csmdm6vfqdr7szxncdsfjij1"
   },
   "stable": {
    "version": [
@@ -84008,14 +84328,14 @@
   "repo": "jojojames/smart-jump",
   "unstable": {
    "version": [
-    20190423,
-    158
+    20190925,
+    1518
    ],
    "deps": [
     "dumb-jump"
    ],
-   "commit": "7df77da872dc836dbf032388fc6de82dbc9fa22c",
-   "sha256": "0w8jfsm6k2ayk0hg0imsm2vv8y5im5crlij9zi18iwa1mrqkmhsp"
+   "commit": "07800ddd508cf620e6360e4a1f5bb25f8eab3ab1",
+   "sha256": "0g6s5v2mpdd06i8yih8c8qj3bz1j1bdnki1937mn5ca163gjlrr9"
   }
  },
  {
@@ -86224,17 +86544,17 @@
  },
  {
   "ename": "stan-mode",
-  "commit": "67a44a0abe675238b10decdd612b67e418caf34b",
-  "sha256": "17ph5khwwrcpyl96xnp3rsbmnk7mpwmgskxka3cfgkm190qihfqy",
+  "commit": "0d31e038cd133936085994641f9af2bb7d15ba36",
+  "sha256": "1pvdh1pgjcbvkw2qh1mpazfrmcjhwv95a1s4flbn4zijmb2zigdf",
   "fetcher": "github",
   "repo": "stan-dev/stan-mode",
   "unstable": {
    "version": [
-    20190805,
-    1427
+    20190921,
+    111
    ],
-   "commit": "e60fe0caecb8e84d0b8fc160a0cdf8343e33d905",
-   "sha256": "16wl8r1409v3cjfb91fkv42gf9cbzgcd1cvqpypj3jm3hdmlz9gz"
+   "commit": "80930bb4f222b8fa11b1e64ba2f2905c0d3dd228",
+   "sha256": "1sqana7wy8r7l6zy8sjv89a92qqlxn4z1zckbjk2zld68hp6q6cd"
   },
   "stable": {
    "version": [
@@ -86248,21 +86568,21 @@
  },
  {
   "ename": "stan-snippets",
-  "commit": "eda8539b7d8da3a458a38f7536ed03580f9088c3",
-  "sha256": "021skkvak645483s7haz1hsz98q3zd8hqi9k5zdzaqlabwdjwh85",
+  "commit": "57f9fe7c4735d4106ad2a0f27331c3e3fe8833c0",
+  "sha256": "1ar2abnlav1sy9622387ps5gr7fls0mx2msczvan4wrc1nnfvwdx",
   "fetcher": "github",
   "repo": "stan-dev/stan-mode",
   "unstable": {
    "version": [
-    20190805,
-    1427
+    20190921,
+    1827
    ],
    "deps": [
     "stan-mode",
     "yasnippet"
    ],
-   "commit": "e60fe0caecb8e84d0b8fc160a0cdf8343e33d905",
-   "sha256": "16wl8r1409v3cjfb91fkv42gf9cbzgcd1cvqpypj3jm3hdmlz9gz"
+   "commit": "80930bb4f222b8fa11b1e64ba2f2905c0d3dd228",
+   "sha256": "1sqana7wy8r7l6zy8sjv89a92qqlxn4z1zckbjk2zld68hp6q6cd"
   },
   "stable": {
    "version": [
@@ -87270,6 +87590,26 @@
    "sha256": "1gw09x5d4yqlmknjsrhgygp9bch315cnmyqp3679i3hza0l7fds6"
   }
  },
+ {
+  "ename": "swift-helpful",
+  "commit": "052fb5b561bee1dd71c2c227c75c4f6db4261f68",
+  "sha256": "0rrhi14asrswzg4pn38vyqrc0bh83bs4jfvdj3sbd7jd1zizgj09",
+  "fetcher": "github",
+  "repo": "danielmartin/swift-helpful",
+  "unstable": {
+   "version": [
+    20190923,
+    1022
+   ],
+   "deps": [
+    "dash",
+    "lsp-mode",
+    "swift-mode"
+   ],
+   "commit": "5d07fa0d574a3ef58dfb0341da118e37c86bf6c5",
+   "sha256": "1jf4544jzn75vkxhxaj3xk3284nz94ik1gxk6b5hzy0r643ccklw"
+  }
+ },
  {
   "ename": "swift-mode",
   "commit": "6440f81aed1fcddcaf7afeedb74520e605211986",
@@ -87806,14 +88146,14 @@
   "repo": "emacs-berlin/syntactic-close",
   "unstable": {
    "version": [
-    20190905,
-    619
+    20190923,
+    1030
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "9bc6dd926bb879cd95ac0def484181f8c6b53419",
-   "sha256": "0bss78m7x46rdivdz74pygq5vdvsna1aabrdj081g4ay36n6grrj"
+   "commit": "a6c2c24453d18a653fe365707692ad354781cba3",
+   "sha256": "0k3ndhgw2hglkd572zgyaf3znk6pmm8sdn4ma681b4vd7m1j2yw1"
   }
  },
  {
@@ -88468,14 +88808,14 @@
   "repo": "zevlg/telega.el",
   "unstable": {
    "version": [
-    20190920,
-    1329
+    20190925,
+    1406
    ],
    "deps": [
     "visual-fill-column"
    ],
-   "commit": "54a340d891ce3c99d2eb51d43cdfe7531708128d",
-   "sha256": "0421xy85vzf443ildd6sn9srifw86kh7v2vn4wg1c91s0y3sq0y7"
+   "commit": "cfb9a581b0832266386f3a6229d3e4f944168652",
+   "sha256": "1s0zg7a737vsd1yxwnlxgh7w19i9w52scm1402fsil3i8sgznr1f"
   },
   "stable": {
    "version": [
@@ -89478,18 +89818,18 @@
     20180905,
     1050
    ],
-   "commit": "21ef6dc0625e6befbffbd5878265ee9985406151",
-   "sha256": "012kfjjb5jpzairp17cdafry8mw5v8w2dqplzhx41bw18y88qv67"
+   "commit": "ba36b4665dff17fa3996c114be56c1d0673aca4e",
+   "sha256": "070nd0dxz1gcw3dsf913gs5p8p7xm83l0g52hpq2cg9max5xr07n"
   },
   "stable": {
    "version": [
     2019,
-    7,
-    29,
+    9,
+    23,
     0
    ],
-   "commit": "e30e8a85fdd5e66318be64a66f879e42ace97825",
-   "sha256": "0n9yvw7m3wj5nphiavb27s8g8nnzwlm42k781y6rzwb0q8baxnzz"
+   "commit": "2f9839604e2569120cc4876c667388da6d7342f2",
+   "sha256": "13sma0vbm5g90sa8yxw03rna1kx0nv7zimm8nnw13k1swv0zm21l"
   }
  },
  {
@@ -89545,8 +89885,8 @@
    "deps": [
     "haskell-mode"
    ],
-   "commit": "621d95f6563d550bf777a51a2010f23382d61a78",
-   "sha256": "0ps8zjfkwjan5ziil6jhz7ls3mzgk970js0gaja3ndwsd5nlsmq2"
+   "commit": "6c25387d6ba088258c6ae2fe0079936395ff8f8d",
+   "sha256": "1bnva874xw3i8qqh4w1jy16jhmxv3b3n86dsvzcrpmq4nk09m5lh"
   },
   "stable": {
    "version": [
@@ -89951,16 +90291,16 @@
   "repo": "abrochard/emacs-todoist",
   "unstable": {
    "version": [
-    20190627,
-    2139
+    20190925,
+    39
    ],
    "deps": [
     "dash",
     "org",
     "transient"
    ],
-   "commit": "ca38839638580001600f076c8075369916d24507",
-   "sha256": "1l6zrsfx4b06rl07ndlyabqg8pp1bnila40cgadpnmqvh5w6sfdz"
+   "commit": "9c6b4e6abcd53d323a992181d6b5ac72cc370c72",
+   "sha256": "178wb528lpf5phcw2nqpmb83k86by59kfmp4qhwixgagnwzz89r5"
   }
  },
  {
@@ -90553,8 +90893,8 @@
   "repo": "Alexander-Miller/treemacs",
   "unstable": {
    "version": [
-    20190916,
-    913
+    20190922,
+    1026
    ],
    "deps": [
     "ace-window",
@@ -90566,8 +90906,8 @@
     "pfuture",
     "s"
    ],
-   "commit": "dba721a03451802872cb783569a6782504a295c3",
-   "sha256": "1cqii0i8ka8n5nrxrid7rg2xdcq994sdaabbiy4lcs1dynwlyp9h"
+   "commit": "6a0b1fce801bf0791bc3eee7b0dc4bbbcf95e6a7",
+   "sha256": "16axm791cg49mi61wrqdj5mcadh59zvmslmkfb1bwai5v43br8nc"
   },
   "stable": {
    "version": [
@@ -90603,8 +90943,8 @@
     "evil",
     "treemacs"
    ],
-   "commit": "dba721a03451802872cb783569a6782504a295c3",
-   "sha256": "1cqii0i8ka8n5nrxrid7rg2xdcq994sdaabbiy4lcs1dynwlyp9h"
+   "commit": "6a0b1fce801bf0791bc3eee7b0dc4bbbcf95e6a7",
+   "sha256": "16axm791cg49mi61wrqdj5mcadh59zvmslmkfb1bwai5v43br8nc"
   },
   "stable": {
    "version": [
@@ -90634,8 +90974,8 @@
     "cl-lib",
     "treemacs"
    ],
-   "commit": "dba721a03451802872cb783569a6782504a295c3",
-   "sha256": "1cqii0i8ka8n5nrxrid7rg2xdcq994sdaabbiy4lcs1dynwlyp9h"
+   "commit": "6a0b1fce801bf0791bc3eee7b0dc4bbbcf95e6a7",
+   "sha256": "16axm791cg49mi61wrqdj5mcadh59zvmslmkfb1bwai5v43br8nc"
   },
   "stable": {
    "version": [
@@ -90666,8 +91006,8 @@
     "pfuture",
     "treemacs"
    ],
-   "commit": "dba721a03451802872cb783569a6782504a295c3",
-   "sha256": "1cqii0i8ka8n5nrxrid7rg2xdcq994sdaabbiy4lcs1dynwlyp9h"
+   "commit": "6a0b1fce801bf0791bc3eee7b0dc4bbbcf95e6a7",
+   "sha256": "16axm791cg49mi61wrqdj5mcadh59zvmslmkfb1bwai5v43br8nc"
   },
   "stable": {
    "version": [
@@ -90698,8 +91038,8 @@
     "projectile",
     "treemacs"
    ],
-   "commit": "dba721a03451802872cb783569a6782504a295c3",
-   "sha256": "1cqii0i8ka8n5nrxrid7rg2xdcq994sdaabbiy4lcs1dynwlyp9h"
+   "commit": "6a0b1fce801bf0791bc3eee7b0dc4bbbcf95e6a7",
+   "sha256": "16axm791cg49mi61wrqdj5mcadh59zvmslmkfb1bwai5v43br8nc"
   },
   "stable": {
    "version": [
@@ -91228,8 +91568,8 @@
     20190918,
     1042
    ],
-   "commit": "1bafd279cf5161476aa540267ea0a45684749cbd",
-   "sha256": "04wm5rd8zjwd91k87l705f4icvvaiykb2fn3gfhpyglm1apfmcqp"
+   "commit": "2405090403e2907d7751770bab4a40865ef043ff",
+   "sha256": "0lsn4p08ka1jpjcb436bbcdk1cnj09ld8x1cdh67m23hcclbssi1"
   },
   "stable": {
    "version": [
@@ -91548,11 +91888,11 @@
   "repo": "jackkamm/undo-propose-el",
   "unstable": {
    "version": [
-    20190909,
-    427
+    20190921,
+    1533
    ],
-   "commit": "47b7df0c97ad0099537d1ade21c4c52f0618a945",
-   "sha256": "078bs8lk9f0lklxqh15976fffayg5z5386y59nxxfhm27lmwgka9"
+   "commit": "505d79053590a411be6d84e1bcd4ce13485e96f0",
+   "sha256": "1kvpwcry6q28cw0xrzmss0d05kzn1ay4y2c55k3sb2157izxvafn"
   }
  },
  {
@@ -93586,11 +93926,11 @@
   "repo": "emacs-w3m/emacs-w3m",
   "unstable": {
    "version": [
-    20190920,
-    1116
+    20190925,
+    2344
    ],
-   "commit": "c9cdb7e3075ddfc9aef356d42b376ebbb039bc7e",
-   "sha256": "1vg43ln70kifk3h0rwmj7w85mksg1yl3z4kqfq9q5zalp9jgwfsh"
+   "commit": "f5abefa599e63a769b08debf1aa8f13e77a2b1b4",
+   "sha256": "0kr136ya51iw5nv72jrkk2wn6m2zr86b19b93i1pplhvq465a9bm"
   }
  },
  {
@@ -95091,11 +95431,11 @@
   "repo": "ArneBab/wisp",
   "unstable": {
    "version": [
-    20190718,
-    1218
+    20190921,
+    2218
    ],
-   "commit": "5e860c746ee02c764bf378aeb8f436a1a341bd5c",
-   "sha256": "12qcq5k7xdlqwnq01qdkjf1035idrdmjxb24ya1xsxdkd3jra9dw"
+   "commit": "0d2c025ac4cfd394706c07fbb60999eaf711020b",
+   "sha256": "1fs4dpc78aax4mzcp0vzcvzf2mxiwzbdwjfgpylwppxamqdycdwy"
   }
  },
  {
@@ -95192,6 +95532,21 @@
    "sha256": "1c7g8f3jr7bb0xxprammfg433gd63in5iiiaq8rjmc94h6hdcys3"
   }
  },
+ {
+  "ename": "with-proxy",
+  "commit": "295a85f94a804b72475b81b324a6120569b8134a",
+  "sha256": "18453b3687iywd62vnh47yig998l6c8vbc9py1rba1m6a9q01vq0",
+  "fetcher": "github",
+  "repo": "twlz0ne/with-proxy.el",
+  "unstable": {
+   "version": [
+    20190920,
+    24
+   ],
+   "commit": "a7506af86ffc943f5d4cba712ec661125799c30b",
+   "sha256": "1nxssc8xn8i2zf9bs9rv61im3jxi38lq1ph9qr0hazwncndcsb39"
+  }
+ },
  {
   "ename": "with-simulated-input",
   "commit": "e4ddf16e19f5018106a423327ddc7e7499cf9248",
@@ -96820,14 +97175,14 @@
   "repo": "leanprover-community/yasnippet-lean",
   "unstable": {
    "version": [
-    20190609,
-    454
+    20190922,
+    2037
    ],
    "deps": [
     "yasnippet"
    ],
-   "commit": "2d57b8ad5c69a1886701d42ca5a8de6bacb170cc",
-   "sha256": "1d2n3q36s1mri1lmazld6pabx3929kqivkgq6b8qaya04ri8ds28"
+   "commit": "9119be08a32286d3e8559138e8ae003856ae1c0a",
+   "sha256": "1q06c574zn0ibbb3zbgi59zxj17i7kyjkcz45sj5h7hbn9l81594"
   }
  },
  {
@@ -96838,25 +97193,25 @@
   "repo": "AndreaCrotti/yasnippet-snippets",
   "unstable": {
    "version": [
-    20190908,
-    1137
+    20190925,
+    846
    ],
    "deps": [
     "yasnippet"
    ],
-   "commit": "676a6ddc190fb957dca3c42a777e34a623f15cbd",
-   "sha256": "14208jiymdz7pa6yx6is9fip3myhqgb7wjby7f27x73iv4rvkvkp"
+   "commit": "221f2c340af36afb4af2edc2cee92568bb3aba6c",
+   "sha256": "0wj97n79qlpkqdg9g5wxh25x6y0dzkclsvsi6j1dp0c5p1n9nylg"
   },
   "stable": {
    "version": [
     0,
-    14
+    15
    ],
    "deps": [
     "yasnippet"
    ],
-   "commit": "71ae4a665f0db13165f14687cf5828d4510ef557",
-   "sha256": "1gaycwqy1s2jvkqswjcbm49157ci5k8apsqlj2x5qs55w71zm5p8"
+   "commit": "221f2c340af36afb4af2edc2cee92568bb3aba6c",
+   "sha256": "0wj97n79qlpkqdg9g5wxh25x6y0dzkclsvsi6j1dp0c5p1n9nylg"
   }
  },
  {
@@ -97017,14 +97372,14 @@
   "repo": "alphapapa/yequake",
   "unstable": {
    "version": [
-    20190114,
-    1955
+    20190921,
+    225
    ],
    "deps": [
     "dash"
    ],
-   "commit": "4c093fa6ca3b8953ee509c7d8f434984d55ec802",
-   "sha256": "0y9dhvfp31yn8cgqslk647b8fs1sv0kwwnnjakjhx2zm3ljld3s0"
+   "commit": "d1f24c1cb49ca4b23fa2a639136ec58ab620cd1f",
+   "sha256": "1fzy4xfyfjrlsc8jzryqp75qz6i623173qa1w5n6knwdn4hgh4r1"
   }
  },
  {
-- 
GitLab


From 61f0f8d607af1ab00d2f07eedd5893f7c2b98815 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Thu, 26 Sep 2019 11:58:55 +0200
Subject: [PATCH 1014/2254] linuxPackages.virtualboxGuestAdditions: apply
 mp-r0drv-linux.c patch

These don't use a the virtualbox sources, but an iso as src, and we need
to add the kernel 5.3 patch aswell.

As for some reason the source files are present on the .iso with Windows
Line endings (sic!), call dos2unix first.

Unfortunately, we can't use the same kernel-5.3-fix.patch as virtualbox
itself, as some files are missing and paths are different.
---
 .../virtualbox/guest-additions/default.nix    | 14 ++++--
 .../guest-additions/kernel-5.3-fix.patch      | 50 +++++++++++++++++++
 2 files changed, 59 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/applications/virtualization/virtualbox/guest-additions/kernel-5.3-fix.patch

diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index 08b6fa63e84..e20fbf73190 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, lib, patchelf, cdrkit, kernel, which, makeWrapper
-, zlib, xorg, dbus, virtualbox }:
+, zlib, xorg, dbus, virtualbox, dos2unix }:
 
 let
   version = virtualbox.version;
@@ -32,9 +32,6 @@ in stdenv.mkDerivation {
   KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
   KERN_INCL = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/source/include";
 
-  # If you add a patch you probably need this.
-  #patchFlags = [ "-p1" "-d" "install/src/vboxguest-${version}" ];
-
   hardeningDisable = [ "pic" ];
 
   NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=implicit-function-declaration";
@@ -42,11 +39,18 @@ in stdenv.mkDerivation {
   nativeBuildInputs = [ patchelf makeWrapper ];
   buildInputs = [ cdrkit ] ++ kernel.moduleBuildDependencies;
 
-  postPatch = ''
+
+  prePatch = ''
     substituteInPlace src/vboxguest-${version}/vboxvideo/vbox_ttm.c \
       --replace "<ttm/" "<drm/ttm/"
+    ${dos2unix}/bin/dos2unix src/vboxguest-${version}/vboxguest/r0drv/linux/mp-r0drv-linux.c
   '';
 
+  patchFlags = [ "-p1" "-d" "src/vboxguest-${version}" ];
+  # Kernel 5.3 fix, should be fixed with VirtualBox 6.0.14
+  # https://www.virtualbox.org/ticket/18911
+  patches = [ ./kernel-5.3-fix.patch ];
+
   unpackPhase = ''
     ${if stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux" then ''
         isoinfo -J -i $src -x /VBoxLinuxAdditions.run > ./VBoxLinuxAdditions.run
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/kernel-5.3-fix.patch b/pkgs/applications/virtualization/virtualbox/guest-additions/kernel-5.3-fix.patch
new file mode 100644
index 00000000000..0bdd9ec1056
--- /dev/null
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/kernel-5.3-fix.patch
@@ -0,0 +1,50 @@
+--- a/vboxguest/r0drv/linux/mp-r0drv-linux.c
++++ a/vboxguest/r0drv/linux/mp-r0drv-linux.c
+@@ -283,12 +283,15 @@
+     if (RTCpuSetCount(&OnlineSet) > 1)
+     {
+         /* Fire the function on all other CPUs without waiting for completion. */
+-# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
++# if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0)
++        smp_call_function(rtmpLinuxAllWrapper, &Args, 0 /* wait */);
++# elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
+         int rc = smp_call_function(rtmpLinuxAllWrapper, &Args, 0 /* wait */);
++        Assert(!rc); NOREF(rc);
+ # else
+         int rc = smp_call_function(rtmpLinuxAllWrapper, &Args, 0 /* retry */, 0 /* wait */);
+-# endif
+         Assert(!rc); NOREF(rc);
++# endif
+     }
+ #endif
+
+@@ -326,7 +329,6 @@
+ {
+ #ifdef CONFIG_SMP
+     IPRT_LINUX_SAVE_EFL_AC();
+-    int rc;
+     RTMPARGS Args;
+
+     RTTHREADPREEMPTSTATE PreemptState = RTTHREADPREEMPTSTATE_INITIALIZER;
+@@ -337,14 +339,17 @@
+     Args.cHits = 0;
+
+     RTThreadPreemptDisable(&PreemptState);
+-# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
+-    rc = smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */);
++# if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0)
++    smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */);
++# elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
++    int rc = smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */);
++    Assert(rc == 0); NOREF(rc);
+ # else /* older kernels */
+-    rc = smp_call_function(rtmpLinuxWrapper, &Args, 0 /* retry */, 1 /* wait */);
++    int rc = smp_call_function(rtmpLinuxWrapper, &Args, 0 /* retry */, 1 /* wait */);
++    Assert(rc == 0); NOREF(rc);
+ # endif /* older kernels */
+     RTThreadPreemptRestore(&PreemptState);
+
+-    Assert(rc == 0); NOREF(rc);
+     IPRT_LINUX_RESTORE_EFL_AC();
+ #else
+     RT_NOREF(pfnWorker, pvUser1, pvUser2);
-- 
GitLab


From cd8821ec59513ea82a7e21929662e3c7dba5f9de Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 03:12:10 -0700
Subject: [PATCH 1015/2254] codespell: 1.15.0 -> 1.16.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/codespell/versions
---
 pkgs/development/python-modules/codespell/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/codespell/default.nix b/pkgs/development/python-modules/codespell/default.nix
index dfd0be09fab..dc531c77fb5 100644
--- a/pkgs/development/python-modules/codespell/default.nix
+++ b/pkgs/development/python-modules/codespell/default.nix
@@ -1,11 +1,11 @@
 { lib, buildPythonApplication, fetchPypi, pytest, chardet }:
 buildPythonApplication rec {
   pname = "codespell";
-  version = "1.15.0";
+  version = "1.16.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0c211rzfgmwls8ab8fj21xp9bhxk6ys3xw8w7chp4arjlifc26wg";
+    sha256 = "1s9dl07ib77gq0iq26mrdpl1c46nkfm7nlhqwxpx5vvs6a1pqfxz";
   };
 
   checkInputs = [ pytest chardet ];
-- 
GitLab


From 5a1bfd63f07da880798f88fdfd96f525e06b26ed Mon Sep 17 00:00:00 2001
From: Langston Barrett <langston.barrett@gmail.com>
Date: Wed, 4 Sep 2019 09:59:26 -0700
Subject: [PATCH 1016/2254] pythonPackages.parso: 0.3.4 -> 0.5.1

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

diff --git a/pkgs/development/python-modules/parso/default.nix b/pkgs/development/python-modules/parso/default.nix
index f5ecb64d232..da42b279c75 100644
--- a/pkgs/development/python-modules/parso/default.nix
+++ b/pkgs/development/python-modules/parso/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "parso";
-  version = "0.3.4";
+  version = "0.5.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "68406ebd7eafe17f8e40e15a84b56848eccbf27d7c1feb89e93d8fca395706db";
+    sha256 = "171a9ivhxwsd52h1cgsz40zgzpgzscn7yqb7sdjhy8m1lzj0wsv6";
   };
 
   checkInputs = [ pytest ];
-- 
GitLab


From d077afdf56da15b3e40edb563daf97b23e4714c2 Mon Sep 17 00:00:00 2001
From: Langston Barrett <langston.barrett@gmail.com>
Date: Wed, 4 Sep 2019 10:03:22 -0700
Subject: [PATCH 1017/2254] pythonPackages.jedi: 0.13.3 -> 0.14.1

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

diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix
index dbd87f23254..ae359493905 100644
--- a/pkgs/development/python-modules/jedi/default.nix
+++ b/pkgs/development/python-modules/jedi/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "jedi";
-  version = "0.13.3";
+  version = "0.14.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2bb0603e3506f708e792c7f4ad8fc2a7a9d9c2d292a358fbbd58da531695595b";
+    sha256 = "0dmgx9c0f7yx897bf13nrp5gbgal192y44y5dhqcvkyklzqm1j2k";
   };
 
   postPatch = ''
-- 
GitLab


From ac4922ed12facfc6d22afacfa94e797e43f414b5 Mon Sep 17 00:00:00 2001
From: Langston Barrett <langston.barrett@gmail.com>
Date: Wed, 4 Sep 2019 10:04:26 -0700
Subject: [PATCH 1018/2254] pythonPackages.python-language-server: 0.28.1 ->
 0.28.3

---
 .../python-modules/python-language-server/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-language-server/default.nix b/pkgs/development/python-modules/python-language-server/default.nix
index 76508d1ec96..4bf482b9ae4 100644
--- a/pkgs/development/python-modules/python-language-server/default.nix
+++ b/pkgs/development/python-modules/python-language-server/default.nix
@@ -21,13 +21,13 @@ in
 
 buildPythonPackage rec {
   pname = "python-language-server";
-  version = "0.28.1";
+  version = "0.28.3";
 
   src = fetchFromGitHub {
     owner = "palantir";
     repo = "python-language-server";
     rev = version;
-    sha256 = "0xa0zw7hlfqqa305ic4csgfmlbxhklb5xzx72mfkcz8gcc0f5qwd";
+    sha256 = "16d8i43r75h0cijggkkmmpnycn29wlbjp63mgg3s4nbrxfa96x2k";
   };
 
   # The tests require all the providers, disable otherwise.
-- 
GitLab


From 2b008d9d5a50c524edb4d6213c778de5c3694682 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 03:35:50 -0700
Subject: [PATCH 1019/2254] cjdns: 20.3 -> 20.4

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/cjdns/versions
---
 pkgs/tools/networking/cjdns/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix
index 82fbfac842a..f9dc3de7735 100644
--- a/pkgs/tools/networking/cjdns/default.nix
+++ b/pkgs/tools/networking/cjdns/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, nodejs, which, python27, utillinux }:
 
-let version = "20.3"; in
+let version = "20.4"; in
 stdenv.mkDerivation {
   name = "cjdns-"+version;
 
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     owner = "cjdelisle";
     repo = "cjdns";
     rev = "cjdns-v${version}";
-    sha256 = "02cxrjmpi7pyf0qfvhkqg3y5rq7vlnib55n2hhxnyhzznxhgrsgy";
+    sha256 = "1d8li7vws1dmdgs96dmy4vh55gqy2ir4dnkrvgkv3fjq9pffr7vx";
   };
 
   buildInputs = [ which python27 nodejs ] ++
-- 
GitLab


From 37fecd6ec4bf2b6b2203eea404091c02eae637c3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 03:46:07 -0700
Subject: [PATCH 1020/2254] clipgrab: 3.8.4 -> 3.8.5

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/clipgrab/versions
---
 pkgs/applications/video/clipgrab/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix
index 1872750deb0..145b7cc06c2 100644
--- a/pkgs/applications/video/clipgrab/default.nix
+++ b/pkgs/applications/video/clipgrab/default.nix
@@ -5,10 +5,10 @@
 
 mkDerivation rec {
   pname = "clipgrab";
-  version = "3.8.4";
+  version = "3.8.5";
 
   src = fetchurl {
-    sha256 = "0pyrg3rrsd538vnrv6x2frhbq9k2638nzffjsar1p76wxp8fm42s";
+    sha256 = "0jfjnzwvz4ynlld0ih7f7d575s5w2dag0hvb02c6qan7xm5jdhv9";
     # The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz!
     url = "https://download.clipgrab.org/${pname}-${version}.tar.gz";
   };
-- 
GitLab


From 0140ba7ec11cc4db4e7dcdfacdb4ef9d0c7c5c64 Mon Sep 17 00:00:00 2001
From: David Wood <david@davidtw.co>
Date: Thu, 26 Sep 2019 11:46:13 +0100
Subject: [PATCH 1021/2254] diffr: init at 0.1.2

Signed-off-by: David Wood <david@davidtw.co>
---
 pkgs/tools/text/diffr/default.nix | 29 +++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  4 ++++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/tools/text/diffr/default.nix

diff --git a/pkgs/tools/text/diffr/default.nix b/pkgs/tools/text/diffr/default.nix
new file mode 100644
index 00000000000..c032d2e8b36
--- /dev/null
+++ b/pkgs/tools/text/diffr/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, rustPlatform, Security }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "diffr";
+  version = "v0.1.2";
+
+  # diffr's tests expect the diffr binary to be at `$CARGO_MANIFEST_DIR/target/debug/diffr`.
+  doCheck = false;
+
+  src = fetchFromGitHub {
+    owner = "mookid";
+    repo = pname;
+    rev = version;
+    sha256 = "1fpcyl4kc4djfl6a2jlj56xqra42334vygz8n7614zgjpyxz3zx2";
+  };
+
+  cargoSha256 = "1dddb3a547qnpm1vvrgffb3v9m8sh19hmhy0fg6xjqpm032lqx3v";
+
+  nativeBuildInputs = [];
+  buildInputs = (stdenv.lib.optional stdenv.isDarwin Security);
+
+  meta = with stdenv.lib; {
+    description = "Yet another diff highlighting tool";
+    homepage = https://github.com/mookid/diffr;
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ davidtwco ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9aabb3a0b8f..f32a817376a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2630,6 +2630,10 @@ in
     jdk = jdk8;
   };
 
+  diffr = callPackage ../tools/text/diffr {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
+
   diffstat = callPackage ../tools/text/diffstat { };
 
   diffutils = callPackage ../tools/text/diffutils { };
-- 
GitLab


From 79d656813caed03b26064d444ceaf87a7358fb33 Mon Sep 17 00:00:00 2001
From: Christian Kampka <kampka@users.noreply.github.com>
Date: Thu, 26 Sep 2019 12:47:29 +0200
Subject: [PATCH 1022/2254] kops_1_13: 1.13.1 -> 1.13.2 (#69485)

---
 pkgs/applications/networking/cluster/kops/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix
index f7336c346bb..48d20ae3d58 100644
--- a/pkgs/applications/networking/cluster/kops/default.nix
+++ b/pkgs/applications/networking/cluster/kops/default.nix
@@ -57,7 +57,7 @@ in rec {
   };
 
   kops_1_13 = mkKops {
-    version = "1.13.1";
-    sha256 = "0knypbrpipxplgdg6r0r6ycsj7w46virmzwn5s4sdim0y8d2ppyb";
+    version = "1.13.2";
+    sha256 = "0lkkg34vn020r62ga8vg5d3a8jwvq00xlv3p1s01nkz33f6salng";
   };
 }
-- 
GitLab


From 0ea96eebb87be79eec61a55744a47064c7f69c40 Mon Sep 17 00:00:00 2001
From: David Wood <david@davidtw.co>
Date: Thu, 26 Sep 2019 11:12:44 +0100
Subject: [PATCH 1023/2254] starship: 0.18.0 -> 0.19.0

Signed-off-by: David Wood <david@davidtw.co>
---
 pkgs/tools/misc/starship/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix
index 8685bf7139e..0b1a3f286be 100644
--- a/pkgs/tools/misc/starship/default.nix
+++ b/pkgs/tools/misc/starship/default.nix
@@ -2,18 +2,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "starship";
-  version = "0.18.0";
+  version = "0.19.0";
 
   src = fetchFromGitHub {
     owner = "starship";
     repo = "starship";
     rev = "v${version}";
-    sha256 = "1xin821lgrdxb50i9p9ya3yfi64l4byf9il4jiijgsjckinxyflj";
+    sha256 = "0cj3r8c583xzraggwl1xb36790czha4dja6c3yvn5f19whmmf2g9";
   };
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ];
 
-  cargoSha256 = "12yswvhgcmqz0nyarva27pjc4xqqqn3m31y04r3l7ldbzgikn8k6";
+  cargoSha256 = "1ldhkys44nkwjm6cmz1x2k5j4n79rqkh6km86hssjps5bzw6niw4";
   checkPhase = "cargo test -- --skip directory::home_directory --skip directory::directory_in_root";
 
   meta = with stdenv.lib; {
-- 
GitLab


From 2963c8811e91d0441d04dcebee74753720b3464d Mon Sep 17 00:00:00 2001
From: Tobias Mayer <tobim@fastmail.fm>
Date: Thu, 26 Sep 2019 13:16:41 +0200
Subject: [PATCH 1024/2254] ccls: 0.20190823 -> 0.20190823.3

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

diff --git a/pkgs/development/tools/misc/ccls/default.nix b/pkgs/development/tools/misc/ccls/default.nix
index e42c3e58db8..8f805fcb759 100644
--- a/pkgs/development/tools/misc/ccls/default.nix
+++ b/pkgs/development/tools/misc/ccls/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ccls";
-  version = "0.20190823";
+  version = "0.20190823.3";
 
   src = fetchFromGitHub {
     owner = "MaskRay";
     repo = "ccls";
     rev = version;
-    sha256 = "1qy1kf83mrvbhwl8m0h7ralwd3sid8y8fpk7pmy81y1nq8f1cf6f";
+    sha256 = "1sx31zp6q2qc6fz3r78rx34zp2x4blrqzxwbpww71vb6lp1clmdm";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -45,6 +45,6 @@ stdenv.mkDerivation rec {
     homepage    = https://github.com/MaskRay/ccls;
     license     = licenses.asl20;
     platforms   = platforms.linux ++ platforms.darwin;
-    maintainers = [ maintainers.mic92 ];
+    maintainers = with maintainers; [ mic92 tobim ];
   };
 }
-- 
GitLab


From ad17ced303380c6b5599fc333d65c85157ce1494 Mon Sep 17 00:00:00 2001
From: Daniel Albert <esclear@users.noreply.github.com>
Date: Thu, 26 Sep 2019 10:23:52 +0200
Subject: [PATCH 1025/2254] libarcus: 4.2.0 -> 4.3.0

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

diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix
index 54d9193c25b..495fb42c302 100644
--- a/pkgs/development/python-modules/libarcus/default.nix
+++ b/pkgs/development/python-modules/libarcus/default.nix
@@ -3,14 +3,14 @@
 
 buildPythonPackage rec {
   pname = "libarcus";
-  version = "4.2.0";
+  version = "4.3.0";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "Ultimaker";
     repo = "libArcus";
     rev = version;
-    sha256 = "0pk0g80ay9aghzmb8gfpqh0chl9rk47jh0ziicpianhklxx2jb44";
+    sha256 = "1x06daijxbrqj0dlxmi2zn7ap74zf6hih3krmkwhvarm2nr052g4";
   };
 
   disabled = pythonOlder "3.4.0";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   buildInputs = [ protobuf ];
 
   postPatch = ''
-    sed -i 's#''${Python3_SITEARCH}#${placeholder "out"}/${python.sitePackages}#' cmake/SIPMacros.cmake
+    sed -i 's#''${Python3_SITELIB}#${placeholder "out"}/${python.sitePackages}#' cmake/SIPMacros.cmake
   '';
 
   meta = with stdenv.lib; {
-- 
GitLab


From 4efe58c23d4a0ffd0d39c397653bbfc4fe6c59b9 Mon Sep 17 00:00:00 2001
From: Daniel Albert <esclear@users.noreply.github.com>
Date: Thu, 26 Sep 2019 10:24:05 +0200
Subject: [PATCH 1026/2254] libsavitar: 4.2.0 -> 4.3.0

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

diff --git a/pkgs/development/python-modules/libsavitar/default.nix b/pkgs/development/python-modules/libsavitar/default.nix
index 657df2dfb7c..7ec89c569dd 100644
--- a/pkgs/development/python-modules/libsavitar/default.nix
+++ b/pkgs/development/python-modules/libsavitar/default.nix
@@ -2,14 +2,14 @@
 
 buildPythonPackage rec {
   pname = "libsavitar";
-  version = "4.2.0";
+  version = "4.3.0";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "Ultimaker";
     repo = "libSavitar";
     rev = version;
-    sha256 = "0cqskd8rcg7pih8nj3s2i137lwxpibmdmym6f8hii14ashny73i1";
+    sha256 = "0sm8945icbdxvyj7yiq9yhkk17ww3gjkpsbk7875qijzlgfs60j8";
   };
 
   postPatch = ''
-- 
GitLab


From 2ec3db1c50962180648f2d4622afbc625bca3baf Mon Sep 17 00:00:00 2001
From: Daniel Albert <esclear@users.noreply.github.com>
Date: Thu, 26 Sep 2019 10:24:19 +0200
Subject: [PATCH 1027/2254] uranium: 4.2.0 -> 4.3.0

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

diff --git a/pkgs/development/python-modules/uranium/default.nix b/pkgs/development/python-modules/uranium/default.nix
index aec0f731554..1777a5d1455 100644
--- a/pkgs/development/python-modules/uranium/default.nix
+++ b/pkgs/development/python-modules/uranium/default.nix
@@ -2,7 +2,7 @@
 , pyqt5, numpy, scipy, shapely, libarcus, doxygen, gettext, pythonOlder }:
 
 buildPythonPackage rec {
-  version = "4.2.0";
+  version = "4.3.0";
   pname = "uranium";
   format = "other";
 
@@ -10,7 +10,7 @@ buildPythonPackage rec {
     owner = "Ultimaker";
     repo = "Uranium";
     rev = version;
-    sha256 = "1dc3s6zya7bbpvzh4acbs65aj899siwd8jr9snnsrdyl9qh8hhq9";
+    sha256 = "13dk6hkwrzljp1dyb40cyfnfbnl7dvlqsm0ncnmxhwizxr31jb8c";
   };
 
   disabled = pythonOlder "3.5.0";
-- 
GitLab


From 7c93929d3dc4e906b2c9f7e96b67bddf97384661 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 04:32:44 -0700
Subject: [PATCH 1028/2254] buck: 2019.06.17.01 -> 2019.09.12.01

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/buck/versions
---
 pkgs/development/tools/build-managers/buck/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/buck/default.nix b/pkgs/development/tools/build-managers/buck/default.nix
index 30e88b497ad..5f3a090fef7 100644
--- a/pkgs/development/tools/build-managers/buck/default.nix
+++ b/pkgs/development/tools/build-managers/buck/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "buck";
-  version = "2019.06.17.01";
+  version = "2019.09.12.01";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1nmphjxqwp51j16qajgvi853dm7654x1w1737xr81zzpcbjw6qig";
+    sha256 = "02rid0r0swxa6n6hl89lcll7hgxn1wjh2kjzxcj4arm7d34243bw";
   };
 
   patches = [ ./pex-mtime.patch ];
-- 
GitLab


From f835f9bc625c34526ed45a4557bb4f370fd91c9a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 05:05:46 -0700
Subject: [PATCH 1029/2254] elementary-xfce-icon-theme: 0.13.1 -> 0.14

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/elementary-xfce-icon-theme/versions
---
 pkgs/data/icons/elementary-xfce-icon-theme/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix
index 5a566bef6ef..4b99d1c15bc 100644
--- a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix
+++ b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "elementary-xfce-icon-theme";
-  version = "0.13.1";
+  version = "0.14";
 
   src = fetchFromGitHub {
     owner = "shimmerproject";
     repo = "elementary-xfce";
     rev = "v${version}";
-    sha256 = "16msdrazhbv80cvh5ffvgj13xmkpf87r7mq6xz071fza6nv7g0jn";
+    sha256 = "00sk6sv0kkfb3q0jqwcllzawi30rw8nfkkfn5l1qwqha48izw3r4";
   };
 
   nativeBuildInputs = [ pkgconfig gdk-pixbuf librsvg optipng gtk3 hicolor-icon-theme ];
-- 
GitLab


From b1b85d18a85c7ad0023506656c6f5e67a1bf3689 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 05:44:02 -0700
Subject: [PATCH 1030/2254] dar: 2.6.5 -> 2.6.6

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/dar/versions
---
 pkgs/tools/backup/dar/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/backup/dar/default.nix b/pkgs/tools/backup/dar/default.nix
index 352f320dadf..f48bfbd3d6a 100644
--- a/pkgs/tools/backup/dar/default.nix
+++ b/pkgs/tools/backup/dar/default.nix
@@ -3,12 +3,12 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "2.6.5";
+  version = "2.6.6";
   pname = "dar";
 
   src = fetchurl {
     url = "mirror://sourceforge/dar/${pname}-${version}.tar.gz";
-    sha256 = "1x2zr5nw3qq1vmbs4bva6mx1cx0180dri5i2971ynzcxybn75znd";
+    sha256 = "1pqdcb9dkjlf8wzpsnx4gcv9nhrm60glv4xadxnknnqlvzs6vips";
   };
 
   buildInputs = [ zlib bzip2 openssl lzo libgcrypt gpgme xz ]
-- 
GitLab


From adb15c3a63fd96edcf7585394b8ccbeb1ceee336 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 26 Sep 2019 14:50:07 +0200
Subject: [PATCH 1031/2254] Revert "rustc: Provide compiler-rt sources"

This reverts commit b7a828031238b0962cd91131eba50844ef401b93. It's no
longer needed with Rust 1.38.
---
 pkgs/development/compilers/rust/rustc.nix | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index daf7af1babd..78d276c1f16 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -1,6 +1,6 @@
 { stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget
 , fetchurl, file, python2, tzdata, ps
-, llvmPackages_7, darwin, git, cmake, rustPlatform
+, llvm_7, darwin, git, cmake, rustPlatform
 , which, libffi, gdb
 , withBundledLLVM ? false
 }:
@@ -9,17 +9,13 @@ let
   inherit (stdenv.lib) optional optionalString;
   inherit (darwin.apple_sdk.frameworks) Security;
 
-  llvmPackages = llvmPackages_7;
-
-  llvmSharedForBuild = pkgsBuildBuild.llvmPackages.llvm.override { enableSharedLibraries = true; };
-  llvmSharedForHost = pkgsBuildHost.llvmPackages.llvm.override { enableSharedLibraries = true; };
-  llvmSharedForTarget = pkgsBuildTarget.llvmPackages.llvm.override { enableSharedLibraries = true; };
+  llvmSharedForBuild = pkgsBuildBuild.llvm_7.override { enableSharedLibraries = true; };
+  llvmSharedForHost = pkgsBuildHost.llvm_7.override { enableSharedLibraries = true; };
+  llvmSharedForTarget = pkgsBuildTarget.llvm_7.override { enableSharedLibraries = true; };
 
   # For use at runtime
-  llvmShared = llvmPackages.llvm.override { enableSharedLibraries = true; };
-in
-
-stdenv.mkDerivation rec {
+  llvmShared = llvm_7.override { enableSharedLibraries = true; };
+in stdenv.mkDerivation rec {
   pname = "rustc";
   version = "1.37.0";
 
@@ -28,12 +24,6 @@ stdenv.mkDerivation rec {
     sha256 = "1hrqprybhkhs6d9b5pjskfnc5z9v2l2gync7nb39qjb5s0h703hj";
   };
 
-  # Provide the compiler-rt sources needed for profiling.
-  preConfigure = ''
-    mkdir src/llvm-project/compiler-rt
-    tar xf ${llvmPackages.compiler-rt.src} -C src/llvm-project/compiler-rt --strip-components=1
-  '';
-
   __darwinAllowLocalNetworking = true;
 
   # rustc complains about modified source files otherwise
-- 
GitLab


From 7a61cd29bda1fdbae148a95b593f18fa2e0ccb9f Mon Sep 17 00:00:00 2001
From: Johan Thomsen <jth@dbc.dk>
Date: Thu, 26 Sep 2019 14:52:02 +0200
Subject: [PATCH 1032/2254] ceph: 14.2.3 -> 14.2.4

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

diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix
index 1755ef625f5..141d21951a8 100644
--- a/pkgs/tools/filesystems/ceph/default.nix
+++ b/pkgs/tools/filesystems/ceph/default.nix
@@ -89,7 +89,7 @@ let
     ps.six
   ]);
 
-  version = "14.2.3";
+  version = "14.2.4";
 in rec {
   ceph = stdenv.mkDerivation {
     pname = "ceph";
@@ -97,7 +97,7 @@ in rec {
 
     src = fetchurl {
       url = "http://download.ceph.com/tarballs/ceph-${version}.tar.gz";
-      sha256 = "1pa8czb205pz4vjfh82gsgickj3cdjrx51mcx7acsyqgp3dfvl33";
+      sha256 = "1y6hixh6srd5aswhzq0sf0dbygwhx0ardx3w3f7qazf5rapvd03i";
     };
 
     patches = [
-- 
GitLab


From 3a73ebdb381bd18312c4372efb8152c5b0d704f8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 06:18:52 -0700
Subject: [PATCH 1033/2254] python37Packages.dlib: 19.17 -> 19.18

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-dlib/versions
---
 pkgs/development/libraries/dlib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix
index dfa5509fb98..aae8989c238 100644
--- a/pkgs/development/libraries/dlib/default.nix
+++ b/pkgs/development/libraries/dlib/default.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "dlib";
-  version = "19.17";
+  version = "19.18";
 
   src = fetchFromGitHub {
     owner = "davisking";
     repo = "dlib";
     rev ="v${version}";
-    sha256 = "0g11ilma6cll3bd2ahm66j1sjb9v4rxz3xjbfkcg5pjsvb49n029";
+    sha256 = "1kbrcf35pn2ymyr8q48ls98n2zb7rrz5207kwpisfh6k22g802ic";
   };
 
   postPatch = ''
-- 
GitLab


From 85ecfecdbe6be48edc617e690a2a3efba3348766 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 26 Sep 2019 21:24:42 +0800
Subject: [PATCH 1034/2254] crudini: 0.9 -> 0.9.3

---
 pkgs/tools/misc/crudini/default.nix | 48 ++++++++++++++++-------------
 1 file changed, 27 insertions(+), 21 deletions(-)

diff --git a/pkgs/tools/misc/crudini/default.nix b/pkgs/tools/misc/crudini/default.nix
index f5291d0789e..f63cd0d32c9 100644
--- a/pkgs/tools/misc/crudini/default.nix
+++ b/pkgs/tools/misc/crudini/default.nix
@@ -1,47 +1,53 @@
-{ stdenv, fetchFromGitHub, python2Packages, help2man }:
+{ stdenv, fetchFromGitHub, python2Packages, help2man, installShellFiles }:
 
-python2Packages.buildPythonApplication rec {
+let
+  # py3 is supposedly working in version 0.9.3 but the tests fail so stick to py2
+  pypkgs = python2Packages;
+
+in
+pypkgs.buildPythonApplication rec {
   pname = "crudini";
-  version = "0.9";
+  version = "0.9.3";
 
   src = fetchFromGitHub {
     owner  = "pixelb";
     repo   = "crudini";
     rev    = version;
-    sha256 = "0x9z9lsygripj88gadag398pc9zky23m16wmh8vbgw7ld1nhkiav";
+    sha256 = "0298hvg0fpk0m0bjpwryj3icksbckwqqsr9w1ain55wf5s0v24k3";
   };
 
-  nativeBuildInputs = [ help2man ];
-  propagatedBuildInputs = with python2Packages; [ iniparse ];
-
-  doCheck = true;
+  nativeBuildInputs = [ help2man installShellFiles ];
 
-  prePatch = ''
-    # make runs the unpatched version in src so we need to patch them in addition to tests
-    patchShebangs .
-  '';
+  propagatedBuildInputs = with pypkgs; [ iniparse ];
 
-  postBuild = ''
-    make all
+  postPatch = ''
+    substituteInPlace crudini-help \
+      --replace ./crudini $out/bin/crudini
+    substituteInPlace tests/test.sh \
+      --replace ..: $out/bin:
   '';
 
   postInstall = ''
-    mkdir -p $out/share/{man/man1,doc/crudini}
+    # this just creates the man page
+    make all
 
-    cp README EXAMPLES $out/share/doc/crudini/
-    for f in *.1 ; do
-      gzip -c $f > $out/share/man/man1/$(basename $f).gz
-    done
+    install -Dm444 -t $out/share/doc/${pname} README EXAMPLES
+    installManPage *.1
   '';
 
   checkPhase = ''
+    runHook preCheck
+
     pushd tests >/dev/null
-    ./test.sh
+    bash ./test.sh
+    popd >/dev/null
+
+    runHook postCheck
   '';
 
   meta = with stdenv.lib; {
     description = "A utility for manipulating ini files ";
-    homepage = http://www.pixelbeat.org/programs/crudini/;
+    homepage = "https://www.pixelbeat.org/programs/crudini/";
     license = licenses.gpl2;
     maintainers = with maintainers; [ peterhoeg ];
   };
-- 
GitLab


From ea356329ca8ebb50cf49088f8a093b6aa7f27556 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 06:59:00 -0700
Subject: [PATCH 1035/2254] gitAndTools.diff-so-fancy: 1.2.6 -> 1.2.7

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/diff-so-fancy/versions
---
 .../git-and-tools/diff-so-fancy/default.nix                   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix
index 1bbbbe22d9a..96216e76fd3 100644
--- a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "diff-so-fancy";
-  version = "1.2.6";
+  version = "1.2.7";
 
   src = fetchFromGitHub {
     owner = "so-fancy";
     repo = "diff-so-fancy";
     rev = "v${version}";
-    sha256 = "1w8x2d83zdhrnydiqq1qjf3j1y4cawdg8p1isj8zqwblnc47ygjm";
+    sha256 = "0y5cp236gi6h7llzai5d27086l4zz58mz1zs01r97xnnmjs9vw21";
   };
 
   # Perl is needed here for patchShebangs
-- 
GitLab


From 2ac7392bc28481bb1170b30a9cc584cc2ca9a6e0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 07:10:27 -0700
Subject: [PATCH 1036/2254] ddcutil: 0.9.5 -> 0.9.7

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/ddcutil/versions
---
 pkgs/tools/misc/ddcutil/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/ddcutil/default.nix b/pkgs/tools/misc/ddcutil/default.nix
index 0ddceb76ffe..a91fdad8d82 100644
--- a/pkgs/tools/misc/ddcutil/default.nix
+++ b/pkgs/tools/misc/ddcutil/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ddcutil";
-  version = "0.9.5";
+  version = "0.9.7";
 
   src = fetchFromGitHub {
     owner  = "rockowitz";
     repo   = "ddcutil";
     rev    = "v${version}";
-    sha256 = "1mqamwafm0rhw420i0pib6gq6hkdafnbg07b0z2ckrxii44sy0c2";
+    sha256 = "1p99kxgg2893ppp56q5igpva39lzj4wvx37c993r4p6i4gq6bi3v";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
-- 
GitLab


From b5b30f796c73c4795fdae6ed943aa35acf8f9c56 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 07:21:26 -0700
Subject: [PATCH 1037/2254] public-sans: 1.005 -> 1.006

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/public-sans/versions
---
 pkgs/data/fonts/public-sans/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/public-sans/default.nix b/pkgs/data/fonts/public-sans/default.nix
index 46ebe4dd4b2..cb4c5523a70 100644
--- a/pkgs/data/fonts/public-sans/default.nix
+++ b/pkgs/data/fonts/public-sans/default.nix
@@ -1,7 +1,7 @@
 { lib, fetchzip }:
 
 let
-  version = "1.005";
+  version = "1.006";
 in fetchzip {
   name = "public-sans-${version}";
 
@@ -12,7 +12,7 @@ in fetchzip {
     unzip $downloadedFile fonts/{otf,variable}/\*.\[ot\]tf -d $out/share/
   '';
 
-  sha256 = "0s0zgszpi12wanl031gi3j24ci9pkbkhvsxc30skx8s1mj99cd7i";
+  sha256 = "1x04mpynfhcgiwx68w5sawgn69xld7k65mbq7n5vcgbfzh2sjwhq";
 
   meta = with lib; {
     description = "A strong, neutral, principles-driven, open source typeface for text or display";
-- 
GitLab


From 0838bc0ed5718658538453f58b3698341bdc1b2e Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Thu, 26 Sep 2019 16:23:57 +0200
Subject: [PATCH 1038/2254] electron-cash: use wrapQtApp

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

diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix
index 913afd766d3..d0429d135d7 100644
--- a/pkgs/applications/misc/electron-cash/default.nix
+++ b/pkgs/applications/misc/electron-cash/default.nix
@@ -56,6 +56,10 @@ python3Packages.buildPythonApplication rec {
       --replace "Exec=electron-cash" "Exec=$out/bin/electron-cash"
   '';
 
+  postFixup = ''
+    wrapQtApp $out/bin/electron-cash
+  '';
+
   doInstallCheck = true;
   installCheckPhase = ''
     $out/bin/electron-cash help >/dev/null
-- 
GitLab


From 4217c4aa4fafe4b6f797dec2e034231da1a6cde0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 07:24:28 -0700
Subject: [PATCH 1039/2254] flexget: 2.21.16 -> 2.21.19

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/flexget/versions
---
 pkgs/applications/networking/flexget/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix
index f01849919ab..6e8ec45a36d 100644
--- a/pkgs/applications/networking/flexget/default.nix
+++ b/pkgs/applications/networking/flexget/default.nix
@@ -24,11 +24,11 @@ with python'.pkgs;
 
 buildPythonApplication rec {
   pname = "FlexGet";
-  version = "2.21.16";
+  version = "2.21.19";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1skb73nsg5gqlqqcs64c9kiidd74p3gm0xx93jaky2gagn0jn7rv";
+    sha256 = "1xkxd5p4ps0dnwns64zzlvs252wx0f9fy5b6000gyql7y5cma3kj";
   };
 
   postPatch = ''
-- 
GitLab


From 631096f22a7735625ea309f132bae0d205a1fe01 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 07:32:45 -0700
Subject: [PATCH 1040/2254] gcompris: 0.96 -> 0.97

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/gcompris/versions
---
 pkgs/games/gcompris/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/gcompris/default.nix b/pkgs/games/gcompris/default.nix
index 23d12602759..874276f2720 100644
--- a/pkgs/games/gcompris/default.nix
+++ b/pkgs/games/gcompris/default.nix
@@ -18,11 +18,11 @@
 
 mkDerivation rec {
   pname = "gcompris";
-  version = "0.96";
+  version = "0.97";
 
   src = fetchurl {
     url = "http://gcompris.net/download/qt/src/gcompris-qt-${version}.tar.xz";
-    sha256 = "06483il59l46ny2w771sg45dgzjwv1ph7vidzzbj0wb8wbk2rg52";
+    sha256 = "1vy2b7vb11glack6p8x1mchxvc2j4l4q8h5fmxacgq8z2ali329b";
   };
 
   cmakeFlags = [
-- 
GitLab


From 9c0968fd8103a32b05c72d8137e6d9e388a86a7e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 26 Sep 2019 14:51:12 +0200
Subject: [PATCH 1041/2254] rustc: 1.37.0 -> 1.38.0

---
 pkgs/development/compilers/rust/bootstrap.nix | 16 ++++++++--------
 pkgs/development/compilers/rust/rustc.nix     |  9 ++++++---
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix
index 43a72985dde..7b774d066b7 100644
--- a/pkgs/development/compilers/rust/bootstrap.nix
+++ b/pkgs/development/compilers/rust/bootstrap.nix
@@ -3,16 +3,16 @@
 let
   # Note: the version MUST be one version prior to the version we're
   # building
-  version = "1.36.0";
+  version = "1.37.0";
 
-  # fetch hashes by running `print-hashes.sh 1.36.0`
+  # fetch hashes by running `print-hashes.sh 1.37.0`
   hashes = {
-    i686-unknown-linux-gnu = "9f95c3e96622a792858c8a1c9274fa63e6992370493b27c1ac7299a3bec5156d";
-    x86_64-unknown-linux-gnu = "15e592ec52f14a0586dcebc87a957e472c4544e07359314f6354e2b8bd284c55";
-    armv7-unknown-linux-gnueabihf = "798181a728017068f9eddfa665771805d97846cd87bddcd67e0fe27c8d082ceb";
-    aarch64-unknown-linux-gnu = "db78c24d93756f9fe232f081dbc4a46d38f8eec98353a9e78b9b164f9628042d";
-    i686-apple-darwin = "3dbc34fdea8bc030badf9c8b2572c09fd3f5369b59ac099fc521064b390b9e60";
-    x86_64-apple-darwin = "91f151ec7e24f5b0645948d439fc25172ec4012f0584dd16c3fb1acb709aa325";
+    i686-unknown-linux-gnu = "74510e0e52a55e65a9f716673c2cda4d2bd427e2453541c6993c77c3ec04acf9";
+    x86_64-unknown-linux-gnu = "cb573229bfd32928177c3835fdeb62d52da64806b844bc1095c6225b0665a1cb";
+    armv7-unknown-linux-gnueabihf = "5b87b877f0ed20c6a09ce26e7a15d8c61b26b62484b97e78a51099d0efefec98";
+    aarch64-unknown-linux-gnu = "263ef98fa3a6b2911b56f89c06615cdebf6ef676eb9b2493ad1539602f79b6ba";
+    i686-apple-darwin = "e45d0c4d882fc6c404ffa6fe790294f4ea96384a2b48804adbf723f3635477a8";
+    x86_64-apple-darwin = "b2310c97ffb964f253c4088c8d29865f876a49da2a45305493af5b5c7a3ca73d";
   };
 
   platform =
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index 78d276c1f16..433dc1719fb 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -1,6 +1,7 @@
 { stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget
 , fetchurl, file, python2, tzdata, ps
 , llvm_7, darwin, git, cmake, rustPlatform
+, pkgconfig, openssl
 , which, libffi, gdb
 , withBundledLLVM ? false
 }:
@@ -17,11 +18,11 @@ let
   llvmShared = llvm_7.override { enableSharedLibraries = true; };
 in stdenv.mkDerivation rec {
   pname = "rustc";
-  version = "1.37.0";
+  version = "1.38.0";
 
   src = fetchurl {
     url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz";
-    sha256 = "1hrqprybhkhs6d9b5pjskfnc5z9v2l2gync7nb39qjb5s0h703hj";
+    sha256 = "101dlpsfkq67p0hbwx4acqq6n90dj4bbprndizpgh1kigk566hk4";
   };
 
   __darwinAllowLocalNetworking = true;
@@ -157,10 +158,12 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = [
     file python2 ps rustPlatform.rust.rustc git cmake
     which libffi removeReferencesTo
+    pkgconfig
   ] # Only needed for the debuginfo tests
     ++ optional (!stdenv.isDarwin) gdb;
 
-  buildInputs = optional stdenv.isDarwin Security
+  buildInputs = [ openssl ]
+    ++ optional stdenv.isDarwin Security
     ++ optional (!withBundledLLVM) llvmShared;
 
   outputs = [ "out" "man" "doc" ];
-- 
GitLab


From be0b876035e5266aa054f9f5facd7af51577e4ae Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 07:38:22 -0700
Subject: [PATCH 1042/2254] flink: 1.8.1 -> 1.9.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/flink/versions
---
 pkgs/applications/networking/cluster/flink/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/flink/default.nix b/pkgs/applications/networking/cluster/flink/default.nix
index 424b2ddca91..f8c73c65991 100644
--- a/pkgs/applications/networking/cluster/flink/default.nix
+++ b/pkgs/applications/networking/cluster/flink/default.nix
@@ -8,8 +8,8 @@ let
       sha256 = "18wqcqi3gyqd40nspih99gq7ylfs20b35f4dcrspffagwkfp2l4z";
     };
     "1.6" = {
-      flinkVersion = "1.8.1";
-      sha256 = "1ynxlkdxvrgww9hh7rlkhybrp5vl2slj3pqg2qzc8khpcgqx1h2g";
+      flinkVersion = "1.9.0";
+      sha256 = "1dzfcmqz5j4b545wq2q3xb2xkbhqllr04s3av1afv54y61l5y952";
     };
   };
 in
-- 
GitLab


From faf9a73e2f783a718071f0aa35e97323cae9a17a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 05:57:05 -0700
Subject: [PATCH 1043/2254] eclib: 20190226 -> 20190909

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/eclib/versions

Relevant sage upstream ticket: https://trac.sagemath.org/ticket/28472
---
 pkgs/applications/science/math/sage/sage-src.nix | 7 +++++++
 pkgs/development/libraries/eclib/default.nix     | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix
index 57d6c852be8..9351b90680d 100644
--- a/pkgs/applications/science/math/sage/sage-src.nix
+++ b/pkgs/applications/science/math/sage/sage-src.nix
@@ -109,6 +109,13 @@ stdenv.mkDerivation rec {
     # now set the cache dir to be withing the .sage directory. This is not
     # strictly necessary, but keeps us from littering in the user's HOME.
     ./patches/sympow-cache.patch
+
+    # https://trac.sagemath.org/ticket/28472
+    (fetchpatch {
+      name = "eclib-20190909.patch";
+      url = "https://git.sagemath.org/sage.git/patch?id=d27dc479a5772d59e4bc85d805b6ffd595284f1d";
+      sha256 = "1nf1s9y7n30lhlbdnam7sghgaq9nasmv96415gl5jlcf7a3hlxk3";
+    })
   ];
 
   patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;
diff --git a/pkgs/development/libraries/eclib/default.nix b/pkgs/development/libraries/eclib/default.nix
index 6aaefd8a2cc..765e13fffb9 100644
--- a/pkgs/development/libraries/eclib/default.nix
+++ b/pkgs/development/libraries/eclib/default.nix
@@ -14,7 +14,7 @@ assert withFlint -> flint != null;
 
 stdenv.mkDerivation rec {
   pname = "eclib";
-  version = "20190226"; # upgrade might break the sage interface
+  version = "20190909"; # upgrade might break the sage interface
   # sage tests to run:
   # src/sage/interfaces/mwrank.py
   # src/sage/libs/eclib
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     owner = "JohnCremona";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1910np1xzyjzszay24xn4b81qhpsvhp5aix9vdpknplni2mq8kwb";
+    sha256 = "0y1vdi4120gdw56gg2dn3wh625yr9wpyk3wpbsd25w4lv83qq5da";
   };
   buildInputs = [
     pari
-- 
GitLab


From 26d6eddb56801dbd55767364fc53b3d5b655ecb8 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 26 Sep 2019 10:29:03 -0400
Subject: [PATCH 1044/2254] vivaldi: 2.8.1664.38-1 -> 2.8.1664.40-1

---
 pkgs/applications/networking/browsers/vivaldi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index be08df3a704..51a9cc9aec0 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -17,11 +17,11 @@ let
   vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
 in stdenv.mkDerivation rec {
   pname = "vivaldi";
-  version = "2.8.1664.38-1";
+  version = "2.8.1664.40-1";
 
   src = fetchurl {
     url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb";
-    sha256 = "1znhlwwgq4k0fplr4l8ixgn6g5k26ns77j2dm0pjg3a2jgjq6rdr";
+    sha256 = "07v7p3r9yc566xkwhiazd80pj2d6rcvs3xnbnwjambi1rajbs5sx";
   };
 
   unpackPhase = ''
-- 
GitLab


From 6ab2a81b3e72214732c6dbf8637501dd3b066f18 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 26 Sep 2019 10:37:15 -0400
Subject: [PATCH 1045/2254] jenkins: 2.176.3 -> 2.190.1

---
 .../tools/continuous-integration/jenkins/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix
index 26647370821..64a9ed85f78 100644
--- a/pkgs/development/tools/continuous-integration/jenkins/default.nix
+++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "jenkins";
-  version = "2.176.3";
+  version = "2.190.1";
 
   src = fetchurl {
     url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war";
-    sha256 = "18wsggb4fhlacpxpxkd04zwj56gqjccrbkhs35vkyixwwazcf1ll";
+    sha256 = "01bg8g1x0g479k0vz2dxzfkn6a3pp5sdqj6nmmmccgs2v4jivys6";
   };
 
   buildCommand = ''
-- 
GitLab


From 5c1adffe6e12d37eee95ad54350a2a3ad9f31d55 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 26 Sep 2019 10:37:58 -0400
Subject: [PATCH 1046/2254] oh-my-zsh: 2019-09-20 -> 2019-09-24

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

diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix
index 7df43f7dab4..b2ae7a2f30f 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -4,13 +4,13 @@
 { stdenv, fetchgit }:
 
 stdenv.mkDerivation rec {
-  version = "2019-09-20";
+  version = "2019-09-24";
   pname = "oh-my-zsh";
-  rev = "6cfaa076272e08b6a81b6358b78d020e48f8a4a6";
+  rev = "f9e7c45a484723f693a77ab6128a1cc163f3704a";
 
   src = fetchgit { inherit rev;
     url = "https://github.com/robbyrussell/oh-my-zsh";
-    sha256 = "0i1mlw42g2w5pbg6zsl48pdwv1hy5zrwx9kq4w04mynwg7mc9hs5";
+    sha256 = "10ih8bxsha5vq1cvfx5j7w0pd3zqxk8iam787r3z15l12xs9kfsq";
   };
 
   pathsToLink = [ "/share/oh-my-zsh" ];
-- 
GitLab


From 9d6f4a662db2e415f342f5da3920e6b4b8058bac Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 07:45:52 -0700
Subject: [PATCH 1047/2254] fio: 3.15 -> 3.16

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/fio/versions
---
 pkgs/tools/system/fio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix
index 5a690b28845..b6ad10ec645 100644
--- a/pkgs/tools/system/fio/default.nix
+++ b/pkgs/tools/system/fio/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fio";
-  version = "3.15";
+  version = "3.16";
 
   src = fetchFromGitHub {
     owner  = "axboe";
     repo   = "fio";
     rev    = "fio-${version}";
-    sha256 = "0wzy5byc2qx5mbnwkcyjkrzc662n4wkrzpcg4h611q4ix494zka9";
+    sha256 = "10ygvmzsrqh2bs8v0a304gkl8h50437xfaz1ck7j2ymckipnbha0";
   };
 
   buildInputs = [ python zlib ]
-- 
GitLab


From 154d3f19e2bec14204a4bb3b35fa9f46b2f8b59d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 08:11:48 -0700
Subject: [PATCH 1048/2254] folly: 2019.08.05.00 -> 2019.09.16.00

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/folly/versions
---
 pkgs/development/libraries/folly/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix
index b072df506a9..fe48eda192d 100644
--- a/pkgs/development/libraries/folly/default.nix
+++ b/pkgs/development/libraries/folly/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "folly";
-  version = "2019.08.05.00";
+  version = "2019.09.16.00";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "folly";
     rev = "v${version}";
-    sha256 = "03arl9hg06rzbyaf3fzyk7q8d5mfbzfwmhqnfnvqcgzlqdj0gaa5";
+    sha256 = "14vdc1rh6z2yhwncpmgyq9c8c0rddhd9l1mnmj9pjhl5hfj45kf6";
   };
 
   nativeBuildInputs = [ cmake ];
-- 
GitLab


From 994e18df0a95aecd52030de1a6b78103c820e122 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 08:19:50 -0700
Subject: [PATCH 1049/2254] fuse-overlayfs: 0.5.1 -> 0.6.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/fuse-overlayfs/versions
---
 pkgs/tools/filesystems/fuse-overlayfs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/fuse-overlayfs/default.nix b/pkgs/tools/filesystems/fuse-overlayfs/default.nix
index a96830feb2a..2c9336802ea 100644
--- a/pkgs/tools/filesystems/fuse-overlayfs/default.nix
+++ b/pkgs/tools/filesystems/fuse-overlayfs/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fuse-overlayfs";
-  version = "0.5.1";
+  version = "0.6.2";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = pname;
     rev = "v${version}";
-    sha256 = "03sdnnq0x44jlwf41snrrma4hxdiixmhynw35gjhm84slpljnngp";
+    sha256 = "03gad89jg0dif5wqdl1kh0rpmfc80pnkx8hk0v4hrlirr130dgl2";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
-- 
GitLab


From 9e25cc8b2ef27e37760081c9272509ec4593d5fb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 08:34:23 -0700
Subject: [PATCH 1050/2254] fvwm: 2.6.8 -> 2.6.9

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/fvwm/versions
---
 pkgs/applications/window-managers/fvwm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/fvwm/default.nix b/pkgs/applications/window-managers/fvwm/default.nix
index 27657c10a7e..cc503b2db4f 100644
--- a/pkgs/applications/window-managers/fvwm/default.nix
+++ b/pkgs/applications/window-managers/fvwm/default.nix
@@ -9,11 +9,11 @@ assert gestures -> libstroke != null;
 
 stdenv.mkDerivation rec {
   pname = "fvwm";
-  version = "2.6.8";
+  version = "2.6.9";
 
   src = fetchurl {
     url = "https://github.com/fvwmorg/fvwm/releases/download/${version}/${pname}-${version}.tar.gz";
-    sha256 = "0hgkkdzcqjnaabvv9cnh0bz90nnjskbhjg9qnzpi2x0mbliwjdpv";
+    sha256 = "1bliqcnap7vb3m2rn8wvxyfhbf35h9x34s41fl4301yhrkrlrihv";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From 8d1d6bcf568a827c174e6e631d6a83ad0cee2e70 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 08:42:05 -0700
Subject: [PATCH 1051/2254] flatcc: 0.5.3 -> 0.6.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/flatcc/versions
---
 pkgs/development/libraries/flatcc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/flatcc/default.nix b/pkgs/development/libraries/flatcc/default.nix
index 8518545665c..d49f6d110de 100644
--- a/pkgs/development/libraries/flatcc/default.nix
+++ b/pkgs/development/libraries/flatcc/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   pname = "flatcc";
-  version = "0.5.3";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "dvidelabs";
     repo = "flatcc";
     rev = "v${version}";
-    sha256 = "06wnwvnkhw1rk0y3nncjmcyjy3bgpw8i9xqd5gpbhbrm38718cjk";
+    sha256 = "0cy79swgdbaf3zmsaqa6gz3b0fad2yqawwcnsipnpl9d8hn1linm";
   };
 
   nativeBuildInputs = [ cmake ];
-- 
GitLab


From fd3052901c13af372228502350c444dddc21cb6e Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Tue, 24 Sep 2019 10:47:34 +0200
Subject: [PATCH 1052/2254] lib/versions: expose splitVersion

---
 lib/default.nix  |  2 ++
 lib/versions.nix | 12 +++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/lib/default.nix b/lib/default.nix
index 18d2dfae1e1..f293a1defb1 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -134,5 +134,7 @@ let
       mergeAttrsByFuncDefaultsClean mergeAttrBy
       fakeSha256 fakeSha512
       nixType imap;
+    inherit (versions)
+      splitVersion;
   });
 in lib
diff --git a/lib/versions.nix b/lib/versions.nix
index 2c05445b3dd..0e9d81ac78b 100644
--- a/lib/versions.nix
+++ b/lib/versions.nix
@@ -1,13 +1,15 @@
 /* Version string functions. */
 { lib }:
 
-let
+rec {
 
-  splitVersion = builtins.splitVersion or (lib.splitString ".");
-
-in
+  /* Break a version string into its component parts.
 
-{
+     Example:
+       splitVersion "1.2.3"
+       => ["1" "2" "3"]
+  */
+  splitVersion = builtins.splitVersion or (lib.splitString ".");
 
   /* Get the major version string from a string.
 
-- 
GitLab


From 2d4352b1ae57a06670b451f1b4426beff9796628 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Tue, 24 Sep 2019 11:27:14 +0200
Subject: [PATCH 1053/2254] lib: basic tests for lib.versions

---
 lib/tests/misc.nix | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix
index d8f412d3fc4..e5d76d4e57b 100644
--- a/lib/tests/misc.nix
+++ b/lib/tests/misc.nix
@@ -102,6 +102,21 @@ runTests {
     expected = [ "2001" "db8" "0" "0042" "" "8a2e" "370" "" ];
   };
 
+  testSplitVersionSingle = {
+    expr = versions.splitVersion "1";
+    expected = [ "1" ];
+  };
+
+  testSplitVersionDouble = {
+    expr = versions.splitVersion "1.2";
+    expected = [ "1" "2" ];
+  };
+
+  testSplitVersionTriple = {
+    expr = versions.splitVersion "1.2.3";
+    expected = [ "1" "2" "3" ];
+  };
+
   testIsStorePath =  {
     expr =
       let goodPath =
-- 
GitLab


From bad07dfac57c36dff1c7b3fd4020fea806d7be93 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Tue, 24 Sep 2019 11:24:13 +0200
Subject: [PATCH 1054/2254] tree-wide: replace uses of splitString "." with
 lib.versions

Quoting from the splitString docstring:

   NOTE: this function is not performant and should never be used.

This replaces trivial uses of splitString for splitting version
strings with the (potentially builtin) splitVersion.
---
 nixos/modules/services/web-servers/apache-httpd/default.nix   | 2 +-
 pkgs/applications/misc/mupdf/default.nix                      | 3 +--
 pkgs/applications/misc/workrave/default.nix                   | 2 +-
 pkgs/applications/networking/cluster/openshift/default.nix    | 2 +-
 pkgs/applications/science/logic/yices/default.nix             | 2 +-
 .../virtualization/virtualbox/guest-additions/default.nix     | 2 +-
 pkgs/build-support/rust/build-rust-crate/configure-crate.nix  | 3 +--
 pkgs/development/compilers/cudatoolkit/default.nix            | 4 +---
 pkgs/development/compilers/llvm/3.9/llvm.nix                  | 2 +-
 pkgs/development/compilers/llvm/4/llvm.nix                    | 2 +-
 pkgs/development/compilers/llvm/5/llvm.nix                    | 2 +-
 pkgs/development/compilers/llvm/6/llvm.nix                    | 2 +-
 pkgs/development/compilers/llvm/7/llvm.nix                    | 2 +-
 pkgs/development/compilers/llvm/8/llvm.nix                    | 2 +-
 pkgs/development/interpreters/lfe/generic-builder.nix         | 4 ++--
 pkgs/development/libraries/mesa/default.nix                   | 2 +-
 pkgs/development/libraries/science/math/cudnn/generic.nix     | 2 +-
 pkgs/development/libraries/sqlite/archive-version.nix         | 4 ++--
 pkgs/development/lua-modules/overrides.nix                    | 2 +-
 pkgs/games/dwarf-fortress/game.nix                            | 2 +-
 pkgs/misc/emulators/epsxe/default.nix                         | 2 +-
 pkgs/os-specific/bsd/netbsd/default.nix                       | 4 ++--
 pkgs/os-specific/linux/kernel/linux-4.14.nix                  | 4 ++--
 pkgs/os-specific/linux/kernel/linux-4.19.nix                  | 4 ++--
 pkgs/os-specific/linux/kernel/linux-5.2.nix                   | 4 ++--
 pkgs/os-specific/linux/kernel/linux-5.3.nix                   | 4 ++--
 pkgs/os-specific/linux/prl-tools/default.nix                  | 4 ++--
 27 files changed, 35 insertions(+), 39 deletions(-)

diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index 098160ee369..b0374d949fc 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -12,7 +12,7 @@ let
 
   php = mainCfg.phpPackage.override { apacheHttpd = httpd.dev; /* otherwise it only gets .out */ };
 
-  phpMajorVersion = head (splitString "." php.version);
+  phpMajorVersion = lib.versions.major (lib.getVersion php);
 
   mod_perl = pkgs.apacheHttpdPackages.mod_perl.override { apacheHttpd = httpd; };
 
diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix
index ddd325214b2..7420932e0b6 100644
--- a/pkgs/applications/misc/mupdf/default.nix
+++ b/pkgs/applications/misc/mupdf/default.nix
@@ -9,8 +9,7 @@ let
 
   # OpenJPEG version is hardcoded in package source
   openJpegVersion = with stdenv;
-    lib.concatStringsSep "." (lib.lists.take 2
-      (lib.splitString "." (lib.getVersion openjpeg)));
+    lib.versions.majorMinor (lib.getVersion openjpeg);
 
 
 in stdenv.mkDerivation rec {
diff --git a/pkgs/applications/misc/workrave/default.nix b/pkgs/applications/misc/workrave/default.nix
index a3c9d735ff8..9ad010deb16 100644
--- a/pkgs/applications/misc/workrave/default.nix
+++ b/pkgs/applications/misc/workrave/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   in fetchFromGitHub {
     sha256 = "0v2mx2idaxlsyv5w66b7pknlill9j9i2gqcs3vq54gak7ix9fj1p";
     rev = with stdenv.lib;
-      "v" + concatStringsSep "_" (splitString "." version);
+      "v" + concatStringsSep "_" (splitVersion version);
     repo = "workrave";
     owner = "rcaelers";
   };
diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix
index 758786f586a..3b96ef4ea45 100644
--- a/pkgs/applications/networking/cluster/openshift/default.nix
+++ b/pkgs/applications/networking/cluster/openshift/default.nix
@@ -10,7 +10,7 @@ with lib;
 
 let
   version = "3.11.0";
-  ver = stdenv.lib.elemAt (stdenv.lib.splitString "." version);
+  ver = stdenv.lib.elemAt (stdenv.lib.splitVersion version);
   versionMajor = ver 0;
   versionMinor = ver 1;
   versionPatch = ver 2;
diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix
index 76ed934fb39..b8dd528a11c 100644
--- a/pkgs/applications/science/logic/yices/default.nix
+++ b/pkgs/applications/science/logic/yices/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   # Includes a fix for the embedded soname being libyices.so.2.5, but
   # only installing the libyices.so.2.5.x file.
   installPhase = let
-    ver_XdotY = builtins.concatStringsSep "." (stdenv.lib.take 2 (stdenv.lib.splitString "." version));
+    ver_XdotY = stdenv.lib.versions.majorMinor version;
   in ''
       make install LDCONFIG=true
       ln -sfr $out/lib/libyices.so.{${version},${ver_XdotY}}
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index ad860b07bdf..1b93121f14e 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -3,7 +3,7 @@
 
 let
   version = virtualbox.version;
-  xserverVListFunc = builtins.elemAt (stdenv.lib.splitString "." xorg.xorgserver.version);
+  xserverVListFunc = builtins.elemAt (stdenv.lib.splitVersion xorg.xorgserver.version);
 
   # Forced to 1.18 in <nixpkgs/nixos/modules/services/x11/xserver.nix>
   # as it even fails to build otherwise.  Still, override this even here,
diff --git a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix
index 2a40240671c..2c7226b0962 100644
--- a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix
+++ b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix
@@ -21,7 +21,7 @@
 , workspace_member }:
 let version_ = lib.splitString "-" crateVersion;
     versionPre = if lib.tail version_ == [] then "" else builtins.elemAt version_ 1;
-    version = lib.splitString "." (lib.head version_);
+    version = lib.splitVersion (lib.head version_);
     rustcOpts = lib.lists.foldl' (opts: opt: opts + " " + opt)
         (if release then "-C opt-level=3" else "-C debuginfo=2")
         (["-C codegen-units=$NIX_BUILD_CORES"] ++ extraRustcOpts);
@@ -150,4 +150,3 @@ in ''
   fi
   runHook postConfigure
 ''
-
diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix
index 8aab9580232..0a7b74b465f 100644
--- a/pkgs/development/compilers/cudatoolkit/default.nix
+++ b/pkgs/development/compilers/cudatoolkit/default.nix
@@ -180,9 +180,7 @@ let
       '';
       passthru = {
         cc = gcc;
-        majorVersion =
-          let versionParts = lib.splitString "." version;
-          in "${lib.elemAt versionParts 0}.${lib.elemAt versionParts 1}";
+        majorVersion = lib.versions.majorMinor version;
       };
 
       meta = with stdenv.lib; {
diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix
index 4dde3be277a..474cfcde9c0 100644
--- a/pkgs/development/compilers/llvm/3.9/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.9/llvm.nix
@@ -22,7 +22,7 @@ assert (stdenv.hostPlatform != stdenv.buildPlatform) -> !enableSharedLibraries;
 let
   # Used when creating a versioned symlinks of libLLVM.dylib
   versionSuffixes = with stdenv.lib;
-    let parts = splitString "." version; in
+    let parts = splitVersion version; in
     imap (i: _: concatStringsSep "." (take i parts)) parts;
 in
 
diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix
index 7e855995352..ac5dcbe6b94 100644
--- a/pkgs/development/compilers/llvm/4/llvm.nix
+++ b/pkgs/development/compilers/llvm/4/llvm.nix
@@ -19,7 +19,7 @@
 let
   # Used when creating a versioned symlinks of libLLVM.dylib
   versionSuffixes = with stdenv.lib;
-    let parts = splitString "." release_version; in
+    let parts = splitVersion release_version; in
     imap (i: _: concatStringsSep "." (take i parts)) parts;
 in
 
diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/pkgs/development/compilers/llvm/5/llvm.nix
index 02db395db57..2fe7df7695b 100644
--- a/pkgs/development/compilers/llvm/5/llvm.nix
+++ b/pkgs/development/compilers/llvm/5/llvm.nix
@@ -18,7 +18,7 @@
 let
   # Used when creating a versioned symlinks of libLLVM.dylib
   versionSuffixes = with stdenv.lib;
-    let parts = splitString "." release_version; in
+    let parts = splitVersion release_version; in
     imap (i: _: concatStringsSep "." (take i parts)) parts;
 in
 
diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix
index 2586602d737..a250c9fefac 100644
--- a/pkgs/development/compilers/llvm/6/llvm.nix
+++ b/pkgs/development/compilers/llvm/6/llvm.nix
@@ -21,7 +21,7 @@ let
 
   # Used when creating a versioned symlinks of libLLVM.dylib
   versionSuffixes = with stdenv.lib;
-    let parts = splitString "." release_version; in
+    let parts = splitVersion release_version; in
     imap (i: _: concatStringsSep "." (take i parts)) parts;
 in
 
diff --git a/pkgs/development/compilers/llvm/7/llvm.nix b/pkgs/development/compilers/llvm/7/llvm.nix
index cfcda02b413..068791406e8 100644
--- a/pkgs/development/compilers/llvm/7/llvm.nix
+++ b/pkgs/development/compilers/llvm/7/llvm.nix
@@ -26,7 +26,7 @@ let
 
   # Used when creating a versioned symlinks of libLLVM.dylib
   versionSuffixes = with stdenv.lib;
-    let parts = splitString "." release_version; in
+    let parts = splitVersion release_version; in
     imap (i: _: concatStringsSep "." (take i parts)) parts;
 
 in stdenv.mkDerivation ({
diff --git a/pkgs/development/compilers/llvm/8/llvm.nix b/pkgs/development/compilers/llvm/8/llvm.nix
index 70e666ba27d..160e2a72366 100644
--- a/pkgs/development/compilers/llvm/8/llvm.nix
+++ b/pkgs/development/compilers/llvm/8/llvm.nix
@@ -25,7 +25,7 @@ let
 
   # Used when creating a version-suffixed symlink of libLLVM.dylib
   shortVersion = with stdenv.lib;
-    concatStringsSep "." (take 1 (splitString "." release_version));
+    concatStringsSep "." (take 1 (splitVersion release_version));
 
 in stdenv.mkDerivation ({
   name = "llvm-${version}";
diff --git a/pkgs/development/interpreters/lfe/generic-builder.nix b/pkgs/development/interpreters/lfe/generic-builder.nix
index fb034a471e7..6e74229e1e8 100644
--- a/pkgs/development/interpreters/lfe/generic-builder.nix
+++ b/pkgs/development/interpreters/lfe/generic-builder.nix
@@ -9,9 +9,9 @@
 }:
 
 let
-  inherit (stdenv.lib) getVersion versionAtLeast splitString head;
+  inherit (stdenv.lib) getVersion versionAtLeast versions;
 
-  mainVersion = head (splitString "." (getVersion erlang));
+  mainVersion = versions.major (getVersion erlang);
 
   proper = buildHex {
     name = "proper";
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index cf1bdaf6432..3a7c93413d5 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -28,7 +28,7 @@ with stdenv.lib;
 
 let
   version = "19.1.5";
-  branch  = head (splitString "." version);
+  branch  = versions.major version;
 in
 
 stdenv.mkDerivation {
diff --git a/pkgs/development/libraries/science/math/cudnn/generic.nix b/pkgs/development/libraries/science/math/cudnn/generic.nix
index f0f5829ce46..5a17e807bd4 100644
--- a/pkgs/development/libraries/science/math/cudnn/generic.nix
+++ b/pkgs/development/libraries/science/math/cudnn/generic.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation {
 
   passthru = {
     inherit cudatoolkit;
-    majorVersion = lib.head (lib.splitString "." version);
+    majorVersion = lib.versions.major version;
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/sqlite/archive-version.nix b/pkgs/development/libraries/sqlite/archive-version.nix
index 1f312ecef23..75d70680fbf 100644
--- a/pkgs/development/libraries/sqlite/archive-version.nix
+++ b/pkgs/development/libraries/sqlite/archive-version.nix
@@ -1,9 +1,9 @@
 lib: version:
 
 with lib;
-  
+
 let
-  fragments = splitString "." version;
+  fragments = splitVersion version;
   major = head fragments;
   minor = concatMapStrings (fixedWidthNumber 2) (tail fragments);
 in
diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix
index 233503c2eca..1f1dc45246b 100644
--- a/pkgs/development/lua-modules/overrides.nix
+++ b/pkgs/development/lua-modules/overrides.nix
@@ -29,7 +29,7 @@ with super;
     # Parse out a version number without the Lua version inserted
     version = with pkgs.lib; let
       version' = super.cqueues.version;
-      rel = splitString "." version';
+      rel = splitVersion version';
       date = head rel;
       rev = last (splitString "-" (last rel));
     in "${date}-${rev}";
diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix
index 291e32b6406..d3a26529424 100644
--- a/pkgs/games/dwarf-fortress/game.nix
+++ b/pkgs/games/dwarf-fortress/game.nix
@@ -26,7 +26,7 @@ let
     i686-cygwin = "win32";
   };
 
-  dfVersionTriple = splitString "." dfVersion;
+  dfVersionTriple = splitVersion dfVersion;
   baseVersion = elemAt dfVersionTriple 1;
   patchVersion = elemAt dfVersionTriple 2;
 
diff --git a/pkgs/misc/emulators/epsxe/default.nix b/pkgs/misc/emulators/epsxe/default.nix
index 6950e12e889..b9923def6f2 100644
--- a/pkgs/misc/emulators/epsxe/default.nix
+++ b/pkgs/misc/emulators/epsxe/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   version = "2.0.5";
 
   src = let
-    version2 = concatStrings (splitString "." version);
+    version2 = replaceStrings ["."] [""] version;
     platform = "linux" + (optionalString stdenv.is64bit "_x64");
   in fetchurl {
     url = "https://www.epsxe.com/files/ePSXe${version2}${platform}.zip";
diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix
index 7370901f319..f724fd33939 100644
--- a/pkgs/os-specific/bsd/netbsd/default.nix
+++ b/pkgs/os-specific/bsd/netbsd/default.nix
@@ -68,9 +68,9 @@ let
   } // lib.optionalAttrs stdenv'.isDarwin {
     MKRELRO = "no";
   } // lib.optionalAttrs (stdenv'.cc.isClang or false) {
-    HAVE_LLVM = lib.head (lib.splitString "." (lib.getVersion stdenv'.cc.cc));
+    HAVE_LLVM = lib.versions.major (lib.getVersion stdenv'.cc.cc);
   } // lib.optionalAttrs (stdenv'.cc.isGNU or false) {
-    HAVE_GCC = lib.head (lib.splitString "." (lib.getVersion stdenv'.cc.cc));
+    HAVE_GCC = lib.versions.major (lib.getVersion stdenv'.cc.cc);
   } // lib.optionalAttrs (attrs.headersOnly or false) {
     installPhase = "includesPhase";
     dontBuild = true;
diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index c5931f2da11..64288071976 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -6,10 +6,10 @@ buildLinux (args // rec {
   version = "4.14.145";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
-  modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
+  modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
 
   # branchVersion needs to be x.y
-  extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version)));
+  extraMeta.branch = versions.majorMinor version;
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix
index 5e0e5f882e4..c4735415d1d 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -6,10 +6,10 @@ buildLinux (args // rec {
   version = "4.19.74";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
-  modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
+  modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
 
   # branchVersion needs to be x.y
-  extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version)));
+  extraMeta.branch = versions.majorMinor version;
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
diff --git a/pkgs/os-specific/linux/kernel/linux-5.2.nix b/pkgs/os-specific/linux/kernel/linux-5.2.nix
index 69cfada3422..13856d14600 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.2.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.2.nix
@@ -6,10 +6,10 @@ buildLinux (args // rec {
   version = "5.2.16";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
-  modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
+  modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
 
   # branchVersion needs to be x.y
-  extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version)));
+  extraMeta.branch = versions.majorMinor version;
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
diff --git a/pkgs/os-specific/linux/kernel/linux-5.3.nix b/pkgs/os-specific/linux/kernel/linux-5.3.nix
index e9cb412d8db..ebc548ea5b4 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.3.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.3.nix
@@ -6,10 +6,10 @@ buildLinux (args // rec {
   version = "5.3";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
-  modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
+  modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
 
   # branchVersion needs to be x.y
-  extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version)));
+  extraMeta.branch = versions.majorMinor version;
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix
index 3daab3917e8..5f84b5dcc66 100644
--- a/pkgs/os-specific/linux/prl-tools/default.nix
+++ b/pkgs/os-specific/linux/prl-tools/default.nix
@@ -8,8 +8,8 @@ assert (!libsOnly) -> kernel != null;
 # Disable for kernels 4.15 and above due to compatibility issues
 assert kernel != null -> stdenv.lib.versionOlder kernel.version "4.15";
 
-let xorgFullVer = (builtins.parseDrvName xorg.xorgserver.name).version;
-    xorgVer = lib.concatStringsSep "." (lib.take 2 (lib.splitString "." xorgFullVer));
+let xorgFullVer = lib.getVersion xorg.xorgserver;
+    xorgVer = lib.versions.majorMinor xorgFullVer;
     x64 = if stdenv.hostPlatform.system == "x86_64-linux" then true
           else if stdenv.hostPlatform.system == "i686-linux" then false
           else throw "Parallels Tools for Linux only support {x86-64,i686}-linux targets";
-- 
GitLab


From f4b470545d5ca42fbd014e427ae64dd0c4821ec0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 08:45:24 -0700
Subject: [PATCH 1055/2254] fdroidserver: 1.1.4 -> 1.1.5

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/fdroidserver/versions
---
 pkgs/development/tools/fdroidserver/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/fdroidserver/default.nix b/pkgs/development/tools/fdroidserver/default.nix
index 3f3f7779528..a4e51008bf7 100644
--- a/pkgs/development/tools/fdroidserver/default.nix
+++ b/pkgs/development/tools/fdroidserver/default.nix
@@ -4,14 +4,14 @@
 , lib }:
 
 python.pkgs.buildPythonApplication rec {
-  version = "1.1.4";
+  version = "1.1.5";
   pname = "fdroidserver";
 
   src = fetchFromGitLab {
     owner = "fdroid";
     repo = "fdroidserver";
     rev = version;
-    sha256 = "020b6w2vhqgkpbrc1d08zh6mkh704mqhqqly14hir2bvay9rr9li";
+    sha256 = "1wpwv5gbwrjs03fmr6d81268k6gzjgr86swzgb8nfj48955iw193";
   };
 
   patchPhase = ''
-- 
GitLab


From 13ee95223230f4f1bdc7e85e0c7ffeb5a48ca747 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 09:06:06 -0700
Subject: [PATCH 1056/2254] flrig: 1.3.47 -> 1.3.48

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/flrig/versions
---
 pkgs/applications/radio/flrig/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/radio/flrig/default.nix b/pkgs/applications/radio/flrig/default.nix
index 5bb561f1426..242536a8965 100644
--- a/pkgs/applications/radio/flrig/default.nix
+++ b/pkgs/applications/radio/flrig/default.nix
@@ -6,12 +6,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.3.47";
+  version = "1.3.48";
   pname = "flrig";
 
   src = fetchurl {
     url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz";
-    sha256 = "1xih3ik5dssa40lx48228pcrds8r7xmd8rmk2fcr1mw6apw6q141";
+    sha256 = "0f46rmrr8aphj8fsbfa1bywihigzfzyxq9zg66d1laa7d3jsfs9q";
   };
 
   buildInputs = [
-- 
GitLab


From 7d3ee66e8e8d66786e6122e8788f696c1339e154 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 09:10:54 -0700
Subject: [PATCH 1057/2254] fmit: 1.2.6 -> 1.2.13

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/fmit/versions
---
 pkgs/applications/audio/fmit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix
index 680694aa403..ee45217e490 100644
--- a/pkgs/applications/audio/fmit/default.nix
+++ b/pkgs/applications/audio/fmit/default.nix
@@ -11,13 +11,13 @@ with stdenv.lib;
 
 mkDerivation rec {
   pname = "fmit";
-  version = "1.2.6";
+  version = "1.2.13";
 
   src = fetchFromGitHub {
     owner = "gillesdegottex";
     repo = "fmit";
     rev = "v${version}";
-    sha256 = "03nzkig5mw2rqwhwmg0qvc5cnk9bwh2wp13jh0mdrr935w0587mz";
+    sha256 = "1qyskam053pvlap1av80rgp12pzhr92rs88vqs6s0ia3ypnixcc6";
   };
 
   nativeBuildInputs = [ qmake itstool wrapQtAppsHook ];
-- 
GitLab


From 07846b02f72bcbd3775832471da637ff40085e5d Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 26 Sep 2019 18:15:59 +0200
Subject: [PATCH 1058/2254] documize-community: 3.3.0 -> 3.3.1

https://github.com/documize/community/releases/tag/v3.3.1
---
 pkgs/servers/documize-community/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/documize-community/default.nix b/pkgs/servers/documize-community/default.nix
index f06315b899d..7339bcc6584 100644
--- a/pkgs/servers/documize-community/default.nix
+++ b/pkgs/servers/documize-community/default.nix
@@ -2,13 +2,13 @@
 
 buildGoPackage rec {
   pname = "documize-community";
-  version = "3.3.0";
+  version = "3.3.1";
 
   src = fetchFromGitHub {
     owner = "documize";
     repo = "community";
     rev = "v${version}";
-    sha256 = "1qkc82bvpmgcil88630pnp1irc2w8rzlh702vl0v67vfmawpxpjq";
+    sha256 = "1n7cdi76yfdk79ky7six72jg2px0b4hb9s16nshz3qvss469dn2j";
   };
 
   goPackagePath = "github.com/documize/community";
-- 
GitLab


From 2b2c6e0bc44f0701d1e7c159eca539a4eefedf42 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Thu, 26 Sep 2019 16:14:32 +0100
Subject: [PATCH 1059/2254] pythonPackages.pipBuildHook: Add wheel dependency

And remove missing "options"
---
 pkgs/development/interpreters/python/hooks/default.nix       | 4 ++--
 pkgs/development/interpreters/python/hooks/pip-build-hook.sh | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix
index 3a4b4a0ccad..861cb38c060 100644
--- a/pkgs/development/interpreters/python/hooks/default.nix
+++ b/pkgs/development/interpreters/python/hooks/default.nix
@@ -20,10 +20,10 @@ in rec {
       };
     } ./flit-build-hook.sh) {};
 
-  pipBuildHook = callPackage ({ pip }:
+  pipBuildHook = callPackage ({ pip, wheel }:
     makeSetupHook {
       name = "pip-build-hook.sh";
-      deps = [ pip ];
+      deps = [ pip wheel ];
       substitutions = {
         inherit pythonInterpreter pythonSitePackages;
       };
diff --git a/pkgs/development/interpreters/python/hooks/pip-build-hook.sh b/pkgs/development/interpreters/python/hooks/pip-build-hook.sh
index 6796d3efd0a..c297bfffb1e 100644
--- a/pkgs/development/interpreters/python/hooks/pip-build-hook.sh
+++ b/pkgs/development/interpreters/python/hooks/pip-build-hook.sh
@@ -7,7 +7,7 @@ pipBuildPhase() {
 
     mkdir -p dist
     echo "Creating a wheel..."
-    @pythonInterpreter@ -m pip wheel --no-index --no-deps --no-clean --no-build-isolation --wheel-dir dist "$options" .
+    @pythonInterpreter@ -m pip wheel --no-index --no-deps --no-clean --no-build-isolation --wheel-dir dist .
     echo "Finished creating a wheel..."
 
     runHook postBuild
-- 
GitLab


From 0f8d1129b151ea8174863cff5bc69d6960e4a4dc Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Thu, 26 Sep 2019 16:15:46 +0100
Subject: [PATCH 1060/2254] pythonPackages.pyrsistent: 0.15.2 -> 0.15.4

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

diff --git a/pkgs/development/python-modules/pyrsistent/default.nix b/pkgs/development/python-modules/pyrsistent/default.nix
index cabb96d2256..74c3724aa19 100644
--- a/pkgs/development/python-modules/pyrsistent/default.nix
+++ b/pkgs/development/python-modules/pyrsistent/default.nix
@@ -2,23 +2,23 @@
 , buildPythonPackage
 , fetchPypi
 , six
-, pytest
+, pytest_4
 , hypothesis
 , pytestrunner
 }:
 
 buildPythonPackage rec {
   pname = "pyrsistent";
-  version = "0.15.2";
+  version = "0.15.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0fjwnxg7q1b02j7hk1wqm5xdn7wck9j2g3ggkkizab6l77kjws8n";
+    sha256 = "0cv5xvhfhlj88pb0ghdwivkfcmgi6503qjwxx4r6n06nd6hpzd1l";
   };
 
   propagatedBuildInputs = [ six ];
 
-  checkInputs = [ pytestrunner pytest hypothesis ];
+  checkInputs = [ pytestrunner pytest_4 hypothesis ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/tobgu/pyrsistent/;
-- 
GitLab


From b8ff7bc092315cc2950837b5844a2b3b1688c754 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Thu, 26 Sep 2019 17:17:08 +0100
Subject: [PATCH 1061/2254] pythonPackages.poetry: Fix build

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

diff --git a/pkgs/development/python-modules/poetry/default.nix b/pkgs/development/python-modules/poetry/default.nix
index d7e2a1db2ff..226e71c13cc 100644
--- a/pkgs/development/python-modules/poetry/default.nix
+++ b/pkgs/development/python-modules/poetry/default.nix
@@ -43,7 +43,8 @@ in buildPythonPackage rec {
   postPatch = ''
     substituteInPlace setup.py --replace \
       "requests-toolbelt>=0.8.0,<0.9.0" \
-      "requests-toolbelt>=0.8.0,<0.10.0"
+      "requests-toolbelt>=0.8.0,<0.10.0" \
+      --replace 'pyrsistent>=0.14.2,<0.15.0' 'pyrsistent>=0.14.2,<0.16.0'
   '';
 
   format = "pyproject";
-- 
GitLab


From 0ce660c62f90aabaf6fa4687fc072c89460ab6be Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 09:17:42 -0700
Subject: [PATCH 1062/2254] flmsg: 4.0.10 -> 4.0.14

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/flmsg/versions
---
 pkgs/applications/radio/flmsg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/radio/flmsg/default.nix b/pkgs/applications/radio/flmsg/default.nix
index ae602b752e0..39fbb0de06c 100644
--- a/pkgs/applications/radio/flmsg/default.nix
+++ b/pkgs/applications/radio/flmsg/default.nix
@@ -6,12 +6,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "4.0.10";
+  version = "4.0.14";
   pname = "flmsg";
 
   src = fetchurl {
     url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz";
-    sha256 = "1vprax1w5wm3v2i4d0mbakrxp7v53m2bm8icsvaji06ixskq7cxf";
+    sha256 = "0s1prawkpvr7xr7h8w7r0ly90ya3n8h6qsii0x6laqrkgjn9w9iy";
   };
 
   buildInputs = [
-- 
GitLab


From 8da4f1ac883fa0be670194b5771a447b05d82875 Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Thu, 26 Sep 2019 18:49:10 +0200
Subject: [PATCH 1063/2254] jormungandr: 0.5.0 -> 0.5.1

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

diff --git a/pkgs/applications/blockchains/jormungandr/default.nix b/pkgs/applications/blockchains/jormungandr/default.nix
index bde73ec16c8..4a6cc4c254d 100644
--- a/pkgs/applications/blockchains/jormungandr/default.nix
+++ b/pkgs/applications/blockchains/jormungandr/default.nix
@@ -10,12 +10,12 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "jormungandr";
-  version = "0.5.0";
+  version = "0.5.1";
 
   src = fetchgit {
     url = "https://github.com/input-output-hk/${pname}";
     rev = "v${version}";
-    sha256 = "19jqnja4mxyfgg79m4ak4815wjxvkg6qn04gk21c15xl3i8b4zf6";
+    sha256 = "1zdy0yymsipk0a5kcjnkpnzllnx27xvd6331a4w231azj5x1gif2";
     fetchSubmodules = true;
   };
 
-- 
GitLab


From f051d7506b0149ffea4a2f6cbe25212ba559098b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 09:51:36 -0700
Subject: [PATCH 1064/2254] fanficfare: 3.10.5 -> 3.11.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/fanficfare/versions
---
 pkgs/tools/text/fanficfare/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/tools/text/fanficfare/default.nix
index 87306a61e0d..556b868e161 100644
--- a/pkgs/tools/text/fanficfare/default.nix
+++ b/pkgs/tools/text/fanficfare/default.nix
@@ -2,11 +2,11 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "FanFicFare";
-  version = "3.10.5";
+  version = "3.11.0";
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "0bxz1a0ak6b6zj5xpkzwy8ikxf45kkxdj64sf4ilj43yaqicm0bw";
+    sha256 = "1w1crc32p5rnbah6x9km6yvjiy5qrmpmvzb4ignsprfxjq803r3a";
   };
 
   propagatedBuildInputs = with python3Packages; [
-- 
GitLab


From b0193e6c01c12af83c3fd0709a2d57c546cdd9fd Mon Sep 17 00:00:00 2001
From: Jan Hrnko <jan.hrnko@satoshilabs.com>
Date: Thu, 26 Sep 2019 17:48:42 +0200
Subject: [PATCH 1065/2254] python-trezor: 0.11.4 -> 0.11.5

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

diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix
index 9b7dc424ddc..078727ddc9a 100644
--- a/pkgs/development/python-modules/trezor/default.nix
+++ b/pkgs/development/python-modules/trezor/default.nix
@@ -15,13 +15,13 @@
 
 buildPythonPackage rec {
   pname = "trezor";
-  version = "0.11.4";
+  version = "0.11.5";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "aeb3f56a4c389495617f27bf218471b7969f636d25ddc491dfefeb8a1b3cd499";
+    sha256 = "cd8aafd70a281daa644c4a3fb021ffac20b7a88e86226ecc8bb3e78e1734a184";
   };
 
   propagatedBuildInputs = [ typing-extensions protobuf hidapi ecdsa mnemonic requests pyblake2 click construct libusb1 rlp shamir-mnemonic ];
@@ -33,7 +33,7 @@ buildPythonPackage rec {
   # disable test_tx_api.py as it requires being online
   checkPhase = ''
     runHook preCheck
-    ${python.interpreter} -m pytest --pyargs trezorlib.tests.unit_tests --ignore trezorlib/tests/unit_tests/test_tx_api.py
+    pytest --pyargs tests --ignore tests/test_tx_api.py
     runHook postCheck
   '';
 
-- 
GitLab


From e669aa4b853f2e9ce4f7f545ff9a5108e50434a7 Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Thu, 26 Sep 2019 19:14:44 +0200
Subject: [PATCH 1066/2254] jormungandr: 0.5.1 -> 0.5.2

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

diff --git a/pkgs/applications/blockchains/jormungandr/default.nix b/pkgs/applications/blockchains/jormungandr/default.nix
index 4a6cc4c254d..5f54b84d4d4 100644
--- a/pkgs/applications/blockchains/jormungandr/default.nix
+++ b/pkgs/applications/blockchains/jormungandr/default.nix
@@ -10,12 +10,12 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "jormungandr";
-  version = "0.5.1";
+  version = "0.5.2";
 
   src = fetchgit {
     url = "https://github.com/input-output-hk/${pname}";
     rev = "v${version}";
-    sha256 = "1zdy0yymsipk0a5kcjnkpnzllnx27xvd6331a4w231azj5x1gif2";
+    sha256 = "0aixz007kc5gisc4hvix3ccmy0r459lczlwmnm2989jcxk3hki3q";
     fetchSubmodules = true;
   };
 
-- 
GitLab


From 31cf9e77a5ceb53c8a90c0d15c94bf6efa2f1c2a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 10:25:53 -0700
Subject: [PATCH 1067/2254] getmail: 5.13 -> 5.14

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/getmail/versions
---
 pkgs/tools/networking/getmail/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix
index 6181093a193..f107e410678 100644
--- a/pkgs/tools/networking/getmail/default.nix
+++ b/pkgs/tools/networking/getmail/default.nix
@@ -2,11 +2,11 @@
 
 python2Packages.buildPythonApplication rec {
   pname = "getmail";
-  version = "5.13";
+  version = "5.14";
 
   src = fetchurl {
     url = "http://pyropus.ca/software/getmail/old-versions/${pname}-${version}.tar.gz";
-    sha256 = "178a1c37z1aia5m2mbq9gyv6hylnxg9g3lp3njcrz7phfmj2zm84";
+    sha256 = "1hcrd9h4g12f5gvl1djsbchcjry02ghq4icdr897s8v48pkrzagk";
   };
 
   doCheck = false;
-- 
GitLab


From 348c8947e0fda0844a053af1128aacbd693662c9 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 19 Sep 2019 15:54:10 +0000
Subject: [PATCH 1068/2254] =?UTF-8?q?ocamlPackages.utop:=202.4.1=20?=
 =?UTF-8?q?=E2=86=92=202.4.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Ensures compatibility with OCaml 4.09
---
 pkgs/development/tools/ocaml/utop/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix
index 28ad85b42e9..7662041a488 100644
--- a/pkgs/development/tools/ocaml/utop/default.nix
+++ b/pkgs/development/tools/ocaml/utop/default.nix
@@ -8,11 +8,11 @@ else
 
 stdenv.mkDerivation rec {
   pname = "utop";
-  version = "2.4.1";
+  version = "2.4.2";
 
   src = fetchurl {
     url = "https://github.com/diml/utop/archive/${version}.tar.gz";
-    sha256 = "0kbg7sfn7jaic7xcy7dm543yzsywirxbgpiv2rzwnp9ny2510f9g";
+    sha256 = "0fl8524vmxb9yxjwrh5varvfp0ff3sgfp627knwbxxr69w45ad8h";
   };
 
   nativeBuildInputs = [ makeWrapper ];
-- 
GitLab


From 6f3b44baa4f446cd920a14eb7a2f1f3a54d45851 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 26 Sep 2019 19:52:28 +0200
Subject: [PATCH 1069/2254] signal-desktop: 1.27.2 -> 1.27.3

---
 .../networking/instant-messengers/signal-desktop/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index f217084585a..7575301cd30 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -58,7 +58,7 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "signal-desktop";
-  version = "1.27.2"; # Please backport all updates to the stable channel.
+  version = "1.27.3"; # Please backport all updates to the stable channel.
   # All releases have a limited lifetime and "expire" 90 days after the release.
   # When releases "expire" the application becomes unusable until an update is
   # applied. The expiration date for the current release can be extracted with:
@@ -68,7 +68,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-    sha256 = "08qh7867bc6z6mdbdilqdacx67n0kaxl3m4m97k0jxhd093a8xfz";
+    sha256 = "1c9arwnwa0lirvkwm0rfknabqn5gkznihxl1p2m6j7cs7hwhhsn2";
   };
 
   phases = [ "unpackPhase" "installPhase" ];
-- 
GitLab


From 305d811a2d6b3b7d8ddd4ff057afc4c93200ec2e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 11:03:21 -0700
Subject: [PATCH 1070/2254] git-cola: 3.4 -> 3.5

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/git-cola/versions
---
 .../version-management/git-and-tools/git-cola/default.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
index 545fc77168e..572a9d3b256 100644
--- a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
@@ -5,13 +5,13 @@ let
 
 in buildPythonApplication rec {
   pname = "git-cola";
-  version = "3.4";
+  version = "3.5";
 
   src = fetchFromGitHub {
     owner = "git-cola";
     repo = "git-cola";
     rev = "v${version}";
-    sha256 = "0754d56dprhb1nhb8fwp4my5pyqcgarwzba1l6zx7il87d7vyi5m";
+    sha256 = "09b60jbpdr4czx7h4vqahqmmi7m9vn77jlkpjfhys7crrdnxjp9i";
   };
 
   buildInputs = [ git gettext ];
-- 
GitLab


From 29a7877a089da7ee5fe2091f15626ee1674b0f01 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 11:11:17 -0700
Subject: [PATCH 1071/2254] git-quick-stats: 2.0.8 -> 2.0.9

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/git-quick-stats/versions
---
 pkgs/development/tools/git-quick-stats/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/git-quick-stats/default.nix b/pkgs/development/tools/git-quick-stats/default.nix
index 6bb8719d5d6..6bcbf7cf9bf 100644
--- a/pkgs/development/tools/git-quick-stats/default.nix
+++ b/pkgs/development/tools/git-quick-stats/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchFromGitHub }:
 stdenv.mkDerivation rec {
   pname = "git-quick-stats";
-  version = "2.0.8";
+  version = "2.0.9";
   src = fetchFromGitHub {
     repo = "git-quick-stats";
     owner = "arzzen";
     rev = version;
-    sha256 = "1px1sk7b6mjnbclsr1jn33m9k4wd8wqyw4d6w1rgj0ii29lhzmqi";
+    sha256 = "0y8rzm2jizsh65sxc3jlqp4nfv558rfhr77s9hz4qy4i24z44bgq";
   };
   PREFIX = builtins.placeholder "out";
   meta = with stdenv.lib; {
-- 
GitLab


From 8686f441397e1e419284376f96b0cc498d60435b Mon Sep 17 00:00:00 2001
From: Lily Ballard <lily@sb.org>
Date: Thu, 26 Sep 2019 11:11:33 -0700
Subject: [PATCH 1072/2254] jazzy: 0.11.1 -> 0.11.2

---
 pkgs/development/tools/jazzy/Gemfile.lock | 23 ++++++----
 pkgs/development/tools/jazzy/gemset.nix   | 53 ++++++++++++++++++-----
 2 files changed, 57 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/tools/jazzy/Gemfile.lock b/pkgs/development/tools/jazzy/Gemfile.lock
index 28bd27ecc76..65716e824f9 100644
--- a/pkgs/development/tools/jazzy/Gemfile.lock
+++ b/pkgs/development/tools/jazzy/Gemfile.lock
@@ -7,18 +7,21 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
+    algoliasearch (1.27.1)
+      httpclient (~> 2.8, >= 2.8.3)
+      json (>= 1.5.1)
     atomos (0.1.3)
     claide (1.0.3)
-    cocoapods (1.7.5)
+    cocoapods (1.8.0)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.7.5)
+      cocoapods-core (= 1.8.0)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
       cocoapods-downloader (>= 1.2.2, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
       cocoapods-stats (>= 1.0.0, < 2.0)
-      cocoapods-trunk (>= 1.3.1, < 2.0)
+      cocoapods-trunk (>= 1.4.0, < 2.0)
       cocoapods-try (>= 1.1.0, < 2.0)
       colored2 (~> 3.1)
       escape (~> 0.0.4)
@@ -27,9 +30,11 @@ GEM
       molinillo (~> 0.6.6)
       nap (~> 1.0)
       ruby-macho (~> 1.4)
-      xcodeproj (>= 1.10.0, < 2.0)
-    cocoapods-core (1.7.5)
+      xcodeproj (>= 1.11.1, < 2.0)
+    cocoapods-core (1.8.0)
       activesupport (>= 4.0.2, < 6)
+      algoliasearch (~> 1.0)
+      concurrent-ruby (~> 1.0)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
     cocoapods-deintegrate (1.0.4)
@@ -38,7 +43,7 @@ GEM
       nap
     cocoapods-search (1.0.0)
     cocoapods-stats (1.1.0)
-    cocoapods-trunk (1.4.0)
+    cocoapods-trunk (1.4.1)
       nap (>= 0.8, < 2.0)
       netrc (~> 0.11)
     cocoapods-try (1.1.0)
@@ -49,9 +54,10 @@ GEM
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
+    httpclient (2.8.3)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    jazzy (0.11.1)
+    jazzy (0.11.2)
       cocoapods (~> 1.5)
       mustache (~> 1.1)
       open4
@@ -60,8 +66,9 @@ GEM
       sassc (~> 2.1)
       sqlite3 (~> 1.3)
       xcinvoke (~> 0.3.0)
+    json (2.2.0)
     liferaft (0.0.6)
-    minitest (5.11.3)
+    minitest (5.12.0)
     molinillo (0.6.6)
     mustache (1.1.0)
     nanaimo (0.2.6)
diff --git a/pkgs/development/tools/jazzy/gemset.nix b/pkgs/development/tools/jazzy/gemset.nix
index 19ec06b6a2b..c397c2a50e2 100644
--- a/pkgs/development/tools/jazzy/gemset.nix
+++ b/pkgs/development/tools/jazzy/gemset.nix
@@ -10,6 +10,17 @@
     };
     version = "4.2.11.1";
   };
+  algoliasearch = {
+    dependencies = ["httpclient" "json"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1ayg8j3819ay2d8618jv32ca16fh8qsgjsiq9j32yd016c170nkj";
+      type = "gem";
+    };
+    version = "1.27.1";
+  };
   atomos = {
     groups = ["default"];
     platforms = [];
@@ -46,21 +57,21 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "02gnm6l7f3pxmy7bqns0dhxmanlqp01hkpvng5cxryww17zrq2qz";
+      sha256 = "07kwhlf8s5by0bwl07f8nyz0k1szgi801cb51n8wbargwhqk1xa4";
       type = "gem";
     };
-    version = "1.7.5";
+    version = "1.8.0";
   };
   cocoapods-core = {
-    dependencies = ["activesupport" "fuzzy_match" "nap"];
+    dependencies = ["activesupport" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1i53x5lhlvyirls2ch45x9wsrfqk7s3zp85lbnwps9abimxj4nh4";
+      sha256 = "1clmsmc7407namv0b6d0zssjzamwvvb2k8hxggwmrcbs2gmd20ad";
       type = "gem";
     };
-    version = "1.7.5";
+    version = "1.8.0";
   };
   cocoapods-deintegrate = {
     groups = ["default"];
@@ -115,10 +126,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1m0p27aij7d0n0b8h7nvyv3q3prcpwisbj7sla0fp2hvn4lqarl5";
+      sha256 = "0vrwsgaq3nf7v3pwksgqy0mhswrp3ipczrc96vl3ii2pcc9ilwkw";
       type = "gem";
     };
-    version = "1.4.0";
+    version = "1.4.1";
   };
   cocoapods-try = {
     source = {
@@ -192,6 +203,16 @@
     };
     version = "1.1.3";
   };
+  httpclient = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99";
+      type = "gem";
+    };
+    version = "2.8.3";
+  };
   i18n = {
     dependencies = ["concurrent-ruby"];
     groups = ["default"];
@@ -209,10 +230,20 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0kdja4bhzak79xvfpwwakqsjw07vfg458d62k08a416im7xcfcmc";
+      sha256 = "0dw29rsdijr4dhpvn89m3934qrr80a4jyg3v813iy7jbkb6kspj4";
+      type = "gem";
+    };
+    version = "0.11.2";
+  };
+  json = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0sx97bm9by389rbzv8r1f43h06xcz8vwi3h5jv074gvparql7lcx";
       type = "gem";
     };
-    version = "0.11.1";
+    version = "2.2.0";
   };
   liferaft = {
     source = {
@@ -227,10 +258,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq";
+      sha256 = "1kj5m8gg643w8jh8nsdy15bpddmnnafhyzhjx7gp28l1acb4fik7";
       type = "gem";
     };
-    version = "5.11.3";
+    version = "5.12.0";
   };
   molinillo = {
     groups = ["default"];
-- 
GitLab


From 460e603852cadd3c228d62431f6bb8c146f15325 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 26 Sep 2019 20:37:03 +0200
Subject: [PATCH 1073/2254] git-cola: build application with python3 by default

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

diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
index 572a9d3b256..5d1a06e0397 100644
--- a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchFromGitHub, pythonPackages, gettext, git, qt5 }:
+{ stdenv, fetchFromGitHub, python3Packages, gettext, git, qt5 }:
 
 let
-  inherit (pythonPackages) buildPythonApplication pyqt5 sip pyinotify;
+  inherit (python3Packages) buildPythonApplication pyqt5 sip pyinotify;
 
 in buildPythonApplication rec {
   pname = "git-cola";
-- 
GitLab


From 44bdda3f7fafb6bf00dae8e21d621afea286d02c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 11:50:03 -0700
Subject: [PATCH 1074/2254] intel-gmmlib: 19.2.3 -> 19.3.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/intel-gmmlib/versions
---
 pkgs/development/libraries/intel-gmmlib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix
index 53b89f17ea5..6657409a708 100644
--- a/pkgs/development/libraries/intel-gmmlib/default.nix
+++ b/pkgs/development/libraries/intel-gmmlib/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "intel-gmmlib";
-  version = "19.2.3";
+  version = "19.3.2";
 
   src = fetchFromGitHub {
     owner  = "intel";
     repo   = "gmmlib";
     rev    = "${pname}-${version}";
-    sha256 = "0hki53czv1na7h5b06fcwkd8bhn690ywg6dwjfs3x9fa4g48kqjb";
+    sha256 = "04jmzyciswvfb31h9shkja9183bmm1clw0l0sn1flq76888nngma";
   };
 
   nativeBuildInputs = [ cmake ];
-- 
GitLab


From ef49489551c2a8e05be14489140bf08314bd045b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 11:56:26 -0700
Subject: [PATCH 1075/2254] gnucash: 3.6 -> 3.7

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/gnucash/versions
---
 pkgs/applications/office/gnucash/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix
index 3abc447f6e9..9ec13c01168 100644
--- a/pkgs/applications/office/gnucash/default.nix
+++ b/pkgs/applications/office/gnucash/default.nix
@@ -25,11 +25,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "gnucash";
-  version = "3.6";
+  version = "3.7";
 
   src = fetchurl {
     url = "mirror://sourceforge/gnucash/${pname}-${version}.tar.bz2";
-    sha256 = "09azp17ghn7i8kwk0ci3gq0qkn5pvbknhf1cbk7v43mvc3g8djzi";
+    sha256 = "1d2qi3ny0bxa16ifh3465z1jgn1l0fmqk9dkph4ialw076gv13kb";
   };
 
   nativeBuildInputs = [ pkgconfig makeWrapper cmake gtest ];
-- 
GitLab


From a468fa8def1657aa49e961d9000407c52ae886d8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 12:02:17 -0700
Subject: [PATCH 1076/2254] libgnurl: 7.65.3 -> 7.66.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libgnurl/versions
---
 pkgs/development/libraries/libgnurl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libgnurl/default.nix b/pkgs/development/libraries/libgnurl/default.nix
index 0bb3af37eee..1736e97f466 100644
--- a/pkgs/development/libraries/libgnurl/default.nix
+++ b/pkgs/development/libraries/libgnurl/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libgnurl";
-  version = "7.65.3";
+  version = "7.66.0";
 
   src = fetchurl {
     url = "mirror://gnu/gnunet/gnurl-${version}.tar.gz";
-    sha256 = "19l7jw3x83qk7yay5968pc39vzvxl55mhn1nmjh51miyda405qa9";
+    sha256 = "03bkzcld384z7i3zh3k9k3pr0xpyqbcr8cxjqya1zqs5lk7i55x5";
   };
 
   nativeBuildInputs = [ libtool groff perl pkgconfig python2 ];
-- 
GitLab


From b7f156625e558a53d7fcf6380501b0e5196564ae Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 12:09:29 -0700
Subject: [PATCH 1077/2254] ginac: 1.7.6 -> 1.7.7

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/ginac/versions
---
 pkgs/applications/science/math/ginac/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/ginac/default.nix b/pkgs/applications/science/math/ginac/default.nix
index 197845bfa3c..541ed548f88 100644
--- a/pkgs/applications/science/math/ginac/default.nix
+++ b/pkgs/applications/science/math/ginac/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cln, pkgconfig, readline, gmp, python }:
 
 stdenv.mkDerivation rec {
-  name = "ginac-1.7.6";
+  name = "ginac-1.7.7";
 
   src = fetchurl {
     url    = "${meta.homepage}/${name}.tar.bz2";
-    sha256 = "03cq93qjfgxgr7zxadrjfbn43lk5f0x2lmd90ggx10p6jq47157v";
+    sha256 = "1jsf74cym5v6nq70aij3l7axq8vf7rrc1lnb9siyb9lsfbnnxzqf";
   };
 
   propagatedBuildInputs = [ cln ];
-- 
GitLab


From 091f90694831454edda94fbdf85dba65a9f576b5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 01:03:46 -0700
Subject: [PATCH 1078/2254] cloc: 1.82 -> 1.84

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/cloc/versions
---
 pkgs/tools/misc/cloc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/cloc/default.nix b/pkgs/tools/misc/cloc/default.nix
index 987d694a0a4..39370e6754e 100644
--- a/pkgs/tools/misc/cloc/default.nix
+++ b/pkgs/tools/misc/cloc/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cloc";
-  version = "1.82";
+  version = "1.84";
 
   src = fetchFromGitHub {
     owner = "AlDanial";
     repo = "cloc";
     rev = version;
-    sha256 = "0fsz07z0slfg58512fmnlj8pnxkc360bgf7fclg60v9clvcjbjsw";
+    sha256 = "14xikdwcr6pcnkk2i43zrsj88z8b3mrv0svbnbvxvarw1id83pnn";
   };
 
   setSourceRoot = ''
-- 
GitLab


From 991f825f2debf0dad487783f5d119876823b9783 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 26 Sep 2019 21:13:26 +0200
Subject: [PATCH 1079/2254] python3Packages.python-hosts: 0.4.5 -> 0.4.7

Also fixes the build: https://hydra.nixos.org/build/101987213

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

diff --git a/pkgs/development/python-modules/python-hosts/default.nix b/pkgs/development/python-modules/python-hosts/default.nix
index c2fcb5440ad..1fdd036bd12 100644
--- a/pkgs/development/python-modules/python-hosts/default.nix
+++ b/pkgs/development/python-modules/python-hosts/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "python-hosts";
-  version = "0.4.5";
+  version = "0.4.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1e5f04430fdaf09d6a7d9e82aa989669bc70fbba3e3e263f112a3e85193259b6";
+    sha256 = "0jdpihj8ajn6pqqa9viw0043l5wvbzgk81rnyk2134iyzhg06z80";
   };
 
   # win_inet_pton is required for windows support
-- 
GitLab


From db7433dd775664a88db03d7ffdaca9dff9fd0a37 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 12:34:59 -0700
Subject: [PATCH 1080/2254] git-secret: 0.2.6 -> 0.3.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/git-secret/versions
---
 .../version-management/git-and-tools/git-secret/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-secret/default.nix b/pkgs/applications/version-management/git-and-tools/git-secret/default.nix
index 62fbab02292..494c0a3421f 100644
--- a/pkgs/applications/version-management/git-and-tools/git-secret/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-secret/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub, makeWrapper, git, gnupg, gawk }:
 
 let
-  version = "0.2.6";
+  version = "0.3.1";
   repo = "git-secret";
 
 in stdenv.mkDerivation {
@@ -11,7 +11,7 @@ in stdenv.mkDerivation {
     inherit repo;
     owner = "sobolevn";
     rev = "v${version}";
-    sha256 = "09p4h8mdmk0nzcd1jh1i6n29klz38n5vqqwdyzjkygmr2xqka55b";
+    sha256 = "0234a2507as242wlybg32f7nd27ffjs50r4p1p95j6vs5s8g413l";
   };
 
   buildInputs = [ makeWrapper ];
-- 
GitLab


From 236ef9424ab7aae2aeaee73ff5c4b0249ed60fa1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 12:39:11 -0700
Subject: [PATCH 1081/2254] gthumb: 3.8.0 -> 3.8.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/gthumb/versions
---
 pkgs/applications/graphics/gthumb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix
index f24d57786ef..d7c0f0e0a0c 100644
--- a/pkgs/applications/graphics/gthumb/default.nix
+++ b/pkgs/applications/graphics/gthumb/default.nix
@@ -33,11 +33,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gthumb";
-  version = "3.8.0";
+  version = "3.8.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1l2s1facq1r6yvqjqc34aqfzlvb3nhkhn79xisxbbdlgrrxdq52f";
+    sha256 = "184zn79w4s9y1zy42ar31p3jsg8rmkxy8k6iry51nz8aizbcs7jb";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From e146b13944467136417c8973420f56e698daa1be Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 12:42:41 -0700
Subject: [PATCH 1082/2254] gradio: 7.2 -> 7.3

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/gradio/versions
---
 pkgs/applications/audio/gradio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/gradio/default.nix b/pkgs/applications/audio/gradio/default.nix
index c4a8f2fce02..487b0a730d8 100644
--- a/pkgs/applications/audio/gradio/default.nix
+++ b/pkgs/applications/audio/gradio/default.nix
@@ -16,7 +16,7 @@
 , gst_plugins ? with gst_all_1; [ gst-plugins-good gst-plugins-ugly ]
 }:
 let
-  version = "7.2";
+  version = "7.3";
 
 in stdenv.mkDerivation {
   pname = "gradio";
@@ -26,7 +26,7 @@ in stdenv.mkDerivation {
     owner = "haecker-felix";
     repo = "gradio";
     rev = "v${version}";
-    sha256 = "0c4vlrfl0ljkiwarpwa8wcfmmihh6a5j4pi4yr0qshyl9xxvxiv3";
+    sha256 = "00982dynl36lpsrx3mkd2a479zsrc8jvwfb8i7pi6w7fzzd8n8bl";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From 7b35f8bccc12ca10b611bb4a0ee4d5c794c94b70 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 26 Sep 2019 22:48:03 +0300
Subject: [PATCH 1083/2254] mtprotoproxy: add uvloop

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

diff --git a/pkgs/servers/mtprotoproxy/default.nix b/pkgs/servers/mtprotoproxy/default.nix
index 69c7f137e3d..9131715113d 100644
--- a/pkgs/servers/mtprotoproxy/default.nix
+++ b/pkgs/servers/mtprotoproxy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, python, pyaes, pycrypto, wrapPython }:
+{ stdenv, fetchFromGitHub, python, pyaes, pycrypto, uvloop, wrapPython }:
 
 stdenv.mkDerivation rec {
   pname = "mtprotoproxy";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ wrapPython ];
-  pythonPath = [ pyaes pycrypto ];
+  pythonPath = [ pyaes pycrypto uvloop ];
 
   installPhase = ''
     install -Dm755 mtprotoproxy.py $out/bin/mtprotoproxy
-- 
GitLab


From dbc21de7dc05ec18157357eb131d5c520d783975 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 13:35:46 -0700
Subject: [PATCH 1084/2254] grip: 3.3.1 -> 3.10.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/grip/versions
---
 pkgs/applications/misc/grip/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/grip/default.nix b/pkgs/applications/misc/grip/default.nix
index 7f2057b2947..e1dd94471cb 100644
--- a/pkgs/applications/misc/grip/default.nix
+++ b/pkgs/applications/misc/grip/default.nix
@@ -2,11 +2,11 @@
 , curl, cdparanoia, libid3tag, ncurses, libtool }:
 
 stdenv.mkDerivation rec {
-  name = "grip-3.3.1";
+  name = "grip-3.10.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/grip/${name}.tar.gz";
-    sha256 = "1zb6zpq7qmn6bflbgfwisyg3vrjr23yi1c1kqvwndl1f0shr8qyl";
+    sha256 = "1wngrvw0zkrd2xw7c6w0qmq38jxishp5q9xvm6qlycza2czb4p36";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From d0bffa6aaae80b1334381ee27df07d309ab4e413 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 26 Sep 2019 22:56:57 +0200
Subject: [PATCH 1085/2254] python3Packages.pysnmp: 4.4.11 -> 4.4.12

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

diff --git a/pkgs/development/python-modules/pysnmp/default.nix b/pkgs/development/python-modules/pysnmp/default.nix
index ae4c273fc00..81172787b65 100644
--- a/pkgs/development/python-modules/pysnmp/default.nix
+++ b/pkgs/development/python-modules/pysnmp/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "pysnmp";
-  version = "4.4.11";
+  version = "4.4.12";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1v7vz045pami4nx5hfvk8drarcswjclb0pfmg932x95fddbdx2zy";
+    sha256 = "1acbfvpbr45i137s00mbhh21p71ywjfw3r8z0ybcmjjqz7rbwg8c";
   };
 
   # NameError: name 'mibBuilder' is not defined
-- 
GitLab


From e6b93257b0ba070bd12810eeacbe281396c24316 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 26 Sep 2019 22:53:06 +0200
Subject: [PATCH 1086/2254] html-proofer: 3.12.2 -> 3.13.0

---
 pkgs/tools/misc/html-proofer/Gemfile.lock | 2 +-
 pkgs/tools/misc/html-proofer/gemset.nix   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/html-proofer/Gemfile.lock b/pkgs/tools/misc/html-proofer/Gemfile.lock
index be01c0118b3..08689ae8dcf 100644
--- a/pkgs/tools/misc/html-proofer/Gemfile.lock
+++ b/pkgs/tools/misc/html-proofer/Gemfile.lock
@@ -6,7 +6,7 @@ GEM
     ethon (0.12.0)
       ffi (>= 1.3.0)
     ffi (1.11.1)
-    html-proofer (3.12.2)
+    html-proofer (3.13.0)
       addressable (~> 2.3)
       mercenary (~> 0.3)
       nokogiri (~> 1.10)
diff --git a/pkgs/tools/misc/html-proofer/gemset.nix b/pkgs/tools/misc/html-proofer/gemset.nix
index 2deda655d99..2d915a48dd9 100644
--- a/pkgs/tools/misc/html-proofer/gemset.nix
+++ b/pkgs/tools/misc/html-proofer/gemset.nix
@@ -37,10 +37,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0xkcchgvlqkk3xgn11vw8n42bhavj6nn6vqsbycbx1rqxgiljlhy";
+      sha256 = "1a620704y2h4g9ffpl6461ssdx87bn6hjd0y1m370r2p2xddkb9f";
       type = "gem";
     };
-    version = "3.12.2";
+    version = "3.13.0";
   };
   mercenary = {
     groups = ["default"];
-- 
GitLab


From 28af6ac647861bc7ac5968029f89eec2a01bbce7 Mon Sep 17 00:00:00 2001
From: Jon <jonringer@users.noreply.github.com>
Date: Thu, 26 Sep 2019 14:09:03 -0700
Subject: [PATCH 1087/2254] python3Packages.flit: fix tests and packaging
 (#69546)

* python3Packages.flit: fix tests

* python: fix flit setup hook
---
 .../interpreters/python/hooks/flit-build-hook.sh     |  4 ++--
 pkgs/development/python-modules/flit/default.nix     | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/interpreters/python/hooks/flit-build-hook.sh b/pkgs/development/interpreters/python/hooks/flit-build-hook.sh
index faa3f6e3075..48295dc3643 100644
--- a/pkgs/development/interpreters/python/hooks/flit-build-hook.sh
+++ b/pkgs/development/interpreters/python/hooks/flit-build-hook.sh
@@ -3,9 +3,9 @@ echo "Sourcing flit-build-hook"
 
 flitBuildPhase () {
     echo "Executing flitBuildPhase"
-    preBuild
+    runHook preBuild
     @pythonInterpreter@ -m flit build --format wheel
-    postBuild
+    runHook postBuild
     echo "Finished executing flitBuildPhase"
 }
 
diff --git a/pkgs/development/python-modules/flit/default.nix b/pkgs/development/python-modules/flit/default.nix
index 64decd9c41c..22bba39ff01 100644
--- a/pkgs/development/python-modules/flit/default.nix
+++ b/pkgs/development/python-modules/flit/default.nix
@@ -7,7 +7,7 @@
 , requests_download
 , zipfile36
 , pythonOlder
-, pytest
+, pytest_4
 , testpath
 , responses
 , pytoml
@@ -21,17 +21,17 @@
 buildPythonPackage rec {
   pname = "flit";
   version = "1.3";
+  disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "6f6f0fb83c51ffa3a150fa41b5ac118df9ea4a87c2c06dff4ebf9adbe7b52b36";
   };
 
-  disabled = !isPy3k;
   propagatedBuildInputs = [ docutils requests requests_download pytoml ]
     ++ lib.optional (pythonOlder "3.6") zipfile36;
 
-  checkInputs = [ pytest testpath responses ];
+  checkInputs = [ pytest_4 testpath responses ];
 
   # Disable test that needs some ini file.
   # Disable test that wants hg
@@ -39,10 +39,10 @@ buildPythonPackage rec {
     HOME=$(mktemp -d) pytest -k "not test_invalid_classifier and not test_build_sdist"
   '';
 
-  meta = {
+  meta = with lib; {
     description = "A simple packaging tool for simple packages";
     homepage = https://github.com/takluyver/flit;
-    license = lib.licenses.bsd3;
-    maintainers = [ lib.maintainers.fridh ];
+    license = licenses.bsd3;
+    maintainers = [ maintainers.fridh ];
   };
 }
-- 
GitLab


From 042b9c88aae776cdf6a8fcf6c9a2b35df0d8102c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 14:12:46 -0700
Subject: [PATCH 1088/2254] htpdate: 1.2.1 -> 1.2.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/htpdate/versions
---
 pkgs/tools/networking/htpdate/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/htpdate/default.nix b/pkgs/tools/networking/htpdate/default.nix
index 4a350d237d0..9bb44b70f11 100644
--- a/pkgs/tools/networking/htpdate/default.nix
+++ b/pkgs/tools/networking/htpdate/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "1.2.1";
+  version = "1.2.2";
   pname = "htpdate";
 
   src = fetchurl {
     url = "http://www.vervest.org/htp/archive/c/${pname}-${version}.tar.xz";
-    sha256 = "1gqw3lg4wwkn8snf4pf21s3qidhb4h791f2ci7i7i0d6kd86jv0q";
+    sha256 = "0mgr350qwgzrdrwkb9kaj6z7l6hn6a2pwh7sacqvnal5fyc9a7sz";
   };
 
   makeFlags = [
-- 
GitLab


From aff9d8b1a2061c8d050588852c86eff7794fe477 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 14:24:59 -0700
Subject: [PATCH 1089/2254] kafkacat: 1.4.0 -> 1.5.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/kafkacat/versions
---
 pkgs/development/tools/kafkacat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/kafkacat/default.nix b/pkgs/development/tools/kafkacat/default.nix
index 076cea38a9e..7de5cd6340a 100644
--- a/pkgs/development/tools/kafkacat/default.nix
+++ b/pkgs/development/tools/kafkacat/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
   pname = "kafkacat";
 
-  version = "1.4.0";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "edenhill";
     repo = "kafkacat";
     rev = version;
-    sha256 = "0zs2nmf3ghm9iar7phc0ncqsb9nhipav94v6qmpxkfwxd2ljkpds";
+    sha256 = "0lf2pf3zqncd4a44h0mjm66qnw02k9kvz1hjkah6p6gp7mx3ksjv";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From 62d1e438ddee62afc813640d13cbd72be41263ec Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 14:39:19 -0700
Subject: [PATCH 1090/2254] i3-gaps: 4.17 -> 4.17.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/i3-gaps/versions
---
 pkgs/applications/window-managers/i3/gaps.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/i3/gaps.nix b/pkgs/applications/window-managers/i3/gaps.nix
index 4d4ab6d96cc..e5c478987df 100644
--- a/pkgs/applications/window-managers/i3/gaps.nix
+++ b/pkgs/applications/window-managers/i3/gaps.nix
@@ -3,12 +3,12 @@
 i3.overrideAttrs (oldAttrs : rec {
 
   name = "i3-gaps-${version}";
-  version = "4.17";
+  version = "4.17.1";
   releaseDate = "2019-01-27";
 
   src = fetchurl {
     url = "https://github.com/Airblader/i3/archive/${version}.tar.gz";
-    sha256 = "1vd2xv91xrcr07s2dywq9rvidqqmbs41hlvhcvr1927gz200vgjg";
+    sha256 = "02jpvwmfwv58dfdwvcvkdfcyca7l7zw7hx18aj4cqm3gg0r5pmqh";
   };
 
   nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ autoreconfHook ];
-- 
GitLab


From 8228f008693ea2306a1a2fc4ec6c1dc88780e5a0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 14:47:06 -0700
Subject: [PATCH 1091/2254] icdiff: 1.9.4 -> 1.9.5

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/icdiff/versions
---
 pkgs/tools/text/icdiff/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/icdiff/default.nix b/pkgs/tools/text/icdiff/default.nix
index dfbe6e7b6dc..79bcf90718b 100644
--- a/pkgs/tools/text/icdiff/default.nix
+++ b/pkgs/tools/text/icdiff/default.nix
@@ -2,13 +2,13 @@
 
 pythonPackages.buildPythonApplication rec {
   pname = "icdiff";
-  version = "1.9.4";
+  version = "1.9.5";
 
   src = fetchFromGitHub {
     owner = "jeffkaufman";
     repo = "icdiff";
     rev = "release-${version}";
-    sha256 = "1micpm7kq9swfscmp4mg37fnzgzpsg7704yi33c5sd6cmgbdabxm";
+    sha256 = "080v8h09pv8qwplin4kwfm0kmqjwdqjfxbpcdrv16sv4hwfwl5qd";
   };
 
   meta = with stdenv.lib; {
-- 
GitLab


From b7f0316aa53815bb912ec1b54e909542a446f9d9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 15:00:48 -0700
Subject: [PATCH 1092/2254] ipv6calc: 1.1.0 -> 2.1.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/ipv6calc/versions
---
 pkgs/tools/networking/ipv6calc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/ipv6calc/default.nix b/pkgs/tools/networking/ipv6calc/default.nix
index 169fea6c447..6e04859410f 100644
--- a/pkgs/tools/networking/ipv6calc/default.nix
+++ b/pkgs/tools/networking/ipv6calc/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   pname = "ipv6calc";
-  version = "1.1.0";
+  version = "2.1.1";
 
   src = fetchurl {
     url = "ftp://ftp.deepspace6.net/pub/ds6/sources/ipv6calc/${pname}-${version}.tar.gz";
-    sha256 = "1q74ikg780v5hllbq08wdfvxr2lf0fc7i41hclqrh1ajc6dqybbq";
+    sha256 = "01a4p2g31y6p1r3kacymbv2hhvkwnv00yskhphgcgjq5jpkmfjcn";
   };
 
   buildInputs = [ geoip geolite-legacy getopt ip2location-c openssl ];
-- 
GitLab


From 0d80f97069dfad276ef88b388398e2ffd7b473bf Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 25 Sep 2019 21:17:32 -0700
Subject: [PATCH 1093/2254] bitcoin-abc: 0.19.4 -> 0.20.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/bitcoin-abc/versions
---
 pkgs/applications/blockchains/bitcoin-abc.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/blockchains/bitcoin-abc.nix b/pkgs/applications/blockchains/bitcoin-abc.nix
index 479d175020b..cd07a57cba7 100644
--- a/pkgs/applications/blockchains/bitcoin-abc.nix
+++ b/pkgs/applications/blockchains/bitcoin-abc.nix
@@ -7,13 +7,13 @@ with stdenv.lib;
 stdenv.mkDerivation rec {
 
   name = "bitcoin" + (toString (optional (!withGui) "d")) + "-abc-" + version;
-  version = "0.19.4";
+  version = "0.20.2";
 
   src = fetchFromGitHub {
     owner = "bitcoin-ABC";
     repo = "bitcoin-abc";
     rev = "v${version}";
-    sha256 = "1z4x25ygcw1pqml2ww02vqrvmihlv4f5gnnn1iyfirrjxgpfaxd7";
+    sha256 = "1hii6wjz6095jpy5kw7z6i3fn2jf1dvsppf162xx2c08n9vmz3s3";
   };
 
   patches = [ ./fix-bitcoin-qt-build.patch ];
-- 
GitLab


From 806219644a0d4d827d77ba34ca8871f68081398d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 15:08:13 -0700
Subject: [PATCH 1094/2254] impressive: 0.12.0 -> 0.12.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/impressive/versions
---
 pkgs/applications/office/impressive/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/impressive/default.nix b/pkgs/applications/office/impressive/default.nix
index 5065a1cb9bc..a8c318d690a 100644
--- a/pkgs/applications/office/impressive/default.nix
+++ b/pkgs/applications/office/impressive/default.nix
@@ -2,7 +2,7 @@
 , SDL, ghostscript, pdftk, dejavu_fonts }:
 
 let
-  version = "0.12.0";
+  version = "0.12.1";
   pythonEnv = python2.withPackages (ps: with ps; [pyopengl pygame pillow]);
 in stdenv.mkDerivation {
     # This project was formerly known as KeyJNote.
@@ -13,7 +13,7 @@ in stdenv.mkDerivation {
 
     src = fetchurl {
       url = "mirror://sourceforge/impressive/Impressive-${version}.tar.gz";
-      sha256 = "0zaqq3yvd296mfr5bxpj2hqlk7vrb0rsbgd4dc1l5ag46giqvivx";
+      sha256 = "1r7ihv41awnlnlry1kymb8fka053wdhzibfwcarn78rr3vs338vl";
     };
 
     buildInputs = [ makeWrapper pythonEnv ];
-- 
GitLab


From 6a9f6958607351865a315fc8ea618247792d8705 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 12:25:01 -0700
Subject: [PATCH 1095/2254] gzdoom: 4.2.0 -> 4.2.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/gzdoom/versions
---
 pkgs/games/gzdoom/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix
index 3ccbdf525ce..e0d5211d02b 100644
--- a/pkgs/games/gzdoom/default.nix
+++ b/pkgs/games/gzdoom/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gzdoom";
-  version = "4.2.0";
+  version = "4.2.1";
 
   src = fetchFromGitHub {
     owner = "coelckers";
     repo = "gzdoom";
     rev = "g${version}";
-    sha256 = "0ifc10y8pdxb6ra38m55k26wb2cwdbjrblx3s24xivmsnkpbn7f6";
+    sha256 = "1fak8bmsb3jqcx28hr60yj3dd3khzhjw1kgq6q7piwnmgr27ibgd";
   };
 
   nativeBuildInputs = [ cmake makeWrapper ];
-- 
GitLab


From 433a62e25fccdf122051e893b7fed944de9589d0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 15:11:26 -0700
Subject: [PATCH 1096/2254] homebank: 5.2.7 -> 5.2.8

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/homebank/versions
---
 pkgs/applications/office/homebank/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix
index 727a68c440a..af289c53cff 100644
--- a/pkgs/applications/office/homebank/default.nix
+++ b/pkgs/applications/office/homebank/default.nix
@@ -2,10 +2,10 @@
 , hicolor-icon-theme, libsoup, gnome3 }:
 
 stdenv.mkDerivation rec {
-  name = "homebank-5.2.7";
+  name = "homebank-5.2.8";
   src = fetchurl {
     url = "http://homebank.free.fr/public/${name}.tar.gz";
-    sha256 = "0pzbn0wlppwbap19isbv8vv3cq7xswladhc272ykaya78r1bxvcf";
+    sha256 = "13ampiv68y30kc0p2560g3yz8whqpwnidfcnb9lndv93b9ca767y";
   };
 
   nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
-- 
GitLab


From 4e990b2ff58ee46193183bb9a0a71322bc225a40 Mon Sep 17 00:00:00 2001
From: Filipe Regadas <filiperegadas@gmail.com>
Date: Thu, 26 Sep 2019 23:14:10 +0100
Subject: [PATCH 1097/2254] fixup! Updated list of urls

---
 pkgs/development/tools/build-managers/sbt/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix
index 01a003fb482..9c5543cff58 100644
--- a/pkgs/development/tools/build-managers/sbt/default.nix
+++ b/pkgs/development/tools/build-managers/sbt/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
       "https://piccolo.link/sbt-${version}.tgz"
       "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"
     ];
-    sha256 = "1ncjc4yrnhp2kc5xw3ismnyx5n71541760rzs81hxi8x8vi36x5b";
+    sha256 = "0vrj9wlw5kf6w7nzhf58dyik0n7rnc9aivjpsz85m299j4wyz37d";
   };
 
   patchPhase = ''
-- 
GitLab


From 6034acabd1c6d316ea292e966700415beadd498a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 15:14:19 -0700
Subject: [PATCH 1098/2254] jam: 2.6 -> 2.6.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/jam/versions
---
 pkgs/development/tools/build-managers/jam/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/jam/default.nix b/pkgs/development/tools/build-managers/jam/default.nix
index 7314643530e..2d94b48ba54 100644
--- a/pkgs/development/tools/build-managers/jam/default.nix
+++ b/pkgs/development/tools/build-managers/jam/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, yacc }:
 
 stdenv.mkDerivation rec {
-  name = "jam-2.6";
+  name = "jam-2.6.1";
 
   src = fetchurl {
     url = "https://swarm.workshop.perforce.com/projects/perforce_software-jam/download/main/${name}.tar";
-    sha256 = "0j4r7xcjz15ksnnpjw56qi99q4lpjmx097pkwwkl1hq3hqml1zhn";
+    sha256 = "19xkvkpycxfsncxvin6yqrql3x3z9ypc1j8kzls5k659q4kv5rmc";
   };
 
   nativeBuildInputs = [ yacc ];
-- 
GitLab


From 5c5dfc372704ac89c8a1e938bd1ab6815288b9e2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 15:27:40 -0700
Subject: [PATCH 1099/2254] innoextract: 1.7 -> 1.8

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/innoextract/versions
---
 pkgs/tools/archivers/innoextract/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/archivers/innoextract/default.nix b/pkgs/tools/archivers/innoextract/default.nix
index dc9796cc9e3..6b0ca7e1528 100644
--- a/pkgs/tools/archivers/innoextract/default.nix
+++ b/pkgs/tools/archivers/innoextract/default.nix
@@ -3,11 +3,11 @@
 , withGog ? false, unar ? null }:
 
 stdenv.mkDerivation rec {
-  name = "innoextract-1.7";
+  name = "innoextract-1.8";
 
   src = fetchurl {
     url = "http://constexpr.org/innoextract/files/${name}.tar.gz";
-    sha256 = "197hs9aj1ska6czrsq4caazsw9v0xbaa0lazbh380fmwy8rbgvy1";
+    sha256 = "0saj50n8ds85shygy4mq1h6s99510r9wgjjdll4dmvhra4lzcy2y";
   };
 
   buildInputs = [ python lzma boost ];
-- 
GitLab


From 77424f2c6d8266da9f0e20fe0cbe758aaf824dfc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 15:32:37 -0700
Subject: [PATCH 1100/2254] hepmc3: 3.1.1 -> 3.1.2 (#69587)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/hepmc3/versions
---
 pkgs/development/libraries/physics/hepmc3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/physics/hepmc3/default.nix b/pkgs/development/libraries/physics/hepmc3/default.nix
index 3116c4d36bb..d8aff555e55 100644
--- a/pkgs/development/libraries/physics/hepmc3/default.nix
+++ b/pkgs/development/libraries/physics/hepmc3/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "hepmc3";
-  version = "3.1.1";
+  version = "3.1.2";
 
   src = fetchurl {
     url = "http://hepmc.web.cern.ch/hepmc/releases/HepMC3-${version}.tar.gz";
-    sha256 = "1fs8ha5issls886g03azpwamry1k633zjrcx51v7g7vg9nbckjrg";
+    sha256 = "1izcldnjbyn6myr7nv7b4jivf2vmdi64ng9gk1vjh998755hfcs1";
   };
 
   buildInputs = [ cmake root ];
-- 
GitLab


From e0d0188986453f7622c224a807094aa3015e4a10 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 15:34:14 -0700
Subject: [PATCH 1101/2254] hcxtools: 5.2.0 -> 5.2.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/hcxtools/versions
---
 pkgs/tools/security/hcxtools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/hcxtools/default.nix b/pkgs/tools/security/hcxtools/default.nix
index 216d58192fb..40e9ee03952 100644
--- a/pkgs/tools/security/hcxtools/default.nix
+++ b/pkgs/tools/security/hcxtools/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "hcxtools";
-  version = "5.2.0";
+  version = "5.2.2";
 
   src = fetchFromGitHub {
     owner = "ZerBea";
     repo = pname;
     rev = version;
-    sha256 = "0k2qlq9hz5zc21nyc6yrnfqzga7hydn5mm0x3rpl2fhkwl81lxcn";
+    sha256 = "0jschcjk9z9s3q2f7qcb4nmjmyipar3f0yqbrgmbg3jpgamahykn";
   };
 
   buildInputs = [ curl openssl zlib ];
-- 
GitLab


From b0a6f4d2c85172b6a3fbaf5a2623d36cb5446346 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 15:38:32 -0700
Subject: [PATCH 1102/2254] apache-jena-fuseki: 3.11.0 -> 3.12.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/apache-jena-fuseki/versions
---
 pkgs/servers/nosql/apache-jena/fuseki-binary.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix
index be7c51a7ef5..641220e1344 100644
--- a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix
+++ b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix
@@ -3,10 +3,10 @@ let
   s = # Generated upstream information
   rec {
     baseName="apache-jena-fuseki";
-    version = "3.11.0";
+    version = "3.12.0";
     name="${baseName}-${version}";
     url="http://archive.apache.org/dist/jena/binaries/apache-jena-fuseki-${version}.tar.gz";
-    sha256 = "05krsd0arhcl2yqmdp3iq2gwl1sc2adv44xpq9w06cps8bxj6yrb";
+    sha256 = "1j2p3r4vgp4l2xrrsh5mx3vbgq03c0vdg6961g1fvd307yqpibk0";
   };
   buildInputs = [
     makeWrapper
-- 
GitLab


From 93bcad6b2039a13faed5266c6a163af52a9b5646 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 15:48:37 -0700
Subject: [PATCH 1103/2254] iio-sensor-proxy: 2.7 -> 2.8

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/iio-sensor-proxy/versions
---
 pkgs/os-specific/linux/iio-sensor-proxy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/iio-sensor-proxy/default.nix b/pkgs/os-specific/linux/iio-sensor-proxy/default.nix
index 76ec9be2798..a1d488adcfa 100644
--- a/pkgs/os-specific/linux/iio-sensor-proxy/default.nix
+++ b/pkgs/os-specific/linux/iio-sensor-proxy/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "iio-sensor-proxy";
-  version = "2.7";
+  version = "2.8";
 
   src = fetchFromGitHub {
     owner  = "hadess";
     repo   = pname;
     rev    = version;
-    sha256 = "05ipljw78d8z90cnkygcrpd0qq4vh14bb9hy06vqxnpdbyq46fxh";
+    sha256 = "07rzm1z2p6lh4iv5pyp0p2x5805m9gsh19kcsjls3fi25p3a2c00";
   };
 
   configurePhase = ''
-- 
GitLab


From 7c7539b9689d3449bfa5dd51c67210a76480708f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 15:53:10 -0700
Subject: [PATCH 1104/2254] intercal: 0.30 -> 0.31

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/intercal/versions
---
 pkgs/development/compilers/intercal/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/intercal/default.nix b/pkgs/development/compilers/intercal/default.nix
index 6640c4aa89a..d890dc0fdfa 100644
--- a/pkgs/development/compilers/intercal/default.nix
+++ b/pkgs/development/compilers/intercal/default.nix
@@ -7,11 +7,11 @@ with stdenv.lib;
 stdenv.mkDerivation rec {
 
   pname = "intercal";
-  version = "0.30";
+  version = "0.31";
 
   src = fetchurl {
     url = "http://catb.org/esr/intercal/${pname}-${version}.tar.gz";
-    sha256 = "058ppvvgz9r5603ia9jkknbrciypgg4hjbczrv9v1d9w3ak652xk";
+    sha256 = "1z2gpa5rbqb7jscqlf258k0b0jc7d2zkyipb5csjpj6d3sw45n4k";
   };
 
   buildInputs =
-- 
GitLab


From 62c55bc70142a4d21c712079a16c6a6c391fe7ea Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 15:59:56 -0700
Subject: [PATCH 1105/2254] ibus-engines.typing-booster-unwrapped: 2.6.4 ->
 2.6.6

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/ibus-typing-booster/versions
---
 .../inputmethods/ibus-engines/ibus-typing-booster/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
index 2ee6944eeb3..839768822f5 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
@@ -13,13 +13,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "ibus-typing-booster";
-  version = "2.6.4";
+  version = "2.6.6";
 
   src = fetchFromGitHub {
     owner = "mike-fabian";
     repo = "ibus-typing-booster";
     rev = version;
-    sha256 = "1k074y9439w8v6s71i7hhmkq9bgkl836y2a409rx3mb73vidadjr";
+    sha256 = "105g16icd482p7s0rpf6yck4hc50qhd3wxrnj0032f015vdzlh5a";
   };
 
   patches = [ ./hunspell-dirs.patch ];
-- 
GitLab


From 6621373d17bee33f83aa626554fb80038690a7b7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 16:19:56 -0700
Subject: [PATCH 1106/2254] i2pd: 2.26.0 -> 2.28.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/i2pd/versions
---
 pkgs/tools/networking/i2pd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix
index 97dbb1bdb8f..10e821fa152 100644
--- a/pkgs/tools/networking/i2pd/default.nix
+++ b/pkgs/tools/networking/i2pd/default.nix
@@ -9,13 +9,13 @@ assert upnpSupport -> miniupnpc != null;
 
 stdenv.mkDerivation rec {
   pname = "i2pd";
-  version = "2.26.0";
+  version = "2.28.0";
 
   src = fetchFromGitHub {
     owner = "PurpleI2P";
     repo = pname;
     rev = version;
-    sha256 = "1za7h449dnnw9h6nx33s5ai3qkakah37yg686a2sp8qynrb0h93h";
+    sha256 = "0pkqm5h3zvpbspj0xdc8j4yb1j2kc9gkw77mihc9g3rqifr7jvsv";
   };
 
   buildInputs = with stdenv.lib; [ boost zlib openssl ]
-- 
GitLab


From 9cb595faad2a6c9493acf75a533e575be8c878ee Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 16:30:54 -0700
Subject: [PATCH 1107/2254] jsonnet: 0.13.0 -> 0.14.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/jsonnet/versions
---
 pkgs/development/compilers/jsonnet/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/jsonnet/default.nix b/pkgs/development/compilers/jsonnet/default.nix
index 460ff405b94..d7c05331991 100644
--- a/pkgs/development/compilers/jsonnet/default.nix
+++ b/pkgs/development/compilers/jsonnet/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "jsonnet";
-  version = "0.13.0";
+  version = "0.14.0";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "google";
     repo = "jsonnet";
-    sha256 = "1fibr1kysbxcf8jp2a4xvs3n7i8d9k2430agxzc9mdyqrh79zlxk";
+    sha256 = "012zapx0xvlkl2y7dljpdn18gymnmzc4mma2yagf9pxnr286lwrf";
   };
 
   enableParallelBuilding = true;
-- 
GitLab


From 0826d695de22c74f7119d36c6d3123c049bac3bf Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 16:35:12 -0700
Subject: [PATCH 1108/2254] jmol: 14.29.49 -> 14.29.53

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/jmol/versions
---
 pkgs/applications/science/chemistry/jmol/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix
index 00231113d2c..f9dc759d67a 100644
--- a/pkgs/applications/science/chemistry/jmol/default.nix
+++ b/pkgs/applications/science/chemistry/jmol/default.nix
@@ -17,14 +17,14 @@ let
   };
 in
 stdenv.mkDerivation rec {
-  version = "14.29.49";
+  version = "14.29.53";
   pname = "jmol";
 
   src = let
     baseVersion = "${lib.versions.major version}.${lib.versions.minor version}";
   in fetchurl {
     url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";
-    sha256 = "19fyr4ldvbd5rbw19hslg9fpwc42wxmyx7r3z78k6dw653vb1ml5";
+    sha256 = "0wdkiprccgvc5nh6h616l282fbd5mx5z3aiq2y558qa4gn22nqrq";
   };
 
   patchPhase = ''
-- 
GitLab


From 2c0c1e4bee4551abe802755ad9b5d1d413c3e7d1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 16:38:56 -0700
Subject: [PATCH 1109/2254] libblockdev: 2.22 -> 2.23

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libblockdev/versions
---
 pkgs/development/libraries/libblockdev/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libblockdev/default.nix b/pkgs/development/libraries/libblockdev/default.nix
index 6deb89a80ea..4982157c3ba 100644
--- a/pkgs/development/libraries/libblockdev/default.nix
+++ b/pkgs/development/libraries/libblockdev/default.nix
@@ -6,13 +6,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "libblockdev";
-  version = "2.22";
+  version = "2.23";
 
   src = fetchFromGitHub {
     owner = "storaged-project";
     repo = "libblockdev";
     rev = "${version}-1";
-    sha256 = "03y4ps37wbi9p1136q0xzgshfnrjg4lgy8pgm1a3ihfcjnbwrbnq";
+    sha256 = "09gp9h05vy3llhnrg98gny8g57kgwnbi8522qyzjwyv7nmhs4zhz";
   };
 
   outputs = [ "out" "dev" "devdoc" ];
-- 
GitLab


From f552da53589ab857047c081690a2d9d3e3909755 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 16:44:00 -0700
Subject: [PATCH 1110/2254] kubetail: 1.6.9 -> 1.6.10

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/kubetail/versions
---
 pkgs/applications/networking/cluster/kubetail/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/kubetail/default.nix b/pkgs/applications/networking/cluster/kubetail/default.nix
index dcda18f18be..779edad8de3 100644
--- a/pkgs/applications/networking/cluster/kubetail/default.nix
+++ b/pkgs/applications/networking/cluster/kubetail/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "kubetail";
-  version = "1.6.9";
+  version = "1.6.10";
 
   src = fetchFromGitHub {
     owner = "johanhaleby";
     repo = "kubetail";
     rev = version;
-    sha256 = "0mcv23p0h1ww9gvax8b4b4x5hmg02shrbgms0v0c72cmw0zf2phr";
+    sha256 = "0bg872n9fs6pl03rmjny9sgby718yznx9jwi5rx3hi4km3ha9j0b";
   };
 
   installPhase = ''
-- 
GitLab


From b14e64b21ec8f0ce855db17e1ec06a952bd166fd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 16:47:38 -0700
Subject: [PATCH 1111/2254] kubectx: 0.6.3 -> 0.7.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/kubectx/versions
---
 pkgs/development/tools/kubectx/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/kubectx/default.nix b/pkgs/development/tools/kubectx/default.nix
index 0f9fb36a3f4..fe72f6dcf16 100644
--- a/pkgs/development/tools/kubectx/default.nix
+++ b/pkgs/development/tools/kubectx/default.nix
@@ -4,13 +4,13 @@ with lib;
 
 stdenv.mkDerivation rec {
   pname = "kubectx";
-  version = "0.6.3";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "ahmetb";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0nb867llpvjmkxv5bbqnyjrc4z74kibqg1d3dw7m47d5a5hn8525";
+    sha256 = "11snp3li2w4ds2r7fc6mldlgj24mga40v0knlralaiz296bd6zcs";
   };
 
   buildInputs = [ makeWrapper ];
-- 
GitLab


From c03a40a13c6b7188809004b017e2ef32ebc90c01 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 16:55:40 -0700
Subject: [PATCH 1112/2254] kitty: 0.14.3 -> 0.14.5

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/kitty/versions
---
 pkgs/applications/misc/kitty/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix
index 3b7e9e9d139..1991cf1fa4a 100644
--- a/pkgs/applications/misc/kitty/default.nix
+++ b/pkgs/applications/misc/kitty/default.nix
@@ -21,14 +21,14 @@
 with python3Packages;
 buildPythonApplication rec {
   pname = "kitty";
-  version = "0.14.3";
+  version = "0.14.5";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "kovidgoyal";
     repo = "kitty";
     rev = "v${version}";
-    sha256 = "0wi6b6b1nyp16rcpcghk6by62wy6qsamv1xdymyn0zbqgd8h9n6b";
+    sha256 = "0qx3wj4n3zgjcpd1vjjwdlz8d1vp8bkxihsg2khlla1izandgxxa";
   };
 
   buildInputs = [
-- 
GitLab


From c52d22dc221f70929631aab9d0f59018592e3a0d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 17:04:51 -0700
Subject: [PATCH 1113/2254] ledger-autosync: 1.0.0 -> 1.0.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/ledger-autosync/versions
---
 pkgs/applications/office/ledger-autosync/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/ledger-autosync/default.nix b/pkgs/applications/office/ledger-autosync/default.nix
index 4c126fc2f91..62ac6a80382 100644
--- a/pkgs/applications/office/ledger-autosync/default.nix
+++ b/pkgs/applications/office/ledger-autosync/default.nix
@@ -2,14 +2,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "ledger-autosync";
-  version = "1.0.0";
+  version = "1.0.1";
 
 # no tests included in PyPI tarball
   src = fetchFromGitHub {
     owner = "egh";
     repo = "ledger-autosync";
     rev = "v${version}";
-    sha256 = "1fn32c02idccdmf9906pxn248qc9basjy2kr2g600806k3qvw84a";
+    sha256 = "1h5mjngdd3rmzwmy026xmas0491kxxi1vxkd5m1xii7y6j50z14q";
   };
 
   propagatedBuildInputs = with python3Packages; [
-- 
GitLab


From cfe8afebe5c60520d55020793793cea5d01ece1b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 27 Sep 2019 02:30:33 +0200
Subject: [PATCH 1114/2254] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.15.0 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/05d7197f3555ac17eb38c7a64344c906d8360029.
---
 .../haskell-modules/hackage-packages.nix      | 369 +++++++++++++++---
 1 file changed, 315 insertions(+), 54 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 8f30f66974c..81acd502ba5 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -28662,8 +28662,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-athena";
-       version = "7.4.2";
-       sha256 = "0mbxg2d5hwd7v17wdqdg61rkhag30pvp84a12bwhjr5ijqhfwbf8";
+       version = "7.4.3";
+       sha256 = "0kzsj1zxic9c434s4jj86i2ydilhjz2rxa5826h581yq4g1mz6g8";
        libraryHaskellDepends = [
          amazonka amazonka-athena amazonka-core base lens resourcet text
          unliftio-core
@@ -28683,8 +28683,8 @@ self: {
     ({ mkDerivation, aeson, antiope-s3, avro, base, bytestring, text }:
      mkDerivation {
        pname = "antiope-contract";
-       version = "7.4.2";
-       sha256 = "0p5lahs7vmah0ww87wxrd7pp579zijyb9n2wh4mys8i0qiqq7fq0";
+       version = "7.4.3";
+       sha256 = "0i1x7nds4j5rszfh6n8zhgfga3dpxbazmi7dysc0xh6yl9kfs1d4";
        libraryHaskellDepends = [
          aeson antiope-s3 avro base bytestring text
        ];
@@ -28702,8 +28702,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-core";
-       version = "7.4.2";
-       sha256 = "13s6shrhm2d17dialmpyi40vrdq5qw1zy960hl0g8d1fyg954ipx";
+       version = "7.4.3";
+       sha256 = "1k4vsfhd72lhkawww64vwz5iks310ixsrz29rhcj5vgfpc8ac0d4";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core base bytestring exceptions
          generic-lens http-client http-types lens mtl resourcet text
@@ -28729,8 +28729,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-dynamodb";
-       version = "7.4.2";
-       sha256 = "1wmxq228wr18j4qpxqhrnv8y3yzhy3gpa1daa2zbq5zflbkxjcvf";
+       version = "7.4.3";
+       sha256 = "1ha2067dbi5qnfscbh93hy7w1z768134m23vy59mhp830swk21vz";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core amazonka-dynamodb antiope-core base
          generic-lens lens text unliftio-core unordered-containers
@@ -28754,8 +28754,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-messages";
-       version = "7.4.2";
-       sha256 = "0xlzz9dr06s03pqfra8agy80a3r8593kjcfs0w7b1v6m0ahwi9ip";
+       version = "7.4.3";
+       sha256 = "1jbnlawj3dnz5sa035wik3padchh6wkrgbc3rgv9986kaqxswnf2";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core base bytestring generic-lens lens
          lens-aeson monad-loops network-uri text unliftio-core
@@ -28779,8 +28779,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-optparse-applicative";
-       version = "7.4.2";
-       sha256 = "0nvmv0db1v0iw446cy2hfczpsll2if3w0cjmhgr5zgj9l5ja9x1c";
+       version = "7.4.3";
+       sha256 = "0365ianldf99jvhsip4lypvm6g1i0j5h0j3j7fbdr9z2sgn1jrjs";
        libraryHaskellDepends = [
          amazonka amazonka-core amazonka-s3 base optparse-applicative text
        ];
@@ -28798,19 +28798,19 @@ self: {
   "antiope-s3" = callPackage
     ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3
      , antiope-core, antiope-messages, attoparsec, base, bytestring
-     , conduit, conduit-extra, exceptions, generic-lens, hedgehog, hspec
-     , hspec-discover, http-types, hw-hspec-hedgehog, lens, mtl
+     , conduit, conduit-extra, dlist, exceptions, generic-lens, hedgehog
+     , hspec, hspec-discover, http-types, hw-hspec-hedgehog, lens, mtl
      , network-uri, resourcet, text, time, unliftio-core
      }:
      mkDerivation {
        pname = "antiope-s3";
-       version = "7.4.2";
-       sha256 = "1gpsc6y18h63wwkawvzwz8qmpw21pqhgpvgnb7apl9jc06xp2v0h";
+       version = "7.4.3";
+       sha256 = "0j8anrlilprik0n54fn0vx7jyh9yrfinkifvmjgdmsv3m372w3r8";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core amazonka-s3 antiope-core
          antiope-messages attoparsec base bytestring conduit conduit-extra
-         exceptions generic-lens http-types lens mtl network-uri resourcet
-         text time unliftio-core
+         dlist exceptions generic-lens http-types lens mtl network-uri
+         resourcet text time unliftio-core
        ];
        testHaskellDepends = [
          aeson amazonka amazonka-core amazonka-s3 antiope-core attoparsec
@@ -28835,8 +28835,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-shell";
-       version = "7.4.2";
-       sha256 = "1xg98dg52qmp8sz2r4b0srh7kasvd411i6wl3cj9m3nngignbab8";
+       version = "7.4.3";
+       sha256 = "07q3y1znyacwlrz1b51hamqzgbv3lks6kby93la024im4mhf4hd2";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core amazonka-s3 antiope-core
          antiope-messages antiope-s3 attoparsec base bytestring exceptions
@@ -28863,8 +28863,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-sns";
-       version = "7.4.2";
-       sha256 = "09g6jsdi20xa43ipb31y5i3afn75gldm0xyr2mqkfyhb8ay6simx";
+       version = "7.4.3";
+       sha256 = "05zj4r32pvdj98zfbq21hvlm2xai2lky7l54y7cqwx2wr6wfa98k";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core amazonka-sns base bytestring
          generic-lens lens text time unliftio-core
@@ -28890,8 +28890,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-sqs";
-       version = "7.4.2";
-       sha256 = "044sa2skvbr492bal52ncbsybr9wrkkq5kcvsdaiqwvkpfwq66v0";
+       version = "7.4.3";
+       sha256 = "0f7k4kh8njibnapn1b5f9xxx505cq017ixc4k2yn8fd24g0dz9jw";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core amazonka-sqs base bytestring conduit
          generic-lens lens lens-aeson monad-loops mtl network-uri split text
@@ -28915,8 +28915,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-swf";
-       version = "7.4.2";
-       sha256 = "1zp63q8dd400ll6cl9wsp6rhghzm56rsak8sh5p860adlk49y9il";
+       version = "7.4.3";
+       sha256 = "05a34lz4ih0vmmr6zfr5g6m7ai8yh8anqq38b2g6j9h22sy32iv7";
        libraryHaskellDepends = [ amazonka-swf base lens text ];
        testHaskellDepends = [ base hedgehog hspec hw-hspec-hedgehog ];
        testToolDepends = [ hspec-discover ];
@@ -39195,8 +39195,8 @@ self: {
      }:
      mkDerivation {
        pname = "birch-beer";
-       version = "0.1.4.5";
-       sha256 = "1yyb897yg2ipvz6jsc6np1jwlckyi41jq94dwxlpyj2sigawzvwh";
+       version = "0.2.0.0";
+       sha256 = "0ks87mqyg0yxg8w2y2332clwjxwi42h2x3x9alvi33c8b9k2ws17";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -39204,9 +39204,9 @@ self: {
          diagrams-cairo diagrams-graphviz diagrams-gtk diagrams-lib
          diversity fgl foldl graphviz gtk hierarchical-clustering
          hierarchical-spectral-clustering lens matrix-market-attoparsec mtl
-         palette plots safe scientific sparse-linear-algebra
-         spectral-clustering split statistics SVGFonts temporary text
-         text-show typed-spreadsheet vector
+         optparse-generic palette plots safe scientific
+         sparse-linear-algebra spectral-clustering split statistics SVGFonts
+         temporary text text-show typed-spreadsheet vector
        ];
        executableHaskellDepends = [
          aeson base bytestring cassava colour containers diagrams
@@ -65760,8 +65760,8 @@ self: {
      }:
      mkDerivation {
        pname = "debug-me";
-       version = "1.20181208";
-       sha256 = "0gnnhgqzhbhgc49y3md7440plgfv1wry8fk73f81s2f1c1agqh1i";
+       version = "1.20190926";
+       sha256 = "0qy2ianwal4v4s0m13yjszk032dp3y6k4p61whwmlp49xmqvwjyb";
        isLibrary = false;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal filepath ];
@@ -76150,6 +76150,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "email-validate_2_3_2_12" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, doctest, hspec
+     , QuickCheck, template-haskell
+     }:
+     mkDerivation {
+       pname = "email-validate";
+       version = "2.3.2.12";
+       sha256 = "0ar3cfjia3x11chb7w60mi7hp5djanms883ddk875l6lifr2lyqf";
+       libraryHaskellDepends = [
+         attoparsec base bytestring template-haskell
+       ];
+       testHaskellDepends = [ base bytestring doctest hspec QuickCheck ];
+       description = "Email address validation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "email-validate-json" = callPackage
     ({ mkDerivation, aeson, base, email-validate, text }:
      mkDerivation {
@@ -90424,6 +90441,21 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "generics-mrsop_2_2_0" = callPackage
+    ({ mkDerivation, base, containers, mtl, sop-core, template-haskell
+     }:
+     mkDerivation {
+       pname = "generics-mrsop";
+       version = "2.2.0";
+       sha256 = "0ni0pvwgpb1a8irgxn20hv2pxn2mx0d40s3raz9v38vyiyb6l05x";
+       libraryHaskellDepends = [
+         base containers mtl sop-core template-haskell
+       ];
+       description = "Generic Programming with Mutually Recursive Sums of Products";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "generics-mrsop-gdiff" = callPackage
     ({ mkDerivation, base, generics-mrsop }:
      mkDerivation {
@@ -92311,6 +92343,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "ghc-parser_0_2_1_0" = callPackage
+    ({ mkDerivation, base, cpphs, ghc, happy }:
+     mkDerivation {
+       pname = "ghc-parser";
+       version = "0.2.1.0";
+       sha256 = "0z6gr3zs89agyc2iw2lv8rddw78yn6wxzyzkip7gfca1n9f7xwd9";
+       libraryHaskellDepends = [ base ghc ];
+       libraryToolDepends = [ cpphs happy ];
+       description = "Haskell source parser from GHC";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghc-paths" = callPackage
     ({ mkDerivation, base, Cabal, directory }:
      mkDerivation {
@@ -111173,8 +111218,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskseg";
-       version = "0.1.0.2";
-       sha256 = "0p9z71gbrgssjs1zgbjfqn2g4k4i6ahs9lj1x82mjqppvc4gr0n3";
+       version = "0.1.0.3";
+       sha256 = "1az5gj51wr3bfalbm6nq50cgzv02x48c68qrmd7y9dji4865vnya";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -116663,8 +116708,8 @@ self: {
      }:
      mkDerivation {
        pname = "hierarchical-spectral-clustering";
-       version = "0.5.0.0";
-       sha256 = "1x3n5z1gvn4ppcx7p1sgrx8xc9ln949q60d50vjz80ly08k7py8s";
+       version = "0.5.0.1";
+       sha256 = "08pz68vw8pbm70iqgrq6h9jhmq4zpg801byjlgkr2rvx6x8d1ghv";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -129516,7 +129561,7 @@ self: {
        broken = true;
      }) {};
 
-  "hw-balancedparens_0_3_0_0" = callPackage
+  "hw-balancedparens_0_3_0_1" = callPackage
     ({ mkDerivation, base, criterion, deepseq, hedgehog, hspec
      , hspec-discover, hw-bits, hw-excess, hw-fingertree
      , hw-hspec-hedgehog, hw-prim, hw-rankselect-base, transformers
@@ -129524,10 +129569,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-balancedparens";
-       version = "0.3.0.0";
-       sha256 = "1xb2pyhmcwl927v4hc7nfi31bf9lvlz9mnqdbb7mzpl6bdlg7xc7";
-       revision = "1";
-       editedCabalFile = "1a8zs7j05vxbamcc63fi1xf6vvz7bg1zf0a72930xh4y4bd2m0qk";
+       version = "0.3.0.1";
+       sha256 = "1lndl9f1bvdj79979bp8bnff6y7qskvx6fdjfkwnnaf9sxxsi5jl";
        libraryHaskellDepends = [
          base deepseq hedgehog hspec hw-bits hw-excess hw-fingertree hw-prim
          hw-rankselect-base vector
@@ -129573,6 +129616,30 @@ self: {
        broken = true;
      }) {};
 
+  "hw-bits_0_7_0_7" = callPackage
+    ({ mkDerivation, base, bytestring, criterion, hedgehog, hspec
+     , hspec-discover, hw-hspec-hedgehog, hw-int, hw-prim
+     , hw-string-parse, QuickCheck, vector
+     }:
+     mkDerivation {
+       pname = "hw-bits";
+       version = "0.7.0.7";
+       sha256 = "11j43d8fxi3s6mfhnx2kcj03gpxj7gxmi00vbbnxnwby66vvbbib";
+       libraryHaskellDepends = [
+         base bytestring hw-int hw-prim hw-string-parse vector
+       ];
+       testHaskellDepends = [
+         base bytestring hedgehog hspec hw-hspec-hedgehog hw-prim QuickCheck
+         vector
+       ];
+       testToolDepends = [ hspec-discover ];
+       benchmarkHaskellDepends = [ base criterion vector ];
+       description = "Bit manipulation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "hw-ci-assist" = callPackage
     ({ mkDerivation, base, hedgehog, hspec, hspec-discover, hw-hedgehog
      , hw-hspec-hedgehog, optparse-applicative
@@ -130550,20 +130617,20 @@ self: {
   "hw-uri" = callPackage
     ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3
      , antiope-core, antiope-optparse-applicative, antiope-s3, base
-     , bytestring, directory, exceptions, filepath, generic-lens
+     , bytestring, directory, dlist, exceptions, filepath, generic-lens
      , hedgehog, hspec, hspec-discover, http-client, http-types
      , hw-hspec-hedgehog, hw-prim, lens, mtl, optparse-applicative
      , resourcet, text, unliftio-core
      }:
      mkDerivation {
        pname = "hw-uri";
-       version = "0.1.1.8";
-       sha256 = "09lkzl2338ah47zqbm28cf3pk1x3b3d0imbksf8995xixgvgf1vx";
+       version = "0.1.1.9";
+       sha256 = "0l6ihhl79z1l361c4xh13qmbw8h2hnf85ncha7hivqafb585m1yr";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson amazonka amazonka-core amazonka-s3 antiope-core antiope-s3
-         base bytestring directory exceptions filepath generic-lens
+         base bytestring directory dlist exceptions filepath generic-lens
          http-client http-types hw-prim lens mtl resourcet text
          unliftio-core
        ];
@@ -132805,6 +132872,43 @@ self: {
        broken = true;
      }) {};
 
+  "ihaskell_0_10_0_2" = callPackage
+    ({ mkDerivation, aeson, base, base64-bytestring, bytestring, cereal
+     , cmdargs, containers, directory, filepath, ghc, ghc-boot
+     , ghc-parser, ghc-paths, haskeline, haskell-src-exts, here, hlint
+     , hspec, hspec-contrib, http-client, http-client-tls, HUnit
+     , ipython-kernel, mtl, parsec, process, random, raw-strings-qq
+     , setenv, shelly, split, stm, strict, text, time, transformers
+     , unix, unordered-containers, utf8-string, vector
+     }:
+     mkDerivation {
+       pname = "ihaskell";
+       version = "0.10.0.2";
+       sha256 = "01jk48kj5z7n547z1lg78c0bphpjyv2nfzjrh4jv7xygkw5asqxb";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson base base64-bytestring bytestring cereal cmdargs containers
+         directory filepath ghc ghc-boot ghc-parser ghc-paths haskeline
+         haskell-src-exts hlint http-client http-client-tls ipython-kernel
+         mtl parsec process random shelly split stm strict text time
+         transformers unix unordered-containers utf8-string vector
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring containers directory ghc ipython-kernel
+         process strict text transformers unix unordered-containers
+       ];
+       testHaskellDepends = [
+         base directory ghc ghc-paths here hspec hspec-contrib HUnit
+         raw-strings-qq setenv shelly text transformers
+       ];
+       description = "A Haskell backend kernel for the IPython project";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "ihaskell-aeson" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, here
      , ihaskell, text
@@ -136514,6 +136618,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "ipython-kernel_0_10_1_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, cereal, cereal-text
+     , containers, cryptonite, directory, filepath, memory, mtl, process
+     , temporary, text, transformers, unordered-containers, uuid
+     , zeromq4-haskell
+     }:
+     mkDerivation {
+       pname = "ipython-kernel";
+       version = "0.10.1.0";
+       sha256 = "03sygh5jvigfjg3il49wy41p6ac1wh2gx8wj3hg2rvsh91p9f4dw";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson base bytestring cereal cereal-text containers cryptonite
+         directory filepath memory mtl process temporary text transformers
+         unordered-containers uuid zeromq4-haskell
+       ];
+       description = "A library for creating kernels for IPython frontends";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "irc" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, HUnit, QuickCheck
      , test-framework, test-framework-hunit, test-framework-quickcheck2
@@ -158845,6 +158972,23 @@ self: {
        broken = true;
      }) {};
 
+  "mini-egison" = callPackage
+    ({ mkDerivation, base, containers, haskell-src-meta, hspec, primes
+     , regex-compat, split, template-haskell
+     }:
+     mkDerivation {
+       pname = "mini-egison";
+       version = "0.1.1";
+       sha256 = "1b73igp5n2z5z910rfif2ag8ir97vr5bn1jrkmv30rnw6pnp5a5d";
+       libraryHaskellDepends = [
+         base containers haskell-src-meta regex-compat split
+         template-haskell
+       ];
+       testHaskellDepends = [ base hspec primes ];
+       description = "Template Haskell Implementation of Egison Pattern Matching";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "miniball" = callPackage
     ({ mkDerivation, base, vector }:
      mkDerivation {
@@ -175409,6 +175553,42 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pandoc-citeproc_0_16_3" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
+     , Cabal, containers, data-default, directory, filepath, hs-bibutils
+     , HsYAML, HsYAML-aeson, libyaml, mtl, network, old-locale, pandoc
+     , pandoc-types, parsec, process, rfc5051, safe, setenv, split, syb
+     , tagsoup, temporary, text, time, unordered-containers, vector
+     , xml-conduit, yaml
+     }:
+     mkDerivation {
+       pname = "pandoc-citeproc";
+       version = "0.16.3";
+       sha256 = "1jj4j71xx63k3hhcr2l9vgxsj3v038dska1pdlz8pi6b4kmp00hb";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       setupHaskellDepends = [ base Cabal ];
+       libraryHaskellDepends = [
+         aeson base bytestring containers data-default directory filepath
+         hs-bibutils HsYAML HsYAML-aeson mtl network old-locale pandoc
+         pandoc-types parsec rfc5051 setenv split syb tagsoup text time
+         unordered-containers vector xml-conduit yaml
+       ];
+       executableHaskellDepends = [
+         aeson aeson-pretty attoparsec base bytestring filepath libyaml
+         pandoc pandoc-types safe syb text yaml
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers directory filepath mtl pandoc
+         pandoc-types process temporary text yaml
+       ];
+       doCheck = false;
+       description = "Supports using pandoc with citeproc";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pandoc-citeproc-preamble" = callPackage
     ({ mkDerivation, base, directory, filepath, pandoc-types, process
      }:
@@ -177836,8 +178016,8 @@ self: {
        pname = "path";
        version = "0.6.1";
        sha256 = "0nayla4k1gb821k8y5b9miflv1bi8f0czf9rqr044nrr2dddi2sb";
-       revision = "1";
-       editedCabalFile = "05b1zwx2a893h4h5wvgpc5g5pyx71hfmx409rqisd8s1bq1hn463";
+       revision = "2";
+       editedCabalFile = "05pgmg0w1mfwcmx9ad4p09xqxld8njhgwmgq38v7pr58czvmd6ks";
        libraryHaskellDepends = [
          aeson base deepseq exceptions filepath hashable template-haskell
        ];
@@ -187720,6 +187900,17 @@ self: {
        broken = true;
      }) {};
 
+  "primitive-convenience" = callPackage
+    ({ mkDerivation, primitive }:
+     mkDerivation {
+       pname = "primitive-convenience";
+       version = "0.1";
+       sha256 = "1xnyyw76kh42fy1b1wkc143bg3588gbp48990xdskcad1aj4fyan";
+       libraryHaskellDepends = [ primitive ];
+       description = "convenience class for PrimMonad m/PrimState m";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "primitive-extras" = callPackage
     ({ mkDerivation, base, bytestring, cereal, deferred-folds, focus
      , foldl, list-t, primitive, profunctors, QuickCheck
@@ -199129,6 +199320,8 @@ self: {
        pname = "req";
        version = "2.1.0";
        sha256 = "07sm483bkwqq7fvhwqysl4ac0nw1mvhkywawwpgq0c1gw2wnv56n";
+       revision = "1";
+       editedCabalFile = "0dgd4wgijd0k96khy56b6gnzmqzmz44a4qsj0v5mwslvnvkq598a";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson authenticate-oauth base blaze-builder bytestring
@@ -208725,6 +208918,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "servant-errors" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, http-api-data, http-media
+     , http-types, markdown-unlit, scientific, servant, servant-server
+     , string-conversions, text, unordered-containers, wai, warp
+     }:
+     mkDerivation {
+       pname = "servant-errors";
+       version = "0.1.0.3";
+       sha256 = "0dgl30k5fz0q15y6msa5qdc2sj28n8fdddiw835q3kp6wy2dzpc1";
+       libraryHaskellDepends = [
+         aeson base bytestring http-api-data http-media http-types
+         scientific servant string-conversions text unordered-containers wai
+       ];
+       testHaskellDepends = [ aeson base servant-server text wai warp ];
+       testToolDepends = [ markdown-unlit ];
+       description = "Servant Errors wai-middlware";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "servant-examples" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, either
      , http-types, js-jquery, lucid, random, servant, servant-client
@@ -212902,10 +213114,8 @@ self: {
      }:
      mkDerivation {
        pname = "sign";
-       version = "0.4.3";
-       sha256 = "0i3m3zylss4nxmf290wmc8ldck0pnx0m5z4y8nhxnz51adlmp1bp";
-       revision = "2";
-       editedCabalFile = "1j4kxvxd3cl9k2nhlgnx8zrh1ygd0m75q0m2wrqcqv0pf1z39lya";
+       version = "0.4.4";
+       sha256 = "1z9csfbl5h4cprvykszn81xncsry7fama2y3gbgnqr7mq15qziq7";
        libraryHaskellDepends = [
          base containers deepseq hashable lattices universe-base
        ];
@@ -214812,6 +215022,24 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "skylighting_0_8_2_1" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers
+     , skylighting-core
+     }:
+     mkDerivation {
+       pname = "skylighting";
+       version = "0.8.2.1";
+       sha256 = "1xls8ycad77m55ax4hp55k60h3pi5sm3m32hycbc8baixbgfx5xz";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base binary bytestring containers skylighting-core
+       ];
+       description = "syntax highlighting library";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "skylighting-core" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, attoparsec, base
      , base64-bytestring, binary, blaze-html, bytestring
@@ -214844,6 +215072,39 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "skylighting-core_0_8_2_1" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, attoparsec, base
+     , base64-bytestring, binary, blaze-html, bytestring
+     , case-insensitive, colour, containers, criterion, Diff, directory
+     , filepath, HUnit, hxt, mtl, pretty-show, QuickCheck, random
+     , regex-base, regex-pcre-builtin, safe, tasty, tasty-golden
+     , tasty-hunit, tasty-quickcheck, text, transformers, utf8-string
+     }:
+     mkDerivation {
+       pname = "skylighting-core";
+       version = "0.8.2.1";
+       sha256 = "0hdchivb4af9w7v5v7lrwfwawd3kcwmpzk69m1vkkm3pis8lcr1s";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson ansi-terminal attoparsec base base64-bytestring binary
+         blaze-html bytestring case-insensitive colour containers directory
+         filepath hxt mtl regex-base regex-pcre-builtin safe text
+         transformers utf8-string
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers Diff directory filepath HUnit
+         pretty-show QuickCheck random tasty tasty-golden tasty-hunit
+         tasty-quickcheck text
+       ];
+       benchmarkHaskellDepends = [
+         base containers criterion directory filepath text
+       ];
+       description = "syntax highlighting library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "skylighting-extensions" = callPackage
     ({ mkDerivation, base, containers, skylighting, skylighting-modding
      , text
@@ -236740,8 +237001,8 @@ self: {
      }:
      mkDerivation {
        pname = "too-many-cells";
-       version = "0.1.12.4";
-       sha256 = "02qgin4x0vmj56y4yv3zb4fimd6zaqnx344gyj9lrq11fnr202yr";
+       version = "0.2.0.0";
+       sha256 = "05ky77q0smz27917zk6k4ladyf8vbg6biidjmfwx0y1mbsq50k4y";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-- 
GitLab


From 2b3c8c468c494ecd15fb051ae4204b42bcaf6f2d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 17:38:48 -0700
Subject: [PATCH 1115/2254] leatherman: 1.7.1 -> 1.7.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/leatherman/versions
---
 pkgs/development/libraries/leatherman/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix
index a84e6b5c08d..ba5dbf130b9 100644
--- a/pkgs/development/libraries/leatherman/default.nix
+++ b/pkgs/development/libraries/leatherman/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   pname = "leatherman";
-  version = "1.7.1";
+  version = "1.7.2";
 
   src = fetchFromGitHub {
-    sha256 = "0m2dm1gzwj0kwyl031bif89h3n4znml3m5n97hywlbra58ni8km1";
+    sha256 = "1k70fx9i4prw0vp5680ijs1ldbwd7gmvpav7jfqvpbcm3zblkc23";
     rev = version;
     repo = "leatherman";
     owner = "puppetlabs";
-- 
GitLab


From 9033e1bdc1e1a2d689cbf446b20ba23571562ec8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 18:03:39 -0700
Subject: [PATCH 1116/2254] kotlin: 1.3.41 -> 1.3.50

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/kotlin/versions
---
 pkgs/development/compilers/kotlin/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix
index 90dc20fcd3e..12a75eb8f14 100644
--- a/pkgs/development/compilers/kotlin/default.nix
+++ b/pkgs/development/compilers/kotlin/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, makeWrapper, jre, unzip }:
 
 let
-  version = "1.3.41";
+  version = "1.3.50";
 in stdenv.mkDerivation {
   inherit version;
   pname = "kotlin";
 
   src = fetchurl {
     url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
-    sha256 = "0ch1fynqjfsb7jklw3pa6fygrgnl8nz4x4v0id06wq4md23bcjn4";
+    sha256 = "1v66pnk810agf26khwdv7l8jpc11x6na5fyqxs9jvxdpls8l0hk9";
   };
 
   propagatedBuildInputs = [ jre ] ;
-- 
GitLab


From 42a2b373760a667fe920f45dc17eac48d09a4244 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 04:00:22 -0700
Subject: [PATCH 1117/2254] criu: 3.12 -> 3.13

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/criu/versions
---
 pkgs/os-specific/linux/criu/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix
index 354eea40b24..3210a0106a6 100644
--- a/pkgs/os-specific/linux/criu/default.nix
+++ b/pkgs/os-specific/linux/criu/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "criu";
-  version = "3.12";
+  version = "3.13";
 
   src = fetchurl {
     url    = "https://download.openvz.org/criu/${pname}-${version}.tar.bz2";
-    sha256 = "1z0fpym8fi2jqx99himqs8pm5l4mzrswjqxcyfwjmbabzb77dwhf";
+    sha256 = "1yn9ix9lqvqvjrs3a3g6g1wqfniyf9n7giy0mr3jvijmrcm7y0pa";
   };
 
   enableParallelBuilding = true;
-- 
GitLab


From 17ad60e68f7440200a1b19a966c7ae52bb712de8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 19:15:47 -0700
Subject: [PATCH 1118/2254] logrotate: 3.15.0 -> 3.15.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/logrotate/versions
---
 pkgs/tools/system/logrotate/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/logrotate/default.nix b/pkgs/tools/system/logrotate/default.nix
index cee092f755f..9fd6c4ea81a 100644
--- a/pkgs/tools/system/logrotate/default.nix
+++ b/pkgs/tools/system/logrotate/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "logrotate";
-  version = "3.15.0";
+  version = "3.15.1";
 
   src = fetchFromGitHub {
     owner = "logrotate";
     repo = "logrotate";
     rev = version;
-    sha256 = "094wv4d3gv5dmw55d0xij06lgcg5q9bmq49hipc2jhp4vdsj4xr5";
+    sha256 = "0l92zarygp34qnw3p5rcwqsvgz7zmmhi7lgh00vj2jb9zkjbldc0";
   };
 
   # Logrotate wants to access the 'mail' program; to be done.
-- 
GitLab


From 1e629e532f5422f54eec89c4b2aa6a2dbe1ead3f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 19:29:22 -0700
Subject: [PATCH 1119/2254] linuxsampler: 2.1.0 -> 2.1.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/linuxsampler/versions
---
 pkgs/applications/audio/linuxsampler/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/linuxsampler/default.nix b/pkgs/applications/audio/linuxsampler/default.nix
index 26fc2408d8a..f13f10d15e8 100644
--- a/pkgs/applications/audio/linuxsampler/default.nix
+++ b/pkgs/applications/audio/linuxsampler/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   pname = "linuxsampler";
-  version = "2.1.0";
+  version = "2.1.1";
 
   src = fetchurl {
     url = "https://download.linuxsampler.org/packages/${pname}-${version}.tar.bz2";
-    sha256 = "0fdxpw7jjfi058l95131d6d8538h05z7n94l60i6mhp9xbplj2jf";
+    sha256 = "1gijf50x5xbpya5dj3v2mzj7azx4qk9p012csgddp73f0qi0n190";
   };
 
   preConfigure = ''
-- 
GitLab


From bcecdd5822c380c5f529294c82b62744d8bb365b Mon Sep 17 00:00:00 2001
From: Jacek Generowicz <jacg@my-post-office.net>
Date: Thu, 19 Sep 2019 15:38:56 +0200
Subject: [PATCH 1120/2254] webmacs: init at version 0.8

---
 .../networking/browsers/webmacs/default.nix   | 73 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 75 insertions(+)
 create mode 100644 pkgs/applications/networking/browsers/webmacs/default.nix

diff --git a/pkgs/applications/networking/browsers/webmacs/default.nix b/pkgs/applications/networking/browsers/webmacs/default.nix
new file mode 100644
index 00000000000..0f36177278b
--- /dev/null
+++ b/pkgs/applications/networking/browsers/webmacs/default.nix
@@ -0,0 +1,73 @@
+{ lib
+, mkDerivationWith
+, fetchFromGitHub
+, python3Packages
+, herbstluftwm
+}:
+
+mkDerivationWith python3Packages.buildPythonApplication rec {
+  pname = "webmacs";
+  version = "0.8";
+
+  disabled = python3Packages.isPy27;
+
+  src = fetchFromGitHub {
+    owner = "parkouss";
+    repo = "webmacs";
+    rev = version;
+    fetchSubmodules = true;
+    sha256 = "1hzb9341hybgrqcy1w20hshm6xaiby4wbjpjkigf4zq389407368";
+  };
+
+  propagatedBuildInputs = with python3Packages; [
+    pyqtwebengine
+    setuptools
+    dateparser
+    jinja2
+    pygments
+  ];
+
+  dontWrapQtApps = true;
+
+  makeWrapperArgs = [ "\${qtWrapperArgs[@]}" ];
+
+  # See https://github.com/parkouss/webmacs/blob/1a04fb7bd3f33d39cb4d71621b48c2458712ed39/setup.py#L32
+  # Don't know why they're using CC for g++.
+  preConfigure = ''
+   export CC=$CXX
+  '';
+
+  doCheck = false; # test dependencies not packaged up yet
+
+  checkInputs = [
+    python3Packages.pytest
+    #python3Packages.pytest-xvfb
+    #python3Packages.pytest-qt
+    python3Packages.pytestCheckHook
+    herbstluftwm
+
+    # The following are listed in test-requirements.txt but appear not
+    # to be needed at present:
+
+    # python3Packages.pytest-mock
+    # python3Packages.flake8
+  ];
+
+  meta = with lib; {
+    description = "Keyboard-based web browser with Emacs/conkeror heritage";
+    longDescription = ''
+      webmacs is yet another browser for keyboard-based web navigation.
+
+      It mainly targets emacs-like navigation, and started as a clone (in terms of
+      features) of conkeror.
+
+      Based on QtWebEngine and Python 3. Fully customizable in Python.
+    '';
+    homepage = https://webmacs.readthedocs.io/en/latest/;
+    changelog = https://github.com/parkouss/webmacs/blob/master/CHANGELOG.md;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ jacg ];
+    platforms = platforms.all;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9aabb3a0b8f..7cddde45d4e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21190,6 +21190,8 @@ in
 
   wayv = callPackage ../tools/X11/wayv {};
 
+  webmacs = libsForQt5.callPackage ../applications/networking/browsers/webmacs {};
+
   webtorrent_desktop = callPackage ../applications/video/webtorrent_desktop {};
 
   wrapWeechat = callPackage ../applications/networking/irc/weechat/wrapper.nix { };
-- 
GitLab


From cce7486deb2be3375c0a58899af5e5ff802bf869 Mon Sep 17 00:00:00 2001
From: Craige McWhirter <craige@mcwhirter.io>
Date: Thu, 15 Aug 2019 08:29:13 +1000
Subject: [PATCH 1121/2254] nixos/doc: Clarify wireless examples

This commits makes it clearer to a novice reader how to configure several
diferent types of SSID connections that were otherwise obscurely documented

Resolves #66650
---
 nixos/doc/manual/configuration/wireless.xml        | 11 +++++++++--
 .../modules/services/networking/wpa_supplicant.nix | 14 ++++++++++++--
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/nixos/doc/manual/configuration/wireless.xml b/nixos/doc/manual/configuration/wireless.xml
index 9c0e3a8d7aa..247d29d5831 100644
--- a/nixos/doc/manual/configuration/wireless.xml
+++ b/nixos/doc/manual/configuration/wireless.xml
@@ -19,10 +19,17 @@
   NixOS lets you specify networks for wpa_supplicant declaratively:
 <programlisting>
 <xref linkend="opt-networking.wireless.networks"/> = {
-  echelon = {
+  echelon = {                # SSID with no spaces or special characters
     psk = "abcdefgh";
   };
-  "free.wifi" = {};
+  "echelon's AP" = {         # SSID with spaces and/or special characters
+    psk = "ijklmnop";
+  };
+  echelon = {                # Hidden SSID
+    hidden = true;
+    psk = "qrstuvwx";
+  };
+  free.wifi = {};            # Public wireless network
 };
 </programlisting>
   Be aware that keys will be written to the nix store in plaintext! When no
diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix
index 63e59e7c8fa..294c0d70ede 100644
--- a/nixos/modules/services/networking/wpa_supplicant.nix
+++ b/nixos/modules/services/networking/wpa_supplicant.nix
@@ -103,6 +103,13 @@ in {
               description = ''
                 Set this to <literal>true</literal> if the SSID of the network is hidden.
               '';
+              example = literalExample ''
+                { echelon = {
+                    hidden = true;
+                    psk = "abcdefgh";
+                  };
+                }
+              '';
             };
 
             priority = mkOption {
@@ -146,10 +153,13 @@ in {
         '';
         default = {};
         example = literalExample ''
-          { echelon = {
+          { echelon = {                   # SSID with no spaces or special characters
               psk = "abcdefgh";
             };
-            "free.wifi" = {};
+            "echelon's AP" = {            # SSID with spaces and/or special characters
+               psk = "ijklmnop";
+            };
+            "free.wifi" = {};             # Public wireless network
           }
         '';
       };
-- 
GitLab


From 56183fb2ddf3c03de3de8e827459fb6d06d8eeed Mon Sep 17 00:00:00 2001
From: Tom Doggett <nocoolnametom@gmail.com>
Date: Tue, 24 Sep 2019 09:52:01 -0700
Subject: [PATCH 1122/2254] toot: 0.22.0 -> 0.24.0

Updating Toot to version 0.24.0 which includes the new TUI along with some encoding fixes since its original introduction in 0.23.0.  The TUI uses the `urwid` package.
---
 pkgs/applications/misc/toot/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/toot/default.nix b/pkgs/applications/misc/toot/default.nix
index 425ea8d237b..13e0cdfb260 100644
--- a/pkgs/applications/misc/toot/default.nix
+++ b/pkgs/applications/misc/toot/default.nix
@@ -1,20 +1,20 @@
 { stdenv, fetchFromGitHub, python3Packages }:
 
 python3Packages.buildPythonApplication rec {
-  version = "0.22.0";
+  version = "0.24.0";
   name    = "toot-${version}";
 
   src = fetchFromGitHub {
     owner  = "ihabunek";
     repo   = "toot";
     rev    = version;
-    sha256 = "11dgz082shxpbsxr4i41as040cfqinm5lbcg3bmsxqvc4hsz2nr5";
+    sha256 = "1szpmkxc1lqfphicfcj0z7b1nq97xmb4ppwf806p8w0fxj1shil3";
   };
 
   checkInputs = with python3Packages; [ pytest ];
 
   propagatedBuildInputs = with python3Packages;
-    [ requests beautifulsoup4 future wcwidth ];
+    [ requests beautifulsoup4 future wcwidth urwid ];
 
   checkPhase = ''
     py.test
-- 
GitLab


From e7eb269d455d7afa0fd7abb211036f721b7afc78 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Fri, 27 Sep 2019 08:17:09 +0300
Subject: [PATCH 1123/2254] cabal2nix: fix build

Without this change, the build fails with:

```
Warning:
    This package indirectly depends on multiple versions of the same package. This is very likely to cause a compile failure.
      package hackage-db (hackage-db-2.0.1-AliTRXEJBGFAEMpONOEnbV) requires Cabal-2.4.0.1
      package hpack (hpack-0.32.0-1iJuukTWmC4EGkYhAiFeII) requires Cabal-3.0.0.0-CD1INMNwoxXIKVgcu1nec5
      package distribution-nixpkgs (distribution-nixpkgs-1.3.1-82Z2DCdLAUs8Q2gjtlPLz5) requires Cabal-3.0.0.0-CD1INMNwoxXIKVgcu1nec5
      package cabal2nix (cabal2nix-2.15.0) requires Cabal-3.0.0.0-CD1INMNwoxXIKVgcu1nec5
      package cabal2nix (cabal2nix-2.15.0) requires Cabal-3.0.0.0-CD1INMNwoxXIKVgcu1nec5
      package cabal2nix (cabal2nix-2.15.0) requires Cabal-3.0.0.0-CD1INMNwoxXIKVgcu1nec5
```
---
 .../haskell-modules/configuration-ghc-8.6.x.nix           | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
index 455b2358da7..41b6177efef 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -95,7 +95,11 @@ self: super: {
   # Newer versions don't compile.
   resolv = self.resolv_0_1_1_2;
 
-  # cabal2nix needs the latest version of Cabal.
-  cabal2nix = super.cabal2nix.overrideScope (self: super: { Cabal = self.Cabal_3_0_0_0; });
+  # cabal2nix needs the latest version of Cabal, and the one
+  # hackage-db uses must match, so take the latest
+  cabal2nix = super.cabal2nix.overrideScope (self: super: {
+    Cabal = self.Cabal_3_0_0_0;
+    hackage-db = self.hackage-db_2_1_0;
+  });
 
 }
-- 
GitLab


From 4ca445c722d283c7cc11dfeb0e50e2d490a3515b Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 19 Sep 2019 15:56:21 +0000
Subject: [PATCH 1124/2254] ocaml-ng.ocamlPackages_latest: 4.08.1 -> 4.09.0

---
 pkgs/development/compilers/ocaml/4.09.nix | 6 ++++++
 pkgs/top-level/ocaml-packages.nix         | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/compilers/ocaml/4.09.nix

diff --git a/pkgs/development/compilers/ocaml/4.09.nix b/pkgs/development/compilers/ocaml/4.09.nix
new file mode 100644
index 00000000000..4b56d82eba5
--- /dev/null
+++ b/pkgs/development/compilers/ocaml/4.09.nix
@@ -0,0 +1,6 @@
+import ./generic.nix {
+  major_version = "4";
+  minor_version = "09";
+  patch_version = "0";
+  sha256 = "1v3z5ar326f3hzvpfljg4xj8b9lmbrl53fn57yih1bkbx3gr3yzj";
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 23c0643f1c4..ce0a6fe5bfb 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1133,7 +1133,9 @@ in let inherit (pkgs) callPackage; in rec
 
   ocamlPackages_4_08 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.08.nix { });
 
-  ocamlPackages_latest = ocamlPackages_4_08;
+  ocamlPackages_4_09 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.09.nix { });
+
+  ocamlPackages_latest = ocamlPackages_4_09;
 
   ocamlPackages = ocamlPackages_4_06;
 }
-- 
GitLab


From afd6b04f478d9658f60cdef548614d13c6d5c15a Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Thu, 19 Sep 2019 18:14:27 +0900
Subject: [PATCH 1125/2254] pythonPackages.pymupdf: init at 1.16.2

python bindings for mupdf. Provides the fitz module for
https://github.com/dsanson/termpdf.py that I am trying to package.
---
 .../python-modules/pymupdf/default.nix        | 27 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/development/python-modules/pymupdf/default.nix

diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix
new file mode 100644
index 00000000000..749fe413de6
--- /dev/null
+++ b/pkgs/development/python-modules/pymupdf/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, buildPythonPackage, fetchPypi, mupdf, swig }:
+buildPythonPackage rec {
+  pname = "PyMuPDF";
+  version = "1.16.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1bidybzkjsc0kdd18xnhz97p70br8xh8whzwydp3a5m411cm00mg";
+  };
+
+  patchPhase = ''
+    substituteInPlace setup.py \
+        --replace '/usr/include/mupdf' ${mupdf.dev}/include/mupdf
+    '';
+  nativeBuildInputs = [ swig ];
+  buildInputs = [ mupdf ];
+
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Python bindings for MuPDF's rendering library.";
+    homepage = https://github.com/pymupdf/PyMuPDF;
+    maintainers = with maintainers; [ teto ];
+    license =  licenses.agpl3;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index df85197fbbf..143619aeb14 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -855,6 +855,8 @@ in {
 
   pymysql = callPackage ../development/python-modules/pymysql { };
 
+  pymupdf = callPackage ../development/python-modules/pymupdf { };
+
   Pmw = callPackage ../development/python-modules/Pmw { };
 
   py_stringmatching = callPackage ../development/python-modules/py_stringmatching { };
-- 
GitLab


From 4b656c744747572b5d17ad6f2b94758d56ad8617 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Thu, 26 Sep 2019 15:32:48 +0200
Subject: [PATCH 1126/2254] knot-resolver: 4.2.0 -> 4.2.1 (bugfixes)

https://gitlab.labs.nic.cz/knot/knot-resolver/tags/v4.2.1
---
 pkgs/servers/dns/knot-resolver/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index 22b1f2a67e2..1daa3916925 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -23,11 +23,11 @@ exportLuaPathsFor = luaPkgs: ''
 
 unwrapped = stdenv.mkDerivation rec {
   pname = "knot-resolver";
-  version = "4.2.0";
+  version = "4.2.1";
 
   src = fetchurl {
     url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz";
-    sha256 = "b37ff9ceefbaa4e4527d183fb1bbb63e641d34d9889ce92715128bc1423c7ef4";
+    sha256 = "286e432762f8aa5e605e5e8fecf81815b55c4ed0be19a63e81fbc28171ae553b";
   };
 
   # https://gitlab.labs.nic.cz/knot/knot-resolver/issues/496
-- 
GitLab


From 5fe9452e1142bac4882f7b166620dc376ca44f7e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 25 Sep 2019 17:30:11 +0200
Subject: [PATCH 1127/2254] haskell-liquidhaskell: drop obsolete overrides

---
 .../configuration-ghc-8.6.x.nix               | 21 -------------------
 1 file changed, 21 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
index 455b2358da7..5b7b70305ff 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -71,27 +71,6 @@ self: super: {
   # Break out of "yaml >=0.10.4.0 && <0.11": https://github.com/commercialhaskell/stack/issues/4485
   stack = doJailbreak super.stack;
 
-  # Needs a recent version from the "develop" branch of the upstream git
-  # repository to compile with ghc 8.6.4.
-  liquid-fixpoint = assert super.liquid-fixpoint.version == "0.7.0.7"; overrideSrc super.liquid-fixpoint {
-    src = pkgs.fetchFromGitHub {
-      owner = "ucsd-progsys";
-      repo = "liquid-fixpoint";
-      rev = "42c027ab9ae47907c588a2f1f9c05a5e0aa881e9";
-      sha256 = "17qmzq1vx7h04yd38drr6sh6hys3q2rz62qh3pna9kbxlcnikkqf";
-    };
-    version = "0.8.0.2-pre-release";
-  };
-  liquidhaskell = assert super.liquidhaskell.version == "0.8.2.4"; overrideSrc super.liquidhaskell {
-    src = pkgs.fetchFromGitHub {
-      owner = "ucsd-progsys";
-      repo = "liquidhaskell";
-      rev = "46f11e8faef006e70d39572d08419283b1280b88";
-      sha256 = "10z5r6g5acd43bsak762kwhy33ff262zmhs0wga545nbg29q1fyp";
-    };
-    version = "0.8.6.0-pre-release";
-  };
-
   # Newer versions don't compile.
   resolv = self.resolv_0_1_1_2;
 
-- 
GitLab


From 2ead786984191720c0e2be4efc76dfaef8f71528 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Fri, 27 Sep 2019 12:23:43 +0200
Subject: [PATCH 1128/2254] qtile: FIX No module named 'pkg_resources'

---
 pkgs/applications/window-managers/qtile/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix
index dc78702b03c..6d0e6bdac45 100644
--- a/pkgs/applications/window-managers/qtile/default.nix
+++ b/pkgs/applications/window-managers/qtile/default.nix
@@ -32,7 +32,7 @@ python37Packages.buildPythonApplication rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ glib libxcb cairo pango python37Packages.xcffib ];
 
-  pythonPath = with python37Packages; [ xcffib cairocffi-xcffib ];
+  pythonPath = with python37Packages; [ xcffib cairocffi-xcffib setuptools ];
 
   postInstall = ''
     wrapProgram $out/bin/qtile \
-- 
GitLab


From f72a8b02bdada70722dcfaf806a55d2b6a7405a5 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 27 Sep 2019 12:54:12 +0200
Subject: [PATCH 1129/2254] pass: add patch for basic wayland support

This adds an upstream patch to support `wl-clipboard` for `pass -c` and
optionally wraps `wl-clipboard`. The patch is directly checked into
nixpkgs as it had to be modified to properly apply with
`set-correct-name-for-sleep.patch`.
---
 .../security/pass/clip-wayland-support.patch  | 113 ++++++++++++++++++
 pkgs/tools/security/pass/default.nix          |  13 +-
 pkgs/top-level/all-packages.nix               |   4 +
 3 files changed, 127 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/tools/security/pass/clip-wayland-support.patch

diff --git a/pkgs/tools/security/pass/clip-wayland-support.patch b/pkgs/tools/security/pass/clip-wayland-support.patch
new file mode 100644
index 00000000000..7b8d2eb010d
--- /dev/null
+++ b/pkgs/tools/security/pass/clip-wayland-support.patch
@@ -0,0 +1,113 @@
+From b0b784b1a57c0b06936e6f5d6560712b4b810cd3 Mon Sep 17 00:00:00 2001
+From: Brett Cornwall <brett@i--b.com>
+Date: Wed, 27 Feb 2019 00:08:33 -0700
+Subject: clip: Add support for wl-clipboard
+
+Edited to properly apply with
+`set-correct-program-name-for-sleep.patch`.
+
+---
+ README                |  4 +++-
+ man/pass.1            |  5 +++++
+ src/password-store.sh | 26 +++++++++++++++++++++-----
+ 3 files changed, 29 insertions(+), 6 deletions(-)
+
+diff --git a/README b/README
+index 6b59965..1a46242 100644
+--- a/README
++++ b/README
+@@ -19,8 +19,10 @@ Depends on:
+   http://www.gnupg.org/
+ - git
+   http://www.git-scm.com/
+-- xclip
++- xclip (for X11 environments)
+   http://sourceforge.net/projects/xclip/
++- wl-clipboard (for wlroots Wayland-based environments)
++  https://github.com/bugaevc/wl-clipboard
+ - tree >= 1.7.0
+   http://mama.indstate.edu/users/ice/tree/
+ - GNU getopt
+diff --git a/man/pass.1 b/man/pass.1
+index 01a3fbe..a555dcb 100644
+--- a/man/pass.1
++++ b/man/pass.1
+@@ -99,6 +99,8 @@ Decrypt and print a password named \fIpass-name\fP. If \fI--clip\fP or \fI-c\fP
+ is specified, do not print the password but instead copy the first (or otherwise specified)
+ line to the clipboard using
+ .BR xclip (1)
++or
++.BR wl-clipboard(1)
+ and then restore the clipboard after 45 (or \fIPASSWORD_STORE_CLIP_TIME\fP) seconds. If \fI--qrcode\fP
+ or \fI-q\fP is specified, do not print the password but instead display a QR code using
+ .BR qrencode (1)
+@@ -132,6 +134,8 @@ in generating passwords can be changed with the \fIPASSWORD_STORE_CHARACTER_SET\
+ If \fI--clip\fP or \fI-c\fP is specified, do not print the password but instead copy
+ it to the clipboard using
+ .BR xclip (1)
++or
++.BR wl-clipboard(1)
+ and then restore the clipboard after 45 (or \fIPASSWORD_STORE_CLIP_TIME\fP) seconds. If \fI--qrcode\fP
+ or \fI-q\fP is specified, do not print the password but instead display a QR code using
+ .BR qrencode (1)
+@@ -466,6 +470,7 @@ The location of the text editor used by \fBedit\fP.
+ .BR tr (1),
+ .BR git (1),
+ .BR xclip (1),
++.BR wl-clipboard (1),
+ .BR qrencode (1).
+ 
+ .SH AUTHOR
+diff --git a/src/password-store.sh b/src/password-store.sh
+index d89d455..284eabf 100755
+--- a/src/password-store.sh
++++ b/src/password-store.sh
+@@ -152,16 +152,32 @@ check_sneaky_paths() {
+ #
+ 
+ clip() {
++	if [[ -n $WAYLAND_DISPLAY ]]; then
++		local copy_cmd=( wl-copy )
++		local paste_cmd=( wl-paste -n )
++		if [[ $X_SELECTION == primary ]]; then
++			copy_cmd+=( --primary )
++			paste_cmd+=( --primary )
++		fi
++		local display_name="$WAYLAND_DISPLAY"
++	elif [[ -n $DISPLAY ]]; then
++		local copy_cmd=( xclip -selection "$X_SELECTION" )
++		local paste_cmd=( xclip -o -selection "$X_SELECTION" )
++		local display_name="$DISPLAY"
++	else
++		die "Error: No X11 or Wayland display detected"
++	fi
++	local sleep_argv0="password store sleep on display $display_name"
++
+ 	# This base64 business is because bash cannot store binary data in a shell
+ 	# variable. Specifically, it cannot store nulls nor (non-trivally) store
+ 	# trailing new lines.
+-	local sleep_argv0="password store sleep on display $DISPLAY"
+ 	pkill -P $(pgrep -f "^$sleep_argv0") 2>/dev/null && sleep 0.5
+-	local before="$(xclip -o -selection "$X_SELECTION" 2>/dev/null | $BASE64)"
+-	echo -n "$1" | xclip -selection "$X_SELECTION" || die "Error: Could not copy data to the clipboard"
++	local before="$("${paste_cmd[@]}" 2>/dev/null | $BASE64)"
++	echo -n "$1" | "${copy_cmd[@]}" || die "Error: Could not copy data to the clipboard"
+ 	(
+ 		( exec -a "$sleep_argv0" bash <(echo trap 'kill %1' TERM\; sleep "$CLIP_TIME & wait") )
+-		local now="$(xclip -o -selection "$X_SELECTION" | $BASE64)"
++		local now="$("${paste_cmd[@]}" | $BASE64)"
+ 		[[ $now != $(echo -n "$1" | $BASE64) ]] && before="$now"
+ 
+ 		# It might be nice to programatically check to see if klipper exists,
+@@ -173,7 +189,7 @@ clip() {
+ 		# so we axe it here:
+ 		qdbus org.kde.klipper /klipper org.kde.klipper.klipper.clearClipboardHistory &>/dev/null
+ 
+-		echo "$before" | $BASE64 -d | xclip -selection "$X_SELECTION"
++		echo "$before" | $BASE64 -d | "${copy_cmd[@]}"
+ 	) >/dev/null 2>&1 & disown
+ 	echo "Copied $2 to clipboard. Will clear in $CLIP_TIME seconds."
+ }
+-- 
+cgit v1.2.1-28-gf32c
+
diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix
index aeb838c0576..5d0e94bc803 100644
--- a/pkgs/tools/security/pass/default.nix
+++ b/pkgs/tools/security/pass/default.nix
@@ -4,6 +4,7 @@
 
 , xclip ? null, xdotool ? null, dmenu ? null
 , x11Support ? !stdenv.isDarwin
+, waylandSupport ? false, wl-clipboard ? null
 
 # For backwards-compatibility
 , tombPluginSupport ? false
@@ -15,6 +16,8 @@ assert x11Support -> xclip != null
                   && xdotool != null
                   && dmenu != null;
 
+assert waylandSupport -> wl-clipboard != null;
+
 let
   passExtensions = import ./extensions { inherit pkgs; };
 
@@ -37,8 +40,11 @@ let
       sha256 = "1x53k5dn3cdmvy8m4fqdld4hji5n676ksl0ql4armkmsds26av1b";
     };
 
-    patches = [ ./set-correct-program-name-for-sleep.patch
-              ] ++ stdenv.lib.optional stdenv.isDarwin ./no-darwin-getopt.patch;
+    patches = [ ./set-correct-program-name-for-sleep.patch ]
+      ++ stdenv.lib.optional stdenv.isDarwin ./no-darwin-getopt.patch
+      # TODO (@Ma27) this patch adds support for wl-clipboard and can be removed during the next
+      # version bump.
+      ++ stdenv.lib.optional waylandSupport ./clip-wayland-support.patch;
 
     nativeBuildInputs = [ makeWrapper ];
 
@@ -67,7 +73,8 @@ let
       qrencode
       procps
     ] ++ optional stdenv.isDarwin openssl
-      ++ ifEnable x11Support [ dmenu xclip xdotool ]);
+      ++ ifEnable x11Support [ dmenu xclip xdotool ]
+      ++ optional waylandSupport wl-clipboard);
 
     postFixup = ''
       # Link extensions env
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f32a817376a..ee3498db651 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -891,6 +891,10 @@ in
 
   pass = callPackage ../tools/security/pass { };
 
+  pass-wayland = callPackage ../tools/security/pass {
+    waylandSupport = true;
+  };
+
   passExtensions = recurseIntoAttrs pass.extensions;
 
   asc-key-to-qr-code-gif = callPackage ../tools/security/asc-key-to-qr-code-gif { };
-- 
GitLab


From 5c6e9e83d393502ffcc675b8ac383d0116628cec Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Thu, 29 Aug 2019 13:52:59 -0400
Subject: [PATCH 1130/2254] bcachefs-tools: 2019-08-21 -> 2019-09-25

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

diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix
index 98dab6278b0..68783b94716 100644
--- a/pkgs/tools/filesystems/bcachefs-tools/default.nix
+++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix
@@ -3,12 +3,12 @@
 
 stdenv.mkDerivation {
   pname = "bcachefs-tools";
-  version = "2019-08-21";
+  version = "2019-09-25";
 
   src = fetchgit {
     url = "https://evilpiepirate.org/git/bcachefs-tools.git";
-    rev = "72a408f84846fe702b8db4f158b678ee20bbf835";
-    sha256 = "0y5700afv1x1i3wnp3g71i3zhyhkwmx79j0irxr63fmg47n0ys1i";
+    rev = "db39aa3e1b528db3b9d731c3b054f27411e1e1a9";
+    sha256 = "19x7n51yr30dd9rrvji3xk3rij5xd8b86qiym9alpkbbyrz7h956";
   };
 
   enableParallelBuilding = true;
-- 
GitLab


From 6eb5915afd2361b65cbf7b21cf905a49d4665e8e Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Thu, 29 Aug 2019 13:53:07 -0400
Subject: [PATCH 1131/2254] linux_testing_bcachefs: 5.1.2019.08.21 ->
 5.2.2019.09.24

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

diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
index 0b2ed76a4b4..38c0ad10ae5 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
@@ -1,13 +1,13 @@
 { stdenv, buildPackages, fetchgit, fetchpatch, perl, buildLinux, ... } @ args:
 
 buildLinux (args // {
-  version = "5.1.2019.08.21";
-  modDirVersion = "5.1.0";
+  version = "5.2.2019.09.24";
+  modDirVersion = "5.2.0";
 
   src = fetchgit {
     url = "https://evilpiepirate.org/git/bcachefs.git";
-    rev = "ece184f718c2b678738bc2c42906e90eeb8ba7dc";
-    sha256 = "08cbisgcww8fklpxwqkm2c8ddz0mm7v11ycp7ch0kalwdv2f81lr";
+    rev = "5a3a4087af27aa10da5f23cb174a439946153584";
+    sha256 = "1yn40n2iyflbfv1z8l86nixv8wlybg7abz49nq5k6hmf7r9z56mk";
   };
 
   extraConfig = "BCACHEFS_FS m";
-- 
GitLab


From 07891afccf42acda2406880f1e42093f598c63d5 Mon Sep 17 00:00:00 2001
From: pacien <pacien.trangirard@pacien.net>
Date: Fri, 27 Sep 2019 15:36:43 +0200
Subject: [PATCH 1132/2254] riot-web: 1.3.5 -> 1.4.0

---
 .../networking/instant-messengers/riot/riot-web.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
index b938f4f47cf..d0ee71b9969 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "riot-web";
-  version = "1.3.5";
+  version = "1.4.0";
 
   src = fetchurl {
     url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
-    sha256 = "0vpfv5rvrhrws52j4lxnj1qyagf9894znpxkdnkp72g19qsjn66g";
+    sha256 = "1si11hxkfn6sqaq1hddm5vkfrd0pghzwqld1wv4vxlb5jyn32qqk";
   };
 
   installPhase = let
-- 
GitLab


From ec0d11a72f014d3934e2e5b527aed8cd1f154636 Mon Sep 17 00:00:00 2001
From: pacien <pacien.trangirard@pacien.net>
Date: Fri, 27 Sep 2019 15:36:51 +0200
Subject: [PATCH 1133/2254] riot-desktop: 1.3.5 -> 1.4.0

---
 .../instant-messengers/riot/riot-desktop-package.json         | 2 +-
 .../networking/instant-messengers/riot/riot-desktop.nix       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json
index b9017c12d60..cfc38fb4ae7 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json
@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "src/electron-main.js",
-  "version": "1.3.5",
+  "version": "1.4.0",
   "description": "A feature-rich client for Matrix.org",
   "author": "New Vector Ltd.",
   "dependencies": {
diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
index 1fde990e4a8..885e90a98c4 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
@@ -6,12 +6,12 @@
 
 let
   executableName = "riot-desktop";
-  version = "1.3.5";
+  version = "1.4.0";
   riot-web-src = fetchFromGitHub {
     owner = "vector-im";
     repo = "riot-web";
     rev = "v${version}";
-    sha256 = "05xwp6062lvjsy539swa6dxj3k3dw1667nkx8ffwdl1dg17wphy8";
+    sha256 = "1p8bl7v2214shywn53fpcb27vvvdjrs3kcys3f045v2l5fg5xhsa";
   };
 
 in yarn2nix-moretea.mkYarnPackage rec {
-- 
GitLab


From 39d7eeb5c07f25fd4a124f7a3a078a53c69a995e Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Fri, 27 Sep 2019 16:01:17 +0200
Subject: [PATCH 1134/2254] atlassian-jira: 8.4.0 -> 8.4.1

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

diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix
index 53b7b88d5b0..f73a4df2c4d 100644
--- a/pkgs/servers/atlassian/jira.nix
+++ b/pkgs/servers/atlassian/jira.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "atlassian-jira";
-  version = "8.4.0";
+  version = "8.4.1";
 
   src = fetchurl {
     url = "https://product-downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz";
-    sha256 = "1ckim2zv1i1986yciknb1c6gmj466slv38w053nnkm3nn85c5ksv";
+    sha256 = "0dkilp5wvda29rin2wj9zs2vgwyfning7cz6dyk0kyg45dl07wky";
   };
 
   phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ];
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Proprietary issue tracking product, also providing project management functions";
-    homepage = https://www.atlassian.com/software/jira;
+    homepage = "https://www.atlassian.com/software/jira";
     license = licenses.unfree;
     maintainers = with maintainers; [ fpletz globin ciil ];
   };
-- 
GitLab


From f6a894475cefa3d6bad81a73bb79d73a22dc008e Mon Sep 17 00:00:00 2001
From: Svein Ove Aas <sveina@gmail.com>
Date: Fri, 27 Sep 2019 15:25:13 +0100
Subject: [PATCH 1135/2254] zfs: 0.8.1 -> 0.8.2

---
 ...ld-fixes-unstable.patch => build-fixes-0.8.patch} |  0
 pkgs/os-specific/linux/zfs/default.nix               | 12 ++++++------
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename pkgs/os-specific/linux/zfs/{build-fixes-unstable.patch => build-fixes-0.8.patch} (100%)

diff --git a/pkgs/os-specific/linux/zfs/build-fixes-unstable.patch b/pkgs/os-specific/linux/zfs/build-fixes-0.8.patch
similarity index 100%
rename from pkgs/os-specific/linux/zfs/build-fixes-unstable.patch
rename to pkgs/os-specific/linux/zfs/build-fixes-0.8.patch
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index 1b9b5a3ba51..f704a8a2a6c 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -154,12 +154,12 @@ in {
     # incompatibleKernelVersion = "4.20";
 
     # this package should point to the latest release.
-    version = "0.8.1";
+    version = "0.8.2";
 
-    sha256 = "0wlbziijx08a9bmbyq4gfz4by9l5jrx44g18i99qnfm78k2q8a84";
+    sha256 = "0miax0h2wg4b2kn8n93804faajy2n1sh25knyy2hg3k77nlr4pni";
 
     extraPatches = [
-      ./build-fixes-unstable.patch
+      ./build-fixes-0.8.patch
     ];
   };
 
@@ -168,13 +168,13 @@ in {
     # incompatibleKernelVersion = "4.19";
 
     # this package should point to a version / git revision compatible with the latest kernel release
-    version = "0.8.1";
+    version = "0.8.2";
 
-    sha256 = "0wlbziijx08a9bmbyq4gfz4by9l5jrx44g18i99qnfm78k2q8a84";
+    sha256 = "0miax0h2wg4b2kn8n93804faajy2n1sh25knyy2hg3k77nlr4pni";
     isUnstable = true;
 
     extraPatches = [
-      ./build-fixes-unstable.patch
+      ./build-fixes-0.8.patch
     ];
   };
 }
-- 
GitLab


From 5855ba8a33468089b02d99e7523f1b17917ef901 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 08:04:12 -0700
Subject: [PATCH 1136/2254] libdigidocpp: 3.13.7 -> 3.14.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libdigidocpp/versions
---
 pkgs/development/libraries/libdigidocpp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libdigidocpp/default.nix b/pkgs/development/libraries/libdigidocpp/default.nix
index 4aec6fdef91..fc12096ef5b 100644
--- a/pkgs/development/libraries/libdigidocpp/default.nix
+++ b/pkgs/development/libraries/libdigidocpp/default.nix
@@ -2,12 +2,12 @@
 , xercesc, xml-security-c, pkgconfig, xsd, zlib, xalanc, xxd }:
 
 stdenv.mkDerivation rec {
-  version = "3.13.7";
+  version = "3.14.0";
   pname = "libdigidocpp";
 
   src = fetchurl {
      url = "https://github.com/open-eid/libdigidocpp/releases/download/v${version}/libdigidocpp-${version}.tar.gz";
-     sha256 = "1d8yx8avijp55p53fz4pd4ihjz6nyap0g8dq23bwg33411mdiqff";
+     sha256 = "0klbr881d56661d1lqlv4ivxhxcv2q16ivlz7r0rb901wilq5jyl";
   };
 
   nativeBuildInputs = [ cmake pkgconfig xxd ];
-- 
GitLab


From ae650d2c02f0663a8aa243037781d183850199e2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 08:07:01 -0700
Subject: [PATCH 1137/2254] lightning: 2.1.2 -> 2.1.3

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/lightning/versions
---
 pkgs/development/libraries/lightning/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/lightning/default.nix b/pkgs/development/libraries/lightning/default.nix
index 8a5026e307f..24d99e691a2 100644
--- a/pkgs/development/libraries/lightning/default.nix
+++ b/pkgs/development/libraries/lightning/default.nix
@@ -4,11 +4,11 @@ with stdenv.lib;
 stdenv.mkDerivation rec {
 
   pname = "lightning";
-  version = "2.1.2";
+  version = "2.1.3";
 
   src = fetchurl {
     url = "mirror://gnu/lightning/${pname}-${version}.tar.gz";
-    sha256 = "0sbs2lm8b9in2m8d52zf0x9gpp40x6r7sl6sha92yq3pr78rwa4v";
+    sha256 = "1jgxbq2cm51dzi3zhz38mmgwdcgs328mfl8iviw8dxn6dn36p1gd";
   };
 
   checkInputs = [ libopcodes ];
-- 
GitLab


From 66a03ce8f99b976be038718b25a7efe66d1310b0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 08:09:32 -0700
Subject: [PATCH 1138/2254] logmein-hamachi: 2.1.0.198 -> 2.1.0.203

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/logmein-hamachi/versions
---
 pkgs/tools/networking/logmein-hamachi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/logmein-hamachi/default.nix b/pkgs/tools/networking/logmein-hamachi/default.nix
index 52b2a9a94dc..e8a83d38131 100644
--- a/pkgs/tools/networking/logmein-hamachi/default.nix
+++ b/pkgs/tools/networking/logmein-hamachi/default.nix
@@ -9,14 +9,14 @@ let
     else throwSystem;
   throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
   sha256 =
-    if stdenv.hostPlatform.system == "x86_64-linux" then "11mxa4kls5xjj3462ycrfvfxb1xkk23p5m9iirvwsi0zdmhpnwm8"
+    if stdenv.hostPlatform.system == "x86_64-linux" then "0zy0jzvdqccfsg42m2lq1rj8r2c4iypd1h9vxl9824cbl92yim37"
     else if stdenv.hostPlatform.system == "i686-linux" then "03ml9xv19km99f0z7fpr21b1zkxvw7q39kjzd8wpb2pds51wnc62"
     else throwSystem;
   libraries = stdenv.lib.makeLibraryPath [ stdenv.cc.cc ];
 
 in stdenv.mkDerivation rec {
   pname = "logmein-hamachi";
-  version = "2.1.0.198";
+  version = "2.1.0.203";
 
   src = fetchurl {
     url = "https://www.vpn.net/installers/${pname}-${version}-${arch}.tgz";
-- 
GitLab


From b7d73890b12c25fc62f91cc7a561cad45ce90b0b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 08:14:20 -0700
Subject: [PATCH 1139/2254] libsolv: 0.7.5 -> 0.7.6

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libsolv/versions
---
 pkgs/development/libraries/libsolv/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix
index 263623c3d37..071111ae4c2 100644
--- a/pkgs/development/libraries/libsolv/default.nix
+++ b/pkgs/development/libraries/libsolv/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }:
 
 stdenv.mkDerivation rec {
-  version  = "0.7.5";
+  version  = "0.7.6";
   pname = "libsolv";
 
   src = fetchFromGitHub {
     owner  = "openSUSE";
     repo   = "libsolv";
     rev    = version;
-    sha256 = "0khks19i01s9h297c7af4bpq448abs2pqw55scf56xfdvxpv23aw";
+    sha256 = "0rrf7i2zs2kbz6k2sj1mg30i05h2msl1q9h95dp5brq2k0w94rna";
   };
 
   cmakeFlags = [
-- 
GitLab


From 497fdfb28c9597d394ed5efca8e615bdc176e833 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 19:06:21 -0700
Subject: [PATCH 1140/2254] libfaketime: 0.9.7 -> 0.9.8

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libfaketime/versions
---
 pkgs/development/libraries/libfaketime/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libfaketime/default.nix b/pkgs/development/libraries/libfaketime/default.nix
index 10e9efed26a..10cc5cace7b 100644
--- a/pkgs/development/libraries/libfaketime/default.nix
+++ b/pkgs/development/libraries/libfaketime/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libfaketime";
-  version = "0.9.7";
+  version = "0.9.8";
 
   src = fetchurl {
     url = "https://github.com/wolfcw/libfaketime/archive/v${version}.tar.gz";
-    sha256 = "07l189881q0hybzmlpjyp7r5fwz23iafkm957bwy4gnmn9lg6rad";
+    sha256 = "18s2hjm4sbrlg6sby944z87yslnq9s85p7j892hyr42qrlvq4a06";
   };
 
   patches = [
-- 
GitLab


From 6c55dc2828278f8b3484d4c28ac2bb709c0c3ee0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 08:22:02 -0700
Subject: [PATCH 1141/2254] libfilezilla: 0.18.1 -> 0.18.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libfilezilla/versions
---
 pkgs/development/libraries/libfilezilla/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix
index 9b6c1d505c1..95954a120c8 100644
--- a/pkgs/development/libraries/libfilezilla/default.nix
+++ b/pkgs/development/libraries/libfilezilla/default.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libfilezilla";
-  version = "0.18.1";
+  version = "0.18.2";
 
   src = fetchurl {
     url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.bz2";
-    sha256 = "15vzi95ibp6a9n4jjfs78z4b1iym8x1yv849gjipxzx64y5awyyb";
+    sha256 = "1j9da9xi2k4nw97m14mpp7h39rh03br0gmjj9ff819l6nhlnkn20";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From d6bbc18708704105ebb35e2a94afc898ddac5a72 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 27 Sep 2019 10:40:31 -0500
Subject: [PATCH 1142/2254] pim-data-exporter: Add missing dependencies

---
 pkgs/applications/kde/pim-data-exporter.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/kde/pim-data-exporter.nix b/pkgs/applications/kde/pim-data-exporter.nix
index d17ffb3c044..9f2117b41fb 100644
--- a/pkgs/applications/kde/pim-data-exporter.nix
+++ b/pkgs/applications/kde/pim-data-exporter.nix
@@ -1,10 +1,10 @@
 {
   mkDerivation, lib, kdepimTeam,
   extra-cmake-modules, kdoctools,
-  akonadi, kcmutils, kcrash, kdbusaddons, kidentitymanagement, kldap,
-  kmailtransport, knewstuff, knotifications, knotifyconfig, kparts, kross, ktexteditor,
-  kwallet, libkdepim, libkleo, pimcommon, qttools,
-  karchive, mailcommon, messagelib
+  akonadi, akonadi-notes, kcalcore, kcmutils, kcrash, kdbusaddons,
+  kidentitymanagement, kldap, kmailtransport, knewstuff, knotifications,
+  knotifyconfig, kparts, kross, ktexteditor, kwallet, libkdepim, libkleo,
+  pimcommon, qttools, karchive, mailcommon, messagelib
 }:
 
 mkDerivation {
@@ -15,8 +15,9 @@ mkDerivation {
   };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
-    akonadi kcmutils kcrash kdbusaddons kidentitymanagement kldap kmailtransport
-    knewstuff knotifications knotifyconfig kparts kross ktexteditor kwallet libkdepim
-    libkleo pimcommon qttools karchive mailcommon messagelib
+    akonadi akonadi-notes kcalcore kcmutils kcrash kdbusaddons
+    kidentitymanagement kldap kmailtransport knewstuff knotifications
+    knotifyconfig kparts kross ktexteditor kwallet libkdepim libkleo pimcommon
+    qttools karchive mailcommon messagelib
   ];
 }
-- 
GitLab


From b000d00d6c43c891900b03ce71f3d3018456def3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 08:43:54 -0700
Subject: [PATCH 1143/2254] libivykis: 0.42.3 -> 0.42.4

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libivykis/versions
---
 pkgs/development/libraries/libivykis/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libivykis/default.nix b/pkgs/development/libraries/libivykis/default.nix
index bd1432b8a21..17cca74c7d2 100644
--- a/pkgs/development/libraries/libivykis/default.nix
+++ b/pkgs/development/libraries/libivykis/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
   pname = "libivykis";
 
-  version = "0.42.3";
+  version = "0.42.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/libivykis/${version}/ivykis-${version}.tar.gz";
-    sha256 = "1v0ajkm531v4zxzn2x90yb5ab81ssqv2y0fib24wbsggbkajbc69";
+    sha256 = "0abi0rc3wnncvr68hy6rmzp96x6napd7fs1mff20dr8lb0jyvy3f";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
-- 
GitLab


From 4103b304f96865d45fa4d42428ed893a10d8be70 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 09:12:47 -0700
Subject: [PATCH 1144/2254] libdvbpsi: 1.3.2 -> 1.3.3

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libdvbpsi/versions
---
 pkgs/development/libraries/libdvbpsi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libdvbpsi/default.nix b/pkgs/development/libraries/libdvbpsi/default.nix
index aed6f05fec4..3a83d01353f 100644
--- a/pkgs/development/libraries/libdvbpsi/default.nix
+++ b/pkgs/development/libraries/libdvbpsi/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libdvbpsi";
-  version = "1.3.2";
+  version = "1.3.3";
 
   src = fetchurl {
     url = "http://get.videolan.org/libdvbpsi/${version}/${pname}-${version}.tar.bz2";
-    sha256 = "1zn5hfv4qbahmydbwh59a3b480s3m5ss27r6ml35gqdip7r3jkmc";
+    sha256 = "04h1l3vrkrdsrvkgzcr51adk10g6hxcxvgjphyyxz718ry5rkd82";
   };
 
   meta = {
-- 
GitLab


From f5e74b4cd223a785e5f3dc6a09f6de8e03634453 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 09:18:57 -0700
Subject: [PATCH 1145/2254] libpwquality: 1.4.0 -> 1.4.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libpwquality/versions
---
 pkgs/development/libraries/libpwquality/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libpwquality/default.nix b/pkgs/development/libraries/libpwquality/default.nix
index 60c01565e63..df3595adc01 100644
--- a/pkgs/development/libraries/libpwquality/default.nix
+++ b/pkgs/development/libraries/libpwquality/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libpwquality";
-  version = "1.4.0";
+  version = "1.4.1";
 
   src = fetchFromGitHub {
     owner = "libpwquality";
     repo = "libpwquality";
     rev = "${pname}-${version}";
-    sha256 = "0k564hj2q13z5ag8cj6rnkzm1na7001k4chz4f736p6aqvspv0bd";
+    sha256 = "150gk1d0gq9cig3ylyns7fgihgm3qb1basncahgyh1kzxplrdqm7";
   };
 
   nativeBuildInputs = [ autoreconfHook perl ];
-- 
GitLab


From 5515661c4e4a42ed26b23321c5feb2ba2d6af0b9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 09:24:14 -0700
Subject: [PATCH 1146/2254] librsync: 2.0.2 -> 2.1.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/librsync/versions
---
 pkgs/development/libraries/librsync/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/librsync/default.nix b/pkgs/development/libraries/librsync/default.nix
index 79b05619ac5..6c958feab77 100644
--- a/pkgs/development/libraries/librsync/default.nix
+++ b/pkgs/development/libraries/librsync/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "librsync";
-  version = "2.0.2";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "librsync";
     repo = "librsync";
     rev = "v${version}";
-    sha256 = "1qnr4rk93mhggqjh2025clmlhhgnjhq983p1vbh8i1g8aiqdnapi";
+    sha256 = "03ncx7a2zd93b3jaq7b62nwn8qcwmf04jfvljnpxj5wsxl2agkp7";
   };
 
   nativeBuildInputs = [ cmake ];
-- 
GitLab


From dcfec377e987f2f62123bf63c29ba1cc26d40e8f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 09:32:28 -0700
Subject: [PATCH 1147/2254] libosmium: 2.15.2 -> 2.15.3

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libosmium/versions
---
 pkgs/development/libraries/libosmium/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libosmium/default.nix b/pkgs/development/libraries/libosmium/default.nix
index eeb8fec5f93..8005fb9dbbe 100644
--- a/pkgs/development/libraries/libosmium/default.nix
+++ b/pkgs/development/libraries/libosmium/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libosmium";
-  version = "2.15.2";
+  version = "2.15.3";
 
   src = fetchFromGitHub {
     owner = "osmcode";
     repo = "libosmium";
     rev = "v${version}";
-    sha256 = "1fh8wl4grs1c0g9whx90kd4jva3k9b6zbb1cl3isay489gwndgss";
+    sha256 = "14xpzac93f8pqjkz1r0ckqv8h691z5p6pd06wn8ib1aryzc7ps97";
   };
 
   nativeBuildInputs = [ cmake ];
-- 
GitLab


From b55854c0b4df62b0ace46eae18ea14bcc77ae442 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Fri, 27 Sep 2019 17:00:15 +0000
Subject: [PATCH 1148/2254] ghcHEAD: 8.9.20190601 -> 8.9.20190924

Also close pointless diff with 8.8.1.
---
 pkgs/development/compilers/ghc/head.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index b78f5bc2204..565c545e48c 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -27,7 +27,7 @@
 , # Whetherto build terminfo.
   enableTerminfo ? !stdenv.targetPlatform.isWindows
 
-, version ? "8.9.20190601"
+, version ? "8.9.20190924"
 , # What flavour to build. An empty string indicates no
   # specific flavour and falls back to ghc default values.
   ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
@@ -89,8 +89,8 @@ stdenv.mkDerivation (rec {
 
   src = fetchgit {
     url = "https://gitlab.haskell.org/ghc/ghc.git/";
-    rev = "9bc10993bb300d3712b0f13ec6e28621d75d4204";
-    sha256 = "1s7vbinywx8ffj09nxr0h32nggjiqpssrvgmj7820k32w2yi7i8v";
+    rev = "795986aaf33e2ffc233836b86a92a77366c91db2";
+    sha256 = "0a111x6c53r07q5qdg6c8mnydqp0wh4mpxmw7ga4x5wlap8i0bji";
   };
 
   enableParallelBuilding = true;
@@ -183,7 +183,7 @@ stdenv.mkDerivation (rec {
 
   nativeBuildInputs = [
     perl autoconf automake m4 python3 sphinx
-    bootPkgs.ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
+    ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
   ];
 
   # For building runtime libs
@@ -224,14 +224,14 @@ stdenv.mkDerivation (rec {
     inherit enableShared;
 
     # Our Cabal compiler name
-    haskellCompilerName = "ghc-8.7";
+    haskellCompilerName = "ghc-${version}";
   };
 
   meta = {
     homepage = http://haskell.org/ghc;
     description = "The Glasgow Haskell Compiler";
     maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
-    inherit (bootPkgs.ghc.meta) license platforms;
+    inherit (ghc.meta) license platforms;
   };
 
 } // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt {
-- 
GitLab


From e4f975765f24465d13b4d3079f5007a4bf507de8 Mon Sep 17 00:00:00 2001
From: Svein Ove Aas <sveina@gmail.com>
Date: Fri, 27 Sep 2019 18:24:23 +0100
Subject: [PATCH 1149/2254] nixos/zfs: Enable trim by default

---
 nixos/modules/tasks/filesystems/zfs.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix
index 2ed8c5aa292..cfdc0a31020 100644
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@@ -268,7 +268,12 @@ in
     };
 
     services.zfs.trim = {
-      enable = mkEnableOption "Enables periodic TRIM on all ZFS pools.";
+      enable = mkOption {
+        description = "Whether to enable periodic TRIM on all ZFS pools.";
+        default = true;
+        example = false;
+        type = types.bool;
+      };
 
       interval = mkOption {
         default = "weekly";
-- 
GitLab


From 630329f11d297a7c31b90d9afc0fb769d108a6d4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 10:39:30 -0700
Subject: [PATCH 1150/2254] mergerfs: 2.28.1 -> 2.28.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mergerfs/versions
---
 pkgs/tools/filesystems/mergerfs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/mergerfs/default.nix b/pkgs/tools/filesystems/mergerfs/default.nix
index 43c7c167b5e..4a3e860d358 100644
--- a/pkgs/tools/filesystems/mergerfs/default.nix
+++ b/pkgs/tools/filesystems/mergerfs/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "mergerfs";
-  version = "2.28.1";
+  version = "2.28.2";
 
   src = fetchFromGitHub {
     owner = "trapexit";
     repo = pname;
     rev = version;
-    sha256 = "18yc80ccpqf785gah5xw6jg5524wfra8bf3pcjr7idzdz4ca7nvf";
+    sha256 = "14h32acx2fcbyjf1f80vb86q845zwcjszd99a307ybdfhlv18r2m";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From ab77ea0bf25dd1f193c8dd078ef7e90523366135 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Fri, 27 Sep 2019 19:44:32 +0200
Subject: [PATCH 1151/2254] giflib: fix build on darwin by patch submitted
 upstream

It broke by the update in 3605f128.  The patch seems OK on a quick look.
---
 pkgs/development/libraries/giflib/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/giflib/default.nix b/pkgs/development/libraries/giflib/default.nix
index d97477e3f3a..e047bdbb648 100644
--- a/pkgs/development/libraries/giflib/default.nix
+++ b/pkgs/development/libraries/giflib/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, xmlto, docbook_xml_dtd_412, docbook_xsl, libxml2 }:
+{ stdenv, fetchurl, fetchpatch, xmlto, docbook_xml_dtd_412, docbook_xsl, libxml2 }:
 
 stdenv.mkDerivation rec {
   name = "giflib-5.2.1";
@@ -7,6 +7,15 @@ stdenv.mkDerivation rec {
     sha256 = "1gbrg03z1b6rlrvjyc6d41bc8j1bsr7rm8206gb1apscyii5bnii";
   };
 
+  patches = stdenv.lib.optional stdenv.hostPlatform.isDarwin
+    (fetchpatch {
+      # https://sourceforge.net/p/giflib/bugs/133/
+      name = "darwin-soname.patch";
+      url = "https://sourceforge.net/p/giflib/bugs/_discuss/thread/4e811ad29b/c323/attachment/Makefile.patch";
+      sha256 = "12afkqnlkl3n1hywwgx8sqnhp3bz0c5qrwcv8j9hifw1lmfhv67r";
+      extraPrefix = "./";
+    });
+
   postPatch = ''
     substituteInPlace Makefile \
       --replace 'PREFIX = /usr/local' 'PREFIX = ${builtins.placeholder "out"}'
-- 
GitLab


From 2aaea01b2be8e60bd52d79f2ec1d15bc027b7505 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Fri, 27 Sep 2019 10:53:55 -0700
Subject: [PATCH 1152/2254] python3Packages.lammps-cython: fix tests

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

diff --git a/pkgs/development/python-modules/lammps-cython/default.nix b/pkgs/development/python-modules/lammps-cython/default.nix
index 501e4adc21d..df2a122d068 100644
--- a/pkgs/development/python-modules/lammps-cython/default.nix
+++ b/pkgs/development/python-modules/lammps-cython/default.nix
@@ -9,7 +9,7 @@
 , pymatgen
 , ase
 , pytestrunner
-, pytest
+, pytest_4
 , pytestcov
 , isPy3k
 , openssh
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   };
 
   buildInputs = [ cython pytestrunner ];
-  checkInputs = [ pytest pytestcov openssh ];
+  checkInputs = [ pytest_4 pytestcov openssh ];
   propagatedBuildInputs = [ mpi4py pymatgen ase numpy ];
 
   preBuild = ''
-- 
GitLab


From 91ea0393fa2e455b8cc83d7b1370fdd747c04ec2 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Fri, 27 Sep 2019 11:05:27 -0700
Subject: [PATCH 1153/2254] python3Packages.dotnetcore2: 2.1.8.1 -> 2.1.9

---
 pkgs/development/python-modules/dotnetcore2/default.nix   | 4 ++--
 pkgs/development/python-modules/dotnetcore2/runtime.patch | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/dotnetcore2/default.nix b/pkgs/development/python-modules/dotnetcore2/default.nix
index caafeb54740..c885466f5af 100644
--- a/pkgs/development/python-modules/dotnetcore2/default.nix
+++ b/pkgs/development/python-modules/dotnetcore2/default.nix
@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "dotnetcore2";
-  version = "2.1.8.1";
+  version = "2.1.9";
   format = "wheel";
   disabled = isPy27;
 
@@ -15,7 +15,7 @@ buildPythonPackage rec {
     inherit pname version format;
     python = "py3";
     platform = "manylinux1_x86_64";
-    sha256 = "13zrff5j767d3f8drl397sjhl28winsrfa8pa20svf00xfcsy34s";
+    sha256 = "0h1igixk84md68z7gwj1vd6ki4d5drxh0ih5zww8xcr3qh5r0drb";
   };
 
   nativeBuildInputs = [ unzip ];
diff --git a/pkgs/development/python-modules/dotnetcore2/runtime.patch b/pkgs/development/python-modules/dotnetcore2/runtime.patch
index 54322087a78..28cf10e21d1 100644
--- a/pkgs/development/python-modules/dotnetcore2/runtime.patch
+++ b/pkgs/development/python-modules/dotnetcore2/runtime.patch
@@ -1,7 +1,8 @@
-diff a/dotnetcore2/runtime.py b/dotnetcore2/runtime.py
+diff --git a/dotnetcore2/runtime.py b/dotnetcore2/runtime.py
+index 475e2b4..5b578ec 100644
 --- a/dotnetcore2/runtime.py
 +++ b/dotnetcore2/runtime.py
-@@ -39,13 +39,13 @@ def _get_bin_folder() -> str:
+@@ -41,6 +41,7 @@ def _get_bin_folder() -> str:
  
  
  def get_runtime_path():
@@ -9,6 +10,8 @@ diff a/dotnetcore2/runtime.py b/dotnetcore2/runtime.py
      search_string = os.path.join(_get_bin_folder(), 'dotnet*')
      matches = [f for f in glob.glob(search_string, recursive=True)]
      return matches[0]
+@@ -96,8 +97,7 @@ class _FileLock():
+ 
  
  def ensure_dependencies() -> Optional[str]:
 -    if dist is None:
-- 
GitLab


From 97b89a172830f5088f6876d14e80216b8d62cc7d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 11:17:39 -0700
Subject: [PATCH 1154/2254] monetdb: 11.33.3 -> 11.33.11

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/monetdb/versions
---
 pkgs/servers/sql/monetdb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/monetdb/default.nix b/pkgs/servers/sql/monetdb/default.nix
index 245bd811c1a..34ebebbbcc1 100644
--- a/pkgs/servers/sql/monetdb/default.nix
+++ b/pkgs/servers/sql/monetdb/default.nix
@@ -3,7 +3,7 @@
 }:
 
 let
-  version = "11.33.3";
+  version = "11.33.11";
 in stdenv.mkDerivation {
 
   pname = "monetdb";
@@ -11,7 +11,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${version}.tar.bz2";
-    sha256 = "0k0xcm3b5qq2arjfn8f1h020sjkk97qfynsimn848bnl01vscqh8";
+    sha256 = "1fzgf1hplwlki6l6yvrk8an9y4jj40xzl4m5x1d8vi3xr526bzc9";
   };
 
   postPatch = ''
-- 
GitLab


From 53a536c69869e68b1101518a84cf89e3d91e25bc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 11:24:43 -0700
Subject: [PATCH 1155/2254] mu: 1.2 -> 1.3.3

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mu/versions
---
 pkgs/tools/networking/mu/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix
index bd035e8f03c..0ff6a3baa59 100644
--- a/pkgs/tools/networking/mu/default.nix
+++ b/pkgs/tools/networking/mu/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   pname = "mu";
-  version = "1.2";
+  version = "1.3.3";
 
   src = fetchFromGitHub {
     owner  = "djcb";
     repo   = "mu";
     rev    = version;
-    sha256 = "0yhjlj0z23jw3cf2wfnl98y8q6gikvmhkb8vdm87bd7jw0bdnrfz";
+    sha256 = "06z1l27rp3dpyphg3zqg0ww568a4g8iwz01vy4f7rl62asrbglsy";
   };
 
   # test-utils coredumps so don't run those
-- 
GitLab


From f0ccfb1b031803c6a0b778038ed77fdd1de18cf3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 11:35:03 -0700
Subject: [PATCH 1156/2254] memcached: 1.5.16 -> 1.5.18

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/memcached/versions
---
 pkgs/servers/memcached/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix
index a9873261d78..bd1acd36278 100644
--- a/pkgs/servers/memcached/default.nix
+++ b/pkgs/servers/memcached/default.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchurl, cyrus_sasl, libevent}:
 
 stdenv.mkDerivation rec {
-  version = "1.5.16";
+  version = "1.5.18";
   pname = "memcached";
 
   src = fetchurl {
     url = "https://memcached.org/files/${pname}-${version}.tar.gz";
-    sha256 = "0nnccb697jhdn5gqrh3phibzs6xr4nf4ryv7nmyv5vf11n4jr8j5";
+    sha256 = "127g4l0ilb376dpgz6qby24vc72ban35c938dzmp1nh6bdqddgcy";
   };
 
   configureFlags = [
-- 
GitLab


From 8d306d599a66503c02405b557af2c0bb6541ab85 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Fri, 27 Sep 2019 11:10:17 -0700
Subject: [PATCH 1157/2254] pythonPackages.streamz: 0.5.1 -> 0.5.2

---
 .../python-modules/streamz/default.nix        | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/streamz/default.nix b/pkgs/development/python-modules/streamz/default.nix
index 5360b951de2..da77691e354 100644
--- a/pkgs/development/python-modules/streamz/default.nix
+++ b/pkgs/development/python-modules/streamz/default.nix
@@ -5,23 +5,23 @@
 , toolz
 , zict
 , six
-, pytest
+, pytest_4
 , networkx
 , distributed
 , confluent-kafka
 , graphviz
+, requests
 }:
 
 buildPythonPackage rec {
   pname = "streamz";
-  version = "0.5.1";
+  version = "0.5.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "80c9ded1d6e68d3b78339deb6e9baf93a633d84b4a8875221e337ac06890103f";
+    sha256 = "127rpdjgkcyjifmkqbhmqfbzlgi32n54rybrdxja610qr906y40c";
   };
 
-  checkInputs = [ pytest networkx distributed confluent-kafka graphviz ];
   propagatedBuildInputs = [
     tornado
     toolz
@@ -29,6 +29,15 @@ buildPythonPackage rec {
     six
   ];
 
+  checkInputs = [
+    confluent-kafka
+    distributed
+    graphviz
+    networkx
+    pytest_4
+    requests
+  ];
+
   # Disable test_tcp_async because fails on sandbox build
   checkPhase = ''
     pytest --deselect=streamz/tests/test_sources.py::test_tcp_async \
@@ -37,7 +46,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Pipelines to manage continuous streams of data";
-    homepage = https://github.com/mrocklin/streamz/;
+    homepage = "https://github.com/mrocklin/streamz";
     license = licenses.bsd3;
     maintainers = [ maintainers.costrouc ];
   };
-- 
GitLab


From dc5ed50dbf732433c7a59e516227d8b45c17238a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 11:20:52 -0700
Subject: [PATCH 1158/2254] mtprotoproxy: 1.0.5 -> 1.0.6

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mtprotoproxy/versions
---
 pkgs/servers/mtprotoproxy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/mtprotoproxy/default.nix b/pkgs/servers/mtprotoproxy/default.nix
index 9131715113d..e5aba6f95a0 100644
--- a/pkgs/servers/mtprotoproxy/default.nix
+++ b/pkgs/servers/mtprotoproxy/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "mtprotoproxy";
-  version = "1.0.5";
+  version = "1.0.6";
 
   src = fetchFromGitHub {
     owner = "alexbers";
     repo = "mtprotoproxy";
     rev = "v${version}";
-    sha256 = "11jaz01cagmqadyxkks7dx41ggg6pp2l1ia9npqyrl2xhcxm5b0x";
+    sha256 = "1i8v6w79ad3xn9dnn144q93vcs23cj0m7hj3x33i16hxz325zb9y";
   };
 
   nativeBuildInputs = [ wrapPython ];
-- 
GitLab


From 1421ec2340206c3bcf7500060c9f4c626b73805c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 12:43:35 -0700
Subject: [PATCH 1159/2254] ntl: 11.3.2 -> 11.3.4

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/ntl/versions
---
 pkgs/development/libraries/ntl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/ntl/default.nix b/pkgs/development/libraries/ntl/default.nix
index e83fe2e7e7b..efb307507a3 100644
--- a/pkgs/development/libraries/ntl/default.nix
+++ b/pkgs/development/libraries/ntl/default.nix
@@ -14,11 +14,11 @@ assert withGf2x -> gf2x != null;
 
 stdenv.mkDerivation rec {
   pname = "ntl";
-  version = "11.3.2";
+  version = "11.3.4";
 
   src = fetchurl {
     url = "http://www.shoup.net/ntl/ntl-${version}.tar.gz";
-    sha256 = "17bfsvn72zjqfibnxscyf4hbk3inndh4r89jd2zg7mgqmd2k3fl4";
+    sha256 = "0fdy63x6iglp20ypqhkpjj6wqjzpxlyl2wfw2dqlgiy6l6ibm4rd";
   };
 
   buildInputs = [
-- 
GitLab


From 2d0f8a0f0cc24f280d04e9ec5472fa9153f3b52b Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Fri, 27 Sep 2019 15:55:29 -0400
Subject: [PATCH 1160/2254] jetbrains.clion: 2019.2.1 -> 2019.2.3

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 95cf627c2f6..74435057898 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -250,12 +250,12 @@ in
 
   clion = buildClion rec {
     name = "clion-${version}";
-    version = "2019.2.1"; /* updated by script */
+    version = "2019.2.3"; /* updated by script */
     description  = "C/C++ IDE. New. Intelligent. Cross-platform";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
-      sha256 = "13y2c3vzlklwz9cd7anpfdc3dqwh714xivm1g59s6p4x9sy172lp"; /* updated by script */
+      sha256 = "0kiqbcx64rlz1pajbn326zwy0d1vxdxpvk5xpqkcj7nva611pdq1"; /* updated by script */
     };
     wmClass = "jetbrains-clion";
     update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml
-- 
GitLab


From 403dc59d547a0c2c9b99508b625f467c969c9d5c Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Fri, 27 Sep 2019 15:55:46 -0400
Subject: [PATCH 1161/2254] jetbrains.datagrip: 2019.2.3 -> 2019.2.5

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 74435057898..351c71a36fa 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -263,12 +263,12 @@ in
 
   datagrip = buildDataGrip rec {
     name = "datagrip-${version}";
-    version = "2019.2.3"; /* updated by script */
+    version = "2019.2.5"; /* updated by script */
     description = "Your Swiss Army Knife for Databases and SQL";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/datagrip/${name}.tar.gz";
-      sha256 = "04zhasf22wb3nd6p5zrwa84vbcnbrr40sjlm8djsabhskmy7f6pc"; /* updated by script */
+      sha256 = "18frmlchalpvc55j25ig2slf2h33gwmbmm8dvc29jb3kgsl0ny7p"; /* updated by script */
     };
     wmClass = "jetbrains-datagrip";
     update-channel = "DataGrip RELEASE";
-- 
GitLab


From 5ebf7e414ebd521ee01660a70d6cb5cb9066131c Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Fri, 27 Sep 2019 15:56:05 -0400
Subject: [PATCH 1162/2254] jetbrains.goland: 2019.2.1 -> 2019.2.2

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 351c71a36fa..77e644b8683 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -276,12 +276,12 @@ in
 
   goland = buildGoland rec {
     name = "goland-${version}";
-    version = "2019.2.1"; /* updated by script */
+    version = "2019.2.2"; /* updated by script */
     description = "Up and Coming Go IDE";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/go/${name}.tar.gz";
-      sha256 = "16wmsf6c8x95d050grqgv6aaxlkc6pqhbqzlz6fzsngjnbkn64yj"; /* updated by script */
+      sha256 = "1wq1prgfn6wc7lc6qjhiykm62c56yrb5rv0hyylcsgdw0q3ns6z2"; /* updated by script */
     };
     wmClass = "jetbrains-goland";
     update-channel = "GoLand RELEASE";
-- 
GitLab


From a92aed3386d1743036d1053b2f7292df8815d612 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Fri, 27 Sep 2019 15:56:22 -0400
Subject: [PATCH 1163/2254] jetbrains.idea-community: 2019.2.2 -> 2019.2.3

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 77e644b8683..12e47d4eae4 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -289,12 +289,12 @@ in
 
   idea-community = buildIdea rec {
     name = "idea-community-${version}";
-    version = "2019.2.2"; /* updated by script */
+    version = "2019.2.3"; /* updated by script */
     description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
-      sha256 = "1bqzfg2yk12wq523nw4s8zxjzcbl9hrdlk2jd9vywjbaa4ll4bgs"; /* updated by script */
+      sha256 = "0gy42x49yhdnp4ks6445xbc24dxw2vxnl12hdyx03mszdv0r58ni"; /* updated by script */
     };
     wmClass = "jetbrains-idea-ce";
     update-channel = "IntelliJ IDEA RELEASE";
-- 
GitLab


From 2cffced76af9c5f06139661caabbbb85cc53da6b Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Fri, 27 Sep 2019 15:56:40 -0400
Subject: [PATCH 1164/2254] jetbrains.idea-ultimate: 2019.2.2 -> 2019.2.3

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 12e47d4eae4..ac365d0aedd 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -302,12 +302,12 @@ in
 
   idea-ultimate = buildIdea rec {
     name = "idea-ultimate-${version}";
-    version = "2019.2.2"; /* updated by script */
+    version = "2019.2.3"; /* updated by script */
     description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz";
-      sha256 = "139im0w34wy9d1lplq1k2k6gmlav4n6nxdchxm3zqhx2isq4qx2f"; /* updated by script */
+      sha256 = "0allnibq8van3n1c5y85gscbpls0wshwffa6b2l2andw1jkhc259"; /* updated by script */
     };
     wmClass = "jetbrains-idea";
     update-channel = "IntelliJ IDEA RELEASE";
-- 
GitLab


From a440d6d7f19592db482ecace37d021fcaffcaacf Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Fri, 27 Sep 2019 15:57:03 -0400
Subject: [PATCH 1165/2254] jetbrains.phpstorm: 2019.2.1 -> 2019.2.3

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index ac365d0aedd..676f488547e 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -315,12 +315,12 @@ in
 
   phpstorm = buildPhpStorm rec {
     name = "phpstorm-${version}";
-    version = "2019.2.1"; /* updated by script */
+    version = "2019.2.3"; /* updated by script */
     description = "Professional IDE for Web and PHP developers";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
-      sha256 = "1m198p6586dych6mrgwqxs486qndypsmnikl0rxx45ddrwfjl42g"; /* updated by script */
+      sha256 = "0pra0hmyczxcxnvsc7rqiwhwj23ckx97c9m1wcyn7ik612xwik1i"; /* updated by script */
     };
     wmClass = "jetbrains-phpstorm";
     update-channel = "PhpStorm RELEASE";
-- 
GitLab


From ac3c6be8b80675547dcc90cb5ef12ad7e97d66b9 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Fri, 27 Sep 2019 15:57:20 -0400
Subject: [PATCH 1166/2254] jetbrains.pycharm-community: 2019.2.1 -> 2019.2.3

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 676f488547e..34e23490b23 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -328,12 +328,12 @@ in
 
   pycharm-community = buildPycharm rec {
     name = "pycharm-community-${version}";
-    version = "2019.2.1"; /* updated by script */
+    version = "2019.2.3"; /* updated by script */
     description = "PyCharm Community Edition";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "https://download.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "0a3fi2wjj0166199pyhvvpaih9nx0xr6q7zf7jfj8i7khpkdk8i5"; /* updated by script */
+      sha256 = "02fynwi54libibgigwggh6xaf5p4046n0kjsqsck1kjbnrlghp10"; /* updated by script */
     };
     wmClass = "jetbrains-pycharm-ce";
     update-channel = "PyCharm RELEASE";
-- 
GitLab


From 4b6774a327d3cd47a4e4a0e709d1dff46685678f Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Fri, 27 Sep 2019 15:57:37 -0400
Subject: [PATCH 1167/2254] jetbrains.pycharm-professional: 2019.2.1 ->
 2019.2.3

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 34e23490b23..dab1f685088 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -341,12 +341,12 @@ in
 
   pycharm-professional = buildPycharm rec {
     name = "pycharm-professional-${version}";
-    version = "2019.2.1"; /* updated by script */
+    version = "2019.2.3"; /* updated by script */
     description = "PyCharm Professional Edition";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "03i7qi0kcnx0irih468xaz7hzicaa5yh399r676drs22ak23qwrq"; /* updated by script */
+      sha256 = "19i3ll8p69n7jw7psv2nkhjq899gljwmc5ixpqhyl203rykavb7n"; /* updated by script */
     };
     wmClass = "jetbrains-pycharm";
     update-channel = "PyCharm RELEASE";
-- 
GitLab


From f3d611f108cd4e5237018df056d332a5cf9e4af9 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Fri, 27 Sep 2019 15:57:53 -0400
Subject: [PATCH 1168/2254] jetbrains.ruby-mine: 2019.2.1 -> 2019.2.3

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index dab1f685088..9105928a500 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -367,12 +367,12 @@ in
 
   ruby-mine = buildRubyMine rec {
     name = "ruby-mine-${version}";
-    version = "2019.2.1"; /* updated by script */
+    version = "2019.2.3"; /* updated by script */
     description = "The Most Intelligent Ruby and Rails IDE";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz";
-      sha256 = "0l0kwc1mih55px8j6bvp1g3pxrv0scd9vpydwvkaqmq5x0r1n3jf"; /* updated by script */
+      sha256 = "0g8yxsq9xn8l8wnmcm0y5y0ll5081s83mmwrb62k4bldlsr25iba"; /* updated by script */
     };
     wmClass = "jetbrains-rubymine";
     update-channel = "RubyMine RELEASE";
-- 
GitLab


From 6b91398870ce9d55ae6af79d493f8f458307e0f4 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Fri, 27 Sep 2019 15:58:04 -0400
Subject: [PATCH 1169/2254] jetbrains.webstorm: 2019.2.1 -> 2019.2.3

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 9105928a500..3b6418877ee 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -380,12 +380,12 @@ in
 
   webstorm = buildWebStorm rec {
     name = "webstorm-${version}";
-    version = "2019.2.1"; /* updated by script */
+    version = "2019.2.3"; /* updated by script */
     description = "Professional IDE for Web and JavaScript development";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz";
-      sha256 = "1wwy32xq332vwx70v7haa5mvrq1wq8mk5icdpgp5l6pqkzy5xayn"; /* updated by script */
+      sha256 = "0l3c3b1d53b3w90d4g99pjw8vmjj716jjaxsv4hy53shh1ncd55g"; /* updated by script */
     };
     wmClass = "jetbrains-webstorm";
     update-channel = "WebStorm RELEASE";
-- 
GitLab


From 05699ac87883b8f6022f3967fd88f9bb01e8f58d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 12:58:51 -0700
Subject: [PATCH 1170/2254] nbd: 3.19 -> 3.20

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/nbd/versions
---
 pkgs/tools/networking/nbd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix
index f9df781715a..9c443696eda 100644
--- a/pkgs/tools/networking/nbd/default.nix
+++ b/pkgs/tools/networking/nbd/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, glib, which }:
 
 stdenv.mkDerivation rec {
-  name = "nbd-3.19";
+  name = "nbd-3.20";
 
   src = fetchurl {
     url = "mirror://sourceforge/nbd/${name}.tar.xz";
-    sha256 = "1446rdg490fxd8mg5gvrf4nddbw1w7lf2daxy9cpc19yy4968iml";
+    sha256 = "1kfnyx52nna2mnw264njk1dl2zc8m78sz031yp65mbmpi99v7qg0";
   };
 
   buildInputs = [ glib ]
-- 
GitLab


From c43c2d67fe8038b3e13602b1db3c845244551ee3 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Fri, 27 Sep 2019 16:01:58 -0400
Subject: [PATCH 1171/2254] jetbrains.jdk: 451 -> 485.1

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

diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix
index 24bbb59c700..1e323c1c2b2 100644
--- a/pkgs/development/compilers/jetbrains-jdk/default.nix
+++ b/pkgs/development/compilers/jetbrains-jdk/default.nix
@@ -7,12 +7,12 @@
 
 let drv = stdenv.mkDerivation rec {
   pname = "jetbrainsjdk";
-  version = "451";
+  version = "485.1";
 
   src = if stdenv.hostPlatform.system == "x86_64-linux" then
     fetchurl {
       url = "https://bintray.com/jetbrains/intellij-jbr/download_file?file_path=jbrsdk-11_0_4-linux-x64-b${version}.tar.gz";
-      sha256 = "05khf817i8lywfdp68a6lniv8hgi20rmnxqp3963k6vw41ar9qba";
+      sha256 = "18jnn0dra9nsnyllwq0ljxzr58k2pg8d0kg10y39vnxwccic4f76";
     }
   else
     throw "unsupported system: ${stdenv.hostPlatform.system}";
-- 
GitLab


From 55e9675187b58daa5fbd63e7605518e3e9181113 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Fri, 27 Sep 2019 16:06:59 -0400
Subject: [PATCH 1172/2254] pantheon.elementary-greeter: hardcode fallback
 wallpaper

Workaround https://github.com/elementary/greeter/issues/360
---
 .../desktop/elementary-greeter/default.nix    |  6 +++++
 .../hardcode-fallback-background.patch        | 22 +++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/desktops/pantheon/desktop/elementary-greeter/hardcode-fallback-background.patch

diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
index 963418feec0..5241aded066 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
@@ -1,6 +1,7 @@
 { stdenv
 , fetchFromGitHub
 , linkFarm
+, substituteAll
 , elementary-greeter
 , pantheon
 , pkgconfig
@@ -86,6 +87,11 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./sysconfdir-install.patch
+    # Needed until https://github.com/elementary/greeter/issues/360 is fixed
+    (substituteAll {
+      src = ./hardcode-fallback-background.patch;
+      default_wallpaper = "${nixos-artwork.wallpapers.simple-dark-gray}/share/artwork/gnome/nix-wallpaper-simple-dark-gray.png";
+    })
   ];
 
   preFixup = ''
diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/hardcode-fallback-background.patch b/pkgs/desktops/pantheon/desktop/elementary-greeter/hardcode-fallback-background.patch
new file mode 100644
index 00000000000..556a0fc82a1
--- /dev/null
+++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/hardcode-fallback-background.patch
@@ -0,0 +1,22 @@
+diff --git a/src/Cards/BackgroundImage.vala b/src/Cards/BackgroundImage.vala
+index b57fb4d..ddfd56c 100644
+--- a/src/Cards/BackgroundImage.vala
++++ b/src/Cards/BackgroundImage.vala
+@@ -9,7 +9,7 @@ public class Greeter.BackgroundImage : Gtk.EventBox {
+ 
+     public BackgroundImage (string? path) {
+         if (path == null) {
+-            path = "/usr/share/backgrounds/elementaryos-default";
++            path = "@default_wallpaper@";
+         }
+ 
+         try {
+@@ -19,7 +19,7 @@ public class Greeter.BackgroundImage : Gtk.EventBox {
+             critical ("Fallback to default wallpaper");
+ 
+             try {
+-                full_pixbuf = new Gdk.Pixbuf.from_file ("/usr/share/backgrounds/elementaryos-default");
++                full_pixbuf = new Gdk.Pixbuf.from_file ("@default_wallpaper");
+             } catch (GLib.Error e) {
+                 critical (e.message);
+             }
-- 
GitLab


From 4ac8b052a7d6d09711101ef0b308d76621d07f3e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 13:25:41 -0700
Subject: [PATCH 1173/2254] neo4j: 3.5.8 -> 3.5.11

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/neo4j/versions
---
 pkgs/servers/nosql/neo4j/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix
index f471017a336..ecc36dc283d 100644
--- a/pkgs/servers/nosql/neo4j/default.nix
+++ b/pkgs/servers/nosql/neo4j/default.nix
@@ -4,11 +4,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "neo4j";
-  version = "3.5.8";
+  version = "3.5.11";
 
   src = fetchurl {
     url = "https://neo4j.com/artifact.php?name=neo4j-community-${version}-unix.tar.gz";
-    sha256 = "0kj92vljxdhk9pf6gr9cvd2a2ilc4myp5djjkrj3gm37f074swgg";
+    sha256 = "0xk37rvb37rd7pwpv4ingmb2v6ad1kqka8ldmd16n89fqfvg5m2d";
   };
 
   buildInputs = [ makeWrapper jre8 which gawk ];
-- 
GitLab


From a913e749dbdf923986654e5ca54ba6516a96f475 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 13:37:13 -0700
Subject: [PATCH 1174/2254] nx-libs: 3.5.99.21 -> 3.5.99.22

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/nx-libs/versions
---
 pkgs/tools/X11/nx-libs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/X11/nx-libs/default.nix b/pkgs/tools/X11/nx-libs/default.nix
index c2bcfe788e6..77aada9f83f 100644
--- a/pkgs/tools/X11/nx-libs/default.nix
+++ b/pkgs/tools/X11/nx-libs/default.nix
@@ -2,12 +2,12 @@
   libpng, libtool, libxml2, pkgconfig, which, xorg }:
 stdenv.mkDerivation rec {
   pname = "nx-libs";
-  version = "3.5.99.21";
+  version = "3.5.99.22";
   src = fetchFromGitHub {
     owner = "ArcticaProject";
     repo = "nx-libs";
     rev = version;
-    sha256 = "10xid8mhhid5mrap5jb51k9fm63cm03ss4k4sfymc8zsn0wrqnr9";
+    sha256 = "0ipq93s2knv2xbb919d777mrc7v4k9l5bk0d4x6ji1bgispfa7jl";
   };
 
   nativeBuildInputs = [ autoconf automake libtool pkgconfig which
-- 
GitLab


From b9c6124da0580073dd42f431ceb6acb3850d88e7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 13:47:39 -0700
Subject: [PATCH 1175/2254] minixml: 3.0 -> 3.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mxml/versions
---
 pkgs/development/libraries/minixml/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/minixml/default.nix b/pkgs/development/libraries/minixml/default.nix
index 5bdacbba11d..73b045aa964 100644
--- a/pkgs/development/libraries/minixml/default.nix
+++ b/pkgs/development/libraries/minixml/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "mxml";
-  version = "3.0";
+  version = "3.1";
 
   src = fetchFromGitHub {
     owner = "michaelrsweet";
     repo = "mxml";
     rev = "v${version}";
-    sha256 = "0madp2v2md3xq96aham91byns6qy4byd5pbg28q827fdahfhpmq7";
+    sha256 = "1kv36fxxh7bwfydhb90zjgsrvpyzvx1p5d0ayfvd3j8gip2rjhnp";
   };
 
   enableParallelBuilding = true;
-- 
GitLab


From 31a2c2f0e3cdb1086398113f6ef909446c6b39af Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 13:59:32 -0700
Subject: [PATCH 1176/2254] numix-icon-theme-square: 19.02.22 -> 19.05.07

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/numix-icon-theme-square/versions
---
 pkgs/data/icons/numix-icon-theme-square/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix
index ddec15e5f31..08b30847603 100644
--- a/pkgs/data/icons/numix-icon-theme-square/default.nix
+++ b/pkgs/data/icons/numix-icon-theme-square/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "numix-icon-theme-square";
-  version = "19.02.22";
+  version = "19.05.07";
 
   src = fetchFromGitHub {
     owner = "numixproject";
     repo = pname;
     rev = version;
-    sha256 = "0qn0s7cd795pm0hbx85gxd1s272zxrzf3r9r6da54h149v3wkgzw";
+    sha256 = "13wxy36qys439pv0xaynqvmjshnfrk9wa89iw878ibvfj506ji2s";
   };
 
   nativeBuildInputs = [ gtk3 numix-icon-theme ];
-- 
GitLab


From 1506d02857866db284b3c1a42415acbebb59d9c3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 14:15:34 -0700
Subject: [PATCH 1177/2254] ncmpc: 0.34 -> 0.35

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/ncmpc/versions
---
 pkgs/applications/audio/ncmpc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix
index d89b61aa21f..4fa9626332b 100644
--- a/pkgs/applications/audio/ncmpc/default.nix
+++ b/pkgs/applications/audio/ncmpc/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ncmpc";
-  version = "0.34";
+  version = "0.35";
 
   src = fetchFromGitHub {
     owner  = "MusicPlayerDaemon";
     repo   = "ncmpc";
     rev    = "v${version}";
-    sha256 = "0ffby37qdg251c1w0vl6rmd13akbydnf12468z4vrl0ybwfd7fc4";
+    sha256 = "0hhc5snxy5fbg47ynz4b7fkmzdy974zxqr0cqc6kh15yvbr25ikh";
   };
 
   buildInputs = [ glib ncurses mpd_clientlib boost ];
-- 
GitLab


From 15da9ce14974f0a2859e598f2740c48428c8ea27 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 14:23:24 -0700
Subject: [PATCH 1178/2254] obs-studio: 23.2.1 -> 24.0.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/obs-studio/versions
---
 pkgs/applications/video/obs-studio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index 5e7cf9353b2..72aa59571bf 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -37,13 +37,13 @@ let
   optional = stdenv.lib.optional;
 in mkDerivation rec {
   pname = "obs-studio";
-  version = "23.2.1";
+  version = "24.0.1";
 
   src = fetchFromGitHub {
     owner = "jp9000";
     repo = "obs-studio";
     rev = version;
-    sha256 = "05brixq2z98mvn1q2rgdl27xj798509nv8yh6h0yzqyk9gly4anz";
+    sha256 = "056s0hs1ds3c57sc0gy39dxaxvwlakl3w25jxgawh0fs99211ar5";
   };
 
   nativeBuildInputs = [ cmake
-- 
GitLab


From 899d76408c13c6f35e19653028e1ce022fb5fed2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 14:29:12 -0700
Subject: [PATCH 1179/2254] nwipe: 0.25 -> 0.26

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/nwipe/versions
---
 pkgs/tools/security/nwipe/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/nwipe/default.nix b/pkgs/tools/security/nwipe/default.nix
index caaa5eba86a..62d7fb3b34a 100644
--- a/pkgs/tools/security/nwipe/default.nix
+++ b/pkgs/tools/security/nwipe/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub, ncurses, parted, automake, autoconf, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  version = "0.25";
+  version = "0.26";
   pname = "nwipe";
   src = fetchFromGitHub {
     owner = "martijnvanbrummelen";
     repo = "nwipe";
     rev = "v${version}";
-    sha256 = "1hx041arw82k814g9r8dqsfi736mj5nlzp2zpi8n2qfqfc1q8nir";
+    sha256 = "072gg7hafq4vncpgm62yswshg6qgbi9mg2hl0p22c7if908p4vaa";
   };
   nativeBuildInputs = [ automake autoconf pkgconfig ];
   buildInputs = [ ncurses parted ];
-- 
GitLab


From b93dd3d2c5424f5f75e2d2743dcb5e7648a03395 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 14:32:40 -0700
Subject: [PATCH 1180/2254] nagios: 4.4.4 -> 4.4.5

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/nagios/versions
---
 pkgs/servers/monitoring/nagios/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/servers/monitoring/nagios/default.nix
index 475d79a090a..693e67ee6dd 100644
--- a/pkgs/servers/monitoring/nagios/default.nix
+++ b/pkgs/servers/monitoring/nagios/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "nagios";
-  version = "4.4.4";
+  version = "4.4.5";
 
   src = fetchurl {
     url = "mirror://sourceforge/nagios/nagios-4.x/${pname}-${version}/${pname}-${version}.tar.gz";
-    sha256 = "0nkbv8lzpiknddiq0466dlpp3hw8lqmaidk8931hp4664cdsaw57";
+    sha256 = "079rgi3dqdg6h511c96hrch62rxsap9p4x37hm2nj672zb9f4sdz";
   };
 
   patches = [ ./nagios.patch ];
-- 
GitLab


From 923812e662924e6842a44886b0b38d0dfc6ecae8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 14:37:48 -0700
Subject: [PATCH 1181/2254] numix-icon-theme-circle: 19.02.22 -> 19.05.07

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/numix-icon-theme-circle/versions
---
 pkgs/data/icons/numix-icon-theme-circle/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix
index b545856f703..76cf450e1cc 100644
--- a/pkgs/data/icons/numix-icon-theme-circle/default.nix
+++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "numix-icon-theme-circle";
-  version = "19.02.22";
+  version = "19.05.07";
 
   src = fetchFromGitHub {
     owner = "numixproject";
     repo = pname;
     rev = version;
-    sha256 = "10jh633rllp9yjfkjjyf8455n84q7ppxw1kk9dp1rsg4dq327ks7";
+    sha256 = "04h7kp1895rkfaqrgzrpqjmqamkxv3dkmhslgm2cxsa6qc0wammg";
   };
 
   nativeBuildInputs = [ gtk3 numix-icon-theme ];
-- 
GitLab


From e4cce87fbaff0c6f13ca391f5c1d0c4760e31648 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Fri, 27 Sep 2019 17:42:39 -0400
Subject: [PATCH 1182/2254] nixos/gdm: update description

GDM isn't dangerous anymore in NixOS.
---
 nixos/modules/services/x11/display-managers/gdm.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index 0a5d52e319e..6c785396613 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -42,10 +42,7 @@ in
     services.xserver.displayManager.gdm = {
 
       enable = mkEnableOption ''
-        GDM as the display manager.
-        <emphasis>GDM in NixOS is not well-tested with desktops other
-        than GNOME, so use with caution, as it could render the
-        system unusable.</emphasis>
+        GDM, the GNOME Display Manager
       '';
 
       debug = mkEnableOption ''
-- 
GitLab


From ef3f4af0f1d6c029593f336bfde42537dd9e8024 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 12:03:39 -0700
Subject: [PATCH 1183/2254] lttng-ust: 2.10.4 -> 2.10.5

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/lttng-ust/versions
---
 pkgs/development/tools/misc/lttng-ust/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/lttng-ust/default.nix b/pkgs/development/tools/misc/lttng-ust/default.nix
index ad5276e5e1a..4b0be0f0fa4 100644
--- a/pkgs/development/tools/misc/lttng-ust/default.nix
+++ b/pkgs/development/tools/misc/lttng-ust/default.nix
@@ -13,11 +13,11 @@
 
 stdenv.mkDerivation rec {
   pname = "lttng-ust";
-  version = "2.10.4";
+  version = "2.10.5";
 
   src = fetchurl {
     url = "https://lttng.org/files/lttng-ust/${pname}-${version}.tar.bz2";
-    sha256 = "0rx9q5r9qcdx3i9i0rx28p33yl52sd6f35qj7qs4li2w42xv9mbm";
+    sha256 = "0ddwk0nl28bkv2xb78gz16a2bvlpfbjmzwfbgwf5p1cq46dyvy86";
   };
 
   buildInputs = [ python ];
-- 
GitLab


From d8f5f0e349344e1ae86d155f83b4f6a8426a9928 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 15:21:06 -0700
Subject: [PATCH 1184/2254] powerdns: 4.1.13 -> 4.2.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/powerdns/versions
---
 pkgs/servers/dns/powerdns/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/dns/powerdns/default.nix b/pkgs/servers/dns/powerdns/default.nix
index 1b23f652021..5bfb06cb15b 100644
--- a/pkgs/servers/dns/powerdns/default.nix
+++ b/pkgs/servers/dns/powerdns/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "powerdns";
-  version = "4.1.13";
+  version = "4.2.0";
 
   src = fetchurl {
     url = "https://downloads.powerdns.com/releases/pdns-${version}.tar.bz2";
-    sha256 = "09az5yp5d9wvzw8faifyzsljhmmc8ifm4j70m4n2sr83i9i9rsp7";
+    sha256 = "0flhia156vir03np8va53rw31jsbg9wz3dyqqwddgai5bvr0f812";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From 1d67d6474c898181cde32084b66a26592f70af92 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 15:37:04 -0700
Subject: [PATCH 1185/2254] openapi-generator-cli: 4.1.0 -> 4.1.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/openapi-generator-cli/versions
---
 pkgs/tools/networking/openapi-generator-cli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/openapi-generator-cli/default.nix b/pkgs/tools/networking/openapi-generator-cli/default.nix
index 38255a68ffe..5fd1172778e 100644
--- a/pkgs/tools/networking/openapi-generator-cli/default.nix
+++ b/pkgs/tools/networking/openapi-generator-cli/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, jre, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  version = "4.1.0";
+  version = "4.1.2";
   pname = "openapi-generator-cli";
 
   jarfilename = "${pname}-${version}.jar";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://central.maven.org/maven2/org/openapitools/${pname}/${version}/${jarfilename}";
-    sha256 = "0pkibvhk1f999mg1zv2ikxzjpkrrbb0wwq5x0gzpmvr5sgywr6k4";
+    sha256 = "18f5ksngx6afh7rrw9aiw7q6yx801qflbbbqc7i28b68l9dh5qy4";
   };
 
   phases = [ "installPhase" ];
-- 
GitLab


From 1aa1787d37795c67bc964c9a4aa794c014297125 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 15:43:46 -0700
Subject: [PATCH 1186/2254] pwsafe: 1.08.1 -> 1.08.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/pwsafe/versions
---
 pkgs/applications/misc/pwsafe/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/pwsafe/default.nix b/pkgs/applications/misc/pwsafe/default.nix
index 1ed54b05ec8..b1f4e5f9e42 100644
--- a/pkgs/applications/misc/pwsafe/default.nix
+++ b/pkgs/applications/misc/pwsafe/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pwsafe";
-  version = "1.08.1";
+  version = "1.08.2";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "${version}BETA";
-    sha256 = "0x89pn056h8b4yvxbd6l3qwrghslxc7vlxnblmcmsx7xx4i041ng";
+    sha256 = "14qwk3cv5psj7ll71ikyv452x55c7iwjw9765yrpij6741r4yjln";
   };
 
   nativeBuildInputs = [ 
-- 
GitLab


From fcd36adb2395a70cd26fd81c39a187b93d2bc38c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 15:50:20 -0700
Subject: [PATCH 1187/2254] parallel: 20190722 -> 20190922

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/parallel/versions
---
 pkgs/tools/misc/parallel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index 06ae22c86ff..46ff72a678a 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, perl, makeWrapper, procps }:
 
 stdenv.mkDerivation rec {
-  name = "parallel-20190722";
+  name = "parallel-20190922";
 
   src = fetchurl {
     url = "mirror://gnu/parallel/${name}.tar.bz2";
-    sha256 = "19xwdkmia2dw2hry9sbaq0ln79qy9dsqx11hq2s9dcyvhhqqdl0f";
+    sha256 = "0qrw34rpp8g5knb2nhs8z1hz9i42nxjn6i12m4rblm0anhnfwbr8";
   };
 
   nativeBuildInputs = [ makeWrapper ];
-- 
GitLab


From cc1fd419645a5b0a2ed0c0b33ac3e6a7a0d46f80 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 16:09:41 -0700
Subject: [PATCH 1188/2254] osmium-tool: 1.10.0 -> 1.11.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/osmium-tool/versions
---
 pkgs/applications/misc/osmium-tool/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/osmium-tool/default.nix b/pkgs/applications/misc/osmium-tool/default.nix
index 616949af883..19657da607f 100644
--- a/pkgs/applications/misc/osmium-tool/default.nix
+++ b/pkgs/applications/misc/osmium-tool/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "osmium-tool";
-  version = "1.10.0";
+  version = "1.11.0";
 
   src = fetchFromGitHub {
     owner = "osmcode";
     repo = "osmium-tool";
     rev = "v${version}";
-    sha256 = "1balhz78nva0agmbp8n9vg8fhmdssnd9fjxj20bpw7b45mxhjc20";
+    sha256 = "164r1w539dzy67ir2rqh21kwdvkjv87isd18gp51qyxbsprz6kq5";
   };
 
   nativeBuildInputs = [ cmake ];
-- 
GitLab


From 8696c19bbbabb8f6ec2a3ebbde75ec1ccb838d34 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 16:17:19 -0700
Subject: [PATCH 1189/2254] openresty: 1.15.8.1 -> 1.15.8.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/openresty/versions
---
 pkgs/servers/http/openresty/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix
index 3990c5de818..53773302963 100644
--- a/pkgs/servers/http/openresty/default.nix
+++ b/pkgs/servers/http/openresty/default.nix
@@ -5,11 +5,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "openresty";
-  version = "1.15.8.1";
+  version = "1.15.8.2";
 
   src = fetchurl {
     url = "https://openresty.org/download/openresty-${version}.tar.gz";
-    sha256 = "0hh8aygyzxgb0cyafqin70nbi87jpnjvxbf00dljssbpl66278c9";
+    sha256 = "05jxrb8hv758nm38jil8n63q1nhrz3d249bsrwc7maa7sn24wss3";
   };
 
   buildInputs = [ openssl zlib pcre libxml2 libxslt gd geoip postgresql ];
-- 
GitLab


From e3be39cd81ee29c8049d87c13919c805d63d1fbf Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 16:23:25 -0700
Subject: [PATCH 1190/2254] pdfcrack: 0.17 -> 0.18

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/pdfcrack/versions
---
 pkgs/tools/security/pdfcrack/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/pdfcrack/default.nix b/pkgs/tools/security/pdfcrack/default.nix
index c235c98b971..bf8f014bcfd 100644
--- a/pkgs/tools/security/pdfcrack/default.nix
+++ b/pkgs/tools/security/pdfcrack/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "pdfcrack";
-  version = "0.17";
+  version = "0.18";
 
   src = fetchurl {
     url = "mirror://sourceforge/pdfcrack/pdfcrack/pdfcrack-${version}.tar.gz";
-    sha256 = "15hfxwr9yfzkx842p0jjdjnjarny6qc5fwcpy2f6lnq047pb26sn";
+    sha256 = "035s3jzrs3ci0i53x04dzpqp9225c4s52cd722d6zqra5b2sw8w2";
   };
 
   installPhase = ''
-- 
GitLab


From 28dba451bd0661fa074d8dfae8fd75bec5b0ddfb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 16:32:35 -0700
Subject: [PATCH 1191/2254] openiscsi: 2.0.877 -> 2.0.878

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/open-iscsi/versions
---
 pkgs/os-specific/linux/open-iscsi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/open-iscsi/default.nix b/pkgs/os-specific/linux/open-iscsi/default.nix
index 274e960a89b..090b9d7183d 100644
--- a/pkgs/os-specific/linux/open-iscsi/default.nix
+++ b/pkgs/os-specific/linux/open-iscsi/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   pname = "open-iscsi";
-  version = "2.0.877";
+  version = "2.0.878";
 
   nativeBuildInputs = [ autoconf automake gettext libtool perl pkgconf ];
   buildInputs = [ kmod openisns.lib openssl systemd utillinux ];
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     owner = "open-iscsi";
     repo = "open-iscsi";
     rev = version;
-    sha256 = "0v3dsrl34pdx0yl5jsanrpgg3vw466rl8k81hkshgq3a5mq5qhf6";
+    sha256 = "0hkprlni0z1zdkrmhd897knyfws0l95bz67fgp0vvf63ag08b5ly";
   };
 
   DESTDIR = "$(out)";
-- 
GitLab


From b7c5073f729b63a2d7733e8e74cf66f86db5c2c0 Mon Sep 17 00:00:00 2001
From: xrelkd <46590321+xrelkd@users.noreply.github.com>
Date: Sat, 28 Sep 2019 07:37:54 +0800
Subject: [PATCH 1192/2254] youtube-dl: 2019.09.12.1 -> 2019.09.28

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

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 98449f8f554..9ef2156af8f 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -18,11 +18,11 @@ buildPythonPackage rec {
   # The websites youtube-dl deals with are a very moving target. That means that
   # downloads break constantly. Because of that, updates should always be backported
   # to the latest stable release.
-  version = "2019.09.12.1";
+  version = "2019.09.28";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
-    sha256 = "0h7v81kcxcpy82wq9b1aiz2zg6hg7rnlcfmzd13j6k8yhr7ah9yf";
+    sha256 = "0nrk0bk6lksnmng8lwhcpkc57iibzjjamlqz8rxjpsw6dnzxz82h";
   };
 
   nativeBuildInputs = [ makeWrapper ];
-- 
GitLab


From 0d41518464f483e8ed2b14364149a4465693664a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 16:39:01 -0700
Subject: [PATCH 1193/2254] python37Packages.pelican: 4.1.0 -> 4.1.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-pelican/versions
---
 pkgs/development/python-modules/pelican/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pelican/default.nix b/pkgs/development/python-modules/pelican/default.nix
index 2dcc3e5b873..cbda650158b 100644
--- a/pkgs/development/python-modules/pelican/default.nix
+++ b/pkgs/development/python-modules/pelican/default.nix
@@ -6,13 +6,13 @@
 
 buildPythonPackage rec {
   pname = "pelican";
-  version = "4.1.0";
+  version = "4.1.1";
 
   src = fetchFromGitHub {
     owner = "getpelican";
     repo = "pelican";
     rev = version;
-    sha256 = "1ww3kc5bzp5q7b23n2vmzqch1z06l7vrscn0h96cscvk45sxc7yz";
+    sha256 = "08lwbkgqdf6qx9vg17qj70k7nz2j34ymlnrc4cbz7xj98cw4ams1";
     # Remove unicode file names which leads to different checksums on HFS+
     # vs. other filesystems because of unicode normalisation.
     extraPostFetch = ''
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     glibcLocales
     # Note: Pelican has to adapt to a changed CLI of pandoc before enabling this
     # again. Compare https://github.com/getpelican/pelican/pull/2252.
-    # Version 4.1.0 is incompatible with our current pandoc version.
+    # Version 4.1.1 is incompatible with our current pandoc version.
     # pandoc
     git
     mock
-- 
GitLab


From a662296fafb0210ef9d7ebc7f01c2d03a9b77713 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 16:42:17 -0700
Subject: [PATCH 1194/2254] openvdb: 6.1.0 -> 6.2.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/openvdb/versions
---
 pkgs/development/libraries/openvdb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/openvdb/default.nix b/pkgs/development/libraries/openvdb/default.nix
index 800acebac34..3be467fdb32 100644
--- a/pkgs/development/libraries/openvdb/default.nix
+++ b/pkgs/development/libraries/openvdb/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec
 {
   pname = "openvdb";
-  version = "6.1.0";
+  version = "6.2.0";
 
   src = fetchFromGitHub {
     owner = "dreamworksanimation";
     repo = "openvdb";
     rev = "v${version}";
-    sha256 = "0rs50741c4m0jgc7k2fdyinvm7hhjrbg0wls6whqaghbbaf1lhpk";
+    sha256 = "0ms7jmx9nsza46bky42vyb6n6p29kfjfidqg51kccvirzi07crvq";
   };
 
   outputs = [ "out" ];
-- 
GitLab


From 042597a5a4e414dbb1f942c535cb2296fb393d5e Mon Sep 17 00:00:00 2001
From: xrelkd <46590321+xrelkd@users.noreply.github.com>
Date: Sat, 28 Sep 2019 07:48:53 +0800
Subject: [PATCH 1195/2254] go-ethereum: 1.9.3 -> 1.9.5

---
 pkgs/applications/blockchains/go-ethereum.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/blockchains/go-ethereum.nix b/pkgs/applications/blockchains/go-ethereum.nix
index 5f347fe91e9..3754c9a087c 100644
--- a/pkgs/applications/blockchains/go-ethereum.nix
+++ b/pkgs/applications/blockchains/go-ethereum.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "go-ethereum";
-  version = "1.9.3";
+  version = "1.9.5";
 
   goPackagePath = "github.com/ethereum/go-ethereum";
 
@@ -17,7 +17,7 @@ buildGoPackage rec {
     owner = "ethereum";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0lv6gxp34j26hqazcvyr4c7rsl1vljm6cfzkcmlapsjdgym505bg";
+    sha256 = "1h1c02dgazlcgp9lrm0zsig80nfj0c9553jy9nsvjyzf95ym1542";
   };
 
   meta = with stdenv.lib; {
-- 
GitLab


From 4008ba7b0c68ba4f87ed237abb465e829f52fd59 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 17:03:42 -0700
Subject: [PATCH 1196/2254] parlatype: 1.6.1 -> 1.6.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/parlatype/versions
---
 pkgs/applications/audio/parlatype/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/parlatype/default.nix b/pkgs/applications/audio/parlatype/default.nix
index 1eb8b416a9a..fb5fe47f4f2 100644
--- a/pkgs/applications/audio/parlatype/default.nix
+++ b/pkgs/applications/audio/parlatype/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "parlatype";
-  version = "1.6.1";
+  version = "1.6.2";
 
   src = fetchFromGitHub {
     owner  = "gkarsay";
     repo   = pname;
     rev    = "v${version}";
-    sha256 = "0b811lwiylrjirx88gi9az1b1b71j2i5a4a6g56wp9qxln6lzjj2";
+    sha256 = "157423f40l8nd5da6y0qjmg4l3125zailp98w2hda3mxxn1j5ix3";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From e83bca62e2a579d24e31d34f5cae762487fb49b7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 17:10:08 -0700
Subject: [PATCH 1197/2254] papirus-icon-theme: 20190802 -> 20190919

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/papirus-icon-theme/versions
---
 pkgs/data/icons/papirus-icon-theme/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix
index 3f9cff62ee4..c1959124c36 100644
--- a/pkgs/data/icons/papirus-icon-theme/default.nix
+++ b/pkgs/data/icons/papirus-icon-theme/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "papirus-icon-theme";
-  version = "20190802";
+  version = "20190919";
 
   src = fetchFromGitHub {
     owner = "PapirusDevelopmentTeam";
     repo = pname;
     rev = version;
-    sha256 = "1i6nh1vy2cjqh4fw1mzq5v4ah613ghf018g8w0npxhj9qi3pyjm5";
+    sha256 = "1pykrvh232b12wlhc56yd992vl4p3j2ap21mhhcwyxml06riwvki";
   };
 
   nativeBuildInputs = [ gtk3 ];
-- 
GitLab


From 13db163a94bea8dc11c7f491051fe7fad7b78ef0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 17:17:06 -0700
Subject: [PATCH 1198/2254] fpp: 0.8.2 -> 0.9.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/fpp/versions
---
 pkgs/tools/misc/fpp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/fpp/default.nix b/pkgs/tools/misc/fpp/default.nix
index ac731bcdbe8..7f036cb1f90 100644
--- a/pkgs/tools/misc/fpp/default.nix
+++ b/pkgs/tools/misc/fpp/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fpp";
-  version = "0.8.2";
+  version = "0.9.2";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "PathPicker";
     rev = version;
-    sha256 = "00916xx4scd4xr9zxqkyhilczi27f2qm5y042592wr79ddix4n9v";
+    sha256 = "08p2xlz045fqyb0aj9pwwf2s5nb4b02i8zj81732q59yx5c6lrlv";
   };
 
   postPatch = ''
-- 
GitLab


From ece7ad556f9a6f5ecbdf7dbda0b3c9992ed80fae Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 28 Sep 2019 02:30:34 +0200
Subject: [PATCH 1199/2254] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.15.0 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/47b2f92d3c7f9fc506ca0534b68b765b25c3aa00.
---
 .../haskell-modules/hackage-packages.nix      | 469 ++++++++++++++----
 1 file changed, 369 insertions(+), 100 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 81acd502ba5..336516b9c92 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -7761,6 +7761,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "HDBC_2_4_0_3" = callPackage
+    ({ mkDerivation, base, bytestring, containers, convertible, mtl
+     , old-time, text, time, utf8-string
+     }:
+     mkDerivation {
+       pname = "HDBC";
+       version = "2.4.0.3";
+       sha256 = "0vv2l99wpm2azm1wmbiqvra5aw708rsldd8y4fdf660q7lgvqqqy";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring containers convertible mtl old-time text time
+         utf8-string
+       ];
+       description = "Haskell Database Connectivity";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "HDBC-mysql" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, HDBC, mysqlclient
      , openssl, time, utf8-string, zlib
@@ -7798,15 +7817,16 @@ self: {
      }) {inherit (pkgs) unixODBC;};
 
   "HDBC-postgresql" = callPackage
-    ({ mkDerivation, base, bytestring, convertible, HDBC, mtl, old-time
-     , parsec, postgresql, time, utf8-string
+    ({ mkDerivation, base, bytestring, Cabal, convertible, HDBC, mtl
+     , old-time, parsec, postgresql, time, utf8-string
      }:
      mkDerivation {
        pname = "HDBC-postgresql";
-       version = "2.3.2.6";
-       sha256 = "1kas80zv3vbqq9cd73w87fj4mwxcphfmf7ycfnl4jwdzpqjzr0yj";
+       version = "2.3.2.7";
+       sha256 = "0mfx172lrhwxx6gbqfqji8m14llng76x0mxksm3s556kakvv1cgg";
        isLibrary = true;
        isExecutable = true;
+       setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [
          base bytestring convertible HDBC mtl old-time parsec time
          utf8-string
@@ -23570,6 +23590,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "aeson-pretty_0_8_8" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring
+     , cmdargs, scientific, text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "aeson-pretty";
+       version = "0.8.8";
+       sha256 = "09n7gs91y1fbw6gjszrd2na3isnvk3y5rsi90lzjrwywnqfadkl1";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base base-compat bytestring scientific text
+         unordered-containers vector
+       ];
+       executableHaskellDepends = [
+         aeson attoparsec base bytestring cmdargs
+       ];
+       description = "JSON pretty-printing library and command-line tool";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "aeson-qq" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base-compat, ghc-prim
      , haskell-src-meta, hspec, parsec, scientific, template-haskell
@@ -23649,8 +23691,8 @@ self: {
      }:
      mkDerivation {
        pname = "aeson-schemas";
-       version = "1.0.2";
-       sha256 = "1f75fk4775gri6qvgkcsfx9v7f832zy76z61wl63q8h0yh6lapxl";
+       version = "1.0.3";
+       sha256 = "0fmhqibw6mw9shxh94riqq465njbgjsv539xb6sx7qpkhcck2csi";
        libraryHaskellDepends = [
          aeson base bytestring first-class-families megaparsec
          template-haskell text unordered-containers
@@ -33498,8 +33540,8 @@ self: {
        pname = "avers";
        version = "0.0.17.1";
        sha256 = "1x96fvx0z7z75c39qcggw70qvqnw7kzjf0qqxb3jwg3b0fmdhi8v";
-       revision = "32";
-       editedCabalFile = "0p4jhc8rxvm82cp3zaibazb5jnjs33vl4f71pvgvzf31xd7immyy";
+       revision = "34";
+       editedCabalFile = "0mj6881npk0xdkf4nkcy52sn6y4414wdpysbw03kkb5vx6cgjws9";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring clock containers cryptonite
          filepath inflections memory MonadRandom mtl network network-uri
@@ -35665,6 +35707,27 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "base62" = callPackage
+    ({ mkDerivation, base, byteslice, doctest, natural-arithmetic
+     , primitive, small-bytearray-builder, tasty, tasty-hunit
+     , tasty-quickcheck, wide-word
+     }:
+     mkDerivation {
+       pname = "base62";
+       version = "0.1.0.0";
+       sha256 = "1ns8hr9xjmrlq5lgi47630gpn8xdglk33ncqw4kjvdrb1x90iz0p";
+       libraryHaskellDepends = [
+         base byteslice natural-arithmetic primitive small-bytearray-builder
+         wide-word
+       ];
+       testHaskellDepends = [
+         base byteslice doctest primitive tasty tasty-hunit tasty-quickcheck
+         wide-word
+       ];
+       description = "Base62 encoding and decoding";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "base64-bytestring" = callPackage
     ({ mkDerivation, base, bytestring, containers, criterion, deepseq
      , HUnit, QuickCheck, split, test-framework, test-framework-hunit
@@ -41511,8 +41574,8 @@ self: {
      }:
      mkDerivation {
        pname = "boolector";
-       version = "0.0.0.8";
-       sha256 = "09zhrg6zrf3viigjdw4q4c1i0x4ww467m9ghapdfwq4d01cr0c43";
+       version = "0.0.0.9";
+       sha256 = "1f4lnshc4b3r9qyc6y476qpkcl3hkripqsd2vfyg9q0xbyg9pxq6";
        libraryHaskellDepends = [
          base containers directory mtl temporary time
        ];
@@ -59851,6 +59914,44 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "criterion_1_5_6_1" = callPackage
+    ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat
+     , base-compat-batteries, binary, binary-orphans, bytestring
+     , cassava, code-page, containers, criterion-measurement, deepseq
+     , directory, exceptions, filepath, Glob, HUnit, js-flot, js-jquery
+     , microstache, mtl, mwc-random, optparse-applicative, parsec
+     , QuickCheck, statistics, tasty, tasty-hunit, tasty-quickcheck
+     , text, time, transformers, transformers-compat, vector
+     , vector-algorithms
+     }:
+     mkDerivation {
+       pname = "criterion";
+       version = "1.5.6.1";
+       sha256 = "0m2k323r00q3x5fk8gfcd2y39kmj35nzb8fwqmxjlg7kiz3nkyx5";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson ansi-wl-pprint base base-compat-batteries binary
+         binary-orphans bytestring cassava code-page containers
+         criterion-measurement deepseq directory exceptions filepath Glob
+         js-flot js-jquery microstache mtl mwc-random optparse-applicative
+         parsec statistics text time transformers transformers-compat vector
+         vector-algorithms
+       ];
+       executableHaskellDepends = [
+         base base-compat-batteries optparse-applicative
+       ];
+       testHaskellDepends = [
+         aeson base base-compat base-compat-batteries bytestring deepseq
+         directory HUnit QuickCheck statistics tasty tasty-hunit
+         tasty-quickcheck vector
+       ];
+       description = "Robust, reliable performance measurement and analysis";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "criterion-compare" = callPackage
     ({ mkDerivation, base, bytestring, cassava, Chart, Chart-diagrams
      , clay, colour, containers, data-default, filepath, lens, lucid
@@ -69738,8 +69839,8 @@ self: {
      }:
      mkDerivation {
        pname = "dirtree";
-       version = "0.1.0";
-       sha256 = "0hyvaf17rfaqjag6qg3pfhbhjnhrd4xdknvn0k494vi3wd1ddzap";
+       version = "0.1.1";
+       sha256 = "18iahbw6hzjxsnmr3yi80w0xvf6iphdxb2yg5kpnww26lmlgk6dc";
        libraryHaskellDepends = [
          base bytestring containers deepseq directory filepath lens unix
          zip-archive
@@ -75446,25 +75547,25 @@ self: {
      }) {};
 
   "elliptic-curve" = callPackage
-    ({ mkDerivation, arithmoi, base, criterion, galois-field
-     , MonadRandom, protolude, tasty, tasty-hunit, tasty-quickcheck
-     , text, wl-pprint-text
+    ({ mkDerivation, base, criterion, galois-field, groups, MonadRandom
+     , protolude, tasty, tasty-hunit, tasty-quickcheck, text
+     , wl-pprint-text
      }:
      mkDerivation {
        pname = "elliptic-curve";
-       version = "0.2.2";
-       sha256 = "082q01xqfqa73c0wasmh8v0hgf76gsfg8jzd78n9vgrp69zali1n";
+       version = "0.3.0";
+       sha256 = "1rvil4va3dy04474kiihadsplhqbpbrkjsqnmaykw23lqgzp32iq";
        libraryHaskellDepends = [
-         base galois-field MonadRandom protolude tasty-quickcheck text
-         wl-pprint-text
+         base galois-field groups MonadRandom protolude tasty-quickcheck
+         text wl-pprint-text
        ];
        testHaskellDepends = [
-         arithmoi base galois-field MonadRandom protolude tasty tasty-hunit
+         base galois-field groups MonadRandom protolude tasty tasty-hunit
          tasty-quickcheck text wl-pprint-text
        ];
        benchmarkHaskellDepends = [
-         base criterion galois-field MonadRandom protolude tasty-quickcheck
-         text wl-pprint-text
+         base criterion galois-field groups MonadRandom protolude
+         tasty-quickcheck text wl-pprint-text
        ];
        description = "Elliptic curve library";
        license = stdenv.lib.licenses.mit;
@@ -85527,6 +85628,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "folds_0_7_5" = callPackage
+    ({ mkDerivation, adjunctions, base, bifunctors, bytestring, Cabal
+     , cabal-doctest, comonad, constraints, contravariant, data-reify
+     , deepseq, directory, distributive, doctest, filepath, lens, mtl
+     , pointed, profunctors, reflection, semigroupoids, semigroups
+     , transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "folds";
+       version = "0.7.5";
+       sha256 = "17a8xggx17m59hiwd2lxd2379sw4xblgyv1pk9g5h93w3m8wgq1r";
+       configureFlags = [ "-f-test-hlint" ];
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         adjunctions base bifunctors comonad constraints contravariant
+         data-reify distributive lens mtl pointed profunctors reflection
+         semigroupoids transformers unordered-containers vector
+       ];
+       testHaskellDepends = [
+         base bytestring deepseq directory doctest filepath mtl semigroups
+       ];
+       description = "Beautiful Folding";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "folds-common" = callPackage
     ({ mkDerivation, base, containers, folds, tasty, tasty-quickcheck
      }:
@@ -89067,26 +89194,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "galois-field_0_4_1" = callPackage
-    ({ mkDerivation, base, criterion, integer-gmp, MonadRandom, poly
-     , protolude, semirings, tasty, tasty-quickcheck, vector
+  "galois-field_1_0_0" = callPackage
+    ({ mkDerivation, base, criterion, groups, integer-gmp, MonadRandom
+     , poly, protolude, semirings, tasty, tasty-quickcheck, vector
      , wl-pprint-text
      }:
      mkDerivation {
        pname = "galois-field";
-       version = "0.4.1";
-       sha256 = "1q577m518gb3q7z7l84pf2ghw786p86sjx7b5mr3xhrvplwdvhcl";
+       version = "1.0.0";
+       sha256 = "0afmqavxca8p1zfmqibn9kh1xigq9y1s8wail6rdmq9ci1gzd90y";
        libraryHaskellDepends = [
-         base integer-gmp MonadRandom poly protolude semirings
+         base groups integer-gmp MonadRandom poly protolude semirings
          tasty-quickcheck vector wl-pprint-text
        ];
        testHaskellDepends = [
-         base integer-gmp MonadRandom poly protolude semirings tasty
+         base groups integer-gmp MonadRandom poly protolude semirings tasty
          tasty-quickcheck vector wl-pprint-text
        ];
        benchmarkHaskellDepends = [
-         base criterion integer-gmp MonadRandom poly protolude semirings
-         tasty-quickcheck vector wl-pprint-text
+         base criterion groups integer-gmp MonadRandom poly protolude
+         semirings tasty-quickcheck vector wl-pprint-text
        ];
        description = "Galois field library";
        license = stdenv.lib.licenses.mit;
@@ -90262,6 +90389,8 @@ self: {
        pname = "generic-monoid";
        version = "0.1.0.0";
        sha256 = "0jzhmy6vi38p3cnlvi4hw59zga239y67nszzl7zscx263wsk7q0w";
+       revision = "1";
+       editedCabalFile = "1xsgnb87k80p3gn0jyiv3a1c6g77q8sqml6bmbpppfa24z8paa1p";
        libraryHaskellDepends = [ base ];
        description = "Derive monoid instances for product types";
        license = stdenv.lib.licenses.bsd3;
@@ -90460,8 +90589,8 @@ self: {
     ({ mkDerivation, base, generics-mrsop }:
      mkDerivation {
        pname = "generics-mrsop-gdiff";
-       version = "0.0.0";
-       sha256 = "0a60q7g5x7kwd864dc7yz83kz83fxf4gpj7q5lj4f2fg69ih0ybm";
+       version = "0.0.1";
+       sha256 = "0r5i9m07bl3m0m0vkzf38dddp0bjwg4lpyiyhjysb0s5sw4djrnh";
        libraryHaskellDepends = [ base generics-mrsop ];
        description = "Reimplementation of the `gdiff` algorithm for `generics-mrsop`";
        license = stdenv.lib.licenses.bsd3;
@@ -90775,12 +90904,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "genvalidity_0_9_0_0" = callPackage
+  "genvalidity_0_9_0_1" = callPackage
     ({ mkDerivation, base, hspec, hspec-core, QuickCheck, validity }:
      mkDerivation {
        pname = "genvalidity";
-       version = "0.9.0.0";
-       sha256 = "1q2ylz0id5b85ycqymrybpgczqmm9cc9yqzlg9lilhq8rnp0na0x";
+       version = "0.9.0.1";
+       sha256 = "1f0jhahgh0kyyk74g2vmjb3vcv4qvg2xhib1n92r8yyggxih3msl";
        libraryHaskellDepends = [ base QuickCheck validity ];
        testHaskellDepends = [ base hspec hspec-core QuickCheck ];
        description = "Testing utilities for the validity library";
@@ -92612,6 +92741,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ghc-syntax-highlighter_0_0_4_1" = callPackage
+    ({ mkDerivation, base, ghc, ghc-boot, hspec, hspec-discover, text
+     }:
+     mkDerivation {
+       pname = "ghc-syntax-highlighter";
+       version = "0.0.4.1";
+       sha256 = "0glsfz2sn6a161m3sy08nf739ndgslqd8s7fawyas9ziqg06lvjg";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [ base ghc ghc-boot text ];
+       testHaskellDepends = [ base hspec text ];
+       testToolDepends = [ hspec-discover ];
+       description = "Syntax highlighter for Haskell using lexer of GHC itself";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghc-tcplugins-extra" = callPackage
     ({ mkDerivation, base, ghc }:
      mkDerivation {
@@ -113603,8 +113748,8 @@ self: {
      }:
      mkDerivation {
        pname = "hdiff";
-       version = "0.0.0";
-       sha256 = "0vs55wrcip9djhdwd5wz44d8w5hfafdck4abhc488b23chdxxxi9";
+       version = "0.0.1";
+       sha256 = "09a4vp80ik7fza2qzv9n3zddkk1phm0yd3f9v1r5zp3i8s38aa89";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -130673,8 +130818,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-xml";
-       version = "0.4.0.0";
-       sha256 = "07mv58bwzafzcaddnahj6p1qvblm4fjrydrq1adi7slydmsxa61z";
+       version = "0.4.0.1";
+       sha256 = "07xjdn2wzcvlhfbf3jlvrmw8mcbl1g5sc62xk6s73figs26gjm6z";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -139884,6 +140029,33 @@ self: {
        broken = true;
      }) {};
 
+  "json-tokens" = callPackage
+    ({ mkDerivation, array-builder, array-chunks, base, byteslice
+     , bytesmith, bytestring, gauge, neat-interpolation, primitive
+     , QuickCheck, scientific-notation, small-bytearray-builder, tasty
+     , tasty-hunit, text, text-short, vector
+     }:
+     mkDerivation {
+       pname = "json-tokens";
+       version = "0.1.0.0";
+       sha256 = "18kshh9g7pm68lqn4k89jy36xblk2gi37zfvla3l1kavcjcf15jd";
+       libraryHaskellDepends = [
+         array-builder array-chunks base byteslice bytesmith bytestring
+         primitive scientific-notation text-short
+       ];
+       testHaskellDepends = [
+         base byteslice bytestring neat-interpolation primitive QuickCheck
+         scientific-notation small-bytearray-builder tasty tasty-hunit text
+         vector
+       ];
+       benchmarkHaskellDepends = [
+         base byteslice bytestring gauge neat-interpolation primitive
+         scientific-notation text
+       ];
+       description = "Tokenize JSON";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "json-tools" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
      , process, tar, text, unordered-containers, vector
@@ -159934,10 +160106,10 @@ self: {
     ({ mkDerivation, base, vector }:
      mkDerivation {
        pname = "mmsyn2";
-       version = "0.1.2.0";
-       sha256 = "04ryfj058z6vkbfmvg4vvza36zj5m1akb64bfm61l4g2rxj7s3nv";
+       version = "0.1.4.0";
+       sha256 = "0v33fby4bynnij875sq09qv71w74lp18ga6wpaki5xw76ak9qvxm";
        libraryHaskellDepends = [ base vector ];
-       description = "The library that can be used for optimization of multiple (Ord a) => a -> b transformations";
+       description = "The library that can be used for multiple (Ord a) => a -> b transformations";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -160118,6 +160290,8 @@ self: {
        pname = "modern-uri";
        version = "0.3.1.0";
        sha256 = "1pi7la2rrpfa9qszz7zm4dd7dihakm4kjrhjzvxpbp4n34ihl8h5";
+       revision = "1";
+       editedCabalFile = "09fwv2sx49kbabkllag01g1g85m92fmz60k5lf0w8qnr7hkxv3rd";
        libraryHaskellDepends = [
          base bytestring containers contravariant deepseq exceptions
          megaparsec mtl profunctors QuickCheck reflection tagged
@@ -169077,15 +169251,16 @@ self: {
      }) {};
 
   "newtype-zoo" = callPackage
-    ({ mkDerivation, base, data-default, deepseq, pointed, profunctors
-     , QuickCheck, random
+    ({ mkDerivation, base, comonad, data-default, deepseq, pointed
+     , profunctors, QuickCheck, random
      }:
      mkDerivation {
        pname = "newtype-zoo";
-       version = "1.1.0.0";
-       sha256 = "0sw476mmczq6gfgbbbrybrna472p5bjrimsbblw9rlyzcg2szqrp";
+       version = "1.2.0.0";
+       sha256 = "12p2nyjpvbqjc7p6jd59ggl37jlg5rh9z8y1bxy4w98m47p8lj31";
        libraryHaskellDepends = [
-         base data-default deepseq pointed profunctors QuickCheck random
+         base comonad data-default deepseq pointed profunctors QuickCheck
+         random
        ];
        description = "Newtype Wrapper Zoo";
        license = stdenv.lib.licenses.bsd3;
@@ -175371,29 +175546,27 @@ self: {
        broken = true;
      }) {};
 
-  "pairing_0_5_0" = callPackage
+  "pairing_1_0_0" = callPackage
     ({ mkDerivation, base, bytestring, criterion, elliptic-curve
-     , errors, galois-field, MonadRandom, protolude, QuickCheck
+     , errors, galois-field, groups, MonadRandom, protolude, QuickCheck
      , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck
-     , wl-pprint-text
      }:
      mkDerivation {
        pname = "pairing";
-       version = "0.5.0";
-       sha256 = "0qnwkkfzd1jiqg4b989knvzzf05aljqjfqv1z35nl2ms46sqdv1b";
+       version = "1.0.0";
+       sha256 = "0mcjd463ffgq2ghvbi2h02dxy0p40ilhazznn2zqzqp7gksrhvfd";
        libraryHaskellDepends = [
-         base bytestring elliptic-curve errors galois-field MonadRandom
-         protolude QuickCheck wl-pprint-text
+         base bytestring elliptic-curve errors galois-field groups
+         MonadRandom protolude tasty-quickcheck
        ];
        testHaskellDepends = [
-         base bytestring elliptic-curve errors galois-field MonadRandom
-         protolude QuickCheck quickcheck-instances tasty tasty-hunit
-         tasty-quickcheck wl-pprint-text
+         base bytestring elliptic-curve errors galois-field groups
+         MonadRandom protolude QuickCheck quickcheck-instances tasty
+         tasty-hunit tasty-quickcheck
        ];
        benchmarkHaskellDepends = [
-         base bytestring criterion elliptic-curve errors galois-field
-         MonadRandom protolude QuickCheck quickcheck-instances tasty
-         tasty-hunit tasty-quickcheck wl-pprint-text
+         base bytestring criterion elliptic-curve errors galois-field groups
+         MonadRandom protolude tasty-quickcheck
        ];
        description = "Bilinear pairings";
        license = stdenv.lib.licenses.mit;
@@ -190381,8 +190554,8 @@ self: {
      }:
      mkDerivation {
        pname = "publicsuffix";
-       version = "0.20190826";
-       sha256 = "1z6apxnp88jjpf5q7zg04r18lja7rafwlx1w2cy7d74qfrh1v2b7";
+       version = "0.20190927";
+       sha256 = "1yvv9yjpaj9f4ck1g7qdcglm7xli2h30nbrcc8s9vnl8im4gmy25";
        libraryHaskellDepends = [ base filepath template-haskell ];
        testHaskellDepends = [ base hspec ];
        benchmarkHaskellDepends = [ base criterion random ];
@@ -191252,6 +191425,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "pusher-http-haskell_1_5_1_11" = callPackage
+    ({ mkDerivation, aeson, base, base16-bytestring, bytestring
+     , cryptonite, hashable, hspec, http-client, http-types, memory
+     , QuickCheck, scientific, text, time, transformers
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "pusher-http-haskell";
+       version = "1.5.1.11";
+       sha256 = "02r6w64ll7gka1zgvv6yqalbzpjmw0rx2ji84fmbnk0f7c1793sq";
+       libraryHaskellDepends = [
+         aeson base base16-bytestring bytestring cryptonite hashable
+         http-client http-types memory text time transformers
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base base16-bytestring bytestring cryptonite hspec
+         http-client http-types QuickCheck scientific text time transformers
+         unordered-containers vector
+       ];
+       description = "Haskell client library for the Pusher HTTP API";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pusher-ws" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, deepseq
      , hashable, http-conduit, lens, lens-aeson, network, scientific
@@ -192763,8 +192961,8 @@ self: {
      }:
      mkDerivation {
        pname = "quickcheck-string-random";
-       version = "0.1.2.0";
-       sha256 = "0n5h7nlicgm8xn23pvrsxrw4y2f4j1ammpbccl6z1c37yasf1xm7";
+       version = "0.1.3.0";
+       sha256 = "0pyh2xa68d6jhca1lr5ymmxqs19m17hjxdlrplyl0pww65mfrj8d";
        libraryHaskellDepends = [ base QuickCheck string-random text ];
        testHaskellDepends = [
          base QuickCheck tasty tasty-quickcheck text
@@ -199413,8 +199611,8 @@ self: {
      }:
      mkDerivation {
        pname = "reqcatcher";
-       version = "0.2.0.0";
-       sha256 = "1wg4sfhzsl0dkwl5ldm9fk2y44jvbbagk34hgyh4dn5qc08rygw9";
+       version = "0.2.1.0";
+       sha256 = "1fh9p7437czn7rw5jmpxlmg0zhrkkj5hwd0kzlr2jainxzvlw2b3";
        libraryHaskellDepends = [ base http-types network text wai warp ];
        testHaskellDepends = [
          base http-client http-types HUnit lens tasty tasty-hunit wai wreq
@@ -200155,8 +200353,8 @@ self: {
        pname = "rethinkdb-client-driver";
        version = "0.0.25";
        sha256 = "15l9z7ki81cv97lajxcbddavbd254c5adcdi8yw6df31rmbc378g";
-       revision = "3";
-       editedCabalFile = "1g4shgl944fd3qbqkd68jv6vh65plaivci4vjzfs4py7a2p62db1";
+       revision = "4";
+       editedCabalFile = "1fjavc5gmz15za1yzj4b23gd50b2jj83l0d5pc2kmz8f6bs5nx9f";
        libraryHaskellDepends = [
          aeson base binary bytestring containers hashable mtl network
          old-locale scientific stm template-haskell text time
@@ -200233,6 +200431,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "retry_0_8_0_2" = callPackage
+    ({ mkDerivation, base, exceptions, ghc-prim, hedgehog, HUnit, mtl
+     , random, stm, tasty, tasty-hedgehog, tasty-hunit, time
+     , transformers
+     }:
+     mkDerivation {
+       pname = "retry";
+       version = "0.8.0.2";
+       sha256 = "1i98a5pp37fcny28wfp002bc16m9jf793jicbp83ffwlk0g123v5";
+       libraryHaskellDepends = [
+         base exceptions ghc-prim random transformers
+       ];
+       testHaskellDepends = [
+         base exceptions ghc-prim hedgehog HUnit mtl random stm tasty
+         tasty-hedgehog tasty-hunit time transformers
+       ];
+       description = "Retry combinators for monadic actions that may fail";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "retryer" = callPackage
     ({ mkDerivation, base, optparse-applicative, process }:
      mkDerivation {
@@ -208925,8 +209144,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-errors";
-       version = "0.1.0.3";
-       sha256 = "0dgl30k5fz0q15y6msa5qdc2sj28n8fdddiw835q3kp6wy2dzpc1";
+       version = "0.1.2.0";
+       sha256 = "0w3adlvysybc9dv3qf00ja0gx86y47n4lz8p6dypzmvs598h6rxs";
        libraryHaskellDepends = [
          aeson base bytestring http-api-data http-media http-types
          scientific servant string-conversions text unordered-containers wai
@@ -220685,8 +220904,8 @@ self: {
        pname = "stache";
        version = "2.0.1";
        sha256 = "0awyh8zjvly18s4gnqy4970fj1hr4zpb38lisfy6px42m38g17vk";
-       revision = "2";
-       editedCabalFile = "17da7jih43nl3zqgpmlk3n2kpwjmb2np4w8ldpq2vyi9ab8p6vjm";
+       revision = "3";
+       editedCabalFile = "1y1wff5mdcin3wc9pbj3agsircrf1pxjjm8j90n8g40l7acnf63c";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring containers deepseq directory filepath
@@ -220714,6 +220933,8 @@ self: {
        pname = "stache";
        version = "2.1.0";
        sha256 = "1q34h46px7miy2kx1yzaj785ai70mkchmijpdq2iih1fffir8kvk";
+       revision = "1";
+       editedCabalFile = "19vkvp6gkhld4lm8d87sicw63cd6d5awphyjpsdg9iha44j6sh11";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring containers deepseq directory filepath
@@ -233813,12 +234034,31 @@ self: {
        pname = "th-test-utils";
        version = "1.0.0";
        sha256 = "1kpkf6h0vr06z7iphkcjva9x28mfjg967hrih4im527g9vw5mdq6";
+       revision = "2";
+       editedCabalFile = "1m2fh0js7cyqr8g0yn0222jjc62bib4lvb1lq570p0c4zd508dpn";
+       libraryHaskellDepends = [ base template-haskell transformers ];
+       testHaskellDepends = [
+         base tasty tasty-hunit template-haskell transformers
+       ];
+       description = "Utility functions for testing Template Haskell code";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "th-test-utils_1_0_1" = callPackage
+    ({ mkDerivation, base, tasty, tasty-hunit, template-haskell
+     , transformers
+     }:
+     mkDerivation {
+       pname = "th-test-utils";
+       version = "1.0.1";
+       sha256 = "1qbxj4zarw1nm0c2shrr4wrrkmqlxx2qdh9q3q9arkic4lwgsxcx";
        libraryHaskellDepends = [ base template-haskell transformers ];
        testHaskellDepends = [
          base tasty tasty-hunit template-haskell transformers
        ];
        description = "Utility functions for testing Template Haskell code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "th-to-exp" = callPackage
@@ -238517,16 +238757,16 @@ self: {
 
   "tree-sitter" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, directory
-     , filepath, fused-effects, hedgehog, split, template-haskell, text
-     , unordered-containers
+     , filepath, fused-effects, hedgehog, semantic-source, split
+     , template-haskell, text, unordered-containers
      }:
      mkDerivation {
        pname = "tree-sitter";
-       version = "0.3.0.0";
-       sha256 = "1ai587a8m67j0rjg1gbhxnv1kl4awpcr7jvh4qnlvx91g7s1gq2g";
+       version = "0.4.0.0";
+       sha256 = "0iqyqj2wavm4qrnmls4nwcnr0y8lgxsj42jbm22riwfh3wlg4dnf";
        libraryHaskellDepends = [
          aeson base bytestring containers directory filepath fused-effects
-         split template-haskell text unordered-containers
+         semantic-source split template-haskell text unordered-containers
        ];
        testHaskellDepends = [ base hedgehog ];
        description = "Unstable bindings for the tree-sitter parsing library";
@@ -238539,8 +238779,8 @@ self: {
     ({ mkDerivation, base, template-haskell, tree-sitter }:
      mkDerivation {
        pname = "tree-sitter-go";
-       version = "0.2.0.0";
-       sha256 = "1yrhn025rdllfcmlcaiz6idxhxqh02qjpw71dm3zynmnmgmpqcc0";
+       version = "0.2.0.1";
+       sha256 = "1l1phqnsfsi47pqcjn84i8pqxfyslnrhw8an9g6fxx21gc6sdn45";
        libraryHaskellDepends = [ base template-haskell tree-sitter ];
        doHaddock = false;
        description = "Tree-sitter grammar/parser for Go";
@@ -238553,10 +238793,8 @@ self: {
     ({ mkDerivation, base, template-haskell, tree-sitter }:
      mkDerivation {
        pname = "tree-sitter-haskell";
-       version = "0.2.0.0";
-       sha256 = "0cds6xmps88vx3x7ifkpjbbbgvnbc22hxam6qdwy2m1njbff3wad";
-       revision = "1";
-       editedCabalFile = "07kgsp70bwggcnxh9229dvbfysc9s4ykzir4973pn02qs5l7kb6y";
+       version = "0.2.0.1";
+       sha256 = "0c02sv4hzlyfdpk7s8ykgm9cr6xwmjw8npy356v2vgbr0l238bgw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base template-haskell tree-sitter ];
@@ -238571,8 +238809,8 @@ self: {
     ({ mkDerivation, base, template-haskell, tree-sitter }:
      mkDerivation {
        pname = "tree-sitter-java";
-       version = "0.2.0.0";
-       sha256 = "1gayg7ln4iy56a4pl3dqrl2iq689b1a8z2n59dnrhmzhq87lzx7y";
+       version = "0.2.0.1";
+       sha256 = "17dpqd3ddhgaiav332wzgiqzlx8rbnzziv7gal3mvjbz0nv78rk6";
        libraryHaskellDepends = [ base template-haskell tree-sitter ];
        doHaddock = false;
        description = "Tree-sitter grammar/parser for Java";
@@ -238585,8 +238823,8 @@ self: {
     ({ mkDerivation, base, template-haskell, tree-sitter }:
      mkDerivation {
        pname = "tree-sitter-json";
-       version = "0.2.0.0";
-       sha256 = "0x30pwmganjabzkgqgrkk249r8v4frag9ww64j4sfq6r2vbfc7l3";
+       version = "0.2.0.1";
+       sha256 = "107ymwb1fyff8b5qvvrg7rm32xnvzfh6mz2mr1nq3yjdqp6rz3n9";
        libraryHaskellDepends = [ base template-haskell tree-sitter ];
        doHaddock = false;
        description = "Tree-sitter grammar/parser for JSON";
@@ -238599,8 +238837,8 @@ self: {
     ({ mkDerivation, base, template-haskell, tree-sitter }:
      mkDerivation {
        pname = "tree-sitter-php";
-       version = "0.2.0.0";
-       sha256 = "0wdyppjp879wb3m73kczsa78c0lyqvpnkvsh13bh22vw66jypj6x";
+       version = "0.2.0.1";
+       sha256 = "0dxszds10fr3zp1vjcj18b44mv6hmbzskmai14x03zgimxgwwaqm";
        libraryHaskellDepends = [ base template-haskell tree-sitter ];
        doHaddock = false;
        description = "Tree-sitter grammar/parser for PHP";
@@ -238611,15 +238849,16 @@ self: {
 
   "tree-sitter-python" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, filepath
-     , hedgehog, template-haskell, tree-sitter
+     , hedgehog, semantic-source, template-haskell, tree-sitter
      }:
      mkDerivation {
        pname = "tree-sitter-python";
-       version = "0.4.0.0";
-       sha256 = "02i12ys845j4n0j7a1qpdlbx9ia51m7ab9lhk7d4028ysx82crn9";
+       version = "0.5.0.0";
+       sha256 = "1ikl7r2lmcynb4ahbmzjlq04s0ydnv8jixwgcihywnfn410w82sx";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         aeson base directory filepath template-haskell tree-sitter
+         aeson base directory filepath semantic-source template-haskell
+         tree-sitter
        ];
        testHaskellDepends = [ base bytestring hedgehog tree-sitter ];
        doHaddock = false;
@@ -238633,8 +238872,8 @@ self: {
     ({ mkDerivation, base, template-haskell, tree-sitter }:
      mkDerivation {
        pname = "tree-sitter-ruby";
-       version = "0.2.0.0";
-       sha256 = "0n2ls3mkinqv0h2h05pmi8scmgr70bpg3pdg9wnid1gdpcwn07qx";
+       version = "0.2.0.1";
+       sha256 = "1rk49pm93avr9fap8xim7zl26wms50q2f5x2yp9nq5w3mbm3j3sc";
        libraryHaskellDepends = [ base template-haskell tree-sitter ];
        doHaddock = false;
        description = "Tree-sitter grammar/parser for Ruby";
@@ -238647,8 +238886,8 @@ self: {
     ({ mkDerivation, base, template-haskell, tree-sitter }:
      mkDerivation {
        pname = "tree-sitter-tsx";
-       version = "0.2.1.0";
-       sha256 = "1lj2mmgqkswn8n5p4j4zdd0fw3syvg8v4d0ahnipvv1b05g1y1f4";
+       version = "0.2.1.1";
+       sha256 = "1r4kr4c0vslw3j2hanzf8wifabfynz5brayd6kz1hpczg8icandm";
        libraryHaskellDepends = [ base template-haskell tree-sitter ];
        doHaddock = false;
        description = "Tree-sitter grammar/parser for TSX";
@@ -238661,8 +238900,8 @@ self: {
     ({ mkDerivation, base, template-haskell, tree-sitter }:
      mkDerivation {
        pname = "tree-sitter-typescript";
-       version = "0.2.1.0";
-       sha256 = "1dgb5b1yhpwrr8qd18l4jlxx3g5c34zaxffh934pssyldckfbid6";
+       version = "0.2.1.1";
+       sha256 = "0i8vnc0afqnf8lnl8rmsax6b9pfx3s14s8q35f0h3ghpv9b38bs6";
        libraryHaskellDepends = [ base template-haskell tree-sitter ];
        doHaddock = false;
        description = "Tree-sitter grammar/parser for TypeScript";
@@ -245998,6 +246237,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "validity_0_9_0_2" = callPackage
+    ({ mkDerivation, base, hspec }:
+     mkDerivation {
+       pname = "validity";
+       version = "0.9.0.2";
+       sha256 = "1aa93lp1pqwv7vhx19nazlig8qhbp3psblbz360s5lii3s5rli2v";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec ];
+       description = "Validity typeclass";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "validity-aeson" = callPackage
     ({ mkDerivation, aeson, base, validity, validity-scientific
      , validity-text, validity-unordered-containers, validity-vector
@@ -246064,6 +246316,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "validity-path_0_4_0_0" = callPackage
+    ({ mkDerivation, base, filepath, genvalidity-hspec, hspec, path
+     , validity
+     }:
+     mkDerivation {
+       pname = "validity-path";
+       version = "0.4.0.0";
+       sha256 = "1clma6ll0n5biaci0bsi0zzf8xr2xnc1ff5vmbxyr98pz1wy6yn4";
+       libraryHaskellDepends = [ base filepath path validity ];
+       testHaskellDepends = [
+         base filepath genvalidity-hspec hspec path validity
+       ];
+       description = "Validity instances for Path";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "validity-primitive" = callPackage
     ({ mkDerivation, base, primitive, validity }:
      mkDerivation {
-- 
GitLab


From 04d6fa1385e91bcf300b125b3b3692d2ce94975a Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 28 Sep 2019 02:53:54 +0200
Subject: [PATCH 1200/2254] kitty: 0.14.5 -> 0.14.6

https://sw.kovidgoyal.net/kitty/changelog.html#id1
---
 pkgs/applications/misc/kitty/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix
index 1991cf1fa4a..1df331065c4 100644
--- a/pkgs/applications/misc/kitty/default.nix
+++ b/pkgs/applications/misc/kitty/default.nix
@@ -21,14 +21,14 @@
 with python3Packages;
 buildPythonApplication rec {
   pname = "kitty";
-  version = "0.14.5";
+  version = "0.14.6";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "kovidgoyal";
     repo = "kitty";
     rev = "v${version}";
-    sha256 = "0qx3wj4n3zgjcpd1vjjwdlz8d1vp8bkxihsg2khlla1izandgxxa";
+    sha256 = "1rb5ys9xsdhd2qa3kz5gqzz111c6b14za98va6hlglk69wqlmb51";
   };
 
   buildInputs = [
@@ -123,6 +123,6 @@ buildPythonApplication rec {
     description = "A modern, hackable, featureful, OpenGL based terminal emulator";
     license = licenses.gpl3;
     platforms = platforms.darwin ++ platforms.linux;
-    maintainers = with maintainers; [ tex rvolosatovs ];
+    maintainers = with maintainers; [ tex rvolosatovs ma27 ];
   };
 }
-- 
GitLab


From 52a9e1509a132334f5ba83301128e38578c0aead Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 18:10:23 -0700
Subject: [PATCH 1201/2254] powershell: 6.2.2 -> 6.2.3

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/powershell/versions
---
 pkgs/shells/powershell/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix
index a7fe9634fee..b999070a49e 100644
--- a/pkgs/shells/powershell/default.nix
+++ b/pkgs/shells/powershell/default.nix
@@ -4,8 +4,8 @@
 let platformString = if stdenv.isDarwin then "osx"
                      else if stdenv.isLinux then "linux"
                      else throw "unsupported platform";
-    platformSha = if stdenv.isDarwin then "005ax54l7752lhrvlpsyn2yywr4zh58psc7sc1qv9p86d414pmkq"
-                     else if stdenv.isLinux then "1b3n6d2xgvqybmh61smyr415sfaymiilixlvs04yxm6ajsbnsm82"
+    platformSha = if stdenv.isDarwin then "0jb2xm79m3m14zk7v730ai1zvxcb5a13jbkkya0qy7332k6gn6bl"
+                     else if stdenv.isLinux then "0s0jvc9ha6fw8qy7f5n0v6zf043rawsjdlm5wvqxq1q2idz7xcw1"
                      else throw "unsupported platform";
     platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH"
                      else if stdenv.isLinux then "LD_LIBRARY_PATH"
@@ -15,7 +15,7 @@ let platformString = if stdenv.isDarwin then "osx"
 in
 stdenv.mkDerivation rec {
   pname = "powershell";
-  version = "6.2.2";
+  version = "6.2.3";
 
   src = fetchzip {
     url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-${platformString}-x64.tar.gz";
-- 
GitLab


From 62ff5b63428b4f48317012b0ada5acdb89fbf094 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 18:15:57 -0700
Subject: [PATCH 1202/2254] pet: 0.3.5 -> 0.3.6

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/pet/versions
---
 pkgs/development/tools/pet/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/pet/default.nix b/pkgs/development/tools/pet/default.nix
index 7953a55c7d9..e7f4fce3c4d 100644
--- a/pkgs/development/tools/pet/default.nix
+++ b/pkgs/development/tools/pet/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "pet";
-  version = "0.3.5";
+  version = "0.3.6";
 
   src = fetchFromGitHub {
     owner = "knqyf263";
     repo = "pet";
     rev = "v${version}";
-    sha256 = "03fzvvdmb06kf2zglaf8jkqxqv9h1kl7n586ww61z3n3mmp1x4rd";
+    sha256 = "1na3az7vicjq1rxd3ybid47yrblsdazgli0dchkbwh8zchwhqj33";
   };
 
   modSha256 = "06ham8lsx5c1vk5jkwp1aa9g4q4g7sfq7gxz2gkffa98x2vlawyf";
-- 
GitLab


From 6fd3fea4db261f52e0b5422219d41adaf884a422 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 28 Sep 2019 03:23:49 +0200
Subject: [PATCH 1203/2254] minitube: 2.9 -> 3.2

https://flavio.tordini.org/minitube-3-2
https://flavio.tordini.org/minitube-3-1
https://flavio.tordini.org/minitube-3-0
---
 pkgs/applications/video/minitube/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/video/minitube/default.nix b/pkgs/applications/video/minitube/default.nix
index a9876da234f..f1f757d588f 100644
--- a/pkgs/applications/video/minitube/default.nix
+++ b/pkgs/applications/video/minitube/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, wrapQtAppsHook, phonon, phonon-backend-vlc, qtbase, qmake
-, qtdeclarative, qttools
+, qtdeclarative, qttools, qtx11extras, mpv
 
 # "Free" key generated by nckx <github@tobias.gr>. I no longer have a Google
 # account. You'll need to generate (and please share :-) a new one if it breaks.
@@ -7,16 +7,17 @@
 
 stdenv.mkDerivation rec {
   pname = "minitube";
-  version = "2.9";
+  version = "3.2";
 
   src = fetchFromGitHub {
-    sha256 = "11zkmwqadlgrrghs3rxq0h0fllfnyd3g09d7gdd6vd9r1a1yz73f";
+    sha256 = "0175sgqmszakqd631bni4aqjpx68h6n49zjvg23fb1yyancnkn4c";
     rev = version;
     repo = "minitube";
     owner = "flaviotordini";
+    fetchSubmodules = true;
   };
 
-  buildInputs = [ phonon phonon-backend-vlc qtbase qtdeclarative qttools ];
+  buildInputs = [ phonon phonon-backend-vlc qtbase qtdeclarative qttools qtx11extras mpv ];
   nativeBuildInputs = [ wrapQtAppsHook qmake ];
 
   qmakeFlags = [ "DEFINES+=APP_GOOGLE_API_KEY=${withAPIKey}" ];
-- 
GitLab


From 8c397c2bc2f105e84983c2ca1b7fc21d2564dc8c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 18:25:22 -0700
Subject: [PATCH 1204/2254] picard-tools: 2.20.5 -> 2.20.8

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/picard-tools/versions
---
 pkgs/applications/science/biology/picard-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix
index 2a57febe8f5..8fff296affa 100644
--- a/pkgs/applications/science/biology/picard-tools/default.nix
+++ b/pkgs/applications/science/biology/picard-tools/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "picard-tools";
-  version = "2.20.5";
+  version = "2.20.8";
 
   src = fetchurl {
     url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
-    sha256 = "107zlvp74ahpn652nfkipp80bbzf3fp812pi1ma42njk4wchah10";
+    sha256 = "01bibkwyp4xzwcpvkr3ab6z0syjmzj4zmyxl3bybmrp9irhjvydg";
   };
 
   nativeBuildInputs = [ makeWrapper ];
-- 
GitLab


From f2d04f2dd8f7400f22d2e0522fa40422c957387e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 18:32:41 -0700
Subject: [PATCH 1205/2254] profile-sync-daemon: 6.34 -> 6.35

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/profile-sync-daemon/versions
---
 pkgs/tools/misc/profile-sync-daemon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/profile-sync-daemon/default.nix b/pkgs/tools/misc/profile-sync-daemon/default.nix
index 989a2d3f22b..c1496e0dbc9 100644
--- a/pkgs/tools/misc/profile-sync-daemon/default.nix
+++ b/pkgs/tools/misc/profile-sync-daemon/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, utillinux}:
 
 stdenv.mkDerivation rec {
-  version = "6.34";
+  version = "6.35";
   pname = "profile-sync-daemon";
 
   src = fetchurl {
     url = "https://github.com/graysky2/profile-sync-daemon/archive/v${version}.tar.gz";
-    sha256 = "0v6yzgfwv3mhf1q2fp6abrvr15p9b1c1gahj3mdh5b4bfcsg3n5a";
+    sha256 = "0hd3cjhf9nv4q5gvc8lbh5c82095lll7mxll1mj5hkzmnijzsf0v";
   };
 
   installPhase = ''
-- 
GitLab


From 801268a8cdc5aaed388431bec65902cd793ec28d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 18:35:37 -0700
Subject: [PATCH 1206/2254] phoronix-test-suite: 8.8.1 -> 9.0.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/phoronix-test-suite/versions
---
 pkgs/tools/misc/phoronix-test-suite/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/phoronix-test-suite/default.nix b/pkgs/tools/misc/phoronix-test-suite/default.nix
index 6c1bc5fcf04..2dfbd227ac0 100644
--- a/pkgs/tools/misc/phoronix-test-suite/default.nix
+++ b/pkgs/tools/misc/phoronix-test-suite/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "phoronix-test-suite";
-  version = "8.8.1";
+  version = "9.0.0";
 
   src = fetchurl {
     url = "https://phoronix-test-suite.com/releases/${pname}-${version}.tar.gz";
-    sha256 = "1l5wnj5d652dg02j7iy7n9ab7qrpclmgvyxnh1s6cdnnnspyxznn";
+    sha256 = "1gfmkwfzgpbmhv2wdr5aiknv1jyazx7sb33nna34pnd3bkmak0bq";
   };
 
   buildInputs = [ php ];
-- 
GitLab


From 1d5e4fc30dda3a4ba01fc2f47d5193811104279a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 18:41:37 -0700
Subject: [PATCH 1207/2254] pmdk: 1.6 -> 1.6.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/pmdk/versions
---
 pkgs/development/libraries/pmdk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/pmdk/default.nix b/pkgs/development/libraries/pmdk/default.nix
index e945154c003..eae21639110 100644
--- a/pkgs/development/libraries/pmdk/default.nix
+++ b/pkgs/development/libraries/pmdk/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pmdk";
-  version = "1.6";
+  version = "1.6.1";
 
   src = fetchFromGitHub {
     owner  = "pmem";
     repo   = "pmdk";
     rev    = "refs/tags/${version}";
-    sha256 = "11h9h5ifgaa5f6v9y77s5lmsj7k61qg52992s1361cmvl0ndgl9k";
+    sha256 = "0iphvm9x8ly8srn3rn50qjp7339x5gpixn77n022xxr79g8jbxy6";
   };
 
   nativeBuildInputs = [ autoconf pkgconfig ];
-- 
GitLab


From 095f107c7e676b89066010cf23bd6f33dfcbc4e2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 18:45:32 -0700
Subject: [PATCH 1208/2254] postfix: 3.4.6 -> 3.4.7

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/postfix/versions
---
 pkgs/servers/mail/postfix/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix
index 39845f12f03..dedfd6614e2 100644
--- a/pkgs/servers/mail/postfix/default.nix
+++ b/pkgs/servers/mail/postfix/default.nix
@@ -26,11 +26,11 @@ in stdenv.mkDerivation rec {
 
   pname = "postfix";
 
-  version = "3.4.6";
+  version = "3.4.7";
 
   src = fetchurl {
     url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${pname}-${version}.tar.gz";
-    sha256 = "09p3vg2xlh6iq45gp6zanbp1728fc31r7zz71r131vh20ssajx6n";
+    sha256 = "0rzr0n1gljhmxidsslbr9505xcv0hm8jahkp4dm87a1v3l956cpy";
   };
 
   nativeBuildInputs = [ makeWrapper m4 ];
-- 
GitLab


From 5d8d34c4ba5ff98400899131468be9cdff3cc651 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 18:49:42 -0700
Subject: [PATCH 1209/2254] pulseaudio-ctl: 1.66 -> 1.67

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/pulseaudio-ctl/versions
---
 pkgs/applications/audio/pulseaudio-ctl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/pulseaudio-ctl/default.nix b/pkgs/applications/audio/pulseaudio-ctl/default.nix
index 1ad57efda7a..6b7d242e1f6 100644
--- a/pkgs/applications/audio/pulseaudio-ctl/default.nix
+++ b/pkgs/applications/audio/pulseaudio-ctl/default.nix
@@ -7,13 +7,13 @@ let
 
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
-  version = "1.66";
+  version = "1.67";
 
   src = fetchFromGitHub {
     owner = "graysky2";
     repo = pname;
     rev = "v${version}";
-    sha256 = "19a24w7y19551ar41q848w7r1imqkl9cpff4dpb7yry7qp1yjg0y";
+    sha256 = "1mf5r7x6aiqmx9mz7gpckrqvvzxnr5gs2q1k4m42rjk6ldkpdb46";
   };
 
   postPatch = ''
-- 
GitLab


From 2807da5e37fe7f1ec285cdfe24abdaa032df122a Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Fri, 27 Sep 2019 21:54:10 -0400
Subject: [PATCH 1210/2254] f2fs-tools: 1.11.0 -> 1.13.0

---
 pkgs/tools/filesystems/f2fs-tools/default.nix |  4 +--
 .../f2fs-tools/f2fs-tools-cross-fix.patch     | 30 ++++++++++---------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/pkgs/tools/filesystems/f2fs-tools/default.nix b/pkgs/tools/filesystems/f2fs-tools/default.nix
index d7fa971c987..c5ec523e247 100644
--- a/pkgs/tools/filesystems/f2fs-tools/default.nix
+++ b/pkgs/tools/filesystems/f2fs-tools/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "f2fs-tools";
-  version = "1.11.0";
+  version = "1.13.0";
 
   src = fetchgit {
     url = "https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git";
     rev = "refs/tags/v${version}";
-    sha256 = "188yv77ga466wpzbirsx6vspym8idaschgi7cx92z4jwqpnkk5gv";
+    sha256 = "0h6wincsvg6s232ajxblg66r5nx87v00a4w7xkbxgbl1qyny477j";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/tools/filesystems/f2fs-tools/f2fs-tools-cross-fix.patch b/pkgs/tools/filesystems/f2fs-tools/f2fs-tools-cross-fix.patch
index 1503732240c..e01a97b0bc3 100644
--- a/pkgs/tools/filesystems/f2fs-tools/f2fs-tools-cross-fix.patch
+++ b/pkgs/tools/filesystems/f2fs-tools/f2fs-tools-cross-fix.patch
@@ -1,25 +1,27 @@
---- f2fs-tools/configure.ac.orig	2018-11-29 05:05:57.154988687 +0300
-+++ f2fs-tools/configure.ac	2018-11-29 05:06:12.667316101 +0300
-@@ -20,14 +20,16 @@
+diff --git a/configure.ac b/configure.ac
+index 9b0e872..0108219 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -20,14 +20,16 @@ AC_DEFINE([F2FS_MINOR_VERSION], m4_bpatsubst(f2fs_tools_version,
  				[\([0-9]*\).\([0-9]*\)\(\w\|\W\)*], [\2]),
  				[Minor version for f2fs-tools])
  
--AC_CHECK_FILE(.git,
+-AS_IF([test -d .git],[
 -	AC_DEFINE([F2FS_TOOLS_DATE],
 -		"m4_bpatsubst(f2fs_tools_gitdate,
 -		[\([0-9-]*\)\(\w\|\W\)*], [\1])",
--		[f2fs-tools date based on Git commits]),
+-		[f2fs-tools date based on Git commits])],[
 -	AC_DEFINE([F2FS_TOOLS_DATE],
 -		"f2fs_tools_date",
--		[f2fs-tools date based on Source releases]))
-+dnl AC_CHECK_FILE(.git,
-+dnl 	AC_DEFINE([F2FS_TOOLS_DATE],
-+dnl 		"m4_bpatsubst(f2fs_tools_gitdate,
-+dnl 		[\([0-9-]*\)\(\w\|\W\)*], [\1])",
-+dnl 		[f2fs-tools date based on Git commits]),
-+dnl 	AC_DEFINE([F2FS_TOOLS_DATE],
-+dnl 		"f2fs_tools_date",
-+dnl 		[f2fs-tools date based on Source releases]))
+-		[f2fs-tools date based on Source releases])])
++dnl AS_IF([test -d .git],[
++dnl	AC_DEFINE([F2FS_TOOLS_DATE],
++dnl		"m4_bpatsubst(f2fs_tools_gitdate,
++dnl		[\([0-9-]*\)\(\w\|\W\)*], [\1])",
++dnl		[f2fs-tools date based on Git commits])],[
++dnl	AC_DEFINE([F2FS_TOOLS_DATE],
++dnl		"f2fs_tools_date",
++dnl		[f2fs-tools date based on Source releases])])
 +
 +AC_DEFINE([F2FS_TOOLS_DATE], "f2fs_tools_date", [f2fs-tools date based on Source releases])
  
-- 
GitLab


From 3f6ccc14b873ea1220d193962039a89e1422717b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 18:56:19 -0700
Subject: [PATCH 1211/2254] pspg: 1.6.8 -> 2.0.4

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/pspg/versions
---
 pkgs/tools/misc/pspg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix
index 81d7591b740..099c5598958 100644
--- a/pkgs/tools/misc/pspg/default.nix
+++ b/pkgs/tools/misc/pspg/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pspg";
-  version = "1.6.8";
+  version = "2.0.4";
 
   src = fetchFromGitHub {
     owner = "okbob";
     repo = "pspg";
     rev = version;
-    sha256 = "1lwzyimn28a7q8k2c8z7and4qhrdil0za8lixh96z6x4lcb0rz5q";
+    sha256 = "1xiyshz56qpx3bv0mzx73rqr7wmyamyj8jbqdv05wjb72npkjmzl";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From ebb136da9f4e743c8c1f873e9d85840559127265 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Sat, 28 Sep 2019 03:52:01 +0200
Subject: [PATCH 1212/2254] lib.mkRemovedOptionModule: Show replacement for
 option usage too

Previously mkRemovedOptionModule would only show the replacement
instructions when the removed option was *defined*. With this change, it
also does so when an option is *used*.

This is essential for options that are only intended to be used such as
`security.acme.directory`, whose replacement instructions would never
trigger without this change because almost everybody only uses the
option and isn't defining it.
---
 lib/modules.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/modules.nix b/lib/modules.nix
index c3c903c1dfa..629e7fb13fe 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -591,6 +591,7 @@ rec {
     { options, ... }:
     { options = setAttrByPath optionName (mkOption {
         visible = false;
+        apply = x: throw "The option `${showOption optionName}' can no longer be used since it's been removed. ${replacementInstructions}";
       });
       config.warnings =
         let opt = getAttrFromPath optionName options; in
-- 
GitLab


From 31e2429e04d9c7a1c5a6cd664ab3e41defe40156 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Fri, 27 Sep 2019 22:29:59 -0400
Subject: [PATCH 1213/2254] buildbot: 2.4.0 -> 2.4.1 (#69731)

---
 pkgs/development/python-modules/buildbot/default.nix |  4 ++--
 pkgs/development/python-modules/buildbot/pkg.nix     |  4 ++--
 pkgs/development/python-modules/buildbot/plugins.nix | 10 +++++-----
 pkgs/development/python-modules/buildbot/worker.nix  |  4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix
index c19fc280c7f..763362f6bd0 100644
--- a/pkgs/development/python-modules/buildbot/default.nix
+++ b/pkgs/development/python-modules/buildbot/default.nix
@@ -25,11 +25,11 @@ let
 
   package = buildPythonPackage rec {
     pname = "buildbot";
-    version = "2.4.0";
+    version = "2.4.1";
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "141ad2g1j5y0n5cdnd18m55ss0gqjlz5ky85rb6qfn73dgw42vmz";
+      sha256 = "0sqsp7ikmg5v48n1sy7l4913g906hyi1g9sikxd07n8vysp0ncx8";
     };
 
     propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/buildbot/pkg.nix b/pkgs/development/python-modules/buildbot/pkg.nix
index dababe48e99..31723b9537d 100644
--- a/pkgs/development/python-modules/buildbot/pkg.nix
+++ b/pkgs/development/python-modules/buildbot/pkg.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "buildbot-pkg";
-  version = "2.4.0";
+  version = "2.4.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0na336jwibgbix8fr4jki1gqys44kkm0a8q32llcr2z08igs4mvy";
+    sha256 = "0dfx3b6w9b326a0jrgc42a5ki84ya7bvx10pm62bfcby0mixhd4y";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/buildbot/plugins.nix b/pkgs/development/python-modules/buildbot/plugins.nix
index e31085a2498..e0855bbcb3d 100644
--- a/pkgs/development/python-modules/buildbot/plugins.nix
+++ b/pkgs/development/python-modules/buildbot/plugins.nix
@@ -7,7 +7,7 @@
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "0g3m5z8yska245r1x9n85b4br8b63i4zca2qn3qspf62b1wzmxmd";
+      sha256 = "0l4kyxh62y86cw97101gjs42n1sdw1n18cgh6mm337gzjn42nv3x";
     };
 
     buildInputs = [ buildbot buildbot-pkg mock ];
@@ -26,7 +26,7 @@
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "0p7az9mb09c4bl0j37w28wflzygq9vy8rjbbnhlfbs6py6mjdagr";
+      sha256 = "1s0jl5b9zd7iwxqfb2g145nzf5nx6q44x4y1axkzilkd777162cz";
     };
 
     buildInputs = [ buildbot-pkg ];
@@ -46,7 +46,7 @@
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "0ba0a7q7ii7sipvifxs9ldkcs4b975skndarmirbphc797993hj1";
+      sha256 = "0qld1424d4qvf08qz5ibl3pv0qzj0qxrvgra5dr3wagaq3jfh3kz";
     };
 
     buildInputs = [ buildbot-pkg ];
@@ -66,7 +66,7 @@
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "0dvchhjzmfbbrxqm8dlmwck22z99pgnflxk3cyn0wbb1qskhd9cv";
+      sha256 = "1di8w9dzalg3d2k3wff682irbi8dcksysc9n176zncmkbi2pr2ia";
     };
 
     buildInputs = [ buildbot-pkg ];
@@ -86,7 +86,7 @@
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "0w9p3y89rqsmqiacwj2avir42r0xjr2yri14v3ay6yar5391r8wa";
+      sha256 = "0gh6ddczlga75n6fh9pkbv39x8p3b6pqviaj287wab27wimd1hxa";
     };
 
     buildInputs = [ buildbot-pkg ];
diff --git a/pkgs/development/python-modules/buildbot/worker.nix b/pkgs/development/python-modules/buildbot/worker.nix
index 8cfc56678c0..ceeb365d1e3 100644
--- a/pkgs/development/python-modules/buildbot/worker.nix
+++ b/pkgs/development/python-modules/buildbot/worker.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage (rec {
   pname = "buildbot-worker";
-  version = "2.4.0";
+  version = "2.4.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "04dk1jg0yq0rcm7j7pn7l1pqqjhiyvwppnhc1b7106sx2cdj2yb2";
+    sha256 = "1l2ax9ywrhgrs9f9yyhiq5nhcf34w916ikx6bjcd6f201ixky1xg";
   };
 
   propagatedBuildInputs = [ twisted future ];
-- 
GitLab


From 56b8daef2f719ea0cadc669bbee5b9d7703453bc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 19:38:19 -0700
Subject: [PATCH 1214/2254] pulseeffects: 4.6.6 -> 4.6.8

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/pulseeffects/versions
---
 pkgs/applications/audio/pulseeffects/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/pulseeffects/default.nix b/pkgs/applications/audio/pulseeffects/default.nix
index 83fb17189e1..2a68f9a64f2 100644
--- a/pkgs/applications/audio/pulseeffects/default.nix
+++ b/pkgs/applications/audio/pulseeffects/default.nix
@@ -47,13 +47,13 @@ let
   ];
 in stdenv.mkDerivation rec {
   pname = "pulseeffects";
-  version = "4.6.6";
+  version = "4.6.8";
 
   src = fetchFromGitHub {
     owner = "wwmm";
     repo = "pulseeffects";
     rev = "v${version}";
-    sha256 = "15w1kc1b0i8wrkrbfzrvcscanxvcsz336bfyi1awb1lbclvd3sf4";
+    sha256 = "09crsg73mvqdknvh6lczwx16x73zb2vb3m53bsapqiaq4lmwy3qr";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From eacd9639f6e795975a72ed50c455579e61e95a75 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 19:42:17 -0700
Subject: [PATCH 1215/2254] poco: 1.9.2 -> 1.9.4

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/poco/versions
---
 pkgs/development/libraries/poco/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/poco/default.nix b/pkgs/development/libraries/poco/default.nix
index c19e343f19a..88977e48479 100644
--- a/pkgs/development/libraries/poco/default.nix
+++ b/pkgs/development/libraries/poco/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
   pname = "poco";
 
-  version = "1.9.2";
+  version = "1.9.4";
 
   src = fetchurl {
     url = "https://pocoproject.org/releases/${pname}-${version}/${pname}-${version}-all.tar.gz";
-    sha256 = "0jkbxw6z8l7zpr7bh2xcyzk8a5apzyz4ranhl66gxna1ay0gpzvd";
+    sha256 = "0xzxi3r4v2076kcxhj7b1achma2lqy01spshxq8sfh0jn5bz4d7b";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];
-- 
GitLab


From e10996a5693c663830ae503918dc872082e910f6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 19:48:03 -0700
Subject: [PATCH 1216/2254] ponyc: 0.30.0 -> 0.31.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/ponyc/versions
---
 pkgs/development/compilers/ponyc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix
index 85641c351d4..6c9c9c77e6d 100644
--- a/pkgs/development/compilers/ponyc/default.nix
+++ b/pkgs/development/compilers/ponyc/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation ( rec {
   pname = "ponyc";
-  version = "0.30.0";
+  version = "0.31.0";
 
   src = fetchFromGitHub {
     owner = "ponylang";
     repo = pname;
     rev = version;
-    sha256 = "1gs9x4rw4mfv499j3k1brm8gbz7pjl8dyr7v68pa2f563cbzwaq9";
+    sha256 = "0cchikwga59b3p7ip9d6kxz50w5yvk1dh1dcmbix4fwfwc3zdm75";
   };
 
   buildInputs = [ llvm makeWrapper which ];
-- 
GitLab


From e6439c7698cacb6507bbe2aa33dbb80b2c9dd0c6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 19:56:05 -0700
Subject: [PATCH 1217/2254] pgbouncer: 1.10.0 -> 1.11.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/pgbouncer/versions
---
 pkgs/servers/sql/pgbouncer/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/pgbouncer/default.nix b/pkgs/servers/sql/pgbouncer/default.nix
index 30be61a805a..76b35a345b5 100644
--- a/pkgs/servers/sql/pgbouncer/default.nix
+++ b/pkgs/servers/sql/pgbouncer/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "pgbouncer";
-  version = "1.10.0";
+  version = "1.11.0";
 
   src = fetchurl {
     url = "https://pgbouncer.github.io/downloads/files/${version}/${pname}-${version}.tar.gz";
-    sha256 = "1m8vsxyna5grs5p0vnxf3fxxnkk9aqjf3qmr2bbkpkhlzr11986q";
+    sha256 = "0w3y53kwnkcm9fmf28zbjvqk6ivfic5f2k3nflvca1i8iaj2z044";
   };
 
   buildInputs = [ libevent openssl c-ares pkg-config ];
-- 
GitLab


From a2ef604823615c020e98706600e609f47fc30726 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 20:24:30 -0700
Subject: [PATCH 1218/2254] python37Packages.annoy: 1.15.2 -> 1.16.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-annoy/versions
---
 pkgs/development/python-modules/annoy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/annoy/default.nix b/pkgs/development/python-modules/annoy/default.nix
index ce7d9940bf2..e06f916d5a3 100644
--- a/pkgs/development/python-modules/annoy/default.nix
+++ b/pkgs/development/python-modules/annoy/default.nix
@@ -5,12 +5,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "1.15.2";
+  version = "1.16.0";
   pname = "annoy";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1i5bkf8mwd1pyrbhfwncir2r8yq8s9qz5j13vv2qz92n9g57sr3m";
+    sha256 = "0jnm38kg7aw63mkd5113i3pb2p9fp5cia91jwhyg9sazb45bzpv9";
   };
 
   checkInputs = [
-- 
GitLab


From 44b7c0a5f1079f3ce51e1cf44dd5282c643e78fc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 20:27:00 -0700
Subject: [PATCH 1219/2254] python37Packages.canmatrix: 0.7 -> 0.8

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-canmatrix/versions
---
 pkgs/development/python-modules/canmatrix/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/canmatrix/default.nix b/pkgs/development/python-modules/canmatrix/default.nix
index a6c3f485d74..004669d605b 100644
--- a/pkgs/development/python-modules/canmatrix/default.nix
+++ b/pkgs/development/python-modules/canmatrix/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "canmatrix";
-  version = "0.7";
+  version = "0.8";
 
   # uses fetchFromGitHub as PyPi release misses test/ dir
   src = fetchFromGitHub {
     owner = "ebroecker";
     repo = pname;
     rev = version;
-    sha256 = "0q8qb282nfgirl8r2i9c8whm3hvr14ig2r42ssgnv2hya971cwjq";
+    sha256 = "1wzflapyj2j4xsi7d7gfmznmxbgr658n092xyq9nac46rbhpcphg";
   };
 
   propagatedBuildInputs = [
-- 
GitLab


From 3731d036e97a6743467719aef381f30bc041f026 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 20:29:40 -0700
Subject: [PATCH 1220/2254] python37Packages.ase: 3.18.0 -> 3.18.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-ase/versions
---
 pkgs/development/python-modules/ase/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ase/default.nix b/pkgs/development/python-modules/ase/default.nix
index 643bafe617a..c84672e8abc 100644
--- a/pkgs/development/python-modules/ase/default.nix
+++ b/pkgs/development/python-modules/ase/default.nix
@@ -12,12 +12,12 @@
 
 buildPythonPackage rec {
   pname = "ase";
-  version = "3.18.0";
+  version = "3.18.1";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1ycp1yksysiiz902gn762030sfmirxm950pwpw2rcrpjvq95zm1r";
+    sha256 = "0zxcdj61j9mxlgk2y4ax6rpml9gvmal8aa3pdmwwq4chyzdlh6g2";
   };
 
   propagatedBuildInputs = [ numpy scipy matplotlib flask pillow psycopg2 ];
-- 
GitLab


From 30414d6d7babbb3ee08f8083dcf7426166a9453f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 20:34:37 -0700
Subject: [PATCH 1221/2254] python37Packages.azure-batch: 7.0.0 -> 8.0.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-azure-batch/versions
---
 pkgs/development/python-modules/azure-batch/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-batch/default.nix b/pkgs/development/python-modules/azure-batch/default.nix
index 8297c67b90d..42bb4cbad6c 100644
--- a/pkgs/development/python-modules/azure-batch/default.nix
+++ b/pkgs/development/python-modules/azure-batch/default.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "azure-batch";
-  version = "7.0.0";
+  version = "8.0.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "1q8mdjdbz408z2j0y1zxqg9zg8j1v84p0dnh621vq73a2x1g298j";
+    sha256 = "1j8nibnics9vakhqiwnjv7bwril7mfyz1svcvvsrb9a4wbdd12wi";
   };
 
   propagatedBuildInputs = [
-- 
GitLab


From c6745f039853da6f1bdab05b4e1bdb61a9ee23d4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 20:41:50 -0700
Subject: [PATCH 1222/2254] python37Packages.aioconsole: 0.1.14 -> 0.1.15

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-aioconsole/versions
---
 pkgs/development/python-modules/aioconsole/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aioconsole/default.nix b/pkgs/development/python-modules/aioconsole/default.nix
index aa8ed392934..36a1c1b76e4 100644
--- a/pkgs/development/python-modules/aioconsole/default.nix
+++ b/pkgs/development/python-modules/aioconsole/default.nix
@@ -10,11 +10,11 @@
 # wrapped to be able to find aioconsole and any other packages.
 buildPythonPackage rec {
   pname = "aioconsole";
-  version = "0.1.14";
+  version = "0.1.15";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f1ddd04050d9be5e93e223a4e9367433436d245f8fe70905f4124bfde2cd3cdd";
+    sha256 = "0gbl08p89959g8dqy2vainppg3kyf948xlh18p7iwk5p0mw5d3j9";
   };
 
   # hardcodes a test dependency on an old version of pytest-asyncio
-- 
GitLab


From b7704dab0970ae237be8c1454eca2f0cb0c1ff71 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 27 Sep 2019 23:00:00 -0500
Subject: [PATCH 1223/2254] boringtun: 20190407 -> 0.2.0

---
 pkgs/tools/networking/boringtun/default.nix | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/networking/boringtun/default.nix b/pkgs/tools/networking/boringtun/default.nix
index 05e9ba1282e..56e0728739c 100644
--- a/pkgs/tools/networking/boringtun/default.nix
+++ b/pkgs/tools/networking/boringtun/default.nix
@@ -2,25 +2,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "boringtun";
-  # "boringtun" is still undergoing review for security concerns.
-  # The GitHub page does not show any release yet,
-  # use 20190407 as version number to indicate that it is an unstable version.
-  version = "20190407";
+  version = "0.2.0";
 
   src = fetchFromGitHub {
     owner = "cloudflare";
     repo = pname;
-    rev = "b040eb4fd1591b1d5ceb07c6cbb0856553f50adc";
-    sha256 = "04i53dvxld2a0xzr0gfl895rcwfvisj1rfs7rl0444gml8s8xyb3";
+    rev = "v${version}";
+    sha256 = "1mijy51hd8c4as9g4ivpfxismc9m5m3nhibfvclh3wrlcmp1ha9c";
   };
 
   cargoSha256 = "1gvmshwg9b486933vfgkg2r8nn6w6dyz42hqjy74p785fcg0v5hs";
 
-  # To prevent configuration phase error that is caused by
-  # lacking a new line in file ".cargo/config",
-  # we append a new line to the end of file.
-  preConfigure = "echo '' >> .cargo/config";
-
   buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
 
   # Testing this project requires sudo, Docker and network access, etc.
-- 
GitLab


From 2b5e13d3eaa4faa150804ed42b8e8da946ff73c9 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 27 Sep 2019 23:01:00 -0500
Subject: [PATCH 1224/2254] boringtun: add marsam as maintainer

---
 pkgs/tools/networking/boringtun/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/boringtun/default.nix b/pkgs/tools/networking/boringtun/default.nix
index 56e0728739c..dfb13f2168b 100644
--- a/pkgs/tools/networking/boringtun/default.nix
+++ b/pkgs/tools/networking/boringtun/default.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
     description = "Userspace WireGuard® implementation in Rust";
     homepage = https://github.com/cloudflare/boringtun;
     license = licenses.bsd3;
-    maintainers = with maintainers; [ xrelkd ];
+    maintainers = with maintainers; [ xrelkd marsam ];
     platforms = platforms.linux ++ platforms.darwin;
   };
 }
-- 
GitLab


From 4df266aa07175dfe8760eee68953813f59034f0d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 21:07:35 -0700
Subject: [PATCH 1225/2254] python37Packages.asgiref: 3.2.1 -> 3.2.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-asgiref/versions
---
 pkgs/development/python-modules/asgiref/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/asgiref/default.nix b/pkgs/development/python-modules/asgiref/default.nix
index 295bc750f82..e75be31c85f 100644
--- a/pkgs/development/python-modules/asgiref/default.nix
+++ b/pkgs/development/python-modules/asgiref/default.nix
@@ -1,6 +1,6 @@
 { stdenv, buildPythonPackage, pythonOlder, fetchFromGitHub, async-timeout, pytest, pytest-asyncio }:
 buildPythonPackage rec {
-  version = "3.2.1";
+  version = "3.2.2";
   pname = "asgiref";
 
   disabled = pythonOlder "3.5";
@@ -10,7 +10,7 @@ buildPythonPackage rec {
     owner = "django";
     repo = pname;
     rev = version;
-    sha256 = "16wb137dvnjmbmshy4r9vgsfjc4g8d6l527aj9d5vszyk5x5fm7d";
+    sha256 = "11lnynspgdi5zp3hd8piy8h9fq0s3ck6lzyl7h0fn2mxxyx83yh2";
   };
 
   propagatedBuildInputs = [ async-timeout ];
-- 
GitLab


From 698d44e272e018a8842608777e99eb7ae78fd6b9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 21:33:42 -0700
Subject: [PATCH 1226/2254] python37Packages.asyncssh: 1.17.1 -> 1.18.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-asyncssh/versions
---
 pkgs/development/python-modules/asyncssh/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix
index ba94e395f67..da222f7e615 100644
--- a/pkgs/development/python-modules/asyncssh/default.nix
+++ b/pkgs/development/python-modules/asyncssh/default.nix
@@ -5,12 +5,12 @@
 
 buildPythonPackage rec {
   pname = "asyncssh";
-  version = "1.17.1";
+  version = "1.18.0";
   disabled = pythonOlder "3.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0gyqms4zs9j9k7dgy24va4w42vf20x75yx9jvsds0sg42mqlkd5v";
+    sha256 = "1d9x7xpsqqd5scdk7f1c76lycgrxylaaf5qn4p46i8clfvm5a435";
   };
 
   patches = [
-- 
GitLab


From 484fa5154957ef78803a73ade9b4ba1e3ab82ad7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 21:46:28 -0700
Subject: [PATCH 1227/2254] python37Packages.azure-mgmt-signalr: 0.2.0 -> 0.3.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-azure-mgmt-signalr/versions
---
 .../development/python-modules/azure-mgmt-signalr/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-signalr/default.nix b/pkgs/development/python-modules/azure-mgmt-signalr/default.nix
index 5751bfb042c..050e8e7b4e9 100644
--- a/pkgs/development/python-modules/azure-mgmt-signalr/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-signalr/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-signalr";
-  version = "0.2.0";
+  version = "0.3.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "0k39hf6r2rfy2wyxd9czha2mwmcqf6sc1v69jyh6ml3slbliivlz";
+    sha256 = "08b2i6wz9n13h77ahay1hvmg8abk2vvs7kn4y7xip9gi6ij8fv0a";
   };
 
   propagatedBuildInputs = [
-- 
GitLab


From c5791b47725a87933726d69a8c61b9de77d3dc36 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 22:03:46 -0700
Subject: [PATCH 1228/2254] python37Packages.distributed: 2.3.0 -> 2.4.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-distributed/versions
---
 pkgs/development/python-modules/distributed/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix
index 4a892ddb705..b8383ec3daf 100644
--- a/pkgs/development/python-modules/distributed/default.nix
+++ b/pkgs/development/python-modules/distributed/default.nix
@@ -28,12 +28,12 @@
 
 buildPythonPackage rec {
   pname = "distributed";
-  version = "2.3.0";
+  version = "2.4.0";
 
   # get full repository need conftest.py to run tests
   src = fetchPypi {
     inherit pname version;
-    sha256 = "15lb6fz3739nkyxi1igzm5p2lk40digkc9fkzjqx1jpymfac9dwl";
+    sha256 = "1cz7n84g8dgx3cs28qnrh1sd6lka9lx8llysxa6mxyz6wf3ngl9h";
   };
 
   checkInputs = [ pytest pytest-repeat pytest-faulthandler pytest-timeout mock joblib ];
-- 
GitLab


From f1688df276f0dc5588ac51e2125f80a53a5d23ca Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 22:09:01 -0700
Subject: [PATCH 1229/2254] python37Packages.apprise: 0.7.9 -> 0.8.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-apprise/versions
---
 pkgs/development/python-modules/apprise/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix
index 7b8885de169..c2c542a8c01 100644
--- a/pkgs/development/python-modules/apprise/default.nix
+++ b/pkgs/development/python-modules/apprise/default.nix
@@ -1,21 +1,21 @@
 { lib, buildPythonPackage, fetchPypi
-, Babel, decorator, requests, requests_oauthlib, six, click, markdown, pyyaml
+, Babel, requests, requests_oauthlib, six, click, markdown, pyyaml
 , pytestrunner, coverage, flake8, mock, pytest, pytestcov, tox
 }:
 
 buildPythonPackage rec {
   pname = "apprise";
-  version = "0.7.9";
+  version = "0.8.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0zqnk255d311ibird08sv0c21fw1r1xhldhyx5lnl3ji1xkv9173";
+    sha256 = "02apbzckj158995k9ls0gr1m9hfk7nw3ck0bp7k41srl5wdys72i";
   };
 
   nativeBuildInputs = [ Babel ];
 
   propagatedBuildInputs = [
-    decorator requests requests_oauthlib six click markdown pyyaml
+    requests requests_oauthlib six click markdown pyyaml
   ];
 
   checkInputs = [
-- 
GitLab


From d56f066e979f24c3b74174dec0c89deba2d2a834 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 22:11:27 -0700
Subject: [PATCH 1230/2254] python37Packages.flask-restplus: 0.12.1 -> 0.13.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-flask-restplus/versions
---
 pkgs/development/python-modules/flask-restplus/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/flask-restplus/default.nix b/pkgs/development/python-modules/flask-restplus/default.nix
index f7f8360fa48..2fc0fa8569b 100644
--- a/pkgs/development/python-modules/flask-restplus/default.nix
+++ b/pkgs/development/python-modules/flask-restplus/default.nix
@@ -18,11 +18,11 @@
 
 buildPythonPackage rec {
   pname = "flask-restplus";
-  version = "0.12.1";
+  version = "0.13.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3fad697e1d91dfc13c078abcb86003f438a751c5a4ff41b84c9050199d2eab62";
+    sha256 = "0p4zz8b5bwbw7w0vhbyihl99d2gw13cb81rxzj4z626a1cnl8vm6";
   };
 
   checkInputs = [ nose blinker tzlocal mock rednose ];
-- 
GitLab


From d377c1e1b556a35c4defc9f00fa7fe1caa50756d Mon Sep 17 00:00:00 2001
From: Lily Ballard <lily@sb.org>
Date: Thu, 26 Sep 2019 11:19:32 -0700
Subject: [PATCH 1231/2254] cocoapods: 1.7.5 -> 1.8.1

---
 .../development/mobile/cocoapods/Gemfile.lock | 27 +++++---
 pkgs/development/mobile/cocoapods/gemset.nix  | 69 +++++++++++++++----
 2 files changed, 71 insertions(+), 25 deletions(-)

diff --git a/pkgs/development/mobile/cocoapods/Gemfile.lock b/pkgs/development/mobile/cocoapods/Gemfile.lock
index b8ce7131b9f..e2de7cb0bf1 100644
--- a/pkgs/development/mobile/cocoapods/Gemfile.lock
+++ b/pkgs/development/mobile/cocoapods/Gemfile.lock
@@ -1,24 +1,27 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.0)
+    CFPropertyList (3.0.1)
     activesupport (4.2.11.1)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
+    algoliasearch (1.27.1)
+      httpclient (~> 2.8, >= 2.8.3)
+      json (>= 1.5.1)
     atomos (0.1.3)
-    claide (1.0.2)
-    cocoapods (1.7.5)
+    claide (1.0.3)
+    cocoapods (1.8.1)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.7.5)
+      cocoapods-core (= 1.8.1)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
       cocoapods-downloader (>= 1.2.2, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
       cocoapods-stats (>= 1.0.0, < 2.0)
-      cocoapods-trunk (>= 1.3.1, < 2.0)
+      cocoapods-trunk (>= 1.4.0, < 2.0)
       cocoapods-try (>= 1.1.0, < 2.0)
       colored2 (~> 3.1)
       escape (~> 0.0.4)
@@ -27,9 +30,11 @@ GEM
       molinillo (~> 0.6.6)
       nap (~> 1.0)
       ruby-macho (~> 1.4)
-      xcodeproj (>= 1.10.0, < 2.0)
-    cocoapods-core (1.7.5)
+      xcodeproj (>= 1.11.1, < 2.0)
+    cocoapods-core (1.8.1)
       activesupport (>= 4.0.2, < 6)
+      algoliasearch (~> 1.0)
+      concurrent-ruby (~> 1.1)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
     cocoapods-deintegrate (1.0.4)
@@ -38,7 +43,7 @@ GEM
       nap
     cocoapods-search (1.0.0)
     cocoapods-stats (1.1.0)
-    cocoapods-trunk (1.3.1)
+    cocoapods-trunk (1.4.1)
       nap (>= 0.8, < 2.0)
       netrc (~> 0.11)
     cocoapods-try (1.1.0)
@@ -48,9 +53,11 @@ GEM
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
+    httpclient (2.8.3)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    minitest (5.11.3)
+    json (2.2.0)
+    minitest (5.12.0)
     molinillo (0.6.6)
     nanaimo (0.2.6)
     nap (1.1.0)
@@ -59,7 +66,7 @@ GEM
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    xcodeproj (1.11.0)
+    xcodeproj (1.12.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
diff --git a/pkgs/development/mobile/cocoapods/gemset.nix b/pkgs/development/mobile/cocoapods/gemset.nix
index 003c3a1bc13..2eb630e0f93 100644
--- a/pkgs/development/mobile/cocoapods/gemset.nix
+++ b/pkgs/development/mobile/cocoapods/gemset.nix
@@ -10,6 +10,17 @@
     };
     version = "4.2.11.1";
   };
+  algoliasearch = {
+    dependencies = ["httpclient" "json"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1ayg8j3819ay2d8618jv32ca16fh8qsgjsiq9j32yd016c170nkj";
+      type = "gem";
+    };
+    version = "1.27.1";
+  };
   atomos = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -19,20 +30,24 @@
     version = "0.1.3";
   };
   CFPropertyList = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0ykjag3k5msz3sf1j91rb55da2xh596y06m3a4yl79fiy2id0w9z";
+      sha256 = "0fr8sdzs2q1969zqh790w223hjidlwx4hfm4c91gj0va5j5pv3n8";
       type = "gem";
     };
-    version = "3.0.0";
+    version = "3.0.1";
   };
   claide = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0az54rp691hc42yl1xyix2cxv58byhaaf4gxbpghvvq29l476rzc";
+      sha256 = "0kasxsms24fgcdsq680nz99d5lazl9rmz1qkil2y5gbbssx89g0z";
       type = "gem";
     };
-    version = "1.0.2";
+    version = "1.0.3";
   };
   cocoapods = {
     dependencies = ["activesupport" "claide" "cocoapods-core" "cocoapods-deintegrate" "cocoapods-downloader" "cocoapods-plugins" "cocoapods-search" "cocoapods-stats" "cocoapods-trunk" "cocoapods-try" "colored2" "escape" "fourflusher" "gh_inspector" "molinillo" "nap" "ruby-macho" "xcodeproj"];
@@ -40,21 +55,21 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "02gnm6l7f3pxmy7bqns0dhxmanlqp01hkpvng5cxryww17zrq2qz";
+      sha256 = "108zj698l44wnc0jgx81gxra86c7mrzyqrx6rxssalrc5rviadw7";
       type = "gem";
     };
-    version = "1.7.5";
+    version = "1.8.1";
   };
   cocoapods-core = {
-    dependencies = ["activesupport" "fuzzy_match" "nap"];
+    dependencies = ["activesupport" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1i53x5lhlvyirls2ch45x9wsrfqk7s3zp85lbnwps9abimxj4nh4";
+      sha256 = "15bcc7771jws4p3n3sd26faxslah0yvqgpb0y8gh6d0dwjdygmk0";
       type = "gem";
     };
-    version = "1.7.5";
+    version = "1.8.1";
   };
   cocoapods-deintegrate = {
     groups = ["default"];
@@ -105,12 +120,14 @@
   };
   cocoapods-trunk = {
     dependencies = ["nap" "netrc"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1plssgabdv6hcaq1c3gf43kf1d2prx883q8lzdr6chi5byzzs3yl";
+      sha256 = "0vrwsgaq3nf7v3pwksgqy0mhswrp3ipczrc96vl3ii2pcc9ilwkw";
       type = "gem";
     };
-    version = "1.3.1";
+    version = "1.4.1";
   };
   cocoapods-try = {
     source = {
@@ -172,6 +189,16 @@
     };
     version = "1.1.3";
   };
+  httpclient = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99";
+      type = "gem";
+    };
+    version = "2.8.3";
+  };
   i18n = {
     dependencies = ["concurrent-ruby"];
     source = {
@@ -181,13 +208,25 @@
     };
     version = "0.9.5";
   };
+  json = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0sx97bm9by389rbzv8r1f43h06xcz8vwi3h5jv074gvparql7lcx";
+      type = "gem";
+    };
+    version = "2.2.0";
+  };
   minitest = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq";
+      sha256 = "1kj5m8gg643w8jh8nsdy15bpddmnnafhyzhjx7gp28l1acb4fik7";
       type = "gem";
     };
-    version = "5.11.3";
+    version = "5.12.0";
   };
   molinillo = {
     source = {
@@ -254,9 +293,9 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1h73ilwyjwyyhj761an3pmicllw50514gxb6b1r4z4klc9rzxw4j";
+      sha256 = "162gwhrl7ppj6hlmnpp1scvy1ylcv5xqk51826v075sckdqjp8c8";
       type = "gem";
     };
-    version = "1.11.0";
+    version = "1.12.0";
   };
 }
\ No newline at end of file
-- 
GitLab


From 8d44be304129f89ea190b6fcc32e18fe85ef51fc Mon Sep 17 00:00:00 2001
From: Lily Ballard <lily@sb.org>
Date: Thu, 26 Sep 2019 11:19:43 -0700
Subject: [PATCH 1232/2254] cocoapods-beta: 1.8.0.beta.2 -> 1.8.1

---
 .../mobile/cocoapods/Gemfile-beta.lock        | 14 ++++++-------
 .../mobile/cocoapods/gemset-beta.nix          | 20 +++++++++----------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/mobile/cocoapods/Gemfile-beta.lock b/pkgs/development/mobile/cocoapods/Gemfile-beta.lock
index c75dc334ebc..5a30e40293e 100644
--- a/pkgs/development/mobile/cocoapods/Gemfile-beta.lock
+++ b/pkgs/development/mobile/cocoapods/Gemfile-beta.lock
@@ -7,15 +7,15 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    algoliasearch (1.26.1)
+    algoliasearch (1.27.1)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
     atomos (0.1.3)
     claide (1.0.3)
-    cocoapods (1.8.0.beta.2)
+    cocoapods (1.8.1)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.8.0.beta.2)
+      cocoapods-core (= 1.8.1)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
       cocoapods-downloader (>= 1.2.2, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -31,10 +31,10 @@ GEM
       nap (~> 1.0)
       ruby-macho (~> 1.4)
       xcodeproj (>= 1.11.1, < 2.0)
-    cocoapods-core (1.8.0.beta.2)
+    cocoapods-core (1.8.1)
       activesupport (>= 4.0.2, < 6)
       algoliasearch (~> 1.0)
-      concurrent-ruby (~> 1.0)
+      concurrent-ruby (~> 1.1)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
     cocoapods-deintegrate (1.0.4)
@@ -43,7 +43,7 @@ GEM
       nap
     cocoapods-search (1.0.0)
     cocoapods-stats (1.1.0)
-    cocoapods-trunk (1.4.0)
+    cocoapods-trunk (1.4.1)
       nap (>= 0.8, < 2.0)
       netrc (~> 0.11)
     cocoapods-try (1.1.0)
@@ -57,7 +57,7 @@ GEM
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
     json (2.2.0)
-    minitest (5.11.3)
+    minitest (5.12.0)
     molinillo (0.6.6)
     nanaimo (0.2.6)
     nap (1.1.0)
diff --git a/pkgs/development/mobile/cocoapods/gemset-beta.nix b/pkgs/development/mobile/cocoapods/gemset-beta.nix
index e2d4127ae44..f5f95db3ced 100644
--- a/pkgs/development/mobile/cocoapods/gemset-beta.nix
+++ b/pkgs/development/mobile/cocoapods/gemset-beta.nix
@@ -16,10 +16,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1vlasxdgz49y75p8vjkbdpb4kmc73xv71d7vpn9x9xjgvsar03kp";
+      sha256 = "1ayg8j3819ay2d8618jv32ca16fh8qsgjsiq9j32yd016c170nkj";
       type = "gem";
     };
-    version = "1.26.1";
+    version = "1.27.1";
   };
   atomos = {
     groups = ["default"];
@@ -57,10 +57,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1qsj34czqsy93w2bnwhdhr0cyzjwl7vy3sknmak4syyni6m0rlli";
+      sha256 = "108zj698l44wnc0jgx81gxra86c7mrzyqrx6rxssalrc5rviadw7";
       type = "gem";
     };
-    version = "1.8.0.beta.2";
+    version = "1.8.1";
   };
   cocoapods-core = {
     dependencies = ["activesupport" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap"];
@@ -68,10 +68,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "166pr9m3da9hsra9rviaxz3i4spm7kl003mkn7sn25r9smcvfdj4";
+      sha256 = "15bcc7771jws4p3n3sd26faxslah0yvqgpb0y8gh6d0dwjdygmk0";
       type = "gem";
     };
-    version = "1.8.0.beta.2";
+    version = "1.8.1";
   };
   cocoapods-deintegrate = {
     groups = ["default"];
@@ -130,10 +130,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1m0p27aij7d0n0b8h7nvyv3q3prcpwisbj7sla0fp2hvn4lqarl5";
+      sha256 = "0vrwsgaq3nf7v3pwksgqy0mhswrp3ipczrc96vl3ii2pcc9ilwkw";
       type = "gem";
     };
-    version = "1.4.0";
+    version = "1.4.1";
   };
   cocoapods-try = {
     groups = ["default"];
@@ -241,10 +241,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq";
+      sha256 = "1kj5m8gg643w8jh8nsdy15bpddmnnafhyzhjx7gp28l1acb4fik7";
       type = "gem";
     };
-    version = "5.11.3";
+    version = "5.12.0";
   };
   molinillo = {
     groups = ["default"];
-- 
GitLab


From 6d38dc4db52684fe87196704d8322cae3dcf72f9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 22:16:45 -0700
Subject: [PATCH 1233/2254] python37Packages.azure-mgmt-network: 4.0.0 -> 5.0.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-azure-mgmt-network/versions
---
 .../development/python-modules/azure-mgmt-network/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-network/default.nix b/pkgs/development/python-modules/azure-mgmt-network/default.nix
index 6384df020e0..a950f1f7c03 100644
--- a/pkgs/development/python-modules/azure-mgmt-network/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-network/default.nix
@@ -7,13 +7,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "4.0.0";
+  version = "5.0.0";
   pname = "azure-mgmt-network";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "0h2lnigmh2arq0ppwjk8h9rqxplj6s7h7qxwyv7wirk0ydx6cfd9";
+    sha256 = "03ymxm3ryhgh4f1pw00fiyb3lxv2w6nkvn8xnj91h8xdd34flqzc";
   };
 
   postInstall = if isPy3k then "" else ''
-- 
GitLab


From 0375786e87c93e3293d00141eb32a3c80b570f74 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 22:49:11 -0700
Subject: [PATCH 1234/2254] python37Packages.cssselect2: 0.2.1 -> 0.2.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-cssselect2/versions
---
 pkgs/development/python-modules/cssselect2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cssselect2/default.nix b/pkgs/development/python-modules/cssselect2/default.nix
index 45a9920dbe2..ff56e2a2f47 100644
--- a/pkgs/development/python-modules/cssselect2/default.nix
+++ b/pkgs/development/python-modules/cssselect2/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "cssselect2";
-  version = "0.2.1";
+  version = "0.2.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "505d2ce3d3a1d390ddb52f7d0864b7efeb115a5b852a91861b498b92424503ab";
+    sha256 = "0skymzb4ncrm2zdsy80f53vi0arf776lvbp51hzh4ayp1il5lj3h";
   };
 
   # We're not interested in code quality tests
-- 
GitLab


From a65a72f2de6f9bc863b122b61ba4f1f2f7a6c558 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 22:51:52 -0700
Subject: [PATCH 1235/2254] python37Packages.django_silk: 3.0.3 -> 3.0.4

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-django-silk/versions
---
 pkgs/development/python-modules/django_silk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django_silk/default.nix b/pkgs/development/python-modules/django_silk/default.nix
index 13ba5ef7964..85e5f8f02f0 100644
--- a/pkgs/development/python-modules/django_silk/default.nix
+++ b/pkgs/development/python-modules/django_silk/default.nix
@@ -23,14 +23,14 @@
 
 buildPythonPackage rec {
   pname = "django-silk";
-  version = "3.0.3";
+  version = "3.0.4";
 
   # pypi tarball doesn't include test project
   src = fetchFromGitHub {
     owner = "jazzband";
     repo = "django-silk";
     rev = version;
-    sha256 = "0j1r88zv7fvmlnrzr2h65czzdcpvl7n847ra1pfc52bfa4lf8b9j";
+    sha256 = "10542yvbchcy8hik2hw3jclb4ic89mxkw0sykag4bw9sv43xv7vx";
   };
   # "test_time_taken" tests aren't suitable for reproducible execution, but django's
   # test runner doesn't have an easy way to ignore tests - so instead prevent it from picking
-- 
GitLab


From 4545ea0483366bdcc7df0fec7c006b64b0d109db Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 23:01:03 -0700
Subject: [PATCH 1236/2254] python37Packages.azure-mgmt-servicefabric: 0.3.0 ->
 0.4.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-azure-mgmt-servicefabric/versions
---
 .../python-modules/azure-mgmt-servicefabric/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix b/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix
index 3dad2bccdc2..cf44d66eab7 100644
--- a/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-servicefabric";
-  version = "0.3.0";
+  version = "0.4.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "0cirsp8wnsswba6gbmw4s2ljsjwi3855my063gvi2mqr55spvx2n";
+    sha256 = "1x18grkjf2p2r1ihlwv607sna9yjvsr2jwnkjc55askrgrwx5jx2";
   };
 
   propagatedBuildInputs = [
-- 
GitLab


From 9218d6ba954e1af8757c72a043ab2fdca8ad6f96 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 23:05:53 -0700
Subject: [PATCH 1237/2254] python37Packages.bugzilla: 2.2.0 -> 2.3.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-bugzilla/versions
---
 pkgs/development/python-modules/bugzilla/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bugzilla/default.nix b/pkgs/development/python-modules/bugzilla/default.nix
index 52d42b7a263..a342ac99943 100644
--- a/pkgs/development/python-modules/bugzilla/default.nix
+++ b/pkgs/development/python-modules/bugzilla/default.nix
@@ -3,12 +3,12 @@
 
 buildPythonPackage rec {
   pname = "bugzilla";
-  version = "2.2.0";
+  version = "2.3.0";
 
   src = fetchPypi {
     pname = "python-${pname}";
     inherit version;
-    sha256 = "0x3jjb1g5bgjdj0jf0jmcg80hn5x2isf49frwvf2ykdl3fxd5gxc";
+    sha256 = "0q8c3k0kdnd11g2s56cp8va9365x0xfr2m2zn9fgxjijdyhwdic5";
   };
 
   buildInputs = [ pep8 coverage logilab_common ];
-- 
GitLab


From aa486995d9e5b5fc8f00419c07d27875b88840b2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 23:25:01 -0700
Subject: [PATCH 1238/2254] python37Packages.azure-mgmt-devtestlabs: 3.0.0 ->
 4.0.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-azure-mgmt-devtestlabs/versions
---
 .../python-modules/azure-mgmt-devtestlabs/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix b/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix
index f5d60a74b60..62ae975f8d5 100644
--- a/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-devtestlabs";
-  version = "3.0.0";
+  version = "4.0.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "b3d5b2919021bf45f0acdd34ab23dc9b0435d9d0a6b472e5008128fb8521e700";
+    sha256 = "1397ksrd61jv7400mgn8sqngp6ahir55fyq9n5k69wk88169qm2r";
   };
 
   propagatedBuildInputs = [
-- 
GitLab


From 0feb3d4ee77daf7f2d882c3a58955bda38d5aae5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 00:14:48 -0700
Subject: [PATCH 1239/2254] python37Packages.cupy: 6.2.0 -> 6.3.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-cupy/versions
---
 pkgs/development/python-modules/cupy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix
index d0f3a7dc762..407988b6c73 100644
--- a/pkgs/development/python-modules/cupy/default.nix
+++ b/pkgs/development/python-modules/cupy/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "cupy";
-  version = "6.2.0";
+  version = "6.3.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0d6liaavgqks772rqam53qha3yk6dfw24i0pj3izxvvawzhlp10z";
+    sha256 = "1q38riv63110ch170c1pyhq5jfbg8y0qmcdsqn8vb9sb79amvg93";
   };
 
   checkInputs = [
-- 
GitLab


From 913dfc4c8176374b4c3c3ce9e564dbf8dd447015 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 00:43:56 -0700
Subject: [PATCH 1240/2254] python37Packages.django-cors-headers: 3.0.2 ->
 3.1.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-django-cors-headers/versions
---
 .../python-modules/django-cors-headers/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django-cors-headers/default.nix b/pkgs/development/python-modules/django-cors-headers/default.nix
index 24146306af7..a91d6bf2870 100644
--- a/pkgs/development/python-modules/django-cors-headers/default.nix
+++ b/pkgs/development/python-modules/django-cors-headers/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "django-cors-headers";
-  version = "3.0.2";
+  version = "3.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0b11nkcviwv5dqnlmv63bgzciczb51wairm8b6wr6sda4p7y5wzb";
+    sha256 = "0g1vqhc36ay518vs67kkf6w76ay27dc73w145bpwgp9fky81r6z6";
   };
 
   propagatedBuildInputs = [ django ];
-- 
GitLab


From 5f434d11e8eb328ff511f40edc98ea54335919ae Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 01:03:30 -0700
Subject: [PATCH 1241/2254] python37Packages.django-allauth: 0.39.1 -> 0.40.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-django-allauth/versions
---
 pkgs/development/python-modules/django-allauth/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django-allauth/default.nix b/pkgs/development/python-modules/django-allauth/default.nix
index 50922ccded2..10fe8cde826 100644
--- a/pkgs/development/python-modules/django-allauth/default.nix
+++ b/pkgs/development/python-modules/django-allauth/default.nix
@@ -3,14 +3,14 @@
 
 buildPythonPackage rec {
   pname = "django-allauth";
-  version = "0.39.1";
+  version = "0.40.0";
 
   # no tests on PyPI
   src = fetchFromGitHub {
     owner = "pennersr";
     repo = pname;
     rev = version;
-    sha256 = "1kplkanhj26z3i6p0l1r5lczha4pavcx96vj3kpcp1rvyk1v0f7r";
+    sha256 = "10id4k01p1hg5agb8cmllg8mv4kc7ryl75br10idwxabqqp4vla1";
   };
 
   propagatedBuildInputs = [ requests requests_oauthlib django python3-openid ];
-- 
GitLab


From 61801968aa648eed8fafc905bd4a707c416c33a5 Mon Sep 17 00:00:00 2001
From: xrelkd <46590321+xrelkd@users.noreply.github.com>
Date: Sat, 28 Sep 2019 16:12:59 +0800
Subject: [PATCH 1242/2254] parity: 2.5.7 -> 2.5.9

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

diff --git a/pkgs/applications/blockchains/parity/default.nix b/pkgs/applications/blockchains/parity/default.nix
index 88d24a87e13..299bb0639b6 100644
--- a/pkgs/applications/blockchains/parity/default.nix
+++ b/pkgs/applications/blockchains/parity/default.nix
@@ -1,6 +1,6 @@
 let
-  version     = "2.5.7";
-  sha256      = "0aprs71cbf98dsvjz0kydngkvdg5x7dijji8j6xadgvsarl1ljnj";
-  cargoSha256 = "11mr5q5aynli9xm4wnxcypl3ij7f4b0p7l557yi9n0cvdraw8ki4";
+  version     = "2.5.9";
+  sha256      = "06gmfw5l8n5i35dimsmj6dn0fxhbp53zjrdvbkff63r5kfqnwnx2";
+  cargoSha256 = "1kdy0bnmyqx4rhpq0a8gliy6mws68n035kfkxrfa6cxr2cn53dyb";
 in
   import ./parity.nix { inherit version sha256 cargoSha256; }
-- 
GitLab


From eae30c7929b39effb7f783d0673cca130cc1c6da Mon Sep 17 00:00:00 2001
From: xrelkd <46590321+xrelkd@users.noreply.github.com>
Date: Sat, 28 Sep 2019 16:13:33 +0800
Subject: [PATCH 1243/2254] parity-beta: 2.6.2 -> 2.6.4

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

diff --git a/pkgs/applications/blockchains/parity/beta.nix b/pkgs/applications/blockchains/parity/beta.nix
index a6d4660dff1..a26a1b7cc77 100644
--- a/pkgs/applications/blockchains/parity/beta.nix
+++ b/pkgs/applications/blockchains/parity/beta.nix
@@ -1,6 +1,6 @@
 let
-  version     = "2.6.2";
-  sha256      = "1j4249m5k3bi7di0wq6fm64zv3nlpgmg4hr5hnn94fyc09nz9n1r";
-  cargoSha256 = "1wr0i54zc3l6n0x6cvlq9zfy3bw9w5fcvdz4vmyym9r1nkvk31s7";
+  version     = "2.6.4";
+  sha256      = "11l93w97961zig4gqf345j9l20g0mjp7fayl1mdwdp14hhd5zk5g";
+  cargoSha256 = "1q6cbms7j1h726bvq38npxkjkmz14b5ir9c4z7pb0jcy7gkplyxx";
 in
   import ./parity.nix { inherit version sha256 cargoSha256; }
-- 
GitLab


From 0cdb1a45ff44af2270d414efcf254d46e9e49953 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 01:18:38 -0700
Subject: [PATCH 1244/2254] python37Packages.amqp: 2.5.0 -> 2.5.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-amqp/versions
---
 pkgs/development/python-modules/amqp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/amqp/default.nix b/pkgs/development/python-modules/amqp/default.nix
index bf008df3832..b8d9e8f2537 100644
--- a/pkgs/development/python-modules/amqp/default.nix
+++ b/pkgs/development/python-modules/amqp/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "amqp";
-  version = "2.5.0";
+  version = "2.5.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1j1046gcriidsfha0hvrw6hwcm0wrhbvg0prjjji5inaadyzidnb";
+    sha256 = "0s2yxnnhhx9hww0n33yn22q6sgnbd6n2nw92050qv2qpc3i1ga8r";
   };
 
   checkInputs = [ pytest case pytest-sugar ];
-- 
GitLab


From 88fe67a7dc88670ab76b4d6c2c77e946a5aca9bc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 01:25:49 -0700
Subject: [PATCH 1245/2254] python37Packages.azure-datalake-store: 0.0.45 ->
 0.0.47

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-azure-datalake-store/versions
---
 .../python-modules/azure-datalake-store/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-datalake-store/default.nix b/pkgs/development/python-modules/azure-datalake-store/default.nix
index 508fa8bf87e..f2fdbd40edc 100644
--- a/pkgs/development/python-modules/azure-datalake-store/default.nix
+++ b/pkgs/development/python-modules/azure-datalake-store/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "azure-datalake-store";
-  version = "0.0.45";
+  version = "0.0.47";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1k2wkpdv30wjmi53zdcsa5xfqw8gyak39na73ja6rb7wy8196wbd";
+    sha256 = "19fkkabr76r851r95kh5dpk4bdn3jkysv3aij6i2x99mkb4vxg2m";
   };
 
   propagatedBuildInputs = [
-- 
GitLab


From 55d429554576c8a60624dfec177c89d505a0f6d8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 01:35:01 -0700
Subject: [PATCH 1246/2254] python37Packages.azure-mgmt-datamigration: 2.2.0 ->
 3.0.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-azure-mgmt-datamigration/versions
---
 .../python-modules/azure-mgmt-datamigration/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix b/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix
index 9d1bdb7a013..d752abd6012 100644
--- a/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-datamigration";
-  version = "2.2.0";
+  version = "3.0.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "0bixyya9afas0sv2wji7ivfi64z4dvv8p1gjnppibi5zas1mb4zw";
+    sha256 = "0pc5pf7jpkpdrad5hafh2hki01dpx5773whp6kpxp71gh265mm5n";
   };
 
   propagatedBuildInputs = [
-- 
GitLab


From b3521524d45844254e1814da65dd92c2229f11b7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 01:40:19 -0700
Subject: [PATCH 1247/2254] python37Packages.azure-mgmt-cognitiveservices:
 4.0.0 -> 5.0.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-azure-mgmt-cognitiveservices/versions
---
 .../python-modules/azure-mgmt-cognitiveservices/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix b/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix
index d0ebe0470ae..fc12cafc117 100644
--- a/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-cognitiveservices";
-  version = "4.0.0";
+  version = "5.0.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "05zbgy1d6mschqv6y14byr4nwdnv48x9skx4rbsbz1fcqqx3j2sd";
+    sha256 = "1m7v3rfkvmdgghrpz15fm8pvmmhi40lcwfxdm2kxh7mx01r5l906";
   };
 
   propagatedBuildInputs = [
-- 
GitLab


From 017199e4b8cf656c013af28f6432b67c4de04d7e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 01:42:44 -0700
Subject: [PATCH 1248/2254] python37Packages.azure-mgmt-batch: 6.0.0 -> 7.0.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-azure-mgmt-batch/versions
---
 pkgs/development/python-modules/azure-mgmt-batch/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-batch/default.nix b/pkgs/development/python-modules/azure-mgmt-batch/default.nix
index 67fe9c568ea..f218fe58e87 100644
--- a/pkgs/development/python-modules/azure-mgmt-batch/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-batch/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-batch";
-  version = "6.0.0";
+  version = "7.0.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "dc929d2a0a65804c28a75dc00bb84ba581f805582a09238f4e7faacb15f8a2a3";
+    sha256 = "18dwgbwk1kc0pdqa85hbsm9312l50rf8ymb60fia1c9rni9bdi8n";
   };
 
   propagatedBuildInputs = [
-- 
GitLab


From 3dffba8a472347e456aab5c8cb71e721548621e3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 01:47:19 -0700
Subject: [PATCH 1249/2254] python37Packages.fido2: 0.7.0 -> 0.7.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-fido2/versions
---
 pkgs/development/python-modules/fido2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/fido2/default.nix b/pkgs/development/python-modules/fido2/default.nix
index 8922d6e0519..08aa2fe7eb2 100644
--- a/pkgs/development/python-modules/fido2/default.nix
+++ b/pkgs/development/python-modules/fido2/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "fido2";
-  version = "0.7.0";
+  version = "0.7.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "11wdcjymw8y6wxgp29gbhdxff3lpc5yp5fcqnr5vnj88g192ic27";
+    sha256 = "10i61g8srx1dk0wfjj11s7ka5pv0661ivwg2r0y3y2nsnf5b90s4";
   };
 
   propagatedBuildInputs = [ six cryptography ];
-- 
GitLab


From de9c03ed4bda6f88ac5c9d05229eb58e637ba1a3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 01:49:45 -0700
Subject: [PATCH 1250/2254] python37Packages.influxdb: 5.2.2 -> 5.2.3

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-influxdb/versions
---
 pkgs/development/python-modules/influxdb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/influxdb/default.nix b/pkgs/development/python-modules/influxdb/default.nix
index 657a8178440..d624ebd60e5 100644
--- a/pkgs/development/python-modules/influxdb/default.nix
+++ b/pkgs/development/python-modules/influxdb/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "influxdb";
-  version = "5.2.2";
+  version = "5.2.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0hriag4d4gx4bsqisiz29478sj54b215p6xzmshlw6x9af4z5vxg";
+    sha256 = "0dlddhbmd37qsdfyqn9w3xx4v07hladj6fvk9i15jxmz0iz6q9rh";
   };
 
   # ImportError: No module named tests
-- 
GitLab


From 9fa4c619d4be053b7d006f6de6b638d9e2cf2275 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 01:58:57 -0700
Subject: [PATCH 1251/2254] python37Packages.affine: 2.2.2 -> 2.3.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-affine/versions
---
 pkgs/development/python-modules/affine/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/affine/default.nix b/pkgs/development/python-modules/affine/default.nix
index e2fd802cf80..ba137ed5178 100644
--- a/pkgs/development/python-modules/affine/default.nix
+++ b/pkgs/development/python-modules/affine/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "affine";
-  version = "2.2.2";
+  version = "2.3.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "146slzpj2b220dmbmrxib030wymvplawxzn7gcgnbahgm500y3gz";
+    sha256 = "00jil4q3b17qml6azim7s7zar6qb1vhsf0g888y637m23bpms11f";
   };
 
   checkInputs = [ pytest ];
-- 
GitLab


From ec3e40cf2409619a2d8ec993eea4e825718e2598 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 02:08:12 -0700
Subject: [PATCH 1252/2254] python37Packages.django-mailman3: 1.2.0 -> 1.3.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-django-mailman3/versions
---
 pkgs/development/python-modules/django-mailman3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django-mailman3/default.nix b/pkgs/development/python-modules/django-mailman3/default.nix
index 91cea9b0059..5702bb226b4 100644
--- a/pkgs/development/python-modules/django-mailman3/default.nix
+++ b/pkgs/development/python-modules/django-mailman3/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "django-mailman3";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0v6c1jhcc212wc2xa314irfcchl05r7nysrcy63dcaan958kmnnx";
+    sha256 = "0wppv1q3jkkg2d66qsygc4dfpvhfcj5i2as2xpqnzf3l3w7dgja1";
   };
 
   propagatedBuildInputs = [
-- 
GitLab


From 9c3452cbc3bcdce8d82836ea62df6992d4adf42b Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Sat, 28 Sep 2019 11:13:13 +0200
Subject: [PATCH 1253/2254] vimPlugins: update

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

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index be1e6427bee..5f354491691 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -61,12 +61,12 @@ let
 
   ale = buildVimPluginFrom2Nix {
     pname = "ale";
-    version = "2019-09-20";
+    version = "2019-09-25";
     src = fetchFromGitHub {
       owner = "w0rp";
       repo = "ale";
-      rev = "ab8e0433536dc6074c77f6ed1fa18325ea1be349";
-      sha256 = "0nlpcph9f0sfx50rvzdc2vz6b23x2hgx46ywjflfix54cmakpkl8";
+      rev = "41ff80dc9ec2cc834cc8c4aaa753e308223d48b8";
+      sha256 = "1bfylcp9490cd2yz00nq6ky1w55dkvldrdjxip36ahci4cpfn0xw";
     };
   };
 
@@ -83,12 +83,12 @@ let
 
   ansible-vim = buildVimPluginFrom2Nix {
     pname = "ansible-vim";
-    version = "2019-09-15";
+    version = "2019-09-27";
     src = fetchFromGitHub {
       owner = "pearofducks";
       repo = "ansible-vim";
-      rev = "95531d40e5c5a6417aac53b7d4e8bd7130d5efe6";
-      sha256 = "1xa8hh95am0baxrjm411fdpzmf3mkkfcpb56cxr81n9idmq1qlqp";
+      rev = "ac2e4f55aedddd7f473aaaa4035062c3c489e8c3";
+      sha256 = "0kgdm06g67y3pfzcd4wqdrc59klxchrim755ml1038hbnk39lilj";
     };
   };
 
@@ -105,12 +105,12 @@ let
 
   auto-git-diff = buildVimPluginFrom2Nix {
     pname = "auto-git-diff";
-    version = "2019-01-21";
+    version = "2019-09-23";
     src = fetchFromGitHub {
       owner = "hotwatermorning";
       repo = "auto-git-diff";
-      rev = "1be2fec036f747fe44ec7f0a3868af0b0980954f";
-      sha256 = "1yvbz4pn73j8jyarjbwidr88zg7vw3gq3hvh4334148iq2fj8529";
+      rev = "a14d52b7ed7e7fb69bf1de9d363f3abdd3410b3a";
+      sha256 = "0i0bnlxclh8pzanrxj428728mdx4wdy19fx499kiin87qr4r2hbn";
     };
   };
 
@@ -314,12 +314,12 @@ let
 
   coc-go = buildVimPluginFrom2Nix {
     pname = "coc-go";
-    version = "2019-09-16";
+    version = "2019-09-24";
     src = fetchFromGitHub {
       owner = "josa42";
       repo = "coc-go";
-      rev = "3c7954c3e167ca3785efb96d3e95563b7e0d4045";
-      sha256 = "0nir8yvqrz2a8zmjp8ny4s08qlcvy3ms6k55i21xvyjwyrmrknpq";
+      rev = "a03314978c6b94701ddfd614f70e52d63bfd4540";
+      sha256 = "1awshnwsvrdxmh0xd1yqp3vnsva93i89frss0gym1szv15697j2q";
     };
   };
 
@@ -380,12 +380,12 @@ let
 
   coc-json = buildVimPluginFrom2Nix {
     pname = "coc-json";
-    version = "2019-09-12";
+    version = "2019-09-22";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-json";
-      rev = "ad75187c954f55ec3f92ca9ac5d9f77347b0bbfe";
-      sha256 = "0hwv394498qz6bb5zl2i57d18dbl4faxmh3g2d8mfggmx16pv41n";
+      rev = "d47bbf74ccee5954be887845248251eb9b75635e";
+      sha256 = "08xr276n37x8wx5jzka0hw09mx20n4irdcq1mmy89w9p9rh54fgh";
     };
   };
 
@@ -402,12 +402,12 @@ let
 
   coc-neco = buildVimPluginFrom2Nix {
     pname = "coc-neco";
-    version = "2018-12-21";
+    version = "2019-09-23";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-neco";
-      rev = "2c33b8b5a9847ff5b4abca37be88131cc4d746ab";
-      sha256 = "10b23y5g16ggb5mrn1f6dv5mr3ncg0wpn8bvn8g22zz4g737nzii";
+      rev = "e6eb1ccc2ab98966fe678107c6da0d4ddfa34f10";
+      sha256 = "14lph4dg7q0s5yjdr8snz9yl7bn6gs42ikizb6mxq43qqfdnxzdx";
     };
   };
 
@@ -424,12 +424,12 @@ let
 
   coc-prettier = buildVimPluginFrom2Nix {
     pname = "coc-prettier";
-    version = "2019-09-16";
+    version = "2019-09-26";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-prettier";
-      rev = "5b25fc3a4709c1e0e61f95ec82f039d1b8c426a3";
-      sha256 = "1j4whxna3gjjs29ndlfr9wpzylapa889831yf1pn7lz2847hnjdr";
+      rev = "6e7d0e32ecc60c68f0ebbd3cf26ea6b7c3c95faa";
+      sha256 = "0fxn2p78d16wgy74mb24hnyq63d2wmzv0873yg950cal4xidw644";
     };
   };
 
@@ -545,12 +545,12 @@ let
 
   coc-tsserver = buildVimPluginFrom2Nix {
     pname = "coc-tsserver";
-    version = "2019-09-09";
+    version = "2019-09-23";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-tsserver";
-      rev = "30cf468536a47c994133bb0b5614f305dd6441fe";
-      sha256 = "1nkx1wmhmic4xavb5pnssv14cb6k3znc2jlfcc3ipanm0a6bwkpx";
+      rev = "4bd9cde9dc8c623b9486b845f7a5df2f466e70e6";
+      sha256 = "0mqjf4x95sx61h4r80aifpzdzwb6s832g5g0nnz4p2c1gpcckz63";
     };
   };
 
@@ -766,23 +766,23 @@ let
 
   dart-vim-plugin = buildVimPluginFrom2Nix {
     pname = "dart-vim-plugin";
-    version = "2019-09-20";
+    version = "2019-09-24";
     src = fetchFromGitHub {
       owner = "dart-lang";
       repo = "dart-vim-plugin";
-      rev = "27b3ebd24f1c5690700b7f94f112c06216a0dd76";
-      sha256 = "012vg71h0jijhj430dqd38xh2gq5k79zr1m59gvh004jjb8bh8c7";
+      rev = "f8486e58fb02351689ae247cebf28b5fee326c33";
+      sha256 = "038zx5zn4da73ps5klixcwh64z6rivfp78l2lvaj5d1vjqh1ac83";
     };
   };
 
   defx-nvim = buildVimPluginFrom2Nix {
     pname = "defx-nvim";
-    version = "2019-08-19";
+    version = "2019-09-25";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "defx.nvim";
-      rev = "dbd2dceea914ecaa71d24a1d6036f1981becdca5";
-      sha256 = "1gl18s39v7k1p6z7hchq1k16f6f1i2ccq76as562c0nvn68jdqi8";
+      rev = "6da0c868fbc8c1fbdc99bb2208d1070c30994cd0";
+      sha256 = "17mm0hjhvcgkwp48lazjrv9g34bi31xr79f1nr3k55q1g0cqb3a4";
     };
   };
 
@@ -821,12 +821,12 @@ let
 
   denite-nvim = buildVimPluginFrom2Nix {
     pname = "denite-nvim";
-    version = "2019-09-19";
+    version = "2019-09-28";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "denite.nvim";
-      rev = "a4969dfe9decc6184548b919379ec39027d627c6";
-      sha256 = "0crwjbvflvf5axgqqfj04q67ilgfnhchi0gxbxi152h6hm4f1wx3";
+      rev = "2de8a3dfd7a104ce6e661c672d58f90ffa90dc35";
+      sha256 = "1bnlr0lrkl8djhji0vaplx73vw4yq82nx90lzd9jch1fm4d5mdq0";
     };
   };
 
@@ -934,23 +934,23 @@ let
 
   deoplete-ternjs = buildVimPluginFrom2Nix {
     pname = "deoplete-ternjs";
-    version = "2019-07-09";
+    version = "2019-09-22";
     src = fetchFromGitHub {
       owner = "carlitux";
       repo = "deoplete-ternjs";
-      rev = "fe5935dcf3cbaa663c81e2b9705a93840a407e56";
-      sha256 = "04yqw92yjcvimwvx1dqqc50y52j3y4zkvjkxmpmfnyx86ah730fk";
+      rev = "307f9c3beb178026d122d9ab3825e4640dd1c29a";
+      sha256 = "039qbcg9fanrs7dc52n987rhd0xdyvsmjdrfd1dcrr6ys990n64d";
     };
   };
 
   deoplete-nvim = buildVimPluginFrom2Nix {
     pname = "deoplete-nvim";
-    version = "2019-09-20";
+    version = "2019-09-26";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "deoplete.nvim";
-      rev = "7f1d4d8b1f5dbf344f2d0d1f4b8c5d6a0aaa24a6";
-      sha256 = "1i8964nwarq2hwbixbj74n5a5k8c27hn7srbf8bbckk12rh1rjkj";
+      rev = "503c42d17deb812ee5363e271cca0e68856a289d";
+      sha256 = "1b4hd4g3s96gbq3bi4jbry02jhbzvhx09jss574krhp771mrkzl2";
     };
   };
 
@@ -1057,12 +1057,12 @@ let
 
   falcon = buildVimPluginFrom2Nix {
     pname = "falcon";
-    version = "2019-09-17";
+    version = "2019-09-24";
     src = fetchFromGitHub {
       owner = "fenetikm";
       repo = "falcon";
-      rev = "a6ba8a5d6745d92a23eb8b95562bbd9f05f8de5f";
-      sha256 = "0in4fs2aycwyspi1yck36f6w6m9jmjm5ckdq5wxisvjncnzxblhs";
+      rev = "346587418bc7a1b39bdf65dce2a85a1058ed87b5";
+      sha256 = "17qa5xhqjy43sg1nmm83z90dk8nfkd64n98ijx04kqprk6jp90rq";
     };
   };
 
@@ -1090,12 +1090,12 @@ let
 
   ferret = buildVimPluginFrom2Nix {
     pname = "ferret";
-    version = "2019-08-13";
+    version = "2019-09-27";
     src = fetchFromGitHub {
       owner = "wincent";
       repo = "ferret";
-      rev = "aeb47b01b36021aaf84ff4f7f1a4cf64bc68fe53";
-      sha256 = "1cssvdpkmrlby50p2lyqfz1jhp5igyv1bqd34588p3ivsd3hrhyy";
+      rev = "d03f7ebeb0cea0311d23888adb1d62efcf04021a";
+      sha256 = "1xh6jp1gzmn211bfv7v1r88sh49x1zly16qs3k70qgj9w57zgwwy";
     };
   };
 
@@ -1410,12 +1410,12 @@ let
 
   jedi-vim = buildVimPluginFrom2Nix {
     pname = "jedi-vim";
-    version = "2019-09-18";
+    version = "2019-09-24";
     src = fetchFromGitHub {
       owner = "davidhalter";
       repo = "jedi-vim";
-      rev = "89c995e7d964fb71c715e6f4ac330e4c59b44128";
-      sha256 = "02ks1bwrdw7zmnf9mipvfjla9cv6904sx18q9qnyrqbkclrpfn0y";
+      rev = "50abb5e95a8d496dbda7b04a9bb78e4a6cd0a968";
+      sha256 = "04zag6ngqa1djwc2yk0p6hwknsm06nl3lvlyymz57vl51nhmvc2c";
       fetchSubmodules = true;
     };
   };
@@ -1730,12 +1730,12 @@ let
 
   neoformat = buildVimPluginFrom2Nix {
     pname = "neoformat";
-    version = "2019-08-26";
+    version = "2019-09-26";
     src = fetchFromGitHub {
       owner = "sbdchd";
       repo = "neoformat";
-      rev = "eb94d083bc0c9a4e4bec8a205fc65f6a464bd0f7";
-      sha256 = "1va2dvqjjlcyl2in9wjh6c8gmnxlnl13j7gmf2g37j6jm28l16r9";
+      rev = "6b66c20fadd489460422104a62279a0cd8b35eda";
+      sha256 = "1kfhirlxq90vbqzg0wwa69aya0k89icxbw8qdinfrsfng1f3yliq";
     };
   };
 
@@ -1840,23 +1840,23 @@ let
 
   nerdcommenter = buildVimPluginFrom2Nix {
     pname = "nerdcommenter";
-    version = "2019-09-20";
+    version = "2019-09-26";
     src = fetchFromGitHub {
       owner = "scrooloose";
       repo = "nerdcommenter";
-      rev = "50f307bbf68e7402a1564689910ec65ae7ab1781";
-      sha256 = "0f3b9vx3lvq8612k1qnsdzbwp2drvy1vj3xqfxvxpzzsay10qcb1";
+      rev = "a4b7c046b3d3e170c6f62a6209abfa0760d6694a";
+      sha256 = "0qz5b00rv59b3ng8wzf69lgbabqxfwzxbcj2595hmyf6pi0k0swz";
     };
   };
 
   nerdtree = buildVimPluginFrom2Nix {
     pname = "nerdtree";
-    version = "2019-09-15";
+    version = "2019-09-26";
     src = fetchFromGitHub {
       owner = "scrooloose";
       repo = "nerdtree";
-      rev = "9193962ad88f15d9f426c3cfb8a274ff1dd0c5b2";
-      sha256 = "1mgi6k3q46za4c8z9nc4rn6pcj4bc9pkvfqbzymwn03pj4r6n8yp";
+      rev = "496b61ead1acd80128164cce5c2ff8e89c42ded2";
+      sha256 = "0d7c6rf8sbfvxfqd79i92gas7rcd9lzfw15iiala3xr74bap5kpb";
     };
   };
 
@@ -1939,12 +1939,12 @@ let
 
   nvimdev-nvim = buildVimPluginFrom2Nix {
     pname = "nvimdev-nvim";
-    version = "2019-09-03";
+    version = "2019-09-27";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvimdev.nvim";
-      rev = "83c2a2aab7f2f7ae8c004c52aaddc8b15065ba90";
-      sha256 = "0i0ds5mfx2k03ivncw795xr3p9iig1b4pqj4mbr7b7hs3984jh08";
+      rev = "c405a548d489e3bb93784ecf5f6fa25109305ac1";
+      sha256 = "17n9adnhhc6hnvrw98i54f8jb1510bfzgciwf436l5xgcjgvqvk0";
     };
   };
 
@@ -3171,12 +3171,12 @@ let
 
   vim-devicons = buildVimPluginFrom2Nix {
     pname = "vim-devicons";
-    version = "2019-09-17";
+    version = "2019-09-23";
     src = fetchFromGitHub {
       owner = "ryanoasis";
       repo = "vim-devicons";
-      rev = "0f9146e9fafe3317693ca214a3f68cd1e036424f";
-      sha256 = "086ng0gja855bmh99qcwwvchwk64dgz1kj1j24yapx2ab314w6g8";
+      rev = "fae1550b95f537b879da7ebb7bfaa0ac65859271";
+      sha256 = "1h0x6wck52ga8qq2phk718yn30yniljbhgrvp59qi5fskx8hsjd4";
     };
   };
 
@@ -3204,12 +3204,12 @@ let
 
   vim-dispatch = buildVimPluginFrom2Nix {
     pname = "vim-dispatch";
-    version = "2019-09-20";
+    version = "2019-09-27";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-dispatch";
-      rev = "1f39fa150fc9275ff264e1f8807fc6fcbbdae012";
-      sha256 = "0c1492hh0gldjyd8w3wsyz6py7qw4r2idfjh8klkk39pg9aajwjl";
+      rev = "4bd1ecd7f38206ef26c37d7d142df58c4237d9dc";
+      sha256 = "0wz8p8fm48dbpzd00h9qw0q2s3r7nm8qa5kcligcrzh1kv139026";
     };
   };
 
@@ -3402,12 +3402,12 @@ let
 
   vim-fugitive = buildVimPluginFrom2Nix {
     pname = "vim-fugitive";
-    version = "2019-09-19";
+    version = "2019-09-27";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-fugitive";
-      rev = "1d8c0a38b2fc4ce9ca4204676573b6335725ff75";
-      sha256 = "0ln11qdpsssgqd122zldfmjvwyvxild8a0yxgdazp720dypkvgjm";
+      rev = "ab26e9fdb328cc351933f8d6178178e8ce5c8381";
+      sha256 = "0fvn2y7wyj7i39p027d4ijz73vpidzlgg7g7b9bcvyjsfmyds1fk";
     };
   };
 
@@ -3446,12 +3446,12 @@ let
 
   vim-gitgutter = buildVimPluginFrom2Nix {
     pname = "vim-gitgutter";
-    version = "2019-09-19";
+    version = "2019-09-27";
     src = fetchFromGitHub {
       owner = "airblade";
       repo = "vim-gitgutter";
-      rev = "76aa5920dba9b05991940f7dc29dc79ad7af0a3e";
-      sha256 = "0yazz5aqyfkwhx2x44pp8x81wswrh7sjgslbimwa9d67yvnh0bz6";
+      rev = "44bb472bac2fa96c1444fcc02ad981152e56735b";
+      sha256 = "0dcm685sdwaajglh8iv2a20sf47a6lmahj5jscdpcbpnhcd3wdia";
     };
   };
 
@@ -3479,12 +3479,12 @@ let
 
   vim-go = buildVimPluginFrom2Nix {
     pname = "vim-go";
-    version = "2019-09-21";
+    version = "2019-09-27";
     src = fetchFromGitHub {
       owner = "fatih";
       repo = "vim-go";
-      rev = "6904ded741573113c20408abdce455c5d3969e08";
-      sha256 = "12ill4rpfc3bzxa6s47mscvbclidnckxci3rdixzkvrmwsyyip6k";
+      rev = "a7b5edc1872b76e6c0cc18b89fcda3aa98422961";
+      sha256 = "1k92n93bcy24fqfairqqkxd7l9adc0azggp4lp3r0rh7dsglnsf0";
     };
   };
 
@@ -3721,12 +3721,12 @@ let
 
   vim-jade = buildVimPluginFrom2Nix {
     pname = "vim-jade";
-    version = "2019-05-07";
+    version = "2019-09-23";
     src = fetchFromGitHub {
       owner = "digitaltoad";
       repo = "vim-jade";
-      rev = "efed0c8680d22bd16b9dc7e08f5373269b67c45f";
-      sha256 = "0dq0mmx2bg304b24cp337lr29r0f1wkvhq9i3z54bw3x3pbw5hal";
+      rev = "ea39cd942cf3194230cf72bfb838901a5344d3b3";
+      sha256 = "07141jkfnaia4ydc6qcg0bc06w720l2lzl7bm4bsjwswqrzmhfam";
     };
   };
 
@@ -4261,12 +4261,12 @@ let
 
   vim-polyglot = buildVimPluginFrom2Nix {
     pname = "vim-polyglot";
-    version = "2019-09-12";
+    version = "2019-09-27";
     src = fetchFromGitHub {
       owner = "sheerun";
       repo = "vim-polyglot";
-      rev = "4f3df59be709bf0d5c5c67dc804fde49abdc2700";
-      sha256 = "0rknm6bj75ax2a81bkw96nqakn2gb1mjfb6lgg8kwvcjzddfvmb9";
+      rev = "f95026252c5a31242903a98c741887696dfbb11f";
+      sha256 = "0lzzlrwcic3vbn6rk3vcakwg6fl6nkvhamxcind6jx43pr1ylwwv";
     };
   };
 
@@ -4690,23 +4690,23 @@ let
 
   vim-terraform = buildVimPluginFrom2Nix {
     pname = "vim-terraform";
-    version = "2019-09-15";
+    version = "2019-09-26";
     src = fetchFromGitHub {
       owner = "hashivim";
       repo = "vim-terraform";
-      rev = "81dd8ea296660a51618cefed62462ddff56f22fa";
-      sha256 = "1im4klyfgz5ab98ygc0jw1h9gnylab8zvzm4pk2rga2zbz9ymkxj";
+      rev = "a9925ccef810d01e3a21295d4dba97532d14f2ee";
+      sha256 = "0il49wyidin463x16b2lcf7cb5rqidqqwv56vxv9znrg6wqn94wp";
     };
   };
 
   vim-test = buildVimPluginFrom2Nix {
     pname = "vim-test";
-    version = "2019-09-01";
+    version = "2019-09-27";
     src = fetchFromGitHub {
       owner = "janko-m";
       repo = "vim-test";
-      rev = "5aaa872eb7519909b87abb2b0f13600aa2210771";
-      sha256 = "0wvjf3fhhj9qm5p7azk2dgi3aa1qw16pzm5nkl2jr5gn2cmlphd8";
+      rev = "3c2cc7c87882c4034f4ce0a9b71980b127a680a3";
+      sha256 = "0jac3cf7cidwqf0lvlkdkg6m2r0xng3xyzsh0iyn1dw6qg3wzi2y";
     };
   };
 
@@ -4855,12 +4855,12 @@ let
 
   vim-visual-multi = buildVimPluginFrom2Nix {
     pname = "vim-visual-multi";
-    version = "2019-09-12";
+    version = "2019-09-26";
     src = fetchFromGitHub {
       owner = "mg979";
       repo = "vim-visual-multi";
-      rev = "6ff6e336ac3df959c8d0462be277b4fff8661421";
-      sha256 = "1drp53cvbflr6x94vy0f57fg9nb3kxlaxvrc5w71id4mv0pr7bb2";
+      rev = "56104bd06a30c08bf0c0dd69a98d5cb516a3025c";
+      sha256 = "1fjn4cdw99y78c8gway1pg9sbqgyr0jbbr6snh8awlnmgwa3yrg7";
     };
   };
 
@@ -5009,12 +5009,12 @@ let
 
   vimtex = buildVimPluginFrom2Nix {
     pname = "vimtex";
-    version = "2019-09-20";
+    version = "2019-09-27";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "ece9f454ac2f590629ebbbbe4b0bb23deafdcb04";
-      sha256 = "05h1hya3c4k9z1x2k13k1a1zpq8lf7nr8ggg548mmayh0cv5qvqs";
+      rev = "53ba80c91162aa84ccbfd12dbd30435d869c1391";
+      sha256 = "1lmy7fzpyga9mk26xhcq5j2i3nmzzrnbgnpi0darfg8334bzw251";
     };
   };
 
@@ -5209,12 +5209,12 @@ let
 
   zig-vim = buildVimPluginFrom2Nix {
     pname = "zig-vim";
-    version = "2019-09-19";
+    version = "2019-09-26";
     src = fetchFromGitHub {
       owner = "zig-lang";
       repo = "zig.vim";
-      rev = "29d9358a825c56a31f6438ea93eb09f091998f0d";
-      sha256 = "1rah0fm3qxv3jjb0ma2pn5kvbg2fwg4p5ycgm6vjbq95j73f5aq1";
+      rev = "08ba9f9354698c3ab85bf84b8390ce909d3bc221";
+      sha256 = "1m44hm7jgv1v5z88mi5ha0p1lrffxx2h0p25vxq12zd2x834vghf";
     };
   };
 
-- 
GitLab


From 7cfdc16cfd5647de764c05bfb92f3b5acaf32389 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 28 Sep 2019 04:20:00 -0500
Subject: [PATCH 1254/2254] skim: 0.6.8 -> 0.6.9

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

diff --git a/pkgs/tools/misc/skim/default.nix b/pkgs/tools/misc/skim/default.nix
index 5072bfb6934..55e6e5424d7 100644
--- a/pkgs/tools/misc/skim/default.nix
+++ b/pkgs/tools/misc/skim/default.nix
@@ -2,18 +2,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "skim";
-  version = "0.6.8";
+  version = "0.6.9";
 
   src = fetchFromGitHub {
     owner = "lotabout";
     repo = pname;
     rev = "v${version}";
-    sha256 = "00sx1pyj0a9hkv9b8g3iykkw303vnqziddp2600nvfr8x8pd01gi";
+    sha256 = "1ygnjrljar4caybh8lqfjif4vhb33aam80ffnzgqxz6s6g85ifrb";
   };
 
   outputs = [ "out" "vim" ];
 
-  cargoSha256 = "1kqawnyddv4pjyiaizw3ydqk6hl4ng6xfw9ixy58rb1vk591kq8w";
+  cargoSha256 = "1vcxcyhhqncjii0pad775x10j1kp62y82q1mii65jclr1karml3p";
 
   patchPhase = ''
     sed -i -e "s|expand('<sfile>:h:h')|'$out'|" plugin/skim.vim
-- 
GitLab


From 91a233570bcfbb57989ff7678d92bba6d69c0efd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 06:49:06 -0700
Subject: [PATCH 1255/2254] python27Packages.mechanize: 0.4.2 -> 0.4.3

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python2.7-mechanize/versions
---
 pkgs/development/python-modules/mechanize/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mechanize/default.nix b/pkgs/development/python-modules/mechanize/default.nix
index f23c3c9e20b..6a408e77e9f 100644
--- a/pkgs/development/python-modules/mechanize/default.nix
+++ b/pkgs/development/python-modules/mechanize/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "mechanize";
-  version = "0.4.2";
+  version = "0.4.3";
   disabled = isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b680ca1b4fabe5ef52024d120f40b8e2ed7d175ed4d67225d2c477dac7c7a58b";
+    sha256 = "1gyxkwjnabqf8xxnkj787xh2dpcnm858g369fnahdcz1wn5hdmyp";
   };
 
   propagatedBuildInputs = [ html5lib ];
-- 
GitLab


From d4591423179b409d939fa05800e2a3875b44823e Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 28 Sep 2019 04:20:00 -0500
Subject: [PATCH 1256/2254] python27Packages.mechanize: enable on python 3

---
 pkgs/development/python-modules/mechanize/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/mechanize/default.nix b/pkgs/development/python-modules/mechanize/default.nix
index 6a408e77e9f..882872d47e1 100644
--- a/pkgs/development/python-modules/mechanize/default.nix
+++ b/pkgs/development/python-modules/mechanize/default.nix
@@ -2,13 +2,11 @@
 , buildPythonPackage
 , fetchPypi
 , html5lib
-, isPy3k
 }:
 
 buildPythonPackage rec {
   pname = "mechanize";
   version = "0.4.3";
-  disabled = isPy3k;
 
   src = fetchPypi {
     inherit pname version;
@@ -21,7 +19,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Stateful programmatic web browsing in Python";
-    homepage = http://wwwsearch.sourceforge.net/;
+    homepage = "https://github.com/python-mechanize/mechanize";
     license = "BSD-style";
   };
 
-- 
GitLab


From 5f311f613febfe387836e3595697b19c70881104 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 28 Sep 2019 04:20:00 -0500
Subject: [PATCH 1257/2254] shadowsocks-rust: 1.7.0 -> 1.7.2

Changelog: https://github.com/shadowsocks/shadowsocks-rust/releases/tag/v1.7.2
---
 pkgs/tools/networking/shadowsocks-rust/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/shadowsocks-rust/default.nix b/pkgs/tools/networking/shadowsocks-rust/default.nix
index 668d55d8927..2416ef23c8a 100644
--- a/pkgs/tools/networking/shadowsocks-rust/default.nix
+++ b/pkgs/tools/networking/shadowsocks-rust/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "shadowsocks-rust";
-  version = "1.7.0";
+  version = "1.7.2";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "shadowsocks";
     repo = pname;
-    sha256 = "0mqjm54mp6c9mfdl3gf01v9vm2rjll8fw63n6j4qgv01y4hrsm4f";
+    sha256 = "0w7ysha46ml3j1i1knvll4pmqg291z8a2ypcy650m61dhrvkh2ng";
   };
 
-  cargoSha256 = "19wx19sbal2q5ndniv6vllayjjy5fzi8fw7fn1d23jb9l91ak7ab";
+  cargoSha256 = "18nlvqa9ha4vs9xb60hivhgcsqr69zsigfmqyig48slvwgqkbwda";
 
   buildInputs = [ openssl libsodium ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
-- 
GitLab


From be7bc495049de792069f58e338cf2b5249c5395f Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 28 Sep 2019 04:20:00 -0500
Subject: [PATCH 1258/2254] gitAndTools.hub: 2.12.4 -> 2.12.7

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

diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix
index cd38be2b977..c3d0ddfe4e3 100644
--- a/pkgs/applications/version-management/git-and-tools/hub/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "hub";
-  version = "2.12.4";
+  version = "2.12.7";
 
   goPackagePath = "github.com/github/hub";
 
@@ -13,7 +13,7 @@ buildGoPackage rec {
     owner = "github";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1d4cn4pgx520psrfac92h3m7azxnpj1plrrqmxryar85f3y363bq";
+    sha256 = "028hc2cgjgqmi9kvxhck4nvq02p095bp1d8qxc6q38aynwfmmhk5";
   };
 
   nativeBuildInputs = [ groff utillinux ];
-- 
GitLab


From b289915b376115fb5822ee55daed1e3328197a0d Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 28 Sep 2019 04:20:00 -0500
Subject: [PATCH 1259/2254] wabt: 1.0.11 -> 1.0.12

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

diff --git a/pkgs/development/tools/wabt/default.nix b/pkgs/development/tools/wabt/default.nix
index f8936e27516..4c7df9b12d8 100644
--- a/pkgs/development/tools/wabt/default.nix
+++ b/pkgs/development/tools/wabt/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "wabt";
-  version = "1.0.11";
+  version = "1.0.12";
 
   src = fetchFromGitHub {
     owner  = "WebAssembly";
     repo   = "wabt";
     rev    = version;
-    sha256 = "0hn88vlqyclpk79v3wg3lrssd9vwhjdgvb41g03jqakygxxgnmp5";
+    sha256 = "1zlv3740wkqj4mn6sr84h0x6wk2lcp4pwwmqsh5yyqp1j1glbsa0";
   };
 
   nativeBuildInputs = [ cmake ];
-- 
GitLab


From c7858d9dfc73ca84ccdf43ade4c639de1c9c6675 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 02:27:11 -0700
Subject: [PATCH 1260/2254] python37Packages.emoji: 0.5.3 -> 0.5.4

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-emoji/versions
---
 pkgs/development/python-modules/emoji/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/emoji/default.nix b/pkgs/development/python-modules/emoji/default.nix
index 01cd9190647..5f3d14e73c7 100644
--- a/pkgs/development/python-modules/emoji/default.nix
+++ b/pkgs/development/python-modules/emoji/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "emoji";
-  version = "0.5.3";
+  version = "0.5.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0kn6qq1h0d6cg70wk0hji6bcwg5s18ys6gfmlmfmx8420ka150dn";
+    sha256 = "0x61xypwswhghchp5svs084didkgfwqpq2fbiapvirff5lx2srb0";
   };
 
   checkInputs = [ nose ];
-- 
GitLab


From e75071e10e46618fa7d985e82fa64362e3d399d8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 02:29:43 -0700
Subject: [PATCH 1261/2254] python37Packages.azure-mgmt-sql: 0.12.0 -> 0.13.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-azure-mgmt-sql/versions
---
 pkgs/development/python-modules/azure-mgmt-sql/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-sql/default.nix b/pkgs/development/python-modules/azure-mgmt-sql/default.nix
index 913eb150224..2cb1c16c503 100644
--- a/pkgs/development/python-modules/azure-mgmt-sql/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-sql/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-sql";
-  version = "0.12.0";
+  version = "0.13.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "8399702e9d1836f3b040ce0c93d8dc089767d66edb9224a3b8a6c9ab7e8ff01f";
+    sha256 = "184jma28nyn4c52mjj0g0p6rci6kajsdjqy8mbdaisphpjl4f77l";
   };
 
   propagatedBuildInputs = [
-- 
GitLab


From 30bb550fc28e65fc51e15cb9cab8f51ce8902798 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 02:42:56 -0700
Subject: [PATCH 1262/2254] python37Packages.bumps: 0.7.11 -> 0.7.12

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-bumps/versions
---
 pkgs/development/python-modules/bumps/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bumps/default.nix b/pkgs/development/python-modules/bumps/default.nix
index d8fc3d99235..ccbbf67c596 100644
--- a/pkgs/development/python-modules/bumps/default.nix
+++ b/pkgs/development/python-modules/bumps/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonPackage rec {
   pname = "bumps";
-  version = "0.7.11";
+  version = "0.7.12";
 
   propagatedBuildInputs = [six];
 
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "16d24a7f965592d9b02f96e68e6aa70d6fb59abe4db37bb14c4b60c509a3c2ef";
+    sha256 = "0a8m56bwyi0gdrf3kgkdw3cajyxlr40qrj1xlh5yn4qqjbz7ym02";
   };
 
   meta = with stdenv.lib; {
-- 
GitLab


From 539e66c4291604806aca382201647bcf77d3cf73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 25 Sep 2019 11:30:31 +0100
Subject: [PATCH 1263/2254] zfsUnstable: drop build patches

---
 .../linux/zfs/build-fixes-0.8.patch           | 36 -------------------
 pkgs/os-specific/linux/zfs/default.nix        | 11 ++----
 2 files changed, 2 insertions(+), 45 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/zfs/build-fixes-0.8.patch

diff --git a/pkgs/os-specific/linux/zfs/build-fixes-0.8.patch b/pkgs/os-specific/linux/zfs/build-fixes-0.8.patch
deleted file mode 100644
index ff2c6e2e150..00000000000
--- a/pkgs/os-specific/linux/zfs/build-fixes-0.8.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From b323e7a7ebb2327943851fa3fd139399eb24d3dd Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
-Date: Mon, 13 Aug 2018 22:58:21 +0200
-Subject: [PATCH] build fixes needed for nixos
-
----
- module/Makefile.in | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/module/Makefile.in b/module/Makefile.in
-index 935bd2663..afb08df81 100644
---- a/module/Makefile.in
-+++ b/module/Makefile.in
-@@ -44,15 +44,15 @@ clean:
- modules_install:
- 	@# Install the kernel modules
- 	$(MAKE) -C @LINUX_OBJ@ M=`pwd` $@ \
--		INSTALL_MOD_PATH=$(DESTDIR)$(INSTALL_MOD_PATH) \
-+		INSTALL_MOD_PATH=@prefix@/$(INSTALL_MOD_PATH) \
- 		INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) \
- 		KERNELRELEASE=@LINUX_VERSION@
- 	@# Remove extraneous build products when packaging
--	kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \
--	if [ -n "$(DESTDIR)" ]; then \
-+	kmoddir=@prefix@$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \
-+	if [ -n "@prefix@" ]; then \
- 		find $$kmoddir -name 'modules.*' | xargs $(RM); \
- 	fi
--	sysmap=$(DESTDIR)$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \
-+	sysmap=@prefix@$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \
- 	if [ -f $$sysmap ]; then \
- 		depmod -ae -F $$sysmap @LINUX_VERSION@; \
- 	fi
--- 
-2.19.2
-
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index f704a8a2a6c..899e5f05509 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -19,7 +19,7 @@ let
 
   common = { version
     , sha256
-    , extraPatches
+    , extraPatches ? []
     , rev ? "zfs-${version}"
     , isUnstable ? false
     , incompatibleKernelVersion ? null }:
@@ -103,6 +103,7 @@ let
       installFlags = [
         "sysconfdir=\${out}/etc"
         "DEFAULT_INITCONF_DIR=\${out}/default"
+        "INSTALL_MOD_PATH=\${out}"
       ];
 
       postInstall = optionalString buildKernel ''
@@ -157,10 +158,6 @@ in {
     version = "0.8.2";
 
     sha256 = "0miax0h2wg4b2kn8n93804faajy2n1sh25knyy2hg3k77nlr4pni";
-
-    extraPatches = [
-      ./build-fixes-0.8.patch
-    ];
   };
 
   zfsUnstable = common {
@@ -172,9 +169,5 @@ in {
 
     sha256 = "0miax0h2wg4b2kn8n93804faajy2n1sh25knyy2hg3k77nlr4pni";
     isUnstable = true;
-
-    extraPatches = [
-      ./build-fixes-0.8.patch
-    ];
   };
 }
-- 
GitLab


From 8ef1d5fa31d6813fe2e725e4d816624069674f02 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 02:56:47 -0700
Subject: [PATCH 1264/2254] python37Packages.basemap: 1.2.0 -> 1.2.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-basemap/versions
---
 pkgs/development/python-modules/basemap/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/basemap/default.nix b/pkgs/development/python-modules/basemap/default.nix
index 25b19a2b731..a06bcebc8e6 100644
--- a/pkgs/development/python-modules/basemap/default.nix
+++ b/pkgs/development/python-modules/basemap/default.nix
@@ -13,13 +13,13 @@
 
 buildPythonPackage rec {
   pname = "basemap";
-  version = "1.2.0";
+  version = "1.2.1";
 
   src = fetchFromGitHub {
     owner = "matplotlib";
     repo = "basemap";
     rev = "v${version}rel";
-    sha256 = "1p3app8n65rlppkdbp1pb7fa4250kh7hi7lzdsryi2iv88np7193";
+    sha256 = "13lw1iwa8hadpvqdgb06nh881l8c17awzvvwbfwblvb9q9s0lnzp";
   };
 
   propagatedBuildInputs = [ numpy matplotlib pillow pyproj pyshp six ];
-- 
GitLab


From 2590a85189c5fbcd7bdf2d76e27e74c396447ab2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 25 Sep 2019 17:30:11 +0200
Subject: [PATCH 1265/2254] haskell-liquidhaskell: drop obsolete overrides

---
 .../configuration-ghc-8.6.x.nix               | 21 -------------------
 1 file changed, 21 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
index 41b6177efef..7c0866bfbe5 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -71,27 +71,6 @@ self: super: {
   # Break out of "yaml >=0.10.4.0 && <0.11": https://github.com/commercialhaskell/stack/issues/4485
   stack = doJailbreak super.stack;
 
-  # Needs a recent version from the "develop" branch of the upstream git
-  # repository to compile with ghc 8.6.4.
-  liquid-fixpoint = assert super.liquid-fixpoint.version == "0.7.0.7"; overrideSrc super.liquid-fixpoint {
-    src = pkgs.fetchFromGitHub {
-      owner = "ucsd-progsys";
-      repo = "liquid-fixpoint";
-      rev = "42c027ab9ae47907c588a2f1f9c05a5e0aa881e9";
-      sha256 = "17qmzq1vx7h04yd38drr6sh6hys3q2rz62qh3pna9kbxlcnikkqf";
-    };
-    version = "0.8.0.2-pre-release";
-  };
-  liquidhaskell = assert super.liquidhaskell.version == "0.8.2.4"; overrideSrc super.liquidhaskell {
-    src = pkgs.fetchFromGitHub {
-      owner = "ucsd-progsys";
-      repo = "liquidhaskell";
-      rev = "46f11e8faef006e70d39572d08419283b1280b88";
-      sha256 = "10z5r6g5acd43bsak762kwhy33ff262zmhs0wga545nbg29q1fyp";
-    };
-    version = "0.8.6.0-pre-release";
-  };
-
   # Newer versions don't compile.
   resolv = self.resolv_0_1_1_2;
 
-- 
GitLab


From b83221fe2f2f358d34f4f0700e0c147862e6b5b1 Mon Sep 17 00:00:00 2001
From: Luflosi <luflosi@luflosi.de>
Date: Fri, 27 Sep 2019 17:53:40 +0200
Subject: [PATCH 1266/2254] kitty: remove symlink to kitty-deref-symlink

Symlinking to `kitty-deref-symlink` on macOS is no longer needed. In fact `kitty-deref-symlink` is now a symlink itself.
This reverts 240fce7ba75e6df25855122ce0d4f93d1ea1c1be.
---
 pkgs/applications/misc/kitty/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix
index 1df331065c4..db8ef004383 100644
--- a/pkgs/applications/misc/kitty/default.nix
+++ b/pkgs/applications/misc/kitty/default.nix
@@ -89,7 +89,7 @@ buildPythonApplication rec {
     mkdir -p $out
     ${if stdenv.isDarwin then ''
     mkdir "$out/bin"
-    ln -s ../Applications/kitty.app/Contents/MacOS/kitty-deref-symlink "$out/bin/kitty"
+    ln -s ../Applications/kitty.app/Contents/MacOS/kitty "$out/bin/kitty"
     mkdir "$out/Applications"
     cp -r kitty.app "$out/Applications/kitty.app"
     '' else ''
-- 
GitLab


From 47efd5756b4697a16a1d57b8262d183ea5d80fd5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 03:15:59 -0700
Subject: [PATCH 1267/2254] python37Packages.dkimpy: 0.9.2 -> 0.9.3

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-dkimpy/versions
---
 pkgs/development/python-modules/dkimpy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dkimpy/default.nix b/pkgs/development/python-modules/dkimpy/default.nix
index ef0a6f90741..e4ec38c1a7f 100644
--- a/pkgs/development/python-modules/dkimpy/default.nix
+++ b/pkgs/development/python-modules/dkimpy/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "dkimpy";
-  version = "0.9.2";
+  version = "0.9.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "83d5ddc1b83304dbccba1dc7b9e0ee37bec4269bb9ad5779480991525c3811d6";
+    sha256 = "1rnnax2blmwk6404yrnhswp50xbp2h192rd2l6mra5lh3rg36zvd";
 };
 
   checkInputs = [ pytest ];
-- 
GitLab


From f0baafe6ede39e3b7f1baa5b8b2fbe60f36071c6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 03:46:26 -0700
Subject: [PATCH 1268/2254] python37Packages.azure-cosmos: 3.1.0 -> 3.1.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-azure-cosmos/versions
---
 pkgs/development/python-modules/azure-cosmos/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-cosmos/default.nix b/pkgs/development/python-modules/azure-cosmos/default.nix
index 2b7c7ded276..72d5b9a6ff7 100644
--- a/pkgs/development/python-modules/azure-cosmos/default.nix
+++ b/pkgs/development/python-modules/azure-cosmos/default.nix
@@ -6,12 +6,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "3.1.0";
+  version = "3.1.1";
   pname = "azure-cosmos";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1955kpn2y16k5mil90bnnyscnh1hyh4d5l5v5b90ms969p61i9zl";
+    sha256 = "0q8pl8wnadxhyawcrfzrm2k85xd4mdmdk2xwdial55zmpa8ji4pk";
   };
 
   propagatedBuildInputs = [ six requests ];
-- 
GitLab


From 504afe42124011830e4d3e0367f407a9a47cb600 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 03:51:54 -0700
Subject: [PATCH 1269/2254] python37Packages.azure-mgmt-cosmosdb: 0.7.0 ->
 0.8.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-azure-mgmt-cosmosdb/versions
---
 .../python-modules/azure-mgmt-cosmosdb/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix
index 72be0b3dbb9..aa3f44d0797 100644
--- a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-cosmosdb";
-  version = "0.7.0";
+  version = "0.8.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "1d9xzf9ydlhwlsk7ij64ji1r2j0l7bwaykwngcy5lh8sdxax305r";
+    sha256 = "0iakxb2rr1w9171802m9syjzqas02vjah711mpagbgcj549mjysb";
   };
 
   propagatedBuildInputs = [
-- 
GitLab


From 41e777d82fd0308f36edb6ced31b8342b0806c91 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 04:37:05 -0700
Subject: [PATCH 1270/2254] python37Packages.libversion: 1.1.4 -> 1.2.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-libversion/versions
---
 pkgs/development/python-modules/libversion/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/libversion/default.nix b/pkgs/development/python-modules/libversion/default.nix
index e5741176426..775d1a9ef85 100644
--- a/pkgs/development/python-modules/libversion/default.nix
+++ b/pkgs/development/python-modules/libversion/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "libversion";
-  version = "1.1.4";
+  version = "1.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0xp0wv4s1537s0iqa1ih3kfh1p70s7d1fkwhvrnbj8m98yjij84q";
+    sha256 = "1p3snjlsg11vhba8h286h19kn6azlxbywg9f6rdhj8sfraccqlmk";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From 89b2490c502d45ef4d1ca04223862653b9ee6867 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 04:44:58 -0700
Subject: [PATCH 1271/2254] python37Packages.py3status: 3.19 -> 3.20

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-py3status/versions
---
 pkgs/development/python-modules/py3status/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix
index 31d31f714b7..21f1148ba6c 100644
--- a/pkgs/development/python-modules/py3status/default.nix
+++ b/pkgs/development/python-modules/py3status/default.nix
@@ -22,11 +22,11 @@
 
 buildPythonPackage rec {
   pname = "py3status";
-  version = "3.19";
+  version = "3.20";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "10ikvdx39phr7n01qa6y9i5lqg3blv0d6y1pwqniczaf558cfp3l";
+    sha256 = "14p0ikbgy1pgphy00gvi6zpkz2kf5mwmawbdqs0l57s0fzrz7xwz";
   };
 
   doCheck = false;
-- 
GitLab


From 019eaad22d5b34d9628e01565b491aa0d94081a8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 04:50:26 -0700
Subject: [PATCH 1272/2254] python37Packages.pyscard: 1.9.8 -> 1.9.9

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-pyscard/versions
---
 pkgs/development/python-modules/pyscard/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix
index 06e2690c111..1ea5830c62b 100644
--- a/pkgs/development/python-modules/pyscard/default.nix
+++ b/pkgs/development/python-modules/pyscard/default.nix
@@ -9,12 +9,12 @@ let
 in
 
 buildPythonPackage rec {
-  version = "1.9.8";
+  version = "1.9.9";
   pname = "pyscard";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "15fh00z1an6r5j7hrz3jlq0rb3jygwf3x4jcwsa008bv8vpcg7gm";
+    sha256 = "082cjkbxadaz2jb4rbhr0mkrirzlqyqhcf3r823qb0q1k50ybgg6";
   };
 
   postPatch = if withApplePCSC then ''
-- 
GitLab


From 66e742278a287411735b2ad59ec481000c73354e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 05:35:08 -0700
Subject: [PATCH 1273/2254] python37Packages.pgspecial: 1.11.5 -> 1.11.7

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-pgspecial/versions
---
 pkgs/development/python-modules/pgspecial/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/pgspecial/default.nix b/pkgs/development/python-modules/pgspecial/default.nix
index 8c653ce060a..5c5f342651b 100644
--- a/pkgs/development/python-modules/pgspecial/default.nix
+++ b/pkgs/development/python-modules/pgspecial/default.nix
@@ -2,15 +2,15 @@
 
 buildPythonPackage rec {
   pname = "pgspecial";
-  version = "1.11.5";
+  version = "1.11.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0yvlxv9vy0hbfgf0xcwl7wh5hg6cl86arsv1ip3kvn9znn6x8kgl";
+    sha256 = "0wy1zmd44y0vl0kxx2y53g6lpipmixbwwrg6c2r7rc3nwa0icl7p";
   };
 
-  checkInputs = [ pytest psycopg2 ];
-  propagatedBuildInputs = [ click sqlparse ];
+  checkInputs = [ pytest ];
+  propagatedBuildInputs = [ click sqlparse psycopg2 ];
 
   checkPhase = ''
     find tests -name \*.pyc -delete
-- 
GitLab


From e0f4b29c355bc688779f80c958b5f37421b2cbd1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 05:56:23 -0700
Subject: [PATCH 1274/2254] python37Packages.pymediainfo: 4.0 -> 4.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-pymediainfo/versions
---
 pkgs/development/python-modules/pymediainfo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pymediainfo/default.nix b/pkgs/development/python-modules/pymediainfo/default.nix
index 67318bac9bf..dbed3c7f037 100644
--- a/pkgs/development/python-modules/pymediainfo/default.nix
+++ b/pkgs/development/python-modules/pymediainfo/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "pymediainfo";
-  version = "4.0";
+  version = "4.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1yjs208c34p2xsc0r8vbi264ii5hixh546718n06b7v670glqjir";
+    sha256 = "0mhpxs7vlqx8w75z93dy7nnvx89kwfdjkla03l19an15rlyqyspd";
   };
 
   postPatch = ''
-- 
GitLab


From 27130cb3a7bc41fc4d9d871f967bdb734d12c8ee Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 05:59:25 -0700
Subject: [PATCH 1275/2254] python37Packages.pydantic: 0.31 -> 0.32.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-pydantic/versions
---
 pkgs/development/python-modules/pydantic/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pydantic/default.nix b/pkgs/development/python-modules/pydantic/default.nix
index 9b713827199..42921ea6483 100644
--- a/pkgs/development/python-modules/pydantic/default.nix
+++ b/pkgs/development/python-modules/pydantic/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "pydantic";
-  version = "0.31";
+  version = "0.32.2";
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0x9xc5hpyrlf05dc4bx9f7v51fahxcahkvh0ij8ibay15nwli53d";
+    sha256 = "0q565m7d2rapjy6ylbdpd00z9zk99pkqg110191racp1d34kb4va";
   };
 
   propagatedBuildInputs = [
-- 
GitLab


From db4063ed5c3c6d6627d4860e46025651cde485a0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 06:11:15 -0700
Subject: [PATCH 1276/2254] python37Packages.luftdaten: 0.6.2 -> 0.6.3

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-luftdaten/versions
---
 pkgs/development/python-modules/luftdaten/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/luftdaten/default.nix b/pkgs/development/python-modules/luftdaten/default.nix
index 0138d866ff0..9784d3af61f 100644
--- a/pkgs/development/python-modules/luftdaten/default.nix
+++ b/pkgs/development/python-modules/luftdaten/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "luftdaten";
-  version = "0.6.2";
+  version = "0.6.3";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0919hcycv2rkn99lv4dn78i827mgvm3vagm9xcc6qgawsli8vrlp";
+    sha256 = "161g3s3nwbkn3s101g8l4axll0kk8xxahxnvjrjdg2cghcjq9n8n";
   };
 
   propagatedBuildInputs = [ aiohttp async-timeout ];
-- 
GitLab


From 89892e0278342fee263ccbee21dfcbf220c46f48 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 06:23:43 -0700
Subject: [PATCH 1277/2254] python37Packages.pytesseract: 0.2.9 -> 0.3.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-pytesseract/versions
---
 pkgs/development/python-modules/pytesseract/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pytesseract/default.nix b/pkgs/development/python-modules/pytesseract/default.nix
index e8146a6fc7f..0f10ed601f7 100644
--- a/pkgs/development/python-modules/pytesseract/default.nix
+++ b/pkgs/development/python-modules/pytesseract/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "pytesseract";
-  version = "0.2.9";
+  version = "0.3.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1mjr3pa4fycdsl7xk9s8fpn2vhpgx7mrdnn5h4lyyjhz86195ivg";
+    sha256 = "0n9vasm5fp25fmr9ns9i3bf4kri63s1mvmjgc6q8w7rx840ww7df";
   };
 
   patches = [
-- 
GitLab


From b279c87ff1dc7adad0ec282acffe46ea8aaaff65 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 06:39:21 -0700
Subject: [PATCH 1278/2254] python37Packages.python-gnupg: 0.4.4 -> 0.4.5

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-python-gnupg/versions
---
 pkgs/development/python-modules/python-gnupg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-gnupg/default.nix b/pkgs/development/python-modules/python-gnupg/default.nix
index 728a353cec7..90dee35d290 100644
--- a/pkgs/development/python-modules/python-gnupg/default.nix
+++ b/pkgs/development/python-modules/python-gnupg/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname   = "python-gnupg";
-  version = "0.4.4";
+  version = "0.4.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "45daf020b370bda13a1429c859fcdff0b766c0576844211446f9266cae97fb0e";
+    sha256 = "01gckjhvsmr6kfwfk4qdxm5jz8nq8zilbjhzpzpiab6d96cyalrk";
   };
 
   # Let's make the library default to our gpg binary
-- 
GitLab


From be620532dbd986021d59f288ed29ae341ff65b0b Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 28 Sep 2019 09:51:11 -0500
Subject: [PATCH 1279/2254] python37Packages.pyscard: remove darwin version
 patch

fixed upstream https://github.com/LudovicRousseau/pyscard/commit/62e675028086c75656444cc21d563d9f08ebf8e7
---
 pkgs/development/python-modules/pyscard/default.nix | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix
index 1ea5830c62b..ddd8b0ce295 100644
--- a/pkgs/development/python-modules/pyscard/default.nix
+++ b/pkgs/development/python-modules/pyscard/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, fetchpatch, buildPythonPackage, swig, pcsclite, PCSC }:
+{ stdenv, fetchPypi, buildPythonPackage, swig, pcsclite, PCSC }:
 
 let
   # Package does not support configuring the pcsc library.
@@ -30,14 +30,6 @@ buildPythonPackage rec {
   NIX_CFLAGS_COMPILE = optionalString (! withApplePCSC)
     "-I ${getDev pcsclite}/include/PCSC";
 
-  # The error message differs depending on the macOS host version.
-  # Since Nix reports a constant host version, but proxies to the
-  # underlying library, it's not possible to determine the correct
-  # expected error message.  This patch allows both errors to be
-  # accepted.
-  # See: https://github.com/LudovicRousseau/pyscard/issues/77
-  patches = optionals withApplePCSC [ ./ignore-macos-bug.patch ];
-
   propagatedBuildInputs = if withApplePCSC then [ PCSC ] else [ pcsclite ];
   nativeBuildInputs = [ swig ];
 
-- 
GitLab


From e463c7cd75f68e112b838252963ca20495903210 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Sat, 28 Sep 2019 16:49:53 +0200
Subject: [PATCH 1280/2254] nixos/nix-daemon: Prevent network warning when
 checking config

Since version 2.3 (https://github.com/NixOS/nix/pull/2949 which was
cherry-picked to master) Nix issues a warning when --no-net wasn't
passed and there is no network interface. This commit adds the --no-net
flag to the nix.conf check such that no warning is issued.
---
 nixos/modules/services/misc/nix-daemon.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index 3826f728afd..3263f695423 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -11,6 +11,7 @@ let
   nixVersion = getVersion nix;
 
   isNix20 = versionAtLeast nixVersion "2.0pre";
+  isNix23 = versionAtLeast nixVersion "2.3pre";
 
   makeNixBuildUser = nr:
     { name = "nixbld${toString nr}";
@@ -63,7 +64,7 @@ let
           builders =
         ''}
         system-features = ${toString cfg.systemFeatures}
-        ${optionalString (versionAtLeast nixVersion "2.3pre") ''
+        ${optionalString isNix23 ''
           sandbox-fallback = false
         ''}
         $extraOptions
@@ -74,7 +75,7 @@ let
             '' else ''
               echo "Checking that Nix can read nix.conf..."
               ln -s $out ./nix.conf
-              NIX_CONF_DIR=$PWD ${cfg.package}/bin/nix show-config >/dev/null
+              NIX_CONF_DIR=$PWD ${cfg.package}/bin/nix show-config ${optionalString isNix23 "--no-net"} >/dev/null
             '')
       );
 
-- 
GitLab


From 6f4a235d68f5864929ceeae4701e7c22911758cf Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 08:07:22 -0700
Subject: [PATCH 1281/2254] python37Packages.Logbook: 1.4.3 -> 1.5.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-logbook/versions
---
 pkgs/development/python-modules/Logbook/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/Logbook/default.nix b/pkgs/development/python-modules/Logbook/default.nix
index 503fefc0013..74a3ffdfcc8 100644
--- a/pkgs/development/python-modules/Logbook/default.nix
+++ b/pkgs/development/python-modules/Logbook/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "Logbook";
-  version = "1.4.3";
+  version = "1.5.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a5a96792abd8172c80d61b7530e134524f20e2841981038031e602ed5920fef5";
+    sha256 = "0mvsig6sk4dywpw5naah1npf6h621qzhg0sd427j5znr06a2ksqs";
   };
 
   checkInputs = [ pytest ] ++ lib.optionals (!isPy3k) [ mock ];
-- 
GitLab


From b21ca3152bdd41e2faa73d425e472ab2ae48551a Mon Sep 17 00:00:00 2001
From: Free Potion <42352817+freepotion@users.noreply.github.com>
Date: Sat, 28 Sep 2019 18:13:27 +0300
Subject: [PATCH 1282/2254] ivan: 056 -> 057

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

diff --git a/pkgs/games/ivan/default.nix b/pkgs/games/ivan/default.nix
index 86f3f721446..0a7474e0f51 100644
--- a/pkgs/games/ivan/default.nix
+++ b/pkgs/games/ivan/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
 
   pname = "ivan";
-  version = "056";
+  version = "057";
 
   src = fetchFromGitHub {
     owner = "Attnam";
     repo = "ivan";
     rev = "v${version}";
-    sha256 = "07mj3b2p3n3bq7rwi31y0vywnr4namqbcnz4c53kl38ajw9viyf0";
+    sha256 = "0mavmwikfsyr5sp65sl8dqknl1yz7c7ds53y1qkma24vsikz3k64";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];
-- 
GitLab


From b1ed9c6d9e67032934d2c0bae5d64f63fb3b01e7 Mon Sep 17 00:00:00 2001
From: Ambroz Bizjak <abizjak.pro@gmail.com>
Date: Sat, 28 Sep 2019 17:26:06 +0200
Subject: [PATCH 1283/2254] nvidia-x11: Remove patches from the 390 version.
 (#69851)

Without those patches it builds and works with kernels 4.19 and 5.2.

Fixes https://github.com/NixOS/nixpkgs/issues/65937
---
 pkgs/os-specific/linux/nvidia-x11/default.nix | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index c41ce5994a1..e3affca1220 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -39,18 +39,6 @@ rec {
     sha256_64bit = "0h0jcckqpd63vaj95lvdgj2sbbn9y1ri1xx7r2snxfx0plhwz46n";
     settingsSha256 = "1w5nkxs7a40mq0qf97nhfazdqhfn1bvr54v50s8p0ggixb6vdm3l";
     persistencedSha256 = "02v76202qcnh8hvg4y9wmk9swdlv7z39ppfd1c850nlv158vn5nf";
-
-    patches = [
-      (fetchurl {
-        url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/kernel-4.16.patch?h=2ad07241ea525a6b6b555b6cb96a97634a4b2cb0";
-        sha256 = "11b3dp0na496rn13v5q4k66bf61174800g36rcwj42r0xj9cfak2";
-      })
-
-      (fetchurl {
-        url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/kernel-5.1.patch?h=42d50ef8d6048608d18bdf2c296dd335260c5a1a";
-        sha256 = "03v46ym2bcckg9q2xrilkg21hfiwypr6gl4jmly2q3m4yza9ja6r";
-      })
-    ];
   };
 
   legacy_340 = generic {
-- 
GitLab


From e49fde057b5b30625cdff53bbbe76bb19c1efb70 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 08:29:31 -0700
Subject: [PATCH 1284/2254] python37Packages.pyftdi: 0.29.4 -> 0.30.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-pyftdi/versions
---
 pkgs/development/python-modules/pyftdi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyftdi/default.nix b/pkgs/development/python-modules/pyftdi/default.nix
index 8f80447b85d..afd7a4599ec 100644
--- a/pkgs/development/python-modules/pyftdi/default.nix
+++ b/pkgs/development/python-modules/pyftdi/default.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "pyftdi";
-  version = "0.29.4";
+  version = "0.30.0";
   disabled = pythonOlder "3.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0jy0xbqvmhy0nq9v86759d96raa8p52yq8ik3ji5kjlx7cizq67v";
+    sha256 = "0avmxz38bkl6hp3fn1jm31qahsdp76j454mfnpxwx5wlk35iss09";
   };
 
   propagatedBuildInputs = [ pyusb pyserial ];
-- 
GitLab


From 8f0ef6787ce144a5f19c6e3ac6c867b4333a5ce6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 08:34:07 -0700
Subject: [PATCH 1285/2254] python37Packages.kconfiglib: 10.36.0 -> 12.12.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-kconfiglib/versions
---
 pkgs/development/python-modules/kconfiglib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/kconfiglib/default.nix b/pkgs/development/python-modules/kconfiglib/default.nix
index 7d83d2c4338..26320cccd1e 100644
--- a/pkgs/development/python-modules/kconfiglib/default.nix
+++ b/pkgs/development/python-modules/kconfiglib/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "kconfiglib";
-  version = "10.36.0";
+  version = "12.12.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1qhy4vv1rpgx4r1la14symxv3cpz7klqakn1rqdagwyaqp667g9b";
+    sha256 = "0afc0gidh0pjb0ll99xifzs5z14g365crfj935614zp9w8fcchp0";
   };
 
   # doesnt work out of the box but might be possible
-- 
GitLab


From ab1c3d596399c7a93b6700d88f18e013981cd3b1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 08:43:57 -0700
Subject: [PATCH 1286/2254] python37Packages.pydns: 3.2.0 -> 3.2.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-py3dns/versions
---
 pkgs/development/python-modules/py3dns/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/py3dns/default.nix b/pkgs/development/python-modules/py3dns/default.nix
index 7ac093cbc57..5a28a045c3e 100644
--- a/pkgs/development/python-modules/py3dns/default.nix
+++ b/pkgs/development/python-modules/py3dns/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "py3dns";
-  version = "3.2.0";
+  version = "3.2.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8e88c0648c4d38a880f08aeb05a6e5cb48b8ce2602d381caafc6c71698ee3c21";
+    sha256 = "1r25f0ys5p37bhld7m7n4gb0lrysaym3w318w2f8bncq7r3d81qz";
   };
 
   preConfigure = ''
-- 
GitLab


From d1e50a5f78228468d7aa41c5de0b6ca0d4c40853 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 08:49:17 -0700
Subject: [PATCH 1287/2254] gitAndTools.pre-commit: 1.18.2 -> 1.18.3

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/pre-commit/versions
---
 pkgs/development/python-modules/pre-commit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pre-commit/default.nix b/pkgs/development/python-modules/pre-commit/default.nix
index 7b5377cc15a..18b548faf21 100644
--- a/pkgs/development/python-modules/pre-commit/default.nix
+++ b/pkgs/development/python-modules/pre-commit/default.nix
@@ -14,12 +14,12 @@
 
 buildPythonApplication rec {
   pname = "pre-commit";
-  version = "1.18.2";
+  version = "1.18.3";
 
   src = fetchPypi {
     inherit version;
     pname = "pre_commit";
-    sha256 = "1y6gd6nq8mfyjxknrgdryvn1bj5arvwaz2r00h41g054lfg3iki1";
+    sha256 = "0gqzx5n5kps7z45rgydciz0sq1m09b4g49vclhvybi57pn3hag0x";
   };
 
   propagatedBuildInputs = [
-- 
GitLab


From 0b47606829083cc751dcc8d5f8954b27743edf36 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 09:00:50 -0700
Subject: [PATCH 1288/2254] python37Packages.jupytext: 1.2.1 -> 1.2.3

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-jupytext/versions
---
 pkgs/development/python-modules/jupytext/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix
index ae6796825f1..c0b89ddddbd 100644
--- a/pkgs/development/python-modules/jupytext/default.nix
+++ b/pkgs/development/python-modules/jupytext/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "jupytext";
-  version = "1.2.1";
+  version = "1.2.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "05vwxgjh7pzxgdzj0775562bfps8j7w3p7dcf1zfh169whqw9vg8";
+    sha256 = "0a2c00bncf68havs3msra6jkx8frbv3yal56mk85wnkwhzlahj0c";
   };
 
   propagatedBuildInputs = [
-- 
GitLab


From 5496caac483b701c7e3968e54a863919c443a81e Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sat, 28 Sep 2019 19:04:53 +0300
Subject: [PATCH 1289/2254] hasmail: init at 2019-08-24

---
 .../mailreaders/hasmail/default.nix           | 40 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/applications/networking/mailreaders/hasmail/default.nix

diff --git a/pkgs/applications/networking/mailreaders/hasmail/default.nix b/pkgs/applications/networking/mailreaders/hasmail/default.nix
new file mode 100644
index 00000000000..05d869e3349
--- /dev/null
+++ b/pkgs/applications/networking/mailreaders/hasmail/default.nix
@@ -0,0 +1,40 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+, pkgconfig
+, gobject-introspection
+, pango
+, cairo
+, gtk2
+}:
+
+buildGoModule rec {
+  pname = "hasmail";
+  version = "2019-08-24";
+  name = "${pname}-${version}-unstable";
+
+  src = fetchFromGitHub {
+    owner = "jonhoo";
+    repo = "hasmail";
+    rev = "eb52536d26815383bfe5990cd5ace8bb9d036c8d";
+    sha256 = "1p6kwa5xk1mb1fkkxz1b5rcyp5kb4zc8nfif1gk6fab6wbdj9ia1";
+  };
+
+  modSha256 = "0z3asz7v1izg81f9xifx9s2sp5hly173hajsn9idi3bkv0h78is2";
+
+  buildInputs = [
+    pkgconfig
+    gobject-introspection
+    pango
+    cairo
+    gtk2
+  ];
+
+  meta = with lib; {
+    description = "Simple tray icon for detecting new email on IMAP servers";
+    homepage = "https://github.com/jonhoo/hasmail";
+    license = licenses.unlicense;
+    maintainers = with maintainers; [ doronbehar ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c71abe5e309..f3b5f68e410 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3720,6 +3720,8 @@ in
 
   hash-slinger = callPackage ../tools/security/hash-slinger { };
 
+  hasmail = callPackage ../applications/networking/mailreaders/hasmail { };
+
   hal-flash = callPackage ../os-specific/linux/hal-flash { };
 
   half = callPackage ../development/libraries/half { };
-- 
GitLab


From 3ceb8d59909b2a57a91b6735ad16b4ed81891049 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Sat, 28 Sep 2019 18:07:53 +0200
Subject: [PATCH 1290/2254] ledger-live-desktop: 1.12.0 -> 1.15.0

built with appimageTools.wrapType2 instead of wrapping appimage-run
---
 .../ledger-live-desktop/default.nix           | 50 +++++++------------
 1 file changed, 17 insertions(+), 33 deletions(-)

diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix
index 0417d2913de..88b35dd78a6 100644
--- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix
+++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix
@@ -1,50 +1,34 @@
-{ stdenv, fetchurl, makeDesktopItem, makeWrapper, appimage-run }:
+{ stdenv, fetchurl, makeDesktopItem, appimageTools }:
 
-stdenv.mkDerivation rec {
+let
   pname = "ledger-live-desktop";
-  version = "1.12.0";
+  version = "1.15.0";
+  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage";
-    sha256 = "0sn0ri8kqvy36d6vjwsb0mh54nwic58416m6q5drl1schsn6wyvj";
+    sha256 = "0r7gm7q7gj39v36jd5xz20931za94nf2fpf3clbghkhlbrm0kbnq";
   };
 
-  nativeBuildInputs = [ makeWrapper ];
-  buildInputs = [ appimage-run ];
-
-  desktopIcon = fetchurl {
-    url = "https://raw.githubusercontent.com/LedgerHQ/${pname}/v${version}/build/icon.png";
-    sha256 = "1mmfaf0yk7xf1kgbs3ka8wsbz1qgh60xj6z91ica1i7lw2qbdd5h";
-  };
-
-  desktopItem = makeDesktopItem {
-    name = pname;
-    exec = "${placeholder "out"}/bin/${pname}";
-    icon = pname;
-    desktopName = "Ledger Live";
-    categories = "Utility;";
+  appimageContents = appimageTools.extractType2 {
+    inherit name src;
   };
-
-  unpackPhase = ":";
-
-  installPhase = ''
-    runHook preInstall
-
-    ${desktopItem.buildCommand}
-    install -D $src $out/share/${src.name}
-    install -Dm -x ${desktopIcon} \
-      $out/share/icons/hicolor/1024x1024/apps/${pname}.png
-    makeWrapper ${appimage-run}/bin/appimage-run $out/bin/${pname} \
-      --add-flags $out/share/${src.name}
-
-    runHook postInstall
+in appimageTools.wrapType2 rec {
+  inherit name src;
+
+  extraInstallCommands = ''
+    mv $out/bin/${name} $out/bin/${pname}
+    install -m 444 -D ${appimageContents}/ledger-live-desktop.desktop $out/share/applications/ledger-live-desktop.desktop
+    install -m 444 -D ${appimageContents}/ledger-live-desktop.png $out/share/icons/hicolor/1024x1024/apps/ledger-live-desktop.png
+    substituteInPlace $out/share/applications/ledger-live-desktop.desktop \
+      --replace 'Exec=AppRun' 'Exec=${pname}'
   '';
 
   meta = with stdenv.lib; {
     description = "Wallet app for Ledger Nano S and Ledger Blue";
     homepage = "https://www.ledger.com/live";
     license = licenses.mit;
-    maintainers = with maintainers; [ thedavidmeister ];
+    maintainers = with maintainers; [ thedavidmeister nyanloutre ];
     platforms = [ "x86_64-linux" ];
   };
 }
-- 
GitLab


From 3867b4574515deeb107233f5100e6b7a6e77d74b Mon Sep 17 00:00:00 2001
From: Nicolas Mattia <nicolas@nmattia.com>
Date: Sat, 28 Sep 2019 18:31:37 +0200
Subject: [PATCH 1291/2254] niv: mark as not broken

`niv` used to depend on the broken `github`. The dependency was removed
and `niv` builds fine.
---
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 0c92abbd0a2..e1ae2938282 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -7461,7 +7461,6 @@ broken-packages:
   - Ninjas
   - nirum
   - nitro
-  - niv
   - nixfromnpm
   - nkjp
   - nlp-scores
-- 
GitLab


From 718b6d980f0a1b6841e464e8b25bf06a57be6c7f Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 20 Sep 2019 17:14:39 +0000
Subject: [PATCH 1292/2254] =?UTF-8?q?ocamlPackages.ptmap:=202.0.3=20?=
 =?UTF-8?q?=E2=86=92=202.0.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Ensures compatibility with OCaml 4.07
---
 .../development/ocaml-modules/ptmap/default.nix | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ptmap/default.nix b/pkgs/development/ocaml-modules/ptmap/default.nix
index 91b0d22a852..d6637d23052 100644
--- a/pkgs/development/ocaml-modules/ptmap/default.nix
+++ b/pkgs/development/ocaml-modules/ptmap/default.nix
@@ -1,13 +1,22 @@
 { stdenv, fetchzip, ocaml, findlib, obuild }:
 
-let version = "2.0.3"; in
+let param =
+  if stdenv.lib.versionAtLeast ocaml.version "4.07"
+  then {
+    version = "2.0.4";
+    sha256 = "05a391m1l04zigi6ghywj7f5kxy2w6186221k7711wmg56m94yjw";
+  } else {
+    version = "2.0.3";
+    sha256 = "19xykhqk7q25r1pj8rpfj53j2r9ls8mxi1w5m2wqshrf20gf078h";
+  }
+; in
 
 stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-ptmap-${version}";
+  name = "ocaml${ocaml.version}-ptmap-${param.version}";
 
   src = fetchzip {
-    url = "https://github.com/backtracking/ptmap/archive/v${version}.tar.gz";
-    sha256 = "19xykhqk7q25r1pj8rpfj53j2r9ls8mxi1w5m2wqshrf20gf078h";
+    url = "https://github.com/backtracking/ptmap/archive/v${param.version}.tar.gz";
+    inherit (param) sha256;
   };
 
   buildInputs = [ ocaml findlib obuild ];
-- 
GitLab


From a9e872a1260e2499645208cd1df89715e3d94dc1 Mon Sep 17 00:00:00 2001
From: jD91mZM2 <me@krake.one>
Date: Sat, 28 Sep 2019 18:48:55 +0200
Subject: [PATCH 1293/2254] x11docker: 6.0.0 -> 6.2.0

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

diff --git a/pkgs/applications/virtualization/x11docker/default.nix b/pkgs/applications/virtualization/x11docker/default.nix
index ea8a24e57a3..1d18e4d14e8 100644
--- a/pkgs/applications/virtualization/x11docker/default.nix
+++ b/pkgs/applications/virtualization/x11docker/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchFromGitHub, makeWrapper, nx-libs, xorg }:
 stdenv.mkDerivation rec {
   pname = "x11docker";
-  version = "6.0.0";
+  version = "6.2.0";
   src = fetchFromGitHub {
     owner = "mviereck";
     repo = "x11docker";
     rev = "v${version}";
-    sha256 = "1sfdxlh50hv8j3dj5bphihqdyf8s7ixm6ckrmvqgr2y3gak1y840";
+    sha256 = "19q5vrhspxpjkdhhlgya2sa2fgjg8gyd3kmnb83nlfs46p8jx4f4";
   };
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ nx-libs xorg.xhost xorg.xinit ];
-- 
GitLab


From 9caee45a59458f905fdc364203842f3426f90124 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 10:16:17 -0700
Subject: [PATCH 1294/2254] python37Packages.portalocker: 1.5.0 -> 1.5.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-portalocker/versions
---
 pkgs/development/python-modules/portalocker/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/portalocker/default.nix b/pkgs/development/python-modules/portalocker/default.nix
index 7d536c83782..82be4b8151f 100644
--- a/pkgs/development/python-modules/portalocker/default.nix
+++ b/pkgs/development/python-modules/portalocker/default.nix
@@ -10,12 +10,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "1.5.0";
+  version = "1.5.1";
   pname = "portalocker";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "08y5k39mn5a7n69wv0hsyjqb51lazs4i4dpxp42nla2lhllnpbyr";
+    sha256 = "08d8vm373fbx90wrql2i7025d4ir54sq8ahx6g1pw9h793zqrn0y";
   };
 
   checkInputs = [
-- 
GitLab


From 4c07c0fdf033dfe1512a195acfd12cbcdcf26f9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sat, 28 Sep 2019 19:31:31 +0200
Subject: [PATCH 1295/2254] nixos network-interfaces.nix: fixup after the last
 change

TL;DR: ipv6 tests were broken (probably the privacy-extension stuff)
https://github.com/NixOS/nixpkgs/pull/68227#issuecomment-536159177
---
 nixos/modules/tasks/network-interfaces.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 7351f8b6b7e..29310f6f24a 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -1092,7 +1092,7 @@ in
         destination = "/etc/udev/rules.d/98-${name}";
         text = ''
           # enable and prefer IPv6 privacy addresses by default
-          ACTION=="add", SUBSYSTEM=="net", RUN+="${pkgs.coreutils}/bin/echo 2 > /proc/sys/net/ipv6/conf/%k/use_tempaddr"
+          ACTION=="add", SUBSYSTEM=="net", RUN+="${pkgs.bash}/bin/sh -c 'echo 2 > /proc/sys/net/ipv6/conf/%k/use_tempaddr'"
         '';
       })
       (pkgs.writeTextFile rec {
-- 
GitLab


From 33f9896d42f51de4a03f3263d01fe0a2425e77d1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 10:39:34 -0700
Subject: [PATCH 1296/2254] python37Packages.mox3: 0.26.0 -> 0.28.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-mox3/versions
---
 pkgs/development/python-modules/mox3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mox3/default.nix b/pkgs/development/python-modules/mox3/default.nix
index 8885401ae5f..480e28dffcb 100644
--- a/pkgs/development/python-modules/mox3/default.nix
+++ b/pkgs/development/python-modules/mox3/default.nix
@@ -13,11 +13,11 @@
 
 buildPythonPackage rec {
   pname = "mox3";
-  version = "0.26.0";
+  version = "0.28.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b13c0b8459d6fb0688f9a4e70feeec43fa2cca05b727fc01156789596e083bb1";
+    sha256 = "17d4vglb71s96hhi6d30vnkr7g1pahv95igc4sjv857qf278d540";
   };
 
   buildInputs = [ subunit testrepository testtools six ];
-- 
GitLab


From 60df4d200f80c1d7d2204022109a7864d404fdf8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 10:44:24 -0700
Subject: [PATCH 1297/2254] python37Packages.premailer: 3.3.0 -> 3.6.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-premailer/versions
---
 pkgs/development/python-modules/premailer/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/premailer/default.nix b/pkgs/development/python-modules/premailer/default.nix
index f19f2dfe265..df9d5801302 100644
--- a/pkgs/development/python-modules/premailer/default.nix
+++ b/pkgs/development/python-modules/premailer/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "premailer";
-  version = "3.3.0";
+  version = "3.6.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "93be4f197e9d2a87a8fe6b5b6a79b64070dbb523108dfaf2a415b4558fc78ec1";
+    sha256 = "08pshx7a110k4ll20x0xhpvyn3kkipkrbgxjjn7ncdxs54ihdhgw";
   };
 
   buildInputs = [ mock nose ];
-- 
GitLab


From 1bdc484b3a6d50d7799f2232a6d039b1aa96eec2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 10:49:42 -0700
Subject: [PATCH 1298/2254] python37Packages.pyopencl: 2019.1 -> 2019.1.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-pyopencl/versions
---
 pkgs/development/python-modules/pyopencl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix
index 8561cbac1b8..cbe9b111a2c 100644
--- a/pkgs/development/python-modules/pyopencl/default.nix
+++ b/pkgs/development/python-modules/pyopencl/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "pyopencl";
-  version = "2019.1";
+  version = "2019.1.1";
 
   checkInputs = [ pytest ];
   buildInputs = [ opencl-headers ocl-icd pybind11 ];
@@ -25,7 +25,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "04ahndgc5aqm3pqix2j4vzn9n3k762ylf3yq55jdbxm5cicz9nx0";
+    sha256 = "0g5n1c8gfqhfrfpzdypzwfj1q1nlqzcfjrx397cs6qqw67mg095k";
   };
 
   # py.test is not needed during runtime, so remove it from `install_requires`
-- 
GitLab


From d76ae937008411760365182ca56beb45d6c21e87 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 10:52:07 -0700
Subject: [PATCH 1299/2254] python37Packages.ldap3: 2.6 -> 2.6.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-ldap3/versions
---
 pkgs/development/python-modules/ldap3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ldap3/default.nix b/pkgs/development/python-modules/ldap3/default.nix
index 13fe196e471..58acc263eff 100644
--- a/pkgs/development/python-modules/ldap3/default.nix
+++ b/pkgs/development/python-modules/ldap3/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "ldap3";
-  version = "2.6";
+  version = "2.6.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1f0v82584b7gkzrnnnl4fc88w4i73x7cxqbzy0r0bknm33yfwcq5";
+    sha256 = "0ag5xqlki6pjk3f50b8ar8vynx2fmkna7rfampv3kdgwg8z6gjr7";
   };
 
   propagatedBuildInputs = [ pyasn1 ];
-- 
GitLab


From 3d7f64d7a7e1b73dd0a0cecae77c6776984bdfe0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 10:54:34 -0700
Subject: [PATCH 1300/2254] python37Packages.MechanicalSoup: 0.11.0 -> 0.12.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-mechanicalsoup/versions
---
 pkgs/development/python-modules/MechanicalSoup/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/MechanicalSoup/default.nix b/pkgs/development/python-modules/MechanicalSoup/default.nix
index 6c4a2d310da..7882685df4c 100644
--- a/pkgs/development/python-modules/MechanicalSoup/default.nix
+++ b/pkgs/development/python-modules/MechanicalSoup/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "MechanicalSoup";
-  version = "0.11.0";
+  version = "0.12.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0k59wwk75q7nz6i6gynvzhagy02ql0bv7py3qqcwgjw7607yq4i7";
+    sha256 = "1g976rk79apz6rc338zq3ml2yps8hb88nyw3a698d0brm4khd9ir";
   };
 
   checkInputs = [ pytest pytestrunner requests-mock pytestcov ];
-- 
GitLab


From 17bc6566345f20dcaa30c4f952e7d16409cdc283 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 28 Sep 2019 13:00:00 -0500
Subject: [PATCH 1301/2254] tflint: 0.11.2 -> 0.12.0

Changelog: https://github.com/wata727/tflint/releases/tag/v0.12.0
---
 pkgs/development/tools/analysis/tflint/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix
index 39e9830dd5d..342600c7caa 100644
--- a/pkgs/development/tools/analysis/tflint/default.nix
+++ b/pkgs/development/tools/analysis/tflint/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "tflint";
-  version = "0.11.2";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
     owner = "wata727";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1lhg81bsmzxs46329rlayf8k2y7fbjlmxj09rqbygr9f0693rzgy";
+    sha256 = "1dma1nav6z9919lj4f7cqcf8h12l4gbwn24323y18l57zv988331";
   };
 
-  modSha256 = "10za02363yglhj0pbsd2591rflrrcq12gxx9d53pg9hb7lrxj9ij";
+  modSha256 = "1xjxaszpxv9k9s27y1i54cnp0ip47bq4ad2ziq7n8nb76zxw03mx";
 
   subPackages = [ "." ];
 
-- 
GitLab


From 446756a2cecaa4551f922fa999490d3c25da58c3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 11:01:47 -0700
Subject: [PATCH 1302/2254] python37Packages.plotly: 4.1.0 -> 4.1.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-plotly/versions
---
 pkgs/development/python-modules/plotly/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix
index 5cd6c106826..c12857759dd 100644
--- a/pkgs/development/python-modules/plotly/default.nix
+++ b/pkgs/development/python-modules/plotly/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "plotly";
-  version = "4.1.0";
+  version = "4.1.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "166rscpr9xbs3pwd61mivhlm1gv3chkgpk2cy0fpb86axa7z4cwk";
+    sha256 = "06gjvicl5k0qn8xz2gnqd4akxvd81n16gwssr7gwlnmdic5da30g";
   };
 
   propagatedBuildInputs = [
-- 
GitLab


From 4bd76f58fd9b7ead97a17f474f2ac4deab56f919 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 11:07:05 -0700
Subject: [PATCH 1303/2254] python37Packages.netcdf4: 1.5.1.2 -> 1.5.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-netcdf4/versions
---
 pkgs/development/python-modules/netcdf4/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/netcdf4/default.nix b/pkgs/development/python-modules/netcdf4/default.nix
index d3a1cfe3907..8b847397a3c 100644
--- a/pkgs/development/python-modules/netcdf4/default.nix
+++ b/pkgs/development/python-modules/netcdf4/default.nix
@@ -3,13 +3,13 @@
 }:
 buildPythonPackage rec {
   pname = "netCDF4";
-  version = "1.5.1.2";
+  version = "1.5.2";
 
   disabled = isPyPy;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "161pqb7xc9nj0dlnp6ply8c6zv68y1frq619xqfrpmc9s1932jzk";
+    sha256 = "08l92yzg2cy1zrkxjvwya2kpnmfzgwnvgb925hlrgcp5ga9y2xg0";
   };
 
   checkInputs = [ pytest ];
-- 
GitLab


From e0a03cad60e4e9f3d026ce8ad5f7465a0bb5a97b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 11:13:51 -0700
Subject: [PATCH 1304/2254] python37Packages.kubernetes: 10.0.0 -> 10.0.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-kubernetes/versions
---
 pkgs/development/python-modules/kubernetes/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/kubernetes/default.nix b/pkgs/development/python-modules/kubernetes/default.nix
index 8ba7b109264..153398bdd8e 100644
--- a/pkgs/development/python-modules/kubernetes/default.nix
+++ b/pkgs/development/python-modules/kubernetes/default.nix
@@ -4,7 +4,7 @@
 
 buildPythonPackage rec {
   pname = "kubernetes";
-  version = "10.0.0";
+  version = "10.0.1";
 
   prePatch = ''
     sed -e 's/sphinx>=1.2.1,!=1.3b1,<1.4 # BSD/sphinx/' -i test-requirements.txt
@@ -23,7 +23,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0v3hiy427ca010k8brys3aafgb5013i32yva1nmiibk3xcf7f90f";
+    sha256 = "14l5mj0yjmqsq084pdh8g8hlagvvjkdylpk6xwfsv5ikcsba8w1p";
   };
 
   checkInputs = [ isort coverage pytest mock sphinx autopep8 pep8 codecov recommonmark nose ];
-- 
GitLab


From 32a283d1dcabd8af078646debd9a80c2abaa42ee Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 11:41:21 -0700
Subject: [PATCH 1305/2254] python37Packages.whichcraft: 0.6.0 -> 0.6.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-whichcraft/versions
---
 pkgs/development/python-modules/whichcraft/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/whichcraft/default.nix b/pkgs/development/python-modules/whichcraft/default.nix
index 102496582a0..de6c4c570cc 100644
--- a/pkgs/development/python-modules/whichcraft/default.nix
+++ b/pkgs/development/python-modules/whichcraft/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "whichcraft";
-  version = "0.6.0";
+  version = "0.6.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1614vs0iwm9abina70vgvxaabi8xbz83yxgqfqi1syrzrhaalk6m";
+    sha256 = "11yfkzyplizdgndy34vyd5qlmr1n5mxis3a3svxmx8fnccdvknxc";
   };
 
   LC_ALL="en_US.utf-8";
-- 
GitLab


From beae056884a1315b9a5d54dd15689712be2182f4 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Fri, 13 Sep 2019 16:06:06 -0700
Subject: [PATCH 1306/2254] pythonPackage.datatable: 0.8.0 -> 0.9.0

---
 .../python-modules/datatable/default.nix      | 26 ++++++-----------
 ...onkeypatch_disable-native-relocation.patch | 28 -------------------
 2 files changed, 8 insertions(+), 46 deletions(-)
 delete mode 100644 pkgs/development/python-modules/datatable/remove-compiler-monkeypatch_disable-native-relocation.patch

diff --git a/pkgs/development/python-modules/datatable/default.nix b/pkgs/development/python-modules/datatable/default.nix
index 200ebef1faa..81a53ac15f4 100644
--- a/pkgs/development/python-modules/datatable/default.nix
+++ b/pkgs/development/python-modules/datatable/default.nix
@@ -1,32 +1,25 @@
-{ blessed
-, buildPythonPackage
-, fetchPypi
-, lib
+{ stdenv, lib, buildPythonPackage, fetchPypi, substituteAll, pythonOlder
+, blessed
+, docutils
 , libcxx
 , libcxxabi
 , llvm
 , openmp
 , pytest
-, pythonOlder
-, stdenv
-, substituteAll
 , typesentry
 }:
 
 buildPythonPackage rec {
   pname = "datatable";
-  version = "0.8.0";
+  version = "0.9.0";
+  disabled = pythonOlder "3.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1s8z81zffrckvdwrrl0pkjc7gsdvjxw59xgg6ck81dl7gkh5grjk";
+    sha256 = "1shwjkm9nyaj6asn57vwdd74pn13pggh14r6dzv729lzxm7nm65f";
   };
 
-  patches = [
-    # Disable the compiler monkey patching, and remove the task that's copying
-    # the native dependencies to the build directory.
-    ./remove-compiler-monkeypatch_disable-native-relocation.patch
-  ] ++ lib.optionals stdenv.isDarwin [
+  patches = lib.optionals stdenv.isDarwin [
     # Replace the library auto-detection with hardcoded paths.
     (substituteAll {
       src = ./hardcode-library-paths.patch;
@@ -37,16 +30,13 @@ buildPythonPackage rec {
     })
   ];
 
-  disabled = pythonOlder "3.5";
-
   propagatedBuildInputs = [ typesentry blessed ];
   buildInputs = [ llvm ] ++ lib.optionals stdenv.isDarwin [ openmp ];
-  checkInputs = [ pytest ];
+  checkInputs = [ docutils pytest ];
 
   LLVM = llvm;
 
   checkPhase = ''
-    # py.test adds local datatable to path, which doesn't contain built native library.
     mv datatable datatable.hidden
     pytest
   '';
diff --git a/pkgs/development/python-modules/datatable/remove-compiler-monkeypatch_disable-native-relocation.patch b/pkgs/development/python-modules/datatable/remove-compiler-monkeypatch_disable-native-relocation.patch
deleted file mode 100644
index 7cdbfa90724..00000000000
--- a/pkgs/development/python-modules/datatable/remove-compiler-monkeypatch_disable-native-relocation.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 58fc875..8032561 100644
---- a/setup.py
-+++ b/setup.py
-@@ -141,23 +141,6 @@ if cmd in ("build", "bdist_wheel", "build_ext", "install"):
-     extra_link_args = get_extra_link_args()
-     cpp_files = get_c_sources("c")
- 
--    with TaskContext("Copy dynamic libraries") as log:
--        # Copy system libraries into the datatable/lib folder, so that they can
--        # be packaged with the wheel
--        libs = find_linked_dynamic_libraries()
--        for libpath in libs:
--            trgfile = os.path.join("datatable", "lib",
--                                   os.path.basename(libpath))
--            if os.path.exists(trgfile):
--                log.info("File %s already exists, skipped" % trgfile)
--            else:
--                log.info("Copying %s to %s" % (libpath, trgfile))
--                shutil.copy(libpath, trgfile)
--
--    if ismacos():
--        monkey_patch_compiler()
--
--
- # Create the git version file
- if cmd in ("build", "sdist", "bdist_wheel", "install"):
-     make_git_version_file(True)
-- 
GitLab


From 91eb09c1b3360e89e6340f229a214504209049d0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 11:50:09 -0700
Subject: [PATCH 1307/2254] python37Packages.umap-learn: 0.3.9 -> 0.3.10

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-umap-learn/versions
---
 pkgs/development/python-modules/umap-learn/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/umap-learn/default.nix b/pkgs/development/python-modules/umap-learn/default.nix
index 1fbdbd3782a..a97f69652e8 100644
--- a/pkgs/development/python-modules/umap-learn/default.nix
+++ b/pkgs/development/python-modules/umap-learn/default.nix
@@ -10,13 +10,13 @@
 
 buildPythonPackage rec {
   pname = "umap-learn";
-  version = "0.3.9";
+  version = "0.3.10";
 
   src = fetchFromGitHub {
     owner = "lmcinnes";
     repo = "umap";
     rev = version;
-    sha256 = "1cdc7hs3vwzxvzs34l9a06q8rvks29wj6swyj8zvwr32knxch8a9";
+    sha256 = "0nck5va5km7qkbrhn15dsn0p2mms9kc641lcypy7l8haqgm44h8x";
   };
 
   checkInputs = [
-- 
GitLab


From beb59b76cfc71cc17f35be243f7ff556a30021d6 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 28 Sep 2019 20:53:43 +0200
Subject: [PATCH 1308/2254] prometheus-wireguard-exporter: 3.1.0 -> 3.1.1

https://github.com/MindFlavor/prometheus_wireguard_exporter/releases/tag/3.1.1

This release adds a flag `-l` which takes an address where the exporter
is available. The default is `0.0.0.0` (previously, `0.0.0.0` was used
by default).

Please note that there are no dependency changes in Cargo and therefore
the cargo hash didn't change.
---
 .../monitoring/prometheus/exporters/wireguard.nix        | 9 +++++++++
 .../servers/monitoring/prometheus/wireguard-exporter.nix | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix b/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix
index 8ae2c927b58..82e881236ad 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix
@@ -42,6 +42,14 @@ in {
         Whether or not the remote IP of a WireGuard peer should be exposed via prometheus.
       '';
     };
+
+    addr = mkOption {
+      type = types.str;
+      default = "0.0.0.0";
+      description = ''
+        IP address of the exporter.
+      '';
+    };
   };
   serviceOpts = {
     path = [ pkgs.wireguard-tools ];
@@ -51,6 +59,7 @@ in {
       ExecStart = ''
         ${pkgs.prometheus-wireguard-exporter}/bin/prometheus_wireguard_exporter \
           -p ${toString cfg.port} \
+          -l ${cfg.addr} \
           ${optionalString cfg.verbose "-v"} \
           ${optionalString cfg.singleSubnetPerField "-s"} \
           ${optionalString cfg.withRemoteIp "-r"} \
diff --git a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix
index 9b0d91747ad..249a3f8a089 100644
--- a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix
@@ -2,13 +2,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "wireguard-exporter";
-  version = "3.1.0";
+  version = "3.1.1";
 
   src = fetchFromGitHub {
     owner = "MindFlavor";
     repo = "prometheus_wireguard_exporter";
     rev = version;
-    sha256 = "0hl82cg6cijk3xf35cgi4v14gmxk3fj4c3z1x5hrs2i0j1i26ilw";
+    sha256 = "1cc36bngpjq8138f98d2dl0imgisiph7xmw1i7csmjs03b4pnfcx";
   };
 
   cargoSha256 = "1ndb33bi08j40b4jkj4q7d3k0cw5fscz2gc2cc3134nbs2r7jamk";
-- 
GitLab


From 31d1544e832d8d2c75c5088e0f64f5bcc6e3a072 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 12:00:54 -0700
Subject: [PATCH 1309/2254] python37Packages.twilio: 6.29.1 -> 6.29.3

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-twilio/versions
---
 pkgs/development/python-modules/twilio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix
index b2bb8a740a8..657d98722a2 100644
--- a/pkgs/development/python-modules/twilio/default.nix
+++ b/pkgs/development/python-modules/twilio/default.nix
@@ -3,13 +3,13 @@
 
 buildPythonPackage rec {
   pname = "twilio";
-  version = "6.29.1";
+  version = "6.29.3";
   # tests not included in PyPi, so fetch from github instead
   src = fetchFromGitHub {
     owner = "twilio";
     repo = "twilio-python";
     rev = version;
-    sha256 = "1g2wdy62w25sjibggr25b3833x0fhc7w6ypy8g1fgix217rja7pz";
+    sha256 = "0xc0lw6js8icshjh65rvgbnxrscqsd7ls3h0ni4xqg0kin9wyz42";
   };
 
   buildInputs = [ nose mock ];
-- 
GitLab


From a1a3fb121f29585ff341acc50809ef99a7cb8bd1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 18:28:33 -0700
Subject: [PATCH 1310/2254] plantuml: 1.2019.8 -> 1.2019.11

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/plantuml/versions
---
 pkgs/tools/misc/plantuml/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix
index eb2881b29f7..2ff042d8cbb 100644
--- a/pkgs/tools/misc/plantuml/default.nix
+++ b/pkgs/tools/misc/plantuml/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, makeWrapper, jre, graphviz }:
 
 stdenv.mkDerivation rec {
-  version = "1.2019.8";
+  version = "1.2019.11";
   pname = "plantuml";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar";
-    sha256 = "0kbyjsy8zp3325syg9g91rfgy2dzkffdj2ji82b5h9zy3rkrz08p";
+    sha256 = "0k9l4d3rf5g5vwx6kd170ija872j3fafkn50fkd3ddzjqdd0v9lm";
   };
 
   nativeBuildInputs = [ makeWrapper ];
-- 
GitLab


From 262b17a375a6aebd9681768b300a18f7ce3d2d1d Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 27 Sep 2019 22:53:20 +0200
Subject: [PATCH 1311/2254] fuse3: 3.6.2 -> 3.7.0

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

diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix
index f48e528b486..4a1fe56c5e1 100644
--- a/pkgs/os-specific/linux/fuse/default.nix
+++ b/pkgs/os-specific/linux/fuse/default.nix
@@ -11,7 +11,7 @@ in {
   };
 
   fuse_3 = mkFuse {
-    version = "3.6.2";
-    sha256Hash = "1cxx94q6zqns1iw5d4g3ll8f78swqxl6h25bpxmqkqsj6c91pzkl";
+    version = "3.7.0";
+    sha256Hash = "0l22gv5h84j5m7khs7l82jw834i8wf7hcgagpsn9y02x7ymmiha2";
   };
 }
-- 
GitLab


From 026a23713ec3abac8edaf160931ce13397dc1bdc Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 28 Sep 2019 14:16:13 -0500
Subject: [PATCH 1312/2254] rocs: Remove wrapper

---
 pkgs/applications/kde/rocs.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/applications/kde/rocs.nix b/pkgs/applications/kde/rocs.nix
index 45bc39fbb1c..0c007b3f09b 100644
--- a/pkgs/applications/kde/rocs.nix
+++ b/pkgs/applications/kde/rocs.nix
@@ -1,5 +1,5 @@
 {
-  stdenv, mkDerivation, makeWrapper, lib,
+  mkDerivation, lib,
   extra-cmake-modules, boost,
   qtbase, qtscript, qtquickcontrols, qtwebkit, qtxmlpatterns, grantlee,
   kdoctools, karchive, kxmlgui, kcrash, kdeclarative, ktexteditor, kguiaddons
@@ -13,9 +13,6 @@ mkDerivation {
     qtbase qtscript qtquickcontrols qtwebkit qtxmlpatterns grantlee
     kxmlgui kcrash kdeclarative karchive ktexteditor kguiaddons
   ];
-  postInstall = ''
-    wrapProgram $out/bin/rocs --prefix QT_PLUGIN_PATH ":" "${qtbase.bin}/${qtbase.qtPluginPrefix}:$out/${qtbase.qtPluginPrefix}"
-  '';
   meta = with lib; {
     homepage = http://www.kde.org;
     license = with licenses; [ gpl2 lgpl21 fdl12 ];
-- 
GitLab


From 4dc1971211d61ae5a16bea26ea56dc36f3a3e55a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 28 Sep 2019 14:16:39 -0500
Subject: [PATCH 1313/2254] rocs: Fix meta

---
 pkgs/applications/kde/rocs.nix | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/kde/rocs.nix b/pkgs/applications/kde/rocs.nix
index 0c007b3f09b..feae7ca81de 100644
--- a/pkgs/applications/kde/rocs.nix
+++ b/pkgs/applications/kde/rocs.nix
@@ -7,16 +7,19 @@
 
 mkDerivation {
   name = "rocs";
-  nativeBuildInputs = [ extra-cmake-modules makeWrapper kdoctools ];
-  buildInputs = [
-    boost
-    qtbase qtscript qtquickcontrols qtwebkit qtxmlpatterns grantlee
-    kxmlgui kcrash kdeclarative karchive ktexteditor kguiaddons
-  ];
+
   meta = with lib; {
-    homepage = http://www.kde.org;
+    homepage = "https://edu.kde.org/rocs/";
+    description = "A graph theory IDE.";
     license = with licenses; [ gpl2 lgpl21 fdl12 ];
     platforms = lib.platforms.linux;
     maintainers = with maintainers; [ knairda ];
   };
+
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [
+    boost
+    qtbase qtscript qtquickcontrols qtwebkit qtxmlpatterns grantlee
+    kxmlgui kcrash kdeclarative karchive ktexteditor kguiaddons
+  ];
 }
-- 
GitLab


From e04dae50cfb42650daf4b71ba23f11c99da8195b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 28 Sep 2019 21:33:14 +0200
Subject: [PATCH 1314/2254] fix dhall_1_26_0 reference

---
 pkgs/development/haskell-modules/configuration-common.nix | 6 ++++--
 pkgs/development/haskell-modules/configuration-nix.nix    | 1 -
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 75ad9337b82..e9d0593314a 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1035,6 +1035,8 @@ self: super: {
     generateOptparseApplicativeCompletion "dhall" (
       dontCheck super.dhall
   );
+  dhall_1_26_1 = dontCheck super.dhall_1_26_1;
+
 
   # Missing test files in source distribution, fixed once 1.4.0 is bumped
   # https://github.com/dhall-lang/dhall-haskell/pull/997
@@ -1191,8 +1193,8 @@ self: super: {
   temporary-resourcet = doJailbreak super.temporary-resourcet;
 
   # Requires dhall >= 1.23.0
-  ats-pkg = super.ats-pkg.override { dhall = self.dhall_1_26_0; };
-  dhall-to-cabal = super.dhall-to-cabal.override { dhall = self.dhall_1_26_0; };
+  ats-pkg = super.ats-pkg.override { dhall = self.dhall_1_26_1; };
+  dhall-to-cabal = super.dhall-to-cabal.override { dhall = self.dhall_1_26_1; };
 
   # Test suite doesn't work with current QuickCheck
   # https://github.com/pruvisto/heap/issues/11
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 795029402a4..2f815d8a5f1 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -589,7 +589,6 @@ self: super: builtins.intersectAttrs super {
   snap-server = dontCheck super.snap-server;
 
   # Tests require internet
-  dhall_1_26_0 = dontCheck super.dhall_1_26_0;
   http-download = dontCheck super.http-download;
   pantry = dontCheck super.pantry;
 
-- 
GitLab


From a7e76e519f77c8392f71520c39528fbe4872eadd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 12:59:27 -0700
Subject: [PATCH 1315/2254] qradiolink: 0.5.0 -> 0.5.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/qradiolink/versions
---
 pkgs/applications/radio/qradiolink/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/radio/qradiolink/default.nix b/pkgs/applications/radio/qradiolink/default.nix
index a00ec6c47eb..4a185667944 100644
--- a/pkgs/applications/radio/qradiolink/default.nix
+++ b/pkgs/applications/radio/qradiolink/default.nix
@@ -5,7 +5,7 @@
 } :
 
 let
-  version = "0.5.0";
+  version = "0.5.2";
 
 in stdenv.mkDerivation {
   pname = "qradiolink";
@@ -15,7 +15,7 @@ in stdenv.mkDerivation {
     owner = "kantooon";
     repo = "qradiolink";
     rev = version;
-    sha256 = "0xhg5zhjznmls5m3rhpk1qx0dipxmca12s85w15d0i7qwva2f1gi";
+    sha256 = "0djhrr96b8sr2vi6hwbzgzlp9771622dp93f0rsphsyxlwbzsrgl";
   };
 
   preBuild = ''
-- 
GitLab


From 68ce39c601d68bffa1d183aadf6797412b3a64fa Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 13:10:41 -0700
Subject: [PATCH 1316/2254] python37Packages.uproot: 3.8.0 -> 3.10.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-uproot/versions
---
 pkgs/development/python-modules/uproot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix
index f85c28b7f57..3d20c31b9be 100644
--- a/pkgs/development/python-modules/uproot/default.nix
+++ b/pkgs/development/python-modules/uproot/default.nix
@@ -15,11 +15,11 @@
 
 buildPythonPackage rec {
   pname = "uproot";
-  version = "3.8.0";
+  version = "3.10.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "06s0lym5md59pj8w89acnwk0i0hh92az187h4gz22mb849h308pw";
+    sha256 = "1ir3gxgfidw0lx0d2x1lmmxg9brb5fam3ncfihba2b0bvyq9bqzd";
   };
 
   nativeBuildInputs = [ pytestrunner ];
-- 
GitLab


From 0d57e8a0e882de30832e19d2b40b6755e8fab1ae Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 28 Sep 2019 15:15:15 -0500
Subject: [PATCH 1317/2254] _1password: 0.6.1 -> 0.6.2

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

diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix
index edcd08f2499..ce004d0cd51 100644
--- a/pkgs/applications/misc/1password/default.nix
+++ b/pkgs/applications/misc/1password/default.nix
@@ -2,24 +2,24 @@
 
 stdenv.mkDerivation rec {
   pname = "1password";
-  version = "0.6.1";
+  version = "0.6.2";
   src =
     if stdenv.hostPlatform.system == "i686-linux" then
       fetchzip {
         url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_386_v${version}.zip";
-        sha256 = "1yr78yawscp9fgvdw0dimc68k3bblk3g67g3jrqpa7hnl6pr24yl";
+        sha256 = "08ha4qr064jyivsp8z3q2cwmmm6klqyicc1i9vpf7zd9xmmx72rd";
         stripRoot = false;
       }
     else if stdenv.hostPlatform.system == "x86_64-linux" then
       fetchzip {
         url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip";
-        sha256 = "03m0vxhghzf4zq7k2f1afkc5ixf0qwiiypqjfjgpqpfng7g9ang7";
+        sha256 = "1fjhn1k9h6rlrgin5czvpig8h70dh14i5k20g77jvxq24bf0sn9m";
         stripRoot = false;
       }
     else if stdenv.hostPlatform.system == "x86_64-darwin" then
       fetchzip {
         url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_darwin_amd64_v${version}.zip";
-        sha256 = "1hypmls1fq4rjx9icgr0pkx3s3fhhma2q5rds314sv7f9ijl458f";
+        sha256 = "1x7pj41a4wra3ws09cyc063ai5isf12qbkm2hxiiiq5glnacpvpl";
         stripRoot = false;
       }
     else throw "Architecture not supported";
-- 
GitLab


From 63bc994a8b6988746f5faa89fe5feacbbae43b3f Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 24 Sep 2019 14:54:51 -0500
Subject: [PATCH 1318/2254] librseq: init at 0.1pre54_1526001

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../development/libraries/librseq/default.nix | 37 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/development/libraries/librseq/default.nix

diff --git a/pkgs/development/libraries/librseq/default.nix b/pkgs/development/libraries/librseq/default.nix
new file mode 100644
index 00000000000..d4619ba4320
--- /dev/null
+++ b/pkgs/development/libraries/librseq/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchFromGitHub
+, autoreconfHook, linuxHeaders
+}:
+
+stdenv.mkDerivation rec {
+  pname = "librseq";
+  version = "0.1.0pre54_${builtins.substring 0 7 src.rev}";
+
+  src = fetchFromGitHub {
+    owner  = "compudj";
+    repo   = "librseq";
+    rev    = "152600188dd214a0b2c6a8c66380e50c6ad27154";
+    sha256 = "0mivjmgdkgrr6z2gz3k6q6wgnvyvw9xzy65f6ipvqva68sxhk0mx";
+  };
+
+  outputs = [ "out" "dev" ];
+  nativeBuildInputs = [ autoreconfHook ];
+  buildInputs = [ linuxHeaders ];
+
+  separateDebugInfo = true;
+  enableParallelBuilding = true;
+
+  # The share/ subdir only contains a doc/ with a README.md that just describes
+  # how to compile the library, which clearly isn't very useful! So just get
+  # rid of it anyway.
+  postInstall = ''
+    rm -rf $out/share
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Userspace library for the Linux Restartable Sequence API";
+    homepage    = "https://github.com/compudj/librseq";
+    license     = licenses.lgpl21;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ thoughtpolice ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4b28714ec67..113b94915ff 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11880,6 +11880,8 @@ in
 
   liburing = callPackage ../development/libraries/liburing { };
 
+  librseq = callPackage ../development/libraries/librseq { };
+
   libseccomp = callPackage ../development/libraries/libseccomp { };
 
   libsecret = callPackage ../development/libraries/libsecret { };
-- 
GitLab


From df1800b7c95dfab24029bf129479d13a848141a9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 13:36:00 -0700
Subject: [PATCH 1319/2254] python37Packages.uncompyle6: 3.3.3 -> 3.4.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-uncompyle6/versions
---
 pkgs/development/python-modules/uncompyle6/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/uncompyle6/default.nix b/pkgs/development/python-modules/uncompyle6/default.nix
index f300ed72751..65542cd758b 100644
--- a/pkgs/development/python-modules/uncompyle6/default.nix
+++ b/pkgs/development/python-modules/uncompyle6/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "uncompyle6";
-  version = "3.3.3";
+  version = "3.4.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9c492a560ff1c8713f0947cfc3ab755c368e26421d13087cd5b6c01b1529ea5b";
+    sha256 = "0w4m0jywjb0w1y73nkb05zmjxb4plpfi3w2g1rgrf45afa2aqm8z";
   };
 
   checkInputs = [ nose pytest hypothesis six ];
-- 
GitLab


From 9db458fd104c35752afd2abd74d7231edb900808 Mon Sep 17 00:00:00 2001
From: Anders Lundstedt <git@anderslundstedt.se>
Date: Sat, 28 Sep 2019 22:55:53 +0200
Subject: [PATCH 1320/2254] spotifyd: 0.2.14 -> 0.2.16

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

diff --git a/pkgs/applications/audio/spotifyd/default.nix b/pkgs/applications/audio/spotifyd/default.nix
index 7734a7f3067..443107ad9e4 100644
--- a/pkgs/applications/audio/spotifyd/default.nix
+++ b/pkgs/applications/audio/spotifyd/default.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "spotifyd";
-  version = "0.2.14";
+  version = "0.2.16";
 
   src = fetchFromGitHub {
     owner = "Spotifyd";
     repo = "spotifyd";
     rev = "v${version}";
-    sha256 = "1hbcyc5rdrvdnvvsgaykqamq4i0yq8wqq5qjp6zjf4jlaxxif4nz";
+    sha256 = "097hg18h7gya2w0wl5jkav79nb3qzcc4ycsryq7nhxa0h1agvinc";
   };
 
-  cargoSha256 = "15gd8shg0mn4vsma2hckj6w8gkwr58iniyfw1vjrh4clw4x7ibb4";
+  cargoSha256 = "0ar4bfwn3qxa6wsz2hd7nv1wr824h74jy3xqba2qsy0rsfwy1bmm";
 
   cargoBuildFlags = [
     "--no-default-features"
-- 
GitLab


From 2590da0384952453e6a04007f19e8ddb06551232 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 13:56:01 -0700
Subject: [PATCH 1321/2254] python37Packages.zstd: 1.4.1.0 -> 1.4.3.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-zstd/versions
---
 pkgs/development/python-modules/zstd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/zstd/default.nix b/pkgs/development/python-modules/zstd/default.nix
index 9c9c932cabf..3f9dac6d42c 100644
--- a/pkgs/development/python-modules/zstd/default.nix
+++ b/pkgs/development/python-modules/zstd/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "zstd";
-  version = "1.4.1.0";
+  version = "1.4.3.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0laxg0pag1bzmqmg4x81jb32412pn98p9zg2b0li035m779nka95";
+    sha256 = "1h4wvzikar4ryhawm7clh29bvhbpy0ix1rlxhg9x195fpq56vsh7";
   };
 
   postPatch = ''
-- 
GitLab


From 0a7624484ddcf2cb5786d88d9d4e057b926b0404 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 14:05:58 -0700
Subject: [PATCH 1322/2254] python37Packages.reproject: 0.4 -> 0.5.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-reproject/versions
---
 pkgs/development/python-modules/reproject/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/reproject/default.nix b/pkgs/development/python-modules/reproject/default.nix
index f84508fe53c..d16f9fd2929 100644
--- a/pkgs/development/python-modules/reproject/default.nix
+++ b/pkgs/development/python-modules/reproject/default.nix
@@ -10,13 +10,13 @@
 
 buildPythonPackage rec {
   pname = "reproject";
-  version = "0.4";
+  version = "0.5.1";
 
   doCheck = false; # tests require pytest-astropy
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "dbbb18a8b211292c7ce61121b8538fc279540337be1c05cabc7570c5aca6d734";
+    sha256 = "069rha55cbm8vsi1qf8zydds42lgkcc97sd57hmjw1mgiz025xrp";
   };
 
   propagatedBuildInputs = [ numpy astropy astropy-healpix astropy-helpers scipy ];
-- 
GitLab


From 859e6373838bff53d43944cb9c9ddf04b1838b15 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 28 Sep 2019 16:20:00 -0500
Subject: [PATCH 1323/2254] _1password: add marsam as maintainer

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

diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix
index ce004d0cd51..5895990e80e 100644
--- a/pkgs/applications/misc/1password/default.nix
+++ b/pkgs/applications/misc/1password/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     description  = "1Password command-line tool";
     homepage     = https://support.1password.com/command-line/;
     downloadPage = https://app-updates.agilebits.com/product_history/CLI;
-    maintainers  = with maintainers; [ joelburget ];
+    maintainers  = with maintainers; [ joelburget marsam ];
     license      = licenses.unfree;
     platforms    = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
   };
-- 
GitLab


From 564d8e333ddeed6b3c759d9de7125c0c8b730a8b Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 28 Sep 2019 16:20:00 -0500
Subject: [PATCH 1324/2254] work-sans: init at 1.6

---
 pkgs/data/fonts/work-sans/default.nix | 29 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/data/fonts/work-sans/default.nix

diff --git a/pkgs/data/fonts/work-sans/default.nix b/pkgs/data/fonts/work-sans/default.nix
new file mode 100644
index 00000000000..16a0e9ac021
--- /dev/null
+++ b/pkgs/data/fonts/work-sans/default.nix
@@ -0,0 +1,29 @@
+{ lib, fetchFromGitHub }:
+
+let
+  version = "1.6";
+in fetchFromGitHub {
+  name = "work-sans-${version}";
+
+  owner = "weiweihuanghuang";
+  repo = "Work-Sans";
+  rev = "v${version}";
+
+  postFetch = ''
+    tar xf $downloadedFile --strip=1
+    install -m444 -Dt $out/share/fonts/opentype/ fonts/desktop/*.otf
+    install -m444 -Dt $out/share/fonts/truetype/ fonts/webfonts/ttf/*.ttf
+    install -m444 -Dt $out/share/fonts/woff/     fonts/webfonts/woff/*.woff
+    install -m444 -Dt $out/share/fonts/woff2/    fonts/webfonts/woff2/*.woff2
+  '';
+
+  sha256 = "01kjidk6zv80rqxapcdwhd9wxzrjfc6lj4gkf6dwa4sskw5x3b8a";
+
+  meta = with lib; {
+    description = "A grotesque sans";
+    homepage = "https://weiweihuanghuang.github.io/Work-Sans/";
+    license = licenses.ofl;
+    maintainers = [ maintainers.marsam ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0a27f73a16c..8dd6f264024 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17269,6 +17269,8 @@ in
 
   wireless-regdb = callPackage ../data/misc/wireless-regdb { };
 
+  work-sans  = callPackage ../data/fonts/work-sans { };
+
   wqy_microhei = callPackage ../data/fonts/wqy-microhei { };
 
   wqy_zenhei = callPackage ../data/fonts/wqy-zenhei { };
-- 
GitLab


From 9ac6fc4d69bfa7c12937c8466c5acb3d32245049 Mon Sep 17 00:00:00 2001
From: Johannes Schleifenbaum <johannes@js-webcoding.de>
Date: Mon, 26 Aug 2019 08:27:55 +0200
Subject: [PATCH 1325/2254] teamspeak_client: 3.3.0 -> 3.3.2

---
 .../networking/instant-messengers/teamspeak/client.nix      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
index eaf9a8f47e5..a75d0c8633a 100644
--- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
+++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
@@ -33,13 +33,13 @@ in
 stdenv.mkDerivation rec {
   pname = "teamspeak-client";
 
-  version = "3.3.0";
+  version = "3.3.2";
 
   src = fetchurl {
     url = "https://files.teamspeak-services.com/releases/client/${version}/TeamSpeak3-Client-linux_${arch}-${version}.run";
     sha256 = if stdenv.is64bit
-                then "13286dbjp4qiyfv8my1hfpwzns4szdsnqa11j8ygsh5ikgjk338a"
-                else "04lwclq7nvw73v5fmn9795j5wi54syglc77ldl41caiqqhdqf1i5";
+                then "1n916ds67dxj5bfgc5zm9nz2xh2914k85pzzspzvfyr7njcw7hpi"
+                else "0csl5xklcb4v8bzwvby5m2n38zjrnaw8dcvha7qvfbjllxr75yn2";
   };
 
   # grab the plugin sdk for the desktop icon
-- 
GitLab


From 0d639063db8dd0766f27ee764f28062d600ed1d3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 14:25:52 -0700
Subject: [PATCH 1326/2254] python37Packages.srsly: 0.0.7 -> 0.1.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-srsly/versions
---
 pkgs/development/python-modules/srsly/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/srsly/default.nix b/pkgs/development/python-modules/srsly/default.nix
index d1685b4d579..17cd3e8c503 100644
--- a/pkgs/development/python-modules/srsly/default.nix
+++ b/pkgs/development/python-modules/srsly/default.nix
@@ -12,11 +12,11 @@
 
 buildPythonPackage rec {
   pname = "srsly";
-  version = "0.0.7";
+  version = "0.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1v9nn17q2lshnvnc8ff6nk53rggz2hgnmx4fj4czfr40125r98pk";
+    sha256 = "1l9yjp1w2vrkrynxrlrc0v47i2iq9059k4ni44nz23573xbdrh2w";
   };
 
   propagatedBuildInputs = lib.optional (pythonOlder "3.4") pathlib;
-- 
GitLab


From b2c482b700009aa47d35933bb457e8d5227ba96a Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 27 Sep 2019 15:05:10 +0100
Subject: [PATCH 1327/2254] verilog: extend platforms

---
 pkgs/applications/science/electronics/verilog/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/electronics/verilog/default.nix b/pkgs/applications/science/electronics/verilog/default.nix
index f850a1bf94d..b707db14160 100644
--- a/pkgs/applications/science/electronics/verilog/default.nix
+++ b/pkgs/applications/science/electronics/verilog/default.nix
@@ -35,6 +35,6 @@ stdenv.mkDerivation rec {
     homepage = "http://iverilog.icarus.com/";
     license = licenses.lgpl21;
     maintainers = with maintainers; [ winden ];
-    platforms = platforms.linux;
+    platforms = platforms.all;
   };
 }
-- 
GitLab


From b819ce615daa5160d58ba7f126aed40cef5f23e9 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 27 Sep 2019 15:06:36 +0100
Subject: [PATCH 1328/2254] yosys: 2019.09.01 -> 2019.09.27

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

diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix
index 1535c7a7de6..47c3259099c 100644
--- a/pkgs/development/compilers/yosys/default.nix
+++ b/pkgs/development/compilers/yosys/default.nix
@@ -8,14 +8,14 @@ with builtins;
 
 stdenv.mkDerivation rec {
   pname = "yosys";
-  version = "2019.09.01";
+  version = "2019.09.27";
 
   srcs = [
     (fetchFromGitHub {
       owner  = "yosyshq";
       repo   = "yosys";
-      rev    = "4aa505d1b254b3fbb66af2d95b396a8f077da9d0";
-      sha256 = "16rhwmn1z2ppaq3wycgq713krq48s80a6h57vgzjzj17hgncg7hs";
+      rev    = "c372e7baf9c48d41ebdbea4486a72e8dfaaddd3d";
+      sha256 = "18cyz900haf8lkpddqn0sns0a3hc8fqndzz7gg391671hzvy820k";
       name   = "yosys";
     })
 
-- 
GitLab


From 26d26f77a6960600da70dbddc81beb294f59a88a Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 27 Sep 2019 15:06:42 +0100
Subject: [PATCH 1329/2254] yosys: enable tests

---
 pkgs/development/compilers/yosys/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix
index 47c3259099c..79c8f67b9e0 100644
--- a/pkgs/development/compilers/yosys/default.nix
+++ b/pkgs/development/compilers/yosys/default.nix
@@ -2,6 +2,7 @@
 , pkgconfig, bison, flex
 , tcl, readline, libffi, python3
 , protobuf, zlib
+, verilog
 }:
 
 with builtins;
@@ -49,6 +50,7 @@ stdenv.mkDerivation rec {
       --replace 'LD = gcc' 'LD = $(CXX)' \
       --replace 'ABCMKARGS = CC="$(CXX)" CXX="$(CXX)"' 'ABCMKARGS =' \
       --replace 'echo UNKNOWN' 'echo ${substring 0 10 (elemAt srcs 0).rev}'
+    patchShebangs tests
   '';
 
   preBuild = ''
@@ -62,6 +64,13 @@ stdenv.mkDerivation rec {
     (cd misc && ${protobuf}/bin/protoc --cpp_out ../backends/protobuf/ ./yosys.proto)
   '';
 
+  doCheck = true;
+  checkInputs = [ verilog ];
+  # checkPhase defaults to VERBOSE=y, which gets passed down to abc,
+  # which then does $(VERBOSE)gcc, which then complains about not
+  # being able to find ygcc. Life is pain.
+  checkFlags = [ " " ];
+
   meta = {
     description = "Framework for RTL synthesis tools";
     longDescription = ''
-- 
GitLab


From 391ce62306da37a6a65846ca802f53f837463817 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 27 Sep 2019 15:06:50 +0100
Subject: [PATCH 1330/2254] icestorm: 2019.08.31 -> 2019.09.13

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

diff --git a/pkgs/development/tools/icestorm/default.nix b/pkgs/development/tools/icestorm/default.nix
index b3ce4f8f6a7..a7af74a8dc8 100644
--- a/pkgs/development/tools/icestorm/default.nix
+++ b/pkgs/development/tools/icestorm/default.nix
@@ -11,7 +11,7 @@
 
 stdenv.mkDerivation rec {
   pname = "icestorm";
-  version = "2019.08.31";
+  version = "2019.09.13";
 
   pythonPkg = if usePyPy then pypy3 else python3;
   pythonInterp = pythonPkg.interpreter;
@@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner  = "cliffordwolf";
     repo   = "icestorm";
-    rev    = "04f1eb78ed8fd50516aee50102675041a8fd40cd";
-    sha256 = "10jdiw4mw0afcjq7xl3xs8z733mlrx927x620vs2yz91p757jxbd";
+    rev    = "0ec00d892a91cc68e45479b46161f649caea2933";
+    sha256 = "1qlh99fafb7xga702k64fmc9m700nsddrfgcq4x8qn8fplsb64f1";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From ee960619464eb9835d8a9a0ca2eecc7036a7bbc1 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 27 Sep 2019 15:06:56 +0100
Subject: [PATCH 1331/2254] trellis: 2019.09.01 -> 2019.09.27

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

diff --git a/pkgs/development/tools/trellis/default.nix b/pkgs/development/tools/trellis/default.nix
index c98529484d5..d9ec787fc47 100644
--- a/pkgs/development/tools/trellis/default.nix
+++ b/pkgs/development/tools/trellis/default.nix
@@ -8,16 +8,17 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "trellis";
-  version = "2019.09.01";
+  version = "2019.09.27";
+  # git describe --tags
   realVersion = with stdenv.lib; with builtins;
-    "1.0-53-g${substring 0 7 (elemAt srcs 0).rev}";
+    "1.0-71-g${substring 0 7 (elemAt srcs 0).rev}";
 
   srcs = [
     (fetchFromGitHub {
        owner  = "symbiflow";
        repo   = "prjtrellis";
-       rev    = "98871e0e2959bc8cb4de3c7ebe2b9eddc4efe00c";
-       sha256 = "1yq7ih2xvhfvdpijmbqjq6jcngl6710kiv66hkww5ih8j5dzsq5l";
+       rev    = "06904938dfe8f52392e73f7c8b1e034327887c27";
+       sha256 = "1yk13pipj7wp2mma0qcss4sa0wx8h60x0l0x9awh8g2iyk1y8nfw";
        name   = "trellis";
      })
     (fetchFromGitHub {
@@ -32,11 +33,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ boostWithPython3 ];
   nativeBuildInputs = [ cmake python3 ];
+  cmakeFlags = [ "-DCURRENT_GIT_VERSION=${realVersion}" ];
 
   preConfigure = with builtins; ''
-    substituteInPlace libtrellis/CMakeLists.txt \
-      --replace "git describe --tags" "echo ${realVersion}"
-
     rmdir database && ln -sfv ${elemAt srcs 1} ./database
 
     source environment.sh
-- 
GitLab


From 9f7165de66fa2b24215937c46685c2c57a8c8d5f Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sat, 28 Sep 2019 12:55:43 +0100
Subject: [PATCH 1332/2254] nextpnr: 2019.08.31 -> 2019.09.28

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

diff --git a/pkgs/development/compilers/nextpnr/default.nix b/pkgs/development/compilers/nextpnr/default.nix
index 357f26cf314..4713626fbb2 100644
--- a/pkgs/development/compilers/nextpnr/default.nix
+++ b/pkgs/development/compilers/nextpnr/default.nix
@@ -14,13 +14,14 @@ let
 in
 with stdenv; mkDerivation rec {
   pname = "nextpnr";
-  version = "2019.08.31";
+  version = "2019.09.28";
 
   src = fetchFromGitHub {
     owner  = "yosyshq";
     repo   = "nextpnr";
-    rev    = "c0b7379e8672b6263152d5e340e62f22179fdc8b";
-    sha256 = "174n962xiwyzy53cn192h9rq95h951k3xy6bs43p5ya592ai5mjh";
+    rev    = "7cd1e0495122847611b17a8d1f007d97a05b288c";
+    sha256 = "13y739l92plb22g73jf35pyh3y94b2vq0i65r9c31r2rb7fw4bbl";
+    fetchSubmodules = true;
   };
 
   nativeBuildInputs
@@ -40,8 +41,6 @@ with stdenv; mkDerivation rec {
       "-DUSE_OPENMP=ON"
       # warning: high RAM usage
       "-DSERIALIZE_CHIPDB=OFF"
-      # use PyPy for icestorm if enabled
-      "-DPYTHON_EXECUTABLE=${icestorm.pythonInterp}"
     ]
     ++ (lib.optional (!enableGui) "-DBUILD_GUI=OFF")
     ++ (lib.optional (enableGui && stdenv.isDarwin)
@@ -52,6 +51,10 @@ with stdenv; mkDerivation rec {
   patchPhase = with builtins; ''
     substituteInPlace ./CMakeLists.txt \
       --replace 'git log -1 --format=%h' 'echo ${substring 0 11 src.rev}'
+
+    # use PyPy for icestorm if enabled
+    substituteInPlace ./ice40/family.cmake \
+      --replace ''\'''${PYTHON_EXECUTABLE}' '${icestorm.pythonInterp}'
   '';
 
 
-- 
GitLab


From 97ca1528a031075ad1bb1ebb6f71079accf31527 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 27 Sep 2019 15:07:07 +0100
Subject: [PATCH 1333/2254] nextpnr: enable tests

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

diff --git a/pkgs/development/compilers/nextpnr/default.nix b/pkgs/development/compilers/nextpnr/default.nix
index 4713626fbb2..d9f6f9f65dd 100644
--- a/pkgs/development/compilers/nextpnr/default.nix
+++ b/pkgs/development/compilers/nextpnr/default.nix
@@ -35,6 +35,7 @@ with stdenv; mkDerivation rec {
   enableParallelBuilding = true;
   cmakeFlags =
     [ "-DARCH=generic;ice40;ecp5"
+      "-DBUILD_TESTS=ON"
       "-DICEBOX_ROOT=${icestorm}/share/icebox"
       "-DTRELLIS_ROOT=${trellis}/share/trellis"
       "-DPYTRELLIS_LIBDIR=${trellis}/lib/trellis"
@@ -57,6 +58,7 @@ with stdenv; mkDerivation rec {
       --replace ''\'''${PYTHON_EXECUTABLE}' '${icestorm.pythonInterp}'
   '';
 
+  doCheck = true;
 
   postFixup = lib.optionalString enableGui ''
     wrapQtApp $out/bin/nextpnr-generic
-- 
GitLab


From f68ec22dcc7bf8289c06c6f74ced87b91b31dd2e Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 27 Sep 2019 15:07:14 +0100
Subject: [PATCH 1334/2254] python3Packages.nmigen: unstable-2019-08-31 ->
 unstable-2019-09-28

---
 .../python-modules/nmigen/default.nix         | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/nmigen/default.nix b/pkgs/development/python-modules/nmigen/default.nix
index 345ba982b0b..02569e0a81b 100644
--- a/pkgs/development/python-modules/nmigen/default.nix
+++ b/pkgs/development/python-modules/nmigen/default.nix
@@ -2,6 +2,8 @@
 , buildPythonPackage
 , pythonOlder
 , fetchFromGitHub
+, setuptools
+, setuptools_scm
 , pyvcd
 , bitarray
 , jinja2
@@ -19,19 +21,22 @@
 
 buildPythonPackage rec {
   pname = "nmigen";
-  version = "unstable-2019-08-31";
-  realVersion = lib.substring 0 7 src.rev;
+  version = "unstable-2019-09-28";
+  # python setup.py --version
+  realVersion = "0.1.dev689+g${lib.substring 0 7 src.rev}";
 
   src = fetchFromGitHub {
     owner = "m-labs";
     repo = "nmigen";
-    rev = "2e206220462c67aa6ae97f7515a2191440fd61b3";
-    sha256 = "0y3w6vd493jqm9b8ppgwzs02v1al8w1n5gylljlsw70ci7fyk4qa";
+    rev = "a02e3750bfeba44bcaad4c5de8d9eb0ef055d9c6";
+    sha256 = "0m399c2nm7y54q2f0fbkmi4h35csbc2llckm6k9kqdf5qc6355wd";
   };
 
   disabled = pythonOlder "3.6";
 
-  propagatedBuildInputs = [ pyvcd bitarray jinja2 ];
+  nativeBuildInputs = [ setuptools_scm ];
+
+  propagatedBuildInputs = [ setuptools pyvcd bitarray jinja2 ];
 
   checkInputs = [ yosys yices ];
 
@@ -48,14 +53,15 @@ buildPythonPackage rec {
       tool icestorm "icepack" //
       tool trellis "ecppack";
   in ''
-    substituteInPlace setup.py \
-      --replace 'versioneer.get_version()' '"${realVersion}"'
-
     substituteInPlace nmigen/_toolchain.py \
       --replace 'overrides = {}' \
                 'overrides = ${builtins.toJSON toolchainOverrides}'
   '';
 
+  preBuild = ''
+    export SETUPTOOLS_SCM_PRETEND_VERSION="${realVersion}"
+  '';
+
   meta = with lib; {
     description = "A refreshed Python toolbox for building complex digital hardware";
     homepage = https://github.com/m-labs/nmigen;
-- 
GitLab


From 32c4e9e7229a4ccca758e1a6f93785c644effaea Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 27 Sep 2019 15:07:19 +0100
Subject: [PATCH 1335/2254] python3Packages.nmigen-boards: unstable-2019-08-30
 -> unstable-2019-09-23

---
 .../python-modules/nmigen-boards/default.nix  | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/nmigen-boards/default.nix b/pkgs/development/python-modules/nmigen-boards/default.nix
index 4151d08b60f..7f4654eab79 100644
--- a/pkgs/development/python-modules/nmigen-boards/default.nix
+++ b/pkgs/development/python-modules/nmigen-boards/default.nix
@@ -2,25 +2,28 @@
 , buildPythonPackage
 , fetchFromGitHub
 , nmigen
+, setuptools
+, setuptools_scm
 }:
 
 buildPythonPackage rec {
   pname = "nmigen-boards";
-  version = "unstable-2019-08-30";
-  realVersion = lib.substring 0 7 src.rev;
+  version = "unstable-2019-09-23";
+  # python setup.py --version
+  realVersion = "0.1.dev55+g${lib.substring 0 7 src.rev}";
 
   src = fetchFromGitHub {
     owner = "m-labs";
     repo = "nmigen-boards";
-    rev = "3b80b3a3749ae8f123ff258a25e81bd21412aed4";
-    sha256 = "01qynxip8bq23jfjc5wjd97vxfvhld2zb8sxphwf0zixrmmyaspi";
+    rev = "b8b2bbaff34c905f2b1094a74b6865961feb2290";
+    sha256 = "00gsdm7qf6gsxqmkgqz1ing1yc0352s14pvw863rdbjbd1bv5r0m";
   };
 
-  propagatedBuildInputs = [ nmigen ];
+  nativeBuildInputs = [ setuptools_scm ];
+  propagatedBuildInputs = [ setuptools nmigen ];
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace 'versioneer.get_version()' '"${realVersion}"'
+  preBuild = ''
+    export SETUPTOOLS_SCM_PRETEND_VERSION="${realVersion}"
   '';
 
   meta = with lib; {
-- 
GitLab


From 32c6c0ef30bcf0492d90d9979cb8b1361fc774cb Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 27 Sep 2019 15:07:25 +0100
Subject: [PATCH 1336/2254] libfx2: unstable-2019-08-27 -> unstable-2019-09-23

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

diff --git a/pkgs/development/python-modules/fx2/default.nix b/pkgs/development/python-modules/fx2/default.nix
index fa5edc1077c..2d47e0669d8 100644
--- a/pkgs/development/python-modules/fx2/default.nix
+++ b/pkgs/development/python-modules/fx2/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage {
   pname = "fx2";
-  version = "unstable-2019-08-27";
+  version = "unstable-2019-09-23";
 
   src = fetchFromGitHub {
     owner = "whitequark";
     repo = "libfx2";
-    rev = "dd1e42c7b46ff410dbb18beab46111bb5491400c";
-    sha256 = "0xvlmx6ym0ylrvnlqzf18d475wa0mfci7wkdbv30gl3hgdhsppjz";
+    rev = "3adb4fc842f174b0686ed122c0309d68356edc11";
+    sha256 = "0b3zp50mschsxi2v3192dmnpw32gwblyl8aswlz9a0vx1qg3ibzn";
   };
 
   nativeBuildInputs = [ sdcc ];
-- 
GitLab


From abcd56bd779e8c4b703ad7302ca79348f0fca375 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 27 Sep 2019 15:07:31 +0100
Subject: [PATCH 1337/2254] glasgow: unstable-2019-08-31 -> unstable-2019-09-28

---
 .../python-modules/glasgow/default.nix        | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/glasgow/default.nix b/pkgs/development/python-modules/glasgow/default.nix
index 264a13aed5e..ceab6b7e83e 100644
--- a/pkgs/development/python-modules/glasgow/default.nix
+++ b/pkgs/development/python-modules/glasgow/default.nix
@@ -1,6 +1,8 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
+, setuptools
+, setuptools_scm
 , sdcc
 , nmigen
 , fx2
@@ -16,19 +18,21 @@
 
 buildPythonPackage rec {
   pname = "glasgow";
-  version = "unstable-2019-08-31";
-  realVersion = lib.substring 0 7 src.rev;
+  version = "unstable-2019-09-28";
+  # python setup.py --version
+  realVersion = "0.1.dev1234+g${lib.substring 0 7 src.rev}";
 
   src = fetchFromGitHub {
     owner = "GlasgowEmbedded";
     repo = "Glasgow";
-    rev = "21641a13c6a0daaf8618aff3c5bfffcb26ef6cca";
-    sha256 = "1dpm1jmm4fg8xf17s6h9g5sc09gq8b6xq955sv2x11nrbqf98l4v";
+    rev = "a1cc0333315847980806fd0330021c6de05c5395";
+    sha256 = "0rdx7fymz828i73bc559sr67aikydz1m8s2a0i6c86gznh1s3cfk";
   };
 
-  nativeBuildInputs = [ sdcc ];
+  nativeBuildInputs = [ setuptools_scm sdcc ];
 
   propagatedBuildInputs = [
+    setuptools
     nmigen
     fx2
     libusb1
@@ -38,15 +42,11 @@ buildPythonPackage rec {
     crcmod
   ];
 
-  postPatch = ''
-    substituteInPlace software/setup.py \
-      --replace 'versioneer.get_version()' '"${realVersion}"'
-  '';
-
   preBuild = ''
     make -C firmware LIBFX2=${fx2}/share/libfx2
     cp firmware/glasgow.ihex software/glasgow
     cd software
+    export SETUPTOOLS_SCM_PRETEND_VERSION="${realVersion}"
   '';
 
   # a couple failing tests and also installCheck tries to build_ext again
-- 
GitLab


From 67393f6441317b54bbabc4f08b1bf8316a501728 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 27 Sep 2019 15:07:36 +0100
Subject: [PATCH 1338/2254] glasgow: enable tests

---
 pkgs/development/python-modules/glasgow/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/glasgow/default.nix b/pkgs/development/python-modules/glasgow/default.nix
index ceab6b7e83e..6e314668fae 100644
--- a/pkgs/development/python-modules/glasgow/default.nix
+++ b/pkgs/development/python-modules/glasgow/default.nix
@@ -49,9 +49,8 @@ buildPythonPackage rec {
     export SETUPTOOLS_SCM_PRETEND_VERSION="${realVersion}"
   '';
 
-  # a couple failing tests and also installCheck tries to build_ext again
+  # installCheck tries to build_ext again
   doInstallCheck = false;
-  doCheck = false;
 
   checkPhase = ''
     python -m unittest discover
-- 
GitLab


From 1f289463acf259af314a5aaa66da74a1e9de09c6 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Sat, 28 Sep 2019 17:52:58 -0400
Subject: [PATCH 1339/2254] linux_rpi1: fix Raspberry Pi Zero device tree file
 name

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

diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix
index b383abdef1d..f8ad6b37a19 100644
--- a/pkgs/os-specific/linux/kernel/linux-rpi.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix
@@ -49,8 +49,8 @@ lib.overrideDerivation (buildLinux (args // {
       cp -v "$dtbDir/$1" "$dtbDir/$2"
     }
   '' + lib.optionalString (lib.elem stdenv.hostPlatform.system ["armv6l-linux"]) ''
-    copyDTB bcm2708-rpi-0-w.dtb bcm2835-rpi-zero.dtb
-    copyDTB bcm2708-rpi-0-w.dtb bcm2835-rpi-zero-w.dtb
+    copyDTB bcm2708-rpi-zero-w.dtb bcm2835-rpi-zero.dtb
+    copyDTB bcm2708-rpi-zero-w.dtb bcm2835-rpi-zero-w.dtb
     copyDTB bcm2708-rpi-b.dtb bcm2835-rpi-a.dtb
     copyDTB bcm2708-rpi-b.dtb bcm2835-rpi-b.dtb
     copyDTB bcm2708-rpi-b.dtb bcm2835-rpi-b-rev2.dtb
-- 
GitLab


From 2026c28743ee3148ac6363216161892909452aa0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 15:39:30 -0700
Subject: [PATCH 1340/2254] osinfo-db: 20190805 -> 20190920

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/osinfo-db/versions
---
 pkgs/data/misc/osinfo-db/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix
index b41c4a4c5aa..8af161e8707 100644
--- a/pkgs/data/misc/osinfo-db/default.nix
+++ b/pkgs/data/misc/osinfo-db/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "osinfo-db";
-  version = "20190805";
+  version = "20190920";
 
   src = fetchurl {
     url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz";
-    sha256 = "1la80kmh58nrra8aa4grv31gc7xbqbybl8q1m4yv0byb11slg93x";
+    sha256 = "12kwlqljaai4fsa08m7l28v41q6244dbracvqzcbg1cs0y9jxqy8";
   };
 
   nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ];
-- 
GitLab


From afbb73ee7177a7a0833335e49bfa7e567eaf7534 Mon Sep 17 00:00:00 2001
From: marius851000 <mariusdavid@laposte.net>
Date: Tue, 17 Sep 2019 10:26:04 +0200
Subject: [PATCH 1341/2254] system-syzygy: init at 1.0.1

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

diff --git a/pkgs/games/system-syzygy/default.nix b/pkgs/games/system-syzygy/default.nix
new file mode 100644
index 00000000000..ee47bd54506
--- /dev/null
+++ b/pkgs/games/system-syzygy/default.nix
@@ -0,0 +1,43 @@
+{lib, rustPlatform, fetchFromGitHub, fetchurl, SDL2, makeWrapper, makeDesktopItem}:
+
+let
+  desktopFile = makeDesktopItem {
+    name = "system-syzygy";
+    exec = "%out%/bin/syzygy";
+    comment = "A puzzle game";
+    desktopName = "System Syzygy";
+    categories = "Game;";
+  };
+in
+rustPlatform.buildRustPackage rec {
+  pname = "system-syzygy";
+  version = "1.0.1";
+
+  src = fetchFromGitHub {
+    owner = "mdsteele";
+    repo = "syzygy";
+    rev = "5ba148fed7aae14bf35108d7303e4194e8ffe5e8";
+    sha256 = "07mzwx8ql33q865snnw4gm3dgf0mnm60lnq1f5fgas2yjy9g9vwa";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+  buildInputs = [ SDL2 ];
+
+  cargoSha256 = "03724z33dqxbbrzpvz172qh45qrgnyb801algjdcm32v8xsx81qg";
+
+  postInstall = ''
+    mkdir -p $out/share/syzygy/
+    cp -r ${src}/data/* $out/share/syzygy/
+    wrapProgram $out/bin/syzygy --set SYZYGY_DATA_DIR $out/share/syzygy
+    mkdir -p $out/share/applications
+    substituteAll ${desktopFile}/share/applications/system-syzygy.desktop $out/share/applications/system-syzygy.desktop
+  '';
+
+
+  meta = with lib; {
+    description = "A story and a puzzle game, where you solve a variety of puzzle";
+    homepage = "https://mdsteele.games/syzygy";
+    license = licenses.gpl3Plus;
+    maintainers = [ maintainers.marius851000 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 113b94915ff..0a27f73a16c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22494,6 +22494,8 @@ in
 
   synthv1 = callPackage ../applications/audio/synthv1 { };
 
+  system-syzygy = callPackage ../games/system-syzygy { };
+
   t4kcommon = callPackage ../games/t4kcommon { };
 
   tcl2048 = callPackage ../games/tcl2048 { };
-- 
GitLab


From f5428e10151417b78617f12f1b5a6ab0611c1ead Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 15:51:14 -0700
Subject: [PATCH 1342/2254] python37Packages.validators: 0.13.0 -> 0.14.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-validators/versions
---
 pkgs/development/python-modules/validators/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/validators/default.nix b/pkgs/development/python-modules/validators/default.nix
index bbcca388c93..241dffe7167 100644
--- a/pkgs/development/python-modules/validators/default.nix
+++ b/pkgs/development/python-modules/validators/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "validators";
-  version = "0.13.0";
+  version = "0.14.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ea9bf8bf22aa692c205e12830d90b3b93950e5122d22bed9eb2f2fece0bba298";
+    sha256 = "1bhla1l8gbks572zp4f254acz23822dz2mp122djxvp328i87b7h";
   };
 
   propagatedBuildInputs = [
-- 
GitLab


From e896c254c165efb78291840eae07caa60c9b3145 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 15:55:58 -0700
Subject: [PATCH 1343/2254] qpdf: 8.4.2 -> 9.0.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/qpdf/versions
---
 pkgs/development/libraries/qpdf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix
index 789a63bef74..81606a4e28e 100644
--- a/pkgs/development/libraries/qpdf/default.nix
+++ b/pkgs/development/libraries/qpdf/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, libjpeg, zlib, perl }:
 
-let version = "8.4.2";
+let version = "9.0.1";
 in
 stdenv.mkDerivation rec {
   pname = "qpdf";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://sourceforge/qpdf/qpdf/${version}/${pname}-${version}.tar.gz";
-    sha256 = "1hrys6zmia8fw6f6ih3ckgsc1jr12fizdwaiy7dyd64kxxjhm8v9";
+    sha256 = "0lhgb82s2402ad2yiswkj227vjlw9zypphdfdivfkbril7dg6495";
   };
 
   nativeBuildInputs = [ perl ];
-- 
GitLab


From 613fa47c464bf3782ef65212ee38499f84946e95 Mon Sep 17 00:00:00 2001
From: xrelkd <46590321+xrelkd@users.noreply.github.com>
Date: Sun, 29 Sep 2019 07:05:17 +0800
Subject: [PATCH 1344/2254] eksctl: 0.5.2 -> 0.6.0

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

diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix
index 25330658653..c2035aebb35 100644
--- a/pkgs/tools/admin/eksctl/default.nix
+++ b/pkgs/tools/admin/eksctl/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "eksctl";
-  version = "0.5.2";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "weaveworks";
     repo = pname;
     rev = version;
-    sha256 = "1aw69kcb2wx832hdfbx0944wwvdn5jbpr164pv6z0bxqzc0yi2kv";
+    sha256 = "0gh6p912y8i295p3vwhlrsxky761zlvrykcl6jm6j2qhwl5k4k29";
   };
 
   modSha256 = "0c8hbb73w1922qh895lsk0m9i7lk9kzrvxjc4crwsfpn9pv0qgd3";
-- 
GitLab


From f8022b6277a7d9414107bae3f8e4e9737cb1644f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 16:16:09 -0700
Subject: [PATCH 1345/2254] python37Packages.sepaxml: 2.1.0 -> 2.2.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-sepaxml/versions
---
 pkgs/development/python-modules/sepaxml/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sepaxml/default.nix b/pkgs/development/python-modules/sepaxml/default.nix
index 6e6809663a6..1790ae2e8f5 100644
--- a/pkgs/development/python-modules/sepaxml/default.nix
+++ b/pkgs/development/python-modules/sepaxml/default.nix
@@ -6,7 +6,7 @@
 }:
 
 buildPythonPackage rec {
-  version = "2.1.0";
+  version = "2.2.0";
   pname = "sepaxml";
   disabled = isPy27;
 
@@ -14,7 +14,7 @@ buildPythonPackage rec {
     owner = "raphaelm";
     repo = "python-sepaxml";
     rev = version;
-    sha256 = "0lkb0nnyxmwvm6gkwls8w2290b66lwz9bv8p39wwcn7flabviwhj";
+    sha256 = "1qmgdcz61hs65m2fddwn9jpyk2sxifdb0f3jz1n0lgy774z0pmas";
   };
 
   propagatedBuildInputs = [
-- 
GitLab


From fb05248dc9428e20d8ef86ea296517aace6ab4d4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 16:52:24 -0700
Subject: [PATCH 1346/2254] python37Packages.resampy: 0.2.1 -> 0.2.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-resampy/versions
---
 pkgs/development/python-modules/resampy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/resampy/default.nix b/pkgs/development/python-modules/resampy/default.nix
index e9e51756d9f..a83e196005d 100644
--- a/pkgs/development/python-modules/resampy/default.nix
+++ b/pkgs/development/python-modules/resampy/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "resampy";
-  version = "0.2.1";
+  version = "0.2.2";
 
   # No tests in PyPi Archive
   src = fetchFromGitHub {
     owner = "bmcfee";
     repo = pname;
     rev = version;
-    sha256 = "0a2bxj042y62dimm2i4vglbhpwbybam07mcl67cb6pmfsw9fbqhj";
+    sha256 = "0qmkxl5sbgh0j73n667vyi7ywzh09iaync91yp1j5rrcmwsn0qfs";
   };
 
   checkInputs = [ pytest pytestcov ];
-- 
GitLab


From 6b5e41a3c5701e58721bf5de6ef54fb21c635b28 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 17:10:51 -0700
Subject: [PATCH 1347/2254] python37Packages.stripe: 2.30.0 -> 2.35.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-stripe/versions
---
 pkgs/development/python-modules/stripe/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix
index 9c252aa9ce2..68ed8dcf99f 100644
--- a/pkgs/development/python-modules/stripe/default.nix
+++ b/pkgs/development/python-modules/stripe/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonPackage rec {
   pname = "stripe";
-  version = "2.30.0";
+  version = "2.35.1";
 
   # Tests require network connectivity and there's no easy way to disable
   # them. ~ C.
@@ -10,7 +10,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "de6be07c9e8a350d588278186316f66c72af7036aa5e917d1a924fb875249034";
+    sha256 = "0rmzba8yig426anf8fxiacyvwchlsws746757sgvw748n8lrarbw";
   };
 
   propagatedBuildInputs = [ requests ];
-- 
GitLab


From 956546e20b774fbdbebed84611afbc7768384933 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 28 Sep 2019 19:19:19 -0500
Subject: [PATCH 1348/2254] lsof: fix man page

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

diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix
index 1298346ef31..274577c4a4c 100644
--- a/pkgs/development/tools/misc/lsof/default.nix
+++ b/pkgs/development/tools/misc/lsof/default.nix
@@ -34,6 +34,10 @@ stdenv.mkDerivation rec {
   '';
 
   installPhase = ''
+    # Fix references from man page https://github.com/lsof-org/lsof/issues/66
+    substituteInPlace Lsof.8 \
+      --replace ".so ./00DIALECTS" "" \
+      --replace ".so ./version" ".ds VN ${version}"
     mkdir -p $out/bin $out/man/man8
     cp Lsof.8 $out/man/man8/lsof.8
     cp lsof $out/bin
-- 
GitLab


From dbaa4d098e21e9d161b2a2ca51267ec5f937b593 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 29 Sep 2019 02:30:49 +0200
Subject: [PATCH 1349/2254] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.15.0 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/04348dc32c9d89ce4eda31f13805def85a89857f.
---
 .../haskell-modules/hackage-packages.nix      | 315 ++++++++++++++++--
 1 file changed, 282 insertions(+), 33 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 336516b9c92..980401b9c59 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -9469,6 +9469,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "HaTeX_3_22_0_0" = callPackage
+    ({ mkDerivation, base, bibtex, bytestring, containers, hashable
+     , matrix, parsec, prettyprinter, QuickCheck, tasty
+     , tasty-quickcheck, text, transformers
+     }:
+     mkDerivation {
+       pname = "HaTeX";
+       version = "3.22.0.0";
+       sha256 = "06n5r66giqwg9235fdzlky181ll1n7qlqhc9nv8gsb8dv9a6a6yv";
+       libraryHaskellDepends = [
+         base bibtex bytestring containers hashable matrix parsec
+         prettyprinter QuickCheck text transformers
+       ];
+       testHaskellDepends = [
+         base parsec QuickCheck tasty tasty-quickcheck text
+       ];
+       description = "The Haskell LaTeX library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "HaTeX-meta" = callPackage
     ({ mkDerivation, base, Cabal, containers, directory, filepath, ghc
      , haddock, haskell-src-exts, mtl, parsec
@@ -20538,6 +20559,25 @@ self: {
          inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXinerama; 
          inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXrender;};
 
+  "X11_1_9_1" = callPackage
+    ({ mkDerivation, base, data-default, libX11, libXext, libXinerama
+     , libXrandr, libXrender, libXScrnSaver
+     }:
+     mkDerivation {
+       pname = "X11";
+       version = "1.9.1";
+       sha256 = "0gg6852mrlgl8zng1j84fismz7k81jr5fk92glgkscf8q6ryg0bm";
+       libraryHaskellDepends = [ base data-default ];
+       librarySystemDepends = [
+         libX11 libXext libXinerama libXrandr libXrender libXScrnSaver
+       ];
+       description = "A binding to the X11 graphics library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXScrnSaver; 
+         inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXinerama; 
+         inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXrender;};
+
   "X11-extras" = callPackage
     ({ mkDerivation, base, libX11, X11 }:
      mkDerivation {
@@ -31717,8 +31757,8 @@ self: {
     ({ mkDerivation, base, Cabal, directory, filepath }:
      mkDerivation {
        pname = "asset-bundle";
-       version = "0.1.0.1";
-       sha256 = "0wf0xnf4ljihzvbz8pkaiqwhvp00bwnyx0334s4757z6lsc2hsrw";
+       version = "0.1.0.2";
+       sha256 = "1c0678qjkr1q3pi20ch05k8ri4zxcc1drc4j44fvb1sz7b8y260c";
        libraryHaskellDepends = [ base Cabal directory filepath ];
        description = "A build-time Cabal library that bundles executables with assets";
        license = stdenv.lib.licenses.bsd3;
@@ -35839,6 +35879,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "basen" = callPackage
+    ({ mkDerivation, base, bytestring, quickcheck-instances, tasty
+     , tasty-discover, tasty-hspec, tasty-quickcheck, text
+     }:
+     mkDerivation {
+       pname = "basen";
+       version = "0.1.0.0";
+       sha256 = "0v7dksk1zq17kpa5nknn5am1ywy58d0f6jr2vnb9jzy4v70m6ngx";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base bytestring text ];
+       executableHaskellDepends = [ base bytestring text ];
+       testHaskellDepends = [
+         base bytestring quickcheck-instances tasty tasty-discover
+         tasty-hspec tasty-quickcheck text
+       ];
+       testToolDepends = [ tasty-discover ];
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "basen-bytestring" = callPackage
     ({ mkDerivation, base, bytestring, QuickCheck }:
      mkDerivation {
@@ -66747,6 +66808,8 @@ self: {
        pname = "dependent-map";
        version = "0.2.4.0";
        sha256 = "0il2naf6gdkvkhscvqd8kg9v911vdhqp9h10z5546mninnyrdcsx";
+       revision = "1";
+       editedCabalFile = "0a5f35d1sgfq1cl1r5bgb5pwfjniiycxiif4ycxglaizp8g5rlr1";
        libraryHaskellDepends = [ base containers dependent-sum ];
        description = "Dependent finite maps (partial dependent products)";
        license = "unknown";
@@ -67807,6 +67870,8 @@ self: {
        pname = "dhall-json";
        version = "1.4.1";
        sha256 = "1widvpgrswj6bz9330i2xyxv1h6asw0pm5rrwdhyf926qgag83pp";
+       revision = "1";
+       editedCabalFile = "0vwr27ikw0y39za9jc91g3xbd7vb745zkkni0x3k73944w0w47n3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -102436,8 +102501,8 @@ self: {
      }:
      mkDerivation {
        pname = "gtk2hs-buildtools";
-       version = "0.13.5.0";
-       sha256 = "01a3q7ciinrwa6xjk0qwpyjabdjzfsy8qqfkp0iir2h8i8prnpz4";
+       version = "0.13.5.1";
+       sha256 = "0b941qm4rj9xd5g04hzagdhn5i30n542izr15x89giardr8f95iz";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -137661,6 +137726,8 @@ self: {
        pname = "iterm-show";
        version = "0.1.0.1";
        sha256 = "1wlrn6q3v5a4pqmk3a3syir7szq97g658s1bzrq5p65frs7i7daw";
+       revision = "1";
+       editedCabalFile = "1xyb5dj53vl4nf2a68zda95lz0fr987rghvh3610bmrgr8hg3y02";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base base64-bytestring bytestring ];
@@ -140662,8 +140729,8 @@ self: {
      }:
      mkDerivation {
        pname = "jvm-binary";
-       version = "0.7.0";
-       sha256 = "1ism2fq66qdh72nm9cq4km9yn7v79j2qq6glpyf9yk10549kv7dv";
+       version = "0.8.0";
+       sha256 = "0mzzfdsxh6r8blx447c25bdzv3y8gqb984p48y5cfpvrn2dwhs41";
        libraryHaskellDepends = [
          attoparsec base binary bytestring containers data-binary-ieee754
          deepseq deriving-compat mtl template-haskell text vector
@@ -147019,8 +147086,25 @@ self: {
        pname = "lens-process";
        version = "0.3.0.0";
        sha256 = "1bp2mw38qvlq98596pn1illb6c1l8prd6qrzrg0g6xin98sqigb0";
-       revision = "1";
-       editedCabalFile = "1wwj258gq4qg97dx7pn2sxj8znrlb5sm2xcidwkhyrs45r75500b";
+       revision = "2";
+       editedCabalFile = "1smhrlj7i2nsvf5x50svafydfmmy706n69xffzp6ij75s13fa37c";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [ base filepath lens process ];
+       testHaskellDepends = [
+         base doctest filepath lens process tasty tasty-hunit
+       ];
+       description = "Optics for system processes";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "lens-process_0_3_0_1" = callPackage
+    ({ mkDerivation, base, Cabal, cabal-doctest, doctest, filepath
+     , lens, process, tasty, tasty-hunit
+     }:
+     mkDerivation {
+       pname = "lens-process";
+       version = "0.3.0.1";
+       sha256 = "05vznfn28a35k3qyjx28jva9d5acgzcdzn8s24mkb8mz1l8722d6";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [ base filepath lens process ];
        testHaskellDepends = [
@@ -147028,6 +147112,7 @@ self: {
        ];
        description = "Optics for system processes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lens-properties" = callPackage
@@ -150866,7 +150951,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {llvm-config = null;};
 
-  "llvm-hs_9_0_0" = callPackage
+  "llvm-hs_9_0_1" = callPackage
     ({ mkDerivation, array, attoparsec, base, bytestring, Cabal
      , containers, exceptions, llvm-config, llvm-hs-pure, mtl
      , pretty-show, process, QuickCheck, tasty, tasty-hunit
@@ -150875,8 +150960,8 @@ self: {
      }:
      mkDerivation {
        pname = "llvm-hs";
-       version = "9.0.0";
-       sha256 = "0sz1rhdf73v43jz8x7f5f7bjwrkvyyvf950gw9063aapbsdzm76h";
+       version = "9.0.1";
+       sha256 = "0723xgh45h9cyxmmjsvxnsp8bpn1ljy4qgh7a7vqq3sj9d6wzq00";
        setupHaskellDepends = [ base Cabal containers ];
        libraryHaskellDepends = [
          array attoparsec base bytestring containers exceptions llvm-hs-pure
@@ -158493,6 +158578,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "microlens-process_0_2_0_1" = callPackage
+    ({ mkDerivation, base, Cabal, cabal-doctest, doctest, filepath
+     , microlens, process
+     }:
+     mkDerivation {
+       pname = "microlens-process";
+       version = "0.2.0.1";
+       sha256 = "0grnqs0b76la48ql6amrjnqfkgcb0rcq3s2xqs2czjg2jgp3zw5r";
+       revision = "2";
+       editedCabalFile = "0jy50p09axr5gwkhc2qnlragpzvy3s6b947s7r3354ya2byli4dz";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [ base filepath microlens process ];
+       testHaskellDepends = [ base doctest microlens process ];
+       description = "Micro-optics for the process library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "microlens-th" = callPackage
     ({ mkDerivation, base, containers, microlens, template-haskell
      , th-abstraction, transformers
@@ -160106,8 +160209,8 @@ self: {
     ({ mkDerivation, base, vector }:
      mkDerivation {
        pname = "mmsyn2";
-       version = "0.1.4.0";
-       sha256 = "0v33fby4bynnij875sq09qv71w74lp18ga6wpaki5xw76ak9qvxm";
+       version = "0.1.5.0";
+       sha256 = "0nad75cbpdknrwg9yb0av39x07x4qgawp1ymhrwghp0fm2n7gmda";
        libraryHaskellDepends = [ base vector ];
        description = "The library that can be used for multiple (Ord a) => a -> b transformations";
        license = stdenv.lib.licenses.mit;
@@ -169661,8 +169764,6 @@ self: {
        ];
        description = "Easy dependency management for Nix projects";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nix-delegate" = callPackage
@@ -179460,8 +179561,8 @@ self: {
      }:
      mkDerivation {
        pname = "perceptual-hash";
-       version = "0.1.3.0";
-       sha256 = "1g7hp5ijfqc2b3jacgabhq1mza9lqlxid309cvcm0jgppm4lvdpp";
+       version = "0.1.3.2";
+       sha256 = "0nmky6x40wcc9b3n9ijjw8ynbwmpqa4gb26mqzi6dxn298bgm12g";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -185411,6 +185512,48 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "poseidon" = callPackage
+    ({ mkDerivation, aeson, async, base, binary, binary-bits
+     , bytestring, generics-eot, hspec, postgresql-libpq, QuickCheck
+     , random, scientific, text, time, unordered-containers, uuid
+     }:
+     mkDerivation {
+       pname = "poseidon";
+       version = "0.1.1.0";
+       sha256 = "1y33xrbqlhavk8z9lnpy9wx0hiys1bqp8dnqdibrmfs3s5zq2w92";
+       libraryHaskellDepends = [
+         aeson async base binary binary-bits bytestring generics-eot
+         postgresql-libpq random scientific text time unordered-containers
+         uuid
+       ];
+       testHaskellDepends = [
+         aeson base bytestring hspec postgresql-libpq QuickCheck scientific
+         text time unordered-containers uuid
+       ];
+       description = "Simple extensible library to run SQL file against PostgreSQL database";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "poseidon-postgis" = callPackage
+    ({ mkDerivation, aeson, base, binary, bytestring, geojson, hspec
+     , poseidon, postgresql-libpq, QuickCheck, scientific, text, time
+     , unordered-containers, uuid, wkt-geom
+     }:
+     mkDerivation {
+       pname = "poseidon-postgis";
+       version = "0.1.1.0";
+       sha256 = "04j0pwrbmfa746la7ss5acns1miidyng48scska0qsf3xsxfqash";
+       libraryHaskellDepends = [
+         base binary bytestring geojson poseidon wkt-geom
+       ];
+       testHaskellDepends = [
+         aeson base binary bytestring hspec poseidon postgresql-libpq
+         QuickCheck scientific text time unordered-containers uuid
+       ];
+       description = "Extension of Poseidon library for Postgis (Spatial and Geographic objects for PostgreSQL)";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "positive" = callPackage
     ({ mkDerivation, base, nats, semigroups }:
      mkDerivation {
@@ -195931,28 +196074,29 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
-  "reanimate_0_1_6_0" = callPackage
+  "reanimate_0_1_7_0" = callPackage
     ({ mkDerivation, ansi-wl-pprint, attoparsec, base
-     , base64-bytestring, bytestring, cassava, colour, containers
-     , cubicbezier, diagrams, diagrams-contrib, diagrams-core
-     , diagrams-lib, diagrams-svg, directory, filepath, fsnotify
-     , hashable, here, JuicyPixels, lens, linear, matrices, matrix, mtl
-     , open-browser, palette, parallel, process, QuickCheck
-     , random-shuffle, reanimate-svg, svg-builder, tasty, tasty-golden
-     , tasty-hunit, temporary, text, time, vector, websockets, xml
+     , base64-bytestring, bytestring, cassava, chiphunk, colour
+     , containers, cubicbezier, diagrams, diagrams-contrib
+     , diagrams-core, diagrams-lib, diagrams-svg, directory, filepath
+     , fsnotify, hashable, here, JuicyPixels, lens, linear, matrix, mtl
+     , open-browser, optparse-applicative, palette, parallel, process
+     , QuickCheck, random-shuffle, reanimate-svg, svg-builder, tasty
+     , tasty-golden, tasty-hunit, temporary, text, time, vector
+     , websockets, xml
      }:
      mkDerivation {
        pname = "reanimate";
-       version = "0.1.6.0";
-       sha256 = "10nivxmj8lkvr7g8fjnq7m7kxy3jmy9vka0lva6ahr91c9qk1fcz";
+       version = "0.1.7.0";
+       sha256 = "1yms6pckffrci9mpnvqmsb13pr3kfa8bw2wv34aws44lszxyii9j";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          ansi-wl-pprint attoparsec base base64-bytestring bytestring cassava
-         colour containers cubicbezier diagrams diagrams-contrib
+         chiphunk colour containers cubicbezier diagrams diagrams-contrib
          diagrams-core diagrams-lib diagrams-svg directory filepath fsnotify
-         hashable here JuicyPixels lens linear matrices matrix mtl
-         open-browser palette parallel process random-shuffle reanimate-svg
-         svg-builder temporary text time vector websockets xml
+         hashable here JuicyPixels lens linear matrix mtl open-browser
+         optparse-applicative palette parallel process random-shuffle
+         reanimate-svg svg-builder temporary text time vector websockets xml
        ];
        testHaskellDepends = [
          ansi-wl-pprint base bytestring directory filepath process
@@ -197802,6 +197946,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "regex-tdfa_1_2_3_3" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, file-embed
+     , filepath, ghc-prim, mtl, parsec, regex-base, utf8-string
+     }:
+     mkDerivation {
+       pname = "regex-tdfa";
+       version = "1.2.3.3";
+       sha256 = "1jw80pvdvrd9lwgwqx4irmx774rd8l2ccxl45r4y3ahjvhbl2yn2";
+       libraryHaskellDepends = [
+         array base bytestring containers ghc-prim mtl parsec regex-base
+       ];
+       testHaskellDepends = [
+         array base bytestring containers file-embed filepath mtl regex-base
+         utf8-string
+       ];
+       description = "Replaces/Enhances Text.Regex";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "regex-tdfa-pipes" = callPackage
     ({ mkDerivation, array, base, lens, monads-tf, pipes, regex-base
      , regex-tdfa
@@ -205372,8 +205536,8 @@ self: {
      }:
      mkDerivation {
        pname = "schemas";
-       version = "0.1.0.0";
-       sha256 = "0kcvkwj7h8rra4rhc9cz1gkr2zss6ihm0vwdahxnl7pdyihi09ms";
+       version = "0.1.1.0";
+       sha256 = "0afk5bjmiqzw526p6s8wd7xpd0rj4figvfvs51fl34jvyc6wc0ic";
        libraryHaskellDepends = [
          aeson aeson-pretty base bifunctors bytestring free generic-lens
          generics-sop hashable lens lens-aeson pretty-simple profunctors
@@ -212598,6 +212762,24 @@ self: {
        license = stdenv.lib.licenses.mpl20;
      }) {};
 
+  "shellmet_0_0_3_0" = callPackage
+    ({ mkDerivation, base, doctest, Glob, markdown-unlit, process, text
+     }:
+     mkDerivation {
+       pname = "shellmet";
+       version = "0.0.3.0";
+       sha256 = "1i39zl8khsriadi7k28rn0w2y8wf6jmnz5x3nlkdd9spkdy1qz49";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base process text ];
+       executableHaskellDepends = [ base text ];
+       executableToolDepends = [ markdown-unlit ];
+       testHaskellDepends = [ base doctest Glob ];
+       description = "Out of the shell solution for scripting in Haskell";
+       license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "shellout" = callPackage
     ({ mkDerivation, async, base, stm, text, typed-process }:
      mkDerivation {
@@ -226889,6 +227071,32 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {};
 
+  "swish_0_10_0_2" = callPackage
+    ({ mkDerivation, base, containers, directory, filepath, hashable
+     , HUnit, intern, mtl, network-uri, old-locale, polyparse
+     , semigroups, test-framework, test-framework-hunit, text, time
+     }:
+     mkDerivation {
+       pname = "swish";
+       version = "0.10.0.2";
+       sha256 = "1r6wfj8x5r3w2gvnhvdkjgn3rq4a4smna81gsxah2ibpwhinjjf1";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base containers directory filepath hashable intern mtl network-uri
+         old-locale polyparse text time
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base containers hashable HUnit network-uri old-locale semigroups
+         test-framework test-framework-hunit text time
+       ];
+       description = "A semantic web toolkit";
+       license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "sws" = callPackage
     ({ mkDerivation, base, bytestring, cryptonite, directory, filepath
      , hourglass, http-types, network, resourcet, transformers, wai
@@ -233923,6 +234131,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "th-orphans_0_13_9" = callPackage
+    ({ mkDerivation, base, bytestring, ghc-prim, hspec, hspec-discover
+     , mtl, template-haskell, th-lift, th-lift-instances, th-reify-many
+     }:
+     mkDerivation {
+       pname = "th-orphans";
+       version = "0.13.9";
+       sha256 = "1xj1gssv77hdx1r3ndg8k49v3ipj3a6r7crkyvx13jrps3m6ng1z";
+       libraryHaskellDepends = [
+         base mtl template-haskell th-lift th-lift-instances th-reify-many
+       ];
+       testHaskellDepends = [
+         base bytestring ghc-prim hspec template-haskell th-lift
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Orphan instances for TH datatypes";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "th-pprint" = callPackage
     ({ mkDerivation, base, lens, pretty, template-haskell }:
      mkDerivation {
@@ -240104,6 +240332,8 @@ self: {
        pname = "turtle";
        version = "1.5.15";
        sha256 = "0yckgsc2a4g5x867gni80ldp226bsnhncfbil4ql6v2zwm4r8p7f";
+       revision = "1";
+       editedCabalFile = "02q1rv7zx31xz9wnmcqwd4w3iw7623p07iyi21zr0cqlignic5pg";
        libraryHaskellDepends = [
          ansi-wl-pprint async base bytestring clock containers directory
          exceptions foldl hostname managed optional-args
@@ -247023,6 +247253,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "vector-builder_0_3_8" = callPackage
+    ({ mkDerivation, attoparsec, base, base-prelude, QuickCheck
+     , quickcheck-instances, rerebase, semigroups, tasty, tasty-hunit
+     , tasty-quickcheck, vector
+     }:
+     mkDerivation {
+       pname = "vector-builder";
+       version = "0.3.8";
+       sha256 = "0ww0l52p8s6gmh985adnjbvm1vrqpqbm08qdcrvxwhhcqmxgv6m3";
+       libraryHaskellDepends = [ base base-prelude semigroups vector ];
+       testHaskellDepends = [
+         attoparsec QuickCheck quickcheck-instances rerebase tasty
+         tasty-hunit tasty-quickcheck
+       ];
+       description = "Vector builder";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "vector-bytes-instances" = callPackage
     ({ mkDerivation, base, bytes, tasty, tasty-quickcheck, vector }:
      mkDerivation {
-- 
GitLab


From a0b667e7d930206aac2a9dd9594ad628c96424af Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 17:58:57 -0700
Subject: [PATCH 1350/2254] qlcplus: 4.12.1 -> 4.12.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/qlcplus/versions
---
 pkgs/applications/misc/qlcplus/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/qlcplus/default.nix b/pkgs/applications/misc/qlcplus/default.nix
index 8fc890f4243..e928b0d597e 100644
--- a/pkgs/applications/misc/qlcplus/default.nix
+++ b/pkgs/applications/misc/qlcplus/default.nix
@@ -5,13 +5,13 @@
 
 mkDerivation rec {
   pname = "qlcplus";
-  version = "4.12.1";
+  version = "4.12.2";
 
   src = fetchFromGitHub {
     owner = "mcallegari";
     repo = "qlcplus";
     rev = "QLC+_${version}";
-    sha256 = "1kz2zbz7blnm91dysn949bjsy4xqxg658k47p3gbl0pjl58c44hp";
+    sha256 = "1j0jhgql78p5ghcaz36l1k55447s5qiv396a448qic7xqpym2vl3";
   };
 
   nativeBuildInputs = [ qmake pkgconfig ];
-- 
GitLab


From f70e674800d1dbf929333dde3eaa36ae45e4849b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 18:08:25 -0700
Subject: [PATCH 1351/2254] quilter: 1.9.5 -> 2.0.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/quilter/versions
---
 pkgs/applications/editors/quilter/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/quilter/default.nix b/pkgs/applications/editors/quilter/default.nix
index 49ebe579ed4..49f41d5205b 100644
--- a/pkgs/applications/editors/quilter/default.nix
+++ b/pkgs/applications/editors/quilter/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "quilter";
-  version = "1.9.5";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "lainsce";
     repo = pname;
     rev = version;
-    sha256 = "119ri6lkzqapi5k0v818qkhg1916jj9s6bh72yqvc2wmyjnn2dbw";
+    sha256 = "1jmgnmpalnl3261wifk0mqa9viag6yvlrycgzqalmnrm1b20pyg4";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From 5e4de799bd84495ebd6e4c23866a72e0ef77aa7a Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 29 Sep 2019 03:27:09 +0200
Subject: [PATCH 1352/2254] phpPackages.phpcs: 3.4.2 -> 3.5.0

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

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index fc6d7674338..ff5be8399b2 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -365,12 +365,12 @@ let
   };
 
   phpcs = mkDerivation rec {
-    version = "3.4.2";
+    version = "3.5.0";
     pname = "phpcs";
 
     src = pkgs.fetchurl {
       url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcs.phar";
-      sha256 = "0hk9w5kn72z9xhswfmxilb2wk96vy07z4a1pwrpspjlr23aajrk9";
+      sha256 = "078anf2r6a3p8v575m65vryazipgfchs07yb92m9xh41lk5wlndf";
     };
 
     phases = [ "installPhase" ];
-- 
GitLab


From ad166725f1301dd7552a189269255e67541071a2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 18:34:09 -0700
Subject: [PATCH 1353/2254] roundcube: 1.3.9 -> 1.3.10

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/roundcube/versions
---
 pkgs/servers/roundcube/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/roundcube/default.nix b/pkgs/servers/roundcube/default.nix
index 0b774a4b5ad..93499d87e0b 100644
--- a/pkgs/servers/roundcube/default.nix
+++ b/pkgs/servers/roundcube/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "roundcube";
-  version = "1.3.9";
+  version = "1.3.10";
 
   src = fetchurl {
     url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz";
-    sha256 = "1b91amcpzb7935hpm67iqw92bl5r1a0rkfrc8gfm8w9sngzv8vbj";
+    sha256 = "1gx8dgrr3p6fksv3pm381a080i9r6snwcmfd1q112mqg19ai3zk9";
   };
 
   patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ];
-- 
GitLab


From 6c074851e65d4c3fa99c9a6b5b9c3508be2d944d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 18:37:30 -0700
Subject: [PATCH 1354/2254] rtl_433: 18.12 -> 19.08

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/rtl_433/versions
---
 pkgs/applications/radio/rtl_433/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/radio/rtl_433/default.nix b/pkgs/applications/radio/rtl_433/default.nix
index 3d519255ab4..148ad35a1f0 100644
--- a/pkgs/applications/radio/rtl_433/default.nix
+++ b/pkgs/applications/radio/rtl_433/default.nix
@@ -4,14 +4,14 @@
 
 stdenv.mkDerivation {
 
-  version = "18.12";
+  version = "19.08";
   pname = "rtl_433";
 
   src = fetchFromGitHub {
     owner = "merbanan";
     repo = "rtl_433";
-    rev = "18.12";
-    sha256 = "0y73g9ffpsgnmfk8lbihyl9d1fd9v91wsn8k8xhsdmgmn4ra1jk5";
+    rev = "19.08";
+    sha256 = "0cm82gm5c86qfl4dw37h8wyk77947k6fv2n1pn3xvk3wz2ygsdi6";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
-- 
GitLab


From f7391051b2d0d77e4ec7badbf6dcccf0f01ae463 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 18:41:19 -0700
Subject: [PATCH 1355/2254] rambox-pro: 1.1.6 -> 1.1.7

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/rambox-pro/versions
---
 .../applications/networking/instant-messengers/rambox/pro.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/rambox/pro.nix b/pkgs/applications/networking/instant-messengers/rambox/pro.nix
index 9a0aab6f8ce..eee5fd82bba 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/pro.nix
+++ b/pkgs/applications/networking/instant-messengers/rambox/pro.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   pname = "rambox-pro";
-  version = "1.1.6";
+  version = "1.1.7";
 
   dontBuild = true;
   dontStrip = true;
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/ramboxapp/download/releases/download/v${version}/RamboxPro-${version}-linux-x64.tar.gz";
-    sha256 = "1jdamjdl649315ms5g1c7m7gpy04rv7xpy6bsvink242adaq2pjz";
+    sha256 = "1d84hlac3qwrbi8khp6r3bm5y25zcz52l6z54k7jmyplay46r5as";
   };
 
   installPhase = ''
-- 
GitLab


From 8fe18e4b3e7b0baa6366b6846c391b1261a5d734 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 19:10:44 -0700
Subject: [PATCH 1356/2254] radare2-cutter: 1.8.3 -> 1.9.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/radare2-cutter/versions
---
 pkgs/development/tools/analysis/radare2/cutter.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/analysis/radare2/cutter.nix b/pkgs/development/tools/analysis/radare2/cutter.nix
index 84c56a9b569..252e95e5793 100644
--- a/pkgs/development/tools/analysis/radare2/cutter.nix
+++ b/pkgs/development/tools/analysis/radare2/cutter.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "radare2-cutter";
-  version = "1.8.3";
+  version = "1.9.0";
 
   src = fetchFromGitHub {
     owner = "radareorg";
     repo = "cutter";
     rev = "v${version}";
-    sha256 = "03f3cdckh51anx9gd1b0ndb2fg7061hqngvygf32ky29mm2m2lyv";
+    sha256 = "1ln55ssrasbaam267lwc2vxnm8j0c2x35qsda44xi2p8hqxslf8k";
   };
 
   postUnpack = "export sourceRoot=$sourceRoot/src";
-- 
GitLab


From 5abb31557dfb0346c124ea5d9d6fe64a04e72679 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 19:33:01 -0700
Subject: [PATCH 1357/2254] rmlint: 2.8.0 -> 2.9.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/rmlint/versions
---
 pkgs/tools/misc/rmlint/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix
index 7b7fa9ce705..408660bf3d9 100644
--- a/pkgs/tools/misc/rmlint/default.nix
+++ b/pkgs/tools/misc/rmlint/default.nix
@@ -5,13 +5,13 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   pname = "rmlint";
-  version = "2.8.0";
+  version = "2.9.0";
 
   src = fetchFromGitHub {
     owner = "sahib";
     repo = "rmlint";
     rev = "v${version}";
-    sha256 = "1gc7gbnh0qg1kl151cv1ld87vhpm1v3pnkn7prhscdcc21jrg8nz";
+    sha256 = "1b5cziam14h80xrfb285fmfrzz2rligxcpsq1xsig14xf4l2875i";
   };
 
   CFLAGS="-I${stdenv.lib.getDev utillinux}/include";
-- 
GitLab


From a5cf83c78acb1a626113a38235a4b6cd46c43d7b Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sun, 29 Sep 2019 02:56:22 +0000
Subject: [PATCH 1358/2254] rdkafka: 1.0.1 -> 1.2.0

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

diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix
index 165e9716a97..670d2a832ee 100644
--- a/pkgs/development/libraries/rdkafka/default.nix
+++ b/pkgs/development/libraries/rdkafka/default.nix
@@ -2,16 +2,17 @@
 
 stdenv.mkDerivation rec {
   pname = "rdkafka";
-  version = "1.0.1";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "edenhill";
     repo = "librdkafka";
     rev = "v${version}";
-    sha256 = "1jxwsizqwckjzirh9gsvlca46z4y3i47vcifs1fh8gxb2lvdfgwb";
+    sha256 = "03h4yxnbnig17zapnnyvvnh1bsp0qalvlpb4fc3bpvs7yj4d8v25";
   };
 
   nativeBuildInputs = [ pkgconfig ];
+
   buildInputs = [ zlib perl python openssl ];
 
   NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow";
@@ -20,6 +21,8 @@ stdenv.mkDerivation rec {
     patchShebangs .
   '';
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "librdkafka - Apache Kafka C/C++ client library";
     homepage = https://github.com/edenhill/librdkafka;
-- 
GitLab


From 67024620aaac51eeb827bdc35d7b80cfadb0e004 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sun, 29 Sep 2019 02:51:52 +0000
Subject: [PATCH 1359/2254] clickhouse: 19.13.1.11 -> 19.13.5.44

Closes #66797
---
 pkgs/servers/clickhouse/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix
index ab2d44577c0..6418bd917f1 100644
--- a/pkgs/servers/clickhouse/default.nix
+++ b/pkgs/servers/clickhouse/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "clickhouse";
-  version = "19.13.1.11";
+  version = "19.13.5.44";
 
   src = fetchFromGitHub {
     owner  = "yandex";
     repo   = "ClickHouse";
     rev    = "v${version}-stable";
-    sha256 = "1j9jhgl2z84id5z6rbvyal7aha5v3m8pd393cmcsf1bf0fiz8qmc";
+    sha256 = "1h0jjpa1wrms5vcgx1vf8fmkc7jjrql1r70dvwr0nw8f7rfyi1l6";
   };
 
   nativeBuildInputs = [ cmake libtool ninja ];
-- 
GitLab


From 2b4a33c002b4a6a3b0f62c858ddee5bd5a76aa1e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 20:06:44 -0700
Subject: [PATCH 1360/2254] snd: 19.6 -> 19.7

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/snd/versions
---
 pkgs/applications/audio/snd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix
index 32e241cf557..43637ef5dc4 100644
--- a/pkgs/applications/audio/snd/default.nix
+++ b/pkgs/applications/audio/snd/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "snd-19.6";
+  name = "snd-19.7";
 
   src = fetchurl {
     url = "mirror://sourceforge/snd/${name}.tar.gz";
-    sha256 = "0s2qv8sznvw6559bi39qj9p072azh9qcb2b86w6w8clz2azjaa76";
+    sha256 = "1pr3l9iadvwinmxfl9a2lsm67yi7w3rhxglidpd41m2ni8jf2rlm";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From b31e2832b594ed281ca0ac99a5d91bb99cc8b8df Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 20:32:52 -0700
Subject: [PATCH 1361/2254] signal-cli: 0.6.2 -> 0.6.3

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/signal-cli/versions
---
 .../networking/instant-messengers/signal-cli/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix
index 010ea1bff7c..7c474d26c88 100644
--- a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "signal-cli";
-  version = "0.6.2";
+  version = "0.6.3";
 
   # Building from source would be preferred, but is much more involved.
   src = fetchurl {
     url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}.tar.gz";
-    sha256 = "050nizf7v10jlrwr8f4awzi2368qr01pzpvl2qkrwhdk25r505yr";
+    sha256 = "1gvdifscyxmxn2dwlkqi684ahy5kbcj84mqda0m8l4aa8iaq1d59";
   };
 
   buildInputs = [ makeWrapper ];
-- 
GitLab


From 8335ffe59b4af6571350d15a55d7d160d4cc1e88 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 20:41:10 -0700
Subject: [PATCH 1362/2254] serialdv: 1.1.1 -> 1.1.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/serialdv/versions
---
 pkgs/development/libraries/serialdv/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/serialdv/default.nix b/pkgs/development/libraries/serialdv/default.nix
index 11f9d301347..b57d90eb21c 100644
--- a/pkgs/development/libraries/serialdv/default.nix
+++ b/pkgs/development/libraries/serialdv/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "serialdv";
-  version ="1.1.1";
+  version ="1.1.2";
 
   src = fetchFromGitHub {
     owner = "f4exb";
     repo = "serialdv";
     rev = "v${version}";
-    sha256 = "0swalyp8cbs7if6gxbcl7wf83ml8ch3k7ww4hws89rzpjvf070fr";
+    sha256 = "0d2lnvfzf31i3f2klm46s87gby3yz3hc46cap0yqifzml0ff1qbm";
   };
 
   nativeBuildInputs = [ cmake ];
-- 
GitLab


From 7f33507e85742dbd00833be014c7346bc7f5492b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 20:46:00 -0700
Subject: [PATCH 1363/2254] src: 1.26 -> 1.27

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/src/versions
---
 pkgs/applications/version-management/src/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/src/default.nix b/pkgs/applications/version-management/src/default.nix
index a3fcd209efc..8ff384d84b7 100644
--- a/pkgs/applications/version-management/src/default.nix
+++ b/pkgs/applications/version-management/src/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "src";
-  version = "1.26";
+  version = "1.27";
 
   src = fetchurl {
     url = "http://www.catb.org/~esr/src/${pname}-${version}.tar.gz";
-    sha256 = "06npsnf2bfjgcs7wilhcqn24zn286nyy4qyp3yp88zapkxzlap23";
+    sha256 = "0764kcyh54plzmvfyhh086wpszh67nv1nsxgk95n9bxxinr7sn3x";
   };
 
   nativeBuildInputs = [ makeWrapper ];
-- 
GitLab


From dc59594878971ea92241e4676896a5fcdd8db01c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 22:19:37 -0700
Subject: [PATCH 1364/2254] sourcetrail: 2019.2.39 -> 2019.3.46

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/sourcetrail/versions
---
 pkgs/development/tools/sourcetrail/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/sourcetrail/default.nix b/pkgs/development/tools/sourcetrail/default.nix
index d84322bb547..3d068b06f40 100644
--- a/pkgs/development/tools/sourcetrail/default.nix
+++ b/pkgs/development/tools/sourcetrail/default.nix
@@ -3,12 +3,12 @@
 
 stdenv.mkDerivation rec {
   pname = "sourcetrail";
-  version = "2019.2.39";
+  version = "2019.3.46";
 
   src = fetchurl {
     name = "sourtrail.tar.gz";
     url = "https://www.sourcetrail.com/downloads/${version}/linux/64bit";
-    sha256 = "13kzfnsb5lf9v6bqw41qljp5bgz2rd3w163r6xg59hzd3dv8f90q";
+    sha256 = "0dnkxr3fijcsbn6pd20lyxhr9ns6ji1c4dffly9s16yq4x9ad5r4";
   };
 
   nativeBuildInputs = [ autoPatchelfHook ];
-- 
GitLab


From 2bfb2f3c28f26eeb7a3d62cc0ded2353744a3ca3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 22:22:46 -0700
Subject: [PATCH 1365/2254] sequeler: 0.7.2 -> 0.7.3

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/sequeler/versions
---
 pkgs/applications/misc/sequeler/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/sequeler/default.nix b/pkgs/applications/misc/sequeler/default.nix
index e3edb539928..78c9fed17fe 100644
--- a/pkgs/applications/misc/sequeler/default.nix
+++ b/pkgs/applications/misc/sequeler/default.nix
@@ -11,13 +11,13 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "sequeler";
-  version = "0.7.2";
+  version = "0.7.3";
 
   src = fetchFromGitHub {
     owner = "Alecaddd";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0mxlhyfqmd4zg0psdmr62rhmvssw8jslm7a1nvh93675ns3vfrs5";
+    sha256 = "16vc3v9qls9fxg9h8fsi67z68s4acl5hj14gbcrnqm7mf3kmk3aw";
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig pantheon.vala gettext wrapGAppsHook python3 desktop-file-utils ];
-- 
GitLab


From 7c751ccba1ce5181ed4dc0f44916d62bef7ec9e6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 22:28:49 -0700
Subject: [PATCH 1366/2254] streamlink: 1.1.1 -> 1.2.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/streamlink/versions
---
 pkgs/applications/video/streamlink/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix
index e33610ac416..b5ffdb018ff 100644
--- a/pkgs/applications/video/streamlink/default.nix
+++ b/pkgs/applications/video/streamlink/default.nix
@@ -1,14 +1,14 @@
 { stdenv, pythonPackages, fetchFromGitHub, rtmpdump, ffmpeg }:
 
 pythonPackages.buildPythonApplication rec {
-  version = "1.1.1";
+  version = "1.2.0";
   pname = "streamlink";
 
   src = fetchFromGitHub {
     owner = "streamlink";
     repo = "streamlink";
     rev = version;
-    sha256 = "1vyf0pifdqygg98azdkfhy5fdckb0w2ca7c46mkrj452gkvmcq33";
+    sha256 = "0l8b9ipfmd6dic07ajqqml26jdydz0k046hvx32mqp64jl5jpznh";
   };
 
   checkInputs = with pythonPackages; [ pytest mock requests-mock freezegun ];
-- 
GitLab


From c0dc5d365455974df422d4dbfee55814a746e616 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 22:37:54 -0700
Subject: [PATCH 1367/2254] squirrel-sql: 3.9.1 -> 4.0.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/squirrel-sql/versions
---
 pkgs/development/tools/database/squirrel-sql/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/database/squirrel-sql/default.nix b/pkgs/development/tools/database/squirrel-sql/default.nix
index ca04d209fab..717dc2d7951 100644
--- a/pkgs/development/tools/database/squirrel-sql/default.nix
+++ b/pkgs/development/tools/database/squirrel-sql/default.nix
@@ -5,14 +5,14 @@
 , drivers ? []
 }:
 let
-  version = "3.9.1";
+  version = "4.0.0";
 in stdenv.mkDerivation rec {
   pname = "squirrel-sql";
   inherit version;
 
   src = fetchurl {
     url = "mirror://sourceforge/project/squirrel-sql/1-stable/${version}-plainzip/squirrelsql-${version}-standard.zip";
-    sha256 = "1xpkh9kwdjzd0zks8c4mq3add9ivc24hb0hflp11dl32dsdmzrai";
+    sha256 = "06njdp2248zxm7zlcpyawx1s7j6hffp5a9mwam3cb53gsmzcz126";
   };
 
   nativeBuildInputs = [ makeWrapper unzip ];
-- 
GitLab


From 8f9135f511e6dc4cde7ff2046d49bc0e51285165 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sun, 29 Sep 2019 01:40:27 -0400
Subject: [PATCH 1368/2254] lollypop: correct search-provider wrapping

---
 pkgs/applications/audio/lollypop/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix
index 73d8d350f38..c967576a5aa 100644
--- a/pkgs/applications/audio/lollypop/default.nix
+++ b/pkgs/applications/audio/lollypop/default.nix
@@ -71,9 +71,8 @@ python3.pkgs.buildPythonApplication rec  {
     patchShebangs meson_post_install.py
   '';
 
-  preFixup = ''
-    buildPythonPath "$out $propagatedBuildInputs"
-    patchPythonScript "$out/libexec/lollypop-sp"
+  postFixup = ''
+    wrapPythonProgramsIn $out/libexec "$out $propagatedBuildInputs"
   '';
 
   # Produce only one wrapper using wrap-python passing
-- 
GitLab


From 627f03f5bfd2e880029f50d280d6c694efe1783a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 22:42:02 -0700
Subject: [PATCH 1369/2254] varnish6: 6.2.0 -> 6.3.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/varnish/versions
---
 pkgs/servers/varnish/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix
index 8a63ed3ea7f..4756fbdafb6 100644
--- a/pkgs/servers/varnish/default.nix
+++ b/pkgs/servers/varnish/default.nix
@@ -51,8 +51,8 @@ in
     python = python2;
   };
   varnish6 = common {
-    version = "6.2.0";
-    sha256 = "0lwfk2gq99c653h5f51fs3j37r0gh2pf0p4w5z986nm2mi9z6yn3";
+    version = "6.3.0";
+    sha256 = "0zwlffdd1m0ih33nq40xf2wwdyvr4czmns2fs90qpfnwy72xxk4m";
     python = python3;
     extraNativeBuildInputs = [ python3.pkgs.sphinx ];
   };
-- 
GitLab


From 4a7964614f146aa2de0ebfeecb66714e0744297c Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sun, 29 Sep 2019 01:47:04 -0400
Subject: [PATCH 1370/2254] eolie: 0.9.60 -> 0.9.63

---
 pkgs/applications/networking/browsers/eolie/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix
index e067f3f15eb..b9b183a03ff 100644
--- a/pkgs/applications/networking/browsers/eolie/default.nix
+++ b/pkgs/applications/networking/browsers/eolie/default.nix
@@ -5,7 +5,7 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "eolie";
-  version = "0.9.60";
+  version = "0.9.63";
 
   format = "other";
   doCheck = false;
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
     url = "https://gitlab.gnome.org/World/eolie";
     rev = "refs/tags/${version}";
     fetchSubmodules = true;
-    sha256 = "1mhl7p8pwp8lqx5z15r0lx1y4mb2c1gjwy3w6041cyc4hyb91693";
+    sha256 = "0z8gcfg7i842rr5p8r3vqa31kf7nnj1yv3afax3jzf4zbnhb8wm0";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From 949cc9c3167cddf50babf1b4d7469a8ac1096734 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 29 Sep 2019 00:02:36 -0700
Subject: [PATCH 1371/2254] tdlib: 1.4.0 -> 1.5.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/tdlib/versions
---
 pkgs/development/libraries/tdlib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/tdlib/default.nix b/pkgs/development/libraries/tdlib/default.nix
index 716f3d313b4..96ae5c1ec9a 100644
--- a/pkgs/development/libraries/tdlib/default.nix
+++ b/pkgs/development/libraries/tdlib/default.nix
@@ -1,14 +1,14 @@
 { fetchFromGitHub, gperf, openssl, readline, zlib, cmake, stdenv }:
 
 stdenv.mkDerivation rec {
-  version = "1.4.0";
+  version = "1.5.0";
   pname = "tdlib";
 
   src = fetchFromGitHub {
     owner = "tdlib";
     repo = "td";
     rev = "v${version}";
-    sha256 = "1ijyn14rjb87rqm39hg7md8ab33yiy8cgzw3p0m37scn58gabpp7";
+    sha256 = "1rqxdvzlryqln5jzj35cwz1fjwy4s8xq97p0wdnpzbfjpcalvrm5";
   };
 
   buildInputs = [ gperf openssl readline zlib ];
-- 
GitLab


From 48ea4171cb7f8155044baf107b955b3ec268f354 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 29 Sep 2019 00:09:43 -0700
Subject: [PATCH 1372/2254] urlscan: 0.9.3 -> 0.9.4

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/urlscan/versions
---
 pkgs/applications/misc/urlscan/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/urlscan/default.nix b/pkgs/applications/misc/urlscan/default.nix
index 87800cf90d6..791075e4dd9 100644
--- a/pkgs/applications/misc/urlscan/default.nix
+++ b/pkgs/applications/misc/urlscan/default.nix
@@ -2,13 +2,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "urlscan";
-  version = "0.9.3";
+  version = "0.9.4";
 
   src = fetchFromGitHub {
     owner = "firecat53";
     repo = pname;
     rev = version;
-    sha256 = "0z24k8sk2zfp2pwysyp844vmhr5vbkj74frwy4i0v5pj60i9jl0v";
+    sha256 = "11wkwjqsq848ks6m2jqsb8h0xnz75fb60bm0c4jkxys9wzy4chg5";
   };
 
   propagatedBuildInputs = [ python3Packages.urwid ];
-- 
GitLab


From 606b9f40aaff48045af51276142c6e14b3328016 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 29 Sep 2019 09:11:04 +0200
Subject: [PATCH 1373/2254] haskell.packages.ghc881.regex-posix: fix build

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 2c4f3967a22..09faec3cfa3 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -84,9 +84,11 @@ self: super: {
   })) (drv: {
     preConfigure = "sed -i -e 's/base >=4 && < 4.13,/base,/' regex-base.cabal";
   });
-  regex-posix = appendPatch super.regex-posix (pkgs.fetchpatch {
+  regex-posix = overrideCabal (appendPatch super.regex-posix (pkgs.fetchpatch {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-posix-0.95.2.patch";
     sha256 = "006yli58jpqp786zm1xlncjsilc38iv3a09r4pv94l587sdzasd2";
+  })) (drv: {
+    preConfigure = "sed -i -e 's/base >= 4 && < 4.13/base/' regex-posix.cabal";
   });
   optparse-applicative = appendPatch (doJailbreak super.optparse-applicative) (pkgs.fetchpatch {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/optparse-applicative-0.14.3.0.patch";
-- 
GitLab


From ca4c5041916575cd67d92e33ecf0d5a23f190cc7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 29 Sep 2019 00:12:18 -0700
Subject: [PATCH 1374/2254] uptimed: 0.4.1 -> 0.4.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/uptimed/versions
---
 pkgs/tools/system/uptimed/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/uptimed/default.nix b/pkgs/tools/system/uptimed/default.nix
index 71a5726759c..2e856aaf9be 100644
--- a/pkgs/tools/system/uptimed/default.nix
+++ b/pkgs/tools/system/uptimed/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   pname = "uptimed";
-  version = "0.4.1";
+  version = "0.4.2";
 
   src = fetchFromGitHub {
-    sha256 = "0hqs7n3agayckwdgwadzw5shpdh4h1inqgvp4zr5fi324pj5x80j";
+    sha256 = "0wnnpjfxnycigqj6hag0n6p5piss8cv40y9jda72d9s4df5n91z8";
     rev = "v${version}";
     repo = "uptimed";
     owner = "rpodgorny";
-- 
GitLab


From 3da81570f6b36e9846947e689c86aa115218c13c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 15:00:06 -0700
Subject: [PATCH 1375/2254] qmmp: 1.3.3 -> 1.3.4

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/qmmp/versions
---
 pkgs/applications/audio/qmmp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix
index ef52c65b105..aee373329ce 100644
--- a/pkgs/applications/audio/qmmp/default.nix
+++ b/pkgs/applications/audio/qmmp/default.nix
@@ -29,11 +29,11 @@
 # handle that.
 
 mkDerivation rec {
-  name = "qmmp-1.3.3";
+  name = "qmmp-1.3.4";
 
   src = fetchurl {
     url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2";
-    sha256 = "1777kqgvbkshqlawy00gbgwflxflwmjjidqdq29mhqszs76r6727";
+    sha256 = "0j9vgm6216w7arwl919p9rps0a9r6s4415spl3qkpifhwlk90zg0";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];
-- 
GitLab


From 3a59830c446b6e55dbe0d44022eee79d780f19d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 29 Sep 2019 09:52:11 +0200
Subject: [PATCH 1376/2254] cachix&niv: use separate bin output

---
 pkgs/development/haskell-modules/configuration-nix.nix | 8 +++-----
 pkgs/top-level/all-packages.nix                        | 4 +++-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 2f815d8a5f1..3ef96ca4138 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -94,11 +94,9 @@ self: super: builtins.intersectAttrs super {
   # Won't find it's header files without help.
   sfml-audio = appendConfigureFlag super.sfml-audio "--extra-include-dirs=${pkgs.openal}/include/AL";
 
-  cachix = overrideCabal (addBuildTools (enableSeparateBinOutput super.cachix) [pkgs.boost]) (drv: {
-    postPatch = (drv.postPatch or "") + ''
-      substituteInPlace cachix.cabal --replace "c++14" "c++17"
-    '';
-  });
+  cachix = addBuildTools (enableSeparateBinOutput super.cachix) [pkgs.boost];
+
+  niv = enableSeparateBinOutput super.niv;
 
   ghcid = enableSeparateBinOutput super.ghcid;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d333251dd4d..7d687145893 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10420,7 +10420,9 @@ in
 
   c-blosc = callPackage ../development/libraries/c-blosc { };
 
-  cachix = haskell.lib.justStaticExecutables haskellPackages.cachix;
+  cachix = haskellPackages.cachix.bin;
+
+  niv = haskellPackages.niv.bin;
 
   capnproto = callPackage ../development/libraries/capnproto { };
 
-- 
GitLab


From 5dd11ebb4afa37b1cf092d02c61bc2252b3eaa88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 29 Sep 2019 09:57:32 +0200
Subject: [PATCH 1377/2254] haskellPackages.amazonka*: fix build

---
 pkgs/development/haskell-modules/configuration-common.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index e9d0593314a..a30b4f1c1e2 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1227,10 +1227,4 @@ self: super: {
   # The LTS-14.x version of optparse-applicative is too old.
   cabal-plan = super.cabal-plan.override { optparse-applicative = self.optparse-applicative_0_15_1_0; };
 
-  # https://github.com/brendanhay/amazonka/commit/657b70d174fe5cb61e56cb8b9c5e57f1ec216f2b
-  amazonka = appendPatch super.amazonka ./patches/amazonka-Allow-http-client-0.6.patch;
-
-  # https://github.com/brendanhay/amazonka/commit/657b70d174fe5cb61e56cb8b9c5e57f1ec216f2b
-  amazonka-core = appendPatch super.amazonka-core ./patches/amazonka-core-Allow-http-client-0.6.patch;
-
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
-- 
GitLab


From 2c389b4098681acdf5d4277950c3868642228e01 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 29 Sep 2019 01:13:39 -0700
Subject: [PATCH 1378/2254] tpm2-tss: 2.2.3 -> 2.3.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/tpm2-tss/versions
---
 pkgs/development/libraries/tpm2-tss/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/tpm2-tss/default.nix b/pkgs/development/libraries/tpm2-tss/default.nix
index cb105235678..0bff95f02a7 100644
--- a/pkgs/development/libraries/tpm2-tss/default.nix
+++ b/pkgs/development/libraries/tpm2-tss/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "tpm2-tss";
-  version = "2.2.3";
+  version = "2.3.1";
 
   src = fetchurl {
     url = "https://github.com/tpm2-software/${pname}/releases/download/${version}/${pname}-${version}.tar.gz";
-    sha256 = "1hwrka0g817a4d1177vv0z13gp66bxzxhflfxswjhcdk93kaws8k";
+    sha256 = "1ryy6da3s91ks3m66y3xp6yh3v096kny0f9br74mxf2635n5g5kh";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From 990a5623103a870c5bfd03f4768125abc91f98fa Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 29 Sep 2019 01:27:47 -0700
Subject: [PATCH 1379/2254] vips: 8.8.1 -> 8.8.3

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/vips/versions
---
 pkgs/tools/graphics/vips/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix
index ad352c04ad9..3efbd6e0765 100644
--- a/pkgs/tools/graphics/vips/default.nix
+++ b/pkgs/tools/graphics/vips/default.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "vips";
-  version = "8.8.1";
+  version = "8.8.3";
 
   src = fetchFromGitHub {
     owner = "libvips";
     repo = "libvips";
     rev = "v${version}";
-    sha256 = "1wnfn92rvafx1g9vvhbvxssifzydx9y95kszg6i4c1p5sv5nhfd2";
+    sha256 = "0wlwcgcp7d3vhjdbi3xlpvnj4jl4321vac9v1sr1mis4aivwzsrn";
     # Remove unicode file names which leads to different checksums on HFS+
     # vs. other filesystems because of unicode normalisation.
     extraPostFetch = ''
-- 
GitLab


From d2ccabaeeacc9d5353a7387a8b2c60db4bd98fd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Sun, 29 Sep 2019 10:00:01 +0200
Subject: [PATCH 1380/2254] pythonPackages.spacy: fix import error

Importing spacy fails with:

ModuleNotFoundError: No module named 'pkg_resources

spaCy probably worked before because a dependency had setuptools as a
propagated dependency. This change adds setuptools to spacy's
propogatedBuildInputs.

Tested with the en_core_web_sm model.
---
 pkgs/development/python-modules/spacy/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix
index cdef1b2a9bd..aff670e5dfe 100644
--- a/pkgs/development/python-modules/spacy/default.nix
+++ b/pkgs/development/python-modules/spacy/default.nix
@@ -21,6 +21,7 @@
 , blis
 , wasabi
 , srsly
+, setuptools
 }:
 
 buildPythonPackage rec {
@@ -55,6 +56,7 @@ buildPythonPackage rec {
    blis
    wasabi
    srsly
+   setuptools
   ] ++ lib.optional (pythonOlder "3.4") pathlib;
 
   checkInputs = [
-- 
GitLab


From e739035e9ea2b6cb77464e91f3a7228ae7f93801 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 29 Sep 2019 01:49:33 -0700
Subject: [PATCH 1381/2254] xmrig: 3.0.0 -> 3.1.3

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/xmrig/versions
---
 pkgs/applications/misc/xmrig/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix
index 8a46336c9de..425c4a85888 100644
--- a/pkgs/applications/misc/xmrig/default.nix
+++ b/pkgs/applications/misc/xmrig/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "xmrig";
-  version = "3.0.0";
+  version = "3.1.3";
 
   src = fetchFromGitHub {
     owner = "xmrig";
     repo = "xmrig";
     rev = "v${version}";
-    sha256 = "1m0rsjb7y1j77mzg5cqb3fdvzgvjkrwgmkjn9nv1xl2757z8hcl4";
+    sha256 = "05z3hpz42609zsrqwd9sbxkgzm4f28ajhvgk69jvcfw7azg5jcfq";
   };
 
   nativeBuildInputs = [ cmake ];
-- 
GitLab


From 158fa3448987db4ce87fbb64fb3415948ef242e2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 29 Sep 2019 01:55:53 -0700
Subject: [PATCH 1382/2254] xlockmore: 5.57 -> 5.58

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/xlockmore/versions
---
 pkgs/misc/screensavers/xlockmore/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/misc/screensavers/xlockmore/default.nix
index c08b16a0a1d..c63a930cd05 100644
--- a/pkgs/misc/screensavers/xlockmore/default.nix
+++ b/pkgs/misc/screensavers/xlockmore/default.nix
@@ -2,11 +2,11 @@
 , libXdmcp, libXt }:
 
 stdenv.mkDerivation rec {
-  name = "xlockmore-5.57";
+  name = "xlockmore-5.58";
 
   src = fetchurl {
     url = "http://sillycycle.com/xlock/${name}.tar.xz";
-    sha256 = "18r8rh8fzdn9miicbpc3qbdd4mm2g1jpsbcvj29sr66pxydzkb7r";
+    sha256 = "1va11sbv5lbkxkp0i0msz5md3n2n82nzppk27rzdrw7y79vq37zw";
     curlOpts = "--user-agent 'Mozilla/5.0'";
   };
 
-- 
GitLab


From 22aef72ff132f59f3f3a00614912394b59de32f1 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 29 Sep 2019 10:34:30 +0200
Subject: [PATCH 1383/2254] python: get rid of msgpack-python, fixes #48864

We already have msgpack, which is the same. Building a Python env with
`spacy` resulted in a collision between an `.so` provided through both
`msgpack` and `msgpack-python`.

I don't know why `transitional = True` was set. These kind of things
should be documented!
---
 .../networking/instant-messengers/pybitmessage/default.nix | 2 +-
 pkgs/development/python-modules/cachy/default.nix          | 4 ++--
 pkgs/development/python-modules/intake/default.nix         | 4 ++--
 pkgs/development/python-modules/monty/default.nix          | 4 ++--
 pkgs/development/python-modules/spacy/default.nix          | 4 ++--
 pkgs/development/python-modules/thinc/default.nix          | 4 ++--
 pkgs/development/python-modules/zerorpc/default.nix        | 4 ++--
 pkgs/top-level/python-packages.nix                         | 7 -------
 8 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix
index 3f6b23d70a0..ea3ef08a2cd 100644
--- a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix
@@ -12,7 +12,7 @@ python2Packages.buildPythonApplication rec {
     sha256 = "1lmhbpwsqh1v93krlqqhafw2pc3y0qp8zby186yllbph6s8kdp35";
   };
 
-  propagatedBuildInputs = with python2Packages; [ msgpack-python pyqt4 numpy pyopencl ] ++ [ openssl ];
+  propagatedBuildInputs = with python2Packages; [ msgpack pyqt4 numpy pyopencl ] ++ [ openssl ];
 
   preConfigure = ''
     # Remove interaction and misleading output
diff --git a/pkgs/development/python-modules/cachy/default.nix b/pkgs/development/python-modules/cachy/default.nix
index 029a1864484..d5c3428fcc1 100644
--- a/pkgs/development/python-modules/cachy/default.nix
+++ b/pkgs/development/python-modules/cachy/default.nix
@@ -1,7 +1,7 @@
 { lib, buildPythonPackage, fetchPypi
 , redis
 , memcached
-, msgpack-python
+, msgpack
 }:
 
 buildPythonPackage rec {
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     redis
     memcached
-    msgpack-python
+    msgpack
   ];
 
   # The Pypi tarball doesn't include tests, and the GitHub source isn't
diff --git a/pkgs/development/python-modules/intake/default.nix b/pkgs/development/python-modules/intake/default.nix
index f89b7ab1ce6..f670d8f01e0 100644
--- a/pkgs/development/python-modules/intake/default.nix
+++ b/pkgs/development/python-modules/intake/default.nix
@@ -7,7 +7,7 @@
 , hvplot
 , jinja2
 , msgpack-numpy
-, msgpack-python
+, msgpack
 , numpy
 , pandas
 , panel
@@ -39,7 +39,7 @@ buildPythonPackage rec {
     hvplot
     jinja2
     msgpack-numpy
-    msgpack-python
+    msgpack
     numpy
     pandas
     panel
diff --git a/pkgs/development/python-modules/monty/default.nix b/pkgs/development/python-modules/monty/default.nix
index 4675a386054..677cb68ca50 100644
--- a/pkgs/development/python-modules/monty/default.nix
+++ b/pkgs/development/python-modules/monty/default.nix
@@ -5,7 +5,7 @@
 , numpy
 , six
 , ruamel_yaml
-, msgpack-python
+, msgpack
 , coverage
 , coveralls
 , pymongo
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     sha256 = "0vqaaz0dw0ypl6sfwbycpb0qs3ap04c4ghbggklxih66spdlggh6";
   };
 
-  checkInputs = [ lsof nose numpy msgpack-python coverage coveralls pymongo];
+  checkInputs = [ lsof nose numpy msgpack coverage coveralls pymongo];
   propagatedBuildInputs = [ six ruamel_yaml ];
 
   preCheck = ''
diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix
index aff670e5dfe..441c656a0e1 100644
--- a/pkgs/development/python-modules/spacy/default.nix
+++ b/pkgs/development/python-modules/spacy/default.nix
@@ -15,7 +15,7 @@
 , regex
 , cymem
 , pathlib
-, msgpack-python
+, msgpack
 , msgpack-numpy
 , jsonschema
 , blis
@@ -50,7 +50,7 @@ buildPythonPackage rec {
    requests
    regex
    ftfy
-   msgpack-python
+   msgpack
    msgpack-numpy
    jsonschema
    blis
diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix
index ac8ab3fd864..945da85b9fa 100644
--- a/pkgs/development/python-modules/thinc/default.nix
+++ b/pkgs/development/python-modules/thinc/default.nix
@@ -8,7 +8,7 @@
 , cymem
 , darwin
 , msgpack-numpy
-, msgpack-python
+, msgpack
 , preshed
 , numpy
 , murmurhash
@@ -44,7 +44,7 @@ buildPythonPackage rec {
    cython
    cymem
    msgpack-numpy
-   msgpack-python
+   msgpack
    preshed
    numpy
    murmurhash
diff --git a/pkgs/development/python-modules/zerorpc/default.nix b/pkgs/development/python-modules/zerorpc/default.nix
index 2ad01586189..bbd7bc8aba2 100644
--- a/pkgs/development/python-modules/zerorpc/default.nix
+++ b/pkgs/development/python-modules/zerorpc/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, future, gevent, msgpack-python, pyzmq }:
+{ lib, buildPythonPackage, fetchPypi, future, gevent, msgpack, pyzmq }:
 
 buildPythonPackage rec {
   pname = "zerorpc";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
     sha256 = "14d0nmprs0nm17d8kg2f7qalsi8x7c4damsccqgncylj7mpnk9hh";
   };
 
-  propagatedBuildInputs = [ future gevent msgpack-python pyzmq ];
+  propagatedBuildInputs = [ future gevent msgpack pyzmq ];
 
   doCheck = false; # pypi version doesn't include tests
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 143619aeb14..d08bb33f34e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3836,13 +3836,6 @@ in {
 
   msgpack-numpy = callPackage ../development/python-modules/msgpack-numpy {};
 
-  msgpack-python = self.msgpack.overridePythonAttrs {
-    pname = "msgpack-python";
-    postPatch = ''
-      substituteInPlace setup.py --replace "TRANSITIONAL = False" "TRANSITIONAL = True"
-    '';
-  };
-
   msrplib = callPackage ../development/python-modules/msrplib { };
 
   multipledispatch = callPackage ../development/python-modules/multipledispatch { };
-- 
GitLab


From 7408c39d20463b7dca3ec36ffe103ff5d0ddfb01 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 29 Sep 2019 10:43:45 +0200
Subject: [PATCH 1384/2254] pybitmessage: fix build

- use setuptools
- use msgpack instead of msgpack-python
---
 .../networking/instant-messengers/pybitmessage/default.nix   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix
index ea3ef08a2cd..111f4e728e7 100644
--- a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix
@@ -12,14 +12,15 @@ python2Packages.buildPythonApplication rec {
     sha256 = "1lmhbpwsqh1v93krlqqhafw2pc3y0qp8zby186yllbph6s8kdp35";
   };
 
-  propagatedBuildInputs = with python2Packages; [ msgpack pyqt4 numpy pyopencl ] ++ [ openssl ];
+  propagatedBuildInputs = with python2Packages; [ msgpack pyqt4 numpy pyopencl setuptools ] ++ [ openssl ];
 
   preConfigure = ''
     # Remove interaction and misleading output
     substituteInPlace setup.py \
       --replace "nothing = raw_input()" pass \
       --replace 'print "It looks like building the package failed.\n" \' pass \
-      --replace '    "You may be missing a C++ compiler and the OpenSSL headers."' pass
+      --replace '    "You may be missing a C++ compiler and the OpenSSL headers."' pass \
+      --replace 'msgpack-python' 'msgpack'
 
     substituteInPlace src/pyelliptic/openssl.py \
       --replace "libdir.append(find_library('ssl'))" "libdir.append('${openssl.out}/lib/libssl.so')"
-- 
GitLab


From 0d956a673d662bba236ee85dd5220c770ad29655 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 29 Sep 2019 10:46:56 +0200
Subject: [PATCH 1385/2254] python: zerorpc: 0.6.1 -> 0.6.3

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

diff --git a/pkgs/development/python-modules/zerorpc/default.nix b/pkgs/development/python-modules/zerorpc/default.nix
index bbd7bc8aba2..343c7c6e251 100644
--- a/pkgs/development/python-modules/zerorpc/default.nix
+++ b/pkgs/development/python-modules/zerorpc/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "zerorpc";
-  version = "0.6.1";
+  version = "0.6.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "14d0nmprs0nm17d8kg2f7qalsi8x7c4damsccqgncylj7mpnk9hh";
+    sha256 = "d2ee247a566fc703f29c277d767f6f61f1e12f76d0402faea4bd815f32cbf37f";
   };
 
   propagatedBuildInputs = [ future gevent msgpack pyzmq ];
-- 
GitLab


From 3a98fa3852f5877ce5434af376bb21b640214969 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 29 Sep 2019 02:03:52 -0700
Subject: [PATCH 1386/2254] worker: 4.0.1 -> 4.1.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/worker/versions
---
 pkgs/applications/misc/worker/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/worker/default.nix b/pkgs/applications/misc/worker/default.nix
index e5b89ff43b5..6ff09a5b4b0 100644
--- a/pkgs/applications/misc/worker/default.nix
+++ b/pkgs/applications/misc/worker/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "worker";
-  version = "4.0.1";
+  version = "4.1.0";
 
   src = fetchurl {
     url = "http://www.boomerangsworld.de/cms/worker/downloads/${pname}-${version}.tar.gz";
-    sha256 = "1mwkyak68bsxgff399xmr7bb3hxl0r976b90zi7jrzznwlvxx7vh";
+    sha256 = "19v4g34sk4fkagk0s60rbixyrrgg22qy1xwffm8b5ffq36r7yfch";
   };
 
   buildInputs = [ libX11 ];
-- 
GitLab


From 3062ec7f3e694e0ea0e6c89bbcf53788609aad9d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 29 Sep 2019 02:07:31 -0700
Subject: [PATCH 1387/2254] xterm: 348 -> 349

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/xterm/versions
---
 pkgs/applications/misc/xterm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix
index 60231350edb..83ba28bfce3 100644
--- a/pkgs/applications/misc/xterm/default.nix
+++ b/pkgs/applications/misc/xterm/default.nix
@@ -3,14 +3,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "xterm-348";
+  name = "xterm-349";
 
   src = fetchurl {
     urls = [
      "ftp://ftp.invisible-island.net/xterm/${name}.tgz"
      "https://invisible-mirror.net/archives/xterm/${name}.tgz"
    ];
-    sha256 = "1gkmj9v44xg4jahivhnpbmq22w1mwclr6fssv3lhssgkvchm27wb";
+    sha256 = "0ps7b2b2kbrkv5q49cmb8c51z0w21jmm7hwciw30m6jgfb9s79ir";
   };
 
   buildInputs =
-- 
GitLab


From b3b123a104f448e1f377b162cbd52af461fdecb2 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Wed, 25 Sep 2019 16:47:17 -0400
Subject: [PATCH 1388/2254] dbus: set datadir again

Fixes #69404
---
 pkgs/development/libraries/dbus/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index 616ad869d57..804f0e7fc85 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -60,6 +60,7 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--enable-user-session"
     "--libexecdir=${placeholder ''out''}/libexec"
+    "--datadir=/etc"
     "--localstatedir=/var"
     "--runstatedir=/run"
     "--sysconfdir=/etc"
-- 
GitLab


From 02648a6cc1816b7f0156a5a2b9dcee2c0fbd37cc Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Sat, 28 Sep 2019 18:49:37 -0700
Subject: [PATCH 1389/2254] python3Packages.pytorch: fix build

---
 pkgs/development/python-modules/pytorch/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix
index f14200b3542..17bf6f5cdab 100644
--- a/pkgs/development/python-modules/pytorch/default.nix
+++ b/pkgs/development/python-modules/pytorch/default.nix
@@ -44,6 +44,7 @@ in buildPythonPackage rec {
       })
     ];
 
+  dontUseCmakeConfigure = true;
   preConfigure = lib.optionalString cudaSupport ''
     export CC=${cudatoolkit.cc}/bin/gcc CXX=${cudatoolkit.cc}/bin/g++
   '' + lib.optionalString (cudaSupport && cudnn != null) ''
-- 
GitLab


From 65247333822a9b0ea6e92aabad81ad0b1bef3368 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Sat, 28 Sep 2019 21:44:23 -0700
Subject: [PATCH 1390/2254] pythonPackages.opt-einsum: fix build

---
 pkgs/development/python-modules/opt-einsum/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/opt-einsum/default.nix b/pkgs/development/python-modules/opt-einsum/default.nix
index c28105d4e49..11da1ba1ea5 100644
--- a/pkgs/development/python-modules/opt-einsum/default.nix
+++ b/pkgs/development/python-modules/opt-einsum/default.nix
@@ -1,4 +1,5 @@
-{ buildPythonPackage, fetchPypi, lib, numpy, pytest, pytestpep8, pytestcov }:
+{ buildPythonPackage, fetchPypi, lib, numpy, pytest_4 }:
+
 buildPythonPackage rec {
   version = "2.3.2";
   pname = "opt_einsum";
@@ -9,9 +10,7 @@ buildPythonPackage rec {
   };
 
   checkInputs = [
-    pytest
-    pytestpep8
-    pytestcov
+    pytest_4
   ];
 
   checkPhase = ''
-- 
GitLab


From 3a63bee1545038253f32bc4cfd45c5cbb8d1d879 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Sat, 28 Sep 2019 22:02:34 -0700
Subject: [PATCH 1391/2254] python3Packages.opt-einsum: 2.3.2 -> 3.0.1

---
 .../python-modules/opt-einsum/2.nix           | 30 +++++++++++++++++++
 .../python-modules/opt-einsum/default.nix     | 20 +++++--------
 pkgs/top-level/python-packages.nix            |  5 +++-
 3 files changed, 42 insertions(+), 13 deletions(-)
 create mode 100644 pkgs/development/python-modules/opt-einsum/2.nix

diff --git a/pkgs/development/python-modules/opt-einsum/2.nix b/pkgs/development/python-modules/opt-einsum/2.nix
new file mode 100644
index 00000000000..11da1ba1ea5
--- /dev/null
+++ b/pkgs/development/python-modules/opt-einsum/2.nix
@@ -0,0 +1,30 @@
+{ buildPythonPackage, fetchPypi, lib, numpy, pytest_4 }:
+
+buildPythonPackage rec {
+  version = "2.3.2";
+  pname = "opt_einsum";
+
+  src = fetchPypi {
+    inherit version pname;
+    sha256 = "0ny3v8x83mzpwmqjdzqhzy2pzwyy4wx01r1h9i29xw3yvas69m6k";
+  };
+
+  checkInputs = [
+    pytest_4
+  ];
+
+  checkPhase = ''
+    pytest
+  '';
+
+  propagatedBuildInputs = [
+    numpy
+  ];
+
+  meta = {
+    description = "Optimizing NumPy's einsum function with order optimization and GPU support.";
+    homepage = http://optimized-einsum.readthedocs.io;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ teh ];
+  };
+}
diff --git a/pkgs/development/python-modules/opt-einsum/default.nix b/pkgs/development/python-modules/opt-einsum/default.nix
index 11da1ba1ea5..f4e7d38ecb8 100644
--- a/pkgs/development/python-modules/opt-einsum/default.nix
+++ b/pkgs/development/python-modules/opt-einsum/default.nix
@@ -1,30 +1,26 @@
 { buildPythonPackage, fetchPypi, lib, numpy, pytest_4 }:
 
 buildPythonPackage rec {
-  version = "2.3.2";
+  version = "3.0.1";
   pname = "opt_einsum";
 
   src = fetchPypi {
     inherit version pname;
-    sha256 = "0ny3v8x83mzpwmqjdzqhzy2pzwyy4wx01r1h9i29xw3yvas69m6k";
+    sha256 = "1agyvq26x0zd6j3wzgczl4apx8v7cb9w1z50azn8c3pq9jphgfla";
   };
 
-  checkInputs = [
-    pytest_4
-  ];
+  propagatedBuildInputs = [ numpy ];
+
+  checkInputs = [ pytest_4 ];
 
   checkPhase = ''
     pytest
   '';
 
-  propagatedBuildInputs = [
-    numpy
-  ];
-
-  meta = {
+  meta = with lib; {
     description = "Optimizing NumPy's einsum function with order optimization and GPU support.";
     homepage = http://optimized-einsum.readthedocs.io;
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ teh ];
+    license = licenses.mit;
+    maintainers = with maintainers; [ teh ];
   };
 }
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d08bb33f34e..a610ef51d8c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3165,7 +3165,10 @@ in {
 
   pyro-ppl = callPackage ../development/python-modules/pyro-ppl {};
 
-  opt-einsum = callPackage ../development/python-modules/opt-einsum {};
+  opt-einsum = if isPy27 then
+      callPackage ../development/python-modules/opt-einsum/2.nix {}
+    else
+      callPackage ../development/python-modules/opt-einsum {};
 
   pytorchWithCuda = self.pytorch.override {
     cudaSupport = true;
-- 
GitLab


From 7ebd5999bd11a3c0be4ebdd536131c8baf6b41f9 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 13 Feb 2019 00:07:13 -0500
Subject: [PATCH 1392/2254] brotli: add staticOnly option

---
 pkgs/tools/compression/brotli/default.nix | 10 ++++++++--
 pkgs/top-level/static.nix                 |  4 ++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix
index 33b6f12cd46..229c6c8b8e4 100644
--- a/pkgs/tools/compression/brotli/default.nix
+++ b/pkgs/tools/compression/brotli/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ stdenv, fetchFromGitHub, cmake, fetchpatch, staticOnly ? false }:
 
 # ?TODO: there's also python lib in there
 
@@ -15,7 +15,13 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  cmakeFlags = [];
+  patches = stdenv.lib.optional staticOnly (fetchpatch {
+    url = "https://github.com/google/brotli/pull/655/commits/7289e5a378ba13801996a84d89d8fe95c3fc4c11.patch";
+    sha256 = "1bghbdvj24jrvb0sqfdif9vwg7wx6pn8dvl6flkrcjkhpj0gi0jg";
+  });
+
+  cmakeFlags = []
+    ++ stdenv.lib.optional staticOnly "-DBUILD_SHARED_LIBS=OFF";
 
   outputs = [ "out" "dev" "lib" ];
 
diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix
index f3c524378ea..6a311b4c9d2 100644
--- a/pkgs/top-level/static.nix
+++ b/pkgs/top-level/static.nix
@@ -159,6 +159,10 @@ in {
     };
   };
 
+  brotli = super.brotli.override {
+    staticOnly = true;
+  };
+
   llvmPackages_8 = super.llvmPackages_8 // {
     libraries = super.llvmPackages_8.libraries // rec {
       libcxxabi = super.llvmPackages_8.libraries.libcxxabi.override {
-- 
GitLab


From 85210e13e5a3307448bb3d50095ad0d91a64d828 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 12 Feb 2019 23:36:55 -0500
Subject: [PATCH 1393/2254] boehm-gc: support static + musl

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

diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix
index cf76d9e7d24..b347a7a0f2f 100644
--- a/pkgs/development/libraries/boehm-gc/default.nix
+++ b/pkgs/development/libraries/boehm-gc/default.nix
@@ -21,14 +21,17 @@ stdenv.mkDerivation rec {
     export NIX_CFLAGS_COMPILE+=" -D_GNU_SOURCE -DUSE_MMAP -DHAVE_DL_ITERATE_PHDR"
   '';
 
-  patches =
+  patches = [ (fetchpatch {
+    name = "boehm-gc-7.6.0-sys_select.patch";
+    url = "https://gitweb.gentoo.org/proj/musl.git/plain/dev-libs/boehm-gc/files/boehm-gc-7.6.0-sys_select.patch?id=85b6a600996bdd71162b357e9ba93d8559342432";
+    sha256 = "1gydwlklvci30f5dpp5ccw2p2qpph5y41r55wx9idamjlq66fbb3";
+  }) ] ++
     # https://github.com/ivmai/bdwgc/pull/208
     lib.optional stdenv.hostPlatform.isRiscV ./riscv.patch;
 
   configureFlags =
     [ "--enable-cplusplus" "--with-libatomic-ops=none" ]
-    ++ lib.optional enableLargeConfig "--enable-large-config"
-    ++ lib.optional (stdenv.hostPlatform.libc == "musl") "--disable-static";
+    ++ lib.optional enableLargeConfig "--enable-large-config";
 
   doCheck = true; # not cross;
 
-- 
GitLab


From 5ba8c04ae51b915a18dabf2cb7d75d8a4611de4d Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 12 Feb 2019 22:34:37 -0500
Subject: [PATCH 1394/2254] busybox: fix musl builds
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

You shouldn’t need to add anything with musl builds. The libc will
configure these values for you.
---
 pkgs/os-specific/linux/busybox/default.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix
index f041d2b5042..da9ed304db8 100644
--- a/pkgs/os-specific/linux/busybox/default.nix
+++ b/pkgs/os-specific/linux/busybox/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, buildPackages, fetchurl
 , enableStatic ? false
 , enableMinimal ? false
-, useMusl ? stdenv.hostPlatform.libc == "musl", musl
+, useMusl ? stdenv.hostPlatform.libc == "musl"
 , extraConfig ? ""
 }:
 
@@ -88,10 +88,6 @@ stdenv.mkDerivation rec {
     runHook postConfigure
   '';
 
-  postConfigure = lib.optionalString useMusl ''
-    makeFlagsArray+=("CC=${stdenv.cc.targetPrefix}cc -isystem ${musl.dev}/include -B${musl}/lib -L${musl}/lib")
-  '';
-
   depsBuildBuild = [ buildPackages.stdenv.cc ];
 
   buildInputs = lib.optionals (enableStatic && !useMusl && stdenv.cc.libc ? static) [ stdenv.cc.libc stdenv.cc.libc.static ];
-- 
GitLab


From 094f290f35c2c5c60f11e4deb9fa756bf922eb5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 29 Sep 2019 11:18:02 +0200
Subject: [PATCH 1395/2254] bohem-gc: fix static build

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

diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix
index b347a7a0f2f..bc8b7a8c760 100644
--- a/pkgs/development/libraries/boehm-gc/default.nix
+++ b/pkgs/development/libraries/boehm-gc/default.nix
@@ -15,18 +15,13 @@ stdenv.mkDerivation rec {
   };
 
   outputs = [ "out" "dev" "doc" ];
-  separateDebugInfo = stdenv.isLinux;
+  separateDebugInfo = stdenv.isLinux && stdenv.hostPlatform.libc != "musl";
 
   preConfigure = stdenv.lib.optionalString (stdenv.hostPlatform.libc == "musl") ''
     export NIX_CFLAGS_COMPILE+=" -D_GNU_SOURCE -DUSE_MMAP -DHAVE_DL_ITERATE_PHDR"
   '';
 
-  patches = [ (fetchpatch {
-    name = "boehm-gc-7.6.0-sys_select.patch";
-    url = "https://gitweb.gentoo.org/proj/musl.git/plain/dev-libs/boehm-gc/files/boehm-gc-7.6.0-sys_select.patch?id=85b6a600996bdd71162b357e9ba93d8559342432";
-    sha256 = "1gydwlklvci30f5dpp5ccw2p2qpph5y41r55wx9idamjlq66fbb3";
-  }) ] ++
-    # https://github.com/ivmai/bdwgc/pull/208
+  patches = # https://github.com/ivmai/bdwgc/pull/208
     lib.optional stdenv.hostPlatform.isRiscV ./riscv.patch;
 
   configureFlags =
-- 
GitLab


From d564733dd9ad64f3bc31192024ddfde47f21c5e8 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Sat, 28 Sep 2019 18:47:48 -0700
Subject: [PATCH 1396/2254] python3Packages.joblib: add setuptools dependency

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

diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix
index c16c7687c8a..08957304312 100644
--- a/pkgs/development/python-modules/joblib/default.nix
+++ b/pkgs/development/python-modules/joblib/default.nix
@@ -3,10 +3,11 @@
 , fetchPypi
 , fetchpatch
 , stdenv
-, sphinx
 , numpydoc
 , pytest
 , python-lz4
+, setuptools
+, sphinx
 }:
 
 
@@ -37,7 +38,7 @@ buildPythonPackage rec {
   ];
 
   checkInputs = [ sphinx numpydoc pytest ];
-  propagatedBuildInputs = [ python-lz4 ];
+  propagatedBuildInputs = [ python-lz4 setuptools ];
 
   # test_disk_used is broken: https://github.com/joblib/joblib/issues/57
   # test_dispatch_multiprocessing is broken only on Darwin.
-- 
GitLab


From a1fffa983a63aa766faf1facd3b9bdc1cd1a143d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 22:51:19 -0700
Subject: [PATCH 1397/2254] python37Packages.twine: 1.13.0 -> 1.15.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-twine/versions
---
 pkgs/development/python-modules/twine/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/twine/default.nix b/pkgs/development/python-modules/twine/default.nix
index a49e994019e..3fdc11e440e 100644
--- a/pkgs/development/python-modules/twine/default.nix
+++ b/pkgs/development/python-modules/twine/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "twine";
-  version = "1.13.0";
+  version = "1.15.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d6c29c933ecfc74e9b1d9fa13aa1f87c5d5770e119f5a4ce032092f0ff5b14dc";
+    sha256 = "11rpd653zcgzkq3sgwkzs3mpxl3r5rij59745ni84ikv8smjmlm3";
   };
 
   propagatedBuildInputs = [ pkginfo requests requests_toolbelt tqdm pyblake2 readme_renderer ];
-- 
GitLab


From f25e8a6d782fd8814179095a38b05f74c51e5ec2 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Sat, 28 Sep 2019 21:27:04 -0700
Subject: [PATCH 1398/2254] python3Packages.cnvkit: fix build

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

diff --git a/pkgs/development/python-modules/cnvkit/default.nix b/pkgs/development/python-modules/cnvkit/default.nix
index 905b274a055..054e302dfe7 100644
--- a/pkgs/development/python-modules/cnvkit/default.nix
+++ b/pkgs/development/python-modules/cnvkit/default.nix
@@ -39,6 +39,11 @@ buildPythonPackage rec {
     pomegranate
   ];
 
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "pandas >= 0.20.1, < 0.25.0" "pandas"
+  '';
+
   meta = with lib; {
     homepage = "https://cnvkit.readthedocs.io";
     description = "A Python library and command-line software toolkit to infer and visualize copy number from high-throughput DNA sequencing data";
-- 
GitLab


From a64bc803699fbec2a0e5f9549b86fd530a6471d4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 17:27:13 -0700
Subject: [PATCH 1399/2254] python37Packages.websockify: 0.8.0 -> 0.9.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-websockify/versions
---
 pkgs/development/python-modules/websockify/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/websockify/default.nix b/pkgs/development/python-modules/websockify/default.nix
index a9758580a44..484cc33b1f3 100644
--- a/pkgs/development/python-modules/websockify/default.nix
+++ b/pkgs/development/python-modules/websockify/default.nix
@@ -5,12 +5,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.8.0";
+  version = "0.9.0";
   pname = "websockify";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "547d3d98c5081f2dc2872a2e4a3aef33e0ee5141d5f6209204aab2f4a41548d2";
+    sha256 = "1nnalv0jkkj34hw6yb12lp6r6fj1ps9vkkyshjvx65y5xdwmnny3";
   };
 
   propagatedBuildInputs = [ numpy ];
-- 
GitLab


From 16452f182371b7529277d6b3a8a604e0ab12edae Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 16:47:28 -0700
Subject: [PATCH 1400/2254] python37Packages.tld: 0.9.3 -> 0.9.6

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-tld/versions
---
 pkgs/development/python-modules/tld/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tld/default.nix b/pkgs/development/python-modules/tld/default.nix
index b3d83deeac9..470a4bb40dd 100644
--- a/pkgs/development/python-modules/tld/default.nix
+++ b/pkgs/development/python-modules/tld/default.nix
@@ -2,11 +2,11 @@
 
 python.pkgs.buildPythonPackage rec {
   pname   = "tld";
-  version = "0.9.3";
+  version = "0.9.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0i0prgwrmm157h6fa5bx9wm0m70qq2nhzp743374a94p9s766rpp";
+    sha256 = "0figmf80y715zv6viqan2nyzpg9aia5dyl25nskirpm5lh1s99w9";
   };
 
   propagatedBuildInputs = with python.pkgs; [ six ];
-- 
GitLab


From e8e68cff3c7bdef3602280827914512fadff7998 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 16:44:56 -0700
Subject: [PATCH 1401/2254] python27Packages.tilestache: 1.51.13 -> 1.51.14

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python2.7-tilestache/versions
---
 pkgs/development/python-modules/tilestache/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tilestache/default.nix b/pkgs/development/python-modules/tilestache/default.nix
index 2b0fc68ca4c..c76cc6645d9 100644
--- a/pkgs/development/python-modules/tilestache/default.nix
+++ b/pkgs/development/python-modules/tilestache/default.nix
@@ -12,13 +12,13 @@
 
 buildPythonPackage rec {
   pname = "tilestache";
-  version = "1.51.13";
+  version = "1.51.14";
   disabled = !isPy27;
 
   src = fetchPypi {
     pname = "TileStache";
     inherit version;
-    sha256 = "11e15dd85501345bcfeb18dce5b1c8fb74ac8d867df2520afe0eefe1edd85f27";
+    sha256 = "1qjrabl6qr7i6yj6v647ck92abcyklb0vmb6h6kj7x8v2cj5xbvk";
   };
 
   propagatedBuildInputs = [ modestmaps pillow pycairo python-mapnik simplejson werkzeug ];
-- 
GitLab


From 1304139d0c3460bad2ab469e3b8317ff3c295cae Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 29 Sep 2019 02:32:12 -0700
Subject: [PATCH 1402/2254] zim: 0.71.1 -> 0.72.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/zim/versions
---
 pkgs/applications/office/zim/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix
index a41064666d5..5afc03a3bd6 100644
--- a/pkgs/applications/office/zim/default.nix
+++ b/pkgs/applications/office/zim/default.nix
@@ -9,11 +9,11 @@
 
 python3Packages.buildPythonApplication rec {
   name = "zim-${version}";
-  version = "0.71.1";
+  version = "0.72.0";
 
   src = fetchurl {
     url = "http://zim-wiki.org/downloads/${name}.tar.gz";
-    sha256 = "0d7whwpbklkhamlvysa0yyix1hchkpdynimf3gp1xbibg8mqzbxc";
+    sha256 = "1n3gmg7g86s8iwcx0i7rvvfdfs1fzmc9awr9qzjd2rckw4bkxad1";
   };
 
   buildInputs = [ gtk3 gobject-introspection wrapGAppsHook ];
-- 
GitLab


From 342ecaefd7c39e02674ac04539f8d4c4801029b0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 15:38:47 -0700
Subject: [PATCH 1403/2254] python37Packages.rasterio: 1.0.25 -> 1.0.28

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-rasterio/versions
---
 pkgs/development/python-modules/rasterio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix
index 1a4fdff5812..b5dc13f6625 100644
--- a/pkgs/development/python-modules/rasterio/default.nix
+++ b/pkgs/development/python-modules/rasterio/default.nix
@@ -6,14 +6,14 @@
 
 buildPythonPackage rec {
   pname = "rasterio";
-  version = "1.0.25";
+  version = "1.0.28";
 
   # Pypi doesn't ship the tests, so we fetch directly from GitHub
   src = fetchFromGitHub {
     owner = "mapbox";
     repo = "rasterio";
     rev = version;
-    sha256 = "15m0ajcrxjdzahdkxa3mylk87l31zz48k99bvmmx96hcl31cf347";
+    sha256 = "05rn2ijjv64a765gkpwcq3bb933gzp35zj4l9sk0agh19462myjx";
   };
 
   checkInputs = [ boto3 pytest pytestcov packaging hypothesis ] ++ lib.optional (!isPy3k) mock;
-- 
GitLab


From 0a9b241587dd7a5e79853f5b7f82040e16df7806 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 14:32:08 -0700
Subject: [PATCH 1404/2254] python37Packages.radio_beam: 0.3.1 -> 0.3.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-radio_beam/versions
---
 pkgs/development/python-modules/radio_beam/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/radio_beam/default.nix b/pkgs/development/python-modules/radio_beam/default.nix
index 09d815134ef..d21da2c7583 100644
--- a/pkgs/development/python-modules/radio_beam/default.nix
+++ b/pkgs/development/python-modules/radio_beam/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "radio_beam";
-  version = "0.3.1";
+  version = "0.3.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1wgd9dyz3pcc9ighkclb6qfyshwbg35s57lz6k62jhcxpvp8r5zb";
+    sha256 = "0g1nqiikv023ab60gfqrvc13kfjv8m70bpfk264vlliaq6mvxdf2";
   };
 
   propagatedBuildInputs = [ astropy ];
-- 
GitLab


From cd860e4306895ab290ff7c8b0f3c5985b697cc68 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 14:03:27 -0700
Subject: [PATCH 1405/2254] python37Packages.qtconsole: 4.5.2 -> 4.5.5

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-qtconsole/versions
---
 pkgs/development/python-modules/qtconsole/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix
index 055a54612a0..95ee3a864e6 100644
--- a/pkgs/development/python-modules/qtconsole/default.nix
+++ b/pkgs/development/python-modules/qtconsole/default.nix
@@ -14,11 +14,11 @@
 
 buildPythonPackage rec {
   pname = "qtconsole";
-  version = "4.5.2";
+  version = "4.5.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0z6d2rmzrx2dzbx94xxmsrl6vn6jjpzvb6014y2bqhwr7znbjzkn";
+    sha256 = "1nf64wl3ni0q69ihcm5y6zl12mmg7gvkhrb98hbgwv3yb09787mr";
   };
 
   checkInputs = [ nose ] ++ lib.optionals isPy27 [mock];
-- 
GitLab


From 2390a52ec7ae0bd8106837a19f3cca2fde68d8ec Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 13:41:18 -0700
Subject: [PATCH 1406/2254] python37Packages.Wand: 0.5.6 -> 0.5.7

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-wand/versions
---
 pkgs/development/python-modules/Wand/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/Wand/default.nix b/pkgs/development/python-modules/Wand/default.nix
index b1b71b39572..6ff6a7b9f07 100644
--- a/pkgs/development/python-modules/Wand/default.nix
+++ b/pkgs/development/python-modules/Wand/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "Wand";
-  version = "0.5.6";
+  version = "0.5.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "126gpx6zj7fpx87v1qgicpfdahmmkqqmd2a8abllq0jlckrmjsyh";
+    sha256 = "0wvqzppflph3fkgkyv3k11ga28fv1g1bz8sbf227d7pql8c6ia8k";
   };
 
   postPatch = ''
-- 
GitLab


From 2e77b1c31d6d0a246d7a80ddeae5974f02ee81b8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 08:21:52 -0700
Subject: [PATCH 1407/2254] python37Packages.lark-parser: 0.7.3 -> 0.7.5

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-lark-parser/versions
---
 pkgs/development/python-modules/lark-parser/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/lark-parser/default.nix b/pkgs/development/python-modules/lark-parser/default.nix
index 590ca988023..79bf4636b50 100644
--- a/pkgs/development/python-modules/lark-parser/default.nix
+++ b/pkgs/development/python-modules/lark-parser/default.nix
@@ -5,13 +5,13 @@
 
 buildPythonPackage rec {
   pname = "lark-parser";
-  version = "0.7.3";
+  version = "0.7.5";
 
   src = fetchFromGitHub {
     owner = "lark-parser";
     repo = "lark";
     rev = version;
-    sha256 = "1d8dbn8wwqqvvjyhai813sqkx6366d8jkjq0gkyh51692pflmwrp";
+    sha256 = "1k9s62ddv6pghzp1yak2ld6sk92zm4sz1xqp8zkzyh3xqdsmfa0f";
   };
 
   # tests of Nearley support require js2py
-- 
GitLab


From 5f074f3a49791072a7128a0ce7477c6df847116e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 08:12:33 -0700
Subject: [PATCH 1408/2254] python37Packages.pomegranate: 0.11.0 -> 0.11.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-pomegranate/versions
---
 pkgs/development/python-modules/pomegranate/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pomegranate/default.nix b/pkgs/development/python-modules/pomegranate/default.nix
index 7054485f302..4493ef51075 100644
--- a/pkgs/development/python-modules/pomegranate/default.nix
+++ b/pkgs/development/python-modules/pomegranate/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "pomegranate";
-  version = "0.11.0";
+  version = "0.11.1";
 
   src = fetchFromGitHub {
     repo = pname;
     owner = "jmschrei";
     rev = "v${version}";
-    sha256 = "0gf7z343ag4g7pfccn1sdap3ihkaxrc9ca75awjhmsa2cyqs66df";
+    sha256 = "19kdzqyj86aldsls68a6ymrs8sasv3a8r4wjmfdmcif1xsg6zb4q";
   };
 
   propagatedBuildInputs = [ numpy scipy cython networkx joblib pyyaml ];
-- 
GitLab


From 31d202c19fb421736d73144f67e89ff023ee7928 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 07:06:18 -0700
Subject: [PATCH 1409/2254] python37Packages.peewee: 3.10.0 -> 3.11.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-peewee/versions
---
 pkgs/development/python-modules/peewee/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/peewee/default.nix b/pkgs/development/python-modules/peewee/default.nix
index afb805c0b7e..d2cd79419a4 100644
--- a/pkgs/development/python-modules/peewee/default.nix
+++ b/pkgs/development/python-modules/peewee/default.nix
@@ -10,14 +10,14 @@
 buildPythonPackage rec {
 
   pname = "peewee";
-  version = "3.10.0";
+  version = "3.11.1";
 
   # pypi release does not provide tests
   src = fetchFromGitHub {
     owner = "coleifer";
     repo = pname;
     rev = version;
-    sha256 = "166h7vy3j0v4h2jnyiwpmpqgmn95381a5ra40ghghy0fqd9v49g8";
+    sha256 = "0q84r9x99h9a3kqs3i12bgk8rz5my8vpjngg8yaqd2kzsb6gynp8";
   };
 
 
-- 
GitLab


From 301523922d50ef2cdecbfbf825ad15415f8d79e2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 04:41:37 -0700
Subject: [PATCH 1410/2254] python37Packages.pex: 1.6.8 -> 1.6.11

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-pex/versions
---
 pkgs/development/python-modules/pex/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix
index 1e61992b49d..30631e06b5f 100644
--- a/pkgs/development/python-modules/pex/default.nix
+++ b/pkgs/development/python-modules/pex/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "pex";
-  version = "1.6.8";
+  version = "1.6.11";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1zibkc074dvk69bkiipfzn2l9glgzs26g16j2ny5lzq320wqszkj";
+    sha256 = "034170w0qh20qkfaha2rpnccm31f7snhb4r9cd079v4v2x2swybk";
   };
 
   nativeBuildInputs = [ setuptools ];
-- 
GitLab


From 6b060f3b5f32ea808b935666e645327a4f939777 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 03:41:50 -0700
Subject: [PATCH 1411/2254] python37Packages.holoviews: 1.12.3 -> 1.12.5

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-holoviews/versions
---
 pkgs/development/python-modules/holoviews/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/holoviews/default.nix b/pkgs/development/python-modules/holoviews/default.nix
index bd0cbda48d8..07be912a65a 100644
--- a/pkgs/development/python-modules/holoviews/default.nix
+++ b/pkgs/development/python-modules/holoviews/default.nix
@@ -15,11 +15,11 @@
 
 buildPythonPackage rec {
   pname = "holoviews";
-  version = "1.12.3";
+  version = "1.12.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "df64c0f163fe8b43d28cf5bcdeb8abc45d882aedca525b870f17987edd0c80a2";
+    sha256 = "15cay2fnhwqr42s4hiq37b8q87sir5k59p14g96mvg5p0gjnhg3w";
   };
 
   propagatedBuildInputs = [
-- 
GitLab


From d8f8782efba4d8a7243731575d3835b718050fcd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 00:41:29 -0700
Subject: [PATCH 1412/2254] python37Packages.azure-cli-telemetry: 1.0.2 ->
 1.0.3

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-azure-cli-telemetry/versions
---
 .../python-modules/azure-cli-telemetry/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-cli-telemetry/default.nix b/pkgs/development/python-modules/azure-cli-telemetry/default.nix
index 73873076bda..22b32e20eee 100644
--- a/pkgs/development/python-modules/azure-cli-telemetry/default.nix
+++ b/pkgs/development/python-modules/azure-cli-telemetry/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "azure-cli-telemetry";
-  version = "1.0.2";
+  version = "1.0.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "14wmxdsrrlnixaj52q37rrvp9wg5b54gf5wn2z1vq68kxpg1s560";
+    sha256 = "0sf27pcz653h0cnxsg47nndilhqlw9fl019aqbnji2vn967r9rnl";
   };
 
   propagatedBuildInputs = [
-- 
GitLab


From 6a7bd00e777d1428e91dc8a17a19ecd0e1c58932 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 00:34:08 -0700
Subject: [PATCH 1413/2254] python37Packages.clikit: 0.3.1 -> 0.3.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-clikit/versions
---
 pkgs/development/python-modules/clikit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/clikit/default.nix b/pkgs/development/python-modules/clikit/default.nix
index 1ac684e6d69..37a41c7fba4 100644
--- a/pkgs/development/python-modules/clikit/default.nix
+++ b/pkgs/development/python-modules/clikit/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "clikit";
-  version = "0.3.1";
+  version = "0.3.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0f8ba0kbka208faxdlny8byqb2w2cdyspq73zalymq8vr91796lp";
+    sha256 = "1pvzq3glf4sjgrm0wyxln3s6vicdc9q8r5sgaiqmxdmd9pylw0xm";
   };
 
   propagatedBuildInputs = [
-- 
GitLab


From 7f470e14d4dd44f7e9fee18b833917f803c4ed86 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 22:44:28 -0700
Subject: [PATCH 1414/2254] python37Packages.bidict: 0.18.0 -> 0.18.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-bidict/versions
---
 pkgs/development/python-modules/bidict/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bidict/default.nix b/pkgs/development/python-modules/bidict/default.nix
index 61dc1db1a48..a3fd59eea43 100644
--- a/pkgs/development/python-modules/bidict/default.nix
+++ b/pkgs/development/python-modules/bidict/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "bidict";
-  version = "0.18.0";
+  version = "0.18.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4d10630fd5d86b7c165387473c5180e7fca7635f12e24b1f426aac259c72c81a";
+    sha256 = "0br3ljvd56nqifr1mbwksvl5jjk40pihrrjlyn7hmc40yq6m5bvh";
   };
 
   nativeBuildInputs = [ setuptools_scm ];
-- 
GitLab


From 97b48dcad52ae7c99bc01c276ee5a7545fa009d9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 22:23:34 -0700
Subject: [PATCH 1415/2254] python37Packages.identify: 1.4.5 -> 1.4.7

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-identify/versions
---
 pkgs/development/python-modules/identify/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix
index 8987ce97c71..3b53038321c 100644
--- a/pkgs/development/python-modules/identify/default.nix
+++ b/pkgs/development/python-modules/identify/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "identify";
-  version = "1.4.5";
+  version = "1.4.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1z8xjvpkj599h3s76q05y10iysjjky7b0s5g3zicfyxhzm7x59a3";
+    sha256 = "0vi9qxgnjgxdk4wj3c5ha3hjmc97j3pw1zh2cg39jprapn4rb4fq";
   };
 
   # Tests not included in PyPI tarball
-- 
GitLab


From 1d7a33e11bb951fecaefb37dbaf9a0fbcbe20464 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Fri, 13 Sep 2019 14:39:43 -0700
Subject: [PATCH 1416/2254] pythonPackages.azure: mark as broken

---
 pkgs/development/python-modules/azure/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/azure/default.nix b/pkgs/development/python-modules/azure/default.nix
index 87a39255561..0a2e733ea1a 100644
--- a/pkgs/development/python-modules/azure/default.nix
+++ b/pkgs/development/python-modules/azure/default.nix
@@ -34,5 +34,6 @@ buildPythonPackage rec {
     homepage = "https://azure.microsoft.com/en-us/develop/python/";
     license = licenses.asl20;
     maintainers = with maintainers; [ olcai ];
+    broken = true; # this should propagate over 70 azure packages, many of which are not added yet
   };
 }
-- 
GitLab


From 3a6efadba0c606c40320ff3f6e216277ffcbf196 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 29 Sep 2019 12:01:21 +0200
Subject: [PATCH 1417/2254] pkgsStatic: fix curl, boost, openssl and libsodium

---
 pkgs/development/libraries/libsodium/default.nix |  2 +-
 pkgs/top-level/static.nix                        | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix
index 8c88abd2c44..a2b6ba6224e 100644
--- a/pkgs/development/libraries/libsodium/default.nix
+++ b/pkgs/development/libraries/libsodium/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   outputs = [ "out" "dev" ];
-  separateDebugInfo = stdenv.isLinux;
+  separateDebugInfo = stdenv.isLinux && stdenv.hostPlatform.libc != "musl";
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix
index 6a311b4c9d2..f0ba6a09c0b 100644
--- a/pkgs/top-level/static.nix
+++ b/pkgs/top-level/static.nix
@@ -115,7 +115,9 @@ in {
     static = true;
   };
   openblas = super.openblas.override { enableStatic = true; };
-  openssl = super.openssl.override {
+  nix = super.nix.override { withAWS = false; };
+  # openssl 1.1 doesn't compile
+  openssl = super.openssl_1_0_2.override {
     static = true;
 
     # Don’t use new stdenv for openssl because it doesn’t like the
@@ -125,6 +127,10 @@ in {
   boost = super.boost.override {
     enableStatic = true;
     enableShared = false;
+
+    # Don’t use new stdenv for boost because it doesn’t like the
+    # --disable-shared flag
+    stdenv = super.stdenv;
   };
   gmp = super.gmp.override {
     withStatic = true;
@@ -159,6 +165,11 @@ in {
     };
   };
 
+  curl = super.curl.override {
+    # a very sad story: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=439039
+    gssSupport = false;
+  };
+
   brotli = super.brotli.override {
     staticOnly = true;
   };
-- 
GitLab


From 925b4244d7b022786f9d4ec0c07ee9693b244f71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 29 Sep 2019 11:02:01 +0100
Subject: [PATCH 1418/2254] radare2-for-cutter: 3.6.0 -> 3.8.0

---
 pkgs/development/tools/analysis/radare2/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix
index 41949b0ad42..cc6930fce13 100644
--- a/pkgs/development/tools/analysis/radare2/default.nix
+++ b/pkgs/development/tools/analysis/radare2/default.nix
@@ -120,12 +120,12 @@ in {
     cs_sha256 = "0ijwxxk71nr9z91yxw20zfj4bbsbrgvixps5c7cpj163xlzlwba6";
   };
   r2-for-cutter = generic {
-    version_commit = "22775";
-    gittap = "3.6.0";
-    gittip = "ff3bb6e3b2e6a519b4c975d05758c171a5186389";
-    rev = "ff3bb6e3b2e6a519b4c975d05758c171a5186389";
-    version = "2019-06-24";
-    sha256 = "0vp94qzznqv87vvjbyyj6swkm6gl7byqvb1jv23i8i42zi5n7qmd";
+    version_commit = "22888";
+    gittap = "3.8.0";
+    gittip = "b4860e4eecad2053202965926f16296864b2f1e5";
+    rev = "b4860e4eecad2053202965926f16296864b2f1e5";
+    version = "2019-09-03";
+    sha256 = "0rx6az2vpqy12lvzpxx9pappqj84d88daj8bis3zsffqgmhsafcd";
     cs_ver = "4.0.1";
     cs_sha256 = "0ijwxxk71nr9z91yxw20zfj4bbsbrgvixps5c7cpj163xlzlwba6";
   };
-- 
GitLab


From 305e48b0458797c30572a53cdcc412369f40aab7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 29 Sep 2019 03:07:29 -0700
Subject: [PATCH 1419/2254] xidlehook: 0.7.0 -> 0.7.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/xidlehook/versions
---
 pkgs/tools/X11/xidlehook/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/X11/xidlehook/default.nix b/pkgs/tools/X11/xidlehook/default.nix
index b1770af2406..89aff817f50 100644
--- a/pkgs/tools/X11/xidlehook/default.nix
+++ b/pkgs/tools/X11/xidlehook/default.nix
@@ -3,7 +3,7 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "xidlehook";
-  version = "0.7.0";
+  version = "0.7.1";
 
   doCheck = false;
 
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
     repo = "xidlehook";
     rev = version;
 
-    sha256 = "0dl4rnh4l3rhga5pfxmkc9syn6vx05zxdf8xcv0gw9h60y1smp6v";
+    sha256 = "04bb81iwxznkr1zq1q8dql9qklzm9qy7837a71b02ywp3fc6v5b2";
   };
 
   cargoBuildFlags = lib.optionals (!stdenv.isLinux) ["--no-default-features" "--features" "pulse"];
-- 
GitLab


From 23d3a0269a7580dc05c5fa2b9f11ed73c87afc3b Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 14 Aug 2019 13:45:12 -0700
Subject: [PATCH 1420/2254] antlr4: 4.7.1 -> 4.7.2

---
 pkgs/development/tools/parsing/antlr/4.7.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/parsing/antlr/4.7.nix b/pkgs/development/tools/parsing/antlr/4.7.nix
index fcd7e445b8a..05f08e5f060 100644
--- a/pkgs/development/tools/parsing/antlr/4.7.nix
+++ b/pkgs/development/tools/parsing/antlr/4.7.nix
@@ -2,12 +2,12 @@
 , fetchFromGitHub, cmake, ninja, pkgconfig, libuuid, darwin }:
 
 let
-  version = "4.7.1";
+  version = "4.7.2";
   source = fetchFromGitHub {
     owner = "antlr";
     repo = "antlr4";
     rev = version;
-    sha256 = "1xb4d9bd4hw406v85s64gg8gwcrrsrw171vhga1gz4xj6pzfwxz7";
+    sha256 = "1pl0zs6c6wx9nmq30s7ccpc3dl72az55i8vfp574fw9sywmvxmlj";
   };
 
   runtime = {
@@ -38,9 +38,10 @@ let
   antlr = stdenv.mkDerivation {
     pname = "antlr";
     inherit version;
+
     src = fetchurl {
       url ="https://www.antlr.org/download/antlr-${version}-complete.jar";
-      sha256 = "1236gwnzchama92apb2swmklnypj01m7bdwwfvwvl8ym85scw7gl";
+      sha256 = "1d40nfkq3ws8g4ksx4gj6l6m2l9j4b605q6sf68z5vvmg5nkhlk8";
     };
 
     dontUnpack = true;
-- 
GitLab


From cca1670bcda2ff78e05c6260b1ef594252077588 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 14 Aug 2019 13:46:52 -0700
Subject: [PATCH 1421/2254] mysqlWorkbench: support antlr4.7.2

---
 pkgs/applications/misc/mysql-workbench/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix
index 135745feec3..443fe2f1d6c 100644
--- a/pkgs/applications/misc/mysql-workbench/default.nix
+++ b/pkgs/applications/misc/mysql-workbench/default.nix
@@ -37,6 +37,12 @@ in stdenv.mkDerivation rec {
     })
   ];
 
+  # have it look for 4.7.2 instead of 4.7.1
+  preConfigure = ''
+    substituteInPlace CMakeLists.txt \
+      --replace "antlr-4.7.1-complete.jar" "antlr-4.7.2-complete.jar"
+  '';
+
   nativeBuildInputs = [
     cmake ninja pkgconfig jre swig wrapGAppsHook
   ];
-- 
GitLab


From 24fde6615657f8de75d1ea5f73cde3694eac33f2 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 14 Aug 2019 14:26:49 -0700
Subject: [PATCH 1422/2254] pythonPackages.antlr4-python{2,3}-runtime: use
 antlr4 source

---
 .../antlr4-python2-runtime/default.nix        | 19 ++++++++++--------
 .../antlr4-python3-runtime/default.nix        | 20 +++++++++++--------
 pkgs/top-level/python-packages.nix            |  4 ++--
 3 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/python-modules/antlr4-python2-runtime/default.nix b/pkgs/development/python-modules/antlr4-python2-runtime/default.nix
index b343be1d7bb..aa18a0fe290 100644
--- a/pkgs/development/python-modules/antlr4-python2-runtime/default.nix
+++ b/pkgs/development/python-modules/antlr4-python2-runtime/default.nix
@@ -1,18 +1,21 @@
-{ stdenv, fetchPypi, buildPythonPackage, isPy3k }:
+{ lib, buildPythonPackage, isPy3k, python
+, antlr4
+}:
 
 buildPythonPackage rec {
   pname = "antlr4-python2-runtime";
-  version = "4.7.2";
+  inherit (antlr4.runtime.cpp) version src;
   disabled = isPy3k;
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "04ljic5wnqpizln8q3c78pqrckz6q5nb433if00j1mlyv2yja22q";
-  };
+  sourceRoot = "source/runtime/Python2";
+
+  checkPhase = ''
+    ${python.interpreter} tests/TestTokenStreamRewriter.py
+  '';
 
-  meta = {
+  meta = with lib; {
     description = "Runtime for ANTLR";
     homepage = "https://www.antlr.org/";
-    license = stdenv.lib.licenses.bsd3;
+    license = licenses.bsd3;
   };
 }
diff --git a/pkgs/development/python-modules/antlr4-python3-runtime/default.nix b/pkgs/development/python-modules/antlr4-python3-runtime/default.nix
index 3ebba9f9d38..0fade1362c9 100644
--- a/pkgs/development/python-modules/antlr4-python3-runtime/default.nix
+++ b/pkgs/development/python-modules/antlr4-python3-runtime/default.nix
@@ -1,18 +1,22 @@
-{ stdenv, fetchPypi, buildPythonPackage, isPy3k }:
+{ lib, buildPythonPackage, isPy3k, python
+, antlr4
+}:
 
 buildPythonPackage rec {
   pname = "antlr4-python3-runtime";
-  version = "4.7.2";
+  inherit (antlr4.runtime.cpp) version src;
   disabled = !isPy3k;
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "02xm7ccsf51vh4xsnhlg6pvchm1x3ckgv9kwm222w5drizndr30n";
-  };
+  sourceRoot = "source/runtime/Python3";
+
+  checkPhase = ''
+    cd test
+    ${python.interpreter} ctest.py
+  '';
 
-  meta = {
+  meta = with lib; {
     description = "Runtime for ANTLR";
     homepage = "https://www.antlr.org/";
-    license = stdenv.lib.licenses.bsd3;
+    license = licenses.bsd3;
   };
 }
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a610ef51d8c..0e21f19d8bb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1379,9 +1379,9 @@ in {
 
   amqplib = callPackage ../development/python-modules/amqplib {};
 
-  antlr4-python2-runtime = callPackage ../development/python-modules/antlr4-python2-runtime {};
+  antlr4-python2-runtime = callPackage ../development/python-modules/antlr4-python2-runtime { antlr4 = pkgs.antlr4; };
 
-  antlr4-python3-runtime = callPackage ../development/python-modules/antlr4-python3-runtime {};
+  antlr4-python3-runtime = callPackage ../development/python-modules/antlr4-python3-runtime { antlr4 = pkgs.antlr4; };
 
   apipkg = callPackage ../development/python-modules/apipkg {};
 
-- 
GitLab


From dfb8a8c5e4506f254e4b950a83817748ef0724ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 29 Sep 2019 12:20:28 +0200
Subject: [PATCH 1423/2254] pkgsStatic: fiz zlib and nghttp2

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

diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix
index f0ba6a09c0b..cc773207c37 100644
--- a/pkgs/top-level/static.nix
+++ b/pkgs/top-level/static.nix
@@ -69,6 +69,10 @@ in {
       haskellStaticAdapter;
   };
 
+  nghttp2 = super.nghttp2.override {
+    enableApp = false;
+  };
+
   ncurses = super.ncurses.override {
     enableStatic = true;
   };
@@ -78,14 +82,14 @@ in {
   } // optionalAttrs super.stdenv.hostPlatform.isDarwin {
     pythonSupport = false;
   });
-  zlib = super.zlib.override {
+  zlib = (super.zlib.override {
     static = true;
     shared = false;
 
     # Don’t use new stdenv zlib because
     # it doesn’t like the --disable-shared flag
     stdenv = super.stdenv;
-  };
+  }).static;
   xz = super.xz.override {
     enableStatic = true;
   };
-- 
GitLab


From 40d75f26b299a6d77ee36e270b0f60a2786b82c3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 29 Sep 2019 03:35:20 -0700
Subject: [PATCH 1424/2254] xmrig-proxy: 3.0.0 -> 3.1.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/xmrig-proxy/versions
---
 pkgs/applications/misc/xmrig/proxy.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/xmrig/proxy.nix b/pkgs/applications/misc/xmrig/proxy.nix
index 7d9ebca0086..5871d1a557b 100644
--- a/pkgs/applications/misc/xmrig/proxy.nix
+++ b/pkgs/applications/misc/xmrig/proxy.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "xmrig-proxy";
-  version = "3.0.0";
+  version = "3.1.1";
 
   src = fetchFromGitHub {
     owner = "xmrig";
     repo = "xmrig-proxy";
     rev = "v${version}";
-    sha256 = "19rv5zmxwr3kmb2m3fas91aq1493cnkhvs88zcflnijr1ra218ks";
+    sha256 = "1qiwarf0bqc17w3r88ysxxpm71gm861zx1fnzp0xi4q3rbh3nfmd";
   };
 
   nativeBuildInputs = [ cmake ];
-- 
GitLab


From 46b3bf07b2ed41df031523d0a7ac0d5c70a293a4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 29 Sep 2019 03:42:12 -0700
Subject: [PATCH 1425/2254] watson: 1.7.0 -> 1.8.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/watson/versions
---
 pkgs/applications/office/watson/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/watson/default.nix b/pkgs/applications/office/watson/default.nix
index 16df0b294c1..7d79d79072a 100644
--- a/pkgs/applications/office/watson/default.nix
+++ b/pkgs/applications/office/watson/default.nix
@@ -4,12 +4,12 @@ with pythonPackages;
 
 buildPythonApplication rec {
   pname = "watson";
-  version = "1.7.0";
+  version = "1.8.0";
 
   src = fetchPypi {
     inherit version;
     pname = "td-watson";
-    sha256 = "249313996751f32f38817d424cbf8d74956461df1439f0ee3a962fcc3c77225d";
+    sha256 = "1ip66jhbcqifdw1avbhngwym0vv7fsqxgbph11da5wlqwfwp060n";
   };
 
   checkPhase = ''
-- 
GitLab


From ec01a4f9c6776a426e5a8d1551ec31e1b94c9614 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 29 Sep 2019 03:51:46 -0700
Subject: [PATCH 1426/2254] you-get: 0.4.1328 -> 0.4.1347

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/you-get/versions
---
 pkgs/tools/misc/you-get/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/tools/misc/you-get/default.nix
index a900e26019c..81d98ff7ab3 100644
--- a/pkgs/tools/misc/you-get/default.nix
+++ b/pkgs/tools/misc/you-get/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonApplication rec {
   pname = "you-get";
-  version = "0.4.1328";
+  version = "0.4.1347";
 
   # Tests aren't packaged, but they all hit the real network so
   # probably aren't suitable for a build environment anyway.
@@ -10,7 +10,7 @@ buildPythonApplication rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1rbsf7dphvlzahrzgdj1bq62mqhp2fmr61lckcyzq6jdq3vsf0w8";
+    sha256 = "11wqk0q2nim7mmi247sflk4sq4yac3f4s71a6kldhbb94l4p8q26";
   };
 
   meta = with stdenv.lib; {
-- 
GitLab


From 7cb387908ca9a6ed4e317a6c916972b92f17bf05 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@gmail.com>
Date: Sun, 29 Sep 2019 14:29:37 +0300
Subject: [PATCH 1427/2254] hugo: 0.58.0 -> 0.58.3

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

diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index 720445be9be..840f4c32e52 100644
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/pkgs/applications/misc/hugo/default.nix
@@ -2,18 +2,18 @@
 
 buildGoModule rec {
   pname = "hugo";
-  version = "0.58.0";
+  version = "0.58.3";
 
   goPackagePath = "github.com/gohugoio/hugo";
 
   src = fetchFromGitHub {
     owner  = "gohugoio";
-    repo   = "hugo";
+    repo   = pname;
     rev    = "v${version}";
-    sha256 = "0971li0777c1s67w72wl1y0b58ky93dw05hbk3s4kqys0acanc2d";
+    sha256 = "00dhb6xilkwr9yhncpyc6alzqw77ch3vd85dc7lzsmhw1c80n0lc";
   };
 
-  modSha256 = "14ylbh2hx14swcqvawprbx5gynkwyb0nlp5acr4fjy1zl0ifc790";
+  modSha256 = "0d6zc7hxb246zsvwsjz4ds6gdd2m95x6l3djh3mmciwfg9cd7prx";
 
   buildFlags = "-tags extended";
 
-- 
GitLab


From 1392ea854387f7788536f67dc3cd24dd76164973 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6gler?= <christian.koegler@esg.de>
Date: Sun, 29 Sep 2019 13:45:50 +0200
Subject: [PATCH 1428/2254] halide new release 2018/02/15 -> 2019/08/27

---
 pkgs/development/compilers/halide/default.nix |  4 ++--
 pkgs/development/compilers/halide/nix.patch   | 23 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  2 +-
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/compilers/halide/default.nix b/pkgs/development/compilers/halide/default.nix
index 683f8d7ace0..36c1ad0ff90 100644
--- a/pkgs/development/compilers/halide/default.nix
+++ b/pkgs/development/compilers/halide/default.nix
@@ -3,7 +3,7 @@
 }:
 
 let
-  version = "2018_02_15";
+  version = "2019_08_27";
 
 in llvmPackages.stdenv.mkDerivation {
 
@@ -13,7 +13,7 @@ in llvmPackages.stdenv.mkDerivation {
     owner = "halide";
     repo = "Halide";
     rev = "release_${version}";
-    sha256 = "14lmpbxydx7ii0pxds6rgq5vw4i6yfjsq0bai1l5wwpv1rnwmbxd";
+    sha256 = "09xf8v9zyxx2fn6s1yzjkyzcf9zyzrg3x5vivgd2ljzbfhm8wh7n";
   };
 
   patches = [ ./nix.patch ];
diff --git a/pkgs/development/compilers/halide/nix.patch b/pkgs/development/compilers/halide/nix.patch
index 2ab1e31adeb..fb9bbf1a4cf 100644
--- a/pkgs/development/compilers/halide/nix.patch
+++ b/pkgs/development/compilers/halide/nix.patch
@@ -1,11 +1,11 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 40a685b7e..c452efd09 100644
+index 4ba384324..7e23038f7 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -49,10 +49,10 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
-
+@@ -75,10 +75,10 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+ 
  set(LLVM_VERSION "${LLVM_VERSION_MAJOR}${LLVM_VERSION_MINOR}")
-
+ 
 -file(TO_NATIVE_PATH "${LLVM_TOOLS_BINARY_DIR}/llvm-as${CMAKE_EXECUTABLE_SUFFIX}" LLVM_AS)
 -file(TO_NATIVE_PATH "${LLVM_TOOLS_BINARY_DIR}/llvm-nm${CMAKE_EXECUTABLE_SUFFIX}" LLVM_NM)
 -file(TO_NATIVE_PATH "${LLVM_TOOLS_BINARY_DIR}/clang${CMAKE_EXECUTABLE_SUFFIX}" CLANG)
@@ -14,7 +14,7 @@ index 40a685b7e..c452efd09 100644
 +find_program(LLVM_NM llvm-nm HINTS ${LLVM_TOOLS_BINARY_DIR})
 +find_program(CLANG clang HINTS ${LLVM_TOOLS_BINARY_DIR})
 +find_program(LLVM_CONFIG llvm-config HINTS ${LLVM_TOOLS_BINARY_DIR})
-
+ 
  # LLVM doesn't appear to expose --system-libs via its CMake interface,
  # so we must shell out to llvm-config to find this info
 diff --git a/apps/linear_algebra/CMakeLists.txt b/apps/linear_algebra/CMakeLists.txt
@@ -27,7 +27,7 @@ index 132c80e6a..36ce865f2 100644
    set(OpenBLAS_EXTRA_LIBS)
 -  set(BLAS_VENDORS OpenBLAS ATLAS)
 +  set(BLAS_VENDORS OpenBLAS)
-
+ 
    # TODO
    # there are more vendors we could add here that support the cblas interface
 @@ -41,6 +41,7 @@ if (CBLAS_FOUND)
@@ -39,17 +39,18 @@ index 132c80e6a..36ce865f2 100644
      endif()
    endforeach()
 diff --git a/apps/linear_algebra/tests/CMakeLists.txt b/apps/linear_algebra/tests/CMakeLists.txt
-index 4b95eb3bb..1daa97437 100644
+index cc02eb0a4..c20419a0d 100644
 --- a/apps/linear_algebra/tests/CMakeLists.txt
 +++ b/apps/linear_algebra/tests/CMakeLists.txt
-@@ -19,6 +19,6 @@ target_compile_options(test_halide_blas PRIVATE -Wno-unused-variable)
+@@ -19,7 +19,7 @@ target_compile_options(test_halide_blas PRIVATE -Wno-unused-variable)
  target_link_libraries(test_halide_blas
    PRIVATE
     halide_blas
 -   cblas # XXX fragile
 +   ${BLAS_LIBRARIES}
-    Halide
+    ${HALIDE_COMPILER_LIB}
  )
---
-2.15.0
+ 
+-- 
+2.23.0
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 914dd054abf..ea825a547b3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3745,7 +3745,7 @@ in
 
   halibut = callPackage ../tools/typesetting/halibut { };
 
-  halide = callPackage ../development/compilers/halide { llvmPackages=llvmPackages_6; };
+  halide = callPackage ../development/compilers/halide { };
 
   ham = pkgs.perlPackages.ham;
 
-- 
GitLab


From eb8e76d4b6802fe9c19a87e162d7124b86196baa Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 29 Sep 2019 04:51:47 -0700
Subject: [PATCH 1429/2254] yder: 1.4.7 -> 1.4.8

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/yder/versions
---
 pkgs/development/libraries/yder/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/yder/default.nix b/pkgs/development/libraries/yder/default.nix
index 82d2d20cb3e..7025fd2eb1c 100644
--- a/pkgs/development/libraries/yder/default.nix
+++ b/pkgs/development/libraries/yder/default.nix
@@ -4,13 +4,13 @@
 assert withSystemd -> systemd != null;
 stdenv.mkDerivation rec {
   pname = "yder";
-  version = "1.4.7";
+  version = "1.4.8";
 
   src = fetchFromGitHub {
     owner = "babelouest";
     repo = pname;
     rev = "v${version}";
-    sha256 = "19ghiwpi972wjqvlgg576nk2nkf1ii5l1kvzb056496xfmlysrwa";
+    sha256 = "0r3rhcsp182cg0vmx8wwibb415mg2qkx8zrfpb0b97nz30h9hbvd";
   };
 
   patches = [
-- 
GitLab


From f3641ba7212b1af4885b170f3c8b82bb70508394 Mon Sep 17 00:00:00 2001
From: Jake Stanger <mail@jstanger.dev>
Date: Sun, 29 Sep 2019 12:52:17 +0100
Subject: [PATCH 1430/2254] maintainers: add jakestanger

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 82100fe63af..c30475c8eef 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2836,6 +2836,12 @@
     githubId = 820715;
     name = "Jake Logemann";
   };
+  jakestanger = {
+    email = "mail@jstanger.dev";
+    github = "JakeStanger";
+    githubId = 5057870;
+    name = "Jake Stanger";
+  };
   jakewaksbaum = {
     email = "jake.waksbaum@gmail.com";
     github = "jbaum98";
-- 
GitLab


From 114584fe6ffcc35a37fcb7c5fd2ff3d2f098d1cc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 29 Sep 2019 04:56:36 -0700
Subject: [PATCH 1431/2254] xsecurelock: 1.4.0 -> 1.5.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/xsecurelock/versions
---
 pkgs/tools/X11/xsecurelock/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/X11/xsecurelock/default.nix b/pkgs/tools/X11/xsecurelock/default.nix
index 8766e3c0d54..6e6aa1fb60e 100644
--- a/pkgs/tools/X11/xsecurelock/default.nix
+++ b/pkgs/tools/X11/xsecurelock/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "xsecurelock";
-  version = "1.4.0";
+  version = "1.5.1";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "xsecurelock";
     rev = "v${version}";
-    sha256 = "1l9xk3hb5fxp4sqlxjldm4j6cvmxa39a7a37hw8f7vbpmcqy6n6w";
+    sha256 = "1if8byaby18ydkrk4k5yy8n0981x1dfqikq59gfpb7c2rv0vgi7i";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From 0beeafc4a9d70659acf0fb9922dc28638ab8d06d Mon Sep 17 00:00:00 2001
From: Gwendolyn Quasebarth <gwen@quasebarth.de>
Date: Sat, 28 Sep 2019 12:57:15 +0200
Subject: [PATCH 1432/2254] maintainers: add laikq

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 6cb9d07fe93..5d8dd1bdd8e 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3495,6 +3495,11 @@
     githubId = 1362179;
     name = "Kyle Lacy";
   };
+  laikq = {
+    email = "gwen@quasebarth.de";
+    github = "laikq";
+    name = "Gwendolyn Quasebarth";
+  };
   lasandell = {
     email = "lasandell@gmail.com";
     github = "lasandell";
-- 
GitLab


From 3090b90830bbb9e0be39e1e24773b912b781e565 Mon Sep 17 00:00:00 2001
From: Gwendolyn Quasebarth <gwen@quasebarth.de>
Date: Sun, 29 Sep 2019 09:27:04 +0200
Subject: [PATCH 1433/2254] sndpeek: init at 1.4

This version compiles with ALSA, although other modes of compilation could be
imagined.
---
 pkgs/applications/audio/sndpeek/default.nix   | 56 +++++++++++++++++++
 pkgs/applications/audio/sndpeek/pthread.patch | 13 +++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 71 insertions(+)
 create mode 100644 pkgs/applications/audio/sndpeek/default.nix
 create mode 100644 pkgs/applications/audio/sndpeek/pthread.patch

diff --git a/pkgs/applications/audio/sndpeek/default.nix b/pkgs/applications/audio/sndpeek/default.nix
new file mode 100644
index 00000000000..ecdafdaeadd
--- /dev/null
+++ b/pkgs/applications/audio/sndpeek/default.nix
@@ -0,0 +1,56 @@
+{ stdenv, fetchurl, libsndfile, freeglut, alsaLib, mesa, libGLU, libX11, libXmu
+, libXext, libXi }:
+
+stdenv.mkDerivation rec {
+  pname = "sndpeek";
+  version = "1.4";
+
+  src = fetchurl {
+    url = "https://soundlab.cs.princeton.edu/software/sndpeek/files/sndpeek-${version}.tgz";
+    sha256 = "2d86cf74854fa00dcdc05a35dd92bc4cf6115e87102b17023be5cba9ead8eedf";
+  };
+  sourceRoot = "sndpeek-${version}/src/sndpeek";
+
+  # this patch adds -lpthread to the list of libraries, without it a
+  # symbol-not-found-error is thrown
+  patches = [ ./pthread.patch ];
+
+  buildInputs = [
+    freeglut
+    alsaLib
+    mesa
+    libGLU
+    libsndfile
+    libX11
+    libXmu
+    libXext
+    libXi
+  ];
+  buildFlags = "linux-alsa";
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mv sndpeek $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Real-time 3D animated audio display/playback";
+    longDescription = ''
+       sndpeek is just what it sounds (and looks) like:
+         * real-time 3D animated display/playback
+         * can use mic-input or wav/aiff/snd/raw/mat file (with playback)
+         * time-domain waveform
+         * FFT magnitude spectrum
+         * 3D waterfall plot
+         * lissajous! (interchannel correlation)
+         * rotatable and scalable display
+         * freeze frame! (for didactic purposes)
+         * real-time spectral feature extraction (centroid, rms, flux, rolloff)
+         * available on MacOS X, Linux, and Windows under GPL
+         * part of the sndtools distribution.
+    '';
+    homepage = https://soundlab.cs.princeton.edu/software/sndpeek/;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.laikq ];
+  };
+}
diff --git a/pkgs/applications/audio/sndpeek/pthread.patch b/pkgs/applications/audio/sndpeek/pthread.patch
new file mode 100644
index 00000000000..b2f1d37da6b
--- /dev/null
+++ b/pkgs/applications/audio/sndpeek/pthread.patch
@@ -0,0 +1,13 @@
+diff --git a/makefile.alsa b/makefile.alsa
+index 34fb848..cdaeaec 100644
+--- a/makefile.alsa
++++ b/makefile.alsa
+@@ -4,7 +4,7 @@ CPP=g++
+ INCLUDES=-I../marsyas/
+ MARSYAS_DIR=../marsyas/
+ CFLAGS=-D__LINUX_ALSA__ -D__LITTLE_ENDIAN__ $(INCLUDES) -O3 -c
+-LIBS=-L/usr/X11R6/lib -lglut -lGL -lGLU -lasound -lXmu -lX11 -lXext -lXi -lm -lsndfile
++LIBS=-L/usr/X11R6/lib -lglut -lGL -lGLU -lasound -lXmu -lX11 -lXext -lXi -lm -lsndfile -lpthread
+ 
+ OBJS=chuck_fft.o RtAudio.o Thread.o sndpeek.o Stk.o \
+ 	Centroid.o DownSampler.o Flux.o LPC.o MFCC.o RMS.o Rolloff.o \
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 914dd054abf..b87184d3314 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19762,6 +19762,8 @@ in
 
   sidplayfp = callPackage ../applications/audio/sidplayfp { };
 
+  sndpeek = callPackage ../applications/audio/sndpeek { };
+
   sxhkd = callPackage ../applications/window-managers/sxhkd { };
 
   mpop = callPackage ../applications/networking/mpop {
-- 
GitLab


From 722d6577b5f42a7593318fbf730ccbed1d4702e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20M=C3=B6ller?= <fabianm88@gmail.com>
Date: Tue, 17 Sep 2019 14:43:52 +0200
Subject: [PATCH 1434/2254] bullet: fix darwin build

---
 pkgs/development/libraries/bullet/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/bullet/default.nix b/pkgs/development/libraries/bullet/default.nix
index f6041802a9c..1b6c56f13af 100644
--- a/pkgs/development/libraries/bullet/default.nix
+++ b/pkgs/development/libraries/bullet/default.nix
@@ -40,7 +40,8 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=argument-outside-range";
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang
+    "-Wno-error=argument-outside-range -Wno-error=c++11-narrowing";
 
   meta = with stdenv.lib; {
     description = "A professional free 3D Game Multiphysics Library";
-- 
GitLab


From fb41b3d9e6421f79b2f149edd12a31323fd59b0f Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Sun, 29 Sep 2019 05:39:36 -0700
Subject: [PATCH 1435/2254] pythonPackages.shodan: 1.14.0 -> 1.17.0

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

diff --git a/pkgs/development/python-modules/shodan/default.nix b/pkgs/development/python-modules/shodan/default.nix
index 8723a7b940c..ae9f9e42ecf 100644
--- a/pkgs/development/python-modules/shodan/default.nix
+++ b/pkgs/development/python-modules/shodan/default.nix
@@ -4,22 +4,24 @@
 , click-plugins
 , colorama
 , requests
+, setuptools
 , XlsxWriter
 }:
 
 buildPythonPackage rec {
   pname = "shodan";
-  version = "1.14.0";
+  version = "1.17.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0c5x53757p6ihh1f8xqsal2gi9ikcl3464b38qinva51s0kkb58k";
+    sha256 = "1sh7a2dsal3kzcl4s9xbpl7hxhm9k55s5hiqdqqnafhvhnh0vmbz";
   };
 
   propagatedBuildInputs = [
     click-plugins
     colorama
     requests
+    setuptools
     XlsxWriter
   ];
 
-- 
GitLab


From e3f951018a6b8084c1c8bf61695a060f18a8bc04 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 29 Sep 2019 14:47:59 +0200
Subject: [PATCH 1436/2254] esniper: update to latest git revision

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

diff --git a/pkgs/applications/networking/esniper/default.nix b/pkgs/applications/networking/esniper/default.nix
index 2535d0dc31d..9de87ee178d 100644
--- a/pkgs/applications/networking/esniper/default.nix
+++ b/pkgs/applications/networking/esniper/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchgit, openssl, curl, coreutils, gawk, bash, which }:
 
 stdenv.mkDerivation {
-  name = "esniper-2.35.0-15-g91d2665";
+  name = "esniper-2.35.0-18-g4a59da0";
 
   src = fetchgit {
     url    = "https://git.code.sf.net/p/esniper/git";
-    rev    = "91d2665539beaeac21fb4c0cc2fd39c44e771ed7";
-    sha256 = "0dixcsvbcj9jbfjfv50nwvw7w90c4s6gnkrpilaan984i6y45rw0";
+    rev    = "4a59da032aa4536b9e5ea95633247650412511db";
+    sha256 = "0d3vazh5q7wymqahggbb2apl9hgrm037y4s3j91d24hjgk2pzzyd";
   };
 
   buildInputs = [ openssl curl ];
-- 
GitLab


From f08d4f78e4df759e244b96a944285c100218c9e1 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Sun, 29 Sep 2019 05:52:08 -0700
Subject: [PATCH 1437/2254] pythonPackages.supervisor: 3.3.5 -> 4.0.4

---
 .../python-modules/supervisor/default.nix       | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/supervisor/default.nix b/pkgs/development/python-modules/supervisor/default.nix
index 4771ba7a89d..e7bbb57cedc 100644
--- a/pkgs/development/python-modules/supervisor/default.nix
+++ b/pkgs/development/python-modules/supervisor/default.nix
@@ -1,27 +1,26 @@
 { lib, buildPythonPackage, isPy3k, fetchPypi
 , mock
 , meld3
+, setuptools
 }:
+
 buildPythonPackage rec {
   pname = "supervisor";
-  version = "3.3.5";
+  version = "4.0.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1w3ahridzbc6rxfpbyx8lij6pjlcgf2ymzyg53llkjqxalp6sk8v";
+    sha256 = "02pindhq84hb9a7ykyaqw8i2iqb21h69lpmclyqh7fm1446rji4n";
   };
 
   checkInputs = [ mock ];
 
-  propagatedBuildInputs = [ meld3 ];
-
-  # Supervisor requires Python 2.4 or later but does not work on any version of Python 3.  You are using version 3.6.5 (default, Mar 28 2018, 10:24:30)
-  disabled = isPy3k;
+  propagatedBuildInputs = [ meld3 setuptools ];
 
-  meta = {
+  meta = with lib; {
     description = "A system for controlling process state under UNIX";
     homepage = http://supervisord.org/;
-    license = lib.licenses.free; # http://www.repoze.org/LICENSE.txt
-    maintainers = with lib.maintainers; [ zimbatm ];
+    license = licenses.free; # http://www.repoze.org/LICENSE.txt
+    maintainers = with maintainers; [ zimbatm ];
   };
 }
-- 
GitLab


From 1fb381844029d0bfd5f3ca85577695c112ce41f1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 29 Sep 2019 15:11:00 +0200
Subject: [PATCH 1438/2254] nixos/tests/ferm: wait for DAD timeout before
 testing

The test has recently been failing due to the IPv6 address
on the server still being in the tentative state, when the
client sends its first request. The server will not start
using the IPv6 address until DAD has completed.

Scripted networking seems not to wait for DAD completion
before completing network-online.target, so let's switch
to networkd instead, which does.
---
 nixos/tests/ferm.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/tests/ferm.nix b/nixos/tests/ferm.nix
index b8e8663e3ad..14c1cd44f5c 100644
--- a/nixos/tests/ferm.nix
+++ b/nixos/tests/ferm.nix
@@ -22,6 +22,7 @@ import ./make-test.nix ({ pkgs, ...} : {
         {
           networking = {
             dhcpcd.enable = false;
+            useNetworkd = true;
             interfaces.eth1.ipv6.addresses = mkOverride 0 [ { address = "fd00::1"; prefixLength = 64; } ];
             interfaces.eth1.ipv4.addresses = mkOverride 0 [ { address = "192.168.1.1"; prefixLength = 24; } ];
           };
-- 
GitLab


From 5254bf354bdd404cc081ebb1ce98462a84d3542a Mon Sep 17 00:00:00 2001
From: "Tristan Helmich (omniIT)" <tristan.helmich@omniit.de>
Date: Sun, 29 Sep 2019 13:52:50 +0000
Subject: [PATCH 1439/2254] pythonPackages.phonenumbers: 8.10.17 -> 8.10.19

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

diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix
index 6d2e8169eb7..f52d61e839b 100644
--- a/pkgs/development/python-modules/phonenumbers/default.nix
+++ b/pkgs/development/python-modules/phonenumbers/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "phonenumbers";
-  version = "8.10.17";
+  version = "8.10.19";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "023rcv3qishd5n33gj22dzgq51kzpk41ckcmim96s1xvdbd2sxg9";
+    sha256 = "0xdj4faxvcmkw1war203yxcb66jhhbgscjyqxjifknr0mxax3ngw";
   };
 
   meta = {
-- 
GitLab


From 23961502e152ccd7407dd8e2d2b20f5e756794e9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 17:34:11 -0700
Subject: [PATCH 1440/2254] ocamlPackages.zarith: 1.8 -> 1.9.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/ocaml4.06.1-zarith/versions
---
 pkgs/development/ocaml-modules/zarith/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/zarith/default.nix b/pkgs/development/ocaml-modules/zarith/default.nix
index cb90c200547..c97078c62ed 100644
--- a/pkgs/development/ocaml-modules/zarith/default.nix
+++ b/pkgs/development/ocaml-modules/zarith/default.nix
@@ -6,9 +6,9 @@
 let source =
   if stdenv.lib.versionAtLeast ocaml.version "4.02"
   then {
-    version = "1.8";
-    url = https://github.com/ocaml/Zarith/archive/release-1.8.tar.gz;
-    sha256 = "1cn63c97aij19nrw5hc1zh1jpnbsdkzq99zyyk649c4s3xi3iqq7";
+    version = "1.9.1";
+    url = https://github.com/ocaml/Zarith/archive/release-1.9.1.tar.gz;
+    sha256 = "0pfa271476dic5pvn6kxz3dfswxs6kqm2cxmhdx5xq2ayca05gj9";
   } else {
     version = "1.3";
     url = http://forge.ocamlcore.org/frs/download.php/1471/zarith-1.3.tgz;
-- 
GitLab


From 64d821d9f4256fbf1215beaed27f30959d4cca39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 29 Sep 2019 15:31:50 +0100
Subject: [PATCH 1441/2254] Revert "busybox: fix musl builds"

This reverts commit 5ba8c04ae51b915a18dabf2cb7d75d8a4611de4d.

Broke non-musl busybox.

fixes: #70007
---
 pkgs/os-specific/linux/busybox/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix
index da9ed304db8..f041d2b5042 100644
--- a/pkgs/os-specific/linux/busybox/default.nix
+++ b/pkgs/os-specific/linux/busybox/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, buildPackages, fetchurl
 , enableStatic ? false
 , enableMinimal ? false
-, useMusl ? stdenv.hostPlatform.libc == "musl"
+, useMusl ? stdenv.hostPlatform.libc == "musl", musl
 , extraConfig ? ""
 }:
 
@@ -88,6 +88,10 @@ stdenv.mkDerivation rec {
     runHook postConfigure
   '';
 
+  postConfigure = lib.optionalString useMusl ''
+    makeFlagsArray+=("CC=${stdenv.cc.targetPrefix}cc -isystem ${musl.dev}/include -B${musl}/lib -L${musl}/lib")
+  '';
+
   depsBuildBuild = [ buildPackages.stdenv.cc ];
 
   buildInputs = lib.optionals (enableStatic && !useMusl && stdenv.cc.libc ? static) [ stdenv.cc.libc stdenv.cc.libc.static ];
-- 
GitLab


From a228951a70ddfbbaf81ceec285393f10acc46d8b Mon Sep 17 00:00:00 2001
From: 0x4A6F <0x4A6F@users.noreply.github.com>
Date: Sun, 29 Sep 2019 14:37:27 +0000
Subject: [PATCH 1442/2254] zola: 0.8.0 -> 0.9.0

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

diff --git a/pkgs/applications/misc/zola/default.nix b/pkgs/applications/misc/zola/default.nix
index 7418640e072..b9231f8f093 100644
--- a/pkgs/applications/misc/zola/default.nix
+++ b/pkgs/applications/misc/zola/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "zola";
-  version = "0.8.0";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "getzola";
     repo = pname;
     rev = "v${version}";
-    sha256 = "166kmlkzd1qyw9yq2jqs58z8b3d956jjhw9r15jzw98md949psr5";
+    sha256 = "0dbj2rkn4k5glnwdazsvjhah5pj9cbdb8hwlvm5q4njsmrgpyaw5";
   };
 
-  cargoSha256 = "1brmlg6nqyls1v62z0fg0km150q9m7h71wy67lidcnw76icmqr24";
+  cargoSha256 = "0i0xqbpbv3md42d2853cfzkhfwlkvxahhz5dldla5x96rm1i2hr8";
 
   nativeBuildInputs = [ cmake pkgconfig ];
   buildInputs = [ openssl ]
-- 
GitLab


From 39769df9dfa63263850e9c4f6f771873b89198b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 29 Sep 2019 16:55:48 +0200
Subject: [PATCH 1443/2254] busybox: flip around logic how musl is determined

---
 pkgs/os-specific/linux/busybox/sandbox-shell.nix | 2 --
 pkgs/top-level/all-packages.nix                  | 7 ++++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/busybox/sandbox-shell.nix b/pkgs/os-specific/linux/busybox/sandbox-shell.nix
index c2d82ebc487..036ea0a0f48 100644
--- a/pkgs/os-specific/linux/busybox/sandbox-shell.nix
+++ b/pkgs/os-specific/linux/busybox/sandbox-shell.nix
@@ -2,8 +2,6 @@
 
 # Minimal shell for use as basic /bin/sh in sandbox builds
 busybox.override {
-  # musl roadmap has RISC-V support projected for 1.1.20
-  useMusl = !stdenv.hostPlatform.isRiscV && stdenv.hostPlatform.libc != "bionic";
   enableStatic = true;
   enableMinimal = true;
   extraConfig = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f992cc9919b..076f8e3415e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15473,7 +15473,12 @@ in
   bridge-utils = callPackage ../os-specific/linux/bridge-utils { };
 
   busybox = callPackage ../os-specific/linux/busybox { };
-  busybox-sandbox-shell = callPackage ../os-specific/linux/busybox/sandbox-shell.nix { };
+  busybox-sandbox-shell = callPackage ../os-specific/linux/busybox/sandbox-shell.nix { 
+    # musl roadmap has RISC-V support projected for 1.1.20
+    busybox = if !stdenv.hostPlatform.isRiscV && stdenv.hostPlatform.libc != "bionic"
+              then pkgsStatic.busybox
+              else busybox; 
+  };
 
   cachefilesd = callPackage ../os-specific/linux/cachefilesd { };
 
-- 
GitLab


From 94560d77ec8efbe9be882cdd8e5a1cc78c3c5ca3 Mon Sep 17 00:00:00 2001
From: Cedric Cellier <rixed@happyleptic.org>
Date: Wed, 27 Mar 2019 18:49:31 +0100
Subject: [PATCH 1444/2254] lacaml: Use propagatedBuildInputs for stublibs

This frees the packages depending on lacaml to have to repeat this.
---
 pkgs/development/ocaml-modules/lacaml/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ocaml-modules/lacaml/default.nix b/pkgs/development/ocaml-modules/lacaml/default.nix
index 4556fb1eb41..4b35ce25fde 100644
--- a/pkgs/development/ocaml-modules/lacaml/default.nix
+++ b/pkgs/development/ocaml-modules/lacaml/default.nix
@@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
     sha256 = "1aflg07cc9ak9mg1cr0qr368c9s141glwlarl5nhalf6hhq7ibcb";
   };
 
-  buildInputs =
-    [ ocaml findlib dune base stdio liblapack blas ] ++
+  buildInputs = [ ocaml findlib dune base stdio ];
+  propagatedBuildInputs = [ liblapack blas ] ++
     stdenv.lib.optionals stdenv.isDarwin
       [ darwin.apple_sdk.frameworks.Accelerate ];
 
-- 
GitLab


From d8dda825a730f384d1dd522c32d529750ab8d604 Mon Sep 17 00:00:00 2001
From: 0x4A6F <0x4A6F@users.noreply.github.com>
Date: Sun, 29 Sep 2019 10:16:38 +0000
Subject: [PATCH 1445/2254] cwm: 0.5.6 -> 0.6.3

(cherry picked from commit 141f41b583b6eb9f620f04d04d6e544381761612)
---
 .../window-managers/cwm/default.nix           | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/window-managers/cwm/default.nix b/pkgs/applications/window-managers/cwm/default.nix
index 1354171dcfa..84df53b8c8d 100644
--- a/pkgs/applications/window-managers/cwm/default.nix
+++ b/pkgs/applications/window-managers/cwm/default.nix
@@ -1,13 +1,15 @@
 { stdenv, fetchFromGitHub, libX11, libXinerama, libXrandr, libXft, yacc, pkgconfig }:
 
-stdenv.mkDerivation {
-  name = "cwm-5.6";
+stdenv.mkDerivation rec {
+
+  pname = "cwm";
+  version = "6.3";
 
   src = fetchFromGitHub {
-      owner = "chneukirchen";
-      repo = "cwm";
-      rev = "b7a8c11750d11721a897fdb8442d52f15e7a24a0";
-      sha256 = "0a0x8rgqif4kxy7hj70hck7jma6c8jy4428ybl8fz9qxgxh014ml";
+    owner = "leahneukirchen";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1m08gd6nscwfx6040zbg2zl89m4g73im68iflzcihd6pdc8rzzs4";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -17,9 +19,9 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "A lightweight and efficient window manager for X11";
-    homepage = https://github.com/chneukirchen/cwm;
-    maintainers = [];
-    license     = licenses.isc;
-    platforms   = platforms.linux;
+    homepage = "https://github.com/leahneukirchen/cwm";
+    maintainers = with maintainers; [ "0x4A6F" ];
+    license = licenses.isc;
+    platforms = platforms.linux;
   };
 }
-- 
GitLab


From 0b0f805882bf7d168540b1a0342517bf941925cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Krzysztof=20Feiler?= <m@mikf.pl>
Date: Sun, 29 Sep 2019 13:56:54 +0200
Subject: [PATCH 1446/2254] cwm: added maintainer "mkf", firstly declaring in
 maintainer-list

(cherry picked from commit 5de195fc681a6d663769c35091ba21962180583d)
(cherry picked from commit 0838eeb0edf0f2e842c3a006de32b27c1bc3dca9)
---
 maintainers/maintainer-list.nix                   | 9 +++++++++
 pkgs/applications/window-managers/cwm/default.nix | 8 ++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 6cb9d07fe93..bf693ad96ce 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4217,6 +4217,15 @@
     githubId = 5698461;
     name = "Maciej Kazulak";
   };
+  mkf = {
+    email = "m@mikf.pl";
+    github = "mkf";
+    name = "Michał Krzysztof Feiler";
+    keys = [{
+      longkeyid = "rsa4096/0xE35C2D7C2C6AC724";
+      fingerprint = "1E36 9940 CC7E 01C4 CFE8  F20A E35C 2D7C 2C6A C724";
+    }];
+  };
   mkg = {
     email = "mkg@vt.edu";
     github = "mkgvt";
diff --git a/pkgs/applications/window-managers/cwm/default.nix b/pkgs/applications/window-managers/cwm/default.nix
index 84df53b8c8d..c109cd5cb68 100644
--- a/pkgs/applications/window-managers/cwm/default.nix
+++ b/pkgs/applications/window-managers/cwm/default.nix
@@ -19,9 +19,9 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A lightweight and efficient window manager for X11";
-    homepage = "https://github.com/leahneukirchen/cwm";
-    maintainers = with maintainers; [ "0x4A6F" ];
-    license = licenses.isc;
-    platforms = platforms.linux;
+    homepage    = "https://github.com/leahneukirchen/cwm";
+    maintainers = with maintainers; [ "0x4A6F" mkf ];
+    license     = licenses.isc;
+    platforms   = platforms.linux;
   };
 }
-- 
GitLab


From 9717d35312889f41dab55069548a08ef7bb326f8 Mon Sep 17 00:00:00 2001
From: Even Brenden <evenbrenden@gmail.com>
Date: Sun, 29 Sep 2019 18:21:51 +0200
Subject: [PATCH 1447/2254] jotta-cli: init at 0.6.18626 (#69326)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reviewed-by: Tor Hedin Brønner <torhedinbronner@gmail.com>
---
 maintainers/maintainer-list.nix              |  6 ++++
 pkgs/applications/misc/jotta-cli/default.nix | 35 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 3 files changed, 43 insertions(+)
 create mode 100644 pkgs/applications/misc/jotta-cli/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 5d8dd1bdd8e..5f4912daa68 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2077,6 +2077,12 @@
     githubId = 195032;
     name = "Eric Evenchick";
   };
+  evenbrenden = {
+    email = "evenbrenden@gmail.com";
+    github = "evenbrenden";
+    githubId = 2512008;
+    name = "Even Brenden";
+  };
   exfalso = {
     email = "0slemi0@gmail.com";
     github = "exfalso";
diff --git a/pkgs/applications/misc/jotta-cli/default.nix b/pkgs/applications/misc/jotta-cli/default.nix
new file mode 100644
index 00000000000..a5196811a6a
--- /dev/null
+++ b/pkgs/applications/misc/jotta-cli/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchzip }:
+
+let
+  arch = "amd64";
+in
+stdenv.mkDerivation rec {
+  pname = "jotta-cli";
+  version = "0.6.18626";
+  src =
+    fetchzip {
+      url = "https://repo.jotta.us/archives/linux/${arch}/jotta-cli-${version}_linux_${arch}.tar.gz";
+      sha256 = "0v9bw0f2mcvmzp7v8gs6q4p1q54rflqnbjv5sw7h1kyfwznmflzj";
+      stripRoot = false;
+    };
+
+  installPhase = ''
+    install -D usr/bin/jotta-cli usr/bin/jottad -t $out/bin/
+    mkdir -p $out/share/bash-completion/completions
+  '';
+
+  postFixup = ''
+    patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $out/bin/jotta-cli
+    patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $out/bin/jottad
+    $out/bin/jotta-cli completion > $out/share/bash-completion/completions/jotta-cli.bash
+  '';
+
+  meta = with stdenv.lib; {
+    description  = "Jottacloud CLI";
+    homepage     = https://www.jottacloud.com/;
+    downloadPage = https://repo.jotta.us/archives/linux/;
+    maintainers  = with maintainers; [ evenbrenden ];
+    license      = licenses.unfree;
+    platforms    = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 076f8e3415e..6e394eb8b4e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1765,6 +1765,8 @@ in
 
   jellyfin = callPackage ../servers/jellyfin { };
 
+  jotta-cli = callPackage ../applications/misc/jotta-cli { };
+
   kapacitor = callPackage ../servers/monitoring/kapacitor { };
 
   kisslicer = callPackage ../tools/misc/kisslicer { };
-- 
GitLab


From 5ea4c9184bc041707483803595a9c767181b6018 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 29 Sep 2019 18:43:32 +0200
Subject: [PATCH 1448/2254] busybox: remove the missing diff

---
 pkgs/os-specific/linux/busybox/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix
index f041d2b5042..087209a9d29 100644
--- a/pkgs/os-specific/linux/busybox/default.nix
+++ b/pkgs/os-specific/linux/busybox/default.nix
@@ -88,10 +88,6 @@ stdenv.mkDerivation rec {
     runHook postConfigure
   '';
 
-  postConfigure = lib.optionalString useMusl ''
-    makeFlagsArray+=("CC=${stdenv.cc.targetPrefix}cc -isystem ${musl.dev}/include -B${musl}/lib -L${musl}/lib")
-  '';
-
   depsBuildBuild = [ buildPackages.stdenv.cc ];
 
   buildInputs = lib.optionals (enableStatic && !useMusl && stdenv.cc.libc ? static) [ stdenv.cc.libc stdenv.cc.libc.static ];
-- 
GitLab


From 887cf78b0e014a9f38f586d0a50d53d82615abf3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 29 Sep 2019 04:13:03 -0700
Subject: [PATCH 1449/2254] wireshark: 3.0.3 -> 3.0.5

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/wireshark-qt/versions
---
 pkgs/applications/networking/sniffers/wireshark/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index aa965a0c868..ef1e07ca976 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -10,7 +10,7 @@ assert withQt  -> qt5  != null;
 with stdenv.lib;
 
 let
-  version = "3.0.3";
+  version = "3.0.5";
   variant = if withQt then "qt" else "cli";
 
 in stdenv.mkDerivation {
@@ -20,7 +20,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz";
-    sha256 = "0711jilp9sbgi46d105m3galw8n4wk5yncawi08031qxg2f754mg";
+    sha256 = "087qv7nd7zlbckvcs37fkkg7v0mw0hjd5yfbghqym764fpjgqlf5";
   };
 
   cmakeFlags = [
-- 
GitLab


From 0e60d8641ea390d54f46e426efba439cc34b61c0 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 29 Sep 2019 12:27:36 -0500
Subject: [PATCH 1450/2254] libkscreen: Broken with Qt < 5.12.0

---
 pkgs/desktops/plasma-5/libkscreen/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/plasma-5/libkscreen/default.nix b/pkgs/desktops/plasma-5/libkscreen/default.nix
index 5625aa656ce..cf9d7084401 100644
--- a/pkgs/desktops/plasma-5/libkscreen/default.nix
+++ b/pkgs/desktops/plasma-5/libkscreen/default.nix
@@ -1,11 +1,14 @@
 {
   mkDerivation, lib, copyPathsToStore, propagate,
   extra-cmake-modules,
-  kwayland, libXrandr, qtx11extras
+  kwayland, libXrandr, qtbase, qtx11extras
 }:
 
 mkDerivation {
   name = "libkscreen";
+  meta = {
+    broken = builtins.compareVersions qtbase.version "5.12.0" < 0;
+  };
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ kwayland libXrandr qtx11extras ];
   outputs = [ "out" "dev" ];
-- 
GitLab


From 9a678e664e0b29619c0e2340c8ca04d110653926 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 29 Sep 2019 12:27:57 -0500
Subject: [PATCH 1451/2254] kdecoration: Broken with Qt < 5.12.0

---
 pkgs/desktops/plasma-5/kdecoration.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/desktops/plasma-5/kdecoration.nix b/pkgs/desktops/plasma-5/kdecoration.nix
index 569da3c7034..72bfd1b4bca 100644
--- a/pkgs/desktops/plasma-5/kdecoration.nix
+++ b/pkgs/desktops/plasma-5/kdecoration.nix
@@ -2,6 +2,9 @@
 
 mkDerivation {
   name = "kdecoration";
+  meta = {
+    broken = builtins.compareVersions qtbase.version "5.12.0" < 0;
+  };
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ qtbase ki18n ];
   outputs = [ "out" "dev" ];
-- 
GitLab


From e9bf955fd6d5ffda218878ba561c93c6a28dfe8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6gler?= <christian.koegler@esg.de>
Date: Sun, 29 Sep 2019 19:57:19 +0200
Subject: [PATCH 1452/2254] make-disk-image: replace nixos-install by nix-env
 calls

nixos-install can only be called from a machine
---
 nixos/lib/make-disk-image.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix
index 5e86ea479d5..de4aacf2319 100644
--- a/nixos/lib/make-disk-image.nix
+++ b/nixos/lib/make-disk-image.nix
@@ -180,9 +180,17 @@ let format' = format; in let
     export NIX_STATE_DIR=$TMPDIR/state
     nix-store --load-db < ${closureInfo}/registration
 
-    echo "running nixos-install..."
-    nixos-install --root $root --no-bootloader --no-root-passwd \
-      --system ${config.system.build.toplevel} --channel ${channelSources} --substituters ""
+    mkdir -m 0755 -p "$root/etc"
+    touch "$root/etc/NIXOS"
+
+    echo "copying system..."
+    nix-env --store "$root" --substituters "auto?trusted=1" \
+        -p "$root/nix/var/nix/profiles/system" --set "${config.system.build.toplevel}" --quiet
+
+    echo "copying channel..."
+    mkdir -p "$root/nix/var/nix/profiles/per-user/root"
+    nix-env --store "$root" --substituters "auto?trusted=1" \
+        -p "$root/nix/var/nix/profiles/per-user/root/channels" --set "${channelSources}" --quiet
 
     echo "copying staging root to image..."
     cptofs -p ${optionalString (partitionTableType != "none") "-P ${rootPartition}"} -t ${fsType} -i $diskImage $root/* /
-- 
GitLab


From 27a335c963ee316dd07976ab9edeca44688c4228 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sun, 29 Sep 2019 20:46:13 +0200
Subject: [PATCH 1453/2254] tdesktop: 1.8.8 -> 1.8.9

---
 .../instant-messengers/telegram/tdesktop/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 26b858aa3b8..9319d8b0f5b 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -8,7 +8,7 @@ with lib;
 
 mkDerivation rec {
   pname = "telegram-desktop";
-  version = "1.8.8";
+  version = "1.8.9";
   # Note: Due to our strong dependency on the Arch patches it's probably best
   # to also wait for the Arch update (especially if the patches don't apply).
 
@@ -17,7 +17,7 @@ mkDerivation rec {
     owner = "telegramdesktop";
     repo = "tdesktop";
     rev = "v${version}";
-    sha256 = "1aj1pnzc6bz8jbdrfwdj2r54jhw9z7b5fd1095r007zmlnzs51lv";
+    sha256 = "0b1c903ah3fhxr9qjg23p8x9k895k3cxkzz5ckcr7r4pmmbnnvkp";
     fetchSubmodules = true;
   };
 
-- 
GitLab


From e84cea5761e695c8d747b9b9bc6373c76369e070 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@gmail.com>
Date: Sun, 29 Sep 2019 22:22:20 +0300
Subject: [PATCH 1454/2254] gpxsee: 7.13 -> 7.14

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

diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix
index 4b2ed9af24e..4a7cafb0b15 100644
--- a/pkgs/applications/misc/gpxsee/default.nix
+++ b/pkgs/applications/misc/gpxsee/default.nix
@@ -2,13 +2,13 @@
 
 mkDerivation rec {
   pname = "gpxsee";
-  version = "7.13";
+  version = "7.14";
 
   src = fetchFromGitHub {
     owner = "tumic0";
     repo = "GPXSee";
     rev = version;
-    sha256 = "08cg5k4ffj2wrcm4rk7vyixbyyz0424276fw2fn8lmziklkdqyjw";
+    sha256 = "13lxjbc54mw2d5jn0q61wjzm0hk2f6vmbvw11n7z8p62n8q30nvb";
   };
 
   nativeBuildInputs = [ qmake ];
-- 
GitLab


From a3e33b69bac863837e63dfeac5fcd25f34c47ef1 Mon Sep 17 00:00:00 2001
From: Simon Chatterjee <code@chatts.net>
Date: Mon, 9 Sep 2019 19:15:41 +0100
Subject: [PATCH 1455/2254] pythonPackages.uvicorn: fix propagated LICENSE.md

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

diff --git a/pkgs/development/python-modules/uvicorn/default.nix b/pkgs/development/python-modules/uvicorn/default.nix
index 9f7efef1e84..a525846be76 100644
--- a/pkgs/development/python-modules/uvicorn/default.nix
+++ b/pkgs/development/python-modules/uvicorn/default.nix
@@ -43,6 +43,12 @@ buildPythonPackage rec {
     pytest
   '';
 
+  # LICENCE.md gets propagated without this, causing collisions
+  # see https://github.com/encode/uvicorn/issues/392
+  postInstall = ''
+    rm $out/LICENSE.md
+  '';
+
   meta = with lib; {
     homepage = https://www.uvicorn.org/;
     description = "The lightning-fast ASGI server";
-- 
GitLab


From 8b263a4530e1af5c46222f33a16c6e9d3764f21b Mon Sep 17 00:00:00 2001
From: Simon Chatterjee <code@chatts.net>
Date: Sun, 8 Sep 2019 20:10:03 +0100
Subject: [PATCH 1456/2254] pythonPackages.sanic: 19.3.1 -> 19.6.3

The new version depend on two packages that are not currently in nixpkgs, and
marked as already deprecated by their author. So just include them locally. Also,
adapt to the fact that the version of websockets in nixpkgs is 8.x, when sanic
wants 7.x.
---
 .../python-modules/sanic/default.nix          | 79 ++++++++++++++++++-
 1 file changed, 75 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix
index 6aae4c11fdd..5c1e0e81246 100644
--- a/pkgs/development/python-modules/sanic/default.nix
+++ b/pkgs/development/python-modules/sanic/default.nix
@@ -15,15 +15,76 @@
 , pytest-sanic
 , pytest-sugar
 , pytest-benchmark
+
+# required just httpcore / requests-async
+, h11
+, h2
+, certifi
+, chardet
+, idna
+, requests
+, rfc3986
+, uvicorn
 }:
 
+let
+
+  # This version of sanic depends on two packages that have been deprecated by
+  # their development teams:
+  #
+  # - requests-async [where first line of pypi says to use `http3` instead now]
+  # - httpcore       [where the homepage redirects to `http3` now]
+  #
+  # Since no other packages in nixpkg depend on these right now, define these
+  # packages just as local dependencies here, to avoid bloat.
+
+  httpcore = buildPythonPackage rec {
+    pname = "httpcore";
+    version = "0.3.0";
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "0n3bamaixxhcm27gf1ws3g6rkamvqx87087c88r6hyyl52si1ycn";
+    };
+
+    propagatedBuildInputs = [ certifi chardet h11 h2 idna rfc3986 ];
+
+    # relax pinned old version of h11
+    postConfigure = ''
+      substituteInPlace setup.py \
+        --replace "h11==0.8.*" "h11"
+      '';
+
+    # LICENCE.md gets propagated without this, causing collisions
+    postInstall = ''
+      rm $out/LICENSE.md
+    '';
+  };
+
+  requests-async = buildPythonPackage rec {
+    pname = "requests-async";
+    version = "0.5.0";
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "8731420451383196ecf2fd96082bfc8ae5103ada90aba185888499d7784dde6f";
+    };
+
+    propagatedBuildInputs = [ requests httpcore ];
+
+    # LICENCE.md gets propagated without this, causing collisions
+    postInstall = ''
+      rm $out/LICENSE.md
+    '';
+  };
+
+in
+
 buildPythonPackage rec {
   pname = "sanic";
-  version = "19.3.1";
+  version = "19.6.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ce434eb154872ca64493a6c3a288f11fd10bca0de7be7bf9f1d0d063185e51ec";
+    sha256 = "0b1qqsvdjkibrw5kgr0pm7n7jzb1403132wjmb0lx3k5wyvqfi95";
   };
 
   propagatedBuildInputs = [
@@ -31,6 +92,7 @@ buildPythonPackage rec {
     aiofiles
     websockets
     multidict
+    requests-async
     uvloop
     ujson
   ];
@@ -44,11 +106,20 @@ buildPythonPackage rec {
     pytest-sanic
     pytest-sugar
     pytest-benchmark
+    uvicorn
   ];
 
+  # Sanic says it needs websockets 7.x, but the changelog for 8.x is actually
+  # nearly compatible with sanic's use. So relax this constraint, with a small
+  # required code change.
   postConfigure = ''
-    substituteInPlace setup.py \
-      --replace "websockets>=6.0,<7.0" "websockets"
+    substituteInPlace setup.py --replace \
+      "websockets>=7.0,<8.0"             \
+      "websockets>=7.0,<9.0"
+    substituteInPlace sanic/websocket.py --replace    \
+           "self.websocket.subprotocol = subprotocol" \
+           "self.websocket.subprotocol = subprotocol
+            self.websocket.is_client = False"
   '';
 
   # 10/500 tests ignored due to missing directory and
-- 
GitLab


From 1cb9d4d85bd9f23aff05f60adda7280e7bd05c9c Mon Sep 17 00:00:00 2001
From: Simon Chatterjee <code@chatts.net>
Date: Wed, 11 Sep 2019 20:39:28 +0100
Subject: [PATCH 1457/2254] pythonPackages.datasette: 0.28 -> 0.29.3

Patch donated by @wd51, and removes sanic dependency.
---
 .../python-modules/datasette/default.nix        | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/datasette/default.nix b/pkgs/development/python-modules/datasette/default.nix
index 48de7e86b92..828976f0e9f 100644
--- a/pkgs/development/python-modules/datasette/default.nix
+++ b/pkgs/development/python-modules/datasette/default.nix
@@ -3,7 +3,6 @@
 , fetchFromGitHub
 , click
 , click-default-group
-, sanic
 , jinja2
 , hupper
 , pint
@@ -14,17 +13,20 @@
 , black
 , aiohttp
 , beautifulsoup4
+, uvicorn
+, asgiref
+, aiofiles
 }:
 
 buildPythonPackage rec {
   pname = "datasette";
-  version = "0.28";
+  version = "0.29.3";
 
   src = fetchFromGitHub {
     owner = "simonw";
     repo = "datasette";
     rev = version;
-    sha256 = "1m2s03gyq0ghjc3s0b5snpinisddywpgii2f0zqa3v4ljmzanx7h";
+    sha256 = "0cib7pd4z240ncck0pskzvizblhwkr42fsjpd719wdxy4scs7yqa";
   };
 
   buildInputs = [ pytestrunner ];
@@ -32,11 +34,12 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     click
     click-default-group
-    sanic
     jinja2
     hupper
     pint
     pluggy
+    uvicorn
+    aiofiles
   ];
 
   checkInputs = [
@@ -45,6 +48,7 @@ buildPythonPackage rec {
     aiohttp
     beautifulsoup4
     black
+    asgiref
   ];
 
   postConfigure = ''
@@ -52,8 +56,9 @@ buildPythonPackage rec {
       --replace "click-default-group==1.2" "click-default-group" \
       --replace "Sanic==0.7.0" "Sanic" \
       --replace "hupper==1.0" "hupper" \
-      --replace "pint==0.8.1" "pint" \
-      --replace "Jinja2==2.10.1" "Jinja2"
+      --replace "pint~=0.8.1" "pint" \
+      --replace "Jinja2==2.10.1" "Jinja2" \
+      --replace "uvicorn~=0.8.4" "uvicorn"
   '';
 
   # many tests require network access
-- 
GitLab


From ee96f91d2c28e177c6af7307aff5f6ed2be15f13 Mon Sep 17 00:00:00 2001
From: Simon Chatterjee <code@chatts.net>
Date: Sun, 29 Sep 2019 21:00:32 +0100
Subject: [PATCH 1458/2254] pythonPackages.websocket: disable failing tests on
 darwin

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

diff --git a/pkgs/development/python-modules/websockets/default.nix b/pkgs/development/python-modules/websockets/default.nix
index 589a8089fca..9202d02ad5b 100644
--- a/pkgs/development/python-modules/websockets/default.nix
+++ b/pkgs/development/python-modules/websockets/default.nix
@@ -3,6 +3,7 @@
 , buildPythonPackage
 , pythonOlder
 , pytest
+, stdenv
 }:
 
 buildPythonPackage rec {
@@ -18,6 +19,9 @@ buildPythonPackage rec {
 
   disabled = pythonOlder "3.3";
 
+  # Tests fail on Darwin with `OSError: AF_UNIX path too long`
+  doCheck = !stdenv.isDarwin;
+
   meta = with lib; {
     description = "WebSocket implementation in Python 3";
     homepage = "https://github.com/aaugustin/websockets";
-- 
GitLab


From 88af3a6c21c93988548b5933552200898caff830 Mon Sep 17 00:00:00 2001
From: markuskowa <markus.kowalewski@gmail.com>
Date: Sun, 29 Sep 2019 22:21:57 +0200
Subject: [PATCH 1459/2254] Revert "qradiolink: 0.5.0 -> 0.5.2"

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

diff --git a/pkgs/applications/radio/qradiolink/default.nix b/pkgs/applications/radio/qradiolink/default.nix
index 4a185667944..a00ec6c47eb 100644
--- a/pkgs/applications/radio/qradiolink/default.nix
+++ b/pkgs/applications/radio/qradiolink/default.nix
@@ -5,7 +5,7 @@
 } :
 
 let
-  version = "0.5.2";
+  version = "0.5.0";
 
 in stdenv.mkDerivation {
   pname = "qradiolink";
@@ -15,7 +15,7 @@ in stdenv.mkDerivation {
     owner = "kantooon";
     repo = "qradiolink";
     rev = version;
-    sha256 = "0djhrr96b8sr2vi6hwbzgzlp9771622dp93f0rsphsyxlwbzsrgl";
+    sha256 = "0xhg5zhjznmls5m3rhpk1qx0dipxmca12s85w15d0i7qwva2f1gi";
   };
 
   preBuild = ''
-- 
GitLab


From 096f03e414b72ac0ace5683c940c5a8ad92c20ea Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 29 Sep 2019 23:24:07 +0200
Subject: [PATCH 1460/2254] phpPackages.phpcbf: 3.4.2 -> 3.5.0

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

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index ff5be8399b2..b215a4c1986 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -338,12 +338,12 @@ let
   };
 
   phpcbf = mkDerivation rec {
-    version = "3.4.2";
+    version = "3.5.0";
     pname = "phpcbf";
 
     src = pkgs.fetchurl {
       url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcbf.phar";
-      sha256 = "08s47r8i5dyjivk1q3nhrz40n6fx3zghrn5irsxfnx5nj9pb7ffp";
+      sha256 = "15n3r3sc62ar1kq38idw22y7gasvy747bix99zs0l0paapcbxz6n";
     };
 
     phases = [ "installPhase" ];
-- 
GitLab


From d9a7c5101646a5e33c92173adc6b1d4b76b5ded4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Krzysztof=20Feiler?= <m@mikf.pl>
Date: Sun, 29 Sep 2019 23:26:08 +0200
Subject: [PATCH 1461/2254] nixos/cwm: init

Added windowManager cwm, basing on the module for dwm.
---
 .../services/x11/window-managers/cwm.nix      | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 nixos/modules/services/x11/window-managers/cwm.nix

diff --git a/nixos/modules/services/x11/window-managers/cwm.nix b/nixos/modules/services/x11/window-managers/cwm.nix
new file mode 100644
index 00000000000..03375a226bb
--- /dev/null
+++ b/nixos/modules/services/x11/window-managers/cwm.nix
@@ -0,0 +1,23 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.xserver.windowManager.cwm;
+in
+{
+  options = {
+    services.xserver.windowManager.cwm.enable = mkEnableOption "cwm";
+  };
+  config = mkIf cfg.enable {
+    services.xserver.windowManager.session = singleton
+      { name = "cwm";
+        start =
+          ''
+            cwm &
+            waitPID=$!
+          '';
+      };
+    environment.systemPackages = [ pkgs.cwm ];
+  };
+}
-- 
GitLab


From 499deedb8659a16125d905909384b54f69d41acd Mon Sep 17 00:00:00 2001
From: Jake Stanger <mail@jstanger.dev>
Date: Sun, 29 Sep 2019 12:52:17 +0100
Subject: [PATCH 1462/2254] rofi-mpd: init at 1.1.0

---
 pkgs/applications/audio/rofi-mpd/default.nix | 26 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/applications/audio/rofi-mpd/default.nix

diff --git a/pkgs/applications/audio/rofi-mpd/default.nix b/pkgs/applications/audio/rofi-mpd/default.nix
new file mode 100644
index 00000000000..9def4a292f6
--- /dev/null
+++ b/pkgs/applications/audio/rofi-mpd/default.nix
@@ -0,0 +1,26 @@
+{ lib, python3Packages, fetchFromGitHub }:
+
+python3Packages.buildPythonApplication rec {
+  pname = "rofi-mpd";
+  version = "1.1.0";
+
+  src = fetchFromGitHub {
+    owner = "JakeStanger";
+    repo = "Rofi_MPD";
+    rev = "v${version}";
+    sha256 = "0pdra1idgas3yl9z9v7b002igwg2c1mv0yw2ffb8rsbx88x4gbai";
+  };
+
+  propagatedBuildInputs = with python3Packages; [ mutagen mpd2 ];
+
+  # upstream doesn't contain a test suite
+  doCheck = false;
+
+  meta = with lib; {
+    description = "A rofi menu for interacting with MPD written in Python";
+    homepage = "https://github.com/JakeStanger/Rofi_MPD";
+    license = licenses.mit;
+    maintainers = with maintainers; [ jakestanger ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f32a817376a..b17659793c9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19517,6 +19517,8 @@ in
 
   ncmpcpp = callPackage ../applications/audio/ncmpcpp { };
 
+  rofi-mpd = callPackage ../applications/audio/rofi-mpd { };
+
   ympd = callPackage ../applications/audio/ympd { };
 
   nload = callPackage ../applications/networking/nload { };
-- 
GitLab


From e00ce8c983c71f554eac2a755206bb4651ed6bba Mon Sep 17 00:00:00 2001
From: Christine Koppelt <cko@users.noreply.github.com>
Date: Sun, 29 Sep 2019 23:59:13 +0200
Subject: [PATCH 1463/2254] addressing remarks from @peterhoeg ( thinkfan:
 0.9.3 -> 1.0.2)

---
 pkgs/tools/system/thinkfan/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/tools/system/thinkfan/default.nix b/pkgs/tools/system/thinkfan/default.nix
index e0a061a45b8..f3b4ab8440e 100644
--- a/pkgs/tools/system/thinkfan/default.nix
+++ b/pkgs/tools/system/thinkfan/default.nix
@@ -22,12 +22,16 @@ stdenv.mkDerivation rec {
   buildInputs = [ libyamlcpp ] ++ stdenv.lib.optional smartSupport libatasmart;
 
   installPhase = ''
+    runHook preInstall
+
     install -Dm755 {.,$out/bin}/thinkfan
 
     cd "$NIX_BUILD_TOP"; cd "$sourceRoot" # attempt to be a bit robust
     install -Dm644 {.,$out/share/doc/thinkfan}/README
     cp -R examples $out/share/doc/thinkfan
     install -Dm644 {src,$out/share/man/man1}/thinkfan.1
+
+    runHook postInstall
   '';
 
   meta = with stdenv.lib; {
-- 
GitLab


From 9ddfe6f6787e0aa6632b0db7ae7f8e05c809eb17 Mon Sep 17 00:00:00 2001
From: Lily Ballard <lily@sb.org>
Date: Sun, 29 Sep 2019 16:37:01 -0700
Subject: [PATCH 1464/2254] ffsend: 0.2.51 -> 0.2.52

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

diff --git a/pkgs/tools/misc/ffsend/default.nix b/pkgs/tools/misc/ffsend/default.nix
index 31642000806..511b4fb1c36 100644
--- a/pkgs/tools/misc/ffsend/default.nix
+++ b/pkgs/tools/misc/ffsend/default.nix
@@ -16,16 +16,16 @@ with rustPlatform;
 
 buildRustPackage rec {
   pname = "ffsend";
-  version = "0.2.51";
+  version = "0.2.52";
 
   src = fetchFromGitLab {
     owner = "timvisee";
     repo = "ffsend";
     rev = "v${version}";
-    sha256 = "1ckzgzbv2fh5y7c5r0b9n6y2migmsrnlwdg7dybr0c82s39swr7f";
+    sha256 = "0bz0pgv7vdcha6sx2csx3mhkj4ph90w32p7h1wjvcgg3wlk1cgsf";
   };
 
-  cargoSha256 = "1x4hxar60lwimldpsi0frdlssgsb72qahn3dmb980sj6cmbq3f0b";
+  cargoSha256 = "01sgk4101ad0zk1k8zz89fsk2iq6j2vr8xd0wi6h88g2lgxvffzf";
 
   nativeBuildInputs = [ cmake pkgconfig installShellFiles ];
   buildInputs = [ openssl ]
-- 
GitLab


From 737014b8839e9a081e5404a205ed79f7fa01558f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 30 Sep 2019 02:30:49 +0200
Subject: [PATCH 1465/2254] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.15.0 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/fd0a3e82ed9baf9ccd250ad6c1c8bccd950ac9f4.
---
 .../haskell-modules/hackage-packages.nix      | 244 ++++++++++++++----
 1 file changed, 198 insertions(+), 46 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 980401b9c59..88ce4f77c55 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -31638,6 +31638,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "asn1-encoding_0_9_6" = callPackage
+    ({ mkDerivation, asn1-types, base, bytestring, hourglass, mtl
+     , tasty, tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "asn1-encoding";
+       version = "0.9.6";
+       sha256 = "02nsr30h5yic1mk7znf0q4z3n560ip017n60hg7ya25rsfmxxy6r";
+       libraryHaskellDepends = [ asn1-types base bytestring hourglass ];
+       testHaskellDepends = [
+         asn1-types base bytestring hourglass mtl tasty tasty-quickcheck
+       ];
+       description = "ASN1 data reader and writer in RAW, BER and DER forms";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "asn1-parse" = callPackage
     ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring }:
      mkDerivation {
@@ -31651,6 +31668,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "asn1-parse_0_9_5" = callPackage
+    ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring }:
+     mkDerivation {
+       pname = "asn1-parse";
+       version = "0.9.5";
+       sha256 = "17pk8y3nwv9b9i5j15qlmwi7fmq9ab2z4kfpjk2rvcrh9lsf27wg";
+       libraryHaskellDepends = [
+         asn1-encoding asn1-types base bytestring
+       ];
+       description = "Simple monadic parser for ASN1 stream types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "asn1-types" = callPackage
     ({ mkDerivation, base, bytestring, hourglass, memory }:
      mkDerivation {
@@ -36674,8 +36705,8 @@ self: {
     ({ mkDerivation, base, dunai, MonadRandom, mtl, transformers }:
      mkDerivation {
        pname = "bearriver";
-       version = "0.10.4.4";
-       sha256 = "14aqp6jqca5b4z0bf5q18pq5l9q43bzz18zjwn3j0ns1fakrq5bb";
+       version = "0.10.4.6";
+       sha256 = "1m038d6brzp2h2fbwmxvwazm9d59sf5r2nlnw2csmdkck11zzw3j";
        libraryHaskellDepends = [
          base dunai MonadRandom mtl transformers
        ];
@@ -43737,6 +43768,8 @@ self: {
        pname = "butcher";
        version = "1.3.2.3";
        sha256 = "0lpicayq9k59m2ydz989xsypr653xwhp6mmhlp7nmjzk6jwpq5q5";
+       revision = "1";
+       editedCabalFile = "06vy9018ia6sncgxdmv4ili2krkqn1b6r7xz4raa18kdvgnl100v";
        libraryHaskellDepends = [
          base bifunctors containers deque extra free microlens microlens-th
          mtl multistate pretty transformers unsafe void
@@ -46720,14 +46753,14 @@ self: {
      }) {};
 
   "can-i-haz" = callPackage
-    ({ mkDerivation, base, deepseq, hspec, should-not-typecheck }:
+    ({ mkDerivation, base, deepseq, hspec, HUnit }:
      mkDerivation {
        pname = "can-i-haz";
-       version = "0.1.0.1";
-       sha256 = "1nay2hrvf8cxazsy5ha3affwxayirznjf0zlir0n7vbyl5w92im0";
+       version = "0.2.0.0";
+       sha256 = "1sf42vxaqk10kxspib6lzdvs4hjmgyq61gbqp5l59vq7qxfz43ar";
        libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base deepseq hspec should-not-typecheck ];
-       description = "Generic implementation of the Has pattern";
+       testHaskellDepends = [ base deepseq hspec HUnit ];
+       description = "Generic implementation of the Has and CoHas patterns";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -64507,6 +64540,8 @@ self: {
        pname = "data-tree-print";
        version = "0.1.0.2";
        sha256 = "00jh37anim8qsn553467gmfhajcz1c61zrgh1ypkqsll0gc29vy3";
+       revision = "1";
+       editedCabalFile = "1r6dnvc7d50q5p9fdqqwfvi7kwn7r89319plj7v284sjai9b6ld4";
        libraryHaskellDepends = [ base pretty syb ];
        description = "Print Data instances as a nested tree";
        license = stdenv.lib.licenses.bsd3;
@@ -73415,6 +73450,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "dunai_0_5_2_1" = callPackage
+    ({ mkDerivation, base, MonadRandom, transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "dunai";
+       version = "0.5.2.1";
+       sha256 = "18ccvjmr03v4fghlv2hcb3g4c9zrq0ccasr2i9r71dp07mhrpaba";
+       libraryHaskellDepends = [
+         base MonadRandom transformers transformers-base
+       ];
+       description = "Generalised reactive framework supporting classic, arrowized and monadic FRP";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "dunai-core" = callPackage
     ({ mkDerivation, base, MonadRandom, transformers, transformers-base
      }:
@@ -105629,6 +105679,22 @@ self: {
        broken = true;
      }) {};
 
+  "hakyll-typescript" = callPackage
+    ({ mkDerivation, base, bytestring, directory, hakyll, hjsmin, tasty
+     , tasty-hunit, typed-process
+     }:
+     mkDerivation {
+       pname = "hakyll-typescript";
+       version = "0.0.1.0";
+       sha256 = "1vhkhbmy0pflcnzfhb9gck436rr5wr6hfpcb3sz8r27l1fml26ji";
+       libraryHaskellDepends = [
+         base bytestring hakyll hjsmin typed-process
+       ];
+       testHaskellDepends = [ base directory hakyll tasty tasty-hunit ];
+       description = "Typescript and javascript hakyll compilers";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hal" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, envy
      , exceptions, http-conduit, http-types, mtl, text, time
@@ -117579,6 +117645,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hint_0_9_0_2" = callPackage
+    ({ mkDerivation, base, containers, directory, exceptions
+     , extensible-exceptions, filepath, ghc, ghc-boot, ghc-paths, HUnit
+     , mtl, random, temporary, unix
+     }:
+     mkDerivation {
+       pname = "hint";
+       version = "0.9.0.2";
+       sha256 = "06xnlfpf9h7i4fvm3p69accm18h7hblh7173040vlk5qvjywblhf";
+       libraryHaskellDepends = [
+         base directory exceptions filepath ghc ghc-boot ghc-paths mtl
+         random temporary unix
+       ];
+       testHaskellDepends = [
+         base containers directory exceptions extensible-exceptions filepath
+         HUnit unix
+       ];
+       description = "Runtime Haskell interpreter (GHC API wrapper)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hint-server" = callPackage
     ({ mkDerivation, base, eprocess, exceptions, hint, monad-loops, mtl
      }:
@@ -118854,21 +118942,21 @@ self: {
     ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs
      , containers, cpphs, data-default, directory, extra, filepath
      , ghc-lib-parser, haskell-src-exts, haskell-src-exts-util, hscolour
-     , process, refact, text, transformers, uniplate
+     , mtl, process, refact, syb, text, transformers, uniplate
      , unordered-containers, vector, yaml
      }:
      mkDerivation {
        pname = "hlint";
-       version = "2.2.2";
-       sha256 = "1v10xcz4vdzk1a3gjlvqbdckldax2643sg7s3xkm3dnlj5hg05yp";
+       version = "2.2.3";
+       sha256 = "0amkk315mpqc1b2pf5mngfzmzfx4bad4pzcg4h0120825909zpz6";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson ansi-terminal base bytestring cmdargs containers cpphs
          data-default directory extra filepath ghc-lib-parser
-         haskell-src-exts haskell-src-exts-util hscolour process refact text
-         transformers uniplate unordered-containers vector yaml
+         haskell-src-exts haskell-src-exts-util hscolour mtl process refact
+         syb text transformers uniplate unordered-containers vector yaml
        ];
        executableHaskellDepends = [ base ];
        description = "Source code suggestions";
@@ -121078,8 +121166,8 @@ self: {
      }:
      mkDerivation {
        pname = "hoppy-docs";
-       version = "0.5.0";
-       sha256 = "08i15jbn7k21qfmmi1f8151bakqivbk440gi44jjnndhkdj8lwwa";
+       version = "0.6.0";
+       sha256 = "0wgzjzjnj1f9mw1099l5h2fh8y91v45a243paksb5dp76y27baxg";
        libraryHaskellDepends = [
          base haskell-src hoppy-generator hoppy-runtime
        ];
@@ -121090,15 +121178,16 @@ self: {
      }) {};
 
   "hoppy-generator" = callPackage
-    ({ mkDerivation, base, containers, directory, filepath, haskell-src
-     , mtl
+    ({ mkDerivation, base, bytestring, containers, directory, filepath
+     , haskell-src, mtl, process, temporary, text
      }:
      mkDerivation {
        pname = "hoppy-generator";
-       version = "0.5.2";
-       sha256 = "0ifk7ja1nynbgcf7q8v2dl4sn5ivif9rbd2d7pjp9lx43di9axfc";
+       version = "0.6.0";
+       sha256 = "1y10s0lbc0k7vir2h7bgghxmjh3zgja764i6w1j056rr0qh9v5bj";
        libraryHaskellDepends = [
-         base containers directory filepath haskell-src mtl
+         base bytestring containers directory filepath haskell-src mtl
+         process temporary text
        ];
        description = "C++ FFI generator - Code generator";
        license = stdenv.lib.licenses.agpl3;
@@ -121110,8 +121199,8 @@ self: {
     ({ mkDerivation, base, Cabal, containers, directory, filepath }:
      mkDerivation {
        pname = "hoppy-runtime";
-       version = "0.5.1";
-       sha256 = "0gh6kjfy9wcdppbq9ml5i2iz7bi12pbvnzqhj25sg9dy77iwc7cp";
+       version = "0.6.0";
+       sha256 = "0zlh84ibyvyl9wxmiyjgm26s6avjvqphg17bmsls69pqawzzgphy";
        libraryHaskellDepends = [
          base Cabal containers directory filepath
        ];
@@ -121125,8 +121214,8 @@ self: {
     ({ mkDerivation, base, filepath, haskell-src, hoppy-generator }:
      mkDerivation {
        pname = "hoppy-std";
-       version = "0.5.0";
-       sha256 = "1x4a4z434nhkgd5nndwrj3y9zm3pf4mln1mccsclf8kkyaj4hyqd";
+       version = "0.6.0";
+       sha256 = "0z7jmhv9xkmky8gn0qgk6f3l3w943qvfhwlq18p1gf6x7iq1ijdg";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base filepath haskell-src hoppy-generator
@@ -129701,14 +129790,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hvega_0_4_1_0" = callPackage
+  "hvega_0_4_1_1" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
      , filepath, tasty, tasty-golden, text, unordered-containers, vector
      }:
      mkDerivation {
        pname = "hvega";
-       version = "0.4.1.0";
-       sha256 = "1qjswpgn1ass1x4bk5zjv6vvw7vvsbzh00qc6jjfq3bnljrl4i75";
+       version = "0.4.1.1";
+       sha256 = "1dmb5w250l11p7hyzi7v9b286s4qdalg41bz1ckahrwaaaz8qa1d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -144862,6 +144951,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "language-javascript_0_6_0_14" = callPackage
+    ({ mkDerivation, alex, array, base, blaze-builder, bytestring
+     , Cabal, containers, happy, hspec, mtl, QuickCheck, text
+     , utf8-light, utf8-string
+     }:
+     mkDerivation {
+       pname = "language-javascript";
+       version = "0.6.0.14";
+       sha256 = "1j4f9jg98kwr1jiwk9y7akdgpc63dpwzcp53888adayxn5h6mqf1";
+       libraryHaskellDepends = [
+         array base blaze-builder bytestring containers mtl text utf8-string
+       ];
+       libraryToolDepends = [ alex happy ];
+       testHaskellDepends = [
+         array base blaze-builder bytestring Cabal containers hspec mtl
+         QuickCheck utf8-light utf8-string
+       ];
+       description = "Parser for JavaScript";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "language-js" = callPackage
     ({ mkDerivation, base, hspec, parsec }:
      mkDerivation {
@@ -147348,8 +147459,8 @@ self: {
      }:
      mkDerivation {
        pname = "lentil";
-       version = "1.3.0.0";
-       sha256 = "15z32gk4ki0iz5mcakajyd70bcyn5impp0i322sc905j1wivvcz2";
+       version = "1.3.1.0";
+       sha256 = "0jvabc8p69wgf20q3mq0nn9kg6x20gym3xl251vnbyl7chkg9can";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -196127,6 +196238,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "reanimate-svg_0_9_3_0" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, containers, hspec
+     , JuicyPixels, lens, linear, mtl, scientific, svg-tree, text
+     , transformers, vector, xml
+     }:
+     mkDerivation {
+       pname = "reanimate-svg";
+       version = "0.9.3.0";
+       sha256 = "1wwk2bd802nznwb9nlc7pq16krldw3dzj89fjd1v00plg9b5i3i4";
+       libraryHaskellDepends = [
+         attoparsec base bytestring containers JuicyPixels lens linear mtl
+         scientific text transformers vector xml
+       ];
+       testHaskellDepends = [
+         attoparsec base hspec linear scientific svg-tree
+       ];
+       description = "SVG file loader and serializer";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "reason-export" = callPackage
     ({ mkDerivation, base, bytestring, containers, Diff, directory
      , formatting, hashable, hspec, hspec-core, HUnit, mtl, QuickCheck
@@ -197855,6 +197987,8 @@ self: {
        pname = "regex-pcre-builtin";
        version = "0.94.4.8.8.35";
        sha256 = "0y7as9wqlkykpipka2cfdhmcnin345q01pp0wsva8fwmvsavdl8b";
+       revision = "1";
+       editedCabalFile = "0r29q3fwlji0vxypk0pywrqgrqz84ryd0n5zmk44bgy2k534mk6c";
        libraryHaskellDepends = [
          array base bytestring containers regex-base
        ];
@@ -197862,6 +197996,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "regex-pcre-builtin_0_94_5_8_8_35" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, regex-base }:
+     mkDerivation {
+       pname = "regex-pcre-builtin";
+       version = "0.94.5.8.8.35";
+       sha256 = "1s755qdg1mxrf125sh83bsc5kjkrj8fkq8wf6dg1jan86c7p7gl4";
+       libraryHaskellDepends = [
+         array base bytestring containers regex-base
+       ];
+       description = "Replaces/Enhances Text.Regex";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "regex-pcre-text" = callPackage
     ({ mkDerivation, array, base, bytestring, regex-base
      , regex-pcre-builtin, regex-tdfa-text, text
@@ -197946,14 +198094,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "regex-tdfa_1_2_3_3" = callPackage
+  "regex-tdfa_1_3_0" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, file-embed
      , filepath, ghc-prim, mtl, parsec, regex-base, utf8-string
      }:
      mkDerivation {
        pname = "regex-tdfa";
-       version = "1.2.3.3";
-       sha256 = "1jw80pvdvrd9lwgwqx4irmx774rd8l2ccxl45r4y3ahjvhbl2yn2";
+       version = "1.3.0";
+       sha256 = "1qzcix4bmz5lj0w433qrfi576rvy8y8flv5wvlp6cchb2s8mfq0v";
        libraryHaskellDepends = [
          array base bytestring containers ghc-prim mtl parsec regex-base
        ];
@@ -198019,6 +198167,8 @@ self: {
        pname = "regex-tdfa-text";
        version = "1.0.0.3";
        sha256 = "0090g6lgbdm9lywpqm2d3724nnnh24nx3vnlqr96qc2w486pmmrq";
+       revision = "1";
+       editedCabalFile = "00swglzmdw30g4bn47z6j71all0djjb2hjm7bkfl7pza4wv14wpv";
        libraryHaskellDepends = [ array base regex-base regex-tdfa text ];
        description = "Text interface for regex-tdfa";
        license = stdenv.lib.licenses.bsd3;
@@ -205536,16 +205686,16 @@ self: {
      }:
      mkDerivation {
        pname = "schemas";
-       version = "0.1.1.0";
-       sha256 = "0afk5bjmiqzw526p6s8wd7xpd0rj4figvfvs51fl34jvyc6wc0ic";
+       version = "0.2.0";
+       sha256 = "1zwnx6r9fb4vcgcyvxzdiv1wbzk5zjvh9frhkj2mwwqjdqk7j08f";
        libraryHaskellDepends = [
-         aeson aeson-pretty base bifunctors bytestring free generic-lens
-         generics-sop hashable lens lens-aeson pretty-simple profunctors
-         scientific text transformers unordered-containers vector
+         aeson base bifunctors bytestring free generics-sop hashable lens
+         lens-aeson profunctors scientific text transformers
+         unordered-containers vector
        ];
        testHaskellDepends = [
          aeson aeson-pretty base bytestring generic-lens generics-sop hspec
-         lens pretty-simple QuickCheck text
+         lens pretty-simple QuickCheck text unordered-containers
        ];
        description = "schema guided serialization";
        license = stdenv.lib.licenses.bsd3;
@@ -227502,21 +227652,23 @@ self: {
      }) {};
 
   "symbiote" = callPackage
-    ({ mkDerivation, aeson, async, base, bytestring, cereal, containers
-     , monad-control, mtl, QuickCheck, quickcheck-instances, stm, tasty
-     , tasty-hunit, text
+    ({ mkDerivation, abides, aeson, async, base, bytestring, cereal
+     , cereal-text, containers, monad-control, mtl, QuickCheck
+     , quickcheck-instances, stm, tasty, tasty-hunit, tasty-quickcheck
+     , text
      }:
      mkDerivation {
        pname = "symbiote";
-       version = "0.0.0.1";
-       sha256 = "06341y9bfr6h9sf7llxm2zc36q0zabn2ildp0gyskspybibl1sdy";
+       version = "0.0.1";
+       sha256 = "1pq5nncn0sg0246a569arncgj98b9d0j7l499yych97r016rg5bf";
        libraryHaskellDepends = [
-         aeson async base bytestring cereal containers monad-control mtl
-         QuickCheck stm text
+         abides aeson async base bytestring cereal cereal-text containers
+         monad-control mtl QuickCheck quickcheck-instances stm text
        ];
        testHaskellDepends = [
-         aeson async base bytestring cereal containers monad-control mtl
-         QuickCheck quickcheck-instances stm tasty tasty-hunit text
+         abides aeson async base bytestring cereal cereal-text containers
+         monad-control mtl QuickCheck quickcheck-instances stm tasty
+         tasty-hunit tasty-quickcheck text
        ];
        description = "Data serialization, communication, and operation verification implementation";
        license = stdenv.lib.licenses.bsd3;
-- 
GitLab


From 68ab37aa4491c8f870483c9eff888dc5fc88d2c8 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sun, 29 Sep 2019 18:51:15 -0400
Subject: [PATCH 1466/2254] nixos/gnome-settings-daemon: drop package option

After some thought, it doesn't make sense for this module to be shared.
---
 .../desktops/gnome3/gnome-settings-daemon.nix | 21 +++++++++++--------
 .../services/x11/desktop-managers/mate.nix    |  3 ++-
 .../x11/desktop-managers/pantheon.nix         |  2 +-
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/services/desktops/gnome3/gnome-settings-daemon.nix b/nixos/modules/services/desktops/gnome3/gnome-settings-daemon.nix
index 7f7adcf26ac..9d080acb2aa 100644
--- a/nixos/modules/services/desktops/gnome3/gnome-settings-daemon.nix
+++ b/nixos/modules/services/desktops/gnome3/gnome-settings-daemon.nix
@@ -12,6 +12,12 @@ in
 
 {
 
+  imports = [
+    (mkRemovedOptionModule
+      ["services" "gnome3" "gnome-settings-daemon" "package"]
+      "")
+  ];
+
   ###### interface
 
   options = {
@@ -20,13 +26,6 @@ in
 
       enable = mkEnableOption "GNOME Settings Daemon";
 
-      # There are many forks of gnome-settings-daemon
-      package = mkOption {
-        type = types.package;
-        default = pkgs.gnome3.gnome-settings-daemon;
-        description = "Which gnome-settings-daemon package to use.";
-      };
-
     };
 
   };
@@ -36,9 +35,13 @@ in
 
   config = mkIf cfg.enable {
 
-    environment.systemPackages = [ cfg.package ];
+    environment.systemPackages = [
+      pkgs.gnome3.gnome-settings-daemon
+    ];
 
-    services.udev.packages = [ cfg.package ];
+    services.udev.packages = [
+      pkgs.gnome3.gnome-settings-daemon
+    ];
 
   };
 
diff --git a/nixos/modules/services/x11/desktop-managers/mate.nix b/nixos/modules/services/x11/desktop-managers/mate.nix
index 4563583e070..fe63f36cf96 100644
--- a/nixos/modules/services/x11/desktop-managers/mate.nix
+++ b/nixos/modules/services/x11/desktop-managers/mate.nix
@@ -85,6 +85,7 @@ in
         pkgs.gtk3.out
         pkgs.shared-mime-info
         pkgs.xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/
+        pkgs.mate.mate-settings-daemon
       ];
 
     programs.dconf.enable = true;
@@ -98,7 +99,7 @@ in
     services.gnome3.at-spi2-core.enable = true;
     services.gnome3.gnome-keyring.enable = true;
     services.gnome3.gnome-settings-daemon.enable = true;
-    services.gnome3.gnome-settings-daemon.package = pkgs.mate.mate-settings-daemon;
+    services.udev.packages = [ pkgs.mate.mate-settings-daemon ];
     services.gvfs.enable = true;
     services.upower.enable = config.powerManagement.enable;
 
diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix
index d80ea9a53e8..7f01614cf3b 100644
--- a/nixos/modules/services/x11/desktop-managers/pantheon.nix
+++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix
@@ -119,7 +119,7 @@ in
     # TODO: gnome-keyring's xdg autostarts will still be in the environment (from elementary-session-settings) if disabled forcefully
     services.gnome3.gnome-keyring.enable = true;
     services.gnome3.gnome-settings-daemon.enable = true;
-    services.gnome3.gnome-settings-daemon.package = pkgs.pantheon.elementary-settings-daemon;
+    services.udev.packages = [ pkgs.pantheon.elementary-settings-daemon ];
     services.gvfs.enable = true;
     services.gnome3.rygel.enable = mkDefault true;
     services.gsignond.enable = mkDefault true;
-- 
GitLab


From 9bc81696957106cd5ba51be104d86cff60063620 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sun, 29 Sep 2019 20:05:40 -0400
Subject: [PATCH 1467/2254] nixos/networkmanager: remove basePackages option

This option in now completely useless.
All the default configs for these packages
already have GNOME features default,
---
 .../services/networking/networkmanager.nix    | 30 +++++++++----------
 .../services/x11/desktop-managers/gnome3.nix  |  8 -----
 .../x11/desktop-managers/pantheon.nix         |  5 ----
 .../x11/desktop-managers/xfce4-14.nix         |  8 -----
 4 files changed, 15 insertions(+), 36 deletions(-)

diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index a137045834b..09f36aaf8b3 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -5,6 +5,18 @@ with lib;
 let
   cfg = config.networking.networkmanager;
 
+  basePackages = with pkgs; [
+    crda
+    modemmanager
+    networkmanager
+    networkmanager-fortisslvpn
+    networkmanager-iodine
+    networkmanager-l2tp
+    networkmanager-openconnect
+    networkmanager-openvpn
+    networkmanager-vpnc
+   ] ++ optional (!delegateWireless) wpa_supplicant;
+
   dynamicHostsEnabled =
     cfg.dynamicHosts.enable && cfg.dynamicHosts.hostsDirs != {};
 
@@ -176,25 +188,13 @@ in {
         '';
       };
 
-      # Ugly hack for using the correct gnome3 packageSet
-      basePackages = mkOption {
-        type = types.attrsOf types.package;
-        default = { inherit (pkgs)
-                            networkmanager modemmanager crda
-                            networkmanager-openvpn networkmanager-vpnc
-                            networkmanager-openconnect networkmanager-fortisslvpn
-                            networkmanager-l2tp networkmanager-iodine; }
-                  // optionalAttrs (!delegateWireless) { inherit (pkgs) wpa_supplicant; };
-        internal = true;
-      };
-
       packages = mkOption {
-        type = types.listOf types.path;
+        type = types.listOf types.package;
         default = [ ];
         description = ''
           Extra packages that provide NetworkManager plugins.
         '';
-        apply = list: (attrValues cfg.basePackages) ++ list;
+        apply = list: basePackages ++ list;
       };
 
       dhcp = mkOption {
@@ -395,7 +395,7 @@ in {
       }
     ];
 
-    environment.etc = with cfg.basePackages; [
+    environment.etc = with pkgs; [
       { source = configFile;
         target = "NetworkManager/NetworkManager.conf";
       }
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 30c5250221c..2334e6d6894 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -209,14 +209,6 @@ in
 
       networking.networkmanager.enable = mkDefault true;
 
-      # Use the correct gnome3 packageSet
-      networking.networkmanager.basePackages = {
-        inherit (pkgs) networkmanager modemmanager wpa_supplicant crda;
-        inherit (pkgs.gnome3) networkmanager-openvpn networkmanager-vpnc
-        networkmanager-openconnect networkmanager-fortisslvpn
-        networkmanager-iodine networkmanager-l2tp;
-      };
-
       services.xserver.updateDbusEnvironment = true;
 
       # Needed for themes and backgrounds
diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix
index 7f01614cf3b..7181bf8506b 100644
--- a/nixos/modules/services/x11/desktop-managers/pantheon.nix
+++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix
@@ -154,11 +154,6 @@ in
     qt5.style = "adwaita";
 
     networking.networkmanager.enable = mkDefault true;
-    networking.networkmanager.basePackages =
-      { inherit (pkgs) networkmanager modemmanager wpa_supplicant crda;
-        inherit (pkgs.gnome3) networkmanager-openvpn networkmanager-vpnc
-                              networkmanager-openconnect networkmanager-fortisslvpn
-                              networkmanager-iodine networkmanager-l2tp; };
 
     # Override GSettings schemas
     environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";
diff --git a/nixos/modules/services/x11/desktop-managers/xfce4-14.nix b/nixos/modules/services/x11/desktop-managers/xfce4-14.nix
index 130e865a1fb..d75a5a14104 100644
--- a/nixos/modules/services/x11/desktop-managers/xfce4-14.nix
+++ b/nixos/modules/services/x11/desktop-managers/xfce4-14.nix
@@ -108,14 +108,6 @@ in
       "/share/gtksourceview-4.0"
     ];
 
-    # Use the correct gnome3 packageSet
-    networking.networkmanager.basePackages = mkIf config.networking.networkmanager.enable {
-      inherit (pkgs) networkmanager modemmanager wpa_supplicant crda;
-      inherit (pkgs.gnome3) networkmanager-openvpn networkmanager-vpnc
-      networkmanager-openconnect networkmanager-fortisslvpn
-      networkmanager-iodine networkmanager-l2tp;
-    };
-
     services.xserver.desktopManager.session = [{
       name = "xfce4-14";
       bgSupport = true;
-- 
GitLab


From 607a4a6e3a67940b7ddc3f7ea172f0129585b7ee Mon Sep 17 00:00:00 2001
From: arcnmx <arcnmx@users.noreply.github.com>
Date: Sun, 29 Sep 2019 18:06:29 -0700
Subject: [PATCH 1468/2254] llvmPackages_9.compiler-rt: remove crt patch

This doesn't apply because it was merged upstream.
---
 .../compilers/llvm/9/compiler-rt.nix          |   3 +-
 .../compilers/llvm/9/crtbegin-and-end.patch   | 595 ------------------
 2 files changed, 1 insertion(+), 597 deletions(-)
 delete mode 100644 pkgs/development/compilers/llvm/9/crtbegin-and-end.patch

diff --git a/pkgs/development/compilers/llvm/9/compiler-rt.nix b/pkgs/development/compilers/llvm/9/compiler-rt.nix
index 2dbade74af5..0b7e6815c64 100644
--- a/pkgs/development/compilers/llvm/9/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/9/compiler-rt.nix
@@ -36,8 +36,7 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory
-  ]# ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
-    ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./crtbegin-and-end.patch;
+  ];# ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
 
   # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
   # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra
diff --git a/pkgs/development/compilers/llvm/9/crtbegin-and-end.patch b/pkgs/development/compilers/llvm/9/crtbegin-and-end.patch
deleted file mode 100644
index e63be181f95..00000000000
--- a/pkgs/development/compilers/llvm/9/crtbegin-and-end.patch
+++ /dev/null
@@ -1,595 +0,0 @@
-Get crtbegin and crtend without compiler GCC! PR is at https://reviews.llvm.org/D28791
-
-Index: compiler-rt/CMakeLists.txt
-===================================================================
---- compiler-rt/CMakeLists.txt
-+++ compiler-rt/CMakeLists.txt
-@@ -29,6 +29,8 @@
- 
- option(COMPILER_RT_BUILD_BUILTINS "Build builtins" ON)
- mark_as_advanced(COMPILER_RT_BUILD_BUILTINS)
-+option(COMPILER_RT_BUILD_CRT "Build crtbegin.o/crtend.o" ON)
-+mark_as_advanced(COMPILER_RT_BUILD_CRT)
- option(COMPILER_RT_BUILD_SANITIZERS "Build sanitizers" ON)
- mark_as_advanced(COMPILER_RT_BUILD_SANITIZERS)
- option(COMPILER_RT_BUILD_XRAY "Build xray" ON)
-Index: compiler-rt/cmake/Modules/AddCompilerRT.cmake
-===================================================================
---- compiler-rt/cmake/Modules/AddCompilerRT.cmake
-+++ compiler-rt/cmake/Modules/AddCompilerRT.cmake
-@@ -132,7 +132,7 @@
- # Adds static or shared runtime for a list of architectures and operating
- # systems and puts it in the proper directory in the build and install trees.
- # add_compiler_rt_runtime(<name>
--#                         {STATIC|SHARED}
-+#                         {OBJECT|STATIC|SHARED}
- #                         ARCHS <architectures>
- #                         OS <os list>
- #                         SOURCES <source files>
-@@ -144,8 +144,8 @@
- #                         PARENT_TARGET <convenience parent target>
- #                         ADDITIONAL_HEADERS <header files>)
- function(add_compiler_rt_runtime name type)
--  if(NOT type MATCHES "^(STATIC|SHARED)$")
--    message(FATAL_ERROR "type argument must be STATIC or SHARED")
-+  if(NOT type MATCHES "^(OBJECT|STATIC|SHARED)$")
-+    message(FATAL_ERROR "type argument must be OBJECT, STATIC or SHARED")
-     return()
-   endif()
-   cmake_parse_arguments(LIB
-@@ -204,7 +204,10 @@
-         message(FATAL_ERROR "Architecture ${arch} can't be targeted")
-         return()
-       endif()
--      if(type STREQUAL "STATIC")
-+      if(type STREQUAL "OBJECT")
-+        set(libname "${name}-${arch}")
-+        set(output_name_${libname} ${libname}${COMPILER_RT_OS_SUFFIX})
-+      elseif(type STREQUAL "STATIC")
-         set(libname "${name}-${arch}")
-         set_output_name(output_name_${libname} ${name} ${arch})
-       else()
-@@ -270,12 +273,34 @@
-       set(COMPONENT_OPTION COMPONENT ${libname})
-     endif()
- 
--    add_library(${libname} ${type} ${sources_${libname}})
--    set_target_compile_flags(${libname} ${extra_cflags_${libname}})
--    set_target_link_flags(${libname} ${extra_link_flags_${libname}})
--    set_property(TARGET ${libname} APPEND PROPERTY
--                COMPILE_DEFINITIONS ${LIB_DEFS})
--    set_target_output_directories(${libname} ${output_dir_${libname}})
-+    if(type STREQUAL "OBJECT")
-+      string(TOUPPER ${CMAKE_BUILD_TYPE} config)
-+      get_property(cflags SOURCE ${sources_${libname}} PROPERTY COMPILE_FLAGS)
-+      separate_arguments(cflags)
-+      add_custom_command(
-+          OUTPUT ${output_dir_${libname}}/${libname}.o
-+          COMMAND ${CMAKE_C_COMPILER} ${sources_${libname}} ${cflags} ${extra_cflags_${libname}} -c -o ${output_dir_${libname}}/${libname}.o
-+          DEPENDS ${sources_${libname}}
-+          COMMENT "Building C object ${libname}.o")
-+      add_custom_target(${libname} DEPENDS ${output_dir_${libname}}/${libname}.o)
-+      install(FILES ${output_dir_${libname}}/${libname}.o
-+        DESTINATION ${install_dir_${libname}}
-+        ${COMPONENT_OPTION})
-+    else()
-+      add_library(${libname} ${type} ${sources_${libname}})
-+      set_target_compile_flags(${libname} ${extra_cflags_${libname}})
-+      set_target_link_flags(${libname} ${extra_link_flags_${libname}})
-+      set_property(TARGET ${libname} APPEND PROPERTY
-+                   COMPILE_DEFINITIONS ${LIB_DEFS})
-+      set_target_output_directories(${libname} ${output_dir_${libname}})
-+      install(TARGETS ${libname}
-+        ARCHIVE DESTINATION ${install_dir_${libname}}
-+                ${COMPONENT_OPTION}
-+        LIBRARY DESTINATION ${install_dir_${libname}}
-+                ${COMPONENT_OPTION}
-+        RUNTIME DESTINATION ${install_dir_${libname}}
-+                ${COMPONENT_OPTION})
-+    endif()
-     set_target_properties(${libname} PROPERTIES
-         OUTPUT_NAME ${output_name_${libname}})
-     set_target_properties(${libname} PROPERTIES FOLDER "Compiler-RT Runtime")
-@@ -299,13 +324,6 @@
-         )
-       endif()
-     endif()
--    install(TARGETS ${libname}
--      ARCHIVE DESTINATION ${install_dir_${libname}}
--              ${COMPONENT_OPTION}
--      LIBRARY DESTINATION ${install_dir_${libname}}
--              ${COMPONENT_OPTION}
--      RUNTIME DESTINATION ${install_dir_${libname}}
--              ${COMPONENT_OPTION})
- 
-     # We only want to generate per-library install targets if you aren't using
-     # an IDE because the extra targets get cluttered in IDEs.
-Index: compiler-rt/cmake/config-ix.cmake
-===================================================================
---- compiler-rt/cmake/config-ix.cmake
-+++ compiler-rt/cmake/config-ix.cmake
-@@ -227,6 +227,7 @@
-     ${ARM32} ${ARM64} ${MIPS32} ${MIPS64} ${S390X})
- set(ALL_ASAN_SUPPORTED_ARCH ${X86} ${X86_64} ${ARM32} ${ARM64}
-     ${MIPS32} ${MIPS64} ${PPC64} ${S390X})
-+set(ALL_CRT_SUPPORTED_ARCH ${X86} ${X86_64} ${ARM32} ${ARM64})
- set(ALL_DFSAN_SUPPORTED_ARCH ${X86_64} ${MIPS64} ${ARM64})
- set(ALL_FUZZER_SUPPORTED_ARCH ${X86_64} ${ARM64})
- 
-@@ -474,6 +475,7 @@
-     SANITIZER_COMMON_SUPPORTED_ARCH)
- 
- else()
-+  filter_available_targets(CRT_SUPPORTED_ARCH ${ALL_CRT_SUPPORTED_ARCH})
-   # Architectures supported by compiler-rt libraries.
-   filter_available_targets(SANITIZER_COMMON_SUPPORTED_ARCH
-     ${ALL_SANITIZER_COMMON_SUPPORTED_ARCH})
-@@ -563,6 +565,12 @@
- 
- # TODO: Add builtins support.
- 
-+if (CRT_SUPPORTED_ARCH AND OS_NAME MATCHES "Linux")
-+  set(COMPILER_RT_HAS_CRT TRUE)
-+else()
-+  set(COMPILER_RT_HAS_CRT FALSE)
-+endif()
-+
- if (COMPILER_RT_HAS_SANITIZER_COMMON AND DFSAN_SUPPORTED_ARCH AND
-     OS_NAME MATCHES "Linux")
-   set(COMPILER_RT_HAS_DFSAN TRUE)
-Index: compiler-rt/lib/CMakeLists.txt
-===================================================================
---- compiler-rt/lib/CMakeLists.txt
-+++ compiler-rt/lib/CMakeLists.txt
-@@ -17,6 +17,10 @@
-   add_subdirectory(builtins)
- endif()
- 
-+if(COMPILER_RT_BUILD_CRT)
-+  add_subdirectory(crt)
-+endif()
-+
- function(compiler_rt_build_runtime runtime)
-   string(TOUPPER ${runtime} runtime_uppercase)
-   if(COMPILER_RT_HAS_${runtime_uppercase})
-Index: compiler-rt/lib/crt/CMakeLists.txt
-===================================================================
---- /dev/null
-+++ compiler-rt/lib/crt/CMakeLists.txt
-@@ -0,0 +1,102 @@
-+add_compiler_rt_component(crt)
-+
-+function(check_cxx_section_exists section output)
-+  cmake_parse_arguments(ARG "" "" "SOURCE;FLAGS" ${ARGN})
-+  if(NOT ARG_SOURCE)
-+    set(ARG_SOURCE "int main() { return 0; }\n")
-+  endif()
-+
-+  string(RANDOM TARGET_NAME)
-+  set(TARGET_NAME "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/cmTC_${TARGET_NAME}.dir")
-+  file(MAKE_DIRECTORY ${TARGET_NAME})
-+
-+  file(WRITE "${TARGET_NAME}/CheckSectionExists.c" "${ARG_SOURCE}\n")
-+
-+  string(REGEX MATCHALL "<[A-Za-z0-9_]*>" substitutions
-+         ${CMAKE_C_COMPILE_OBJECT})
-+
-+  set(try_compile_flags "${ARG_FLAGS}")
-+  if(CMAKE_C_COMPILER_ID MATCHES Clang AND CMAKE_C_COMPILER_TARGET)
-+    list(APPEND try_compile_flags "-target ${CMAKE_C_COMPILER_TARGET}")
-+  endif()
-+
-+  string(REPLACE ";" " " extra_flags "${try_compile_flags}")
-+
-+  set(test_compile_command "${CMAKE_C_COMPILE_OBJECT}")
-+  foreach(substitution ${substitutions})
-+    if(substitution STREQUAL "<CMAKE_C_COMPILER>")
-+      string(REPLACE "<CMAKE_C_COMPILER>"
-+             "${CMAKE_C_COMPILER}" test_compile_command ${test_compile_command})
-+    elseif(substitution STREQUAL "<OBJECT>")
-+      string(REPLACE "<OBJECT>" "${TARGET_NAME}/CheckSectionExists.o"
-+             test_compile_command ${test_compile_command})
-+    elseif(substitution STREQUAL "<SOURCE>")
-+      string(REPLACE "<SOURCE>" "${TARGET_NAME}/CheckSectionExists.c"
-+             test_compile_command ${test_compile_command})
-+    elseif(substitution STREQUAL "<FLAGS>")
-+      string(REPLACE "<FLAGS>" "${CMAKE_C_FLAGS} ${extra_flags}"
-+             test_compile_command ${test_compile_command})
-+    else()
-+      string(REPLACE "${substitution}" "" test_compile_command
-+             ${test_compile_command})
-+    endif()
-+  endforeach()
-+
-+  string(REPLACE " " ";" test_compile_command "${test_compile_command}")
-+
-+  execute_process(
-+    COMMAND ${test_compile_command}
-+    RESULT_VARIABLE TEST_RESULT
-+    OUTPUT_VARIABLE TEST_OUTPUT
-+    ERROR_VARIABLE TEST_ERROR
-+  )
-+
-+  execute_process(
-+    COMMAND ${CMAKE_OBJDUMP} -h "${TARGET_NAME}/CheckSectionExists.o"
-+    RESULT_VARIABLE CHECK_RESULT
-+    OUTPUT_VARIABLE CHECK_OUTPUT
-+    ERROR_VARIABLE CHECK_ERROR
-+  )
-+  string(FIND "${CHECK_OUTPUT}" "${section}" SECTION_FOUND)
-+
-+  if(NOT SECTION_FOUND EQUAL -1)
-+    set(${output} TRUE PARENT_SCOPE)
-+  else()
-+    set(${output} FALSE PARENT_SCOPE)
-+  endif()
-+
-+  file(REMOVE_RECURSE ${TARGET_NAME})
-+endfunction()
-+
-+check_cxx_section_exists(".init_array" COMPILER_RT_HAS_INITFINI_ARRAY
-+  SOURCE "__attribute__((constructor)) void f() {}\nint main() { return 0; }\n")
-+
-+append_list_if(COMPILER_RT_HAS_INITFINI_ARRAY -DCRT_HAS_INITFINI_ARRAY CRT_CFLAGS)
-+append_list_if(COMPILER_RT_HAS_FPIC_FLAG -fPIC CRT_CFLAGS)
-+
-+foreach(arch ${CRT_SUPPORTED_ARCH})
-+  add_compiler_rt_runtime(clang_rt.crtbegin
-+    OBJECT
-+    ARCHS ${arch}
-+    SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/crtbegin.c
-+    CFLAGS ${CRT_CFLAGS}
-+    PARENT_TARGET crt)
-+  add_compiler_rt_runtime(clang_rt.crtbegin_shared
-+    OBJECT
-+    ARCHS ${arch}
-+    SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/crtbegin.c
-+    CFLAGS ${CRT_CFLAGS} -DCRT_SHARED
-+    PARENT_TARGET crt)
-+  add_compiler_rt_runtime(clang_rt.crtend
-+    OBJECT
-+    ARCHS ${arch}
-+    SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/crtend.c
-+    CFLAGS ${CRT_CFLAGS}
-+    PARENT_TARGET crt)
-+  add_compiler_rt_runtime(clang_rt.crtend_shared
-+    OBJECT
-+    ARCHS ${arch}
-+    SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/crtend.c
-+    CFLAGS ${CRT_CFLAGS} -DCRT_SHARED
-+    PARENT_TARGET crt)
-+endforeach()
-Index: compiler-rt/lib/crt/crtbegin.c
-===================================================================
---- /dev/null
-+++ compiler-rt/lib/crt/crtbegin.c
-@@ -0,0 +1,108 @@
-+/* ===-- crtbegin.c - Start of constructors and destructors ----------------===
-+ *
-+ *      	       The LLVM Compiler Infrastructure
-+ *
-+ * This file is dual licensed under the MIT and the University of Illinois Open
-+ * Source Licenses. See LICENSE.TXT for details.
-+ *
-+ * ===----------------------------------------------------------------------===
-+ */
-+
-+#include <stddef.h>
-+
-+__attribute__((visibility("hidden")))
-+#ifdef CRT_SHARED
-+void *__dso_handle = &__dso_handle;
-+#else
-+void *__dso_handle = (void *)0;
-+#endif
-+
-+static long __EH_FRAME_LIST__[]
-+    __attribute__((section(".eh_frame"), aligned(sizeof(void *)))) = {};
-+
-+extern void __register_frame_info(const void *, void *) __attribute__((weak));
-+extern void *__deregister_frame_info(const void *) __attribute__((weak));
-+
-+#ifndef CRT_HAS_INITFINI_ARRAY
-+typedef void (*fp)(void);
-+
-+static fp __CTOR_LIST__[]
-+    __attribute__((section(".ctors"), aligned(sizeof(fp)), used)) = {(fp)-1};
-+extern fp __CTOR_LIST_END__[];
-+#endif
-+
-+#ifdef CRT_SHARED
-+extern void __cxa_finalize(void *) __attribute__((weak));
-+#endif
-+
-+static void __attribute__((used)) __do_init() {
-+  static _Bool __initialized;
-+  if (__builtin_expect(__initialized, 0))
-+    return;
-+  __initialized = 1;
-+
-+  static struct { void *p[8]; } __object;
-+  if (__register_frame_info)
-+    __register_frame_info(__EH_FRAME_LIST__, &__object);
-+
-+#ifndef CRT_HAS_INITFINI_ARRAY
-+  const size_t n = __CTOR_LIST_END__ - __CTOR_LIST__ - 1;
-+  for (size_t i = n; i >= 1; i--) __CTOR_LIST__[i]();
-+#endif
-+}
-+
-+#ifdef CRT_HAS_INITFINI_ARRAY
-+__attribute__((section(".init_array"),
-+               used)) static void (*__init)(void) = __do_init;
-+#else  // CRT_HAS_INITFINI_ARRAY
-+#if defined(__i386__) || defined(__x86_64__)
-+asm(".pushsection .init,\"ax\",@progbits\n\t"
-+    "call " __USER_LABEL_PREFIX__ "__do_init\n\t"
-+    ".popsection");
-+#elif defined(__arm__)
-+asm(".pushsection .init,\"ax\",%progbits\n\t"
-+    "bl " __USER_LABEL_PREFIX__ "__do_init\n\t"
-+    ".popsection");
-+#endif  // CRT_HAS_INITFINI_ARRAY
-+#endif
-+
-+#ifndef CRT_HAS_INITFINI_ARRAY
-+static fp __DTOR_LIST__[]
-+    __attribute__((section(".dtors"), aligned(sizeof(fp)), used)) = {(fp)-1};
-+extern fp __DTOR_LIST_END__[];
-+#endif
-+
-+static void __attribute__((used)) __do_fini() {
-+  static _Bool __finalized;
-+  if (__builtin_expect(__finalized, 0))
-+    return;
-+  __finalized = 1;
-+
-+#ifdef CRT_SHARED
-+  if (__cxa_finalize)
-+    __cxa_finalize(__dso_handle);
-+#endif
-+
-+#ifndef CRT_HAS_INITFINI_ARRAY
-+  if (__deregister_frame_info)
-+    __deregister_frame_info(__EH_FRAME_LIST__);
-+
-+  const size_t n = __DTOR_LIST_END__ - __DTOR_LIST__ - 1;
-+  for (size_t i = 1; i < n; i++) __DTOR_LIST__[i]();
-+#endif
-+}
-+
-+#ifdef CRT_HAS_INITFINI_ARRAY
-+__attribute__((section(".fini_array"),
-+               used)) static void (*__fini)(void) = __do_fini;
-+#else  // CRT_HAS_INITFINI_ARRAY
-+#if defined(__i386__) || defined(__x86_64__)
-+asm(".pushsection .fini,\"ax\",@progbits\n\t"
-+    "call " __USER_LABEL_PREFIX__ "__do_fini\n\t"
-+    ".popsection");
-+#elif defined(__arm__)
-+asm(".pushsection .fini,\"ax\",%progbits\n\t"
-+    "bl " __USER_LABEL_PREFIX__ "__do_fini\n\t"
-+    ".popsection");
-+#endif
-+#endif  // CRT_HAS_INIT_FINI_ARRAY
-Index: compiler-rt/lib/crt/crtend.c
-===================================================================
---- /dev/null
-+++ compiler-rt/lib/crt/crtend.c
-@@ -0,0 +1,24 @@
-+/* ===-- crtend.c - End of constructors and destructors --------------------===
-+ *
-+ *      	       The LLVM Compiler Infrastructure
-+ *
-+ * This file is dual licensed under the MIT and the University of Illinois Open
-+ * Source Licenses. See LICENSE.TXT for details.
-+ *
-+ * ===----------------------------------------------------------------------===
-+ */
-+
-+#include <stdint.h>
-+
-+// Put 4-byte zero which is the length field in FDE at the end as a terminator.
-+const int32_t __EH_FRAME_LIST_END__[]
-+    __attribute__((section(".eh_frame"), aligned(sizeof(int32_t)),
-+                   visibility("hidden"), used)) = {0};
-+
-+#ifndef CRT_HAS_INITFINI_ARRAY
-+typedef void (*fp)(void);
-+fp __CTOR_LIST_END__[]
-+    __attribute__((section(".ctors"), visibility("hidden"), used)) = {0};
-+fp __DTOR_LIST_END__[]
-+    __attribute__((section(".dtors"), visibility("hidden"), used)) = {0};
-+#endif
-Index: compiler-rt/test/CMakeLists.txt
-===================================================================
---- compiler-rt/test/CMakeLists.txt
-+++ compiler-rt/test/CMakeLists.txt
-@@ -73,6 +73,9 @@
-   if(COMPILER_RT_BUILD_XRAY)
-     compiler_rt_test_runtime(xray)
-   endif()
-+  if(COMPILER_RT_HAS_CRT)
-+    add_subdirectory(crt)
-+  endif()
-   # ShadowCallStack does not yet provide a runtime with compiler-rt, the tests
-   # include their own minimal runtime
-   add_subdirectory(shadowcallstack)
-Index: compiler-rt/test/crt/CMakeLists.txt
-===================================================================
---- /dev/null
-+++ compiler-rt/test/crt/CMakeLists.txt
-@@ -0,0 +1,31 @@
-+set(CRT_LIT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
-+
-+set(CRT_TESTSUITES)
-+
-+set(CRT_TEST_DEPS "")
-+
-+if(NOT COMPILER_RT_STANDALONE_BUILD AND COMPILER_RT_BUILD_CRT AND
-+   COMPILER_RT_HAS_CRT)
-+  list(APPEND CRT_TEST_DEPS crt)
-+endif()
-+
-+set(CRT_TEST_ARCH ${CRT_SUPPORTED_ARCH})
-+if (COMPILER_RT_BUILD_CRT AND COMPILER_RT_HAS_CRT)
-+  foreach(arch ${CRT_TEST_ARCH})
-+    set(CRT_TEST_TARGET_ARCH ${arch})
-+    string(TOLOWER "-${arch}-${OS_NAME}" CRT_TEST_CONFIG_SUFFIX)
-+    get_test_cc_for_arch(${arch} CRT_TEST_TARGET_CC CRT_TEST_TARGET_CFLAGS)
-+    string(TOUPPER ${arch} ARCH_UPPER_CASE)
-+    set(CONFIG_NAME ${ARCH_UPPER_CASE}${OS_NAME}Config)
-+
-+    configure_lit_site_cfg(
-+      ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
-+      ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg)
-+    list(APPEND CRT_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME})
-+  endforeach()
-+endif()
-+
-+add_lit_testsuite(check-crt "Running the CRT tests"
-+  ${CRT_TESTSUITES}
-+  DEPENDS ${CRT_TEST_DEPS})
-+set_target_properties(check-crt PROPERTIES FOLDER "Compiler-RT Misc")
-Index: compiler-rt/test/crt/dso_handle.cpp
-===================================================================
---- /dev/null
-+++ compiler-rt/test/crt/dso_handle.cpp
-@@ -0,0 +1,33 @@
-+// RUN: %clangxx -g -DCRT_SHARED -c %s -fPIC -o %tshared.o
-+// RUN: %clangxx -g -c %s -fPIC -o %t.o
-+// RUN: %clangxx -g -shared -o %t.so -nostdlib %crti %shared_crtbegin %tshared.o %libstdcxx -lc -lm -lgcc_s %shared_crtend %crtn
-+// RUN: %clangxx -g -o %t -nostdlib %crt1 %crti %crtbegin %t.o %libstdcxx -lc -lm %libgcc %t.so %crtend %crtn
-+// RUN: %run %t 2>&1 | FileCheck %s
-+
-+#include <stdio.h>
-+
-+// CHECK: 1
-+// CHECK-NEXT: ~A()
-+
-+#ifdef CRT_SHARED
-+bool G;
-+void C() {
-+  printf("%d\n", G);
-+}
-+
-+struct A {
-+  A() { G = true; }
-+  ~A() {
-+    printf("~A()\n");
-+  }
-+};
-+
-+A a;
-+#else
-+void C();
-+
-+int main() {
-+  C();
-+  return 0;
-+}
-+#endif
-Index: compiler-rt/test/crt/lit.cfg
-===================================================================
---- /dev/null
-+++ compiler-rt/test/crt/lit.cfg
-@@ -0,0 +1,80 @@
-+# -*- Python -*-
-+
-+import os
-+import subprocess
-+
-+# Setup config name.
-+config.name = 'CRT' + config.name_suffix
-+
-+# Setup source root.
-+config.test_source_root = os.path.dirname(__file__)
-+
-+
-+def get_library_path(file):
-+    cmd = subprocess.Popen([config.clang.strip(),
-+                            config.target_cflags.strip(),
-+                            '-print-file-name=%s' % file],
-+                           stdout=subprocess.PIPE,
-+                           env=config.environment)
-+    if not cmd.stdout:
-+      lit_config.fatal("Couldn't find the library path for '%s'" % file)
-+    dir = cmd.stdout.read().strip()
-+    if sys.platform in ['win32'] and execute_external:
-+        # Don't pass dosish path separator to msys bash.exe.
-+        dir = dir.replace('\\', '/')
-+    # Ensure the result is an ascii string, across Python2.5+ - Python3.
-+    return str(dir.decode('ascii'))
-+
-+
-+def get_libgcc_file_name():
-+    cmd = subprocess.Popen([config.clang.strip(),
-+                            config.target_cflags.strip(),
-+                            '-print-libgcc-file-name'],
-+                           stdout=subprocess.PIPE,
-+                           env=config.environment)
-+    if not cmd.stdout:
-+      lit_config.fatal("Couldn't find the library path for '%s'" % file)
-+    dir = cmd.stdout.read().strip()
-+    if sys.platform in ['win32'] and execute_external:
-+        # Don't pass dosish path separator to msys bash.exe.
-+        dir = dir.replace('\\', '/')
-+    # Ensure the result is an ascii string, across Python2.5+ - Python3.
-+    return str(dir.decode('ascii'))
-+
-+
-+def build_invocation(compile_flags):
-+    return ' ' + ' '.join([config.clang] + compile_flags) + ' '
-+
-+
-+# Setup substitutions.
-+config.substitutions.append(
-+    ('%clang ', build_invocation([config.target_cflags])))
-+config.substitutions.append(
-+    ('%clangxx ',
-+     build_invocation(config.cxx_mode_flags + [config.target_cflags])))
-+
-+base_lib = os.path.join(
-+    config.compiler_rt_libdir, "clang_rt.%%s-%s.o" % config.target_arch)
-+config.substitutions.append(('%crtbegin', base_lib % "crtbegin"))
-+config.substitutions.append(('%shared_crtbegin', base_lib % "crtbegin_shared"))
-+config.substitutions.append(('%crtend', base_lib % "crtend"))
-+config.substitutions.append(('%shared_crtend', base_lib % "crtend_shared"))
-+
-+config.substitutions.append(
-+    ('%crt1', get_library_path('crt1.o')))
-+config.substitutions.append(
-+    ('%crti', get_library_path('crti.o')))
-+config.substitutions.append(
-+    ('%crtn', get_library_path('crtn.o')))
-+
-+config.substitutions.append(
-+    ('%libgcc', get_libgcc_file_name()))
-+
-+config.substitutions.append(
-+    ('%libstdcxx', '-l' + config.sanitizer_cxx_lib.lstrip('lib')))
-+
-+# Default test suffixes.
-+config.suffixes = ['.c', '.cc', '.cpp']
-+
-+if config.host_os not in ['Linux']:
-+    config.unsupported = True
-Index: compiler-rt/test/crt/lit.site.cfg.in
-===================================================================
---- /dev/null
-+++ compiler-rt/test/crt/lit.site.cfg.in
-@@ -0,0 +1,14 @@
-+@LIT_SITE_CFG_IN_HEADER@
-+
-+# Tool-specific config options.
-+config.name_suffix = "@CRT_TEST_CONFIG_SUFFIX@"
-+config.crt_lit_source_dir = "@CRT_LIT_SOURCE_DIR@"
-+config.target_cflags = "@CRT_TEST_TARGET_CFLAGS@"
-+config.target_arch = "@CRT_TEST_TARGET_ARCH@"
-+config.sanitizer_cxx_lib = "@SANITIZER_TEST_CXX_LIBNAME@"
-+
-+# Load common config for all compiler-rt lit tests
-+lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured")
-+
-+# Load tool-specific config that would do the real work.
-+lit_config.load_config(config, "@CRT_LIT_SOURCE_DIR@/lit.cfg")
-- 
GitLab


From 0449518afbf2f34c8ae40c15713edfcef4536179 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 29 Sep 2019 21:21:21 -0500
Subject: [PATCH 1469/2254] zeek: 2.5.5 -> 3.0.0

---
 .../networking/ids/bro/default.nix            | 24 --------------
 .../networking/ids/zeek/default.nix           | 31 +++++++++++++++++++
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  6 ++--
 4 files changed, 34 insertions(+), 28 deletions(-)
 delete mode 100644 pkgs/applications/networking/ids/bro/default.nix
 create mode 100644 pkgs/applications/networking/ids/zeek/default.nix

diff --git a/pkgs/applications/networking/ids/bro/default.nix b/pkgs/applications/networking/ids/bro/default.nix
deleted file mode 100644
index f90457ba937..00000000000
--- a/pkgs/applications/networking/ids/bro/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{stdenv, fetchurl, cmake, flex, bison, openssl, libpcap, perl, zlib, file, curl
-, geoip, gperftools, python, swig }:
-
-stdenv.mkDerivation rec {
-  name = "bro-2.5.5";
-
-  src = fetchurl {
-    url = "https://www.bro.org/downloads/${name}.tar.gz";
-    sha256 = "1kvkiq8jjsqryry9jd4vw45pbfb46jly988mq62mv4sd1fqsxwhq";
-  };
-
-  nativeBuildInputs = [ cmake flex bison file ];
-  buildInputs = [ openssl libpcap perl zlib curl geoip gperftools python swig ];
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    description = "Powerful network analysis framework much different from a typical IDS";
-    homepage = https://www.bro.org/;
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ pSub ];
-    platforms = with platforms; linux;
-  };
-}
diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/applications/networking/ids/zeek/default.nix
new file mode 100644
index 00000000000..885b05adfb9
--- /dev/null
+++ b/pkgs/applications/networking/ids/zeek/default.nix
@@ -0,0 +1,31 @@
+{stdenv, fetchurl, cmake, flex, bison, openssl, libpcap, zlib, file, curl
+, libmaxminddb, gperftools, python, swig, rocksdb }:
+
+stdenv.mkDerivation rec {
+  pname = "zeek";
+  version = "3.0.0";
+
+  src = fetchurl {
+    url = "https://www.zeek.org/downloads/zeek-${version}.tar.gz";
+    sha256 = "16pz5fh0z1hmvhn8pxqmdm5a9d8mqrp4gxpxkaywnaqk2h598lmm";
+  };
+
+  nativeBuildInputs = [ cmake flex bison file ];
+  buildInputs = [ openssl libpcap zlib curl libmaxminddb gperftools python swig rocksdb ];
+
+  enableParallelBuilding = true;
+
+  cmakeFlags = [
+    "-DPY_MOD_INSTALL_DIR=${placeholder "out"}/${python.sitePackages}"
+    "-DENABLE_PERFTOOLS=true"
+    "-DINSTALL_AUX_TOOLS=true"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Powerful network analysis framework much different from a typical IDS";
+    homepage = "https://www.zeek.org";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ pSub ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 7c6cdb8b1a3..a6b4c2db0f8 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -48,6 +48,7 @@ mapAliases ({
   bar-xft = lemonbar-xft;  # added 2015-01-16
   bashCompletion = bash-completion; # Added 2016-09-28
   bridge_utils = bridge-utils;  # added 2015-02-20
+  bro = zeek; # added 2019-09-29
   btrfsProgs = btrfs-progs; # added 2016-01-03
   bittorrentSync = throw "bittorrentSync has been deprecated by resilio-sync."; # added 2019-06-03
   bittorrentSync14 = throw "bittorrentSync14 has been deprecated by resilio-sync."; # added 2019-06-03
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f63b316752f..0ea8a48229f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1198,10 +1198,6 @@ in
 
   brltty = callPackage ../tools/misc/brltty { };
 
-  bro = callPackage ../applications/networking/ids/bro {
-    openssl = openssl_1_0_2;
-  };
-
   brook = callPackage ../tools/networking/brook { };
 
   broot = callPackage ../tools/misc/broot { };
@@ -2842,6 +2838,8 @@ in
 
   zabbixctl = callPackage ../tools/misc/zabbixctl { };
 
+  zeek = callPackage ../applications/networking/ids/zeek { };
+
   zzuf = callPackage ../tools/security/zzuf { };
 
   ### DEVELOPMENT / EMSCRIPTEN
-- 
GitLab


From 8bc8184936c4a1418d39a5b5cc87f24742bd6a25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6gler?= <christian.koegler@esg.de>
Date: Mon, 30 Sep 2019 07:11:44 +0200
Subject: [PATCH 1470/2254] Halide platforms limited to x68

ARM platforms are currently not supported by Halide:

https://github.com/halide/Halide/issues/3296
---
 pkgs/development/compilers/halide/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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


From 173d5a4e6ebb00e634c91fc07cd1ea62bce6fd4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 30 Sep 2019 10:00:33 +0100
Subject: [PATCH 1471/2254] rustc: remove test related patches/code

Tests have been disabled since over a year and now the
code starts to bit-rot. As it seems unlikely that they
will come back in near future, let's just remove it.
---
 .../rust/patches/net-tcp-disable-tests.patch  | 92 -------------------
 .../patches/stdsimd-disable-doctest.patch     | 20 ----
 pkgs/development/compilers/rust/rustc.nix     | 72 +--------------
 3 files changed, 5 insertions(+), 179 deletions(-)
 delete mode 100644 pkgs/development/compilers/rust/patches/net-tcp-disable-tests.patch
 delete mode 100644 pkgs/development/compilers/rust/patches/stdsimd-disable-doctest.patch

diff --git a/pkgs/development/compilers/rust/patches/net-tcp-disable-tests.patch b/pkgs/development/compilers/rust/patches/net-tcp-disable-tests.patch
deleted file mode 100644
index 583a6027f83..00000000000
--- a/pkgs/development/compilers/rust/patches/net-tcp-disable-tests.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-diff -ru rustc-1.36.0-src-orig/src/libstd/net/tcp.rs rustc-1.36.0-src/src/libstd/net/tcp.rs
---- rustc-1.36.0-src-orig/src/libstd/net/tcp.rs	2019-07-03 10:00:00.000000000 +0200
-+++ rustc-1.36.0-src/src/libstd/net/tcp.rs	2019-07-07 11:33:35.378130207 +0200
-@@ -973,6 +973,7 @@
-         }
-     }
- 
-+    #[cfg_attr(target_os = "macos", ignore)]
-     #[test]
-     fn listen_localhost() {
-         let socket_addr = next_test_ip4();
-@@ -1031,6 +1032,7 @@
-         })
-     }
- 
-+    #[cfg_attr(target_os = "macos", ignore)]
-     #[test]
-     fn read_eof() {
-         each_ip(&mut |addr| {
-@@ -1050,6 +1052,7 @@
-         })
-     }
- 
-+    #[cfg_attr(target_os = "macos", ignore)]
-     #[test]
-     fn write_close() {
-         each_ip(&mut |addr| {
-@@ -1076,6 +1079,7 @@
-         })
-     }
- 
-+    #[cfg_attr(target_os = "macos", ignore)]
-     #[test]
-     fn multiple_connect_serial() {
-         each_ip(&mut |addr| {
-@@ -1098,6 +1102,7 @@
-         })
-     }
- 
-+    #[cfg_attr(target_os = "macos", ignore)]
-     #[test]
-     fn multiple_connect_interleaved_greedy_schedule() {
-         const MAX: usize = 10;
-@@ -1134,6 +1139,7 @@
-     }
- 
-     #[test]
-+    #[cfg_attr(target_os = "macos", ignore)]
-     fn multiple_connect_interleaved_lazy_schedule() {
-         const MAX: usize = 10;
-         each_ip(&mut |addr| {
-@@ -1467,6 +1473,7 @@
-     }
- 
-     #[test]
-+    #[cfg_attr(target_os = "macos", ignore)]
-     fn clone_while_reading() {
-         each_ip(&mut |addr| {
-             let accept = t!(TcpListener::bind(&addr));
-@@ -1597,7 +1604,7 @@
- 
-     // FIXME: re-enabled openbsd tests once their socket timeout code
-     //        no longer has rounding errors.
--    #[cfg_attr(any(target_os = "netbsd", target_os = "openbsd"), ignore)]
-+    #[cfg_attr(any(target_os = "netbsd", target_os = "openbsd", target_os = "macos"), ignore)]
-     #[cfg_attr(target_env = "sgx", ignore)] // FIXME: https://github.com/fortanix/rust-sgx/issues/31
-     #[test]
-     fn timeouts() {
-@@ -1643,6 +1650,7 @@
-         drop(listener);
-     }
- 
-+    #[cfg_attr(target_os = "macos", ignore)]
-     #[test]
-     #[cfg_attr(target_env = "sgx", ignore)] // FIXME: https://github.com/fortanix/rust-sgx/issues/31
-     fn test_read_with_timeout() {
-@@ -1687,6 +1695,7 @@
-         drop(listener);
-     }
- 
-+    #[cfg_attr(target_os = "macos", ignore)]
-     #[test]
-     #[cfg_attr(target_env = "sgx", ignore)]
-     fn nodelay() {
-@@ -1719,6 +1728,7 @@
-         assert_eq!(ttl, t!(stream.ttl()));
-     }
- 
-+    #[cfg_attr(target_os = "macos", ignore)]
-     #[test]
-     #[cfg_attr(target_env = "sgx", ignore)]
-     fn set_nonblocking() {
diff --git a/pkgs/development/compilers/rust/patches/stdsimd-disable-doctest.patch b/pkgs/development/compilers/rust/patches/stdsimd-disable-doctest.patch
deleted file mode 100644
index 6ef7fd0f7ce..00000000000
--- a/pkgs/development/compilers/rust/patches/stdsimd-disable-doctest.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/src/stdsimd/coresimd/x86/mod.rs b/src/stdsimd/coresimd/x86/mod.rs
-index 32915c332..7cb54f31e 100644
---- a/src/stdsimd/coresimd/x86/mod.rs
-+++ b/src/stdsimd/coresimd/x86/mod.rs
-@@ -279,7 +279,6 @@ types! {
-     ///
-     /// # Examples
-     ///
--    /// ```
-     /// # #![feature(cfg_target_feature, target_feature, stdsimd)]
-     /// # #![cfg_attr(not(dox), no_std)]
-     /// # #[cfg(not(dox))]
-@@ -301,7 +300,6 @@ types! {
-     /// # }
-     /// # if is_x86_feature_detected!("sse") { unsafe { foo() } }
-     /// # }
--    /// ```
-     pub struct __m256(f32, f32, f32, f32, f32, f32, f32, f32);
- 
-     /// 256-bit wide set of four `f64` types, x86-specific
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index 433dc1719fb..27336aa501b 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -1,8 +1,8 @@
 { stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget
-, fetchurl, file, python2, tzdata, ps
+, fetchurl, file, python2
 , llvm_7, darwin, git, cmake, rustPlatform
 , pkgconfig, openssl
-, which, libffi, gdb
+, which, libffi
 , withBundledLLVM ? false
 }:
 
@@ -98,18 +98,6 @@ in stdenv.mkDerivation rec {
       --replace 'BOOTSTRAP_ARGS :=' 'BOOTSTRAP_ARGS := --jobs $(NIX_BUILD_CORES)'
   '';
 
-  patches = [
-    ./patches/net-tcp-disable-tests.patch
-
-    # Re-evaluate if this we need to disable this one
-    #./patches/stdsimd-disable-doctest.patch
-
-    # Fails on hydra - not locally; the exact reason is unknown.
-    # Comments in the test suggest that some non-reproducible environment
-    # variables such $RANDOM can make it fail.
-    # ./patches/disable-test-inherit-env.patch
-  ];
-
   # the rust build system complains that nix alters the checksums
   dontFixLibtool = true;
 
@@ -122,45 +110,18 @@ in stdenv.mkDerivation rec {
     sed -i configure \
       -e '/probe_need CFG_CURL curl/d'
 
-    # On Hydra: `TcpListener::bind(&addr)`: Address already in use (os error 98)'
-    sed '/^ *fn fast_rebind()/i#[ignore]' -i src/libstd/net/tcp.rs
-
-    # https://github.com/rust-lang/rust/issues/39522
-    echo removing gdb-version-sensitive tests...
-    find src/test/debuginfo -type f -execdir grep -q ignore-gdb-version '{}' \; -print -delete
-    rm src/test/debuginfo/{borrowed-c-style-enum.rs,c-style-enum-in-composite.rs,gdb-pretty-struct-and-enums.rs,generic-enum-with-different-disr-sizes.rs}
-
     # Useful debugging parameter
     # export VERBOSE=1
-  '' + optionalString stdenv.isDarwin ''
-    # Disable all lldb tests.
-    # error: Can't run LLDB test because LLDB's python path is not set
-    rm -vr src/test/debuginfo/*
-    rm -v src/test/run-pass/backtrace-debuginfo.rs || true
-
-    # error: No such file or directory
-    rm -v src/test/ui/run-pass/issues/issue-45731.rs || true
-
-    # Disable tests that fail when sandboxing is enabled.
-    substituteInPlace src/libstd/sys/unix/ext/net.rs \
-        --replace '#[test]' '#[test] #[ignore]'
-    substituteInPlace src/test/run-pass/env-home-dir.rs \
-        --replace 'home_dir().is_some()' true
-    rm -v src/test/run-pass/fds-are-cloexec.rs || true  # FIXME: pipes?
-    rm -v src/test/ui/run-pass/threads-sendsync/sync-send-in-std.rs || true  # FIXME: ???
   '';
 
   # rustc unfortunately needs cmake to compile llvm-rt but doesn't
   # use it for the normal build. This disables cmake in Nix.
   dontUseCmakeConfigure = true;
 
-  # ps is needed for one of the test cases
   nativeBuildInputs = [
-    file python2 ps rustPlatform.rust.rustc git cmake
-    which libffi removeReferencesTo
-    pkgconfig
-  ] # Only needed for the debuginfo tests
-    ++ optional (!stdenv.isDarwin) gdb;
+    file python2 rustPlatform.rust.rustc git cmake
+    which libffi removeReferencesTo pkgconfig
+  ];
 
   buildInputs = [ openssl ]
     ++ optional stdenv.isDarwin Security
@@ -169,29 +130,6 @@ in stdenv.mkDerivation rec {
   outputs = [ "out" "man" "doc" ];
   setOutputFlags = false;
 
-  # Disable codegen units and hardening for the tests.
-  preCheck = ''
-    export RUSTFLAGS=
-    export TZDIR=${tzdata}/share/zoneinfo
-    export hardeningDisable=all
-  '' +
-  # Ensure TMPDIR is set, and disable a test that removing the HOME
-  # variable from the environment falls back to another home
-  # directory.
-  optionalString stdenv.isDarwin ''
-    export TMPDIR=/tmp
-    sed -i '28s/home_dir().is_some()/true/' ./src/test/run-pass/env-home-dir.rs
-  '';
-
-  # 1. Upstream is not running tests on aarch64:
-  # see https://github.com/rust-lang/rust/issues/49807#issuecomment-380860567
-  # So we do the same.
-  # 2. Tests run out of memory for i686
-  #doCheck = !stdenv.isAarch64 && !stdenv.isi686;
-
-  # Disabled for now; see https://github.com/NixOS/nixpkgs/pull/42348#issuecomment-402115598.
-  doCheck = false;
-
   # remove references to llvm-config in lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends/librustc_codegen_llvm-llvm.so
   # and thus a transitive dependency on ncurses
   postInstall = ''
-- 
GitLab


From d9176bee708b1b4d9d60b4a4b00d35245c9a23db Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Mon, 30 Sep 2019 11:10:10 +0200
Subject: [PATCH 1472/2254] sage: 8.9.rc1 -> 8.9

---
 pkgs/applications/science/math/sage/sage-src.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix
index 03c1e07439f..5a0f4b97c51 100644
--- a/pkgs/applications/science/math/sage/sage-src.nix
+++ b/pkgs/applications/science/math/sage/sage-src.nix
@@ -10,14 +10,14 @@
 # all get the same sources with the same patches applied.
 
 stdenv.mkDerivation rec {
-  version = "8.9.rc1";
+  version = "8.9";
   pname = "sage-src";
 
   src = fetchFromGitHub {
     owner = "sagemath";
     repo = "sage";
     rev = version;
-    sha256 = "04ryxwgdrm2gwbwrcv7akm97933hlpvglywydy6q6gpy0dvshdah";
+    sha256 = "1bwga58x3s8z42w5h51c232f91ndsc1861dlb1glhax3pn0rhn3a";
   };
 
   # Patches needed because of particularities of nix or the way this is packaged.
-- 
GitLab


From 9fa1b3bc8206240c941aec7e93691e4e93f99a2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 30 Sep 2019 07:00:09 -0300
Subject: [PATCH 1473/2254] matcha: 2019-09-23 -> 2019-09-30

---
 pkgs/data/themes/matcha/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix
index b9de3743daf..b5882eb98d0 100644
--- a/pkgs/data/themes/matcha/default.nix
+++ b/pkgs/data/themes/matcha/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "matcha";
-  version = "2019-09-23";
+  version = "2019-09-30";
 
   src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = pname;
-    rev = "v${version}";
-    sha256 = "0fx6ksv9yb16drhx1sn4nq6jha36gha3cxnr1fjhj8dgarjqrg9k";
+    rev = version;
+    sha256 = "1zp8s2hr33lpdyc4nihfmsc728672fa2dcji4xk6dv6b64cp1xyx";
   };
 
   buildInputs = [ gdk-pixbuf librsvg ];
-- 
GitLab


From b08b0bcbbec77046e5a7082177cedc12fbf1dc6c Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 25 Sep 2019 17:13:29 +0200
Subject: [PATCH 1474/2254] mkRemovedOptionModule: assert on removed options

We don't want to ignore config that can mess up machines. In general
this should always fail evaluation, as you think you are changing
behaviour and don't, which can easily create run-time errors we can
catch early.
---
 lib/modules.nix                                       | 11 +++++++----
 .../monitoring/prometheus/exporters/nginx.nix         |  2 +-
 nixos/modules/tasks/network-interfaces.nix            |  2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/lib/modules.nix b/lib/modules.nix
index c3c903c1dfa..00c7712487b 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -592,11 +592,14 @@ rec {
     { options = setAttrByPath optionName (mkOption {
         visible = false;
       });
-      config.warnings =
-        let opt = getAttrFromPath optionName options; in
-        optional opt.isDefined ''
+      config.assertions =
+        let opt = getAttrFromPath optionName options; in [{
+          assertion = !opt.isDefined;
+          message = ''
             The option definition `${showOption optionName}' in ${showFiles opt.files} no longer has any effect; please remove it.
-            ${replacementInstructions}'';
+            ${replacementInstructions}
+          '';
+        }];
     };
 
   /* Return a module that causes a warning to be shown if the
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix b/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix
index 554377df37b..ba852fea433 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix
@@ -49,6 +49,6 @@ in
     (mkRemovedOptionModule [ "insecure" ] ''
       This option was replaced by 'prometheus.exporters.nginx.sslVerify'.
     '')
-    ({ options.warnings = options.warnings; })
+    ({ options.warnings = options.warnings; options.assertions = options.assertions; })
   ];
 }
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 5bf7b0d227f..ee3ae2e91f2 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -305,7 +305,7 @@ let
             optional (defined ipv6Address && defined ipv6PrefixLength)
             { address = ipv6Address; prefixLength = ipv6PrefixLength; }))
 
-        ({ options.warnings = options.warnings; })
+        ({ options.warnings = options.warnings; options.assertions = options.assertions; })
       ];
 
   };
-- 
GitLab


From c98de4115999f94f2815bc77ea82c572ab2dca3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 30 Sep 2019 07:07:56 -0300
Subject: [PATCH 1475/2254] mate.mate-common: 1.22.0 -> 1.22.2

---
 pkgs/desktops/mate/mate-common/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/mate-common/default.nix b/pkgs/desktops/mate/mate-common/default.nix
index f85dd632bd1..5eacbd08146 100644
--- a/pkgs/desktops/mate/mate-common/default.nix
+++ b/pkgs/desktops/mate/mate-common/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mate-common";
-  version = "1.22.0";
+  version = "1.22.2";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "11lwckndizawbq993ws8lqp59vsc873zri0m8s1i5zyc4qx9f69z";
+    sha256 = "1xx7qrw8kc6355r1a1nybncf8s2rxjb2nqzw0gv2r5j5sqx8fzgf";
   };
 
   meta = {
-- 
GitLab


From 7f000377df35ffd864b37417425a42f8a9f99058 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 30 Sep 2019 07:07:57 -0300
Subject: [PATCH 1476/2254] mate.mate-utils: 1.22.1 -> 1.22.2

---
 pkgs/desktops/mate/mate-utils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/mate-utils/default.nix b/pkgs/desktops/mate/mate-utils/default.nix
index 7775173611e..adb8fef27f5 100644
--- a/pkgs/desktops/mate/mate-utils/default.nix
+++ b/pkgs/desktops/mate/mate-utils/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mate-utils";
-  version = "1.22.1";
+  version = "1.22.2";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0768y6x33ljc9dxjlfmvplsn4lrxj5xhjddbyab9h6pqav8527rg";
+    sha256 = "1i6fnm3y1hj8r57x4jpc4ixqs77zln8f7477d0haypflxm3s4kjr";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From a287970a160cf361fb4443ec1ceec298197d7780 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 30 Sep 2019 07:07:57 -0300
Subject: [PATCH 1477/2254] mate.mozo: 1.22.1 -> 1.22.2

---
 pkgs/desktops/mate/mozo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/mozo/default.nix b/pkgs/desktops/mate/mozo/default.nix
index 36f8fecb192..9d61f45e18e 100644
--- a/pkgs/desktops/mate/mozo/default.nix
+++ b/pkgs/desktops/mate/mozo/default.nix
@@ -2,14 +2,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "mozo";
-  version = "1.22.1";
+  version = "1.22.2";
 
   format = "other";
   doCheck = false;
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0yffp7p3b6ynpf7ck21klym7h09l35amnyahm71dxbv2kzj6hlqh";
+    sha256 = "1lzcwsz940v218frwzhpywp1an9x3cgfvqr7r8dplpdapvd0khrs";
   };
 
   nativeBuildInputs = [ pkgconfig intltool gobject-introspection wrapGAppsHook ];
-- 
GitLab


From c888800325a788ae305ddfec88282e2380af7e0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 30 Sep 2019 07:07:57 -0300
Subject: [PATCH 1478/2254] mate.pluma: 1.22.1 -> 1.22.2

---
 pkgs/desktops/mate/pluma/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix
index cfbe33dd380..e0b61fd35cb 100644
--- a/pkgs/desktops/mate/pluma/default.nix
+++ b/pkgs/desktops/mate/pluma/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "pluma";
-  version = "1.22.1";
+  version = "1.22.2";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "14d5c5fg31d7br9h1y3gdcr53j4sxlgybf326jvdcw8mgy91k3dg";
+    sha256 = "1gsj8grdhzb1jvl5zwd8zjc9cj9ys2ndny04gy4bbh80sjaj6xva";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From 0c3847f4cbac71a4b7d00b9edc45ed809e5a9f9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 30 Sep 2019 07:07:57 -0300
Subject: [PATCH 1479/2254] mate.python-caja: 1.22.0 -> 1.22.1

---
 pkgs/desktops/mate/python-caja/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/python-caja/default.nix b/pkgs/desktops/mate/python-caja/default.nix
index 42a8e328a16..d861ddbf4d7 100644
--- a/pkgs/desktops/mate/python-caja/default.nix
+++ b/pkgs/desktops/mate/python-caja/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "python-caja";
-  version = "1.22.0";
+  version = "1.22.1";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1zwdjvxci72j0181nlfq6912lw3aq8j3746brlp7wlzn22qp7b0k";
+    sha256 = "07hkvs4a6anrvh28zjsrj8anbcz32p19hslhq66yhcvh0hh4kvqk";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From c311665d37937d7c6149cb8c4b7555d65a54c1ce Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 30 Sep 2019 12:27:33 +0200
Subject: [PATCH 1480/2254] haskell-hlint: update override to use the latest
 ghc-lib-parser version

---
 pkgs/development/haskell-modules/configuration-common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index a30b4f1c1e2..67fe3b23942 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1204,7 +1204,7 @@ self: super: {
   constraints-deriving = dontCheck super.constraints-deriving;
 
   # need newer version of ghc-libparser
-  hlint = super.hlint.override { ghc-lib-parser = self.ghc-lib-parser_8_8_0_20190723; };
+  hlint = super.hlint.override { ghc-lib-parser = self.ghc-lib-parser_8_8_1; };
 
   # https://github.com/sol/hpack/issues/366
   hpack = self.hpack_0_32_0;
-- 
GitLab


From 2d995f138fe1295882c95474368bbe7072979dad Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 30 Sep 2019 12:28:37 +0200
Subject: [PATCH 1481/2254] haskell-ghc-lib-parser: we mo longer need older
 versions around

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

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index e1ae2938282..f4cf3cb01db 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2485,7 +2485,6 @@ extra-packages:
   - dbus <1                             # for xmonad-0.26
   - deepseq == 1.3.0.1                  # required to build Cabal with GHC 6.12.3
   - generic-deriving == 1.10.5.*        # new versions don't compile with GHC 7.10.x
-  - ghc-lib-parser == 8.8.0.20190723    # required by hlint-2.2.2
   - gloss < 1.9.3                       # new versions don't compile with GHC 7.8.x
   - haddock < 2.17                      # required on GHC 7.10.x
   - haddock == 2.17.*                   # required on GHC 8.0.x
-- 
GitLab


From f12bc855dd79eb62117d684e7796b4038285f9f0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 30 Sep 2019 12:32:22 +0200
Subject: [PATCH 1482/2254] hackage2nix: disable failing builds that break
 evaluation on Hydra

---
 .../haskell-modules/configuration-hackage2nix.yaml          | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index f4cf3cb01db..70dddd52252 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -3128,6 +3128,7 @@ broken-packages:
   - base-feature-macros
   - base-generics
   - base-io-access
+  - base62
   - base64-conduit
   - baserock-schema
   - BASIC
@@ -3703,6 +3704,7 @@ broken-packages:
   - codex
   - coin
   - coinbase-exchange
+  - coinbase-pro
   - coincident-root-loci
   - colada
   - colchis
@@ -6474,6 +6476,7 @@ broken-packages:
   - json-python
   - json-schema
   - json-togo
+  - json-tokens
   - json-tools
   - json-tracer
   - json2
@@ -7392,6 +7395,7 @@ broken-packages:
   - net-spider-cli
   - net-spider-pangraph
   - net-spider-rpl
+  - net-spider-rpl-cli
   - netclock
   - netcore
   - netease-fm
@@ -7929,6 +7933,7 @@ broken-packages:
   - porte
   - PortFusion
   - ports
+  - poseidon-postgis
   - posix-acl
   - posix-api
   - posix-realtime
@@ -8553,6 +8558,7 @@ broken-packages:
   - scholdoc-types
   - scidb-hquery
   - science-constants-dimensional
+  - scientific-notation
   - SciFlow
   - SciFlow-drmaa
   - scion
-- 
GitLab


From 33011f0d50f994305480110e77a58cd4b752b777 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 30 Sep 2019 12:35:51 +0200
Subject: [PATCH 1483/2254] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.15.0 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/65cacc5a5a1ef0ecdbb1d582b3cccc82ba00727c.
---
 .../haskell-modules/hackage-packages.nix      | 201 +++++++++++++++---
 1 file changed, 166 insertions(+), 35 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 88ce4f77c55..798683996fb 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -23915,6 +23915,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "aeson-yaml" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, string-qq, tasty
+     , tasty-discover, tasty-hunit, text, unordered-containers, vector
+     , yaml
+     }:
+     mkDerivation {
+       pname = "aeson-yaml";
+       version = "1.0.0.0";
+       sha256 = "1d9ijcd9vry7fx5ks0qcq5q6pmncibg3m9k798i4vnl8ahncjqcq";
+       revision = "2";
+       editedCabalFile = "1zvil7w7a8j4d6dxkpdizs63qm8ylz18nvz6s2hjs5kgnfjd3dxm";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring text unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring string-qq tasty tasty-discover tasty-hunit
+         unordered-containers yaml
+       ];
+       testToolDepends = [ tasty-discover ];
+       description = "Output any Aeson value as YAML (pure Haskell library)";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "affection" = callPackage
     ({ mkDerivation, base, bytestring, clock, containers, glib, linear
      , monad-loops, monad-parallel, mtl, OpenGL, sdl2, stm, text, uuid
@@ -35797,6 +35822,8 @@ self: {
        ];
        description = "Base62 encoding and decoding";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "base64-bytestring" = callPackage
@@ -36729,6 +36756,28 @@ self: {
        broken = true;
      }) {};
 
+  "bech32" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, deepseq
+     , extra, hspec, hspec-discover, QuickCheck, text, vector
+     }:
+     mkDerivation {
+       pname = "bech32";
+       version = "1.0.0";
+       sha256 = "1pq0izcjsnyrwjik7p6xw1y8b5g3x4rxi95jh08x81lfp53pr9bn";
+       revision = "1";
+       editedCabalFile = "0xkdidn53amg5ihbiwjw44yc87rnw6wivcgx84nimmhi9az3mlkb";
+       libraryHaskellDepends = [
+         array base bytestring containers extra text
+       ];
+       testHaskellDepends = [
+         base bytestring containers deepseq extra hspec QuickCheck text
+         vector
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Implementation of the Bech32 cryptocurrency address format (BIP 0173)";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "bed-and-breakfast" = callPackage
     ({ mkDerivation, array, base, binary, cpphs, deepseq, QuickCheck
      , template-haskell
@@ -53492,6 +53541,8 @@ self: {
        ];
        description = "Client for Coinbase Pro";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "coincident-root-loci" = callPackage
@@ -92392,26 +92443,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "ghc-lib-parser_8_8_0_20190723" = callPackage
-    ({ mkDerivation, alex, array, base, binary, bytestring, containers
-     , deepseq, directory, filepath, ghc-prim, happy, hpc, pretty
-     , process, time, transformers, unix
-     }:
-     mkDerivation {
-       pname = "ghc-lib-parser";
-       version = "8.8.0.20190723";
-       sha256 = "0szrv98h2c1db3400cbb7vbhqnwagqncgpllzd9jiw74rq6y8mjq";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         array base binary bytestring containers deepseq directory filepath
-         ghc-prim hpc pretty process time transformers unix
-       ];
-       libraryToolDepends = [ alex happy ];
-       description = "The GHC API, decoupled from GHC versions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "ghc-lib-parser_8_8_1" = callPackage
     ({ mkDerivation, alex, array, base, binary, bytestring, containers
      , deepseq, directory, filepath, ghc-prim, happy, hpc, pretty
@@ -114669,6 +114700,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hedn_0_3_0_0" = callPackage
+    ({ mkDerivation, base, containers, deepseq, deriving-compat
+     , hedgehog, megaparsec, parser-combinators, prettyprinter
+     , scientific, template-haskell, text, time, uuid-types, vector
+     }:
+     mkDerivation {
+       pname = "hedn";
+       version = "0.3.0.0";
+       sha256 = "1gx8bw2l1qpb4jgh5d1zzgfm2rnwavg5shmp4wq2mqrih11r3f3y";
+       libraryHaskellDepends = [
+         base containers deepseq deriving-compat megaparsec
+         parser-combinators prettyprinter scientific template-haskell text
+         time uuid-types vector
+       ];
+       testHaskellDepends = [
+         base containers hedgehog megaparsec text time uuid-types vector
+       ];
+       description = "EDN parsing and encoding";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hedn-functor" = callPackage
     ({ mkDerivation, base, containers, hedn, recursion-schemes, text
      , vector
@@ -140210,6 +140263,8 @@ self: {
        ];
        description = "Tokenize JSON";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "json-tools" = callPackage
@@ -150368,6 +150423,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "list-t_1_0_4" = callPackage
+    ({ mkDerivation, base, base-prelude, foldl, HTF, mmorph
+     , monad-control, mtl, mtl-prelude, transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "list-t";
+       version = "1.0.4";
+       sha256 = "0xsmq4rhp91k4az1d0hnpiy2b3d3nqqdywjrrryrjiway55q8qrq";
+       libraryHaskellDepends = [
+         base foldl mmorph monad-control mtl transformers transformers-base
+       ];
+       testHaskellDepends = [ base-prelude HTF mmorph mtl-prelude ];
+       description = "ListT done right";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "list-t-attoparsec" = callPackage
     ({ mkDerivation, attoparsec, base-prelude, either, hspec, list-t
      , list-t-text, text, transformers
@@ -155883,6 +155955,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "massiv_0_4_2_0" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, cabal-doctest
+     , data-default-class, deepseq, doctest, exceptions
+     , mersenne-random-pure64, primitive, QuickCheck, random, scheduler
+     , splitmix, template-haskell, unliftio-core, vector
+     }:
+     mkDerivation {
+       pname = "massiv";
+       version = "0.4.2.0";
+       sha256 = "051za4zdphpsscliza6v9y81bcgzmn0flyirs29x4jfhsyk81qjy";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         base bytestring data-default-class deepseq exceptions primitive
+         scheduler unliftio-core vector
+       ];
+       testHaskellDepends = [
+         base doctest mersenne-random-pure64 QuickCheck random splitmix
+         template-haskell
+       ];
+       description = "Massiv (Массив) is an Array Library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "massiv-io" = callPackage
     ({ mkDerivation, base, bytestring, data-default-class, deepseq
      , directory, filepath, JuicyPixels, massiv, netpbm, process, vector
@@ -160320,8 +160416,8 @@ self: {
     ({ mkDerivation, base, vector }:
      mkDerivation {
        pname = "mmsyn2";
-       version = "0.1.5.0";
-       sha256 = "0nad75cbpdknrwg9yb0av39x07x4qgawp1ymhrwghp0fm2n7gmda";
+       version = "0.1.6.0";
+       sha256 = "1jwfm24ybgsb1ryx2kk1a65s2bprpppy1nkyjxcy34kckj534gjp";
        libraryHaskellDepends = [ base vector ];
        description = "The library that can be used for multiple (Ord a) => a -> b transformations";
        license = stdenv.lib.licenses.mit;
@@ -167538,6 +167634,8 @@ self: {
        ];
        description = "CLI executable of NetSpider.RPL.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "netclock" = callPackage
@@ -173766,6 +173864,8 @@ self: {
        pname = "openssl-streams";
        version = "1.2.2.0";
        sha256 = "0rplym6ayydkpr7x9mw3l13p0vzzfzzxw244d7sd3jcvaxpv0rmr";
+       revision = "1";
+       editedCabalFile = "125bxb2axgpcq7rrpamfq0yz017i0ks9zsykh6hn0ifw3lxj1k29";
        libraryHaskellDepends = [
          base bytestring HsOpenSSL io-streams network
        ];
@@ -185663,6 +185763,8 @@ self: {
        ];
        description = "Extension of Poseidon library for Postgis (Spatial and Geographic objects for PostgreSQL)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "positive" = callPackage
@@ -186371,24 +186473,25 @@ self: {
      }) {};
 
   "postgresql-simple-opts" = callPackage
-    ({ mkDerivation, base, bytestring, data-default, either
-     , generic-deriving, hspec, optparse-applicative, optparse-generic
-     , postgres-options, postgresql-simple, split, uri-bytestring
+    ({ mkDerivation, base, bytestring, containers, data-default, either
+     , envy, generic-deriving, hspec, optparse-applicative
+     , optparse-generic, postgres-options, postgresql-simple, split
+     , uri-bytestring
      }:
      mkDerivation {
        pname = "postgresql-simple-opts";
-       version = "0.4.0.0";
-       sha256 = "0zrmqd25xni2d51jna2a52l3bmdn6lpx9mbjzllnf6zn6ckw4ja8";
+       version = "0.5.0.0";
+       sha256 = "1a2z6pcdvg51k6n5k1ppp43pv2vvdbkgx2rpwm4ip15qh63gm7i3";
        libraryHaskellDepends = [
-         base bytestring data-default either generic-deriving
+         base bytestring data-default either envy generic-deriving
          optparse-applicative optparse-generic postgres-options
          postgresql-simple split uri-bytestring
        ];
        testHaskellDepends = [
-         base bytestring data-default hspec optparse-applicative
+         base bytestring containers data-default hspec optparse-applicative
          postgres-options postgresql-simple
        ];
-       description = "An optparse-applicative parser for postgresql-simple's connection options";
+       description = "An optparse-applicative and envy parser for postgresql-simple's connection options";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
@@ -197996,12 +198099,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "regex-pcre-builtin_0_94_5_8_8_35" = callPackage
+  "regex-pcre-builtin_0_94_6_8_8_35" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, regex-base }:
      mkDerivation {
        pname = "regex-pcre-builtin";
-       version = "0.94.5.8.8.35";
-       sha256 = "1s755qdg1mxrf125sh83bsc5kjkrj8fkq8wf6dg1jan86c7p7gl4";
+       version = "0.94.6.8.8.35";
+       sha256 = "1rgslippp796wm36gmc0aywhk1d1ifx88l37msnmncdvj7p6sf8s";
        libraryHaskellDepends = [
          array base bytestring containers regex-base
        ];
@@ -205653,6 +205756,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "scheduler_1_4_2_1" = callPackage
+    ({ mkDerivation, async, atomic-primops, base, Cabal, cabal-doctest
+     , criterion, deepseq, doctest, exceptions, genvalidity-hspec, hspec
+     , monad-par, mwc-random, parallel, primitive, QuickCheck, streamly
+     , template-haskell, unliftio, unliftio-core, vector
+     }:
+     mkDerivation {
+       pname = "scheduler";
+       version = "1.4.2.1";
+       sha256 = "074m037ksjl7kgpgfldimaadhc4f6mmv40y6cq54m9shhg7rxw1c";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         atomic-primops base deepseq exceptions primitive unliftio-core
+       ];
+       testHaskellDepends = [
+         base deepseq doctest genvalidity-hspec hspec mwc-random QuickCheck
+         template-haskell unliftio vector
+       ];
+       benchmarkHaskellDepends = [
+         async base criterion deepseq monad-par parallel streamly unliftio
+       ];
+       description = "Work stealing scheduler";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "schedyield" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -205979,6 +206108,8 @@ self: {
        ];
        description = "Scientific notation intended for tokenization";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scion" = callPackage
@@ -238259,8 +238390,8 @@ self: {
      }:
      mkDerivation {
        pname = "traction";
-       version = "0.3.0";
-       sha256 = "1y0l02hcbxmc3vidg477z7dlbikalmi448dv8dl5pl7zpflcp7di";
+       version = "0.4.0";
+       sha256 = "1prd4wq5jb4flzdg78861w1x8xwdbgd0b64xbksdprhlvlyrvmxk";
        libraryHaskellDepends = [
          base bytestring containers exceptions mmorph postgresql-simple
          resource-pool syb template-haskell text time transformers
-- 
GitLab


From 69666091041a4a3382fbc53ddf2b3df2aeb7a9a0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 30 Sep 2019 12:48:24 +0200
Subject: [PATCH 1484/2254] Drop obsolete ghcjs-8.4.x code.

The 8.4.x version of ghcjs hasn't compiled successfully
in ages, so I reckon it's unused. The even older code
in pkgs/development/compilers/ghcjs is unused entirely;
it's not even referenced in Nixpkgs.
---
 .../compilers/ghcjs-ng/8.4/dep-overrides.nix  |   9 -
 .../compilers/ghcjs-ng/8.4/git.json           |   6 -
 .../compilers/ghcjs-ng/8.4/stage0.nix         | 176 ------------------
 pkgs/development/compilers/ghcjs/base.nix     | 161 ----------------
 .../development/compilers/ghcjs/gen-stage2.rb |  54 ------
 .../compilers/ghcjs/ghcjs-boot.nix            |  25 ---
 pkgs/top-level/haskell-packages.nix           |  13 --
 7 files changed, 444 deletions(-)
 delete mode 100644 pkgs/development/compilers/ghcjs-ng/8.4/dep-overrides.nix
 delete mode 100644 pkgs/development/compilers/ghcjs-ng/8.4/git.json
 delete mode 100644 pkgs/development/compilers/ghcjs-ng/8.4/stage0.nix
 delete mode 100644 pkgs/development/compilers/ghcjs/base.nix
 delete mode 100755 pkgs/development/compilers/ghcjs/gen-stage2.rb
 delete mode 100644 pkgs/development/compilers/ghcjs/ghcjs-boot.nix

diff --git a/pkgs/development/compilers/ghcjs-ng/8.4/dep-overrides.nix b/pkgs/development/compilers/ghcjs-ng/8.4/dep-overrides.nix
deleted file mode 100644
index efba0dc8634..00000000000
--- a/pkgs/development/compilers/ghcjs-ng/8.4/dep-overrides.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ haskellLib }:
-
-let inherit (haskellLib) dontCheck doJailbreak;
-in self: super: {
-  haddock-library-ghcjs = doJailbreak (dontCheck super.haddock-library-ghcjs);
-  haddock-api-ghcjs = doJailbreak super.haddock-api-ghcjs;
-
-  template-haskell-ghcjs = doJailbreak super.template-haskell-ghcjs;
-}
diff --git a/pkgs/development/compilers/ghcjs-ng/8.4/git.json b/pkgs/development/compilers/ghcjs-ng/8.4/git.json
deleted file mode 100644
index cfa6cf1d7d2..00000000000
--- a/pkgs/development/compilers/ghcjs-ng/8.4/git.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "url": "https://github.com/ghcjs/ghcjs",
-  "rev": "81bf5f31dabaa711aab234cb119eb9c998ccb129",
-  "sha256": "1bgnc71kjqicqv2xq8p70nck600yi2p7g4k9r1jclv21ib7i5hmx",
-  "fetchSubmodules": true
-}
diff --git a/pkgs/development/compilers/ghcjs-ng/8.4/stage0.nix b/pkgs/development/compilers/ghcjs-ng/8.4/stage0.nix
deleted file mode 100644
index 3b89db14497..00000000000
--- a/pkgs/development/compilers/ghcjs-ng/8.4/stage0.nix
+++ /dev/null
@@ -1,176 +0,0 @@
-{ callPackage, configuredSrc }:
-
-{
-
-  ghcjs = callPackage
-    ({ mkDerivation, aeson, array, attoparsec, base, base16-bytestring
-    , base64-bytestring, binary, bytestring, Cabal, containers
-    , cryptohash, data-default, deepseq, directory, executable-path
-    , filepath, ghc-api-ghcjs, ghc-boot, ghc-paths, ghci-ghcjs
-    , ghcjs-th, haddock-api-ghcjs, hashable, haskell-src-exts
-    , haskell-src-meta, http-types, HUnit, lens, lifted-base, mtl
-    , network, optparse-applicative, parallel, parsec, process, random
-    , regex-posix, safe, shelly, split, stdenv, stringsearch, syb
-    , system-fileio, system-filepath, tar, template-haskell
-    , template-haskell-ghcjs, terminfo, test-framework
-    , test-framework-hunit, text, time, transformers
-    , transformers-compat, unix, unix-compat, unordered-containers
-    , vector, wai, wai-app-static, wai-extra, wai-websockets, warp
-    , webdriver, websockets, wl-pprint-text, yaml
-    }:
-    mkDerivation {
-      pname = "ghcjs";
-      version = "8.4.0.1";
-      src = configuredSrc + /.;
-      isLibrary = true;
-      isExecutable = true;
-      enableSeparateDataOutput = true;
-      setupHaskellDepends = [
-        base Cabal containers directory filepath process template-haskell
-        transformers
-      ];
-      libraryHaskellDepends = [
-        aeson array attoparsec base base16-bytestring base64-bytestring
-        binary bytestring Cabal containers cryptohash data-default deepseq
-        directory filepath ghc-api-ghcjs ghc-boot ghc-paths ghci-ghcjs
-        ghcjs-th hashable haskell-src-exts haskell-src-meta lens mtl
-        optparse-applicative parallel parsec process regex-posix safe split
-        stringsearch syb template-haskell template-haskell-ghcjs text time
-        transformers unordered-containers vector wl-pprint-text yaml
-      ];
-      executableHaskellDepends = [
-        aeson base binary bytestring Cabal containers directory
-        executable-path filepath ghc-api-ghcjs ghc-boot haddock-api-ghcjs
-        lens mtl optparse-applicative process shelly system-fileio
-        system-filepath tar terminfo text time transformers
-        transformers-compat unix unix-compat unordered-containers vector
-        yaml
-      ];
-      testHaskellDepends = [
-        aeson base bytestring data-default deepseq directory http-types
-        HUnit lens lifted-base network optparse-applicative process random
-        shelly system-fileio system-filepath test-framework
-        test-framework-hunit text time transformers unordered-containers
-        wai wai-app-static wai-extra wai-websockets warp webdriver
-        websockets yaml
-      ];
-      description = "Haskell to JavaScript compiler";
-      license = stdenv.lib.licenses.mit;
-    }) {};
-
-  ghc-api-ghcjs = callPackage
-    ({ mkDerivation, array, base, binary, bytestring, containers
-    , deepseq, directory, filepath, ghc-boot, ghc-boot-th, ghci-ghcjs
-    , hpc, process, stdenv, template-haskell-ghcjs, terminfo, time
-    , transformers, unix
-    }:
-    mkDerivation {
-      pname = "ghc-api-ghcjs";
-      version = "8.4.0";
-      src = configuredSrc + /lib/ghc-api-ghcjs;
-      libraryHaskellDepends = [
-        array base binary bytestring containers deepseq directory filepath
-        ghc-boot ghc-boot-th ghci-ghcjs hpc process template-haskell-ghcjs
-        terminfo time transformers unix
-      ];
-      homepage = "http://www.haskell.org/ghc/";
-      description = "The GHC API (customized for GHCJS)";
-      license = stdenv.lib.licenses.bsd3;
-    }) {};
-
-  ghci-ghcjs = callPackage
-    ({ mkDerivation, array, base, binary, bytestring, containers
-    , deepseq, filepath, ghc-boot, ghc-boot-th, stdenv
-    , template-haskell-ghcjs, transformers, unix
-    }:
-    mkDerivation {
-      pname = "ghci-ghcjs";
-      version = "8.4.0";
-      src = configuredSrc + /lib/ghci-ghcjs;
-      libraryHaskellDepends = [
-        array base binary bytestring containers deepseq filepath ghc-boot
-        ghc-boot-th template-haskell-ghcjs transformers unix
-      ];
-      description = "The library supporting GHC's interactive interpreter (customized for GHCJS)";
-      license = stdenv.lib.licenses.bsd3;
-    }) {};
-
-  ghcjs-th = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, ghc-prim
-    , ghci-ghcjs, stdenv, template-haskell-ghcjs
-    }:
-    mkDerivation {
-      pname = "ghcjs-th";
-      version = "0.1.0.0";
-      src = configuredSrc + /lib/ghcjs-th;
-      libraryHaskellDepends = [
-        base binary bytestring containers ghc-prim ghci-ghcjs
-        template-haskell-ghcjs
-      ];
-      homepage = "https://github.com/ghcjs";
-      license = stdenv.lib.licenses.mit;
-    }) {};
-
-  haddock-api-ghcjs = callPackage
-    ({ mkDerivation, array, base, bytestring, Cabal, containers, deepseq
-    , directory, filepath, ghc-api-ghcjs, ghc-boot, ghc-paths
-    , haddock-library-ghcjs, hspec, hspec-discover, QuickCheck, stdenv
-    , transformers, xhtml
-    }:
-    mkDerivation {
-      pname = "haddock-api-ghcjs";
-      version = "2.20.0";
-      src = configuredSrc + /lib/haddock-api-ghcjs;
-      enableSeparateDataOutput = true;
-      libraryHaskellDepends = [
-        array base bytestring Cabal containers deepseq directory filepath
-        ghc-api-ghcjs ghc-boot ghc-paths haddock-library-ghcjs transformers
-        xhtml
-      ];
-      testHaskellDepends = [
-        array base bytestring Cabal containers deepseq directory filepath
-        ghc-api-ghcjs ghc-boot ghc-paths haddock-library-ghcjs hspec
-        QuickCheck transformers xhtml
-      ];
-      testToolDepends = [ hspec-discover ];
-      homepage = "http://www.haskell.org/haddock/";
-      description = "A documentation-generation tool for Haskell libraries";
-      license = stdenv.lib.licenses.bsd3;
-    }) {};
-
-  haddock-library-ghcjs = callPackage
-    ({ mkDerivation, base, base-compat, bytestring, containers, deepseq
-    , directory, filepath, haddock-library, hspec, hspec-discover
-    , optparse-applicative, QuickCheck, stdenv, transformers, tree-diff
-    }:
-    mkDerivation {
-      pname = "haddock-library-ghcjs";
-      version = "1.6.0";
-      src = configuredSrc + /lib/haddock-library-ghcjs;
-      libraryHaskellDepends = [
-        base bytestring containers deepseq transformers
-      ];
-      testHaskellDepends = [
-        base base-compat bytestring containers deepseq directory filepath
-        haddock-library hspec optparse-applicative QuickCheck transformers
-        tree-diff
-      ];
-      testToolDepends = [ hspec-discover ];
-      doHaddock = false;
-      homepage = "http://www.haskell.org/haddock/";
-      description = "Library exposing some functionality of Haddock";
-      license = stdenv.lib.licenses.bsd3;
-    }) {};
-
-  template-haskell-ghcjs = callPackage
-    ({ mkDerivation, base, ghc-boot-th, pretty, stdenv }:
-    mkDerivation {
-      pname = "template-haskell-ghcjs";
-      version = "2.13.0.0";
-      src = configuredSrc + /lib/template-haskell-ghcjs;
-      libraryHaskellDepends = [ base ghc-boot-th pretty ];
-      description = "Support library for Template Haskell (customized for GHCJS)";
-      license = stdenv.lib.licenses.bsd3;
-    }) {};
-
-}
diff --git a/pkgs/development/compilers/ghcjs/base.nix b/pkgs/development/compilers/ghcjs/base.nix
deleted file mode 100644
index ba0bbb1962b..00000000000
--- a/pkgs/development/compilers/ghcjs/base.nix
+++ /dev/null
@@ -1,161 +0,0 @@
-{ mkDerivation
-, lib
-, broken ? false
-, test-framework
-, test-framework-hunit
-, data-default
-, ghc-paths
-, haskell-src-exts
-, haskell-src-meta
-, optparse-applicative
-, system-fileio
-, system-filepath
-, text-binary
-, unordered-containers
-, cabal-install
-, wl-pprint-text
-, base16-bytestring
-, executable-path
-, transformers-compat
-, haddock-api
-, regex-posix
-
-, bootPkgs, gmp
-
-, runCommand
-, nodejs, stdenv, filepath, HTTP, HUnit, mtl, network, QuickCheck, random, stm
-, time
-, zlib, aeson, attoparsec, bzlib, hashable
-, lens
-, parallel, safe, shelly, split, stringsearch, syb
-, tar, terminfo
-, vector, yaml
-, alex, happy, git, gnumake, autoconf, patch
-, automake, libtool
-, cryptohash
-, haddock, hspec, xhtml, pkgs
-, coreutils
-, libiconv
-
-, version
-, ghcjsSrc
-, ghcjsBootSrc
-, ghcjsBoot ? import ./ghcjs-boot.nix {
-    inherit runCommand;
-    src = ghcjsBootSrc;
-  }
-, shims
-
-# This is the list of the Stage 1 packages that are built into a booted ghcjs installation
-# It can be generated with the command:
-# nix-shell -p haskell.packages.ghcjs.ghc --command "ghcjs-pkg list | sed -n 's/^    \(.*\)-\([0-9.]*\)$/\1_\2/ p' | sed 's/\./_/g' | sed 's/^\([^_]*\)\(.*\)$/      \"\1\"/'"
-, stage1Packages
-
-, stage2 ? import ./stage2.nix
-
-, patches
-
-# used for resolving compiler plugins
-, ghcLibdir ? null
-}:
-let
-  inherit (bootPkgs) ghc;
-
-in mkDerivation ({
-  pname = "ghcjs";
-  inherit version;
-  src = ghcjsSrc;
-  isLibrary = true;
-  isExecutable = true;
-  jailbreak = true;
-  doHaddock = false;
-  doCheck = false;
-  buildDepends = [
-    filepath HTTP mtl network random stm time zlib aeson attoparsec
-    bzlib data-default ghc-paths hashable haskell-src-exts haskell-src-meta
-    lens optparse-applicative parallel safe shelly split
-    stringsearch syb system-fileio system-filepath tar terminfo text-binary
-    unordered-containers vector wl-pprint-text yaml
-    alex happy git gnumake autoconf automake libtool patch gmp
-    base16-bytestring cryptohash executable-path haddock-api
-    transformers-compat QuickCheck haddock hspec xhtml
-    regex-posix libiconv
-  ];
-  buildTools = [ nodejs git ];
-  testDepends = [
-    HUnit test-framework test-framework-hunit
-  ];
-  inherit patches;
-  postPatch = ''
-    substituteInPlace Setup.hs \
-      --replace "/usr/bin/env" "${coreutils}/bin/env"
-
-    substituteInPlace src/Compiler/Info.hs \
-      --replace "@PREFIX@" "$out"          \
-      --replace "@VERSION@" "${version}"
-
-    substituteInPlace src-bin/Boot.hs \
-      --replace "@PREFIX@" "$out"     \
-      --replace "@CC@"     "${stdenv.cc}/bin/cc"
-  '';
-  preBuild = ''
-    export HOME="$TMP"
-
-    local topDir=$out/lib/ghcjs-${version}
-    mkdir -p $topDir
-
-    cp -r ${ghcjsBoot} $topDir/ghcjs-boot
-    chmod -R u+w $topDir/ghcjs-boot
-
-    cp -r ${shims} $topDir/shims
-    chmod -R u+w $topDir/shims
-
-    # Make the patches be relative their corresponding package's directory.
-    # See: https://github.com/ghcjs/ghcjs-boot/pull/12
-    for patch in "$topDir/ghcjs-boot/patches/"*.patch; do
-      echo "fixing patch: $patch"
-      sed -i -e 's@ \(a\|b\)/boot/[^/]\+@ \1@g' $patch
-    done
-  '';
-  # We build with --quick so we can build stage 2 packages separately.
-  # This is necessary due to: https://github.com/haskell/cabal/commit/af19fb2c2d231d8deff1cb24164a2bf7efb8905a
-  # Cabal otherwise fails to build: http://hydra.nixos.org/build/31824079/nixlog/1/raw
-  postInstall = ''
-    PATH=$out/bin:$PATH LD_LIBRARY_PATH=${gmp.out}/lib:${stdenv.cc}/lib64:$LD_LIBRARY_PATH \
-      env -u GHC_PACKAGE_PATH $out/bin/ghcjs-boot \
-        --dev \
-        --quick \
-        --with-cabal ${cabal-install}/bin/cabal \
-        --with-gmp-includes ${gmp.dev}/include \
-        --with-gmp-libraries ${gmp.out}/lib
-  '' + lib.optionalString (ghcLibdir != null) ''
-    printf '%s' '${ghcLibdir}' > "$out/lib/ghcjs-${version}/ghc_libdir"
-  '';
-  passthru = {
-    inherit bootPkgs;
-    ghcVersion = ghc.version;
-    isCross = true;
-    isGhcjs = true;
-    inherit nodejs ghcjsBoot;
-    socket-io = pkgs.nodePackages."socket.io";
-    haskellCompilerName = "ghcjs-${version}";
-
-    # let us assume ghcjs is never actually cross compiled
-    targetPrefix = "";
-
-    enableShared = true;
-
-    inherit stage1Packages;
-    mkStage2 = stage2 {
-      inherit ghcjsBoot;
-    };
-  };
-
-  homepage = https://github.com/ghcjs/ghcjs;
-  description = "A Haskell to JavaScript compiler that uses the GHC API";
-  license = stdenv.lib.licenses.bsd3;
-  platforms = ghc.meta.platforms;
-  maintainers = with stdenv.lib.maintainers; [ jwiegley cstrahan dmjio elvishjerricco ];
-  hydraPlatforms = if broken then [] else ghc.meta.platforms;
-  inherit broken;
-})
diff --git a/pkgs/development/compilers/ghcjs/gen-stage2.rb b/pkgs/development/compilers/ghcjs/gen-stage2.rb
deleted file mode 100755
index 709e635db55..00000000000
--- a/pkgs/development/compilers/ghcjs/gen-stage2.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'pathname'
-
-# from boot.yaml in ghcjs/ghcjs
-stage2_packages = [
-  "boot/async",
-  "boot/aeson",
-  "boot/attoparsec",
-  "boot/case-insensitive",
-  "boot/dlist",
-  "boot/extensible-exceptions",
-  "boot/hashable",
-  "boot/mtl",
-  "boot/old-time",
-  "boot/parallel",
-  "boot/scientific",
-  "boot/stm",
-  "boot/syb",
-  "boot/text",
-  "boot/unordered-containers",
-  "boot/vector",
-  "ghcjs/ghcjs-base",
-  # not listed under stage2, but needed when "quick booting".
-  "boot/cabal/Cabal"
-]
-
-nixpkgs = File.expand_path("../../../../..", __FILE__)
-boot = ARGV[0] || `nix-build #{nixpkgs} -A haskell.packages.ghcjs.ghc.ghcjsBoot`.chomp
-
-out = "".dup
-out << "{ ghcjsBoot }: { callPackage }:\n"
-out << "\n"
-out << "{\n"
-
-stage2_packages.each do |package|
-  name = Pathname.new(package).basename
-  nix = `cabal2nix file://#{boot}/#{package}  --jailbreak`
-  nix.sub!(/src =.*?$/, "src = \"${ghcjsBoot}/#{package}\";")
-  nix.sub!("  doCheck = false;\n", "")
-  nix.sub!("libraryHaskellDepends", "doCheck = false;\n  libraryHaskellDepends")
-  # cabal2nix somehow generates the deps for 'text' as if it had selected flag
-  # 'integer-simple' (despite not passing the flag within the generated
-  # expression). We want integer-gmp instead.
-  nix.gsub!(/integer-simple/, "integer-gmp")
-  nix = nix.split("\n").join("\n      ")
-
-  out << "  #{name} = callPackage\n"
-  out << "    (#{nix}) {};\n"
-end
-
-out << "}"
-
-puts out
diff --git a/pkgs/development/compilers/ghcjs/ghcjs-boot.nix b/pkgs/development/compilers/ghcjs/ghcjs-boot.nix
deleted file mode 100644
index c00e13a9240..00000000000
--- a/pkgs/development/compilers/ghcjs/ghcjs-boot.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ runCommand, src }:
-
-# we remove the patches so ghcjs-boot doesn't try to apply them again.
-runCommand "${src.name}-patched" {} ''
-  cp -r ${src} $out
-  chmod -R +w $out
-
-  # Make the patches be relative their corresponding package's directory.
-  # See: https://github.com/ghcjs/ghcjs-boot/pull/12
-  for patch in $out/patches/*.patch; do
-    echo ">> fixing patch: $patch"
-    sed -i -e 's@ \(a\|b\)/boot/[^/]\+@ \1@g' $patch
-  done
-
-  for package in $(cd $out/boot; echo *); do
-    patch=$out/patches/$package.patch
-    if [[ -e $patch ]]; then
-      echo ">> patching package: $package"
-      pushd $out/boot/$package
-      patch -p1 < $patch
-      rm $patch
-      popd
-    fi
-  done
-''
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index be7c0bc4171..8f1133d9ba2 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -7,7 +7,6 @@ let
     "ghc863Binary"
     "ghc844"
     "ghcjs"
-    "ghcjs84"
     "ghcjs86"
     "integer-simple"
   ];
@@ -70,12 +69,6 @@ in {
       llvmPackages = pkgs.llvmPackages_6;
     };
     ghcjs = compiler.ghcjs86;
-    ghcjs84 = callPackage ../development/compilers/ghcjs-ng {
-      bootPkgs = packages.ghc844;
-      ghcjsSrcJson = ../development/compilers/ghcjs-ng/8.4/git.json;
-      stage0 = ../development/compilers/ghcjs-ng/8.4/stage0.nix;
-      ghcjsDepOverrides = callPackage ../development/compilers/ghcjs-ng/8.4/dep-overrides.nix {};
-    };
     ghcjs86 = callPackage ../development/compilers/ghcjs-ng {
       bootPkgs = packages.ghc865;
       ghcjsSrcJson = ../development/compilers/ghcjs-ng/8.6/git.json;
@@ -133,12 +126,6 @@ in {
       compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { };
     };
     ghcjs = packages.ghcjs86;
-    ghcjs84 = callPackage ../development/haskell-modules rec {
-      buildHaskellPackages = ghc.bootPkgs;
-      ghc = bh.compiler.ghcjs84;
-      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.4.x.nix { };
-      packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };
-    };
     ghcjs86 = callPackage ../development/haskell-modules rec {
       buildHaskellPackages = ghc.bootPkgs;
       ghc = bh.compiler.ghcjs86;
-- 
GitLab


From 1c92cdaf7414261b4a0e0753ca9383137e6fef06 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 30 Sep 2019 12:52:43 +0200
Subject: [PATCH 1485/2254] configuration-ghcjs.nix: fix evaluation

---
 .../haskell-modules/configuration-ghcjs.nix          | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix
index 489f363db6a..862b45299a6 100644
--- a/pkgs/development/haskell-modules/configuration-ghcjs.nix
+++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix
@@ -43,13 +43,12 @@ self: super:
   # integer-simple is wrong.
   #integer-simple = null;
 
-  # These packages are core libraries in GHC 7.10.x, but not here.
+  # These packages are core libraries in GHC 8.6..x, but not here.
   bin-package-db = null;
-  haskeline = self.haskeline_0_7_3_1;
-  hoopl = self.hoopl_3_10_2_1;
-  hpc = self.hpc_0_6_0_2;
-  terminfo = self.terminfo_0_4_1_1;
-  xhtml = self.xhtml_3000_2_1;
+  haskeline = self.haskeline_0_7_5_0;
+  hpc = self.hpc_0_6_0_3;
+  terminfo = self.terminfo_0_4_1_4;
+  xhtml = self.xhtml_3000_2_2_1;
 
 ## OTHER PACKAGES
 
@@ -115,7 +114,6 @@ self: super:
       ];
       license = pkgs.stdenv.lib.licenses.mit;
       description = "bindings for https://github.com/Matt-Esch/virtual-dom";
-      inherit (src) homepage;
     }) {};
 
   ghcjs-dom = overrideCabal super.ghcjs-dom (drv: {
-- 
GitLab


From 821676200d6f65c9eb4584e393af1204eeb7e363 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 30 Sep 2019 13:56:16 +0200
Subject: [PATCH 1486/2254] cachix: comment why boost is needed

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

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 3ef96ca4138..feebec7d2dc 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -94,6 +94,7 @@ self: super: builtins.intersectAttrs super {
   # Won't find it's header files without help.
   sfml-audio = appendConfigureFlag super.sfml-audio "--extra-include-dirs=${pkgs.openal}/include/AL";
 
+  # cachix needs boost_context dur to Nix, until boost has multiple outputs this is the easiest
   cachix = addBuildTools (enableSeparateBinOutput super.cachix) [pkgs.boost];
 
   niv = enableSeparateBinOutput super.niv;
-- 
GitLab


From dbda0f2052ca361898f9154b8104c0ccac9a13fc Mon Sep 17 00:00:00 2001
From: Simonas Kazlauskas <git@kazlauskas.me>
Date: Mon, 30 Sep 2019 15:01:27 +0300
Subject: [PATCH 1487/2254] berlgas: init at 0.2.0

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

diff --git a/pkgs/tools/admin/berglas/default.nix b/pkgs/tools/admin/berglas/default.nix
new file mode 100644
index 00000000000..239fc9691f7
--- /dev/null
+++ b/pkgs/tools/admin/berglas/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+
+  name = "berglas-${version}";
+  version = "0.2.0";
+
+  src = fetchFromGitHub {
+    owner = "GoogleCloudPlatform";
+    repo = "berglas";
+    rev = "v0.2.0";
+    sha256 = "1d75x0n1d1ry2xmy6h64qqc0dlnivipycv3p0aihyp3l810gpdbk";
+  };
+
+  modSha256 = "0fvgvrvdpdwjx51wmbf0rdwnr9l1l212qbvznvif3xsi5nnlkx6r";
+
+  meta = with stdenv.lib; {
+    description = "A tool for managing secrets on Google Cloud";
+    homepage = https://github.com/GoogleCloudPlatform/berglas;
+    license = licenses.asl20;
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6e394eb8b4e..00a7704318b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -700,6 +700,8 @@ in
 
   awless = callPackage ../tools/virtualization/awless { };
 
+  berglas = callPackage ../tools/admin/berglas/default.nix { };
+
   brakeman = callPackage ../development/tools/analysis/brakeman { };
 
   brewtarget = libsForQt5.callPackage ../applications/misc/brewtarget { } ;
-- 
GitLab


From a4487e81c7cf817cc72a21728f21ec65b40d2885 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 30 Sep 2019 15:44:14 +0300
Subject: [PATCH 1488/2254] Use only pname instead of name attr

---
 pkgs/applications/networking/mailreaders/hasmail/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/hasmail/default.nix b/pkgs/applications/networking/mailreaders/hasmail/default.nix
index 05d869e3349..2e2042d8b07 100644
--- a/pkgs/applications/networking/mailreaders/hasmail/default.nix
+++ b/pkgs/applications/networking/mailreaders/hasmail/default.nix
@@ -9,9 +9,8 @@
 }:
 
 buildGoModule rec {
-  pname = "hasmail";
+  pname = "hasmail-unstable";
   version = "2019-08-24";
-  name = "${pname}-${version}-unstable";
 
   src = fetchFromGitHub {
     owner = "jonhoo";
-- 
GitLab


From fb6dd16789f7e8069407ee03ca70559218368dc9 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 30 Sep 2019 15:44:41 +0300
Subject: [PATCH 1489/2254] Remove gobject-introspection and put pkgconfig in
 native

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

diff --git a/pkgs/applications/networking/mailreaders/hasmail/default.nix b/pkgs/applications/networking/mailreaders/hasmail/default.nix
index 2e2042d8b07..49f0ac53365 100644
--- a/pkgs/applications/networking/mailreaders/hasmail/default.nix
+++ b/pkgs/applications/networking/mailreaders/hasmail/default.nix
@@ -21,9 +21,11 @@ buildGoModule rec {
 
   modSha256 = "0z3asz7v1izg81f9xifx9s2sp5hly173hajsn9idi3bkv0h78is2";
 
-  buildInputs = [
+  nativeBuildInputs = [
     pkgconfig
-    gobject-introspection
+  ];
+
+  buildInputs = [
     pango
     cairo
     gtk2
-- 
GitLab


From 432ba5105b257e401f214fa6ae6d60a5e6c38962 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 30 Sep 2019 06:29:44 -0700
Subject: [PATCH 1490/2254] pythonPackages.stevedore: 1.30.1 -> 1.31.0

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

diff --git a/pkgs/development/python-modules/stevedore/default.nix b/pkgs/development/python-modules/stevedore/default.nix
index e7f8be7b469..2e3071ed29c 100644
--- a/pkgs/development/python-modules/stevedore/default.nix
+++ b/pkgs/development/python-modules/stevedore/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, buildPythonPackage, fetchPypi, pbr, six }:
+{ stdenv, buildPythonPackage, fetchPypi, pbr, setuptools, six }:
 
 buildPythonPackage rec {
   pname = "stevedore";
-  version = "1.30.1";
+  version = "1.31.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1860zslirsqskc2iifljxcyly28zqgjpmkm7k3bj6zyqagzriq3v";
+    sha256 = "054apq55yg7058pmbnyc8jhrcpi9clmi0sm7znhwg0d676brywz0";
   };
 
   doCheck = false;
 
-  propagatedBuildInputs = [ pbr six ];
+  propagatedBuildInputs = [ pbr setuptools six ];
 
   meta = with stdenv.lib; {
     description = "Manage dynamic plugins for Python applications";
-- 
GitLab


From 073f50593b643438ab73c581028c38d5bb059183 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 30 Sep 2019 06:30:36 -0700
Subject: [PATCH 1491/2254] pythonPackages.jenkins-job-builder: 3.0.1 -> 3.0.2

---
 .../jenkins-job-builder/default.nix           | 23 ++++++++-----------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/jenkins-job-builder/default.nix b/pkgs/development/python-modules/jenkins-job-builder/default.nix
index e6c4086c386..184c86e9268 100644
--- a/pkgs/development/python-modules/jenkins-job-builder/default.nix
+++ b/pkgs/development/python-modules/jenkins-job-builder/default.nix
@@ -1,37 +1,32 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
+{ lib, buildPythonPackage, fetchPypi, isPy27
+, fasteners
+, jinja2
 , pbr
-, mock
 , python-jenkins
 , pyyaml
 , six
 , stevedore
-, isPy27
-, fasteners
-, jinja2
 }:
 
 buildPythonPackage rec {
   pname = "jenkins-job-builder";
-  version = "3.0.1";
-  disabled = !isPy27;
+  version = "3.0.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "16x97pdr90x3xsc1xl66l7q77pgja5dzsk921by2h09k7dvxaqmh";
+    sha256 = "02ggscsyrrqk06w9lb43km77qgcj8cixrrm5mkigr4gz2pzdjhmf";
   };
 
   postPatch = ''
     export HOME=$TMPDIR
   '';
 
-  propagatedBuildInputs = [ pbr mock python-jenkins pyyaml six stevedore fasteners jinja2 ];
+  propagatedBuildInputs = [ pbr python-jenkins pyyaml six stevedore fasteners jinja2 ];
 
-  # Need to fix test deps
-  doCheck = false;
+  # Need to fix test deps, relies on stestr and a few other packages that aren't available on nixpkgs
+  checkPhase = ''$out/bin/jenkins-jobs --help'';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Jenkins Job Builder is a system for configuring Jenkins jobs using simple YAML files stored in Git";
     homepage = "https://docs.openstack.org/infra/system-config/jjb.html";
     license = licenses.asl20;
-- 
GitLab


From 3c8a7afa8e5347e3af6b22b1e47ccf8d222c7877 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 30 Sep 2019 06:33:24 -0700
Subject: [PATCH 1492/2254] jenkins-job-builder: use python3

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 00a7704318b..1bb0a16d9ee 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9756,7 +9756,7 @@ in
 
   jenkins = callPackage ../development/tools/continuous-integration/jenkins { };
 
-  jenkins-job-builder = pythonPackages.jenkins-job-builder;
+  jenkins-job-builder = with python3Packages; toPythonApplication jenkins-job-builder;
 
   kafkacat = callPackage ../development/tools/kafkacat { };
 
-- 
GitLab


From 5e4270f451b3c29366bdb79bfe86afbf3d5f46e4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 30 Sep 2019 15:52:25 +0200
Subject: [PATCH 1493/2254] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.15.0-1-g5325ccd from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/48972320ba180459d6ad28ab4f21389b1b3d7fc6.
---
 .../haskell-modules/hackage-packages.nix      | 198 +++++++++++++++---
 1 file changed, 164 insertions(+), 34 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 798683996fb..4ca103186cf 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -43584,30 +43584,36 @@ self: {
        broken = true;
      }) {};
 
-  "bulletproofs_1_0_1" = callPackage
-    ({ mkDerivation, arithmoi, base, containers, criterion, cryptonite
-     , galois-field, memory, MonadRandom, protolude, QuickCheck
-     , random-shuffle, tasty, tasty-discover, tasty-hunit
+  "bulletproofs_1_1_0" = callPackage
+    ({ mkDerivation, arithmoi, base, bytestring, containers, criterion
+     , cryptonite, elliptic-curve, galois-field, memory, MonadRandom
+     , protolude, QuickCheck, SHA, tasty, tasty-discover, tasty-hunit
      , tasty-quickcheck, text
      }:
      mkDerivation {
        pname = "bulletproofs";
-       version = "1.0.1";
-       sha256 = "1c23dppl851a1ga9x8axkl27bswb0hlwql0mfabsd9ydclmipzf0";
+       version = "1.1.0";
+       sha256 = "1sj38m2x4y9483nwnk61jk4jphsyllgv5bgrx26nqlph45a9222a";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
-         arithmoi base containers cryptonite galois-field memory MonadRandom
-         protolude QuickCheck random-shuffle text
+         arithmoi base bytestring containers elliptic-curve galois-field
+         memory MonadRandom protolude QuickCheck SHA text
+       ];
+       executableHaskellDepends = [
+         arithmoi base bytestring containers elliptic-curve galois-field
+         memory MonadRandom protolude QuickCheck SHA text
        ];
        testHaskellDepends = [
-         arithmoi base containers cryptonite galois-field memory MonadRandom
-         protolude QuickCheck random-shuffle tasty tasty-discover
-         tasty-hunit tasty-quickcheck text
+         arithmoi base bytestring containers cryptonite elliptic-curve
+         galois-field memory MonadRandom protolude QuickCheck SHA tasty
+         tasty-discover tasty-hunit tasty-quickcheck text
        ];
        testToolDepends = [ tasty-discover ];
        benchmarkHaskellDepends = [
-         arithmoi base containers criterion cryptonite galois-field memory
-         MonadRandom protolude QuickCheck random-shuffle tasty tasty-hunit
-         tasty-quickcheck text
+         arithmoi base bytestring containers criterion elliptic-curve
+         galois-field memory MonadRandom protolude QuickCheck SHA tasty
+         tasty-hunit tasty-quickcheck text
        ];
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -44123,8 +44129,8 @@ self: {
      }:
      mkDerivation {
        pname = "bytesmith";
-       version = "0.2.0.1";
-       sha256 = "1qscwrsn18fms4kkia9rw9nqm115if97n8vhk8c71ri1hjqxvmb1";
+       version = "0.3.0.0";
+       sha256 = "0zwa0klj1slazsvd37l33p5j2ii3ab114ic5fvd10aic37y6w82s";
        libraryHaskellDepends = [
          base byteslice bytestring contiguous primitive run-st text-short
        ];
@@ -46216,10 +46222,10 @@ self: {
      }) {};
 
   "cachix" = callPackage
-    ({ mkDerivation, async, base, base64-bytestring, boost_context
-     , bytestring, cachix-api, conduit, conduit-extra, containers
-     , cookie, cryptonite, dhall, directory, ed25519, filepath, fsnotify
-     , here, hnix-store-core, hspec, hspec-discover, http-client
+    ({ mkDerivation, async, base, base64-bytestring, boost, bytestring
+     , cachix-api, conduit, conduit-extra, containers, cookie
+     , cryptonite, dhall, directory, ed25519, filepath, fsnotify, here
+     , hnix-store-core, hspec, hspec-discover, http-client
      , http-client-tls, http-conduit, http-types, inline-c, inline-c-cpp
      , lzma-conduit, megaparsec, memory, mmorph, netrc, nix
      , optparse-applicative, process, protolude, resourcet, retry
@@ -46243,7 +46249,7 @@ self: {
          servant-auth-client servant-client servant-client-core
          servant-conduit text unix uri-bytestring versions
        ];
-       librarySystemDepends = [ boost_context ];
+       librarySystemDepends = [ boost ];
        libraryPkgconfigDepends = [ nix ];
        executableHaskellDepends = [ base cachix-api ];
        executableToolDepends = [ hspec-discover ];
@@ -46252,7 +46258,7 @@ self: {
        ];
        description = "Command line client for Nix binary cache hosting https://cachix.org";
        license = stdenv.lib.licenses.asl20;
-     }) {boost_context = null; inherit (pkgs) nix;};
+     }) {inherit (pkgs) boost; inherit (pkgs) nix;};
 
   "cachix-api" = callPackage
     ({ mkDerivation, aeson, base, base16-bytestring, bytestring
@@ -91313,8 +91319,8 @@ self: {
      }:
      mkDerivation {
        pname = "genvalidity-mergeful";
-       version = "0.0.0.0";
-       sha256 = "07j3dczqxmwri458r8nml3rn31ii14fdz3b2sc8g41f2czr6fa75";
+       version = "0.1.0.0";
+       sha256 = "04vk1jrn69i61l445y3nyw8pklfgbfcja30ghjvcrxxdf9nlmciy";
        libraryHaskellDepends = [
          base containers genvalidity genvalidity-containers genvalidity-time
          mergeful QuickCheck
@@ -136682,6 +136688,37 @@ self: {
        broken = true;
      }) {};
 
+  "ip_1_6_0" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, byteslice, bytesmith
+     , bytestring, criterion, deepseq, doctest, hashable, hspec
+     , hspec-discover, HUnit, natural-arithmetic, primitive, QuickCheck
+     , quickcheck-classes, small-bytearray-builder, tasty, tasty-hunit
+     , tasty-quickcheck, text, text-short, vector, wide-word
+     }:
+     mkDerivation {
+       pname = "ip";
+       version = "1.6.0";
+       sha256 = "19qs04lcjpzcdl9b1yi6clc72w25i0qc04nm877bgy3sqp7qj2zm";
+       libraryHaskellDepends = [
+         aeson attoparsec base byteslice bytesmith bytestring deepseq
+         hashable natural-arithmetic primitive small-bytearray-builder text
+         text-short vector wide-word
+       ];
+       testHaskellDepends = [
+         attoparsec base byteslice bytestring doctest hspec HUnit QuickCheck
+         quickcheck-classes tasty tasty-hunit tasty-quickcheck text
+         text-short wide-word
+       ];
+       testToolDepends = [ hspec-discover ];
+       benchmarkHaskellDepends = [
+         attoparsec base byteslice bytestring criterion text
+       ];
+       description = "Library for IP and MAC addresses";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "ip-quoter" = callPackage
     ({ mkDerivation, base, cpu, network, tasty, tasty-hunit
      , template-haskell
@@ -140246,8 +140283,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-tokens";
-       version = "0.1.0.0";
-       sha256 = "18kshh9g7pm68lqn4k89jy36xblk2gi37zfvla3l1kavcjcf15jd";
+       version = "0.1.0.1";
+       sha256 = "031x1k0j86qnkq8xddxf6q8mhrbmd88aa40x8w6485zr1v16dnis";
        libraryHaskellDepends = [
          array-builder array-chunks base byteslice bytesmith bytestring
          primitive scientific-notation text-short
@@ -156036,6 +156073,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "massiv-test_0_1_1" = callPackage
+    ({ mkDerivation, base, bytestring, containers, data-default
+     , data-default-class, deepseq, exceptions, genvalidity-hspec, hspec
+     , massiv, primitive, QuickCheck, scheduler, unliftio, vector
+     }:
+     mkDerivation {
+       pname = "massiv-test";
+       version = "0.1.1";
+       sha256 = "0fz3bf0lmwhzbxwpfschwk4yn3dzr5p542dqkvkbdmlx97spm1vi";
+       libraryHaskellDepends = [
+         base bytestring data-default-class deepseq exceptions hspec massiv
+         primitive QuickCheck scheduler unliftio vector
+       ];
+       testHaskellDepends = [
+         base bytestring containers data-default deepseq genvalidity-hspec
+         hspec massiv QuickCheck scheduler vector
+       ];
+       description = "Library that contains generators, properties and tests for Massiv Array Library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "master-plan" = callPackage
     ({ mkDerivation, base, diagrams, diagrams-lib, diagrams-rasterific
      , hspec, megaparsec, mtl, optparse-applicative, QuickCheck
@@ -157980,8 +158039,8 @@ self: {
      }:
      mkDerivation {
        pname = "mergeful";
-       version = "0.0.0.0";
-       sha256 = "1zvli3gqw5svr5k36yl420ih2x8drl1522khn8jmjp9n26hc080w";
+       version = "0.1.0.0";
+       sha256 = "1cw3mrbza5fqrh4qg4bjzw4dv23vwb0aglh0dcwzmzsl23hnvhad";
        libraryHaskellDepends = [
          aeson base containers mtl text time validity validity-containers
          validity-time
@@ -198084,6 +198143,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) pcre;};
 
+  "regex-pcre_0_95_0_0" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, pcre
+     , regex-base
+     }:
+     mkDerivation {
+       pname = "regex-pcre";
+       version = "0.95.0.0";
+       sha256 = "0nn76q4bsjnxim0j0d01jifmh36as9jdpcvm001a851vvq86zb8n";
+       libraryHaskellDepends = [
+         array base bytestring containers regex-base
+       ];
+       libraryPkgconfigDepends = [ pcre ];
+       description = "PCRE Backend for \"Text.Regex\" (regex-base)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) pcre;};
+
   "regex-pcre-builtin" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, regex-base }:
      mkDerivation {
@@ -206095,8 +206171,8 @@ self: {
      }:
      mkDerivation {
        pname = "scientific-notation";
-       version = "0.1.0.0";
-       sha256 = "0150krfwm5ya5ws6h39fngbgdhi5hd29jpci07ap3fbq27ygrds0";
+       version = "0.1.0.1";
+       sha256 = "1a877ryswq5h7i3lml55ksrx5hzd9gwbm2yzp0a7cw1hb6r5pjs7";
        libraryHaskellDepends = [ base bytesmith ];
        testHaskellDepends = [
          base byteslice bytesmith bytestring primitive QuickCheck tasty
@@ -207522,6 +207598,8 @@ self: {
        pname = "selda-postgresql";
        version = "0.1.8.0";
        sha256 = "0x7ncc8593lialllgsjdy759cinvgwh4spq2aarfd0j3zv78yvdi";
+       revision = "1";
+       editedCabalFile = "0zbx50lw8d5x7lsx9gpy2ql1n2nryhyd6x7w98lbnb3nzn3szzqr";
        libraryHaskellDepends = [
          base bytestring exceptions postgresql-binary postgresql-libpq selda
          selda-json text time uuid-types
@@ -207538,6 +207616,8 @@ self: {
        pname = "selda-sqlite";
        version = "0.1.7.0";
        sha256 = "0qiagfsd45v3vk1npdm8g28mlbdbnrp3drvb6hdnxyp3b5cmyzik";
+       revision = "1";
+       editedCabalFile = "0m9zps90idp41h3fggd30xjqyjy2yyyb572231w5m2ygl4kv8hvh";
        libraryHaskellDepends = [
          base bytestring direct-sqlite directory exceptions selda text time
          uuid-types
@@ -214049,6 +214129,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "simple-cabal_0_1_0" = callPackage
+    ({ mkDerivation, base, Cabal, directory, filepath }:
+     mkDerivation {
+       pname = "simple-cabal";
+       version = "0.1.0";
+       sha256 = "03isazzxy8bhk9mpzyzr5ls235d0ax7vah0js2jx656ksbbbn8v9";
+       libraryHaskellDepends = [ base Cabal directory filepath ];
+       description = "Cabal file wrapper library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "simple-cmd" = callPackage
     ({ mkDerivation, base, directory, filepath, process, unix }:
      mkDerivation {
@@ -216606,6 +216698,17 @@ self: {
        broken = true;
      }) {};
 
+  "smith" = callPackage
+    ({ mkDerivation, base, bytesmith, primitive }:
+     mkDerivation {
+       pname = "smith";
+       version = "0.1.0.0";
+       sha256 = "13h0v7fl8xi84n0nq9mjsb5hphv2b7l8yaz1hg9ky3bkmqki6vml";
+       libraryHaskellDepends = [ base bytesmith primitive ];
+       description = "Parse arrays of tokens";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "smith-cli" = callPackage
     ({ mkDerivation, attoparsec, base, base64-bytestring, bytestring
      , cereal, crypto-pubkey-openssh, crypto-pubkey-types, directory
@@ -218853,6 +218956,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "socks_0_6_1" = callPackage
+    ({ mkDerivation, base, basement, bytestring, cereal, network }:
+     mkDerivation {
+       pname = "socks";
+       version = "0.6.1";
+       sha256 = "0wvaxy3dkv97wrncjv1rxrmjr4014hgxz82kixvcwqdhidalfi3k";
+       libraryHaskellDepends = [
+         base basement bytestring cereal network
+       ];
+       description = "Socks proxy (ver 5)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "sodium" = callPackage
     ({ mkDerivation, base, containers, mtl }:
      mkDerivation {
@@ -244807,12 +244924,14 @@ self: {
      }) {};
 
   "unpacked-maybe-numeric" = callPackage
-    ({ mkDerivation, base, primitive, QuickCheck, quickcheck-classes }:
+    ({ mkDerivation, base, primitive, QuickCheck, quickcheck-classes
+     , wide-word
+     }:
      mkDerivation {
        pname = "unpacked-maybe-numeric";
-       version = "0.1.0.0";
-       sha256 = "19jz91jkbvnldy56kv9wb1nmbwvlxjh7nqlxc99nq6yi4whsh8gj";
-       libraryHaskellDepends = [ base primitive ];
+       version = "0.1.1.0";
+       sha256 = "1bhipjz20zajbkg6zjgw99w1bzdn6w6ixl34m6wnhvz8bms27lm1";
+       libraryHaskellDepends = [ base primitive wide-word ];
        testHaskellDepends = [ base QuickCheck quickcheck-classes ];
        description = "maybes of numeric values with fewer indirections";
        license = stdenv.lib.licenses.bsd3;
@@ -244820,6 +244939,17 @@ self: {
        broken = true;
      }) {};
 
+  "unpacked-maybe-text" = callPackage
+    ({ mkDerivation, base, bytestring, text-short }:
+     mkDerivation {
+       pname = "unpacked-maybe-text";
+       version = "0.1.0.0";
+       sha256 = "10mc9kjjqf82ddi586g5r6h065znhj9s0ih9w800yw4xl65ygayv";
+       libraryHaskellDepends = [ base bytestring text-short ];
+       description = "optional text that unpacks well";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "unpacked-these" = callPackage
     ({ mkDerivation, base, deepseq, ghc-prim, QuickCheck
      , quickcheck-classes, these, unpacked-maybe
-- 
GitLab


From f29e3b72df43d72d57de3a81228daa615798ffa3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 30 Sep 2019 15:56:13 +0200
Subject: [PATCH 1494/2254] cachix: it's no longer necessary to add boost
 manually

---
 pkgs/development/haskell-modules/configuration-nix.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index feebec7d2dc..5336cb86d62 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -94,8 +94,7 @@ self: super: builtins.intersectAttrs super {
   # Won't find it's header files without help.
   sfml-audio = appendConfigureFlag super.sfml-audio "--extra-include-dirs=${pkgs.openal}/include/AL";
 
-  # cachix needs boost_context dur to Nix, until boost has multiple outputs this is the easiest
-  cachix = addBuildTools (enableSeparateBinOutput super.cachix) [pkgs.boost];
+  cachix = enableSeparateBinOutput super.cachix;
 
   niv = enableSeparateBinOutput super.niv;
 
-- 
GitLab


From 25803ddc86c50ff80e8e5ece97f5cfaac763d867 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 30 Sep 2019 07:06:12 -0700
Subject: [PATCH 1495/2254] pythonPackages.rasterio: add setuptools

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

diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix
index b5dc13f6625..143b5bea155 100644
--- a/pkgs/development/python-modules/rasterio/default.nix
+++ b/pkgs/development/python-modules/rasterio/default.nix
@@ -1,5 +1,5 @@
 { buildPythonPackage, lib, fetchFromGitHub, isPy3k
-, cython
+, cython, setuptools
 , numpy, affine, attrs, cligj, click-plugins, snuggs, gdal
 , pytest, pytestcov, packaging, hypothesis, boto3, mock
 }:
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   checkInputs = [ boto3 pytest pytestcov packaging hypothesis ] ++ lib.optional (!isPy3k) mock;
   nativeBuildInputs = [ cython gdal ];
-  propagatedBuildInputs = [ gdal numpy attrs affine cligj click-plugins snuggs ];
+  propagatedBuildInputs = [ gdal numpy attrs affine cligj click-plugins snuggs setuptools ];
 
   meta = with lib; {
     description = "Python package to read and write geospatial raster data";
-- 
GitLab


From 02585db25bc4d5d623ce083b41f727c65709ad3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:45:50 +0000
Subject: [PATCH 1496/2254] =?UTF-8?q?librsvg:=202.44.14=20=E2=86=92=202.46?=
 =?UTF-8?q?.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

rsvg-view was removed so GTK is not needed anymore
---
 pkgs/development/libraries/librsvg/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix
index 4653b8b86a2..54aed7b4fed 100644
--- a/pkgs/development/libraries/librsvg/default.nix
+++ b/pkgs/development/libraries/librsvg/default.nix
@@ -1,25 +1,24 @@
 { lib, stdenv, fetchurl, pkgconfig, glib, gdk-pixbuf, pango, cairo, libxml2, libgsf
 , bzip2, libcroco, libintl, darwin, rustc, cargo, gnome3
-, withGTK ? false, gtk3 ? null
 , vala, gobject-introspection }:
 
 let
   pname = "librsvg";
-  version = "2.44.15";
+  version = "2.46.0";
 in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1p4cifnxppz2qwsk2wvn2a6c7dpvgfrsf5vlhdkmsd373czm9396";
+    sha256 = "1la3az2af2ccm6rp86b6wh0kq7kxzl4n8pli5qxhyic1rd91xj4n";
   };
 
   outputs = [ "out" "dev" "installedTests" ];
 
   buildInputs = [ libxml2 libgsf bzip2 libcroco pango libintl ];
 
-  propagatedBuildInputs = [ glib gdk-pixbuf cairo ] ++ lib.optional withGTK gtk3;
+  propagatedBuildInputs = [ glib gdk-pixbuf cairo ];
 
   nativeBuildInputs = [ pkgconfig rustc cargo vala gobject-introspection ]
     ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
-- 
GitLab


From 4bf49d94179ad2378f50ba54138343fecb75e446 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Mon, 9 Sep 2019 19:40:15 +0200
Subject: [PATCH 1497/2254] qscintilla: Use both .so and _qt5.so suffix

Make sure that the both libqscintilla2_qt5.so and libqscintilla2.so are
present in `$out/lib` so all the dependant packages can find the most
appropriate library (some except the empty suffix, such as
sqlitebrowser, other expect the _qt5 suffix such as
python3Packages.qscintilla-qt5).

The mechanism would also work work for qt4 build, but it is broken at
the moment.

Also make sure python*Packages.qscintilla* are up to date
---
 pkgs/development/libraries/qscintilla/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix
index c75f324bf26..33e57a682b9 100644
--- a/pkgs/development/libraries/qscintilla/default.nix
+++ b/pkgs/development/libraries/qscintilla/default.nix
@@ -34,15 +34,16 @@ in stdenv.mkDerivation rec {
 
   patches = lib.optional (stdenv.isDarwin && withQt5) [ xcodePatch ];
 
+  # Make sure that libqscintilla2.so is available in $out/lib since it is expected
+  # by some packages such as sqlitebrowser
+  postFixup = ''
+    ln -s $out/lib/libqscintilla2_qt?.so $out/lib/libqscintilla2.so
+  '';
+
   enableParallelBuilding = true;
 
-  # By default qscintilla will name the library with a qt version suffix which
-  # confuses the crap out of sqlitebrowser and possibly others so we simply
-  # strip the suffix as we don't need it and the various FindQScintilla.cmake
-  # files floating around *should* look for the un-suffixed version.
   postPatch = ''
     substituteInPlace qscintilla.pro \
-      --replace '_qt$''${QT_MAJOR_VERSION}'   "" \
       --replace '$$[QT_INSTALL_LIBS]'         $out/lib \
       --replace '$$[QT_INSTALL_HEADERS]'      $out/include \
       --replace '$$[QT_INSTALL_TRANSLATIONS]' $out/translations \
-- 
GitLab


From edc638c4b77d946900c39aedce6b633ad56ca60e Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Mon, 30 Sep 2019 17:50:03 +0200
Subject: [PATCH 1498/2254] python3Packages.qscintilla-qt5: fix build

---
 .../development/python-modules/qscintilla-qt5/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/python-modules/qscintilla-qt5/default.nix b/pkgs/development/python-modules/qscintilla-qt5/default.nix
index e8076db6053..06475c09ca8 100644
--- a/pkgs/development/python-modules/qscintilla-qt5/default.nix
+++ b/pkgs/development/python-modules/qscintilla-qt5/default.nix
@@ -15,6 +15,13 @@ buildPythonPackage {
   buildInputs = [ qscintilla ];
   propagatedBuildInputs = [ pyqt5 ];
 
+  postPatch = ''
+    substituteInPlace Python/configure.py \
+      --replace \
+      "target_config.py_module_dir" \
+      "'$out/${python.sitePackages}'"
+  '';
+
   preConfigure = ''
     mkdir -p $out
     lndir ${pyqt5} $out
@@ -26,6 +33,7 @@ buildPythonPackage {
       --stubsdir=$out/${python.sitePackages}/PyQt5 \
       --apidir=$out/api/${python.libPrefix} \
       --qsci-incdir=${qscintilla}/include \
+      --qsci-featuresdir=${qscintilla}/mkspecs/features \
       --qsci-libdir=${qscintilla}/lib \
       --pyqt-sipdir=${pyqt5}/share/sip/PyQt5 \
       --qsci-sipdir=$out/share/sip/PyQt5 \
-- 
GitLab


From f81fe344d5a10b4a19a6174fe8b9e805272e2c16 Mon Sep 17 00:00:00 2001
From: Soner Sayakci <s.sayakci@shopware.com>
Date: Mon, 30 Sep 2019 17:54:21 +0200
Subject: [PATCH 1499/2254] phpPackages.phpstan: 0.11.15 => 0.11.16

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

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index b215a4c1986..8e012669748 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -392,12 +392,12 @@ let
   };
 
   phpstan = mkDerivation rec {
-    version = "0.11.15";
+    version = "0.11.16";
     pname = "phpstan";
 
     src = pkgs.fetchurl {
       url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar";
-      sha256 = "1fa3bq5k548jpyph2rxkgnarblyy5f1m55awjcps8mjqbw9r6439";
+      sha256 = "0c2417kwkj3nf1zya1flw7g1mz0dwhh27hjs3wz04b0kgnv4syzs";
     };
 
     phases = [ "installPhase" ];
-- 
GitLab


From b7fdf53dd6460f4776fe41531bef353ca0cb7484 Mon Sep 17 00:00:00 2001
From: Soner Sayakci <s.sayakci@shopware.com>
Date: Mon, 30 Sep 2019 17:58:09 +0200
Subject: [PATCH 1500/2254] phpPackages.php-cs-fixer: 2.15.1 => 2.15.3

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

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index b215a4c1986..58eeba1342f 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -262,12 +262,12 @@ let
   };
 
   php-cs-fixer = mkDerivation rec {
-    version = "2.15.1";
+    version = "2.15.3";
     pname = "php-cs-fixer";
 
     src = pkgs.fetchurl {
       url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar";
-      sha256 = "0qbqdki6vj8bgj5m2k4mi0qgj17r6s2v2q7yc30hhgvksf7vamlc";
+      sha256 = "0hbc9y3676dd0841llgp1g7bhklfxi1cw47dcww0qmk69gjfv54c";
     };
 
     phases = [ "installPhase" ];
-- 
GitLab


From ab5a5c15cb712ed41e63de3b36a32c531ae1ec00 Mon Sep 17 00:00:00 2001
From: Simon Chatterjee <code@chatts.net>
Date: Tue, 17 Sep 2019 11:54:22 +0100
Subject: [PATCH 1501/2254] maintainers: add simonchatts

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index b777d37d764..9f3586293ad 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5898,6 +5898,12 @@
       fingerprint = "ADF4 C13D 0E36 1240 BD01  9B51 D1DE 6D7F 6936 63A5";
     }];
   };
+  simonchatts = {
+    email = "code@chatts.net";
+    github = "simonchatts";
+    githubId = 11135311;
+    name = "Simon Chatterjee";
+  };
   simonvandel = {
     email = "simon.vandel@gmail.com";
     github = "simonvandel";
-- 
GitLab


From 8d00c48937d87a51d191796b89d0daae63830742 Mon Sep 17 00:00:00 2001
From: Simon Chatterjee <code@chatts.net>
Date: Tue, 17 Sep 2019 12:02:18 +0100
Subject: [PATCH 1502/2254] pythonPackages.janus: init at 0.4.0

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

diff --git a/pkgs/development/python-modules/janus/default.nix b/pkgs/development/python-modules/janus/default.nix
new file mode 100644
index 00000000000..ea82ec4f99b
--- /dev/null
+++ b/pkgs/development/python-modules/janus/default.nix
@@ -0,0 +1,20 @@
+{ lib, buildPythonPackage, fetchPypi, pytest }:
+
+buildPythonPackage rec {
+  pname = "janus";
+  version = "0.4.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "cfc221683160b91b35bae1917e2957b78dad10a2e634f4f8ed119ed72e2a88ef";
+  };
+
+ checkInputs = [ pytest ];
+
+  meta = with lib; {
+    description = "Mixed sync-async queue";
+    homepage = "https://github.com/aio-libs/janus";
+    license = licenses.asl20;
+    maintainers = [ maintainers.simonchatts ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a610ef51d8c..28b58d81847 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -689,6 +689,8 @@ in {
 
   inquirer = callPackage ../development/python-modules/inquirer { };
 
+  janus = callPackage ../development/python-modules/janus { };
+
   jira = callPackage ../development/python-modules/jira { };
 
   jwcrypto = callPackage ../development/python-modules/jwcrypto { };
-- 
GitLab


From 9cd1e90e00bd7fd05d22d50ac1649ed4c45df4d0 Mon Sep 17 00:00:00 2001
From: Soner Sayakci <s.sayakci@shopware.com>
Date: Mon, 30 Sep 2019 18:20:28 +0200
Subject: [PATCH 1503/2254] phpPackages.psalm: init at 3.5.3

---
 pkgs/top-level/php-packages.nix | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index b215a4c1986..2d2fde38d06 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -486,6 +486,32 @@ let
     };
   };
 
+  psalm = mkDerivation rec {
+    version = "3.5.3";
+    pname = "psalm";
+
+    src = pkgs.fetchurl {
+      url = "https://github.com/vimeo/psalm/releases/download/${version}/psalm.phar";
+      sha256 = "1n5pfzln82wzk1qa40c436lhbin1g06lfdk89q720yzrrs07r8sw";
+    };
+
+    phases = [ "installPhase" ];
+    nativeBuildInputs = [ pkgs.makeWrapper ];
+
+    installPhase = ''
+      mkdir -p $out/bin
+      install -D $src $out/libexec/psalm/psalm.phar
+      makeWrapper ${php}/bin/php $out/bin/psalm \
+        --add-flags "$out/libexec/psalm/psalm.phar"
+    '';
+
+    meta = with pkgs.lib; {
+      description = "A static analysis tool for finding errors in PHP applications";
+      license = licenses.mit;
+      homepage = https://github.com/vimeo/psalm;
+    };
+  };
+
   psysh = mkDerivation rec {
     version = "0.9.9";
     pname = "psysh";
-- 
GitLab


From dfb57552793e4b42d69abe6ea4ebe5ce64f1ea5e Mon Sep 17 00:00:00 2001
From: Simon Chatterjee <code@chatts.net>
Date: Tue, 17 Sep 2019 12:09:05 +0100
Subject: [PATCH 1504/2254] pythonPackages.entrance: init at 1.1.10

---
 .../python-modules/entrance/default.nix       | 45 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  4 ++
 2 files changed, 49 insertions(+)
 create mode 100644 pkgs/development/python-modules/entrance/default.nix

diff --git a/pkgs/development/python-modules/entrance/default.nix b/pkgs/development/python-modules/entrance/default.nix
new file mode 100644
index 00000000000..67005d577cd
--- /dev/null
+++ b/pkgs/development/python-modules/entrance/default.nix
@@ -0,0 +1,45 @@
+{ lib, fetchPypi, buildPythonPackage, pythonOlder, routerFeatures
+, janus, ncclient, paramiko, pyyaml, sanic }:
+
+let
+  # The `routerFeatures` flag optionally brings in some somewhat heavy
+  # dependencies, in order to enable interacting with routers
+  opts = if routerFeatures then {
+      prePatch = ''
+        substituteInPlace ./setup.py --replace "extra_deps = []" "extra_deps = router_feature_deps"
+      '';
+      extraBuildInputs = [ janus ncclient paramiko ];
+    } else {
+      prePatch = "";
+      extraBuildInputs = [];
+    };
+
+in
+
+buildPythonPackage rec {
+  pname = "entrance";
+  version = "1.1.10";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "080qkvkmfw4004cl721l5bvpg001xz8vs6q59dg797kqxfrwk5kw";
+  };
+
+  # The versions of `sanic` and `websockets` in nixpkgs only support 3.6 or later
+  disabled = pythonOlder "3.6";
+
+  # No useful tests
+  doCheck = false;
+
+  propagatedBuildInputs = [ pyyaml sanic ] ++ opts.extraBuildInputs;
+
+  prePatch = opts.prePatch;
+
+  meta = with lib; {
+    description = "A server framework for web apps with an Elm frontend";
+    homepage = https://github.com/ensoft/entrance;
+    license = licenses.mit;
+    maintainers = with maintainers; [ simonchatts ];
+  };
+}
+
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 28b58d81847..4a19c606036 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -563,6 +563,10 @@ in {
 
   diff-match-patch = callPackage ../development/python-modules/diff-match-patch { };
 
+  entrance = callPackage ../development/python-modules/entrance { routerFeatures = false; };
+
+  entrance-with-router-features = callPackage ../development/python-modules/entrance { routerFeatures = true; };
+
   eradicate = callPackage ../development/python-modules/eradicate {  };
 
   face = callPackage ../development/python-modules/face { };
-- 
GitLab


From 98ddcfe794b28a1fa89d544f9efa3783b7835a0f Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 30 Sep 2019 18:26:08 +0200
Subject: [PATCH 1505/2254] A band-aid workaround for 68384. The situation
 should not be possible, not clear whether there is a missed detail about ASDF
 or SBCL

---
 .../lisp-modules/quicklisp-to-nix/system-info.lisp            | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/system-info.lisp b/pkgs/development/lisp-modules/quicklisp-to-nix/system-info.lisp
index 6a4c2b4ad1a..0f7941a0115 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix/system-info.lisp
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix/system-info.lisp
@@ -265,7 +265,9 @@ parasitic systems will be tracked."
     (cond
       (source-file
        (loop :for system-name :being :the :hash-keys :of asdf/find-system::*registered-systems* :do
-          (when (and (parasitic-relationship-p system system-name)
+             ; for an unclear reason, a literal 0 which is not a key in the hash table gets observed
+          (when (and (gethash system-name asdf/find-system::*registered-systems*)
+                     (parasitic-relationship-p system system-name)
                      (not (blacklisted-parasite-p system-name)))
             (found-new-parasite system-name)
             (let ((*track-dependencies* t))
-- 
GitLab


From aaa1ba37002d68c807b6464d1afd68fa390aabbb Mon Sep 17 00:00:00 2001
From: pacien <pacien.trangirard@pacien.net>
Date: Mon, 30 Sep 2019 19:01:32 +0200
Subject: [PATCH 1506/2254] exim: 4.92.2 -> 4.92.3

security update: CVE-2019-16928
---
 pkgs/servers/mail/exim/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix
index 96c8ad4a383..dd4d1850b59 100644
--- a/pkgs/servers/mail/exim/default.nix
+++ b/pkgs/servers/mail/exim/default.nix
@@ -7,11 +7,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "exim-4.92.2";
+  name = "exim-4.92.3";
 
   src = fetchurl {
     url = "https://ftp.exim.org/pub/exim/exim4/${name}.tar.xz";
-    sha256 = "0m56jsh2fzvwj4rdpcc3pkd5vsi40cjrpzalis7l1zq33m4axmq1";
+    sha256 = "1zfj4zblv5881qxpzkrg3f6a96pbcq270s9p6p1w85lfxjsknif4";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From f8d67ec135de10ac16fcc0c1623c911a4783775f Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sat, 24 Aug 2019 14:29:47 +0200
Subject: [PATCH 1507/2254] buildRustPackage: add verifyCargoDeps option

One issue with cargoSha256 is that it's hard to detect when it needs to
be updated or not. It's possible to upgrade a package and forget to
update cargoSha256 and run with old versions of the program or
libraries.

This commit introduces `verifyCargoDeps` which, when enabled, will check
that the Cargo.lock is not out of date in the cargoDeps by comparing it
with the package source.
---
 doc/languages-frameworks/rust.section.md |  4 ++++
 pkgs/build-support/rust/default.nix      | 19 +++++++++++++++++++
 pkgs/build-support/rust/fetchcargo.nix   | 18 +++++++++++++++++-
 3 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md
index 2d9338f2e89..83b7b159bd6 100644
--- a/doc/languages-frameworks/rust.section.md
+++ b/doc/languages-frameworks/rust.section.md
@@ -43,6 +43,7 @@ rustPlatform.buildRustPackage rec {
   };
 
   cargoSha256 = "0q68qyl2h6i0qsz82z840myxlnjay8p1w5z7hfyr8fqp7wgwa9cx";
+  verifyCargoDeps = true;
 
   meta = with stdenv.lib; {
     description = "A fast line-oriented regex search tool, similar to ag and ack";
@@ -64,6 +65,9 @@ When the `Cargo.lock`, provided by upstream, is not in sync with the
 added in `cargoPatches` will also be prepended to the patches in `patches` at
 build-time.
 
+When `verifyCargoDeps` is set to `true`, the build will also verify that the
+`cargoSha256` is not out of date by comparing the `Cargo.lock` file in both the `cargoDeps` and `src`. Note that this option changes the value of `cargoSha256` since it also copies the `Cargo.lock` in it. To avoid breaking backward-compatibility this option is not enabled by default but hopefully will be in the future.
+
 ## Compiling Rust crates using Nix instead of Cargo
 
 ### Simple operation
diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index 4634d32f6ac..27601e481c6 100644
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@@ -13,6 +13,9 @@
 , cargoUpdateHook ? ""
 , cargoDepsHook ? ""
 , cargoBuildFlags ? []
+, # Set to true to verify if the cargo dependencies are up to date.
+  # This will change the value of cargoSha256.
+  verifyCargoDeps ? false
 , buildType ? "release"
 , meta ? {}
 
@@ -26,6 +29,7 @@ let
   cargoDeps = if cargoVendorDir == null
     then fetchcargo {
         inherit name src srcs sourceRoot cargoUpdateHook;
+        copyLockfile = verifyCargoDeps;
         patches = cargoPatches;
         sha256 = cargoSha256;
       }
@@ -95,6 +99,21 @@ stdenv.mkDerivation (args // {
 
     unset cargoDepsCopy
     export RUST_LOG=${logLevel}
+  '' + stdenv.lib.optionalString verifyCargoDeps ''
+    if ! diff source/Cargo.lock $cargoDeps/Cargo.lock ; then
+      echo
+      echo "ERROR: cargoSha256 is out of date."
+      echo
+      echo "Cargo.lock is not the same in $cargoDeps."
+      echo
+      echo "To fix the issue:"
+      echo '1. Use "1111111111111111111111111111111111111111111111111111" as the cargoSha256 value'
+      echo "2. Build the derivation and wait it to fail with a hash mismatch"
+      echo "3. Copy the 'got: sha256:' value back into the cargoSha256 field"
+      echo
+
+      exit 1
+    fi
   '' + (args.postUnpack or "");
 
   configurePhase = args.configurePhase or ''
diff --git a/pkgs/build-support/rust/fetchcargo.nix b/pkgs/build-support/rust/fetchcargo.nix
index bc80db0947b..a515ce9c6eb 100644
--- a/pkgs/build-support/rust/fetchcargo.nix
+++ b/pkgs/build-support/rust/fetchcargo.nix
@@ -17,7 +17,16 @@ let cargo-vendor-normalise = stdenv.mkDerivation {
   preferLocalBuild = true;
 };
 in
-{ name ? "cargo-deps", src, srcs, patches, sourceRoot, sha256, cargoUpdateHook ? "" }:
+{ name ? "cargo-deps"
+, src
+, srcs
+, patches
+, sourceRoot
+, sha256
+, cargoUpdateHook ? ""
+, # whenever to also include the Cargo.lock in the output
+  copyLockfile ? false
+}:
 stdenv.mkDerivation {
   name = "${name}-vendor";
   nativeBuildInputs = [ cacert git cargo-vendor-normalise cargo ];
@@ -37,6 +46,9 @@ stdenv.mkDerivation {
         exit 1
     fi
 
+    # Keep the original around for copyLockfile
+    cp Cargo.lock Cargo.lock.orig
+
     export CARGO_HOME=$(mktemp -d cargo-home.XXX)
     CARGO_CONFIG=$(mktemp cargo-config.XXXX)
 
@@ -52,6 +64,10 @@ stdenv.mkDerivation {
     if ! cmp $CARGO_CONFIG ${./fetchcargo-default-config.toml} > /dev/null; then
       install -D $CARGO_CONFIG $out/.cargo/config;
     fi;
+
+  '' + stdenv.lib.optionalString copyLockfile ''
+    # add the Cargo.lock to allow hash invalidation
+    cp Cargo.lock.orig $out/Cargo.lock
   '';
 
   outputHashAlgo = "sha256";
-- 
GitLab


From ee00d08ed081f518c119758301fcc5b04e061e4b Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sun, 25 Aug 2019 15:19:11 +0200
Subject: [PATCH 1508/2254] mdsh: use the verifyCargoDeps option

---
 pkgs/development/tools/documentation/mdsh/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/documentation/mdsh/default.nix b/pkgs/development/tools/documentation/mdsh/default.nix
index a88963c6e2c..e6c485b7ed7 100644
--- a/pkgs/development/tools/documentation/mdsh/default.nix
+++ b/pkgs/development/tools/documentation/mdsh/default.nix
@@ -11,7 +11,8 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0m3f5mrdmnmkfsy7mc6x3jf4ainmq0z42mv935ikcdbjwwjbd5gq";
   };
 
-  cargoSha256 = "11kzl0ns84xhdacn0k7nilgzgpwazmaaqdjf2kcarxf2h01b0rjv";
+  cargoSha256 = "0adc525hbs7j7zasvcdxy7k6pf145hs711hjbzgwf72k514ypyrl";
+  verifyCargoDeps = true;
 
   meta = with stdenv.lib; {
     description = "Markdown shell pre-processor";
-- 
GitLab


From 0c79a57062a5152198c3ccc720b6c704c28b9ca6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:43:58 +0000
Subject: [PATCH 1509/2254] =?UTF-8?q?at-spi2-atk:=202.32.0=20=E2=86=92=202?=
 =?UTF-8?q?.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/libraries/at-spi2-atk/default.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix
index a805949bf11..4af9c9ce32b 100644
--- a/pkgs/development/libraries/at-spi2-atk/default.nix
+++ b/pkgs/development/libraries/at-spi2-atk/default.nix
@@ -10,23 +10,20 @@
 , dbus
 , glib
 , libxml2
-, fixDarwinDylibNames
 
 , gnome3 # To pass updateScript
 }:
 
 stdenv.mkDerivation rec {
   pname = "at-spi2-atk";
-  version = "2.32.0";
+  version = "2.34.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0p54wx6f6q7s8w0b1j0sgw87pikllp79q5g3lfiwqazs779ycl8b";
+    sha256 = "00250s72ii8w6lb6ww61v49y9k4cswfj0hhawqlram7bl6b7x6is";
   };
 
-  nativeBuildInputs = [ meson ninja pkgconfig ]
-    # Fixup rpaths because of meson, remove with meson-0.47
-    ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
+  nativeBuildInputs = [ meson ninja pkgconfig ];
   buildInputs = [ at-spi2-core atk dbus glib libxml2 ];
 
   doCheck = false; # fails with "No test data file provided"
@@ -40,7 +37,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "D-Bus bridge for Assistive Technology Service Provider Interface (AT-SPI) and Accessibility Toolkit (ATK)";
     homepage = https://gitlab.gnome.org/GNOME/at-spi2-atk;
-    license = licenses.lgpl2Plus; # NOTE: 2018-06-06: Please check the license when upstream sorts-out licensing: https://gitlab.gnome.org/GNOME/at-spi2-atk/issues/2
+    license = licenses.lgpl21Plus;
     maintainers = gnome3.maintainers;
     platforms = platforms.unix;
   };
-- 
GitLab


From ec16cb4276a2ce2b10fe91b61a6287204b010b7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:43:57 +0000
Subject: [PATCH 1510/2254] =?UTF-8?q?at-spi2-core:=202.32.1=20=E2=86=92=20?=
 =?UTF-8?q?2.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/libraries/at-spi2-core/default.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix
index e7cea235ceb..bda809b1a5a 100644
--- a/pkgs/development/libraries/at-spi2-core/default.nix
+++ b/pkgs/development/libraries/at-spi2-core/default.nix
@@ -13,25 +13,22 @@
 , libX11
 , libXtst # at-spi2-core can be build without X support, but due it is a client-side library, GUI-less usage is a very rare case
 , libXi
-, fixDarwinDylibNames
 
 , gnome3 # To pass updateScript
 }:
 
 stdenv.mkDerivation rec {
   pname = "at-spi2-core";
-  version = "2.32.1";
+  version = "2.34.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0lqd7gsl471v6538iighkvb21gjglcb9pklvas32rjpsxcvsjaiw";
+    sha256 = "1ihixwhh3c16q6253qj9gf69741rb2pi51822a4rylsfcyywsafn";
   };
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection makeWrapper ]
-    # Fixup rpaths because of meson, remove with meson-0.47
-    ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
+  nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection makeWrapper ];
   buildInputs = [ dbus glib libX11 libXtst libXi ];
 
   doCheck = false; # fails with "AT-SPI: Couldn't connect to accessibility bus. Is at-spi-bus-launcher running?"
@@ -58,7 +55,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Assistive Technology Service Provider Interface protocol definitions and daemon for D-Bus";
     homepage = https://gitlab.gnome.org/GNOME/at-spi2-core;
-    license = licenses.lgpl2Plus; # NOTE: 2018-06-06: Please check the license when upstream sorts-out licensing: https://gitlab.gnome.org/GNOME/at-spi2-core/issues/2
+    license = licenses.lgpl21Plus;
     maintainers = gnome3.maintainers;
     platforms = platforms.unix;
   };
-- 
GitLab


From 0e341a35e508515b98e59718f7ec5c71b0a692b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 17:33:50 +0000
Subject: [PATCH 1511/2254] =?UTF-8?q?atk:=202.32.0=20=E2=86=92=202.34.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix .pc file requires gobject:
https://gitlab.gnome.org/GNOME/atk/merge_requests/30
---
 pkgs/development/libraries/atk/default.nix  | 10 ++++++++--
 pkgs/development/libraries/atk/fix_pc.patch |  9 +++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/atk/fix_pc.patch

diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix
index 0a076442b42..9e80d4fc6ca 100644
--- a/pkgs/development/libraries/atk/default.nix
+++ b/pkgs/development/libraries/atk/default.nix
@@ -4,7 +4,7 @@
 
 let
   pname = "atk";
-  version = "2.32.0";
+  version = "2.34.1";
 in
 
 stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1k4i817bd2w5b9z394f2yyx95591l2746wa40am0vvz4gzdgwhfb";
+    sha256 = "1jwp16r6p5z66k4b2v8zlzhyshhwlmyi27ippkrgqr8jsary7w6l";
   };
 
   outputs = [ "out" "dev" ];
@@ -26,6 +26,12 @@ stdenv.mkDerivation rec {
     glib
   ];
 
+  patches = [
+    # meson builds an incorrect .pc file
+    # glib should be Requires not Requires.private
+    ./fix_pc.patch
+  ];
+
   doCheck = true;
 
   passthru = {
diff --git a/pkgs/development/libraries/atk/fix_pc.patch b/pkgs/development/libraries/atk/fix_pc.patch
new file mode 100644
index 00000000000..3d19d9862cb
--- /dev/null
+++ b/pkgs/development/libraries/atk/fix_pc.patch
@@ -0,0 +1,9 @@
+--- a/atk/meson.build
++++ b/atk/meson.build
+@@ -162,5 +162,6 @@ pkgconfig.generate(libatk,
+   name: 'Atk',
+   description: 'Accessibility Toolkit',
+   subdirs: atk_api_name,
++  requires: glib_dep,
+   filebase: 'atk',
+ )
-- 
GitLab


From 0a826ed11629f397013414f65605e5e880b19228 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 9 Sep 2019 19:33:30 +0000
Subject: [PATCH 1512/2254] =?UTF-8?q?baobab:=203.32.0=20=E2=86=92=203.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/core/baobab/default.nix b/pkgs/desktops/gnome-3/core/baobab/default.nix
index 4734a0e96b8..5817d8ff942 100644
--- a/pkgs/desktops/gnome-3/core/baobab/default.nix
+++ b/pkgs/desktops/gnome-3/core/baobab/default.nix
@@ -4,13 +4,13 @@
 
 let
   pname = "baobab";
-  version = "3.32.0";
+  version = "3.34.0";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0b33s9bhpiffv5wl76cq2bbnqhvx3qs2vxyxmil5gcs583llqh9r";
+    sha256 = "01w6m5ylyqs4wslpjn1hg6n6ynwh3rghksak0qs8r9m6dm3dkss6";
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig vala gettext itstool libxml2 desktop-file-utils wrapGAppsHook ];
-- 
GitLab


From 8c5486aa82002ccd386fd124d37fed5ffbe2d268 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Wed, 11 Sep 2019 08:14:50 +0200
Subject: [PATCH 1513/2254] dee: fix build with glib-2.62

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

diff --git a/pkgs/development/libraries/dee/default.nix b/pkgs/development/libraries/dee/default.nix
index 093cc2bdf05..1318d9453b3 100644
--- a/pkgs/development/libraries/dee/default.nix
+++ b/pkgs/development/libraries/dee/default.nix
@@ -43,6 +43,9 @@ stdenv.mkDerivation rec {
     dbus-glib
   ];
 
+  # glib-2.62 deprecations
+  NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
+
   configureFlags = [
     "--disable-gtk-doc"
     "--with-pygi-overrides-dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides"
-- 
GitLab


From 91fed91d8b6fccbcd041b024e61c0806e9618237 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:44:03 +0000
Subject: [PATCH 1514/2254] =?UTF-8?q?evolution-data-server:=203.32.4=20?=
 =?UTF-8?q?=E2=86=92=203.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
index 0048b02581a..63e1ec9ae29 100644
--- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "evolution-data-server";
-  version = "3.32.4";
+  version = "3.34.0";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0zsc9xwy6ixk3x0dx69ax5isrdw8qxjdxg2i5fr95s40nss7rxl3";
+    sha256 = "1kw6wkrr33bxv95z06dr31qvmp7c7x88xkw27k3fq0df4jlb17gv";
   };
 
   patches = [
-- 
GitLab


From a1eda8138190e081e8a4fd6c1d269df641d02cb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:44:03 +0000
Subject: [PATCH 1515/2254] =?UTF-8?q?folks:=200.12.1=20=E2=86=92=200.13.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/libraries/folks/default.nix b/pkgs/development/libraries/folks/default.nix
index 84ab5fedebc..38e4d2c6884 100644
--- a/pkgs/development/libraries/folks/default.nix
+++ b/pkgs/development/libraries/folks/default.nix
@@ -30,13 +30,13 @@
 
 stdenv.mkDerivation rec {
   pname = "folks";
-  version = "0.12.1";
+  version = "0.13.1";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0xfl6rnzhdbmw1q26xiq34cdiy7a9karpi2r7wyplnnz1zaz5a9w";
+    sha256 = "0pda8sx4ap3lyri5fdrnakl29la1zkhwlc9bmnp13qigp1iwdw9x";
   };
 
   mesonFlags = [
-- 
GitLab


From 343dec46362df3d542d6d3765d010d61f9a03201 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:44:05 +0000
Subject: [PATCH 1516/2254] =?UTF-8?q?gcr:=203.28.1=20=E2=86=92=203.33.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/libraries/gcr/default.nix b/pkgs/development/libraries/gcr/default.nix
index dcb4df1419e..18b568b0f6c 100644
--- a/pkgs/development/libraries/gcr/default.nix
+++ b/pkgs/development/libraries/gcr/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gnupg, p11-kit, glib
+{ stdenv, fetchurl, pkgconfig, gettext, gnupg, p11-kit, glib
 , libgcrypt, libtasn1, dbus-glib, gtk3, pango, gdk-pixbuf, atk
 , gobject-introspection, makeWrapper, libxslt, vala, gnome3
-, python2 }:
+, python3 }:
 
 stdenv.mkDerivation rec {
   pname = "gcr";
-  version = "3.28.1";
+  version = "3.33.4";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "12qn7mcmxb45lz1gq3s3b34rimiyrrshkrpvxdw1fc0w26i4l84m";
+    sha256 = "1hf06p4qfyywnb6334ysnr6aqxik3srb37glclvr4yhb3wzrjqnm";
   };
 
   passthru = {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ pkgconfig intltool gobject-introspection libxslt makeWrapper vala ];
+  nativeBuildInputs = [ pkgconfig gettext gobject-introspection libxslt makeWrapper vala ];
 
   buildInputs = let
     gpg = gnupg.override { guiSupport = false; }; # prevent build cycle with pinentry_gnome
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ glib gtk3 p11-kit ];
 
-  checkInputs = [ python2 ];
+  checkInputs = [ python3 ];
   doCheck = false; # fails 21 out of 603 tests, needs dbus daemon
 
   #enableParallelBuilding = true; issues on hydra
-- 
GitLab


From 9baa018e2370dbd71e4dafc9d1393b9b0bb17fcb Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Wed, 18 Sep 2019 20:36:20 -0400
Subject: [PATCH 1517/2254] =?UTF-8?q?gdk-pixbuf:=202.38.1=20=E2=86=92=202.?=
 =?UTF-8?q?38.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index 59e7808057f..86d89d6eef5 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -4,13 +4,13 @@
 
 let
   pname = "gdk-pixbuf";
-  version = "2.38.1";
+  version = "2.38.2";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0fmbjgjcyym3qg46f64qgl7icdm4ii77flyc1mhk244rp8vgi7zi";
+    sha256 = "10875lywkabh6nm2rgf0vxqn39h34b72kcbh63fp77fqq0g6bykk";
   };
 
   patches = [
-- 
GitLab


From a3ef0bfeb87227bb3632488c1277edc0310c77f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Sun, 8 Sep 2019 18:17:22 +0000
Subject: [PATCH 1518/2254] =?UTF-8?q?gdl:=203.28.0=20=E2=86=92=203.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/libraries/gdl/default.nix b/pkgs/development/libraries/gdl/default.nix
index 45a29e15ede..c4baaa3fae9 100644
--- a/pkgs/development/libraries/gdl/default.nix
+++ b/pkgs/development/libraries/gdl/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gdl";
-  version = "3.28.0";
+  version = "3.34.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gdl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1dipnzqpxl0yfwzl2lqdf6vb3174gb9f1d5jndkq8505q7n9ik2j";
+    sha256 = "00ldva6wg6s4wlxmisiqzyz8ihsprra7sninx2rlqk6frpq312w5";
   };
 
   nativeBuildInputs = [ pkgconfig intltool ];
-- 
GitLab


From 1644d1cd678ff2afd49f7c279489543560de8d03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Wed, 4 Sep 2019 11:26:58 +0000
Subject: [PATCH 1519/2254] =?UTF-8?q?glib-networking:=202.60.3=20=E2=86=92?=
 =?UTF-8?q?=202.62.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix
index ae386f46bff..ad3b77c1bc6 100644
--- a/pkgs/development/libraries/glib-networking/default.nix
+++ b/pkgs/development/libraries/glib-networking/default.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "glib-networking";
-  version = "2.60.3";
+  version = "2.62.0";
 
   outputs = [ "out" "installedTests" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1mfw44qpmwvz6yzj8c6spx6z357wrmkk15byrkc5byagd82860fm";
+    sha256 = "1p7vgav0g03r00qiafhrdiad2gh1w6wsd1a7nnn79psng5gnh8ck";
   };
 
   patches = [
-- 
GitLab


From 1e3e7822a64fefb5ef98878047025efa6ae34b7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 17:53:03 +0200
Subject: [PATCH 1520/2254] glib: 2.60.7 -> 2.62.0

Co-authored-by: Jan Tojnar <jtojnar@gmail.com>
---
 pkgs/development/libraries/glib/default.nix   |  57 ++++---
 .../libraries/glib/split-dev-programs.patch   | 154 ++++++++++++++++++
 2 files changed, 190 insertions(+), 21 deletions(-)
 create mode 100644 pkgs/development/libraries/glib/split-dev-programs.patch

diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index de7505e6cde..204aa03e06f 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -1,4 +1,4 @@
-{ config, stdenv, fetchurl, gettext, meson, ninja, pkgconfig, perl, python3, glibcLocales
+{ config, stdenv, fetchurl, gettext, meson, ninja, pkgconfig, perl, python3
 , libiconv, zlib, libffi, pcre, libelf, gnome3, libselinux, bash, gnum4, gtk-doc, docbook_xsl, docbook_xml_dtd_45
 # use utillinuxMinimal to avoid circular dependency (utillinux, systemd, glib)
 , utillinuxMinimal ? null
@@ -44,17 +44,15 @@ let
     done
     ln -sr -t "''${!outputInclude}/include/" "''${!outputInclude}"/lib/*/include/* 2>/dev/null || true
   '';
-
-  binPrograms = optional (!stdenv.isDarwin) "gapplication" ++ [ "gdbus" "gio" "gsettings" ];
 in
 
 stdenv.mkDerivation rec {
   pname = "glib";
-  version = "2.60.7";
+  version = "2.62.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0433m0na8nc4cf0gidf4gfzz8k5d3dsssmh541qkpzcsaspw04lb";
+    sha256 = "046sqfmr84blxh4vkipmh8ff7wd19fxmh6lnr5ibchx3l02p49bc";
   };
 
   patches = optional stdenv.isDarwin ./darwin-compilation.patch
@@ -66,10 +64,33 @@ stdenv.mkDerivation rec {
       ./schema-override-variable.patch
       # Require substituteInPlace in postPatch
       ./fix-gio-launch-desktop-path.patch
+
+      # GLib contains many binaries used for different purposes;
+      # we will install them to different outputs:
+      # 1. Tools for desktop environment ($bin)
+      #    * gapplication (non-darwin)
+      #    * gdbus
+      #    * gio
+      #    * gio-launch-desktop (symlink to $out)
+      #    * gsettings
+      # 2. Development/build tools ($dev)
+      #    * gdbus-codegen
+      #    * gio-querymodules
+      #    * glib-compile-resources
+      #    * glib-compile-schemas
+      #    * glib-genmarshal
+      #    * glib-gettextize
+      #    * glib-mkenums
+      #    * gobject-query
+      #    * gresource
+      #    * gtester
+      #    * gtester-report
+      # 3. Tools for desktop environment that cannot go to $bin due to $out depending on them ($out)
+      #    * gio-launch-desktop
+      ./split-dev-programs.patch
     ];
 
   outputs = [ "bin" "out" "dev" "devdoc" ];
-  outputBin = "dev";
 
   setupHook = ./setup-hook.sh;
 
@@ -84,7 +105,7 @@ stdenv.mkDerivation rec {
   ]);
 
   nativeBuildInputs = [
-    meson ninja pkgconfig perl python3 gettext gtk-doc docbook_xsl docbook_xml_dtd_45 glibcLocales
+    meson ninja pkgconfig perl python3 gettext gtk-doc docbook_xsl docbook_xml_dtd_45
   ];
 
   propagatedBuildInputs = [ zlib libffi gettext libiconv ];
@@ -94,10 +115,9 @@ stdenv.mkDerivation rec {
     # Instead we just copy them over from the native output.
     "-Dgtk_doc=${if stdenv.hostPlatform == stdenv.buildPlatform then "true" else "false"}"
     "-Dnls=enabled"
+    "-Ddevbindir=${placeholder ''dev''}/bin"
   ];
 
-  LC_ALL = "en_US.UTF-8";
-
   NIX_CFLAGS_COMPILE = [
     "-Wno-error=nonnull"
     # Default for release buildtype but passed manually because
@@ -111,6 +131,8 @@ stdenv.mkDerivation rec {
 
     chmod +x gio/tests/gengiotypefuncs.py
     patchShebangs gio/tests/gengiotypefuncs.py
+    chmod +x docs/reference/gio/concat-files-helper.py
+    patchShebangs docs/reference/gio/concat-files-helper.py
     patchShebangs glib/gen-unicode-tables.pl
     patchShebangs tests/gen-casefold-txt.py
     patchShebangs tests/gen-casemap-txt.py
@@ -122,18 +144,6 @@ stdenv.mkDerivation rec {
   DETERMINISTIC_BUILD = 1;
 
   postInstall = ''
-    mkdir -p $bin/bin
-    for app in ${concatStringsSep " " binPrograms}; do
-      mv "$dev/bin/$app" "$bin/bin"
-    done
-
-  '' + optionalString (!stdenv.isDarwin) ''
-    # Add gio-launch-desktop to $out so we can refer to it from $dev
-    mkdir $out/bin
-    mv "$dev/bin/gio-launch-desktop" "$out/bin/"
-    ln -s "$out/bin/gio-launch-desktop" "$bin/bin/"
-
-  '' + ''
     moveToOutput "share/glib-2.0" "$dev"
     substituteInPlace "$dev/bin/gdbus-codegen" --replace "$out" "$dev"
     sed -i "$dev/bin/glib-gettextize" -e "s|^gettext_dir=.*|gettext_dir=$dev/share/glib-2.0/gettext|"
@@ -141,6 +151,11 @@ stdenv.mkDerivation rec {
     # This file is *included* in gtk3 and would introduce runtime reference via __FILE__.
     sed '1i#line 1 "${pname}-${version}/include/glib-2.0/gobject/gobjectnotifyqueue.c"' \
       -i "$dev"/include/glib-2.0/gobject/gobjectnotifyqueue.c
+  '' + optionalString (!stdenv.isDarwin) ''
+    # Add gio-launch-desktop to $out so we can refer to it from $lib
+    mkdir $out/bin
+    mv "$bin/bin/gio-launch-desktop" "$out/bin/"
+    ln -s "$out/bin/gio-launch-desktop" "$bin/bin/"
   '' + optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
     cp -r ${buildPackages.glib.devdoc} $devdoc
   '';
diff --git a/pkgs/development/libraries/glib/split-dev-programs.patch b/pkgs/development/libraries/glib/split-dev-programs.patch
new file mode 100644
index 00000000000..9d3989a30a5
--- /dev/null
+++ b/pkgs/development/libraries/glib/split-dev-programs.patch
@@ -0,0 +1,154 @@
+diff --git a/gio/gdbus-2.0/codegen/meson.build b/gio/gdbus-2.0/codegen/meson.build
+index 121e9e6bb..b76fa0188 100644
+--- a/gio/gdbus-2.0/codegen/meson.build
++++ b/gio/gdbus-2.0/codegen/meson.build
+@@ -16,7 +16,7 @@ gdbus_codegen_conf.set('DATADIR', glib_datadir)
+ # Install gdbus-codegen executable
+ gdbus_codegen = configure_file(input : 'gdbus-codegen.in',
+   output : 'gdbus-codegen',
+-  install_dir : get_option('bindir'),
++  install_dir : get_option('devbindir'),
+   configuration : gdbus_codegen_conf
+ )
+   # Provide tools for others when we're a subproject and they use the Meson GNOME module
+diff --git a/gio/meson.build b/gio/meson.build
+index 9a9e621b3..12e1d146a 100644
+--- a/gio/meson.build
++++ b/gio/meson.build
+@@ -830,14 +830,15 @@ pkg.generate(libgio,
+   variables : ['datadir=' + join_paths('${prefix}', get_option('datadir')),
+                'schemasdir=' + join_paths('${datadir}', schemas_subdir),
+                'bindir=' + join_paths('${prefix}', get_option('bindir')),
++               'devbindir=' + get_option('devbindir'),
+                'giomoduledir=' + giomodulesdir,
+                'gio=' + join_paths('${bindir}', 'gio'),
+-               'gio_querymodules=' + join_paths('${bindir}', 'gio-querymodules'),
+-               'glib_compile_schemas=' + join_paths('${bindir}', 'glib-compile-schemas'),
+-               'glib_compile_resources=' + join_paths('${bindir}', 'glib-compile-resources'),
++               'gio_querymodules=' + join_paths('${devbindir}', 'gio-querymodules'),
++               'glib_compile_schemas=' + join_paths('${devbindir}', 'glib-compile-schemas'),
++               'glib_compile_resources=' + join_paths('${devbindir}', 'glib-compile-resources'),
+                'gdbus=' + join_paths('${bindir}', 'gdbus'),
+-               'gdbus_codegen=' + join_paths('${bindir}', 'gdbus-codegen'),
+-               'gresource=' + join_paths('${bindir}', 'gresource'),
++               'gdbus_codegen=' + join_paths('${devbindir}', 'gdbus-codegen'),
++               'gresource=' + join_paths('${devbindir}', 'gresource'),
+                'gsettings=' + join_paths('${bindir}', 'gsettings')],
+   version : glib_version,
+   install_dir : glib_pkgconfigreldir,
+@@ -938,12 +939,14 @@ executable('gio', gio_tool_sources,
+ 
+ executable('gresource', 'gresource-tool.c',
+   install : true,
++  install_dir : get_option('devbindir'),
+   # intl.lib is not compatible with SAFESEH
+   link_args : noseh_link_args,
+   dependencies : [libelf, libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep])
+ 
+ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodule-priv.c',
+   install : true,
++  install_dir : get_option('devbindir'),
+   c_args : gio_c_args,
+   # intl.lib is not compatible with SAFESEH
+   link_args : noseh_link_args,
+@@ -952,6 +955,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu
+ glib_compile_schemas = executable('glib-compile-schemas',
+   [gconstructor_as_data_h, 'gvdb/gvdb-builder.c', 'glib-compile-schemas.c'],
+   install : true,
++  install_dir : get_option('devbindir'),
+   # intl.lib is not compatible with SAFESEH
+   link_args : noseh_link_args,
+   dependencies : [libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep])
+@@ -959,6 +963,7 @@ glib_compile_schemas = executable('glib-compile-schemas',
+ glib_compile_resources = executable('glib-compile-resources',
+   [gconstructor_as_data_h, 'gvdb/gvdb-builder.c', 'glib-compile-resources.c'],
+   install : true,
++  install_dir : get_option('devbindir'),
+   c_args : gio_c_args,
+   # intl.lib is not compatible with SAFESEH
+   link_args : noseh_link_args,
+diff --git a/glib/meson.build b/glib/meson.build
+index 91a48f194..80472a06b 100644
+--- a/glib/meson.build
++++ b/glib/meson.build
+@@ -375,9 +375,10 @@ pkg.generate(libglib,
+   subdirs : ['glib-2.0'],
+   extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags,
+   variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')),
+-               'glib_genmarshal=' + join_paths('${bindir}', 'glib-genmarshal'),
+-               'gobject_query=' + join_paths('${bindir}', 'gobject-query'),
+-               'glib_mkenums=' + join_paths('${bindir}', 'glib-mkenums')],
++               'devbindir=' + get_option('devbindir'),
++               'glib_genmarshal=' + join_paths('${devbindir}', 'glib-genmarshal'),
++               'gobject_query=' + join_paths('${devbindir}', 'gobject-query'),
++               'glib_mkenums=' + join_paths('${devbindir}', 'glib-mkenums')],
+   version : glib_version,
+   install_dir : glib_pkgconfigreldir,
+   filebase : 'glib-2.0',
+@@ -413,6 +414,7 @@ if host_system == 'windows'
+ else
+   gtester = executable('gtester', 'gtester.c',
+     install : true,
++    install_dir : get_option('devbindir'),
+     c_args : ['-UG_DISABLE_ASSERT'],
+     include_directories : configinc,
+     dependencies : [libglib_dep])
+@@ -424,7 +426,7 @@ report_conf.set('PYTHON', python_name)
+ configure_file(
+   input: 'gtester-report.in',
+   output: 'gtester-report',
+-  install_dir: get_option('bindir'),
++  install_dir: get_option('devbindir'),
+   configuration: report_conf,
+   install_mode: 'rwxr-xr-x'
+ )
+diff --git a/gobject/meson.build b/gobject/meson.build
+index c7805c556..22ec629a4 100644
+--- a/gobject/meson.build
++++ b/gobject/meson.build
+@@ -75,7 +75,7 @@ foreach tool: python_tools
+     input : tool + '.in',
+     output : tool,
+     configuration : python_tools_conf,
+-    install_dir : glib_bindir,
++    install_dir : get_option('devbindir'),
+   )
+ 
+   # Set variables for later use
+@@ -145,6 +145,7 @@ libgobject_dep = declare_dependency(link_with : libgobject,
+ 
+ executable('gobject-query', 'gobject-query.c',
+   install : true,
++  install_dir : get_option('devbindir'),
+   dependencies : [libglib_dep, libgobject_dep])
+ 
+ install_data('gobject_gdb.py', install_dir : join_paths(glib_pkgdatadir, 'gdb'))
+diff --git a/meson.build b/meson.build
+index 717d1bccb..fb0bee8a1 100644
+--- a/meson.build
++++ b/meson.build
+@@ -2118,7 +2118,7 @@ if have_sh
+   gettextize_conf.set('datarootdir', glib_datadir)
+   gettextize_conf.set('datadir', glib_datadir)
+   configure_file(input : 'glib-gettextize.in',
+-    install_dir : glib_bindir,
++    install_dir : get_option('devbindir'),
+     output : 'glib-gettextize',
+     configuration : gettextize_conf)
+ endif
+diff --git a/meson_options.txt b/meson_options.txt
+index 2c831e37e..5d8928577 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -3,6 +3,11 @@ option('runtime_libdir',
+        value : '',
+        description : 'install runtime libraries relative to libdir')
+ 
++option('devbindir',
++       type : 'string',
++       value : '',
++       description : 'bindir for development tools')
++
+ option('iconv',
+        type : 'combo',
+        choices : ['auto', 'libc', 'external'],
-- 
GitLab


From 5a5f149e1054a26b05c43ae23f35499e358af7c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:44:11 +0000
Subject: [PATCH 1521/2254] =?UTF-8?q?gnome-builder:=203.32.4=20=E2=86=92?=
 =?UTF-8?q?=203.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* add pcre2
* don't override stdenv

Co-authored-by: worldofpeace <worldofpeace@protonmail.ch>
---
 .../editors/gnome-builder/default.nix            | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix
index 740d65838c3..a1448764245 100644
--- a/pkgs/applications/editors/gnome-builder/default.nix
+++ b/pkgs/applications/editors/gnome-builder/default.nix
@@ -1,4 +1,4 @@
-{ gcc8Stdenv
+{ stdenv
 , ctags
 , appstream-glib
 , desktop-file-utils
@@ -23,6 +23,7 @@
 , ninja
 , ostree
 , pcre
+, pcre2
 , pkgconfig
 , python3
 , sysprof
@@ -33,20 +34,16 @@
 , wrapGAppsHook
 , dbus
 , xvfb_run
+, glib
 }:
 
-let
-  # Does not build with GCC 7
-  # https://gitlab.gnome.org/GNOME/gnome-builder/issues/868
-  stdenv = gcc8Stdenv;
-in
 stdenv.mkDerivation rec {
   pname = "gnome-builder";
-  version = "3.32.4";
+  version = "3.34.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0xip58m206p8wa28p0a3y4ykylzr5xzmirjl3dspg4j25r08i8qr";
+    sha256 = "19i2ipgw48fpd50wacwyhj35hajlg7qcyxpj8rsqk4g21ijfykrg";
   };
 
   nativeBuildInputs = [
@@ -82,6 +79,7 @@ stdenv.mkDerivation rec {
     libxml2
     ostree
     pcre
+    pcre2
     python3
     sysprof
     template-glib
@@ -100,6 +98,8 @@ stdenv.mkDerivation rec {
     patchShebangs build-aux/meson/post_install.py
   '';
 
+  NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
+
   mesonFlags = [
     "-Dpython_libprefix=${python3.libPrefix}"
     "-Ddocs=true"
-- 
GitLab


From 506c899d4475390f86ed5cc64130a966e32f8521 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:44:10 +0000
Subject: [PATCH 1522/2254] =?UTF-8?q?gnome-photos:=203.32.1=20=E2=86=92=20?=
 =?UTF-8?q?3.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/applications/graphics/gnome-photos/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/gnome-photos/default.nix b/pkgs/applications/graphics/gnome-photos/default.nix
index ea4cf986f39..0eb4f21e53c 100644
--- a/pkgs/applications/graphics/gnome-photos/default.nix
+++ b/pkgs/applications/graphics/gnome-photos/default.nix
@@ -35,13 +35,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-photos";
-  version = "3.32.1";
+  version = "3.34.0";
 
   outputs = [ "out" "installedTests" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0nxa2jz1g73wypdsj19r4plf4hfkhs9mpl7gbhsiyqp1rkn84ahn";
+    sha256 = "12j455id5g616cn0nnj73v83aqgpavrsqszw1r5yhbpyc76lg03m";
   };
 
   patches = [
-- 
GitLab


From 42b796ae8d8f64ec6d8480e950a4cb5c94403d5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:44:12 +0000
Subject: [PATCH 1523/2254] =?UTF-8?q?gnome-usage:=203.32.0=20=E2=86=92=203?=
 =?UTF-8?q?.33.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/applications/misc/gnome-usage/default.nix b/pkgs/applications/misc/gnome-usage/default.nix
index eecf9bbd88f..7484998ab20 100644
--- a/pkgs/applications/misc/gnome-usage/default.nix
+++ b/pkgs/applications/misc/gnome-usage/default.nix
@@ -13,15 +13,16 @@
 , libgtop
 , libdazzle
 , gnome3
+, tracker
 }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-usage";
-  version = "3.32.0";
+  version = "3.33.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0bgszckddfpd3czyb9fddx4pgv5yv44sxc45dfk2kgqyy169gjih";
+    sha256 = "0w3ppfaf15il8mad64qyc9hj1rmlvzs5dyzrxhq7r50k4kyiwmk4";
   };
 
   nativeBuildInputs = [
@@ -41,6 +42,7 @@ stdenv.mkDerivation rec {
     gtk3
     libdazzle
     libgtop
+    tracker
   ];
 
   postPatch = ''
-- 
GitLab


From 78e19b6b0d7c27c5ab540a24cd7763a28d0158e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:44:16 +0000
Subject: [PATCH 1524/2254] =?UTF-8?q?gnome3.accerciser:=203.32.3=20?=
 =?UTF-8?q?=E2=86=92=203.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/apps/accerciser/default.nix
index 9a70319952c..a2556492bb6 100644
--- a/pkgs/desktops/gnome-3/apps/accerciser/default.nix
+++ b/pkgs/desktops/gnome-3/apps/accerciser/default.nix
@@ -17,13 +17,13 @@
 
  python3.pkgs.buildPythonApplication rec {
   name = "accerciser-${version}";
-  version = "3.32.3";
+  version = "3.34.0";
 
   format = "other";
 
   src = fetchurl {
     url = "mirror://gnome/sources/accerciser/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0ark4qkfvdggz2mbksq12iq55izdsjnkjqkvfnnkf4k5vfpa95y5";
+    sha256 = "1npl1pxqrij9dsmp70ralcfbjbw503jsz2pqm3qjwyba5cf6kcbm";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From da0935c299da035abe4baeffdfc05553f3707e9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Fri, 6 Sep 2019 13:35:07 +0000
Subject: [PATCH 1525/2254] =?UTF-8?q?gnome3.adwaita-icon-theme:=203.32.0?=
 =?UTF-8?q?=20=E2=86=92=203.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix
index a7f4a637b17..d2f161f23b4 100644
--- a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix
+++ b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   pname = "adwaita-icon-theme";
-  version = "3.32.0";
+  version = "3.34.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/adwaita-icon-theme/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "11ij35na8nisvxx3qh527iz33h6z2q1a7iinqyp7p65v0zjbd3b9";
+    sha256 = "0zvwikj3a07i3g3rir4cc63b14822lrzzgprs1j2nmb3h8gykds0";
   };
 
   # For convenience, we can specify adwaita-icon-theme only in packages
-- 
GitLab


From f2c3ced2abb26c8caeed4fa6e240ad657bb86547 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Tue, 10 Sep 2019 02:30:32 +0000
Subject: [PATCH 1526/2254] =?UTF-8?q?gnome3.aisleriot:=203.22.8=20?=
 =?UTF-8?q?=E2=86=92=203.22.9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/games/aisleriot/default.nix b/pkgs/desktops/gnome-3/games/aisleriot/default.nix
index 3e274c35cdd..474c49fb584 100644
--- a/pkgs/desktops/gnome-3/games/aisleriot/default.nix
+++ b/pkgs/desktops/gnome-3/games/aisleriot/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "aisleriot";
-  version = "3.22.8";
+  version = "3.22.9";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "15pm39679ymxki07sb5nvhycz4z53zwbvascyp5wm4864bn98815";
+    sha256 = "0yzdh9cw5cjjgvfh75bihl968czlgfmpmn1z0fdk88sgvpjgzwji";
   };
 
   configureFlags = [
-- 
GitLab


From dc9098bf91261b76df18b6792657880bf47bdc5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 9 Sep 2019 18:05:43 +0000
Subject: [PATCH 1527/2254] =?UTF-8?q?gnome3.anjuta:=203.28.0=20=E2=86=92?=
 =?UTF-8?q?=203.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix
index 573259b7e7d..4df3ed10a69 100644
--- a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix
+++ b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "anjuta";
-  version = "3.28.0";
+  version = "3.34.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/anjuta/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0ya7ajai9rx9g597sr5wawr6l5pb2s34bbjdsbnx0lkrhnjv11xh";
+    sha256 = "13ql7axw6zz387s7pa1m7wmh7qps3x7fk53h9832vq1yxlq33aa2";
   };
 
   passthru = {
-- 
GitLab


From 28c62559b7dafb6fef56a66101d3d19bf96a8d52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Wed, 4 Sep 2019 11:26:23 +0000
Subject: [PATCH 1528/2254] =?UTF-8?q?gnome3.atomix:=203.32.1=20=E2=86=92?=
 =?UTF-8?q?=203.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/games/atomix/default.nix b/pkgs/desktops/gnome-3/games/atomix/default.nix
index c9395166c52..ec9895b3bf5 100644
--- a/pkgs/desktops/gnome-3/games/atomix/default.nix
+++ b/pkgs/desktops/gnome-3/games/atomix/default.nix
@@ -3,13 +3,13 @@
 
 let
   pname = "atomix";
-  version = "3.32.1";
+  version = "3.34.0";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "19wpm7mn6r7x6jz1r0kkqg3xa69iycvgb7g7i8wi0d3cx0rsgjkl";
+    sha256 = "0h909a4mccf160hi0aimyicqhq2b0gk1dmqp7qwf87qghfrw6m00";
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook python3 ];
-- 
GitLab


From 7a414f8e0b4278455a439f51c1e3146f05f348a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:44:19 +0000
Subject: [PATCH 1529/2254] =?UTF-8?q?gnome3.cheese:=203.32.1=20=E2=86=92?=
 =?UTF-8?q?=203.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/apps/cheese/default.nix | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/cheese/default.nix b/pkgs/desktops/gnome-3/apps/cheese/default.nix
index b18e58f6f56..b3bb1e1093c 100644
--- a/pkgs/desktops/gnome-3/apps/cheese/default.nix
+++ b/pkgs/desktops/gnome-3/apps/cheese/default.nix
@@ -1,39 +1,41 @@
-{ stdenv, intltool, fetchurl, wrapGAppsHook, gnome-video-effects, libcanberra-gtk3
+{ stdenv, gettext, fetchurl, wrapGAppsHook, gnome-video-effects, libcanberra-gtk3
 , pkgconfig, gtk3, glib, clutter-gtk, clutter-gst, udev, gst_all_1, itstool
-, libgudev, autoreconfHook, vala, docbook_xml_dtd_43, docbook_xsl, appstream-glib
+, libgudev, vala, docbook_xml_dtd_43, docbook_xsl, appstream-glib
 , libxslt, yelp-tools, gnome-common, gtk-doc
-, adwaita-icon-theme, librsvg, totem, gdk-pixbuf, gnome3, gnome-desktop, libxml2 }:
+, adwaita-icon-theme, librsvg, totem, gdk-pixbuf, gnome3, gnome-desktop, libxml2
+, meson, ninja, dbus, python3 }:
 
 stdenv.mkDerivation rec {
   pname = "cheese";
-  version = "3.32.1";
+  version = "3.34.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/cheese/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1xlmsm4zsx05ahvpd4mgy1hfhxbag0r5i6p63bksjxdligdd36kv";
+    sha256 = "0wvyc9wb0avrprvm529m42y5fkv3lirdphqydc9jw0c8mh05d1ni";
   };
 
+  postPatch = ''
+    chmod +x meson_post_install.py
+    patchShebangs meson_post_install.py
+  '';
+
   passthru = {
     updateScript = gnome3.updateScript { packageName = "cheese"; attrPath = "gnome3.cheese"; };
   };
 
   nativeBuildInputs = [
-    pkgconfig intltool itstool vala wrapGAppsHook libxml2 appstream-glib
+    meson ninja pkgconfig gettext itstool vala wrapGAppsHook libxml2 appstream-glib
     libxslt docbook_xml_dtd_43 docbook_xsl
-    autoreconfHook gtk-doc yelp-tools gnome-common
+    gtk-doc yelp-tools gnome-common python3
   ];
   buildInputs = [ gtk3 glib gnome-video-effects
                   gdk-pixbuf adwaita-icon-theme librsvg udev gst_all_1.gstreamer
                   gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gnome-desktop
                   gst_all_1.gst-plugins-bad clutter-gtk clutter-gst
-                  libcanberra-gtk3 libgudev ];
+                  libcanberra-gtk3 libgudev dbus ];
 
   outputs = [ "out" "man" "devdoc" ];
 
-  patches = [
-    gtk-doc.respect_xml_catalog_files_var_patch
-  ];
-
   preFixup = ''
     gappsWrapperArgs+=(
       # Effects
-- 
GitLab


From 4a25ab2d51b51fb78462c5e7a99af730c7b82095 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:44:21 +0000
Subject: [PATCH 1530/2254] =?UTF-8?q?gnome3.dconf-editor:=203.32.0=20?=
 =?UTF-8?q?=E2=86=92=203.34.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix
index 7f4f84fa5fe..4f7b64ca065 100644
--- a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix
+++ b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix
@@ -3,13 +3,13 @@
 
 let
   pname = "dconf-editor";
-  version = "3.32.0";
+  version = "3.34.1";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1fmsmlh16njjm948grz20mzrsvb4wjj7pl1fvkrkxqi7mhr177gi";
+    sha256 = "0dgkgzrk4q8753j3lvz4ykyfs7pv1fvdmi516ryv3q20k24kxb9j";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From ff8958a8bbff4fcafa36c347dd76bb94aec780b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 9 Sep 2019 21:44:46 +0200
Subject: [PATCH 1531/2254] gnome3.dconf: 0.32.0 -> 0.34.0

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

diff --git a/pkgs/desktops/gnome-3/core/dconf/default.nix b/pkgs/desktops/gnome-3/core/dconf/default.nix
index 43f8dd08dbf..7ce498da9f3 100644
--- a/pkgs/desktops/gnome-3/core/dconf/default.nix
+++ b/pkgs/desktops/gnome-3/core/dconf/default.nix
@@ -6,20 +6,14 @@ let
 in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
-  version = "0.32.0";
+  version = "0.34.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1azz4hb9z76yxn34yrrsiib3iqz5z4vpwn5q7cncp55w365ygg38";
+    sha256 = "0lnsl85cp2vpzgp8pkf6l6yd2i3lp02jdvga1icfa78j2smr8fll";
   };
 
   patches = [
-    # Fix the build on Darwin
-    # Issue: https://gitlab.gnome.org/GNOME/dconf/issues/47
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/dconf/commit/49f4d916e1151af3975df52c522c69de98ed2fbb.patch";
-      sha256 = "00klkr1jzli9ap0aj6399m1bj2bxxz48pmcj4r16dsy6dfdl6325";
-    })
   ];
 
   postPatch = ''
-- 
GitLab


From 55c95460bf068cc5e92144185da568adf0ca3327 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 9 Sep 2019 18:05:49 +0000
Subject: [PATCH 1532/2254] =?UTF-8?q?gnome3.devhelp:=203.32.0=20=E2=86=92?=
 =?UTF-8?q?=203.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix
index 23a58011e02..8d731d829b2 100644
--- a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix
+++ b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "devhelp";
-  version = "3.32.0";
+  version = "3.34.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/devhelp/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "06sa83zggk29wcg75fl3gqh0rmi7cd3gsbk09a2z23r7vpy7xanq";
+    sha256 = "0zpmn6fgkgiayvn4diia5df0s6s7dqrdnp3nrvpavsmgn0vhb4pg";
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook appstream-glib gobject-introspection python3 ];
-- 
GitLab


From a2febc6166f05dd2af972c9a910c6bf030938596 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:44:21 +0000
Subject: [PATCH 1533/2254] =?UTF-8?q?gnome3.eog:=203.32.2=20=E2=86=92=203.?=
 =?UTF-8?q?34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/core/eog/default.nix b/pkgs/desktops/gnome-3/core/eog/default.nix
index 8bb727a6fc5..fa4de8583da 100644
--- a/pkgs/desktops/gnome-3/core/eog/default.nix
+++ b/pkgs/desktops/gnome-3/core/eog/default.nix
@@ -4,13 +4,13 @@
 
 let
   pname = "eog";
-  version = "3.32.2";
+  version = "3.34.0";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1bcxpqgzlk2cy4wfb3b5h66mhpj2fhrk1rrb5qqcv5xrr62ik5xy";
+    sha256 = "1vjrlgc82ij8ijkgc1ssssig4bp23nd6a31wx44m7k1pwy64z594";
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook libxml2 gobject-introspection python3 ];
-- 
GitLab


From 484cc3737c3d601d58998b6501301981e364a646 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:44:28 +0000
Subject: [PATCH 1534/2254] =?UTF-8?q?gnome3.evolution:=203.32.4=20?=
 =?UTF-8?q?=E2=86=92=203.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix
index 2061fc26607..71bec860384 100644
--- a/pkgs/desktops/gnome-3/apps/evolution/default.nix
+++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix
@@ -10,7 +10,7 @@
 , gtk3
 , glib
 , libnotify
-, gtkspell3
+, gspell
 , evolution-data-server
 , adwaita-icon-theme
 , gnome-desktop
@@ -42,11 +42,11 @@
 
 stdenv.mkDerivation rec {
   pname = "evolution";
-  version = "3.32.4";
+  version = "3.34.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/evolution/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "00hmmg4hfns8rq9rcilmy0gi1xkksld27lfbd9zmw2xw37wjmbqh";
+    sha256 = "136jim297ac7ig0ax7ll6x4dc3vhd7l5prh3fvb4mmskv5klbl6r";
   };
 
   nativeBuildInputs = [
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
     gst_all_1.gst-plugins-base
     gst_all_1.gstreamer
     gtk3
-    gtkspell3
+    gspell
     highlight
     icu
     libcanberra-gtk3
-- 
GitLab


From 968127565e9e17d7676b9c641993aaf17b54ed18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 9 Sep 2019 19:33:39 +0000
Subject: [PATCH 1535/2254] =?UTF-8?q?gnome3.file-roller:=203.32.1=20?=
 =?UTF-8?q?=E2=86=92=203.32.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/apps/file-roller/default.nix
index 267a7f2f7d2..36b89a31052 100644
--- a/pkgs/desktops/gnome-3/apps/file-roller/default.nix
+++ b/pkgs/desktops/gnome-3/apps/file-roller/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   pname = "file-roller";
-  version = "3.32.1";
+  version = "3.32.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/file-roller/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0irm72cf8222h93skivn0nn0ckahiiiimy4rb9r3ccjvhi3hiaqw";
+    sha256 = "0w8s6hakgsvb2nqwbv0lr8ki4cbf1pz5z3qwkb0b2k7ppbh7j2n6";
   };
 
   LANG = "en_US.UTF-8"; # postinstall.py
-- 
GitLab


From 7642faec42e363ac96a036340f3b2df1cd7467e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:44:25 +0000
Subject: [PATCH 1536/2254] =?UTF-8?q?gnome3.four-in-a-row:=203.32.0=20?=
 =?UTF-8?q?=E2=86=92=203.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
index 5b233c48385..356df76a061 100644
--- a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
+++ b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
@@ -1,21 +1,21 @@
 { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, gettext, meson, libcanberra-gtk3, librsvg, itstool, vala
+, gettext, meson, gsound, librsvg, itstool, vala
 , python3, ninja, desktop-file-utils }:
 
 stdenv.mkDerivation rec {
   pname = "four-in-a-row";
-  version = "3.32.0";
+  version = "3.34.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/four-in-a-row/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0h4wmbkdp7x3gp9sbxmvla316m8n6iy4f5sq0ksldj0z7ghlx9zl";
+    sha256 = "1wf0545lhmqf2hfi7wc8bqs7b9g43rm0df0ssza6517xzc4lx7jl";
   };
 
   nativeBuildInputs = [
     pkgconfig wrapGAppsHook gettext meson itstool vala
     ninja python3 desktop-file-utils
   ];
-  buildInputs = [ gtk3 libcanberra-gtk3 librsvg gnome3.adwaita-icon-theme ];
+  buildInputs = [ gtk3 gsound librsvg gnome3.adwaita-icon-theme ];
 
   postPatch = ''
     chmod +x build-aux/meson_post_install.py
-- 
GitLab


From 0e598c206db1acd4237102dd5781d43f6ad680d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:44:26 +0000
Subject: [PATCH 1537/2254] =?UTF-8?q?gnome3.gdm:=203.32.0=20=E2=86=92=203.?=
 =?UTF-8?q?34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- disable custom initial vt as it's buggy
---
 pkgs/desktops/gnome-3/core/gdm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix
index a4d2fd2be5a..8659efe2c32 100644
--- a/pkgs/desktops/gnome-3/core/gdm/default.nix
+++ b/pkgs/desktops/gnome-3/core/gdm/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gdm";
-  version = "3.32.0";
+  version = "3.34.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gdm/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "12ypdz9i24hwbl1d1wnnxb8zlvfa4f49n9ac5cl9d6h8qp4b0gb4";
+    sha256 = "0pnh0nj4kk8n48kgj77bb5r4z5jnb7kxnvpnddk6b9n96g0qwklv";
   };
 
   # Only needed to make it build
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     "--localstatedir=/var"
     "--with-plymouth=yes"
     "--enable-gdm-xsession"
-    "--with-initial-vt=7"
+    # "--with-initial-vt=7"
     "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
     "--with-udevdir=$(out)/lib/udev"
   ];
-- 
GitLab


From 7dc02aa1852db3530ba22113f0383627f8bb32a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:44:27 +0000
Subject: [PATCH 1538/2254] gnome3.geary: 3.32.2 -> 3.34.0

---
 pkgs/desktops/gnome-3/misc/geary/default.nix | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix
index 8babe77e412..870ff56e570 100644
--- a/pkgs/desktops/gnome-3/misc/geary/default.nix
+++ b/pkgs/desktops/gnome-3/misc/geary/default.nix
@@ -1,28 +1,30 @@
 { stdenv, fetchurl, pkgconfig, gtk3, vala, enchant2, wrapGAppsHook, meson, ninja
 , desktop-file-utils, gnome-online-accounts, gsettings-desktop-schemas, adwaita-icon-theme
-, libnotify, libcanberra-gtk3, libsecret, gmime, isocodes, libxml2, gettext
+, libcanberra-gtk3, libsecret, gmime, isocodes, libxml2, gettext
 , sqlite, gcr, json-glib, itstool, libgee, gnome3, webkitgtk, python3
-, xvfb_run, dbus, shared-mime-info, libunwind, libunity, folks, glib-networking }:
+, xvfb_run, dbus, shared-mime-info, libunwind, libunity, folks, glib-networking
+, gobject-introspection, gspell, appstream-glib, libytnef, libhandy }:
 
 stdenv.mkDerivation rec {
   pname = "geary";
-  version = "3.32.2";
+  version = "3.34.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0sg53zq81v28hdqiy5d048skwfgsa8ck0z7ywsagdh7iaqin68gq";
+    sha256 = "1cxpyjgfrai423vwqc6jv4aqadxkd3ghh2had71drilyywy5bx64";
   };
 
   nativeBuildInputs = [
     desktop-file-utils gettext itstool libxml2 meson ninja
-    pkgconfig vala wrapGAppsHook python3
+    pkgconfig vala wrapGAppsHook python3 appstream-glib
+    gobject-introspection
   ];
 
   buildInputs = [
     adwaita-icon-theme enchant2 gcr gmime gnome-online-accounts
     gsettings-desktop-schemas gtk3 isocodes json-glib libcanberra-gtk3
-    libgee libnotify libsecret sqlite webkitgtk glib-networking
-    libunwind libunity folks
+    libgee libsecret sqlite webkitgtk glib-networking
+    libunwind libunity folks gspell libytnef libhandy
   ];
 
   checkInputs = [ xvfb_run dbus ];
@@ -32,8 +34,8 @@ stdenv.mkDerivation rec {
   ];
 
   postPatch = ''
-    chmod +x build-aux/post_install.py
-    patchShebangs build-aux/post_install.py
+    chmod +x build-aux/post_install.py build-aux/git_version.py
+    patchShebangs build-aux/post_install.py build-aux/git_version.py
 
     chmod +x desktop/geary-attach
   '';
-- 
GitLab


From 86c879f4618951689f54d8903b4642a757a10e27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:44:31 +0000
Subject: [PATCH 1539/2254] =?UTF-8?q?gnome3.gedit:=203.32.2=20=E2=86=92=20?=
 =?UTF-8?q?3.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/apps/gedit/default.nix b/pkgs/desktops/gnome-3/apps/gedit/default.nix
index 35d97a87a86..5115c2d8fb4 100644
--- a/pkgs/desktops/gnome-3/apps/gedit/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gedit/default.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gedit";
-  version = "3.32.2";
+  version = "3.34.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gedit/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1q2rk7fym542c7k3bn2wlnzgy384gxacbifsjny0spbg95gfybvl";
+    sha256 = "0zjh3p3lns7a7kx3g3v7gkgcqdzyx1zyv8ssr6d5ljfb7hfyb59y";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From d1cf35e1841f588f608de8c9325c450ab1e7f80d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:44:31 +0000
Subject: [PATCH 1540/2254] =?UTF-8?q?gnome3.gjs:=201.56.2=20=E2=86=92=201.?=
 =?UTF-8?q?58.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- No longer links to gkt3
---
 pkgs/desktops/gnome-3/core/gjs/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gjs/default.nix b/pkgs/desktops/gnome-3/core/gjs/default.nix
index 303377b8631..a7b8e18d73a 100644
--- a/pkgs/desktops/gnome-3/core/gjs/default.nix
+++ b/pkgs/desktops/gnome-3/core/gjs/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gjs";
-  version = "1.56.2";
+  version = "1.58.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gjs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1b5321krn89p3f7s2ik6gpfnc61apzljhlnbqky8c88f7n6832ac";
+    sha256 = "1wvywpng27y0264pq9anxdi1xy280x6mcnbgiggn804pql4nml8y";
   };
 
   passthru = {
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "installedTests" ];
 
   nativeBuildInputs = [ pkgconfig makeWrapper ];
-  buildInputs = [ libxml2 gobject-introspection gtk3 glib pango readline dbus ];
+  buildInputs = [ libxml2 gobject-introspection glib pango readline dbus ];
 
   propagatedBuildInputs = [ spidermonkey_60 ];
 
-- 
GitLab


From 1fbeb1d4d7f4c6911302275215b3e8bb20a0fa3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Fri, 6 Sep 2019 13:35:31 +0000
Subject: [PATCH 1541/2254] =?UTF-8?q?gnome3.gnome-applets:=203.32.0=20?=
 =?UTF-8?q?=E2=86=92=203.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

GSD no longer required since modem-lights applet was removed.
---
 pkgs/desktops/gnome-3/misc/gnome-applets/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix b/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix
index 25e1347f1c9..fff328c608d 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix
@@ -18,7 +18,6 @@
 , adwaita-icon-theme
 , libgweather
 , gucharmap
-, gnome-settings-daemon
 , tracker
 , polkit
 , gnome3
@@ -26,13 +25,13 @@
 
 let
   pname = "gnome-applets";
-  version = "3.32.0";
+  version = "3.34.0";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "10kd19ymxl2z65121g90mx96m6vcn2a8a50g6a56prrdjsgbgia1";
+    sha256 = "1mbhykqwzq18zpvfkdcdkbb4zhijmxqa2i6502an78yap87vq74i";
   };
 
   nativeBuildInputs = [
@@ -56,7 +55,6 @@ in stdenv.mkDerivation rec {
     adwaita-icon-theme
     libgweather
     gucharmap
-    gnome-settings-daemon
     tracker
     polkit
     wirelesstools
-- 
GitLab


From 21976dd1fb24946fa51f5cf69a2170bb99bb95df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:44:34 +0000
Subject: [PATCH 1542/2254] =?UTF-8?q?gnome3.gnome-bluetooth:=203.32.1=20?=
 =?UTF-8?q?=E2=86=92=203.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix
index 817c8324c6b..b52161f90ae 100644
--- a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix
@@ -6,14 +6,14 @@ let
   pname = "gnome-bluetooth";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
-  version = "3.32.1";
+  version = "3.34.0";
 
   # TODO: split out "lib"
   outputs = [ "out" "dev" "devdoc" "man" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1am1gf0nzwg6x1s8ly13j0xnjzgrfj06j0dp52x4zy9s67ywlhb4";
+    sha256 = "1bvbxcsjkyl0givy8nfm7112bq3c0vn1v89fdk2pip714dsfcrz8";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From c09404c3593d3bf53d7e4f1dc0f1a3b5cb77b084 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:44:36 +0000
Subject: [PATCH 1543/2254] =?UTF-8?q?gnome3.gnome-books:=203.32.0=20?=
 =?UTF-8?q?=E2=86=92=203.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/apps/gnome-books/default.nix b/pkgs/desktops/gnome-3/apps/gnome-books/default.nix
index 25ee957224c..628442c3075 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-books/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-books/default.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-books";
-  version = "3.32.0";
+  version = "3.34.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1wkcywcwwszj9mldr0lngczqdz7hys08rr1nd2k6rs8ykzs2z7m4";
+    sha256 = "153vknqisjn5f105avzm933fsc3v0pjzzbwxlqxf8vjjksh1cmya";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From b59b97637a62d6bd9564811c69486e070006f141 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Wed, 4 Sep 2019 11:27:03 +0000
Subject: [PATCH 1544/2254] =?UTF-8?q?gnome3.gnome-boxes:=203.32.1=20?=
 =?UTF-8?q?=E2=86=92=203.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

oVirt support was dropped
---
 pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
index 2f0a21896e9..ba0d0bd891b 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
@@ -6,17 +6,15 @@
 , libcap_ng, numactl, xen, libapparmor, json-glib, webkitgtk, vte
 }:
 
-# TODO: ovirt (optional)
-
 let
-  version = "3.32.1";
+  version = "3.34.0";
 in stdenv.mkDerivation rec {
   pname = "gnome-boxes";
   inherit version;
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-boxes/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "159sxii3g4s5pjb4s4i3kc4q162w5vicp4g6wvk1y2yv68bgmcl4";
+    sha256 = "07qjrb1qgfznvm0l2jm99d212dvw3iaw76czq5q1msnghpdw67qd";
   };
 
   doCheck = true;
@@ -40,10 +38,6 @@ in stdenv.mkDerivation rec {
     gappsWrapperArgs+=(--prefix PATH : "${stdenv.lib.makeBinPath [ mtools cdrkit libcdio ]}")
   '';
 
-  mesonFlags = [
-    "-Dovirt=false"
-  ];
-
   postPatch = ''
     chmod +x build-aux/post_install.py # patchShebangs requires executable file
     patchShebangs build-aux/post_install.py
-- 
GitLab


From 108b0e567aeb42862cd1a186c9541bcc3eb60be8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:44:36 +0000
Subject: [PATCH 1545/2254] =?UTF-8?q?gnome3.gnome-calculator:=203.32.2=20?=
 =?UTF-8?q?=E2=86=92=203.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
index df43371a497..f743e8fead6 100644
--- a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
@@ -1,14 +1,14 @@
 { stdenv, meson, ninja, vala, gettext, itstool, fetchurl, pkgconfig, libxml2
 , gtk3, glib, gtksourceview4, wrapGAppsHook, gobject-introspection, python3
-, gnome3, mpfr, gmp, libsoup, libmpc, gsettings-desktop-schemas }:
+, gnome3, mpfr, gmp, libsoup, libmpc, gsettings-desktop-schemas, libgee }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-calculator";
-  version = "3.32.2";
+  version = "3.34.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-calculator/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0fgpn3sc226s9fpzhik5rkkrf669037gc659ga2kn9jsyckj6p41";
+    sha256 = "0gzjdddby3pi22srlcw6q2dv9dxwak75jbplpvflhq4w82qx543b";
   };
 
   nativeBuildInputs = [
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     gtk3 glib libxml2 gtksourceview4 mpfr gmp
-    gnome3.adwaita-icon-theme
+    gnome3.adwaita-icon-theme libgee
     gsettings-desktop-schemas libsoup libmpc
   ];
 
-- 
GitLab


From 36f752d83ce2e28b9477265ddf9c96f94942ad58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:44:37 +0000
Subject: [PATCH 1546/2254] =?UTF-8?q?gnome3.gnome-calendar:=203.32.2=20?=
 =?UTF-8?q?=E2=86=92=203.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
index 03619f38c9b..ec09b856f30 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
@@ -4,13 +4,13 @@
 
 let
   pname = "gnome-calendar";
-  version = "3.32.2";
+  version = "3.34.0";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "07p73cvzj8idr80npja5yiv9pjfyi6qqfhaz5jwcgqspqbnhnl7k";
+    sha256 = "0gbiqsx3pny2blgfwazy82fbrnn17yilm3rvv1aq8k5w0xd9147b";
   };
 
   passthru = {
-- 
GitLab


From b44b63a5b93ef7c7fb6a707a89e449ef881b8607 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:44:41 +0000
Subject: [PATCH 1547/2254] =?UTF-8?q?gnome3.gnome-chess:=203.32.0=20?=
 =?UTF-8?q?=E2=86=92=203.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix
index d7001e1c527..72c4bdf1d29 100644
--- a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-chess";
-  version = "3.32.0";
+  version = "3.34.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-chess/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0hzb6s4wmfy1fysagc5hmn1ijvrwyd2cg7iz41mpn7gfdjyak639";
+    sha256 = "1n1vjg6xhwppmddrmqmkk6b3jkgphshp06rjbv5h3270k520a135";
   };
 
   nativeBuildInputs = [ meson ninja vala pkgconfig gettext itstool libxml2 python3 wrapGAppsHook gobject-introspection ];
-- 
GitLab


From e321bba430e959582353a267861730ef3d0d0477 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:44:40 +0000
Subject: [PATCH 1548/2254] =?UTF-8?q?gnome3.gnome-clocks:=203.32.0=20?=
 =?UTF-8?q?=E2=86=92=203.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
index 38182f1f994..a99e775b26b 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-clocks";
-  version = "3.32.0";
+  version = "3.34.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-clocks/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1w6lgjdak3x76c9gyhd1lqrdmjfh8q77sjnrkcimylsg0jq913bc";
+    sha256 = "0g7hjk55smhkd09hwa9kag3h5a12l494wj89w9smpdk3ghsmy6b1";
   };
 
   passthru = {
-- 
GitLab


From be2cfc45e46f1fd70375e11c6e0e3c3605ee59b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:44:42 +0000
Subject: [PATCH 1549/2254] =?UTF-8?q?gnome3.gnome-contacts:=203.32.1=20?=
 =?UTF-8?q?=E2=86=92=203.34?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gnome-3/core/gnome-contacts/default.nix         | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
index 75a15a41f97..01127853a86 100644
--- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
@@ -5,14 +5,14 @@
 , vala, meson, ninja, libhandy, gsettings-desktop-schemas }:
 
 let
-  version = "3.32.1";
+  version = "3.34";
 in stdenv.mkDerivation rec {
   pname = "gnome-contacts";
   inherit version;
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-contacts/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "17g1gh8yj58cfpdx69h2szivlbjgvv982kmhnkkh0i5bwj0zs2yy";
+    sha256 = "04igc9xvyc4kb5xf5g2missnvyvj9zv5cqxf5k4z7hb0sv42wq4r";
   };
 
   propagatedUserEnvPkgs = [ evolution-data-server ];
@@ -33,15 +33,6 @@ in stdenv.mkDerivation rec {
   ];
 
   patches = [
-    # Fixes build with libhandy >= 0.0.10
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/gnome-contacts/commit/c5eee38cd2556403a640a0a4c11d36cbf9a5a798.patch";
-      sha256 = "0s2cl7z6b0x3ky4y28yyxc9x5zp4r3vqmvbhz5m2fm6830fyjg13";
-    })
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/gnome-contacts/commit/1f1500ca01098ffda6392f5ec9ce3a29a48a84b1.patch";
-      sha256 = "082zaaj2l5cgr2qy145x8yknja87r0vpigrhidal40041kd5nldg";
-    })
   ];
 
   postPatch = ''
-- 
GitLab


From e344e027fed1f2f3969af41931791580867a5383 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:44:43 +0000
Subject: [PATCH 1550/2254] =?UTF-8?q?gnome3.gnome-control-center:=203.32.2?=
 =?UTF-8?q?=20=E2=86=92=203.34.0.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
index 04730f2370f..b87980f6b65 100644
--- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
@@ -67,11 +67,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-control-center";
-  version = "3.32.2";
+  version = "3.34.0.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "03np0mhfl9kkdw4cb711pda0cli9zgh2bq2gqn2zwbdi3qnhk9gs";
+    sha256 = "1jr3bbpycdzk26b83fsxw1my0aldi86v0733k42y4x45vacaanqa";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From e0ee3d745a5c7895caf60478df7875360fbdb446 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:44:44 +0000
Subject: [PATCH 1551/2254] =?UTF-8?q?gnome3.gnome-desktop:=203.32.2=20?=
 =?UTF-8?q?=E2=86=92=203.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
index 9d798c2811b..cf76caf9f48 100644
--- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-desktop";
-  version = "3.32.2";
+  version = "3.34.0";
 
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-desktop/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0bidx4626x7k2myv6f64qv4fzmxv8v475wibiz19kj8hjfr737q9";
+    sha256 = "09i4nv3fn8vlx7f1rzqid9qgd3srlz3hfajnjwmnpmf1apk1wcwd";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From cd0a6e75c7c5f0495a609ea983fe5169537ecdb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:44:49 +0000
Subject: [PATCH 1552/2254] =?UTF-8?q?gnome3.gnome-disk-utility:=203.32.1?=
 =?UTF-8?q?=20=E2=86=92=203.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
index d6d9f927252..86739bb0f45 100644
--- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
@@ -1,15 +1,15 @@
 { stdenv, gettext, fetchurl, pkgconfig, udisks2, libsecret, libdvdread
 , meson, ninja, gtk3, glib, wrapGAppsHook, python3, libnotify
 , itstool, gnome3, libxml2, gsettings-desktop-schemas
-, libcanberra-gtk3, libxslt, docbook_xsl, libpwquality }:
+, libcanberra-gtk3, libxslt, docbook_xsl, libpwquality, systemd }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-disk-utility";
-  version = "3.32.1";
+  version = "3.34.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-disk-utility/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "08vwbji9m1nhjjdiyhhaqi8cncys7i89b4bpy095f8475v8y05bg";
+    sha256 = "1mb7q90lnlp97dhxhnadhjagcfd12dfqzp0vj9h6b1r61pzhy97y";
   };
 
   nativeBuildInputs = [
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     gtk3 glib libsecret libpwquality libnotify libdvdread libcanberra-gtk3
-    udisks2 gnome3.adwaita-icon-theme
+    udisks2 gnome3.adwaita-icon-theme systemd
     gnome3.gnome-settings-daemon gsettings-desktop-schemas
   ];
 
-- 
GitLab


From 1415bf1b867763a2d38d430e870f7c54dcf5e91d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:44:49 +0000
Subject: [PATCH 1553/2254] =?UTF-8?q?gnome3.gnome-documents:=203.32.0=20?=
 =?UTF-8?q?=E2=86=92=203.33.90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
index 1301381e5aa..3a7e1473332 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-documents";
-  version = "3.32.0";
+  version = "3.33.90";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-documents/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1gqddzbr4d8s0asmrhy0sfmwggzhbmpm61mqf8rxpdjk7s26086c";
+    sha256 = "0l9g10i380bnjp1y3pslsy8ph1hd5x1d57dadvq70p5ki4r3qjaw";
   };
 
   doCheck = true;
-- 
GitLab


From e702f9eb104075910c7c1873b44615ddfb39c1ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:44:48 +0000
Subject: [PATCH 1554/2254] =?UTF-8?q?gnome3.gnome-flashback:=203.32.0=20?=
 =?UTF-8?q?=E2=86=92=203.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Now longer has a gnome-flashback-init component.
---
 .../gnome-3/misc/gnome-flashback/default.nix         | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix
index 3cade7ccdf8..e809cc7f44f 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix
@@ -26,24 +26,20 @@
 
 let
   pname = "gnome-flashback";
-  version = "3.32.0";
-  requiredComponents = wmName: "RequiredComponents=${wmName};gnome-flashback-init;gnome-flashback;gnome-panel;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Clipboard;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Mouse;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings;";
+  version = "3.34.0";
+  requiredComponents = wmName: "RequiredComponents=${wmName};gnome-flashback;gnome-panel;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings;";
   gnome-flashback = stdenv.mkDerivation rec {
     name = "${pname}-${version}";
 
     src = fetchurl {
       url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-      sha256 = "0jfzr7vdmnxpxqqa38ni1p3c508xhlnxqpmmqshk3rvrf0afqn62";
+      sha256 = "1ryr28psrjr3kp0in99a12y4vy6kvi2mvhp174dli2a56ds16mgj";
     };
 
     # make .desktop Execs absolute
     postPatch = ''
       patch -p0 <<END_PATCH
-      +++ data/applications/gnome-flashback-init.desktop.in
-      @@ -4 +4 @@
-      -Exec=gnome-flashback --initialize
-      +Exec=$out/bin/gnome-flashback --initialize
-      +++ data/applications/gnome-flashback.desktop.in
+      +++ data/applications/gnome-flashback.desktop.in.in
       @@ -4 +4 @@
       -Exec=gnome-flashback
       +Exec=$out/bin/gnome-flashback
-- 
GitLab


From ea250cadf233562a8125c5dd00ec148673470984 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:44:49 +0000
Subject: [PATCH 1555/2254] =?UTF-8?q?gnome3.gnome-font-viewer:=203.32.0=20?=
 =?UTF-8?q?=E2=86=92=203.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix
index 976829acd4c..0589dfe7285 100644
--- a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-font-viewer";
-  version = "3.32.0";
+  version = "3.34.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-font-viewer/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "10b150sa3971i5lfnk0jkkzlril97lz09sshwsbkabc8b7kv1qa3";
+    sha256 = "12xrsqwmvid7hksiw4zhj4jd1qwxn8w0czskbq4yqfprwn1havxa";
   };
 
   doCheck = true;
-- 
GitLab


From 2308486549de969efc935bb5a8c546739d07a46b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:45:10 +0000
Subject: [PATCH 1556/2254] =?UTF-8?q?gnome3.gnome-getting-started-docs:=20?=
 =?UTF-8?q?3.32.2=20=E2=86=92=203.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gnome-3/apps/gnome-getting-started-docs/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix
index 655e9e9fe34..bb4e1820807 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-getting-started-docs";
-  version = "3.32.2";
+  version = "3.34.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-getting-started-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1v4k465mlzrhgcdddzs6bmm0yliyrfx6jg3gh0s17a08i0w5rbwq";
+    sha256 = "1nq3dvvjr6vzl87p0y2ggv8bxap3hdbwhbn9ycan4y5d4g5f437p";
   };
 
   passthru = {
-- 
GitLab


From 28788db24b020840c3d2006e0cd2d994dedf28b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:44:56 +0000
Subject: [PATCH 1557/2254] =?UTF-8?q?gnome3.gnome-klotski:=203.32.0=20?=
 =?UTF-8?q?=E2=86=92=203.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix
index 904edd7e51a..137357e0a39 100644
--- a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix
@@ -5,13 +5,13 @@
 
 let
   pname = "gnome-klotski";
-  version = "3.32.0";
+  version = "3.34.0";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1p4s15gxj6gasix22z9vlx2yrx196fvcxr6v6qrl569idfgjbi72";
+    sha256 = "0sbx0bzy32lh2c9jp8v7gz788wn9y1la8mr5a7gf7370szsl4d4f";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From 0c456c362f7c40623a961817612fc376f625eddb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:44:54 +0000
Subject: [PATCH 1558/2254] =?UTF-8?q?gnome3.gnome-logs:=203.32.1=20?=
 =?UTF-8?q?=E2=86=92=203.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
index 8681a3c866c..c80238740e5 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
@@ -1,23 +1,22 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, gnome3, glib, gtk3, wrapGAppsHook, desktop-file-utils
+{ stdenv, fetchurl, meson, ninja, pkgconfig, gnome3, glib, gtk3, wrapGAppsHook
 , gettext, itstool, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_43, systemd, python3, gsettings-desktop-schemas }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-logs";
-  version = "3.32.1";
+  version = "3.34.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-logs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0hh3nnbq7q2xbflvaywanm0j3dqhb04ngphskhnjx2sg7px12068";
+    sha256 = "16jfwg912asirrdmipf6wh7zr5zrww3nyhf99mi230y8hmqazx0m";
   };
 
   mesonFlags = [
-    "-Dtests=true"
     "-Dman=true"
   ];
 
   nativeBuildInputs = [
     python3
-    meson ninja pkgconfig wrapGAppsHook gettext itstool desktop-file-utils
+    meson ninja pkgconfig wrapGAppsHook gettext itstool
     libxml2 libxslt docbook_xsl docbook_xml_dtd_43
   ];
   buildInputs = [ glib gtk3 systemd gsettings-desktop-schemas gnome3.adwaita-icon-theme ];
-- 
GitLab


From 3c229475063380aee90837b8bb4d12664017ce44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:44:56 +0000
Subject: [PATCH 1559/2254] =?UTF-8?q?gnome3.gnome-mahjongg:=203.32.0=20?=
 =?UTF-8?q?=E2=86=92=203.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix
index 9d173945cdd..aa7824a0317 100644
--- a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-mahjongg";
-  version = "3.32.0";
+  version = "3.34.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-mahjongg/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "12kamxnxbh26k4iykhbs873mx25a2wrjnhr013lfkwbyl52kg12j";
+    sha256 = "0qyi3jkg112jysrsy5p330b7b92sl09mr8zsimq06q68kj1wzkz5";
   };
 
   passthru = {
-- 
GitLab


From eb2076aa03adecdfe96aecf1e944605ecd1b6d59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:44:59 +0000
Subject: [PATCH 1560/2254] =?UTF-8?q?gnome3.gnome-maps:=203.32.2.1=20?=
 =?UTF-8?q?=E2=86=92=203.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
index 6011092c0e0..fd659b3e405 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
@@ -5,13 +5,13 @@
 
 let
   pname = "gnome-maps";
-  version = "3.32.2.1";
+  version = "3.34.0";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1m191iq1gjaqz79ci3dkbmwrkxp7pzknngimlf5bqib5x8yairlb";
+    sha256 = "0vsi21zzk5mvf6rv86r6ahzxd93ciyhjrdqsn3pncnk0yy67y2wr";
   };
 
   doCheck = true;
-- 
GitLab


From 16544a60f7c2b3b2c7aeecfdbee61aeb9b2b8bbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:45:00 +0000
Subject: [PATCH 1561/2254] =?UTF-8?q?gnome3.gnome-mines:=203.32.2=20?=
 =?UTF-8?q?=E2=86=92=203.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix
index 1ac7e51357e..8c620fdd0d1 100644
--- a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-mines";
-  version = "3.32.2";
+  version = "3.34.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-mines/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1nv966wkp2rqxzcdb76bwlbzpjqadcaqzrnkxpzwnvjjr167yx8g";
+    sha256 = "1spxa6qr1y8s5rrsvpciywpvhk812ngn95s1apaxaigwy2g1iw54";
   };
 
   # gobject-introspection for finding vapi files
-- 
GitLab


From 5bb4b8cd0ab16a17b1385c2865f24bbe4c1d7339 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:45:02 +0000
Subject: [PATCH 1562/2254] =?UTF-8?q?gnome3.gnome-music:=203.32.2=20?=
 =?UTF-8?q?=E2=86=92=203.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
index 9b8c96729ad..204d0a8982e 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
@@ -6,13 +6,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "gnome-music";
-  version = "3.32.2";
+  version = "3.34.0";
 
   format = "other";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0cn7l1d3ayima1w3bxpshijabd7ibhnvqxv2mpvffzizk04ln6hk";
+    sha256 = "1a566ifx08clfm22qzdh1i6w8cr2kv7avqzkk6zgc5adba0vmzx4";
   };
 
   nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ];
-- 
GitLab


From a36a47ad963457f4fb192c98f97b254905a344a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:45:04 +0000
Subject: [PATCH 1563/2254] =?UTF-8?q?gnome3.gnome-nibbles:=203.32.0=20?=
 =?UTF-8?q?=E2=86=92=203.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gnome-3/games/gnome-nibbles/default.nix     | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix
index 7b069922169..803661b0153 100644
--- a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix
@@ -1,19 +1,24 @@
 { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, librsvg, libcanberra-gtk3, clutter-gtk, intltool, itstool
-, libxml2, libgee, libgnome-games-support }:
+, librsvg, gsound, clutter-gtk, gettext, itstool, vala, python3
+, libxml2, libgee, libgnome-games-support, meson, ninja
+, desktop-file-utils, hicolor-icon-theme}:
 
 stdenv.mkDerivation rec {
   pname = "gnome-nibbles";
-  version = "3.32.0";
+  version = "3.34.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-nibbles/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0g627pzbfywiy2rsh4aidgbln9s4j5m8pryw4cgr5ygc4z8l6l9p";
+    sha256 = "0al0znl26y3xcdq6ilv78g54pz0fcw5lr9rhhf9g9rkyigd5056n";
   };
 
-  nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool itstool libxml2 ];
+  nativeBuildInputs = [
+    meson ninja vala python3
+    pkgconfig wrapGAppsHook gettext itstool libxml2
+    desktop-file-utils hicolor-icon-theme
+  ];
   buildInputs = [
-    gtk3 librsvg libcanberra-gtk3 clutter-gtk gnome3.adwaita-icon-theme
+    gtk3 librsvg gsound clutter-gtk gnome3.adwaita-icon-theme
     libgee libgnome-games-support
   ];
 
-- 
GitLab


From fcf160d383a412a91f5ca9e68e887b585f397180 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Wed, 4 Sep 2019 11:26:22 +0000
Subject: [PATCH 1564/2254] =?UTF-8?q?gnome3.gnome-notes:=203.32.2=20?=
 =?UTF-8?q?=E2=86=92=203.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix
index 920343a6024..a6bc54fd86b 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix
@@ -5,14 +5,14 @@
 , gnome3, libxml2, gsettings-desktop-schemas, tracker }:
 
 let
-  version = "3.32.2";
+  version = "3.34.0";
 in stdenv.mkDerivation {
   pname = "gnome-notes";
   inherit version;
 
   src = fetchurl {
     url = "mirror://gnome/sources/bijiben/${stdenv.lib.versions.majorMinor version}/bijiben-${version}.tar.xz";
-    sha256 = "0chm2fks7cpx3mycxzddpj6v9by203c3m1y6zns5ra43bspwafy2";
+    sha256 = "0wrnsspcg4s0vdfc23cc84xy02k3b19yim9s4k0vv23b69n37n1l";
   };
 
   doCheck = true;
-- 
GitLab


From 1dce1e58f746152ca224497e91f70aa41487c0ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:44:10 +0000
Subject: [PATCH 1565/2254] =?UTF-8?q?gnome3.gnome-online-accounts:=203.32.?=
 =?UTF-8?q?0=20=E2=86=92=203.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/libraries/gnome-online-accounts/default.nix b/pkgs/development/libraries/gnome-online-accounts/default.nix
index 9ae4a572d93..f97a49e26b8 100644
--- a/pkgs/development/libraries/gnome-online-accounts/default.nix
+++ b/pkgs/development/libraries/gnome-online-accounts/default.nix
@@ -6,13 +6,13 @@
 
 let
   pname = "gnome-online-accounts";
-  version = "3.32.0";
+  version = "3.34.0";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1anlx0rb2hafg9929pgfms25mdz23sd0vdva06h6zlf8f5byc68w";
+    sha256 = "0mvz6wrw03zyp5sm46znkipncagb257xam29mfi06ixmxvjbqky4";
   };
 
   outputs = [ "out" "man" "dev" "devdoc" ];
-- 
GitLab


From 40aa2930c7b22b622fdaab58bf5ae9b0c9adc39d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Wed, 4 Sep 2019 11:27:18 +0000
Subject: [PATCH 1566/2254] =?UTF-8?q?gnome3.gnome-online-miners:=203.30.0?=
 =?UTF-8?q?=20=E2=86=92=203.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix
index 93da1f8abec..b21e3f6f68a 100644
--- a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-online-miners";
-  version = "3.30.0";
+  version = "3.34.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-online-miners/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0pjamwwzn5wqgihyss357dyl2q70r0bngnqmwsqawchx5f9aja9c";
+    sha256 = "1n2jz9i8a42zwxx5h8j2gdy6q1vyydh4vl00r0al7w8jzdh24p44";
   };
 
   nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
-- 
GitLab


From be73d2077d8bd10a5b4f167c0094837987ca49f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:45:10 +0000
Subject: [PATCH 1567/2254] =?UTF-8?q?gnome3.gnome-panel:=203.32.0=20?=
 =?UTF-8?q?=E2=86=92=203.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix b/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix
index 3031b2c1d78..6cb7249b64e 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix
@@ -23,7 +23,7 @@
 
 let
   pname = "gnome-panel";
-  version = "3.32.0";
+  version = "3.34.0";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
@@ -31,7 +31,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0a9zi1jb0b42zd6wx3251cnns9v1w0cbwasmrx9hsj1dsb9pjq3a";
+    sha256 = "11qsmpv0nyrkqc5b9a1532i82jmbxww1nlzdzysid283l9zyy2dn";
   };
 
   # make .desktop Exec absolute
-- 
GitLab


From e70325ad720af6a48c669187ffd2478397c26689 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:45:09 +0000
Subject: [PATCH 1568/2254] =?UTF-8?q?gnome3.gnome-robots:=203.32.0=20?=
 =?UTF-8?q?=E2=86=92=203.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix
index 46723867f8a..09aaae8e1e9 100644
--- a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, librsvg, libcanberra-gtk3, gettext, itstool, libxml2, libgnome-games-support
+, librsvg, gsound, gettext, itstool, libxml2, libgnome-games-support
 , libgee, meson, ninja, python3, desktop-file-utils , hicolor-icon-theme, adwaita-icon-theme }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-robots";
-  version = "3.32.0";
+  version = "3.34.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-robots/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1xp1sijl5k7wmnbb0hdgh4ajxgp74k7fcnmd5c6rw6lf51wpinyh";
+    sha256 = "18vnx5096d3mc2i7w4ma9hflsqfnvahl29aifjnvhdm5ji8qi0mb";
   };
 
   passthru = {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     hicolor-icon-theme # For setup-hook
   ];
   buildInputs = [
-    gtk3 librsvg libcanberra-gtk3 libgnome-games-support libgee adwaita-icon-theme
+    gtk3 librsvg gsound libgnome-games-support libgee adwaita-icon-theme
   ];
 
   postPatch = ''
-- 
GitLab


From f6c19ee5272cec4e92a969b56d15442919c9dcd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:45:10 +0000
Subject: [PATCH 1569/2254] =?UTF-8?q?gnome3.gnome-screenshot:=203.32.0=20?=
 =?UTF-8?q?=E2=86=92=203.33.90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
index 33acfd245cf..bf57fb809c6 100644
--- a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
@@ -4,13 +4,13 @@
 
 let
   pname = "gnome-screenshot";
-  version = "3.32.0";
+  version = "3.33.90";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "09ha7dizjm5ymqpjyrqd10ijfb3xlqc1mwg9ajkrbfry11q9yq4b";
+    sha256 = "0bki99lkp20jvp1yjymy8y56k378vivpvqvfwfx9dwl8r3qal7i2";
   };
 
   doCheck = true;
-- 
GitLab


From 6e9c75ed046d3c86b16b30464ac259cfe5896c54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:45:13 +0000
Subject: [PATCH 1570/2254] =?UTF-8?q?gnome3.gnome-session:=203.32.0=20?=
 =?UTF-8?q?=E2=86=92=203.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* adds systemd sessions
---
 pkgs/desktops/gnome-3/core/gnome-session/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix
index f13ad9f47aa..127aa5bf79b 100644
--- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-session/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-session";
-  version = "3.32.0";
+  version = "3.34.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-session/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0zrzkpd406i159mla7bfs5npa32fgqh66aip1rfq02rgsgmc9m5v";
+    sha256 = "0qkdwvj6w33h8csq9mhjbf10f0v5g0sgabyfg1bgp75z0br76si0";
   };
 
   patches = [
-- 
GitLab


From b373422223823b23b8ea2daeaa34b2bf6e8c6761 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:45:14 +0000
Subject: [PATCH 1571/2254] =?UTF-8?q?gnome3.gnome-settings-daemon:=203.32.?=
 =?UTF-8?q?1=20=E2=86=92=203.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- fixup build
---
 .../gnome-3/core/gnome-settings-daemon/default.nix    |  8 ++++++--
 .../core/gnome-settings-daemon/fix-paths.patch        | 11 -----------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
index b9f33ce73a8..aa8a42ceb21 100644
--- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
@@ -27,6 +27,7 @@
 , libwacom
 , libxslt
 , libxml2
+, modemmanager
 , networkmanager
 , gnome-desktop
 , geocode-glib
@@ -35,15 +36,16 @@
 , python3
 , tzdata
 , nss
+, gcr
 }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-settings-daemon";
-  version = "3.32.1";
+  version = "3.34.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-settings-daemon/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "02d0s0g2mmqfib44r3sf0499r08p61s8l2ndsjssbam1bi7x2dks";
+    sha256 = "0dvkq6pwrvqsm30wa965q0wf15v7nmnv6xfb9sli2sc62yc9gr3w";
   };
 
   patches = [
@@ -71,6 +73,7 @@ stdenv.mkDerivation rec {
     gtk3
     glib
     gsettings-desktop-schemas
+    modemmanager
     networkmanager
     libnotify
     libgnomekbd # for org.gnome.libgnomekbd.keyboard schema
@@ -89,6 +92,7 @@ stdenv.mkDerivation rec {
     systemd
     libgudev
     libwacom
+    gcr
   ];
 
   mesonFlags = [
diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/fix-paths.patch b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/fix-paths.patch
index 272656fae78..2229302cab7 100644
--- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/fix-paths.patch
+++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/fix-paths.patch
@@ -13,14 +13,3 @@
  
  typedef struct _TzDB TzDB;
  typedef struct _TzLocation TzLocation;
---- a/plugins/mouse/gsd-mouse-manager.c
-+++ b/plugins/mouse/gsd-mouse-manager.c
-@@ -118,7 +118,7 @@ set_mousetweaks_daemon (GsdMouseManager *manager,
-         gboolean run_daemon = dwell_click_enabled || secondary_click_enabled;
-
-         if (run_daemon || manager->priv->mousetweaks_daemon_running)
--                comm = g_strdup_printf ("mousetweaks %s",
-+                comm = g_strdup_printf ("@mousetweaks@/bin/mousetweaks %s",
-                                         run_daemon ? "" : "-s");
-         else
-                 return;
-- 
GitLab


From 4845bd046be6a8886513d94171e79546ce93797d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:45:15 +0000
Subject: [PATCH 1572/2254] =?UTF-8?q?gnome3.gnome-shell-extensions:=203.32?=
 =?UTF-8?q?.1=20=E2=86=92=203.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/gnome-shell-extensions/default.nix      | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
index 3d37040828c..dd88d4feea1 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
@@ -1,19 +1,19 @@
-{ stdenv, fetchurl, meson, ninja, gettext, pkgconfig, spidermonkey_52, glib
+{ stdenv, fetchurl, meson, ninja, gettext, pkgconfig, spidermonkey_60, glib
 , gnome3, gnome-menus, substituteAll }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-extensions";
-  version = "3.32.1";
+  version = "3.34.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-shell-extensions/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "07libf6z24n42hpdsq163w0j8xyrav0lxqrwxrvq5kbz8zxv5ch2";
+    sha256 = "1ayb48l2p3lji7b226027293jfclgcjmdb5dd6xfn67rhxm8zgzm";
   };
 
   passthru = {
     updateScript = gnome3.updateScript {
-      packageName = "gnome-shell-extensions";
-      attrPath = "gnome3.gnome-shell-extensions";
+      packageName = pname;
+      attrPath = "gnome3.${pname}";
     };
   };
 
@@ -25,9 +25,9 @@ stdenv.mkDerivation rec {
   ];
 
   doCheck = true;
-  # 52 is required for tests
-  # https://gitlab.gnome.org/GNOME/gnome-shell-extensions/blob/3.30.1/meson.build#L25
-  checkInputs = [ spidermonkey_52 ];
+  # 60 is required for tests
+  # https://gitlab.gnome.org/GNOME/gnome-shell-extensions/blob/3.34.0/meson.build#L23
+  checkInputs = [ spidermonkey_60 ];
 
   nativeBuildInputs = [ meson ninja pkgconfig gettext glib ];
 
-- 
GitLab


From ca97caee7e5bf5457db976d9d07d28c959e0f544 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 9 Sep 2019 21:46:15 +0200
Subject: [PATCH 1573/2254] gnome3.gnome-shell: 3.32.2 -> 3.34.0

---
 pkgs/desktops/gnome-3/core/gnome-shell/default.nix     | 6 ++++--
 pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch | 5 ++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
index a1d8f2c599a..92578ef2798 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
@@ -14,11 +14,11 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "gnome-shell";
-  version = "3.32.2";
+  version = "3.34.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-shell/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0anlkdnqsp5fqvmg95rqjpp1ifcx5xzsvwcrdsvb1cqzbh6inmp5";
+    sha256 = "0vdx4mfj46cpvzn6mhxc1ivg138437f5m4n3k4vb54pk45w4s00x";
   };
 
   LANG = "en_US.UTF-8";
@@ -49,6 +49,8 @@ in stdenv.mkDerivation rec {
     caribou
   ];
 
+  mesonFlags = [ "-Dextensions_tool=false" ];
+
   patches = [
     (fetchpatch {
       name = "0001-build-Add-missing-dependency-to-run-js-test.patch";
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch b/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch
index 3207af11088..9cb9655b72e 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch
+++ b/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch
@@ -11,10 +11,9 @@
                                            null);
 --- a/js/ui/status/keyboard.js
 +++ b/js/ui/status/keyboard.js
-@@ -1059,7 +1059,7 @@ class InputSourceIndicator extends PanelMenu.Button {
-         let description = xkbLayout;
+@@ -1062,6 +1062,6 @@ class InputSourceIndicator extends PanelMenu.Button {
          if (xkbVariant.length > 0)
-             description = description + '\t' + xkbVariant;
+             description = `${description}\t${xkbVariant}`;
  
 -        Util.spawn(['gkbd-keyboard-display', '-l', description]);
 +        Util.spawn(['@libgnomekbd@/bin/gkbd-keyboard-display', '-l', description]);
-- 
GitLab


From 860f1042354c5ab6ae5055ebf27db2c653c5ed44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 9 Sep 2019 18:06:34 +0000
Subject: [PATCH 1574/2254] =?UTF-8?q?gnome3.gnome-software:=203.32.4=20?=
 =?UTF-8?q?=E2=86=92=203.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix
index 12081bbae5b..8c5e0fad41e 100644
--- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix
@@ -11,11 +11,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "gnome-software";
-  version = "3.32.4";
+  version = "3.34.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-software/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0g30wdrpypj23npvx85wqh1i4a8bbg00ainz7wmsvry21hcny4d4";
+    sha256 = "1mr03s6f38pbgvgpb1p91csqms369f1lzqyk5nfam5jqyl273nzk";
   };
 
   patches = [
-- 
GitLab


From 9917cd06944bdc24ecf6dbc50f6b167ff05a0791 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:45:18 +0000
Subject: [PATCH 1575/2254] =?UTF-8?q?gnome3.gnome-sudoku:=203.32.0=20?=
 =?UTF-8?q?=E2=86=92=203.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix
index a555ee31cf3..de00368df2e 100644
--- a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-sudoku";
-  version = "3.32.0";
+  version = "3.34.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-sudoku/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1wwdjflw1lbx3cv6gvqcgp5jnjkrq37ld6mjbjj03g3vr90qaf0l";
+    sha256 = "1bwy9w4jkdlsc6iz7lwy0nm4vqa11kgcw24qf4w2g0qyldcvhc3y";
   };
 
   nativeBuildInputs = [ meson ninja vala pkgconfig gobject-introspection gettext itstool libxml2 python3 desktop-file-utils wrapGAppsHook ];
-- 
GitLab


From 97aa29806d2275b298e191d8986b485067a82bf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:45:21 +0000
Subject: [PATCH 1576/2254] =?UTF-8?q?gnome3.gnome-taquin:=203.32.0=20?=
 =?UTF-8?q?=E2=86=92=203.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
index b6c60362265..889991d210f 100644
--- a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, librsvg, libcanberra-gtk3, gettext, itstool, libxml2
+, librsvg, gsound, gettext, itstool, libxml2
 , meson, ninja, vala, python3, desktop-file-utils
 }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-taquin";
-  version = "3.32.0";
+  version = "3.34.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-taquin/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1kyxh68gg7clxg22ls4sliisxb2sydwccbxqgfvxjg2fklr6r1lm";
+    sha256 = "0jhfryqim98m9i84k18r4xb83q2g2198mn4igmr05sr974f0j578";
   };
 
   passthru = {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     gettext itstool libxml2 vala desktop-file-utils
   ];
   buildInputs = [
-    gtk3 librsvg libcanberra-gtk3
+    gtk3 librsvg gsound
     gnome3.adwaita-icon-theme
   ];
 
-- 
GitLab


From 7b50a0e9d0bf50d364b813f37d439534a5bf503d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:45:21 +0000
Subject: [PATCH 1577/2254] =?UTF-8?q?gnome3.gnome-terminal:=203.32.2=20?=
 =?UTF-8?q?=E2=86=92=203.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* add pcre2

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

diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
index 75d4b117e77..1ca58c8f777 100644
--- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, pkgconfig, libxml2, gnome3, dconf, nautilus
 , gtk3, gsettings-desktop-schemas, vte, intltool, which, libuuid, vala
-, desktop-file-utils, itstool, wrapGAppsHook, hicolor-icon-theme }:
+, desktop-file-utils, itstool, wrapGAppsHook, hicolor-icon-theme, glib, pcre2 }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-terminal";
-  version = "3.32.2";
+  version = "3.34.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-terminal/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0shhpnagasyp1kxgjczfrivcxbgrrl3y8lzvp1z101m67h4jp6km";
+    sha256 = "0wcavripfsr691qkcjb71vccffz0wx2q5qh4clwnk1hi8j1hz9l5";
   };
 
   buildInputs = [
@@ -19,10 +19,12 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     pkgconfig intltool itstool which libxml2
-    vala desktop-file-utils wrapGAppsHook
+    vala desktop-file-utils wrapGAppsHook pcre2
     hicolor-icon-theme # for setup-hook
   ];
 
+  NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
+
   # Silly ./configure, it looks for dbus file from gnome-shell in the
   # installation tree of the package it is configuring.
   postPatch = ''
-- 
GitLab


From 4353f36298045275d23f31b6b5ea836af9f437f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:45:21 +0000
Subject: [PATCH 1578/2254] =?UTF-8?q?gnome3.gnome-tetravex:=203.32.0=20?=
 =?UTF-8?q?=E2=86=92=203.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix
index 29141530211..774f066d06b 100644
--- a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-tetravex";
-  version = "3.32.0";
+  version = "3.34.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-tetravex/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "18drxp43j2jnywxl6qa7mn1iv33jxr0dpc1l9xza3lnrb0jp0kjl";
+    sha256 = "0wyhiiyi9zhvj250nwsc9h38dnhw3z8aml3yk6b7i1wfg7f54nwa";
   };
 
   passthru = {
-- 
GitLab


From 23228d7ac3b1ba2cc18cc3d52bdd1ac4a61e872a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:45:25 +0000
Subject: [PATCH 1579/2254] =?UTF-8?q?gnome3.gnome-tweaks:=203.32.0=20?=
 =?UTF-8?q?=E2=86=92=203.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix
index 7a54114d2db..f40911577c1 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix
@@ -1,17 +1,17 @@
 { stdenv, meson, ninja, gettext, fetchurl
 , pkgconfig, gtk3, glib, libsoup, gsettings-desktop-schemas
-, itstool, libxml2, python3Packages
+, itstool, libxml2, python3Packages, libhandy
 , gnome3, gdk-pixbuf, libnotify, gobject-introspection, wrapGAppsHook }:
 
 let
   pname = "gnome-tweaks";
-  version = "3.32.0";
+  version = "3.34.0";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "037r35cw34ifcs676fq9n2v4mh1nkqx0qk474bznf18mr6r62h55";
+    sha256 = "0l2j42ba7v866iknygamnkiq7igh0fjvq92r93cslvvfnkx2ccq0";
   };
 
   nativeBuildInputs = [
@@ -23,7 +23,7 @@ in stdenv.mkDerivation rec {
     libnotify gnome3.gnome-shell python3Packages.pygobject3
     libsoup gnome3.gnome-settings-daemon gnome3.nautilus
     gnome3.mutter gnome3.gnome-desktop gobject-introspection
-    gnome3.nautilus
+    gnome3.nautilus libhandy
     # Makes it possible to select user themes through the `user-theme` extension
     gnome3.gnome-shell-extensions
   ];
-- 
GitLab


From 08cbcdb6e93fed78f45a716fed565d2db71a9891 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:45:28 +0000
Subject: [PATCH 1580/2254] =?UTF-8?q?gnome3.gnome-user-docs:=203.32.3=20?=
 =?UTF-8?q?=E2=86=92=203.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
index 7915e71a73c..cb0c1494b94 100644
--- a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-user-docs";
-  version = "3.32.3";
+  version = "3.34.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-user-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0dvsl0ldg8rf7yq0r4dv1pn41s7gjgcqp7agkbflkbmhrl6vbhig";
+    sha256 = "1v94mz8zwzx67db2avbi9p2klw36cz45qr6fbskpvygz2pzhg6cg";
   };
 
   passthru = {
-- 
GitLab


From 50babe1202f2fbcc1e732273fa86745d9918561f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:45:26 +0000
Subject: [PATCH 1581/2254] =?UTF-8?q?gnome3.gnome-user-share:=203.32.0.1?=
 =?UTF-8?q?=20=E2=86=92=203.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gnome-3/core/gnome-user-share/default.nix | 36 +++++++++++++++----
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix
index 2a425acb067..6207dd42a61 100644
--- a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix
@@ -1,6 +1,9 @@
 { stdenv
 , gettext
+, meson
+, ninja
 , fetchurl
+, fetchpatch
 , apacheHttpd
 , nautilus
 , pkgconfig
@@ -14,36 +17,55 @@
 , mod_dnssd
 , gnome3
 , libcanberra-gtk3
+, python3
 }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-user-share";
-  version = "3.32.0.1";
+  version = "3.34.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "16w6n0cjyzp8vln3zspvab8jhjprpvs88xc9x7bvigg0wry74945";
+    sha256 = "04r9ck9v4i0d31grbli1d4slw2d6dcsfkpaybkwbzi7wnj72l30x";
   };
 
+  patches = [
+    # fix gio-unix-2.0 lookup
+    (fetchpatch {
+      url = https://gitlab.gnome.org/GNOME/gnome-user-share/commit/8772980d4732c15505b15dccff2ca3c97e96d49d.patch;
+      sha256 = "03clzhrx72pq1cbmg2y24hvw4i1xsvrg9ip113fi5bc3w4gcji7p";
+    })
+  ];
+
+  postPatch = ''
+    chmod +x meson_post_install.py
+    patchShebangs meson_post_install.py
+  '';
+
   preConfigure = ''
     sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' \
       -e 's,''${HTTP_MODULES_PATH},${apacheHttpd}/modules,' \
       -i data/dav_user_2.4.conf
   '';
 
-  configureFlags = [
-    "--with-httpd=${apacheHttpd.out}/bin/httpd"
-    "--with-modules-path=${apacheHttpd.dev}/modules"
-    "--with-systemduserunitdir=${placeholder "out"}/etc/systemd/user"
-    "--with-nautilusdir=${placeholder "out"}/lib/nautilus/extensions-3.0"
+  mesonFlags = [
+    "-Dhttpd=${apacheHttpd.out}/bin/httpd"
+    "-Dmodules_path=${apacheHttpd.dev}/modules"
+    "-Dsystemduserunitdir=${placeholder "out"}/etc/systemd/user"
+    # In 3.34.0 it defaults to false but it is silently ignored and always installed.
+    # Let’s add it anyway in case they decide to make build respect the option in the future.
+    "-Dnautilus_extension=true"
   ];
 
   nativeBuildInputs = [
     pkgconfig
+    meson
+    ninja
     gettext
     itstool
     libxml2
     wrapGAppsHook
+    python3
   ];
 
   buildInputs = [
-- 
GitLab


From d5f1b96844d532fb8caaa0ac63a70c87e8a5e529 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:45:29 +0000
Subject: [PATCH 1582/2254] =?UTF-8?q?gnome3.gnome-weather:=203.32.2=20?=
 =?UTF-8?q?=E2=86=92=203.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix
index 1e5a641f08f..c71baa146d1 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-weather";
-  version = "3.32.2";
+  version = "3.34.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-weather/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0jfxdfbjkrk3x48w6nxgbmazd6jw1fh4mfw12hlly4rs0cjw698s";
+    sha256 = "1g63xzs17i36if923b36k9fwbk0nqa5vz6zh1k6q2axrzhhpx1i4";
   };
 
   nativeBuildInputs = [ pkgconfig meson ninja wrapGAppsHook python3 ];
-- 
GitLab


From 40f2a2c2e20652a85554e1199a0f60ed6bda2710 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:45:34 +0000
Subject: [PATCH 1583/2254] =?UTF-8?q?gnome3.hitori:=203.32.0=20=E2=86=92?=
 =?UTF-8?q?=203.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/games/hitori/default.nix b/pkgs/desktops/gnome-3/games/hitori/default.nix
index 8e53a937a5e..cf83527432f 100644
--- a/pkgs/desktops/gnome-3/games/hitori/default.nix
+++ b/pkgs/desktops/gnome-3/games/hitori/default.nix
@@ -18,11 +18,11 @@
 
 stdenv.mkDerivation rec {
   pname = "hitori";
-  version = "3.32.0";
+  version = "3.34.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/hitori/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "15s20db2fq4cy031sw20pmf53hxiak44fgyjy5njqnp2h2sg3806";
+    sha256 = "1612hq6d2mnggppy949dkb8lz9886n0rlg68z7qmjjizz1l41lb5";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From 02bef3c21b6b8aabbb6bfa62225f29eea1156f48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:45:35 +0000
Subject: [PATCH 1584/2254] =?UTF-8?q?gnome3.iagno:=203.32.0=20=E2=86=92=20?=
 =?UTF-8?q?3.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/games/iagno/default.nix b/pkgs/desktops/gnome-3/games/iagno/default.nix
index 114551ed4ee..bee939fd129 100644
--- a/pkgs/desktops/gnome-3/games/iagno/default.nix
+++ b/pkgs/desktops/gnome-3/games/iagno/default.nix
@@ -1,22 +1,22 @@
 { stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk-pixbuf, librsvg, wrapGAppsHook
-, itstool, libcanberra-gtk3, libxml2
+, itstool, gsound, libxml2
 , meson, ninja, python3, vala, desktop-file-utils
 }:
 
 stdenv.mkDerivation rec {
   pname = "iagno";
-  version = "3.32.0";
+  version = "3.34.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/iagno/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1rcqb4gpam16xw87n4q2akkrg94ksrn16ry21pr6bsd7qs7hw17d";
+    sha256 = "15zan1h63hm9z0bf3y5h7rqd935jjw672qh88waqzwp6mlv1y321";
   };
 
   nativeBuildInputs = [
     meson ninja python3 vala desktop-file-utils
     pkgconfig wrapGAppsHook itstool libxml2
   ];
-  buildInputs = [ gtk3 gnome3.adwaita-icon-theme gdk-pixbuf librsvg libcanberra-gtk3 ];
+  buildInputs = [ gtk3 gnome3.adwaita-icon-theme gdk-pixbuf librsvg gsound ];
 
   enableParallelBuilding = true;
 
-- 
GitLab


From 0df8cd88879102f5881ccae4996205f39111a27d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Wed, 4 Sep 2019 11:27:48 +0000
Subject: [PATCH 1585/2254] =?UTF-8?q?gnome3.libgnome-games-support:=201.4.?=
 =?UTF-8?q?3=20=E2=86=92=201.4.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gnome-3/misc/libgnome-games-support/default.nix       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix b/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix
index 3776a9adbf2..d591fb6033d 100644
--- a/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix
+++ b/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, fetchurl, pkgconfig, glib, gtk3, libgee, intltool, gnome3
+{ stdenv, fetchurl, pkgconfig, glib, gtk3, libgee, gettext, gnome3
 , libintl }:
 
 let
   pname = "libgnome-games-support";
-  version = "1.4.3";
+  version = "1.4.4";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0g6a1vvhrbs0pfnzjfg3lgqvppwkydn6j3dn713zhrjhma9pljkh";
+    sha256 = "1zkbmnrn161p74qg6jhsn9f66yjjzxfm13pl1klv9av8k1bax9pq";
   };
 
-  nativeBuildInputs = [ pkgconfig intltool ];
+  nativeBuildInputs = [ pkgconfig gettext ];
   buildInputs = [ libintl ];
   propagatedBuildInputs = [
     # Required by libgnome-games-support-1.pc
-- 
GitLab


From 2803a9c708b252f15b4676de1038b37488a9a97d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Wed, 4 Sep 2019 11:28:00 +0000
Subject: [PATCH 1586/2254] =?UTF-8?q?gnome3.lightsoff:=203.32.0=20?=
 =?UTF-8?q?=E2=86=92=203.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/games/lightsoff/default.nix b/pkgs/desktops/gnome-3/games/lightsoff/default.nix
index 9c582f037a2..0a236d0425a 100644
--- a/pkgs/desktops/gnome-3/games/lightsoff/default.nix
+++ b/pkgs/desktops/gnome-3/games/lightsoff/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "lightsoff";
-  version = "3.32.0";
+  version = "3.34.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/lightsoff/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0vc3ibjs9ynnm0gxlhhin7jpnsx22vnn4ygaybxwmv9w2q49cs9f";
+    sha256 = "1yyq0962fv16rab3alq5saf4gpii9xvcfy5vbq85hhhgjpbqrfns";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From 894df0c2bb27f0a049dd53b7f9bbfd1597a8f580 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Fri, 6 Sep 2019 13:36:40 +0000
Subject: [PATCH 1587/2254] =?UTF-8?q?gnome3.metacity:=203.32.0=20=E2=86=92?=
 =?UTF-8?q?=203.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/misc/metacity/default.nix b/pkgs/desktops/gnome-3/misc/metacity/default.nix
index 8b1d2b05df1..0c32b4448d7 100644
--- a/pkgs/desktops/gnome-3/misc/metacity/default.nix
+++ b/pkgs/desktops/gnome-3/misc/metacity/default.nix
@@ -16,13 +16,13 @@
 
 let
   pname = "metacity";
-  version = "3.32.0";
+  version = "3.34.0";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "177dmb1smizfgkddk49n2kr90graj9r6xw5hg3aq0y2qqg6v4rcg";
+    sha256 = "0ih95lmw56z6pha7p035ahqpvpw9sxfam3cxm7fambib5qrky192";
   };
 
   patches = [
-- 
GitLab


From f01d9db50424fcdecdc031f558942302c2295e34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 9 Sep 2019 21:47:10 +0200
Subject: [PATCH 1588/2254] gnome3.mutter: 3.32.2 -> 3.34.0

---
 pkgs/desktops/gnome-3/core/mutter/default.nix | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix
index eab0b131ea9..8022a0b110c 100644
--- a/pkgs/desktops/gnome-3/core/mutter/default.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/default.nix
@@ -7,22 +7,25 @@
 , xorgserver
 , python3
 , wrapGAppsHook
+, sysprof
+, desktop-file-utils
 }:
 
 stdenv.mkDerivation rec {
   pname = "mutter";
-  version = "3.32.2";
+  version = "3.34.0";
 
   outputs = [ "out" "dev" "man" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/mutter/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1h577i2ap7dpfy1jg101jvc6nzccc0csgvd55ahydlr8f94frcva";
+    sha256 = "0qdpw0fya8kr5737jf635455qb714wvhszkk82rlw48fqj8nk8ss";
   };
 
   mesonFlags = [
     "-Dxwayland-path=${xwayland}/bin/Xwayland"
     "-Dinstalled_tests=false" # TODO: enable these
+    "-Dprofiler=false"
   ];
 
   propagatedBuildInputs = [
@@ -39,6 +42,7 @@ stdenv.mkDerivation rec {
     # for cvt command
     xorgserver
     wrapGAppsHook
+    desktop-file-utils
   ];
 
   buildInputs = [
@@ -47,21 +51,19 @@ stdenv.mkDerivation rec {
     geocode-glib libinput libgudev libwacom
     libcanberra-gtk3 zenity xkeyboard_config libxkbfile
     libxkbcommon pipewire xwayland
-    gnome-settings-daemon
+    gnome-settings-daemon # sysprof
   ];
 
   patches = [
+    (fetchpatch {
+      name = "ensure-emit-x11-display-opened.patch";
+      url = "https://gitlab.gnome.org/GNOME/mutter/commit/850ef518795dcc20d3b9a4f661f70ff8d0ddacb2.patch";
+      sha256 = "0cxdbrbcc8kfkvw7ryxjm2v1vk15jki7bawn128385r5hasabhxf";
+    })
     (substituteAll {
       src = ./fix-paths.patch;
       inherit zenity;
     })
-    # Fix a segmentation fault in dri_flush_front_buffer() upon
-    # suspend/resume. This change should be removed when Mutter
-    # is updated to 3.34.
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/mutter/commit/8307c0f7ab60760de53f764e6636893733543be8.diff";
-      sha256 = "1hzfva71xdqvvnx5smjsrjlgyrmc7dj94mpylkak0gwda5si0h2n";
-    })
   ];
 
   postPatch = ''
-- 
GitLab


From f011fc9c789aa70e1a8290e89bac0789cb15f169 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:45:54 +0000
Subject: [PATCH 1589/2254] =?UTF-8?q?gnome3.nautilus:=203.32.3=20=E2=86=92?=
 =?UTF-8?q?=203.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* add gobject-introspection for gir

Co-authored-by: worldofpeace <worldofpeace@protonmail.ch>
---
 .../core/nautilus/bubblewrap-paths.patch      | 15 ----
 .../gnome-3/core/nautilus/default.nix         | 83 ++++++++++++++-----
 2 files changed, 60 insertions(+), 38 deletions(-)
 delete mode 100644 pkgs/desktops/gnome-3/core/nautilus/bubblewrap-paths.patch

diff --git a/pkgs/desktops/gnome-3/core/nautilus/bubblewrap-paths.patch b/pkgs/desktops/gnome-3/core/nautilus/bubblewrap-paths.patch
deleted file mode 100644
index 37358c8432c..00000000000
--- a/pkgs/desktops/gnome-3/core/nautilus/bubblewrap-paths.patch
+++ /dev/null
@@ -1,15 +0,0 @@
----   a/src/gnome-desktop/gnome-desktop-thumbnail-script.c
-+++   a/src/gnome-desktop/gnome-desktop-thumbnail-script.c
-@@ -536,9 +536,9 @@ add_bwrap (GPtrArray   *array,
-   g_return_val_if_fail (script->s_infile != NULL, FALSE);
- 
-   add_args (array,
--	    "bwrap",
--	    "--ro-bind", "/usr", "/usr",
--	    "--ro-bind", "/etc/ld.so.cache", "/etc/ld.so.cache",
-+	    "@bubblewrap_bin@",
-+	    "--ro-bind", "@storeDir@", "@storeDir@",
-+	    "--ro-bind", "/run/current-system", "/run/current-system",
- 	    NULL);
- 
-   /* These directories might be symlinks into /usr/... */
diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix
index 14551fb7d0c..b68415b32a2 100644
--- a/pkgs/desktops/gnome-3/core/nautilus/default.nix
+++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix
@@ -1,33 +1,77 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, libxml2
-, desktop-file-utils, python3, wrapGAppsHook , gtk3, gnome3, gnome-autoar
-, glib-networking, shared-mime-info, libnotify, libexif, libseccomp , exempi
-, librsvg, tracker, tracker-miners, gexiv2, libselinux, gdk-pixbuf
-, substituteAll, bubblewrap, gst_all_1, gsettings-desktop-schemas
+{ stdenv
+, fetchurl
+, meson
+, ninja
+, pkgconfig
+, gettext
+, libxml2
+, desktop-file-utils
+, python3
+, wrapGAppsHook
+, gtk3
+, gnome3
+, gnome-autoar
+, glib-networking
+, shared-mime-info
+, libnotify
+, libexif
+, libseccomp
+, exempi
+, librsvg
+, tracker
+, tracker-miners
+, gexiv2
+, libselinux
+, gdk-pixbuf
+, substituteAll
+, gnome-desktop
+, gst_all_1
+, gsettings-desktop-schemas
+, gobject-introspection
 }:
 
-let
+stdenv.mkDerivation rec {
   pname = "nautilus";
-  version = "3.32.3";
-in stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
+  version = "3.34.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1x9crzbj6rrrf8w5dkcx0c14j40byr4ijpzkwd5dcrbfvvdy1r01";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    sha256 = "1ncs5hmaxjb9p2yzj81m7dz2x27vzmvppir3058dk236jzn98r36";
   };
 
   nativeBuildInputs = [
-    meson ninja pkgconfig libxml2 gettext python3 wrapGAppsHook
     desktop-file-utils
+    gettext
+    gobject-introspection
+    libxml2
+    meson
+    ninja
+    pkgconfig
+    python3
+    wrapGAppsHook
   ];
 
   buildInputs = [
-    glib-networking shared-mime-info libexif gtk3 exempi libnotify libselinux
-    tracker tracker-miners gexiv2 libseccomp bubblewrap gst_all_1.gst-plugins-base
-    gnome3.adwaita-icon-theme gsettings-desktop-schemas
+    exempi
+    gexiv2
+    glib-networking
+    gnome-desktop
+    gnome3.adwaita-icon-theme
+    gsettings-desktop-schemas
+    gst_all_1.gst-plugins-base
+    gtk3
+    libexif
+    libnotify
+    libseccomp
+    libselinux
+    shared-mime-info
+    tracker
+    tracker-miners
   ];
 
-  propagatedBuildInputs = [ gnome-autoar ];
+  propagatedBuildInputs = [
+    gnome-autoar
+  ];
 
   preFixup = ''
     gappsWrapperArgs+=(
@@ -44,13 +88,6 @@ in stdenv.mkDerivation rec {
 
   patches = [
     ./extension_dir.patch
-    # 3.30 now generates it's own thummbnails,
-    # and no longer depends on `gnome-desktop`
-    (substituteAll {
-      src = ./bubblewrap-paths.patch;
-      bubblewrap_bin = "${bubblewrap}/bin/bwrap";
-      inherit (builtins) storeDir;
-    })
   ];
 
   passthru = {
-- 
GitLab


From 76f634b5cdea391ff5faf1366aff322d437b360f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:45:54 +0000
Subject: [PATCH 1590/2254] =?UTF-8?q?gnome3.polari:=203.32.2=20=E2=86=92?=
 =?UTF-8?q?=203.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/apps/polari/default.nix b/pkgs/desktops/gnome-3/apps/polari/default.nix
index 51fea63b714..0202821f7d5 100644
--- a/pkgs/desktops/gnome-3/apps/polari/default.nix
+++ b/pkgs/desktops/gnome-3/apps/polari/default.nix
@@ -5,13 +5,13 @@
 
 let
   pname = "polari";
-  version = "3.32.2";
+  version = "3.34.0";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0h0w9j3y067l911gpj446b3a2w1i2vzr1w2a7cz7i5rhn6qkf2sp";
+    sha256 = "09g2ylx2fwm55h28w0c03fxkdvlwmr2yc033m93c4acz1h30rjns";
   };
 
   propagatedUserEnvPkgs = [ telepathy-idle telepathy-logger ];
-- 
GitLab


From 324c7055d6c64d84ad347c7aec63f9867620568a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:45:55 +0000
Subject: [PATCH 1591/2254] =?UTF-8?q?gnome3.quadrapassel:=203.32.0=20?=
 =?UTF-8?q?=E2=86=92=203.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gnome-3/games/quadrapassel/default.nix       | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix
index 78ed0d9fa68..0f89d8c3a74 100644
--- a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix
+++ b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix
@@ -1,18 +1,16 @@
 { stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk-pixbuf
-, librsvg, libcanberra-gtk3, libmanette
+, librsvg, gsound, libmanette
 , gettext, itstool, libxml2, clutter, clutter-gtk, wrapGAppsHook
 , meson, ninja, python3, vala, desktop-file-utils
 }:
 
-let
+stdenv.mkDerivation rec {
   pname = "quadrapassel";
-in stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
-  version = "3.32.0";
+  version = "3.34.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/quadrapassel/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1zhi1957knz9dm98drn2dh95mr33sdch590yddh1f8r6bzsfjvpy";
+    url = "mirror://gnome/sources/quadrapassel/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    sha256 = "1na5j1mf09rdj0kp7fwfdnc1p7mfclpv58is2cs2ldfik4y1p2if";
   };
 
   nativeBuildInputs = [
@@ -22,11 +20,9 @@ in stdenv.mkDerivation rec {
   ];
   buildInputs = [
     gtk3 gdk-pixbuf librsvg libmanette
-    libcanberra-gtk3 clutter libxml2 clutter-gtk
+    gsound clutter libxml2 clutter-gtk
   ];
 
-  enableParallelBuilding = true;
-
   passthru = {
     updateScript = gnome3.updateScript {
       packageName = pname;
-- 
GitLab


From 202ce61c81e344c4f527cbf9e769733209fbf2e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:45:59 +0000
Subject: [PATCH 1592/2254] =?UTF-8?q?gnome3.sushi:=203.32.1=20=E2=86=92=20?=
 =?UTF-8?q?3.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/core/sushi/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/sushi/default.nix b/pkgs/desktops/gnome-3/core/sushi/default.nix
index 86675f21f06..fc4034acf66 100644
--- a/pkgs/desktops/gnome-3/core/sushi/default.nix
+++ b/pkgs/desktops/gnome-3/core/sushi/default.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchurl, pkgconfig, meson, gettext, gobject-introspection, glib
-, clutter-gtk, clutter-gst, gnome3, gtksourceview, gjs
+, clutter-gtk, clutter-gst, gnome3, gtksourceview4, gjs
 , webkitgtk, libmusicbrainz5, icu, wrapGAppsHook, gst_all_1
-, gdk-pixbuf, librsvg, gtk3, harfbuzz, ninja }:
+, gdk-pixbuf, librsvg, gtk3, harfbuzz, ninja, epoxy }:
 
 stdenv.mkDerivation rec {
   pname = "sushi";
-  version = "3.32.1";
+  version = "3.34.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/sushi/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "02idvqjk76lii9xyg3b1yz4rw721709bdm5j8ikjym6amcghl0aj";
+    sha256 = "1zcr8wi5bgvvpb5ha1v96aiaz4vqqrsn6cvvalwzah6am85k78m8";
   };
 
   nativeBuildInputs = [
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
   ];
   buildInputs = [
     glib gtk3 gnome3.evince icu harfbuzz
-    clutter-gtk clutter-gst gjs gtksourceview gdk-pixbuf
-    librsvg libmusicbrainz5 webkitgtk
+    clutter-gtk clutter-gst gjs gtksourceview4 gdk-pixbuf
+    librsvg libmusicbrainz5 webkitgtk epoxy
     gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
   ];
 
-- 
GitLab


From fa8d17ba70e725f422d8d917a14d7079e0d5cd69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Wed, 4 Sep 2019 11:28:16 +0000
Subject: [PATCH 1593/2254] =?UTF-8?q?gnome3.swell-foop:=203.32.0=20?=
 =?UTF-8?q?=E2=86=92=203.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/games/swell-foop/default.nix b/pkgs/desktops/gnome-3/games/swell-foop/default.nix
index a944e0c568a..6de5eaa96c3 100644
--- a/pkgs/desktops/gnome-3/games/swell-foop/default.nix
+++ b/pkgs/desktops/gnome-3/games/swell-foop/default.nix
@@ -3,13 +3,13 @@
 
 let
   pname = "swell-foop";
-  version = "3.32.0";
+  version = "3.34.0";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0jpci3c1wyzbvsq86j30rcl166skhi2wf12001amfgh0dmmwipci";
+    sha256 = "1vbclb1jcn2s9rb7whk02v6hfr6fnwx2ppa55bsa7595f3ki79v5";
   };
 
   passthru = {
-- 
GitLab


From 2f2f17828ceb48d6e27a8cba328c6e53b4785e91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:46:01 +0000
Subject: [PATCH 1594/2254] =?UTF-8?q?gnome3.totem:=203.32.1=20=E2=86=92=20?=
 =?UTF-8?q?3.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

vala and nautilus support was removed in 3.32.
---
 pkgs/desktops/gnome-3/core/totem/default.nix | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix
index a5388f2eae1..379f154abec 100644
--- a/pkgs/desktops/gnome-3/core/totem/default.nix
+++ b/pkgs/desktops/gnome-3/core/totem/default.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   pname = "totem";
-  version = "3.32.1";
+  version = "3.34.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/totem/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0yra8apc7smpwf7d1k8crhrm8d4wix24ds6i9yxbch1v11jnhr3v";
+    sha256 = "00fpm3609zckiqjrlg3r64vz2mqych44kdkljxbidb847vg6xm84";
   };
 
   doCheck = true;
@@ -31,14 +31,6 @@ stdenv.mkDerivation rec {
     patchShebangs .
   '';
 
-  mesonFlags = [
-    "-Dwith-nautilusdir=${placeholder "out"}/lib/nautilus/extensions-3.0"
-    # https://bugs.launchpad.net/ubuntu/+source/totem/+bug/1712021
-    # https://bugzilla.gnome.org/show_bug.cgi?id=784236
-    # https://github.com/mesonbuild/meson/issues/1994
-    "-Denable-vala=no"
-  ];
-
   checkInputs = [ xvfb_run ];
 
   checkPhase = ''
-- 
GitLab


From 4a1a728dd5b1c18ca46ad5a566f4c19e13635358 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:46:05 +0000
Subject: [PATCH 1595/2254] =?UTF-8?q?gnome3.tracker-miners:=202.2.2=20?=
 =?UTF-8?q?=E2=86=92=202.3.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/libraries/tracker-miners/default.nix    | 4 ++--
 .../development/libraries/tracker-miners/fix-paths.patch | 9 ---------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/tracker-miners/default.nix b/pkgs/development/libraries/tracker-miners/default.nix
index 9f31e70ad53..99374b572c6 100644
--- a/pkgs/development/libraries/tracker-miners/default.nix
+++ b/pkgs/development/libraries/tracker-miners/default.nix
@@ -45,11 +45,11 @@
 
 stdenv.mkDerivation rec {
   pname = "tracker-miners";
-  version = "2.2.2";
+  version = "2.3.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0kk5xaajamb8jlm6cfdbc2m3axzr6bnph84m7697xmb0pkg8hdiw";
+    sha256 = "1ky7hd0vms1z40a0y9wq9pg3l7gxh4p6a0ngmnjqh8p23qfxdrxd";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/libraries/tracker-miners/fix-paths.patch b/pkgs/development/libraries/tracker-miners/fix-paths.patch
index 724c51cb56f..ce44416055c 100644
--- a/pkgs/development/libraries/tracker-miners/fix-paths.patch
+++ b/pkgs/development/libraries/tracker-miners/fix-paths.patch
@@ -9,12 +9,3 @@
  		                         DEFAULT_RULE, NULL);
  
  		if (!g_file_test (path, G_FILE_TEST_IS_REGULAR)) {
-@@ -388,7 +388,7 @@
- 	if (!priv->ontology_location) {
- 		gchar *ontology_path;
- 
--		ontology_path = g_build_filename (SHAREDIR, "tracker", "ontologies",
-+		ontology_path = g_build_filename ("@tracker@", "share", "tracker", "ontologies",
- 		                                  priv->ontology_name, NULL);
- 
- 		if (!g_file_test (ontology_path, G_FILE_TEST_IS_DIR)) {
-- 
GitLab


From 93ecc2a52f3a015453ae48459ff0f864f43ba449 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:46:04 +0000
Subject: [PATCH 1596/2254] =?UTF-8?q?gnome3.tracker:=202.2.2=20=E2=86=92?=
 =?UTF-8?q?=202.3.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../development/libraries/tracker/default.nix | 23 ++++++++-----------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix
index db4f620a740..4add8046de1 100644
--- a/pkgs/development/libraries/tracker/default.nix
+++ b/pkgs/development/libraries/tracker/default.nix
@@ -1,37 +1,32 @@
-{ stdenv, fetchurl, intltool, meson, ninja, pkgconfig, gobject-introspection, python3
+{ stdenv, fetchurl, gettext, meson, ninja, pkgconfig, gobject-introspection, python3
 , gtk-doc, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_43, glibcLocales
 , libxml2, upower, glib, wrapGAppsHook, vala, sqlite, libxslt, libstemmer
-, gnome3, icu, libuuid, networkmanager, libsoup, json-glib
-, substituteAll}:
+, gnome3, icu, libuuid, networkmanager, libsoup, json-glib, systemd
+, substituteAll }:
 
-let
+stdenv.mkDerivation rec {
   pname = "tracker";
-  version = "2.2.2";
-in stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
+  version = "2.3.0";
 
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1rp2c6k7ajcm553p9kpni87zgi9aplm3s01rl7pk575az5i399y6";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    sha256 = "0yxzqvjm3ij28p6g8jc4pd90yhhslmykcvi1cnyb069lm16m611c";
   };
 
   nativeBuildInputs = [
-    meson ninja vala pkgconfig intltool libxslt wrapGAppsHook gobject-introspection
+    meson ninja vala pkgconfig gettext libxslt wrapGAppsHook gobject-introspection
     gtk-doc docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_43 glibcLocales
     python3 # for data-generators
+    systemd # used for checks to install systemd user service
   ];
 
   buildInputs = [
     glib libxml2 sqlite upower icu networkmanager libsoup libuuid json-glib libstemmer
   ];
 
-  LC_ALL = "en_US.UTF-8";
-
   mesonFlags = [
-    "-Ddbus_services=${placeholder "out"}/share/dbus-1/services"
-    "-Dsystemd_user_services=${placeholder "out"}/lib/systemd/user"
     # TODO: figure out wrapping unit tests, some of them fail on missing gsettings-desktop-schemas
     "-Dfunctional_tests=false"
     "-Ddocs=true"
-- 
GitLab


From b748da63b831828678f87b8fb895fde3fd47c914 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:46:08 +0000
Subject: [PATCH 1597/2254] =?UTF-8?q?gnome3.yelp-xsl:=203.32.1=20=E2=86=92?=
 =?UTF-8?q?=203.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gnome-3/core/yelp-xsl/default.nix         | 33 ++++++++++++++-----
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
index fc5b0268df7..7cb63b8df79 100644
--- a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
+++ b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
@@ -1,23 +1,38 @@
-{ stdenv, intltool, fetchurl, pkgconfig
-, itstool, libxml2, libxslt, gnome3 }:
+{ stdenv
+, gettext
+, fetchurl
+, pkgconfig
+, itstool
+, libxml2
+, libxslt
+, gnome3
+}:
 
 stdenv.mkDerivation rec {
   pname = "yelp-xsl";
-  version = "3.32.1";
+  version = "3.34.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/yelp-xsl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "013z2ixx9kfrs6hq79qpil093xfbc12y1p0mvsh6lpala30iphya";
+    sha256 = "1qjfw4s8yf4hmyqrcqy6q2rsnb8b2cl1qbq67m7n7pyiczp3l1p8";
   };
 
-  passthru = {
-    updateScript = gnome3.updateScript { packageName = "yelp-xsl"; attrPath = "gnome3.yelp-xsl"; };
-  };
+  nativeBuildInputs = [
+    pkgconfig
+    gettext
+    itstool
+    libxml2
+    libxslt
+  ];
 
   doCheck = true;
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ intltool itstool libxml2 libxslt ];
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+      attrPath = "gnome3.${pname}";
+    };
+  };
 
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Yelp;
-- 
GitLab


From 7d49165f780a3d1c6e7b5724bfed4741fbd77dbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Tue, 10 Sep 2019 05:10:51 +0200
Subject: [PATCH 1598/2254] gnomeExtensions.gsconnect: 23 -> 26

---
 .../gnome-3/extensions/gsconnect/default.nix  |  6 +--
 .../extensions/gsconnect/fix-paths.patch      | 40 +++++++++++++------
 2 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
index cef00513df1..cfd906a3d0c 100644
--- a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-gsconnect";
-  version = "23";
+  version = "26";
 
   src = fetchFromGitHub {
     owner = "andyholmes";
     repo = "gnome-shell-extension-gsconnect";
     rev = "v${version}";
-    sha256 = "011asrhkly9zhvnng2mh9v06yw39fx244pmqz5yk9rd9m4c32xid";
+    sha256 = "01p8b3blsnxi2i89nddkm51wbbw5irwii2qlvlrzfh8hhh37my0a";
   };
 
   patches = [
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
     upower
     gnome3.caribou
     gnome3.gjs # for running daemon
-    gnome3.evolution-data-server # folks.py requires org.gnome.Evolution.DefaultSources gsettings; TODO: hardcode the schema path to the library (similarly to https://github.com/NixOS/nixpkgs/issues/47226)
+    gnome3.evolution-data-server # for libebook-contacts typelib
   ];
 
   mesonFlags = [
diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/fix-paths.patch b/pkgs/desktops/gnome-3/extensions/gsconnect/fix-paths.patch
index b32d0af3272..097cde829ea 100644
--- a/pkgs/desktops/gnome-3/extensions/gsconnect/fix-paths.patch
+++ b/pkgs/desktops/gnome-3/extensions/gsconnect/fix-paths.patch
@@ -29,16 +29,32 @@
  const Gio = imports.gi.Gio;
  const GLib = imports.gi.GLib;
  const Gtk = imports.gi.Gtk;
---- a/src/service/__init__.js
-+++ b/src/service/__init__.js
-@@ -600,7 +600,9 @@
- /**
-  * Convenience functions for saving/restoring window geometry
-  */
--const _mutter = new Gio.Settings({schema_id: 'org.gnome.mutter'});
-+const _schema_source = Gio.SettingsSchemaSource.new_from_directory('@mutter_gsettings_path@', Gio.SettingsSchemaSource.get_default(), true);
-+const _schema = _schema_source.lookup('org.gnome.mutter', false);
-+const _mutter = new Gio.Settings({settings_schema: _schema});
+--- a/src/preferences/service.js
++++ b/src/preferences/service.js
+@@ -435,9 +435,9 @@ var Window = GObject.registerClass({
+ 
+     _restoreGeometry() {
+         if (this._mutterSettings === undefined) {
+-            this._mutterSettings = new Gio.Settings({
+-                schema_id: 'org.gnome.mutter'
+-            });
++            const _schema_source = Gio.SettingsSchemaSource.new_from_directory('@mutter_gsettings_path@', Gio.SettingsSchemaSource.get_default(), true);
++            const _schema = _schema_source.lookup('org.gnome.mutter', false);
++            this._mutterSettings = new Gio.Settings({settings_schema: _schema});
+         }
+ 
+         // Restore geometry, even if we're going to maximize
+--- a/src/service/ui/messaging.js
++++ b/src/service/ui/messaging.js
+@@ -891,9 +891,9 @@ var Window = GObject.registerClass({
+      */
+     _restoreGeometry() {
+         if (this._mutterSettings === undefined) {
+-            this._mutterSettings = new Gio.Settings({
+-                schema_id: 'org.gnome.mutter'
+-            });
++            const _schema_source = Gio.SettingsSchemaSource.new_from_directory('@mutter_gsettings_path@', Gio.SettingsSchemaSource.get_default(), true);
++            const _schema = _schema_source.lookup('org.gnome.mutter', false);
++            this._mutterSettings = new Gio.Settings({settings_schema: _schema});
+         }
  
- Gtk.Window.prototype.restore_geometry = function() {
-     let [width, height] = this.settings.get_value('window-size').deep_unpack();
-- 
GitLab


From 99fb5e3668d2f1c4adf65b8a718ca4b7cea391b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Wed, 4 Sep 2019 11:27:33 +0000
Subject: [PATCH 1599/2254] =?UTF-8?q?gobject-introspection:=201.60.2=20?=
 =?UTF-8?q?=E2=86=92=201.62.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix
index 43695d8db58..81df734a2ce 100644
--- a/pkgs/development/libraries/gobject-introspection/default.nix
+++ b/pkgs/development/libraries/gobject-introspection/default.nix
@@ -9,7 +9,7 @@
 
 let
   pname = "gobject-introspection";
-  version = "1.60.2";
+  version = "1.62.0";
 in
 with stdenv.lib;
 stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "172ymc1vbg2rclq1rszx4y32vm900nn1mc4qg1a4mqxjiwvf5pzz";
+    sha256 = "18lhglg9v6y83lhqzyifc1z0wrlawzrhzzxx0a3h1g7xaz97xvmi";
   };
 
   outputs = [ "out" "dev" "man" ];
-- 
GitLab


From 8df73bed150f124dc394a6ca951378e4abe90af8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:45:30 +0000
Subject: [PATCH 1600/2254] =?UTF-8?q?gsettings-desktop-schemas:=203.32.0?=
 =?UTF-8?q?=20=E2=86=92=203.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../libraries/gsettings-desktop-schemas/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix
index ffb8be85d3a..ea6e08811af 100644
--- a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix
+++ b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gsettings-desktop-schemas";
-  version = "3.32.0";
+  version = "3.34.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gsettings-desktop-schemas/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0d8a6479vappgplq5crdr3ah0ykqcr3fw533wkx9v1a8lnrv8n9d";
+    sha256 = "1bayr76aylawf2fhyjhv9zgk4kpv7ivrrmd80khb0h3h1wk092r8";
   };
 
   passthru = {
-- 
GitLab


From 593e238b5d0b57b8bf885cd358b1f3db4936b6d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Sun, 8 Sep 2019 18:18:35 +0000
Subject: [PATCH 1601/2254] =?UTF-8?q?gspell:=201.8.1=20=E2=86=92=201.8.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/libraries/gspell/default.nix b/pkgs/development/libraries/gspell/default.nix
index fd6b12ccaac..8adb6264e37 100644
--- a/pkgs/development/libraries/gspell/default.nix
+++ b/pkgs/development/libraries/gspell/default.nix
@@ -2,7 +2,7 @@
 
 let
   pname = "gspell";
-  version = "1.8.1";
+  version = "1.8.2";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1rdv873ixhwr15jwgc2z6k6y0hj353fqnwsy7zkh0c30qwiiv6l1";
+    sha256 = "1miybm1z5cl91i25l7mfqlxhv7j8yy8rcgi0s1bgbb2vm71rb4dv";
   };
 
   propagatedBuildInputs = [ enchant2 ]; # required for pkgconfig
-- 
GitLab


From 5f6c07f3906f92d6cf7dd7f5c4fb299190961ac6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:45:39 +0000
Subject: [PATCH 1602/2254] =?UTF-8?q?gtksourceview4:=204.2.0=20=E2=86=92?=
 =?UTF-8?q?=204.4.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/libraries/gtksourceview/4.x.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/gtksourceview/4.x.nix b/pkgs/development/libraries/gtksourceview/4.x.nix
index fde94e79f05..d3a7d849062 100644
--- a/pkgs/development/libraries/gtksourceview/4.x.nix
+++ b/pkgs/development/libraries/gtksourceview/4.x.nix
@@ -1,13 +1,14 @@
-{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango, vala
-, libxml2, perl, gettext, gnome3, gobject-introspection, dbus, xvfb_run, shared-mime-info }:
+{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango, fribidi, vala
+, libxml2, perl, gettext, gnome3, gobject-introspection, dbus, xvfb_run, shared-mime-info
+, meson, ninja }:
 
 stdenv.mkDerivation rec {
   pname = "gtksourceview";
-  version = "4.2.0";
+  version = "4.4.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtksourceview/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0xgnjj7jd56wbl99s76sa1vjq9bkz4mdsxwgwlcphg689liyncf4";
+    sha256 = "16k8kqw9w775f1ijsk898hp210an5mv4yfyrmik9m8khxx593nwx";
   };
 
   propagatedBuildInputs = [
@@ -19,11 +20,11 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ pkgconfig gettext perl gobject-introspection vala ];
+  nativeBuildInputs = [ meson ninja pkgconfig gettext perl gobject-introspection vala ];
 
   checkInputs = [ xvfb_run dbus ];
 
-  buildInputs = [ atk cairo glib pango libxml2 ];
+  buildInputs = [ atk cairo glib pango fribidi libxml2 ];
 
   patches = [ ./4.x-nix_share_path.patch ];
 
@@ -31,11 +32,10 @@ stdenv.mkDerivation rec {
 
   doCheck = stdenv.isLinux;
   checkPhase = ''
-    NO_AT_BRIDGE=1 \
     XDG_DATA_DIRS="$XDG_DATA_DIRS:${shared-mime-info}/share" \
     xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
       --config-file=${dbus.daemon}/share/dbus-1/session.conf \
-      make check
+      meson test --no-rebuild --print-errorlogs
   '';
 
   passthru = {
-- 
GitLab


From ad19a11ddf27477ff661752b83902038be5114ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:44:15 +0000
Subject: [PATCH 1603/2254] =?UTF-8?q?gvfs:=201.40.2=20=E2=86=92=201.42.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Non-gnome build now require gnome-desktop-schemas
---
 pkgs/development/libraries/gvfs/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix
index 8b3bc30a661..43305291db6 100644
--- a/pkgs/development/libraries/gvfs/default.nix
+++ b/pkgs/development/libraries/gvfs/default.nix
@@ -14,7 +14,7 @@
 , libgphoto2
 , avahi
 , libarchive
-, fuse
+, fuse3
 , libcdio
 , libxml2
 , libxslt
@@ -36,15 +36,16 @@
 , libsecret
 , libgdata
 , python3
+, gsettings-desktop-schemas
 }:
 
 stdenv.mkDerivation rec {
   pname = "gvfs";
-  version = "1.40.2";
+  version = "1.42.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "07lpcfric3h0302n9b1pwa38mjb76r9s98kg2867y2d1qvzfivxx";
+    sha256 = "1wbc0qsa97ihpn24fqvl7zwxy0zy20ggakm7vn6vnm7vxsf8v5fh";
   };
 
   postPatch = ''
@@ -76,7 +77,7 @@ stdenv.mkDerivation rec {
     libgphoto2
     avahi
     libarchive
-    fuse
+    fuse3
     libcdio
     samba
     libmtp
@@ -87,6 +88,7 @@ stdenv.mkDerivation rec {
     libcdio-paranoia
     libnfs
     openssh
+    gsettings-desktop-schemas
     # TODO: a ligther version of libsoup to have FTP/HTTP support?
   ] ++ stdenv.lib.optionals gnomeSupport [
     gnome3.libsoup
-- 
GitLab


From d3779eeb81f525e7c4d1748f878744de9fd7cc03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:53:36 +0000
Subject: [PATCH 1604/2254] =?UTF-8?q?jsonrpc-glib:=203.32.0=20=E2=86=92=20?=
 =?UTF-8?q?3.33.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/libraries/jsonrpc-glib/default.nix b/pkgs/development/libraries/jsonrpc-glib/default.nix
index 8012c6b3b14..63ccc620033 100644
--- a/pkgs/development/libraries/jsonrpc-glib/default.nix
+++ b/pkgs/development/libraries/jsonrpc-glib/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, meson, ninja, glib, json-glib, pkgconfig, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43, gnome3 }:
 stdenv.mkDerivation rec {
   pname = "jsonrpc-glib";
-  version = "3.32.0";
+  version = "3.33.3";
 
   outputs = [ "out" "dev" "devdoc" ];
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1sx6xvzzdm9k0vfmpgg07abz7a9kar20h1a9ml0wgjdxr0valq5w";
+    sha256 = "03vni35vxhajpgcaz104fzpzgs1yw6lc78d0bz1q1b1yi1b0807q";
   };
 
   mesonFlags = [
-- 
GitLab


From a8dd352d4468dfd9d8bf53d61c1b78623c8a03e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:45:38 +0000
Subject: [PATCH 1605/2254] =?UTF-8?q?libdazzle:=203.32.3=20=E2=86=92=203.3?=
 =?UTF-8?q?4.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../libraries/libdazzle/default.nix           | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/libdazzle/default.nix b/pkgs/development/libraries/libdazzle/default.nix
index 5b6d92d629d..2c63a3c71db 100644
--- a/pkgs/development/libraries/libdazzle/default.nix
+++ b/pkgs/development/libraries/libdazzle/default.nix
@@ -1,35 +1,28 @@
 { stdenv, fetchurl, ninja, meson, pkgconfig, vala, gobject-introspection, libxml2
-, gtk-doc, docbook_xsl, docbook_xml_dtd_43, glibcLocales, dbus, xvfb_run, glib, gtk3, gnome3 }:
+, gtk-doc, docbook_xsl, docbook_xml_dtd_43, dbus, xvfb_run, glib, gtk3, gnome3 }:
 
-let
-  version = "3.32.3";
+stdenv.mkDerivation rec {
   pname = "libdazzle";
-in
-stdenv.mkDerivation {
-  name = "${pname}-${version}";
+  version = "3.34.0";
 
   outputs = [ "out" "dev" "devdoc" ];
   outputBin = "dev";
 
   src = fetchurl {
     url = "mirror://gnome/sources/libdazzle/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1s37hv12ikfzhvh86qzgmfcjm3wvp12l2vsr0whl5xmm2harp3bc";
+    sha256 = "0z3395mpa9qwviazrlgf3356121ypzq9dziyzfhbvmmcnay291cd";
   };
 
-  nativeBuildInputs = [ ninja meson pkgconfig vala gobject-introspection libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 glibcLocales dbus xvfb_run ];
+  nativeBuildInputs = [ ninja meson pkgconfig vala gobject-introspection libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 dbus xvfb_run ];
   buildInputs = [ glib gtk3 ];
 
   mesonFlags = [
     "-Denable_gtk_doc=true"
   ];
 
-  LC_ALL = "en_US.UTF-8";
-
-  # https://gitlab.gnome.org/GNOME/libdazzle/issues/25
-  doCheck = false;
+  doCheck = true;
 
   checkPhase = ''
-    export NO_AT_BRIDGE=1
     xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
       --config-file=${dbus.daemon}/share/dbus-1/session.conf \
       meson test --print-errorlogs
-- 
GitLab


From 88de388c986bf2a6080e82a2abe152698bb91843 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:45:46 +0000
Subject: [PATCH 1606/2254] =?UTF-8?q?libgweather:=203.32.2=20=E2=86=92=203?=
 =?UTF-8?q?.33.92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/libraries/libgweather/default.nix b/pkgs/development/libraries/libgweather/default.nix
index 5e35a43fb9d..65f3592eba0 100644
--- a/pkgs/development/libraries/libgweather/default.nix
+++ b/pkgs/development/libraries/libgweather/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libgweather";
-  version = "3.32.2";
+  version = "3.33.92";
 
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "00iwbllh8dmnqch0ysng9xhkzzs3ir9jl9f4hp41vbvg1pq5zv98";
+    sha256 = "1w9y79lrl0ablbxr3zpgkgad1296z3nxh1573icx26fwaklyakkz";
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig gettext vala gtk-doc docbook_xsl docbook_xml_dtd_43 gobject-introspection python3 ];
-- 
GitLab


From 1edd898ffdd2f7292e2328bb372e544ea8a3b15b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 9 Sep 2019 21:49:40 +0200
Subject: [PATCH 1607/2254] libmbim: 1.18.2 -> 1.20.0

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

diff --git a/pkgs/development/libraries/libmbim/default.nix b/pkgs/development/libraries/libmbim/default.nix
index 7a7bd115328..2d026452e6f 100644
--- a/pkgs/development/libraries/libmbim/default.nix
+++ b/pkgs/development/libraries/libmbim/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libmbim";
-  version = "1.18.2";
+  version = "1.20.0";
 
   src = fetchurl {
     url = "https://www.freedesktop.org/software/libmbim/${pname}-${version}.tar.xz";
-    sha256 = "0s4jsfsydp2vykv7lnimalp9i680aas1qcx7zdpjiic64b5g48vp";
+    sha256 = "0rm8j4zh9gnb3yi324cnxy91gdimc1vg5gv1kxc2m5lymb3wdxrc";
   };
 
   outputs = [ "out" "dev" "man" ];
-- 
GitLab


From 9e6d89ea313af6f3caea86d59089b07563ba2a4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:45:48 +0000
Subject: [PATCH 1608/2254] =?UTF-8?q?libpeas:=201.22.0=20=E2=86=92=201.24.?=
 =?UTF-8?q?0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/libraries/libpeas/default.nix b/pkgs/development/libraries/libpeas/default.nix
index 314d5884501..beee52f8217 100644
--- a/pkgs/development/libraries/libpeas/default.nix
+++ b/pkgs/development/libraries/libpeas/default.nix
@@ -1,19 +1,17 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gnome3
+{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gnome3
 , glib, gtk3, gobject-introspection, python3, ncurses
 }:
 
 stdenv.mkDerivation rec {
   pname = "libpeas";
-  version = "1.22.0";
+  version = "1.24.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0qm908kisyjzjxvygdl18hjqxvvgkq9w0phs2g55pck277sw0bsv";
+    sha256 = "1yg6r0srz3knhgvplprl3pikrq5c02dmdxgfwcynd6hjih9h16hb";
   };
 
-  configureFlags = [ "--enable-python3" ];
-
-  nativeBuildInputs = [ pkgconfig intltool gobject-introspection ];
+  nativeBuildInputs = [ pkgconfig meson ninja gettext gobject-introspection ];
   buildInputs =  [ glib gtk3 ncurses python3 python3.pkgs.pygobject3 ];
   propagatedBuildInputs = [
     # Required by libpeas-1.0.pc
-- 
GitLab


From d5491d49b2e5875197e24bbd0ec6fd50e7d0dccd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 9 Sep 2019 21:50:34 +0200
Subject: [PATCH 1609/2254] libqmi: 1.22.4 -> 1.22.6

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

diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix
index 930eafc9675..4d365e5be36 100644
--- a/pkgs/development/libraries/libqmi/default.nix
+++ b/pkgs/development/libraries/libqmi/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libqmi";
-  version = "1.22.4";
+  version = "1.22.6";
 
   src = fetchurl {
     url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz";
-    sha256 = "1wgrrb9vb3myl8xgck8ik86876ycbg8crylybs3ssi21vrxqwnsc";
+    sha256 = "1pnma62kib6zbs4wr7h5g53v3p81jb8cvyvqcvaidb1hlfibwnvm";
   };
 
   outputs = [ "out" "dev" "devdoc" ];
-- 
GitLab


From 7a4bbf6895f7a035ac4a875039ab7dd5a22062a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 9 Sep 2019 21:48:04 +0200
Subject: [PATCH 1610/2254] libsoup: 2.66.2 -> 2.68.1

---
 pkgs/development/libraries/libsoup/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix
index 5f88ba80cd6..fae1581c87a 100644
--- a/pkgs/development/libraries/libsoup/default.nix
+++ b/pkgs/development/libraries/libsoup/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, glib, libxml2, meson, ninja, pkgconfig, gnome3
 , gnomeSupport ? true, sqlite, glib-networking, gobject-introspection, vala
-, libpsl, python3 }:
+, libpsl, python3, brotli }:
 
 stdenv.mkDerivation rec {
   pname = "libsoup";
-  version = "2.66.2";
+  version = "2.68.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0amfw1yvy1kjrg41rfh2vvrw5gkwnyckqbw1fab50hm6xc1acbmx";
+    sha256 = "13dz7x092yswdidj69hadzqfyv6cyfnjbzidjym7nycf7gjj60vz";
   };
 
   postPatch = ''
@@ -17,15 +17,16 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  buildInputs = [ python3 sqlite libpsl ];
+  buildInputs = [ python3 sqlite libpsl brotli ];
   nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala ];
   propagatedBuildInputs = [ glib libxml2 ];
 
   mesonFlags = [
     "-Dtls_check=false" # glib-networking is a runtime dependency, not a compile-time dependency
-    "-Dgssapi=false"
-    "-Dvapi=true"
+    "-Dgssapi=disabled"
+    "-Dvapi=enabled"
     "-Dgnome=${if gnomeSupport then "true" else "false"}"
+    "-Dntlm=disabled"
   ];
 
   doCheck = false; # ERROR:../tests/socket-test.c:37:do_unconnected_socket_test: assertion failed (res == SOUP_STATUS_OK): (2 == 200)
-- 
GitLab


From f4e233e57ae58dc4e3e4d613bdd83c87289d9892 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:45:56 +0000
Subject: [PATCH 1611/2254] =?UTF-8?q?orca:=203.32.0=20=E2=86=92=203.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/applications/misc/orca/default.nix | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix
index 1a8d5b76fe3..4009bbb6da1 100644
--- a/pkgs/applications/misc/orca/default.nix
+++ b/pkgs/applications/misc/orca/default.nix
@@ -1,6 +1,6 @@
 { stdenv, pkgconfig, fetchurl, buildPythonApplication
 , autoreconfHook, wrapGAppsHook, gobject-introspection
-, intltool, yelp-tools, itstool, libxmlxx3
+, gettext, yelp-tools, itstool, libxmlxx3
 , python, pygobject3, gtk3, gnome3, substituteAll, hicolor-icon-theme
 , at-spi2-atk, at-spi2-core, pyatspi, dbus, dbus-python, pyxdg
 , xkbcomp, procps, lsof, coreutils, gsettings-desktop-schemas
@@ -9,13 +9,13 @@
 
 buildPythonApplication rec {
   pname = "orca";
-  version = "3.32.0";
+  version = "3.34.0";
 
   format = "other";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "05jqzlg0f1x53hyl0l9282ynmw37159g6dsbrid12b7sjs12cc1i";
+    sha256 = "10h258cprsxzb2hz9wqrkzv1yrsm19ws46l6fsnspywza5wq0z4p";
   };
 
   patches = [
@@ -30,7 +30,7 @@ buildPythonApplication rec {
 
   nativeBuildInputs = [
     autoreconfHook wrapGAppsHook pkgconfig libxmlxx3
-    intltool yelp-tools itstool gobject-introspection
+    gettext yelp-tools itstool gobject-introspection
     hicolor-icon-theme # setup-hook
   ];
 
@@ -45,11 +45,6 @@ buildPythonApplication rec {
     gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
   ];
 
-  # Run intltoolize to create po/Makefile.in.in
-  preConfigure = ''
-    intltoolize
-  '';
-
   passthru = {
     updateScript = gnome3.updateScript {
       packageName = pname;
-- 
GitLab


From 8cca9416eb6324b4ae3b9018a4dade5ac85bd639 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:46:00 +0000
Subject: [PATCH 1612/2254] =?UTF-8?q?simple-scan:=203.32.2.1=20=E2=86=92?=
 =?UTF-8?q?=203.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix
index de56b14d46f..89d756c559e 100644
--- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix
+++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "simple-scan";
-  version = "3.32.2.1";
+  version = "3.34.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/simple-scan/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0xqb642bsd2hddsm4bd199vyq8jcipdlxm0br3mjlc5vjcxgkxyp";
+    sha256 = "1fxqrwhpvm7y83zrn85wg2avwlcmkfjvv1gb6br6v58zi6fvny3k";
   };
 
   buildInputs = [
-- 
GitLab


From 63b9cbdb8ea6212c5b0eb4d187309ee42825f427 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 9 Sep 2019 21:48:51 +0200
Subject: [PATCH 1613/2254] sysprof: 3.32.0 -> 3.34.0

---
 pkgs/development/tools/profiling/sysprof/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix
index 720544f4b6c..d01785a8fc0 100644
--- a/pkgs/development/tools/profiling/sysprof/default.nix
+++ b/pkgs/development/tools/profiling/sysprof/default.nix
@@ -5,6 +5,7 @@
 , glib
 , gtk3
 , itstool
+, libdazzle
 , libxml2
 , meson, ninja
 , pango
@@ -18,13 +19,13 @@
 
 stdenv.mkDerivation rec {
   pname = "sysprof";
-  version = "3.32.0";
+  version = "3.34.0";
 
   outputs = [ "out" "lib" "dev" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0kamsnnig56lzs4ziwcxm3b1xyis4z361s9nj3nca0c78sgac8pw";
+    sha256 = "0b7rpwvs5wckiy418vs0d4i62wafpcx1zlspw39ag50d1sjcbv58";
   };
 
   nativeBuildInputs = [
@@ -39,7 +40,7 @@ stdenv.mkDerivation rec {
     wrapGAppsHook
     gnome3.adwaita-icon-theme
   ];
-  buildInputs = [ glib gtk3 pango polkit systemd.dev systemd.lib ];
+  buildInputs = [ glib gtk3 pango polkit systemd.dev systemd.lib libdazzle ];
 
   mesonFlags = [
     "-Dsystemdunitdir=lib/systemd/system"
-- 
GitLab


From 374ae1b4ec7b3e5d0a94c409f3251497781cddeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Wed, 4 Sep 2019 00:02:39 +0000
Subject: [PATCH 1614/2254] =?UTF-8?q?vte:=200.56.3=20=E2=86=92=200.58.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: worldofpeace <worldofpeace@protonmail.ch>
---
 pkgs/development/libraries/vte/default.nix | 62 ++++++++++++++++------
 1 file changed, 46 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix
index 35bc881d3d1..b3f1d9306f1 100644
--- a/pkgs/development/libraries/vte/default.nix
+++ b/pkgs/development/libraries/vte/default.nix
@@ -1,36 +1,67 @@
-{ stdenv, fetchurl, intltool, pkgconfig
-, gnome3, glib, gtk3, ncurses, gobject-introspection, vala, libxml2, gnutls
-, gperf, pcre2
+{ stdenv
+, fetchurl
+, gettext
+, pkgconfig
+, meson
+, ninja
+, gnome3
+, glib
+, gtk3
+, gobject-introspection
+, vala
+, libxml2
+, gnutls
+, gperf
+, pango
+, pcre2
+, fribidi
+, zlib
 }:
 
 stdenv.mkDerivation rec {
   pname = "vte";
-  version = "0.56.3";
+  version = "0.58.0";
+
+  outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0j166gic5znssdb9r45qazq4kb4v9fial82czand5wa8i2yd988p";
+    sha256 = "0ifvza9sdrkxxqq7m9i7ry23sv7widjz6nzbvgc60kpph4fmf187";
   };
 
   passthru = {
     updateScript = gnome3.updateScript { packageName = pname; };
   };
 
-  nativeBuildInputs = [ gobject-introspection intltool pkgconfig vala gperf libxml2 ];
-  buildInputs = [ glib gtk3 ncurses ];
+  nativeBuildInputs = [
+    gettext
+    gobject-introspection
+    gperf
+    libxml2
+    meson
+    ninja
+    pkgconfig
+    vala
+  ];
 
-  propagatedBuildInputs = [
-    # Required by vte-2.91.pc.
-    gtk3
+  buildInputs = [
+    fribidi
     gnutls
     pcre2
+    zlib
   ];
 
-  preConfigure = "patchShebangs .";
-
-  configureFlags = [ "--enable-introspection" "--disable-Bsymbolic" ];
+  propagatedBuildInputs = [
+    # Required by vte-2.91.pc.
+    gtk3
+    glib
+    pango
+  ];
 
-  enableParallelBuilding = true;
+  postPatch = ''
+    patchShebangs perf/*
+    patchShebangs src/box_drawing_generate.sh
+  '';
 
   meta = with stdenv.lib; {
     homepage = https://www.gnome.org/;
@@ -45,7 +76,6 @@ stdenv.mkDerivation rec {
     '';
     license = licenses.lgpl2;
     maintainers = with maintainers; [ astsmtl antono lethalman ];
-    platforms = platforms.linux ++ platforms.darwin;
+    platforms = platforms.unix;
   };
 }
-
-- 
GitLab


From 12f9e847ff64ab77174d4ed622fa1cab259e4ea5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 16:46:06 +0000
Subject: [PATCH 1615/2254] =?UTF-8?q?yelp:=203.32.2=20=E2=86=92=203.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix
index 7e326dd1657..438c71c4ad3 100644
--- a/pkgs/desktops/gnome-3/core/yelp/default.nix
+++ b/pkgs/desktops/gnome-3/core/yelp/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "yelp";
-  version = "3.32.2";
+  version = "3.34.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/yelp/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0yrl96icmmrxvg7sxl519gzg9qb368cmzgrr9ddh181ignkxzx7f";
+    sha256 = "0ifhgdxff2xx2damaj72gpjln5k36grg2chvi4335mv3b5y55mp3";
   };
 
   nativeBuildInputs = [ pkgconfig gettext itstool wrapGAppsHook ];
-- 
GitLab


From 90b8ac0ff37205f868bd176583aa8a8a265134ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Sat, 14 Sep 2019 02:45:42 +0200
Subject: [PATCH 1616/2254] vte-ng: fix build

vte now uses meson so don't bother overriding vte.
---
 pkgs/development/libraries/vte/ng.nix | 44 +++++++++++++++++++++++----
 1 file changed, 38 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/vte/ng.nix b/pkgs/development/libraries/vte/ng.nix
index c00be4c008f..af4fe76840f 100644
--- a/pkgs/development/libraries/vte/ng.nix
+++ b/pkgs/development/libraries/vte/ng.nix
@@ -1,6 +1,10 @@
-{ vte, fetchFromGitHub, fetchpatch, autoconf, automake, gtk-doc, gettext, libtool, gperf }:
+{ vte, fetchFromGitHub, fetchpatch, autoconf, automake, gtk-doc, gettext, libtool, gperf
+, stdenv, fetchurl, intltool, pkgconfig
+, gnome3, glib, gtk3, ncurses, gobject-introspection, vala, libxml2, gnutls
+, pcre2
+}:
 
-vte.overrideAttrs (oldAttrs: rec {
+stdenv.mkDerivation rec {
   name = "vte-ng-${version}";
   version = "0.54.2.a";
 
@@ -20,8 +24,36 @@ vte.overrideAttrs (oldAttrs: rec {
     })
   ];
 
-  preConfigure = oldAttrs.preConfigure + "; NOCONFIGURE=1 ./autogen.sh";
+  nativeBuildInputs = [
+    gtk-doc autoconf automake gettext libtool gperf
+    gobject-introspection intltool pkgconfig vala gperf libxml2
+  ];
+  buildInputs = [ glib gtk3 ncurses ];
+
+  propagatedBuildInputs = [
+    # Required by vte-2.91.pc.
+    gtk3
+    gnutls
+    pcre2
+  ];
 
-  nativeBuildInputs = oldAttrs.nativeBuildInputs or []
-    ++ [ gtk-doc autoconf automake gettext libtool gperf ];
-})
+  preConfigure = "patchShebangs .; NOCONFIGURE=1 ./autogen.sh";
+
+  configureFlags = [ "--enable-introspection" "--disable-Bsymbolic" ];
+
+  meta = with stdenv.lib; {
+    homepage = https://www.gnome.org/;
+    description = "A library implementing a terminal emulator widget for GTK";
+    longDescription = ''
+      VTE is a library (libvte) implementing a terminal emulator widget for
+      GTK, and a minimal sample application (vte) using that.  Vte is
+      mainly used in gnome-terminal, but can also be used to embed a
+      console/terminal in games, editors, IDEs, etc. VTE supports Unicode and
+      character set conversion, as well as emulating any terminal known to
+      the system's terminfo database.
+    '';
+    license = licenses.lgpl2;
+    maintainers = with maintainers; [ astsmtl antono lethalman ];
+    platforms = platforms.unix;
+  };
+}
-- 
GitLab


From 29984810d20c2cbafb2e2779c2cb70e81bcd6f8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Sat, 14 Sep 2019 02:53:00 +0200
Subject: [PATCH 1617/2254] gcolor3: fix build

---
 pkgs/applications/graphics/gcolor3/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/gcolor3/default.nix b/pkgs/applications/graphics/gcolor3/default.nix
index c7555b612f7..67be3ba6782 100644
--- a/pkgs/applications/graphics/gcolor3/default.nix
+++ b/pkgs/applications/graphics/gcolor3/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchFromGitLab, meson, ninja, gettext, pkgconfig, libxml2, gtk3, hicolor-icon-theme, wrapGAppsHook }:
+{ stdenv, fetchFromGitLab, meson, ninja, gettext, pkgconfig, libxml2, gtk3, hicolor-icon-theme, wrapGAppsHook
+, fetchpatch }:
 
 let
   version = "2.3.1";
@@ -14,6 +15,14 @@ in stdenv.mkDerivation {
     sha256 = "10cfzlkflwkb7f51rnrxmgxpfryh1qzvqaydj6lffjq9zvnhigg7";
   };
 
+  patches = [
+    # Remove useage of deprecrated G_PARAM_PRIVATE
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/World/gcolor3/commit/96612cdd6c2cc71e28eb97ee17956004a05e5140.patch";
+      sha256 = "134wv5x15bd7k0fjzifrddwssaq213sx2l38r3xw6x1j625qwzq9";
+    })
+  ];
+
   nativeBuildInputs = [ meson ninja gettext pkgconfig libxml2 wrapGAppsHook ];
 
   buildInputs = [ gtk3 hicolor-icon-theme ];
-- 
GitLab


From afe005329aed1ad87662c848a320ee72a770a6db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Sat, 14 Sep 2019 21:29:54 +0200
Subject: [PATCH 1618/2254] gnome3.gpaste: 3.32.0 -> 3.34.0

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

diff --git a/pkgs/desktops/gnome-3/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/misc/gpaste/default.nix
index 46ca01c1a1a..ebedf0c81ff 100644
--- a/pkgs/desktops/gnome-3/misc/gpaste/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gpaste/default.nix
@@ -2,12 +2,12 @@
 , pango, gtk3, gnome3, dbus, clutter, appstream-glib, wrapGAppsHook, gobject-introspection }:
 
 stdenv.mkDerivation rec {
-  version = "3.32.0";
+  version = "3.34.0";
   pname = "gpaste";
 
   src = fetchurl {
     url = "https://github.com/Keruspe/GPaste/archive/v${version}.tar.gz";
-    sha256 = "1fvpl9vqmrr1w22hm0ybabn9pjfii5qj9ghnc2jzihgrn2h486v6";
+    sha256 = "0mih07b3mb0m1bk8ng9175fgvdbmvsacl4v4kvdnnlnql6rh47gv";
   };
 
   patches = [
-- 
GitLab


From e732933aa728ea57b2219c929e7abb322068ccb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Wed, 4 Sep 2019 13:24:13 +0200
Subject: [PATCH 1619/2254] networkmanager-iodine: fix build with glib-2.62

---
 pkgs/tools/networking/network-manager/iodine/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/network-manager/iodine/default.nix b/pkgs/tools/networking/network-manager/iodine/default.nix
index 27e091b6b60..a7f5bbf145e 100644
--- a/pkgs/tools/networking/network-manager/iodine/default.nix
+++ b/pkgs/tools/networking/network-manager/iodine/default.nix
@@ -24,8 +24,8 @@ in stdenv.mkDerivation {
 
   nativeBuildInputs = [ intltool pkgconfig ];
 
-  # Fixes deprecation errors with networkmanager 1.10.2
-  NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations";
+  # glib-2.62 deprecations
+  NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
 
   configureFlags = [
     "--without-libnm-glib"
-- 
GitLab


From 8ff1d64b431760c16154fdb5d4095ac9e051ef3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Sat, 14 Sep 2019 22:42:52 +0200
Subject: [PATCH 1620/2254] gnucash: fix build with glib-2.62

---
 pkgs/applications/office/gnucash/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix
index 9ec13c01168..85868803ec6 100644
--- a/pkgs/applications/office/gnucash/default.nix
+++ b/pkgs/applications/office/gnucash/default.nix
@@ -43,9 +43,8 @@ stdenv.mkDerivation rec {
 
   propagatedUserEnvPkgs = [ dconf ];
 
-  # glib-2.58 deprecrated g_type_class_add_private
-  # Should probably be removed next version bump
-  CXXFLAGS = [ "-Wno-deprecated-declarations" ];
+  # glib-2.62 deprecations
+  NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
 
   patches = [ ./cmake_check_symbol_exists.patch ];
 
-- 
GitLab


From 03495ea203851f023ccfbfa9f7e78b9f671b8116 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Sat, 14 Sep 2019 22:43:59 +0200
Subject: [PATCH 1621/2254] bamf: fix build with glib-2.62

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

diff --git a/pkgs/development/libraries/bamf/default.nix b/pkgs/development/libraries/bamf/default.nix
index b1fb17b08fa..58d44a54137 100644
--- a/pkgs/development/libraries/bamf/default.nix
+++ b/pkgs/development/libraries/bamf/default.nix
@@ -66,8 +66,8 @@ stdenv.mkDerivation rec {
   # TODO: Requires /etc/machine-id
   doCheck = false;
 
-  # ignore deprecation errors
-  NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations";
+  # glib-2.62 deprecations
+  NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
 
   meta = with stdenv.lib; {
     description = "Application matching framework";
-- 
GitLab


From 0b45e79490c2874fee18875acf490a5401325a8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Sat, 14 Sep 2019 22:45:31 +0200
Subject: [PATCH 1622/2254] libunique: fix build with glib-2.62

---
 pkgs/development/libraries/libunique/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libunique/default.nix b/pkgs/development/libraries/libunique/default.nix
index b96fdf5eedd..e0022411221 100644
--- a/pkgs/development/libraries/libunique/default.nix
+++ b/pkgs/development/libraries/libunique/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "1fsgvmncd9caw552lyfg8swmsd6bh4ijjsph69bwacwfxwf09j75";
   };
 
-  NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
+  # glib-2.62 deprecations
+  NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
 
   # Patches from Gentoo portage
   patches = [
-- 
GitLab


From 36a95c772ac56ef4fae4dc8d116d77a081e1b021 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Sat, 14 Sep 2019 22:46:09 +0200
Subject: [PATCH 1623/2254] ldmtool: fix build with glib-2.62

---
 pkgs/tools/misc/ldmtool/default.nix | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/ldmtool/default.nix b/pkgs/tools/misc/ldmtool/default.nix
index b59c46a8477..d1d3996bd62 100644
--- a/pkgs/tools/misc/ldmtool/default.nix
+++ b/pkgs/tools/misc/ldmtool/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchFromGitHub, autoconf, automake, gtk-doc, pkgconfig, libuuid,
-  libtool, readline, gobject-introspection, json-glib, lvm2, libxslt, docbook_xsl }:
+  libtool, readline, gobject-introspection, json-glib, lvm2, libxslt, docbook_xsl
+, fetchpatch }:
 
 stdenv.mkDerivation rec {
    pname = "ldmtool";
@@ -12,13 +13,21 @@ stdenv.mkDerivation rec {
      sha256 = "1fy5wbmk8kwl86lzswq0d1z2j5y023qzfm2ppm8knzv9c47kniqk";
    };
 
+  patches = [
+    # Remove useage of deprecrated G_PARAM_PRIVATE
+    (fetchpatch {
+      url = "https://github.com/mdbooth/libldm/commit/ee1b37a034038f09d61b121cc8b3651024acc46f.patch";
+      sha256 = "02y34kbcpcpffvy1n9yqngvdldmxmvdkha1v2xjqvrnclanpigcp";
+    })
+  ];
+
    preConfigure = ''
      sed -i docs/reference/ldmtool/Makefile.am \
        -e 's|-nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl|--nonet ${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl|g'
    '';
 
-   # ldm.c:951:5: error: 'g_type_class_add_private' is deprecated [-Werror=deprecated-declarations]
-   NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
+   # glib-2.62 deprecations
+   NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
 
    configureScript = "sh autogen.sh";
 
-- 
GitLab


From a993a06a2f2bbffbc98c2c61d8249c1d33f431cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Sat, 14 Sep 2019 23:00:47 +0200
Subject: [PATCH 1624/2254] xlog: fix build with glib-2.62

---
 pkgs/applications/radio/xlog/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/radio/xlog/default.nix b/pkgs/applications/radio/xlog/default.nix
index 7b9cf0a4ee5..3434c0624ed 100644
--- a/pkgs/applications/radio/xlog/default.nix
+++ b/pkgs/applications/radio/xlog/default.nix
@@ -8,6 +8,9 @@ stdenv.mkDerivation rec {
     sha256 = "0vmn8518zk7qk1mbp1h8dm0f8fx0z0jvmy42c1n15il714lj7vsl";
   };
 
+  # glib-2.62 deprecations
+  NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
+
   buildInputs = [ glib pkgconfig gtk2 hamlib ];
 
   meta = with stdenv.lib; {
-- 
GitLab


From b85523cf8449438647a975f2efadd87fcd6cfad4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Sat, 14 Sep 2019 23:10:54 +0200
Subject: [PATCH 1625/2254] purple-matrix: fix build with glib-2.62

---
 .../pidgin-plugins/purple-matrix/default.nix                   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix
index 310d419718f..8a15a3bdd85 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix
@@ -13,6 +13,9 @@ stdenv.mkDerivation {
     sha256 = "0ph0s24b37d1c50p8zbzgf4q2xns43a8v6vk85iz633wdd72zsa0";
   };
 
+  # glib-2.62 deprecations
+  NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
+
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ pidgin json-glib glib http-parser sqlite olm libgcrypt ];
 
-- 
GitLab


From 203ba052b2c09211d64fa08e58020424687ec1bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Sat, 14 Sep 2019 23:21:34 +0200
Subject: [PATCH 1626/2254] openjfx12: fix build with glib-2.62

---
 pkgs/development/compilers/openjdk/openjfx/12.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/compilers/openjdk/openjfx/12.nix b/pkgs/development/compilers/openjdk/openjfx/12.nix
index 418c58ac683..356ac4800d9 100644
--- a/pkgs/development/compilers/openjdk/openjfx/12.nix
+++ b/pkgs/development/compilers/openjdk/openjfx/12.nix
@@ -83,6 +83,9 @@ in makePackage {
     cp -r build/modular-sdk $out
   '';
 
+  # glib-2.62 deprecations
+  NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
+
   stripDebugList = [ "." ];
 
   postFixup = ''
-- 
GitLab


From 1905a6d01eab8ad5dcadd3189937cdbf25a0881e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Sat, 14 Sep 2019 23:22:01 +0200
Subject: [PATCH 1627/2254] openjfx11: fix build with glib-2.62

---
 pkgs/development/compilers/openjdk/openjfx/11.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/compilers/openjdk/openjfx/11.nix b/pkgs/development/compilers/openjdk/openjfx/11.nix
index 9e6d30efda8..43fe8ed8387 100644
--- a/pkgs/development/compilers/openjdk/openjfx/11.nix
+++ b/pkgs/development/compilers/openjdk/openjfx/11.nix
@@ -83,6 +83,9 @@ in makePackage {
     cp -r build/modular-sdk $out
   '';
 
+  # glib-2.62 deprecations
+  NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
+
   stripDebugList = [ "." ];
 
   postFixup = ''
-- 
GitLab


From 4885a9522211532a5b05b426a356da5a4306ffe3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Sun, 15 Sep 2019 02:20:32 +0200
Subject: [PATCH 1628/2254] putty: fix build with glib-2.62

---
 pkgs/applications/networking/remote/putty/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix
index 3b7db7075bb..d8dc33c944e 100644
--- a/pkgs/applications/networking/remote/putty/default.nix
+++ b/pkgs/applications/networking/remote/putty/default.nix
@@ -14,6 +14,9 @@ stdenv.mkDerivation rec {
     sha256 = "1f66iss0kqk982azmxbk4xfm2i1csby91vdvly6cr04pz3i1r4rg";
   };
 
+  # glib-2.62 deprecations
+  NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
+
   preConfigure = lib.optionalString stdenv.hostPlatform.isUnix ''
     perl mkfiles.pl
     ( cd doc ; make );
-- 
GitLab


From ade2073064887c2312ed1a78c3bdf3a54e4b3734 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Sun, 15 Sep 2019 02:04:56 +0000
Subject: [PATCH 1629/2254] =?UTF-8?q?gnome3.gnome-backgrounds:=203.32.0=20?=
 =?UTF-8?q?=E2=86=92=203.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix
index e4c772cb1d4..4b91b3219be 100644
--- a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-backgrounds";
-  version = "3.32.0";
+  version = "3.34.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-backgrounds/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1s5krdmd3md44p1fgr2lqm5ifxb8s1vzx6hm11sb4cgzr4dw6lrz";
+    sha256 = "0zxlwy55fz7i582hch2wnj8zy1kzikssgaix0l2y41ccp5nzpdy2";
   };
 
   passthru = {
-- 
GitLab


From 6a35bd4fcf763dd1d35365bd56ceda5e213a3b8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Sun, 15 Sep 2019 02:05:16 +0000
Subject: [PATCH 1630/2254] =?UTF-8?q?grilo:=200.3.9=20=E2=86=92=200.3.10?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Dropped the meson_options patch, not sure if it was necessary.
---
 pkgs/development/libraries/grilo/default.nix | 25 ++++----------------
 1 file changed, 4 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/libraries/grilo/default.nix b/pkgs/development/libraries/grilo/default.nix
index b2a7f0bd5ae..79ccc931972 100644
--- a/pkgs/development/libraries/grilo/default.nix
+++ b/pkgs/development/libraries/grilo/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, vala, glib, liboauth, gtk3
-, gtk-doc, docbook_xsl, docbook_xml_dtd_43, fetchpatch
+, gtk-doc, docbook_xsl, docbook_xml_dtd_43
 , libxml2, gnome3, gobject-introspection, libsoup, totem-pl-parser }:
 
 let
   pname = "grilo";
-  version = "0.3.9"; # if you change minor, also change ./setup-hook.sh
+  version = "0.3.10"; # if you change minor, also change ./setup-hook.sh
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
@@ -13,30 +13,13 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1wnabc69730jsv8dljj5ik8g7p581nw60mw1mkgamkzjcb6821bk";
+    sha256 = "1s7ilyywf18q26aj5c4709kfizqywjlnacp4jzmj9v9i9kkv4i3y";
   };
 
   setupHook = ./setup-hook.sh;
 
   mesonFlags = [
-    "-Dgtk_doc=true"
-  ];
-
-  patches = [
-    # https://gitlab.gnome.org/GNOME/grilo/merge_requests/45
-    # commits are from a separate branch so they shouldn't 404
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/worldofpeace/grilo/commit/f6993c2a8a6c1a6246372569f9f7a9179955c95e.patch";
-      sha256 = "1x4s0ahs60dqyphgv2dy3x2sjnxv5ydd55kdlcjsys5870ijwbi8";
-    })
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/worldofpeace/grilo/commit/61bca28b141162a33eb2fb575ef1daf0f21c7741.patch";
-      sha256 = "1147xbmaq61myfwxz0pagdv056krfmh1s78qjbiy5k7k203qrjz0";
-    })
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/worldofpeace/grilo/commit/363b198a062eeb8aaa5489ea9720e69d428e885c.patch";
-      sha256 = "01w1bfzdbnxy5l37b2z7a9h2mrxziqkzdw02dybjphy85nb0hz5w";
-    })
+    "-Denable-gtk-doc=true"
   ];
 
   nativeBuildInputs = [
-- 
GitLab


From 7817c878b34b38dc71c8c7380d4d9ac66ca5a1a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Sun, 15 Sep 2019 02:05:18 +0000
Subject: [PATCH 1631/2254] =?UTF-8?q?gnome3.grilo-plugins:=200.3.9=20?=
 =?UTF-8?q?=E2=86=92=200.3.10?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/libraries/grilo-plugins/default.nix b/pkgs/development/libraries/grilo-plugins/default.nix
index 118a910a168..435da107fcb 100644
--- a/pkgs/development/libraries/grilo-plugins/default.nix
+++ b/pkgs/development/libraries/grilo-plugins/default.nix
@@ -28,11 +28,11 @@
 
 stdenv.mkDerivation rec {
   pname = "grilo-plugins";
-  version = "0.3.9";
+  version = "0.3.10";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1hv84b56qjic8vz8iz46ikhrxx31l29ilbr8dm5qcghbd8ikw8j1";
+    sha256 = "0jldaixc4kzycn5v8ixkjld1n0z3dp0l1p3vchgdwpvdvc7kcfw0";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From 8ca630391f580ccf938b764989f821d608611815 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sun, 15 Sep 2019 16:00:03 -0400
Subject: [PATCH 1632/2254] libsecret: 0.18.8 -> 0.19.1

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

diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix
index 6c2723bbd90..6c14269c2d5 100644
--- a/pkgs/development/libraries/libsecret/default.nix
+++ b/pkgs/development/libraries/libsecret/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libsecret";
-  version = "0.18.8";
+  version = "0.19.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "058x64689k55wxfkdp4svhnwvv8jmqm7z5mrynybl38f4sfqiyiv";
+    sha256 = "0fhflcsr70b1pps2pcvqcbdhip2ny5am9nbm634f4sj5g40y30w5";
   };
 
   postPatch = ''
-- 
GitLab


From 345ef1cfe0b86b74178b7f666f956fd7de23387c Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sun, 15 Sep 2019 16:35:43 -0400
Subject: [PATCH 1633/2254] gnome3.gnome-autoar: cleanup

* enable vapi
* multi outputs
* correct Inputs
---
 .../gnome-3/misc/gnome-autoar/default.nix     | 30 +++++++++++++++----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix b/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix
index c8d26988391..8ccf5107046 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix
@@ -1,11 +1,20 @@
-{ stdenv, fetchurl, pkgconfig, gnome3
-, gtk3, glib, gobject-introspection, libarchive
+{ stdenv
+, fetchurl
+, pkgconfig
+, gnome3
+, gtk3
+, glib
+, gobject-introspection
+, libarchive
+, vala
 }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-autoar";
   version = "0.2.3";
 
+  outputs = [ "out" "dev" ];
+
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-autoar/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "02i4zgqqqj56h7bcys6dz7n78m4nj2x4dv1ggjmnrk98n06xpsax";
@@ -15,9 +24,20 @@ stdenv.mkDerivation rec {
     updateScript = gnome3.updateScript { packageName = "gnome-autoar"; attrPath = "gnome3.gnome-autoar"; };
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ gtk3 glib ];
-  propagatedBuildInputs = [ libarchive gobject-introspection ];
+  nativeBuildInputs = [
+    gobject-introspection
+    pkgconfig
+    vala
+  ];
+
+  buildInputs = [
+    gtk3
+  ];
+
+  propagatedBuildInputs = [
+    libarchive
+    glib
+  ];
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;
-- 
GitLab


From 90b0e3c19f8c9d7af12de9fae7c7958a177ddbda Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sun, 15 Sep 2019 16:49:42 -0400
Subject: [PATCH 1634/2254] gnome3.gnome-shell: enable extensions_tool

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

diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
index 92578ef2798..6c26c8c4fa4 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
@@ -5,7 +5,8 @@
 , libpulseaudio, libical, gobject-introspection, gstreamer, wrapGAppsHook, libxslt, gcr, caribou
 , accountsservice, gdk-pixbuf, gdm, upower, ibus, networkmanagerapplet, libgnomekbd, gnome-desktop
 , gsettings-desktop-schemas, gnome-keyring, glib, gjs, mutter, evolution-data-server, gtk3
-, sassc, systemd, gst_all_1, adwaita-icon-theme, gnome-bluetooth, gnome-clocks, gnome-settings-daemon }:
+, sassc, systemd, gst_all_1, adwaita-icon-theme, gnome-bluetooth, gnome-clocks, gnome-settings-daemon
+, gnome-autoar, asciidoc-full }:
 
 # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup
 
@@ -25,7 +26,7 @@ in stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     meson ninja pkgconfig gettext docbook_xsl docbook_xsl_ns docbook_xml_dtd_42 perl wrapGAppsHook glibcLocales
-    sassc desktop-file-utils libxslt.bin python3
+    sassc desktop-file-utils libxslt.bin python3 asciidoc-full
   ];
   buildInputs = [
     systemd caribou
@@ -39,6 +40,7 @@ in stdenv.mkDerivation rec {
     at-spi2-core upower ibus gnome-desktop telepathy-logger gnome-settings-daemon
     gst_all_1.gst-plugins-good # recording
     gobject-introspection
+    gnome-autoar
 
     # not declared at build time, but typelib is needed at runtime
     libgweather networkmanagerapplet
@@ -49,8 +51,6 @@ in stdenv.mkDerivation rec {
     caribou
   ];
 
-  mesonFlags = [ "-Dextensions_tool=false" ];
-
   patches = [
     (fetchpatch {
       name = "0001-build-Add-missing-dependency-to-run-js-test.patch";
-- 
GitLab


From fc43be57f0f475e9f506ded26abc615ad1bac5e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Sun, 15 Sep 2019 13:30:04 +0200
Subject: [PATCH 1635/2254] nixos/gdm: start after getty@tty1

GDM is now killed if tty1 is started after gdm is launched. This follows
upstream's gdm service config.

This might cause problems with nixos-rebuild switch though. See the reasoning
and work that led to not following upstream on this:
  https://github.com/NixOS/nixpkgs/issues/21439
  4a180da
  c46d4da
---
 nixos/modules/services/x11/display-managers/gdm.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index 6c785396613..8edefd592a1 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -159,6 +159,10 @@ in
       "rc-local.service"
       "systemd-machined.service"
       "systemd-user-sessions.service"
+      "getty@tty1.service"
+    ];
+    systemd.services.display-manager.conflicts = [
+      "getty@tty1.service"
     ];
 
     systemd.services.display-manager.serviceConfig = {
-- 
GitLab


From d27212d466d0e79c3d9781b60aa3374d234370c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 16 Sep 2019 07:19:00 +0200
Subject: [PATCH 1636/2254] nixos/gnome3: enable systemd session

- register gnome-session and gnome-settings-daemon services.
- gnome-shell is already registered due to having a xdg portal
- manually specify that gsd is wanted by gnome-session
    (systemd.packages doesn't pick the .wants directories for some reason)
---
 .../services/x11/desktop-managers/gnome3.nix   | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 30c5250221c..b625f592efa 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -236,7 +236,23 @@ in
       services.gvfs.enable = true;
       services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true));
       services.telepathy.enable = mkDefault true;
-      systemd.packages = [ pkgs.gnome3.vino ];
+
+      systemd.packages = with pkgs.gnome3; [ vino gnome-session gnome-settings-daemon ];
+
+      # gnome-settings-daemon.nix is shared between several desktop
+      # environments (eg. mate and pantheon) so specify these gnome-shell specific
+      # service dependencies here instead.
+      systemd.user.targets."gnome-session-initialized".wants = [
+        "gsd-a11y-settings.target" "gsd-housekeeping.target" "gsd-power.target"
+        "gsd-color.target" "gsd-keyboard.target" "gsd-print-notifications.target"
+        "gsd-datetime.target" "gsd-media-keys.target" "gsd-rfkill.target"
+        "gsd-screensaver-proxy.target" "gsd-sound.target" "gsd-smartcard.target"
+        "gsd-sharing.target" "gsd-wacom.target" "gsd-wwan.target"
+      ];
+
+      systemd.user.targets."gnome-session-x11-services".wants = [
+        "gsd-xsettings.target"
+      ];
 
       services.avahi.enable = mkDefault true;
 
-- 
GitLab


From b916c657066277e8d30c5061caf4e2068f64f380 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 16 Sep 2019 10:49:58 +0200
Subject: [PATCH 1637/2254] gnome3.gnome-shell: hardcode gsettings path

---
 pkgs/desktops/gnome-3/core/gnome-shell/default.nix     | 1 +
 pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
index 6c26c8c4fa4..abd467d2aa4 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
@@ -60,6 +60,7 @@ in stdenv.mkDerivation rec {
     (substituteAll {
       src = ./fix-paths.patch;
       inherit libgnomekbd unzip;
+      gsettings = "${glib.bin}/bin/gsettings";
     })
   ];
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch b/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch
index 9cb9655b72e..7b93475619b 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch
+++ b/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch
@@ -19,3 +19,12 @@
 +        Util.spawn(['@libgnomekbd@/bin/gkbd-keyboard-display', '-l', description]);
      }
  });
+--- a/data/gnome-shell-disable-extensions.service
++++ b/data/gnome-shell-disable-extensions.service
+@@ -10,5 +10,5 @@ Requisite=gnome-session-stable.timer
+ [Service]
+ Type=simple
+ # Disable extensions
+-ExecStart=gsettings set org.gnome.shell disable-user-extensions true
++ExecStart=@gsettings@ set org.gnome.shell disable-user-extensions true
+ Restart=no
-- 
GitLab


From a821167046d808365c667e13db44ebba5a680a89 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Mon, 16 Sep 2019 10:38:36 -0400
Subject: [PATCH 1638/2254] gnome3.mutter: enable profiler

This needed a patch to get the correct directory to the sysprof
dbus interface.
---
 ...gconfig_variable-for-sysprof-dbusdir.patch | 25 +++++++++++++++++++
 pkgs/desktops/gnome-3/core/mutter/default.nix |  5 ++--
 2 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/desktops/gnome-3/core/mutter/0001-build-use-get_pkgconfig_variable-for-sysprof-dbusdir.patch

diff --git a/pkgs/desktops/gnome-3/core/mutter/0001-build-use-get_pkgconfig_variable-for-sysprof-dbusdir.patch b/pkgs/desktops/gnome-3/core/mutter/0001-build-use-get_pkgconfig_variable-for-sysprof-dbusdir.patch
new file mode 100644
index 00000000000..2df70ff9646
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/mutter/0001-build-use-get_pkgconfig_variable-for-sysprof-dbusdir.patch
@@ -0,0 +1,25 @@
+From 71acfd5258b4d12323fc51dda48e83830e62e696 Mon Sep 17 00:00:00 2001
+From: worldofpeace <worldofpeace@protonmail.ch>
+Date: Mon, 16 Sep 2019 11:18:27 -0400
+Subject: [PATCH] build: use get_pkgconfig_variable for sysprof dbusdir
+
+---
+ src/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/meson.build b/src/meson.build
+index 182f7f5f5..43060865b 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -710,7 +710,7 @@ if have_profiler
+     'backends/meta-profiler.h',
+   ]
+ 
+-  dbus_interfaces_dir = join_paths(datadir, 'dbus-1', 'interfaces')
++  dbus_interfaces_dir = join_paths(sysprof_dep.get_pkgconfig_variable('prefix'), 'share', 'dbus-1', 'interfaces')
+   sysprof3_dbus_file = join_paths(dbus_interfaces_dir, 'org.gnome.Sysprof3.Profiler.xml')
+ 
+   dbus_sysprof3_profiler_built_sources = gnome.gdbus_codegen('meta-dbus-sysprof3-profiler',
+-- 
+2.22.1
+
diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix
index 8022a0b110c..6c4d7a97ba2 100644
--- a/pkgs/desktops/gnome-3/core/mutter/default.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/default.nix
@@ -25,7 +25,6 @@ stdenv.mkDerivation rec {
   mesonFlags = [
     "-Dxwayland-path=${xwayland}/bin/Xwayland"
     "-Dinstalled_tests=false" # TODO: enable these
-    "-Dprofiler=false"
   ];
 
   propagatedBuildInputs = [
@@ -51,7 +50,7 @@ stdenv.mkDerivation rec {
     geocode-glib libinput libgudev libwacom
     libcanberra-gtk3 zenity xkeyboard_config libxkbfile
     libxkbcommon pipewire xwayland
-    gnome-settings-daemon # sysprof
+    gnome-settings-daemon sysprof
   ];
 
   patches = [
@@ -60,6 +59,8 @@ stdenv.mkDerivation rec {
       url = "https://gitlab.gnome.org/GNOME/mutter/commit/850ef518795dcc20d3b9a4f661f70ff8d0ddacb2.patch";
       sha256 = "0cxdbrbcc8kfkvw7ryxjm2v1vk15jki7bawn128385r5hasabhxf";
     })
+   # TODO: submit upstream
+   ./0001-build-use-get_pkgconfig_variable-for-sysprof-dbusdir.patch
     (substituteAll {
       src = ./fix-paths.patch;
       inherit zenity;
-- 
GitLab


From c95786fcfab441ec2426bbccb54c0fb0631463dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Tue, 17 Sep 2019 09:46:10 +0200
Subject: [PATCH 1639/2254] stupidterm: fix build with updated vte

vte no longer propagates pcre2
---
 pkgs/applications/misc/stupidterm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/stupidterm/default.nix b/pkgs/applications/misc/stupidterm/default.nix
index ecaf9d5a34a..a3247b29fb8 100644
--- a/pkgs/applications/misc/stupidterm/default.nix
+++ b/pkgs/applications/misc/stupidterm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, vte, gtk }:
+{ stdenv, fetchFromGitHub, pkgconfig, vte, gtk, pcre2 }:
 
 stdenv.mkDerivation {
   pname = "stupidterm";
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ pkgconfig ];
 
-  buildInputs = [ vte gtk ];
+  buildInputs = [ vte gtk pcre2 ];
 
   src = fetchFromGitHub {
     owner = "esmil";
-- 
GitLab


From a7d9f9096cff1f7eff52fa726609086c9d497671 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Tue, 17 Sep 2019 09:48:07 +0200
Subject: [PATCH 1640/2254] xfce4-14.xfce4-terminal: fix build with updated vte

vte no longer propagates pcre2.
---
 pkgs/desktops/xfce4-14/xfce4-terminal/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce4-14/xfce4-terminal/default.nix b/pkgs/desktops/xfce4-14/xfce4-terminal/default.nix
index 78e98e9ea7d..3b9cd268d55 100644
--- a/pkgs/desktops/xfce4-14/xfce4-terminal/default.nix
+++ b/pkgs/desktops/xfce4-14/xfce4-terminal/default.nix
@@ -1,4 +1,4 @@
-{ mkXfceDerivation, gtk3, libxfce4ui, vte, xfconf }:
+{ mkXfceDerivation, gtk3, libxfce4ui, vte, xfconf, pcre2 }:
 
 mkXfceDerivation {
   category = "apps";
@@ -7,7 +7,7 @@ mkXfceDerivation {
 
   sha256 = "0sg9vwyvhh7pjp83biv7gvf42423a7ly4dc7q2gn28kp6bds2qcp";
 
-  buildInputs = [ gtk3 libxfce4ui vte xfconf ];
+  buildInputs = [ gtk3 libxfce4ui vte xfconf pcre2 ];
 
   meta = {
     description = "A modern terminal emulator";
-- 
GitLab


From 51770cb77e0f440d831f8e9d4fa9a362ffb18d60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Tue, 17 Sep 2019 09:50:31 +0200
Subject: [PATCH 1641/2254] deepin.deepin-terminal: fix build with updated vte

vte no longer propagates pcre2 and gnutls
---
 pkgs/desktops/deepin/deepin-terminal/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/deepin/deepin-terminal/default.nix b/pkgs/desktops/deepin/deepin-terminal/default.nix
index 59789bd84bb..11032fba0e7 100644
--- a/pkgs/desktops/deepin/deepin-terminal/default.nix
+++ b/pkgs/desktops/deepin/deepin-terminal/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pkgconfig, cmake, ninja, vala,
   gettext, at-spi2-core, dbus, epoxy, expect, gtk3, json-glib,
   libXdmcp, libgee, libpthreadstubs, librsvg, libsecret, libtasn1,
-  libxcb, libxkbcommon, p11-kit, pcre, vte, wnck, libselinux,
+  libxcb, libxkbcommon, p11-kit, pcre, vte, wnck, libselinux, gnutls, pcre2,
   libsepol, utillinux, deepin-menu, deepin-shortcut-viewer, deepin, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
@@ -47,6 +47,8 @@ stdenv.mkDerivation rec {
     pcre
     vte
     wnck
+    gnutls
+    pcre2
   ];
 
   postPatch = ''
-- 
GitLab


From ecc32f8df47013ad2208002ea1538fabbbe2cf3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Tue, 17 Sep 2019 09:37:29 +0200
Subject: [PATCH 1642/2254] networkmanager_strongswan: fix build with glib-2.62

---
 pkgs/tools/networking/network-manager/strongswan.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/network-manager/strongswan.nix b/pkgs/tools/networking/network-manager/strongswan.nix
index 60c344e8eb4..448fef4226a 100644
--- a/pkgs/tools/networking/network-manager/strongswan.nix
+++ b/pkgs/tools/networking/network-manager/strongswan.nix
@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ intltool pkgconfig ];
 
-  # Fixes deprecation errors with networkmanager 1.10.2
-  NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations";
+  # glib-2.62 deprecations
+  NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
 
   configureFlags = [
     "--without-libnm-glib"
-- 
GitLab


From cc4c198dcacbbdd6fa49f57b336b2985a35ec34d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Tue, 17 Sep 2019 10:00:56 +0200
Subject: [PATCH 1643/2254] sakura: fix build with updated vte

vte no longer propagates pcre2.
---
 pkgs/applications/misc/sakura/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/sakura/default.nix b/pkgs/applications/misc/sakura/default.nix
index 8510d501942..ede1995f927 100644
--- a/pkgs/applications/misc/sakura/default.nix
+++ b/pkgs/applications/misc/sakura/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, pkgconfig, gtk3, perl, vte, pcre, glib , makeWrapper }:
+{ stdenv, fetchurl, cmake, pkgconfig, gtk3, perl, vte, pcre2, glib , makeWrapper }:
 
 stdenv.mkDerivation rec {
   pname = "sakura";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake perl pkgconfig ];
 
-  buildInputs = [ makeWrapper gtk3 vte pcre glib ];
+  buildInputs = [ makeWrapper gtk3 vte pcre2 glib ];
 
   # Wrapper sets path to gsettings-schemata so sakura knows where to find colorchooser, fontchooser ...
   postInstall = "wrapProgram $out/bin/sakura --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/";
-- 
GitLab


From 1c5dac0fb26463906a9d1af103c5d83b15f62c8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Tue, 17 Sep 2019 09:54:00 +0200
Subject: [PATCH 1644/2254] roxterm: fix build with updated vte

vte no longer propagates pcre2
---
 pkgs/applications/misc/roxterm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/roxterm/default.nix b/pkgs/applications/misc/roxterm/default.nix
index 3dbe7790d18..efd2ddad221 100644
--- a/pkgs/applications/misc/roxterm/default.nix
+++ b/pkgs/applications/misc/roxterm/default.nix
@@ -1,6 +1,6 @@
 { at-spi2-core, cmake, dbus, dbus-glib, docbook_xsl, epoxy, fetchpatch, fetchFromGitHub
 , glib, gtk3, harfbuzz, hicolor-icon-theme, libXdmcp, libXtst, libpthreadstubs
-, libselinux, libsepol, libtasn1, libxkbcommon, libxslt, p11-kit, pcre
+, libselinux, libsepol, libtasn1, libxkbcommon, libxslt, p11-kit, pcre2
 , pkgconfig, stdenv, utillinuxMinimal, vte, wrapGAppsHook, xmlto
 }:
 
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook libxslt ];
 
   buildInputs =
-    [ gtk3 dbus dbus-glib vte pcre harfbuzz libpthreadstubs libXdmcp
+    [ gtk3 dbus dbus-glib vte pcre2 harfbuzz libpthreadstubs libXdmcp
       utillinuxMinimal glib hicolor-icon-theme docbook_xsl xmlto libselinux
       libsepol libxkbcommon epoxy at-spi2-core libXtst libtasn1 p11-kit
     ];
-- 
GitLab


From 8fa7740aa7e02b875fdaf3df974a4ffdf575a5e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Tue, 17 Sep 2019 09:55:46 +0200
Subject: [PATCH 1645/2254] planner: fix build with glib-2.62

---
 pkgs/applications/office/planner/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/office/planner/default.nix b/pkgs/applications/office/planner/default.nix
index 687b83948cd..f454d8830cb 100644
--- a/pkgs/applications/office/planner/default.nix
+++ b/pkgs/applications/office/planner/default.nix
@@ -45,6 +45,9 @@ in stdenv.mkDerivation {
     python2.pkgs.pygtk
   ];
 
+  # glib-2.62 deprecations
+  NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
+
   preConfigure = ''./autogen.sh'';
   configureFlags = [
     "--enable-python"
-- 
GitLab


From f82064919c274a2a759a975e33878b70118c939f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Tue, 17 Sep 2019 09:56:44 +0200
Subject: [PATCH 1646/2254] pidgin-sipe: fix build with glib-2.62

---
 .../instant-messengers/pidgin-plugins/sipe/default.nix         | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
index 5b3e09440a6..6180f531f47 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
@@ -13,6 +13,9 @@ stdenv.mkDerivation rec {
   buildInputs = [ pidgin gmime libxml2 nss ];
   enableParallelBuilding = true;
 
+  # glib-2.62 deprecations
+  NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
+
   postInstall = "find $out -ls; ln -s \$out/lib/purple-2 \$out/share/pidgin-sipe";
 
   meta = with stdenv.lib; {
-- 
GitLab


From e3bece77a7b51ad85c81589809eb498563cccf92 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 17 Sep 2019 19:08:00 -0400
Subject: [PATCH 1647/2254] gnome3.gnome-todo: fix build with libecal 2.0

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

diff --git a/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix b/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix
index dbbbb43659b..f5c4eedc48d 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix
@@ -31,10 +31,11 @@ stdenv.mkDerivation rec {
   };
 
   patches = [
-    # fix build with e-d-s 3.32
+    # fix build with libecal 2.0
     (fetchpatch {
-      url = https://gitlab.gnome.org/GNOME/gnome-todo/commit/6cdabc4dd0c6c804a093b94c269461ce376fed4f.patch;
-      sha256 = "08ldgyxv9216dgr8y9asqd7j2y82y9yqnqhkqaxc9i8a67yz1gzy";
+      name = "gnome-todo-eds-libecal-2.0.patch";
+      url = "https://src.fedoraproject.org/rpms/gnome-todo/raw/bed44b8530f3c79589982e03b430b3a125e9bceb/f/gnome-todo-eds-libecal-2.0.patch";
+      sha256 = "1ghrz973skal36j90wm2z13m3panw983r6y0k7z9gpj5lxgz92mq";
     })
   ];
   postPatch = ''
-- 
GitLab


From a9633e883d18a5bdb668e993b825edda2ac2b13b Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 17 Sep 2019 19:12:04 -0400
Subject: [PATCH 1648/2254] gnome3.nautilus-sendto: remove

Upstream doesn't recommended its use/ it's archived [0]

[0]: https://github.com/GNOME/gnome-build-meta/commit/ba9f5e257cd430d01e7c53aaed8e9a26975760e6
---
 .../gnome-3/apps/nautilus-sendto/default.nix  | 31 -------------------
 pkgs/desktops/gnome-3/default.nix             |  4 +--
 2 files changed, 2 insertions(+), 33 deletions(-)
 delete mode 100644 pkgs/desktops/gnome-3/apps/nautilus-sendto/default.nix

diff --git a/pkgs/desktops/gnome-3/apps/nautilus-sendto/default.nix b/pkgs/desktops/gnome-3/apps/nautilus-sendto/default.nix
deleted file mode 100644
index 7ac8b4dfe11..00000000000
--- a/pkgs/desktops/gnome-3/apps/nautilus-sendto/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv, fetchurl, meson, ninja, glib, pkgconfig, gnome3, appstream-glib, gettext }:
-
-let
-  pname = "nautilus-sendto";
-  version = "3.8.6";
-in stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
-
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/3.8/${name}.tar.xz";
-    sha256 = "164d7c6e8bae29c4579bcc67a7bf50d783662b1545b62f3008e7ea3c0410e04d";
-  };
-
-  nativeBuildInputs = [ meson ninja pkgconfig appstream-glib gettext ];
-  buildInputs = [ glib ];
-
-  passthru = {
-    updateScript = gnome3.updateScript {
-      packageName = pname;
-      attrPath = "gnome3.${pname}";
-    };
-  };
-
-  meta = with stdenv.lib; {
-    description = "Integrates Evolution and Pidgin into the Nautilus file manager";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 370733798af..f082dd1584b 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -215,8 +215,6 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   gnome-weather = callPackage ./apps/gnome-weather { };
 
-  nautilus-sendto = callPackage ./apps/nautilus-sendto { };
-
   polari = callPackage ./apps/polari { };
 
   seahorse = callPackage ./apps/seahorse { };
@@ -356,4 +354,6 @@ lib.makeScope pkgs.newScope (self: with self; {
   corePackages = throw "deprecated 2019-08-25: please use `services.gnome3.core-shell.enable`";
   optionalPackages = throw "deprecated 2019-08-25: please use `services.gnome3.core-utilities.enable`";
   gamesPackages = throw "deprecated 2019-08-25: please use `services.gnome3.games.enable`";
+
+  nautilus-sendto = throw "deprecated 2019-09-17: abandoned";
 })
-- 
GitLab


From 08fc2fc7497470336a9018d8c0f57c8019e32bc9 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 28 Aug 2019 21:46:42 +0200
Subject: [PATCH 1649/2254] gnome-firmware-updater: init at 3.34.0

Co-authored-by: worldofpeace <worldofpeace@protonmail.ch>
---
 .../misc/gnome-firmware-updater/default.nix   | 76 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 78 insertions(+)
 create mode 100644 pkgs/applications/misc/gnome-firmware-updater/default.nix

diff --git a/pkgs/applications/misc/gnome-firmware-updater/default.nix b/pkgs/applications/misc/gnome-firmware-updater/default.nix
new file mode 100644
index 00000000000..f05c5fd210c
--- /dev/null
+++ b/pkgs/applications/misc/gnome-firmware-updater/default.nix
@@ -0,0 +1,76 @@
+{ stdenv
+, fetchFromGitLab
+, fetchpatch
+, appstream-glib
+, desktop-file-utils
+, fwupd
+, gettext
+, glib
+, gnome3
+, gtk3
+, libsoup
+, libxmlb
+, meson
+, ninja
+, pkgconfig
+, systemd
+, help2man
+, wrapGAppsHook
+}:
+
+stdenv.mkDerivation rec {
+  pname = "gnome-firmware-updater";
+  version = "3.34.0";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.gnome.org";
+    owner = "hughsie";
+    repo = "gnome-firmware-updater";
+    rev = version;
+    sha256 = "04pll0fzf4nr276kfw89r0524s6ppmls5rz4vq2j8c8gb50g0b6l";
+  };
+
+  patches = [
+    # Fixes manual build
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/hughsie/gnome-firmware-updater/commit/006b64dcb401d8c81a33222bc4be8274c23f3c9c.patch";
+      sha256 = "02303ip4ri5pv1bls8c0njb00qhn0jd0d8rmvsrig0fmacwfvc06";
+    })
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/hughsie/gnome-firmware-updater/commit/c4f076f2c902080618e0c27dec924fd0019f68a3.patch";
+      sha256 = "1yfxd7qsg3gwpamg0m2sbcfrgks59w70r9728arrc4pwx1hia2q1";
+    })
+  ];
+
+  nativeBuildInputs = [
+    appstream-glib # for ITS rules
+    desktop-file-utils
+    gettext
+    help2man
+    meson
+    ninja
+    pkgconfig
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
+    fwupd
+    glib
+    gtk3
+    libsoup
+    libxmlb
+    systemd
+  ];
+
+  mesonFlags = [
+    "-Dconsolekit=false"
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://gitlab.gnome.org/hughsie/gnome-firmware-updater";
+    description = "Tool for installing firmware on devices";
+    license = licenses.gpl2Plus;
+    maintainers = gnome3.maintainers;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 243883874fc..ea4077a9d23 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9633,6 +9633,8 @@ in
 
   gnome-desktop-testing = callPackage ../development/tools/gnome-desktop-testing {};
 
+  gnome-firmware-updater = callPackage ../applications/misc/gnome-firmware-updater {};
+
   gnome-hexgl = callPackage ../games/gnome-hexgl {};
 
   gnome-usage = callPackage ../applications/misc/gnome-usage {};
-- 
GitLab


From 2e4f06c4d2e3d9746e4ed4a12d9525976c9f2508 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 17 Sep 2019 19:43:18 -0400
Subject: [PATCH 1650/2254] pantheon.elementary-calendar: 5.0 -> 2019-09-17

This is needed for the libical 2.0 compat that landed in master [0]

[0]: https://github.com/elementary/calendar/issues/404
---
 .../desktops/pantheon/apps/elementary-calendar/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
index b806c085f84..72983c8479c 100644
--- a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
@@ -25,21 +25,22 @@
 
 stdenv.mkDerivation rec {
   pname = "elementary-calendar";
-  version = "5.0";
+  version = "unstable-2019-09-17";
 
   repoName = "calendar";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = repoName;
-    rev = version;
-    sha256 = "0yiis5ig98gjw4s2qh8lppkdmv1cgi6qchxqncsjdki7yxyyni35";
+    rev = "46346e48b53e9d3d59d9f567b622532338f50f32"; # needed for libical 2.0 compat
+    sha256 = "04xzczcj5rbzqlhmf175d8p0wzw01s4658v5jllrp8nchmndb986";
   };
 
   passthru = {
     updateScript = pantheon.updateScript {
       inherit repoName;
       attrPath = pname;
+      versionPolicy = "master";
     };
   };
 
-- 
GitLab


From 70f24029dd9c18257566951f8584fa417f57a947 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Wed, 18 Sep 2019 13:42:53 -0400
Subject: [PATCH 1651/2254] gnome3.gnome-sound-recorder: 3.32.1 -> 3.34.0

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

diff --git a/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix b/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix
index 907c0424454..667750b012e 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-sound-recorder";
-  version = "3.32.1";
+  version = "3.34.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0q83b6dabckmwj8mcw0wvhbxaszwdzzcf8ajx5bldll3lyl5yh2b";
+    sha256 = "1i442qas2dkp5d9j9j1z1jicb4cb7jkgbcl4c36bmhvaq3hddwa9";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From d82ed7e741780184a029419f2a4f46a9557f2aee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Wed, 18 Sep 2019 09:04:26 +0200
Subject: [PATCH 1652/2254] lxqt-archiver: 0.0.96 -> 2019-09-15

fix build with glib-2.62
---
 pkgs/desktops/lxqt/lxqt-archiver/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-archiver/default.nix b/pkgs/desktops/lxqt/lxqt-archiver/default.nix
index da90826116f..07a603364d7 100644
--- a/pkgs/desktops/lxqt/lxqt-archiver/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-archiver/default.nix
@@ -1,13 +1,14 @@
 { lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, json-glib, libfm-qt, qtbase, qttools, qtx11extras }:
 
 mkDerivation rec {
-  pname = "lxqt-archiver";
-  version = "0.0.96";
+  # pname = "lxqt-archiver";
+  pname = "lxqt-archiver-unstable";
+  version = "2019-09-15";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
-    rev = version;
+    rev = "1e657b6a3e68c32f042d583872eca39a5d4b820f";
     sha256 = "1vc9pzxrhznp65gdkzj3fzzivfqy712mwcxp3r25ar59d54alfpj";
   };
 
-- 
GitLab


From 393e96b3fac51139c134209c5d4f2738506b140e Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 18 Sep 2019 13:01:09 -0500
Subject: [PATCH 1653/2254] gtk3: 3.24.10 -> 3.24.11

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

diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix
index aee97d9bad0..3f599a7846f 100644
--- a/pkgs/development/libraries/gtk/3.x.nix
+++ b/pkgs/development/libraries/gtk/3.x.nix
@@ -45,7 +45,7 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "gtk+3";
-  version = "3.24.10";
+  version = "3.24.11";
 
   outputs = [ "out" "dev" ];
   outputBin = "dev";
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtk+/${stdenv.lib.versions.majorMinor version}/gtk+-${version}.tar.xz";
-    sha256 = "00qvq1r96ikdalv7xzgng1kad9i0rcahqk01gwhxl3xrw83z3a1m";
+    sha256 = "1598k357xvffbswsrvc63lyj73wq0b510lhg4vcgl6rf1a6nb9yv";
   };
 
   patches = [
-- 
GitLab


From ec52a8a1ef0a686e1a2b028a358527f6a11abc34 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Wed, 18 Sep 2019 19:48:32 -0400
Subject: [PATCH 1654/2254] glibmm: 2.60.0 -> 2.62.0

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

diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix
index 829dca04c18..18963e31b6e 100644
--- a/pkgs/development/libraries/glibmm/default.nix
+++ b/pkgs/development/libraries/glibmm/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "glibmm";
-  version = "2.60.0";
+  version = "2.62.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1g7jxqd270dv2d83r7pf5893mwpz7d5xib0q01na2yalh34v38d3";
+    sha256 = "1ziwx6r7k7wbvg4qq1rgrv8zninapgrmhn1hs6926a3krh9ryr9n";
   };
 
   outputs = [ "out" "dev" ];
-- 
GitLab


From edc4d08f45feb6f0a4542e47b7ee2699d96ba182 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Wed, 18 Sep 2019 23:50:20 -0400
Subject: [PATCH 1655/2254] vala_0_44: 0.44.6 -> 0.44.7

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

diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix
index 15ed7f8bd29..9c07745e9ee 100644
--- a/pkgs/development/compilers/vala/default.nix
+++ b/pkgs/development/compilers/vala/default.nix
@@ -129,8 +129,8 @@ in rec {
   };
 
   vala_0_44 = generic {
-    version = "0.44.6";
-    sha256 = "0fkrrpnisgq3y816piyr7hm2b94jaj7ki9y974galq3lmxb1g7xb";
+    version = "0.44.7";
+    sha256 = "0z5xy4qc95rm2gj7s2k14xm1xp3mrf0yz64fx4kddqjxkpsz87xz";
   };
 
   vala = vala_0_44;
-- 
GitLab


From 14bcc08c434b98a344d61947d36d16c59a466eb4 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Wed, 18 Sep 2019 23:53:21 -0400
Subject: [PATCH 1656/2254] vala_0_38: remove

---
 pkgs/development/compilers/vala/default.nix | 10 ----------
 pkgs/top-level/all-packages.nix             |  1 -
 2 files changed, 11 deletions(-)

diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix
index 9c07745e9ee..4b1bf69f4e2 100644
--- a/pkgs/development/compilers/vala/default.nix
+++ b/pkgs/development/compilers/vala/default.nix
@@ -22,10 +22,6 @@ let
         };
 
       in {
-        "0.38" = fp {
-          commit = "2c290f7253bba5ceb0d32e7d0b0ec0d0e81cc263";
-          sha256 = "056ybapfx18d7xw1k8k85nsjrc26qk2q2d9v9nz2zrcwbq5brhkp";
-        };
 
         # NOTE: the openembedded-core project doesn't have a patch for 0.40.12
         # We've fixed the single merge conflict in the following patch.
@@ -112,12 +108,6 @@ in rec {
     sha256 = "05si2f4zjvq0q3wqfh1wxdq20jy1xqxq2skqh8vfh2jyp355lwar";
   };
 
-  vala_0_38 = generic {
-    version = "0.38.10";
-    sha256  = "1rdwwqs973qv225v8b5izcgwvqn56jxgr4pa3wxxbliar3aww5sw";
-    extraNativeBuildInputs = [ autoconf ] ++ lib.optional stdenv.isDarwin libtool;
-  };
-
   vala_0_40 = generic {
     version = "0.40.16";
     sha256 = "0vv25fmr9jqiqf080vak1x4raa4w3cz3n5ysjglqsq9qfx304i7b";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ea4077a9d23..46669739021 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8517,7 +8517,6 @@ in
 
   inherit (callPackage ../development/compilers/vala { })
     vala_0_36
-    vala_0_38
     vala_0_40
     vala_0_42
     vala_0_44
-- 
GitLab


From 6b4bdd626b128a8e8c9927c6361b29990a46a477 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Wed, 18 Sep 2019 23:54:44 -0400
Subject: [PATCH 1657/2254] vala_0_36: 0.36.19 -> 0.36.20

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

diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix
index 4b1bf69f4e2..ea134f5aa8d 100644
--- a/pkgs/development/compilers/vala/default.nix
+++ b/pkgs/development/compilers/vala/default.nix
@@ -104,8 +104,8 @@ let
 
 in rec {
   vala_0_36 = generic {
-    version = "0.36.19";
-    sha256 = "05si2f4zjvq0q3wqfh1wxdq20jy1xqxq2skqh8vfh2jyp355lwar";
+    version = "0.36.20";
+    sha256 = "19v7zjhr9yxkh9lxg46n9gjr0lb7j6v0xqfhrdvgz18xhj3hm5my";
   };
 
   vala_0_40 = generic {
-- 
GitLab


From 2c4fd1512cc143ec2f0607887ffb7d375a01c056 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Thu, 19 Sep 2019 00:09:18 -0400
Subject: [PATCH 1658/2254] vala_0_46: init at 0.46.1

---
 pkgs/development/compilers/vala/default.nix   |   7 +
 .../vala/disable-graphviz-0.46.1.patch        | 261 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   1 +
 3 files changed, 269 insertions(+)
 create mode 100644 pkgs/development/compilers/vala/disable-graphviz-0.46.1.patch

diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix
index ea134f5aa8d..eeb4b5431fe 100644
--- a/pkgs/development/compilers/vala/default.nix
+++ b/pkgs/development/compilers/vala/default.nix
@@ -39,6 +39,8 @@ let
         #     0.42.4: https://github.com/openembedded/openembedded-core/raw/f2b4f9ec6f44dced7f88df849cca68961419eeb8/meta/recipes-devtools/vala/vala/disable-graphviz.patch
         "0.44" = ./disable-graphviz-0.44.3.patch;
 
+        "0.46" = ./disable-graphviz-0.46.1.patch;
+
       }.${lib.versions.majorMinor version} or (throw "no graphviz patch for this version of vala");
 
     disableGraphviz = lib.versionAtLeast version "0.38" && !withGraphviz;
@@ -123,5 +125,10 @@ in rec {
     sha256 = "0z5xy4qc95rm2gj7s2k14xm1xp3mrf0yz64fx4kddqjxkpsz87xz";
   };
 
+  vala_0_46 = generic {
+    version = "0.46.1";
+    sha256 = "10czkhclnisdz6k5qfiicmvx47m9177l5dkhjn29g43khnmpkr8l";
+  };
+
   vala = vala_0_44;
 }
diff --git a/pkgs/development/compilers/vala/disable-graphviz-0.46.1.patch b/pkgs/development/compilers/vala/disable-graphviz-0.46.1.patch
new file mode 100644
index 00000000000..8c3e54b6a95
--- /dev/null
+++ b/pkgs/development/compilers/vala/disable-graphviz-0.46.1.patch
@@ -0,0 +1,261 @@
+diff --git a/Makefile.am b/Makefile.am
+index f70234759..b3d6c3833 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -13,19 +13,9 @@ SUBDIRS = \
+ 	doc \
+ 	gobject-introspection \
+ 	vapigen \
+-	$(NULL)
+-
+-if ENABLE_VALADOC
+-SUBDIRS += \
+ 	libvaladoc \
+ 	valadoc \
+ 	$(NULL)
+-endif
+-
+-DISTCHECK_CONFIGURE_FLAGS = \
+-	--enable-valadoc \
+-	--enable-unversioned \
+-	$(NULL)
+ 
+ if ENABLE_UNVERSIONED
+ aclocaldir = $(datadir)/aclocal
+diff --git a/configure.ac b/configure.ac
+index 6de326bbb..91f159b16 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -160,10 +160,11 @@ AC_SUBST(GMODULE_CFLAGS)
+ AC_SUBST(GMODULE_LIBS)
+ 
+ AC_ARG_WITH(cgraph, AS_HELP_STRING([--with-cgraph], [Required flag for cross-compilation to define capability of graphviz]), [], with_cgraph=check)
+-AC_ARG_ENABLE(valadoc, AS_HELP_STRING([--disable-valadoc], [Disable valadoc]), enable_valadoc=$enableval, enable_valadoc=yes)
+-if test x$enable_valadoc = xyes; then
++AC_ARG_ENABLE(graphviz, AS_HELP_STRING([--disable-graphviz], [Disable graphviz usage for valadoc]), enable_graphviz=$enableval, enable_graphviz=yes)
++if test x$enable_graphviz = xyes; then
+ 	PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED)
+ 	AC_MSG_CHECKING([for CGRAPH])
++	VALAFLAGS="$VALAFLAGS -D HAVE_GRAPHVIZ"
+ 	cgraph_tmp_LIBADD="$LIBADD"
+ 	cgraph_tmp_CFLAGS="$CFLAGS"
+ 	LIBADD="$LIBADD $LIBGVC_LIBS"
+@@ -201,8 +202,8 @@ if test x$enable_valadoc = xyes; then
+ 	LIBADD="$cgraph_tmp_LIBADD"
+ 	CFLAGS="$cgraph_tmp_CFLAGS"
+ fi
++AM_CONDITIONAL(ENABLE_GRAPHVIZ, test x$enable_graphviz = xyes)
+ AM_CONDITIONAL(HAVE_CGRAPH, test "$have_cgraph" = "yes")
+-AM_CONDITIONAL(ENABLE_VALADOC, test x$enable_valadoc = xyes)
+ 
+ AC_PATH_PROG([XSLTPROC], [xsltproc], :)
+ AM_CONDITIONAL(HAVE_XSLTPROC, test "$XSLTPROC" != :)
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index d2684a0e0..b343c7c10 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -6,16 +6,11 @@ SUBDIRS = \
+ 
+ dist_man_MANS = \
+ 	valac.1 \
++	valadoc.1 \
+ 	vala-gen-introspect.1 \
+ 	vapigen.1 \
+ 	$(NULL)
+ 
+-if ENABLE_VALADOC
+-dist_man_MANS += \
+-	valadoc.1 \
+-	$(NULL)
+-endif
+-
+ EXTRA_DIST = \
+ 	valac.h2m \
+ 	valadoc.h2m \
+@@ -24,11 +19,7 @@ EXTRA_DIST = \
+ 	$(NULL)
+ 
+ if HAVE_HELP2MAN
+-if ENABLE_VALADOC
+ manpages: valac.1 valadoc.1 vala-gen-introspect.1 vapigen.1
+-else
+-manpages: valac.1 vala-gen-introspect.1 vapigen.1
+-endif
+ 	@rm $^
+ 	$(MAKE) $(AM_MAKEFLAGS) $^
+ 
+@@ -37,13 +28,11 @@ valac.1:
+ 		--include $(srcdir)/valac.h2m \
+ 		--libtool --no-info \
+ 		--output=$@
+-if ENABLE_VALADOC
+ valadoc.1:
+ 	$(HELP2MAN) $(top_builddir)/valadoc/valadoc \
+ 		--include $(srcdir)/valadoc.h2m \
+ 		--libtool --no-info \
+ 		--output=$@
+-endif
+ vala-gen-introspect.1:
+ 	$(HELP2MAN) $(top_builddir)/gobject-introspection/gen-introspect \
+ 		--include $(srcdir)/vala-gen-introspect.h2m \
+@@ -60,15 +49,12 @@ endif
+ if ENABLE_UNVERSIONED
+ install-data-hook:
+ 	cd $(DESTDIR)$(man1dir) && $(LN_S) -f valac@PACKAGE_SUFFIX@.1 valac.1
+-if ENABLE_VALADOC
+ 	cd $(DESTDIR)$(man1dir) && $(LN_S) -f valadoc@PACKAGE_SUFFIX@.1 valadoc.1
+-endif
+ 	cd $(DESTDIR)$(man1dir) && $(LN_S) -f vala-gen-introspect@PACKAGE_SUFFIX@.1 vala-gen-introspect.1
+ 	cd $(DESTDIR)$(man1dir) && $(LN_S) -f vapigen@PACKAGE_SUFFIX@.1 vapigen.1
+ endif
+ 
+ 
+-if ENABLE_VALADOC
+ COMMON_VALADOCFLAGS = \
+ 	--force \
+ 	--verbose \
+@@ -150,7 +136,6 @@ internal-apis/valadoc: $(valadoc_VALASOURCES) internal-apis/codegen
+ 	@touch $@
+ 
+ internal-api-docs: internal-apis/gee internal-apis/vala internal-apis/ccode internal-apis/codegen internal-apis/valadoc
+-endif
+ 
+ clean-local:
+ 	rm -rf $(builddir)/internal-apis
+diff --git a/libvaladoc/Makefile.am b/libvaladoc/Makefile.am
+index 8a3924b54..81fde9ac8 100644
+--- a/libvaladoc/Makefile.am
++++ b/libvaladoc/Makefile.am
+@@ -119,10 +119,6 @@ libvaladoc_la_VALASOURCES = \
+ 	content/tablerow.vala \
+ 	content/taglet.vala \
+ 	content/text.vala \
+-	charts/chart.vala \
+-	charts/chartfactory.vala \
+-	charts/hierarchychart.vala \
+-	charts/simplechartfactory.vala \
+ 	parser/manyrule.vala \
+ 	parser/oneofrule.vala \
+ 	parser/optionalrule.vala \
+@@ -149,13 +145,24 @@ libvaladoc_la_VALASOURCES = \
+ 	highlighter/codetoken.vala \
+ 	highlighter/highlighter.vala \
+ 	html/basicdoclet.vala \
+-	html/htmlchartfactory.vala \
+ 	html/linkhelper.vala \
+ 	html/cssclassresolver.vala \
+ 	html/htmlmarkupwriter.vala \
+ 	html/htmlrenderer.vala \
+ 	$(NULL)
+ 
++if ENABLE_GRAPHVIZ
++libvaladoc_la_VALASOURCES += \
++	charts/chart.vala \
++	charts/chartfactory.vala \
++	charts/hierarchychart.vala \
++	charts/simplechartfactory.vala \
++	html/htmlchartfactory.vala \
++	$(NULL)
++
++LIBGVC_PKG = --vapidir $(top_srcdir)/vapi --pkg libgvc
++endif
++
+ libvaladoc@PACKAGE_SUFFIX@_la_SOURCES = \
+ 	libvaladoc.vala.stamp \
+ 	$(libvaladoc_la_VALASOURCES:.vala=.c) \
+@@ -175,11 +182,11 @@ libvaladoc.vala.stamp: $(libvaladoc_la_VALASOURCES)
+ 		--library valadoc \
+ 		--vapi valadoc@PACKAGE_SUFFIX@.vapi \
+ 		--vapidir $(top_srcdir)/vapi --pkg gmodule-2.0 \
+-		--vapidir $(top_srcdir)/vapi --pkg libgvc \
+ 		--vapidir $(top_srcdir)/gee --pkg gee \
+ 		--vapidir $(top_srcdir)/vala --pkg vala \
+ 		--vapidir $(top_srcdir)/ccode --pkg ccode \
+ 		--vapidir $(top_srcdir)/codegen --pkg codegen \
++		$(LIBGVC_PKG) \
+ 		--pkg config \
+ 		$(filter %.vala %.c,$^)
+ 	touch $@
+@@ -207,6 +214,9 @@ nodist_pkgconfig_DATA = valadoc@PACKAGE_SUFFIX@.pc
+ 
+ valadoc@PACKAGE_SUFFIX@.pc: valadoc.pc
+ 	cp $< $@
++if !ENABLE_GRAPHVIZ
++	sed -i "s/libgvc //g" $@
++endif
+ 
+ vapidir = $(datadir)/vala/vapi
+ dist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.vapi
+@@ -214,6 +224,9 @@ nodist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.deps
+ 
+ valadoc@PACKAGE_SUFFIX@.deps: valadoc.deps
+ 	cp $< $@
++if !ENABLE_GRAPHVIZ
++	sed -i "s/libgvc//g" $@
++endif
+ 
+ EXTRA_DIST = \
+ 	$(libvaladoc_la_VALASOURCES) \
+diff --git a/libvaladoc/html/basicdoclet.vala b/libvaladoc/html/basicdoclet.vala
+index 46578c28f..f6ce7097c 100644
+--- a/libvaladoc/html/basicdoclet.vala
++++ b/libvaladoc/html/basicdoclet.vala
+@@ -46,7 +46,11 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
+ 	protected HtmlRenderer _renderer;
+ 	protected Html.MarkupWriter writer;
+ 	protected Html.CssClassResolver cssresolver;
++#if HAVE_GRAPHVIZ
+ 	protected Charts.Factory image_factory;
++#else
++	protected void* image_factory;
++#endif
+ 	protected ErrorReporter reporter;
+ 	protected string package_list_link = "../index.html";
+ 
+@@ -120,7 +124,9 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
+ 		this.linker = new LinkHelper ();
+ 
+ 		_renderer = new HtmlRenderer (settings, this.linker, this.cssresolver);
++#if HAVE_GRAPHVIZ
+ 		this.image_factory = new SimpleChartFactory (settings, linker);
++#endif
+ 	}
+ 
+ 
+@@ -1025,6 +1031,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
+ 	}
+ 
+ 	protected void write_image_block (Api.Node element) {
++#if HAVE_GRAPHVIZ
+ 		if (element is Class || element is Interface || element is Struct) {
+ 			unowned string format = (settings.use_svg_images ? "svg" : "png");
+ 			var chart = new Charts.Hierarchy (image_factory, element);
+@@ -1044,6 +1051,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
+ 									   this.get_img_path_html (element, format)});
+ 			writer.add_usemap (chart);
+ 		}
++#endif
+ 	}
+ 
+ 	public void write_namespace_content (Namespace node, Api.Node? parent) {
+diff --git a/libvaladoc/html/htmlmarkupwriter.vala b/libvaladoc/html/htmlmarkupwriter.vala
+index 5aa4afdea..e79b0b8f5 100644
+--- a/libvaladoc/html/htmlmarkupwriter.vala
++++ b/libvaladoc/html/htmlmarkupwriter.vala
+@@ -51,12 +51,16 @@ public class Valadoc.Html.MarkupWriter : Valadoc.MarkupWriter {
+ 		}
+ 	}
+ 
++#if HAVE_GRAPHVIZ
+ 	public unowned MarkupWriter add_usemap (Charts.Chart chart) {
+ 		string? buf = (string?) chart.write_buffer ("cmapx");
+ 		if (buf != null) {
+ 			raw_text ("\n");
+ 			raw_text ((!) buf);
+ 		}
++#else
++	public unowned MarkupWriter add_usemap (void* chart) {
++#endif
+ 
+ 		return this;
+ 	}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 46669739021..033d978b1af 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8520,6 +8520,7 @@ in
     vala_0_40
     vala_0_42
     vala_0_44
+    vala_0_46
     vala;
 
   valadoc = callPackage ../development/tools/valadoc { };
-- 
GitLab


From 628bb2ae0a5f33cfe81c0eb3fa62faf0e4121513 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Thu, 19 Sep 2019 00:13:17 -0400
Subject: [PATCH 1659/2254] vala_0_42: remove

---
 pkgs/desktops/deepin/default.nix            |  2 +-
 pkgs/development/compilers/vala/default.nix | 10 ----------
 pkgs/top-level/all-packages.nix             |  1 -
 3 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix
index 869f08154bb..61db4ca0571 100644
--- a/pkgs/desktops/deepin/default.nix
+++ b/pkgs/desktops/deepin/default.nix
@@ -39,7 +39,7 @@ let
     deepin-turbo = callPackage ./deepin-turbo { };
     deepin-wallpapers = callPackage ./deepin-wallpapers { };
     deepin-wm = callPackage ./deepin-wm {
-      vala = pkgs.vala_0_42;
+      vala = pkgs.vala_0_40;
     };
     dpa-ext-gnomekeyring = callPackage ./dpa-ext-gnomekeyring { };
     dtkcore = callPackage ./dtkcore { };
diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix
index eeb4b5431fe..9f4d8b66860 100644
--- a/pkgs/development/compilers/vala/default.nix
+++ b/pkgs/development/compilers/vala/default.nix
@@ -28,11 +28,6 @@ let
         #     0.40.12: https://github.com/openembedded/openembedded-core/raw/8553c52f174af4c8c433c543f806f5ed5c1ec48c/meta/recipes-devtools/vala/vala/disable-graphviz.patch
         "0.40" = ./disable-graphviz-0.40.12.patch;
 
-        "0.42" = fp {
-          commit = "f2b4f9ec6f44dced7f88df849cca68961419eeb8";
-          sha256 = "112qhdzix0d7lfpfcam1cxprzmfzpwypb1226m5ma1vq9qy0sn7g";
-        };
-
         # NOTE: the openembedded-core project doesn't have a patch for 0.44.1
         # We've reverted the addition of the "--disable-valadoc" option
         # and then applied the following patch.
@@ -115,11 +110,6 @@ in rec {
     sha256 = "0vv25fmr9jqiqf080vak1x4raa4w3cz3n5ysjglqsq9qfx304i7b";
   };
 
-  vala_0_42 = generic {
-    version = "0.42.7";
-    sha256 = "029ksbsdpl581wzy570kj4kkw8b4bizgh494c051zsvkwck55p83";
-  };
-
   vala_0_44 = generic {
     version = "0.44.7";
     sha256 = "0z5xy4qc95rm2gj7s2k14xm1xp3mrf0yz64fx4kddqjxkpsz87xz";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 033d978b1af..72c818a455e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8518,7 +8518,6 @@ in
   inherit (callPackage ../development/compilers/vala { })
     vala_0_36
     vala_0_40
-    vala_0_42
     vala_0_44
     vala_0_46
     vala;
-- 
GitLab


From 9e6896cb59a0f948b3d8ddf7dd7b302ed5b728b0 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Thu, 19 Sep 2019 00:26:36 -0400
Subject: [PATCH 1660/2254] vala: use vala_0_46

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

diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix
index 9f4d8b66860..9714a8ebd50 100644
--- a/pkgs/development/compilers/vala/default.nix
+++ b/pkgs/development/compilers/vala/default.nix
@@ -120,5 +120,5 @@ in rec {
     sha256 = "10czkhclnisdz6k5qfiicmvx47m9177l5dkhjn29g43khnmpkr8l";
   };
 
-  vala = vala_0_44;
+  vala = vala_0_46;
 }
-- 
GitLab


From 25e4163914bfa51682ec1b87ab8d3e41bd87ad76 Mon Sep 17 00:00:00 2001
From: Victor SENE <victor@sene.ovh>
Date: Mon, 30 Sep 2019 20:47:33 +0200
Subject: [PATCH 1661/2254] jackett: 0.11.687 -> 0.11.751

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

diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix
index 6aaae932906..c5c97b51422 100644
--- a/pkgs/servers/jackett/default.nix
+++ b/pkgs/servers/jackett/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "jackett";
-  version = "0.11.687";
+  version = "0.11.751";
 
   src = fetchurl {
     url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.LinuxAMDx64.tar.gz";
-    sha256 = "0wq6rc12dn5yxa6yyabv234xw5nrsbvlrpgfjppvw3i4vy2cfzh9";
+    sha256 = "09y9pck35pj2g89936zallxr3hanmbgp8jc42nj2js68l0z64qz3";
   };
 
   buildInputs = [ makeWrapper ];
-- 
GitLab


From 5afde25a10185b56f348eb6112656ed9ef2d4bb0 Mon Sep 17 00:00:00 2001
From: Jonathan Marler <johnnymarler@gmail.com>
Date: Mon, 30 Sep 2019 08:27:19 -0600
Subject: [PATCH 1662/2254] maintainers: add jonathanmarler

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index b777d37d764..33837ea1b32 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3144,6 +3144,11 @@
     githubId = 392720;
     name = "Jon Banafato";
   };
+  jonathanmarler = {
+    email = "johnnymarler@gmail.com";
+    github = "marler8997";
+    name = "Jonathan Marler";
+  };
   jonathanreeve = {
     email = "jon.reeve@gmail.com";
     github = "JonathanReeve";
-- 
GitLab


From 6ce605e18da7a4b4ef76c47cde8882f322eee3e7 Mon Sep 17 00:00:00 2001
From: AmineChikhaoui <amine.chikhaoui91@gmail.com>
Date: Sat, 28 Sep 2019 11:57:19 -0400
Subject: [PATCH 1663/2254] sdImage: add option to enable bzip2 compression

also make SD image compression the default setup.
Fixes issues with output size such as: https://hydra.nixos.org/build/102163603
---
 nixos/doc/manual/release-notes/rl-2003.xml  |  2 +-
 nixos/modules/installer/cd-dvd/sd-image.nix | 19 +++++++++++++++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml
index c84bc8dbb37..2bbc42bbec6 100644
--- a/nixos/doc/manual/release-notes/rl-2003.xml
+++ b/nixos/doc/manual/release-notes/rl-2003.xml
@@ -73,7 +73,7 @@
 
   <itemizedlist>
    <listitem>
-    <para />
+     <para>SD images are now compressed by default using <literal>bzip2</literal>.</para>
    </listitem>
   </itemizedlist>
  </section>
diff --git a/nixos/modules/installer/cd-dvd/sd-image.nix b/nixos/modules/installer/cd-dvd/sd-image.nix
index a2a8e8ef752..d510f3b2daf 100644
--- a/nixos/modules/installer/cd-dvd/sd-image.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image.nix
@@ -98,6 +98,16 @@ in
         populate the ./files/boot (/boot) directory.
       '';
     };
+
+    compressImage = mkOption {
+      type = types.bool;
+      default = true;
+      description = ''
+        Whether the SD image should be compressed using
+        <command>bzip2</command>.
+      '';
+    };
+
   };
 
   config = {
@@ -118,10 +128,12 @@ in
 
     sdImage.storePaths = [ config.system.build.toplevel ];
 
-    system.build.sdImage = pkgs.callPackage ({ stdenv, dosfstools, e2fsprogs, mtools, libfaketime, utillinux }: stdenv.mkDerivation {
+    system.build.sdImage = pkgs.callPackage ({ stdenv, dosfstools, e2fsprogs, mtools, libfaketime, utillinux, bzip2 }: stdenv.mkDerivation {
       name = config.sdImage.imageName;
 
-      nativeBuildInputs = [ dosfstools e2fsprogs mtools libfaketime utillinux ];
+      nativeBuildInputs = [ dosfstools e2fsprogs mtools libfaketime utillinux bzip2 ];
+
+      inherit (config.sdImage) compressImage;
 
       buildCommand = ''
         mkdir -p $out/nix-support $out/sd-image
@@ -168,6 +180,9 @@ in
         # Verify the FAT partition before copying it.
         fsck.vfat -vn firmware_part.img
         dd conv=notrunc if=firmware_part.img of=$img seek=$START count=$SECTORS
+        if test -n "$compressImage"; then
+            bzip2 $img
+        fi
       '';
     }) {};
 
-- 
GitLab


From c2ef0a08756863e09ec85d8b6b2c2f58dbd23495 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 23 Sep 2019 19:55:47 +0000
Subject: [PATCH 1664/2254] =?UTF-8?q?ocamlPackages.camlpdf:=202.2.1=20?=
 =?UTF-8?q?=E2=86=92=202.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocaml-modules/camlpdf/default.nix         | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/ocaml-modules/camlpdf/default.nix b/pkgs/development/ocaml-modules/camlpdf/default.nix
index a0a00472a4d..e1e213eca78 100644
--- a/pkgs/development/ocaml-modules/camlpdf/default.nix
+++ b/pkgs/development/ocaml-modules/camlpdf/default.nix
@@ -1,15 +1,20 @@
-{ stdenv, fetchgit, ocaml, findlib, ncurses }:
+{ stdenv, fetchFromGitHub, ocaml, findlib }:
+
+if !stdenv.lib.versionAtLeast ocaml.version "4.02"
+then throw "camlpdf is not available for OCaml ${ocaml.version}"
+else
 
 stdenv.mkDerivation rec {
-  version = "2.2.1";
+  version = "2.3";
   name = "ocaml${ocaml.version}-camlpdf-${version}";
-  src = fetchgit {
-    url = https://github.com/johnwhitington/camlpdf.git;
-    rev = "refs/tags/v${version}";
-    sha256 = "0wa4rw8ccpb8xprslg88hbk352bi8bia4iffc22y55gkjr60f8gj";
+  src = fetchFromGitHub {
+    owner = "johnwhitington";
+    repo = "camlpdf";
+    rev = "v${version}";
+    sha256 = "1z8h6bjzmlscr6h6kdvzj8kspifb4n9dg7zi54z1cv2qi03kr8dk";
   };
 
-  buildInputs = [ ocaml findlib ncurses ];
+  buildInputs = [ ocaml findlib ];
 
   # Version number in META file is wrong
   patchPhase = ''
@@ -21,12 +26,6 @@ stdenv.mkDerivation rec {
     EOF
   '';
 
-  makeFlags = with stdenv.lib;
-  optionals (versionAtLeast ocaml.version "4.06") [
-    "OCAMLBCFLAGS+=-unsafe-string"
-    "OCAMLNCFLAGS+=-unsafe-string"
-  ];
-
   createFindlibDestdir = true;
 
   meta = with stdenv.lib; {
-- 
GitLab


From 2f43ae44c518e3901fb105213ba70235041504a6 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 23 Sep 2019 19:55:58 +0000
Subject: [PATCH 1665/2254] =?UTF-8?q?ocamlPackages.cpdf:=202.2.1=20?=
 =?UTF-8?q?=E2=86=92=202.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocaml-modules/cpdf/default.nix            | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/ocaml-modules/cpdf/default.nix b/pkgs/development/ocaml-modules/cpdf/default.nix
index b6473126158..5df15316e32 100644
--- a/pkgs/development/ocaml-modules/cpdf/default.nix
+++ b/pkgs/development/ocaml-modules/cpdf/default.nix
@@ -1,25 +1,20 @@
-{ stdenv, fetchgit, ocaml, findlib, camlpdf, ncurses }:
+{ stdenv, fetchFromGitHub, ocaml, findlib, camlpdf, ncurses }:
 
-let version = "2.2.1"; in
+let version = "2.3"; in
 
 stdenv.mkDerivation {
   name = "ocaml${ocaml.version}-cpdf-${version}";
 
-  src = fetchgit {
-    url = https://github.com/johnwhitington/cpdf-source.git;
-    rev = "refs/tags/v${version}";
-    sha256 = "1i2z417agnzzdavjfwb20r6716jl3sk5yi43ssy4jqzy6ah8x1ff";
+  src = fetchFromGitHub {
+    owner = "johnwhitington";
+    repo = "cpdf-source";
+    rev = "v${version}";
+    sha256 = "0i976y1v0l7x7k2n8k6v0h4bw9zlxsv04y4fdxss6dzpsfz49w23";
   };
 
   buildInputs = [ ocaml findlib ncurses ];
   propagatedBuildInputs = [ camlpdf ];
 
-  makeFlags = with stdenv.lib;
-  optionals (versionAtLeast ocaml.version "4.06") [
-    "OCAMLBCFLAGS+=-unsafe-string"
-    "OCAMLNCFLAGS+=-unsafe-string"
-  ];
-
   createFindlibDestdir = true;
 
   postInstall = ''
-- 
GitLab


From 70d08871da69299d167e3dee779440b2b21d7037 Mon Sep 17 00:00:00 2001
From: Victor SENE <victor@sene.ovh>
Date: Mon, 30 Sep 2019 22:09:25 +0200
Subject: [PATCH 1666/2254] nexcloud: 16.0.4 -> 16.0.5

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

diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix
index 69b1f28d2d6..c99ccc6e3cc 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "nextcloud";
-  version = "16.0.4";
+  version = "16.0.5";
 
   src = fetchurl {
     url = "https://download.nextcloud.com/server/releases/${pname}-${version}.tar.bz2";
-    sha256 = "1l7ckzyqz7g4ny8s2q4xal72p57ldfjs947sk2ya2df93qjh0qz0";
+    sha256 = "0lg5zaakfdngrh0ida0qbq76jbiab5fv46jziqf77zbnlx7wc2c7";
   };
 
   installPhase = ''
-- 
GitLab


From 5d761d985b1032212b3c4c18820cc67236059b68 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 30 Sep 2019 10:17:58 -0700
Subject: [PATCH 1667/2254] pythonPackages.supervisor: fix tests

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

diff --git a/pkgs/development/python-modules/supervisor/default.nix b/pkgs/development/python-modules/supervisor/default.nix
index e7bbb57cedc..18ab5bca7ea 100644
--- a/pkgs/development/python-modules/supervisor/default.nix
+++ b/pkgs/development/python-modules/supervisor/default.nix
@@ -1,6 +1,7 @@
-{ lib, buildPythonPackage, isPy3k, fetchPypi
+{ stdenv, lib, buildPythonPackage, isPy3k, fetchPypi
 , mock
 , meld3
+, pytest
 , setuptools
 }:
 
@@ -13,7 +14,13 @@ buildPythonPackage rec {
     sha256 = "02pindhq84hb9a7ykyaqw8i2iqb21h69lpmclyqh7fm1446rji4n";
   };
 
-  checkInputs = [ mock ];
+  # wants to write to /tmp/foo which is likely already owned by another
+  # nixbld user on hydra
+  doCheck = !stdenv.isDarwin;
+  checkInputs = [ mock pytest ];
+  checkPhase = ''
+    pytest
+  '';
 
   propagatedBuildInputs = [ meld3 setuptools ];
 
-- 
GitLab


From 3090637d82b4a754b0fdf93238b36452a78ca7a6 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 30 Sep 2019 13:59:51 -0700
Subject: [PATCH 1668/2254] pythonPackages.ephem: 3.7.6.0 -> 3.7.7.0

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

diff --git a/pkgs/development/python-modules/ephem/default.nix b/pkgs/development/python-modules/ephem/default.nix
index 742fdb83b72..9069bef68e0 100644
--- a/pkgs/development/python-modules/ephem/default.nix
+++ b/pkgs/development/python-modules/ephem/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "ephem";
-  version = "3.7.6.0";
+  version = "3.7.7.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7a4c82b1def2893e02aec0394f108d24adb17bd7b0ca6f4bc78eb7120c0212ac";
+    sha256 = "0dj4kk325b01s7q1zkwpm9rrzl7n1jf7fr92wcajjhc5kx14hwb0";
   };
 
   patchFlags = "-p0";
@@ -17,11 +17,6 @@ buildPythonPackage rec {
     LC_ALL="en_US.UTF-8" py.test --pyargs ephem.tests -k "not JPLTest"
   '';
 
-  # Unfortunately, the tests are broken for Python 3 in 3.7.6.0. They have been
-  # fixed in https://github.com/brandon-rhodes/pyephem/commit/c8633854e2d251a198b0f701d0528b508baa2411
-  # but there has not been a new release since then.
-  doCheck = !isPy3k;
-
   meta = with stdenv.lib; {
     description = "Compute positions of the planets and stars";
     homepage = https://pypi.python.org/pypi/ephem/;
-- 
GitLab


From b2c12abb281a0308b3e5941169d60a6a594b8191 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= <jl@lafuente.me>
Date: Mon, 30 Sep 2019 23:37:37 +0200
Subject: [PATCH 1669/2254] kube3d: build as GoModule instead of GoPackage
 (#70062)

Also adds build flags version and k3sVersion. Previously it was using the default, dev and latest
---
 .../networking/cluster/kube3d/default.nix     |  16 +-
 .../networking/cluster/kube3d/deps.nix        | 174 ------------------
 2 files changed, 12 insertions(+), 178 deletions(-)
 delete mode 100644 pkgs/applications/networking/cluster/kube3d/deps.nix

diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix
index c549efa7b40..7058c009f2d 100644
--- a/pkgs/applications/networking/cluster/kube3d/default.nix
+++ b/pkgs/applications/networking/cluster/kube3d/default.nix
@@ -1,8 +1,9 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 
-buildGoPackage rec {
+buildGoModule rec {
   pname = "kube3d";
   version = "1.3.1";
+  k3sVersion = "0.9.1";
 
   goPackagePath = "github.com/rancher/k3d";
 
@@ -13,13 +14,20 @@ buildGoPackage rec {
     sha256 = "0bdpjnzyxd6mdc1qv0ml89qds6305kn3wmyci2kv6g2y7r7wxvm2";
   };
 
-  goDeps = ./deps.nix;
+  buildFlagsArray = ''
+    -ldflags=
+      -w -s
+      -X github.com/rancher/k3d/version.Version=${version}
+      -X github.com/rancher/k3d/version.K3sVersion=v${k3sVersion}
+  '';
+
+  modSha256 = "1qadf3gc2626l4jpad4lzi649nh8if9m6fgs2cf46r1nish16h95";
 
   meta = with stdenv.lib; {
     homepage = "https://github.com/rancher/k3d";
     description = "A helper to run k3s (Lightweight Kubernetes. 5 less than k8s) in a docker container";
     license = licenses.mit;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ kuznero ];
+    maintainers = with maintainers; [ kuznero jlesquembre ];
   };
 }
diff --git a/pkgs/applications/networking/cluster/kube3d/deps.nix b/pkgs/applications/networking/cluster/kube3d/deps.nix
deleted file mode 100644
index 4fb2936a40b..00000000000
--- a/pkgs/applications/networking/cluster/kube3d/deps.nix
+++ /dev/null
@@ -1,174 +0,0 @@
-# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
-[
-  {
-    goPackagePath = "github.com/Microsoft/go-winio";
-    fetch = {
-      type = "git";
-      url = "https://github.com/Microsoft/go-winio";
-      rev = "v0.4.12";
-      sha256 = "10v2f1xaw2cc97mjqnxzgs9ydpqv71f0ynp1spcywqw97la56zqw";
-    };
-  }
-  {
-    goPackagePath = "github.com/davecgh/go-spew";
-    fetch = {
-      type = "git";
-      url = "https://github.com/davecgh/go-spew";
-      rev = "v1.1.0";
-      sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c";
-    };
-  }
-  {
-    goPackagePath = "github.com/docker/distribution";
-    fetch = {
-      type = "git";
-      url = "https://github.com/docker/distribution";
-      rev = "v2.7.1";
-      sha256 = "1nx8b5a68rn81alp8wkkw6qd5v32mgf0fk23mxm60zdf63qk1nzw";
-    };
-  }
-  {
-    goPackagePath = "github.com/docker/docker";
-    fetch = {
-      type = "git";
-      url = "https://github.com/docker/docker";
-      rev = "v1.13.1";
-      sha256 = "0l9kjibnpwcgk844sibxk9ppyqniw9r0np1mzp95f8f461jb0iar";
-    };
-  }
-  {
-    goPackagePath = "github.com/docker/go-connections";
-    fetch = {
-      type = "git";
-      url = "https://github.com/docker/go-connections";
-      rev = "v0.4.0";
-      sha256 = "0mv6f6b5nljc17dmwmc28hc0y11pqglz7x0d2mjrwdmfxf64hwqq";
-    };
-  }
-  {
-    goPackagePath = "github.com/docker/go-units";
-    fetch = {
-      type = "git";
-      url = "https://github.com/docker/go-units";
-      rev = "v0.3.3";
-      sha256 = "0npxsb3pp89slwf4a73fxm20hykad8xggij6i6hcd5jy19bjrd93";
-    };
-  }
-  {
-    goPackagePath = "github.com/mattn/go-runewidth";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mattn/go-runewidth";
-      rev = "v0.0.4";
-      sha256 = "00b3ssm7wiqln3k54z2wcnxr3k3c7m1ybyhb9h8ixzbzspld0qzs";
-    };
-  }
-  {
-    goPackagePath = "github.com/mitchellh/go-homedir";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mitchellh/go-homedir";
-      rev = "v1.1.0";
-      sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1";
-    };
-  }
-  {
-    goPackagePath = "github.com/olekukonko/tablewriter";
-    fetch = {
-      type = "git";
-      url = "https://github.com/olekukonko/tablewriter";
-      rev = "v0.0.1";
-      sha256 = "0hh95glg7d2md185r03wn52j2r33jc4zil0qvcrs66ka7bdxi7vj";
-    };
-  }
-  {
-    goPackagePath = "github.com/opencontainers/go-digest";
-    fetch = {
-      type = "git";
-      url = "https://github.com/opencontainers/go-digest";
-      rev = "v1.0.0-rc1";
-      sha256 = "01gc7fpn8ax429024p2fcx3yb18axwz5bjf2hqxlii1jbsgw4bh9";
-    };
-  }
-  {
-    goPackagePath = "github.com/pkg/errors";
-    fetch = {
-      type = "git";
-      url = "https://github.com/pkg/errors";
-      rev = "v0.8.1";
-      sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1";
-    };
-  }
-  {
-    goPackagePath = "github.com/pmezard/go-difflib";
-    fetch = {
-      type = "git";
-      url = "https://github.com/pmezard/go-difflib";
-      rev = "v1.0.0";
-      sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
-    };
-  }
-  {
-    goPackagePath = "github.com/stretchr/objx";
-    fetch = {
-      type = "git";
-      url = "https://github.com/stretchr/objx";
-      rev = "v0.1.0";
-      sha256 = "19ynspzjdynbi85xw06mh8ad5j0qa1vryvxjgvbnyrr8rbm4vd8w";
-    };
-  }
-  {
-    goPackagePath = "github.com/stretchr/testify";
-    fetch = {
-      type = "git";
-      url = "https://github.com/stretchr/testify";
-      rev = "v1.3.0";
-      sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy";
-    };
-  }
-  {
-    goPackagePath = "github.com/urfave/cli";
-    fetch = {
-      type = "git";
-      url = "https://github.com/urfave/cli";
-      rev = "v1.20.0";
-      sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/crypto";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/crypto";
-      rev = "c2843e01d9a2";
-      sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/net";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/net";
-      rev = "b630fd6fe46b";
-      sha256 = "0m84kwckmmc0z05kjb4dd43g1g61al32a4z593flpcbaqx8di5sd";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/sys";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/sys";
-      rev = "d0b11bdaac8a";
-      sha256 = "18yfsmw622l7gc5sqriv5qmck6903vvhivpzp8i3xfy3z33dybdl";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/text";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/text";
-      rev = "v0.3.0";
-      sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
-    };
-  }
-]
-- 
GitLab


From 7adddf7c3ee4ea5a58cdbc34ba5892d411ed297b Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Mon, 30 Sep 2019 23:59:56 +0200
Subject: [PATCH 1670/2254] jormungandr: 0.5.2 -> 0.5.4

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

diff --git a/pkgs/applications/blockchains/jormungandr/default.nix b/pkgs/applications/blockchains/jormungandr/default.nix
index 5f54b84d4d4..bd781fa979d 100644
--- a/pkgs/applications/blockchains/jormungandr/default.nix
+++ b/pkgs/applications/blockchains/jormungandr/default.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "jormungandr";
-  version = "0.5.2";
+  version = "0.5.4";
 
   src = fetchgit {
     url = "https://github.com/input-output-hk/${pname}";
     rev = "v${version}";
-    sha256 = "0aixz007kc5gisc4hvix3ccmy0r459lczlwmnm2989jcxk3hki3q";
+    sha256 = "18qja9gmw05hm1xy51pmzcrrapx6yz2qcz1a08aip954j23sqh8j";
     fetchSubmodules = true;
   };
 
-  cargoSha256 = "1grrxmczdmkf2sd0f0b2iblzzcp8qlrsad5dkm0r5vxch22rcx7d";
+  cargoSha256 = "1cnwmc0a1k308zpp8r18krlxzcfcf6hkx4qlldyzf9b2lrnfi1d2";
 
   nativeBuildInputs = [ pkgconfig protobuf ];
   buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
-- 
GitLab


From cad5d81b1cd0b076030b7ea3d18cf78ebc6486ec Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Mon, 30 Sep 2019 18:00:00 -0500
Subject: [PATCH 1671/2254] rubocop: 0.74.0 -> 0.75.0

Changelog: https://github.com/rubocop-hq/rubocop/releases/tag/v0.75.0
---
 pkgs/development/tools/rubocop/Gemfile.lock | 4 ++--
 pkgs/development/tools/rubocop/gemset.nix   | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/rubocop/Gemfile.lock b/pkgs/development/tools/rubocop/Gemfile.lock
index df5bee57be6..df2f0aae8ea 100644
--- a/pkgs/development/tools/rubocop/Gemfile.lock
+++ b/pkgs/development/tools/rubocop/Gemfile.lock
@@ -4,10 +4,10 @@ GEM
     ast (2.4.0)
     jaro_winkler (1.5.3)
     parallel (1.17.0)
-    parser (2.6.3.0)
+    parser (2.6.4.1)
       ast (~> 2.4.0)
     rainbow (3.0.0)
-    rubocop (0.74.0)
+    rubocop (0.75.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.6)
diff --git a/pkgs/development/tools/rubocop/gemset.nix b/pkgs/development/tools/rubocop/gemset.nix
index 892d0d74d7b..d113120e3d6 100644
--- a/pkgs/development/tools/rubocop/gemset.nix
+++ b/pkgs/development/tools/rubocop/gemset.nix
@@ -35,10 +35,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1pnks149x0fzgqiw53qlmvcd8bi746cxdw03sjljby5s97p1fskn";
+      sha256 = "1axig0czm40ydbnay9b9qzzavszx2p7knidbwim8lgcpfm4ynxdw";
       type = "gem";
     };
-    version = "2.6.3.0";
+    version = "2.6.4.1";
   };
   rainbow = {
     groups = ["default"];
@@ -56,10 +56,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0wpyass9qb2wvq8zsc7wdzix5xy2ldiv66wnx8mwwprz2dcvzayk";
+      sha256 = "1x0hc3b9admal4684cfa1rh778khsydkv1dwf18cxyvb3v2h9rab";
       type = "gem";
     };
-    version = "0.74.0";
+    version = "0.75.0";
   };
   ruby-progressbar = {
     groups = ["default"];
-- 
GitLab


From 590f85f7a11a8efcdc7be314b60b1ed0173839ff Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 1 Oct 2019 02:30:41 +0200
Subject: [PATCH 1672/2254] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.15.0-1-g5325ccd from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/36c258915faffff2b555a49d04b4905c8034c2bd.
---
 .../haskell-modules/hackage-packages.nix      | 225 +++++++++++++++---
 1 file changed, 189 insertions(+), 36 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 4ca103186cf..0f3b4d7bb6c 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -15998,8 +15998,8 @@ self: {
     ({ mkDerivation, base, mtl, QuickCheck, random }:
      mkDerivation {
        pname = "QuickCheck-GenT";
-       version = "0.2.0";
-       sha256 = "0vbc4zw9f03hm6mnlkiymp75yi9knar12zyyrchlr8792acwlcrd";
+       version = "0.2.1";
+       sha256 = "1bf3vx2szdb0svnmhn0k7vfkv86vhfxgcfklzlf5w7y49s4369k0";
        libraryHaskellDepends = [ base mtl QuickCheck random ];
        description = "A GenT monad transformer for QuickCheck library";
        license = stdenv.lib.licenses.mit;
@@ -42754,6 +42754,46 @@ self: {
        license = stdenv.lib.licenses.agpl3;
      }) {};
 
+  "brittany_0_12_1_0" = callPackage
+    ({ mkDerivation, aeson, base, butcher, bytestring, cmdargs
+     , containers, czipwith, data-tree-print, deepseq, directory, extra
+     , filepath, ghc, ghc-boot-th, ghc-exactprint, ghc-paths, hspec
+     , monad-memo, mtl, multistate, neat-interpolation, parsec, pretty
+     , random, safe, semigroups, strict, syb, text, transformers
+     , uniplate, unsafe, yaml
+     }:
+     mkDerivation {
+       pname = "brittany";
+       version = "0.12.1.0";
+       sha256 = "1r5nbw63hv5nq02lx6igin70lbzbdglldb2lf1m52jpiwwz5j0i4";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base butcher bytestring cmdargs containers czipwith
+         data-tree-print deepseq directory extra filepath ghc ghc-boot-th
+         ghc-exactprint ghc-paths monad-memo mtl multistate
+         neat-interpolation pretty random safe semigroups strict syb text
+         transformers uniplate unsafe yaml
+       ];
+       executableHaskellDepends = [
+         aeson base butcher bytestring cmdargs containers czipwith
+         data-tree-print deepseq directory extra filepath ghc ghc-boot-th
+         ghc-exactprint ghc-paths monad-memo mtl multistate
+         neat-interpolation pretty safe semigroups strict syb text
+         transformers uniplate unsafe yaml
+       ];
+       testHaskellDepends = [
+         aeson base butcher bytestring cmdargs containers czipwith
+         data-tree-print deepseq directory extra filepath ghc ghc-boot-th
+         ghc-exactprint ghc-paths hspec monad-memo mtl multistate
+         neat-interpolation parsec pretty safe semigroups strict syb text
+         transformers uniplate unsafe yaml
+       ];
+       description = "Haskell source code formatter";
+       license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "broadcast-chan" = callPackage
     ({ mkDerivation, async, base, criterion, deepseq, stm
      , unliftio-core
@@ -69565,13 +69605,13 @@ self: {
      }) {};
 
   "dimensions" = callPackage
-    ({ mkDerivation, base, Cabal, constraints-deriving, ghc, QuickCheck
-     }:
+    ({ mkDerivation, base, Cabal, constraints-deriving, QuickCheck }:
      mkDerivation {
        pname = "dimensions";
-       version = "2.0.0.0";
-       sha256 = "1k0j8lcshscs5cd18i6qqiwb7sjy55mcfha5kl5f4x9nxrnn6xa8";
-       libraryHaskellDepends = [ base constraints-deriving ghc ];
+       version = "2.1.0.0";
+       sha256 = "08jkcr1lbjb8n4n9pmfy1jg5djaxn4fs6f1jk4dbpk4paxp3psc9";
+       setupHaskellDepends = [ base Cabal ];
+       libraryHaskellDepends = [ base constraints-deriving ];
        testHaskellDepends = [
          base Cabal constraints-deriving QuickCheck
        ];
@@ -74375,8 +74415,9 @@ self: {
      }:
      mkDerivation {
        pname = "easytensor";
-       version = "2.0.1.0";
-       sha256 = "018g738yq7ac386ahbl18jnkjzd25jbgb744fg0kxz90734iwwdv";
+       version = "2.1.0.0";
+       sha256 = "1d11i3g0rhcl43jd2pklbagazv2az73ns9sfkky8yx078cf79xyd";
+       setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [ base constraints-deriving dimensions ];
        testHaskellDepends = [
          base Cabal constraints-deriving dimensions QuickCheck
@@ -74393,8 +74434,8 @@ self: {
     ({ mkDerivation, base, dimensions, easytensor, vulkan-api }:
      mkDerivation {
        pname = "easytensor-vulkan";
-       version = "2.0.1.0";
-       sha256 = "0j3np8b24kr30bc2lcrvgpnv440a0mzcksjiyf37sp6l9fml65m5";
+       version = "2.0.2.0";
+       sha256 = "0gi8p76x7h78frv3yrg6a7qnzjczx3j7warqclc36pkwv050dn3i";
        libraryHaskellDepends = [ base dimensions easytensor vulkan-api ];
        description = "Use easytensor with vulkan-api";
        license = stdenv.lib.licenses.bsd3;
@@ -92139,8 +92180,8 @@ self: {
      }:
      mkDerivation {
        pname = "ghc-events";
-       version = "0.9.1";
-       sha256 = "1phq4jxhm05xj42y7aqpjj43vj5mixi3hhf3h5c0dh1vmsz9w3z1";
+       version = "0.10.0";
+       sha256 = "153rivbk7zma04hk7hqd2ra051jrh372mh1sfrjyw7x5crh07ac7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -104620,8 +104661,8 @@ self: {
     ({ mkDerivation, base, filepath, haddock-api }:
      mkDerivation {
        pname = "haddock";
-       version = "2.22.0";
-       sha256 = "1k42z2zh550rl93c8pa9cg2xsanp6wvb031xvan6cmngnplmdib6";
+       version = "2.23.0";
+       sha256 = "1f7n4l1kkq1msl8csnvzg2xh3i5a056dzmcf40gib0im91wcwl0x";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base haddock-api ];
@@ -104693,24 +104734,23 @@ self: {
      }) {};
 
   "haddock-api" = callPackage
-    ({ mkDerivation, array, base, bytestring, Cabal, containers
-     , deepseq, directory, filepath, ghc, ghc-boot, ghc-paths
-     , haddock-library, hspec, hspec-discover, QuickCheck, transformers
-     , xhtml
+    ({ mkDerivation, array, base, bytestring, containers, deepseq
+     , directory, filepath, ghc, ghc-boot, ghc-paths, haddock-library
+     , hspec, hspec-discover, QuickCheck, transformers, xhtml
      }:
      mkDerivation {
        pname = "haddock-api";
-       version = "2.22.0";
-       sha256 = "149q4zlf4m7wcrr4af2n2flh0jxjsypshbc229vsj1m0kmz4z014";
+       version = "2.23.0";
+       sha256 = "0fbk458qr7iw1j8vh6455n2819c0pfdw1m3gy1y3fs6fdpj9qbjj";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         array base bytestring Cabal containers deepseq directory filepath
-         ghc ghc-boot ghc-paths haddock-library transformers xhtml
+         array base bytestring containers deepseq directory filepath ghc
+         ghc-boot ghc-paths haddock-library transformers xhtml
        ];
        testHaskellDepends = [
-         array base bytestring Cabal containers deepseq directory filepath
-         ghc ghc-boot ghc-paths haddock-library hspec QuickCheck
-         transformers xhtml
+         array base bytestring containers deepseq directory filepath ghc
+         ghc-boot ghc-paths haddock-library hspec QuickCheck transformers
+         xhtml
        ];
        testToolDepends = [ hspec-discover ];
        description = "A documentation-generation tool for Haskell libraries";
@@ -104802,6 +104842,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "haddock-library_1_8_0" = callPackage
+    ({ mkDerivation, base, base-compat, bytestring, containers, deepseq
+     , directory, filepath, hspec, hspec-discover, optparse-applicative
+     , parsec, QuickCheck, text, transformers, tree-diff
+     }:
+     mkDerivation {
+       pname = "haddock-library";
+       version = "1.8.0";
+       sha256 = "15xpv29yh3kb9qq9gmws2l8m64i7phvf47y08vxc2j55101sg4vh";
+       libraryHaskellDepends = [
+         base bytestring containers parsec text transformers
+       ];
+       testHaskellDepends = [
+         base base-compat bytestring containers deepseq directory filepath
+         hspec optparse-applicative parsec QuickCheck text transformers
+         tree-diff
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Library exposing some functionality of Haddock";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "haddock-test" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, directory, filepath
      , process, syb, xhtml, xml
@@ -118479,6 +118542,24 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "hkgr_0_2_3_3" = callPackage
+    ({ mkDerivation, base, directory, filepath, simple-cabal
+     , simple-cmd, simple-cmd-args
+     }:
+     mkDerivation {
+       pname = "hkgr";
+       version = "0.2.3.3";
+       sha256 = "1a7ibkfdn4xkr89xlps3znr7ry9bdzdijylbqnlsvikri7vibaaz";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base directory filepath simple-cabal simple-cmd simple-cmd-args
+       ];
+       description = "Simple Hackage release workflow for package maintainers";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hkt" = callPackage
     ({ mkDerivation, base, hspec, inspection-testing, protolude, text
      }:
@@ -130722,15 +130803,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hw-prim_0_6_2_33" = callPackage
+  "hw-prim_0_6_2_34" = callPackage
     ({ mkDerivation, base, bytestring, criterion, directory, exceptions
      , ghc-prim, hedgehog, hspec, hspec-discover, hw-hspec-hedgehog
      , mmap, QuickCheck, semigroups, transformers, unliftio-core, vector
      }:
      mkDerivation {
        pname = "hw-prim";
-       version = "0.6.2.33";
-       sha256 = "1n4bg5q8mdphsd9v7xgabks4r3vl70rlvfz4hj6kwcrqnamqdhl1";
+       version = "0.6.2.34";
+       sha256 = "1smp5fwnycps4avnv321bmx3ln8pvvr0yppfivm46qcnilaasyy8";
        libraryHaskellDepends = [
          base bytestring ghc-prim mmap semigroups transformers unliftio-core
          vector
@@ -161846,8 +161927,8 @@ self: {
     ({ mkDerivation, base, mmorph, mtl, transformers }:
      mkDerivation {
        pname = "monad-resumption";
-       version = "0.1.3.0";
-       sha256 = "0zi4p8v02shw0m471xsq1d3wbskz6jd2j92wpdi3qcd8fx4i283q";
+       version = "0.1.4.0";
+       sha256 = "0hc9dbqhd609lzn79c25zwhm55262i9yip16ag9rysxv6rxbshml";
        libraryHaskellDepends = [ base mmorph mtl transformers ];
        description = "Resumption and reactive resumption monads for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -197956,6 +198037,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "regex-compat_0_95_2_0" = callPackage
+    ({ mkDerivation, array, base, regex-base, regex-posix }:
+     mkDerivation {
+       pname = "regex-compat";
+       version = "0.95.2.0";
+       sha256 = "01l44zrfpqb4k1rrzd1j18hn6922xhrl9h7s0hjfs363dx3hxj8z";
+       libraryHaskellDepends = [ array base regex-base regex-posix ];
+       description = "Replaces/Enhances \"Text.Regex\"";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "regex-compat-tdfa" = callPackage
     ({ mkDerivation, array, base, regex-base, regex-tdfa }:
      mkDerivation {
@@ -198175,12 +198268,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "regex-pcre-builtin_0_94_6_8_8_35" = callPackage
+  "regex-pcre-builtin_0_95_0_8_8_35" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, regex-base }:
      mkDerivation {
        pname = "regex-pcre-builtin";
-       version = "0.94.6.8.8.35";
-       sha256 = "1rgslippp796wm36gmc0aywhk1d1ifx88l37msnmncdvj7p6sf8s";
+       version = "0.95.0.8.8.35";
+       sha256 = "071zlipd90vyb0d986a0pnlszjmnwvhfi5vqahpnr2b8zz40lsrk";
        libraryHaskellDepends = [
          array base bytestring containers regex-base
        ];
@@ -198238,6 +198331,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "regex-posix_0_96_0_0" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, regex-base }:
+     mkDerivation {
+       pname = "regex-posix";
+       version = "0.96.0.0";
+       sha256 = "08a584jabmmn5gmaqrcar5wsp3qzk0hklldzp2mr2bmvlvqh04r5";
+       libraryHaskellDepends = [
+         array base bytestring containers regex-base
+       ];
+       description = "POSIX Backend for \"Text.Regex\" (regex-base)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "regex-posix-clib" = callPackage
+    ({ mkDerivation }:
+     mkDerivation {
+       pname = "regex-posix-clib";
+       version = "2.7";
+       sha256 = "1y4vmiq1xksxxd84yvyark6axsz51ywb6slswbddlxbdpcpfday7";
+       doHaddock = false;
+       description = "\"Regex for Windows\" C library";
+       license = stdenv.lib.licenses.lgpl21;
+     }) {};
+
   "regex-posix-unittest" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, mtl
      , regex-base, regex-posix
@@ -209669,8 +209787,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-errors";
-       version = "0.1.2.0";
-       sha256 = "0w3adlvysybc9dv3qf00ja0gx86y47n4lz8p6dypzmvs598h6rxs";
+       version = "0.1.3.0";
+       sha256 = "1l8hcjjjcc90hrzc3mkd081ql1ljb510kdaskbar1gqhaz6s96wb";
        libraryHaskellDepends = [
          aeson base bytestring http-api-data http-media http-types
          scientific servant string-conversions text unordered-containers wai
@@ -225238,6 +225356,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "string-fromto" = callPackage
+    ({ mkDerivation, base, bytestring, memory, text }:
+     mkDerivation {
+       pname = "string-fromto";
+       version = "1.0.0.0";
+       sha256 = "0vnf500vahgccbbg7zvxqjxllvyq3jxzf2difqwh46fp62jfqwmx";
+       libraryHaskellDepends = [ base bytestring memory text ];
+       description = "Conversions between common string types, as well as Base16/Base32/Base64";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "string-interpolate" = callPackage
     ({ mkDerivation, base, bytestring, criterion, formatting
      , haskell-src-meta, hspec, interpolate, interpolatedstring-perl6
@@ -248639,6 +248768,30 @@ self: {
        broken = true;
      }) {};
 
+  "vinyl_0_12_0" = callPackage
+    ({ mkDerivation, aeson, array, base, criterion, doctest, ghc-prim
+     , hspec, lens, lens-aeson, linear, microlens, mtl, mwc-random
+     , primitive, should-not-typecheck, singletons, tagged, text
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "vinyl";
+       version = "0.12.0";
+       sha256 = "04lzhlmm57yp1x0z4g0dl1q96wqsygsldxdksam0gisdidk133vi";
+       libraryHaskellDepends = [ array base ghc-prim ];
+       testHaskellDepends = [
+         aeson base doctest hspec lens lens-aeson microlens mtl
+         should-not-typecheck singletons text unordered-containers vector
+       ];
+       benchmarkHaskellDepends = [
+         base criterion linear microlens mwc-random primitive tagged vector
+       ];
+       description = "Extensible Records";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "vinyl-generics" = callPackage
     ({ mkDerivation, aeson, base, generics-sop, hspec, hspec-core
      , QuickCheck, records-sop, text, vinyl
-- 
GitLab


From 9e522a736d637c6a479fcbf35ad66f9de874d5db Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Mon, 30 Sep 2019 20:00:00 -0500
Subject: [PATCH 1673/2254] zig: 0.4.0 -> 0.5.0

Release Notes: https://ziglang.org/download/0.5.0/release-notes.html
---
 pkgs/development/compilers/zig/default.nix | 8 ++++++--
 pkgs/top-level/all-packages.nix            | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/zig/default.nix b/pkgs/development/compilers/zig/default.nix
index 35ad09320de..961e28da82e 100644
--- a/pkgs/development/compilers/zig/default.nix
+++ b/pkgs/development/compilers/zig/default.nix
@@ -1,19 +1,23 @@
 { stdenv, fetchFromGitHub, cmake, llvmPackages, libxml2, zlib }:
 
 stdenv.mkDerivation rec {
-  version = "0.4.0";
+  version = "0.5.0";
   pname = "zig";
 
   src = fetchFromGitHub {
     owner = "ziglang";
     repo = pname;
     rev = version;
-    sha256 = "1cq6cc5pvybz9kn3y0j5gskkjq88hkmmcsva54mfzpcc65l3pv6p";
+    sha256 = "0xyl0riakh6kwb3yvxihb451kqs4ai4q0aygqygnlb2rlr1dn1zb";
   };
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [ llvmPackages.clang-unwrapped llvmPackages.llvm libxml2 zlib ];
 
+  preBuild = ''
+    export HOME=$TMPDIR;
+  '';
+
   meta = with stdenv.lib; {
     description = "Programming languaged designed for robustness, optimality, and clarity";
     homepage = https://ziglang.org/;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 243883874fc..bd50b042028 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14275,7 +14275,7 @@ in
   zmqpp = callPackage ../development/libraries/zmqpp { };
 
   zig = callPackage ../development/compilers/zig {
-    llvmPackages = llvmPackages_8;
+    llvmPackages = llvmPackages_9;
   };
 
   zimlib = callPackage ../development/libraries/zimlib { };
-- 
GitLab


From d303a2f4318cc5cf36d3537347eda91e0e440118 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 28 Sep 2019 17:10:51 -0400
Subject: [PATCH 1674/2254] llvm/compiler-rt: fix on i686

Only turn on cross related flags when useLLVM = true.

Fixes #66693
---
 pkgs/development/compilers/llvm/7/compiler-rt.nix | 9 ++++-----
 pkgs/development/compilers/llvm/8/compiler-rt.nix | 7 +++----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/compilers/llvm/7/compiler-rt.nix b/pkgs/development/compilers/llvm/7/compiler-rt.nix
index 0912435327c..ca3bbf905de 100644
--- a/pkgs/development/compilers/llvm/7/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/7/compiler-rt.nix
@@ -7,11 +7,10 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ cmake python llvm ];
   buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
 
-  cmakeFlags = [
+  cmakeFlags = stdenv.lib.optionals (stdenv.hostPlatform.useLLVM or false) [
     "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON"
     "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}"
     "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}"
-  ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [
     "-DCMAKE_C_FLAGS=-nodefaultlibs"
     "-DCMAKE_CXX_COMPILER_WORKS=ON"
     "-DCOMPILER_RT_BUILD_BUILTINS=ON"
@@ -26,7 +25,7 @@ stdenv.mkDerivation {
 
   patches = [
     ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory
-  ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./crtbegin-and-end.patch
+  ] ++ stdenv.lib.optional (stdenv.hostPlatform.useLLVM or false) ./crtbegin-and-end.patch
     ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch;
 
   # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
@@ -37,7 +36,7 @@ stdenv.mkDerivation {
   postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
     substituteInPlace cmake/config-ix.cmake \
       --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)'
-  '' + stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+  '' + stdenv.lib.optionalString (stdenv.hostPlatform.useLLVM or false) ''
     substituteInPlace lib/builtins/int_util.c \
       --replace "#include <stdlib.h>" ""
     substituteInPlace lib/builtins/clear_cache.c \
@@ -49,7 +48,7 @@ stdenv.mkDerivation {
   # Hack around weird upsream RPATH bug
   postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
     ln -s "$out/lib"/*/* "$out/lib"
-  '' + stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+  '' + stdenv.lib.optionalString (stdenv.hostPlatform.useLLVM or false) ''
     ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/linux/crtbegin.o
     ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/linux/crtend.o
     ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/linux/crtbeginS.o
diff --git a/pkgs/development/compilers/llvm/8/compiler-rt.nix b/pkgs/development/compilers/llvm/8/compiler-rt.nix
index 936c877d58c..88788852862 100644
--- a/pkgs/development/compilers/llvm/8/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/8/compiler-rt.nix
@@ -7,11 +7,10 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ cmake python llvm ];
   buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
 
-  cmakeFlags = [
+  cmakeFlags = stdenv.lib.optionals (stdenv.hostPlatform.useLLVM or false) [
     "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON"
     "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}"
     "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}"
-  ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
     "-DCMAKE_C_FLAGS=-nodefaultlibs"
     "-DCMAKE_CXX_COMPILER_WORKS=ON"
     "-DCOMPILER_RT_BUILD_SANITIZERS=OFF"
@@ -37,7 +36,7 @@ stdenv.mkDerivation {
   patches = [
     ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory
   ]# ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
-    ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./crtbegin-and-end.patch;
+    ++ stdenv.lib.optional (stdenv.hostPlatform.useLLVM or false) ./crtbegin-and-end.patch;
 
   # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
   # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra
@@ -47,7 +46,7 @@ stdenv.mkDerivation {
   postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
     substituteInPlace cmake/config-ix.cmake \
       --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)'
-  '' + stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+  '' + stdenv.lib.optionalString (stdenv.hostPlatform.useLLVM or false) ''
     substituteInPlace lib/builtins/int_util.c \
       --replace "#include <stdlib.h>" ""
     substituteInPlace lib/builtins/clear_cache.c \
-- 
GitLab


From a7dc5c685ecb23a7520462b1db9dffd5eb0aebc6 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 28 Sep 2019 18:02:53 -0400
Subject: [PATCH 1675/2254] llvm/compiler: preserve hashes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Don’t require a mass rebuild for this fix.
---
 pkgs/development/compilers/llvm/7/compiler-rt.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/llvm/7/compiler-rt.nix b/pkgs/development/compilers/llvm/7/compiler-rt.nix
index ca3bbf905de..5d7266f39ec 100644
--- a/pkgs/development/compilers/llvm/7/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/7/compiler-rt.nix
@@ -7,10 +7,11 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ cmake python llvm ];
   buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
 
-  cmakeFlags = stdenv.lib.optionals (stdenv.hostPlatform.useLLVM or false) [
+  cmakeFlags = stdenv.lib.optionals (stdenv.hostPlatform.useLLVM or false || stdenv.isDarwin) [
     "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON"
     "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}"
     "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}"
+  ] ++ stdenv.lib.optionals (stdenv.hostPlatform.useLLVM or false) [
     "-DCMAKE_C_FLAGS=-nodefaultlibs"
     "-DCMAKE_CXX_COMPILER_WORKS=ON"
     "-DCOMPILER_RT_BUILD_BUILTINS=ON"
-- 
GitLab


From 1f95c9c933b8762ac9d87d84c1e9218b46ab7441 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 30 Sep 2019 21:26:26 -0400
Subject: [PATCH 1676/2254] llvm9/compiler-rt: fix on i686

---
 pkgs/development/compilers/llvm/9/compiler-rt.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/llvm/9/compiler-rt.nix b/pkgs/development/compilers/llvm/9/compiler-rt.nix
index 0b7e6815c64..9a333ad7c11 100644
--- a/pkgs/development/compilers/llvm/9/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/9/compiler-rt.nix
@@ -7,11 +7,10 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake python llvm ];
   buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
 
-  cmakeFlags = [
+  cmakeFlags = stdenv.lib.optionals (stdenv.hostPlatform.useLLVM or false) [
     "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON"
     "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}"
     "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}"
-  ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
     "-DCMAKE_C_FLAGS=-nodefaultlibs"
     "-DCMAKE_CXX_COMPILER_WORKS=ON"
     "-DCOMPILER_RT_BUILD_SANITIZERS=OFF"
@@ -46,7 +45,7 @@ stdenv.mkDerivation rec {
   postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
     substituteInPlace cmake/config-ix.cmake \
       --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)'
-  '' + stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+  '' + stdenv.lib.optionalString (stdenv.hostPlatform.useLLVM or false) ''
     substituteInPlace lib/builtins/int_util.c \
       --replace "#include <stdlib.h>" ""
     substituteInPlace lib/builtins/clear_cache.c \
-- 
GitLab


From fcb84c55343b06683bd45708165a9ae89f03c542 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Mon, 30 Sep 2019 22:55:17 -0400
Subject: [PATCH 1677/2254] blueman: no optional networkmanager

blueman declares NetworkManager gi bindings
as a required runtime dependency [0]

Fixes #69555

[0]: https://github.com/blueman-project/blueman/blob/531da47b06de3617492cc5ae5530ca8b3f2e12a4/Dependencies.md
---
 pkgs/tools/bluetooth/blueman/default.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix
index 8e393ac3f13..01ab2eefc21 100644
--- a/pkgs/tools/bluetooth/blueman/default.nix
+++ b/pkgs/tools/bluetooth/blueman/default.nix
@@ -1,9 +1,7 @@
 { config, stdenv, lib, fetchurl, intltool, pkgconfig, python3Packages, bluez, gtk3
 , obex_data_server, xdg_utils, dnsmasq, dhcp, libappindicator, iproute
 , gnome3, librsvg, wrapGAppsHook, gobject-introspection
-, withNetworkManager ?
-    config.networking.networkmanager.enable or false, networkmanager
-, withPulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio }:
+, networkmanager, withPulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio }:
 
 let
   pythonPackages = python3Packages;
@@ -24,10 +22,9 @@ in stdenv.mkDerivation rec {
   ];
 
   buildInputs = [ bluez gtk3 pythonPackages.python librsvg
-                  gnome3.adwaita-icon-theme iproute libappindicator ]
+                  gnome3.adwaita-icon-theme iproute libappindicator networkmanager ]
                 ++ pythonPath
-                ++ lib.optional withPulseAudio libpulseaudio
-                ++ lib.optional withNetworkManager networkmanager;
+                ++ lib.optional withPulseAudio libpulseaudio;
 
   postPatch = lib.optionalString withPulseAudio ''
     sed -i 's,CDLL(",CDLL("${libpulseaudio.out}/lib/,g' blueman/main/PulseAudioUtils.py
-- 
GitLab


From 187cf4a567d0b332b40489d280c292d109206d98 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 08:04:37 -0700
Subject: [PATCH 1678/2254] python37Packages.marshmallow-sqlalchemy: 0.17.0 ->
 0.19.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-marshmallow-sqlalchemy/versions
---
 .../python-modules/marshmallow-sqlalchemy/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix
index 22f9b445d24..76e641bae2c 100644
--- a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix
@@ -4,7 +4,7 @@
 
 buildPythonPackage rec {
   pname = "marshmallow-sqlalchemy";
-  version = "0.17.0";
+  version = "0.19.0";
 
   meta = {
     homepage = "https://github.com/marshmallow-code/marshmallow-sqlalchemy";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "17pnbv28n9vy3q66ckxfdbb9k1riy6s8lg63zfm5jsx00f0zqqnn";
+    sha256 = "175ydlxmj8pbkrv3wcrsd9jg7smnxhln2y0i691yafhidxgy8fmm";
   };
 
   propagatedBuildInputs = [ marshmallow sqlalchemy ];
-- 
GitLab


From 549c0ee2f677ab04dd8d44e6842eb77f8ac90ee7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 08:39:23 -0700
Subject: [PATCH 1679/2254] python37Packages.meld3: 1.0.2 -> 2.0.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-meld3/versions
---
 pkgs/development/python-modules/meld3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/meld3/default.nix b/pkgs/development/python-modules/meld3/default.nix
index 018a634a43a..a1729ecb04e 100644
--- a/pkgs/development/python-modules/meld3/default.nix
+++ b/pkgs/development/python-modules/meld3/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "meld3";
-  version = "1.0.2";
+  version = "2.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0n4mkwlpsqnmn0dm0wm5hn9nkda0nafl0jdy5sdl5977znh59dzp";
+    sha256 = "1fbyafwi0d54394hkmp65nf6vk0qm4kipf5z60pdp4244rvadz8y";
   };
 
   doCheck = false;
-- 
GitLab


From 90c6fbabf2e84cb8b8cc21d081d7d34e874af9a5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 07:21:35 -0700
Subject: [PATCH 1680/2254] python27Packages.pycdio: 2.0.0 -> 2.1.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python2.7-pycdio/versions
---
 pkgs/development/python-modules/pycdio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pycdio/default.nix b/pkgs/development/python-modules/pycdio/default.nix
index 4a5577d7e0b..f7a64b9bde4 100644
--- a/pkgs/development/python-modules/pycdio/default.nix
+++ b/pkgs/development/python-modules/pycdio/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "pycdio";
-  version = "2.0.0";
+  version = "2.1.0";
   disabled = !isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1a1h0lmfl56a2a9xqhacnjclv81nv3906vdylalybxrk4bhrm3hj";
+    sha256 = "01b7vqqfry071p60sabydym7r3m3rxszyqpdbs1qi5rk2sfyblnn";
   };
 
   prePatch = "sed -i -e '/DRIVER_BSDI/d' pycdio.py";
-- 
GitLab


From a86acc7e26c41bc6a2f671742a66255db3e9cd56 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 06:04:02 -0700
Subject: [PATCH 1681/2254] python37Packages.python-gitlab: 1.9.0 -> 1.11.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-python-gitlab/versions
---
 pkgs/development/python-modules/python-gitlab/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix
index bbd05b6757b..b6e6611ad45 100644
--- a/pkgs/development/python-modules/python-gitlab/default.nix
+++ b/pkgs/development/python-modules/python-gitlab/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname   = "python-gitlab";
-  version = "1.9.0";
+  version = "1.11.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1p0i6gsl4mcv6w1sm0rsxq9bq2cmmg3n7c0dniqlvqmzkk62qqhx";
+    sha256 = "1icnf27wrndglhr7h3gbns6dn6a98y3i46cmyrxpnir79446sdgy";
   };
 
   propagatedBuildInputs = [ requests six ];
-- 
GitLab


From 494b1d5b3c85742aa7e0ff056d55999629854eae Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 11:27:13 -0700
Subject: [PATCH 1682/2254] mawk: 1.3.4-20171017 -> 1.3.4-20190203

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mawk/versions
---
 pkgs/tools/text/mawk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/mawk/default.nix b/pkgs/tools/text/mawk/default.nix
index 9fed14c6d55..fbfc032445b 100644
--- a/pkgs/tools/text/mawk/default.nix
+++ b/pkgs/tools/text/mawk/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "mawk-1.3.4-20171017";
+  name = "mawk-1.3.4-20190203";
 
   src = fetchurl {
     urls = [
       "ftp://ftp.invisible-island.net/mawk/${name}.tgz"
       "https://invisible-mirror.net/archives/mawk/${name}.tgz"
     ];
-    sha256 = "0nwyxhipn4jx7j695lih1xggxm6cp4fjk4wbgihd33ni3rfi25yv";
+    sha256 = "0h5qlslaj5czz4v25hqg8a6kg4c5mlkmdpxhhvpvp1ci08ab7b6s";
   };
 
   meta = with stdenv.lib; {
-- 
GitLab


From 72e80436cd6c187cbd609a3113750ed7639458a1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 20:37:02 -0700
Subject: [PATCH 1683/2254] python37Packages.dbf: 0.98.2 -> 0.98.3

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-dbf/versions
---
 pkgs/development/python-modules/dbf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dbf/default.nix b/pkgs/development/python-modules/dbf/default.nix
index c3d5224dd4d..f81b7d1c8bf 100644
--- a/pkgs/development/python-modules/dbf/default.nix
+++ b/pkgs/development/python-modules/dbf/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
     pname = "dbf";
-    version = "0.98.2";
+    version = "0.98.3";
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "0d8m3zhhxy1f35r1s8k0s218iz86bs6v89vy65lslrxbdg5pjia0";
+      sha256 = "01d71vya2x87f3kl9x0s8xp0n7wixn6ksrd054y7idq3n1mjaxzh";
     };
 
     propagatedBuildInputs = [ aenum ] ++ stdenv.lib.optional (pythonOlder "3.4") [ enum34 ];
-- 
GitLab


From c52b5b8a5d3319e7e0321c57c9435b32de824cf2 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Fri, 30 Aug 2019 00:22:16 -0400
Subject: [PATCH 1684/2254] quassel: Fix use of `mkDerivation`

The `with stdenv;` would override the `mkDerivation` to be the regular
one, instead of the libsForQt5 one.

This simply removes the dangerous use of the all-encompassing `with`,
and prefers using a more precise inherit for `lib`.

See #65399

Co-authored-by: worldofpeace <worldofpeace@protonmail.ch>
---
 .../networking/irc/quassel/default.nix            | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix
index 6addd66ac63..d1b950a7757 100644
--- a/pkgs/applications/networking/irc/quassel/default.nix
+++ b/pkgs/applications/networking/irc/quassel/default.nix
@@ -5,7 +5,7 @@
 , static ? false # link statically
 
 , stdenv, fetchFromGitHub, cmake, makeWrapper, dconf
-, qtbase, qtscript
+, mkDerivation, qtbase, qtscript
 , phonon, libdbusmenu, qca-qt5
 
 , withKDE ? true # enable KDE integration
@@ -20,6 +20,7 @@
 }:
 
 let
+    inherit (stdenv) lib;
     buildClient = monolithic || client;
     buildCore = monolithic || enableDaemon;
 in
@@ -31,7 +32,7 @@ assert !buildClient -> !withKDE; # KDE is used by the client only
 let
   edf = flag: feature: [("-D" + feature + (if flag then "=ON" else "=OFF"))];
 
-in with stdenv; mkDerivation rec {
+in (if !buildClient then stdenv.mkDerivation else mkDerivation) rec {
   name = "quassel${tag}-${version}";
   version = "0.13.1";
 
@@ -67,13 +68,15 @@ in with stdenv; mkDerivation rec {
     ++ edf client "WANT_QTCLIENT"
     ++ edf withKDE "WITH_KDE";
 
-  preFixup =
+  dontWrapQtApps = true;
+
+  postFixup =
     lib.optionalString enableDaemon ''
-        wrapProgram "$out/bin/quasselcore" --suffix PATH : "${qtbase.bin}/bin"
+      wrapProgram "$out/bin/quasselcore" --suffix PATH : "${qtbase.bin}/bin"
     '' +
     lib.optionalString buildClient ''
-        wrapProgram "$out/bin/quassel${lib.optionalString client "client"}" \
-          --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules"
+      wrapQtApp "$out/bin/quassel${lib.optionalString client "client"}" \
+        --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules"
     '';
 
   meta = with stdenv.lib; {
-- 
GitLab


From 3fea7b5e086f323cb399353d28c9d148c8922815 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 05:37:45 -0700
Subject: [PATCH 1685/2254] davix: 0.7.4 -> 0.7.5

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/davix/versions
---
 pkgs/tools/networking/davix/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/davix/default.nix b/pkgs/tools/networking/davix/default.nix
index ff4d0d64c20..9faad377520 100644
--- a/pkgs/tools/networking/davix/default.nix
+++ b/pkgs/tools/networking/davix/default.nix
@@ -1,17 +1,17 @@
 { stdenv, fetchurl, cmake, pkgconfig, openssl, libxml2, boost, python3, libuuid }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.4";
+  version = "0.7.5";
   pname = "davix";
   nativeBuildInputs = [ cmake pkgconfig python3 ];
   buildInputs = [ openssl libxml2 boost libuuid ];
 
-  # using the url below since the 0.7.4 release did carry a broken CMake file,
+  # using the url below since the 0.7.5 release did carry a broken CMake file,
   # supposedly fixed in the next release
   # https://github.com/cern-fts/davix/issues/40
   src = fetchurl {
     url = "http://grid-deployment.web.cern.ch/grid-deployment/dms/lcgutil/tar/davix/${version}/davix-${version}.tar.gz";
-    sha256 = "1k407ckvsw1w212k3lp2867i0sscnrbigsx79l1sp5ymj3n62aih";
+    sha256 = "1j3gzsjhzrsk6irxalc3rwgp9cqb52chriadmy1mv1s6d2bwl86r";
   };
 
 
-- 
GitLab


From 13ccc86f4ea710f2e85571f2ff2598da017432ce Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 07:17:24 -0700
Subject: [PATCH 1686/2254] flatpak-builder: 1.0.8 -> 1.0.9

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/flatpak-builder/versions
---
 pkgs/development/tools/flatpak-builder/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix
index d190ee32fca..f7d344506d5 100644
--- a/pkgs/development/tools/flatpak-builder/default.nix
+++ b/pkgs/development/tools/flatpak-builder/default.nix
@@ -43,7 +43,7 @@
 let
   installed_testdir = "${placeholder "installedTests"}/libexec/installed-tests/flatpak-builder";
   installed_test_metadir = "${placeholder "installedTests"}/share/installed-tests/flatpak-builder";
-  version = "1.0.8";
+  version = "1.0.9";
 in stdenv.mkDerivation rec {
   pname = "flatpak-builder";
   inherit version;
@@ -52,7 +52,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${pname}-${version}.tar.xz";
-    sha256 = "0ns1vv2phhd3vsi2749cajwapapx7xa841kkvssixwgfa575d912";
+    sha256 = "00qd770qjsiyd8qhhhyn7zg6jyi283ix5dhjzcfdn9yr3h53kvyn";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From e33810594d9689f693774694086e69ace787f7ca Mon Sep 17 00:00:00 2001
From: Dima <dgoldin+github@protonmail.ch>
Date: Tue, 24 Sep 2019 21:39:50 +0200
Subject: [PATCH 1687/2254] epson-escpr2: 1.0.29 -> 1.1.1

The build was failing because the source rpm does not exist
on epsons servers anymore.

Thus bumping it to an existing version
https://hydra.nixos.org/build/101990975/nixlog/5
---
 pkgs/misc/drivers/epson-escpr2/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/drivers/epson-escpr2/default.nix b/pkgs/misc/drivers/epson-escpr2/default.nix
index 2110de6e4c1..96399b9cd97 100644
--- a/pkgs/misc/drivers/epson-escpr2/default.nix
+++ b/pkgs/misc/drivers/epson-escpr2/default.nix
@@ -2,11 +2,14 @@
 
 stdenv.mkDerivation rec {
   pname = "epson-inkjet-printer-escpr2";
-  version = "1.0.29";
+  version = "1.1.1";
 
   src = fetchurl {
-    url = "https://download3.ebz.epson.net/dsc/f/03/00/09/02/31/a332507b6398c6e2e007c05477dd6c3d5a8e50eb/${pname}-${version}-1lsb3.2.src.rpm";
-    sha256 = "064br52akpw5yrxb2wqw2klv4jrvyipa7w0rjj974xgyi781lqs5";
+    # To find new versions, visit http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX
+    # and search for some printer like for instance "WF-7210" to get to the most recent version.
+    # NOTE: keep in mind that many parts of the URL change and not just version.
+    url = "https://download3.ebz.epson.net/dsc/f/03/00/09/72/04/c6d928e83e558c4ba1e7e8bcb5c1fe080b8095eb/${pname}-${version}-1lsb3.2.src.rpm";
+    sha256 = "02vdlhvinsx6vsjq172b2c1vrfzkg0w9j5lbsnjvj6yq3yqz5b5q";
   };
 
   patches = [ ./cups-filter-ppd-dirs.patch ];
-- 
GitLab


From 212973a057d4c0c4c78bc7470ae4d608e5617bc6 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Tue, 1 Oct 2019 07:47:54 +0000
Subject: [PATCH 1688/2254] pythonPackages.janus: disabled if python < 3.6

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

diff --git a/pkgs/development/python-modules/janus/default.nix b/pkgs/development/python-modules/janus/default.nix
index ea82ec4f99b..da0f43811f2 100644
--- a/pkgs/development/python-modules/janus/default.nix
+++ b/pkgs/development/python-modules/janus/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, pytest }:
+{ lib, buildPythonPackage, fetchPypi, pytest, pythonOlder }:
 
 buildPythonPackage rec {
   pname = "janus";
@@ -9,7 +9,9 @@ buildPythonPackage rec {
     sha256 = "cfc221683160b91b35bae1917e2957b78dad10a2e634f4f8ed119ed72e2a88ef";
   };
 
- checkInputs = [ pytest ];
+  disabled = pythonOlder "3.6";
+
+  checkInputs = [ pytest ];
 
   meta = with lib; {
     description = "Mixed sync-async queue";
-- 
GitLab


From f641fca688c8be93bcb1c0f54920ce16e9b0e631 Mon Sep 17 00:00:00 2001
From: Jan Hrnko <jan.hrnko@satoshilabs.com>
Date: Tue, 1 Oct 2019 09:31:27 +0200
Subject: [PATCH 1689/2254] diceware: add missing 'setuptools' to
 propagatedBuildInputs

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

diff --git a/pkgs/tools/security/diceware/default.nix b/pkgs/tools/security/diceware/default.nix
index 1c3d5f1d465..07682eb22c5 100644
--- a/pkgs/tools/security/diceware/default.nix
+++ b/pkgs/tools/security/diceware/default.nix
@@ -15,6 +15,8 @@ buildPythonApplication rec {
 
   nativeBuildInputs = [ pytestrunner ];
 
+  propagatedBuildInputs = [ setuptools ];
+
   checkInputs = [ coverage pytest ];
 
   # see https://github.com/ulif/diceware/commit/a7d844df76cd4b95a717f21ef5aa6167477b6733
-- 
GitLab


From b444b2e9563f01355d181a89fa9dcfd30130c5a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Maret?= <sebastien.maret@icloud.com>
Date: Tue, 1 Oct 2019 10:52:50 +0200
Subject: [PATCH 1690/2254] gildas: 20190901_a -> 20191001_a

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

diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix
index a21c9f328f4..9584c2f41a8 100644
--- a/pkgs/applications/science/astronomy/gildas/default.nix
+++ b/pkgs/applications/science/astronomy/gildas/default.nix
@@ -7,8 +7,8 @@ let
 in
 
 stdenv.mkDerivation rec {
-  srcVersion = "sep19a";
-  version = "20190901_a";
+  srcVersion = "oct19a";
+  version = "20191001_a";
   pname = "gildas";
 
   src = fetchurl {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     # source code of the previous release to a different directory
     urls = [ "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.xz"
       "http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.xz" ];
-    sha256 = "0l4jfzzxp1ab70a920qfbxiphgnc06m46wfwv0jlsq2mfk7cxac1";
+    sha256 = "0h6g16ra7v8x15j21z5hnb3midwm0asc7bjm9gs5v5sw66vn3wc1";
   };
 
   enableParallelBuilding = true;
-- 
GitLab


From f8c6b826d4e481af8ec690682fada5fb6e6d8010 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 1 Oct 2019 11:09:41 +0200
Subject: [PATCH 1691/2254] python3Packages.scikit-build: fix build

Build broke as it's attempted to run the cmake configure-phase which
won't work as this package uses cmake, but builds via a `setup.py`
rather than a `CMakeLists.txt`.

ZHF #68361
---
 pkgs/development/python-modules/scikit-build/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/scikit-build/default.nix b/pkgs/development/python-modules/scikit-build/default.nix
index 91fa26ef44d..3fe7b9ff4ef 100644
--- a/pkgs/development/python-modules/scikit-build/default.nix
+++ b/pkgs/development/python-modules/scikit-build/default.nix
@@ -22,6 +22,8 @@ buildPythonPackage rec {
     requests flake8
   ];
 
+  dontUseCmakeConfigure = true;
+
   disabledTests = lib.concatMapStringsSep " and " (s: "not " + s) ([
     "test_hello_develop" # tries setuptools develop install
     "test_source_distribution" # pip has no way to install missing dependencies
-- 
GitLab


From a96a5f37d2a50880cc3c085bb34da490aa23ba88 Mon Sep 17 00:00:00 2001
From: Calvin Kim <ccychc@gmail.com>
Date: Tue, 1 Oct 2019 19:43:27 +0900
Subject: [PATCH 1692/2254] nixos/cmt: Update error message for cmt

Added clearer error message for the failed assertion with libinput
---
 nixos/modules/services/x11/hardware/cmt.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/hardware/cmt.nix b/nixos/modules/services/x11/hardware/cmt.nix
index 95353e92098..5ac824c5e41 100644
--- a/nixos/modules/services/x11/hardware/cmt.nix
+++ b/nixos/modules/services/x11/hardware/cmt.nix
@@ -47,7 +47,12 @@ in {
     assertions = [
       {
         assertion = !config.services.xserver.libinput.enable;
-        message = "cmt and libinput are incompatible, you cannot enable both (in services.xserver).";
+        message = ''
+          cmt and libinput are incompatible, meaning you cannot enable them both.
+          To use cmt you need to disable libinput with `services.xserver.libinput.enable = false`
+          If you haven't enabled it in configuration.nix, it's enabled by default on a
+          different xserver module.
+        '';
       }
     ];
   };
-- 
GitLab


From c7164ea3c49545c689a7b3c869d5a57b4d4d8228 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 1 Oct 2019 13:53:33 +0200
Subject: [PATCH 1693/2254] python3Packages.pytaglib: fix build

Applied several patches to fix the test suite on python 2.7 and to
properly install the `pyprinttags` executable. Also switched to the
GitHub source for now as the PyPI tarball was wrongly packaged and
didn't contain the `pyprinttags.py` script (see the last two patches for
further reference).

See also https://hydra.nixos.org/build/102493330

ZHF #68361
---
 .../python-modules/pytaglib/default.nix       | 33 ++++++++++++++++---
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/pytaglib/default.nix b/pkgs/development/python-modules/pytaglib/default.nix
index 46d4135d6af..6b19a8f0c73 100644
--- a/pkgs/development/python-modules/pytaglib/default.nix
+++ b/pkgs/development/python-modules/pytaglib/default.nix
@@ -1,21 +1,46 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , taglib
 , cython
 , pytest
 , glibcLocales
+, fetchpatch
 }:
 
 buildPythonPackage rec {
   pname   = "pytaglib";
   version = "1.4.5";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "8aec64bc146a9f72778a0d2d1f3448f58be6ebea68f64b0ff88ea8e0f4dc5d8f";
+  src = fetchFromGitHub {
+    owner = "supermihi";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1gvvadlgk8ny8bg76gwvvfcwp1nfgrjphi60h5f9ha7h5ff1g2wb";
   };
 
+  patches = [
+    # fix tests on python 2.7
+    (fetchpatch {
+      url = https://github.com/supermihi/pytaglib/commit/0c4ae750fcd5b18d2553975c7e3e183e9dca5bf1.patch;
+      sha256 = "1kv3c68vimx5dc8aacvzphiaq916avmprxddi38wji8p2ql6vngj";
+    })
+
+    # properly install pyprinttags
+    (fetchpatch {
+      url = https://github.com/supermihi/pytaglib/commit/ba7a1406ddf35ddc41ed57f1c8d1f2bc2ed2c93a.patch;
+      sha256 = "0pi0dcq7db5fd3jnbwnfsfsgxvlhnm07z5yhpp93shk0s7ci2bwp";
+    })
+    (fetchpatch {
+      url = https://github.com/supermihi/pytaglib/commit/28772f6f94d37f05728071381a0fa04c6a14783a.patch;
+      sha256 = "0h259vzj1l0gpibdf322yclyd10x5rh1anzhsjj2ghm6rj6q0r0m";
+    })
+  ];
+
+  postPatch = ''
+    substituteInPlace setup.py --replace "'pytest-runner', " ""
+  '';
+
   buildInputs = [ taglib cython ];
 
   checkInputs = [ pytest glibcLocales ];
-- 
GitLab


From 6f807b386133743954d6bc8fbfe84d9eed2185cb Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 1 Oct 2019 08:00:08 -0400
Subject: [PATCH 1694/2254] linux: 4.19.75 -> 4.19.76

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix
index 9e1fd6bfd8a..da7347f7c67 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.19.75";
+  version = "4.19.76";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0y0vcmxyfg98mm63vaqq6n2bmxkbmrnvigm5zdh1al74w53p2pnx";
+    sha256 = "0rhyjw5r3xdnj37dd6wrpihdqc3zn5ih6hcpa4x2cjvk0acx4kds";
   };
 } // (args.argsOverride or {}))
-- 
GitLab


From 5783f5335dec24741e014921133ce8992d075597 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 1 Oct 2019 08:00:22 -0400
Subject: [PATCH 1695/2254] linux: 5.2.17 -> 5.2.18

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

diff --git a/pkgs/os-specific/linux/kernel/linux-5.2.nix b/pkgs/os-specific/linux/kernel/linux-5.2.nix
index 9de8418cc5d..db8fc2965cf 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.2.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.2.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.2.17";
+  version = "5.2.18";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "1y9d218w83qgd6wima6h6n4zbj1rxz15yb6hdlhv8dm9kv88lfvv";
+    sha256 = "0q6akmhcdj52lhvs5fjxrr25r0hyklh7115hg0zl0fcpdj30y2bd";
   };
 } // (args.argsOverride or {}))
-- 
GitLab


From ed5a7f6740e323b77e348419753374bb201689cb Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 1 Oct 2019 08:00:25 -0400
Subject: [PATCH 1696/2254] linux: 5.3.1 -> 5.3.2

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

diff --git a/pkgs/os-specific/linux/kernel/linux-5.3.nix b/pkgs/os-specific/linux/kernel/linux-5.3.nix
index 4586e5d64a9..43f096be1a7 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.3.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.3.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.3.1";
+  version = "5.3.2";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "0n7qjakglzh6rpbjdjqr4fgp8f8fd3qgb5as0hfj25nk16lvb44q";
+    sha256 = "0szw21mpp94gp3zn2fgllbv6fdjjf20njgrcjay7vjmm7farq7rn";
   };
 } // (args.argsOverride or {}))
-- 
GitLab


From f5aaf1f9588f64e5340a445ab29f46aa1a365582 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 1 Oct 2019 08:02:01 -0400
Subject: [PATCH 1697/2254] zoom-us: 3.0.291715.0908 -> 3.0.301026.0930

---
 .../networking/instant-messengers/zoom-us/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index 933badccf63..5a84f9be96d 100644
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -14,11 +14,11 @@ assert pulseaudioSupport -> libpulseaudio != null;
 let
   inherit (stdenv.lib) concatStringsSep makeBinPath optional;
 
-  version = "3.0.291715.0908";
+  version = "3.0.301026.0930";
   srcs = {
     x86_64-linux = fetchurl {
       url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz";
-      sha256 = "1f2fcwf0p86bxcnfdhij6hvgizd7n7gjcccwzdm2jv0dbqskad2f";
+      sha256 = "0y3c7345y2wibz6p7d6p89wraaqb51651p176z4v7lcjv3gr8dar";
     };
   };
 
-- 
GitLab


From f7765fb052879f109c4920e13569173934c1b57d Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 1 Oct 2019 08:04:40 -0400
Subject: [PATCH 1698/2254] oh-my-zsh: 2019-09-24 -> 2019-10-01

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

diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix
index b2ae7a2f30f..12802b414b5 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -4,13 +4,13 @@
 { stdenv, fetchgit }:
 
 stdenv.mkDerivation rec {
-  version = "2019-09-24";
+  version = "2019-10-01";
   pname = "oh-my-zsh";
-  rev = "f9e7c45a484723f693a77ab6128a1cc163f3704a";
+  rev = "bb6ae70b92ce720762ff3baed65aadbd34fc1867";
 
   src = fetchgit { inherit rev;
     url = "https://github.com/robbyrussell/oh-my-zsh";
-    sha256 = "10ih8bxsha5vq1cvfx5j7w0pd3zqxk8iam787r3z15l12xs9kfsq";
+    sha256 = "1is3rk3bix1i8splamc6fi157pjvx25s66vvgvq298gs50k5jf9x";
   };
 
   pathsToLink = [ "/share/oh-my-zsh" ];
-- 
GitLab


From dd8ca1cac2c15db79d958d0db804beef635bc17c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Tue, 1 Oct 2019 09:26:15 -0300
Subject: [PATCH 1699/2254] enlightenment.enlightenment: 0.23.0 -> 0.23.1

---
 pkgs/desktops/enlightenment/enlightenment.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix
index a5724385e41..99d1236ea88 100644
--- a/pkgs/desktops/enlightenment/enlightenment.nix
+++ b/pkgs/desktops/enlightenment/enlightenment.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation rec {
   pname = "enlightenment";
-  version = "0.23.0";
+  version = "0.23.1";
 
   src = fetchurl {
     url = "http://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "1y7x594gvyvl5zbb1rnf3clj2pm6j97n8wl5mp9x6xjmhx0d1idq";
+    sha256 = "0d1cyl07w9pvi2pf029kablazks2q9aislzl46b6fq5m1465jc75";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From 40dad5ec30f79754b82dd3bcba087ebadd005c90 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 1 Oct 2019 14:41:36 +0200
Subject: [PATCH 1700/2254] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.15.0-1-g5325ccd from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/c3176c037fe0413020074aeda2569fdace1378cb.
---
 .../haskell-modules/hackage-packages.nix      | 175 ++++++++++++++----
 1 file changed, 135 insertions(+), 40 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 0f3b4d7bb6c..8cda5e037c2 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -31566,6 +31566,47 @@ self: {
        broken = true;
      }) {};
 
+  "asif_6_0_3" = callPackage
+    ({ mkDerivation, attoparsec, base, binary, bytestring, conduit
+     , conduit-combinators, conduit-extra, containers, cpu, directory
+     , either, exceptions, foldl, generic-lens, hedgehog, hspec
+     , hspec-discover, hw-bits, hw-hspec-hedgehog, hw-ip, lens, network
+     , old-locale, optparse-applicative, profunctors, resourcet
+     , temporary-resourcet, text, thyme, transformers, vector
+     }:
+     mkDerivation {
+       pname = "asif";
+       version = "6.0.3";
+       sha256 = "14c77hvghh6116ca29xzj1l7j95557mcfx0j9s73wxc82hl14wjg";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         attoparsec base binary bytestring conduit conduit-combinators
+         conduit-extra containers cpu either exceptions foldl generic-lens
+         hw-bits hw-ip lens network old-locale profunctors resourcet
+         temporary-resourcet text thyme transformers vector
+       ];
+       executableHaskellDepends = [
+         attoparsec base binary bytestring conduit conduit-combinators
+         conduit-extra containers cpu directory either exceptions foldl
+         generic-lens hw-bits hw-ip lens network old-locale
+         optparse-applicative profunctors resourcet temporary-resourcet text
+         thyme transformers vector
+       ];
+       testHaskellDepends = [
+         attoparsec base binary bytestring conduit conduit-combinators
+         conduit-extra containers cpu either exceptions foldl generic-lens
+         hedgehog hspec hw-bits hw-hspec-hedgehog hw-ip lens network
+         old-locale profunctors resourcet temporary-resourcet text thyme
+         transformers vector
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Library for creating and querying segmented feeds";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "asil" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
      , data-binary-ieee754, directory, filepath, haskell-src-exts, mtl
@@ -31671,6 +31712,8 @@ self: {
        pname = "asn1-encoding";
        version = "0.9.6";
        sha256 = "02nsr30h5yic1mk7znf0q4z3n560ip017n60hg7ya25rsfmxxy6r";
+       revision = "1";
+       editedCabalFile = "19nq8g1v323p47cqlc4m9r6li35dd3cmcd7k486jw24cijkdjm9n";
        libraryHaskellDepends = [ asn1-types base bytestring hourglass ];
        testHaskellDepends = [
          asn1-types base bytestring hourglass mtl tasty tasty-quickcheck
@@ -35945,6 +35988,8 @@ self: {
        pname = "basen";
        version = "0.1.0.0";
        sha256 = "0v7dksk1zq17kpa5nknn5am1ywy58d0f6jr2vnb9jzy4v70m6ngx";
+       revision = "1";
+       editedCabalFile = "0iwmv5kmh7lj96jvnllkrmrbivv1kbwk6f3nnd80zcv5iifsdxj8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring text ];
@@ -45673,20 +45718,19 @@ self: {
 
   "cabal-rpm" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, directory, filepath
-     , http-client, http-client-tls, http-conduit, process, simple-cmd
-     , time, unix
+     , http-client, http-client-tls, http-conduit, process, simple-cabal
+     , simple-cmd, simple-cmd-args, time, unix
      }:
      mkDerivation {
        pname = "cabal-rpm";
-       version = "0.13.3";
-       sha256 = "04d5m74i0r6livhkhmccrwhshpa2aizyb77i2qcqhxradw0lkvl4";
-       revision = "1";
-       editedCabalFile = "1ngw9afzplbz4q707nak9zcjmk9fdynw0jvis4lgjq02y4i14hj6";
+       version = "1.0.1";
+       sha256 = "0p0z5yar9dzbssqy1flwvj15gnfyi708n9pf8ij8h15bya9qrg3a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          base bytestring Cabal directory filepath http-client
-         http-client-tls http-conduit process simple-cmd time unix
+         http-client-tls http-conduit process simple-cabal simple-cmd
+         simple-cmd-args time unix
        ];
        description = "RPM packaging tool for Haskell Cabal-based packages";
        license = stdenv.lib.licenses.gpl3;
@@ -49895,8 +49939,8 @@ self: {
      }:
      mkDerivation {
        pname = "chiphunk";
-       version = "0.1.1.0";
-       sha256 = "0avh87427i06ds79kkiikf6czylgwscxim3hjaz0fbpgvsd9snrm";
+       version = "0.1.2.0";
+       sha256 = "0bdmvsspbnyqqf4bp8g8xggly1xs2yglh60y63633h27qdy2062b";
        libraryHaskellDepends = [
          base hashable safe-exceptions StateVar vector-space
        ];
@@ -57498,8 +57542,8 @@ self: {
     ({ mkDerivation, aeson, base, constraints, template-haskell }:
      mkDerivation {
        pname = "constraints-extras";
-       version = "0.3.0.1";
-       sha256 = "0majx5yrddpyvymfl84dqwrqf4bf91jskgaki4ia0h8vhzqfcivx";
+       version = "0.3.0.2";
+       sha256 = "1n3k5ld6qzq7vlwsqwrm3gsg4z7mk11ah3amazzbvbmxwz8wviys";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base constraints template-haskell ];
@@ -95525,8 +95569,8 @@ self: {
      }:
      mkDerivation {
        pname = "github";
-       version = "0.22";
-       sha256 = "15py79qcpj0k331i42njgwkirwyiacbc5razmxnm4672dvvip2qk";
+       version = "0.23";
+       sha256 = "1d08m0kajl6zaralz1rbm4miv2a5zrbm6asjyrl75n915l56m9mb";
        libraryHaskellDepends = [
          aeson base base-compat base16-bytestring binary binary-instances
          bytestring containers cryptohash-sha1 deepseq deepseq-generics
@@ -111922,6 +111966,8 @@ self: {
        pname = "haskus-binary";
        version = "1.4";
        sha256 = "0riqgfy9ai1vb7555l1w9rfcp10ylg7sbk46ph1f2y00pjbxsmv3";
+       revision = "1";
+       editedCabalFile = "1b1dxsrl6iq97dbjsw90jpy6s37dik245w4jgaj2pgqsw1w1vz5h";
        libraryHaskellDepends = [
          base bytestring cereal directory filepath ghc-prim haskus-utils
          haskus-utils-data haskus-utils-types megaparsec mtl primitive
@@ -130803,15 +130849,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hw-prim_0_6_2_34" = callPackage
+  "hw-prim_0_6_2_35" = callPackage
     ({ mkDerivation, base, bytestring, criterion, directory, exceptions
      , ghc-prim, hedgehog, hspec, hspec-discover, hw-hspec-hedgehog
      , mmap, QuickCheck, semigroups, transformers, unliftio-core, vector
      }:
      mkDerivation {
        pname = "hw-prim";
-       version = "0.6.2.34";
-       sha256 = "1smp5fwnycps4avnv321bmx3ln8pvvr0yppfivm46qcnilaasyy8";
+       version = "0.6.2.35";
+       sha256 = "0fm1bmk2da0bsvpf8qvyyapwwc8vlybhibs5n53v067faf38dxqf";
        libraryHaskellDepends = [
          base bytestring ghc-prim mmap semigroups transformers unliftio-core
          vector
@@ -132348,6 +132394,23 @@ self: {
        license = "(BSD-3-Clause OR Apache-2.0)";
      }) {};
 
+  "hz3" = callPackage
+    ({ mkDerivation, base, containers, hspec, QuickCheck, transformers
+     , z3
+     }:
+     mkDerivation {
+       pname = "hz3";
+       version = "96.0.0.0";
+       sha256 = "080bhbnhswic7m35rzbqi9i7lb57szag6khprrjccpa80vq7lj6n";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base containers transformers ];
+       librarySystemDepends = [ z3 ];
+       testHaskellDepends = [ base hspec QuickCheck ];
+       description = "Bindings for the Z3 Theorem Prover";
+       license = stdenv.lib.licenses.bsd3;
+     }) {inherit (pkgs) z3;};
+
   "hzaif" = callPackage
     ({ mkDerivation, aeson, base, bytestring, http-conduit, text }:
      mkDerivation {
@@ -175471,21 +175534,24 @@ self: {
 
   "overloaded" = callPackage
     ({ mkDerivation, base, bytestring, containers, fin, generic-lens
-     , ghc, HUnit, lens, singleton-bool, sop-core, split, syb, symbols
-     , tasty, tasty-hunit, text, time, vec
+     , ghc, HUnit, lens, optics-core, record-hasfield, singleton-bool
+     , sop-core, split, syb, symbols, tasty, tasty-hunit, text, time
+     , vec
      }:
      mkDerivation {
        pname = "overloaded";
-       version = "0.1.1";
-       sha256 = "0palmwxknrc5pqwhlij3rfbzfz9csi5h41iild89bxkb3qj0x2z4";
+       version = "0.1.2";
+       sha256 = "0m2ddb48vsl0x0hz6pq8wabl1s6vl7s66rz7z9v2i6d809zl83kw";
        libraryHaskellDepends = [
-         base bytestring containers fin ghc sop-core split syb symbols text
-         time vec
+         base bytestring containers fin ghc optics-core record-hasfield
+         sop-core split syb symbols text time vec
        ];
        testHaskellDepends = [
-         base bytestring containers fin generic-lens HUnit lens
-         singleton-bool sop-core symbols tasty tasty-hunit text time vec
+         base bytestring containers fin generic-lens HUnit lens optics-core
+         record-hasfield singleton-bool sop-core symbols tasty tasty-hunit
+         text time vec
        ];
+       doHaddock = false;
        description = "Overloaded pragmas as a plugin";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -209787,8 +209853,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-errors";
-       version = "0.1.3.0";
-       sha256 = "1l8hcjjjcc90hrzc3mkd081ql1ljb510kdaskbar1gqhaz6s96wb";
+       version = "0.1.3.1";
+       sha256 = "120rl4adz54c3psb6qv8l6im4xv2649kwazvfr7h0l11jjfb6hni";
        libraryHaskellDepends = [
          aeson base bytestring http-api-data http-media http-types
          scientific servant string-conversions text unordered-containers wai
@@ -211411,8 +211477,8 @@ self: {
      }:
      mkDerivation {
        pname = "serverless-haskell";
-       version = "0.8.11";
-       sha256 = "1jvfjq7qlyqyprvhlk0licr8mrnc7xn5l4g3l95g3x4qii48j4s0";
+       version = "0.9.1";
+       sha256 = "09l9d43ls4ca10y0fx39l8bqsmb226sa0f5yprsm5jz5nbvl70qv";
        libraryHaskellDepends = [
          aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis
          amazonka-s3 base bytestring case-insensitive http-types iproute
@@ -215914,14 +215980,14 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
-  "skylighting_0_8_2_1" = callPackage
+  "skylighting_0_8_2_2" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers
      , skylighting-core
      }:
      mkDerivation {
        pname = "skylighting";
-       version = "0.8.2.1";
-       sha256 = "1xls8ycad77m55ax4hp55k60h3pi5sm3m32hycbc8baixbgfx5xz";
+       version = "0.8.2.2";
+       sha256 = "1fw9ay8h22vlf2nk8nvijsq1rqfyahz9h2zw4lkkl0ja71l4d589";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -215964,25 +216030,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "skylighting-core_0_8_2_1" = callPackage
+  "skylighting-core_0_8_2_2" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, attoparsec, base
      , base64-bytestring, binary, blaze-html, bytestring
      , case-insensitive, colour, containers, criterion, Diff, directory
      , filepath, HUnit, hxt, mtl, pretty-show, QuickCheck, random
-     , regex-base, regex-pcre-builtin, safe, tasty, tasty-golden
-     , tasty-hunit, tasty-quickcheck, text, transformers, utf8-string
+     , regex-pcre-builtin, safe, tasty, tasty-golden, tasty-hunit
+     , tasty-quickcheck, text, transformers, utf8-string
      }:
      mkDerivation {
        pname = "skylighting-core";
-       version = "0.8.2.1";
-       sha256 = "0hdchivb4af9w7v5v7lrwfwawd3kcwmpzk69m1vkkm3pis8lcr1s";
+       version = "0.8.2.2";
+       sha256 = "18zs0j2ckaryskq6n4pky3dfbd85kkx24d154wkswydvybkn9gl7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson ansi-terminal attoparsec base base64-bytestring binary
          blaze-html bytestring case-insensitive colour containers directory
-         filepath hxt mtl regex-base regex-pcre-builtin safe text
-         transformers utf8-string
+         filepath hxt mtl regex-pcre-builtin safe text transformers
+         utf8-string
        ];
        testHaskellDepends = [
          aeson base bytestring containers Diff directory filepath HUnit
@@ -225675,6 +225741,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "stripe-concepts_1_0_2_0" = callPackage
+    ({ mkDerivation, base, bytestring, text }:
+     mkDerivation {
+       pname = "stripe-concepts";
+       version = "1.0.2.0";
+       sha256 = "0a8p4pm8v83kcgxm3jpmpl4811pdjjn2rmdl0mkq649rfnm3cg2k";
+       libraryHaskellDepends = [ base bytestring text ];
+       description = "Types for the Stripe API";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "stripe-core" = callPackage
     ({ mkDerivation, aeson, base, bytestring, mtl, text, time
      , transformers, unordered-containers
@@ -225817,6 +225895,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "stripe-wreq_1_0_1_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, lens, stripe-concepts
+     , text, unordered-containers, wreq
+     }:
+     mkDerivation {
+       pname = "stripe-wreq";
+       version = "1.0.1.0";
+       sha256 = "0i5d0c9zha4v9361p92kq5bpma5dq5aqdkqdrghwpzx0pppfpx3y";
+       libraryHaskellDepends = [
+         aeson base bytestring lens stripe-concepts text
+         unordered-containers wreq
+       ];
+       description = "Use the Stripe API via Wreq";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "strips" = callPackage
     ({ mkDerivation, base, containers, hspec, mtl }:
      mkDerivation {
@@ -232512,8 +232607,8 @@ self: {
        pname = "test-framework";
        version = "0.8.2.0";
        sha256 = "1hhacrzam6b8f10hyldmjw8pb7frdxh04rfg3farxcxwbnhwgbpm";
-       revision = "4";
-       editedCabalFile = "1g1z9h55ii55b44gzgrjgi1lpk85yfi4yhrynvfy0199ywpckpd5";
+       revision = "5";
+       editedCabalFile = "18g92ajx3ghznd6k3ihj22ln29n676ailzwx3k0f1kj3bmpilnh6";
        libraryHaskellDepends = [
          ansi-terminal ansi-wl-pprint base containers hostname old-locale
          random regex-posix time xml
-- 
GitLab


From 6efc9c1bb5cea4284858990c04eaec54c66ef7a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Tue, 1 Oct 2019 09:47:21 -0300
Subject: [PATCH 1701/2254] numix-icon-theme: 18.07.17 -> 19.09.20

---
 pkgs/data/icons/numix-icon-theme/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix
index e41373f536f..da6556c6060 100644
--- a/pkgs/data/icons/numix-icon-theme/default.nix
+++ b/pkgs/data/icons/numix-icon-theme/default.nix
@@ -2,20 +2,20 @@
 
 stdenv.mkDerivation rec {
   pname = "numix-icon-theme";
-  version = "18.07.17";
+  version = "19.09.20";
 
   src = fetchFromGitHub {
     owner = "numixproject";
     repo = pname;
     rev = version;
-    sha256 = "0clh55kmhc52d33dfm2c6h3lg6ddfh8a088ir9lv1camn9kj55bd";
+    sha256 = "0pn3x0mmsph777lwhg890ck366p31bjl3755h4pv161ym08d4z9w";
   };
 
   nativeBuildInputs = [ gtk3 hicolor-icon-theme ];
 
   installPhase = ''
     mkdir -p $out/share/icons
-    mv Numix{,-Light} $out/share/icons
+    cp -a Numix{,-Light} $out/share/icons/
   '';
 
   postFixup = ''
-- 
GitLab


From 417c4193b29f44f6c9e56039ca689a86ad24d13c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Tue, 1 Oct 2019 09:53:48 -0300
Subject: [PATCH 1702/2254] numix-icon-theme-circle: 19.05.07 -> 19.09.20

---
 pkgs/data/icons/numix-icon-theme-circle/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix
index 76cf450e1cc..ee481465ead 100644
--- a/pkgs/data/icons/numix-icon-theme-circle/default.nix
+++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "numix-icon-theme-circle";
-  version = "19.05.07";
+  version = "19.09.20";
 
   src = fetchFromGitHub {
     owner = "numixproject";
     repo = pname;
     rev = version;
-    sha256 = "04h7kp1895rkfaqrgzrpqjmqamkxv3dkmhslgm2cxsa6qc0wammg";
+    sha256 = "1pmz2dy1580ln5m57xw3vhqrjhviayisgbs2km3i77hyx66hiivi";
   };
 
   nativeBuildInputs = [ gtk3 numix-icon-theme ];
-- 
GitLab


From c993eb3fb369a3c4e3c8f95548759cf9fb47e436 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Tue, 1 Oct 2019 09:54:49 -0300
Subject: [PATCH 1703/2254] numix-icon-theme-circle: add romildo as maintainer

---
 pkgs/data/icons/numix-icon-theme-circle/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix
index ee481465ead..3a461e993d1 100644
--- a/pkgs/data/icons/numix-icon-theme-circle/default.nix
+++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix
@@ -30,6 +30,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3;
     # darwin cannot deal with file names differing only in case
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = with maintainers; [ romildo ];
   };
 }
-- 
GitLab


From c1c13c0b994ef5fc8475364a9f5159521ba205fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Tue, 1 Oct 2019 09:59:33 -0300
Subject: [PATCH 1704/2254] numix-icon-theme-square: 19.05.07 -> 19.09.20

---
 pkgs/data/icons/numix-icon-theme-square/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix
index 08b30847603..31ef15d40f7 100644
--- a/pkgs/data/icons/numix-icon-theme-square/default.nix
+++ b/pkgs/data/icons/numix-icon-theme-square/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "numix-icon-theme-square";
-  version = "19.05.07";
+  version = "19.09.20";
 
   src = fetchFromGitHub {
     owner = "numixproject";
     repo = pname;
     rev = version;
-    sha256 = "13wxy36qys439pv0xaynqvmjshnfrk9wa89iw878ibvfj506ji2s";
+    sha256 = "0q3d4d4wndknz3043bh8ardjvdpds2hkzk73kyyh1848wg4ff0ly";
   };
 
   nativeBuildInputs = [ gtk3 numix-icon-theme ];
-- 
GitLab


From 79b99099cf21613e3a5d28cbc8ffe6ff9bac3d49 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Tue, 1 Oct 2019 15:46:52 +0200
Subject: [PATCH 1705/2254] grafana: 6.3.6 -> 6.4.0

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

diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index 3d61961321d..3c10ec6f985 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "grafana";
-  version = "6.3.6";
+  version = "6.4.0";
 
   goPackagePath = "github.com/grafana/grafana";
 
@@ -12,12 +12,12 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "grafana";
     repo = "grafana";
-    sha256 = "1dxsd32ny7wcpfyhhdf5m6anzgs0mkyvlrha7ps5pfyiix7brrlk";
+    sha256 = "0rqfgswlq4fs3kb1cdpisvhawxvfirrs5pja6143sm1via3p8y59";
   };
 
   srcStatic = fetchurl {
     url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
-    sha256 = "0cz6bg8q8lxxvqh9nb2b64rr5brkmbvpvvg4x7dykc04vcjivf6n";
+    sha256 = "1hyawiq7jgdak93ayzxmksbvkvdmfc26ska0n28f4gqppvrvkcqn";
   };
 
   postPatch = ''
-- 
GitLab


From bd355d9a387e350071bdbfa32d3154f6eb5ac645 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 1 Oct 2019 16:18:59 +0200
Subject: [PATCH 1706/2254] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.15.0-1-g5325ccd from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/b51789ef3eed6bcb3a786ae581d424a62526e333.
---
 .../haskell-modules/hackage-packages.nix      | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 8cda5e037c2..debddd3272c 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -46319,8 +46319,8 @@ self: {
      }:
      mkDerivation {
        pname = "cachix";
-       version = "0.3.3";
-       sha256 = "06jj961im8pavn7lay4kfn5dcs8pbd6adq8cmxalf4cm8gy77bxj";
+       version = "0.3.4";
+       sha256 = "1zafbwy0pbdnaybf7q9izrwi6w1l0df6l5628i6m9j9d82k75iqx";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -167798,18 +167798,21 @@ self: {
      }) {};
 
   "net-spider-rpl" = callPackage
-    ({ mkDerivation, aeson, base, conduit, conduit-parse, greskell
-     , hashable, hspec, ip, mtl, net-spider, safe-exceptions, text, time
+    ({ mkDerivation, aeson, base, bytestring, conduit, conduit-parse
+     , fast-logger, greskell, hashable, hspec, ip, monad-logger, mtl
+     , net-spider, safe-exceptions, text, time
      }:
      mkDerivation {
        pname = "net-spider-rpl";
-       version = "0.2.3.0";
-       sha256 = "1nsx9y8g2fpqkh52wnlzpq6p9vsp8y3rcikin1gsf7fjs18n74k8";
+       version = "0.3.0.0";
+       sha256 = "1b0035j4y4gd8jhisnjs4fgw2jmyh91az6b29869wxwdcrvk3cm4";
        libraryHaskellDepends = [
-         aeson base conduit conduit-parse greskell hashable ip mtl
-         net-spider safe-exceptions text time
+         aeson base conduit conduit-parse greskell hashable ip monad-logger
+         mtl net-spider safe-exceptions text time
+       ];
+       testHaskellDepends = [
+         base bytestring fast-logger hspec monad-logger net-spider text
        ];
-       testHaskellDepends = [ base hspec net-spider text ];
        description = "NetSpider data model and utility for RPL networks";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-- 
GitLab


From e082fe47b7fea832de1d490f22f09bd709951cc1 Mon Sep 17 00:00:00 2001
From: Shahrukh Khan <shahrukh@Shahrukhs-MacBook-Pro.local>
Date: Tue, 1 Oct 2019 19:25:10 +0500
Subject: [PATCH 1707/2254] maintainers: add shahrukh330

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 5f4912daa68..43202425654 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5807,6 +5807,12 @@
     githubId = 1151264;
     name = "Sebastian Graf";
   };
+  shahrukh330 = {
+    email = "shahrukh330@gmail.com";
+    github = "shahrukh330";
+    githubId = 1588288;
+    name = "Shahrukh Khan";
+  };
   shanemikel = {
     email = "shanemikel1@gmail.com";
     github = "shanemikel";
-- 
GitLab


From d1a8006b89bdfb511450316e5088a179a8e69d78 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Tue, 1 Oct 2019 14:30:52 +0200
Subject: [PATCH 1708/2254] transifex-client: Add missing setuptools dependency

---
 pkgs/tools/text/transifex-client/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/text/transifex-client/default.nix b/pkgs/tools/text/transifex-client/default.nix
index 9a11b5fba57..12e68689934 100644
--- a/pkgs/tools/text/transifex-client/default.nix
+++ b/pkgs/tools/text/transifex-client/default.nix
@@ -1,12 +1,12 @@
 { stdenv, buildPythonApplication, fetchPypi
-, python-slugify, requests, urllib3, six }:
+, python-slugify, requests, urllib3, six, setuptools }:
 
 buildPythonApplication rec {
   pname = "transifex-client";
   version = "0.13.6";
 
   propagatedBuildInputs = [
-    urllib3 requests python-slugify six
+    urllib3 requests python-slugify six setuptools
   ];
 
   src = fetchPypi {
@@ -24,7 +24,7 @@ buildPythonApplication rec {
   doCheck = false;
 
   meta = with stdenv.lib; {
-    homepage = https://www.transifex.com/;
+    homepage = "https://www.transifex.com/";
     license = licenses.gpl2;
     description = "Transifex translation service client";
     maintainers = [ maintainers.etu ];
-- 
GitLab


From 4941a8b8e2c2ba5218441cbf0077b5117dfb34e9 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Tue, 1 Oct 2019 16:44:28 +0200
Subject: [PATCH 1709/2254] cargo-audit: init at 0.9.1

cargo-audit is a subcommand for cargo which audits Cargo.lock files for crates
with security vulnerabilities
---
 .../cargo-audit/default.nix                   | 28 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  3 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/tools/package-management/cargo-audit/default.nix

diff --git a/pkgs/tools/package-management/cargo-audit/default.nix b/pkgs/tools/package-management/cargo-audit/default.nix
new file mode 100644
index 00000000000..45422f613d0
--- /dev/null
+++ b/pkgs/tools/package-management/cargo-audit/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, lib, rustPlatform, fetchFromGitHub, openssl, pkg-config, Security, libiconv }:
+rustPlatform.buildRustPackage rec {
+  pname = "cargo-audit";
+  version = "0.9.1";
+
+  src = fetchFromGitHub {
+    owner = "RustSec";
+    repo = "cargo-audit";
+    rev = "v${version}";
+    sha256 = "0j556dh0lf2l8nq7pfl5bbypgsvp00fh6ckms9wr4dgb8xvpf2r1";
+  };
+
+  cargoSha256 = "0200x0bdllq7mpxmp7ly5jarpkc3gpg22gxq8qvdbnmyd39b7wx0";
+
+  buildInputs = [ openssl libiconv ] ++ lib.optionals stdenv.isDarwin [ Security ];
+  nativeBuildInputs = [ pkg-config ];
+
+  # The tests require network access which is not available in sandboxed Nix builds.
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Audit Cargo.lock files for crates with security vulnerabilities";
+    homepage = "https://rustsec.org";
+    license = with licenses; [ mit asl20 ];
+    maintainers = with maintainers; [ basvandijk ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b7308fff8ac..25ac15f3a97 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8371,6 +8371,9 @@ in
 
   defaultCrateOverrides = callPackage ../build-support/rust/default-crate-overrides.nix { };
 
+  cargo-audit = callPackage ../tools/package-management/cargo-audit {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
   cargo-download = callPackage ../tools/package-management/cargo-download { };
   cargo-edit = callPackage ../tools/package-management/cargo-edit { };
   cargo-graph = callPackage ../tools/package-management/cargo-graph { };
-- 
GitLab


From a296cc254f6845dccb05402eb8f7ce5c9ca172ac Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 30 Sep 2019 17:44:02 -0400
Subject: [PATCH 1710/2254] kwallet-pam: wrap pam_kwallet_init

This needs a compatible env as kwalletd daemon. Need to wrap it to
correct this.

Fixes #68316
---
 pkgs/desktops/plasma-5/kwallet-pam.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/desktops/plasma-5/kwallet-pam.nix b/pkgs/desktops/plasma-5/kwallet-pam.nix
index b4fd032cf1f..7ddd6e2abb7 100644
--- a/pkgs/desktops/plasma-5/kwallet-pam.nix
+++ b/pkgs/desktops/plasma-5/kwallet-pam.nix
@@ -7,4 +7,8 @@ mkDerivation {
   postPatch = ''
     sed -i pam_kwallet_init -e "s|socat|${lib.getBin socat}/bin/socat|"
   '';
+  postFixup = ''
+    wrapQtApp $out/libexec/pam_kwallet_init
+  '';
+  dontWrapQtApps = true;
 }
-- 
GitLab


From 5852497f3cc75799652a89b66a0e9c6b17e66635 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 14:33:03 -0700
Subject: [PATCH 1711/2254] imagemagick7: 7.0.8-58 -> 7.0.8-66

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/imagemagick/versions
---
 pkgs/applications/graphics/ImageMagick/7.0.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix
index 654363d36f2..bd557f7b832 100644
--- a/pkgs/applications/graphics/ImageMagick/7.0.nix
+++ b/pkgs/applications/graphics/ImageMagick/7.0.nix
@@ -13,8 +13,8 @@ let
     else throw "ImageMagick is not supported on this platform.";
 
   cfg = {
-    version = "7.0.8-58";
-    sha256 = "0yfw32nydwy7ag7ina1zc6yssa146x4v35hjv6v59bci9mmj9fb1";
+    version = "7.0.8-66";
+    sha256 = "0wih8ag5i6qg2zhbjrlcripb5ic5l6i1z04chnlgykb84n5pcirv";
     patches = [];
   };
 in
-- 
GitLab


From 7929af8818ff2177e24398ab54dc647eec39588d Mon Sep 17 00:00:00 2001
From: Soner Sayakci <s.sayakci@shopware.com>
Date: Tue, 1 Oct 2019 17:26:43 +0200
Subject: [PATCH 1712/2254] maintainers: add shyim

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index d9a8d931590..b491f881e0b 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5869,6 +5869,12 @@
     githubId = 819413;
     name = "Benedict Aas";
   };
+  shyim = {
+    email = "s.sayakci@gmail.com";
+    github = "shyim";
+    githubId = 6224096;
+    name = "Soner Sayakci";
+  };
   siddharthist = {
     email = "langston.barrett@gmail.com";
     github = "langston-barrett";
-- 
GitLab


From db8704bfe78a4127fabaf36856a04f1c9fef59dd Mon Sep 17 00:00:00 2001
From: Soner Sayakci <s.sayakci@shopware.com>
Date: Tue, 1 Oct 2019 17:27:17 +0200
Subject: [PATCH 1713/2254] anydesk: 4.0.1 -> 5.1.2

---
 .../networking/remote/anydesk/default.nix      | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix
index 30130f60028..3f1e8f20293 100644
--- a/pkgs/applications/networking/remote/anydesk/default.nix
+++ b/pkgs/applications/networking/remote/anydesk/default.nix
@@ -4,22 +4,22 @@
 
 let
   sha256 = {
-    x86_64-linux = "08kdxsg9npb1nmlr2jyq7p238735kqkp7c5xckxn6rc4cp12n2y2";
-    i686-linux   = "11r5d4234zbkkgyrd7q9x3w7s7lailnq7z4x8cnhpr8vipzrg7h2";
+    x86_64-linux = "0mixw2sk7li1hjagibwzdgbfnrih5acricczqmfks1gsinjqrn82";
+    i386-linux   = "1gshd4vm8ysn636r1z44vmzdzrgybsmj8ma4zdabvs9jsbm2da3c";
   }.${stdenv.hostPlatform.system} or (throw "system ${stdenv.hostPlatform.system} not supported");
 
   arch = {
     x86_64-linux = "amd64";
-    i686-linux   = "i686";
+    i386-linux   = "i386";
   }.${stdenv.hostPlatform.system} or (throw "system ${stdenv.hostPlatform.system} not supported");
 
   description = "Desktop sharing application, providing remote support and online meetings";
 
   desktopItem = makeDesktopItem {
-    name = "anydesk";
+    name = "AnyDesk";
     exec = "@out@/bin/anydesk";
     icon = "anydesk";
-    desktopName = "anydesk";
+    desktopName = "AnyDesk";
     genericName = description;
     categories = "Application;Network;";
     startupNotify = "false";
@@ -27,7 +27,7 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "anydesk";
-  version = "4.0.1";
+  version = "5.1.2";
 
   src = fetchurl {
     url = "https://download.anydesk.com/linux/${pname}-${version}-${arch}.tar.gz";
@@ -40,7 +40,7 @@ in stdenv.mkDerivation rec {
     pangox_compat polkit polkit_gnome
   ] ++ (with xorg; [
     libxcb libX11 libXdamage libXext libXfixes libXi libXmu
-    libXrandr libXtst libXt libICE libSM
+    libXrandr libXtst libXt libICE libSM libXrender
   ]);
 
   nativeBuildInputs = [ makeWrapper ];
@@ -50,7 +50,7 @@ in stdenv.mkDerivation rec {
 
     mkdir -p $out/bin $out/share/{applications,doc/anydesk,icons/hicolor}
     install -m755 anydesk $out/bin/anydesk
-    cp changelog copyright README $out/share/doc/anydesk
+    cp copyright README $out/share/doc/anydesk
     cp -r icons/* $out/share/icons/hicolor/
     cp ${desktopItem}/share/applications/*.desktop $out/share/applications
 
@@ -75,6 +75,6 @@ in stdenv.mkDerivation rec {
     homepage = https://www.anydesk.com;
     license = licenses.unfree;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ peterhoeg ];
+    maintainers = with maintainers; [ shyim ];
   };
 }
-- 
GitLab


From f2a1d489898e9c404704bdcef26dbcc7343ae28d Mon Sep 17 00:00:00 2001
From: Shahrukh Khan <shahrukh@Shahrukhs-MacBook-Pro.local>
Date: Tue, 1 Oct 2019 20:38:59 +0500
Subject: [PATCH 1714/2254] pythonPackages.qds_sdk: init at 1.12.0

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

diff --git a/pkgs/development/python-modules/qds_sdk/default.nix b/pkgs/development/python-modules/qds_sdk/default.nix
new file mode 100644
index 00000000000..7b4cfa501dd
--- /dev/null
+++ b/pkgs/development/python-modules/qds_sdk/default.nix
@@ -0,0 +1,43 @@
+{ lib,
+ fetchFromGitHub,
+ buildPythonPackage,
+ boto,
+ inflection,
+ pytest,
+ mock,
+ requests,
+ six,
+ urllib3 }:
+
+buildPythonPackage rec {
+  pname = "qds_sdk";
+  version = "1.12.0";
+
+  # pypi does not contain tests, using github sources instead
+  src = fetchFromGitHub {
+    owner = "qubole";
+    repo = "qds-sdk-py";
+    rev = "V${version}";
+    sha256 = "18xhvlcfki8llv7fw2r5yfk20zds3gr78b4klwm9mkvhlhwds9rx";
+  };
+
+  propagatedBuildInputs = [ 
+    boto
+    inflection
+    requests
+    six 
+    urllib3 
+  ];
+
+  checkInputs = [ pytest mock ];
+  checkPhase = ''
+    py.test --disable-pytest-warnings tests
+  '';
+ 
+  meta = with lib; {
+    description = "A Python module that provides the tools you need to authenticate with, and use the Qubole Data Service API";
+    homepage = "https://github.com/qubole/qds-sdk-py";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ shahrukh330 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a610ef51d8c..52182351787 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4683,6 +4683,8 @@ in {
 
   qdarkstyle = callPackage ../development/python-modules/qdarkstyle { };
 
+  qds_sdk = callPackage ../development/python-modules/qds_sdk { };
+
   quamash = callPackage ../development/python-modules/quamash { };
 
   quandl = callPackage ../development/python-modules/quandl { };
-- 
GitLab


From c6a1412132b691107f31161f0ef9b80097b9fe5b Mon Sep 17 00:00:00 2001
From: Jonathan Marler <johnnymarler@gmail.com>
Date: Fri, 5 Apr 2019 20:35:59 -0600
Subject: [PATCH 1715/2254] rund: init at version 1.0.0

Adding a D Programming Language Compiler Wrapper tool that runs and caches D programs.  This is an alternative to the existing `rdmd` tool.  It's a rewrite that leverages a new compiler feature that allows it to run the compiler once instead of having to run it twice like `rdmd` does.  I decided to create a new tool rather than trying to support both older and new compilers in the same tool.  It also introduces new features like "Source Compiler Directives" which allow D Language source files to contain compiler configuration such as import paths, environment variables, etc.
---
 pkgs/development/tools/rund/default.nix | 49 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 +
 2 files changed, 51 insertions(+)
 create mode 100644 pkgs/development/tools/rund/default.nix

diff --git a/pkgs/development/tools/rund/default.nix b/pkgs/development/tools/rund/default.nix
new file mode 100644
index 00000000000..a2433da2997
--- /dev/null
+++ b/pkgs/development/tools/rund/default.nix
@@ -0,0 +1,49 @@
+{stdenv, lib, fetchFromGitHub, ldc ? null, dcompiler ? ldc }:
+
+assert dcompiler != null;
+
+stdenv.mkDerivation rec {
+  pname = "rund";
+  version = "1.0.0";
+
+  src = fetchFromGitHub {
+    owner = "dragon-lang";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "10x6f1nn294r5qnpacrpcbp348dndz5fv4nz6ih55c61ckpkvgcf";
+  };
+
+  buildInputs = [ dcompiler ];
+  buildPhase = ''
+    for candidate in dmd ldmd2 gdmd; do
+      echo Checking for DCompiler $candidate ...
+      dc=$(type -P $candidate || echo "")
+      if [ ! "$dc" == "" ]; then
+        break
+      fi
+    done
+    if [ "$dc" == "" ]; then
+      exit "Error: could not find a D compiler"
+    fi
+    echo Using DCompiler $candidate
+    $dc -I=$src/src -i -run $src/make.d build --out $NIX_BUILD_TOP
+  '';
+
+  doCheck = true;
+  checkPhase = ''
+    $NIX_BUILD_TOP/rund make.d test
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mv $NIX_BUILD_TOP/rund $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A compiler-wrapper that runs and caches D programs";
+    homepage = https://github.com/dragon-lang/rund;
+    license = lib.licenses.boost;
+    maintainers = with maintainers; [ jonathanmarler ];
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 96c3c564d1b..0059177550b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5943,6 +5943,8 @@ in
 
   runningx = callPackage ../tools/X11/runningx { };
 
+  rund = callPackage ../development/tools/rund { };
+
   runzip = callPackage ../tools/archivers/runzip { };
 
   rw = callPackage ../tools/misc/rw { };
-- 
GitLab


From f2eabd49fc9bbad520eae5b83f5acf7e103e3014 Mon Sep 17 00:00:00 2001
From: Trevor Thompson <tredontho@gmail.com>
Date: Tue, 1 Oct 2019 11:27:59 -0500
Subject: [PATCH 1716/2254] universal-ctags: Add jansson dependency

Add jansson dependency to enable JSON support
---
 pkgs/development/tools/misc/universal-ctags/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/universal-ctags/default.nix b/pkgs/development/tools/misc/universal-ctags/default.nix
index 47aa4917814..90605771958 100644
--- a/pkgs/development/tools/misc/universal-ctags/default.nix
+++ b/pkgs/development/tools/misc/universal-ctags/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, perl, pythonPackages, libiconv }:
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, perl, pythonPackages, libiconv, jansson }:
 
 stdenv.mkDerivation {
   pname = "universal-ctags";
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig pythonPackages.docutils ];
-  buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv;
+  buildInputs = [ jansson ] ++ stdenv.lib.optional stdenv.isDarwin libiconv;
 
   # to generate makefile.in
   autoreconfPhase = ''
-- 
GitLab


From d6f1e7056067d4df513a0d1fbb1c2220ee080aa2 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 1 Oct 2019 12:35:51 -0400
Subject: [PATCH 1717/2254] haskell: Speed up cross callHackage by using native
 source

The extract of code from hackage is the same on all platforms.
---
 pkgs/development/haskell-modules/make-package-set.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index a4c04067348..cd9a101d3c5 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -122,9 +122,9 @@ let
   haskellSrc2nix = { name, src, sha256 ? null, extraCabal2nixOptions ? "" }:
     let
       sha256Arg = if sha256 == null then "--sha256=" else ''--sha256="${sha256}"'';
-    in pkgs.buildPackages.stdenv.mkDerivation {
+    in buildPackages.stdenv.mkDerivation {
       name = "cabal2nix-${name}";
-      nativeBuildInputs = [ pkgs.buildPackages.cabal2nix ];
+      nativeBuildInputs = [ buildPackages.cabal2nix ];
       preferLocalBuild = true;
       allowSubstitutes = false;
       phases = ["installPhase"];
@@ -137,7 +137,7 @@ let
       '';
   };
 
-  all-cabal-hashes-component = name: version: pkgs.runCommand "all-cabal-hashes-component-${name}-${version}" {} ''
+  all-cabal-hashes-component = name: version: buildPackages.runCommand "all-cabal-hashes-component-${name}-${version}" {} ''
     tar --wildcards -xzvf ${all-cabal-hashes} \*/${name}/${version}/${name}.{json,cabal}
     mkdir -p $out
     mv */${name}/${version}/${name}.{json,cabal} $out
-- 
GitLab


From 3098d652100d698d466a37ce7215065743d1038e Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 1 Oct 2019 12:51:57 -0400
Subject: [PATCH 1718/2254] lib: Add armv7a-linux to doubles.nix

This is needed for android.
---
 lib/systems/doubles.nix | 2 +-
 lib/tests/systems.nix   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix
index 8e02fcb5de0..58cff18e648 100644
--- a/lib/systems/doubles.nix
+++ b/lib/systems/doubles.nix
@@ -7,7 +7,7 @@ let
 
   all = [
     "aarch64-linux"
-    "armv5tel-linux" "armv6l-linux" "armv7l-linux"
+    "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux"
 
     "mipsel-linux"
 
diff --git a/lib/tests/systems.nix b/lib/tests/systems.nix
index 5748c09b564..818749442f9 100644
--- a/lib/tests/systems.nix
+++ b/lib/tests/systems.nix
@@ -14,7 +14,7 @@ let
 in with lib.systems.doubles; lib.runTests {
   testall = mseteq all (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ wasi ++ windows ++ embedded);
 
-  testarm = mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv7l-linux" "arm-none" "armv7a-darwin" ];
+  testarm = mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "arm-none" "armv7a-darwin" ];
   testi686 = mseteq i686 [ "i686-linux" "i686-freebsd" "i686-netbsd" "i686-openbsd" "i686-cygwin" "i686-windows" "i686-none" "i686-darwin" ];
   testmips = mseteq mips [ "mipsel-linux" ];
   testx86_64 = mseteq x86_64 [ "x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin" "x86_64-solaris" "x86_64-windows" "x86_64-none" ];
@@ -24,7 +24,7 @@ in with lib.systems.doubles; lib.runTests {
   testfreebsd = mseteq freebsd [ "i686-freebsd" "x86_64-freebsd" ];
   testgnu = mseteq gnu (linux /* ++ kfreebsd ++ ... */);
   testillumos = mseteq illumos [ "x86_64-solaris" ];
-  testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "i686-linux" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64le-linux" ];
+  testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64le-linux" ];
   testnetbsd = mseteq netbsd [ "i686-netbsd" "x86_64-netbsd" ];
   testopenbsd = mseteq openbsd [ "i686-openbsd" "x86_64-openbsd" ];
   testwindows = mseteq windows [ "i686-cygwin" "x86_64-cygwin" "i686-windows" "x86_64-windows" ];
-- 
GitLab


From b4490a4964fab93102323d22ba9c7f0549e1357d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kieran.meinhardt@gmail.com>
Date: Tue, 1 Oct 2019 17:42:25 +0200
Subject: [PATCH 1719/2254] vimPlugins: Update

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

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 5f354491691..8672a671409 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -303,12 +303,12 @@ let
 
   coc-git = buildVimPluginFrom2Nix {
     pname = "coc-git";
-    version = "2019-09-19";
+    version = "2019-09-29";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-git";
-      rev = "672beb8976e0a8fe0e5c52dc00263144077b659d";
-      sha256 = "0g6cwcbirkqqnljyhlpfdx2q09b5irrp39bqlgl9qb912sz90fqg";
+      rev = "50508a69a02e3598ad1208d4f2f7be9df555892b";
+      sha256 = "18id9gbpx15acyrg695434cjk5ni543y265xjp0jc3jwayl3rwfq";
     };
   };
 
@@ -424,12 +424,12 @@ let
 
   coc-prettier = buildVimPluginFrom2Nix {
     pname = "coc-prettier";
-    version = "2019-09-26";
+    version = "2019-10-01";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-prettier";
-      rev = "6e7d0e32ecc60c68f0ebbd3cf26ea6b7c3c95faa";
-      sha256 = "0fxn2p78d16wgy74mb24hnyq63d2wmzv0873yg950cal4xidw644";
+      rev = "dbe8d23a4397daba8211192c57117ea0f900fbf6";
+      sha256 = "1p7ypmy5x7d1skrfqgl52vrx0y5z8q66fk9zyj4y349n4kgx9i85";
     };
   };
 
@@ -755,12 +755,12 @@ let
 
   ctrlp-vim = buildVimPluginFrom2Nix {
     pname = "ctrlp-vim";
-    version = "2019-02-08";
+    version = "2019-09-30";
     src = fetchFromGitHub {
       owner = "ctrlpvim";
       repo = "ctrlp.vim";
-      rev = "2e773fd8c7548526853fff6ee2e642eafbbe3d04";
-      sha256 = "0jvl4ydxmqnbcrzw71jf64vqlnc91970b25r6xl08a0lfb9xi3vd";
+      rev = "6bca8770a04c099e8c6ec7c7ea58cf9a17c8e44d";
+      sha256 = "1h0k9s5adpplrd5zga8078khdld02wxrwwg47q6n0sz5f40vjncp";
     };
   };
 
@@ -777,12 +777,12 @@ let
 
   defx-nvim = buildVimPluginFrom2Nix {
     pname = "defx-nvim";
-    version = "2019-09-25";
+    version = "2019-09-29";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "defx.nvim";
-      rev = "6da0c868fbc8c1fbdc99bb2208d1070c30994cd0";
-      sha256 = "17mm0hjhvcgkwp48lazjrv9g34bi31xr79f1nr3k55q1g0cqb3a4";
+      rev = "9423625ec729fceed640337012a8a64264f47654";
+      sha256 = "11gwdqyayi9pznkw75z27k7r42bl5dh9l3d79ashfv70z578sp1j";
     };
   };
 
@@ -1079,12 +1079,12 @@ let
 
   fastfold = buildVimPluginFrom2Nix {
     pname = "fastfold";
-    version = "2019-09-03";
+    version = "2019-10-01";
     src = fetchFromGitHub {
       owner = "konfekt";
       repo = "fastfold";
-      rev = "cf38299fee6f6a9b0bc5874545ed3a2415b6b3c5";
-      sha256 = "1x2ab1fjiqwmaph2r5dga4bv128ppzb8kpr3bjh6hvmcfabsh1f6";
+      rev = "8450f30c094946fd57719d7c2b667b81a034ef60";
+      sha256 = "00yl0wafr62b95pr4jw3ybg5k8pfvnsybz127hcbf7997smz8141";
     };
   };
 
@@ -1410,12 +1410,12 @@ let
 
   jedi-vim = buildVimPluginFrom2Nix {
     pname = "jedi-vim";
-    version = "2019-09-24";
+    version = "2019-09-28";
     src = fetchFromGitHub {
       owner = "davidhalter";
       repo = "jedi-vim";
-      rev = "50abb5e95a8d496dbda7b04a9bb78e4a6cd0a968";
-      sha256 = "04zag6ngqa1djwc2yk0p6hwknsm06nl3lvlyymz57vl51nhmvc2c";
+      rev = "b4b2f3ef54c02d6f8fb09cf1eb0f139d3a45bdb8";
+      sha256 = "0947003kyy0hpymhnl13mgv2in3q5q26y3d1gqqx4hy63plcxi14";
       fetchSubmodules = true;
     };
   };
@@ -1510,12 +1510,12 @@ let
 
   lh-vim-lib = buildVimPluginFrom2Nix {
     pname = "lh-vim-lib";
-    version = "2019-09-02";
+    version = "2019-09-30";
     src = fetchFromGitHub {
       owner = "LucHermitte";
       repo = "lh-vim-lib";
-      rev = "8adf0b269a1732b43644e2f6083113a4d5704a8b";
-      sha256 = "0na11kdp2nksyg1whf89sa4ss909srdqp94i28m5fdngv3z46wqs";
+      rev = "3c041e1e98c207f260f9c0b2f323e724adf1fb6d";
+      sha256 = "063mvhip0pvnil2ip2nlwadn5g845k0v6r3p44zywlklgm5l62ss";
     };
   };
 
@@ -1851,12 +1851,12 @@ let
 
   nerdtree = buildVimPluginFrom2Nix {
     pname = "nerdtree";
-    version = "2019-09-26";
+    version = "2019-10-01";
     src = fetchFromGitHub {
       owner = "scrooloose";
       repo = "nerdtree";
-      rev = "496b61ead1acd80128164cce5c2ff8e89c42ded2";
-      sha256 = "0d7c6rf8sbfvxfqd79i92gas7rcd9lzfw15iiala3xr74bap5kpb";
+      rev = "2d639b70e73ecf3f62884a578fe5e5937e6d8a92";
+      sha256 = "0ahfdbg26yn4phwkbkx29m8z8dabx5qa7zahsab0pd3pvgipjxzj";
     };
   };
 
@@ -2236,12 +2236,12 @@ let
 
   semshi = buildVimPluginFrom2Nix {
     pname = "semshi";
-    version = "2019-09-15";
+    version = "2019-10-01";
     src = fetchFromGitHub {
       owner = "numirias";
       repo = "semshi";
-      rev = "ca6b2c16dd374d672861b2c73c33f41c88e5cb39";
-      sha256 = "0nmywnfs8rm6vlcyycnk1zvpp044n1d714xw5sn4qpw4gz1acbm7";
+      rev = "b50f1bcc48bb944704c586b462a5e9d5cdf0d532";
+      sha256 = "1f2wqqhnfyicx8dgna6lcsa3pl5bxbjqf261rz9phxw649rsa9a4";
     };
   };
 
@@ -2522,12 +2522,12 @@ let
 
   tlib_vim = buildVimPluginFrom2Nix {
     pname = "tlib_vim";
-    version = "2019-04-27";
+    version = "2019-09-28";
     src = fetchFromGitHub {
       owner = "tomtom";
       repo = "tlib_vim";
-      rev = "19c98450af64fd9d875e009e0868cb119db01755";
-      sha256 = "0b95rvlfiiqh3lbmb8kmhq77iyvgsg1ayxp64fdn5809sj4avl79";
+      rev = "a071b6d41b20069a3520e0d101194a752968973b";
+      sha256 = "05swfvjyai32cbdpg10m3k2frkv017i1avf0nzilqavskvg04vi3";
     };
   };
 
@@ -2544,12 +2544,12 @@ let
 
   traces-vim = buildVimPluginFrom2Nix {
     pname = "traces-vim";
-    version = "2019-07-20";
+    version = "2019-09-30";
     src = fetchFromGitHub {
       owner = "markonm";
       repo = "traces.vim";
-      rev = "6c82275b8cd4c70e0610fd87f0574ef2463952a6";
-      sha256 = "1pms2bm4g0v0idkva1f9bdcbbwvs6fhbzzx90zdyyhs73xp62k9k";
+      rev = "47a9452038d6aba1b653de21bc6e6bc303f1ae5f";
+      sha256 = "129rism5mj91nmrsrmh2qksw74byfm346d5hizz4c40g87gs72x0";
     };
   };
 
@@ -2907,12 +2907,12 @@ let
 
   vim-android = buildVimPluginFrom2Nix {
     pname = "vim-android";
-    version = "2019-07-02";
+    version = "2019-09-29";
     src = fetchFromGitHub {
       owner = "hsanson";
       repo = "vim-android";
-      rev = "94dc352ff8cf0bc5636e548963a7ad99424813ad";
-      sha256 = "0iddlbsqijknxd0dwqz5j6kshs41rpja2kfr9ym9fandh466n3l8";
+      rev = "1d5d169044ef71f687df0efcffd9a394528d7f47";
+      sha256 = "07h1091fdjnhi45wql7yadsyln2861m4435wzr8zp5yj2b9k132a";
     };
   };
 
@@ -3105,12 +3105,12 @@ let
 
   vim-commentary = buildVimPluginFrom2Nix {
     pname = "vim-commentary";
-    version = "2018-07-27";
+    version = "2019-09-28";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-commentary";
-      rev = "141d9d32a9fb58fe474fcc89cd7221eb2dd57b3a";
-      sha256 = "0nncs32ayfhr557aiynq7b0sc7rxqwv7xanram53x1wvmfy14zf0";
+      rev = "62b68aecec2de531bc3978bfb9c07d3b6759ce0e";
+      sha256 = "1fbcdrrhn4l8266zr6rm0f3zbhpql9is6rx4rkim5wxcwmnpkr77";
     };
   };
 
@@ -3380,12 +3380,12 @@ let
 
   vim-flutter = buildVimPluginFrom2Nix {
     pname = "vim-flutter";
-    version = "2019-07-08";
+    version = "2019-09-29";
     src = fetchFromGitHub {
       owner = "thosakwe";
       repo = "vim-flutter";
-      rev = "7f12c91b9f3789ab3559eeed9ed8905afcca6dfb";
-      sha256 = "07hx5hdqw0scgviqn92xjx8zcfl4ils94cdsp9jh2h98jqhcic1p";
+      rev = "030a4e609f8f38922fa4ec9a27836d9dabaae957";
+      sha256 = "0jibmr0v0pqml1cprs3qmkhhmacpb2bwpk8lhaz4dzp8jlga9g00";
     };
   };
 
@@ -3402,12 +3402,12 @@ let
 
   vim-fugitive = buildVimPluginFrom2Nix {
     pname = "vim-fugitive";
-    version = "2019-09-27";
+    version = "2019-09-30";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-fugitive";
-      rev = "ab26e9fdb328cc351933f8d6178178e8ce5c8381";
-      sha256 = "0fvn2y7wyj7i39p027d4ijz73vpidzlgg7g7b9bcvyjsfmyds1fk";
+      rev = "621ffb087aee3915cc149f1aa33272229993086a";
+      sha256 = "0d86zd7yi6im0zyjxcpq9gkfqlxqgpmrksdcc767smq0g9d9bm3i";
     };
   };
 
@@ -3446,12 +3446,12 @@ let
 
   vim-gitgutter = buildVimPluginFrom2Nix {
     pname = "vim-gitgutter";
-    version = "2019-09-27";
+    version = "2019-10-01";
     src = fetchFromGitHub {
       owner = "airblade";
       repo = "vim-gitgutter";
-      rev = "44bb472bac2fa96c1444fcc02ad981152e56735b";
-      sha256 = "0dcm685sdwaajglh8iv2a20sf47a6lmahj5jscdpcbpnhcd3wdia";
+      rev = "1725c13add66c6981d9406f109dcd64dff5fbf59";
+      sha256 = "0xv1w9csl63kl7pm0inkzfjas1q477cpxqxyxa3x1wbmmar6sn46";
     };
   };
 
@@ -3479,12 +3479,12 @@ let
 
   vim-go = buildVimPluginFrom2Nix {
     pname = "vim-go";
-    version = "2019-09-27";
+    version = "2019-09-29";
     src = fetchFromGitHub {
       owner = "fatih";
       repo = "vim-go";
-      rev = "a7b5edc1872b76e6c0cc18b89fcda3aa98422961";
-      sha256 = "1k92n93bcy24fqfairqqkxd7l9adc0azggp4lp3r0rh7dsglnsf0";
+      rev = "e50c57536be5e545663549f87b9f0ec92dbf2e20";
+      sha256 = "0aw4k753fgnwywxb8b229ixd5ngv7db8s7zqvmaaj9dx489w2mc1";
     };
   };
 
@@ -3501,12 +3501,12 @@ let
 
   vim-grepper = buildVimPluginFrom2Nix {
     pname = "vim-grepper";
-    version = "2019-09-04";
+    version = "2019-10-01";
     src = fetchFromGitHub {
       owner = "mhinz";
       repo = "vim-grepper";
-      rev = "ebe6d1ffd1fb2faada867c56a55f44cbaa0248e3";
-      sha256 = "0axgpc72q4zn3l9b23v03akz1p1y5vy3gkzma4qw9avgbwhq5870";
+      rev = "e550eadf37ed7529fbc103c6153ceaa0ab1e5a62";
+      sha256 = "0zp3q1qd2zwlr0x7ij5gyfpg7kkyws090pamv60ni0ij2y7xjl8n";
     };
   };
 
@@ -4019,12 +4019,12 @@ let
 
   vim-mucomplete = buildVimPluginFrom2Nix {
     pname = "vim-mucomplete";
-    version = "2019-07-30";
+    version = "2019-09-30";
     src = fetchFromGitHub {
       owner = "lifepillar";
       repo = "vim-mucomplete";
-      rev = "eede692d8e8ee847de5c59d760f77fa27ea5ff47";
-      sha256 = "0c8rjqz0mzi9c69qjd9arljkwdckjp8x5d3ks570xhlcmp17qzn8";
+      rev = "3a512e21a9c91cb61103734b8bb5dc776c1a3146";
+      sha256 = "1dh26qwsky12fhc8v9d6x841nhgbdnp2xgsrlnqak7cyiwmwp41g";
     };
   };
 
@@ -4239,12 +4239,12 @@ let
 
   vim-plug = buildVimPluginFrom2Nix {
     pname = "vim-plug";
-    version = "2019-09-03";
+    version = "2019-09-29";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "vim-plug";
-      rev = "46f843aafe6a284765c484397fdc5ad9bb77147a";
-      sha256 = "1c9xnjfzr0s6vp6yb7j3sqclj7kazwcmsqvm0whzx1yx5dbisnv7";
+      rev = "ff97806e50196d56b2858cd56bada9d48cada2aa";
+      sha256 = "0n1j35h09hbwinfbk3a276vjv0bv9f73q8prckkpxdnzzcyrs0yl";
     };
   };
 
@@ -4470,12 +4470,12 @@ let
 
   vim-signify = buildVimPluginFrom2Nix {
     pname = "vim-signify";
-    version = "2019-08-22";
+    version = "2019-10-01";
     src = fetchFromGitHub {
       owner = "mhinz";
       repo = "vim-signify";
-      rev = "2b5070441dea482cc4f88556b19002f2da6f3566";
-      sha256 = "185c8x8nly7jxv0vpf0dsbpby2nsfqdxkyzc6mips6in7ymgg3b3";
+      rev = "909b6110ebccaf1c22b200f14ff8b5d5f0c0a039";
+      sha256 = "0kqwzqpq068hg2g9784zsaam4db6k0sncafx5ksn060ngw1r9jxw";
     };
   };
 
@@ -4536,12 +4536,12 @@ let
 
   vim-snippets = buildVimPluginFrom2Nix {
     pname = "vim-snippets";
-    version = "2019-09-19";
+    version = "2019-09-28";
     src = fetchFromGitHub {
       owner = "honza";
       repo = "vim-snippets";
-      rev = "db67e54d5998dbfbe9fe4161a29d74323031b1fa";
-      sha256 = "1d5mynnb90fnc1w0glfg2m953iphmhxndd5gmflg25720n3msdls";
+      rev = "67f54554409660af1b34562906c9feab4e2d9909";
+      sha256 = "181m3jpn99frds32ash1mvbh6wpawginiy2n04hagf7rmsjz5721";
     };
   };
 
@@ -4591,12 +4591,12 @@ let
 
   vim-startify = buildVimPluginFrom2Nix {
     pname = "vim-startify";
-    version = "2019-09-19";
+    version = "2019-10-01";
     src = fetchFromGitHub {
       owner = "mhinz";
       repo = "vim-startify";
-      rev = "9814df57c199271a9b2b70c75ebe4189dc96b126";
-      sha256 = "1rsss95six8f9w075k46318kq2sapijik13jzkakf5nfxlbi2raw";
+      rev = "af03e075a3c0dfe5ca17fd49c59a3f4c30a4b342";
+      sha256 = "1dd2vhszck76mpxz2m9qlmyvsravx9xslh4j68y8ygap97y2ykzi";
     };
   };
 
@@ -4657,12 +4657,12 @@ let
 
   vim-table-mode = buildVimPluginFrom2Nix {
     pname = "vim-table-mode";
-    version = "2019-09-05";
+    version = "2019-09-28";
     src = fetchFromGitHub {
       owner = "dhruvasagar";
       repo = "vim-table-mode";
-      rev = "934778947e28fc8e570e34efdb5f90d5c99fdac7";
-      sha256 = "1klvr8xal8iyv6wga324xhq26a31dxp2qlsz0qyri8y4hkrappkf";
+      rev = "126897a6fbcbf24523737502524208f75f255b88";
+      sha256 = "1cdnggcl8vkz74l5k1yl2y3yg1zawvg1zj2nlqrk3c5qm9qzhkzq";
     };
   };
 
@@ -5009,12 +5009,12 @@ let
 
   vimtex = buildVimPluginFrom2Nix {
     pname = "vimtex";
-    version = "2019-09-27";
+    version = "2019-09-30";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "53ba80c91162aa84ccbfd12dbd30435d869c1391";
-      sha256 = "1lmy7fzpyga9mk26xhcq5j2i3nmzzrnbgnpi0darfg8334bzw251";
+      rev = "0bca6e13f4ebd611e0138b81a893581f36a2c49f";
+      sha256 = "0ynwz59gz0j5fd575xlssv3lm5rbhnqa0l5a6kx1dyrqrv4qlg7g";
     };
   };
 
-- 
GitLab


From 58899b8d1936310dbbe3128258133cc9c91d824b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kieran.meinhardt@gmail.com>
Date: Tue, 1 Oct 2019 17:44:40 +0200
Subject: [PATCH 1720/2254] vimPlugins.vim-fsharp: init at 2018-11-13

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

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 8672a671409..9776c894abe 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -3389,6 +3389,17 @@ let
     };
   };
 
+  vim-fsharp = buildVimPluginFrom2Nix {
+    pname = "vim-fsharp";
+    version = "2018-11-13";
+    src = fetchFromGitHub {
+      owner = "fsharp";
+      repo = "vim-fsharp";
+      rev = "012d98c981139976551a4d9779f5cce7f8d84d5c";
+      sha256 = "0ds300kjhm352ni3fwivsrnc9ls021d2x29f4cdszillamcgs7pw";
+    };
+  };
+
   vim-ft-diff_fold = buildVimPluginFrom2Nix {
     pname = "vim-ft-diff_fold";
     version = "2013-02-10";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 59d1726820a..89b93119e49 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -86,6 +86,7 @@ fisadev/vim-isort
 flazz/vim-colorschemes
 floobits/floobits-neovim
 frigoeu/psc-ide-vim
+fsharp/vim-fsharp
 garbas/vim-snipmate
 glts/vim-textobj-comment
 gmarik/vundle
-- 
GitLab


From b980f1e46ca73ce2e9ac88cb41ccacb9edaf2df6 Mon Sep 17 00:00:00 2001
From: Christian Kampka <kampka@users.noreply.github.com>
Date: Tue, 1 Oct 2019 19:03:02 +0200
Subject: [PATCH 1721/2254] kops_1_14: init at 1.14.0 (#70189)

---
 pkgs/applications/networking/cluster/kops/default.nix | 5 +++++
 pkgs/top-level/all-packages.nix                       | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix
index 48d20ae3d58..0b4959d3b9b 100644
--- a/pkgs/applications/networking/cluster/kops/default.nix
+++ b/pkgs/applications/networking/cluster/kops/default.nix
@@ -60,4 +60,9 @@ in rec {
     version = "1.13.2";
     sha256 = "0lkkg34vn020r62ga8vg5d3a8jwvq00xlv3p1s01nkz33f6salng";
   };
+  
+  kops_1_14 = mkKops {
+    version = "1.14.0";
+    sha256 = "0zd2plsdn45wf73qspv9yaxa0crwfy5h6ws3lvw96vxvrkhl96l2";
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0059177550b..9c7469a4dbe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23981,8 +23981,9 @@ in
     mkKops
     kops_1_12
     kops_1_13
+    kops_1_14
     ;
-  kops = kops_1_13;
+  kops = kops_1_14;
 
   lguf-brightness = callPackage ../misc/lguf-brightness { };
 
-- 
GitLab


From 67b5f7567264e8d0c7ae7ace0455c8ddac97c71e Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 1 Oct 2019 13:05:10 -0400
Subject: [PATCH 1722/2254] top-level/release-cross.nix: add android32

---
 pkgs/top-level/release-cross.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index bc822b466c9..003fb9c4fff 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -143,9 +143,8 @@ in
 
   x86_64-musl = mapTestOnCross lib.systems.examples.musl64 linuxCommon;
 
-  /* Linux on Aarch64 */
-  android64 = mapTestOnCross lib.systems.examples.aarch64-android-prebuilt (linuxCommon // {
-  });
+  android64 = mapTestOnCross lib.systems.examples.aarch64-android-prebuilt linuxCommon;
+  android32 = mapTestOnCross lib.systems.examples.armv7a-android-prebuilt linuxCommon;
 
   wasi32 = mapTestOnCross lib.systems.examples.wasi32 wasiCommon;
 
-- 
GitLab


From b5204d9f5fab3562c3ac9f0e34e65d7aa40d35bf Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 1 Oct 2019 09:48:23 +0200
Subject: [PATCH 1723/2254] svgbob: fix build

See https://hydra.nixos.org/build/102480738

Bumping to latest version (which is 0.4.2 according to Cargo.lock) fixes
the build error. As no dependency changes happened, cargoSha256 doesn't
need to be updated.

ZHF #68361
---
 pkgs/tools/graphics/svgbob/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/graphics/svgbob/default.nix b/pkgs/tools/graphics/svgbob/default.nix
index ecf982c21cd..24736b8f0ff 100644
--- a/pkgs/tools/graphics/svgbob/default.nix
+++ b/pkgs/tools/graphics/svgbob/default.nix
@@ -2,13 +2,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "svgbob";
-  version = "unstable-2018-10-05";
+  version = "0.4.2";
 
   src = fetchFromGitHub {
     owner = "ivanceras";
     repo = pname;
-    rev = "43fb0364e989d0e9a7656b148c947d47cc769622";
-    sha256 = "1imjj57dx1af3wrs214yzaa2qfk8ld00nj3nx4z450gw2xjjj1gw";
+    rev = "0febc4377134a2ea3b3cd43ebdf5ea688a0e7432";
+    sha256 = "1n0w5b3fjgbczy1iw52172x1p3y1bvw1qpz77fkaxkhrkgfd7vwr";
   };
 
   sourceRoot = "source/svgbob_cli";
-- 
GitLab


From bdd869352f65f65019adb94f05c63f283f39718a Mon Sep 17 00:00:00 2001
From: pacien <pacien.trangirard@pacien.net>
Date: Tue, 1 Oct 2019 20:49:48 +0200
Subject: [PATCH 1724/2254] riot-web: 1.4.0 -> 1.4.1

---
 .../networking/instant-messengers/riot/riot-web.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
index d0ee71b9969..1b9b34ed4aa 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "riot-web";
-  version = "1.4.0";
+  version = "1.4.1";
 
   src = fetchurl {
     url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
-    sha256 = "1si11hxkfn6sqaq1hddm5vkfrd0pghzwqld1wv4vxlb5jyn32qqk";
+    sha256 = "16lgxyqxs6vpjcfdr4j7gnn7h8gyi6b5520b8nq8hxynh24iyhcq";
   };
 
   installPhase = let
-- 
GitLab


From 7a82c74afebb1f5ec631033d39d2ffbb6f744d05 Mon Sep 17 00:00:00 2001
From: pacien <pacien.trangirard@pacien.net>
Date: Tue, 1 Oct 2019 20:50:00 +0200
Subject: [PATCH 1725/2254] riot-desktop: 1.4.0 -> 1.4.1

---
 .../instant-messengers/riot/riot-desktop-package.json         | 2 +-
 .../networking/instant-messengers/riot/riot-desktop.nix       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json
index cfc38fb4ae7..d305fade038 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json
@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "src/electron-main.js",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "A feature-rich client for Matrix.org",
   "author": "New Vector Ltd.",
   "dependencies": {
diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
index 885e90a98c4..7b5bb1e04f3 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
@@ -6,12 +6,12 @@
 
 let
   executableName = "riot-desktop";
-  version = "1.4.0";
+  version = "1.4.1";
   riot-web-src = fetchFromGitHub {
     owner = "vector-im";
     repo = "riot-web";
     rev = "v${version}";
-    sha256 = "1p8bl7v2214shywn53fpcb27vvvdjrs3kcys3f045v2l5fg5xhsa";
+    sha256 = "0w4w39smak6hp65vam5rrz6l48rb4yzszzyn1yjhr1m8w8j9bvfl";
   };
 
 in yarn2nix-moretea.mkYarnPackage rec {
-- 
GitLab


From 9cf5305eb2f0e876c20cf8d0cf91ae946faec66b Mon Sep 17 00:00:00 2001
From: mtrsk <marcos.schonfinkel@protonmail.com>
Date: Tue, 1 Oct 2019 15:55:13 -0300
Subject: [PATCH 1726/2254] ffmpegthumbnailer: 2.2.0 -> 2.2.1

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

diff --git a/pkgs/development/libraries/ffmpegthumbnailer/default.nix b/pkgs/development/libraries/ffmpegthumbnailer/default.nix
index 45238690fe0..4e6a987eb71 100644
--- a/pkgs/development/libraries/ffmpegthumbnailer/default.nix
+++ b/pkgs/development/libraries/ffmpegthumbnailer/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ffmpegthumbnailer";
-  version = "2.2.0";
+  version = "2.2.1";
 
   src = fetchFromGitHub {
     owner = "dirkvdb";
     repo = "ffmpegthumbnailer";
     rev = version;
-    sha256 = "0kl8aa547icy9b05njps02a8sw4yn4f8fzs228kig247sn09s4cp";
+    sha256 = "0mcdvyzny3yrdx23f3ww0i6lgkh68nzfcdla9d4vkc8l2b1kla1j";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];
-- 
GitLab


From 3fc5a4e0462deba05814bf5cc7c482c98d8899b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kieran.meinhardt@gmail.com>
Date: Tue, 1 Oct 2019 17:35:37 +0200
Subject: [PATCH 1727/2254] vimPlugins.todo-txt-vim: init at 2016-11-10

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

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 9776c894abe..ce694b8e2d9 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -2542,6 +2542,18 @@ let
     };
   };
 
+  todo-txt-vim = buildVimPluginFrom2Nix {
+    pname = "todo-txt-vim";
+    version = "2016-11-10";
+    src = fetchFromGitHub {
+      owner = "freitass";
+      repo = "todo.txt-vim";
+      rev = "6845221d45bd62e604c2024bc511a56e79d1118b";
+      sha256 = "08m9q5f2pz6gjp0vkmm7glfsrbnldxi1j59dm5d7any6y96xxd6v";
+      fetchSubmodules = true;
+    };
+  };
+
   traces-vim = buildVimPluginFrom2Nix {
     pname = "traces-vim";
     version = "2019-09-30";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 89b93119e49..71d2d3853f1 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -85,6 +85,7 @@ fenetikm/falcon
 fisadev/vim-isort
 flazz/vim-colorschemes
 floobits/floobits-neovim
+freitass/todo.txt-vim
 frigoeu/psc-ide-vim
 fsharp/vim-fsharp
 garbas/vim-snipmate
-- 
GitLab


From e7ac6e3ff84ea2e51ef3d26915269fd815619bd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kieran.meinhardt@gmail.com>
Date: Tue, 1 Oct 2019 17:28:30 +0200
Subject: [PATCH 1728/2254] vimPlugins.vim-fetch: init at 2019-04-03

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

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index ce694b8e2d9..70f7e77d199 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -3346,6 +3346,17 @@ let
     };
   };
 
+  vim-fetch = buildVimPluginFrom2Nix {
+    pname = "vim-fetch";
+    version = "2019-04-03";
+    src = fetchFromGitHub {
+      owner = "wsdjeg";
+      repo = "vim-fetch";
+      rev = "76c08586e15e42055c9c21321d9fca0677442ecc";
+      sha256 = "0avcqjcqvxgj00r477ps54rjrwvmk5ygqm3qrzghbj9m1gpyp2kz";
+    };
+  };
+
   vim-fireplace = buildVimPluginFrom2Nix {
     pname = "vim-fireplace";
     version = "2019-09-01";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 71d2d3853f1..29701f4908d 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -466,6 +466,7 @@ wellle/tmux-complete.vim
 will133/vim-dirdiff
 wincent/command-t
 wincent/ferret
+wsdjeg/vim-fetch
 xolox/vim-easytags
 xolox/vim-misc
 xuhdev/vim-latex-live-preview
-- 
GitLab


From d0d6da14b15484b7d43e5daaa5a8a44a0c466857 Mon Sep 17 00:00:00 2001
From: Frank Doepper <woffs@woffs.de>
Date: Tue, 1 Oct 2019 09:02:32 +0200
Subject: [PATCH 1729/2254] stenc: init at 1.0.7

---
 pkgs/tools/backup/stenc/default.nix | 21 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/tools/backup/stenc/default.nix

diff --git a/pkgs/tools/backup/stenc/default.nix b/pkgs/tools/backup/stenc/default.nix
new file mode 100644
index 00000000000..ed4f944a960
--- /dev/null
+++ b/pkgs/tools/backup/stenc/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  version = "1.0.7";
+  pname = "stenc";
+
+  src = fetchFromGitHub {
+    owner = "scsitape";
+    repo = "stenc";
+    rev = "${version}";
+    sha256 = "1778m1zcyzyf42k5m496yqh0gv6kqhb0sq5983dhky1fccjl905k";
+  };
+
+  meta = {
+    description = "SCSI Tape Encryption Manager";
+    homepage = https://github.com/scsitape/stenc;
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = with stdenv.lib.maintainers; [ woffs ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9c7469a4dbe..0de73de9ee1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6230,6 +6230,8 @@ in
 
   stdman = callPackage ../data/documentation/stdman { };
 
+  stenc = callPackage ../tools/backup/stenc { };
+
   stm32loader = with python3Packages; toPythonApplication stm32loader;
 
   storebrowse = callPackage ../tools/system/storebrowse { };
-- 
GitLab


From e1c7d2079336148dd48cdd17cfc7b35e0d1559b3 Mon Sep 17 00:00:00 2001
From: Trolli Schmittlauch <t.schmittlauch+nixos@orlives.de>
Date: Tue, 1 Oct 2019 14:07:57 +0200
Subject: [PATCH 1730/2254] cawbird: init at 1.0.1

Cawbird is a fork of the discontinued Corebird Twitter client.

Co-Authored-By: Jon <jonringer@users.noreply.github.com>
---
 .../networking/cawbird/default.nix            | 38 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/applications/networking/cawbird/default.nix

diff --git a/pkgs/applications/networking/cawbird/default.nix b/pkgs/applications/networking/cawbird/default.nix
new file mode 100644
index 00000000000..edcf9b2846e
--- /dev/null
+++ b/pkgs/applications/networking/cawbird/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchFromGitHub, glib, gtk3, json-glib, sqlite, libsoup, gettext, vala
+, meson, ninja, pkgconfig, gnome3, gst_all_1, wrapGAppsHook, gobject-introspection
+, glib-networking, python3 }:
+
+stdenv.mkDerivation rec {
+  version = "1.0.1";
+  pname = "cawbird";
+
+  src = fetchFromGitHub {
+    owner = "IBBoard";
+    repo = "cawbird";
+    rev = "v${version}";
+    sha256 = "sha256:0bk33fh32nnv6ya6j0ij34abw6a3g6m8fq13303slhhja8xhvmb1";
+  };
+
+  nativeBuildInputs = [
+    meson ninja vala pkgconfig wrapGAppsHook python3
+    gobject-introspection # for setup hook
+  ];
+
+  buildInputs = [
+    glib gtk3 json-glib sqlite libsoup gettext gnome3.dconf gnome3.gspell glib-networking
+  ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-bad (gst-plugins-good.override { gtkSupport = true; }) gst-libav ]);
+
+  postPatch = ''
+    chmod +x data/meson_post_install.py # patchShebangs requires executable file
+    patchShebangs data/meson_post_install.py
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Native GTK Twitter client for the Linux desktop";
+    longDescription = "Cawbird is a modern, easy and fun Twitter client. Fork of the discontinued Corebird.";
+    homepage = https://ibboard.co.uk/cawbird/;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ jonafato schmittlauch ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 243883874fc..dec168a1d36 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1309,6 +1309,8 @@ in
 
   cardpeek = callPackage ../applications/misc/cardpeek { };
 
+  cawbird = callPackage ../applications/networking/cawbird { };
+
   cde = callPackage ../tools/package-management/cde { };
 
   cdemu-daemon = callPackage ../misc/emulators/cdemu/daemon.nix { };
-- 
GitLab


From edbeb51cf6cca37fc0865b978a16b56f4501f915 Mon Sep 17 00:00:00 2001
From: Nick Braga <nick.braga@bookbub.com>
Date: Tue, 1 Oct 2019 17:39:35 -0400
Subject: [PATCH 1731/2254] overmind: 2.0.2 -> 2.0.3

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

diff --git a/pkgs/applications/misc/overmind/default.nix b/pkgs/applications/misc/overmind/default.nix
index 918924df0b9..7603a66cd36 100644
--- a/pkgs/applications/misc/overmind/default.nix
+++ b/pkgs/applications/misc/overmind/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "overmind";
-  version = "2.0.2";
+  version = "2.0.3";
   goPackagePath = "github.com/DarthSim/overmind";
 
   nativeBuildInputs = [ makeWrapper ];
@@ -15,7 +15,7 @@ buildGoPackage rec {
     owner = "DarthSim";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0cns19gqkfxsiiyfxhb05cjp1iv2fb40x47gp8djrwwzcd1r6zxh";
+    sha256 = "0c551c240lqxdjg0jj01rh2fyhwls02k5lczlxacj05prp1plz9p";
   };
 
   meta = with lib; {
-- 
GitLab


From 280f17c893f28ddc39a7e4cbe71e32c2ffb96029 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 2 Oct 2019 00:41:03 +0300
Subject: [PATCH 1732/2254] buildBazelPackage: remove rules_cc

It's a new builtin dependency from Bazel 0.29.
---
 pkgs/build-support/build-bazel-package/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix
index d4318b715ba..a1a38484386 100644
--- a/pkgs/build-support/build-bazel-package/default.nix
+++ b/pkgs/build-support/build-bazel-package/default.nix
@@ -60,6 +60,7 @@ in stdenv.mkDerivation (fBuildAttrs // {
 
       # Remove all built in external workspaces, Bazel will recreate them when building
       rm -rf $bazelOut/external/{bazel_tools,\@bazel_tools.marker}
+      rm -rf $bazelOut/external/{rules_cc,\@rules_cc.marker}
       rm -rf $bazelOut/external/{embedded_jdk,\@embedded_jdk.marker}
       rm -rf $bazelOut/external/{local_*,\@local_*.marker}
 
-- 
GitLab


From 85abd40bcb05fc41c69227fa991b03f3ed91ff52 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 1 Oct 2019 17:47:59 -0400
Subject: [PATCH 1733/2254] sbt-extras: 2019-08-14 -> 2019-09-30

---
 .../development/tools/build-managers/sbt-extras/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix
index cf19862b005..a07cbab285c 100644
--- a/pkgs/development/tools/build-managers/sbt-extras/default.nix
+++ b/pkgs/development/tools/build-managers/sbt-extras/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub, which, curl, makeWrapper, jdk }:
 
 let
-  rev = "53f1edc685d8f269ac551336809e34faf7cd29a6";
-  version = "2019-08-14";
+  rev = "aa4425cc96aee5119fb9fee9138b3d3bdb6482f7";
+  version = "2019-09-30";
 in
 stdenv.mkDerivation {
   name = "sbt-extras-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
     owner = "paulp";
     repo = "sbt-extras";
     inherit rev;
-    sha256 = "1fyfwcnr30c0rgq6xfd2is9a8j1hsrl2p0xqicwqi4bzijy4r6gw";
+    sha256 = "15xkd1l0ka1fl77g7p498krvk0mcn25jq6jp4zyq5r8dla5rn832";
   };
 
   dontBuild = true;
-- 
GitLab


From e120e00d54a8edffcff6208c105c06211a1ec4d9 Mon Sep 17 00:00:00 2001
From: Tobias Bora <tobias.bora@gmail.com>
Date: Tue, 1 Oct 2019 23:48:23 +0200
Subject: [PATCH 1734/2254] owncloud-client: Use qt5's own mkDerivation
 (#70187)

---
 pkgs/applications/networking/owncloud-client/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix
index 7907365a6a3..c674956066a 100644
--- a/pkgs/applications/networking/owncloud-client/default.nix
+++ b/pkgs/applications/networking/owncloud-client/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, sqlite }:
+{ stdenv, fetchurl, mkDerivation, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, sqlite }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   pname = "owncloud-client";
   version = "2.5.4.11654";
 
-- 
GitLab


From fc408c8690218bf07d7c9338e39c23577348c23b Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 2 Oct 2019 00:08:13 +0200
Subject: [PATCH 1735/2254] lua.pkgs.luv.libluv: fix linking against lua on
 darwin

    [ 50%] Building C object CMakeFiles/luv.dir/src/luv.c.o
    [100%] Linking C shared library libluv.dylib
    Undefined symbols for architecture x86_64:
      "_luaL_addlstring", referenced from:
          _thread_dump in luv.c.o
      ...
---
 pkgs/development/lua-modules/overrides.nix | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix
index 87636c84c41..bb640cb09a5 100644
--- a/pkgs/development/lua-modules/overrides.nix
+++ b/pkgs/development/lua-modules/overrides.nix
@@ -273,17 +273,22 @@ with super;
      sed -i 's,\(option(WITH_SHARED_LIBUV.*\)OFF,\1ON,' CMakeLists.txt
      rm -rf deps/libuv
     '';
-    propagatedBuildInputs = [
-      pkgs.libuv
-    ];
+
+    buildInputs = [ pkgs.libuv ];
 
     passthru = {
-      libluv = self.luv.override({
+      libluv = self.luv.override ({
         preBuild = self.luv.preBuild + ''
-         sed -i 's,\(option(BUILD_MODULE.*\)ON,\1OFF,' CMakeLists.txt
-         sed -i 's,\(option(BUILD_SHARED_LIBS.*\)OFF,\1ON,' CMakeLists.txt
-         sed -i 's,${"\${INSTALL_INC_DIR}"},${placeholder "out"}/include/luv,' CMakeLists.txt
+          sed -i 's,\(option(BUILD_MODULE.*\)ON,\1OFF,' CMakeLists.txt
+          sed -i 's,\(option(BUILD_SHARED_LIBS.*\)OFF,\1ON,' CMakeLists.txt
+          sed -i 's,${"\${INSTALL_INC_DIR}"},${placeholder "out"}/include/luv,' CMakeLists.txt
         '';
+
+        nativeBuildInputs = [ pkgs.fixDarwinDylibNames ];
+
+        # Fixup linking libluv.dylib, for some reason it's not linked against lua correctly.
+        NIX_LDFLAGS = pkgs.lib.optionalString pkgs.stdenv.isDarwin
+          (if isLuaJIT then "-lluajit-${lua.luaversion}" else "-llua");
       });
     };
   });
-- 
GitLab


From 70c6a035e2c7c2cf8ff05b790f1aa822728e4b80 Mon Sep 17 00:00:00 2001
From: Dmitry Kudriavtsev <dkudriavtsev@gmail.com>
Date: Tue, 1 Oct 2019 15:11:09 -0700
Subject: [PATCH 1736/2254] maintainers: add dkudriavtsev

I plan to add several packages and would like to add myself as a maintainer.
---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index d5f35c05508..136c6ab3e1e 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1655,6 +1655,12 @@
     githubId = 1316469;
     name = "Naomi Morse";
   };
+  dkudriavtsev = {
+    email = "dkudriavtsev@gmail.com";
+    github = "dkudriavtsev";
+    githubId = 9790772;
+    name = "Dmitry Kudriavtsev";
+  };
   dmalikov = {
     email = "malikov.d.y@gmail.com";
     github = "dmalikov";
-- 
GitLab


From c819648a68edd4bfe44456f04830cffdfeb49b11 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 2 Oct 2019 00:08:47 +0200
Subject: [PATCH 1737/2254] neovim: link against libluv on darwin

---
 pkgs/applications/editors/neovim/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix
index 6808d7115c5..99b04059730 100644
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@@ -79,9 +79,11 @@ in
 
     cmakeFlags = [
       "-DGPERF_PRG=${gperf}/bin/gperf"
-      "-DLIBLUV_LIBRARY=${lua.pkgs.luv}/lib/lua/${lua.luaversion}/luv.so"
       "-DLUA_PRG=${neovimLuaEnv.interpreter}"
     ]
+    # FIXME: this is verry messy and strange.
+    ++ optional (!stdenv.isDarwin) "-DLIBLUV_LIBRARY=${lua.pkgs.luv}/lib/lua/${lua.luaversion}/luv.so"
+    ++ optional (stdenv.isDarwin) "-DLIBLUV_LIBRARY=${lua.pkgs.luv.libluv}/lib/lua/${lua.luaversion}/libluv.dylib"
     ++ optional doCheck "-DBUSTED_PRG=${neovimLuaEnv}/bin/busted"
     ++ optional (!lua.pkgs.isLuaJIT) "-DPREFER_LUA=ON"
     ;
-- 
GitLab


From b2bf3a2ac6926df61935d5a45bfd4a677771092a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 2 Oct 2019 02:30:34 +0200
Subject: [PATCH 1738/2254] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.15.0-1-g5325ccd from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/845035f8d911809290588c5ca4b6e3b5eb458f90.
---
 .../haskell-modules/hackage-packages.nix      | 249 +++++++++++++++---
 1 file changed, 211 insertions(+), 38 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index debddd3272c..21b0d1a4060 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -264,25 +264,27 @@ self: {
      }) {};
 
   "ADPfusion" = callPackage
-    ({ mkDerivation, base, bits, containers, DPutils, mmorph, mtl
-     , OrderedBits, primitive, PrimitiveArray, QuickCheck, strict, tasty
-     , tasty-quickcheck, tasty-th, template-haskell, th-orphans
-     , transformers, tuple, vector
+    ({ mkDerivation, base, bits, containers, deepseq, DPutils, ghc-prim
+     , mmorph, mtl, OrderedBits, primitive, PrimitiveArray, QuickCheck
+     , singletons, strict, tasty, tasty-quickcheck, tasty-th
+     , template-haskell, th-orphans, transformers, tuple, vector
      }:
      mkDerivation {
        pname = "ADPfusion";
-       version = "0.5.2.2";
-       sha256 = "1r87pbwhghxyk4ivbyivrs8iwrzyvhy5lp0cy4c7kmvh50w0swlh";
+       version = "0.6.0.0";
+       sha256 = "093gg9s2rk2sqjpkyy9z4smlsjlxnn5afnasj1bklf09d2z324gn";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bits containers DPutils mmorph mtl OrderedBits primitive
-         PrimitiveArray QuickCheck strict template-haskell th-orphans
-         transformers tuple vector
+         base bits containers deepseq DPutils ghc-prim mmorph mtl
+         OrderedBits primitive PrimitiveArray QuickCheck singletons strict
+         template-haskell th-orphans transformers tuple vector
        ];
        testHaskellDepends = [
-         base bits OrderedBits PrimitiveArray QuickCheck strict tasty
-         tasty-quickcheck tasty-th vector
+         base bits containers deepseq DPutils ghc-prim mmorph mtl
+         OrderedBits primitive PrimitiveArray QuickCheck singletons strict
+         tasty tasty-quickcheck tasty-th template-haskell th-orphans
+         transformers tuple vector
        ];
        description = "Efficient, high-level dynamic programming";
        license = stdenv.lib.licenses.bsd3;
@@ -40197,24 +40199,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "bitvec_1_0_1_0" = callPackage
+  "bitvec_1_0_1_1" = callPackage
     ({ mkDerivation, base, containers, deepseq, gauge, ghc-prim, gmp
      , integer-gmp, primitive, quickcheck-classes, random, tasty
      , tasty-hunit, tasty-quickcheck, vector
      }:
      mkDerivation {
        pname = "bitvec";
-       version = "1.0.1.0";
-       sha256 = "171snhh25allsqpajl8anhy7bvri6hsszf734byd8xvwabia0416";
+       version = "1.0.1.1";
+       sha256 = "0r11av150f6gr6l4894195h1iya667vny9crjpgagfhnrbzhmfaq";
        libraryHaskellDepends = [
          base deepseq ghc-prim integer-gmp primitive vector
        ];
        librarySystemDepends = [ gmp ];
        testHaskellDepends = [
-         base primitive quickcheck-classes tasty tasty-hunit
+         base integer-gmp primitive quickcheck-classes tasty tasty-hunit
          tasty-quickcheck vector
        ];
-       benchmarkHaskellDepends = [ base containers gauge random vector ];
+       benchmarkHaskellDepends = [
+         base containers gauge integer-gmp random vector
+       ];
        description = "Space-efficient bit vectors";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -47081,8 +47085,8 @@ self: {
        pname = "cantor-pairing";
        version = "0.1.1.0";
        sha256 = "03vl7qd5962kr0mi4ymgmh667948rzqiq9f1ixcvycyjz8hz0yqw";
-       revision = "1";
-       editedCabalFile = "1rl4zjxwiys9mf75bvw363ydpr3nwvi6d77p19rwnmxc9k5spap6";
+       revision = "2";
+       editedCabalFile = "0vl4b3v7qzbsd93vb0flyd6xkpayji49il97d2a6v35cliph5yw2";
        libraryHaskellDepends = [
          arithmoi base containers integer-gmp integer-logarithms
        ];
@@ -50332,6 +50336,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "chs-cabal" = callPackage
+    ({ mkDerivation, base, Cabal, chs-deps }:
+     mkDerivation {
+       pname = "chs-cabal";
+       version = "0.1.0.1";
+       sha256 = "0s734zls7gjihw0l27mfxyzbphq4n443vy08d47s3znri4fn6r58";
+       libraryHaskellDepends = [ base Cabal chs-deps ];
+       description = "Cabal with c2hs dependencies";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "chs-deps" = callPackage
+    ({ mkDerivation, alex, array, base, bytestring, criterion, tasty
+     , tasty-hunit
+     }:
+     mkDerivation {
+       pname = "chs-deps";
+       version = "0.1.0.0";
+       sha256 = "0mgi44nvsbmfxj2xr7ja7yslsxvbnznd9xbprz967705nhbs2cqb";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [ array base bytestring ];
+       libraryToolDepends = [ alex ];
+       testHaskellDepends = [ base bytestring tasty tasty-hunit ];
+       benchmarkHaskellDepends = [ base bytestring criterion ];
+       description = "c2hs dependency analyzer";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "chu2" = callPackage
     ({ mkDerivation, base, bytestring, data-default, hack2
      , hack2-handler-snap-server, utf8-string
@@ -60595,6 +60627,8 @@ self: {
        pname = "crypto-enigma";
        version = "0.1.1.5";
        sha256 = "001kl84ngfwr644v7dyk5shkqfw606bpza8b61bv4p4lqyfk96l2";
+       revision = "1";
+       editedCabalFile = "0ld72k1zq13vg1xh75qj1zrrrc4w5fzj0jv7idrynybjwmhvq92n";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers split text ];
@@ -79606,6 +79640,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "exception-transformers_0_4_0_8" = callPackage
+    ({ mkDerivation, base, HUnit, stm, test-framework
+     , test-framework-hunit, transformers, transformers-compat
+     }:
+     mkDerivation {
+       pname = "exception-transformers";
+       version = "0.4.0.8";
+       sha256 = "079vwd0lkv7y5cijpjxsxn6wyba1y22fw9mfirzgjpiswx46isrr";
+       libraryHaskellDepends = [
+         base stm transformers transformers-compat
+       ];
+       testHaskellDepends = [
+         base HUnit test-framework test-framework-hunit transformers
+         transformers-compat
+       ];
+       description = "Type classes and monads for unchecked extensible exceptions";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "exceptional" = callPackage
     ({ mkDerivation, base, exceptions }:
      mkDerivation {
@@ -83943,6 +83997,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "first-class-patterns_0_3_2_5" = callPackage
+    ({ mkDerivation, base, transformers }:
+     mkDerivation {
+       pname = "first-class-patterns";
+       version = "0.3.2.5";
+       sha256 = "1bh8ndf77pfh851d7szx0q2lpima6zm1d652s9j7jzchr7icyjvs";
+       libraryHaskellDepends = [ base transformers ];
+       description = "First class patterns and pattern matching, using type families";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "firstify" = callPackage
     ({ mkDerivation, base, containers, directory, filepath
      , homeomorphic, mtl, Safe, yhccore
@@ -87061,6 +87127,17 @@ self: {
        license = stdenv.lib.licenses.mpl20;
      }) {};
 
+  "free-categories" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "free-categories";
+       version = "0.1.0.0";
+       sha256 = "0lzal6vbh1zjcag4dwmhnsv4j66n00gkl0cmf0pssdjwwywxgpwx";
+       libraryHaskellDepends = [ base ];
+       description = "free categories";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "free-category" = callPackage
     ({ mkDerivation, base, free-algebras }:
      mkDerivation {
@@ -96556,14 +96633,13 @@ self: {
      , bytestring, Cabal, config-schema, config-value, containers
      , directory, filepath, free, gitrev, hashable, hookup, HsOpenSSL
      , HUnit, irc-core, kan-extensions, lens, network, process, psqueues
-     , regex-tdfa, regex-tdfa-text, semigroupoids, split, stm
-     , template-haskell, text, time, transformers, unix
-     , unordered-containers, vector, vty
+     , regex-tdfa, semigroupoids, split, stm, template-haskell, text
+     , time, transformers, unix, unordered-containers, vector, vty
      }:
      mkDerivation {
        pname = "glirc";
-       version = "2.33";
-       sha256 = "14znjbgy67mh68hpbr2xxl1aff1b0bzmrwkknp402zq0y9p81iwy";
+       version = "2.33.1";
+       sha256 = "0vzrx0904s8r7srld4c3wkw3j0rx3l6jszz3m5friwkdwfs60a83";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal filepath ];
@@ -96571,9 +96647,8 @@ self: {
          async attoparsec base base64-bytestring bytestring config-schema
          config-value containers directory filepath free gitrev hashable
          hookup HsOpenSSL irc-core kan-extensions lens network process
-         psqueues regex-tdfa regex-tdfa-text semigroupoids split stm
-         template-haskell text time transformers unix unordered-containers
-         vector vty
+         psqueues regex-tdfa semigroupoids split stm template-haskell text
+         time transformers unix unordered-containers vector vty
        ];
        executableHaskellDepends = [ base lens text vty ];
        testHaskellDepends = [ base HUnit ];
@@ -120117,6 +120192,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hnock" = callPackage
+    ({ mkDerivation, base, parsec, text }:
+     mkDerivation {
+       pname = "hnock";
+       version = "0.4.0";
+       sha256 = "1d3w6lmvsanzwjs3r424fhalv19ia6k4w6m37jaqkq60lmzkfp5d";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base parsec text ];
+       executableHaskellDepends = [ base text ];
+       testHaskellDepends = [ base ];
+       description = "A Nock interpreter";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hnop" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -130571,6 +130661,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hw-json-simd_0_1_0_3" = callPackage
+    ({ mkDerivation, base, bytestring, c2hs, hw-prim, lens
+     , optparse-applicative, vector
+     }:
+     mkDerivation {
+       pname = "hw-json-simd";
+       version = "0.1.0.3";
+       sha256 = "0cgi7q0cx3zx56wq9l115vbhwc6yjbdrmiyz6z8zcnlhgq6cfgjl";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base bytestring hw-prim lens vector ];
+       libraryToolDepends = [ c2hs ];
+       executableHaskellDepends = [
+         base bytestring hw-prim lens optparse-applicative vector
+       ];
+       testHaskellDepends = [ base bytestring hw-prim lens vector ];
+       description = "SIMD-based JSON semi-indexer";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hw-json-simple-cursor" = callPackage
     ({ mkDerivation, base, bytestring, criterion, directory
      , generic-lens, hedgehog, hspec, hspec-discover, hw-balancedparens
@@ -148061,20 +148172,26 @@ self: {
      }) {};
 
   "libarchive" = callPackage
-    ({ mkDerivation, base, bytestring, c2hs, composition-prelude, dlist
-     , filepath, libarchive
+    ({ mkDerivation, base, bytestring, c2hs, chs-cabal
+     , composition-prelude, criterion, deepseq, directory, dlist
+     , filepath, hspec, libarchive, mtl, tar, tar-conduit, temporary
+     , unix-compat
      }:
      mkDerivation {
        pname = "libarchive";
-       version = "1.0.5.1";
-       sha256 = "1fchnvs03hg513v7a45a3qbfr3kbh3nmqjqljzr2y1mg2ghkr7cz";
-       revision = "5";
-       editedCabalFile = "1fmsrrg8q46fwv6zgg5afc5jyd9y1qz193ypyh2kb4zf9psl3bdc";
+       version = "2.0.0.1";
+       sha256 = "173h1id6fdii7g850xifji70fz4i4xqhzaxh8727q8ld0q57lfjx";
+       setupHaskellDepends = [ base chs-cabal ];
        libraryHaskellDepends = [
-         base bytestring composition-prelude dlist filepath
+         base bytestring composition-prelude deepseq dlist filepath mtl
+         unix-compat
        ];
        libraryPkgconfigDepends = [ libarchive ];
        libraryToolDepends = [ c2hs ];
+       testHaskellDepends = [ base bytestring directory filepath hspec ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion tar tar-conduit temporary
+       ];
        description = "Haskell interface to libarchive";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) libarchive;};
@@ -196497,7 +196614,7 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
-  "reanimate_0_1_7_0" = callPackage
+  "reanimate_0_1_8_0" = callPackage
     ({ mkDerivation, ansi-wl-pprint, attoparsec, base
      , base64-bytestring, bytestring, cassava, chiphunk, colour
      , containers, cubicbezier, diagrams, diagrams-contrib
@@ -196510,8 +196627,8 @@ self: {
      }:
      mkDerivation {
        pname = "reanimate";
-       version = "0.1.7.0";
-       sha256 = "1yms6pckffrci9mpnvqmsb13pr3kfa8bw2wv34aws44lszxyii9j";
+       version = "0.1.8.0";
+       sha256 = "1vr0cqn47gl7810clqvn1wgkz3glzd216jmyvxfp6q1i5jhbizvw";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          ansi-wl-pprint attoparsec base base64-bytestring bytestring cassava
@@ -202600,6 +202717,25 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "rocksdb-query_0_3_0" = callPackage
+    ({ mkDerivation, base, bytestring, cereal, conduit, data-default
+     , hspec, resourcet, rocksdb-haskell, unliftio
+     }:
+     mkDerivation {
+       pname = "rocksdb-query";
+       version = "0.3.0";
+       sha256 = "0fy7d9m9g0jwssjgkhyg2d170s7mp7g9kz73zgnnp0xgl6mpxrsi";
+       libraryHaskellDepends = [
+         base bytestring cereal conduit resourcet rocksdb-haskell unliftio
+       ];
+       testHaskellDepends = [
+         base cereal data-default hspec rocksdb-haskell unliftio
+       ];
+       description = "RocksDB database querying library for Haskell";
+       license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "roguestar" = callPackage
     ({ mkDerivation, base, bytestring, directory, filepath, old-time
      , process
@@ -206078,8 +206214,8 @@ self: {
      }:
      mkDerivation {
        pname = "schemas";
-       version = "0.2.0";
-       sha256 = "1zwnx6r9fb4vcgcyvxzdiv1wbzk5zjvh9frhkj2mwwqjdqk7j08f";
+       version = "0.2.0.1";
+       sha256 = "19dqs2px9gj17lrav6syypn86pqk0yai29vn7z7a1gydmgvbzpw6";
        libraryHaskellDepends = [
          aeson base bifunctors bytestring free generics-sop hashable lens
          lens-aeson profunctors scientific text transformers
@@ -248852,6 +248988,8 @@ self: {
        pname = "vinyl";
        version = "0.11.0";
        sha256 = "0sqa4x8cwg6hdx3lrnq9pbggsh5vv6rhng2az4grl60c4kw6zr08";
+       revision = "1";
+       editedCabalFile = "05i1sjkgn9vf488sa063fnp0p56ic39a5vyni9b2llm4vbpl4kwz";
        libraryHaskellDepends = [ array base ghc-prim ];
        testHaskellDepends = [
          aeson base doctest hspec lens lens-aeson microlens mtl
@@ -249469,6 +249607,41 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "vty_5_26" = callPackage
+    ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers
+     , deepseq, directory, filepath, hashable, HUnit, microlens
+     , microlens-mtl, microlens-th, mtl, parallel, parsec, QuickCheck
+     , quickcheck-assertions, random, smallcheck, stm, string-qq
+     , terminfo, test-framework, test-framework-hunit
+     , test-framework-smallcheck, text, transformers, unix, utf8-string
+     , vector
+     }:
+     mkDerivation {
+       pname = "vty";
+       version = "5.26";
+       sha256 = "03iznvkdm11blzx09il96262qpgc4mmi3qzarhl8grrijkgzxj4x";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base blaze-builder bytestring containers deepseq directory filepath
+         hashable microlens microlens-mtl microlens-th mtl parallel parsec
+         stm terminfo text transformers unix utf8-string vector
+       ];
+       executableHaskellDepends = [
+         base containers microlens microlens-mtl mtl
+       ];
+       testHaskellDepends = [
+         base blaze-builder bytestring Cabal containers deepseq HUnit
+         microlens microlens-mtl mtl QuickCheck quickcheck-assertions random
+         smallcheck stm string-qq terminfo test-framework
+         test-framework-hunit test-framework-smallcheck text unix
+         utf8-string vector
+       ];
+       description = "A simple terminal UI library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "vty-examples" = callPackage
     ({ mkDerivation, array, base, bytestring, Cabal, containers
      , data-default, deepseq, lens, mtl, parallel, parsec, QuickCheck
-- 
GitLab


From 9d61ddaf822798d0e02092e471060b5ba672f2ab Mon Sep 17 00:00:00 2001
From: Michael Peyton Jones <me@michaelpj.com>
Date: Mon, 30 Sep 2019 20:41:20 +0100
Subject: [PATCH 1739/2254] nixos/system-environment: replace env vars in
 values of variables too

We were only replacing them in the profiles. We also need to do this in
the values of variables, including both the session-relative variables
and the non-session-relative variables.
---
 nixos/modules/config/system-environment.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/config/system-environment.nix b/nixos/modules/config/system-environment.nix
index 792d1dbb38f..e934e79e7e8 100644
--- a/nixos/modules/config/system-environment.nix
+++ b/nixos/modules/config/system-environment.nix
@@ -8,11 +8,6 @@ let
 
   cfg = config.environment;
 
-  pamProfiles =
-    map
-      (replaceStrings ["$HOME" "$USER"] ["@{HOME}" "@{PAM_USER}"])
-      cfg.profiles;
-
 in
 
 {
@@ -75,13 +70,18 @@ in
       let
         suffixedVariables =
           flip mapAttrs cfg.profileRelativeSessionVariables (envVar: suffixes:
-            flip concatMap pamProfiles (profile:
+            flip concatMap cfg.profiles (profile:
               map (suffix: "${profile}${suffix}") suffixes
             )
           );
 
+        # We're trying to use the same syntax for PAM variables and env variables.
+        # That means we need to map the env variables that people might use to their
+        # equivalent PAM variable.
+        replaceEnvVars = replaceStrings ["$HOME" "$USER"] ["@{HOME}" "@{PAM_USER}"]
+
         pamVariable = n: v:
-          ''${n}   DEFAULT="${concatStringsSep ":" (toList v)}"'';
+          ''${n}   DEFAULT="${concatStringsSep ":" (map replaceEnvVars (toList v))}"'';
 
         pamVariables =
           concatStringsSep "\n"
-- 
GitLab


From d8b9742deb3994018d94fc550e777ea684baca6e Mon Sep 17 00:00:00 2001
From: Michael Peyton Jones <me@michaelpj.com>
Date: Mon, 30 Sep 2019 21:01:33 +0100
Subject: [PATCH 1740/2254] nixos/system-environment: fix syntax for
 environment variables

`@` synax is for `PAM_ITEM`s, `HOME` needs to use `$`.
---
 nixos/modules/config/system-environment.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/config/system-environment.nix b/nixos/modules/config/system-environment.nix
index e934e79e7e8..4b663ebf85a 100644
--- a/nixos/modules/config/system-environment.nix
+++ b/nixos/modules/config/system-environment.nix
@@ -78,7 +78,9 @@ in
         # We're trying to use the same syntax for PAM variables and env variables.
         # That means we need to map the env variables that people might use to their
         # equivalent PAM variable.
-        replaceEnvVars = replaceStrings ["$HOME" "$USER"] ["@{HOME}" "@{PAM_USER}"]
+        # Note: PAM_USER is a PAM_ITEM, HOME is an environment variable, they have 
+        # different syntax.
+        replaceEnvVars = replaceStrings ["$HOME" "$USER"] ["\${HOME}" "@{PAM_USER}"];
 
         pamVariable = n: v:
           ''${n}   DEFAULT="${concatStringsSep ":" (map replaceEnvVars (toList v))}"'';
-- 
GitLab


From a3255de8c97b3f27b0fd0837e8739b45116a97df Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Tue, 1 Oct 2019 21:19:47 -0400
Subject: [PATCH 1741/2254] bcachefs-tools: 2019-09-25 -> 2019-10-01

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

diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix
index 68783b94716..d53fbb3960b 100644
--- a/pkgs/tools/filesystems/bcachefs-tools/default.nix
+++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix
@@ -3,12 +3,12 @@
 
 stdenv.mkDerivation {
   pname = "bcachefs-tools";
-  version = "2019-09-25";
+  version = "2019-10-01";
 
   src = fetchgit {
     url = "https://evilpiepirate.org/git/bcachefs-tools.git";
-    rev = "db39aa3e1b528db3b9d731c3b054f27411e1e1a9";
-    sha256 = "19x7n51yr30dd9rrvji3xk3rij5xd8b86qiym9alpkbbyrz7h956";
+    rev = "7f69c4161c31b8f43723a9ccad1a9a358f4e2e70";
+    sha256 = "0v4b8h99cd434v349y8vmhj2igf0ryky7svd20ar1fr7da580kvj";
   };
 
   enableParallelBuilding = true;
-- 
GitLab


From 2df3cb15e3f09a3d210b37d3f491782bfd539c19 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 22:15:31 -0700
Subject: [PATCH 1742/2254] scrypt: 1.2.1 -> 1.3.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/scrypt/versions
---
 pkgs/tools/security/scrypt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/scrypt/default.nix b/pkgs/tools/security/scrypt/default.nix
index 2ca4c1df18c..66313b53649 100644
--- a/pkgs/tools/security/scrypt/default.nix
+++ b/pkgs/tools/security/scrypt/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "scrypt";
-  version = "1.2.1";
+  version = "1.3.0";
 
   src = fetchurl {
     url = "https://www.tarsnap.com/scrypt/${pname}-${version}.tgz";
-    sha256 = "0xy5yhrwwv13skv9im9vm76rybh9f29j2dh4hlh2x01gvbkza8a6";
+    sha256 = "0j17yfrpi2bk5cawb4a4mzpv1vadqxh956hx0pa1gqfisknk8c16";
   };
 
   buildInputs = [ openssl ];
-- 
GitLab


From eca416c4699545a43366e57ea57a5bfc96ad8340 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 29 Sep 2019 01:33:30 -0700
Subject: [PATCH 1743/2254] verilator: 4.016 -> 4.018

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/verilator/versions
---
 pkgs/applications/science/electronics/verilator/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix
index 9a989919250..3ac4b24bf76 100644
--- a/pkgs/applications/science/electronics/verilator/default.nix
+++ b/pkgs/applications/science/electronics/verilator/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "verilator";
-  version = "4.016";
+  version = "4.018";
 
   src = fetchurl {
     url    = "https://www.veripool.org/ftp/${pname}-${version}.tgz";
-    sha256 = "18fqm6pgscy504ql27i150fdsd2j91hw5qsnpymws3pvqj2qz2ij";
+    sha256 = "0ih38dd8hiwgjyc6gclx8i9jlycgdlrxzz8bicm4a6yj4p0jxmcq";
   };
 
   enableParallelBuilding = true;
-- 
GitLab


From 8d440b5e591947308f96de43e0b3b5c9d4133d91 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Fri, 27 Sep 2019 10:45:45 -0700
Subject: [PATCH 1744/2254] python3Packages.keyring: 19.1.0 -> 19.2.0

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

diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix
index cf1eeb5392c..65f8697e124 100644
--- a/pkgs/development/python-modules/keyring/default.nix
+++ b/pkgs/development/python-modules/keyring/default.nix
@@ -1,14 +1,15 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ stdenv, buildPythonPackage, fetchPypi, isPy27
 , dbus-python, setuptools_scm, entrypoints, secretstorage
 , pytest, pytest-flake8 }:
 
 buildPythonPackage rec {
   pname = "keyring";
-  version = "19.1.0";
+  version = "19.2.0";
+  disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "13frfmws03jdyz9wxb4ylkvk80qiyb6a3h3sn7wx3ry97bn5li3a";
+    sha256 = "1cvlm48fggl12m19j9vcnrlplidr2sjf8h3pdyki58f9y357q0wi";
   };
 
   nativeBuildInputs = [ setuptools_scm ];
-- 
GitLab


From 90fc4a177f2b06e5909d385a70cc5e23662f3c99 Mon Sep 17 00:00:00 2001
From: Markus Schneider <mschneider@linkdot.org>
Date: Mon, 30 Sep 2019 17:33:05 +0200
Subject: [PATCH 1745/2254] vscode-extensions.james-yu.latex-workshop: init at
 8.2.0

---
 pkgs/misc/vscode-extensions/default.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix
index e1b928b1373..564de4c6353 100644
--- a/pkgs/misc/vscode-extensions/default.nix
+++ b/pkgs/misc/vscode-extensions/default.nix
@@ -48,6 +48,18 @@ in
     };
   };
 
+  james-yu.latex-workshop = buildVscodeMarketplaceExtension {
+    mktplcRef = {
+      name = "latex-workshop";
+      publisher = "James-Yu";
+      version = "8.2.0"; 
+      sha256 = "1ai16aam4v5jzhxgms589q0l24kyk1a9in6z4i7g05b3sahyxab2";
+    };
+    meta = with stdenv.lib; {
+      license = licenses.mit;
+    };
+  };
+
   justusadam.language-haskell = buildVscodeMarketplaceExtension {
     mktplcRef = {
       name = "language-haskell";
-- 
GitLab


From 5d7f8997c6354b02acaed0ea8e50214873f4728c Mon Sep 17 00:00:00 2001
From: Markus Schneider <mschneider@linkdot.org>
Date: Mon, 30 Sep 2019 17:25:30 +0200
Subject: [PATCH 1746/2254] vscode-extensions.skyapps.fish-code: init at 0.2.1

---
 pkgs/misc/vscode-extensions/default.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix
index 564de4c6353..744840945b0 100644
--- a/pkgs/misc/vscode-extensions/default.nix
+++ b/pkgs/misc/vscode-extensions/default.nix
@@ -78,6 +78,18 @@ in
     extractNuGet = callPackage ./python/extract-nuget.nix { };
   };
 
+  skyapps.fish-vscode = buildVscodeMarketplaceExtension {
+    mktplcRef = {
+      name = "fish-vscode";
+      publisher = "skyapps";
+      version = "0.2.1";
+      sha256 = "0y1ivymn81ranmir25zk83kdjpjwcqpnc9r3jwfykjd9x0jib2hl";
+    };
+    meta = with stdenv.lib; {
+      license = licenses.mit;
+    };
+  };
+
   vscodevim.vim = buildVscodeMarketplaceExtension {
     mktplcRef = {
       name = "vim";
-- 
GitLab


From 8358d7595d16d678b8395cfef5b1d72271253f71 Mon Sep 17 00:00:00 2001
From: Markus Schneider <mschneider@linkdot.org>
Date: Mon, 30 Sep 2019 17:28:59 +0200
Subject: [PATCH 1747/2254] vscode-extensions.cmschuetz12.wal: init at 0.1.0

---
 pkgs/misc/vscode-extensions/default.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix
index 744840945b0..e33a32ffa3e 100644
--- a/pkgs/misc/vscode-extensions/default.nix
+++ b/pkgs/misc/vscode-extensions/default.nix
@@ -36,6 +36,18 @@ in
     };
   };
 
+  cmschuetz12.wal = buildVscodeMarketplaceExtension {
+    mktplcRef = {
+        name = "wal";
+        publisher = "cmschuetz12";
+        version = "0.1.0";
+        sha256 = "0q089jnzqzhjfnv0vlb5kf747s3mgz64r7q3zscl66zb2pz5q4zd";
+    };
+    meta = with stdenv.lib; {
+      license = licenses.mit;
+    };
+  };
+
   formulahendry.auto-close-tag = buildVscodeMarketplaceExtension {
     mktplcRef = {
       name = "auto-close-tag";
-- 
GitLab


From 45a2072ac17d8b77804fc510556175b8ac3abd2a Mon Sep 17 00:00:00 2001
From: Daniel Albert <esclear@users.noreply.github.com>
Date: Tue, 1 Oct 2019 23:46:13 +0200
Subject: [PATCH 1748/2254] maintainers: Add @esclear

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index d5f35c05508..59ce425b26f 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2045,6 +2045,12 @@
     github = "ertes";
     name = "Ertugrul Söylemez";
   };
+  esclear = {
+    email = "esclear@users.noreply.github.com";
+    github = "esclear";
+    githubId = 7432848;
+    name = "Daniel Albert";
+  };
   Esteth = {
     email = "adam.copp@gmail.com";
     name = "Adam Copp";
-- 
GitLab


From bed71467587c234d2bd2b0bbbd55ab3bce845c8f Mon Sep 17 00:00:00 2001
From: Daniel Albert <esclear@users.noreply.github.com>
Date: Tue, 1 Oct 2019 23:46:38 +0200
Subject: [PATCH 1749/2254] pgmodeler: init at 0.9.1

pgModeler (PostgreSQL Database Modeler) is an open source database modeling tool designed for PostgreSQL.
---
 pkgs/applications/misc/pgmodeler/default.nix | 32 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/applications/misc/pgmodeler/default.nix

diff --git a/pkgs/applications/misc/pgmodeler/default.nix b/pkgs/applications/misc/pgmodeler/default.nix
new file mode 100644
index 00000000000..5ce7d06d727
--- /dev/null
+++ b/pkgs/applications/misc/pgmodeler/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, lib, fetchFromGitHub, pkgconfig, qmake, mkDerivation,
+  qtsvg,
+  libxml2, postgresql }:
+
+mkDerivation rec {
+  pname = "pgmodeler";
+  version = "0.9.1";
+
+  src = fetchFromGitHub {
+    owner = "pgmodeler";
+    repo = "pgmodeler";
+    rev = "v${version}";
+    sha256 = "15isnbli9jj327r6sj7498nmhgf1mzdyhc1ih120ibw4900aajiv";
+  };
+
+  enableParallelBuilding = true;
+
+  nativeBuildInputs = [ pkgconfig qmake ];
+  qmakeFlags = [ "pgmodeler.pro" "CONFIG+=release" ];
+
+  # todo: libpq would suffice here. Unfortunately this won't work, if one uses only postgresql.lib here.
+  buildInputs = [ postgresql qtsvg ];
+
+  meta = with stdenv.lib; {
+    description = "A database modeling tool for PostgreSQL";
+    longDescription = ''pgModeler (PostgreSQL Database Modeler) is an open source database modeling tool designed for PostgreSQL.'';
+    homepage = https://pgmodeler.io/;
+    license = licenses.gpl3;
+    maintainers = [ maintainers.esclear ];
+    platforms = platforms.linux;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9c7469a4dbe..6fe80880f21 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24297,6 +24297,8 @@ in
     openssl = openssl_1_0_2;
   };
 
+  pgmodeler = libsForQt5.callPackage ../applications/misc/pgmodeler { };
+
   pgf = pgf2;
 
   # Keep the old PGF since some documents don't render properly with
-- 
GitLab


From 4e7364abab5443212f33f21846a73d46b63f1990 Mon Sep 17 00:00:00 2001
From: Minijackson <minijackson@riseup.net>
Date: Wed, 18 Sep 2019 13:06:42 +0200
Subject: [PATCH 1750/2254] gnvim: init at 0.1.5

---
 .../editors/neovim/gnvim/default.nix          | 47 +++++++++++++++++++
 .../editors/neovim/gnvim/wrapper.nix          | 41 ++++++++++++++++
 pkgs/top-level/all-packages.nix               |  6 +++
 3 files changed, 94 insertions(+)
 create mode 100644 pkgs/applications/editors/neovim/gnvim/default.nix
 create mode 100644 pkgs/applications/editors/neovim/gnvim/wrapper.nix

diff --git a/pkgs/applications/editors/neovim/gnvim/default.nix b/pkgs/applications/editors/neovim/gnvim/default.nix
new file mode 100644
index 00000000000..764d7004940
--- /dev/null
+++ b/pkgs/applications/editors/neovim/gnvim/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, rustPlatform, fetchFromGitHub, gtk, webkitgtk }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "gnvim-unwrapped";
+  version = "0.1.5";
+
+  src = fetchFromGitHub {
+    owner = "vhakulinen";
+    repo = "gnvim";
+    rev = version;
+    sha256 = "11gb59lhc1sp5dxj2fdm6072f4nxxay0war3kmchdwsk41nvxlrh";
+  };
+
+  cargoSha256 = "00r5jf5qdw02vcv3522qqrnwj14mip0l58prcncbvyg4pxlm2rb2";
+
+  buildInputs = [ gtk webkitgtk ];
+
+  # The default build script tries to get the version through Git, so we
+  # replace it
+  prePatch = ''
+    cat << EOF > build.rs
+    use std::env;
+    use std::fs::File;
+    use std::io::Write;
+    use std::path::Path;
+
+    fn main() {
+        let out_dir = env::var("OUT_DIR").unwrap();
+        let dest_path = Path::new(&out_dir).join("gnvim_version.rs");
+        let mut f = File::create(&dest_path).unwrap();
+        f.write_all(b"const VERSION: &str = \"${version}\";").unwrap();
+    }
+    EOF
+  '';
+
+  installPhase = ''
+    make install PREFIX="${placeholder "out"}"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "GUI for neovim, without any web bloat";
+    homepage = "https://github.com/vhakulinen/gnvim";
+    license     = licenses.mit;
+    maintainers =  with maintainers; [ minijackson ];
+    inherit version;
+  };
+}
diff --git a/pkgs/applications/editors/neovim/gnvim/wrapper.nix b/pkgs/applications/editors/neovim/gnvim/wrapper.nix
new file mode 100644
index 00000000000..e16fe8a8adc
--- /dev/null
+++ b/pkgs/applications/editors/neovim/gnvim/wrapper.nix
@@ -0,0 +1,41 @@
+{ stdenv, gnvim-unwrapped, neovim, makeWrapper }:
+
+stdenv.mkDerivation {
+  pname = "gnvim";
+  version = gnvim-unwrapped.version;
+  buildCommand = if stdenv.isDarwin then ''
+    mkdir -p $out/Applications
+    cp -r ${gnvim-unwrapped}/bin/gnvim.app $out/Applications
+
+    chmod -R a+w "$out/Applications/gnvim.app/Contents/MacOS"
+    wrapProgram "$out/Applications/gnvim.app/Contents/MacOS/gnvim" \
+      --prefix PATH : "${neovim}/bin" \
+      --set GNVIM_RUNTIME_PATH "${gnvim-unwrapped}/share/gnvim/runtime"
+  '' else ''
+    makeWrapper '${gnvim-unwrapped}/bin/gnvim' "$out/bin/gnvim" \
+      --prefix PATH : "${neovim}/bin" \
+      --set GNVIM_RUNTIME_PATH "${gnvim-unwrapped}/share/gnvim/runtime"
+
+    mkdir -p "$out/share"
+    ln -s '${gnvim-unwrapped}/share/icons' "$out/share/icons"
+
+    # copy and fix .desktop file
+    cp -r '${gnvim-unwrapped}/share/applications' "$out/share/applications"
+    # Sed needs a writable directory to do inplace modifications
+    chmod u+rw "$out/share/applications"
+    for file in $out/share/applications/*.desktop; do
+      sed -e "s|Exec=.\\+gnvim\\>|Exec=$out/bin/gnvim|" -i "$file"
+    done
+  '';
+
+  preferLocalBuild = true;
+
+  nativeBuildInputs = [
+    makeWrapper
+  ];
+
+  passthru.unwrapped = gnvim-unwrapped;
+
+  inherit (gnvim-unwrapped) meta;
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0de73de9ee1..33501cad4fc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21123,6 +21123,12 @@ in
 
   neovim-qt = libsForQt5.callPackage ../applications/editors/neovim/qt.nix { };
 
+  gnvim-unwrapped = callPackage ../applications/editors/neovim/gnvim {
+    gtk = pkgs.gtk3;
+  };
+
+  gnvim = callPackage ../applications/editors/neovim/gnvim/wrapper.nix { };
+
   neovim-remote = callPackage ../applications/editors/neovim/neovim-remote.nix { pythonPackages = python3Packages; };
 
   vis = callPackage ../applications/editors/vis {
-- 
GitLab


From d222547f4883e5f56193384e767de4b5483c51e9 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 1 Oct 2019 22:41:21 -0700
Subject: [PATCH 1751/2254] pythonPackages.poetry: fix python2 build

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

diff --git a/pkgs/development/python-modules/poetry/default.nix b/pkgs/development/python-modules/poetry/default.nix
index 226e71c13cc..52be2c3bafc 100644
--- a/pkgs/development/python-modules/poetry/default.nix
+++ b/pkgs/development/python-modules/poetry/default.nix
@@ -10,6 +10,7 @@
 , pkginfo
 , html5lib
 , shellingham
+, subprocess32
 , tomlkit
 , typing
 , pathlib2
@@ -63,7 +64,7 @@ in buildPythonPackage rec {
     shellingham
     tomlkit
   ] ++ lib.optionals (isPy27 || isPy34) [ typing pathlib2 glob2 ]
-    ++ lib.optionals isPy27 [ virtualenv functools32 ];
+    ++ lib.optionals isPy27 [ virtualenv functools32 subprocess32 ];
 
   postInstall = ''
     mkdir -p "$out/share/bash-completion/completions"
-- 
GitLab


From 7eed92a7ac22d28cb04909a272108fdffbb38ec2 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Fri, 13 Sep 2019 14:42:08 -0700
Subject: [PATCH 1752/2254] pythonPackage.cli-helpers: disable python2 tests

---
 .../python-modules/cli-helpers/default.nix       | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/cli-helpers/default.nix b/pkgs/development/python-modules/cli-helpers/default.nix
index 1c209353f0e..2ebc6f44b44 100644
--- a/pkgs/development/python-modules/cli-helpers/default.nix
+++ b/pkgs/development/python-modules/cli-helpers/default.nix
@@ -1,14 +1,11 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
+{ lib, buildPythonPackage, fetchPypi, isPy27
+, backports_csv
 , configobj
-, terminaltables
+, mock
+, pytest
 , tabulate
-, backports_csv
+, terminaltables
 , wcwidth
-, pytest
-, mock
-, isPy27
 }:
 
 buildPythonPackage rec {
@@ -27,6 +24,9 @@ buildPythonPackage rec {
     wcwidth
   ] ++ (lib.optionals isPy27 [ backports_csv ]);
 
+  # namespace collision between backport.csv and backports.configparser
+  doCheck = !isPy27;
+
   checkInputs = [ pytest mock ];
 
   checkPhase = ''
-- 
GitLab


From 9d9aa6099f6c284aa5df7d45d83c56e57552251a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Vask=C3=B3?= <vlaci@balabit.hu>
Date: Tue, 24 Sep 2019 17:41:35 +0200
Subject: [PATCH 1753/2254] python37Packages.pyrsistent: 0.15.2 -> 0.15.4

Some tests are broken on 0.15.2 if used with pytest 5+ as discussed
in #64145. The issue is fixed in tobgu/pyrsistent#175 and released in
0.15.4.
---
 pkgs/development/python-modules/pyrsistent/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/python-modules/pyrsistent/default.nix b/pkgs/development/python-modules/pyrsistent/default.nix
index 74c3724aa19..c8310c39441 100644
--- a/pkgs/development/python-modules/pyrsistent/default.nix
+++ b/pkgs/development/python-modules/pyrsistent/default.nix
@@ -20,6 +20,10 @@ buildPythonPackage rec {
 
   checkInputs = [ pytestrunner pytest_4 hypothesis ];
 
+  postPatch = ''
+    substituteInPlace setup.py --replace 'pytest<5' 'pytest'
+  '';
+
   meta = with stdenv.lib; {
     homepage = https://github.com/tobgu/pyrsistent/;
     description = "Persistent/Functional/Immutable data structures";
-- 
GitLab


From d156b2b619ba207e12c5ca3abfbfaace6dfe7ce1 Mon Sep 17 00:00:00 2001
From: Ambroz Bizjak <abizjak.pro@gmail.com>
Date: Sat, 28 Sep 2019 12:35:03 +0200
Subject: [PATCH 1754/2254] nvidia-x11: Make vulkan library path absolute for
 >= 435.

The original file contains just a library name, which does not work when LD_LIBRARY_PATH does not contain /run/opengl-driver/lib, as is the case in unstable NixOS.

Fixes https://github.com/NixOS/nixpkgs/issues/69264
---
 pkgs/os-specific/linux/nvidia-x11/builder.sh | 21 ++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh
index 2b1b37db344..b4c6952d44d 100755
--- a/pkgs/os-specific/linux/nvidia-x11/builder.sh
+++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh
@@ -59,15 +59,24 @@ installPhase() {
         mv $i/lib/libvdpau* $i/lib/vdpau
 
         # Install ICDs, make absolute paths.
+        # Be careful not to modify any original files because this runs twice.
+
+        # OpenCL
         sed -E "s#(libnvidia-opencl)#$i/lib/\\1#" nvidia.icd > nvidia.icd.fixed
         install -Dm644 nvidia.icd.fixed $i/etc/OpenCL/vendors/nvidia.icd
-        if [ -e nvidia_icd.json.template ]; then
-            # template patching for version < 435
-            sed "s#__NV_VK_ICD__#$i/lib/libGLX_nvidia.so#" nvidia_icd.json.template > nvidia_icd.json
-        fi
-        if [ -e nvidia_icd.json ]; then
-            install -Dm644 nvidia_icd.json $i/share/vulkan/icd.d/nvidia.json
+
+        # Vulkan
+        if [ -e nvidia_icd.json.template ] || [ -e nvidia_icd.json ]; then
+            if [ -e nvidia_icd.json.template ]; then
+                # template patching for version < 435
+                sed "s#__NV_VK_ICD__#$i/lib/libGLX_nvidia.so#" nvidia_icd.json.template > nvidia_icd.json.fixed
+            else
+                sed -E "s#(libGLX_nvidia)#$i/lib/\\1#" nvidia_icd.json > nvidia_icd.json.fixed
+            fi
+            install -Dm644 nvidia_icd.json.fixed $i/share/vulkan/icd.d/nvidia.json
         fi
+
+        # EGL
         if [ "$useGLVND" = "1" ]; then
             sed -E "s#(libEGL_nvidia)#$i/lib/\\1#" 10_nvidia.json > 10_nvidia.json.fixed
             install -Dm644 10_nvidia.json.fixed $i/share/glvnd/egl_vendor.d/nvidia.json
-- 
GitLab


From 46b7933d9a21e67c52c7a9c31af057e607170349 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 2 Oct 2019 01:00:22 +0300
Subject: [PATCH 1755/2254] tensorflow: fix CUDA build using wrong GCC

---
 pkgs/development/python-modules/tensorflow/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix
index 7f6952e8fe5..c511049ec03 100644
--- a/pkgs/development/python-modules/tensorflow/default.nix
+++ b/pkgs/development/python-modules/tensorflow/default.nix
@@ -203,6 +203,7 @@ let
     TF_NEED_CUDA = tfFeature cudaSupport;
     TF_CUDA_PATHS = lib.optionalString cudaSupport "${cudatoolkit_joined},${cudnn},${nccl}";
     GCC_HOST_COMPILER_PREFIX = lib.optionalString cudaSupport "${cudatoolkit_cc_joined}/bin";
+    GCC_HOST_COMPILER_PATH = lib.optionalString cudaSupport "${cudatoolkit_cc_joined}/bin/gcc";
     TF_CUDA_COMPUTE_CAPABILITIES = lib.concatStringsSep "," cudaCapabilities;
 
     postPatch = ''
-- 
GitLab


From 4947ddf3478910800bc8538596ab8c20b03f9b74 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 2 Oct 2019 10:32:40 +0300
Subject: [PATCH 1756/2254] libtensorflow: add meta

---
 .../python-modules/tensorflow/default.nix      | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix
index c511049ec03..1895f2bfd0a 100644
--- a/pkgs/development/python-modules/tensorflow/default.nix
+++ b/pkgs/development/python-modules/tensorflow/default.nix
@@ -297,6 +297,15 @@ let
         cp -Lr "$PWD/dist" "$python"
       '';
     };
+
+    meta = with stdenv.lib; {
+      description = "Computation using data flow graphs for scalable machine learning";
+      homepage = http://tensorflow.org;
+      license = licenses.asl20;
+      maintainers = with maintainers; [ jyp abbradar ];
+      platforms = platforms.linux;
+      broken = !(xlaSupport -> cudaSupport);
+    };
   };
 
 in buildPythonPackage {
@@ -347,12 +356,5 @@ in buildPythonPackage {
 
   passthru.libtensorflow = bazel-build.out;
 
-  meta = with stdenv.lib; {
-    description = "Computation using data flow graphs for scalable machine learning";
-    homepage = http://tensorflow.org;
-    license = licenses.asl20;
-    maintainers = with maintainers; [ jyp abbradar ];
-    platforms = platforms.linux;
-    broken = !(xlaSupport -> cudaSupport);
-  };
+  inherit (bazel-build) meta;
 }
-- 
GitLab


From 1c429acbffc650d960ec64014e9af92c8f2577f3 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 2 Oct 2019 10:32:48 +0300
Subject: [PATCH 1757/2254] tensorflow: add OpenGL path to find libcudart

---
 .../libraries/science/math/tensorflow/bin.nix   |  7 ++++++-
 .../python-modules/tensorflow/bin.nix           | 10 +++++++++-
 .../python-modules/tensorflow/default.nix       | 17 ++++++++++++++++-
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/science/math/tensorflow/bin.nix b/pkgs/development/libraries/science/math/tensorflow/bin.nix
index 3db7a6f1d1e..f9f300883a1 100644
--- a/pkgs/development/libraries/science/math/tensorflow/bin.nix
+++ b/pkgs/development/libraries/science/math/tensorflow/bin.nix
@@ -1,6 +1,6 @@
 { stdenv
 , fetchurl
-, patchelf
+, addOpenGLRunpath
 , cudaSupport ? false, symlinkJoin, cudatoolkit, cudnn, nvidia_x11
 }:
 
@@ -35,6 +35,9 @@ let
     else ''
       patchelf --set-rpath "${rpath}:$out/lib" $out/lib/libtensorflow.so
       patchelf --set-rpath "${rpath}" $out/lib/libtensorflow_framework.so
+      ${optionalString cudaSupport ''
+        addOpenGLRunpath $out/lib/libtensorflow.so $out/lib/libtensorflow_framework.so
+      ''}
     '';
 
 in stdenv.mkDerivation rec {
@@ -43,6 +46,8 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl url;
 
+  nativeBuildInputs = optional cudaSupport addOpenGLRunpath;
+
   # Patch library to use our libc, libstdc++ and others
   buildCommand = ''
     mkdir -pv $out
diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix
index e46d0298953..db2308a0be8 100644
--- a/pkgs/development/python-modules/tensorflow/bin.nix
+++ b/pkgs/development/python-modules/tensorflow/bin.nix
@@ -26,6 +26,7 @@
 , symlinkJoin
 , keras-applications
 , keras-preprocessing
+, addOpenGLRunpath
 }:
 
 # We keep this binary build for two reasons:
@@ -76,6 +77,8 @@ in buildPythonPackage {
   ] ++ lib.optional (!isPy3k) mock
     ++ lib.optionals (pythonOlder "3.4") [ backports_weakref ];
 
+  nativeBuildInputs = lib.optional cudaSupport addOpenGLRunpath;
+
   # Upstream has a pip hack that results in bin/tensorboard being in both tensorflow
   # and the propageted input tensorflow-tensorboard which causes environment collisions.
   # another possibility would be to have tensorboard only in the buildInputs
@@ -94,7 +97,12 @@ in buildPythonPackage {
   lib.optionalString stdenv.isLinux ''
     rrPath="$out/${python.sitePackages}/tensorflow/:$out/${python.sitePackages}/tensorflow/contrib/tensor_forest/:${rpath}"
     internalLibPath="$out/${python.sitePackages}/tensorflow/python/_pywrap_tensorflow_internal.so"
-    find $out \( -name '*.so' -or -name '*.so.*' \) -exec patchelf --set-rpath "$rrPath" {} \;
+    find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do
+      patchelf --set-rpath "$rrPath" "$lib"
+      ${lib.optionalString cudaSupport ''
+        addOpenGLRunpath "$lib"
+      ''}
+    done
   '';
 
 
diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix
index 1895f2bfd0a..e180c9d70e9 100644
--- a/pkgs/development/python-modules/tensorflow/default.nix
+++ b/pkgs/development/python-modules/tensorflow/default.nix
@@ -1,4 +1,5 @@
 { stdenv, pkgs, buildBazelPackage, lib, fetchFromGitHub, fetchpatch, symlinkJoin
+, addOpenGLRunpath
 # Python deps
 , buildPythonPackage, isPy3k, pythonOlder, pythonAtLeast, python
 # Python libraries
@@ -112,7 +113,7 @@ let
 
     nativeBuildInputs = [
       swig which pythonEnv
-    ];
+    ] ++ lib.optional cudaSupport addOpenGLRunpath;
 
     buildInputs = [
       jemalloc
@@ -296,6 +297,12 @@ let
         bazel-bin/tensorflow/tools/pip_package/build_pip_package --src "$PWD/dist"
         cp -Lr "$PWD/dist" "$python"
       '';
+
+      postFixup = lib.optionalString cudaSupport ''
+        find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do
+          addOpenGLRunpath "$lib"
+        done
+      '';
     };
 
     meta = with stdenv.lib; {
@@ -347,6 +354,14 @@ in buildPythonPackage {
     tensorflow-tensorboard
   ];
 
+  nativeBuildInputs = lib.optional cudaSupport addOpenGLRunpath;
+
+  postFixup = lib.optionalString cudaSupport ''
+    find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do
+      addOpenGLRunpath "$lib"
+    done
+  '';
+
   # Actual tests are slow and impure.
   # TODO try to run them anyway
   # TODO better test (files in tensorflow/tools/ci_build/builds/*test)
-- 
GitLab


From e38f32a468c7da4afe7d101580ee482ec7619678 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 26 Aug 2019 20:46:04 -0700
Subject: [PATCH 1758/2254] onnxruntime: init at 0.5.0

---
 .../libraries/onnxruntime/default.nix         | 62 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 64 insertions(+)
 create mode 100644 pkgs/development/libraries/onnxruntime/default.nix

diff --git a/pkgs/development/libraries/onnxruntime/default.nix b/pkgs/development/libraries/onnxruntime/default.nix
new file mode 100644
index 00000000000..b5549c6735f
--- /dev/null
+++ b/pkgs/development/libraries/onnxruntime/default.nix
@@ -0,0 +1,62 @@
+{ stdenv, fetchFromGitHub, glibcLocales
+, cmake, python3
+}:
+
+stdenv.mkDerivation rec {
+  pname = "onnxruntime";
+  version = "0.5.0";
+
+  src = fetchFromGitHub {
+    owner = "microsoft";
+    repo = "onnxruntime";
+    rev = "v${version}";
+    sha256 = "0s8ylc5xr55490hbz7zn3hnp9dnyp92d320ln8xw5hqkw3mgyr3p";
+    # TODO: use nix-versions of grpc, onnx, eigen, googletest, etc.
+    # submodules increase src size and compile times significantly
+    # not currently feasible due to how integrated cmake build is with git
+    fetchSubmodules = true;
+  };
+
+  # TODO: build server, and move .so's to lib output
+  outputs = [ "out" "dev" ];
+
+  nativeBuildInputs = [
+    cmake
+    python3 # for shared-lib or server
+  ];
+
+  cmakeDir = "../cmake";
+
+  cmakeFlags = [
+    "-Donnxruntime_USE_OPENMP=ON"
+    "-Donnxruntime_BUILD_SHARED_LIB=ON"
+    "-Donnxruntime_ENABLE_LTO=ON"
+  ];
+
+  # ContribOpTest.StringNormalizerTest sets locale to en_US.UTF-8"
+  preCheck = stdenv.lib.optionalString stdenv.isLinux ''
+    export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive"
+  '';
+  doCheck = true;
+
+  postInstall = ''
+    rm -r $out/bin   # ctest runner
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Cross-platform, high performance scoring engine for ML models";
+    longDescription = ''
+      ONNX Runtime is a performance-focused complete scoring engine
+      for Open Neural Network Exchange (ONNX) models, with an open
+      extensible architecture to continually address the latest developments
+      in AI and Deep Learning. ONNX Runtime stays up to date with the ONNX
+      standard with complete implementation of all ONNX operators, and
+      supports all ONNX releases (1.2+) with both future and backwards
+      compatibility.
+    '';
+    homepage = "https://github.com/microsoft/onnxruntime";
+    license = licenses.mit;
+    maintainers = with maintainers; [ jonringer ];
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 80a4805d288..08a051d0d25 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1852,6 +1852,8 @@ in
 
   onboard = callPackage ../applications/misc/onboard { };
 
+  onnxruntime = callPackage ../development/libraries/onnxruntime { };
+
   xkbd = callPackage ../applications/misc/xkbd { };
 
   optar = callPackage ../tools/graphics/optar {};
-- 
GitLab


From fca2e1cb5a0ba99fb723ae5fe311302e70dd89ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 2 Oct 2019 08:51:22 +0100
Subject: [PATCH 1759/2254] thunderbird: fix build with rustc 1.38

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

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 574c4895a64..cdf2769c27e 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -52,6 +52,11 @@ in stdenv.mkDerivation rec {
   patches = [
     # Remove buildconfig.html to prevent a dependency on clang etc.
     ./no-buildconfig.patch
+    (fetchpatch {
+      # https://phabricator.services.mozilla.com/D47796
+      url = "https://d3kxowhw4s8amj.cloudfront.net/file/data/a54c6fszaol23yh5aa27/PHID-FILE-sql3i57neyrztfdngrwe/D47796.diff";
+      sha256 = "18i1bk6rz875dly2vnkrdgbah8kx0lv4akjzl0i9gxc58hi5q3nq";
+    })
   ]
   ++ lib.optional (lib.versionOlder version "69")
     (fetchpatch { # https://bugzilla.mozilla.org/show_bug.cgi?id=1500436#c29
-- 
GitLab


From 80e262e85ad6dd5d29cb6ca7e99bc980886c8274 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 2 Oct 2019 03:00:00 -0500
Subject: [PATCH 1760/2254] zeek: add marsam as maintainer

---
 pkgs/applications/networking/ids/zeek/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/applications/networking/ids/zeek/default.nix
index 885b05adfb9..22bfa4d9bc9 100644
--- a/pkgs/applications/networking/ids/zeek/default.nix
+++ b/pkgs/applications/networking/ids/zeek/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     description = "Powerful network analysis framework much different from a typical IDS";
     homepage = "https://www.zeek.org";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ pSub ];
+    maintainers = with maintainers; [ pSub marsam ];
     platforms = platforms.unix;
   };
 }
-- 
GitLab


From 5d8ec9b99b49fcefb5527e0beffec7a656ea9112 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Mon, 9 Sep 2019 20:59:38 +0200
Subject: [PATCH 1761/2254] qgis: 3.8.0 -> 3.8.3

---
 pkgs/applications/gis/qgis/unwrapped.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix
index a57b180d5b2..bb772db2b6a 100644
--- a/pkgs/applications/gis/qgis/unwrapped.nix
+++ b/pkgs/applications/gis/qgis/unwrapped.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, cmake, ninja, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl
+{ mkDerivation, lib, fetchFromGitHub, cmake, ninja, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl
 , qwt, fcgi, python3Packages, libspatialindex, libspatialite, postgresql
 , txt2tags, openssl, libzip, hdf5, netcdf, exiv2
 , qtbase, qtwebkit, qtsensors, qca-qt5, qtkeychain, qscintilla, qtserialport, qtxmlpatterns
@@ -9,8 +9,8 @@ let
   pythonBuildInputs = with python3Packages;
     [ qscintilla-qt5 gdal jinja2 numpy psycopg2
       chardet dateutil pyyaml pytz requests urllib3 pygments pyqt5 sip owslib six ];
-in stdenv.mkDerivation rec {
-  version = "3.8.0";
+in mkDerivation rec {
+  version = "3.8.3";
   pname = "qgis";
   name = "${pname}-unwrapped-${version}";
 
@@ -18,7 +18,7 @@ in stdenv.mkDerivation rec {
     owner = "qgis";
     repo = "QGIS";
     rev = "final-${lib.replaceStrings ["."] ["_"] version}";
-    sha256 = "11jqj6lavpw9piv0rm8vvbgd99zhcxl6yfjg699wlrjlyf71xac5";
+    sha256 = "16axjih48qn8ri3p71d8f7k0y3rd05wghmg1fcbyda871b45b2f8";
   };
 
   passthru = {
@@ -29,7 +29,7 @@ in stdenv.mkDerivation rec {
   buildInputs = [ openssl proj geos xlibsWrapper sqlite gsl qwt exiv2
     fcgi libspatialindex libspatialite postgresql txt2tags libzip hdf5 netcdf
     qtbase qtwebkit qtsensors qca-qt5 qtkeychain qscintilla qtserialport qtxmlpatterns] ++
-    (stdenv.lib.optional withGrass grass) ++ pythonBuildInputs;
+    (lib.optional withGrass grass) ++ pythonBuildInputs;
 
   nativeBuildInputs = [ cmake flex bison ninja ];
 
@@ -45,13 +45,13 @@ in stdenv.mkDerivation rec {
   cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF"
                  "-DPYQT5_SIP_DIR=${python3Packages.pyqt5}/share/sip/PyQt5"
                  "-DQSCI_SIP_DIR=${python3Packages.qscintilla-qt5}/share/sip/PyQt5" ] ++
-                 stdenv.lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}";
+                 lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}";
 
   meta = {
     description = "A Free and Open Source Geographic Information System";
     homepage = http://www.qgis.org;
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = with stdenv.lib.platforms; linux;
-    maintainers = with stdenv.lib.maintainers; [ lsix ];
+    license = lib.licenses.gpl2Plus;
+    platforms = with lib.platforms; linux;
+    maintainers = with lib.maintainers; [ lsix ];
   };
 }
-- 
GitLab


From dbdb787cce9cdeb2f9e1fe4df19a456f7855cb9e Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Wed, 2 Oct 2019 10:08:44 +0200
Subject: [PATCH 1762/2254] grafana: 6.4.0 -> 6.4.1

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

diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index 3c10ec6f985..04ddde00458 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "grafana";
-  version = "6.4.0";
+  version = "6.4.1";
 
   goPackagePath = "github.com/grafana/grafana";
 
@@ -12,12 +12,12 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "grafana";
     repo = "grafana";
-    sha256 = "0rqfgswlq4fs3kb1cdpisvhawxvfirrs5pja6143sm1via3p8y59";
+    sha256 = "0z615a885vh92kv9jm6ixhj0i1w0k44wl4rczvp6mcmasbvfb5fb";
   };
 
   srcStatic = fetchurl {
     url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
-    sha256 = "1hyawiq7jgdak93ayzxmksbvkvdmfc26ska0n28f4gqppvrvkcqn";
+    sha256 = "08y2h7c2zavxwmxlajg2qzfd0lhkj00i2azz5ydm184m38b98kk7";
   };
 
   postPatch = ''
-- 
GitLab


From 0fe1972e8c7b12de541d7e602e2bb5d6cba72d2d Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 2 Oct 2019 10:33:09 +0200
Subject: [PATCH 1763/2254] openscad: fix qscintilla2 library reference

It is a bit of mystery where it gets qscintilla2_qt5 idea (removing it
from cmake modlues doesn't help, and such a library doesn't exist), so
just force-fix it for now.
---
 pkgs/applications/graphics/openscad/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix
index 9f7fbc8421b..9910b7bbadf 100644
--- a/pkgs/applications/graphics/openscad/default.nix
+++ b/pkgs/applications/graphics/openscad/default.nix
@@ -53,6 +53,10 @@ mkDerivation rec {
   # src/lexer.l:36:10: fatal error: parser.hxx: No such file or directory
   enableParallelBuilding = false; # true by default due to qmake
 
+  preBuild = ''
+    sed -re 's/qscintilla2_qt5/qscintilla2/g' -i Makefile
+  '';
+
   postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
     mkdir $out/Applications
     mv $out/bin/*.app $out/Applications
-- 
GitLab


From 7ed57e7c700d6fbed261a9b612decd00bad3fe01 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 2 Oct 2019 04:00:00 -0500
Subject: [PATCH 1764/2254] zeek: add tobim as maintainer

---
 pkgs/applications/networking/ids/zeek/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/applications/networking/ids/zeek/default.nix
index 22bfa4d9bc9..b087a6c3ae3 100644
--- a/pkgs/applications/networking/ids/zeek/default.nix
+++ b/pkgs/applications/networking/ids/zeek/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     description = "Powerful network analysis framework much different from a typical IDS";
     homepage = "https://www.zeek.org";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ pSub marsam ];
+    maintainers = with maintainers; [ pSub marsam tobim ];
     platforms = platforms.unix;
   };
 }
-- 
GitLab


From befd5c954bd14f55f0b4a2216bdf28f9ad50af5b Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 2 Oct 2019 00:00:00 -0500
Subject: [PATCH 1765/2254] ruby: remove ruby_2_3 patchset

d3983caf451ae52b2a527e6a9ad1620b950a8276 removed ruby_2_3 from nixpkgs
---
 pkgs/development/interpreters/ruby/patchsets.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix
index 56164de5b5f..775bc0e2c37 100644
--- a/pkgs/development/interpreters/ruby/patchsets.nix
+++ b/pkgs/development/interpreters/ruby/patchsets.nix
@@ -1,11 +1,6 @@
 { patchSet, useRailsExpress, ops, patchLevel, fetchpatch }:
 
 {
-  "2.3.8" = ops useRailsExpress [
-    "${patchSet}/patches/ruby/2.3/head/railsexpress/01-skip-broken-tests.patch"
-    "${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch"
-    "${patchSet}/patches/ruby/2.3/head/railsexpress/03-display-more-detailed-stack-trace.patch"
-  ];
   "2.4.7" = ops useRailsExpress [
     "${patchSet}/patches/ruby/2.4/head/railsexpress/01-skip-broken-tests.patch"
     "${patchSet}/patches/ruby/2.4/head/railsexpress/02-improve-gc-stats.patch"
-- 
GitLab


From 4ee22f3a9cd385f7dc7c984ec007ba90827657c1 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 2 Oct 2019 00:01:00 -0500
Subject: [PATCH 1766/2254] ruby_2_5: 2.6.4 -> 2.6.5

Changelog: https://www.ruby-lang.org/en/news/2019/10/01/ruby-2-6-5-released/
---
 pkgs/development/interpreters/ruby/default.nix   | 6 +++---
 pkgs/development/interpreters/ruby/patchsets.nix | 7 +------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 3494c8dee24..73ea36f23c4 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -228,10 +228,10 @@ in {
   };
 
   ruby_2_6 = generic {
-    version = rubyVersion "2" "6" "4" "";
+    version = rubyVersion "2" "6" "5" "";
     sha256 = {
-      src = "0dvrw4g2igvjclxk9bmb9pf6mzxwm22zqvqa0abkfnshfnxdihag";
-      git = "1h4z66amjykpzl6lxx6yad2yfpwnwix4sw19bd96jnwg248kviqf";
+      src = "0zgdrgylq6avbblf78kpaf0k2xnkpc3jng3wkd7x67ycdrqnp5v6";
+      git = "0pay6ic22ag3bnvxffhgwp7z6clkd0p93944a1l4lvc5hxc8v77j";
     };
   };
 }
diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix
index 775bc0e2c37..df4d3b4e72a 100644
--- a/pkgs/development/interpreters/ruby/patchsets.nix
+++ b/pkgs/development/interpreters/ruby/patchsets.nix
@@ -11,12 +11,7 @@
     "${patchSet}/patches/ruby/2.5/head/railsexpress/02-improve-gc-stats.patch"
     "${patchSet}/patches/ruby/2.5/head/railsexpress/03-more-detailed-stacktrace.patch"
   ];
-  "2.6.4" = [
-    (fetchpatch {
-      url = "https://git.ruby-lang.org/ruby.git/patch/?id=ade1283ca276f7d589ffd3539fbc7b9817f682d5";
-      sha256 = "1vgrckmzz0ykyxgzyp8fcifa93xz2hvyfil79bw1gc3xx94wnnxd";
-    })
-  ] ++ ops useRailsExpress [
+  "2.6.5" = ops useRailsExpress [
     "${patchSet}/patches/ruby/2.6/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch"
     "${patchSet}/patches/ruby/2.6/head/railsexpress/02-improve-gc-stats.patch"
     "${patchSet}/patches/ruby/2.6/head/railsexpress/03-more-detailed-stacktrace.patch"
-- 
GitLab


From 5e76e7b4301981d4118337c8f9a14a27cc5c7995 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 2 Oct 2019 00:02:00 -0500
Subject: [PATCH 1767/2254] ruby_2_5: 2.5.6 -> 2.5.7

Changelog: https://www.ruby-lang.org/en/news/2019/10/01/ruby-2-5-7-released/
---
 pkgs/development/interpreters/ruby/default.nix   | 6 +++---
 pkgs/development/interpreters/ruby/patchsets.nix | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 73ea36f23c4..d828431f842 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -220,10 +220,10 @@ in {
   };
 
   ruby_2_5 = generic {
-    version = rubyVersion "2" "5" "6" "";
+    version = rubyVersion "2" "5" "7" "";
     sha256 = {
-      src = "19xy6rf138ys4qycv0ibsycqwbjmf1j6iv9plw9cs81hcxnd0zhx";
-      git = "067gyy7149m6vk9dfyx22mghm2gbgy7snfa7df4ddrvr1pqffqmz";
+      src = "1m6nmnj9shifp8g3yh7aimac01vl035bzcc19x2spdji6ig0sb8b";
+      git = "0wppf82c9ccdbnvj30mppr5a3mc7sxm05diahjdw7hhk29n43knp";
     };
   };
 
diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix
index df4d3b4e72a..317fe771b79 100644
--- a/pkgs/development/interpreters/ruby/patchsets.nix
+++ b/pkgs/development/interpreters/ruby/patchsets.nix
@@ -6,7 +6,7 @@
     "${patchSet}/patches/ruby/2.4/head/railsexpress/02-improve-gc-stats.patch"
     "${patchSet}/patches/ruby/2.4/head/railsexpress/03-display-more-detailed-stack-trace.patch"
   ];
-  "2.5.6" = ops useRailsExpress [
+  "2.5.7" = ops useRailsExpress [
     "${patchSet}/patches/ruby/2.5/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch"
     "${patchSet}/patches/ruby/2.5/head/railsexpress/02-improve-gc-stats.patch"
     "${patchSet}/patches/ruby/2.5/head/railsexpress/03-more-detailed-stacktrace.patch"
-- 
GitLab


From 5ed9d8b8aaa1ce53b658704e075387678ba19222 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 2 Oct 2019 04:20:00 -0500
Subject: [PATCH 1768/2254] ruby_2_4: 2.4.7 -> 2.4.9

Changelog:
- https://www.ruby-lang.org/en/news/2019/10/01/ruby-2-4-8-released/
- https://www.ruby-lang.org/en/news/2019/10/02/ruby-2-4-9-released/
---
 pkgs/development/interpreters/ruby/default.nix   | 6 +++---
 pkgs/development/interpreters/ruby/patchsets.nix | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index d828431f842..723a4978234 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -212,10 +212,10 @@ let
 
 in {
   ruby_2_4 = generic {
-    version = rubyVersion "2" "4" "7" "";
+    version = rubyVersion "2" "4" "9" "";
     sha256 = {
-      src = "12cbyf7zai8mi3mxffm5ynq3mmkcbvs7kb1bbrs259m61irgqvnd";
-      git = "1dgch9xz4wdcncb6pf2dvijm10yk6mbw2wfdrj7d3wazrjzh305z";
+      src = "1bn6n5b920qy3lsx99jr8495jkc3sg89swgb96d5fgd579g6p6zr";
+      git = "066kb1iki7mx7qkm10xhj5b6v8s47wg68v43l3nc36y2hyim1w2c";
     };
   };
 
diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix
index 317fe771b79..6fbb33b27fc 100644
--- a/pkgs/development/interpreters/ruby/patchsets.nix
+++ b/pkgs/development/interpreters/ruby/patchsets.nix
@@ -1,7 +1,7 @@
 { patchSet, useRailsExpress, ops, patchLevel, fetchpatch }:
 
 {
-  "2.4.7" = ops useRailsExpress [
+  "2.4.9" = ops useRailsExpress [
     "${patchSet}/patches/ruby/2.4/head/railsexpress/01-skip-broken-tests.patch"
     "${patchSet}/patches/ruby/2.4/head/railsexpress/02-improve-gc-stats.patch"
     "${patchSet}/patches/ruby/2.4/head/railsexpress/03-display-more-detailed-stack-trace.patch"
-- 
GitLab


From 01aa4bb7cb1ec6dba14ce9df17215f7f0fc07418 Mon Sep 17 00:00:00 2001
From: Pierre Bourdon <delroth@gmail.com>
Date: Wed, 2 Oct 2019 12:46:01 +0200
Subject: [PATCH 1769/2254] vulnix: add missing setuptools dependency

More #68314 related breakage.
---
 pkgs/tools/security/vulnix/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/security/vulnix/default.nix b/pkgs/tools/security/vulnix/default.nix
index 2f7986c128b..25d3e8d105b 100644
--- a/pkgs/tools/security/vulnix/default.nix
+++ b/pkgs/tools/security/vulnix/default.nix
@@ -27,6 +27,7 @@ pythonPackages.buildPythonApplication rec {
     lxml
     pyyaml
     requests
+    setuptools
     toml
     zodb
   ]);
-- 
GitLab


From f5ab71b864695f3424dfcdacc6c534dfbf0ed0e6 Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Wed, 2 Oct 2019 13:13:44 +0200
Subject: [PATCH 1770/2254] jormungandr: 0.5.4 -> 0.5.5

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

diff --git a/pkgs/applications/blockchains/jormungandr/default.nix b/pkgs/applications/blockchains/jormungandr/default.nix
index bd781fa979d..f4ed3d777ca 100644
--- a/pkgs/applications/blockchains/jormungandr/default.nix
+++ b/pkgs/applications/blockchains/jormungandr/default.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "jormungandr";
-  version = "0.5.4";
+  version = "0.5.5";
 
   src = fetchgit {
     url = "https://github.com/input-output-hk/${pname}";
     rev = "v${version}";
-    sha256 = "18qja9gmw05hm1xy51pmzcrrapx6yz2qcz1a08aip954j23sqh8j";
+    sha256 = "1fzhmkx60b5fnx4x81g5ls93iixd3126m4q1smrpq8ksidw5xifa";
     fetchSubmodules = true;
   };
 
-  cargoSha256 = "1cnwmc0a1k308zpp8r18krlxzcfcf6hkx4qlldyzf9b2lrnfi1d2";
+  cargoSha256 = "1hkbzxp6ic1655cq45zv6dcyrk9rbmvscdl8wm8fbidabz4x8vqd";
 
   nativeBuildInputs = [ pkgconfig protobuf ];
   buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
-- 
GitLab


From 25295972d42c96a0b8219e052242dcd0287e54c7 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 1 Oct 2019 17:08:14 -0400
Subject: [PATCH 1771/2254] kafka: Add 2.3

---
 nixos/tests/kafka.nix                 | 1 +
 pkgs/servers/apache-kafka/default.nix | 5 +++++
 pkgs/top-level/all-packages.nix       | 7 ++++---
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/nixos/tests/kafka.nix b/nixos/tests/kafka.nix
index f526d18befe..48ca98da8fa 100644
--- a/nixos/tests/kafka.nix
+++ b/nixos/tests/kafka.nix
@@ -73,4 +73,5 @@ in with pkgs; {
   kafka_2_0  = makeKafkaTest "kafka_2_0"  apacheKafka_2_0;
   kafka_2_1  = makeKafkaTest "kafka_2_1"  apacheKafka_2_1;
   kafka_2_2  = makeKafkaTest "kafka_2_2"  apacheKafka_2_2;
+  kafka_2_3  = makeKafkaTest "kafka_2_3"  apacheKafka_2_3;
 }
diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix
index 0c1c69982fa..e932b772749 100644
--- a/pkgs/servers/apache-kafka/default.nix
+++ b/pkgs/servers/apache-kafka/default.nix
@@ -43,6 +43,11 @@ let
       scalaVersion = "2.12";
       sha256 = "1svdnhdzq9a6jsig513i0ahaysfgar5i385bq9fz7laga6a4z3qv";
     };
+    "2.3" = {
+      kafkaVersion = "2.3.0";
+      scalaVersion = "2.12";
+      sha256 = "1rz3xqv26h0zv5pmk65znzn08gycmrfj6vvbmrvl9i7hm4hm2vyq";
+    };
   };
 in
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a628bb1f4e0..2ef9fd0aa52 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9178,7 +9178,7 @@ in
   apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { };
   ant = apacheAnt;
 
-  apacheKafka = apacheKafka_2_2;
+  apacheKafka = apacheKafka_2_3;
   apacheKafka_0_9 = callPackage ../servers/apache-kafka { majorVersion = "0.9"; };
   apacheKafka_0_10 = callPackage ../servers/apache-kafka { majorVersion = "0.10"; };
   apacheKafka_0_11 = callPackage ../servers/apache-kafka { majorVersion = "0.11"; };
@@ -9187,6 +9187,7 @@ in
   apacheKafka_2_0 = callPackage ../servers/apache-kafka { majorVersion = "2.0"; };
   apacheKafka_2_1 = callPackage ../servers/apache-kafka { majorVersion = "2.1"; };
   apacheKafka_2_2 = callPackage ../servers/apache-kafka { majorVersion = "2.2"; };
+  apacheKafka_2_3 = callPackage ../servers/apache-kafka { majorVersion = "2.3"; };
 
   kt = callPackage ../tools/misc/kt {};
 
@@ -15484,11 +15485,11 @@ in
   bridge-utils = callPackage ../os-specific/linux/bridge-utils { };
 
   busybox = callPackage ../os-specific/linux/busybox { };
-  busybox-sandbox-shell = callPackage ../os-specific/linux/busybox/sandbox-shell.nix { 
+  busybox-sandbox-shell = callPackage ../os-specific/linux/busybox/sandbox-shell.nix {
     # musl roadmap has RISC-V support projected for 1.1.20
     busybox = if !stdenv.hostPlatform.isRiscV && stdenv.hostPlatform.libc != "bionic"
               then pkgsStatic.busybox
-              else busybox; 
+              else busybox;
   };
 
   cachefilesd = callPackage ../os-specific/linux/cachefilesd { };
-- 
GitLab


From 7b8ae75cc3b719430354a08aa6b5cd931721efe8 Mon Sep 17 00:00:00 2001
From: Nicolas Mattia <nicolas@nmattia.com>
Date: Wed, 2 Oct 2019 14:13:39 +0200
Subject: [PATCH 1772/2254] libbfd: use zlib.dev as input

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

diff --git a/pkgs/development/libraries/libbfd/default.nix b/pkgs/development/libraries/libbfd/default.nix
index 89ca984767b..15561677ad5 100644
--- a/pkgs/development/libraries/libbfd/default.nix
+++ b/pkgs/development/libraries/libbfd/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
   dontUpdateAutotoolsGnuConfigScripts = true;
 
   nativeBuildInputs = [ autoreconfHook bison ];
-  buildInputs = [ libiberty zlib ];
+  buildInputs = [ libiberty zlib.dev ];
 
   configurePlatforms = [ "build" "host" ];
   configureFlags = [
-- 
GitLab


From 96a1dbac972c4f67aea7ee548f4e5531003f8ab0 Mon Sep 17 00:00:00 2001
From: talyz <kim.lindberger@gmail.com>
Date: Wed, 2 Oct 2019 00:32:21 +0200
Subject: [PATCH 1773/2254] bundler: 1.17.2 -> 1.17.3

Extracted from https://github.com/NixOS/nixpkgs/pull/70216.
---
 pkgs/development/ruby-modules/bundler/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix
index decde250ac2..6190b4210cd 100644
--- a/pkgs/development/ruby-modules/bundler/default.nix
+++ b/pkgs/development/ruby-modules/bundler/default.nix
@@ -4,8 +4,8 @@ buildRubyGem rec {
   inherit ruby;
   name = "${gemName}-${version}";
   gemName = "bundler";
-  version = "1.17.2";
-  source.sha256 = "0dbnq6703mjvgsri45vaw7b4wjqr89z1h8xkzsacqcp24a706m5r";
+  version = "1.17.3";
+  source.sha256 = "0ln3gnk7cls81gwsbxvrmlidsfd78s6b2hzlm4d4a9wbaidzfjxw";
   dontPatchShebangs = true;
 
   postFixup = ''
-- 
GitLab


From 5258f5597d71c98e679d6529c919a07de68d60bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 2 Oct 2019 15:15:32 +0200
Subject: [PATCH 1774/2254] haddock-*: fix by pinning

---
 .../haskell-modules/configuration-hackage2nix.yaml       | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 70dddd52252..64d90730ecb 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2486,13 +2486,8 @@ extra-packages:
   - deepseq == 1.3.0.1                  # required to build Cabal with GHC 6.12.3
   - generic-deriving == 1.10.5.*        # new versions don't compile with GHC 7.10.x
   - gloss < 1.9.3                       # new versions don't compile with GHC 7.8.x
-  - haddock < 2.17                      # required on GHC 7.10.x
-  - haddock == 2.17.*                   # required on GHC 8.0.x
-  - haddock-api == 2.15.*               # required on GHC 7.8.x
-  - haddock-api == 2.16.*               # required on GHC 7.10.x
-  - haddock-api == 2.17.*               # required on GHC 8.0.x
-  - haddock-library == 1.2.*            # required for haddock-api-2.16.x
-  - haddock-library == 1.4.3            # required for haddock-api-2.17.x
+  - haddock == 2.22.*                   # required on GHC 8.0.x
+  - haddock-api == 2.22.*               # required on GHC 7.8.x
   - happy <1.19.6                       # newer versions break Agda
   - haskell-gi-overloading == 0.0       # gi-* packages use this dependency to disable overloading support
   - haskell-src-exts == 1.19.*          # required by hindent and structured-haskell-mode
-- 
GitLab


From 9dfa74a9a80ded5e7587742a539102683b7c7b73 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 2 Oct 2019 15:25:01 +0200
Subject: [PATCH 1775/2254] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.15.0-1-g5325ccd from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/54d61d70bc071d03e652e6d662e4d944d20723c5.
---
 .../haskell-modules/hackage-packages.nix      | 297 +++++++++---------
 1 file changed, 141 insertions(+), 156 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 21b0d1a4060..acab9c23765 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -6098,28 +6098,23 @@ self: {
 
   "FormalGrammars" = callPackage
     ({ mkDerivation, ADPfusion, ansi-wl-pprint, base, bytestring
-     , cmdargs, containers, data-default, HaTeX, lens, mtl, parsers
-     , PrimitiveArray, QuickCheck, semigroups, smallcheck, tasty
-     , tasty-quickcheck, tasty-smallcheck, tasty-th, template-haskell
-     , text, transformers, trifecta, unordered-containers, vector
+     , containers, data-default, lens, mtl, parsers, PrimitiveArray
+     , semigroups, template-haskell, text, transformers, trifecta
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "FormalGrammars";
-       version = "0.3.1.2";
-       sha256 = "02c80cjn4cprkcyd6vyjp7d0q9180cv0ajf6gj4x7ai5n4z2fl1q";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.4.0.0";
+       sha256 = "1gl0z40g8vc52zhjzdysrzgjyj5qrwhh6dnzkpfj83m13zahhy1p";
        libraryHaskellDepends = [
          ADPfusion ansi-wl-pprint base bytestring containers data-default
-         HaTeX lens mtl parsers PrimitiveArray semigroups template-haskell
-         text transformers trifecta unordered-containers vector
-       ];
-       executableHaskellDepends = [
-         ansi-wl-pprint base cmdargs trifecta
+         lens mtl parsers PrimitiveArray semigroups template-haskell text
+         transformers trifecta unordered-containers vector
        ];
        testHaskellDepends = [
-         base QuickCheck smallcheck tasty tasty-quickcheck tasty-smallcheck
-         tasty-th
+         ADPfusion ansi-wl-pprint base bytestring containers data-default
+         lens mtl parsers PrimitiveArray semigroups template-haskell text
+         transformers trifecta unordered-containers vector
        ];
        description = "(Context-free) grammars in formal language theory";
        license = stdenv.lib.licenses.gpl3;
@@ -7263,8 +7258,8 @@ self: {
      }:
      mkDerivation {
        pname = "GrammarProducts";
-       version = "0.1.1.3";
-       sha256 = "1mr5pdm0nprs997vq7xdk7f5m85pdyncgs8qnfy2fjcs5zl8zzr0";
+       version = "0.2.0.0";
+       sha256 = "15iqga816zkc9fwfb4aiab6xjs84z56v9fm2jxbhvigvadd153bj";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -7272,6 +7267,7 @@ self: {
          FormalGrammars lens newtype parsers PrimitiveArray semigroups
          template-haskell transformers trifecta
        ];
+       testHaskellDepends = [ base ];
        description = "Grammar products and higher-dimensional grammars";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -13386,16 +13382,16 @@ self: {
      }) {};
 
   "Monadoro" = callPackage
-    ({ mkDerivation, ansi-terminal, base, doctest, time }:
+    ({ mkDerivation, ansi-terminal, base, doctest, process, time }:
      mkDerivation {
        pname = "Monadoro";
-       version = "0.2.1.5";
-       sha256 = "1k4f7ks0cbyqz2g6y5kdzrlbx2j3xz7mrvj79k2m3lbhs4hcik6l";
+       version = "0.2.1.8";
+       sha256 = "19xnj9hcb3dk3igkwzh5vfvkixyya84r1jxrh1x1k663fapcnkp5";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ ansi-terminal base time ];
-       executableHaskellDepends = [ ansi-terminal base time ];
-       testHaskellDepends = [ ansi-terminal base doctest time ];
+       libraryHaskellDepends = [ ansi-terminal base process time ];
+       executableHaskellDepends = [ ansi-terminal base process time ];
+       testHaskellDepends = [ ansi-terminal base doctest process time ];
        description = "A minimalistic CLI Pomodoro timer";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -30502,14 +30498,28 @@ self: {
        broken = true;
      }) {debian-mirror = null; help = null;};
 
+  "archive-libarchive" = callPackage
+    ({ mkDerivation, base, bytestring, composition-prelude, libarchive
+     }:
+     mkDerivation {
+       pname = "archive-libarchive";
+       version = "0.2.0.0";
+       sha256 = "0gy52dw00b110f5nc6gbnfgs5nssv7r8az1vy8xr1xj1dnpjwb74";
+       libraryHaskellDepends = [
+         base bytestring composition-prelude libarchive
+       ];
+       description = "Common interface using libarchive";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "archive-sig" = callPackage
     ({ mkDerivation, base, bytestring, composition-prelude
      , dir-traverse
      }:
      mkDerivation {
        pname = "archive-sig";
-       version = "0.2.0.1";
-       sha256 = "1x7kpyxfhn4i9c9wrxwda53qyj4jgw9vd3wfrzxvdfj5wdrdn79d";
+       version = "0.2.0.2";
+       sha256 = "0pfznlkw0vj8y1ahsmiy904hkhkf76qgqlp6h3hlgzrmhdy5yz9d";
        libraryHaskellDepends = [
          base bytestring composition-prelude dir-traverse
        ];
@@ -40013,6 +40023,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bits-extra_0_0_1_4" = callPackage
+    ({ mkDerivation, base, criterion, ghc-prim, hedgehog, hspec
+     , hspec-discover, hw-hedgehog, hw-hspec-hedgehog, vector
+     }:
+     mkDerivation {
+       pname = "bits-extra";
+       version = "0.0.1.4";
+       sha256 = "1hkl71661hh8czd7hrfwj48blav4g3jdy3nl06bw2iw8bkl00nz2";
+       libraryHaskellDepends = [ base ghc-prim vector ];
+       testHaskellDepends = [
+         base ghc-prim hedgehog hspec hw-hedgehog hw-hspec-hedgehog
+       ];
+       testToolDepends = [ hspec-discover ];
+       benchmarkHaskellDepends = [ base criterion ghc-prim vector ];
+       description = "Useful bitwise operations";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "bits-extras" = callPackage
     ({ mkDerivation, base, gcc_s }:
      mkDerivation {
@@ -45294,6 +45323,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cabal-doctest_1_0_8" = callPackage
+    ({ mkDerivation, base, Cabal, directory, filepath }:
+     mkDerivation {
+       pname = "cabal-doctest";
+       version = "1.0.8";
+       sha256 = "03if74imlhhk7m56nci5f1wclniwqdmwl4hl177040j1gnlac9i0";
+       libraryHaskellDepends = [ base Cabal directory filepath ];
+       description = "A Setup.hs helper for doctests running";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cabal-file-th" = callPackage
     ({ mkDerivation, base, Cabal, directory, pretty, template-haskell
      }:
@@ -59237,10 +59278,8 @@ self: {
      }:
      mkDerivation {
        pname = "cpkg";
-       version = "0.2.3.3";
-       sha256 = "1wd53g5isk284im2vzyis9n38qchg6m62zb3x4gkmy21zrjh50f1";
-       revision = "1";
-       editedCabalFile = "1ihawlb4xkq5lhj56ry5n2mhykrkjnan33s577f6gzzmzyz0rd1h";
+       version = "0.2.3.4";
+       sha256 = "0q54dwhlp9x6k363n5p12722davfalxljxlbiskirky02kba9bdl";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -59252,7 +59291,7 @@ self: {
        ];
        libraryToolDepends = [ cpphs ];
        executableHaskellDepends = [
-         base directory optparse-applicative text
+         base dhall directory optparse-applicative text
        ];
        testHaskellDepends = [ base hspec hspec-megaparsec megaparsec ];
        description = "Build tool for C";
@@ -85135,6 +85174,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "flow_1_0_19" = callPackage
+    ({ mkDerivation, base, doctest, QuickCheck, template-haskell }:
+     mkDerivation {
+       pname = "flow";
+       version = "1.0.19";
+       sha256 = "00pfsyfn7wpgghsw9xgakrxa3n04lizfhrxkg9jbyw0gvd5w6hi9";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base doctest QuickCheck template-haskell ];
+       description = "Write more understandable Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "flow-er" = callPackage
     ({ mkDerivation, base, doctest, flow, QuickCheck }:
      mkDerivation {
@@ -90648,14 +90700,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "generic-lens_1_2_0_0" = callPackage
+  "generic-lens_1_2_0_1" = callPackage
     ({ mkDerivation, base, criterion, deepseq, doctest, HUnit
      , inspection-testing, lens, profunctors, QuickCheck, tagged, text
      }:
      mkDerivation {
        pname = "generic-lens";
-       version = "1.2.0.0";
-       sha256 = "0qf49s01xkbhlfclc4a3ybhhf65g6mmigkkqj2psdjndgjdaxhb2";
+       version = "1.2.0.1";
+       sha256 = "0dl7xrrrrbcsz6m69liiz6r8jaa7yi1h8ppgxj94r2zi7pjmwvwf";
        libraryHaskellDepends = [ base profunctors tagged text ];
        testHaskellDepends = [
          base doctest HUnit inspection-testing lens profunctors
@@ -104740,35 +104792,16 @@ self: {
        broken = true;
      }) {};
 
-  "haddock_2_16_1" = callPackage
-    ({ mkDerivation, base, Cabal, directory, filepath, haddock-api
-     , process
-     }:
-     mkDerivation {
-       pname = "haddock";
-       version = "2.16.1";
-       sha256 = "1mnnvc5jqp6n6rj7xw8wdm0z2xp9fndkz11c8p3vbljsrcqd3v26";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [ base haddock-api ];
-       testHaskellDepends = [ base Cabal directory filepath process ];
-       doCheck = false;
-       preCheck = "unset GHC_PACKAGE_PATH";
-       description = "A documentation-generation tool for Haskell libraries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "haddock_2_17_5" = callPackage
-    ({ mkDerivation, base, filepath, haddock-api, hspec }:
+  "haddock_2_22_0" = callPackage
+    ({ mkDerivation, base, filepath, haddock-api }:
      mkDerivation {
        pname = "haddock";
-       version = "2.17.5";
-       sha256 = "1qxy6yxpxgpqpwcs76ydpal45cz4a3hyq3rq07cwma1cs4p034ql";
+       version = "2.22.0";
+       sha256 = "1k42z2zh550rl93c8pa9cg2xsanp6wvb031xvan6cmngnplmdib6";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base haddock-api ];
-       testHaskellDepends = [ base filepath hspec ];
+       testHaskellDepends = [ base filepath ];
        doCheck = false;
        preCheck = "unset GHC_PACKAGE_PATH";
        description = "A documentation-generation tool for Haskell libraries";
@@ -104792,61 +104825,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "haddock-api_2_15_0_2" = callPackage
-    ({ mkDerivation, array, base, bytestring, Cabal, containers
-     , deepseq, directory, filepath, ghc, ghc-paths, haddock-library
-     , xhtml
-     }:
-     mkDerivation {
-       pname = "haddock-api";
-       version = "2.15.0.2";
-       sha256 = "1gdmwid3qg86ql0828bp8g121psvmz11s0xivrzhiv8knxbqj8l7";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         array base bytestring Cabal containers deepseq directory filepath
-         ghc ghc-paths haddock-library xhtml
-       ];
-       description = "A documentation-generation tool for Haskell libraries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "haddock-api_2_16_1" = callPackage
+  "haddock-api_2_22_0" = callPackage
     ({ mkDerivation, array, base, bytestring, Cabal, containers
-     , deepseq, directory, filepath, ghc, ghc-paths, haddock-library
+     , deepseq, directory, filepath, ghc, ghc-boot, ghc-paths
+     , haddock-library, hspec, hspec-discover, QuickCheck, transformers
      , xhtml
      }:
      mkDerivation {
        pname = "haddock-api";
-       version = "2.16.1";
-       sha256 = "1spd5axg1pdjv4dkdb5gcwjsc8gg37qi4mr2k2db6ayywdkis1p2";
+       version = "2.22.0";
+       sha256 = "149q4zlf4m7wcrr4af2n2flh0jxjsypshbc229vsj1m0kmz4z014";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base bytestring Cabal containers deepseq directory filepath
-         ghc ghc-paths haddock-library xhtml
+         ghc ghc-boot ghc-paths haddock-library transformers xhtml
        ];
-       description = "A documentation-generation tool for Haskell libraries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "haddock-api_2_17_4" = callPackage
-    ({ mkDerivation, array, base, bytestring, Cabal, containers
-     , deepseq, directory, filepath, ghc, ghc-boot, ghc-paths
-     , haddock-library, hspec, QuickCheck, transformers, xhtml
-     }:
-     mkDerivation {
-       pname = "haddock-api";
-       version = "2.17.4";
-       sha256 = "00fn6pzgg8xjbaw12d76jdqh2dbc5xy7miyz0x6kidvvar7i35ss";
-       revision = "1";
-       editedCabalFile = "0saa5ksmvxyvwi2nrzh7m4ha1kwh31pkpa79yrppvw7sm39klpyw";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
+       testHaskellDepends = [
          array base bytestring Cabal containers deepseq directory filepath
-         ghc ghc-boot ghc-paths haddock-library transformers xhtml
+         ghc ghc-boot ghc-paths haddock-library hspec QuickCheck
+         transformers xhtml
        ];
-       testHaskellDepends = [ base containers ghc hspec QuickCheck ];
+       testToolDepends = [ hspec-discover ];
        description = "A documentation-generation tool for Haskell libraries";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -104907,40 +104906,6 @@ self: {
        broken = true;
      }) {};
 
-  "haddock-library_1_2_1" = callPackage
-    ({ mkDerivation, base, base-compat, bytestring, deepseq, hspec
-     , QuickCheck, transformers
-     }:
-     mkDerivation {
-       pname = "haddock-library";
-       version = "1.2.1";
-       sha256 = "0mhh2ppfhrvvi9485ipwbkv2fbgj35jvz3la02y3jlvg5ffs1c8g";
-       libraryHaskellDepends = [ base bytestring deepseq transformers ];
-       testHaskellDepends = [
-         base base-compat bytestring deepseq hspec QuickCheck transformers
-       ];
-       description = "Library exposing some functionality of Haddock";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "haddock-library_1_4_3" = callPackage
-    ({ mkDerivation, base, base-compat, bytestring, deepseq, hspec
-     , QuickCheck, transformers
-     }:
-     mkDerivation {
-       pname = "haddock-library";
-       version = "1.4.3";
-       sha256 = "0ns4bpf6whmcfl0cm2gx2c73if416x4q3ac4l4qm8w84h0zpcr7p";
-       libraryHaskellDepends = [ base bytestring deepseq transformers ];
-       testHaskellDepends = [
-         base base-compat bytestring deepseq hspec QuickCheck transformers
-       ];
-       description = "Library exposing some functionality of Haddock";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "haddock-library" = callPackage
     ({ mkDerivation, base, base-compat, bytestring, containers, deepseq
      , hspec, hspec-discover, parsec, QuickCheck, text, transformers
@@ -128323,8 +128288,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-client-overrides";
-       version = "0.1.0.0";
-       sha256 = "1s6qblbw4z9afzdy43hk8rfhgxj3k60x03p3y0dmp1l2i712x89g";
+       version = "0.1.1.0";
+       sha256 = "15asl6xksr7qmjbm64my3h1x3sx7558vdidx7zlkl8lf1k0w0kcl";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -130330,27 +130295,29 @@ self: {
      }) {};
 
   "hw-dump" = callPackage
-    ({ mkDerivation, base, bits-extra, bytestring, criterion, hedgehog
-     , hspec, hw-bits, hw-hspec-hedgehog, hw-prim, lens
-     , optparse-applicative, QuickCheck, safe, vector
+    ({ mkDerivation, base, bits-extra, bytestring, criterion
+     , generic-lens, hedgehog, hspec, hspec-discover, hw-bits
+     , hw-hspec-hedgehog, hw-prim, lens, optparse-applicative
+     , QuickCheck, safe, vector
      }:
      mkDerivation {
        pname = "hw-dump";
-       version = "0.0.0.1";
-       sha256 = "0sxw0fgrq83ahil1sa2mqndwxw7bjxya42sxym6jjsky9jr0mygl";
+       version = "0.1.0.0";
+       sha256 = "1srbn2xkaa8ab1x00hasanj829h5pypa8dan37zcmdhdqvpc6k25";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base bits-extra bytestring hw-bits hw-prim safe vector
        ];
        executableHaskellDepends = [
-         base bits-extra bytestring hw-bits hw-prim lens
+         base bits-extra bytestring generic-lens hw-bits hw-prim lens
          optparse-applicative vector
        ];
        testHaskellDepends = [
          base bits-extra bytestring hedgehog hspec hw-bits hw-hspec-hedgehog
          hw-prim QuickCheck vector
        ];
+       testToolDepends = [ hspec-discover ];
        benchmarkHaskellDepends = [
          base bits-extra bytestring criterion hw-bits hw-prim vector
        ];
@@ -130407,6 +130374,8 @@ self: {
        pname = "hw-excess";
        version = "0.2.2.0";
        sha256 = "07d6q5m98z6r7p4hhzzm8ihn9sbd05hhf40a0hcq3ixxrdz7yyrb";
+       revision = "1";
+       editedCabalFile = "13k4fm6cyqmsh3wbqh76jn8r0rw9z1nw65zb061smgkk1v9ii3j7";
        libraryHaskellDepends = [
          base hw-bits hw-prim hw-rankselect-base safe vector
        ];
@@ -130481,6 +130450,8 @@ self: {
        pname = "hw-hspec-hedgehog";
        version = "0.1.0.8";
        sha256 = "0c54mhzbmjfjvy5lyvr6xffrncqmbbr10lran2x9czbkhhbikrss";
+       revision = "1";
+       editedCabalFile = "0msy1a646w5m0z5670b7xgc1apzan3myaqrq6i6khsayzk5z597j";
        libraryHaskellDepends = [
          base call-stack hedgehog hspec HUnit transformers
        ];
@@ -130791,8 +130762,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-kafka-client";
-       version = "2.6.0";
-       sha256 = "1318gyl3jn3q2namzpzf0254hqpib2nn1kipf6gnfp4dvwv0wbgn";
+       version = "2.6.1";
+       sha256 = "01481i1cw7rdxr006ksiizggh7gjlqzhrxw2lmg953sa35bgz784";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -131057,8 +131028,8 @@ self: {
        pname = "hw-rankselect";
        version = "0.13.2.0";
        sha256 = "00k163jalapxdlcmcvi4ddk60bsj34f7ng05agvh1374kybqscb4";
-       revision = "1";
-       editedCabalFile = "0a0mlfbln3whziv2rp63qr1qjm4vxgrd8535irnlyy5ba0a0lad8";
+       revision = "2";
+       editedCabalFile = "12c35s16x77wch32jcbxqy35gwkvnfrx3s1xca4crg7mcwd5lcg4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -131094,8 +131065,8 @@ self: {
        pname = "hw-rankselect-base";
        version = "0.3.2.1";
        sha256 = "0q4kywln4bls2dvazhqh2acw4yqnabnx0mdkhldgg70q8amnq2nj";
-       revision = "2";
-       editedCabalFile = "0djyix1fp00s8j0qjja4557wdflgixpz4fvrmwiw7x294zr9f9fw";
+       revision = "3";
+       editedCabalFile = "1hbbxxzmar0djj4r43nr3ar9nsl659wnq20rw6cp6q974ivlglx2";
        libraryHaskellDepends = [
          base bits-extra hw-bits hw-int hw-prim hw-string-parse safe vector
        ];
@@ -134782,6 +134753,20 @@ self: {
        broken = true;
      }) {};
 
+  "indents_0_5_0_1" = callPackage
+    ({ mkDerivation, base, mtl, parsec, tasty, tasty-hunit }:
+     mkDerivation {
+       pname = "indents";
+       version = "0.5.0.1";
+       sha256 = "0dpcwiz0dwn5aqdsc50plfaawh86adhf7jx5dsmhn5q5nz32qn51";
+       libraryHaskellDepends = [ base mtl parsec ];
+       testHaskellDepends = [ base mtl parsec tasty tasty-hunit ];
+       description = "indentation sensitive parser-combinators for parsec";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "index-core" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -145853,8 +145838,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-thrift";
-       version = "0.10.0.0";
-       sha256 = "0y6klcw036cjw72snwyhkz1mzg2cp6p7cfdc449ynzwsg5l9kz99";
+       version = "0.11.0.0";
+       sha256 = "0gxhpaspb8iyfhl8gxxn9an17blrh5vnkn3y9ywzslxkvj31nds5";
        libraryHaskellDepends = [
          ansi-wl-pprint base containers megaparsec scientific semigroups
          text transformers
@@ -189257,14 +189242,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "process_1_6_5_1" = callPackage
+  "process_1_6_6_0" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, directory, filepath
      , unix
      }:
      mkDerivation {
        pname = "process";
-       version = "1.6.5.1";
-       sha256 = "1x9vdcj4g19ibf34w96nzgv2blxx727z0xb7dq012ky04ssblx8j";
+       version = "1.6.6.0";
+       sha256 = "140as37rfad7hy1lg03n19dzfbcdaahv64aydl6frv06qvdlc49w";
        libraryHaskellDepends = [ base deepseq directory filepath unix ];
        testHaskellDepends = [ base bytestring directory ];
        description = "Process libraries";
@@ -195616,8 +195601,8 @@ self: {
      }:
      mkDerivation {
        pname = "raven-haskell";
-       version = "0.1.2.0";
-       sha256 = "1g6102p6adn5jc2jvqjgyzpylvacv52yj754rki21l6d13cn07a4";
+       version = "0.1.2.1";
+       sha256 = "1mzz7z99a2agivwypcl62y68vpmihyh6rvy79w1jd29n1l2p621x";
        libraryHaskellDepends = [
          aeson base bytestring http-conduit mtl network random resourcet
          text time unordered-containers uuid
-- 
GitLab


From bf22c802e1a96eb098b685cf9a7e307b4e19023b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 2 Oct 2019 15:35:50 +0200
Subject: [PATCH 1776/2254] haddock: fix build

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 67fe3b23942..1ddc15a2ca4 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1056,12 +1056,13 @@ self: super: {
   # https://github.com/haskell-hvr/hgettext/issues/14
   hgettext = doJailbreak super.hgettext;
 
+  # 2.23.0 supports GHC 8.x and up
+  haddock = super.haddock_2_22_0;
   # haddock-api-2.22.0: Break out of “QuickCheck ==2.11.*, hspec >=2.4.4 && <2.6”
-  haddock-api = dontHaddock (doJailbreak (super.haddock-api));
+  haddock-api = dontHaddock (doJailbreak (super.haddock-api_2_22_0));
 
   # The test suite is broken. Break out of "base-compat >=0.9.3 && <0.10, hspec >=2.4.4 && <2.5".
   haddock-library = doJailbreak (dontCheck super.haddock-library);
-  # haddock-library_1_6_0 = doJailbreak (dontCheck super.haddock-library_1_6_0);
 
   # Generate shell completion.
   cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix;
-- 
GitLab


From b1bf22ab0050cf5cff4f389719cdbca53bd30666 Mon Sep 17 00:00:00 2001
From: Eric Dallo <ericdallo06@hotmail.com>
Date: Sun, 29 Sep 2019 21:35:23 -0300
Subject: [PATCH 1777/2254] gnomeExtensions.drop-down-terminal: init at 24

---
 maintainers/maintainer-list.nix               |  5 +++
 .../extensions/drop-down-terminal/default.nix | 35 +++++++++++++++++++
 .../drop-down-terminal/fix_vte_and_gjs.patch  | 32 +++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 4 files changed, 73 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/extensions/drop-down-terminal/default.nix
 create mode 100644 pkgs/desktops/gnome-3/extensions/drop-down-terminal/fix_vte_and_gjs.patch

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 3cb0cd3fa99..12e9ce60694 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1997,6 +1997,11 @@
     githubId = 4828;
     name = "Eric Merritt";
   };
+  ericdallo = {
+    email = "ercdll1337@gmail.com";
+    github = "ericdallo";
+    name = "Eric Dallo";
+  };
   ericsagnes = {
     email = "eric.sagnes@gmail.com";
     github = "ericsagnes";
diff --git a/pkgs/desktops/gnome-3/extensions/drop-down-terminal/default.nix b/pkgs/desktops/gnome-3/extensions/drop-down-terminal/default.nix
new file mode 100644
index 00000000000..c0ecfc29e2c
--- /dev/null
+++ b/pkgs/desktops/gnome-3/extensions/drop-down-terminal/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchFromGitHub, substituteAll, gnome3, vte }:
+
+stdenv.mkDerivation rec {
+  pname = "gnome-shell-extension-drop-down-terminal";
+  version = "24";
+
+  src = fetchFromGitHub {
+    owner = "zzrough";
+    repo = "gs-extensions-drop-down-terminal";
+    rev = "v${version}";
+    sha256 = "1gda56xzwsa5pgmgpb7lhb3i3gqishvn84282inwvqm86afks73r";
+  };
+
+  uuid = "drop-down-terminal@gs-extensions.zzrough.org";
+
+  patches = [
+    (substituteAll {
+      src = ./fix_vte_and_gjs.patch;
+      inherit vte;
+      gjs = gnome3.gjs;
+    })
+  ];
+
+  installPhase = ''
+    mkdir -p $out/share/gnome-shell/extensions
+    cp -r ${uuid} $out/share/gnome-shell/extensions/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Configurable drop down terminal shell";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ ericdallo ];
+    homepage = https://github.com/zzrough/gs-extensions-drop-down-terminal;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/extensions/drop-down-terminal/fix_vte_and_gjs.patch b/pkgs/desktops/gnome-3/extensions/drop-down-terminal/fix_vte_and_gjs.patch
new file mode 100644
index 00000000000..3544c91ee89
--- /dev/null
+++ b/pkgs/desktops/gnome-3/extensions/drop-down-terminal/fix_vte_and_gjs.patch
@@ -0,0 +1,32 @@
+--- a/drop-down-terminal@gs-extensions.zzrough.org/extension.js
++++ b/drop-down-terminal@gs-extensions.zzrough.org/extension.js
+@@ -15,6 +15,8 @@
+ 
+ // Author: Stéphane Démurget <stephane.demurget@free.fr>
+ 
++imports.gi.GIRepository.Repository.prepend_search_path('@vte@/lib/girepository-1.0')
++
+ const Lang = imports.lang;
+ const Gettext = imports.gettext.domain("drop-down-terminal");
+ const Mainloop = imports.mainloop;
+@@ -653,7 +655,7 @@ const DropDownTerminalExtension = new Lang.Class({
+         this._killingChild = false;
+ 
+         // finds the forking arguments
+-        let args = ["gjs", GLib.build_filenamev([Me.path, "terminal.js"]), Me.path];
++        let args = ["@gjs@/bin/gjs", GLib.build_filenamev([Me.path, "terminal.js"]), Me.path];
+ 
+         // forks the process
+         debug("forking '" + args.join(" ") + "'");
+--- a/drop-down-terminal@gs-extensions.zzrough.org/terminal.js
++++ b/drop-down-terminal@gs-extensions.zzrough.org/terminal.js
+@@ -14,6 +14,9 @@
+ // along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ 
+ // Author: Stéphane Démurget <stephane.demurget@free.fr>
++
++imports.gi.GIRepository.Repository.prepend_search_path('@vte@/lib/girepository-1.0')
++
+ const Lang = imports.lang;
+ 
+ const Pango = imports.gi.Pango;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a2fbc80a9c6..457b11a7590 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22654,6 +22654,7 @@ in
     clipboard-indicator = callPackage ../desktops/gnome-3/extensions/clipboard-indicator { };
     dash-to-dock = callPackage ../desktops/gnome-3/extensions/dash-to-dock { };
     dash-to-panel = callPackage ../desktops/gnome-3/extensions/dash-to-panel { };
+    drop-down-terminal = callPackage ../desktops/gnome-3/extensions/drop-down-terminal { };
     gsconnect = callPackage ../desktops/gnome-3/extensions/gsconnect { };
     icon-hider = callPackage ../desktops/gnome-3/extensions/icon-hider { };
     impatience = callPackage ../desktops/gnome-3/extensions/impatience.nix { };
-- 
GitLab


From 44e14e94940e75106568e29b205985b7c49daa26 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 2 Oct 2019 04:20:00 -0500
Subject: [PATCH 1778/2254] rclone: 1.49.3 -> 1.49.4

Changelog: https://forum.rclone.org/t/rclone-1-49-4-release/12099
---
 pkgs/applications/networking/sync/rclone/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix
index 5e9945492de..bc26541f4d7 100644
--- a/pkgs/applications/networking/sync/rclone/default.nix
+++ b/pkgs/applications/networking/sync/rclone/default.nix
@@ -2,13 +2,13 @@
 
 buildGoPackage rec {
   pname = "rclone";
-  version = "1.49.3";
+  version = "1.49.4";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "0dd5xrbf62n4y77zzaai1rc069ism1ikvcw43hzja3mzwfa0sqqa";
+    sha256 = "04fa85ch85dxm2nq7vqria34zn6fbgvky7p1i59j1wib753jpxyp";
   };
 
   goPackagePath = "github.com/rclone/rclone";
-- 
GitLab


From ffa991e7a0ee29bc69b940f91593ddf7abeef56d Mon Sep 17 00:00:00 2001
From: 0x4A6F <0x4A6F@users.noreply.github.com>
Date: Sat, 31 Aug 2019 14:16:45 +0000
Subject: [PATCH 1779/2254] qubes-core-vchan-xen: init at 4.1.2

---
 .../qubes/qubes-core-vchan-xen/default.nix    | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/applications/qubes/qubes-core-vchan-xen/default.nix

diff --git a/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix b/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix
new file mode 100644
index 00000000000..e8241ede96c
--- /dev/null
+++ b/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, xen_4_10 }:
+
+stdenv.mkDerivation rec {
+  pname = "qubes-core-vchan-xen";
+  version = "4.1.2";
+
+  src = fetchFromGitHub {
+    owner = "QubesOS";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1wj4vv8nkzzig52r2nzkd4jy0cwznfkyddx379hfsdl4pzsp55mj";
+  };
+
+  buildInputs = [ xen_4_10 ];
+  buildPhase = ''
+    make all PREFIX=/
+  '';
+  installPhase = ''
+    make install DESTDIR=$out PREFIX=/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Libraries required for the higher-level Qubes daemons and tools";
+    homepage = "https://qubes-os.org";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ "0x4A6F" ];
+    platforms = platforms.linux;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 33501cad4fc..93127b57ae7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24985,4 +24985,6 @@ in
 
   wifi-password = callPackage ../os-specific/darwin/wifi-password {};
 
+  qubes-core-vchan-xen = callPackage ../applications/qubes/qubes-core-vchan-xen {};
+
 }
-- 
GitLab


From b1acc7dc8b4ce7e80dc48c9cb1c5522de982d1e2 Mon Sep 17 00:00:00 2001
From: yvt <i@yvt.jp>
Date: Thu, 3 Oct 2019 01:09:27 +0900
Subject: [PATCH 1780/2254] maintainer: Set githubId of yvt

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index bb27e110844..d43613e67e0 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -7067,6 +7067,7 @@
   yvt = {
     email = "i@yvt.jp";
     github = "yvt";
+    githubId = 5253988;
     name = "yvt";
   };
   z77z = {
-- 
GitLab


From e3c1ecf11155902c59909bc3862536f474d00b1e Mon Sep 17 00:00:00 2001
From: yvt <i@yvt.jp>
Date: Thu, 3 Oct 2019 01:30:41 +0900
Subject: [PATCH 1781/2254] nixos/do-agent: Use DynamicUser

---
 .../modules/services/monitoring/do-agent.nix  | 22 +------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

diff --git a/nixos/modules/services/monitoring/do-agent.nix b/nixos/modules/services/monitoring/do-agent.nix
index a03c3330348..a9471994e32 100644
--- a/nixos/modules/services/monitoring/do-agent.nix
+++ b/nixos/modules/services/monitoring/do-agent.nix
@@ -8,18 +8,6 @@ in
 {
   options.services.do-agent = {
     enable = mkEnableOption "do-agent, the DigitalOcean droplet metrics agent";
-
-    user = mkOption {
-      type = types.str;
-      default = "do-agent";
-      description = "User account under which do-agent runs.";
-    };
-
-    group = mkOption {
-      type = types.str;
-      default = "do-agent";
-      description = "Group account under which do-agent runs.";
-    };
   };
 
   config = mkIf cfg.enable {
@@ -38,16 +26,8 @@ in
         ProtectSystem = "full";
         ProtectHome = "yes";
         NoNewPrivileges = "yes";
+        DynamicUser = "yes";
       };
     };
-
-    users.users = optionalAttrs (cfg.user == "do-agent") (singleton
-      { name = "do-agent";
-        group = cfg.group;
-      });
-
-    users.groups = optionalAttrs (cfg.group == "do-agent") (singleton
-      { name = "do-agent";
-      });
   };
 }
-- 
GitLab


From 12f03a07764ff404b75a4240f891a08c57477e5d Mon Sep 17 00:00:00 2001
From: Troels Henriksen <athas@sigkill.dk>
Date: Wed, 2 Oct 2019 19:29:29 +0200
Subject: [PATCH 1782/2254] ispc: do not test on the "host" target

This is because some very sensitive tests may fail when using more
exotic platforms and vector instructions.  For example, floating point
summation (which is not associative in the first place), or
transcendental functions.  Arguably, ispc's test suite is too
sensitive here.
---
 pkgs/development/compilers/ispc/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix
index f240deda0bf..762d1233bb6 100644
--- a/pkgs/development/compilers/ispc/default.nix
+++ b/pkgs/development/compilers/ispc/default.nix
@@ -1,5 +1,5 @@
 {stdenv, fetchFromGitHub, which, m4, python, bison, flex, llvmPackages,
-testedTargets ? ["sse2" "host"] # the default test target is sse4, but that is not supported by all Hydra agents
+testedTargets ? ["sse2"] # the default test target is sse4, but that is not supported by all Hydra agents
 }:
 
 stdenv.mkDerivation rec {
-- 
GitLab


From 00a54207e01a27c60814828ac8f464f1d2c80c58 Mon Sep 17 00:00:00 2001
From: yvt <i@yvt.jp>
Date: Thu, 3 Oct 2019 02:44:33 +0900
Subject: [PATCH 1783/2254] nixos/do-agent: Depend on network-online.target

---
 nixos/modules/services/monitoring/do-agent.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/monitoring/do-agent.nix b/nixos/modules/services/monitoring/do-agent.nix
index a9471994e32..2d3fe2f7976 100644
--- a/nixos/modules/services/monitoring/do-agent.nix
+++ b/nixos/modules/services/monitoring/do-agent.nix
@@ -16,7 +16,8 @@ in
     systemd.services.do-agent = {
       description = "DigitalOcean Droplet Metrics Agent";
       wantedBy = [ "multi-user.target" ];
-      after = [ "network.target" ];
+      after = [ "network-online.target" ];
+      wants = [ "network-online.target" ];
       serviceConfig = {
         ExecStart = "${pkgs.do-agent}/bin/do-agent --syslog";
         Restart = "always";
-- 
GitLab


From a3ad16b9ca8f9a74894e689dad7b9a72716c2826 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 2 Oct 2019 13:37:43 -0500
Subject: [PATCH 1784/2254] Remove pykde4

---
 .../python-modules/pykde4/default.nix         | 45 -------------------
 .../python-modules/pykde4/dlfcn.patch         | 13 ------
 .../python-modules/pykde4/kdelibs.nix         | 38 ----------------
 pkgs/top-level/python-packages.nix            |  5 ---
 4 files changed, 101 deletions(-)
 delete mode 100644 pkgs/development/python-modules/pykde4/default.nix
 delete mode 100644 pkgs/development/python-modules/pykde4/dlfcn.patch
 delete mode 100644 pkgs/development/python-modules/pykde4/kdelibs.nix

diff --git a/pkgs/development/python-modules/pykde4/default.nix b/pkgs/development/python-modules/pykde4/default.nix
deleted file mode 100644
index 913453962eb..00000000000
--- a/pkgs/development/python-modules/pykde4/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ pyqt4, openssl_1_0_2
-, stdenv, callPackage, fetchurl, cmake, automoc4, sip }:
-
-let
-  kdelibs = callPackage ./kdelibs.nix {
-    openssl = openssl_1_0_2;
-  };
-  sip4_19_3 = sip.overrideAttrs (oldAttrs: rec {
-    src = fetchurl {
-      url = "mirror://sourceforge/pyqt/sip/sip-4.19.3/sip-4.19.3.tar.gz";
-      sha256 = "0x2bghbprwl3az1ni3p87i0bq8r99694la93kg65vi0cz12gh3bl";
-    };
-  });
-  pyqt4_fixed = pyqt4.overrideAttrs (oldAttrs: {
-    propagatedBuildInputs = [ sip4_19_3 ];
-  });
-in stdenv.mkDerivation rec {
-  version = "4.14.3";
-  pname = "pykde4";
-
-  src = fetchurl {
-    url = "mirror://kde/stable/${version}/src/${pname}-${version}-${version}.tar.xz";
-    sha256 = "1z40gnkyjlv6ds3cmpzvv99394rhmydr6rxx7qj33m83xnsxgfbz";
-  };
-
-  patches = [ ./dlfcn.patch ];
-
-  buildInputs = [
-    kdelibs
-  ];
-
-  nativeBuildInputs = [ cmake automoc4 ];
-
-  propagatedBuildInputs = [ pyqt4_fixed ];
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    description = "Python bindings for KDE";
-    license = with licenses; [ gpl2 lgpl2 ];
-    homepage = https://api.kde.org/pykde-4.3-api/;
-    maintainers = with maintainers; [ gnidorah ];
-  };
-}
diff --git a/pkgs/development/python-modules/pykde4/dlfcn.patch b/pkgs/development/python-modules/pykde4/dlfcn.patch
deleted file mode 100644
index 63aff46eeab..00000000000
--- a/pkgs/development/python-modules/pykde4/dlfcn.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- __init__.py.orig	2017-11-02 09:06:48.998054459 +0300
-+++ ./__init__.py	2017-11-02 09:24:28.089072752 +0300
-@@ -1,4 +1,8 @@
--import sys,DLFCN
-+import sys
-+try:
-+    import DLFCN
-+except ImportError:
-+    import os as DLFCN
- # This is needed to ensure that dynamic_cast and RTTI works inside kdelibs.
- sys.setdlopenflags(DLFCN.RTLD_NOW|DLFCN.RTLD_GLOBAL)
-      
-\ No newline at end of file
diff --git a/pkgs/development/python-modules/pykde4/kdelibs.nix b/pkgs/development/python-modules/pykde4/kdelibs.nix
deleted file mode 100644
index 9803e7800c3..00000000000
--- a/pkgs/development/python-modules/pykde4/kdelibs.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  stdenv, fetchurl,
-  automoc4, cmake_2_8, libxslt, perl, pkgconfig, shared-mime-info,
-  attica, docbook_xml_dtd_42, docbook_xsl, giflib,
-  libdbusmenu_qt, libjpeg, phonon, qt4, openssl
-}:
-
-stdenv.mkDerivation rec {
-  version = "4.14.38";
-  pname = "kdelibs";
-  src = fetchurl {
-    url = "mirror://kde/stable/applications/17.08.3/src/${pname}-${version}.tar.xz";
-    sha256 = "1zn3yb09sd22bm54is0rn98amj0398zybl550dp406419sil7z9p";
-  };
-
-  enableParallelBuilding = true;
-
-  nativeBuildInputs = [
-    automoc4 cmake_2_8 libxslt perl pkgconfig shared-mime-info
-  ];
-  buildInputs = [
-    attica giflib libdbusmenu_qt libjpeg openssl
-  ];
-  propagatedBuildInputs = [ qt4 phonon ];
-
-  cmakeFlags = [
-    "-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook"
-    "-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook"
-    "-DKJS_FORCE_DISABLE_PCRE=true"
-    "-DWITH_SOLID_UDISKS2=OFF"
-  ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    homepage = http://www.kde.org;
-    license = with licenses; [ gpl2 fdl12 lgpl21 ];
-  };
-}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c269c830fdf..6190bdd83c2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -972,11 +972,6 @@ in {
 
   pyjwkest = callPackage ../development/python-modules/pyjwkest { };
 
-  pykde4 = callPackage ../development/python-modules/pykde4 {
-    inherit (self) pyqt4;
-    callPackage = pkgs.callPackage;
-  };
-
   pykdtree = callPackage ../development/python-modules/pykdtree {
     inherit (pkgs.llvmPackages) openmp;
   };
-- 
GitLab


From 902de7a4122d74bcbe6d3c4cd2a6b20b5178ae54 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Wed, 2 Oct 2019 21:19:01 +0200
Subject: [PATCH 1785/2254] ledger-live-desktop: add smaller desktop icon

Original 1024x1024 icon doesn't show properly in KDE
---
 pkgs/applications/blockchains/ledger-live-desktop/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix
index 88b35dd78a6..09cb3c329b9 100644
--- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix
+++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeDesktopItem, appimageTools }:
+{ stdenv, fetchurl, makeDesktopItem, appimageTools, imagemagick }:
 
 let
   pname = "ledger-live-desktop";
@@ -20,6 +20,8 @@ in appimageTools.wrapType2 rec {
     mv $out/bin/${name} $out/bin/${pname}
     install -m 444 -D ${appimageContents}/ledger-live-desktop.desktop $out/share/applications/ledger-live-desktop.desktop
     install -m 444 -D ${appimageContents}/ledger-live-desktop.png $out/share/icons/hicolor/1024x1024/apps/ledger-live-desktop.png
+    ${imagemagick}/bin/convert ${appimageContents}/ledger-live-desktop.png -resize 512x512 ledger-live-desktop_512.png
+    install -m 444 -D ledger-live-desktop_512.png $out/share/icons/hicolor/512x512/apps/ledger-live-desktop.png
     substituteInPlace $out/share/applications/ledger-live-desktop.desktop \
       --replace 'Exec=AppRun' 'Exec=${pname}'
   '';
-- 
GitLab


From bd1ff8696bd25a5161c34ae35da62ad194900bf5 Mon Sep 17 00:00:00 2001
From: Nathan Yong <nathyong@users.noreply.github.com>
Date: Tue, 1 Oct 2019 11:53:03 +1000
Subject: [PATCH 1786/2254] vcv-rack: 1.1.4 -> 1.1.5

---
 pkgs/applications/audio/vcv-rack/default.nix              | 8 ++++----
 .../audio/vcv-rack/rack-minimize-vendoring.patch          | 7 +++----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/audio/vcv-rack/default.nix b/pkgs/applications/audio/vcv-rack/default.nix
index 234b98a893c..4322bbcbc43 100644
--- a/pkgs/applications/audio/vcv-rack/default.nix
+++ b/pkgs/applications/audio/vcv-rack/default.nix
@@ -1,6 +1,6 @@
 { stdenv, makeWrapper, fetchFromBitbucket, fetchFromGitHub, pkgconfig
 , alsaLib, curl, glew, glfw, gtk2-x11, jansson, libjack2, libXext, libXi
-, libzip, rtaudio, rtmidi, speex }:
+, libzip, rtaudio, rtmidi, speex, libsamplerate }:
 
 let
   glfw-git = glfw.overrideAttrs (oldAttrs: rec {
@@ -28,13 +28,13 @@ let
 in
 with stdenv.lib; stdenv.mkDerivation rec {
   pname = "VCV-Rack";
-  version = "1.1.4";
+  version = "1.1.5";
 
   src = fetchFromGitHub {
     owner = "VCVRack";
     repo = "Rack";
     rev = "v${version}";
-    sha256 = "04kg0nm7w19s2zfrsxjfl3bs4sy3bzf28kzl4hayzwv480667ybx";
+    sha256 = "172v66v2vb6l9dpsq6fb6xn035igwhpjci8w3kz2na3rvmz1bc5w";
     fetchSubmodules = true;
   };
 
@@ -58,7 +58,7 @@ with stdenv.lib; stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   nativeBuildInputs = [ makeWrapper pkgconfig ];
-  buildInputs = [ glfw-git alsaLib curl glew gtk2-x11 jansson libjack2 libzip rtaudio rtmidi speex ];
+  buildInputs = [ glfw-git alsaLib curl glew gtk2-x11 jansson libjack2 libzip rtaudio rtmidi speex libsamplerate ];
 
   buildFlags = "Rack";
 
diff --git a/pkgs/applications/audio/vcv-rack/rack-minimize-vendoring.patch b/pkgs/applications/audio/vcv-rack/rack-minimize-vendoring.patch
index eca9c2f13c0..d310d57835e 100644
--- a/pkgs/applications/audio/vcv-rack/rack-minimize-vendoring.patch
+++ b/pkgs/applications/audio/vcv-rack/rack-minimize-vendoring.patch
@@ -5,10 +5,9 @@ diff -ru a/Makefile b/Makefile
  build/dep/osdialog/osdialog_gtk2.c.o: FLAGS += $(shell pkg-config --cflags gtk+-2.0)
  
  	LDFLAGS += -rdynamic \
--		dep/lib/libglfw3.a dep/lib/libGLEW.a dep/lib/libjansson.a dep/lib/libspeexdsp.a dep/lib/libzip.a dep/lib/libz.a dep/lib/librtmidi.a dep/lib/librtaudio.a dep/lib/libcurl.a dep/lib/libssl.a dep/lib/libcrypto.a \
--		-lpthread -lGL -ldl -lX11 -lasound -ljack \
-+		-lGLEW -ljansson -lspeexdsp -lzip -lz -lrtmidi -lrtaudio -lcurl -lssl -lcrypto \
-+		-lpthread -lGL -ldl -lX11 -lasound -ljack -lglfw \
+-		dep/lib/libGLEW.a dep/lib/libglfw3.a dep/lib/libjansson.a dep/lib/libcurl.a dep/lib/libssl.a dep/lib/libcrypto.a dep/lib/libzip.a dep/lib/libz.a dep/lib/libspeexdsp.a dep/lib/libsamplerate.a dep/lib/librtmidi.a dep/lib/librtaudio.a \
++		-lGLEW -lglfw -ljansson -lcurl -lssl -lcrypto -lzip -lz -lspeexdsp -lsamplerate -lrtmidi -lrtaudio \
+		-lpthread -lGL -ldl -lX11 -lasound -ljack \
  		$(shell pkg-config --libs gtk+-2.0)
  	TARGET := Rack
  endif
-- 
GitLab


From 4ec79e8c097669bfd03b4530c0957aa75d859e99 Mon Sep 17 00:00:00 2001
From: Philipp Middendorf <middendorf@plapadoo.de>
Date: Sat, 21 Sep 2019 18:22:54 +0200
Subject: [PATCH 1787/2254] quake3e: init at 2019-09-09

---
 pkgs/games/quake3/quake3e/default.nix | 37 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  1 +
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/games/quake3/quake3e/default.nix

diff --git a/pkgs/games/quake3/quake3e/default.nix b/pkgs/games/quake3/quake3e/default.nix
new file mode 100644
index 00000000000..2c9367bfe76
--- /dev/null
+++ b/pkgs/games/quake3/quake3e/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, curl, libGL, libX11, libXxf86dga, alsaLib, libXrandr, libXxf86vm, libXext, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  pname = "Quake3e";
+  version = "2019-09-09";
+
+  src = fetchFromGitHub {
+    owner = "ec-";
+    repo = pname;
+    rev = version;
+    sha256 = "0i9flw8h87lagdpbci6vgqkriv05p3bidgqb4pwrxls947zwfcw8";
+  };
+
+  buildInputs = [ curl libGL libX11 libXxf86dga alsaLib libXrandr libXxf86vm libXext ];
+  enableParallelBuilding = true;
+
+  postPatch = ''
+    sed -i -e 's#OpenGLLib = dlopen( dllname#OpenGLLib = dlopen( "${libGL}/lib/libGL.so"#' code/unix/linux_qgl.c
+    sed -i -e 's#Sys_LoadLibrary( "libasound.so.2" )#Sys_LoadLibrary( "${alsaLib}/lib/libasound.so.2" )#' code/unix/linux_snd.c
+    sed -i -e 's#Sys_LoadLibrary( "libXrandr.so.2" )#Sys_LoadLibrary( "${libXrandr}/lib/libXrandr.so.2" )#' code/unix/x11_randr.c
+    sed -i -e 's#Sys_LoadLibrary( "libXxf86vm.so.1" )#Sys_LoadLibrary( "${libXxf86vm}/lib/libXxf86vm.so.1" )#' code/unix/x11_randr.c
+    sed -i -e 's#Sys_LoadLibrary( "libXxf86dga.so.1" )#Sys_LoadLibrary( "${libXxf86dga}/lib/libXxf86dga.so.1" )#' code/unix/x11_dga.c
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp build/*/*x64 $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/ec-/Quake3e;
+    description = "Improved Quake III Arena engine";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ pmiddend ];
+  };  
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8486671abe7..97c98ba6e0e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22397,6 +22397,7 @@ in
   vkquake = callPackage ../games/quakespasm/vulkan.nix { };
 
   ioquake3 = callPackage ../games/quake3/ioquake { };
+  quake3e = callPackage ../games/quake3/quake3e { };
 
   quantumminigolf = callPackage ../games/quantumminigolf {};
 
-- 
GitLab


From f855e588b74d1b1d3fe5aac47482a6dc17703e34 Mon Sep 17 00:00:00 2001
From: Trolli Schmittlauch <t.schmittlauch+nixos@orlives.de>
Date: Wed, 2 Oct 2019 22:05:43 +0200
Subject: [PATCH 1788/2254] corebird: drop package due to discontinuation,
 recommend `cawbird` as alternative

---
 .../networking/corebird/default.nix           | 38 -------------------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 1 insertion(+), 39 deletions(-)
 delete mode 100644 pkgs/applications/networking/corebird/default.nix

diff --git a/pkgs/applications/networking/corebird/default.nix b/pkgs/applications/networking/corebird/default.nix
deleted file mode 100644
index 73c0e234945..00000000000
--- a/pkgs/applications/networking/corebird/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ stdenv, fetchFromGitHub, glib, gtk3, json-glib, sqlite, libsoup, gettext, vala_0_40
-, meson, ninja, pkgconfig, gnome3, gst_all_1, wrapGAppsHook, gobject-introspection
-, glib-networking, python3 }:
-
-stdenv.mkDerivation rec {
-  version = "1.7.4";
-  pname = "corebird";
-
-  src = fetchFromGitHub {
-    owner = "baedert";
-    repo = "corebird";
-    rev = version;
-    sha256 = "0qjffsmg1hm64dgsbkfwzbzy9q4xa1q4fh4h8ni8a2b1p3h80x7n";
-  };
-
-  nativeBuildInputs = [
-    meson ninja vala_0_40 pkgconfig wrapGAppsHook python3
-    gobject-introspection # for setup hook
-  ];
-
-  buildInputs = [
-    glib gtk3 json-glib sqlite libsoup gettext gnome3.dconf gnome3.gspell glib-networking
-  ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-bad (gst-plugins-good.override { gtkSupport = true; }) gst-libav ]);
-
-  postPatch = ''
-    chmod +x data/meson_post_install.py # patchShebangs requires executable file
-    patchShebangs data/meson_post_install.py
-  '';
-
-  meta = {
-    description = "Native GTK Twitter client for the Linux desktop";
-    longDescription = "Corebird is a modern, easy and fun Twitter client.";
-    homepage = https://corebird.baedert.org/;
-    license = stdenv.lib.licenses.gpl3;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.jonafato ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dec168a1d36..bceb8ad0a65 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1385,7 +1385,7 @@ in
 
   copyright-update = callPackage ../tools/text/copyright-update { };
 
-  corebird = callPackage ../applications/networking/corebird { };
+  corebird = throw "corebird has been discontinued, use cawbird instead";
 
   inherit (callPackage ../tools/misc/coreboot-utils { })
     msrtool
-- 
GitLab


From 24a7e828df01214fbc24bfdd2963dbda030ebc40 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Tue, 1 Oct 2019 21:32:38 -0400
Subject: [PATCH 1789/2254] linux_testing_bcachefs: 5.2.2019.09.24 ->
 5.2.2019.10.01

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

diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
index 38c0ad10ae5..578cbf318b8 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
@@ -1,13 +1,13 @@
 { stdenv, buildPackages, fetchgit, fetchpatch, perl, buildLinux, ... } @ args:
 
 buildLinux (args // {
-  version = "5.2.2019.09.24";
+  version = "5.2.2019.10.01";
   modDirVersion = "5.2.0";
 
   src = fetchgit {
     url = "https://evilpiepirate.org/git/bcachefs.git";
-    rev = "5a3a4087af27aa10da5f23cb174a439946153584";
-    sha256 = "1yn40n2iyflbfv1z8l86nixv8wlybg7abz49nq5k6hmf7r9z56mk";
+    rev = "45920b5139a752bb4f22871b8b916beacc4f9fb9";
+    sha256 = "1hi98jckzd8d7whivmgl1ywdfdixhq7la37jagwnwbf8lsqsp25i";
   };
 
   extraConfig = "BCACHEFS_FS m";
-- 
GitLab


From 9f58b7c4bb3bf9c7f14c4bce519a61e62c131086 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Tue, 1 Oct 2019 14:43:36 -0300
Subject: [PATCH 1790/2254] catfish: 1.4.7 -> 1.4.10

---
 pkgs/applications/search/catfish/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/search/catfish/default.nix b/pkgs/applications/search/catfish/default.nix
index 983a5153ee2..30b9b9c273d 100644
--- a/pkgs/applications/search/catfish/default.nix
+++ b/pkgs/applications/search/catfish/default.nix
@@ -5,13 +5,13 @@
 
 pythonPackages.buildPythonApplication rec {
   majorver = "1.4";
-  minorver = "7";
+  minorver = "10";
   version = "${majorver}.${minorver}";
   pname = "catfish";
 
   src = fetchurl {
     url = "https://archive.xfce.org/src/apps/${pname}/${majorver}/${pname}-${version}.tar.bz2";
-    sha256 = "1s97jb1r07ff40jnz8zianpn1f0c67hssn8ywdi2g7njfb4amjj8";
+    sha256 = "0g9l5sv5d7wmyb23cvpz5mpvjnxiqjh25v9gr5qzhcah202a0wr5";
   };
 
   nativeBuildInputs = [
@@ -19,7 +19,7 @@ pythonPackages.buildPythonApplication rec {
     file
     which
     intltool
-    gobject-introspection
+    gobject-introspection # for setup hook populating GI_TYPELIB_PATH
     wrapGAppsHook
   ];
 
@@ -30,9 +30,11 @@ pythonPackages.buildPythonApplication rec {
     pythonPackages.ptyprocess
     pythonPackages.pycairo
     hicolor-icon-theme
+    gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943
   ];
 
   propagatedBuildInputs = [
+    pythonPackages.dbus-python
     pythonPackages.pygobject3
     pythonPackages.pexpect
     xdg_utils
@@ -53,7 +55,7 @@ pythonPackages.buildPythonApplication rec {
 
   meta = with stdenv.lib; {
     homepage = https://docs.xfce.org/apps/catfish/start;
-    description = "A handy file search tool";
+    description = "Handy file search tool";
     longDescription = ''
       Catfish is a handy file searching tool. The interface is
       intentionally lightweight and simple, using only GTK 3.
-- 
GitLab


From cdc963c5f3693eabffc9e6a3488d203d461ac09e Mon Sep 17 00:00:00 2001
From: Evan Stoll <evanjsx@gmail.com>
Date: Mon, 30 Sep 2019 09:11:53 -0400
Subject: [PATCH 1791/2254] gitkraken: 6.2.0 -> 6.2.1

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

diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix
index 0299d4ab48e..67e6589ac1a 100644
--- a/pkgs/applications/version-management/gitkraken/default.nix
+++ b/pkgs/applications/version-management/gitkraken/default.nix
@@ -13,11 +13,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "gitkraken";
-  version = "6.2.0";
+  version = "6.2.1";
 
   src = fetchurl {
     url = "https://release.axocdn.com/linux/GitKraken-v${version}.deb";
-    sha256 = "1kvp0fbixpynb0wh8px1qm6gnxwc5ml2q0vwsll0pa8zrjdz4q3k";
+    sha256 = "1l1w8gr4ss0g2k7bfslnc7df4ls1av59jjjc8mrx97wsndrm3vxg";
   };
 
   libPath = makeLibraryPath [
-- 
GitLab


From 2e2b068e0435be6fde2ceccf98be3659c88a3f8c Mon Sep 17 00:00:00 2001
From: John Mercier <moaxcp@gmail.com>
Date: Tue, 1 Oct 2019 06:08:22 -0400
Subject: [PATCH 1792/2254] micronaut 1.2.1 -> 1.2.3

---
 pkgs/development/tools/micronaut/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/micronaut/default.nix b/pkgs/development/tools/micronaut/default.nix
index 102f911bf85..3d5453af807 100644
--- a/pkgs/development/tools/micronaut/default.nix
+++ b/pkgs/development/tools/micronaut/default.nix
@@ -1,21 +1,22 @@
-{ stdenv, fetchzip, jdk, makeWrapper }:
+{ stdenv, fetchzip, jdk, makeWrapper, installShellFiles }:
 
 stdenv.mkDerivation rec {
   pname = "micronaut";
-  version = "1.2.1";
+  version = "1.2.3";
 
   src = fetchzip {
     url = "https://github.com/micronaut-projects/micronaut-core/releases/download/v${version}/${pname}-${version}.zip";
     sha256 = "0lfl2hfakpdcfii3a3jr6kws731jamy4fb3dmlnj5ydk0zbnmk6r";
   };
 
-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ makeWrapper installShellFiles ];
 
   installPhase = ''
     rm bin/mn.bat
     cp -r . $out
     wrapProgram $out/bin/mn \
       --prefix JAVA_HOME : ${jdk} 
+    installShellCompletion --bash --name mn.bash bin/mn_completion
   '';
 
   meta = with stdenv.lib; {
-- 
GitLab


From e98b64c2e0a913b7d414b053305ecb1f398e3161 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 2 Oct 2019 16:29:14 -0500
Subject: [PATCH 1793/2254] Revert "Remove pykde4"

This reverts commit a3ad16b9ca8f9a74894e689dad7b9a72716c2826.
---
 .../python-modules/pykde4/default.nix         | 45 +++++++++++++++++++
 .../python-modules/pykde4/dlfcn.patch         | 13 ++++++
 .../python-modules/pykde4/kdelibs.nix         | 38 ++++++++++++++++
 pkgs/top-level/python-packages.nix            |  5 +++
 4 files changed, 101 insertions(+)
 create mode 100644 pkgs/development/python-modules/pykde4/default.nix
 create mode 100644 pkgs/development/python-modules/pykde4/dlfcn.patch
 create mode 100644 pkgs/development/python-modules/pykde4/kdelibs.nix

diff --git a/pkgs/development/python-modules/pykde4/default.nix b/pkgs/development/python-modules/pykde4/default.nix
new file mode 100644
index 00000000000..913453962eb
--- /dev/null
+++ b/pkgs/development/python-modules/pykde4/default.nix
@@ -0,0 +1,45 @@
+{ pyqt4, openssl_1_0_2
+, stdenv, callPackage, fetchurl, cmake, automoc4, sip }:
+
+let
+  kdelibs = callPackage ./kdelibs.nix {
+    openssl = openssl_1_0_2;
+  };
+  sip4_19_3 = sip.overrideAttrs (oldAttrs: rec {
+    src = fetchurl {
+      url = "mirror://sourceforge/pyqt/sip/sip-4.19.3/sip-4.19.3.tar.gz";
+      sha256 = "0x2bghbprwl3az1ni3p87i0bq8r99694la93kg65vi0cz12gh3bl";
+    };
+  });
+  pyqt4_fixed = pyqt4.overrideAttrs (oldAttrs: {
+    propagatedBuildInputs = [ sip4_19_3 ];
+  });
+in stdenv.mkDerivation rec {
+  version = "4.14.3";
+  pname = "pykde4";
+
+  src = fetchurl {
+    url = "mirror://kde/stable/${version}/src/${pname}-${version}-${version}.tar.xz";
+    sha256 = "1z40gnkyjlv6ds3cmpzvv99394rhmydr6rxx7qj33m83xnsxgfbz";
+  };
+
+  patches = [ ./dlfcn.patch ];
+
+  buildInputs = [
+    kdelibs
+  ];
+
+  nativeBuildInputs = [ cmake automoc4 ];
+
+  propagatedBuildInputs = [ pyqt4_fixed ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    description = "Python bindings for KDE";
+    license = with licenses; [ gpl2 lgpl2 ];
+    homepage = https://api.kde.org/pykde-4.3-api/;
+    maintainers = with maintainers; [ gnidorah ];
+  };
+}
diff --git a/pkgs/development/python-modules/pykde4/dlfcn.patch b/pkgs/development/python-modules/pykde4/dlfcn.patch
new file mode 100644
index 00000000000..63aff46eeab
--- /dev/null
+++ b/pkgs/development/python-modules/pykde4/dlfcn.patch
@@ -0,0 +1,13 @@
+--- __init__.py.orig	2017-11-02 09:06:48.998054459 +0300
++++ ./__init__.py	2017-11-02 09:24:28.089072752 +0300
+@@ -1,4 +1,8 @@
+-import sys,DLFCN
++import sys
++try:
++    import DLFCN
++except ImportError:
++    import os as DLFCN
+ # This is needed to ensure that dynamic_cast and RTTI works inside kdelibs.
+ sys.setdlopenflags(DLFCN.RTLD_NOW|DLFCN.RTLD_GLOBAL)
+      
+\ No newline at end of file
diff --git a/pkgs/development/python-modules/pykde4/kdelibs.nix b/pkgs/development/python-modules/pykde4/kdelibs.nix
new file mode 100644
index 00000000000..9803e7800c3
--- /dev/null
+++ b/pkgs/development/python-modules/pykde4/kdelibs.nix
@@ -0,0 +1,38 @@
+{
+  stdenv, fetchurl,
+  automoc4, cmake_2_8, libxslt, perl, pkgconfig, shared-mime-info,
+  attica, docbook_xml_dtd_42, docbook_xsl, giflib,
+  libdbusmenu_qt, libjpeg, phonon, qt4, openssl
+}:
+
+stdenv.mkDerivation rec {
+  version = "4.14.38";
+  pname = "kdelibs";
+  src = fetchurl {
+    url = "mirror://kde/stable/applications/17.08.3/src/${pname}-${version}.tar.xz";
+    sha256 = "1zn3yb09sd22bm54is0rn98amj0398zybl550dp406419sil7z9p";
+  };
+
+  enableParallelBuilding = true;
+
+  nativeBuildInputs = [
+    automoc4 cmake_2_8 libxslt perl pkgconfig shared-mime-info
+  ];
+  buildInputs = [
+    attica giflib libdbusmenu_qt libjpeg openssl
+  ];
+  propagatedBuildInputs = [ qt4 phonon ];
+
+  cmakeFlags = [
+    "-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook"
+    "-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook"
+    "-DKJS_FORCE_DISABLE_PCRE=true"
+    "-DWITH_SOLID_UDISKS2=OFF"
+  ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    homepage = http://www.kde.org;
+    license = with licenses; [ gpl2 fdl12 lgpl21 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6190bdd83c2..c269c830fdf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -972,6 +972,11 @@ in {
 
   pyjwkest = callPackage ../development/python-modules/pyjwkest { };
 
+  pykde4 = callPackage ../development/python-modules/pykde4 {
+    inherit (self) pyqt4;
+    callPackage = pkgs.callPackage;
+  };
+
   pykdtree = callPackage ../development/python-modules/pykdtree {
     inherit (pkgs.llvmPackages) openmp;
   };
-- 
GitLab


From ee36267193f5e924579034b362a10da2fccee047 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 2 Oct 2019 16:30:09 -0500
Subject: [PATCH 1794/2254] kdelibs: gnidorah is maintainer

---
 pkgs/development/python-modules/pykde4/kdelibs.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/pykde4/kdelibs.nix b/pkgs/development/python-modules/pykde4/kdelibs.nix
index 9803e7800c3..d13898ca6dc 100644
--- a/pkgs/development/python-modules/pykde4/kdelibs.nix
+++ b/pkgs/development/python-modules/pykde4/kdelibs.nix
@@ -34,5 +34,6 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
     homepage = http://www.kde.org;
     license = with licenses; [ gpl2 fdl12 lgpl21 ];
+    maintainers = with maintainers; [ gnidorah ];
   };
 }
-- 
GitLab


From 260ef791a365474623aeb1de6b16aaef548cf194 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 2 Oct 2019 16:31:41 -0500
Subject: [PATCH 1795/2254] pykde4: Do not build on Hydra

pykde4 is not used in Nixpkgs, so it is not appropriate to build on Hydra.
---
 pkgs/development/python-modules/pykde4/default.nix | 1 +
 pkgs/development/python-modules/pykde4/kdelibs.nix | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/pykde4/default.nix b/pkgs/development/python-modules/pykde4/default.nix
index 913453962eb..d2c66c8cd2c 100644
--- a/pkgs/development/python-modules/pykde4/default.nix
+++ b/pkgs/development/python-modules/pykde4/default.nix
@@ -37,6 +37,7 @@ in stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;
+    hydraPlatforms = platforms.none;
     description = "Python bindings for KDE";
     license = with licenses; [ gpl2 lgpl2 ];
     homepage = https://api.kde.org/pykde-4.3-api/;
diff --git a/pkgs/development/python-modules/pykde4/kdelibs.nix b/pkgs/development/python-modules/pykde4/kdelibs.nix
index d13898ca6dc..7c21be17e65 100644
--- a/pkgs/development/python-modules/pykde4/kdelibs.nix
+++ b/pkgs/development/python-modules/pykde4/kdelibs.nix
@@ -32,6 +32,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;
+    hydraPlatforms = platforms.none;
     homepage = http://www.kde.org;
     license = with licenses; [ gpl2 fdl12 lgpl21 ];
     maintainers = with maintainers; [ gnidorah ];
-- 
GitLab


From 12f31b73667fc55905b453afd4cb09665edb2fd3 Mon Sep 17 00:00:00 2001
From: Martin Milata <martin@martinmilata.cz>
Date: Wed, 2 Oct 2019 23:41:25 +0200
Subject: [PATCH 1796/2254] libpng12: 1.2.57 -> 1.2.59

CVE-2017-12652
---
 pkgs/development/libraries/libpng/12.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libpng/12.nix b/pkgs/development/libraries/libpng/12.nix
index 2cd8c1debaf..6f59c94a56b 100644
--- a/pkgs/development/libraries/libpng/12.nix
+++ b/pkgs/development/libraries/libpng/12.nix
@@ -3,11 +3,11 @@
 assert stdenv.hostPlatform == stdenv.buildPlatform -> zlib != null;
 
 stdenv.mkDerivation rec {
-  name = "libpng-1.2.57";
+  name = "libpng-1.2.59";
 
   src = fetchurl {
     url = "mirror://sourceforge/libpng/${name}.tar.xz";
-    sha256 = "1n2lrzjkm5jhfg2bs10q398lkwbbx742fi27zgdgx0x23zhj0ihg";
+    sha256 = "1izw9ybm27llk8531w6h4jp4rk2rxy2s9vil16nwik5dp0amyqxl";
   };
 
   outputs = [ "out" "dev" "man" ];
-- 
GitLab


From 9a0674296ee64efdcb89b5b1db6d9ad727a400c0 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 2 Oct 2019 13:32:01 -0500
Subject: [PATCH 1797/2254] kdelibs: Patch for CVE-2019-14744

See also: https://phabricator.kde.org/D22989
See also: https://github.com/NixOS/nixpkgs/issues/70102
---
 pkgs/development/python-modules/pykde4/kdelibs.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pykde4/kdelibs.nix b/pkgs/development/python-modules/pykde4/kdelibs.nix
index 7c21be17e65..e6f20b8248b 100644
--- a/pkgs/development/python-modules/pykde4/kdelibs.nix
+++ b/pkgs/development/python-modules/pykde4/kdelibs.nix
@@ -1,5 +1,5 @@
 {
-  stdenv, fetchurl,
+  stdenv, fetchurl, fetchpatch,
   automoc4, cmake_2_8, libxslt, perl, pkgconfig, shared-mime-info,
   attica, docbook_xml_dtd_42, docbook_xsl, giflib,
   libdbusmenu_qt, libjpeg, phonon, qt4, openssl
@@ -12,6 +12,14 @@ stdenv.mkDerivation rec {
     url = "mirror://kde/stable/applications/17.08.3/src/${pname}-${version}.tar.xz";
     sha256 = "1zn3yb09sd22bm54is0rn98amj0398zybl550dp406419sil7z9p";
   };
+  patches = [
+    # https://phabricator.kde.org/D22989
+    (fetchpatch {
+      url = "https://cgit.kde.org/kdelibs.git/patch/?id=2c3762feddf7e66cf6b64d9058f625a715694a00";
+      sha256 = "1wbzywh8lcc66n6y3pxs18h7cwkq6g216faz27san33jpl8ra1i9";
+      name = "CVE-2019-14744.patch";
+    })
+  ];
 
   enableParallelBuilding = true;
 
-- 
GitLab


From d33e497b1b450e1c1140376903e82ce07b526178 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 23:35:05 -0700
Subject: [PATCH 1798/2254] unrar: 5.7.5 -> 5.8.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/unrar/versions
---
 pkgs/tools/archivers/unrar/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix
index 07f62fa02ad..ce878075f2a 100644
--- a/pkgs/tools/archivers/unrar/default.nix
+++ b/pkgs/tools/archivers/unrar/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "unrar";
-  version = "5.7.5";
+  version = "5.8.1";
 
   src = fetchurl {
     url = "https://www.rarlab.com/rar/unrarsrc-${version}.tar.gz";
-    sha256 = "1vp2pc1n5qhri0zr7fszlpjz8niw9x4cl47wbd9v323sm3dgvhp1";
+    sha256 = "0cp6436ckivljfnv8qic5x2a4z74qff6n57ckahaxhhddx1iypq3";
   };
 
   postPatch = ''
-- 
GitLab


From 26e22e6dfe3c6541e2f94f76d579977adacc2a62 Mon Sep 17 00:00:00 2001
From: Utku Demir <me@utdemir.com>
Date: Thu, 3 Oct 2019 11:07:21 +1300
Subject: [PATCH 1799/2254] Remove obsolete patch for Hedgehog on ghc-8.8.1

---
 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 09faec3cfa3..bdb90250d83 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -98,10 +98,6 @@ self: super: {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/hackage-security-0.5.3.0.patch";
     sha256 = "0l8x0pbsn18fj5ak5q0g5rva4xw1s9yc4d86a1pfyaz467b9i5a4";
   });
-  hedgehog = appendPatch (doJailbreak super.hedgehog) (pkgs.fetchpatch {
-    url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/hedgehog-1.0.patch";
-    sha256 = "16gadh1hb74jqvzc9c893sffb1y2vjglblyrqjwp7xfhccq7g8yw";
-  });
   regex-tdfa = appendPatch super.regex-tdfa (pkgs.fetchpatch {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-tdfa-1.2.3.1.patch";
     sha256 = "1lhas4s2ms666prb475gaw2bqw1v4y8cxi66sy20j727sx7ppjs7";
-- 
GitLab


From 41d71bacd6f224a540ee7d58b3caa6f43b895ad5 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Thu, 19 Sep 2019 00:43:34 -0400
Subject: [PATCH 1800/2254] dee: pull in patches

Fixes the deprecation warnings and vapi stuff.
This also allows us to use latest vala.
---
 pkgs/development/libraries/dee/default.nix | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/dee/default.nix b/pkgs/development/libraries/dee/default.nix
index 1318d9453b3..dd26e5eb8ba 100644
--- a/pkgs/development/libraries/dee/default.nix
+++ b/pkgs/development/libraries/dee/default.nix
@@ -1,11 +1,12 @@
 { stdenv
 , fetchgit
+, fetchpatch
 , pkgconfig
 , glib
 , icu
 , gobject-introspection
 , dbus-glib
-, vala_0_40
+, vala
 , python3
 , autoreconfHook
 }:
@@ -18,20 +19,26 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "https://git.launchpad.net/ubuntu/+source/dee";
-    rev = "import/1.2.7+17.10.20170616-4ubuntu1";
-    sha256 = "0q3d9d6ahcyibp6x23g1wvjfcppjh9v614s328yjmx47216z7394";
+    rev = "import/1.2.7+17.10.20170616-4ubuntu3";
+    sha256 = "09blrdj7229vscp4mkg0fabmcvc6jdpamvblrq86rbky7j2nnwlk";
   };
 
   patches = [
     "${src}/debian/patches/gtkdocize.patch"
     "${src}/debian/patches/strict-prototype.patch"
-    "${src}/debian/patches/icu-pkg-config.patch"
+    "${src}/debian/patches/vapi-skip-properties.patch"
+
+    # Fixes glib 2.62 deprecations
+    (fetchpatch {
+      name = "dee-1.2.7-deprecated-g_type_class_add_private.patch";
+      url = "https://src.fedoraproject.org/rpms/dee/raw/1a9a4ce3377074fabfca653ffe0287cd73aef82f/f/dee-1.2.7-deprecated-g_type_class_add_private.patch";
+      sha256 = "13nyprq7bb7lnzkcb7frcpzidbl836ycn5bvmwa2k0nhmj6ycbx5";
+    })
   ];
 
   nativeBuildInputs = [
     pkgconfig
-    # https://gitlab.gnome.org/GNOME/vala/issues/803
-    vala_0_40
+    vala
     autoreconfHook
     gobject-introspection
     python3
@@ -43,9 +50,6 @@ stdenv.mkDerivation rec {
     dbus-glib
   ];
 
-  # glib-2.62 deprecations
-  NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
-
   configureFlags = [
     "--disable-gtk-doc"
     "--with-pygi-overrides-dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides"
-- 
GitLab


From 4ff0d1e23fe3cd431762a9a3068d964721a23525 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Thu, 19 Sep 2019 00:49:13 -0400
Subject: [PATCH 1801/2254] umockdev: use latest vala

---
 pkgs/top-level/all-packages.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 72c818a455e..5c3bc883690 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13931,9 +13931,7 @@ in
 
   uid_wrapper = callPackage ../development/libraries/uid_wrapper { };
 
-  umockdev = callPackage ../development/libraries/umockdev {
-    vala = vala_0_40;
-  };
+  umockdev = callPackage ../development/libraries/umockdev { };
 
   unconvert = callPackage ../development/tools/unconvert { };
 
-- 
GitLab


From f8682c31dde566786f727e91281ce2f0ea575109 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Thu, 19 Sep 2019 11:52:29 -0400
Subject: [PATCH 1802/2254] gnome3.gnome-initial-setup: init at 3.34.0

---
 .../core/gnome-initial-setup/default.nix      | 115 ++++++++++++++++++
 .../core/gnome-initial-setup/fix-paths.patch  |  67 ++++++++++
 .../core/gnome-initial-setup/vendor.conf      |   5 +
 pkgs/desktops/gnome-3/default.nix             |   2 +
 4 files changed, 189 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix
 create mode 100644 pkgs/desktops/gnome-3/core/gnome-initial-setup/fix-paths.patch
 create mode 100644 pkgs/desktops/gnome-3/core/gnome-initial-setup/vendor.conf

diff --git a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix b/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix
new file mode 100644
index 00000000000..1ca3d696726
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix
@@ -0,0 +1,115 @@
+{ stdenv
+, fetchurl
+, fetchpatch
+, substituteAll
+, gettext
+, meson
+, ninja
+, pkgconfig
+, wrapGAppsHook
+, gnome3
+, accountsservice
+, fontconfig
+, gdm
+, geoclue2
+, geocode-glib
+, glib
+, gnome-desktop
+, gnome-getting-started-docs
+, gnome-online-accounts
+, gtk3
+, libgweather
+, json-glib
+, krb5
+, libpwquality
+, librest
+, libsecret
+, networkmanager
+, pango
+, polkit
+, webkitgtk
+, systemd
+, networkmanagerapplet
+, tzdata
+, yelp
+, libgnomekbd
+}:
+
+stdenv.mkDerivation rec {
+  pname = "gnome-initial-setup";
+  version = "3.34.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    sha256 = "19ly8xrj7vvjlhhbh6y2cm5l02qgq9wqfczrjdn0llkga9f8b8sc";
+  };
+
+  nativeBuildInputs = [
+    gettext
+    meson
+    ninja
+    pkgconfig
+    systemd
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
+    accountsservice
+    fontconfig
+    gdm
+    geoclue2
+    geocode-glib
+    glib
+    gnome-desktop
+    gnome-getting-started-docs
+    gnome-online-accounts
+    gtk3
+    json-glib
+    krb5
+    libgweather
+    libpwquality
+    librest
+    libsecret
+    networkmanager
+    pango
+    polkit
+    webkitgtk
+    networkmanagerapplet
+  ];
+
+  patches = [
+    # Disable g-i-s service in GDM
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/gnome-initial-setup/commit/b67b5cc48c418415eb3233f78ab089bc447b1952.patch";
+      sha256 = "050zc6cnil71bf7ijav6w6bkr33lqwglipcg7anw9jcn7mcakhlq";
+    })
+    (substituteAll {
+      src = ./fix-paths.patch;
+      inherit tzdata libgnomekbd;
+      yelp = "${yelp}/bin/yelp"; # gnome-welcome-tour
+    })
+  ];
+
+  mesonFlags = [
+    "-Dregion-page=true"
+    "-Dcheese=disabled"
+    "-Dsoftware-sources=disabled"
+    "-Dibus=disabled"
+    "-Dvendor-conf-file=${./vendor.conf}"
+  ];
+
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+      attrPath = "gnome3.${pname}";
+    };
+  };
+
+  meta = with stdenv.lib; {
+    description = "Simple, easy, and safe way to prepare a new system";
+    homepage = "https://gitlab.gnome.org/GNOME/gnome-initial-setup";
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = gnome3.maintainers;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/core/gnome-initial-setup/fix-paths.patch b/pkgs/desktops/gnome-3/core/gnome-initial-setup/fix-paths.patch
new file mode 100644
index 00000000000..94e14f688b3
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/gnome-initial-setup/fix-paths.patch
@@ -0,0 +1,67 @@
+diff --git a/data/gnome-welcome-tour b/data/gnome-welcome-tour
+index c479296..3dd629c 100755
+--- a/data/gnome-welcome-tour
++++ b/data/gnome-welcome-tour
+@@ -3,7 +3,7 @@
+ cfgdir=${XDG_CONFIG_DIR:-$HOME/.config}
+ 
+ # Don't do anything if yelp isn't installed
+-yelp_path=$(which yelp 2>/dev/null)
++yelp_path=@yelp@
+ if test -z "${yelp_path}"; then
+     rm -f $cfgdir/run-welcome-tour
+     exit
+@@ -17,5 +17,5 @@ geometry=(1024, 709)
+ EOF
+ fi
+ 
+-yelp help:gnome-help/getting-started
++$yelp_path help:gnome-help/getting-started
+ rm -f $cfgdir/run-welcome-tour
+diff --git a/gnome-initial-setup/pages/keyboard/cc-input-chooser.c b/gnome-initial-setup/pages/keyboard/cc-input-chooser.c
+index 1c34ef7..a1e7f93 100644
+--- a/gnome-initial-setup/pages/keyboard/cc-input-chooser.c
++++ b/gnome-initial-setup/pages/keyboard/cc-input-chooser.c
+@@ -177,9 +177,9 @@ preview_cb (GtkLabel       *label,
+ 		return TRUE;
+ 
+ 	if (variant[0])
+-		commandline = g_strdup_printf ("gkbd-keyboard-display -l \"%s\t%s\"", layout, variant);
++		commandline = g_strdup_printf ("@libgnomekbd@/bin/gkbd-keyboard-display -l \"%s\t%s\"", layout, variant);
+ 	else
+-		commandline = g_strdup_printf ("gkbd-keyboard-display -l %s", layout);
++		commandline = g_strdup_printf ("@libgnomekbd@/bin/gkbd-keyboard-display -l %s", layout);
+ 	g_spawn_command_line_async (commandline, NULL);
+ 	g_free (commandline);
+ 
+@@ -829,7 +829,7 @@ cc_input_chooser_class_init (CcInputChooserClass *klass)
+                 g_param_spec_string ("showing-extra", "", "", "",
+                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+ 
+-	signals[CHANGED] = 
++	signals[CHANGED] =
+ 		g_signal_new ("changed",
+ 			      G_TYPE_FROM_CLASS (object_class),
+ 			      G_SIGNAL_RUN_FIRST,
+diff --git a/gnome-initial-setup/pages/timezone/tz.h b/gnome-initial-setup/pages/timezone/tz.h
+index 93905b3..e7ee785 100644
+--- a/gnome-initial-setup/pages/timezone/tz.h
++++ b/gnome-initial-setup/pages/timezone/tz.h
+@@ -4,7 +4,7 @@
+  * Copyright (C) 2000-2001 Ximian, Inc.
+  *
+  * Authors: Hans Petter Jansson <hpj@ximian.com>
+- * 
++ *
+  * Largely based on Michael Fulbright's work on Anaconda.
+  *
+  * This program is free software; you can redistribute it and/or modify
+@@ -28,7 +28,7 @@
+ #include <glib.h>
+ 
+ #ifndef __sun
+-#  define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab"
++#  define TZ_DATA_FILE "@tzdata@/share/zoneinfo/zone.tab"
+ #else
+ #  define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab"
+ #endif
diff --git a/pkgs/desktops/gnome-3/core/gnome-initial-setup/vendor.conf b/pkgs/desktops/gnome-3/core/gnome-initial-setup/vendor.conf
new file mode 100644
index 00000000000..a06b37e100e
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/gnome-initial-setup/vendor.conf
@@ -0,0 +1,5 @@
+# Disable pages not right for NixOS
+# For example user accounts should be preconfigured
+# and we can't modify system time with systemd.
+[pages]
+skip=account;software;password;timezone;
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index f082dd1584b..d2a377d084e 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -79,6 +79,8 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   libgnome-keyring = callPackage ./core/libgnome-keyring { };
 
+  gnome-initial-setup = callPackage ./core/gnome-initial-setup { };
+
   gnome-online-miners = callPackage ./core/gnome-online-miners { };
 
   gnome-remote-desktop = callPackage ./core/gnome-remote-desktop { };
-- 
GitLab


From f9b44934bc153eff178921d764c230c53f4c720c Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Thu, 19 Sep 2019 15:12:18 -0400
Subject: [PATCH 1803/2254] nixos/gnome-initial-setup: init

It tries to start during the GDM session even
with the conflicts.
---
 nixos/modules/module-list.nix                 |  3 +-
 .../desktops/gnome3/gnome-initial-setup.nix   | 56 +++++++++++++++++++
 .../services/x11/desktop-managers/gnome3.nix  |  1 +
 3 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 nixos/modules/services/desktops/gnome3/gnome-initial-setup.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index a648eef46e5..7a33af688e2 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -299,10 +299,11 @@
   ./services/desktops/gnome3/chrome-gnome-shell.nix
   ./services/desktops/gnome3/evolution-data-server.nix
   ./services/desktops/gnome3/glib-networking.nix
+  ./services/desktops/gnome3/gnome-initial-setup.nix
   ./services/desktops/gnome3/gnome-keyring.nix
   ./services/desktops/gnome3/gnome-online-accounts.nix
-  ./services/desktops/gnome3/gnome-remote-desktop.nix
   ./services/desktops/gnome3/gnome-online-miners.nix
+  ./services/desktops/gnome3/gnome-remote-desktop.nix
   ./services/desktops/gnome3/gnome-settings-daemon.nix
   ./services/desktops/gnome3/gnome-user-share.nix
   ./services/desktops/gnome3/rygel.nix
diff --git a/nixos/modules/services/desktops/gnome3/gnome-initial-setup.nix b/nixos/modules/services/desktops/gnome3/gnome-initial-setup.nix
new file mode 100644
index 00000000000..d50624a3457
--- /dev/null
+++ b/nixos/modules/services/desktops/gnome3/gnome-initial-setup.nix
@@ -0,0 +1,56 @@
+# GNOME Initial Setup.
+
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.gnome3.gnome-initial-setup = {
+
+      enable = mkEnableOption "GNOME Initial Setup, a Simple, easy, and safe way to prepare a new system";
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf config.services.gnome3.gnome-initial-setup.enable {
+
+    environment.systemPackages = [
+      pkgs.gnome3.gnome-initial-setup
+    ];
+
+    systemd.packages = [
+      pkgs.gnome3.gnome-initial-setup
+    ];
+
+    systemd.user.targets."gnome-session".wants = [
+      "gnome-initial-setup-copy-worker.service"
+      "gnome-initial-setup-first-login.service"
+      "gnome-welcome-tour.service"
+    ];
+
+    systemd.user.targets."gnome-session@gnome-initial-setup".wants = [
+      "gnome-initial-setup.service"
+    ];
+
+    # Setup conflicts
+    systemd.user.services."gnome-initial-setup-copy-worker".conflicts = [
+      "gnome-session@gnome-login.target"
+    ];
+
+    systemd.user.services."gnome-initial-setup-first-login".conflicts = [
+      "gnome-session@gnome-login.target"
+      "gnome-session@gnome-initial-setup.target"
+    ];
+
+  };
+
+}
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index b625f592efa..c112d4b6e4d 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -229,6 +229,7 @@ in
       services.colord.enable = mkDefault true;
       services.gnome3.chrome-gnome-shell.enable = mkDefault true;
       services.gnome3.glib-networking.enable = true;
+      services.gnome3.gnome-initial-setup.enable = mkDefault true;
       services.gnome3.gnome-remote-desktop.enable = mkDefault true;
       services.gnome3.gnome-settings-daemon.enable = true;
       services.gnome3.gnome-user-share.enable = mkDefault true;
-- 
GitLab


From ea6aae81f1e2df347fdbffe78fc8697b2e255bff Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Thu, 19 Sep 2019 19:14:12 -0400
Subject: [PATCH 1804/2254] gnome3.gdm: add branding

We use the logo key to add the NixOS text logo to GDM.
---
 pkgs/desktops/gnome-3/core/gdm/default.nix    | 21 ++++++++++++++++++-
 .../org.gnome.login-screen.gschema.override   |  2 ++
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/desktops/gnome-3/core/gdm/org.gnome.login-screen.gschema.override

diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix
index 8659efe2c32..37199737fc4 100644
--- a/pkgs/desktops/gnome-3/core/gdm/default.nix
+++ b/pkgs/desktops/gnome-3/core/gdm/default.nix
@@ -1,7 +1,21 @@
 { stdenv, fetchurl, substituteAll, pkgconfig, glib, itstool, libxml2, xorg
 , accountsservice, libX11, gnome3, systemd, autoreconfHook
 , gtk3, libcanberra-gtk3, pam, libtool, gobject-introspection, plymouth
-, librsvg, coreutils, xwayland }:
+, librsvg, coreutils, xwayland, nixos-icons }:
+
+let
+
+  icon = fetchurl {
+    url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/4f041870efa1a6f0799ef4b32bb7be2cafee7a74/logo/nixos.svg";
+    sha256 = "0b0dj408c1wxmzy6k0pjwc4bzwq286f1334s3cqqwdwjshxskshk";
+  };
+
+  override = substituteAll {
+    src = ./org.gnome.login-screen.gschema.override;
+    inherit icon;
+  };
+
+in
 
 stdenv.mkDerivation rec {
   pname = "gdm";
@@ -65,6 +79,11 @@ stdenv.mkDerivation rec {
     "dbusconfdir=$(out)/etc/dbus-1/system.d"
   ];
 
+  preInstall = ''
+    schema_dir=${glib.makeSchemaPath "$out" "${pname}-${version}"}
+    install -D ${override} $schema_dir/org.gnome.login-screen.gschema.override
+  '';
+
   passthru = {
     updateScript = gnome3.updateScript {
       packageName = "gdm";
diff --git a/pkgs/desktops/gnome-3/core/gdm/org.gnome.login-screen.gschema.override b/pkgs/desktops/gnome-3/core/gdm/org.gnome.login-screen.gschema.override
new file mode 100644
index 00000000000..8c17f494b0f
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/gdm/org.gnome.login-screen.gschema.override
@@ -0,0 +1,2 @@
+[org.gnome.login-screen]
+logo='@icon@'
-- 
GitLab


From f462b376bb9ee469067e4a30c0ee52ad1ef155d5 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Thu, 19 Sep 2019 23:07:45 -0400
Subject: [PATCH 1805/2254] nixos/gdm: prevent g-i-s from running

---
 nixos/modules/services/x11/display-managers/gdm.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index 8edefd592a1..9f76bba9980 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -150,6 +150,11 @@ in
           mkdir -p /run/gdm/.config/pulse
           ln -sf ${pulseConfig} /run/gdm/.config/pulse/default.pa
           chown -R gdm:gdm /run/gdm/.config
+        '' + optionalString config.services.gnome3.gnome-initial-setup.enable ''
+          # Create stamp file for gnome-initial-setup to prevent run.
+          cat - > /run/gdm/.config/gnome-initial-setup-done <<- EOF
+          yes
+          EOF
         '';
       };
 
-- 
GitLab


From 38147b92153c50d4f229a0b734ddd0a3284f86b1 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Thu, 19 Sep 2019 23:09:02 -0400
Subject: [PATCH 1806/2254] nixos/gnome-initial-setup: prevent run on existing
 systems

GNOME initial setup's run is conditioned on whether
the gnome-initial-setup-done file exists in XDG_CONFIG_HOME
Because of this, every existing user will have initial setup
running because they never ran it before.

To prevent this we create the file if the users stateVersion
is older than 20.03 (the release we added this module).

Also drop uneeded manual conflicts as systemd.packages
does handle this.
---
 .../desktops/gnome3/gnome-initial-setup.nix   | 52 +++++++++++++++----
 1 file changed, 41 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/services/desktops/gnome3/gnome-initial-setup.nix b/nixos/modules/services/desktops/gnome3/gnome-initial-setup.nix
index d50624a3457..d715d52c2d0 100644
--- a/nixos/modules/services/desktops/gnome3/gnome-initial-setup.nix
+++ b/nixos/modules/services/desktops/gnome3/gnome-initial-setup.nix
@@ -4,6 +4,44 @@
 
 with lib;
 
+let
+
+  # GNOME initial setup's run is conditioned on whether
+  # the gnome-initial-setup-done file exists in XDG_CONFIG_HOME
+  # Because of this, every existing user will have initial setup
+  # running because they never ran it before.
+  #
+  # To prevent this we create the file if the users stateVersion
+  # is older than 20.03 (the release we added this module).
+
+  script = pkgs.writeScript "create-gis-stamp-files" ''
+    #!${pkgs.runtimeShell}
+    setup_done=$HOME/.config/gnome-initial-setup-done
+
+    echo "Creating g-i-s stamp file $setup_done ..."
+    cat - > $setup_done <<- EOF
+    yes
+    EOF
+  '';
+
+  createGisStampFilesAutostart = pkgs.writeTextFile rec {
+    name = "create-g-i-s-stamp-files";
+    destination = "/etc/xdg/autostart/${name}.desktop";
+    text = ''
+      [Desktop Entry]
+      Type=Application
+      Name=Create GNOME Initial Setup stamp files
+      Exec=${script}
+      StartupNotify=false
+      NoDisplay=true
+      OnlyShowIn=GNOME;
+      AutostartCondition=unless-exists gnome-initial-setup-done
+      X-GNOME-Autostart-Phase=EarlyInitialization
+    '';
+  };
+
+in
+
 {
 
   ###### interface
@@ -25,7 +63,9 @@ with lib;
 
     environment.systemPackages = [
       pkgs.gnome3.gnome-initial-setup
-    ];
+    ]
+    ++ optional (versionOlder config.system.stateVersion "20.03") createGisStampFilesAutostart
+    ;
 
     systemd.packages = [
       pkgs.gnome3.gnome-initial-setup
@@ -41,16 +81,6 @@ with lib;
       "gnome-initial-setup.service"
     ];
 
-    # Setup conflicts
-    systemd.user.services."gnome-initial-setup-copy-worker".conflicts = [
-      "gnome-session@gnome-login.target"
-    ];
-
-    systemd.user.services."gnome-initial-setup-first-login".conflicts = [
-      "gnome-session@gnome-login.target"
-      "gnome-session@gnome-initial-setup.target"
-    ];
-
   };
 
 }
-- 
GitLab


From 84fb39ef12a71caabd4fb4a87a4892497bcb2f7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 16 Sep 2019 14:06:13 +0200
Subject: [PATCH 1807/2254] webkitgtk: 2.24.4 -> 2.26.1

* add fix-bubblewrap-paths.patch
* use clangStdenv
  We're running into #36947

Co-authored-by: worldofpeace <worldofpeace@protonmail.ch>
---
 .../libraries/webkitgtk/default.nix           | 20 +++++++++++-----
 .../webkitgtk/fix-bubblewrap-paths.patch      | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +-
 3 files changed, 38 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/development/libraries/webkitgtk/fix-bubblewrap-paths.patch

diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index c0fae2f7176..7d48b68d14c 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -6,6 +6,7 @@
 , enableGeoLocation ? true, geoclue2, sqlite
 , enableGtk2Plugins ? false, gtk2 ? null
 , gst-plugins-base, gst-plugins-bad, woff2
+, bubblewrap, libseccomp, xdg-dbus-proxy, substituteAll
 }:
 
 assert enableGeoLocation -> geoclue2 != null;
@@ -15,7 +16,7 @@ assert stdenv.isDarwin -> !enableGtk2Plugins;
 with stdenv.lib;
 stdenv.mkDerivation rec {
   pname = "webkitgtk";
-  version = "2.24.4";
+  version = "2.26.1";
 
   meta = {
     description = "Web content rendering engine, GTK port";
@@ -28,11 +29,14 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz";
-    sha256 = "1n3x5g1z6rg9n1ssna7wi0z6zlprjm4wzk544v14wqi6q0lv2s46";
+    sha256 = "0mfikjfjhwcnrxbzdyh3fl9bbs2azgbdnx8h5910h41b3n022jvb";
   };
 
-  patches = optionals stdenv.isDarwin [
-    ## TODO add necessary patches for Darwin
+  patches = optionals stdenv.isLinux [
+    (substituteAll {
+      src = ./fix-bubblewrap-paths.patch;
+      inherit (builtins) storeDir;
+    })
   ];
 
   postPatch = ''
@@ -41,8 +45,9 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [
   "-DPORT=GTK"
-  "-DUSE_LIBHYPHEN=0"
+  "-DUSE_LIBHYPHEN=OFF"
   "-DENABLE_INTROSPECTION=ON"
+  "-DUSE_WPE_RENDERER=OFF"
   ]
   ++ optional (!enableGtk2Plugins) "-DENABLE_PLUGIN_PROCESS_GTK2=OFF"
   ++ optional stdenv.isLinux "-DENABLE_GLES2=ON"
@@ -73,11 +78,14 @@ stdenv.mkDerivation rec {
     ++ optional enableGtk2Plugins gtk2
     ++ (with xorg; [ libXdmcp libXt libXtst libXdamage ])
     ++ optionals stdenv.isDarwin [ libedit readline libGLU_combined ]
-    ++ optional stdenv.isLinux wayland;
+    ++ optionals stdenv.isLinux [
+      wayland bubblewrap libseccomp xdg-dbus-proxy
+  ];
 
   propagatedBuildInputs = [
     libsoup gtk3
   ];
 
   outputs = [ "out" "dev" ];
+
 }
diff --git a/pkgs/development/libraries/webkitgtk/fix-bubblewrap-paths.patch b/pkgs/development/libraries/webkitgtk/fix-bubblewrap-paths.patch
new file mode 100644
index 00000000000..6485ba0f261
--- /dev/null
+++ b/pkgs/development/libraries/webkitgtk/fix-bubblewrap-paths.patch
@@ -0,0 +1,23 @@
+diff -ru old/webkitgtk-2.26.0/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp webkitgtk-2.26.0/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp
+--- old/webkitgtk-2.26.0/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp	2019-09-09 04:47:07.000000000 -0400
++++ webkitgtk-2.26.0/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp	2019-09-20 21:14:10.537921173 -0400
+@@ -585,7 +585,7 @@
+         { SCMP_SYS(keyctl), nullptr },
+         { SCMP_SYS(request_key), nullptr },
+ 
+-        // Scary VM/NUMA ops 
++        // Scary VM/NUMA ops
+         { SCMP_SYS(move_pages), nullptr },
+         { SCMP_SYS(mbind), nullptr },
+         { SCMP_SYS(get_mempolicy), nullptr },
+@@ -724,6 +724,10 @@
+         "--ro-bind-try", "/usr/local/lib64", "/usr/local/lib64",
+ 
+         "--ro-bind-try", PKGLIBEXECDIR, PKGLIBEXECDIR,
++
++        // Nix Directories
++        "--ro-bind", "@storeDir@", "@storeDir@",
++        "--ro-bind", "/run/current-system", "/run/current-system",
+     };
+     // We would have to parse ld config files for more info.
+     bindPathVar(sandboxArgs, "LD_LIBRARY_PATH");
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5c3bc883690..c200860c317 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14098,7 +14098,7 @@ in
   webkitgtk = callPackage ../development/libraries/webkitgtk {
     harfbuzz = harfbuzzFull;
     inherit (gst_all_1) gst-plugins-base gst-plugins-bad;
-    stdenv = gcc6Stdenv;
+    stdenv = clangStdenv; # TODO: https://github.com/NixOS/nixpkgs/issues/36947
   };
 
   webkitgtk24x-gtk3 = callPackage ../development/libraries/webkitgtk/2.4.nix {
-- 
GitLab


From e7b7d75825471cbf7fe3194235d75dc8897ef37c Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Fri, 20 Sep 2019 22:39:40 -0400
Subject: [PATCH 1808/2254] epiphany: 3.32.4 -> 3.34.0

---
 .../gnome-3/core/epiphany/default.nix         | 90 +++++++++++++++----
 1 file changed, 74 insertions(+), 16 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix
index c52162ce7f1..d583e8d1f87 100644
--- a/pkgs/desktops/gnome-3/core/epiphany/default.nix
+++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix
@@ -1,32 +1,90 @@
-{ stdenv, meson, ninja, gettext, fetchurl, pkgconfig, gtk3, glib, icu
-, wrapGAppsHook, gnome3, libxml2, libxslt, itstool
-, webkitgtk, libsoup, glib-networking, libsecret, gnome-desktop, libnotify, p11-kit
-, sqlite, gcr, isocodes, desktop-file-utils, python3, nettle
-, gdk-pixbuf, gst_all_1, json-glib, libdazzle, libhandy }:
+{ stdenv
+, meson
+, ninja
+, gettext
+, fetchurl
+, pkgconfig
+, gtk3
+, glib
+, icu
+, wrapGAppsHook
+, gnome3
+, libxml2
+, libxslt
+, itstool
+, webkitgtk
+, libsoup
+, glib-networking
+, libsecret
+, gnome-desktop
+, libnotify
+, p11-kit
+, sqlite
+, gcr
+, isocodes
+, desktop-file-utils
+, python3
+, nettle
+, gdk-pixbuf
+, gst_all_1
+, json-glib
+, libdazzle
+, libhandy
+}:
 
 stdenv.mkDerivation rec {
   pname = "epiphany";
-  version = "3.32.4";
+  version = "3.34.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/epiphany/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "15d9s295yr6m9pbwh344c4akm7rgn19y4g1xkyn7gbq1hdbjia69";
+    sha256 = "04wxnz8i0wbg21lqll2gqaa5j17f4vxqzgwgc7b0nylqi9pyd8bb";
   };
 
   # Tests need an X display
-  mesonFlags = [ "-Dunit_tests=disabled" ];
+  mesonFlags = [
+    "-Dunit_tests=disabled"
+  ];
 
   nativeBuildInputs = [
-    meson ninja libxslt pkgconfig itstool gettext wrapGAppsHook desktop-file-utils python3
+    desktop-file-utils
+    gettext
+    itstool
+    libxslt
+    meson
+    ninja
+    pkgconfig
+    python3
+    wrapGAppsHook
   ];
 
   buildInputs = [
-    gtk3 glib webkitgtk libsoup libxml2 libsecret gnome-desktop libnotify
-    sqlite isocodes p11-kit icu libhandy
-    gdk-pixbuf gnome3.adwaita-icon-theme gcr
-    glib-networking gst_all_1.gstreamer gst_all_1.gst-plugins-base
-    gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly
-    gst_all_1.gst-libav json-glib libdazzle nettle
+    gcr
+    gdk-pixbuf
+    glib
+    glib-networking
+    gnome-desktop
+    gnome3.adwaita-icon-theme
+    gst_all_1.gst-libav
+    gst_all_1.gst-plugins-bad
+    gst_all_1.gst-plugins-base
+    gst_all_1.gst-plugins-good
+    gst_all_1.gst-plugins-ugly
+    gst_all_1.gstreamer
+    gtk3
+    icu
+    isocodes
+    json-glib
+    libdazzle
+    libhandy
+    libnotify
+    libsecret
+    libsoup
+    libxml2
+    nettle
+    p11-kit
+    sqlite
+    webkitgtk
   ];
 
   postPatch = ''
@@ -36,7 +94,7 @@ stdenv.mkDerivation rec {
 
   passthru = {
     updateScript = gnome3.updateScript {
-      packageName = "epiphany";
+      packageName = pname;
     };
   };
 
-- 
GitLab


From 752ebe1078db6f067febbd5a89873418b9b8ac41 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sat, 21 Sep 2019 17:27:36 -0400
Subject: [PATCH 1809/2254] libunity: fix build with latest vala

See: https://gitlab.gnome.org/GNOME/vala/issues/766
---
 .../libraries/libunity/default.nix            |  5 +++
 .../libraries/libunity/fix-vala.patch         | 36 +++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/development/libraries/libunity/fix-vala.patch

diff --git a/pkgs/development/libraries/libunity/default.nix b/pkgs/development/libraries/libunity/default.nix
index 2baaa14b88e..daaf3de6bcc 100644
--- a/pkgs/development/libraries/libunity/default.nix
+++ b/pkgs/development/libraries/libunity/default.nix
@@ -43,6 +43,11 @@ stdenv.mkDerivation {
     libdbusmenu
   ];
 
+  patches = [
+    # See: https://gitlab.gnome.org/GNOME/vala/issues/766
+    ./fix-vala.patch
+  ];
+
   preConfigure = ''
     intltoolize
   '';
diff --git a/pkgs/development/libraries/libunity/fix-vala.patch b/pkgs/development/libraries/libunity/fix-vala.patch
new file mode 100644
index 00000000000..ec34229b444
--- /dev/null
+++ b/pkgs/development/libraries/libunity/fix-vala.patch
@@ -0,0 +1,36 @@
+diff -ru old/libunity/src/unity-aggregator-scope.vala libunity/src/unity-aggregator-scope.vala
+--- old/libunity/src/unity-aggregator-scope.vala	1969-12-31 19:00:01.000000000 -0500
++++ libunity/src/unity-aggregator-scope.vala	2019-09-21 17:06:12.663864891 -0400
+@@ -51,7 +51,7 @@
+    */
+   public abstract int category_index_for_scope_id (string scope_id);
+ 
+-  public AggregatorScope (string dbus_path_, string id_, MergeMode merge_mode = AggregatorScope.MergeMode.OWNER_SCOPE, bool proxy_filter_hints = false)
++  protected AggregatorScope (string dbus_path_, string id_, MergeMode merge_mode = AggregatorScope.MergeMode.OWNER_SCOPE, bool proxy_filter_hints = false)
+   {
+     Object (dbus_path: dbus_path_, id: id_, is_master: true,
+             merge_mode: merge_mode, proxy_filter_hints: proxy_filter_hints);
+diff -ru old/libunity/src/unity-deprecated-scope.vala libunity/src/unity-deprecated-scope.vala
+--- old/libunity/src/unity-deprecated-scope.vala	1969-12-31 19:00:01.000000000 -0500
++++ libunity/src/unity-deprecated-scope.vala	2019-09-21 17:06:39.721627805 -0400
+@@ -61,7 +61,7 @@
+   internal CategorySet _categories;
+   internal FilterSet _filters;
+    
+-  public DeprecatedScopeBase (string dbus_path_, string id_)
++  protected DeprecatedScopeBase (string dbus_path_, string id_)
+   {
+     Object (dbus_path: dbus_path_, id: id_);
+   }
+diff -ru old/libunity/tools/preview-renderer.vala libunity/tools/preview-renderer.vala
+--- old/libunity/tools/preview-renderer.vala	1969-12-31 19:00:01.000000000 -0500
++++ libunity/tools/preview-renderer.vala	2019-09-21 17:09:16.201522110 -0400
+@@ -63,7 +63,7 @@
+      */
+     public abstract class GridRenderer: PreviewRenderer
+     {
+-        public GridRenderer()
++        protected GridRenderer()
+         {
+             Object();
+         }
-- 
GitLab


From 7ba3608aa0c591c7216f22311a35337dd9a7aff8 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sat, 21 Sep 2019 17:27:51 -0400
Subject: [PATCH 1810/2254] feedreader: fix build with latest libsecret

---
 .../networking/feedreaders/feedreader/default.nix      | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/feedreaders/feedreader/default.nix b/pkgs/applications/networking/feedreaders/feedreader/default.nix
index 959649c4b15..c2fda72e36a 100644
--- a/pkgs/applications/networking/feedreaders/feedreader/default.nix
+++ b/pkgs/applications/networking/feedreaders/feedreader/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, vala, gettext, python3
-, appstream-glib, desktop-file-utils, wrapGAppsHook, gnome-online-accounts
+, appstream-glib, desktop-file-utils, wrapGAppsHook, gnome-online-accounts, fetchpatch
 , gtk3, libgee, libpeas, librest, webkitgtk, gsettings-desktop-schemas, hicolor-icon-theme
 , curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo, libxml2
 }:
@@ -33,6 +33,14 @@ stdenv.mkDerivation rec {
     patchShebangs build-aux/meson_post_install.py
   '';
 
+  patches = [
+    # Fixes build with libsecret
+    (fetchpatch {
+      url = "https://patch-diff.githubusercontent.com/raw/jangernert/FeedReader/pull/943.patch";
+      sha256 = "0anrwvcg6607dzvfrhy5qcnpxzflskb3iy3khdg191aw1h2mqhb5";
+    })
+  ];
+
   meta = with stdenv.lib; {
     description = "A modern desktop application designed to complement existing web-based RSS accounts";
     homepage = https://jangernert.github.io/FeedReader/;
-- 
GitLab


From 1252132f080e6c0d8246b9d511cebb55e5642e20 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sat, 21 Sep 2019 17:45:51 -0400
Subject: [PATCH 1811/2254] midori: 7 -> 9.0

* add libarchive and json-glib

We use vala_0_44 to avoid the issue with sqlite3 vapi [0]

[0]: https://gitlab.gnome.org/GNOME/vala/commit/a54e4d89a449044c965869abf0ce78dadcf093ac.patch
---
 .../networking/browsers/midori/default.nix    | 44 +++++++++++++++----
 1 file changed, 36 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix
index a0bc0c743e4..f87ba43f2bb 100644
--- a/pkgs/applications/networking/browsers/midori/default.nix
+++ b/pkgs/applications/networking/browsers/midori/default.nix
@@ -1,24 +1,52 @@
-{ stdenv, fetchurl, cmake, ninja, pkgconfig, intltool, vala, wrapGAppsHook, gcr, libpeas
-, gtk3, webkitgtk, sqlite, gsettings-desktop-schemas, libsoup, glib-networking
+{ stdenv
+, fetchurl
+, cmake
+, ninja
+, pkgconfig
+, intltool
+, vala_0_44
+, wrapGAppsHook
+, gcr
+, libpeas
+, gtk3
+, webkitgtk
+, sqlite
+, gsettings-desktop-schemas
+, libsoup
+, glib-networking
+, json-glib
+, libarchive
 }:
 
 stdenv.mkDerivation rec {
   pname = "midori";
-  version = "7";
+  version = "9.0";
 
   src = fetchurl {
-    url = "https://github.com/midori-browser/core/releases/download/v${version}/midori-v${version}.0.tar.gz";
-    sha256 = "0ffdnjp55s0ci737vlhxikb2nihghwlb6mjcjzpgpnzi47vjqnwh";
+    url = "https://github.com/midori-browser/core/releases/download/v${version}/midori-v${version}.tar.gz";
+    sha256 = "05i04qa83dnarmgkx4xsk6fga5lw1lmslh4rb3vhyyy4ala562jy";
   };
 
   nativeBuildInputs = [
-    pkgconfig cmake ninja intltool vala wrapGAppsHook
+    cmake
+    intltool
+    ninja
+    pkgconfig
+    vala_0_44
+    wrapGAppsHook
   ];
 
   buildInputs = [
-    gtk3 webkitgtk sqlite gsettings-desktop-schemas gcr
-    (libsoup.override { gnomeSupport = true; }) libpeas
+    (libsoup.override { gnomeSupport = true; })
+    gcr
     glib-networking
+    gsettings-desktop-schemas
+    gtk3
+    libpeas
+    sqlite
+    webkitgtk
+    json-glib
+    libarchive
   ];
 
   meta = with stdenv.lib; {
-- 
GitLab


From dac8bf9ed5bbbcac38a8091c1234f79bc98e2678 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sat, 21 Sep 2019 18:46:31 -0400
Subject: [PATCH 1812/2254] libpeas: correct gtk .pc file

Here's the diff post meson:
-prefix=/nix/store/hfrrby8wapcz17v927as18z3znqdv2ps-libpeas-1.22.0
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+prefix=/nix/store/sc8h3m6fv3zdjzpkimhm4yqarafhjp6y-libpeas-1.24.0
+libdir=${prefix}/lib
 includedir=${prefix}/include

-Name: libpeas-gtk
-Description: libpeas-gtk, a GObject plugins library (Gtk widgets)
-Requires: glib-2.0 >= 2.38.0, gtk+-3.0 >= 3.0.0, libpeas-1.0 >= 1.22.0
-Version: 1.22.0
+Name: libpeas-gtk-1.0
+Description: GObject plugins library widgetery
+Version: 1.24.0
+Requires.private: libpeas-1.0, glib-2.0 >=  2.38.0, gobject-2.0 >=  2.38.0, gobject-introspection-1.0 >=  1.39.0, gtk+-3.0 >=  3.0.0, gmodule-2.0 >=  2.38.0, gio-2.0 >=  2.38.0
+Libs: -L${prefix}//lib  -lpeas-gtk-1.0
 Cflags: -I${includedir}/libpeas-1.0
-Libs: -L${libdir} -lpeas-gtk-1.0

As we can see, all the requires got moved into private.
This appears to have broken midori [0]

[0]: https://hydra.nixos.org/build/101627205
---
 .../development/libraries/libpeas/default.nix |  4 ++++
 .../libpeas/fix-libpeas-gtk-pc.patch          | 22 +++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/libraries/libpeas/fix-libpeas-gtk-pc.patch

diff --git a/pkgs/development/libraries/libpeas/default.nix b/pkgs/development/libraries/libpeas/default.nix
index beee52f8217..cdb1b95935f 100644
--- a/pkgs/development/libraries/libpeas/default.nix
+++ b/pkgs/development/libraries/libpeas/default.nix
@@ -18,6 +18,10 @@ stdenv.mkDerivation rec {
     gobject-introspection
   ];
 
+  patches = [
+    ./fix-libpeas-gtk-pc.patch
+  ];
+
   passthru = {
     updateScript = gnome3.updateScript {
       packageName = pname;
diff --git a/pkgs/development/libraries/libpeas/fix-libpeas-gtk-pc.patch b/pkgs/development/libraries/libpeas/fix-libpeas-gtk-pc.patch
new file mode 100644
index 00000000000..8016939716d
--- /dev/null
+++ b/pkgs/development/libraries/libpeas/fix-libpeas-gtk-pc.patch
@@ -0,0 +1,22 @@
+diff --git a/libpeas-gtk/meson.build b/libpeas-gtk/meson.build
+index bf590de..00def42 100644
+--- a/libpeas-gtk/meson.build
++++ b/libpeas-gtk/meson.build
+@@ -111,10 +111,17 @@ libpeas_gtk_test_dep = declare_dependency(
+   sources: libpeas_gtk_dep_sources,
+ )
+ 
++libpeas_gtk_pc_reqs = [
++  glib_dep,
++  gtk_dep,
++  package_string + ' >= @0@'.format(version)
++]
++
+ libpeas_gtk_pc = pkg.generate(
+   libpeas_gtk_sha,
+   name: package_gtk_string,
+   description: 'GObject plugins library widgetery',
++  requires: libpeas_gtk_pc_reqs,
+   subdirs: package_string,
+   install_dir: pkgconfigdir,
+ )
-- 
GitLab


From d935c9bc59a206ba552f27f488451179e26ddb71 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Mon, 23 Sep 2019 18:26:52 -0400
Subject: [PATCH 1813/2254] gnomeExtensions.mediaplayer: remove

Source repo is archived and the extension was retired [0]

[0]: https://github.com/JasonLG1979/gnome-shell-extensions-mediaplayer/blob/master/README.md
---
 .../extensions/mediaplayer/default.nix        | 37 -------------------
 pkgs/top-level/all-packages.nix               |  3 +-
 2 files changed, 2 insertions(+), 38 deletions(-)
 delete mode 100644 pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix

diff --git a/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix b/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix
deleted file mode 100644
index 10175719e46..00000000000
--- a/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ stdenv, fetchFromGitHub, glib, meson, gettext, ninja, python3 }:
-
-stdenv.mkDerivation {
-  pname = "gnome-shell-extensions-mediaplayer";
-  version = "unstable-2019-03-21";
-
-  src = fetchFromGitHub {
-    owner = "JasonLG1979";
-    repo = "gnome-shell-extensions-mediaplayer";
-    rev = "b382c98481fa421501684e2ff3eafc53971ef22b";
-    sha256 = "01z2dml8dvl5sljw62g7x19mz02dz1g4gkmyp0h5bx49djcw1nnh";
-  };
-
-  nativeBuildInputs = [
-    meson
-    ninja
-    python3
-  ];
-  buildInputs = [
-    glib
-    gettext
-  ];
-
-  postPatch = ''
-    rm build
-    chmod +x meson_post_install.py
-    patchShebangs meson_post_install.py
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Control MPRIS Version 2 Capable Media Players";
-    license = licenses.gpl2Plus;
-    homepage = https://github.com/JasonLG1979/gnome-shell-extensions-mediaplayer/;
-    maintainers = with maintainers; [ tiramiseb ];
-  };
-}
-
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c200860c317..0bca4e145f7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22753,7 +22753,6 @@ in
     gsconnect = callPackage ../desktops/gnome-3/extensions/gsconnect { };
     icon-hider = callPackage ../desktops/gnome-3/extensions/icon-hider { };
     impatience = callPackage ../desktops/gnome-3/extensions/impatience.nix { };
-    mediaplayer = callPackage ../desktops/gnome-3/extensions/mediaplayer { };
     nohotcorner = callPackage ../desktops/gnome-3/extensions/nohotcorner { };
     no-title-bar = callPackage ../desktops/gnome-3/extensions/no-title-bar { };
     pidgin-im-integration = callPackage ../desktops/gnome-3/extensions/pidgin-im-integration { };
@@ -22765,6 +22764,8 @@ in
     timepp = callPackage ../desktops/gnome-3/extensions/timepp { };
     topicons-plus = callPackage ../desktops/gnome-3/extensions/topicons-plus { };
     window-corner-preview = callPackage ../desktops/gnome-3/extensions/window-corner-preview { };
+
+    mediaplayer = throw "deprecated 2019-09-23: retired upstream https://github.com/JasonLG1979/gnome-shell-extensions-mediaplayer/blob/master/README.md";
   };
 
   hsetroot = callPackage ../tools/X11/hsetroot { };
-- 
GitLab


From fc8413d218c5737dce9517f213bfd007369f9960 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Mon, 23 Sep 2019 18:47:16 -0400
Subject: [PATCH 1814/2254] gnomeExtensions.appindicator: 29 -> 30

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

diff --git a/pkgs/desktops/gnome-3/extensions/appindicator/default.nix b/pkgs/desktops/gnome-3/extensions/appindicator/default.nix
index 6f289fd74d9..910007bc05b 100644
--- a/pkgs/desktops/gnome-3/extensions/appindicator/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/appindicator/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-extension-appindicator";
-  version = "29";
+  version = "30";
 
   src = fetchFromGitHub {
     owner = "Ubuntu";
     repo = "gnome-shell-extension-appindicator";
     rev = "v${version}";
-    sha256 = "02cr6rhi3dfk49jcjm6vh7yx117bv5wqyvd34cyv1kzwzsla8v2i";
+    sha256 = "1fjhx23jqwv3d0smwhnjvc35gqhwk9p5f96ic22pfax653cn5vh8";
   };
 
   # This package has a Makefile, but it's used for building a zip for
-- 
GitLab


From 3b81b3a8274ce7afb0b41abf5c1e1a207ad15970 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Mon, 23 Sep 2019 18:49:23 -0400
Subject: [PATCH 1815/2254] gnomeExtensions.arc-menu: 31 -> 33.2

---
 pkgs/desktops/gnome-3/extensions/arc-menu/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix b/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix
index b38f0aeba91..cb1fa70d681 100644
--- a/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-arc-menu";
-  version = "31";
+  version = "33.2";
 
   src = fetchFromGitLab {
     owner = "LinxGem33";
     repo = "Arc-Menu";
-    rev = "v${version}-stable";
-    sha256 = "124jgdy6mw76nrkq3f0y7qkhdm39wg273zifdvwbgpvirwzxbia1";
+    rev = "v${version}-dev";
+    sha256 = "1dd9ysiyza6drwdv4qcxyijy7yijirjf2fd1aq5jv8s4bqajcqf4";
   };
 
   patches = [
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     glib gettext
   ];
 
-  makeFlags = [ "INSTALL_BASE=$(out)/share/gnome-shell/extensions" ];
+  makeFlags = [ "INSTALL_BASE=${placeholder "out"}/share/gnome-shell/extensions" ];
 
   meta = with stdenv.lib; {
     description = "Gnome shell extension designed to replace the standard menu found in Gnome 3";
-- 
GitLab


From 18f2e6230a12e7c8d41c8ea66ef4ddfd673b63fd Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Mon, 23 Sep 2019 18:50:03 -0400
Subject: [PATCH 1816/2254] gnomeExtensions.caffeine: make as broken

---
 pkgs/desktops/gnome-3/extensions/caffeine/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/extensions/caffeine/default.nix b/pkgs/desktops/gnome-3/extensions/caffeine/default.nix
index 95a68505c7c..8cf9fb9f0e6 100644
--- a/pkgs/desktops/gnome-3/extensions/caffeine/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/caffeine/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, glib, gettext, bash }:
+{ stdenv, fetchFromGitHub, glib, gettext, bash, gnome3 }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-extension-caffeine";
@@ -32,5 +32,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2;
     maintainers = with maintainers; [ eperuffo ];
     homepage = https://github.com/eonpatapon/gnome-shell-extension-caffeine;
+    broken = versionAtLeast gnome3.gnome-shell.version "3.32"; # Doesn't support 3.34
   };
 }
-- 
GitLab


From 77f1d77a3b12509ba3ee8b0cba660705e8bfc9ce Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Mon, 23 Sep 2019 18:50:22 -0400
Subject: [PATCH 1817/2254] gnomeExtensions.clipboard-indicator: mark as broken

---
 .../gnome-3/extensions/clipboard-indicator/default.nix         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix b/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix
index 0faadbcd2b6..5277cb08cbb 100644
--- a/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchFromGitHub, gnome3 }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-extension-clipboard-indicator";
@@ -24,5 +24,6 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ jonafato ];
     platforms = platforms.linux;
     homepage = https://github.com/Tudmotu/gnome-shell-extension-clipboard-indicator;
+    broken = versionAtLeast gnome3.gnome-shell.version "3.26";
   };
 }
-- 
GitLab


From 006330bce48e8c7574468a6dcfe7db42380d7598 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Mon, 23 Sep 2019 18:50:37 -0400
Subject: [PATCH 1818/2254] gnomeExtensions.icon-hider: mark as broken

---
 pkgs/desktops/gnome-3/extensions/icon-hider/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix b/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix
index 8214300a531..8bfd681625f 100644
--- a/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix
@@ -24,5 +24,6 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ jonafato ];
     platforms = gnome3.gnome-shell.meta.platforms;
     homepage = https://github.com/ikalnytskyi/gnome-shell-extension-icon-hider;
+    broken = versionAtLeast gnome3.gnome-shell.version "3.32"; # Doesn't support 3.34
   };
 }
-- 
GitLab


From 4333119b64b9c712a4133c67321935afa83e5a7c Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Mon, 23 Sep 2019 18:50:57 -0400
Subject: [PATCH 1819/2254] gnomeExtensions.pidgin-im-integration: mark as
 broken

---
 .../gnome-3/extensions/pidgin-im-integration/default.nix       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix b/pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix
index 6f1cc3df409..cffe96894cc 100644
--- a/pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, glib }:
+{ stdenv, fetchFromGitHub, glib, gnome3 }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-extension-pidgin-im-integration";
@@ -27,5 +27,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ ];
+    broken = versionAtLeast gnome3.gnome-shell.version "3.32"; # Doesn't support 3.34
   };
 }
-- 
GitLab


From d6413fc352109896680a3c270640edf3dfd16082 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Mon, 23 Sep 2019 18:51:22 -0400
Subject: [PATCH 1820/2254] gnomeExtensions.remove-dropdown-arrows: 11 -> 13

---
 .../gnome-3/extensions/remove-dropdown-arrows/default.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix b/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix
index d9ea670db09..fbbd56f1c0f 100644
--- a/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-extension-remove-dropdown-arrows";
-  version = "11";
+  version = "13";
 
   src = fetchFromGitHub {
     owner = "mpdeimos";
     repo = "gnome-shell-remove-dropdown-arrows";
     rev = "version/${version}";
-    sha256 = "1g99r9bpjdhab3xj74wkl40gdnaf2w51kswcr8mi6bq72n4wjxwh";
+    sha256 = "09b2hnfbqym20pb1sfc8xiz7gs2kbs6b1s7xl8swc8dydhsbambk";
   };
 
   # This package has a Makefile, but it's used for publishing and linting, not
-- 
GitLab


From 9599236469e39ada9a6504d43b66ba9b2d30a1b3 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Mon, 23 Sep 2019 18:53:03 -0400
Subject: [PATCH 1821/2254] gnomeExtension.sound-output-device-chooser:
 2019-04-01 -> 24

---
 .../extensions/sound-output-device-chooser/default.nix      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix b/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix
index 33c127f449b..a5f94288ae5 100644
--- a/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-extension-sound-output-device-chooser";
-  version = "unstable-2019-04-01";
+  version = "24";
 
   src = fetchFromGitHub {
     owner = "kgshank";
     repo = "gse-sound-output-device-chooser";
-    rev = "37098909a50bafe2f2538819f988cb2327ed7c60";
-    sha256 = "09sbby8zi9xn21lbdry57bp1vwgd5c73anvqpw9css3x2ryda5li";
+    rev = version;
+    sha256 = "0n1rf4pdf0b78ivmz89x223sqlzv30qydkvlnvn7hwx0j32kyr0x";
   };
 
   dontBuild = true;
-- 
GitLab


From b9f3160c2aa55f75506385683047365a457e32ba Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Mon, 23 Sep 2019 18:53:26 -0400
Subject: [PATCH 1822/2254] gnomeExtension.system-monitor-applet: mark as
 broken

---
 pkgs/desktops/gnome-3/extensions/system-monitor/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
index 13b2d6a1db4..921991a33ae 100644
--- a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, substituteAll, fetchFromGitHub, glib, glib-networking, libgtop }:
+{ stdenv, substituteAll, fetchFromGitHub, glib, glib-networking, libgtop, gnome3 }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-system-monitor";
@@ -41,5 +41,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ aneeshusa tiramiseb ];
     homepage = https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet;
+    broken = versionAtLeast gnome3.gnome-shell.version "3.32";
   };
 }
-- 
GitLab


From 3e0539af09ab1dfcaa1d1b31a4d0c2ca09f29632 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Mon, 23 Sep 2019 18:53:45 -0400
Subject: [PATCH 1823/2254] gnomeExtension.taskwhisperer: mark as broken

---
 pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix b/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix
index 90be6aed1d7..1e44cd4de5c 100644
--- a/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, substituteAll, fetchFromGitHub, taskwarrior, gettext, runtimeShell }:
+{ stdenv, substituteAll, fetchFromGitHub, taskwarrior, gettext, runtimeShell, gnome3 }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-extension-taskwhisperer";
@@ -38,5 +38,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ jonafato ];
     homepage = https://github.com/cinatic/taskwhisperer;
+    broken = versionAtLeast gnome3.gnome-shell.version "3.32"; # Doesnt't support 3.34
   };
 }
-- 
GitLab


From eebc63aabde2eef67f3ca5c6336522c546d62e3a Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Mon, 23 Sep 2019 18:54:22 -0400
Subject: [PATCH 1824/2254] gnomeExtension.tilingnome: 2019-01-18 -> 2019-09-19

---
 .../gnome-3/extensions/tilingnome/default.nix         | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/gnome-3/extensions/tilingnome/default.nix b/pkgs/desktops/gnome-3/extensions/tilingnome/default.nix
index 293918bd2b1..22f857a7809 100644
--- a/pkgs/desktops/gnome-3/extensions/tilingnome/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/tilingnome/default.nix
@@ -1,14 +1,14 @@
 { stdenv, lib, fetchFromGitHub, glib, gnome3 }:
 
 stdenv.mkDerivation rec {
-  pname = "gnome-shell-extension-tilingnome";
-  version = "unstable-2019-01-18";
+  pname = "gnome-shell-extension-tilingnome-unstable";
+  version = "unstable-2019-09-19";
 
   src = fetchFromGitHub {
     owner = "rliang";
-    repo = pname;
-    rev = "bd4fb8c19f7a6282b38724b30e62645143390226";
-    sha256 = "1y4s4n88gdkpvgd3v3dg0181ccyhlixbvkx3bwyvdxyyyxbqibid";
+    repo = "gnome-shell-extension-tilingnome";
+    rev = "f401c20c9721d85e6b3e30d1e822a200db370407";
+    sha256 = "1hq9g9bxqpzqrdj9zm0irld8r6q4w1m4b00jya7wsny8rzb1s0y2";
   };
 
   nativeBuildInputs = [ glib ];
@@ -30,6 +30,5 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ benley ];
     homepage = https://github.com/rliang/gnome-shell-extension-tilingnome;
     platforms = gnome3.gnome-shell.meta.platforms;
-    broken = lib.versionAtLeast gnome3.gnome-shell.version "3.31";
   };
 }
-- 
GitLab


From 76d12e8b88fb95e3668dae9333e7256f67ca99ef Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Mon, 23 Sep 2019 18:54:46 -0400
Subject: [PATCH 1825/2254] gnomeExtension.timepp: mark as broken

---
 pkgs/desktops/gnome-3/extensions/timepp/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/extensions/timepp/default.nix b/pkgs/desktops/gnome-3/extensions/timepp/default.nix
index f841ef2403d..04e98d51b0c 100644
--- a/pkgs/desktops/gnome-3/extensions/timepp/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/timepp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchFromGitHub, gnome3 }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-extension-timepp";
@@ -22,5 +22,6 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/zagortenay333/timepp__gnome;
     license = licenses.gpl3;
     maintainers = with maintainers; [ svsdep ];
+    broken = versionAtLeast gnome3.gnome-shell.version "3.32"; # Dosen't support 3.34 https://github.com/zagortenay333/timepp__gnome/issues/113
   };
 }
-- 
GitLab


From da8226b3342bbd38bd7083282f8c17dd7f561b2f Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Mon, 23 Sep 2019 19:12:28 -0400
Subject: [PATCH 1826/2254] gnome3.pomodoro: 0.15.1 -> 2019-09-15

---
 pkgs/desktops/gnome-3/misc/pomodoro/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix
index fcbceab24ea..0080177df71 100644
--- a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix
+++ b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix
@@ -22,14 +22,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  pname = "gnome-shell-pomodoro";
-  version = "0.15.1";
+  pname = "gnome-shell-pomodoro-unstable";
+  version = "2019-09-15";
 
   src = fetchFromGitHub {
     owner = "codito";
     repo = "gnome-pomodoro";
-    rev = version;
-    sha256 = "0nmgd122gsfka0p50mila88iwrzckq2r36a3h20lswn5qkn321i1";
+    rev = "cb1ad32587c209d3322cd1bbc139efa624a4436f";
+    sha256 = "1zp3z043zzkkn2305s55hnpf9bdzirlzljpzswfh1fj6j4dqlb9k";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From 513e8de83bcfd690db57e737b80816324913fe5c Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Wed, 25 Sep 2019 08:16:20 -0400
Subject: [PATCH 1827/2254] pantheon.elementary-settings-daemon: fix
 gnome-session detecting autostarts

For some reason GNOME 3.34 gnome-session fails to recognize
these autostarts suffixed with `-pantheon`, whereas they worked before.
It seems to work fine without the suffix, and it's verified elementary-settings-daemon
proccess are running in the session.
---
 .../pantheon/services/elementary-settings-daemon/default.nix  | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
index 67a67dd4b3d..d29178b220d 100644
--- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
+++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
@@ -90,8 +90,6 @@ stdenv.mkDerivation rec {
   '';
 
   postFixup = ''
-    for f in $out/etc/xdg/autostart/*; do mv "$f" "''${f%.desktop}-pantheon.desktop"; done
-
     for autostart in $(grep -rl "OnlyShowIn=GNOME;" $out/etc/xdg/autostart)
     do
       echo "Patching OnlyShowIn to Pantheon in: $autostart"
@@ -100,7 +98,7 @@ stdenv.mkDerivation rec {
 
     # This breaks lightlocker https://github.com/elementary/session-settings/commit/b0e7a2867608c3a3916f9e4e21a68264a20e44f8
     # TODO: shouldn't be neeed for the 5.1 greeter (awaiting release)
-    rm $out/etc/xdg/autostart/org.gnome.SettingsDaemon.ScreensaverProxy-pantheon.desktop
+    rm $out/etc/xdg/autostart/org.gnome.SettingsDaemon.ScreensaverProxy.desktop
 
     # So the polkit policy can reference /run/current-system/sw/bin/elementary-settings-daemon/gsd-backlight-helper
     mkdir -p $out/bin/elementary-settings-daemon
-- 
GitLab


From a62a8aaa141ad4b1f1fa6d66c501992f8e177a10 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Mon, 25 Feb 2019 21:11:39 -0500
Subject: [PATCH 1828/2254] pantheon.elementary-session-settings: add default
 settings to config dirs

Also don't use placeholder in the executable.
---
 .../desktop/elementary-session-settings/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
index 7b0657bcd80..69a1efa3e9e 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
@@ -10,7 +10,6 @@
 , onboard
 , at-spi2-core
 , elementary-default-settings
-, writeShellScriptBin
 , elementary-settings-daemon
 , runtimeShell
 }:
@@ -50,9 +49,9 @@ let
     script = dockitems-script;
   };
 
-  executable = writeShellScriptBin "pantheon" ''
-    export XDG_CONFIG_DIRS=${elementary-settings-daemon}/etc/xdg:$XDG_CONFIG_DIRS
-    export XDG_DATA_DIRS=${placeholder "out"}/share:$XDG_DATA_DIRS
+  executable = writeScript "pantheon" ''
+    export XDG_CONFIG_DIRS=${elementary-settings-daemon}/etc/xdg:${elementary-default-settings}/etc:$XDG_CONFIG_DIRS
+    export XDG_DATA_DIRS=@out@/share:$XDG_DATA_DIRS
     exec ${gnome-session}/bin/gnome-session --session=pantheon "$@"
   '';
 
@@ -95,13 +94,17 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/gnome-session/sessions
     cp -av gnome-session/pantheon.session $out/share/gnome-session/sessions
 
+    mkdir -p $out/libexec
+    substitute ${executable} $out/libexec/pantheon --subst-var out
+    chmod +x $out/libexec/pantheon
+
     mkdir -p $out/share/xsessions
     cp -av xsessions/pantheon.desktop $out/share/xsessions
   '';
 
   postFixup = ''
     substituteInPlace $out/share/xsessions/pantheon.desktop \
-      --replace "gnome-session --session=pantheon" "${executable}/bin/pantheon" \
+      --replace "gnome-session --session=pantheon" "$out/libexec/pantheon" \
       --replace "wingpanel" "${wingpanel}/bin/wingpanel"
 
     for f in $out/etc/xdg/autostart/*; do mv "$f" "''${f%.desktop}-pantheon.desktop"; done
-- 
GitLab


From 22dccf9602c1c028c1d7b3fa1c99782ba98ff2e1 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Fri, 27 Sep 2019 18:10:03 -0400
Subject: [PATCH 1829/2254] gnome3.gdm: fix rebuild switch

See: https://gitlab.gnome.org/GNOME/gdm/issues/515
---
 pkgs/desktops/gnome-3/core/gdm/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix
index 37199737fc4..1e37c45a1ad 100644
--- a/pkgs/desktops/gnome-3/core/gdm/default.nix
+++ b/pkgs/desktops/gnome-3/core/gdm/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, substituteAll, pkgconfig, glib, itstool, libxml2, xorg
 , accountsservice, libX11, gnome3, systemd, autoreconfHook
 , gtk3, libcanberra-gtk3, pam, libtool, gobject-introspection, plymouth
-, librsvg, coreutils, xwayland, nixos-icons }:
+, librsvg, coreutils, xwayland, nixos-icons, fetchpatch }:
 
 let
 
@@ -51,6 +51,12 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   patches = [
+    # See: https://gitlab.gnome.org/GNOME/gdm/issues/515
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/gdm/commit/0e05e2fd3c2a3b28ed4db0e51e4646aa6af67a5f.patch";
+      sha256 = "10kbjn0kis0xf95dfzq4w6xazyfbcz8yj9lrixg5jb3srrnp0hhf";
+    })
+
     # Change hardcoded paths to nix store paths.
     (substituteAll {
       src = ./fix-paths.patch;
-- 
GitLab


From dcd578d94941d60d403116adabd629402040e181 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Fri, 27 Sep 2019 19:28:18 -0400
Subject: [PATCH 1830/2254] gnome3.gdm: Remove duplicate sessions when on Xorg

---
 pkgs/desktops/gnome-3/core/gdm/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix
index 1e37c45a1ad..8b9c3732454 100644
--- a/pkgs/desktops/gnome-3/core/gdm/default.nix
+++ b/pkgs/desktops/gnome-3/core/gdm/default.nix
@@ -57,6 +57,12 @@ stdenv.mkDerivation rec {
       sha256 = "10kbjn0kis0xf95dfzq4w6xazyfbcz8yj9lrixg5jb3srrnp0hhf";
     })
 
+    # https://gitlab.gnome.org/GNOME/gdm/merge_requests/84
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/gdm/commit/2136c3baab81b6ec2115180f67ada91727e948f7.patch";
+      sha256 = "1ispxh4p6hdh3bx9x86497gzlwpgj32x2ymmv60wafg76vmrlcc2";
+    })
+
     # Change hardcoded paths to nix store paths.
     (substituteAll {
       src = ./fix-paths.patch;
-- 
GitLab


From 2f41598ba83a6d258013de34614524c6478511be Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Fri, 27 Sep 2019 19:47:15 -0400
Subject: [PATCH 1831/2254] gnome3.gnome-session: fix debug spam with systemd
 session

---
 .../desktops/gnome-3/core/gnome-session/default.nix | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix
index 127aa5bf79b..9e86297e1ec 100644
--- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-session/default.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, substituteAll, meson, ninja, pkgconfig, gnome3, glib, gtk3, gsettings-desktop-schemas
 , gnome-desktop, dbus, json-glib, libICE, xmlto, docbook_xsl, docbook_xml_dtd_412, python3
-, libxslt, gettext, makeWrapper, systemd, xorg, epoxy, gnugrep, bash }:
+, libxslt, gettext, makeWrapper, systemd, xorg, epoxy, gnugrep, bash, fetchpatch }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-session";
@@ -12,6 +12,17 @@ stdenv.mkDerivation rec {
   };
 
   patches = [
+    # Fix debug spam when using systemd session
+    # https://gitlab.gnome.org/GNOME/gnome-session/issues/31
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/gnome-session/commit/adfdf7f64f08fc07325f9332e9eba46974cc30ee.patch";
+      sha256 = "0vjg77gpj3k63a5ffhsvv5m30lbj6cab35lhl4gpqxg4j2j3yy7y";
+    })
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/gnome-session/commit/b7b24627485c520f873db4e918e217a76ededd8c.patch";
+      sha256 = "1d8pw8q423wvv0cd32p0yf52vlfj7w1if2gljqvarcm2n1m0pdxj";
+    })
+
     (substituteAll {
       src = ./fix-paths.patch;
       gsettings = "${glib.bin}/bin/gsettings";
-- 
GitLab


From dd86155fe4c372c3d524211f2a0839a4ce7d721f Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Fri, 27 Sep 2019 19:48:44 -0400
Subject: [PATCH 1832/2254] nixos/gnome3: use sessionVariables

Without this GNOME_SESSION_DEBUG
likely won't be set in the systemd user environment.
---
 nixos/modules/services/x11/desktop-managers/gnome3.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index c112d4b6e4d..304554e3684 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -155,10 +155,10 @@ in
 
       environment.systemPackages = cfg.sessionPath;
 
-      environment.variables.GNOME_SESSION_DEBUG = mkIf cfg.debug "1";
+      environment.sessionVariables.GNOME_SESSION_DEBUG = mkIf cfg.debug "1";
 
       # Override GSettings schemas
-      environment.variables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";
+      environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";
 
        # If gnome3 is installed, build vim for gtk3 too.
       nixpkgs.config.vim.gui = "gtk3";
@@ -346,10 +346,10 @@ in
 
       # Let nautilus find extensions
       # TODO: Create nautilus-with-extensions package
-      environment.variables.NAUTILUS_EXTENSION_DIR = "${config.system.path}/lib/nautilus/extensions-3.0";
+      environment.sessionVariables.NAUTILUS_EXTENSION_DIR = "${config.system.path}/lib/nautilus/extensions-3.0";
 
       # Override default mimeapps for nautilus
-      environment.variables.XDG_DATA_DIRS = [ "${mimeAppsList}/share" ];
+      environment.sessionVariables.XDG_DATA_DIRS = [ "${mimeAppsList}/share" ];
 
       environment.pathsToLink = [
         "/share/nautilus-python/extensions"
-- 
GitLab


From 34a76d40cd9ea624bdfc7df4b06d39545bd85c69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Sat, 28 Sep 2019 00:24:26 +0200
Subject: [PATCH 1833/2254] gnome3.gnome-shell: drop caribou

This should no longer be necessary as gnome-shell ships its own on-screen
keyboard.
---
 pkgs/desktops/gnome-3/core/gnome-shell/default.nix | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
index abd467d2aa4..57fa9c967ca 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
@@ -2,7 +2,7 @@
 , python3, libsoup, polkit, clutter, networkmanager, docbook_xsl , docbook_xsl_ns, at-spi2-core
 , libstartup_notification, telepathy-glib, telepathy-logger, libXtst, unzip, glibcLocales, shared-mime-info
 , libgweather, libcanberra-gtk3, librsvg, geoclue2, perl, docbook_xml_dtd_42, desktop-file-utils
-, libpulseaudio, libical, gobject-introspection, gstreamer, wrapGAppsHook, libxslt, gcr, caribou
+, libpulseaudio, libical, gobject-introspection, gstreamer, wrapGAppsHook, libxslt, gcr
 , accountsservice, gdk-pixbuf, gdm, upower, ibus, networkmanagerapplet, libgnomekbd, gnome-desktop
 , gsettings-desktop-schemas, gnome-keyring, glib, gjs, mutter, evolution-data-server, gtk3
 , sassc, systemd, gst_all_1, adwaita-icon-theme, gnome-bluetooth, gnome-clocks, gnome-settings-daemon
@@ -29,7 +29,7 @@ in stdenv.mkDerivation rec {
     sassc desktop-file-utils libxslt.bin python3 asciidoc-full
   ];
   buildInputs = [
-    systemd caribou
+    systemd
     gsettings-desktop-schemas gnome-keyring glib gcr json-glib accountsservice
     libcroco libsecret libsoup polkit gdk-pixbuf librsvg
     clutter networkmanager libstartup_notification telepathy-glib
@@ -45,11 +45,6 @@ in stdenv.mkDerivation rec {
     # not declared at build time, but typelib is needed at runtime
     libgweather networkmanagerapplet
   ];
-  propagatedUserEnvPkgs = [
-    # Needed to support on-screen keyboard used with touch screen devices
-    # see https://github.com/NixOS/nixpkgs/issues/25968
-    caribou
-  ];
 
   patches = [
     (fetchpatch {
-- 
GitLab


From 880fab10fc8fb882d98c6087e28caad49eb64314 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Sat, 28 Sep 2019 14:01:27 +0200
Subject: [PATCH 1834/2254] gnome3.mutter: Add upstream patches before 3.34.1

Fixes some eg. animation related crashes which in particular affected
dash-to-dock.
---
 pkgs/desktops/gnome-3/core/mutter/default.nix | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix
index 6c4d7a97ba2..ce129f7537f 100644
--- a/pkgs/desktops/gnome-3/core/mutter/default.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/default.nix
@@ -59,6 +59,33 @@ stdenv.mkDerivation rec {
       url = "https://gitlab.gnome.org/GNOME/mutter/commit/850ef518795dcc20d3b9a4f661f70ff8d0ddacb2.patch";
       sha256 = "0cxdbrbcc8kfkvw7ryxjm2v1vk15jki7bawn128385r5hasabhxf";
     })
+    # fix animation related crashes: https://gitlab.gnome.org/GNOME/mutter/merge_requests/805
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/mutter/commit/63a0b702c94af013b94ad3f32a8c5ba86bf6dfba.patch";
+      sha256 = "13hvz3n275crvpankj1b47nds71c42nnbq1yx2xhhvk60qc72vh4";
+    })
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/mutter/commit/1e637bd7e1b2a4316d1cf6da80966d43819a10df.patch";
+      sha256 = "0jcx33j2sw7hva0gs0svqg69habxxmgdi0kcb07nqq2df6pb62qf";
+    })
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/mutter/commit/c9c53cb55fd6e782c50f36da1e2adbf28111a660.patch";
+      sha256 = "0iwjlbr8j0icigmilpghlkcyg4hll9dm0mcaj8lvi7qxrgjrmczr";
+    })
+    # Fix crash when pressing ctrl-super: https://gitlab.gnome.org/GNOME/mutter/issues/823
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/mutter/commit/0706e021f5bd82cf4c9b2c0d2916d272f3cba406.patch";
+      sha256 = "0i4ixr419jggrd17gxxs45jnx131lnp8wkkhhygqsrpq8941sdw6";
+    })
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/mutter/commit/76f2579e442d8ad0a3b8b644daab7c72a585506b.patch";
+      sha256 = "0c3ls624k9f4mqrrbv8ng0slvm31l0li6ciqn04qd4yi18plnldy";
+    })
+    # Avoid crashing any apps on X11 when restarting: https://gitlab.gnome.org/GNOME/mutter/merge_requests/808
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/mutter/commit/f352c3d79da99e961341c1d2b5dd334dcade0271.patch";
+      sha256 = "1drn8wjbkj903jxay5wxq163i9ahp558sjl2bc3fi1qs90xj6cn2";
+    })
    # TODO: submit upstream
    ./0001-build-use-get_pkgconfig_variable-for-sysprof-dbusdir.patch
     (substituteAll {
-- 
GitLab


From b8ab8598ed3f6d2efefc08fe908a6cce49c38974 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 29 Sep 2019 01:30:15 +0200
Subject: [PATCH 1835/2254] vte-ng: move inside termite

It is just a few patches only needed by termite. Let's not pollute our tree with it.
---
 pkgs/applications/misc/termite/default.nix | 40 +++++++++++++--
 pkgs/desktops/gnome-3/default.nix          |  2 +-
 pkgs/development/libraries/vte/ng.nix      | 59 ----------------------
 pkgs/top-level/all-packages.nix            |  2 -
 4 files changed, 38 insertions(+), 65 deletions(-)
 delete mode 100644 pkgs/development/libraries/vte/ng.nix

diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/misc/termite/default.nix
index 6a9de364446..992c1f7e223 100644
--- a/pkgs/applications/misc/termite/default.nix
+++ b/pkgs/applications/misc/termite/default.nix
@@ -1,6 +1,40 @@
-{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, vte-ng, gtk3, ncurses, wrapGAppsHook }:
+{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, vte, gtk3, ncurses, pcre2, wrapGAppsHook }:
 
-stdenv.mkDerivation rec {
+let
+
+  # termite requires VTE with some internals exposed
+  # https://github.com/thestinger/vte-ng
+  vte-ng =  vte.overrideAttrs (attrs: {
+    patches = attrs.patches or [] ++ [
+      (fetchpatch {
+        name = "0001-expose-functions-for-pausing-unpausing-output.patch";
+        url = "https://github.com/thestinger/vte-ng/commit/342e26574f50dcd40bbeaad9e839c2a6144d0c1c.patch";
+        sha256 = "1b0k9ys545q85vfki417p21kis9f36yd0hyp12phayynss6fn715";
+      })
+      (fetchpatch {
+        name = "0002-expose-function-for-setting-cursor-position.patch";
+        url = "https://github.com/thestinger/vte-ng/commit/5ae3acb69474fe5bc43767a4a3625e9ed23607a1.patch";
+        sha256 = "091sb44g2pl0zbxnxidpfmsqqc65dmkakhjb0wvlnsjckqalhs89";
+      })
+      (fetchpatch {
+        name = "0003-add-function-for-setting-the-text-selections.patch";
+        url = "https://github.com/thestinger/vte-ng/commit/742d57ecf15e24f6a5f2133a81b6c70acc8ff03c.patch";
+        sha256 = "12rq3svbj1nzridbssxsvmmb8njky3w8qdnkymz7850b3kqg277x";
+      })
+      (fetchpatch {
+        name = "0004-add-functions-to-get-set-block-selection-mode.patch";
+        url = "https://github.com/thestinger/vte-ng/commit/08748fd9cb82bd191e5c476b1682ca71f7732572.patch";
+        sha256 = "1cnhd8f7ywdgcyd6xmcd2nn39jjxzkxp4d0zsj2k7m5v74nhcs1g";
+      })
+      (fetchpatch {
+        name = "0005-expose-function-for-getting-the-selected-text.patch";
+        url = "https://github.com/thestinger/vte-ng/commit/dd74ae7c06e8888af2fc090ac6f8920a9d8227fb.patch";
+        sha256 = "0pbnbkwqxm4p9xsgvqwayvh8srk5z1kyjnigmahf9mlqn7hi6v27";
+      })
+    ];
+  });
+
+in stdenv.mkDerivation rec {
   pname = "termite";
   version = "15";
 
@@ -24,7 +58,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "VERSION=v${version}" "PREFIX=" "DESTDIR=$(out)" ];
 
-  buildInputs = [ vte-ng gtk3 ncurses ];
+  buildInputs = [ vte-ng gtk3 ncurses pcre2 ];
 
   nativeBuildInputs = [ wrapGAppsHook pkgconfig ];
 
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index d2a377d084e..017ced6c98b 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -338,7 +338,7 @@ lib.makeScope pkgs.newScope (self: with self; {
   inherit (pkgs) atk glib gobject-introspection gspell webkitgtk gtk3 gtkmm3
       libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceviewmm gtksourceview4
       easytag meld orca rhythmbox shotwell gnome-usage
-      clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee geocode-glib libgweather librest libzapojit libmediaart gfbgraph gexiv2 folks totem-pl-parser gcr gsound libgnomekbd vte vte_290 vte-ng gnome-menus gdl;
+      clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee geocode-glib libgweather librest libzapojit libmediaart gfbgraph gexiv2 folks totem-pl-parser gcr gsound libgnomekbd vte vte_290 gnome-menus gdl;
   inherit (pkgs) gsettings-desktop-schemas; # added 2019-04-16
   inherit (pkgs) gnome-video-effects; # added 2019-08-19
   inherit (pkgs) gnome-online-accounts grilo grilo-plugins tracker tracker-miners gnome-photos; # added 2019-08-23
diff --git a/pkgs/development/libraries/vte/ng.nix b/pkgs/development/libraries/vte/ng.nix
deleted file mode 100644
index af4fe76840f..00000000000
--- a/pkgs/development/libraries/vte/ng.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{ vte, fetchFromGitHub, fetchpatch, autoconf, automake, gtk-doc, gettext, libtool, gperf
-, stdenv, fetchurl, intltool, pkgconfig
-, gnome3, glib, gtk3, ncurses, gobject-introspection, vala, libxml2, gnutls
-, pcre2
-}:
-
-stdenv.mkDerivation rec {
-  name = "vte-ng-${version}";
-  version = "0.54.2.a";
-
-  src = fetchFromGitHub {
-    owner = "thestinger";
-    repo = "vte-ng";
-    rev = version;
-    sha256 = "1r7d9m07cpdr4f7rw3yx33hmp4jmsk0dn5byq5wgksb2qjbc4ags";
-  };
-
-  patches = [
-    # Fix build with vala 0.44
-    # See: https://github.com/thestinger/vte-ng/issues/32
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/vte/commit/53690d5cee51bdb7c3f7680d3c22b316b1086f2c.patch";
-      sha256 = "1jrpqsx5hqa01g7cfqrsns6vz51mwyqwdp43ifcpkhz3wlp5dy66";
-    })
-  ];
-
-  nativeBuildInputs = [
-    gtk-doc autoconf automake gettext libtool gperf
-    gobject-introspection intltool pkgconfig vala gperf libxml2
-  ];
-  buildInputs = [ glib gtk3 ncurses ];
-
-  propagatedBuildInputs = [
-    # Required by vte-2.91.pc.
-    gtk3
-    gnutls
-    pcre2
-  ];
-
-  preConfigure = "patchShebangs .; NOCONFIGURE=1 ./autogen.sh";
-
-  configureFlags = [ "--enable-introspection" "--disable-Bsymbolic" ];
-
-  meta = with stdenv.lib; {
-    homepage = https://www.gnome.org/;
-    description = "A library implementing a terminal emulator widget for GTK";
-    longDescription = ''
-      VTE is a library (libvte) implementing a terminal emulator widget for
-      GTK, and a minimal sample application (vte) using that.  Vte is
-      mainly used in gnome-terminal, but can also be used to embed a
-      console/terminal in games, editors, IDEs, etc. VTE supports Unicode and
-      character set conversion, as well as emulating any terminal known to
-      the system's terminfo database.
-    '';
-    license = licenses.lgpl2;
-    maintainers = with maintainers; [ astsmtl antono lethalman ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0bca4e145f7..076dfc60360 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14035,8 +14035,6 @@ in
 
   vte_290 = callPackage ../development/libraries/vte/2.90.nix { };
 
-  vte-ng = callPackage ../development/libraries/vte/ng.nix { };
-
   vtk = callPackage ../development/libraries/vtk {
     inherit (darwin) libobjc;
     inherit (darwin.apple_sdk.libs) xpc;
-- 
GitLab


From 1c5db6535d4eb19378175b7328eaec3f881ded88 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 29 Sep 2019 02:00:18 +0200
Subject: [PATCH 1836/2254] gnome3.seahorse: fix build with recent libsecret

---
 pkgs/desktops/gnome-3/apps/seahorse/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/apps/seahorse/default.nix
index a1bcb406eb3..670cbabf362 100644
--- a/pkgs/desktops/gnome-3/apps/seahorse/default.nix
+++ b/pkgs/desktops/gnome-3/apps/seahorse/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, vala, meson, ninja, libpwquality
+{ stdenv, fetchurl, fetchpatch, vala, meson, ninja, libpwquality
 , pkgconfig, gtk3, glib, gobject-introspection
 , wrapGAppsHook, itstool, gnupg, libsoup
 , gnome3, gpgme, python3, openldap, gcr
@@ -13,6 +13,15 @@ stdenv.mkDerivation rec {
     sha256 = "0d8zdzmlz7fjv9xl20zl4ckidf465mvdjnbpxy3k08y9iw423q4x";
   };
 
+  patches = [
+    # fix build with recent libsecret
+    # https://gitlab.gnome.org/GNOME/seahorse/merge_requests/83
+    (fetchpatch {
+      url = https://gitlab.gnome.org/GNOME/seahorse/commit/d9db29db567012b7c72e85e1be1fbf55fcc9b667.patch;
+      sha256 = "004zgs0n0hfc4yfmiy9lj37d67m7wxdf42sf7bzn2c3hcvpl0rcj";
+    })
+  ];
+
   doCheck = true;
 
   nativeBuildInputs = [
-- 
GitLab


From 44069671ebf6c186a7881648da3022f82d7ccf7a Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 29 Sep 2019 05:13:14 +0200
Subject: [PATCH 1837/2254] grilo-plugins: build grl-bookmarks

Totem asks after it.
---
 pkgs/development/libraries/grilo-plugins/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/grilo-plugins/default.nix b/pkgs/development/libraries/grilo-plugins/default.nix
index 435da107fcb..3f6ab858c23 100644
--- a/pkgs/development/libraries/grilo-plugins/default.nix
+++ b/pkgs/development/libraries/grilo-plugins/default.nix
@@ -18,6 +18,7 @@
 , grilo
 , gnome-online-accounts
 , gmime
+, gom
 , json-glib
 , avahi
 , tracker
@@ -57,6 +58,7 @@ stdenv.mkDerivation rec {
     libarchive
     libsoup
     gmime
+    gom
     json-glib
     avahi
     libmediaart
-- 
GitLab


From 6d88a57efe6adf8986b0faee4cf9f200f92bb5ab Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sun, 29 Sep 2019 05:38:41 -0400
Subject: [PATCH 1838/2254] gnome3.evolution: fix FHS paths

This includes commands to spamassassin, sa-learn, bogofilter
and the prefix to openldap
---
 pkgs/desktops/gnome-3/apps/evolution/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix
index 71bec860384..8085b2a824a 100644
--- a/pkgs/desktops/gnome-3/apps/evolution/default.nix
+++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix
@@ -38,6 +38,7 @@
 , procps
 , p11-kit
 , openldap
+, spamassassin
 }:
 
 stdenv.mkDerivation rec {
@@ -102,6 +103,10 @@ stdenv.mkDerivation rec {
     "-DENABLE_LIBCRYPTUI=OFF"
     "-DENABLE_PST_IMPORT=OFF"
     "-DENABLE_YTNEF=OFF"
+    "-DWITH_SPAMASSASSIN=${spamassassin}/bin/spamassassin"
+    "-DWITH_SA_LEARN=${spamassassin}/bin/sa-learn"
+    "-DWITH_BOGOFILTER=${bogofilter}/bin/bogofilter"
+    "-DWITH_OPENLDAP=${openldap}"
   ];
 
   requiredSystemFeatures = [
-- 
GitLab


From a631d57c7916a8aba1c0f0bf84665c4ac122e72d Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sun, 29 Sep 2019 06:57:53 -0400
Subject: [PATCH 1839/2254] pantheon.wingpanel-indicator-datetime: use older
 e-s-d

Workaround https://github.com/elementary/wingpanel-indicator-datetime/issues/122
Revert once resolved upstream.
---
 .../wingpanel-indicators/datetime/default.nix   | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
index 74408a4ed6d..74542b5c4c4 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
@@ -18,8 +18,23 @@
 , elementary-calendar
 , elementary-icon-theme
 , wrapGAppsHook
+, fetchurl
 }:
 
+let
+
+  # Terrible workaround https://github.com/elementary/wingpanel-indicator-datetime/issues/122
+  # Evolution Data Server functionality will be broken (events from calendar in indicator)
+  # but at least we don't fail to build.
+  old-evolution-data-server = evolution-data-server.overrideAttrs(old: {
+    src = fetchurl {
+      url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor "3.32.4"}/${old.pname}-3.32.4.tar.xz";
+      sha256 = "0zsc9xwy6ixk3x0dx69ax5isrdw8qxjdxg2i5fr95s40nss7rxl3";
+    };
+  });
+
+in
+
 stdenv.mkDerivation rec {
   pname = "wingpanel-indicator-datetime";
   version = "2.1.3";
@@ -49,7 +64,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     elementary-icon-theme
-    evolution-data-server
+    old-evolution-data-server
     granite
     gtk3
     libgee
-- 
GitLab


From 0038189df8e1cc4138d88f4108340cd82cfe0d5e Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 29 Sep 2019 13:48:21 +0200
Subject: [PATCH 1840/2254] grilo-plugins: add grl-chromaprint

---
 .../chromaprint-gst-plugins.patch              | 13 +++++++++++++
 .../libraries/grilo-plugins/default.nix        | 18 ++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/libraries/grilo-plugins/chromaprint-gst-plugins.patch

diff --git a/pkgs/development/libraries/grilo-plugins/chromaprint-gst-plugins.patch b/pkgs/development/libraries/grilo-plugins/chromaprint-gst-plugins.patch
new file mode 100644
index 00000000000..cb6a1a35494
--- /dev/null
+++ b/pkgs/development/libraries/grilo-plugins/chromaprint-gst-plugins.patch
@@ -0,0 +1,13 @@
+diff --git a/src/chromaprint/grl-chromaprint.c b/src/chromaprint/grl-chromaprint.c
+index 5a3598b..8979291 100644
+--- a/src/chromaprint/grl-chromaprint.c
++++ b/src/chromaprint/grl-chromaprint.c
+@@ -111,6 +111,8 @@
+ 
+   gst_init (NULL, NULL);
+ 
++  @load_plugins@
++
+   source = grl_chromaprint_source_new ();
+   grl_registry_register_source (registry,
+                                 plugin,
diff --git a/pkgs/development/libraries/grilo-plugins/default.nix b/pkgs/development/libraries/grilo-plugins/default.nix
index 3f6ab858c23..ddf29c2dcd8 100644
--- a/pkgs/development/libraries/grilo-plugins/default.nix
+++ b/pkgs/development/libraries/grilo-plugins/default.nix
@@ -1,5 +1,6 @@
 { stdenv
 , fetchurl
+, substituteAll
 , meson
 , ninja
 , pkgconfig
@@ -16,6 +17,7 @@
 , libgdata
 , libmediaart
 , grilo
+, gst_all_1
 , gnome-online-accounts
 , gmime
 , gom
@@ -36,6 +38,21 @@ stdenv.mkDerivation rec {
     sha256 = "0jldaixc4kzycn5v8ixkjld1n0z3dp0l1p3vchgdwpvdvc7kcfw0";
   };
 
+  patches = [
+    # grl-chromaprint requires the following GStreamer elements:
+    # * fakesink (gstreamer)
+    # * playbin (gst-plugins-base)
+    # * chromaprint (gst-plugins-bad)
+    (substituteAll {
+      src = ./chromaprint-gst-plugins.patch;
+      load_plugins = stdenv.lib.concatMapStrings (plugin: ''gst_registry_scan_path(gst_registry_get(), "${plugin}/lib/gstreamer-1.0");'') (with gst_all_1; [
+        gstreamer
+        gst-plugins-base
+        gst-plugins-bad
+      ]);
+    })
+  ];
+
   nativeBuildInputs = [
     meson
     ninja
@@ -64,6 +81,7 @@ stdenv.mkDerivation rec {
     libmediaart
     tracker
     dleyna-server
+    gst_all_1.gstreamer
   ];
 
   passthru = {
-- 
GitLab


From 4b3942b75ab64fb46a3cedc62556ac3fb153c72b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Sun, 29 Sep 2019 15:34:34 +0200
Subject: [PATCH 1841/2254] gnomeExtensions.dash-to-dock: 66 -> 20190921

There's still no official release for gnome-3.34
---
 pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix b/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix
index e80149e5005..1f09afc52c4 100644
--- a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix
@@ -2,13 +2,14 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-dash-to-dock";
-  version = "66";
+  version = "20190921";
 
   src = fetchFromGitHub {
     owner = "micheleg";
     repo = "dash-to-dock";
-    rev = "extensions.gnome.org-v" + version;
-    sha256 = "04krl6rxlp1qc97psraf2kwin7h0mx4c7pnfpi7vhplmvasrwkfh";
+    # rev = "extensions.gnome.org-v" + version;
+    rev = "d918d29a6afced8823dc954a4317988b79aad6b8";
+    sha256 = "1wlmbcn8zs8xiyxhgdcbnf2igjsjg0bkcsvjpy8fk13fxshxsqx6";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From 7543b25e3746c7e2880f5cebeb8f1ff0be02bef6 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Mon, 30 Sep 2019 11:02:01 -0400
Subject: [PATCH 1842/2254] libproxy: build with spidermonkey_60

---
 .../libraries/libproxy/default.nix            | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix
index 773acd03535..c9b08079c38 100644
--- a/pkgs/development/libraries/libproxy/default.nix
+++ b/pkgs/development/libraries/libproxy/default.nix
@@ -6,7 +6,7 @@
 , fetchpatch
 , dbus
 , networkmanager
-, spidermonkey_38
+, spidermonkey_60
 , pcre
 , gsettings-desktop-schemas
 , glib
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
     JavaScriptCore
   ] else [
     glib
-    spidermonkey_38
+    spidermonkey_60
     dbus
     networkmanager
   ]);
@@ -59,7 +59,21 @@ stdenv.mkDerivation rec {
     "-DPYTHON3_SITEPKG_DIR=${placeholder "py3"}/${python3.sitePackages}"
   ];
 
-  patches = stdenv.lib.optionals stdenv.isDarwin [
+  patches = [
+    # Make build with spidermonkey_60
+    (fetchpatch {
+      url = "https://github.com/libproxy/libproxy/pull/86.patch";
+      sha256 = "17c06ilinrnzr7xnnmw9pc6zrncyaxcdd6r6k1ah5p156skbykfs";
+    })
+    (fetchpatch {
+      url = "https://github.com/libproxy/libproxy/pull/87.patch";
+      sha256 = "0sagzfwm16f33inbkwsp88w9wmrd034rjmw0y8d122f7k1qfx6zc";
+    })
+    (fetchpatch {
+      url = "https://github.com/libproxy/libproxy/pull/95.patch";
+      sha256 = "18vyr6wlis9zfwml86606jpgb9mss01l9aj31iiciml8p857aixi";
+    })
+  ] ++ stdenv.lib.optionals stdenv.isDarwin [
     (fetchpatch {
       url = "https://github.com/libproxy/libproxy/commit/44158f03f8522116758d335688ed840dfcb50ac8.patch";
       sha256 = "0axfvb6j7gcys6fkwi9dkn006imhvm3kqr83gpwban8419n0q5v1";
-- 
GitLab


From 04b726c032af4c2a8ba9fe0113ff8b25da308b72 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 1 Oct 2019 00:37:57 -0400
Subject: [PATCH 1843/2254] gnome3.evince: 3.32.0 -> 3.34.0

---
 pkgs/desktops/gnome-3/core/evince/default.nix | 69 +++++++++----------
 1 file changed, 34 insertions(+), 35 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix
index 9313ca8990c..ee4e619332c 100644
--- a/pkgs/desktops/gnome-3/core/evince/default.nix
+++ b/pkgs/desktops/gnome-3/core/evince/default.nix
@@ -1,6 +1,5 @@
-{ fetchFromGitLab
-, stdenv
-, fetchpatch
+{ stdenv
+, fetchFromGitLab
 , meson
 , ninja
 , pkgconfig
@@ -34,6 +33,9 @@
 , texlive
 , t1lib
 , gst_all_1
+, gtk-doc
+, docbook-xsl-nons
+, docbook_xml_dtd_43
 , supportMultimedia ? true # PDF multimedia
 , libgxps
 , supportXPS ? true # Open XML Paper Specification via libgxps
@@ -41,64 +43,62 @@
 
 stdenv.mkDerivation rec {
   pname = "evince";
-  version = "3.32.0";
+  version = "3.34.0";
 
+  outputs = [ "out" "dev" "devdoc" ];
+
+  # meson.build not distributed
+  # See: https://gitlab.gnome.org/GNOME/evince/issues/1270
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "GNOME";
     repo = pname;
     rev = version;
-    sha256 = "1klq8j70q8r8hyqv1wi6jcx8g76yh46bh8614y82zzggn4cx6y3r";
+    sha256 = "0kjylhlkadi89w3p9afzl69jpd9gryk21sm1g89a0y2pkwz181qr";
   };
 
-
-  patches = [
-    (fetchpatch {
-      name = "CVE-2019-11459.patch";
-      url = "https://gitlab.gnome.org/GNOME/evince/commit/3e38d5ad724a042eebadcba8c2d57b0f48b7a8c7.patch";
-      sha256 = "1ds6iwr2r9i86nwrly8cx7p1kbvf1gljjplcffa67znxqmwx4n74";
-    })
-  ];
-
   postPatch = ''
     chmod +x meson_post_install.py
     patchShebangs meson_post_install.py
   '';
 
   nativeBuildInputs = [
+    appstream
+    docbook-xsl-nons
+    docbook_xml_dtd_43
+    gettext
+    gobject-introspection
+    gtk-doc
+    itstool
     meson
     ninja
     pkgconfig
-    gobject-introspection
-    gettext
-    itstool
-    yelp-tools
-    appstream
-    wrapGAppsHook
     python3
+    wrapGAppsHook
+    yelp-tools
   ];
 
   buildInputs = [
-    glib
-    gtk3
-    pango
+    adwaita-icon-theme
     atk
+    dbus # only needed to find the service directory
+    djvulibre
     gdk-pixbuf
-    libxml2
-    gsettings-desktop-schemas
-    poppler
     ghostscriptX
-    djvulibre
-    libspectre
+    glib
+    gnome-desktop
+    gsettings-desktop-schemas
+    gspell
+    gtk3
     libarchive
-    libsecret
     librsvg
-    adwaita-icon-theme
-    gspell
-    gnome-desktop
-    dbus # only needed to find the service directory
-    texlive.bin.core # kpathsea for DVI support
+    libsecret
+    libspectre
+    libxml2
+    pango
+    poppler
     t1lib
+    texlive.bin.core # kpathsea for DVI support
   ] ++ stdenv.lib.optional supportXPS libgxps
     ++ stdenv.lib.optionals supportMultimedia (with gst_all_1; [
       gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav ]);
@@ -106,7 +106,6 @@ stdenv.mkDerivation rec {
   mesonFlags = [
     "-Dnautilus=false"
     "-Dps=enabled"
-    "-Dgtk_doc=false"
   ];
 
   NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
-- 
GitLab


From fa8b4eec80d5d890cfc741790ce465c9d36156c4 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 1 Oct 2019 00:41:54 -0400
Subject: [PATCH 1844/2254] gnome3.gnome-keyring: 3.31.91 -> 3.34.0

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

diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
index 7817936bfda..fa960087f9b 100644
--- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-keyring";
-  version = "3.31.91";
+  version = "3.34.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-keyring/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1fjylqw4xp0rqsylq4gbxzw1sql2sy55h1mnz1pprrxb9py0mnd4";
+    sha256 = "0hqrsh5g9q9lm190f0m85q4nki8k4ng7wphl6qbccdry59aakkg9";
   };
 
   outputs = [ "out" "dev" ];
-- 
GitLab


From fe24628a26e203e4c94147234b27df81496f6e12 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 26 Aug 2019 11:05:40 -0700
Subject: [PATCH 1845/2254] git-up: 1.4.2 -> 1.6.1

---
 .../version-management/git-up/default.nix     | 20 +++++++++----------
 pkgs/top-level/all-packages.nix               |  4 +++-
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/version-management/git-up/default.nix b/pkgs/applications/version-management/git-up/default.nix
index ba0625c433d..5812ff8c1d1 100644
--- a/pkgs/applications/version-management/git-up/default.nix
+++ b/pkgs/applications/version-management/git-up/default.nix
@@ -1,17 +1,18 @@
-{ stdenv, fetchurl, python2Packages, git }:
+{ stdenv, fetchurl, pythonPackages, git }:
 
-python2Packages.buildPythonApplication rec {
-  version = "1.4.2";
+pythonPackages.buildPythonApplication rec {
   pname = "git-up";
+  version = "1.6.1";
 
-  src = fetchurl {
-    url = "mirror://pypi/g/git-up/${pname}-${version}.zip";
-    sha256 = "121ia5gyjy7js6fbsx9z98j2qpq7rzwpsj8gnfvsbz2d69g0vl7q";
+  src = pythonPackages.fetchPypi {
+    inherit pname version;
+    sha256 = "0gs791yb0cndg9879vayvcj329jwhzpk6wrf9ri12l5hg8g490za";
   };
 
-  buildInputs = [ git ] ++ (with python2Packages; [ nose ]);
-  propagatedBuildInputs = with python2Packages; [ click colorama docopt GitPython six termcolor ];
+  # git should be on path for tool to work correctly
+  propagatedBuildInputs = [ git ] ++ (with pythonPackages; [ click colorama docopt GitPython six termcolor ]);
 
+  checkInputs = [ git pythonPackages.nose ]; # git needs to be on path
   # 1. git fails to run as it cannot detect the email address, so we set it
   # 2. $HOME is by default not a valid dir, so we have to set that too
   # https://github.com/NixOS/nixpkgs/issues/12591
@@ -22,7 +23,7 @@ python2Packages.buildPythonApplication rec {
     '';
 
   postInstall = ''
-    rm -r $out/${python2Packages.python.sitePackages}/PyGitUp/tests
+    rm -r $out/${pythonPackages.python.sitePackages}/PyGitUp/tests
   '';
 
   meta = with stdenv.lib; {
@@ -31,6 +32,5 @@ python2Packages.buildPythonApplication rec {
     license = licenses.mit;
     maintainers = with maintainers; [ peterhoeg ];
     platforms = platforms.all;
-    broken = true; # Incompatible with Git 2.15 object store.
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 29951a033fa..26677b1d235 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3380,7 +3380,9 @@ in
 
   git-sizer = callPackage ../applications/version-management/git-sizer { };
 
-  git-up = callPackage ../applications/version-management/git-up { };
+  git-up = callPackage ../applications/version-management/git-up {
+    pythonPackages = python3Packages;
+  };
 
   gitfs = callPackage ../tools/filesystems/gitfs { };
 
-- 
GitLab


From 0cd88820b3f68129fda7f5207fbbc0cda7ce0684 Mon Sep 17 00:00:00 2001
From: mb <mb@codemonkey.cc>
Date: Sat, 21 Sep 2019 13:00:28 +0200
Subject: [PATCH 1846/2254] rocksdb: 6.2.2 -> 6.2.4

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

diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix
index 1b6b5b1b57b..4f49e015852 100644
--- a/pkgs/development/libraries/rocksdb/default.nix
+++ b/pkgs/development/libraries/rocksdb/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "rocksdb";
-  version = "6.2.2";
+  version = "6.2.4";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0wz9rfj8gk6gyabh9anl67fqm5dw2z866y1a0k0j2lmcaag537r2";
+    sha256 = "08077agbimm7738xrknkw6fjw9f8jv6x3igp8b5pmsj9l954ywma";
   };
 
   nativeBuildInputs = [ cmake ];
-- 
GitLab


From 89895a609f22d0236ec0ecd972f9efd5c4aba58c Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@gmail.com>
Date: Thu, 12 Sep 2019 22:14:42 +0300
Subject: [PATCH 1847/2254] qmapshack: 1.13.1 -> 1.13.2

---
 pkgs/applications/misc/qmapshack/default.nix | 34 ++++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/misc/qmapshack/default.nix b/pkgs/applications/misc/qmapshack/default.nix
index 335c583998f..a12736b5a60 100644
--- a/pkgs/applications/misc/qmapshack/default.nix
+++ b/pkgs/applications/misc/qmapshack/default.nix
@@ -1,12 +1,18 @@
-{ mkDerivation, lib, fetchurl, fetchpatch, cmake, qtscript, qtwebengine, gdal, proj, routino, quazip }:
+{ mkDerivation, lib, fetchFromGitHub, cmake
+, qtscript, qtwebengine, gdal, proj, routino, quazip }:
 
 mkDerivation rec {
   pname = "qmapshack";
-  version = "1.13.1";
-
-  src = fetchurl {
-    url = "https://bitbucket.org/maproom/qmapshack/downloads/${pname}-${version}.tar.gz";
-    sha256 = "15x1b2q0hr1vx006f9hjc4cvfjvxvfdwybw32qvczdyc3crq0mc9";
+  version = "1.13.2";
+
+  src = fetchFromGitHub {
+    owner = "Maproom";
+    repo = pname;
+    # TODO: remove it on next release.
+    # 1.13.2 release tarball is essentially broken, use fixed commit instead.
+    # See https://github.com/maproom/qmapshack/pull/4 for more details.
+    rev = "763cfc149566325cce9e4690cb7b5f986048f86a"; #"V_${version}";
+    sha256 = "1lfivhm9rv9ly1srlmb7d80s77306xplg23lx35vav879bri29rx";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -22,21 +28,15 @@ mkDerivation rec {
   enableParallelBuilding = true;
 
   patches = [
-    (fetchpatch {
-      url = "https://bitbucket.org/maproom/qmapshack/raw/d0b1b595578a83fda981ccc1ff24166fa636ba1d/FindPROJ4.patch";
-      sha256 = "1nx4ax233bnnj478cmjpm5c1qqmyn1navlihf10q6hhbanay9n99";
-    })
-    (fetchpatch {
-      url = "https://bitbucket.org/maproom/qmapshack/raw/d0b1b595578a83fda981ccc1ff24166fa636ba1d/FindQuaZip5.patch";
-      sha256 = "0z1b2dz2zlz685mxgn8bmh1fyhxpf6dzd6jvkkjyk2kvnrdxv3b9";
-    })
+    "${src}/FindPROJ4.patch"
+    "${src}/FindQuaZip5.patch"
   ];
 
   meta = with lib; {
-    homepage = https://bitbucket.org/maproom/qmapshack/wiki/Home;
-    description = "Plan your next outdoor trip";
+    homepage = https://github.com/Maproom/qmapshack;
+    description = "Consumer grade GIS software";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ dotlambda ];
+    maintainers = with maintainers; [ dotlambda sikmir ];
     platforms = with platforms; linux;
   };
 }
-- 
GitLab


From 45a9542a37315f3857f1d1e2a0e886a3218d54d7 Mon Sep 17 00:00:00 2001
From: Trolli Schmittlauch <t.schmittlauch+nixos@orlives.de>
Date: Thu, 3 Oct 2019 00:41:33 +0200
Subject: [PATCH 1848/2254] corebird: move deprecation warning to aliases and
 release notes

---
 nixos/doc/manual/release-notes/rl-1909.xml | 6 ++++++
 pkgs/top-level/aliases.nix                 | 1 +
 pkgs/top-level/all-packages.nix            | 2 --
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
index e4dcc90cdd3..f42471c5969 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -513,6 +513,12 @@
        must be owned by either <literal>root</literal> or the user specified in <option>services.gitlab.user</option>.
      </para>
    </listitem>
+   <listitem>
+     <para>
+       The Twitter client <literal>corebird</literal> has been dropped as <link xlink:href="https://www.patreon.com/posts/corebirds-future-18921328">it is discontinued and does not work against the new Twitter API</link>.
+       Please use the fork <literal>cawbird</literal> instead which has been adapted to the API changes and is still maintained.
+     </para>
+   </listitem>
   </itemizedlist>
  </section>
 
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index a6b4c2db0f8..091824a5239 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -67,6 +67,7 @@ mapAliases ({
   compton-git = compton; # added 2019-05-20
   conntrack_tools = conntrack-tools; # added 2018-05
   cool-old-term = cool-retro-term; # added 2015-01-31
+  corebird = throw "deprecated 2019-10-02: See https://www.patreon.com/posts/corebirds-future-18921328. Please use Cawbird as replacement.";
   cpp-gsl = microsoft_gsl; # added 2019-05-24
   cupsBjnp = cups-bjnp; # added 2016-01-02
   cups_filters = cups-filters; # added 2016-08
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 26677b1d235..8d4278426e7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1381,8 +1381,6 @@ in
 
   copyright-update = callPackage ../tools/text/copyright-update { };
 
-  corebird = throw "corebird has been discontinued, use cawbird instead";
-
   inherit (callPackage ../tools/misc/coreboot-utils { })
     msrtool
     cbmem
-- 
GitLab


From 3dc58eda52ef935313cd0418264abd1d30d6b4d3 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Wed, 2 Oct 2019 19:29:05 -0400
Subject: [PATCH 1849/2254] cawbird: fix build with vala 0.46

---
 pkgs/applications/networking/cawbird/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/cawbird/default.nix b/pkgs/applications/networking/cawbird/default.nix
index edcf9b2846e..51657659b95 100644
--- a/pkgs/applications/networking/cawbird/default.nix
+++ b/pkgs/applications/networking/cawbird/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, glib, gtk3, json-glib, sqlite, libsoup, gettext, vala
 , meson, ninja, pkgconfig, gnome3, gst_all_1, wrapGAppsHook, gobject-introspection
-, glib-networking, python3 }:
+, glib-networking, python3, fetchpatch }:
 
 stdenv.mkDerivation rec {
   version = "1.0.1";
@@ -22,6 +22,14 @@ stdenv.mkDerivation rec {
     glib gtk3 json-glib sqlite libsoup gettext gnome3.dconf gnome3.gspell glib-networking
   ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-bad (gst-plugins-good.override { gtkSupport = true; }) gst-libav ]);
 
+  patches = [
+    # Fix build with vala 0.46
+    (fetchpatch {
+      url = "https://github.com/IBBoard/cawbird/commit/7b88f8856d108b9555ba7b855c7daed7b9e745ca.patch";
+      sha256 = "10kfdy91yas4xyz0hd057q6nsqfrkljcj7pql81xgm43qaff31y0";
+    })
+  ];
+
   postPatch = ''
     chmod +x data/meson_post_install.py # patchShebangs requires executable file
     patchShebangs data/meson_post_install.py
-- 
GitLab


From 770d7f46b9004bf838074ab6b1020e3d060fed2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Wed, 2 Oct 2019 19:37:42 +0200
Subject: [PATCH 1850/2254] python3Packages.preshed: 2.0.1 -> 3.0.2

---
 pkgs/development/python-modules/preshed/default.nix | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/preshed/default.nix b/pkgs/development/python-modules/preshed/default.nix
index 287b1294b5f..60f551bec16 100644
--- a/pkgs/development/python-modules/preshed/default.nix
+++ b/pkgs/development/python-modules/preshed/default.nix
@@ -1,6 +1,7 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
+, murmurhash
 , pytest
 , cython
 , cymem
@@ -8,27 +9,23 @@
 }:
 buildPythonPackage rec {
   pname = "preshed";
-  version = "2.0.1";
+  version = "3.0.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1rd943zp4gyspajqm5qxzndxziyh51grx0zcw23w8r9r65s1rq6s";
+    sha256 = "1jrnci1pw9yv7j1a9b2q6c955l3gb8fv1q4d0id6s7bwr5l39mv1";
   };
 
   propagatedBuildInputs = [
    cython
    cymem
+   murmurhash
   ];
 
-  buildInputs = [
+  checkInputs = [
     pytest
   ];
 
-  prePatch = ''
-    substituteInPlace setup.py \
-      --replace "wheel>=0.32.0,<0.33.0" "wheel>=0.31.0"
-  '';
-
   checkPhase = ''
     ${python.interpreter} setup.py test
   '';
-- 
GitLab


From bff5f0bbb11080e334e89f1a3e6f1881e7d80542 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Wed, 2 Oct 2019 19:40:01 +0200
Subject: [PATCH 1851/2254] python3Packages.thinc: 7.1.0 -> 7.1.1

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

diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix
index 83c9d8f81b2..a9d1cdee257 100644
--- a/pkgs/development/python-modules/thinc/default.nix
+++ b/pkgs/development/python-modules/thinc/default.nix
@@ -28,11 +28,11 @@
 
 buildPythonPackage rec {
   pname = "thinc";
-  version = "7.1.0";
+  version = "7.1.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0j2nfzz154j9331gzwa5rmc2f5ljjan728rhgsx6c7jwg323mmsa";
+    sha256 = "0gkz4q53ps3vzz0ww154y0dv6nri5sli8yflh7c26maawvz8wiv8";
   };
 
   buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
-- 
GitLab


From 44919589222535e27c5a1fc14dad435389887d63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Wed, 2 Oct 2019 19:58:36 +0200
Subject: [PATCH 1852/2254] python3Packages.spacy: 2.1.8 -> 2.2.0

Changelog:
https://github.com/explosion/spaCy/releases/tag/v2.2.0
---
 pkgs/development/python-modules/spacy/default.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix
index a37f7548219..de0701430fa 100644
--- a/pkgs/development/python-modules/spacy/default.nix
+++ b/pkgs/development/python-modules/spacy/default.nix
@@ -26,18 +26,16 @@
 
 buildPythonPackage rec {
   pname = "spacy";
-  version = "2.1.8";
+  version = "2.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1dja0crbai2n1l19m0hkv2fkj9r6zzy5ijd6dffp60v7lrch8lcw";
+    sha256 = "1cfgp3qnwcyiz5hs0i920aidz12j0iaargrfgf69fc6pc0n3a899";
   };
 
   prePatch = ''
-    substituteInPlace setup.py \
-      --replace "plac<1.0.0,>=0.9.6" "plac>=0.9.6" \
-      --replace "thinc>=7.0.8,<7.1.0" "thinc>=7.0.8" \
-      --replace "blis>=0.2.2,<0.3.0" "blis>=0.2.2"
+    substituteInPlace setup.cfg \
+      --replace "plac<1.0.0,>=0.9.6" "plac>=0.9.6"
   '';
 
   propagatedBuildInputs = [
-- 
GitLab


From c4fdb91a0b6210152bc7bf0f88f8419f714619c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Wed, 2 Oct 2019 20:09:24 +0200
Subject: [PATCH 1853/2254] python3Packages.spacy_models: update for spaCy
 2.2.0 compatibility

---
 .../python-modules/spacy/models.json          | 60 +++++++++----------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/pkgs/development/python-modules/spacy/models.json b/pkgs/development/python-modules/spacy/models.json
index d8078c116c2..8e2ab20175d 100644
--- a/pkgs/development/python-modules/spacy/models.json
+++ b/pkgs/development/python-modules/spacy/models.json
@@ -1,43 +1,43 @@
 [{
   "pname": "de_core_news_md",
-  "version": "2.1.0",
-  "sha256": "0q1flyrp2n8ja11kdlw6x1k0gll0r096pxy8ba4xv15hjng2zay1",
+  "version": "2.2.0",
+  "sha256": "1n61jg0mxpl5mqpydclq9d2xds14v0blnb0plmnf7qhzzfhrmxq9",
   "license": "cc-by-sa-40"
 },
 {
   "pname": "de_core_news_sm",
-  "version": "2.1.0",
-  "sha256": "0fj4dqa915i6niyskxmw2318fxzjhgdjhjx79h9cpp4mxw719w95",
+  "version": "2.2.0",
+  "sha256": "06g2snm57k64il3plgn20l27a00dsr9dcxkyyqj6pq5ih91mfycb",
   "license": "cc-by-sa-40"
 },
 {
   "pname": "el_core_news_md",
-  "version": "2.1.0",
-  "sha256": "1rgy9hlb92amhlbwkd91yh87xssqj2a1ign0wm59aai69rb79q3s",
+  "version": "2.2.0",
+  "sha256": "0xgyh5wj9mpbl2mdrk60i3m8wmgaxbf5qviy78qk8zb1jvnxzc2n",
   "license": "cc-by-sa-40"
 },
 {
   "pname": "el_core_news_sm",
-  "version": "2.1.0",
-  "sha256": "07n7qg0nnzg5gjq7vs72j9qc6z4zjx65qsrrj0hjhiihk3ps378z",
+  "version": "2.2.0",
+  "sha256": "0qbf16g6s1xfm2clnmrwr3m3vgmvvsziyhy6jbm6axh8c0fy0j8p",
   "license": "cc-by-sa-40"
 },
 {
   "pname": "en_core_web_lg",
-  "version": "2.1.0",
-  "sha256": "0ywcczd9nsxmpfwknxa7z54h566bwi7chq0jzx3sqk2a6lva4q52",
+  "version": "2.2.0",
+  "sha256": "1dxy43kf3vbz4jxc7jkr315hyzmi44v41lf09rax53f3s1jghsbh",
   "license": "cc-by-sa-40"
 },
 {
   "pname": "en_core_web_md",
-  "version": "2.1.0",
-  "sha256": "10vgq1xd6dpdl7xdssgf0kywbq7xpxp79yqc2vcnl3c4axfpwk5q",
+  "version": "2.2.0",
+  "sha256": "13fvr8z7fjhyzc9mm55ah6c2snpj27lrrc0rzgyb0hcg7ghd6v58",
   "license": "cc-by-sa-40"
 },
 {
   "pname": "en_core_web_sm",
-  "version": "2.1.0",
-  "sha256": "1wg5a7nxq82sfmnc3j5xfr8il65rprmcx2h36va5dvydm1h6icad",
+  "version": "2.2.0",
+  "sha256": "197afra99lhh84yi6wxvxdxibd1ikaybqfsq2nsmm7ahsw9s3kk5",
   "license": "cc-by-sa-40"
 },
 {
@@ -48,49 +48,49 @@
 },
 {
   "pname": "es_core_news_md",
-  "version": "2.1.0",
-  "sha256": "02v7hm711r9ma8p5yk057z7hm2pcvpfjgnjszc697d0ymfn4avby",
+  "version": "2.2.0",
+  "sha256": "0sdps0cdmsd2l3irsg63d874sba9vpn0san0n89rk8h3pa49dpab",
   "license": "cc-by-sa-40"
 },
 {
   "pname": "es_core_news_sm",
-  "version": "2.1.0",
-  "sha256": "1smyyb1gqp090sailqdqp5v5ww4kf99a3hcd9d9rdhn1wgsv28dh",
+  "version": "2.2.0",
+  "sha256": "073dgna796lk4rm7f25gyyl2ml7dfsb4azd4jkk03kxkcy6ypnag",
   "license": "cc-by-sa-40"
 },
 {
   "pname": "fr_core_news_md",
-  "version": "2.1.0",
-  "sha256": "0n94ja7y4jbvz0k0x5bij2dypy11ikvgpd9dav0m0hw1wpqgls1i",
+  "version": "2.2.0",
+  "sha256": "0061hnw03189z3ya1gb6506bq8yxrg17v9cywg7zbk6izakxcasr",
   "license": "cc-by-sa-40"
 },
 {
   "pname": "fr_core_news_sm",
-  "version": "2.1.0",
-  "sha256": "1czr40y5sqs0n2dd4s37kc2xawkh2nsj41wvmsx48bw0aksb1n75",
+  "version": "2.2.0",
+  "sha256": "0kj31kx4q9mm7ms622ph2i6pkl1ifm8s5ng3f3khf9ia0vr31vbq",
   "license": "cc-by-sa-40"
 },
 {
   "pname": "it_core_news_sm",
-  "version": "2.1.0",
-  "sha256": "1i8dm703mf1l39jwis3mn5mb9azpx6bsimh66iriax94612x64mb",
+  "version": "2.2.0",
+  "sha256": "0gxmknd68kajak8jr443799bfd69pp5j0jnmcbnyx5abzyq6wkzx",
   "license": "cc-by-sa-40"
 },
 {
   "pname": "nl_core_news_sm",
-  "version": "2.1.0",
-  "sha256": "0ywyn7jprsfr10bvwnm3qk270raxm9s9rvzyp1cp7ca037ab633y",
+  "version": "2.2.0",
+  "sha256": "1sh5nc5mv0h5bdjhv7pddmqrcnvvyg9rk9nyqksi4b2dpc8p999h",
   "license": "cc-by-sa-40"
 },
 {
   "pname": "pt_core_news_sm",
-  "version": "2.1.0",
-  "sha256": "0vigc9x7158sdqxjgcxgvp6458k5936jlmlp2qdmlmzxr5wmfrbc",
+  "version": "2.2.0",
+  "sha256": "1fi4wick1x96sj46idic1ad26l9zd2p5smi4v7mkry71xp7d9s13",
   "license": "cc-by-sa-40"
 },
 {
   "pname": "xx_ent_wiki_sm",
-  "version": "2.1.0",
-  "sha256": "19sfsxwjqdzlfm43gb4hbyj0hgqcfhcfxwdib4g5i1pcfx1v3pf4",
+  "version": "2.2.0",
+  "sha256": "0niwnd1mdaji92yp2dqsbmr0w420gpaybb1ppbqr1rmk6bwgyhsb",
   "license": "cc-by-sa-40"
 }]
-- 
GitLab


From 86dea5559fca96d9d4d96a485027b7f4cd253e77 Mon Sep 17 00:00:00 2001
From: Elias Probst <mail@eliasprobst.eu>
Date: Wed, 2 Oct 2019 21:45:44 -0400
Subject: [PATCH 1854/2254] nixos/networkmanager: allow iwd as Wi-Fi backend

This introduces an option wifi.backend to the networkmanager module.

Co-authored-by: Cole Mickens <cole.mickens@gmail.com>
Co-authored-by: worldofpeace <worldofpeace@protonmail.ch>
---
 .../services/networking/networkmanager.nix     | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index 09f36aaf8b3..176d26e07b0 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -15,13 +15,15 @@ let
     networkmanager-openconnect
     networkmanager-openvpn
     networkmanager-vpnc
-   ] ++ optional (!delegateWireless) wpa_supplicant;
+   ] ++ optional (!delegateWireless && !enableIwd) wpa_supplicant;
 
   dynamicHostsEnabled =
     cfg.dynamicHosts.enable && cfg.dynamicHosts.hostsDirs != {};
 
   delegateWireless = config.networking.wireless.enable == true && cfg.unmanaged != [];
 
+  enableIwd = cfg.wifi.backend == "iwd";
+
   # /var/lib/misc is for dnsmasq.leases.
   stateDirs = "/var/lib/NetworkManager /var/lib/dhclient /var/lib/misc";
 
@@ -50,6 +52,7 @@ let
 
     [device]
     wifi.scan-rand-mac-address=${if cfg.wifi.scanRandMacAddress then "yes" else "no"}
+    wifi.backend=${cfg.wifi.backend}
 
     ${cfg.extraConfig}
   '';
@@ -236,6 +239,15 @@ in {
       wifi = {
         macAddress = macAddressOpt;
 
+        backend = mkOption {
+          type = types.enum [ "wpa_supplicant" "iwd" ];
+          default = "wpa_supplicant";
+          description = ''
+            Specify the Wi-Fi backend used for the device.
+            Currently supported are <option>wpa_supplicant</option> or <option>iwd</option> (experimental).
+          '';
+        };
+
         powersave = mkOption {
           type = types.nullOr types.bool;
           default = null;
@@ -390,7 +402,7 @@ in {
       { assertion = !dynamicHostsEnabled || (dynamicHostsEnabled && cfg.dns == "dnsmasq");
         message = ''
           To use networking.networkmanager.dynamicHosts you also need to set
-          networking.networkmanager.dns = "dnsmasq"
+          `networking.networkmanager.dns = "dnsmasq"`
         '';
       }
     ];
@@ -510,6 +522,8 @@ in {
       wireless.enable = mkDefault false;
     }) // (mkIf cfg.enableStrongSwan {
       networkmanager.packages = [ pkgs.networkmanager_strongswan ];
+    }) // (mkIf enableIwd {
+      wireless.iwd.enable = true;
     });
 
     security.polkit.extraConfig = polkitConf;
-- 
GitLab


From f6f5151d5736f3a563787dd4adc9e41e62d9ed5d Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Thu, 20 Sep 2018 11:11:48 -0400
Subject: [PATCH 1855/2254] installer: autorun xserver in graphical media

---
 .../installer/cd-dvd/installation-cd-graphical-base.nix        | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix
index 1578e1547bc..719ba5ffb12 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix
@@ -25,9 +25,6 @@ with lib;
   services.xserver = {
     enable = true;
 
-    # Don't start the X server by default.
-    autorun = mkForce false;
-
     # Automatically login as nixos.
     displayManager.slim = {
       enable = true;
-- 
GitLab


From 489548310fa17ff9df9342fbffd38ac21ac74fc9 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sat, 28 Sep 2019 17:21:57 -0400
Subject: [PATCH 1856/2254] nixos/iso-image: add menu entry to disable
 display-manager

---
 nixos/modules/installer/cd-dvd/iso-image.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix
index 93c8ebaa249..d62db084458 100644
--- a/nixos/modules/installer/cd-dvd/iso-image.nix
+++ b/nixos/modules/installer/cd-dvd/iso-image.nix
@@ -284,6 +284,14 @@ let
         ${buildMenuAdditionalParamsGrub2 config "video=1920x1080@60"}
       }
 
+      # If we boot into a graphical environment where X is autoran
+      # and always crashes, it makes the media unusable. Allow the user
+      # to disable this.
+      submenu "Disable display-manager" --class quirk-disable-displaymanager {
+        ${grubMenuCfg}
+        ${buildMenuAdditionalParamsGrub2 config "systemd.mask=display-manager.service"}
+      }
+
       # Some laptop and convertibles have the panel installed in an
       # inconvenient way, rotated away from the keyboard.
       # Those entries makes it easier to use the installer.
-- 
GitLab


From 159b12bee7a9b30b0cfe25f53efcc443a130313d Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sat, 28 Sep 2019 18:17:04 -0400
Subject: [PATCH 1857/2254] rl-2003: graphical image autoruns X

---
 nixos/doc/manual/release-notes/rl-2003.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml
index 6de0214b1fb..bdf56acd545 100644
--- a/nixos/doc/manual/release-notes/rl-2003.xml
+++ b/nixos/doc/manual/release-notes/rl-2003.xml
@@ -28,6 +28,14 @@
      Postgresql for NixOS service now defaults to v11.
     </para>
    </listitem>
+   <listitem>
+    <para>
+     The graphical installer image starts the graphical session automatically.
+     Before you'd be greeted by a tty and asked to enter <command>systemctl start display-manager</command>.
+     It is now possible to disable the display-manager from running by selecting the <literal>Disable display-manager</literal>
+     quirk in the boot menu.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 
-- 
GitLab


From fb7b158ddaea7d57dcaf012bea3673f5c6d02d87 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Wed, 2 Oct 2019 21:39:24 -0400
Subject: [PATCH 1858/2254] nixos/gnome-settings-daemon: move systemd config
 here

As I've decided that it doesn't make sense for the module to be shared [0]
we can move this config here.

[0]: 68ab37aa4491c8f870483c9eff888dc5fc88d2c8
---
 .../desktops/gnome3/gnome-settings-daemon.nix | 26 +++++++++++++++++++
 .../services/x11/desktop-managers/gnome3.nix  | 17 +-----------
 2 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/nixos/modules/services/desktops/gnome3/gnome-settings-daemon.nix b/nixos/modules/services/desktops/gnome3/gnome-settings-daemon.nix
index 9d080acb2aa..2f83fd653bd 100644
--- a/nixos/modules/services/desktops/gnome3/gnome-settings-daemon.nix
+++ b/nixos/modules/services/desktops/gnome3/gnome-settings-daemon.nix
@@ -43,6 +43,32 @@ in
       pkgs.gnome3.gnome-settings-daemon
     ];
 
+    systemd.packages = [
+      pkgs.gnome3.gnome-settings-daemon
+    ];
+
+    systemd.user.targets."gnome-session-initialized".wants = [
+      "gsd-color.target"
+      "gsd-datetime.target"
+      "gsd-keyboard.target"
+      "gsd-media-keys.target"
+      "gsd-print-notifications.target"
+      "gsd-rfkill.target"
+      "gsd-screensaver-proxy.target"
+      "gsd-sharing.target"
+      "gsd-smartcard.target"
+      "gsd-sound.target"
+      "gsd-wacom.target"
+      "gsd-wwan.target"
+      "gsd-a11y-settings.target"
+      "gsd-housekeeping.target"
+      "gsd-power.target"
+    ];
+
+    systemd.user.targets."gnome-session-x11-services".wants = [
+      "gsd-xsettings.target"
+    ];
+
   };
 
 }
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index c0cee95bdcb..9b0c8d752ce 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -230,22 +230,7 @@ in
       services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true));
       services.telepathy.enable = mkDefault true;
 
-      systemd.packages = with pkgs.gnome3; [ vino gnome-session gnome-settings-daemon ];
-
-      # gnome-settings-daemon.nix is shared between several desktop
-      # environments (eg. mate and pantheon) so specify these gnome-shell specific
-      # service dependencies here instead.
-      systemd.user.targets."gnome-session-initialized".wants = [
-        "gsd-a11y-settings.target" "gsd-housekeeping.target" "gsd-power.target"
-        "gsd-color.target" "gsd-keyboard.target" "gsd-print-notifications.target"
-        "gsd-datetime.target" "gsd-media-keys.target" "gsd-rfkill.target"
-        "gsd-screensaver-proxy.target" "gsd-sound.target" "gsd-smartcard.target"
-        "gsd-sharing.target" "gsd-wacom.target" "gsd-wwan.target"
-      ];
-
-      systemd.user.targets."gnome-session-x11-services".wants = [
-        "gsd-xsettings.target"
-      ];
+      systemd.packages = with pkgs.gnome3; [ vino gnome-session ];
 
       services.avahi.enable = mkDefault true;
 
-- 
GitLab


From c83db0cc536a1ed604f5d9b6e316d943f76ffcac Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Wed, 2 Oct 2019 15:15:31 -0400
Subject: [PATCH 1859/2254] sourcehut: use recurseIntoAttrs

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

diff --git a/pkgs/applications/version-management/sourcehut/default.nix b/pkgs/applications/version-management/sourcehut/default.nix
index 00a3cf27111..3fa5399c2b5 100644
--- a/pkgs/applications/version-management/sourcehut/default.nix
+++ b/pkgs/applications/version-management/sourcehut/default.nix
@@ -1,5 +1,5 @@
 { python37, openssl
-, callPackage }:
+, callPackage, recurseIntoAttrs }:
 
 # To expose the *srht modules, they have to be a python module so we use `buildPythonModule`
 # Then we expose them through all-packages.nix as an application through `toPythonApplication`
@@ -25,7 +25,7 @@ let
       scmsrht = self.callPackage ./scm.nix { };
     };
   };
-in with python.pkgs; {
+in with python.pkgs; recurseIntoAttrs {
   inherit python;
   buildsrht = toPythonApplication buildsrht;
   dispatchsrht = toPythonApplication dispatchsrht;
-- 
GitLab


From 64205fa1080f25a868c951e055832ae015e12889 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 1 Oct 2019 22:17:48 -0700
Subject: [PATCH 1860/2254] pythonPackages.trackpy: disable plot tests

---
 pkgs/development/python-modules/trackpy/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/trackpy/default.nix b/pkgs/development/python-modules/trackpy/default.nix
index 2e26679ebf2..32c8c64c68c 100644
--- a/pkgs/development/python-modules/trackpy/default.nix
+++ b/pkgs/development/python-modules/trackpy/default.nix
@@ -45,6 +45,7 @@ buildPythonPackage rec {
     pytest trackpy --ignore trackpy/tests/test_motion.py \
                    --ignore trackpy/tests/test_feature_saving.py \
                    --ignore trackpy/tests/test_feature.py \
+                   --ignore trackpy/tests/test_plots.py \
                    --ignore trackpy/tests/test_legacy_linking.py
   '';
 
-- 
GitLab


From 31c4f79289d75b897005759559d647cb96866392 Mon Sep 17 00:00:00 2001
From: Enno Lohmeier <enno@nerdworks.de>
Date: Sun, 29 Sep 2019 12:42:16 +0200
Subject: [PATCH 1861/2254] pythonPackages.bleach: add implicit setuptools
 dependency

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

diff --git a/pkgs/development/python-modules/bleach/default.nix b/pkgs/development/python-modules/bleach/default.nix
index 7de124267f0..86b253a72c9 100644
--- a/pkgs/development/python-modules/bleach/default.nix
+++ b/pkgs/development/python-modules/bleach/default.nix
@@ -5,6 +5,7 @@
 , pytestrunner
 , six
 , html5lib
+, setuptools
 }:
 
 buildPythonPackage rec {
@@ -17,7 +18,7 @@ buildPythonPackage rec {
   };
 
   checkInputs = [ pytest pytestrunner ];
-  propagatedBuildInputs = [ six html5lib ];
+  propagatedBuildInputs = [ six html5lib setuptools ];
 
   postPatch = ''
     substituteInPlace setup.py --replace ",<3dev" ""
-- 
GitLab


From 57c43ad8d025069cc37ff6fc4d5b9735b7e66a86 Mon Sep 17 00:00:00 2001
From: Rommel MARTINEZ <ebzzry@ebzzry.io>
Date: Thu, 3 Oct 2019 12:09:51 +0800
Subject: [PATCH 1862/2254] qutebrowser: 1.7.0 -> 1.8.1

---
 .../networking/browsers/qutebrowser/default.nix        | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index 1f441b4e961..7b13d748fe0 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -10,23 +10,23 @@ assert withMediaPlayback -> gst_all_1 != null;
 
 let
   pdfjs = let
-    version = "2.1.266";
+    version = "2.2.228";
   in
   fetchzip rec {
     name = "pdfjs-${version}";
     url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/${name}-dist.zip";
-    sha256 = "1ybbnpz2jcdikzwr7r13lq528vxj3bpms1fqmg3n1zgs30cqpkby";
+    sha256 = "0yik4vfnz46j844jfw1gq5cshgzry42kpy2d5rr7fbn9fjf98bw6";
     stripRoot = false;
   };
 
 in mkDerivationWith python3Packages.buildPythonApplication rec {
   pname = "qutebrowser";
-  version = "1.7.0";
+  version = "1.8.1";
 
   # the release tarballs are different from the git checkout!
   src = fetchurl {
     url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz";
-    sha256 = "0wyjmb2qvnw3gn0ypgckwblmn7kasi12dfwp343hi6wscqripw7i";
+    sha256 = "0ckffbw2zlg0afz4rgyywzdprnqs74va5qj0xqlaqc14ziiypxnw";
   };
 
   # Needs tox
@@ -108,6 +108,6 @@ in mkDerivationWith python3Packages.buildPythonApplication rec {
     homepage    = https://github.com/The-Compiler/qutebrowser;
     description = "Keyboard-focused browser with a minimal GUI";
     license     = licenses.gpl3Plus;
-    maintainers = with maintainers; [ jagajaga rnhmjoj ];
+    maintainers = with maintainers; [ jagajaga rnhmjoj ebzzry ];
   };
 }
-- 
GitLab


From f2fc1b004635e2bf6e6dd2e672fd09dac6922814 Mon Sep 17 00:00:00 2001
From: Okinan <okinan@chiru.no>
Date: Thu, 3 Oct 2019 01:25:08 -0500
Subject: [PATCH 1863/2254] nixos/zeronet: remove static uid and gid

---
 nixos/modules/misc/ids.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index ac6af1ce8b7..3e8a5b07a5e 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -328,7 +328,7 @@
       qemu-libvirtd = 301;
       # kvm = 302; # unused
       # render = 303; # unused
-      zeronet = 304;
+      # zeronet = 304; # removed 2019-01-03
       lirc = 305;
       lidarr = 306;
       slurm = 307;
@@ -629,7 +629,7 @@
       qemu-libvirtd = 301;
       kvm = 302; # default udev rules from systemd requires these
       render = 303; # default udev rules from systemd requires these
-      zeronet = 304;
+      # zeronet = 304; # removed 2019-01-03
       lirc = 305;
       lidarr = 306;
       slurm = 307;
-- 
GitLab


From e0dcde83b00f8d9052372a070b5d15b0276551fb Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 23 Sep 2019 20:47:01 +0000
Subject: [PATCH 1864/2254] ocamlPackages.sexp_pretty: init at 0.12.0

---
 pkgs/development/ocaml-modules/janestreet/0.12.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/ocaml-modules/janestreet/0.12.nix b/pkgs/development/ocaml-modules/janestreet/0.12.nix
index 4089b24ca22..c7d9fc76771 100644
--- a/pkgs/development/ocaml-modules/janestreet/0.12.nix
+++ b/pkgs/development/ocaml-modules/janestreet/0.12.nix
@@ -429,6 +429,13 @@ rec {
     propagatedBuildInputs = [ core ];
   };
 
+  sexp_pretty = janePackage {
+    pname = "sexp_pretty";
+    hash = "06hdsaszc5cd7fphiblbn4r1sh36xgjwf2igzr2rvlzqs7jiv2v4";
+    meta.description = "S-expression pretty-printer";
+    propagatedBuildInputs = [ ppx_base re sexplib ];
+  };
+
   ### Packages at version 0.11, with dependencies at version 0.12
 
   configurator = janePackage {
-- 
GitLab


From 2c87f4f07e83f14acfe31c0a3ec1183156f30803 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 23 Sep 2019 20:47:07 +0000
Subject: [PATCH 1865/2254] ocamlPackages.expect_test_helpers_kernel: init at
 0.12.0

---
 pkgs/development/ocaml-modules/janestreet/0.12.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/ocaml-modules/janestreet/0.12.nix b/pkgs/development/ocaml-modules/janestreet/0.12.nix
index c7d9fc76771..bba763db154 100644
--- a/pkgs/development/ocaml-modules/janestreet/0.12.nix
+++ b/pkgs/development/ocaml-modules/janestreet/0.12.nix
@@ -436,6 +436,14 @@ rec {
     propagatedBuildInputs = [ ppx_base re sexplib ];
   };
 
+  expect_test_helpers_kernel = janePackage {
+    pname = "expect_test_helpers_kernel";
+    hash = "18ya187y2i2hfxr771sd9vy5jdsa30vhs56yjdhwk06v01b2fzbq";
+    meta.description = "Helpers for writing expectation tests";
+    buildInputs = [ ppx_jane ];
+    propagatedBuildInputs = [ core_kernel sexp_pretty ];
+  };
+
   ### Packages at version 0.11, with dependencies at version 0.12
 
   configurator = janePackage {
-- 
GitLab


From 33c36dd2f4a9126dfe3d71359e53eb5734817598 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 23 Sep 2019 20:47:12 +0000
Subject: [PATCH 1866/2254] ocamlPackages.expect_test_helpers: init at 0.12.0

---
 pkgs/development/ocaml-modules/janestreet/0.12.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/ocaml-modules/janestreet/0.12.nix b/pkgs/development/ocaml-modules/janestreet/0.12.nix
index bba763db154..555ea198373 100644
--- a/pkgs/development/ocaml-modules/janestreet/0.12.nix
+++ b/pkgs/development/ocaml-modules/janestreet/0.12.nix
@@ -444,6 +444,13 @@ rec {
     propagatedBuildInputs = [ core_kernel sexp_pretty ];
   };
 
+  expect_test_helpers = janePackage {
+    pname = "expect_test_helpers";
+    hash = "0ixqck2lnsmz107yw0q2sr8va80skjpldx7lz4ymjiq2vsghk0rb";
+    meta.description = "Async helpers for writing expectation tests";
+    propagatedBuildInputs = [ async expect_test_helpers_kernel ];
+  };
+
   ### Packages at version 0.11, with dependencies at version 0.12
 
   configurator = janePackage {
-- 
GitLab


From dc6b299e098c4f956f00e1fcbd6b92abb07d3290 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 23 Sep 2019 20:47:17 +0000
Subject: [PATCH 1867/2254] ocamlPackages.patience_diff: init at 0.12.0

---
 pkgs/development/ocaml-modules/janestreet/0.12.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/ocaml-modules/janestreet/0.12.nix b/pkgs/development/ocaml-modules/janestreet/0.12.nix
index 555ea198373..01463f30715 100644
--- a/pkgs/development/ocaml-modules/janestreet/0.12.nix
+++ b/pkgs/development/ocaml-modules/janestreet/0.12.nix
@@ -451,6 +451,13 @@ rec {
     propagatedBuildInputs = [ async expect_test_helpers_kernel ];
   };
 
+  patience_diff = janePackage {
+    pname = "patience_diff";
+    hash = "055kd3piadjnplip8c8q99ssh79d4irmhg2wng7aida5pbqp2p9f";
+    meta.description = "Diff library using Bram Cohen's patience diff algorithm";
+    propagatedBuildInputs = [ core_kernel ];
+  };
+
   ### Packages at version 0.11, with dependencies at version 0.12
 
   configurator = janePackage {
-- 
GitLab


From ea5d2a0efa6938aa586688918f3c72d377855007 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 2 Oct 2019 04:20:00 -0500
Subject: [PATCH 1868/2254] flow: 0.108.0 -> 0.109.0

Changelog: https://github.com/facebook/flow/releases/tag/v0.109.0
---
 pkgs/development/tools/analysis/flow/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix
index 2d7d99bb393..752a750f26e 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "flow";
-  version = "0.108.0";
+  version = "0.109.0";
 
   src = fetchFromGitHub {
     owner  = "facebook";
     repo   = "flow";
     rev    = "refs/tags/v${version}";
-    sha256 = "13irr1hkv7mxvq57pywmjmqdf5fv359vl5d19w3sra3rqg7vi3ws";
+    sha256 = "0wfhy7r85s2bxhfkmcdp7p1gaqjxr4yzay52k680hv6ghhay2318";
   };
 
   installPhase = ''
-- 
GitLab


From 0f8133d633cf2b4601a7a191a5a2e64a7ea92dd6 Mon Sep 17 00:00:00 2001
From: talyz <kim.lindberger@gmail.com>
Date: Sat, 14 Sep 2019 01:38:54 +0200
Subject: [PATCH 1869/2254] nixos/gitlab: Fix state directory permissions

Since the preStart script is no longer running in privileged mode, we
reassign the files in the state directory and its config subdirectory
to the user we're running as. This is done by splitting the preStart
script into a privileged and an unprivileged part where the privileged
part does the reassignment.

Also, delete the database.yml symlink if it exists, since we want to
create a real file in its place.

Fixes #68696.
---
 nixos/modules/services/misc/gitlab.nix | 148 ++++++++++++++-----------
 1 file changed, 81 insertions(+), 67 deletions(-)

diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index 4c1ffead00c..58ef463c49e 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -763,82 +763,96 @@ in {
         procps
         gnupg
       ];
-      preStart = ''
-        cp -f ${cfg.packages.gitlab}/share/gitlab/VERSION ${cfg.statePath}/VERSION
-        rm -rf ${cfg.statePath}/db/*
-        cp -rf --no-preserve=mode ${cfg.packages.gitlab}/share/gitlab/config.dist/* ${cfg.statePath}/config
-        cp -rf --no-preserve=mode ${cfg.packages.gitlab}/share/gitlab/db/* ${cfg.statePath}/db
 
-        ${cfg.packages.gitlab-shell}/bin/install
+      serviceConfig = {
+        Type = "simple";
+        User = cfg.user;
+        Group = cfg.group;
+        TimeoutSec = "infinity";
+        Restart = "on-failure";
+        WorkingDirectory = "${cfg.packages.gitlab}/share/gitlab";
+        ExecStartPre = let
+          preStartFullPrivileges = ''
+            shopt -s dotglob nullglob
+            chown --no-dereference '${cfg.user}':'${cfg.group}' '${cfg.statePath}'/*
+            chown --no-dereference '${cfg.user}':'${cfg.group}' '${cfg.statePath}'/config/*
+          '';
+          preStart = ''
+            cp -f ${cfg.packages.gitlab}/share/gitlab/VERSION ${cfg.statePath}/VERSION
+            rm -rf ${cfg.statePath}/db/*
+            cp -rf --no-preserve=mode ${cfg.packages.gitlab}/share/gitlab/config.dist/* ${cfg.statePath}/config
+            cp -rf --no-preserve=mode ${cfg.packages.gitlab}/share/gitlab/db/* ${cfg.statePath}/db
 
-        ${optionalString cfg.smtp.enable ''
-          install -m u=rw ${smtpSettings} ${cfg.statePath}/config/initializers/smtp_settings.rb
-          ${optionalString (cfg.smtp.passwordFile != null) ''
-            smtp_password=$(<'${cfg.smtp.passwordFile}')
-            ${pkgs.replace}/bin/replace-literal -e '@smtpPassword@' "$smtp_password" '${cfg.statePath}/config/initializers/smtp_settings.rb'
-          ''}
-        ''}
+            ${cfg.packages.gitlab-shell}/bin/install
 
-        (
-          umask u=rwx,g=,o=
+            ${optionalString cfg.smtp.enable ''
+              install -m u=rw ${smtpSettings} ${cfg.statePath}/config/initializers/smtp_settings.rb
+              ${optionalString (cfg.smtp.passwordFile != null) ''
+                smtp_password=$(<'${cfg.smtp.passwordFile}')
+                ${pkgs.replace}/bin/replace-literal -e '@smtpPassword@' "$smtp_password" '${cfg.statePath}/config/initializers/smtp_settings.rb'
+              ''}
+            ''}
 
-          ${pkgs.openssl}/bin/openssl rand -hex 32 > ${cfg.statePath}/gitlab_shell_secret
+            (
+              umask u=rwx,g=,o=
 
-          ${if cfg.databasePasswordFile != null then ''
-              export db_password="$(<'${cfg.databasePasswordFile}')"
+              ${pkgs.openssl}/bin/openssl rand -hex 32 > ${cfg.statePath}/gitlab_shell_secret
 
-              if [[ -z "$db_password" ]]; then
-                >&2 echo "Database password was an empty string!"
-                exit 1
+              if [[ -h '${cfg.statePath}/config/database.yml' ]]; then
+                rm '${cfg.statePath}/config/database.yml'
               fi
 
-              ${pkgs.jq}/bin/jq <${pkgs.writeText "database.yml" (builtins.toJSON databaseConfig)} \
-                                '.production.password = $ENV.db_password' \
-                                >'${cfg.statePath}/config/database.yml'
-            ''
-            else ''
-              ${pkgs.jq}/bin/jq <${pkgs.writeText "database.yml" (builtins.toJSON databaseConfig)} \
-                                >'${cfg.statePath}/config/database.yml'
-            ''
-          }
-
-          ${utils.genJqSecretsReplacementSnippet
-              gitlabConfig
-              "${cfg.statePath}/config/gitlab.yml"
-          }
-
-          if [[ -h '${cfg.statePath}/config/secrets.yml' ]]; then
-            rm '${cfg.statePath}/config/secrets.yml'
-          fi
-
-          export secret="$(<'${cfg.secrets.secretFile}')"
-          export db="$(<'${cfg.secrets.dbFile}')"
-          export otp="$(<'${cfg.secrets.otpFile}')"
-          export jws="$(<'${cfg.secrets.jwsFile}')"
-          ${pkgs.jq}/bin/jq -n '{production: {secret_key_base: $ENV.secret,
-                                              otp_key_base: $ENV.otp,
-                                              db_key_base: $ENV.db,
-                                              openid_connect_signing_key: $ENV.jws}}' \
-                            > '${cfg.statePath}/config/secrets.yml'
-        )
-
-        initial_root_password="$(<'${cfg.initialRootPasswordFile}')"
-        ${gitlab-rake}/bin/gitlab-rake gitlab:db:configure GITLAB_ROOT_PASSWORD="$initial_root_password" \
-                                                           GITLAB_ROOT_EMAIL='${cfg.initialRootEmail}'
-
-        # We remove potentially broken links to old gitlab-shell versions
-        rm -Rf ${cfg.statePath}/repositories/**/*.git/hooks
-
-        ${pkgs.git}/bin/git config --global core.autocrlf "input"
-      '';
+              ${if cfg.databasePasswordFile != null then ''
+                  export db_password="$(<'${cfg.databasePasswordFile}')"
+
+                  if [[ -z "$db_password" ]]; then
+                    >&2 echo "Database password was an empty string!"
+                    exit 1
+                  fi
+
+                  ${pkgs.jq}/bin/jq <${pkgs.writeText "database.yml" (builtins.toJSON databaseConfig)} \
+                                    '.production.password = $ENV.db_password' \
+                                    >'${cfg.statePath}/config/database.yml'
+                ''
+                else ''
+                  ${pkgs.jq}/bin/jq <${pkgs.writeText "database.yml" (builtins.toJSON databaseConfig)} \
+                                    >'${cfg.statePath}/config/database.yml'
+                ''
+              }
+
+              ${utils.genJqSecretsReplacementSnippet
+                  gitlabConfig
+                  "${cfg.statePath}/config/gitlab.yml"
+              }
+
+              if [[ -h '${cfg.statePath}/config/secrets.yml' ]]; then
+                rm '${cfg.statePath}/config/secrets.yml'
+              fi
 
-      serviceConfig = {
-        Type = "simple";
-        User = cfg.user;
-        Group = cfg.group;
-        TimeoutSec = "infinity";
-        Restart = "on-failure";
-        WorkingDirectory = "${cfg.packages.gitlab}/share/gitlab";
+              export secret="$(<'${cfg.secrets.secretFile}')"
+              export db="$(<'${cfg.secrets.dbFile}')"
+              export otp="$(<'${cfg.secrets.otpFile}')"
+              export jws="$(<'${cfg.secrets.jwsFile}')"
+              ${pkgs.jq}/bin/jq -n '{production: {secret_key_base: $ENV.secret,
+                                                  otp_key_base: $ENV.otp,
+                                                  db_key_base: $ENV.db,
+                                                  openid_connect_signing_key: $ENV.jws}}' \
+                                > '${cfg.statePath}/config/secrets.yml'
+            )
+
+            initial_root_password="$(<'${cfg.initialRootPasswordFile}')"
+            ${gitlab-rake}/bin/gitlab-rake gitlab:db:configure GITLAB_ROOT_PASSWORD="$initial_root_password" \
+                                                               GITLAB_ROOT_EMAIL='${cfg.initialRootEmail}'
+
+            # We remove potentially broken links to old gitlab-shell versions
+            rm -Rf ${cfg.statePath}/repositories/**/*.git/hooks
+
+            ${pkgs.git}/bin/git config --global core.autocrlf "input"
+          '';
+        in [
+          "+${pkgs.writeShellScript "gitlab-pre-start-full-privileges" preStartFullPrivileges}"
+          "${pkgs.writeShellScript "gitlab-pre-start" preStart}"
+        ];
         ExecStart = "${cfg.packages.gitlab.rubyEnv}/bin/unicorn -c ${cfg.statePath}/config/unicorn.rb -E production";
       };
 
-- 
GitLab


From 660db64a261bc583c909e82a0c553c4b1e07b655 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 3 Oct 2019 10:08:42 +0200
Subject: [PATCH 1870/2254] cachix: fix build on darwin

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

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index f8a49558c09..17f3b2a258c 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -94,7 +94,8 @@ self: super: builtins.intersectAttrs super {
   # Won't find it's header files without help.
   sfml-audio = appendConfigureFlag super.sfml-audio "--extra-include-dirs=${pkgs.openal}/include/AL";
 
-  cachix = enableSeparateBinOutput super.cachix;
+  # profiling is disabled to allow C++/C mess to work, which is fixed in GHC 8.8
+  cachix = disableLibraryProfiling (enableSeparateBinOutput super.cachix);
 
   niv = enableSeparateBinOutput super.niv;
 
-- 
GitLab


From 1fb1f41c1bd7aa6d14b815920cdabefd98fa3a38 Mon Sep 17 00:00:00 2001
From: Koki Yasuno <lattfein@gmail.com>
Date: Fri, 27 Sep 2019 13:26:40 +0900
Subject: [PATCH 1871/2254] maintainers: add lattfein

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index b818c80e6e6..2058ceea8ec 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3551,6 +3551,12 @@
     github = "Lassulus";
     name = "Lassulus";
   };
+  lattfein = {
+    email = "lattfein@gmail.com";
+    github = "lattfein";
+    githubId = 53550838;
+    name = "Koki Yasuno";
+  };
   layus = {
     email = "layus.on@gmail.com";
     github = "layus";
-- 
GitLab


From 45e3058f78e4d861f88499d5e67e9b0ad5e6f509 Mon Sep 17 00:00:00 2001
From: Koki Yasuno <lattfein@gmail.com>
Date: Fri, 27 Sep 2019 13:28:11 +0900
Subject: [PATCH 1872/2254] station: init at 1.51.1

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

diff --git a/pkgs/applications/networking/station/default.nix b/pkgs/applications/networking/station/default.nix
new file mode 100644
index 00000000000..6b241ddb959
--- /dev/null
+++ b/pkgs/applications/networking/station/default.nix
@@ -0,0 +1,30 @@
+{ appimageTools, fetchurl, gsettings-desktop-schemas, gtk3, lib }:
+
+let
+  pname = "station";
+  version = "1.51.1";
+in appimageTools.wrapType2 rec {
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/getstation/desktop-app-releases/releases/download/${version}/Station-${version}.AppImage";
+    sha256 = "1vfis2q7zf1sabdlxzmbxh135jk25ylhavrgfc30k5nad9cacw8k";
+  };
+
+  profile = ''
+    export LC_ALL=C.UTF-8
+    export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
+  '';
+
+  multiPkgs = null;
+  extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;
+  extraInstallCommands = "mv $out/bin/{${name},${pname}}";
+
+  meta = with lib; {
+    description = "A single place for all of your web applications";
+    homepage = "https://getstation.com";
+    license = licenses.mit;
+    platforms = [ "x86_64-linux" ];
+    maintainers = with maintainers; [ lattfein ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4ac2434f962..70c6f306f77 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19772,6 +19772,8 @@ in
 
   speedread = callPackage ../applications/misc/speedread { };
 
+  station = callPackage ../applications/networking/station { };
+
   synapse = callPackage ../applications/misc/synapse { };
 
   synapse-bt = callPackage ../applications/networking/p2p/synapse-bt {
-- 
GitLab


From ab5863afada3c1b50fc43bf774b75ea71b287cde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 3 Oct 2019 10:52:06 +0200
Subject: [PATCH 1873/2254] cachix: workaround
 https://github.com/NixOS/nix/issues/2990

---
 pkgs/development/haskell-modules/configuration-nix.nix | 2 +-
 pkgs/top-level/all-packages.nix                        | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 17f3b2a258c..ec9f4285f87 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -95,7 +95,7 @@ self: super: builtins.intersectAttrs super {
   sfml-audio = appendConfigureFlag super.sfml-audio "--extra-include-dirs=${pkgs.openal}/include/AL";
 
   # profiling is disabled to allow C++/C mess to work, which is fixed in GHC 8.8
-  cachix = disableLibraryProfiling (enableSeparateBinOutput super.cachix);
+  cachix = disableLibraryProfiling super.cachix;
 
   niv = enableSeparateBinOutput super.niv;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 70c6f306f77..15ab0bf257c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10467,7 +10467,8 @@ in
 
   c-blosc = callPackage ../development/libraries/c-blosc { };
 
-  cachix = haskellPackages.cachix.bin;
+  # justStaticExecutables is needed due to https://github.com/NixOS/nix/issues/2990
+  cachix = haskell.lib.justStaticExecutables haskellPackages.cachix;
 
   niv = haskellPackages.niv.bin;
 
-- 
GitLab


From 382f2865a7658b5aca96612d291714844ce21a70 Mon Sep 17 00:00:00 2001
From: Olli Helenius <liff@iki.fi>
Date: Thu, 26 Sep 2019 14:49:24 +0300
Subject: [PATCH 1874/2254] maintainers: add liff

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 2058ceea8ec..02ebefa1a0f 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3651,6 +3651,12 @@
     githubId = 307589;
     name = "Nathaniel Baxter";
   };
+  liff = {
+    email = "liff@iki.fi";
+    github = "liff";
+    githubId = 124475;
+    name = "Olli Helenius";
+  };
   lightbulbjim = {
     email = "chris@killred.net";
     github = "lightbulbjim";
-- 
GitLab


From 2ac643c241bb13d52021efc3ac524f202ec88524 Mon Sep 17 00:00:00 2001
From: Olli Helenius <liff@iki.fi>
Date: Thu, 26 Sep 2019 14:50:15 +0300
Subject: [PATCH 1875/2254] pythonPackages.hcloud: init at 1.6.1

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

diff --git a/pkgs/development/python-modules/hcloud/default.nix b/pkgs/development/python-modules/hcloud/default.nix
new file mode 100644
index 00000000000..8d8e2c50689
--- /dev/null
+++ b/pkgs/development/python-modules/hcloud/default.nix
@@ -0,0 +1,38 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, future
+, requests
+, python-dateutil
+, flake8
+, isort
+, mock
+, pytest
+}:
+
+buildPythonPackage rec {
+  pname = "hcloud";
+  version = "1.6.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1skqq36k1dm7mngfg9c93pb1rdvmbapc0cv8zj00hnm63r67hmrj";
+  };
+
+  propagatedBuildInputs = [ future requests python-dateutil ];
+
+  checkInputs = [ flake8 isort mock pytest ];
+
+  # Skip integration tests since they require a separate external fake API endpoint.
+  checkPhase = ''
+    pytest --ignore=tests/integration
+  '';
+
+  meta = with lib; {
+    description = "Official Hetzner Cloud python library";
+    homepage = "https://github.com/hetznercloud/hcloud-python";
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ liff ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c269c830fdf..efa8c4be094 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6288,6 +6288,8 @@ in {
   runway-python = callPackage ../development/python-modules/runway-python { };
 
   pyprof2calltree = callPackage ../development/python-modules/pyprof2calltree { };
+
+  hcloud = callPackage ../development/python-modules/hcloud { };
 });
 
 in fix' (extends overrides packages)
-- 
GitLab


From 06041fd174fe53b2db7c487cbad0acfe10ffdaef Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 3 Oct 2019 11:03:07 +0200
Subject: [PATCH 1876/2254] python3Packages.asdf: 2.3.3 -> 2.4.2

Bump to fix the broken build of the package:

* Disable doctest as they're currently broken in our test env
* Loosen version constraint for `semantic_version` as it was only
  introduced to work around some deprecation warnings[1]

See also: https://hydra.nixos.org/build/102480957

ZHF #68361

[1] https://github.com/spacetelescope/asdf/commit/3446ae072ba99b72d8f6405853f832ef8197f270
---
 pkgs/development/python-modules/asdf/default.nix | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/asdf/default.nix b/pkgs/development/python-modules/asdf/default.nix
index 8efc251140a..6d685429e50 100644
--- a/pkgs/development/python-modules/asdf/default.nix
+++ b/pkgs/development/python-modules/asdf/default.nix
@@ -9,18 +9,26 @@
 , numpy
 , isPy27
 , astropy
+, setuptools_scm
+, setuptools
 }:
 
 buildPythonPackage rec {
   pname = "asdf";
-  version = "2.3.3";
+  version = "2.4.2";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d02e936a83abd206e7bc65050d94e8848da648344dbec9e49dddc2bdc3bd6870";
+    sha256 = "1wlgx8469wwsczc2gjka9k1a03yzird67zg3va0kg8y6j1qmbwvg";
   };
 
+  postPatch = ''
+    substituteInPlace setup.cfg \
+      --replace "semantic_version>=2.3.1,<=2.6.0" "semantic_version>=2.3.1" \
+      --replace "doctest_plus = enabled" ""
+  '';
+
   checkInputs = [
     pytest-astropy
     astropy
@@ -32,6 +40,8 @@ buildPythonPackage rec {
     jsonschema
     six
     numpy
+    setuptools_scm
+    setuptools
   ];
 
   checkPhase = ''
-- 
GitLab


From 33a095fb9ed74e76a7c4e3902616f6e1287f56b9 Mon Sep 17 00:00:00 2001
From: Tobias Mayer <tobim@fastmail.fm>
Date: Thu, 3 Oct 2019 10:18:50 +0200
Subject: [PATCH 1877/2254] vimPlugins: Update

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

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 70f7e77d199..3ad2339b62f 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -391,12 +391,12 @@ let
 
   coc-lists = buildVimPluginFrom2Nix {
     pname = "coc-lists";
-    version = "2019-08-12";
+    version = "2019-10-02";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-lists";
-      rev = "2c502ceec9816259350969970e76402c984ac4f9";
-      sha256 = "1ic62ba9w4diajd1d65xpqxkb3kjpp3d09p1n7pv8341w015zcf9";
+      rev = "5711bf2eedb7de2757b1650603736886a810388d";
+      sha256 = "0k0lgdvxlpv6hg09xhwkim9654sgzw2ivhp1saiab1dy0klp4iqv";
     };
   };
 
@@ -457,12 +457,12 @@ let
 
   coc-rls = buildVimPluginFrom2Nix {
     pname = "coc-rls";
-    version = "2019-09-10";
+    version = "2019-10-02";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-rls";
-      rev = "6d6cbb2768304bca987f83d23e7fe56b7fe66c2b";
-      sha256 = "18jz9qjxkb6626pnc5gmcfxq7yyyqnvalcllapsrk19ji6ykfi7k";
+      rev = "eea9357be6d1875e7af127a5fa54b3dd313c3978";
+      sha256 = "1wnfiqa5hvp74jllzhli7379w88c7jlzxxl9skmzyqmrvpmpc5z5";
     };
   };
 
@@ -545,12 +545,12 @@ let
 
   coc-tsserver = buildVimPluginFrom2Nix {
     pname = "coc-tsserver";
-    version = "2019-09-23";
+    version = "2019-10-02";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-tsserver";
-      rev = "4bd9cde9dc8c623b9486b845f7a5df2f466e70e6";
-      sha256 = "0mqjf4x95sx61h4r80aifpzdzwb6s832g5g0nnz4p2c1gpcckz63";
+      rev = "d64d956388d85b53dceca6eb526b032c96912672";
+      sha256 = "137bfdnywx44vl8b50vxbi7k8g622yhpsavvlqxc8cllmjamp96f";
     };
   };
 
@@ -1079,12 +1079,12 @@ let
 
   fastfold = buildVimPluginFrom2Nix {
     pname = "fastfold";
-    version = "2019-10-01";
+    version = "2019-10-02";
     src = fetchFromGitHub {
       owner = "konfekt";
       repo = "fastfold";
-      rev = "8450f30c094946fd57719d7c2b667b81a034ef60";
-      sha256 = "00yl0wafr62b95pr4jw3ybg5k8pfvnsybz127hcbf7997smz8141";
+      rev = "bd88eed0c22a298a49f52a14a673bc1aad8c0a1b";
+      sha256 = "1xvf32g5kzx7g1si84m0sih02b0dd888bdwa2ym533qxiriqgxpg";
     };
   };
 
@@ -1179,12 +1179,12 @@ let
 
   ghcid = buildVimPluginFrom2Nix {
     pname = "ghcid";
-    version = "2019-09-08";
+    version = "2019-10-02";
     src = fetchFromGitHub {
       owner = "ndmitchell";
       repo = "ghcid";
-      rev = "586dd9652f9fa76d342557029abd4bbcb744f2f4";
-      sha256 = "115zw4b8jxyalm0qhqjzzakaqc2bzy6bf0jm7kkfhyv3lfqwf19p";
+      rev = "840d9a7f4c707b3369f2a4b6aac89dcbc45950dc";
+      sha256 = "19bncad9k4mc2zsiw3r6qrf1mscjzimivzpq4d1yp4ciswvmqx4a";
     };
   };
 
@@ -2214,12 +2214,12 @@ let
 
   rust-vim = buildVimPluginFrom2Nix {
     pname = "rust-vim";
-    version = "2019-09-20";
+    version = "2019-10-01";
     src = fetchFromGitHub {
       owner = "rust-lang";
       repo = "rust.vim";
-      rev = "d0456774a8a9616fea9df66e5131d6428450ebed";
-      sha256 = "1zbd7gbiyx1lmr8kg70xwad88rrs18q7rgy7yv85l57zs71ffnib";
+      rev = "0dabf6a2ecfe671e0cab945ba980ad19bbcfa8ca";
+      sha256 = "193z9np3gbjbrgsak60bxq8sga74l3g7bfbcsqmjbw888bmaipm6";
     };
   };
 
@@ -2302,12 +2302,12 @@ let
 
   SpaceCamp = buildVimPluginFrom2Nix {
     pname = "SpaceCamp";
-    version = "2019-08-12";
+    version = "2019-10-02";
     src = fetchFromGitHub {
       owner = "jaredgorski";
       repo = "SpaceCamp";
-      rev = "9f7bee325f32db1ee509b82e5144df522fa2aca2";
-      sha256 = "1i9kyipnd7fkv7vdlwpsb44h0yzvf0rjrwrj09w8bj2lqmcv8yjp";
+      rev = "52f9db92514ee2d2b9907bff31e8b16267cc9a91";
+      sha256 = "066z9zypgmcs9jzxfqhh4m7ppjcgw36bmhs799198qj740whlqd9";
     };
   };
 
@@ -2401,12 +2401,12 @@ let
 
   syntastic = buildVimPluginFrom2Nix {
     pname = "syntastic";
-    version = "2019-07-20";
+    version = "2019-10-02";
     src = fetchFromGitHub {
       owner = "scrooloose";
       repo = "syntastic";
-      rev = "0336c35c0b10b46d85cdd9c3df721f978429e82c";
-      sha256 = "1ylg8qlndz9981k48alhfh0m2cl8wxwmgfv0pqkvhpyqypd5rk2c";
+      rev = "3b3f4ee8abf81191d1eca4350448148b86e8a741";
+      sha256 = "0spksh2pafp9lzx9mybnx3whm9jgjg3yh2lfi5f5kk6gypfnwc4y";
     };
   };
 
@@ -2677,12 +2677,12 @@ let
 
   vim-abolish = buildVimPluginFrom2Nix {
     pname = "vim-abolish";
-    version = "2018-11-25";
+    version = "2019-10-01";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-abolish";
-      rev = "b95463a1cffd8fc9aff2a1ff0ae9327944948699";
-      sha256 = "1cvhylz6hgvl63zhlrxqrjqqp07pm29i436xv33dzzhdp8dcj1mp";
+      rev = "3c7f939bbc99a30d1c5013bc9fa0fe967398c9ac";
+      sha256 = "0i8i912lvs281n0wn4wvqykx0aj0f1ply6pd9pbk5k0whlgf6r1v";
     };
   };
 
@@ -2897,12 +2897,12 @@ let
 
   vim-airline = buildVimPluginFrom2Nix {
     pname = "vim-airline";
-    version = "2019-09-11";
+    version = "2019-10-02";
     src = fetchFromGitHub {
       owner = "vim-airline";
       repo = "vim-airline";
-      rev = "89d1d43165c8ef6c029ee0e9590a0d67978a7c97";
-      sha256 = "0nkq6a5r2dx0jqp6ikbzbrvlfgpcn28y5l9b41bfpxkqplh03bhn";
+      rev = "62f2dc02f01da7cfa16e45a9f8ce7036a03c3420";
+      sha256 = "13ngk5riqjacn6k9l7bn4llsdld3235bda1cl3ambmv8qbwn5mk5";
     };
   };
 
@@ -2952,12 +2952,12 @@ let
 
   vim-autoformat = buildVimPluginFrom2Nix {
     pname = "vim-autoformat";
-    version = "2019-09-02";
+    version = "2019-10-01";
     src = fetchFromGitHub {
       owner = "Chiel92";
       repo = "vim-autoformat";
-      rev = "2842eb24dc9d3b9a6585a9f744fc0d62f692dabc";
-      sha256 = "1n0l1n5ymr9fgmf4cq42hdnnb4lxdkh9yaxv18gadncchwzp7cvj";
+      rev = "7d8d3979182eaee65299690b971f785fa0e1f422";
+      sha256 = "1z60mvj93krhp5cdn8ip26v3qkc9nmv5a8jf5kwkscfsfxsriqvr";
     };
   };
 
@@ -3436,12 +3436,12 @@ let
 
   vim-fugitive = buildVimPluginFrom2Nix {
     pname = "vim-fugitive";
-    version = "2019-09-30";
+    version = "2019-10-02";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-fugitive";
-      rev = "621ffb087aee3915cc149f1aa33272229993086a";
-      sha256 = "0d86zd7yi6im0zyjxcpq9gkfqlxqgpmrksdcc767smq0g9d9bm3i";
+      rev = "80aa8a9aea72f2054fb2ad8582461f60b0db9757";
+      sha256 = "0pbrx477hg5kwb6smja6lijkavrfz5jjxj843pa6vv2lf8xvrddf";
     };
   };
 
@@ -3513,12 +3513,12 @@ let
 
   vim-go = buildVimPluginFrom2Nix {
     pname = "vim-go";
-    version = "2019-09-29";
+    version = "2019-10-02";
     src = fetchFromGitHub {
       owner = "fatih";
       repo = "vim-go";
-      rev = "e50c57536be5e545663549f87b9f0ec92dbf2e20";
-      sha256 = "0aw4k753fgnwywxb8b229ixd5ngv7db8s7zqvmaaj9dx489w2mc1";
+      rev = "1df81617fbda56bf3cb2dfc289fe1f3713bdfddb";
+      sha256 = "0w6mi2fph6c1skqz4j7q30k130p30nqyylbphzjaqa32xxsq2psd";
     };
   };
 
@@ -3987,12 +3987,12 @@ let
 
   vim-lsc = buildVimPluginFrom2Nix {
     pname = "vim-lsc";
-    version = "2019-09-05";
+    version = "2019-10-01";
     src = fetchFromGitHub {
       owner = "natebosch";
       repo = "vim-lsc";
-      rev = "ff86c97cb41c1e415dfd1a3c42dfd817ff541f6d";
-      sha256 = "1lr72qxzpq4i748sb4q52ln18awxpxqqcsf13wr95d4wvrn50y61";
+      rev = "8d1691f9f191b7cfab3fe7c4606c0bb8dd7bd47d";
+      sha256 = "016589m1g7fn0705fiikgg4ypbncg8i6mvw4wm58v80s2d84az6m";
     };
   };
 
@@ -4174,12 +4174,12 @@ let
 
   vim-orgmode = buildVimPluginFrom2Nix {
     pname = "vim-orgmode";
-    version = "2019-09-13";
+    version = "2019-10-03";
     src = fetchFromGitHub {
       owner = "jceb";
       repo = "vim-orgmode";
-      rev = "2848ab2db5a2862d43d77acee04faf981f643dd0";
-      sha256 = "06cgb7zb239yk3rkym3nxy26ihm9b2ibqyvjyjgj43w1bm6jfwg5";
+      rev = "5012b8ffaaf18803d2e52e8ba4609a3ed1828653";
+      sha256 = "1liw4ixljkzbkzmjz4n0cygv8wylrw0bxiv98z9lindbm3pa0n9l";
     };
   };
 
@@ -4504,12 +4504,12 @@ let
 
   vim-signify = buildVimPluginFrom2Nix {
     pname = "vim-signify";
-    version = "2019-10-01";
+    version = "2019-10-02";
     src = fetchFromGitHub {
       owner = "mhinz";
       repo = "vim-signify";
-      rev = "909b6110ebccaf1c22b200f14ff8b5d5f0c0a039";
-      sha256 = "0kqwzqpq068hg2g9784zsaam4db6k0sncafx5ksn060ngw1r9jxw";
+      rev = "ab60166512f7ea2d361243fbf8b1593721a043a2";
+      sha256 = "037nhry4k6cmjvdmvmbfh48y56kvpygvqs714j05mijfkprj802y";
     };
   };
 
@@ -4570,12 +4570,12 @@ let
 
   vim-snippets = buildVimPluginFrom2Nix {
     pname = "vim-snippets";
-    version = "2019-09-28";
+    version = "2019-10-02";
     src = fetchFromGitHub {
       owner = "honza";
       repo = "vim-snippets";
-      rev = "67f54554409660af1b34562906c9feab4e2d9909";
-      sha256 = "181m3jpn99frds32ash1mvbh6wpawginiy2n04hagf7rmsjz5721";
+      rev = "eb76bee6e7b610298dfccb9653b1e6dbb571b0c8";
+      sha256 = "0r136z0arw36gbjkxhn7fajyf91fv4qlz8zf17npbks8x7zgcszx";
     };
   };
 
@@ -5043,12 +5043,12 @@ let
 
   vimtex = buildVimPluginFrom2Nix {
     pname = "vimtex";
-    version = "2019-09-30";
+    version = "2019-10-01";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "0bca6e13f4ebd611e0138b81a893581f36a2c49f";
-      sha256 = "0ynwz59gz0j5fd575xlssv3lm5rbhnqa0l5a6kx1dyrqrv4qlg7g";
+      rev = "e323c55e9669c1adb205295b06ec4463bae5b637";
+      sha256 = "0wcpdmblb38ym08b7k4iy1l279zcvmpnzygp5m946sija6nc34v9";
     };
   };
 
@@ -5186,24 +5186,24 @@ let
 
   yats-vim = buildVimPluginFrom2Nix {
     pname = "yats-vim";
-    version = "2019-09-05";
+    version = "2019-10-03";
     src = fetchFromGitHub {
       owner = "HerringtonDarkholme";
       repo = "yats.vim";
-      rev = "d9af5fc9fd7f11fa1219a9acb6f4243105e60b38";
-      sha256 = "1wlrxibj8q2l0lfzkg3wvzivkgz67xvi7vgrih4dgrs7a639dyl0";
+      rev = "88edbffd4f1149d308340321f1d0bbe620b1b252";
+      sha256 = "1s90kx5a2r1azc0chrq84c9pwaifndc4lzi5l7j8lrfq6saj8q1s";
       fetchSubmodules = true;
     };
   };
 
   youcompleteme = buildVimPluginFrom2Nix {
     pname = "youcompleteme";
-    version = "2019-09-18";
+    version = "2019-10-01";
     src = fetchFromGitHub {
       owner = "valloric";
       repo = "youcompleteme";
-      rev = "bdbfdd938fe711ff75155546fc0a0e0bebcb952a";
-      sha256 = "0dxip8xi6s74045hvbx6av16caid150lvywg2sn7kq5x6zcc9dgc";
+      rev = "94cfacd11ff97643a32409671fed072e3b1412d6";
+      sha256 = "0zrypbd8cwrcasg8pf7zxm7v64vq0jjqa3gwkywp76x9shxi6dk5";
       fetchSubmodules = true;
     };
   };
@@ -5232,12 +5232,12 @@ let
 
   zenburn = buildVimPluginFrom2Nix {
     pname = "zenburn";
-    version = "2019-09-20";
+    version = "2019-10-01";
     src = fetchFromGitHub {
       owner = "jnurmine";
       repo = "zenburn";
-      rev = "d39461f7ad13814307cc0115122b32901662a86e";
-      sha256 = "1ww4irkl6h2q9p1y2gj87j4hy0rh2gkfz8nyzfn32z6rjsmj5n3c";
+      rev = "90d28f75948d267058433d62b5450a3bc044ddc3";
+      sha256 = "0c7f6g4j6gz08j7r8j0qjqq2nw01vcvs5i19lzhy2gp9kh5dg85m";
     };
   };
 
-- 
GitLab


From 7b29837a6981b22edf7e6ebbee86fe9b79d269cd Mon Sep 17 00:00:00 2001
From: Tobias Mayer <tobim@fastmail.fm>
Date: Thu, 3 Oct 2019 10:25:39 +0200
Subject: [PATCH 1878/2254] vimPlugins.asterisk: init at 2019-09-23

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

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 3ad2339b62f..41989e07103 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -2939,6 +2939,17 @@ let
     };
   };
 
+  vim-asterisk = buildVimPluginFrom2Nix {
+    pname = "vim-asterisk";
+    version = "2019-09-23";
+    src = fetchFromGitHub {
+      owner = "haya14busa";
+      repo = "vim-asterisk";
+      rev = "7cf0d8f379babbdbf538aefe3af444ac4ba21dce";
+      sha256 = "0y21ziz36sqa84dy9pv2jnr0ppalxn54bsk82zfc6064h3bqn77r";
+    };
+  };
+
   vim-auto-save = buildVimPluginFrom2Nix {
     pname = "vim-auto-save";
     version = "2019-03-19";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 29701f4908d..b5649de3d59 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -101,6 +101,7 @@ guns/xterm-color-table.vim
 hashivim/vim-terraform
 haya14busa/incsearch-easymotion.vim
 haya14busa/incsearch.vim
+haya14busa/vim-asterisk
 heavenshell/vim-jsdoc
 hecal3/vim-leader-guide
 HerringtonDarkholme/yats.vim
-- 
GitLab


From 30f246e4f495fa837455b84d811f02973d3f88a6 Mon Sep 17 00:00:00 2001
From: Tobias Mayer <tobim@fastmail.fm>
Date: Thu, 3 Oct 2019 10:27:13 +0200
Subject: [PATCH 1879/2254] vimPlugins.vim-indexed-search: init at 2019-07-04

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

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 41989e07103..d33dfe9cf81 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -3742,6 +3742,17 @@ let
     };
   };
 
+  vim-indexed-search = buildVimPluginFrom2Nix {
+    pname = "vim-indexed-search";
+    version = "2019-07-04";
+    src = fetchFromGitHub {
+      owner = "henrik";
+      repo = "vim-indexed-search";
+      rev = "5af020bba084b699d0453f242d7d76711d64b1e3";
+      sha256 = "0cq265yqksh7jqazxn7qxr7bclrk2pq7py4c29wspsvbi0m3m8rc";
+    };
+  };
+
   vim-ipython = buildVimPluginFrom2Nix {
     pname = "vim-ipython";
     version = "2015-06-23";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index b5649de3d59..776e9f46b0e 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -104,6 +104,7 @@ haya14busa/incsearch.vim
 haya14busa/vim-asterisk
 heavenshell/vim-jsdoc
 hecal3/vim-leader-guide
+henrik/vim-indexed-search
 HerringtonDarkholme/yats.vim
 honza/vim-snippets
 hotwatermorning/auto-git-diff
-- 
GitLab


From 4185ed3a81c7e54d2271f879b0d5192812eaf681 Mon Sep 17 00:00:00 2001
From: Tobias Mayer <tobim@fastmail.fm>
Date: Thu, 3 Oct 2019 10:28:22 +0200
Subject: [PATCH 1880/2254] vimPlugins.vim-textobj-variable-segment: init at
 2019-05-05

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

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index d33dfe9cf81..bdebbe2b6ea 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -4810,6 +4810,17 @@ let
     };
   };
 
+  vim-textobj-variable-segment = buildVimPluginFrom2Nix {
+    pname = "vim-textobj-variable-segment";
+    version = "2019-05-05";
+    src = fetchFromGitHub {
+      owner = "Julian";
+      repo = "vim-textobj-variable-segment";
+      rev = "1af9cdef58a4072dddbe926e7c8c53903e97b70a";
+      sha256 = "0spfbc30sli7ckpfbmjspfrbcg9dq5k0aimzbxx06rimbba8f846";
+    };
+  };
+
   vim-themis = buildVimPluginFrom2Nix {
     pname = "vim-themis";
     version = "2019-08-18";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 776e9f46b0e..a960bb367a3 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -142,6 +142,7 @@ josa42/coc-go
 jpalardy/vim-slime
 JuliaEditorSupport/deoplete-julia
 JuliaEditorSupport/julia-vim
+Julian/vim-textobj-variable-segment
 junegunn/fzf.vim
 junegunn/goyo.vim
 junegunn/limelight.vim
-- 
GitLab


From eef286ca53af1ab824b93832db8be501482c55bf Mon Sep 17 00:00:00 2001
From: Tobias Mayer <tobim@fastmail.fm>
Date: Thu, 3 Oct 2019 10:30:05 +0200
Subject: [PATCH 1881/2254] vimPlugins.vim-pasta: init at 2018-09-08

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

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index bdebbe2b6ea..c3387f30175 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -4260,6 +4260,17 @@ let
     };
   };
 
+  vim-pasta = buildVimPluginFrom2Nix {
+    pname = "vim-pasta";
+    version = "2018-09-08";
+    src = fetchFromGitHub {
+      owner = "sickill";
+      repo = "vim-pasta";
+      rev = "cb4501a123d74fc7d66ac9f10b80c9d393746c66";
+      sha256 = "14rswwx24i75xzgkbx1hywan1msn2ki26353ly2pyvznnqss1pwq";
+    };
+  };
+
   vim-pathogen = buildVimPluginFrom2Nix {
     pname = "vim-pathogen";
     version = "2018-12-13";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index a960bb367a3..0a32fff23fe 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -365,6 +365,7 @@ Shougo/unite.vim
 Shougo/vimproc.vim
 Shougo/vimshell.vim
 shumphrey/fugitive-gitlab.vim
+sickill/vim-pasta
 SirVer/ultisnips
 sjl/gundo.vim
 sjl/splice.vim
-- 
GitLab


From 02795b4ed5103e05f0f9b41bc0ecb3f8dcf19b44 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 3 Oct 2019 02:15:30 -0700
Subject: [PATCH 1882/2254] racerd: 2019-03-20 -> 2019-09-02

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

diff --git a/pkgs/development/tools/rust/racerd/default.nix b/pkgs/development/tools/rust/racerd/default.nix
index fab0dc05c45..a665b466ef4 100644
--- a/pkgs/development/tools/rust/racerd/default.nix
+++ b/pkgs/development/tools/rust/racerd/default.nix
@@ -4,12 +4,12 @@ with rustPlatform;
 
 buildRustPackage rec {
   pname = "racerd";
-  version = "2019-03-20";
+  version = "unstable-2019-09-02";
   src = fetchFromGitHub {
     owner = "jwilm";
     repo = "racerd";
-    rev = "6f74488e58e42314a36ff000bae796fe54c1bdd1";
-    sha256 = "1lg7j2plxpn5l65jxhsm99vmy08ljdb666hm0y1nnmmzalrakrg1";
+    rev = "e3d380b9a1d3f3b67286d60465746bc89fea9098";
+    sha256 = "13jqdvjk4savcl03mrn2vzgdsd7vxv2racqbyavrxp2cm9h6cjln";
   };
 
   # a nightly compiler is required unless we use this cheat code.
@@ -17,7 +17,7 @@ buildRustPackage rec {
 
   doCheck = false;
 
-  cargoSha256 = "15894qr0kpp5kivx0p71zmmfhfh8in0ydkvfirxh2r12x0r2jhdd";
+  cargoSha256 = "07130587drrdkrk7aqb8pl8i3p485qr6xh1m86630ydlnb9z6s6i";
 
   buildInputs = [ makeWrapper ]
                 ++ stdenv.lib.optional stdenv.isDarwin Security;
-- 
GitLab


From 1ba3f3f00fc24ffaa2b9f075d66f738831f7a392 Mon Sep 17 00:00:00 2001
From: Bruno Bzeznik <Bruno.Bzeznik@imag.fr>
Date: Thu, 3 Oct 2019 11:18:48 +0200
Subject: [PATCH 1883/2254] SPAdes: init at 3.13.1 (#63082)

---
 .../science/biology/spades/default.nix        | 27 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/applications/science/biology/spades/default.nix

diff --git a/pkgs/applications/science/biology/spades/default.nix b/pkgs/applications/science/biology/spades/default.nix
new file mode 100644
index 00000000000..a195f79010a
--- /dev/null
+++ b/pkgs/applications/science/biology/spades/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, zlib, bzip2, cmake }:
+
+stdenv.mkDerivation rec {
+  pname = "SPAdes";
+  version = "3.13.1";
+
+  src = fetchurl {
+    url = "http://cab.spbu.ru/files/release${version}/${pname}-${version}.tar.gz";
+    sha256 = "0giayz197lmq2108filkn9izma3i803sb3iskv9hs5snzdr9p8ld";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  buildInputs = [ zlib bzip2 ];
+
+  doCheck = true;
+
+  sourceRoot = "${pname}-${version}/src";
+
+  meta = with stdenv.lib; {
+    description = "St. Petersburg genome assembler: assembly toolkit containing various assembly pipelines";
+    license = licenses.gpl2;
+    homepage = "http://cab.spbu.ru/software/spades/";
+    platforms = platforms.unix;
+    maintainers = [ maintainers.bzizou ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 15ab0bf257c..3cd3577c60a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23085,6 +23085,8 @@ in
 
   seaview = callPackage ../applications/science/biology/seaview { };
 
+  SPAdes = callPackage ../applications/science/biology/spades { };
+
   trimal = callPackage ../applications/science/biology/trimal { };
 
   varscan = callPackage ../applications/science/biology/varscan { };
-- 
GitLab


From 96097ab665fb1b908e416ba7e39ecbf0bb6b14d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 2 Oct 2019 19:33:51 +0100
Subject: [PATCH 1884/2254] linux: update fpu patches for 5.3

At the moment we experience bad instabilities with linux 5.3:

https://github.com/zfsonlinux/zfs/issues/9346

as the zfs-native method of disabling the FPU is buggy.
---
 ...=> export_kernel_fpu_functions_4_14.patch} |  0
 .../export_kernel_fpu_functions_5_3.patch     | 42 +++++++++++++++++++
 pkgs/os-specific/linux/kernel/patches.nix     | 10 ++++-
 pkgs/top-level/all-packages.nix               | 11 +++--
 4 files changed, 57 insertions(+), 6 deletions(-)
 rename pkgs/os-specific/linux/kernel/{export_kernel_fpu_functions.patch => export_kernel_fpu_functions_4_14.patch} (100%)
 create mode 100644 pkgs/os-specific/linux/kernel/export_kernel_fpu_functions_5_3.patch

diff --git a/pkgs/os-specific/linux/kernel/export_kernel_fpu_functions.patch b/pkgs/os-specific/linux/kernel/export_kernel_fpu_functions_4_14.patch
similarity index 100%
rename from pkgs/os-specific/linux/kernel/export_kernel_fpu_functions.patch
rename to pkgs/os-specific/linux/kernel/export_kernel_fpu_functions_4_14.patch
diff --git a/pkgs/os-specific/linux/kernel/export_kernel_fpu_functions_5_3.patch b/pkgs/os-specific/linux/kernel/export_kernel_fpu_functions_5_3.patch
new file mode 100644
index 00000000000..dc9ca64bdc1
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/export_kernel_fpu_functions_5_3.patch
@@ -0,0 +1,42 @@
+From 1e010beda2896bdf3082fb37a3e49f8ce20e04d8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
+Date: Thu, 2 May 2019 05:28:08 +0100
+Subject: [PATCH] x86/fpu: Export kernel_fpu_{begin,end}() with
+ EXPORT_SYMBOL_GPL
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+We need these symbols in zfs as the fpu implementation breaks userspace:
+
+https://github.com/zfsonlinux/zfs/issues/9346
+Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
+---
+ arch/x86/kernel/fpu/core.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/arch/x86/kernel/fpu/core.c b/arch/x86/kernel/fpu/core.c
+index 12c70840980e..352538b3bb5d 100644
+--- a/arch/x86/kernel/fpu/core.c
++++ b/arch/x86/kernel/fpu/core.c
+@@ -102,7 +102,7 @@ void kernel_fpu_begin(void)
+ 	}
+ 	__cpu_invalidate_fpregs_state();
+ }
+-EXPORT_SYMBOL_GPL(kernel_fpu_begin);
++EXPORT_SYMBOL(kernel_fpu_begin);
+ 
+ void kernel_fpu_end(void)
+ {
+@@ -111,7 +111,7 @@ void kernel_fpu_end(void)
+ 	this_cpu_write(in_kernel_fpu, false);
+ 	preempt_enable();
+ }
+-EXPORT_SYMBOL_GPL(kernel_fpu_end);
++EXPORT_SYMBOL(kernel_fpu_end);
+ 
+ /*
+  * Save the FPU state (mark it for reload if necessary):
+-- 
+2.23.0
+
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index b80320db282..fa5b168389b 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -59,8 +59,14 @@
   };
 
   export_kernel_fpu_functions = {
-    name = "export_kernel_fpu_functions";
-    patch = ./export_kernel_fpu_functions.patch;
+    "4.14" = {
+      name = "export_kernel_fpu_functions";
+      patch = ./export_kernel_fpu_functions_4_14.patch;
+    };
+    "5.3" = {
+      name = "export_kernel_fpu_functions";
+      patch = ./export_kernel_fpu_functions_5_3.patch;
+    };
   };
 
   # patches from https://lkml.org/lkml/2019/7/15/1748
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3cd3577c60a..614cd4e4e40 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15821,7 +15821,7 @@ in
         # when adding a new linux version
         kernelPatches.cpu-cgroup-v2."4.11"
         kernelPatches.modinst_arg_list_too_long
-        kernelPatches.export_kernel_fpu_functions
+        kernelPatches.export_kernel_fpu_functions."4.14"
       ];
   };
 
@@ -15829,7 +15829,7 @@ in
     kernelPatches =
       [ kernelPatches.bridge_stp_helper
         kernelPatches.modinst_arg_list_too_long
-        kernelPatches.export_kernel_fpu_functions
+        kernelPatches.export_kernel_fpu_functions."4.14"
       ];
   };
 
@@ -15837,12 +15837,15 @@ in
     kernelPatches =
       [ kernelPatches.bridge_stp_helper
         kernelPatches.modinst_arg_list_too_long
-        kernelPatches.export_kernel_fpu_functions
+        kernelPatches.export_kernel_fpu_functions."4.14"
       ];
   };
 
   linux_5_3 = callPackage ../os-specific/linux/kernel/linux-5.3.nix {
-    kernelPatches = [ kernelPatches.bridge_stp_helper ];
+    kernelPatches = [
+      kernelPatches.bridge_stp_helper
+      kernelPatches.export_kernel_fpu_functions."5.3"
+    ];
   };
 
   linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix {
-- 
GitLab


From cac7fdfdcdbb01e37acec1e045fe144a81af612e Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 3 Oct 2019 07:34:21 -0400
Subject: [PATCH 1885/2254] oh-my-zsh: 2019-10-01 -> 2019-10-02

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

diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix
index 12802b414b5..d322d967705 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -4,13 +4,13 @@
 { stdenv, fetchgit }:
 
 stdenv.mkDerivation rec {
-  version = "2019-10-01";
+  version = "2019-10-02";
   pname = "oh-my-zsh";
-  rev = "bb6ae70b92ce720762ff3baed65aadbd34fc1867";
+  rev = "ae0de1135dc96cfabe31d70f65112cbeadbfa3bf";
 
   src = fetchgit { inherit rev;
     url = "https://github.com/robbyrussell/oh-my-zsh";
-    sha256 = "1is3rk3bix1i8splamc6fi157pjvx25s66vvgvq298gs50k5jf9x";
+    sha256 = "1xr3xxmhqz2x2v9w15jmxb1pql8fal1smw1j59irmzvnq8zisz2y";
   };
 
   pathsToLink = [ "/share/oh-my-zsh" ];
-- 
GitLab


From 76b54c75b3bc7a17ffaa20a862246f1d7fe89b58 Mon Sep 17 00:00:00 2001
From: Nicolas Mattia <nicolas@nmattia.com>
Date: Thu, 3 Oct 2019 13:39:19 +0200
Subject: [PATCH 1886/2254] libcxxabi: don't depend on libunwind

---
 pkgs/development/compilers/llvm/7/libc++abi.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/llvm/7/libc++abi.nix b/pkgs/development/compilers/llvm/7/libc++abi.nix
index b5e6e0e7048..522c8d1a163 100644
--- a/pkgs/development/compilers/llvm/7/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/7/libc++abi.nix
@@ -1,4 +1,4 @@
-{ stdenv, cmake, fetch, libcxx, libunwind, llvm, version }:
+{ stdenv, cmake, fetch, libcxx, llvm, version }:
 
 stdenv.mkDerivation {
   pname = "libc++abi";
@@ -7,7 +7,6 @@ stdenv.mkDerivation {
   src = fetch "libcxxabi" "1zcqxsdjhawgz1cvpk07y3jl6fg9p3ay4nl69zsirqb2ghgyhhb2";
 
   nativeBuildInputs = [ cmake ];
-  buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind;
 
   postUnpack = ''
     unpackFile ${libcxx.src}
-- 
GitLab


From 7c74ebd2a631ab52618829c367e112ed24fb97a6 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 2 Oct 2019 17:09:43 +0200
Subject: [PATCH 1887/2254] python3Packages.asyncpg: fix hash

The hash to the patch is broken, even with the original revision
which adds asyncpg (ee2161c5e82b2c7be9dcfcb0105e99fee1bddd3f). As the
downloaded patch seems fine, I guess that it was generated with
`nix-prefetch-url` (the hashes for `fetchpatch` usually differ) and the
issue wasn't found as the fixed-output-derivation was already in the
contributor's store.

See https://hydra.nixos.org/build/102495795

ZHF #68361
---
 pkgs/development/python-modules/asyncpg/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/asyncpg/default.nix b/pkgs/development/python-modules/asyncpg/default.nix
index a71ffd85367..6722d3ee0fd 100644
--- a/pkgs/development/python-modules/asyncpg/default.nix
+++ b/pkgs/development/python-modules/asyncpg/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   patches = [
     (fetchpatch {
       url = "https://github.com/MagicStack/asyncpg/commit/aaeb7076e5acb045880b46155014c0640624797e.patch";
-      sha256 = "0r6g6pvb39vzci8g67mv9rlrvavqvfz6vlv8988wv53bpz1mss3p";
+      sha256 = "0l420cmk7469wgb1xq2rxinvja1f2brb5cm4smj2s2wqgymbrf6h";
     })
   ];
 
-- 
GitLab


From 334641d1127fdd90475bd128011dabc21d9b8141 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 2 Oct 2019 17:12:58 +0200
Subject: [PATCH 1888/2254] nodejs-11_x: remove

Package is EOLed by upstream: https://github.com/nodejs/Release

Fixes #69008
---
 nixos/doc/manual/release-notes/rl-1909.xml             |  5 +++++
 .../applications/version-management/sourcehut/core.nix |  6 +++---
 pkgs/development/web/nodejs/v11.nix                    | 10 ----------
 pkgs/top-level/all-packages.nix                        |  4 ----
 4 files changed, 8 insertions(+), 17 deletions(-)
 delete mode 100644 pkgs/development/web/nodejs/v11.nix

diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
index f42471c5969..66f803ac442 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -519,6 +519,11 @@
        Please use the fork <literal>cawbird</literal> instead which has been adapted to the API changes and is still maintained.
      </para>
    </listitem>
+   <listitem>
+     <para>
+      The <literal>nodejs-11_x</literal> package has been removed as it's EOLed by upstream.
+     </para>
+   </listitem>
   </itemizedlist>
  </section>
 
diff --git a/pkgs/applications/version-management/sourcehut/core.nix b/pkgs/applications/version-management/sourcehut/core.nix
index ca054c5cfde..21ee99684bd 100644
--- a/pkgs/applications/version-management/sourcehut/core.nix
+++ b/pkgs/applications/version-management/sourcehut/core.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, fetchNodeModules, buildPythonPackage
 , pgpy, flask, bleach, misaka, humanize, markdown, psycopg2, pygments, requests
 , sqlalchemy, flask_login, beautifulsoup4, sqlalchemy-utils, celery, alembic
-, sassc, nodejs-11_x
+, sassc, nodejs
 , writeText }:
 
 buildPythonPackage rec {
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   node_modules = fetchNodeModules {
     src = "${src}/srht";
-    nodejs = nodejs-11_x;
+    nodejs = nodejs;
     sha256 = "0axl50swhcw8llq8z2icwr4nkr5qsw2riih0a040f9wx4xiw4p6p";
   };
 
@@ -26,7 +26,7 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [
     sassc
-    nodejs-11_x
+    nodejs
   ];
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/web/nodejs/v11.nix b/pkgs/development/web/nodejs/v11.nix
deleted file mode 100644
index 7b60a3772d3..00000000000
--- a/pkgs/development/web/nodejs/v11.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ callPackage, openssl, enableNpm ? true }:
-
-let
-  buildNodejs = callPackage ./nodejs.nix { inherit openssl; };
-in
-  buildNodejs {
-    inherit enableNpm;
-    version = "11.15.0";
-    sha256 = "68a776c5d8b8b91a8f2adac2ca4ce4390ae1804883ec7ec9c0d6a6a64d306a76";
-  }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 614cd4e4e40..f76b3d98712 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4452,10 +4452,6 @@ in
   nodejs-slim-10_x = callPackage ../development/web/nodejs/v10.nix {
     enableNpm = false;
   };
-  nodejs-11_x = callPackage ../development/web/nodejs/v11.nix { };
-  nodejs-slim-11_x = callPackage ../development/web/nodejs/v11.nix {
-    enableNpm = false;
-  };
   nodejs-12_x = callPackage ../development/web/nodejs/v12.nix { };
   nodejs-slim-12_x = callPackage ../development/web/nodejs/v12.nix {
     enableNpm = false;
-- 
GitLab


From 594378ceeab609270541926860d7805620b39d00 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 2 Oct 2019 17:13:37 +0200
Subject: [PATCH 1889/2254] sourcehut: mark as broken

There were several custom python dependencies broken. I decided to
modify the `sourcehut` expression as it wouldn't even evaluate without
nodejs-11_x I didn't manage to get it building.
---
 pkgs/applications/version-management/sourcehut/core.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/version-management/sourcehut/core.nix b/pkgs/applications/version-management/sourcehut/core.nix
index 21ee99684bd..4b12d66a3a2 100644
--- a/pkgs/applications/version-management/sourcehut/core.nix
+++ b/pkgs/applications/version-management/sourcehut/core.nix
@@ -75,6 +75,7 @@ buildPythonPackage rec {
     homepage = https://git.sr.ht/~sircmpwn/srht;
     description = "Core modules for sr.ht";
     license = licenses.bsd3;
+    broken = true;
     maintainers = with maintainers; [ eadwu ];
   };
 }
-- 
GitLab


From c6efa9fd2d0bc9353ffc3dd497f677d7c49a3a11 Mon Sep 17 00:00:00 2001
From: talyz <kim.lindberger@gmail.com>
Date: Thu, 3 Oct 2019 14:38:54 +0200
Subject: [PATCH 1890/2254] nixos/gitlab: Clean up the initializers on start

The initializers directory is populated with files from the gitlab
distribution on start, but old files will be left in the state folder
even if they're removed from the distribution, which can lead to
startup failures. Fix this by always purging the directory on start
before populating it.
---
 nixos/modules/services/misc/gitlab.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index 58ef463c49e..0b15b40c72c 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -780,6 +780,7 @@ in {
           preStart = ''
             cp -f ${cfg.packages.gitlab}/share/gitlab/VERSION ${cfg.statePath}/VERSION
             rm -rf ${cfg.statePath}/db/*
+            rm -rf ${cfg.statePath}/config/initializers/*
             cp -rf --no-preserve=mode ${cfg.packages.gitlab}/share/gitlab/config.dist/* ${cfg.statePath}/config
             cp -rf --no-preserve=mode ${cfg.packages.gitlab}/share/gitlab/db/* ${cfg.statePath}/db
 
-- 
GitLab


From 68543580f4e67647cb55b1d06f0fe288c33e3182 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Thu, 3 Oct 2019 10:30:22 -0400
Subject: [PATCH 1891/2254] opera: use autoPatchelfHook, use wrapGAppsHook

Fixes #70322
---
 .../networking/browsers/opera/default.nix     | 116 +++++++++---------
 1 file changed, 55 insertions(+), 61 deletions(-)

diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix
index 062d2e6582b..b968c4f3d9d 100644
--- a/pkgs/applications/networking/browsers/opera/default.nix
+++ b/pkgs/applications/networking/browsers/opera/default.nix
@@ -36,60 +36,14 @@
 , systemd
 , at-spi2-atk
 , at-spi2-core
+, autoPatchelfHook
+, wrapGAppsHook
 }:
 
 let
 
   mirror = "https://get.geo.opera.com/pub/opera/desktop";
 
-  rpath = lib.makeLibraryPath [
-
-    # These provide shared libraries loaded when starting. If one is missing,
-    # an error is shown in stderr.
-    alsaLib.out
-    atk.out
-    cairo.out
-    cups
-    curl.out
-    dbus.lib
-    expat.out
-    fontconfig.lib
-    freetype.out
-    gdk-pixbuf.out
-    glib.out
-    gnome2.GConf
-    gtk3.out
-    libX11.out
-    libXScrnSaver.out
-    libXcomposite.out
-    libXcursor.out
-    libXdamage.out
-    libXext.out
-    libXfixes.out
-    libXi.out
-    libXrandr.out
-    libXrender.out
-    libXtst.out
-    libxcb.out
-    libnotify.out
-    libuuid.out
-    nspr.out
-    nss.out
-    pango.out
-    stdenv.cc.cc.lib
-
-    # This is a little tricky. Without it the app starts then crashes. Then it
-    # brings up the crash report, which also crashes. `strace -f` hints at a
-    # missing libudev.so.0.
-    systemd.lib
-
-    # Works fine without this except there is no sound.
-    libpulseaudio.out
-
-    at-spi2-atk
-    at-spi2-core
-  ];
-
 in stdenv.mkDerivation rec {
 
   pname = "opera";
@@ -102,23 +56,63 @@ in stdenv.mkDerivation rec {
 
   unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc .";
 
+  nativeBuildInputs = [
+    autoPatchelfHook
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
+    alsaLib
+    at-spi2-atk
+    at-spi2-core
+    atk
+    cairo
+    cups
+    curl
+    dbus
+    expat
+    fontconfig.lib
+    freetype
+    gdk-pixbuf
+    glib
+    gnome2.GConf
+    gtk3
+    libX11
+    libXScrnSaver
+    libXcomposite
+    libXcursor
+    libXdamage
+    libXext
+    libXfixes
+    libXi
+    libXrandr
+    libXrender
+    libXtst
+    libnotify
+    libuuid
+    libxcb
+    nspr
+    nss
+    pango
+    stdenv.cc.cc.lib
+  ];
+
+  runtimeDependencies = [
+    # Works fine without this except there is no sound.
+    libpulseaudio.out
+
+    # This is a little tricky. Without it the app starts then crashes. Then it
+    # brings up the crash report, which also crashes. `strace -f` hints at a
+    # missing libudev.so.0.
+    systemd.lib
+  ];
+
   installPhase = ''
-    mkdir --parent $out
-    mv * $out/
+    mkdir -p $out
+    cp -r . $out/
     mv $out/lib/*/opera/*.so $out/lib/
   '';
 
-  postFixup = ''
-    find $out -executable -type f \
-    | while read f
-      do
-        patchelf \
-          --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-          --set-rpath "$out/lib:${rpath}" \
-          "$f"
-      done
-  '';
-
   meta = with lib; {
     homepage = "https://www.opera.com";
     description = "Web browser";
-- 
GitLab


From d3542aae76de40387691946b0543d46a4b18e6d6 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Thu, 3 Oct 2019 14:34:17 +0000
Subject: [PATCH 1892/2254] coz: init at 0.2.0 (#68981)

---
 .../tools/analysis/coz/default.nix            | 52 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 54 insertions(+)
 create mode 100644 pkgs/development/tools/analysis/coz/default.nix

diff --git a/pkgs/development/tools/analysis/coz/default.nix b/pkgs/development/tools/analysis/coz/default.nix
new file mode 100644
index 00000000000..1ef3457e8e9
--- /dev/null
+++ b/pkgs/development/tools/analysis/coz/default.nix
@@ -0,0 +1,52 @@
+{ stdenv
+, fetchFromGitHub
+, libelfin
+, ncurses
+, python3
+, makeWrapper
+}:
+stdenv.mkDerivation rec {
+  pname = "coz";
+  version = "0.2.0";
+
+  src = fetchFromGitHub {
+    owner = "plasma-umass";
+    repo = "coz";
+    rev = version;
+    sha256 = "0a55q3s8ih1r9x6fp7wkg3n5h1yd9pcwg74k33d1r94y3j3m0znr";
+  };
+
+  postConfigure = ''
+    # This is currently hard-coded. Will be fixed in the next release.
+    sed -e "s|/usr/lib/|$out/lib/|" -i ./coz
+  '';
+
+  nativeBuildInputs = [
+    ncurses
+    makeWrapper
+  ];
+
+  buildInputs = [
+    libelfin
+    (python3.withPackages (p: [ p.docutils ]))
+  ];
+
+  installPhase = ''
+    mkdir -p $out/share/man/man1
+    make install prefix=$out
+
+    # fix executable includes
+    chmod -x $out/include/coz.h
+
+    # make sure that PYTHONPATH doesn't leak from the environment
+    wrapProgram $out/bin/coz \
+      --unset PYTHONPATH
+  '';
+
+  meta = {
+    homepage = "https://github.com/plasma-umass/coz";
+    description = "Coz: Causal Profiling";
+    license = stdenv.lib.licenses.bsd2;
+    maintainers = with stdenv.lib.maintainers; [ zimbatm ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 614cd4e4e40..fb906ed884a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25008,4 +25008,6 @@ in
 
   qubes-core-vchan-xen = callPackage ../applications/qubes/qubes-core-vchan-xen {};
 
+  coz = callPackage ../development/tools/analysis/coz {};
+
 }
-- 
GitLab


From 259556da8aba1ea3116ce7ba8bdfbaad46c634fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Thu, 3 Oct 2019 06:17:35 +0200
Subject: [PATCH 1893/2254] glib: fix loading dylibs through gobject on darwin

---
 pkgs/development/libraries/glib/default.nix | 76 +++++++++++----------
 1 file changed, 41 insertions(+), 35 deletions(-)

diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 204aa03e06f..bbe503a67f3 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -8,7 +8,7 @@
 , doCheck ? config.doCheckByDefault or false
 , coreutils, dbus, libxml2, tzdata
 , desktop-file-utils, shared-mime-info
-, darwin
+, darwin, fetchpatch
 }:
 
 with stdenv.lib;
@@ -55,40 +55,46 @@ stdenv.mkDerivation rec {
     sha256 = "046sqfmr84blxh4vkipmh8ff7wd19fxmh6lnr5ibchx3l02p49bc";
   };
 
-  patches = optional stdenv.isDarwin ./darwin-compilation.patch
-    ++ optional doCheck ./skip-timer-test.patch
-    ++ optionals stdenv.hostPlatform.isMusl [
-      ./quark_init_on_demand.patch
-      ./gobject_init_on_demand.patch
-    ] ++ [
-      ./schema-override-variable.patch
-      # Require substituteInPlace in postPatch
-      ./fix-gio-launch-desktop-path.patch
-
-      # GLib contains many binaries used for different purposes;
-      # we will install them to different outputs:
-      # 1. Tools for desktop environment ($bin)
-      #    * gapplication (non-darwin)
-      #    * gdbus
-      #    * gio
-      #    * gio-launch-desktop (symlink to $out)
-      #    * gsettings
-      # 2. Development/build tools ($dev)
-      #    * gdbus-codegen
-      #    * gio-querymodules
-      #    * glib-compile-resources
-      #    * glib-compile-schemas
-      #    * glib-genmarshal
-      #    * glib-gettextize
-      #    * glib-mkenums
-      #    * gobject-query
-      #    * gresource
-      #    * gtester
-      #    * gtester-report
-      # 3. Tools for desktop environment that cannot go to $bin due to $out depending on them ($out)
-      #    * gio-launch-desktop
-      ./split-dev-programs.patch
-    ];
+  patches = optionals stdenv.isDarwin [
+    ./darwin-compilation.patch
+    # fix loading dylibs on darwin
+    # Remove on 2.62.1
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/glib/commit/e2409e5e180f1fa369d0e87e38e4d646d9f68791.patch";
+      sha256 = "1dhjwlsqdgnn8fr8pzfrnd63m7pdgf7mizdyn8lwg17ggvq6qsqf";
+    })
+  ] ++ optionals stdenv.hostPlatform.isMusl [
+    ./quark_init_on_demand.patch
+    ./gobject_init_on_demand.patch
+  ] ++ [
+    ./schema-override-variable.patch
+    # Require substituteInPlace in postPatch
+    ./fix-gio-launch-desktop-path.patch
+
+    # GLib contains many binaries used for different purposes;
+    # we will install them to different outputs:
+    # 1. Tools for desktop environment ($bin)
+    #    * gapplication (non-darwin)
+    #    * gdbus
+    #    * gio
+    #    * gio-launch-desktop (symlink to $out)
+    #    * gsettings
+    # 2. Development/build tools ($dev)
+    #    * gdbus-codegen
+    #    * gio-querymodules
+    #    * glib-compile-resources
+    #    * glib-compile-schemas
+    #    * glib-genmarshal
+    #    * glib-gettextize
+    #    * glib-mkenums
+    #    * gobject-query
+    #    * gresource
+    #    * gtester
+    #    * gtester-report
+    # 3. Tools for desktop environment that cannot go to $bin due to $out depending on them ($out)
+    #    * gio-launch-desktop
+    ./split-dev-programs.patch
+  ] ++ optional doCheck ./skip-timer-test.patch;
 
   outputs = [ "bin" "out" "dev" "devdoc" ];
 
-- 
GitLab


From 297db487c20f1d23f001388b2ba952edbf1766b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillaume=20Mass=C3=A9?= <masgui@gmail.com>
Date: Thu, 3 Oct 2019 11:24:37 -0400
Subject: [PATCH 1894/2254] sublimetext: 3207 -> 3211

---
 pkgs/applications/editors/sublime/3/packages.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/sublime/3/packages.nix b/pkgs/applications/editors/sublime/3/packages.nix
index 82d92ba2fe1..d72966e0440 100644
--- a/pkgs/applications/editors/sublime/3/packages.nix
+++ b/pkgs/applications/editors/sublime/3/packages.nix
@@ -5,15 +5,15 @@ let
 in
   {
     sublime3-dev = common {
-      buildVersion = "3208";
+      buildVersion = "3210";
       dev = true;
-      x32sha256 = "09k04fjryc0dc6173i6nwhi5xaan89n4lp0n083crvkqwp0qlf2i";
-      x64sha256 = "12pn3yfm452m75dlyl0lyf82956j8raz2dglv328m81hbafflrj8";
+      x32sha256 = "1ngr4c8h2mafy96mi8dd3g8mg5r9ha1cpcd8p3gz7jwpbypvkkbv";
+      x64sha256 = "0j65a4ylgga1qzc74wf3k5craghahma8hwqg3zs1rgzz601nl693";
     } {};
 
     sublime3 = common {
-      buildVersion = "3207";
-      x32sha256 = "14hfb8x8zb49zjq0pd8s73xk333gmf38h5b7g979czcmbhdxiyqy";
-      x64sha256 = "1i1q9592sc8idvlpygksdkclh7h506hsz5l0i02g1814w0flzdmc";
+      buildVersion = "3211";
+      x32sha256 = "0w9hba1nl2hv1mri418n7v0m321b6wqphb1knll23ldv5fb0j1j8";
+      x64sha256 = "1vkldmimyjhbgplcd6r27gvk64rr7cparfd44hy6qdyzwsjqqg0b";
     } {};
   }
-- 
GitLab


From 0c02ecaea2b862cb0374cd64b5f5b8a71d2746e3 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 3 Oct 2019 18:23:48 +0300
Subject: [PATCH 1895/2254] gnome15: mark as broken

It doesn't support Python 3 and newer versions of libraries are Python 2-only.
---
 pkgs/applications/misc/gnome15/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/misc/gnome15/default.nix b/pkgs/applications/misc/gnome15/default.nix
index 7a918d961f6..41d535b3510 100644
--- a/pkgs/applications/misc/gnome15/default.nix
+++ b/pkgs/applications/misc/gnome15/default.nix
@@ -28,6 +28,9 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "A set of tools for configuring the Logitech G15 keyboard";
+    # Doesn't work with new `keyring` library which is Python 3-only now.
+    # https://github.com/Gnome15/gnome15/issues/29
+    broken = true;
     license = licenses.gpl3;
     homepage = https://gnome15.org/;
     platforms = platforms.linux;
-- 
GitLab


From 2dfb002a9bcaba0548d780910f2db108008bba2e Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 3 Oct 2019 18:24:25 +0300
Subject: [PATCH 1896/2254] python2.pkgs.mkrose: mark as broken

It supports only Python 3 now.
---
 pkgs/development/python-modules/mlrose/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/mlrose/default.nix b/pkgs/development/python-modules/mlrose/default.nix
index f7d43115a1b..6222921db74 100644
--- a/pkgs/development/python-modules/mlrose/default.nix
+++ b/pkgs/development/python-modules/mlrose/default.nix
@@ -1,8 +1,9 @@
-{ stdenv, buildPythonPackage, fetchPypi, scikitlearn }:
+{ stdenv, isPy27, buildPythonPackage, fetchPypi, scikitlearn }:
 
 buildPythonPackage rec {
   pname = "mlrose";
   version = "1.2.0";
+  disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-- 
GitLab


From cae2ade1f9d0fee69cac91fc77e10abc9b4c0c0a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 02:21:18 -0700
Subject: [PATCH 1897/2254] python37Packages.djangoql: 0.12.6 -> 0.13.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-djangoql/versions
---
 pkgs/development/python-modules/djangoql/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/djangoql/default.nix b/pkgs/development/python-modules/djangoql/default.nix
index 98f9c04c09f..a2bf586442c 100644
--- a/pkgs/development/python-modules/djangoql/default.nix
+++ b/pkgs/development/python-modules/djangoql/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "djangoql";
-  version = "0.12.6";
+  version = "0.13.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1mwv1ljznj9mn74ncvcyfmj6ygs8xm2rajpxm88gcac9hhdmk5gs";
+    sha256 = "0hkg0zh8w6f4krbrv4nl66blrx48yixgc8ikf915415ghlqfsbjj";
   };
 
   propagatedBuildInputs = [ ply ];
-- 
GitLab


From ce085a8ee8a57e23c6afda959e3b7df38d8b166d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 3 Oct 2019 11:56:35 -0300
Subject: [PATCH 1898/2254] matcha: 2019-09-30 -> 2019-10-03

---
 pkgs/data/themes/matcha/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix
index b5882eb98d0..0c92eb110d2 100644
--- a/pkgs/data/themes/matcha/default.nix
+++ b/pkgs/data/themes/matcha/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "matcha";
-  version = "2019-09-30";
+  version = "2019-10-03";
 
   src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = pname;
     rev = version;
-    sha256 = "1zp8s2hr33lpdyc4nihfmsc728672fa2dcji4xk6dv6b64cp1xyx";
+    sha256 = "1fxlpq3hgp6brgjkhv0g8k4gsdg6jw2z467awqgfr8a1p3ksmxpw";
   };
 
   buildInputs = [ gdk-pixbuf librsvg ];
-- 
GitLab


From dd63381444818186105582b46fb320826123f8d3 Mon Sep 17 00:00:00 2001
From: derchris <derchris@me.com>
Date: Thu, 3 Oct 2019 16:34:37 +0200
Subject: [PATCH 1899/2254] video2midi: 0.3.9.1 > 0.3.9.5

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

diff --git a/pkgs/tools/audio/video2midi/default.nix b/pkgs/tools/audio/video2midi/default.nix
index 1ed5e48077b..c664c745f32 100644
--- a/pkgs/tools/audio/video2midi/default.nix
+++ b/pkgs/tools/audio/video2midi/default.nix
@@ -8,7 +8,7 @@ let
   });
 in pythonPackages.buildPythonApplication rec {
   pname = "video2midi";
-  version = "0.3.9.1";
+  version = "0.3.9.5";
 
   format = "other";
 
@@ -16,7 +16,7 @@ in pythonPackages.buildPythonApplication rec {
     owner = "svsdval";
     repo = pname;
     rev = version;
-    sha256 = "1ndzhfng8z5080n1xkcavw21dm6rjz0x1954v9llifsdmf4cpn8y";
+    sha256 = "1jc50zimc64ilc1as3dyh16lsygwqyvi381mw8si8m9j3pw6may4";
   };
 
   propagatedBuildInputs = with pythonPackages; [ opencv3_ midiutil pygame pyopengl ];
-- 
GitLab


From e2f87b7d5f6849f35886fccacb9ed92b5fe29588 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Thu, 3 Oct 2019 16:53:10 +0200
Subject: [PATCH 1900/2254] python3Packages.spacy: 2.2.0 -> 2.2.1

Changes:

* Vectors.most_similar returns the top most similar vectors instead
  only one.
* Fixes tag map in Dutch model.
* Fix initialization of DocBin with attributes.
---
 pkgs/development/python-modules/spacy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix
index de0701430fa..44a9e09181c 100644
--- a/pkgs/development/python-modules/spacy/default.nix
+++ b/pkgs/development/python-modules/spacy/default.nix
@@ -26,11 +26,11 @@
 
 buildPythonPackage rec {
   pname = "spacy";
-  version = "2.2.0";
+  version = "2.2.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1cfgp3qnwcyiz5hs0i920aidz12j0iaargrfgf69fc6pc0n3a899";
+    sha256 = "1a833dx8i4s106fk42x4dnayaq5p3qxaxnc012xij991i09v2pxn";
   };
 
   prePatch = ''
-- 
GitLab


From 4c37faa8dafde34fb13143d817645eca837857d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Thu, 3 Oct 2019 16:59:05 +0200
Subject: [PATCH 1901/2254] python3Packages.spacy_models.nl_core_news_sm

---
 pkgs/development/python-modules/spacy/models.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/spacy/models.json b/pkgs/development/python-modules/spacy/models.json
index 8e2ab20175d..d500448dfe7 100644
--- a/pkgs/development/python-modules/spacy/models.json
+++ b/pkgs/development/python-modules/spacy/models.json
@@ -78,8 +78,8 @@
 },
 {
   "pname": "nl_core_news_sm",
-  "version": "2.2.0",
-  "sha256": "1sh5nc5mv0h5bdjhv7pddmqrcnvvyg9rk9nyqksi4b2dpc8p999h",
+  "version": "2.2.1",
+  "sha256": "0gw9a1j3v4f15cxcz7zr7dz7mqi2a3541b04q6kj74gg397li4ny",
   "license": "cc-by-sa-40"
 },
 {
-- 
GitLab


From 37c2b7fb84a0b505bb9291d3425b5fe886384f02 Mon Sep 17 00:00:00 2001
From: derchris <derchris@me.com>
Date: Thu, 3 Oct 2019 18:26:30 +0200
Subject: [PATCH 1902/2254] mysqltuner: 1.7.13 -> 1.7.17

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

diff --git a/pkgs/tools/misc/mysqltuner/default.nix b/pkgs/tools/misc/mysqltuner/default.nix
index 183871c39a7..9b7453ad1cc 100644
--- a/pkgs/tools/misc/mysqltuner/default.nix
+++ b/pkgs/tools/misc/mysqltuner/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "mysqltuner";
-  version = "1.7.13";
+  version = "1.7.17";
 
   src = fetchFromGitHub {
     owner  = "major";
     repo   = "MySQLTuner-perl";
     rev    = version;
-    sha256 = "0zxm2hjvgznbbmsqb8bpcgzc0yq1ikxz1gckirp95ibxid3jdham";
+    sha256 = "0wjdqraa6r6kd6rsgrn177dq6xsnnr1sgnbs9whknjbs4fn3wwl5";
   };
 
   buildInputs = [ perl ];
-- 
GitLab


From 7b7360dab56eade4b6b2c6c59324428f70adb83a Mon Sep 17 00:00:00 2001
From: derchris <derchris@me.com>
Date: Thu, 3 Oct 2019 18:41:06 +0200
Subject: [PATCH 1903/2254] mp3gain: 1.5.2 -> 1.6.2

---
 pkgs/applications/audio/mp3gain/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/audio/mp3gain/default.nix b/pkgs/applications/audio/mp3gain/default.nix
index 907d4b8be16..233aebfa147 100644
--- a/pkgs/applications/audio/mp3gain/default.nix
+++ b/pkgs/applications/audio/mp3gain/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, fetchurl, unzip }:
+{ stdenv, fetchurl, unzip, mpg123 }:
 
 stdenv.mkDerivation {
-  name = "mp3gain-1.5.2";
+  name = "mp3gain-1.6.2";
   src = fetchurl {
-    url = "mirror://sourceforge/mp3gain/mp3gain-1_5_2-src.zip";
-    sha256 = "1jkgry59m8cnnfq05b9y1h4x4wpy3iq8j68slb9qffwa3ajcgbfv";
+    url = "mirror://sourceforge/mp3gain/mp3gain-1_6_2-src.zip";
+    sha256 = "0varr6y7k8zarr56b42r0ad9g3brhn5vv3xjg1c0v19jxwr4gh2w";
   };
 
-  buildInputs = [ unzip ];
+  buildInputs = [ unzip mpg123 ];
 
   sourceRoot = ".";
 
-- 
GitLab


From 7a9ca5ad1ca8e10df02acbcf330a16e054b72cc0 Mon Sep 17 00:00:00 2001
From: Philipp Hausmann <philipp.hausmann@tiko.energy>
Date: Thu, 3 Oct 2019 11:48:29 +0200
Subject: [PATCH 1904/2254] kafka: Fix stop script in pure environments

---
 pkgs/servers/apache-kafka/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix
index e932b772749..7b27909856d 100644
--- a/pkgs/servers/apache-kafka/default.nix
+++ b/pkgs/servers/apache-kafka/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, jre, makeWrapper, bash, coreutils, gnugrep, gnused,
+{ stdenv, fetchurl, jre, makeWrapper, bash, coreutils, gnugrep, gnused, ps,
   majorVersion ? "1.0" }:
 
 let
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
     inherit sha256;
   };
 
-  buildInputs = [ jre makeWrapper bash gnugrep gnused coreutils ];
+  buildInputs = [ jre makeWrapper bash gnugrep gnused coreutils ps ];
 
   installPhase = ''
     mkdir -p $out
@@ -76,6 +76,9 @@ stdenv.mkDerivation rec {
     substituteInPlace $out/bin/kafka-run-class.sh \
       --replace 'LOG_DIR="$base_dir/logs"' 'LOG_DIR="$KAFKA_LOG_DIR"'
 
+    substituteInPlace $out/bin/kafka-server-stop.sh \
+      --replace 'ps' '${ps}/bin/ps'
+
     for p in $out/bin\/*.sh; do
       wrapProgram $p \
         --set JAVA_HOME "${jre}" \
-- 
GitLab


From 55771ecd78b27057b8e671bf55872c52b134a8d3 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Thu, 3 Oct 2019 13:58:33 -0400
Subject: [PATCH 1905/2254] birdfont: use vala_0_44

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

diff --git a/pkgs/tools/misc/birdfont/default.nix b/pkgs/tools/misc/birdfont/default.nix
index 092c83114e7..9dc3eb86e79 100644
--- a/pkgs/tools/misc/birdfont/default.nix
+++ b/pkgs/tools/misc/birdfont/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, python3, xmlbird,
-cairo, gdk-pixbuf, libgee, glib, gtk3, webkitgtk, libnotify, sqlite, vala,
+cairo, gdk-pixbuf, libgee, glib, gtk3, webkitgtk, libnotify, sqlite, vala_0_44,
 gobject-introspection, gsettings-desktop-schemas, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0dr2cnvq30wak0j2k8089is7fvhw0ppwkfrrw1m649s2b95wav3q";
   };
 
-  nativeBuildInputs = [ python3 pkgconfig vala gobject-introspection wrapGAppsHook ];
+  nativeBuildInputs = [ python3 pkgconfig vala_0_44 gobject-introspection wrapGAppsHook ];
   buildInputs = [ xmlbird libgee cairo gdk-pixbuf glib gtk3 webkitgtk libnotify sqlite gsettings-desktop-schemas ];
 
   postPatch = "patchShebangs .";
-- 
GitLab


From 513a68a7231274b2fcb9659d3ed893a3ab25263e Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 3 Oct 2019 21:00:39 +0200
Subject: [PATCH 1906/2254] prometheus-alertmanager: 0.18.0 -> 0.19.0

---
 pkgs/servers/monitoring/prometheus/alertmanager.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix
index f1dbf0e5144..5ad5cfc0613 100644
--- a/pkgs/servers/monitoring/prometheus/alertmanager.nix
+++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "alertmanager";
-  version = "0.18.0";
+  version = "0.19.0";
   rev = "v${version}";
 
   goPackagePath = "github.com/prometheus/alertmanager";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "prometheus";
     repo = "alertmanager";
-    sha256 = "17f3a4fiwycpd031k1d9irhd96cklbh2ygs35j5r6hgw2130sy4p";
+    sha256 = "08k898x9ks5rzcmb7ps1rnxv36ynv64x8yq2ahpwmfkmv6nw1ylh";
   };
 
   buildFlagsArray = let t = "${goPackagePath}/vendor/github.com/prometheus/common/version"; in ''
-- 
GitLab


From aad72d5c95fd02e1d1acaa863cc88f95fd631b2b Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 3 Oct 2019 21:09:00 +0200
Subject: [PATCH 1907/2254] iproute: 5.2.0 -> 5.3.0

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

diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix
index 87b7de4736f..d30ac5e62bb 100644
--- a/pkgs/os-specific/linux/iproute/default.nix
+++ b/pkgs/os-specific/linux/iproute/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "iproute2";
-  version = "5.2.0";
+  version = "5.3.0";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/net/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "1a2dywa2kam24951byv9pl32mb9z6klh7d4vp8fwfgrm4vn5vfd5";
+    sha256 = "0gvv269wjn4279hxr5zzwsk2c5qgswr47za3hm1x4frsk52iw76b";
   };
 
   preConfigure = ''
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     substituteInPlace Makefile --replace " netem " " "
   '';
 
-  outputs = [ "out" "dev"];
+  outputs = [ "out" "dev" ];
 
   makeFlags = [
     "DESTDIR="
-- 
GitLab


From ffb7d6a7ea6830219c1b11c5f5a6004601f31710 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 3 Oct 2019 21:16:09 +0200
Subject: [PATCH 1908/2254] strace: 5.2 -> 5.3

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

diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix
index c809437f6fb..4f71d5ae410 100644
--- a/pkgs/development/tools/misc/strace/default.nix
+++ b/pkgs/development/tools/misc/strace/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "strace";
-  version = "5.2";
+  version = "5.3";
 
   src = fetchurl {
     url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz";
-    sha256 = "1li49i75wrdw91hchyyd8spnzfcmxcfyfb5g9zbaza89aq4bq4ym";
+    sha256 = "0ix06z4vnc49mv76f22kixz8dsh7daqv9mpgwcgl0mlnfjc124vc";
   };
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
-- 
GitLab


From c6a010af8e47ac5011b9931e1a0082653e9899ba Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Thu, 3 Oct 2019 14:11:51 -0400
Subject: [PATCH 1909/2254] font-manager: fix build with vala 0.46

---
 pkgs/applications/misc/font-manager/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix
index 5df34c84f09..5d0854a4c72 100644
--- a/pkgs/applications/misc/font-manager/default.nix
+++ b/pkgs/applications/misc/font-manager/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, meson, ninja, gettext, python3,
+{ stdenv, fetchFromGitHub, meson, ninja, gettext, python3, fetchpatch,
   pkgconfig, libxml2, json-glib , sqlite, itstool, librsvg,
   vala, gtk3, gnome3, desktop-file-utils, wrapGAppsHook, gobject-introspection
 }:
@@ -42,6 +42,15 @@ stdenv.mkDerivation rec {
     "-Ddisable_pycompile=true"
   ];
 
+  patches = [
+    # fix build with Vala 0.46
+    (fetchpatch {
+      url = "https://github.com/FontManager/font-manager/commit/c73b40de11f376f4515a0edfe97fb3721a264b35.patch";
+      sha256 = "0lacwsifgvda2r3z6j2a0svdqr6mgav7zkvih35xa8155y8wfpnw";
+      excludes = [ "fedora/font-manager.spec" ];
+    })
+  ];
+
   postPatch = ''
     chmod +x meson_post_install.py
     patchShebangs meson_post_install.py
-- 
GitLab


From 9b1fad08a25265063c3b6a017dd1a4616f3d6623 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Thu, 3 Oct 2019 14:17:01 -0400
Subject: [PATCH 1910/2254] grip: fix build

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

diff --git a/pkgs/applications/misc/grip/default.nix b/pkgs/applications/misc/grip/default.nix
index e1dd94471cb..b7df9b49fb3 100644
--- a/pkgs/applications/misc/grip/default.nix
+++ b/pkgs/applications/misc/grip/default.nix
@@ -15,6 +15,9 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
+  # glib-2.62 deprecations
+  NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
+
   meta = {
     description = "GTK-based audio CD player/ripper";
     homepage = http://nostatic.org/grip;
-- 
GitLab


From e83ff7fc949fc66c155ffa602a92971ebcdfa186 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Thu, 3 Oct 2019 14:18:43 -0400
Subject: [PATCH 1911/2254] gxneur: fix build

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

diff --git a/pkgs/applications/misc/gxneur/default.nix b/pkgs/applications/misc/gxneur/default.nix
index 7d19a9cb110..6e6145e7908 100644
--- a/pkgs/applications/misc/gxneur/default.nix
+++ b/pkgs/applications/misc/gxneur/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation {
     sha256 = "0avmhdcj0hpr55fc0iih8fjykmdhn34c8mwdnqvl8jh4nhxxchxr";
   };
 
-  NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations";
+  # glib-2.62 deprecations
+  NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
 
   nativeBuildInputs = [ pkgconfig intltool ];
   buildInputs = [
-- 
GitLab


From 8256ec72d0a34d2b41aaf206f0a6d0b464bd0f3b Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Thu, 3 Oct 2019 14:26:21 -0400
Subject: [PATCH 1912/2254] lxqt.libfm-qt: 0.14.1 -> 2019-09-22

See: https://github.com/lxqt/libfm-qt/pull/472
---
 pkgs/desktops/lxqt/libfm-qt/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/lxqt/libfm-qt/default.nix b/pkgs/desktops/lxqt/libfm-qt/default.nix
index c214f0b3dcd..39cece7724e 100644
--- a/pkgs/desktops/lxqt/libfm-qt/default.nix
+++ b/pkgs/desktops/lxqt/libfm-qt/default.nix
@@ -5,14 +5,14 @@
 }:
 
 mkDerivation rec {
-  pname = "libfm-qt";
-  version = "0.14.1";
+  pname = "libfm-qt-unstable";
+  version = "2019-09-22";
 
   src = fetchFromGitHub {
     owner = "lxqt";
-    repo = pname;
-    rev = version;
-    sha256 = "00rn5i16h659zyp1dx213nc3jz7rx9phiw71zf6nspxzxsb8w2sc";
+    repo = "libfm-qt";
+    rev = "7c94e9efb996df0602f1f2b34b0216ba9b6df498";
+    sha256 = "1fnli2kh7n4hxmqwcb1n06lyk67d9a2fx6z70gas5jzym7r2h5vw";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From 1e5457c8b403f39650ac5ebb49d4b969cecb359d Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Thu, 3 Oct 2019 14:26:58 -0400
Subject: [PATCH 1913/2254] lxqt.lxqt-archiver: 2019-09-15 -> 2019-09-25

---
 pkgs/desktops/lxqt/lxqt-archiver/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-archiver/default.nix b/pkgs/desktops/lxqt/lxqt-archiver/default.nix
index 07a603364d7..205ea2fd201 100644
--- a/pkgs/desktops/lxqt/lxqt-archiver/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-archiver/default.nix
@@ -3,13 +3,13 @@
 mkDerivation rec {
   # pname = "lxqt-archiver";
   pname = "lxqt-archiver-unstable";
-  version = "2019-09-15";
+  version = "2019-09-25";
 
   src = fetchFromGitHub {
     owner = "lxqt";
-    repo = pname;
-    rev = "1e657b6a3e68c32f042d583872eca39a5d4b820f";
-    sha256 = "1vc9pzxrhznp65gdkzj3fzzivfqy712mwcxp3r25ar59d54alfpj";
+    repo = "lxqt-archiver";
+    rev = "62501255434b2ba6a8fd043a5af13dc0df038a5b";
+    sha256 = "1af58k68karmnay7xgngzlmcgkmvx6hay5m1xbl5id9hh16n20in";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From 6acce347fb95aa181a80234a2f7ab8448b0d1e7f Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Thu, 3 Oct 2019 14:35:11 -0400
Subject: [PATCH 1914/2254] pdfpc: fix build with vala 0.46

---
 pkgs/applications/misc/pdfpc/default.nix | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix
index c0dca056476..1adab6b70a3 100644
--- a/pkgs/applications/misc/pdfpc/default.nix
+++ b/pkgs/applications/misc/pdfpc/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, cmake, makeWrapper, pkgconfig, vala, gtk3, libgee
-, poppler, libpthreadstubs, gstreamer, gst-plugins-base, librsvg, pcre, gobject-introspection }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, vala, gtk3, libgee, fetchpatch
+, poppler, libpthreadstubs, gstreamer, gst-plugins-base, librsvg, pcre, gobject-introspection, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "${product}-${version}";
@@ -17,16 +17,20 @@ stdenv.mkDerivation rec {
     cmake pkgconfig vala
     # For setup hook
     gobject-introspection
+    wrapGAppsHook
   ];
   buildInputs = [ gstreamer gst-plugins-base gtk3 libgee poppler
-    libpthreadstubs makeWrapper librsvg pcre ];
+    libpthreadstubs librsvg pcre ];
 
   cmakeFlags = stdenv.lib.optionalString stdenv.isDarwin "-DMOVIES=OFF";
 
-  postInstall = ''
-    wrapProgram $out/bin/pdfpc \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"
-  '';
+  patches = [
+    # Fix build vala 0.46
+    (fetchpatch {
+      url = "https://github.com/pdfpc/pdfpc/commit/bbc16b97ecbdcdd22c2dc827a5c0e8b569073312.patch";
+      sha256 = "0wi1rqcvg65cxnxvmvavcvghqyksnpijq1p91m57jaby3hb0pdcy";
+    })
+  ];
 
   meta = with stdenv.lib; {
     description = "A presenter console with multi-monitor support for PDF files";
-- 
GitLab


From e4b323d47d98dcf5334d8a63bfbe8b9e4204fe20 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Thu, 3 Oct 2019 14:58:02 -0400
Subject: [PATCH 1915/2254] deepin.deepin-terminal: fix build

There appears to be issues with the xcb.vapi

Seeing errors like
xcb.vapi:411.3-411.48: error: missing return statement at end of subroutine body
---
 pkgs/desktops/deepin/deepin-terminal/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/deepin/deepin-terminal/default.nix b/pkgs/desktops/deepin/deepin-terminal/default.nix
index 11032fba0e7..bb2ab7bc8a1 100644
--- a/pkgs/desktops/deepin/deepin-terminal/default.nix
+++ b/pkgs/desktops/deepin/deepin-terminal/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, cmake, ninja, vala,
+{ stdenv, fetchFromGitHub, pkgconfig, cmake, ninja, vala_0_44,
   gettext, at-spi2-core, dbus, epoxy, expect, gtk3, json-glib,
   libXdmcp, libgee, libpthreadstubs, librsvg, libsecret, libtasn1,
   libxcb, libxkbcommon, p11-kit, pcre, vte, wnck, libselinux, gnutls, pcre2,
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     pkgconfig
     cmake
     ninja
-    vala
+    vala_0_44 # xcb.vapi:411.3-411.48: error: missing return statement at end of subroutine body
     gettext
     libselinux libsepol utillinux # required by gio
     deepin.setupHook
-- 
GitLab


From 4631a07f51e2073c98630fca0deb708342c086f5 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Thu, 3 Oct 2019 15:30:56 -0400
Subject: [PATCH 1916/2254] fontmanager: drop repositories.git attribute

---
 pkgs/applications/misc/font-manager/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix
index 5d0854a4c72..dad95490012 100644
--- a/pkgs/applications/misc/font-manager/default.nix
+++ b/pkgs/applications/misc/font-manager/default.nix
@@ -69,7 +69,6 @@ stdenv.mkDerivation rec {
       Font Manager is NOT a professional-grade font management solution.
     '';
     license = licenses.gpl3;
-    repositories.git = https://github.com/FontManager/master;
     platforms = platforms.unix;
     maintainers = [ maintainers.romildo ];
   };
-- 
GitLab


From 3002522f1ce433dbb3cdce2c86686d367dae3fd8 Mon Sep 17 00:00:00 2001
From: Tadeo Kondrak <me@tadeo.ca>
Date: Thu, 3 Oct 2019 14:39:35 -0600
Subject: [PATCH 1917/2254] wl-clipboard: 1.0.0 -> 2.0.0

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

diff --git a/pkgs/tools/misc/wl-clipboard/default.nix b/pkgs/tools/misc/wl-clipboard/default.nix
index de3a19c3f51..349d910dafc 100644
--- a/pkgs/tools/misc/wl-clipboard/default.nix
+++ b/pkgs/tools/misc/wl-clipboard/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "wl-clipboard";
-  version = "1.0.0";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "bugaevc";
     repo = "wl-clipboard";
     rev = "v${version}";
-    sha256 = "03h6ajcc30w6928bkd4h6xfj4iy2359ww6hdlybq8mr1zwmb2h0q";
+    sha256 = "0c4w87ipsw09aii34szj9p0xfy0m00wyjpll0gb0aqmwa60p0c5d";
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig wayland-protocols ];
-- 
GitLab


From 0910bb304368ae7f401f0f2381b4fc383550c64a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=83=81=E3=83=AB=E3=83=8E?= <okinan@chiru.no>
Date: Thu, 3 Oct 2019 15:47:40 -0500
Subject: [PATCH 1918/2254] vlang: 0.1.18 -> 0.1.21 (#70297)

---
 pkgs/development/compilers/vlang/default.nix | 31 ++++++++++++--------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/compilers/vlang/default.nix b/pkgs/development/compilers/vlang/default.nix
index f72ec089054..d49d651a6ca 100644
--- a/pkgs/development/compilers/vlang/default.nix
+++ b/pkgs/development/compilers/vlang/default.nix
@@ -1,42 +1,47 @@
-{ stdenv, fetchFromGitHub, glfw, freetype, openssl }:
+{ stdenv, fetchFromGitHub, glfw, freetype, openssl, upx ? null }:
+
+assert stdenv.hostPlatform.isUnix -> upx != null;
 
 stdenv.mkDerivation rec {
   pname = "vlang";
-  version = "0.1.18";
+  version = "0.1.21";
 
   src = fetchFromGitHub {
     owner = "vlang";
     repo = "v";
     rev = version;
-    sha256 = "0js92v2r1h4vaaha3z1spgi7qynlmr9vls41gxp284w4yhnjzv15";
+    sha256 = "0npd7a7nhd6r9mr99naib9scqk30209hz18nxif27284ckjbl4fk";
   };
 
   # V compiler source translated to C for bootstrap.
+  # Use matching v.c release commit for now, 0.1.21 release is not available.
   vc = fetchFromGitHub {
     owner = "vlang";
     repo = "vc";
-    rev = version;
-    sha256 = "0qx1drs1hr94w7vaaq5w8mkq7j1d3biffnmxkyz63yv8573k03bj";
+    rev = "950a90b6acaebad1c6ddec5486fc54307e38a9cd";
+    sha256 = "1dh5l2m207rip1xj677hvbp067inw28n70ddz5wxzfpmaim63c0l";
   };
 
   enableParallelBuilding = true;
-  buildInputs = [ glfw freetype openssl ];
+  buildInputs = [ glfw freetype openssl ]
+    ++ stdenv.lib.optional stdenv.hostPlatform.isUnix upx;
 
   buildPhase = ''
     runHook preBuild
     cc -std=gnu11 $CFLAGS -w -o v $vc/v.c -lm $LDFLAGS
-    ./v -prod -o v compiler
-    make thirdparty
+    ./v -prod -cflags `$CFLAGS` -o v compiler
+    # Exclude thirdparty/vschannel as it is windows-specific.
+    find thirdparty -path thirdparty/vschannel -prune -o -type f -name "*.c" -execdir cc -std=gnu11 $CFLAGS -w -c {} ';'
     runHook postBuild
   '';
 
   installPhase = ''
     runHook preInstall
-    mkdir -p $out/{bin,lib/vlang,share/vlang}
-    cp -r examples $out/share/vlang
-    cp -r {vlib,thirdparty} $out/lib/vlang
-    cp v $out/lib/vlang
-    ln -s $out/lib/vlang/v $out/bin/v
+    mkdir -p $out/{bin,lib,share}
+    cp -r examples $out/share
+    cp -r {vlib,thirdparty} $out/lib
+    cp v $out/lib
+    ln -s $out/lib/v $out/bin/v
     runHook postInstall
   '';
 
-- 
GitLab


From 48221de37a26a786982f168db09074396e528f8c Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Wed, 25 Sep 2019 19:07:47 +0200
Subject: [PATCH 1919/2254] plex: 1.16.6.1592 -> 1.17.0.1841

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

diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix
index b617fe6fa0e..197b1699749 100644
--- a/pkgs/servers/plex/raw.nix
+++ b/pkgs/servers/plex/raw.nix
@@ -8,13 +8,13 @@
 # server, and the FHS userenv and corresponding NixOS module should
 # automatically pick up the changes.
 stdenv.mkDerivation rec {
-  version = "1.16.6.1592-b9d49bdb7";
+  version = "1.17.0.1841-d42cfa161";
   pname = "plexmediaserver";
 
   # Fetch the source
   src = fetchurl {
     url = "https://downloads.plex.tv/plex-media-server-new/${version}/redhat/plexmediaserver-${version}.x86_64.rpm";
-    sha256 = "12wff06nlvcssa6sf6vhxajfd1dnr9870xn9fac4q7gf0yayj27j";
+    sha256 = "1sa3a8i204qq1hsg0dsa3f6vpsbyny88y3bskf6ljsz87c6g9kmh";
   };
 
   outputs = [ "out" "basedb" ];
-- 
GitLab


From ca18f905df34e659fb3187fd7f311f636defd707 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Thu, 3 Oct 2019 17:13:51 -0400
Subject: [PATCH 1920/2254] gnome3.seahorse: 3.32.2 -> 3.34

* dropped gobject-introspection
---
 .../gnome-3/apps/seahorse/default.nix         | 72 +++++++++++++------
 1 file changed, 49 insertions(+), 23 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/apps/seahorse/default.nix
index 670cbabf362..c6d5b22f934 100644
--- a/pkgs/desktops/gnome-3/apps/seahorse/default.nix
+++ b/pkgs/desktops/gnome-3/apps/seahorse/default.nix
@@ -1,39 +1,65 @@
-{ stdenv, fetchurl, fetchpatch, vala, meson, ninja, libpwquality
-, pkgconfig, gtk3, glib, gobject-introspection
-, wrapGAppsHook, itstool, gnupg, libsoup
-, gnome3, gpgme, python3, openldap, gcr
-, libsecret, avahi, p11-kit, openssh, gsettings-desktop-schemas }:
+{ stdenv
+, fetchurl
+, fetchpatch
+, vala
+, meson
+, ninja
+, libpwquality
+, pkgconfig
+, gtk3
+, glib
+, wrapGAppsHook
+, itstool
+, gnupg
+, libsoup
+, gnome3
+, gpgme
+, python3
+, openldap
+, gcr
+, libsecret
+, avahi
+, p11-kit
+, openssh
+, gsettings-desktop-schemas
+}:
 
 stdenv.mkDerivation rec {
   pname = "seahorse";
-  version = "3.32.2";
+  version = "3.34";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0d8zdzmlz7fjv9xl20zl4ckidf465mvdjnbpxy3k08y9iw423q4x";
+    sha256 = "16sfnqrdlr5xx6kixx2ln1mva7nngjlw1k3f5n454vyaigffjh2v";
   };
 
-  patches = [
-    # fix build with recent libsecret
-    # https://gitlab.gnome.org/GNOME/seahorse/merge_requests/83
-    (fetchpatch {
-      url = https://gitlab.gnome.org/GNOME/seahorse/commit/d9db29db567012b7c72e85e1be1fbf55fcc9b667.patch;
-      sha256 = "004zgs0n0hfc4yfmiy9lj37d67m7wxdf42sf7bzn2c3hcvpl0rcj";
-    })
-  ];
-
   doCheck = true;
 
   nativeBuildInputs = [
-    meson ninja pkgconfig vala itstool wrapGAppsHook
-    python3 gobject-introspection
+    meson
+    ninja
+    pkgconfig
+    vala
+    itstool
+    wrapGAppsHook
+    python3
   ];
+
   buildInputs = [
-    gtk3 glib gcr
-    gsettings-desktop-schemas gnupg
-    gnome3.adwaita-icon-theme gpgme
-    libsecret avahi libsoup p11-kit
-    openssh openldap libpwquality
+    gtk3
+    glib
+    gcr
+    gsettings-desktop-schemas
+    gnupg
+    gnome3.adwaita-icon-theme
+    gpgme
+    libsecret
+    avahi
+    libsoup
+    p11-kit
+    openssh
+    openldap
+    libpwquality
   ];
 
   postPatch = ''
-- 
GitLab


From 5c18c08da9fd13d583b56d3b8cc698621ce8cd16 Mon Sep 17 00:00:00 2001
From: Okinan <okinan@chiru.no>
Date: Thu, 3 Oct 2019 17:03:32 -0500
Subject: [PATCH 1921/2254] nixos/zeronet: improved config, dynamic user

---
 nixos/modules/services/networking/zeronet.nix | 92 +++++++------------
 1 file changed, 33 insertions(+), 59 deletions(-)

diff --git a/nixos/modules/services/networking/zeronet.nix b/nixos/modules/services/networking/zeronet.nix
index f4988a90268..f354a9d42c7 100644
--- a/nixos/modules/services/networking/zeronet.nix
+++ b/nixos/modules/services/networking/zeronet.nix
@@ -1,44 +1,39 @@
 { config, lib, pkgs, ... }:
 
 let
+  inherit (lib) generators literalExample mkEnableOption mkIf mkOption recursiveUpdate types;
   cfg = config.services.zeronet;
-
-  zConfFile = pkgs.writeTextFile {
-    name = "zeronet.conf";
-
-    text = ''
-      [global]
-      data_dir = ${cfg.dataDir}
-      log_dir = ${cfg.logDir}
-    '' + lib.optionalString (cfg.port != null) ''
-      ui_port = ${toString cfg.port}
-    '' + lib.optionalString (cfg.fileserverPort != null) ''
-      fileserver_port = ${toString cfg.fileserverPort}
-    '' + lib.optionalString (cfg.torAlways) ''
-      tor = always
-    '' + cfg.extraConfig;
+  dataDir = "/var/lib/zeronet";
+  configFile = pkgs.writeText "zeronet.conf" (generators.toINI {} (recursiveUpdate defaultSettings cfg.settings));
+
+  defaultSettings = {
+    global = {
+      data_dir = dataDir;
+      log_dir = dataDir;
+      ui_port = cfg.port;
+      fileserver_port = cfg.fileserverPort;
+      tor = if !cfg.tor then "disable" else if cfg.torAlways then "always" else "enable";
+    };
   };
 in with lib; {
   options.services.zeronet = {
     enable = mkEnableOption "zeronet";
 
-    dataDir = mkOption {
-      type = types.path;
-      default = "/var/lib/zeronet";
-      example = "/home/okina/zeronet";
-      description = "Path to the zeronet data directory.";
-    };
+    settings = mkOption {
+      type = with types; attrsOf (oneOf [ str int bool (listOf str) ]);
+      default = {};
+      example = literalExample "global.tor = enable;";
 
-    logDir = mkOption {
-      type = types.path;
-      default = "/var/log/zeronet";
-      example = "/home/okina/zeronet/log";
-      description = "Path to the zeronet log directory.";
+      description = ''
+        <filename>zeronet.conf</filename> configuration. Refer to
+        <link xlink:href="https://zeronet.readthedocs.io/en/latest/faq/#is-it-possible-to-use-a-configuration-file"/>
+        for details on supported values;
+      '';
     };
 
     port = mkOption {
-      type = types.nullOr types.int;
-      default = null;
+      type = types.int;
+      default = 43110;
       example = 43110;
       description = "Optional zeronet web UI port.";
     };
@@ -63,22 +58,13 @@ in with lib; {
       default = false;
       description = "Use TOR for all zeronet traffic.";
     };
-
-    extraConfig = mkOption {
-      type = types.lines;
-      default = "";
-
-      description = ''
-        Extra configuration. Contents will be added verbatim to the
-        configuration file at the end.
-      '';
-    };
   };
 
   config = mkIf cfg.enable {
     services.tor = mkIf cfg.tor {
       enable = true;
       controlPort = 9051;
+
       extraConfig = ''
         CacheDirectoryGroupReadable 1
         CookieAuthentication 1
@@ -86,37 +72,25 @@ in with lib; {
       '';
     };
 
-    systemd.tmpfiles.rules = [
-      "d '${cfg.dataDir}' 750 zeronet zeronet - -"
-      "d '${cfg.logDir}' 750 zeronet zeronet - -"
-    ];
-
     systemd.services.zeronet = {
       description = "zeronet";
       after = [ "network.target" (optionalString cfg.tor "tor.service") ];
       wantedBy = [ "multi-user.target" ];
 
       serviceConfig = {
-        PrivateTmp = "yes";
         User = "zeronet";
-        Group = "zeronet";
-        ExecStart = "${pkgs.zeronet}/bin/zeronet --config_file ${zConfFile}";
-      };
-    };
-
-    users = {
-      groups.zeronet.gid = config.ids.gids.zeronet;
-
-      users.zeronet = {
-        description = "zeronet service user";
-        home = cfg.dataDir;
-        createHome = true;
-        group = "zeronet";
-        extraGroups = mkIf cfg.tor [ "tor" ];
-        uid = config.ids.uids.zeronet;
+        DynamicUser = true;
+        StateDirectory = "zeronet";
+        SupplementaryGroups = mkIf cfg.tor [ "tor" ];
+        ExecStart = "${pkgs.zeronet}/bin/zeronet --config_file ${configFile}";
       };
     };
   };
 
+  imports = [
+    (mkRemovedOptionModule [ "services" "zeronet" "dataDir" ] "Zeronet will store data by default in /var/lib/zeronet")
+    (mkRemovedOptionModule [ "services" "zeronet" "logDir" ] "Zeronet will log by default in /var/lib/zeronet")
+  ];
+
   meta.maintainers = with maintainers; [ chiiruno ];
 }
-- 
GitLab


From 1a22abd305b1f29802d9af2c51bf68cf341b3ad0 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 2 Oct 2019 19:00:00 -0500
Subject: [PATCH 1922/2254] noti: 3.2.0 -> 3.3.0

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

diff --git a/pkgs/tools/misc/noti/default.nix b/pkgs/tools/misc/noti/default.nix
index 74b1f96fad8..b48e936d39f 100644
--- a/pkgs/tools/misc/noti/default.nix
+++ b/pkgs/tools/misc/noti/default.nix
@@ -3,18 +3,16 @@
 
 buildGoPackage rec {
   pname = "noti";
-  version = "3.2.0";
+  version = "3.3.0";
 
   src = fetchFromGitHub {
     owner = "variadico";
     repo = "noti";
     rev = version;
-    sha256 = "1lw1wmw2m83m0s5znb4gliywjpg74qrhrj6rwpcb5p352c4vbwxs";
+    sha256 = "1644bivjcky07n3rrm83vsms7hw47p4hnp2536q0z3qca5jyri2f";
   };
 
   buildInputs = lib.optional stdenv.isDarwin Cocoa;
-  # TODO: Remove this when we update apple_sdk
-  NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin "-fno-objc-arc";
 
   goPackagePath = "github.com/variadico/noti";
 
-- 
GitLab


From 08431598db3a030650d389edc457171d52c3a0d1 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 2 Oct 2019 19:01:00 -0500
Subject: [PATCH 1923/2254] noti: add marsam as maintainer

---
 pkgs/tools/misc/noti/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/noti/default.nix b/pkgs/tools/misc/noti/default.nix
index b48e936d39f..dcc946c854e 100644
--- a/pkgs/tools/misc/noti/default.nix
+++ b/pkgs/tools/misc/noti/default.nix
@@ -34,7 +34,7 @@ buildGoPackage rec {
     '';
     homepage = https://github.com/variadico/noti;
     license = licenses.mit;
-    maintainers = with maintainers; [ stites ];
+    maintainers = with maintainers; [ stites marsam ];
     platforms = platforms.all;
   };
 }
-- 
GitLab


From 223d313693ace7a3281669b41140e72f11422b68 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 21:44:01 -0700
Subject: [PATCH 1924/2254] python37Packages.feedgen: 0.7.0 -> 0.8.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-feedgen/versions
---
 pkgs/development/python-modules/feedgen/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/feedgen/default.nix b/pkgs/development/python-modules/feedgen/default.nix
index 67ff86e8f72..d59f0a702aa 100644
--- a/pkgs/development/python-modules/feedgen/default.nix
+++ b/pkgs/development/python-modules/feedgen/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "feedgen";
-  version = "0.7.0";
+  version = "0.8.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "82c9e29884e137c3e3e7959a02f142d1f7a46cd387d572e9e40150112a27604f";
+    sha256 = "0551ixbcz2gaala4gi3i8gici3haijj7dhvjsz1a61s050276m96";
   };
 
   propagatedBuildInputs = [ dateutil lxml ];
-- 
GitLab


From 9cb9e6509ee66f6089b73fa765728182aeaa2d77 Mon Sep 17 00:00:00 2001
From: Chuck <chuck@intelligence.org>
Date: Thu, 3 Oct 2019 15:18:06 -0700
Subject: [PATCH 1925/2254] nerdfonts: Use patchShebangs

In commit e8e191a1be9d after v2.0.0, nerdfonts switched from #!/bin/bash
to #!/usr/bin/env bash.  Rather than synchronizing this patching with
that change, just use patchShebangs which handles both cases.
---
 pkgs/data/fonts/nerdfonts/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/nerdfonts/default.nix b/pkgs/data/fonts/nerdfonts/default.nix
index 59b0f89e45e..454cbc09281 100644
--- a/pkgs/data/fonts/nerdfonts/default.nix
+++ b/pkgs/data/fonts/nerdfonts/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, bash, which, withFont ? "" }:
+{ stdenv, fetchFromGitHub, which, withFont ? "" }:
 
 stdenv.mkDerivation rec {
   version = "2.0.0";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   dontPatchShebangs = true;
   buildInputs = [ which ];
   patchPhase = ''
-    sed -i -e 's|/bin/bash|${bash}/bin/bash|g' install.sh
+    patchShebangs install.sh
     sed -i -e 's|font_dir="\$HOME/.local/share/fonts|font_dir="$out/share/fonts/truetype|g' install.sh
   '';
   installPhase = ''
-- 
GitLab


From 5fe43c1943246676098b073790f86b2bc7022878 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Sep 2019 18:26:02 -0700
Subject: [PATCH 1926/2254] kid3: 3.7.1 -> 3.8.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/kid3/versions
---
 pkgs/applications/audio/kid3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix
index dfb07c4f456..75ffd083a5a 100644
--- a/pkgs/applications/audio/kid3/default.nix
+++ b/pkgs/applications/audio/kid3/default.nix
@@ -9,11 +9,11 @@
 stdenv.mkDerivation rec {
 
   pname = "kid3";
-  version = "3.7.1";
+  version = "3.8.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/kid3/kid3/${version}/${pname}-${version}.tar.gz";
-    sha256 = "0xkrsjrbr3z8cn8hjf623l28r3b755gr11i0clv8d8i3s10vhbd8";
+    sha256 = "1a6ixkkdp1fl3arylx06w73mwf26i0ibyplwwcn2kw5xsfxmbjp6";
   };
 
   nativeBuildInputs = [ wrapQtAppsHook ];
-- 
GitLab


From 8b3a1c0ed0cc4bf071aaf5ebd6b9b4d25dc4318f Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 4 Oct 2019 02:08:00 +0200
Subject: [PATCH 1927/2254] wayland_1_9: remove

ancient compat version, that no longer has any use

was introduced > 3 yrs ago in https://github.com/NixOS/nixpkgs/commit/0593ad2b1613e22efa88307ee6ee4115563721fb
---
 pkgs/development/libraries/wayland/1.9.nix | 33 ----------------------
 pkgs/top-level/all-packages.nix            |  2 --
 2 files changed, 35 deletions(-)
 delete mode 100644 pkgs/development/libraries/wayland/1.9.nix

diff --git a/pkgs/development/libraries/wayland/1.9.nix b/pkgs/development/libraries/wayland/1.9.nix
deleted file mode 100644
index 7572051b1de..00000000000
--- a/pkgs/development/libraries/wayland/1.9.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ lib, stdenv, fetchurl, pkgconfig
-, libffi, libxml2
-, expat ? null # Build wayland-scanner (currently cannot be disabled as of 1.7.0)
-}:
-
-# Require the optional to be enabled until upstream fixes or removes the configure flag
-assert expat != null;
-
-stdenv.mkDerivation rec {
-  pname = "wayland";
-  version = "1.9.0";
-
-  src = fetchurl {
-    url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz";
-    sha256 = "1yhy62vkbq8j8c9zaa6yzvn75cd99kfa8n2zfdwl80x019r711ww";
-  };
-
-  configureFlags = [ "--with-scanner" "--disable-documentation" ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  buildInputs = [ libffi /* docbook_xsl doxygen graphviz libxslt xmlto */ expat libxml2 ];
-
-  meta = {
-    description = "Reference implementation of the wayland protocol";
-    homepage    = https://wayland.freedesktop.org/;
-    license     = lib.licenses.mit;
-    platforms   = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ codyopel ];
-  };
-
-  passthru.version = version;
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fb906ed884a..be4221d4b95 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14100,8 +14100,6 @@ in
 
   wayland = callPackage ../development/libraries/wayland { };
 
-  wayland_1_9 = callPackage ../development/libraries/wayland/1.9.nix { };
-
   wayland-protocols = callPackage ../development/libraries/wayland/protocols.nix { };
 
   waylandpp = callPackage ../development/libraries/waylandpp { };
-- 
GitLab


From b5a018f1487f27704889af2a52e930641906eccc Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Thu, 3 Oct 2019 20:00:00 -0500
Subject: [PATCH 1928/2254] wireguard-go: 0.0.20190517 -> 0.0.20190908

---
 .../tools/networking/wireguard-go/default.nix |  7 ++-
 pkgs/tools/networking/wireguard-go/deps.nix   | 43 ++++++++-----------
 2 files changed, 20 insertions(+), 30 deletions(-)

diff --git a/pkgs/tools/networking/wireguard-go/default.nix b/pkgs/tools/networking/wireguard-go/default.nix
index dfda88cb867..025573d7dd1 100644
--- a/pkgs/tools/networking/wireguard-go/default.nix
+++ b/pkgs/tools/networking/wireguard-go/default.nix
@@ -2,13 +2,13 @@
 
 buildGoPackage rec {
   pname = "wireguard-go";
-  version = "0.0.20190517";
+  version = "0.0.20190908";
 
-  goPackagePath = "git.zx2c4.com/wireguard-go";
+  goPackagePath = "golang.zx2c4.com/wireguard";
 
   src = fetchzip {
     url = "https://git.zx2c4.com/wireguard-go/snapshot/wireguard-go-${version}.tar.xz";
-    sha256 = "0ir3dp13vkkqr76q0jvw610qw40053ngk51psqhqxfaw3jicdqgr";
+    sha256 = "1jsch0157nk86krdknij7dsvg6i7ar0ydhy07r40drhxqyp3q0hx";
   };
 
   goDeps = ./deps.nix;
@@ -20,6 +20,5 @@ buildGoPackage rec {
     homepage = https://git.zx2c4.com/wireguard-go/about/;
     license = licenses.gpl2;
     maintainers = with maintainers; [ elseym kirelagin yegortimoshenko zx2c4 ];
-    platforms = platforms.darwin;
   };
 }
diff --git a/pkgs/tools/networking/wireguard-go/deps.nix b/pkgs/tools/networking/wireguard-go/deps.nix
index 6ebef971e59..5501ebdc6c2 100644
--- a/pkgs/tools/networking/wireguard-go/deps.nix
+++ b/pkgs/tools/networking/wireguard-go/deps.nix
@@ -1,30 +1,12 @@
 # file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
 [
-  {
-    goPackagePath = "github.com/Microsoft/go-winio";
-    fetch = {
-      type = "git";
-      url = "https://github.com/Microsoft/go-winio";
-      rev = "v0.4.12";
-      sha256 = "10v2f1xaw2cc97mjqnxzgs9ydpqv71f0ynp1spcywqw97la56zqw";
-    };
-  }
-  {
-    goPackagePath = "github.com/pkg/errors";
-    fetch = {
-      type = "git";
-      url = "https://github.com/pkg/errors";
-      rev = "v0.8.1";
-      sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1";
-    };
-  }
   {
     goPackagePath = "golang.org/x/crypto";
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/crypto";
-      rev = "a29dc8fdc734";
-      sha256 = "07f0jj4haqs0ywc1akk1qjwn5msl2j0pry1rxjkkbfcq4r6ihc1p";
+      rev = "9756ffdc2472";
+      sha256 = "0q7hxaaq6lp0v8qqzifvysl47z5rfdlrxkh3d29vsl3wyby3dxl8";
     };
   }
   {
@@ -32,8 +14,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/net";
-      rev = "7f726cade0ab";
-      sha256 = "0zv5var5agbhd2mcn7lciwip0j49gxka73f0csvh3hvb1di068gn";
+      rev = "ba9fcec4b297";
+      sha256 = "1hbqvy6r0s5h0dpdqw8fynl3cq0acin3iyqki9xvl5r8h33yb9bx";
     };
   }
   {
@@ -41,8 +23,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/sys";
-      rev = "a43fa875dd82";
-      sha256 = "0xvwwaqcj02a9n8izs4zrlg8vvz7wffli955i93nc34m1f0w8vyg";
+      rev = "19e00faab6ad";
+      sha256 = "0znjx9xbyjdvk8cafdc1jl22gg29asxl5yl7mi3yz6zx3h39rm8y";
     };
   }
   {
@@ -50,8 +32,17 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/text";
-      rev = "v0.3.0";
-      sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
+      rev = "v0.3.2";
+      sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/tools";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/tools";
+      rev = "90fa682c2a6e";
+      sha256 = "03ic2xsy51jw9749wl7gszdbz99iijbd2bckgygl6cm9w5m364ak";
     };
   }
 ]
-- 
GitLab


From eb14b000e589417ab5a136b6f8b25984b814d84c Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Thu, 3 Oct 2019 22:27:04 -0400
Subject: [PATCH 1929/2254] nixos/gnome3: copy gnome-shell override

Without this these default settings overrides to gnome-shell
don't appear to be used completely.
---
 nixos/modules/services/x11/desktop-managers/gnome3.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 9b0c8d752ce..20385c884b5 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -28,6 +28,8 @@ let
         (pkg: "cp -rf ${pkg}/share/gsettings-schemas/*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas\n")
         (defaultPackages ++ cfg.extraGSettingsOverridePackages)}
 
+     cp -f ${pkgs.gnome3.gnome-shell}/share/gsettings-schemas/*/glib-2.0/schemas/*.gschema.override $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
+
      chmod -R a+w $out/share/gsettings-schemas/nixos-gsettings-overrides
      cat - > $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/nixos-defaults.gschema.override <<- EOF
        [org.gnome.desktop.background]
-- 
GitLab


From 42710203b04738b8f19ae51f0fd21d22fddf3f39 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 3 Oct 2019 23:39:39 -0400
Subject: [PATCH 1930/2254] llvm9/clang.nix: fix clang on macos

Fixes #70243
---
 pkgs/development/compilers/llvm/9/clang/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/llvm/9/clang/default.nix b/pkgs/development/compilers/llvm/9/clang/default.nix
index df6b916e87f..bf9b1a32a83 100644
--- a/pkgs/development/compilers/llvm/9/clang/default.nix
+++ b/pkgs/development/compilers/llvm/9/clang/default.nix
@@ -71,6 +71,7 @@ let
 
       # Move libclang to 'lib' output
       moveToOutput "lib/libclang.*" "$lib"
+      moveToOutput "lib/libclang-cpp.*" "$lib"
       substituteInPlace $out/lib/cmake/clang/ClangTargets-release.cmake \
           --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang."
 
-- 
GitLab


From ad3f51f737d4022e1cf9539ce0649a38d4fb1daf Mon Sep 17 00:00:00 2001
From: cw <789@webuhu.at>
Date: Fri, 27 Sep 2019 10:10:38 +0200
Subject: [PATCH 1931/2254] nextcloud: 16.0.5 -> 17.0.0

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

diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix
index c99ccc6e3cc..3b994337e9c 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "nextcloud";
-  version = "16.0.5";
+  version = "17.0.0";
 
   src = fetchurl {
     url = "https://download.nextcloud.com/server/releases/${pname}-${version}.tar.bz2";
-    sha256 = "0lg5zaakfdngrh0ida0qbq76jbiab5fv46jziqf77zbnlx7wc2c7";
+    sha256 = "19j2l4qxkqsxcw75gvkinjqawia07wx2kcmzn8q33nzc6cdl50b0";
   };
 
   installPhase = ''
-- 
GitLab


From 3dc70841d32c237bf3b6f0b739956d228084bbc6 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Fri, 4 Oct 2019 02:51:10 +0000
Subject: [PATCH 1932/2254] cbc: 2.10.2 -> 2.10.3

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

diff --git a/pkgs/applications/science/math/cbc/default.nix b/pkgs/applications/science/math/cbc/default.nix
index d0857e2a517..e68ceb379b0 100644
--- a/pkgs/applications/science/math/cbc/default.nix
+++ b/pkgs/applications/science/math/cbc/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "cbc";
-  version = "2.10.2";
+  version = "2.10.3";
 
   src = fetchurl {
     url = "https://www.coin-or.org/download/source/Cbc/Cbc-${version}.tgz";
-    sha256 = "0frbxkh6nbh46kaxsx5bmzridgip3v7aq75l8yak5npiiq4jlwv3";
+    sha256 = "1zzcg40ky5v96s7br2hqlkqdspwrn43kf3757g6c35wl29bq6f5d";
   };
 
   configureFlags = [ "-C" ];
-- 
GitLab


From 2455b2e3091d406e9902dc57a9b618860d66adef Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Fri, 4 Oct 2019 02:51:43 +0000
Subject: [PATCH 1933/2254] or-tools: 7.0 -> 7.3

---
 .../libraries/science/math/or-tools/build.patch       |  5 +++++
 .../libraries/science/math/or-tools/default.nix       | 11 ++++++++---
 .../libraries/science/math/or-tools/protobuf.patch    | 10 ++++++++++
 3 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/libraries/science/math/or-tools/build.patch
 create mode 100644 pkgs/development/libraries/science/math/or-tools/protobuf.patch

diff --git a/pkgs/development/libraries/science/math/or-tools/build.patch b/pkgs/development/libraries/science/math/or-tools/build.patch
new file mode 100644
index 00000000000..a67e137ff4a
--- /dev/null
+++ b/pkgs/development/libraries/science/math/or-tools/build.patch
@@ -0,0 +1,5 @@
+--- a/makefiles/Makefile.python.mk
++++ b/makefiles/Makefile.python.mk
+@@ -1070 +1070 @@ $(PYPI_ARCHIVE_TEMP_DIR)/ortools/ortools/data: $(PYDATA_LIBS) | $(PYPI_ARCHIVE_T
+-$(PYPI_ARCHIVE_TEMP_DIR)/ortools/ortools/util: $(PYUTIL_LIBS) | $(PYPI_ARCHIVE_TEMP_DIR)/ortools/ortools
++$(PYPI_ARCHIVE_TEMP_DIR)/ortools/ortools/util: $(PYSORTED_INTERVAL_LIST_LIBS) | $(PYPI_ARCHIVE_TEMP_DIR)/ortools/ortools
diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix
index c6e065320a2..224f4239a22 100644
--- a/pkgs/development/libraries/science/math/or-tools/default.nix
+++ b/pkgs/development/libraries/science/math/or-tools/default.nix
@@ -5,15 +5,20 @@
 
 stdenv.mkDerivation rec {
   pname = "or-tools";
-  version = "v7.0";
+  version = "7.3";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "or-tools";
-    rev = version;
-    sha256 = "09rs2j3w4ljw9qhhnsjlvfii297njjszwvkbgj1i6kns3wnlr7cp";
+    rev = "v${version}";
+    sha256 = "0q06vxmds6nm3dpjw4y5jzr8j98qgfb9i8pbm9pfhmqigv791hwc";
   };
 
+  patches = [
+    ./build.patch # https://github.com/google/or-tools/pull/1619
+    ./protobuf.patch # Otherwise it tries to install protobuf from pypi.
+  ];
+
   # The original build system uses cmake which does things like pull
   # in dependencies through git and Makefile creation time. We
   # obviously don't want to do this so instead we provide the
diff --git a/pkgs/development/libraries/science/math/or-tools/protobuf.patch b/pkgs/development/libraries/science/math/or-tools/protobuf.patch
new file mode 100644
index 00000000000..b0cce40434c
--- /dev/null
+++ b/pkgs/development/libraries/science/math/or-tools/protobuf.patch
@@ -0,0 +1,10 @@
+--- a/makefiles/Makefile.third_party.unix.mk
++++ b/makefiles/Makefile.third_party.unix.mk
+@@ -24,1 +24,1 @@ GLOG_TAG = 0.4.0
+-PROTOBUF_TAG = 3.9.0
++PROTOBUF_TAG = 3.7.0
+--- a/makefiles/Makefile.third_party.win.mk
++++ b/makefiles/Makefile.third_party.win.mk
+@@ -40 +40 @@ GLOG_TAG = 0.4.0
+-PROTOBUF_TAG = 3.9.0
++PROTOBUF_TAG = 3.7.0
-- 
GitLab


From 4f2119af050f09a5e11be61780c54d2008b1380a Mon Sep 17 00:00:00 2001
From: Sascha Grunert <sgrunert@suse.com>
Date: Fri, 4 Oct 2019 08:42:39 +0200
Subject: [PATCH 1934/2254] podman: 1.5.1 -> 1.6.1

Signed-off-by: Sascha Grunert <sgrunert@suse.com>
---
 pkgs/applications/virtualization/podman/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix
index ff768cb7878..35a89f3f989 100644
--- a/pkgs/applications/virtualization/podman/default.nix
+++ b/pkgs/applications/virtualization/podman/default.nix
@@ -5,13 +5,13 @@
 
 buildGoPackage rec {
   pname = "podman";
-  version = "1.5.1";
+  version = "1.6.1";
 
   src = fetchFromGitHub {
     owner  = "containers";
     repo   = "libpod";
     rev    = "v${version}";
-    sha256 = "1jg7fdshqz0x71339i0wndskb17x1k5rwpkjiwd463f96fnbfp4x";
+    sha256 = "0s9jxcjx9bkml606rn29358pfavd85m6zshra4qkpbc1iwa6hgr9";
   };
 
   goPackagePath = "github.com/containers/libpod";
-- 
GitLab


From c1e531bf5edfa7e039b04ac2510ce0d41e0b44f3 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Fri, 4 Oct 2019 08:55:46 +0200
Subject: [PATCH 1935/2254] php73: 7.3.9 -> 7.3.10

Changelog: https://www.php.net/ChangeLog-7.php#7.3.10
---
 pkgs/development/interpreters/php/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 508339d0da6..7fc5473d691 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -262,8 +262,8 @@ in {
   };
 
   php73 = generic {
-    version = "7.3.9";
-    sha256 = "1i33v50rbqrfwjwch1d46mbpwbxrg1xfycs9mjl7xsy9m04rg753";
+    version = "7.3.10";
+    sha256 = "0j2lqiw8miv9aqg55z2dvfg3mwm5vyqx6ggmfbw013zvq1qxhvah";
 
     # https://bugs.php.net/bug.php?id=76826
     extraPatches = optional stdenv.isDarwin ./php73-darwin-isfinite.patch;
-- 
GitLab


From b5f73124e4ffc367a1abc8fe41ace190fd2ccdcd Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Fri, 4 Oct 2019 08:58:32 +0200
Subject: [PATCH 1936/2254] php72: 7.2.22 -> 7.2.23

Changelog: https://www.php.net/ChangeLog-7.php#7.2.23
---
 pkgs/development/interpreters/php/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 7fc5473d691..6d0aeb78156 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -254,8 +254,8 @@ let
 
 in {
   php72 = generic {
-    version = "7.2.22";
-    sha256 = "12phn0rrd5r1j6xlz83h7v6gszmj4lb5gwj927psbbc6nn1rh2n1";
+    version = "7.2.23";
+    sha256 = "03a3snx8wdn2pwfy8qdk035da9g3qdnpgqvpz4qfgmr97mjg6ym1";
 
     # https://bugs.php.net/bug.php?id=76826
     extraPatches = optional stdenv.isDarwin ./php72-darwin-isfinite.patch;
-- 
GitLab


From 734e02a643bb8a16058a92ead7c478d683df2959 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@fysik.su.se>
Date: Fri, 4 Oct 2019 10:40:52 +0200
Subject: [PATCH 1937/2254] slurm: 19.05.2.1 -> 19.05.3.2

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

diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix
index c448e4936f6..87ee924bbd3 100644
--- a/pkgs/servers/computing/slurm/default.nix
+++ b/pkgs/servers/computing/slurm/default.nix
@@ -8,7 +8,7 @@
 
 stdenv.mkDerivation rec {
   pname = "slurm";
-  version = "19.05.2.1";
+  version = "19.05.3.2";
 
   # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php
   # because the latter does not keep older releases.
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     repo = "slurm";
     # The release tags use - instead of .
     rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}";
-    sha256 = "1k19z0qyjr6nwqxv93wbnnhy498788rc4fl9zyf0smc5yq1zbjir";
+    sha256 = "1ds4dvwswyx9rjcmcwz2fm2zi3q4gcc2n0fxxihl31i5i6wg1kv0";
   };
 
   outputs = [ "out" "dev" ];
-- 
GitLab


From 011c984b45c2f886a00386e973e5a271d3e1adfb Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 4 Oct 2019 04:20:00 -0500
Subject: [PATCH 1938/2254] gitAndTools.delta: init at 0.0.12

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

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index a0f39bad363..cb098f50276 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -24,6 +24,8 @@ let
 
   darcsToGit = callPackage ./darcs-to-git { };
 
+  delta = callPackage ./delta { };
+
   diff-so-fancy = callPackage ./diff-so-fancy { };
 
   ghq = callPackage ./ghq { };
diff --git a/pkgs/applications/version-management/git-and-tools/delta/default.nix b/pkgs/applications/version-management/git-and-tools/delta/default.nix
new file mode 100644
index 00000000000..d4040c3a2a1
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/delta/default.nix
@@ -0,0 +1,22 @@
+{ lib, fetchFromGitHub, rustPlatform }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "delta";
+  version = "0.0.12";
+
+  src = fetchFromGitHub {
+    owner = "dandavison";
+    repo = pname;
+    rev = version;
+    sha256 = "10jmawxzqgz7gjg1xdna9q2v6l1qlf83ybbqxcbx6941s15lgs7x";
+  };
+
+  cargoSha256 = "1888bvkpalfcw9bc9zmf9bmil6x35l9ia31x6mx1h2dvrfpw3bb1";
+
+  meta = with lib; {
+    homepage = "https://github.com/dandavison/delta";
+    description = "A syntax-highlighting pager for git";
+    license = licenses.mit;
+    maintainers = [ maintainers.marsam ];
+  };
+}
-- 
GitLab


From 2691337a68c3c23d85679800b824bb6e049a7885 Mon Sep 17 00:00:00 2001
From: Quentin Vaucher <quentin.vaucher@protonmail.com>
Date: Fri, 4 Oct 2019 11:59:55 +0200
Subject: [PATCH 1939/2254] timetable: 1.0.8 -> 1.0.9

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

diff --git a/pkgs/applications/office/timetable/default.nix b/pkgs/applications/office/timetable/default.nix
index fa2d5939218..6d8f095dc9c 100644
--- a/pkgs/applications/office/timetable/default.nix
+++ b/pkgs/applications/office/timetable/default.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "timetable";
-  version = "1.0.8";
+  version = "1.0.9";
 
   src = fetchFromGitHub {
     owner = "lainsce";
     repo = pname;
     rev = version;
-    sha256 = "0s825al10s0hwfzl90bplwwasx89wx28n41sg2md71l9hfqy296q";
+    sha256 = "1n02y7vpi4lb888iic06xifc86n2xirk50s1ssf84vlc5md1kq9f";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From c6be8bfc1011c82ea4cfa99ec87acc1c1b27922b Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Fri, 4 Oct 2019 12:03:09 +0200
Subject: [PATCH 1940/2254] desmume: copy debian patches

Obtained from
http://deb.debian.org/debian/pool/main/d/desmume/desmume_0.9.11-3.diff.gz
since desmume never moved to salsa.debian.org (previously on
anonscm.debian.org as a subversion repo)
---
 .../desmume/01_use_system_tinyxml.patch       | 231 ++++++++++++++++++
 pkgs/misc/emulators/desmume/default.nix       |  11 +-
 pkgs/misc/emulators/desmume/gcc6_fixes.patch  |  59 +++++
 pkgs/misc/emulators/desmume/gcc7_fixes.patch  |  18 ++
 4 files changed, 313 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/misc/emulators/desmume/01_use_system_tinyxml.patch
 create mode 100644 pkgs/misc/emulators/desmume/gcc6_fixes.patch
 create mode 100644 pkgs/misc/emulators/desmume/gcc7_fixes.patch

diff --git a/pkgs/misc/emulators/desmume/01_use_system_tinyxml.patch b/pkgs/misc/emulators/desmume/01_use_system_tinyxml.patch
new file mode 100644
index 00000000000..8cec26026e7
--- /dev/null
+++ b/pkgs/misc/emulators/desmume/01_use_system_tinyxml.patch
@@ -0,0 +1,231 @@
+From: Evgeni Golov <evgeni@debian.org>
+Subject: use the system tinyxml instead of the embedded copy
+Last-Update: 2015-08-09
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 7b9e263..bc7ba8c 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -81,12 +81,6 @@ libdesmume_a_SOURCES = \
+ 	utils/libfat/mem_allocate.h \
+ 	utils/libfat/partition.cpp \
+ 	utils/libfat/partition.h \
+-	utils/tinyxml/tinystr.cpp \
+-	utils/tinyxml/tinystr.h \
+-	utils/tinyxml/tinyxml.cpp \
+-	utils/tinyxml/tinyxml.h \
+-	utils/tinyxml/tinyxmlerror.cpp \
+-	utils/tinyxml/tinyxmlparser.cpp \
+ 	utils/glcorearb.h \
+ 	addons/slot2_auto.cpp addons/slot2_mpcf.cpp addons/slot2_paddle.cpp addons/slot2_gbagame.cpp addons/slot2_none.cpp addons/slot2_rumblepak.cpp addons/slot2_guitarGrip.cpp addons/slot2_expMemory.cpp addons/slot2_piano.cpp addons/slot2_passme.cpp addons/slot1_none.cpp addons/slot1_r4.cpp addons/slot1_retail_nand.cpp addons/slot1_retail_auto.cpp addons/slot1_retail_mcrom.cpp addons/slot1_retail_mcrom_debug.cpp addons/slot1comp_mc.cpp addons/slot1comp_mc.h addons/slot1comp_rom.h addons/slot1comp_rom.cpp addons/slot1comp_protocol.h addons/slot1comp_protocol.cpp \
+ 	cheatSystem.cpp cheatSystem.h \
+@@ -204,3 +198,4 @@ if HAVE_GDB_STUB
+ libdesmume_a_SOURCES += gdbstub.h
+ endif
+ libdesmume_a_LIBADD = fs-$(desmume_arch).$(OBJEXT)
++LIBS += -ltinyxml
+diff --git a/src/Makefile.in b/src/Makefile.in
+index 9cf26a3..d9ff7b2 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -184,9 +184,6 @@ am__libdesmume_a_SOURCES_DIST = armcpu.cpp armcpu.h \
+ 	utils/libfat/libfat_public_api.h utils/libfat/lock.cpp \
+ 	utils/libfat/lock.h utils/libfat/mem_allocate.h \
+ 	utils/libfat/partition.cpp utils/libfat/partition.h \
+-	utils/tinyxml/tinystr.cpp utils/tinyxml/tinystr.h \
+-	utils/tinyxml/tinyxml.cpp utils/tinyxml/tinyxml.h \
+-	utils/tinyxml/tinyxmlerror.cpp utils/tinyxml/tinyxmlparser.cpp \
+ 	utils/glcorearb.h addons/slot2_auto.cpp addons/slot2_mpcf.cpp \
+ 	addons/slot2_paddle.cpp addons/slot2_gbagame.cpp \
+ 	addons/slot2_none.cpp addons/slot2_rumblepak.cpp \
+@@ -324,10 +321,6 @@ am_libdesmume_a_OBJECTS = armcpu.$(OBJEXT) arm_instructions.$(OBJEXT) \
+ 	utils/libfat/libfat.$(OBJEXT) \
+ 	utils/libfat/libfat_public_api.$(OBJEXT) \
+ 	utils/libfat/lock.$(OBJEXT) utils/libfat/partition.$(OBJEXT) \
+-	utils/tinyxml/tinystr.$(OBJEXT) \
+-	utils/tinyxml/tinyxml.$(OBJEXT) \
+-	utils/tinyxml/tinyxmlerror.$(OBJEXT) \
+-	utils/tinyxml/tinyxmlparser.$(OBJEXT) \
+ 	addons/slot2_auto.$(OBJEXT) addons/slot2_mpcf.$(OBJEXT) \
+ 	addons/slot2_paddle.$(OBJEXT) addons/slot2_gbagame.$(OBJEXT) \
+ 	addons/slot2_none.$(OBJEXT) addons/slot2_rumblepak.$(OBJEXT) \
+@@ -475,7 +468,7 @@ LIBAGG_LIBS = @LIBAGG_LIBS@
+ LIBGLADE_CFLAGS = @LIBGLADE_CFLAGS@
+ LIBGLADE_LIBS = @LIBGLADE_LIBS@
+ LIBOBJS = @LIBOBJS@
+-LIBS = @LIBS@
++LIBS = @LIBS@ -ltinyxml
+ LIBSOUNDTOUCH_CFLAGS = @LIBSOUNDTOUCH_CFLAGS@
+ LIBSOUNDTOUCH_LIBS = @LIBSOUNDTOUCH_LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+@@ -625,9 +618,6 @@ libdesmume_a_SOURCES = armcpu.cpp armcpu.h arm_instructions.cpp \
+ 	utils/libfat/libfat_public_api.h utils/libfat/lock.cpp \
+ 	utils/libfat/lock.h utils/libfat/mem_allocate.h \
+ 	utils/libfat/partition.cpp utils/libfat/partition.h \
+-	utils/tinyxml/tinystr.cpp utils/tinyxml/tinystr.h \
+-	utils/tinyxml/tinyxml.cpp utils/tinyxml/tinyxml.h \
+-	utils/tinyxml/tinyxmlerror.cpp utils/tinyxml/tinyxmlparser.cpp \
+ 	utils/glcorearb.h addons/slot2_auto.cpp addons/slot2_mpcf.cpp \
+ 	addons/slot2_paddle.cpp addons/slot2_gbagame.cpp \
+ 	addons/slot2_none.cpp addons/slot2_rumblepak.cpp \
+@@ -760,20 +750,6 @@ utils/libfat/lock.$(OBJEXT): utils/libfat/$(am__dirstamp) \
+ 	utils/libfat/$(DEPDIR)/$(am__dirstamp)
+ utils/libfat/partition.$(OBJEXT): utils/libfat/$(am__dirstamp) \
+ 	utils/libfat/$(DEPDIR)/$(am__dirstamp)
+-utils/tinyxml/$(am__dirstamp):
+-	@$(MKDIR_P) utils/tinyxml
+-	@: > utils/tinyxml/$(am__dirstamp)
+-utils/tinyxml/$(DEPDIR)/$(am__dirstamp):
+-	@$(MKDIR_P) utils/tinyxml/$(DEPDIR)
+-	@: > utils/tinyxml/$(DEPDIR)/$(am__dirstamp)
+-utils/tinyxml/tinystr.$(OBJEXT): utils/tinyxml/$(am__dirstamp) \
+-	utils/tinyxml/$(DEPDIR)/$(am__dirstamp)
+-utils/tinyxml/tinyxml.$(OBJEXT): utils/tinyxml/$(am__dirstamp) \
+-	utils/tinyxml/$(DEPDIR)/$(am__dirstamp)
+-utils/tinyxml/tinyxmlerror.$(OBJEXT): utils/tinyxml/$(am__dirstamp) \
+-	utils/tinyxml/$(DEPDIR)/$(am__dirstamp)
+-utils/tinyxml/tinyxmlparser.$(OBJEXT): utils/tinyxml/$(am__dirstamp) \
+-	utils/tinyxml/$(DEPDIR)/$(am__dirstamp)
+ addons/$(am__dirstamp):
+ 	@$(MKDIR_P) addons
+ 	@: > addons/$(am__dirstamp)
+@@ -1035,10 +1011,6 @@ mostlyclean-compile:
+ 	-rm -f utils/libfat/partition.$(OBJEXT)
+ 	-rm -f utils/md5.$(OBJEXT)
+ 	-rm -f utils/task.$(OBJEXT)
+-	-rm -f utils/tinyxml/tinystr.$(OBJEXT)
+-	-rm -f utils/tinyxml/tinyxml.$(OBJEXT)
+-	-rm -f utils/tinyxml/tinyxmlerror.$(OBJEXT)
+-	-rm -f utils/tinyxml/tinyxmlparser.$(OBJEXT)
+ 	-rm -f utils/vfat.$(OBJEXT)
+ 	-rm -f utils/xstring.$(OBJEXT)
+ 
+@@ -1175,10 +1147,6 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@utils/libfat/$(DEPDIR)/libfat_public_api.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@utils/libfat/$(DEPDIR)/lock.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@utils/libfat/$(DEPDIR)/partition.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@utils/tinyxml/$(DEPDIR)/tinystr.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@utils/tinyxml/$(DEPDIR)/tinyxml.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@utils/tinyxml/$(DEPDIR)/tinyxmlerror.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@utils/tinyxml/$(DEPDIR)/tinyxmlparser.Po@am__quote@
+ 
+ .c.o:
+ @am__fastdepCC_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@@ -1449,8 +1417,6 @@ distclean-generic:
+ 	-rm -f utils/decrypt/$(am__dirstamp)
+ 	-rm -f utils/libfat/$(DEPDIR)/$(am__dirstamp)
+ 	-rm -f utils/libfat/$(am__dirstamp)
+-	-rm -f utils/tinyxml/$(DEPDIR)/$(am__dirstamp)
+-	-rm -f utils/tinyxml/$(am__dirstamp)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -1460,7 +1426,7 @@ clean: clean-recursive
+ clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
+ 
+ distclean: distclean-recursive
+-	-rm -rf ./$(DEPDIR) addons/$(DEPDIR) filter/$(DEPDIR) metaspu/$(DEPDIR) utils/$(DEPDIR) utils/AsmJit/core/$(DEPDIR) utils/AsmJit/x86/$(DEPDIR) utils/decrypt/$(DEPDIR) utils/libfat/$(DEPDIR) utils/tinyxml/$(DEPDIR)
++	-rm -rf ./$(DEPDIR) addons/$(DEPDIR) filter/$(DEPDIR) metaspu/$(DEPDIR) utils/$(DEPDIR) utils/AsmJit/core/$(DEPDIR) utils/AsmJit/x86/$(DEPDIR) utils/decrypt/$(DEPDIR) utils/libfat/$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+ 	distclean-tags
+@@ -1506,7 +1472,7 @@ install-ps-am:
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-recursive
+-	-rm -rf ./$(DEPDIR) addons/$(DEPDIR) filter/$(DEPDIR) metaspu/$(DEPDIR) utils/$(DEPDIR) utils/AsmJit/core/$(DEPDIR) utils/AsmJit/x86/$(DEPDIR) utils/decrypt/$(DEPDIR) utils/libfat/$(DEPDIR) utils/tinyxml/$(DEPDIR)
++	-rm -rf ./$(DEPDIR) addons/$(DEPDIR) filter/$(DEPDIR) metaspu/$(DEPDIR) utils/$(DEPDIR) utils/AsmJit/core/$(DEPDIR) utils/AsmJit/x86/$(DEPDIR) utils/decrypt/$(DEPDIR) utils/libfat/$(DEPDIR)
+ 	-rm -f Makefile
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+ 
+diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am
+index 1985209..d958323 100755
+--- a/src/cli/Makefile.am
++++ b/src/cli/Makefile.am
+@@ -5,7 +5,7 @@ AM_CPPFLAGS += $(SDL_CFLAGS) $(ALSA_CFLAGS) $(LIBAGG_CFLAGS) $(GLIB_CFLAGS) $(GT
+ 
+ bin_PROGRAMS = desmume-cli
+ desmume_cli_SOURCES = main.cpp ../sndsdl.cpp ../ctrlssdl.h ../ctrlssdl.cpp ../driver.h ../driver.cpp
+-desmume_cli_LDADD = ../libdesmume.a $(SDL_LIBS) $(ALSA_LIBS) $(LIBAGG_LIBS) $(GLIB_LIBS) $(GTHREAD_LIBS) $(LIBSOUNDTOUCH_LIBS)
++desmume_cli_LDADD = ../libdesmume.a $(SDL_LIBS) $(ALSA_LIBS) $(LIBAGG_LIBS) $(GLIB_LIBS) $(GTHREAD_LIBS) $(LIBSOUNDTOUCH_LIBS) -ltinyxml
+ if HAVE_GDB_STUB
+ desmume_cli_LDADD += ../gdbstub/libgdbstub.a
+ endif
+diff --git a/src/cli/Makefile.in b/src/cli/Makefile.in
+index 14efd77..f04ab7d 100644
+--- a/src/cli/Makefile.in
++++ b/src/cli/Makefile.in
+@@ -311,7 +311,7 @@ AM_LDFLAGS =
+ desmume_cli_SOURCES = main.cpp ../sndsdl.cpp ../ctrlssdl.h ../ctrlssdl.cpp ../driver.h ../driver.cpp
+ desmume_cli_LDADD = ../libdesmume.a $(SDL_LIBS) $(ALSA_LIBS) \
+ 	$(LIBAGG_LIBS) $(GLIB_LIBS) $(GTHREAD_LIBS) \
+-	$(LIBSOUNDTOUCH_LIBS) $(am__append_1)
++	$(LIBSOUNDTOUCH_LIBS) -ltinyxml $(am__append_1)
+ all: all-recursive
+ 
+ .SUFFIXES:
+diff --git a/src/gtk-glade/Makefile.am b/src/gtk-glade/Makefile.am
+index b667fca..c79fdac 100755
+--- a/src/gtk-glade/Makefile.am
++++ b/src/gtk-glade/Makefile.am
+@@ -33,7 +33,7 @@ desmume_glade_SOURCES =  \
+ desmume_glade_LDADD = ../libdesmume.a \
+ 			$(SDL_LIBS) $(GTKGLEXT_LIBS) $(LIBGLADE_LIBS) \
+ 			$(GTHREAD_LIBS) $(ALSA_LIBS) $(LIBAGG_LIBS) \
+-			$(LIBSOUNDTOUCH_LIBS)
++			$(LIBSOUNDTOUCH_LIBS) -ltinyxml
+ if HAVE_GDB_STUB
+ desmume_glade_LDADD += ../gdbstub/libgdbstub.a
+ endif
+diff --git a/src/gtk-glade/Makefile.in b/src/gtk-glade/Makefile.in
+index 5f77ec5..012aa72 100644
+--- a/src/gtk-glade/Makefile.in
++++ b/src/gtk-glade/Makefile.in
+@@ -367,7 +367,7 @@ desmume_glade_SOURCES = \
+ 
+ desmume_glade_LDADD = ../libdesmume.a $(SDL_LIBS) $(GTKGLEXT_LIBS) \
+ 	$(LIBGLADE_LIBS) $(GTHREAD_LIBS) $(ALSA_LIBS) $(LIBAGG_LIBS) \
+-	$(LIBSOUNDTOUCH_LIBS) $(am__append_1)
++	$(LIBSOUNDTOUCH_LIBS) -ltinyxml $(am__append_1)
+ all: all-recursive
+ 
+ .SUFFIXES:
+diff --git a/src/gtk/Makefile.am b/src/gtk/Makefile.am
+index 59cb1f2..e451102 100755
+--- a/src/gtk/Makefile.am
++++ b/src/gtk/Makefile.am
+@@ -32,7 +32,7 @@ desmume_SOURCES = \
+ 	../filter/videofilter.cpp ../filter/videofilter.h \
+ 	main.cpp main.h
+ desmume_LDADD = ../libdesmume.a \
+-	$(SDL_LIBS) $(GTK_LIBS) $(GTHREAD_LIBS) $(ALSA_LIBS) $(LIBAGG_LIBS) $(LIBSOUNDTOUCH_LIBS)
++	$(SDL_LIBS) $(GTK_LIBS) $(GTHREAD_LIBS) $(ALSA_LIBS) $(LIBAGG_LIBS) $(LIBSOUNDTOUCH_LIBS) -ltinyxml
+ if HAVE_GDB_STUB
+ desmume_LDADD += ../gdbstub/libgdbstub.a
+ endif
+diff --git a/src/gtk/Makefile.in b/src/gtk/Makefile.in
+index e1a2c37..75f392f 100644
+--- a/src/gtk/Makefile.in
++++ b/src/gtk/Makefile.in
+@@ -382,7 +382,7 @@ desmume_SOURCES = \
+ 
+ desmume_LDADD = ../libdesmume.a $(SDL_LIBS) $(GTK_LIBS) \
+ 	$(GTHREAD_LIBS) $(ALSA_LIBS) $(LIBAGG_LIBS) \
+-	$(LIBSOUNDTOUCH_LIBS) $(am__append_1) $(am__append_2) \
++	$(LIBSOUNDTOUCH_LIBS) -ltinyxml $(am__append_1) $(am__append_2) \
+ 	$(am__append_3)
+ UPDATE_DESKTOP = \
+   appsdir=$(DESTDIR)$(datadir)/applications ; \
+diff --git a/src/utils/advanscene.cpp b/src/utils/advanscene.cpp
+index 8d8f370..09c35bb 100755
+--- a/src/utils/advanscene.cpp
++++ b/src/utils/advanscene.cpp
+@@ -19,7 +19,7 @@
+ #include <time.h>
+ 
+ #define TIXML_USE_STL
+-#include "tinyxml/tinyxml.h"
++#include <tinyxml.h>
+ 
+ #include "advanscene.h"
+ #include "../common.h"
diff --git a/pkgs/misc/emulators/desmume/default.nix b/pkgs/misc/emulators/desmume/default.nix
index 6bb5be3c713..67fb3b4d24b 100644
--- a/pkgs/misc/emulators/desmume/default.nix
+++ b/pkgs/misc/emulators/desmume/default.nix
@@ -2,6 +2,7 @@
 , pkgconfig, libtool, intltool
 , libXmu
 , lua
+, tinyxml
 , agg, alsaLib, soundtouch, openal
 , desktop-file-utils
 , gtk2, gtkglext, libglade, pangox_compat
@@ -19,11 +20,9 @@ stdenv.mkDerivation rec {
   };
 
   patches = [
-    (fetchpatch {
-      name = "gcc6_fixes.patch";
-      url = "https://anonscm.debian.org/viewvc/pkg-games/packages/trunk/desmume/debian/patches/gcc6_fixes.patch?revision=15925";
-      sha256 = "0j3fmxz0mfb3f4biks03pyz8f9hy958ks6qplisl60rzq9v9qpks";
-     })
+    ./gcc6_fixes.patch
+    ./gcc7_fixes.patch
+    ./01_use_system_tinyxml.patch
   ];
 
   CXXFLAGS = "-fpermissive";
@@ -31,7 +30,7 @@ stdenv.mkDerivation rec {
   buildInputs =
   [ pkgconfig libtool intltool libXmu lua agg alsaLib soundtouch
     openal desktop-file-utils gtk2 gtkglext libglade pangox_compat
-    libGLU libpcap SDL zziplib ];
+    libGLU libpcap SDL zziplib tinyxml ];
 
   configureFlags = [
     "--disable-glade"  # Failing on compile step
diff --git a/pkgs/misc/emulators/desmume/gcc6_fixes.patch b/pkgs/misc/emulators/desmume/gcc6_fixes.patch
new file mode 100644
index 00000000000..6eb9576f649
--- /dev/null
+++ b/pkgs/misc/emulators/desmume/gcc6_fixes.patch
@@ -0,0 +1,59 @@
+From: zeromus
+Origin: upstream, https://sourceforge.net/p/desmume/code/5514, https://sourceforge.net/p/desmume/code/5517, https://sourceforge.net/p/desmume/code/5430
+Subject: fix GCC6 issues
+Bug: https://sourceforge.net/p/desmume/bugs/1570/
+Bug-Debian: http://bugs.debian.org/811691
+
+Index: desmume/src/MMU_timing.h
+===================================================================
+--- desmume/src/MMU_timing.h	(revision 5513)
++++ desmume/src/MMU_timing.h	(revision 5517)
+@@ -155,8 +155,8 @@
+ 	enum { ASSOCIATIVITY = 1 << ASSOCIATIVESHIFT };
+ 	enum { BLOCKSIZE = 1 << BLOCKSIZESHIFT };
+ 	enum { TAGSHIFT = SIZESHIFT - ASSOCIATIVESHIFT };
+-	enum { TAGMASK = (u32)(~0 << TAGSHIFT) };
+-	enum { BLOCKMASK = ((u32)~0 >> (32 - TAGSHIFT)) & (u32)(~0 << BLOCKSIZESHIFT) };
++	enum { TAGMASK = (u32)(~0U << TAGSHIFT) };
++	enum { BLOCKMASK = ((u32)~0U >> (32 - TAGSHIFT)) & (u32)(~0U << BLOCKSIZESHIFT) };
+ 	enum { WORDSIZE = sizeof(u32) };
+ 	enum { WORDSPERBLOCK = (1 << BLOCKSIZESHIFT) / WORDSIZE };
+ 	enum { DATAPERWORD = WORDSIZE * ASSOCIATIVITY };
+Index: desmume/src/ctrlssdl.cpp
+===================================================================
+--- desmume/src/ctrlssdl.cpp	(revision 5513)
++++ desmume/src/ctrlssdl.cpp	(revision 5517)
+@@ -200,7 +200,7 @@
+           break;
+         case SDL_JOYAXISMOTION:
+           /* Dead zone of 50% */
+-          if( (abs(event.jaxis.value) >> 14) != 0 )
++          if( ((u32)abs(event.jaxis.value) >> 14) != 0 )
+             {
+               key = ((event.jaxis.which & 15) << 12) | JOY_AXIS << 8 | ((event.jaxis.axis & 127) << 1);
+               if (event.jaxis.value > 0) {
+@@ -370,7 +370,7 @@
+          Note: button constants have a 1bit offset. */
+     case SDL_JOYAXISMOTION:
+       key_code = ((event->jaxis.which & 15) << 12) | JOY_AXIS << 8 | ((event->jaxis.axis & 127) << 1);
+-      if( (abs(event->jaxis.value) >> 14) != 0 )
++      if( ((u32)abs(event->jaxis.value) >> 14) != 0 )
+         {
+           if (event->jaxis.value > 0)
+             key_code |= 1;
+Index: desmume/src/wifi.cpp
+===================================================================
+--- desmume/src/wifi.cpp	(revision 5429)
++++ desmume/src/wifi.cpp	(revision 5430)
+@@ -320,9 +320,9 @@
+ 
+ #if (WIFI_LOGGING_LEVEL >= 1)
+ 	#if WIFI_LOG_USE_LOGC
+-		#define WIFI_LOG(level, ...) if(level <= WIFI_LOGGING_LEVEL) LOGC(8, "WIFI: "__VA_ARGS__);
++		#define WIFI_LOG(level, ...) if(level <= WIFI_LOGGING_LEVEL) LOGC(8, "WIFI: " __VA_ARGS__);
+ 	#else
+-		#define WIFI_LOG(level, ...) if(level <= WIFI_LOGGING_LEVEL) printf("WIFI: "__VA_ARGS__);
++		#define WIFI_LOG(level, ...) if(level <= WIFI_LOGGING_LEVEL) printf("WIFI: " __VA_ARGS__);
+ 	#endif
+ #else
+ #define WIFI_LOG(level, ...) {}
diff --git a/pkgs/misc/emulators/desmume/gcc7_fixes.patch b/pkgs/misc/emulators/desmume/gcc7_fixes.patch
new file mode 100644
index 00000000000..a4934ff6e61
--- /dev/null
+++ b/pkgs/misc/emulators/desmume/gcc7_fixes.patch
@@ -0,0 +1,18 @@
+From e1f7039f1b06add4fb75b2f8774000b8f05574af Mon Sep 17 00:00:00 2001
+From: rogerman <rogerman@users.sf.net>
+Date: Mon, 17 Aug 2015 21:15:04 +0000
+Subject: Fix bug with libfat string handling.
+
+diff --git a/src/utils/libfat/directory.cpp b/src/utils/libfat/directory.cpp
+index 765d7ae5..b6d7f01f 100644
+--- a/src/utils/libfat/directory.cpp
++++ b/src/utils/libfat/directory.cpp
+@@ -139,7 +139,7 @@ static size_t _FAT_directory_mbstoucs2 (ucs2_t* dst, const char* src, size_t len
+ 	int bytes;
+ 	size_t count = 0;
+ 
+-	while (count < len-1 && src != '\0') {
++	while (count < len-1 && *src != '\0') {
+ 		bytes = mbrtowc (&tempChar, src, MB_CUR_MAX, &ps);
+ 		if (bytes > 0) {
+ 			*dst = (ucs2_t)tempChar;
-- 
GitLab


From 5a547851b1b1536b0c05b0eebb114447ae5da618 Mon Sep 17 00:00:00 2001
From: Quentin Vaucher <quentin.vaucher@protonmail.com>
Date: Fri, 4 Oct 2019 12:06:40 +0200
Subject: [PATCH 1941/2254] ephemeral: 5.3.0 -> 5.4.0

---
 pkgs/applications/networking/browsers/ephemeral/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/ephemeral/default.nix b/pkgs/applications/networking/browsers/ephemeral/default.nix
index 369689520d8..170e0f98c90 100644
--- a/pkgs/applications/networking/browsers/ephemeral/default.nix
+++ b/pkgs/applications/networking/browsers/ephemeral/default.nix
@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ephemeral";
-  version = "5.3.0";
+  version = "5.4.0";
 
   src = fetchFromGitHub {
     owner = "cassidyjames";
     repo = "ephemeral";
     rev = version;
-    sha256 = "1xglhv4rpl6vqryvliyvr9y8mqli4x4bjcfjsl1v8gdxkzkwfy39";
+    sha256 = "1bl5x79nvzq49azcghc2sx9l709524zixh7py8ddccfnhrq641w8";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From 099c740aa5f90880784a6157c302147a1445ed4d Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 4 Oct 2019 12:06:14 +0200
Subject: [PATCH 1942/2254] android-studio: 3.5.0.21 -> 3.5.1.0

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

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index b059747e052..aeacc0a33b5 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -8,9 +8,9 @@ let
     inherit (gnome2) GConf gnome_vfs;
   };
   stableVersion = {
-    version = "3.5.0.21"; # "Android Studio 3.5"
-    build = "191.5791312";
-    sha256Hash = "0vvk2vhklxg9wfi4lv4sahs5ahhb1mki1msy3yixmr56vipgv52p";
+    version = "3.5.1.0"; # "Android Studio 3.5.1"
+    build = "191.5900203";
+    sha256Hash = "0afxlif8pkrl6m1lhiqri1qv4vf5mfm1yg6qk5rad0442hm3kz4l";
   };
   betaVersion = stableVersion;
   latestVersion = { # canary & dev
-- 
GitLab


From b52fb3b0789b143e4f4c92972ce62d1880e3b1fe Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 4 Oct 2019 12:13:14 +0200
Subject: [PATCH 1943/2254] gns3Packages.{server,gui}Stable: 2.1.21 -> 2.2.0

gns3Packages.{server,gui}Preview: 2.2.0rc5 -> 2.2.0

The new dependency on setuptools is required for pkg_resources:

ImportError: No module named pkg_resources
---
 pkgs/applications/networking/gns3/default.nix | 12 +++----
 pkgs/applications/networking/gns3/gui.nix     |  4 +--
 pkgs/applications/networking/gns3/server.nix  | 36 +++----------------
 3 files changed, 12 insertions(+), 40 deletions(-)

diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix
index 1d2756de7e6..3375bfd04d6 100644
--- a/pkgs/applications/networking/gns3/default.nix
+++ b/pkgs/applications/networking/gns3/default.nix
@@ -1,16 +1,16 @@
 { callPackage }:
 
 let
-  stableVersion = "2.1.21";
-  previewVersion = "2.2.0rc5";
+  stableVersion = "2.2.0";
+  previewVersion = "2.2.0";
   addVersion = args:
     let version = if args.stable then stableVersion else previewVersion;
         branch = if args.stable then "stable" else "preview";
     in args // { inherit version branch; };
   mkGui = args: callPackage (import ./gui.nix (addVersion args)) { };
   mkServer = args: callPackage (import ./server.nix (addVersion args)) { };
-  guiSrcHash = "1ydmib302r1cpm2z9pzsfp4ygxrbmskwszsip397n92qx3l9a9v3";
-  serverSrcHash = "1ahn1xq1f0wx46i0c8idz96dxfbakk37pqi6amy91594mdlp8yr4";
+  guiSrcHash = "0xghldzk126ly49y7drp241w7c0h9fb0ags9blk0rlq99i72as78";
+  serverSrcHash = "0iphs0w6r9s85cgd95bh6jd0224ywilrzb7a4jjwi38z7a7id4gk";
 in {
   guiStable = mkGui {
     stable = true;
@@ -18,7 +18,7 @@ in {
   };
   guiPreview = mkGui {
     stable = false;
-    sha256Hash = "0x4sp6yjnvzpk8cxdqlf51njckmvvkijdb7rvcb4hvqq1ab6gb2x";
+    sha256Hash = guiSrcHash;
   };
 
   serverStable = mkServer {
@@ -27,6 +27,6 @@ in {
   };
   serverPreview = mkServer {
     stable = false;
-    sha256Hash = "0inj6fac0683s1sxaba3ljia90cfach0y42xylzgzza36wpyqpqg";
+    sha256Hash = serverSrcHash;
   };
 }
diff --git a/pkgs/applications/networking/gns3/gui.nix b/pkgs/applications/networking/gns3/gui.nix
index de624d7f6b2..9af0f1a6bc6 100644
--- a/pkgs/applications/networking/gns3/gui.nix
+++ b/pkgs/applications/networking/gns3/gui.nix
@@ -19,8 +19,8 @@ in pythonPackages.buildPythonPackage rec {
   propagatedBuildInputs = with pythonPackages; [
     raven psutil jsonschema # tox for check
     # Runtime dependencies
-    sip (pyqt5.override { withWebSockets = true; })
-  ] ++ stdenv.lib.optional (!stable) pythonPackages.distro;
+    sip (pyqt5.override { withWebSockets = true; }) distro setuptools
+  ];
 
   doCheck = false; # Failing
 
diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix
index f681f3fa63b..71223c6f512 100644
--- a/pkgs/applications/networking/gns3/server.nix
+++ b/pkgs/applications/networking/gns3/server.nix
@@ -3,35 +3,7 @@
 { stdenv, python3, fetchFromGitHub }:
 
 let
-  python = if stable then python3.override {
-    packageOverrides = self: super: {
-      async-timeout = super.async-timeout.overridePythonAttrs (oldAttrs: rec {
-        version = "2.0.1";
-        src = oldAttrs.src.override {
-          inherit version;
-          sha256 = "1l3kg062m02mph6rf9rdv8r5c5n356clxa6b6mrn0i77vk9g9kq0";
-        };
-      });
-      aiohttp = super.aiohttp.overridePythonAttrs (oldAttrs: rec {
-        version = "2.3.10";
-        src = oldAttrs.src.override {
-          inherit version;
-          sha256 = "8adda6583ba438a4c70693374e10b60168663ffa6564c5c75d3c7a9055290964";
-        };
-        propagatedBuildInputs = with self; [ async-timeout attrs chardet multidict yarl idna-ssl ];
-        doCheck = false;
-      });
-      aiohttp-cors = super.aiohttp-cors.overridePythonAttrs (oldAttrs: rec {
-        version = "0.6.0";
-        src = oldAttrs.src.override {
-          inherit version;
-          sha256 = "1r0mb4dw0dc1lpi54dk5vxqs06nyhvagp76lyrvk7rd94z5mjkd4";
-        };
-        propagatedBuildInputs = with self; [ aiohttp ]
-          ++ stdenv.lib.optional (pythonOlder "3.5") typing;
-      });
-    };
-  } else python3;
+  python = python3;
 
 in python.pkgs.buildPythonPackage {
   pname = "gns3-server";
@@ -50,10 +22,10 @@ in python.pkgs.buildPythonPackage {
   '';
 
   propagatedBuildInputs = with python.pkgs; [
-    aiohttp-cors yarl aiohttp multidict
-    jinja2 psutil zipstream raven jsonschema
+    aiohttp-cors yarl aiohttp multidict setuptools
+    jinja2 psutil zipstream raven jsonschema distro async_generator aiofiles
     (python.pkgs.callPackage ../../../development/python-modules/prompt_toolkit/1.nix {})
-  ] ++ stdenv.lib.optional (!stable) [ distro async_generator aiofiles ];
+  ];
 
   # Requires network access
   doCheck = false;
-- 
GitLab


From 3682a3b0b1c99c61735cab2619cbf2dcc06cde99 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Fri, 4 Oct 2019 12:33:31 +0200
Subject: [PATCH 1944/2254] ipsecTools: ship patch directly

No longer available since anonscm.debian.org is shut
down (#39927). Replacement obtained from OpenSUSE source package
http://download.opensuse.org/repositories/openSUSE:/Factory/standard/src/ipsec-tools-0.8.2-9.6.src.rpm
---
 .../linux/ipsec-tools/CVE-2016-10396.patch    | 193 ++++++++++++++++++
 .../os-specific/linux/ipsec-tools/default.nix |   5 +-
 2 files changed, 194 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/os-specific/linux/ipsec-tools/CVE-2016-10396.patch

diff --git a/pkgs/os-specific/linux/ipsec-tools/CVE-2016-10396.patch b/pkgs/os-specific/linux/ipsec-tools/CVE-2016-10396.patch
new file mode 100644
index 00000000000..b644d46f8c9
--- /dev/null
+++ b/pkgs/os-specific/linux/ipsec-tools/CVE-2016-10396.patch
@@ -0,0 +1,193 @@
+From: Antoine_Beaupre <anarcat@orangeseeds.org>
+Acked-by: Jiri Bohac <jbohac@suse.cz>
+Subject: PR/51682: Avoid DoS with fragment out of order insertion; keep fragments sorted in the list.
+References: bsc#1047443, CVE-2016-10396
+
+
+
+Index: a/src/racoon/handler.h
+===================================================================
+--- a/src/racoon/handler.h.orig	2018-01-26 18:05:21.114764376 +0100
++++ a/src/racoon/handler.h	2018-01-26 18:05:33.986741103 +0100
+@@ -141,6 +141,7 @@ struct ph1handle {
+ #endif
+ #ifdef ENABLE_FRAG
+ 	int frag;			/* IKE phase 1 fragmentation */
++	int frag_last_index;
+ 	struct isakmp_frag_item *frag_chain;	/* Received fragments */
+ #endif
+ 
+Index: a/src/racoon/isakmp.c
+===================================================================
+--- a/src/racoon/isakmp.c.orig	2018-01-26 18:05:21.118764369 +0100
++++ a/src/racoon/isakmp.c	2018-01-26 18:05:33.986741103 +0100
+@@ -1069,6 +1069,7 @@ isakmp_ph1begin_i(rmconf, remote, local)
+ 		iph1->frag = 1;
+ 	else
+ 		iph1->frag = 0;
++	iph1->frag_last_index = 0;
+ 	iph1->frag_chain = NULL;
+ #endif
+ 	iph1->approval = NULL;
+@@ -1173,6 +1174,7 @@ isakmp_ph1begin_r(msg, remote, local, et
+ #endif
+ #ifdef ENABLE_FRAG
+ 	iph1->frag = 0;
++	iph1->frag_last_index = 0;
+ 	iph1->frag_chain = NULL;
+ #endif
+ 	iph1->approval = NULL;
+Index: a/src/racoon/isakmp_frag.c
+===================================================================
+--- a/src/racoon/isakmp_frag.c.orig	2018-01-26 18:05:21.118764369 +0100
++++ a/src/racoon/isakmp_frag.c	2018-01-26 18:05:33.986741103 +0100
+@@ -173,6 +173,43 @@ vendorid_frag_cap(gen)
+ 	return ntohl(hp[MD5_DIGEST_LENGTH / sizeof(*hp)]);
+ }
+ 
++static int 
++isakmp_frag_insert(struct ph1handle *iph1, struct isakmp_frag_item *item)
++{
++	struct isakmp_frag_item *pitem = NULL;
++	struct isakmp_frag_item *citem = iph1->frag_chain;
++
++	/* no frag yet, just insert at beginning of list */
++	if (iph1->frag_chain == NULL) {
++		iph1->frag_chain = item;
++		return 0;
++	}
++
++	do {
++		/* duplicate fragment number, abort (CVE-2016-10396) */
++		if (citem->frag_num == item->frag_num)
++			return -1;
++
++		/* need to insert before current item */
++		if (citem->frag_num > item->frag_num) {
++			if (pitem != NULL)
++				pitem->frag_next = item;
++			else
++				/* insert at the beginning of the list  */
++				iph1->frag_chain = item;
++			item->frag_next = citem;
++			return 0;
++		}
++
++		pitem = citem;
++		citem = citem->frag_next;
++	} while (citem != NULL);
++
++	/* we reached the end of the list, insert */
++	pitem->frag_next = item;
++	return 0;
++}
++
+ int 
+ isakmp_frag_extract(iph1, msg)
+ 	struct ph1handle *iph1;
+@@ -224,39 +261,43 @@ isakmp_frag_extract(iph1, msg)
+ 	item->frag_next = NULL;
+ 	item->frag_packet = buf;
+ 
+-	/* Look for the last frag while inserting the new item in the chain */
+-	if (item->frag_last)
+-		last_frag = item->frag_num;
++	/* Check for the last frag before inserting the new item in the chain */
++	if (item->frag_last) {
++		/* if we have the last fragment, indices must match */
++		if (iph1->frag_last_index != 0 &&
++		    item->frag_last != iph1->frag_last_index) {
++			plog(LLV_ERROR, LOCATION, NULL,
++			     "Repeated last fragment index mismatch\n");
++			racoon_free(item);
++			vfree(buf);
++			return -1;
++		}
+ 
+-	if (iph1->frag_chain == NULL) {
+-		iph1->frag_chain = item;
+-	} else {
+-		struct isakmp_frag_item *current;
++		last_frag = iph1->frag_last_index = item->frag_num;
++	}
+ 
+-		current = iph1->frag_chain;
+-		while (current->frag_next) {
+-			if (current->frag_last)
+-				last_frag = item->frag_num;
+-			current = current->frag_next;
+-		}
+-		current->frag_next = item;
++	/* insert fragment into chain */
++	if (isakmp_frag_insert(iph1, item) == -1) {
++		plog(LLV_ERROR, LOCATION, NULL,
++		    "Repeated fragment index mismatch\n");
++		racoon_free(item);
++		vfree(buf);
++		return -1;
+ 	}
+ 
+-	/* If we saw the last frag, check if the chain is complete */
++	/* If we saw the last frag, check if the chain is complete
++	 * we have a sorted list now, so just walk through */
+ 	if (last_frag != 0) {
++		item = iph1->frag_chain;
+ 		for (i = 1; i <= last_frag; i++) {
+-			item = iph1->frag_chain;
+-			do {
+-				if (item->frag_num == i)
+-					break;
+-				item = item->frag_next;
+-			} while (item != NULL);
+-
++			if (item->frag_num != i)
++				break;
++			item = item->frag_next;
+ 			if (item == NULL) /* Not found */
+ 				break;
+ 		}
+ 
+-		if (item != NULL) /* It is complete */
++		if (i > last_frag) /* It is complete */
+ 			return 1;
+ 	}
+ 		
+@@ -291,15 +332,9 @@ isakmp_frag_reassembly(iph1)
+ 	}
+ 	data = buf->v;
+ 
++	item = iph1->frag_chain;
+ 	for (i = 1; i <= frag_count; i++) {
+-		item = iph1->frag_chain;
+-		do {
+-			if (item->frag_num == i)
+-				break;
+-			item = item->frag_next;
+-		} while (item != NULL);
+-
+-		if (item == NULL) {
++		if (item->frag_num != i) {
+ 			plog(LLV_ERROR, LOCATION, NULL, 
+ 			    "Missing fragment #%d\n", i);
+ 			vfree(buf);
+@@ -308,6 +343,7 @@ isakmp_frag_reassembly(iph1)
+ 		}
+ 		memcpy(data, item->frag_packet->v, item->frag_packet->l);
+ 		data += item->frag_packet->l;
++		item = item->frag_next;
+ 	}
+ 
+ out:
+
+
+diff -u -p -r1.50 -r1.51
+--- a/src/racoon/isakmp_inf.c	2013/04/12 09:53:10	1.50
++++ a/src/racoon/isakmp_inf.c	2017/01/24 19:23:56	1.51
+@@ -720,6 +720,7 @@ isakmp_info_send_nx(isakmp, remote, loca
+ #endif
+ #ifdef ENABLE_FRAG
+ 	iph1->frag = 0;
++	iph1->frag_last_index = 0;
+ 	iph1->frag_chain = NULL;
+ #endif
+ 
diff --git a/pkgs/os-specific/linux/ipsec-tools/default.nix b/pkgs/os-specific/linux/ipsec-tools/default.nix
index 0aa074b4df8..551fc61f814 100644
--- a/pkgs/os-specific/linux/ipsec-tools/default.nix
+++ b/pkgs/os-specific/linux/ipsec-tools/default.nix
@@ -19,10 +19,7 @@ stdenv.mkDerivation rec {
   patches = [
     ./dont-create-localstatedir-during-install.patch
     ./CVE-2015-4047.patch
-    (fetchpatch {
-      url = "https://anonscm.debian.org/cgit/pkg-ipsec-tools/pkg-ipsec-tools.git/plain/debian/patches/CVE-2016-10396.patch?id=62ac12648a4eb7c5ba5dba0f81998d1acf310d8b";
-      sha256 = "1kf7j2pf1blni52z7q41n0yisqb7gvk01lvldr319zaxxg7rm84a";
-    })
+    ./CVE-2016-10396.patch
   ];
 
   # fix build with newer gcc versions
-- 
GitLab


From 7fd280c3f73ca35e85d7ad1cc9b525951a8ec6fd Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Fri, 4 Oct 2019 12:40:43 +0200
Subject: [PATCH 1945/2254] diffoscope: 110 -> 125, get from upstream site

---
 pkgs/tools/misc/diffoscope/default.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
index 22da00da9fc..9cb76b2ce37 100644
--- a/pkgs/tools/misc/diffoscope/default.nix
+++ b/pkgs/tools/misc/diffoscope/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchgit, python3Packages, docutils, help2man
+{ lib, stdenv, fetchurl, python3Packages, docutils, help2man
 , acl, apktool, binutils-unwrapped, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, db, diffutils, dtc
 , e2fsprogs, file, findutils, fontforge-fonttools, fpc, gettext, ghc, ghostscriptX, giflib, gnumeric, gnupg, gnutar
 , gzip, imagemagick, jdk, libarchive, libcaca, llvm, lz4, mono, openssh, pdftk, pgpdump, poppler_utils, sng, sqlite
@@ -8,13 +8,12 @@
 
 # Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
 python3Packages.buildPythonApplication rec {
-  name = "diffoscope-${version}";
-  version = "110";
+  pname = "diffoscope";
+  version = "125";
 
-  src = fetchgit {
-    url    = "https://anonscm.debian.org/git/reproducible/diffoscope.git";
-    rev    = "refs/tags/${version}";
-    sha256 = "0rhjxigwxbqbqk7xv7n4m4rh693rg3cbp4x565jv68iy423mf2fb";
+  src = fetchurl {
+    url    = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
+    sha256 = "0qwib44f43hinidbdjqnr2zanj678mgckx34x48jyywppvbj8yq4";
   };
 
   patches = [
@@ -34,7 +33,7 @@ python3Packages.buildPythonApplication rec {
   # Most of the non-Python dependencies here are optional command-line tools for various file-format parsers.
   # To help figuring out what's missing from the list, run: ./pkgs/tools/misc/diffoscope/list-missing-tools.sh
   #
-  # Still missing these tools: abootimg docx2txt dumpxsb enjarify js-beautify lipo oggDump otool procyon-decompiler Rscript
+  # Still missing these tools: abootimg docx2txt dumpxsb enjarify js-beautify lipo oggDump otool procyon-decompiler Rscript wasm2wat zipnode
   # Also these libraries: python3-guestfs
   pythonPath = with python3Packages; [ debian libarchive-c python_magic tlsh rpm ] ++ [
       acl binutils-unwrapped bzip2 cdrkit colordiff coreutils cpio db diffutils
-- 
GitLab


From 91ceb6b997b51d9c55d7d80d78cea9e2a3e9c891 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Fri, 4 Oct 2019 12:42:21 +0200
Subject: [PATCH 1946/2254] treewide: fix dead anonscm.debian.org links

---
 .../applications/virtualization/OVMF/default.nix |  2 +-
 pkgs/misc/drivers/foomatic-filters/default.nix   |  2 +-
 pkgs/misc/emulators/pcsxr/default.nix            | 16 ++++++++--------
 pkgs/os-specific/linux/acpitool/default.nix      |  2 +-
 pkgs/os-specific/linux/molly-guard/default.nix   |  2 +-
 pkgs/tools/networking/ppp/default.nix            |  4 ++--
 pkgs/tools/networking/uwimap/default.nix         |  2 +-
 pkgs/tools/text/catdoc/default.nix               |  4 ++--
 8 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix
index ecf6f1c5421..c0080329487 100644
--- a/pkgs/applications/virtualization/OVMF/default.nix
+++ b/pkgs/applications/virtualization/OVMF/default.nix
@@ -42,7 +42,7 @@ edk2.mkDerivation projectDscPath {
     mv -v $out/FV/QEMU_{EFI,VARS}.fd $fd/FV
 
     # Uses Fedora dir layout: https://src.fedoraproject.org/cgit/rpms/edk2.git/tree/edk2.spec
-    # FIXME: why is it different from Debian dir layout? https://anonscm.debian.org/cgit/pkg-qemu/edk2.git/tree/debian/rules
+    # FIXME: why is it different from Debian dir layout? https://salsa.debian.org/qemu-team/edk2/blob/debian/debian/rules
     dd of=$fd/AAVMF/QEMU_EFI-pflash.raw       if=/dev/zero bs=1M    count=64
     dd of=$fd/AAVMF/QEMU_EFI-pflash.raw       if=$fd/FV/QEMU_EFI.fd conv=notrunc
     dd of=$fd/AAVMF/vars-template-pflash.raw if=/dev/zero bs=1M    count=64
diff --git a/pkgs/misc/drivers/foomatic-filters/default.nix b/pkgs/misc/drivers/foomatic-filters/default.nix
index 580b473b0cd..d4f15992e74 100644
--- a/pkgs/misc/drivers/foomatic-filters/default.nix
+++ b/pkgs/misc/drivers/foomatic-filters/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   patches = [
     # for CVE-2015-8327 & CVE-2015-8560
     (fetchpatch {
-      url = "https://anonscm.debian.org/cgit/collab-maint/foomatic-filters.git/plain/debian/patches/0500-r7406_also_consider_the_back_tick_as_an_illegal_shell_escape_character.patch";
+      url = "https://salsa.debian.org/debian/foomatic-filters/raw/a3abbef2d2f8c7e62d2fe64f64afe294563fdf8f/debian/patches/0500-r7406_also_consider_the_back_tick_as_an_illegal_shell_escape_character.patch";
       sha256 = "055nwi3sjf578nk40bqsch3wx8m2h65hdih0wmxflb6l0hwkq4p4";
     })
   ];
diff --git a/pkgs/misc/emulators/pcsxr/default.nix b/pkgs/misc/emulators/pcsxr/default.nix
index 8f1e5e02c18..1035061d057 100644
--- a/pkgs/misc/emulators/pcsxr/default.nix
+++ b/pkgs/misc/emulators/pcsxr/default.nix
@@ -14,35 +14,35 @@ stdenv.mkDerivation rec {
 
   patches = [
     ( fetchpatch {
-      url = "https://anonscm.debian.org/cgit/pkg-games/pcsxr.git/plain/debian/patches/01_fix-i386-exec-stack.patch?h=debian/1.9.94-2";
+      url = "https://salsa.debian.org/games-team/pcsxr/raw/315e56d16e36ef3011f72d0fe86190728d2ba596/debian/patches/01_fix-i386-exec-stack.patch";
       sha256 = "17497wjxd6b92bj458s2769d9bpp68ydbvmfs9gp51yhnq4zl81x";
     })
     ( fetchpatch {
-      url = "https://anonscm.debian.org/cgit/pkg-games/pcsxr.git/plain/debian/patches/02_disable-ppc-auto-dynarec.patch?h=debian/1.9.94-2";
+      url = "https://salsa.debian.org/games-team/pcsxr/raw/315e56d16e36ef3011f72d0fe86190728d2ba596/debian/patches/02_disable-ppc-auto-dynarec.patch";
       sha256 = "0v8n79z034w6cqdrzhgd9fkdpri42mzvkdjm19x4asz94gg2i2kf";
     })
     ( fetchpatch {
-      url = "https://anonscm.debian.org/cgit/pkg-games/pcsxr.git/plain/debian/patches/03_fix-plugin-dir.patch?h=debian/1.9.94-2";
+      url = "https://salsa.debian.org/games-team/pcsxr/raw/315e56d16e36ef3011f72d0fe86190728d2ba596/debian/patches/03_fix-plugin-dir.patch";
       sha256 = "0vkl0mv6whqaz79kvvvlmlmjpynyq4lh352j3bbxcr0vjqffxvsy";
     })
     ( fetchpatch {
-      url = "https://anonscm.debian.org/cgit/pkg-games/pcsxr.git/plain/debian/patches/04_update-homedir-symlinks.patch?h=debian/1.9.94-2";
+      url = "https://salsa.debian.org/games-team/pcsxr/raw/315e56d16e36ef3011f72d0fe86190728d2ba596/debian/patches/04_update-homedir-symlinks.patch";
       sha256 = "18r6n025ybr8fljfsaqm4ap31wp8838j73lrsffi49fkis60dp4j";
     })
     ( fetchpatch {
-      url = "https://anonscm.debian.org/cgit/pkg-games/pcsxr.git/plain/debian/patches/05_format-security.patch?h=debian/1.9.94-2";
+      url = "https://salsa.debian.org/games-team/pcsxr/raw/315e56d16e36ef3011f72d0fe86190728d2ba596/debian/patches/05_format-security.patch";
       sha256 = "03m4kfc9bk5669hf7ji1anild08diliapx634f9cigyxh72jcvni";
     })
     ( fetchpatch {
-      url = "https://anonscm.debian.org/cgit/pkg-games/pcsxr.git/plain/debian/patches/06_warnings.patch?h=debian/1.9.94-2";
+      url = "https://salsa.debian.org/games-team/pcsxr/raw/315e56d16e36ef3011f72d0fe86190728d2ba596/debian/patches/06_warnings.patch";
       sha256 = "0iz3g9ihnhisfgrzma9l74y4lhh57na9h41bmiam1millb796g71";
     })
     ( fetchpatch {
-      url = "https://anonscm.debian.org/cgit/pkg-games/pcsxr.git/plain/debian/patches/07_non-linux-ip-addr.patch?h=debian/1.9.94-2";
+      url = "https://salsa.debian.org/games-team/pcsxr/raw/315e56d16e36ef3011f72d0fe86190728d2ba596/debian/patches/07_non-linux-ip-addr.patch";
       sha256 = "14vb9l0l4nzxcymhjjs4q57nmsncmby9qpdr7c19rly5wavm4k77";
     })
     ( fetchpatch {
-      url = "https://anonscm.debian.org/cgit/pkg-games/pcsxr.git/plain/debian/patches/08_reproducible.patch?h=debian/1.9.94-2";
+      url = "https://salsa.debian.org/games-team/pcsxr/raw/315e56d16e36ef3011f72d0fe86190728d2ba596/debian/patches/08_reproducible.patch";
       sha256 = "1cx9q59drsk9h6l31097lg4aanaj93ysdz5p88pg9c7wvxk1qz06";
     })
 
diff --git a/pkgs/os-specific/linux/acpitool/default.nix b/pkgs/os-specific/linux/acpitool/default.nix
index ce47932587c..86e6b54906a 100644
--- a/pkgs/os-specific/linux/acpitool/default.nix
+++ b/pkgs/os-specific/linux/acpitool/default.nix
@@ -3,7 +3,7 @@
 let
    acpitool-patch-051-4 = params: fetchpatch rec {
      inherit (params) name sha256;
-     url = "https://anonscm.debian.org/cgit/pkg-acpi/acpitool.git/plain/debian/patches/${name}?h=debian/0.5.1-4&id=3fd9f396f12ec9c1cae3337a2a25026b7faad2ae";
+     url = "https://salsa.debian.org/debian/acpitool/raw/33e2ef42a663de820457b212ea2925e506df3b88/debian/patches/${name}";
    };
 
 in stdenv.mkDerivation rec {
diff --git a/pkgs/os-specific/linux/molly-guard/default.nix b/pkgs/os-specific/linux/molly-guard/default.nix
index 766c01eed3f..cdd9d162f4a 100644
--- a/pkgs/os-specific/linux/molly-guard/default.nix
+++ b/pkgs/os-specific/linux/molly-guard/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Attempts to prevent you from accidentally shutting down or rebooting machines";
-    homepage    = https://anonscm.debian.org/git/collab-maint/molly-guard.git/;
+    homepage    = https://salsa.debian.org/debian/molly-guard;
     license     = licenses.artistic2;
     platforms   = platforms.linux;
     maintainers = with maintainers; [ DerTim1 ];
diff --git a/pkgs/tools/networking/ppp/default.nix b/pkgs/tools/networking/ppp/default.nix
index b072ed21318..987960c9c50 100644
--- a/pkgs/tools/networking/ppp/default.nix
+++ b/pkgs/tools/networking/ppp/default.nix
@@ -20,11 +20,11 @@ stdenv.mkDerivation rec {
       ./nonpriv.patch
       (fetchurl {
         name = "CVE-2015-3310.patch";
-        url = "https://anonscm.debian.org/git/collab-maint/pkg-ppp.git/plain/debian/patches/rc_mksid-no-buffer-overflow?h=debian/2.4.7-1%2b4";
+        url = "https://salsa.debian.org/roam/ppp/raw/ef5d585aca6b1200a52c7109caa66ef97964d76e/debian/patches/rc_mksid-no-buffer-overflow";
         sha256 = "1dk00j7bg9nfgskw39fagnwv1xgsmyv0xnkd6n1v5gy0psw0lvqh";
       })
       (fetchurl {
-        url = "https://anonscm.debian.org/git/collab-maint/pkg-ppp.git/plain/debian/patches/0016-pppoe-include-netinet-in.h-before-linux-in.h.patch";
+        url = "https://salsa.debian.org/roam/ppp/raw/ef5d585aca6b1200a52c7109caa66ef97964d76e/debian/patches/0016-pppoe-include-netinet-in.h-before-linux-in.h.patch";
         sha256 = "1xnmqn02kc6g5y84xynjwnpv9cvrfn3nyv7h7r8j8xi7qf2aj4q8";
       })
       (fetchurl {
diff --git a/pkgs/tools/networking/uwimap/default.nix b/pkgs/tools/networking/uwimap/default.nix
index 125c83da4c4..bc500a01c11 100644
--- a/pkgs/tools/networking/uwimap/default.nix
+++ b/pkgs/tools/networking/uwimap/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation ({
     ++ stdenv.lib.optional (!stdenv.isDarwin) pam;
 
   patches = [ (fetchpatch {
-    url = "https://anonscm.debian.org/cgit/collab-maint/uw-imap.git/plain/debian/patches/1006_openssl1.1_autoverify.patch?id=b4df81d246a6cdbfd035c21f43e844effda3582b";
+    url = "https://salsa.debian.org/holmgren/uw-imap/raw/dcb42981201ea14c2d71c01ebb4a61691b6f68b3/debian/patches/1006_openssl1.1_autoverify.patch";
     sha256 = "09xb58awvkhzmmjhrkqgijzgv7ia381ablf0y7i1rvhcqkb5wga7";
   }) ];
 
diff --git a/pkgs/tools/text/catdoc/default.nix b/pkgs/tools/text/catdoc/default.nix
index 16d5b9995c2..d4f40270915 100644
--- a/pkgs/tools/text/catdoc/default.nix
+++ b/pkgs/tools/text/catdoc/default.nix
@@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
 
   patches = [
     (fetchpatch {
-      url = "https://anonscm.debian.org/git/collab-maint/catdoc.git/diff/debian/patches/05-CVE-2017-11110.patch?id=21dd5b29b11be04149587657dd90253f52dfef0b";
-      sha256 = "0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9c73";
+      url = "https://sources.debian.org/data/main/c/catdoc/1:0.95-4.1/debian/patches/05-CVE-2017-11110.patch";
+      sha256 = "1ljnwvssvzig94hwx8843b88p252ww2lbxh8zybcwr3kwwlcymx7";
     })
   ];
 
-- 
GitLab


From 448bed5653ec36db5959f423abf5a0529337c760 Mon Sep 17 00:00:00 2001
From: Renato Alves <alves.rjc@gmail.com>
Date: Wed, 2 Oct 2019 11:24:30 +0200
Subject: [PATCH 1947/2254] HTSeq: init at 0.11.2

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

diff --git a/pkgs/development/python-modules/HTSeq/default.nix b/pkgs/development/python-modules/HTSeq/default.nix
new file mode 100644
index 00000000000..7cbe523ba1e
--- /dev/null
+++ b/pkgs/development/python-modules/HTSeq/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, buildPythonPackage, fetchPypi, cython, numpy, pysam, matplotlib
+}:
+buildPythonPackage rec {
+  version = "0.11.2";
+  pname = "HTSeq";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "65c4c13968506c7df92e97124df96fdd041c4476c12a548d67350ba8b436bcfc";
+  };
+
+  buildInputs = [ cython numpy pysam ];
+  propagatedBuildInputs = [ numpy pysam matplotlib ];
+
+  meta = with stdenv.lib; {
+    description = "A framework to work with high-throughput sequencing data";
+    maintainers = with maintainers; [ unode ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index efa8c4be094..75f2afab0d7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1698,6 +1698,8 @@ in {
     inherit (pkgs) pkgconfig;
   };
 
+  HTSeq = callPackage ../development/python-modules/HTSeq { };
+
   httpserver = callPackage ../development/python-modules/httpserver {};
 
   bleach = callPackage ../development/python-modules/bleach { };
-- 
GitLab


From 64d02bba0125ef905d35224436538a6a44dbde04 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 4 Oct 2019 15:37:17 +0300
Subject: [PATCH 1948/2254] pdfcpu: 0.2.4 -> 0.2.5

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

diff --git a/pkgs/applications/graphics/pdfcpu/default.nix b/pkgs/applications/graphics/pdfcpu/default.nix
index 7b1077d18a9..3d6d04db553 100644
--- a/pkgs/applications/graphics/pdfcpu/default.nix
+++ b/pkgs/applications/graphics/pdfcpu/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "pdfcpu";
-  version = "0.2.4";
+  version = "0.2.5";
 
   src = fetchFromGitHub {
     owner = "pdfcpu";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0inlwrpv5zkcv48g5gq1xdrvd7w1zkhf8p57fpr2cpd7hd3am7n8";
+    sha256 = "0fgdq8byb9pp9wiq3dm0vxw32kbspczqnk41agxpzjf303zmv75y";
   };
 
   modSha256 = "1nagb3k2ghfw27g4vcmn7v8s5flg387jpf1l18gw6c44a1xjcivs";
-- 
GitLab


From c97c5b9dfe77a34f8a67023cda4d52e0225819bc Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 4 Oct 2019 15:39:44 +0300
Subject: [PATCH 1949/2254] onedrive: 2.3.9 -> 2.3.10

---
 pkgs/applications/networking/sync/onedrive/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/sync/onedrive/default.nix b/pkgs/applications/networking/sync/onedrive/default.nix
index ceaddeb3d44..b1a5e8e74cb 100644
--- a/pkgs/applications/networking/sync/onedrive/default.nix
+++ b/pkgs/applications/networking/sync/onedrive/default.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "onedrive";
-  version = "2.3.9";
+  version = "2.3.10";
 
   src = fetchFromGitHub {
     owner = "abraunegg";
     repo = "onedrive";
     rev = "v${version}";
-    sha256 = "0fg2zzhhd1wl8z416px432xynx6whnzdamzdckc8rmm1cvghgb0f";
+    sha256 = "0ks22anxih63zwlc11z0gi531wvcricbkv1wlkrgfihi58l8fhfk";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From 85b7d89892a4ea088d541a694addb2e363758e44 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Fri, 4 Oct 2019 08:44:07 -0400
Subject: [PATCH 1950/2254] libmediaart: apply patch to fix gnome-music crash

See https://bugzilla.gnome.org/show_bug.cgi?id=792272
---
 pkgs/development/libraries/libmediaart/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libmediaart/default.nix b/pkgs/development/libraries/libmediaart/default.nix
index 569c567e928..20a63fd6eb0 100644
--- a/pkgs/development/libraries/libmediaart/default.nix
+++ b/pkgs/development/libraries/libmediaart/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gdk-pixbuf, gobject-introspection, gnome3 }:
+{ stdenv, fetchurl, meson, ninja, pkgconfig, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gdk-pixbuf, gobject-introspection, gnome3, fetchpatch }:
 
 stdenv.mkDerivation rec {
   pname = "libmediaart";
@@ -14,6 +14,14 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ meson ninja pkgconfig vala gtk-doc docbook_xsl docbook_xml_dtd_412 gobject-introspection ];
   buildInputs = [ glib gdk-pixbuf ];
 
+  patches = [
+    # https://bugzilla.gnome.org/show_bug.cgi?id=792272
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/libmediaart/commit/a704d0b6cfea091274bd79aca6d15f19b4f6e5b5.patch";
+      sha256 = "0606qfmdqxcxrydv1fgwq11hmas34ba4a5kzbbqdhfh0h9ldgwkv";
+    })
+  ];
+
   # FIXME: Turn on again when https://github.com/NixOS/nixpkgs/issues/53701
   # is fixed on master.
   doCheck = false;
-- 
GitLab


From 51c6082a9fc2042b7aa0eda9a9365d4a3b604575 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Fri, 4 Oct 2019 15:24:16 +0200
Subject: [PATCH 1951/2254] openscad: remove useless preBuild phase

The preBuild phase was introduced to follow a modification in qscintilla
build (76ad2796be28c5fbe8f8fe2b9bada12c3e1360e2) that forced the library
libqscintilla2_qt5.so to be called libqscintilla2.so. This has been
inproved in 4bf49d94179ad2378f50ba54138343fecb75e446 so the preBuild
trick is not necessary anymore.
---
 pkgs/applications/graphics/openscad/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix
index 9910b7bbadf..9f7fbc8421b 100644
--- a/pkgs/applications/graphics/openscad/default.nix
+++ b/pkgs/applications/graphics/openscad/default.nix
@@ -53,10 +53,6 @@ mkDerivation rec {
   # src/lexer.l:36:10: fatal error: parser.hxx: No such file or directory
   enableParallelBuilding = false; # true by default due to qmake
 
-  preBuild = ''
-    sed -re 's/qscintilla2_qt5/qscintilla2/g' -i Makefile
-  '';
-
   postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
     mkdir $out/Applications
     mv $out/bin/*.app $out/Applications
-- 
GitLab


From 5b590f93e0e8bd6d1fd1f7220b9f3626b35db28d Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Fri, 4 Oct 2019 16:48:30 +0200
Subject: [PATCH 1952/2254] nano: 4.4 -> 4.5

See https://lists.gnu.org/archive/html/info-gnu/2019-10/msg00001.html
for release information.
---
 pkgs/applications/editors/nano/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix
index aea585ce8d6..15f251f5b09 100644
--- a/pkgs/applications/editors/nano/default.nix
+++ b/pkgs/applications/editors/nano/default.nix
@@ -20,11 +20,11 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "nano";
-  version = "4.4";
+  version = "4.5";
 
   src = fetchurl {
     url = "mirror://gnu/nano/${pname}-${version}.tar.xz";
-    sha256 = "1iw2ypq34g1gfqyhgka2fz5yj5vrlz85q6zk7amgyj286ph25wia";
+    sha256 = "0czmz1yq8s5qcxcmfjdxzg9nkhbmlc9q1nz04jvf57fdbs7w7mfy";
   };
 
   nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;
-- 
GitLab


From b8ef3d07278ea8f1b9da22e5ad802bfd1a838316 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Fri, 4 Oct 2019 17:00:17 +0200
Subject: [PATCH 1953/2254] screen: 4.6.2 -> 4.7.0

See https://lists.gnu.org/archive/html/info-gnu/2019-10/msg00000.html
for release information.
---
 pkgs/tools/misc/screen/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix
index beeeb84aac9..bb02c286c4d 100644
--- a/pkgs/tools/misc/screen/default.nix
+++ b/pkgs/tools/misc/screen/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "screen";
-  version = "4.6.2";
+  version = "4.7.0";
 
   src = fetchurl {
     url = "mirror://gnu/screen/${pname}-${version}.tar.gz";
-    sha256 = "0fps0fsipfbh7c2cnp7rjw9n79j0ysq21mk8hzifa33a1r924s8v";
+    sha256 = "1h90bpy2wk304xw367y1zwz0kilrpm6h28nphykx4fvqz8l56xys";
   };
 
   configureFlags= [
-- 
GitLab


From f3eb063ecfb0cb76e2cef1e9c9764cdee92f9ed7 Mon Sep 17 00:00:00 2001
From: talyz <kim.lindberger@gmail.com>
Date: Tue, 1 Oct 2019 15:38:22 +0200
Subject: [PATCH 1954/2254] gitlab: 12.1.6 -> 12.3.4

- Update GitLab to 12.3.4

- Update update.py to cope with the new upstream repository structure

- Refactor gitlab-shell to use buildGoPackage and bundlerEnv for
  dependencies

- Refactor gitlab-workhorse to use buildGoPackage for dependencies

- Make update.py able to update gitlab-shell and gitlab-workhorse
  dependencies

- Various fixes necessary for update to work
---
 .../version-management/gitlab/data.json       |  40 +-
 .../version-management/gitlab/default.nix     |   2 +-
 .../version-management/gitlab/gitaly/Gemfile  |   5 +-
 .../gitlab/gitaly/Gemfile.lock                |  37 +-
 .../gitlab/gitaly/default.nix                 |   6 +-
 .../version-management/gitlab/gitaly/deps.nix |  48 +-
 .../gitlab/gitaly/gemset.nix                  |  65 +-
 .../gitlab/gitlab-shell/Gemfile               |  12 +
 .../gitlab/gitlab-shell/Gemfile.lock          | 109 +++
 .../gitlab/gitlab-shell/default.nix           |  69 +-
 .../gitlab/gitlab-shell/deps.nix              | 507 ++++++++++
 .../gitlab/gitlab-shell/gemset.nix            | 451 +++++++++
 .../remove-hardcoded-locations.patch          |  14 +-
 .../gitlab/gitlab-workhorse/default.nix       |  22 +-
 .../gitlab/gitlab-workhorse/deps.nix          | 885 ++++++++++++++++++
 .../gitlab/rubyEnv-ce/Gemfile                 |  84 +-
 .../gitlab/rubyEnv-ce/Gemfile.lock            | 232 +++--
 .../gitlab/rubyEnv-ce/gemset.nix              | 686 ++++++++++----
 .../gitlab/rubyEnv-ee/Gemfile                 |  63 +-
 .../gitlab/rubyEnv-ee/Gemfile.lock            | 185 ++--
 .../gitlab/rubyEnv-ee/gemset.nix              | 500 ++++++----
 .../version-management/gitlab/update.py       |  47 +-
 22 files changed, 3292 insertions(+), 777 deletions(-)
 create mode 100644 pkgs/applications/version-management/gitlab/gitlab-shell/Gemfile
 create mode 100644 pkgs/applications/version-management/gitlab/gitlab-shell/Gemfile.lock
 create mode 100644 pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix
 create mode 100644 pkgs/applications/version-management/gitlab/gitlab-shell/gemset.nix
 create mode 100644 pkgs/applications/version-management/gitlab/gitlab-workhorse/deps.nix

diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json
index d20236e9f5b..c4f0c5deb00 100644
--- a/pkgs/applications/version-management/gitlab/data.json
+++ b/pkgs/applications/version-management/gitlab/data.json
@@ -1,32 +1,32 @@
 {
   "ce": {
-    "version": "12.1.6",
-    "repo_hash": "0zyqxzyb1m8qa94iiyqf5ivqxrg60y378r94fsixy17fbh4y7sa6",
-    "deb_hash": "14bwcmwar44pjnjr6fdn2h9y92vyfva0kb76d4pz8pqc9pfm2hmg",
-    "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_12.1.6-ce.0_amd64.deb/download.deb",
+    "version": "12.3.4",
+    "repo_hash": "02nfgwvm8z8cn64qlkvjmj9mvxqy9aszzdsmfr0kjjq0zzg7l7hk",
+    "deb_hash": "09iwrqdx897i35hb0dvw13s0747wqcqk67h855a9abm5phbkv4bb",
+    "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_12.3.4-ce.0_amd64.deb/download.deb",
     "owner": "gitlab-org",
-    "repo": "gitlab-ce",
-    "rev": "v12.1.6",
+    "repo": "gitlab-foss",
+    "rev": "v12.3.4",
     "passthru": {
-      "GITALY_SERVER_VERSION": "1.53.2",
-      "GITLAB_PAGES_VERSION": "1.7.1",
-      "GITLAB_SHELL_VERSION": "9.3.0",
-      "GITLAB_WORKHORSE_VERSION": "8.7.0"
+      "GITALY_SERVER_VERSION": "1.65.1",
+      "GITLAB_PAGES_VERSION": "1.9.0",
+      "GITLAB_SHELL_VERSION": "10.0.0",
+      "GITLAB_WORKHORSE_VERSION": "8.10.0"
     }
   },
   "ee": {
-    "version": "12.1.6",
-    "repo_hash": "1lxci1hwcccgw567c5733yl95xsxr4gnw41m48igdw9y8p6g7zbc",
-    "deb_hash": "0yjilhf4bjhl1a596x6n4cvjklfbrwhymslhx977nfjazfb5slx3",
-    "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_12.1.6-ee.0_amd64.deb/download.deb",
+    "version": "12.3.4",
+    "repo_hash": "152gg7h0zwzih93ajn3ki5ij8c1fbanlgwl40i44nnsk79m8jbia",
+    "deb_hash": "1kyw3r0l5h79sfckfqwwfd7g2zxslywksbv58yhar6nwcidrjags",
+    "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_12.3.4-ee.0_amd64.deb/download.deb",
     "owner": "gitlab-org",
-    "repo": "gitlab-ee",
-    "rev": "v12.1.6-ee",
+    "repo": "gitlab",
+    "rev": "v12.3.4-ee",
     "passthru": {
-      "GITALY_SERVER_VERSION": "1.53.2",
-      "GITLAB_PAGES_VERSION": "1.7.1",
-      "GITLAB_SHELL_VERSION": "9.3.0",
-      "GITLAB_WORKHORSE_VERSION": "8.7.0"
+      "GITALY_SERVER_VERSION": "1.65.1",
+      "GITLAB_PAGES_VERSION": "1.9.0",
+      "GITLAB_SHELL_VERSION": "10.0.0",
+      "GITLAB_WORKHORSE_VERSION": "8.10.0"
     }
   }
 }
\ No newline at end of file
diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix
index fb18fb7941e..2c457da1961 100644
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@@ -19,7 +19,7 @@ let
         };
       };
     groups = [
-      "default" "unicorn" "ed25519" "metrics" "development" "puma" "test"
+      "default" "unicorn" "ed25519" "metrics" "development" "puma" "test" "kerberos"
     ];
     # N.B. omniauth_oauth2_generic and apollo_upload_server both provide a
     # `console` executable.
diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile b/pkgs/applications/version-management/gitlab/gitaly/Gemfile
index 1a6eb99b678..9478dc9a84b 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile
+++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile
@@ -6,8 +6,7 @@ gem 'bundler', '>= 1.17.3'
 gem 'rugged', '~> 0.28'
 gem 'github-linguist', '~> 6.1', require: 'linguist'
 gem 'gitlab-markup', '~> 1.7.0'
-gem 'activesupport', '~> 5.1.7'
-gem 'gitaly-proto', '~> 1.36.0'
+gem 'activesupport', '~> 5.2.3'
 gem 'rdoc', '~> 4.2'
 gem 'gitlab-gollum-lib', '~> 4.2.7.7', require: false
 gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.2', require: false
@@ -17,7 +16,7 @@ gem 'faraday', '~> 0.12'
 gem 'rbtrace', require: false
 
 # Labkit provides observability functionality
-gem 'gitlab-labkit', '~> 0.3.0'
+gem 'gitlab-labkit', '~> 0.5.0'
 
 # Detects the open source license the repository includes
 # This version needs to be in sync with GitLab CE/EE
diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
index 0a86273f7cb..cb292af8cc3 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
@@ -2,20 +2,20 @@ GEM
   remote: https://rubygems.org/
   specs:
     abstract_type (0.0.7)
-    actionpack (5.1.7)
-      actionview (= 5.1.7)
-      activesupport (= 5.1.7)
+    actionpack (5.2.3)
+      actionview (= 5.2.3)
+      activesupport (= 5.2.3)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.1.7)
-      activesupport (= 5.1.7)
+    actionview (5.2.3)
+      activesupport (= 5.2.3)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activesupport (5.1.7)
+    activesupport (5.2.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -46,11 +46,9 @@ GEM
       activesupport (>= 4.2.0)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
-    ffi (1.10.0)
+    ffi (1.11.1)
     gemojione (3.3.0)
       json
-    gitaly-proto (1.36.0)
-      grpc (~> 1.0)
     github-linguist (6.4.1)
       charlock_holmes (~> 0.7.6)
       escape_utils (~> 1.2.0)
@@ -73,12 +71,13 @@ GEM
       diff-lcs (~> 1.1)
       mime-types (>= 1.16)
       posix-spawn (~> 0.3)
-    gitlab-labkit (0.3.0)
+    gitlab-labkit (0.5.2)
       actionpack (~> 5)
       activesupport (~> 5)
-      grpc (~> 1.19.0)
+      grpc (~> 1.19)
       jaeger-client (~> 0.10)
       opentracing (~> 0.4)
+      redis (> 3.0.0, < 5.0.0)
     gitlab-markup (1.7.0)
     gollum-grit_adapter (1.0.1)
       gitlab-grit (~> 2.7, >= 2.7.1)
@@ -111,10 +110,10 @@ GEM
     mime-types-data (3.2019.0331)
     mini_portile2 (2.4.0)
     minitest (5.11.3)
-    msgpack (1.2.10)
+    msgpack (1.3.0)
     multi_json (1.13.1)
     multipart-post (2.0.0)
-    nokogiri (1.10.3)
+    nokogiri (1.10.4)
       mini_portile2 (~> 2.4.0)
     nokogumbo (1.5.0)
       nokogiri
@@ -139,7 +138,7 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.4)
+    rails-html-sanitizer (1.2.0)
       loofah (~> 2.2, >= 2.2.2)
     rainbow (3.0.0)
     rbtrace (0.4.11)
@@ -147,7 +146,8 @@ GEM
       msgpack (>= 0.4.3)
       optimist (>= 3.0.0)
     rdoc (4.3.0)
-    rouge (3.5.1)
+    redis (4.1.2)
+    rouge (3.11.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
@@ -175,7 +175,7 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
     ruby-progressbar (1.10.0)
-    rugged (0.28.1)
+    rugged (0.28.3.1)
     safe_yaml (1.0.5)
     sanitize (4.6.6)
       crass (~> 1.0.2)
@@ -213,15 +213,14 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (~> 5.1.7)
+  activesupport (~> 5.2.3)
   bundler (>= 1.17.3)
   factory_bot
   faraday (~> 0.12)
-  gitaly-proto (~> 1.36.0)
   github-linguist (~> 6.1)
   gitlab-gollum-lib (~> 4.2.7.7)
   gitlab-gollum-rugged_adapter (~> 0.4.4.2)
-  gitlab-labkit (~> 0.3.0)
+  gitlab-labkit (~> 0.5.0)
   gitlab-markup (~> 1.7.0)
   google-protobuf (~> 3.7.1)
   grpc (~> 1.19.0)
diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix
index 873d9f39090..066a29579d7 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix
@@ -17,14 +17,14 @@ let
       };
   };
 in buildGoPackage rec {
-  version = "1.53.2";
+  version = "1.65.1";
   pname = "gitaly";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitaly";
     rev = "v${version}";
-    sha256 = "0x4dhqaxx6n5jlcvf69rglxiz11037ghgcnskks6qnlcbkd85j3d";
+    sha256 = "1a39i723na2xk4363a7v48ba23vi04qpg0119dw09g13m0k5hjc3";
   };
 
   goPackagePath = "gitlab.com/gitlab-org/gitaly";
@@ -40,7 +40,7 @@ in buildGoPackage rec {
 
   postInstall = ''
     mkdir -p $ruby
-    cp -rv $src/ruby/{bin,lib,git-hooks,gitlab-shell} $ruby
+    cp -rv $src/ruby/{bin,lib,proto,git-hooks,gitlab-shell} $ruby
 
     # gitlab-shell will try to read its config relative to the source
     # code by default which doesn't work in nixos because it's a
diff --git a/pkgs/applications/version-management/gitlab/gitaly/deps.nix b/pkgs/applications/version-management/gitlab/gitaly/deps.nix
index 5522185783d..3bca67fe312 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/deps.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/deps.nix
@@ -270,6 +270,33 @@
       sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9";
     };
   }
+  {
+    goPackagePath = "github.com/kr/pretty";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kr/pretty";
+      rev = "v0.1.0";
+      sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp";
+    };
+  }
+  {
+    goPackagePath = "github.com/kr/pty";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kr/pty";
+      rev = "v1.1.1";
+      sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6";
+    };
+  }
+  {
+    goPackagePath = "github.com/kr/text";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kr/text";
+      rev = "v0.1.0";
+      sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1";
+    };
+  }
   {
     goPackagePath = "github.com/libgit2/git2go";
     fetch = {
@@ -477,15 +504,6 @@
       sha256 = "113fwpn80ylx970w8h7nfqnhh18dpx1jadbk7rbr8k68q4di4y0q";
     };
   }
-  {
-    goPackagePath = "gitlab.com/gitlab-org/gitaly-proto";
-    fetch = {
-      type = "git";
-      url = "https://gitlab.com/gitlab-org/gitaly-proto.git";
-      rev = "v1.36.0";
-      sha256 = "0xma8ys3lf1bdhlkmcis31xs1h1dshcr5796wwfwnzijwk6422m3";
-    };
-  }
   {
     goPackagePath = "gitlab.com/gitlab-org/labkit";
     fetch = {
@@ -509,8 +527,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/crypto";
-      rev = "c2843e01d9a2";
-      sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r";
+      rev = "20be4c3c3ed5";
+      sha256 = "1ph7y8v30hc95h1dwr7vrhg1nzs47a261qin6zg8mhf12g5k2lxb";
     };
   }
   {
@@ -554,8 +572,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/sys";
-      rev = "d0b11bdaac8a";
-      sha256 = "18yfsmw622l7gc5sqriv5qmck6903vvhivpzp8i3xfy3z33dybdl";
+      rev = "953cdadca894";
+      sha256 = "0gkha4whk8xkcv3isigbs250akag99isxnd3v9xmy0kl3g88hxy1";
     };
   }
   {
@@ -626,8 +644,8 @@
     fetch = {
       type = "git";
       url = "https://gopkg.in/check.v1";
-      rev = "20d25e280405";
-      sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np";
+      rev = "788fd7840127";
+      sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a";
     };
   }
   {
diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix
index fd1af22dd78..a5140972ef0 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix
@@ -13,10 +13,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0zyi3dc50ii2msdkawaf11y4xw645ig57ha2jfnr8lpr8s1nlh52";
+      sha256 = "1s2iay17i2k0xx36cmnpbrmr5w6x70jk7fq1d8w70xcdw5chm0w1";
       type = "gem";
     };
-    version = "5.1.7";
+    version = "5.2.3";
   };
   actionview = {
     dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"];
@@ -24,10 +24,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0i2j580njb767yhf0k5ih3qqg38ybiah80ai8dsr6kjjw35aj747";
+      sha256 = "1v49rgf8305grqf6gq7qa47qhamr369igyy0giycz60x86afyr4h";
       type = "gem";
     };
-    version = "5.1.7";
+    version = "5.2.3";
   };
   activesupport = {
     dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
@@ -35,10 +35,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0znhiy90hdlx66jqhaycin4qrphrymsw68c36a1an7g481zvfv91";
+      sha256 = "110vp4frgkw3mpzlmshg2f2ig09cknls2w68ym1r1s39d01v0mi8";
       type = "gem";
     };
-    version = "5.1.7";
+    version = "5.2.3";
   };
   adamantium = {
     dependencies = ["ice_nine" "memoizable"];
@@ -205,12 +205,14 @@
     version = "0.15.4";
   };
   ffi = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p";
+      sha256 = "06mvxpjply8qh4j3fj9wh08kdzwkbnvsiysh0vrhlk5cwxzjmblh";
       type = "gem";
     };
-    version = "1.10.0";
+    version = "1.11.1";
   };
   gemojione = {
     dependencies = ["json"];
@@ -221,17 +223,6 @@
     };
     version = "3.3.0";
   };
-  gitaly-proto = {
-    dependencies = ["grpc"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "11bkrf2z5ppp55cipawdpinrva42x12grp2gl1dp1jdb35crqick";
-      type = "gem";
-    };
-    version = "1.36.0";
-  };
   github-linguist = {
     dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"];
     groups = ["default"];
@@ -283,15 +274,15 @@
     version = "2.8.2";
   };
   gitlab-labkit = {
-    dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing"];
+    dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing" "redis"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0dvapmdc9axm9dq2gg89qrqb318rkrsabpyybrqvcx1ipbi5k3a1";
+      sha256 = "1j06gl4ksd83rycg3fb46bb77iw74i1ivs5li6pyf5klrxjq8k3h";
       type = "gem";
     };
-    version = "0.3.0";
+    version = "0.5.2";
   };
   gitlab-markup = {
     groups = ["default"];
@@ -489,10 +480,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1w38hilm3dk42dwk8ygiq49bl4in7y80hfqr63hk54mj4gmzi6ch";
+      sha256 = "1186lhwnxiw5ryv6dbxrsfy0fajfll2l95kf9pmca50iyiqi86zn";
       type = "gem";
     };
-    version = "1.2.10";
+    version = "1.3.0";
   };
   multi_json = {
     source = {
@@ -516,10 +507,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "02bjydih0j515szfv9mls195cvpyidh6ixm7dwbl3s2sbaxxk5s4";
+      sha256 = "0nmdrqqz1gs0fwkgzxjl4wr554gr8dc1fkrqjc2jpsvwgm41rygv";
       type = "gem";
     };
-    version = "1.10.3";
+    version = "1.10.4";
   };
   nokogumbo = {
     dependencies = ["nokogiri"];
@@ -649,10 +640,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1gv7vr5d9g2xmgpjfq4nxsqr70r9pr042r9ycqqnfvw5cz9c7jwr";
+      sha256 = "0ilwxzm3a7bql5c9q2n9g9nb1hax7vd8d65a5yp3d967ld97nvrq";
       type = "gem";
     };
-    version = "1.0.4";
+    version = "1.2.0";
   };
   rainbow = {
     source = {
@@ -679,15 +670,25 @@
     };
     version = "4.3.0";
   };
+  redis = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1mymdx7s5sr4mablklaipz679ckczsiigswm1g2v5mc93yj5amw3";
+      type = "gem";
+    };
+    version = "4.1.2";
+  };
   rouge = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0yfhazlhjc4abgzhkgq8zqmdphvkh52211widkl4zhsbhqh8wg2q";
+      sha256 = "1zsyv6abqrk7lpql5f1ja4m88bfy9qndi8xykpss6cpvjdmi3ydb";
       type = "gem";
     };
-    version = "3.5.1";
+    version = "3.11.0";
   };
   rspec = {
     dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"];
@@ -778,10 +779,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1yiszpz6y13vvgh3fss1l0ipp0zgsbbc8c28vynnpdyx1sy6krp6";
+      sha256 = "03w3k7j27kgzpcc3halkd3w0b677sny2lfwm2lwn2n1ac20dzjc6";
       type = "gem";
     };
-    version = "0.28.1";
+    version = "0.28.3.1";
   };
   safe_yaml = {
     groups = ["default" "development" "test"];
diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/Gemfile b/pkgs/applications/version-management/gitlab/gitlab-shell/Gemfile
new file mode 100644
index 00000000000..cabe4079df1
--- /dev/null
+++ b/pkgs/applications/version-management/gitlab/gitlab-shell/Gemfile
@@ -0,0 +1,12 @@
+source 'https://rubygems.org'
+
+group :development, :test do
+  gem 'listen', '~> 0.5.0'
+  gem 'pry', '~> 0.12.2'
+  gem 'rspec', '~> 3.8.0'
+  gem 'rspec-parameterized', '~> 0.4.0'
+  gem 'rubocop', '0.49.1', require: false
+  gem 'simplecov', '~> 0.9.0', require: false
+  gem 'vcr', '~> 4.0.0'
+  gem 'webmock', '~> 3.4.0'
+end
diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitlab-shell/Gemfile.lock
new file mode 100644
index 00000000000..b178b2c07ad
--- /dev/null
+++ b/pkgs/applications/version-management/gitlab/gitlab-shell/Gemfile.lock
@@ -0,0 +1,109 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    abstract_type (0.0.7)
+    adamantium (0.2.0)
+      ice_nine (~> 0.11.0)
+      memoizable (~> 0.4.0)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    ast (2.4.0)
+    binding_of_caller (0.8.0)
+      debug_inspector (>= 0.0.1)
+    coderay (1.1.2)
+    concord (0.1.5)
+      adamantium (~> 0.2.0)
+      equalizer (~> 0.0.9)
+    crack (0.4.3)
+      safe_yaml (~> 1.0.0)
+    debug_inspector (0.0.3)
+    diff-lcs (1.3)
+    docile (1.1.5)
+    equalizer (0.0.11)
+    hashdiff (0.3.7)
+    ice_nine (0.11.2)
+    listen (0.5.3)
+    memoizable (0.4.2)
+      thread_safe (~> 0.3, >= 0.3.1)
+    method_source (0.9.2)
+    multi_json (1.13.1)
+    parallel (1.12.1)
+    parser (2.5.1.2)
+      ast (~> 2.4.0)
+    powerpack (0.1.2)
+    proc_to_ast (0.1.0)
+      coderay
+      parser
+      unparser
+    procto (0.0.3)
+    pry (0.12.2)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    public_suffix (3.0.3)
+    rainbow (2.2.2)
+      rake
+    rake (12.3.3)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-parameterized (0.4.0)
+      binding_of_caller
+      parser
+      proc_to_ast
+      rspec (>= 2.13, < 4)
+      unparser
+    rspec-support (3.8.0)
+    rubocop (0.49.1)
+      parallel (~> 1.10)
+      parser (>= 2.3.3.1, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.9.0)
+    safe_yaml (1.0.4)
+    simplecov (0.9.2)
+      docile (~> 1.1.0)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.9.0)
+    simplecov-html (0.9.0)
+    thread_safe (0.3.6)
+    unicode-display_width (1.4.0)
+    unparser (0.2.8)
+      abstract_type (~> 0.0.7)
+      adamantium (~> 0.2.0)
+      concord (~> 0.1.5)
+      diff-lcs (~> 1.3)
+      equalizer (~> 0.0.9)
+      parser (>= 2.3.1.2, < 2.6)
+      procto (~> 0.0.2)
+    vcr (4.0.0)
+    webmock (3.4.2)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  listen (~> 0.5.0)
+  pry (~> 0.12.2)
+  rspec (~> 3.8.0)
+  rspec-parameterized (~> 0.4.0)
+  rubocop (= 0.49.1)
+  simplecov (~> 0.9.0)
+  vcr (~> 4.0.0)
+  webmock (~> 3.4.0)
+
+BUNDLED WITH
+   1.16.3
diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
index cd4784b36c8..3022aeac14e 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
@@ -1,40 +1,65 @@
-{ stdenv, ruby, bundler, fetchFromGitLab, go }:
-
-stdenv.mkDerivation rec {
-  version = "9.3.0";
-  pname = "gitlab-shell";
+{ stdenv, ruby, bundler, fetchFromGitLab, buildGoPackage, bundlerEnv }:
 
+let
+  version = "10.0.0";
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-shell";
     rev = "v${version}";
-    sha256 = "1r000h4sgplx7giqvqs5iy0zh3drf6qa1iiq0mxlk3h9fshs1348";
+    sha256 = "0n1llkb0jrqxm10l9wqmqxjycydqphgz0chbbf395d8pywyz826x";
   };
+  rubyEnv = bundlerEnv {
+    name = "gitlab-shell-env";
+    inherit ruby;
+    gemdir = ./.;
+  };
+  goPackage = buildGoPackage {
+    pname = "gitlab-shell-go";
+    inherit src version;
 
-  buildInputs = [ ruby bundler go ];
-
-  patches = [ ./remove-hardcoded-locations.patch ];
+    patches = [ ./remove-hardcoded-locations.patch ];
 
-  installPhase = ''
-    export GOCACHE="$TMPDIR/go-cache"
+    goPackagePath = "gitlab.com/gitlab-org/gitlab-shell";
+    goDeps = ./deps.nix;
 
-    ruby bin/compile
-    mkdir -p $out/
-    cp -R . $out/
-
-    # Nothing to install ATM for non-development but keeping the
-    # install command anyway in case that changes in the future:
-    export HOME=$(pwd)
-    bundle install -j4 --verbose --local --deployment --without development test
-  '';
+    # gitlab-shell depends on an older version of gitaly which
+    # contains old, vendored versions of some packages; gitlab-shell
+    # also explicitly depends on newer versions of these libraries,
+    # but buildGoPackage exposes the vendored versions instead,
+    # leading to compilation errors. Since the vendored libraries
+    # aren't used here anyway, we'll just remove them.
+    postConfigure = ''
+      rm -r "$NIX_BUILD_TOP/go/src/gitlab.com/gitlab-org/gitaly/vendor/"
+    '';
+  };
+in
+stdenv.mkDerivation {
+  pname = "gitlab-shell";
+  inherit src version;
+  
+  patches = [ ./remove-hardcoded-locations.patch ];
 
   # gitlab-shell will try to read its config relative to the source
   # code by default which doesn't work in nixos because it's a
   # read-only filesystem
   postPatch = ''
     substituteInPlace lib/gitlab_config.rb --replace \
-       "File.join(ROOT_PATH, 'config.yml')" \
-       "'/run/gitlab/shell-config.yml'"
+    "File.join(ROOT_PATH, 'config.yml')" \
+    "'/run/gitlab/shell-config.yml'"
+  '';
+
+  buildInputs = [ rubyEnv.wrappedRuby ];
+
+  dontBuild = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/
+    cp -R . $out/
+    cp ${goPackage.bin}/bin/* $out/bin/
+
+    runHook postInstall
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix
new file mode 100644
index 00000000000..55faacc41cd
--- /dev/null
+++ b/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix
@@ -0,0 +1,507 @@
+# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
+[
+  {
+    goPackagePath = "bou.ke/monkey";
+    fetch = {
+      type = "git";
+      url = "https://github.com/bouk/monkey";
+      rev = "v1.0.1";
+      sha256 = "050y07pwx5zk7fchp0lhf35w417sml7lxkkzly8f932fy25rydz5";
+    };
+  }
+  {
+    goPackagePath = "cloud.google.com/go";
+    fetch = {
+      type = "git";
+      url = "https://code.googlesource.com/gocloud";
+      rev = "v0.26.0";
+      sha256 = "149v3ci17g6wd2pm18mzcncq5qpl9hwdjnz3rlbn5rfidyn46la1";
+    };
+  }
+  {
+    goPackagePath = "github.com/certifi/gocertifi";
+    fetch = {
+      type = "git";
+      url = "https://github.com/certifi/gocertifi";
+      rev = "ee1a9a0726d2";
+      sha256 = "08l6lqaw83pva6fa0aafmhmy1mhb145av21772zfh3ij809a37i4";
+    };
+  }
+  {
+    goPackagePath = "github.com/client9/misspell";
+    fetch = {
+      type = "git";
+      url = "https://github.com/client9/misspell";
+      rev = "v0.3.4";
+      sha256 = "1vwf33wsc4la25zk9nylpbp9px3svlmldkm0bha4hp56jws4q9cs";
+    };
+  }
+  {
+    goPackagePath = "github.com/codahale/hdrhistogram";
+    fetch = {
+      type = "git";
+      url = "https://github.com/codahale/hdrhistogram";
+      rev = "3a0bb77429bd";
+      sha256 = "1zampgfjbxy192cbwdi7g86l1idxaam96d834wncnpfdwgh5kl57";
+    };
+  }
+  {
+    goPackagePath = "github.com/davecgh/go-spew";
+    fetch = {
+      type = "git";
+      url = "https://github.com/davecgh/go-spew";
+      rev = "v1.1.1";
+      sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
+    };
+  }
+  {
+    goPackagePath = "github.com/fsnotify/fsnotify";
+    fetch = {
+      type = "git";
+      url = "https://github.com/fsnotify/fsnotify";
+      rev = "v1.4.7";
+      sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
+    };
+  }
+  {
+    goPackagePath = "github.com/getsentry/raven-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/getsentry/raven-go";
+      rev = "v0.1.0";
+      sha256 = "1dl80kar4lzdcfl3w6jssi1ld6bv0rmx6sp6bz6rzysfr9ilm02z";
+    };
+  }
+  {
+    goPackagePath = "github.com/gogo/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gogo/protobuf";
+      rev = "v1.1.1";
+      sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2";
+    };
+  }
+  {
+    goPackagePath = "github.com/golang/glog";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/glog";
+      rev = "23def4e6c14b";
+      sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30";
+    };
+  }
+  {
+    goPackagePath = "github.com/golang/lint";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/lint";
+      rev = "06c8688daad7";
+      sha256 = "0xi94dwvz50a66bq1hp9fyqkym5mcpdxdb1hrfvicldgjf37lc47";
+    };
+  }
+  {
+    goPackagePath = "github.com/golang/mock";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/mock";
+      rev = "v1.1.1";
+      sha256 = "0ap8wb6pdl6ccmdb43advjll2ly4sz26wsc3axw0hbrjrybybzgy";
+    };
+  }
+  {
+    goPackagePath = "github.com/golang/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/protobuf";
+      rev = "v1.2.0";
+      sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab";
+    };
+  }
+  {
+    goPackagePath = "github.com/grpc-ecosystem/go-grpc-middleware";
+    fetch = {
+      type = "git";
+      url = "https://github.com/grpc-ecosystem/go-grpc-middleware";
+      rev = "v1.0.0";
+      sha256 = "0lwgxih021xfhfb1xb9la5f98bpgpaiz63sbllx77qwwl2rmhrsp";
+    };
+  }
+  {
+    goPackagePath = "github.com/hpcloud/tail";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hpcloud/tail";
+      rev = "v1.0.0";
+      sha256 = "1njpzc0pi1acg5zx9y6vj9xi6ksbsc5d387rd6904hy6rh2m6kn0";
+    };
+  }
+  {
+    goPackagePath = "github.com/kisielk/gotool";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kisielk/gotool";
+      rev = "v1.0.0";
+      sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn";
+    };
+  }
+  {
+    goPackagePath = "github.com/lightstep/lightstep-tracer-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/lightstep/lightstep-tracer-go";
+      rev = "v0.15.6";
+      sha256 = "10n5r66g44s6rnz5kf86s4a3p1g55kc1kxqhnk7bx7mlayndgpmb";
+    };
+  }
+  {
+    goPackagePath = "github.com/mattn/go-shellwords";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-shellwords";
+      rev = "2444a32a19f4";
+      sha256 = "08zcgr1az1n8zaxzwdd205j86hczgyc52nxfnw5avpw7rrkf7v0d";
+    };
+  }
+  {
+    goPackagePath = "github.com/onsi/ginkgo";
+    fetch = {
+      type = "git";
+      url = "https://github.com/onsi/ginkgo";
+      rev = "v1.7.0";
+      sha256 = "14wgpdrvpc35rdz3859bz53sc1g4vpr1fysy15wy3ff9gmqs14yg";
+    };
+  }
+  {
+    goPackagePath = "github.com/onsi/gomega";
+    fetch = {
+      type = "git";
+      url = "https://github.com/onsi/gomega";
+      rev = "v1.4.3";
+      sha256 = "1c8rqg5i2hz3snmq7s41yar1zjnzilb0fyiyhkg83v97afcfx79v";
+    };
+  }
+  {
+    goPackagePath = "github.com/opentracing/opentracing-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/opentracing/opentracing-go";
+      rev = "v1.0.2";
+      sha256 = "0i0ghg94dg8lk05mw5n23983wq04yjvkjmdkc9z5y1f3508938h9";
+    };
+  }
+  {
+    goPackagePath = "github.com/otiai10/copy";
+    fetch = {
+      type = "git";
+      url = "https://github.com/otiai10/copy";
+      rev = "v1.0.1";
+      sha256 = "0xmy0kfcx48q10s040579pcjswfaxlwhv7a2z07z9r92fdrgw03k";
+    };
+  }
+  {
+    goPackagePath = "github.com/otiai10/curr";
+    fetch = {
+      type = "git";
+      url = "https://github.com/otiai10/curr";
+      rev = "f5a3d24e5776";
+      sha256 = "01k33ifs9n0pnhwhbfb9ws3q5sa37fi7dhir5vjakpfzdin07y4w";
+    };
+  }
+  {
+    goPackagePath = "github.com/otiai10/mint";
+    fetch = {
+      type = "git";
+      url = "https://github.com/otiai10/mint";
+      rev = "v1.2.4";
+      sha256 = "1mf7b8h3akxbpj1rf3nk0ccqk5idd6z2gh9gm31phr7ll4gykn2m";
+    };
+  }
+  {
+    goPackagePath = "github.com/philhofer/fwd";
+    fetch = {
+      type = "git";
+      url = "https://github.com/philhofer/fwd";
+      rev = "v1.0.0";
+      sha256 = "1pg84khadh79v42y8sjsdgfb54vw2kzv7hpapxkifgj0yvcp30g2";
+    };
+  }
+  {
+    goPackagePath = "github.com/pkg/errors";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pkg/errors";
+      rev = "v0.8.0";
+      sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
+    };
+  }
+  {
+    goPackagePath = "github.com/pmezard/go-difflib";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pmezard/go-difflib";
+      rev = "v1.0.0";
+      sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
+    };
+  }
+  {
+    goPackagePath = "github.com/sirupsen/logrus";
+    fetch = {
+      type = "git";
+      url = "https://github.com/sirupsen/logrus";
+      rev = "v1.0.5";
+      sha256 = "0g5z7al7kky11ai2dhac6gkp3b5pxsvx72yj3xg4wg3265gbn7yz";
+    };
+  }
+  {
+    goPackagePath = "github.com/stretchr/testify";
+    fetch = {
+      type = "git";
+      url = "https://github.com/stretchr/testify";
+      rev = "v1.2.2";
+      sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs";
+    };
+  }
+  {
+    goPackagePath = "github.com/tinylib/msgp";
+    fetch = {
+      type = "git";
+      url = "https://github.com/tinylib/msgp";
+      rev = "v1.0.2";
+      sha256 = "0pypfknghg1hcjjrqz3f1riaylk6hcxn9h0qyzynb74rp0qmlxjc";
+    };
+  }
+  {
+    goPackagePath = "github.com/uber-go/atomic";
+    fetch = {
+      type = "git";
+      url = "https://github.com/uber-go/atomic";
+      rev = "v1.3.2";
+      sha256 = "11pzvjys5ddjjgrv94pgk9pnip9yyb54z7idf33zk7p7xylpnsv6";
+    };
+  }
+  {
+    goPackagePath = "github.com/uber/jaeger-client-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/uber/jaeger-client-go";
+      rev = "v2.15.0";
+      sha256 = "0ki23m9zrf3vxp839fnp9ckr4m28y6mpad8g5s5lr5k8jkl0sfwj";
+    };
+  }
+  {
+    goPackagePath = "github.com/uber/jaeger-lib";
+    fetch = {
+      type = "git";
+      url = "https://github.com/uber/jaeger-lib";
+      rev = "v1.5.0";
+      sha256 = "113fwpn80ylx970w8h7nfqnhh18dpx1jadbk7rbr8k68q4di4y0q";
+    };
+  }
+  {
+    goPackagePath = "gitlab.com/gitlab-org/gitaly";
+    fetch = {
+      type = "git";
+      url = "https://gitlab.com/gitlab-org/gitaly.git";
+      rev = "v1.7.0";
+      sha256 = "1hhiyw1ag22mgn6chp8lf29y2fgj90xyb7wjd6s30hayqja7knh1";
+    };
+  }
+  {
+    goPackagePath = "gitlab.com/gitlab-org/gitaly-proto";
+    fetch = {
+      type = "git";
+      url = "https://gitlab.com/gitlab-org/gitaly-proto.git";
+      rev = "v1.12.0";
+      sha256 = "02aqw1q8n84v4f3rc0x7hsg0gkmbqkznp9cl6vrhjvsisv38v695";
+    };
+  }
+  {
+    goPackagePath = "gitlab.com/gitlab-org/labkit";
+    fetch = {
+      type = "git";
+      url = "https://gitlab.com/gitlab-org/labkit.git";
+      rev = "0c3fc7cdd57c";
+      sha256 = "0fpn37v7dhhdgd63v4mq9cna9wdzrsfams13qmjmps3xpdw2wr9i";
+    };
+  }
+  {
+    goPackagePath = "go.uber.org/atomic";
+    fetch = {
+      type = "git";
+      url = "https://github.com/uber-go/atomic";
+      rev = "v1.3.2";
+      sha256 = "11pzvjys5ddjjgrv94pgk9pnip9yyb54z7idf33zk7p7xylpnsv6";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/crypto";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/crypto";
+      rev = "182114d58262";
+      sha256 = "0dhagsjpk3wn2f7w148v0h9i651jpk4c0mlsy5sihcnmqz8s764l";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/lint";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/lint";
+      rev = "06c8688daad7";
+      sha256 = "0xi94dwvz50a66bq1hp9fyqkym5mcpdxdb1hrfvicldgjf37lc47";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/net";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/net";
+      rev = "10aee1819953";
+      sha256 = "1rd6y0fr2gqhx3bsy0ahnacqzbxijkx8wyfmamrb3wbzc01091rl";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/oauth2";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/oauth2";
+      rev = "d2e6202438be";
+      sha256 = "0wbn75fd10485nb93bm4kqldqifdim5xqy4v7r5sdvimvf3fyhn7";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/sync";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sync";
+      rev = "1d60e4601c6f";
+      sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev = "70b957f3b65e";
+      sha256 = "146jwkr39asigqbsnsigxpkpb4vydld4k9q34xvvw0bp10qzjxxw";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/text";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/text";
+      rev = "v0.3.0";
+      sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/tools";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/tools";
+      rev = "6cd1fcedba52";
+      sha256 = "00hl0vkmy8impsnmc2dmm55sdhia95k0kqcrjbdpynryn1lamn5d";
+    };
+  }
+  {
+    goPackagePath = "google.golang.org/appengine";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/appengine";
+      rev = "v1.1.0";
+      sha256 = "1pz202zszg8f35dk5pfhwgcdi3r6dx1l4yk6x6ly7nb4j45zi96x";
+    };
+  }
+  {
+    goPackagePath = "google.golang.org/genproto";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/go-genproto";
+      rev = "bd91e49a0898";
+      sha256 = "1f5q04h03q6fksbfkhz13ai5849rkkb8xrmmi7cxs4lzsi6ixkg8";
+    };
+  }
+  {
+    goPackagePath = "google.golang.org/grpc";
+    fetch = {
+      type = "git";
+      url = "https://github.com/grpc/grpc-go";
+      rev = "v1.16.0";
+      sha256 = "0a9xl6c5j7lvsb4q6ry5p892rjm86p47d4f8xrf0r8lxblf79qbg";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/DataDog/dd-trace-go.v1";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/DataDog/dd-trace-go.v1";
+      rev = "v1.9.0";
+      sha256 = "1zfbsmm8fbcwhd6j28q3ijyswn1d3dyhydx3ckqpkkp6qiam3c2j";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/airbrake/gobrake.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/airbrake/gobrake.v2";
+      rev = "v2.0.9";
+      sha256 = "1x06f7n7qlyzqgyz0sdfcidf3w4ldn6zs6qx2mhibggk2z4whcjw";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/check.v1";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/check.v1";
+      rev = "20d25e280405";
+      sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/fsnotify.v1";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/fsnotify.v1";
+      rev = "v1.4.7";
+      sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/gemnasium/logrus-airbrake-hook.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/gemnasium/logrus-airbrake-hook.v2";
+      rev = "v2.1.2";
+      sha256 = "0sbg0dn6cysmf8f2bi209jwl4jnpiwp4rdghnxlzirw3c32ms5y5";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/tomb.v1";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/tomb.v1";
+      rev = "dd632973f1e7";
+      sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/yaml.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/yaml.v2";
+      rev = "v2.2.1";
+      sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
+    };
+  }
+  {
+    goPackagePath = "honnef.co/go/tools";
+    fetch = {
+      type = "git";
+      url = "https://github.com/dominikh/go-tools";
+      rev = "88497007e858";
+      sha256 = "0rinkyx3r2bq45mgcasnn5jb07cwbv3p3s2wwcrzxsarsj6wa5lc";
+    };
+  }
+]
diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/gemset.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/gemset.nix
new file mode 100644
index 00000000000..665c21feb1b
--- /dev/null
+++ b/pkgs/applications/version-management/gitlab/gitlab-shell/gemset.nix
@@ -0,0 +1,451 @@
+{
+  abstract_type = {
+    groups = ["default" "development" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "09330cmhrc2wmfhdj9zzg82sv6cdhm3qgdkva5ni5xfjril2pf14";
+      type = "gem";
+    };
+    version = "0.0.7";
+  };
+  adamantium = {
+    dependencies = ["ice_nine" "memoizable"];
+    groups = ["default" "development" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0165r2ikgfwv2rm8dzyijkp74fvg0ni72hpdx8ay2v7cj08dqyak";
+      type = "gem";
+    };
+    version = "0.2.0";
+  };
+  addressable = {
+    dependencies = ["public_suffix"];
+    groups = ["default" "development" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk";
+      type = "gem";
+    };
+    version = "2.5.2";
+  };
+  ast = {
+    groups = ["default" "development" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "184ssy3w93nkajlz2c70ifm79jp3j737294kbc5fjw69v1w0n9x7";
+      type = "gem";
+    };
+    version = "2.4.0";
+  };
+  binding_of_caller = {
+    dependencies = ["debug_inspector"];
+    groups = ["default" "development" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "05syqlks7463zsy1jdfbbdravdhj9hpj5pv2m74blqpv8bq4vv5g";
+      type = "gem";
+    };
+    version = "0.8.0";
+  };
+  coderay = {
+    groups = ["default" "development" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "15vav4bhcc2x3jmi3izb11l4d9f3xv8hp2fszb7iqmpsccv1pz4y";
+      type = "gem";
+    };
+    version = "1.1.2";
+  };
+  concord = {
+    dependencies = ["adamantium" "equalizer"];
+    groups = ["default" "development" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1b6cdn0fg4n9gzbdr7zyf4jq40y6h0c0g9cra7wk9hhmsylk91bg";
+      type = "gem";
+    };
+    version = "0.1.5";
+  };
+  crack = {
+    dependencies = ["safe_yaml"];
+    groups = ["default" "development" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0abb0fvgw00akyik1zxnq7yv391va148151qxdghnzngv66bl62k";
+      type = "gem";
+    };
+    version = "0.4.3";
+  };
+  debug_inspector = {
+    groups = ["default" "development" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0vxr0xa1mfbkfcrn71n7c4f2dj7la5hvphn904vh20j3x4j5lrx0";
+      type = "gem";
+    };
+    version = "0.0.3";
+  };
+  diff-lcs = {
+    groups = ["default" "development" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "18w22bjz424gzafv6nzv98h0aqkwz3d9xhm7cbr1wfbyas8zayza";
+      type = "gem";
+    };
+    version = "1.3";
+  };
+  docile = {
+    groups = ["default" "development" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0m8j31whq7bm5ljgmsrlfkiqvacrw6iz9wq10r3gwrv5785y8gjx";
+      type = "gem";
+    };
+    version = "1.1.5";
+  };
+  equalizer = {
+    groups = ["default" "development" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1kjmx3fygx8njxfrwcmn7clfhjhb6bvv3scy2lyyi0wqyi3brra4";
+      type = "gem";
+    };
+    version = "0.0.11";
+  };
+  hashdiff = {
+    groups = ["default" "development" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0yj5l2rw8i8jc725hbcpc4wks0qlaaimr3dpaqamfjkjkxl0hjp9";
+      type = "gem";
+    };
+    version = "0.3.7";
+  };
+  ice_nine = {
+    groups = ["default" "development" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1nv35qg1rps9fsis28hz2cq2fx1i96795f91q4nmkm934xynll2x";
+      type = "gem";
+    };
+    version = "0.11.2";
+  };
+  listen = {
+    groups = ["development" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0inlw7vix61170vjr87h9izhjm5dbby8rbfrf1iryiv7b3kyvkxl";
+      type = "gem";
+    };
+    version = "0.5.3";
+  };
+  memoizable = {
+    dependencies = ["thread_safe"];
+    groups = ["default" "development" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0v42bvghsvfpzybfazl14qhkrjvx0xlmxz0wwqc960ga1wld5x5c";
+      type = "gem";
+    };
+    version = "0.4.2";
+  };
+  method_source = {
+    groups = ["default" "development" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1pviwzvdqd90gn6y7illcdd9adapw8fczml933p5vl739dkvl3lq";
+      type = "gem";
+    };
+    version = "0.9.2";
+  };
+  multi_json = {
+    groups = ["default" "development" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv";
+      type = "gem";
+    };
+    version = "1.13.1";
+  };
+  parallel = {
+    groups = ["default" "development" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "01hj8v1qnyl5ndrs33g8ld8ibk0rbcqdpkpznr04gkbxd11pqn67";
+      type = "gem";
+    };
+    version = "1.12.1";
+  };
+  parser = {
+    dependencies = ["ast"];
+    groups = ["default" "development" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1zp89zg7iypncszxsjp8kiccrpbdf728jl449g6cnfkz990fyb5k";
+      type = "gem";
+    };
+    version = "2.5.1.2";
+  };
+  powerpack = {
+    groups = ["default" "development" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1r51d67wd467rpdfl6x43y84vwm8f5ql9l9m85ak1s2sp3nc5hyv";
+      type = "gem";
+    };
+    version = "0.1.2";
+  };
+  proc_to_ast = {
+    dependencies = ["coderay" "parser" "unparser"];
+    groups = ["default" "development" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "14c65w48bbzp5lh1cngqd1y25kqvfnq1iy49hlzshl12dsk3z9wj";
+      type = "gem";
+    };
+    version = "0.1.0";
+  };
+  procto = {
+    groups = ["default" "development" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "13imvg1x50rz3r0yyfbhxwv72lbf7q28qx9l9nfbb91h2n9ch58c";
+      type = "gem";
+    };
+    version = "0.0.3";
+  };
+  pry = {
+    dependencies = ["coderay" "method_source"];
+    groups = ["development" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "00rm71x0r1jdycwbs83lf9l6p494m99asakbvqxh8rz7zwnlzg69";
+      type = "gem";
+    };
+    version = "0.12.2";
+  };
+  public_suffix = {
+    groups = ["default" "development" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l";
+      type = "gem";
+    };
+    version = "3.0.3";
+  };
+  rainbow = {
+    dependencies = ["rake"];
+    groups = ["default" "development" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "08w2ghc5nv0kcq5b257h7dwjzjz1pqcavajfdx2xjyxqsvh2y34w";
+      type = "gem";
+    };
+    version = "2.2.2";
+  };
+  rake = {
+    groups = ["default" "development" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1cvaqarr1m84mhc006g3l1vw7sa5qpkcw0138lsxlf769zdllsgp";
+      type = "gem";
+    };
+    version = "12.3.3";
+  };
+  rspec = {
+    dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"];
+    groups = ["development" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "15ppasvb9qrscwlyjz67ppw1lnxiqnkzx5vkx1bd8x5n3dhikxc3";
+      type = "gem";
+    };
+    version = "3.8.0";
+  };
+  rspec-core = {
+    dependencies = ["rspec-support"];
+    groups = ["default" "development" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1p1s5bnbqp3sxk67y0fh0x884jjym527r0vgmhbm81w7aq6b7l4p";
+      type = "gem";
+    };
+    version = "3.8.0";
+  };
+  rspec-expectations = {
+    dependencies = ["diff-lcs" "rspec-support"];
+    groups = ["default" "development" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0vfqqcjmhdq25jrc8rd7nx4n8xid7s1ynv65ph06bk2xafn3rgll";
+      type = "gem";
+    };
+    version = "3.8.1";
+  };
+  rspec-mocks = {
+    dependencies = ["diff-lcs" "rspec-support"];
+    groups = ["default" "development" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "06y508cjqycb4yfhxmb3nxn0v9xqf17qbd46l1dh4xhncinr4fyp";
+      type = "gem";
+    };
+    version = "3.8.0";
+  };
+  rspec-parameterized = {
+    dependencies = ["binding_of_caller" "parser" "proc_to_ast" "rspec" "unparser"];
+    groups = ["development" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0arynbr6cfjhccwc8gy2xf87nybdnncsnmfwknnh8s7d4mj730p0";
+      type = "gem";
+    };
+    version = "0.4.0";
+  };
+  rspec-support = {
+    groups = ["default" "development" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0p3m7drixrlhvj2zpc38b11x145bvm311x6f33jjcxmvcm0wq609";
+      type = "gem";
+    };
+    version = "3.8.0";
+  };
+  rubocop = {
+    dependencies = ["parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"];
+    groups = ["development" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1mqyylfzch0967w7nfnqza84sqhljijd9y4bnq8hcmrscch75cxw";
+      type = "gem";
+    };
+    version = "0.49.1";
+  };
+  ruby-progressbar = {
+    groups = ["default" "development" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1igh1xivf5h5g3y5m9b4i4j2mhz2r43kngh4ww3q1r80ch21nbfk";
+      type = "gem";
+    };
+    version = "1.9.0";
+  };
+  safe_yaml = {
+    groups = ["default" "development" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094";
+      type = "gem";
+    };
+    version = "1.0.4";
+  };
+  simplecov = {
+    dependencies = ["docile" "multi_json" "simplecov-html"];
+    groups = ["development" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1a3wy9zlmfwl3f47cibnxyxrgfz16y6fmy0dj1vyidzyys4mvy12";
+      type = "gem";
+    };
+    version = "0.9.2";
+  };
+  simplecov-html = {
+    groups = ["default" "development" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0jv9pmpaxihrcsgcf6mgl3qg7rhf9scl5l2k67d768w9cz63xgvc";
+      type = "gem";
+    };
+    version = "0.9.0";
+  };
+  thread_safe = {
+    groups = ["default" "development" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy";
+      type = "gem";
+    };
+    version = "0.3.6";
+  };
+  unicode-display_width = {
+    groups = ["default" "development" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0040bsdpcmvp8w31lqi2s9s4p4h031zv52401qidmh25cgyh4a57";
+      type = "gem";
+    };
+    version = "1.4.0";
+  };
+  unparser = {
+    dependencies = ["abstract_type" "adamantium" "concord" "diff-lcs" "equalizer" "parser" "procto"];
+    groups = ["default" "development" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0rh1649846ac17av30x0b0v9l45v0x1j2y1i8m1a7xdd0v4sld0z";
+      type = "gem";
+    };
+    version = "0.2.8";
+  };
+  vcr = {
+    groups = ["development" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0qh7lkj9b0shph84dw1wsrlaprl0jn1i4339fpsfy99402290zrr";
+      type = "gem";
+    };
+    version = "4.0.0";
+  };
+  webmock = {
+    dependencies = ["addressable" "crack" "hashdiff"];
+    groups = ["development" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "03994dxs4xayvkxqp01dd1ivhg4xxx7z35f7cxw7y2mwj3xn24ib";
+      type = "gem";
+    };
+    version = "3.4.2";
+  };
+}
\ No newline at end of file
diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch
index d8337ebb9ea..ef3604d8c0d 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch
+++ b/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch
@@ -60,12 +60,10 @@ diff --git a/go/internal/command/fallback/fallback.go b/go/internal/command/fall
 index 2cb76a8..f59ad5e 100644
 --- a/go/internal/command/fallback/fallback.go
 +++ b/go/internal/command/fallback/fallback.go
-@@ -21,7 +21,7 @@
- )
+@@ -53,5 +53,5 @@
+ func (c *Command) fallbackProgram() string {
+ 	fileName := fmt.Sprintf("%s-ruby", c.Executable.Name)
  
- func (c *Command) Execute() error {
--	rubyCmd := filepath.Join(c.RootDir, "bin", RubyProgram)
-+	rubyCmd := filepath.Join("/run/current-system/sw/bin", RubyProgram)
- 
- 	// Ensure rubyArgs[0] is the full path to gitlab-shell-ruby
- 	rubyArgs := append([]string{rubyCmd}, c.Args[1:]...)
+-	return filepath.Join(c.RootDir, "bin", fileName)
++	return filepath.Join("/run/current-system/sw/bin", fileName)
+ }
diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
index 12f354bc2fb..107eca7cd1d 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
@@ -1,21 +1,33 @@
-{ stdenv, fetchFromGitLab, git, go }:
+{ stdenv, fetchFromGitLab, git, buildGoPackage }:
 
-stdenv.mkDerivation rec {
+buildGoPackage rec {
   pname = "gitlab-workhorse";
 
-  version = "8.7.0";
+  version = "8.10.0";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-workhorse";
     rev = "v${version}";
-    sha256 = "1zlngc498hnzbxwdjn3ymr0xwrnfgnzzhn9lyf37yfbjl8x28n3z";
+    sha256 = "11cfhh48dga5ghfcijb68gbx0nfr5bs3vvp2j1gam9ac37fpvk0x";
   };
 
-  buildInputs = [ git go ];
+  goPackagePath = "gitlab.com/gitlab-org/gitlab-workhorse";
+  goDeps = ./deps.nix;
+  buildInputs = [ git ];
 
   makeFlags = [ "PREFIX=$(out)" "VERSION=${version}" "GOCACHE=$(TMPDIR)/go-cache" ];
 
+  # gitlab-workhorse depends on an older version of labkit which
+  # contains old, vendored versions of some packages; gitlab-workhorse
+  # also explicitly depends on newer versions of these libraries,
+  # but buildGoPackage exposes the vendored versions instead,
+  # leading to compilation errors. Since the vendored libraries
+  # aren't used here anyway, we'll just remove them.
+  postConfigure = ''
+    rm -r "$NIX_BUILD_TOP/go/src/gitlab.com/gitlab-org/labkit/vendor"
+  '';
+
   meta = with stdenv.lib; {
     homepage = http://www.gitlab.com/;
     platforms = platforms.unix;
diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/deps.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/deps.nix
new file mode 100644
index 00000000000..9db1c002f8f
--- /dev/null
+++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/deps.nix
@@ -0,0 +1,885 @@
+# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
+[
+  {
+    goPackagePath = "cloud.google.com/go";
+    fetch = {
+      type = "git";
+      url = "https://code.googlesource.com/gocloud";
+      rev = "v0.26.0";
+      sha256 = "149v3ci17g6wd2pm18mzcncq5qpl9hwdjnz3rlbn5rfidyn46la1";
+    };
+  }
+  {
+    goPackagePath = "github.com/BurntSushi/toml";
+    fetch = {
+      type = "git";
+      url = "https://github.com/BurntSushi/toml";
+      rev = "v0.3.1";
+      sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6";
+    };
+  }
+  {
+    goPackagePath = "github.com/FZambia/sentinel";
+    fetch = {
+      type = "git";
+      url = "https://github.com/FZambia/sentinel";
+      rev = "v1.0.0";
+      sha256 = "14cfngdy0n5rg7nrvxg1ydcjd18v0s8h33jx9wkln5ms0d59kfly";
+    };
+  }
+  {
+    goPackagePath = "github.com/alecthomas/template";
+    fetch = {
+      type = "git";
+      url = "https://github.com/alecthomas/template";
+      rev = "a0175ee3bccc";
+      sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj";
+    };
+  }
+  {
+    goPackagePath = "github.com/alecthomas/units";
+    fetch = {
+      type = "git";
+      url = "https://github.com/alecthomas/units";
+      rev = "2efee857e7cf";
+      sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl";
+    };
+  }
+  {
+    goPackagePath = "github.com/beorn7/perks";
+    fetch = {
+      type = "git";
+      url = "https://github.com/beorn7/perks";
+      rev = "v1.0.0";
+      sha256 = "1i1nz1f6g55xi2y3aiaz5kqfgvknarbfl4f0sx4nyyb4s7xb1z9x";
+    };
+  }
+  {
+    goPackagePath = "github.com/certifi/gocertifi";
+    fetch = {
+      type = "git";
+      url = "https://github.com/certifi/gocertifi";
+      rev = "ee1a9a0726d2";
+      sha256 = "08l6lqaw83pva6fa0aafmhmy1mhb145av21772zfh3ij809a37i4";
+    };
+  }
+  {
+    goPackagePath = "github.com/client9/misspell";
+    fetch = {
+      type = "git";
+      url = "https://github.com/client9/misspell";
+      rev = "v0.3.4";
+      sha256 = "1vwf33wsc4la25zk9nylpbp9px3svlmldkm0bha4hp56jws4q9cs";
+    };
+  }
+  {
+    goPackagePath = "github.com/client9/reopen";
+    fetch = {
+      type = "git";
+      url = "https://github.com/client9/reopen";
+      rev = "v1.0.0";
+      sha256 = "0f0dpdbmvk7w518c6zjhlmp65y55vvx47x4lq9pgzvcbsvjsf18s";
+    };
+  }
+  {
+    goPackagePath = "github.com/cloudflare/tableflip";
+    fetch = {
+      type = "git";
+      url = "https://github.com/cloudflare/tableflip";
+      rev = "8392f1641731";
+      sha256 = "0by5hk8s0bhhl3kiw658p5g53zvc61k4q2wxnh1w64p5ghd1rfn8";
+    };
+  }
+  {
+    goPackagePath = "github.com/codahale/hdrhistogram";
+    fetch = {
+      type = "git";
+      url = "https://github.com/codahale/hdrhistogram";
+      rev = "3a0bb77429bd";
+      sha256 = "1zampgfjbxy192cbwdi7g86l1idxaam96d834wncnpfdwgh5kl57";
+    };
+  }
+  {
+    goPackagePath = "github.com/davecgh/go-spew";
+    fetch = {
+      type = "git";
+      url = "https://github.com/davecgh/go-spew";
+      rev = "v1.1.1";
+      sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
+    };
+  }
+  {
+    goPackagePath = "github.com/dgrijalva/jwt-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/dgrijalva/jwt-go";
+      rev = "v3.2.0";
+      sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp";
+    };
+  }
+  {
+    goPackagePath = "github.com/fsnotify/fsnotify";
+    fetch = {
+      type = "git";
+      url = "https://github.com/fsnotify/fsnotify";
+      rev = "v1.4.7";
+      sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
+    };
+  }
+  {
+    goPackagePath = "github.com/getsentry/raven-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/getsentry/raven-go";
+      rev = "v0.1.2";
+      sha256 = "1dl80kar4lzdcfl3w6jssi1ld6bv0rmx6sp6bz6rzysfr9ilm02z";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-kit/kit";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-kit/kit";
+      rev = "v0.8.0";
+      sha256 = "1rcywbc2pvab06qyf8pc2rdfjv7r6kxdv2v4wnpqnjhz225wqvc0";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-logfmt/logfmt";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-logfmt/logfmt";
+      rev = "v0.3.0";
+      sha256 = "1gkgh3k5w1xwb2qbjq52p6azq3h1c1rr6pfwjlwj1zrijpzn2xb9";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-stack/stack";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-stack/stack";
+      rev = "v1.8.0";
+      sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v";
+    };
+  }
+  {
+    goPackagePath = "github.com/gogo/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gogo/protobuf";
+      rev = "v1.1.1";
+      sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2";
+    };
+  }
+  {
+    goPackagePath = "github.com/golang/gddo";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/gddo";
+      rev = "af0f2af80721";
+      sha256 = "0ja0xwgg31i2fyqn0b9sf1rjsqkw34kwrr0k0iczzn19mhhc3m7j";
+    };
+  }
+  {
+    goPackagePath = "github.com/golang/glog";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/glog";
+      rev = "23def4e6c14b";
+      sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30";
+    };
+  }
+  {
+    goPackagePath = "github.com/golang/lint";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/lint";
+      rev = "06c8688daad7";
+      sha256 = "0xi94dwvz50a66bq1hp9fyqkym5mcpdxdb1hrfvicldgjf37lc47";
+    };
+  }
+  {
+    goPackagePath = "github.com/golang/mock";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/mock";
+      rev = "v1.1.1";
+      sha256 = "0ap8wb6pdl6ccmdb43advjll2ly4sz26wsc3axw0hbrjrybybzgy";
+    };
+  }
+  {
+    goPackagePath = "github.com/golang/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/protobuf";
+      rev = "v1.3.1";
+      sha256 = "15am4s4646qy6iv0g3kkqq52rzykqjhm4bf08dk0fy2r58knpsyl";
+    };
+  }
+  {
+    goPackagePath = "github.com/gomodule/redigo";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gomodule/redigo";
+      rev = "v2.0.0";
+      sha256 = "1kg7s8027b4g1sfw0v3nh30c15j407kv684s53gg281r807dnfpk";
+    };
+  }
+  {
+    goPackagePath = "github.com/google/go-cmp";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/go-cmp";
+      rev = "v0.3.1";
+      sha256 = "1caw49i0plkjxir7kdf5qhwls3krqwfmi7g4h392rdfwi3kfahx1";
+    };
+  }
+  {
+    goPackagePath = "github.com/google/renameio";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/renameio";
+      rev = "v0.1.0";
+      sha256 = "1ki2x5a9nrj17sn092d6n4zr29lfg5ydv4xz5cp58z6cw8ip43jx";
+    };
+  }
+  {
+    goPackagePath = "github.com/google/uuid";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/uuid";
+      rev = "v1.1.1";
+      sha256 = "0hfxcf9frkb57k6q0rdkrmnfs78ms21r1qfk9fhlqga2yh5xg8zb";
+    };
+  }
+  {
+    goPackagePath = "github.com/gopherjs/gopherjs";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gopherjs/gopherjs";
+      rev = "0766667cb4d1";
+      sha256 = "13pfc9sxiwjky2lm1xb3i3lcisn8p6mgjk2d927l7r92ysph8dmw";
+    };
+  }
+  {
+    goPackagePath = "github.com/gorilla/websocket";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gorilla/websocket";
+      rev = "v1.4.0";
+      sha256 = "00i4vb31nsfkzzk7swvx3i75r2d960js3dri1875vypk3v2s0pzk";
+    };
+  }
+  {
+    goPackagePath = "github.com/grpc-ecosystem/go-grpc-middleware";
+    fetch = {
+      type = "git";
+      url = "https://github.com/grpc-ecosystem/go-grpc-middleware";
+      rev = "v1.0.0";
+      sha256 = "0lwgxih021xfhfb1xb9la5f98bpgpaiz63sbllx77qwwl2rmhrsp";
+    };
+  }
+  {
+    goPackagePath = "github.com/grpc-ecosystem/go-grpc-prometheus";
+    fetch = {
+      type = "git";
+      url = "https://github.com/grpc-ecosystem/go-grpc-prometheus";
+      rev = "v1.2.0";
+      sha256 = "1lzk54h7np32b3acidg1ggbn8ppbnns0m71gcg9d1qkkdh8zrijl";
+    };
+  }
+  {
+    goPackagePath = "github.com/hpcloud/tail";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hpcloud/tail";
+      rev = "v1.0.0";
+      sha256 = "1njpzc0pi1acg5zx9y6vj9xi6ksbsc5d387rd6904hy6rh2m6kn0";
+    };
+  }
+  {
+    goPackagePath = "github.com/jfbus/httprs";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jfbus/httprs";
+      rev = "b0af8319bb15";
+      sha256 = "05cg9a27i9g92n3bivqrrqznccl5lfadlk97sp9izmd368dl5qvc";
+    };
+  }
+  {
+    goPackagePath = "github.com/jpillora/backoff";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jpillora/backoff";
+      rev = "8eab2debe79d";
+      sha256 = "1m5z0703094vhbbmp6s7n6kk7ci5s1pfjq466mz14zp8d1w0yn3x";
+    };
+  }
+  {
+    goPackagePath = "github.com/json-iterator/go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/json-iterator/go";
+      rev = "v1.1.6";
+      sha256 = "08caswxvdn7nvaqyj5kyny6ghpygandlbw9vxdj7l5vkp7q0s43r";
+    };
+  }
+  {
+    goPackagePath = "github.com/jtolds/gls";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jtolds/gls";
+      rev = "v4.20.0";
+      sha256 = "1k7xd2q2ysv2xsh373qs801v6f359240kx0vrl0ydh7731lngvk6";
+    };
+  }
+  {
+    goPackagePath = "github.com/julienschmidt/httprouter";
+    fetch = {
+      type = "git";
+      url = "https://github.com/julienschmidt/httprouter";
+      rev = "v1.2.0";
+      sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666";
+    };
+  }
+  {
+    goPackagePath = "github.com/kelseyhightower/envconfig";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kelseyhightower/envconfig";
+      rev = "v1.3.0";
+      sha256 = "1zcq480ig7wbg4378qcfxznp2gzqmk7x6rbxizflvg9v2f376vrw";
+    };
+  }
+  {
+    goPackagePath = "github.com/kisielk/gotool";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kisielk/gotool";
+      rev = "v1.0.0";
+      sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn";
+    };
+  }
+  {
+    goPackagePath = "github.com/konsorten/go-windows-terminal-sequences";
+    fetch = {
+      type = "git";
+      url = "https://github.com/konsorten/go-windows-terminal-sequences";
+      rev = "v1.0.2";
+      sha256 = "09mn209ika7ciy87xf2x31dq5fnqw39jidgaljvmqxwk7ff1hnx7";
+    };
+  }
+  {
+    goPackagePath = "github.com/kr/logfmt";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kr/logfmt";
+      rev = "b84e30acd515";
+      sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9";
+    };
+  }
+  {
+    goPackagePath = "github.com/kr/pretty";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kr/pretty";
+      rev = "v0.1.0";
+      sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp";
+    };
+  }
+  {
+    goPackagePath = "github.com/kr/pty";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kr/pty";
+      rev = "v1.1.1";
+      sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6";
+    };
+  }
+  {
+    goPackagePath = "github.com/kr/text";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kr/text";
+      rev = "v0.1.0";
+      sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1";
+    };
+  }
+  {
+    goPackagePath = "github.com/libgit2/git2go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/libgit2/git2go";
+      rev = "ecaeb7a21d47";
+      sha256 = "14r7ryff93r49g94f6kg66xc0y6rwb31lj22s3qmzmlgywk0pgvr";
+    };
+  }
+  {
+    goPackagePath = "github.com/lightstep/lightstep-tracer-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/lightstep/lightstep-tracer-go";
+      rev = "v0.15.6";
+      sha256 = "10n5r66g44s6rnz5kf86s4a3p1g55kc1kxqhnk7bx7mlayndgpmb";
+    };
+  }
+  {
+    goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
+    fetch = {
+      type = "git";
+      url = "https://github.com/matttproud/golang_protobuf_extensions";
+      rev = "v1.0.1";
+      sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya";
+    };
+  }
+  {
+    goPackagePath = "github.com/mitchellh/copystructure";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mitchellh/copystructure";
+      rev = "v1.0.0";
+      sha256 = "05njg92w1088v4yl0js0zdrpfq6k37i9j14mxkr3p90p5yd9rrrr";
+    };
+  }
+  {
+    goPackagePath = "github.com/mitchellh/reflectwalk";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mitchellh/reflectwalk";
+      rev = "v1.0.0";
+      sha256 = "0wzkp0fdx22n8f7y9y37dgmnlrlfsv9zjdb48cbx7rsqsbnny7l0";
+    };
+  }
+  {
+    goPackagePath = "github.com/modern-go/concurrent";
+    fetch = {
+      type = "git";
+      url = "https://github.com/modern-go/concurrent";
+      rev = "bacd9c7ef1dd";
+      sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs";
+    };
+  }
+  {
+    goPackagePath = "github.com/modern-go/reflect2";
+    fetch = {
+      type = "git";
+      url = "https://github.com/modern-go/reflect2";
+      rev = "v1.0.1";
+      sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf";
+    };
+  }
+  {
+    goPackagePath = "github.com/mwitkow/go-conntrack";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mwitkow/go-conntrack";
+      rev = "cc309e4a2223";
+      sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf";
+    };
+  }
+  {
+    goPackagePath = "github.com/onsi/ginkgo";
+    fetch = {
+      type = "git";
+      url = "https://github.com/onsi/ginkgo";
+      rev = "v1.7.0";
+      sha256 = "14wgpdrvpc35rdz3859bz53sc1g4vpr1fysy15wy3ff9gmqs14yg";
+    };
+  }
+  {
+    goPackagePath = "github.com/onsi/gomega";
+    fetch = {
+      type = "git";
+      url = "https://github.com/onsi/gomega";
+      rev = "v1.4.3";
+      sha256 = "1c8rqg5i2hz3snmq7s41yar1zjnzilb0fyiyhkg83v97afcfx79v";
+    };
+  }
+  {
+    goPackagePath = "github.com/opentracing/opentracing-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/opentracing/opentracing-go";
+      rev = "v1.0.2";
+      sha256 = "0i0ghg94dg8lk05mw5n23983wq04yjvkjmdkc9z5y1f3508938h9";
+    };
+  }
+  {
+    goPackagePath = "github.com/philhofer/fwd";
+    fetch = {
+      type = "git";
+      url = "https://github.com/philhofer/fwd";
+      rev = "v1.0.0";
+      sha256 = "1pg84khadh79v42y8sjsdgfb54vw2kzv7hpapxkifgj0yvcp30g2";
+    };
+  }
+  {
+    goPackagePath = "github.com/pkg/errors";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pkg/errors";
+      rev = "v0.8.0";
+      sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
+    };
+  }
+  {
+    goPackagePath = "github.com/pmezard/go-difflib";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pmezard/go-difflib";
+      rev = "v1.0.0";
+      sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/client_golang";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/client_golang";
+      rev = "v1.0.0";
+      sha256 = "1f03ndyi3jq7zdxinnvzimz3s4z2374r6dikkc8i42xzb6d1bli6";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/client_model";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/client_model";
+      rev = "fd36f4220a90";
+      sha256 = "1bs5d72k361llflgl94c22n0w53j30rsfh84smgk8mbjbcmjsaa5";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/common";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/common";
+      rev = "v0.4.1";
+      sha256 = "0sf4sjdckblz1hqdfvripk3zyp8xq89w7q75kbsyg4c078af896s";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/procfs";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/procfs";
+      rev = "v0.0.2";
+      sha256 = "0s7pvs7fgnfpmym3cd0k219av321h9sf3yvdlnn3qy0ps280lg7k";
+    };
+  }
+  {
+    goPackagePath = "github.com/rafaeljusto/redigomock";
+    fetch = {
+      type = "git";
+      url = "https://github.com/rafaeljusto/redigomock";
+      rev = "257e089e14a1";
+      sha256 = "1k572vsda7q5l42s1kn5bjkfb30jshsbc96dz4cnghg43qylyd6h";
+    };
+  }
+  {
+    goPackagePath = "github.com/rogpeppe/go-internal";
+    fetch = {
+      type = "git";
+      url = "https://github.com/rogpeppe/go-internal";
+      rev = "v1.3.0";
+      sha256 = "0mcdh1licgnnahwml9y2iq6xy5x9xmjw5frcnds2s3wpjyqrl216";
+    };
+  }
+  {
+    goPackagePath = "github.com/sebest/xff";
+    fetch = {
+      type = "git";
+      url = "https://github.com/sebest/xff";
+      rev = "6c115e0ffa35";
+      sha256 = "0l11d8mc870vxzgi74cc9dqr7kgxjmbfkfi53gc30rsyx877jx4h";
+    };
+  }
+  {
+    goPackagePath = "github.com/sirupsen/logrus";
+    fetch = {
+      type = "git";
+      url = "https://github.com/sirupsen/logrus";
+      rev = "v1.3.0";
+      sha256 = "0ib7k8cwxn53dyxd3af1g81z018n77n6q64pm4miznirf7c2c9gk";
+    };
+  }
+  {
+    goPackagePath = "github.com/smartystreets/assertions";
+    fetch = {
+      type = "git";
+      url = "https://github.com/smartystreets/assertions";
+      rev = "b2de0cb4f26d";
+      sha256 = "1i7ldgavgl35c7gk25p7bvdr282ckng090zr4ch9mk1705akx09y";
+    };
+  }
+  {
+    goPackagePath = "github.com/smartystreets/goconvey";
+    fetch = {
+      type = "git";
+      url = "https://github.com/smartystreets/goconvey";
+      rev = "505e41936337";
+      sha256 = "07zjxwszayal88z1j2bwnqrsa32vg8l4nivks5yfr9j8xfsw7n6m";
+    };
+  }
+  {
+    goPackagePath = "github.com/stretchr/objx";
+    fetch = {
+      type = "git";
+      url = "https://github.com/stretchr/objx";
+      rev = "v0.1.1";
+      sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls";
+    };
+  }
+  {
+    goPackagePath = "github.com/stretchr/testify";
+    fetch = {
+      type = "git";
+      url = "https://github.com/stretchr/testify";
+      rev = "v1.3.0";
+      sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy";
+    };
+  }
+  {
+    goPackagePath = "github.com/tinylib/msgp";
+    fetch = {
+      type = "git";
+      url = "https://github.com/tinylib/msgp";
+      rev = "v1.1.0";
+      sha256 = "08ha23sn14071ywrgxlyj7r523vzdwx1i83dcp1mqa830glgqaff";
+    };
+  }
+  {
+    goPackagePath = "github.com/uber-go/atomic";
+    fetch = {
+      type = "git";
+      url = "https://github.com/uber-go/atomic";
+      rev = "v1.3.2";
+      sha256 = "11pzvjys5ddjjgrv94pgk9pnip9yyb54z7idf33zk7p7xylpnsv6";
+    };
+  }
+  {
+    goPackagePath = "github.com/uber/jaeger-client-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/uber/jaeger-client-go";
+      rev = "v2.15.0";
+      sha256 = "0ki23m9zrf3vxp839fnp9ckr4m28y6mpad8g5s5lr5k8jkl0sfwj";
+    };
+  }
+  {
+    goPackagePath = "github.com/uber/jaeger-lib";
+    fetch = {
+      type = "git";
+      url = "https://github.com/uber/jaeger-lib";
+      rev = "v1.5.0";
+      sha256 = "113fwpn80ylx970w8h7nfqnhh18dpx1jadbk7rbr8k68q4di4y0q";
+    };
+  }
+  {
+    goPackagePath = "gitlab.com/gitlab-org/gitaly";
+    fetch = {
+      type = "git";
+      url = "https://gitlab.com/gitlab-org/gitaly.git";
+      rev = "v1.57.0";
+      sha256 = "0mgawp5afcv9s4y8fq3mc4dn6hhdg1shbns8vmjwklh9bia988cy";
+    };
+  }
+  {
+    goPackagePath = "gitlab.com/gitlab-org/labkit";
+    fetch = {
+      type = "git";
+      url = "https://gitlab.com/gitlab-org/labkit.git";
+      rev = "905271af7abb";
+      sha256 = "144w5dikd82wz53drml9khlx39pmp6kgqccc5c0xfzpijbj7krbd";
+    };
+  }
+  {
+    goPackagePath = "go.uber.org/atomic";
+    fetch = {
+      type = "git";
+      url = "https://github.com/uber-go/atomic";
+      rev = "v1.3.2";
+      sha256 = "11pzvjys5ddjjgrv94pgk9pnip9yyb54z7idf33zk7p7xylpnsv6";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/crypto";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/crypto";
+      rev = "20be4c3c3ed5";
+      sha256 = "1ph7y8v30hc95h1dwr7vrhg1nzs47a261qin6zg8mhf12g5k2lxb";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/lint";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/lint";
+      rev = "06c8688daad7";
+      sha256 = "0xi94dwvz50a66bq1hp9fyqkym5mcpdxdb1hrfvicldgjf37lc47";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/mod";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/mod";
+      rev = "4bf6d317e70e";
+      sha256 = "19lg1ly3j31anx92p0hynic1gjk417wwxphfdrb2cq1c19kj3r17";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/net";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/net";
+      rev = "d28f0bde5980";
+      sha256 = "18xj31h70m7xxb7gc86n9i21w6d7djbjz67zfaljm4jqskz6hxkf";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/oauth2";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/oauth2";
+      rev = "d2e6202438be";
+      sha256 = "0wbn75fd10485nb93bm4kqldqifdim5xqy4v7r5sdvimvf3fyhn7";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/sync";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sync";
+      rev = "112230192c58";
+      sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev = "953cdadca894";
+      sha256 = "0gkha4whk8xkcv3isigbs250akag99isxnd3v9xmy0kl3g88hxy1";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/text";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/text";
+      rev = "v0.3.0";
+      sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/tools";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/tools";
+      rev = "6e04913cbbac";
+      sha256 = "1314j8r4cp69a12nqdaljd06r6hmh3b1v4xyrz8prw6gx5jg7h3q";
+    };
+  }
+  {
+    goPackagePath = "google.golang.org/appengine";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/appengine";
+      rev = "v1.1.0";
+      sha256 = "1pz202zszg8f35dk5pfhwgcdi3r6dx1l4yk6x6ly7nb4j45zi96x";
+    };
+  }
+  {
+    goPackagePath = "google.golang.org/genproto";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/go-genproto";
+      rev = "bd91e49a0898";
+      sha256 = "1f5q04h03q6fksbfkhz13ai5849rkkb8xrmmi7cxs4lzsi6ixkg8";
+    };
+  }
+  {
+    goPackagePath = "google.golang.org/grpc";
+    fetch = {
+      type = "git";
+      url = "https://github.com/grpc/grpc-go";
+      rev = "v1.16.0";
+      sha256 = "0a9xl6c5j7lvsb4q6ry5p892rjm86p47d4f8xrf0r8lxblf79qbg";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/DataDog/dd-trace-go.v1";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/DataDog/dd-trace-go.v1";
+      rev = "v1.7.0";
+      sha256 = "0j45skiiayfsaw8id4g20k51zfr0raj47a03q2icka5xrh3qj6yq";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/alecthomas/kingpin.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/alecthomas/kingpin.v2";
+      rev = "v2.2.6";
+      sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/check.v1";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/check.v1";
+      rev = "788fd7840127";
+      sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/errgo.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/errgo.v2";
+      rev = "v2.1.0";
+      sha256 = "065mbihiy7q67wnql0bzl9y1kkvck5ivra68254zbih52jxwrgr2";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/fsnotify.v1";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/fsnotify.v1";
+      rev = "v1.4.7";
+      sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/tomb.v1";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/tomb.v1";
+      rev = "dd632973f1e7";
+      sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/yaml.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/yaml.v2";
+      rev = "v2.2.2";
+      sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa";
+    };
+  }
+  {
+    goPackagePath = "honnef.co/go/tools";
+    fetch = {
+      type = "git";
+      url = "https://github.com/dominikh/go-tools";
+      rev = "v0.0.1-2019.2.2";
+      sha256 = "1vndpwg797z2gw9h9378iq99aqy7nalqx82lgvcsaqnkypdmppnd";
+    };
+  }
+]
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile
index 8bffc2a973d..864e514ae0d 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile
+++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile
@@ -2,6 +2,8 @@ source 'https://rubygems.org'
 
 gem 'rails', '5.2.3'
 
+gem 'bootsnap', '~> 1.4'
+
 # Improves copy-on-write performance for MRI
 gem 'nakayoshi_fork', '~> 0.0.4'
 
@@ -14,8 +16,7 @@ gem 'sprockets', '~> 3.7.0'
 gem 'default_value_for', '~> 3.2.0'
 
 # Supported DBs
-gem 'mysql2', '~> 0.4.10', group: :mysql
-gem 'pg', '~> 1.1', group: :postgres
+gem 'pg', '~> 1.1'
 
 gem 'rugged', '~> 0.28'
 gem 'grape-path-helpers', '~> 1.1'
@@ -47,9 +48,13 @@ gem 'omniauth-salesforce', '~> 1.0.5'
 gem 'rack-oauth2', '~> 1.9.3'
 gem 'jwt', '~> 2.1.0'
 
+# Kerberos authentication. EE-only
+gem 'gssapi', group: :kerberos
+
 # Spam and anti-bot protection
 gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails'
 gem 'akismet', '~> 2.0'
+gem 'invisible_captcha', '~> 0.12.1'
 
 # Two-factor authentication
 gem 'devise-two-factor', '~> 3.0.0'
@@ -81,7 +86,10 @@ gem 'grape-entity', '~> 0.7.1'
 gem 'rack-cors', '~> 1.0.0', require: 'rack/cors'
 
 # GraphQL API
-gem 'graphql', '~> 1.8.0'
+gem 'graphql', '~> 1.9.11'
+# NOTE: graphiql-rails v1.5+ doesn't work: https://gitlab.com/gitlab-org/gitlab-ce/issues/67293
+# TODO: remove app/views/graphiql/rails/editors/show.html.erb when https://github.com/rmosolgo/graphiql-rails/pull/71 is released:
+# https://gitlab.com/gitlab-org/gitlab-ce/issues/67263
 gem 'graphiql-rails', '~> 1.4.10'
 gem 'apollo_upload_server', '~> 2.0.0.beta3'
 gem 'graphql-docs', '~> 1.6.0', group: [:development, :test]
@@ -104,7 +112,7 @@ gem 'fog-aws', '~> 3.5'
 # Locked until fog-google resolves https://github.com/fog/fog-google/issues/421.
 # Also see config/initializers/fog_core_patch.rb.
 gem 'fog-core', '= 2.1.0'
-gem 'fog-google', '~> 1.8'
+gem 'fog-google', '~> 1.9'
 gem 'fog-local', '~> 0.6'
 gem 'fog-openstack', '~> 1.0'
 gem 'fog-rackspace', '~> 0.1.1'
@@ -119,6 +127,13 @@ gem 'unf', '~> 0.1.4'
 # Seed data
 gem 'seed-fu', '~> 2.3.7'
 
+# Search
+gem 'elasticsearch-model', '~> 0.1.9'
+gem 'elasticsearch-rails', '~> 0.1.9', require: 'elasticsearch/rails/instrumentation'
+gem 'elasticsearch-api',   '5.0.3'
+gem 'aws-sdk'
+gem 'faraday_middleware-aws-signers-v4'
+
 # Markdown and HTML processing
 gem 'html-pipeline', '~> 2.8'
 gem 'deckar01-task_list', '2.2.0'
@@ -133,10 +148,10 @@ gem 'wikicloth', '0.8.1'
 gem 'asciidoctor', '~> 2.0.10'
 gem 'asciidoctor-include-ext', '~> 0.3.1', require: false
 gem 'asciidoctor-plantuml', '0.0.9'
-gem 'rouge', '~> 3.5'
+gem 'rouge', '~> 3.7'
 gem 'truncato', '~> 0.7.11'
 gem 'bootstrap_form', '~> 4.2.0'
-gem 'nokogiri', '~> 1.10.3'
+gem 'nokogiri', '~> 1.10.4'
 gem 'escape_utils', '~> 1.1'
 
 # Calendar rendering
@@ -169,7 +184,7 @@ gem 'acts-as-taggable-on', '~> 6.0'
 gem 'sidekiq', '~> 5.2.7'
 gem 'sidekiq-cron', '~> 1.0'
 gem 'redis-namespace', '~> 1.6.0'
-gem 'gitlab-sidekiq-fetcher', '~> 0.4.0', require: 'sidekiq-reliable-fetch'
+gem 'gitlab-sidekiq-fetcher', '0.5.2', require: 'sidekiq-reliable-fetch'
 
 # Cron Parser
 gem 'fugit', '~> 1.2.1'
@@ -199,13 +214,13 @@ gem 'js_regex', '~> 3.1'
 # User agent parsing
 gem 'device_detector'
 
-# Cache
-gem 'redis-rails', '~> 5.0.2'
-
 # Redis
-gem 'redis', '~> 3.2'
+gem 'redis', '~> 4.0'
 gem 'connection_pool', '~> 2.0'
 
+# Redis session store
+gem 'redis-rails', '~> 5.0.2'
+
 # Discord integration
 gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false
 
@@ -213,7 +228,8 @@ gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false
 gem 'hipchat', '~> 1.5.0'
 
 # Jira integration
-gem 'jira-ruby', '~> 1.4'
+gem 'jira-ruby', '~> 1.7'
+gem 'atlassian-jwt', '~> 0.2.0'
 
 # Flowdock integration
 gem 'flowdock', '~> 0.7'
@@ -231,7 +247,7 @@ gem 'asana', '~> 0.8.1'
 gem 'ruby-fogbugz', '~> 0.2.1'
 
 # Kubernetes integration
-gem 'kubeclient', '~> 4.2.2'
+gem 'kubeclient', '~> 4.4.0'
 
 # Sanitize user input
 gem 'sanitize', '~> 4.6'
@@ -260,7 +276,7 @@ gem 'fast_blank'
 
 # Parse time & duration
 gem 'chronic', '~> 0.10.2'
-gem 'chronic_duration', '~> 0.10.6'
+gem 'gitlab_chronic_duration', '~> 0.10.6.1'
 
 gem 'webpack-rails', '~> 0.9.10'
 gem 'rack-proxy', '~> 0.6.0'
@@ -273,16 +289,17 @@ gem 'font-awesome-rails', '~> 4.7'
 gem 'gemojione', '~> 3.3'
 gem 'gon', '~> 6.2'
 gem 'request_store', '~> 1.3'
-gem 'virtus', '~> 1.0.1'
 gem 'base32', '~> 0.3.0'
 
+gem "gitlab-license", "~> 1.0"
+
 # Sentry integration
 gem 'sentry-raven', '~> 2.9'
 
 gem 'premailer-rails', '~> 1.9.7'
 
 # LabKit: Tracing and Correlation
-gem 'gitlab-labkit', '~> 0.3.0'
+gem 'gitlab-labkit', '~> 0.5'
 
 # I18n
 gem 'ruby_parser', '~> 3.8', require: false
@@ -294,12 +311,11 @@ gem 'gettext', '~> 3.2.2', require: false, group: :development
 gem 'batch-loader', '~> 1.4.0'
 
 # Perf bar
-gem 'peek', '~> 1.0.1'
-gem 'peek-gc', '~> 0.0.2'
-gem 'peek-mysql2', '~> 1.2.0', group: :mysql
-gem 'peek-pg', '~> 1.3.0', group: :postgres
-gem 'peek-rblineprof', '~> 0.2.0'
-gem 'peek-redis', '~> 1.2.0'
+# https://gitlab.com/gitlab-org/gitlab-ee/issues/13996
+gem 'gitlab-peek', '~> 0.0.1', require: 'peek'
+
+# Snowplow events tracking
+gem 'snowplow-tracker', '~> 0.6.1'
 
 # Memory benchmarks
 gem 'derailed_benchmarks', require: false
@@ -310,13 +326,14 @@ group :metrics do
   gem 'influxdb', '~> 0.2', require: false
 
   # Prometheus
-  gem 'prometheus-client-mmap', '~> 0.9.8'
+  gem 'prometheus-client-mmap', '~> 0.9.10'
   gem 'raindrops', '~> 0.18'
 end
 
 group :development do
   gem 'foreman', '~> 0.84.0'
   gem 'brakeman', '~> 4.2', require: false
+  gem 'danger', '~> 6.0', require: false
 
   gem 'letter_opener_web', '~> 1.3.4'
   gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
@@ -330,7 +347,6 @@ group :development do
 end
 
 group :development, :test do
-  gem 'bootsnap', '~> 1.4'
   gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET']
   gem 'pry-byebug', '~> 3.5.1', platform: :mri
   gem 'pry-rails', '~> 0.3.4'
@@ -369,15 +385,12 @@ group :development, :test do
   gem 'haml_lint', '~> 0.31.0', require: false
   gem 'simplecov', '~> 0.16.1', require: false
   gem 'bundler-audit', '~> 0.5.0', require: false
-  gem 'mdl', '~> 0.5.0', require: false
 
   gem 'benchmark-ips', '~> 2.3.0', require: false
 
   gem 'license_finder', '~> 5.4', require: false
   gem 'knapsack', '~> 1.17'
 
-  gem 'activerecord_sane_schema_dumper', '1.0'
-
   gem 'stackprof', '~> 0.2.10', require: false
 
   gem 'simple_po_parser', '~> 1.1.2', require: false
@@ -391,7 +404,6 @@ group :test do
   gem 'json-schema', '~> 2.8.0'
   gem 'webmock', '~> 3.5.1'
   gem 'rails-controller-testing'
-  gem 'sham_rack', '~> 1.3.6'
   gem 'concurrent-ruby', '~> 1.1'
   gem 'test-prof', '~> 0.2.5'
   gem 'rspec_junit_formatter'
@@ -404,7 +416,7 @@ gem 'mail_room', '~> 0.9.1'
 gem 'email_reply_trimmer', '~> 0.1'
 gem 'html2text'
 
-gem 'ruby-prof', '~> 0.17.0'
+gem 'ruby-prof', '~> 1.0.0'
 gem 'rbtrace', '~> 0.4', require: false
 gem 'memory_profiler', '~> 0.9', require: false
 gem 'benchmark-memory', '~> 0.1', require: false
@@ -420,6 +432,9 @@ gem 'health_check', '~> 2.6.0'
 gem 'vmstat', '~> 2.3.0'
 gem 'sys-filesystem', '~> 1.1.6'
 
+# NTP client
+gem 'net-ntp'
+
 # SSH host key support
 gem 'net-ssh', '~> 5.2'
 gem 'sshkey', '~> 2.0'
@@ -430,8 +445,8 @@ group :ed25519 do
   gem 'bcrypt_pbkdf', '~> 1.0'
 end
 
-# Gitaly GRPC client
-gem 'gitaly-proto', '~> 1.37.0', require: 'gitaly'
+# Gitaly GRPC protocol definitions
+gem 'gitaly', '~> 1.58.0'
 
 gem 'grpc', '~> 1.19.0'
 
@@ -443,7 +458,14 @@ gem 'toml-rb', '~> 1.0.0', require: false
 gem 'flipper', '~> 0.13.0'
 gem 'flipper-active_record', '~> 0.13.0'
 gem 'flipper-active_support_cache_store', '~> 0.13.0'
+gem 'unleash', '~> 0.1.5'
 
 # Structured logging
 gem 'lograge', '~> 0.5'
 gem 'grape_logging', '~> 1.7'
+
+# DNS Lookup
+gem 'net-dns', '~> 0.9.0'
+
+# Countries list
+gem 'countries', '~> 3.0'
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock
index 60939ae918c..fec34622be3 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock
@@ -41,8 +41,6 @@ GEM
     activerecord-explain-analyze (0.1.0)
       activerecord (>= 4)
       pg
-    activerecord_sane_schema_dumper (1.0)
-      rails (>= 5, < 6)
     activestorage (5.2.3)
       actionpack (= 5.2.3)
       activerecord (= 5.2.3)
@@ -76,11 +74,20 @@ GEM
     asciidoctor-plantuml (0.0.9)
       asciidoctor (>= 1.5.6, < 3.0.0)
     ast (2.4.0)
-    atomic (1.1.99)
+    atlassian-jwt (0.2.0)
+      jwt (~> 2.1.0)
     attr_encrypted (3.1.0)
       encryptor (~> 3.0.0)
     attr_required (1.0.1)
     awesome_print (1.8.0)
+    aws-sdk (2.9.32)
+      aws-sdk-resources (= 2.9.32)
+    aws-sdk-core (2.9.32)
+      aws-sigv4 (~> 1.0)
+      jmespath (~> 1.0)
+    aws-sdk-resources (2.9.32)
+      aws-sdk-core (= 2.9.32)
+    aws-sigv4 (1.0.0)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
@@ -101,7 +108,7 @@ GEM
     binding_ninja (0.2.3)
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
-    bootsnap (1.4.1)
+    bootsnap (1.4.4)
       msgpack (~> 1.0)
     bootstrap_form (4.2.0)
       actionpack (>= 5.0)
@@ -137,22 +144,31 @@ GEM
     childprocess (0.9.0)
       ffi (~> 1.0, >= 1.0.11)
     chronic (0.10.2)
-    chronic_duration (0.10.6)
-      numerizer (~> 0.1.1)
     chunky_png (1.3.5)
     citrus (3.0.2)
+    claide (1.0.3)
+    claide-plugins (0.9.2)
+      cork
+      nap
+      open4 (~> 1.3)
     coderay (1.1.2)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
+    colored2 (3.1.2)
     commonmarker (0.17.13)
       ruby-enum (~> 0.5)
     concord (0.1.5)
       adamantium (~> 0.2.0)
       equalizer (~> 0.0.9)
     concurrent-ruby (1.1.5)
-    concurrent-ruby-ext (1.1.5)
-      concurrent-ruby (= 1.1.5)
     connection_pool (2.2.2)
+    contracts (0.11.0)
+    cork (0.3.0)
+      colored2 (~> 3.1)
+    countries (3.0.0)
+      i18n_data (~> 0.8.0)
+      sixarm_ruby_unaccent (~> 1.1)
+      unicode_utils (~> 1.4)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     crass (1.0.4)
@@ -160,6 +176,19 @@ GEM
     css_parser (1.5.0)
       addressable
     daemons (1.2.6)
+    danger (6.0.9)
+      claide (~> 1.0)
+      claide-plugins (>= 0.9.2)
+      colored2 (~> 3.1)
+      cork (~> 0.1)
+      faraday (~> 0.9)
+      faraday-http-cache (~> 2.0)
+      git (~> 1.5)
+      kramdown (~> 2.0)
+      kramdown-parser-gfm (~> 1.0)
+      no_proxy_fix
+      octokit (~> 4.7)
+      terminal-table (~> 1)
     database_cleaner (1.7.0)
     debug_inspector (0.0.3)
     debugger-ruby_core_source (1.3.8)
@@ -205,6 +234,19 @@ GEM
       doorkeeper (~> 4.3)
       json-jwt (~> 1.6)
     ed25519 (1.2.4)
+    elasticsearch (5.0.3)
+      elasticsearch-api (= 5.0.3)
+      elasticsearch-transport (= 5.0.3)
+    elasticsearch-api (5.0.3)
+      multi_json
+    elasticsearch-model (0.1.9)
+      activesupport (> 3)
+      elasticsearch (> 0.4)
+      hashie
+    elasticsearch-rails (0.1.9)
+    elasticsearch-transport (5.0.3)
+      faraday
+      multi_json
     email_reply_trimmer (0.1.6)
     email_spec (2.2.0)
       htmlentities (~> 4.3.3)
@@ -229,15 +271,20 @@ GEM
       railties (>= 3.0.0)
     faraday (0.12.2)
       multipart-post (>= 1.2, < 3)
+    faraday-http-cache (2.0.0)
+      faraday (~> 0.8)
     faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
+    faraday_middleware-aws-signers-v4 (0.1.7)
+      aws-sdk-resources (~> 2)
+      faraday (~> 0.9)
     faraday_middleware-multi_json (0.0.6)
       faraday_middleware
       multi_json
     fast_blank (1.0.0)
     fast_gettext (1.6.0)
     ffaker (2.10.0)
-    ffi (1.10.0)
+    ffi (1.11.1)
     flipper (0.13.0)
     flipper-active_record (0.13.0)
       activerecord (>= 3.2, < 6)
@@ -263,7 +310,7 @@ GEM
       excon (~> 0.58)
       formatador (~> 0.2)
       mime-types
-    fog-google (1.8.2)
+    fog-google (1.9.1)
       fog-core (<= 2.1.0)
       fog-json (~> 1.2)
       fog-xml (~> 0.1.0)
@@ -310,23 +357,30 @@ GEM
       gettext_i18n_rails (>= 0.7.1)
       po_to_json (>= 1.0.0)
       rails (>= 3.2.0)
-    gitaly-proto (1.37.0)
+    git (1.5.0)
+    gitaly (1.58.0)
       grpc (~> 1.0)
     github-markup (1.7.0)
-    gitlab-labkit (0.3.0)
+    gitlab-labkit (0.5.2)
       actionpack (~> 5)
       activesupport (~> 5)
-      grpc (~> 1.19.0)
+      grpc (~> 1.19)
       jaeger-client (~> 0.10)
       opentracing (~> 0.4)
+      redis (> 3.0.0, < 5.0.0)
+    gitlab-license (1.0.0)
     gitlab-markup (1.7.0)
-    gitlab-sidekiq-fetcher (0.4.0)
+    gitlab-peek (0.0.1)
+      railties (>= 4.0.0)
+    gitlab-sidekiq-fetcher (0.5.2)
       sidekiq (~> 5)
-    gitlab-styles (2.7.0)
+    gitlab-styles (2.8.0)
       rubocop (~> 0.69.0)
       rubocop-gitlab-security (~> 0.1.0)
       rubocop-performance (~> 1.1.0)
       rubocop-rspec (~> 1.19)
+    gitlab_chronic_duration (0.10.6.1)
+      numerizer (~> 0.1.1)
     gitlab_omniauth-ldap (2.1.1)
       net-ldap (~> 0.16)
       omniauth (~> 1.3)
@@ -376,7 +430,7 @@ GEM
     graphiql-rails (1.4.10)
       railties
       sprockets-rails
-    graphql (1.8.1)
+    graphql (1.9.11)
     graphql-docs (1.6.0)
       commonmarker (~> 0.16)
       escape_utils (~> 1.2)
@@ -388,6 +442,8 @@ GEM
     grpc (1.19.0)
       google-protobuf (~> 3.1)
       googleapis-common-protos-types (~> 1.0.0)
+    gssapi (1.2.0)
+      ffi (>= 1.0.1)
     haml (5.0.4)
       temple (>= 0.8.0)
       tilt
@@ -433,20 +489,25 @@ GEM
     httpclient (2.8.3)
     i18n (1.6.0)
       concurrent-ruby (~> 1.0)
+    i18n_data (0.8.0)
     icalendar (2.4.1)
     ice_nine (0.11.2)
     influxdb (0.2.3)
       cause
       json
+    invisible_captcha (0.12.1)
+      rails (>= 3.2.0)
     ipaddress (0.8.3)
     jaeger-client (0.10.0)
       opentracing (~> 0.3)
       thrift
-    jaro_winkler (1.5.2)
-    jira-ruby (1.4.1)
+    jaro_winkler (1.5.3)
+    jira-ruby (1.7.1)
       activesupport
+      atlassian-jwt
       multipart-post
       oauth (~> 0.5, >= 0.5.0)
+    jmespath (1.3.1)
     js_regex (3.1.1)
       character_set (~> 1.1)
       regexp_parser (~> 1.1)
@@ -474,8 +535,10 @@ GEM
     kgio (2.11.2)
     knapsack (1.17.0)
       rake
-    kramdown (1.17.0)
-    kubeclient (4.2.2)
+    kramdown (2.1.0)
+    kramdown-parser-gfm (1.1.0)
+      kramdown (~> 2.0)
+    kubeclient (4.4.0)
       http (~> 3.0)
       recursive-open-struct (~> 1.0, >= 1.0.4)
       rest-client (~> 2.0)
@@ -510,10 +573,6 @@ GEM
     mail_room (0.9.1)
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
-    mdl (0.5.0)
-      kramdown (~> 1.12, >= 1.12.0)
-      mixlib-cli (~> 1.7, >= 1.7.0)
-      mixlib-config (~> 2.2, >= 2.2.1)
     memoist (0.16.0)
     memoizable (0.4.2)
       thread_safe (~> 0.3, >= 0.3.1)
@@ -523,27 +582,28 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2019.0331)
     mimemagic (0.3.2)
-    mini_magick (4.8.0)
+    mini_magick (4.9.5)
     mini_mime (1.0.1)
     mini_portile2 (2.4.0)
     minitest (5.11.3)
-    mixlib-cli (1.7.0)
-    mixlib-config (2.2.18)
-      tomlrb
-    msgpack (1.2.10)
+    msgpack (1.3.0)
     multi_json (1.13.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
+    murmurhash3 (0.1.6)
     mustermann (1.0.3)
     mustermann-grape (1.0.0)
       mustermann (~> 1.0.0)
-    mysql2 (0.4.10)
     nakayoshi_fork (0.0.4)
+    nap (1.1.0)
+    net-dns (0.9.0)
     net-ldap (0.16.0)
+    net-ntp (2.1.3)
     net-ssh (5.2.0)
     netrc (0.11.0)
     nio4r (2.3.1)
-    nokogiri (1.10.3)
+    no_proxy_fix (0.1.2)
+    nokogiri (1.10.4)
       mini_portile2 (~> 2.4.0)
     nokogumbo (1.5.0)
       nokogiri
@@ -619,6 +679,7 @@ GEM
       addressable (~> 2.5)
       omniauth (~> 1.3)
       openid_connect (~> 1.1)
+    open4 (1.3.4)
     openid_connect (1.1.6)
       activemodel
       attr_required (>= 1.0.0)
@@ -639,29 +700,6 @@ GEM
     parser (2.6.3.0)
       ast (~> 2.4.0)
     parslet (1.8.2)
-    peek (1.0.1)
-      concurrent-ruby (>= 0.9.0)
-      concurrent-ruby-ext (>= 0.9.0)
-      railties (>= 4.0.0)
-    peek-gc (0.0.2)
-      peek
-    peek-mysql2 (1.2.0)
-      concurrent-ruby
-      concurrent-ruby-ext
-      mysql2
-      peek
-    peek-pg (1.3.0)
-      concurrent-ruby
-      concurrent-ruby-ext
-      peek
-      pg
-    peek-rblineprof (0.2.0)
-      peek
-      rblineprof
-    peek-redis (1.2.0)
-      atomic (>= 1.0.0)
-      peek
-      redis
     pg (1.1.4)
     po_to_json (1.0.1)
       json (>= 1.6.0)
@@ -677,7 +715,7 @@ GEM
       parser
       unparser
     procto (0.0.3)
-    prometheus-client-mmap (0.9.8)
+    prometheus-client-mmap (0.9.10)
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
@@ -732,7 +770,7 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.4)
+    rails-html-sanitizer (1.2.0)
       loofah (~> 2.2, >= 2.2.2)
     rails-i18n (5.1.1)
       i18n (>= 0.7, < 2)
@@ -760,17 +798,17 @@ GEM
     recaptcha (4.13.1)
       json
     recursive-open-struct (1.1.0)
-    redis (3.3.5)
+    redis (4.1.2)
     redis-actionpack (5.0.2)
       actionpack (>= 4.0, < 6)
       redis-rack (>= 1, < 3)
       redis-store (>= 1.1.0, < 2)
-    redis-activesupport (5.0.4)
+    redis-activesupport (5.0.7)
       activesupport (>= 3, < 6)
       redis-store (>= 1.3, < 2)
     redis-namespace (1.6.0)
       redis (>= 3.0.4)
-    redis-rack (2.0.4)
+    redis-rack (2.0.5)
       rack (>= 1.5, < 3)
       redis-store (>= 1.2, < 2)
     redis-rails (5.0.2)
@@ -796,7 +834,7 @@ GEM
     retriable (3.1.2)
     rinku (2.0.0)
     rotp (2.1.2)
-    rouge (3.5.1)
+    rouge (3.7.0)
     rqrcode (0.7.0)
       chunky_png
     rqrcode-rails3 (0.1.7)
@@ -855,8 +893,8 @@ GEM
       i18n
     ruby-fogbugz (0.2.1)
       crack (~> 0.4)
-    ruby-prof (0.17.0)
-    ruby-progressbar (1.10.0)
+    ruby-prof (1.0.0)
+    ruby-progressbar (1.10.1)
     ruby-saml (1.7.2)
       nokogiri (>= 1.5.10)
     ruby_parser (3.13.1)
@@ -864,7 +902,7 @@ GEM
     rubyntlm (0.6.2)
     rubypants (0.2.0)
     rubyzip (1.2.2)
-    rugged (0.28.1)
+    rugged (0.28.3.1)
     safe_yaml (1.0.4)
     sanitize (4.6.6)
       crass (~> 1.0.2)
@@ -900,8 +938,6 @@ GEM
       faraday (>= 0.7.6, < 1.0)
     settingslogic (2.0.9)
     sexp_processor (4.12.0)
-    sham_rack (1.3.6)
-      rack
     shoulda-matchers (4.0.1)
       activesupport (>= 4.2.0)
     sidekiq (5.2.7)
@@ -923,7 +959,10 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
+    sixarm_ruby_unaccent (1.2.0)
     slack-notifier (1.5.1)
+    snowplow-tracker (0.6.1)
+      contracts (~> 0.7, <= 0.11)
     spring (2.0.2)
       activesupport (>= 4.2)
     spring-commands-rspec (1.0.4)
@@ -952,7 +991,9 @@ GEM
     sys-filesystem (1.1.6)
       ffi
     sysexits (1.2.0)
-    temple (0.8.0)
+    temple (0.8.1)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
     test-prof (0.2.5)
     text (1.3.1)
     thin (1.7.2)
@@ -962,14 +1003,13 @@ GEM
     thor (0.19.4)
     thread_safe (0.3.6)
     thrift (0.11.0.0)
-    tilt (2.0.8)
+    tilt (2.0.9)
     timecop (0.8.1)
     timfel-krb5-auth (0.8.3)
     toml (0.2.0)
       parslet (~> 1.8.0)
     toml-rb (1.0.0)
       citrus (~> 3.0, > 3.0)
-    tomlrb (1.2.8)
     truncato (0.7.11)
       htmlentities (~> 4.3.1)
       nokogiri (>= 1.7.0, <= 2.0)
@@ -984,6 +1024,7 @@ GEM
       unf_ext
     unf_ext (0.0.7.5)
     unicode-display_width (1.6.0)
+    unicode_utils (1.4.0)
     unicorn (5.4.1)
       kgio (~> 2.6)
       raindrops (~> 0.7)
@@ -991,6 +1032,8 @@ GEM
       get_process_mem (~> 0)
       unicorn (>= 4, < 6)
     uniform_notifier (1.10.0)
+    unleash (0.1.5)
+      murmurhash3 (~> 0.1.6)
     unparser (0.4.5)
       abstract_type (~> 0.0.7)
       adamantium (~> 0.2.0)
@@ -1046,7 +1089,6 @@ DEPENDENCIES
   ace-rails-ap (~> 4.1.0)
   acme-client (~> 2.0.2)
   activerecord-explain-analyze (~> 0.1)
-  activerecord_sane_schema_dumper (= 1.0)
   acts-as-taggable-on (~> 6.0)
   addressable (~> 2.5.2)
   akismet (~> 2.0)
@@ -1055,8 +1097,10 @@ DEPENDENCIES
   asciidoctor (~> 2.0.10)
   asciidoctor-include-ext (~> 0.3.1)
   asciidoctor-plantuml (= 0.0.9)
+  atlassian-jwt (~> 0.2.0)
   attr_encrypted (~> 3.1.0)
   awesome_print
+  aws-sdk
   babosa (~> 1.0.2)
   base32 (~> 0.3.0)
   batch-loader (~> 1.4.0)
@@ -1076,11 +1120,12 @@ DEPENDENCIES
   carrierwave (~> 1.3)
   charlock_holmes (~> 0.7.5)
   chronic (~> 0.10.2)
-  chronic_duration (~> 0.10.6)
   commonmarker (~> 0.17)
   concurrent-ruby (~> 1.1)
   connection_pool (~> 2.0)
+  countries (~> 3.0)
   creole (~> 0.5.0)
+  danger (~> 6.0)
   database_cleaner (~> 1.7.0)
   deckar01-task_list (= 2.2.0)
   default_value_for (~> 3.2.0)
@@ -1093,11 +1138,15 @@ DEPENDENCIES
   doorkeeper (~> 4.3)
   doorkeeper-openid_connect (~> 1.5)
   ed25519 (~> 1.2)
+  elasticsearch-api (= 5.0.3)
+  elasticsearch-model (~> 0.1.9)
+  elasticsearch-rails (~> 0.1.9)
   email_reply_trimmer (~> 0.1)
   email_spec (~> 2.2.0)
   escape_utils (~> 1.1)
   factory_bot_rails (~> 4.8.2)
   faraday (~> 0.12)
+  faraday_middleware-aws-signers-v4
   fast_blank
   ffaker (~> 2.10)
   flipper (~> 0.13.0)
@@ -1107,7 +1156,7 @@ DEPENDENCIES
   fog-aliyun (~> 0.3)
   fog-aws (~> 3.5)
   fog-core (= 2.1.0)
-  fog-google (~> 1.8)
+  fog-google (~> 1.9)
   fog-local (~> 0.6)
   fog-openstack (~> 1.0)
   fog-rackspace (~> 0.1.1)
@@ -1119,12 +1168,15 @@ DEPENDENCIES
   gettext (~> 3.2.2)
   gettext_i18n_rails (~> 1.8.0)
   gettext_i18n_rails_js (~> 1.3)
-  gitaly-proto (~> 1.37.0)
+  gitaly (~> 1.58.0)
   github-markup (~> 1.7.0)
-  gitlab-labkit (~> 0.3.0)
+  gitlab-labkit (~> 0.5)
+  gitlab-license (~> 1.0)
   gitlab-markup (~> 1.7.0)
-  gitlab-sidekiq-fetcher (~> 0.4.0)
+  gitlab-peek (~> 0.0.1)
+  gitlab-sidekiq-fetcher (= 0.5.2)
   gitlab-styles (~> 2.7)
+  gitlab_chronic_duration (~> 0.10.6.1)
   gitlab_omniauth-ldap (~> 2.1.1)
   gon (~> 6.2)
   google-api-client (~> 0.23)
@@ -1135,9 +1187,10 @@ DEPENDENCIES
   grape-path-helpers (~> 1.1)
   grape_logging (~> 1.7)
   graphiql-rails (~> 1.4.10)
-  graphql (~> 1.8.0)
+  graphql (~> 1.9.11)
   graphql-docs (~> 1.6.0)
   grpc (~> 1.19.0)
+  gssapi
   haml_lint (~> 0.31.0)
   hamlit (~> 2.8.8)
   hangouts-chat (~> 0.0.5)
@@ -1149,30 +1202,31 @@ DEPENDENCIES
   httparty (~> 0.16.4)
   icalendar
   influxdb (~> 0.2)
-  jira-ruby (~> 1.4)
+  invisible_captcha (~> 0.12.1)
+  jira-ruby (~> 1.7)
   js_regex (~> 3.1)
   json-schema (~> 2.8.0)
   jwt (~> 2.1.0)
   kaminari (~> 1.0)
   knapsack (~> 1.17)
-  kubeclient (~> 4.2.2)
+  kubeclient (~> 4.4.0)
   letter_opener_web (~> 1.3.4)
   license_finder (~> 5.4)
   licensee (~> 8.9)
   lograge (~> 0.5)
   loofah (~> 2.2)
   mail_room (~> 0.9.1)
-  mdl (~> 0.5.0)
   memory_profiler (~> 0.9)
   method_source (~> 0.8)
   mimemagic (~> 0.3.2)
   mini_magick
   minitest (~> 5.11.0)
-  mysql2 (~> 0.4.10)
   nakayoshi_fork (~> 0.0.4)
+  net-dns (~> 0.9.0)
   net-ldap
+  net-ntp
   net-ssh (~> 5.2)
-  nokogiri (~> 1.10.3)
+  nokogiri (~> 1.10.4)
   oauth2 (~> 1.4)
   octokit (~> 4.9)
   omniauth (~> 1.8)
@@ -1194,15 +1248,9 @@ DEPENDENCIES
   omniauth_crowd (~> 2.2.0)
   omniauth_openid_connect (~> 0.3.1)
   org-ruby (~> 0.9.12)
-  peek (~> 1.0.1)
-  peek-gc (~> 0.0.2)
-  peek-mysql2 (~> 1.2.0)
-  peek-pg (~> 1.3.0)
-  peek-rblineprof (~> 0.2.0)
-  peek-redis (~> 1.2.0)
   pg (~> 1.1)
   premailer-rails (~> 1.9.7)
-  prometheus-client-mmap (~> 0.9.8)
+  prometheus-client-mmap (~> 0.9.10)
   pry-byebug (~> 3.5.1)
   pry-rails (~> 0.3.4)
   puma (~> 3.12)
@@ -1223,12 +1271,12 @@ DEPENDENCIES
   rdoc (~> 6.0)
   re2 (~> 1.1.1)
   recaptcha (~> 4.11)
-  redis (~> 3.2)
+  redis (~> 4.0)
   redis-namespace (~> 1.6.0)
   redis-rails (~> 5.0.2)
   request_store (~> 1.3)
   responders (~> 2.0)
-  rouge (~> 3.5)
+  rouge (~> 3.7)
   rqrcode-rails3 (~> 0.1.7)
   rspec-parameterized
   rspec-rails (~> 3.8.0)
@@ -1240,7 +1288,7 @@ DEPENDENCIES
   rubocop-performance (~> 1.1.0)
   rubocop-rspec (~> 1.22.1)
   ruby-fogbugz (~> 0.2.1)
-  ruby-prof (~> 0.17.0)
+  ruby-prof (~> 1.0.0)
   ruby-progressbar
   ruby_parser (~> 3.8)
   rubyzip (~> 1.2.2)
@@ -1252,13 +1300,13 @@ DEPENDENCIES
   selenium-webdriver (~> 3.141)
   sentry-raven (~> 2.9)
   settingslogic (~> 2.0.9)
-  sham_rack (~> 1.3.6)
   shoulda-matchers (~> 4.0.1)
   sidekiq (~> 5.2.7)
   sidekiq-cron (~> 1.0)
   simple_po_parser (~> 1.1.2)
   simplecov (~> 0.16.1)
   slack-notifier (~> 1.5.1)
+  snowplow-tracker (~> 0.6.1)
   spring (~> 2.0.0)
   spring-commands-rspec (~> 1.0.4)
   sprockets (~> 3.7.0)
@@ -1276,9 +1324,9 @@ DEPENDENCIES
   unf (~> 0.1.4)
   unicorn (~> 5.4.1)
   unicorn-worker-killer (~> 0.4.4)
+  unleash (~> 0.1.5)
   validates_hostname (~> 1.0.6)
   version_sorter (~> 2.2.4)
-  virtus (~> 1.0.1)
   vmstat (~> 2.3.0)
   webmock (~> 3.5.1)
   webpack-rails (~> 0.9.10)
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix
index 8da7a3262c1..147ce5bb4ea 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix
@@ -114,15 +114,6 @@
     };
     version = "0.1.0";
   };
-  activerecord_sane_schema_dumper = {
-    dependencies = ["rails"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "16jbf461wjaxyq26si5505wcj46mi23mii9hx4wjpva1zn9hz5m2";
-      type = "gem";
-    };
-    version = "1.0";
-  };
   activestorage = {
     dependencies = ["actionpack" "activerecord" "marcel"];
     groups = ["default" "development" "test"];
@@ -260,13 +251,16 @@
     };
     version = "2.4.0";
   };
-  atomic = {
+  atlassian-jwt = {
+    dependencies = ["jwt"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1kh9rvhjn4dndbfsk3yjq7alds6s2j70rc4k8wdwdyibab8a8gq9";
+      sha256 = "1ckfiiwv7dnifra7zhbggj96g0x0kzkv0x9n1is7lb86svlm7rjj";
       type = "gem";
     };
-    version = "1.1.99";
+    version = "0.2.0";
   };
   attr_encrypted = {
     dependencies = ["encryptor"];
@@ -295,6 +289,49 @@
     };
     version = "1.8.0";
   };
+  aws-sdk = {
+    dependencies = ["aws-sdk-resources"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "03r754cqa0jayf1nxpcmp1anaypxwpcjyjaq5cz7i04l9jdxvsnn";
+      type = "gem";
+    };
+    version = "2.9.32";
+  };
+  aws-sdk-core = {
+    dependencies = ["aws-sigv4" "jmespath"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1pq09wwb74y4m5adk4hi4zlz05q6sxjxij6g71v6nkd0z83hi34x";
+      type = "gem";
+    };
+    version = "2.9.32";
+  };
+  aws-sdk-resources = {
+    dependencies = ["aws-sdk-core"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "15m56k12x9gzkcyhwrab1qhi3wqla0qmv84dkqcjwp44d7c2xjyi";
+      type = "gem";
+    };
+    version = "2.9.32";
+  };
+  aws-sigv4 = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0cnrfxbaxn86qrxhfidg10f89ka1hddihakdhcvnri0dljaw7dsz";
+      type = "gem";
+    };
+    version = "1.0.0";
+  };
   axiom-types = {
     dependencies = ["descendants_tracker" "ice_nine" "thread_safe"];
     source = {
@@ -403,12 +440,14 @@
   };
   bootsnap = {
     dependencies = ["msgpack"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1amksyijp9hwpc2jr0yi45hpcp0qiz5r2h8rnf2wi1hdfw6m2hxh";
+      sha256 = "1jcc0x0l3jqap8r8l1j994ljh93c8hcppm59mjzpa0hdvprh23av";
       type = "gem";
     };
-    version = "1.4.1";
+    version = "1.4.4";
   };
   bootstrap_form = {
     dependencies = ["actionpack" "activemodel"];
@@ -541,15 +580,6 @@
     };
     version = "0.10.2";
   };
-  chronic_duration = {
-    dependencies = ["numerizer"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1k7sx3xqbrn6s4pishh2pgr4kw6fmw63h00lh503l66k8x0qvigs";
-      type = "gem";
-    };
-    version = "0.10.6";
-  };
   chunky_png = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -566,6 +596,27 @@
     };
     version = "3.0.2";
   };
+  claide = {
+    groups = ["default" "development"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0kasxsms24fgcdsq680nz99d5lazl9rmz1qkil2y5gbbssx89g0z";
+      type = "gem";
+    };
+    version = "1.0.3";
+  };
+  claide-plugins = {
+    dependencies = ["cork" "nap" "open4"];
+    groups = ["default" "development"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0bhw5j985qs48v217gnzva31rw5qvkf7qj8mhp73pcks0sy7isn7";
+      type = "gem";
+    };
+    version = "0.9.2";
+  };
   coderay = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -583,6 +634,16 @@
     };
     version = "1.0.0";
   };
+  colored2 = {
+    groups = ["default" "development"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0jlbqa9q4mvrm73aw9mxh23ygzbjiqwisl32d8szfb5fxvbjng5i";
+      type = "gem";
+    };
+    version = "3.1.2";
+  };
   commonmarker = {
     dependencies = ["ruby-enum"];
     source = {
@@ -611,24 +672,45 @@
     };
     version = "1.1.5";
   };
-  concurrent-ruby-ext = {
-    dependencies = ["concurrent-ruby"];
-    groups = ["default" "mysql" "postgres"];
+  connection_pool = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0lflx29mlznf1hn0nihkgllzbj8xp5qasn8j7h838465pi399k68";
+      type = "gem";
+    };
+    version = "2.2.2";
+  };
+  contracts = {
+    groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "03ypsv2k581yv0b3f0hzvb3mq6mqj8jlbi32jmkj3k175vbc8hvz";
+      sha256 = "11kj7hdr94hxgxad9wazncvaxzaxlbvw6laq179ivhw9za746vnz";
       type = "gem";
     };
-    version = "1.1.5";
+    version = "0.11.0";
   };
-  connection_pool = {
+  cork = {
+    dependencies = ["colored2"];
+    groups = ["default" "development"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0lflx29mlznf1hn0nihkgllzbj8xp5qasn8j7h838465pi399k68";
+      sha256 = "1g6l780z1nj4s3jr11ipwcj8pjbibvli82my396m3y32w98ar850";
       type = "gem";
     };
-    version = "2.2.2";
+    version = "0.3.0";
+  };
+  countries = {
+    dependencies = ["i18n_data" "sixarm_ruby_unaccent" "unicode_utils"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0w278pjhwkbin7jpr7m47wac7gj5n4l2him9k2q4ngzq6rs2id7c";
+      type = "gem";
+    };
+    version = "3.0.0";
   };
   crack = {
     dependencies = ["safe_yaml"];
@@ -672,6 +754,17 @@
     };
     version = "1.2.6";
   };
+  danger = {
+    dependencies = ["claide" "claide-plugins" "colored2" "cork" "faraday" "faraday-http-cache" "git" "kramdown" "kramdown-parser-gfm" "no_proxy_fix" "octokit" "terminal-table"];
+    groups = ["development"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0gyxfs7pkcg90llhpl2nwfqqcqi0qngqhk8gpyrffj6m0lm1m6wl";
+      type = "gem";
+    };
+    version = "6.0.9";
+  };
   database_cleaner = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -850,6 +943,60 @@
     };
     version = "1.2.4";
   };
+  elasticsearch = {
+    dependencies = ["elasticsearch-api" "elasticsearch-transport"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0fik4nrxyi28zy1xwi4rygn0pf1sm1gskcrvbsnmqfrsdd6l4ga4";
+      type = "gem";
+    };
+    version = "5.0.3";
+  };
+  elasticsearch-api = {
+    dependencies = ["multi_json"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0aal128hq59l5kscl2ag2cv24g1sp5ysdb4jxkqmj0b1l9rv16mw";
+      type = "gem";
+    };
+    version = "5.0.3";
+  };
+  elasticsearch-model = {
+    dependencies = ["activesupport" "elasticsearch" "hashie"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "10kbsdxd192g8x60fhaxs4gqpgwag68d53flcw8rwvdm0i8smyzf";
+      type = "gem";
+    };
+    version = "0.1.9";
+  };
+  elasticsearch-rails = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "081hm2dc3l6kky027wm3s8k6lmiygg0hnrggnidchbl94nlalw2z";
+      type = "gem";
+    };
+    version = "0.1.9";
+  };
+  elasticsearch-transport = {
+    dependencies = ["faraday" "multi_json"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1a7fak70ajdqw1ahd2gmgijka52pjjfr3chaakkxa5fk3rwwna26";
+      type = "gem";
+    };
+    version = "5.0.3";
+  };
   email_reply_trimmer = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -982,6 +1129,17 @@
     };
     version = "0.12.2";
   };
+  faraday-http-cache = {
+    dependencies = ["faraday"];
+    groups = ["default" "development"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "08j86fgcwl7z792qyijdsq680arzpfiydqd24ja405z2rbm7r2i0";
+      type = "gem";
+    };
+    version = "2.0.0";
+  };
   faraday_middleware = {
     dependencies = ["faraday"];
     source = {
@@ -991,6 +1149,17 @@
     };
     version = "0.12.2";
   };
+  faraday_middleware-aws-signers-v4 = {
+    dependencies = ["aws-sdk-resources" "faraday"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0y88xcbq8k2ijhsqdava5493p26k49agvnzca6vkl3qwfv3ambhp";
+      type = "gem";
+    };
+    version = "0.1.7";
+  };
   faraday_middleware-multi_json = {
     dependencies = ["faraday_middleware" "multi_json"];
     source = {
@@ -1025,12 +1194,14 @@
     version = "2.10.0";
   };
   ffi = {
+    groups = ["default" "development" "kerberos" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p";
+      sha256 = "06mvxpjply8qh4j3fj9wh08kdzwkbnvsiysh0vrhlk5cwxzjmblh";
       type = "gem";
     };
-    version = "1.10.0";
+    version = "1.11.1";
   };
   flipper = {
     source = {
@@ -1098,12 +1269,14 @@
   };
   fog-google = {
     dependencies = ["fog-core" "fog-json" "fog-xml" "google-api-client"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0rxhcf2rhs8ml9j9xppz1yxgig3s1l5hm6yz582lqrs8bdmq028m";
+      sha256 = "1784xynmgvj1x9phy42nbd3fcgj040zps6wn7msi6vnj1sg4wpfy";
       type = "gem";
     };
-    version = "1.8.2";
+    version = "1.9.1";
   };
   fog-json = {
     dependencies = ["fog-core" "multi_json"];
@@ -1254,16 +1427,26 @@
     };
     version = "1.3.0";
   };
-  gitaly-proto = {
+  git = {
+    groups = ["default" "development"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0bf83icwypi3p3pd97vlqbnp3hvf31ncd440m9kh9y7x6yk74wyh";
+      type = "gem";
+    };
+    version = "1.5.0";
+  };
+  gitaly = {
     dependencies = ["grpc"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1lx2cids0r175agdz3wa25ivi17vxx2kryb2v29gdsrpg3pyyq7j";
+      sha256 = "00di7rl1171rvpncxnfdpnmqc32kx9xmi6nwrn52k8cyrxzz2ixf";
       type = "gem";
     };
-    version = "1.37.0";
+    version = "1.58.0";
   };
   github-markup = {
     source = {
@@ -1274,15 +1457,25 @@
     version = "1.7.0";
   };
   gitlab-labkit = {
-    dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing"];
+    dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing" "redis"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0dvapmdc9axm9dq2gg89qrqb318rkrsabpyybrqvcx1ipbi5k3a1";
+      sha256 = "1j06gl4ksd83rycg3fb46bb77iw74i1ivs5li6pyf5klrxjq8k3h";
       type = "gem";
     };
-    version = "0.3.0";
+    version = "0.5.2";
+  };
+  gitlab-license = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1q26cgp3ln3b36n3sc69r6hxafkxjwdr3m0d7jlch5j7vyib9bih";
+      type = "gem";
+    };
+    version = "1.0.0";
   };
   gitlab-markup = {
     groups = ["default"];
@@ -1294,16 +1487,27 @@
     };
     version = "1.7.0";
   };
+  gitlab-peek = {
+    dependencies = ["railties"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0r5a1cjhw8dyz1az9rhqh252rvsjhvbs28wnmk0lnqkvyydip4ql";
+      type = "gem";
+    };
+    version = "0.0.1";
+  };
   gitlab-sidekiq-fetcher = {
     dependencies = ["sidekiq"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1xaag97iclmiay8fx7dkiws8dsws2gi6l0axq4yljq5g7xm78qjr";
+      sha256 = "0dvx2klf1a1xyf15q34fn59291v6jwx3z315rxb2dmkvcr9873m1";
       type = "gem";
     };
-    version = "0.4.0";
+    version = "0.5.2";
   };
   gitlab-styles = {
     dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-performance" "rubocop-rspec"];
@@ -1311,10 +1515,21 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1vxlvbq4jpq0cfjqippz9d3j73sq9qg3pna5pb0l8jr0rc0xs89y";
+      sha256 = "0kxn5j4gk2bidxfi3lnx8sl58kwh0fp89p75pbwwz3cd88d4vgsq";
       type = "gem";
     };
-    version = "2.7.0";
+    version = "2.8.0";
+  };
+  gitlab_chronic_duration = {
+    dependencies = ["numerizer"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0rajna3aijqj8ap55xggawyh2xzh1vkrmzkjh3ja5x05qsf9csgs";
+      type = "gem";
+    };
+    version = "0.10.6.1";
   };
   gitlab_omniauth-ldap = {
     dependencies = ["net-ldap" "omniauth" "pyu-ruby-sasl" "rubyntlm"];
@@ -1441,12 +1656,14 @@
     version = "1.4.10";
   };
   graphql = {
+    groups = ["default" "development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "10bnl8yjyg5x6h787cfkpd5gphl5z5jblj8fc9lbmgk27n2knssl";
+      sha256 = "17gpvpv3zpmcbzgdx9skaaj5frxw12ja5hssk7xwzckna0v782vh";
       type = "gem";
     };
-    version = "1.8.1";
+    version = "1.9.11";
   };
   graphql-docs = {
     dependencies = ["commonmarker" "escape_utils" "extended-markdown-filter" "gemoji" "graphql" "html-pipeline" "sass"];
@@ -1470,6 +1687,17 @@
     };
     version = "1.19.0";
   };
+  gssapi = {
+    dependencies = ["ffi"];
+    groups = ["kerberos"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0j93nsf9j57p7x4aafalvjg8hia2mmqv3aky7fmw2ck5yci343ix";
+      type = "gem";
+    };
+    version = "1.2.0";
+  };
   haml = {
     dependencies = ["temple" "tilt"];
     source = {
@@ -1652,6 +1880,16 @@
     };
     version = "1.6.0";
   };
+  i18n_data = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0v0cdwxiaqdwhaljd7z0fbx29q3r5kjl93xnjm5abi1x37645ncj";
+      type = "gem";
+    };
+    version = "0.8.0";
+  };
   icalendar = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -1677,6 +1915,17 @@
     };
     version = "0.2.3";
   };
+  invisible_captcha = {
+    dependencies = ["rails"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "15510dh1vh7l2xs2a4956nhxpnf10168r62i497nmcbyqpp1df88";
+      type = "gem";
+    };
+    version = "0.12.1";
+  };
   ipaddress = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -1699,19 +1948,31 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1zz27z88qznix4r65gd9h56gl177snlfpgv10b0s69vi8qpl909l";
+      sha256 = "1930v0chc1q4fr7hn0y1j34mw0v032a8kh0by4d4sbz8ksy056kf";
       type = "gem";
     };
-    version = "1.5.2";
+    version = "1.5.3";
   };
   jira-ruby = {
-    dependencies = ["activesupport" "multipart-post" "oauth"];
+    dependencies = ["activesupport" "atlassian-jwt" "multipart-post" "oauth"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "14019mliqwcppj6qp2wdhh5gbvs2yh2idibag13m9a18ag965bhw";
+      sha256 = "0hb3645x0p3bkmqcgc9b2q4b5kn02wgmb03brx7ag1h5y79an4q5";
       type = "gem";
     };
-    version = "1.4.1";
+    version = "1.7.1";
+  };
+  jmespath = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "07w8ipjg59qavijq59hl82zs74jf3jsp7vxl9q3a2d0wpv5akz3y";
+      type = "gem";
+    };
+    version = "1.3.1";
   };
   js_regex = {
     dependencies = ["character_set" "regexp_parser" "regexp_property_values"];
@@ -1809,23 +2070,36 @@
     version = "1.17.0";
   };
   kramdown = {
-    groups = ["default" "development" "test"];
+    groups = ["default" "development"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1n1c4jmrh5ig8iv1rw81s4mw4xsp4v97hvf8zkigv4hn5h542qjq";
+      sha256 = "1dl840bvx8d9nq6lg3mxqyvbiqnr6lk3jfsm6r8zhz7p5srmd688";
       type = "gem";
     };
-    version = "1.17.0";
+    version = "2.1.0";
+  };
+  kramdown-parser-gfm = {
+    dependencies = ["kramdown"];
+    groups = ["default" "development"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0a8pb3v951f4x7h968rqfsa19c8arz21zw1vaj42jza22rap8fgv";
+      type = "gem";
+    };
+    version = "1.1.0";
   };
   kubeclient = {
     dependencies = ["http" "recursive-open-struct" "rest-client"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "10761kwhgclnf2lrdjspmxnw90z7i0l85inranfxc688ing0d5xn";
+      sha256 = "0gj6z90p3nm43bafbp97b78zi764gy88590g2y4lm8zcgk8k586r";
       type = "gem";
     };
-    version = "4.2.2";
+    version = "4.4.0";
   };
   launchy = {
     dependencies = ["addressable"];
@@ -1930,17 +2204,6 @@
     };
     version = "0.3.3";
   };
-  mdl = {
-    dependencies = ["kramdown" "mixlib-cli" "mixlib-config"];
-    groups = ["development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "047hp8z1ma630wp38bm1giklkf385rp6wly8aidn825q831w2g4i";
-      type = "gem";
-    };
-    version = "0.5.0";
-  };
   memoist = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -2004,12 +2267,14 @@
     version = "0.3.2";
   };
   mini_magick = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1djxfs9rxw6q6vr6wb4ndxhp1vj1zbwb55s1kf6mz9bzgmswqg0n";
+      sha256 = "0qy09qrd5bwh8mkbj514n5vcw9ni73218h9s3zmvbpmdwrnzi8j4";
       type = "gem";
     };
-    version = "4.8.0";
+    version = "4.9.5";
   };
   mini_mime = {
     source = {
@@ -2035,36 +2300,15 @@
     };
     version = "5.11.3";
   };
-  mixlib-cli = {
-    groups = ["default" "development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0647msh7kp7lzyf6m72g6snpirvhimjm22qb8xgv9pdhbcrmcccp";
-      type = "gem";
-    };
-    version = "1.7.0";
-  };
-  mixlib-config = {
-    dependencies = ["tomlrb"];
-    groups = ["default" "development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1gm6yj9cbbgsl9x4xqxga0vz5w0ksq2jnq1wj8hvgm5c4wfcrswb";
-      type = "gem";
-    };
-    version = "2.2.18";
-  };
   msgpack = {
-    groups = ["default" "development" "test"];
+    groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1w38hilm3dk42dwk8ygiq49bl4in7y80hfqr63hk54mj4gmzi6ch";
+      sha256 = "1186lhwnxiw5ryv6dbxrsfy0fajfll2l95kf9pmca50iyiqi86zn";
       type = "gem";
     };
-    version = "1.2.10";
+    version = "1.3.0";
   };
   multi_json = {
     source = {
@@ -2090,6 +2334,16 @@
     };
     version = "2.0.0";
   };
+  murmurhash3 = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1szwcm44z5jg1l4dq73zyjw4rjin23ihkhrw5cpcjrb6cg8hd3y7";
+      type = "gem";
+    };
+    version = "0.1.6";
+  };
   mustermann = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -2107,21 +2361,33 @@
     };
     version = "1.0.0";
   };
-  mysql2 = {
+  nakayoshi_fork = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0qjd97w6a0w9aldsrhb2y6jrc4wnnlbj5j8kcl7pp7vviwa0r5iq";
+      sha256 = "1mj5czi7rxxmfq4v9qjz74lcqypvnjxhxqfs71zhb2rsfa97a6jg";
       type = "gem";
     };
-    version = "0.4.10";
+    version = "0.0.4";
   };
-  nakayoshi_fork = {
+  nap = {
+    groups = ["default" "development"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1mj5czi7rxxmfq4v9qjz74lcqypvnjxhxqfs71zhb2rsfa97a6jg";
+      sha256 = "0xm5xssxk5s03wjarpipfm39qmgxsalb46v1prsis14x1xk935ll";
       type = "gem";
     };
-    version = "0.0.4";
+    version = "1.1.0";
+  };
+  net-dns = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "18d97xjphw21naaqfhgxp95ikr1d79rx708b2df3xm01j6isqy1d";
+      type = "gem";
+    };
+    version = "0.9.0";
   };
   net-ldap = {
     source = {
@@ -2131,6 +2397,16 @@
     };
     version = "0.16.0";
   };
+  net-ntp = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0z96m7nnb9f634cz4i6p0x89z7g9i9h97cnk5f3x3q5x090kzisv";
+      type = "gem";
+    };
+    version = "2.1.3";
+  };
   net-ssh = {
     groups = ["default"];
     platforms = [];
@@ -2157,16 +2433,26 @@
     };
     version = "2.3.1";
   };
+  no_proxy_fix = {
+    groups = ["default" "development"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "006dmdb640v1kq0sll3dnlwj1b0kpf3i1p27ygyffv8lpcqlr6sf";
+      type = "gem";
+    };
+    version = "0.1.2";
+  };
   nokogiri = {
     dependencies = ["mini_portile2"];
-    groups = ["default" "development" "mysql" "postgres" "test"];
+    groups = ["default" "development" "test"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "02bjydih0j515szfv9mls195cvpyidh6ixm7dwbl3s2sbaxxk5s4";
+      sha256 = "0nmdrqqz1gs0fwkgzxjl4wr554gr8dc1fkrqjc2jpsvwgm41rygv";
       type = "gem";
     };
-    version = "1.10.3";
+    version = "1.10.4";
   };
   nokogumbo = {
     dependencies = ["nokogiri"];
@@ -2406,6 +2692,16 @@
     };
     version = "0.3.1";
   };
+  open4 = {
+    groups = ["default" "development"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1cgls3f9dlrpil846q0w7h66vsc33jqn84nql4gcqkk221rh7px1";
+      type = "gem";
+    };
+    version = "1.3.4";
+  };
   openid_connect = {
     dependencies = ["activemodel" "attr_required" "json-jwt" "rack-oauth2" "swd" "tzinfo" "validate_email" "validate_url" "webfinger"];
     groups = ["default"];
@@ -2489,60 +2785,6 @@
     };
     version = "1.8.2";
   };
-  peek = {
-    dependencies = ["concurrent-ruby" "concurrent-ruby-ext" "railties"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1998vcsli215d6qrn9821gr2qip60xki2p7n2dpn8i1n68hyshcn";
-      type = "gem";
-    };
-    version = "1.0.1";
-  };
-  peek-gc = {
-    dependencies = ["peek"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "094h3mr9q8wzbqsj0girpyjvj4bcxax8m438igp42n75xv0bhwi9";
-      type = "gem";
-    };
-    version = "0.0.2";
-  };
-  peek-mysql2 = {
-    dependencies = ["concurrent-ruby" "concurrent-ruby-ext" "mysql2" "peek"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0avmwm3yw0kx0z8gh4cpqj79jb5aicd0h3yzrcdfpzwks56h1k9z";
-      type = "gem";
-    };
-    version = "1.2.0";
-  };
-  peek-pg = {
-    dependencies = ["concurrent-ruby" "concurrent-ruby-ext" "peek" "pg"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "17yk8xrh7yh57wg6vi3s8km9qd9f910n94r511mdyqd7aizlfb7c";
-      type = "gem";
-    };
-    version = "1.3.0";
-  };
-  peek-rblineprof = {
-    dependencies = ["peek" "rblineprof"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0ywk1gvsnhrkhqq2ibwsg7099kg5m2vs4nmzy0wf65kb0ywl0m9c";
-      type = "gem";
-    };
-    version = "0.2.0";
-  };
-  peek-redis = {
-    dependencies = ["atomic" "peek" "redis"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0v91cni591d9wdrmvgam20gr3504x84mh1l95da4rz5a9436jm33";
-      type = "gem";
-    };
-    version = "1.2.0";
-  };
   pg = {
     groups = ["development" "postgres" "test"];
     platforms = [];
@@ -2602,10 +2844,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "01f1zkpi7qsmgmk17fpq6ck7jn64sa9afsq20vc5k9f6mpyqkncd";
+      sha256 = "0immyg4as0isyj2dcjf44n0avg1jv5kx1qk0asrgb5ayzwmjqg1k";
       type = "gem";
     };
-    version = "0.9.8";
+    version = "0.9.10";
   };
   pry = {
     dependencies = ["coderay" "method_source"];
@@ -2794,12 +3036,14 @@
   };
   rails-html-sanitizer = {
     dependencies = ["loofah"];
+    groups = ["default" "development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1gv7vr5d9g2xmgpjfq4nxsqr70r9pr042r9ycqqnfvw5cz9c7jwr";
+      sha256 = "0ilwxzm3a7bql5c9q2n9g9nb1hax7vd8d65a5yp3d967ld97nvrq";
       type = "gem";
     };
-    version = "1.0.4";
+    version = "1.2.0";
   };
   rails-i18n = {
     dependencies = ["i18n" "railties"];
@@ -2924,12 +3168,14 @@
     version = "4.3.2";
   };
   redis = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0i415x8gi0c5vsiy6ikvx5js6fhc4x80a5lqv8iidy2iymd20irv";
+      sha256 = "1mymdx7s5sr4mablklaipz679ckczsiigswm1g2v5mc93yj5amw3";
       type = "gem";
     };
-    version = "3.3.5";
+    version = "4.1.2";
   };
   redis-actionpack = {
     dependencies = ["actionpack" "redis-rack" "redis-store"];
@@ -2942,12 +3188,14 @@
   };
   redis-activesupport = {
     dependencies = ["activesupport" "redis-store"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0rq5dhrzc1l8c7f5gx9r7mvnsk5206dfwih3yv5si5rf42nx2ay5";
+      sha256 = "0y1df62gpqgy0yrlmgl05rp4kb0xvn0kylprhv1k32bs33dgpv62";
       type = "gem";
     };
-    version = "5.0.4";
+    version = "5.0.7";
   };
   redis-namespace = {
     dependencies = ["redis"];
@@ -2960,12 +3208,14 @@
   };
   redis-rack = {
     dependencies = ["rack" "redis-store"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0px0wv8zripc6lrn3k0k61j6nlxda145q8sz50yvnig17wlk36gb";
+      sha256 = "03xgdmq4fh187aqlh8z05idbxrmgddcarlb8x1kw4wjfcsf5afqi";
       type = "gem";
     };
-    version = "2.0.4";
+    version = "2.0.5";
   };
   redis-rails = {
     dependencies = ["redis-actionpack" "redis-activesupport" "redis-store"];
@@ -3067,10 +3317,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0yfhazlhjc4abgzhkgq8zqmdphvkh52211widkl4zhsbhqh8wg2q";
+      sha256 = "0pv628bqalippv8vjs3003qpl3zab9g44vqzydgcwxd628r5k9sv";
       type = "gem";
     };
-    version = "3.5.1";
+    version = "3.7.0";
   };
   rqrcode = {
     dependencies = ["chunky_png"];
@@ -3262,22 +3512,24 @@
     version = "0.2.1";
   };
   ruby-prof = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "02z4lh1iv1d8751a1l6r4hfc9mp61gf80g4qc4l6gbync3j3hf2c";
+      sha256 = "0ac3mv3x468s820f6wnp5whzl59y5844wmdjg47a8mbp0kkmnn58";
       type = "gem";
     };
-    version = "0.17.0";
+    version = "1.0.0";
   };
   ruby-progressbar = {
     groups = ["default" "development" "test"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1cv2ym3rl09svw8940ny67bav7b2db4ms39i4raaqzkf59jmhglk";
+      sha256 = "1k77i0d4wsn23ggdd2msrcwfy0i376cglfqypkk2q77r2l3408zf";
       type = "gem";
     };
-    version = "1.10.0";
+    version = "1.10.1";
   };
   ruby-saml = {
     dependencies = ["nokogiri"];
@@ -3328,10 +3580,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1yiszpz6y13vvgh3fss1l0ipp0zgsbbc8c28vynnpdyx1sy6krp6";
+      sha256 = "03w3k7j27kgzpcc3halkd3w0b677sny2lfwm2lwn2n1ac20dzjc6";
       type = "gem";
     };
-    version = "0.28.1";
+    version = "0.28.3.1";
   };
   safe_yaml = {
     source = {
@@ -3457,15 +3709,6 @@
     };
     version = "4.12.0";
   };
-  sham_rack = {
-    dependencies = ["rack"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0zs6hpgg87x5jrykjxgfp2i7m5aja53s5kamdhxam16wki1hid3i";
-      type = "gem";
-    };
-    version = "1.3.6";
-  };
   shoulda-matchers = {
     dependencies = ["activesupport"];
     groups = ["test"];
@@ -3535,6 +3778,16 @@
     };
     version = "0.10.2";
   };
+  sixarm_ruby_unaccent = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "11237b8r8p7fc0cpn04v9wa7ggzq0xm6flh10h1lnb6zgc3schq0";
+      type = "gem";
+    };
+    version = "1.2.0";
+  };
   slack-notifier = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -3543,6 +3796,17 @@
     };
     version = "1.5.1";
   };
+  snowplow-tracker = {
+    dependencies = ["contracts"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "05136477ifa567aym9k8nqqmwv3plbczgh9x9fbz86860vym5v4w";
+      type = "gem";
+    };
+    version = "0.6.1";
+  };
   spring = {
     dependencies = ["activesupport"];
     source = {
@@ -3658,12 +3922,25 @@
     version = "1.2.0";
   };
   temple = {
+    groups = ["default" "development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "00nxf610nzi4n1i2lkby43nrnarvl89fcl6lg19406msr0k3ycmq";
+      sha256 = "158d7ygbwcifqnvrph219p7m78yjdjazhykv5darbkms7bxm5y09";
       type = "gem";
     };
-    version = "0.8.0";
+    version = "0.8.1";
+  };
+  terminal-table = {
+    dependencies = ["unicode-display_width"];
+    groups = ["default" "development"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1512cngw35hsmhvw4c05rscihc59mnj09m249sm9p3pik831ydqk";
+      type = "gem";
+    };
+    version = "1.8.0";
   };
   test-prof = {
     source = {
@@ -3715,12 +3992,14 @@
     version = "0.11.0.0";
   };
   tilt = {
+    groups = ["default" "development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0020mrgdf11q23hm1ddd6fv691l51vi10af00f137ilcdb2ycfra";
+      sha256 = "0ca4k0clwf0rkvy7726x4nxpjxkpv67w043i39saxgldxd97zmwz";
       type = "gem";
     };
-    version = "2.0.8";
+    version = "2.0.9";
   };
   timecop = {
     source = {
@@ -3756,16 +4035,6 @@
     };
     version = "1.0.0";
   };
-  tomlrb = {
-    groups = ["default" "development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0g28ssfal6vry3cmhy509ba3vi5d5aggz1gnffnvvmc8ml8vkpiv";
-      type = "gem";
-    };
-    version = "1.2.8";
-  };
   truncato = {
     dependencies = ["htmlentities" "nokogiri"];
     source = {
@@ -3836,6 +4105,16 @@
     };
     version = "1.6.0";
   };
+  unicode_utils = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0h1a5yvrxzlf0lxxa1ya31jcizslf774arnsd89vgdhk4g7x08mr";
+      type = "gem";
+    };
+    version = "1.4.0";
+  };
   unicorn = {
     dependencies = ["kgio" "raindrops"];
     source = {
@@ -3862,6 +4141,17 @@
     };
     version = "1.10.0";
   };
+  unleash = {
+    dependencies = ["murmurhash3"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0xs2ml9cwskddsxick3a9wnasy7q6wmc0dbydfcaspfl2cjmp1rk";
+      type = "gem";
+    };
+    version = "0.1.5";
+  };
   unparser = {
     dependencies = ["abstract_type" "adamantium" "concord" "diff-lcs" "equalizer" "parser" "procto"];
     groups = ["default" "development" "test"];
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile
index 62ee2990dfa..864e514ae0d 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile
+++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile
@@ -2,6 +2,8 @@ source 'https://rubygems.org'
 
 gem 'rails', '5.2.3'
 
+gem 'bootsnap', '~> 1.4'
+
 # Improves copy-on-write performance for MRI
 gem 'nakayoshi_fork', '~> 0.0.4'
 
@@ -14,8 +16,7 @@ gem 'sprockets', '~> 3.7.0'
 gem 'default_value_for', '~> 3.2.0'
 
 # Supported DBs
-gem 'mysql2', '~> 0.4.10', group: :mysql
-gem 'pg', '~> 1.1', group: :postgres
+gem 'pg', '~> 1.1'
 
 gem 'rugged', '~> 0.28'
 gem 'grape-path-helpers', '~> 1.1'
@@ -53,6 +54,7 @@ gem 'gssapi', group: :kerberos
 # Spam and anti-bot protection
 gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails'
 gem 'akismet', '~> 2.0'
+gem 'invisible_captcha', '~> 0.12.1'
 
 # Two-factor authentication
 gem 'devise-two-factor', '~> 3.0.0'
@@ -84,7 +86,10 @@ gem 'grape-entity', '~> 0.7.1'
 gem 'rack-cors', '~> 1.0.0', require: 'rack/cors'
 
 # GraphQL API
-gem 'graphql', '~> 1.8.0'
+gem 'graphql', '~> 1.9.11'
+# NOTE: graphiql-rails v1.5+ doesn't work: https://gitlab.com/gitlab-org/gitlab-ce/issues/67293
+# TODO: remove app/views/graphiql/rails/editors/show.html.erb when https://github.com/rmosolgo/graphiql-rails/pull/71 is released:
+# https://gitlab.com/gitlab-org/gitlab-ce/issues/67263
 gem 'graphiql-rails', '~> 1.4.10'
 gem 'apollo_upload_server', '~> 2.0.0.beta3'
 gem 'graphql-docs', '~> 1.6.0', group: [:development, :test]
@@ -107,7 +112,7 @@ gem 'fog-aws', '~> 3.5'
 # Locked until fog-google resolves https://github.com/fog/fog-google/issues/421.
 # Also see config/initializers/fog_core_patch.rb.
 gem 'fog-core', '= 2.1.0'
-gem 'fog-google', '~> 1.8'
+gem 'fog-google', '~> 1.9'
 gem 'fog-local', '~> 0.6'
 gem 'fog-openstack', '~> 1.0'
 gem 'fog-rackspace', '~> 0.1.1'
@@ -143,10 +148,10 @@ gem 'wikicloth', '0.8.1'
 gem 'asciidoctor', '~> 2.0.10'
 gem 'asciidoctor-include-ext', '~> 0.3.1', require: false
 gem 'asciidoctor-plantuml', '0.0.9'
-gem 'rouge', '~> 3.5'
+gem 'rouge', '~> 3.7'
 gem 'truncato', '~> 0.7.11'
 gem 'bootstrap_form', '~> 4.2.0'
-gem 'nokogiri', '~> 1.10.3'
+gem 'nokogiri', '~> 1.10.4'
 gem 'escape_utils', '~> 1.1'
 
 # Calendar rendering
@@ -179,7 +184,7 @@ gem 'acts-as-taggable-on', '~> 6.0'
 gem 'sidekiq', '~> 5.2.7'
 gem 'sidekiq-cron', '~> 1.0'
 gem 'redis-namespace', '~> 1.6.0'
-gem 'gitlab-sidekiq-fetcher', '~> 0.4.0', require: 'sidekiq-reliable-fetch'
+gem 'gitlab-sidekiq-fetcher', '0.5.2', require: 'sidekiq-reliable-fetch'
 
 # Cron Parser
 gem 'fugit', '~> 1.2.1'
@@ -209,13 +214,13 @@ gem 'js_regex', '~> 3.1'
 # User agent parsing
 gem 'device_detector'
 
-# Cache
-gem 'redis-rails', '~> 5.0.2'
-
 # Redis
-gem 'redis', '~> 3.2'
+gem 'redis', '~> 4.0'
 gem 'connection_pool', '~> 2.0'
 
+# Redis session store
+gem 'redis-rails', '~> 5.0.2'
+
 # Discord integration
 gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false
 
@@ -223,7 +228,8 @@ gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false
 gem 'hipchat', '~> 1.5.0'
 
 # Jira integration
-gem 'jira-ruby', '~> 1.4'
+gem 'jira-ruby', '~> 1.7'
+gem 'atlassian-jwt', '~> 0.2.0'
 
 # Flowdock integration
 gem 'flowdock', '~> 0.7'
@@ -241,7 +247,7 @@ gem 'asana', '~> 0.8.1'
 gem 'ruby-fogbugz', '~> 0.2.1'
 
 # Kubernetes integration
-gem 'kubeclient', '~> 4.2.2'
+gem 'kubeclient', '~> 4.4.0'
 
 # Sanitize user input
 gem 'sanitize', '~> 4.6'
@@ -270,7 +276,7 @@ gem 'fast_blank'
 
 # Parse time & duration
 gem 'chronic', '~> 0.10.2'
-gem 'chronic_duration', '~> 0.10.6'
+gem 'gitlab_chronic_duration', '~> 0.10.6.1'
 
 gem 'webpack-rails', '~> 0.9.10'
 gem 'rack-proxy', '~> 0.6.0'
@@ -283,7 +289,6 @@ gem 'font-awesome-rails', '~> 4.7'
 gem 'gemojione', '~> 3.3'
 gem 'gon', '~> 6.2'
 gem 'request_store', '~> 1.3'
-gem 'virtus', '~> 1.0.1'
 gem 'base32', '~> 0.3.0'
 
 gem "gitlab-license", "~> 1.0"
@@ -294,7 +299,7 @@ gem 'sentry-raven', '~> 2.9'
 gem 'premailer-rails', '~> 1.9.7'
 
 # LabKit: Tracing and Correlation
-gem 'gitlab-labkit', '~> 0.3.0'
+gem 'gitlab-labkit', '~> 0.5'
 
 # I18n
 gem 'ruby_parser', '~> 3.8', require: false
@@ -306,12 +311,8 @@ gem 'gettext', '~> 3.2.2', require: false, group: :development
 gem 'batch-loader', '~> 1.4.0'
 
 # Perf bar
-gem 'peek', '~> 1.0.1'
-gem 'peek-gc', '~> 0.0.2'
-gem 'peek-mysql2', '~> 1.2.0', group: :mysql
-gem 'peek-pg', '~> 1.3.0', group: :postgres
-gem 'peek-rblineprof', '~> 0.2.0'
-gem 'peek-redis', '~> 1.2.0'
+# https://gitlab.com/gitlab-org/gitlab-ee/issues/13996
+gem 'gitlab-peek', '~> 0.0.1', require: 'peek'
 
 # Snowplow events tracking
 gem 'snowplow-tracker', '~> 0.6.1'
@@ -325,13 +326,14 @@ group :metrics do
   gem 'influxdb', '~> 0.2', require: false
 
   # Prometheus
-  gem 'prometheus-client-mmap', '~> 0.9.8'
+  gem 'prometheus-client-mmap', '~> 0.9.10'
   gem 'raindrops', '~> 0.18'
 end
 
 group :development do
   gem 'foreman', '~> 0.84.0'
   gem 'brakeman', '~> 4.2', require: false
+  gem 'danger', '~> 6.0', require: false
 
   gem 'letter_opener_web', '~> 1.3.4'
   gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
@@ -345,7 +347,6 @@ group :development do
 end
 
 group :development, :test do
-  gem 'bootsnap', '~> 1.4'
   gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET']
   gem 'pry-byebug', '~> 3.5.1', platform: :mri
   gem 'pry-rails', '~> 0.3.4'
@@ -384,15 +385,12 @@ group :development, :test do
   gem 'haml_lint', '~> 0.31.0', require: false
   gem 'simplecov', '~> 0.16.1', require: false
   gem 'bundler-audit', '~> 0.5.0', require: false
-  gem 'mdl', '~> 0.5.0', require: false
 
   gem 'benchmark-ips', '~> 2.3.0', require: false
 
   gem 'license_finder', '~> 5.4', require: false
   gem 'knapsack', '~> 1.17'
 
-  gem 'activerecord_sane_schema_dumper', '1.0'
-
   gem 'stackprof', '~> 0.2.10', require: false
 
   gem 'simple_po_parser', '~> 1.1.2', require: false
@@ -406,7 +404,6 @@ group :test do
   gem 'json-schema', '~> 2.8.0'
   gem 'webmock', '~> 3.5.1'
   gem 'rails-controller-testing'
-  gem 'sham_rack', '~> 1.3.6'
   gem 'concurrent-ruby', '~> 1.1'
   gem 'test-prof', '~> 0.2.5'
   gem 'rspec_junit_formatter'
@@ -419,7 +416,7 @@ gem 'mail_room', '~> 0.9.1'
 gem 'email_reply_trimmer', '~> 0.1'
 gem 'html2text'
 
-gem 'ruby-prof', '~> 0.17.0'
+gem 'ruby-prof', '~> 1.0.0'
 gem 'rbtrace', '~> 0.4', require: false
 gem 'memory_profiler', '~> 0.9', require: false
 gem 'benchmark-memory', '~> 0.1', require: false
@@ -448,8 +445,8 @@ group :ed25519 do
   gem 'bcrypt_pbkdf', '~> 1.0'
 end
 
-# Gitaly GRPC client
-gem 'gitaly-proto', '~> 1.37.0', require: 'gitaly'
+# Gitaly GRPC protocol definitions
+gem 'gitaly', '~> 1.58.0'
 
 gem 'grpc', '~> 1.19.0'
 
@@ -461,6 +458,7 @@ gem 'toml-rb', '~> 1.0.0', require: false
 gem 'flipper', '~> 0.13.0'
 gem 'flipper-active_record', '~> 0.13.0'
 gem 'flipper-active_support_cache_store', '~> 0.13.0'
+gem 'unleash', '~> 0.1.5'
 
 # Structured logging
 gem 'lograge', '~> 0.5'
@@ -468,3 +466,6 @@ gem 'grape_logging', '~> 1.7'
 
 # DNS Lookup
 gem 'net-dns', '~> 0.9.0'
+
+# Countries list
+gem 'countries', '~> 3.0'
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock
index 0a6d7fe1370..fec34622be3 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock
@@ -41,8 +41,6 @@ GEM
     activerecord-explain-analyze (0.1.0)
       activerecord (>= 4)
       pg
-    activerecord_sane_schema_dumper (1.0)
-      rails (>= 5, < 6)
     activestorage (5.2.3)
       actionpack (= 5.2.3)
       activerecord (= 5.2.3)
@@ -76,7 +74,8 @@ GEM
     asciidoctor-plantuml (0.0.9)
       asciidoctor (>= 1.5.6, < 3.0.0)
     ast (2.4.0)
-    atomic (1.1.99)
+    atlassian-jwt (0.2.0)
+      jwt (~> 2.1.0)
     attr_encrypted (3.1.0)
       encryptor (~> 3.0.0)
     attr_required (1.0.1)
@@ -109,7 +108,7 @@ GEM
     binding_ninja (0.2.3)
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
-    bootsnap (1.4.1)
+    bootsnap (1.4.4)
       msgpack (~> 1.0)
     bootstrap_form (4.2.0)
       actionpack (>= 5.0)
@@ -145,23 +144,31 @@ GEM
     childprocess (0.9.0)
       ffi (~> 1.0, >= 1.0.11)
     chronic (0.10.2)
-    chronic_duration (0.10.6)
-      numerizer (~> 0.1.1)
     chunky_png (1.3.5)
     citrus (3.0.2)
+    claide (1.0.3)
+    claide-plugins (0.9.2)
+      cork
+      nap
+      open4 (~> 1.3)
     coderay (1.1.2)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
+    colored2 (3.1.2)
     commonmarker (0.17.13)
       ruby-enum (~> 0.5)
     concord (0.1.5)
       adamantium (~> 0.2.0)
       equalizer (~> 0.0.9)
     concurrent-ruby (1.1.5)
-    concurrent-ruby-ext (1.1.5)
-      concurrent-ruby (= 1.1.5)
     connection_pool (2.2.2)
     contracts (0.11.0)
+    cork (0.3.0)
+      colored2 (~> 3.1)
+    countries (3.0.0)
+      i18n_data (~> 0.8.0)
+      sixarm_ruby_unaccent (~> 1.1)
+      unicode_utils (~> 1.4)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     crass (1.0.4)
@@ -169,6 +176,19 @@ GEM
     css_parser (1.5.0)
       addressable
     daemons (1.2.6)
+    danger (6.0.9)
+      claide (~> 1.0)
+      claide-plugins (>= 0.9.2)
+      colored2 (~> 3.1)
+      cork (~> 0.1)
+      faraday (~> 0.9)
+      faraday-http-cache (~> 2.0)
+      git (~> 1.5)
+      kramdown (~> 2.0)
+      kramdown-parser-gfm (~> 1.0)
+      no_proxy_fix
+      octokit (~> 4.7)
+      terminal-table (~> 1)
     database_cleaner (1.7.0)
     debug_inspector (0.0.3)
     debugger-ruby_core_source (1.3.8)
@@ -251,6 +271,8 @@ GEM
       railties (>= 3.0.0)
     faraday (0.12.2)
       multipart-post (>= 1.2, < 3)
+    faraday-http-cache (2.0.0)
+      faraday (~> 0.8)
     faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
     faraday_middleware-aws-signers-v4 (0.1.7)
@@ -262,7 +284,7 @@ GEM
     fast_blank (1.0.0)
     fast_gettext (1.6.0)
     ffaker (2.10.0)
-    ffi (1.10.0)
+    ffi (1.11.1)
     flipper (0.13.0)
     flipper-active_record (0.13.0)
       activerecord (>= 3.2, < 6)
@@ -288,7 +310,7 @@ GEM
       excon (~> 0.58)
       formatador (~> 0.2)
       mime-types
-    fog-google (1.8.2)
+    fog-google (1.9.1)
       fog-core (<= 2.1.0)
       fog-json (~> 1.2)
       fog-xml (~> 0.1.0)
@@ -335,24 +357,30 @@ GEM
       gettext_i18n_rails (>= 0.7.1)
       po_to_json (>= 1.0.0)
       rails (>= 3.2.0)
-    gitaly-proto (1.37.0)
+    git (1.5.0)
+    gitaly (1.58.0)
       grpc (~> 1.0)
     github-markup (1.7.0)
-    gitlab-labkit (0.3.0)
+    gitlab-labkit (0.5.2)
       actionpack (~> 5)
       activesupport (~> 5)
-      grpc (~> 1.19.0)
+      grpc (~> 1.19)
       jaeger-client (~> 0.10)
       opentracing (~> 0.4)
+      redis (> 3.0.0, < 5.0.0)
     gitlab-license (1.0.0)
     gitlab-markup (1.7.0)
-    gitlab-sidekiq-fetcher (0.4.0)
+    gitlab-peek (0.0.1)
+      railties (>= 4.0.0)
+    gitlab-sidekiq-fetcher (0.5.2)
       sidekiq (~> 5)
-    gitlab-styles (2.7.0)
+    gitlab-styles (2.8.0)
       rubocop (~> 0.69.0)
       rubocop-gitlab-security (~> 0.1.0)
       rubocop-performance (~> 1.1.0)
       rubocop-rspec (~> 1.19)
+    gitlab_chronic_duration (0.10.6.1)
+      numerizer (~> 0.1.1)
     gitlab_omniauth-ldap (2.1.1)
       net-ldap (~> 0.16)
       omniauth (~> 1.3)
@@ -402,7 +430,7 @@ GEM
     graphiql-rails (1.4.10)
       railties
       sprockets-rails
-    graphql (1.8.1)
+    graphql (1.9.11)
     graphql-docs (1.6.0)
       commonmarker (~> 0.16)
       escape_utils (~> 1.2)
@@ -461,18 +489,22 @@ GEM
     httpclient (2.8.3)
     i18n (1.6.0)
       concurrent-ruby (~> 1.0)
+    i18n_data (0.8.0)
     icalendar (2.4.1)
     ice_nine (0.11.2)
     influxdb (0.2.3)
       cause
       json
+    invisible_captcha (0.12.1)
+      rails (>= 3.2.0)
     ipaddress (0.8.3)
     jaeger-client (0.10.0)
       opentracing (~> 0.3)
       thrift
-    jaro_winkler (1.5.2)
-    jira-ruby (1.4.1)
+    jaro_winkler (1.5.3)
+    jira-ruby (1.7.1)
       activesupport
+      atlassian-jwt
       multipart-post
       oauth (~> 0.5, >= 0.5.0)
     jmespath (1.3.1)
@@ -503,8 +535,10 @@ GEM
     kgio (2.11.2)
     knapsack (1.17.0)
       rake
-    kramdown (1.17.0)
-    kubeclient (4.2.2)
+    kramdown (2.1.0)
+    kramdown-parser-gfm (1.1.0)
+      kramdown (~> 2.0)
+    kubeclient (4.4.0)
       http (~> 3.0)
       recursive-open-struct (~> 1.0, >= 1.0.4)
       rest-client (~> 2.0)
@@ -539,10 +573,6 @@ GEM
     mail_room (0.9.1)
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
-    mdl (0.5.0)
-      kramdown (~> 1.12, >= 1.12.0)
-      mixlib-cli (~> 1.7, >= 1.7.0)
-      mixlib-config (~> 2.2, >= 2.2.1)
     memoist (0.16.0)
     memoizable (0.4.2)
       thread_safe (~> 0.3, >= 0.3.1)
@@ -552,29 +582,28 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2019.0331)
     mimemagic (0.3.2)
-    mini_magick (4.8.0)
+    mini_magick (4.9.5)
     mini_mime (1.0.1)
     mini_portile2 (2.4.0)
     minitest (5.11.3)
-    mixlib-cli (1.7.0)
-    mixlib-config (2.2.18)
-      tomlrb
-    msgpack (1.2.10)
+    msgpack (1.3.0)
     multi_json (1.13.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
+    murmurhash3 (0.1.6)
     mustermann (1.0.3)
     mustermann-grape (1.0.0)
       mustermann (~> 1.0.0)
-    mysql2 (0.4.10)
     nakayoshi_fork (0.0.4)
+    nap (1.1.0)
     net-dns (0.9.0)
     net-ldap (0.16.0)
     net-ntp (2.1.3)
     net-ssh (5.2.0)
     netrc (0.11.0)
     nio4r (2.3.1)
-    nokogiri (1.10.3)
+    no_proxy_fix (0.1.2)
+    nokogiri (1.10.4)
       mini_portile2 (~> 2.4.0)
     nokogumbo (1.5.0)
       nokogiri
@@ -650,6 +679,7 @@ GEM
       addressable (~> 2.5)
       omniauth (~> 1.3)
       openid_connect (~> 1.1)
+    open4 (1.3.4)
     openid_connect (1.1.6)
       activemodel
       attr_required (>= 1.0.0)
@@ -670,29 +700,6 @@ GEM
     parser (2.6.3.0)
       ast (~> 2.4.0)
     parslet (1.8.2)
-    peek (1.0.1)
-      concurrent-ruby (>= 0.9.0)
-      concurrent-ruby-ext (>= 0.9.0)
-      railties (>= 4.0.0)
-    peek-gc (0.0.2)
-      peek
-    peek-mysql2 (1.2.0)
-      concurrent-ruby
-      concurrent-ruby-ext
-      mysql2
-      peek
-    peek-pg (1.3.0)
-      concurrent-ruby
-      concurrent-ruby-ext
-      peek
-      pg
-    peek-rblineprof (0.2.0)
-      peek
-      rblineprof
-    peek-redis (1.2.0)
-      atomic (>= 1.0.0)
-      peek
-      redis
     pg (1.1.4)
     po_to_json (1.0.1)
       json (>= 1.6.0)
@@ -708,7 +715,7 @@ GEM
       parser
       unparser
     procto (0.0.3)
-    prometheus-client-mmap (0.9.8)
+    prometheus-client-mmap (0.9.10)
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
@@ -763,7 +770,7 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.4)
+    rails-html-sanitizer (1.2.0)
       loofah (~> 2.2, >= 2.2.2)
     rails-i18n (5.1.1)
       i18n (>= 0.7, < 2)
@@ -791,17 +798,17 @@ GEM
     recaptcha (4.13.1)
       json
     recursive-open-struct (1.1.0)
-    redis (3.3.5)
+    redis (4.1.2)
     redis-actionpack (5.0.2)
       actionpack (>= 4.0, < 6)
       redis-rack (>= 1, < 3)
       redis-store (>= 1.1.0, < 2)
-    redis-activesupport (5.0.4)
+    redis-activesupport (5.0.7)
       activesupport (>= 3, < 6)
       redis-store (>= 1.3, < 2)
     redis-namespace (1.6.0)
       redis (>= 3.0.4)
-    redis-rack (2.0.4)
+    redis-rack (2.0.5)
       rack (>= 1.5, < 3)
       redis-store (>= 1.2, < 2)
     redis-rails (5.0.2)
@@ -827,7 +834,7 @@ GEM
     retriable (3.1.2)
     rinku (2.0.0)
     rotp (2.1.2)
-    rouge (3.5.1)
+    rouge (3.7.0)
     rqrcode (0.7.0)
       chunky_png
     rqrcode-rails3 (0.1.7)
@@ -886,8 +893,8 @@ GEM
       i18n
     ruby-fogbugz (0.2.1)
       crack (~> 0.4)
-    ruby-prof (0.17.0)
-    ruby-progressbar (1.10.0)
+    ruby-prof (1.0.0)
+    ruby-progressbar (1.10.1)
     ruby-saml (1.7.2)
       nokogiri (>= 1.5.10)
     ruby_parser (3.13.1)
@@ -895,7 +902,7 @@ GEM
     rubyntlm (0.6.2)
     rubypants (0.2.0)
     rubyzip (1.2.2)
-    rugged (0.28.1)
+    rugged (0.28.3.1)
     safe_yaml (1.0.4)
     sanitize (4.6.6)
       crass (~> 1.0.2)
@@ -931,8 +938,6 @@ GEM
       faraday (>= 0.7.6, < 1.0)
     settingslogic (2.0.9)
     sexp_processor (4.12.0)
-    sham_rack (1.3.6)
-      rack
     shoulda-matchers (4.0.1)
       activesupport (>= 4.2.0)
     sidekiq (5.2.7)
@@ -954,6 +959,7 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
+    sixarm_ruby_unaccent (1.2.0)
     slack-notifier (1.5.1)
     snowplow-tracker (0.6.1)
       contracts (~> 0.7, <= 0.11)
@@ -986,6 +992,8 @@ GEM
       ffi
     sysexits (1.2.0)
     temple (0.8.1)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
     test-prof (0.2.5)
     text (1.3.1)
     thin (1.7.2)
@@ -1002,7 +1010,6 @@ GEM
       parslet (~> 1.8.0)
     toml-rb (1.0.0)
       citrus (~> 3.0, > 3.0)
-    tomlrb (1.2.8)
     truncato (0.7.11)
       htmlentities (~> 4.3.1)
       nokogiri (>= 1.7.0, <= 2.0)
@@ -1017,6 +1024,7 @@ GEM
       unf_ext
     unf_ext (0.0.7.5)
     unicode-display_width (1.6.0)
+    unicode_utils (1.4.0)
     unicorn (5.4.1)
       kgio (~> 2.6)
       raindrops (~> 0.7)
@@ -1024,6 +1032,8 @@ GEM
       get_process_mem (~> 0)
       unicorn (>= 4, < 6)
     uniform_notifier (1.10.0)
+    unleash (0.1.5)
+      murmurhash3 (~> 0.1.6)
     unparser (0.4.5)
       abstract_type (~> 0.0.7)
       adamantium (~> 0.2.0)
@@ -1079,7 +1089,6 @@ DEPENDENCIES
   ace-rails-ap (~> 4.1.0)
   acme-client (~> 2.0.2)
   activerecord-explain-analyze (~> 0.1)
-  activerecord_sane_schema_dumper (= 1.0)
   acts-as-taggable-on (~> 6.0)
   addressable (~> 2.5.2)
   akismet (~> 2.0)
@@ -1088,6 +1097,7 @@ DEPENDENCIES
   asciidoctor (~> 2.0.10)
   asciidoctor-include-ext (~> 0.3.1)
   asciidoctor-plantuml (= 0.0.9)
+  atlassian-jwt (~> 0.2.0)
   attr_encrypted (~> 3.1.0)
   awesome_print
   aws-sdk
@@ -1110,11 +1120,12 @@ DEPENDENCIES
   carrierwave (~> 1.3)
   charlock_holmes (~> 0.7.5)
   chronic (~> 0.10.2)
-  chronic_duration (~> 0.10.6)
   commonmarker (~> 0.17)
   concurrent-ruby (~> 1.1)
   connection_pool (~> 2.0)
+  countries (~> 3.0)
   creole (~> 0.5.0)
+  danger (~> 6.0)
   database_cleaner (~> 1.7.0)
   deckar01-task_list (= 2.2.0)
   default_value_for (~> 3.2.0)
@@ -1145,7 +1156,7 @@ DEPENDENCIES
   fog-aliyun (~> 0.3)
   fog-aws (~> 3.5)
   fog-core (= 2.1.0)
-  fog-google (~> 1.8)
+  fog-google (~> 1.9)
   fog-local (~> 0.6)
   fog-openstack (~> 1.0)
   fog-rackspace (~> 0.1.1)
@@ -1157,13 +1168,15 @@ DEPENDENCIES
   gettext (~> 3.2.2)
   gettext_i18n_rails (~> 1.8.0)
   gettext_i18n_rails_js (~> 1.3)
-  gitaly-proto (~> 1.37.0)
+  gitaly (~> 1.58.0)
   github-markup (~> 1.7.0)
-  gitlab-labkit (~> 0.3.0)
+  gitlab-labkit (~> 0.5)
   gitlab-license (~> 1.0)
   gitlab-markup (~> 1.7.0)
-  gitlab-sidekiq-fetcher (~> 0.4.0)
+  gitlab-peek (~> 0.0.1)
+  gitlab-sidekiq-fetcher (= 0.5.2)
   gitlab-styles (~> 2.7)
+  gitlab_chronic_duration (~> 0.10.6.1)
   gitlab_omniauth-ldap (~> 2.1.1)
   gon (~> 6.2)
   google-api-client (~> 0.23)
@@ -1174,7 +1187,7 @@ DEPENDENCIES
   grape-path-helpers (~> 1.1)
   grape_logging (~> 1.7)
   graphiql-rails (~> 1.4.10)
-  graphql (~> 1.8.0)
+  graphql (~> 1.9.11)
   graphql-docs (~> 1.6.0)
   grpc (~> 1.19.0)
   gssapi
@@ -1189,32 +1202,31 @@ DEPENDENCIES
   httparty (~> 0.16.4)
   icalendar
   influxdb (~> 0.2)
-  jira-ruby (~> 1.4)
+  invisible_captcha (~> 0.12.1)
+  jira-ruby (~> 1.7)
   js_regex (~> 3.1)
   json-schema (~> 2.8.0)
   jwt (~> 2.1.0)
   kaminari (~> 1.0)
   knapsack (~> 1.17)
-  kubeclient (~> 4.2.2)
+  kubeclient (~> 4.4.0)
   letter_opener_web (~> 1.3.4)
   license_finder (~> 5.4)
   licensee (~> 8.9)
   lograge (~> 0.5)
   loofah (~> 2.2)
   mail_room (~> 0.9.1)
-  mdl (~> 0.5.0)
   memory_profiler (~> 0.9)
   method_source (~> 0.8)
   mimemagic (~> 0.3.2)
   mini_magick
   minitest (~> 5.11.0)
-  mysql2 (~> 0.4.10)
   nakayoshi_fork (~> 0.0.4)
   net-dns (~> 0.9.0)
   net-ldap
   net-ntp
   net-ssh (~> 5.2)
-  nokogiri (~> 1.10.3)
+  nokogiri (~> 1.10.4)
   oauth2 (~> 1.4)
   octokit (~> 4.9)
   omniauth (~> 1.8)
@@ -1236,15 +1248,9 @@ DEPENDENCIES
   omniauth_crowd (~> 2.2.0)
   omniauth_openid_connect (~> 0.3.1)
   org-ruby (~> 0.9.12)
-  peek (~> 1.0.1)
-  peek-gc (~> 0.0.2)
-  peek-mysql2 (~> 1.2.0)
-  peek-pg (~> 1.3.0)
-  peek-rblineprof (~> 0.2.0)
-  peek-redis (~> 1.2.0)
   pg (~> 1.1)
   premailer-rails (~> 1.9.7)
-  prometheus-client-mmap (~> 0.9.8)
+  prometheus-client-mmap (~> 0.9.10)
   pry-byebug (~> 3.5.1)
   pry-rails (~> 0.3.4)
   puma (~> 3.12)
@@ -1265,12 +1271,12 @@ DEPENDENCIES
   rdoc (~> 6.0)
   re2 (~> 1.1.1)
   recaptcha (~> 4.11)
-  redis (~> 3.2)
+  redis (~> 4.0)
   redis-namespace (~> 1.6.0)
   redis-rails (~> 5.0.2)
   request_store (~> 1.3)
   responders (~> 2.0)
-  rouge (~> 3.5)
+  rouge (~> 3.7)
   rqrcode-rails3 (~> 0.1.7)
   rspec-parameterized
   rspec-rails (~> 3.8.0)
@@ -1282,7 +1288,7 @@ DEPENDENCIES
   rubocop-performance (~> 1.1.0)
   rubocop-rspec (~> 1.22.1)
   ruby-fogbugz (~> 0.2.1)
-  ruby-prof (~> 0.17.0)
+  ruby-prof (~> 1.0.0)
   ruby-progressbar
   ruby_parser (~> 3.8)
   rubyzip (~> 1.2.2)
@@ -1294,7 +1300,6 @@ DEPENDENCIES
   selenium-webdriver (~> 3.141)
   sentry-raven (~> 2.9)
   settingslogic (~> 2.0.9)
-  sham_rack (~> 1.3.6)
   shoulda-matchers (~> 4.0.1)
   sidekiq (~> 5.2.7)
   sidekiq-cron (~> 1.0)
@@ -1319,9 +1324,9 @@ DEPENDENCIES
   unf (~> 0.1.4)
   unicorn (~> 5.4.1)
   unicorn-worker-killer (~> 0.4.4)
+  unleash (~> 0.1.5)
   validates_hostname (~> 1.0.6)
   version_sorter (~> 2.2.4)
-  virtus (~> 1.0.1)
   vmstat (~> 2.3.0)
   webmock (~> 3.5.1)
   webpack-rails (~> 0.9.10)
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix
index 8050743ab25..37bea0bd708 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix
@@ -114,15 +114,6 @@
     };
     version = "0.1.0";
   };
-  activerecord_sane_schema_dumper = {
-    dependencies = ["rails"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "16jbf461wjaxyq26si5505wcj46mi23mii9hx4wjpva1zn9hz5m2";
-      type = "gem";
-    };
-    version = "1.0";
-  };
   activestorage = {
     dependencies = ["actionpack" "activerecord" "marcel"];
     groups = ["default" "development" "test"];
@@ -260,13 +251,16 @@
     };
     version = "2.4.0";
   };
-  atomic = {
+  atlassian-jwt = {
+    dependencies = ["jwt"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1kh9rvhjn4dndbfsk3yjq7alds6s2j70rc4k8wdwdyibab8a8gq9";
+      sha256 = "1ckfiiwv7dnifra7zhbggj96g0x0kzkv0x9n1is7lb86svlm7rjj";
       type = "gem";
     };
-    version = "1.1.99";
+    version = "0.2.0";
   };
   attr_encrypted = {
     dependencies = ["encryptor"];
@@ -438,12 +432,14 @@
   };
   bootsnap = {
     dependencies = ["msgpack"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1amksyijp9hwpc2jr0yi45hpcp0qiz5r2h8rnf2wi1hdfw6m2hxh";
+      sha256 = "1jcc0x0l3jqap8r8l1j994ljh93c8hcppm59mjzpa0hdvprh23av";
       type = "gem";
     };
-    version = "1.4.1";
+    version = "1.4.4";
   };
   bootstrap_form = {
     dependencies = ["actionpack" "activemodel"];
@@ -576,15 +572,6 @@
     };
     version = "0.10.2";
   };
-  chronic_duration = {
-    dependencies = ["numerizer"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1k7sx3xqbrn6s4pishh2pgr4kw6fmw63h00lh503l66k8x0qvigs";
-      type = "gem";
-    };
-    version = "0.10.6";
-  };
   chunky_png = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -601,6 +588,27 @@
     };
     version = "3.0.2";
   };
+  claide = {
+    groups = ["default" "development"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0kasxsms24fgcdsq680nz99d5lazl9rmz1qkil2y5gbbssx89g0z";
+      type = "gem";
+    };
+    version = "1.0.3";
+  };
+  claide-plugins = {
+    dependencies = ["cork" "nap" "open4"];
+    groups = ["default" "development"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0bhw5j985qs48v217gnzva31rw5qvkf7qj8mhp73pcks0sy7isn7";
+      type = "gem";
+    };
+    version = "0.9.2";
+  };
   coderay = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -618,6 +626,16 @@
     };
     version = "1.0.0";
   };
+  colored2 = {
+    groups = ["default" "development"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0jlbqa9q4mvrm73aw9mxh23ygzbjiqwisl32d8szfb5fxvbjng5i";
+      type = "gem";
+    };
+    version = "3.1.2";
+  };
   commonmarker = {
     dependencies = ["ruby-enum"];
     source = {
@@ -646,17 +664,6 @@
     };
     version = "1.1.5";
   };
-  concurrent-ruby-ext = {
-    dependencies = ["concurrent-ruby"];
-    groups = ["default" "mysql" "postgres"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "03ypsv2k581yv0b3f0hzvb3mq6mqj8jlbi32jmkj3k175vbc8hvz";
-      type = "gem";
-    };
-    version = "1.1.5";
-  };
   connection_pool = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -675,6 +682,28 @@
     };
     version = "0.11.0";
   };
+  cork = {
+    dependencies = ["colored2"];
+    groups = ["default" "development"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1g6l780z1nj4s3jr11ipwcj8pjbibvli82my396m3y32w98ar850";
+      type = "gem";
+    };
+    version = "0.3.0";
+  };
+  countries = {
+    dependencies = ["i18n_data" "sixarm_ruby_unaccent" "unicode_utils"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0w278pjhwkbin7jpr7m47wac7gj5n4l2him9k2q4ngzq6rs2id7c";
+      type = "gem";
+    };
+    version = "3.0.0";
+  };
   crack = {
     dependencies = ["safe_yaml"];
     source = {
@@ -717,6 +746,17 @@
     };
     version = "1.2.6";
   };
+  danger = {
+    dependencies = ["claide" "claide-plugins" "colored2" "cork" "faraday" "faraday-http-cache" "git" "kramdown" "kramdown-parser-gfm" "no_proxy_fix" "octokit" "terminal-table"];
+    groups = ["development"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0gyxfs7pkcg90llhpl2nwfqqcqi0qngqhk8gpyrffj6m0lm1m6wl";
+      type = "gem";
+    };
+    version = "6.0.9";
+  };
   database_cleaner = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -1071,6 +1111,17 @@
     };
     version = "0.12.2";
   };
+  faraday-http-cache = {
+    dependencies = ["faraday"];
+    groups = ["default" "development"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "08j86fgcwl7z792qyijdsq680arzpfiydqd24ja405z2rbm7r2i0";
+      type = "gem";
+    };
+    version = "2.0.0";
+  };
   faraday_middleware = {
     dependencies = ["faraday"];
     source = {
@@ -1123,12 +1174,14 @@
     version = "2.10.0";
   };
   ffi = {
+    groups = ["default" "development" "kerberos" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p";
+      sha256 = "06mvxpjply8qh4j3fj9wh08kdzwkbnvsiysh0vrhlk5cwxzjmblh";
       type = "gem";
     };
-    version = "1.10.0";
+    version = "1.11.1";
   };
   flipper = {
     source = {
@@ -1196,12 +1249,14 @@
   };
   fog-google = {
     dependencies = ["fog-core" "fog-json" "fog-xml" "google-api-client"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0rxhcf2rhs8ml9j9xppz1yxgig3s1l5hm6yz582lqrs8bdmq028m";
+      sha256 = "1784xynmgvj1x9phy42nbd3fcgj040zps6wn7msi6vnj1sg4wpfy";
       type = "gem";
     };
-    version = "1.8.2";
+    version = "1.9.1";
   };
   fog-json = {
     dependencies = ["fog-core" "multi_json"];
@@ -1352,16 +1407,26 @@
     };
     version = "1.3.0";
   };
-  gitaly-proto = {
+  git = {
+    groups = ["default" "development"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0bf83icwypi3p3pd97vlqbnp3hvf31ncd440m9kh9y7x6yk74wyh";
+      type = "gem";
+    };
+    version = "1.5.0";
+  };
+  gitaly = {
     dependencies = ["grpc"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1lx2cids0r175agdz3wa25ivi17vxx2kryb2v29gdsrpg3pyyq7j";
+      sha256 = "00di7rl1171rvpncxnfdpnmqc32kx9xmi6nwrn52k8cyrxzz2ixf";
       type = "gem";
     };
-    version = "1.37.0";
+    version = "1.58.0";
   };
   github-markup = {
     source = {
@@ -1372,15 +1437,15 @@
     version = "1.7.0";
   };
   gitlab-labkit = {
-    dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing"];
+    dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing" "redis"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0dvapmdc9axm9dq2gg89qrqb318rkrsabpyybrqvcx1ipbi5k3a1";
+      sha256 = "1j06gl4ksd83rycg3fb46bb77iw74i1ivs5li6pyf5klrxjq8k3h";
       type = "gem";
     };
-    version = "0.3.0";
+    version = "0.5.2";
   };
   gitlab-license = {
     source = {
@@ -1400,16 +1465,27 @@
     };
     version = "1.7.0";
   };
+  gitlab-peek = {
+    dependencies = ["railties"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0r5a1cjhw8dyz1az9rhqh252rvsjhvbs28wnmk0lnqkvyydip4ql";
+      type = "gem";
+    };
+    version = "0.0.1";
+  };
   gitlab-sidekiq-fetcher = {
     dependencies = ["sidekiq"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1xaag97iclmiay8fx7dkiws8dsws2gi6l0axq4yljq5g7xm78qjr";
+      sha256 = "0dvx2klf1a1xyf15q34fn59291v6jwx3z315rxb2dmkvcr9873m1";
       type = "gem";
     };
-    version = "0.4.0";
+    version = "0.5.2";
   };
   gitlab-styles = {
     dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-performance" "rubocop-rspec"];
@@ -1417,10 +1493,21 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1vxlvbq4jpq0cfjqippz9d3j73sq9qg3pna5pb0l8jr0rc0xs89y";
+      sha256 = "0kxn5j4gk2bidxfi3lnx8sl58kwh0fp89p75pbwwz3cd88d4vgsq";
       type = "gem";
     };
-    version = "2.7.0";
+    version = "2.8.0";
+  };
+  gitlab_chronic_duration = {
+    dependencies = ["numerizer"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0rajna3aijqj8ap55xggawyh2xzh1vkrmzkjh3ja5x05qsf9csgs";
+      type = "gem";
+    };
+    version = "0.10.6.1";
   };
   gitlab_omniauth-ldap = {
     dependencies = ["net-ldap" "omniauth" "pyu-ruby-sasl" "rubyntlm"];
@@ -1547,12 +1634,14 @@
     version = "1.4.10";
   };
   graphql = {
+    groups = ["default" "development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "10bnl8yjyg5x6h787cfkpd5gphl5z5jblj8fc9lbmgk27n2knssl";
+      sha256 = "17gpvpv3zpmcbzgdx9skaaj5frxw12ja5hssk7xwzckna0v782vh";
       type = "gem";
     };
-    version = "1.8.1";
+    version = "1.9.11";
   };
   graphql-docs = {
     dependencies = ["commonmarker" "escape_utils" "extended-markdown-filter" "gemoji" "graphql" "html-pipeline" "sass"];
@@ -1767,6 +1856,16 @@
     };
     version = "1.6.0";
   };
+  i18n_data = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0v0cdwxiaqdwhaljd7z0fbx29q3r5kjl93xnjm5abi1x37645ncj";
+      type = "gem";
+    };
+    version = "0.8.0";
+  };
   icalendar = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -1792,6 +1891,17 @@
     };
     version = "0.2.3";
   };
+  invisible_captcha = {
+    dependencies = ["rails"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "15510dh1vh7l2xs2a4956nhxpnf10168r62i497nmcbyqpp1df88";
+      type = "gem";
+    };
+    version = "0.12.1";
+  };
   ipaddress = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -1814,19 +1924,21 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1zz27z88qznix4r65gd9h56gl177snlfpgv10b0s69vi8qpl909l";
+      sha256 = "1930v0chc1q4fr7hn0y1j34mw0v032a8kh0by4d4sbz8ksy056kf";
       type = "gem";
     };
-    version = "1.5.2";
+    version = "1.5.3";
   };
   jira-ruby = {
-    dependencies = ["activesupport" "multipart-post" "oauth"];
+    dependencies = ["activesupport" "atlassian-jwt" "multipart-post" "oauth"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "14019mliqwcppj6qp2wdhh5gbvs2yh2idibag13m9a18ag965bhw";
+      sha256 = "0hb3645x0p3bkmqcgc9b2q4b5kn02wgmb03brx7ag1h5y79an4q5";
       type = "gem";
     };
-    version = "1.4.1";
+    version = "1.7.1";
   };
   jmespath = {
     source = {
@@ -1932,23 +2044,36 @@
     version = "1.17.0";
   };
   kramdown = {
-    groups = ["default" "development" "test"];
+    groups = ["default" "development"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1n1c4jmrh5ig8iv1rw81s4mw4xsp4v97hvf8zkigv4hn5h542qjq";
+      sha256 = "1dl840bvx8d9nq6lg3mxqyvbiqnr6lk3jfsm6r8zhz7p5srmd688";
       type = "gem";
     };
-    version = "1.17.0";
+    version = "2.1.0";
+  };
+  kramdown-parser-gfm = {
+    dependencies = ["kramdown"];
+    groups = ["default" "development"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0a8pb3v951f4x7h968rqfsa19c8arz21zw1vaj42jza22rap8fgv";
+      type = "gem";
+    };
+    version = "1.1.0";
   };
   kubeclient = {
     dependencies = ["http" "recursive-open-struct" "rest-client"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "10761kwhgclnf2lrdjspmxnw90z7i0l85inranfxc688ing0d5xn";
+      sha256 = "0gj6z90p3nm43bafbp97b78zi764gy88590g2y4lm8zcgk8k586r";
       type = "gem";
     };
-    version = "4.2.2";
+    version = "4.4.0";
   };
   launchy = {
     dependencies = ["addressable"];
@@ -2053,17 +2178,6 @@
     };
     version = "0.3.3";
   };
-  mdl = {
-    dependencies = ["kramdown" "mixlib-cli" "mixlib-config"];
-    groups = ["development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "047hp8z1ma630wp38bm1giklkf385rp6wly8aidn825q831w2g4i";
-      type = "gem";
-    };
-    version = "0.5.0";
-  };
   memoist = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -2127,12 +2241,14 @@
     version = "0.3.2";
   };
   mini_magick = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1djxfs9rxw6q6vr6wb4ndxhp1vj1zbwb55s1kf6mz9bzgmswqg0n";
+      sha256 = "0qy09qrd5bwh8mkbj514n5vcw9ni73218h9s3zmvbpmdwrnzi8j4";
       type = "gem";
     };
-    version = "4.8.0";
+    version = "4.9.5";
   };
   mini_mime = {
     source = {
@@ -2158,36 +2274,15 @@
     };
     version = "5.11.3";
   };
-  mixlib-cli = {
-    groups = ["default" "development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0647msh7kp7lzyf6m72g6snpirvhimjm22qb8xgv9pdhbcrmcccp";
-      type = "gem";
-    };
-    version = "1.7.0";
-  };
-  mixlib-config = {
-    dependencies = ["tomlrb"];
-    groups = ["default" "development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1gm6yj9cbbgsl9x4xqxga0vz5w0ksq2jnq1wj8hvgm5c4wfcrswb";
-      type = "gem";
-    };
-    version = "2.2.18";
-  };
   msgpack = {
-    groups = ["default" "development" "test"];
+    groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1w38hilm3dk42dwk8ygiq49bl4in7y80hfqr63hk54mj4gmzi6ch";
+      sha256 = "1186lhwnxiw5ryv6dbxrsfy0fajfll2l95kf9pmca50iyiqi86zn";
       type = "gem";
     };
-    version = "1.2.10";
+    version = "1.3.0";
   };
   multi_json = {
     source = {
@@ -2213,6 +2308,16 @@
     };
     version = "2.0.0";
   };
+  murmurhash3 = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1szwcm44z5jg1l4dq73zyjw4rjin23ihkhrw5cpcjrb6cg8hd3y7";
+      type = "gem";
+    };
+    version = "0.1.6";
+  };
   mustermann = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -2230,21 +2335,23 @@
     };
     version = "1.0.0";
   };
-  mysql2 = {
+  nakayoshi_fork = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0qjd97w6a0w9aldsrhb2y6jrc4wnnlbj5j8kcl7pp7vviwa0r5iq";
+      sha256 = "1mj5czi7rxxmfq4v9qjz74lcqypvnjxhxqfs71zhb2rsfa97a6jg";
       type = "gem";
     };
-    version = "0.4.10";
+    version = "0.0.4";
   };
-  nakayoshi_fork = {
+  nap = {
+    groups = ["default" "development"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1mj5czi7rxxmfq4v9qjz74lcqypvnjxhxqfs71zhb2rsfa97a6jg";
+      sha256 = "0xm5xssxk5s03wjarpipfm39qmgxsalb46v1prsis14x1xk935ll";
       type = "gem";
     };
-    version = "0.0.4";
+    version = "1.1.0";
   };
   net-dns = {
     source = {
@@ -2296,16 +2403,26 @@
     };
     version = "2.3.1";
   };
+  no_proxy_fix = {
+    groups = ["default" "development"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "006dmdb640v1kq0sll3dnlwj1b0kpf3i1p27ygyffv8lpcqlr6sf";
+      type = "gem";
+    };
+    version = "0.1.2";
+  };
   nokogiri = {
     dependencies = ["mini_portile2"];
-    groups = ["default" "development" "mysql" "postgres" "test"];
+    groups = ["default" "development" "test"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "02bjydih0j515szfv9mls195cvpyidh6ixm7dwbl3s2sbaxxk5s4";
+      sha256 = "0nmdrqqz1gs0fwkgzxjl4wr554gr8dc1fkrqjc2jpsvwgm41rygv";
       type = "gem";
     };
-    version = "1.10.3";
+    version = "1.10.4";
   };
   nokogumbo = {
     dependencies = ["nokogiri"];
@@ -2545,6 +2662,16 @@
     };
     version = "0.3.1";
   };
+  open4 = {
+    groups = ["default" "development"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1cgls3f9dlrpil846q0w7h66vsc33jqn84nql4gcqkk221rh7px1";
+      type = "gem";
+    };
+    version = "1.3.4";
+  };
   openid_connect = {
     dependencies = ["activemodel" "attr_required" "json-jwt" "rack-oauth2" "swd" "tzinfo" "validate_email" "validate_url" "webfinger"];
     groups = ["default"];
@@ -2628,60 +2755,6 @@
     };
     version = "1.8.2";
   };
-  peek = {
-    dependencies = ["concurrent-ruby" "concurrent-ruby-ext" "railties"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1998vcsli215d6qrn9821gr2qip60xki2p7n2dpn8i1n68hyshcn";
-      type = "gem";
-    };
-    version = "1.0.1";
-  };
-  peek-gc = {
-    dependencies = ["peek"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "094h3mr9q8wzbqsj0girpyjvj4bcxax8m438igp42n75xv0bhwi9";
-      type = "gem";
-    };
-    version = "0.0.2";
-  };
-  peek-mysql2 = {
-    dependencies = ["concurrent-ruby" "concurrent-ruby-ext" "mysql2" "peek"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0avmwm3yw0kx0z8gh4cpqj79jb5aicd0h3yzrcdfpzwks56h1k9z";
-      type = "gem";
-    };
-    version = "1.2.0";
-  };
-  peek-pg = {
-    dependencies = ["concurrent-ruby" "concurrent-ruby-ext" "peek" "pg"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "17yk8xrh7yh57wg6vi3s8km9qd9f910n94r511mdyqd7aizlfb7c";
-      type = "gem";
-    };
-    version = "1.3.0";
-  };
-  peek-rblineprof = {
-    dependencies = ["peek" "rblineprof"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0ywk1gvsnhrkhqq2ibwsg7099kg5m2vs4nmzy0wf65kb0ywl0m9c";
-      type = "gem";
-    };
-    version = "0.2.0";
-  };
-  peek-redis = {
-    dependencies = ["atomic" "peek" "redis"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0v91cni591d9wdrmvgam20gr3504x84mh1l95da4rz5a9436jm33";
-      type = "gem";
-    };
-    version = "1.2.0";
-  };
   pg = {
     groups = ["development" "postgres" "test"];
     platforms = [];
@@ -2741,10 +2814,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "01f1zkpi7qsmgmk17fpq6ck7jn64sa9afsq20vc5k9f6mpyqkncd";
+      sha256 = "0immyg4as0isyj2dcjf44n0avg1jv5kx1qk0asrgb5ayzwmjqg1k";
       type = "gem";
     };
-    version = "0.9.8";
+    version = "0.9.10";
   };
   pry = {
     dependencies = ["coderay" "method_source"];
@@ -2933,12 +3006,14 @@
   };
   rails-html-sanitizer = {
     dependencies = ["loofah"];
+    groups = ["default" "development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1gv7vr5d9g2xmgpjfq4nxsqr70r9pr042r9ycqqnfvw5cz9c7jwr";
+      sha256 = "0ilwxzm3a7bql5c9q2n9g9nb1hax7vd8d65a5yp3d967ld97nvrq";
       type = "gem";
     };
-    version = "1.0.4";
+    version = "1.2.0";
   };
   rails-i18n = {
     dependencies = ["i18n" "railties"];
@@ -3063,12 +3138,14 @@
     version = "4.3.2";
   };
   redis = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0i415x8gi0c5vsiy6ikvx5js6fhc4x80a5lqv8iidy2iymd20irv";
+      sha256 = "1mymdx7s5sr4mablklaipz679ckczsiigswm1g2v5mc93yj5amw3";
       type = "gem";
     };
-    version = "3.3.5";
+    version = "4.1.2";
   };
   redis-actionpack = {
     dependencies = ["actionpack" "redis-rack" "redis-store"];
@@ -3081,12 +3158,14 @@
   };
   redis-activesupport = {
     dependencies = ["activesupport" "redis-store"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0rq5dhrzc1l8c7f5gx9r7mvnsk5206dfwih3yv5si5rf42nx2ay5";
+      sha256 = "0y1df62gpqgy0yrlmgl05rp4kb0xvn0kylprhv1k32bs33dgpv62";
       type = "gem";
     };
-    version = "5.0.4";
+    version = "5.0.7";
   };
   redis-namespace = {
     dependencies = ["redis"];
@@ -3099,12 +3178,14 @@
   };
   redis-rack = {
     dependencies = ["rack" "redis-store"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0px0wv8zripc6lrn3k0k61j6nlxda145q8sz50yvnig17wlk36gb";
+      sha256 = "03xgdmq4fh187aqlh8z05idbxrmgddcarlb8x1kw4wjfcsf5afqi";
       type = "gem";
     };
-    version = "2.0.4";
+    version = "2.0.5";
   };
   redis-rails = {
     dependencies = ["redis-actionpack" "redis-activesupport" "redis-store"];
@@ -3206,10 +3287,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0yfhazlhjc4abgzhkgq8zqmdphvkh52211widkl4zhsbhqh8wg2q";
+      sha256 = "0pv628bqalippv8vjs3003qpl3zab9g44vqzydgcwxd628r5k9sv";
       type = "gem";
     };
-    version = "3.5.1";
+    version = "3.7.0";
   };
   rqrcode = {
     dependencies = ["chunky_png"];
@@ -3401,22 +3482,24 @@
     version = "0.2.1";
   };
   ruby-prof = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "02z4lh1iv1d8751a1l6r4hfc9mp61gf80g4qc4l6gbync3j3hf2c";
+      sha256 = "0ac3mv3x468s820f6wnp5whzl59y5844wmdjg47a8mbp0kkmnn58";
       type = "gem";
     };
-    version = "0.17.0";
+    version = "1.0.0";
   };
   ruby-progressbar = {
     groups = ["default" "development" "test"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1cv2ym3rl09svw8940ny67bav7b2db4ms39i4raaqzkf59jmhglk";
+      sha256 = "1k77i0d4wsn23ggdd2msrcwfy0i376cglfqypkk2q77r2l3408zf";
       type = "gem";
     };
-    version = "1.10.0";
+    version = "1.10.1";
   };
   ruby-saml = {
     dependencies = ["nokogiri"];
@@ -3467,10 +3550,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1yiszpz6y13vvgh3fss1l0ipp0zgsbbc8c28vynnpdyx1sy6krp6";
+      sha256 = "03w3k7j27kgzpcc3halkd3w0b677sny2lfwm2lwn2n1ac20dzjc6";
       type = "gem";
     };
-    version = "0.28.1";
+    version = "0.28.3.1";
   };
   safe_yaml = {
     source = {
@@ -3596,15 +3679,6 @@
     };
     version = "4.12.0";
   };
-  sham_rack = {
-    dependencies = ["rack"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0zs6hpgg87x5jrykjxgfp2i7m5aja53s5kamdhxam16wki1hid3i";
-      type = "gem";
-    };
-    version = "1.3.6";
-  };
   shoulda-matchers = {
     dependencies = ["activesupport"];
     groups = ["test"];
@@ -3674,6 +3748,16 @@
     };
     version = "0.10.2";
   };
+  sixarm_ruby_unaccent = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "11237b8r8p7fc0cpn04v9wa7ggzq0xm6flh10h1lnb6zgc3schq0";
+      type = "gem";
+    };
+    version = "1.2.0";
+  };
   slack-notifier = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -3817,6 +3901,17 @@
     };
     version = "0.8.1";
   };
+  terminal-table = {
+    dependencies = ["unicode-display_width"];
+    groups = ["default" "development"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1512cngw35hsmhvw4c05rscihc59mnj09m249sm9p3pik831ydqk";
+      type = "gem";
+    };
+    version = "1.8.0";
+  };
   test-prof = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -3910,16 +4005,6 @@
     };
     version = "1.0.0";
   };
-  tomlrb = {
-    groups = ["default" "development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0g28ssfal6vry3cmhy509ba3vi5d5aggz1gnffnvvmc8ml8vkpiv";
-      type = "gem";
-    };
-    version = "1.2.8";
-  };
   truncato = {
     dependencies = ["htmlentities" "nokogiri"];
     source = {
@@ -3990,6 +4075,16 @@
     };
     version = "1.6.0";
   };
+  unicode_utils = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0h1a5yvrxzlf0lxxa1ya31jcizslf774arnsd89vgdhk4g7x08mr";
+      type = "gem";
+    };
+    version = "1.4.0";
+  };
   unicorn = {
     dependencies = ["kgio" "raindrops"];
     source = {
@@ -4016,6 +4111,17 @@
     };
     version = "1.10.0";
   };
+  unleash = {
+    dependencies = ["murmurhash3"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0xs2ml9cwskddsxick3a9wnasy7q6wmc0dbydfcaspfl2cjmp1rk";
+      type = "gem";
+    };
+    version = "0.1.5";
+  };
   unparser = {
     dependencies = ["abstract_type" "adamantium" "concord" "diff-lcs" "equalizer" "parser" "procto"];
     groups = ["default" "development" "test"];
diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py
index 650bd73aa84..a14ef572b17 100755
--- a/pkgs/applications/version-management/gitlab/update.py
+++ b/pkgs/applications/version-management/gitlab/update.py
@@ -55,8 +55,8 @@ class GitLabRepo:
         :param arch: amd64
         :return: url of the debian package
         """
-        if self.owner != "gitlab-org" or self.repo not in ['gitlab-ce', 'gitlab-ee']:
-            raise Exception(f"don't know how to get deb_url for {self.url}")
+        if flavour not in ['ce', 'ee']:
+            raise Exception(f"don't know how to get deb_url for flavour {flavour}")
         return f"https://packages.gitlab.com/gitlab/gitlab-{flavour}/packages" + \
                f"/debian/stretch/gitlab-{flavour}_{version}-{flavour}.0_{arch}.deb/download.deb"
 
@@ -106,7 +106,10 @@ def _flavour2gitlabrepo(flavour: str):
         raise Exception(f"unknown gitlab flavour: {flavour}, needs to be ce or ee")
 
     owner = 'gitlab-org'
-    repo = 'gitlab-' + flavour
+    if flavour == 'ce':
+        repo = 'gitlab-foss'
+    else:
+        repo = 'gitlab'
 
     return GitLabRepo(owner, repo)
 
@@ -209,12 +212,8 @@ def update_gitaly():
 
     for fn in ['go.mod', 'go.sum']:
         os.unlink(gitaly_dir / fn)
-    # currently broken, as `gitaly.meta.position` returns
-    # pkgs/development/go-modules/generic/default.nix
-    # so update-source-version doesn't know where to update hashes
-    # _call_update_source_version('gitaly', gitaly_server_version)
-    gitaly_hash = r.get_git_hash(f"v{gitaly_server_version}")
-    click.echo(f"Please update gitaly/default.nix to version {gitaly_server_version} and hash {gitaly_hash}")
+
+    _call_update_source_version('gitaly', gitaly_server_version)
 
 
 @cli.command('update-gitlab-shell')
@@ -224,14 +223,42 @@ def update_gitlab_shell():
     gitlab_shell_version = data['ce']['passthru']['GITLAB_SHELL_VERSION']
     _call_update_source_version('gitlab-shell', gitlab_shell_version)
 
+    r = GitLabRepo('gitlab-org', 'gitlab-shell')
+    gitlab_shell_dir = pathlib.Path(__file__).parent / 'gitlab-shell'
+
+    for fn in ['Gemfile.lock', 'Gemfile']:
+        with open(gitlab_shell_dir / fn, 'w') as f:
+            f.write(r.get_file(fn, f"v{gitlab_shell_version}"))
+
+    for fn in ['go.mod', 'go.sum']:
+        with open(gitlab_shell_dir / fn, 'w') as f:
+            f.write(r.get_file(f"go/{fn}", f"v{gitlab_shell_version}"))
+
+    subprocess.check_output(['bundix'], cwd=gitlab_shell_dir)
+    subprocess.check_output(['vgo2nix'], cwd=gitlab_shell_dir)
+
+    for fn in ['go.mod', 'go.sum']:
+        os.unlink(gitlab_shell_dir / fn)
+
 
 @cli.command('update-gitlab-workhorse')
 def update_gitlab_workhorse():
-    """Update gitlab-shell"""
+    """Update gitlab-workhorse"""
     data = _get_data_json()
     gitlab_workhorse_version = data['ce']['passthru']['GITLAB_WORKHORSE_VERSION']
     _call_update_source_version('gitlab-workhorse', gitlab_workhorse_version)
 
+    r = GitLabRepo('gitlab-org', 'gitlab-workhorse')
+    gitlab_workhorse_dir = pathlib.Path(__file__).parent / 'gitlab-workhorse'
+
+    for fn in ['go.mod', 'go.sum']:
+        with open(gitlab_workhorse_dir / fn, 'w') as f:
+            f.write(r.get_file(fn, f"v{gitlab_workhorse_version}"))
+
+    subprocess.check_output(['vgo2nix'], cwd=gitlab_workhorse_dir)
+
+    for fn in ['go.mod', 'go.sum']:
+        os.unlink(gitlab_workhorse_dir / fn)
 
 @cli.command('update-all')
 @click.pass_context
-- 
GitLab


From 09e657efea00126b22c3268a318139eee6ba973a Mon Sep 17 00:00:00 2001
From: talyz <kim.lindberger@gmail.com>
Date: Wed, 2 Oct 2019 16:44:55 +0200
Subject: [PATCH 1955/2254] gitlab-shell: Split patch into ruby and go parts

Split the remove-hardcoded-locations patch into two separate patches,
one for the ruby package and one for the go package. This is clearer
and results in fewer rebuilds.
---
 .../gitlab/gitlab-shell/default.nix           |  6 ++--
 ...ch => remove-hardcoded-locations-go.patch} | 29 +------------------
 .../remove-hardcoded-locations-ruby.patch     | 27 +++++++++++++++++
 3 files changed, 31 insertions(+), 31 deletions(-)
 rename pkgs/applications/version-management/gitlab/gitlab-shell/{remove-hardcoded-locations.patch => remove-hardcoded-locations-go.patch} (51%)
 create mode 100644 pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations-ruby.patch

diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
index 3022aeac14e..bb406d66449 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
@@ -17,7 +17,7 @@ let
     pname = "gitlab-shell-go";
     inherit src version;
 
-    patches = [ ./remove-hardcoded-locations.patch ];
+    patches = [ ./remove-hardcoded-locations-go.patch ];
 
     goPackagePath = "gitlab.com/gitlab-org/gitlab-shell";
     goDeps = ./deps.nix;
@@ -36,8 +36,8 @@ in
 stdenv.mkDerivation {
   pname = "gitlab-shell";
   inherit src version;
-  
-  patches = [ ./remove-hardcoded-locations.patch ];
+
+  patches = [ ./remove-hardcoded-locations-ruby.patch ];
 
   # gitlab-shell will try to read its config relative to the source
   # code by default which doesn't work in nixos because it's a
diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations-go.patch
similarity index 51%
rename from pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch
rename to pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations-go.patch
index ef3604d8c0d..a4a1a979b24 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch
+++ b/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations-go.patch
@@ -10,7 +10,7 @@ index f951fe6..b422fe3 100644
  	"path"
  	"strings"
  
-@@ -30,16 +29,13 @@ type Config struct {
+@@ -44,16 +43,13 @@ type Config struct {
  }
  
  func New() (*Config, error) {
@@ -29,33 +29,6 @@ index f951fe6..b422fe3 100644
  }
  
  func (c *Config) FeatureEnabled(featureName string) bool {
-diff --git a/lib/gitlab_keys.rb b/lib/gitlab_keys.rb
-index 0600a18..c46f2d7 100644
---- a/lib/gitlab_keys.rb
-+++ b/lib/gitlab_keys.rb
-@@ -10,7 +10,7 @@ class GitlabKeys # rubocop:disable Metrics/ClassLength
-   attr_accessor :auth_file, :key
- 
-   def self.command(whatever)
--    "#{ROOT_PATH}/bin/gitlab-shell #{whatever}"
-+    "/run/current-system/sw/bin/gitlab-shell #{whatever}"
-   end
- 
-   def self.command_key(key_id)
-diff --git a/lib/gitlab_shell.rb b/lib/gitlab_shell.rb
-index 2cb76a8..f59ad5e 100644
---- a/lib/gitlab_shell.rb
-+++ b/lib/gitlab_shell.rb
-@@ -190,7 +190,8 @@ class GitlabShell # rubocop:disable Metrics/ClassLength
- 
-     args = [executable, gitaly_address, json_args]
-     # We use 'chdir: ROOT_PATH' to let the next executable know where config.yml is.
--    Kernel.exec(env, *args, unsetenv_others: true, chdir: ROOT_PATH)
-+    # Except we don't, because we're already in the right directory on nixos!
-+    Kernel.exec(env, *args, unsetenv_others: true)
-   end
- 
-   def api
 diff --git a/go/internal/command/fallback/fallback.go b/go/internal/command/fallback/fallback.go
 index 2cb76a8..f59ad5e 100644
 --- a/go/internal/command/fallback/fallback.go
diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations-ruby.patch b/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations-ruby.patch
new file mode 100644
index 00000000000..64623ae310c
--- /dev/null
+++ b/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations-ruby.patch
@@ -0,0 +1,27 @@
+diff --git a/lib/gitlab_keys.rb b/lib/gitlab_keys.rb
+index 0600a18..c46f2d7 100644
+--- a/lib/gitlab_keys.rb
++++ b/lib/gitlab_keys.rb
+@@ -2,7 +2,7 @@ class GitlabKeys # rubocop:disable Metrics/ClassLength
+   attr_accessor :auth_file, :key
+ 
+   def self.command(whatever)
+-    "#{ROOT_PATH}/bin/gitlab-shell #{whatever}"
++    "/run/current-system/sw/bin/gitlab-shell #{whatever}"
+   end
+ 
+   def self.command_key(key_id)
+diff --git a/lib/gitlab_shell.rb b/lib/gitlab_shell.rb
+index 2cb76a8..f59ad5e 100644
+--- a/lib/gitlab_shell.rb
++++ b/lib/gitlab_shell.rb
+@@ -195,7 +195,8 @@ class GitlabShell # rubocop:disable Metrics/ClassLength
+ 
+     args = [executable, gitaly_address, json_args]
+     # We use 'chdir: ROOT_PATH' to let the next executable know where config.yml is.
+-    Kernel.exec(env, *args, unsetenv_others: true, chdir: ROOT_PATH)
++    # Except we don't, because we're already in the right directory on nixos!
++    Kernel.exec(env, *args, unsetenv_others: true)
+   end
+ 
+   def api
-- 
GitLab


From 47723057e5ec5cf704e3099d78e0eb15fad200f9 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 4 Oct 2019 17:50:55 +0200
Subject: [PATCH 1956/2254] xtreemfs: fix build with openssl-1.1

---
 pkgs/tools/filesystems/xtreemfs/default.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/xtreemfs/default.nix b/pkgs/tools/filesystems/xtreemfs/default.nix
index 436037245bb..d8d41450079 100644
--- a/pkgs/tools/filesystems/xtreemfs/default.nix
+++ b/pkgs/tools/filesystems/xtreemfs/default.nix
@@ -1,5 +1,5 @@
 { stdenv, boost, fuse, openssl, cmake, attr, jdk, ant, which, file, python
-, lib, valgrind, makeWrapper, fetchFromGitHub }:
+, lib, valgrind, makeWrapper, fetchFromGitHub, fetchpatch }:
 
 stdenv.mkDerivation {
   src = fetchFromGitHub {
@@ -15,6 +15,14 @@ stdenv.mkDerivation {
 
   buildInputs = [ which attr makeWrapper python ];
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/xtreemfs/xtreemfs/commit/ebfdc2fff56c09f310159d92026883941e42a953.patch";
+      sha256 = "075w00ad88qm6xpm5679m0gfzkrc53w17sk7ycybf4hzxjs29ygy";
+      name = "xtreemfs-fix-for-openssl_1_1";
+    })
+  ];
+
   preConfigure = ''
     export JAVA_HOME=${jdk}
     export ANT_HOME=${ant}
@@ -66,6 +74,5 @@ stdenv.mkDerivation {
     maintainers = with lib.maintainers; [ raskin matejc ];
     platforms = lib.platforms.linux;
     license = lib.licenses.bsd3;
-    broken = true;  # does not support openssl 1.1
   };
 }
-- 
GitLab


From 4a815f4a591f1e5819f08c5134f36c5710e00c36 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 19:39:03 -0700
Subject: [PATCH 1957/2254] rabbitmq-server: 3.7.17 -> 3.7.18

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/rabbitmq-server/versions
---
 pkgs/servers/amqp/rabbitmq-server/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix
index 14a0df25747..da60a122a4c 100644
--- a/pkgs/servers/amqp/rabbitmq-server/default.nix
+++ b/pkgs/servers/amqp/rabbitmq-server/default.nix
@@ -6,12 +6,12 @@
 stdenv.mkDerivation rec {
   pname = "rabbitmq-server";
 
-  version = "3.7.17";
+  version = "3.7.18";
 
   # when updating, consider bumping elixir version in all-packages.nix
   src = fetchurl {
     url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz";
-    sha256 = "1ychgvjbi6ikapfcp4rgwa0vihhs1f34c2advb7833jym8alazrr";
+    sha256 = "1vzx9g2k7ynbv2gz450cwjyxcn3vcxsmlpnvq1r5wzcf25giy9ky";
   };
 
   buildInputs =
-- 
GitLab


From 1097c03a663017ac61ba1c11f295d711d64ebcfb Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 4 Oct 2019 22:13:20 +0300
Subject: [PATCH 1958/2254] cpp-utilities: 5.0.0 -> 5.0.1 (#70396)

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

diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix
index c7f94945570..82e09c33a55 100644
--- a/pkgs/development/libraries/cpp-utilities/default.nix
+++ b/pkgs/development/libraries/cpp-utilities/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cpp-utilities";
-  version = "5.0.0";
+  version = "5.0.1";
 
   src = fetchFromGitHub {
     owner = "Martchus";
     repo = pname;
     rev = "v${version}";
-    sha256 = "031kiawmrp40sqgd9g5qd82ljglcm9xvynicsn4n8n4ngfgbnc0m";
+    sha256 = "11wm7z4ldsja2x2m2dkj3xhiammkwfqgbgkwq9gssnv14803fhnv";
   };
 
   nativeBuildInputs = [ cmake ];
-- 
GitLab


From 922de4f4b54858a4938a5593d50b5a5eecd47712 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sat, 28 Sep 2019 16:31:39 +0300
Subject: [PATCH 1959/2254] luaPackages.pulseaudio: init at 0.1

---
 maintainers/scripts/luarocks-packages.csv |  1 +
 pkgs/top-level/lua-packages.nix           | 33 +++++++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv
index a6fbcd5a0be..a13bd22916a 100644
--- a/maintainers/scripts/luarocks-packages.csv
+++ b/maintainers/scripts/luarocks-packages.csv
@@ -68,3 +68,4 @@ say,,,,,
 std__debug,std._debug,,,,
 std_normalize,std.normalize,,,,
 stdlib,,,,,vyp
+pulseaudio,,,,,doronbehar
diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index c9e9305666e..2fb09981c9a 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -132,6 +132,39 @@ with self; {
     };
   };
 
+  pulseaudio = buildLuaPackage rec {
+    pname = "pulseaudio";
+    version = "0.1";
+    name = "pulseaudio-${version}";
+
+    src = fetchFromGitHub {
+      owner = "doronbehar";
+      repo = "lua-pulseaudio";
+      rev = "v${version}";
+      sha256 = "0vldm34m3ysgn8gvwfdglpw4jl5680fvfay7pzs14gzkzcvgv25b";
+    };
+    disabled = (luaOlder "5.1") || (luaAtLeast "5.5");
+    buildInputs = [ pkgs.libpulseaudio ];
+    propagatedBuildInputs = [ lua ];
+    nativeBuildInputs = [ pkgs.pulseaudio pkgconfig ];
+
+    makeFlags = [
+      "INST_LIBDIR=${placeholder "out"}/lib/lua/${lua.luaversion}"
+      "INST_LUADIR=${placeholder "out"}/share/lua/${lua.luaversion}"
+      "LUA_BINDIR=${placeholder "out"}/bin"
+    ];
+    preBuild = ''
+      mkdir -p ${placeholder "out"}/lib/lua/${lua.luaversion}
+    '';
+
+    meta = with stdenv.lib; {
+      homepage = "https://github.com/doronbehar/lua-pulseaudio";
+      description = "Libpulse Lua bindings";
+      maintainers = with maintainers; [ doronbehar ];
+      license = licenses.lgpl21;
+    };
+  };
+
   vicious = toLuaModule(stdenv.mkDerivation rec {
     pname = "vicious";
     version = "2.3.1";
-- 
GitLab


From c1b1270255702e6314a50f44d2d287f4a2107222 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 4 Oct 2019 21:03:36 +0200
Subject: [PATCH 1960/2254] tdesktop: 1.8.9 -> 1.8.13

---
 .../telegram/tdesktop/default.nix             | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 9319d8b0f5b..0aec91c853a 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -8,7 +8,7 @@ with lib;
 
 mkDerivation rec {
   pname = "telegram-desktop";
-  version = "1.8.9";
+  version = "1.8.13";
   # Note: Due to our strong dependency on the Arch patches it's probably best
   # to also wait for the Arch update (especially if the patches don't apply).
 
@@ -17,7 +17,7 @@ mkDerivation rec {
     owner = "telegramdesktop";
     repo = "tdesktop";
     rev = "v${version}";
-    sha256 = "0b1c903ah3fhxr9qjg23p8x9k895k3cxkzz5ckcr7r4pmmbnnvkp";
+    sha256 = "19p4cjzk7jyhrd4sd8dq1r1zksff23zyg5rh5vlr3kqd372bffzz";
     fetchSubmodules = true;
   };
 
@@ -25,8 +25,8 @@ mkDerivation rec {
   archPatches = fetchsvn {
     url = "svn://svn.archlinux.org/community/telegram-desktop/trunk";
     # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk
-    rev = "509240";
-    sha256 = "1sf4mspbsqsnjzp9ys9l0asrx1bhj273d163i2bv1zhl4mmgpl3k";
+    rev = "512849";
+    sha256 = "1hl7znvv6qr4cwpkj8wlplpa63i1lhk2iax7hb4l1s1a4mijx9ls";
   };
   privateHeadersPatch = fetchpatch {
     url = "https://github.com/telegramdesktop/tdesktop/commit/b9d3ba621eb8af638af46c6b3cfd7a8330bf0dd5.patch";
@@ -38,8 +38,10 @@ mkDerivation rec {
   patches = [
     "${archPatches}/tdesktop.patch"
     "${archPatches}/no-gtk2.patch"
-    # "${archPatches}/Use-system-wide-font.patch"
+    "${archPatches}/Revert-Disable-DemiBold-fallback-for-Semibold.patch"
     "${archPatches}/tdesktop_lottie_animation_qtdebug.patch"
+    # "${archPatches}/Revert-Change-some-private-header-includes.patch"
+    # "${archPatches}/Use-system-wide-font.patch"
   ];
 
   postPatch = ''
@@ -87,7 +89,6 @@ mkDerivation rec {
 
   preConfigure = ''
     # Patches to revert:
-    patch -R -Np1 -i "${archPatches}/demibold.patch"
     patch -R -Np1 -i "${privateHeadersPatch}"
 
     # Patches to apply:
@@ -98,17 +99,17 @@ mkDerivation rec {
     # disable static-qt for rlottie
     sed "/RLOTTIE_WITH_STATIC_QT/d" -i "Telegram/gyp/lib_rlottie.gyp"
 
-    sed -i Telegram/gyp/telegram_linux.gypi \
+    sed -i Telegram/gyp/telegram/linux.gypi \
       -e 's,/usr,/does-not-exist,g' \
       -e 's,appindicator-0.1,appindicator3-0.1,g' \
       -e 's,-flto,,g'
 
-    sed -i Telegram/gyp/qt.gypi \
+    sed -i Telegram/gyp/modules/qt.gypi \
       -e "s,/usr/include/qt/QtCore/,${qtbase.dev}/include/QtCore/,g" \
       -e 's,\d+",\d+" | head -n1,g'
-    sed -i Telegram/gyp/qt_moc.gypi \
+    sed -i Telegram/gyp/modules/qt_moc.gypi \
       -e "s,/usr/bin/moc,moc,g"
-    sed -i Telegram/gyp/qt_rcc.gypi \
+    sed -i Telegram/gyp/modules/qt_rcc.gypi \
       -e "s,/usr/bin/rcc,rcc,g"
 
     # Build system assumes x86, but it works fine on non-x86 if we patch this one flag out
-- 
GitLab


From 1038822c3037bbd77aa067dda0ce607237b506fa Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 4 Oct 2019 21:33:25 +0200
Subject: [PATCH 1961/2254] range-v3: 0.5.0 -> 0.9.1

Was too outdated for tdesktop:

/build/source/Telegram/SourceFiles/ui/image/image_prepare.cpp: In function 'QImage Images::BlurLargeImage(QImage, int)':
/build/source/Telegram/SourceFiles/ui/image/image_prepare.cpp:265:81: error: expected primary-expression before ')' token
  265 |  for (auto &&[value, index] : ranges::view::zip(dvs, ints(0, ranges::unreachable))) {
      |                                                                                 ^
---
 pkgs/development/libraries/range-v3/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/range-v3/default.nix b/pkgs/development/libraries/range-v3/default.nix
index e02b22af756..f02093001e4 100644
--- a/pkgs/development/libraries/range-v3/default.nix
+++ b/pkgs/development/libraries/range-v3/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "range-v3";
-  version = "0.5.0";
+  version = "0.9.1";
 
   src = fetchFromGitHub {
     owner = "ericniebler";
     repo = "range-v3";
     rev = version;
-    sha256 = "0fzbpaa4vwlivi417zxm1d6v4lkp5c9f5bd706nn2fmw3zxjj815";
+    sha256 = "0qga2fnfrlrzrvnnk1z1plpmvcr8b4c75g5xz0jv0sav0kmq5zwn";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -23,6 +23,6 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/ericniebler/range-v3;
     license = licenses.boost;
     platforms = platforms.all;
-    maintainers = with maintainers; [ xwvvvvwx ];
+    maintainers = with maintainers; [ primeos xwvvvvwx ];
   };
 }
-- 
GitLab


From 8385e4d2074f53c4f594f2d9af792d0efda2115e Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 4 Oct 2019 04:20:00 -0500
Subject: [PATCH 1962/2254] shadowenv: init at 1.2.1

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

diff --git a/pkgs/tools/misc/shadowenv/default.nix b/pkgs/tools/misc/shadowenv/default.nix
new file mode 100644
index 00000000000..6638a50931d
--- /dev/null
+++ b/pkgs/tools/misc/shadowenv/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, rustPlatform, Security }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "shadowenv";
+  version = "1.2.1";
+
+  src = fetchFromGitHub {
+    owner = "Shopify";
+    repo = pname;
+    rev = version;
+    sha256 = "01hhh45h742z9mjcpmyjpbjf90a5b1m58b6nml2han149xpn5b74";
+  };
+
+  cargoSha256 = "0r8s20xgcp5d1ac07g5g4lrrnhrn2qsr1kgj13h2csly22j0ca2a";
+
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://shopify.github.io/shadowenv/";
+    description = "reversible directory-local environment variable manipulations";
+    license = licenses.mit;
+    maintainers = [ maintainers.marsam ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 65e455b13d4..a82bc66bb99 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10064,6 +10064,10 @@ in
 
   scss-lint = callPackage ../development/tools/scss-lint { };
 
+  shadowenv = callPackage ../tools/misc/shadowenv {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
+
   shake = haskell.lib.justStaticExecutables haskellPackages.shake;
 
   shallot = callPackage ../tools/misc/shallot { };
-- 
GitLab


From 1442f704f507a1a63002e888ae8b9fa07cd8c211 Mon Sep 17 00:00:00 2001
From: David Wood <david@davidtw.co>
Date: Fri, 4 Oct 2019 12:02:29 +0100
Subject: [PATCH 1963/2254] starship: 0.19.0 -> 0.20.1

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

diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix
index 0b1a3f286be..48876c8e387 100644
--- a/pkgs/tools/misc/starship/default.nix
+++ b/pkgs/tools/misc/starship/default.nix
@@ -2,18 +2,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "starship";
-  version = "0.19.0";
+  version = "0.20.1";
 
   src = fetchFromGitHub {
     owner = "starship";
     repo = "starship";
     rev = "v${version}";
-    sha256 = "0cj3r8c583xzraggwl1xb36790czha4dja6c3yvn5f19whmmf2g9";
+    sha256 = "0v6x19rv7i03rp4wmg97yw9wybafpn8r2gb0l6ha3d218vhb71ln";
   };
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ];
 
-  cargoSha256 = "1ldhkys44nkwjm6cmz1x2k5j4n79rqkh6km86hssjps5bzw6niw4";
+  cargoSha256 = "0c82k6aw245vsqkcrg6bhqhylfbxdszcr040mrz7cz9ydxcb58b9";
   checkPhase = "cargo test -- --skip directory::home_directory --skip directory::directory_in_root";
 
   meta = with stdenv.lib; {
-- 
GitLab


From 54393d25d809af6be6b7d6e139d537e4d58297b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Wed, 2 Oct 2019 09:04:51 +0200
Subject: [PATCH 1964/2254] maturin: 0.7.2 -> 0.7.6

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

diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/development/tools/rust/maturin/default.nix
index b152be414da..98a2b0b7e0b 100644
--- a/pkgs/development/tools/rust/maturin/default.nix
+++ b/pkgs/development/tools/rust/maturin/default.nix
@@ -5,16 +5,16 @@ let
   inherit (darwin.apple_sdk.frameworks) Security;
 in rustPlatform.buildRustPackage rec {
   name = "maturin-${version}";
-  version = "0.7.2";
+  version = "0.7.6";
 
   src = fetchFromGitHub {
     owner = "PyO3";
     repo = "maturin";
     rev = "v${version}";
-    sha256 = "180dynm9qy3mliqai4jfwxbg01jdz2a95bfyar880qmp75f35wi8";
+    sha256 = "1siqd8k6grlbj9n1a75jq8px1pzvzpr2ph689g53rjngf1k44zqk";
   };
 
-  cargoSha256 = "1x61kxmbk5mazi3lmzfnixjl584cxkfv16si2smh8d9xhhz6gvpw";
+  cargoSha256 = "18678qzrzj044aj5nvyjn5hvby0i0x23gx26nhcf1nqcjn3fr32l";
 
   nativeBuildInputs = [ pkgconfig ];
 
-- 
GitLab


From 9d04a64a8fb56d46293db91d0afa35d60e09e8ba Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 21 Sep 2019 17:08:00 +0200
Subject: [PATCH 1965/2254] iso-image: add loopback.cfg support to boot iso
 from grub

---
 nixos/modules/installer/cd-dvd/iso-image.nix | 11 +++++++-
 nixos/modules/system/boot/stage-1-init.sh    | 27 ++++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix
index 93c8ebaa249..6595d0f30f9 100644
--- a/nixos/modules/installer/cd-dvd/iso-image.nix
+++ b/nixos/modules/installer/cd-dvd/iso-image.nix
@@ -24,7 +24,7 @@ let
         # Name appended to menuentry defaults to params if no specific name given.
         option.name or (if option ? params then "(${option.params})" else "")
         }' ${if option ? class then " --class ${option.class}" else ""} {
-          linux ${defaults.image} ${defaults.params} ${
+          linux ${defaults.image} \''${isoboot} ${defaults.params} ${
             option.params or ""
           }
           initrd ${defaults.initrd}
@@ -268,6 +268,12 @@ let
     set timeout=10
     ${grubMenuCfg}
 
+    # If the parameter iso_path is set, append the findiso parameter to the kernel
+    # line. We need this to allow the nixos iso to be booted from grub directly.
+    if [ \''${iso_path} ] ; then
+      set isoboot="findiso=\''${iso_path}"
+    fi
+
     #
     # Menu entries
     #
@@ -616,6 +622,9 @@ in
         { source = "${efiDir}/EFI";
           target = "/EFI";
         }
+        { source = pkgs.writeText "loopback.cfg" "source /EFI/boot/grub.cfg";
+          target = "/boot/grub/loopback.cfg";
+        }
       ] ++ optionals (config.boot.loader.grub.memtest86.enable && canx86BiosBoot) [
         { source = "${pkgs.memtest86plus}/memtest.bin";
           target = "/boot/memtest.bin";
diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh
index b817a45deba..f520bf54ad1 100644
--- a/nixos/modules/system/boot/stage-1-init.sh
+++ b/nixos/modules/system/boot/stage-1-init.sh
@@ -183,6 +183,12 @@ for o in $(cat /proc/cmdline); do
         copytoram)
             copytoram=1
             ;;
+        findiso=*)
+            # if an iso name is supplied, try to find the device where
+            # the iso resides on
+            set -- $(IFS==; echo $o)
+            isoPath=$2
+            ;;
     esac
 done
 
@@ -442,6 +448,27 @@ if test -e /sys/power/resume -a -e /sys/power/disk; then
     fi
 fi
 
+# If we have a path to an iso file, find the iso and link it to /dev/root
+if [ -n "$isoPath" ]; then
+  mkdir -p /findiso
+
+  for delay in 5 10; do
+    blkid | while read -r line; do
+      device=$(echo "$line" | sed 's/:.*//')
+      type=$(echo "$line" | sed 's/.*TYPE="\([^"]*\)".*/\1/')
+
+      mount -t "$type" "$device" /findiso
+      if [ -e "/findiso$isoPath" ]; then
+        ln -sf "/findiso$isoPath" /dev/root
+        break 2
+      else
+        umount /findiso
+      fi
+    done
+
+    sleep "$delay"
+  done
+fi
 
 # Try to find and mount the root device.
 mkdir -p $targetRoot
-- 
GitLab


From 419b06b5072247f0b6a981bd2ec55123feaf8af4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 23:52:24 -0700
Subject: [PATCH 1966/2254] teamviewer: 14.5.1691 -> 14.6.2452

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/teamviewer/versions
---
 pkgs/applications/networking/remote/teamviewer/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix
index d9a3d4aefcd..97e561da93b 100644
--- a/pkgs/applications/networking/remote/teamviewer/default.nix
+++ b/pkgs/applications/networking/remote/teamviewer/default.nix
@@ -6,11 +6,11 @@
 
 mkDerivation rec {
   pname = "teamviewer";
-  version = "14.5.1691";
+  version = "14.6.2452";
 
   src = fetchurl {
     url = "https://dl.tvcdn.de/download/linux/version_14x/teamviewer_${version}_amd64.deb";
-    sha256 = "1dzvjyvcqcah6z1dvw4zvmbdn8iks9j2909slbkksavn1rp3akxc";
+    sha256 = "0j677bqwvlczbja9msayqpdgandb2mvyvcr0vasc3hhnmnk70ahw";
   };
 
   unpackPhase = ''
-- 
GitLab


From b1e0c37ee3be8b4180791c1cf0fcfe202a6d21a2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 23:19:19 -0700
Subject: [PATCH 1967/2254] sysvinit: 2.95 -> 2.96

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/sysvinit/versions
---
 pkgs/os-specific/linux/sysvinit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/sysvinit/default.nix b/pkgs/os-specific/linux/sysvinit/default.nix
index a29c6152aaa..e3a8baa7da3 100644
--- a/pkgs/os-specific/linux/sysvinit/default.nix
+++ b/pkgs/os-specific/linux/sysvinit/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, withoutInitTools ? false }:
 
-let version = "2.95"; in
+let version = "2.96"; in
 
 stdenv.mkDerivation {
   name = (if withoutInitTools then "sysvtools" else "sysvinit") + "-" + version;
 
   src = fetchurl {
     url = "mirror://savannah/sysvinit/sysvinit-${version}.tar.xz";
-    sha256 = "1j46dydib9yd2a46w43is9b61lplwrsry46fw7cbmfrn7ywrq0n9";
+    sha256 = "11xmcamvjmrw874zp0vc37hrqc4hz02i0iy8n4xa4dd25avjcbia";
   };
 
   prePatch = ''
-- 
GitLab


From 43fe77c0e85d3394ba029be8d48147c86ba02306 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Sep 2019 17:19:42 -0700
Subject: [PATCH 1968/2254] qownnotes: 19.8.6 -> 19.9.16

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/qownnotes/versions
---
 pkgs/applications/office/qownnotes/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix
index ab32ebc67a7..4845f058f83 100644
--- a/pkgs/applications/office/qownnotes/default.nix
+++ b/pkgs/applications/office/qownnotes/default.nix
@@ -2,13 +2,13 @@
 
 mkDerivation rec {
   pname = "qownnotes";
-  version = "19.8.6";
+  version = "19.9.16";
 
   src = fetchurl {
     url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz";
     # Can grab official version like so:
     # $ curl https://download.tuxfamily.org/qownnotes/src/qownnotes-19.1.8.tar.xz.sha256
-    sha256 = "a242dd15dc484baad39e737fe1af8529411f49a0d74994e6c78cf6bad4b733b6";
+    sha256 = "01ja4a9z87y8wdf1p9pdjdhr2h4hlyf28iqh1wlcapfq8f53zq42";
   };
 
   nativeBuildInputs = [ qmake qttools ];
-- 
GitLab


From fa4b5185b3967c4a8f8806722e886bf3922c0f03 Mon Sep 17 00:00:00 2001
From: Tom Hunger <tehunger@gmail.com>
Date: Sun, 29 Sep 2019 09:54:04 +0100
Subject: [PATCH 1969/2254] pyre: remove

Every other version update of pyre is non-trivial and requires
specific versions which blocks updates elsewhere. Removing now,
we can re-import when pyre has settled down.
---
 pkgs/development/tools/pyre/default.nix       | 137 ------------------
 .../tools/pyre/pyre-bdist-wheel.patch         |  43 ------
 pkgs/top-level/all-packages.nix               |   2 -
 3 files changed, 182 deletions(-)
 delete mode 100644 pkgs/development/tools/pyre/default.nix
 delete mode 100644 pkgs/development/tools/pyre/pyre-bdist-wheel.patch

diff --git a/pkgs/development/tools/pyre/default.nix b/pkgs/development/tools/pyre/default.nix
deleted file mode 100644
index 060875924d8..00000000000
--- a/pkgs/development/tools/pyre/default.nix
+++ /dev/null
@@ -1,137 +0,0 @@
-{ stdenv, fetchFromGitHub, ocamlPackages, writeScript
-, dune, python3, rsync, buck, watchman, sqlite }:
-let
-  # Manually set version - the setup script requires
-  # hg and git + keeping the .git directory around.
-  pyre-version = "0.0.22";  # also change typeshed revision below with $pyre-src/.typeshed-version
-  pyre-src = fetchFromGitHub {
-    owner = "facebook";
-    repo = "pyre-check";
-    rev = "v${pyre-version}";
-    sha256 = "057vy6zmgwsi0ag9n4m6sszhahmfk2s1ywm36nyfs7w4d0wnk92s";
-  };
-  versionFile = writeScript "version.ml" ''
-    cat > "./version.ml" <<EOF
-    open Core
-    let build_info () =
-    "pyre-nixpkgs ${pyre-version}"
-    let version () =
-    "${pyre-version}"
-
-    let log_version_banner () =
-      Log.info "Running as pid: %d" (Pid.to_int (Unix.getpid ()));
-      Log.info "Version: %s" (version ());
-      Log.info "Build info: %s" (build_info ())
-    EOF
-  '';
- pyre-bin = stdenv.mkDerivation {
-  name = "pyre-${pyre-version}";
-
-  src = pyre-src;
-
-  buildInputs = with ocamlPackages; [
-    ocaml
-    findlib
-    menhir
-    yojson
-    core
-    sedlex
-    ppx_deriving_yojson
-    ocamlbuild
-    ppxlib
-    dune
-    ounit
-    base64
-    sqlite.dev
-    # python36Packages.python36Full # TODO
-  ];
-
-  preBuild = ''
-    # build requires HOME to be set
-    export HOME=$TMPDIR
-
-    # "external" because https://github.com/facebook/pyre-check/pull/8/files
-    sed "s/%VERSION%/external/" dune.in > dune
-
-    ln -sf ${versionFile} ./scripts/generate-version-number.sh
-
-    mkdir $(pwd)/build
-    export OCAMLFIND_DESTDIR=$(pwd)/build
-    export OCAMLPATH=$OCAMLPATH:$(pwd)/build
-  '';
-
-  buildFlags = [ "release" ];
-
-  doCheck = true;
-  # ./scripts/run-python-tests.sh # TODO: once typeshed and python bits are added
-
-  # Note that we're not installing the typeshed yet.
-  # Improvement for a future version.
-  installPhase = ''
-    install -D ./_build/default/main.exe $out/bin/pyre.bin
-  '';
-
-  meta = with stdenv.lib; {
-    description = "A performant type-checker for Python 3";
-    homepage = https://pyre-check.org;
-    license = licenses.mit;
-    platforms = ocamlPackages.ocaml.meta.platforms;
-    maintainers = with maintainers; [ teh ];
-  };
-};
-typeshed = stdenv.mkDerivation {
-  pname = "typeshed";
-  version = pyre-version;
-  src = fetchFromGitHub {
-    owner = "python";
-    repo = "typeshed";
-    rev = "0b49ce75b478fdf283dda5dd1368759ac342dfe2";
-    sha256 = "1w5aqbbcfk5ki8n9fgdikkyadjb318ipqyi517s9xnwlzi1jv0fh";
-  };
-  phases = [ "unpackPhase" "installPhase" ];
-  installPhase = "cp -r $src $out";
-};
-in python3.pkgs.buildPythonApplication {
-  pname = "pyre-check";
-  version = pyre-version;
-  src = pyre-src;
-  patches = [ ./pyre-bdist-wheel.patch ];
-
-  # The build-pypi-package script does some funky stuff with build
-  # directories - easier to patch it a bit than to replace it
-  # completely though:
-  postPatch = ''
-    mkdir ./build
-    substituteInPlace scripts/build-pypi-package.sh \
-        --replace 'NIX_BINARY_FILE' '${pyre-bin}/bin/pyre.bin' \
-        --replace 'BUILD_ROOT="$(mktemp -d)"' "BUILD_ROOT=$PWD/build"
-    for file in client/pyre.py client/commands/initialize.py client/commands/tests/initialize_test.py; do
-      substituteInPlace "$file" \
-          --replace '"watchman"' '"${watchman}/bin/watchman"'
-    done
-    substituteInPlace client/buck.py \
-        --replace '"buck"' '"${buck}/bin/buck"'
-    substituteInPlace client/tests/buck_test.py \
-        --replace '"buck"' '"${buck}/bin/buck"'
-  '';
-
-  buildInputs = [ pyre-bin ];
-  nativeBuildInputs = [ rsync ]; # only required for build-pypi-package.sh
-  propagatedBuildInputs = with python3.pkgs; [
-    docutils
-    typeshed
-    click-log
-    ipython
-    sqlalchemy
-    munch
-    xxhash
-    ujson
-  ];
-  buildPhase = ''
-    bash scripts/build-pypi-package.sh --version ${pyre-version} --bundle-typeshed ${typeshed}
-    cp -r build/dist dist
-  '';
-  checkPhase = ''
-    bash scripts/run-python-tests.sh
-  '';
-}
diff --git a/pkgs/development/tools/pyre/pyre-bdist-wheel.patch b/pkgs/development/tools/pyre/pyre-bdist-wheel.patch
deleted file mode 100644
index 1b6fea024e0..00000000000
--- a/pkgs/development/tools/pyre/pyre-bdist-wheel.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff --git a/scripts/build-pypi-package.sh b/scripts/build-pypi-package.sh
-index 1035591..bb8cbae 100755
---- a/scripts/build-pypi-package.sh
-+++ b/scripts/build-pypi-package.sh
-@@ -98,7 +98,7 @@ rsync -avm --filter='- tests/' --filter='+ */' --filter='-! *.py' "${SCRIPTS_DIR
- sed -i -e "/__version__/s/= \".*\"/= \"${PACKAGE_VERSION}\"/" "${BUILD_ROOT}/${MODULE_NAME}/version.py"
- 
- # Copy binary files.
--BINARY_FILE="${SCRIPTS_DIRECTORY}/../_build/default/main.exe"
-+BINARY_FILE="NIX_BINARY_FILE"
- if [[ ! -f "${BINARY_FILE}" ]]; then
-   echo "The binary file ${BINARY_FILE} does not exist."
-   echo "Have you run 'make' in the toplevel directory?"
-@@ -146,7 +146,7 @@ def find_typeshed_files(base):
-         result.append((target, files))
-     return result
- 
--with open('README.md') as f:
-+with open('README.md', encoding='utf8') as f:
-     long_description = f.read()
- 
- setup(
-@@ -205,20 +205,3 @@ fi
- 
- # Build.
- python3 setup.py bdist_wheel
--
--# Move artifact outside the build directory.
--mkdir -p "${SCRIPTS_DIRECTORY}/dist"
--files_count="$(find "${BUILD_ROOT}/dist/" -type f | wc -l | tr -d ' ')"
--[[ "${files_count}" == '1' ]] || \
--  die "${files_count} files created in ${BUILD_ROOT}/dist, but only one was expected"
--source_file="$(find "${BUILD_ROOT}/dist/" -type f)"
--destination="$(basename "${source_file}")"
--destination="${destination/%-any.whl/-${WHEEL_DISTRIBUTION_PLATFORM}.whl}"
--mv "${source_file}" "${SCRIPTS_DIRECTORY}/dist/${destination}"
--
--# Cleanup.
--cd "${SCRIPTS_DIRECTORY}"
--rm -rf "${BUILD_ROOT}"
--
--printf '\nAll done. Build artifact available at:\n  %s\n' "${SCRIPTS_DIRECTORY}/dist/${destination}"
--exit 0
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a82bc66bb99..d997c1ac46c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7898,8 +7898,6 @@ in
 
   fstar = callPackage ../development/compilers/fstar { };
 
-  pyre = callPackage ../development/tools/pyre { };
-
   dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix {});
 
   glslang = callPackage ../development/compilers/glslang {
-- 
GitLab


From 7ff17ce730c40f4f7eb1daf6ea3b47fbfa8344e3 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sat, 28 Sep 2019 19:42:03 +0300
Subject: [PATCH 1970/2254] bpm-tools: init at 0.3

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

diff --git a/pkgs/tools/audio/bpm-tools/default.nix b/pkgs/tools/audio/bpm-tools/default.nix
new file mode 100644
index 00000000000..035fbf09533
--- /dev/null
+++ b/pkgs/tools/audio/bpm-tools/default.nix
@@ -0,0 +1,32 @@
+{
+  stdenv,
+  fetchurl,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "bpm-tools";
+  version = "0.3";
+
+  src = fetchurl {
+    url = "http://www.pogo.org.uk/~mark/bpm-tools/releases/bpm-tools-${version}.tar.gz";
+    sha256 = "151vfbs8h3cibs7kbdps5pqrsxhpjv16y2iyfqbxzsclylgfivrp";
+  };
+
+  patchPhase = ''
+    patchShebangs bpm-tag
+    patchShebangs bpm-graph
+  '';
+
+  installFlags = [
+    "PREFIX=${placeholder "out"}"
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = "http://www.pogo.org.uk/~mark/bpm-tools/";
+    description = "Automatically calculate BPM (tempo) of music files";
+    license = licenses.gpl2;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ doronbehar ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d997c1ac46c..5f9cb3af16a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9309,6 +9309,8 @@ in
 
   bpftool = callPackage ../os-specific/linux/bpftool { };
 
+  bpm-tools = callPackage ../tools/audio/bpm-tools { };
+
   byacc = callPackage ../development/tools/parsing/byacc { };
 
   cadre = callPackage ../development/tools/cadre { };
-- 
GitLab


From 93fa16f93980d38bdd1b3f4e415abad2c1fd3147 Mon Sep 17 00:00:00 2001
From: elseym <elseym@me.com>
Date: Sat, 5 Oct 2019 00:40:44 +0200
Subject: [PATCH 1971/2254] documize: introduce state directory

---
 nixos/modules/services/web-apps/documize.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/nixos/modules/services/web-apps/documize.nix b/nixos/modules/services/web-apps/documize.nix
index 37359869cb6..1b90299aa23 100644
--- a/nixos/modules/services/web-apps/documize.nix
+++ b/nixos/modules/services/web-apps/documize.nix
@@ -14,6 +14,15 @@ in {
   options.services.documize = {
     enable = mkEnableOption "Documize Wiki";
 
+    stateDirectoryName = mkOption {
+      type = types.str;
+      default = "documize";
+      description = ''
+        The name of the directory below <filename>/var/lib/private</filename>
+        where documize runs in and stores, for example, backups.
+      '';
+    };
+
     package = mkOption {
       type = types.package;
       default = pkgs.documize-community;
@@ -132,6 +141,8 @@ in {
         ];
         Restart = "always";
         DynamicUser = "yes";
+        StateDirectory = cfg.stateDirectoryName;
+        WorkingDirectory = "/var/lib/${cfg.stateDirectoryName}";
       };
     };
   };
-- 
GitLab


From 04f71c2f8ff6d594d34cf147153e7a5226eb1ff3 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sat, 5 Oct 2019 00:33:47 +0100
Subject: [PATCH 1972/2254] git-revise: 0.4.2 -> 0.5.0

---
 pkgs/development/python-modules/git-revise/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/git-revise/default.nix b/pkgs/development/python-modules/git-revise/default.nix
index 86d4decc6d8..905f38739b2 100644
--- a/pkgs/development/python-modules/git-revise/default.nix
+++ b/pkgs/development/python-modules/git-revise/default.nix
@@ -1,7 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, pythonAtLeast
+, pythonOlder
 , tox
 , pytest
 , pylint
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "git-revise";
-  version = "0.4.2";
+  version = "0.5.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1mq1fh8m6jxl052d811cgpl378hiq20a8zrhdjn0i3dqmxrcb8vs";
+    sha256 = "16sxmxksb5gjj6zfh1wy2czqj9nm4sd3j4fbrsphs8l065dzzikj";
   };
 
-  disabled = !(pythonAtLeast "3.6");
+  disabled = pythonOlder "3.6";
 
   checkInputs = [ tox pytest pylint mypy black ];
 
@@ -29,6 +29,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Efficiently update, split, and rearrange git commits";
     homepage = https://github.com/mystor/git-revise;
+    changelog = "https://github.com/mystor/git-revise/blob/${version}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [ emily ];
   };
-- 
GitLab


From 376bb002e4014abcf6d38320ad0635e6271b49a7 Mon Sep 17 00:00:00 2001
From: Raphael Borun Das Gupta <git@raphael.dasgupta.ch>
Date: Sat, 5 Oct 2019 02:03:07 +0200
Subject: [PATCH 1973/2254] cmatrix: set license attribute (gpl3)

According to https://github.com/abishekvashok/cmatrix/blob/v2.0/COPYING
and https://github.com/abishekvashok/cmatrix/tree/v2.0#license,
CMatrix 2.0 is licensed under GPL 3.

part of #43716
---
 pkgs/applications/misc/cmatrix/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/misc/cmatrix/default.nix b/pkgs/applications/misc/cmatrix/default.nix
index 9a008a886fa..cc57e58c56a 100644
--- a/pkgs/applications/misc/cmatrix/default.nix
+++ b/pkgs/applications/misc/cmatrix/default.nix
@@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Simulates the falling characters theme from The Matrix movie";
+    license = licenses.gpl3;
     longDescription = ''
       CMatrix simulates the display from "The Matrix" and is based
       on the screensaver from the movie's website.
-- 
GitLab


From f681016b03dfb701c3d8e66dd906d97a75323125 Mon Sep 17 00:00:00 2001
From: Thiago Areias <thiago.areias@booking.com>
Date: Sat, 5 Oct 2019 01:59:39 +0200
Subject: [PATCH 1974/2254] Updates pmdk from 1.6.1 to 1.7

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

diff --git a/pkgs/development/libraries/pmdk/default.nix b/pkgs/development/libraries/pmdk/default.nix
index eae21639110..27351522789 100644
--- a/pkgs/development/libraries/pmdk/default.nix
+++ b/pkgs/development/libraries/pmdk/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pmdk";
-  version = "1.6.1";
+  version = "1.7";
 
   src = fetchFromGitHub {
     owner  = "pmem";
     repo   = "pmdk";
     rev    = "refs/tags/${version}";
-    sha256 = "0iphvm9x8ly8srn3rn50qjp7339x5gpixn77n022xxr79g8jbxy6";
+    sha256 = "1833sq0f1msaqwn31dn1fp37a6d5zp995i9gkazanydmppi2qy0i";
   };
 
   nativeBuildInputs = [ autoconf pkgconfig ];
-- 
GitLab


From 35b405aeb75dba4226ce649530f46255c97ac64c Mon Sep 17 00:00:00 2001
From: Michael Fellinger <michael.fellinger@iohk.io>
Date: Sat, 5 Oct 2019 02:26:52 +0200
Subject: [PATCH 1975/2254] dbmate: 1.4.1 -> 1.7.0

---
 pkgs/development/tools/database/dbmate/default.nix | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/tools/database/dbmate/default.nix b/pkgs/development/tools/database/dbmate/default.nix
index 11b84648632..efc20b6972b 100644
--- a/pkgs/development/tools/database/dbmate/default.nix
+++ b/pkgs/development/tools/database/dbmate/default.nix
@@ -1,23 +1,21 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 
-buildGoPackage rec {
+buildGoModule rec {
   pname = "dbmate";
-  version = "1.4.1";
-
-  goPackagePath = "github.com/amacneil/dbmate";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "amacneil";
     repo = "dbmate";
     rev = "v${version}";
-    sha256 = "0s3l51kmpsaikixq1yxryrgglzk4kfrjagcpf1i2bkq4wc5gyv5d";
+    sha256 = "0jvizj616rsh3aw9z3bijk7ixpbnqmm3xqmdxznjzqd46avr54c3";
   };
 
-  goDeps = ./deps.nix;
+  modSha256 = "12x3m5bjyx3blh5i51pd99phv73m96pmm6i3ir4vf2kms3viif9i";
 
   meta = with stdenv.lib; {
     description = "Database migration tool";
-    homepage = https://dbmate.readthedocs.io;
+    homepage = https://github.com/amacneil/dbmate;
     license = licenses.mit;
     maintainers = [ maintainers.manveru ];
     platforms = platforms.unix;
-- 
GitLab


From f3b1cfa5faf980f235f2f04e0e3d5016928a0f4b Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 4 Oct 2019 22:05:39 -0500
Subject: [PATCH 1976/2254] pgcenter: 0.6.2 -> 0.6.4

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

diff --git a/pkgs/tools/misc/pgcenter/default.nix b/pkgs/tools/misc/pgcenter/default.nix
index 5e0d0aa8089..7cb810b2fe2 100644
--- a/pkgs/tools/misc/pgcenter/default.nix
+++ b/pkgs/tools/misc/pgcenter/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "pgcenter";
-  version = "0.6.2";
+  version = "0.6.4";
 
   src = fetchFromGitHub {
     owner  = "lesovsky";
     repo   = "pgcenter";
     rev    = "v${version}";
-    sha256 = "0mh0s83gkjhrm9ip5r1bb6y5n0nl1rlh99570yv7p3yvyhmh2292";
+    sha256 = "0p8ck4s5jj53nc638darhwbylcsslfmfz72bwy6wxby9iqi9kq6b";
   };
 
   modSha256 = "0kassq52v07zmffs6l066g0d3kfv6wmrh9g5cgk79bmyq13clqjj";
-- 
GitLab


From 1efac91ca4d8df849f4f657c1879021671fd9302 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Fri, 4 Oct 2019 22:34:18 +0200
Subject: [PATCH 1977/2254] nixos/gdm: make config dir for gnome-initial-setup

Observed failure to lauch gdm in a VM due to missing /run/gdm.config.
---
 nixos/modules/services/x11/display-managers/gdm.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index 9f76bba9980..46c57405c5c 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -152,6 +152,7 @@ in
           chown -R gdm:gdm /run/gdm/.config
         '' + optionalString config.services.gnome3.gnome-initial-setup.enable ''
           # Create stamp file for gnome-initial-setup to prevent run.
+          mkdir -p /run/gdm/.config
           cat - > /run/gdm/.config/gnome-initial-setup-done <<- EOF
           yes
           EOF
-- 
GitLab


From 9be5321097c16d10df0b41b92ccee0a682fb0bff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Fri, 4 Oct 2019 22:39:43 +0200
Subject: [PATCH 1978/2254] nixos/gdm: follow upstream's service config

---
 nixos/modules/services/x11/display-managers/gdm.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index 46c57405c5c..3b4723ce9fe 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -166,9 +166,15 @@ in
       "systemd-machined.service"
       "systemd-user-sessions.service"
       "getty@tty1.service"
+      "plymouth-quit.service"
+      "plymouth-start.service"
     ];
     systemd.services.display-manager.conflicts = [
       "getty@tty1.service"
+      "plymouth-quit.service"
+    ];
+    systemd.services.display-manager.onFailure = [
+      "plymouth-quit.service"
     ];
 
     systemd.services.display-manager.serviceConfig = {
@@ -178,6 +184,9 @@ in
       BusName = "org.gnome.DisplayManager";
       StandardOutput = "syslog";
       StandardError = "inherit";
+      ExecReload = "${pkgs.coreutils}/bin/kill -SIGHUP $MAINPID";
+      KeyringMode = "shared";
+      EnvironmentFile = "-/etc/locale.conf";
     };
 
     systemd.services.display-manager.path = [ pkgs.gnome3.gnome-session ];
-- 
GitLab


From bdccffa81ce1ab1f5366c833b29065dfddfb8c1a Mon Sep 17 00:00:00 2001
From: Dima <dgoldin+github@protonmail.ch>
Date: Sat, 21 Sep 2019 18:16:38 +0200
Subject: [PATCH 1979/2254] linux_5_2, linux_5_3: fixing nondeterminism

In 5.2 kernel a new mechanism was introduced which embeds the kernel
headers in the kernel image and exposes them in procfs for simplified
use by userland tools.

It was introduced in
https://github.com/torvalds/linux/commit/43d8ce9d65a54846d378545770991e65838981e0
and later modified a bit in
https://github.com/torvalds/linux/commit/f7b101d33046a837c2aa4526cef28a3c785d7af2

The archive containing the header files had nondeterminism through the
header files metadata - specifically `mtime`, but I also decided to
normalize some other aspects just in case.

In our default setup we currently compile this as a module, so to expose
the headers to test the functionality `kheaders` needs to be loaded.

See https://lkml.org/lkml/2019/10/4/1036 and
https://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git/commit/?h=fixes&id=2cc99c9cdc8fde5e92e34f9655829449cebd3e00

I commented out the documentation part of the patch to make it cleanly apply to
5.2 and 5.3, see remark in the patch itself.
---
 .../linux/kernel/gen-kheaders-metadata.patch  | 86 +++++++++++++++++++
 .../linux/kernel/manual-config.nix            |  4 +-
 2 files changed, 89 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/os-specific/linux/kernel/gen-kheaders-metadata.patch

diff --git a/pkgs/os-specific/linux/kernel/gen-kheaders-metadata.patch b/pkgs/os-specific/linux/kernel/gen-kheaders-metadata.patch
new file mode 100644
index 00000000000..0639f8b4e8f
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/gen-kheaders-metadata.patch
@@ -0,0 +1,86 @@
+From 2cc99c9cdc8fde5e92e34f9655829449cebd3e00 Mon Sep 17 00:00:00 2001
+From: Dmitry Goldin <dgoldin+lkml@protonmail.ch>
+Date: Fri, 4 Oct 2019 10:40:07 +0000
+Subject: kheaders: make headers archive reproducible
+
+In commit 43d8ce9d65a5 ("Provide in-kernel headers to make
+extending kernel easier") a new mechanism was introduced, for kernels
+>=5.2, which embeds the kernel headers in the kernel image or a module
+and exposes them in procfs for use by userland tools.
+
+The archive containing the header files has nondeterminism caused by
+header files metadata. This patch normalizes the metadata and utilizes
+KBUILD_BUILD_TIMESTAMP if provided and otherwise falls back to the
+default behaviour.
+
+In commit f7b101d33046 ("kheaders: Move from proc to sysfs") it was
+modified to use sysfs and the script for generation of the archive was
+renamed to what is being patched.
+
+Signed-off-by: Dmitry Goldin <dgoldin+lkml@protonmail.ch>
+Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Reviewed-by: Joel Fernandes (Google) <joel@joelfernandes.org>
+Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
+
+---
+
+nixos note: This patch is from
+https://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git/commit/?h=fixes&id=2cc99c9cdc8fde5e92e34f9655829449cebd3e00
+I commented out the documentation part here, so that it easily applies
+to linux 5.2 and 5.3, which does not ship with the reproducible build
+documentation yet, which only was introduced recently.
+
+---
+ Documentation/kbuild/reproducible-builds.rst | 13 +++++++++----
+ kernel/gen_kheaders.sh                       |  5 ++++-
+ 2 files changed, 13 insertions(+), 5 deletions(-)
+
+#diff --git a/Documentation/kbuild/reproducible-builds.rst b/Documentation/kbuild/reproducible-builds.rst
+#index ab92e98c89c8..503393854e2e 100644
+# --- a/Documentation/kbuild/reproducible-builds.rst
+#+++ b/Documentation/kbuild/reproducible-builds.rst
+#@@ -16,16 +16,21 @@ the kernel may be unreproducible, and how to avoid them.
+# Timestamps
+# ----------
+#
+#-The kernel embeds a timestamp in two places:
+#+The kernel embeds timestamps in three places:
+#
+# * The version string exposed by ``uname()`` and included in
+#   ``/proc/version``
+#
+# * File timestamps in the embedded initramfs
+#
+#-By default the timestamp is the current time.  This must be overridden
+#-using the `KBUILD_BUILD_TIMESTAMP`_ variable.  If you are building
+#-from a git commit, you could use its commit date.
+#+* If enabled via ``CONFIG_IKHEADERS``, file timestamps of kernel
+#+  headers embedded in the kernel or respective module,
+#+  exposed via ``/sys/kernel/kheaders.tar.xz``
+#+
+#+By default the timestamp is the current time and in the case of
+#+``kheaders`` the various files' modification times. This must
+#+be overridden using the `KBUILD_BUILD_TIMESTAMP`_ variable.
+#+If you are building from a git commit, you could use its commit date.
+#
+# The kernel does *not* use the ``__DATE__`` and ``__TIME__`` macros,
+# and enables warnings if they are used.  If you incorporate external
+diff --git a/kernel/gen_kheaders.sh b/kernel/gen_kheaders.sh
+index 9ff449888d9c..aff79e461fc9 100755
+--- a/kernel/gen_kheaders.sh
++++ b/kernel/gen_kheaders.sh
+@@ -71,7 +71,10 @@ done | cpio --quiet -pd $cpio_dir >/dev/null 2>&1
+ find $cpio_dir -type f -print0 |
+ 	xargs -0 -P8 -n1 perl -pi -e 'BEGIN {undef $/;}; s/\/\*((?!SPDX).)*?\*\///smg;'
+
+-tar -Jcf $tarfile -C $cpio_dir/ . > /dev/null
++# Create archive and try to normalize metadata for reproducibility
++tar "${KBUILD_BUILD_TIMESTAMP:+--mtime=$KBUILD_BUILD_TIMESTAMP}" \
++    --owner=0 --group=0 --sort=name --numeric-owner \
++    -Jcf $tarfile -C $cpio_dir/ . > /dev/null
+
+ echo "$src_files_md5" >  kernel/kheaders.md5
+ echo "$obj_files_md5" >> kernel/kheaders.md5
+--
+cgit 1.2-0.3.lf.el7
+
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index 88e990501f9..9764fddf019 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -94,7 +94,9 @@ let
       patches =
         map (p: p.patch) kernelPatches
         # Required for deterministic builds along with some postPatch magic.
-        ++ optional (stdenv.lib.versionAtLeast version "4.13") ./randstruct-provide-seed.patch;
+        ++ optional (stdenv.lib.versionAtLeast version "4.13") ./randstruct-provide-seed.patch
+        # Fixes determinism by normalizing metadata for the archive of kheaders
+        ++ optional (stdenv.lib.versionAtLeast version "5.2") ./gen-kheaders-metadata.patch;
 
       prePatch = ''
         for mf in $(find -name Makefile -o -name Makefile.include -o -name install.sh); do
-- 
GitLab


From daac44f01ae84ebd45d14cf218698d2414f3fc1e Mon Sep 17 00:00:00 2001
From: Gwendolyn Quasebarth <gwen@quasebarth.de>
Date: Sat, 28 Sep 2019 17:50:30 +0200
Subject: [PATCH 1980/2254] friture: init at 0.36

---
 pkgs/applications/audio/friture/default.nix   | 44 +++++++++++++++++++
 .../audio/friture/factorial.patch             | 13 ++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 59 insertions(+)
 create mode 100644 pkgs/applications/audio/friture/default.nix
 create mode 100644 pkgs/applications/audio/friture/factorial.patch

diff --git a/pkgs/applications/audio/friture/default.nix b/pkgs/applications/audio/friture/default.nix
new file mode 100644
index 00000000000..483f873fbd5
--- /dev/null
+++ b/pkgs/applications/audio/friture/default.nix
@@ -0,0 +1,44 @@
+{ lib, fetchFromGitHub, python3Packages, wrapQtAppsHook }:
+
+let
+  py = python3Packages;
+in py.buildPythonApplication rec {
+  pname = "friture";
+  version = "0.36";
+
+  src = fetchFromGitHub {
+    owner = "tlecomte";
+    repo = "friture";
+    rev = "v${version}";
+    sha256 = "1pz8v0qbzqq3ig9w33cp027s6c8rj316x5sy8pqs5nsiny9ddnk6";
+  };
+
+  # module imports scipy.misc.factorial, but it has been removed since scipy
+  # 1.3.0; use scipy.special.factorial instead
+  patches = [ ./factorial.patch ];
+
+  nativeBuildInputs = (with py; [ numpy cython scipy ]) ++
+    [ wrapQtAppsHook ];
+
+  propagatedBuildInputs = with py; [
+    sounddevice
+    pyopengl
+    docutils
+    numpy
+    pyqt5
+    appdirs
+    pyrr
+  ];
+
+  postFixup = ''
+    wrapQtApp $out/bin/friture
+    wrapQtApp $out/bin/.friture-wrapped
+  '';
+
+  meta = with lib; {
+    description = "A real-time audio analyzer";
+    homepage = http://friture.org/;
+    license = licenses.gpl3;
+    maintainers = [ maintainers.laikq ];
+  };
+}
diff --git a/pkgs/applications/audio/friture/factorial.patch b/pkgs/applications/audio/friture/factorial.patch
new file mode 100644
index 00000000000..de053802932
--- /dev/null
+++ b/pkgs/applications/audio/friture/factorial.patch
@@ -0,0 +1,13 @@
+diff --git a/friture/filter_design.py b/friture/filter_design.py
+index 9876c43..1cc749a 100644
+--- a/friture/filter_design.py
++++ b/friture/filter_design.py
+@@ -2,7 +2,7 @@
+ from numpy import pi, exp, arange, cos, sin, sqrt, zeros, ones, log, arange, set_printoptions
+ # the three following lines are a workaround for a bug with scipy and py2exe
+ # together. See http://www.pyinstaller.org/ticket/83 for reference.
+-from scipy.misc import factorial
++from scipy.special import factorial
+ import scipy
+ scipy.factorial = factorial
+ 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5f9cb3af16a..2ef74dc142e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18518,6 +18518,8 @@ in
 
   freerdpUnstable = freerdp;
 
+  friture = libsForQt5.callPackage ../applications/audio/friture { };
+
   fte = callPackage ../applications/editors/fte { };
 
   game-music-emu = callPackage ../applications/audio/game-music-emu { };
-- 
GitLab


From 82259b5d549e58a70aac2bd37efb8d02a0873da6 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Sat, 5 Oct 2019 10:35:52 +0200
Subject: [PATCH 1981/2254] thanos: 0.6.1 -> 0.7.0

---
 nixos/modules/services/monitoring/thanos.nix | 34 ++++++++++++++++++++
 pkgs/servers/monitoring/thanos/default.nix   |  6 ++--
 2 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/monitoring/thanos.nix b/nixos/modules/services/monitoring/thanos.nix
index 215cd43fd86..52dab28cf72 100644
--- a/nixos/modules/services/monitoring/thanos.nix
+++ b/nixos/modules/services/monitoring/thanos.nix
@@ -126,6 +126,8 @@ let
           '';
           description = ''
             Path to YAML file that contains tracing configuration.
+
+            See format details: <link xlink:href="https://thanos.io/tracing.md/#configuration"/>
           '';
         };
       };
@@ -141,6 +143,8 @@ let
             <option>tracing.config-file</option> will default to its path.
 
             If <option>tracing.config-file</option> is set this option has no effect.
+
+            See format details: <link xlink:href="https://thanos.io/tracing.md/#configuration"/>
           '';
         };
     };
@@ -187,6 +191,8 @@ let
           '';
           description = ''
             Path to YAML file that contains object store configuration.
+
+            See format details: <link xlink:href="https://thanos.io/storage.md/#configuration"/>
           '';
         };
       };
@@ -202,6 +208,8 @@ let
             <option>objstore.config-file</option> will default to its path.
 
             If <option>objstore.config-file</option> is set this option has no effect.
+
+            See format details: <link xlink:href="https://thanos.io/storage.md/#configuration"/>
           '';
         };
     };
@@ -276,6 +284,24 @@ let
       block-sync-concurrency = mkParamDef types.int 20 ''
         Number of goroutines to use when syncing blocks from object storage.
       '';
+
+      min-time = mkParamDef types.str "0000-01-01T00:00:00Z" ''
+        Start of time range limit to serve.
+
+        Thanos Store serves only metrics, which happened later than this
+        value. Option can be a constant time in RFC3339 format or time duration
+        relative to current time, such as -1d or 2h45m. Valid duration units are
+        ms, s, m, h, d, w, y.
+      '';
+
+      max-time = mkParamDef types.str "9999-12-31T23:59:59Z" ''
+        End of time range limit to serve.
+
+        Thanos Store serves only blocks, which happened eariler than this
+        value. Option can be a constant time in RFC3339 format or time duration
+        relative to current time, such as -1d or 2h45m. Valid duration units are
+        ms, s, m, h, d, w, y.
+      '';
     };
 
     query = params.common cfg.query // {
@@ -560,6 +586,14 @@ let
         '';
       };
 
+      downsampling.disable = mkFlagParam ''
+        Disables downsampling.
+
+        This is not recommended as querying long time ranges without
+        non-downsampled data is not efficient and useful e.g it is not possible
+        to render all samples for a human eye anyway
+      '';
+
       block-sync-concurrency = mkParamDef types.int 20 ''
         Number of goroutines to use when syncing block metadata from object storage.
       '';
diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/servers/monitoring/thanos/default.nix
index ab2f187e504..01068a909b9 100644
--- a/pkgs/servers/monitoring/thanos/default.nix
+++ b/pkgs/servers/monitoring/thanos/default.nix
@@ -1,16 +1,16 @@
 { stdenv, buildGoModule, fetchFromGitHub }:
 buildGoModule rec {
   pname = "thanos";
-  version = "0.6.1";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "thanos-io";
     repo = "thanos";
-    sha256 = "06vy22cy81rd71py8057bia3265vjm6ffp16wpx06faramdazq6p";
+    sha256 = "0yxa1wipab1n9bh95n237c9l1sx1nx7r8snsk4nzpmwr3y1b4nn8";
   };
 
-  modSha256 = "139b66jdryqv4s1hjbn9fzkyzn1160wr4z6a6wmmvm3f6p6wgjxp";
+  modSha256 = "0iz16yj41gahsyb6mxbmjs8mjhp5c96dmw75rg9bh5xdh8qh767m";
 
   subPackages = "cmd/thanos";
 
-- 
GitLab


From bed6814c832a68adf4a17f99b7aae6361ec3372a Mon Sep 17 00:00:00 2001
From: Renato Alves <alves.rjc@gmail.com>
Date: Sat, 5 Oct 2019 11:00:55 +0200
Subject: [PATCH 1982/2254] pysam: 0.15.2 -> 0.15.3

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

diff --git a/pkgs/development/python-modules/pysam/default.nix b/pkgs/development/python-modules/pysam/default.nix
index 05f2db8ac06..e5cc2cf9da0 100644
--- a/pkgs/development/python-modules/pysam/default.nix
+++ b/pkgs/development/python-modules/pysam/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname   = "pysam";
-  version = "0.15.2";
+  version = "0.15.3";
 
   # Fetching from GitHub instead of PyPi cause the 0.13 src release on PyPi is
   # missing some files which cause test failures.
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "pysam-developers";
     repo = "pysam";
     rev = "v${version}";
-    sha256 = "03aczbzx6gmvgy60fhswpwkry7a8zb5q1pbp55v5gx8hk15n40k1";
+    sha256 = "0g6md20gsr24pdr9b8nj403w31ixfjv8bjhdvg3x476kjiq1kvyb";
   };
 
   buildInputs = [ bzip2 curl cython lzma zlib ];
-- 
GitLab


From 0d6b16da8ee20b87bab5de7f3965b4f6c40610c4 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 5 Oct 2019 04:20:00 -0500
Subject: [PATCH 1983/2254] spotifyd: 0.2.16 -> 0.2.18

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

diff --git a/pkgs/applications/audio/spotifyd/default.nix b/pkgs/applications/audio/spotifyd/default.nix
index 443107ad9e4..fab12a3e724 100644
--- a/pkgs/applications/audio/spotifyd/default.nix
+++ b/pkgs/applications/audio/spotifyd/default.nix
@@ -6,13 +6,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "spotifyd";
-  version = "0.2.16";
+  version = "0.2.18";
 
   src = fetchFromGitHub {
     owner = "Spotifyd";
     repo = "spotifyd";
     rev = "v${version}";
-    sha256 = "097hg18h7gya2w0wl5jkav79nb3qzcc4ycsryq7nhxa0h1agvinc";
+    sha256 = "12826b0wf31m9vw1s7bcd1hb4ygb1xn4sdknn1y9kzc68brsq94v";
   };
 
   cargoSha256 = "0ar4bfwn3qxa6wsz2hd7nv1wr824h74jy3xqba2qsy0rsfwy1bmm";
-- 
GitLab


From f947a311b77709a4560d3fd030974f94f2ff3969 Mon Sep 17 00:00:00 2001
From: Hugo Reeves <hugolreeves@gmail.com>
Date: Sat, 5 Oct 2019 22:24:20 +1300
Subject: [PATCH 1984/2254] croc: 6.1.3 -> 6.1.4

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

diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix
index 5ed2d5a1cb1..db3c24398f7 100644
--- a/pkgs/tools/networking/croc/default.nix
+++ b/pkgs/tools/networking/croc/default.nix
@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   pname = "croc";
-  version = "6.1.3";
+  version = "6.1.4";
 
   goPackagePath = "github.com/schollz/croc";
 
@@ -10,10 +10,10 @@ buildGoModule rec {
     owner = "schollz";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1qc655y1vvz0bk4rk78fl33s3dqz196zn08aczrb4ipbbj7hp8x8";
+    sha256 = "1qqmyqkzg8gcib6zzva9zqlv22zpg4lwc3dqi6yyaynmdgy9pk1m";
   };
 
-  modSha256 = "00bnf4dc3i41s9wjpbc59nn7jwlhvp2zhdrjhjn5fwbc95pm4gm0";
+  modSha256 = "17vpfq3bsciq3vx5s2r3sv76aqsij3vvckqnk2w2sp346by5vavf";
   subPackages = [ "." ];
 
   meta = with stdenv.lib; {
-- 
GitLab


From d852d58e801dd94c32c28874fa6fc44e2549f3d9 Mon Sep 17 00:00:00 2001
From: geistesk <github.jyf300hj@0x21.biz>
Date: Sat, 5 Oct 2019 10:26:55 +0200
Subject: [PATCH 1985/2254] alot: 0.8 -> 0.8.1

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

diff --git a/pkgs/development/python-modules/alot/default.nix b/pkgs/development/python-modules/alot/default.nix
index bda0e677f4a..9dd3a449664 100644
--- a/pkgs/development/python-modules/alot/default.nix
+++ b/pkgs/development/python-modules/alot/default.nix
@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "alot";
-  version = "0.8";
+  version = "0.8.1";
   outputs = [ "out" ] ++ lib.optional withManpage "man";
 
   disabled = !isPy3k;
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     owner = "pazz";
     repo = "alot";
     rev = version;
-    sha256 = "1isn0p0i2a7dlbrdk5ib01xa1wgi6bi9ka4xl4vj8iw1q4i5fqv9";
+    sha256 = "1gzis6w45d860mr2qbmjhnbrhy6d9xwhw27wpmvs56vndafvv9d3";
   };
 
   nativeBuildInputs = lib.optional withManpage sphinx;
@@ -57,6 +57,6 @@ buildPythonPackage rec {
     description = "Terminal MUA using notmuch mail";
     license = licenses.gpl3;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = with maintainers; [ geistesk ];
   };
 }
-- 
GitLab


From d274d95cefa0df3771cb83ba13fea37ec9dbe713 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Sat, 5 Oct 2019 18:43:58 +0900
Subject: [PATCH 1986/2254] firefox-bin: 69.0.1 -> 69.0.2

---
 .../browsers/firefox-bin/release_sources.nix  | 746 +++++++++---------
 1 file changed, 373 insertions(+), 373 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index 93259332bfb..dd289d203b8 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,935 +1,935 @@
 {
-  version = "69.0.1";
+  version = "69.0.2";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ach/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/ach/firefox-69.0.2.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "100d7c9523102d3c4fc07ccb3950a9bf6caa096061c9b5e49d960f89ad6e2a8aa032e8a91ddd4bdda1d4eb8442ceb393dc6b31da11c5a86bfe9c7907bdf3a566";
+      sha512 = "650e140fded88137d72babd41abeeca478d7b48025b3bf0821467ac0a899932c0a49d59e94a5ec9dcf94b0c2fc40c4e1dee59591e7b9b3a09ccd2693e7588483";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/af/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/af/firefox-69.0.2.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "ed6e066bd58d84d8e9a240e02b984ab7a52e1646dc4bad7470666e26aebb004b6ef5d43397457c82b4a7b0fa04ad0cc7dcbb662ad721e3c82563104955502627";
+      sha512 = "d18a0c1b1e9df37c6ba034c5c39fdb4ddade929d949cca06df2b4d7b61e49ad0f9b333c19e8ef661bb80182c77ee69d4462aecb1cd7a91b0d4fa8a067fd2dbab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/an/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/an/firefox-69.0.2.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "7b75c42de08df56741778a0b01345238fa276ef2012b06cdfa54159b8559b37910b50277335d68d7b0870de36a04c24fcd83132999faa9d7c4e089511018acce";
+      sha512 = "501fc660c9911b6949f9b43f68ba48f8ec775df22f59f20f34b13831f44954d53b88659974d01a52f184447052a196787f2c4df0219171e36f27e4f444a0877b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ar/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/ar/firefox-69.0.2.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "7f0266be9bb2b34189ee2891be11907720a248fbd11855d5a99bf54ef439756ecbd201a4d52a21b24b89ec23f1254b4ab15fd02d7511fcfb7d71eca9adf3a852";
+      sha512 = "df127eb1947d76ba1fcd7e75a39439331bd9cb6d1e4eae897a93696a816534df3f9210440f4536127b11a1866aee36fb8a7c4f1d0f5ee1234bffb815058f07cd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ast/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/ast/firefox-69.0.2.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "d4681a2280549b3fb0384b5ae6a98ad9785921fa65d4a83fa967fe2d05363ed0ba8348a7621c0cc104a2da9efd97feddb38ef1ac6901c08ae3d9dd649e5ad30b";
+      sha512 = "8342887310ba51a523d966e413bda10d93ec8e23e593267ea287d3d5673df30dd9a991bff6358bb91f8c5a5825a0befb45b75b584326af8678fa305f0b5b6a6f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/az/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/az/firefox-69.0.2.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "c19cedc18719ad6d5723a546be1e9d3aac2e408fcb94fba28aec9e1856250257422407cb945cf516bd0f86ebc1ebd1c06c28713cc6ff49691542fde660fab53b";
+      sha512 = "fc1c395390117c62770a362330068877928b9b3141195effe3ec49517016b501e56f5542c07b6f9245e61f31e046a2453aa8b521c37a08b7a521d8681fe531eb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/be/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/be/firefox-69.0.2.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "e6e4ae0eae225ff64595df0c7038c750c8b3b245c9aa76afdf3e8a2ad9fbb6e324630c73801974f515ccbe315fffe797df3e087412c46e2507507c88311c8a82";
+      sha512 = "bd8d861b85abcc9ea35ba6e2fbe02ae226bbe95dd42910e7bb32e62a58222d4b331e2ed432da81138d6babbf0bc701525e53fab9cbc9a68ec41d1c20e64a2a9c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/bg/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/bg/firefox-69.0.2.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "4d2869b82e4f577acc0933e828f72856c55c4d0771bd938a888cbcb6af5ca319f03510cc96249f220d31b6786426c40726e1509beb40633d995bcdeae8299c7b";
+      sha512 = "fb26463a13ad0c5ee2bfc0ab8ccb7256bf1a3b8a585755297065b3de44ec65d2ee0ff1cc7cf67f314d10e29c4452ae01d3a7f296c447a7611276e6997aae9f58";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/bn/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/bn/firefox-69.0.2.tar.bz2";
       locale = "bn";
       arch = "linux-x86_64";
-      sha512 = "b01ecf839f6c1e028593c0338132931b39af29b2cbb414d08b29379832300abf4a423566935946b52d4ad4aa04d9d670e41cc11f1989b1e913201f8bc631f786";
+      sha512 = "43aee9e4e2a6f4202a1edd0ac295d2144608fa7fa9607a9399855be6d03225ef6d395ac1089e898515badcb5aad78ec028ae19631efc895fcef2aa2cbac8bb54";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/br/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/br/firefox-69.0.2.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "62e0603e9fec08ff0babf25ad38aad703806b43f8b1aa4b986f41a74623fd59dc18b6b230219ac93767924264a45f7ffdc6c41243e888bef786e0e14d6631718";
+      sha512 = "fd80c5d18a816380ade244f52bf1d6a6811ce1904a895326c8c1f7e9b9441edf3dccb1e01a1867c0bf1c3ca975cefc3e92d177956cca4a0340375ec3063ebb9b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/bs/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/bs/firefox-69.0.2.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "c2020ea412b0852f7904ea9371bd3851bda9e0cf006a582a1427e8c9e412991bce7a0a6febf0632ee58a9da10c7b329cafc30caa8dcb5a2b12837465886be175";
+      sha512 = "164abe404d823674f85819450277e9e71929cb25a899b2d99621b702ea7a8c5d9bb41bce0f0767348838e1a09a637a2c60fd9d9e7324b05363c08bcaf2ed6b59";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ca/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/ca/firefox-69.0.2.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "35c4a61866b37d7afb1cb5e78997b5467bf1d9810db7d4b651d4144132c6b52b6dc5091217787a6a71088b814c3454757eb4f741ec3c3c24462892da77600f73";
+      sha512 = "318f407386b93619b72a1e1e6291adafc62cf9d9200599fd1640b35e0b76f883a81ceb7a93713f5f243debc79e1163d5c48082800cd80025ec80417bb5bf4be3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/cak/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/cak/firefox-69.0.2.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "273c8f0e40187f88368e4049a66052b230594939c85ee00e48dfd7760a4093735f91bf4e3eeb14d1c92266068c9994599d3a3cc271206e449e715c1c3d038aad";
+      sha512 = "a11ff622217abb69fa0322e27169947033d77faf56608e1a768953a4848d44e0f02828f849676d2cb46fc37d9b8f0e39ad12a8df93ab5f29c490f2ae9d45e9b6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/cs/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/cs/firefox-69.0.2.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "3dc3657c494f3b954236dd330e2c2137b5500bea5a0b4ef2052c7050c0ab23e9b773090843d459c9c259d0eceae0524b0e4ebf6f02883d8419bd05901943d9f0";
+      sha512 = "8e73d9d631482c02a0abe66c8fa029d0ed48427c707b20e8d7fa2f838d5d4095197d89fdf23db21acba96254c047043afb53cb8bfef3de33bac51ab5e4d65b29";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/cy/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/cy/firefox-69.0.2.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "9ba021a9df417c36b8ee10afaa95595d19897d11485407e9e3fb446c16a1cd31c683014917da608a721a583efd008c0771d13c642c8d94913bcc21227966ae6e";
+      sha512 = "e8c58e39a9b6fd950c9459645a2d3489bc43918b21536ffe8e16774ac26a213ad17e17944d5d0cc11dd3decd701991d3e7b40e8ff05a12e31e5ea1e909bc8af0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/da/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/da/firefox-69.0.2.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "c6eb2a98e0dd59dfe196d0b8f149aff109e1272199e215fd09d14a614697bc8652fb0442505cfae8a9f2bc0dbeec00bbbe73a7bc737e534f2f230a356137835b";
+      sha512 = "8002bd633c8ae1ce839399e6b5e680c12b326b32c87fa027ddd38a2776bfb008803938caa9c9b9a31cb7698b6b098fae2db10dfa003d39d388e95c46431f07bb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/de/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/de/firefox-69.0.2.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "a689581f54c278d217c7ae12d770ad1caa686db1fb5138ab3a34c14848b717256d0f09ba8cb5bbcb2472fec73b01e0a5aa4d5b869c7a2f388d8d54b2216b68da";
+      sha512 = "7acb482726040a659731baf1a907525be5934a75606e948f4dd256df4ffbfb11fe70137d7a5c25d8a4a6d11e38f2272b2d89a9acb56d2810ff77dae22b8d9ef5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/dsb/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/dsb/firefox-69.0.2.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "d33f730bb3727756f982bdcd35e0858cd0d5252594e14ed670324c9d5a1b4a87aa1391bf1e58759a0adf9fae896aa8de7a3258267b40dd96e957efaeeb9abd4b";
+      sha512 = "b25f88fc38dc03b1ba87ee70636b13c5d2b677beddddcdba6eeb67932a6e5cd5d69bee2d0f3e5336f184d9968f80d76debce102db4b8b2449787c46424674053";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/el/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/el/firefox-69.0.2.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "4d040b92aa3f06e718ffe0f2dcd477d915dd3959087d0e98bffa7b14fcdd86a74b50be23df1f47ceb4ff9c63564d09a22217bb91f4eb3419b77c0dca12a1bebf";
+      sha512 = "5eef7c7aae58590ce1119b583cd8c32b62143a0776be28f1693ac43ade2ed28cb2bfb529756b553de9e16fccd8662c0735cf91d4766fd9e1216c19deee89c98b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/en-CA/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/en-CA/firefox-69.0.2.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha512 = "390700c7d7fb2c38d6082e91b6c5ad4d1cc4912eb88ae3f207745e88c72ca6a169612be19d984438dd784e8b2e56ca2ea6ab9a3fa1fe6e8253f3e96278eb3dd3";
+      sha512 = "0e08e3a4cc7e83f484dd5cc264e5e0797fa610b2ffb0594ff646b444da25d06b450d4b733e4298111b7dcfd9727bef0167fc29587ca5cc65d55eb72c5bb0e45c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/en-GB/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/en-GB/firefox-69.0.2.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "d719c4c84a62fbaac67ee90812e6922f5b5b7ba08916740d06bf4780d818698a3c46e82c483d0ecd8b4ea040c53a69aebf31ce8c8c4e68dc32e0e27032704c74";
+      sha512 = "1d6b06d58a49e27a7d6eedac33a3e6ae74778fe8c98368c2e10709d0c9e451cd90d32df6a2165e65e9d78faa32fed514567479aa58bedcec69d5a4fdeeb0ec4e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/en-US/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/en-US/firefox-69.0.2.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "ccf48f7ef61bebabe3e583e2d08a5c9ced3ea4c10b7d4febd64108cb89c9905076d69482056ee5a20dcc6c2e9bba9fee6d3f02eb54a390f0df444e24b3fd8443";
+      sha512 = "b7de5546104889f334daaf4751470ffb26ecc845e433d26ad455dab9d443baf1cc0e1c7efd42ebe2df6ce609ef8a08946d83470a78341739195832f51528f427";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/eo/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/eo/firefox-69.0.2.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "4ddb06d38c53e24fba796a16676b85d74713a3c324b8f44bc66cd2ab8d3a26204627e0be0b0fddb27ff414360330fba78dcba2ee0cc9691621a1e4ccd7a3d046";
+      sha512 = "b1df1d53c78405597fbf174e270fc49dc1a52529973a7ec690bdd3309824fc295d5bdc980449f0d8eea366548a180852cf38d2f7ceea82d9518a527a9a57bf2d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/es-AR/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/es-AR/firefox-69.0.2.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "e00e8bccd62a45ea959d0d826dc814964b4953343284e4d54d0acb4623d2369e7efdc96cf61028f8309bfcddb9deec4ce20ba10c3613e4a6e686ded9617ec1bc";
+      sha512 = "ff89873f85e4cf87e3f6338987e1da54412686017f14f2f2cbd14bd507b3ba0a00e15c45ce2711b07cb3c0a72fcaa778965ed293601eafb991aeef84ed8d29a3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/es-CL/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/es-CL/firefox-69.0.2.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "63bbce2c62e331ac92c7501e80d661edd686ff7feae714c32e1dcb8afec829bbfb0ed188138b5655ce5ba479767a58ffae1a367703f80c683c371f707286623e";
+      sha512 = "2ad1c34e64824565b699275d13e74027d5a4950e00bbff71754b221fc9a1f1118414a7d62a280acbd8aa8172175fb54f41e67f6fd3d696a07dd8a888b7e1adfb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/es-ES/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/es-ES/firefox-69.0.2.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "90c11f172ecb14a38e851558ace78ffd81a0ad10966e9b338c2394485c6460f81ab9f83824e204cab212d77cc56d066d8ddfd9686a3f6791ae9a8d99009d6b0b";
+      sha512 = "ca21787070a5ec6a9009cb04ac214fa86239776b90d6d541adfbff0babb6a16ff51d568cd01a10d19b547a181f123dc4a15bbd5d82fdb38d41332cd192cd81fc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/es-MX/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/es-MX/firefox-69.0.2.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "13660d6449512791b4e8cf2b5d7f658d5716c1de5ae80f43893be351ee0de71ad21b135902056422325f9367e778ee31006f9120bbaeed19e9e3af36a20a7a4c";
+      sha512 = "63d5cb5c2fd570ef5e00c700aa60294858eed7f953d5a89dabad324ea7c1151fafe990097892da085075f14041f6e7e1b11dd77b4064f64830da9a3ea5edaea7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/et/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/et/firefox-69.0.2.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "db6ae24e866a32802e9ba9fd35b5fb7bdb63e1f0c8c3aa74d97d6d3e732123a10260794e03af30bac13c71d82b71d72057c0c32697f5efb78d35f55c088f6514";
+      sha512 = "f6f94f4ac50ecbe39837e10822fc1824c97094a897fd8426c83f86f2f3ff97851626091c27e71efb73ae4f3ae611da3bf1d419d8cb0971fc2729853cabc2f320";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/eu/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/eu/firefox-69.0.2.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "da166bd2be438b767af8c3566a7721a50df66572182c5504654be234b486027e1044186e3d2dcb43b2505ccb989f91556d19228f5e30ff4a05beb6f18911cb3a";
+      sha512 = "dcc82582dce399f5620c47d1853db3bfd233be6b8addd3b2e87275f2d88483dc840e50f57674ccf0eecb7d53381065321ce285d046e860a869534c4bb618e7d2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/fa/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/fa/firefox-69.0.2.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "c05f526f70225dd91bd38b1d74fbf0217b12919173582262739fbd97b4b556c3d820ee38bb0c33da37cfb26996a882ebc3498faa21141290722eb07dc586b878";
+      sha512 = "032fa11b3def5f2bfc1776296a4868396986eee1ea4480fdcad33c2a8e4b743803df59aac5088a01300f43c4f2ef2f106d18320ea829d2c3d178c2c42f79bbcc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ff/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/ff/firefox-69.0.2.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "15385e03ad168f2be63fc30c871617d7d673b53181bea0d592b48d52c172d74b978e84cf1403272e5fa9fe03900f8d1118f9ccf1dd70cf0a7da7af7ddd6fad4a";
+      sha512 = "caa002e10a2ff3f9115b63fb3625914977550401a342e0cd9ca515fd64af3281a22a1a3aa51814370ef18e3ead3d6e093ad6c7b0b728011d8f0a40088168c9c5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/fi/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/fi/firefox-69.0.2.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "fca2397499ab573ff33f14dc2ad61ccd4d0ca711493545e39fba143e65e2d883d9b7317330ca8b8bc7345d74ee5eaea277cef5f1b88b1456b99c8b5f6bc5ad52";
+      sha512 = "12136b4f24c697ab663c5947d6042eb7af0efa676126882009fb8b74bbaddfc25433c0a80f22094e342d3f390ed253b67371e6b54b3fbf7388df2130042079ef";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/fr/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/fr/firefox-69.0.2.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "262f3abd56f9f5b1b6a90f779c1ec233c684a1a71b783eb8fdace2bcd323fa8328dff5312e43458be1418d77109f7e677e9442dc10289064179955015f076fb4";
+      sha512 = "f88d755212abdd116d13db212056d6d6eb2c628130c381ed17183e8aa64453b71f514cc22c347f37b9fa40346e2bb95188e4b248dc7429c70ffc306acbf9cc7e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/fy-NL/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/fy-NL/firefox-69.0.2.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "3159e601d22b6b3f5e0d80d0950d03f9f707903a378abe622acc88c1dfccd7bb3d439b370d186460ad4197dade467fa153573da2efef31825f757bc5f5aa1912";
+      sha512 = "25fc225c9c97850f23bec3317198dcce8b3c802fb672db3cadfe2abe5a77feb2a55a2c2835c35495dfb7dc97039f21ff6d5189fe4fb266efd40c41c45be718e9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ga-IE/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/ga-IE/firefox-69.0.2.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "46ac2bd25b600d801d2ff34b9b802a5830ec69fa69315c98217350462104eb73215ef8130f2987fdf8900ef45c91ea0618ba40ee8916406fb579b41462dc1a26";
+      sha512 = "83e4ff3f316a537420f92d564397e6d39969cce23497d5ea2da5832804d0ca00781cc430541324ab6d36ab711048637976be9b07725f1a1657997824a47b3704";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/gd/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/gd/firefox-69.0.2.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "ad36cd4d42a29c9ab9d9e7e15e1827fd2ee7799f0484698c62bfba5acd2b0db89f66f7d40a5cf55012708e756cee43653211dff95c28a5a04173c83c45b0e4e1";
+      sha512 = "7b1f1dd35680fa7566fbc56619a467f6d1d32118c74b0b5cf6e96188f5eae9c5c7275353319c755b4685dff999bbeb6cd18c56ae8e24753c6ab74ced6cbbf066";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/gl/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/gl/firefox-69.0.2.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "46ce314704d19f6572568b3a01e975a01c63bb075f8d99c7e04ae01982ac42d61cde92619beb30c04a778f009c56f98e2c05d7549d4ab9843349f85321532755";
+      sha512 = "7061aeb98e08c3b0ce12d17c6a41eec360a1662dd4a91ece86aea2e1d24ac6e4f99bd678a1a02fc458901d50aa0fb29fd6ab03c0409e771e0664fb02ba4eaf6e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/gn/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/gn/firefox-69.0.2.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "ec4afbcb087157ee7c0b487ba72fbc3469e53522cee6a3e53d0dd88bb063d2ba6811da51dcefc696924ad79bb352440d2c5d91fecd87a72436508ad37ba9e86b";
+      sha512 = "56fd0618ace9343c0a5a23a269654e6e4fcf9cd1f0d1fa5170dbf61f6d102246dc3dc68faa04ef601d0b37775733154aaf2f573d4a82fdc3290e3f126962e59c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/gu-IN/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/gu-IN/firefox-69.0.2.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "a736f01bad98b99efb41d7d516f156ff6806b5e1489cbaf799c651efe641b5191742c1372459081abfc8e75c63d0832ab33037e3ef7a5fd07d943a02af60aa4e";
+      sha512 = "74995df89406da1cb2303c75300d3aefa77b14c7f7af55f6152649034fc87049aebb6f9529bb03a465f85c702fb0cf24f5b08d7d109b4bb7952a331c7ab69cf3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/he/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/he/firefox-69.0.2.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "73a56b235d0c5a7c69e51a52ded8477b606c2a3eca9686f1f07a2407de1c3e00ea06364912b8f8f90734a33d7d6f68b64b7693876b1b47426713bc49355cbf86";
+      sha512 = "fa860c409ab5d77cd4beb48cf1294588afc2343d75cea07c717ad844195364176e14ced2d38f8cb91996899037d213ec04852847628cc4c87b2808d33cb814c3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/hi-IN/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/hi-IN/firefox-69.0.2.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "1d531f68e03763d49c03308d2cd04a84ad36afb3d19f7abed8528c39e7ac089912e569e20d3f6e177db5b17344d7c5389b7f0b2c9cdea5cc1be03983b2016c4b";
+      sha512 = "c14b6d9dc7e38dcb20a7676b8a8744dae145e8cb99ee5a568aad79e6c086bcc591232e6312c87543120b5ecc698abffa8c7acc83073ede8bccd6cf07f9e16aff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/hr/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/hr/firefox-69.0.2.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "cef89e675a547a753db64861e4d6c65ca6faf87e573099907aabbc6f7fa1a4b9f8e3fcb0de44956fc95ae95a9bab98432879c3273c800ed4cc5e363cbbfe5e02";
+      sha512 = "ae9f7b87fe869441e21d87956ac199440aa3189cb6704a3e55f08e3de5cb714a2c0eabaec9d33b2a0de40c89cc464f731412acb7fc7d11eeccebc24974de521b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/hsb/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/hsb/firefox-69.0.2.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "f038d4752c3eee035cb95a657ce4588c20ac32438d578ecc86520f3a0da6f89135a55b3afccb7aca833a9845742ef7cfed7638a4954697b3826fc97582190de8";
+      sha512 = "5acc0a8e09e77e3e98c0f4296e1fb410918db719de853ac3c0e1ddc028a19878bd7b31299cd2292cf54570e8c911318dcd32e74e272e15f7cddd9d74ebb93524";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/hu/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/hu/firefox-69.0.2.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "e66afc6d0108a36081f18d18c59f87b529ecad7d97b14916f2bcf38f19edfd61d6bae7c0c7fcee211484abe9ab003f432b7c56be32889c129fcace827e592c03";
+      sha512 = "82798f3e1105e75bcd0fbce330e01ef0cc6b4eac806d122bd448ef5420e9508355e2fcc477bcd75399c0f93b9be99d0a629356294b132f86376d279c45799b26";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/hy-AM/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/hy-AM/firefox-69.0.2.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "6ed9a940ed6c5c699b0647ff340f3b81a68cd99c3c8e6acaa7f0b7c2f35a9eb41402951834769426cafecfc44f5e3b66d21f046ac470b43d2507165d01c7ec3a";
+      sha512 = "b5f4bb43d12cc9337d416b8233f1fa025e24c6e818990018fd90097f762451775dc9d5d43be1dd7ee81cdacfdc071e9344d05ed41f6d6b28869b77273e505309";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ia/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/ia/firefox-69.0.2.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "f617f7077ed05f72c1eae5677691e5a62e6728d1c9d4fc92684306c072d96b6459eb014e23738e589d132f1e798ef36356fc40ce1f55972f43205a332a0e173e";
+      sha512 = "84c2adcbcf52fb3ae64d484b0683840579d6ac5e87cd6361709132c150015f909c9f8036fc6e4609c23a8faa0f53c4f27b15ec32fe04c7d7b839e8c30a720008";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/id/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/id/firefox-69.0.2.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "8d08c251b0890b378fe46c2527a089ad80b33e550ad3e91e2461d6de11e3f7c00959350cf9b61baefbfb8f663064ccc6ffb489ec65ae7f05cae8995b388fa6c3";
+      sha512 = "9524f5fdb0d1b5289a30fc2b0c0b37cc1ea45a99e9f8f6292a6d7c53ef65d02278135035cfaf4b8858b67f3795791434f041da81c03e7ae03fa0462403d3be2e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/is/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/is/firefox-69.0.2.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "ac4500d36d78330f569287a48197c927ebb8b73ad295d035137f682a7e51dbd58e6b7da7fe76997f538de71c0175627128e8860ec690c7e34d9e05027ad6b2a4";
+      sha512 = "1b5b416a431e067390610893dcc0101a194a552a1ea1251bdf8abca5590128ee313b17a5c2be7c21fee21037f5ae2270c016f4cdc944eb7d9777301d194f65ad";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/it/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/it/firefox-69.0.2.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "7e848f6827d8d169d6f00bd9f74bd041a6f81cc9eb5c77658ba6ad66d2640bb3fc615a7b5aad867dfb55496f464ebca41c38fb59aa410bc6b7c7b76867531dec";
+      sha512 = "2891360ad4b83a98bd4fe919eb553b5d52b5b07df05a4376e5cfc06e1391f1c007929fbb56e7f541361e156852637c37106a67b943e7045cc4db17fcc55321dc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ja/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/ja/firefox-69.0.2.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "45e31ec74e866bffe4fae630b8d2d183ba2caea16b53f3447e0ffbe6b24a1db35faf834c6dbba6d248713812d4023302bef4a815b050240a5995f1fb435cc0cc";
+      sha512 = "c440e77db3c5b9ed0a539bc104eabe38e271f5951d617abaaa3f33ab51573518a2abdbddecd711d087d3844582916e14ba4f1aeb1bfe6e1be59cffbbc660189d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ka/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/ka/firefox-69.0.2.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "10264908a24ffd4362e3ad0c766a60fa1eadf69c68e387482273427aacd19b2a2729cef28a2e32c99a924c31d88fb4b1642c570d7fe171f9475bf3ef9b9353b4";
+      sha512 = "09bc7fa6d98677149d99c8c0ce38202d6928956907637d3168816197b2470eab0b3285267d98e353b348a39a89ce0330eb3c969493027702a6324ca3cd81f7e6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/kab/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/kab/firefox-69.0.2.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "7ff9328a0d475d1134c511555e9f0e163506b86008b8bfd649b98edca4d62321f10990c3d71910d97d5cdd0f355f2ffd47907d120fe15b54a2f8ae153c489147";
+      sha512 = "6ef367e0e7429f93c1ac0664cbe63c1263af2d134018d1aa69a4616bc896e400e798f899791446fa16e7e89aa03d682a21e318ae4de809da8842c44e5778d674";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/kk/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/kk/firefox-69.0.2.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "67d5394f0f2eb4621c830ba679e2957448862b616c625f47be89b951d387015049bf5fe100173480c6f12b9b60a7688388b9118422777ac1b082fbc510a874b0";
+      sha512 = "da0dad64eca68f473aee8c09f6ed3fa3ced3f172415aca55ab68366dea5f75ea98f0b384b63be19c6b96a6d29163a91009118e43bd792de6f8c71cdec3d70d2e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/km/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/km/firefox-69.0.2.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "71b7d9cf1f161d2f3264c36872071751d19e15d71ab8b7fd4b34c4a3dccb24641de20ea202ab7f6bd34641f2e209c58b1b26425df4e24961e8b545ca274fa505";
+      sha512 = "8409553cd52554702fd3bccd3c50b4604dd39872a2caeca9d6bfa3edb7bb01f1d5f093ddf04fc826152691fc669b9881e295c3d796e0327fd4c210bdca01ebc1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/kn/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/kn/firefox-69.0.2.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "e8babd31e5ba80af0c4bb397ad6cd995c7f7c3e5b9c07a14ee1b8fe707b7d1a92154cbb3ae9a4e0c4266e2fbd3497ee70ca854a417799a508e4453e28a06284b";
+      sha512 = "c626d769f319c4cc155fa26f9bd32a2bab60e7260aa0237fbe9e8569a3c162b2e5285de8008a83e94b44f329f59af57df1c5c186fbbd9263a6b4da52120af13e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ko/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/ko/firefox-69.0.2.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "30db8bf846c844e3e246fab62aa35ce71a2762d2e364bc7d54e967ce970188dcef23dbb70f1e9d030b18e1fa3f20bd698fc9e1965d3acb46411430617304cb0c";
+      sha512 = "838316274f178e3498afee6bbdc245433f31a92cad50893729263b5399f3fe3f3a97dad77eabfb13648453bc3356d4c4fab3077ee71cfa801b68505f613babc4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/lij/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/lij/firefox-69.0.2.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "f76d3b05b31173cbff091a731513ff213ea0f6868352983b02d9495203d454478a3f78633e2a8452eee331157c759daae28295d77657faa9bee2a7053525cb7d";
+      sha512 = "7529cdcade0ed9e1a9adebed956a9f1c5c26b212d4ce76d3a75d00d9dd8edac086e6b9fe2f993d5071230b6f0f5067a9ac9281fc95a4c82fd6cf60f1647679fd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/lt/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/lt/firefox-69.0.2.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "b941a48ae9dceb7689c82a670711cf37af0229d8472f6006887cb2adc519262ead9471b23ad1503a9d1be5096769a58894821ccc7ba72de0fa820df9df1d2449";
+      sha512 = "68803d5c8aaf40a78fb6e51237fa36f72142f9ffbaa7c41f845debbedebab990cf6349736ac98ae0ccafd00c56c6f16aaf053e847b31cfa508f4272914d9948f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/lv/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/lv/firefox-69.0.2.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "89da4afe8892513ec831bc8f565409513d65dc314ac1cdb6e267940de6e572e93b10859b3ea05558a1aa7732b94fedc37dec18a069d3498077dcd20a04fdecb6";
+      sha512 = "9746365d8720cd416ef13affd40015c25c0b225fc10d9a8d5e28440ca0ffaef5a9ea72572af10f122eeccb9c95f6c0f86420bc82407b968e481ae8bbab5e59dd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/mk/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/mk/firefox-69.0.2.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "3d42d641ee18b664af649e16458984c13b61c7c208ece86035aba3f5f1165eaf074e17ea7030ac43c3603e55dfa8a739c6f4b7f482ef469577c420f732ee883a";
+      sha512 = "5fea92de8a3a040e0c2bc9f79c313bc8ec1ed5c6ac3394479cb5e18cd29908c7b5c6aa6e0f3f94590479712e0f1bd70e099d93ce4ea8bb822a65b7dba42ea78a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/mr/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/mr/firefox-69.0.2.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "fb71aae70bfa56a876f4d2d033f533087bf4da146245d8ec3601f340ccfbcf4c37d2c5a0702191c0f0f6337405f40b069c0fcde90e1bc208a1631cad78c251b8";
+      sha512 = "787ad5c7c176009199e63d8abd55a11b1aac9f815bd9596a80e08298e44f6948ded1c5d03ef23267e129aa7522169569b6a1d23032110c7522f6c68b8012702f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ms/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/ms/firefox-69.0.2.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "d3cf1b0401cf0787240c39cd31f523d41272ceaced2c219a81173a2ab746d7b0003f919c43fbeae4aea187c0c048b8af71f9e338ca2f4e7049d65d767df950ec";
+      sha512 = "682c955257f36be238dc4e6c4770eb65661af1fd6dc46a2b4ecd3d506e08ce602f22366e46bdba91d636eecf943fa0a5151f29536aafba4c488728abf660bd0c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/my/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/my/firefox-69.0.2.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "10b4272df10d520202299702aff5a0075a51df982225d9e8c826c8822367de6d8598cccec394c057d18ea5e9b965a6d2b6bf3c4f11a52b142d6998c2690212fc";
+      sha512 = "cdfaafd1720039202d569d106f484f6c1fa6181ff2d9128b1de3cbc555c34454391cb87dc9c90557ac62100731243de7f3efcda73d5bf69dbcfcacb76d65f6b1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/nb-NO/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/nb-NO/firefox-69.0.2.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "e73d077e21bdd3305b85454a256fa07c481f377edcc4efb2b743d51ddd125bdc494d3741138e8b576ae1c155abc8ff7e059803df1566c49a269a522086e35e6c";
+      sha512 = "9e147b4dd6ac4bef22c89f7fe7e946bb1546a6a0872e5d9e9fe9b6c7c368e98de365cf6d55bdfd4d4f826abc18a8992775e07552c9f14d1156c2524d3fb4d8e6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ne-NP/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/ne-NP/firefox-69.0.2.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "63c0f1f8bad1dcf2dd1203383577923b9eb5e3dc87d4b1d7891fc93b145327eb538b7399994f6868e7c998acf58f2cf8ae69f57722bf68743900abe8c058f2f6";
+      sha512 = "528e2dbca84dc8ca16393c4b037e0ae3eb95896342e5bcdc4eb068f5e42509ccdfeda1995b483fc76ebf43d09d7362a6493936588d4cc649a3547868d1377314";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/nl/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/nl/firefox-69.0.2.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "a2b3c2e791dd9d984b1772cc5db4c492aa530b389c03f234604c592749f7e0e689f10f563c4b9b2daab0ac71361bc77258c8278c0de7703820ede4b130dd69f9";
+      sha512 = "87cc2663920121c158c626be7a89a5a96d933f23c6e6c29958ee077acc0722c99f6e8728aee40e1a5249fd7af8259c2904768d26f7d0ed68574b4655e03334f2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/nn-NO/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/nn-NO/firefox-69.0.2.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "8b348a4fac00a9490966032c425f469ead22af7eda989e49080ca548e875b24d050a2e0447ab75934a4440341edbf7d2ec8dd04dd227c1dcdc7099fa160e5a90";
+      sha512 = "bee76395e5941618ee0ef3ce4e602aad58916456bbcc2d348240888810d86d0cc0ec7f24309c610988acca106848227b6c8427a59e231d6103a7e8e73a4b74b2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/oc/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/oc/firefox-69.0.2.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "8a94a5a3753689c66cc103bcbc31c9c4e943414c27fae9c64390699eed8e00ce30c904a60b83e0c19ab2fe626d981a33f85bb473c3f54b19e1cc225eb122adc9";
+      sha512 = "70ec55d6ce83982a3fc6e84a4850a580eb461abb92ad74d8674f5fea9e87ffeb3ea679bc2786d0a8951292c9a9d1bde008edb696121c26d9ecd618583b78312c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/pa-IN/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/pa-IN/firefox-69.0.2.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "c1fa222416168e97452c0e50894d257f5e13b50728fd3cd53331043248b111961b9fc0f106f375295a79ea48af31f082a2463aa25eddb5f668258dde1c299480";
+      sha512 = "38d808b9b4cdfb710667514d8d88dba29ab19ee4e33780791b1d6e8e3e01db532bb2e8297d4bca658e20cf65de18279d77e1af2f0aa0a2b66552ef2e712010c6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/pl/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/pl/firefox-69.0.2.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "01ca1ee21d42f093e3d0393443a91e7c5cb92e6cd9f90889e1d68f0690514fb0bef6cc295299856a5f13a58cae396e80c970cdc55e90853593e4fba285c066d6";
+      sha512 = "87a482bcd54044a2b42d2716102814a07f03254407abe7fe1d242717040c5981260f7df2bfa46ee2dfc709d517ff5e1d4ab8d203c0640503eb65edb39cc93601";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/pt-BR/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/pt-BR/firefox-69.0.2.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "341a9c074476fe17b917047a362775438dc5cce42a989d10695c248db5f1467f9a5dd41cd2ecc9b83132920bd85ba424bbeb5141597a95ab8098b6e6e3b0db05";
+      sha512 = "ac9b20c4719e2d9f4f77d52c850a32d25b0beb53d2e320f7eee4044f72543a5a4f0051060d9b0c30b50e8643e20bcb57e46e670a5b8b993a1b330c345e71acea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/pt-PT/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/pt-PT/firefox-69.0.2.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "4ff64a3091999d5171193be0022fc239fc61c0fbf4487754be4ef9b3f7f8f16055ce302617c68f66c8c0a0fcee5b8cdc5f91e5bbd0ffd9500809d1566436f2d9";
+      sha512 = "27a2871a7687d3d9037f5f983670d1f2e34d31221925e26f6aa8d39fd0efab85495f54dd7c154fd4974968ecb1798eed3177315575a949d9e0b9900dd2f34c39";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/rm/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/rm/firefox-69.0.2.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "b7d109e8bcf9eec1757c14ae1bf693ac7616296a112961cac39b5466609af5050cfc2dcb4b68801dca7a4a2b00f76c4b4f31bc325163aac88a012f0a318898b4";
+      sha512 = "f7e45e4f7b52a016eb97778340134b9d8f8358c7a37fafb8a29225323767147991030a1be996bf9f09ff777716d3a179e18e79ce784ecd3aa0df4167df5b1c1f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ro/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/ro/firefox-69.0.2.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "e8eae3c374b4ea0940e256946a21ed7f317bd9e37115a0b471ff656f194eaef8bf8205a8385b1d5e22f3aefab1be67cfea314b77483c6d9facfe58d757932804";
+      sha512 = "792d13d134c81a072139706d27554563fbc84f3063d71945055d13e9277f6b6dec13d4af0a2d3c3ffd5a36ec64dc1b6f2b5ff3634c19b7f4fe290cd16f997a25";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ru/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/ru/firefox-69.0.2.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "567db4e146fde58297868a7ae7bbe55f658e49578951513d6e0728b82349ebb7b631bff8abe9ea2305ca0ff3f12d6c4b1507cb6df10b45f7763b3a505caf9ac1";
+      sha512 = "ebbb9f69e090f61ddebf3013dfade85ee9d2b448394bbbcbd638feebea27f3e1dec4314644210ea9e07169cf81f06276c7fac42dd0adfc90087f0dcdf4b3f603";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/si/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/si/firefox-69.0.2.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "24db969220444eddd0251ec1f17ccb30ce73050f1efcffb5dff3475c69bbba46735236c41f1bf2910a4c283b1ffe8f0195894f57350031c7519c8080e6ab0958";
+      sha512 = "160b341ad9cbf78e4a518262b392672bddca2c54bc4695587afff79448f192d032cd1234d58c2d2be0d437a7934c7eaf29929e60ad57a431574ceb3e48e26e13";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/sk/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/sk/firefox-69.0.2.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "921d440d44adc69fde5a68e177b1d2cc7ba224e67f4688a4643887516ceaf713913bbab6e9b04a1ff01bf89f83a3b77709edcd603951f1a6d9b7b327a8c91152";
+      sha512 = "070a8c830a2424b96ab8a8ae0f590dc982b775fb237abab6bfb023d35cf8fcbe21bf608f5c684cafbc7c48f7849811c2c0deacfc73633cc85ca274c8348e96bb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/sl/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/sl/firefox-69.0.2.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "9b56d90ff8b53615a0356fc593c236ee577b8fc2ed751345da4961ddeb10c039bd54285aaf72c193bb6deb27e4aa88960d61b68dda892acd4995c70c44e7c7ba";
+      sha512 = "e29d6a7bad88f96656242539f316ec20116779f1160ec5795b8922e86c9b12bf6a687cee3db322cc5a574e5371919864c17fa39741f930f2cd32d3645e26a010";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/son/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/son/firefox-69.0.2.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "3bf49dd6a56efd4e855170de6964181fa3cb6e43eee637bb8458d841f863043ce845d17683b1fb2ca6b906dcbd2c9f4acda733c7fcb48a6718fff2f11b38590e";
+      sha512 = "48286ed90c08ff2fafd22964fb52791bccfd03a80f03d2bcc22141b4b8bc06fd05818923048389f80dd93046dbf28a1d86ea0612f0bdfaeacbcb45f0eb643e52";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/sq/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/sq/firefox-69.0.2.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "da7d3a5c5615a187d4bd8f8eda41c42060038ee545a578b31d9f0f2cb2f77c4f36f1ef3911230c09dc2d995444aa2867190c2b95ff399caecefa2f29f5cc9be7";
+      sha512 = "179c51438cadcf6f669c75d1db3ec4e79cf8a943cd2242d80727984c90a2bd7c167832e465e4d0510fb385bde450129ec48f4f97d4aec6d4f78d753a2d2cba7b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/sr/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/sr/firefox-69.0.2.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "753a31f6c534d7faeb775bac52087ca59321fb18d6c3c456e7d84ed67f81fdb12d666e5e481886aacf5e59b22249fb10ad75d2e149cc1f8307e6362058d00aa4";
+      sha512 = "96c8cbf9589a2b00e1318f5031b26eda5b44fd3be002f4d47f2df174452273baa36cb427b31168206427b23e2002ba4fac666803c498bf45b95270d70b25ed21";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/sv-SE/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/sv-SE/firefox-69.0.2.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "84ba83794b6d6be38f4268ed0c2d8e0dee4a543de1244f7ab88ea6944f1485d0f6383d029a24c5ec08a3d2e78174e6292ac5c641abdad5f452a95786636a7aec";
+      sha512 = "a8da64283b5c58693c91270a7aef01ae8b8332cfcef6e2c3c989ce72effa7de00b3e162f925dcec23cc1d9f7e29672875d27cd81656b55decc67d59ba2a5ccb8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ta/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/ta/firefox-69.0.2.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "b9d10d22b3ddaeb9ca5536399494b8a51029dc37e04cbf352850122e988f8e04fe77e834f8cb0fb80ac1cad842ab1617207c8c643dceaedca07e23da44f38020";
+      sha512 = "6f505ce970579f59fe0d6bee0a38754cb1f2762b550be21760199600c34979f6aa943c2aaeaad74299245ca8b4c8834a7d4349e328121b1db375e188f1675a8b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/te/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/te/firefox-69.0.2.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "76a2367fd1913a5ffcbc4072701448880ee5319e46b82bb99bc12b84649cbe09464447504f4a8ffe40695c1ae76a2e0bc6f46d797811592c2409e2acb95783c4";
+      sha512 = "a171b0bcdc1ff9a21a6dbfa4db5fa83576d16d51445384bcd83a9ffae908f9a55077cde70f22a34848b9ef2841b162e86ba9aa2ec4a8bd38fed9ca9e021226e5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/th/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/th/firefox-69.0.2.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "41a16d4d1ebb7e12cf43c748aa6eb44069cdfd6bb10482518d23f5e4886b10b01c103a0c1b53210fdb86bcc369ad4e2451fab6b4a4d3810b8dd7b3e8059a9de6";
+      sha512 = "63af749d36b86e113a768569f53791a3c8ac156434f4ed2651f1cebfe9ac565e142ec406af44245e76e661fe30c9fd070f7d8078b98c720699efaf63ccd88d20";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/tr/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/tr/firefox-69.0.2.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "e0602d3b4ccaaed09fdc740b8d445cf4d9d4661bf8680c3ab8cbce002add211e2f64a127dfd010624ccb13fe81270ff8e1679ec6cc0b96b25c81b4fcd1a9314e";
+      sha512 = "3d519e4fe21e5637a3ac0c9a4f67dc3a473fadcad2078f933d2126cf524893b638cf8a4b69522f3209d2ec2560821b469d89c873ab3b83da8f4515898003af90";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/uk/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/uk/firefox-69.0.2.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "bdda18234e4d38484746a06b254fef51139ef0022474b2bc3a21c8ddc0fef62d13ca6c7829d24605ad04aada6a6ed4e9e4e029014d6e6a4cc56b4256da443163";
+      sha512 = "0b155c61963a65a13b88d630f81407b5b9aa38ec2a66dd95e8fb125d740b9a802492dc799d3064ddb99d84e7d36d279c0295a77ffe06d28deafb211cea12aceb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ur/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/ur/firefox-69.0.2.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "7018f8f9c34e430acd461610e488968df3f0b0dd6ad53701582644413cf7e3efe0e83e04abeb6b931ce8755769baecb9cc25a2a94a4934f491079df968b824c9";
+      sha512 = "fcf8432ea95d66466ba8ab254f630924ccb05432d0b3a7424813149e02dc6a8db6b29c5c11be65820267189594e7e5bc4a9f7f3b9ffc80c1334bd24faab3fd07";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/uz/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/uz/firefox-69.0.2.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "dcb88a105c8ed02534b4f54dc9265330035c0ebc3a34326c8a73acc96455a63956c665f4240589b10682e06acd0b4302c144045c77cd98484a35b273168f4a04";
+      sha512 = "89e69e07500096124d9d5b75d82d76fa245dcb86973f588fd2db744e162b8a89971005e4ac3385a1badbf5e195fa04ee4216d0737ee0c5d51cd1995e9c03a107";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/vi/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/vi/firefox-69.0.2.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "43d695edaaa3c98e3607267115f1fec358c6b93bf79b2dbb5433ff98abadd6af54bc40f1fbe7e6fd7ee5a11558dc3266749b2cfaac47f8db818e554722052949";
+      sha512 = "5e8d1b3a719368a7466cf84f486ea5f8c26b6907bf69376291db8fedc18f8e7e2c7bd949c8b156fc4eb3b8fdba630395373d48032fca8c0e5f4b2a6d411503c8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/xh/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/xh/firefox-69.0.2.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "ed78cda83cc9207a84a013c01535a423b8c315464b0339fa684fc0c3c64b4d014d097816b115a6d80c79c725f3b376bf996d980284b75a774418f9999dcf6e3c";
+      sha512 = "dea545c6f6e9304ef94f9dd33c1ef39c862db7a4d9f0cefa81301dfeca1f898382229aa7ff960eef51b3f216ba69a70edd17a64ab6c936ee7cb1c0b5dc02bb95";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/zh-CN/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/zh-CN/firefox-69.0.2.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "079dec7bf78a3f1e8b3dc392cb30916f70fde6e1092a5fd4ac26719448a5ce8c3f3b86296b585c8d9c4941e5a106976967348021aefc37fc8b18e352091e0664";
+      sha512 = "1f09b9bdc8b7dc8e05132d8b448cd95f3241a539a4a76756ca3eacfb401e40251463a120596d33a84f447508e4872a71de50b509ed01b2b6f0d80d4d852ce8ef";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/zh-TW/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/zh-TW/firefox-69.0.2.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "24a30c8a29ae61a3a3b96c68cc56086985be110da3cfc10210c3365fb6ead7dad9450888c15151fa782f0f47326fa3611478dc4ac265dad63bcaf3e1a654d20b";
+      sha512 = "9a219a35dc0cbad6bb98f27d55b654e1b3277e30ddfc3ca40a436eefd3ab49854ad92844a9abb54993214a456858fcef317a3400135aabc1cc879734df70c858";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ach/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/ach/firefox-69.0.2.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "9523e53ce15887c713ed5664cafc89c41a9edb0430374cb7e15321e51f5f5f626e27f626f4a2475113f2c4dae9d3fefe18d498fb47166da59e7c4fbce7ae5bb5";
+      sha512 = "b8ce88a7adf8b4a5fb39fa810c12500625f077f31938c0215642e263611ef99982912719ef0e9989704e4d79100a2234123179a0e352886d7f6052184968cae7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/af/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/af/firefox-69.0.2.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "2eb5ec7b08ab03d99e40b1147878211be92592213e568fe1770b8a1e570c012a43e60ebbf708012b138a615587dc28e12d9512b732b3434c6144c21ef30cae29";
+      sha512 = "bbd7ae4ffc80f7b15166cf80589b406c0e50851bb1e3935450cd376d763fe4a54be138be16ba3d6de3d3d416559e626ef7ca6400500b3c80cdd5bab10a1acefc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/an/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/an/firefox-69.0.2.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "5eb5a56a0171f4ca0430d453c797d0a5de608ef947d1be3a471df85572658c631be78c70d90542ceb488f6f23986439acf101ac35949b55994fba1d4b7f353d0";
+      sha512 = "2086c62510b52f87e980557dbf14a859ab5a622b02e5ae04ecc7d483cd22ad1126a4ea4ec4736fee792fcd741630fcc5ed8f6e66759502ec583805cae0cf9011";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ar/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/ar/firefox-69.0.2.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "9cbf0bb2f75426361a015bae999e86c4cf033136f86f942def26f05ee91bdda8552f93f3fccdedfc01f2ce3366adbe7a89a5a49dc99394f57d95dae658df18e4";
+      sha512 = "391a85284f0542fd35363fea0ca566a3f06db3ca06c47017d7f3696cfd41ef56d97dd51667f80e04e079e187f1b214871d552ab6139108927353d5f5bfe6ba81";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ast/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/ast/firefox-69.0.2.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "c7dbf2fa1e9dc77a57259678a09242dd17d5246afecb395406e0f11f4b3d00f899e331c8e8ffec8f1b8487c710ae8adbde5b57366c029d8d2aa53a73c07df38a";
+      sha512 = "1336b446a8473fe82eb2a9fe2c00e683ff80d24629fb80c37378ffac713b4cd7a617670eeca084018da3b9fa952e9304f6f32a6d29a28213fa49f1aa9d52fc2a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/az/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/az/firefox-69.0.2.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "de4deb88d31748410c77994091faee898d08ec211f2c55a92c7b2fc447758175311c6324f35e1753f483351a76616944392a5e9201fe03fbf50ed6e8f11ece5e";
+      sha512 = "f55cc621d04c9d3899e35652a16dd70f299c7568694b3de2135c129369ccb6471c0c7b811182a9b5eb6c803ab9b2c169b99911aa2de30c437fd8eecaac8c1dea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/be/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/be/firefox-69.0.2.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "64a94634bddda83e516586b89feb329f93dd26b98da690f46367c31f42b2b7cc6a9ccc3f339c4cfcfc507b8380b57bc81244db41cd07407acdc82ff455f84241";
+      sha512 = "6638a25ec12cac9d753bb524d9b5531c31e11ce57fa607fd0a45ee602a34b32b7b46cb62db18d14fe21c15e4273f9109f04e08dafbbb13fe56e8b4dbb2511ede";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/bg/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/bg/firefox-69.0.2.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "b1740cd77fe9871e580557c2d81ee6f8d944cd823f5949fc25685e7a7c886e960a70cf7f86d6404f4b33d5c1da4622ed452d217f7c8fd1cfcc2062531948f0a5";
+      sha512 = "fa01acc679b88354fe6db0e1c757dfba339ef7bf4f95205d771edf21c62373770000db2f794e34d86a0e8a7ba31aa7d6d125a70a305fbbc434b84e8732e361be";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/bn/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/bn/firefox-69.0.2.tar.bz2";
       locale = "bn";
       arch = "linux-i686";
-      sha512 = "5a61525960b05d788b03f58445e78050680c7101b70c017d07f9144f911697f2cb113f0a99a6898ee738bb927bfbfdec73714b3e7820a3f5d10484f9526dce97";
+      sha512 = "5ffff990d4ebcf3933577350777ab7bc7798d6e8ca01a4cee42f20c90473c48d2c91884868c22c44153894ced374a0ddee7e8aaec5c3d6ec3f419c20468e0637";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/br/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/br/firefox-69.0.2.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "9791d88c4c3a3ccef9fc59e4ffe74ef4b16ff25866643cf1ad43cc727d3880568d1d76c1f5ef4598c3fafb83f9e1c53ca43fa614af572525351a46ba646c5c11";
+      sha512 = "2af02050e3ef328bd4669f99de250eae122ea13997428b94b13ebc2ff66bbc9d49d8ae9660a30c399099ab700bcd2db2ff2ebfff7e40e379ad119315dc8bdacf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/bs/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/bs/firefox-69.0.2.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "a75b91887962a52b9a24a7bd7d268baf54c5d65e03f444563f2d12af36f01fcf9ef3af17b642eb1a2dcb365ab58cc0c6e25bbbe94aee2c3c9ce487f57a0f5031";
+      sha512 = "c311a75c53820fd05fc41b02e41a70ba6f3802d1d48e1e66cc76e24e7f74416034cdcdbcd189bac0d8b88088fa5530deb22ba6bd04e238a0ba8de13af760fcee";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ca/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/ca/firefox-69.0.2.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "d5489feb1053c4f14481b8cbb3c55c9e6e99b970924caaf7ddda32d3274efdd24d4486ca46909bc469b3791ab7331b25a0eab476ac158d807948ea79aa8c4857";
+      sha512 = "3fb3cffe26403fda0c578ac815cde6a1d79227ad1cb4b27706d805af0baea726f292a79bab124204e50e90e07fc61a921554a72a19c6960fed846139ff7efec0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/cak/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/cak/firefox-69.0.2.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "ecfedf3b03bb6d52fd43e077d4caa1c09c4a3c43af99e0f5a4089840d507484d753e7a8f0a43bb35b73250d21ffe27f38126ca22b26a06eea494bf89627cc906";
+      sha512 = "0f862f6dc7af2dd8f880edb22c678a20fb0e3a84e3d904c882970ebe7c6d9f66e33cc6d2a0644f8e4416a45bbc44f712bfb51b2009d75635317870d558fdeef1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/cs/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/cs/firefox-69.0.2.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "5ce4b41bbd50e3ef18364e32632eb39bb25750910d1f5792797cf6e20a11c7bcb65ccdb7b23d780af80552363e7502ea22076bf7b1e7664d7b46b5403e32ab2b";
+      sha512 = "5716fe5ac9ace990cca650ecc7c169cc737fb75031d8eccbc181f79acea019328a96d0e8132325a0161a092e051ed0d26fad60c1426ae8245799ecc916ac440b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/cy/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/cy/firefox-69.0.2.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "35ec97df8aec5981ca3edff177a83a8fa52816674d77a7f784cb9939ef65c797d196c7b6512d16307b9a3db8afbecfd958d4b296b72d93d36c01e372ab358175";
+      sha512 = "c903d8206a0175c5c34a1b4fbcacd5b8139adb721cae921c586851ada8d29880ae1e601286a8a4bdbba8f3f25e9943b63cf449785dc8489ac2d437ac3412bad8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/da/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/da/firefox-69.0.2.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "ebae89079a202b95601d511d0052989bdf41f5dc7dd76037536982c12ff39f08ba4a9081d41fb0b9571ac5fda7fbe228154c4c437b66075bb1f27aaadc0adac4";
+      sha512 = "b2618aaffb14618e7f649c9dea62ce945d5db8a13d8ca71b6377d03df30ac57b18c7d009931704c4be6120015ad39128a2f1f6953828e5b3df5eb4c92aba900e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/de/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/de/firefox-69.0.2.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "13bad87f6a65faf5f6ae95e613b199102fbd02204670952cde280dba7ecbc25a201c1a4c424f1ef1bec85a9af51b523bd82cdab612e0933c68b3e257c84a980a";
+      sha512 = "03bcace61e808f009d4bca532f88ae1fc145421cdc4f35613e4224c0a96ae4b251db1e95041da3a7cb4ec96c438a379fe3fbb0b84b672c881f733c300b7d925a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/dsb/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/dsb/firefox-69.0.2.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "32f92a1d47e83f5f3b73b4284adabff6282e65a5df7a2f3e4c76e5e0adb7332ce071ce0b250346870b79df8ea6118b51bfde7604d054dab86f230ae261eea8e0";
+      sha512 = "a8e9a7e62a84f9dadfb3028781659d3c7df23b8d922ae8424bed8a0f3cd61515c5c41f70c1d89f243fe949953e7885713ecbf89193ad78bf08c23402e27db478";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/el/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/el/firefox-69.0.2.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "b524c8dd476df29526d030adace43660085b5ffff42f3508caf22a887e4664367606b57d6cf47911e0b61154df10c789b189ac897be80d994271a4464ad3de90";
+      sha512 = "a34958a80d35c01dced2a53451d300d87b1eba32154ce15eb1588ab7c2ddf4d9b521c60b6746d1372c63375826a84adb3dcc61edfabe264ead2ecc05281f2e4d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/en-CA/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/en-CA/firefox-69.0.2.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha512 = "005808f2650cb486b718b2fe0e6fd28cfee8b7bc5cab336421cc6cab70a56b0362214853f51410a25680b2cf4d8f528a274ac79f19f6235caf073ade4b1f9882";
+      sha512 = "151471c8ac80ced526160a53c9026aa4c374c48e7a4f548da386f744a2769c26b36b67566487933c02d8eedfe839cff62c7496b3d91af516df20e0b35c9da8c5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/en-GB/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/en-GB/firefox-69.0.2.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "f9162f83614e6f9ae9a471b92597ce10090577a0e76b10dad397b1222f0012c44dd8f2e3bb8b28f2475b0371ddde37874a24edd75740d0d0a812dd4b5760fc5d";
+      sha512 = "4f618d64d981d633dc305e4fea60439d382ea0245212cbd1945737bde2d1afc65c69cf1ae33a609d775879471aa3a125bcfb1b0c646c5a9cf905ef0aeeacbcc9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/en-US/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/en-US/firefox-69.0.2.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "a7faa84a119abec0905718380bfc8d5853647d75b2d36e8bd7221b10868778eddccea5652f990a8626dc14da6b3402ca7adf5b7fa9789b13d6d460ee552d53d6";
+      sha512 = "a90d847edef53119ba8014501c6fadc940085054a6fdea3d565e31c5f054b1c1d1d04dcdb9cbca8a2a123dd0080a36e7e733cf4178a782fbebe7069677b28f23";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/eo/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/eo/firefox-69.0.2.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "90f02c45bbe91a3fa830967b32776619a21066af4a4df8201ad60cb0bb8d092b814e0d44a40bfd047635740381c223b7f4d17814408983c2cc8f1577fea3c9cc";
+      sha512 = "6d88b395dba7cb3659c701e34e3e8dcb676f906b76e5985fe6b00e7f35a760849d1f265d81046854b7624f5d73566ccc4d402b31b302aa712c48e374ec0c4275";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/es-AR/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/es-AR/firefox-69.0.2.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "a1d40686834a78b02d9ddb4b99d26f8d9c44ad5a7d36ac47652a013a430dd392db6270498eaff2eb7248808a8a23cc57572d6f4fa18f963587cc95381f75e7c9";
+      sha512 = "dff444623c2e36adc9bad96397a852a1b3b48b693ddc36fd0293025bf9ba74084e2a31c24bffe08d402cc4b55b95a7845dc26db16cbfd0720e51b24e17ea8b1e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/es-CL/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/es-CL/firefox-69.0.2.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "761a6b16ce97e28edcc630f4edcee5636a0b112385956ddedfe2e18400207a149ae3d0275faf9f992ae0461108646f258e7ab75e93b9cb6f0c4900f61277c5a6";
+      sha512 = "483e69faed459cd03ba2b23cec038634381ee7f6759d8947cf741da667891c9f9bf2e0276d4fc754cb31281b391ad22170ebc8e710eec8aef65f922e4293b8d3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/es-ES/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/es-ES/firefox-69.0.2.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "656e00db3eda337d6dc3e0bb69af70eada522cdaefbbb48dd211fb23df12c44bd48ab02e082ee711de746f2dafa52ed918b6fd13602a04b40eb58369b1a6fe11";
+      sha512 = "a0fec9000b79fc5852599de23469b623d1d813ae3c7731924e579967b1297261aec6ab73d605e4171725641f2cec17d8498503d16e93a371767da7015042d69b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/es-MX/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/es-MX/firefox-69.0.2.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "604e8397f07e1dd8337ea66fbcfa8c208ccc183d482881e4f7c2a9839ce6f9f14a89e6b981cf5ec4ca75332273af63458b0f716ad34a64b6db140db87159b85e";
+      sha512 = "c87b41584fe94cb995defe294402ec879fc44334f669bae1d5688bf661d6fd43f1715f221634bba930513fb612cb8602f5bade200cdc27f55611e56b709ed049";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/et/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/et/firefox-69.0.2.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "d5371374a98c8a9d678c8d4b4f3d3af7152f461bb111e4451594570546acb5d94756eed0c6135b0d72e0c7f455f50c5654ac34275a06c60238749ea28104ed92";
+      sha512 = "d28baeb886d075fdb60785476cda5e133fb4afb3108e4d2aee0fa87410ecb556faf7678cf2557dc8e6bce1fd1e0610af9215ed16b5bc92a57a9c789ed5518c5e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/eu/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/eu/firefox-69.0.2.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "a5783b579317a49ee50a74c93b557a3acfe02911bf14e1a1efde185160a4658622ba635662530a4fd9e5c7251061f8eafd3d2421fb4f8eba19da5e0fabbfc8e4";
+      sha512 = "c36b95059cea376a02b4a64161e712ed262d8754994168181278b8d87d806abbcc217384c5610aad6ad42a0372cd828d3cc081841c3ff89f805eec37d1d478e3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/fa/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/fa/firefox-69.0.2.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "70655dcc91e411d3c430e0def9d8b7730922ac4fab9b902fa08f791db6e7d3104fa46aec2b95b91b8e56654778400b3760c4399135ad008aa029daecadad57f3";
+      sha512 = "e668003d18a987b1bc08d4736d13cd1766b4e225740995809066c65454b03ae0354a13cfd971e032e79254d6ac8d2246d94ec9eb9be807751d01c1742d3a05ca";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ff/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/ff/firefox-69.0.2.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "d2ff78a9f318a9d0c74aff45d5559c605048bd3655ae4c0cae3018ff9c2f7c030ad5740c4010f1ba59c51633c35b2649f21d84a827900ef3fe277888042acd6d";
+      sha512 = "321cab5b4d231ea2b9623dafba4fb4e0ae3e4f9b283d202ea8540daa057ed7b066dc52382b24af9b19711af0a79f5bfc8b8072f27a26941b9d6f6d7862fab306";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/fi/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/fi/firefox-69.0.2.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "9e8ca84d3e9642ee8950aa676182607d1c19b379389605f4b9311266e15c12d3dc6cac6baadad2f71d09e8acbe1a86ef029002fc46e39ce993370abeefca5eb8";
+      sha512 = "d63e5bca29768a6e10fa1cdea04893768df29a39382ae65c2ab64c76e921790c628f3728bf5e7b93d01eaa87af7e1e8c0464fdf9b1f562a22c3736cba27db9cc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/fr/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/fr/firefox-69.0.2.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "0d3810f2c00119277f1d7db396db85e8f82eaeec1db5d0bd7b10e106852140ddf704a02d4a93bd522c7a5b7f6f5e5b0457265cfde0f965e3442f42f55c6dd1c2";
+      sha512 = "be3b4191c10c8d9e001eec25d93d7b45c66cb80c5752d6d98994a3a4cafed513d527e0d707c9d4e387c1fab613d4334707a19bc728901f26b3a8a116685b13ff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/fy-NL/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/fy-NL/firefox-69.0.2.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "2fa52fb095b4c118404378cd1435058634c5dcd77b8cc76d9f9fdf7596006ace8bdbfcef3fb7355022e241c4e35029b0fc44b1284293bcf473a7fef0df36b0d9";
+      sha512 = "346c46c329577e990c74e5134b9bec54fb4f892c7b5e52f45a0e9d460ccdcbe8e3c8516f894c4183020c9a60ca26ce74cd3a0867afba6513bf5e005f88d73e2e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ga-IE/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/ga-IE/firefox-69.0.2.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "d2204a87685ab5bfb03bb553c18793de4774c563b40bfd13f8c7d50c088a6944e646d01fbacc0c16189da3f214a185bf82aa042de56d1d63ed020483744612d7";
+      sha512 = "378bc4c3bb2e9ae8c4a8eebde8508fb21d880b6d2c8f46f934383cfaf6b046fbb282e1643ea491e4349d2fda73978c9bffd1c8c22b9183896c5cbaae91d72a03";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/gd/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/gd/firefox-69.0.2.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "a0b6139fae5b0629f5263fae3175fb7a45218c82b1517f97d52d4e65e5381dc0a15e05c1bd1896352681520ba7f213df24ce4878c9b9d4254e17a5a903d6e9c1";
+      sha512 = "b539a54da10439d874eb8cfb996ff5199d7467ea9f454f9d762d7094dfdec14353e12614f5bd5a9d3f7e8927ad787c254764562a96eeb4b1d0e86a4fde1f0993";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/gl/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/gl/firefox-69.0.2.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "6e8a7f461b5d5c20ce60c7308a44c19e76bddc8637be3b5b1d2083434c3e213d9f21f6596573503d4cf5fa105cf7a103c038892f052f5fb29b1d6c64d11b4bb0";
+      sha512 = "c540869fd35a38446c3846167bdc7d9448dd2110cc2a2086cbabab133cac841a5c1b5c1fe0cb4d91c351dc78c8e32d1a11d640d5e06b0ff2ba82ac1f697383a9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/gn/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/gn/firefox-69.0.2.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "5288b63758ea97c3349a5e8a427479f2ecdc7f855790fd05ba1de662e1997352dff84103076a923caa67872e849b1af5c2c80168f52d258d1e3f0aea1937a0a3";
+      sha512 = "c69667a0fa55ea3ce6baa9771b9fd1d79f77eec1955228e0b1702c7f19d13048400fe41459847f06a42ea57fc6a6f10ed7629c19bcff9514121331e58bc3b46e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/gu-IN/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/gu-IN/firefox-69.0.2.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "4e354642853c537ca7dec9bbe184a64f575870d8017c295db053364635c54ac8cc8e64a9686625b567d99d9055149a9d053a44ae0d145f91b01610570080556f";
+      sha512 = "ee89d19d539e3738f64ab39933ca974e3c4d4f8e6ca74c9cd925165a35663738deeee2f850c898ee83a9182a9466e5a075528d8fae573cead952c5946349fc3e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/he/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/he/firefox-69.0.2.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "e627e7d824cc8174430c8450e1224a61a50cbf7a2fe7ebc1cbd13449c155d2334e40201b5e4190fdf848d7e53edd177bc70caf3addb220dc03fe1c1bf0fdcd6a";
+      sha512 = "28ea17f2930c998d240389ee4fce00344ecc53bcfaf232a6b643c76aace3b2eb443bd2dc01830d6435eabc0091ccb466279dea6df4a36511963a97b192cc30ba";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/hi-IN/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/hi-IN/firefox-69.0.2.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "100c109d4668f1c5bd559bd539ee39a556eb03ac29cab0824a8d9f9121a210632d4fd6aa6e15f523df3bdaba637b5e13940e7afe25d1cccf85ad91eee693c89c";
+      sha512 = "5f2660e0fc98ce6481f07ea118fe270e18d21088e421ce8a53f38a180c068ac6b6ecaee7bc4fad2526ecf06c9dcd60d87ef8119703d8904bef9732592b699268";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/hr/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/hr/firefox-69.0.2.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "959573f7900c124dad817dcf526afbfe2a108305e96a94d20a763e19fd6c151b5544ab41191b731ed3881be38f78a29a747c9aba087b82ef29bf8f37eb3d57e7";
+      sha512 = "11517b04b45cd49a16909532d950508ad566acac98f4b464cb124952c97989c825302df84027198a7ea85c7ce227904aed7d3d229e22b8988678be7dbc2ba556";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/hsb/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/hsb/firefox-69.0.2.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "4832103eb5ac251f664fc68b044b1bad78260e90be1ae9d3c149cd4d36b98ab1dae3cd56f135e4a7f46bad65af4a368d77717c332476d0faa453655ad0ccc2c4";
+      sha512 = "89e86cd92e70f5ae038ed967597822de420160a1c57c61d52354c94a98b4a3b3624645a1ac774916cd3049e6dc9c2fed9bafdaef28822754c8891cde3f2180e3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/hu/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/hu/firefox-69.0.2.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "2f48f16eca53488b2d6a633913214d17f9be56ed84b86e2dd7d2134eb0950d3211e674ec836fee725d08d08042800fa72fd808dd1806b467a2559dd7113aa957";
+      sha512 = "7acaf642e8ee366af432bca7066631270d035979d210d7ce23831b54096e967a6b7e870220fcf9eab048df6e0d3bd71d2851f39382d666b305ad007147afc648";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/hy-AM/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/hy-AM/firefox-69.0.2.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "315c10ad3c3787e7d564ed563d03b86204e825c9e4a5651a47568a543feb7bbcd0a5243ee8878e7c60df410a578e2fa69552d43ab2aa819e43124b1ebcd66b86";
+      sha512 = "0fac10d9a34f19640fd454fdb187581d2b745386b0ed40c88890a2a0b4c1336a9d07624f7faa466f75abfd60c7efccc6c7e59e2aeb0eab1e90c4868c4bf3c9c8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ia/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/ia/firefox-69.0.2.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "376a0f09596165fc8c1f5c3624cab6b3ed0f512826504ec94e874b0f856ea3282673b99a6e84c0bf0a08ef76d9d11544c25cf501f3f2ca88cf3f6c00ca19874a";
+      sha512 = "4ea1fe6671a8965d159e4244e610f3058ff40c1e5236cf9aa7019db0685a370084bd692cc4f9e4800e6daa701c5eb2492de4c66d9fbcad0a73f5209458b1c813";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/id/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/id/firefox-69.0.2.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "7f2acc92f59bb0568b6ea96d5820441790b95377f56da5158bf41a311262ff90bee1259f3917454b11f61fc6e4b329ad938d1116e8940fb28c529c31898a483f";
+      sha512 = "d7b214515f4d8015439c9e8c99f1d4e9a4bb8678bd3ff3310dfbe497ffa61d886afae690d42fd0ea7dd23716b3d26026a63c4a4ccb5c7ad4e8124492a05089b0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/is/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/is/firefox-69.0.2.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "4d714ca45d2d7bce2e2798c3fcfe7c876b024441a55c53e82c81cca572ebbbe172127ea005516c5729b49d4517fecef497946a45e2768e88f5b648cacbfc14a6";
+      sha512 = "ffee8ba2d33edb4e2b1f13d2140491baf53bb9965affc604da4fe2a441f5b2f402df366da303b5261e2d8a3de40b8ec54f9c675627cf7ce14098bd513868a59d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/it/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/it/firefox-69.0.2.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "57fb82bedb27d1928f5bbcbf5f0424966d1b7969df07fd6816d72976fa7a7ead07d2dbc644079672b5831fa1339104d5a9dc58f662b38dcc719e54cc5ce8e1e4";
+      sha512 = "70515a2abf2dde0795a5945073f7f8065336b9922b5c25dacbfd7a165171c9c6e8d73e34259f875bcfda3fa2aff5a35563c37357f7b6e97d177b209483064c05";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ja/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/ja/firefox-69.0.2.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "9b4bc5aa16bb05132de7b894cc118dd07166a5f8af603aa206f8e52aa8029532f4fea7236791ed1f0d8d43214240ffee6297969b030750379631bb55ea105609";
+      sha512 = "c2a9dafd649c7c08ebae2b5e3a6d8f38abf7105e64d2206ac7e007bbaadfcf7b60cca6259b77b22881065c885a5a88d0484f2486e37a5af689ef53ea936b99d6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ka/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/ka/firefox-69.0.2.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "d0b789fbb3fe72bc8e0f4eba595d8015ef6c66fdfd6e8d699ef15071b1e83ed4d5245f7513a6b7122f0852378241fc2ab01047f4d968dbcf40dde79a7524fa30";
+      sha512 = "f7ade5f8f34a12f22596f5f91a5876e508f40f42511a57d5ae0bf72cd9eea520f3e6f25a93ed75bc243931b2e2513067eb538798218179baffc88452986e07c5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/kab/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/kab/firefox-69.0.2.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "1aba37ef9fe09a5765ba3b4dae2165373b6fc0b1a10f6705835cf70af0797ef024256d42b7f67ee9b8eb2d93010bac165732d483928253d289d39260799cd450";
+      sha512 = "17b20c0dec71766064fced196c757d6b6bd98e50d251e499edce9656d955729643e85b27492ffe965de3d5bb7693919bff4b721b34c3495fcb231adda7116c00";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/kk/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/kk/firefox-69.0.2.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "34be7310030481903c867e3d0ef69cf87dea784804190db89109703568515a933704d81d3aaae2e900be6b96a99a48c5d72ce860ece0418fee344b73d774fdea";
+      sha512 = "fa1da75b80000391fe9267eff190cd6d0b152737c77425f4e553be65e09b181c909fa63c88189cd90fb34e03ac97a3379aac098211cdb50f7d82751db3bb36a3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/km/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/km/firefox-69.0.2.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "62209e5ec47160647d160a8c74ac63ccba4340704e6408cfe780ba6215a1228f994a6b3af5d7d44438effa778377fe31993e255bb6ec4e8eb622eda0f6e6eafe";
+      sha512 = "f73f28f0dea884f83ab9c0e1e239485689c5aa46bf5aa88fb459c2cf4e717af02857f1858488c5c886c82f719086395f6be4f9a2802172f96a4c1fa624bc50dc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/kn/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/kn/firefox-69.0.2.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "ac1fc4c0c3b8b6cead2eef3dffd208eee7cd215aad444f23e00acbf390b933486cfff9b26a34356c57b85963d546d2ebb01dd8e22615ce58df0e1aec83d7cdb7";
+      sha512 = "e777d4c9368b87b771c3b32c9877de90c417a2612d89c88b856bedea0f139482858e48705d6a2f7845b9414d49531e9532bb13462639c36999299b4d094f6e2a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ko/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/ko/firefox-69.0.2.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "a27d76e6acd03b1dafa9b3931a8906d456d35216947b37148eaf48736be18953d83e3fec01914812a8180017ece34662a877c2aeb218404ed3f1f75287b5427b";
+      sha512 = "fa22beb017404454f729f3b2edd1fcf8dc108a64daee0df17782e214440979eb0985d3c19934ed940fe650ea93c906328bda3a724a6a42967e07f37cd4ab2af4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/lij/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/lij/firefox-69.0.2.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "c0dfb7d36b87250edf7eb2bb566bb46d9ba782d257e87f6e3d080972d2f1cca37b6c41201fea7fdac86db471eadd86c2e2d8a4f568c8d89e848653060e01dda3";
+      sha512 = "974dcd6ff8970360ab11f81b1b3015bae66ad959f2158c476a539202d24eb85ae02dfa1f4178360b8215a8260ab0a2b11bf97fbcf7c73b79e3b594517530eed7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/lt/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/lt/firefox-69.0.2.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "9d0990670c808f2e0ea2d4033e4a33347653979d9eb228ba7811069c5e2559e66c50eb8b7c5e8e4ffbd7916f049813b52c3035907d15b8df9dfd266a31a92883";
+      sha512 = "f5121f98a06ee04040412606a6023bd26307679bb50ef93e607b51b6397bcafb92d0176c3407c45a48f3e21ac111e8415a5083d7a36e942160ce4a99fd17ef6c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/lv/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/lv/firefox-69.0.2.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "0369ff96b5b31795df415f9cb7009208a6e061acd384e0eae689b6cd40e74c737c3137c6de001f4149cdde7f6e6e3ee24eee5d69ffc83426285cd109a29b5441";
+      sha512 = "df5128735ea116c025ee7161f993798bddf7a1e18ca3bac24feae3d4dd61ccec09d95a10fb19f12cd090b8645d3f0776e608628fe717deeb2e8eb9c42d1fc240";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/mk/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/mk/firefox-69.0.2.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "89f9401be25014c9b209fde3f2696462cfcb8b700163190c7c81548dc610c53d930cde00b8d3e25506a2e50d55cca401f856c5a80e2d2a1a1c25f4ab3c167e75";
+      sha512 = "ff59e4e400ed7faf2f7ae6c277083219fa8b1a6f9f84332d2639d1dea02cc7e7a7644d7af540637d299573e3abde03a884ae657fb225349e11266bf1c169b9ea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/mr/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/mr/firefox-69.0.2.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "5fe5f6a7f498d0c287bebb9962843c8d94f1f07245f55c8c904e768ede8fa41ee8b63628d63f03f73c9b46f08c1a10344a5267737cd5d89b7667cce7359cf01f";
+      sha512 = "4f8a55fbad666b39617f8c3fc6783631cffbc6e6dc97d8047b561d606fb7a010e422d1911df16d965a3fe2b871baf23391ab6aadb1768cedf8065807e1f31501";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ms/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/ms/firefox-69.0.2.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "8e38689f618fb80958b8aa91ce83114f52542c4ad42483f694df1b3825a1dc3de2cc34d61cac5fc55b2b35f9dead7f31e7ddd631f9336c5cf711f02ebbe9a2ee";
+      sha512 = "8aead1b0d2c83e50c59e626ff77027077d26cc2fadcf702d4d825bddde58bf4163a5c5f7fc179b0cd9cad3c899b4f3e529e660e20bb6ce47a699d312bacd7b3e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/my/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/my/firefox-69.0.2.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "5a8c6ac58cfb35b12cacfcbcf933a7aeb5ed8a425e15f9953746e593c6b15b517305d7e721c89d8fd66967f4fb3de0a50f1b6fa7dc4010a120f9d93745aa4e7c";
+      sha512 = "e60f014d5f3fb838451541fd1a9dffeffa1150f449a38374c981dd8cb785decc72027a207cfe0e64fc550166e931f86793cb1aadcbede8656818452c36e2ebe0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/nb-NO/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/nb-NO/firefox-69.0.2.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "80cc7131d33cdbf49a346ced7f8a771e2df9078cfca926e1eca14e15464dc84d574efe9212031f986f8af7b339f0a16a31c0f492ea19b4f728763124b21b30a7";
+      sha512 = "a5ce10c96f910ffe60f926599e415a30f1ae22f78cfe837140b5fb0112a5126f7fb219259eb7c1ed8c89e476ec5bcaafd17e0422f66833ba87c58c8eb62993de";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ne-NP/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/ne-NP/firefox-69.0.2.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "42cc3265931455e4be0c4c0a25e108d8af14d786feb232d2b5c66695a9f182fb7d93f604390620c211aae38ab7e9d76d6e498867d886badf19a4034ab08503b4";
+      sha512 = "b1e90bb61b75dafa61653a340bd80331d0c4a93d5aaa41ad944741c056acc62b16d2243a6618c99d3c9f69b6bb6993cc509476052973cf68596f7bbf4577f10d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/nl/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/nl/firefox-69.0.2.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "1062c28e1a5d8ea5aecbe1af1b4b70e0cafa362c5cae1a5f7000220acb2f658cd3c5ccef8ea5bb35d6b14ddb211b34bd3a0169baa9d02a37ddfc1feb90f61326";
+      sha512 = "5ba6a608aaa0125995c5e4d8f62f4e61a48159a60632988c0adfbd63d90c957fffa2517cc13633fe3257a60bfec6281d5550f0332810ee1aa75400eedb1d598e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/nn-NO/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/nn-NO/firefox-69.0.2.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "9c0b4f0ed5cf8ed2d8fcd71c6d72f09a736a339dd83318ea5368652a154e05a695254fd4e78a3e8a185e0c10362e649883e772ff7e64249c6c470d39cb690f50";
+      sha512 = "f8f5325e0d724c006a83ba41e4232463c4913753280b508c38c505e79c46029a7fe8ddb9219acdd80ee5c84b31a759a54ad961b6e37d780db7df5b527242a72f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/oc/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/oc/firefox-69.0.2.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "407ff179331cf0dc5ae6061f3f5e1f13ae7df5dd5d23b664bcaeebc95e35e6c3b5307a5575264cb0037cbb4561d37dc68dc69a5660729a18593f9e3ed25770e3";
+      sha512 = "1c2940a380f4d58cc86be0946ca437e29fbf3072b1601402831faccdbc3eac85b95d435257f818b07bf1881dae618c619fe2453b8851bdf0796d907c609ea69a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/pa-IN/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/pa-IN/firefox-69.0.2.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "c1efcb59556591fa2de0568fffd0b6e29835144ca6cda471153c2336b4500cac0d367de84ef345cdd6d995297ec854df97380592477f42cc3f197b1cca443fd6";
+      sha512 = "215759a9748edaef6720f3c9146e610ac067f9e92f9395ca7097607692801ac56f1d4c8f02de03307144d04bc54345239e1a92470d4b6a0a16a886e5899e9aea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/pl/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/pl/firefox-69.0.2.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "881e8e438564eb7de648a2bb9c199e184edee3c97382cebb989734e0d6aeb5c213590d6ea04ea6dbbe31c085e62be18172e4dede07d8d8f067de0b2e52d709a5";
+      sha512 = "fea49ac1dd08b0de8ebf4b64b026ad1511661a92cb49b3e600917a37a4f7e8b920dddf6e50252b53c6edf74d5d373b770247632886689d87a1c489b8d0c361dc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/pt-BR/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/pt-BR/firefox-69.0.2.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "b45f8802d0a9a1967b17f09bc99bc6761befb676e901fd0b0dc891f0d222c8d860337c70931a082a8508c68cc8b259d460e0534bf9e276c70f69a092f70f49a2";
+      sha512 = "f9fb77f1165f3230408a620cda6df1e0ab3fe749f34c5a8e33e8de52764e08568ca3e642c49b9eac33c52f7d33bb41a7df2735ea0b5960e64d16d3c9f1b35b28";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/pt-PT/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/pt-PT/firefox-69.0.2.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "2b04403601a5c43fd1e5f4f69f3cc5a3761b1d017c97f3b9997317bbc4cb0960aeaac4df1145a8e64b64aa2397d0042fdcf49b0f01d8403b5d63fd26812c85a1";
+      sha512 = "23d029b3187a6de32037aaf0872c4f33de4664eca779d9fc7c10b2aac04274905aaff61542a0686dd50e56c60ff2db56ff981a0124eaa268dda27d74db8f56f6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/rm/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/rm/firefox-69.0.2.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "37f0c828559cb9afc157765ea87b3045f827eff59c2a1fea62fc75c3b28886191578bd81d2f44c9acd6d9da0e63e67cc155724759e424f7f2d91ec3256a7f899";
+      sha512 = "cfd45aae4671eb2c4bca7d397b5ea5987f092d99944adf6c3e66ec4b40f044ee072ad72fab5e62acd13b2990ea6bb50eb6dd42abfd735393a77d959a626eb1be";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ro/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/ro/firefox-69.0.2.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "23a8b2753dabbaf2e020c0cab2359dbfd99e260d17346de48275941b43134d1b6fe844498e4fda10e5323adfd459757d2a1da3c82b441ac099455b8e33f2cad8";
+      sha512 = "2ac00a6503443b1d46327eccd94b97afd2a4fb7ec7ed108b3098c98a3f9da3fbef949d821274b596dd9b5c243396056bf50c6a21a854de9e91bb2f2a8cf71749";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ru/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/ru/firefox-69.0.2.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "b8999174e73e0002c06077575ed9a2b8b1dbbcac162a8d53eccde1a3ec50ef5bb26a123e89a5f38029c379560c0b6c67e8da355aeb42d151504fdf3cbac5bfab";
+      sha512 = "17514d91496849a32fa830abe5cad8ebfa23da496af57d6c79ab46d7dc0a9c6f25af7969b23ead52f7a56385a4d22cd32503ad26d87584031aa080b689ab4e9e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/si/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/si/firefox-69.0.2.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "8dcc78847797a853f78eaa100f5cba6da54f52e28e3bb92f64ec1187421c871a4f6fbbfa51971b90d7476703862fdaef241110648e031038cd4a3aa62d9eb74d";
+      sha512 = "cfa2527b657b6136a25bc4edbd594b0353c8e2072f147da3be0d3bfd11ae1082252de9a5fafc2d0deb2fb2815c5e8e3a2426685976b4711a4de0cfa02ee62099";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/sk/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/sk/firefox-69.0.2.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "416bbffcfd8a32f1c3c22f28beaf3fa45df693e373552ecc78c921dfb010db79c8423251697daf7ea3038dad07ba168786168915a7c4ff844a62167e929da9cd";
+      sha512 = "1f38bb9237e7937b2c152204bb0403030e1fe05e6b6fc7bf28168eff1caae4204b4b469ac36ba04633ecfbaba17141d11167cd7f49943322e4fc7444f8f38785";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/sl/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/sl/firefox-69.0.2.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "b99af009ca4c1c7a190a31146de0ff2975196e89687fc37ec9b8c506a18bd9f4ccb1820751f52c50acb3c808998dea08151de3a38b69f62b45d7c80f97b0b42e";
+      sha512 = "76a01cdae11ad8364cf32f1cb7580d728954b7a2d6944a8b1af49cef282b45a5727093723b34ffe3d488d8ec24925b88622afeb966008df4bfba8d495d2919f8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/son/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/son/firefox-69.0.2.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "5efab88af1ade7d8c7437c638282c9f1fe8490174cfaa47563b0eaae7fe8c4b35210f240e4154458adf054924780c2a8d91b49158cc693cc3773f18963551434";
+      sha512 = "9bbbb4f9062e700dbae41df85bba28aeb99aeb73850e02cdecbdde4bca3fcb6808cd1079a8102ca9279ff5f2349418414c958ff316dee9a05fa8bd8bb9d499ba";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/sq/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/sq/firefox-69.0.2.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "4a6b10da6d0de76aae0e63a12c81369d8068689e23a3d289629b64350dc5fe191c42d91b58100206befe81a7bdf899c66bad78883605d020eb1e7559b9f9d237";
+      sha512 = "396e93b74ca2a00a57569322d4d7874c8bb29b326003726d5c4ee0e3db22d6504b1d73232ee3120b3a6f7f5b7244d5c98e441cd0d8e190c6d5004e1971ee08d6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/sr/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/sr/firefox-69.0.2.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "3833a2db3d8c2a9ef616cb1679c07c71280b74330771d79579c414619e3517bfec56c90712529bffaaf99abb07a63547a8aff9fb376f1089b3964c8dd92e523d";
+      sha512 = "8322797d3ede9d475a4b4b45472d513e3a2d6cb052a7645f0bc683e9df0fbba4bccf5fdbedb56e4136df1a4a1c5ac9b7aed49480aa6c8607fd5387bb5c50f0f7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/sv-SE/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/sv-SE/firefox-69.0.2.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "8dd898b57cff3dc25a52a7693f8e62f130af23a9c1e7d74a4c36abc5c6249f7b142006601596bd1cdc65b04c5b3ce2d8dcfce6caf230db047d1e7dba127f47d0";
+      sha512 = "01550f47dcb1dd9fe5cf6fb00098ff910e71e0c1a58f9c8956f97de47cb67527df8e14a8b82fc878aed1ebba50e99183285252269c8d158e6e11ede5a5240073";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ta/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/ta/firefox-69.0.2.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "7fa1f1e7dc3099a44841db01ee2746f87eaa4e93a12a5ba909e428b0dd5f3386a35eb66650fbd4b8e160d0a4c48f5b98c19a44a16b48432e576fe32ac953ebd5";
+      sha512 = "3acfdcc73aab0ecda77f96fd37ae9643c619a14b1a9d88f6058d0b16e000352680d39e6e37498b62e234385c60d2ab1224943ea057b069a5b492cea24ba4a37f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/te/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/te/firefox-69.0.2.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "74a78995878c2c207fc02abf667ef744008fe544c5f594d69c5c4653cb2adc58d56973591b4c0264d77993d76a2802dee1ce9b10b8355848ab6c11d0cfa3cc47";
+      sha512 = "768926b2fcf050675d3e9d915fd336d5c85f9e73a4a27e33bca7b78cc5161a0f142134fc8c0dac18f6cd47c309b1c90d5f21b8136075becb92e3f4e3507f6731";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/th/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/th/firefox-69.0.2.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "2fdda53cdea8a2a153b192a52f76e4a5b73dd128310d53ad26c59fadd54734b8d2a2f88b11087e18d6179d0b7fb1a9e87f722c5241544860be25ea14542d7da9";
+      sha512 = "d6b23302197682eb9c4c3323ee3a385c14844889adc8b82b9d6df837bc429b07ccb1c4c4ee5b383f1571a46a900b8c95eebd52649f118d716673f0be4cc8d0ae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/tr/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/tr/firefox-69.0.2.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "8cb6a590382c080a0b6ed81a566b385f07e909a86faab077d2f0027a05d2e985e9ab4eee0103cb30f9e88fde7e63c20250f4b2165824426c7a3956e69a448219";
+      sha512 = "7f3ea40a95b093191f3a83f29b2616f99f45bcdb5de5a796dd3d0c10b08317d5e39a63133436e9109a39c76846163a46b9be1b16c6b22059176f5f8c902c8046";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/uk/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/uk/firefox-69.0.2.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "a9269d73bfdbaa9f9c9484588a0921003c7602732a78c8c5316b00d67ef6ae43836a1fb606988fe3bc2143fb6be55a677a1238da0ad9d3a531bfc19ad0e7d482";
+      sha512 = "3c09c74b77226548dc5842fe67990f69b89a6dec5f86f4bcf98cc7a04ec8810e55e988350c231b951c96d3005c86e45a27e9fc507acd1855a86c42ce8aeb3194";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ur/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/ur/firefox-69.0.2.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "38696e57487b19eccd4669ee7fc0159f13a91abe062e21657111f95d58cf3183fcba370af94156b350a87810f9d73492e8ad2bd8e48a6ed5e82a9a3e54373099";
+      sha512 = "098a78e40511e2ab7d2b093da2c34867b46fdf8f9bf7ee123641149da5ca11cb9ab8aa9be2665bc58521fd1d7b3ab1a05a28c78ba15bec9ed15aebe838014d79";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/uz/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/uz/firefox-69.0.2.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "c912f028950f78c3b4b34c0f40d4381ccd961199f606d4ff8ce75c260dbc04b4eb471985edd61b7c380471835072ff7d58149bd98d029741ddcb39ea082c90e5";
+      sha512 = "9a9d1c10a787e69afc67d352fe5626993b23a4d04c17463e80001350dfbd0703af1793dbe5040e6614de268ec1d7d3789fc0363635d1bc773a7a6da94bb2778c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/vi/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/vi/firefox-69.0.2.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "40b0dd2c70c647dfa3f73db24d17296e719f6dedbff24fe7465799b9ae1deeac61a394a11095a93f48b785e5645ca8f801312e965dadf7de4fb964c87b90b17a";
+      sha512 = "18fb0259a310543991eccb796debfb156a77a942cb94264105526f5637c9d39b21fc033e62c837d41b3b316732caa6d3118abfc48ac0b3188c8a995dac95c828";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xh/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/xh/firefox-69.0.2.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "35993045afc78623d4ba1fb4e30c3c6e595f2ef02e5720f435d541af510ea552c254209f67afdad8d228bbf4c557885b5a9e2b6579973b323000a796d7e1a4a4";
+      sha512 = "ef8008332ec10d03a24928e13c01bb9bf6c75efd9a96e992d00dae4ffb250d054724752189bcc87c88edf502002130af626082b4320ca644de7da10b84306a44";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/zh-CN/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/zh-CN/firefox-69.0.2.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "e1cbdd94cb9c608f4c85354a1c683058eced84e783e6a76c08906983aa8b879094978747898cefe995bca4855ff463599d6288863739305f6a0eac0b0d07cda2";
+      sha512 = "55920dcac08a969e5db550fe22c419043011301bc9d7863bbd0744350f267d66cfd6deb63de8690ad363d047570a5e9e8354d649730dcc7bc2570b6e409f0f98";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/zh-TW/firefox-69.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/zh-TW/firefox-69.0.2.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "307e82f9c1b68e916c4369f57c52158be4279a8a5017bcd6e1d5c50e93ce8c25ebf07b115937ae0bf809a8e5448486d0f951b2c426a318037388de6ff58a2b02";
+      sha512 = "96677bf71dd3ecf7466fcc8b6b7fb41470634a7c1eae4662c6f6a509f3f97ebfddae10d28e3d575a2caa573996fcd386359244860e2962b0c345fb7cb8591be9";
     }
     ];
 }
-- 
GitLab


From 6d974eb7ce5e66e6a502d188cc8ef6be91e9ee7a Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Sat, 5 Oct 2019 18:44:22 +0900
Subject: [PATCH 1987/2254] firefox: 69.0.1 -> 69.0.2

---
 pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 1d89ee2a5d7..eabd3239586 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -17,10 +17,10 @@ rec {
 
   firefox = common rec {
     pname = "firefox";
-    ffversion = "69.0.1";
+    ffversion = "69.0.2";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
-      sha512 = "0zvjwn17accmp9m55a9s12mw3cflsplysizfrpa3hy02na20w39g974d42fmxpk4zq4zqy4m17v2rpibibb0g7giy9rywndhaw3xrl9";
+      sha512 = "2ag1syrvlkch7vl151hkq8abf86p9v6b6gmgcbh26b8wfva1p1ss1x09h4w50zmcc6jq4q5mcxgf1sd9zna552jl90k1y4rqvrrzwl6";
     };
 
     patches = [
-- 
GitLab


From 9b8c532a59f99ec9475f9b7c5904e14a7cc6d99b Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sat, 5 Oct 2019 01:16:12 -0400
Subject: [PATCH 1988/2254] pantheon.elementary-default-settings: 5.1.0 ->
 5.1.1

* downstream patch meson
---
 .../0001-Build-with-Meson.patch               | 309 ++++++++++++++++++
 .../correct-override.patch                    |  25 --
 .../elementary-default-settings/default.nix   |  67 +++-
 .../plank-dockitems.gschema.override          |   2 +
 4 files changed, 364 insertions(+), 39 deletions(-)
 create mode 100644 pkgs/desktops/pantheon/desktop/elementary-default-settings/0001-Build-with-Meson.patch
 delete mode 100644 pkgs/desktops/pantheon/desktop/elementary-default-settings/correct-override.patch
 create mode 100644 pkgs/desktops/pantheon/desktop/elementary-default-settings/overrides/plank-dockitems.gschema.override

diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/0001-Build-with-Meson.patch b/pkgs/desktops/pantheon/desktop/elementary-default-settings/0001-Build-with-Meson.patch
new file mode 100644
index 00000000000..3a0b3812450
--- /dev/null
+++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/0001-Build-with-Meson.patch
@@ -0,0 +1,309 @@
+From f728ac670d8f6bb7600a007d92034b711471fab6 Mon Sep 17 00:00:00 2001
+From: worldofpeace <worldofpeace@protonmail.ch>
+Date: Sat, 13 Jul 2019 19:06:20 -0400
+Subject: [PATCH 1/2] Build with Meson
+
+Has the following meson build options:
+* default-wallpaper
+* plank-dockitems
+* default-gsettings-overrides
+
+All default to true.
+
+We also split the default-settings gsettings override into another that
+only sets plank's default dockitems. This is installed when plank-dockitems
+is true. We need to have this because those settings are dependent on
+those dockitems actually being installed and we have it optional.
+---
+ accountsservice/create-symlink.py             |  24 ++++++
+ accountsservice/meson.build                   |  25 ++++++
+ .../appcenter.blacklist                       |   0
+ .../default-testpage.pdf                      | Bin
+ settings.ini => gtk/settings.ini              |   0
+ .inputrc => inputrc/.inputrc                  |   0
+ meson.build                                   |  79 ++++++++++++++++++
+ meson/post_install.py                         |  12 +++
+ meson_options.txt                             |  14 ++++
+ ...e => default-settings.gschema.override.in} |   3 +-
+ overrides/meson.build                         |  21 +++++
+ overrides/plank-dockitems.gschema.override    |   2 +
+ .../sessioninstaller.desktop                  |   0
+ 13 files changed, 178 insertions(+), 2 deletions(-)
+ create mode 100644 accountsservice/create-symlink.py
+ create mode 100644 accountsservice/meson.build
+ rename appcenter.blacklist => appcenter/appcenter.blacklist (100%)
+ rename default-testpage.pdf => cups/default-testpage.pdf (100%)
+ rename settings.ini => gtk/settings.ini (100%)
+ rename .inputrc => inputrc/.inputrc (100%)
+ create mode 100644 meson.build
+ create mode 100755 meson/post_install.py
+ create mode 100644 meson_options.txt
+ rename overrides/{default-settings.gschema.override => default-settings.gschema.override.in} (92%)
+ create mode 100644 overrides/meson.build
+ create mode 100644 overrides/plank-dockitems.gschema.override
+ rename sessioninstaller.desktop => sessioninstaller/sessioninstaller.desktop (100%)
+
+diff --git a/accountsservice/create-symlink.py b/accountsservice/create-symlink.py
+new file mode 100644
+index 0000000..e502134
+--- /dev/null
++++ b/accountsservice/create-symlink.py
+@@ -0,0 +1,24 @@
++#!/usr/bin/env python3
++
++import os
++import sys
++
++if len(sys.argv) < 3:
++    print('Usage: create-symlink.py SOURCE DESTINATION')
++    sys.exit(1)
++
++src = sys.argv[1]
++dest = sys.argv[2]
++
++if 'MESON_INSTALL_DESTDIR_PREFIX' in os.environ:
++    src = os.path.join(os.environ['MESON_INSTALL_DESTDIR_PREFIX'], src)
++    dest = os.path.join(os.environ['MESON_INSTALL_DESTDIR_PREFIX'], dest)
++
++if os.path.isabs(src):
++    src = os.path.relpath(src, os.path.dirname(os.path.realpath(dest)))
++
++if not os.path.exists(dest):
++    print('Creating symbolic link: ' + dest + ' -> ' + src)
++    if not os.path.exists(os.path.dirname(dest)):
++        os.makedirs(os.path.dirname(dest))
++    os.symlink(src, dest)
+diff --git a/accountsservice/meson.build b/accountsservice/meson.build
+new file mode 100644
+index 0000000..6d18459
+--- /dev/null
++++ b/accountsservice/meson.build
+@@ -0,0 +1,25 @@
++dbus_dep = dependency('dbus-1')
++dbus_interfaces_dir = dbus_dep.get_pkgconfig_variable('interfaces_dir', define_variable: ['datadir', datadir])
++
++install_data(
++    'io.elementary.pantheon.AccountsService.xml',
++    install_dir: dbus_interfaces_dir
++)
++
++
++polkit_dep = dependency('polkit-gobject-1')
++polkit_actiondir = polkit_dep.get_pkgconfig_variable('actiondir', define_variable: ['prefix', prefix])
++
++install_data(
++    'io.elementary.pantheon.AccountsService.policy',
++    install_dir: polkit_actiondir
++)
++
++act_dep = dependency('accountsservice')
++act_interfacesdir = act_dep.get_pkgconfig_variable('interfacesdir', define_variable: ['datadir', datadir])
++
++meson.add_install_script(
++    'create-symlink.py',
++    join_paths(dbus_interfaces_dir, 'io.elementary.pantheon.AccountsService.xml'),
++    join_paths(act_interfacesdir, 'io.elementary.pantheon.AccountsService.xml'),
++)
+diff --git a/appcenter.blacklist b/appcenter/appcenter.blacklist
+similarity index 100%
+rename from appcenter.blacklist
+rename to appcenter/appcenter.blacklist
+diff --git a/default-testpage.pdf b/cups/default-testpage.pdf
+similarity index 100%
+rename from default-testpage.pdf
+rename to cups/default-testpage.pdf
+diff --git a/settings.ini b/gtk/settings.ini
+similarity index 100%
+rename from settings.ini
+rename to gtk/settings.ini
+diff --git a/.inputrc b/inputrc/.inputrc
+similarity index 100%
+rename from .inputrc
+rename to inputrc/.inputrc
+diff --git a/meson.build b/meson.build
+new file mode 100644
+index 0000000..7740a34
+--- /dev/null
++++ b/meson.build
+@@ -0,0 +1,79 @@
++project(
++    'elementary-default-settings',
++    version: '5.1.0',
++    default_options: 'sysconfdir=/etc',
++)
++
++prefix = get_option('prefix')
++datadir = join_paths(prefix, get_option('datadir'))
++sysconfdir = get_option('sysconfdir')
++
++meson.add_install_script('meson/post_install.py', datadir)
++
++# Planks Default DockItems
++if get_option('plank-dockitems')
++    install_subdir(
++        'plank',
++        install_dir: join_paths(sysconfdir, 'skel', '.config')
++    )
++endif
++
++# Setup system wide global environment for applications
++install_subdir(
++    'profile.d',
++    install_dir: join_paths(sysconfdir, 'profile.d'),
++    strip_directory : true
++)
++
++# elementary Plymouth Theme
++install_subdir(
++    'plymouth/elementary',
++    install_dir: join_paths(datadir, 'plymouth', 'themes')
++)
++
++install_data(
++    'plymouth/ubuntu-text.plymouth',
++    install_dir: join_paths(datadir, 'plymouth', 'themes')
++)
++
++# Sudo password feedback in terminals
++install_data(
++    'sudoers.d/pwfeedback',
++    install_dir: join_paths(sysconfdir, 'sudoers.d')
++)
++
++# CUPS Printing testpage
++install_data(
++    'cups/default-testpage.pdf',
++    install_dir: join_paths(datadir, 'cups', 'data')
++)
++
++# GTK3 Settings
++install_data(
++    'gtk/settings.ini',
++    install_dir: join_paths(sysconfdir, 'gtk-3.0')
++)
++
++# So SessionInstaller can have an Icon
++install_data(
++    'sessioninstaller/sessioninstaller.desktop',
++    install_dir: join_paths(datadir, 'applications')
++)
++
++# Default Appcenter Blacklist
++install_data(
++    'appcenter/appcenter.blacklist',
++    install_dir: join_paths(sysconfdir, 'appcenter')
++)
++
++# Configuration file of GNU readline
++install_data(
++    'inputrc/.inputrc',
++    install_dir: join_paths(sysconfdir, 'skel')
++)
++
++# Default gsettings overrides
++subdir('overrides')
++
++# AccountsService extension for Greeter.
++subdir('accountsservice')
+diff --git a/meson/post_install.py b/meson/post_install.py
+new file mode 100755
+index 0000000..c6b5617
+--- /dev/null
++++ b/meson/post_install.py
+@@ -0,0 +1,12 @@
++#!/usr/bin/env python3
++
++import os
++import sys
++import subprocess
++
++if 'DESTDIR' not in os.environ:
++    default_settings_datadir = sys.argv[1]
++
++    print('Compiling GSettings schemas...')
++    subprocess.call(['glib-compile-schemas',
++                    os.path.join(default_settings_datadir, 'glib-2.0', 'schemas')])
+diff --git a/meson_options.txt b/meson_options.txt
+new file mode 100644
+index 0000000..8fd19ba
+--- /dev/null
++++ b/meson_options.txt
+@@ -0,0 +1,14 @@
++option('default-wallpaper',
++       type: 'string',
++       value: '/usr/share/backgrounds/elementaryos-default',
++       description: 'Path to default wallpaper to use in Pantheon.')
++
++option('plank-dockitems',
++       type: 'boolean',
++       value: true,
++       description: 'Install default Pantheon Plank dockitems')
++
++option('default-gsettings-overrides',
++       type: 'boolean',
++       value: true,
++       description: 'Install default Pantheon GSettings Overrides')
+diff --git a/overrides/default-settings.gschema.override b/overrides/default-settings.gschema.override.in
+similarity index 92%
+rename from overrides/default-settings.gschema.override
+rename to overrides/default-settings.gschema.override.in
+index 1aef29c..69d272b 100644
+--- a/overrides/default-settings.gschema.override
++++ b/overrides/default-settings.gschema.override.in
+@@ -1,5 +1,4 @@
+ [net.launchpad.plank.dock.settings]
+-dock-items=['gala-multitaskingview.dockitem','org.gnome.Epiphany.dockitem','org.pantheon.mail.dockitem','io.elementary.calendar.dockitem','io.elementary.music.dockitem','io.elementary.videos.dockitem','io.elementary.photos.dockitem','io.elementary.switchboard.dockitem','io.elementary.appcenter.dockitem']
+ hide-delay=250
+ hide-mode='window-dodge'
+ show-dock-item=false
+@@ -11,7 +10,7 @@ triggers=['<Control>space']
+ [org.gnome.desktop.background]
+ draw-background=true
+ picture-options='zoom'
+-picture-uri='file:///usr/share/backgrounds/elementaryos-default'
++picture-uri='file://@DEFAULT_WALLPAPER@'
+ primary-color='#000000'
+ show-desktop-icons=false
+ 
+diff --git a/overrides/meson.build b/overrides/meson.build
+new file mode 100644
+index 0000000..ad80644
+--- /dev/null
++++ b/overrides/meson.build
+@@ -0,0 +1,21 @@
++if get_option('default-gsettings-overrides')
++    default_wallpaper = get_option('default-wallpaper')
++
++    wallpaper_configuration = configuration_data()
++    wallpaper_configuration.set('DEFAULT_WALLPAPER', default_wallpaper)
++
++    settings_override = configure_file(
++        input: 'default-settings.gschema.override.in',
++        output: '@BASENAME@',
++        configuration: wallpaper_configuration,
++        install_dir: join_paths(datadir, 'glib-2.0', 'schemas')
++    )
++endif
++
++# Install conditionally because it's dependent on our dockitems being installed
++if get_option('plank-dockitems')
++    install_data(
++        'plank-dockitems.gschema.override',
++        install_dir: join_paths(datadir, 'glib-2.0', 'schemas')
++    )
++endif
+diff --git a/overrides/plank-dockitems.gschema.override b/overrides/plank-dockitems.gschema.override
+new file mode 100644
+index 0000000..72b38d4
+--- /dev/null
++++ b/overrides/plank-dockitems.gschema.override
+@@ -0,0 +1,2 @@
++[net.launchpad.plank.dock.settings]
++dock-items=['gala-multitaskingview.dockitem','org.gnome.Epiphany.dockitem','org.pantheon.mail.dockitem','io.elementary.calendar.dockitem','io.elementary.music.dockitem','io.elementary.videos.dockitem','io.elementary.photos.dockitem','io.elementary.switchboard.dockitem','io.elementary.appcenter.dockitem']
+diff --git a/sessioninstaller.desktop b/sessioninstaller/sessioninstaller.desktop
+similarity index 100%
+rename from sessioninstaller.desktop
+rename to sessioninstaller/sessioninstaller.desktop
+-- 
+2.23.0
+
diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/correct-override.patch b/pkgs/desktops/pantheon/desktop/elementary-default-settings/correct-override.patch
deleted file mode 100644
index 1b2dc835706..00000000000
--- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/correct-override.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/overrides/default-settings.gschema.override b/overrides/default-settings.gschema.override
-index 1aef29c..08de164 100644
---- a/overrides/default-settings.gschema.override
-+++ b/overrides/default-settings.gschema.override
-@@ -1,5 +1,5 @@
- [net.launchpad.plank.dock.settings]
--dock-items=['gala-multitaskingview.dockitem','org.gnome.Epiphany.dockitem','org.pantheon.mail.dockitem','io.elementary.calendar.dockitem','io.elementary.music.dockitem','io.elementary.videos.dockitem','io.elementary.photos.dockitem','io.elementary.switchboard.dockitem','io.elementary.appcenter.dockitem']
-+dock-items=['gala-multitaskingview.dockitem','org.gnome.Epiphany.dockitem','org.gnome.Geary.dockitem','io.elementary.calendar.dockitem','io.elementary.music.dockitem','io.elementary.videos.dockitem','io.elementary.photos.dockitem','io.elementary.switchboard.dockitem']
- hide-delay=250
- hide-mode='window-dodge'
- show-dock-item=false
-@@ -8,13 +8,6 @@ theme='Gtk+'
- [org.freedesktop.ibus.general.hotkey]
- triggers=['<Control>space']
- 
--[org.gnome.desktop.background]
--draw-background=true
--picture-options='zoom'
--picture-uri='file:///usr/share/backgrounds/elementaryos-default'
--primary-color='#000000'
--show-desktop-icons=false
--
- [org.gnome.desktop.datetime]
- automatic-timezone=true
- 
diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix
index a1a69ee303f..f20f1197499 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix
@@ -1,11 +1,20 @@
 { stdenv
 , fetchFromGitHub
 , pantheon
+, meson
+, ninja
+, nixos-artwork
+, glib
+, pkgconfig
+, dbus
+, polkit
+, accountsservice
+, python3
 }:
 
 stdenv.mkDerivation rec {
   pname = "elementary-default-settings";
-  version = "5.1.0";
+  version = "5.1.1";
 
   repoName = "default-settings";
 
@@ -13,7 +22,7 @@ stdenv.mkDerivation rec {
     owner = "elementary";
     repo = repoName;
     rev = version;
-    sha256 = "0l73py4rr56i4dalb2wh1c6qiwmcjkm0l1j75jp5agcnxldh5wym";
+    sha256 = "10sdy8v34y6bgb3mabwy7k3b5dbqrnab504dvhashpfxr9n9xncy";
   };
 
   passthru = {
@@ -24,24 +33,54 @@ stdenv.mkDerivation rec {
   };
 
   patches = [
-    ./correct-override.patch
+    # https://github.com/elementary/default-settings/pull/119
+    ./0001-Build-with-Meson.patch
   ];
 
-  dontBuild = true;
-  dontConfigure = true;
+  nativeBuildInputs = [
+    accountsservice
+    dbus
+    glib # polkit requires
+    meson
+    ninja
+    pkgconfig
+    polkit
+    python3
+  ];
+
+  mesonFlags = [
+    "--sysconfdir=${placeholder "out"}/etc"
+    "-Ddefault-wallpaper=${nixos-artwork.wallpapers.simple-dark-gray}/share/artwork/gnome/nix-wallpaper-simple-dark-gray.png"
+    "-Dplank-dockitems=false"
+  ];
 
-  installPhase = ''
-    mkdir -p $out/etc/gtk-3.0
-    cp -av settings.ini $out/etc/gtk-3.0
+  postPatch = ''
+    chmod +x meson/post_install.py
+    patchShebangs meson/post_install.py
+  '';
 
-    mkdir -p $out/share/glib-2.0/schemas
-    cp -av overrides/default-settings.gschema.override $out/share/glib-2.0/schemas/20-io.elementary.desktop.gschema.override
+  preInstall = ''
+    # Install our override for plank dockitems.
+    # This is because we don't have Pantheon's mail or Appcenter.
+    # See: https://github.com/NixOS/nixpkgs/issues/58161
+    schema_dir=$out/share/glib-2.0/schemas
+    install -D ${./overrides/plank-dockitems.gschema.override} $schema_dir/plank-dockitems.gschema.override
+
+    # Our launchers that use paths at /run/current-system/sw/bin
+    mkdir -p $out/etc/skel/.config/plank/dock1
+    cp -avr ${./launchers} $out/etc/skel/.config/plank/dock1/launchers
+
+    # Whitelist wingpanel indicators to be used in the greeter
+    # TODO: is this needed or installed upstream?
+    install -D ${./io.elementary.greeter.whitelist} $out/etc/wingpanel.d/io.elementary.greeter.whitelist
+  '';
 
-    mkdir $out/etc/wingpanel.d
-    cp -avr ${./io.elementary.greeter.whitelist} $out/etc/wingpanel.d/io.elementary.greeter.whitelist
+  postFixup = ''
+    # https://github.com/elementary/default-settings/issues/55
+    rm -rf $out/share/plymouth
+    rm -rf $out/share/cups
 
-    mkdir -p $out/share/elementary/config/plank/dock1
-    cp -avr ${./launchers} $out/share/elementary/config/plank/dock1/launchers
+    rm -rf $out/share/applications
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/overrides/plank-dockitems.gschema.override b/pkgs/desktops/pantheon/desktop/elementary-default-settings/overrides/plank-dockitems.gschema.override
new file mode 100644
index 00000000000..671448745c5
--- /dev/null
+++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/overrides/plank-dockitems.gschema.override
@@ -0,0 +1,2 @@
+[net.launchpad.plank.dock.settings]
+dock-items=['gala-multitaskingview.dockitem','org.gnome.Epiphany.dockitem','org.gnome.Geary.dockitem','io.elementary.calendar.dockitem','io.elementary.music.dockitem','io.elementary.videos.dockitem','io.elementary.photos.dockitem','io.elementary.switchboard.dockitem']
-- 
GitLab


From 1f4b22cb37dbd8a3702f804882a0e10920255b10 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sat, 5 Oct 2019 01:17:01 -0400
Subject: [PATCH 1989/2254] pantheon.elementary-gsettings-schemas: drop
 wallpaper setting

We have this built-in with meson from elementary-default-settings.
---
 .../desktop/elementary-gsettings-schemas/default.nix        | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix b/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix
index 9fc4418e7ca..38e57539de4 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix
@@ -41,13 +41,9 @@ runCommand "elementary-gsettings-desktop-schemas" {}
      ${concatMapStrings (pkg: "cp -rf ${glib.getSchemaPath pkg}/*.xml $schema_dir\n") gsettingsOverridePackages}
 
      chmod -R a+w $out/share/gsettings-schemas/nixos-gsettings-overrides
-     cp ${elementary-default-settings}/share/glib-2.0/schemas/20-io.elementary.desktop.gschema.override $schema_dir
+     cp ${glib.getSchemaPath elementary-default-settings}/* $schema_dir
 
      cat - > $schema_dir/nixos-defaults.gschema.override <<- EOF
-     [org.gnome.desktop.background]
-     picture-uri='file://${nixos-artwork.wallpapers.simple-dark-gray}/share/artwork/gnome/nix-wallpaper-simple-dark-gray.png'
-     primary-color='#000000'
-
      ${extraGSettingsOverrides}
      EOF
 
-- 
GitLab


From 614c493592660156a500902bf755c1066841070d Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sat, 5 Oct 2019 01:45:28 -0400
Subject: [PATCH 1990/2254] pantheon.elementary-session-settings: use
 writeTextFile, change plank dirs

Adapts to plank launcher directory change.
---
 .../default-elementary-dockitems.desktop      |  8 -------
 .../elementary-session-settings/default.nix   | 21 ++++++++++++-------
 2 files changed, 14 insertions(+), 15 deletions(-)
 delete mode 100644 pkgs/desktops/pantheon/desktop/elementary-session-settings/default-elementary-dockitems.desktop

diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default-elementary-dockitems.desktop b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default-elementary-dockitems.desktop
deleted file mode 100644
index 517a9457ae1..00000000000
--- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default-elementary-dockitems.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Instantiate Default elementary dockitems
-Exec=@script@
-StartupNotify=false
-NoDisplay=true
-OnlyShowIn=Pantheon;
-X-GNOME-Autostart-Phase=EarlyInitialization
diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
index 69a1efa3e9e..a264af51c56 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
@@ -12,6 +12,7 @@
 , elementary-default-settings
 , elementary-settings-daemon
 , runtimeShell
+, writeText
 }:
 
 let
@@ -32,22 +33,28 @@ let
     #!${runtimeShell}
 
     elementary_default_settings="${elementary-default-settings}"
-    dock_items="$elementary_default_settings/share/elementary/config/plank/dock1/launchers"/*
+    dock_items="$elementary_default_settings/etc/skel/.config/plank/dock1/launchers"/*
 
     if [ ! -d "$HOME/.config/plank/dock1" ]; then
         echo "Instantiating default Plank Dockitems..."
 
-        mkdir -p $HOME/.config/plank/dock1/launchers
-        cp -r --no-preserve=mode,ownership $dock_items $HOME/.config/plank/dock1/launchers/
+        mkdir -p "$HOME/.config/plank/dock1/launchers"
+        cp -r --no-preserve=mode,ownership $dock_items "$HOME/.config/plank/dock1/launchers/"
     else
         echo "Plank Dockitems already instantiated"
     fi
   '';
 
-  dockitemAutostart = substituteAll {
-    src = ./default-elementary-dockitems.desktop;
-    script = dockitems-script;
-  };
+  dockitemAutostart = writeText "default-elementary-dockitems.desktop" ''
+    [Desktop Entry]
+    Type=Application
+    Name=Instantiate Default elementary dockitems
+    Exec=${dockitems-script}
+    StartupNotify=false
+    NoDisplay=true
+    OnlyShowIn=Pantheon;
+    X-GNOME-Autostart-Phase=EarlyInitialization
+  '';
 
   executable = writeScript "pantheon" ''
     export XDG_CONFIG_DIRS=${elementary-settings-daemon}/etc/xdg:${elementary-default-settings}/etc:$XDG_CONFIG_DIRS
-- 
GitLab


From 7e7a155a9cea3422444cd74f26a16b35bc2c3224 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sat, 5 Oct 2019 04:55:01 -0400
Subject: [PATCH 1991/2254] pantheon.elementary-session-settings: build with
 meson

---
 .../elementary-session-settings/default.nix   |  40 ++-
 .../elementary-session-settings/meson.patch   | 272 ++++++++++++++++++
 2 files changed, 297 insertions(+), 15 deletions(-)
 create mode 100644 pkgs/desktops/pantheon/desktop/elementary-session-settings/meson.patch

diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
index a264af51c56..ab7333212a0 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
@@ -13,6 +13,9 @@
 , elementary-settings-daemon
 , runtimeShell
 , writeText
+, meson
+, ninja
+, git
 }:
 
 let
@@ -77,17 +80,23 @@ stdenv.mkDerivation rec {
     sha256 = "1vrjm7bklkfv0dyafm312v4hxzy6lb7p1ny4ijkn48kr719gc71k";
   };
 
-  passthru = {
-    updateScript = pantheon.updateScript {
-      inherit repoName;
-      attrPath = pname;
-    };
-  };
+  postPatch = ''
+    ${git}/bin/git apply --verbose ${./meson.patch}
+  '';
 
-  dontBuild = true;
-  dontConfigure = true;
+  nativeBuildInputs = [
+    meson
+    ninja
+  ];
 
-  installPhase = ''
+  mesonFlags = [
+    "-Ddefaults-list=false"
+    "-Dpatched-gsd-autostarts=false"
+    "-Dpatched-ubuntu-autostarts=false"
+    "-Dfallback-session=GNOME"
+  ];
+
+  postInstall = ''
     mkdir -p $out/share/applications
     cp -av ${./pantheon-mimeapps.list} $out/share/applications/pantheon-mimeapps.list
 
@@ -98,15 +107,9 @@ stdenv.mkDerivation rec {
 
     cp "${dockitemAutostart}" $out/etc/xdg/autostart/default-elementary-dockitems.desktop
 
-    mkdir -p $out/share/gnome-session/sessions
-    cp -av gnome-session/pantheon.session $out/share/gnome-session/sessions
-
     mkdir -p $out/libexec
     substitute ${executable} $out/libexec/pantheon --subst-var out
     chmod +x $out/libexec/pantheon
-
-    mkdir -p $out/share/xsessions
-    cp -av xsessions/pantheon.desktop $out/share/xsessions
   '';
 
   postFixup = ''
@@ -123,6 +126,13 @@ stdenv.mkDerivation rec {
     done
   '';
 
+  passthru = {
+    updateScript = pantheon.updateScript {
+      inherit repoName;
+      attrPath = pname;
+    };
+  };
+
   meta = with stdenv.lib; {
     description = "Session settings for elementary";
     homepage = https://github.com/elementary/session-settings;
diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/meson.patch b/pkgs/desktops/pantheon/desktop/elementary-session-settings/meson.patch
new file mode 100644
index 00000000000..39d15565661
--- /dev/null
+++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/meson.patch
@@ -0,0 +1,272 @@
+From 0a20ad6a31c74f4f96e9ed3613ec6c16a94ede39 Mon Sep 17 00:00:00 2001
+From: worldofpeace <worldofpeace@protonmail.ch>
+Date: Thu, 8 Aug 2019 11:25:37 -0400
+Subject: [PATCH] Build with Meson (#13)
+
+---
+ applications/meson.build                       |  4 ++++
+ ...ettingsDaemon.A11ySettings-pantheon.desktop |  0
+ ...e.SettingsDaemon.Clipboard-pantheon.desktop |  0
+ ...gnome.SettingsDaemon.Color-pantheon.desktop |  0
+ ...me.SettingsDaemon.Datetime-pantheon.desktop |  0
+ ...ettingsDaemon.Housekeeping-pantheon.desktop |  0
+ ...me.SettingsDaemon.Keyboard-pantheon.desktop |  0
+ ...e.SettingsDaemon.MediaKeys-pantheon.desktop |  0
+ ...gnome.SettingsDaemon.Mouse-pantheon.desktop |  0
+ ...gnome.SettingsDaemon.Power-pantheon.desktop |  0
+ ...sDaemon.PrintNotifications-pantheon.desktop |  0
+ ...nome.SettingsDaemon.Rfkill-pantheon.desktop |  0
+ ...ome.SettingsDaemon.Sharing-pantheon.desktop |  0
+ ...e.SettingsDaemon.Smartcard-pantheon.desktop |  0
+ ...gnome.SettingsDaemon.Sound-pantheon.desktop |  0
+ ...gnome.SettingsDaemon.Wacom-pantheon.desktop |  0
+ ...e.SettingsDaemon.XSettings-pantheon.desktop |  0
+ autostart/meson.build                          | 18 ++++++++++++++++++
+ .../gnome-keyring-gpg-pantheon.desktop         |  0
+ .../gnome-keyring-pkcs11-pantheon.desktop      |  0
+ .../gnome-keyring-secrets-pantheon.desktop     |  0
+ .../gnome-keyring-ssh-pantheon.desktop         |  0
+ .../onboard-autostart-pantheon.desktop         |  0
+ .../orca-autostart-pantheon.desktop            |  0
+ .../user-dirs-update-gtk-pantheon.desktop      |  0
+ gnome-session/meson.build                      | 11 +++++++++++
+ .../{pantheon.session => pantheon.session.in}  |  2 +-
+ meson.build                                    | 14 ++++++++++++++
+ meson_options.txt                              | 11 +++++++++++
+ xsessions/meson.build                          |  4 ++++
+ 30 files changed, 63 insertions(+), 1 deletion(-)
+ create mode 100644 applications/meson.build
+ rename autostart/{ => gsd}/org.gnome.SettingsDaemon.A11ySettings-pantheon.desktop (100%)
+ rename autostart/{ => gsd}/org.gnome.SettingsDaemon.Clipboard-pantheon.desktop (100%)
+ rename autostart/{ => gsd}/org.gnome.SettingsDaemon.Color-pantheon.desktop (100%)
+ rename autostart/{ => gsd}/org.gnome.SettingsDaemon.Datetime-pantheon.desktop (100%)
+ rename autostart/{ => gsd}/org.gnome.SettingsDaemon.Housekeeping-pantheon.desktop (100%)
+ rename autostart/{ => gsd}/org.gnome.SettingsDaemon.Keyboard-pantheon.desktop (100%)
+ rename autostart/{ => gsd}/org.gnome.SettingsDaemon.MediaKeys-pantheon.desktop (100%)
+ rename autostart/{ => gsd}/org.gnome.SettingsDaemon.Mouse-pantheon.desktop (100%)
+ rename autostart/{ => gsd}/org.gnome.SettingsDaemon.Power-pantheon.desktop (100%)
+ rename autostart/{ => gsd}/org.gnome.SettingsDaemon.PrintNotifications-pantheon.desktop (100%)
+ rename autostart/{ => gsd}/org.gnome.SettingsDaemon.Rfkill-pantheon.desktop (100%)
+ rename autostart/{ => gsd}/org.gnome.SettingsDaemon.Sharing-pantheon.desktop (100%)
+ rename autostart/{ => gsd}/org.gnome.SettingsDaemon.Smartcard-pantheon.desktop (100%)
+ rename autostart/{ => gsd}/org.gnome.SettingsDaemon.Sound-pantheon.desktop (100%)
+ rename autostart/{ => gsd}/org.gnome.SettingsDaemon.Wacom-pantheon.desktop (100%)
+ rename autostart/{ => gsd}/org.gnome.SettingsDaemon.XSettings-pantheon.desktop (100%)
+ create mode 100644 autostart/meson.build
+ rename autostart/{ => ubuntu}/gnome-keyring-gpg-pantheon.desktop (100%)
+ rename autostart/{ => ubuntu}/gnome-keyring-pkcs11-pantheon.desktop (100%)
+ rename autostart/{ => ubuntu}/gnome-keyring-secrets-pantheon.desktop (100%)
+ rename autostart/{ => ubuntu}/gnome-keyring-ssh-pantheon.desktop (100%)
+ rename autostart/{ => ubuntu}/onboard-autostart-pantheon.desktop (100%)
+ rename autostart/{ => ubuntu}/orca-autostart-pantheon.desktop (100%)
+ rename autostart/{ => ubuntu}/user-dirs-update-gtk-pantheon.desktop (100%)
+ create mode 100644 gnome-session/meson.build
+ rename gnome-session/{pantheon.session => pantheon.session.in} (94%)
+ create mode 100644 meson.build
+ create mode 100644 meson_options.txt
+ create mode 100644 xsessions/meson.build
+
+diff --git a/applications/meson.build b/applications/meson.build
+new file mode 100644
+index 0000000..d03b92b
+--- /dev/null
++++ b/applications/meson.build
+@@ -0,0 +1,4 @@
++install_data(
++    'defaults.list',
++    install_dir: join_paths(datadir, 'applications')
++)
+diff --git a/autostart/org.gnome.SettingsDaemon.A11ySettings-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.A11ySettings-pantheon.desktop
+similarity index 100%
+rename from autostart/org.gnome.SettingsDaemon.A11ySettings-pantheon.desktop
+rename to autostart/gsd/org.gnome.SettingsDaemon.A11ySettings-pantheon.desktop
+diff --git a/autostart/org.gnome.SettingsDaemon.Clipboard-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.Clipboard-pantheon.desktop
+similarity index 100%
+rename from autostart/org.gnome.SettingsDaemon.Clipboard-pantheon.desktop
+rename to autostart/gsd/org.gnome.SettingsDaemon.Clipboard-pantheon.desktop
+diff --git a/autostart/org.gnome.SettingsDaemon.Color-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.Color-pantheon.desktop
+similarity index 100%
+rename from autostart/org.gnome.SettingsDaemon.Color-pantheon.desktop
+rename to autostart/gsd/org.gnome.SettingsDaemon.Color-pantheon.desktop
+diff --git a/autostart/org.gnome.SettingsDaemon.Datetime-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.Datetime-pantheon.desktop
+similarity index 100%
+rename from autostart/org.gnome.SettingsDaemon.Datetime-pantheon.desktop
+rename to autostart/gsd/org.gnome.SettingsDaemon.Datetime-pantheon.desktop
+diff --git a/autostart/org.gnome.SettingsDaemon.Housekeeping-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.Housekeeping-pantheon.desktop
+similarity index 100%
+rename from autostart/org.gnome.SettingsDaemon.Housekeeping-pantheon.desktop
+rename to autostart/gsd/org.gnome.SettingsDaemon.Housekeeping-pantheon.desktop
+diff --git a/autostart/org.gnome.SettingsDaemon.Keyboard-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.Keyboard-pantheon.desktop
+similarity index 100%
+rename from autostart/org.gnome.SettingsDaemon.Keyboard-pantheon.desktop
+rename to autostart/gsd/org.gnome.SettingsDaemon.Keyboard-pantheon.desktop
+diff --git a/autostart/org.gnome.SettingsDaemon.MediaKeys-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.MediaKeys-pantheon.desktop
+similarity index 100%
+rename from autostart/org.gnome.SettingsDaemon.MediaKeys-pantheon.desktop
+rename to autostart/gsd/org.gnome.SettingsDaemon.MediaKeys-pantheon.desktop
+diff --git a/autostart/org.gnome.SettingsDaemon.Mouse-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.Mouse-pantheon.desktop
+similarity index 100%
+rename from autostart/org.gnome.SettingsDaemon.Mouse-pantheon.desktop
+rename to autostart/gsd/org.gnome.SettingsDaemon.Mouse-pantheon.desktop
+diff --git a/autostart/org.gnome.SettingsDaemon.Power-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.Power-pantheon.desktop
+similarity index 100%
+rename from autostart/org.gnome.SettingsDaemon.Power-pantheon.desktop
+rename to autostart/gsd/org.gnome.SettingsDaemon.Power-pantheon.desktop
+diff --git a/autostart/org.gnome.SettingsDaemon.PrintNotifications-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.PrintNotifications-pantheon.desktop
+similarity index 100%
+rename from autostart/org.gnome.SettingsDaemon.PrintNotifications-pantheon.desktop
+rename to autostart/gsd/org.gnome.SettingsDaemon.PrintNotifications-pantheon.desktop
+diff --git a/autostart/org.gnome.SettingsDaemon.Rfkill-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.Rfkill-pantheon.desktop
+similarity index 100%
+rename from autostart/org.gnome.SettingsDaemon.Rfkill-pantheon.desktop
+rename to autostart/gsd/org.gnome.SettingsDaemon.Rfkill-pantheon.desktop
+diff --git a/autostart/org.gnome.SettingsDaemon.Sharing-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.Sharing-pantheon.desktop
+similarity index 100%
+rename from autostart/org.gnome.SettingsDaemon.Sharing-pantheon.desktop
+rename to autostart/gsd/org.gnome.SettingsDaemon.Sharing-pantheon.desktop
+diff --git a/autostart/org.gnome.SettingsDaemon.Smartcard-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.Smartcard-pantheon.desktop
+similarity index 100%
+rename from autostart/org.gnome.SettingsDaemon.Smartcard-pantheon.desktop
+rename to autostart/gsd/org.gnome.SettingsDaemon.Smartcard-pantheon.desktop
+diff --git a/autostart/org.gnome.SettingsDaemon.Sound-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.Sound-pantheon.desktop
+similarity index 100%
+rename from autostart/org.gnome.SettingsDaemon.Sound-pantheon.desktop
+rename to autostart/gsd/org.gnome.SettingsDaemon.Sound-pantheon.desktop
+diff --git a/autostart/org.gnome.SettingsDaemon.Wacom-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.Wacom-pantheon.desktop
+similarity index 100%
+rename from autostart/org.gnome.SettingsDaemon.Wacom-pantheon.desktop
+rename to autostart/gsd/org.gnome.SettingsDaemon.Wacom-pantheon.desktop
+diff --git a/autostart/org.gnome.SettingsDaemon.XSettings-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.XSettings-pantheon.desktop
+similarity index 100%
+rename from autostart/org.gnome.SettingsDaemon.XSettings-pantheon.desktop
+rename to autostart/gsd/org.gnome.SettingsDaemon.XSettings-pantheon.desktop
+diff --git a/autostart/meson.build b/autostart/meson.build
+new file mode 100644
+index 0000000..265088b
+--- /dev/null
++++ b/autostart/meson.build
+@@ -0,0 +1,18 @@
++autostartdir = join_paths(get_option('sysconfdir'), 'xdg', 'autostart')
++
++if get_option('patched-gsd-autostarts')
++    install_subdir(
++        'gsd',
++        install_dir: autostartdir,
++        strip_directory: true
++    )
++endif
++
++
++if get_option('patched-ubuntu-autostarts')
++    install_subdir(
++        'ubuntu',
++        install_dir: autostartdir,
++        strip_directory: true
++    )
++endif
+diff --git a/autostart/gnome-keyring-gpg-pantheon.desktop b/autostart/ubuntu/gnome-keyring-gpg-pantheon.desktop
+similarity index 100%
+rename from autostart/gnome-keyring-gpg-pantheon.desktop
+rename to autostart/ubuntu/gnome-keyring-gpg-pantheon.desktop
+diff --git a/autostart/gnome-keyring-pkcs11-pantheon.desktop b/autostart/ubuntu/gnome-keyring-pkcs11-pantheon.desktop
+similarity index 100%
+rename from autostart/gnome-keyring-pkcs11-pantheon.desktop
+rename to autostart/ubuntu/gnome-keyring-pkcs11-pantheon.desktop
+diff --git a/autostart/gnome-keyring-secrets-pantheon.desktop b/autostart/ubuntu/gnome-keyring-secrets-pantheon.desktop
+similarity index 100%
+rename from autostart/gnome-keyring-secrets-pantheon.desktop
+rename to autostart/ubuntu/gnome-keyring-secrets-pantheon.desktop
+diff --git a/autostart/gnome-keyring-ssh-pantheon.desktop b/autostart/ubuntu/gnome-keyring-ssh-pantheon.desktop
+similarity index 100%
+rename from autostart/gnome-keyring-ssh-pantheon.desktop
+rename to autostart/ubuntu/gnome-keyring-ssh-pantheon.desktop
+diff --git a/autostart/onboard-autostart-pantheon.desktop b/autostart/ubuntu/onboard-autostart-pantheon.desktop
+similarity index 100%
+rename from autostart/onboard-autostart-pantheon.desktop
+rename to autostart/ubuntu/onboard-autostart-pantheon.desktop
+diff --git a/autostart/orca-autostart-pantheon.desktop b/autostart/ubuntu/orca-autostart-pantheon.desktop
+similarity index 100%
+rename from autostart/orca-autostart-pantheon.desktop
+rename to autostart/ubuntu/orca-autostart-pantheon.desktop
+diff --git a/autostart/user-dirs-update-gtk-pantheon.desktop b/autostart/ubuntu/user-dirs-update-gtk-pantheon.desktop
+similarity index 100%
+rename from autostart/user-dirs-update-gtk-pantheon.desktop
+rename to autostart/ubuntu/user-dirs-update-gtk-pantheon.desktop
+diff --git a/gnome-session/meson.build b/gnome-session/meson.build
+new file mode 100644
+index 0000000..b9245a1
+--- /dev/null
++++ b/gnome-session/meson.build
+@@ -0,0 +1,11 @@
++fallback_session = get_option('fallback-session')
++
++session_configuration = configuration_data()
++session_configuration.set('FALLBACK_SESSION', fallback_session)
++
++pantheon_session = configure_file(
++  input: 'pantheon.session.in',
++  output: '@BASENAME@',
++  configuration: session_configuration,
++  install_dir: join_paths(datadir, 'gnome-session', 'sessions')
++)
+diff --git a/gnome-session/pantheon.session b/gnome-session/pantheon.session.in
+similarity index 94%
+rename from gnome-session/pantheon.session
+rename to gnome-session/pantheon.session.in
+index 1626393..7bc1814 100644
+--- a/gnome-session/pantheon.session
++++ b/gnome-session/pantheon.session.in
+@@ -1,5 +1,5 @@
+ [GNOME Session]
+ Name=Pantheon
+ RequiredComponents=gala;gala-daemon;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Clipboard;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Mouse;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings;
+-FallbackSession=ubuntu
++FallbackSession=@FALLBACK_SESSION@
+ DesktopName=Pantheon
+diff --git a/meson.build b/meson.build
+new file mode 100644
+index 0000000..a7d3195
+--- /dev/null
++++ b/meson.build
+@@ -0,0 +1,14 @@
++project('elementary-session-settings',
++        version: '5.0.3',
++        default_options: 'sysconfdir=/etc')
++
++prefix = get_option('prefix')
++datadir = join_paths(prefix, get_option('datadir'))
++
++if get_option('defaults-list')
++    subdir('applications')
++endif
++
++subdir('autostart')
++subdir('gnome-session')
++subdir('xsessions')
+diff --git a/meson_options.txt b/meson_options.txt
+new file mode 100644
+index 0000000..4c5ac2d
+--- /dev/null
++++ b/meson_options.txt
+@@ -0,0 +1,11 @@
++option('defaults-list', type : 'boolean', value: true,
++       description : 'Install defaults.list')
++
++option('patched-gsd-autostarts', type : 'boolean', value: true,
++       description : 'Install patched GNOME Settings Daemon autostarts')
++
++option('patched-ubuntu-autostarts', type : 'boolean', value: true,
++       description : 'Install patched Ubuntu autostarts')
++
++option('fallback-session', type : 'string', value: 'ubuntu',
++       description : 'Fallback session to use for Pantheon')
+diff --git a/xsessions/meson.build b/xsessions/meson.build
+new file mode 100644
+index 0000000..d144291
+--- /dev/null
++++ b/xsessions/meson.build
+@@ -0,0 +1,4 @@
++install_data(
++    'pantheon.desktop',
++    install_dir: join_paths(datadir, 'xsessions')
++)
-- 
GitLab


From fe3da83b7e26b6f7cdde7a457a794c215d16e969 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 3 Oct 2019 09:16:53 +0200
Subject: [PATCH 1992/2254] nixos/containers: explicitly load kernel modules
 for networking

List all modules that *may* be required depending on individual container
configurations; don't expect that further modules can be loaded after boot.

Fixes https://github.com/NixOS/nixpkgs/issues/38676
---
 nixos/modules/virtualisation/containers.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 9c9f8fc0c21..691ee2c136e 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -824,5 +824,12 @@ in
     '';
 
     environment.systemPackages = [ pkgs.nixos-container ];
+
+    boot.kernelModules = [
+      "bridge"
+      "macvlan"
+      "tap"
+      "tun"
+    ];
   });
 }
-- 
GitLab


From 99df63be0a5fc3623a9953188f2700b44898fec7 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Wed, 18 Sep 2019 17:40:28 -0400
Subject: [PATCH 1993/2254] nixos/pantheon: add elementary-default-settings for
 services

This is needed for the AccountsService interfaces (in systemPackages).
---
 nixos/modules/services/x11/desktop-managers/pantheon.nix | 5 +++--
 pkgs/desktops/pantheon/default.nix                       | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix
index 7181bf8506b..80dab135ee2 100644
--- a/nixos/modules/services/x11/desktop-managers/pantheon.nix
+++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix
@@ -109,8 +109,9 @@ in
     services.pantheon.files.enable = mkDefault true;
     services.tumbler.enable = mkDefault true;
     services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true));
-    services.dbus.packages = [
-      pkgs.pantheon.switchboard-plug-power
+    services.dbus.packages = with pkgs.pantheon; [
+      switchboard-plug-power
+      elementary-default-settings
     ];
     services.pantheon.contractor.enable = mkDefault true;
     services.gnome3.at-spi2-core.enable = true;
diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix
index aed08c35a80..57c2c30c9d2 100644
--- a/pkgs/desktops/pantheon/default.nix
+++ b/pkgs/desktops/pantheon/default.nix
@@ -18,6 +18,7 @@ lib.makeScope pkgs.newScope (self: with self; {
   ];
 
   desktop = [
+    elementary-default-settings
     elementary-session-settings
     elementary-shortcut-overlay
     gala
-- 
GitLab


From a08851c925cf2eef92b4f6ccf9581751633f0f40 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 5 Oct 2019 12:41:40 +0200
Subject: [PATCH 1994/2254] graphene-hardened-malloc: constrain platforms to
 x64 linux

Build error on i686:

> util.h:39:18: error: '__int128' is not supported on this target
  typedef unsigned __int128 u128;
---
 pkgs/development/libraries/graphene-hardened-malloc/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/graphene-hardened-malloc/default.nix b/pkgs/development/libraries/graphene-hardened-malloc/default.nix
index 66c5d8eb061..be32a74ea45 100644
--- a/pkgs/development/libraries/graphene-hardened-malloc/default.nix
+++ b/pkgs/development/libraries/graphene-hardened-malloc/default.nix
@@ -52,6 +52,6 @@ stdenv.mkDerivation rec {
     '';
     license = licenses.mit;
     maintainers = with maintainers; [ ris ];
-    platforms = platforms.linux;
+    platforms = [ "x86_64-linux" ];
   };
 }
-- 
GitLab


From 6208273727c27a6bd5111fedc48535bc2d9eb47b Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 27 Dec 2018 21:23:41 +0100
Subject: [PATCH 1995/2254] pacman: use runtimeShell as the scriptlet shell

---
 pkgs/tools/package-management/pacman/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/package-management/pacman/default.nix b/pkgs/tools/package-management/pacman/default.nix
index 81e8152769b..b81c833063d 100644
--- a/pkgs/tools/package-management/pacman/default.nix
+++ b/pkgs/tools/package-management/pacman/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchurl, autoreconfHook, pkgconfig, perl, libarchive, openssl,
-zlib, bzip2, lzma }:
+zlib, bzip2, lzma, runtimeShell }:
 
 stdenv.mkDerivation rec {
   pname = "pacman";
@@ -15,6 +15,7 @@ stdenv.mkDerivation rec {
     "--disable-doc"
 
     "--localstatedir=/var"
+    "--with-scriptlet-shell=${runtimeShell}"
   ];
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
-- 
GitLab


From 2858e9838d048f1d5f1bd6c9943df3db13ad4ab6 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 27 Dec 2018 21:24:22 +0100
Subject: [PATCH 1996/2254] pacman: build with libcurl

Obviates the need to specify a custom Xfer command
---
 pkgs/tools/package-management/pacman/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/pacman/default.nix b/pkgs/tools/package-management/pacman/default.nix
index b81c833063d..f6c43b9ff15 100644
--- a/pkgs/tools/package-management/pacman/default.nix
+++ b/pkgs/tools/package-management/pacman/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchurl, autoreconfHook, pkgconfig, perl, libarchive, openssl,
-zlib, bzip2, lzma, runtimeShell }:
+zlib, bzip2, lzma, curl, runtimeShell }:
 
 stdenv.mkDerivation rec {
   pname = "pacman";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
-  buildInputs = [ perl libarchive openssl zlib bzip2 lzma ];
+  buildInputs = [ curl perl libarchive openssl zlib bzip2 lzma ];
 
   postFixup = ''
     substituteInPlace $out/bin/repo-add \
-- 
GitLab


From 42128d962ffafe71f0c4567e39f0fe657bec9da3 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 5 May 2019 12:30:23 +0200
Subject: [PATCH 1997/2254] pacman: parallel building

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

diff --git a/pkgs/tools/package-management/pacman/default.nix b/pkgs/tools/package-management/pacman/default.nix
index f6c43b9ff15..60fd7caa5a5 100644
--- a/pkgs/tools/package-management/pacman/default.nix
+++ b/pkgs/tools/package-management/pacman/default.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
     sha256 = "108xp6dhvp02jnzskhgzjmp9jvrxhhkffvmpvs3rrif7vj47xd76";
   };
 
+  enableParallelBuilding = true;
+
   configureFlags = [
     # trying to build docs fails with a2x errors, unable to fix through asciidoc
     "--disable-doc"
-- 
GitLab


From 96d81151e67cc9d9e8ff56c0d4b8cf8d5a2d9c0f Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 5 May 2019 12:39:07 +0200
Subject: [PATCH 1998/2254] pacman: set sysconfdir=/etc

---
 pkgs/tools/package-management/pacman/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/package-management/pacman/default.nix b/pkgs/tools/package-management/pacman/default.nix
index 60fd7caa5a5..9fd0ea05510 100644
--- a/pkgs/tools/package-management/pacman/default.nix
+++ b/pkgs/tools/package-management/pacman/default.nix
@@ -16,10 +16,13 @@ stdenv.mkDerivation rec {
     # trying to build docs fails with a2x errors, unable to fix through asciidoc
     "--disable-doc"
 
+    "--sysconfdir=/etc"
     "--localstatedir=/var"
     "--with-scriptlet-shell=${runtimeShell}"
   ];
 
+  installFlags = [ "sysconfdir=${placeholder "out"}/etc" ];
+
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
   buildInputs = [ curl perl libarchive openssl zlib bzip2 lzma ];
 
-- 
GitLab


From 06b4f4d46f849b533f5171222814b90b8533b9e6 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 5 May 2019 10:28:23 +0200
Subject: [PATCH 1999/2254] tinycc: minor refactorings

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

diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix
index 338ba931249..23ed6a925b9 100644
--- a/pkgs/development/compilers/tinycc/default.nix
+++ b/pkgs/development/compilers/tinycc/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromRepoOrCz, perl, texinfo }:
-with stdenv.lib;
+{ stdenv, lib, fetchFromRepoOrCz, perl, texinfo }:
+with lib;
 
 stdenv.mkDerivation rec {
   pname = "tcc";
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
       generation.
     '';
 
-    homepage = http://www.tinycc.org/;
+    homepage = "http://www.tinycc.org/";
     license = licenses.mit;
 
     platforms = [ "x86_64-linux" ];
-- 
GitLab


From 8b1000432b47895719651d018f2ecdf9b94617ec Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 5 May 2019 10:08:06 +0200
Subject: [PATCH 2000/2254] tinycc: parallel building

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

diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix
index 23ed6a925b9..dd41d5af5f4 100644
--- a/pkgs/development/compilers/tinycc/default.nix
+++ b/pkgs/development/compilers/tinycc/default.nix
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "fortify" ];
 
+  enableParallelBuilding = true;
+
   postPatch = ''
     substituteInPlace "texi2pod.pl" \
       --replace "/usr/bin/perl" "${perl}/bin/perl"
-- 
GitLab


From f73f525b720f75a6f1f85631a425f33245a93168 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 5 May 2019 10:27:39 +0200
Subject: [PATCH 2001/2254] tinycc: generate a pkgconfig file for libtcc

---
 pkgs/development/compilers/tinycc/default.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix
index dd41d5af5f4..80209a8a96a 100644
--- a/pkgs/development/compilers/tinycc/default.nix
+++ b/pkgs/development/compilers/tinycc/default.nix
@@ -32,6 +32,17 @@ stdenv.mkDerivation rec {
     configureFlagsArray+=("--libpaths=${getLib stdenv.cc.libc}/lib")
   '';
 
+  postFixup = ''
+    cat >libtcc.pc <<EOF
+    Name: libtcc
+    Description: Tiny C compiler backend
+    Version: ${version}
+    Libs: -L$out/lib -Wl,--rpath $out/lib -ltcc -ldl
+    Cflags: -I$out/include
+    EOF
+    install -Dt $out/lib/pkgconfig libtcc.pc
+  '';
+
   doCheck = true;
   checkTarget = "test";
 
-- 
GitLab


From bb75bc9d429c969b4e86cbe19790ba3f08c46d73 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 5 Oct 2019 13:04:41 +0200
Subject: [PATCH 2002/2254] tinycc: derive rev from version

---
 pkgs/development/compilers/tinycc/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix
index 80209a8a96a..7c81f9ba163 100644
--- a/pkgs/development/compilers/tinycc/default.nix
+++ b/pkgs/development/compilers/tinycc/default.nix
@@ -4,10 +4,11 @@ with lib;
 stdenv.mkDerivation rec {
   pname = "tcc";
   version = "0.9.27";
+  upstreamVersion = "release_${concatStringsSep "_" (builtins.splitVersion version)}";
 
   src = fetchFromRepoOrCz {
     repo = "tinycc";
-    rev = "release_0_9_27";
+    rev = upstreamVersion;
     sha256 = "12mm1lqywz0akr2yb2axjfbw8lwv57nh395vzsk534riz03ml977";
   };
 
-- 
GitLab


From be9b61fc81e3c51985e7d8da56beb7b35eae60a2 Mon Sep 17 00:00:00 2001
From: "(cdep)illabout" <cdep.illabout@gmail.com>
Date: Sat, 5 Oct 2019 15:57:58 +0900
Subject: [PATCH 2003/2254] memtest86-efi: 8.0 -> 8.1

Update memtest86-efi from version 8.0 to 8.1.

This also reworks the derivation to have less dependencies.
---
 pkgs/tools/misc/memtest86-efi/default.nix | 44 ++++++++++++-----------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/pkgs/tools/misc/memtest86-efi/default.nix b/pkgs/tools/misc/memtest86-efi/default.nix
index 10135d66408..8d28dbcf40e 100644
--- a/pkgs/tools/misc/memtest86-efi/default.nix
+++ b/pkgs/tools/misc/memtest86-efi/default.nix
@@ -1,25 +1,28 @@
-{ lib, stdenv, fetchurl, unzip, libguestfs-with-appliance }:
+{ fetchzip, lib, p7zip, stdenv }:
 
 stdenv.mkDerivation rec {
   pname = "memtest86-efi";
-  version = "8.0";
+  version = "8.1";
 
-  src = fetchurl {
-    # TODO: The latest version of memtest86 is actually 8.1, but apparently the
-    # company has stopped distributing versioned binaries of memtest86:
+  src = fetchzip {
+    # TODO: The latest version of memtest86 is actually 8.2, but the
+    # company developing memtest86 has stopped providing a versioned download
+    # link for the latest version:
+    #
     # https://www.passmark.com/forum/memtest86/44494-version-8-1-distribution-file-is-not-versioned?p=44505#post44505
-    # However, it does look like redistribution is okay, so if we had
-    # somewhere to host binaries that we make sure to version, then we could
-    # probably keep up with the latest versions released by the company.
+    #
+    # However, versioned links for the previous version are available, so that
+    # is what is being used.
+    #
+    # It does look like redistribution is okay, so if we had somewhere to host
+    # binaries that we make sure to version, then we could probably keep up
+    # with the latest versions released by the company.
     url = "https://www.memtest86.com/downloads/memtest86-${version}-usb.zip";
-    sha256 = "147mnd7fnx2wvbzscw7pkg9ljiczhz05nb0cjpmww49a0ms4yknw";
+    sha256 = "0qiyd8ymn307shmvwmqd80q3svxf49133d2pf84qpdlcmjjfnhgg";
+    stripRoot = false;
   };
 
-  nativeBuildInputs = [ libguestfs-with-appliance unzip ];
-
-  unpackPhase = ''
-    unzip -q $src -d .
-  '';
+  nativeBuildInputs = [ p7zip ];
 
   installPhase = ''
     mkdir -p $out
@@ -27,16 +30,15 @@ stdenv.mkDerivation rec {
     # memtest86 is distributed as a bootable USB image.  It contains the actual
     # memtest86 EFI app.
     #
-    # The following command uses libguestfs to extract the actual EFI app from the
-    # usb image so that it can be installed directly on the hard drive.  This creates
-    # the ./BOOT/ directory with the memtest86 EFI app.
-    guestfish --ro --add ./memtest86-usb.img --mount /dev/sda1:/  copy-out /EFI/BOOT .
-
-    cp -r BOOT/* $out/
+    # The following command uses p7zip to extract the actual EFI app from the
+    # usb image so that it can be installed directly on the hard drive.
+    7z x -o$TEMP/temp-efi-dirs $src/memtest86-usb.img
+    7z x -o$TEMP/memtest86-files $TEMP/temp-efi-dirs/EFI\ System\ Partition.img
+    cp -r $TEMP/memtest86-files/EFI/BOOT/* $out/
   '';
 
   meta = with lib; {
-    homepage = http://memtest86.com/;
+    homepage = "http://memtest86.com/";
     downloadPage = "https://www.memtest86.com/download.htm";
     description = "A tool to detect memory errors, to be run from a bootloader";
     longDescription = ''
-- 
GitLab


From e621bf7972b034f6a59394d88e124c6d218884d0 Mon Sep 17 00:00:00 2001
From: David Wood <david@davidtw.co>
Date: Sat, 5 Oct 2019 12:59:58 +0100
Subject: [PATCH 2004/2254] ansi2html: init at 1.5.2

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

diff --git a/pkgs/development/python-modules/ansi2html/default.nix b/pkgs/development/python-modules/ansi2html/default.nix
new file mode 100644
index 00000000000..2a705b53538
--- /dev/null
+++ b/pkgs/development/python-modules/ansi2html/default.nix
@@ -0,0 +1,23 @@
+{ lib, buildPythonPackage, fetchPypi, isPy3k, six, mock, nose, setuptools }:
+
+buildPythonPackage rec {
+  pname = "ansi2html";
+  version = "1.5.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1a9vihsvd03hb0a4dbiklyy686adp9q2ipl79mkxmdr6gfp8bbln";
+  };
+
+  propagatedBuildInputs = [ six setuptools ];
+
+  checkInputs = [ mock nose ];
+
+  meta = with lib; {
+    description = "Convert text with ANSI color codes to HTML";
+    homepage = http://github.com/ralphbean/ansi2html;
+    license = licenses.lgpl3Plus;
+    maintainers = with maintainers; [ davidtwco ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index efa8c4be094..b274a8257f6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -165,6 +165,8 @@ in {
 
   ansicolor = callPackage ../development/python-modules/ansicolor { };
 
+  ansi2html = callPackage ../development/python-modules/ansi2html { };
+
   anytree = callPackage ../development/python-modules/anytree {
     inherit (pkgs) graphviz;
   };
-- 
GitLab


From 7500c71e7b2ae63933de7292870e88d1465db496 Mon Sep 17 00:00:00 2001
From: David Wood <david@davidtw.co>
Date: Sat, 5 Oct 2019 13:00:14 +0100
Subject: [PATCH 2005/2254] mdcat: init at 0.13.0

---
 pkgs/tools/text/mdcat/default.nix | 32 +++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  5 +++++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/tools/text/mdcat/default.nix

diff --git a/pkgs/tools/text/mdcat/default.nix b/pkgs/tools/text/mdcat/default.nix
new file mode 100644
index 00000000000..9ebc9840b07
--- /dev/null
+++ b/pkgs/tools/text/mdcat/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, Security, ansi2html }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "mdcat";
+  version = "0.13.0";
+
+  src = fetchFromGitHub {
+    owner = "lunaryorn";
+    repo = pname;
+    rev = "mdcat-${version}";
+    sha256 = "0xlcpyfmil7sszv4008v4ipqswz49as4nzac0kzmzsb86np191q0";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ (stdenv.lib.optional stdenv.isDarwin Security) openssl ];
+
+  cargoSha256 = "16q17gm59lpjqa18q289cjmjlf2jicag12jz529x5kh11x6bjl8v";
+
+  checkInputs = [ ansi2html ];
+  checkPhase = ''
+    # Skip tests that use the network.
+    cargo test -- --skip terminal::iterm2
+  '';
+
+  meta = with stdenv.lib; {
+    description = "cat for markdown";
+    homepage = https://github.com/lunaryorn/mdcat;
+    license = with licenses; [ asl20 ];
+    maintainers = with maintainers; [ davidtwco ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fb906ed884a..fa05dda099a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4343,6 +4343,11 @@ in
     inherit (darwin.apple_sdk.frameworks) CoreServices;
   };
 
+  mdcat = callPackage ../tools/text/mdcat {
+    inherit (darwin.apple_sdk.frameworks) Security;
+    inherit (pythonPackages) ansi2html;
+  };
+
   medfile = callPackage ../development/libraries/medfile { };
 
   memtester = callPackage ../tools/system/memtester { };
-- 
GitLab


From 9e8e6c8f642f1ebb0cecd2d3067abd71b45abdc9 Mon Sep 17 00:00:00 2001
From: David Wood <david@davidtw.co>
Date: Sat, 5 Oct 2019 13:05:07 +0100
Subject: [PATCH 2006/2254] starship: 0.20.1 -> 0.20.2

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

diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix
index 48876c8e387..907d9647331 100644
--- a/pkgs/tools/misc/starship/default.nix
+++ b/pkgs/tools/misc/starship/default.nix
@@ -2,13 +2,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "starship";
-  version = "0.20.1";
+  version = "0.20.2";
 
   src = fetchFromGitHub {
     owner = "starship";
     repo = "starship";
     rev = "v${version}";
-    sha256 = "0v6x19rv7i03rp4wmg97yw9wybafpn8r2gb0l6ha3d218vhb71ln";
+    sha256 = "0nyka4w7vzx3n93y44vblc9pjqaymd867fmp0yd8kk2v56cyf4vd";
   };
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ];
-- 
GitLab


From 1a61e254a04c6e53a8022b7e5580201f21e20b00 Mon Sep 17 00:00:00 2001
From: David Wood <david@davidtw.co>
Date: Sat, 5 Oct 2019 13:05:41 +0100
Subject: [PATCH 2007/2254] starship: add davidtwco as maintainer

---
 pkgs/tools/misc/starship/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix
index 907d9647331..b2a5ded346a 100644
--- a/pkgs/tools/misc/starship/default.nix
+++ b/pkgs/tools/misc/starship/default.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
     description = "A minimal, blazing fast, and extremely customizable prompt for any shell";
     homepage = "https://starship.rs";
     license = licenses.isc;
-    maintainers = with maintainers; [ bbigras ];
+    maintainers = with maintainers; [ bbigras davidtwco ];
     platforms = platforms.all;
   };
 }
-- 
GitLab


From fd41a333d806b9d4ac4a5f39775b650edc5756f6 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 5 Oct 2019 13:49:52 +0200
Subject: [PATCH 2008/2254] libcouchbase: fix build

This applies an upstream fix from libcouchbase to fix a timeout issue
with openssl 1.1.

See also https://hydra.nixos.org/build/102495724

ZHF #68361
---
 ...x-timeouts-in-libcouchbase-testsuite.patch | 36 +++++++++++++++++++
 .../libraries/libcouchbase/default.nix        |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/development/libraries/libcouchbase/0001-Fix-timeouts-in-libcouchbase-testsuite.patch

diff --git a/pkgs/development/libraries/libcouchbase/0001-Fix-timeouts-in-libcouchbase-testsuite.patch b/pkgs/development/libraries/libcouchbase/0001-Fix-timeouts-in-libcouchbase-testsuite.patch
new file mode 100644
index 00000000000..1c57757f855
--- /dev/null
+++ b/pkgs/development/libraries/libcouchbase/0001-Fix-timeouts-in-libcouchbase-testsuite.patch
@@ -0,0 +1,36 @@
+From 58237e64fa77ec5cdec658b3295f71ec899175fa Mon Sep 17 00:00:00 2001
+From: Maximilian Bosch <maximilian@mbosch.me>
+Date: Sat, 5 Oct 2019 13:47:59 +0200
+Subject: [PATCH] Fix timeouts in libcouchbase testsuite
+
+Nix-specific patch. Basically
+https://github.com/couchbase/libcouchbase/commit/b272f6ab88be523bbcf9d5c4252d07fccb023fe5, but
+rebased onto 2.10.4.
+---
+ src/ssl/ssl_e.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/ssl/ssl_e.c b/src/ssl/ssl_e.c
+index f4506cf..734a3e6 100644
+--- a/src/ssl/ssl_e.c
++++ b/src/ssl/ssl_e.c
+@@ -210,10 +210,16 @@ flush_ssl_data(lcbio_ESSL *es)
+      * calls. While we could have done this inline with the send() call this
+      * would make future optimization more difficult. */
+     GT_WRITE_DONE:
++#if !LCB_CAN_OPTIMIZE_SSL_BIO
++    BIO_get_mem_ptr(es->wbio, &wmb);
++#endif
+     while (wmb->length > (size_t)tmp_len) {
+         char dummy[4096];
+         unsigned to_read = MINIMUM(wmb->length-tmp_len, sizeof dummy);
+         BIO_read(es->wbio, dummy, to_read);
++#if !LCB_CAN_OPTIMIZE_SSL_BIO
++        BIO_get_mem_ptr(es->wbio, &wmb);
++#endif
+     }
+     BIO_clear_retry_flags(es->wbio);
+     return 0;
+-- 
+2.23.0
+
diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix
index 23b39bca1f3..ccfe241324e 100644
--- a/pkgs/development/libraries/libcouchbase/default.nix
+++ b/pkgs/development/libraries/libcouchbase/default.nix
@@ -19,6 +19,8 @@ stdenv.mkDerivation rec {
   # Running tests in parallel does not work
   enableParallelChecking = false;
 
+  patches = [ ./0001-Fix-timeouts-in-libcouchbase-testsuite.patch ];
+
   doCheck = !stdenv.isDarwin;
 
   meta = with stdenv.lib; {
-- 
GitLab


From bbe7f62ace3c80cf47351aa9f1443de9fa6d8702 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sat, 5 Oct 2019 09:08:58 -0400
Subject: [PATCH 2009/2254] gnomeExtensions.mpris-indicator-button: init at
 2019-09-29

This is essentially the replacement for gnomeExtensions.mediaplayer.
---
 .../mpris-indicator-button/default.nix        | 32 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  3 +-
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/desktops/gnome-3/extensions/mpris-indicator-button/default.nix

diff --git a/pkgs/desktops/gnome-3/extensions/mpris-indicator-button/default.nix b/pkgs/desktops/gnome-3/extensions/mpris-indicator-button/default.nix
new file mode 100644
index 00000000000..dca346c6cce
--- /dev/null
+++ b/pkgs/desktops/gnome-3/extensions/mpris-indicator-button/default.nix
@@ -0,0 +1,32 @@
+{ stdenv
+, fetchFromGitHub
+, gnome3
+}:
+
+stdenv.mkDerivation rec {
+  pname = "gnome-shell-extension-mpris-indicator-button-unstable";
+  version = "2019-09-29";
+
+  src = fetchFromGitHub {
+    owner = "JasonLG1979";
+    repo = "gnome-shell-extension-mpris-indicator-button";
+    rev = "6cdc28a8bde98f25618b27ee48280996e2b4a0f8";
+    sha256 = "1n3sh3phpa75y3vpc09wnzhis0m92zli1m46amzsdbvmk6gkifif";
+  };
+
+  uuid = "mprisindicatorbutton@JasonLG1979.github.io";
+
+  installPhase = ''
+    mkdir -p $out/share/gnome-shell/extensions
+    cp -r ${uuid} $out/share/gnome-shell/extensions
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A simple MPRIS indicator button for GNOME Shell";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ worldofpeace ];
+    platforms = gnome3.gnome-shell.meta.platforms;
+    homepage = "https://github.com/JasonLG1979/gnome-shell-extension-mpris-indicator-button";
+    broken = versionOlder gnome3.gnome-shell.version "3.34";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2ef74dc142e..6d21a5b59dd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22787,8 +22787,9 @@ in
     gsconnect = callPackage ../desktops/gnome-3/extensions/gsconnect { };
     icon-hider = callPackage ../desktops/gnome-3/extensions/icon-hider { };
     impatience = callPackage ../desktops/gnome-3/extensions/impatience.nix { };
-    nohotcorner = callPackage ../desktops/gnome-3/extensions/nohotcorner { };
+    mpris-indicator-button = callPackage ../desktops/gnome-3/extensions/mpris-indicator-button { };
     no-title-bar = callPackage ../desktops/gnome-3/extensions/no-title-bar { };
+    nohotcorner = callPackage ../desktops/gnome-3/extensions/nohotcorner { };
     pidgin-im-integration = callPackage ../desktops/gnome-3/extensions/pidgin-im-integration { };
     remove-dropdown-arrows = callPackage ../desktops/gnome-3/extensions/remove-dropdown-arrows { };
     sound-output-device-chooser = callPackage ../desktops/gnome-3/extensions/sound-output-device-chooser { };
-- 
GitLab


From de171ba0c687374bd5694c57ff85c8d29f8aa1f1 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 5 Oct 2019 16:17:37 +0300
Subject: [PATCH 2010/2254] cntk: partially unbreak

* Use GCC 7 to unbreak the build;
* Mark CUDA build as broken due to cub incompatibility.
---
 .../science/math/cntk/default.nix             | 19 ++++++++++++++++---
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/math/cntk/default.nix b/pkgs/applications/science/math/cntk/default.nix
index c20a6954c3c..ceb87b25ba8 100644
--- a/pkgs/applications/science/math/cntk/default.nix
+++ b/pkgs/applications/science/math/cntk/default.nix
@@ -1,7 +1,7 @@
-{ config, lib, stdenv, fetchgit, fetchFromGitHub, cmake
+{ lib, stdenv, fetchgit, fetchFromGitHub, cmake
 , openblas, opencv3, libzip, boost, protobuf, openmpi
 , onebitSGDSupport ? false
-, cudaSupport ? config.cudaSupport or false, cudatoolkit, nvidia_x11
+, cudaSupport ? false, addOpenGLRunpath, cudatoolkit, nvidia_x11
 , cudnnSupport ? cudaSupport, cudnn
 }:
 
@@ -27,7 +27,10 @@ in stdenv.mkDerivation rec {
     sha256 = "18l9k7s966a26ywcf7flqyhm61788pcb9fj3wk61jrmgkhy2pcns";
   };
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake ] ++ lib.optional cudaSupport addOpenGLRunpath;
+
+  # Force OpenMPI to use g++ in PATH.
+  OMPI_CXX = "g++";
 
   buildInputs = [ openblas opencv3 libzip boost protobuf openmpi ]
              ++ lib.optional cudaSupport cudatoolkit
@@ -69,6 +72,7 @@ in stdenv.mkDerivation rec {
       ln -s ${cudnn}/include cuda
       export configureFlags="$configureFlags --with-cudnn=$PWD"
     ''}
+
     ../configure $configureFlags
   '';
 
@@ -79,9 +83,18 @@ in stdenv.mkDerivation rec {
     cp bin/cntk $out/bin
   '';
 
+  postFixup = lib.optionalString cudaSupport ''
+    for lib in $out/lib/*; do
+      addOpenGLRunpath "$lib"
+    done
+  '';
+
   enableParallelBuilding = true;
 
   meta = with lib; {
+    # Newer cub is included with cudatoolkit now and it breaks the build.
+    # https://github.com/Microsoft/CNTK/issues/3191
+    broken = cudaSupport;
     homepage = https://github.com/Microsoft/CNTK;
     description = "An open source deep-learning toolkit";
     license = if onebitSGDSupport then licenses.unfreeRedistributable else licenses.mit;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6ddfef431ab..f23a3f8e155 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23554,8 +23554,10 @@ in
   caffeine-ng = callPackage ../tools/X11/caffeine-ng {};
 
   cntk = callPackage ../applications/science/math/cntk {
+    stdenv = gcc7Stdenv;
     inherit (linuxPackages) nvidia_x11;
     opencv3 = opencv3WithoutCuda; # Used only for image loading.
+    cudaSupport = pkgs.config.cudaSupport or false;
   };
 
   ecm = callPackage ../applications/science/math/ecm { };
-- 
GitLab


From 57481b7a1c1e8c7c835009e1c7ad89d2f7b3d898 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sat, 5 Oct 2019 09:43:47 -0400
Subject: [PATCH 2011/2254] nixos/system-environment: use pam syntax for home
 variable

---
 nixos/modules/config/system-environment.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/nixos/modules/config/system-environment.nix b/nixos/modules/config/system-environment.nix
index 4b663ebf85a..361c3cfc553 100644
--- a/nixos/modules/config/system-environment.nix
+++ b/nixos/modules/config/system-environment.nix
@@ -78,9 +78,7 @@ in
         # We're trying to use the same syntax for PAM variables and env variables.
         # That means we need to map the env variables that people might use to their
         # equivalent PAM variable.
-        # Note: PAM_USER is a PAM_ITEM, HOME is an environment variable, they have 
-        # different syntax.
-        replaceEnvVars = replaceStrings ["$HOME" "$USER"] ["\${HOME}" "@{PAM_USER}"];
+        replaceEnvVars = replaceStrings ["$HOME" "$USER"] ["@{HOME}" "@{PAM_USER}"];
 
         pamVariable = n: v:
           ''${n}   DEFAULT="${concatStringsSep ":" (map replaceEnvVars (toList v))}"'';
-- 
GitLab


From 1a27482a6ce3e14dab274ef55051111b25a33cff Mon Sep 17 00:00:00 2001
From: Michael Fellinger <michael.fellinger@iohk.io>
Date: Sat, 5 Oct 2019 02:32:21 +0200
Subject: [PATCH 2012/2254] di: fix homepage

---
 pkgs/tools/system/di/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/di/default.nix b/pkgs/tools/system/di/default.nix
index 9d56b8488e5..48335d28d46 100644
--- a/pkgs/tools/system/di/default.nix
+++ b/pkgs/tools/system/di/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "4.47.1";
 
   src = fetchurl {
-    url = "http://gentoo.com/di/${pname}-${version}.tar.gz";
+    url = "https://gentoo.com/${pname}/${pname}-${version}.tar.gz";
     sha256 = "1bdbl9k3gqf4h6g21difqc0w17pjid6r587y19wi37vx36aava7f";
   };
 
@@ -13,8 +13,9 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Disk information utility; displays everything 'df' does and more";
-    homepage = http://www.gentoo.com/di/;
+    homepage = https://gentoo.com/di/;
     license = licenses.zlib;
+    updateWalker = true;
     maintainers = with maintainers; [ manveru ndowens ];
     platforms = platforms.all;
   };
-- 
GitLab


From eb4da7a8c13ae6b102a8c303e3c251b176db8fcf Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 5 Oct 2019 10:35:23 -0400
Subject: [PATCH 2013/2254] linux: 4.14.146 -> 4.14.147

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index efafd10b0b8..1e28f20758f 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.14.146";
+  version = "4.14.147";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1x9343pvlxdgx0zbsn12mcfhf6r8d9p57h6l5cw7krm3gs44pid3";
+    sha256 = "04jvp05spszcxmkdsl21dylbcf76ns9bwxf1zlk4x7cxiil97mwg";
   };
 } // (args.argsOverride or {}))
-- 
GitLab


From f47dd4a4568e923e5e3046b0c4e217b3deaf4cf5 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 5 Oct 2019 10:35:57 -0400
Subject: [PATCH 2014/2254] linux: 4.19.76 -> 4.19.77

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix
index da7347f7c67..c5b81717d6d 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.19.76";
+  version = "4.19.77";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0rhyjw5r3xdnj37dd6wrpihdqc3zn5ih6hcpa4x2cjvk0acx4kds";
+    sha256 = "1agksl35amjzc6g6d9zjwz6p5qir2cligb5c1d9s2bag9766jav1";
   };
 } // (args.argsOverride or {}))
-- 
GitLab


From 63ec681edbc2a4d3f32e54ac5eca0805ee81d800 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 5 Oct 2019 10:36:19 -0400
Subject: [PATCH 2015/2254] linux: 4.4.194 -> 4.4.195

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index 9ca235ae24c..99f2b219165 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.4.194";
+  version = "4.4.195";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0kvlp2v4nvkilaanhpgwf8dkyfj24msaw0m38rbc4y51y69yhqvz";
+    sha256 = "1dilaz0ghmkml10cvzzpz7ivcx9d8d6fpb76vmixcg634w2jx962";
   };
 } // (args.argsOverride or {}))
-- 
GitLab


From 808633dc81688815220d0c9f0a6c01c715c7c177 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 5 Oct 2019 10:36:49 -0400
Subject: [PATCH 2016/2254] linux: 4.9.194 -> 4.9.195

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index e5b2d0d386b..299fce9eab4 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.9.194";
+  version = "4.9.195";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1qy20vw5bhnsfbh95sdhjbk6y94js8m4ryd3m7xg2qg4hisvpx6m";
+    sha256 = "0s4xj8f1dpnz3fbrqmgwq02smhcrq1ni8hgn2bbfqvm15lm5dgjl";
   };
 } // (args.argsOverride or {}))
-- 
GitLab


From e0907d24940a51d5367fbf5b67d07cfc3b4ce973 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 5 Oct 2019 10:37:27 -0400
Subject: [PATCH 2017/2254] linux: 5.2.18 -> 5.2.19

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

diff --git a/pkgs/os-specific/linux/kernel/linux-5.2.nix b/pkgs/os-specific/linux/kernel/linux-5.2.nix
index db8fc2965cf..315c8caaf59 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.2.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.2.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.2.18";
+  version = "5.2.19";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "0q6akmhcdj52lhvs5fjxrr25r0hyklh7115hg0zl0fcpdj30y2bd";
+    sha256 = "12mi857lyd5vj8qhj2f505hqnwzsnd829hxd78n9kk88iv1f966y";
   };
 } // (args.argsOverride or {}))
-- 
GitLab


From d5832fbfac411fb3727c937b73891e584e21c4f8 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 5 Oct 2019 10:37:52 -0400
Subject: [PATCH 2018/2254] linux: 5.3.2 -> 5.3.4

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

diff --git a/pkgs/os-specific/linux/kernel/linux-5.3.nix b/pkgs/os-specific/linux/kernel/linux-5.3.nix
index 43f096be1a7..61b7b7b58be 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.3.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.3.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.3.2";
+  version = "5.3.4";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "0szw21mpp94gp3zn2fgllbv6fdjjf20njgrcjay7vjmm7farq7rn";
+    sha256 = "0vi4bgcr921z5l6fbcrcgmhaji5gl2avpmp7njna6v0f7sxism0r";
   };
 } // (args.argsOverride or {}))
-- 
GitLab


From b16998f51e7bc07ddc4685b697316d706326f918 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 5 Oct 2019 10:55:44 -0400
Subject: [PATCH 2019/2254] oh-my-zsh: 2019-10-02 -> 2019-10-03

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

diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix
index d322d967705..c732723b30f 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -4,13 +4,13 @@
 { stdenv, fetchgit }:
 
 stdenv.mkDerivation rec {
-  version = "2019-10-02";
+  version = "2019-10-03";
   pname = "oh-my-zsh";
-  rev = "ae0de1135dc96cfabe31d70f65112cbeadbfa3bf";
+  rev = "3848102a5ec8534cef935d594c6abcbfc0f419c8";
 
   src = fetchgit { inherit rev;
     url = "https://github.com/robbyrussell/oh-my-zsh";
-    sha256 = "1xr3xxmhqz2x2v9w15jmxb1pql8fal1smw1j59irmzvnq8zisz2y";
+    sha256 = "07bkw0517sghgfvjnahiscyjj15zalarprwh6gn380z4czqhfcp4";
   };
 
   pathsToLink = [ "/share/oh-my-zsh" ];
-- 
GitLab


From 10b433ecffa2330df253da4e23db188071a694da Mon Sep 17 00:00:00 2001
From: Quentin Vaucher <quentin.vaucher@protonmail.com>
Date: Fri, 4 Oct 2019 13:15:52 +0200
Subject: [PATCH 2020/2254] cipher: init at 2.0.0

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

diff --git a/pkgs/applications/misc/cipher/default.nix b/pkgs/applications/misc/cipher/default.nix
new file mode 100644
index 00000000000..51095e8e58e
--- /dev/null
+++ b/pkgs/applications/misc/cipher/default.nix
@@ -0,0 +1,57 @@
+{ stdenv
+, fetchFromGitHub
+, meson
+, ninja
+, pkgconfig
+, pantheon
+, python3
+, gettext
+, glib
+, gtk3
+, libgee
+, xdg_utils
+, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+  pname = "cipher";
+  version = "2.0.0";
+
+  src = fetchFromGitHub {
+    owner = "arshubham";
+    repo = "cipher";
+    rev = version;
+    sha256 = "0n5aigcyxnl4k52mdmavbxx6afc1ixymn3k3l2ryhyzi5q31x0x3";
+  };
+
+  nativeBuildInputs = [
+    gettext
+    meson
+    ninja
+    pantheon.vala
+    pkgconfig
+    python3
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
+    glib
+    gtk3
+    pantheon.granite
+    libgee
+  ];
+
+  postPatch = ''
+  	substituteInPlace data/com.github.arshubham.cipher.desktop.in \
+  		--replace xdg-open ${xdg_utils}/bin/xdg-open
+    chmod +x post_install.py
+    patchShebangs post_install.py
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A simple application for encoding and decoding text, designed for elementary OS";
+    homepage = "https://github.com/arshubham/cipher";
+    maintainers = with maintainers; [ kjuvi ] ++ pantheon.maintainers;
+    platforms = platforms.linux;
+    license = licenses.gpl3Plus;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fb906ed884a..272e2e8486b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17729,6 +17729,8 @@ in
 
   cinelerra = callPackage ../applications/video/cinelerra { };
 
+  cipher = callPackage ../applications/misc/cipher { };
+
   claws-mail = callPackage ../applications/networking/mailreaders/claws-mail {
     inherit (xorg) libSM;
   };
-- 
GitLab


From 0eaf29433e9f96205cbe8e9db76b94799a79ddec Mon Sep 17 00:00:00 2001
From: Albert Safin <xzfcpw@gmail.com>
Date: Sat, 5 Oct 2019 15:48:30 +0000
Subject: [PATCH 2021/2254] nixos/doc: fix manpage format

Spaces inside <refname> cause stray double underscore in generated manual pages.

Fixes #70468
---
 nixos/doc/manual/man-configuration.xml         | 4 ++--
 nixos/doc/manual/man-nixos-build-vms.xml       | 4 ++--
 nixos/doc/manual/man-nixos-enter.xml           | 4 ++--
 nixos/doc/manual/man-nixos-generate-config.xml | 4 ++--
 nixos/doc/manual/man-nixos-install.xml         | 4 ++--
 nixos/doc/manual/man-nixos-option.xml          | 4 ++--
 nixos/doc/manual/man-nixos-rebuild.xml         | 4 ++--
 nixos/doc/manual/man-nixos-version.xml         | 4 ++--
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/nixos/doc/manual/man-configuration.xml b/nixos/doc/manual/man-configuration.xml
index 9f30b792510..ddb1408fdcf 100644
--- a/nixos/doc/manual/man-configuration.xml
+++ b/nixos/doc/manual/man-configuration.xml
@@ -8,8 +8,8 @@
 <!-- <refmiscinfo class="version"><xi:include href="version.txt" parse="text"/></refmiscinfo> -->
  </refmeta>
  <refnamediv>
-  <refname><filename>configuration.nix</filename>
-  </refname><refpurpose>NixOS system configuration specification</refpurpose>
+  <refname><filename>configuration.nix</filename></refname>
+  <refpurpose>NixOS system configuration specification</refpurpose>
  </refnamediv>
  <refsection>
   <title>Description</title>
diff --git a/nixos/doc/manual/man-nixos-build-vms.xml b/nixos/doc/manual/man-nixos-build-vms.xml
index 7d6e04e0dd9..d114261f53b 100644
--- a/nixos/doc/manual/man-nixos-build-vms.xml
+++ b/nixos/doc/manual/man-nixos-build-vms.xml
@@ -8,8 +8,8 @@
 <!-- <refmiscinfo class="version"><xi:include href="version.txt" parse="text"/></refmiscinfo> -->
  </refmeta>
  <refnamediv>
-  <refname><command>nixos-build-vms</command>
-  </refname><refpurpose>build a network of virtual machines from a network of NixOS configurations</refpurpose>
+  <refname><command>nixos-build-vms</command></refname>
+  <refpurpose>build a network of virtual machines from a network of NixOS configurations</refpurpose>
  </refnamediv>
  <refsynopsisdiv>
   <cmdsynopsis>
diff --git a/nixos/doc/manual/man-nixos-enter.xml b/nixos/doc/manual/man-nixos-enter.xml
index 1481db46712..fe560d3efdd 100644
--- a/nixos/doc/manual/man-nixos-enter.xml
+++ b/nixos/doc/manual/man-nixos-enter.xml
@@ -8,8 +8,8 @@
 <!-- <refmiscinfo class="version"><xi:include href="version.txt" parse="text"/></refmiscinfo> -->
  </refmeta>
  <refnamediv>
-  <refname><command>nixos-enter</command>
-  </refname><refpurpose>run a command in a NixOS chroot environment</refpurpose>
+  <refname><command>nixos-enter</command></refname>
+  <refpurpose>run a command in a NixOS chroot environment</refpurpose>
  </refnamediv>
  <refsynopsisdiv>
   <cmdsynopsis>
diff --git a/nixos/doc/manual/man-nixos-generate-config.xml b/nixos/doc/manual/man-nixos-generate-config.xml
index 61531a8f01c..9ac3b918ff6 100644
--- a/nixos/doc/manual/man-nixos-generate-config.xml
+++ b/nixos/doc/manual/man-nixos-generate-config.xml
@@ -8,8 +8,8 @@
 <!-- <refmiscinfo class="version"><xi:include href="version.txt" parse="text"/></refmiscinfo> -->
  </refmeta>
  <refnamediv>
-  <refname><command>nixos-generate-config</command>
-  </refname><refpurpose>generate NixOS configuration modules</refpurpose>
+  <refname><command>nixos-generate-config</command></refname>
+  <refpurpose>generate NixOS configuration modules</refpurpose>
  </refnamediv>
  <refsynopsisdiv>
   <cmdsynopsis>
diff --git a/nixos/doc/manual/man-nixos-install.xml b/nixos/doc/manual/man-nixos-install.xml
index 4fb94ee7494..45bbd5d81ff 100644
--- a/nixos/doc/manual/man-nixos-install.xml
+++ b/nixos/doc/manual/man-nixos-install.xml
@@ -8,8 +8,8 @@
 <!-- <refmiscinfo class="version"><xi:include href="version.txt" parse="text"/></refmiscinfo> -->
  </refmeta>
  <refnamediv>
-  <refname><command>nixos-install</command>
-  </refname><refpurpose>install bootloader and NixOS</refpurpose>
+  <refname><command>nixos-install</command></refname>
+  <refpurpose>install bootloader and NixOS</refpurpose>
  </refnamediv>
  <refsynopsisdiv>
   <cmdsynopsis>
diff --git a/nixos/doc/manual/man-nixos-option.xml b/nixos/doc/manual/man-nixos-option.xml
index 3e316e10d4e..81e3739b3be 100644
--- a/nixos/doc/manual/man-nixos-option.xml
+++ b/nixos/doc/manual/man-nixos-option.xml
@@ -8,8 +8,8 @@
 <!-- <refmiscinfo class="version"><xi:include href="version.txt" parse="text"/></refmiscinfo> -->
  </refmeta>
  <refnamediv>
-  <refname><command>nixos-option</command>
-  </refname><refpurpose>inspect a NixOS configuration</refpurpose>
+  <refname><command>nixos-option</command></refname>
+  <refpurpose>inspect a NixOS configuration</refpurpose>
  </refnamediv>
  <refsynopsisdiv>
   <cmdsynopsis>
diff --git a/nixos/doc/manual/man-nixos-rebuild.xml b/nixos/doc/manual/man-nixos-rebuild.xml
index a83c4fb965e..c697b7ee047 100644
--- a/nixos/doc/manual/man-nixos-rebuild.xml
+++ b/nixos/doc/manual/man-nixos-rebuild.xml
@@ -9,8 +9,8 @@
  </refmeta>
 
  <refnamediv>
-  <refname><command>nixos-rebuild</command>
-  </refname><refpurpose>reconfigure a NixOS machine</refpurpose>
+  <refname><command>nixos-rebuild</command></refname>
+  <refpurpose>reconfigure a NixOS machine</refpurpose>
  </refnamediv>
 
  <refsynopsisdiv>
diff --git a/nixos/doc/manual/man-nixos-version.xml b/nixos/doc/manual/man-nixos-version.xml
index 931c4a5ad02..e9ad8bddcac 100644
--- a/nixos/doc/manual/man-nixos-version.xml
+++ b/nixos/doc/manual/man-nixos-version.xml
@@ -7,8 +7,8 @@
   <refmiscinfo class="source">NixOS</refmiscinfo>
  </refmeta>
  <refnamediv>
-  <refname><command>nixos-version</command>
-  </refname><refpurpose>show the NixOS version</refpurpose>
+  <refname><command>nixos-version</command></refname>
+  <refpurpose>show the NixOS version</refpurpose>
  </refnamediv>
  <refsynopsisdiv>
   <cmdsynopsis>
-- 
GitLab


From 1b813fa0161c781775793c0d0799ea5b65968b7b Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 5 Oct 2019 19:25:50 +0200
Subject: [PATCH 2022/2254] pythonPackages.openrazer-daemon: python3 only

The build [fails](https://hydra.nixos.org/build/102502339) due to not finding
the python3 interpreter; as far as I can tell, all scripts in the package
refer to python3.

For [ZHF](https://github.com/NixOS/nixpkgs/issues/68361)
---
 pkgs/development/python-modules/openrazer/daemon.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/python-modules/openrazer/daemon.nix b/pkgs/development/python-modules/openrazer/daemon.nix
index 6e3ab1e7833..dd54851ea81 100644
--- a/pkgs/development/python-modules/openrazer/daemon.nix
+++ b/pkgs/development/python-modules/openrazer/daemon.nix
@@ -1,4 +1,5 @@
 { buildPythonApplication
+, isPy3k
 , daemonize
 , dbus-python
 , fetchFromGitHub
@@ -21,6 +22,8 @@ buildPythonApplication (common // rec {
 
   sourceRoot = "source/daemon";
 
+  disabled = !isPy3k;
+
   outputs = [ "out" "man" ];
 
   nativeBuildInputs = [ makeWrapper wrapGAppsHook ];
-- 
GitLab


From 43a333a1e41d0bb75495a25bbd68d91d38f5dfe7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcial=20Gai=C3=9Fert?=
 <gaisseml@studi.informatik.uni-stuttgart.de>
Date: Sat, 5 Oct 2019 19:37:52 +0200
Subject: [PATCH 2023/2254] cups-filters: 1.25.0 -> 1.25.6

---
 pkgs/misc/cups/filters.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix
index 927755fdb74..05b8c1f7046 100644
--- a/pkgs/misc/cups/filters.nix
+++ b/pkgs/misc/cups/filters.nix
@@ -9,11 +9,11 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "cups-filters";
-  version = "1.25.0";
+  version = "1.25.6";
 
   src = fetchurl {
     url = "https://openprinting.org/download/cups-filters/${pname}-${version}.tar.xz";
-    sha256 = "1laiscq8yvynw862calkgbz9irrdkmd5l821q6a6wik1ifd186c1";
+    sha256 = "1pgjk7j2p8m17pwynqd86hxgvz9lyb09ivx18lv6inmygij0pm4j";
   };
 
   nativeBuildInputs = [ pkgconfig makeWrapper ];
-- 
GitLab


From 317a011e5e250f57f82663b922f8aa762295c170 Mon Sep 17 00:00:00 2001
From: Amanda Cameron <amanda@darkdna.net>
Date: Sat, 5 Oct 2019 14:54:02 -0400
Subject: [PATCH 2024/2254] vscode: Make it so that it places the .app in
 /Applications on macOS

---
 pkgs/applications/editors/vscode/generic.nix  | 6 +++---
 pkgs/applications/editors/vscode/vscodium.nix | 8 ++++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix
index 7b7209a5e1f..bdcf786f61d 100644
--- a/pkgs/applications/editors/vscode/generic.nix
+++ b/pkgs/applications/editors/vscode/generic.nix
@@ -69,9 +69,9 @@ in
 
     installPhase =
       if system == "x86_64-darwin" then ''
-        mkdir -p $out/lib/vscode $out/bin
-        cp -r ./* $out/lib/vscode
-        ln -s $out/lib/vscode/Contents/Resources/app/bin/${executableName} $out/bin
+        mkdir -p "$out/Applications/${longName}.app" $out/bin
+        cp -r ./* "$out/Applications/${longName}.app"
+        ln -s "$out/Applications/${longName}.app/Contents/Resources/app/bin/code" $out/bin/${executableName}
       '' else ''
         mkdir -p $out/lib/vscode $out/bin
         cp -r ./* $out/lib/vscode
diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix
index b526d8fe327..3024ea10799 100644
--- a/pkgs/applications/editors/vscode/vscodium.nix
+++ b/pkgs/applications/editors/vscode/vscodium.nix
@@ -14,8 +14,14 @@ let
     x86_64-linux = "15m7mfb8gmx3pwydc37blj0rxwgmkrnqfj6y79rpqlr2dg92gwlb";
     x86_64-darwin = "080k4fnfa5ylmmya6zprgci3gld9mrbqsfnk53hgcny91ykl5xj5";
   }.${system};
+
+  sourceRoot = {
+    x86_64-linux = ".";
+    x86_64-darwin = "";
+  }.${system};
 in
   callPackage ./generic.nix rec {
+    inherit sourceRoot;
 
     version = "1.38.1";
     pname = "vscodium";
@@ -29,8 +35,6 @@ in
       inherit sha256;
     };
 
-    sourceRoot = ".";
-
     meta = with stdenv.lib; {
       description = ''
         Open source source code editor developed by Microsoft for Windows,
-- 
GitLab


From 6b8400381c387ef394903366036615f6ddc911a8 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 5 Oct 2019 21:15:32 +0200
Subject: [PATCH 2025/2254] gotify: init add 2.1.1

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

diff --git a/pkgs/tools/misc/gotify-cli/default.nix b/pkgs/tools/misc/gotify-cli/default.nix
new file mode 100644
index 00000000000..a4b9af09712
--- /dev/null
+++ b/pkgs/tools/misc/gotify-cli/default.nix
@@ -0,0 +1,26 @@
+{ buildGoModule, fetchFromGitHub, lib }:
+
+buildGoModule rec {
+  pname = "gotify-cli";
+  version = "2.1.1";
+
+  src = fetchFromGitHub {
+    owner = "gotify";
+    repo = "cli";
+    rev = "v${version}";
+    sha256 = "131gs6xzfggnrzq5jgyky23zvcmhx3q3hd17xvqxd02s2i9x1mg4";
+  };
+
+  modSha256 = "1lrsg33zd7m24za2gv407hz02n3lmz9qljfk82whlj44hx7kim1z";
+
+  postInstall = ''
+    mv $out/bin/cli $out/bin/gotify
+  '';
+
+  meta = with lib; {
+    license = licenses.mit;
+    homepage = https://github.com/gotify/cli;
+    description = "A command line interface for pushing messages to gotify/server.";
+    maintainers = with maintainers; [ ma27 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aced699a041..a20fed53291 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1713,6 +1713,8 @@ in
 
   gosu = callPackage ../tools/misc/gosu { };
 
+  gotify-cli = callPackage ../tools/misc/gotify-cli { };
+
   gping = callPackage ../tools/networking/gping { };
 
   greg = callPackage ../applications/audio/greg {
-- 
GitLab


From 0b1fb4f2d20dd2cc8965e9e3a8fbd69afd1e174b Mon Sep 17 00:00:00 2001
From: mujx <sideris.konstantin@gmail.com>
Date: Sat, 5 Oct 2019 22:44:09 +0300
Subject: [PATCH 2026/2254] haskellPackages.OpenAL: link with the OpenAL
 framework on Darwin (#70150)

* haskellPackages.OpenAL: link with the OpenAL framework on Darwin

The missing framework caused a build failure on Darwin. Fixes #68306.
---
 pkgs/development/haskell-modules/configuration-nix.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index ec9f4285f87..acab791e963 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -99,6 +99,11 @@ self: super: builtins.intersectAttrs super {
 
   niv = enableSeparateBinOutput super.niv;
 
+  # Ensure the necessary frameworks for Darwin.
+  OpenAL = if pkgs.stdenv.isDarwin
+    then addExtraLibrary super.OpenAL pkgs.darwin.apple_sdk.frameworks.OpenAL
+    else super.OpenAL;
+
   ghcid = enableSeparateBinOutput super.ghcid;
 
   hzk = overrideCabal super.hzk (drv: {
-- 
GitLab


From c4a42a726d049244b3b6eee789d78cc048a74cf4 Mon Sep 17 00:00:00 2001
From: Konstantinos Sideris <siderisk@auth.gr>
Date: Tue, 1 Oct 2019 08:06:54 +0300
Subject: [PATCH 2027/2254] haskellPackages.proteaaudio: link with the
 AudioToolbox framework on Darwin

The build is currently failing on Darwin due to missing headers. see #70151
---
 pkgs/development/haskell-modules/configuration-nix.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index acab791e963..81662b4e9da 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -104,6 +104,11 @@ self: super: builtins.intersectAttrs super {
     then addExtraLibrary super.OpenAL pkgs.darwin.apple_sdk.frameworks.OpenAL
     else super.OpenAL;
 
+  # Ensure the necessary frameworks for Darwin.
+  proteaaudio = if pkgs.stdenv.isDarwin
+    then addExtraLibrary super.proteaaudio pkgs.darwin.apple_sdk.frameworks.AudioToolbox
+    else super.proteaaudio;
+
   ghcid = enableSeparateBinOutput super.ghcid;
 
   hzk = overrideCabal super.hzk (drv: {
-- 
GitLab


From 35521b42c24703046e3f236e25b0fdb6929b0371 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 5 Oct 2019 21:48:36 +0200
Subject: [PATCH 2028/2254] update Python packages psycopg2, sqlparse, and
 pgcli (#70257)

* python-psycopg2: update from 2.7.7 to 2.8.3

* python-sqlparse: update from 0.2.4 to 0.3.0

* pgcli: update from 2.0.2 to 2.1.1
---
 .../python-modules/psycopg2/default.nix       |  4 +-
 .../python-modules/sqlparse/default.nix       |  4 +-
 .../tools/database/pgcli/default.nix          | 37 +++++++------------
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/python-packages.nix            |  2 +
 5 files changed, 21 insertions(+), 28 deletions(-)

diff --git a/pkgs/development/python-modules/psycopg2/default.nix b/pkgs/development/python-modules/psycopg2/default.nix
index dae97d87ef2..7ce65aea2ca 100644
--- a/pkgs/development/python-modules/psycopg2/default.nix
+++ b/pkgs/development/python-modules/psycopg2/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "psycopg2";
-  version = "2.7.7";
+  version = "2.8.3";
 
   disabled = isPyPy;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f4526d078aedd5187d0508aa5f9a01eae6a48a470ed678406da94b4cd6524b7e";
+    sha256 = "0ms4kx0p5n281l89awccix4d05ybmdngnjjpi9jbzd0rhf1nwyl9";
   };
 
   buildInputs = lib.optional stdenv.isDarwin openssl;
diff --git a/pkgs/development/python-modules/sqlparse/default.nix b/pkgs/development/python-modules/sqlparse/default.nix
index 5858779b86b..e631a5ac5d9 100644
--- a/pkgs/development/python-modules/sqlparse/default.nix
+++ b/pkgs/development/python-modules/sqlparse/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "sqlparse";
-  version = "0.2.4";
+  version = "0.3.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ce028444cfab83be538752a2ffdb56bc417b7784ff35bb9a3062413717807dec";
+    sha256 = "0wxqrm9fpn4phz6rqm7kfd1wwkwzx376gs27nnalwx12q0lwlgbw";
   };
 
   checkInputs = [ pytest ];
diff --git a/pkgs/development/tools/database/pgcli/default.nix b/pkgs/development/tools/database/pgcli/default.nix
index 31ffff3804f..147988b22b3 100644
--- a/pkgs/development/tools/database/pgcli/default.nix
+++ b/pkgs/development/tools/database/pgcli/default.nix
@@ -1,38 +1,29 @@
-{ lib, python3Packages, fetchpatch }:
+{ buildPythonApplication, lib, fetchPypi, isPy3k, fetchpatch
+, cli-helpers, click, configobj, humanize, prompt_toolkit, psycopg2
+, pygments, sqlparse, pgspecial, setproctitle, keyring, pytest, mock
+}:
 
-python3Packages.buildPythonApplication rec {
+buildPythonApplication rec {
   pname = "pgcli";
-  version = "2.0.2";
+  version = "2.1.1";
 
-  # Python 2 won't have prompt_toolkit 2.x.x
-  # See: https://github.com/NixOS/nixpkgs/blob/f49e2ad3657dede09dc998a4a98fd5033fb52243/pkgs/top-level/python-packages.nix#L3408
-  disabled = python3Packages.isPy27;
+  disabled = !isPy3k;
 
-  src = python3Packages.fetchPypi {
+  src = fetchPypi {
     inherit pname version;
-    sha256 = "1p4j2dbcfxd3kz86qi519jkqjx1mg5wdgn1gxdjx3lk1vpsd7x04";
+    sha256 = "1jmnb8izsdjmq9cgajhfapr31wlhvcml4lakz2mcmjn355x83q44";
   };
 
-  patches = [
-    (fetchpatch {
-      # TODO: Remove with next pgcli release. Fixes TypeError in tests
-      # https://github.com/dbcli/pgcli/pull/1006
-      url = https://github.com/dbcli/pgcli/commit/351135b61ef9ad3184c49a406544708daf589fe3.patch;
-      sha256 = "08131y0lv1v760i0ypcx2hljx066ks93kp96xkv3bycxnavvcl53";
-      excludes = [ "changelog.rst" ];
-    })
-  ];
-
-  propagatedBuildInputs = with python3Packages; [
+  propagatedBuildInputs = [
     cli-helpers click configobj humanize prompt_toolkit psycopg2
     pygments sqlparse pgspecial setproctitle keyring
   ];
 
-  checkInputs = with python3Packages; [ pytest mock ];
+  checkInputs = [ pytest mock ];
 
-  checkPhase = ''
-    pytest
-  '';
+  # One test fails: https://github.com/dbcli/pgcli/issues/1104
+  doCheck = false;
+  checkPhase = "pytest";
 
   meta = with lib; {
     description = "Command-line interface for PostgreSQL";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a20fed53291..59cbb9d5300 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9952,7 +9952,7 @@ in
 
   peg = callPackage ../development/tools/parsing/peg { };
 
-  pgcli = callPackage ../development/tools/database/pgcli {};
+  pgcli = pkgs.python3Packages.pgcli;
 
   phantomjs = callPackage ../development/tools/phantomjs { };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bb6cd3aaf7c..d736064bda9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4204,6 +4204,8 @@ in {
 
   periodictable = callPackage ../development/python-modules/periodictable { };
 
+  pgcli = callPackage ../development/tools/database/pgcli {};
+
   pg8000 = callPackage ../development/python-modules/pg8000 { };
   pg8000_1_12 = callPackage ../development/python-modules/pg8000/1_12.nix { };
 
-- 
GitLab


From b8193bd0b02675d9aa3da48e7f4ac536b145e2ee Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 5 Oct 2019 22:57:11 +0200
Subject: [PATCH 2029/2254] lispPackages.cl-mysql: fix build

For [ZHF](https://github.com/NixOS/nixpkgs/issues/68361)
---
 .../lisp-modules/quicklisp-to-nix-overrides.nix          | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
index 2d643384ad1..5cdeef36840 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
@@ -90,7 +90,14 @@ $out/lib/common-lisp/query-fs"
     };
   };
   cffi = addNativeLibs [pkgs.libffi];
-  cl-mysql = addNativeLibs [pkgs.libmysqlclient];
+  cl-mysql = x: {
+    propagatedBuildInputs = [pkgs.libmysqlclient];
+    overrides = y: (x.overrides y) // {
+      prePatch = ((x.overrides y).prePatch or "") + ''
+        sed -i 's,libmysqlclient_r,${pkgs.libmysqlclient}/lib/mysql/libmysqlclient_r,' system.lisp
+      '';
+    };
+  };
   cl-ppcre-template = x: {
     overrides = y: (x.overrides y) // {
       postPatch = ''
-- 
GitLab


From a1febca9fc94fbcf79f79360e1c3e4838a4adc6a Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 5 Oct 2019 18:54:10 +0200
Subject: [PATCH 2030/2254] lkl: 2019-06-20 -> 2019-10-04

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

diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix
index 318929eb225..cd6600387cd 100644
--- a/pkgs/applications/virtualization/lkl/default.nix
+++ b/pkgs/applications/virtualization/lkl/default.nix
@@ -3,8 +3,8 @@
 
 stdenv.mkDerivation rec {
   pname = "lkl";
-  version = "2019-06-20";
-  rev  = "0a4ebeadad12b94db665b8daf30e44e949a02d90";
+  version = "2019-10-04";
+  rev  = "06ca3ddb74dc5b84fa54fa1746737f2df502e047";
 
   outputs = [ "dev" "lib" "out" ];
 
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     inherit rev;
     owner  = "lkl";
     repo   = "linux";
-    sha256 = "09y9ci3j0lp3z74h577ng2s9a4n4glqpqndyc9iy6wdqaj764gm6";
+    sha256 = "0qjp0r338bwgrqdsvy5mkdh7ryas23m47yvxfwdknfyl0k3ylq62";
   };
 
   # Fix a /usr/bin/env reference in here that breaks sandboxed builds
-- 
GitLab


From ee06d27cf23aa59fec01d47e3cfea12ae3c9f7c7 Mon Sep 17 00:00:00 2001
From: Christine Koppelt <cko@users.noreply.github.com>
Date: Sun, 6 Oct 2019 06:59:27 +0200
Subject: [PATCH 2031/2254] treewide: add some missing meta: descriptions and
 homepages (#70497)

---
 pkgs/applications/version-management/gitlab/gitaly/default.nix | 3 ++-
 pkgs/tools/misc/getopt/default.nix                             | 2 ++
 pkgs/tools/networking/eggdrop/default.nix                      | 2 ++
 pkgs/tools/networking/weighttp/default.nix                     | 2 ++
 pkgs/tools/system/which/default.nix                            | 1 +
 5 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix
index 873d9f39090..66ad6b627e0 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix
@@ -53,7 +53,8 @@ in buildGoPackage rec {
   outputs = [ "bin" "out" "ruby" ];
 
   meta = with stdenv.lib; {
-    homepage = http://www.gitlab.com/;
+    homepage = https://gitlab.com/gitlab-org/gitaly;
+    description = "A Git RPC service for handling all the git calls made by GitLab";
     platforms = platforms.unix;
     maintainers = with maintainers; [ roblabla globin fpletz ];
     license = licenses.mit;
diff --git a/pkgs/tools/misc/getopt/default.nix b/pkgs/tools/misc/getopt/default.nix
index 62414a60475..d168c8aaa14 100644
--- a/pkgs/tools/misc/getopt/default.nix
+++ b/pkgs/tools/misc/getopt/default.nix
@@ -17,5 +17,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     platforms = stdenv.lib.platforms.unix;
+    homepage = http://frodo.looijaard.name/project/getopt;
+    description = "Parses command-line arguments from shell scripts";
   };
 }
diff --git a/pkgs/tools/networking/eggdrop/default.nix b/pkgs/tools/networking/eggdrop/default.nix
index c490464c31a..5b85a680efd 100644
--- a/pkgs/tools/networking/eggdrop/default.nix
+++ b/pkgs/tools/networking/eggdrop/default.nix
@@ -32,5 +32,7 @@ stdenv.mkDerivation {
   meta = with stdenv.lib; {
     license = licenses.gpl2;
     platforms = platforms.unix;
+    homepage = http://www.eggheads.org;
+    description = "An Internet Relay Chat (IRC) bot";
   };
 }
diff --git a/pkgs/tools/networking/weighttp/default.nix b/pkgs/tools/networking/weighttp/default.nix
index 5615c249de9..8ba47534cfb 100644
--- a/pkgs/tools/networking/weighttp/default.nix
+++ b/pkgs/tools/networking/weighttp/default.nix
@@ -14,5 +14,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     platforms = stdenv.lib.platforms.unix;
+    homepage = https://redmine.lighttpd.net/projects/weighttp/wiki;
+    description = "A lightweight and simple webserver benchmarking tool";
   };
 }
diff --git a/pkgs/tools/system/which/default.nix b/pkgs/tools/system/which/default.nix
index be2892e52e8..12aac2508cb 100644
--- a/pkgs/tools/system/which/default.nix
+++ b/pkgs/tools/system/which/default.nix
@@ -10,6 +10,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = https://www.gnu.org/software/which/;
+    description = "Shows the full path of (shell) commands";
     platforms = platforms.all;
     license = licenses.gpl3;
   };
-- 
GitLab


From a43660271b658ad067906c10f01473cf88871c2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Sun, 6 Oct 2019 07:08:11 +0200
Subject: [PATCH 2032/2254] gnome3.gnome-session: always run
 /etc/set-environment on startup

gnomes-session sources its environment from a login shell. But if the systemd
user environment already contains `__NIXOS_SET_ENVIRONMENT_DONE` the environment
setup won't happen correctly. Simply unset this variable to ensure a fresh
environment.

This was previously handled by a GDM patch, but it no longer works reliably with
gnome-sessions systemd session.

We still need the GDM patch to handle running other sessions (eg. plasma).

See https://github.com/NixOS/nixpkgs/issues/48255 for more info on the
underlying issue.
---
 pkgs/desktops/gnome-3/core/gnome-session/fix-paths.patch | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-session/fix-paths.patch b/pkgs/desktops/gnome-3/core/gnome-session/fix-paths.patch
index fe4feaf7085..2399c656016 100644
--- a/pkgs/desktops/gnome-3/core/gnome-session/fix-paths.patch
+++ b/pkgs/desktops/gnome-3/core/gnome-session/fix-paths.patch
@@ -1,6 +1,6 @@
 --- a/gnome-session/gnome-session.in
 +++ b/gnome-session/gnome-session.in
-@@ -3,11 +3,11 @@
+@@ -3,11 +3,13 @@
  if [ "x$XDG_SESSION_TYPE" = "xwayland" ] &&
     [ "x$XDG_SESSION_CLASS" != "xgreeter" ] &&
     [  -n "$SHELL" ] &&
@@ -12,6 +12,8 @@
 +   ! (echo "$SHELL" | @grep@ -q "nologin"); then
    if [ "$1" != '-l' ]; then
 -    exec bash -c "exec -l '$SHELL' -c '$0 -l $*'"
++    # Make sure the shell actually sets up the environment
++    unset __NIXOS_SET_ENVIRONMENT_DONE
 +    exec @bash@ -c "exec -l '$SHELL' -c '$0 -l $*'"
    else
      shift
-- 
GitLab


From 8acf4cd06cd5ac5f6a57e115af6e5a484d979f89 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 28 Sep 2019 18:39:31 +0000
Subject: [PATCH 2033/2254] =?UTF-8?q?ocamlPackages.pgocaml:=203.2=20?=
 =?UTF-8?q?=E2=86=92=204.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Ensures compatibility with OCaml 4.08
---
 .../ocaml-modules/pgocaml/default.nix         | 27 +++++++------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/ocaml-modules/pgocaml/default.nix b/pkgs/development/ocaml-modules/pgocaml/default.nix
index cf3cd3272a8..8896675f63c 100644
--- a/pkgs/development/ocaml-modules/pgocaml/default.nix
+++ b/pkgs/development/ocaml-modules/pgocaml/default.nix
@@ -1,34 +1,27 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, camlp4
-, ppx_tools_versioned, result, rresult
+{ lib, fetchFromGitHub, buildDunePackage
 , calendar, csv, hex, re
 }:
 
-if !stdenv.lib.versionAtLeast ocaml.version "4.05"
-then throw "pgocaml is not available for OCaml ${ocaml.version}"
-else
-
-stdenv.mkDerivation rec {
-  name = "ocaml${ocaml.version}-pgocaml-${version}";
-  version = "3.2";
+buildDunePackage rec {
+  pname = "pgocaml";
+  version = "4.0";
   src = fetchFromGitHub {
     owner = "darioteixeira";
     repo = "pgocaml";
     rev = "v${version}";
-    sha256 = "0jxzr5niv8kdh90pr57b1qb500zkkasxb8b8l7w9cydcfprnlk24";
+    sha256 = "1s8c5prr7jb9k76bz990m836czm6k8rv5bvp6s2zg9ra0w19w90j";
   };
 
-  buildInputs = [ ocaml findlib ocamlbuild camlp4 ppx_tools_versioned result rresult ];
-  propagatedBuildInputs = [ calendar csv hex re ];
+  minimumOCamlVersion = "4.05";
 
-  configureFlags = [ "--enable-p4" "--enable-ppx" ];
+  preConfigure = "patchShebangs src/genconfig.sh";
 
-  createFindlibDestdir = true;
+  propagatedBuildInputs = [ calendar csv hex re ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An interface to PostgreSQL databases for OCaml applications";
-    homepage = http://pgocaml.forge.ocamlcore.org/;
+    inherit (src.meta) homepage;
     license = licenses.lgpl2;
     maintainers = with maintainers; [ vbgl ];
-    inherit (ocaml.meta) platforms;
   };
 }
-- 
GitLab


From 923c449e9bf554f0bd0aa2df4d1f857e144eeaf3 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 6 Oct 2019 08:06:25 +0200
Subject: [PATCH 2034/2254] nixos/blcr: remove

---
 nixos/modules/module-list.nix   |  1 -
 nixos/modules/programs/blcr.nix | 27 ---------------------------
 nixos/modules/rename.nix        |  3 +++
 3 files changed, 3 insertions(+), 28 deletions(-)
 delete mode 100644 nixos/modules/programs/blcr.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 775cc05aa0a..862e62a4e25 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -98,7 +98,6 @@
   ./programs/autojump.nix
   ./programs/bash/bash.nix
   ./programs/bcc.nix
-  ./programs/blcr.nix
   ./programs/browserpass.nix
   ./programs/captive-browser.nix
   ./programs/ccache.nix
diff --git a/nixos/modules/programs/blcr.nix b/nixos/modules/programs/blcr.nix
deleted file mode 100644
index 804e1d01f12..00000000000
--- a/nixos/modules/programs/blcr.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ config, lib, ... }:
-
-let
-  inherit (lib) mkOption mkIf;
-  cfg = config.environment.blcr;
-  blcrPkg = config.boot.kernelPackages.blcr;
-in
-
-{
-  ###### interface
-
-  options = {
-    environment.blcr.enable = mkOption {
-      default = false;
-      description =
-        "Whether to enable support for the BLCR checkpointing tool.";
-    };
-  };
-
-  ###### implementation
-
-  config = mkIf cfg.enable {
-    boot.kernelModules = [ "blcr" "blcr_imports" ];
-    boot.extraModulePackages = [ blcrPkg ];
-    environment.systemPackages = [ blcrPkg ];
-  };
-}
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 802ffcdc94e..564c53465e3 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -275,6 +275,9 @@ with lib;
     (mkRenamedOptionModule [ "networking" "extraResolvconfConf" ] [ "networking" "resolvconf" "extraConfig" ])
     (mkRenamedOptionModule [ "networking" "resolvconfOptions" ] [ "networking" "resolvconf" "extraOptions" ])
 
+    # BLCR
+    (mkRemovedOptionModule [ "environment.blcr.enable" ] "The BLCR module has been removed")
+
     # Redis
     (mkRemovedOptionModule [ "services" "redis" "user" ] "The redis module now is hardcoded to the redis user.")
     (mkRemovedOptionModule [ "services" "redis" "dbpath" ] "The redis module now uses /var/lib/redis as data directory.")
-- 
GitLab


From 83ffa1457bb45bcc1f5edeb891fa0f9a26ce42d0 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 5 Oct 2019 19:12:24 +0200
Subject: [PATCH 2035/2254] linuxPackages.blcr: remove

blcr is only supported for pre v4 kernels.
---
 pkgs/os-specific/linux/blcr/default.nix | 43 -------------------------
 pkgs/top-level/all-packages.nix         |  2 --
 2 files changed, 45 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/blcr/default.nix

diff --git a/pkgs/os-specific/linux/blcr/default.nix b/pkgs/os-specific/linux/blcr/default.nix
deleted file mode 100644
index e018f4622b4..00000000000
--- a/pkgs/os-specific/linux/blcr/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ stdenv, fetchurl, kernel, perl, makeWrapper }:
-
-# BLCR version 0.8.6 should works with linux kernel up to version 3.17.x
-
-assert stdenv.lib.versionOlder "3.18" kernel.version;
-
-stdenv.mkDerivation {
-  name = "blcr_${kernel.version}-0.8.6pre4";
-
-  src = fetchurl {
-    url = https://upc-bugs.lbl.gov/blcr-dist/blcr-0.8.6_b4.tar.gz;
-    sha256 = "1a3gdhdnmk592jc652szxgfz8rjd8dax5jwxfsypiqx5lgkj3m21";
-  };
-
-  buildInputs = [ perl makeWrapper ];
-
-  hardeningDisable = [ "pic" ];
-
-  preConfigure = ''
-    configureFlagsArray=(
-      --with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build
-      --with-kmod-dir=$out/lib/modules/${kernel.modDirVersion}
-      --with-system-map=${kernel}/System.map
-    )
-  '';
-
-  postInstall = ''
-    for prog in "$out/bin/"*
-    do
-      wrapProgram "$prog" --prefix LD_LIBRARY_PATH ":" "$out/lib"
-    done
-  '';
-
-  meta = {
-    description = "Berkeley Lab Checkpoint/Restart for Linux (BLCR)";
-    homepage = https://ftg.lbl.gov/projects/CheckpointRestart/;
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [
-      z77z
-    ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cd3bc17f4f0..4a4a34190d6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15816,8 +15816,6 @@ in
 
     ati_drivers_x11 = callPackage ../os-specific/linux/ati-drivers { };
 
-    blcr = if stdenv.lib.versionOlder "3.18" kernel.version then callPackage ../os-specific/linux/blcr { } else null;
-
     chipsec = callPackage ../tools/security/chipsec {
       inherit kernel;
       withDriver = true;
-- 
GitLab


From b0bf7bd589be831b44962b4225ba61b5a3a3f9da Mon Sep 17 00:00:00 2001
From: Vladyslav M <dywedir@gra.red>
Date: Fri, 4 Oct 2019 23:05:23 +0300
Subject: [PATCH 2036/2254] oil: 0.7.pre3 -> 0.7.pre5

---
 pkgs/shells/oil/default.nix | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix
index 9f1bf3ce6af..4796cc27391 100644
--- a/pkgs/shells/oil/default.nix
+++ b/pkgs/shells/oil/default.nix
@@ -1,14 +1,23 @@
-{ stdenv, lib, fetchurl }:
+{ stdenv, lib, fetchurl, fetchpatch }:
 
 stdenv.mkDerivation rec {
   pname = "oil";
-  version = "0.7.pre3";
+  version = "0.7.pre5";
 
   src = fetchurl {
     url = "https://www.oilshell.org/download/oil-${version}.tar.xz";
-    sha256 = "01zc36zaasaagr54rnh90k0j7pbnj0cc6a9pvz6gs6pk91i80lqg";
+    sha256 = "1vpk4my8lp7wik8ywspawimya2a7hb1qjkp5vpm7ypmkya5jqivc";
   };
 
+
+  # TODO remove at next bump
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/oilshell/oil/commit/81551d76ae5a8b53179f2472492d0b44f13f84fd.patch";
+      sha256 = "0v99cx13ajqmf489vvxkqhqi9pjyc8jn0dgc8wp78gsv9js2k7km";
+    })
+  ];
+
   postPatch = ''
     patchShebangs build
   '';
-- 
GitLab


From fc64448320a3613f8b6f20607ee62037ebb0b404 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@gmail.com>
Date: Sun, 6 Oct 2019 11:02:34 +0300
Subject: [PATCH 2037/2254] gpxsee: 7.14 -> 7.15

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

diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix
index 4a7cafb0b15..ef84b8a4e6d 100644
--- a/pkgs/applications/misc/gpxsee/default.nix
+++ b/pkgs/applications/misc/gpxsee/default.nix
@@ -2,13 +2,13 @@
 
 mkDerivation rec {
   pname = "gpxsee";
-  version = "7.14";
+  version = "7.15";
 
   src = fetchFromGitHub {
     owner = "tumic0";
     repo = "GPXSee";
     rev = version;
-    sha256 = "13lxjbc54mw2d5jn0q61wjzm0hk2f6vmbvw11n7z8p62n8q30nvb";
+    sha256 = "036g17479nqy3kvy3dy3cn7yi7r57rsp28gkcay0qhf9h0az76p3";
   };
 
   nativeBuildInputs = [ qmake ];
-- 
GitLab


From a4ae914695faa5f23c2b4db848540b4728460207 Mon Sep 17 00:00:00 2001
From: Daniel Albert <esclear@users.noreply.github.com>
Date: Fri, 4 Oct 2019 22:15:10 +0200
Subject: [PATCH 2038/2254] fileshare: init at 0.2.4

Fileshare is a simple tool for sharing the contents of a directory via a
webserver and optionally allowing uploads.
---
 pkgs/servers/fileshare/default.nix | 35 ++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix    |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/servers/fileshare/default.nix

diff --git a/pkgs/servers/fileshare/default.nix b/pkgs/servers/fileshare/default.nix
new file mode 100644
index 00000000000..357237e1e29
--- /dev/null
+++ b/pkgs/servers/fileshare/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, lib, fetchgit, pkgconfig, git, libmicrohttpd }:
+
+stdenv.mkDerivation rec {
+  pname = "fileshare";
+  version = "0.2.4";
+
+  src = fetchgit {
+    url = https://git.tkolb.de/Public/fileshare.git;
+    rev = "v${version}";
+    sha256 = "03jrhk4vj6bc2w3lsrfjpfflb4laihysgs5i4cv097nr5cz32hyk";
+  };
+
+  postPatch = ''
+    sed -i 's,$(shell git rev-parse --short HEAD),/${version},g' Makefile
+  '';
+
+  nativeBuildInputs = [ pkgconfig git ];
+  buildInputs = [ libmicrohttpd ];
+
+  makeFlags = "BUILD=release";
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp bin/release/fileshare $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A small HTTP Server for quickly sharing files over the network";
+    longDescription = "Fileshare is a simple tool for sharing the contents of a directory via a webserver and optionally allowing uploads.";
+    homepage = https://git.tkolb.de/Public/fileshare;
+    license = licenses.mit;
+    maintainers = [ maintainers.esclear ];
+    platforms = platforms.linux;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c849a7e88c4..bd7c138f2f1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1629,6 +1629,8 @@ in
     bison = bison2;
   };
 
+  fileshare = callPackage ../servers/fileshare {};
+
   fileshelter = callPackage ../servers/web-apps/fileshelter { };
 
   firecracker = callPackage ../applications/virtualization/firecracker { };
-- 
GitLab


From 13886ac10eb5de4c844f222bf835edf6f4fb1cb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sun, 6 Oct 2019 10:48:55 +0200
Subject: [PATCH 2039/2254] bird, bird6: 1.6.6 -> 1.6.8 (security)

I haven't tested running them, but the bumps are almost exclusively
bugfixes, in particular CVE-2019-16159.
---
 pkgs/servers/bird/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix
index fbd08c45c3a..13b5a19a751 100644
--- a/pkgs/servers/bird/default.nix
+++ b/pkgs/servers/bird/default.nix
@@ -47,13 +47,13 @@ in
 
 {
   bird = generic {
-    version = "1.6.6";
-    sha256 = "0w1dmwx89g3qdy92wkjl3p52rn521izm2m8yq74hs7myxxx3nnwp";
+    version = "1.6.8";
+    sha256 = "1ch0pkkhd7axdjlvhprynh9q08x0nm984nvkm1cjb7gm5rfsnqbc";
   };
 
   bird6 = generic {
-    version = "1.6.6";
-    sha256 = "0w1dmwx89g3qdy92wkjl3p52rn521izm2m8yq74hs7myxxx3nnwp";
+    version = "1.6.8";
+    sha256 = "1ch0pkkhd7axdjlvhprynh9q08x0nm984nvkm1cjb7gm5rfsnqbc";
     enableIPv6 = true;
   };
 
-- 
GitLab


From 72f9ec92255fec772864eaacbab3dc64931928f2 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 4 Oct 2019 15:55:39 +0300
Subject: [PATCH 2040/2254] syncthingtray: 0.10.0 -> 0.10.1

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

diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix
index 70aa684da04..79dfc7344da 100644
--- a/pkgs/applications/misc/syncthingtray/default.nix
+++ b/pkgs/applications/misc/syncthingtray/default.nix
@@ -20,14 +20,14 @@
 }:
 
 mkDerivation rec {
-  version = "0.10.0";
+  version = "0.10.1";
   pname = "syncthingtray";
 
   src = fetchFromGitHub {
     owner = "Martchus";
     repo = "syncthingtray";
     rev = "v${version}";
-    sha256 = "18h6z6baaiyr0wr7kyz6ysg45zb12550m63j3vqiap4hfrrwhly5";
+    sha256 = "107w6dlr1m5g60j342p2b6ipfn1r8kyad8av58nh8ibzycghbfv2";
   };
 
   buildInputs = [ qtbase cpp-utilities qtutilities ]
-- 
GitLab


From 0002a7d9ee08b26c0f6ff267d8f024cc4aee9a5c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 6 Oct 2019 11:15:08 +0200
Subject: [PATCH 2041/2254] haskell-regex-pcre-builtin: fix build with ghc
 8.8.1

---
 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index bdb90250d83..cc047e0abc1 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -157,6 +157,7 @@ self: super: {
   lens = self.lens_4_18_1;
   memory = self.memory_0_15_0;
   microlens = self.microlens_0_4_11_2;
+  regex-pcre-builtin = self.regex-pcre-builtin_0_95_0_8_8_35;
   shelly = self.shelly_1_9_0;
   string-qq = self.string-qq_0_0_4;
   tls = self.tls_1_5_1;
-- 
GitLab


From 7f1d646b80469fd19dadca622d8dba75252e4e16 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 6 Oct 2019 04:20:00 -0500
Subject: [PATCH 2042/2254] gitAndTools.hub: 2.12.7 -> 2.12.8

Changelog: https://github.com/github/hub/releases/tag/v2.12.8
---
 .../version-management/git-and-tools/hub/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix
index c3d0ddfe4e3..e40bfc9961b 100644
--- a/pkgs/applications/version-management/git-and-tools/hub/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "hub";
-  version = "2.12.7";
+  version = "2.12.8";
 
   goPackagePath = "github.com/github/hub";
 
@@ -13,7 +13,7 @@ buildGoPackage rec {
     owner = "github";
     repo = pname;
     rev = "v${version}";
-    sha256 = "028hc2cgjgqmi9kvxhck4nvq02p095bp1d8qxc6q38aynwfmmhk5";
+    sha256 = "0a2dpg0w29nblk1dba9a35bpwwyf0zbqcgrwn4a8diyx27b77x3x";
   };
 
   nativeBuildInputs = [ groff utillinux ];
-- 
GitLab


From c133c29fb5e05e56c345b19a6c4ad1c5062cd62a Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 6 Oct 2019 04:20:00 -0500
Subject: [PATCH 2043/2254] ibm-plex: 2.0.0 -> 3.0.0

Changelog: https://github.com/IBM/plex/releases/tag/v3.0.0
---
 pkgs/data/fonts/ibm-plex/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/ibm-plex/default.nix b/pkgs/data/fonts/ibm-plex/default.nix
index 7401c569462..d4a673533af 100644
--- a/pkgs/data/fonts/ibm-plex/default.nix
+++ b/pkgs/data/fonts/ibm-plex/default.nix
@@ -1,7 +1,7 @@
 { lib, fetchzip }:
 
 let
-  version = "2.0.0";
+  version = "3.0.0";
 in fetchzip {
   name = "ibm-plex-${version}";
   url = "https://github.com/IBM/plex/releases/download/v${version}/OpenType.zip";
@@ -9,7 +9,7 @@ in fetchzip {
     mkdir -p $out/share/fonts
     unzip -j $downloadedFile "OpenType/*/*.otf" -d $out/share/fonts/opentype
   '';
-  sha256 = "0m4paww4349d37s7j20a00hp514p1jq54xrnz45wyrafb8pkah4g";
+  sha256 = "1vv0lf2fn0y0ln14s4my8x2mykq1lwqpmkjkhs6cm48mzf740nhs";
 
   meta = with lib; {
     description = "IBM Plex Typeface";
-- 
GitLab


From 71bc760da87fb54cf05677bfb609d5af48385ac4 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 6 Oct 2019 04:20:00 -0500
Subject: [PATCH 2044/2254] cascadia-code: 1909.16 -> 1910.04

---
 pkgs/data/fonts/cascadia-code/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/cascadia-code/default.nix b/pkgs/data/fonts/cascadia-code/default.nix
index ddb214c49e1..d2d2ad34256 100644
--- a/pkgs/data/fonts/cascadia-code/default.nix
+++ b/pkgs/data/fonts/cascadia-code/default.nix
@@ -2,7 +2,7 @@
 
 let
   pname = "cascadia-code";
-  version = "1909.16";
+  version = "1910.04";
 in
 fetchurl {
   name = "${pname}-${version}";
@@ -15,7 +15,7 @@ fetchurl {
     install -Dm444 $downloadedFile $out/share/fonts/truetype/Cascadia.ttf
   '';
 
-  sha256 = "0nckczvak3pd1h3fiz0j827pm87px9swx60q07lc2jnjlxcghgl2";
+  sha256 = "124zbv7xwirwwxrm988h3plwd2vynqxyx7p2gijqrnw69q9pf67q";
 
   meta = with lib; {
     description = "Monospaced font that includes programming ligatures and is designed to enhance the modern look and feel of the Windows Terminal";
-- 
GitLab


From 1134fb45c098d0d50d694e506c9d48981ec4f97c Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Sun, 6 Oct 2019 15:33:03 +0300
Subject: [PATCH 2045/2254] unit: 1.11.0 -> 1.12.0

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

diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix
index 88a26a22917..f05d9c1ce8f 100644
--- a/pkgs/servers/http/unit/default.nix
+++ b/pkgs/servers/http/unit/default.nix
@@ -14,14 +14,14 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "1.11.0";
+  version = "1.12.0";
   pname = "unit";
 
   src = fetchFromGitHub {
     owner = "nginx";
     repo = "unit";
     rev = version;
-    sha256 = "05qplbwki8kcj0xy9d39gf8lhwwg2cx24waxd1q5cb0fq9a5hprm";
+    sha256 = "1ylzfsajjfaxzn7mycjs69ms4x58r4szpk07kqrmbf03dp2cmxkq";
   };
 
   nativeBuildInputs = [ which ];
-- 
GitLab


From 24f0ef530eb2fecb193f5bafa990f802136429d7 Mon Sep 17 00:00:00 2001
From: Alex Branham <alex.branham@gmail.com>
Date: Sat, 5 Oct 2019 08:38:14 -0400
Subject: [PATCH 2046/2254] R: Update CRAN and bioconductor packages

---
 pkgs/development/r-modules/cran-packages.nix | 2773 ++++++++++--------
 pkgs/development/r-modules/default.nix       |    2 -
 2 files changed, 1538 insertions(+), 1237 deletions(-)

diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix
index ed205130cae..1a00fcd4084 100644
--- a/pkgs/development/r-modules/cran-packages.nix
+++ b/pkgs/development/r-modules/cran-packages.nix
@@ -4,9 +4,10 @@
 # Rscript generate-r-packages.R cran >new && mv new cran-packages.nix
 
 { self, derive }:
-let derive2 = derive { snapshot = "2019-08-05"; };
+let derive2 = derive { snapshot = "2019-10-04"; };
 in with self; {
   A3 = derive2 { name="A3"; version="1.0.0"; sha256="017hq9pjsv1h9i7cqk5cfx27as54shlhdsdvr6jkhb8jfkpdb6cw"; depends=[pbapply xtable]; };
+  ABACUS = derive2 { name="ABACUS"; version="1.0.0"; sha256="0m1dnkwjr1522l9ddbzzx7ayxvli17sbmk6s28adpmzzjwh2kd1i"; depends=[ggplot2 shiny]; };
   ABC_RAP = derive2 { name="ABC.RAP"; version="0.9.0"; sha256="1kdspln17v0krvahcd55vib4dv5azp60b3r1zf489x10qqbp1mxk"; depends=[]; };
   ABCanalysis = derive2 { name="ABCanalysis"; version="1.2.1"; sha256="0wac1ksmnxa36v99ca4hv8k0rsh3igwpcllmlv9wf7i9kgqviqwi"; depends=[plotrix]; };
   ABCoptim = derive2 { name="ABCoptim"; version="0.15.0"; sha256="1ih0xk88qhsmpvnxf56041wx5sk8as2f4f2gdnpnwdym9mbr9n4b"; depends=[Rcpp]; };
@@ -23,7 +24,7 @@ in with self; {
   ACSNMineR = derive2 { name="ACSNMineR"; version="0.16.8.25"; sha256="0gh604s8qall6zfjlwcg2ilxjvz08dplf9k5g47idhv43scm748l"; depends=[ggplot2 gridExtra scales]; };
   ACSWR = derive2 { name="ACSWR"; version="1.0"; sha256="195vjrkang5cl7gwsna0aq4p0h4jym9xg9yh94bnf8vq6wf8j83n"; depends=[MASS]; };
   ACTCD = derive2 { name="ACTCD"; version="1.2-0"; sha256="0mzjxxr2zfdidw8ibh6w8mvpkw3q3nvngqi05g9ind26ckvk053p"; depends=[GDINA R_methodsS3]; };
-  ADAPTS = derive2 { name="ADAPTS"; version="0.9.20"; sha256="1ik9bc8adpz5gphg36grx2hvq76gf1x3yblxp4dj7vhcqva11kzl"; depends=[ComICS DeconRNASeq doParallel e1071 foreach missForest nnls pcaMethods pheatmap preprocessCore quantmod WGCNA]; };
+  ADAPTS = derive2 { name="ADAPTS"; version="0.9.21"; sha256="18cx58rfc2s7lcrc7nhq24564av3wgrsjhc6k62yr7f36474cq1b"; depends=[ComICS DeconRNASeq doParallel e1071 foreach missForest nnls pcaMethods pheatmap preprocessCore quantmod WGCNA]; };
   ADCT = derive2 { name="ADCT"; version="0.1.0"; sha256="1glf83ydx4v3ld8c4gb9h3jk6srd054bis5l8k57p1ba4fnqnnpp"; depends=[mvtnorm]; };
   ADDT = derive2 { name="ADDT"; version="2.0"; sha256="044bb1jw2m8vwk5q8l7rlz4kqphjvy8i9d59rjg0k5q5l9vczfrp"; depends=[coneproj Matrix nlme]; };
   ADGofTest = derive2 { name="ADGofTest"; version="0.3"; sha256="0ik817qzqp6kfbckjp1z7srlma0w6z2zcwykh0jdiv7nahwk3ncw"; depends=[]; };
@@ -40,7 +41,7 @@ in with self; {
   AGD = derive2 { name="AGD"; version="0.39"; sha256="0hmq684snnffc2v7vmns4ky200a6zh1ggiap03n5cvpb3nlqc6lr"; depends=[gamlss gamlss_dist]; };
   AGHmatrix = derive2 { name="AGHmatrix"; version="1.0.2"; sha256="0qipqk8p80463hfkbjnkw8ivziqj2xb15l54x52kcgbd9hl4zami"; depends=[Matrix zoo]; };
   AGSDest = derive2 { name="AGSDest"; version="2.3.2"; sha256="0f3qchvdi2n1cr8ipjj332dw8hdza58dvfk21p0c6bhmxzg7f71i"; depends=[ldbounds]; };
-  AGread = derive2 { name="AGread"; version="0.2.2"; sha256="08d705fh11ksxijqjlc3ny7rclq7hw12f161h277fjdx71wgn8hp"; depends=[anytime binaryLogic data_table DescTools dplyr GGIR lubridate magrittr rlang seewave stringr]; };
+  AGread = derive2 { name="AGread"; version="1.0.0"; sha256="0z0c43m7sgw9qfwmr9jv6ppx2zvrm3mpb5gljg5bvv5gd3cfxbpy"; depends=[anytime binaryLogic data_table DescTools dplyr GGIR lubridate magrittr PAutilities Rcpp rlang seewave stringr]; };
   AHM = derive2 { name="AHM"; version="1.0.1"; sha256="00r1rn7d64a18rckbxvla5yapqv00p9ajxv72fx7s6p80kfal89w"; depends=[devtools dplyr glmnet Matrix mixexp plgp quadprog tibble tidyr]; };
   AHMbook = derive2 { name="AHMbook"; version="0.1.4"; sha256="1cxyk420pzhh1scagxjmpm328xrcc1mpdrrch92yfgbgx09zkr4c"; depends=[coda plotrix RandomFields raster sp unmarked]; };
   AHR = derive2 { name="AHR"; version="1.5.0"; sha256="0sscw80cz4r1xmdymp9knz0dfans7yzwjwklv7ahafxlflw5527h"; depends=[etm MASS Rcpp RcppArmadillo survival]; };
@@ -63,7 +64,7 @@ in with self; {
   AMModels = derive2 { name="AMModels"; version="0.1.4"; sha256="18h075bzk8s75b3zmjd0x8c6dpl40445d4kv8n0p4ldnx80b1aha"; depends=[unmarked]; };
   AMOEBA = derive2 { name="AMOEBA"; version="1.1"; sha256="1npzh3rpfnxd4r1pj1hm214sfgbw4wmq4ws093lnl7pvsl0q37xn"; depends=[rlecuyer snowfall spdep]; };
   AMORE = derive2 { name="AMORE"; version="0.2-15"; sha256="00zfqcsah2353mrhqkv8bbh24l8gaxk4y78icr9kxy4pqb2988yz"; depends=[]; };
-  AMPLE = derive2 { name="AMPLE"; version="0.0.1"; sha256="1qgr5672s7w7w34r9392rygnw2mx7fcnkwgk42baf10wl9iflgs2"; depends=[dplyr ggplot2 RColorBrewer shiny shinyjs tidyr]; };
+  AMPLE = derive2 { name="AMPLE"; version="0.0.2"; sha256="0j19f8rl7gkads4n52l5gfc5k7dx27sswzrypwl7dnxhfp4ivql7"; depends=[dplyr ggplot2 shiny shinyjs tidyr wesanderson]; };
   AMR = derive2 { name="AMR"; version="0.7.1"; sha256="1dgdiaa0xfdgdyaps2mx7xb4zis8rf5npa9cr2lz72nlhh3b0h5h"; depends=[backports crayon data_table dplyr ggplot2 hms knitr microbenchmark rlang scales tidyr]; };
   ANN2 = derive2 { name="ANN2"; version="2.3.2"; sha256="0ib6cs2az0hhfg7vj4dk6fxbwjlc305psqjs188fdya2jrxgq1gs"; depends=[ggplot2 Rcpp RcppArmadillo reshape2 testthat viridisLite]; };
   ANOM = derive2 { name="ANOM"; version="0.5"; sha256="14nfy9xplbabfprwxz5fvx26nmqhp657vr6d90dc8vk8ds63ckiz"; depends=[ggplot2 MCPAN multcomp nparcomp SimComp]; };
@@ -72,11 +73,12 @@ in with self; {
   ANOVAreplication = derive2 { name="ANOVAreplication"; version="1.1.4"; sha256="0rq4aphjmqrr4pm55vpc8qr4rghqkmlsqsvxzarx3kmr3aqlmqg8"; depends=[quadprog shiny]; };
   APCanalysis = derive2 { name="APCanalysis"; version="1.0"; sha256="11snn5i8zyjpzf58ica762fpp14v7x5h8a8iwx4s4v81pgvlx862"; depends=[]; };
   APFr = derive2 { name="APFr"; version="1.0.2"; sha256="1vax7rfccds6qz3bi6n1h3nzl9jnxpwk331wmpsbqlk23md3m4g4"; depends=[]; };
+  APIS = derive2 { name="APIS"; version="0.1.0"; sha256="1kpf766b6mvig9gj9zhjgpr2yvbjinjrhzxv1109fv3igabzjxd9"; depends=[doParallel foreach ggplot2 gridExtra]; };
   APML0 = derive2 { name="APML0"; version="0.9"; sha256="1scvcrcsjgdrq9gfv8qxbd703k76cyk01ml93bcr8j8kiwv05z0f"; depends=[Matrix Rcpp RcppEigen]; };
   APPEstimation = derive2 { name="APPEstimation"; version="0.1.1"; sha256="1bg9ma4i3k3xdgyk2h4f368gqnczvlhvjw4114iznmrv1wl4g25c"; depends=[densratio]; };
   APSIM = derive2 { name="APSIM"; version="0.9.3"; sha256="1pqyy170h2s0kv7nf9v6xr8lgp8yh4psnmpi0naghjg7h72bl53k"; depends=[data_table lubridate plyr RSQLite sirad stringr]; };
   APSIMBatch = derive2 { name="APSIMBatch"; version="0.1.0.2374"; sha256="0j44ijq1v1k60lka9nmw8m1jfjw7pidny9bvswqy5v82gzmwl29d"; depends=[]; };
-  APfun = derive2 { name="APfun"; version="0.1.3"; sha256="02p40n4l66r63wq8x7ygchfhxmnpaa7vgy4bjhkqx5gfi2v4psxd"; depends=[maptools raster rgdal sp yesno]; };
+  APfun = derive2 { name="APfun"; version="0.1.4"; sha256="0k4m3zwxcjfb1y4njig6yyjqzsvqi99zmglbfpvp65s829zxd881"; depends=[maptools raster rgdal sp]; };
   APtools = derive2 { name="APtools"; version="6.8.8"; sha256="171aydyd7s8qll7djl4ysy596wxdf5wfwpqwfi14jjglc9r9qrrr"; depends=[cmprsk survival]; };
   AR = derive2 { name="AR"; version="1.1"; sha256="1wn4g2997c4vc3mzq2pv8ld0ryp0i78v4zlqqryvhshxgnz4f2pr"; depends=[DISTRIB]; };
   AR1seg = derive2 { name="AR1seg"; version="1.0"; sha256="0v9adx5wj9r4jwl3bqqmj0byiqfp585jz013qfqrq601wj8v4zi3"; depends=[Segmentor3IsBack]; };
@@ -200,14 +202,15 @@ in with self; {
   AutoStepwiseGLM = derive2 { name="AutoStepwiseGLM"; version="0.2.0"; sha256="0wwi8hg2q1zkf28rq7bj0f9fcxc5hj59hkmk0gl9p8i3rghlyrms"; depends=[caret formula_tools]; };
   Autoplotprotein = derive2 { name="Autoplotprotein"; version="1.1"; sha256="13mxqmhhdiq7mz4m6nx39dsq7x3bm8fsgskswx48vsq6x2k6byxa"; depends=[ade4 plotrix plyr seqinr XML]; };
   AutoregressionMDE = derive2 { name="AutoregressionMDE"; version="1.0"; sha256="1dmg0q4sp2d2anzhw2my8xjhpyjsx0kf7r202q5bkw8yr57jnhvr"; depends=[]; };
-  AzureAuth = derive2 { name="AzureAuth"; version="1.1.1"; sha256="0lamvfgdf1yc8p1v6q83i9j08s4h0657vzma0b0k7999xn60ffry"; depends=[httr jose jsonlite openssl R6 rappdirs]; };
+  AzureAuth = derive2 { name="AzureAuth"; version="1.2.2"; sha256="1fsak6f5gkb6vz5iln0m47ss01zmf7wicqm2v5n453v9895fixws"; depends=[httr jose jsonlite openssl R6 rappdirs]; };
   AzureContainers = derive2 { name="AzureContainers"; version="1.1.0"; sha256="0c6xq47k4mggnc7id4xkzc4cznsg8b0aam6iymk587727a6rw1jw"; depends=[AzureAuth AzureGraph AzureRMR httr openssl R6]; };
-  AzureGraph = derive2 { name="AzureGraph"; version="1.0.3"; sha256="0klfdx89rqx69qkvkyf8xbvy4x2ximlb5yav6l2jmcfaw739vdyh"; depends=[AzureAuth httr jsonlite openssl R6]; };
+  AzureGraph = derive2 { name="AzureGraph"; version="1.0.4"; sha256="1bhqgb3msz0yn3xjs8y6wglcyi5s570w5wzq2x0zmfcfyml3pvsa"; depends=[AzureAuth httr jsonlite openssl R6]; };
   AzureKeyVault = derive2 { name="AzureKeyVault"; version="1.0.1"; sha256="0vchsn7pcsbw6xq1v4qslaysaq1pwirsjmkv2w8skvhbjdxc84km"; depends=[AzureAuth AzureGraph AzureRMR httr jose jsonlite openssl R6]; };
-  AzureKusto = derive2 { name="AzureKusto"; version="1.0.2"; sha256="08vac33zh3nz3iwgp8npvzjzxz6g8n1r8pami35zj5a71g4mrw36"; depends=[AzureAuth AzureRMR DBI dplyr httr jsonlite openssl R6 rlang tibble tidyselect]; };
-  AzureRMR = derive2 { name="AzureRMR"; version="2.1.3"; sha256="0r801kn46s64i9a3gdpaciaai6wsz9sk9r4ira1x8wgm4w7m25q1"; depends=[AzureAuth httr jsonlite R6 uuid]; };
-  AzureStor = derive2 { name="AzureStor"; version="2.1.0"; sha256="098pldcvwh5yqfl9xxmdh9wbpisxbmazi9fppncvisj9i6pw2n8w"; depends=[AzureRMR httr mime openssl R6 xml2]; };
-  AzureVM = derive2 { name="AzureVM"; version="2.0.0"; sha256="195mwr4bf79ryisvi7rv3i70ajvdcdy0l2n5zij6bhxwzbkb63db"; depends=[AzureRMR jsonlite R6]; };
+  AzureKusto = derive2 { name="AzureKusto"; version="1.0.3"; sha256="1givy2f54jv9rfri92c8z3z2rg2vbvf079gmb6f4x4wzm21bgd4j"; depends=[AzureAuth AzureRMR DBI dplyr httr jsonlite openssl R6 rlang tibble tidyselect]; };
+  AzureRMR = derive2 { name="AzureRMR"; version="2.2.0"; sha256="1i22c6wjzjhsj1r9nfpq38hfqaqwhjrikxcs01vlzwx5k8w6say9"; depends=[AzureAuth httr jsonlite R6 uuid]; };
+  AzureStor = derive2 { name="AzureStor"; version="2.1.1"; sha256="1h94fnjw8myhfxd614mgamvkl8w9476da7rczk4ff5x1jq4z4rg0"; depends=[AzureRMR httr mime openssl R6 xml2]; };
+  AzureVM = derive2 { name="AzureVM"; version="2.0.1"; sha256="1da64azk4dmx9bfcxxv34mnsgyxin4c3577zp39f8nfypxk78f9b"; depends=[AzureRMR jsonlite R6]; };
+  AzureVMmetadata = derive2 { name="AzureVMmetadata"; version="1.0.0"; sha256="0k99ncp9zkyxl0r51041rfgq49gb65f5d3yc89d1gg2aqavk3g2y"; depends=[httr openssl]; };
   B2Z = derive2 { name="B2Z"; version="1.4"; sha256="0w7394vs883vb32gs6yhrc1kh5406rs851yb2gs8hqzxad1alvpn"; depends=[coda mvtnorm numDeriv]; };
   BACA = derive2 { name="BACA"; version="1.3"; sha256="1vbip7wbzix1s2izbm4058wmwar7w5rv3q8bmj9pm7hcapfi19k0"; depends=[ggplot2 RDAVIDWebService rJava]; };
   BACCO = derive2 { name="BACCO"; version="2.0-9"; sha256="0i1dnk0g3miyv3b60rzgjjm60180wxzv6v2q477r71q74b0v0r1y"; depends=[approximator calibrator emulator]; };
@@ -219,9 +222,9 @@ in with self; {
   BALLI = derive2 { name="BALLI"; version="0.2.0"; sha256="0qmjwpj56n07dvjwfknqvc02f0y5mlwh2yz4lrw7c4wqgrckcpgi"; depends=[edgeR limma MASS]; };
   BAMBI = derive2 { name="BAMBI"; version="2.1.0"; sha256="029yzjv6zj54g9g0g4c6aj89dilcasnjipsf2d95n1xkzpvssvyp"; depends=[bridgesampling coda future_apply gtools label_switching lattice loo mvtnorm qrng RColorBrewer Rcpp RcppArmadillo rootSolve scales]; };
   BAMMtools = derive2 { name="BAMMtools"; version="2.1.6"; sha256="01mb40w3g0xy93pl9064ky8kd46sa7qlz6by1r6kchcfhajx8plv"; depends=[ape gplots Rcpp]; };
-  BANEScarparkinglite = derive2 { name="BANEScarparkinglite"; version="0.1.2"; sha256="0yxsgk4p7i8arjkchsiml6lx97inpmaihb61787vcl8kxyx7v6wr"; depends=[dplyr httr lubridate RCurl readr rvest XML xml2 zoo]; };
-  BANOVA = derive2 { name="BANOVA"; version="1.1.3"; sha256="11f5s1paskq5z3hwy6gs8irgignjfmjr9qz3kxnir1ahxvrxs7ma"; depends=[coda rjags rstan runjags]; };
-  BART = derive2 { name="BART"; version="2.5"; sha256="0ljlzk114r0r57mc4jy2ivx3fk953v1c70gmcq63z5j2z9dd7cak"; depends=[nlme nnet Rcpp survival]; };
+  BANEScarparkinglite = derive2 { name="BANEScarparkinglite"; version="0.1.3"; sha256="0z2n4ikj9cr2vcafpn0kmn5v24pdy7cd98asdy7njg5l54hajsxc"; depends=[dplyr httr lubridate RCurl readr rvest XML xml2]; };
+  BANOVA = derive2 { name="BANOVA"; version="1.1.4"; sha256="10mapmichzmm99swp0hdbrr147cj9wr6mxpv5vyq5f0zh39mz43p"; depends=[coda rjags rstan runjags]; };
+  BART = derive2 { name="BART"; version="2.6"; sha256="1zghz9jpqcfhax39his97dwylx4l4yzjch49a6ibgkx10llb3dbr"; depends=[nlme nnet Rcpp survival]; };
   BAS = derive2 { name="BAS"; version="1.5.3"; sha256="0xf8wd42mlk6dkkiwzf9lyb5fvqmpjsqyzay146d6p2y1zk65lc0"; depends=[]; };
   BASIX = derive2 { name="BASIX"; version="1.1"; sha256="18dkvv1iwskfnlpl6xridcgqpalbbpm2616mvc3hfrc0b26v01id"; depends=[]; };
   BASS = derive2 { name="BASS"; version="0.2.2"; sha256="1q3sihp2iv1ikggzgd2k3vh2myz8bz31rzlaavw0n84d0h1zjxy2"; depends=[]; };
@@ -242,7 +245,7 @@ in with self; {
   BCC1997 = derive2 { name="BCC1997"; version="0.1.1"; sha256="1lqbivjkc7858jn54av1v9bzp0as43klgndbzkr59dc3l128xp12"; depends=[]; };
   BCDating = derive2 { name="BCDating"; version="0.9.8"; sha256="1px9fimg3fqx8bfkzq6rl34xclc9gcjxqjvj5islpdy4f1ifwph3"; depends=[]; };
   BCE = derive2 { name="BCE"; version="2.1"; sha256="0dqp08pbq7r88yhvlwgzzk9dcdln7awlliy5mfq18j5jhiy7axiz"; depends=[FME limSolve Matrix]; };
-  BCEA = derive2 { name="BCEA"; version="2.2-6"; sha256="1h1hgr0w6sidxfm58x6xz3i66prk5cxw6ldgfznr28pvrbgi5wsi"; depends=[MASS]; };
+  BCEA = derive2 { name="BCEA"; version="2.3-1.1"; sha256="0ppjcbcapmg6j5gdalw1j86w50xwaanvhld9zpzp5fvj8b7f016b"; depends=[dplyr MASS rlang]; };
   BCEE = derive2 { name="BCEE"; version="1.2"; sha256="08jsnsy7l182n0gy2jy0l9a7grr62g57gz3217fzapk2im2q648b"; depends=[BMA leaps Rcpp RcppArmadillo]; };
   BCRA = derive2 { name="BCRA"; version="2.1"; sha256="0n1f2qcwca7lb90qmim5dc3wj3hf5b31nh0xiw64k1cv8lhqc0mz"; depends=[]; };
   BCSub = derive2 { name="BCSub"; version="0.5"; sha256="0c8dlxsx23qfyygmajg2amj78ax01kb3808d9hvy7g3hkgp2i2fp"; depends=[MASS mcclust nFactors Rcpp RcppArmadillo]; };
@@ -252,7 +255,7 @@ in with self; {
   BDEsize = derive2 { name="BDEsize"; version="1.1"; sha256="0bxfl2hgqwxz97qn21j2gm3lc30h64h41ij6w89rdlad4hkz7vxp"; depends=[fpow ggplot2 shiny shinyalert]; };
   BDP2 = derive2 { name="BDP2"; version="0.1.3"; sha256="14m85sigx6hk0qzhfgih43m2lxp9xczmp9g3z4pping6msbnbdrz"; depends=[rmarkdown shiny shinyBS]; };
   BDWreg = derive2 { name="BDWreg"; version="1.2.0"; sha256="07j6dy69q1as1nwgp2790wzpzmjich2256cddhl7n3h2rs1dja74"; depends=[coda doParallel DWreg foreach MASS]; };
-  BDgraph = derive2 { name="BDgraph"; version="2.59"; sha256="018vlfh81a8rahdsgcnh9vlhxp8xcfsa2wg943d19jzfgwg6rk7p"; depends=[igraph]; };
+  BDgraph = derive2 { name="BDgraph"; version="2.61"; sha256="0xq9zygxs7jli9cw4rsl9ajs6nnl5adfilb47cjdk263909fla5j"; depends=[igraph]; };
   BE = derive2 { name="BE"; version="0.1.1"; sha256="1ldzj1fvbgmnp0cn7g348md2xskm2q5b7y6l1sm3pa2am8jc7ixa"; depends=[rtf]; };
   BEACH = derive2 { name="BEACH"; version="1.3.1"; sha256="0biq6c74k8vb8ykafzf3blyi08rp65x1vaw3bfpwdc1ihc9wrgjr"; depends=[devtools DT haven plyr rJava rtf sas7bdat shiny WriteXLS xtable]; };
   BEDASSLE = derive2 { name="BEDASSLE"; version="1.5"; sha256="1bz3lr0waly9vj9adwhmgs3lq7zjdkcbvm3y9rnn72qlrwmv5fbn"; depends=[emdbook MASS matrixcalc]; };
@@ -260,6 +263,7 @@ in with self; {
   BENMMI = derive2 { name="BENMMI"; version="4.3-6"; sha256="07jmf4icij8yb83bf7x0vsaf60gcvdzaijjckv5400xjykpm7scm"; depends=[benthos dplyr ggplot2 jsonlite knitr markdown purrr readr tidyr xtable]; };
   BEQI2 = derive2 { name="BEQI2"; version="2.0-0"; sha256="19q29kkwww5hziffkm2yx7n4cpfcsyh0z4mljdcnjkwfp732sjig"; depends=[jsonlite knitr markdown plyr reshape2 xtable]; };
   BEST = derive2 { name="BEST"; version="0.5.1"; sha256="0yx3bkaaly0lriyd5xr7aay4c381a5iwanfixz9v37cmvs64rs4s"; depends=[coda HDInterval rjags]; };
+  BESTree = derive2 { name="BESTree"; version="0.5.2"; sha256="0yij6xdlvhbqifckaylgbhszwwp38d9x6vbpr1nl40mwwnv4bswz"; depends=[plyr]; };
   BETS = derive2 { name="BETS"; version="0.4.9"; sha256="0daixk7mqmk2jq35i7mjaslz11gxbnnjgwxfvj8x1s88vz9l74sm"; depends=[DBI digest dplyr DT dygraphs forecast foreign ggplot2 grnn htmltools httr lubridate miniUI plotly rjson rmarkdown RMySQL rstudioapi rvest seasonal shiny sqldf stringr urca webshot xml2 zoo]; };
   BGData = derive2 { name="BGData"; version="2.1.0"; sha256="168lvmcfj9ch2dfp8haykgz8cwmrp1yqn01hbyssqfgpc42lrgf3"; depends=[BEDMatrix bigmemory bit crochet ff LinkedMatrix symDMatrix synchronicity]; };
   BGGE = derive2 { name="BGGE"; version="0.6.5"; sha256="1h76c40y45xhf2vp9g0q5j9lfwh16q9axbk5c9aqn4md008xr1j2"; depends=[]; };
@@ -293,19 +297,20 @@ in with self; {
   BMA = derive2 { name="BMA"; version="3.18.9"; sha256="1lwgjswjiiyzxjpbpr61lcppgkz2d6m3vhgz7qpg33jg2mvdkvjy"; depends=[inline leaps robustbase rrcov survival]; };
   BMAmevt = derive2 { name="BMAmevt"; version="1.0.3"; sha256="0p1y4yc502r4wjc1vkpa4q9d3xzxnyvp13y910vq5z5nqixjdfsp"; depends=[coda]; };
   BMRBr = derive2 { name="BMRBr"; version="0.2.0"; sha256="0v2ysap5jfkq9fc5blqlfhsv2bs8rqybmp5z4q3g6y3y7qzhypjw"; depends=[rvest xml2]; };
+  BMRSr = derive2 { name="BMRSr"; version="1.0.0"; sha256="0xdzzwmn2ibzgy68djsf7jxayfwd2yr1qsa0dcg9zl4rhl6b8nrl"; depends=[httr readr stringr tibble xml2]; };
   BMRV = derive2 { name="BMRV"; version="1.32"; sha256="1j1cwjk3l7f06nqdwrqdyhzm43bb8hj5wgdd14zc1grxyfc9ya95"; depends=[BH]; };
   BMS = derive2 { name="BMS"; version="0.3.4"; sha256="0z3mk1xd1fphf80kdbashkn04jwsr2bghms4d7nav3pw73q41wql"; depends=[]; };
   BMT = derive2 { name="BMT"; version="0.1.0.3"; sha256="1vdah5bsn41s2qriq15xi7dw9qzngaacmn5gk6yc7hi89dwyy3yj"; depends=[fitdistrplus partitions]; };
-  BMTME = derive2 { name="BMTME"; version="1.0.6"; sha256="1x15h3l459g4k7i97yry2wlb4arw35mkv7jiad6d23jifz5l6485"; depends=[BGLR doSNOW dplyr foreach matrixcalc mvtnorm progress Rcpp RcppArmadillo snow tidyr]; };
+  BMTME = derive2 { name="BMTME"; version="1.0.11"; sha256="137kh3h4vqqb70crr1h0i3nigy8m7h0lm9kfcv6imqrsfksw42a4"; depends=[BGLR doSNOW dplyr foreach matrixcalc mvtnorm progress Rcpp RcppArmadillo snow tidyr]; };
   BMhyb = derive2 { name="BMhyb"; version="2.1.5"; sha256="0yyvrn5akj132zkxlg5kicj12d7agzmi84jird4aj7hvi88l5wwv"; depends=[ape corpcor cowplot DEoptim geiger ggplot2 igraph lhs MASS Matrix metR mvtnorm numDeriv phytools plyr TreeSim viridis]; };
   BMhyd = derive2 { name="BMhyd"; version="1.2-8"; sha256="14pv5f621zq5x9i408zjm8k80hcsabkjpdf86gk3ylgw5yqcivrx"; depends=[ape corpcor geiger mvtnorm numDeriv phylobase phytools TreeSim]; };
   BMisc = derive2 { name="BMisc"; version="1.3.1"; sha256="0wh17bf1ii6zan09n59cf9257nb60nh08ig01id9k0bvm9f14ay6"; depends=[formula_tools plm]; };
   BNDataGenerator = derive2 { name="BNDataGenerator"; version="1.0"; sha256="17zi83jhpn9ygavkpr9haffvd4622sca18jzzxxxmfq0ilrj201g"; depends=[]; };
   BNN = derive2 { name="BNN"; version="1.0.2"; sha256="13h9xqfdqnc9d8brx1xlmvb4nrkpwncwjz98y7i3wijih85wkikd"; depends=[mvtnorm]; };
   BNPMIXcluster = derive2 { name="BNPMIXcluster"; version="1.2.4"; sha256="06s0cs3anbby93n7pjcin9195agfzfq9im6f9k7ih3cbg8mzfaqy"; depends=[gplots MASS matrixcalc mvtnorm plyr Rcpp RcppArmadillo truncnorm]; };
-  BNPTSclust = derive2 { name="BNPTSclust"; version="1.1"; sha256="1zmxwg6zn3nqqm1sw2n4pvq47mv7ygb4lf1c6yhn3xaf1rqmf26s"; depends=[MASS mvtnorm]; };
-  BNPdensity = derive2 { name="BNPdensity"; version="2019.7.9"; sha256="1r6cisb4ygk8jxdlc2kma7f61rviad5782di8r3ksp5nal6gb31f"; depends=[coda dplyr ggplot2 gridExtra survival tidyr viridis]; };
-  BNPmix = derive2 { name="BNPmix"; version="0.2.2"; sha256="0q4kn4ryn9m9vcxjsnbp2rcd9cn3na09nci79g30lscgwfci7w0a"; depends=[ggplot2 Rcpp RcppArmadillo]; };
+  BNPTSclust = derive2 { name="BNPTSclust"; version="2.0"; sha256="1ymvklv6d9684xzwdkvaxdjd1q20xmsf6kkfibn2wphlaqs2rh2n"; depends=[MASS mvtnorm]; };
+  BNPdensity = derive2 { name="BNPdensity"; version="2019.9.18"; sha256="1s4mifmlvh0b0w4ckllg49z2jwfzy5d2x7lak38r92yg75nabng6"; depends=[coda dplyr ggplot2 gridExtra survival tidyr viridis]; };
+  BNPmix = derive2 { name="BNPmix"; version="0.2.3"; sha256="1vrblwcrhmkgcgpdlb42lfysgpznaxljiaz6jn2jq7qnsiyqnrmy"; depends=[coda ggplot2 Rcpp RcppArmadillo]; };
   BNSL = derive2 { name="BNSL"; version="0.1.4"; sha256="0nrlx55364kgvkdpyaimgjxwnzmmdl1gmvyv3wkm8n2jyki92xxp"; depends=[bnlearn igraph Rcpp]; };
   BNSP = derive2 { name="BNSP"; version="2.1.0"; sha256="01nfzyzd1s55rhc1mghlcqgq6cnp8g44acyfb89vd0w9mdwgj8r0"; depends=[coda corrplot cubature Formula ggplot2 gridExtra mgcv plot3D plyr threejs]; };
   BOG = derive2 { name="BOG"; version="2.0"; sha256="0lz5af813b67hfl4hzcydn58sjhgn5706n2h44g488bks928k940"; depends=[DIME hash]; };
@@ -313,7 +318,7 @@ in with self; {
   BPEC = derive2 { name="BPEC"; version="1.3.0"; sha256="0chdp7g75a6hajq7h1lbl0zima22myah9a66m06zga274plakdq2"; depends=[ape coda fields ggmap ggplot2 igraph maptools mvtnorm OpenStreetMap phytools sp]; };
   BPM = derive2 { name="BPM"; version="1.0.0"; sha256="17k2d1xjfz85ygx0xnh6yqca9nyypd32d7sbna3k33ynsjqay3x8"; depends=[limma]; };
   BRETIGEA = derive2 { name="BRETIGEA"; version="1.0.0"; sha256="176z7ajyfcfljv36d2sa15cvw047rsir3gn0l4lxmcyliw93r4lv"; depends=[]; };
-  BRISC = derive2 { name="BRISC"; version="0.1.0"; sha256="0fkh7wv9lf7fckh5xn4xygh6k792j8j6ax7kwqw7m4qqvl7gds44"; depends=[matrixStats pbapply RANN rdist]; };
+  BRISC = derive2 { name="BRISC"; version="0.2.0"; sha256="0dnkf4ld1blbadmxvgd0k021ihszrf2x19qypvv8jvgfrgcr8ax7"; depends=[matrixStats pbapply RANN rdist]; };
   BRugs = derive2 { name="BRugs"; version="0.9-0"; sha256="0f0v30mvfw97vfwzkjpqzf2894b2yhksja0xhpranprk135srxp0"; depends=[coda]; };
   BSDA = derive2 { name="BSDA"; version="1.2.0"; sha256="0gs33yyca45jd4f5k5f7qid4ayw2rnl2wl7a6m7vf39dfx7ympm2"; depends=[e1071 lattice]; };
   BSGS = derive2 { name="BSGS"; version="2.0"; sha256="08m8g4zbsp55msqbic4f17lcry07mdn0f5a61zdcy2msn2ihzzf9"; depends=[batchmeans MASS plyr pscl]; };
@@ -330,7 +335,7 @@ in with self; {
   BTYDplus = derive2 { name="BTYDplus"; version="1.0.1"; sha256="0x8as4zskpbsvhh8gnvzgp833dkv01cs5fqfva9qri296343kppv"; depends=[bayesm BTYD coda data_table mvtnorm Rcpp]; };
   BTdecayLasso = derive2 { name="BTdecayLasso"; version="0.1.0"; sha256="0x1s2zvv3vnapk5wp8582zwflsqvgc8khkvl5ch9i70v739jxp15"; depends=[ggplot2 optimr]; };
   BUCSS = derive2 { name="BUCSS"; version="1.1.0"; sha256="1agx6yd29zq6gvwgnd0qahjnk5z7gdbijbg7rk85d5x6pihwmh9q"; depends=[]; };
-  BVAR = derive2 { name="BVAR"; version="0.1.5"; sha256="0vq1a4a5l444asbbr5f9ha6s3py9n24dria1a7yk3wfh302fj15s"; depends=[MASS]; };
+  BVAR = derive2 { name="BVAR"; version="0.2.1"; sha256="0ql8ivnfkjy4sh376lxpm5bvy54h20zhhgwz8qrkl2x24lxsmwm0"; depends=[mvtnorm]; };
   BVS = derive2 { name="BVS"; version="4.12.1"; sha256="111g61bpwh80v6gy44q087swcrnnnzdcibm22pzzi9jsfphy6l0c"; depends=[haplo_stats MASS msm]; };
   BVSNLP = derive2 { name="BVSNLP"; version="1.1.8"; sha256="0qlmvi189ky6h0a3jyvyil488asx3v6x52mvca7s93dvarxr6rw1"; depends=[doParallel foreach Rcpp RcppArmadillo RcppEigen RcppNumerical]; };
   BWStest = derive2 { name="BWStest"; version="0.2.2"; sha256="02amzlfprmw5pyis0dg0kg0x8xqh50a4vfdcxxmklrzik3b1vzzs"; depends=[memoise Rcpp]; };
@@ -344,13 +349,13 @@ in with self; {
   BalanceCheck = derive2 { name="BalanceCheck"; version="0.2"; sha256="0aal641vfbjk3w6ipwbqqmm9nnxs962hjmpph9wnqaqk5r6s7brs"; depends=[ade4 mvtnorm]; };
   BalancedSampling = derive2 { name="BalancedSampling"; version="1.5.5"; sha256="01ayvjfs83dbnk0m9xb7y9rnxxpfpb6w4qjdffd6hdhcn2s5f73d"; depends=[Rcpp SamplingBigData]; };
   Ball = derive2 { name="Ball"; version="1.3.8"; sha256="0zzi4xmarha30n5c2k452vr4dli1nc1rpx79pwfaj5h0rn1q01yy"; depends=[gam mvtnorm survival]; };
-  BallMapper = derive2 { name="BallMapper"; version="0.1.0"; sha256="1v0n4nyxhz3i7jkyrg3zgznz4z0rim68pv60dvn8197q81z0bk7g"; depends=[fields igraph networkD3 scales testthat]; };
+  BallMapper = derive2 { name="BallMapper"; version="0.2.0"; sha256="1hf94d41cks8mbrb985mpd0nqgirvm096cfv7bsy0182bbxlk6s1"; depends=[fields igraph networkD3 scales stringr testthat]; };
   BarBorGradient = derive2 { name="BarBorGradient"; version="1.0.5"; sha256="0g2g7hrm23as1xbj79g48r8sj3gsj66fmi895jqlqfbqrl2fl7a5"; depends=[]; };
   BarcodingR = derive2 { name="BarcodingR"; version="1.0-2"; sha256="1mn5rdax8v1s2z3apk9z0kzy4hw19m8ql6j91l6wd29g2n2bjqxx"; depends=[ape class nnet sp]; };
   Barnard = derive2 { name="Barnard"; version="1.8"; sha256="1ki58hjs5kpmp76kwj1qi6hwmdvjphqb1lvrlhnmkgqxg4hw4vqg"; depends=[]; };
   Barycenter = derive2 { name="Barycenter"; version="1.3.1"; sha256="0yhc0wwjqms569gnm8z2l9hgcbw8lyy437ynkij47pa4c1a1qvjy"; depends=[Rcpp RcppArmadillo]; };
   BatchExperiments = derive2 { name="BatchExperiments"; version="1.4.2"; sha256="0zvcpgzhbna6p37jlf57j7mzrvh5xs5w17janmv9v4210cpbzi1q"; depends=[backports BatchJobs BBmisc checkmate data_table DBI RSQLite]; };
-  BatchGetSymbols = derive2 { name="BatchGetSymbols"; version="2.5.2"; sha256="1m3i70vbyia1i04zn2f9wjlmba09rn4389r7kjy6ihbgbba8fg18"; depends=[curl dplyr furrr future lubridate purrr quantmod rvest scales stringr tibble tidyr XML]; };
+  BatchGetSymbols = derive2 { name="BatchGetSymbols"; version="2.5.3"; sha256="11p44iymjgsy9b2yk916sh5f1wv8ma17978ibhckwb4rr0rkcf2i"; depends=[curl dplyr furrr future lubridate purrr quantmod rvest scales stringr tibble tidyr XML zoo]; };
   BatchJobs = derive2 { name="BatchJobs"; version="1.8"; sha256="1zz4sspj596pijxlz321g0jy2rg9ki83j6fihbwisjwr66p2vk1m"; depends=[backports BBmisc brew checkmate data_table DBI digest RSQLite sendmailR stringi]; };
   BatchMap = derive2 { name="BatchMap"; version="1.0.2.0"; sha256="0v3k4xrmsbyhzgmph8xna11dgpp10yxqmss95asrj6n814jxj19b"; depends=[ggplot2 Rcpp RcppArmadillo reshape2]; };
   BayHap = derive2 { name="BayHap"; version="1.0.1"; sha256="0xqnl2cbf0pyjlpywyy0j4mwknfn8msz4s719dsri3r7hvn9m6kd"; depends=[boa]; };
@@ -358,6 +363,7 @@ in with self; {
   BayLum = derive2 { name="BayLum"; version="0.1.3"; sha256="0hina84s8ax01zpnji4jqqkdap0phvxr78s4rnab0407xrydbf0w"; depends=[ArchaeoPhases coda hexbin KernSmooth Luminescence rjags]; };
   BaySIC = derive2 { name="BaySIC"; version="1.0"; sha256="023ji6q1nvksmhp3ny8ad39xxccc0a1rv9iaiaagwavgzzc0pjd9"; depends=[fields poibin rjags]; };
   BayesBD = derive2 { name="BayesBD"; version="1.2"; sha256="10ik2lndqgmy6pvdm6cx4fsxgjb2fgi6hlz5ic35ab7fkpi90ka5"; depends=[jpeg mritc png Rcpp RcppArmadillo shiny]; };
+  BayesBP = derive2 { name="BayesBP"; version="1.0"; sha256="1gmjljkp4pvm87qf6rq2kixqdx64sfg34b1xxdl242a3cckmjc5y"; depends=[iterators openxlsx]; };
   BayesBinMix = derive2 { name="BayesBinMix"; version="1.4.1"; sha256="1b18qg0mjbmrilwqffrq33gw04fzask2xgj1bp4cli51cjf2slf7"; depends=[coda doParallel foreach label_switching]; };
   BayesCR = derive2 { name="BayesCR"; version="2.1"; sha256="1qav7l64iqqdvr1v6c7hlzvbx7zbvsa55pyisvkq5rsayy1rdsl1"; depends=[mnormt mvtnorm rootSolve truncdist]; };
   BayesCTDesign = derive2 { name="BayesCTDesign"; version="0.6.0"; sha256="1ym2v5ynmb28miwivyjx604vfsfi5ksmaha0far0ddq2cl06if2q"; depends=[eha ggplot2 reshape2 survival]; };
@@ -369,16 +375,18 @@ in with self; {
   BayesFactor = derive2 { name="BayesFactor"; version="0.9.12-4.2"; sha256="1z083v7is21gm0a458jm5ph3xfdm7mh29a6sg2r1njq82f8x3s3g"; depends=[coda gtools hypergeo Matrix MatrixModels mvtnorm pbapply Rcpp RcppEigen stringr]; };
   BayesGESM = derive2 { name="BayesGESM"; version="1.4"; sha256="0qw2byb48f67461m1k8a1rqh6a0c3zq1rc4ni9xzxv8dih4wkq0f"; depends=[Formula GIGrvg normalp]; };
   BayesGOF = derive2 { name="BayesGOF"; version="5.2"; sha256="17wm0228xq3db431abyi9jr0q1q86nnajsn7hmy4dwzgvrlz5s0i"; depends=[Bolstad2 nleqslv orthopolynom VGAM]; };
-  BayesH = derive2 { name="BayesH"; version="1.0"; sha256="0mjd1i3rkhyq3qcalq0ing0ap0igbhyvczaihl4pcfidgs70bci3"; depends=[]; };
   BayesLCA = derive2 { name="BayesLCA"; version="1.7"; sha256="0lsqgjqal9092v1wr07p8g5cqm24k2d80sp7hlr7r1xknakmm1b6"; depends=[coda e1071 fields MCMCpack nlme]; };
+  BayesLogit = derive2 { name="BayesLogit"; version="2.1"; sha256="0w3bzk39sxdskwikcz5i0xwfsll4sqgkpr8vw8jvzlcy6dl3yhis"; depends=[]; };
   BayesMAMS = derive2 { name="BayesMAMS"; version="0.1"; sha256="1qq3j9nm0k58gpyfavz77v1dwghy8pmpk0v52cj7l8sb3a3aiinm"; depends=[mvtnorm]; };
-  BayesMallows = derive2 { name="BayesMallows"; version="0.4.0"; sha256="0kxy0ciz0vlnpf8q9p6zphxwzjd76vlj523i048lngfk60kphmxd"; depends=[cowplot dplyr ggplot2 HDInterval igraph PerMallows purrr Rcpp RcppArmadillo Rdpack relations rlang sets tidyr]; };
+  BayesMallows = derive2 { name="BayesMallows"; version="0.4.1"; sha256="0q89al122393nym9i71gz5mh10d304fcnbw2naxwzmj744g3lpm2"; depends=[cowplot dplyr ggplot2 HDInterval igraph PerMallows purrr Rcpp RcppArmadillo Rdpack relations rlang sets tidyr]; };
   BayesMed = derive2 { name="BayesMed"; version="1.0.1"; sha256="1ysc7sh0drqxbisi2dz6gj4jlw6qsd879bbhr5pra7nxgmk4h650"; depends=[MCMCpack polspline QRM R2jags]; };
   BayesMixSurv = derive2 { name="BayesMixSurv"; version="0.9.1"; sha256="19kf39881q00pap9afwvvggk4s4w3qpz17b7065nig1mvk8dnp8r"; depends=[survival]; };
   BayesNI = derive2 { name="BayesNI"; version="0.1"; sha256="0zvr6rkb5zxgl53xby69d0j3yrfnlcmac6kwkxz77q5616w9dwq0"; depends=[]; };
+  BayesNSGP = derive2 { name="BayesNSGP"; version="0.1.0"; sha256="0nms9s5r1vg5irpfj1kz030hwbiqz84hb7zsnc9y3zqg5arp60xk"; depends=[FNN Matrix nimble StatMatch]; };
   BayesNetBP = derive2 { name="BayesNetBP"; version="1.4.0"; sha256="007anxk76rxwskc7fvbmaw7ihjnwqad0xmiy6iyv68lwrjifvpc2"; depends=[bnlearn doBy fields graph igraph qtl qtlnet RColorBrewer Rgraphviz]; };
   BayesPieceHazSelect = derive2 { name="BayesPieceHazSelect"; version="1.1.0"; sha256="0znbmv7crqycdx75jh02h6z8d6cifjszbrldv2yva4mkjxsydag5"; depends=[mvtnorm]; };
   BayesPiecewiseICAR = derive2 { name="BayesPiecewiseICAR"; version="0.2.1"; sha256="1qrmw7zmygdzz84p76hyh2d8dx88b8xhbbd7radqm39g35zq5wz6"; depends=[mvtnorm]; };
+  BayesPostEst = derive2 { name="BayesPostEst"; version="0.0.1"; sha256="0q57zlfmxssdvsyj9hxngfa5qbfp39mz5cl9b6g7f61rd30szf9w"; depends=[carData caTools coda dplyr ggmcmc ggplot2 ggridges R2jags reshape2 rlang ROCR tidyr]; };
   BayesRS = derive2 { name="BayesRS"; version="0.1.3"; sha256="0fhvnckabp0z1cdsbjgv3ijnzaxwhrk83fwcflgqbhvm3a9lzr77"; depends=[coda ggplot2 metRology reshape rjags]; };
   BayesS5 = derive2 { name="BayesS5"; version="1.31"; sha256="1azxn3r0s52zy6y5qsa6yx331795mkk7fb28fcinv2zx9iyvk33w"; depends=[abind Matrix snowfall]; };
   BayesSAE = derive2 { name="BayesSAE"; version="1.0-2"; sha256="1xbx9hr254agpcqs1fl7qi7h19fd2bbmjszn44l566n2svgvxwf5"; depends=[coda Formula lattice]; };
@@ -390,7 +398,7 @@ in with self; {
   BayesTwin = derive2 { name="BayesTwin"; version="1.0"; sha256="026blnhihbx9bpd63mxhbp0kpvj0lwbj7mg72alyfr2jnrh1n3lp"; depends=[coda foreign matrixStats rjags]; };
   BayesValidate = derive2 { name="BayesValidate"; version="0.0"; sha256="1gli65avpkb90asx92l1yjbwaxcsyb920idyjwgd2sl2b3l657ly"; depends=[]; };
   BayesVarSel = derive2 { name="BayesVarSel"; version="1.8.0"; sha256="1sf18m4p8zaw2s5fv4p9s99n1n0cgzscgfhm5ngkzif43kwz1l6n"; depends=[MASS mvtnorm]; };
-  BayesX = derive2 { name="BayesX"; version="0.3-0"; sha256="0vgi0yng53x0w18h4n0ygqmcky7jwmk99j4gcv2vwhcmz45s73j0"; depends=[coda colorspace maptools shapefiles sp]; };
+  BayesX = derive2 { name="BayesX"; version="0.3-1"; sha256="0g4cdkvicqzg75qgr62j89dc9mni38ai7705j6jbfx59vn6dbrr5"; depends=[coda colorspace maptools shapefiles sp]; };
   BayesXsrc = derive2 { name="BayesXsrc"; version="3.0-1"; sha256="0l8c6xsyqj09m722hdanr1d9n6a1ps77ybm1jaqmp86bqmq1br03"; depends=[]; };
   BayesianAnimalTracker = derive2 { name="BayesianAnimalTracker"; version="1.2"; sha256="1pgjijqznfdpvw296h5vksnxgspxs7qhy6s84ww7abnlhg59bz5s"; depends=[TrackReconstruction]; };
   BayesianFROC = derive2 { name="BayesianFROC"; version="0.1.5"; sha256="11dpha68vh68ifxk721p3jiklaaavzq06cs12ph95lakrlbv9mr8"; depends=[bridgesampling car crayon DiagrammeR ggplot2 knitr pracma Rcpp readxl rhandsontable rstan shiny shinydashboard xlsx]; };
@@ -409,12 +417,12 @@ in with self; {
   Bergm = derive2 { name="Bergm"; version="5.0.0"; sha256="0l04hg5rwgi5vgb7h987f0j3shb0vz9w26zmk4hm7vfbwb9xxix6"; depends=[coda ergm Matrix matrixcalc MCMCpack mvtnorm network]; };
   Bessel = derive2 { name="Bessel"; version="0.6-0"; sha256="0iwm08nhlivi4zwcqdi296a1l4n4lfanfxhaysh9vcsyk1kpiacf"; depends=[Rmpfr]; };
   BetaBit = derive2 { name="BetaBit"; version="1.3"; sha256="1x9mfnijgi8726p82d52g2zgmliwsc97v2g96mz9ccz2vqqnwq4w"; depends=[digest]; };
-  BetaPASS = derive2 { name="BetaPASS"; version="1.0-1"; sha256="0c9a3bv9q9nzz3iw3jwqrkfqk4zd6ybaq4jlijja6rl2gqrprsi2"; depends=[betareg ggplot2 lmtest Rcpp reshape]; };
+  BetaPASS = derive2 { name="BetaPASS"; version="1.1-1"; sha256="17q1bfmijv38zyaj5fxlylf5zmkqry4ca9wm5km6zpksgsg2kjjq"; depends=[betareg ggplot2 pbapply]; };
   BeviMed = derive2 { name="BeviMed"; version="5.3"; sha256="01q5pr776ki973bcld20cqpsz9f10bb30vj95da9gbz5af6bvb14"; depends=[Rcpp]; };
   BeyondBenford = derive2 { name="BeyondBenford"; version="1.1"; sha256="1mqrzd6hpfsqxwm2sgc2lmgx7czvaj7qvhs05pj6p63n0fiimq9c"; depends=[]; };
   Bhat = derive2 { name="Bhat"; version="0.9-10"; sha256="1vg4pzrk3y0dk1kbf80mxsbz9ammkysh6bn26maiplmjagbj954v"; depends=[]; };
   BiBitR = derive2 { name="BiBitR"; version="0.3.1"; sha256="0wfwph6nw12hb43j14i9ycj8m2zn0m5ynp7afq9cray8rbgvxfv6"; depends=[biclust cluster dendextend foreign lattice randomcoloR viridis]; };
-  BiDAG = derive2 { name="BiDAG"; version="1.1.2"; sha256="076v7p70clk6wc20gr1cf6vi1x01nbi9pn7z51zwwg6i54a7hsr4"; depends=[pcalg Rcpp]; };
+  BiDAG = derive2 { name="BiDAG"; version="1.2.0"; sha256="0cn6aasrhqv5vkdb45a1mjzkgcppv1m57cx2bi97riy3siy5h0dy"; depends=[pcalg Rcpp]; };
   BiDimRegression = derive2 { name="BiDimRegression"; version="2.0.0"; sha256="0k0708z6xn04zjkc4sk15649wji6hl5q4rvd28sz5kbq7z54j1j5"; depends=[Formula]; };
   BiProbitPartial = derive2 { name="BiProbitPartial"; version="1.0.3"; sha256="0y19b8bkwr7rpygmj03013slmfbyd7aj6714hm14w5rdbnckymw3"; depends=[coda Formula mvtnorm numDeriv optimr pbivnorm Rcpp RcppArmadillo RcppTN]; };
   BiSEp = derive2 { name="BiSEp"; version="2.2"; sha256="1ha7rc1q54dr2xl4bpkiwl703igmmi9qphsgv2h0flq7iz0gr351"; depends=[AnnotationDbi GOSemSim mclust]; };
@@ -444,10 +452,11 @@ in with self; {
   BiocManager = derive2 { name="BiocManager"; version="1.30.4"; sha256="0kxs76pixk1d2lpvkyrq6nnvv1rqf55ph5f7igkadyyqirf3y2ah"; depends=[]; };
   Biocomb = derive2 { name="Biocomb"; version="0.4"; sha256="0jqfac81r5731m0i9jq7v5ns9263p8r7i03jyz10y915kfr6ikh6"; depends=[arules class e1071 FSelector gtools MASS nnet pamr pROC randomForest Rcpp rgl ROCR rpart RWeka]; };
   Biodem = derive2 { name="Biodem"; version="0.4"; sha256="0k0p4s21089wg3r3pvyy9cxsdf4ijdl598gmxynbzvwpr670qnsh"; depends=[]; };
-  BiodiversityR = derive2 { name="BiodiversityR"; version="2.11-2"; sha256="1w87f9lf50sr0lk1gxqw75liqg3f7dkmnxwyaa5dv84l0yzak6mm"; depends=[Rcmdr rgl vegan vegan3d]; };
+  BiodiversityR = derive2 { name="BiodiversityR"; version="2.11-3"; sha256="1ba19vlxpy88xcryf3xki3h49hbmkz9hf69lni6swl2rh1k7fx41"; depends=[Rcmdr rgl vegan vegan3d]; };
   Biograph = derive2 { name="Biograph"; version="2.0.6"; sha256="0vklqwbifbac3v9ws9fs22yxpqqk5b3m96qzr8j0irnimb5kgh5p"; depends=[Epi etm ggplot2 lubridate msm mstate mvna plyr reshape survival]; };
   Bioi = derive2 { name="Bioi"; version="0.2.9"; sha256="0kvqvvaws1zc3npxvl3jqidak24n5y8n98ml44mkbh7c5n296z2p"; depends=[assertthat dplyr igraph Rcpp]; };
   Biolinv = derive2 { name="Biolinv"; version="0.1-2"; sha256="0g9vw1jcsjawmddkixssm5gbncy17fdd6a3c5b2qd4hx81kxz8q9"; depends=[classInt fields raster sp spatstat]; };
+  Biopeak = derive2 { name="Biopeak"; version="1.0"; sha256="1l08m1jl8yygbdfzk8klpj1q2m7icvxi98vmk7akxs0sswjc6wd2"; depends=[cluster dbscan factoextra gplots RColorBrewer]; };
   Bios2cor = derive2 { name="Bios2cor"; version="1.2"; sha256="00fzvj20x85gcpb9l6rfnm3qml8nnl365z1a68j90qi14wy6dfh6"; depends=[bigmemory bio3d circular igraph]; };
   BisRNA = derive2 { name="BisRNA"; version="0.2.2"; sha256="11jl5109nlm272vncprwplkz4kpvg7yx6yfnbjg47lfrsxcj8n0g"; depends=[MASS]; };
   BisqueRNA = derive2 { name="BisqueRNA"; version="1.0"; sha256="1ks91gjfcnajg540930drcnqcrn4fi3735hywyy3y6i1q0wnq9vb"; depends=[Biobase lsei]; };
@@ -473,8 +482,8 @@ in with self; {
   BondValuation = derive2 { name="BondValuation"; version="0.1.0"; sha256="1sgnf5a6rm1br6i82bmp7s044012bwfxa9yb6bjkq8kr83mf7i6v"; depends=[Rcpp timeDate]; };
   BoolFilter = derive2 { name="BoolFilter"; version="1.0.0"; sha256="14z4fzf8p4wgi939qs6v39a3xizccjcx7j4szsydllpkvxbwggbw"; depends=[BoolNet Rlab]; };
   BoolNet = derive2 { name="BoolNet"; version="2.1.5"; sha256="11fysc39vfk3zb9qklryi8gl42c3hqgzlvci4jj0zkqnm0v9amqk"; depends=[igraph XML]; };
-  Boom = derive2 { name="Boom"; version="0.9.1"; sha256="010d0mbjl7djv956niw115p610vjs6wfyby4r8wq182gbssldhm7"; depends=[BH MASS]; };
-  BoomSpikeSlab = derive2 { name="BoomSpikeSlab"; version="1.1.1"; sha256="0rklw3ap2p95g967spi3b8r9vvg0x3zr4zj5gblab48q9khirf52"; depends=[BH Boom igraph]; };
+  Boom = derive2 { name="Boom"; version="0.9.2"; sha256="12si4qd3xyx38bryd1s0p2qr1w7w5sxvk6ncpf071v6lxsf7zh05"; depends=[MASS]; };
+  BoomSpikeSlab = derive2 { name="BoomSpikeSlab"; version="1.2.1"; sha256="1fxh39rplcnpfyffvzl7kns04lvfc1jx70nsq1380471z1n144lj"; depends=[Boom igraph]; };
   BootMRMR = derive2 { name="BootMRMR"; version="0.1"; sha256="07am80603pv1dh5ma3zb0idnslkzm5m3ym8sd1nhkh8zbc6qqmzs"; depends=[]; };
   BootPR = derive2 { name="BootPR"; version="0.60"; sha256="03zw7hz4gyhp6iq3sb03pc5k2fhvrpkspzi22zks25s1l7mq51bi"; depends=[]; };
   BootValidation = derive2 { name="BootValidation"; version="0.1.65"; sha256="1q42yqj56by3j1kmq17pjl4aq0sznhph65yxfwav39q28bf5y83r"; depends=[glmnet pbapply pROC risksetROC survival]; };
@@ -503,7 +512,7 @@ in with self; {
   CA3variants = derive2 { name="CA3variants"; version="2.0"; sha256="1wnc9qfcligpsi5ycmzw0igm14h6lvf4vd82aygnas6q41vnypwz"; depends=[ggplot2 ggrepel gridExtra multichull]; };
   CADFtest = derive2 { name="CADFtest"; version="0.3-3"; sha256="06bwv728ckalzibxginzfica24w18m4g87i0i064m3q89ghmnlqm"; depends=[dynlm sandwich tseries urca]; };
   CADStat = derive2 { name="CADStat"; version="3.0.8"; sha256="0wdglw1vyd5gz70r9ma0mwshvizv39nb4ahp8pvr70c4qqzsfhc0"; depends=[bio_infer car gdata gmodels JavaGD JGR lattice MASS quantreg rJava rpart XML]; };
-  CAISEr = derive2 { name="CAISEr"; version="1.0.14"; sha256="0jfpn4ih5dc55jjiivbdscpm6jw250js8p8gvcnsdf3pgrzp8cxr"; depends=[assertthat ggplot2 gridExtra lattice pbmcapply]; };
+  CAISEr = derive2 { name="CAISEr"; version="1.0.15"; sha256="0igm1yvhllnhqd0bc2z6bfjdmr3w2465xi7vyaa7a68dd5k81apj"; depends=[assertthat ggplot2 gridExtra pbmcapply]; };
   CALF = derive2 { name="CALF"; version="0.2.0"; sha256="12w1vr0rk6m4lv6zvqrf45k81d301ln1253wyy9xi6mv1hkabg0v"; depends=[ggplot2]; };
   CALIBERrfimpute = derive2 { name="CALIBERrfimpute"; version="1.0-1"; sha256="1xsnqyj0qdi081rdnpas9ciy9zbhdcjx3lphl6drk0bbmik3znkv"; depends=[mice mvtnorm randomForest]; };
   CAM = derive2 { name="CAM"; version="1.0"; sha256="07mmrz6j8cm6zgaw2zcxgkxb7abd651kb80526r271snjgvpr5bl"; depends=[glmnet Matrix mboost mgcv]; };
@@ -516,7 +525,6 @@ in with self; {
   CARLIT = derive2 { name="CARLIT"; version="1.0"; sha256="04kpjfps4ydf8fj75isqp16g1asdsyf8nszhbfkpw1zxkrmiksyp"; depends=[]; };
   CARRoT = derive2 { name="CARRoT"; version="2.0.0"; sha256="1x8y803rvfchmjfw608nframvdm3nvci36bv0bb9h42z8gviyh0v"; depends=[doParallel foreach nnet Rdpack]; };
   CARS = derive2 { name="CARS"; version="0.2.2"; sha256="18l2bhfwma24q1zg1y1xmlcmnbzjqmmny3h7s179kslagnh3kmsj"; depends=[np]; };
-  CARrampsOcl = derive2 { name="CARrampsOcl"; version="0.1.4"; sha256="1sdrir7h7xl1imipm9b71vca062dxqsqd8mg3w9f3s80x2aghxl8"; depends=[fields OpenCL]; };
   CASMAP = derive2 { name="CASMAP"; version="0.6.0"; sha256="1z321l34da5ggwmbggs9d8m96syra1jm29gj68lfhd7ikbpmw96w"; depends=[Rcpp]; };
   CAST = derive2 { name="CAST"; version="0.3.1"; sha256="1cqadrww0w2wkqmh4mi2bmdr572q5qpnz2c4jpvwqrk2ynhz43qn"; depends=[caret ggplot2]; };
   CATT = derive2 { name="CATT"; version="2.0"; sha256="12xdspl1gbf51snyrl44nn7alfyccdfihibkgvzr66lrby8b8fhg"; depends=[]; };
@@ -524,12 +532,13 @@ in with self; {
   CATkit = derive2 { name="CATkit"; version="3.3.3"; sha256="01q2ssyg0jcjgahaslfgpakjsv2wil654lc6xrg5xbbrkx7ccb90"; depends=[assertr CombMSC Hmisc magic MASS png rtf season signal]; };
   CAWaR = derive2 { name="CAWaR"; version="0.0.1"; sha256="1z8xmwnxwlk0nhi22nabwzggizzsp8jzwfln0h2hkk7h1p8xjlhk"; depends=[fieldRS ggplot2 lubridate raster rgdal rgeos rsMove RStoolbox sp spatialEco]; };
   CAinterprTools = derive2 { name="CAinterprTools"; version="1.0.0"; sha256="1ia4qfvj0nzxi6pwqnha2vpfcx3qwaw4vrjqiza11sai274j0pjy"; depends=[ca classInt cluster FactoMineR ggplot2 ggrepel Hmisc RcmdrMisc reshape2]; };
-  CAvariants = derive2 { name="CAvariants"; version="4.0"; sha256="16k25rhwzih1spbp0m80lv2vfrbm8l5ajkgp2i27gvnhhln227qm"; depends=[ggplot2 ggrepel gridExtra rgl]; };
+  CAvariants = derive2 { name="CAvariants"; version="5.0"; sha256="0y87xg2iwsmn8klavapncd7vkqvl15z9crmx3ja56ksb36czn8kk"; depends=[ggplot2 ggrepel gridExtra]; };
   CB2 = derive2 { name="CB2"; version="1.2.1"; sha256="089cf0pcy5xyzr6pl9ljqc52cy2bh2xfxhfh7iika2wv932wwq98"; depends=[dplyr ggplot2 glue magrittr metap pheatmap Rcpp RcppArmadillo stringr tibble tidyr]; };
   CBCgrps = derive2 { name="CBCgrps"; version="2.3"; sha256="07cy8z1fyr328jpa98sdxwd1vydx8sr93jx79hjn9hgm157240mg"; depends=[nortest]; };
   CBDA = derive2 { name="CBDA"; version="1.0.0"; sha256="0qm77vvqjgi83i8izly995ziv9ski8kgzqyq4g81i2k7a5dp8vxv"; depends=[doParallel foreach prettydoc SuperLearner]; };
-  CBPS = derive2 { name="CBPS"; version="0.20"; sha256="016fldahmivs8fr3nmm3azgivnnqgslhc62azcdkfgac37mpm5hw"; depends=[glmnet MASS MatchIt nnet numDeriv]; };
+  CBPS = derive2 { name="CBPS"; version="0.21"; sha256="0av9lgdn9z57xl9cp53pi9nq971a6fj4przczw7sdb5saml3yr30"; depends=[glmnet MASS MatchIt nnet numDeriv]; };
   CBT = derive2 { name="CBT"; version="1.0"; sha256="13h6sf7w03nfq2arqymwww13ywnv9xnqbqazlzn856mj3ggaqda7"; depends=[]; };
+  CC = derive2 { name="CC"; version="1.0"; sha256="189si37ggichqmzy8m686zw1cijix7yfy8ma5iqpnq1q9vm3pcvy"; depends=[]; };
   CCA = derive2 { name="CCA"; version="1.2"; sha256="00zy6bln22qshhlll0y0adnvb8wa1f7famqyws71b6pcnwxki5ha"; depends=[fda fields]; };
   CCAGFA = derive2 { name="CCAGFA"; version="1.0.8"; sha256="1jxb6d1h5p97wnr45s1fsspksqn771nib415ihxi4vj5w8s94j8b"; depends=[]; };
   CCM = derive2 { name="CCM"; version="1.2"; sha256="1mhl7yppniybdffylddbbb65n7gmv029fb46wlsxm4yf2xkplmwy"; depends=[]; };
@@ -538,7 +547,7 @@ in with self; {
   CCpop = derive2 { name="CCpop"; version="1.0"; sha256="10kgw3b98r0kn74w89znq6skgk8b3ldil6yb0hn5rlcf6lazjzca"; depends=[nloptr]; };
   CDFt = derive2 { name="CDFt"; version="1.0.1"; sha256="0sc8ga48l3vvqfjq3ak5j1y27hgr5dw61wp0w5jpwzjz22jzqbap"; depends=[]; };
   CDLasso = derive2 { name="CDLasso"; version="1.1"; sha256="0n699y18ia2yqpk78mszgggy7jz5dybwsi2y56kdyblddcmz1yv7"; depends=[]; };
-  CDM = derive2 { name="CDM"; version="7.3-17"; sha256="06487k920b7alp6b6115zdfb2laaaqwwlhc3zjpzchhsbc6ly4vy"; depends=[MASS mvtnorm polycor Rcpp RcppArmadillo sfsmisc]; };
+  CDM = derive2 { name="CDM"; version="7.4-19"; sha256="1ln1r3rk004fmk55iy08bjh3vv4wnkb8zg2wj3r9rq7pi8jn8fv4"; depends=[mvtnorm polycor Rcpp RcppArmadillo]; };
   CDNmoney = derive2 { name="CDNmoney"; version="2012.4-2"; sha256="1isbvfq0lygs75y1hn3klqms8q7g1xbkcr8fgj75h1c99d4khvm6"; depends=[]; };
   CDROM = derive2 { name="CDROM"; version="1.1"; sha256="0mvhqs4m8jp39x1rk31a1sqqmfq1avcnasgh8bizlyxx62igmi1b"; depends=[]; };
   CDVine = derive2 { name="CDVine"; version="1.4"; sha256="0cp78pb6yny4n5q2j9k6xdql588536572gbphnw8zkdmrg65qyz7"; depends=[igraph MASS mvtnorm]; };
@@ -579,11 +588,11 @@ in with self; {
   CMLS = derive2 { name="CMLS"; version="1.0-0"; sha256="1542qqsl6sksrcpwhnn55d260hkbmy4ikd0v2an96yxk5w95spvn"; depends=[quadprog]; };
   CMPControl = derive2 { name="CMPControl"; version="1.0"; sha256="0cp29cibiydawsl0cq433l9abdivr16b431zlrh45wzr5kzfcs0v"; depends=[compoisson]; };
   CMatching = derive2 { name="CMatching"; version="2.3.0"; sha256="0q0hplhsamj46z7g6pa7yg1bap5822ka1419yhcip551djhvnpmv"; depends=[lme4 lmtest Matching multiwayvcov]; };
-  CMplot = derive2 { name="CMplot"; version="3.3.3"; sha256="0p96cq37jkkqgq3l5kbi74w2j2p0a2cnjqvzalf2gzsv5zsakrir"; depends=[]; };
+  CMplot = derive2 { name="CMplot"; version="3.4.0"; sha256="1gbgwfxxg8x2bzkd0lvnf14rp3hvlqnw3p42i2jc720zgg1vrxl5"; depends=[]; };
   CNLTreg = derive2 { name="CNLTreg"; version="0.1-2"; sha256="07yi0ajil1113663v3gp5d3453r4l9qm442jnpydx4ygvjk7m2ha"; depends=[adlift miscTools nlt]; };
   CNLTtsa = derive2 { name="CNLTtsa"; version="0.1-2"; sha256="1vy0jjg6s8yvsvkx4pin183y5bnikm5cmjcpa9znz9dj1w6hwr5r"; depends=[adlift CNLTreg fields nlt]; };
   CNOGpro = derive2 { name="CNOGpro"; version="1.1"; sha256="1frsmhfqrlg1vsa06cabqmrzngq4p5gqwyb9qgnsgg81a9ybm6l8"; depends=[seqinr]; };
-  CNVScope = derive2 { name="CNVScope"; version="2.7.0"; sha256="1m5g6qfqlqnysqcmia54hasb1bdp70a1jzlqb8dz8830lzw797fi"; depends=[BiocManager biomaRt blockseg BSgenome_Hsapiens_UCSC_hg19 circlize data_table doParallel dplyr foreach GenomicFeatures GenomicInteractions GenomicRanges ggplot2 heatmaply HiCseg htmltools htmlwidgets igraph InteractionSet IRanges jointseg logging magrittr Matrix matrixStats numbers OpenImageR plotly plyr RCurl reshape2 rslurm rtracklayer S4Vectors shiny shinycssloaders shinyjs shinythemes spatialfil stringr tibble tidyr visNetwork]; };
+  CNVScope = derive2 { name="CNVScope"; version="2.7.2.5"; sha256="13hqgpdjarc9754ac08yw8hza1n1c693l3x9gzd4gz1p1h9yvdm2"; depends=[BiocManager biomaRt blockseg BSgenome_Hsapiens_UCSC_hg19 circlize data_table doParallel dplyr foreach GenomeInfoDb GenomicFeatures GenomicInteractions GenomicRanges ggplot2 heatmaply HiCseg htmltools htmlwidgets igraph InteractionSet IRanges jointseg logging magrittr Matrix matrixStats numbers OpenImageR plotly plyr RCurl reshape2 rslurm rtracklayer S4Vectors shiny shinycssloaders shinyjs shinythemes spatialfil stringr tibble tidyr visNetwork]; };
   CNprep = derive2 { name="CNprep"; version="2.0"; sha256="08dpjikx3ldqzw2kwb12q0kbw15qzl09srjdfs0sz9si0x6bfxs6"; depends=[mclust rlecuyer]; };
   CNull = derive2 { name="CNull"; version="1.0"; sha256="14hy86zg18hqxi63bfzrpkz70yrzfxp2v2pva5xnrvx9dmlyz820"; depends=[ape Matrix PhyloMeasures Rcpp]; };
   COBRA = derive2 { name="COBRA"; version="0.99.4"; sha256="1r1cw12d7c148pcgcg08bfsr1q1s736kfpyyss6b4d7ny7wgmqy4"; depends=[]; };
@@ -648,13 +657,13 @@ in with self; {
   CalSim = derive2 { name="CalSim"; version="0.3.2"; sha256="1a4w9kh9ykms1i30hhd7h8gdkbfl6g071jmcy26j1sbshxrnq8s1"; depends=[spatstat]; };
   Calculator_LR_FNs = derive2 { name="Calculator.LR.FNs"; version="1.3"; sha256="03qg9rnz623dwnp68xhhsh9788s49n6xp0migg1nnjaqhrahlgdd"; depends=[]; };
   CaliCo = derive2 { name="CaliCo"; version="0.1.1"; sha256="16a6hfd3s7dzb6mvpyn4fkdi5irfjsbal7niky2g6p54290va982"; depends=[coda DiceDesign DiceKriging ggplot2 gridExtra gtools MASS Matrix R6 Rcpp RcppArmadillo]; };
-  CalibratR = derive2 { name="CalibratR"; version="0.1.1"; sha256="0ka7amcml15qifwpw4phpn12r9qjn0dvlrlraf3af971yjmwc745"; depends=[doParallel fitdistrplus foreach ggplot2 pROC reshape2]; };
+  CalibratR = derive2 { name="CalibratR"; version="0.1.2"; sha256="1hnmhijckxd35h8mhpzqpglk1ykdih2c5kg17myc7cci5xjk9nfr"; depends=[doParallel fitdistrplus foreach ggplot2 pROC reshape2]; };
   CalibrateSSB = derive2 { name="CalibrateSSB"; version="1.1"; sha256="0rqa6xbxzqv0ks3i4pmmzczhf6g3ss6mb96g3d71y9xa6pzdxjjp"; depends=[survey]; };
+  CamelUp = derive2 { name="CamelUp"; version="0.1.1"; sha256="09i6bi2vnd7iyll9s8sbyy73l6kq8xrpf07qbcahs595x5iclgrg"; depends=[data_table R6 shiny shinyalert tidyverse]; };
   Canopy = derive2 { name="Canopy"; version="1.3.0"; sha256="0979hpphzhf4v71jx0shh3l8nffmpsn9l6f8ip2wxzcyx571i1wd"; depends=[ape fields pheatmap scatterplot3d]; };
   CarletonStats = derive2 { name="CarletonStats"; version="2.0"; sha256="0pgzvw6gf8kjv8ndprwp4wlgdgh5sb75ga8z5syfw57fb05v7ac3"; depends=[]; };
-  Cascade = derive2 { name="Cascade"; version="1.7"; sha256="110fmav17j17w98fz1fx5d731p5f4g3sc7bx187p1wgwiv6x9kkm"; depends=[abind animation cluster igraph lars lattice limma magic nnls survival tnet VGAM]; };
+  Cascade = derive2 { name="Cascade"; version="1.8"; sha256="0d75a9f43ligyjv62476plb86ipfq9y7g9njq4rx84cp17vbb662"; depends=[abind animation cluster igraph lars lattice limma magic nnls survival tnet VGAM]; };
   CascadeData = derive2 { name="CascadeData"; version="1.2"; sha256="0czc41f1vj61rkdl6gnnnga3qliyxp0ffl5j9wrhrlwnbdaknics"; depends=[]; };
-  CaseBasedReasoning = derive2 { name="CaseBasedReasoning"; version="0.1"; sha256="0hwll17j0br8sr0ci3bfa5rx4r36hr7myq7b5fav664zjxdh9wr4"; depends=[cowplot data_table dplyr magrittr R6 ranger Rcpp RcppArmadillo RcppParallel rms survival tidyverse]; };
   CatDyn = derive2 { name="CatDyn"; version="1.1-1"; sha256="0gkaxs7apqhq7mp3chjsyhrnk3qkk11f8p7smmyj6h73888ry8jn"; depends=[BB optimx]; };
   CatEncoders = derive2 { name="CatEncoders"; version="0.1.1"; sha256="1q9wzq06lac8z9y8b65alsxpb48bw8wqmifd893kknk51xq6r9kl"; depends=[data_table Matrix]; };
   CatPredi = derive2 { name="CatPredi"; version="1.1"; sha256="1fqz2mb3xhpzvamf0bpqfql3vd86vq6fq7n6p8xq7lraj1w77lys"; depends=[CPE mgcv rgenoud rms survival]; };
@@ -679,7 +688,7 @@ in with self; {
   ChangepointTesting = derive2 { name="ChangepointTesting"; version="1.0"; sha256="1nb78b1jpp0wpy9ah2fxkh53hlmb2f82b68msbfhancb8zp2lclv"; depends=[]; };
   ChannelAttribution = derive2 { name="ChannelAttribution"; version="1.16"; sha256="02kxybv9299j36xl4wk6d50crdnz0f6qbyxjiy6xf0s7hnlcr44c"; depends=[Rcpp RcppArmadillo]; };
   ChannelAttributionApp = derive2 { name="ChannelAttributionApp"; version="1.1"; sha256="0qy92ij1riynz7dhri3z85pafww5w9j1gx1bcgr8phlr32a7had7"; depends=[ChannelAttribution data_table ggplot2 shiny]; };
-  Chaos01 = derive2 { name="Chaos01"; version="1.2.0"; sha256="10780nxdakk4xnbzdnrcm3z66ipx5pf676n9s1arb4g624splc61"; depends=[]; };
+  Chaos01 = derive2 { name="Chaos01"; version="1.2.1"; sha256="1wk70l1y0yzbjcjp0r334l1q3hzki0vzn6wbza97mq9pz8wp050r"; depends=[]; };
   ChaosGame = derive2 { name="ChaosGame"; version="0.4"; sha256="10bq8i6b6zkg8nzq5np998xabyvijizxfbvw1m2nvfh74vxspj4p"; depends=[colorRamps ggplot2 gridExtra plot3D RColorBrewer rgl sphereplot]; };
   ChargeTransport = derive2 { name="ChargeTransport"; version="1.0.2"; sha256="0mq06ckp3yyj5g1z2sla79fiqdk2nlbclm618frhqcgmq93h0vha"; depends=[]; };
   CheckDigit = derive2 { name="CheckDigit"; version="0.1-1"; sha256="0091q9f77a0n701n668zaghi6b2k3n2jlb1y91nghijkv32a7d0j"; depends=[]; };
@@ -701,19 +710,21 @@ in with self; {
   Cite = derive2 { name="Cite"; version="0.1.0"; sha256="1gfjirhswh4dkz88z4gl8m8jznqrvcgd4z3mnszyg1k5w3avlf1q"; depends=[miniUI RefManageR rstudioapi shiny]; };
   CityPlot = derive2 { name="CityPlot"; version="2.0"; sha256="0lskgxmagqjglvpq39hgbygkf4qp28i2bj6b4m2av1s3pzb4465g"; depends=[]; };
   CityWaterBalance = derive2 { name="CityWaterBalance"; version="0.1.0"; sha256="0nvm6bv2cxszjf33xgn1xcvhrgrgbdcar0jahwf7bs03gdlpmgi1"; depends=[dataRetrieval dplyr EcoHydRology geoknife lubridate reshape2 tgp xts zoo]; };
-  Ckmeans_1d_dp = derive2 { name="Ckmeans.1d.dp"; version="4.2.2"; sha256="15arwppq78zvjxhvhm4kal0x0a9cwjbgmi5xhq3vch8ppwzvm2mh"; depends=[Rcpp]; };
+  Ckmeans_1d_dp = derive2 { name="Ckmeans.1d.dp"; version="4.3.0"; sha256="0xl587a4yym2a8b1csdgrj6fmggb3084pj3p7z4hqr2pq5jdyadk"; depends=[Rcpp Rdpack]; };
   Claddis = derive2 { name="Claddis"; version="0.3.0"; sha256="10r1v2nla43ckhbvdvldvpmcv0j966cdsasr3vgd5wfrca5jar73"; depends=[ape gdata phytools strap]; };
   ClamR = derive2 { name="ClamR"; version="2.1-1"; sha256="0raz1n79g24a9mc93zj49r20xcmdziw6vvcw5sd3qyjp1ycia13c"; depends=[]; };
   ClassComparison = derive2 { name="ClassComparison"; version="3.1.8"; sha256="0fd5s4697pvj295fzvvn5mislf42wfzrcvks17v98388rph586gl"; depends=[Biobase oompaBase]; };
   ClassDiscovery = derive2 { name="ClassDiscovery"; version="3.3.12"; sha256="1r9fri9mlvzhd5ki5spd6xqq6767p6hha72cr3r20s1z5327wkpy"; depends=[Biobase cluster mclust oompaBase oompaData]; };
   CleanBSequences = derive2 { name="CleanBSequences"; version="0.4.0"; sha256="12s24v2kfyc32pm34ibw58zzjqhzwlrqrkhl0m70jcqvn50b5r98"; depends=[Biostrings]; };
   ClickClust = derive2 { name="ClickClust"; version="1.1.5"; sha256="0b46f453mffg4ym6yvmh7g3v05mc9gphwfra75j28y1425s87yvw"; depends=[]; };
+  ClickClustCont = derive2 { name="ClickClustCont"; version="0.1.7"; sha256="1caymvpwvxq4rirnjm2kwzvqm1pl01rdc3785k8mq4k2m0n6l2rz"; depends=[gtools]; };
   CliftLRD = derive2 { name="CliftLRD"; version="0.1-1"; sha256="0qsdv568klxg6chgw329jbfjmf6w61hly2vxp90yzdfkca03z2s4"; depends=[CNLTreg liftLRD]; };
   ClimClass = derive2 { name="ClimClass"; version="2.1.0"; sha256="1r836md31z2r5d9xckkbalzbhm4kf5paljv71kxpy53q92k7yi91"; depends=[geosphere ggplot2 reshape2]; };
   ClimDown = derive2 { name="ClimDown"; version="1.0.2"; sha256="0dbv5vn985bi9nqxhq7jcj6k38s8dlbqnln3adgd0ih2fwilvalg"; depends=[abind fields foreach ncdf4 PCICt seas udunits2]; };
   ClimInd = derive2 { name="ClimInd"; version="0.1-2"; sha256="0brimmkr8ccdbpmcmgbd8ydx4cy0yblfrzcgx151x83wskzq04sj"; depends=[chron SPEI weathermetrics]; };
+  ClimMobTools = derive2 { name="ClimMobTools"; version="0.2-7"; sha256="0y2dhf7j230hvsi54dl08ds170ad7aww4c8gk0f5c2v2zfxkbya8"; depends=[httr jsonlite Matrix nasapower PlackettLuce raster RSpectra tibble tidyr]; };
   ClimProjDiags = derive2 { name="ClimProjDiags"; version="0.0.4"; sha256="1819kv0h7qh285nykncdqr808b9v5fviccr0fbv2im7zni497scq"; depends=[climdex_pcic multiApply PCICt plyr]; };
-  ClinReport = derive2 { name="ClinReport"; version="0.9.1.12"; sha256="0c0ixr28p8gj3mx2pkrmjvs13g9h8fv1y6ririvrwkbmrdikq7g3"; depends=[dplyr emmeans flextable ggplot2 officer reshape2 xtable]; };
+  ClinReport = derive2 { name="ClinReport"; version="0.9.1.14"; sha256="140hpg6ybz1rlql06gk851fcvlb2k53kp46dq22cbs36frggk3rj"; depends=[car dplyr emmeans flextable ggplot2 lme4 officer reshape2 xtable]; };
   ClinicalTrialSummary = derive2 { name="ClinicalTrialSummary"; version="1.1.1"; sha256="0b5by4sn9yvrvxr9921yqsgp8ma3g1hi2qbp5j9m836db1zjhyla"; depends=[Rcpp]; };
   CloneSeeker = derive2 { name="CloneSeeker"; version="1.0.7"; sha256="07rh577m7xp6v0adchp0mbfs0mkglpv7p27794rm958nvfsmffds"; depends=[combinat gtools quantmod]; };
   ClueR = derive2 { name="ClueR"; version="1.4"; sha256="0awl3ag48idg0396hcgqrh5f16mbgximr5xbxjiimib5zysdc558"; depends=[e1071]; };
@@ -735,11 +746,12 @@ in with self; {
   CoDiNA = derive2 { name="CoDiNA"; version="1.1.1"; sha256="00kda4grizdgh9xs0vywg9npjj7i97vbdf0hvzl96657rcillwdh"; depends=[data_table igraph magrittr plyr visNetwork]; };
   CoFRA = derive2 { name="CoFRA"; version="0.1002"; sha256="0ldf84dxaanww3qkf64mz5gv3yv2rjp9m6dy64xckds66vw6x0m3"; depends=[gplots stringr]; };
   CoImp = derive2 { name="CoImp"; version="1.0"; sha256="06y722flpiqpwq0p7ik86s09mdnvqw3hdybhdzn8vfns5swc8x1y"; depends=[copula gtools locfit nnet]; };
-  CoRpower = derive2 { name="CoRpower"; version="1.0.2"; sha256="1kiljppp96iykc1m3im10nsgpqia1vqcwqxpsb53hkb7b7yz4pfg"; depends=[osDesign survival]; };
+  CoRpower = derive2 { name="CoRpower"; version="1.0.3"; sha256="007v6khv2kkf398cqy3vjv0ncd7zc8ad084a5qhpplsnj1f3ll2j"; depends=[osDesign survival]; };
   CoSMoS = derive2 { name="CoSMoS"; version="1.0.1"; sha256="1kh1ka428vv99vwxajyvaz9n5d1ss6h03w7kwwp89hjxrm8wnrc2"; depends=[data_table ggplot2 nloptr pracma]; };
   CodataGS = derive2 { name="CodataGS"; version="1.43"; sha256="1bjn6s1f5jn64gwrvjz5kvwfkbqrqhavib6dj9k37rb5nzqkwhp6"; depends=[Matrix]; };
   CodeDepends = derive2 { name="CodeDepends"; version="0.6.5"; sha256="0l7kiv3awx50glf5cs841b4zzsff1ml90f0zr868ygvwsr4ps1hq"; depends=[codetools graph XML]; };
   CoinMinD = derive2 { name="CoinMinD"; version="1.1"; sha256="0invnbj5589wbs0k2w5aq9qak7axc3s0g9nw85c48lnl0v95s91i"; depends=[MCMCpack]; };
+  Coinprofile = derive2 { name="Coinprofile"; version="0.1.9"; sha256="1bcip62gm34cx5m8a1mx9px2rhgvdmsgnn6q9q40k8p5hw4cx9g0"; depends=[coin exactRankTests ggplot2 plyr Rdpack zoo]; };
   CollapsABEL = derive2 { name="CollapsABEL"; version="0.10.11"; sha256="0libm1wv34av3vm2vvbqcnxjh4y1rwfi8qzjca8qdz9490vngags"; depends=[biganalytics bigmemory collUtils dplyr ggplot2 haplo_stats R_utils rJava RSQLite stringr]; };
   CollapseLevels = derive2 { name="CollapseLevels"; version="0.2.0"; sha256="1fn5k83lh0vw5j9vhq0x6ksbkrm25acpslav85wfyknsj9vzmzid"; depends=[dplyr ggplot2 lazyeval magrittr]; };
   CollessLike = derive2 { name="CollessLike"; version="1.0"; sha256="080mrvszysdqvx03sd4aczvhs1zmhc6fx8zp5nwrh7mmyajslxkx"; depends=[ape igraph]; };
@@ -781,18 +793,21 @@ in with self; {
   ConjointChecks = derive2 { name="ConjointChecks"; version="0.0.9"; sha256="097mhiz8zjmmkiiapr3zfx7v35xirg57nqp1swd72dixaa23nhr1"; depends=[]; };
   ConnMatTools = derive2 { name="ConnMatTools"; version="0.3.3"; sha256="0zsn3al3di0fd9hkqljpqqy4zbmh97xr6cdi4fzv80ax81fjfqyk"; depends=[]; };
   ConsRank = derive2 { name="ConsRank"; version="2.0.1"; sha256="18f1gqa46f8jrcf2zj4njyy78cl0scjs9k8s9mvg0f9dpr44xnan"; depends=[gtools proxy rgl]; };
+  ContaminatedMixt = derive2 { name="ContaminatedMixt"; version="1.3.4"; sha256="148zpk5a091kxrn6f73k6piwfwbqdmiyd48qinn6cbfma012n13w"; depends=[caret mclust mixture mnormt mvtnorm]; };
   ContourFunctions = derive2 { name="ContourFunctions"; version="0.1.1"; sha256="00p5bdiq8hj95lkr86iwyh50qw0d0d4gs9hhbzcix6lwn8dwqd3s"; depends=[]; };
   ConvergenceClubs = derive2 { name="ConvergenceClubs"; version="1.4.3"; sha256="0glfnwmfs6xv4d1h5y0859srvj3y68192589mdjcx0jgkgk2c9np"; depends=[lmtest sandwich]; };
-  ConvergenceConcepts = derive2 { name="ConvergenceConcepts"; version="1.2.1"; sha256="0kl67ds6369mxl2i93h43r00ji12qkg0k9m4jhcxsb0ydd8rfqgp"; depends=[lattice tkrplot]; };
+  ConvergenceConcepts = derive2 { name="ConvergenceConcepts"; version="1.2.2"; sha256="1pvcl0bgd4anrbn6wqxsd1s23ycsc7jhrk94yzwx67xx0qs9mmrw"; depends=[lattice tkrplot]; };
   CoopGame = derive2 { name="CoopGame"; version="0.2.1"; sha256="1c11b5l6r5csa6zw5a6lfqaygzhnp5jfdf0vkrxpl7fb4bbxhm31"; depends=[geometry gtools rcdd rgl]; };
   CoordinateCleaner = derive2 { name="CoordinateCleaner"; version="2.0-11"; sha256="0z1ksim2chwg5acbvav0dzsrnzch1qmbvr2k0dhjmn8lr9rdk4m5"; depends=[dplyr geosphere ggplot2 raster rgbif rgdal rgeos rnaturalearth sp tidyselect]; };
   CopCTS = derive2 { name="CopCTS"; version="1.0.0"; sha256="1j0bhkjk181y9k69442diswgwax5whmh5vfqydhf3b1r5ll1wkm3"; depends=[copBasic copula msm]; };
   Copula_Markov = derive2 { name="Copula.Markov"; version="2.4"; sha256="1qzc1clj6i1msqy6405w2vqxsx8hyzhd4zz6cqirv1zl4r2743vv"; depends=[]; };
+  Copula_Markov_survival = derive2 { name="Copula.Markov.survival"; version="0.1.0"; sha256="1r9m96r0mqqjlawhlb9d8d1hf2k2bkal2fmw6g0zabdjb19c75y7"; depends=[survival]; };
   Copula_surv = derive2 { name="Copula.surv"; version="1.0"; sha256="1cq12vmsvrxd6anpv6b5jig7x1lf6pj589353h2ba9k0fhkpk51y"; depends=[]; };
   CopulaCenR = derive2 { name="CopulaCenR"; version="1.1.2"; sha256="1ksxqgb91vww5q4njidchxwia64g5229dvpxhqhfp8w6hvmib1k1"; depends=[caret copula corpcor flexsurv icenReg magrittr plotly pracma survival]; };
   CopulaDTA = derive2 { name="CopulaDTA"; version="1.0.0"; sha256="1bx0jvlbhaxf4yhrfpd5l5zp7kmp6f17ckb1y9974sgc7s3hpqcd"; depends=[ggplot2 plyr reshape2 rstan]; };
   CopulaREMADA = derive2 { name="CopulaREMADA"; version="1.3"; sha256="152g8nfa3ksj0dlzlch9a6g18b1vi6dlw748a6m55haghchbyr9l"; depends=[matlab mc2d statmod tensor]; };
   CopyDetect = derive2 { name="CopyDetect"; version="1.3"; sha256="1g3bwd805h62x93xvvn67acf9v6vn7s7ghxpvjhwcfdfj7fwzh6l"; depends=[mirt]; };
+  CorBin = derive2 { name="CorBin"; version="0.3.1"; sha256="1jkrqy8z54jizbhnjdrhmbvv02kv237rgjpjwnzxcs04q8lqvqjm"; depends=[]; };
   CorDiff = derive2 { name="CorDiff"; version="1.0"; sha256="12rgfhygrdq1ign4ybr8g171wxic8zbp83n1xdsnqpj910k5jdr5"; depends=[mcc]; };
   Corbi = derive2 { name="Corbi"; version="0.4-4"; sha256="0s56hl2hr73kf8y7syq441wy1b9gjjcnvpgdigcc9g7gi0bkjx35"; depends=[CRF Matrix mpmi]; };
   CoreGx = derive2 { name="CoreGx"; version="0.1.0"; sha256="1hw7hnd259cspy043js8rv5mb600j3kdhrcq9iva0nmy1qayxdbl"; depends=[Biobase lsa piano rlang]; };
@@ -806,11 +821,11 @@ in with self; {
   Correlplot = derive2 { name="Correlplot"; version="1.0-2"; sha256="0prxnbi7ga5d23i0i4qpynfb3zrsgjxam47km6nsj1prakdkrq7w"; depends=[calibrate xtable]; };
   CosW = derive2 { name="CosW"; version="0.1"; sha256="12l4w8b5jnr8773hxk7khrdn705x6bdbw7s8z8w95bfbbi12dj6v"; depends=[fdrtool pracma]; };
   Counterfactual = derive2 { name="Counterfactual"; version="1.1"; sha256="0mz0h5zsmca8fww7nq08m9cld2zbaydn8qad5f2g6vxn382842p9"; depends=[doParallel doRNG foreach Hmisc quantreg survival]; };
-  Countr = derive2 { name="Countr"; version="3.5.2"; sha256="0f45pxxl09avf4k6lzlhykd1y07hvpc3d68bc2y7nrxhpipwl5yl"; depends=[boot car dplyr flexsurv Formula lattice lmtest MASS Matrix numDeriv optimx pscl RColorBrewer Rcpp RcppArmadillo Rdpack standardize VGAM xtable]; };
+  Countr = derive2 { name="Countr"; version="3.5.4"; sha256="10fzmqncbnr47x35xqpsmwzadv9j6r2svisrv8vfpp27mlvp9qwr"; depends=[boot car dplyr flexsurv Formula lattice lmtest MASS Matrix numDeriv optimx pscl RColorBrewer Rcpp RcppArmadillo Rdpack standardize VGAM xtable]; };
   CountsEPPM = derive2 { name="CountsEPPM"; version="3.0"; sha256="0iw7sfrb4yyaagwm1f4q9av5zvzia1mp2ns287ppsw3k248lz0kb"; depends=[expm Formula lmtest numDeriv]; };
   CovSel = derive2 { name="CovSel"; version="1.2.1"; sha256="02fsiykbg96ynqw25vfyrams7fs39xjmfhvb23zjbqb7ql6d0xdk"; depends=[dr MASS np]; };
   CovSelHigh = derive2 { name="CovSelHigh"; version="1.1.1"; sha256="0dvvpkqml2k00gicpgp475z1rjspq3s37ys1mam29k54qlshhny6"; depends=[bartMachine bindata bnlearn doParallel doRNG foreach glmnet MASS Matching randomForest tmle xtable]; };
-  CovTools = derive2 { name="CovTools"; version="0.5.1"; sha256="0fz7cvyfnf082kf5wymds3rzn4qln4s371i2qlpcmqgsszcxjkvj"; depends=[doParallel expm foreach geigen Matrix mvtnorm pracma Rcpp RcppArmadillo Rdpack shapes]; };
+  CovTools = derive2 { name="CovTools"; version="0.5.2"; sha256="10qxfl3i7ahx4lv2hpicps56p150v59drrjbx5csb7d8jzc0pj5z"; depends=[doParallel expm foreach geigen Matrix mvtnorm pracma Rcpp RcppArmadillo Rdpack shapes SHT]; };
   CoxBoost = derive2 { name="CoxBoost"; version="1.4"; sha256="1bxkanc8zr4g3abn4ds5wqibv65flvm4y648fs9s0l4vc9vmyshg"; depends=[Matrix prodlim survival]; };
   CoxPhLb = derive2 { name="CoxPhLb"; version="1.2.0"; sha256="0jlh2k5ygj896sfx7dcw5qlb80bl64rsvqfayv0c6a107bmrzsw4"; depends=[survival]; };
   CoxPlus = derive2 { name="CoxPlus"; version="1.1.1"; sha256="038wsz206bgc0pnzx403b5ihcwhxpkrpxmwvrvqcxf8333pb62l5"; depends=[Rcpp RcppArmadillo]; };
@@ -820,6 +835,7 @@ in with self; {
   Cprob = derive2 { name="Cprob"; version="1.4.1"; sha256="1m4ys8xpj1jbn3lf8fym935y94dxipiimsf9zxwyw5sy71y7skgq"; depends=[geepack lattice lgtdl prodlim tpr]; };
   CreditMetrics = derive2 { name="CreditMetrics"; version="0.0-2"; sha256="16g3xw8r6axqwqv2f0bbqmwicgyx7nwzff59dz967iqna1wh3spi"; depends=[]; };
   CreditRisk = derive2 { name="CreditRisk"; version="0.1.3"; sha256="09ks8xlsrbp3an1drcwmmd6df4fsfz61z21ma2p62a1pk0bnc86c"; depends=[fOptions]; };
+  CropDetectR = derive2 { name="CropDetectR"; version="0.0.1"; sha256="14sabqld94if7f2m39bh6652cb62hcwx53k8q5k23anzzsn93qlj"; depends=[dplyr EBImage imager reshape2]; };
   CrossClustering = derive2 { name="CrossClustering"; version="4.0.3"; sha256="05lbdmblwmmv24h46ixxabbrp7mpajyv7raw1p5h0dmsbfbq9hi5"; depends=[assertive cli cluster crayon dplyr flip glue magrittr mclust purrr]; };
   CrossScreening = derive2 { name="CrossScreening"; version="0.1.1"; sha256="1gig80r8p611ysn35ajx7xdjj5wnkcf1vspcf0i06dmh75xpm3w9"; depends=[plyr tables]; };
   CrossVA = derive2 { name="CrossVA"; version="0.9.9"; sha256="0k2czhnb3jws86p2iv9fv3qarxbh1dd4xxnv2hdwz0y82y6mkkvx"; depends=[stringi]; };
@@ -845,8 +861,9 @@ in with self; {
   DAIME = derive2 { name="DAIME"; version="1.1"; sha256="0kgss7gdwn1fd25arcwai915gm18qm5ffpq4f7qj2pg0lk4hvp0r"; depends=[]; };
   DAISIE = derive2 { name="DAISIE"; version="1.4"; sha256="16653wwz20lhf3bpzflpj5d1h7j3cqyfaqk5gn24aifga2jc0wbb"; depends=[DDD deSolve Matrix subplex tensor]; };
   DAKS = derive2 { name="DAKS"; version="2.1-3"; sha256="0vmpwxvksnmyq40faimbgpj0y3zbk519986n38ipwdfzllcg0zs4"; depends=[relations sets]; };
-  DALEX = derive2 { name="DALEX"; version="0.4.4"; sha256="04i17ni8g595jj8dxdfwr9vsxmdn2kkam90ab68vlwws3ywqjl6r"; depends=[ggplot2]; };
+  DALEX = derive2 { name="DALEX"; version="0.4.7"; sha256="0iiwkf0pfdb90lf1xhv43qd32z3cjmkmf0ly9841n5lldkjazy3h"; depends=[ggplot2]; };
   DALEX2 = derive2 { name="DALEX2"; version="0.9"; sha256="1k39gswksicrb60nx7zzna3mqdm36ckg590iw511ga7frnb8fjl9"; depends=[]; };
+  DALEXtra = derive2 { name="DALEXtra"; version="0.1.8"; sha256="17pn8jb1jr9k4ji368didiszp7fi1v8ngffb9sbhcqgn1c0dnmjb"; depends=[DALEX ggplot2 reticulate]; };
   DALY = derive2 { name="DALY"; version="1.5.0"; sha256="1v7ld01xcn5jiygl1c3xhd5h71ip90lks87fs9gmpnivp8jz5cr5"; depends=[]; };
   DAMOCLES = derive2 { name="DAMOCLES"; version="1.1"; sha256="07z8mynhqnk1zcvm84w09xzkiy2dfxwhmnpi6gaddr3p0waql4gj"; depends=[ape caper deSolve expm geiger matrixStats picante]; };
   DAMisc = derive2 { name="DAMisc"; version="1.5"; sha256="1m418lmzy4sv5hj90j4r4j1bb2q43hxnmpd0mp16010fyr0asbcy"; depends=[AICcmodavg boot car coda effects fANCOVA games gdata lattice latticeExtra MASS nnet optiscale pscl QRM rstan VGAM xtable]; };
@@ -870,10 +887,10 @@ in with self; {
   DCchoice = derive2 { name="DCchoice"; version="0.0.15"; sha256="1qdqn45ipq0806r25ri4aygzq48k8j5k8rlhi1cafym421yq6bfg"; depends=[Formula interval MASS]; };
   DChaos = derive2 { name="DChaos"; version="0.1-2"; sha256="045zlc9c3cs90dcdrrwwszwrh1n93mdkw6q52l3aq1ln7ywrjlgc"; depends=[NeuralNetTools nnet outliers pracma sandwich xts zoo]; };
   DCluster = derive2 { name="DCluster"; version="0.2-7"; sha256="008nyry64s5g80narcc58273v0jhqzfgwynka6mh7jgi7qsqnxjd"; depends=[boot MASS spdep]; };
-  DClusterm = derive2 { name="DClusterm"; version="0.2-1"; sha256="1xnnm73ivz4pgsszjj5wxzq1f2az110wmn88j89xy2wgk8rp0rab"; depends=[DCluster gridExtra latticeExtra lme4 pscl RColorBrewer sp spacetime xts]; };
+  DClusterm = derive2 { name="DClusterm"; version="1.0-0"; sha256="19ifnj7y3zjp15hd6mafjjqbqqyff17zd0ivnl8bd843nalgfxbb"; depends=[DCluster gridExtra latticeExtra lme4 pscl RColorBrewer sp spacetime xts]; };
   DDD = derive2 { name="DDD"; version="4.1"; sha256="09aif9agypw765h148615b6dcjhzw1bvgrzz9dka6n3vk4r1lj5d"; depends=[ape deSolve expm Matrix phytools SparseM subplex]; };
   DDHFm = derive2 { name="DDHFm"; version="1.1.2"; sha256="0lgh6kcfas06p2yy7zy21r05k5521xbj5af3wwwssp5li1cia35g"; depends=[lokern wavethresh]; };
-  DDIwR = derive2 { name="DDIwR"; version="0.3"; sha256="0jz8fkgjyrr5g3hm9zjafaxh2ry817ad68c1rv6giykgvzs2l2fn"; depends=[admisc haven readr tibble xml2]; };
+  DDIwR = derive2 { name="DDIwR"; version="0.4"; sha256="0z994anrw746iy83503bah2n39rd7qvx4spxn4qwhxhxbjp4gkfw"; depends=[admisc haven readr tibble xml2]; };
   DDM = derive2 { name="DDM"; version="1.0-0"; sha256="19g06qk3lzasj294x9wfij729mlq6ryvjqkn3rgl5xp1w0gx9wi2"; depends=[]; };
   DDPGPSurv = derive2 { name="DDPGPSurv"; version="1.0"; sha256="1d271yv621jmwd4dmdnhpwrk95gbpw7g6r2v05lc3d6wzlzpd78c"; depends=[MASS mc2d mvnfast Rcpp RcppArmadillo survival]; };
   DDPNA = derive2 { name="DDPNA"; version="0.2.1"; sha256="0854zs6gay78dq0ivpmkrhg387llk0mbfjz8nkvhnkss0mh6bpmk"; depends=[ggalt ggplot2 Hmisc igraph MEGENA plyr scales VennDiagram]; };
@@ -882,7 +899,7 @@ in with self; {
   DECIDE = derive2 { name="DECIDE"; version="1.2"; sha256="18kn2pm9r0ims2k1jfsfzh258wwxz0xg86rsbwgq6szh0azlq3qy"; depends=[]; };
   DEEPR = derive2 { name="DEEPR"; version="0.1"; sha256="0q8970q3gpjxwxdf2bkhpnqrxpm00w27b20a9sn9vv314rn1n7s8"; depends=[dirmult]; };
   DEEVD = derive2 { name="DEEVD"; version="0.1.0"; sha256="037h40mi4ka5w6m6bhry5mk7rcchss07vn08pzcyikcllnnn2vaf"; depends=[evd]; };
-  DELTD = derive2 { name="DELTD"; version="0.1.0"; sha256="05kj07lxav7b16ndmzakd29bpy0h3y2cmx6if7x7hyy7vnkj3c38"; depends=[]; };
+  DELTD = derive2 { name="DELTD"; version="1.3.1"; sha256="091ln4zyvz0pbn17y5z4kpaw3dvb338k96bqd84ajazcm41q83lx"; depends=[]; };
   DEMEtics = derive2 { name="DEMEtics"; version="0.8-7"; sha256="1s59qim60d4gp5rxjacdbmxdbpdm7cy9samn088w8fs0q232vjjx"; depends=[]; };
   DEMOVA = derive2 { name="DEMOVA"; version="1.0"; sha256="09dqhhhihphhdnplmhdq4q5zwc0qvqhirdrxa9x6fr43vwa5zfp4"; depends=[leaps]; };
   DES = derive2 { name="DES"; version="1.0.0"; sha256="16p38i8ykwc8gjw6c9dhdwjjpa1b17n9wqhz3rhkbzjh978pky31"; depends=[]; };
@@ -909,7 +926,7 @@ in with self; {
   DIconvex = derive2 { name="DIconvex"; version="1.0.0"; sha256="0bnrq9nmryshir6ll43nz20aaqmmw0zjvfml72cpwbvrma8a3qmz"; depends=[lpSolveAPI]; };
   DJL = derive2 { name="DJL"; version="3.0"; sha256="1zsr2smgw7p6llyn1ipq8pkr2f8balvvp52x1j713alx6w5g26z7"; depends=[car lpSolveAPI]; };
   DLASSO = derive2 { name="DLASSO"; version="2.0.2"; sha256="0xdygf6h89d9z4kqb46iqfxgdzq9dmkrxf9ypw78l4d8n9xx2gaa"; depends=[MASS]; };
-  DLMtool = derive2 { name="DLMtool"; version="5.3.1"; sha256="07rijmqfdy238xrs9fz4glqn2ppsyfkzcgyc0dnj9scvvc9sag5w"; depends=[abind boot broom devtools dplyr DT fmsb ggplot2 ggrepel gridExtra kableExtra knitr MASS mvtnorm openxlsx purrr Rcpp RcppArmadillo readxl rfishbase rmarkdown shiny snowfall tidyr]; };
+  DLMtool = derive2 { name="DLMtool"; version="5.4.0"; sha256="0412723k06ynm5f8jg8byqdx2v46g060nfbv9c5js8qxn4snz5kc"; depends=[abind boot broom crayon devtools dplyr DT fmsb ggplot2 ggrepel gridExtra kableExtra knitr MASS mvtnorm openxlsx purrr Rcpp RcppArmadillo readxl rfishbase rmarkdown shiny snowfall tidyr]; };
   DMMF = derive2 { name="DMMF"; version="0.5.0.2"; sha256="02sk1ykispkjdclsi5xp1m4vmf8mhcqm4q2z73xanvax1kqfb3v3"; depends=[raster rgdal sp]; };
   DMRMark = derive2 { name="DMRMark"; version="1.1.1"; sha256="15wr6j0v9kvbv8y6flkp4svfqy059ziv89nxv91vp0pjmavhpdlz"; depends=[ellipse MCMCpack mvtnorm]; };
   DMRnet = derive2 { name="DMRnet"; version="0.2.0"; sha256="1rbba8w4li240gw5z675d7skm72rh0zxzp4rhsn6ivj72jya7jw4"; depends=[glmnet grpreg]; };
@@ -923,18 +940,21 @@ in with self; {
   DOBAD = derive2 { name="DOBAD"; version="1.0.6"; sha256="0ifrrfm4yp1416z58qgnak042rgj1xvqby2vvzgrv19z6b3250p3"; depends=[lattice Matrix numDeriv]; };
   DODR = derive2 { name="DODR"; version="0.99.2"; sha256="16ia9j8vab8n2i6a17wz8nfvkfgj2gsyhxvwgxvjg2cz99hsbhdj"; depends=[Matrix npsm Rfit]; };
   DOS = derive2 { name="DOS"; version="1.0.0"; sha256="0vvkwn4wfvspbk74nb6124hdx9158h6yfksib14xqq7rx7c97ad4"; depends=[MASS]; };
+  DOS2 = derive2 { name="DOS2"; version="0.5.2"; sha256="0lcqk2fxfl5pdnxlpppqiqnyc23jyhp1kcxwci8ilagjv4djipmw"; depends=[MASS sensitivity2x2xk sensitivitymult sensitivitymv senstrat]; };
   DOT = derive2 { name="DOT"; version="0.1"; sha256="0qh5n57cp9c2n5yn59q4wggz82943pwfanp3kx869aba2x3sj30i"; depends=[V8]; };
   DOvalidation = derive2 { name="DOvalidation"; version="1.1.0"; sha256="1mzws3w7djpxnfqxjcqwgia7p17kb0qlnzj6qcfg2m1vamb1cn2z"; depends=[]; };
   DPBBM = derive2 { name="DPBBM"; version="0.2.5"; sha256="1qypxrcm3sb727lqb09ssjf3hblixqayw3qsyql01imrxwm609i2"; depends=[CEoptim gplots tmvtnorm VGAM]; };
   DPP = derive2 { name="DPP"; version="0.1.2"; sha256="1qalcm4gwh03qpy07d0p323ccq8xmk04v6z30g7wg6ic613bqg7m"; depends=[coda Rcpp]; };
-  DPWeibull = derive2 { name="DPWeibull"; version="1.3"; sha256="143mvynkb6k7fbaxlyisw7a4acssqjyh7jld5myz55ns3r3fablw"; depends=[matrixStats Rcpp truncdist]; };
+  DPQ = derive2 { name="DPQ"; version="0.3-3"; sha256="1s9jlk390cvmk9vvz1lw2qh5j73m3sf663j8ih8fckp0phz1sc3j"; depends=[sfsmisc]; };
   DPtree = derive2 { name="DPtree"; version="1.0.1"; sha256="0d7zf695lwkx4gv50f08cbi3p3mjjay0qgrbmvybf9m15i4zmyd7"; depends=[MASS MCMCpack plyr Rdpack]; };
+  DRAFT = derive2 { name="DRAFT"; version="0.3.0"; sha256="02y644fl5dk3qwvv45vb2zkkp4x1zciickna0pj56myh7ls08hxv"; depends=[coda ggplot2 gridExtra lubridate reshape]; };
+  DRAYL = derive2 { name="DRAYL"; version="1.0"; sha256="0cf5pyx6nwh8srdylpnmymv3dr67fm6qqpwd1hvj1wmyfc8fznpp"; depends=[cubature pracma RConics rmutil]; };
   DREGAR = derive2 { name="DREGAR"; version="0.1.3.0"; sha256="15cplshs85r0z659mc7xmj5db7vc95wxs01c34isc22p8z0a287i"; depends=[msgps]; };
-  DRHotNet = derive2 { name="DRHotNet"; version="1.0"; sha256="0lfhypcc222lrsgiya4xh2b524p2xg92ww2f3filjw4qhvi6q5k9"; depends=[maptools raster sp spatstat spdep]; };
+  DRHotNet = derive2 { name="DRHotNet"; version="1.1"; sha256="040g9h2a2hmnd20y41xnms01iam68f6xhp2x0ckarmx961995bhg"; depends=[maptools PBSmapping raster sp spatstat spdep]; };
   DRIP = derive2 { name="DRIP"; version="1.4"; sha256="1rds1161h19waqhiq08hqk5zcn48afccaggmb42xr1zyk31irpi6"; depends=[readbitmap]; };
   DRR = derive2 { name="DRR"; version="0.0.3"; sha256="1yd1fvllfkcrwg9v322n4wkk4q4q84nvy58y4vac9pdr3yf3i4vl"; depends=[CVST kernlab Matrix]; };
   DRaWR = derive2 { name="DRaWR"; version="1.0.1"; sha256="1pfdczwzd236c64yw94bgbk0hbl4dhlgjfjwkljmqgqrzsddvgqh"; depends=[Matrix ROCR]; };
-  DRomics = derive2 { name="DRomics"; version="1.0-2"; sha256="0kvhby807h4ilmrlbcxlmw3rncvg9i428n8rl40v2w865a0p6861"; depends=[ggplot2 limma]; };
+  DRomics = derive2 { name="DRomics"; version="2.0-1"; sha256="0lfjk202fgvxjljjpakbmdqc41hbpgl39lym215hlqksfpi0jq7a"; depends=[DESeq2 ggplot2 limma]; };
   DSAIDE = derive2 { name="DSAIDE"; version="0.8.2"; sha256="00qpnqqdzj8bfg2i04w47hq7by7p17n6prp7w5vzis72y7s3d07l"; depends=[adaptivetau deSolve dplyr ggplot2 gridExtra lhs nloptr plotly shiny XML]; };
   DSAIRM = derive2 { name="DSAIRM"; version="0.8.2"; sha256="05m6hm9h8f41n3wswbp7z80kfvmn65jypj9fwlv3k8bdm4lw1mla"; depends=[adaptivetau boot deSolve dplyr ggplot2 gridExtra lhs nloptr plotly shiny XML]; };
   DSBayes = derive2 { name="DSBayes"; version="1.1"; sha256="0iv4l11dww45qg8x6xcf82f9rcz8bcb9w1mj7c7ha9glv5sfb25v"; depends=[BB]; };
@@ -943,7 +963,7 @@ in with self; {
   DSsim = derive2 { name="DSsim"; version="1.1.4"; sha256="0cspyd6msh8aci3w1fv234ca2bwpi6ylkbl45d4k0v3wzzfj20hk"; depends=[fields mgcv mrds rgeos shapefiles sp splancs]; };
   DStree = derive2 { name="DStree"; version="1.0"; sha256="14wba25ylmsyrndh007kl377dv4r34wr1555yxl6kyxrs4yg3jir"; depends=[Ecdat pec Rcpp rpart rpart_plot survival]; };
   DSviaDRM = derive2 { name="DSviaDRM"; version="1.0"; sha256="1hj2pgnldrpgapwwz1kf4k6mvyzwdvb1i6czd7sbimsx5hafwps8"; depends=[igraph ppcor]; };
-  DT = derive2 { name="DT"; version="0.7"; sha256="0b6ywgzk9b35y5f69zwfz3vv7qwqqj3xsmy0xymf7nfcvrqg3qqx"; depends=[crosstalk htmltools htmlwidgets magrittr promises]; };
+  DT = derive2 { name="DT"; version="0.9"; sha256="17han4560jv8mmfn4f8adrwh0x25fxz2qwd0sv7vv4iky5and8a7"; depends=[crosstalk htmltools htmlwidgets jsonlite magrittr promises]; };
   DTAT = derive2 { name="DTAT"; version="0.3-3"; sha256="184b8qkwqlygdqzad2x2qf4hdrpsr7yffmf21jrz5yf946y621wl"; depends=[data_table dplyr Hmisc jsonlite km_ci pomp r2d3 shiny survival]; };
   DTAXG = derive2 { name="DTAXG"; version="0.1.0"; sha256="1jxa0ix0z35i0xdnjl698j8iqjmp6nz8ckah9bap5ay9rkq0xd7f"; depends=[]; };
   DTComPair = derive2 { name="DTComPair"; version="1.0.3"; sha256="1af2293ckkpz0gjcibgzzvz37852cav4wa4girpc87yn3p4ajlri"; depends=[gee PropCIs]; };
@@ -954,8 +974,8 @@ in with self; {
   DTMCPack = derive2 { name="DTMCPack"; version="0.1-2"; sha256="0bibas5cf06qq834x9q2l2fyh6q9wrg07k8cn6almcyirzax6811"; depends=[]; };
   DTR = derive2 { name="DTR"; version="1.7"; sha256="1lzvk9ar6xf3n2vvy8vb9mvrbx3nafzzhvz5g7vf79jd71yz54jd"; depends=[aod ggplot2 survival]; };
   DTRlearn2 = derive2 { name="DTRlearn2"; version="1.0"; sha256="0aly8byygpgsjfa1lzarcig2dvz852ihdlw7xhb7kx62y8prjzz1"; depends=[foreach glmnet kernlab MASS Matrix]; };
-  DTRreg = derive2 { name="DTRreg"; version="1.3"; sha256="1144kcqblyrpdqyj9as6y47iq3x99bf76hdw6j43cmgcs11gapc3"; depends=[]; };
-  DTSg = derive2 { name="DTSg"; version="0.1.2"; sha256="0j83ysgw5sq4m4sg4a2k2fpmc8g0xbc9hgnlkmyr1cwl3r4xw4ks"; depends=[assertive_base assertive_numbers assertive_sets assertive_types data_table R6]; };
+  DTRreg = derive2 { name="DTRreg"; version="1.4"; sha256="0v2hgq4rgj3ghyi0vzzv1w2a6arg0apps52kki6f6qrvjhh5lh58"; depends=[]; };
+  DTSg = derive2 { name="DTSg"; version="0.1.3"; sha256="0dzz6yfq7637rnpk0sjmysj9v7v4f1wcn0g3bfdywnv08kdwbx8j"; depends=[assertive_base assertive_numbers assertive_sets assertive_types data_table R6]; };
   DTWBI = derive2 { name="DTWBI"; version="1.1"; sha256="06lp4yc5nhacrgic78l014g2w1ibwgs8dp8zrahk5aripaczl25y"; depends=[dtw e1071 entropy lsa rlist]; };
   DTWUMI = derive2 { name="DTWUMI"; version="1.0"; sha256="0pybgbfs2yp2ljbs0kra5z70x3llkiwdngp6cadgs3j9rar4vq4q"; depends=[dtw DTWBI e1071 entropy lsa rlist]; };
   DVHmetrics = derive2 { name="DVHmetrics"; version="0.3.9"; sha256="1m13lhxgw7yj44s5spmlb4xxkranfbmjfh8lhrksikd796vxms3s"; depends=[ggplot2 KernSmooth reshape2 shiny]; };
@@ -978,9 +998,9 @@ in with self; {
   DataGraph = derive2 { name="DataGraph"; version="1.0.1"; sha256="0rvysvkcs926jzhp7iz9d5np0pa31y825ajn9yyzhbdfk5dg2wry"; depends=[Rcpp]; };
   DataLoader = derive2 { name="DataLoader"; version="1.3"; sha256="18mih6mb95v5xjvmqwby2mma74fcxwyqdm5w8j3bhi4iwgfn6d7v"; depends=[plyr rChoiceDialogs readxl xlsx]; };
   DataPackageR = derive2 { name="DataPackageR"; version="0.15.7"; sha256="11bra0kgmvag4mp6hpljd8m3r1306cbncmz3x71iybkahimws813"; depends=[assertthat crayon desc devtools digest futile_logger knitr purrr rmarkdown roxygen2 rprojroot stringr usethis yaml]; };
-  DataSpaceR = derive2 { name="DataSpaceR"; version="0.6.3"; sha256="13hbh2wm9vfwzrr5vsq1nyd6670msd47wbq3smdpwk5vwl8w7m35"; depends=[assertthat curl data_table digest httr jsonlite R6 Rlabkey]; };
-  DataVisualizations = derive2 { name="DataVisualizations"; version="1.1.6"; sha256="0xw40nq6r64c5z2q3kwnr7nn97ar1mwnzifpd0j3l65nyar9dswf"; depends=[AdaptGauss ggplot2 Rcpp RcppArmadillo sp]; };
-  DataViz = derive2 { name="DataViz"; version="0.2.7"; sha256="0skyj254ljg00vfv91mbwv9r9idaw8f6fj0ccvgmmlq183xg16qk"; depends=[Rcpp tibble]; };
+  DataSpaceR = derive2 { name="DataSpaceR"; version="0.7.2"; sha256="1m84hp23ksh58x7xfpl684d85rj2whd6cx515s8m8qhrg737fkp4"; depends=[assertthat curl data_table digest httr jsonlite R6 Rlabkey]; };
+  DataVisualizations = derive2 { name="DataVisualizations"; version="1.1.8"; sha256="1hzgmqq3rkb1fd8apyjmk6mnb7c9j12xd76pykx2k29rwvlavr65"; depends=[ggplot2 Rcpp RcppArmadillo sp]; };
+  DataViz = derive2 { name="DataViz"; version="0.2.8"; sha256="1dr5nvdzc63x9ymlysvv5i8b7zcffq13pa39q0ychdwr1s3x7vzw"; depends=[Rcpp tibble]; };
   DatabaseConnector = derive2 { name="DatabaseConnector"; version="2.4.1"; sha256="0f0kybbi47x585rxlgdhcmrn1wr9399pd26692czg4h9qwvnka52"; depends=[bit DatabaseConnectorJars DBI ff ffbase rJava SqlRender urltools]; };
   DatabaseConnectorJars = derive2 { name="DatabaseConnectorJars"; version="1.1.0"; sha256="18m6ynj30r5xdy51b3s39h0jcz1k2wgka888skr6ds2233lhqk2w"; depends=[rJava]; };
   DatabionicSwarm = derive2 { name="DatabionicSwarm"; version="1.1.1"; sha256="06i5vinyjkmlmz8q9m7zzc86hhyand45vxv9w7lkah5yzc785n3c"; depends=[deldir GeneralizedUmatrix Rcpp RcppArmadillo]; };
@@ -988,7 +1008,7 @@ in with self; {
   DeLorean = derive2 { name="DeLorean"; version="1.5.0"; sha256="1ry6j4mvxms9hddi9c56p9yhjh66fzss41wqkf6xq398h1wbn4q1"; depends=[BH broom coda dplyr fastICA functional ggplot2 kernlab lattice MASS memoise Rcpp RcppEigen reshape2 rstan rstantools seriation StanHeaders stringr]; };
   DeRezende_Ferreira = derive2 { name="DeRezende.Ferreira"; version="0.1.0"; sha256="05c99z3hlwwm0p02cl9z6gjwfxfq2b2qn90l85270bi16llgf42h"; depends=[xts]; };
   DecisionAnalysis = derive2 { name="DecisionAnalysis"; version="0.1.0"; sha256="1pxsvwl1in822ml7spb4flln2l7kzavq0jhxxsgxcrljypvrva61"; depends=[Cairo data_tree dplyr ggplot2 gridExtra tidyr viridisLite]; };
-  DeclareDesign = derive2 { name="DeclareDesign"; version="0.18.0"; sha256="184i74w4n9jjahjbdhx5p4vdvgl3a3hhixvlcqycsbv35hfmkwp8"; depends=[estimatr fabricatr generics randomizr rlang]; };
+  DeclareDesign = derive2 { name="DeclareDesign"; version="0.20.0"; sha256="0zdpiwh74ljc57s4cgak2j8zg3zyz9f3b47dambw2zdiy0db6wk8"; depends=[estimatr fabricatr generics randomizr rlang]; };
   DecorateR = derive2 { name="DecorateR"; version="0.1.1"; sha256="1dvyadlksqv8ns043yh91f6kw162k6r0zwn13j1g6pvismw04br9"; depends=[rJava RWeka RWekajars]; };
   Deducer = derive2 { name="Deducer"; version="0.7-9"; sha256="14kakyf28i654pndlswjzp6h3h7szpznrg6xznqg150mmn0bs3s6"; depends=[car e1071 effects foreign ggplot2 JGR MASS multcomp plyr rJava scales]; };
   DeducerPlugInExample = derive2 { name="DeducerPlugInExample"; version="0.2-0"; sha256="03aw7wr957xzw920ybyzxnck5kx0q2xpcrpq8jh2afyzszy6hzbi"; depends=[Deducer]; };
@@ -1008,9 +1028,9 @@ in with self; {
   Density_T_HoldOut = derive2 { name="Density.T.HoldOut"; version="2.00"; sha256="0kh5nns1kqyiqqfsgvxhx774i2mf4gcim8fp5jjyq577x4679r31"; depends=[histogram]; };
   DepLogo = derive2 { name="DepLogo"; version="1.0"; sha256="0h4jpflf8amip62r936lg0k428gypag296kwl58w1d0qa5jyxrkk"; depends=[]; };
   DepthProc = derive2 { name="DepthProc"; version="2.1.1"; sha256="059hqqjxaa6k65k6snbxvq4kpcqigri86v909kgw9vxq0jmb5pl7"; depends=[colorspace geometry ggplot2 lattice MASS np Rcpp RcppArmadillo rrcov sm zoo]; };
-  Deriv = derive2 { name="Deriv"; version="3.8.5"; sha256="0815ws2zmla3ici1n8amkc8fz8lwpbg5z68m8j3nhc79m2ikvm20"; depends=[]; };
-  DescTools = derive2 { name="DescTools"; version="0.99.28"; sha256="001xjyf19c7sy8x7gfs7krjcj39zsbx2cgc5ds3c4p16fhxnw8vg"; depends=[BH boot expm foreign manipulate MASS mvtnorm Rcpp]; };
-  DescToolsAddIns = derive2 { name="DescToolsAddIns"; version="1.3"; sha256="114zhx26rcbnnpjcm9igbnv4yx4q378z4mi1xjnsy2wn1dwh397a"; depends=[DescTools foreign manipulate rstudioapi writexl]; };
+  Deriv = derive2 { name="Deriv"; version="3.9.0"; sha256="0hlqm216bg3l79gq6m0am0xz6vd3l2hgjnjm6lym3mkmgkka4kxw"; depends=[]; };
+  DescTools = derive2 { name="DescTools"; version="0.99.29"; sha256="0ii6vimqav45qmv72pj6jxwjjphdf930c9abq3zaa39dhmdcf6ji"; depends=[BH boot expm MASS mvtnorm Rcpp]; };
+  DescToolsAddIns = derive2 { name="DescToolsAddIns"; version="1.4"; sha256="082xgva4avw3ymv9d38mhxj5dnpsyikkb2869ldfw4r1px3sqlbc"; depends=[DescTools foreign manipulate rstudioapi writexl]; };
   DescribeDisplay = derive2 { name="DescribeDisplay"; version="0.2.7"; sha256="0241mbz0y3ala7fsb4fwjd0xigsk0wq77hfrjyvnnp97rfjfzmcv"; depends=[GGally ggplot2 plyr reshape2 scales]; };
   DescriptiveStats_OBeu = derive2 { name="DescriptiveStats.OBeu"; version="1.3.1"; sha256="1bqq56m4vhmgijxpyllpy08xx29k0p7lhmd0iwa06jdw4lj5rdah"; depends=[dplyr jsonlite magrittr RCurl reshape]; };
   DesignLibrary = derive2 { name="DesignLibrary"; version="0.1.4"; sha256="16j9ca3y8mcdbd64yqm6js4lb9hjc74dh4r5y3h1ifvwzj0a78yc"; depends=[DeclareDesign estimatr fabricatr generics glue randomizr rlang]; };
@@ -1021,7 +1041,7 @@ in with self; {
   Devore7 = derive2 { name="Devore7"; version="0.7.6"; sha256="1m18p8h9vv4v0aq2fkjyj39vzb8a09azbbczhfiv4y88w540i8nw"; depends=[lattice MASS]; };
   Dforest = derive2 { name="Dforest"; version="0.4.2"; sha256="19jyph2zqfyq9vv22kb6fqy89l0vcviv19zgk10hbd7q850f6ryn"; depends=[ggplot2 rpart]; };
   DiPhiSeq = derive2 { name="DiPhiSeq"; version="0.2.0"; sha256="11l2inf99vxz9k292307j8c2b25kc1066svy3vxrfl72rrm4fqa7"; depends=[]; };
-  DiPs = derive2 { name="DiPs"; version="0.3.0"; sha256="12kgkp7cfsy5bjb801qmbw8mmvgiz02vd38mjr53gz2zm1c02zcg"; depends=[liqueueR mvnfast plyr rcbalance]; };
+  DiPs = derive2 { name="DiPs"; version="0.5.0"; sha256="1bm3zpdp20dz4bgi0jvp064nfb5van11v20605lfq4irf6nqs8j1"; depends=[liqueueR mvnfast plyr rcbalance]; };
   DiSSMod = derive2 { name="DiSSMod"; version="1.0.0"; sha256="199yipbc2sx2lsl51rpfyh80bfxaahfd2llqmfsp946gvj7339hv"; depends=[MASS matrixcalc psych sfsmisc]; };
   DiagrammeR = derive2 { name="DiagrammeR"; version="1.0.1"; sha256="04zhyci6ywysbp2lliaz5sv0qmssxx63gr3d7kkhkjcgc37qmvnc"; depends=[downloader dplyr glue htmltools htmlwidgets igraph influenceR magrittr purrr RColorBrewer readr rgexf rlang rstudioapi scales stringr tibble tidyr viridis visNetwork]; };
   DiagrammeRsvg = derive2 { name="DiagrammeRsvg"; version="0.1"; sha256="0j2cm1mx3zrb2k3pcrb96z2z3kws61gyyjsjjv5rqcb5lzdgi65k"; depends=[V8]; };
@@ -1042,7 +1062,7 @@ in with self; {
   DirectEffects = derive2 { name="DirectEffects"; version="0.2"; sha256="0cawn1i1cyczsr9zpcaky79dfdl9anfjgiaa2404capacnj3call"; depends=[Formula glue sandwich]; };
   DirectStandardisation = derive2 { name="DirectStandardisation"; version="1.2"; sha256="060nscnn7wamnbb45a55wr6rirlbpwwjz0kxiw3aiqkm16ilzfbs"; depends=[]; };
   DirectedClustering = derive2 { name="DirectedClustering"; version="0.1.1"; sha256="1shdqz0c5bbgknvfqr3ais26cb5mpywnah3d3584w97sy8v7gxm2"; depends=[igraph]; };
-  Directional = derive2 { name="Directional"; version="3.9"; sha256="04jr5cpqafaz21hz2l7586mw31c9y7ib4ghj50z9zqhfrjz06g02"; depends=[bigstatsr doParallel foreach MASS RcppZiggurat Rfast Rfast2 rgl]; };
+  Directional = derive2 { name="Directional"; version="4.0"; sha256="072131dqpnqp1hfnrzzqr1f2zpzfkk1ifflzfg727f0zhjvisd4d"; depends=[bigstatsr doParallel foreach MASS RcppZiggurat Rfast Rfast2 rgl]; };
   DirichletReg = derive2 { name="DirichletReg"; version="0.6-3.1"; sha256="1lz4b166grrs6vs98mf6a0wg4hvh0p901h697h9dkfhkxw8cqj3f"; depends=[Formula maxLik rgl]; };
   DisHet = derive2 { name="DisHet"; version="1.0.0"; sha256="056jcs1qpiyadnmlzd0cj4kp0qzkichxi0pdnxypyq1fsqnpvan3"; depends=[gtools matrixStats]; };
   DisImpact = derive2 { name="DisImpact"; version="0.0.4"; sha256="1fv446wr5b8ixcs473vqv5ak9q46vhgzflc1zg8x7k5q5fdwqhmm"; depends=[dplyr magrittr rlang]; };
@@ -1055,12 +1075,15 @@ in with self; {
   Distance = derive2 { name="Distance"; version="0.9.8"; sha256="19n1kjx7ikphp97118n0zwnv1prlxk9hcpn30ckxc4329m0cafvv"; depends=[mrds]; };
   DistatisR = derive2 { name="DistatisR"; version="1.0.1"; sha256="0myzfki8yrk0nhgdgsqs4wjbqhzmkdil1g005hc7p4lz3gi09bfx"; depends=[car prettyGraphs]; };
   DistributionOptimization = derive2 { name="DistributionOptimization"; version="1.2.1"; sha256="0ywf7i26lhcibm45g40i84gsnijmg5haz3730yzxlhv7nnnsyj1l"; depends=[AdaptGauss GA ggplot2]; };
+  DistributionTest = derive2 { name="DistributionTest"; version="1.0"; sha256="0ga0cxk8i1n6p33ywy9j65df3p4ypnc6mimvkx3yi1diczln6dbx"; depends=[MASS]; };
   DistributionUtils = derive2 { name="DistributionUtils"; version="0.6-0"; sha256="08vq54pyqxlqsj6q6gsg5ikqa0z3x842j52ld5dxaq272p6xchvl"; depends=[]; };
+  DivE = derive2 { name="DivE"; version="1.1"; sha256="1445pyw15dq48qsbnm2bgfm9xfffdww5xbhcs901ai0nyb3f7daa"; depends=[deSolve FME rgeos sp]; };
   DivMelt = derive2 { name="DivMelt"; version="1.0.3"; sha256="03vkz8d283l3zgqg7bh5dg3bss27pxv4qih7zwspwyjk81nw3xmr"; depends=[glmnet]; };
   DiversityOccupancy = derive2 { name="DiversityOccupancy"; version="1.0.6"; sha256="16x3fpchgd12mccvr1k11vjka97sy5vjvjcyd5y3pskgnpycc2sv"; depends=[dplyr ggplot2 glmulti MuMIn qpcR raster unmarked vegan]; };
   DnE = derive2 { name="DnE"; version="2.1.0"; sha256="02cbfb3m9xf24wkgqc06k3k0rx7qlqh4ma43khg6fpvif6yyahrn"; depends=[]; };
   DoE_MIParray = derive2 { name="DoE.MIParray"; version="0.13"; sha256="0lbcqfizgrnqmp0b2yn14br7xmabbhywy8h7161hx6hnvnam5r99"; depends=[combinat DoE_base]; };
   DoE_base = derive2 { name="DoE.base"; version="1.1-3"; sha256="0y195kf3fldis17z20blrqkav4xsmy9xq6ak3gw9mgb9x59y7661"; depends=[combinat conf_design lattice MASS numbers partitions vcd]; };
+  DoE_multi_response = derive2 { name="DoE.multi.response"; version="0.1.0"; sha256="1289jlp10999kvyg5adw3dyc2mhh20i6biyqjbxd6g80a8dajknx"; depends=[DoE_wrapper]; };
   DoE_wrapper = derive2 { name="DoE.wrapper"; version="0.10"; sha256="1kknqfpvrs46iksydg0mlld3wnjqcdhm82cx2sc20k3rpmz463b1"; depends=[AlgDesign DiceDesign DoE_base FrF2 lhs rsm]; };
   DoEstRare = derive2 { name="DoEstRare"; version="0.2"; sha256="0y9ymw7114jk1rwiasq400bpgvkxv6rpc954c7v9mgxd3c2nfza7"; depends=[]; };
   DoTC = derive2 { name="DoTC"; version="0.2"; sha256="1hjjkmxrbiysy3xl6n4q7kxcygdq68jcsgki1p937zj9a17sa62j"; depends=[ggplot2 plyr]; };
@@ -1075,7 +1098,7 @@ in with self; {
   DrImpute = derive2 { name="DrImpute"; version="1.0"; sha256="1adzarrwqb282pqgx2yqswp9rpwd1naxsmar54kddr6qyd6b923b"; depends=[Rcpp RcppArmadillo]; };
   DrInsight = derive2 { name="DrInsight"; version="0.1.1"; sha256="02lqf6bwbgcgyg5zx16nvnzpagmcmbsngnhmyv47256vsd9vppjd"; depends=[igraph qusage]; };
   DramaAnalysis = derive2 { name="DramaAnalysis"; version="3.0.0"; sha256="0hqyy79fyc13fxfrj9ghpydvys2j5pizfvsfii1dhk2a2adh7h3y"; depends=[data_table git2r httr readr reshape2 stringr tokenizers xml2]; };
-  DriftBurstHypothesis = derive2 { name="DriftBurstHypothesis"; version="0.1.3"; sha256="12zisrh2wra33hm4m4rzr5r3cxc3gdapv93c18wna64skbggvbv6"; depends=[Rcpp RcppArmadillo xts zoo]; };
+  DriftBurstHypothesis = derive2 { name="DriftBurstHypothesis"; version="0.2.0"; sha256="0xgaiavl7h82y3dbhnzb1gqflfyvcvc4jzlxdng3163axvfp0m1j"; depends=[Rcpp RcppArmadillo xts zoo]; };
   DrillR = derive2 { name="DrillR"; version="0.1"; sha256="0n7pim5kk0wfdjcc67v4vvdb7wyhn5bcgi2a12nbyfyydss7pk1g"; depends=[httr]; };
   DrugClust = derive2 { name="DrugClust"; version="0.2"; sha256="0acvjqwzkbjmy101m501l7fkfxzkp6zflwvn56li5307xv9ggnfg"; depends=[cclust cluster e1071 MESS ROCR]; };
   DstarM = derive2 { name="DstarM"; version="0.3.0"; sha256="16vcv21dgnymhsy9j5x5pblnipf4hdyscajx6pr8kl6i95hs3hmj"; depends=[DEoptim ggplot2 Rcpp RcppArmadillo rtdists RWiener]; };
@@ -1094,7 +1117,7 @@ in with self; {
   EBASS = derive2 { name="EBASS"; version="0.1"; sha256="14hxzj06wrc4ihflr7dqk28fsjwbcizr0jy54vhv0mk1y1gd4201"; depends=[]; };
   EBEN = derive2 { name="EBEN"; version="4.6"; sha256="0gcf5b2viiq69vs8bd8nhk65g9sbzgg212w7zpnz4y6cv9jkk5zz"; depends=[]; };
   EBMAforecast = derive2 { name="EBMAforecast"; version="0.52"; sha256="1809ia0dpkilprv7x19drp1v2qckk0wm596f1i1vl0k37wbhcziv"; depends=[abind Hmisc plyr Rcpp separationplot]; };
-  EBPRS = derive2 { name="EBPRS"; version="1.1.2"; sha256="1pbhxwvkw4sn92ap4lsyc4iin82r2ifvqb7fwyii8qx4m9j8ff5l"; depends=[data_table ROCR]; };
+  EBPRS = derive2 { name="EBPRS"; version="1.1.5"; sha256="05hs05qdjk9pl81axxrh3rz43mm939r7crvvcsdmv1dj6x0i4iyh"; depends=[data_table ROCR]; };
   EBglmnet = derive2 { name="EBglmnet"; version="4.1"; sha256="0wlscmimj74alcr8k5h1g3alvlpss4g2ah7zkpd42akam3zb4s5z"; depends=[]; };
   EBrank = derive2 { name="EBrank"; version="1.0.0"; sha256="1qzhrr3n2zv31mjp224b35324nr9nigzazyfv11j4zhwl1ipf632"; depends=[]; };
   ECFsup = derive2 { name="ECFsup"; version="0.1-2"; sha256="0fpcab0gjgsc3sx0plpx068rw3a7kfzs2nyrr477a5m0rcbqf1kh"; depends=[foreach Rcpp RcppArmadillo]; };
@@ -1114,12 +1137,12 @@ in with self; {
   EFAutilities = derive2 { name="EFAutilities"; version="2.0.0"; sha256="1vbpz9papk6vvch3kb2qm6nspa4llp4mpck6ky1j8kvkhjzm1za0"; depends=[GPArotation mvtnorm plyr]; };
   EFDR = derive2 { name="EFDR"; version="1.0"; sha256="1344ysvrniqn1qv2hx9b9afg9fivccfrj393xy9cqz4j395b6jx0"; depends=[copula doParallel dplyr foreach gstat Matrix sp tidyr waveslim]; };
   EFS = derive2 { name="EFS"; version="1.0.3"; sha256="1q8cf8dnxpv5s3lr9145y0wjhak4rz18dzah4xfs5qr4c8nlpl54"; depends=[party pROC randomForest ROCR]; };
-  EGAnet = derive2 { name="EGAnet"; version="0.7"; sha256="1j385mds2mdl0cbshwfda2js0av8rg9npn7ibp1xy3k0d6mwi90z"; depends=[corpcor doParallel dplyr foreach ggplot2 ggpubr glasso igraph iterators lavaan Matrix matrixcalc mvtnorm NetworkToolbox plotly plyr qgraph semPlot]; };
+  EGAnet = derive2 { name="EGAnet"; version="0.8"; sha256="052zgapy9lw4pbggylgw287ncr83yblmmh2ww02pmpnsrl0j48wz"; depends=[corpcor doParallel dplyr foreach ggplot2 ggpubr glasso igraph iterators lavaan Matrix matrixcalc mvtnorm NetworkToolbox OpenMx pbapply plotly plyr qgraph semPlot]; };
   EGRET = derive2 { name="EGRET"; version="3.0.2"; sha256="02c9cakj7szywx0r4rylbdnk63b4npqp2i5x1fhxjy0j5bn0hc2f"; depends=[dataRetrieval fields foreach survival truncnorm]; };
   EGRETci = derive2 { name="EGRETci"; version="2.0.3"; sha256="1fzcndah890nfd3fg83jhp5lpwb0xfyrccabgvilkrrm4i4x675m"; depends=[binom EGRET]; };
   EHR = derive2 { name="EHR"; version="0.1-3"; sha256="1y12j0sjr1zp3bzha1p31f903js674l6ifjccw0y9718sry8dbv2"; depends=[logistf]; };
-  EHRtemporalVariability = derive2 { name="EHRtemporalVariability"; version="1.0.1"; sha256="0j5q729al80jrfillhy8cpg3yyka852z7rn7psxrbrrwnmbk17xi"; depends=[dplyr lubridate plotly RColorBrewer scales shiny viridis xts zoo]; };
-  EIAdata = derive2 { name="EIAdata"; version="0.0.3"; sha256="12jgw3vi2fminwa4lszczdr4j4svn2k024462sgj1sn07a4a4z2s"; depends=[plyr XML xts zoo]; };
+  EHRtemporalVariability = derive2 { name="EHRtemporalVariability"; version="1.0.2"; sha256="14g1x4zdhzgm122nzsw9gfjqdgz5bcdzcywg0jk6p3df2vi6q6vb"; depends=[dplyr lubridate plotly RColorBrewer scales shiny viridis xts zoo]; };
+  EIAdata = derive2 { name="EIAdata"; version="0.0.5"; sha256="1dg59shsamd5hrf65p3y6wybskfhw875jf9ssv561b241i6dkn3i"; depends=[XML xts zoo]; };
   EILA = derive2 { name="EILA"; version="0.1-2"; sha256="0wxl9k4fa0f7jadw3lvn97iwy7n2d02m8wvm9slnhr2n8r8sx3hb"; depends=[class quantreg]; };
   EIX = derive2 { name="EIX"; version="1.0"; sha256="1is5dr5pqinshw2gnlsdq0byldiha076j2yn2z4vfg0pdws9lggc"; depends=[DALEX data_table ggiraphExtra ggplot2 ggrepel iBreakDown MASS Matrix purrr scales tidyr xgboost]; };
   EKMCMC = derive2 { name="EKMCMC"; version="0.1.0"; sha256="0sfj6w8780fik0ar9bg8zrxkj10wqagvwrngd58g50fc0z4lhr53"; depends=[numDeriv]; };
@@ -1151,11 +1174,11 @@ in with self; {
   EMSaov = derive2 { name="EMSaov"; version="2.3"; sha256="1hpvwimhkl7za5s8j9n4a8883vy89jrxrhlh0k3cfprnndh4zz05"; depends=[shiny]; };
   EMT = derive2 { name="EMT"; version="1.1"; sha256="0m3av1x3jcp3hxnzrfb128kch9gy2zlr6wpy96c5c8kgbngndmph"; depends=[]; };
   EMVS = derive2 { name="EMVS"; version="1.0"; sha256="10ksrj1aav062cszg4ymnwsgib7a9hlnkksfcvmy26nx5gj2g7zl"; depends=[Rcpp RcppArmadillo]; };
-  EMbC = derive2 { name="EMbC"; version="2.0.1"; sha256="0id68ws6l858nvyy790m17j9gddxmm97z66x24w5r58dxi6yfcrp"; depends=[maptools mnormt RColorBrewer Rcpp RcppArmadillo sp]; };
+  EMbC = derive2 { name="EMbC"; version="2.0.2"; sha256="0j6acr9myp4jkg7p2sfhc58w96yz176pkcjl3q1sgdnbh6s7nl3m"; depends=[maptools mnormt RColorBrewer Rcpp RcppArmadillo sp]; };
   ENMeval = derive2 { name="ENMeval"; version="0.3.0"; sha256="0q5s8nxig8kbr0cblfmf3k20ri19fjs770a0fnzsk0kwlac414hw"; depends=[dismo doParallel foreach maxnet raster]; };
   ENiRG = derive2 { name="ENiRG"; version="1.0.1"; sha256="0yjy7g0pia4g18h7mawkxn77dnnqcajnbml21rrv63qwlr347355"; depends=[ade4 fgui gdata miniGUI raster rgrass7 sp]; };
   ENmisc = derive2 { name="ENmisc"; version="1.2-7"; sha256="07rix4nbwx3a4p2fif4wxbm0nh0qr7wbs7nfx2fblafxfzhh6jc7"; depends=[Hmisc RColorBrewer vcd]; };
-  EQL = derive2 { name="EQL"; version="1.0-0"; sha256="0lxfiizkvsfls1km1zr9v980191af6qjrxwcqsa2n6ygzcb17dp5"; depends=[lattice ttutils]; };
+  EQL = derive2 { name="EQL"; version="1.0-1"; sha256="0pa33h0f30l352m6ix296l55lvqxdaib666x2dwy9zx0lmk23w8m"; depends=[lattice ttutils]; };
   EQUIVNONINF = derive2 { name="EQUIVNONINF"; version="1.0"; sha256="103wrry0cmikprihmgx8y4kk1pnbjis7rs1xw13w14v902xkr2rq"; depends=[BiasedUrn]; };
   ERP = derive2 { name="ERP"; version="2.1"; sha256="0l3vgg7szfgi7a6qh93lh2sjnkwkhw02laxdl7x87jirmmsx3157"; depends=[corpcor fdrtool irlba mnormt pacman]; };
   ERSA = derive2 { name="ERSA"; version="0.1.1"; sha256="1b76rfjndw7s0z4qb6rc2s95z0hr9xn4d5qaja9bd721r0g5862k"; depends=[broom car combinat dplyr ggplot2 leaps purrr RColorBrewer shiny tidyr]; };
@@ -1174,13 +1197,13 @@ in with self; {
   EWOC2 = derive2 { name="EWOC2"; version="1.0"; sha256="1x3l332pmh69kl0c1rka264mi69avdm938mzd79ck4y3qcgn07vr"; depends=[MASS rjags]; };
   EXRQ = derive2 { name="EXRQ"; version="1.0"; sha256="1iqsr52sl2j5q03122a7rsp6n6a2bkysk2r908c89l36gk4sj2i5"; depends=[mnormt quantreg]; };
   EZtune = derive2 { name="EZtune"; version="2.0.0"; sha256="1arrd9zkssb8ixx7r4nxwayksz1mk7jkvlcbm264pv9ya6kh3yrh"; depends=[ada e1071 GA gbm optimx rpart]; };
-  Eagle = derive2 { name="Eagle"; version="1.5.1"; sha256="188p8fyg3ch1i85yrh3dpj6gq7vili3lz3jz1rsh59wf0bdv418l"; depends=[data_table ggplot2 ggthemes matrixcalc Rcpp RcppEigen shiny shinyBS shinyFiles shinyjs shinythemes]; };
+  Eagle = derive2 { name="Eagle"; version="1.5.2"; sha256="1pwxqwj1ff7hlfcsr9n1ria686aavzk6pmvr1ac9r0dx2h20nskr"; depends=[data_table ggplot2 ggthemes matrixcalc Rcpp RcppEigen shiny shinyBS shinyFiles shinyjs shinythemes]; };
   EasyABC = derive2 { name="EasyABC"; version="1.5"; sha256="17qv6y8sf2iwwqcv5wfg6sii259gv5jyr72dnfpir2bw78wb3mqx"; depends=[abc lhs MASS mnormt pls tensorA]; };
   EasyHTMLReport = derive2 { name="EasyHTMLReport"; version="0.1.1"; sha256="1hgg8i7py7bx48cldyc7yydf0bggmbj3fx3kwiv9jh1x5wyh929z"; depends=[base64enc ggplot2 knitr markdown reshape2 scales xtable]; };
   EasyMARK = derive2 { name="EasyMARK"; version="1.0"; sha256="10slkblbyxq98c3sxgs194dnkx996khfcpxj6jhz355dp35z7c9d"; depends=[coda doParallel foreach MASS random rjags stringr]; };
   EasyMx = derive2 { name="EasyMx"; version="0.2-1"; sha256="03yshzb4wh3n667z9lmrwsz16chpgnl8qv3qlx425mj5iiyv626z"; depends=[OpenMx]; };
   EbayesThresh = derive2 { name="EbayesThresh"; version="1.4-12"; sha256="07a2dd3za2dc81n6m2xy794sclp3yw7f46lg1igaflh7m9407198"; depends=[wavethresh]; };
-  Ecdat = derive2 { name="Ecdat"; version="0.3-1"; sha256="1lvfp2ih8ng3kn3cia687j5fd27iwiak7gk3bhgjp8bnlgblqq02"; depends=[Ecfun]; };
+  Ecdat = derive2 { name="Ecdat"; version="0.3-3"; sha256="0rxhl0i3hhfcc19744nkqjz0hziil72m0b5jharw99ackyi3hrfs"; depends=[Ecfun]; };
   Ecfun = derive2 { name="Ecfun"; version="0.2-0"; sha256="1clxwmwd4lmhh7zqspqgn13vrzg40lbqzb0a7b90qla4hk9r4zm4"; depends=[fda gdata jpeg MASS RCurl stringi TeachingDemos tis XML xml2]; };
   EcoGenetics = derive2 { name="EcoGenetics"; version="1.2.1-5"; sha256="1953q374msvdw91m2nagxkwh5r9gnq5qss6l6mf34hayq3kwm8s9"; depends=[d3heatmap doParallel edgebundleR foreach ggplot2 htmlwidgets igraph jsonlite magrittr networkD3 party pheatmap plotly raster reshape2 rgdal rkt SoDA sp]; };
   EcoHydRology = derive2 { name="EcoHydRology"; version="0.4.12.1"; sha256="075kgy6cxppkclk6nj5xs1f5yv9w8cpr09xwhf2101a6wswknb88"; depends=[DEoptim operators topmodel XML]; };
@@ -1201,11 +1224,12 @@ in with self; {
   EfficientMaxEigenpair = derive2 { name="EfficientMaxEigenpair"; version="0.1.4"; sha256="1s0i9a2vk2g4f5gadsvzjfkw91hcjsrbyjg2vgnj1v17xrwgp40w"; depends=[]; };
   ElastH = derive2 { name="ElastH"; version="0.3.1"; sha256="1xgmz0xirvdyjz8l31zb2j91nj0g8ffhvzp44b97473fsj06n1g6"; depends=[dlm]; };
   EleChemr = derive2 { name="EleChemr"; version="1.1.0"; sha256="109dv7ayg5nm6zjd70dp8h5qqwrijikymzgb41dl8vx4pqhv43v3"; depends=[ggplot2]; };
-  ElemStatLearn = derive2 { name="ElemStatLearn"; version="2015.6.26.1"; sha256="09hz283vwg0sdxavqw5rp6izqjf8slvv7sraa355cklz5n27xgag"; depends=[]; };
+  ElemStatLearn = derive2 { name="ElemStatLearn"; version="2015.6.26.2"; sha256="1ynp3fxzi095im584bgw9v8pzgs9p2v64csyhmf0m2hqyrr4myd0"; depends=[]; };
   EloChoice = derive2 { name="EloChoice"; version="0.29.4"; sha256="1g8ivvnv16c2gniwd9xa9z89bm4rac0nrg3mcg1risgf9yk4rgm5"; depends=[psychotools Rcpp RcppArmadillo Rdpack]; };
   EloOptimized = derive2 { name="EloOptimized"; version="0.3.0"; sha256="185vh8h6r5wqcbaq3glq8k3fr8jp6h3q2h2ly54agi6bi3fvbs05"; depends=[BAMMtools dplyr lubridate magrittr reshape2 rlang rlist]; };
   EloRating = derive2 { name="EloRating"; version="0.46.8"; sha256="1hsqsdik1slmdjd811mkpag96iahy62l27yj2a27mnnffi188lmi"; depends=[network Rcpp RcppArmadillo Rdpack sna zoo]; };
   ElstonStewart = derive2 { name="ElstonStewart"; version="1.1"; sha256="1y2g4x3fhi78c2406bk8r8c3x9zhx8ya3qlbnypdm65j0minixsn"; depends=[digest kinship2]; };
+  EmbedSOM = derive2 { name="EmbedSOM"; version="1.9.1"; sha256="050j943774zmay6b62rqsb9ifd55cy5p77l0fkrb7b42jgxdqwpy"; depends=[]; };
   Emcdf = derive2 { name="Emcdf"; version="0.1.2"; sha256="0jb59jp1drcwipmk6yzg0cl366i8nhffa13c3x3fmhaj7ifv77vv"; depends=[lattice Rcpp]; };
   EmiStatR = derive2 { name="EmiStatR"; version="1.2.2.0"; sha256="0xwmwbybiyb9688l5n98vir3rwbbjgpw5qb25p20lhlj1pqg95w1"; depends=[doParallel foreach lattice xts zoo]; };
   EmissV = derive2 { name="EmissV"; version="0.665.1.0"; sha256="1xzpsr43pyvmvzbcw66cxv7qs9i8s7pg1w90l3ivx9mz7p8bfz8a"; depends=[data_table lwgeom ncdf4 raster sf sp units]; };
@@ -1226,14 +1250,14 @@ in with self; {
   EnvStats = derive2 { name="EnvStats"; version="2.3.1"; sha256="0ang2s222znrvzvidyvj2sa2bqx95bxicff64p6w2a7z88mx8lyp"; depends=[ggplot2 MASS nortest]; };
   EnviroPRA = derive2 { name="EnviroPRA"; version="1.0"; sha256="0yirh3vy7wap0qmm3kvjz9y68gcvp9i8qshv80wh8aijxwklpr8n"; depends=[fitdistrplus kSamples MASS truncdist]; };
   EnviroStat = derive2 { name="EnviroStat"; version="0.4-2"; sha256="0ckax6vkx0vwczn21nm1dr8skvpm59xs3dgsa5bs54a3xhn5z9hs"; depends=[MASS]; };
-  Epi = derive2 { name="Epi"; version="2.37"; sha256="1lanr9x0c6w22406p56j7cwk6wck8njq6pscb4gzc613d68zj1lk"; depends=[cmprsk data_table etm MASS Matrix mgcv numDeriv plyr survival zoo]; };
+  Epi = derive2 { name="Epi"; version="2.38"; sha256="0ald9fjynrlyah8nzwfs49a08j4myd3c5bm56zn61gg5pyyhi8hd"; depends=[cmprsk data_table etm MASS Matrix mgcv numDeriv plyr survival zoo]; };
   EpiContactTrace = derive2 { name="EpiContactTrace"; version="0.12.0"; sha256="1i84fslz8sdngvkv34zhzjwzrzzxx6f4s31p8f5smmf028jlpyys"; depends=[]; };
-  EpiCurve = derive2 { name="EpiCurve"; version="2.1-1"; sha256="0y6llpxa8xyfn9cxhq35mzfp1gc7la1708q85q4hz0l115abvk92"; depends=[dplyr ggplot2 ISOweek RColorBrewer scales timeDate]; };
+  EpiCurve = derive2 { name="EpiCurve"; version="2.2-1"; sha256="091q03lak2nfk83s10004qnwdng0gl4z92pc174mc41wns7f5d8v"; depends=[dplyr ggplot2 ISOweek RColorBrewer scales timeDate]; };
   EpiDynamics = derive2 { name="EpiDynamics"; version="0.3.0"; sha256="0hpysjl8wfgylbp4ddxmi5msvlp1w70c6pxggc2bwdgap3s127f3"; depends=[deSolve ggplot2 reshape2]; };
   EpiEstim = derive2 { name="EpiEstim"; version="2.2-1"; sha256="1a21mskjvyz9qdvl3kkf0p15zn1nx1a49c5djp1lacrn6h7g8k9p"; depends=[coarseDataTools coda fitdistrplus ggplot2 gridExtra incidence reshape2 scales]; };
   EpiILM = derive2 { name="EpiILM"; version="1.4.2"; sha256="16vml2p7c4nv0lfis661x7b9wimrni1ncpa256dh99cps9508j28"; depends=[coda]; };
   EpiILMCT = derive2 { name="EpiILMCT"; version="1.1.3"; sha256="10snghwkapg6n6lhkf5v3w2g0ngkq556px65ccc4dgyndhwdsqmm"; depends=[coda igraph]; };
-  EpiModel = derive2 { name="EpiModel"; version="1.7.2"; sha256="0zkj17kvssn4y2rglasx2s0ks1ha6bf1lzbj809pmf2m4gvyc4gb"; depends=[ape deSolve doParallel ergm foreach ggplot2 lazyeval network networkDynamic RColorBrewer tergm]; };
+  EpiModel = derive2 { name="EpiModel"; version="1.7.3"; sha256="037y5q25cy3zqbj236pxx30iax2bz1wag0ndffmglhbq17da2w1s"; depends=[ape deSolve doParallel ergm foreach ggplot2 lazyeval network networkDynamic RColorBrewer tergm]; };
   EpiReport = derive2 { name="EpiReport"; version="0.1.0"; sha256="1bfh7nrwmplsk7whvmsf0wxg795xrwvarxw974v58mjb282yp87s"; depends=[dplyr extrafont flextable ggplot2 knitr officer png rmarkdown tidyr zoo]; };
   EpiSignalDetection = derive2 { name="EpiSignalDetection"; version="0.1.1"; sha256="04bagnx9fs0r3167hmwgc389fl5hq7l4j6kdjjmi360vcaimx9qi"; depends=[dplyr DT ggplot2 ISOweek knitr pander rmarkdown shiny surveillance]; };
   EpiStats = derive2 { name="EpiStats"; version="1.3-1"; sha256="07iz6hhfcawfcb1n9znpafgmmgjgw7pikr71hh5c7f802k1qffw7"; depends=[dplyr epiR]; };
@@ -1252,7 +1276,7 @@ in with self; {
   EvalEst = derive2 { name="EvalEst"; version="2015.4-2"; sha256="1jkis39iz3zvi5yfd0arvw7bym6naq45f5cravywg8c37n9v967x"; depends=[dse setRNG tfplot tframe]; };
   EvaluationMeasures = derive2 { name="EvaluationMeasures"; version="1.1.0"; sha256="0b65y4rb650hhlgc18z0sm0danrrawqkazzdl9krl877djrgx87g"; depends=[]; };
   Evapotranspiration = derive2 { name="Evapotranspiration"; version="1.14"; sha256="1v681m7zyhpydyx1mbkk4iwxkkf0mx1317c3z2v465zg9bssp3c7"; depends=[zoo]; };
-  EventDetectR = derive2 { name="EventDetectR"; version="0.3.1"; sha256="1nh859q9d2k9fpgyj9g7dvhbhbychhng174mlmyl8x9l7dvmiydx"; depends=[forecast imputeTS]; };
+  EventDetectR = derive2 { name="EventDetectR"; version="0.3.3"; sha256="01yaf44bhkd8zwwky5m2a0bm3mmpkcyqhvjb4yqx0gszlfm1nb60"; depends=[forecast ggplot2 gridExtra imputeTS]; };
   EventStudy = derive2 { name="EventStudy"; version="0.36"; sha256="0pd7qbpj4agaqc57lianqinnardyh929nr8ammmpal191v2i7hmw"; depends=[curl data_table dplyr ggplot2 httr jsonlite magrittr miniUI openxlsx purrr RColorBrewer readr rlang rstudioapi scales shiny stringr testthat tidyquant tidyr]; };
   EvoRAG = derive2 { name="EvoRAG"; version="2.0"; sha256="0gb269mpl2hbx1cqakv3qicpyrlfb4k8a3a7whhg90masbgmh8f6"; depends=[]; };
   EvolutionaryGames = derive2 { name="EvolutionaryGames"; version="0.1.0"; sha256="1v6xpxk4kbjbmv8vh517rd76gyrd9znpxqdh4jqz8lvdpnpla4wv"; depends=[deSolve geometry ggplot2 interp MASS reshape2 rgl]; };
@@ -1263,13 +1287,15 @@ in with self; {
   ExactCIdiff = derive2 { name="ExactCIdiff"; version="1.3"; sha256="1vayq8x7gk1fnr1jrlscg6rb58wncriybw4m1z0glfgzr259103y"; depends=[]; };
   ExceedanceTools = derive2 { name="ExceedanceTools"; version="1.2.2"; sha256="084sc6pggfbcyavhfnd5whyigw7dyjhb4cxmxi0kh2jiam5k8v5b"; depends=[SpatialTools splancs]; };
   ExcessMass = derive2 { name="ExcessMass"; version="1.0"; sha256="1z8l1lja02wxw8l72s3bq6sgjymn5929n123xk6b7ndd52zlfgf5"; depends=[]; };
-  ExomeDepth = derive2 { name="ExomeDepth"; version="1.1.10"; sha256="11lg1n9wls96cg1byj5bfircw4bsf0rbk37h8fl0hkh29m6gyy16"; depends=[aod Biostrings GenomicAlignments GenomicRanges IRanges Rsamtools VGAM]; };
+  ExomeDepth = derive2 { name="ExomeDepth"; version="1.1.12"; sha256="106r22bqvcm6mycbk5f9k4y5mcv96czx5n5p9ypn8hvl9p25gvha"; depends=[aod Biostrings dplyr GenomicAlignments GenomicRanges IRanges magrittr Rsamtools VGAM]; };
   ExpDE = derive2 { name="ExpDE"; version="0.1.4"; sha256="0yjsap92dd1sb23fhw69i0ddk3lyj5f4kwp9rvz4k0vxry10hx7g"; depends=[assertthat]; };
   ExpDes = derive2 { name="ExpDes"; version="1.2.0"; sha256="0zisgb129fdg2igc3gp8jkrv9bz2r7bz2i20ap07mqlvhq88515a"; depends=[stargazer]; };
   ExpDes_pt = derive2 { name="ExpDes.pt"; version="1.2.0"; sha256="0fny5hcg76bm04vpbkvlwzw78m5gj28rvich7k1hhrhlxm3xi3hf"; depends=[stargazer]; };
   ExpRep = derive2 { name="ExpRep"; version="1.0"; sha256="0spv3wd9c8sr338n5kdzrs28yh7s90fl70wsdnkibmlxhnh3ay3g"; depends=[]; };
   ExplainPrediction = derive2 { name="ExplainPrediction"; version="1.3.0"; sha256="14m3b9fsrpfpr8avsnhl8b3bzk2xlhwgkwag5iq8bj7bzvv4yck1"; depends=[CORElearn semiArtificial]; };
   ExtMallows = derive2 { name="ExtMallows"; version="0.1.0"; sha256="0903jslp74s1vzbklq88y2dm0dgkhd6g77b7aipxam98933k0hzz"; depends=[]; };
+  ExtractTrainData = derive2 { name="ExtractTrainData"; version="5.0.3"; sha256="0a47b3zb4igx39jn609ll9s4zwbpid723xncdjxrmamdp8dvv8r6"; depends=[raster rgdal rgeos]; };
+  ExtremalDep = derive2 { name="ExtremalDep"; version="0.0.3-1"; sha256="139q7cniwspzqz25gad0sl44fmwgflglwri4m4brxqpfi0yp9dxz"; depends=[CompRandFld copula evd fda gtools mvtnorm nloptr numDeriv quadprog rlist sn]; };
   ExtremeBounds = derive2 { name="ExtremeBounds"; version="0.1.6"; sha256="12bc4mmkmggvk3kfmz6nq13fa2470z0bx8smnvq9vf1ypdiiw85y"; depends=[Formula]; };
   FACTMLE = derive2 { name="FACTMLE"; version="1.1"; sha256="0qz2i0hnn84bpps1h8jmfkgp5p59axr0wayj9dvl839radrvpqvy"; depends=[rARPACK]; };
   FADA = derive2 { name="FADA"; version="1.3.4"; sha256="15asq4l3pir28593wpi46wxpszw81r82snv6hgkiiyqkf8pfchga"; depends=[corpcor crossval elasticnet glmnet MASS matrixStats mnormt sda sparseLDA]; };
@@ -1286,13 +1312,14 @@ in with self; {
   FBN = derive2 { name="FBN"; version="1.5.1"; sha256="0723krsddfi4cy2i3vd6pi483qjxniychnsi9r8nw7dm052nb4sf"; depends=[]; };
   FCGR = derive2 { name="FCGR"; version="1.0-0"; sha256="015nnnc9fasx0qjrc3lbxv14rqwyx36xzsw9076grwm5pqahrdsb"; depends=[kerdiest KernSmooth MASS mgcv nlme pspline sfsmisc]; };
   FCMapper = derive2 { name="FCMapper"; version="1.1"; sha256="1yjh8rs65nqslvwv7x4rif469zds41s7v3vhq6pca1y17kvj2in1"; depends=[igraph]; };
+  FCSlib = derive2 { name="FCSlib"; version="1.0.0"; sha256="0wgk3h03w5wlr8anlp779wqj7ivnlw3brlahc82mb92nq3yc0k5d"; depends=[tiff]; };
   FD = derive2 { name="FD"; version="1.0-12"; sha256="0xdpciq14i8rh7v6mw174hip64r7mrzhx7gwri3vp9y7a1380sbi"; depends=[ade4 ape geometry vegan]; };
   FDGcopulas = derive2 { name="FDGcopulas"; version="1.0"; sha256="1i86ns4hq74y0gnxfschshjlc6if3js0disjb4bwfizaclwbw3as"; depends=[numDeriv randtoolbox Rcpp]; };
   FDRSeg = derive2 { name="FDRSeg"; version="1.0-3"; sha256="0dh6m5vlx664kryh56jzi3zxydjwa5217nhbwn6adp0q5qdh6d8a"; depends=[Rcpp stepR]; };
   FDRreg = derive2 { name="FDRreg"; version="0.1"; sha256="17hppvyncbmyqpi7sin9qsrgffrnx8xjcla2ra6y0sqzam1145y4"; depends=[fda mosaic Rcpp RcppArmadillo]; };
   FDRsampsize = derive2 { name="FDRsampsize"; version="1.0"; sha256="0g8kawzyi9x5yndvh330wzqw6rvcnprwq56ngd0j6z51hvvw8qhw"; depends=[]; };
   FDboost = derive2 { name="FDboost"; version="0.3-2"; sha256="1ahdq49ijj4j2yykmzbpgrjn0sm09nzmd33k317y157hnf6zyxvs"; depends=[gamboostLSS MASS Matrix mboost mgcv stabs zoo]; };
-  FENmlm = derive2 { name="FENmlm"; version="2.4.2"; sha256="1nqnrjij5kgn0xpm3xvz2hdlddpcnvyni58pyrlmnlyvbhcw2z0k"; depends=[Formula MASS numDeriv Rcpp]; };
+  FENmlm = derive2 { name="FENmlm"; version="2.4.3"; sha256="1a205a4iv54haixanyzx210lzqg7cnryjvqayvkdj1lhmdql4anw"; depends=[Formula MASS numDeriv Rcpp]; };
   FEprovideR = derive2 { name="FEprovideR"; version="1.1"; sha256="02hfdk9qhaq4y19p700w2i7qsdp4z2kyww0pr0pijfivkqks0vpi"; depends=[ggplot2 Matrix poibin]; };
   FFD = derive2 { name="FFD"; version="1.0-6"; sha256="19yqb45qj54fmjkqfjbcqsx3wz6fk8inrqif9ds93xjkm6aaiqgp"; depends=[R2HTML tkrplot]; };
   FFTrees = derive2 { name="FFTrees"; version="1.4.0"; sha256="0s2h81vdh8d41kwz5ja831q11wrb7ywdd7aq46x3y9sgg3aabd44"; depends=[caret circlize e1071 igraph pROC progress randomForest rpart stringr yarrr]; };
@@ -1322,7 +1349,7 @@ in with self; {
   FNN = derive2 { name="FNN"; version="1.1.3"; sha256="0cllqlnynm5yaj4r64mqyyfc8phkb38rwssq8k8ikgfgr4jklxny"; depends=[]; };
   FPCA2D = derive2 { name="FPCA2D"; version="1.0"; sha256="18bb90ppd9gd8pg9jxfyfkmlsaqk8w25fgaj9fk18ybm2nhsxqm6"; depends=[corpcor]; };
   FPCA3D = derive2 { name="FPCA3D"; version="1.0"; sha256="1hrk9caad2s76dx59clxhia45a85khk1y2ii7955f336x55q34a5"; depends=[]; };
-  FPDclustering = derive2 { name="FPDclustering"; version="1.3"; sha256="1cn5nfvhd1vq8qhlildyv92v77x61zhips3dr67fjhg8g6rif0sf"; depends=[cluster ExPosition mvtnorm ThreeWay]; };
+  FPDclustering = derive2 { name="FPDclustering"; version="1.3.1"; sha256="1mmlq960n51hgawvdl9x5215id43ad3pims1ji9khrwk7n1hs559"; depends=[cluster ExPosition mvtnorm ThreeWay]; };
   FPV = derive2 { name="FPV"; version="0.5"; sha256="0pxa8lbcxw2hx2n0frkx0pdndlcfm7gnh9qay9q53cf5gqzzwvvc"; depends=[FuzzyNumbers FuzzyNumbers_Ext_2]; };
   FRACTION = derive2 { name="FRACTION"; version="1.0"; sha256="0g25dzsbharsq8bzfka96zccaqppdclax24mz5m080ddg4y8zj49"; depends=[]; };
   FRAPO = derive2 { name="FRAPO"; version="0.4-1"; sha256="0mjcrplxr0cyybp5hzzwbq5j03w0f3iiiv1yk7mdqr5gb368dchq"; depends=[cccp Rglpk timeSeries]; };
@@ -1366,7 +1393,7 @@ in with self; {
   FastRWeb = derive2 { name="FastRWeb"; version="1.1-1.1"; sha256="08hqsiglv9ivcv4xmpqqjhqmg3ccba5xa7jahay0m71w2n8m271y"; depends=[base64enc Cairo]; };
   FastSF = derive2 { name="FastSF"; version="0.1.1"; sha256="1xajav45h57hchzkvl2pb4mz9xy433lq74jnry0icid8dai5xhwb"; depends=[limSolve Rcpp RcppArmadillo]; };
   FatTailsR = derive2 { name="FatTailsR"; version="1.7-5"; sha256="1l2anaf4kixidmvya64ni5b78bl9w2n6xf1lnf297lkdka8gxigw"; depends=[minpack_lm timeSeries]; };
-  FateID = derive2 { name="FateID"; version="0.1.7"; sha256="00rhqbwpzxbkxmgg6blv186pngz0fsm448g61qcm40dy6mpf9yd0"; depends=[lle locfit pheatmap princurve randomForest RColorBrewer rgl Rtsne som umap]; };
+  FateID = derive2 { name="FateID"; version="0.1.9"; sha256="0n02591wpi4n0ga42v4xd1jzskcl56nvvls48sdkcnvc7cyi0hjv"; depends=[lle locfit pheatmap princurve randomForest RColorBrewer Rtsne som umap]; };
   FeaLect = derive2 { name="FeaLect"; version="1.14"; sha256="1h6jc8n57mvyz3gi2jdx5xacwv5iim5sx86qzrg3v1higfr54b1l"; depends=[lars rms]; };
   FeatureHashing = derive2 { name="FeatureHashing"; version="0.9.1.3"; sha256="0k8n3c0yiz6bb9rq6ra8z2hypb4hw4qcsdfbrgrw74kqivscs62i"; depends=[BH digest magrittr Matrix Rcpp]; };
   FedData = derive2 { name="FedData"; version="2.5.7"; sha256="07qgqhd3pg86qsih1ap7j02vriwabqna974q68bapfm52qnvm77z"; depends=[curl data_table devtools dplyr foreach Hmisc httr igraph lubridate magrittr ncdf4 raster readr rgdal rgeos sf sp stringr tibble xml2]; };
@@ -1390,7 +1417,7 @@ in with self; {
   FisherEM = derive2 { name="FisherEM"; version="1.5.1"; sha256="1s7gfdw840f51mn76jvcnwpwcf3dzf2w81wlyxqkij45sink92yz"; depends=[elasticnet MASS]; };
   FitAR = derive2 { name="FitAR"; version="1.94"; sha256="1mkk3kvfq4v0pdabnhbwrk31ji2mv2v6ns16xsvvr1qyg2fnx6hq"; depends=[bestglm lattice leaps ltsa]; };
   FitARMA = derive2 { name="FitARMA"; version="1.6.1"; sha256="02di0pkz6hh92glpn3li6z9azkcqa64ja8zfpy0mkh1l97mw6jsv"; depends=[FitAR]; };
-  FitUltD = derive2 { name="FitUltD"; version="3.0.0"; sha256="1dk2hsvak6gszlr44ajcflgf77akmqz8hf7p50pvhj3mqfd7c9fy"; depends=[ADGofTest assertthat cowplot fitdistrplus ggplot2 MASS mclust purrr]; };
+  FitUltD = derive2 { name="FitUltD"; version="3.1.0"; sha256="17fj211riybq71k63wjfv2ndc2h46ay5svrac2v5i3b92cb9hkbv"; depends=[ADGofTest assertthat cowplot fitdistrplus ggplot2 MASS mclust purrr]; };
   FixSeqMTP = derive2 { name="FixSeqMTP"; version="0.1.2"; sha256="0v1cwq8gapgandm7wiw8p6av6qigydlpmwi6w02p1y7f0hf5ifnp"; depends=[]; };
   FixedPoint = derive2 { name="FixedPoint"; version="0.6.1"; sha256="0fxs95rhx17bxv1xx207f83rn4x35gahws4a0n85mfmlb5x2rf5d"; depends=[MASS]; };
   FlexDir = derive2 { name="FlexDir"; version="1.0"; sha256="1gb5alv9jsnw0135g63cy757pxhdw6cgwfm8dpcm8dj9zqg10dkm"; depends=[]; };
@@ -1399,10 +1426,10 @@ in with self; {
   FlexScan = derive2 { name="FlexScan"; version="0.1.0"; sha256="02p8rh3krh30hmzykm03qvm0g1qcrqzcgzlzlww61pswd9j1g53m"; depends=[smerc sp spdep]; };
   FlickrAPI = derive2 { name="FlickrAPI"; version="0.1.0.0"; sha256="0bbk7ac4s3gbcjhfg3yz06pxjid3hpd0mqzxzlj5sghn95f479h9"; depends=[jsonlite magrittr RCurl stringr]; };
   FloodMapper = derive2 { name="FloodMapper"; version="1.0"; sha256="09pr6324namqrwdr2impgqmdmsf34g9pq91091cg9b1031djgzyq"; depends=[magick raster rgdal sp]; };
-  FlowCAr = derive2 { name="FlowCAr"; version="1.0.0"; sha256="19pn29p99j85p8mzjnlkqjr9nbxr3vffahs53i85s1gajb9ynpk4"; depends=[enaR LIM limSolve]; };
+  FlowCAr = derive2 { name="FlowCAr"; version="1.1.1"; sha256="0ddds4726rf38153biz5sgmmyi2knw43vmv2fa7njrjxadsiwclq"; depends=[enaR LIM limSolve]; };
   FlowRegEnvCost = derive2 { name="FlowRegEnvCost"; version="0.1.1"; sha256="0lw4kv4z0s23jy11y53rxxh7zxa7vajxrcnjgxd74xxs64vjlj88"; depends=[zoo]; };
   FlowScreen = derive2 { name="FlowScreen"; version="1.2.6"; sha256="1s9xyrvfsgrl2zxm2an5qj3rs1qx7v7j8wc83jzl28pkwa5xr351"; depends=[changepoint evir zyp]; };
-  FluMoDL = derive2 { name="FluMoDL"; version="0.0.2"; sha256="193xyzc20nb1hsj172alky7h661j8m1r42x3xh1h22yzb1hb6dn4"; depends=[dlnm mvmeta tsModel]; };
+  FluMoDL = derive2 { name="FluMoDL"; version="0.0.3"; sha256="0vp3w6hpph6svz8940w9yk9c5iv4n9mj94f9si1ks0xjbi948rqd"; depends=[dlnm mvmeta tsModel]; };
   Flury = derive2 { name="Flury"; version="0.1-3"; sha256="105fv9azjkd8bsb9b8ba3gpy3pjnyyyp753qhrd11byp3d0bbxy0"; depends=[]; };
   ForIT = derive2 { name="ForIT"; version="1.0"; sha256="0mi2cw09mbc54s8qwcwxin2na1gfyi60cdssy2ncynma7alq3733"; depends=[]; };
   ForImp = derive2 { name="ForImp"; version="1.0.3"; sha256="0ai4i6q233sdsi8xilpbkxjqdf4pxw93clkdkhcxal6q43rnf7vd"; depends=[homals mvtnorm sampling]; };
@@ -1410,7 +1437,7 @@ in with self; {
   ForecastComb = derive2 { name="ForecastComb"; version="1.3.1"; sha256="07cbiv172mpkwvg6svhwgavlfy2144ir3y1l7w37wbd0ygs514id"; depends=[forecast ggplot2 Matrix mtsdi psych quadprog quantreg]; };
   ForecastCombinations = derive2 { name="ForecastCombinations"; version="1.1"; sha256="07vzgm2jy992p1l9b8rsv2lbc8cbfzvql85n5ah4p4l3zjxdxgk9"; depends=[quadprog quantreg]; };
   ForecastFramework = derive2 { name="ForecastFramework"; version="0.10.1"; sha256="0g9d7248zadbhr5gs0rnl2ckjj4xa08nkwlb8kfsvdnnfzihcz4p"; depends=[abind dplyr lubridate magrittr R6 reshape2 tibble]; };
-  ForestFit = derive2 { name="ForestFit"; version="0.3"; sha256="02yv6f76pd9lw38yfb87nbb4z6cj9l0j67ddricfxxzlxmz6n8hv"; depends=[ars cluster]; };
+  ForestFit = derive2 { name="ForestFit"; version="0.4.1"; sha256="06lylnd1jhx0nhvqhir8v98lpli54alcvjdpgmvaw1zgyz154hd0"; depends=[ars]; };
   ForestGapR = derive2 { name="ForestGapR"; version="0.0.2"; sha256="0xig9nal83xg312kgq6dhi7n67sa8ixlnh79x957w3n5rv9kdyf2"; depends=[igraph raster rgeos sp spatstat VGAM viridis]; };
   ForestTools = derive2 { name="ForestTools"; version="0.2.0"; sha256="0q9nk9n001bnz5hd8cxj6wmaf8c7g0kwfkpa0hk6ap42666rrrah"; depends=[APfun imager raster rgeos sp]; };
   FormalSeries = derive2 { name="FormalSeries"; version="1.0"; sha256="09m4ifinasww0xfprs29xsrqhxxkw9zffb3919xnkkjkwp0nax4v"; depends=[]; };
@@ -1419,7 +1446,7 @@ in with self; {
   FossilSim = derive2 { name="FossilSim"; version="2.1.1"; sha256="1dffk14lszq84k61s1jar658qpjc1hm6rwa1gcwwvppvxj6gkvky"; depends=[ape TreeSim]; };
   FourScores = derive2 { name="FourScores"; version="1.5.1"; sha256="1la9d1hfcmi0zg58yl0a7nj36giagh0fwrc7wxyqdq0c7zf1hfzq"; depends=[]; };
   FourgameteP = derive2 { name="FourgameteP"; version="0.1.0"; sha256="15yn47737768fkjjv8ykc9lw7x58pq44k90d9d4c9hp20zw5f3by"; depends=[]; };
-  FrF2 = derive2 { name="FrF2"; version="1.7-3"; sha256="11x9jpj0l5w7195gryimfmii84nk76ll1z6hrrzr2v9y4jcxpx4s"; depends=[BsMD DoE_base igraph scatterplot3d sfsmisc]; };
+  FrF2 = derive2 { name="FrF2"; version="2.1"; sha256="01sihw40jyjy07i2cy7k4pk3ck13mb31djk15j2s37b786z05fmj"; depends=[BsMD DoE_base igraph scatterplot3d sfsmisc]; };
   FrF2_catlg128 = derive2 { name="FrF2.catlg128"; version="1.2-1"; sha256="0i4m5zb9dazpvmnp8wh3k51bm0vykh4gncnhdg71mfk4hzrfpdac"; depends=[FrF2]; };
   FractalParameterEstimation = derive2 { name="FractalParameterEstimation"; version="1.1.2"; sha256="16xm2g723dm1n1h6as6yvy92sigzhj31f269g5rrzqjcd4d5m8an"; depends=[]; };
   Fragman = derive2 { name="Fragman"; version="1.0.9"; sha256="03vmvmnyza4i46v1awkdjz6ccbsiq49dm0mlmwsm801rq6yfihgp"; depends=[]; };
@@ -1427,10 +1454,11 @@ in with self; {
   FreeSortR = derive2 { name="FreeSortR"; version="1.3"; sha256="1m6ahhixbbizzn09pz71zvinrdshn3j6gmy05jdxa9d932agqk0w"; depends=[ellipse smacof vegan]; };
   FreqProf = derive2 { name="FreqProf"; version="0.0.1"; sha256="1yqn2435l2sghfcv5mma0rv9yqvpa69z8cqqsjlrlbih9gib82d4"; depends=[ggplot2 reshape2 shiny]; };
   Fstability = derive2 { name="Fstability"; version="0.1.2"; sha256="0kscdmrs5namvhi112b47c811w0bg9s3xg48mfa566pxwxz1nv45"; depends=[]; };
-  FunChisq = derive2 { name="FunChisq"; version="2.4.5-3"; sha256="0ic912ygjj5gm1s6cn32di5hqxdh9pdn9xhs3wngd92s8anm3axl"; depends=[BH Rcpp]; };
+  FunChisq = derive2 { name="FunChisq"; version="2.4.9.1"; sha256="1yfpd6hccymx4s59d1yyz7c4fd478rxsimdkwkyg8cw12qq93nfl"; depends=[BH Rcpp]; };
   FunCluster = derive2 { name="FunCluster"; version="1.09"; sha256="0i73asn1w4s6ydf2ddn5wpr0mwbbxzgmaly1pslarzkx71wk03fz"; depends=[cluster Hmisc]; };
   FuncMap = derive2 { name="FuncMap"; version="1.0.10"; sha256="0iaay6qz9a2s77xjfpp7wm37y7xwnvmlw6s5k5riccmqzc6dcjs7"; depends=[mvbutils]; };
   FunctionalNetworks = derive2 { name="FunctionalNetworks"; version="1.0.0"; sha256="071hjgiccbrf1gxrh7niw2w1p6vgc77qvrildi59xhk53qcwzqdp"; depends=[Biobase breastCancerVDX]; };
+  FunnelPlotR = derive2 { name="FunnelPlotR"; version="0.2.0"; sha256="1qhzxxvli4zirv7fgikfww3rdwgr6plnm4zzwggbcfq9kamzylhn"; depends=[dplyr ggplot2 ggrepel rlang scales]; };
   FusionLearn = derive2 { name="FusionLearn"; version="0.1.1"; sha256="0n8bj7k2r2vf0v2nsw31k75hzkqj5l4hyfnmvid102hx9cl8hv3y"; depends=[]; };
   Fuzzy_p_value = derive2 { name="Fuzzy.p.value"; version="1.1"; sha256="13h6armh9g57zqxyjqk6mq81jlfqxqrg2sb5p9rrhslka5m01zis"; depends=[FuzzyNumbers]; };
   FuzzyAHP = derive2 { name="FuzzyAHP"; version="0.9.1"; sha256="056k3gr257qg5wzcgaw0ad5y5cfzdlqkfypl170f0yy0l7gfzag1"; depends=[MASS]; };
@@ -1466,15 +1494,15 @@ in with self; {
   GCPM = derive2 { name="GCPM"; version="1.2.2"; sha256="0k2ng78bk3bxpj6nz80j5cvjd56zjz328ga68vyyc3hvdjgpspqj"; depends=[Rcpp RcppProgress]; };
   GCalcium = derive2 { name="GCalcium"; version="1.0.0"; sha256="0r84qmdsqsgpaqr08imh48mdvy26s2b62hi0hxxwhr9kg7qvj0rd"; depends=[caTools dplyr]; };
   GCalignR = derive2 { name="GCalignR"; version="1.0.2"; sha256="1x0as6mmapvn3a28c3qk3wd5gjkx17xgf9c7yb68wp3lj8pknsnm"; depends=[ggplot2 pbapply readr reshape2 stringr]; };
-  GD = derive2 { name="GD"; version="1.6"; sha256="1rlgr4z4ibz5m8m18mw11bqcbbvfjxw2mljg78jp0lb294zh1kbb"; depends=[BAMMtools ggplot2 reshape2]; };
+  GD = derive2 { name="GD"; version="1.7"; sha256="1jazyvkqjjqc8m7hnc0ld4hdzbx7g64bhd5j6mkgjjwa2458rqph"; depends=[]; };
   GDAdata = derive2 { name="GDAdata"; version="0.93"; sha256="13ks97i289rc4i7gpqrifwbj0m9rx8csjhnfg8mad10qmjwz7p8b"; depends=[]; };
   GDAtools = derive2 { name="GDAtools"; version="1.4"; sha256="1i5g7gzl3fkhwxqizqwrn8098s5lrr0mk17wmpyf92s1sy315cpv"; depends=[FactoMineR nleqslv nnet]; };
   GDELTtools = derive2 { name="GDELTtools"; version="1.2"; sha256="1rx6kjh7kmyycqapvbizcxkcfp09qvqv7k8f25v333sxkacpz6p5"; depends=[plyr TimeWarp]; };
-  GDINA = derive2 { name="GDINA"; version="2.6.0"; sha256="02smx1q0a5zgms6h2dnl2786jss38vim8n3vh3dbsijkvj7m4cb9"; depends=[alabama ggplot2 MASS nloptr numDeriv Rcpp RcppArmadillo Rsolnp shiny shinydashboard]; };
+  GDINA = derive2 { name="GDINA"; version="2.7.3"; sha256="0875xfbm36gqzr0116xzlbm8rlff85rybr4s4hjzfflfvjdhgvfx"; depends=[alabama ggplot2 MASS nloptr numDeriv Rcpp RcppArmadillo Rsolnp shiny shinydashboard]; };
   GEEaSPU = derive2 { name="GEEaSPU"; version="1.0.2"; sha256="02pwjqd94kranc1f69bx9rzk27kchavhvhl9fygjhrr40nwq3pbg"; depends=[gee Rcpp RcppArmadillo]; };
   GEEmediate = derive2 { name="GEEmediate"; version="1.1.3"; sha256="1xprkpjp1pkq4ci1n32d3yy80hx3r4xf2j7f6hv7dvsn4cvdp417"; depends=[gee]; };
-  GENEAclassify = derive2 { name="GENEAclassify"; version="1.4.17"; sha256="0v2aa9ig49vc8dz0s91bvs9jilca3pg8zxq7r2w6x195arb3ngga"; depends=[changepoint GENEAread MASS rpart signal]; };
-  GENEAread = derive2 { name="GENEAread"; version="2.0.6"; sha256="1idqfg1ma8sy48j8v875j29p72slfqaj8cix6l9gpwlry6lnhg4g"; depends=[bitops mmap]; };
+  GENEAclassify = derive2 { name="GENEAclassify"; version="1.4.18"; sha256="17m58i3jridgxzcckcm0ydd2ijw3zjvg9w4an8j5jbnr62hmcb2s"; depends=[changepoint GENEAread MASS rpart signal]; };
+  GENEAread = derive2 { name="GENEAread"; version="2.0.7"; sha256="0qx14frs8h81k824z3ham0r3lf7hcvmbhcvkwhhzdz18ggfcdr6m"; depends=[bitops mmap]; };
   GENLIB = derive2 { name="GENLIB"; version="1.0.6"; sha256="0xyq3ggi814vi3x5kxffhi7ygvzcfj3pg0kfi7whcjpi3pjg05h8"; depends=[bootstrap doParallel foreach kinship2 lattice Matrix quadprog Rcpp]; };
   GENMETA = derive2 { name="GENMETA"; version="0.1"; sha256="1mxwqnbg5bvx1qg62xcd62dl81k11l64yckhl3v854asnaczq3pp"; depends=[magic MASS Matrix]; };
   GEOmap = derive2 { name="GEOmap"; version="2.4-4"; sha256="0wk2v0fwcwcm59k711fg829h2w58wkd36im4mg974iai6mqif7qh"; depends=[fields MBA RPMG splancs]; };
@@ -1493,7 +1521,7 @@ in with self; {
   GFORCE = derive2 { name="GFORCE"; version="0.1.4"; sha256="1x7dvzgnqfvyvp6ibdsnrn5q01ivcgkzkh0mv8nfwqg5zr78v2cz"; depends=[lpSolve MASS]; };
   GGEBiplotGUI = derive2 { name="GGEBiplotGUI"; version="1.0-9"; sha256="0nd0ky3m1avy82z48g7hcysq0y0agxjxdn0g624dkm2w99avxw3j"; depends=[rgl tkrplot]; };
   GGEBiplots = derive2 { name="GGEBiplots"; version="0.1.1"; sha256="1xnxaylikjd378flw3rqw36z27b2limkmyad97zhf1cbva317d1b"; depends=[gge GGEBiplotGUI ggforce ggplot2 scales]; };
-  GGIR = derive2 { name="GGIR"; version="1.9-2"; sha256="1qdk0nq2ahznphi6hjr5c1r877xxgqi58bpsayzh19lnzckrcc92"; depends=[data_table Rcpp]; };
+  GGIR = derive2 { name="GGIR"; version="1.10-4"; sha256="1mdxknp4gc8blfs8lsywamdxa4ki9yf0yzwmjinyasq9mg4a1snm"; depends=[bitops data_table doParallel foreach GENEAread matlab Rcpp signal tuneR zoo]; };
   GGMM = derive2 { name="GGMM"; version="1.0.1"; sha256="1d0qxxdk7b3hzg7dimsbjabpf5rxn3azn2hy00pa1c6wya7kxyvv"; depends=[equSA huge mvtnorm]; };
   GGMridge = derive2 { name="GGMridge"; version="1.1"; sha256="0zbfvvp7l836m118m8nmdvw1w7xq6d3b7qirskjsq1dkk23j41hs"; depends=[MASS mvtnorm]; };
   GGMselect = derive2 { name="GGMselect"; version="0.1-12.2"; sha256="16d4nz5x3yy9lw974gdls18fnx7g1hfghzfq3wh7739c54pvd5gs"; depends=[gtools lars mvtnorm]; };
@@ -1503,24 +1531,24 @@ in with self; {
   GHS = derive2 { name="GHS"; version="0.1"; sha256="1khjfy62a67r59s2rax9mmnqy5xnnwhbydzhqwwmyspl48mxycdj"; depends=[MASS]; };
   GIGrvg = derive2 { name="GIGrvg"; version="0.5"; sha256="0mx4n4kf34343yiww80fw5yy0x624xsj71n8fr4dm0a2338pxq8v"; depends=[]; };
   GISTools = derive2 { name="GISTools"; version="0.7-4"; sha256="06alb5d2k4qj344i9cpgm3lz9m68rkmjqfx5k2hzn7z458xjrlxs"; depends=[maptools MASS RColorBrewer rgeos sp]; };
-  GJRM = derive2 { name="GJRM"; version="0.2"; sha256="1mzlrvr0jqi52m5k9dzy7d273sywk2yzwamgxphh0m2rwddz85v3"; depends=[copula distrEx evd gamlss_dist ggplot2 magic matrixcalc matrixStats mgcv mnormt numDeriv psych Rmpfr scam survey survival trust trustOptim VGAM VineCopula]; };
+  GJRM = derive2 { name="GJRM"; version="0.2-1"; sha256="12kbd8nd43fi4vwjc9qpjwcndwx9zq19w0adqxivmlvxhflh93mb"; depends=[copula distrEx evd gamlss_dist ggplot2 ismev magic matrixcalc matrixStats mgcv mnormt numDeriv psych Rmpfr scam survey survival trust trustOptim VGAM VineCopula]; };
   GK2011 = derive2 { name="GK2011"; version="0.1.3"; sha256="13vafhbgcsj485f12qv962y07v3hil3pla51vkl2b030amzy86jv"; depends=[]; };
-  GLDEX = derive2 { name="GLDEX"; version="2.0.0.5"; sha256="0mr8qhccp8dndp43v8ym22f4djrjr8qcxbv61lwabk2462llwln6"; depends=[cluster]; };
+  GLDEX = derive2 { name="GLDEX"; version="2.0.0.6"; sha256="0s8nahy2mdmqlp8z5zsa3mvynwikrna8ks6xj6g2v4j64qd19p09"; depends=[cluster]; };
   GLDreg = derive2 { name="GLDreg"; version="1.0.7"; sha256="1wjrr4x1k0fz8nx9idb4ysamldypriiypj96b5v028lx38jwsk3l"; depends=[ddst GLDEX]; };
   GLIDE = derive2 { name="GLIDE"; version="1.0.2"; sha256="1z5h8br6aig24g5gsh8h6npm269id3h5gjjyf5avs4v08b51rpcv"; depends=[doParallel foreach MASS]; };
   GLMMRR = derive2 { name="GLMMRR"; version="0.2.0"; sha256="0s3jfh720acfmbadilq2c6gql3yifsbijpmw1jkzbsdc87pqi1db"; depends=[lattice lme4]; };
-  GLMMadaptive = derive2 { name="GLMMadaptive"; version="0.6-0"; sha256="0qf6rx93h9mgvzlraiy000sy9zl5jyn48yn3zi3av389dd35nr6a"; depends=[MASS nlme]; };
+  GLMMadaptive = derive2 { name="GLMMadaptive"; version="0.6-5"; sha256="1n2xs4apf477bkyzw3p5zfmm3dzs4ja0m03b1vg8iic44d0nnxzv"; depends=[MASS matrixStats nlme]; };
   GLMaSPU = derive2 { name="GLMaSPU"; version="1.0"; sha256="0zx2bza5v5cfp9v7hf42s57522b6prawcwl77aa3kvjcnb0ish6g"; depends=[MASS mnormt mvtnorm Rcpp RcppArmadillo]; };
   GLMpack = derive2 { name="GLMpack"; version="0.1.0"; sha256="15bpw42y999ljdw8ka2ysrrm0y73xz37wwi3j67i01wafipq82xy"; depends=[AER censReg effects foreign lme4 lmtest MASS Matrix nnet pBrackets plm pscl sandwich]; };
   GLMsData = derive2 { name="GLMsData"; version="1.0.0"; sha256="12q41zxniblzys20vjrf5skj8cbzlwb92mwk6jvnyd86lc70bsh1"; depends=[]; };
   GLSE = derive2 { name="GLSE"; version="0.1.0"; sha256="1snzcz637ppz3lkg1575ln3shfidkrnynqh1d8b5rk0z0974bpm1"; depends=[gRbase igraph mvtnorm]; };
-  GLSME = derive2 { name="GLSME"; version="1.0.4"; sha256="1bh56dv4czl89dm9b6syfpsbds4wni03d5vamvjbp6wblhysxnpm"; depends=[corpcor mvtnorm]; };
+  GLSME = derive2 { name="GLSME"; version="1.0.5"; sha256="18gixzg8b8yql91dhv8xsrcrxdix0kr0qgmiva0hwmyzpsn6rqam"; depends=[corpcor mvtnorm]; };
   GMAC = derive2 { name="GMAC"; version="3.0"; sha256="0c2cfpr8dik7j5br87hkvswrhqzj5vcna54gw6ffdf1rk9rz9j22"; depends=[]; };
   GMCM = derive2 { name="GMCM"; version="1.3.2"; sha256="0sm08kf6ia2fi69zqv4nhnlk71v75b5sz2vd3aj0kfhgan7bl93i"; depends=[ellipse Rcpp RcppArmadillo]; };
   GMDH = derive2 { name="GMDH"; version="1.6"; sha256="093glyz73246m5f2xb2xgbgi80haj4fanmr325byr99dnf4x35yn"; depends=[MASS]; };
   GMDH2 = derive2 { name="GMDH2"; version="1.5"; sha256="0y132zc8q4daj4856xikp4xvrqcibmn9r2shnmwpwxnfbik2ikfb"; depends=[e1071 glmnet magrittr MASS nnet plotly randomForest xtable]; };
   GMDHreg = derive2 { name="GMDHreg"; version="0.2.0"; sha256="07qk9jbav9gm3gh3ag7nz273iab5zlkn0yz31zs2hw646ik1yn14"; depends=[]; };
-  GMMAT = derive2 { name="GMMAT"; version="1.1.0"; sha256="0b6bw33bldnc525aka14bil7fcdjcr18hr92ln9p9afpqajzkayz"; depends=[CompQuadForm foreach Matrix Rcpp RcppArmadillo SeqArray SeqVarTools]; };
+  GMMAT = derive2 { name="GMMAT"; version="1.1.1"; sha256="07ypfgk8jd4aymmbcdvcwflj1avhv4yigyqsyq5sslmw94ld0n5z"; depends=[CompQuadForm foreach Matrix Rcpp RcppArmadillo SeqArray SeqVarTools]; };
   GMMBoost = derive2 { name="GMMBoost"; version="1.1.2"; sha256="01q165vkdiv4qh96lha0g2g94jpnzdclbby6q43ghh9j1yrd4qzj"; depends=[magic minqa]; };
   GMSE = derive2 { name="GMSE"; version="0.4.0.11"; sha256="1by65202swxcj453q3frac02b2lwny1mm1i95vcjhkqihqkffl2z"; depends=[shiny shinydashboard shinyjs]; };
   GMSimpute = derive2 { name="GMSimpute"; version="0.0.1.0"; sha256="1hmn5ss81df9j9ibgibs95j98irqzif94vq0c861mq4a65y59fcp"; depends=[ggplot2 glmnet reshape2]; };
@@ -1543,13 +1571,14 @@ in with self; {
   GPareto = derive2 { name="GPareto"; version="1.1.3"; sha256="1my93nyipg0ldhf95j91hznzr48c8601a802qb18776gb3c2bpcv"; depends=[DiceDesign DiceKriging emoa KrigInv ks MASS pbivnorm pso randtoolbox Rcpp rgenoud rgl]; };
   GPfit = derive2 { name="GPfit"; version="1.0-8"; sha256="05mpiyi2vxv0wqp422n1mnxa8msc4daq40cwpnpngbcwqhlgqkby"; depends=[lattice lhs]; };
   GPoM = derive2 { name="GPoM"; version="1.2"; sha256="1hhwdpish8j3j9y5q6r5pdsl1kpbwp1hjhcq24iiz4lfssib4k9f"; depends=[deSolve rgl]; };
+  GPoM_FDLyapu = derive2 { name="GPoM.FDLyapu"; version="1.0"; sha256="1hpgiwh7b50gazp1msjsh2840b91wfrxhl2l45lxg6jr1m34q8pj"; depends=[deSolve GPoM]; };
   GPrank = derive2 { name="GPrank"; version="0.1.4"; sha256="06j5fk427jkp5lphqlx48vfp4fagnxxnv4iyjcha8nvkswcblwgy"; depends=[gptk matrixStats RColorBrewer tigreBrowserWriter]; };
   GPvam = derive2 { name="GPvam"; version="3.0-5"; sha256="0inhhx5ll4ybkwp71ijigxlyxsa0rdyxb38kgfgxb588dsk4scjz"; depends=[Matrix numDeriv Rcpp RcppArmadillo]; };
+  GPvecchia = derive2 { name="GPvecchia"; version="0.1.0"; sha256="0fldgvhp3634p7pdsjl2b97p79vdar2p6cqg8xvibdi88vbnf3wr"; depends=[BH fields FNN GpGp Matrix Rcpp RcppArmadillo sparseinv]; };
   GRANBase = derive2 { name="GRANBase"; version="2.5.0"; sha256="1sc7f47dnrwww89v4n8y41zvc9z8i8lv7qgya6nwf98vh9b6ifmi"; depends=[covr dplyr GRANCore htmlTable jsonlite markdown RCurl sendmailR stringi switchr]; };
   GRANCore = derive2 { name="GRANCore"; version="0.2.3"; sha256="1f3f34pk0y12yv9cl84ggg40p0bam0x48avrk5f56jskfr475kqk"; depends=[switchr]; };
   GRAPE = derive2 { name="GRAPE"; version="0.1.1"; sha256="1jzvf45ch8x8f2x9kmvv02xz9bix5vplh8143vc4m1yyq42x09c6"; depends=[]; };
   GRCdata = derive2 { name="GRCdata"; version="1.0"; sha256="0nshii6kfvffncgcrmm7wvniq94j9djj84jikcb6ck49viikkrky"; depends=[cubature nloptr]; };
-  GREP2 = derive2 { name="GREP2"; version="1.0.1"; sha256="0sr7r6c4xnhwdq4j1v3frzc063hhghinx8dl952li5cy8rqk8ga5"; depends=[AnnotationDbi Biobase EnsDb_Hsapiens_v86 EnsDb_Mmusculus_v79 EnsDb_Rnorvegicus_v79 GenomicFeatures GEOquery org_Hs_eg_db org_Mm_eg_db org_Rn_eg_db RCurl rentrez tximport XML]; };
   GROAN = derive2 { name="GROAN"; version="1.2.0"; sha256="14n3k1wwz5pn82wcj00cdns4bp699f58k1nj8hp8jn0q7xr2sgv5"; depends=[plyr rrBLUP]; };
   GRS_test = derive2 { name="GRS.test"; version="1.1"; sha256="1ap9453rj5zan6c3ix7jb1qxhxh42bfv295dgqbgjpdygjdlbm6n"; depends=[]; };
   GRTo = derive2 { name="GRTo"; version="1.3"; sha256="1xkcx2agvrpfnmplgaqx70vz303v8rhwnxdyr4hmdlf4h92lbv8i"; depends=[bootstrap]; };
@@ -1558,11 +1587,11 @@ in with self; {
   GSAfisherCombined = derive2 { name="GSAfisherCombined"; version="1.0"; sha256="1xhq5nc3kbz3ml9qkdxm6m0c65fybabfhgqlwii2105jl0ll7qy5"; depends=[]; };
   GSAgm = derive2 { name="GSAgm"; version="1.0"; sha256="18bhk67rpss6gg1ncaj0nrz0wbfxv7kvy1cxria083vi60z0vwbb"; depends=[edgeR survival]; };
   GSE = derive2 { name="GSE"; version="4.2"; sha256="0vrxn6j5brhwd38zqnr6m3in3hp1xfs1mfhps9qsj20d4w8d1rf9"; depends=[cellWise ggplot2 MASS Rcpp RcppArmadillo robustbase rrcov]; };
-  GSED = derive2 { name="GSED"; version="2.3"; sha256="1mpbgdgz6c42bq8klk8b43clspbrnqs3vnrk7i5qjy7ngrd96c6i"; depends=[memoise rootSolve survival]; };
+  GSED = derive2 { name="GSED"; version="2.5"; sha256="0hz7rn0j62gy7bv67dxqpfdq86zv3yqhl9pwafcism94636h8vrj"; depends=[memoise R_utils rootSolve survival]; };
   GSIF = derive2 { name="GSIF"; version="0.5-5"; sha256="104v01yifpagj7kyjfy80c4dgn9wv76py0av90vmgc55qynmvv19"; depends=[aqp dismo gstat plotKML plyr raster rgdal RSAGA scales sp]; };
   GSM = derive2 { name="GSM"; version="1.3.2"; sha256="04xjs9w4gaszwzxmsr7657ry2ywa9pvpwpczpvinxi8vpj347jbb"; depends=[gtools]; };
   GSMX = derive2 { name="GSMX"; version="1.3"; sha256="1n1d7rixj14ari46snsmi48qfmy00ihmzvayk3hkrp2d2d0xi2gh"; depends=[MASS]; };
-  GSODR = derive2 { name="GSODR"; version="1.3.2"; sha256="06narp682zs33gycw1bwgwp2crxk5a345f17n3l9gshgs0gg8x0w"; depends=[curl dplyr future_apply magrittr purrr R_utils readr rlang tibble]; };
+  GSODR = derive2 { name="GSODR"; version="2.0.0"; sha256="1z8j6filfbqc83z495lw3qwwvd3xm35p7r00n74h9qabgvpydycd"; depends=[countrycode curl data_table future_apply httr R_utils]; };
   GSSE = derive2 { name="GSSE"; version="0.1"; sha256="034mmxa6kjq5kgikhb5q75viagz5ck9irrjbxm26zq9099qxm13b"; depends=[Iso zoo]; };
   GSparO = derive2 { name="GSparO"; version="1.0"; sha256="0xna2crxqwy8fj0s79rxbdcaz9x912rp1vdwqv1557fsnmfv2yf0"; depends=[ggplot2 ThreeWay]; };
   GUIDE = derive2 { name="GUIDE"; version="1.2.7"; sha256="0klaczmn3jnlzyh45yaqlc897irjfk467f4w03awmflaiwan3h6v"; depends=[rpanel tkrplot]; };
@@ -1575,7 +1604,7 @@ in with self; {
   GWAF = derive2 { name="GWAF"; version="2.2"; sha256="11lk1dy24y1d0biihy2aypdvlx569lw1pfjs51m54rhgpwzkw6yd"; depends=[coxme geepack lme4]; };
   GWASExactHW = derive2 { name="GWASExactHW"; version="1.01"; sha256="19qmk8h7kxmn9kzw0x4xns5p3qqz27xkqq4q6zmh4jzizd0fsl78"; depends=[]; };
   GWASinlps = derive2 { name="GWASinlps"; version="1.2"; sha256="036lv8f58kz6qdwaviyk1q1qsgcj9cimipq1cjrfpn8snkn7s1gh"; depends=[horseshoe mombf speedglm]; };
-  GWASinspector = derive2 { name="GWASinspector"; version="1.1.2"; sha256="0qvyp8camwvml0yi3p7zx6n8xilzbgaz77qmxnrffyxbnxbpjnha"; depends=[data_table futile_logger ggplot2 gridExtra hash ini kableExtra knitr rmarkdown RSQLite]; };
+  GWASinspector = derive2 { name="GWASinspector"; version="1.2"; sha256="1y7411n14fm1nnmp3hr80cgqd42mka9rkbx0hdpi2h82giqik7ms"; depends=[data_table futile_logger ggplot2 gridExtra hash ini kableExtra knitr rmarkdown RSQLite]; };
   GWEX = derive2 { name="GWEX"; version="1.0.1"; sha256="1bpjygx38rkicya37x6d88k34yc0ysr3pyfp4ci5px1xsic5cpmy"; depends=[abind doParallel EnvStats fGarch foreach lmomco MASS mvtnorm nleqslv Renext]; };
   GWG = derive2 { name="GWG"; version="1.0"; sha256="1va0cd229dhhi1lmrkpwapcm96hrdmxilrmba02xnl7ikhisw0my"; depends=[]; };
   GWLelast = derive2 { name="GWLelast"; version="1.2.2"; sha256="1nm4w5m4ca6npmpvh9nb0cnrbzlyv95nvvhgs3pqcrw4igagm4hj"; depends=[doParallel foreach geosphere glmnet sp spgwr]; };
@@ -1589,10 +1618,10 @@ in with self; {
   GauPro = derive2 { name="GauPro"; version="0.2.2"; sha256="127agnhqbbavcf7sx0zq1c8ldh3w1d1iz5bpd1ixxkyaapmiq4qy"; depends=[lbfgs R6 Rcpp RcppArmadillo]; };
   GaussianHMM1d = derive2 { name="GaussianHMM1d"; version="1.0.1"; sha256="1j1cwh0p7czy2l4qf6nymqcp8kkfaki0j2rj8p99nqn2vgc3vcax"; depends=[doParallel foreach]; };
   GeDS = derive2 { name="GeDS"; version="0.1.3"; sha256="1ddq4hnyl3m3s4cchccxiqphi742ljcm86zqpa01a5nrjbnr87x6"; depends=[Matrix Rcpp Rmpfr]; };
-  GeNetIt = derive2 { name="GeNetIt"; version="0.1-1"; sha256="1xjz22m4yn642m0bqa33w4m2rygpxjwg43c54lw168jck9zzgv1f"; depends=[nlme raster rgeos sp spatialEco spdep]; };
+  GeNetIt = derive2 { name="GeNetIt"; version="0.1-2"; sha256="0frrbakgnng52fvf912rywmcay2ncc01akb6jw9hlixn2qjr0rr1"; depends=[nlme raster rgeos sp spatialEco spdep velox]; };
   GenAlgo = derive2 { name="GenAlgo"; version="2.1.5"; sha256="0d3y9kc2njsbzdngv67d4qrdsnn7nsxph5acc09vmwxpv1cyhxiw"; depends=[ClassDiscovery MASS oompaBase]; };
   GenBinomApps = derive2 { name="GenBinomApps"; version="1.0-2"; sha256="1ps1rq8cjlwh658mysdh3xbn5fihanzcwxb38xvg4031vnwv80in"; depends=[]; };
-  GenEst = derive2 { name="GenEst"; version="1.3.0"; sha256="0bqnn78vjxc92gdi09qvijyc0fp5z5r3lmijaxs0zrvlp1r120j7"; depends=[cbinom corpus DT gsl gtools htmltools lubridate matrixStats mvtnorm Rcpp shiny shinyjs sticky survival]; };
+  GenEst = derive2 { name="GenEst"; version="1.3.2"; sha256="00g7f94f8db22zgs972a0j07w3ri5ga09436x5bhj3zng7yfagjm"; depends=[corpus DT gsl gtools htmltools lubridate matrixStats mvtnorm Rcpp shiny shinyjs sticky survival]; };
   GenForImp = derive2 { name="GenForImp"; version="1.0"; sha256="1wcvi52fclcm6kknbjh4r9bpkc2rg8nk6cddnf5j8zqbvrwf4k5x"; depends=[mvtnorm sn]; };
   GenKern = derive2 { name="GenKern"; version="1.2-60"; sha256="12qmd9ydizl7h178ndn25i4xscjnrssl5k7bifwv94m0wrgj4x6c"; depends=[KernSmooth]; };
   GenOrd = derive2 { name="GenOrd"; version="1.4.0"; sha256="17mfrj1fwj8mri1w0bl2pw1rqriidmd67i7gpn9v56g9dzw5rzms"; depends=[MASS Matrix mvtnorm]; };
@@ -1619,14 +1648,15 @@ in with self; {
   GeoLight = derive2 { name="GeoLight"; version="2.0.0"; sha256="1i49hyj3f5rcw0s6j2csnfwc6mnp5zn44vxjnk05wdkpw6dpvx5i"; depends=[changepoint fields maps MASS]; };
   GeoMongo = derive2 { name="GeoMongo"; version="1.0.1"; sha256="19wim724sgmxx9rd5yvmqdml0hppb92b8qvpl5zqrlnzxzm0ih5x"; depends=[data_table geojsonR R6 reticulate]; };
   GeoRange = derive2 { name="GeoRange"; version="0.1.0"; sha256="0krj9570wkhdvpaqkq3nf0maglqd44mpwn4v1bymvgpk1i1wf5p3"; depends=[moments proj4 raster sp velociraptr]; };
+  GeoTcgaData = derive2 { name="GeoTcgaData"; version="0.2.0"; sha256="07bx17n3b5cvp4dy22nb5lq2rcac6r8ksy9khyphbv6c5fwv3813"; depends=[data_table]; };
   GeomComb = derive2 { name="GeomComb"; version="1.0"; sha256="05xb6m2ciszxd13yhqdkildh9nsq19ss8885ngj6ynvbchqkii7r"; depends=[forecast ForecastCombinations ggplot2 Matrix mtsdi psych]; };
   GerminaR = derive2 { name="GerminaR"; version="1.3"; sha256="1q52rp0xvs2mmc4mr7dx1zq78xags5j7kdgj8h05m8qh8dfhzvqf"; depends=[agricolae assertthat dplyr DT ggplot2 gsheet gtools magrittr readxl shiny shinydashboard tibble tidyr]; };
   GetBCBData = derive2 { name="GetBCBData"; version="0.5"; sha256="1i5b5sawa8ngjp1afm1grm9hbmkhd5pcwqagkamlihsrmsvcdffn"; depends=[curl dplyr furrr future jsonlite lubridate memoise purrr RCurl readr stringr]; };
   GetDFPData = derive2 { name="GetDFPData"; version="1.5.2"; sha256="1xa1dy1lm4v2lch3qmfa990bx8r1qzch7jkpnydlnzmd0qmcbvb4"; depends=[curl dplyr lubridate readr reshape2 stringr tibble xlsx XML]; };
   GetHFData = derive2 { name="GetHFData"; version="1.7"; sha256="05xmr880n6arvpn6lb51yn9qssc8594rsxp6cinshk2jh6hq4fnj"; depends=[curl dplyr lubridate RCurl readr stringr]; };
-  GetLattesData = derive2 { name="GetLattesData"; version="1.3"; sha256="0fqm50095lap687qnf1gxmm7syyv1k75irkqgsajijyr5adrizrp"; depends=[curl dplyr readr stringdist stringr XML]; };
+  GetLattesData = derive2 { name="GetLattesData"; version="1.3.1"; sha256="1rq89110qgfi9v47pqahrzzcmh26r1724sgb8bbccsrydfscf994"; depends=[curl dplyr readr stringdist stringr XML]; };
   GetR = derive2 { name="GetR"; version="0.1"; sha256="1b2wirhz4nhvmf863czwb8z8b42ilsyjjrg9rc4nd9b7nz50bmjg"; depends=[party]; };
-  GetTDData = derive2 { name="GetTDData"; version="1.4.1"; sha256="0hm73i8rsrm58ci7hzmmgirxklcxxh1dg8l3nk8rfi9x8fnnfyhs"; depends=[bizdays curl RCurl readxl stringi stringr tidyr XML]; };
+  GetTDData = derive2 { name="GetTDData"; version="1.4.2"; sha256="1qz75hq1c89riq0jpzjkr9gbk5y7894kb0ydhdyji7kjl1kvgyvx"; depends=[bizdays curl RCurl readxl rvest stringi stringr tidyr XML xml2]; };
   GetoptLong = derive2 { name="GetoptLong"; version="0.1.7"; sha256="1fl3w2n602ldybc5qj7qw4xmzzb804bsjkqwf6dswzj0vf0qiadr"; depends=[GlobalOptions rjson]; };
   Ghat = derive2 { name="Ghat"; version="0.1.0"; sha256="1w5agphnbngc0ldb3gbgh4b8ww956lf31bfyxw2zp56crx4akcxf"; depends=[rrBLUP]; };
   GiNA = derive2 { name="GiNA"; version="1.0.1"; sha256="0his7wsgnggyv9526blxzxa1ni8hwq2ws64wkmha45nvvnm3dsiw"; depends=[doParallel EBImage foreach png]; };
@@ -1634,11 +1664,13 @@ in with self; {
   GibbsACOV = derive2 { name="GibbsACOV"; version="1.1"; sha256="1ikcdsf72sn1zgk527zmxw3zjhx0yvkal6dv001cgkv202842kll"; depends=[MASS]; };
   Gifi = derive2 { name="Gifi"; version="0.3-9"; sha256="0rwyj60cldf3k118cnc5px16dc5p5bfxgl0w2m1lh6rsqlmza25a"; depends=[colorspace]; };
   GillespieSSA = derive2 { name="GillespieSSA"; version="0.6.1"; sha256="0li0jqnbl9rfj8gbspq7fv327fii53rh93ffsxpic7804rmrnbi7"; depends=[]; };
+  GillespieSSA2 = derive2 { name="GillespieSSA2"; version="0.2.5"; sha256="1mswjy9fvrgn5353w1mnkmbr98bn1jdinsyc50ygy42z7sd4ijp2"; depends=[assertthat dplyr dynutils Matrix purrr Rcpp RcppXPtrUtils readr rlang stringr tidyr]; };
   GiniDistance = derive2 { name="GiniDistance"; version="0.1.0"; sha256="0jq1dwpsvh3k25lawvzf9ij72jsspzyqsbnrphz8aqwi1dkm3851"; depends=[energy randomForest Rcpp RcppArmadillo readxl]; };
   GiniWegNeg = derive2 { name="GiniWegNeg"; version="1.0.1"; sha256="1wqwjalsyp55si839cil6na3khigm0mwn6qkg0kjylq10pabfk2a"; depends=[]; };
+  GlmSimulatoR = derive2 { name="GlmSimulatoR"; version="0.1.0"; sha256="0qjh4j5lpc83akr9gwpmr5wwdl8lak4ri2q1j658a98mkydn3b74"; depends=[assertthat dplyr ggplot2 magrittr MASS purrr rlang statmod stringr]; };
   GlobalDeviance = derive2 { name="GlobalDeviance"; version="0.4"; sha256="0s318arq2kmn8fh0rd5hd1h9wmadr9q8yw8ramsjzvdc41bxqq1a"; depends=[snowfall]; };
   GlobalFit = derive2 { name="GlobalFit"; version="1.2"; sha256="01s51nxcsl8xxn6khbv5jsvpwblwf0iamvr477a1rraqqqj94zx0"; depends=[sybil]; };
-  GlobalOptions = derive2 { name="GlobalOptions"; version="0.1.0"; sha256="1wlyqz1yhmhjwslrd7q69jbd9vsbjkjfc01g60kl3cdpyr8hlyjn"; depends=[]; };
+  GlobalOptions = derive2 { name="GlobalOptions"; version="0.1.1"; sha256="0x89hfz80avq4zcskxl71i4zi0mgniqqxfrvz050aa2189wfyja2"; depends=[]; };
   GmAMisc = derive2 { name="GmAMisc"; version="1.0.0"; sha256="14rs13y509hijg4ars3j55fm0133487alm8b9jlffbz8qiln48g4"; depends=[caTools classInt cluster coin corrplot DescTools dismo ggplot2 ggrepel gridExtra Hmisc InPosition kimisc lsr maptools plyr pROC raster RcmdrMisc rgdal rgeos rworldmap shape sp spatialEco spatstat]; };
   Gmedian = derive2 { name="Gmedian"; version="1.2.4"; sha256="0lr1hwprqy9mq5qyp83qqxj8dh5sy487xkqbv2y1qdinzj62pvcn"; depends=[Rcpp RcppArmadillo robustbase RSpectra]; };
   Gmisc = derive2 { name="Gmisc"; version="1.9.0"; sha256="0072aidb9x969g276id68vaqvjddkb72l5smx1wlqss0h70y2r16"; depends=[abind checkmate forestplot Hmisc htmlTable knitr lattice magrittr Rcpp rmarkdown stringr XML]; };
@@ -1657,7 +1689,7 @@ in with self; {
   GreedyExperimentalDesign = derive2 { name="GreedyExperimentalDesign"; version="1.2"; sha256="1x3hnyqq75krlygg82qm0ldd8nsv071nzgr63zkjmifc7hgi0nvb"; depends=[GreedyExperimentalDesignJARs rJava]; };
   GreedyExperimentalDesignJARs = derive2 { name="GreedyExperimentalDesignJARs"; version="1.0"; sha256="14i6m5qlh1fca9xmzid01hicd3bkf6rzl139ss78gvw544zrapw7"; depends=[rJava]; };
   GreedySBTM = derive2 { name="GreedySBTM"; version="1.0"; sha256="1r29cd8nxpyc82rz2xb9mk9wc17gcdlcl9lw1j3y4npr2z0qhf13"; depends=[Rcpp RcppArmadillo]; };
-  Greg = derive2 { name="Greg"; version="1.3"; sha256="1npdgcm6w0x7a6s6dl5l250cyvrs5h2y352d1ih8lh575s5nw819"; depends=[Epi forestplot Gmisc Hmisc htmlTable knitr magrittr nlme rms sandwich stringr]; };
+  Greg = derive2 { name="Greg"; version="1.3.1"; sha256="1ljd42d8fp4bnhrx26bl1br49b0xp8zr8qp8yccpqgxp6qb6cixv"; depends=[Epi forestplot Gmisc Hmisc htmlTable knitr magrittr nlme rms sandwich stringr]; };
   GriegSmith = derive2 { name="GriegSmith"; version="1.0"; sha256="1a7gnaig1wvxpph7d8c37kx51dznzk0457fzf7alw95iwpyb4z7j"; depends=[spatstat]; };
   GrimR = derive2 { name="GrimR"; version="0.5"; sha256="005ywc31yn1cs54kjlkrryw0s7zm8dqqfjkdlkm4s1sbc9r3mssz"; depends=[car]; };
   GroupComparisons = derive2 { name="GroupComparisons"; version="0.1.0"; sha256="0fxgh1mksrfmd4yjrpxg3nfby5wyx75lj0shb5xrdzl7pxzh56ai"; depends=[car]; };
@@ -1670,13 +1702,15 @@ in with self; {
   GuessCompx = derive2 { name="GuessCompx"; version="1.0.3"; sha256="1xbkh1wh2z0n964w8lwi7q4rr7mls0awf5k7n5jjklhq4b6gswic"; depends=[boot dplyr ggplot2 lubridate reshape2]; };
   GxM = derive2 { name="GxM"; version="1.1"; sha256="02rv8qb46ylk22iqn9cgh63vkyrg9a8nr1d0d3j5hqhi0wyhc41r"; depends=[minqa nlme Rcpp]; };
   HAC = derive2 { name="HAC"; version="1.0-5"; sha256="0dc79qjhyydq0k4d8wvg970hs56i9yhxjrh5ky9a178ya61vw208"; depends=[copula numDeriv]; };
-  HACSim = derive2 { name="HACSim"; version="1.0.3"; sha256="0d6r08phibs510w218mws7g8yd5igrgqhgfhxwsg8dib1x7b85zz"; depends=[ape pegas Rcpp RcppArmadillo]; };
+  HACSim = derive2 { name="HACSim"; version="1.0.4"; sha256="12byh36ly04g8664vrcz0szn3f8kk11fxmn4n9iyrl57akl80zgv"; depends=[ape pegas Rcpp RcppArmadillo]; };
   HAP_ROR = derive2 { name="HAP.ROR"; version="1.0"; sha256="1id9amz1cc2l2vnpp0ikbhf8ghbgzqd1b9dfivnyglg7996c3gbg"; depends=[ape hash]; };
   HAPim = derive2 { name="HAPim"; version="1.3"; sha256="03qy0pxazv3gdq3fck7171ixilb9zi1dwnvc4v7d726g0lvn80pg"; depends=[]; };
-  HARModel = derive2 { name="HARModel"; version="0.2"; sha256="18vjzv6nrvaxv758hakpd9y58byqibd9i7sr6kr6z5lshii8fklv"; depends=[Rcpp RcppArmadillo sandwich xts zoo]; };
+  HARModel = derive2 { name="HARModel"; version="1.0"; sha256="17sajqi2g5z69gvnfhkn850jkavi8syhm58xadd2khrm73nvwh2i"; depends=[Rcpp RcppArmadillo sandwich xts zoo]; };
   HARtools = derive2 { name="HARtools"; version="0.0.5"; sha256="10a92jsk1ccgxi5g6byrs4fbj5l2kih7vhib0jg6spdqi6rhqla1"; depends=[assertthat htmltools htmlwidgets jsonlite magrittr]; };
   HBSTM = derive2 { name="HBSTM"; version="1.0.1"; sha256="0bx7dxcfj46k4kqpqb39w4qkm4hvr1ka8d8rws445vkyl31kr0q6"; depends=[fBasics maps MASS]; };
+  HBV_IANIGLA = derive2 { name="HBV.IANIGLA"; version="0.1.1"; sha256="186q915ac2zr2mm43yf7wxj0nw6pz5v7l80p8n15f8m5z6s87l8s"; depends=[Rcpp]; };
   HBglm = derive2 { name="HBglm"; version="0.1"; sha256="1sral7lh5qw5mn31n8459pk52frgw1bjq0z5ckpsnbc4qf3xxcjn"; depends=[bayesm Formula MfUSampler sns]; };
+  HCD = derive2 { name="HCD"; version="0.1"; sha256="158szwhpxwj2dj7sibyh8l92dk9cmy6acapmk8wf5hmfybdpgbsh"; depends=[data_table data_tree dendextend irlba Matrix randnet RSpectra stringr]; };
   HCR = derive2 { name="HCR"; version="0.1.1"; sha256="14s46dyw3ifp3pwwlcwbbl47i6hy2whjj1n65i28am5a33nycgha"; depends=[data_table]; };
   HCT = derive2 { name="HCT"; version="0.1.0"; sha256="0p1bj0spqff8m27lvxdfhk8z1r1z04v1dsv7mqbjyzl07w005hk3"; depends=[rstan]; };
   HCmodelSets = derive2 { name="HCmodelSets"; version="1.0.2"; sha256="0nwr36jgmrfvr7kn71yyah80qv55dwj8zd2hpc4ixhi4kvpr372f"; depends=[ggplot2 mvtnorm survival]; };
@@ -1697,7 +1731,7 @@ in with self; {
   HETOP = derive2 { name="HETOP"; version="0.2-6"; sha256="1fjwyqh7l296pghmc4m81q8icgbhvqvxr61zd638fr46gls3ky2p"; depends=[R2jags]; };
   HGNChelper = derive2 { name="HGNChelper"; version="0.7.1"; sha256="1yfgragyp6zfzm7aq74r9gkzqlrzggw87msm9cqqqy62a8y9y92w"; depends=[]; };
   HGSL = derive2 { name="HGSL"; version="1.0.0"; sha256="1p453xr3d1bmqc6mrmzb0hz9p0gp25m6v6qr0l3bapcf71vzbvq1"; depends=[]; };
-  HH = derive2 { name="HH"; version="3.1-35"; sha256="0sykmmipbph9x7k371liiyj2vmqv0as2hr9x6yrn38ls6bscjlj4"; depends=[abind colorspace gridExtra Hmisc lattice latticeExtra leaps multcomp RColorBrewer reshape2 Rmpfr shiny vcd]; };
+  HH = derive2 { name="HH"; version="3.1-37"; sha256="15b03jbch8l2l5mhacn02asf5mr97pp4sk9p4k50s4hzlqkz5gnm"; depends=[abind colorspace gridExtra Hmisc lattice latticeExtra leaps multcomp RColorBrewer reshape2 Rmpfr shiny vcd]; };
   HHG = derive2 { name="HHG"; version="2.3.2"; sha256="159bs5cxdm770h66fam48451n9krpw2fn5gr397h730x2w7l41ki"; depends=[Rcpp]; };
   HI = derive2 { name="HI"; version="0.4"; sha256="0i7y4zcdr6wcjy43lz9h8glzpdv0pz7livr95xb1j4p8zafykday"; depends=[]; };
   HIMA = derive2 { name="HIMA"; version="1.0.7"; sha256="0mvphwmm8gmin933bji2l2gbpjzm42vyc7sdka4xpjfsaal9pp9i"; depends=[doParallel foreach iterators ncvreg]; };
@@ -1716,7 +1750,7 @@ in with self; {
   HMMextra0s = derive2 { name="HMMextra0s"; version="1.0.0"; sha256="15y5q92x69sn80pc2x7xwbnsfrqpf7cjdja4hkq861jshkksbmg1"; depends=[ellipse mvtnorm]; };
   HMMmlselect = derive2 { name="HMMmlselect"; version="0.1.5"; sha256="10h62h03hiip8m1h93sbln413l6cmxmc6hsq3rla6acjk6hfxb2v"; depends=[DirichletReg HiddenMarkov mclust mvtnorm Rcpp]; };
   HMMpa = derive2 { name="HMMpa"; version="1.0.1"; sha256="0c3jmvcklywqsjmskx7zbw4d3l8i6bzr5h741v8iwgyw67mjn37g"; depends=[]; };
-  HMP = derive2 { name="HMP"; version="1.6"; sha256="0dz46f4wr3paar42hyidjvm5b4w0hz49gs7678b6kv3kb330ymll"; depends=[dirmult doParallel foreach ggplot2 gplots lattice MASS rpart rpart_plot vegan]; };
+  HMP = derive2 { name="HMP"; version="2.0.1"; sha256="0233p7gajr2aic0c5snni4g9v1bwn4zd5i3kagxhqxa3mvy5c7wc"; depends=[dirmult doParallel foreach ggplot2 gplots lattice MASS rpart rpart_plot vegan]; };
   HMPTrees = derive2 { name="HMPTrees"; version="1.4"; sha256="1jha64iyb0816rdg2i3z7i31z02r72k6acmvw0ibw3sli8zcvphb"; depends=[ape dirmult doParallel foreach HMP]; };
   HMR = derive2 { name="HMR"; version="0.4.2"; sha256="0rbpghih99avaq803f6hb66pfbqgzh1i2yaqs0mhbj61yyjzyb7b"; depends=[]; };
   HMVD = derive2 { name="HMVD"; version="1.0"; sha256="0agzvsl2n3zg3i519b93jqpiq9zix0bbrjdzk3ymsbb42dzkmj0d"; depends=[MASS]; };
@@ -1724,16 +1758,18 @@ in with self; {
   HRM = derive2 { name="HRM"; version="1.0.2"; sha256="0krd27raa2ys2gsgqpbxpfnmigj8s6mk3al7fh3czx5l0d73iqy1"; depends=[data_table doBy ggplot2 MASS matrixcalc mvtnorm plyr pseudorank Rcpp reshape2 xtable]; };
   HRQoL = derive2 { name="HRQoL"; version="1.0"; sha256="1gr9rhr8gdnh7bw2v3r0xc3yhmzrx2gzgsd8wd5mmsp81ph0h5lz"; depends=[car fmsb Matrix matrixcalc numDeriv RColorBrewer rootSolve]; };
   HRW = derive2 { name="HRW"; version="1.0-3"; sha256="12y43sl30949jc9ab10ipx8k4rvb9g8gwaazi8j3k1grh26ivpii"; depends=[KernSmooth]; };
-  HS = derive2 { name="HS"; version="1.0"; sha256="1rqsdbszs5y1ps300p9c3rf5zxqs2rmbjysdivs64apximy68i4y"; depends=[zoo]; };
+  HS = derive2 { name="HS"; version="1.1"; sha256="1vhbchc446j49jj7jgmy4l59n8ahk5l8jp1rl5xwsmn9iqir62mp"; depends=[data_table ggplot2 ggpubr partitions reshape2 tidyr zoo]; };
   HSAR = derive2 { name="HSAR"; version="0.4.2"; sha256="0rxb2klmyynr8rzq6ka8p40lw81wjd0jkw2wg3vg90zny0zps98j"; depends=[Rcpp RcppArmadillo spdep]; };
   HSAUR = derive2 { name="HSAUR"; version="1.3-9"; sha256="0b2hyn59lr2pma87fcj7mli3qmrbnfhgd8fv02fa317rj52399qz"; depends=[]; };
   HSAUR2 = derive2 { name="HSAUR2"; version="1.1-17"; sha256="0jc554lz5lj7180vd4rbrjkywar4bh38c7i9kyxhd5clg4afxpw8"; depends=[]; };
   HSAUR3 = derive2 { name="HSAUR3"; version="1.0-9"; sha256="1rpvblak0xvkavbvbd35zq1lcsl5z1zp30vn70wqbkdj7szhj9b4"; depends=[]; };
   HSDiC = derive2 { name="HSDiC"; version="0.1"; sha256="0wiixb1ylx0l8qfgh5ark6alkdq87xaak1jlxizw1m589vghvqfp"; depends=[glmnet Matrix ncvreg quadprog]; };
+  HSPOR = derive2 { name="HSPOR"; version="1.1.9"; sha256="06lr8l71y5fcqcnmgq7cgiab1pcc98wnqzndbxcbikbh33cx7nxv"; depends=[corpcor npregfast]; };
+  HSROC = derive2 { name="HSROC"; version="2.1.9"; sha256="0x5q115c1js5l4rvdy8fg52kcgl18aj1snlj0gi1fdvjsxvglxjl"; depends=[coda lattice MASS MCMCpack]; };
   HSSVD = derive2 { name="HSSVD"; version="1.2"; sha256="1k7ga397grl0r4p0ipjgw5xlafb2528rpww67bw7mmy01w87a1cc"; depends=[bcv]; };
   HTMLUtils = derive2 { name="HTMLUtils"; version="0.1.7"; sha256="05y505jazzahnd6jsp3plqz8hd75991hhhcpcdn8093rinb1f8l1"; depends=[R2HTML]; };
   HTSCluster = derive2 { name="HTSCluster"; version="2.0.8"; sha256="0wnbfh6hdx8692jilgmv8sys1zm6fqc6mim7vvjhyqlmpm8gm0kg"; depends=[capushe edgeR plotrix]; };
-  HTSSIP = derive2 { name="HTSSIP"; version="1.4.0"; sha256="04wfwbi57rxjd69inagvj3qricshwia16k6d2r4fgg9wmikgx4yv"; depends=[ape coenocliner DESeq2 dplyr ggplot2 igraph lazyeval magrittr phyloseq plyr stringr tidyr vegan]; };
+  HTSSIP = derive2 { name="HTSSIP"; version="1.4.1"; sha256="1j2f6f3i4di4bvsk44gxz0narg45ld2rahfn23wpgni5bszy0vb3"; depends=[ape coenocliner DESeq2 dplyr ggplot2 igraph lazyeval magrittr phyloseq plyr stringr tidyr vegan]; };
   HUM = derive2 { name="HUM"; version="1.0"; sha256="1bq74l88jvscmq9ihv5wn06w2wng073ybvqb2bdx2dmiqlpv6jw2"; depends=[gtools Rcpp rgl]; };
   HURDAT = derive2 { name="HURDAT"; version="0.2.3"; sha256="1pcr0dlmhcblsgdyb79n377523x347d4gbzia247cpv52y4kbk0q"; depends=[dplyr purrr readr rlang rvest tidyr xml2]; };
   HW_pval = derive2 { name="HW.pval"; version="1.0"; sha256="14nmyqw2d9cmn64789yc54fmiqanh6n1dizp7vj94h7b0jwq63yy"; depends=[]; };
@@ -1741,7 +1777,7 @@ in with self; {
   HWEintrinsic = derive2 { name="HWEintrinsic"; version="1.2.2"; sha256="035r5bi7m66g351cmrfmf4cj5qqm4fn5pgy3lzsp3gyp2dv0rkg5"; depends=[]; };
   HWxtest = derive2 { name="HWxtest"; version="1.1.9"; sha256="1ri5dxq4qm12y1pi6pjydiz23220hffj6qa5235154m9sjz0jwx3"; depends=[]; };
   HYRISK = derive2 { name="HYRISK"; version="1.2"; sha256="1ngwwzv1pavmscpca3ryzfxzd9rppsh0sm7k4sp2kzc9c0bix4xp"; depends=[kerdiest pbapply reliaR rgenoud sets triangle]; };
-  HaDeX = derive2 { name="HaDeX"; version="0.1"; sha256="1k1qhgf5f9ssb9fxykzdmy8rwk8vjc04aj4g6qr1af7231gan6mg"; depends=[data_table dplyr DT ggplot2 gsubfn latex2exp readr readxl reshape2 shiny stringr tidyr]; };
+  HaDeX = derive2 { name="HaDeX"; version="1.0"; sha256="14f4ql685wrhsmg9yklbfky7b3vsxm4dyiqmpmrl7199kqzinjc0"; depends=[data_table dplyr DT ggplot2 gsubfn latex2exp readr readxl reshape2 shiny stringr tidyr]; };
   HadoopStreaming = derive2 { name="HadoopStreaming"; version="0.2"; sha256="1l9msaizjvnsj1jrpghj4g057qifdgg6vbqhfxhn1fiqdqi2056q"; depends=[getopt]; };
   HandTill2001 = derive2 { name="HandTill2001"; version="0.2-12"; sha256="1rijjv27zwdznznvwlb5hahixmfxayr6vs11p1mzwqma8qhsn5ak"; depends=[]; };
   Hapi = derive2 { name="Hapi"; version="0.0.3"; sha256="0jqjhfq38k161kqff5cx0vxpsmjm2y5ca7049mvqiwqwvi4fp08m"; depends=[ggplot2 HMM]; };
@@ -1750,19 +1786,20 @@ in with self; {
   HardyWeinberg = derive2 { name="HardyWeinberg"; version="1.6.3"; sha256="1irz44q6nf95h37av868f47aakwv3jgwgw217xfsfw0afkm7s25f"; depends=[mice Rcpp Rsolnp]; };
   HarmonicRegression = derive2 { name="HarmonicRegression"; version="1.0"; sha256="0inz3l610wl0ibqjyrhfbmwmcfzcmcfhixai4lpkbfsyx93z2i4d"; depends=[]; };
   Harvest_Tree = derive2 { name="Harvest.Tree"; version="1.1"; sha256="021zmppy7p2iakaxirfjdb5jzakg1ijma9d25ly2ni0nx0p1mh6z"; depends=[rpart]; };
-  HelpersMG = derive2 { name="HelpersMG"; version="3.6"; sha256="1wlx74akpcf5ny4qjd12kb4rlgz38s6b5pj8744vcl852xbfizll"; depends=[coda lme4]; };
+  HellCor = derive2 { name="HellCor"; version="1.2"; sha256="1k7k8gj70wc31w27gykiy0fv2bs9q73414ma0hn3ziqg4cnrgl7m"; depends=[energy]; };
+  HelpersMG = derive2 { name="HelpersMG"; version="3.7"; sha256="0j91d8zb6w9mzd92zvzr6jws9rjdna4p1szd772vg6bk1f95q47v"; depends=[coda lme4]; };
   HeritSeq = derive2 { name="HeritSeq"; version="1.0.1"; sha256="0l1saxwj99xwkzcy43v0k9sicqwpw9gc8ywxpablagcddfj05pi3"; depends=[cplm DESeq2 lme4 MASS pbapply SummarizedExperiment tweedie]; };
-  HextractoR = derive2 { name="HextractoR"; version="1.3"; sha256="09x1zjpkm091yr7by83ksddka8ldczb0dg09yr1gb6j68rhlbigp"; depends=[doParallel foreach seqinr]; };
-  HiCblock = derive2 { name="HiCblock"; version="1.4"; sha256="07f94j9y5g6f09yi7iwag020ddfhpvrj5idfxwbr900hj3vgm1gm"; depends=[GenomeInfoDb GenomicRanges glmnet HiTC IRanges MASS Matrix rtracklayer S4Vectors]; };
+  HextractoR = derive2 { name="HextractoR"; version="1.4"; sha256="1wp7n92wgrjyklq159ymrw8y5ads6lhj2fcz54rzdnccdyx5naxi"; depends=[doParallel foreach seqinr]; };
+  HiCblock = derive2 { name="HiCblock"; version="1.5"; sha256="1c17bdwflfg83d73kd09dgj17nmdbc6cd9fz9dm6q8xvrcvcc6r3"; depends=[GenomeInfoDb GenomicRanges glmnet HiTC IRanges MASS Matrix rtracklayer S4Vectors]; };
   HiCfeat = derive2 { name="HiCfeat"; version="1.4"; sha256="1imz7zfax74aakzk8457jww9r66qxpr2ncyvjj0y5paxdn76lnnq"; depends=[GenomeInfoDb GenomicRanges glmnet IRanges Matrix rtracklayer]; };
-  HiCglmi = derive2 { name="HiCglmi"; version="1.3"; sha256="17vwdhnf36cg56vidq7d85s4vgk2pnn5py1y2wsl2dm41vdl0847"; depends=[GenomeInfoDb GenomicRanges glmnet HiTC IRanges MASS Matrix rtracklayer S4Vectors]; };
+  HiCglmi = derive2 { name="HiCglmi"; version="1.4"; sha256="122f862aaxl9fc6csars8h20sf2q2hmfa7vfa0p67dbknzx76hi4"; depends=[GenomeInfoDb GenomicRanges glmnet HiTC IRanges MASS Matrix rtracklayer S4Vectors]; };
   HiClimR = derive2 { name="HiClimR"; version="2.1.4"; sha256="1ynxy5c2md3bpii3693zcxabldaj0s54xby19j0f616hk4kjm3gm"; depends=[ncdf4]; };
   HiCseg = derive2 { name="HiCseg"; version="1.1"; sha256="19581k3g71wrznyqrp4hmspqyzcbcfbc48xgjlq13zmqii45hcn6"; depends=[]; };
   HiDimDA = derive2 { name="HiDimDA"; version="0.2-4"; sha256="0gxkxzys9mcy33xvsim8klaqmb2xwvy5bvgkn9r400j4qfjd3cgg"; depends=[]; };
   HiLMM = derive2 { name="HiLMM"; version="1.1"; sha256="09135cwi6kqrvzdlivm86q1dqn6cbbi6nspdm0c2s700jl49pl5z"; depends=[]; };
   HiResTEC = derive2 { name="HiResTEC"; version="0.59"; sha256="08c5zvj1as28skhlyybrjinc9wawdsqfxiwybd0ni0ljh2i2sc5c"; depends=[beeswarm Biobase InterpretMSSpectrum openxlsx plyr Rdisop]; };
   HiddenMarkov = derive2 { name="HiddenMarkov"; version="1.8-11"; sha256="1yh85pdb9r90qxcl5gxslyplxzrx8knrrsl2q65l57zfkqj185ja"; depends=[]; };
-  HierDpart = derive2 { name="HierDpart"; version="0.3.5"; sha256="0xppilxnnq2c50xmwvgp0ih19ak1qigd0qqc1r37g0qlys2s7wlp"; depends=[ade4 adegenet ape diveRsity dplyr entropart GGally ggplot2 hierfstat pegas permute reshape2 tibble vegan]; };
+  HierDpart = derive2 { name="HierDpart"; version="0.5.0"; sha256="1lrp5snkx5irrx6b19wdfmkpbxdy4gxkhpjibfin109s5r54jvvg"; depends=[ade4 adegenet ape diveRsity entropart GGally ggplot2 hierfstat mmod pegas permute reshape2 tibble vegan]; };
   HierO = derive2 { name="HierO"; version="0.2"; sha256="1lqj5grjly4kzxl7wb192aagz2kdvpnjdan2kcg5yxwvg1xcvwv1"; depends=[bitops RCurl rneos tcltk2 XML]; };
   HighDimOut = derive2 { name="HighDimOut"; version="1.0.0"; sha256="0r7mazwq4fsz547d3nyavmqya7144lg3fkl5f7amrp48l9h85vx2"; depends=[DMwR FNN foreach ggplot2 plyr proxy]; };
   HistDAWass = derive2 { name="HistDAWass"; version="1.0.3"; sha256="1kvq9q4lnbl2jkj7dvm2znp2ihvv1j6778pnfkkxflxa8aks29k6"; depends=[class FactoMineR ggplot2 ggridges histogram Rcpp RcppArmadillo]; };
@@ -1782,6 +1819,7 @@ in with self; {
   HydeNet = derive2 { name="HydeNet"; version="0.10.9"; sha256="1glzbr91cwp99qk1cyf8824fg8jvghgf84gc64jjn2q70vczcf5f"; depends=[checkmate DiagrammeR dplyr magrittr nnet pixiedust plyr rjags stringr]; };
   HydroMe = derive2 { name="HydroMe"; version="2.0"; sha256="1a1d3lay94mzwk8n22l650h3p133npdf4aj63zgrdw4760p54rqf"; depends=[minpack_lm nlme]; };
   HyperbolicDist = derive2 { name="HyperbolicDist"; version="0.6-2"; sha256="1wgqbx9ascyk6gw1dmvfz6hljvbh49gb9shr9qgf22qbq83waiva"; depends=[]; };
+  HypergeoMat = derive2 { name="HypergeoMat"; version="1.0.1"; sha256="08cbx62n0r1l0ss6dkpwg4nam36xikmfh4w551pjp21f3ybvzql3"; depends=[arrangements gsl]; };
   IAPWS95 = derive2 { name="IAPWS95"; version="1.1.0"; sha256="03kggkcyvbgh7l9haa1ljg0sv6f2rs06r6j0w2x7cpm31qmc3yzl"; depends=[ggplot2 pander Rcpp]; };
   IASD = derive2 { name="IASD"; version="1.1"; sha256="1slhd42k639mbyxccl7n69p7ng2qx6pqag8wz3kdwn479spkavzn"; depends=[]; };
   IAT = derive2 { name="IAT"; version="0.3"; sha256="110rn2q09gspfd4msyh30dllxdxdraffkr18h1nm72brzhmx9cfi"; depends=[dplyr ggplot2 lazyeval]; };
@@ -1802,7 +1840,7 @@ in with self; {
   ICC = derive2 { name="ICC"; version="2.3.0"; sha256="0y8zh9715cp9bglxpygqwgigrarq37sj845lk1xl0ydwinl0a6kk"; depends=[]; };
   ICC_Sample_Size = derive2 { name="ICC.Sample.Size"; version="1.0"; sha256="1w6v1jp8bfvf6c49ikswkc5527gdx5cyqnw95x00pgmm6riwlsp9"; depends=[]; };
   ICCbin = derive2 { name="ICCbin"; version="1.1.1"; sha256="1pzlaj7w98pgrlg3zvpmdv0dpgi5gih0j73qv86ak75fkxvrnzzw"; depends=[]; };
-  ICD10gm = derive2 { name="ICD10gm"; version="1.0.3"; sha256="11gyqdf5xddsryam6cy6k919v88b31905g1sbaijbs7dza6w01ls"; depends=[dplyr magrittr purrr rlang stringi tibble tidyr]; };
+  ICD10gm = derive2 { name="ICD10gm"; version="1.0.4"; sha256="19346z1mfdbir47wy6qxniag81s3xwrxpfbiv1rar6a89z3pczlf"; depends=[dplyr magrittr purrr rlang stringi tibble tidyr tidyselect]; };
   ICDS = derive2 { name="ICDS"; version="0.1.1"; sha256="1jb98xi37jcf6nl5lx2ip9614l4w7lz7v53jpcbdj0ymqbfx1s70"; depends=[graphite igraph metap org_Hs_eg_db]; };
   ICE = derive2 { name="ICE"; version="0.69"; sha256="04p8lakaha28mdh965w0ppyxfrz5ssi1n9xifvsbn3ihdra67rip"; depends=[KernSmooth]; };
   ICEbox = derive2 { name="ICEbox"; version="1.1.2"; sha256="170gg2fg9307yc2b25lsj8d1zla0frjxl47qh0njlqlrpi8jmm7i"; depends=[sfsmisc]; };
@@ -1819,7 +1857,7 @@ in with self; {
   ICcalib = derive2 { name="ICcalib"; version="1.0.8"; sha256="1y2w12ka0qxh9dg6dlcrnndz1xrv8gkppan64qkyk5vjrh18ajz4"; depends=[fitdistrplus icenReg ICsurv MASS msm numDeriv Rcpp RcppArmadillo survival]; };
   ICcforest = derive2 { name="ICcforest"; version="0.5.0"; sha256="0m4bqw06alpj8p0yska4rizra73mgvcpd4zlgmxr146cgdv2lrgd"; depends=[icenReg ipred partykit survival]; };
   ICsurv = derive2 { name="ICsurv"; version="1.0"; sha256="1mbndpy3x5731c9y955wscy76jrxlgv33bf6ldqp65cwyvdgxl86"; depends=[MASS matrixcalc]; };
-  ICtest = derive2 { name="ICtest"; version="0.3-1"; sha256="10wxx2b8m5h0k8f6lgf0z1xhvhr14dyrda2pf46w03fa23f5mb7l"; depends=[GGally ggplot2 ICS ICSNP JADE png Rcpp RcppArmadillo survey]; };
+  ICtest = derive2 { name="ICtest"; version="0.3-2"; sha256="00h72rngcyjhin9g8x80mypm8zx765nm5jgsyjya9m4kw8x4h8la"; depends=[GGally ggplot2 ICS ICSNP JADE png Rcpp RcppArmadillo survey xts zoo]; };
   IDCard = derive2 { name="IDCard"; version="0.3.0"; sha256="06b5zqmgh4clni3mv6ab2a52r4z34isbz0hd1i61793gps9fkc0y"; depends=[stringr]; };
   IDE = derive2 { name="IDE"; version="0.3.0"; sha256="1m1y7gd8i14kl54qxhjy7bnf2md5vs7bb73k7k92nizv941qn0mn"; depends=[DEoptim dplyr FRK ggplot2 Matrix sp spacetime sparseinv tidyr]; };
   IDF = derive2 { name="IDF"; version="1.1"; sha256="19fx04gvzwzkxbd453l3wx46s22dbnh0nxdrmsr4f7l67kihbwdr"; depends=[evd ismev]; };
@@ -1863,7 +1901,7 @@ in with self; {
   IQCC = derive2 { name="IQCC"; version="0.7"; sha256="1zalpmyywkrnci0jd8irakjhiqmr52zhj1sbxf9pz5c7wks2rdbc"; depends=[MASS miscTools qcc]; };
   IRATER = derive2 { name="IRATER"; version="0.0.1"; sha256="0jxdvjmnmangbqy3ibb5qrj9jz3wrzs0wa1r2gjk4v8vsbk0ipcf"; depends=[coda lattice plyr R2admb]; };
   IRISMustangMetrics = derive2 { name="IRISMustangMetrics"; version="2.2.0"; sha256="08r07z9z2mmx2w2xx2qpdvllwz85wmk3pwid77avc7vrvbbvgs6g"; depends=[dplyr IRISSeismic RCurl seismicRoll signal stringr XML]; };
-  IRISSeismic = derive2 { name="IRISSeismic"; version="1.5.0"; sha256="0ckc48y3mzsy4kszy9m11602bbaa4vg9c5m54h8qg31cskpgr676"; depends=[pracma RCurl seismicRoll signal stringr XML]; };
+  IRISSeismic = derive2 { name="IRISSeismic"; version="1.5.1"; sha256="1xwhhj7p8pfvz5f592kldcfhsizww6xrcp48xda924hd8dvbm585"; depends=[pracma RCurl seismicRoll signal stringr XML]; };
   IROmiss = derive2 { name="IROmiss"; version="1.0.1"; sha256="01l08s1g7h8cki372daa61pw3wac3pbv5d4yqnphg5p8ihsmrc5d"; depends=[equSA huge mvtnorm ncvreg]; };
   IRTShiny = derive2 { name="IRTShiny"; version="1.2"; sha256="094ax94y6k5z4vlxfla2w19f57q0z32nwwd5npjbgmnkhvfhhl9v"; depends=[beeswarm CTT ltm psych shiny shinyAce]; };
   IRdisplay = derive2 { name="IRdisplay"; version="0.7.0"; sha256="12chk53nf4zckgc4yl7gbvd7m5dvli52inp5b3f0zvcjvfncksli"; depends=[repr]; };
@@ -1912,7 +1950,7 @@ in with self; {
   Information = derive2 { name="Information"; version="0.0.9"; sha256="0pszwzj3r7vdvdsy9w1qz95zxp7y2bsyg36b58mm4qcvcvymd4kn"; depends=[data_table doParallel foreach ggplot2 iterators plyr]; };
   InformationValue = derive2 { name="InformationValue"; version="1.2.3"; sha256="1b5g2wyp7x5cdhmf4325n3q7afa6i352lh80j28c8s4356pr3w9j"; depends=[data_table ggplot2]; };
   InformativeCensoring = derive2 { name="InformativeCensoring"; version="0.3.4"; sha256="145k4hggymra2jnxkcck795xk280yyldfzh9ls2irnsxmxfszr52"; depends=[boot dplyr survival]; };
-  Infusion = derive2 { name="Infusion"; version="1.3.0"; sha256="0z6yils8ckfk0wdi45iav2yijz2cxn1zfkg3q9l6149czlnhvws1"; depends=[blackbox foreach mvtnorm numDeriv pbapply proxy spaMM viridis]; };
+  Infusion = derive2 { name="Infusion"; version="1.4.1"; sha256="0nxp416mbzawrdk4qwhg5j7lm8zdyplrngka2hw2rlsqmlwhvqzl"; depends=[blackbox foreach mvtnorm numDeriv pbapply proxy spaMM viridis]; };
   InjurySeverityScore = derive2 { name="InjurySeverityScore"; version="0.0.0.2"; sha256="0g52cksa774in18ykrym61l3my9zm343bgsq5mg7mki9x65xd35z"; depends=[dplyr rlang tidyr]; };
   InspectChangepoint = derive2 { name="InspectChangepoint"; version="1.0.1"; sha256="1wirdbz4v7hk7znpjhw9j3l596lmfcrlr4wxayw7klbbdhcwq5qs"; depends=[MASS]; };
   IntClust = derive2 { name="IntClust"; version="0.1.0"; sha256="0whmc084gq5zip82vnwailnwvw9jawk9rx4wqiz1lr693w9xbq66"; depends=[a4Core ade4 analogue Biobase circlize cluster data_table e1071 FactoMineR ggplot2 gplots gridExtra gtools igraph limma lsa plotrix pls plyr Rdpack SNFtool]; };
@@ -1937,7 +1975,7 @@ in with self; {
   InvasionCorrection = derive2 { name="InvasionCorrection"; version="0.1"; sha256="1wwx2kssjysl1lraac36pvxq34vg8qm0vwi861rs1iipfc35i84j"; depends=[lattice]; };
   Inventorymodel = derive2 { name="Inventorymodel"; version="1.1.0"; sha256="1l87xghdksgmb2k3a8j382p7ffi2pma38a6pn31sfjsa6bgmrdnk"; depends=[e1071 GameTheoryAllocation]; };
   Irescale = derive2 { name="Irescale"; version="0.2.6"; sha256="1mxpcxc893ld196fb1hpy8avr6a1n4fi83fw2wmwdi11mdwib495"; depends=[e1071 ggplot2 Rcpp Rdpack sp]; };
-  IrishDirectorates = derive2 { name="IrishDirectorates"; version="0.2.0"; sha256="1m3c3dj4729chk1n3k7awvi1jdfnds2w36vm268azg53j6c7l4b6"; depends=[]; };
+  IrishDirectorates = derive2 { name="IrishDirectorates"; version="1.4"; sha256="1mwjrmqga7f0p5w2m4f0i6mb68jimx6791pz03r8iqj3yx0vzkh0"; depends=[Rcpp RcppArmadillo]; };
   IrregLong = derive2 { name="IrregLong"; version="0.1.0"; sha256="0m0lzvdp3f57faylk5vihymyhya7b6kri01zql971lqmfazybjy8"; depends=[frailtypack geepack survival]; };
   IsingFit = derive2 { name="IsingFit"; version="0.3.1"; sha256="1prdzzp15klkdy72379bjksdgxr15nk16pqm35w95341cddxchc7"; depends=[glmnet Matrix qgraph]; };
   IsingSampler = derive2 { name="IsingSampler"; version="0.2"; sha256="16vwb5pcqjvvsk9wsgj10mzhgh72iz1q6n8nmkva6y1l7xv54c8w"; depends=[magrittr nnet plyr Rcpp]; };
@@ -1945,21 +1983,21 @@ in with self; {
   IsoCI = derive2 { name="IsoCI"; version="1.1"; sha256="0r7ksfic6p2v95c953s4gbzzclk4ldxysm8szb8xba1w0nx2izil"; depends=[KernSmooth]; };
   IsoGene = derive2 { name="IsoGene"; version="1.0-24"; sha256="0flm0mszankvl3aizwsazyhvz2xkr4gfqiqywpc0r1swqj19610r"; depends=[affy Biobase ff Iso xtable]; };
   IsoSpecR = derive2 { name="IsoSpecR"; version="2.0.1"; sha256="1y101x7138pdylp2qsmyd10dh0d3wwic292qfi2kbn3z849dlhnn"; depends=[Rcpp]; };
-  IsoplotR = derive2 { name="IsoplotR"; version="2.7"; sha256="1krh84z9y619x5anazi6a5kcz9a24f086lw7m2rla9sfxxhx6g95"; depends=[MASS]; };
+  IsoplotR = derive2 { name="IsoplotR"; version="3.0"; sha256="08lgv9jp10csiz56chlanhr2vwbzv0h3qfnizlqsgaall9bjkvhv"; depends=[MASS]; };
   IsoriX = derive2 { name="IsoriX"; version="0.8.1"; sha256="0rr9frj0mhismls60vgax357jgfyq2wci7rvhvp70fh5k998mzid"; depends=[lattice latticeExtra numDeriv raster rasterVis sp spaMM viridisLite]; };
   IsotopeR = derive2 { name="IsotopeR"; version="0.5.4"; sha256="0xgha5alh5y5qfz00rl73q4xlamnmrwij7kckljmy6zgrlrdnl6x"; depends=[colorspace ellipse fgui plotrix runjags]; };
-  JADE = derive2 { name="JADE"; version="2.0-1"; sha256="0s7cdvhjcdxdqv4mgjd07xi3s0ngjvpxsmy0ary735rs5y6198mm"; depends=[clue]; };
+  JADE = derive2 { name="JADE"; version="2.0-2"; sha256="0haqb8fsn1z532z42vjz60na7hlwv5rhayxzbd4rkzx2wcvnlbhn"; depends=[clue]; };
   JAGUAR = derive2 { name="JAGUAR"; version="3.0.1"; sha256="0lyc8biwj9yir1i06klp2jkb31mnzwp226aw7pwabkprfhqgfmqd"; depends=[lme4 plyr Rcpp RcppArmadillo RcppProgress reshape2]; };
   JASPAR = derive2 { name="JASPAR"; version="0.0.1"; sha256="0wiyn7cz45hwy9zkvacx28zdrg78q6715cg4r9xgcb39q25s0dcy"; depends=[gtools]; };
   JBTools = derive2 { name="JBTools"; version="0.7.2.9"; sha256="0bynqn3daqgmi3l9asy34mfwyfjkn35k465dfqqi3xwx6cbzlg5k"; depends=[colorspace foreach gplots plotrix]; };
-  JFE = derive2 { name="JFE"; version="2.1.1"; sha256="0bpxa62sa1zxgggnrd812pr9jbpbvnc67ckfpx5bk1psvwjdk191"; depends=[BurStFin fAssets fBasics fPortfolio iClick MASS quantmod rugarch tcltk2 timeDate timeSeries xts zoo]; };
+  JFE = derive2 { name="JFE"; version="2.1.3"; sha256="16fbwi9znvf560vlrpdipg69vw1kyg2081iz1l2adc2wyxp81dda"; depends=[BurStFin fAssets fBasics fPortfolio FRAPO iClick MASS quantmod rugarch tcltk2 timeDate timeSeries xts zoo]; };
   JGEE = derive2 { name="JGEE"; version="1.1"; sha256="078348n623hlyc3n9yh67vv5acsnxapmbwybvrb1i7kawmqw5msi"; depends=[gee MASS]; };
   JGL = derive2 { name="JGL"; version="2.3.1"; sha256="02p9z32f8j60wnh1szkjr2zfa9zwyw0gqinpsvll4dymf8cjawpw"; depends=[igraph]; };
   JGR = derive2 { name="JGR"; version="1.8-6"; sha256="0n3z4dm4q93did5b7hw802akhr6gyidshvlj2db4sghmf07czk2c"; depends=[JavaGD rJava]; };
   JM = derive2 { name="JM"; version="1.4-8"; sha256="1nq07hw30fqnag1h08b7crl2yfs85gyrn70aaw11bdbjv06r2x55"; depends=[MASS nlme survival]; };
   JMI = derive2 { name="JMI"; version="0.1.0"; sha256="05phkwfb9v4g9jixlvbj6br7sbi64zvrgjwfr0v87ijddkxc9si9"; depends=[Rcpp RcppArmadillo]; };
   JMbayes = derive2 { name="JMbayes"; version="0.8-83"; sha256="0x5839sqmy1za6ybmd54vhc1sg505k5y4qwk7hr1lv8sr85yxllh"; depends=[doParallel foreach Hmisc jagsUI MASS nlme Rcpp RcppArmadillo rstan shiny survival xtable]; };
-  JMcmprsk = derive2 { name="JMcmprsk"; version="0.9.4"; sha256="15gn9ydyd3bqmhgjsp1wia338b643pvrdqgrbanjawa3nqp70qlm"; depends=[MASS Rcpp statmod]; };
+  JMcmprsk = derive2 { name="JMcmprsk"; version="0.9.6"; sha256="0jip7kcpl3g5sywk93pmbdxidbq5gmnasrw1rlwvks74l34wrg15"; depends=[MASS Rcpp statmod]; };
   JMdesign = derive2 { name="JMdesign"; version="1.1"; sha256="0w5nzhp82g0k7j5704fif16sf95rpckd76jjz9fbd71pp2d80vlh"; depends=[]; };
   JOP = derive2 { name="JOP"; version="3.6"; sha256="1kpb1dy2vm4jgzd3h0qgdw53nfp2qi74hgq5l5inxx4aayncclk7"; depends=[dglm Rsolnp]; };
   JOUSBoost = derive2 { name="JOUSBoost"; version="2.1.0"; sha256="0f3rr7aw20nvmlpqrq3wzgmr55lqdqhk3wphpqq7msgvaf1zrcl7"; depends=[doParallel foreach Rcpp rpart]; };
@@ -1976,7 +2014,7 @@ in with self; {
   Jmisc = derive2 { name="Jmisc"; version="0.3.1"; sha256="1szn29dng54l2xmrm6pg3d5rmwdc1ks23vsnsmplnr5rx7yj002s"; depends=[]; };
   JoSAE = derive2 { name="JoSAE"; version="0.3.0"; sha256="1vjxzbfs8a7kpmn2lb9dca67d4njmzjr3pl16s0r9ihmmxxwwili"; depends=[nlme]; };
   Johnson = derive2 { name="Johnson"; version="1.4"; sha256="12ajcfz5mwxvimv8nq683a2x3590gz0gnyviviyzf5x066a4q0lj"; depends=[]; };
-  JointAI = derive2 { name="JointAI"; version="0.5.2"; sha256="1g0vrjb3qma90qfalh51zw4cnyjb6yw3zhrcyzh4nvivz6cpp12j"; depends=[coda doParallel foreach MASS mcmcse rjags rlang]; };
+  JointAI = derive2 { name="JointAI"; version="0.6.0"; sha256="13amg3s8hq73qfn6makmqhgdpmq6asqbwhgc0b0haj7iw9ck42ma"; depends=[coda doParallel foreach MASS mcmcse rjags rlang]; };
   JointModel = derive2 { name="JointModel"; version="1.0"; sha256="1zgs5c7saqyqxvxmhw5sxy5w67abq344aid6igw1da05bfy2az6h"; depends=[lme4 statmod survival]; };
   JointNets = derive2 { name="JointNets"; version="2.0.1"; sha256="18n9dsy0w0nh7dznp6gw6g5fhhjhf5y589nb49hri0721kq1h3rb"; depends=[brainR igraph JGL lpSolve MASS misc3d oro_nifti pcaPP rgl shiny]; };
   Julia = derive2 { name="Julia"; version="1.1"; sha256="0i1n150d89pkds7qyr0xycz6h07zikb2y07d5fcpaqs4446a8prg"; depends=[]; };
@@ -1984,7 +2022,7 @@ in with self; {
   JumpTest = derive2 { name="JumpTest"; version="1.1"; sha256="0y375m5477nq0ybnjmfnd8hi45d8jmdnprqvw5f70llpd7bcghh0"; depends=[MASS Rcpp RcppEigen]; };
   JuniperKernel = derive2 { name="JuniperKernel"; version="1.4.1.0"; sha256="1zghlfwh4wsjjp7ldp5y86ffyzc27ccl5j9lcwlp1di9slaqjign"; depends=[data_table gdtools jsonlite pbdZMQ Rcpp repr]; };
   KANT = derive2 { name="KANT"; version="2.0"; sha256="169j72pmdkcj6hv8qgmc02aps0ppvvl1vnr1hzrb1gsf7zj7bs3y"; depends=[affy Biobase]; };
-  KATforDCEMRI = derive2 { name="KATforDCEMRI"; version="1.0"; sha256="1dq45psg8sisxzbi1iv7n45lk1ibarl3f7xf7icd6kv1jkc2f8za"; depends=[locfit matlab R_matlab]; };
+  KATforDCEMRI = derive2 { name="KATforDCEMRI"; version="1.0.1"; sha256="1wcm0h9lwpiw4crf15h5pfv9fxzpmf3g4jkylgnn9a36305rpdl8"; depends=[locfit matlab R_matlab]; };
   KCSKNNShiny = derive2 { name="KCSKNNShiny"; version="0.1.0"; sha256="13gzqf3g7vj8cc0xm5902q7lad2way8d0ri1fs01dnv97wmwbxvn"; depends=[caret dplyr FNN rhandsontable shiny]; };
   KCSNBShiny = derive2 { name="KCSNBShiny"; version="0.1.0"; sha256="1lv5r9qyvr3dnvcs00jyam0whv64qmv5vphhijlar1xa1g1llwqr"; depends=[caret dplyr e1071 rhandsontable shiny]; };
   KDViz = derive2 { name="KDViz"; version="1.3.1"; sha256="1if4lkq9kvncqw56j7m9kh4piph091zkivvnhxzxj72zq661q5br"; depends=[htmlwidgets igraph mpa networkD3 rvest stringr tm xml2]; };
@@ -2009,12 +2047,15 @@ in with self; {
   KSPM = derive2 { name="KSPM"; version="0.1.2"; sha256="1vgd7m0p65asj1v5b77zh6rv9vfbmxdc274mdya002nm9n8xn3gz"; depends=[CompQuadForm DEoptim expm]; };
   KScorrect = derive2 { name="KScorrect"; version="1.4.0"; sha256="1khvwc610yp3fd4fn0wcgqpzxg9g7sicjjmwvfcahs8qxn3m5vfa"; depends=[doParallel foreach iterators MASS mclust]; };
   KSgeneral = derive2 { name="KSgeneral"; version="0.1.1"; sha256="1ldk3fvwbr6hw7x3ydgzixgc41a0fbbic699zjlnpj5x4mjg1qby"; depends=[dgof MASS Rcpp]; };
+  KTensorGraphs = derive2 { name="KTensorGraphs"; version="0.2"; sha256="1851cqsn8ghp29hjp3806hl66lqjnz3d69qkmpcmk5nky426ypdr"; depends=[]; };
   KappaGUI = derive2 { name="KappaGUI"; version="2.0.2"; sha256="0vklny804xpd9r60j4a01j2gak8jizwjw0abf7yvbcalv3zbpb3k"; depends=[irr shiny]; };
   KappaV = derive2 { name="KappaV"; version="0.3"; sha256="13mmfb8ijpgvzfj20andqb662950lp9g25k5b26r5ba65p7nhva7"; depends=[maptools PresenceAbsence rgeos sp]; };
   KarsTS = derive2 { name="KarsTS"; version="2.2"; sha256="0ay9qi3wws0vi7lygkljaz6xhskc0mzl6r8wsaia2f5f399ya1hp"; depends=[BaylorEdPsych circular forecast infotheo mgcv missForest MVN nonlinearTseries plot3D rgl stinepack stlplus tcltk2 tkrplot tseries tseriesChaos zoo]; };
+  KbMvtSkew = derive2 { name="KbMvtSkew"; version="1.0.1"; sha256="0bbnsalyk6r5pzfpz7cniyck4ganm6jka6vijcrals5sxpg70w7x"; depends=[]; };
   KenSyn = derive2 { name="KenSyn"; version="0.3"; sha256="0s8sq3caxn4swac81196dp52r9lbmxb3ni45yaxh53f5g34slsi8"; depends=[lme4 metafor nlme]; };
   Kendall = derive2 { name="Kendall"; version="2.2"; sha256="0z2yr3x2nvdm81w2imb61hxwcbmg14kfb2bxgh3wmkmv3wfjwkwn"; depends=[boot]; };
   KernSmooth = derive2 { name="KernSmooth"; version="2.23-15"; sha256="1xhha8kw10jv8pv8b61hb5in9qiw3r2a9kdji3qlm991s4zd4wlb"; depends=[]; };
+  KernSmoothIRT = derive2 { name="KernSmoothIRT"; version="6.2"; sha256="1dm3j779y630hxdlxycwha563i3n9viil2ksq49s7m65bnwhj33k"; depends=[plotrix Rcpp rgl]; };
   KernelKnn = derive2 { name="KernelKnn"; version="1.0.9"; sha256="1y9s3y9r51rq8nz33glf767wjjclmj988rxw9r7rc9bw01dxkd7f"; depends=[Rcpp RcppArmadillo]; };
   Kernelheaping = derive2 { name="Kernelheaping"; version="2.2.1"; sha256="1mc3jzgmg8gyxs6kk474yz911abqzigxwjwjrmhipc40rrdmmr2z"; depends=[fastmatch ks magrittr MASS mvtnorm plyr sp sparr]; };
   KnapsackSampling = derive2 { name="KnapsackSampling"; version="0.1.0"; sha256="17yzmd11k1n5iy54vbcvpzvkm8ypbl6n1kfi931wwrrcq9y7hg22"; depends=[lpSolve]; };
@@ -2026,13 +2067,14 @@ in with self; {
   Kpart = derive2 { name="Kpart"; version="1.2.2"; sha256="02df0pr8a0gm8558gbw9svxf5sybmg27grymy71ar9hjnhw5xlf2"; depends=[leaps]; };
   KraljicMatrix = derive2 { name="KraljicMatrix"; version="0.2.1"; sha256="0yzilmiiyzd2x3v0cnjphf0wdwiblh37kgrvmfrdy49qly48pvi2"; depends=[dplyr ggplot2 magrittr tibble]; };
   KrigInv = derive2 { name="KrigInv"; version="1.4.1"; sha256="0x12xff7lgr1v2243shfz9a8r02qs56p7i0b8j2s6bmrzj1abrwb"; depends=[anMC DiceKriging mvtnorm pbivnorm randtoolbox rgenoud]; };
-  L0Learn = derive2 { name="L0Learn"; version="1.1.0"; sha256="1lz919d096s98c5lddyqnf8k8q5008a9p38i4nw2227ygi0gz8gk"; depends=[ggplot2 Matrix Rcpp RcppArmadillo reshape2]; };
+  L0Learn = derive2 { name="L0Learn"; version="1.2.0"; sha256="17k006nxn9n66nh6nrnhv24p150s7icbhzsaimjidj7hx2c24lms"; depends=[ggplot2 Matrix Rcpp RcppArmadillo reshape2]; };
   L1pack = derive2 { name="L1pack"; version="0.38.19"; sha256="09n1045lsx1ap47mhzcqghmwwhj24kvpjjr3ysprj058jp5g7ri0"; depends=[]; };
   LAGOSNE = derive2 { name="LAGOSNE"; version="2.0.1"; sha256="1lay0zb24k5ms4nfr62pgpriy7nfafnkdjjrd7xxznsi7dqrav0y"; depends=[curl dplyr lazyeval magrittr memoise progress purrr rappdirs rlang sf stringr tibble tidyr]; };
   LAM = derive2 { name="LAM"; version="0.4-17"; sha256="1isvhmrrpaamahwkxxsgyq6gbzcvfsk2s4ccjavnab4p79j0x782"; depends=[CDM Rcpp RcppArmadillo sirt]; };
   LANDD = derive2 { name="LANDD"; version="1.1.0"; sha256="13szkww9nw8zywfrqd8mwgj9csgragm0bx8ia52rcpakpc3hv3hx"; depends=[BH doParallel fdrtool foreach GGally ggplot2 GOSemSim GOstats igraph intergraph Matrix modeest mvtnorm pROC Rcpp]; };
   LARF = derive2 { name="LARF"; version="1.4"; sha256="1sqib7smgjacn07ishwls1nlbvcb6fpp1vhrjwf9g4xf9jk30i8h"; depends=[Formula]; };
-  LBSPR = derive2 { name="LBSPR"; version="0.1.3"; sha256="0wbqr3zxyfrjr0fdvx39hsxs841flaqhq6h8ynkdy2qnxx1spq7q"; depends=[dplyr ggplot2 gridExtra plotrix RColorBrewer Rcpp shiny tidyr]; };
+  LBLGXE = derive2 { name="LBLGXE"; version="1.4"; sha256="0a5rhijkp9xmwxlc0sx2fj6nikdwgjh2rw9pqavq8bnvvxq6ykwa"; depends=[dummies hapassoc]; };
+  LBSPR = derive2 { name="LBSPR"; version="0.1.4"; sha256="0kjf7pydvzvlvxp4lm5m1kmhgkc4ykj7n4iml22calkhgynm5din"; depends=[dplyr ggplot2 gridExtra plotrix RColorBrewer Rcpp shiny tidyr]; };
   LCA = derive2 { name="LCA"; version="0.1.1"; sha256="014kih33y8b9nls0pcigw68jbz7vgnq8w1xbwm2d37g1m5y6xlyw"; depends=[]; };
   LCAextend = derive2 { name="LCAextend"; version="1.3"; sha256="1l75y3vkbsmsm3pjd5pwy0hlv6gz5ryxs4pkx9aiyhxz2y9wnhpb"; depends=[boot kinship2 mvtnorm rms]; };
   LCAvarsel = derive2 { name="LCAvarsel"; version="1.1"; sha256="0aqc9rbrc8n6s9xllmamby219qsnxd4ajvffjr21qlkhkaklirb1"; depends=[doParallel foreach GA MASS memoise nnet poLCA]; };
@@ -2052,8 +2094,8 @@ in with self; {
   LEANR = derive2 { name="LEANR"; version="1.4.9"; sha256="053xy13ys5hibafdnbkwqdk36hw7dhanp4frfacpfpn5f9nfh95r"; depends=[foreach igraph]; };
   LEAP = derive2 { name="LEAP"; version="0.2"; sha256="1yrhanxvr7krvllqzv17qkc4wvmd7mgl57am8sn53773dbfipfc4"; depends=[]; };
   LEAPFrOG = derive2 { name="LEAPFrOG"; version="1.0.7"; sha256="0z9ahkk4qzc45h1r806frv9cd84vvshvn5mr84gx7qdxljfkfq6h"; depends=[alabama MASS]; };
-  LEGIT = derive2 { name="LEGIT"; version="1.3"; sha256="053ibvayfb9h54a3fcwbfciyx7nzy7sjr551bwv0wfchna8hcnmd"; depends=[boot doSNOW foreach formula_tools glmnet Hmisc iterators pROC RColorBrewer snow]; };
-  LFDR_MLE = derive2 { name="LFDR.MLE"; version="1.0"; sha256="11vy6gg2x98s1y8a5ns9vcd61gw8ax1lhn4lvicdjbd1lg18nm83"; depends=[]; };
+  LEGIT = derive2 { name="LEGIT"; version="1.3.1"; sha256="19wkqj7wj8lpni2i2bbfa8l77xb0wbb121fb82srsi6hn76i392g"; depends=[boot doSNOW foreach formula_tools glmnet Hmisc iterators pROC RColorBrewer snow]; };
+  LFDR_MLE = derive2 { name="LFDR.MLE"; version="1.0.1"; sha256="0ykcd24w71zxb53nch041g7xh83gmg1ia3sysdpn0yzkhm0w7cdl"; depends=[]; };
   LFDREmpiricalBayes = derive2 { name="LFDREmpiricalBayes"; version="1.0"; sha256="1imw3djmbpdyplv9dmdzzirp9imk88j0kcxcyfh8yr9ywgd77x6b"; depends=[matrixStats R6]; };
   LGEWIS = derive2 { name="LGEWIS"; version="1.1"; sha256="1i52vp0ghjzmyh4r8h6jpyij7x4skw99xvw017b56m8fg64zy70r"; depends=[CompQuadForm geeM mvtnorm SKAT]; };
   LGRF = derive2 { name="LGRF"; version="1.0"; sha256="1kdx6y55aa9n6v43zfz6jk8amvvxbx79sqm1jx4ihgkpgcdglan7"; depends=[CompQuadForm geepack SKAT]; };
@@ -2072,16 +2114,19 @@ in with self; {
   LOGAN = derive2 { name="LOGAN"; version="1.0.0"; sha256="00y8kcykw01gv2g20vmpwkc3qqyafwbiw5pa731xlfnh1b8sn0hi"; depends=[dplyr foreign ggplot2 magrittr modules pander psych rlang stringr]; };
   LOGICOIL = derive2 { name="LOGICOIL"; version="0.99.0"; sha256="1wgg7kigzzk5ghjn3hkjf1bb8d6mvjfmkwq64phri5jpxd742ps9"; depends=[nnet]; };
   LOST = derive2 { name="LOST"; version="1.3"; sha256="01ymnczsnfml04hb6hbi041khkz2aki78qr3hriw7n3bzs5i7xim"; depends=[e1071 gdata MASS miscTools pcaMethods rgl shapes]; };
-  LPCM = derive2 { name="LPCM"; version="0.46-2"; sha256="07641mds2w8l4idj6fims7d2vabbbxjfmvmylychj1x0nrh83vgb"; depends=[]; };
+  LPBkg = derive2 { name="LPBkg"; version="1.1.4"; sha256="07nqmpzhwgg64sjv6aqncl2zc9iss6d3ikmnq99azgjkq3jlfpfj"; depends=[Hmisc orthopolynom polynom]; };
+  LPCM = derive2 { name="LPCM"; version="0.46-3"; sha256="1bm5y95lzwcv8arlh55sy17m6hz1x48bcjkrwf3x34ax90qimf66"; depends=[]; };
   LPGraph = derive2 { name="LPGraph"; version="2.0"; sha256="1d3czxihaz3f09bfb34knqb6prhcx50kh8y4qrhhakic999z6ifw"; depends=[car PMA SDMTools]; };
   LPKsample = derive2 { name="LPKsample"; version="2.0"; sha256="1jg99025vk42rnjdymh3nj71npn4pmdsmk6rvnx3lykpi72f85dz"; depends=[apcluster igraph mclust]; };
   LPM = derive2 { name="LPM"; version="2.7"; sha256="1anjgflj1272xrghn3s9a21f2dfggppnzjqh3p8zaid91bzg0g34"; depends=[fracdiff MASS QRM]; };
+  LPRelevance = derive2 { name="LPRelevance"; version="2.0"; sha256="0h05a9dnnvhc6x48ak33n9y0ahyd2x6c7f1pwidj9c9fyb9ki7s5"; depends=[BayesGOF Bolstad2 ggplot2 leaps locfdr polynom reshape2]; };
   LPS = derive2 { name="LPS"; version="1.0.10"; sha256="0gf3jmhfki01z8fm5xdx59gxvhgzqd10x2iwa8369iz9dvwbjk8j"; depends=[]; };
   LPStimeSeries = derive2 { name="LPStimeSeries"; version="1.0-5"; sha256="0jmcy8076w4bzfnxaq2m3s60c1wdmywkwzfyrc19wdm8idf666wh"; depends=[RColorBrewer]; };
   LPTime = derive2 { name="LPTime"; version="1.0-2"; sha256="08lb6884kj9pg12mzx67fdnqb86x5s6yzb72hh3nrz50awj1f8nn"; depends=[orthopolynom]; };
   LPWC = derive2 { name="LPWC"; version="0.99.5"; sha256="13iv2v8lkyz9rpjzz2pr6b5g6nh79j8vd5hpx03vjyx08ii0dnq6"; depends=[]; };
   LPmerge = derive2 { name="LPmerge"; version="1.7"; sha256="1wf7hfj670pnzzxyqm3vwrbrvxdbyprh42s5vpv4y54a0w4nr83g"; depends=[Matrix Rglpk]; };
   LPower = derive2 { name="LPower"; version="0.1.0"; sha256="0g9y5s4k3l4zw97qh6c9jj6ysl39y4fprvqw1ybykirvgflisi8x"; depends=[MASS nlme]; };
+  LRQMM = derive2 { name="LRQMM"; version="1.1.10"; sha256="0dg2a2fcs8l952qpzbk997z03ckwchblm10kj778020w7wcs6jss"; depends=[GeneticsPed MASS MasterBayes Matrix MCMCglmm quantreg SparseM]; };
   LRTH = derive2 { name="LRTH"; version="1.3"; sha256="08vakwb7ca7956gifynzijka441yyx0wd5bq5jfhz56lzcxgfb99"; depends=[]; };
   LRcontrast = derive2 { name="LRcontrast"; version="1.0"; sha256="0fs06p853r42nws2camvs87py39hb1ssxhfm6d5n9kkq81snfx4q"; depends=[DoseFinding]; };
   LS2W = derive2 { name="LS2W"; version="1.3.4"; sha256="1h4vvl1gfxkdjmy6syl0gf4fv03xxxw82cxwvy10b40sf20lwmnv"; depends=[MASS wavethresh]; };
@@ -2152,7 +2197,7 @@ in with self; {
   LncPath = derive2 { name="LncPath"; version="1.1"; sha256="1cpsy681yq96867nr9g75xb0dilb016shqlhxpdn5xyiakrgjl4v"; depends=[igraph]; };
   LocFDRPois = derive2 { name="LocFDRPois"; version="1.0.0"; sha256="0zzdp9wgwr6wn3grimghpj4vq34x37c8bqg8acfzlzih8frqal3r"; depends=[dplyr ggplot2]; };
   LocalControl = derive2 { name="LocalControl"; version="1.1.2"; sha256="0r1qjzwmnh4qgxi5lfpg7v0ksjvcqbn8c23y2cyvb58srmxv7plb"; depends=[cluster gss lattice Rcpp]; };
-  LocalControlStrategy = derive2 { name="LocalControlStrategy"; version="1.3.2"; sha256="0cs2dz1p6kpc9ghihnkzjknxwd904c376ryyabkf6lkqzc2p91sq"; depends=[cluster lattice]; };
+  LocalControlStrategy = derive2 { name="LocalControlStrategy"; version="1.3.3"; sha256="05vggk5d0w3f9w5217c9hzy5jhwv24p2g8pcj0l6zxkhic01nbrl"; depends=[cluster lattice]; };
   Lock5Data = derive2 { name="Lock5Data"; version="2.8"; sha256="17awskq78h23z2dy96d7hziljhnkx5phpd48q7cppxidyvzfywim"; depends=[]; };
   Lock5withR = derive2 { name="Lock5withR"; version="1.2.2"; sha256="10x3i11pb4cig4pgfmw9984na5zjbg7d41y6crakiimf53ihx0c2"; depends=[]; };
   LogConcDEAD = derive2 { name="LogConcDEAD"; version="1.6-3"; sha256="0gplkprvldw2dq43kvij215lv9x9xdnp47smn8m1r93nk4pxy5mr"; depends=[MASS mclust mvtnorm tkrplot]; };
@@ -2166,19 +2211,19 @@ in with self; {
   LowRankQP = derive2 { name="LowRankQP"; version="1.0.3"; sha256="1a46rk0fhpnrlfzmydy7zjswrm6hf056qxgf5p10naq6025whf8x"; depends=[]; };
   LowWAFOMNX = derive2 { name="LowWAFOMNX"; version="1.1.1"; sha256="0f75qsv6pisgvk39yagzfxscnyfsgh63rmhp4gpybpl0pqmjp48x"; depends=[Rcpp RSQLite]; };
   LowWAFOMSobol = derive2 { name="LowWAFOMSobol"; version="1.1.1"; sha256="1ym3i2m1am356di9lcp5nfmxq0np3c4bwsv6bbmf7hg02j7dhwi4"; depends=[Rcpp RSQLite]; };
-  Luminescence = derive2 { name="Luminescence"; version="0.9.3"; sha256="06rhqzli17j4lv87aiqwf43m14gy5c45jh9wzkn4kzqwwh1mzb5a"; depends=[bbmle data_table DEoptim httr magrittr matrixStats minpack_lm plotrix raster Rcpp RcppArmadillo readxl shape XML zoo]; };
+  Luminescence = derive2 { name="Luminescence"; version="0.9.5"; sha256="1ly9xlm3v552264sf44xsymv3r1v5znl3rsv5zak5zgdva0hjdjk"; depends=[bbmle data_table DEoptim httr magrittr matrixStats minpack_lm plotrix raster Rcpp RcppArmadillo readxl shape XML zoo]; };
   M2SMF = derive2 { name="M2SMF"; version="1.0"; sha256="0hf5ckpridi70yv15h0771q1grhqr9c592r87hgba7yh55dqqcq1"; depends=[dplyr MASS]; };
   M3 = derive2 { name="M3"; version="0.3"; sha256="1l40alk166lshckqp72k5zmsgm7s5mgyzxlp11l64mgncjwkw2r3"; depends=[mapdata maps ncdf4 rgdal]; };
   MADPop = derive2 { name="MADPop"; version="1.1.2"; sha256="0hwnkjrc3w9x3gha0y70fidfc587b6gfdhzwzdzrfvxrhsdy05yd"; depends=[BH Rcpp RcppEigen rstan StanHeaders]; };
   MAGNAMWAR = derive2 { name="MAGNAMWAR"; version="2.0.4"; sha256="1asr18byrgy6bkpxpmnkczgr3dam6ymf30lw6izq112krc891bg4"; depends=[ape coxme doParallel dplyr foreach iterators lme4 multcomp plyr qqman seqinr survival]; };
-  MAINT_Data = derive2 { name="MAINT.Data"; version="2.2.0"; sha256="0kzix0kb3md2mamxs8z3jfk63f0b7pbh3r39sm4jcmn1mzil2b65"; depends=[ggplot2 MASS mclust miscTools pcaPP Rcpp RcppEigen robustbase rrcov sn]; };
+  MAINT_Data = derive2 { name="MAINT.Data"; version="2.3.0"; sha256="1c24z5f9j4x7yf64877wgmc68lqilanhcv1h48j6jg22gr5cxamj"; depends=[GGally ggplot2 MASS mclust miscTools pcaPP Rcpp RcppEigen robustbase rrcov sn]; };
   MALDIquant = derive2 { name="MALDIquant"; version="1.19.3"; sha256="0b7kdz3x4sdq413h1q09l1qhcvdnnwv6fqsqwllks1cd3xy34c57"; depends=[]; };
   MALDIquantForeign = derive2 { name="MALDIquantForeign"; version="0.12"; sha256="1r37x1hnhq246dazc76d17jfjc57khxayswbzvc4md39z8dnbihx"; depends=[base64enc digest MALDIquant readBrukerFlexData readMzXmlData XML]; };
   MALDIrppa = derive2 { name="MALDIrppa"; version="1.0.1-2"; sha256="1jl26ndi0zvyq29qjkmdxg9psgwyv8wapd7f0cv4w88d9gk257az"; depends=[lattice MALDIquant robustbase signal wmtsa]; };
   MAMS = derive2 { name="MAMS"; version="1.3"; sha256="181i1p84pacl31qsh5vkvyxnca9sx6rabi7cs42w9qpzk2fxcmzj"; depends=[mvtnorm]; };
   MAMSE = derive2 { name="MAMSE"; version="0.2-1"; sha256="0spi7fqkxjiw5j0nf7ambcr8kpzdhjzh9y3dk23y1mrk2dgc5dkw"; depends=[]; };
   MANCIE = derive2 { name="MANCIE"; version="1.4"; sha256="0940xl3z5bca6hcnj2bj341l79wajilxlxzmyz3dlgrz0b3bbdmm"; depends=[]; };
-  MANOVA_RM = derive2 { name="MANOVA.RM"; version="0.3.2"; sha256="09k46h4x0w8d0pck1bbk9396khszywp2mipvk3lr96yi4nn3zhmw"; depends=[ellipse magic MASS Matrix multcomp plotrix plyr]; };
+  MANOVA_RM = derive2 { name="MANOVA.RM"; version="0.3.4"; sha256="0x7l9k35g7fm70ybddjxy0xni6xhmb9kjnpgabm3ljjipj62vshv"; depends=[data_table ellipse magic MASS Matrix multcomp plotrix plyr]; };
   MAP = derive2 { name="MAP"; version="0.1.3"; sha256="19d0m30jh50ibbdgvcvq1vsz5i1vf8qvl0d0nbqklvnndch61jhk"; depends=[flexmix Matrix]; };
   MAPA = derive2 { name="MAPA"; version="2.0.4"; sha256="02s223s58k2jk49m0xlz3q9m3nip3h4dl4v58j18z2vgi54dwnjr"; depends=[forecast RColorBrewer smooth]; };
   MAPLES = derive2 { name="MAPLES"; version="1.0"; sha256="0hzsh7z1k7qazpxjqbm9842zgdpl51irg7yfd119a7b2sd3a8li9"; depends=[mgcv]; };
@@ -2220,9 +2265,10 @@ in with self; {
   MCMCpack = derive2 { name="MCMCpack"; version="1.4-4"; sha256="1xzrgib2mjz0xpqranhdyc5m4fmg2fir9mcf51ciw5pp53b97qcp"; depends=[coda lattice MASS mcmc quantreg]; };
   MCMCprecision = derive2 { name="MCMCprecision"; version="0.3.9"; sha256="1zmlz2kwrp1qiyvq3v5vv1rsy3s2idlifmckmgznk4nkqds5ifwh"; depends=[combinat Matrix Rcpp RcppArmadillo RcppEigen RcppProgress]; };
   MCMCtreeR = derive2 { name="MCMCtreeR"; version="1.1"; sha256="00r6f62h7ryil7qxd25icvkqypjjssjsrz4i5sbqsnw5cdy5al8z"; depends=[ape coda sn]; };
-  MCMCvis = derive2 { name="MCMCvis"; version="0.12.2"; sha256="0zj94akw48bgj9bvk6zssn41829znv1pyi73m43ldq4vgqj5zp2s"; depends=[coda overlapping rstan]; };
+  MCMCvis = derive2 { name="MCMCvis"; version="0.13.1"; sha256="0p5snrikn9xhjvyzpq5fh2c10304cygxkwqcy2a3s6sqgan4brch"; depends=[coda overlapping rstan]; };
   MCPAN = derive2 { name="MCPAN"; version="1.1-21"; sha256="0q1m0xg8825q9zjwxcz2h2n0dyr21q5bk29qbqpdhirlwm6f1a51"; depends=[magic MCMCpack multcomp mvtnorm plyr]; };
   MCPMod = derive2 { name="MCPMod"; version="1.0-10"; sha256="0ns74qhm9bzi70m9bn61zs4mmqmmxxi77f49pdrcnr8wrrnn1kdn"; depends=[lattice mvtnorm]; };
+  MCPModGeneral = derive2 { name="MCPModGeneral"; version="0.1-0"; sha256="1660r7ibgj5jl5nf3p11911n8k3wbnnzagapn73f2g5racwrbx1d"; depends=[DoseFinding MASS]; };
   MCS = derive2 { name="MCS"; version="0.1.3"; sha256="1kiz1jq1bm2n8f33nsybp5jfrzzl9xbsi3m9l8818ybmph99xms6"; depends=[]; };
   MCSim = derive2 { name="MCSim"; version="1.0"; sha256="1nqry41qa5c02an5fxm3y1g3w1vcqjgsy1an95i3szz1w1ndaj14"; depends=[CircStats MASS]; };
   MCTM = derive2 { name="MCTM"; version="1.0"; sha256="14xjfskyrqi0m58lkwjfjpss5j7wy3ajr148n526czrrpccg108j"; depends=[]; };
@@ -2236,25 +2282,26 @@ in with self; {
   MDimNormn = derive2 { name="MDimNormn"; version="0.8.0"; sha256="080m0irx5v8l45fg9ig5yzcj92s3ah8a9aha288byszli1cchgpn"; depends=[]; };
   MDplot = derive2 { name="MDplot"; version="1.0.1"; sha256="1xijh18hrkb807nfkdr7g642aspn5psc8nw29q387jl5hly2w8s9"; depends=[gplots gtools MASS RColorBrewer]; };
   MED = derive2 { name="MED"; version="0.1.0"; sha256="0fy0qmxirkdz5kigy2r7l5czjzws0fhjxy13kv1kqh628ldrp109"; depends=[]; };
+  MEDseq = derive2 { name="MEDseq"; version="1.0.0"; sha256="1pac9g6pmh5wn5mm48vdbn5rbd0c02z28xqkbdrklf3wcxf4b2qd"; depends=[cluster matrixStats nnet seriation stringdist TraMineR WeightedCluster]; };
   MEET = derive2 { name="MEET"; version="5.1.1"; sha256="02xz2zkwqaf1wck9a3h1j6z8dasw4j0zqa88jg6h10wqzcrlp9ba"; depends=[Hmisc KernSmooth Matrix pcaMethods ROCR seqinr seqLogo]; };
   MEGENA = derive2 { name="MEGENA"; version="1.3.7"; sha256="0cr10pmj1n831scz5kgaq3nkglr3imwgc62cxng2dvdxr9991g21"; depends=[BH cluster doParallel foreach fpc ggplot2 ggraph ggrepel igraph Matrix Rcpp reshape]; };
   MEMSS = derive2 { name="MEMSS"; version="0.9-3"; sha256="0fq85jrajfwavq2fvsw2x9hknc57wc253zw2vw970f04khfbragd"; depends=[lme4]; };
   MEPDF = derive2 { name="MEPDF"; version="3.0"; sha256="15hbp7g5dsdpvi239jm6jn11fn371ir6la31g0flqkilq6sr1sqd"; depends=[gtools mvtnorm plyr pracma]; };
-  MESS = derive2 { name="MESS"; version="0.5.5"; sha256="13kln67ca9d5dnimg0mqbnl6bni52r04xjhrw1vyzlhvn0x684kg"; depends=[geeM geepack glmnet kinship2 MASS Matrix mvtnorm Rcpp RcppArmadillo]; };
-  MEtest = derive2 { name="MEtest"; version="1.0"; sha256="0hiv676lwwis1mmnw51vq4iwhbrwx0dvd6bmbv7hmxd48bykrcvg"; depends=[statmod]; };
+  MESS = derive2 { name="MESS"; version="0.5.6"; sha256="1p0ail3pd5mrw7p9f1hs5vqdirpjdkgs63zpsib60qjhg61l0iy6"; depends=[geeM geepack ggformula ggplot2 glmnet kinship2 MASS Matrix mvtnorm Rcpp RcppArmadillo]; };
+  MEtest = derive2 { name="MEtest"; version="1.1"; sha256="0dxm3fs0lqnas70a1ckikvjp2ib9rqsknwcs9n9jfsmm1fqhxdpf"; depends=[statmod]; };
   MF = derive2 { name="MF"; version="4.3.2"; sha256="1arnhyqf1cjvngygcpqk2g4d52949rhkjmclbaskyxcrvp62qln0"; depends=[]; };
-  MFAg = derive2 { name="MFAg"; version="1.4"; sha256="092zbl2pxbsvfyf3qssbid14194p0ax2zrw0gzpyqwzdpx0brrlb"; depends=[]; };
+  MFAg = derive2 { name="MFAg"; version="1.5"; sha256="0av47syfb0jkiix0xjnd208bz78gx5ji2y9kb7ni1yd7njm7in9m"; depends=[]; };
   MFDFA = derive2 { name="MFDFA"; version="1.1"; sha256="0nr78p6y4jpg1hrl0h7b7hyvwbr61paf85y3f2dx815x5hscmdhy"; depends=[numbers]; };
   MFHD = derive2 { name="MFHD"; version="0.0.1"; sha256="0gb8y297y1x03wy46530psmlawyv4z5dydilk36qcmadlk1wx02k"; depends=[deldir depth depthTools fda_usc matrixStats]; };
   MFKnockoffs = derive2 { name="MFKnockoffs"; version="0.9.1"; sha256="1bcdqfzmllp3dri1phy365wgc9c37wlag65pzljn4p3mf43w10nq"; depends=[corpcor glmnet gtools Matrix Rdsdp RSpectra]; };
   MFPCA = derive2 { name="MFPCA"; version="1.3-2"; sha256="1p467zc8lvdcl8n0mf6aazm39flbn62ykwc6c6brkxy46cdvc5jv"; depends=[abind foreach funData irlba Matrix mgcv plyr]; };
   MFT = derive2 { name="MFT"; version="2.0"; sha256="0n1xws3dw0650037qyqgp600p8cf098qa5hkbncdfdbl0w34qamy"; depends=[]; };
-  MGDrivE = derive2 { name="MGDrivE"; version="1.0.0"; sha256="1wjrc8mb0bh2b66g7qsqhz1w8pp53z4amaq7nv68y2j8i2lm39l9"; depends=[data_table R6 Rcpp Rdpack]; };
+  MGDrivE = derive2 { name="MGDrivE"; version="1.1.0"; sha256="16nm47vazd06hvi4k3z86lxilgk8y4b3p44h6cm2b8az90irmj5f"; depends=[data_table R6 Rcpp Rdpack]; };
   MGL = derive2 { name="MGL"; version="1.1"; sha256="03q453swnangxyc4nvjhzw2zpcy5vp1wpilap5rwymnf0c0xi4j7"; depends=[]; };
   MGLM = derive2 { name="MGLM"; version="0.2.0"; sha256="0yyqm53lvp59zy8lkffw9x3zhqrnh29j5v3yyzk6qrgj2slnc7nk"; depends=[]; };
   MGRASTer = derive2 { name="MGRASTer"; version="0.9"; sha256="0jmf2900r56v60981sabflkhid3yrqd9xd7crb56vgfl1qkva9zp"; depends=[]; };
   MGSDA = derive2 { name="MGSDA"; version="1.4"; sha256="0grwl740yvz2av5nkvmyyrr8ji5f39sjs1c5gxp6lp9p36i2wc32"; depends=[MASS]; };
-  MHCtools = derive2 { name="MHCtools"; version="1.1.1"; sha256="0f3r7600nbj19rzlfxb8hk2ifrqjmf796ilz5xgs4fkdqxclb585"; depends=[rlist]; };
+  MHCtools = derive2 { name="MHCtools"; version="1.2.1"; sha256="1mf70x1vd8h8i0iapl54fp8q4gpqd61faxvhpxlhv49g8s5n9pbd"; depends=[rlist]; };
   MHTcop = derive2 { name="MHTcop"; version="0.1.1"; sha256="1mr8y8brsi37b5qx3fqm0bj90dgknzzwhxfmvyd9kxbxh19whgxq"; depends=[copula matrixStats MCMCpack mvtnorm stabledist]; };
   MHTdiscrete = derive2 { name="MHTdiscrete"; version="1.0.1"; sha256="0czpsk4jiwbzd6g2dwssmggsdhwchikmc1skv48d9j4xvglns7yw"; depends=[]; };
   MHTmult = derive2 { name="MHTmult"; version="0.1.0"; sha256="1y3vh2kab6nfkiz4nzdhrpy9h6drk1ibfd2h62hpr3y09z9a2yld"; depends=[]; };
@@ -2270,9 +2317,9 @@ in with self; {
   MImix = derive2 { name="MImix"; version="1.0"; sha256="033gxr0z2xba0pgckiigblb1xa94wrfmpgv3j122cdynjch44j4r"; depends=[]; };
   MInt = derive2 { name="MInt"; version="1.0.1"; sha256="1nk02baainxk7z083yyajxrnadg2y1dnhr51fianibvph1pjjkl6"; depends=[glasso MASS testthat trust]; };
   MKLE = derive2 { name="MKLE"; version="0.05"; sha256="00hcihjn3xfkzy0lvb70hl2acjkwk6s3y7l4gprix24shnblvxzi"; depends=[]; };
-  MKmisc = derive2 { name="MKmisc"; version="1.5"; sha256="1b8fxhgszyj75ii9mlh84gh8bc5ljf5f8ap1i7jaall9q5m0hfhd"; depends=[ggplot2 limma RColorBrewer robustbase scales]; };
-  ML_MSBD = derive2 { name="ML.MSBD"; version="1.1.1"; sha256="1j110kz2k5hyk3la771yx41k6c2pam2k5hzzx42fm5n127aq3q56"; depends=[ape]; };
-  MLCIRTwithin = derive2 { name="MLCIRTwithin"; version="2.1"; sha256="07fhbhfnlmllxxdpdqiaz6d72y4pj3vrz6lw5rnlb2m7vknx51ik"; depends=[limSolve MASS MultiLCIRT]; };
+  MKmisc = derive2 { name="MKmisc"; version="1.6"; sha256="0x518icdgq4mrc6qm1flb5lpr9y7j9znh0ah3gw2xsbjiplqd323"; depends=[ggplot2 limma RColorBrewer robustbase scales]; };
+  ML_MSBD = derive2 { name="ML.MSBD"; version="1.2.0"; sha256="1dxvvyha984j3h170s2brhbf4lm53f16f12lhnqf3sl4sc0f4xv8"; depends=[ape foreach]; };
+  MLCIRTwithin = derive2 { name="MLCIRTwithin"; version="2.1.1"; sha256="1x0xmka7kkbjnh3yv4zxxyl17cpmf0rb9hxmdl1srb6ijld4np1b"; depends=[limSolve MASS MultiLCIRT]; };
   MLCM = derive2 { name="MLCM"; version="0.4.2"; sha256="14sd9ybwyilympnbyaqmwdrbip4vyn1p93rh9mlxls3bmk6nc4hv"; depends=[]; };
   MLDAShiny = derive2 { name="MLDAShiny"; version="0.1.0"; sha256="14n8pffzw5y7lq3qx1xly4jwm05cyvs14gn838h6y9yssb16xnmr"; depends=[caret DiscriMiner dplyr e1071 klaR MASS rhandsontable rmarkdown shiny]; };
   MLDS = derive2 { name="MLDS"; version="0.4.5"; sha256="1a5y031kd6zx0zqlk6dvxzsv3isbvg9jap4gqad2jwryh0a9x3c1"; depends=[MASS]; };
@@ -2282,7 +2329,8 @@ in with self; {
   MLML2R = derive2 { name="MLML2R"; version="0.3.2"; sha256="0ii1hzbv21x96jancz30rg0jd6kz9miq22j9xx1i9zrzxx1rlh0p"; depends=[]; };
   MLPUGS = derive2 { name="MLPUGS"; version="0.2.0"; sha256="1yda37073g640g1qrkjrwa8hbyq6bjlcw3wpznx0bk5h0639bc0s"; depends=[]; };
   MLRShiny = derive2 { name="MLRShiny"; version="0.1.0"; sha256="06zcyz8l4754sjbcql3jd3nq1d2lgj92p5h2bh708z52mww71isw"; depends=[corrgram dplyr forecast psych QuantPsyc shiny shinyAce]; };
-  MLZ = derive2 { name="MLZ"; version="0.1.1"; sha256="1x2mmd7rb6rk2qb84i7k71w8l14m5dvkwg1xpjqgy9lzqnwhxi45"; depends=[dplyr ggplot2 gplots RcppEigen reshape2 TMB]; };
+  MLRShiny2 = derive2 { name="MLRShiny2"; version="0.1.0"; sha256="1ygamp0ldz1i0w2xyi205rpd1gd5asw61l36z06j41ghdyiz1lww"; depends=[corrgram dplyr forecast psych QuantPsyc shiny shinyAce]; };
+  MLZ = derive2 { name="MLZ"; version="0.1.3"; sha256="0yj9241k3yk8qy6w2q26gwbj9b9qynv3s3jpyfxixvkc9kji3wc2"; depends=[dplyr ggplot2 gplots RcppEigen reshape2 TMB]; };
   MLmetrics = derive2 { name="MLmetrics"; version="1.1.1"; sha256="061129b36h7xqw4zsznik694n8yy9qq6aaqfhdxkhdv8n5v1nzvp"; depends=[ROCR]; };
   MM = derive2 { name="MM"; version="1.6-5"; sha256="0vi6wp6p48jjfmnspdsnmw0yqz39sjk6nrkxdw7kan5h17h4rwd7"; depends=[abind emulator magic Oarray partitions]; };
   MM2S = derive2 { name="MM2S"; version="1.0.6"; sha256="1knr15vjc81cp7j67nc2gwkgds6ar3ribi1h0ihg0ch6rfz5c5zs"; depends=[GSVA kknn lattice pheatmap]; };
@@ -2321,7 +2369,7 @@ in with self; {
   MPS = derive2 { name="MPS"; version="2.3.0"; sha256="0rr66f3ijzvqzj6b0hl7i065r5ndzcb2r5sjhx32rihgjdg60lr3"; depends=[]; };
   MPSEM = derive2 { name="MPSEM"; version="0.3-6"; sha256="0kw3aixhl5j8nq4lcx65l80v4lihvpa4qd12n2jrc96lnm6mw00b"; depends=[ape MASS]; };
   MPTinR = derive2 { name="MPTinR"; version="1.11.0"; sha256="1pflypcysc43yp4rh1lxnf7f0qklc6rl4y1mvj6ydwv5nlz52mbh"; depends=[Brobdingnag numDeriv Rcpp RcppEigen]; };
-  MPTmultiverse = derive2 { name="MPTmultiverse"; version="0.2-0"; sha256="0bhxzg5q3slq5x281xnyqwlgazkddlcaw4z6k7nc419v5ym75cqz"; depends=[coda dplyr ggplot2 limSolve magrittr MPTinR purrr readr reshape2 rlang runjags tibble tidyr TreeBUGS]; };
+  MPTmultiverse = derive2 { name="MPTmultiverse"; version="0.3-3"; sha256="0wl5ww7ii8vbgg3680zh3y5pqz1ipfnhjka1lz62fmp3rs09zmfq"; depends=[coda dplyr ggplot2 limSolve magrittr MPTinR purrr readr reshape2 rlang runjags tibble tidyr TreeBUGS]; };
   MPV = derive2 { name="MPV"; version="1.55"; sha256="127m19q5dq38x2k29rkgvvfidazbmzsarzf9m2sjpx6ay8j8hvpl"; depends=[KernSmooth]; };
   MPkn = derive2 { name="MPkn"; version="0.1.0"; sha256="0nvd6sv1wypcmphm0wcymbibcxrqzx3c9s9b191p1pmxyz607vxv"; depends=[]; };
   MPsychoR = derive2 { name="MPsychoR"; version="0.10-7"; sha256="10nphm5dzxha4xb7a21b0nxbqy55fg8k748qax7nq3rj4nfjaml7"; depends=[]; };
@@ -2339,13 +2387,13 @@ in with self; {
   MRsurv = derive2 { name="MRsurv"; version="0.2"; sha256="148myzk6r8whkpv1yv59dmdlr2n8vdwmaww165aw696xfjxwq550"; depends=[mvtnorm survival]; };
   MRwarping = derive2 { name="MRwarping"; version="1.0"; sha256="13bcs7rlm4irx7yzdnib558w9014a4chh9xwc010m6pxvxv36qnv"; depends=[boa SemiPar]; };
   MSCMT = derive2 { name="MSCMT"; version="1.3.3"; sha256="1962lc6p5cy8pkbshzbl3jnd2pqnk9afs4lmp4qb7fqkmb4xpka3"; depends=[ggplot2 lpSolve lpSolveAPI Rdpack Rglpk]; };
-  MSEtool = derive2 { name="MSEtool"; version="1.2.1"; sha256="1y1hncpa6qbd2dbcrkm9kacxmnw38g75bknxgq0dqygg07hcaabw"; depends=[abind coda corpcor DLMtool gplots MASS mvtnorm pryr RcppEigen reshape2 rmarkdown snowfall TMB]; };
-  MSG = derive2 { name="MSG"; version="0.3"; sha256="181kzkbw69bs3vir6dzgq7jzp8xcpg1p4isfb660vgnd1flb03ix"; depends=[RColorBrewer]; };
+  MSEtool = derive2 { name="MSEtool"; version="1.3.0"; sha256="0px8w9xp64i2xbb9h3vk2hd77qw7spcffix8nlbvh92bwlm5rckk"; depends=[abind coda corpcor DLMtool gplots MASS mvtnorm RcppEigen reshape2 rmarkdown snowfall TMB]; };
+  MSG = derive2 { name="MSG"; version="0.4"; sha256="0fdxgqfc87iwqnnrgh7m8bfxh8lv42ffi0xxy4i1rv94aiw8gfr5"; depends=[RColorBrewer]; };
   MSGARCH = derive2 { name="MSGARCH"; version="2.3"; sha256="0dax3cx0dzmg086vhymnm5x5s7ljdnxx1k52xnnvrm6pprhdgaqn"; depends=[coda expm fanplot MASS numDeriv Rcpp RcppArmadillo zoo]; };
   MSGLasso = derive2 { name="MSGLasso"; version="2.1"; sha256="1k17vnvzr647pwfbdxrpqcsp34iygq86wf0ns4rq8cj6q5mik1bv"; depends=[]; };
   MSIseq = derive2 { name="MSIseq"; version="1.0.0"; sha256="1v2why1k6pjsc04044nr74571p7541nciq7xkzmya3jq6dw878j3"; depends=[IRanges R_utils rJava RWeka]; };
   MSMwRA = derive2 { name="MSMwRA"; version="1.3"; sha256="0b0fqfv6iick1brqik4rqz2936nfa51i6xlfavs65r9692wks73q"; depends=[]; };
-  MSPRT = derive2 { name="MSPRT"; version="2.0"; sha256="16j66r8b4lh9x6wfblq2xxydvbzfajiixmq7144vv1rfmbs8if8m"; depends=[doParallel foreach ggplot2 iterators nleqslv]; };
+  MSPRT = derive2 { name="MSPRT"; version="2.1"; sha256="0c0hhpjpkx8yl5bxqn6nw747jli9fdzkwmi31lzr664r5xinxyf7"; depends=[doParallel foreach ggplot2 iterators nleqslv]; };
   MSQC = derive2 { name="MSQC"; version="1.0.2"; sha256="11wcy04cpjlnc71s2svs4lm1cp718dz1p4a1603x6zwpbf22bygn"; depends=[rgl]; };
   MST = derive2 { name="MST"; version="2.1"; sha256="16mnsn2an02k4jrqb6yj0n1i563zny5v10ngfq1y28fqaw6h8yyq"; depends=[Formula MASS partykit survival]; };
   MSbox = derive2 { name="MSbox"; version="1.2.1"; sha256="0lmvpzsw13w18mzi5z85yzify3xsh5sx356ndggfzyl5d5wk7s8g"; depends=[stringr xml2]; };
@@ -2362,16 +2410,17 @@ in with self; {
   MVA = derive2 { name="MVA"; version="1.0-6"; sha256="09j9frr6jshs6mapqk28bd5jkxnr1ghmmbv6f4zz0lrg81zjizl3"; depends=[HSAUR2]; };
   MVB = derive2 { name="MVB"; version="1.1"; sha256="0an8b594rknlcz6zxjva6br8f34sgwdi2jil3xh1xzb5fa55dw0f"; depends=[Rcpp RcppArmadillo]; };
   MVLM = derive2 { name="MVLM"; version="0.1.4"; sha256="1zcj405dc4jbiqw6p0fcbam8yc9d6yjpmrx5wjw5zjvig3iqb91k"; depends=[CompQuadForm]; };
-  MVN = derive2 { name="MVN"; version="5.7"; sha256="1knll6hppbskny70j1a1vj3ad5yph76mq6swqcbmwh2d46fwdbln"; depends=[boot car energy kableExtra magrittr MASS moments mvoutlier nortest plyr psych robustbase]; };
+  MVN = derive2 { name="MVN"; version="5.8"; sha256="1rk8zrf3bavywv4bca1aqsfrirxkvxh5lfwrnj0g8zncd69bd1fc"; depends=[boot car energy kableExtra magrittr MASS moments mvoutlier nortest plyr psych robustbase]; };
   MVNBayesian = derive2 { name="MVNBayesian"; version="0.0.8-11"; sha256="1iaxyp480v91887cn4w3l74907wvbzs3ay4cjgzd8xk2dp47w8bg"; depends=[mvtnorm plyr]; };
   MVR = derive2 { name="MVR"; version="1.33.0"; sha256="1ygz47a2p5r5axql5zsxvsn25pcqyxz6mpw50zfmzrcqdrfa3bg8"; depends=[statmod]; };
   MVT = derive2 { name="MVT"; version="0.3"; sha256="0vinlv3d5daf8q7pd9xgs51nxz2njgdba5750vygmv883srlzi9d"; depends=[]; };
   MVTests = derive2 { name="MVTests"; version="1.1"; sha256="13q9bfzbcf2gz5mhp5rjja5d0k0m78f0253ziwrlg5ncyf2d8q0c"; depends=[matrixcalc]; };
-  MVar = derive2 { name="MVar"; version="2.0.7"; sha256="025k78ahia9mv983kr8p4gbn675b59zxl7ywv13kbvn4jcpakiy8"; depends=[MASS]; };
-  MVar_pt = derive2 { name="MVar.pt"; version="2.0.7"; sha256="1aif7la0mfsyh2wksvhwvakkrgj9irzg3c84psbad58v9yabjrla"; depends=[MASS]; };
+  MVar = derive2 { name="MVar"; version="2.1.1"; sha256="17fj2y739afmdrbhnd2la9qiywcyyk0nr1d8936c63nz8xivvssv"; depends=[MASS]; };
+  MVar_pt = derive2 { name="MVar.pt"; version="2.1.1"; sha256="0jzsiawisr0378n9ph7s2c2j64xybf9mz00zriw38cjr1lxaqrnf"; depends=[MASS]; };
   MVisAGe = derive2 { name="MVisAGe"; version="0.2.1"; sha256="1plrzzj7cr2hxk1npadvjnk7sanhilh99l5vrkjjh3l6li2ym09b"; depends=[]; };
   MWLasso = derive2 { name="MWLasso"; version="1.3.1"; sha256="11lyk46lmjcd60q0mixi41b8ybjgyp1xi18g3ag4450xyhw3r17s"; depends=[]; };
   MWRidge = derive2 { name="MWRidge"; version="1.0.0"; sha256="17kvs9npr1ff24z3pv9x2qnfwyy6w3hc7hm60ynzbjlk2rr11xr9"; depends=[glmnet]; };
+  MWright = derive2 { name="MWright"; version="0.3.2"; sha256="1c57f0wnlhl4gqy17vi93r4fknycvv67b9bifgcvabws390jpx7q"; depends=[cubature]; };
   MXM = derive2 { name="MXM"; version="1.4.4"; sha256="1dmq8ws1dqd294lrhd60dh1avkj58n9dha5ag4igwgjw31mphsr9"; depends=[bigmemory coxme doParallel dplyr energy foreach geepack knitr lme4 MASS nnet ordinal quantreg relations Rfast Rfast2 survival visNetwork]; };
   MaXact = derive2 { name="MaXact"; version="0.2.1"; sha256="1n7af7kg54jbr09qk2a8gb9cjh25cnxzj2snscpn8sr8cmcrij0i"; depends=[mnormt]; };
   MachineLearning = derive2 { name="MachineLearning"; version="0.1.3"; sha256="0yvrsqzvx8ss614ixa9mwkg2ig3hmfixm78fi8c3wmpc2frvsqrk"; depends=[arules crayon dplyr formula_tools FSelectorRcpp ggplot2 magrittr NbClust rpart rpart_plot]; };
@@ -2384,6 +2433,7 @@ in with self; {
   ManyTests = derive2 { name="ManyTests"; version="1.2"; sha256="1mi7wvnkcd95126f1h8vl8skn397yd2zqvcswprqar54p161wgyi"; depends=[]; };
   Map2NCBI = derive2 { name="Map2NCBI"; version="1.3"; sha256="04fhnghakygpwrmhrwqr6g0r62zsxl0czy5bn3xl5iqzaswcd4i1"; depends=[rentrez]; };
   MapGAM = derive2 { name="MapGAM"; version="1.2-5"; sha256="0ardqsa7smx0syh1l591bm6a1rb7kvcyw3rlb3hkfk8rk4k60qmr"; depends=[colorspace gam maptools sp survival]; };
+  Mapinguari = derive2 { name="Mapinguari"; version="1.0.0"; sha256="1jfqinfr6wkpmkp4jm9ixgawcywm3n1ni03h6zngvx74saz7kd3g"; depends=[dplyr magrittr raster rgdal rlang stringr testthat]; };
   MareyMap = derive2 { name="MareyMap"; version="1.3.4"; sha256="1wap0syzgd0w3xla2x4bcasn8zzlj63r5yyf9r479nvifjxdqxzz"; depends=[tkrplot]; };
   MargCond = derive2 { name="MargCond"; version="1.0.0"; sha256="07qh1lgy8ds11cwlb4rxkl6aiph91zq29sy27b8wwxalycdgjrg8"; depends=[gee lme4 MASS Matrix]; };
   MarginalMediation = derive2 { name="MarginalMediation"; version="0.7.0"; sha256="0jwp8rzv0ghir8k7dfmfrq4rvcqf7xww6va16p3jj2nk3r9hiq0x"; depends=[betareg boot cli crayon furniture magrittr purrr rstudioapi stringr tibble]; };
@@ -2396,7 +2446,7 @@ in with self; {
   MatSkew = derive2 { name="MatSkew"; version="0.1.5"; sha256="019v2b1r0bvw84xs50smjb3jdz7gd2adz5d84xd8zq43lnml96d1"; depends=[]; };
   MatTransMix = derive2 { name="MatTransMix"; version="0.1.5"; sha256="0c4kmlzrscrlbvbsqvkmfr9v95hy4hkwk52vnkanh3gqjmpy2rjk"; depends=[]; };
   MatchIt = derive2 { name="MatchIt"; version="3.0.2"; sha256="1pp91pw2sy9hik4sgn4gcsp40hb01n9pfccrwdcffwji5fd1aavq"; depends=[MASS Matching]; };
-  MatchIt_mice = derive2 { name="MatchIt.mice"; version="2.0.2"; sha256="0wfd77fimadray59llyfkmilm6fmqd3w0asp8d6krfbisx8bdapc"; depends=[MatchIt mice]; };
+  MatchIt_mice = derive2 { name="MatchIt.mice"; version="3.0.1"; sha256="04c078fz7s0wll4wizi0mj4s3gdx1kpr5g40gq7znn362z7q25ym"; depends=[MatchIt mice]; };
   MatchLinReg = derive2 { name="MatchLinReg"; version="0.7.0"; sha256="015s3xdaj56prq8lsdry3ibjkrb6gg0fwgzjh496gdx5axvpbk8g"; depends=[Hmisc Matching]; };
   Matching = derive2 { name="Matching"; version="4.9-6"; sha256="1p36id8cds865b44jdbk6c3fnadvhh203qx6d3g54bi4s7bww3cf"; depends=[MASS]; };
   Matrix = derive2 { name="Matrix"; version="1.2-17"; sha256="1k1zf92ycqr7fz44w7bp1p354ww7jg0wm23ybb8dzmbg37qfchyv"; depends=[lattice]; };
@@ -2409,8 +2459,8 @@ in with self; {
   MaxPro = derive2 { name="MaxPro"; version="4.1-2"; sha256="19a2wp93kx1wkbzd5bvljbm1rr96gr14w4fb0ppbgr2y2a4g8i1v"; depends=[nloptr]; };
   MaxSkew = derive2 { name="MaxSkew"; version="1.1"; sha256="0x5x0jpvhp189jnmgh6d1h3ya0dicj5qfcrgr2fhp1v8jjhl125m"; depends=[]; };
   MaxentVariableSelection = derive2 { name="MaxentVariableSelection"; version="1.0-3"; sha256="1cmxfdkm5k85b4ivlfy5521hkfj0gq2pb1qlxxklh0fprw87kp9c"; depends=[ggplot2 raster]; };
-  MazamaCoreUtils = derive2 { name="MazamaCoreUtils"; version="0.2.0"; sha256="0rgrz42cv4m5cl8nfldgsnkipvmz0jn3dpv812gx7swyqbizp9hw"; depends=[dplyr futile_logger lubridate magrittr stringr]; };
-  MazamaSpatialUtils = derive2 { name="MazamaSpatialUtils"; version="0.6.1"; sha256="14sklx6ja5s1pv8pnqf7s2xvp83x7ddnzc9hzfp3qvdzyyfvwicw"; depends=[countrycode dplyr geojsonio lubridate rgdal rgeos rlang rmapshaper rvest shiny sp stringr xml2]; };
+  MazamaCoreUtils = derive2 { name="MazamaCoreUtils"; version="0.3.5"; sha256="1692v59h953rgyp86ix24jspk7da671ynz6splw761ky8aqrfl89"; depends=[dplyr futile_logger lubridate magrittr purrr rlang stringr tibble]; };
+  MazamaSpatialUtils = derive2 { name="MazamaSpatialUtils"; version="0.6.4"; sha256="0wb221h8lwdcx5h5hkvpz9rarizry22qzydibcc2gs6b0d5514ms"; depends=[countrycode dplyr geojsonio lubridate magrittr rgdal rgeos rlang rmapshaper rvest shiny sp stringr xml2]; };
   MazamaWebUtils = derive2 { name="MazamaWebUtils"; version="0.1.7"; sha256="16k6wxwjkdwzx1cqcxpxwaj7i63khly90gyiyfw13di43h8cvsd1"; depends=[dplyr futile_logger lubridate mime stringr webutils]; };
   McSpatial = derive2 { name="McSpatial"; version="2.0"; sha256="18nmdzhszqcb5z9g8r9whxgsa0w3g7fk7852sgbahzyw750k95n4"; depends=[lattice locfit maptools quantreg RANN SparseM]; };
   Mcomp = derive2 { name="Mcomp"; version="2.8"; sha256="1wz5fr3dhxn4s0qvxm2mzq9dbz3x0vgh6pixjrgk9d4i9w2p7s60"; depends=[forecast ggplot2]; };
@@ -2422,7 +2472,7 @@ in with self; {
   Mediana = derive2 { name="Mediana"; version="1.0.8"; sha256="0j1ikc2iaxl70134v0gijj2i2g0xgjafvn8rc108r9fhm8rpw564"; depends=[doParallel doRNG foreach MASS mvtnorm survival]; };
   Mega2R = derive2 { name="Mega2R"; version="1.0.5"; sha256="18fhkghlx4rkafyx0jpxxyjq20xv6y6sfjyz7m68fi73akjz2rw7"; depends=[AnnotationDbi DBI famSKATRC gdsfmt GenomeInfoDb kinship2 pedgene Rcpp RSQLite SKAT]; };
   MendelianRandomization = derive2 { name="MendelianRandomization"; version="0.4.1"; sha256="01irc5qnw7gsvnpifki05ksh7ys8znk0wvhqrzk1bv5294rnq6r1"; depends=[ggplot2 iterpc knitr Matrix plotly rjson rmarkdown robustbase]; };
-  Mercator = derive2 { name="Mercator"; version="0.8.8"; sha256="1ahbdfxqy7s27qizr50z70k577lzcadwn0af9j126n1cr24qha7i"; depends=[cluster dendextend igraph Polychrome Rtsne Thresher]; };
+  Mercator = derive2 { name="Mercator"; version="0.9.5"; sha256="0lmmc9w9mwmbf8vyddw21imv9j5pjrz92n74xk304dxwyc5smfi1"; depends=[ClassDiscovery cluster dendextend igraph KernSmooth Polychrome Rtsne Thresher]; };
   MergeGUI = derive2 { name="MergeGUI"; version="0.2-1"; sha256="1hx03qv5jyjjmqdvylc3kz5dl5qsdqwlirjbrnxrw7grkgkhygap"; depends=[cairoDevice ggplot2 gWidgetsRGtk2 rpart]; };
   MetABEL = derive2 { name="MetABEL"; version="0.2-0"; sha256="0rqjv85mgswrbbp8b8ip6cdmz0cvfy9lm5mcr8a7h38rzgx3g3i3"; depends=[]; };
   MetFns = derive2 { name="MetFns"; version="3.2.2"; sha256="15fd2d0yysibi2x43qv6b8i1pa18l7z4n0zpmrqhsmvqkgy8sla0"; depends=[astroFns lubridate plotrix pracma]; };
@@ -2442,11 +2492,11 @@ in with self; {
   MetaStan = derive2 { name="MetaStan"; version="0.1.0"; sha256="12r76wrspsz2c8pys0b0s117h514qch776969fbz94w6gjhv3km4"; depends=[BH Rcpp RcppEigen rstan rstantools StanHeaders]; };
   MetaSubtract = derive2 { name="MetaSubtract"; version="1.50"; sha256="1aggkvpyl2zpnmqzrr7k22wmb4dyagljcwrkm956nbyvlzx4sx2x"; depends=[]; };
   MetaUtility = derive2 { name="MetaUtility"; version="1.2.0"; sha256="0sr24cls0li0351s9ly39x0xp310lbbabzwixhmnvavwmp0a66ls"; depends=[metafor stringr]; };
-  MetaboList = derive2 { name="MetaboList"; version="1.4"; sha256="0q7pams9fi2vvaz9i3l80afswl975644sm8iz7bj7d8avzzjidgn"; depends=[dplyr enviPick ggplot2 scales]; };
+  MetaboList = derive2 { name="MetaboList"; version="2.0"; sha256="10skvf14ls4qll0l9p6cig4lmj7138khcksyjvd1pqym9axk3wxn"; depends=[dplyr enviPick ggplot2 scales]; };
   MetaboLouise = derive2 { name="MetaboLouise"; version="1.0.0"; sha256="1agcp520in0wpxv3x2jvvmv61hasazdymnvjhzl66nwv8lifl98z"; depends=[igraph]; };
   MetaboQC = derive2 { name="MetaboQC"; version="1.0"; sha256="1hm0ndwda1ciyyg8igkpaalvvdyd7aq5wnl9gzza8fr1l9fxp4a2"; depends=[plyr]; };
-  MetabolAnalyze = derive2 { name="MetabolAnalyze"; version="1.3"; sha256="0cl76x6imx4a95wd74xx5s8i2vg8wq3inqgakvgzmkwxad6qhrqp"; depends=[ellipse gplots gtools mclust mvtnorm]; };
-  MetabolicSurv = derive2 { name="MetabolicSurv"; version="1.0.0"; sha256="1q2vys8pman6smbqwrgkdxq873ip2z2ynjphxnc1ixp8hr4l5c3z"; depends=[ggplot2 glmnet gplots matrixStats pls Rdpack rms superpc survival survminer tidyr]; };
+  MetabolAnalyze = derive2 { name="MetabolAnalyze"; version="1.3.1"; sha256="070qws759nczjrfdlh7jpbyjz4z3zm1hzb7vcvfgfks82wwb2ny0"; depends=[ellipse gplots gtools mclust mvtnorm]; };
+  MetabolicSurv = derive2 { name="MetabolicSurv"; version="1.1.0"; sha256="0pi3pdl1wz8lbj47d0rvgrrdc72bffjf9q07dp92qx2857pppwz8"; depends=[ggplot2 glmnet gplots matrixStats pls Rdpack rms superpc survival survminer tidyr]; };
   MetabolomicsBasics = derive2 { name="MetabolomicsBasics"; version="1.1"; sha256="13q8s96s71g7nyr6mi5q7jwmf4vx3pcr8l9ixqlc8hglnkd0y6rk"; depends=[C50 caret e1071 mixOmics pcaMethods plyr rlang ropls rpart]; };
   MetaheuristicFPA = derive2 { name="MetaheuristicFPA"; version="1.0"; sha256="096k866mgrdgj55rzvdj080z80hzlj0667mydpz7gjaqdfriw8jg"; depends=[Rcpp RcppArmadillo]; };
   MetamapsDB = derive2 { name="MetamapsDB"; version="0.0.2"; sha256="0y5szb52karxcqr1f9mb050awprbk1ynckr987aw3d4ia6i9gcif"; depends=[base64enc cluster data_table DBI dplyr forcats future GenomicRanges ggplot2 gridExtra httr igraph IRanges lubridate magrittr Matrix purrr RCurl rgexf RJSONIO RSQLite shiny ShortRead stringr tidyr zoo]; };
@@ -2456,7 +2506,7 @@ in with self; {
   Methplot = derive2 { name="Methplot"; version="1.0"; sha256="0aaqss9zfn55qi45jffxkksnkw510npjnkygafx49vl77bkagqh5"; depends=[ggplot2 reshape]; };
   MethylCapSig = derive2 { name="MethylCapSig"; version="1.0.1"; sha256="16ch9aldr6a9jn42h387n7qvnzs0yx28f2yj6xq0kp476q7rf4ql"; depends=[geepack]; };
   Metrics = derive2 { name="Metrics"; version="0.1.4"; sha256="0fh8qbjlwzagh272lgwr4bxcqcjb1qpz53mgs8rzlvncax6nk5bk"; depends=[]; };
-  MetricsWeighted = derive2 { name="MetricsWeighted"; version="0.1.0"; sha256="0c6l5rvrdcrm8fy3rnggfbilw15j29zxin0hhrvg91dx2y024mll"; depends=[]; };
+  MetricsWeighted = derive2 { name="MetricsWeighted"; version="0.2.0"; sha256="19akjaw7fkg99hr6fdvwscp8yv1n72hf8v3rlywzrj3f00wnh74m"; depends=[]; };
   MfUSampler = derive2 { name="MfUSampler"; version="1.0.4"; sha256="0i5siq1jacxbfvakb97qnj3h7pk471rrx8ckwm0d8nl3j586s36y"; depends=[ars coda HI]; };
   MiDA = derive2 { name="MiDA"; version="0.1.2"; sha256="144gxsxqljzskxsw5k0y69ix0pxlfvyyznxkjpf2ng4l47pg11z5"; depends=[caret gbm genefilter limma preprocessCore pROC SQN]; };
   MiRAnorm = derive2 { name="MiRAnorm"; version="1.0.0"; sha256="154wv0j82xyc4y5cd2czh0q8kzhgrk6qsn0ahc1zn3fnrzc9fgz0"; depends=[ArgumentCheck cluster dendextend ggplot2 MASS npmv plyr reshape2]; };
@@ -2464,7 +2514,7 @@ in with self; {
   MiRSEA = derive2 { name="MiRSEA"; version="1.1"; sha256="0jpl6ws5yx1qjzdnip9a37nmvx81az4cbsjm57x613qjpwmg6by3"; depends=[]; };
   MiSPU = derive2 { name="MiSPU"; version="1.0"; sha256="1l6q0fm5z5i6gigr940h8kc5rka08psmhcprp8grmsxk3qy2kply"; depends=[ape aSPU cluster Rcpp RcppArmadillo vegan]; };
   MiST = derive2 { name="MiST"; version="1.0"; sha256="0gqln792gixqfh201xciaygmxbafa0wyv5gpbg9w5zkbbv44wrfk"; depends=[CompQuadForm]; };
-  MicSim = derive2 { name="MicSim"; version="1.0.13"; sha256="16j2ffl6379afhk9dx7z2lci79ywq1nhmjk070kfknlrabl8cs2n"; depends=[chron rlecuyer snowfall]; };
+  MicSim = derive2 { name="MicSim"; version="1.0.15"; sha256="0nbrl013i1jz5hsq5a6526rlsp0qvvrbs86md6yrvhh90bsnf65p"; depends=[chron rlecuyer snowfall]; };
   MicroDatosEs = derive2 { name="MicroDatosEs"; version="0.8.2"; sha256="0k0hmi3ciipizmgjw1i5rrsg34yx21s1msn40vc4qc9s1n4wd8dl"; depends=[readr]; };
   MicroMacroMultilevel = derive2 { name="MicroMacroMultilevel"; version="0.4.0"; sha256="1q5cyqr4hdl1wp2isk6p4p084i83kg6hd406wdp1nj9lv5i0xvgw"; depends=[]; };
   MicroStrategyR = derive2 { name="MicroStrategyR"; version="1.0-1"; sha256="0a6bk0wnwx8zy9081n7wb12lidgckrhn350r0q5m6aa82l6l8ihi"; depends=[gWidgetsRGtk2]; };
@@ -2477,8 +2527,8 @@ in with self; {
   MissingDataGUI = derive2 { name="MissingDataGUI"; version="0.2-5"; sha256="0drbm87ka17avg6fmswjilgnz9c3azwd0236s8yfms24k9k77vnd"; depends=[cairoDevice GGally ggplot2 gWidgetsRGtk2 reshape]; };
   MitISEM = derive2 { name="MitISEM"; version="1.2"; sha256="0dn398vrxh16gmy7ghh5000dgk7cbhb3gi3myrxp5dfri3ysjxcj"; depends=[mvtnorm]; };
   MittagLeffleR = derive2 { name="MittagLeffleR"; version="0.3.0"; sha256="0lp3jazmcg90gp019djr4xx8zwxrrmjidp53rc2v7s122razn9lr"; depends=[stabledist]; };
-  MixAll = derive2 { name="MixAll"; version="1.4.2"; sha256="1m3jkavamx1c2zzalh9j8psk69jmbh4lyl0sxn4x30whv0km5mvp"; depends=[Rcpp rtkore]; };
-  MixGHD = derive2 { name="MixGHD"; version="2.3.2"; sha256="1fqimvfm25f2wkfxxpnbsnzjkpfz2fyi1rgpgg7fgj2rdf56mmhp"; depends=[Bessel cluster e1071 ghyp MASS mixture mvtnorm numDeriv]; };
+  MixAll = derive2 { name="MixAll"; version="1.5.1"; sha256="1jsh29ygy1n7lbz93ks725li9hnvfa0kp1qik13m72nmgw7g7q5a"; depends=[Rcpp rtkore]; };
+  MixGHD = derive2 { name="MixGHD"; version="2.3.3"; sha256="16x8pq077w8ikksypr9szy863pwcfzmfa9f13pssb61x7yyqfa2f"; depends=[Bessel cluster e1071 ghyp MASS mixture mvtnorm numDeriv]; };
   MixMAP = derive2 { name="MixMAP"; version="1.3.4"; sha256="0gxghym5ghbyxf589hda2fhv5l3x5jvm6i40x5xdwx4hadcn8k9a"; depends=[lme4]; };
   MixMatrix = derive2 { name="MixMatrix"; version="0.2.2"; sha256="0gpqggw0fskd37lr0vjpf0y6gv711w6invfwj09rzggxlq6vx2fh"; depends=[CholWishart Rcpp RcppArmadillo]; };
   MixRF = derive2 { name="MixRF"; version="1.0"; sha256="1av1wx7wmfc3z8a4bc6g3i3b807nc28n3s2rs3yh0rcwq1pfl0ir"; depends=[doParallel foreach lme4 randomForest]; };
@@ -2497,13 +2547,14 @@ in with self; {
   MoEClust = derive2 { name="MoEClust"; version="1.2.3"; sha256="1bkknlp49bcx4s2lpdqwpqn5f5rr90lah0zkvmkih309rayirjr3"; depends=[lattice matrixStats mclust mvnfast nnet vcd]; };
   MoLE = derive2 { name="MoLE"; version="1.0.1"; sha256="0bq19vwqjn5hl4mw5imkydbp39gal992vnh2dwrq8bb8cmj3qh91"; depends=[]; };
   MobileTrigger = derive2 { name="MobileTrigger"; version="0.0.31"; sha256="1zbnxdxh6gr4sgpi10i0pnd85f7i842105jgjswacziqamby6mcy"; depends=[caret ggplot2 kableExtra knitr mailR plyr XML yaml]; };
+  ModStatR = derive2 { name="ModStatR"; version="1.3.0"; sha256="1wdqkvbycjk4wzzkpc0pyxvxrzqm48xbi8y87nax5l1v5qdfm1n0"; depends=[BioStatR boot ellipse ggplot2 gsl hypergeo jmuOutlier]; };
   Modalclust = derive2 { name="Modalclust"; version="0.7"; sha256="0ymzdxp6rh6baih1xm6kj8l8jxjclvnmq0gfp38cl8lpskspb26x"; depends=[class mvtnorm zoo]; };
   ModelGood = derive2 { name="ModelGood"; version="1.0.9"; sha256="1y99a7bgwx167pncxj00lbw3cdjj23fhhzl8r24hwnhxr984kvzl"; depends=[prodlim]; };
   ModelMap = derive2 { name="ModelMap"; version="3.4.0.1"; sha256="1279k5hznxrb6fq4zd1baw1pm5dj5437g5awkgb8kp7ll8raa2ql"; depends=[corrplot fields HandTill2001 mgcv PresenceAbsence randomForest raster rgdal]; };
   ModelMetrics = derive2 { name="ModelMetrics"; version="1.2.2"; sha256="158ddbw2snlyzd2q6mdaif5i67kq4qfvadylwjxgv1w2cmszrmk6"; depends=[data_table Rcpp]; };
   Modelcharts = derive2 { name="Modelcharts"; version="0.1.0"; sha256="1jy78kyyh4r13px2d5bm7fra5bkcpimzfji0hmydspkfi3qla37x"; depends=[dplyr plotly]; };
   Modeler = derive2 { name="Modeler"; version="3.4.5"; sha256="15gbg5568qj81wp6yy31amb2b7wl1wvlmgpmdp29lvz1p33jx2y1"; depends=[class ClassComparison ClassDiscovery e1071 neuralnet nnet oompaBase randomForest rpart TailRank]; };
-  MomTrunc = derive2 { name="MomTrunc"; version="3.19"; sha256="137ya4z16w8nxh2qds0bki59h81a87rsmwi50mp82qxr76zv5s5d"; depends=[mvtnorm]; };
+  MomTrunc = derive2 { name="MomTrunc"; version="4.51"; sha256="078b36rn154wm9yk2d1q30d265wzwdyl7hx3wljqizdyz5jmvlk5"; depends=[mvtnorm]; };
   Momocs = derive2 { name="Momocs"; version="1.2.9"; sha256="13pgn31hv529z33mi020w8wm8ya7hyi5yfsp45a78wdhinqas9mm"; depends=[ape dplyr geometry geomorph ggplot2 jpeg magrittr MASS progress RColorBrewer rgeos sp]; };
   Mondrian = derive2 { name="Mondrian"; version="1.0-0"; sha256="07r64q518diphai951pw4vfaw4sd6bqwhi6q5cp4pcl3aqjynkmj"; depends=[RColorBrewer]; };
   MonetDB_R = derive2 { name="MonetDB.R"; version="1.0.1"; sha256="1r7vki0rrzwcrfg4f2lfx30g614vf2xi62qb1rs21a9j5741lxlx"; depends=[codetools DBI digest]; };
@@ -2515,7 +2566,7 @@ in with self; {
   MoonFinder = derive2 { name="MoonFinder"; version="1.0.1"; sha256="0crfh0g95vmwllvgppl2mjfd5kdlb0g9rwrxw8izbl0h6bpgcjxj"; depends=[annotate clusterProfiler igraph org_Hs_eg_db pheatmap RColorBrewer]; };
   Morpho = derive2 { name="Morpho"; version="2.7"; sha256="0zgq79yfgkl6g404j9hpdaza5m5qkklh1xpf9xpmyf940pqdw21c"; depends=[colorRamps doParallel foreach MASS Matrix Rcpp RcppArmadillo rgl Rvcg]; };
   MorseGen = derive2 { name="MorseGen"; version="1.2"; sha256="1kq35n00ky70zmxb20g4mwx0hn8c5g1hw3csmd5n6892mbrri8s9"; depends=[]; };
-  MortCast = derive2 { name="MortCast"; version="2.1-1"; sha256="1xifg4jzmamcnz17a3k3dk2pph7cszkyfg8wz497ig4rc3dk741f"; depends=[wpp2017]; };
+  MortCast = derive2 { name="MortCast"; version="2.1-2"; sha256="0p5cjzrl3yhrbhjr31fm84rj7dl7n65qzccj447ky1lvb4c0v2x1"; depends=[wpp2017]; };
   MortalityGaps = derive2 { name="MortalityGaps"; version="1.0.0"; sha256="0nfm8xa7gnshrl8hsvmvr3za8nbppp7f7i5h4ni204w7xwvh8jxc"; depends=[crch forecast MASS pbapply]; };
   MortalityLaws = derive2 { name="MortalityLaws"; version="1.8.0"; sha256="09k1mxins6ch11h412yw7ywyiyjrrbs17jbxmrg6m2vnasn07bss"; depends=[minpack_lm pbapply RCurl tidyr]; };
   MortalitySmooth = derive2 { name="MortalitySmooth"; version="2.3.4"; sha256="1clx8gb8jqvxcmfgv0b8jyvh39yrmcmwr472j9g3ymm95m4hr8fq"; depends=[lattice svcm]; };
@@ -2525,7 +2576,7 @@ in with self; {
   MplusTrees = derive2 { name="MplusTrees"; version="0.0.1"; sha256="1jmxaxpzccnn5qpc138z7mr89s0ia9kc8wrsa1n6c2d3x4jzmms9"; depends=[MplusAutomation nlme rpart rpart_plot]; };
   Mqrcm = derive2 { name="Mqrcm"; version="1.0"; sha256="1z8zyjvjz1izaal5y6dnlm86pvydab45d9qnhcnibi2l9r1ladkc"; depends=[Hmisc pch]; };
   MsdeParEst = derive2 { name="MsdeParEst"; version="1.7"; sha256="1zhi1jr30sl7jpsw37lc3akfzixlhm9k2hjkha1pjy5fmd5lddlx"; depends=[MASS moments mvtnorm sde]; };
-  MtreeRing = derive2 { name="MtreeRing"; version="1.3.1"; sha256="0kavghk4453ifx4fphzc9z4hpdd2fd85wzpihpkb51234di6lgc8"; depends=[bmp dplR dplyr imager jpeg magick magrittr measuRing png shiny shinydashboard shinyWidgets spatstat tiff]; };
+  MtreeRing = derive2 { name="MtreeRing"; version="1.4.2"; sha256="097w65ijhdkag26z39kzqqp7bs3bcx4iqapj3qc8inh0iynhnxp6"; depends=[bmp dplR dplyr imager jpeg magick magrittr measuRing png shiny shinydashboard shinyWidgets spatstat tiff]; };
   MuChPoint = derive2 { name="MuChPoint"; version="0.6.1"; sha256="15bqsc7bsjg55qxjwxh58bxbwz61a6wv4xxph994g4020b98l01x"; depends=[capushe Matrix Rcpp shiny]; };
   MuFiCokriging = derive2 { name="MuFiCokriging"; version="1.2"; sha256="09p8wdmlsf21ibqyjigwdipcin3ij0naxcd035hqgfj76v20wiyv"; depends=[DiceKriging]; };
   MuMIn = derive2 { name="MuMIn"; version="1.43.6"; sha256="0g8ba1lzn7k9bn0jzay5phcgkzv7bdwpkzm0sxwwvsfyg3igy4f8"; depends=[Matrix nlme]; };
@@ -2533,7 +2584,7 @@ in with self; {
   MullerPlot = derive2 { name="MullerPlot"; version="0.1.2"; sha256="0am5brdmbh2mw74fbw9nha6h4qlhj8psg3142mql1ad99bd0zg4w"; depends=[RColorBrewer]; };
   MultAlloc = derive2 { name="MultAlloc"; version="1.2"; sha256="0c3sqfaa08s8mk4yz77kh6q6v9ic5xp52g9prfw1k2kv4nw1k2qd"; depends=[Rglpk]; };
   MultEq = derive2 { name="MultEq"; version="2.3"; sha256="0fshv7i97q8j7vzkxrv6f20kpqr1kp9v6pbw50g86h37l0jghj7r"; depends=[]; };
-  MultNonParam = derive2 { name="MultNonParam"; version="1.2.6"; sha256="1w9kp7qswz38r2xfi8sc52kc52c8hi2jzjsh8gj4491ds1lilv0r"; depends=[]; };
+  MultNonParam = derive2 { name="MultNonParam"; version="1.2.8"; sha256="1svy06syp6qdsn55zc0wgm3rr5a7j4kkhxxsmnkzzrz3nvj9g6s4"; depends=[]; };
   MultiBD = derive2 { name="MultiBD"; version="0.2.0"; sha256="1qjfr8hx8sr5m8370yzi09r8jnh3i6907wzj3v4h83vmjh81db71"; depends=[BH Rcpp RcppParallel]; };
   MultiCNVDetect = derive2 { name="MultiCNVDetect"; version="0.1-1"; sha256="0mfisblw3skm4y8phfg4wa0rdchl01wccarsq79hv63y78pfhh13"; depends=[]; };
   MultiFit = derive2 { name="MultiFit"; version="1.0.0"; sha256="1i15m30bnydxyghp8jpfr6rs2gnilbw38d6ifs2jzdr83qbxyls3"; depends=[data_table Rcpp RcppArmadillo]; };
@@ -2549,7 +2600,7 @@ in with self; {
   MultiSkew = derive2 { name="MultiSkew"; version="1.1.1"; sha256="1s0k3z1vgdz1cxad007p246ghwx282w06inhrjjscbwliz1vg5ib"; depends=[MaxSkew]; };
   MultiVarMI = derive2 { name="MultiVarMI"; version="1.0"; sha256="1mlaprg3cfmfwrq7wh64fmyv1wpdnil7wpcrcg3921qydk65py6z"; depends=[BinOrdNonNor corpcor CorrToolBox Matrix moments norm PoisNonNor]; };
   MultiVarSel = derive2 { name="MultiVarSel"; version="1.1.3"; sha256="18wcw80m5knv6hbzczjsx3lf7sn9n84z12zz844agp6234im163p"; depends=[glmnet Matrix]; };
-  MultinomialCI = derive2 { name="MultinomialCI"; version="1.0"; sha256="0ryi14d102kvxawls04hcw50n79jkcn29ill77lkfvj6nlzj8i5q"; depends=[]; };
+  MultinomialCI = derive2 { name="MultinomialCI"; version="1.1"; sha256="0da7afpgb98wrcaif8y7396asp84gc244lq5l4959y6d5g199fhz"; depends=[]; };
   MultipleBubbles = derive2 { name="MultipleBubbles"; version="0.2.0"; sha256="047a1pql3jf500gwlap6ws5z7mx0sqmdq6jbql24nl5iypi9jqpf"; depends=[foreach MASS]; };
   MultiplierDEA = derive2 { name="MultiplierDEA"; version="0.1.18"; sha256="1d7cqa44yayyhwkl5wkp68b7vxakfnlwkprs811z8c2fmfm8vk5r"; depends=[lpSolveAPI]; };
   MultisiteMediation = derive2 { name="MultisiteMediation"; version="0.0.2"; sha256="1z9nh8iywlsjsrrmpm6h8hcnaqvh93dldn5rhp4wnj3c7db8qscy"; depends=[ggplot2 lme4 MASS psych statmod]; };
@@ -2563,7 +2614,7 @@ in with self; {
   NACHO = derive2 { name="NACHO"; version="0.5.6"; sha256="0l1irmmhpmmhgm18i1lp3cxmmn2vjxvv747lxvah4pnxla88wcb6"; depends=[dplyr ggbeeswarm ggplot2 ggpubr ggrepel gtools purrr scales shiny tibble tidyr]; };
   NADA = derive2 { name="NADA"; version="1.6-1"; sha256="1jjlm6rljk4nv6b7l2w3xnj31j61wq30sp5pnna8wav6gyjqjfmb"; depends=[survival]; };
   NAEPprimer = derive2 { name="NAEPprimer"; version="1.0.1"; sha256="19p1livdnayfcl88f8r9x1vg30x522q8lgx66pfgwpkxjzvrqa2l"; depends=[]; };
-  NAM = derive2 { name="NAM"; version="1.7.2"; sha256="02nqn8587zg8av0lnjfvgkn0205hp5dlz4yzhh12ljjzvyppk5f7"; depends=[randomForest Rcpp]; };
+  NAM = derive2 { name="NAM"; version="1.7.3"; sha256="12d2yjl0af2ailvwk30fswalx1wzyj500qbrhiczsg1vr4rcqhkh"; depends=[Rcpp]; };
   NAPPA = derive2 { name="NAPPA"; version="2.0.1"; sha256="0nn4wgl8bs7sy7v56xfif7i9az6kdz9xw7m98z1gnvl2g7damvn3"; depends=[NanoStringNorm plyr]; };
   NB = derive2 { name="NB"; version="0.9"; sha256="1gh42z7lp6g09fsfmikxqzyvqp2874cx3a6vr96w43jfwmgi2diq"; depends=[]; };
   NB_MClust = derive2 { name="NB.MClust"; version="1.1.1"; sha256="0hzmrszxgx3pylf9pjjwk2ryjhwz7naxxkhcqpnfjv337vv5dg0i"; depends=[MASS]; };
@@ -2588,7 +2639,7 @@ in with self; {
   NHLData = derive2 { name="NHLData"; version="1.0.0"; sha256="0dfqalccbkmqrn3h1z6s78l818c8sqn7d6yc8mg872ygmszryci7"; depends=[]; };
   NHMSAR = derive2 { name="NHMSAR"; version="1.12"; sha256="034cjzbwyf5jkj24wf9s6dij7g416psd2iz7fjrg34q9ax2kzyyl"; depends=[glasso lars ncvreg ucminf]; };
   NHPoisson = derive2 { name="NHPoisson"; version="3.2"; sha256="0k6m6ampp7g95d0jm5msvrgc12rqirpanb1ykbdf1ii027pqpwsn"; depends=[car]; };
-  NHSRdatasets = derive2 { name="NHSRdatasets"; version="0.1.1"; sha256="0i75dlb0z8i3kp4b7h5fy8ykmnv4ciih1maj21hl7a7l47s095if"; depends=[]; };
+  NHSRdatasets = derive2 { name="NHSRdatasets"; version="0.1.2"; sha256="0xiqbqq7xjyi1vxza853ylyiq4nqr6y10x8i13c2kj756biz4h1n"; depends=[]; };
   NIPTeR = derive2 { name="NIPTeR"; version="1.0.2"; sha256="0ll6amqyw33a93xiccihidrnbaqlx1q7kqcd4wks7cvqawd8pgv1"; depends=[Rsamtools S4Vectors sets]; };
   NIRStat = derive2 { name="NIRStat"; version="1.0"; sha256="1hi8201zslp1f7m3jci8q03y3f1zlcck2x3i793l7lsyl7qbzd1z"; depends=[ggplot2 gridExtra mgcv]; };
   NISTnls = derive2 { name="NISTnls"; version="0.9-13"; sha256="03a1c8a5dr5l5x4wbclnsh3vmx3dy7migfdzdx7d7p3s7hj3ibif"; depends=[]; };
@@ -2605,13 +2656,12 @@ in with self; {
   NMOF = derive2 { name="NMOF"; version="1.6-0"; sha256="0m97xi1bpq1gw18fn512blh0li6xv2yfipf2c3aj7bwaq91wv12l"; depends=[]; };
   NNLM = derive2 { name="NNLM"; version="0.4.3"; sha256="0p7p26070w2j57z5i89pmpgd470yh2z0rrfzpalzdngc8mzp2rkj"; depends=[Rcpp RcppArmadillo RcppProgress]; };
   NNMIS = derive2 { name="NNMIS"; version="1.0.1"; sha256="1w2i4xlx249p589yqdgbx1ra406ycxw729vbk1lqadbn71m6blaz"; depends=[survival]; };
-  NNS = derive2 { name="NNS"; version="0.4.3"; sha256="163kizr1ck4m0fvxwdlja2f1lc7347jgmnrxq89qyjx477gjpir0"; depends=[data_table doParallel rgl stringr]; };
+  NNS = derive2 { name="NNS"; version="0.4.5"; sha256="03b9xf5glzalxqal4s955kpddvxbry46ihgp4aibmnr12g7ayp1c"; depends=[data_table doParallel rgl stringr]; };
   NNTbiomarker = derive2 { name="NNTbiomarker"; version="0.29.11"; sha256="0sqlf7vzhpmq2g98c2qlrcqn3ba4ycfxbczgcjiqqhqsvgkpacc1"; depends=[magrittr mvbutils shiny stringr xtable]; };
   NORMA = derive2 { name="NORMA"; version="0.1"; sha256="193q6dwn8v7k8xq0amjpvb3v6mn7c6agqa487gvjj78dy1qz720a"; depends=[rootSolve]; };
   NORMT3 = derive2 { name="NORMT3"; version="1.0-3"; sha256="041s0qwmksy3c7j45n4hhqhq3rv2hncm2fi5srjpwf9fcj5wxypg"; depends=[]; };
   NORRRM = derive2 { name="NORRRM"; version="1.0.0"; sha256="06bdd5m46c8bbgmr1xkqfw72mm38pafxsvwi9p8y7znzyd0i6ag3"; depends=[ggplot2 SDMTools]; };
   NORTARA = derive2 { name="NORTARA"; version="1.0.0"; sha256="1q4dmn5q939d920spmxxw08afacs3pzhr2gzwyqa5kn8xiz4ffg8"; depends=[corpcor Matrix]; };
-  NPBayesImputeCat = derive2 { name="NPBayesImputeCat"; version="0.1"; sha256="1bqhzzi0c0xw5piq5jng239wing01lsyn3s24hv3rfx3qxy0s0f0"; depends=[Rcpp]; };
   NPC = derive2 { name="NPC"; version="1.1.0"; sha256="06y6vdln5zyinq9bsp66yz6i1v5bkw9pa2hknl9brwc75z359apn"; depends=[coin dplyr matlab permute]; };
   NPCD = derive2 { name="NPCD"; version="1.0-10"; sha256="1ag7j1r9j3piisg706hyhq8vaqfqvm1blxpkfxx7r1impjyqzyai"; depends=[BB R_methodsS3 R_oo]; };
   NPCirc = derive2 { name="NPCirc"; version="2.0.1"; sha256="1pyckjvf4vzns9hxnhnk7cm4abllmdj3f142pvjhnilyqwndqgyc"; depends=[circular misc3d movMF plotrix rgl shape]; };
@@ -2621,7 +2671,7 @@ in with self; {
   NPMLEcmprsk = derive2 { name="NPMLEcmprsk"; version="3.0"; sha256="0nm88fsxgrfk0j0lmir57bhxy4p8ah503gpj6jdlvjqw862jigiq"; depends=[]; };
   NPMOD = derive2 { name="NPMOD"; version="0.1.0"; sha256="1m3rfgyxdbyr0m5vznav5qk70ch45wz3dc8wccxjcxrcfkn8i18k"; depends=[BSDA clinfun gWidgets nortest pspearman readxl rlang RVAideMemoire]; };
   NPMVCP = derive2 { name="NPMVCP"; version="1.1"; sha256="13jpm46abwziq8859jhl6hg1znk3ws1q7g4vlr2jyri3qa6h22dd"; depends=[]; };
-  NPP = derive2 { name="NPP"; version="0.1.0"; sha256="0pwspgwrwdjsdsny8qvhdnqcsxh5fsg33chlla75562hr2jaxqkb"; depends=[]; };
+  NPP = derive2 { name="NPP"; version="0.2.0"; sha256="0zm67b9gs32snsd1knmdmz0ksksdin9cvqrqd94n7g378gdql96y"; depends=[]; };
   NPS = derive2 { name="NPS"; version="1.1"; sha256="02idja149a2sj97sks4lhsaflpifyxi6n0rjlcq9993f84szfgsi"; depends=[]; };
   NPflow = derive2 { name="NPflow"; version="0.13.1"; sha256="0sq47frh665m8mibif1w3i2z5pb577v1ngdjirbya0a9chpmwc3s"; depends=[ellipse fastcluster ggplot2 gplots pheatmap Rcpp RcppArmadillo reshape2 truncnorm]; };
   NPsimex = derive2 { name="NPsimex"; version="0.2-1"; sha256="1k9i1f5ckvzdns8f5qnm2zq7qs3wsgzsnfwdz21zmhmi6d0pwchm"; depends=[]; };
@@ -2630,7 +2680,7 @@ in with self; {
   NST = derive2 { name="NST"; version="2.0.3"; sha256="1viks9lwsbd48w7fa8rscav3pchfcxrsc7h4jgz7114cq4334y9q"; depends=[ape permute vegan]; };
   NSUM = derive2 { name="NSUM"; version="1.0"; sha256="1as4g3v7qlk9wxlpwhg293980jq9gy6qay77bbcrjf481gvkkbp6"; depends=[MASS MCMCpack]; };
   NScluster = derive2 { name="NScluster"; version="1.3.1"; sha256="0qiyw5zb0y45p9agagwz9b3c6njv5x2np0xbggqnkc62593xb9mr"; depends=[]; };
-  NTS = derive2 { name="NTS"; version="1.0.0"; sha256="0xpaay5141bnlhsa8n4y61v1jbnckj3x6024bdryabq397ncs1nl"; depends=[dlm MASS MSwM Rdpack tensor]; };
+  NTS = derive2 { name="NTS"; version="1.0.1"; sha256="12kv49mkkqv4hqm784vgvhxbvs9jdsg4n54x0qdhfxv26n3a0fvm"; depends=[dlm MASS MSwM Rdpack tensor]; };
   NUCOMBog = derive2 { name="NUCOMBog"; version="1.0.4.2"; sha256="0s6gm3adc9qdh94pxzgccbxx1f1lbgqyvd4xk37xp6f3b5hwljdz"; depends=[snowfall]; };
   NameNeedle = derive2 { name="NameNeedle"; version="1.2.4"; sha256="1f8hmabwafjmgx2z381a3m84zfrd0s9x51haa4c1phq41yfq2lm5"; depends=[]; };
   NanoStringNorm = derive2 { name="NanoStringNorm"; version="1.2.1"; sha256="05r1hvrxwi2mcq3pv6b699291qg120ijad96s5dah2f6cwx7gm7j"; depends=[gdata vsn XML]; };
@@ -2649,6 +2699,7 @@ in with self; {
   NetOrigin = derive2 { name="NetOrigin"; version="1.0-3"; sha256="162dhyx7z1nd3z14lfvm3dz0qwwvrc3n17zswbnwcfj6g1b1p2f1"; depends=[colorspace Hmisc igraph]; };
   NetPreProc = derive2 { name="NetPreProc"; version="1.1"; sha256="0r51dqymf2nqm86py4zwdlf7qf120j0bg9r6a9c0gsyyijh4z40p"; depends=[graph]; };
   NetRep = derive2 { name="NetRep"; version="1.2.1"; sha256="0adlnq22nslp8ildbrf0z26783kzgz4cyn45a981qyjbw4c42hin"; depends=[abind BH foreach RColorBrewer Rcpp RcppArmadillo RhpcBLASctl statmod]; };
+  NetSimR = derive2 { name="NetSimR"; version="0.1.0"; sha256="0iadlvc7m78svkjcwx18pk18jg7dv69gm1cvkz8k2a7b1absd9f5"; depends=[]; };
   NetSwan = derive2 { name="NetSwan"; version="0.1"; sha256="1mwdy3ahagiifj2bd1ajrafvnxzi74a1x1d3i2laf1hqpz3fbgld"; depends=[igraph]; };
   NetWeaver = derive2 { name="NetWeaver"; version="0.0.6"; sha256="058fi3vbp11mbg69n4yp1zf48akfdl6s2p0qpa0v6ngmk2zjk0bq"; depends=[]; };
   NetworkChange = derive2 { name="NetworkChange"; version="0.5"; sha256="1n4nnnds8m0waa64b1k14ph1jdj26pd6fphsd53ad5lpyglpzq0y"; depends=[abind GGally ggplot2 ggrepel ggvis gridExtra igraph LaplacesDemon MASS MCMCpack mvtnorm network qgraph RColorBrewer reshape rlang Rmpfr sna tidyr]; };
@@ -2658,11 +2709,11 @@ in with self; {
   NetworkInference = derive2 { name="NetworkInference"; version="1.2.4"; sha256="1x63szbns8wf3k89ibk2p66prngw4fr2ckfn1568mnxdwnzvhrb4"; depends=[assertthat checkmate ggplot2 ggrepel Rcpp RcppProgress]; };
   NetworkRiskMeasures = derive2 { name="NetworkRiskMeasures"; version="0.1.2"; sha256="0c10nahybjd1n0yr78ynbsdnkfa0p7kz6dx3rbwxwsp3x4mrcd6y"; depends=[dplyr expm ggplot2 Matrix]; };
   NetworkSim = derive2 { name="NetworkSim"; version="0.1.0"; sha256="1gvhzlmq46p99wald4pjnv9wxxqdympjkh3bzi98qa7qi84lny7y"; depends=[igraph incgraph]; };
-  NetworkToolbox = derive2 { name="NetworkToolbox"; version="1.2.3"; sha256="0ldhrp3r9aqsqblvg249bi2ndgj66x53dm0zm941a6nf7kh6j3zl"; depends=[corrplot doParallel fdrtool foreach igraph MASS Matrix ppcor psych pwr qgraph R_matlab]; };
+  NetworkToolbox = derive2 { name="NetworkToolbox"; version="1.3.1"; sha256="0gpqknb8c816aw8w9bgn42zs805k2sa7qhpmizld6hvaq71g7847"; depends=[corrplot doParallel fdrtool fitdistrplus foreach igraph MASS Matrix ppcor psych pwr qgraph R_matlab wTO]; };
   NeuralNetTools = derive2 { name="NeuralNetTools"; version="1.5.2"; sha256="0d73rbp8v0k0j8dp4yigan7krhglx6qfbadvyg7nsj67xc00vbfd"; depends=[ggplot2 nnet reshape2 scales tidyr]; };
-  NeuralSens = derive2 { name="NeuralSens"; version="0.0.5"; sha256="1lbl2p9cc35dk0vlcna72nilbv63gv0v96cgwdn9w2hny1bff3za"; depends=[caret fastDummies ggplot2 gridExtra NeuralNetTools reshape2 stringr]; };
+  NeuralSens = derive2 { name="NeuralSens"; version="0.0.9"; sha256="12ka1lsfqs2mr35n41fv2rdzhnzvssa6hplzkxmxfh8mylp375j5"; depends=[caret fastDummies ggplot2 gridExtra Hmisc NeuralNetTools reshape2 stringr]; };
   Newdistns = derive2 { name="Newdistns"; version="2.1"; sha256="1b5njkzj8b0wrvvfv904di0933k9d320gadmfm5zl6pzdp34bh1i"; depends=[AdequacyModel]; };
-  NewmanOmics = derive2 { name="NewmanOmics"; version="1.0.2"; sha256="16lysb690n8jck6c82b8akrd88v77fj5hyi0hhqsz2kz5vj0vify"; depends=[oompaBase]; };
+  NewmanOmics = derive2 { name="NewmanOmics"; version="1.0.4"; sha256="1ny1w4kwdgfzm4jsj6mf3k0c10bwzwz4gmpb5vg3qffddly9wfaz"; depends=[oompaBase]; };
   NightDay = derive2 { name="NightDay"; version="1.0.1.1"; sha256="1gwwxk428gkvci4dhfb3zikvidalpqkl0q2r6qpm58c12j14jk1h"; depends=[maps]; };
   NipponMap = derive2 { name="NipponMap"; version="0.2"; sha256="0jk3zz05vhximbbm15h7ngb0ffxp5w8zhisifipkdgvg1hpi7pb7"; depends=[sf tibble]; };
   NitrogenUptake2016 = derive2 { name="NitrogenUptake2016"; version="0.2.3"; sha256="13mh63z3x8yqd31v5a4d10bhzk4y67ac38flwk2msv7qcx37sny6"; depends=[car MASS zoo]; };
@@ -2672,9 +2723,9 @@ in with self; {
   Nmisc = derive2 { name="Nmisc"; version="0.3.5"; sha256="1328sfxhkq1lyx8wx2k112iq9lxhg067gnk36vgxpcsq42vdzycr"; depends=[dplyr magrittr purrr rappdirs rlang stringr tibble tidyselect]; };
   NoiseFiltersR = derive2 { name="NoiseFiltersR"; version="0.1.0"; sha256="0y90si8f5hsi273g10hw700r72la30hwqlwg59gaq76wqlkm8j0p"; depends=[caret e1071 kknn MASS nnet randomForest rJava rpart RWeka]; };
   NominalLogisticBiplot = derive2 { name="NominalLogisticBiplot"; version="0.2"; sha256="0m9442d9i78x57gdwyl3ckwp1m6j27cam774zkb358dw5nmwxbmz"; depends=[gmodels MASS mirt]; };
-  NonCompart = derive2 { name="NonCompart"; version="0.4.4"; sha256="0m62jwp572z7gn4rykyr47b6cfi4sy9hxxghhlkjdclkxw7bjxx9"; depends=[]; };
+  NonCompart = derive2 { name="NonCompart"; version="0.4.5"; sha256="0z2iigr8nsyanx9lnf7hq5d5fbnm1kd3ir2scfhaqafxa8y8byq9"; depends=[]; };
   NonNorMvtDist = derive2 { name="NonNorMvtDist"; version="1.0.1"; sha256="135scrxwm52fg4drxfr8dgwp2jrgdgbi3fq13i4cka3i99bpx4lm"; depends=[cubature]; };
-  NonProbEst = derive2 { name="NonProbEst"; version="0.1.0"; sha256="0h21w26d22ffcx384b0fb1cm8fcwh4ijp18a691q7vqzcxq0f101"; depends=[caret e1071 sampling]; };
+  NonProbEst = derive2 { name="NonProbEst"; version="0.2.1"; sha256="1ypwx79zysyr2mz3sayprw33dhasc4k2d90i3v3aafdb2jhi6ygp"; depends=[caret e1071 sampling]; };
   NonpModelCheck = derive2 { name="NonpModelCheck"; version="3.0"; sha256="13qk2wbgpdf763q5xg29p2hxwqpml23pcgxrzmx12vnapnqfh71k"; depends=[dr]; };
   Nonpareil = derive2 { name="Nonpareil"; version="3.3.4"; sha256="1hhshcggfv92ll5zqh8hd3pldp07n0684yh1252z2jv2vbl87v3z"; depends=[]; };
   NormExpression = derive2 { name="NormExpression"; version="0.1.0"; sha256="1j4q8mb70ig40acfd9kfy12vxdvq3qpf53rxh47kkw8mywnd0449"; depends=[]; };
@@ -2685,7 +2736,7 @@ in with self; {
   NormalizeMets = derive2 { name="NormalizeMets"; version="0.25"; sha256="0hnyr2aklibbvs6b6q4l0zbb9g8qmp2ds4lqic8a9alqn66sfnf2"; depends=[AUC crmn e1071 GGally ggplot2 htmlwidgets impute knitr limma plotly rmarkdown]; };
   NostalgiR = derive2 { name="NostalgiR"; version="1.0.2"; sha256="0rpvwi815sdhaxqpji1y6g0vy8mkn5k6wci0a4jf54pkywwkwrwp"; depends=[txtplot]; };
   Nozzle_R1 = derive2 { name="Nozzle.R1"; version="1.1-1"; sha256="05sjip4sz12mwd3jcbvk342p83kdmrd4l2jrh17p18w4l7w4nn0z"; depends=[]; };
-  Numero = derive2 { name="Numero"; version="1.2.0"; sha256="0vzz6r2lhg9rygcmgckhagfya4vp6xc1k9sczl47h18kv7daw8d3"; depends=[Rcpp]; };
+  Numero = derive2 { name="Numero"; version="1.3.1"; sha256="058mxg2azfb14anyw576j7fyscxd1kk26jsc9rn9i7hh9gmnrjv6"; depends=[Rcpp]; };
   NutrienTrackeR = derive2 { name="NutrienTrackeR"; version="0.99.2"; sha256="1vzha3ywjbd877fqy3r2xkgi8m44s3ss65bij0vcc4mx8lajhgb5"; depends=[ggplot2]; };
   OAIHarvester = derive2 { name="OAIHarvester"; version="0.3-0"; sha256="1c57jxb9n397wdkrirbfh70sxllrg9zsy0np698z7kcx83rz5lqr"; depends=[curl xml2]; };
   OBMbpkg = derive2 { name="OBMbpkg"; version="1.0.0"; sha256="01wch8wwij3fd0jambk0hpkhlnp4ryrq8qnnr2w1iad9zssjyii5"; depends=[]; };
@@ -2707,7 +2758,7 @@ in with self; {
   OOR = derive2 { name="OOR"; version="0.1.2"; sha256="1zw7g0365znyn828qqsn83l2a837wwj9cx7dzcbns28vhqmsn6hm"; depends=[]; };
   OOmisc = derive2 { name="OOmisc"; version="1.2"; sha256="09vaxn5czsgn6wpr27lka40kzd76jzqgqxavf26ms3m9kkdf83g4"; depends=[]; };
   OPDOE = derive2 { name="OPDOE"; version="1.0-10"; sha256="04z944i4f3i0cjnxh32wf7n2dfyynnvkz4lxdkn90flam2np58yv"; depends=[crossdes gmp mvtnorm nlme orthopolynom polynom]; };
-  OPI = derive2 { name="OPI"; version="2.7"; sha256="0mmk8alpwm4vmq2yr4qkri2zkh4lxfvrp70j0zljinxcynaraqzn"; depends=[]; };
+  OPI = derive2 { name="OPI"; version="2.9"; sha256="0nkdzl4c6k77phiig3mjwp9dkyarcr4k07mxc6ff72yr776s2pma"; depends=[]; };
   ORCI = derive2 { name="ORCI"; version="1.1"; sha256="0xy5lvz2scz06fphjyhqbdhp4bizmv87a8xykp9dbgx8b4ssnqgz"; depends=[BiasedUrn BlakerCI PropCIs]; };
   ORCME = derive2 { name="ORCME"; version="2.0.2"; sha256="1pm8ajj24qqj2fir0gjzq5f4mfpl1cnj6fm2z5qg6g3sbnm57ayk"; depends=[Iso]; };
   ORDER2PARENT = derive2 { name="ORDER2PARENT"; version="1.0"; sha256="04c80vk6z227w6qsnfls89ig4vqyiiymdarhq1pxa0gpr8j2ssx5"; depends=[Matrix]; };
@@ -2735,6 +2786,7 @@ in with self; {
   Omisc = derive2 { name="Omisc"; version="0.1.2"; sha256="0ww83srfc7vr1gw2aaa5bahs6lvm11j4057hn06pclz1wb6fnbyw"; depends=[copula MASS psych]; };
   OmnibusFisher = derive2 { name="OmnibusFisher"; version="1.0"; sha256="0x3q04g45nixgsrl4biqqi6bk4kx79spq5whm3n4ppr0nkv8dw4h"; depends=[CompQuadForm stringr survey]; };
   OnAge = derive2 { name="OnAge"; version="1.0.1"; sha256="1zby5sf92c185b5m19jv4ndgbv6mz107nc47zn1d6bijrypzpc20"; depends=[]; };
+  OncoBayes2 = derive2 { name="OncoBayes2"; version="0.4-4"; sha256="1mvx0c8a5nh9dz77xiyy6qpi66jr82axn5yckp61qmc6b3k702hd"; depends=[abind assertthat bayesplot BH checkmate dplyr Formula ggplot2 RBesT Rcpp RcppEigen rstan rstantools StanHeaders tibble tidyr]; };
   Oncotree = derive2 { name="Oncotree"; version="0.3.3"; sha256="147rc9ci66lxbb91ys2ig40sgmldi15p604yysrd4ccbxpbk2zwf"; depends=[boot]; };
   OneArmPhaseTwoStudy = derive2 { name="OneArmPhaseTwoStudy"; version="1.0.3"; sha256="0q8g33s1jq0ipvwq83xhrly8idsh68licgyivxc628zbm1id5p38"; depends=[Rcpp]; };
   OneR = derive2 { name="OneR"; version="2.2"; sha256="1k7rzhcwq5b2yi4zfsc1r0yb6w65gxj9835d2a1dclallja3zav2"; depends=[]; };
@@ -2743,9 +2795,9 @@ in with self; {
   OpasnetUtils = derive2 { name="OpasnetUtils"; version="1.3"; sha256="0mmn4dpk1wl8slg55xzhpk7jdwhkrka53rwmrsr73sikkh3mcyfn"; depends=[digest ggplot2 httpRequest igraph plyr RCurl reshape2 rgdal rjson sp triangle xtable]; };
   OpenCL = derive2 { name="OpenCL"; version="0.1-3.1"; sha256="0vxfsvin35idgvmc22178bq0r5193pdzba3wwv9djz52fzbj7zys"; depends=[]; };
   OpenImageR = derive2 { name="OpenImageR"; version="1.1.5"; sha256="13bkjwhxvnx7maj009bcpfx85cr08nnghlil75xbyv44ry0gr1ka"; depends=[jpeg png R6 Rcpp RcppArmadillo shiny tiff]; };
-  OpenML = derive2 { name="OpenML"; version="1.8"; sha256="04m2gi35hykqs4iy3ipvi41cmkv8vg145cpafjrsf98kj7jg4pmv"; depends=[backports BBmisc checkmate curl data_table digest httr jsonlite memoise mlr ParamHelpers stringi XML]; };
+  OpenML = derive2 { name="OpenML"; version="1.10"; sha256="132swv22ymm0wxq8y65y2niq8chmga1mnl1lgn6m3cgljvwad47r"; depends=[backports BBmisc checkmate curl data_table digest httr jsonlite memoise stringi XML]; };
   OpenMPController = derive2 { name="OpenMPController"; version="0.2-5"; sha256="00hs8v47pr2d726z8izkfrgmayw147hdm16rr9rw1zs3ad216zjj"; depends=[]; };
-  OpenMx = derive2 { name="OpenMx"; version="2.13.2"; sha256="0w5y19w2hxljzlwfvc4b2lrwyz4x7hfay8zm1mirqd7k1h8b8jdk"; depends=[BH digest MASS Matrix Rcpp RcppEigen rpf StanHeaders]; };
+  OpenMx = derive2 { name="OpenMx"; version="2.14.11"; sha256="14p98mhn7516sxn52kwsjkx84lycx9vw2wy388aivbmpqcbav68z"; depends=[BH digest MASS Matrix Rcpp RcppEigen rpf StanHeaders]; };
   OpenRepGrid = derive2 { name="OpenRepGrid"; version="0.1.12"; sha256="02p9b2y99z9yrrm2pl86p0yqwah0yjic2wdcd4k0mhccimmmkaip"; depends=[abind colorspace GPArotation openxlsx plyr psych pvclust rgl stringr XML]; };
   OpenStreetMap = derive2 { name="OpenStreetMap"; version="0.3.4"; sha256="0kyv14lxi86n6aba4jqmsfpmn075k0ki34q6gkkvhq8yv48wg831"; depends=[ggplot2 raster rgdal rJava sp]; };
   Opportunistic = derive2 { name="Opportunistic"; version="1.2"; sha256="0kaj11ziij1v65l972x4kbr7vzkx4dwa27ymabiip4dg57a976wr"; depends=[]; };
@@ -2754,7 +2806,7 @@ in with self; {
   OptHedging = derive2 { name="OptHedging"; version="1.0"; sha256="0g7qaf5abvbcqv2h1dciwn3gwpz084ryqjjk0yabdm4ym0y38ddm"; depends=[]; };
   OptInterim = derive2 { name="OptInterim"; version="3.0.1"; sha256="1ks24yv5jjhlvscwjppad27iass59da1mls99hlif0li9mvkbvyk"; depends=[clinfun mvtnorm]; };
   OptM = derive2 { name="OptM"; version="0.1.3"; sha256="1dykfhnkrqz2axzzggpzaiknd52rx8zj4nk3nv2rvh74f9hv8px7"; depends=[boot SiZer]; };
-  OptSig = derive2 { name="OptSig"; version="1.0"; sha256="1jmnxwci4rzlwgnq4zxhkii9j7ch1bymx44hk3qv7ws24k7g87nn"; depends=[pwr]; };
+  OptSig = derive2 { name="OptSig"; version="2.0"; sha256="1d5baq6zq5vkklg8sabzs9kril95swvqd6fzkfywixsqnyywcvvm"; depends=[pwr]; };
   OptimClassifier = derive2 { name="OptimClassifier"; version="0.1.4"; sha256="0f1szin0isji60gvb0zi240gri6fc4y1s71n96dn5wacdx5b8mhb"; depends=[clisymbols crayon dplyr e1071 ggplot2 lme4 lmtest MASS nnet nortest rpart]; };
   OptimaRegion = derive2 { name="OptimaRegion"; version="1.1"; sha256="1bikc12a5v3q7f26r14pdfmnxpyqzxa94a10mx5g954km3a329ly"; depends=[boot DepthProc fields geometry magrittr mclust nloptr Rdpack Rdsdp rsm spam stringr]; };
   OptimalCutpoints = derive2 { name="OptimalCutpoints"; version="1.1-4"; sha256="0n2vmzkc733yzs155zdj2n8ng74x9hy4m91fl7fac8d4gnrnc8yg"; depends=[]; };
@@ -2776,13 +2828,14 @@ in with self; {
   OutlierDetection = derive2 { name="OutlierDetection"; version="0.1.1"; sha256="0z4797j2gr37c1jnhivczff3y2dd2kilyncc087ihpwaa26wv0nl"; depends=[DDoutlier depth depthTools ggplot2 ldbod plotly spatstat]; };
   OutliersO3 = derive2 { name="OutliersO3"; version="0.6.2"; sha256="197r5mxvg968hisgqsd0p1sxjsakmn27gpsh3qx3cnvs1pikj3dr"; depends=[cellWise dplyr FastPCS forcats GGally ggplot2 HDoutliers memisc rlist robustbase robustX tidyr]; };
   OutrankingTools = derive2 { name="OutrankingTools"; version="1.0"; sha256="0z7pslkkinn7flc4xwjg0bsfswf8ad4jv9rmglaj3fmjcx9b6wgj"; depends=[igraph]; };
+  OwenQ = derive2 { name="OwenQ"; version="1.0.2"; sha256="00c8cv8bawmlswjhqrhb218vvl7k7ljw85iwbwwrhxf3hpm9mcz3"; depends=[BH Rcpp RcppEigen RcppNumerical]; };
   OxyBS = derive2 { name="OxyBS"; version="1.5"; sha256="11l3gm0jvw993jb13f6kpv77m6z0d1jswscma2v28qzkw053r3dc"; depends=[]; };
   P2C2M = derive2 { name="P2C2M"; version="0.7.6"; sha256="07ycl22v03b2xdaw4v0l6layqhab431ma38qywzm96hkl3ywvl49"; depends=[ape ggplot2 rPython stringr]; };
   PAC = derive2 { name="PAC"; version="1.1.1"; sha256="07f83i43nxf1s2c26kkpcv4iyq517w20y1l7yg41wnmbfi9xlk7s"; depends=[dplyr ggplot2 ggrepel igraph infotheo parmigene Rcpp Rtsne]; };
   PACBO = derive2 { name="PACBO"; version="0.1.0"; sha256="1v3j5bgvf0wh8s4d2yyz0fkc3acdwjlicwnbh1r241b1742x79cb"; depends=[mnormt]; };
   PACLasso = derive2 { name="PACLasso"; version="1.0.0"; sha256="1qzzymhfsjy8mk0r0xpd5h4wrx4wk8gq3vi6fnawkq5xkrg26rld"; depends=[lars limSolve MASS penalized quadprog]; };
-  PACVr = derive2 { name="PACVr"; version="0.8.1"; sha256="03ap3m4c6jbzc311aksnrwrfd8h65gskka9jpmnx4wnvcrkalapj"; depends=[BiocGenerics genbankr optparse RCircos]; };
-  PAFit = derive2 { name="PAFit"; version="1.0.1.2"; sha256="10nwl2wbpka63qc66gk9n6m1rvpf5kx9dwl948n9l6wr488klial"; depends=[igraph knitr magicaxis mapproj MASS network networkDynamic plyr RColorBrewer Rcpp VGAM]; };
+  PACVr = derive2 { name="PACVr"; version="0.8.2"; sha256="0bqv0zhcyp5v1wln11kkvygdwd70yrixd9cbm5fvjqkmmdvmnrv0"; depends=[BiocGenerics genbankr optparse RCircos]; };
+  PAFit = derive2 { name="PAFit"; version="1.0.1.4"; sha256="0lm12dsqz88v10qdk5pyf4a4nv3kk9za8zbnmw761fk330ill045"; depends=[igraph knitr magicaxis mapproj MASS network networkDynamic plyr RColorBrewer Rcpp VGAM]; };
   PAGI = derive2 { name="PAGI"; version="1.0"; sha256="01j1dz5ihqslpwp9yidmhw86l112l7rfkswmf03vss872mpvyp3f"; depends=[igraph]; };
   PAGWAS = derive2 { name="PAGWAS"; version="2.0"; sha256="0bz47ivd32kx1amgqllqbxyyvj773q7wasgk924hmibabiixa8nx"; depends=[foreach lars mnormt]; };
   PANDA = derive2 { name="PANDA"; version="0.9.9"; sha256="1sf3c49v4mb3mz2imqlqdbh1iab7bc2pxpi8bmgj2jld133555ip"; depends=[cluster GO_db]; };
@@ -2815,7 +2868,7 @@ in with self; {
   PCGSE = derive2 { name="PCGSE"; version="0.4"; sha256="0ky1nzhz6v9n34kas9nw2scc6ip7av19g09zcsxaa9436nhip4f6"; depends=[MASS RMTstat safe]; };
   PCICt = derive2 { name="PCICt"; version="0.5-4.1"; sha256="17ipmv6ps7c9dv4k9kxjjynnlgr63baz9z9ndwfg0lckc3vw81ya"; depends=[]; };
   PCIT = derive2 { name="PCIT"; version="1.5-3"; sha256="0gi28i2qd09pkaja4w7abcl7sz43jnk98897vc2905fnk9nks65j"; depends=[]; };
-  PCMBase = derive2 { name="PCMBase"; version="1.2.9"; sha256="1hqqkx630pbi5lp2nhby5jf4gz8q6hihp28h9wlzwakv6dwr2b4w"; depends=[ape data_table expm ggplot2 mvtnorm]; };
+  PCMBase = derive2 { name="PCMBase"; version="1.2.10"; sha256="0q84dd9a59c8pzv4pabcxlxxn37pxm5ya5pa800d3m34fd02h8i3"; depends=[ape data_table expm ggplot2 mvtnorm xtable]; };
   PCMRS = derive2 { name="PCMRS"; version="0.1-1"; sha256="10n4am4qm23aaghf8awv2llcq7392s62yr6mf5h8nf18hfz29wrn"; depends=[cubature ltm mvtnorm Rcpp RcppArmadillo statmod]; };
   PCPS = derive2 { name="PCPS"; version="1.0.6"; sha256="0mihkivlpycqbzc3z8clsmiqg3c6hqnapk29h794lf99had03hp8"; depends=[ape phylobase picante RcppArmadillo SYNCSA vegan]; };
   PCRedux = derive2 { name="PCRedux"; version="0.2.6-4"; sha256="0nya5fx06mic7knfkzddny9lxqwk039kz0d3mf32rixwlbhrdlr5"; depends=[bcp caret changepoint chipPCR ecp fda_usc FFTrees magrittr MBmca pbapply plotly pracma qpcR randomForest robustbase testthat visdat zoo]; };
@@ -2835,9 +2888,9 @@ in with self; {
   PET = derive2 { name="PET"; version="0.5.1"; sha256="1gdq7ai8hgl9h53b72j7sfk09l7yr2b84pdy9bl1z3x8zxbsp8br"; depends=[adimpro]; };
   PGEE = derive2 { name="PGEE"; version="1.5"; sha256="1qcxbqnbpplnfjy83nm9fj9y4abzgbxnsggzx7ix3vb9qs18cdwh"; depends=[MASS mvtnorm]; };
   PGM2 = derive2 { name="PGM2"; version="1.0-1"; sha256="03282pcq7gw47awc2mxjsbz6w3zpqjhqd7fzg8la4p00cd0vvmr4"; depends=[]; };
-  PGRdup = derive2 { name="PGRdup"; version="0.2.3.3"; sha256="1s0v44922zpxl3w9kzn9xzvs5jldg35gjrnlf89f89i3rs59gg98"; depends=[data_table ggplot2 gridExtra igraph stringdist stringi]; };
+  PGRdup = derive2 { name="PGRdup"; version="0.2.3.4"; sha256="1arviyjmvbkiv4fwfs155360p3fnfqsdnhrjdn0r2pgzmsb66i1y"; depends=[data_table ggplot2 gridExtra igraph stringdist stringi]; };
   PHENIX = derive2 { name="PHENIX"; version="1.3.1"; sha256="1gd9ycrwawi81al4f5v559km1112giwqnwvvk8ynj4kdb5bqpyq4"; depends=[ppcor SuppDists]; };
-  PHEindicatormethods = derive2 { name="PHEindicatormethods"; version="1.1.3"; sha256="1464afv2kkr8rydvb7afw6bv8p5fr9fd5a06307l4c56jkmnln3r"; depends=[broom dplyr purrr rlang tidyr]; };
+  PHEindicatormethods = derive2 { name="PHEindicatormethods"; version="1.1.5"; sha256="1cf9qzb58mvlp1qh46wl405zrfgbaf1zjc4smgwb3djdkxyznw6d"; depends=[broom dplyr purrr rlang tidyr]; };
   PHYLOGR = derive2 { name="PHYLOGR"; version="1.0.10"; sha256="17q760k5519alr2skvpnghz3c9jgw07lh5fpw4xf6hjk3qlqq82c"; depends=[]; };
   PHeval = derive2 { name="PHeval"; version="0.5.4"; sha256="06fy5dm4mnp29f01163rw1d1hyl7rlcp4pfw18s87ckpr931qyma"; depends=[survival]; };
   PIGE = derive2 { name="PIGE"; version="1.1"; sha256="0pc24rvvxzpgrsx7xsj98n5vd462hjggakzwp36qdkib69yyr4bn"; depends=[ARTP snowfall survival xtable]; };
@@ -2853,17 +2906,18 @@ in with self; {
   PKgraph = derive2 { name="PKgraph"; version="1.7"; sha256="0g36cdv5cblqx69j48irxjc5nlw2cl3p714mlsblnd3362z1brwn"; depends=[cairoDevice ggplot2 gWidgetsRGtk2 lattice proto rggobi RGtk2]; };
   PKreport = derive2 { name="PKreport"; version="1.5"; sha256="16hss9migbxpnw5f9gcw1nlvb81iyji00ylx5wd6kdwhz0ids9wj"; depends=[ggplot2 lattice]; };
   PLIS = derive2 { name="PLIS"; version="1.1"; sha256="0b81s7677wglqvv1b5lx8k2iaks09kz0wrl07245a7j2pk9nxv7p"; depends=[]; };
-  PLMIX = derive2 { name="PLMIX"; version="2.1.0"; sha256="1z89s4f22d1z6caqamksj17g0w9qlx10n2grg05hg1dpmhv1mf7b"; depends=[abind coda foreach ggmcmc ggplot2 gridExtra gtools label_switching MCMCpack PlackettLuce pmr prefmod radarchart rankdist rcdd Rcpp reshape2 StatRank]; };
+  PLMIX = derive2 { name="PLMIX"; version="2.1.1"; sha256="05mnzsi7y71cvg50qx8hp4m31gqslldl34k41r1f8npyb6ldpdca"; depends=[abind coda foreach ggmcmc ggplot2 gridExtra gtools label_switching MCMCpack PlackettLuce pmr prefmod radarchart rankdist rcdd Rcpp reshape2 StatRank]; };
   PLNmodels = derive2 { name="PLNmodels"; version="0.9.2"; sha256="0xrn1bkzj1bvbfgs0k7jkb8d10k3sh9r9s0lbwx0dgdbhny5gl6p"; depends=[biomformat corrplot dplyr ggplot2 glassoFast gridExtra igraph magrittr MASS Matrix nloptr phyloseq R6 Rcpp RcppArmadillo tidyr]; };
   PLRModels = derive2 { name="PLRModels"; version="1.1"; sha256="0dwnzfw7a1cxz9s00kxf19jmjsc8cy6cc9q2mjqf8z7690wrg7hb"; depends=[]; };
   PLSbiplot1 = derive2 { name="PLSbiplot1"; version="0.1"; sha256="1l8d1k913ic0qwxvrrd447p5ni3mzc6v9lv45b7vqrpzkxdci6gy"; depends=[]; };
-  PLmixed = derive2 { name="PLmixed"; version="0.1.3"; sha256="0n2d7mzviwlw2d1mk3rwhcac170khgfsdivwysqxji2qwgdhgl32"; depends=[lme4 Matrix numDeriv]; };
+  PLmixed = derive2 { name="PLmixed"; version="0.1.4"; sha256="1plkcv7k6jijywhxrsx2lxcbavzvagzl8wnz132nqq619wvb57ia"; depends=[lme4 Matrix numDeriv optimx]; };
   PLordprob = derive2 { name="PLordprob"; version="1.1"; sha256="1g23h3121g9csr85falm6vgzbva42wz3skhfr2rxmvlc3ca4afyp"; depends=[mnormt]; };
   PMA = derive2 { name="PMA"; version="1.1"; sha256="0vlz89rhm5jxcpv18cpxa396qkqf0ywxhjh17ldbgrnqgsw76r7w"; depends=[impute]; };
   PMCMR = derive2 { name="PMCMR"; version="4.3"; sha256="09bvdj2h1086r2cgy3myrhlylplxxlliv8nwx09c8kb1vn02i2ij"; depends=[]; };
   PMCMRplus = derive2 { name="PMCMRplus"; version="1.4.1"; sha256="076nzcnky3c3rp88b9vkqxsvws8jy81yb2aw8sa1ddz6b9hx0f4i"; depends=[BWStest gmp kSamples MASS multcompView mvtnorm Rmpfr SuppDists]; };
+  PML = derive2 { name="PML"; version="1.1"; sha256="11fl7qm98n5wlfwczb6vzj9hswq7mqmb09nh9wl7986jp2wbrjlw"; depends=[dplyr rbokeh tibble tidyr trelliscopejs]; };
   PMmisc = derive2 { name="PMmisc"; version="0.1.2"; sha256="03bavk7ylmrrcc49zy9fb2q08w6138b3srxa4x038syr115k3l6k"; depends=[ggplot2 robust]; };
-  PMwR = derive2 { name="PMwR"; version="0.11-1"; sha256="00vdhm7a1sawbx04602r5f9cn7d2dsxzc5y5vrngkwc8f0yshzr4"; depends=[datetimeutils fastmatch NMOF orgutils textutils zoo]; };
+  PMwR = derive2 { name="PMwR"; version="0.12-0"; sha256="1w3zz3sh06vbyzngcpm52izi2ymnfy897q2zz7vrb6r8xxcbrlwi"; depends=[datetimeutils fastmatch NMOF orgutils textutils zoo]; };
   PNADcIBGE = derive2 { name="PNADcIBGE"; version="0.4.3"; sha256="1mckjb6q7ffvzsifjwc411p9r1vykvczk6v7lcsmpzliifgc0ys4"; depends=[dplyr magrittr RCurl readr readxl survey timeDate]; };
   POCRE = derive2 { name="POCRE"; version="0.5.0"; sha256="0aph1lmb0xkzm4l4ah2wrx13d138igf4k4w9wb9lca4vv6m7xzqf"; depends=[EbayesThresh ggplot2 pracma]; };
   POD = derive2 { name="POD"; version="1.1.4"; sha256="0ivq7jpnyb5zvvi2dx788cawrsh26hyp8j0a8mkfcsnhyhhs7hnb"; depends=[]; };
@@ -2876,13 +2930,15 @@ in with self; {
   PP = derive2 { name="PP"; version="0.6.2"; sha256="1y6f8pnvdp59xnm0vh1rjhcxy3nyd3il7r76yyrrfamdr42hh8lc"; depends=[Rcpp]; };
   PP3 = derive2 { name="PP3"; version="1.2"; sha256="1g36al9w1rxyhfzbvpw9siqq57h2xl0zr94wysz8i0jzqkkqkrvf"; depends=[]; };
   PPCI = derive2 { name="PPCI"; version="0.1.4"; sha256="18q9jjmmmmghwyzpj42k7xa55anvbg1jnqs2y6c5jzlb2cw3ga4h"; depends=[rARPACK]; };
-  PPQplan = derive2 { name="PPQplan"; version="0.1.0"; sha256="06v4agq8bd3ssbfnl1jyfzy5xi4jwj6wqfmj9qalrv9kllh839mv"; depends=[ggplot2 plotly tolerance]; };
+  PPMR = derive2 { name="PPMR"; version="1.0"; sha256="07fky5xc1dmmn23wwdjm46c86i7q20dv5f2147828v52hhky873g"; depends=[Rcpp RcppArmadillo]; };
+  PPQplan = derive2 { name="PPQplan"; version="1.0.0"; sha256="159mgwd2d7qzfwj6dnxr77p0fm7rgq9bpks2ra54s446cm4ahgkd"; depends=[ggplot2 plotly tolerance]; };
   PPRL = derive2 { name="PPRL"; version="0.3.5.2"; sha256="083al6xi9b62vbx71684bxq2xynvmxw25ak01gwngln1r84gsz5l"; depends=[Rcpp settings]; };
   PPforest = derive2 { name="PPforest"; version="0.1.1"; sha256="0iplbw5b2vhqbp6gc123ykzmilwa80akljkv3jzfmi90ckm4k08m"; depends=[doParallel dplyr magrittr plyr Rcpp RcppArmadillo tidyr]; };
   PPtree = derive2 { name="PPtree"; version="2.3.0"; sha256="002qjdx52r2h90wzrf2r3kz8fv3nwx08qbp909whn6r4pbdl532v"; depends=[MASS penalizedLDA]; };
   PPtreeViz = derive2 { name="PPtreeViz"; version="2.0.3"; sha256="1x5rcls49jz19y3h98n2k4kypm8mv8p586clhdj62bvp2nl8wg3x"; depends=[ggplot2 gridExtra partykit Rcpp RcppArmadillo]; };
   PQLseq = derive2 { name="PQLseq"; version="1.1"; sha256="1h8baf0apxvimarr2qwlh6pdzv88ib1dzw927swsyimjg44wjbfc"; depends=[doParallel foreach Matrix Rcpp RcppArmadillo]; };
   PREPShiny = derive2 { name="PREPShiny"; version="0.1.0"; sha256="0zsg07y6nhp2lma3pdz8xd981y3mh8k21il5jv0inma1d1xr4g3f"; depends=[dplyr psycho rmarkdown shiny]; };
+  PRIMAL = derive2 { name="PRIMAL"; version="1.0.0"; sha256="1ivjgc6dczh6idhzjvxag0l8wpkxx9y52bcr6x21rk64kx57mj3h"; depends=[Matrix Rcpp RcppEigen]; };
   PRIMME = derive2 { name="PRIMME"; version="3.0-0"; sha256="1wvwdsaqg5rqx93svvhjvi64x6vxbr0a8za0a7cixy0vdg14vli4"; depends=[Matrix Rcpp]; };
   PRIMsrc = derive2 { name="PRIMsrc"; version="0.8.2"; sha256="04g1saf511xs26m1iv9xfsmfs15fdfaxh5qlbay2mcb198270pd8"; depends=[glmnet Hmisc quantreg superpc survival]; };
   PRISM_forecast = derive2 { name="PRISM.forecast"; version="0.1.6"; sha256="0w0fjbaafq90ac35h70z8g95q1i812v0ivkif4lx8l3q7rhjrvb5"; depends=[glmnet xts zoo]; };
@@ -2934,6 +2990,7 @@ in with self; {
   PakPMICS2018hh = derive2 { name="PakPMICS2018hh"; version="0.1.0"; sha256="0wkjxy8qkndhnyf1w03cr3g7s03cm60yn0lxn5j6hvh019b28nmz"; depends=[tibble]; };
   PakPMICS2018mm = derive2 { name="PakPMICS2018mm"; version="0.1.0"; sha256="08f2n134q545kwysy705mgsy6319ns4l9pwxldlxvbzq0lha4hf9"; depends=[tibble]; };
   PakPMICS2018mn = derive2 { name="PakPMICS2018mn"; version="0.1.0"; sha256="1r5cn1mx7i7hif64lhfcdz4xqqfj3j45i092370xhhi19pqq217n"; depends=[tibble]; };
+  PanCanVarSel = derive2 { name="PanCanVarSel"; version="0.0.3"; sha256="06xkzg2kvyr6ivm1z71x2pk20j37h36sx6kf4kmc8q50cq73k9jl"; depends=[Matrix msm mvtnorm smoothmest]; };
   PanJen = derive2 { name="PanJen"; version="1.6"; sha256="18cl9rls98v286kk6lyxxws3w59zpzgmqi5250gdgcf71xy2lhvm"; depends=[mgcv]; };
   PanelCount = derive2 { name="PanelCount"; version="1.0.9"; sha256="1b6c83qypjc3ylvhh24xm4pjk8w34s24v0i9ddlmg92f1518hlkj"; depends=[Rcpp RcppArmadillo statmod]; };
   Paneldata = derive2 { name="Paneldata"; version="1.0"; sha256="00hk340x5d4mnpl3k0hy1nypgj55as2j7y2pgzfk3fpn3zls5zib"; depends=[]; };
@@ -2941,7 +2998,7 @@ in with self; {
   ParDNAcopy = derive2 { name="ParDNAcopy"; version="2.0"; sha256="017xwznhfibi8kp0ifww02c0qcq0vxs06rjww4kcp2bvdmld8kc4"; depends=[DNAcopy]; };
   ParallelLogger = derive2 { name="ParallelLogger"; version="1.1.0"; sha256="007linzn60bjs8nh1j1jzb292naxajjpkjwmhjc992h8himxfky4"; depends=[jsonlite snow XML]; };
   ParallelPC = derive2 { name="ParallelPC"; version="1.2"; sha256="07y7xb16865khxkvwsk1yglzyy7ja4aj2wpkipaz48i77c3x8bi2"; depends=[]; };
-  ParallelTree = derive2 { name="ParallelTree"; version="0.1.2"; sha256="0x99x1iycx8ik8cih972awnxifvmhbrmjrf2csmnn9fw4rsqn0p5"; depends=[ggplot2]; };
+  ParallelTree = derive2 { name="ParallelTree"; version="0.1.3"; sha256="1h53qwhc63fglm452b3by7f3g6f3hyqwkmwmbdqdb9rv3j4gvnvg"; depends=[ggplot2]; };
   ParamHelpers = derive2 { name="ParamHelpers"; version="1.12"; sha256="056cmgklr4a1385qjalr12mphaybc1x7a31qbhs319cbc3kbjkdm"; depends=[backports BBmisc checkmate fastmatch]; };
   ParentOffspring = derive2 { name="ParentOffspring"; version="1.0"; sha256="117g8h0k65f2cjffigl8n4x37y41rr2kz33qn2awyi876nd3mh93"; depends=[]; };
   ParetoPosStable = derive2 { name="ParetoPosStable"; version="1.1"; sha256="1fwji5wrhbxr089dll812csamvb5q2pxn1607rpirarifgfbj28m"; depends=[ADGofTest doParallel foreach lmom]; };
@@ -2949,12 +3006,12 @@ in with self; {
   Partiallyoverlapping = derive2 { name="Partiallyoverlapping"; version="2.0"; sha256="0pb0digyigqyzb0zqikgz002kqf1xprcjhxr62a7iqbzy1yycayf"; depends=[]; };
   PathSelectMP = derive2 { name="PathSelectMP"; version="1.1"; sha256="036b70bpylmibny6dny79f7gdzn78arqgl2hfs031vygw63yyh9b"; depends=[mice MplusAutomation]; };
   PatternClass = derive2 { name="PatternClass"; version="1.7.1"; sha256="11r4p4s2pm0c4fmnpijzz5srhpai444mbx5nszhkssfsp9rh7cm9"; depends=[SDMTools]; };
-  Patterns = derive2 { name="Patterns"; version="1.0"; sha256="050qvyvkznn46mdx3a3i99vmbjdqya3ng7bg9n9hr0g8ghn0n7bj"; depends=[abind animation Biobase c060 cluster elasticnet glmnet gplots igraph jetset KernSmooth lars lattice limma magic Mfuzz movMF msgps nnls pixmap plotrix SelectBoost spls survival tnet VGAM WGCNA]; };
+  Patterns = derive2 { name="Patterns"; version="1.1"; sha256="0j7riqf5i1prkky395g4nzc6pg5ci6w5jmjc49xjxyda9nlkaly0"; depends=[abind animation Biobase c060 cluster elasticnet glmnet gplots igraph jetset KernSmooth lars lattice limma magic Mfuzz movMF msgps nnls pixmap plotrix SelectBoost spls survival tnet VGAM WGCNA]; };
   PdPDB = derive2 { name="PdPDB"; version="2.0.1"; sha256="05aqg0rqrnlmvjxa32ms1vywgwhw5zlfkyf2ij0fn06rp8l2z3lv"; depends=[dendextend plyr tseries]; };
   Peacock_test = derive2 { name="Peacock.test"; version="1.0"; sha256="0ypvwywipyh8lm8xkazsfjgjpvvyi2g8kid63qff11372p33m6xs"; depends=[]; };
   PeakError = derive2 { name="PeakError"; version="2017.06.19"; sha256="1d4v7s478zjz42dm6ps4nnqqyyqv84dgmzn1bp1a4qwnfv9vmfg7"; depends=[]; };
   PeakSegDP = derive2 { name="PeakSegDP"; version="2017.08.15"; sha256="1ndf4d4ikcyqi0k51kil2jw777z4c1m4pda3dahrjmjyz0jhrhkw"; depends=[]; };
-  PeakSegDisk = derive2 { name="PeakSegDisk"; version="2019.7.29"; sha256="0vcmz57cvyjn69nxzz5ai8xpjj92f3b9cynll5pv76v4k3sms5ld"; depends=[data_table]; };
+  PeakSegDisk = derive2 { name="PeakSegDisk"; version="2019.9.10"; sha256="02b8qmmmwaf3izgic1mj69ixpixadvnxsipnmv3kiy1km723j8js"; depends=[data_table]; };
   PeakSegJoint = derive2 { name="PeakSegJoint"; version="2018.10.3"; sha256="0f0dw6swhhf301j4ci3rs8cmzd39dcjlb0kqxpdh7f00gp3qn7da"; depends=[PeakError penaltyLearning]; };
   PeakSegOptimal = derive2 { name="PeakSegOptimal"; version="2018.05.25"; sha256="0j39jzy4r0h787vs3klgbpcmb096ds3hzhvv5w3xs53kl0qkypj4"; depends=[penaltyLearning]; };
   PearsonDS = derive2 { name="PearsonDS"; version="1.1"; sha256="0rqh9ji0bah3n1c6fcg7krgqs65qla9p3xrnc4jr7va6ph104im9"; depends=[]; };
@@ -2964,7 +3021,7 @@ in with self; {
   PenCoxFrail = derive2 { name="PenCoxFrail"; version="1.0.1"; sha256="0snjf8jxzyf30xj3wx9p6g073dqw592l1j1c6yxfg8y4kgzhzwq7"; depends=[Matrix Rcpp RcppArmadillo survival]; };
   PepPrep = derive2 { name="PepPrep"; version="1.1.0"; sha256="1s2xn05xry50l9kf1mj6yd1dpc7yp6g3d00960hswvhznb0a4l84"; depends=[biomaRt stringr]; };
   PepSAVIms = derive2 { name="PepSAVIms"; version="0.9.1"; sha256="0m4jrq6wcjy0k80gvrnm9f7kvi1ifx9182xfq0psyaxpj0ggvzij"; depends=[elasticnet]; };
-  Peptides = derive2 { name="Peptides"; version="2.4"; sha256="1i5p0z4zhis4p1czwz3cryr64lys4dp2fddnmmasgspl8fyz8p05"; depends=[Rcpp]; };
+  Peptides = derive2 { name="Peptides"; version="2.4.1"; sha256="05xhimjw7kdga07ycgwz6mq5ppcx04zy00mx5fvavp314zrqxnsv"; depends=[Rcpp]; };
   PerFit = derive2 { name="PerFit"; version="1.4.3"; sha256="0qmh78wrx3vzz41z30db3bb62n325blphjhpzdzykfx77gr8plyr"; depends=[fda Hmisc irtoys ltm MASS Matrix mirt]; };
   PerMallows = derive2 { name="PerMallows"; version="1.13"; sha256="0ny2vc8f0npixaw1kp2d93xr4g46nsg8jjwvi6afv9xjvaz0i6wy"; depends=[Rcpp]; };
   Perc = derive2 { name="Perc"; version="0.1.3"; sha256="1wkhxwq15x2niabgnchr93h132ynswsjb81ignlk1rsqppm4hkr5"; depends=[]; };
@@ -2975,22 +3032,24 @@ in with self; {
   PerseusR = derive2 { name="PerseusR"; version="0.3.4"; sha256="1k03flbnjndx5mm26hysk64z89858m50kjs8gyldm4s5f09iny6p"; depends=[Biobase plyr stringr XML]; };
   PersianStemmer = derive2 { name="PersianStemmer"; version="1.0"; sha256="1dpfkafijg7g7hzka93l1ymq5rcnjsfgvkvbpdx3vjnid05kh4v1"; depends=[]; };
   PersomicsArray = derive2 { name="PersomicsArray"; version="1.0"; sha256="1d5gxd65b01m13rgbdhk6w3l43vqcbdk0s1pbgc8h6cnipj55z0i"; depends=[jpeg raster stringr tiff]; };
+  PetfindeR = derive2 { name="PetfindeR"; version="2.0.0"; sha256="0bflibfm1fiv18pd4wp1b6ipf5ybr9mra2r968mhmm9yy4119msy"; depends=[httr jsonlite R6]; };
   PhViD = derive2 { name="PhViD"; version="1.0.8"; sha256="038pw24sb8ja8pbbmj05rww6413i2ljybb2dxwgrpffv22aqawmc"; depends=[LBE MCMCpack]; };
   PharmPow = derive2 { name="PharmPow"; version="1.0"; sha256="0gabkd8p4zsig9p697lyk8m2jxb5abjk81rpzd5ih1yk1qanhsn5"; depends=[scatterplot3d]; };
   Phase123 = derive2 { name="Phase123"; version="2.1"; sha256="0bz867wsnrflzlzrql1vgacymx70rb9wik9jw3g34i2vigpl8x8i"; depends=[Rcpp RcppArmadillo survival]; };
+  Phase12Compare = derive2 { name="Phase12Compare"; version="1.3"; sha256="1zrll0nx2z45sa5yzan4b59pqw9wgfqxpqv7njkpwim19c0damkl"; depends=[mvtnorm Rcpp RcppArmadillo]; };
   PhaseType = derive2 { name="PhaseType"; version="0.1.3"; sha256="092dqyqfaxj8qpwxcjb5cayhnq597rfjz1xb93ps4nrczycqs0l6"; depends=[coda ggplot2 reshape]; };
   PhenotypeSimulator = derive2 { name="PhenotypeSimulator"; version="0.3.3"; sha256="1micildhgqx4h52927p68g6jvw2rif6maf90d3dzvn76ll2zbpwh"; depends=[cowplot data_table dplyr ggplot2 mvtnorm optparse R_utils Rcpp reshape2 snpStats zoo]; };
   Phxnlme = derive2 { name="Phxnlme"; version="1.0.0"; sha256="0h9mi8p95rp1s8xsdv38j9fpy2cy9zvjnldjmnj0n469kimp2782"; depends=[ggplot2 gridExtra lattice manipulate testthat]; };
   PhyInformR = derive2 { name="PhyInformR"; version="1.0"; sha256="10d720ww909b1xmdrms554pnn0757nzppnrniar4n157mh0qw7ms"; depends=[ape doParallel foreach geiger ggplot2 gplots gridExtra hexbin iterators PBSmodelling phytools RColorBrewer]; };
   PhySortR = derive2 { name="PhySortR"; version="1.0.8"; sha256="19426xjdii74qds0wmq5sa88zys81nyqb9lvf9pfihbjgrjr770a"; depends=[ape phytools]; };
   PhyloMeasures = derive2 { name="PhyloMeasures"; version="2.1"; sha256="01axs78s10y1bkx8dbs9vvnphdzik7hpibkwyib1x9mznmyg90hr"; depends=[ape]; };
-  PhylogeneticEM = derive2 { name="PhylogeneticEM"; version="1.2.1"; sha256="0mrlyaj15y1dzlnn13phjq64immad08wn99sv9zdixf7ybdvwwnv"; depends=[ape capushe foreach gglasso glmnet LINselect MASS Matrix plyr Rcpp RcppArmadillo robustbase]; };
+  PhylogeneticEM = derive2 { name="PhylogeneticEM"; version="1.3.0"; sha256="03yqdg4qfzqvykfwc9cgfxjaj4n57kwz95dfdq6zb7lc56gs69ms"; depends=[ape capushe foreach gglasso glmnet LINselect MASS Matrix plyr Rcpp RcppArmadillo robustbase]; };
   PhysActBedRest = derive2 { name="PhysActBedRest"; version="1.0"; sha256="0gmqh700cf6aiagb45iyyf85pgp3b86fx7fbv9lrsm4mda0r8h75"; depends=[chron lubridate stringr]; };
   PhysicalActivity = derive2 { name="PhysicalActivity"; version="0.2-2"; sha256="14z6plgwyr46vs9m997rvlz8sdglfs9g087an8668zqkzzs2w4ln"; depends=[]; };
   PieceExpIntensity = derive2 { name="PieceExpIntensity"; version="1.0.4"; sha256="023hq0gg1vi0j3yf8p5lisgs8wfp5qwyd4akxxzx7wad2985gxb3"; depends=[Rcpp RcppArmadillo]; };
   Pijavski = derive2 { name="Pijavski"; version="1.0"; sha256="1027lmmk17br9zxah980j6l3k2p92065bwigw6gpy9g0g5jjl4f1"; depends=[Rcpp]; };
   PivotalR = derive2 { name="PivotalR"; version="0.1.18.3.1"; sha256="1npfi5bdn0f4arp3wpi5ai21ad5fxx3lm7n5wjhvzvcyr6gl38as"; depends=[Matrix]; };
-  PlackettLuce = derive2 { name="PlackettLuce"; version="0.2-6"; sha256="0f6n2q8c4kmcq6hy6jk65v3y390rn84nd8dfc9r0g6qqwizwi16b"; depends=[igraph Matrix partykit psychotools psychotree qvcalc rARPACK sandwich]; };
+  PlackettLuce = derive2 { name="PlackettLuce"; version="0.2-9"; sha256="1sv37wvvp44iwv4bpjhp3mnpyk77c60vi0xwrapzywszi222ynbl"; depends=[igraph Matrix partykit psychotools psychotree qvcalc RSpectra sandwich]; };
   Planesmuestra = derive2 { name="Planesmuestra"; version="0.1"; sha256="0v7l4hrfckcf7zmk0ihq2ij0qli7x12j17vd6752d1yjk27fgk57"; depends=[]; };
   PlasmaMutationDetector = derive2 { name="PlasmaMutationDetector"; version="1.7.2"; sha256="0qra7q2pzw212qylyrfhv6zjcsldfw84b93cari0qjqnw4gyfph2"; depends=[GenomicRanges ggplot2 robustbase Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation]; };
   Plasmidprofiler = derive2 { name="Plasmidprofiler"; version="0.1.6"; sha256="10m3knmz0596rm30ncyfprar6l42bjm7r34n4pjz1biqmiz6yz6k"; depends=[ape dplyr gdata ggdendro ggplot2 gridExtra gtable htmlwidgets magrittr plotly plyr RColorBrewer reshape2 stringr]; };
@@ -3028,14 +3087,15 @@ in with self; {
   PortfolioEffectEstim = derive2 { name="PortfolioEffectEstim"; version="1.4"; sha256="1sfgkwyn7vfy3rqb1cglywiv5xmyxhzvj38vgrvfq5jf3hvzsg21"; depends=[PortfolioEffectHFT rJava]; };
   PortfolioEffectHFT = derive2 { name="PortfolioEffectHFT"; version="1.8"; sha256="0y4x0d91j6g52136d921hfs5swzf85gkxafxfkf3c15dl5ns120v"; depends=[ggplot2 rJava zoo]; };
   PortfolioOptim = derive2 { name="PortfolioOptim"; version="1.1.1"; sha256="01fw1zr1gr6nlcgw8dlc66b3ygkl6w571lw73p13h0q17y1i872d"; depends=[Rsymphony]; };
+  PostcodesioR = derive2 { name="PostcodesioR"; version="0.1.1"; sha256="1hwyc8i6a5rxlg3bvjcwayjmv858a050c3y4ig3ncaldifyky4lb"; depends=[httr]; };
   PottsUtils = derive2 { name="PottsUtils"; version="0.3-3"; sha256="165k4sjh3kqkb8bzi68wx00yl77yfbgs70fcbpzmsmcw4g4hdpzn"; depends=[miscF]; };
   PoweR = derive2 { name="PoweR"; version="1.0.7"; sha256="040wc7hxa8y6bm1rs7ip2skdxmmwksxkyb6xzqgdjp8m7a25fppb"; depends=[Rcpp RcppArmadillo]; };
   Power2Stage = derive2 { name="Power2Stage"; version="0.5.2"; sha256="1837pc94syhyl5i0kjdmlc1h7ckas3vcpwhvhgh46sv022lrg2gi"; depends=[cubature mvtnorm PowerTOST]; };
   PowerNormal = derive2 { name="PowerNormal"; version="1.2.0"; sha256="1kryqcjvgwk0l4z3gqxdiz47mha3jw5583jlb9z7ml6v7cam06sm"; depends=[]; };
-  PowerTOST = derive2 { name="PowerTOST"; version="1.4-7"; sha256="02k6jn5dw70518g55bchax0l5gkci827lqwwyxwnn6rzs3mx4ybs"; depends=[cubature mvtnorm TeachingDemos]; };
+  PowerTOST = derive2 { name="PowerTOST"; version="1.4-8"; sha256="0975y3q648cqfmz4pp79cfclww7v7mxmkz1limnyd2ahdsbbzyqn"; depends=[cubature mvtnorm TeachingDemos]; };
   PowerUpR = derive2 { name="PowerUpR"; version="1.0.4"; sha256="0ng88x1zs4kb8cf2v51kynbp32iz41mh40my5sciyvjbw430bk59"; depends=[]; };
   PowerfulMaxEigenpair = derive2 { name="PowerfulMaxEigenpair"; version="0.1.0"; sha256="0729yphyvqy7i9mjx3swvijfhyrhh5y57qfwjwqwc4ncs18wm72r"; depends=[]; };
-  PracTools = derive2 { name="PracTools"; version="1.1"; sha256="19yyhri8wr7ki62zhl9bhpf0wbx9fhrfph44j4l65kx68aphl22d"; depends=[]; };
+  PracTools = derive2 { name="PracTools"; version="1.2.1"; sha256="1viwmwis9awr7maprnaj0vdzc5rf6md7xlc9l7hnn51xmaa734ih"; depends=[]; };
   PreKnitPostHTMLRender = derive2 { name="PreKnitPostHTMLRender"; version="0.1.0"; sha256="1749cd734f4bf0n4068s2m617k6as8h9bwp44mm3la2xy3vjf5g1"; depends=[knitr rmarkdown XML]; };
   PreProcess = derive2 { name="PreProcess"; version="3.1.7"; sha256="1fxzkmrj76mc94xdj7a0nq450021i1jxkigmh5jhrmamkp5581jf"; depends=[oompaBase]; };
   PreciseSums = derive2 { name="PreciseSums"; version="0.3"; sha256="02w0pa9dd196sg6zg9w2fp4b0k6wibbw9rbvasr3aphh98kbd6ch"; depends=[]; };
@@ -3044,7 +3104,7 @@ in with self; {
   PredictionR = derive2 { name="PredictionR"; version="1.0-11"; sha256="1dljdbya93dirx715yqs4vz7hbbcwpgrsvyfgikkm2fj28nnn6k9"; depends=[fitdistrplus]; };
   PredictiveRegression = derive2 { name="PredictiveRegression"; version="0.1-4"; sha256="15vkisj3q4hinc3d537s8inhj3wk62q67qhy050xmp9j563ainmd"; depends=[]; };
   PresenceAbsence = derive2 { name="PresenceAbsence"; version="1.1.9"; sha256="17qn4ggkr5aqml45nkihj1j35y479ywkm1xcfkb2g8ky66jb0c0s"; depends=[]; };
-  PrevMap = derive2 { name="PrevMap"; version="1.5.1"; sha256="0nld41msrk85yhj54nfv86yws533bcyzz1zz9cb0dacnxvwvmjz5"; depends=[geoR lme4 Matrix maxLik numDeriv pdist raster splancs truncnorm]; };
+  PrevMap = derive2 { name="PrevMap"; version="1.5.2"; sha256="0nr65vfdzny3y3mly7slm903h4llnn3rxbxz3ml07pnighf7rr3q"; depends=[geoR lme4 Matrix maxLik numDeriv pdist raster splancs truncnorm]; };
   PriorCD = derive2 { name="PriorCD"; version="0.1.0"; sha256="1mb50w2i8sfxjzqd5xnfysn3jnzkkyv6l8algxnp0xpyhcq41pfs"; depends=[dplyr igraph ROCR visNetwork]; };
   PriorGen = derive2 { name="PriorGen"; version="1.1.2"; sha256="0qvdqqdy7wdwwcq95mkgfyf7xf6xlpwdfs3gq299yyv2ba57flnm"; depends=[rootSolve]; };
   PrivateLR = derive2 { name="PrivateLR"; version="1.2-22"; sha256="0d142fa3wk7yadvs8jszajs6hq9m03p0j6h5r4pbw7j0d1l72hgc"; depends=[]; };
@@ -3056,7 +3116,7 @@ in with self; {
   ProbForecastGOP = derive2 { name="ProbForecastGOP"; version="1.3.2"; sha256="0fnw3g19lx4vs8vmn4qdirvybkiy2cxkhwkn9qa3phz45iixnvx4"; depends=[fields RandomFields]; };
   ProbYX = derive2 { name="ProbYX"; version="1.1-0"; sha256="0dphf6jr72l235v3yjhwi8bqmv6ac7yrbyfwhx4qjrrcdnsb7qhl"; depends=[rootSolve]; };
   ProbitSpatial = derive2 { name="ProbitSpatial"; version="1.0"; sha256="0pq5bsjd00qc83c7x8vlpsxdksywlnfg7rlsvb6j21fz9wi3hpas"; depends=[Matrix numDeriv RANN Rcpp RcppEigen speedglm]; };
-  ProfessR = derive2 { name="ProfessR"; version="2.3-5"; sha256="0q04mjfr2g2l2md8c7nampivg6z4wjv6nfcq13b94sgixak0ww6f"; depends=[RPMG]; };
+  ProfessR = derive2 { name="ProfessR"; version="2.4-1"; sha256="1wsbx0dsygc1ipzhgs1pd0lhdb0qvp4ydqzwarn6zv27rzf4p3bd"; depends=[RPMG]; };
   ProfileLikelihood = derive2 { name="ProfileLikelihood"; version="1.1"; sha256="16cdp1nimhg1sd2x0qbffm7clgk54p0838y688z8lnsrjaggmb0x"; depends=[MASS nlme]; };
   ProgGUIinR = derive2 { name="ProgGUIinR"; version="0.0-4"; sha256="0srhk42ssx4i096sbs4jacqjsc1ffqjxjgvpplzshlqaby1h3795"; depends=[ggplot2 MASS svMisc]; };
   ProjectManagement = derive2 { name="ProjectManagement"; version="1.2.1"; sha256="08hkb7hz0hj40ambg5li47ipjz1w2aybmcxygn5yknkl2k52j3gy"; depends=[GameTheory kappalab lpSolveAPI plotly triangle]; };
@@ -3076,12 +3136,14 @@ in with self; {
   PubMedWordcloud = derive2 { name="PubMedWordcloud"; version="0.3.6"; sha256="1wfp1fpr4an7psrwidx38brvhvghmvfsgjy4gdx81p1bdsdn2kw2"; depends=[RColorBrewer RCurl stringr tm wordcloud XML]; };
   PublicationBias = derive2 { name="PublicationBias"; version="1.0.0"; sha256="1bl7msds7q8d08njgslv6ly631cmrp5yabqcayrpc852p2335q4l"; depends=[dplyr ggplot2 metafor MetaUtility Rdpack robumeta]; };
   Publish = derive2 { name="Publish"; version="2018.04.17"; sha256="0dbcql2mi2qsxzcgcqa58yqynfq1800fa06ikyay2dm6gdyf0apq"; depends=[data_table lava multcomp prodlim survival]; };
+  PupilPre = derive2 { name="PupilPre"; version="0.6.0"; sha256="1ngrqrnlm1bpd5krjbxyhvga2mmwqd11dv8djzpgykl4mh41szh9"; depends=[dplyr ggplot2 mgcv rlang robustbase shiny signal tidyr VWPre zoo]; };
   PurBayes = derive2 { name="PurBayes"; version="1.3"; sha256="0nbm4cyrwfbwwbjbjkylr86cshaqbvbif6dkp4fag8kbcgyyx5qh"; depends=[rjags]; };
+  Pursuit = derive2 { name="Pursuit"; version="1.0.0"; sha256="0wcg9zcln2mpqdyi4k4fcah6s1n0xd0jvc98vl4p1gyygy1x2vdr"; depends=[MASS]; };
   PwrGSD = derive2 { name="PwrGSD"; version="2.3.1"; sha256="0rzpapjn4nvrqrnjqbfsg9az1mz78q20rv43243sf58nbqw08k6f"; depends=[survival]; };
   PxWebApiData = derive2 { name="PxWebApiData"; version="0.3.0"; sha256="1c2liqh1asd0mk4cvrwpl4pdid2rqfxrma284ah4hwr6sah5lk6w"; depends=[httr jsonlite pxweb rjstat]; };
   PythonInR = derive2 { name="PythonInR"; version="0.1-7"; sha256="1vrvf68sl2k25y3ppjwpi2j4952aq4k76r92qnq3fj92789ndyqv"; depends=[pack R6]; };
   QAIG = derive2 { name="QAIG"; version="0.1.5"; sha256="1cchf5x7wzc3mc6xzvq14kmd9yxr9kq237s8af4xqaz1pv0b093j"; depends=[Formula stringr]; };
-  QBAsyDist = derive2 { name="QBAsyDist"; version="0.1.1"; sha256="03rg1lcbsv4cnj1ddsmqa9qszqi3r8igw18zf71qc29784701l4k"; depends=[ald Deriv GoFKernel locpol nloptr quantreg zipfR]; };
+  QBAsyDist = derive2 { name="QBAsyDist"; version="0.1.2"; sha256="1yql29npaq9yz02bv3hqf5m2mhscjms7qqf4vlaxm8s665rxcxad"; depends=[ald Deriv GoFKernel locpol nloptr quantreg scdensity zipfR]; };
   QCA = derive2 { name="QCA"; version="3.5"; sha256="0bbyza538a8bwhjxnbc38l7svjvp3dbr1ykabx79y8zwzqn8887g"; depends=[admisc fastdigest shiny venn]; };
   QCAfalsePositive = derive2 { name="QCAfalsePositive"; version="1.1.1"; sha256="03qzb6vdnbri52gfx3laz14988p2swdv9m8i5z7gpsv3f3bjrxbp"; depends=[]; };
   QCApro = derive2 { name="QCApro"; version="1.1-2"; sha256="1glfb1x1h05cs07nq5glqvlil58wp3c0kaxi1l7k94y797i8r7hq"; depends=[lpSolve]; };
@@ -3097,7 +3159,6 @@ in with self; {
   QHOT = derive2 { name="QHOT"; version="0.1.0"; sha256="02z0n2jawd6m7bvyvpcy0j13p1c0zm036g62n56xva18qnq5c9lb"; depends=[]; };
   QLearning = derive2 { name="QLearning"; version="0.1.1"; sha256="1bx77yxsnzh0ny3ghala5fw54lxzrxqk9s32qk3dzvfbyp4paggn"; depends=[]; };
   QPBoot = derive2 { name="QPBoot"; version="0.2"; sha256="1nxmxayfq2xcjzix080mkc8y52wl3vs0rcwdl8lmhwfawjb4pap5"; depends=[abind quantspec rugarch]; };
-  QPot = derive2 { name="QPot"; version="1.5"; sha256="0q80v3nssrd95z976k9w3j2yip2m2fvlzggpajwj3874vfr0jjva"; depends=[MASS]; };
   QQperm = derive2 { name="QQperm"; version="1.0.1"; sha256="06xhv54zgnx8i22j23a0dqxhh7my416idpkkwq93qd1rdzgamzc8"; depends=[]; };
   QRAGadget = derive2 { name="QRAGadget"; version="0.1.0"; sha256="0vmhbpfbbpbcs6s9zjam893yl54spbx4x4698c504g96hcc19kkp"; depends=[htmlwidgets leaflet magrittr miniUI raster scales shiny sp]; };
   QRM = derive2 { name="QRM"; version="0.4-13"; sha256="0zxhm1bdbs4jizd909vw9yjdn484vmcrwcmpk3a7gr4142q9kdjh"; depends=[gsl Matrix mgcv mvtnorm numDeriv Rcpp timeDate timeSeries]; };
@@ -3122,8 +3183,9 @@ in with self; {
   QuantTools = derive2 { name="QuantTools"; version="0.5.7"; sha256="069rvh4yfar5dh6aj6p0q61gasvs9wr72x9pnj00lvyjlnv06p5n"; depends=[data_table fasttime R6 Rcpp RCurl readxl]; };
   QuantifQuantile = derive2 { name="QuantifQuantile"; version="2.2"; sha256="01bdz8a6nhjil6n2z62x5g41v3d6md5v16g0ladsl5zc8raivqdq"; depends=[rgl]; };
   QuantileGradeR = derive2 { name="QuantileGradeR"; version="0.1.1"; sha256="1zwc6bg636gk8zll7wpznd3pzl611hcj2fmzp8b9505rra13p0g2"; depends=[]; };
+  QuantileNPCI = derive2 { name="QuantileNPCI"; version="0.9.0"; sha256="043lkg1pyaja7a4f9lmcwrvdjpfly2z378s15snwnxj8vb5pgr38"; depends=[]; };
   QuantumClone = derive2 { name="QuantumClone"; version="1.0.0.6"; sha256="1520jgkzp8g7gv7ggqhvlrdnpdyhygqjgsd1my5jq30afdqj6qmp"; depends=[DEoptim doParallel foreach fpc ggplot2 gridExtra NbClust optimx]; };
-  QuantumOps = derive2 { name="QuantumOps"; version="2.5.2"; sha256="0027s4kv3a7ly4hs2zykazlvwvgyfyw450cn51np3zghbkihg8aq"; depends=[]; };
+  QuantumOps = derive2 { name="QuantumOps"; version="2.5.3"; sha256="0kcfs3rg50a82spzh5c215c8s2ff0wpdk29yn3n96m3hj4ir7j77"; depends=[]; };
   Quartet = derive2 { name="Quartet"; version="1.0.2"; sha256="17xj05ysi46w3zh1s10gml7cll4w6zdsn9x1ak8rjf7hwszidskg"; depends=[ape memoise Rcpp Rdpack Ternary TreeSearch]; };
   QuasiSeq = derive2 { name="QuasiSeq"; version="1.0-10-2"; sha256="1mr43vys9l1n859lzlcakjrvjllybgrwl0p8mc28h7m87yjkj670"; depends=[edgeR mgcv pracma]; };
   R_SamBada = derive2 { name="R.SamBada"; version="0.1.1"; sha256="0fji3hgx7ad9xhir5811wq1cr5mdixfixhgn77xbhaz3x5v9249g"; depends=[gdsfmt SNPRelate]; };
@@ -3164,6 +3226,7 @@ in with self; {
   RADanalysis = derive2 { name="RADanalysis"; version="0.5.5"; sha256="1py07p24i1pky8wwyy8ajmkg6h2n7nbpxp1w6lrkiyl0p2kgjm20"; depends=[scales sfsmisc]; };
   RAHRS = derive2 { name="RAHRS"; version="1.0.2"; sha256="0s7vkmyc3yh62m2xbsvajgvi9xdw5x4irnp7rcllhqa7z9nj50c9"; depends=[pracma RSpincalc]; };
   RAM = derive2 { name="RAM"; version="1.2.1.7"; sha256="0aalswivpjs1glwf4yh3b79lch3n32fyj5xda55h3v7gzs7p0d7f"; depends=[ade4 ape data_table FD ggmap ggplot2 gplots gridExtra labdsv lattice MASS permute phangorn phytools plyr RColorBrewer reshape reshape2 RgoogleMaps scales vegan VennDiagram]; };
+  RAMClustR = derive2 { name="RAMClustR"; version="1.0.9"; sha256="0fw8gps8lyjffrqklfk8ps4fn8ail2m6b54q3805pcw27mb9jxml"; depends=[BiocManager dynamicTreeCut e1071 fastcluster ff gplots httr InterpretMSSpectrum jsonlite pcaMethods preprocessCore RCurl stringi stringr webchem xml2]; };
   RAMP = derive2 { name="RAMP"; version="2.0.1"; sha256="1n8h58j6v1xs6adrr4w4ha7pn1q2fh14dyg7zgpp2smv0j2b33dr"; depends=[]; };
   RAMpath = derive2 { name="RAMpath"; version="0.4"; sha256="0blixfmgiq22hd356hrp4vbhfkkgh0a58143nhirjx3sav9pxc1v"; depends=[ellipse lavaan MASS]; };
   RANKS = derive2 { name="RANKS"; version="1.0"; sha256="1lvaya9jlqrr9klqznw4fz5h5x0sw191ci74hpymb4gzhhxcbp27"; depends=[graph limma NetPreProc PerfMeas RBGL]; };
@@ -3182,7 +3245,7 @@ in with self; {
   RBF = derive2 { name="RBF"; version="1.0.0"; sha256="0q2k2ar9cd62cykg99r86cflx2nknlg32fhhsjay4xs191fapw8j"; depends=[]; };
   RBMRB = derive2 { name="RBMRB"; version="2.1.2"; sha256="1m6n2kfg83mlfy22k75hy5zjf547v0rdwk9w6l04yfyrr6himbr8"; depends=[data_table ggplot2 httr plotly rjson]; };
   RBPcurve = derive2 { name="RBPcurve"; version="1.2"; sha256="0zkfvnhm780vid4qqdrx9mnc6jxxrmrnq47pqvk35rm3m4l96782"; depends=[BBmisc checkmate mlr shape TeachingDemos]; };
-  RBesT = derive2 { name="RBesT"; version="1.4-0"; sha256="1n1gcmblv1fmf1prsndv1hvriizy0x27mjbpykiw7p151dyp8sv5"; depends=[assertthat bayesplot BH checkmate dplyr Formula ggplot2 mvtnorm Rcpp RcppEigen rstan StanHeaders]; };
+  RBesT = derive2 { name="RBesT"; version="1.5-3"; sha256="18a4f694aq0cn3psf6vqi74yp962hs2nd6bk1fg55s0x11p31spw"; depends=[assertthat bayesplot BH checkmate dplyr Formula ggplot2 mvtnorm Rcpp RcppEigen rstan StanHeaders]; };
   RBitmoji = derive2 { name="RBitmoji"; version="0.0.2"; sha256="1v9qj3vmqsvnccsy735nbflmd81183h2flm0f1ckd4kl08r2fr3f"; depends=[getPass httr jsonlite png RCurl]; };
   RBtest = derive2 { name="RBtest"; version="1.0"; sha256="1pyygx39r5dd81xqzqmxhkwapaq7pc5q1bp0gwx28cp4wi07mm6i"; depends=[mice nnet psych]; };
   RCA = derive2 { name="RCA"; version="2.0"; sha256="0pidb5czrf0dc3ywy6cwm5akgsc62pvf94kfyxibzmd1favykx1h"; depends=[gplots igraph]; };
@@ -3206,7 +3269,7 @@ in with self; {
   RCriteo = derive2 { name="RCriteo"; version="1.0.2"; sha256="1vyhnblw9zr5h6c25lf76p9vn95k8vr0hpq1sjkccdwl9yvsyhfy"; depends=[httr plyr RCurl XML]; };
   RCrypto = derive2 { name="RCrypto"; version="0.1.0"; sha256="1lw7hq5ks36fixk0g3gcy4nw21ygwc14jq840hnhyds4glywfpvm"; depends=[dplyr httr jsonlite]; };
   RCurl = derive2 { name="RCurl"; version="1.95-4.12"; sha256="1x2z708y89fjphhzs76lycs5rmh5i411wallmhyq4h6zmzppjdrr"; depends=[bitops]; };
-  RCzechia = derive2 { name="RCzechia"; version="1.4.1"; sha256="0dbira0qw64dpichfshb84f0fwd3nki5fcmdxcqcbnl20fp8qnsn"; depends=[curl httr jsonlite lwgeom magrittr sf]; };
+  RCzechia = derive2 { name="RCzechia"; version="1.4.2"; sha256="0vxmng4mlc8wdqzk9ck920z3bnh53wdax19kc12k06amclyv8lvm"; depends=[curl httr jsonlite lwgeom magrittr sf]; };
   RDFTensor = derive2 { name="RDFTensor"; version="1.1"; sha256="1xbar13snwyls6rva91bs0632zplfc2qcqlwf7h07r8798m3234s"; depends=[Matrix pracma]; };
   RDIDQ = derive2 { name="RDIDQ"; version="1.0"; sha256="09gincmxv20srh4h82ld1ifwncaibic9b30i56zhy0w35353pxm2"; depends=[]; };
   RDML = derive2 { name="RDML"; version="1.0"; sha256="13ly1p42njbcygwvkyii8sjqbsywjy5w5g1kd7m8kswi5dsk3qqv"; depends=[checkmate data_table lubridate pipeR R6 readxl rlist stringr xml2]; };
@@ -3220,10 +3283,9 @@ in with self; {
   REAT = derive2 { name="REAT"; version="3.0.1"; sha256="1lp9z2pylf4klfw8j1wldx281dcvfdbk4jrg98xda34akqzb2hy1"; depends=[]; };
   REBayes = derive2 { name="REBayes"; version="1.8"; sha256="1mvi163djhnq3c711mx4a6mh1vmlcj80562czx12z2gmx13810nh"; depends=[Matrix reliaR]; };
   RECA = derive2 { name="RECA"; version="1.7"; sha256="1xikj20flqajpkw4wyynmqd1pafbylzwfrmc8bz9pqgggjjhrqql"; depends=[]; };
-  REDCapR = derive2 { name="REDCapR"; version="0.9.8"; sha256="14psw0sxlyig4nf968n997djwf80hgy5ia2g0bp8rdpn8lrj01g6"; depends=[data_table dplyr httr magrittr readr tibble tidyr]; };
+  REDCapR = derive2 { name="REDCapR"; version="0.10.2"; sha256="0rdni325k0641yfv4g9l1szg1bl48767n6r1xkh8q3fnvqaqwnrg"; depends=[dplyr httr magrittr readr rlang tibble tidyr]; };
   REEMtree = derive2 { name="REEMtree"; version="0.90.3"; sha256="01sp36p12ky8vgsz6aik80w4abs70idr9sn4627lf94r92wwwsbc"; depends=[nlme rpart]; };
   REGENT = derive2 { name="REGENT"; version="1.0.6"; sha256="1f2sjqkhw3rbmwbcmx7l7imj696kblisi8y3fz77xygbcbxa6rmq"; depends=[]; };
-  REIDS = derive2 { name="REIDS"; version="0.1.0"; sha256="10mznsba9bmv9754zg6pzrwlrgkcki7zfr995nrlsg5fjphqyqg9"; depends=[aroma_affymetrix aroma_core biomaRt data_table GenomeGraphs lmtest MCMCpack RColorBrewer]; };
   REPLesentR = derive2 { name="REPLesentR"; version="0.3.0"; sha256="1cfbf6r9p09ccia2f3pc2fz178zvrm3rwa6affyqr3gygpd1smb4"; depends=[dat knitr modules]; };
   REPPlab = derive2 { name="REPPlab"; version="0.9.4"; sha256="1pf8zrjdzziyq2lw31p1ij7cn4j7pf659ygxv8wpfnmcmpaqbc45"; depends=[lattice LDRTools rJava]; };
   REPTILE = derive2 { name="REPTILE"; version="1.0"; sha256="11swy4jrmmb0xjjxm1wyxd628fxxcqnialvijdrjwjpdbvraz4gq"; depends=[doParallel flux foreach optparse randomForest]; };
@@ -3234,7 +3296,7 @@ in with self; {
   REdaS = derive2 { name="REdaS"; version="0.9.3"; sha256="09mmcvzgsxvrcq7sq3pw81pxgb1493p8lx8p5hhz8i42vshza6pn"; depends=[]; };
   REddyProc = derive2 { name="REddyProc"; version="1.2"; sha256="1jwmxr9xl45n7r3h6h634lw81j07bn26nhjhwww5nnwwyyylcn4b"; depends=[dplyr magrittr mlegp purrr Rcpp rlang solartime tibble]; };
   REddyProcNCDF = derive2 { name="REddyProcNCDF"; version="1.1.4"; sha256="099f4mzqj7pjlrs8rdjg44mjm0058x3pj2imrfvk892hmlk4r53p"; depends=[REddyProc]; };
-  REndo = derive2 { name="REndo"; version="2.2.1"; sha256="10nbj5s4skk7522nm14s45k9z4zcaxnadl41z3mgmlwhcsdrv3ap"; depends=[AER corpcor data_table Formula lme4 Matrix mvtnorm optimx]; };
+  REndo = derive2 { name="REndo"; version="2.3.0"; sha256="1xgladcbdhb5shx0wbj470dv6vzi72dpdphrsf8j0p1dz806fp5i"; depends=[AER corpcor data_table Formula lme4 Matrix mvtnorm optimx]; };
   RFGLS = derive2 { name="RFGLS"; version="1.1"; sha256="13ggxj74h5b2hfhjyc50ndxznkvlg18j80m78hkzwh25d3948fsk"; depends=[bdsmatrix Matrix]; };
   RFLPtools = derive2 { name="RFLPtools"; version="1.6"; sha256="1hl2crg7jl266zac41xvx151h7kl52346wnlvd8hba64s4s4apay"; depends=[RColorBrewer]; };
   RFOC = derive2 { name="RFOC"; version="3.4-6"; sha256="0cs5wmpvrlag9aisbfiwkvwcb3skv5z4sawl30krmsq49mzj7yhd"; depends=[GEOmap MASS RPMG RSEIS splancs]; };
@@ -3253,6 +3315,7 @@ in with self; {
   RGENERATEPREC = derive2 { name="RGENERATEPREC"; version="1.2"; sha256="1w28yfzk3ilbz1r9fsc76cigyrnzzhsfm3a81ff8g26za7cb8vjp"; depends=[blockmatrix copula Matrix RGENERATE RMAWGEN stringr]; };
   RGF = derive2 { name="RGF"; version="1.0.6"; sha256="11pnbiyp39r95c8ajj2jyxz4h1zf6fi8ki78rmn4vp7xm2bl3zff"; depends=[Matrix R6 reticulate]; };
   RGIFT = derive2 { name="RGIFT"; version="0.1-5"; sha256="1745fs4bq0ss39fiwljspvrmnkgbbpc1fjvhvcrsmp2iizq12sgn"; depends=[]; };
+  RGISTools = derive2 { name="RGISTools"; version="0.9.7"; sha256="1bij314qv9lnbb9rjxb37fhp97nz8sqlbqajdbixxpvsnp4mx2k0"; depends=[curl fields gdalUtils httr magick raster Rdpack rjson rvest sp urltools XML xml2]; };
   RGeckoboard = derive2 { name="RGeckoboard"; version="0.1-5"; sha256="0h7x3kdmlba9siwcnf313ajmz2jsmyhl7pndzs7qaqina3hkl46r"; depends=[httr jsonlite]; };
   RGenData = derive2 { name="RGenData"; version="1.0"; sha256="124h2qvp0f6cil7zf4ln3n0jlqcfzdwbihzfaklk2lxxn7gq4mbi"; depends=[]; };
   RGenetics = derive2 { name="RGenetics"; version="0.1"; sha256="0x5sspd67hh08qm62whlnnd838m0np29q3bfzgwp6j85lhil3jrx"; depends=[]; };
@@ -3272,6 +3335,7 @@ in with self; {
   RI2by2 = derive2 { name="RI2by2"; version="1.3"; sha256="0smc0fb9anq5ih9zx2slfbqyx02njm0hc7g22gpfggskmxf2l509"; depends=[gtools Rcpp]; };
   RIA = derive2 { name="RIA"; version="1.4.2"; sha256="0i7z16viwgdsdnlkxq44p5l492asxv7ghn8005hlvpyxqihazkqw"; depends=[nat oro_dicom oro_nifti]; };
   RIFS = derive2 { name="RIFS"; version="0.1-5"; sha256="0705dhirh7bhy2yf3b1mpk3m7lggg4pwy640lvaspwaxkd6zac5w"; depends=[]; };
+  RISCA = derive2 { name="RISCA"; version="0.8"; sha256="0z6wq5bmfx6zrj7cnd7y0x8h7qkz4njcvb8jb1mil92zx2z47d43"; depends=[date MASS mvtnorm nlme relsurv riskRegression statmod survival]; };
   RISmed = derive2 { name="RISmed"; version="2.1.7"; sha256="08dmkkxsmwp9b4h2g1bbx03cijn793fsnzkmbima8x9d42vxnm1l"; depends=[]; };
   RIdeogram = derive2 { name="RIdeogram"; version="0.1.1"; sha256="17pn5hi661j2pzr2c2m2h9r9x6bd5dl9q7xjdz8s0jf9fka0r8jr"; depends=[ggplot2 grImport2 rsvg scales]; };
   RImageJROI = derive2 { name="RImageJROI"; version="0.1.1"; sha256="0a4sa60klbpl31qxxvjjbksdhvs3vwm9na1v7014v93fzxy6bjas"; depends=[spatstat]; };
@@ -3283,7 +3347,7 @@ in with self; {
   RJDBC = derive2 { name="RJDBC"; version="0.2-7.1"; sha256="1d36js3kwlghsjxfhv7rl8nvg210hxwrx8sdxrxb0inwlqsash25"; depends=[DBI rJava]; };
   RJDemetra = derive2 { name="RJDemetra"; version="0.1.3"; sha256="1j5wxia9j2847rkca3y09lv6b5qs8m3nvvks492kwv1d5vdjlxxv"; depends=[rJava]; };
   RJSDMX = derive2 { name="RJSDMX"; version="2.1-0"; sha256="1z1fhm6as9m35v11n5npv3mlaaal7w5c04g4yl2p26ljsmssfbsh"; depends=[rJava zoo]; };
-  RJSONIO = derive2 { name="RJSONIO"; version="1.3-1.2"; sha256="0zid1573iv25zsa93ni9r6zhbli9ymc84yvlcxnkg1j1q3vih3jm"; depends=[]; };
+  RJSONIO = derive2 { name="RJSONIO"; version="1.3-1.3"; sha256="1f92dpaw1mz86mqr16jvmzmjlpzacj9vwq0gafx3bsfnqkd9fpmw"; depends=[]; };
   RJSplot = derive2 { name="RJSplot"; version="2.5"; sha256="0p2zqbq29pfjl703wqqjzgmif7yfzz7l8rzarjf5axkdy7w7fcyl"; depends=[]; };
   RJaCGH = derive2 { name="RJaCGH"; version="2.0.4"; sha256="1a8nd0w73dvxpamzi2addwr6q3rxhnnpa1girnlwbd1j1dll0bz6"; depends=[]; };
   RJafroc = derive2 { name="RJafroc"; version="1.2.0"; sha256="19d6k8294g9w3i2d8mivd4p1sczhq9rc26mhz7ywz0x5fxqcpx77"; depends=[bbmle binom dplyr ggplot2 mvtnorm numDeriv openxlsx Rcpp stringr]; };
@@ -3294,12 +3358,13 @@ in with self; {
   RKEELjars = derive2 { name="RKEELjars"; version="1.0.19"; sha256="1a879b0xq5jk7r2pf4n41nm0c4himl4yqw083xh2ha4qdhab5kq0"; depends=[downloader]; };
   RKHSMetaMod = derive2 { name="RKHSMetaMod"; version="1.1"; sha256="1h8gqqfmlrzyj4n997yn13vqpaw2kwzl45gscy3fdhskzmyg0ss3"; depends=[Rcpp RcppEigen RcppGSL]; };
   RKUM = derive2 { name="RKUM"; version="0.1.1"; sha256="1w0v6l61dm7xixnyywsc7xziixz7k9r1ja26zcy77nry5kn6v60q"; depends=[]; };
+  RKelly = derive2 { name="RKelly"; version="1.0"; sha256="0mkpc95j67rg2gcj2fc4w8kv4v31cpiyvh660y8kc2fjr5q4aj3l"; depends=[]; };
   RKlout = derive2 { name="RKlout"; version="1.0"; sha256="17mx099393b1m9dl3l5xjcpzmb9n3cpjghb90m9nidccxkhacmqf"; depends=[RCurl]; };
   RLRsim = derive2 { name="RLRsim"; version="3.1-3"; sha256="1r0xqay3jfg435dh9fqc6yy73wjffp658da194rx63vpfhshgz8w"; depends=[lme4 mgcv nlme Rcpp]; };
   RLT = derive2 { name="RLT"; version="3.2.2"; sha256="1a8cip975z99g8ljng4y86wv1gf1xwg0sqnxz79wj6zxpw8fk37c"; depends=[]; };
   RLeafAngle = derive2 { name="RLeafAngle"; version="1.0"; sha256="1anks22hn6qpac556p99kilkhc80h572dvcyz3wj1nqffdrhgrh3"; depends=[]; };
   RLogicalOps = derive2 { name="RLogicalOps"; version="0.1"; sha256="1qyn80x3x3bb5wgzyzw6pxs8a6q26yq1fkmkz7f5wywsnrj8hzfj"; depends=[rstackdeque stringr]; };
-  RLumModel = derive2 { name="RLumModel"; version="0.2.3"; sha256="059nqbvy13jjgzhp4n9afqkc3dbv06aml5v5ffkhpx8kcmv48xp1"; depends=[deSolve Luminescence Rcpp RcppArmadillo]; };
+  RLumModel = derive2 { name="RLumModel"; version="0.2.4"; sha256="08p7pkcwk9nfxvhpbk26mw76x51fqwnqwwh4sxj04sa5q90mwfpw"; depends=[deSolve Luminescence Rcpp RcppArmadillo]; };
   RLumShiny = derive2 { name="RLumShiny"; version="0.2.2"; sha256="0rwl555564ccw4pdzya88s3h3q30iq5dmi77141ji8ir91x4rz3g"; depends=[data_table DT googleVis knitr Luminescence RCarb readxl rhandsontable rmarkdown shiny shinydashboard shinyjs]; };
   RM_weights = derive2 { name="RM.weights"; version="2.0"; sha256="1by1z7gwwx0jjhhvsjkr7f6m7n0x43bj080ah5275cja7xqr5nm6"; depends=[Hmisc psychotools]; };
   RM2 = derive2 { name="RM2"; version="0.0"; sha256="1v57nhwg8jrpv4zi22fhrphw0p0haynq13pg9k992sb0c72dx70a"; depends=[msm]; };
@@ -3319,7 +3384,9 @@ in with self; {
   RMark = derive2 { name="RMark"; version="2.2.6"; sha256="0ihidwk7fbjjh6qmrd3rjmk2yjrjdf7a53sdnh6ynkjkzlqb2gr7"; depends=[coda matrixcalc msm]; };
   RMediation = derive2 { name="RMediation"; version="1.1.4"; sha256="19idqx0hwljbcfrpqwa81k7cxbd8kv77ji8yi4n4p7517jbkzma6"; depends=[e1071 lavaan MASS]; };
   RMixpanel = derive2 { name="RMixpanel"; version="0.7-1"; sha256="1xwmmfvky49n1l0w3kwcyaf2h4rhzz4k5icjwvpc90fqk8sxib6a"; depends=[base64enc jsonlite RCurl uuid]; };
-  RMixtCompIO = derive2 { name="RMixtCompIO"; version="4.0.0"; sha256="09s1qpism2a9ixkza53jiny9k5ysyq8vq3hvcc23nmnjncaanar2"; depends=[BH doParallel foreach Rcpp RcppEigen]; };
+  RMixtComp = derive2 { name="RMixtComp"; version="4.0.2"; sha256="005fmns31m51p9480bxiahllxpg530j2jxkg2vadw761h61s90al"; depends=[ggplot2 plotly RMixtCompIO RMixtCompUtilities]; };
+  RMixtCompIO = derive2 { name="RMixtCompIO"; version="4.0.1"; sha256="0wbzizrhjazjkn37g72av7h3w2g08530p82casg58m8mzmkcgpfj"; depends=[BH doParallel foreach Rcpp RcppEigen]; };
+  RMixtCompUtilities = derive2 { name="RMixtCompUtilities"; version="4.0.0"; sha256="1nyr5llwzqdfv7556ksmx3s17f884wpj19lp36x3zcjx47z98lyw"; depends=[ggplot2 plotly scales]; };
   RMySQL = derive2 { name="RMySQL"; version="0.10.17"; sha256="1xamf99ih44dvaxg5x4ivj0hkqssmabgqd7gh8b8q1srw7yg8kbm"; depends=[DBI]; };
   RNAseqNet = derive2 { name="RNAseqNet"; version="0.1.2"; sha256="07wk0i8iz3cvkiqawxhm61g3nka8adw0zrrv60zx329gg49w0ycl"; depends=[ggplot2 glmnet hot_deck igraph PoiClaClu]; };
   RNAsmc = derive2 { name="RNAsmc"; version="0.4.0"; sha256="17gkhmnrxa1zwh6qhc0x48smgyq35g5gdb4wv0m5pnbyhkqzs7sq"; depends=[RRNA]; };
@@ -3338,7 +3405,7 @@ in with self; {
   RNetLogo = derive2 { name="RNetLogo"; version="1.0-4"; sha256="1z7jp454k197c0zbkn64zmf25wadkiznv3w2csgiz917cbx6xcn1"; depends=[igraph rJava]; };
   RNewsflow = derive2 { name="RNewsflow"; version="1.1.1"; sha256="1vigzkyh8p6x4hzrmcsbvv2jk3pz39kix6b12xzzllkvi1kq784q"; depends=[data_table igraph Matrix quanteda Rcpp RcppEigen RcppProgress scales slam stringi tm wordcloud]; };
   RNifti = derive2 { name="RNifti"; version="0.11.1"; sha256="0jcgdg5k2swmi57aqj347kfi1fc4nvag7pxdfz61kc0vqqamm0wg"; depends=[Rcpp]; };
-  RNiftyReg = derive2 { name="RNiftyReg"; version="2.6.6"; sha256="0a1f2nzlw1w9hd8kdiqal1kz8jabc5wvc5l9w5z1pjfgsry4jy75"; depends=[ore Rcpp RcppEigen RNifti]; };
+  RNiftyReg = derive2 { name="RNiftyReg"; version="2.6.7"; sha256="1qx6igv0kdja2c139gbs42cwfjwj7ifcxxlswydvja03iz3k53wz"; depends=[ore Rcpp RcppEigen RNifti]; };
   ROAuth = derive2 { name="ROAuth"; version="0.9.6"; sha256="0vhsp8qybrl94898m2znqs7hmlnlbsh8sm0q093dwdb2lzrqww4m"; depends=[digest RCurl]; };
   ROC632 = derive2 { name="ROC632"; version="0.6"; sha256="0vgv4rclvb79mfj1phs2hmxhwchpc5rj43hvsj6bp7wv8cahfg5g"; depends=[penalized survival survivalROC]; };
   ROCR = derive2 { name="ROCR"; version="1.0-7"; sha256="1jay8cm7lgq56i967vm5c2hgaxqkphfpip0gn941li3yhh7p3vz7"; depends=[gplots]; };
@@ -3346,7 +3413,7 @@ in with self; {
   ROCit = derive2 { name="ROCit"; version="1.1.1"; sha256="1bip1zz5chm06pfikkscahph2clsaf9rhhpsla6vmvpfy0d8p070"; depends=[]; };
   ROCt = derive2 { name="ROCt"; version="0.9.5"; sha256="0f7day0rv62ggm1nc7qkh45r6svr84mdk7xxpdf09pi4lbdx0rm6"; depends=[date relsurv survival timereg]; };
   ROCwoGS = derive2 { name="ROCwoGS"; version="1.0"; sha256="029nramxwhzqim315g1vkg1zsszzkic28w6ahwg9n7bk9d08adzk"; depends=[]; };
-  RODBC = derive2 { name="RODBC"; version="1.3-15"; sha256="0m37b5ccdh4imbhmk7gj795fys2pcb9d0zx0xx2qanfrf54gk6kk"; depends=[]; };
+  RODBC = derive2 { name="RODBC"; version="1.3-16"; sha256="0fcnszrkk7llz26wccs97glddw793i0f9bd7rwxrld24vn1lng92"; depends=[]; };
   RODBCDBI = derive2 { name="RODBCDBI"; version="0.1.1"; sha256="0jkcc1lm8drsx1pkfj5h6rlbr98cgpvbf9ndzdwr048f3s8gd26i"; depends=[DBI RODBC]; };
   RODBCext = derive2 { name="RODBCext"; version="0.3.1"; sha256="06ky97k93bbrlxm4fg770mnz6yqp2zzgwmvzdqrpanfbg7qkfwwn"; depends=[RODBC]; };
   RODM = derive2 { name="RODM"; version="1.1"; sha256="0cyi2y3lsw77gqxmawla5jlm4vnhsagh3ykdgb6izxslc4j2fszx"; depends=[RODBC]; };
@@ -3386,10 +3453,11 @@ in with self; {
   ROracle = derive2 { name="ROracle"; version="1.3-1"; sha256="07zqzwaq5iqkjcmns2ahl1l71xjlznialb3dbyl4lwsh3p3fhf2n"; depends=[DBI]; };
   RPANDA = derive2 { name="RPANDA"; version="1.6"; sha256="02pf0j6nrv12jlpyn5fb81hvwllsxx9g88p5cdcvwdldwmjhralb"; depends=[ape cluster coda corpcor deSolve fields fpc geiger glassoFast igraph Matrix mvMORPH mvtnorm phytools picante pracma pspline pvclust Rmpfr TESS]; };
   RPCLR = derive2 { name="RPCLR"; version="1.0"; sha256="03kpyszsjb656lfwx2yszv0a9ygxs1x1dla6mpkhcnqw00684fab"; depends=[MASS survival]; };
+  RPEGLMEN = derive2 { name="RPEGLMEN"; version="1.0"; sha256="0c5qgfwk2nnkrxhy7y5k197wvi0n1dgnfw5xyccw4a3bw6wa7yd0"; depends=[PerformanceAnalytics Rcpp RcppEigen RPEIF]; };
   RPEIF = derive2 { name="RPEIF"; version="1.0"; sha256="13psw9sjpqq55vqf09ja4xkhpb6mp9zpzbka40v2gzxr503n69rq"; depends=[ggplot2 PerformanceAnalytics Rcpp RcppArmadillo RobStatTM xts zoo]; };
   RPEXE_RPEXT = derive2 { name="RPEXE.RPEXT"; version="0.0.1"; sha256="0m5ml8ywxrf66mjz6m3xp1lajd7wdq9g7xsaln8n7ykq7h5615fc"; depends=[]; };
   RPEnsemble = derive2 { name="RPEnsemble"; version="0.4"; sha256="0y9g22swcz0m5jbzi87ahxw27fb3jlf3iwvxb73kkzixqlvksw9y"; depends=[class MASS]; };
-  RPMG = derive2 { name="RPMG"; version="2.2-2"; sha256="1hyqhyn8g43cpdvh3iyrf12dbyafp6gv64hb53hr0h1094hrvz81"; depends=[]; };
+  RPMG = derive2 { name="RPMG"; version="2.2-3"; sha256="1di2bcf58z6gc3xknzx35znsjsy1714swvxkdhlq1ljidbdbmmbl"; depends=[]; };
   RPMM = derive2 { name="RPMM"; version="1.25"; sha256="1j48dh434wfhfzka0l21w6f73qlwfm70r9gdddhn504i2d5m4jph"; depends=[cluster]; };
   RPPairwiseDesign = derive2 { name="RPPairwiseDesign"; version="1.0"; sha256="0k2vh698rhs5a0b5vhyvrnnwqnagdzs591zx6hn9vbmm8rm4y1dm"; depends=[]; };
   RPPanalyzer = derive2 { name="RPPanalyzer"; version="1.4.5"; sha256="0cf4mb7mjp7x3k7083c8n8fjbvrmcgq359wh6pdyj817mgkanqzv"; depends=[Biobase gam ggplot2 gplots Hmisc lattice limma quantreg]; };
@@ -3397,7 +3465,7 @@ in with self; {
   RPostgreSQL = derive2 { name="RPostgreSQL"; version="0.6-2"; sha256="1mdhw5821v2h7hpa53v10wz53k4i90r0vb6a3dia5gq8f9j1h088"; depends=[DBI]; };
   RPostgres = derive2 { name="RPostgres"; version="1.1.1"; sha256="1s25lkb69dkc5zk5ikbqa325jw5kfavghsq7s26mrcng4va9dz6i"; depends=[BH bit64 blob DBI hms plogr Rcpp withr]; };
   RPresto = derive2 { name="RPresto"; version="1.3.3"; sha256="0nsqva6k9b9kdv7y7xjbanr3r1bcn28xln2xcv753xqawmsmiv1r"; depends=[DBI httr jsonlite openssl Rcpp stringi]; };
-  RProbSup = derive2 { name="RProbSup"; version="2.0"; sha256="0rmfr2pwfy6wx4mfjlj56k1fjlk5pvf98a82f2z5wzv9wb6ddzi5"; depends=[]; };
+  RProbSup = derive2 { name="RProbSup"; version="2.1"; sha256="0lmv4x235xiykc8jfnp15l4yypm99yz6spsnaxacp49y2aw23jpy"; depends=[]; };
   RProtoBuf = derive2 { name="RProtoBuf"; version="0.4.14"; sha256="1jn288796g61sfffnrfm0nm6igyv0yixlb09yhw8fqih7qg14lnx"; depends=[Rcpp RCurl]; };
   RPtests = derive2 { name="RPtests"; version="0.1.4"; sha256="1r30pslbjq3dip41la81jlin2vhxdmayg902x9ryjy554awfgh7j"; depends=[glmnet randomForest Rcpp]; };
   RPublica = derive2 { name="RPublica"; version="0.1.3"; sha256="1w2pn1g44a00ls8kkzj53a739pq6vzp38px2k0yh10rlzimmb21l"; depends=[curl httr jsonlite]; };
@@ -3406,7 +3474,7 @@ in with self; {
   RQDA = derive2 { name="RQDA"; version="0.3-1"; sha256="1kqax4m4n5h52gi0jaq5cvdh1dgl0bvn420dbws9h5vrabbw1c1w"; depends=[DBI gWidgets gWidgetsRGtk2 igraph RGtk2 RSQLite]; };
   RQEntangle = derive2 { name="RQEntangle"; version="0.1.3"; sha256="178haddk8nnscy2vym3k2a3ca9lf6nl7rpjja8lxqdjninvhvwb2"; depends=[iterators itertools]; };
   RQGIS = derive2 { name="RQGIS"; version="1.0.4"; sha256="0x4jilj5nbikgkcg09913v3dgnfw0aqwwx66xajsfk5lqi6w5vjz"; depends=[raster RCurl readr reticulate rgdal sf sp stringr XML]; };
-  RQuantLib = derive2 { name="RQuantLib"; version="0.4.9"; sha256="1pirjgnf7yzddkidk1d0gbp6f1wlag6f1bzh1rmvm6c5zkww69nl"; depends=[Rcpp zoo]; };
+  RQuantLib = derive2 { name="RQuantLib"; version="0.4.10"; sha256="1x5dzszpx2i4572l55ax5zb308181dsv55mgvmss85w024y20140"; depends=[Rcpp zoo]; };
   RRF = derive2 { name="RRF"; version="1.9.1"; sha256="135adnf7cfs8gddmmmgmzarjzg0qfrd7l67367yhy2b1k0s5ng1w"; depends=[]; };
   RRI = derive2 { name="RRI"; version="1.0"; sha256="163imfrhx435fxw39pi4vj1fmk6g6cldlsgmwcpgfqmp45ycclpj"; depends=[Rcpp RcppArmadillo]; };
   RRNA = derive2 { name="RRNA"; version="1.0"; sha256="14rcqh95ygybci8hb8ays8ikb22g3850s9f3sgx3r4f0ky52dcba"; depends=[]; };
@@ -3420,15 +3488,14 @@ in with self; {
   RSADBE = derive2 { name="RSADBE"; version="1.0"; sha256="1nzpm88rrzavk0n8iflsx8r3s1xcry15n80zqdw6jijjycz10w1q"; depends=[]; };
   RSAGA = derive2 { name="RSAGA"; version="1.3.0"; sha256="1y1zhy2bxkfsv8vmnxjdg9i5rqkvs32kw8h5z1mclv953srgkpn9"; depends=[gstat magrittr plyr rgdal shapefiles stringr]; };
   RSAlgaeR = derive2 { name="RSAlgaeR"; version="1.0.0"; sha256="1hp0v2vkj9ixiv541d53kyl0ph3jsdc5w98r81gv5ck5ixrp6bxp"; depends=[cvTools ggplot2 hydroGOF lubridate mblm plyr]; };
-  RSCABS = derive2 { name="RSCABS"; version="0.9.3"; sha256="08ykkqx9rdx5s6wg2idxz35ddpsz1lir22vrjs92k51zq0jrkhv9"; depends=[gWidgets gWidgetsRGtk2 R2HTML RGtk2]; };
   RSCAT = derive2 { name="RSCAT"; version="1.0.0"; sha256="1axc2vks0prd2fz1aaa1bjlfn1plfzdr041wh27v97541vsjdw47"; depends=[ggplot2 gridExtra Metrics rJava shiny shinycssloaders shinyjs]; };
   RSDA = derive2 { name="RSDA"; version="2.0.8"; sha256="1lnqncjmqci6lbdm2pph6ankwb9vhwi7mvgjip2qvc2ydgyv6gy9"; depends=[abind dplyr FactoMineR ggplot2 ggpolypath glmnet lazyeval nloptr pander princurve purrr randomcoloR reshape RJSONIO rlang scales scatterplot3d sqldf stringr tibble tidyr tidyselect XML xtable]; };
   RSE = derive2 { name="RSE"; version="1.3"; sha256="1dvmj1zwkbp1dj9r8kcvbd8rpknfwfdqaqc5gfl82bh823w72099"; depends=[]; };
-  RSEIS = derive2 { name="RSEIS"; version="3.8-3"; sha256="1qrv41r17svz7dyzz1sik5zyqck29mzzxrjhj5q6mvrwag3x7fi5"; depends=[RPMG Rwave]; };
+  RSEIS = derive2 { name="RSEIS"; version="3.9-0"; sha256="16jmakdq6rkyw3cm1ilnaw3ycsg12544ml9gla7y8mgpbglxsn6i"; depends=[RPMG Rwave]; };
   RSGHB = derive2 { name="RSGHB"; version="1.2.2"; sha256="16s9iahbcdqykavm5cq8n76hlpfqlljl17xwh0vrz5ac7z4z3rdz"; depends=[MCMCpack]; };
   RSIP = derive2 { name="RSIP"; version="1.0.0"; sha256="1yddqbnz0av69l53y83m7rnznc42qz66fc3qrispzaajs7p9n8d7"; depends=[ncdf4 raster rasterVis rgdal sp]; };
   RSKC = derive2 { name="RSKC"; version="2.4.2"; sha256="0r9gpwhzscb6rbba3dg13p78pvskahgvsd59biag0shyii3xvwpm"; depends=[flexclust]; };
-  RSNNS = derive2 { name="RSNNS"; version="0.4-11"; sha256="0z27rgbqa1lsxvcqyl1456mb0pigvkrx099hdqv7zr4ax4k33547"; depends=[Rcpp]; };
+  RSNNS = derive2 { name="RSNNS"; version="0.4-12"; sha256="1fa32wrhv3q0sdgrcrqrazvvylbn83d75bw8d0ncjfspf7dgx3di"; depends=[Rcpp]; };
   RSNPset = derive2 { name="RSNPset"; version="0.5.3"; sha256="1llx6anwkl4as0hdyvmsrlg9z8mkn9p1qxgs6kqs39w87gyx0j36"; depends=[doRNG fastmatch foreach qvalue Rcpp RcppEigen]; };
   RSPS = derive2 { name="RSPS"; version="1.0"; sha256="0ynxhgnxsf27qm8r5d9lyd59zksnc3kvx35hy25vff8j3bg7fqgi"; depends=[gridExtra lattice plyr]; };
   RSQLite = derive2 { name="RSQLite"; version="2.1.2"; sha256="1inrhap5cs0wry2jbw42fx9wwxb3qdzlpy0ba4f6a29bs8jx9nk6"; depends=[BH bit64 blob DBI memoise pkgconfig plogr Rcpp]; };
@@ -3464,7 +3531,7 @@ in with self; {
   RTest = derive2 { name="RTest"; version="1.2.4"; sha256="1h6qvr87307yymzd7ily6xbp9x8jx8hm0b89pqfz9k4h1l4xvdbr"; depends=[base64 glue jsonlite magick magrittr rlang stringr testthat XML]; };
   RTextureMetrics = derive2 { name="RTextureMetrics"; version="1.1"; sha256="0d0mvpmcpd62cvqlajrqp32lnvpflyf9bqvdzly2v8v1kb8274fc"; depends=[]; };
   RTransProb = derive2 { name="RTransProb"; version="0.3.3"; sha256="1fl8ag7aizj7k7j5ypx632qa98jp3wp8z3mp5z490n1277ajzrkb"; depends=[caret chron e1071 expm MASS Matrix matrixStats neuralnet nnet pracma Rcpp RcppArmadillo zoo]; };
-  RTransferEntropy = derive2 { name="RTransferEntropy"; version="0.2.8"; sha256="03si7hsr4a0pq29r7pb2qp1h17qhk9id5lvx8x2kc6xpqacjsqx1"; depends=[future future_apply Rcpp]; };
+  RTransferEntropy = derive2 { name="RTransferEntropy"; version="0.2.12"; sha256="066wyama0gk81l6kc0n31cmf007i1975i7hzvf46qbldvhsc52mc"; depends=[future future_apply Rcpp]; };
   RTriangle = derive2 { name="RTriangle"; version="1.6-0.10"; sha256="07ya95gmv53i2argqwgad6wd4sslql2wl1rkvsmgsvmhsb4wp9hd"; depends=[]; };
   RUnit = derive2 { name="RUnit"; version="0.4.32"; sha256="1wc1gwb7yw7phf8b0gkig6c23klya3ax11c6i4s0f049k42r78r3"; depends=[]; };
   RVAideMemoire = derive2 { name="RVAideMemoire"; version="0.9-73"; sha256="1zjvvqdcczpnxkm6n3zxv8ysgn5x44k7w2b12yx01h2x71bwg1hg"; depends=[ade4 boot car cramer FactoMineR lme4 MASS mixOmics nnet pls pspearman vegan]; };
@@ -3481,7 +3548,7 @@ in with self; {
   RWekajars = derive2 { name="RWekajars"; version="3.9.3-1"; sha256="16syvpc9qfn19sjdp3jikmzccj198ybr8dar7fajfaqsfms2kgfw"; depends=[rJava]; };
   RWiener = derive2 { name="RWiener"; version="1.3-1"; sha256="0w12xvc18l002m8q6ad3laa667xzqjbcfqf0vvcmicgw2j3bbq6h"; depends=[]; };
   RWildbook = derive2 { name="RWildbook"; version="0.9.3"; sha256="1pznzmv8n33hhj61h07fha1gzafcx705n8323cnz3mx6ziijfh28"; depends=[data_table jsonlite marked]; };
-  RWsearch = derive2 { name="RWsearch"; version="4.6"; sha256="12x119y572c8qzshjjizipc4b3k3yalszcfw3ijwqfk2jycxj9ij"; depends=[brew latexpdf networkD3 sig sos XML]; };
+  RWsearch = derive2 { name="RWsearch"; version="4.6.2"; sha256="1sak4ihzvba83q1zvn65983qz50cb1nbz1mwiasr3bzz27hhdp4a"; depends=[brew latexpdf networkD3 sig sos XML]; };
   RXKCD = derive2 { name="RXKCD"; version="1.8-2"; sha256="081zrx293z4009p6fj2za0mkf04nikxmg3i45l667qvy7nmajqlc"; depends=[jpeg png RJSONIO]; };
   RXMCDA = derive2 { name="RXMCDA"; version="1.5.5"; sha256="1ci73q8xf3xxqw8b7sk83v5vz2cqgcb4lkx7qi3hd1ff4xkz1fpa"; depends=[kappalab XML]; };
   RXshrink = derive2 { name="RXshrink"; version="1.1"; sha256="0m8fjcpiv4dp3p9819i3qwfrly5153jpn9v3d2yr674334s1drm5"; depends=[lars]; };
@@ -3491,8 +3558,8 @@ in with self; {
   RZigZag = derive2 { name="RZigZag"; version="0.2.1"; sha256="1civ8qrk5y95775vzkd2m5arqczgan584r632ixy4q76nd5wa8zc"; depends=[Rcpp RcppEigen]; };
   RZooRoH = derive2 { name="RZooRoH"; version="0.2.3"; sha256="0ihfc8hxqmlkx1xhkz3psw8szwjp01imasvynxbzrjmjf4q6amvq"; depends=[data_table doParallel foreach iterators RColorBrewer]; };
   RaPKod = derive2 { name="RaPKod"; version="0.9"; sha256="1qxzi2lf431zd44bcd98ybhzydy1cz12g864l6r668jk91aqy1qg"; depends=[kernlab MASS proxy Rcpp RcppArmadillo]; };
-  RaProR = derive2 { name="RaProR"; version="1.1-4"; sha256="0zaswmig1fmxdsfij5hl58z2q5iw15p9w5yd9i03rdyn3gnkka4g"; depends=[]; };
-  RaceID = derive2 { name="RaceID"; version="0.1.3"; sha256="1kmhjqhm6v4blwnll67b79ywrpsiygipz30nylxfi0030p37bld2"; depends=[cluster coop FateID fpc ica igraph irlba locfit MASS Matrix pheatmap quadprog randomForest RColorBrewer Rtsne vegan]; };
+  RaProR = derive2 { name="RaProR"; version="1.1-5"; sha256="11hwg609pjcd13qnbchbs86c3q8f4nmh1xfxg3dsiijljl6lzx3n"; depends=[]; };
+  RaceID = derive2 { name="RaceID"; version="0.1.5"; sha256="0f1pj9lfxl9xm78sbrwbgzyf1n43i1gpds84wnb4smm7llyqs82i"; depends=[cluster coop FateID FNN fpc ggplot2 ica igraph irlba locfit MASS Matrix pheatmap propr quadprog randomForest RColorBrewer Rcpp Rtsne umap vegan]; };
   RadData = derive2 { name="RadData"; version="1.0.0"; sha256="14npn5vjcpvymdjkby83msjr3f1gsmzh0083gz6cgrp270fglkaw"; depends=[]; };
   RadOnc = derive2 { name="RadOnc"; version="1.1.5"; sha256="0yz2pzcpz32xs04xfs90i714nn28cky7701w1h99cqsxsp892jkq"; depends=[geometry oro_dicom ptinpoly rgl]; };
   RadTran = derive2 { name="RadTran"; version="1.0"; sha256="1sb8d4y3b37akbxhdavxrkp34zn3ip061b7gzy0ga57pyn76cvpn"; depends=[ReacTran rootSolve]; };
@@ -3512,11 +3579,12 @@ in with self; {
   RanglaPunjab = derive2 { name="RanglaPunjab"; version="2.3.4"; sha256="01j3gww9kil02d44jwlkz6j7lwn2him830bnshkly0s7mgh22pgr"; depends=[jpeg shiny tidyverse]; };
   RankAggreg = derive2 { name="RankAggreg"; version="0.6.5"; sha256="031mff1zydxqygx8bn3g0qpwq08kaq5bpmzy6z2y0fa03hgsxz5c"; depends=[gtools]; };
   RankResponse = derive2 { name="RankResponse"; version="3.1.1"; sha256="04s588zbxcjgvpmbb2x46bbf5l15xm7pwiaxjgc1kn1pn6g1080c"; depends=[]; };
-  Rankcluster = derive2 { name="Rankcluster"; version="0.94"; sha256="0ak6cpm073ym4h9l3j7pq0ks9h4is1hzxfjn52j23nc5ifq3fjpq"; depends=[Rcpp RcppEigen]; };
+  Rankcluster = derive2 { name="Rankcluster"; version="0.94.1"; sha256="1zc6cqbifs3qhd64dm4991sj1i8mxkdm5z797c4816j4hq7z3nn9"; depends=[Rcpp RcppEigen]; };
   RankingProject = derive2 { name="RankingProject"; version="0.1.1"; sha256="1n1282pym7q2b1bh18wlkmk9f0simzq149h7hacc23vyqzgkjs84"; depends=[]; };
   RapidPolygonLookup = derive2 { name="RapidPolygonLookup"; version="0.1.1"; sha256="0h4snn3haa4a5rkafg98419by4nnz219wsm3y0dqgm4hw4bvha0g"; depends=[PBSmapping RANN RgoogleMaps sp]; };
   Rarity = derive2 { name="Rarity"; version="1.3-6"; sha256="1m742qrgc0c5vda9sb2q5n3ghmqnlnfhr1cfpxfs7s5ic707gmlb"; depends=[]; };
   RaschSampler = derive2 { name="RaschSampler"; version="0.8-8"; sha256="0y7dkgv1cy6r1mbmyqm27qwl10rl12g1svpx9jkzq5hq0hnm2xhw"; depends=[]; };
+  Rata = derive2 { name="Rata"; version="0.0.1"; sha256="0hal12sric8isljjg7v9nxjqny6rfqzd0yx492p1h2c3qh9ly3zb"; depends=[ggplot2 glpkAPI lpSolveAPI reshape2 Rirt]; };
   RateDistortion = derive2 { name="RateDistortion"; version="1.01"; sha256="1micjlbir1v5ar51g1x7bgkqw9m8217qi82ii6ysgjkhwdvpm075"; depends=[]; };
   RatingScaleReduction = derive2 { name="RatingScaleReduction"; version="1.2.2"; sha256="15xkfjp0bkx9wjp8y27vs0iq2ir4qxjdl8405ix59sjb6lkvv3l2"; depends=[ggplot2 pROC]; };
   RationalExp = derive2 { name="RationalExp"; version="0.2.2"; sha256="0a51sfps3sfb71m93jdsmbvj6kafbyfrq790ix238j570f5xafpg"; depends=[snowfall]; };
@@ -3524,9 +3592,9 @@ in with self; {
   Rbent = derive2 { name="Rbent"; version="0.1.0"; sha256="0xkb57dhhfd3342rv0xwbhbhn4zp5fbfch84fbh0sickm09l9vrj"; depends=[Rfit]; };
   Rbgs = derive2 { name="Rbgs"; version="0.2"; sha256="1q0dnbcpgx7x9klr6z33z6g2p9p8mrmhnsqjy6qw15ch720rrgn3"; depends=[imager magrittr rJava]; };
   Rbitcoin = derive2 { name="Rbitcoin"; version="0.9.2"; sha256="0ndq4kg1jq6h0jxwhpdp8sw1n5shg53lwa1x0bi7rifmy0gnh66f"; depends=[data_table digest RCurl RJSONIO]; };
-  RblDataLicense = derive2 { name="RblDataLicense"; version="0.2.0"; sha256="187w7pfx4f7gly1isfs5cr3m6cxzr5ml25x3775xwm3xjjsh7ylg"; depends=[RCurl xts]; };
+  RblDataLicense = derive2 { name="RblDataLicense"; version="0.2.1"; sha256="1jvy4r3qnyxwa4vai04lsfrf4dgbfg6gpvk4mvzicgdxlnfphrg9"; depends=[RCurl xts]; };
   Rblpapi = derive2 { name="Rblpapi"; version="0.3.10"; sha256="14wkrjfbjc3rb3159sz8wdvshmrh3d17s01swp59s8if7hr94hq0"; depends=[BH Rcpp]; };
-  Rborist = derive2 { name="Rborist"; version="0.1-17"; sha256="0vsld7qr9zl9a6fj1vwdh6avdh23vkibyng6j8q0kd3za0dibcl0"; depends=[data_table Rcpp]; };
+  Rborist = derive2 { name="Rborist"; version="0.2-2"; sha256="0hmq2ph0bcj49lxrb1kvd78x82nc8sb1j629ncifp1y0aynvsa7z"; depends=[data_table digest Rcpp]; };
   Rcan = derive2 { name="Rcan"; version="1.3.72"; sha256="1c2a0p6nc040irgmg50bw0w43ad55flrni8k37avpns1m9k309h1"; depends=[data_table ggplot2 scales]; };
   Rcapture = derive2 { name="Rcapture"; version="1.4-2"; sha256="1nsxy5vpfv7fj03i6l5pgzjm0cldwqxxycnvqkfkshbryjcyl0ps"; depends=[]; };
   RcellData = derive2 { name="RcellData"; version="1.3-2"; sha256="1zzkgpj2pc42xzz5pspyj981a04gjpna4br3lxna255366ijgz4l"; depends=[]; };
@@ -3536,7 +3604,7 @@ in with self; {
   RchivalTag = derive2 { name="RchivalTag"; version="0.0.7"; sha256="0i25rj3f54km2gdr8izgvqdbdbcq4nikywn5narm7sg79fv43pd4"; depends=[mapdata maps maptools ncdf4 oceanmap PBSmapping plyr raster rgeos sp]; };
   Rchoice = derive2 { name="Rchoice"; version="0.3-1.1"; sha256="0nmbb6wfgz164fncljnsr11j2w1hi235hysxn1p2mgc6l301rqhm"; depends=[Formula maxLik msm plm plotrix]; };
   Rclean = derive2 { name="Rclean"; version="1.0.0"; sha256="065jq957xsk9p1nnzf8ilp9swjfxhydgc7xg57lfcg9hz99ckwfr"; depends=[formatR igraph jsonlite]; };
-  Rcmdr = derive2 { name="Rcmdr"; version="2.5-3"; sha256="1lbj1cwdnz2b2zxfilmpdkmmqrmy06lsr77pbwls7jh4fj9v04xi"; depends=[abind car effects RcmdrMisc relimp tcltk2]; };
+  Rcmdr = derive2 { name="Rcmdr"; version="2.6-0"; sha256="0g0xa7dp6k0vr1rd1fnd7fsxyrvx86y6yxwi0vxnw1r9yiycg0s2"; depends=[abind car effects formatR lme4 RcmdrMisc relimp tcltk2]; };
   RcmdrMisc = derive2 { name="RcmdrMisc"; version="2.5-1"; sha256="10cnvk541cx8lzapra2104dn1kh780phzz29dwvfwrx4k9vfbh7i"; depends=[abind car colorspace e1071 foreign haven Hmisc MASS nortest readstata13 readxl sandwich]; };
   RcmdrPlugin_BiclustGUI = derive2 { name="RcmdrPlugin.BiclustGUI"; version="1.1.1"; sha256="1sdc8ibggz8wpn77g7hddyl7lg86dbyw8qax63p6cqx1pfhb4rra"; depends=[BcDiag BiBitR BicARE biclust fabia gplots iBBiG Rcmdr rqubic s4vd superbiclust viridis]; };
   RcmdrPlugin_DoE = derive2 { name="RcmdrPlugin.DoE"; version="0.12-3"; sha256="1iifn71kjjgcp7dfz2pjq57mgbv4rrznrl3b3k9gdc2dva1z9zvc"; depends=[DoE_base DoE_wrapper FrF2 Rcmdr RcmdrMisc relimp]; };
@@ -3550,10 +3618,10 @@ in with self; {
   RcmdrPlugin_GWRM = derive2 { name="RcmdrPlugin.GWRM"; version="1.0.2"; sha256="01q4k9s815pgd5cavm6nyxy5npmpxryari9v6wys4n5cjpn5g6xq"; depends=[GWRM Rcmdr RcmdrMisc]; };
   RcmdrPlugin_HH = derive2 { name="RcmdrPlugin.HH"; version="1.1-47"; sha256="1bba11izs1jhjsyb0d45c34gcihapk231qbiabcxf8x93sdmg6ga"; depends=[HH lattice mgcv Rcmdr]; };
   RcmdrPlugin_IPSUR = derive2 { name="RcmdrPlugin.IPSUR"; version="0.2-1.1"; sha256="0dbdsxdxhxm79cq7hi0rh8qphan73521lmivcnb4ca8g6ha2y32v"; depends=[Rcmdr]; };
-  RcmdrPlugin_KMggplot2 = derive2 { name="RcmdrPlugin.KMggplot2"; version="0.2-5"; sha256="069kpvhflk0rwwll0vyxfdrln1lzr1zhzfzm39si63ji6v7l6msb"; depends=[ggplot2 ggthemes plyr Rcmdr RColorBrewer scales survival tcltk2]; };
+  RcmdrPlugin_KMggplot2 = derive2 { name="RcmdrPlugin.KMggplot2"; version="0.2-6"; sha256="0xh0lfgmr5sc15f3v5avwy1zl0gk1krlw3jb1prjyk9prp8albz9"; depends=[ggplot2 ggthemes plyr Rcmdr RColorBrewer scales survival tcltk2]; };
   RcmdrPlugin_MA = derive2 { name="RcmdrPlugin.MA"; version="0.0-2"; sha256="1zivlc0r2mkxpx23ba76njmb2wnnjijysvza4f24dg4l47d0sr2p"; depends=[MAd metafor Rcmdr]; };
   RcmdrPlugin_MPAStats = derive2 { name="RcmdrPlugin.MPAStats"; version="1.2.2"; sha256="1ynj42p12ncgrbghd8w7mkyys2cq9r9dpbir57rj3k5l46yzj7d5"; depends=[ordinal Rcmdr]; };
-  RcmdrPlugin_NMBU = derive2 { name="RcmdrPlugin.NMBU"; version="1.8.9"; sha256="1lwxmhla66nxrb6ph81vxa60pzga80z0vniq725y37w5zlqzgmcq"; depends=[MASS mixlm phia pls Rcmdr xtable]; };
+  RcmdrPlugin_NMBU = derive2 { name="RcmdrPlugin.NMBU"; version="1.8.11"; sha256="01isc6wswbi39jdgq2wbc3akbjv6fa5x33q1wrmbcc9ph6lvlr4h"; depends=[car MASS mixlm phia pls Rcmdr xtable]; };
   RcmdrPlugin_OptimClassifier = derive2 { name="RcmdrPlugin.OptimClassifier"; version="0.1.2"; sha256="0gisjw1iniihy2c2mr9f9pxfnfr2dc0s482wb9yfn88vknx8d0rn"; depends=[OptimClassifier Rcmdr RcmdrMisc]; };
   RcmdrPlugin_PcaRobust = derive2 { name="RcmdrPlugin.PcaRobust"; version="1.1.4"; sha256="17rq3sv8payazjjn5j37cgd6df5b62d2y8al3grw6hw5nfba7lvn"; depends=[Rcmdr robustbase rrcov tkrplot]; };
   RcmdrPlugin_RMTCJags = derive2 { name="RcmdrPlugin.RMTCJags"; version="1.0-2"; sha256="04g5a1dpch54k5ckfkrg4vsap1nc3af1i0i559qigv3hy8n7pm80"; depends=[coda igraph Rcmdr rjags rmeta runjags]; };
@@ -3585,8 +3653,8 @@ in with self; {
   Rcpp11 = derive2 { name="Rcpp11"; version="3.1.2.0"; sha256="1x6n1z7kizagr5ymvbwqb7nyn3lca4d4m0ks33zhcn9gay6g0fac"; depends=[]; };
   RcppAPT = derive2 { name="RcppAPT"; version="0.0.5"; sha256="0188sabgfmgh83yr3hmqpg5cmhllfkxzbxxchqr2r2fmj6x0ib1a"; depends=[Rcpp]; };
   RcppAlgos = derive2 { name="RcppAlgos"; version="2.3.4"; sha256="1rmadfvavjn17xs0fs93h2dahil5nqg0w59f4zdsnn193cwcfi7p"; depends=[gmp Rcpp RcppThread]; };
-  RcppAnnoy = derive2 { name="RcppAnnoy"; version="0.0.12"; sha256="1b0fmip9c4i0my1yjrvqy8jxfiiqcggq2kms135q0b53njxnqwwg"; depends=[Rcpp]; };
-  RcppArmadillo = derive2 { name="RcppArmadillo"; version="0.9.600.4.0"; sha256="07jg2667xyhmp1fbcdi5nnhmkk81da76s9rlswfq4k2sjsmbfmr0"; depends=[Rcpp]; };
+  RcppAnnoy = derive2 { name="RcppAnnoy"; version="0.0.13"; sha256="1jibp9b07c5ka1kif0nl7f168hxfvysj32wnmnxg85l663hmvm8j"; depends=[Rcpp]; };
+  RcppArmadillo = derive2 { name="RcppArmadillo"; version="0.9.700.2.0"; sha256="0g25w32dnqrvhnri8x4yxqawxd8qhn7w3m8d29nxxy0gybx3y8x9"; depends=[Rcpp]; };
   RcppBDT = derive2 { name="RcppBDT"; version="0.2.3"; sha256="0gnj4gz754l80df7w3d5qn7a57z9kq494n00wp6f7vr8aqgq8wi1"; depends=[BH Rcpp]; };
   RcppCCTZ = derive2 { name="RcppCCTZ"; version="0.2.6"; sha256="1bkrzdcm18z7qfkcfq5yc4s8z6a43y6cfsa09k6j9ni9bl2pd6hf"; depends=[Rcpp]; };
   RcppCNPy = derive2 { name="RcppCNPy"; version="0.2.10"; sha256="175bn75akwgz3vcp0n59kiqqz7q9cwkvih241nj8v810cp4gpmkp"; depends=[Rcpp]; };
@@ -3599,23 +3667,23 @@ in with self; {
   RcppDynProg = derive2 { name="RcppDynProg"; version="0.1.3"; sha256="099hbm355d30rwxqjd7j4dfw678551dc5v4y7yy6q4xxyf527lbs"; depends=[Rcpp RcppArmadillo wrapr]; };
   RcppEigen = derive2 { name="RcppEigen"; version="0.3.3.5.0"; sha256="01bz41c29591ybzqn4z88ss036ai3anh9figryvmfpqcfwbszip5"; depends=[Matrix Rcpp]; };
   RcppEigenAD = derive2 { name="RcppEigenAD"; version="1.0.0"; sha256="18zm9hsfqwiicxsdm87ix3qc261ljxxn2s736p6aayx82b6vwkz6"; depends=[BH functional memoise Rcpp RcppEigen Rdpack readr]; };
-  RcppEnsmallen = derive2 { name="RcppEnsmallen"; version="0.1.15.0.1"; sha256="01jx7vkfj1fa2b6lwjvhjf0a78zsi5hb4viqsfrka0sg385vlark"; depends=[Rcpp RcppArmadillo]; };
-  RcppExamples = derive2 { name="RcppExamples"; version="0.1.8"; sha256="15iw2vx6ygb03siq743418whhqvfrxk2i4nqn7p9yg1m3jwafxna"; depends=[Rcpp]; };
+  RcppEnsmallen = derive2 { name="RcppEnsmallen"; version="0.2.10.3.1"; sha256="1kljhf7y2v0kd7jydpd24grba1zm268ak11hdpg3jxz3s32l45ld"; depends=[Rcpp RcppArmadillo]; };
+  RcppExamples = derive2 { name="RcppExamples"; version="0.1.9"; sha256="0568zipgjxgmx086mlfpp5n7v8kf50gwrylvhl1bgvzb2vvr9dhj"; depends=[Rcpp]; };
   RcppFaddeeva = derive2 { name="RcppFaddeeva"; version="0.1.0"; sha256="1rah18sdfmbcxy83i7vc9scrwyr34kn9xljkv9pa31js68gn2jrl"; depends=[knitr Rcpp]; };
   RcppGSL = derive2 { name="RcppGSL"; version="0.3.6"; sha256="16pdapq31729db53agnb48jkvdm97167n3bigy5zazc3q3isis1m"; depends=[Rcpp]; };
   RcppGetconf = derive2 { name="RcppGetconf"; version="0.0.3"; sha256="1qcnn482h9b8aw798frnkza4bzzpihp0pf4s1mj6zmn2ar01hsl0"; depends=[Rcpp]; };
   RcppGreedySetCover = derive2 { name="RcppGreedySetCover"; version="0.1.0"; sha256="1v84i9gsmvpkmgd4niqnzp58nhrgn2j4rggsrnlh391ikdfrl51x"; depends=[BH data_table Rcpp]; };
   RcppHMM = derive2 { name="RcppHMM"; version="1.2.2"; sha256="0scdzmns1yw2gbarblzd6cbvndlysz54ff17qijiz17ql5cyzly6"; depends=[Rcpp RcppArmadillo]; };
-  RcppHNSW = derive2 { name="RcppHNSW"; version="0.1.0"; sha256="158a069n42pbnjrlmvqsr6bm2cfp9hxpnk3nhp3dwi9qjlq4r9bm"; depends=[Rcpp]; };
+  RcppHNSW = derive2 { name="RcppHNSW"; version="0.2.0"; sha256="0gqdkw7vkcm544rz45g0hplg836ygzbfwk9gh9wr0817icvdb3qv"; depends=[Rcpp]; };
   RcppHungarian = derive2 { name="RcppHungarian"; version="0.1"; sha256="1yx7kjjampjk47l8cqpv727g0nv23dnld9n8iwf7h1myfrl3yb6h"; depends=[Rcpp]; };
   RcppMLPACK = derive2 { name="RcppMLPACK"; version="1.0.10-6"; sha256="0vjx6azp3sny6nv5k1cs6vk61hmbllqw8mgvi7zn15p7ilmhsyyi"; depends=[BH Rcpp RcppArmadillo]; };
   RcppMeCab = derive2 { name="RcppMeCab"; version="0.0.1.2"; sha256="0varavfbrqzma176rw0dr9v5chh7pxh5y9g0rs3v7hqnlghp22y2"; depends=[BH Rcpp RcppParallel]; };
   RcppMsgPack = derive2 { name="RcppMsgPack"; version="0.2.3"; sha256="0ffdw5ckkax8j87q0ykjhyp45l7gvxjppdi73kc4r5qxvijll2g3"; depends=[BH Rcpp]; };
   RcppNLoptExample = derive2 { name="RcppNLoptExample"; version="0.0.1"; sha256="1fml6hpa12q0lgg5fg6fi9lz6mckwh345pbh95mld2qagzvmg01n"; depends=[nloptr Rcpp]; };
   RcppNumerical = derive2 { name="RcppNumerical"; version="0.3-3"; sha256="15qwjfwx6yrh9sl2gndqfxw0b3iwnkr2nrgrccb6phpj3pdp7vsq"; depends=[Rcpp RcppEigen]; };
-  RcppParallel = derive2 { name="RcppParallel"; version="4.4.3"; sha256="1ym0bzs9g6bsg2lz24fisxxa3gypr6xcvrczn304czmrrag9413s"; depends=[]; };
+  RcppParallel = derive2 { name="RcppParallel"; version="4.4.4"; sha256="0p13f2mywjr7gmskf8ri4y8p5yr1bvr4xrpw2w11vdvafwz1vcia"; depends=[]; };
   RcppProgress = derive2 { name="RcppProgress"; version="0.4.1"; sha256="0yk01hfv961zyp569682k9igvhnwqyg5j0n5fm63sxigj82l2xhi"; depends=[]; };
-  RcppQuantuccia = derive2 { name="RcppQuantuccia"; version="0.0.2"; sha256="1si5njb8g4g6fjrkqbp3y6z23yxs901nq9kmiwwbqs8di6svc5q3"; depends=[BH Rcpp]; };
+  RcppQuantuccia = derive2 { name="RcppQuantuccia"; version="0.0.3"; sha256="0cj95y8jcjm33d65y42f5ijw775kq3mh2p0659mp3i3r9fvaishk"; depends=[BH Rcpp]; };
   RcppRedis = derive2 { name="RcppRedis"; version="0.1.9"; sha256="08c2c5d3rn3z89yhlymbr8w145y85hlz1bq3g6kz0kwkjfnkbs1x"; depends=[BH RApiSerialize Rcpp]; };
   RcppRoll = derive2 { name="RcppRoll"; version="0.3.0"; sha256="0srzfhzkk42kzrdjnhbb37946jp1p688rgysy6k3i2is8jb21zyb"; depends=[Rcpp]; };
   RcppSMC = derive2 { name="RcppSMC"; version="0.2.1"; sha256="0k2k1pj05i6hf7gpar3r4mbv9cs04bd4v657saq9vhy30300vg49"; depends=[Rcpp RcppArmadillo]; };
@@ -3650,7 +3718,7 @@ in with self; {
   RealVAMS = derive2 { name="RealVAMS"; version="0.4-3"; sha256="14jqrqza7bs11y1004wzi3bxkvkdfn43d82l0cyh6py8p37rfz28"; depends=[Matrix numDeriv Rcpp RcppArmadillo]; };
   Rearrangement = derive2 { name="Rearrangement"; version="2.1"; sha256="0q253nj62rl65vjsq6503r80qa2j35wac8lv7ydp9w260p28z923"; depends=[quantreg]; };
   Recon = derive2 { name="Recon"; version="0.3.0.0"; sha256="11gag2bl00pcy7ysfycaa58qarh6aigznldkc4kkn2178bl4ii62"; depends=[rootSolve]; };
-  RecordLinkage = derive2 { name="RecordLinkage"; version="0.4-11.1"; sha256="1b5bw87h2lrf5vkd2ni75rz3dj4vjls28wys5g39aajsn55ql10k"; depends=[ada data_table DBI e1071 evd ff ffbase ipred nnet rpart RSQLite xtable]; };
+  RecordLinkage = derive2 { name="RecordLinkage"; version="0.4-11.2"; sha256="1gqf236bpxi0hbhv8bxscv78dwdb3z4x105qfyvzky01aydw5zgn"; depends=[ada data_table DBI e1071 evd ff ffbase ipred nnet rpart RSQLite xtable]; };
   Records = derive2 { name="Records"; version="1.0"; sha256="08y1g2m6bdrvv4rpkhd5v2lh7vprxy9bcx9ahp1f7p062bn2lwji"; depends=[]; };
   RedditExtractoR = derive2 { name="RedditExtractoR"; version="2.1.5"; sha256="1b6pp1vdn7jnyl8k828dgkxrx8sy2wyhkrn4rnfavqw4qvhm0mhm"; depends=[dplyr igraph magrittr RJSONIO rlang visNetwork]; };
   Redmonder = derive2 { name="Redmonder"; version="0.2.0"; sha256="02qrz1b0g7hdacj2s2bks5gfwnypkbiwlmn0bv7im1zz1swg9cp8"; depends=[]; };
@@ -3682,17 +3750,17 @@ in with self; {
   Rexperigen = derive2 { name="Rexperigen"; version="0.2.1"; sha256="158ksnd1gvzq7ii0ys2v0wrfnr001hni0i8m77p1fn1arixgmqdw"; depends=[digest jsonlite RCurl]; };
   Rfacebook = derive2 { name="Rfacebook"; version="0.6.15"; sha256="0hp2mbm0hnyasizszvh5x9hv7z2q633zck1a1gvk36nbxb1shx7c"; depends=[httpuv httr rjson]; };
   Rfast = derive2 { name="Rfast"; version="1.9.5"; sha256="003ghzhq9jnxqdmz3fjn3r32s40lspxrsc5n004n1py1kra0fxmx"; depends=[Rcpp RcppArmadillo RcppZiggurat]; };
-  Rfast2 = derive2 { name="Rfast2"; version="0.0.3"; sha256="0kl4kvj30y4ns7yvdwyhyjpznsswaq1jlb9fmvp8kdwp5ii6y9ra"; depends=[Rcpp RcppArmadillo Rfast]; };
+  Rfast2 = derive2 { name="Rfast2"; version="0.0.4"; sha256="0n4n8krcznrvksfhkhbdzllfn6j79ca1iks3ckmn4vhipyilcafc"; depends=[Rcpp RcppArmadillo Rfast]; };
   Rfit = derive2 { name="Rfit"; version="0.23.0"; sha256="1gxxipbh7mskrqwrpk1gf1dn8mp3l1v4hgmzii44bppffnxs7slp"; depends=[]; };
   Rfolding = derive2 { name="Rfolding"; version="1.0"; sha256="15lf73zxr1slin9faj9k0z8qkb1g9nb7h080nfv99gsi2ks68ssg"; depends=[]; };
-  Rfssa = derive2 { name="Rfssa"; version="0.0.1"; sha256="0d1lpc57msw57i78d1hcjphxlci7rsvfn6mzfkh18x3dw90md9gv"; depends=[fda lattice plot3D Rcpp RcppArmadillo]; };
+  Rfssa = derive2 { name="Rfssa"; version="1.0.0"; sha256="0rmlx1fia0758kbqpi56awh7xws5pwx6zl8nnggi6bqalyskf09n"; depends=[dplyr fda lattice markdown plotly Rcpp RcppArmadillo Rssa shiny]; };
   Rga4gh = derive2 { name="Rga4gh"; version="0.1.1"; sha256="0h5y722blkkwn6ask6vjnhl22v9l6511chdm50ig6xcs5dvjam2m"; depends=[httr jsonlite]; };
   Rgb = derive2 { name="Rgb"; version="1.6.1"; sha256="0qs3dlv4g45dqphqjm23ky3w6rxh8ff2q6b17kvf57skyf1b1yn8"; depends=[]; };
   Rgbp = derive2 { name="Rgbp"; version="1.1.3"; sha256="1340h5rzb4631h6aanrdjl4x4l0h6l5x61qqmckrdf08fw2625lp"; depends=[mnormt sn]; };
   Rglpk = derive2 { name="Rglpk"; version="0.6-4"; sha256="19mzpyimzq9zqnbi05j79b2di3nzaln8swggs9p8sqdr60qvr3d2"; depends=[slam]; };
   Rgnuplot = derive2 { name="Rgnuplot"; version="1.0.3"; sha256="0mwpq6ibfv014fgdfsh3wf8yy82nzva6cgb3zifn3k9lnr3h2fj7"; depends=[]; };
-  RgoogleMaps = derive2 { name="RgoogleMaps"; version="1.4.3"; sha256="06ab3lg1rwm93hkshf1vxfm8mlxq5qsjan0wx43lhnrysay65js4"; depends=[png]; };
-  Rhpc = derive2 { name="Rhpc"; version="0.18-204"; sha256="0ja2cx6sa8ihxnq96qhxfp43z5zd45b8jfb0y2rzzklnd7kj9kl1"; depends=[]; };
+  RgoogleMaps = derive2 { name="RgoogleMaps"; version="1.4.4"; sha256="0sbklacc4jl5524ixhc11mh6smrzdz4l9pji6cn402i6zdn9z05x"; depends=[png]; };
+  Rhpc = derive2 { name="Rhpc"; version="0.19-276"; sha256="1wbdkqmaq3rdj5r9w0mddkcyiabyd9r26jp3i7i4w055mq2r1gs1"; depends=[]; };
   RhpcBLASctl = derive2 { name="RhpcBLASctl"; version="0.18-205"; sha256="1ls2286fvrp1g7p8v4l6axznychh3qndranfpzqz806cm9ml1cdp"; depends=[]; };
   Ricetl = derive2 { name="Ricetl"; version="0.2.5.1"; sha256="1d7229ylnxgh2rvarwga229378ja79l978zjabf3sph4cqc1b965"; depends=[devtools gWidgets gWidgetsRGtk2 plyr readr readxl stringr tidyverse writexl]; };
   RichR = derive2 { name="RichR"; version="1.0.0"; sha256="0z0ri90jqdmw0vwxd1b4wr9if5cgm1gqpf6g9p1fdvncf4sdi9by"; depends=[magrittr metap plyr reshape2]; };
@@ -3703,6 +3771,7 @@ in with self; {
   Rilostat = derive2 { name="Rilostat"; version="1.0.1"; sha256="0k8x2z3vxfwbynn22wpkfbc1i237bl61dh612nhw19c7v48lhdgg"; depends=[data_table dplyr DT haven plyr RCurl readr stringr tibble xml2]; };
   Rinstapkg = derive2 { name="Rinstapkg"; version="0.1.0"; sha256="0fvj4jc00g5b8cc4mrsjj72fdcdmvlky05s2ca0g2gndrjs6vxic"; depends=[digest dplyr httr jsonlite lubridate purrr readr rlang uuid]; };
   Rip46 = derive2 { name="Rip46"; version="1.0.2"; sha256="0wfp6fm5mgmjqjkn0c5hvjd95yn4zcv0s8xc5294qf5jqxp8b1w7"; depends=[Rcpp]; };
+  Rirt = derive2 { name="Rirt"; version="0.0.1"; sha256="149w9fqhy1jay1701y2mary48v7gkx302jrdd0zccn6zf2w3l42g"; depends=[ggplot2 Rcpp reshape2]; };
   Risk = derive2 { name="Risk"; version="1.0"; sha256="1i42xcc699syj108mvgklwb30wkf9c9jrg5rmd2ypnqk9mnyg2fg"; depends=[]; };
   RiskPortfolios = derive2 { name="RiskPortfolios"; version="2.1.2"; sha256="10kgr05npq9gyhglvpzk49hsr44rgscnygkv3b0gz7f6jxqkfj9z"; depends=[MASS nloptr quadprog]; };
   Ritc = derive2 { name="Ritc"; version="1.0.2"; sha256="03smhxjhjfkc9pxhlgg54b6v2jznpmnws8373qpvn9a9ky5bcq2l"; depends=[minpack_lm]; };
@@ -3712,7 +3781,7 @@ in with self; {
   RkMetrics = derive2 { name="RkMetrics"; version="1.3"; sha256="1k6vnr1r4h69iznib638z45gd0f8wc4g4h0ji9f0017883g77li1"; depends=[]; };
   Rknots = derive2 { name="Rknots"; version="1.3.2"; sha256="1krhma8hy3l5lbm6d8rxjlj9jw1zrd16h4wy4p1clfa5vlhh3bwi"; depends=[bio3d rgl rSymPy]; };
   Rlab = derive2 { name="Rlab"; version="2.15.1"; sha256="1pb0pj84i1s4ckdmcglqxa8brhjha4y4rfm9x0na15n7d9lzi9ag"; depends=[]; };
-  Rlabkey = derive2 { name="Rlabkey"; version="2.3.1"; sha256="0m5v8wf6a1pipp0xi0ajxfk0fyslbmdx3698z439g4i5hbrg0i3r"; depends=[httr jsonlite Rcpp]; };
+  Rlabkey = derive2 { name="Rlabkey"; version="2.3.2"; sha256="1axhvc0x0a556p33jz554pp8yww6jy00sxs3wrdrrxz1fvgcla0a"; depends=[httr jsonlite Rcpp]; };
   Rlda = derive2 { name="Rlda"; version="0.2.6"; sha256="0i8n01h9072q339p1kiqhcpwphw0d2x6bsszbhgfqc2b160dk2bl"; depends=[coda doParallel foreach gtools Rcpp RcppArmadillo RcppProgress]; };
   Rlgt = derive2 { name="Rlgt"; version="0.1-3"; sha256="0g610v5rch5s31gc7dy9zx4mcgsdhn82y1pmr2rs14qma0v7x515"; depends=[BH forecast Rcpp RcppEigen rstan rstantools sn StanHeaders]; };
   Rlibeemd = derive2 { name="Rlibeemd"; version="1.4.1"; sha256="06bb939awawpwn4g63b9jzq5b658lsznzy272zl0fy19x62c6bwr"; depends=[Rcpp]; };
@@ -3720,7 +3789,7 @@ in with self; {
   Rlinsolve = derive2 { name="Rlinsolve"; version="0.3.0"; sha256="1kvlpfrw4w2dykpdym9sg6h2ghavnm7lwxn6bzqldwg53wlinvxk"; depends=[BH bigmemory Matrix Rcpp RcppArmadillo Rdpack]; };
   Rlof = derive2 { name="Rlof"; version="1.1.1"; sha256="1px6ax2mr2agbhv41akccrjdrvp8a9lmhymp0cn8fjrib0ig8vql"; depends=[doParallel foreach]; };
   Rmagic = derive2 { name="Rmagic"; version="1.4.0"; sha256="0xf2zc9p0y9z2a26w79p3b7hggk78zyiszbyq269s0v6i3h29gy0"; depends=[ggplot2 Matrix reticulate]; };
-  Rmalschains = derive2 { name="Rmalschains"; version="0.2-5"; sha256="17wqs2v53j4m7ghps6pq8z8i73c9ji4079s4m2jb49izjjr8q711"; depends=[Rcpp]; };
+  Rmalschains = derive2 { name="Rmalschains"; version="0.2-6"; sha256="1dp0nys320i7pa7c0smz57vj6jk7wjvrnnn90z5w7m6xdb4rm369"; depends=[Rcpp]; };
   RmarineHeatWaves = derive2 { name="RmarineHeatWaves"; version="0.17.0"; sha256="09lrrxnkkfnbidnmag1czx2xzssdl09348nkc6pqgq6xz36a3mqc"; depends=[dplyr ggplot2 lazyeval lubridate plyr raster rlang tibble tidyr zoo]; };
   RmecabKo = derive2 { name="RmecabKo"; version="0.1.6.2"; sha256="1i08wlfd14wmvwrsvjyhgzxkwzfp4jiwbzymw8m25pvyjxgi7jmy"; depends=[Rcpp stringr]; };
   Rmisc = derive2 { name="Rmisc"; version="1.5"; sha256="1ijjhfy3v91fspid77rrkc5dkcb2lav37wc3f4k5lwrn24wzy5y8"; depends=[lattice plyr]; };
@@ -3732,7 +3801,7 @@ in with self; {
   RnavGraphImageData = derive2 { name="RnavGraphImageData"; version="0.0.4"; sha256="1k1gnkghap878fck0bbz9mm0fr4cli6lh1d11r0cf47fvl6cc4gr"; depends=[]; };
   RndTexExams = derive2 { name="RndTexExams"; version="1.5"; sha256="17azzxcawqqvfdbw1i34n03bj5yla8npyi7xh3pnx22xb7sbwq3x"; depends=[data_table stringi stringr]; };
   Rnets = derive2 { name="Rnets"; version="1.2.1"; sha256="08441hhmf1i97z5xb9pq651y6hwr2yraiyg1ns7qkxm2svz3kwxs"; depends=[data_table glasso ICSNP igraph rlang stringr]; };
-  Rnightlights = derive2 { name="Rnightlights"; version="0.2.3"; sha256="014bw1xln699y0zjaf5xifc2f3yl9zgb0acv7v1qw0q478ka9aak"; depends=[cleangeo data_table doSNOW dplyr ff ffbase foreach lubridate R_utils raster readr reshape2 rgdal rgeos rvest rworldmap settings snow sp stringr xml2]; };
+  Rnightlights = derive2 { name="Rnightlights"; version="0.2.4"; sha256="0r6yh3fk8sdpnqz1dk1b8hrpslim6mh8khxh56i3qh5s1plpwxcs"; depends=[cleangeo curl data_table doSNOW dplyr ff ffbase foreach lubridate R_utils raster readr reshape2 rgdal rgeos rvest rworldmap settings snow sp stringr xml2]; };
   Rnmr1D = derive2 { name="Rnmr1D"; version="1.2.4"; sha256="0n2nqxn3js3avnln9y5718r73rplr0mcyak70gwhzw4mph2z6i26"; depends=[base64enc doParallel foreach ggplot2 igraph impute MASS MassSpecWavelet Matrix plotly plyr ptw Rcpp signal speaq XML]; };
   Rnumerai = derive2 { name="Rnumerai"; version="0.3"; sha256="0zvfp9zp73gm6pflf9bx1xk1s45xwwvcd56cbris08d2zfj3b3nl"; depends=[httr lubridate]; };
   RobAStBase = derive2 { name="RobAStBase"; version="1.2.1"; sha256="0dn93bcyz9kxbj38sc1wisfa6v0666v9gk6y3zq0ihjkkhkmdwq3"; depends=[distr distrEx distrMod RandVar rrcov startupmsg]; };
@@ -3743,8 +3812,8 @@ in with self; {
   RobPer = derive2 { name="RobPer"; version="1.2.2"; sha256="0631qfpz61606r50vzn7b3h7arfwxcs8j13q1hg779qx60kwrliy"; depends=[BB quantreg rgenoud robustbase]; };
   RobRSVD = derive2 { name="RobRSVD"; version="1.0"; sha256="07z5fw8j5lq7nyxgkvb9i4iwb5inddz2ib4m2bjx6q4c1ricpqz9"; depends=[]; };
   RobRex = derive2 { name="RobRex"; version="1.2.0"; sha256="1npgbdvdzb0p0w77fsngrwg968y621p3lx8qw69ns8qgxjkismqp"; depends=[distr RandVar RobAStBase ROptRegTS]; };
-  RobStatTM = derive2 { name="RobStatTM"; version="1.0.0"; sha256="00c79qmq9r9vqwzzv0ijzpkz9ns33xlysml62b3y4lcfz15scbx9"; depends=[DEoptimR DT fit_models ggplot2 gridExtra PerformanceAnalytics pyinit robust robustbase rrcov shiny shinyjs xts]; };
-  RobinHood = derive2 { name="RobinHood"; version="1.0.7"; sha256="0zvibrkqs5awyshs4r61fxbsx4h81vsslma1c6a7r85255jq9vs3"; depends=[curl dplyr httr jsonlite lubridate magrittr profvis]; };
+  RobStatTM = derive2 { name="RobStatTM"; version="1.0.1"; sha256="05bhly32gi5w5n4w7c276dfvyj9ax1kfiwlj2s7x7l6r8yxkjp25"; depends=[DEoptimR DT fit_models ggplot2 gridExtra PerformanceAnalytics pyinit robust robustbase rrcov shiny shinyjs xts]; };
+  RobinHood = derive2 { name="RobinHood"; version="1.2"; sha256="1rp1bcmr31qdmxapmxc9xyq8chj555hgbpbd7zdpvxjf1l1v5vlb"; depends=[dplyr httr jsonlite lubridate magrittr profvis uuid]; };
   Robocoap = derive2 { name="Robocoap"; version="0.1-1"; sha256="0aj6iv85a1zfaknjhrzf6lnf0qn726dvnj4dywg9nii1kkqrkq2w"; depends=[data_table igraph markovchain tm]; };
   RobustAFT = derive2 { name="RobustAFT"; version="1.4-4"; sha256="17qjfpagz0wpl8hbyksnag51nj6b9arl9mk5a56avykd2nii95kd"; depends=[robustbase survival]; };
   RobustCalibration = derive2 { name="RobustCalibration"; version="0.5.1"; sha256="0wsnvryvrl37acljrda2dm1d8aynqiy66yd2i857m035whixfpqa"; depends=[Rcpp RcppEigen RobustGaSP]; };
@@ -3764,14 +3833,15 @@ in with self; {
   Rpdb = derive2 { name="Rpdb"; version="2.3"; sha256="0zy5f7bli6ppc9giwf8845mzjcv54r2sqb8hxwgbn9k6rjlszgi8"; depends=[rgl]; };
   RpeakChrom = derive2 { name="RpeakChrom"; version="1.1.0"; sha256="1r8f6knpz83arz2kabizx5yyh1myg0h310qlwh8rmy88cdxi1ps9"; depends=[ggplot2 minpack_lm pracma ptw]; };
   Rphylip = derive2 { name="Rphylip"; version="0.1-23"; sha256="0kpqmik4bhr74ib8yvaavr10z4v4w3li5vibdhz7lvz35jfirg9r"; depends=[ape]; };
-  Rphylopars = derive2 { name="Rphylopars"; version="0.2.9"; sha256="19y0j5vh82sa9jigylxhv0s0hgjyhx3xq4blvk55jhpj8v7iyiky"; depends=[ape doBy geiger MASS Matrix mvnmle phylolm phytools Rcpp RcppArmadillo]; };
   Rpipedrive = derive2 { name="Rpipedrive"; version="0.1.1"; sha256="1rf16q0wfmd3n9idiqpmdhcw7sq27yk2cy9gfl5l6bzj0y6ax1q8"; depends=[httr jsonlite]; };
+  Rpoet = derive2 { name="Rpoet"; version="1.1.0"; sha256="11gp4zg0wc2a21956355rkr3i3dyaabfz0z30z4phn8s7y3yqr92"; depends=[]; };
   Rpolyhedra = derive2 { name="Rpolyhedra"; version="0.4.2"; sha256="0q50f0pp72rwmflxwnridjrcl649kz5h2fm8jfz2pn473mghhya8"; depends=[digest dplyr futile_logger geometry git2r R6 rgl stringr testthat XML]; };
   Rpoppler = derive2 { name="Rpoppler"; version="0.1-0"; sha256="19nvv45ahp0c241p1xzlq0sq5qarqg66jw5f1anhqnfi2hi91hcm"; depends=[]; };
   Rprofet = derive2 { name="Rprofet"; version="2.2.0"; sha256="1s0jkq83vfc9jsggnwm31r366b10n6sri2vzpwxybzpjq3d3w5qr"; depends=[binr ClustOfVar ggplot2 gridExtra plyr sqldf stringr]; };
   Rquake = derive2 { name="Rquake"; version="2.4-0"; sha256="14s2mjq9qqxfvlwmq9126h67y5wr7irlc7945pgv1ab9hl1lgmz8"; depends=[GEOmap MBA minpack_lm rgl RPMG RSEIS]; };
+  Rquefts = derive2 { name="Rquefts"; version="1.0-5"; sha256="0c3738rn3abmah61kxyys3ab807r7mhcj10shkraq3li6v7aw5kv"; depends=[meteor Rcpp]; };
   Rramas = derive2 { name="Rramas"; version="0.1-6"; sha256="16aapvz9j81lvi5ryj41bvn3wf51b0gynnzs0jpvva4m3mvzw6an"; depends=[diagram]; };
-  Rraven = derive2 { name="Rraven"; version="1.0.6"; sha256="01yhmanf9hixv0pm5zw219b0hrazqcnxr5bkxm2bxpn7fz0hm8zr"; depends=[NatureSounds pbapply seewave tuneR warbleR]; };
+  Rraven = derive2 { name="Rraven"; version="1.0.7"; sha256="0a08a3mix61lwndagmmm2aqlmw3zqfd1rjwg0yxxc20j4ns6h4hh"; depends=[NatureSounds pbapply seewave tuneR warbleR]; };
   Rrdrand = derive2 { name="Rrdrand"; version="0.1-16"; sha256="0j9yyvq8r1cgwj3kw1ak6hyazr67f2q0c1m651wdm0wcvm1ajx7f"; depends=[]; };
   Rsagacmd = derive2 { name="Rsagacmd"; version="0.0.1"; sha256="15lk35kb69q55z7mjv4ar5nkfn6nkah802272jp9wvf5r5zlw5zp"; depends=[foreign magrittr minpack_lm raster rgdal rlang sf stringr XML]; };
   Rsampletrees = derive2 { name="Rsampletrees"; version="1.0.2"; sha256="1wz3dp1myjkxzf9l5mfli3dfbkc2fwg70xx7m9cxa06vq0a4w5pv"; depends=[ape haplo_stats Rcpp]; };
@@ -3793,7 +3863,6 @@ in with self; {
   Rtnmin = derive2 { name="Rtnmin"; version="2016-7.7"; sha256="0f8ii87v29v61b93hx2yxdppp3nvgnl5imp80sbb4bjsdg0mf989"; depends=[]; };
   Rtsne = derive2 { name="Rtsne"; version="0.15"; sha256="0v17vxizrs1msay24xl2bckfajr2c82wpqj07lyssbrq197nwdsn"; depends=[Rcpp]; };
   Rttf2pt1 = derive2 { name="Rttf2pt1"; version="1.3.7"; sha256="12hf9r3mhjr9sawdvf7qhjf1zph2q64f77i81jwvy7awidbm0kja"; depends=[]; };
-  Rtts = derive2 { name="Rtts"; version="0.3.3"; sha256="0jphdpnpbq0d48kzflilxlh6psk282hi1hz3rmnwnd0rx5iyg624"; depends=[RCurl]; };
   RtutoR = derive2 { name="RtutoR"; version="1.2"; sha256="19wmi30b5i6zj673d76gxl6j0k3ppfyl5fqrcs0dwmmadrrvbajq"; depends=[colourpicker devtools dplyr DT FSelector ggplot2 ggthemes officer plotly rlang rmarkdown shiny shinyBS shinydashboard shinyjs tidyr]; };
   Rtwalk = derive2 { name="Rtwalk"; version="1.8.0"; sha256="0zxf66lsfq8by40flv34xzd5yy0wa1ah9li1d0h7f0yh9nbwhxl5"; depends=[]; };
   Runiversal = derive2 { name="Runiversal"; version="1.0.2"; sha256="0667mspsjydmxi848c6wsf14gz72bmdj9b3lilma92b7fhqnv7ai"; depends=[]; };
@@ -3805,14 +3874,15 @@ in with self; {
   Rwave = derive2 { name="Rwave"; version="2.4-8"; sha256="1rmqwyj2r84sii0vfqhyhpi3n1n1zia2ca627fq9ksvwn110nrvh"; depends=[]; };
   Rwhois = derive2 { name="Rwhois"; version="1.0.3"; sha256="06mx98wi6r265ykkk81hk17yjkym6ar7c2cwp962ijfk3lxwc9l4"; depends=[stringr]; };
   Rwinsteps = derive2 { name="Rwinsteps"; version="1.0-1.1"; sha256="0kaxhaa65k1hkhl4kqfxyyk6v967xncrdr5hy8b808zlbqriankc"; depends=[]; };
+  Rwordseg = derive2 { name="Rwordseg"; version="0.3-2"; sha256="10jhfalh45rrcm76hwz4b5yl408ndx2wkr0i3q1avx6z6i45d8s6"; depends=[HMM tmcn]; };
   RxCEcolInf = derive2 { name="RxCEcolInf"; version="0.1-4"; sha256="0qyhxqd5yi4d1prj0i4g3k29zi0mx6wkjx24ynb4arxw6h1vabh4"; depends=[coda lattice MASS MCMCpack mvtnorm]; };
-  RxODE = derive2 { name="RxODE"; version="0.9.1-2"; sha256="1bb8pyna64nr2383b8dn4scgyhd3pkszh87gz92g89kirc7v50c5"; depends=[assertthat brew cli crayon digest dparser ggforce ggplot2 inline lotri magrittr Matrix memoise mvnfast n1qn1 pillar PreciseSums Rcpp RcppArmadillo remotes rex sys units]; };
+  RxODE = derive2 { name="RxODE"; version="0.9.1-4"; sha256="0bfrk7ajpfwfp5f6p34wr8w9fx507j9yvr81v3szjnv1sbrwbwg4"; depends=[assertthat brew cli crayon digest dparser ggforce ggplot2 inline lotri magrittr Matrix memoise mvnfast pillar PreciseSums Rcpp RcppArmadillo remotes rex sys units]; };
   RxnSim = derive2 { name="RxnSim"; version="1.0.3"; sha256="0fi4aic2brfbl6rsnnfwqq7l8ygvlmr98w0v749l3djpgn7sfrig"; depends=[data_table fingerprint rcdk rJava]; };
   Rxnat = derive2 { name="Rxnat"; version="1.0.6"; sha256="1wzb4dihzbyp23yggi1n7c5ikbq6h2gl9v7bgwxf00y2gwlabjx4"; depends=[httr RCurl]; };
-  Ryacas = derive2 { name="Ryacas"; version="0.4.1"; sha256="1gd8zmrj98r4qsnlmn3qd2pldjk5dhj3f0ybn1dijwy192g1w3vd"; depends=[Rcpp settings xml2]; };
+  Ryacas = derive2 { name="Ryacas"; version="1.0.0"; sha256="1jgii90mm3z8djrq6hir49zr739z1wzlcq8py6xfjkqg87g1dlrn"; depends=[magrittr Rcpp]; };
   S2sls = derive2 { name="S2sls"; version="0.1"; sha256="0qq1rff2cdgrm5rj69jxgrl71i0wmzyn424fdvcg02zdv9ggqhd3"; depends=[spanel]; };
   SACCR = derive2 { name="SACCR"; version="2.3"; sha256="0q5fpzmfj08mzxbxksi5fgkfw8n4zsmh37zqnbwkz30llh620hgv"; depends=[data_tree jsonlite Trading]; };
-  SACOBRA = derive2 { name="SACOBRA"; version="0.7"; sha256="12aj4ghs3i3ks749z0l95ipv8gi33xgggkyjf21zvnzmb1dgphys"; depends=[testit]; };
+  SACOBRA = derive2 { name="SACOBRA"; version="1.1"; sha256="123kbksamx30l4kib8pkv44knra8yqhvjwbx61xxi7k88qaxvmin"; depends=[mgcv R6 testit]; };
   SADEG = derive2 { name="SADEG"; version="1.0.0"; sha256="02ilykbdanx1isbd80c43hqpzkckq6dg40y0rklcnck6v96qky3n"; depends=[]; };
   SADISA = derive2 { name="SADISA"; version="1.1"; sha256="00qixqbbkpc8g8nmggvrknsc03v9w04nb4dlcq91fs7g76rpzs92"; depends=[DDD pracma]; };
   SAFD = derive2 { name="SAFD"; version="2.1"; sha256="078ki9wrmcf80bwhx4d56gas79xrc17a0081i13yxvjqn6w7f7jd"; depends=[]; };
@@ -3851,7 +3921,7 @@ in with self; {
   SCINA = derive2 { name="SCINA"; version="1.2.0"; sha256="1gv9widjwvk5j535r1zx6f41ylpa2r4168ya580llgblx85z402d"; depends=[gplots MASS]; };
   SCMA = derive2 { name="SCMA"; version="1.3.0"; sha256="0izpbvgimqyj529nzng94p0cvmz9l545b3ra4ycc23rsbg50q315"; depends=[]; };
   SCORER2 = derive2 { name="SCORER2"; version="0.99.0"; sha256="1a28wga69ip9s98ch2dqgl0qkwa3w6frmaqcvhclc360ik813mxq"; depends=[]; };
-  SCORPIUS = derive2 { name="SCORPIUS"; version="1.0.3"; sha256="0ppxqb6lxxb9m9m89j52d49i873kilyscdnyalrkpky1b1xh22x0"; depends=[dplyr dyndimred dynutils ggplot2 MASS Matrix mclust pbapply pheatmap princurve purrr ranger RColorBrewer reshape2 tidyr TSP]; };
+  SCORPIUS = derive2 { name="SCORPIUS"; version="1.0.4.1"; sha256="00cmlgi5kvi4q8pnq41hbq47243vkycrfplykmkjj9fdnzrlqs8h"; depends=[dplyr dyndimred dynutils ggplot2 MASS Matrix mclust pbapply pheatmap princurve purrr ranger RColorBrewer tidyr TSP]; };
   SCPME = derive2 { name="SCPME"; version="1.0"; sha256="0yhsaaa349wbrswcvp7w8c52wzp7rs3528rs4wqa8b3r3fh983mh"; depends=[doParallel dplyr foreach ggplot2 Rcpp RcppArmadillo RcppProgress]; };
   SCRABBLE = derive2 { name="SCRABBLE"; version="0.0.1"; sha256="15k8fqcyvbqminqf41n9wx3xm7bg8v47g5vaf65aclj5wn2gn5y2"; depends=[ggplot2 gridExtra pracma rARPACK RColorBrewer Rcpp RcppEigen reshape2]; };
   SCRSELECT = derive2 { name="SCRSELECT"; version="1.3-3"; sha256="118vwnd5gggvdhq7fbs0553l84vh5mhiag41q4svprd7p0pqd9hd"; depends=[mvtnorm]; };
@@ -3864,13 +3934,13 @@ in with self; {
   SDLfilter = derive2 { name="SDLfilter"; version="1.2.1"; sha256="1chvg3vh5mwsczbv2ayq9pj1my1i4m2dmr7az1hh00yvlvilfp0y"; depends=[data_table geosphere ggmap ggplot2 ggsn gridExtra maps raster sp trip]; };
   SDMPlay = derive2 { name="SDMPlay"; version="1.2"; sha256="0kafj5z1fi5d824h0n23qzn8a6n8fqm3bfc0pdfypzbaj2arjz3k"; depends=[dismo gbm raster SDMTools]; };
   SDMTools = derive2 { name="SDMTools"; version="1.1-221.1"; sha256="1fsgnlc7glawimzijp11j53g5bnfp1mdq9wb0754idmxcdi8a99q"; depends=[R_utils]; };
-  SDMtune = derive2 { name="SDMtune"; version="0.1.1"; sha256="03a09k43wi9dsr3pxbwwvcg7zsc37ls6krdcqgsk0nrkqzyd9a97"; depends=[cli crayon dismo ggplot2 htmltools jsonlite kableExtra maxnet progress raster rasterVis Rcpp reshape2 rstudioapi scales stringr whisker]; };
+  SDMtune = derive2 { name="SDMtune"; version="0.2.0"; sha256="03bcgmyj3r0bh6ak7bq2skr7mr57qdszpnivjpxr5xisdbws6hkb"; depends=[cli crayon dismo gbm ggplot2 htmltools jsonlite kableExtra maxnet nnet plotROC progress randomForest raster rasterVis Rcpp reshape2 rstudioapi scales stringr whisker]; };
   SDT = derive2 { name="SDT"; version="1.0.0"; sha256="1jwpfd1pnzy9wcl90qv5bgwi19shsw9064dvml9zwbif8yw8dzjj"; depends=[quadprog]; };
   SDaA = derive2 { name="SDaA"; version="0.1-3"; sha256="0z10ba4s9r850fjhnrirj2jgnfj931vwzi3kw9502r5k7941lsx0"; depends=[]; };
   SDraw = derive2 { name="SDraw"; version="2.1.8"; sha256="05yn0mqdv5a3zyvd6jhmkjh4w06ry8zy0libr56jmp8fcnninvyw"; depends=[deldir rgeos sp spsurvey]; };
   SEA = derive2 { name="SEA"; version="1.0"; sha256="1jcjgiy8459d8f603kiipcdq6d2awfcqzdv13hrdjgxpfnd1n1ha"; depends=[data_table doParallel foreach kolmim KScorrect MASS shiny]; };
   SEAsic = derive2 { name="SEAsic"; version="0.1"; sha256="1mg01sag6n1qldjvmvbasac86s7sbhi4k99kdkav2hdh6n9jg467"; depends=[]; };
-  SECFISH = derive2 { name="SECFISH"; version="0.1.4"; sha256="0bzm15k3rpyfa35gwpb6041cyfhnxfc4x08aryiy50j6xwcaif7n"; depends=[ggplot2 Hmisc optimization]; };
+  SECFISH = derive2 { name="SECFISH"; version="0.1.7"; sha256="0yd9k6anz9g4psg5kh1bhp0lr1i4y7in1m0mxk4qp14nl1zqy4fy"; depends=[ggplot2 Hmisc optimization]; };
   SECP = derive2 { name="SECP"; version="0.1-4"; sha256="0a4j0ggrbs0jzcph70hc4f5alln4kdn2mrkp3jbh321a6494kwl1"; depends=[SPSL]; };
   SEER2R = derive2 { name="SEER2R"; version="1.0"; sha256="0lk0kkp8sv3nl19zwqd7449mmjxsj3pqpzdmqf70qf8xh2pqyvzd"; depends=[]; };
   SEERaBomb = derive2 { name="SEERaBomb"; version="2019.1"; sha256="05ky8gixr19hajssrdvc34dxj4h38wy8ac6mghcfxcxy48vafldf"; depends=[DBI demography dplyr forcats ggplot2 labelled LaF mgcv openxlsx plyr purrr Rcpp readr reshape2 rgl RSQLite scales stringr survival tibble tidyr WriteXLS]; };
@@ -3885,10 +3955,10 @@ in with self; {
   SFtools = derive2 { name="SFtools"; version="0.1.0"; sha256="08k2ywkpk1pzp0qcwm7qx9gnv9hglspl9hrsrrfblagdpkw6rm2x"; depends=[doParallel ff wordspace]; };
   SGB = derive2 { name="SGB"; version="1.0"; sha256="11x0db241c9nkgpdd9p3v48klvkbrxrrbj73xb7lp6ldkdsi7gl2"; depends=[alabama Formula MASS numDeriv]; };
   SGCS = derive2 { name="SGCS"; version="2.7"; sha256="12kyfkd2phdmiyflgay2ndl6z5f9gz425mxi48wqs9ar3gh6akdw"; depends=[spatstat]; };
-  SGL = derive2 { name="SGL"; version="1.2"; sha256="13lpziwkxw2qj4496lvh76d59nfnmrd371jbgz78dhy8dpzyd7c3"; depends=[]; };
+  SGL = derive2 { name="SGL"; version="1.3"; sha256="055mx876ydg4kzvcm6rxfkxqz849zgzkzsskvrfgwj9fs1k6ja2v"; depends=[]; };
   SGP = derive2 { name="SGP"; version="1.9-0.0"; sha256="1nfb9sh10d4wkhzrxyq829b6dhf47pbjp0hzsixamiyjjzhrjz5x"; depends=[Cairo colorspace crayon data_table digest doParallel doRNG equate foreach gridBase gtools iterators jsonlite matrixStats plotly quantreg randomNames RSQLite sn toOrdinal]; };
   SGPdata = derive2 { name="SGPdata"; version="21.0-0.0"; sha256="0yi5744nd5m255rrysp1a05darg5ac7vrjk3wyfp45cvp45gcjcb"; depends=[crayon data_table]; };
-  SHAPforxgboost = derive2 { name="SHAPforxgboost"; version="0.0.1"; sha256="0lkd63k5npvdv35kw6q8smfb0afjgliy0pxx5285vh3dqp5d287y"; depends=[data_table ggExtra ggforce ggplot2 RColorBrewer xgboost]; };
+  SHAPforxgboost = derive2 { name="SHAPforxgboost"; version="0.0.2"; sha256="1d0sq27qs6k8rjrjq0g54s76523a3khb873wdy4hinxhcqwqzcaz"; depends=[BBmisc data_table ggExtra ggforce ggplot2 ggpubr RColorBrewer xgboost]; };
   SHELF = derive2 { name="SHELF"; version="1.6.0"; sha256="1w26vv2r7hd8jpfn6vi4g9z3pav4gy58akvq2vzlcxiaxwv8lvnm"; depends=[ggExtra ggplot2 ggridges gridExtra Hmisc MASS rmarkdown scales shiny shinyMatrix tidyr]; };
   SHIP = derive2 { name="SHIP"; version="1.0.2"; sha256="0b83cclibdz1r7sz968nmca4najwgps9wrdlsh4gxrl7fq40k4ln"; depends=[]; };
   SHT = derive2 { name="SHT"; version="0.1.1"; sha256="0mwk9vygkpc4jbjlkw0ksxdg3afckylgqmwigjcrvfgdc5is171x"; depends=[fastclime pracma Rcpp RcppArmadillo Rdpack]; };
@@ -3896,7 +3966,7 @@ in with self; {
   SIBER = derive2 { name="SIBER"; version="2.1.4"; sha256="1wn69giv6prg9dy10zn2fb63s6a0wqv5maccaf69267anh0s4qpc"; depends=[coda dplyr ellipse ggplot2 hdrcde magrittr mnormt purrr rjags spatstat spatstat_utils tidyr viridis]; };
   SIBERG = derive2 { name="SIBERG"; version="2.0.2"; sha256="0wfx1dpjd09gb736sm2xhrkba26nwnzn5x575h39n2g33jwqqy2r"; depends=[mclust]; };
   SID = derive2 { name="SID"; version="1.0"; sha256="1446zy4rqbw0lpyhnhyd06dzv238dxpdxgmsk34hqv7g3j7q5h1w"; depends=[igraph Matrix pcalg RBGL]; };
-  SIDES = derive2 { name="SIDES"; version="1.13"; sha256="10759nx2x3gy6zacn37fpr2dgx8j8ap8ic4infljfk0048f9in8w"; depends=[doParallel foreach MASS memoise multicool nnet survival]; };
+  SIDES = derive2 { name="SIDES"; version="1.14"; sha256="0hqpymsy0za2j2ax2md3n81mqjrkyc25s7sl90p3xihvbgf64mcz"; depends=[doParallel foreach MASS memoise multicool nnet survival]; };
   SIGN = derive2 { name="SIGN"; version="0.1.0"; sha256="1ak4zv5a50iknrxpfw1iffn8gv8mc0rz2gk96nzky9zx6li5drhk"; depends=[GSVA survcomp survival]; };
   SII = derive2 { name="SII"; version="1.0.3.1"; sha256="1xvk04b7725ksfd7h4p7px5zanbf6s7xlmjpb7w0nvbi6km2f7ri"; depends=[]; };
   SILGGM = derive2 { name="SILGGM"; version="1.0.0"; sha256="1lhmisgg2zbfksl7czz0fqag3732gkjc44n615ipxbdi2pvnc7m0"; depends=[glasso MASS Rcpp reshape]; };
@@ -3929,7 +3999,7 @@ in with self; {
   SMNCensReg = derive2 { name="SMNCensReg"; version="3.0"; sha256="06542jacy74mw6ic0i1ml09pn45sll96bya7dqja6bg9yp0m6bvr"; depends=[Matrix PerformanceAnalytics]; };
   SMPracticals = derive2 { name="SMPracticals"; version="1.4-3"; sha256="0zxq84f9i3b86xx6msb25b61gyj9k09iab2b7wg4d93yas9qzayf"; depends=[ellipse MASS nlme survival]; };
   SMR = derive2 { name="SMR"; version="2.0.1"; sha256="0qy56fmismcjklpf29ic2gi1g8ajdjpxsl0akb9cqzyisyf641ia"; depends=[]; };
-  SMUT = derive2 { name="SMUT"; version="1.0.1"; sha256="05a0xm6jsvfcz0w8dd4nhlyxp6mkzjm1v4yddddpsj2jyj7phyag"; depends=[MASS Rcpp RcppEigen SKAT]; };
+  SMUT = derive2 { name="SMUT"; version="1.1"; sha256="029ishj3jfq957bbkb2xw4jj0qpm4dasb8vpdik43pvd670mgq5s"; depends=[MASS Rcpp RcppEigen SKAT]; };
   SMVar = derive2 { name="SMVar"; version="1.3.3"; sha256="17wr4lixy3p32gr4jq02d7zsr88yrbddjsvynzdsdrwbxf4mwqhp"; depends=[]; };
   SNFtool = derive2 { name="SNFtool"; version="2.3.0"; sha256="1yplcwmy7jhsvz19r82ivpxfqav7q88jcf8d0r2k8ll9iqmi1dbc"; depends=[alluvial ExPosition heatmap_plus]; };
   SNPMClust = derive2 { name="SNPMClust"; version="1.3"; sha256="1gad1jfla4qpczh8vpwyss5cckzgpffsyj0d71r8drbspr4i3r90"; depends=[MASS mclust]; };
@@ -3947,7 +4017,6 @@ in with self; {
   SOR = derive2 { name="SOR"; version="0.23.1"; sha256="1accs4bqy080nfmgkdg7bgamdrcwcn01y6nydvvq12w3v8asdvwh"; depends=[Matrix]; };
   SOUP = derive2 { name="SOUP"; version="1.1"; sha256="0k8nlvl4681cz07xjazprcc0jhknfa5hgr7w1qxxmgrp3sprr8r4"; depends=[tensor]; };
   SPA3G = derive2 { name="SPA3G"; version="1.0"; sha256="15f38imwqn1zifym2821q7xysvws9vhlif4g16w0pnvk0wlhyb92"; depends=[]; };
-  SPACECAP = derive2 { name="SPACECAP"; version="1.1.0"; sha256="11szdq7sqr8ldwz7apbf1dv5mh43rbyb7dkivms58s5623xrq3sm"; depends=[coda]; };
   SPADAR = derive2 { name="SPADAR"; version="1.0"; sha256="0xzhcy5nglwx9j2jkm3i9xj1iw1y9wbf6rwfjyhpiwwq6qn8mn5r"; depends=[mapproj RCEIM]; };
   SPARQL = derive2 { name="SPARQL"; version="1.16"; sha256="0gak1q06yyhdmcxb2n3v0h9gr1vqd0viqji52wpw211qp6r6dcrc"; depends=[RCurl XML]; };
   SPAS = derive2 { name="SPAS"; version="2019.2"; sha256="1jgqywnkfw5mpkc59c4p9cj4x330rjkdj5v87pxrln8jcx7rcl26"; depends=[BB MASS Matrix msm numDeriv plyr]; };
@@ -3984,7 +4053,7 @@ in with self; {
   SRTtools = derive2 { name="SRTtools"; version="1.2.0"; sha256="1203i6nqclx0faxyvhdaapmfxy8h95jj83svxriqh1hpava5s1dy"; depends=[magrittr]; };
   SSBtools = derive2 { name="SSBtools"; version="0.4.0"; sha256="0rmvqhhw5zv8za3h8m59sqz0857hryn6c1bpsl4bdnyjzjfqa675"; depends=[Matrix stringr]; };
   SSDM = derive2 { name="SSDM"; version="0.2.6"; sha256="0qyx755h6rqgc6i3mw0vdaw2jx1yclkm9qxb98njkfk8if7wmbmn"; depends=[dismo e1071 earth gbm gplots mgcv nnet randomForest raster rpart SDMTools shiny shinydashboard shinyFiles sp spThin]; };
-  SSDforR = derive2 { name="SSDforR"; version="1.5.7"; sha256="0j6a7imd9q2s1szvazs1rcbs1sbhxh399wab845ilxxz12krd0zb"; depends=[MAd MASS metafor psych TSA TTR]; };
+  SSDforR = derive2 { name="SSDforR"; version="1.5.9"; sha256="1m09q2dxpbjnqwsan7wqyj3igzypgrj1dx3i24a8n77ddsw6wr3q"; depends=[MAd MASS metafor psych SingleCaseES TSA TTR]; };
   SSLASSO = derive2 { name="SSLASSO"; version="1.2-1"; sha256="0x9nbq9lsnq9g47y50z2ymfbj09l2d1lbii2cfjm76nzk3k5lb39"; depends=[]; };
   SSM = derive2 { name="SSM"; version="1.0.1"; sha256="1h8yyzh5rn5jay70kyzvwirfndi049a5w28qigrjv5rxd7ml84l7"; depends=[]; };
   SSN = derive2 { name="SSN"; version="1.1.13"; sha256="0hk138p1jnlda7d2wxlrf2ipkgliqlip1i5xp67aym979g0b3aaj"; depends=[BH igraph lattice maptools MASS Matrix rgdal rgeos RSQLite sp]; };
@@ -4002,7 +4071,7 @@ in with self; {
   STEPCAM = derive2 { name="STEPCAM"; version="1.2"; sha256="03crbc7hag8w333j9c7k0q7zy7xmfid4lq773p74r55jmac5xpjf"; depends=[ade4 ape FD geometry gtools MASS vcd]; };
   STI = derive2 { name="STI"; version="0.1"; sha256="1p408y9w2h4ljaq0bsw7vc1xghczjprf558cyg6994m0nv5fh4c4"; depends=[fitdistrplus zoo]; };
   STMedianPolish = derive2 { name="STMedianPolish"; version="0.2"; sha256="0jzgcfhm09cccg2nwbvrmnkah1psbnmg26rc2n7lz26n4b20p3l2"; depends=[gstat maptools nabor reshape2 sp spacetime zoo]; };
-  STMotif = derive2 { name="STMotif"; version="1.0.2"; sha256="0ybsjkzggngyb35ms1gb5fmyrnyl2awnq25qrv38mpxk31g96299"; depends=[ggplot2 RColorBrewer reshape2 scales shiny]; };
+  STMotif = derive2 { name="STMotif"; version="1.0.4"; sha256="0667jqpn40y1pw69am59jhkyds9433fm1v67y3vgqi1z1zzpan19"; depends=[ggplot2 RColorBrewer reshape2 scales shiny]; };
   STOPES = derive2 { name="STOPES"; version="0.1"; sha256="0gv58nf0m67bfqc15c7n4gksqk7h661c9b55qapk210j259b7xbv"; depends=[changepoint glmnet MASS]; };
   STPGA = derive2 { name="STPGA"; version="5.2.1"; sha256="0mwjv9r7x925ljmbwk2fl0xvf2n2hnf5n5z5p5rxr57ywvirqw1b"; depends=[AlgDesign emoa scales scatterplot3d]; };
   STRAH = derive2 { name="STRAH"; version="1.0"; sha256="0a2av8by99sq7l28c7cjwm6nqhp1i4pd5qxcsarvwd8f9fckvr5z"; depends=[BiocManager Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19]; };
@@ -4013,15 +4082,16 @@ in with self; {
   SUMMER = derive2 { name="SUMMER"; version="0.2.3"; sha256="1g1rsl0wr7gy7apkw6zjy39lch2pcd29h46vjkdg0jsmb8l3hk0d"; depends=[ggplot2 maptools Matrix reshape2 spdep survey survival]; };
   SVMMaj = derive2 { name="SVMMaj"; version="0.2.9"; sha256="1405gigyjfp8by8nfx4g3rhw9x6r6g7dkpgw52jllv6n4036xa3h"; depends=[dplyr ggplot2 gridExtra kernlab reshape2 scales]; };
   SVMMatch = derive2 { name="SVMMatch"; version="1.1"; sha256="1ykwrhlid4hs466xh3kv6y2qdhgk0jiglg0l3zwk5qlni6p26zc9"; depends=[Rcpp RcppArmadillo]; };
-  SVN = derive2 { name="SVN"; version="1.0"; sha256="0v0nyph5llvv3k1zn1ak4kvk6mqb0xd5iamqc1xlcdzamx8rjaib"; depends=[data_table igraph memoise]; };
+  SVN = derive2 { name="SVN"; version="1.0.1"; sha256="0n93lqb1f2s2qvzc8lrcqmr0fhd57xqbi0ymrqqmll31ns679m92"; depends=[data_table igraph memoise]; };
   SWATmodel = derive2 { name="SWATmodel"; version="0.5.9"; sha256="1i48g9nbjfn30ppwyzyz3k181nscv4wx773l8mzfdwhx0nlv4kyj"; depends=[EcoHydRology]; };
   SWIM = derive2 { name="SWIM"; version="0.1.0"; sha256="1mhmffmp0nqq7p6invg4rq4wq984g55fg83ysc9ma8rl584cspyz"; depends=[ggplot2 Hmisc nleqslv plyr Rdpack reshape2 spatstat]; };
   SWMPr = derive2 { name="SWMPr"; version="2.3.1"; sha256="1az6ss8wkdgq4l1cmfflajzs7z6w6140bclb289gb090pi69p7gy"; depends=[data_table dplyr ggmap ggplot2 gridExtra httr lattice maptools oce openair RColorBrewer reshape2 tictoc tidyr XML zoo]; };
+  SWMPrExtension = derive2 { name="SWMPrExtension"; version="1.1.1"; sha256="0xhs9fwmj0ba3igliv4qbxdhivfnn2z264ngiz2vvqnkpima0s6w"; depends=[broom dplyr EnvStats flextable ggplot2 ggthemes leaflet lubridate magrittr maptools officer RColorBrewer rgdal rgeos rlang scales sp SWMPr tidyr]; };
   SYNCSA = derive2 { name="SYNCSA"; version="1.3.3"; sha256="1g00jzghvvhnj2npplh87bwbm479mwldskhard0vjlfmagbhjm8p"; depends=[FD permute RcppArmadillo vegan]; };
   SafeBayes = derive2 { name="SafeBayes"; version="1.1"; sha256="09bhd3z9ia2mvpn1h0hil00j6cm4x9y9ymxc3gj8wd4ybdi3jqlm"; depends=[]; };
   SafeQuant = derive2 { name="SafeQuant"; version="2.3.1"; sha256="0rgi0ij33sdvkpmjynfmsj0f29kl9l9ylsqckg5x4v49m6mzq1yh"; depends=[Biobase corrplot data_table epiR gplots limma optparse seqinr]; };
   Sample_Size = derive2 { name="Sample.Size"; version="1.0"; sha256="1vfnb2gg3rax4sxd81xqznfvh300nv45nn7zjsyrdjyg1n3ym7nw"; depends=[]; };
-  SampleSize4ClinicalTrials = derive2 { name="SampleSize4ClinicalTrials"; version="0.1.0"; sha256="0wx1rfyf753wppjwwb3l1zpmg4b2mwnwjcw45yzav54yxaszy2v3"; depends=[]; };
+  SampleSize4ClinicalTrials = derive2 { name="SampleSize4ClinicalTrials"; version="0.1.1"; sha256="15q1jsvnz3bhnjil0wbladahac0ppx3qgg5qz7z70vnivgjah606"; depends=[]; };
   SampleSizeMeans = derive2 { name="SampleSizeMeans"; version="1.1"; sha256="1wbc46n8b8wbcxl21blbzs5728dr8r0l8d3jpzbha8pcav0xrh1m"; depends=[]; };
   SampleSizeProportions = derive2 { name="SampleSizeProportions"; version="1.0"; sha256="0mvkvx3nni0l8ys68sq3h2zlbjvksdcdzxqlf03k0ca5bbcmdf9l"; depends=[]; };
   SamplerCompare = derive2 { name="SamplerCompare"; version="1.3.0"; sha256="1lqnkgbg1naa3crk3rakrf37vvxj6mbilbpxrv0k5iifdmh0b7k1"; depends=[mvtnorm]; };
@@ -4056,8 +4126,9 @@ in with self; {
   Select = derive2 { name="Select"; version="1.4"; sha256="1qx4wwxxwjq31vf645xvwb0y2z5h4v6ca8fcrfpaj5kc33f333v2"; depends=[ade4 FD lattice latticeExtra Rsolnp]; };
   SelectBoost = derive2 { name="SelectBoost"; version="1.4.0"; sha256="14i6dgg1yqnghjjfvi7l58kqm6pry9b91sy9gkwrvfqg0nz1dpny"; depends=[Cascade glmnet igraph lars msgps Rfast]; };
   SelvarMix = derive2 { name="SelvarMix"; version="1.2.1"; sha256="02d16ffw5syq0d3yiim9jgrjlz99n956zxp23idpsmq6lb2whq66"; depends=[glasso Rcpp RcppArmadillo Rmixmod]; };
-  SemNetCleaner = derive2 { name="SemNetCleaner"; version="1.0.0"; sha256="0bxc6i4qa81pqfcxvms55avnnys15iwibnawckvr900pn9mns50w"; depends=[searcher SemNetDictionaries stringdist]; };
-  SemNetDictionaries = derive2 { name="SemNetDictionaries"; version="0.1.2"; sha256="1swrccbdzqx8yv6z1kacd8zllsma94cg4vmrc08hz6fj93bya73j"; depends=[]; };
+  SemNeT = derive2 { name="SemNeT"; version="1.1.1"; sha256="0magjdc8k1ln8ssfy50ihsnx9ni89j6iir60dbgbwgsyvg8rcqxk"; depends=[doParallel dplyr foreach ggplot2 igraph lsa magrittr NetworkToolbox networktools pbapply plyr purrr qgraph RColorBrewer SemNetCleaner]; };
+  SemNetCleaner = derive2 { name="SemNetCleaner"; version="1.1.1"; sha256="0ngnk4pz67caawg3jn46dv5jk4kppfdxhl1823bvzjw5nbw468wa"; depends=[foreign hunspell R_matlab readxl searcher SemNetDictionaries stringdist]; };
+  SemNetDictionaries = derive2 { name="SemNetDictionaries"; version="0.1.4"; sha256="1vqb4jbg56n45c6avc8srrksw82m2l1w0qf69cxpfd2gac62phrf"; depends=[]; };
   Semblance = derive2 { name="Semblance"; version="1.1.0"; sha256="1kzrg5z3244nx9y37p092wpangni3fxpx04i5fb4dhrmav4rvgab"; depends=[DescTools fields msos PerformanceAnalytics]; };
   SemiCompRisks = derive2 { name="SemiCompRisks"; version="3.3"; sha256="06anhf0kqaz4i84g73w3l4gf0q2mwi00vlkciqfbxpwgrbacplf6"; depends=[Formula MASS survival]; };
   SemiMarkov = derive2 { name="SemiMarkov"; version="1.4.6"; sha256="0nga790kcrvmbrx5asp4062711x0kjsccc246l4syiiw30b769ig"; depends=[MASS numDeriv Rsolnp]; };
@@ -4074,20 +4145,21 @@ in with self; {
   SeqGrapheR = derive2 { name="SeqGrapheR"; version="0.4.8.5"; sha256="041hlf64zbndz76r076pmym4dw4xl3fahryvpvjspw0sdlhmfm8c"; depends=[Biostrings cairoDevice gWidgets gWidgetsRGtk2 igraph rggobi]; };
   SeqMADE = derive2 { name="SeqMADE"; version="1.0"; sha256="0nf1xjhk0kpmmzgcxycg3ccxvwq6gydjq7xq6n9m7k7v35v9v3qf"; depends=[MASS]; };
   SeqNet = derive2 { name="SeqNet"; version="1.0.0"; sha256="0933g3sydz04yxf98ww0szwk85hlp7z839da9f6w13761aai1r3k"; depends=[fitdistrplus ggplot2 igraph mvtnorm purrr RColorBrewer Rcpp rlang tibble]; };
-  Sequential = derive2 { name="Sequential"; version="3.0.1"; sha256="14vyl4cjc54p3snxvdxhx8d1fyb69lki4n22jy7d7bv8lk6ky9nj"; depends=[boot]; };
+  Sequential = derive2 { name="Sequential"; version="3.1"; sha256="0wh5bxqgmkmlbz9bmvpv3lp8mq4iih86a73ccl6fycfpqvq6nf6i"; depends=[boot]; };
   SequentialDesign = derive2 { name="SequentialDesign"; version="1.0"; sha256="1gi37pixwbpy7358id1c75rckr352hs8vjs8sk8qgsr97pkm5xdq"; depends=[Sequential]; };
   SetMethods = derive2 { name="SetMethods"; version="2.4"; sha256="06fcin03mvqbg4mk09ygn54li0wdyp57mv902c49zs9v4y8r88cs"; depends=[betareg fmsb ggplot2 ggrepel lattice QCA scatterplot3d]; };
   SetRank = derive2 { name="SetRank"; version="1.1.0"; sha256="0p7vwsw05s5hfw1mfh3fbm9nfzsymnxzrdjin7k21dx7asb618wy"; depends=[data_table igraph XML]; };
   SetTest = derive2 { name="SetTest"; version="0.2.0"; sha256="08wc6cbnannmwkncqhpcw6l0y7c1v7z3awk5j7fd853nszfmpbk0"; depends=[]; };
-  Seurat = derive2 { name="Seurat"; version="3.0.2"; sha256="016fgcmjz3sjfxdvam5hd7mdxpmpnc7f6p5zqlh97m21dgn5vpqn"; depends=[ape cluster cowplot fitdistrplus future future_apply ggplot2 ggrepel ggridges ica igraph irlba KernSmooth lmtest MASS Matrix metap pbapply plotly png RANN RColorBrewer Rcpp RcppEigen RcppProgress reticulate rlang ROCR rsvd Rtsne scales sctransform SDMTools tsne]; };
+  Seurat = derive2 { name="Seurat"; version="3.1.1"; sha256="084lr2fjdksshsmv1ww82bgn3a9mml7kswsidjrs89snabgvn360"; depends=[ape cluster cowplot fitdistrplus future future_apply ggplot2 ggrepel ggridges httr ica igraph irlba KernSmooth leiden lmtest MASS Matrix metap pbapply plotly png RANN RColorBrewer Rcpp RcppAnnoy RcppEigen RcppProgress reticulate rlang ROCR rsvd Rtsne scales sctransform SDMTools tsne uwot]; };
   ShapeChange = derive2 { name="ShapeChange"; version="1.4"; sha256="1ch7avx8mxjk8vrp17inaihmbsv968wflyk1n4fbjvacbl24vn2b"; depends=[coneproj quadprog]; };
   ShapePattern = derive2 { name="ShapePattern"; version="1.0.1"; sha256="18jzs0sq21qhldm86mgx7yb9kl473vv1aljl9hm4560xy5pd5fnb"; depends=[rgdal rgeos sp]; };
   ShapeSelectForest = derive2 { name="ShapeSelectForest"; version="1.3"; sha256="1vvfl1ldrn0l9w38hx0hhszvj5a2dpmfl6ljzw7f0ji181lrx96m"; depends=[coneproj raster rgdal]; };
   SharpeR = derive2 { name="SharpeR"; version="1.2.0"; sha256="1gw8wwdqbra4bccbcamqn2j7d853rga1vcvk1p6naih6vbnfqn2s"; depends=[matrixcalc sadists]; };
+  ShiftShareSE = derive2 { name="ShiftShareSE"; version="1.0.0"; sha256="1i77f2pc4a8x2w1x9p56m1jv317pmlidp2pmk7s2xynwwviqylmb"; depends=[Formula]; };
   ShinyImage = derive2 { name="ShinyImage"; version="0.1.0"; sha256="0nhsaq6i9lr8gqpdkahw3qr0c0cb0qwc0nqpk1ism21l6zg6ahc9"; depends=[EBImage R6 shiny shinyjs]; };
   ShinyItemAnalysis = derive2 { name="ShinyItemAnalysis"; version="1.3.1"; sha256="1s1kb1rrppk0kfqywgsmyfl32hrq9ywv8241n9d3xv88cflxz237"; depends=[corrplot cowplot CTT data_table deltaPlotR difNLR difR DT ggdendro ggplot2 gridExtra knitr latticeExtra ltm mirt moments msm nnet plotly psych psychometric reshape2 rmarkdown shiny shinyBS shinydashboard shinyjs stringr VGAM xtable]; };
   ShinyTester = derive2 { name="ShinyTester"; version="0.1.0"; sha256="0wm4rl2p8ggw6v2chk9b6ygh5y8p8cwzbyra0nr0qr2ka97didp8"; depends=[dplyr purrr readr stringr tidyr visNetwork]; };
-  ShortForm = derive2 { name="ShortForm"; version="0.4.2"; sha256="0lfnafkkwfhqv984mrbd13inck1sdzn7rq1qdklfjwks89dx9ql9"; depends=[ggplot2 lavaan stringr tidyr]; };
+  ShortForm = derive2 { name="ShortForm"; version="0.4.3"; sha256="0v7aq45z1kdmqkrfpas2z2kzdsw6z3v16pp6zmksrnjcd27ri41c"; depends=[ggplot2 lavaan stringr tidyr]; };
   ShrinkCovMat = derive2 { name="ShrinkCovMat"; version="1.4.0"; sha256="0iyri3syjk9xv49d87fdyhnxg5c5x827vnak8vgckkkp62sdln2q"; depends=[Rcpp RcppArmadillo]; };
   SiER = derive2 { name="SiER"; version="0.1.0"; sha256="1ng6vnh30z6z1nvclsdzc9gdbrsrb2kqdqvs6fwm0j1zqlk12x0y"; depends=[]; };
   SiMRiv = derive2 { name="SiMRiv"; version="1.0.3"; sha256="1kzvbzmqcxs0sh23nmjd39zkg68kbnc5djpbjhqhn55qjdfx5776"; depends=[mco raster rgdal sp]; };
@@ -4098,15 +4170,17 @@ in with self; {
   SignifReg = derive2 { name="SignifReg"; version="2.1"; sha256="01h6cz602m9jpnkpgbr5smmn3xp5aw5h5xl32kyhxqhybg75j6fj"; depends=[]; };
   Sim_DiffProc = derive2 { name="Sim.DiffProc"; version="4.4"; sha256="14qdz49gyjaja6yj053iv998mrib3nbzzf02g30sl5y0cxkpmnd1"; depends=[Deriv MASS]; };
   Sim_PLFN = derive2 { name="Sim.PLFN"; version="1.0"; sha256="1jmsydhpfv2z9cr99hfy8cairhkkxpwk4wnz1adixwxazkn7qfah"; depends=[DISTRIB FuzzyNumbers]; };
-  SimComp = derive2 { name="SimComp"; version="3.2"; sha256="04rmpxasaa888p6f0rhhpvpqc39fppdkcwbq5sxcslx7bwc9w9z8"; depends=[mratios multcomp mvtnorm]; };
+  SimBIID = derive2 { name="SimBIID"; version="0.1.2"; sha256="1xn5qpnyna125qpj5si9c94b4kxzj5nd86k3fplygdm51dc0m499"; depends=[coda dplyr ggplot2 mvtnorm purrr RColorBrewer Rcpp RcppArmadillo RcppXPtrUtils tibble tidyr]; };
+  SimComp = derive2 { name="SimComp"; version="3.3"; sha256="04qkis20zk0z42bv4nznffqlpwby0y0ij27gj4sa0ha864pg0hi5"; depends=[mratios multcomp mvtnorm]; };
   SimCop = derive2 { name="SimCop"; version="0.7.0"; sha256="1yrdy77a9h14v92c63ng8phi2ig73wy4xjjdb75322grc0bd3jq6"; depends=[quadprog]; };
   SimCorMultRes = derive2 { name="SimCorMultRes"; version="1.7.0"; sha256="10snjwrh95407iracbc52b5cvr3sp2539rrjp7fw63q50pjl285v"; depends=[evd]; };
   SimCorrMix = derive2 { name="SimCorrMix"; version="0.1.1"; sha256="1mx8xkg1nbh4x4xr6m672zyg00s3lky2sy5mz7dfkw40vz2bwi53"; depends=[BB ggplot2 MASS Matrix mvtnorm nleqslv SimMultiCorrData triangle VGAM]; };
   SimDesign = derive2 { name="SimDesign"; version="1.14"; sha256="0im53w0hjm7qdi4xlp8mccnjx43k819wics8gmfqqxljwna0mmmm"; depends=[foreach pbapply plyr]; };
+  SimDissolution = derive2 { name="SimDissolution"; version="0.1.0"; sha256="1rdsxykh740h22ln635m0ysm00pdw94vp7qhgify4mcvc46c3632"; depends=[alabama dplyr mvtnorm]; };
   SimEUCartelLaw = derive2 { name="SimEUCartelLaw"; version="1.0.1"; sha256="1wg9sayk55mp3f2qykvfk0cbqh050vh0n1fhpq4fmlxqll87aml9"; depends=[plot3D plot3Drgl rgl]; };
   SimHaz = derive2 { name="SimHaz"; version="0.1"; sha256="04q4xyc1ki1zr3grm3khfg0kbykjy3j9qpg332l7pxp4j3wa3aw3"; depends=[survival]; };
   SimInf = derive2 { name="SimInf"; version="6.3.0"; sha256="013qb7irn2gjhylmlp9h6c5knq22lkkjr16pyj65dil6wywh58gf"; depends=[Matrix]; };
-  SimJoint = derive2 { name="SimJoint"; version="0.2.1"; sha256="14bzqhvww8ygippcwxh98bxs0amyvpw1rvnsx2iwqxrmvsskgsrj"; depends=[Rcpp RcppArmadillo RcppParallel]; };
+  SimJoint = derive2 { name="SimJoint"; version="0.2.2"; sha256="1b88iv64hhil96cyfc3925askf7vfkr609x1qwwcw6pqi8bw1q4y"; depends=[Rcpp RcppArmadillo RcppParallel]; };
   SimMultiCorrData = derive2 { name="SimMultiCorrData"; version="0.2.2"; sha256="0brszbqxf40y65xp96c5hp7hhvz3gv0xlg93r5ik8qdh0bn0y1sw"; depends=[BB GenOrd ggplot2 Matrix nleqslv psych triangle VGAM]; };
   SimPhe = derive2 { name="SimPhe"; version="0.2.0"; sha256="01kzypahw41jk8s2c92h0k9w32yaicis07wb6k8qlqcmv0zj8xry"; depends=[]; };
   SimRAD = derive2 { name="SimRAD"; version="0.96"; sha256="0ivvd3k04v1akbblxcjhlyc315z3ig7wjs0g3b37lvlfp54ppbrg"; depends=[Biostrings ShortRead zlibbioc]; };
@@ -4127,7 +4201,7 @@ in with self; {
   Simpsons = derive2 { name="Simpsons"; version="0.1.0"; sha256="1pm6wga1yxc35zgz72plzq23d3l4bbzfdvhszdxmkn1pkk64h8ms"; depends=[mclust]; };
   SimuChemPC = derive2 { name="SimuChemPC"; version="1.3"; sha256="06sxknaykikcgbw7qbbw1risg0sbaisb68vhfd7cl6sg0327dznk"; depends=[rcdk]; };
   SinIW = derive2 { name="SinIW"; version="0.2"; sha256="1z7rcjy0i09a9hjpjj1x8i46lv042l20lvb6b0pnsky2sx3v78pd"; depends=[fdrtool pracma]; };
-  SingleCaseES = derive2 { name="SingleCaseES"; version="0.4.2"; sha256="18bw674jsdnzpagqsr3wjjrz0j9lkz39mpgmdcscvrs9pcj0jgfr"; depends=[dplyr magrittr purrr rlang tidyr tidyselect]; };
+  SingleCaseES = derive2 { name="SingleCaseES"; version="0.4.3"; sha256="05bd03ka6qxmq8ls9w0nfklya3qay90s3i0iqjpcd6id4g8cz2kb"; depends=[dplyr magrittr purrr rlang tidyr tidyselect]; };
   SitesInterest = derive2 { name="SitesInterest"; version="1.0"; sha256="06l6i6jnzwj683cvd9a9dg4nlb1wy1v3wb561y97a25bikm3mfy6"; depends=[plotrix]; };
   SixSigma = derive2 { name="SixSigma"; version="0.9-52"; sha256="07s4an2az2pgqhq9c08jrf6b95nrs1b3r1092d53n1ps8wbdmbln"; depends=[e1071 ggplot2 lattice nortest qcc reshape2 scales testthat xtable]; };
   SizeEstimation = derive2 { name="SizeEstimation"; version="1.1.1"; sha256="1rz57y76hzp880511kzm7nhxf201n0dr7ccip6slrjz784dl7s27"; depends=[MCMCpack msm]; };
@@ -4173,13 +4247,13 @@ in with self; {
   SpNMF = derive2 { name="SpNMF"; version="0.1.1"; sha256="1xybxx47i3ww5d7chwl38xc48fbsclgyxcki8h85c6dkm49dxy8i"; depends=[NMF]; };
   SpNetPrep = derive2 { name="SpNetPrep"; version="1.1"; sha256="1y3j7mwjxv69lrgqvi8kxvhlmdyr8v7gbg17741008xb32kgma8h"; depends=[leaflet maptools prodlim raster rgdal shiny shinythemes sp spatstat]; };
   SpaCCr = derive2 { name="SpaCCr"; version="0.1.0"; sha256="0qm1fr6nnax3i1i77fi73x1z8db557avh6kivs0nskb1dfj8ri4m"; depends=[abind dplyr ggplot2 Rcpp RcppArmadillo tidyr]; };
-  SpaDES = derive2 { name="SpaDES"; version="2.0.3"; sha256="050sga2xm9zjrx7qg9qbcv1zrjcl2drka1whsabsdjvmg06jw7ba"; depends=[quickPlot reproducible SpaDES_addins SpaDES_core SpaDES_tools]; };
+  SpaDES = derive2 { name="SpaDES"; version="2.0.4"; sha256="1ihxkr2c7rfpb02chmdv393nfc1id1cg7lq8pbb64xm5vdpyj0bv"; depends=[quickPlot reproducible SpaDES_addins SpaDES_core SpaDES_tools]; };
   SpaDES_addins = derive2 { name="SpaDES.addins"; version="0.1.2"; sha256="0z1n48kfwy460zfam88ayfiq8sbzvnf6cpkasr74nykr4fabs5ha"; depends=[devtools magrittr miniUI reproducible rstudioapi shiny SpaDES_core stringi]; };
-  SpaDES_core = derive2 { name="SpaDES.core"; version="0.2.5"; sha256="0p6xfxx8wd01figni4vdqh12in2z42xihjwmns8q873kivh5bakf"; depends=[codetools crayon data_table DEoptim DiagrammeR dplyr fastdigest fpCompare googledrive httr igraph lubridate quickPlot R_utils raster RCurl reproducible stringi]; };
+  SpaDES_core = derive2 { name="SpaDES.core"; version="0.2.6"; sha256="0mqr76qxw0c87ansq4v7v9cb41cgph8sw3lfgv13f3l7mc34kvm6"; depends=[backports codetools crayon data_table DEoptim DiagrammeR dplyr fastdigest fpCompare httr igraph lubridate quickPlot R_utils raster RCurl reproducible stringi]; };
   SpaDES_tools = derive2 { name="SpaDES.tools"; version="0.3.2"; sha256="0sda1r7vzfzhpk08dvix4lgz1i40dhqqrb7m917nvjd7i8q6jq7b"; depends=[bit checkmate CircStats data_table fastmatch ff ffbase fpCompare magrittr quickPlot raster Rcpp reproducible rgeos sp]; };
   SpaTimeClus = derive2 { name="SpaTimeClus"; version="1.0"; sha256="1l204b8yd11pxwcb026xy39f4lps4sqk6mml8cybnjch8clk9djc"; depends=[Rcpp RcppArmadillo]; };
   SpadeR = derive2 { name="SpadeR"; version="0.1.1"; sha256="0iy2rkq4vvps1a73kqq37zpsyl4pvl3vh07dwvpfhvp7f8nxbx99"; depends=[]; };
-  SparkR = derive2 { name="SparkR"; version="2.4.3"; sha256="02knqjc12ynjk7pnr7i0mcmksmn8q5pr43z6pp02qmmm018yy4rq"; depends=[]; };
+  SparkR = derive2 { name="SparkR"; version="2.4.4"; sha256="181qys7whk061bk8gl8ah34g4wk3a0lw40dnx18nj8yf5iq6yvzd"; depends=[]; };
   SparseBiplots = derive2 { name="SparseBiplots"; version="3.5.0"; sha256="00ynx0cr543zyx9b633cbdalza9wmfgbvvgvr8b6s5r71lpjii8f"; depends=[sparsepca]; };
   SparseDC = derive2 { name="SparseDC"; version="0.1.17"; sha256="0gsfj8631s67a0r9qjjll4rbb57nzk5fwm5bbggvf0027b9hk0pp"; depends=[]; };
   SparseFactorAnalysis = derive2 { name="SparseFactorAnalysis"; version="1.0"; sha256="0lgfvydxb86r5hks1mf0p0yhgpx8s8fbkc3q6dimc728rw26qcv5"; depends=[directlabels ggplot2 MASS proto Rcpp RcppArmadillo truncnorm VGAM]; };
@@ -4213,11 +4287,11 @@ in with self; {
   SpeciesMix = derive2 { name="SpeciesMix"; version="0.3.4"; sha256="0d6hfmzxqcvg4fcvpsfxx36k95fwkws4rlylrixikndj2fncgwb5"; depends=[MASS numDeriv]; };
   SpecsVerification = derive2 { name="SpecsVerification"; version="0.5-2"; sha256="0dnya9mzkf48clp51jrnkz6lc4fps38nn3lap7n2wcp3dvbvdycg"; depends=[Rcpp RcppArmadillo]; };
   SpectralMap = derive2 { name="SpectralMap"; version="1.0"; sha256="15689023k9jzg3s7bx5m97dmn00z876amqhxsxksy8n8wf09wr57"; depends=[fields scatterplot3d]; };
-  Spectrum = derive2 { name="Spectrum"; version="0.7"; sha256="1wkz7q1c67p25czna2s3n76gqhmcp9b3kv8i0npbrfvcahyqxwjb"; depends=[ClusterR diptest ggplot2 RColorBrewer Rfast Rtsne umap]; };
+  Spectrum = derive2 { name="Spectrum"; version="0.8"; sha256="0q6aqmvr4lkswb1q2hch4mmzhy384kha61mhjp6y8ss13h7lhp9d"; depends=[ClusterR diptest ggplot2 RColorBrewer Rfast Rtsne umap]; };
   SphericalCubature = derive2 { name="SphericalCubature"; version="1.4"; sha256="14xrxhmhavz82rcixnyharnbrvdzs6rh7gbxihaxh431d90w2q3k"; depends=[abind cubature mvmesh SimplicialCubature]; };
   SphericalK = derive2 { name="SphericalK"; version="1.2"; sha256="18py4ylm10s75pihjvcy7w948379zy9l9azriw7g7pyp7px29wda"; depends=[]; };
   SplitReg = derive2 { name="SplitReg"; version="1.0.0"; sha256="09ni4hqyr3ng1yvb2g4wyl8vm1sa05rv649g0c9bfq6m6cx7xdvy"; depends=[Rcpp RcppArmadillo]; };
-  SplitSoftening = derive2 { name="SplitSoftening"; version="1.0-0"; sha256="1nng2rbldpxflnn7kqdp4r334lcjyznwbc50sfrd4rxyhcmmy36n"; depends=[]; };
+  SplitSoftening = derive2 { name="SplitSoftening"; version="2.0-0"; sha256="0nlli8nap6ilb5ns1xavyb06nhj2dlf4p0gajmsgrz32s2ljhr8s"; depends=[]; };
   SportsAnalytics = derive2 { name="SportsAnalytics"; version="0.2"; sha256="1vb080ak1mfvr6d0q9i3r8hd547ba80bavjdcri0gclqqcjf1ach"; depends=[]; };
   SqlRender = derive2 { name="SqlRender"; version="1.6.2"; sha256="1b2wkzy10m4zn1yjny1h8kx5k6vfl78vw82fq8a7ksxm113vjxs7"; depends=[rJava]; };
   Sstack = derive2 { name="Sstack"; version="1.0.1"; sha256="137vsas2kw3l37c141g51sgx0j6z8ys6hbxjmsdymz1fxsjr4adg"; depends=[doParallel dplyr foreach randomForest]; };
@@ -4229,10 +4303,9 @@ in with self; {
   Stack = derive2 { name="Stack"; version="2.0-1"; sha256="09fgfhw9grxnpl5yg05p9gvlz38iw4prns1jn14nj3qx01k5rnxb"; depends=[bit ff ffbase plyr stringr]; };
   StagedChoiceSplineMix = derive2 { name="StagedChoiceSplineMix"; version="1.0.0"; sha256="1008gm6zv5k8lpv0qg42qjriajmx0n4kshjh76mvx91dpi788ivh"; depends=[plyr]; };
   StakeholderAnalysis = derive2 { name="StakeholderAnalysis"; version="1.2"; sha256="164mah8h8izxaqp8hc43l6mlnf95pydkcx2laqrlqr9b0bybadxb"; depends=[]; };
-  StanHeaders = derive2 { name="StanHeaders"; version="2.18.1-10"; sha256="0njnnd9480i0qrwx4j71kn08rkrpbhwpakzl2iyyja2l20i7x7wa"; depends=[]; };
+  StanHeaders = derive2 { name="StanHeaders"; version="2.19.0"; sha256="14j5w4pnk45b3wbjclrsq7q1pxdrz264wvhz94vkm43sdacqzax0"; depends=[]; };
   StandardizeText = derive2 { name="StandardizeText"; version="1.0"; sha256="0s267k2b109pcdiyd26gm4ag5afikrnnb55d3cs6g2fvzp744hfp"; depends=[]; };
   Stat2Data = derive2 { name="Stat2Data"; version="2.0.0"; sha256="1fpp3b4k7x915a9wkpyj4dvvqp0wz7c3lpbh154vrxrdsr712z0k"; depends=[]; };
-  StatCharrms = derive2 { name="StatCharrms"; version="0.90.92"; sha256="1vjb214zcy48rc95wnwqh0xkflxyp4vp1rxirmc3ndi23mg6p1yi"; depends=[cairoDevice car clinfun coxme gWidgets gWidgetsRGtk2 lattice multcomp nlme R2HTML RGtk2 RSCABS survival]; };
   StatDA = derive2 { name="StatDA"; version="1.7"; sha256="1hsy4aivd5ga2zj65hr2c5cn9qgjnhs123qqyg6q959vsjxzp0i0"; depends=[cluster e1071 geoR MASS MBA mgcv rgl robustbase sgeostat xtable]; };
   StatDataML = derive2 { name="StatDataML"; version="1.0-26"; sha256="1lcckapbhqdbg6alnhm2yls66lnkxnxamdlzx6pbfqv1dhsy36gf"; depends=[XML]; };
   StatMatch = derive2 { name="StatMatch"; version="1.3.0"; sha256="1ms8qmxgpfa9sk7kl6hpcal14xxn7i84h662va2n045w7p0qmcjw"; depends=[clue lpSolve proxy RANN survey]; };
@@ -4243,7 +4316,7 @@ in with self; {
   SteinerNet = derive2 { name="SteinerNet"; version="3.0.1"; sha256="1jkvv0hsj85i1zfr1bmdsrbwgl11mxpfci3z7997m5vvb5fb5cxn"; depends=[igraph]; };
   Stem = derive2 { name="Stem"; version="1.0"; sha256="1fr02mi5qyxbqavdh2hg8ggw4nfjh3vs7g0vh834h6y0v53l71r5"; depends=[MASS mvtnorm]; };
   StempCens = derive2 { name="StempCens"; version="0.1.0"; sha256="11gspjrcl6yiyr19hankan5mcxipfsdkhha6nsiybs1chg5wx6f4"; depends=[distances ggplot2 gridExtra Matrix MCMCglmm mvtnorm optimx sp spTimer ssym tmvtnorm]; };
-  StepReg = derive2 { name="StepReg"; version="1.2.0"; sha256="0igpdsrq47nrklrgqhhxk7vf4b744fnd6pas07kbwx9qbkih96n4"; depends=[Rcpp RcppEigen]; };
+  StepReg = derive2 { name="StepReg"; version="1.2.1"; sha256="166g47jqbxqxdgr0654vhmlgpcdcsly5wy35myx0fs0dsaqxzfkd"; depends=[Rcpp RcppEigen]; };
   StepSignalMargiLike = derive2 { name="StepSignalMargiLike"; version="2.6.0"; sha256="0j85lvs2bljfhf482r31sq3xgk8l73hcw22wgxxp8z8nla38cwf9"; depends=[Rcpp]; };
   StepwiseTest = derive2 { name="StepwiseTest"; version="1.0"; sha256="1fdm4s9l6grgd45r98ybbsh40rnmnn16c0id6lv28cpmssi0iphi"; depends=[Rcpp RcppArmadillo]; };
   StereoMorph = derive2 { name="StereoMorph"; version="1.6.2"; sha256="1jjvkwln9kkjgyg1vn9ma6ffi32cxbkfh6zn69vilbdkmjcsycl2"; depends=[bezier jpeg MASS png Rcpp rjson shiny svgViewR tiff]; };
@@ -4253,7 +4326,7 @@ in with self; {
   StratSel = derive2 { name="StratSel"; version="1.3"; sha256="0hd6q8s8aiymcd33kv0gd0a4wzr86xxdzwn18jgpyk9q8pmg8gvl"; depends=[Formula MASS memisc mnormt pbivnorm]; };
   Strategy = derive2 { name="Strategy"; version="1.0.1"; sha256="0phja1r0qfvcswvw5w1x6ny86p84wkqb029fdqgw10djdm9xp0f2"; depends=[xts zoo]; };
   StratifiedBalancing = derive2 { name="StratifiedBalancing"; version="0.3.0"; sha256="0pklnm0q0imdhyzhwyb4i0j441dkk4k6qqlx8d4q2xnl62drqnvv"; depends=[bnlearn plyr]; };
-  StratifiedMedicine = derive2 { name="StratifiedMedicine"; version="0.1.1"; sha256="08ym6b4hfirny2xqbxlk9klin4yb9xzfafgbrqs15jiqsg9svwzl"; depends=[dplyr ggplot2 glmnet mvtnorm partykit ranger survival]; };
+  StratifiedMedicine = derive2 { name="StratifiedMedicine"; version="0.1.3"; sha256="1sh4hy0jyqlszmq3rhgx08d2sr0ri5zbs75gmddv96d45150yan8"; depends=[dplyr ggplot2 glmnet mvtnorm partykit ranger survival]; };
   StratifiedRF = derive2 { name="StratifiedRF"; version="0.2.2"; sha256="0a5djia6xacs17nnr5knr1acwzicrffz73q9nvnhdmihazq8v27d"; depends=[C50 dplyr]; };
   StratigrapheR = derive2 { name="StratigrapheR"; version="0.0.6"; sha256="1383gnxfsczvpazkhdq0fpv0x41jq47ksxam29yq19m2gh4afswc"; depends=[diagram dplyr GGally ggplot2 shiny stringr XML]; };
   StreamMetabolism = derive2 { name="StreamMetabolism"; version="1.1.2"; sha256="1sv30i7armk7jhxg5x9lh0r9qq3xixn1k2h0q89halkh1yraal8a"; depends=[chron maptools zoo]; };
@@ -4261,6 +4334,7 @@ in with self; {
   String2AdjMatrix = derive2 { name="String2AdjMatrix"; version="0.1.0"; sha256="058r30kjjna02nmd6ngqfcnn1yk5390i20xvl6qb5qk3bcp2wmxn"; depends=[stringr]; };
   StroupGLMM = derive2 { name="StroupGLMM"; version="0.1.0"; sha256="1w0xizdmwqflfhqwygyq7fw5ci7pdzmr8dfv3j0g3ljbj84kndzd"; depends=[aod broom car ggplot2 lme4 lmerTest lsmeans MASS mutoss nlme pbkrtest phia survey]; };
   StructFDR = derive2 { name="StructFDR"; version="1.3"; sha256="1y0wj7y36iq0lznc4qpsr2yis3an34iilpabkaxxmas2q4abg0qb"; depends=[ape cluster dirmult matrixStats nlme]; };
+  StructureMC = derive2 { name="StructureMC"; version="1.0"; sha256="1pj3inznw6flvmk22dzjcfjnwjhx7r98ngckz0axf6ipp3hb85jn"; depends=[MASS matrixcalc]; };
   SubCultCon = derive2 { name="SubCultCon"; version="1.0"; sha256="08q6k4nsv3gl5qk87s87smdg047yc2a4i7kg0fp08i7q7h62jkvz"; depends=[]; };
   SubTite = derive2 { name="SubTite"; version="2.0.3"; sha256="1i95f3x1nkhx9kqzxwvi15x6yq7mcdihzjxh60la6jvq5nscfi3l"; depends=[Rcpp RcppArmadillo]; };
   SubVis = derive2 { name="SubVis"; version="2.0.2"; sha256="1nb3zgm6i5lwfwdrn8mk3wkg8a4ldfvs27ai8v46l4316qc1fa9p"; depends=[Biostrings shiny]; };
@@ -4274,16 +4348,16 @@ in with self; {
   SupMZ = derive2 { name="SupMZ"; version="0.1.0"; sha256="0qzsx6czp72bamzs0lgpp8ypqfzb1c51xqfag8xx1nnnlcl1hv25"; depends=[dplyr magrittr]; };
   SuperExactTest = derive2 { name="SuperExactTest"; version="1.0.7"; sha256="1ysfsdzbkldcn7hzxhqikf5h2h9747xhfrirqgr8xx8q81wq989s"; depends=[]; };
   SuperGauss = derive2 { name="SuperGauss"; version="1.0.1"; sha256="0pkk8aaghkrh87g6ahikngp6hahaxwhr8i9vz30vv2bzxpgba54b"; depends=[fftw Rcpp RcppEigen]; };
-  SuperLearner = derive2 { name="SuperLearner"; version="2.0-24"; sha256="0hzgqhkj638dcrd4rwi1m37i0rjap2llz6zvf32jbcc5r2i5ixmd"; depends=[cvAUC nnls]; };
+  SuperLearner = derive2 { name="SuperLearner"; version="2.0-25"; sha256="0m17bw343612bzz85dz76skbda5wkv1c7pif8ldfsffx8inaxhy8"; depends=[cvAUC nnls]; };
   SuperPCA = derive2 { name="SuperPCA"; version="0.2.0"; sha256="1g2qf2y83clmjx327b9yk6bkx4l7rm0hj0sjvia2fll24m4hxcjz"; depends=[fBasics glmnet MASS matlab matlabr Matrix matrixStats pracma psych R_matlab RSpectra spls timeSeries]; };
   SuperRanker = derive2 { name="SuperRanker"; version="1.1.1"; sha256="1yiklw9zk7yw0xz5g3lmyl5lv325fnysimdwbxa37nyj6qdfv0ls"; depends=[prodlim Rcpp]; };
   SuperpixelImageSegmentation = derive2 { name="SuperpixelImageSegmentation"; version="1.0.1"; sha256="15d611ik6qg0602n6yk34a1pgfciv42nzd8qaarmxnqqrn8i584n"; depends=[ClusterR OpenImageR R6 Rcpp RcppArmadillo]; };
   SuppDists = derive2 { name="SuppDists"; version="1.1-9.4"; sha256="1ffx8wigqqvz2pnh06jjc0fnf4vq9z2rhwk2y3f9aszn18ap3dgw"; depends=[]; };
   SurfaceTortoise = derive2 { name="SurfaceTortoise"; version="1.0.1"; sha256="0q0swp0xs3lmfx2dxffqrna2spyr2l9ka0zbhmw8nkgb1w5rq5q6"; depends=[gstat raster rgeos sp]; };
-  Surrogate = derive2 { name="Surrogate"; version="1.2"; sha256="1wv8j2ps9wymr4jqgvs0nz91zh2yzs1hv04kkv0yqjq8pz65w5kd"; depends=[extraDistr ks lattice latticeExtra lme4 logistf MASS mixtools msm nlme OrdinalLogisticBiplot rgl rms rootSolve survival]; };
+  Surrogate = derive2 { name="Surrogate"; version="1.3"; sha256="02jy85lvdfpixmpsffpjfv1iadgv6skw5qhzqw11bm0aqk6jqi37"; depends=[extraDistr ks lattice latticeExtra lme4 logistf MASS mixtools msm nlme OrdinalLogisticBiplot rgl rms rootSolve survival]; };
   SurrogateOutcome = derive2 { name="SurrogateOutcome"; version="1.0"; sha256="0x91bmr4n9zn9cc72s91fzzsqhzhrkfpcbcla00gcsfmbjqz3997"; depends=[survival]; };
   SurrogateTest = derive2 { name="SurrogateTest"; version="1.1"; sha256="0m6m44vsfdgv47sswi2s8snmypa7s2ppad73fqnvymq8fm2b3yl2"; depends=[survival]; };
-  SurvBoost = derive2 { name="SurvBoost"; version="0.1.1"; sha256="1yk65s5n0qxgbg2sm91bqgq7w98hqsdg3hwdxxxwaga0wb7wd7n1"; depends=[directlabels ggplot2 mvtnorm plyr Rcpp RcppArmadillo RcppParallel reshape2 survival]; };
+  SurvBoost = derive2 { name="SurvBoost"; version="0.1.2"; sha256="17av00iwa3kpw0ihrvvynrfcghnq492b5k7n9fxfgf2nily24x2p"; depends=[directlabels ggplot2 mvtnorm plyr Rcpp RcppArmadillo RcppParallel reshape2 survival]; };
   SurvCorr = derive2 { name="SurvCorr"; version="1.0"; sha256="01rqdl503q1qnkn49iqnsjzis6azdsfi6s2hjky5k2zd6c9g18k5"; depends=[fields survival]; };
   SurvDisc = derive2 { name="SurvDisc"; version="0.1.1"; sha256="0ajvnm0a4krbm0m584bg58hd7dzl0f2rz5as1zsajx8agywb5qmv"; depends=[cubature MASS mvtnorm nlme simex survival]; };
   SurvGSD = derive2 { name="SurvGSD"; version="1.0.0"; sha256="0aa5zaf9akkqkxs8iqwnm93sfwakhhhs3qfafbk0vrwmb5yvzzm1"; depends=[flexsurv ldbounds mnormt]; };
@@ -4301,8 +4375,10 @@ in with self; {
   SyncRNG = derive2 { name="SyncRNG"; version="1.3.0"; sha256="0sywfmmy6mq6qsxkxjc67665snn1jds01j3h7ni1200igja139g2"; depends=[]; };
   SynchWave = derive2 { name="SynchWave"; version="1.1.1"; sha256="127hllvig8kcs9gr2q14crswzhacv6v2s4zrgj50qdyprj14is18"; depends=[fields]; };
   Synth = derive2 { name="Synth"; version="1.1-5"; sha256="1cfvh91nz6skjk8jv04fhwv3ga9kcsfgq3mdy8lx75jkx16zr0pk"; depends=[kernlab optimx]; };
+  SynthTools = derive2 { name="SynthTools"; version="1.0.0"; sha256="0izsp1gcch3bb7ssq3w5na5k0nli18mcqkx757icnb32jpy9m3a8"; depends=[dplyr magrittr Rdpack]; };
   T2EQ = derive2 { name="T2EQ"; version="1.1"; sha256="1skkkryw63pfx1xslia1lczb2psja6v6hcbph4isdcksb4l4pcig"; depends=[]; };
-  TAM = derive2 { name="TAM"; version="3.2-24"; sha256="1m185pkz56w6shc49cm2jpc9gyks1bv7r5qpqhqnib6xbbkz01xz"; depends=[CDM Rcpp RcppArmadillo]; };
+  TAG = derive2 { name="TAG"; version="0.1.0"; sha256="1ha29kxd767g47qi93sb0p3mwdzvbf1hwa0s2lq3c938hfa3pg6v"; depends=[DiceKriging doParallel FastGP Matrix mgcv mlegp randtoolbox Rcpp RcppArmadillo]; };
+  TAM = derive2 { name="TAM"; version="3.3-10"; sha256="1rkjp5x6wrk1dfspp1imvfals0wvy4w1wb8a5mhfbnilc7vgnlbq"; depends=[CDM Rcpp RcppArmadillo]; };
   TANDEM = derive2 { name="TANDEM"; version="1.0.2"; sha256="1h6m6aq2b5m9gdy4nck4dxv75gv50pfdhxx8xifgyv0d7n8czabq"; depends=[glmnet Matrix]; };
   TAQMNGR = derive2 { name="TAQMNGR"; version="2018.5-1"; sha256="0bf0sgqa53l9y2bhwg2ngiwlcgrmj0nvxchlsmcc8zin388qf4pb"; depends=[Rcpp]; };
   TAR = derive2 { name="TAR"; version="1.0"; sha256="0wjh2n9x3yn9by9a6mjvkl96qy7z549g6dsqp7b4d96xwmyqxlbv"; depends=[mvtnorm]; };
@@ -4313,7 +4389,7 @@ in with self; {
   TCA = derive2 { name="TCA"; version="1.0.0"; sha256="1wjzw126qlv1sf6panrm763vvm4ahrz1gscxbalg2bxd2879j1xc"; depends=[config data_table futile_logger gmodels Matrix matrixcalc matrixStats nloptr pbapply pracma quadprog rsvd]; };
   TCGA2STAT = derive2 { name="TCGA2STAT"; version="1.2"; sha256="15a5lh0nrdcxdwj7wj5m9rsvk1ygpp6wdjb4swilk91rb1lblikv"; depends=[CNTools XML]; };
   TCGAretriever = derive2 { name="TCGAretriever"; version="1.3"; sha256="0mi8j7k2b1sx75ka8ympydqpk8jqp8wz8dyf4vk4776fra7bq24p"; depends=[httr]; };
-  TCIApathfinder = derive2 { name="TCIApathfinder"; version="1.0.5"; sha256="0k1zcjw1zldbwgmy6xac12isw6612yyzzm9qg25jhmrf7k5yh72d"; depends=[httr jsonlite]; };
+  TCIApathfinder = derive2 { name="TCIApathfinder"; version="1.0.6"; sha256="15f3w6vhbqy4xzidxasjnqigxchd3jbr2kpm3gggjnkp7rzsfgaf"; depends=[httr jsonlite]; };
   TDA = derive2 { name="TDA"; version="1.6.5"; sha256="1048b3wh03pvgdplgzqbj9lcc7r4j67zvmizkxmp0gpm216b57nq"; depends=[BH FNN igraph Rcpp RcppEigen scales]; };
   TDAmapper = derive2 { name="TDAmapper"; version="1.0"; sha256="0cxgr2888v8azgdr3sg4vlcdyivkrxkk6dsp1ahv4frrwvg2z09k"; depends=[]; };
   TDAstats = derive2 { name="TDAstats"; version="0.4.0"; sha256="091fx0qla7jr5h7a84rp5mdsrafzdk87gk5xdflf62dk7qghb9kr"; depends=[ggplot2 Rcpp]; };
@@ -4323,6 +4399,7 @@ in with self; {
   TDPanalysis = derive2 { name="TDPanalysis"; version="0.99"; sha256="1kyhs4rpkm3gr55l6hrz4xcb9igk95si1m1sp175580k16n885z0"; depends=[plyr]; };
   TDboost = derive2 { name="TDboost"; version="1.2"; sha256="0sc9vby4892gm5b5h8gbdl4misqvgbkfp8fms53dk83malxkw1zx"; depends=[lattice]; };
   TE = derive2 { name="TE"; version="0.3-0"; sha256="15530a5qjlh74c1qji76j25mm4c59gifp34y066f8j21f70rahfs"; depends=[MASS rainbow]; };
+  TEAM = derive2 { name="TEAM"; version="0.1.0"; sha256="1yj7fw935rr7fh7h2p4ra8d3ynz5c6b30fqzm1djgav1k84wcin2"; depends=[ggplot2 ks plyr]; };
   TED = derive2 { name="TED"; version="1.1.1"; sha256="0nb2arx7c1m8ymnkmj3jwbcw23vhkr1f3vlym2hqs0pq0lnsl4g0"; depends=[animation fields foreach geoR RcppArmadillo zoo]; };
   TEEReg = derive2 { name="TEEReg"; version="1.1"; sha256="0v5qz3vvmcm3fh16kjb05j1r0yj23r7hrxf2www20ng3dmga5q0f"; depends=[]; };
   TELP = derive2 { name="TELP"; version="1.0"; sha256="0wzm3dz0489ha7dd6lkashvvjydck9jw2pavlx9plpksvzr4q9ph"; depends=[arules arulesViz ggplot2 gridExtra RColorBrewer tcltk2 tm wordcloud]; };
@@ -4336,22 +4413,23 @@ in with self; {
   TGS = derive2 { name="TGS"; version="1.0.0"; sha256="0x3a8c02zibqh57sr79gk792m6dsxgzmqpk73lflvg1l2s3r6zf8"; depends=[bnstruct doParallel foreach ggm minet rjson]; };
   TH_data = derive2 { name="TH.data"; version="1.0-10"; sha256="0mgz7aj2d9abbmdr65zgmg1ddp3fdbs3mfj83r5xadh5ldkir2k1"; depends=[MASS survival]; };
   TIMP = derive2 { name="TIMP"; version="1.13.2"; sha256="1y1bc6wsd32792apsc6qncxbw5y8ww9xlhy9v49mhwbffgzn6llg"; depends=[colorspace deSolve fields gclus gplots minpack_lm nnls]; };
-  TITAN2 = derive2 { name="TITAN2"; version="2.1"; sha256="0cxcgkf776411ln5wbfdyjxa42jw473vcq1kns6k6p8dpm1y91c2"; depends=[]; };
+  TITAN2 = derive2 { name="TITAN2"; version="2.3"; sha256="089v4rphxa2wz1w4akqrx7xnzgagirp8z1d38m2v9z9n9dlhj4id"; depends=[cowplot dplyr ggplot2 ggridges glue purrr snow tibble]; };
   TInPosition = derive2 { name="TInPosition"; version="0.13.6.1"; sha256="1c0h9zg71whmsjn5rnzv5kdrabl9kqrq627caznvrpa74c7pjks9"; depends=[ExPosition InPosition prettyGraphs TExPosition]; };
   TKF = derive2 { name="TKF"; version="0.0.8"; sha256="1db87lwx26ayv1x2k8qd9dfr6j3jkvdl9ykisaxr42l6akqy21nr"; depends=[ape expm numDeriv phangorn phytools]; };
   TLBC = derive2 { name="TLBC"; version="1.0"; sha256="08w187akbhfbz6nrrf7avf02lrhgj7bbrjmim9gkh4wlbjhzvw67"; depends=[caret HMM randomForest signal stringr]; };
-  TLMoments = derive2 { name="TLMoments"; version="0.7.4.3"; sha256="1nidxpphqz4l4q9flgwp9g8qgbijqs8i0alacx1j4b5wjqk8rh49"; depends=[ggplot2 hypergeo Rcpp]; };
+  TLMoments = derive2 { name="TLMoments"; version="0.7.4.4"; sha256="0frq3zpg08rpmkf4fshq9igc6irzn7br3rkbn4sxxf8kkp1c9m9l"; depends=[ggplot2 hypergeo Rcpp]; };
   TLdating = derive2 { name="TLdating"; version="0.1.3"; sha256="12lmakk1zd6wqh1318pnl14i7km2hynjn4ymchfjr2bwmp45c1ra"; depends=[gplots Luminescence]; };
   TMB = derive2 { name="TMB"; version="1.7.15"; sha256="1r2d8c5iazihba42sn33yarv0dcfiy989sx64zcf14zr8k6cgjzs"; depends=[Matrix RcppEigen]; };
   TMDb = derive2 { name="TMDb"; version="1.0"; sha256="0bbcmsv7b3vvskhdjww03gbcgql44vsvyjz2fajy9w2vgkr6ga90"; depends=[httr jsonlite]; };
   TNC = derive2 { name="TNC"; version="0.1.0"; sha256="0639wvylmk9mapvmz79ij65g1phv3ylc683awi4pgaf9yfwlmjkn"; depends=[]; };
   TOC = derive2 { name="TOC"; version="0.0-4"; sha256="1c16d4wrzir6v3c323sck6r9yz6mv1a70xamlj5ha1ydmfixcza9"; depends=[bit raster rgdal]; };
+  TOHM = derive2 { name="TOHM"; version="1.3"; sha256="08qwqryy9vdh906k3rhq4csysxlxgki4jjr505shfrxjvnlc662i"; depends=[EQL igraph Matrix nloptr Rmpfr]; };
   TOSTER = derive2 { name="TOSTER"; version="0.3.4"; sha256="1pxcvlw2nhh1sv0d662xc61rykf7kz7f4xjq3yrqf119gjcmps5s"; depends=[ggplot2 jmvcore R6]; };
   TP_idm = derive2 { name="TP.idm"; version="1.5"; sha256="07rxn0mpar3p6blg8fd3kbvdngyz9h9n0r0lcljnfdajfzbysv7h"; depends=[]; };
   TPD = derive2 { name="TPD"; version="1.1.0"; sha256="1ppj6ppi0lhlz079ygjnwx1l5f36bsi8zax23ssr1w6h4csw748m"; depends=[ggplot2 gridExtra ks mvtnorm]; };
   TPEA = derive2 { name="TPEA"; version="3.1.0"; sha256="1yyc3q4dyf4d8m7wi851dnxf3xnvvfnvj28kl8z8py4r4jsb2hfy"; depends=[foreach igraph Matrix MESS RCurl XML]; };
   TPES = derive2 { name="TPES"; version="1.0.0"; sha256="00g1limcappjrly93x7xb1llrgaxivmiky3kw40w2fs0303ha3d7"; depends=[]; };
-  TPMplt = derive2 { name="TPMplt"; version="0.1.2"; sha256="1sq72b0n0bskd488z2cag6hz9p48xgkwvp43hfc2gzs5x6ca7pmn"; depends=[directlabels e1071 ggplot2 RColorBrewer rgl rowr VBTree]; };
+  TPMplt = derive2 { name="TPMplt"; version="0.1.3"; sha256="0y2adbswgd8z3lzy9hi6qx7hm9ns2ky269q83y50ykyg2ms5qjhg"; depends=[directlabels dlm e1071 ggplot2 RColorBrewer rgl rowr VBTree]; };
   TPmsm = derive2 { name="TPmsm"; version="1.2.2"; sha256="1ibb3ayd808x3a562qldaww7czmfq1cd1j4g4ch5k7q38jw5x835"; depends=[KernSmooth]; };
   TR8 = derive2 { name="TR8"; version="0.9.20"; sha256="01xkjl269q1qlpm8cxpnb64czcv2xhrjjwp3brhxywx07za1q8lq"; depends=[gWidgets gWidgetstcltk plyr rappdirs RCurl readxl reshape taxize XML]; };
   TRADER = derive2 { name="TRADER"; version="1.2-3"; sha256="1w9m2b866dyj82s118m64q8j9a1chpq2km2pnn9mfwwj8sivgdgn"; depends=[dplR]; };
@@ -4403,7 +4481,7 @@ in with self; {
   TSstudio = derive2 { name="TSstudio"; version="0.1.4"; sha256="0cc59f7zw5plyj35svh6vr3id0j8c8ywihz5ms9c1gpfiq101a9w"; depends=[bsts data_table dplyr forecast forecastHybrid future future_apply lubridate magrittr plotly purrr RColorBrewer reshape2 scales tidyr viridis xts zoo]; };
   TTAinterfaceTrendAnalysis = derive2 { name="TTAinterfaceTrendAnalysis"; version="1.5.4"; sha256="0r79qbmn4z9v4f4g737xs3mhc4dp6s6llkcz6c3hihwnq1vrvd7h"; depends=[e1071 lubridate multcomp mvtnorm nlme pastecs relimp reshape rkt tcltk2 zoo]; };
   TTCA = derive2 { name="TTCA"; version="0.1.1"; sha256="16slr4c2nwbchsg6fk5prq22p2v4cjxzk93wd3xggav2lzrf8a5h"; depends=[MASS Matrix quantreg RISmed tcltk2 VennDiagram]; };
-  TTR = derive2 { name="TTR"; version="0.23-4"; sha256="18mzyv6cmxmqyqsfwlx2b2k055887mfgc2jgj8xkn8c6m56n05zb"; depends=[curl xts zoo]; };
+  TTR = derive2 { name="TTR"; version="0.23-5"; sha256="0fxipnyxaz55n4camrk9cs71x9w4dsmjrihysv8i1s6khf825rg6"; depends=[curl xts zoo]; };
   TTS = derive2 { name="TTS"; version="1.0"; sha256="0dhxj474dqjxqg0fc2dcx8p5hrjn9xfkn0rjn2vz3js92fa9ik9h"; depends=[mgcv sfsmisc]; };
   TTmoment = derive2 { name="TTmoment"; version="1.0"; sha256="0a4rdb4fk1mqnvvz0r15kni0g5vcj4xkkcwwv7c2gxc94xh5i5ih"; depends=[mvtnorm]; };
   TULIP = derive2 { name="TULIP"; version="1.0"; sha256="0v0qnhlgj31mdl8xhhcbdlnmfcfn2scpr0bf2jxkxpyxiavqdfxy"; depends=[glmnet MASS Matrix tensr]; };
@@ -4433,15 +4511,16 @@ in with self; {
   TempCont = derive2 { name="TempCont"; version="0.1.0"; sha256="1pl0czrpw74zfm5vycyl0h8hc3n5whf4g6a2759a22384gk5fq7k"; depends=[nlme]; };
   TempleMetrics = derive2 { name="TempleMetrics"; version="1.2.0"; sha256="0g8a799grsjqyq55pnlgixyq2qxhvl5k01jcjwc08q54w2dg0xf0"; depends=[BMisc pbapply]; };
   Temporal = derive2 { name="Temporal"; version="0.1.1"; sha256="0x001apiph67cyh2ckx2k9mi6jb86agnmfvn94i27q9lpy4cn1sh"; depends=[expint numDeriv plyr Rcpp RcppEigen]; };
-  Ternary = derive2 { name="Ternary"; version="1.1.1"; sha256="1l5hhr89n8yp62a5azdd2b828x48qmasspzmcrd20w5194n6jpcw"; depends=[viridisLite]; };
+  Ternary = derive2 { name="Ternary"; version="1.1.2"; sha256="0zbvgvs81ciz6qwxmmniylz5b4ci9r9zsa86b4fr36by27mafs6w"; depends=[viridisLite]; };
   TestCor = derive2 { name="TestCor"; version="0.0.1.0"; sha256="0jqx74khjw8d3gvw5kn3yqfps877043d9wa6ffb33b5x7nfnj4hj"; depends=[MASS Rcpp]; };
   TestDataImputation = derive2 { name="TestDataImputation"; version="1.1"; sha256="10b1g9m2s6nbs8lrpcx3s1jf0fmqyd07mg3vx1pnma8r3vwy1yh7"; depends=[Amelia mice]; };
+  TestDesign = derive2 { name="TestDesign"; version="0.2.5"; sha256="0a26c8qqxvv1g5id9cclg2h6xzpywf8dvn5v8s13dqr4z3001mnn"; depends=[crayon foreach logitnorm lpSolve Matrix Rcpp Rdpack]; };
   TestDimorph = derive2 { name="TestDimorph"; version="0.2.0"; sha256="1ckcfr4il1bcjcwvri35wj1bps4nxy1s959n40mx41211khj0rz1"; depends=[caret corrplot dplyr klaR MASS mda plyr purrr reshape2 Rfast rlang rowr stringr truncnorm]; };
   TestFunctions = derive2 { name="TestFunctions"; version="0.2.0"; sha256="018nkz8r6vqahrzq3d588i3ffb1bmd1pdk87j4ivcdsx99mq15sn"; depends=[]; };
   TestScorer = derive2 { name="TestScorer"; version="1.7.2"; sha256="006c3g3gx55mfr93srldwvgz5vm6nkr3f57yi4qg6krn0d32865f"; depends=[]; };
-  TestingSimilarity = derive2 { name="TestingSimilarity"; version="1.0"; sha256="1fagy9168cz09p460pa0qyn8m79zg4i2b9j5vg8gm1ssqi2znsl9"; depends=[alabama DoseFinding lattice]; };
+  TestingSimilarity = derive2 { name="TestingSimilarity"; version="1.1"; sha256="1iq0wh13rl6rby44ql4d286r1akzwmbpsvnq9p8lkl8709z0d34w"; depends=[alabama DoseFinding lattice]; };
   TexExamRandomizer = derive2 { name="TexExamRandomizer"; version="1.2.3"; sha256="0l0vpx4rkib2m8hwhwy9j8pqyf7gpb9qg8wpnh3238snwpadgy3a"; depends=[assertthat jsonlite Rcpp stringr]; };
-  TextForecast = derive2 { name="TextForecast"; version="0.1.1"; sha256="1d54hibsag3n85n8cbmp55mw78y6zy0h4vfq36l0qwhfdm0xxmq3"; depends=[class doParallel dplyr forcats forecast ggplot2 glmnet lars pdftools plyr pracma RColorBrewer rpart SnowballC tau text2vec tidyr tidytext tm tsDyn udpipe wordcloud]; };
+  TextForecast = derive2 { name="TextForecast"; version="0.1.2"; sha256="0yj2m22imzllz07wx04nar2mfpyl06jiq0ya1nwgaq74kaiym42p"; depends=[doParallel dplyr forcats ggplot2 glmnet Matrix pdftools plyr pracma RColorBrewer tidyr tidytext tm udpipe wordcloud]; };
   ThankYouStars = derive2 { name="ThankYouStars"; version="0.2.0"; sha256="0r77ns3102wj1wvrfsa06l427imxyfhigpbs36cdxl2j87qrjzl6"; depends=[httr jsonlite]; };
   ThermIndex = derive2 { name="ThermIndex"; version="0.2.0"; sha256="0s9d55577dq61qixwwfwmqc2k2c8my00j2ng97ng42cw0jc7aylm"; depends=[]; };
   Thermimage = derive2 { name="Thermimage"; version="3.2.1"; sha256="1550ri4qkm7yfv6bisy5pi1cic9mjbm842nl22bsyzj1631j1f8s"; depends=[png tiff]; };
@@ -4474,7 +4553,7 @@ in with self; {
   TopicScore = derive2 { name="TopicScore"; version="0.0.1"; sha256="1x6s3yn25rj8mbd25yi7f2rz0nwg8n0l1vs6r250kyjb17d2javm"; depends=[combinat Matrix quadprog RSpectra slam]; };
   TotalCopheneticIndex = derive2 { name="TotalCopheneticIndex"; version="1.0.1"; sha256="0yc21vs10rzmwx0z6d0gyyncr25835vb7wpn392csc5big6d73xc"; depends=[memoise]; };
   TraMineR = derive2 { name="TraMineR"; version="2.0-12"; sha256="11bgksw8bps9s5kmp9kyfh3pdxbqiq1iq21jl1j7i4m62bgrwyhn"; depends=[boot cluster Hmisc RColorBrewer]; };
-  TraMineRextras = derive2 { name="TraMineRextras"; version="0.4.5"; sha256="1xi2il33qklkjviayz644iwghpak0nvzakqfaln5l8gsg33gk7lg"; depends=[cluster RColorBrewer survival TraMineR]; };
+  TraMineRextras = derive2 { name="TraMineRextras"; version="0.4.6"; sha256="135s6aqkx18c364y9z0an0sbnwkgb2yrzxim3nd5khnbbnqdb5z2"; depends=[cluster RColorBrewer survival TraMineR]; };
   TrackReconstruction = derive2 { name="TrackReconstruction"; version="1.2"; sha256="1kpdiwwzxsdwv5255xlvcnxvnp39ky0aws41g1l5i7cpbv88kca5"; depends=[fields RColorBrewer]; };
   Trading = derive2 { name="Trading"; version="1.2"; sha256="0wlwpf1iygcs0cy7ms57b1bbp8f3s193bvc6fcm31ih5ph8pr48i"; depends=[]; };
   TrafficBDE = derive2 { name="TrafficBDE"; version="0.1.0"; sha256="1lnh9lbjxaradivnd1dkd2szggjh2r4v7klpyxb862dxsmdxxrqw"; depends=[caret data_table dplyr lubridate neuralnet RCurl zoo]; };
@@ -4491,19 +4570,20 @@ in with self; {
   TreeSim = derive2 { name="TreeSim"; version="2.4"; sha256="0nmzx2723n1f5lr951zz2ih2gnpfim5qzihlayhpf181z1qijv93"; depends=[ape geiger]; };
   TreeSimGM = derive2 { name="TreeSimGM"; version="2.3"; sha256="0qwqvmmdn290llz5hmmx2q24jjmd1bxssrslzv31kzi1yq5h6w0b"; depends=[ape TreeSim]; };
   TrendInTrend = derive2 { name="TrendInTrend"; version="1.1.2"; sha256="1kdjrzv2s5vpyg1lx6qkxj3dyi84qwhrvz17mx731f9pp70cz29j"; depends=[pROC rms]; };
+  TrendSLR = derive2 { name="TrendSLR"; version="1.0"; sha256="1x8j2dg3m7b22gva33y4s318a41wl60sz93y868z4j65hp13jb5k"; depends=[changepoint forecast imputeTS plyr Rssa tseries zoo]; };
   TriMatch = derive2 { name="TriMatch"; version="0.9.9"; sha256="17v8hdm594i9qs5hvrzb1k94wrzvx07479rmvbk4314fim27mabg"; depends=[ez ggplot2 gridExtra PSAgraphics psych randomForest reshape2 scales]; };
   TriadSim = derive2 { name="TriadSim"; version="0.1.1"; sha256="0m14k512b7q09zx51v2kxa8q9pk2i179w6ckl6jxj2acc860xw3k"; depends=[doParallel foreach snpStats]; };
   TrialSize = derive2 { name="TrialSize"; version="1.3"; sha256="1hikhw2l7d3c7cg4p7zzrgdwhy9g4rv06znpw5mc6kwinyakp75q"; depends=[]; };
   TrioSGL = derive2 { name="TrioSGL"; version="1.1.0"; sha256="0xzyv1vppw0v1xjpf83nnv1sx1xy7197ay6l7dzvr0vllappdam9"; depends=[]; };
   TripleR = derive2 { name="TripleR"; version="1.5.3"; sha256="13s1vlmr4sqa2sq2fbcld86bh3g73yb204aawbks11rjblwzvb0h"; depends=[ggplot2 plyr reshape2]; };
   TropFishR = derive2 { name="TropFishR"; version="1.6.1"; sha256="06793rgidq1hdm3jwg1fxpglf5vh7w3xbk4hzj1pgw04na464ibv"; depends=[doParallel GA GenSA Hmisc MASS msm propagate reshape2]; };
-  TruncatedNormal = derive2 { name="TruncatedNormal"; version="2.0"; sha256="10yrkpd3aslqd1q4zyi6z3qz0xdkg8dsmhlivwq40fkpw99p0bxj"; depends=[nleqslv qrng Rcpp RcppArmadillo]; };
+  TruncatedNormal = derive2 { name="TruncatedNormal"; version="2.1"; sha256="13aw1lvfq8mz91fqy65zs5aps231m9mq5v0r82c2ps72jaa7mcpw"; depends=[nleqslv randtoolbox Rcpp RcppArmadillo]; };
   Tsphere = derive2 { name="Tsphere"; version="1.0"; sha256="0xgxw2hfj40k5s0b54dcmz7savl8wy4midmmgc7lq4pyb8vd58xx"; depends=[glasso rms]; };
   TukeyC = derive2 { name="TukeyC"; version="1.3-3"; sha256="0bdnfr44hk4c1yh7i9ya95gwbwnplj3hf0k0pl1wm4ghiav39vcq"; depends=[doBy]; };
   TukeyRegion = derive2 { name="TukeyRegion"; version="0.1.2"; sha256="03lik9vkah3hjhn0l4ci95v2h4q8mnziq006idipn69l4gmnddxl"; depends=[bfp BH ddalpha MASS Rcpp rgl Rglpk]; };
   TunePareto = derive2 { name="TunePareto"; version="2.5"; sha256="0v1ylh4m5s80zp346pxxlvhm5070w83mlzfxjyp4n000c8r2nkf4"; depends=[]; };
   TurtleGraphics = derive2 { name="TurtleGraphics"; version="1.0-8"; sha256="0h77pj7rs3lrqi1y2dm1cbrmj13mjpq6y5nw8bcq0s2kbnkfw67l"; depends=[]; };
-  Tushare = derive2 { name="Tushare"; version="0.1.2"; sha256="1ai218cjw1hsxw75cc84w11y3gljccjsflwbnxp4mhr0af3lp2r3"; depends=[data_table forecast httr tidyverse]; };
+  Tushare = derive2 { name="Tushare"; version="0.1.3"; sha256="12aabkwlifc82yiym3yijpfpjhmhfwpw8mz4fb11qm6n4igr1yhg"; depends=[data_table forecast httr tidyverse]; };
   TwoCop = derive2 { name="TwoCop"; version="1.0"; sha256="1ycxq8vbp68z82r2dfg2wkc9zk3bn33d94xay20g2p55lnzl2ifd"; depends=[]; };
   TwoPhaseInd = derive2 { name="TwoPhaseInd"; version="1.1.1"; sha256="0xsqiq4x7vmhif9j8zi1smbchwm4fsbgb10i4vxi0biijybizk9z"; depends=[survival]; };
   TwoRegression = derive2 { name="TwoRegression"; version="0.1.2"; sha256="0qr9zrfmbh4c4207gvwa384q5njjx6nsl6lc58d25m8bkfalifpi"; depends=[data_table dplyr magrittr seewave]; };
@@ -4512,8 +4592,8 @@ in with self; {
   UBCRM = derive2 { name="UBCRM"; version="1.0.1"; sha256="1h9f8wlxdgb67qqqnfhd9gfs4l2cq84vajhcb0psva0gwdd1yf6i"; depends=[]; };
   UBL = derive2 { name="UBL"; version="0.0.6"; sha256="0238irg7r3g248h4x4bdb308wvfqq99hwykywf4k2bssdd25kwjk"; depends=[automap gstat MBA randomForest sp]; };
   UCR_ColumnNames = derive2 { name="UCR.ColumnNames"; version="0.1.0"; sha256="1nwwq93f60r9aik51l7mzckg81f81nz5kgzynyzp5sm4y2wmpzwn"; depends=[]; };
-  UCSCXenaShiny = derive2 { name="UCSCXenaShiny"; version="0.2.0"; sha256="04v5px1ph8529xn93bhr2r6kmfdr96xzbp3wnyr6i3a9rf3kdlb0"; depends=[dplyr DT ggplot2 ggpubr magrittr plotly RColorBrewer shiny shinyBS shinyjs shinythemes tibble UCSCXenaTools zip]; };
-  UCSCXenaTools = derive2 { name="UCSCXenaTools"; version="1.2.5"; sha256="1l7jblnwsywmkmjb7iqzyv0hbr9ldls374hcz4wynw1fbl66zk94"; depends=[dplyr httr jsonlite magrittr readr rlang]; };
+  UCSCXenaShiny = derive2 { name="UCSCXenaShiny"; version="0.3.0"; sha256="17xh879jxaj668xxa31vj67mm74gj74wqs1lg32y6mshfbcss9fp"; depends=[dplyr DT ggplot2 ggpubr magrittr plotly RColorBrewer shiny shinyBS shinyjs shinythemes shinyWidgets tibble UCSCXenaTools zip]; };
+  UCSCXenaTools = derive2 { name="UCSCXenaTools"; version="1.2.6"; sha256="06czkc9y0hxgq7392acml9b0l58yqhc56nnrwxhbsbb536zb8bhn"; depends=[dplyr httr jsonlite magrittr readr rlang]; };
   UKgrid = derive2 { name="UKgrid"; version="0.1.1"; sha256="1p2s49lj1b2nyp8m8mif8cfsgxli8ii649gix1hlyn73gzrm8mjj"; depends=[data_table dplyr lubridate magrittr rlang xts zoo]; };
   UNCLES = derive2 { name="UNCLES"; version="2.0"; sha256="0c61sm09dh0yfrjrjjnizg7qrf8xgc1zdldwhjh64kq8k8g5wa69"; depends=[class kohonen pdist]; };
   UNF = derive2 { name="UNF"; version="2.0.6"; sha256="0sr740dhfp7z9wvhajww43g5gz79x5y5dbflw5a813jgmiqm1jyq"; depends=[base64enc digest]; };
@@ -4539,7 +4619,7 @@ in with self; {
   UniDOE = derive2 { name="UniDOE"; version="1.0.2"; sha256="14jz4acrvbv59sbr7gya8g0z749vv0i04gl5wl0y4218byjvw6bs"; depends=[Rcpp]; };
   UniIsoRegression = derive2 { name="UniIsoRegression"; version="0.0-0"; sha256="0lmrmb9sbk41ak7sbcrzhfnijb1skgb4lqg9m9imc98lcp69h7z0"; depends=[Rcpp]; };
   Unicode = derive2 { name="Unicode"; version="12.0.0-1"; sha256="1wpzj5jwmb9d9iz1xvgn8mc2xjri28g97k4lpafybb1v4xnxqk54"; depends=[]; };
-  UniprotR = derive2 { name="UniprotR"; version="1.0.1"; sha256="03r375cy36vjlcksvjwhrgi2vh6gvycbp9ml5x0jmgfi729drdqd"; depends=[ggplot2 httr magick plyr scales]; };
+  UniprotR = derive2 { name="UniprotR"; version="1.0.3"; sha256="0jscjc1xd8z3kxppf1b7gz77apqfr5jv185hk6q15fmd35qd1ibb"; depends=[data_tree ggplot2 httr magick magrittr plyr scales]; };
   UnitCircle = derive2 { name="UnitCircle"; version="0.1.3"; sha256="0z5ssps8l5ka4aw4984qml15scw4pfssara5dls82afhfhpkszsr"; depends=[]; };
   UnivRNG = derive2 { name="UnivRNG"; version="1.2"; sha256="0cx6bdzzypxnaqi4wkb20saqd5sfa2rga5cqh694l70vj9c3zw26"; depends=[]; };
   UpSetR = derive2 { name="UpSetR"; version="1.4.0"; sha256="007i0njnjjy7vbrxabwav7a1kk2n0hn2mkvqsdzzfk10ckp5y7im"; depends=[ggplot2 gridExtra plyr scales]; };
@@ -4572,6 +4652,7 @@ in with self; {
   VLF = derive2 { name="VLF"; version="1.0"; sha256="1il8zhm80mc22zj16dpsy4s6s9arj21l9ik0vccyrpnlr8ws3d3l"; depends=[]; };
   VLMC = derive2 { name="VLMC"; version="1.4-3-1"; sha256="0cwfpxcj8g68j9z9fl66i0amj8ypf199iv3yyxzsmniqv4w5x4ar"; depends=[MASS]; };
   VNM = derive2 { name="VNM"; version="7.1"; sha256="19qglcibb7r6jjz0n0piklwfv3hi4jphd6vmyfbm0ccjjkmn5nin"; depends=[Rcpp]; };
+  VOSONDash = derive2 { name="VOSONDash"; version="0.4.4"; sha256="0pkfsjfygbf8rvaahmxj1d36nk428rcjp5vf54cwm3qqcf44zm9y"; depends=[httpuv httr igraph lattice magrittr RColorBrewer rtweet shiny syuzhet tm vosonSML wordcloud]; };
   VRPM = derive2 { name="VRPM"; version="1.2"; sha256="1cai5a71vzkx0d7cwzsxbcz7r9cdkqjk4l4bp2ffj5pp7nrlh15r"; depends=[fields ggplot2 Hmisc kernlab R2HTML ROCR shiny survival viridis]; };
   VSE = derive2 { name="VSE"; version="0.99"; sha256="07m5080nw72b77238v2wwdh4dxsvv6y78d4j1329n90wyj2crxl4"; depends=[car GenomicRanges igraph IRanges]; };
   VSURF = derive2 { name="VSURF"; version="1.1.0"; sha256="1azfd4sb89mp27l86k293qj81x94gfiy1ihwnb6c558p8h69xsgf"; depends=[doParallel foreach randomForest ranger Rborist rpart]; };
@@ -4598,7 +4679,6 @@ in with self; {
   VetResearchLMM = derive2 { name="VetResearchLMM"; version="1.0.0"; sha256="1a7wm04bsr5shak7l8ypxlhlnx3qkq1jdpjnji1n05p6b00ih9h1"; depends=[ggplot2 lme4 lmerTest multcomp nlme]; };
   ViSiElse = derive2 { name="ViSiElse"; version="1.2.1"; sha256="14vv25wnqcplf7k0ybfdlcvyhnja0h0kvz39yzlh2qkavjvdaf2y"; depends=[chron colorspace Matrix stringr]; };
   VineCopula = derive2 { name="VineCopula"; version="2.2.0"; sha256="12p1bmp3b5vm0zfmwhbjj5gbmp0gf1ad7dcyzk6lda3zqkvfyfmi"; depends=[ADGofTest copula doParallel foreach kdecopula lattice MASS mvtnorm network]; };
-  VisuClust = derive2 { name="VisuClust"; version="1.2"; sha256="0hnjmrz352950rzky88q4nwvkx7zp6x3lsm7kff5dl4w05iq4wsl"; depends=[aplpack]; };
   Voss = derive2 { name="Voss"; version="0.1-4"; sha256="056izh1j26vqjhjh01fr7nwiz1l6vwr5z4fll87w99nc5wc4a467"; depends=[fields]; };
   VoxR = derive2 { name="VoxR"; version="0.5.1"; sha256="07lsp6lrkq0gv55m84dl9w7gz5246d9avypqnkz96n3rbbgd0w5z"; depends=[]; };
   W2CWM2C = derive2 { name="W2CWM2C"; version="2.0"; sha256="139rbbhshiap3iq4s4n84sip3cwwjn2x7lm7kmzwj5glhl5dc6ga"; depends=[colorspace wavemulcor waveslim]; };
@@ -4621,11 +4701,10 @@ in with self; {
   WRS2 = derive2 { name="WRS2"; version="1.0-0"; sha256="1ax7lchbg0f5miq5779p1zmk6pw36hvwwmbpvsfqwahl5wlvii0s"; depends=[MASS mc2d plyr reshape]; };
   WRSS = derive2 { name="WRSS"; version="2.3"; sha256="182753820fjwl544sv7rhkjsdy268r8fgspyq88brqlpfj7k6rdw"; depends=[GGally ggplot2 Hmisc network nloptr]; };
   WRTDStidal = derive2 { name="WRTDStidal"; version="1.1.1"; sha256="0q2rdzbz3cbgr19sh9j3fqdn0lvwrq93qq2rjmnhx6ia9avkywa8"; depends=[caret dplyr fields foreach forecast ggplot2 gridExtra lubridate purrr quantreg RColorBrewer survival tidyr]; };
-  WVPlots = derive2 { name="WVPlots"; version="1.1.1"; sha256="0922r7h03aczhqjw20djc6nwvmj7rq8dbhk2752jv3ndjdl5ywlw"; depends=[cdata ggplot2 gridExtra mgcv sigr wrapr]; };
+  WVPlots = derive2 { name="WVPlots"; version="1.1.2"; sha256="1471fij60v0f9xn10zsnbd0m36x6c4ls2g9bfgpl2r9cmhliwix2"; depends=[cdata ggplot2 gridExtra mgcv sigr wrapr]; };
   WWGbook = derive2 { name="WWGbook"; version="1.0.1"; sha256="0q8lnd1fp4rmz715x0lf61py3xw8wg55yq3gvswaqwy68dlqrzjc"; depends=[]; };
   WWR = derive2 { name="WWR"; version="1.2.2"; sha256="0ia1dd12r1l08s9nhgvk55jmqwv58jawm25gd2ni6wpa3mcmq02g"; depends=[inline]; };
   WaMaSim = derive2 { name="WaMaSim"; version="1.0.0"; sha256="0sa7qd2bpn3sp06mlpissxxkfhg7j1d07nnwlnz7nyg7pivwnpan"; depends=[magrittr]; };
-  WaterML = derive2 { name="WaterML"; version="1.7.1"; sha256="0aqcanq2l3m9w1kglmkbqshs80wx9inmjp0c1i2j901g4k35ss5j"; depends=[httr RJSONIO XML]; };
   Watersheds = derive2 { name="Watersheds"; version="1.1"; sha256="1gn52nl0rr29pqq94gjasc4fi1kjxlrpjdkgm2x56j5jbd162drk"; depends=[lattice maptools rgeos sp splancs]; };
   WaveLetLongMemory = derive2 { name="WaveLetLongMemory"; version="0.1.2"; sha256="1p9ld6w2qgbvkvp7xkzzd14v89rxcwl6vlr1zgxkpc5awl1ln1a8"; depends=[fracdiff wmtsa]; };
   WaveletANN = derive2 { name="WaveletANN"; version="0.1.0"; sha256="08qnx0lk2laiyx1q1wxj15j0yic65r7mbhr6lqbdllq30v4dcj88"; depends=[forecast fracdiff wavelets]; };
@@ -4633,18 +4712,18 @@ in with self; {
   WaveletComp = derive2 { name="WaveletComp"; version="1.1"; sha256="07w2aa0jiflvxyqhgh48705hg8hjspd103jd00i2pcw2v42hwmf8"; depends=[]; };
   WaverR = derive2 { name="WaverR"; version="1.0"; sha256="084fhzggzm075w6wp2lqd3j0an21idhw8z5l8ynz4y96mpmn204a"; depends=[kimisc MASS]; };
   WeMix = derive2 { name="WeMix"; version="3.1.1"; sha256="0hg7ib3spfd5fp71gfbrh234wxinv3xswyaxb4gzd8342qg2xxhk"; depends=[lme4 Matrix minqa NPflow numDeriv Rmpfr statmod]; };
-  WebGestaltR = derive2 { name="WebGestaltR"; version="0.4.1"; sha256="1xr4qxrp98jawmpw9k2nlbl4qr8ydgm2krmf606ybjrng8l8mdzn"; depends=[apcluster doParallel doRNG dplyr foreach httr igraph jsonlite Rcpp readr rlang whisker]; };
+  WebGestaltR = derive2 { name="WebGestaltR"; version="0.4.2"; sha256="0in0v19ns4ngnf89m4gxfpqqhnh2vp4h9cf8zcn8pgvr8nzd6f49"; depends=[apcluster doParallel doRNG dplyr foreach httr igraph jsonlite Rcpp readr rlang whisker]; };
   WebPower = derive2 { name="WebPower"; version="0.5.2"; sha256="11255q41zai4q6n2mpk3fzhi2lyyr3g8dxqfajkb93f68m1b38jp"; depends=[lavaan lme4 MASS PearsonDS]; };
   WeibullFit = derive2 { name="WeibullFit"; version="0.1.0"; sha256="1a80gcqbmvb1rz2dr2syy16wn6ixjn6l40gayys9zy8302hky9ir"; depends=[e1071 FAdist glue kSamples mixdist optimx R_methodsS3 R_oo sqldf xtable]; };
   WeibullR = derive2 { name="WeibullR"; version="1.0.10"; sha256="1h2w1rgap9yjns7cby0559jwzzwhzjq1h6lwsawrfnni7c36iliq"; depends=[Rcpp RcppArmadillo]; };
-  WeightIt = derive2 { name="WeightIt"; version="0.5.1"; sha256="16gj7ynk4l67z7fjc345211hgqwxbdb6z1bpy27z5s4i7x4fyf8y"; depends=[cobalt]; };
+  WeightIt = derive2 { name="WeightIt"; version="0.6.0"; sha256="0x9k7n2fbcf78lnjnf6i8yr82mk0i6rrccf27b2yxv49a1ypwsgi"; depends=[ggplot2]; };
   Weighted_Desc_Stat = derive2 { name="Weighted.Desc.Stat"; version="1.0"; sha256="030i12mnwlj976avvk3grrccgprsckmc35dm2ajwdfc9dijhypnj"; depends=[]; };
   WeightedCluster = derive2 { name="WeightedCluster"; version="1.4"; sha256="05rmqhgfzh9fs4c1lhmrbk8s46ihaywy7n9qnivf7zcxxzxds0lj"; depends=[cluster RColorBrewer TraMineR]; };
   WeightedPortTest = derive2 { name="WeightedPortTest"; version="1.0"; sha256="007v3w9ssiv2sds7sikpal27g6pxwxhs7bvcyw6kr0vg8gvlbi8h"; depends=[]; };
   WeightedROC = derive2 { name="WeightedROC"; version="2018.10.1"; sha256="1hdksd47pkky83g6hn6123f243yw3bzrlaibdgr2kd5kxn9rma3y"; depends=[]; };
   WgtEff = derive2 { name="WgtEff"; version="0.1.2"; sha256="1z8pndv43ssgmzldwaq0088lmf1g2mkmrbmzyaismcpngn9fqxsk"; depends=[]; };
   WhatIf = derive2 { name="WhatIf"; version="1.5-9"; sha256="0ihpp3wbhpsg00g0s31l0ca4q0a2sch2a2j8cgz14g8na43x8831"; depends=[lpSolve pbmcapply Zelig]; };
-  WhiteStripe = derive2 { name="WhiteStripe"; version="2.3.1"; sha256="1qyv06ai83b1idfg4bgr97askyzlwi2dv8d5wkivb5czp7crdri1"; depends=[mgcv oro_nifti]; };
+  WhiteStripe = derive2 { name="WhiteStripe"; version="2.3.2"; sha256="0kzwglaazn820fzxd2g1fsiw2rnq0qxagns8b5mm3inflsgs35ng"; depends=[mgcv oro_nifti]; };
   WhopGenome = derive2 { name="WhopGenome"; version="0.9.7"; sha256="1xa7d9x5ny8g79scfkv7v5ix9m3mfzg0fks2bsan9zqyhcd01fsq"; depends=[]; };
   WiSEBoot = derive2 { name="WiSEBoot"; version="1.4.0"; sha256="1fch78884ay7m2gy602k8df78gkvjiwzkjk550w0k4xbv430ld0h"; depends=[FAdist wavethresh]; };
   WikidataQueryServiceR = derive2 { name="WikidataQueryServiceR"; version="0.1.1"; sha256="1bqgp3wldfmnwwh9llig8xpa4x0rcp1hcwyw7d7pw4ym61b2v65x"; depends=[dplyr httr jsonlite]; };
@@ -4701,7 +4780,7 @@ in with self; {
   aLFQ = derive2 { name="aLFQ"; version="1.3.5"; sha256="139fyb1zqr4ws2xkkv9i35m8pqmggyfig6mq2sgb84fkin7mgwfb"; depends=[bio3d caret data_table lattice plyr protiq randomForest reshape2 ROCR seqinr]; };
   aMNLFA = derive2 { name="aMNLFA"; version="0.1"; sha256="0sj6rxsdib5zmz78c94bjdlcdwhfkvbc7sp3pncj6vsvvzgqcjdp"; depends=[devtools ggplot2 gridExtra MplusAutomation plyr reshape2 stringr]; };
   aRpsDCA = derive2 { name="aRpsDCA"; version="1.1.1"; sha256="0ghg43rd6bnv4jp8pkpd1ixp5l6kq5pr0mxq61q24s24g0m3s64p"; depends=[]; };
-  aRxiv = derive2 { name="aRxiv"; version="0.5.16"; sha256="1dghv40waprld9gg81p2is72sk0z6fla0pfiqzzfhky8lazaih01"; depends=[httr XML]; };
+  aRxiv = derive2 { name="aRxiv"; version="0.5.19"; sha256="0rik0jkh1xi9fizzw46xmcw139g6nla072p7f8jgvzbhp7k58ba2"; depends=[httr XML]; };
   aSPC = derive2 { name="aSPC"; version="0.1.2"; sha256="1q301rw7dax5v58srg4jlcam1qq2igkaj7kg8wlnlml0hsck4c4a"; depends=[energy mvtnorm]; };
   aSPU = derive2 { name="aSPU"; version="1.48"; sha256="0kjvwwvyhiz9i5kxqg68lq6cvxnk9vzvp5zca5hfv2g77j42wh9h"; depends=[fields gee MASS matrixStats mvtnorm]; };
   aTSA = derive2 { name="aTSA"; version="3.1.2"; sha256="1p3spas0sxj08hkb8p6k2fy64w86prlw1hbnrqnrklr0hnkg2g54"; depends=[]; };
@@ -4722,16 +4801,17 @@ in with self; {
   abnormality = derive2 { name="abnormality"; version="0.1.0"; sha256="1fzfskl9akl06nliy8hkv2a0pznpj8pwcypg3gj5r2nzvr3kan9v"; depends=[MASS Matrix]; };
   abodOutlier = derive2 { name="abodOutlier"; version="0.1"; sha256="1pvhgxmh23br84r0fbmv7g53z2427birdja96a67vqgz18r3fdvj"; depends=[cluster]; };
   abstractr = derive2 { name="abstractr"; version="0.1.0"; sha256="1ymwp7syrynwd4i8aj2x5n8jdi9d96fjzl6jb09n0bnr5fgl7vig"; depends=[colourpicker emojifont ggplot2 gridExtra rintrojs shiny shinythemes]; };
-  abtest = derive2 { name="abtest"; version="0.1.3"; sha256="1jzl5vflpkay5mqiadrwdj91pphcwcs1x1l6zsixkhy7w0yxdipm"; depends=[Matrix mvtnorm plotrix RColorBrewer Rcpp sn truncnorm VGAM]; };
+  abtest = derive2 { name="abtest"; version="0.2.0"; sha256="1ky3cf827kj24bhcpk00v5zl5jdkii1gca0x81ay1cjkzfispgws"; depends=[Matrix mvtnorm plotrix RColorBrewer Rcpp sn truncnorm VGAM]; };
   abundant = derive2 { name="abundant"; version="1.1"; sha256="1m76qdmqvwpgm0sihazi2dna7cgsz9rljal18vgffb5wamwmg9k7"; depends=[QUIC]; };
   acc = derive2 { name="acc"; version="1.3.3"; sha256="1ii2vm47djxbixa75h690q1s2f9m9x6i8nkygik93j6dayr6kr1m"; depends=[circlize DBI ggplot2 iterators mhsmm nleqslv PhysicalActivity plyr R_utils Rcpp RcppArmadillo RSQLite zoo]; };
   accSDA = derive2 { name="accSDA"; version="1.0.0"; sha256="0sgxy5y8kkc1n35657kifwfjsba7y5m1vbr7rkk5lmbpkzahqm61"; depends=[ggplot2 ggthemes gridExtra MASS rARPACK sparseLDA]; };
   accelerometry = derive2 { name="accelerometry"; version="3.1.2"; sha256="13xzrwhr4i1nj9c8vrmfdg2rmrc8n446iihcyxmy99sm99hpzyip"; depends=[dvmisc Rcpp]; };
   accelmissing = derive2 { name="accelmissing"; version="1.4"; sha256="1nql9inx6azdzi3z4sfm2vdml2mms6krl8wzlf1dn1c97ahn57fy"; depends=[mice pscl]; };
+  accept = derive2 { name="accept"; version="0.7.0"; sha256="1r4mhy9g4wjcjgdd0gwdarmr09292il3vdkmx0hz7vh9mffyr9kx"; depends=[dplyr extrafont MASS plotly stringr viridis]; };
   accrual = derive2 { name="accrual"; version="1.3"; sha256="11clm9s5c5518nmp6hd6pjnp0s28y92b2i2x0xgj4j5g816p4j3z"; depends=[fgui SMPracticals tcltk2]; };
   accrued = derive2 { name="accrued"; version="1.4.1"; sha256="05g1jb5914z18rcai1ahn7nihn27vr2rnadwv94gc1j7ivvikvs5"; depends=[]; };
   ace2fastq = derive2 { name="ace2fastq"; version="0.6.0"; sha256="09kk3yyqnr2xp820g0p3aai9a21figigjr9lxkr3zjq2d8gzwfic"; depends=[stringr]; };
-  acebayes = derive2 { name="acebayes"; version="1.7"; sha256="1zp78gq72waqglgafapir3jf1r5dzwqar594mg440vva85m741za"; depends=[compare lhs randtoolbox Rcpp RcppArmadillo]; };
+  acebayes = derive2 { name="acebayes"; version="1.8"; sha256="1xm6bw0qm2vlcrk274x0bawzb2lnacb1wsmzba5mg3i75a55pqln"; depends=[compare lhs randtoolbox Rcpp RcppArmadillo]; };
   acepack = derive2 { name="acepack"; version="1.4.1"; sha256="1f98rpfjmhd92rdc3j004plyfpjailz6j0ycysbac0kgj83haxc2"; depends=[]; };
   acfMPeriod = derive2 { name="acfMPeriod"; version="1.0.0"; sha256="1yww8isfrbs2v9s94hx7p2imyszcgadwafdgpj438n2ik0q6p9d5"; depends=[MASS]; };
   acid = derive2 { name="acid"; version="1.1"; sha256="030i0y8s283ivbsmjccpbv9v7mgbcg2jk9df7vgcbbns74swf9hd"; depends=[gamlss gamlss_dist Hmisc]; };
@@ -4745,7 +4825,7 @@ in with self; {
   acss = derive2 { name="acss"; version="0.2-5"; sha256="0cqa60544f58l5qd7h6xmsir40b9hqnq6pqgd5hfx2j2l5n7qhmk"; depends=[acss_data zoo]; };
   acss_data = derive2 { name="acss.data"; version="1.0"; sha256="09kl4179ipr8bq19g89xcdi1xxs397zcx5cvgp6viy8gn687ilgv"; depends=[]; };
   activPAL = derive2 { name="activPAL"; version="0.1.3"; sha256="1h6hp5z89ji73gdzxy1dgbfwjysiy5lvcqh90xagpb7sa7ahs3na"; depends=[devtools dplyr ggplot2 lubridate magrittr tidyr]; };
-  activity = derive2 { name="activity"; version="1.2"; sha256="11w2bz6p9xbzdh6773dmbbh6rws0h5dj18p8m0ivzizgq932vdzs"; depends=[circular pbapply]; };
+  activity = derive2 { name="activity"; version="1.3"; sha256="12imqj366dp6pam5gap6ji56p5wf1073xz5g4iikfxf5l8snxw92"; depends=[circular insol pbapply]; };
   activityCounts = derive2 { name="activityCounts"; version="0.1.2"; sha256="0zgxr2sk3a8kmygfxx1p5hnrfwdkxx7php6jlrhm8wv6052ck8jz"; depends=[lubridate magrittr seewave signal tibble]; };
   activpalProcessing = derive2 { name="activpalProcessing"; version="1.0.2"; sha256="1y0bjx2qx53iy930y9iww4q1yzjj8y16cwgixk1mq3w4g1f116d1"; depends=[chron]; };
   actogrammr = derive2 { name="actogrammr"; version="0.2.3"; sha256="1jzvarmd41yqlrkagzlc8m19n5mn0w0b36fy50lyvgrfsafjfbqa"; depends=[dplyr ggplot2 lubridate readr tidyr]; };
@@ -4764,12 +4844,12 @@ in with self; {
   adaptsmoFMRI = derive2 { name="adaptsmoFMRI"; version="1.1"; sha256="1h79gh1bd6s2xhwf4whh72wf2cz4di2p8dnlf6192mfg108qc6nw"; depends=[coda Matrix MCMCpack mvtnorm spatstat]; };
   addhaz = derive2 { name="addhaz"; version="0.5"; sha256="1709jq9rp5lhqk0qpk8zkdwzhcv1bcach8mm7yiz7hzcc1mgxb12"; depends=[boot MASS Matrix]; };
   addhazard = derive2 { name="addhazard"; version="1.1.0"; sha256="0hk7br52wjmq605xgslv8lspr35aqpdgkiz2yljz31khy3y3vi8c"; depends=[ahaz rootSolve survival]; };
-  addinslist = derive2 { name="addinslist"; version="0.2"; sha256="04jqhdy0axs1a9c0cfi3pqy9hd67jqxz79a2lj209gd27qv1q22c"; depends=[curl devtools DT miniUI rappdirs rmarkdown rvest shiny shinyjs xml2]; };
+  addinslist = derive2 { name="addinslist"; version="0.3"; sha256="0rw87zxlq3b7ka782qwqbn2cc7w1cwcpg68l8s1mkrdgyaar4wr0"; depends=[curl DT miniUI rappdirs remotes rmarkdown rvest shiny shinyjs xml2]; };
   additiveDEA = derive2 { name="additiveDEA"; version="1.1"; sha256="15nxpdybsda6yhjk23bpafr8v1zdx8332pcxf26k795q3ypjpiy2"; depends=[Benchmarking lpSolveAPI]; };
   additivityTests = derive2 { name="additivityTests"; version="1.1-4"; sha256="048ds90wqjdjy1nyhna3m06asdklbh8sx1n556kss2j1r1pma1sw"; depends=[]; };
   addreg = derive2 { name="addreg"; version="3.0"; sha256="13bwmgxylwi02g60j1rr51cr5jvvkl2nvf2lnnhnq46fhvs2ma7s"; depends=[combinat glm2 turboEM]; };
   ade4 = derive2 { name="ade4"; version="1.7-13"; sha256="16z9jk4qj35ghsk4lwmq241dgc770y8a70dlmp9q4gz6d8ssgl7m"; depends=[MASS]; };
-  ade4TkGUI = derive2 { name="ade4TkGUI"; version="0.2-9"; sha256="0kfnikkzhyfxskrphr65b8amjhdfq35x6dda4kivdhn7ak07s3ll"; depends=[ade4 adegraphics lattice tkrplot]; };
+  ade4TkGUI = derive2 { name="ade4TkGUI"; version="0.3-0"; sha256="1k1d5vck8plv6rq9nn664p73nhd4k3kah52fvqc3vg2zv1hbizzk"; depends=[ade4 adegraphics lattice tkrplot]; };
   adeba = derive2 { name="adeba"; version="1.1.2"; sha256="1z1law3qh6l902g62y8yapk4nypdmb20jmpwhxp9jbglalw9lm73"; depends=[mixtools pdist Rcpp]; };
   adegenet = derive2 { name="adegenet"; version="2.1.1"; sha256="0ynfblp0hbd3dp3k86fn1wyhqr28lk6hs2bg4q7gyf0sfdfzwhrh"; depends=[ade4 ape boot dplyr ggplot2 igraph MASS reshape2 seqinr shiny spdep vegan]; };
   adegraphics = derive2 { name="adegraphics"; version="1.0-15"; sha256="12k77x6vnjz9s9dvz1r81ajqcl1nh9g33r7dymaqk2cs5q3wvfw7"; depends=[ade4 KernSmooth lattice latticeExtra RColorBrewer sp]; };
@@ -4790,11 +4870,11 @@ in with self; {
   adjustedcranlogs = derive2 { name="adjustedcranlogs"; version="0.1.0"; sha256="08apfvpqvnnalx230p4qf5ckrwm1sgzras4zfrysgym5d4map9ci"; depends=[cranlogs dplyr lubridate rvest xml2]; };
   adklakedata = derive2 { name="adklakedata"; version="0.6.1"; sha256="1lzj3ib4bgfkq5lq12n47pwc52h7k35xbbwj6brwsgx1gd4fx3x6"; depends=[httr rappdirs]; };
   adlift = derive2 { name="adlift"; version="1.4-1"; sha256="14q7fnhlqvxdhnfjhdhfmadz241srplbm069a7ybbsql21cphpf3"; depends=[EbayesThresh]; };
-  admisc = derive2 { name="admisc"; version="0.3"; sha256="10khlmkiv9xyhd8rhcj4fb5h24pflmdl6np26rky6j5sa7vhi97y"; depends=[]; };
+  admisc = derive2 { name="admisc"; version="0.4"; sha256="16vfbi2q8khzinj7aps05h3y66s0whmhx3h3909smsg96dhijclk"; depends=[]; };
   admixturegraph = derive2 { name="admixturegraph"; version="1.0.2"; sha256="0ld4qyyvbnr5lz9ff64wjwif4c9xnqyjmbfgbl9bk6pia98zppl3"; depends=[doParallel dplyr foreach ggplot2 MASS neldermead pracma]; };
   adnuts = derive2 { name="adnuts"; version="1.0.1"; sha256="1l52f33yzbvcz27iw0k6iwcnfanr65lw206d7w4609k2vmlw8ink"; depends=[ellipse R2admb rstan]; };
   adoption = derive2 { name="adoption"; version="0.6.2"; sha256="18mjhsh19bjmh27sv5fiay0xv1la0qy96v48b093f7kqfx4c21xb"; depends=[quadprog RandomFieldsUtils tkrplot]; };
-  adoptr = derive2 { name="adoptr"; version="0.2.2"; sha256="0mxknvrwkmd46n45zcai3d6jgw27rjf2k9wbr4ma8vivbnykgsxn"; depends=[nloptr]; };
+  adoptr = derive2 { name="adoptr"; version="0.2.3"; sha256="0i1ckv9721vvxxr742ciy7kpy6wf2nk0wgr22fbmfnjqc8gqa5v2"; depends=[glue nloptr]; };
   adpss = derive2 { name="adpss"; version="0.1.1"; sha256="0p2gyfc4rxmms8zdsq4hjsh1njfl2s736arq8aq1am2wh1w9k5ch"; depends=[Rcpp]; };
   ads = derive2 { name="ads"; version="1.5-3"; sha256="1k1japzcf0mafxkv9dlzaqz9n4c749lsx0lja4wj327ninpdcfy4"; depends=[ade4 spatstat]; };
   advclust = derive2 { name="advclust"; version="0.4"; sha256="1g8a8q4zh6d4152jb66fh7wj7k6ks5k4kfcazzw70jdn10yi6b38"; depends=[clue ggplot2 knitr MASS reshape2]; };
@@ -4803,7 +4883,7 @@ in with self; {
   aemo = derive2 { name="aemo"; version="0.2.0"; sha256="11msifszq7pzmcmwibf2dk2j5dqjc74hrxdxshlprkp6p8sfhijh"; depends=[assertthat dplyr lubridate stringr]; };
   afCEC = derive2 { name="afCEC"; version="1.0.2"; sha256="0jdppp93z5nb8m5qbry6cvd472mwiq1yrmm11906c3z2bfz7791f"; depends=[Rcpp RcppArmadillo rgl]; };
   afc = derive2 { name="afc"; version="1.4.0"; sha256="1iy1wa88kf6zi6x7lbd0jdir653cvzvdraliqpxbac413wwb5gwl"; depends=[]; };
-  afex = derive2 { name="afex"; version="0.24-1"; sha256="14w7kcwr5hxmjcjmdm5ia9ka3bw1nl18pxlm1vpw62nmvicn3455"; depends=[car lme4 lmerTest pbkrtest reshape2]; };
+  afex = derive2 { name="afex"; version="0.25-1"; sha256="12n020y7rjm7402940gkqxa5j901p093f381i23p66fa3fyrshkf"; depends=[car lme4 lmerTest pbkrtest reshape2]; };
   affluenceIndex = derive2 { name="affluenceIndex"; version="1.0"; sha256="1nb2dlsnvjsvkyrfdaskmpr3kv3qgdfb60xgmzvscfli0yf4dzr1"; depends=[]; };
   afmToolkit = derive2 { name="afmToolkit"; version="0.0.1"; sha256="1pm3xyh9vq10mmfgknlvlfr9f027xprrgy1dvbbxpi7f111hv1gl"; depends=[assertthat DBI dplyr ggplot2 gridExtra minpack_lm scales tibble]; };
   afpt = derive2 { name="afpt"; version="1.0.0"; sha256="0kshyzvw8sp7p686xi98g758zld3n7kq44lnvly8d0y8fg6ahcl2"; depends=[]; };
@@ -4824,7 +4904,7 @@ in with self; {
   aiRthermo = derive2 { name="aiRthermo"; version="1.2.1"; sha256="058082qdfi1pbdgf26vbfahri1kbc8b2l816q4dq89j5aj5is0a2"; depends=[]; };
   aidar = derive2 { name="aidar"; version="1.0.5"; sha256="1q2iz2qzh2yl0v0sc537xq4vbx2nblym3kv419vr7jvrghdpx3vj"; depends=[XML]; };
   aimPlot = derive2 { name="aimPlot"; version="1.0.0"; sha256="1d52b7kccxba6j7n0gbd7pzs0p87zn32vv8gdf2f7lyr75qzgz7x"; depends=[ggplot2]; };
-  airGR = derive2 { name="airGR"; version="1.3.2.23"; sha256="0ihykf97alxyq7nw205sl4ji2skyf2pi3xbfxjyvxv4vpmmiljh1"; depends=[]; };
+  airGR = derive2 { name="airGR"; version="1.3.2.42"; sha256="0ll960jm0d56i0gn0g8yln0dvrhxc0b7kbhcfjsrshzb1lb3vq1v"; depends=[]; };
   airGRteaching = derive2 { name="airGRteaching"; version="0.2.6.29"; sha256="15sjwkyvgxihiz35qc8rg1f7f3vb4wdwbrfb37gx8mzql0mwqx4q"; depends=[airGR dygraphs markdown plotrix shiny shinyjs xts]; };
   aire_zmvm = derive2 { name="aire.zmvm"; version="0.8.2"; sha256="0z9knqdl7ihx2vph154qi1lh4s6yvlcw6kwry8k47mhh3p7pynsd"; depends=[dplyr httr lubridate progress readr readxl rvest sp stringr tidyr xml2]; };
   airportr = derive2 { name="airportr"; version="0.1.2"; sha256="06jk4dhr4qj6fpmlvslnbqj67qy78spcb7yhqa4qn2im4kpmb73q"; depends=[dplyr]; };
@@ -4839,7 +4919,7 @@ in with self; {
   ald = derive2 { name="ald"; version="1.2"; sha256="1xmvxmyc1nmsrlyr0rvzz20jx6g1f2jvxpg9f39v48ngg5gmanjj"; depends=[]; };
   alfr = derive2 { name="alfr"; version="1.2.1"; sha256="1ldq8gvgqjjabn86hdqb6hxch8x4hvr6djv5ly4mx039dipc8jxi"; depends=[httr jsonlite magrittr stringr]; };
   alfred = derive2 { name="alfred"; version="0.1.7"; sha256="1467rg5q2dqbqy8vj2061glb1gksq96rnjlifgyiv5rarwzy9b4y"; depends=[dplyr jsonlite lubridate magrittr tibble tidyr]; };
-  algaeClassify = derive2 { name="algaeClassify"; version="0.1.0"; sha256="19iad7av908zrfsv6nwwk4yllfls6pyhyzg78zyh4lk76r04kbjp"; depends=[]; };
+  algaeClassify = derive2 { name="algaeClassify"; version="1.2.0"; sha256="1sna5rij2ngpgqfz5cviqdbyr43xph8cbjc4vnm238n72zgg7cb6"; depends=[httr lubridate plyr RCurl rvest taxize XML xml2]; };
   algorithmia = derive2 { name="algorithmia"; version="0.2.0"; sha256="0h1llcwk1qkxg26ikib44nd19da1q39n3gd8jwwb36687drl26qp"; depends=[base64enc httr rjson]; };
   alignfigR = derive2 { name="alignfigR"; version="0.1.1"; sha256="0jsj0h7zpzj6ynfydl8qbggm03xx8db769rli7rcx9909xdxabk6"; depends=[ggplot2]; };
   alineR = derive2 { name="alineR"; version="1.1.4"; sha256="1gi4pl7ij60pz85yjiga5kvldraj9n3nhcyqdxrigs0cqvdwg3ar"; depends=[]; };
@@ -4854,14 +4934,16 @@ in with self; {
   alphabetr = derive2 { name="alphabetr"; version="0.2.2"; sha256="1pmp6zwhgycb38y5jbvrbv2nza7gyjh508vy09ml483c2cysvc1r"; depends=[clue dplyr multicool Rcpp]; };
   alphahull = derive2 { name="alphahull"; version="2.2"; sha256="024d70z9pasyfp83zwgh7fkjky70l74pbzw1wvazzq75p9m91vzv"; depends=[ggplot2 R_utils sgeostat spatstat splancs tripack]; };
   alphashape3d = derive2 { name="alphashape3d"; version="1.3"; sha256="15l8hsn3jcn5jzwfpya99v2mzrgmhl3i587nw6cx4aky75ajslcx"; depends=[geometry rgl]; };
-  alphastable = derive2 { name="alphastable"; version="0.1.0"; sha256="1c24d879jqakf20rwj0xmv41f1g3d1dq04mlcc8zshigi2diyy5c"; depends=[mvtnorm nlme nnls stabledist]; };
+  alphastable = derive2 { name="alphastable"; version="0.2.1"; sha256="01gwrcxlj2jlb8axs5qmrsixk3a8b7044ypyjg6dpdcxfbcf5fvp"; depends=[mvtnorm nlme nnls stabledist]; };
   alphavantager = derive2 { name="alphavantager"; version="0.1.1"; sha256="0rbvbws0g50z76pvkydadf97gq5yg1l03xlfqyy3yblqh59cj5s6"; depends=[dplyr glue httr jsonlite purrr readr stringr tibble tidyr timetk]; };
   alr3 = derive2 { name="alr3"; version="2.0.8"; sha256="1vkwgf5c9zb8pphcw47vfwwk12nfj4nggj8dr88jwbdnv7yd257h"; depends=[car]; };
   alr4 = derive2 { name="alr4"; version="1.0.6"; sha256="0v98yzi0fcjxq0ak0w05001h8m9nfa9l0ann9bqvz8bwcmb3jlr2"; depends=[car effects]; };
+  altR2 = derive2 { name="altR2"; version="1.0.0"; sha256="15nvbq3n76p2857ipyf3q6rs2mwjqsp9gr3rmzbjfm8lrj0faxsv"; depends=[gsl purrr]; };
   altair = derive2 { name="altair"; version="3.1.1"; sha256="0qy23lzz2lfsrhl9yn195r5gdkspgi99zlp13l1fpcw0d02diw1z"; depends=[assertthat htmlwidgets jsonlite magrittr repr reticulate rlang vegawidget]; };
   alterryx = derive2 { name="alterryx"; version="0.5.0"; sha256="1p9q4244bm7hf6my8q951idw41xa5gcrdl7znmsng9pwxh8dnz3h"; depends=[base64enc digest httr jsonlite]; };
   altmeta = derive2 { name="altmeta"; version="2.2"; sha256="1k3p06v8ccj0dbjfpl4nw6579bwcy4j925rk15v55khqmrlx780l"; depends=[]; };
   amap = derive2 { name="amap"; version="0.8-17"; sha256="1il94bkhl8192vawq4gr2gwyhqhid27jr2312rhvr72ssg8p713b"; depends=[]; };
+  amber = derive2 { name="amber"; version="0.1.5"; sha256="16ghabpim0z9i5w49w1wq76hj9w4jan8axylg3mg7f4d1qhzja6r"; depends=[classInt doParallel foreach latex2exp ncdf4 raster rgeos scico sp spatial_tools viridis xtable]; };
   ambhasGW = derive2 { name="ambhasGW"; version="0.0.2"; sha256="0v517i4whip45pk6bwlwval9pz367pcgzz62b2z22mrwgi6m6bck"; depends=[raster rgdal yaml]; };
   ambient = derive2 { name="ambient"; version="0.1.0"; sha256="142q30rhi0wz0gp1v0swm83gbli8j6plpzzpqjwnjc693wd3a1ih"; depends=[Rcpp]; };
   ameco = derive2 { name="ameco"; version="0.2.9"; sha256="0vzwsy7gp17ghl1hgcsbfs9rarzl8dl36x6lplnzrisqv3dqmk25"; depends=[]; };
@@ -4871,7 +4953,7 @@ in with self; {
   aml = derive2 { name="aml"; version="0.1-1"; sha256="09xxlxp784wlb561apns3j8f2h9pfk497cy5pk8wr4hhqqv4d3al"; depends=[lars]; };
   ammistability = derive2 { name="ammistability"; version="0.1.1"; sha256="1vp2857cwn4dd86vj8qf6h4z8hh5q2jvrlpmply8bf70mnmnq18h"; depends=[agricolae ggcorrplot ggplot2 Rdpack reshape2]; };
   ampd = derive2 { name="ampd"; version="0.2"; sha256="0bi8qngd37n60ym516yjcahxc536vdwm60rq5ld32170hww69j7c"; depends=[]; };
-  amt = derive2 { name="amt"; version="0.0.6"; sha256="1n8qrjvca48f84gkjbd18ivxf24lff7fkamjngx1qlpjah7fq31w"; depends=[broom checkmate circular ctmm dplyr fitdistrplus FNN geosphere glue KernSmooth lazyeval leaflet lubridate magrittr maptools purrr raster Rcpp rgeos rlang sf sp survival tibble tidyr velox]; };
+  amt = derive2 { name="amt"; version="0.0.7"; sha256="1az11vi5kd1sp76xvgshvamyw59dydhp6g4m6c2wqcdll88dlfgn"; depends=[broom checkmate circular ctmm dplyr fitdistrplus FNN geosphere glue KernSmooth lazyeval leaflet lubridate magrittr maptools purrr raster Rcpp rgeos rlang sf sp survival tibble tidyr velox]; };
   anMC = derive2 { name="anMC"; version="0.2.1"; sha256="02mzmaxjjbjqarfwdv6465p5hvnnpsqfkb1wkm68bx64cimgldki"; depends=[mvtnorm Rcpp RcppArmadillo]; };
   anacor = derive2 { name="anacor"; version="1.1-3"; sha256="0mj8g9p4fla0ax9jvcq7kii4lrhj8g872p11nys06anva22qjp51"; depends=[car colorspace fda]; };
   analogsea = derive2 { name="analogsea"; version="0.7.2"; sha256="1dfvdizbxdc00rcabcv1jpy3py4ncb3g2p1kim8m4sy9rdc299yq"; depends=[aws_s3 httr jsonlite magrittr yaml]; };
@@ -4895,8 +4977,8 @@ in with self; {
   anipaths = derive2 { name="anipaths"; version="0.9.7"; sha256="1h6rcrybjfc4kn377bay2c3nfv6qwwi0nk14xh6jfdsxqybq6dw2"; depends=[animation ggmap knitr mgcv RColorBrewer rgdal scales sp]; };
   anocva = derive2 { name="anocva"; version="0.1.1"; sha256="1byg40jla71k1901js5h9yq89j63d00vkm60id1fxlpv95c4wdrr"; depends=[cluster]; };
   anoint = derive2 { name="anoint"; version="1.4"; sha256="10gdqgag9pddvxh80h458gagvv1474g4pcpa71cg3h7g62rqvmv5"; depends=[glmnet MASS survival]; };
-  anomalize = derive2 { name="anomalize"; version="0.1.1"; sha256="1szxjc8bh616z2xc50hcggh4ky1b7343i3xmg81rbssvkl2gghlh"; depends=[dplyr ggplot2 glue purrr rlang sweep tibble tibbletime tidyr timetk]; };
-  anomaly = derive2 { name="anomaly"; version="1.1.0"; sha256="0v1pgyckqkimyh1hh68clyqnm9hkzmz3dal676l9qaiwbgqmkxi4"; depends=[dplyr ggplot2 Rdpack rlang]; };
+  anomalize = derive2 { name="anomalize"; version="0.2.0"; sha256="155la2j9bfdwvaq8qv8gjgfy0y4bjpvrymgk0qzbz80hd771lh2j"; depends=[cli crayon dplyr ggplot2 glue purrr rlang rstudioapi sweep tibble tibbletime tidyr timetk]; };
+  anomaly = derive2 { name="anomaly"; version="2.0.2"; sha256="1vhbmf1q2rj21bxzh7s969x3j21r8i5crnvzndal4pryyb8bm97a"; depends=[assertive BH dplyr ggplot2 Rcpp Rdpack reshape2 rlang robust]; };
   anominate = derive2 { name="anominate"; version="0.6"; sha256="01p2qkqf88bzhwywyass5r8dwg2ycflmkbzmsps7fzy0kv3xyb02"; depends=[coda MCMCpack pscl wnominate]; };
   antaresEditObject = derive2 { name="antaresEditObject"; version="0.1.7"; sha256="0whwlqsjc9ygh2iv9bmgxglqk061l3mgfsq1a0848180wci6frwb"; depends=[antaresRead assertthat data_table whisker]; };
   antaresProcessing = derive2 { name="antaresProcessing"; version="0.17.0"; sha256="0mq2b1dkkgli8d53mpcllilh72gf8189f5mf0dxjcv4qinnhrrvm"; depends=[antaresRead data_table stringi]; };
@@ -4906,7 +4988,7 @@ in with self; {
   antitrust = derive2 { name="antitrust"; version="0.99.11"; sha256="025pm7n06yid28b34llm4rh0mlz0daz9ygh5z0hd87scp8f9gy00"; depends=[BB evd MASS numDeriv rhandsontable shiny]; };
   antiword = derive2 { name="antiword"; version="1.3"; sha256="034znb0g9wwb8gi1r3z75v3sbb4mh83qrc4y8mbfx5lbgh8zhj6j"; depends=[sys]; };
   anyLib = derive2 { name="anyLib"; version="1.0.5"; sha256="1x9x58hhkkwdskmgdjv94ynh811n9w0752hh4214adl1qpn576vm"; depends=[BiocManager curl devtools httr withr]; };
-  anytime = derive2 { name="anytime"; version="0.3.5"; sha256="0jbbfcrggkm04m50b6m2y62x4qvnch4d0wh4l1j26r687a39a0py"; depends=[BH Rcpp]; };
+  anytime = derive2 { name="anytime"; version="0.3.6"; sha256="104dvgj3gh998yf93fy39lw76163n7ck9myscyi6v3znwkdwvhyv"; depends=[BH Rcpp]; };
   aod = derive2 { name="aod"; version="1.3.1"; sha256="1g03ajhs6bid80i83xn3917abhymzgrydqx86wxxpkqga018hb85"; depends=[]; };
   aods3 = derive2 { name="aods3"; version="0.4-1.1"; sha256="1kdmgzd5nkzm0awdjls6fc8p9hxsph9ha9k1jxbppdi4i6f0i7rv"; depends=[boot lme4]; };
   aoos = derive2 { name="aoos"; version="0.5.0"; sha256="0y92vs27i0mkpjdclqzq4j9g1axkymhi3v8xp1v6hazh35yzjkfj"; depends=[magrittr roxygen2]; };
@@ -4917,18 +4999,18 @@ in with self; {
   apaText = derive2 { name="apaText"; version="0.1.1"; sha256="1r217k60w027i63nbj24b1rm37m4qf7a6iirc941s945babkxcmb"; depends=[dplyr]; };
   apc = derive2 { name="apc"; version="1.3"; sha256="1hgkqkvry9is8kjk2w46k637sig7fdznnc75wbrc8bq1hbrmf785"; depends=[lattice]; };
   apcf = derive2 { name="apcf"; version="0.1.3"; sha256="0wpq0739bpiqqlkl18c81x2g1g4k7xkam03vpj46wmmpa4z0glaa"; depends=[Rcpp]; };
-  apcluster = derive2 { name="apcluster"; version="1.4.7"; sha256="188hdfmwjjx3aic599nwmkzjqm9j9jighi5bly6qd43c1vj6ih2s"; depends=[Matrix Rcpp]; };
+  apcluster = derive2 { name="apcluster"; version="1.4.8"; sha256="0lzf2jqm56i74wif6x5sw3j0w2qc4sni49zq2fgbl89b7lwkvchj"; depends=[Matrix Rcpp]; };
   apdesign = derive2 { name="apdesign"; version="1.0.0"; sha256="041zyd7ih9nnj92jj9vb9ya1ij9lmj1dzx64q74vyiadw1ix5l66"; depends=[Matrix]; };
   ape = derive2 { name="ape"; version="5.3"; sha256="08wbk1kxhs32bmmvqlqanbdg1w235amd35k8m00fngsj9h9xzc08"; depends=[lattice nlme Rcpp]; };
   apercu = derive2 { name="apercu"; version="0.2.3"; sha256="0w9hi8pdjb3nschh4cy387q67jxhkl2bn9vir949rsl831x4cs1j"; depends=[pls]; };
   apex = derive2 { name="apex"; version="1.0.3"; sha256="157i67yvb9xqlhzcgkxj7n5lq65svxs82z38dv2c0k8p4krjl1pd"; depends=[adegenet ape phangorn]; };
-  apexcharter = derive2 { name="apexcharter"; version="0.1.1"; sha256="16zndkg4kgaxcgm1434l2lc5h4jkm5849aacadakq3jh0qa9fbqg"; depends=[ggplot2 htmlwidgets magrittr rlang scales]; };
+  apexcharter = derive2 { name="apexcharter"; version="0.1.2"; sha256="00rpyz0wpy7gjnmx5rr2s9lrzhbb7axy44vkhym1lbf89c2fvipm"; depends=[ggplot2 htmlwidgets magrittr rlang scales]; };
   aphid = derive2 { name="aphid"; version="1.3.3"; sha256="1jqpn7w5sgy4k49qd9ci6yj89s55gzwl5w5ldw793mzpg6if7lfn"; depends=[kmer openssl Rcpp]; };
   aplore3 = derive2 { name="aplore3"; version="0.9"; sha256="0af6klscsxvh4amp519b6r41bzysf61p040fj4l5706bbya1arhw"; depends=[]; };
   aplpack = derive2 { name="aplpack"; version="1.3.3"; sha256="010saim43d3hr83ksi916846rh6qfbb0gvhsf5jbdx95m4bai9g3"; depends=[]; };
   apmsWAPP = derive2 { name="apmsWAPP"; version="1.0"; sha256="1azgif06dsbadwlvv9nqs8vwixp6balrrbpj62khzmv1jvqr4072"; depends=[aroma_light Biobase DESeq edgeR genefilter gtools multtest seqinr]; };
   apng = derive2 { name="apng"; version="1.0"; sha256="13hvr1w566anrhdicaqwqjgfq2lk3zkn5gcfgy8zazjnad4vy07y"; depends=[bitops]; };
-  apollo = derive2 { name="apollo"; version="0.0.7"; sha256="1znbxyvwyv7mm8jz86xj50yx2x9hpp6awdh567aw9pkvdy6bwmjp"; depends=[coda maxLik mnormt mvtnorm numDeriv randtoolbox Rcpp RcppArmadillo RcppEigen RSGHB sandwich]; };
+  apollo = derive2 { name="apollo"; version="0.0.8"; sha256="0ffl6mw6gvkpx5jspfsss1crpks586lz38b513qw4i1a71pbrw5r"; depends=[coda maxLik mnormt mvtnorm numDeriv randtoolbox Rcpp RcppArmadillo RcppEigen RSGHB sandwich]; };
   apparent = derive2 { name="apparent"; version="1.1"; sha256="03n3pq620xg1vykzsmvxp6wr9hs561pl5ds50g7zmxk9z0ijcb32"; depends=[outliers]; };
   apple = derive2 { name="apple"; version="0.3"; sha256="194z2f6hwdjjxdkjwlmfhpfp26p9yp3gparklhdbb6zlb4a9nnhz"; depends=[MASS]; };
   appnn = derive2 { name="appnn"; version="1.0-0"; sha256="0wkpr6lcd68wlzk6n622ab7sd99l837073czn4k56hw8bw9v68j3"; depends=[]; };
@@ -4951,8 +5033,9 @@ in with self; {
   archetypal = derive2 { name="archetypal"; version="1.0.0"; sha256="1b5c881balv4p0zr7bgg741mzfnw5fvg6ns303rsqashydxcnyiv"; depends=[doParallel geometry inflection lpSolve Matrix]; };
   archetypes = derive2 { name="archetypes"; version="2.2-0.1"; sha256="0ibxsr173ib77gjhid91m85s8gjii4mi2w3d52q5301igv20p7r0"; depends=[modeltools nnls]; };
   archiDART = derive2 { name="archiDART"; version="3.2"; sha256="08jam0nbqvrgrxjqj24k7f0dybyi935w977yi1qk34q1p48462ph"; depends=[rgl sp XML]; };
-  archivist = derive2 { name="archivist"; version="2.3.2"; sha256="0v3l9k0g4ddzqm1aghic4mmnzdbz8hyi2c4zjyv2d34iy58032p3"; depends=[DBI digest flock httr lubridate magrittr RCurl RSQLite]; };
+  archivist = derive2 { name="archivist"; version="2.3.4"; sha256="1i11hrcq1910jgd6diw6h3sxx624v57zjianm49pqvb2dvd0b8y7"; depends=[DBI digest flock httr lubridate magrittr RCurl RSQLite]; };
   archivist_github = derive2 { name="archivist.github"; version="0.2.6"; sha256="092fzi505vx9xbk41m86d0isxna42iflp7q2kjiqa6z1ccvim2yx"; depends=[archivist digest git2r httr jsonlite]; };
+  arcos = derive2 { name="arcos"; version="0.8.2"; sha256="055sr3brad4p47d018s14zsxlqyzfcvk7zdkqfdi9bxqway8vm7q"; depends=[dplyr jsonlite magrittr stringr urltools vroom]; };
   areal = derive2 { name="areal"; version="0.1.5"; sha256="01fh4al7hz9hxnvkp4my8937czhr8jnxyvpnj4gmhsm4alv25yfc"; depends=[dplyr glue purrr rlang sf]; };
   areaplot = derive2 { name="areaplot"; version="1.2-1"; sha256="1bmr092pgflgyss50xy1hs5xjl57i2wmfg7qa513sh120fi2mina"; depends=[]; };
   arena2r = derive2 { name="arena2r"; version="1.0.0"; sha256="14zjpglp389pldi436935fz6mgi4jdgfii1m035nsvihrms9gqkh"; depends=[dplyr ggplot2 magrittr purrr rlang shiny shinyBS shinydashboard shinyjs tidyr]; };
@@ -4965,7 +5048,7 @@ in with self; {
   argosfilter = derive2 { name="argosfilter"; version="0.63"; sha256="0rrc2f28hla0azw90a5gk3zj72vxhm1b6yy8ani7r78yyfhgm9ig"; depends=[]; };
   argparse = derive2 { name="argparse"; version="2.0.1"; sha256="1as7h6z7kzgv0fqzpnp76qbm96b4jcd37azd58b7rz0l1n94764l"; depends=[findpython jsonlite R6]; };
   argparser = derive2 { name="argparser"; version="0.4"; sha256="0s1wxshx4jk69wfxhycx973q6y8cmqrfymyjklhq1i8xrj0kmmx9"; depends=[]; };
-  ari = derive2 { name="ari"; version="0.3.1"; sha256="0hrmvnqs56v94lgl8i14p336nfcnd2x5yam4hclw7i4mj2l3r9ys"; depends=[hms progress purrr rmarkdown rvest text2speech tuneR webshot xml2]; };
+  ari = derive2 { name="ari"; version="0.3.2"; sha256="1wa1ag1v2f3x9817w7q4vj1byxws95zm3b220nr196x9x4y9d8mj"; depends=[hms progress purrr rmarkdown rvest text2speech tuneR webshot xml2]; };
   aricode = derive2 { name="aricode"; version="0.1.2"; sha256="0w5ap0lhp9x67qvz3z80y49311g6h24x11yn8ziv75s3kaxy2wvz"; depends=[Matrix Rcpp]; };
   arkdb = derive2 { name="arkdb"; version="0.0.5"; sha256="00ih2in6q0kismpc5jc8w3609nxjkmybx8i19cjlbr93y2zjm29i"; depends=[DBI progress]; };
   arm = derive2 { name="arm"; version="1.10-1"; sha256="0vvp90jygajd6ydky57z66wqjq9msfbl88irj5jbsray574mh4bg"; depends=[abind coda lme4 MASS Matrix nlme]; };
@@ -4978,13 +5061,14 @@ in with self; {
   aroma_core = derive2 { name="aroma.core"; version="3.2.0"; sha256="1c4spy2sc80clz49irzilsqy65k6q2vl86qaydnymkzljcz7bbpg"; depends=[future listenv matrixStats PSCBS R_cache R_devices R_filesets R_methodsS3 R_oo R_rsp R_utils RColorBrewer]; };
   arpr = derive2 { name="arpr"; version="0.1.1"; sha256="0j69nbmhmhmyfna011gv68wvxv1x2lijz94pyg9g2ax720x74i2q"; depends=[magrittr]; };
   arrApply = derive2 { name="arrApply"; version="2.1"; sha256="0qy7iwi580rrf3sycsbv6qgxsqcdy9pdbnkdrx81j68qni9iw737"; depends=[Rcpp RcppArmadillo]; };
-  arrangements = derive2 { name="arrangements"; version="1.1.5"; sha256="05frcgk9jxjbbkrj2mmv5vwj8zfbg3pvkysi1fjd9sbbimlzvjn7"; depends=[gmp R6]; };
+  arrangements = derive2 { name="arrangements"; version="1.1.6"; sha256="0napqfai243lpkcqbwzv8qi1apn6xi59yifay69cjdmxwkw51yv5"; depends=[gmp R6]; };
   arrayhelpers = derive2 { name="arrayhelpers"; version="1.0-20160527"; sha256="1ib91hpg6xgy0jr4sb8ib19x0v4f5n96lak0qm0z5vksawgcnp1l"; depends=[svUnit]; };
+  arrow = derive2 { name="arrow"; version="0.14.1.1"; sha256="1m2rrqkh7zvfpajj15aii3yydgf3ci3n3ji7ic81zv1jghmrd9rd"; depends=[assertthat bit64 fs purrr R6 Rcpp rlang tidyselect]; };
   ars = derive2 { name="ars"; version="0.6"; sha256="0zs1rk3i7pc9wcvxrvjcls194mfbvmkz7cb6pwd1cm3fzjwsyxsp"; depends=[]; };
   arse = derive2 { name="arse"; version="1.0.0"; sha256="0ssaalc058m09gfcr1n0s729rx2plia3zkhlynj67drclyvhyb0i"; depends=[dplyr pracma]; };
-  arsenal = derive2 { name="arsenal"; version="3.2.0"; sha256="0npr0s8slw5vzj6012lcn7sijh6nfcaq3q741pa7hpy6pkwznv9p"; depends=[testthat]; };
+  arsenal = derive2 { name="arsenal"; version="3.3.0"; sha256="1bn1i5cdy6caw6ndqcfy41x3qb0hj3g4r8p4jl24gljygd3rvzgh"; depends=[]; };
   artfima = derive2 { name="artfima"; version="1.5"; sha256="1nqsq9fsqk9kag9n7i2r9yvf578nkdfrkkv7qy8650prka0jca2p"; depends=[gsl ltsa]; };
-  arules = derive2 { name="arules"; version="1.6-3"; sha256="0dimrq1pz449z0mz9m87nhm5bpc0v789bcc3lghhh97wwi5zah9y"; depends=[Matrix]; };
+  arules = derive2 { name="arules"; version="1.6-4"; sha256="003c5cd3xzq39h7c19px077ygm0n1v7k83icy5zzrnkagyds2p8n"; depends=[Matrix]; };
   arulesCBA = derive2 { name="arulesCBA"; version="1.1.4"; sha256="1d0ln8mislns7ix1rch63ry4856b2cnpx99rmw9d967dmvyrm8vs"; depends=[arules discretization Matrix testthat]; };
   arulesNBMiner = derive2 { name="arulesNBMiner"; version="0.1-5"; sha256="1q4sx6c9637kc927d0ylmrh29cmn4mv5jxxpl09yaclzfihjlk9a"; depends=[arules rJava]; };
   arulesSequences = derive2 { name="arulesSequences"; version="0.2-22"; sha256="0m4g1mgc1swixq9z2v30bjvgnkqsjrinsmwqznrycxyzcgwbn8b3"; depends=[arules]; };
@@ -5001,12 +5085,12 @@ in with self; {
   asht = derive2 { name="asht"; version="0.9.4"; sha256="1aq384vgf26ig3isyp99z09glcjhl2qd43kp8qdcwk75dcrmxd7z"; depends=[bpcp coin exact2x2 exactci perm ssanv]; };
   askpass = derive2 { name="askpass"; version="1.1"; sha256="07q0ik8jzk44vpwh48rr3fnpd7dzsdhjjsl4l850rffv3dyq4h6v"; depends=[sys]; };
   aslib = derive2 { name="aslib"; version="0.1"; sha256="0dkb6bb6dqavjklbciqxqhi3fdqib9asdnhiap2gp9b9wfnkyq7k"; depends=[BatchExperiments BatchJobs BBmisc checkmate corrplot ggplot2 llama mlr parallelMap ParamHelpers plyr reshape2 RWeka stringr yaml]; };
-  asnipe = derive2 { name="asnipe"; version="1.1.11"; sha256="06bjw99rssna1pgxq8yrsp3mbwgs2x3wxf86him1766gvcs9yawq"; depends=[MASS Matrix]; };
+  asnipe = derive2 { name="asnipe"; version="1.1.12"; sha256="01k2qr9vpazj4mhz4zpngav31d69qr73i8fc59x8gdbi3ipic7rs"; depends=[MASS Matrix]; };
   aspace = derive2 { name="aspace"; version="3.2"; sha256="1g51mrzb6amafky2kg2mx63g6n327f505ndhna6s488xlsr1sl49"; depends=[Hmisc shapefiles splancs]; };
   aspect = derive2 { name="aspect"; version="1.0-5"; sha256="0pbc0daxw20xcbgqyyd5gbs9kmbaf2dq8ajllx0mnfwdcak9jfgj"; depends=[]; };
   aspi = derive2 { name="aspi"; version="0.2.0"; sha256="0rhvxw243vvdv3hxa6pi343gcjc2cbxq1jzqirl9k1l4i3897l87"; depends=[]; };
   asremlPlus = derive2 { name="asremlPlus"; version="4.1-26"; sha256="01brccsfw4pqlcr7idaj11lhv75m8mb3wxsn1v2dvpka1sp8fdr4"; depends=[dae doParallel dplyr foreach ggplot2 plyr RColorBrewer reshape stringr]; };
-  assertable = derive2 { name="assertable"; version="0.2.5"; sha256="0lij4hiy06v9yxhig27m9nk0nzvcq69c6i44asggrc2vgz8215da"; depends=[data_table]; };
+  assertable = derive2 { name="assertable"; version="0.2.7"; sha256="1npks9rcrnchmd0silq6qrvqkmdkp9fwjkyyvvp1lqjclyxk6vkk"; depends=[data_table]; };
   assertive = derive2 { name="assertive"; version="0.3-5"; sha256="0blbbhlxcb5ffdxqxi62xs33ljiawh6s22a0pyvbbh79jf46rzr3"; depends=[assertive_base assertive_code assertive_data assertive_data_uk assertive_data_us assertive_datetimes assertive_files assertive_matrices assertive_models assertive_numbers assertive_properties assertive_reflection assertive_sets assertive_strings assertive_types knitr]; };
   assertive_base = derive2 { name="assertive.base"; version="0.0-7"; sha256="1xs3ysvj0z57c58jw57pckq2rynia6ks4rmjmc02alczhk54wbgh"; depends=[]; };
   assertive_code = derive2 { name="assertive.code"; version="0.0-3"; sha256="1qhbp668zfvhqs8avkhg9amp4zyazz6dsy4fc6kpdmw3sv8yi07g"; depends=[assertive_base assertive_properties assertive_types]; };
@@ -5025,7 +5109,7 @@ in with self; {
   assertive_types = derive2 { name="assertive.types"; version="0.0-3"; sha256="0zxq1jfrzgw95ll7alvm0xnk7aihjdksngq4ya2whyvfjbmv4vdb"; depends=[assertive_base assertive_properties codetools]; };
   assertr = derive2 { name="assertr"; version="2.6"; sha256="0g4ii6vhp0155a29ljhs64a09x0nzy5ybvwwchhk4mkcgsvnvfkj"; depends=[dplyr MASS rlang]; };
   assertthat = derive2 { name="assertthat"; version="0.2.1"; sha256="17wy5bdfzg73sg2clisg1k3zyn1adkj59x56m5nwia2k8z67zkw5"; depends=[]; };
-  assignPOP = derive2 { name="assignPOP"; version="1.1.6"; sha256="0d9sqr7xdkj6an68bwkscsyy8cxafad7km28i94p3kvi0bj7wcaz"; depends=[caret doParallel e1071 foreach ggplot2 MASS randomForest reshape2 stringr tree]; };
+  assignPOP = derive2 { name="assignPOP"; version="1.1.7"; sha256="0zx7cblfzfpi5jvagni56845lg198zkx5q43ip3lg8h0sq2h8qp2"; depends=[caret doParallel e1071 foreach ggplot2 MASS randomForest reshape2 stringr tree]; };
   assist = derive2 { name="assist"; version="3.1.5"; sha256="12mzg1lqy0f35m0bq7kb4jw0l5g0rsghx11ibgz06w6s31g734ar"; depends=[lattice nlme]; };
   assocInd = derive2 { name="assocInd"; version="1.0.1"; sha256="16yzgvlqbapjhvzm5nw8vfrhh8mp9llnhck4bpgmszyrh93z1ha5"; depends=[]; };
   assortnet = derive2 { name="assortnet"; version="0.12"; sha256="1vyzrb8vsi9pcdn6jd83k77bg0q2a3dwdvlnmxnshqiif2pakb8m"; depends=[]; };
@@ -5057,12 +5141,12 @@ in with self; {
   audio = derive2 { name="audio"; version="0.1-6"; sha256="1f3k7n8x716kqx439jd0g0dc5iwc33jzzas4ikjrlgidp89i89iz"; depends=[]; };
   audiolyzR = derive2 { name="audiolyzR"; version="0.4-9"; sha256="09jsrjy15vcn6da0kgk06ghayyrf3s853gqv8qdawg745ky2hbgi"; depends=[hexbin plotrix RJSONIO]; };
   audit = derive2 { name="audit"; version="0.1-1"; sha256="0hrcdcwda5c0snskrychiyfjcbnymkcl2x43bapb6inw9y8989qv"; depends=[]; };
-  auditor = derive2 { name="auditor"; version="0.3.1"; sha256="1ndd5a5264b91qaw0qj9rwjvhn9lgw7y5dirjqlzkib6q9mcyanq"; depends=[car factoextra fdrtool GGally ggplot2 ggrepel gridExtra hnp plotROC ROCR tseries]; };
+  auditor = derive2 { name="auditor"; version="1.1.0"; sha256="10f9vk92w35rd56jsp81a31fm7ys28f9acnp2qr1n28c14m4pbvz"; depends=[DALEX ggplot2 ggrepel gridExtra hnp scales]; };
   augSIMEX = derive2 { name="augSIMEX"; version="3.7.3"; sha256="0cdqpckc4aiwi2dnkcvk2m9n0bg9f7qmd84n3rdw6clcrd0f95wz"; depends=[Formula MASS nleqslv Rcpp rootSolve]; };
   augmentedRCBD = derive2 { name="augmentedRCBD"; version="0.1.1"; sha256="0l2x8f8xqrvsn4gbi707xw2nfxcvcmxwgpzq4vh8ngxnq89m2179"; depends=[dplyr emmeans flextable ggplot2 moments multcomp multcompView officer Rdpack reshape2 stringi]; };
-  auk = derive2 { name="auk"; version="0.3.3"; sha256="0ysp1wn8ik2sgl2cc21bjvfhr39clc485frpi6z7xmnh57aqi56q"; depends=[assertthat countrycode dplyr httr magrittr rlang stringi stringr tidyr]; };
+  auk = derive2 { name="auk"; version="0.4.0"; sha256="1wrplqbzfa0jp91hxc1jd5vjm587pz1768s7csfqvrgn8ziy9akx"; depends=[assertthat countrycode dplyr httr magrittr rlang stringi stringr tidyr]; };
   aurelius = derive2 { name="aurelius"; version="0.8.4"; sha256="00bpf9sggvnajpmg3zsdgfjinkb6wbrcf1ris7qfhh1rp5rz4m4m"; depends=[gbm glmnet jsonlite]; };
-  auth0 = derive2 { name="auth0"; version="0.1.1"; sha256="1snmd6b16paglfpaf0bawja25rj3n7k8cv3hd7112vspc7lb62h0"; depends=[htmltools httr shiny yaml]; };
+  auth0 = derive2 { name="auth0"; version="0.2.1"; sha256="077nqh28q3b9jb25fy0157l06zpx3x0rg4z5dz2dqsh88xy4nhqj"; depends=[htmltools httr shiny shinyjs yaml]; };
   auto_pca = derive2 { name="auto.pca"; version="0.3"; sha256="01m2ldpcxzj7fhgmr9wp4ha3gqdyh7l5bkrnw83smcbq5229hsyy"; depends=[plyr psych]; };
   autoBagging = derive2 { name="autoBagging"; version="0.1.0"; sha256="01k44rgkpbbr3m2x360aq0fz2qi7nz036g5dsh2y3jy94rmddbyy"; depends=[abind caret cluster CORElearn e1071 entropy infotheo lsr MASS minerva party rpart xgboost]; };
   autoFRK = derive2 { name="autoFRK"; version="1.1.0"; sha256="0yl6cj9nzib0xp75i0nd642yd0r0l51vwy3ivizqigjv4sq1pd2f"; depends=[fields filehash filehashSQLite filematrix FNN LatticeKrig MASS mgcv Rcpp RcppEigen RcppParallel RSpectra spam]; };
@@ -5078,8 +5162,9 @@ in with self; {
   autoshiny = derive2 { name="autoshiny"; version="0.0.2"; sha256="0s06ynnirgsh19x8qq4020piirkhvjqpvz372syygvlal062y6cn"; depends=[shiny]; };
   autothresholdr = derive2 { name="autothresholdr"; version="1.3.5"; sha256="1dvc21w57ir34vhcrbz58scl4ly057yn1ibmdkly99hwfkpihv3x"; depends=[checkmate filesstrings glue ijtiff magrittr purrr Rcpp rlang]; };
   autovarCore = derive2 { name="autovarCore"; version="1.0-4"; sha256="0i5fvx0z2kri0c855q40hd596kfjhmwpp2zw7d7k0xvk2xbcgbiv"; depends=[Amelia jsonlite Rcpp urca vars]; };
-  av = derive2 { name="av"; version="0.2"; sha256="0vw6136sh1rgsah10xrcrgrpb6rpf5l8vixs950yq51syxc1y2qc"; depends=[]; };
+  av = derive2 { name="av"; version="0.3"; sha256="0gvd4ncr71ibcshdnhmm3y396q71pnk84jh3zpwhdxpvfah4haky"; depends=[]; };
   available = derive2 { name="available"; version="1.0.4"; sha256="18dqm10dicbvjd5wli4nkv4fip0fgh2b9h9gm5511ayfsdg8lc8l"; depends=[cli clisymbols crayon desc glue jsonlite memoise SnowballC stringdist tibble tidytext udapi yesno]; };
+  avar = derive2 { name="avar"; version="0.1.0"; sha256="00pp2irhw04jry545l4hvklf25aphdrz8djrhxx2936icgxz5kw4"; depends=[Rcpp RcppArmadillo simts]; };
   averisk = derive2 { name="averisk"; version="1.0.3"; sha256="02j27d4jxgy2bk5sgxp1xdfyqr321civs99qj0g8cp34gwqk0j3m"; depends=[MASS]; };
   aweek = derive2 { name="aweek"; version="1.0.0"; sha256="0a9d4yp694qch34mf08qc5fwsn21h9mw1ak6vylaq73nwiihajw9"; depends=[]; };
   aws = derive2 { name="aws"; version="2.2-1"; sha256="1g0saj3v67cjdk6396ck3ah7qvv3m9awj4b3v1n86nkwdpa75z91"; depends=[awsMethods gsl]; };
@@ -5093,7 +5178,7 @@ in with self; {
   aws_polly = derive2 { name="aws.polly"; version="0.1.2"; sha256="0ij0rbng8q7xfa08p4x1l1lcmskmz3fy2pvln28zxqbs6jbc22rm"; depends=[aws_signature httr jsonlite tuneR]; };
   aws_s3 = derive2 { name="aws.s3"; version="0.3.12"; sha256="1yfi9ihrd0hmzxklc86mf5hcwgzsb5c4p1i402vgpg5mfvcvp3rl"; depends=[aws_signature base64enc digest httr xml2]; };
   aws_ses = derive2 { name="aws.ses"; version="0.1.4"; sha256="13hf4iqhnpkm9rnr7nzwky663vplnkjrgk90zix91cn2fvaspjgp"; depends=[aws_signature httr jsonlite]; };
-  aws_signature = derive2 { name="aws.signature"; version="0.5.0"; sha256="1ij24k8lqripvdd4hzmrrvx6nvmymm8ndph9y7z2fh0cvmi43p0m"; depends=[base64enc digest]; };
+  aws_signature = derive2 { name="aws.signature"; version="0.5.2"; sha256="0skibgf2l6n7ql51gnlmvjyfmaqa8ijc9gywmyhvrcj9bix2pydf"; depends=[base64enc digest]; };
   aws_sns = derive2 { name="aws.sns"; version="0.1.7"; sha256="0i8nn5jnykhsjwn4nsqdqbagankjc09zs8and54rkirdigzdny8v"; depends=[aws_signature httr jsonlite xml2]; };
   aws_sqs = derive2 { name="aws.sqs"; version="0.1.10"; sha256="09sh3injb4kfrq5al7hmbnqdn5v5hnjkqqsz86vpi4154435ymdg"; depends=[aws_signature httr jsonlite xml2]; };
   aws_transcribe = derive2 { name="aws.transcribe"; version="0.1.2"; sha256="12qz7j535aqxcvcawj4iqycbcmlba32sdl8qj2cw6rq5rgm55xaz"; depends=[aws_signature httr jsonlite]; };
@@ -5108,12 +5193,13 @@ in with self; {
   baRcodeR = derive2 { name="baRcodeR"; version="0.1.3"; sha256="06fk70d52c4vi5bc42wljpxkvr3n45likhvs5b5r0lpw4himy1fm"; depends=[DT miniUI qrcode rstudioapi shiny]; };
   babar = derive2 { name="babar"; version="1.0"; sha256="13j5klrcnd4dwrgdbxlvwcj56l9mzi4j9ga6jj5i04pgdc6vsfx5"; depends=[]; };
   babel = derive2 { name="babel"; version="0.3-0"; sha256="1iwvx69051yhlxbcl6bypvc3mcih0q8bf3i29r3i79356hp12xqa"; depends=[edgeR]; };
-  babelwhale = derive2 { name="babelwhale"; version="1.0.0"; sha256="054m108wws0i58r4zk1qgd2fkfccdb7rw95ja467m63k0g9pxzn3"; depends=[crayon dplyr dynutils processx purrr]; };
+  babelwhale = derive2 { name="babelwhale"; version="1.0.1"; sha256="0mgkg9hji4mab3l33vvyyyc1d2q84l1zrmg63vr3b3gr0d62jcnl"; depends=[crayon dplyr dynutils processx purrr]; };
   babynames = derive2 { name="babynames"; version="1.0.0"; sha256="1vchzyk5pkr0zhh1q8k9g771n45jxiislipwkgrgamv7yzr49xsp"; depends=[tibble]; };
   bacistool = derive2 { name="bacistool"; version="0.9.8"; sha256="1yq7d2657l6iyy5v094c9rwphbpyhnijhwvacwhb07k6c6h069wh"; depends=[rjags]; };
   backShift = derive2 { name="backShift"; version="0.1.4.2"; sha256="1nj7mcdpzfzq68qg86rrys752gzw69n99yyb0jzg6r8qrgpcxj49"; depends=[clue ggplot2 igraph MASS matrixcalc mvnmle reshape2]; };
+  backbone = derive2 { name="backbone"; version="1.0.0"; sha256="1dddkn0q98xrjr81z8yhcr2rn9mcadc6zcsmdg8mrf51yjpqxg8a"; depends=[Matrix]; };
   backpipe = derive2 { name="backpipe"; version="0.2.3"; sha256="12k2cv9x8h0b002m9c8g4vj5a7chp4b8jqz377ia0diqw89dydpm"; depends=[]; };
-  backports = derive2 { name="backports"; version="1.1.4"; sha256="00zz969vc2gfi5p9q65pzghq2bxm3p9zqgwqswkyz9rgybz5wjzf"; depends=[]; };
+  backports = derive2 { name="backports"; version="1.1.5"; sha256="0k19w68b2aihyj5mflw3732gkkzs78sssqdns960pdw3yfnkiv33"; depends=[]; };
   backtest = derive2 { name="backtest"; version="0.3-4"; sha256="1s0mf247dz2vvyf4m3sp9xiqhv7xcs4rphyg9gdcy73060sah2ad"; depends=[lattice]; };
   bacr = derive2 { name="bacr"; version="1.0.1"; sha256="14zr1v4rihx0ra3x0vsb81vsz0g8gzskkdxkg7nhiz835hp2fiy8"; depends=[MCMCpack]; };
   badgecreatr = derive2 { name="badgecreatr"; version="0.2.0"; sha256="0mdixklaxky5gs8zm99ky280vxxlbq1mxnaarq6x0d1cb71bzv4l"; depends=[git2r]; };
@@ -5121,14 +5207,15 @@ in with self; {
   bagRboostR = derive2 { name="bagRboostR"; version="0.0.2"; sha256="1k9w98p3ad3myzyqhcrc4rsn7196qvhnmk5ddx3fpd1rdvy2dnby"; depends=[randomForest]; };
   baggedcv = derive2 { name="baggedcv"; version="1.0"; sha256="1rqs4sm6g1anck5s2dxlm1vcmylpphcbs2dpvf1sjki5lrzdq9z4"; depends=[doParallel foreach kedd mclust]; };
   baggr = derive2 { name="baggr"; version="0.1.0"; sha256="04iqvdj3ih5i6qwb25rmngvhw66v00xb2x5mzgbicd712dydp57s"; depends=[bayesplot BH crayon ggplot2 gridExtra Rcpp RcppEigen rstan rstantools StanHeaders]; };
-  bain = derive2 { name="bain"; version="0.2.1"; sha256="0z3c6k4hr6zkkzm2v8m1rmblbcz2j7hzipa9brirhhwqdlh8l6mj"; depends=[]; };
+  bain = derive2 { name="bain"; version="0.2.2"; sha256="08cgqba073hkisg122612va8ry971cvqs564gg9c7cfyipg5rilz"; depends=[lavaan]; };
   bairt = derive2 { name="bairt"; version="0.1.2"; sha256="17nc0lp0bzwshik33v0gq5d6nd2gvm4799b7rfiq089zhnzv90kj"; depends=[coda mvtnorm shiny shinyjs]; };
   baitmet = derive2 { name="baitmet"; version="1.0.1"; sha256="02ydakqr8v41hdnhcsgigwnic8d48qswryg1srb5w1fqdmdglnkl"; depends=[erah HiClimR Rcpp signal XML]; };
   balance = derive2 { name="balance"; version="0.2.4"; sha256="13ksd1ysd2by8qdc3vn1fgnaj1c2v0py7f501bajiyq6hpcwn1c5"; depends=[ggplot2]; };
   ballr = derive2 { name="ballr"; version="0.2.3"; sha256="1bfbdzn4q3i5m87vbxymxha54vgxjfckzpxk52m54fkwpz6yw9cl"; depends=[dplyr janitor lubridate magrittr rlang rvest xml2]; };
+  bama = derive2 { name="bama"; version="0.9.1"; sha256="1yx0gv5qxq3si5vzrrjy8y6d3b0v433aljyniyx9dp6q6mcqrhvw"; depends=[Rcpp RcppArmadillo]; };
   bamboo = derive2 { name="bamboo"; version="0.9.24"; sha256="1fw1wniba0kxb44d2w9r9nh5sy1jhrk48bn0zblz2y6gvwn8m2vn"; depends=[rscala]; };
   bamdit = derive2 { name="bamdit"; version="3.3.2"; sha256="11v9hy8ijbcqhwim0s3y69dz11jvys4vjvfnshj4p5qdz38sji6l"; depends=[ggExtra ggplot2 gridExtra MASS R2jags rjags]; };
-  bamlss = derive2 { name="bamlss"; version="1.0-2"; sha256="1g28c91j6zkmcah7dblgpgw789fsrcd9f3gbr8n8aa2yfflazjkp"; depends=[coda colorspace Formula Matrix MBA mgcv mvtnorm sp survival]; };
+  bamlss = derive2 { name="bamlss"; version="1.1-0"; sha256="1d1b6hzfyq03p0va568rckc9fm6b9k9dsdx1zp50w8jnf5bfns8x"; depends=[coda colorspace Formula Matrix MBA mgcv mvtnorm sp survival]; };
   bamp = derive2 { name="bamp"; version="2.0.7"; sha256="0yrqy4cj6wq98d5yfm9ahzhp2giwyqzd93s2fhxb8r4mzza5i9hm"; depends=[abind coda]; };
   banR = derive2 { name="banR"; version="0.2.0"; sha256="0m71m99f8f4wckylry6z16gw6r2cc4wxbd9287ns00jr6s13x6c8"; depends=[dplyr httr magrittr purrr readr rlang stringr tibble]; };
   bandit = derive2 { name="bandit"; version="0.5.0"; sha256="03mv4vbn9g4mqikd9map33gmw2fl9xvb62p7gpxs1240w5r4w3fp"; depends=[boot gam]; };
@@ -5163,6 +5250,7 @@ in with self; {
   batchtools = derive2 { name="batchtools"; version="0.9.11"; sha256="02mj21ypcjv5fs7ajf63p6bq0cyvihdl55hlpqx6kmsfjin1cr0v"; depends=[backports base64url brew checkmate data_table digest fs progress R6 rappdirs stringi withr]; };
   batman = derive2 { name="batman"; version="0.1.0"; sha256="0ccgx506p4iri23k2ikb8jmh04dp08w66785bv52iy8kd359h43f"; depends=[Rcpp]; };
   batteryreduction = derive2 { name="batteryreduction"; version="0.1.1"; sha256="0j838q7063bplkzd50kmnxji80cgysfsq7m1qifv8z7a2zsh8c8g"; depends=[pracma]; };
+  baycn = derive2 { name="baycn"; version="1.0.0"; sha256="1wjm7isdvb4z5lyhix849sxzngbmk8ccdvc8qgjgdcfmnx15binq"; depends=[egg ggplot2 MASS]; };
   bayes4psy = derive2 { name="bayes4psy"; version="1.1.1"; sha256="08fziwvsdwwwpk5hjsh8r9n920qqcwz5j5566p3m78dm5dsjkl7x"; depends=[BH circular cowplot dplyr emg ggplot2 mcmcse metRology Rcpp RcppEigen reshape rstan rstantools StanHeaders]; };
   bayesAB = derive2 { name="bayesAB"; version="1.1.2"; sha256="0xg29s3h4dy43snlc365q80ix96hwh4mfy1qvv87yys3i9zfinm5"; depends=[ggplot2 Rcpp rlang]; };
   bayesCL = derive2 { name="bayesCL"; version="0.0.1"; sha256="1l278lxidn16nma2ny14wjajcqyzbr6j5xl2lj08cic26c7hvjbm"; depends=[]; };
@@ -5188,14 +5276,14 @@ in with self; {
   bayesloglin = derive2 { name="bayesloglin"; version="1.0.1"; sha256="0j2ziahf6mwsz2gvb1azvdzlmszlpqgr5zqcqa68pxgq947sa2cs"; depends=[igraph]; };
   bayeslongitudinal = derive2 { name="bayeslongitudinal"; version="0.1.0"; sha256="0g45ikpnbry1albb3asrzab5z3sy98yf74c64qn02d65xgafifwg"; depends=[LearnBayes MASS mvtnorm]; };
   bayesm = derive2 { name="bayesm"; version="3.1-3"; sha256="041ach2f2vrqzd5kz17v7wmkjz6z8cjjihpk4qvczm4cr9z85r2i"; depends=[Rcpp RcppArmadillo]; };
-  bayesmeta = derive2 { name="bayesmeta"; version="2.3"; sha256="12rljnlr7wv0q95ild7vrsbgkpg7zw1lmh6gx4kpip1ckax04360"; depends=[forestplot metafor]; };
+  bayesmeta = derive2 { name="bayesmeta"; version="2.4"; sha256="0h2b237ml90z9xcbjy5fgc4l8k09210g101cf25mngbz76wxvy87"; depends=[forestplot metafor]; };
   bayesmix = derive2 { name="bayesmix"; version="0.7-4"; sha256="1qms1nnk2nq3gqr8zf2b9ri4wv8jrxv5i8s087k1rwdvya3k5r9a"; depends=[coda rjags]; };
   bayesplot = derive2 { name="bayesplot"; version="1.7.0"; sha256="0h23sbfny2hcipvvfhq5aiwdh1vanizn7f8lpb9kffypxhcd7v7w"; depends=[dplyr ggplot2 ggridges glue reshape2 rlang tibble tidyselect]; };
   bayespref = derive2 { name="bayespref"; version="1.0"; sha256="0gwlzs7qkgmf90np7xv85d27jjqggyhfj00vpya664a2znyjb3jm"; depends=[coda lattice MASS MCMCpack RColorBrewer]; };
   bayesreg = derive2 { name="bayesreg"; version="1.1"; sha256="12g5sklip3i8fpzrhvbikhgnl6kx8fxb88hfv8f34jy71r3h7zyp"; depends=[pgdraw]; };
   bayess = derive2 { name="bayess"; version="1.4"; sha256="0axipk5hn2hw3g4dfh7y3xa0dxqmi8kqpbr77nl14y7ydpija6xm"; depends=[combinat gplots MASS mnormt]; };
   bayest = derive2 { name="bayest"; version="1.0"; sha256="0ysfy96s9pk0xw0rzygf43c5jpj9j37kap3cd6w3m6361a0dw8mj"; depends=[]; };
-  bayestestR = derive2 { name="bayestestR"; version="0.2.2"; sha256="09r654lrhwwnshn5h2s2fbx3c8wigv3j4sva5hmfnkwjg8cclhd9"; depends=[insight]; };
+  bayestestR = derive2 { name="bayestestR"; version="0.3.0"; sha256="0r453zb106hj9w53jjgckxqajjf7shlrgv10gjxsv8if6qybdz5b"; depends=[insight]; };
   bayesvl = derive2 { name="bayesvl"; version="0.8.5"; sha256="1gb2in8hjiqb3daqz6phn1639i6p2w641kxrm3zh4rm3d6hg6hzr"; depends=[bayesplot bnlearn coda dplyr ggplot2 reshape2 rstan StanHeaders viridis]; };
   bayfoxr = derive2 { name="bayfoxr"; version="0.0.1"; sha256="1295296mbjpmd0bg1pfxvyp0az3sry6gsq9ir3l8x64w5a4qrzd5"; depends=[]; };
   bayou = derive2 { name="bayou"; version="2.1.1"; sha256="17gvb2dmviwibnlqn6p3p9pcc3705xh9r8lrm90p0yg7nhm0cn02"; depends=[ape assertthat coda denstrip fitdistrplus foreach geiger MASS Matrix mnormt phytools Rcpp RcppArmadillo]; };
@@ -5204,6 +5292,7 @@ in with self; {
   bazar = derive2 { name="bazar"; version="1.0.11"; sha256="1q2w5pvlb51lzbb5k719sf1lrhffandkfqlcvi2prw4dmq7qjxv9"; depends=[kimisc]; };
   bbefkr = derive2 { name="bbefkr"; version="4.2"; sha256="1wjx652w3p41sq71a2zdzmb7frjxm6xvcgrc2ark2spwb0lbjjw6"; depends=[]; };
   bbemkr = derive2 { name="bbemkr"; version="2.0"; sha256="015c57s8mpimm82nddnh382wlkisxgdmc2hvp7k38pcnqxc5gb5q"; depends=[MASS]; };
+  bbl = derive2 { name="bbl"; version="0.1.5"; sha256="1xp89cq27msqhq297i0syh3m0cwnmai0ii502x78m7fx7kgf5v1b"; depends=[pROC Rcpp]; };
   bbmle = derive2 { name="bbmle"; version="1.0.20"; sha256="1xzij7swrrzl5ly8l3lw6awh486zcm00251dwqws1y23fbgyh3vc"; depends=[lattice MASS numDeriv]; };
   bbo = derive2 { name="bbo"; version="0.2"; sha256="19xrbla3bb3csg3gjjrpkgyr379zfwyh293bcrcd6j8rnm6g4i01"; depends=[]; };
   bbw = derive2 { name="bbw"; version="0.1.3"; sha256="1z3an561qh0rfi3jhh1ghsdbg8aimqmf4hpqri2jz39in3p0gwg4"; depends=[car]; };
@@ -5211,14 +5300,14 @@ in with self; {
   bcROCsurface = derive2 { name="bcROCsurface"; version="1.0-3"; sha256="1g9l4abnpp1iq5wy3rl2jv47ql9zh6s2qrhyj06x22358lpinjnl"; depends=[boot nnet Rcpp RcppArmadillo rgl]; };
   bcRep = derive2 { name="bcRep"; version="1.3.6"; sha256="1fibx11ykkkjv4sgg6zc2a0g270384z2cf68hwghnld0wi002b5z"; depends=[ape doParallel foreach gplots ineq plotrix proxy stringdist vegan]; };
   bcaboot = derive2 { name="bcaboot"; version="0.2-1"; sha256="0wf1igkb0lidz4pvh3kfccs9858m1g9650wprrvrpwsdfrcd7rc9"; depends=[]; };
-  bcf = derive2 { name="bcf"; version="1.2.1"; sha256="03l4wlqz69sqkffjrlznlam2sql9zfpa6x84y7x1z66zfy6f7n79"; depends=[Rcpp RcppArmadillo]; };
+  bcf = derive2 { name="bcf"; version="1.3"; sha256="1f8szjgsyhnff3zzmmy7bnsam12ywj46n3fxsj1y3fn1m5wnd8mz"; depends=[Rcpp RcppArmadillo]; };
   bcgam = derive2 { name="bcgam"; version="1.0"; sha256="1dg2fcjw8xal77irviiz260qpar2iqkjvi2k4qfm71jyq0ir0axk"; depends=[coda igraph nimble]; };
   bclust = derive2 { name="bclust"; version="1.5"; sha256="01kx02azj26b6swly53zhf3sny6c6jglkxnzylsc0pvri89x7yj2"; depends=[]; };
   bcmaps = derive2 { name="bcmaps"; version="0.18.0"; sha256="0zq5fp9r6n2mpjd96ri7lmp63g8lm5sjwgfmc4cligrch3kakzxy"; depends=[httr rappdirs sf]; };
   bcp = derive2 { name="bcp"; version="4.0.3"; sha256="0vhs89lb2wpanqsljclpvwbjmgdsc3jicws8bzqiqh8mbs3nzpxy"; depends=[Rcpp RcppArmadillo]; };
   bcpa = derive2 { name="bcpa"; version="1.1"; sha256="0rwbd39szp0ar9nli2rswhjiwil31zgl7lnwm9phd0qjv8q0ppar"; depends=[plyr Rcpp]; };
   bcpmeta = derive2 { name="bcpmeta"; version="1.0"; sha256="02fw1qz9cvr7pvmcng7qg7p04wxxpmvb2s8p78f52w4bf694iqhl"; depends=[mvtnorm]; };
-  bcrm = derive2 { name="bcrm"; version="0.5.3"; sha256="1zd01qlpwps28yvckd0bxax3q4w9spnmik1slsibg77b15d6scy7"; depends=[ggplot2 knitr mvtnorm rlang]; };
+  bcrm = derive2 { name="bcrm"; version="0.5.4"; sha256="1j8bfa3x7h77vs41k4nqbqlb961szp1fkhc181wzb3zpbnzmjhhy"; depends=[ggplot2 knitr mvtnorm rlang]; };
   bcrypt = derive2 { name="bcrypt"; version="1.1"; sha256="1wwdin8x09y8n8zrwj1ylh5ikcz0v0la4wmrsvbdr61cg336wzx4"; depends=[openssl]; };
   bcv = derive2 { name="bcv"; version="1.0.1"; sha256="0yqcfariw9sw0b8cpljcr7vf5rf0cwr1wbif23icchfaxk2m42gj"; depends=[]; };
   bdDwC = derive2 { name="bdDwC"; version="0.1.15"; sha256="0yraq8a0wgz12rzi2dx0gdcz5rx99qd2pzw972wjqyq3rs41pwx0"; depends=[shiny shinyBS shinydashboard shinyFiles shinyjs]; };
@@ -5226,6 +5315,7 @@ in with self; {
   bdchecks = derive2 { name="bdchecks"; version="0.1.7"; sha256="1pzsvn1m1f9bdmhxmh57pvn9jm4z41rkvv6h60hq2lfgkapnjy7q"; depends=[bdDwC data_table DT finch knitr rgbif shiny shinyBS shinydashboard shinyjs spocc yaml]; };
   bdclean = derive2 { name="bdclean"; version="0.1.15"; sha256="14cy8yaqd6bg2zyh2wvndydk9sigaydavxl4cfypqz5kqdhj82z9"; depends=[bdchecks bdDwC data_table DT finch knitr leaflet rgbif rmarkdown shiny shinydashboard shinyjs spocc]; };
   bde = derive2 { name="bde"; version="1.0.1"; sha256="1f25gmjfl58x4pns89abfk85yq5aad3bgq9yqpv505g5gxk62d3v"; depends=[ggplot2 shiny]; };
+  bdl = derive2 { name="bdl"; version="1.0.0"; sha256="1nnzjg3qblx9x8s113104kdpxvq708s9qgnilr3sjasfny50b49b"; depends=[dplyr ggplot2 ggpubr httr jsonlite magrittr purrr randomcoloR sf tibble tidyr tmap tmaptools]; };
   bdots = derive2 { name="bdots"; version="0.1.19"; sha256="1cj6ly62d50z6713119hadl90cxf5x30wpnpx6mssmd49zds6nxb"; depends=[doParallel doRNG foreach Matrix mvtnorm nlme]; };
   bdpar = derive2 { name="bdpar"; version="1.0.0"; sha256="0f5hwm4j4m8q1jgyal710p6s1hwc05kxzmcp3zsavwm8qzcc9s60"; depends=[ini magrittr pipeR purrr R6 rlist svMisc]; };
   bdpopt = derive2 { name="bdpopt"; version="1.0-1"; sha256="1z7mdqklw3frsdzyhvx8s8wvblwm28fr1gca2yrivqjng0r47lx4"; depends=[coda rjags]; };
@@ -5250,14 +5340,14 @@ in with self; {
   beeswarm = derive2 { name="beeswarm"; version="0.2.3"; sha256="0hy89bwv7jixlg91li1fywa77916am2whqp1m1fx1khd45g44581"; depends=[]; };
   beezdemand = derive2 { name="beezdemand"; version="0.1.0"; sha256="1i6p36cfvz87k6llpibklmdbjb7vp1v38ijxaqkmv1jzc28sj3cl"; depends=[ggplot2 nlmrt nls2 nlstools reshape2]; };
   beginr = derive2 { name="beginr"; version="0.1.7"; sha256="1a1lzjmq0qimm8yrb4n6knh23gyqxgax60n95rih95sg34904d0m"; depends=[cranlogs]; };
-  behaviorchange = derive2 { name="behaviorchange"; version="0.1.0"; sha256="15yrkgbhmfns4jvjjcfgk74rh3k54m5x31s160cg3gw53q3frdka"; depends=[BiasedUrn data_tree DiagrammeR ggplot2 googlesheets gridExtra gtable magrittr ufs userfriendlyscience viridis]; };
+  behaviorchange = derive2 { name="behaviorchange"; version="0.2.1"; sha256="12dakzc3k85na3wvnwisynpzy4i2vw2i2amkrf4lf6rahn0rkfs1"; depends=[BiasedUrn data_tree DiagrammeR DiagrammeRsvg ggplot2 googlesheets gridExtra gtable magrittr ufs viridis]; };
   behavr = derive2 { name="behavr"; version="0.3.2"; sha256="01ny099m2zmvlalwiq3nqkgynnxn1mdspch15lkawwd40q8s9s4p"; depends=[data_table]; };
   belex = derive2 { name="belex"; version="0.1.0"; sha256="1563yngc1lvncmx3h6kgsj1r6k3hvxidh6h9rb7apxs2rq5k32ms"; depends=[XML]; };
-  belg = derive2 { name="belg"; version="0.2.3"; sha256="1ss40fxfmzld4fqpbkc3knsxdqc4nmllgvl2v4nyqzcalcknzvvf"; depends=[Rcpp RcppArmadillo]; };
-  bench = derive2 { name="bench"; version="1.0.2"; sha256="07hrcjvrbd69yqc7nl4n23aanz1p94qikyq0fliypycvj452g315"; depends=[glue pillar profmem rlang tibble]; };
+  belg = derive2 { name="belg"; version="1.0.0"; sha256="02n4i0kyxdxwgq7qqjqa4pwsxmmp0cksn0jrj5dvlvpflf1naicg"; depends=[Rcpp RcppArmadillo]; };
+  bench = derive2 { name="bench"; version="1.0.4"; sha256="1vb31jx4rwri4ywm9jlib65nn2avirvyd40af8zz5i3sl684ypg9"; depends=[glue pillar profmem rlang tibble]; };
   benchden = derive2 { name="benchden"; version="1.0.5"; sha256="1cwcgcm660k8rc8cpd9sfpzz66r55b4f4hcjc0hznpml35015zla"; depends=[]; };
-  benchmarkme = derive2 { name="benchmarkme"; version="1.0.0"; sha256="1jslcz56m48rx64w80xxccdzhmqbpg2b81rp8i358mj9xjrasya9"; depends=[benchmarkmeData doParallel dplyr foreach httr Matrix tibble]; };
-  benchmarkmeData = derive2 { name="benchmarkmeData"; version="1.0.1"; sha256="1azjsvz855kzrd2fwc2v06pzdlc75492sq8pxwk4via8jp11jm67"; depends=[dplyr tibble]; };
+  benchmarkme = derive2 { name="benchmarkme"; version="1.0.2"; sha256="0ivrlglxnfl7cm7vww8mrnpjy2w2w4vdrkr647s3x6yfia12p07n"; depends=[benchmarkmeData doParallel dplyr foreach httr Matrix tibble]; };
+  benchmarkmeData = derive2 { name="benchmarkmeData"; version="1.0.2"; sha256="1rxly627f7wbwvhli5xzz52vpabj5wa5fkx6ahl487jgs1ll7nms"; depends=[dplyr tibble]; };
   benchr = derive2 { name="benchr"; version="0.2.3-1"; sha256="1q8g9v7zbspd2gmydwwfi3avdsnmn5ahr9iybdqsicgfch5plsf5"; depends=[Rcpp RcppProgress]; };
   bender = derive2 { name="bender"; version="0.1.1"; sha256="07npksrj094h884lli0fjvwjc1lhcwzlsk9wx82761mka5xajv4v"; depends=[httr jsonlite R6]; };
   benford_analysis = derive2 { name="benford.analysis"; version="0.1.5"; sha256="0y0c7l2r9s7lg9bw4ndcqwisa5l6a2cpydn1vmz88h3yva0l68cg"; depends=[data_table]; };
@@ -5265,7 +5355,7 @@ in with self; {
   benthos = derive2 { name="benthos"; version="1.3-6"; sha256="1vywnc6k37gpaq7g59v3qa6619svcmnd8ri5zm5l0ila2s3ccb2c"; depends=[dplyr lazyeval readr]; };
   ber = derive2 { name="ber"; version="4.0"; sha256="0gl7rms92qpa5ksn8h3ppykmxk5lzbcs13kf2sjiy0r2535n8ydi"; depends=[MASS]; };
   berryFunctions = derive2 { name="berryFunctions"; version="1.18.2"; sha256="0yicwsz6v5nffvw2wmjmc2zhcik7avz3xmj8zhb77xhaq9dazk9s"; depends=[abind]; };
-  bestNormalize = derive2 { name="bestNormalize"; version="1.4.0"; sha256="01bb5sxgiv04lf1nkvwg1xfpll83lrjr8mb5bqcvriwxv15div0j"; depends=[doParallel doRNG dplyr foreach LambertW nortest]; };
+  bestNormalize = derive2 { name="bestNormalize"; version="1.4.2"; sha256="0df4fspcmf8scifgy2v69qlqp7zzyicjmscmyxp1m8wzd7cwzd0q"; depends=[doParallel doRNG dplyr foreach LambertW nortest]; };
   bestglm = derive2 { name="bestglm"; version="0.37"; sha256="0ghhi4g75mgq2pnkrvw188s65132i1d7v3hahnjrsnx4vrr8a9lz"; depends=[glmnet grpreg lattice leaps pls]; };
   betaboost = derive2 { name="betaboost"; version="1.0.1"; sha256="1zdyzxl2kp2i5lkiz280wz4av9wqklbn25zmq6n4yb6a579yjfn8"; depends=[gamboostLSS mboost]; };
   betacal = derive2 { name="betacal"; version="0.1.0"; sha256="19wgpgf9yhckl9qx9v24f4yh055wfalphcxwm7lg68px6ap2pxl9"; depends=[]; };
@@ -5278,7 +5368,6 @@ in with self; {
   bethel = derive2 { name="bethel"; version="0.2"; sha256="1zlkw672k1c5px47bpa2vk3w2906vkhvifz20h6xm7s51gmm64i0"; depends=[]; };
   beyondWhittle = derive2 { name="beyondWhittle"; version="1.1.1"; sha256="1nr414wvfwycp3s9v592jd4gk5wdjfklk7ypqabx73k5fsxrcc0g"; depends=[BH forecast ltsa MASS MTS Rcpp RcppArmadillo]; };
   bezier = derive2 { name="bezier"; version="1.1.2"; sha256="1vw5128v8h973xwa1fdm9cw2jvrldj87nd55lddlp3qsz3ag4br6"; depends=[]; };
-  bfa = derive2 { name="bfa"; version="0.4"; sha256="08n6446xl2w8z0rsqi6v2hp9cp744frxw6vrbxg5cpybhyyfzr36"; depends=[coda Rcpp RcppArmadillo]; };
   bfast = derive2 { name="bfast"; version="1.5.7"; sha256="0n75minka55rxpvs3qkj0c65ydn1gc3i8lkr2gdyn1adjkl5yn01"; depends=[forecast raster sp strucchange zoo]; };
   bfp = derive2 { name="bfp"; version="0.0-40"; sha256="03risiq2b7bc3gwlgpcsy1gvja6n5w1j3kw13s2wrd420hddzk4s"; depends=[Rcpp]; };
   bfsl = derive2 { name="bfsl"; version="0.1.0"; sha256="1hl53nis8bb1ffgkx91ij9vh680cpkb80y548y67y9w18iyd4aw4"; depends=[]; };
@@ -5293,8 +5382,9 @@ in with self; {
   bib2df = derive2 { name="bib2df"; version="1.1.1"; sha256="0d57883df774qqwpssmly3f1gci32yc5sgwc3x8f2rjih23s1nf6"; depends=[dplyr httr humaniformat stringr]; };
   bibliometrix = derive2 { name="bibliometrix"; version="2.2.1"; sha256="0d8mwhy792m4dp9h0gyw984qq5p8xbs1xx626w8a6jw23w6qzmxg"; depends=[dplyr DT factoextra FactoMineR ggplot2 ggraph ggrepel igraph Matrix networkD3 RColorBrewer reshape2 RISmed rscopus shiny shinycssloaders shinythemes SnowballC stringdist stringr]; };
   bibtex = derive2 { name="bibtex"; version="0.4.2"; sha256="0wl3925ryd54g1nv3ncwllc493d39dpgy5md61940h69c0van1hz"; depends=[stringr]; };
-  biclique = derive2 { name="biclique"; version="1.0.2"; sha256="1284k1aj9lx282d3lyigb8ifp51d119r97jis8g593qvzb8dqclr"; depends=[]; };
+  biclique = derive2 { name="biclique"; version="1.0.3"; sha256="1jxfw0f9z916l2s9q5q7jgqfdr038ikf7ql61hzh3pw0ypnvabam"; depends=[]; };
   biclust = derive2 { name="biclust"; version="2.0.1"; sha256="1y5n6wfa1lx88ck3x09rcg0dh3pw89225h85hmq2la1s1fpa48i0"; depends=[additivityTests colorspace flexclust ggplot2 lattice MASS tidyr]; };
+  biclustermd = derive2 { name="biclustermd"; version="0.1.0"; sha256="0d2fa6lainnkdzn1mq8pbxlc14hvlgfi3pcxw9rwqfjhxp6wkkig"; depends=[biclust clues doParallel dplyr foreach ggplot2 magrittr nycflights13 tidyr]; };
   bife = derive2 { name="bife"; version="0.6"; sha256="1fmzmzq3hxr9kzqq5zmmsm2927vjb5mj08g2pnzljhmvsn2b7x3y"; depends=[data_table Formula Rcpp RcppArmadillo]; };
   bigGP = derive2 { name="bigGP"; version="0.1-6"; sha256="0fwm06rzx1qbh16ii93x26i4v4yb50jk67k3qmzyr3gr4z9b9xhg"; depends=[Rmpi]; };
   bigIntegerAlgos = derive2 { name="bigIntegerAlgos"; version="0.1.2"; sha256="1cbcxwhb25ismiyr95pfgc7nq14p4srd9y8y3g3xz0ywjs0qnjy5"; depends=[gmp]; };
@@ -5308,7 +5398,7 @@ in with self; {
   bigdatadist = derive2 { name="bigdatadist"; version="1.1"; sha256="16gkybwcp9sxqb0iic2fhmc4gndr44ayg14wrfcjvjaj4g5r6xs2"; depends=[FNN MASS pdist rrcov]; };
   bigdist = derive2 { name="bigdist"; version="0.1.4"; sha256="1qfnmhyfadmnnagbhdl4jjrb53i1srszf19idp8fy6bczbjq85yi"; depends=[assertthat bigstatsr furrr proxy]; };
   biglars = derive2 { name="biglars"; version="1.0.2"; sha256="17zs25dvlja9ynx2fm5f4nmgkx4mnyqs5iscwsyahr6qigx1rz9x"; depends=[ff]; };
-  biglasso = derive2 { name="biglasso"; version="1.3-6"; sha256="044l2l34l4pl7ijwgq569cn8x5clj795qpfwb1b9qfwvggvgzgni"; depends=[BH bigmemory Matrix ncvreg Rcpp RcppArmadillo]; };
+  biglasso = derive2 { name="biglasso"; version="1.3-7"; sha256="1s9l8n0a3nv6viyp62k890nhdpfh8jl1ahhsa51x7bx2agdqplhi"; depends=[BH bigmemory Matrix ncvreg Rcpp RcppArmadillo]; };
   bigleaf = derive2 { name="bigleaf"; version="0.7.1"; sha256="0hsssz5973vapkmmh9dgzrijyjj1s75iarq3cpfi7ljm4n748qig"; depends=[robustbase solartime]; };
   biglm = derive2 { name="biglm"; version="0.9-1"; sha256="1z7h4by457z93k5i6qf5rq7xmd1y2kcd1rq4pv465cd32d4mb2g1"; depends=[DBI]; };
   biglmm = derive2 { name="biglmm"; version="0.9-1"; sha256="1f4w59jvq7lq0bh5fs41czw0yc8h56iijbj0hlcq47zyqx6gll9a"; depends=[DBI]; };
@@ -5316,7 +5406,7 @@ in with self; {
   bigmemory = derive2 { name="bigmemory"; version="4.5.33"; sha256="0ycl9dzm3drpyas625h34rir5bnbjlncxlvawfsfmqwcbmwdjdvj"; depends=[BH bigmemory_sri Rcpp]; };
   bigmemory_sri = derive2 { name="bigmemory.sri"; version="0.1.3"; sha256="0mg14ilwdkd64q2ri9jdwnk7mp55dqim7xfifrs65sdsv1934h2m"; depends=[]; };
   bigml = derive2 { name="bigml"; version="0.1.2"; sha256="0vl5krjbgckknxwl26b2hn63jhb80zbn7abpckhxzxfxzncpnfz9"; depends=[plyr RCurl RJSONIO]; };
-  bigreadr = derive2 { name="bigreadr"; version="0.1.7"; sha256="0sdjdwdgw2jicdqrpyan4nma060yimd6wpxwvw06h4spljbp00yl"; depends=[data_table fpeek Rcpp]; };
+  bigreadr = derive2 { name="bigreadr"; version="0.1.10"; sha256="0zp8xqjf15xahhlwrcqgr0r30dbdpvnk5ml2h4m9kw6cydkb9g7b"; depends=[data_table Rcpp]; };
   bigrquery = derive2 { name="bigrquery"; version="1.2.0"; sha256="1ggh2gngr5x0g6y7d55y6kvn94anf7qi1bkc28cjmw61hxjq38fb"; depends=[assertthat bit64 curl DBI gargle glue httr jsonlite prettyunits progress rapidjsonr Rcpp rlang tibble]; };
   bigsplines = derive2 { name="bigsplines"; version="1.1-1"; sha256="1kf04p2lglzdi1fdryk27nmj2a2jca2ii7ki8vak93sq21isb179"; depends=[quadprog]; };
   bigstatsr = derive2 { name="bigstatsr"; version="0.9.1"; sha256="0v0rxp45lbv5bmvyfkm1v4l2rr7g1rfymi547y10b2zysllbfbr0"; depends=[bigreadr cowplot doParallel foreach ggplot2 Rcpp RcppArmadillo rmio RSpectra tibble]; };
@@ -5324,13 +5414,14 @@ in with self; {
   bigtabulate = derive2 { name="bigtabulate"; version="1.1.5"; sha256="1jvp3m0ms2cav9z8vvhh80gsa0kvc351brv2jq99rxv1mwvpa4xj"; depends=[BH biganalytics bigmemory Rcpp]; };
   bigtcr = derive2 { name="bigtcr"; version="1.1"; sha256="1l03yc28afdm7glbw4ay0zsywjgqg5l90qz1hfhslsy8gg7d5wq5"; depends=[]; };
   bigtime = derive2 { name="bigtime"; version="0.1.0"; sha256="136gy2i4qwa2drklllyzp3z0dbijlavgf3sxy73bf84df2yq1c9i"; depends=[corrplot lattice MASS Rcpp RcppArmadillo RcppEigen zoo]; };
-  bikedata = derive2 { name="bikedata"; version="0.2.3"; sha256="0dbvzasp7is4zwv2n7mgliglw88hy0hc9g6cqjpp6r67w8s6vhcl"; depends=[BH DBI dodgr httr lubridate magrittr Rcpp readxl reshape2 RSQLite tibble xml2]; };
+  bigutilsr = derive2 { name="bigutilsr"; version="0.1.1"; sha256="143nvsg9xyvhmi6ky76ls00v87h41iiwy7yvpk6pqvbj7zqzs0cy"; depends=[hdpca nabor Rcpp robust robustbase]; };
   bikeshare14 = derive2 { name="bikeshare14"; version="0.1.2"; sha256="1sib83driqv9k4aa131nw3xasslrxvnxkn3mr8kxycxccky025n9"; depends=[]; };
+  bikm1 = derive2 { name="bikm1"; version="0.9.0"; sha256="09ibaj5nd7ql5l30z726nifym5bnmkx4nbw982p9h2440rdx0g5b"; depends=[ade4 ggplot2 gtools pracma reshape2]; };
   bild = derive2 { name="bild"; version="1.1-5"; sha256="03has1zi57inicahl52ja006vv5cdndyxfsxp77l6nc3zc6ixna8"; depends=[]; };
   billboard = derive2 { name="billboard"; version="0.1.0"; sha256="1z3y8dijhc1381y91n5zq305xzm1gpvs0g4mdpfr7zrblpa8ws39"; depends=[tibble]; };
-  billboarder = derive2 { name="billboarder"; version="0.2.6"; sha256="0hz135ffzg8s773ligbdjflqj3v0svldvqwq13lhdj78dx9k6jya"; depends=[ggplot2 htmltools htmlwidgets jsonlite magrittr scales]; };
+  billboarder = derive2 { name="billboarder"; version="0.2.7"; sha256="02k90rhz2pawy83kp0rjzvl94s02x41a53diqfva357p8w9k6z48"; depends=[ggplot2 htmltools htmlwidgets jsonlite magrittr scales]; };
   bimetallic = derive2 { name="bimetallic"; version="1.0"; sha256="181qi4dr0zc7x6wziq7jdc1his20jmprfpq3hrfm56fr5n1sj8wl"; depends=[]; };
-  bimets = derive2 { name="bimets"; version="1.4.0"; sha256="1siyivhx5c390akdlggy4xhjgryqjcv46h0jiw942afmmkm8iq4d"; depends=[xts zoo]; };
+  bimets = derive2 { name="bimets"; version="1.4.1"; sha256="1yv6zag3jhr64hkjwliy71ac8vrg6rmpyfbcs0hbwd4zfwmzbdv7"; depends=[xts zoo]; };
   bimixt = derive2 { name="bimixt"; version="1.0"; sha256="0nhszpzjqy8z3vngl5jdzqxzshnn92wgi0ci5n3n5kzi24xkfrzc"; depends=[pROC]; };
   binGroup = derive2 { name="binGroup"; version="2.2-1"; sha256="0cb7j6b0s3y56mv1967awwri0kv0rf3sr3vwf9gc2zbjggxi9ffp"; depends=[partitions Rdpack]; };
   binMto = derive2 { name="binMto"; version="0.0-7"; sha256="0rg9rsdy14jx7zjv60krcz1vh0sxqimsai0wynhx2sx0kydw4ngy"; depends=[mvtnorm]; };
@@ -5359,10 +5450,10 @@ in with self; {
   binst = derive2 { name="binst"; version="0.2.1"; sha256="09kzk7n1j9nzgyijwirzk33z6p6hc67zkd05hv1i9qfijy31gci4"; depends=[rpart]; };
   bio_infer = derive2 { name="bio.infer"; version="1.3-3"; sha256="14pdv6yk0sk6v8g9p6bazbp7mr3wmxgfi6p6dj9n77lhqlvjcgm9"; depends=[]; };
   bio3d = derive2 { name="bio3d"; version="2.3-4"; sha256="1zmswa9xs81lbrlkkgi8dvv9xpf0ynqjqwy1k36szvfb8ar9mczr"; depends=[Rcpp]; };
-  bioOED = derive2 { name="bioOED"; version="0.1.4"; sha256="1rjcqrni5xag97pxfsf40isr2c8pkqsvihf86phak8ngwl7qdgmc"; depends=[bioinactivation corrplot dplyr FME ggplot2 MEIGOR]; };
+  bioOED = derive2 { name="bioOED"; version="0.2.1"; sha256="0wx58bngpzlrbbcnx8l1lqhsg51y98wcym1238p87drf64x2mj1n"; depends=[bioinactivation corrplot dplyr FME ggplot2 MEIGOR rlang tidyr tidyselect tidyverse]; };
   bioPN = derive2 { name="bioPN"; version="1.2.0"; sha256="0mvqgsfc7d4h6npgg728chyp5jcsf49xhnq8cgjxfzmdayr1fwr8"; depends=[]; };
   bioRad = derive2 { name="bioRad"; version="0.4.0"; sha256="100b1fz7dxpvsc452r4yvd4g6gmzz80pvw1l0sp6g4310gyzs2fb"; depends=[curl fields ggmap ggplot2 maptools raster rgdal rhdf5 sp]; };
-  bioacoustics = derive2 { name="bioacoustics"; version="0.2.0.1"; sha256="1slg2drj7m90w6i5411cnssvgq9rhsykyv5mjmqgkvr5plfacxsw"; depends=[htmltools moments Rcpp stringr tuneR]; };
+  bioacoustics = derive2 { name="bioacoustics"; version="0.2.1"; sha256="0yk7x2alr6sly9fnd3wg6cph8w4lpz140588zjldiz7zg97qbvvq"; depends=[htmltools moments Rcpp stringr tuneR]; };
   biofiles = derive2 { name="biofiles"; version="1.0.0"; sha256="1bglgl2jcp6jy3f7xwndil56i98xx4kn518s3fqdixw7n5ibmqd2"; depends=[assertthat BiocGenerics Biostrings foreach GenomeInfoDb GenomicRanges IRanges iterators Rcpp RCurl reutils S4Vectors XVector]; };
   biogas = derive2 { name="biogas"; version="1.10.3"; sha256="1qfidjwhaxg5zplzkldhj4zqg81xrcqmvh9x5km5yhyymzr6y4vs"; depends=[]; };
   biogeo = derive2 { name="biogeo"; version="1.0"; sha256="14sqgg8b06gp5dajxvyj9s3ndsk7jpkfr0mkyl2l61kgp6qx53rh"; depends=[maptools raster sp stringr vegan]; };
@@ -5384,7 +5475,7 @@ in with self; {
   bipartite = derive2 { name="bipartite"; version="2.13"; sha256="11l8lialvb02wwk6q81sq0i48v422rcvxxbkz74la820a2qzdwcx"; depends=[fields igraph MASS permute sna vegan]; };
   bipartiteD3 = derive2 { name="bipartiteD3"; version="0.2.0"; sha256="1jvhlycmxii4vcm9qbj246qkwhd1bcggqq56b5rmbyqwd4vhqh8f"; depends=[downloader dplyr purrr r2d3 RColorBrewer stringr tibble tidyr]; };
   biplotbootGUI = derive2 { name="biplotbootGUI"; version="1.2"; sha256="07lrs2n6s54h97vjriszszhksdbi14s2i234kwfhg7aq47k6l0jl"; depends=[cluster dendroextras MASS matlib rgl shapes tcltk2 tkrplot]; };
-  birdring = derive2 { name="birdring"; version="1.3"; sha256="1vlivapmgq3kz2zz795c7hcfpibnqcfnxp7m42di37yngqc90q87"; depends=[geosphere ks lazyData raster rgdal rgeos rworldmap rworldxtra sp]; };
+  birdring = derive2 { name="birdring"; version="1.4"; sha256="0rskrf0r5nrzfcac0zvc60vabvs9dws2zx1rxssvw6xmwyiiy1z6"; depends=[geosphere ks lazyData raster rgdal rgeos rworldmap rworldxtra sp]; };
   birk = derive2 { name="birk"; version="2.1.2"; sha256="07ck59m5mw897a60vmdn1b3qrmqj20qpfsn3093haqbpn8z13dmn"; depends=[]; };
   birtr = derive2 { name="birtr"; version="1.0.0"; sha256="0bcxvj30wzwclw1lcyhvwj3k7awd39lrvzia1nrg53hw90bfs811"; depends=[]; };
   biscale = derive2 { name="biscale"; version="0.1.2"; sha256="1m7b1sjqngcfqc5z1b10i3s9m6lml2jiw6ab5dk9dr01i4yw0nhw"; depends=[classInt dplyr ggplot2 glue rlang tidyr]; };
@@ -5400,17 +5491,18 @@ in with self; {
   bivarRIpower = derive2 { name="bivarRIpower"; version="1.2"; sha256="0vgi0476rwali6k8bkp317jawzq5pf04v75xmycpmadb7drnpzy0"; depends=[]; };
   bivariate = derive2 { name="bivariate"; version="0.4.1"; sha256="13qmwz8lwgxppjsq491f8grsg2myhwma4ikhx2k40lag98dpgc9f"; depends=[barsurf intoo KernSmooth mvtnorm]; };
   bivgeom = derive2 { name="bivgeom"; version="1.0"; sha256="1cn8k7q011whr4f7zig85dsrkz04614z9ns2ky6k6i16s5n3glxy"; depends=[bbmle copula]; };
+  bivquant = derive2 { name="bivquant"; version="0.1"; sha256="05dn4qik2dvmgqc2613vddh312bqhza1vnf94an75888gxri5h03"; depends=[copula cubature lpSolve MASS mvtnorm regpro]; };
   bivrp = derive2 { name="bivrp"; version="1.2"; sha256="1yrciaadxlkxzbgdsig80yjn9iqrv8a6ccz62hsnyb3knycpcln1"; depends=[MASS mrfDepth]; };
   biwavelet = derive2 { name="biwavelet"; version="0.20.19"; sha256="0pdjjjjiwnl7ihlwzjd9hwl5kzq5wbnbqfmm5pp8gvkcypj9k7rb"; depends=[fields foreach Rcpp]; };
   biwt = derive2 { name="biwt"; version="1.0"; sha256="1mb3x8ky3x8j4n8d859i7byyjyfzq035i674b2dmdca6mn7paa14"; depends=[MASS rrcov]; };
   bizdays = derive2 { name="bizdays"; version="1.0.6"; sha256="1av96rj4fllfais9xwh1p8601xvsj0awfh9n2n1x5kzca966h8fq"; depends=[jsonlite]; };
   bjscrapeR = derive2 { name="bjscrapeR"; version="0.1.0"; sha256="18chbgiwify272iqf0w4vsqh73wbk12d8m2awc5hbnfqblz3phwd"; depends=[dplyr glue readr tibble]; };
   bkmr = derive2 { name="bkmr"; version="0.2.0"; sha256="0dk6dn73bqlvwinn3aginls4533931xcr3h59k0w60yxs3v8yakv"; depends=[dplyr fields magrittr MASS nlme tidyr tmvtnorm truncnorm]; };
-  blackbox = derive2 { name="blackbox"; version="1.1.25"; sha256="1xjljxvh8jg5gnfwdb6f8ifn5s30dxjlnbal97kinq0ad33lvs48"; depends=[foreach geometry lattice MASS nloptr numDeriv pbapply proxy rcdd Rcpp RcppEigen spaMM]; };
+  blackbox = derive2 { name="blackbox"; version="1.1.27"; sha256="1mpxil8fr56xiy64177s6m16pygfsr6i1bn4crvnhypz9197in8c"; depends=[foreach geometry lattice MASS nloptr numDeriv pbapply proxy rcdd Rcpp RcppEigen spaMM]; };
   blaise = derive2 { name="blaise"; version="1.3.4"; sha256="14jk62sw4xs0yip8gh1w2795l8p0ybv83c24ijizxymg16h7i9g7"; depends=[dplyr readr stringr tibble]; };
   blandr = derive2 { name="blandr"; version="0.5.1"; sha256="1rqas71hlf000b3z824d8ljshf8bx91bbrzaxxnx5n3chv19w6z6"; depends=[ggplot2 jmvcore knitr R6 rmarkdown stringr]; };
   blastula = derive2 { name="blastula"; version="0.2.1"; sha256="1w9g858c6p7qzv86pfndycvpgv6k63r85wlq11249mi2zqzvh7rl"; depends=[commonmark downloader dplyr ggplot2 glue htmltools httr magrittr stringr tidyr]; };
-  blavaan = derive2 { name="blavaan"; version="0.3-5"; sha256="1hvv33wqa5c57bszds0jad4c7sh3c78glrppy3g64lj0awjk90p7"; depends=[BH coda lavaan loo MCMCpack mnormt nonnest2 Rcpp RcppEigen rstan rstantools StanHeaders]; };
+  blavaan = derive2 { name="blavaan"; version="0.3-7"; sha256="16r838lc93a5lg4brvdyx7ghb4k2p896azmgnfschj1rw3xdlf3q"; depends=[bayesplot BH coda future_apply lavaan loo MCMCpack mnormt nonnest2 Rcpp RcppEigen rstan rstantools StanHeaders]; };
   blendedLink = derive2 { name="blendedLink"; version="1.0"; sha256="19d1pnjag89jjvkl5a6wx531qjqp4cv5jk95md6jby27yr52r8vp"; depends=[]; };
   blender = derive2 { name="blender"; version="0.1.2"; sha256="1qqkfgf7fzwcz88a43cqr8bw86qda33f18dg3rv1k77gpjqr999c"; depends=[vegan]; };
   blin = derive2 { name="blin"; version="0.0.1"; sha256="1h94azm7gli9i4v3li5c1p36p3rkcj2p5j6rqzlzf0pcqs0bsc09"; depends=[abind glmnet MASS Matrix mvtnorm]; };
@@ -5421,7 +5513,7 @@ in with self; {
   blmeco = derive2 { name="blmeco"; version="1.3"; sha256="0yxwzx8s297mvvr5yspsl1dn3x1pnkxm0sagy7ivi98d2x9y8yn7"; depends=[arm lme4 MASS MuMIn]; };
   blob = derive2 { name="blob"; version="1.2.0"; sha256="08z071jzac4gasgfgab0y5g3ilfmlw08ln813wphxg07hsiczw8s"; depends=[prettyunits rlang vctrs]; };
   blockForest = derive2 { name="blockForest"; version="0.2.3"; sha256="19s1v3q489zns09lf00jsqlr5v9yi2drfykg2zh0gp0q4clpwmvj"; depends=[Matrix Rcpp RcppEigen survival]; };
-  blockRAR = derive2 { name="blockRAR"; version="1.0.0"; sha256="0f71azkjlaj6vcpjq77991vkfjr77nwifyxaqnli94svbbvf3yb6"; depends=[arm bayesDP dplyr ldbounds magrittr tibble]; };
+  blockRAR = derive2 { name="blockRAR"; version="1.0.1"; sha256="043x5110vzjq53cq02xnw3482jgkx86fabd11q8c0ddzg4i88ag7"; depends=[arm bayesDP dplyr ldbounds magrittr tibble]; };
   blockTools = derive2 { name="blockTools"; version="0.6-3"; sha256="0023p0msfmp8swq4f5aff40m976np7y051x8hjizzw91hrfa4w2n"; depends=[MASS tibble]; };
   blockcluster = derive2 { name="blockcluster"; version="4.4.3"; sha256="0al1v4r26rh4fx4g8gyk8mxfagn75xb9n4lwh3s6xvk87x33p20c"; depends=[Rcpp rtkore]; };
   blockmatrix = derive2 { name="blockmatrix"; version="1.0"; sha256="14k69ly4i8pb8z59005kaf5rpv611kk1mk96q6piyn1gz1s6sk6r"; depends=[]; };
@@ -5430,7 +5522,7 @@ in with self; {
   blockrand = derive2 { name="blockrand"; version="1.3"; sha256="1090vb26w6s7iqjcal0xbb3qb6p6j46a5w25f1wjdppd1spvh7f9"; depends=[]; };
   blocksdesign = derive2 { name="blocksdesign"; version="3.5"; sha256="04bsax0f3q332920xllbxawz49wr8k4cwlizp649gpz82a2rs7zd"; depends=[crossdes lme4 plyr]; };
   blockseg = derive2 { name="blockseg"; version="0.5.2"; sha256="1i2c9prr51ak6vrdh5gzxlwkdmmky1sj71b4m12khrizigbqgysa"; depends=[ggplot2 Matrix Rcpp RcppArmadillo reshape2 shiny]; };
-  blogdown = derive2 { name="blogdown"; version="0.14"; sha256="0g46wjji2bynhbmd7magkqnd6mfpwkbqvfnpdcjkvyiw5idgpxci"; depends=[bookdown htmltools httpuv knitr rmarkdown servr xfun yaml]; };
+  blogdown = derive2 { name="blogdown"; version="0.16"; sha256="12gjwkrif1qnvjkzcfr9kcnlgzrk3k51anf5hdr39vjhq94bk88q"; depends=[bookdown htmltools httpuv knitr rmarkdown servr xfun yaml]; };
   blorr = derive2 { name="blorr"; version="0.2.1"; sha256="1lvh5jr1jidrkwidpy6plzd58p8q3rxa23wl4xsf8milw180w69p"; depends=[car caret checkmate cli clisymbols crayon dplyr e1071 ggplot2 glue gridExtra magrittr purrr Rcpp rlang scales shiny tibble]; };
   blrm = derive2 { name="blrm"; version="1.0-1"; sha256="0p0nmbxil4l89fcryrgsg9mxzb5fyg93p50aqkjy00ms05hwd0hx"; depends=[boot mvtnorm openxlsx reshape2 rjags]; };
   blsAPI = derive2 { name="blsAPI"; version="0.2.1"; sha256="0p45g4qqaialh5m9bxgrvnc7nqmm0429syw0bml8h4h8vy4014a7"; depends=[httr rjson]; };
@@ -5440,7 +5532,7 @@ in with self; {
   bmd = derive2 { name="bmd"; version="0.5"; sha256="0d4wxyymycb416sdn272292l70s1h2m5kv568vakx3rbvb8y6agy"; depends=[drc]; };
   bmem = derive2 { name="bmem"; version="1.5"; sha256="1miiki743rraralk9dp12dsjjajj3iizcrfwmplf6xas6pl8sfk6"; depends=[Amelia lavaan MASS sem snowfall]; };
   bmeta = derive2 { name="bmeta"; version="0.1.2"; sha256="19pm60xpmlanngq4nbibp0n5m98xw24b2xghz92ly31i3mkg2n68"; depends=[forestplot R2jags]; };
-  bmixture = derive2 { name="bmixture"; version="1.3"; sha256="1719d5hwdblx2c0snz8rn521726gg675m2102x1mfvmi8b2hh04d"; depends=[BDgraph]; };
+  bmixture = derive2 { name="bmixture"; version="1.4"; sha256="0dh4qy0snxw7d82v68zymwm5pfvzwdfkyaha6kgh2mvin5k2vaqm"; depends=[BDgraph]; };
   bmk = derive2 { name="bmk"; version="1.0"; sha256="1wxkrlrhmsxsiraj8nyiax9bqs834ln2swykmpf40wxspkykgfdq"; depends=[coda functional plyr]; };
   bmlm = derive2 { name="bmlm"; version="1.3.11"; sha256="1nlwfrs6kk2jxq8vxwfj388cdf2p8h81lskkb9bp80fp8fx722qh"; depends=[BH ggplot2 Rcpp RcppEigen rstan StanHeaders]; };
   bmmix = derive2 { name="bmmix"; version="0.1-2"; sha256="00php2pgpnm9n0mnamchi6a3dgaa97kdz2ynivrf38s0vca7fqx8"; depends=[ggplot2 reshape2]; };
@@ -5448,7 +5540,7 @@ in with self; {
   bmp = derive2 { name="bmp"; version="0.3"; sha256="0jd67r11bn98hjwgyr6gas423787xy7ji2hq7ay80blkkcj91xxx"; depends=[]; };
   bmrm = derive2 { name="bmrm"; version="4.1"; sha256="1brdd5mhr5282wkdc62lgsqcxw077p69rknjk7fjcs282ahcik2s"; depends=[LowRankQP lpSolve matrixStats Rcpp]; };
   bnclassify = derive2 { name="bnclassify"; version="0.4.2"; sha256="1x7rf54zrls1gwxybmn51c071kd62d2gxczlnihcfxj3hw1b27bh"; depends=[assertthat BH entropy matrixStats Rcpp rpart]; };
-  bnlearn = derive2 { name="bnlearn"; version="4.4.1"; sha256="1nb4m945650538d7w383j4f1d2h3ndy608mfr3amxjrpp7d9ys3k"; depends=[]; };
+  bnlearn = derive2 { name="bnlearn"; version="4.5"; sha256="0y452cw1dxm1cik4na1zq6g0zv5ybiwc1cq9sdashq1jacjpc158"; depends=[]; };
   bnnSurvival = derive2 { name="bnnSurvival"; version="0.1.5"; sha256="1d9jmfx0id4lmw122zga7hb52vlfdfqn4amhzpsmhyck99rv92j4"; depends=[pec prodlim Rcpp]; };
   bnormnlr = derive2 { name="bnormnlr"; version="1.0"; sha256="0l2r7vqikak47nr6spdzgjzhvmkr9dc61lfnxybmajvcyy6ymqs9"; depends=[mvtnorm numDeriv]; };
   bnpa = derive2 { name="bnpa"; version="0.3.0"; sha256="0qsxk47i7q4d8hbs2xj5k5sf8bqyzhq7rbj4y7w8ljprznlydgl9"; depends=[bnlearn fastDummies lavaan Rgraphviz semPlot xlsx]; };
@@ -5456,13 +5548,13 @@ in with self; {
   bnpsd = derive2 { name="bnpsd"; version="1.1.1"; sha256="1vvs7rbnqfs1h4naff8rjvipm93v86ay65rmqpqhr2zf3d8ygc29"; depends=[]; };
   bnspatial = derive2 { name="bnspatial"; version="1.1"; sha256="1mgqll65b1kngg89nf9vc4zlwr0qy2y3zzxd0wgqnywp31mhwpzi"; depends=[doParallel foreach gRain gRbase raster rgdal sf]; };
   bnstruct = derive2 { name="bnstruct"; version="1.0.6"; sha256="1vnjjv8ms8hvd21zsgyl056s266a1plp7ybdmnkl2cy3n8jpdwi1"; depends=[bitops igraph Matrix]; };
-  bnviewer = derive2 { name="bnviewer"; version="0.1.3"; sha256="0sr9wjm75gs6y9sbfz3vscwdrnsgfx0nxgps4mmxz976fq571y4c"; depends=[bnlearn igraph visNetwork]; };
+  bnviewer = derive2 { name="bnviewer"; version="0.1.4"; sha256="1g9zllgbkx274nsarx7q4nxsjq2wwgrfh231xbqzrsjwdnjzlbf7"; depends=[bnlearn igraph visNetwork]; };
   boa = derive2 { name="boa"; version="1.1.8-2"; sha256="04lhqk5qfvaz1jk90glr2yi5vq7cdy0w8m6g2lnzk359l9y41zhp"; depends=[]; };
   bodenmiller = derive2 { name="bodenmiller"; version="0.1"; sha256="0gqrjscgq4qgk7yl32w0965yscc1py9klr49s8q8hkzyihlwzim2"; depends=[]; };
   boilerpipeR = derive2 { name="boilerpipeR"; version="1.3"; sha256="0467bjqhdmi3p02fp0r7rgm00x9ry464f2hniav990qzsw8i16q6"; depends=[rJava]; };
   bold = derive2 { name="bold"; version="0.9.0"; sha256="0ppdhbpdffvs0sgh7ykkhr585nhk66w6vqw793wa4ia57yl49s25"; depends=[crul data_table jsonlite plyr reshape stringr tibble xml2]; };
   bomrang = derive2 { name="bomrang"; version="0.6.0"; sha256="0lnrv274lhl4n9rngkwx63dgd765bv0bd0mq9gz0vh8msmxnih0z"; depends=[crayon curl data_table dplyr foreign hoardr httr janitor jsonlite lubridate magrittr raster readr rgdal rvest tidyr xml2]; };
-  bookdown = derive2 { name="bookdown"; version="0.12"; sha256="1c2v0rpa1rrpbx8yb66sfvrf4gf57f6a8x7ydjqqbkbwhxdlrsrq"; depends=[htmltools knitr rmarkdown tinytex xfun]; };
+  bookdown = derive2 { name="bookdown"; version="0.14"; sha256="1jiq2d292y0l3f4npyfzfpnmb0sqxsl212kkjfbjg5301h0na762"; depends=[htmltools knitr rmarkdown tinytex xfun]; };
   bookdownplus = derive2 { name="bookdownplus"; version="1.5.7"; sha256="1y3iiw3grs6h3ppar1yjmha0nbp19naiirj0hvzgi4yhnibf7nid"; depends=[bookdown knitr magick xaringan]; };
   boostmtree = derive2 { name="boostmtree"; version="1.3.0"; sha256="0q1lgjvbc15m2gygnmh63m0wy2c6x25iwrh9cbn0baq598hnr7j9"; depends=[nlme randomForestSRC]; };
   boostr = derive2 { name="boostr"; version="1.0.0"; sha256="123ag8m042i1dhd4i5pqayqxbkfdj4z0kq2fyhxfy92a7550gib2"; depends=[foreach iterators stringr]; };
@@ -5474,7 +5566,7 @@ in with self; {
   bootSVD = derive2 { name="bootSVD"; version="0.5"; sha256="14xwbrpqj3j1xpsppgjxpn9ggsns2n1kmni9vn30vgy68zwvs2wy"; depends=[ff]; };
   bootStepAIC = derive2 { name="bootStepAIC"; version="1.2-0"; sha256="0p6v4zjsaj1p6c678010fazdh40lpv0rvhczd1halj8aic98avdx"; depends=[MASS]; };
   bootcluster = derive2 { name="bootcluster"; version="0.1.0"; sha256="1mx08p0csz06mq55bdg4vgnqa9khdgqrz4jnm48c24pg8rpaj98b"; depends=[cluster flexclust fpc mclust plyr sets]; };
-  bootnet = derive2 { name="bootnet"; version="1.2.3"; sha256="09vk89c1gjqs5ww0bmzhwp1njipm1b17khpyrcwqx6hnq3695naq"; depends=[abind BDgraph corpcor dplyr ggplot2 glasso graphicalVAR gtools huge igraph IsingFit IsingSampler lavaan Matrix mgm mvtnorm NetworkToolbox networktools parcor pbapply psychTools qgraph relaimpo tidyr]; };
+  bootnet = derive2 { name="bootnet"; version="1.2.4"; sha256="152zgkk7lw0cjvsrnqbb2j4hlvfdy7n6j63xjpn5sjxyal69inp2"; depends=[abind BDgraph corpcor dplyr ggplot2 glasso graphicalVAR gtools huge igraph IsingFit IsingSampler lavaan Matrix mgm mvtnorm NetworkToolbox networktools parcor pbapply psychTools qgraph relaimpo tidyr]; };
   bootruin = derive2 { name="bootruin"; version="1.2-4"; sha256="1gbvh99snchipf13kjhymcx60s2kni23y7lv8lhzd3d402grp68h"; depends=[]; };
   bootsPLS = derive2 { name="bootsPLS"; version="1.1.2"; sha256="19ikz3l0qds25hgcxvhsvqy6jyshcdvnxw6774ifl9ylngxvlfh0"; depends=[mixOmics]; };
   bootspecdens = derive2 { name="bootspecdens"; version="3.0"; sha256="0hnxhfsc3ac4153lrjlxan8xi4sg1glwb5947ps6pkkyhixm0kc1"; depends=[MASS]; };
@@ -5500,6 +5592,7 @@ in with self; {
   bpp = derive2 { name="bpp"; version="1.0.0"; sha256="11fgn92vvl7kklv0xdisf8gnf2rbhq11qyckqsxvc5wa821lmnkm"; depends=[mvtnorm]; };
   bqtl = derive2 { name="bqtl"; version="1.0-32"; sha256="0jjqgsm9fmvz5nkgz608xfljjpmaf4rs4f7kxvpqn4b1l9s5lhci"; depends=[]; };
   braQCA = derive2 { name="braQCA"; version="1.0.0.1"; sha256="1chyy8sk3iqs54sqg79dp1vjz3gcvnbzqbmgasdynir38b45scjh"; depends=[bootstrap dplyr QCA]; };
+  bracer = derive2 { name="bracer"; version="1.1.1"; sha256="1l722jg88i4898v8fwb9klwl9mbpaz1phypbpqc1j2kp2n2vq0vb"; depends=[stringr]; };
   braidReports = derive2 { name="braidReports"; version="0.5.3"; sha256="107c9lrzb55dw5pal8qqpn8is3nrh19vfngx3zcfpmc49f06kskq"; depends=[braidrm ggplot2]; };
   braidrm = derive2 { name="braidrm"; version="0.71"; sha256="1cn0rdlw775pmzbjmhny7gkm901a3qgz7infqb5s9az606xg54d3"; depends=[]; };
   brainGraph = derive2 { name="brainGraph"; version="2.2.0"; sha256="10bqlwrhqjzj1bqv8r77rrqjrxqbwfmzyand47bv4vb00g1wyq3x"; depends=[abind ade4 boot data_table expm foreach ggplot2 ggrepel gridExtra Hmisc igraph MASS Matrix mediation oro_nifti permute RcppEigen scales]; };
@@ -5525,14 +5618,14 @@ in with self; {
   bridgesampling = derive2 { name="bridgesampling"; version="0.7-2"; sha256="0kd4p5pz46vssjb8faxwy5nv6r403a89h8hylxhq50n2rj94x934"; depends=[Brobdingnag coda Matrix mvnfast scales stringr]; };
   briqr = derive2 { name="briqr"; version="0.1.0"; sha256="073pdk1094ng4kggzdjvihl791r2qlja1j2w3pfmh2027kn520r8"; depends=[dplyr httr jsonlite magrittr tibble]; };
   briskaR = derive2 { name="briskaR"; version="0.1.2"; sha256="1y9sabj7pfgyvv6s3bbvrb0xhjhwc4pcfsfx847kqdajid92qx8w"; depends=[deldir fftwtools fields MASS mvtnorm pracma raster rgdal rgeos sp]; };
-  brlrmr = derive2 { name="brlrmr"; version="0.1.5"; sha256="14dnmh062fw11bm236ilaqs6ss4ywajvsk3sxj0zwqk2bjf7y7vh"; depends=[boot brglm MASS profileModel Rcpp]; };
+  brlrmr = derive2 { name="brlrmr"; version="0.1.7"; sha256="0s47qz8y416x0gz91pzdpr97pmlvddwkvll454vnlafxxk9p5lds"; depends=[boot brglm MASS profileModel Rcpp]; };
   brm = derive2 { name="brm"; version="1.0"; sha256="0h4kgig28hkqv1amadznc0n9256dx613rxbn8s8si11ygx79x2dd"; depends=[]; };
-  brms = derive2 { name="brms"; version="2.9.0"; sha256="0a203wk5p6dw9arfvy96cx9dfsci6cdbmg7q5sfd0fx6113migvc"; depends=[abind backports bayesplot bridgesampling coda future ggplot2 glue loo Matrix matrixStats mgcv nleqslv nlme Rcpp rstan rstantools shinystan]; };
+  brms = derive2 { name="brms"; version="2.10.0"; sha256="10v9givr91k316j5c26qddw0591i32p4arzspavsjhli2x2nyilh"; depends=[abind backports bayesplot bridgesampling coda future ggplot2 glue loo Matrix matrixStats mgcv nleqslv nlme Rcpp rstan rstantools shinystan]; };
   brnn = derive2 { name="brnn"; version="0.7"; sha256="1bfqr21szlpn1izjwlzih9j7f34x31zrapckk184rvynbsbgg7g6"; depends=[Formula]; };
   broman = derive2 { name="broman"; version="0.69-5"; sha256="1y1l1p0ddy4a3vwa01yhrc5zcgnl673ar9prkn89pspbdab7km2s"; depends=[assertthat ggplot2 jsonlite RPushbullet]; };
   broom = derive2 { name="broom"; version="0.5.2"; sha256="0qmclih5dm5sqzy4hplcfy677kr12pm9pnpv3r319g14dd27pbqn"; depends=[backports dplyr generics nlme purrr reshape2 stringr tibble tidyr]; };
   broom_mixed = derive2 { name="broom.mixed"; version="0.2.4"; sha256="176817l4d31xbi7yfsjlw287va2wjllxizhi5z3p7x5mi7fkyv2c"; depends=[broom coda dplyr nlme plyr purrr reshape2 stringr tibble tidyr TMB]; };
-  broomExtra = derive2 { name="broomExtra"; version="0.0.4"; sha256="15732zpiy0dgbqaahqc2cpszk647fi3lmb9v5pgvfgv24k8d9d3p"; depends=[broom broom_mixed dplyr magrittr purrr rlang rsample tidyr]; };
+  broomExtra = derive2 { name="broomExtra"; version="0.0.5"; sha256="1hfh0yc94919llmzapvp0khglc2n5w6rkgpr5h1r4nww2ikr7v6p"; depends=[broom broom_mixed dplyr magrittr purrr rlang rsample tidyr]; };
   brotli = derive2 { name="brotli"; version="1.2"; sha256="07rgdgxh9bvn0qavpclxmkglwyl6ndqasxcs6j12if698dkn976b"; depends=[]; };
   brr = derive2 { name="brr"; version="1.0.0"; sha256="050ivnqcaxiyypd1sxfpy6ianhzzmvs6c77ga40g3440cvfigkgw"; depends=[gsl hypergeo pander stringr SuppDists TeachingDemos]; };
   brranching = derive2 { name="brranching"; version="0.5.0"; sha256="07dxynk8pbpbsqwaxg9vhpjv4wx8mb1lqxy1nkczjayn1yrpjfm5"; depends=[ape conditionz crul curl phylocomr phytools taxize]; };
@@ -5547,26 +5640,28 @@ in with self; {
   bsplinePsd = derive2 { name="bsplinePsd"; version="0.6.0"; sha256="0f785l02hiq3f7anxqhm09f7lrqgkkqhly7f1x78cxm22hvrqyhg"; depends=[Rcpp]; };
   bsplus = derive2 { name="bsplus"; version="0.1.1"; sha256="0s3407z48b7sdbkjkqcjk2j1wvs0z7chvdjzphil83l0vp3j5x0s"; depends=[glue htmltools lubridate magrittr purrr rmarkdown stringr]; };
   bspmma = derive2 { name="bspmma"; version="0.1-2"; sha256="1a3p1h7bks5yrxv791wfa680v4a6q10p59iz6wvfifhf3ndlaw49"; depends=[]; };
-  bssm = derive2 { name="bssm"; version="0.1.7"; sha256="1a6fxzlq65409hrzzimf1qdg3ilqfkvdd9d2b6841cwsl0i245vx"; depends=[BH coda diagis ggplot2 ramcmc Rcpp RcppArmadillo sitmo]; };
+  bssm = derive2 { name="bssm"; version="0.1.8"; sha256="14bm80pzcq61ibhnz4b1r6g74dvl9psrqpd3jcgmb7lzj6w6p0xv"; depends=[BH coda diagis ggplot2 ramcmc Rcpp RcppArmadillo sitmo]; };
   bssn = derive2 { name="bssn"; version="0.7"; sha256="1g2xhb7bqapwd5zbc4bl4h1fskd7k6gd0rz74hnydiiwxrwiihf6"; depends=[sn]; };
   bst = derive2 { name="bst"; version="0.3-17"; sha256="0x7hv0gx5kn8dwgbkabz7d4dh2l75zdawgdj5zxan13k7b9n3l8y"; depends=[doParallel foreach gbm rpart]; };
-  bsts = derive2 { name="bsts"; version="0.9.1"; sha256="0zyvlpps0p663arvx5fhac2jqc5c0g3gfmx3qcr45qi5qhya7lzq"; depends=[BH Boom BoomSpikeSlab xts zoo]; };
+  bsts = derive2 { name="bsts"; version="0.9.2"; sha256="1v32wsjcfcq0zwklrp0c83xw4h49v49nmjs973mdzh4q05wzlpmp"; depends=[Boom BoomSpikeSlab xts zoo]; };
   btb = derive2 { name="btb"; version="0.1.30"; sha256="1f94zzpg3q6ldd436cv1wqpfbpw5f706073wk38a4dkg57dwrbgi"; depends=[BH Rcpp RcppArmadillo RcppParallel sf sp]; };
   btergm = derive2 { name="btergm"; version="1.9.4"; sha256="17bjd1d2yj1l98mbflklznxd3q7zi5nzj943nxzva7ij3hdsn6l4"; depends=[boot coda ergm ggplot2 igraph Matrix network ROCR RSiena sna speedglm statnet_common xergm_common]; };
   bucky = derive2 { name="bucky"; version="1.0.5"; sha256="0xn92dnhrs8810f8kvn2dnig0icd1k4dkxljmldij6dn8xb7c85q"; depends=[lmtest sandwich]; };
-  buildmer = derive2 { name="buildmer"; version="1.1"; sha256="0ds48qnydwc3kngik2r78y70q50yca497xi83p643g4yl1kcybfy"; depends=[lme4 mgcv plyr]; };
+  buildmer = derive2 { name="buildmer"; version="1.3"; sha256="0iv0819vaax7yy2p9cyrhj507n3zr681w7ks81y2b07n8mra0ylz"; depends=[lme4 mgcv plyr]; };
   bulletcp = derive2 { name="bulletcp"; version="1.0.0"; sha256="1k7lw8gflih47ncz8hgsj0sxbajnkhz1k7yb7rwbdnzcki3n3jln"; depends=[assertthat dplyr mvtnorm Rdpack]; };
   bulletr = derive2 { name="bulletr"; version="0.1"; sha256="181rnrp62almf08gr41qnrnq8qnbqraqdvj4zixdh8fachsq2imp"; depends=[dplyr ggplot2 plotly plyr reshape2 robustbase smoother xml2 zoo]; };
   bullwhipgame = derive2 { name="bullwhipgame"; version="0.1.0"; sha256="03nwf2v4zhgkxvkghpkbkxz0cnkqcwwl51ykrk25qciakfqkgfws"; depends=[shiny]; };
+  bunching = derive2 { name="bunching"; version="0.8.4"; sha256="0hb50xxlpia3149kyp0df4dmfkxvblnj7hd24c7ylglxzx2hq59j"; depends=[BB dplyr ggplot2 tidyr]; };
   bunchr = derive2 { name="bunchr"; version="1.2.0"; sha256="1b8hdg2x26k0ahx4gxdpzr36hy056939r4496q3vbgyd4bbk2fbd"; depends=[shiny]; };
   bundesbank = derive2 { name="bundesbank"; version="0.1-9"; sha256="05sc6m2v8bfgdka7v28rxhq5a8c88gsxkv0zjk08rpw8k8zql0dk"; depends=[]; };
   bundesligR = derive2 { name="bundesligR"; version="0.1.0"; sha256="0dnhbh9jh7dfbk7mfh8msq4ys5kakalr0kwkycycrb2q8rd049vp"; depends=[]; };
   bupaR = derive2 { name="bupaR"; version="0.4.2"; sha256="0fg16lw3liwmp1y92ky32wq18lfzn8psn2sqfja0322q6b34fgjk"; depends=[data_table dplyr eventdataR forcats glue magrittr miniUI purrr rlang shiny tidyr]; };
-  burnr = derive2 { name="burnr"; version="0.4.0"; sha256="096z4bzmvalyihy45bdcvp1zsxvmwk3mkz7wj5x077z2pg8kfq38"; depends=[ggplot2 MASS plyr reshape2]; };
+  burnr = derive2 { name="burnr"; version="0.5.0"; sha256="19kkk4cyd7h3idn8di77426lcmq2jkxaksbpvg87hpkn72vcr8y5"; depends=[ggplot2 MASS plyr reshape2]; };
   bursts = derive2 { name="bursts"; version="1.0-1"; sha256="172g09d1vmwl83xs6gr4gfblqmx3apvblpzdr5d7fcw1ybsx0kj6"; depends=[]; };
   busdater = derive2 { name="busdater"; version="0.2.0"; sha256="0hib73zay9r7rv49zv1lx0l15jzjyli9f1vrk414l8apggvx4c6s"; depends=[lubridate]; };
+  butcher = derive2 { name="butcher"; version="0.1.0"; sha256="0rs7mkwq78bdlpvcy6l6wqcj9x3dfqqjy9p0mq0w6z82cakv5w8q"; depends=[fs lobstr purrr rlang tibble usethis]; };
   bvarsv = derive2 { name="bvarsv"; version="1.1"; sha256="1bv4fbbi8bn7sqqpjlf8w5jpgydjr15wv5v9940wc42yk792yjrx"; depends=[Rcpp RcppArmadillo]; };
-  bvartools = derive2 { name="bvartools"; version="0.0.1"; sha256="0pf8avjdknc2h6n52bwlxj3d7a3jhgk02pdcyjsjh0qms5rsiwvs"; depends=[coda Rcpp RcppArmadillo]; };
+  bvartools = derive2 { name="bvartools"; version="0.0.2"; sha256="16wa2bnm91764xspgvswvl3ylv0s3x5f734scw9x0zjy9q72b05h"; depends=[coda Rcpp RcppArmadillo]; };
   bvenn = derive2 { name="bvenn"; version="0.1"; sha256="1xrya49w5bd2b7plfxpqla60b2828rkm0rjmc4qnqzvrahsbal0y"; depends=[]; };
   bvls = derive2 { name="bvls"; version="1.4"; sha256="18aaf7kk5mks3a59wwqhm1ckpn6s704l9m5nzy0x5iw0s98ijbm2"; depends=[]; };
   bvpSolve = derive2 { name="bvpSolve"; version="1.3.3"; sha256="1q5sh3kj1c07zq7mx8sh4ggp1fvwh86394qrc3ildj4wrbakmzib"; depends=[deSolve rootSolve]; };
@@ -5583,7 +5678,7 @@ in with self; {
   c3net = derive2 { name="c3net"; version="1.1.1"; sha256="0m4nvrs41kmlakc6m203zlncqwgj94wns8kzcb31xngjcacmcq42"; depends=[igraph]; };
   cAIC4 = derive2 { name="cAIC4"; version="0.8"; sha256="08616cbzwdl2yqjk2v9nlwzgky8fq16qpzahbay8sb9kjslqgiyg"; depends=[lme4 Matrix]; };
   cIRT = derive2 { name="cIRT"; version="1.3.0"; sha256="0jbjkmzw3z935pq12k5kmy3vdpqlpm70siv8f0bnlw42sai1qcw1"; depends=[Rcpp RcppArmadillo]; };
-  cNORM = derive2 { name="cNORM"; version="1.2.0"; sha256="1mhdagdbz02zcr4dggmm54h2pk2zkzn4hlwa0ngki55l14bhg6k2"; depends=[lattice latticeExtra leaps]; };
+  cNORM = derive2 { name="cNORM"; version="1.2.2"; sha256="1lid4j6i65xmmakab0bbs7vyhkrvax3l5kv7r66x665gm8y00h0b"; depends=[lattice latticeExtra leaps]; };
   cOde = derive2 { name="cOde"; version="1.0.0"; sha256="12222wlsk9l6m9y477mjl8x279xhs8c1l1wsq92khwycm1j06jfy"; depends=[]; };
   cPCG = derive2 { name="cPCG"; version="1.0"; sha256="1pfbsv2rcjsryn6nr56a7i4yb7k0m3gdfn4q9l1kpzhmv9lic7m1"; depends=[Rcpp RcppArmadillo]; };
   cRegulome = derive2 { name="cRegulome"; version="0.3.1"; sha256="0j3rv7vakv27r1n1yxmd50nlnyc4y329w0dmrw56dwkdkk4zzbsg"; depends=[DBI ggplot2 ggridges httr igraph R_utils RSQLite UpSetR VennDiagram]; };
@@ -5601,10 +5696,10 @@ in with self; {
   calcWOI = derive2 { name="calcWOI"; version="1.0.2"; sha256="09g96inaayp0brbxw75l7k1cqn50f7qw0glb2g04657zmlk16i52"; depends=[LS2W wavethresh]; };
   calendar = derive2 { name="calendar"; version="0.0.1"; sha256="18ha6vpx2bpk8p08hajiq2d201fbqhzcycp8ks6wrr06fy04z689"; depends=[lubridate tibble]; };
   calibrar = derive2 { name="calibrar"; version="0.2.0"; sha256="1544bc5rhhc6d1mky7ngza00wwh63q07dkbzlwfgyavly8m9cplb"; depends=[cmaes foreach optimx]; };
-  calibrate = derive2 { name="calibrate"; version="1.7.2"; sha256="010nb1nb9y7zhw2k6d2i2drwy5brp7b83mjj2w7i3wjp9xb6l1kq"; depends=[MASS]; };
+  calibrate = derive2 { name="calibrate"; version="1.7.5"; sha256="1s423nr176l2sc66wp7hzgqkv7c2bq8d2bjrrvrrm5qa9y3zdx1k"; depends=[MASS]; };
   calibrateBinary = derive2 { name="calibrateBinary"; version="0.1"; sha256="1k6sl4bg05piyczpk6wsva914gcmy8viyz4423gx9i6ddflb7xdb"; depends=[gelnet GPfit kernlab randtoolbox]; };
   calibrator = derive2 { name="calibrator"; version="1.2-8"; sha256="1m9g1pmnr6d9jkg5ab0l0cbqfj7kmx7sdmcdqdhn9ifyhhn7812y"; depends=[cubature emulator mvtnorm]; };
-  callr = derive2 { name="callr"; version="3.3.1"; sha256="0rvrlg86fxr5nadvqa0dr1iifqjs4d1rc32v76m3ccvx6m3xlq5z"; depends=[processx R6]; };
+  callr = derive2 { name="callr"; version="3.3.2"; sha256="12dbqzjngbyaqdyw0yq1blyfx8pagcvx1vqj2jm451hs25nhdrnh"; depends=[processx R6]; };
   calmate = derive2 { name="calmate"; version="0.12.1"; sha256="07sjbq7bcrhal52pdzsb5pfmk6a8a44wg8xn79sv4y5v74c5xaqz"; depends=[aroma_core MASS matrixStats R_filesets R_methodsS3 R_oo R_utils]; };
   calpassapi = derive2 { name="calpassapi"; version="0.0.2"; sha256="0i81ffdfw3m15cfbag3l9s245dyhapqhy7adb3228vam3qp3n59b"; depends=[digest dplyr httr jsonlite stringr]; };
   camsRad = derive2 { name="camsRad"; version="0.3.0"; sha256="06gar6qan1ka01ngjvbpcv649yvfga697mplwn1x6qnfr4ngb7cs"; depends=[httr xml2]; };
@@ -5614,7 +5709,7 @@ in with self; {
   cancerTiming = derive2 { name="cancerTiming"; version="3.1.8"; sha256="1sfi8q2f5ag7iak0sf9pmqncb89w3gnxdiwjwpivkwhr28ais4mq"; depends=[gplots LearnBayes]; };
   candisc = derive2 { name="candisc"; version="0.8-0"; sha256="0hq5bwvq791rhff2c29xdjbbkcyydii1lbsy05c1fapyn88ir0mi"; depends=[car heplots]; };
   canprot = derive2 { name="canprot"; version="0.1.2"; sha256="0lc31vw49sc2zsrn52aqqljcc4n79j4i4845sr201ga67w07vrrb"; depends=[CHNOSZ xtable]; };
-  cansim = derive2 { name="cansim"; version="0.3.0"; sha256="0byyrwwsx4msfj7nmsp8s5gibvkf05rjajl5a3a92jj41qhw6hy4"; depends=[dplyr httr jsonlite purrr readr rlang rvest stringr tibble xml2]; };
+  cansim = derive2 { name="cansim"; version="0.3.2"; sha256="11s4kx4pjbl62ishwgkm9d9l9mqiy0nlw2l7jp4h486qnb27s1vl"; depends=[dplyr httr jsonlite purrr readr rlang rvest stringr tibble xml2]; };
   canvasXpress = derive2 { name="canvasXpress"; version="1.24.8"; sha256="1sxhxddl9fdvxs1hdn5b03jg0sp8wgpfli9v0p2n381lq1z30m3s"; depends=[htmlwidgets httr]; };
   cap = derive2 { name="cap"; version="1.0"; sha256="1pv8hskxjbp589dn7rx80yaa1ld76x1w37bss2fyrys1p3qr78aa"; depends=[MASS multigroup]; };
   cape = derive2 { name="cape"; version="2.0.2"; sha256="0ngm9scd3f2zcy7gy0lqk05cgbfrhhcss3mj5g6bj0byhgwd7msn"; depends=[corpcor doParallel evd fdrtool foreach HardyWeinberg igraph Matrix qpcR RColorBrewer regress shape]; };
@@ -5644,7 +5739,7 @@ in with self; {
   carrier = derive2 { name="carrier"; version="0.1.0"; sha256="0bqnwnnjqjk9q0lxq6kkz9s75ss10lfyyywyyi24m8wppxpw1vqc"; depends=[pryr rlang]; };
   cartograflow = derive2 { name="cartograflow"; version="1.0.0"; sha256="1sczhvkkrdhcn2phjpsvb86ik0bgyhbgcza7dz6d4qmpl8195bs9"; depends=[dplyr g_data ggplot2 maptools plotly reshape2 rgdal rgeos rlang sp]; };
   cartogram = derive2 { name="cartogram"; version="0.1.1"; sha256="171zw3h38iyxy70wz7yqhnivjx6kf1srj97dfmlkxyhz1ppyk38w"; depends=[packcircles rgeos sf sp]; };
-  cartography = derive2 { name="cartography"; version="2.2.0"; sha256="0w0pbvzpbl17vlq9s9ns474m7fnb09p60r4f8k1pkly148p7pji8"; depends=[classInt raster Rcpp rgeos rosm sf sp]; };
+  cartography = derive2 { name="cartography"; version="2.2.1"; sha256="0fbgaaq354j6hg7m9wgpw4z1b26njl4liysb2vzgi3py5n9xg3dp"; depends=[classInt raster Rcpp rgeos rosm sf sp]; };
   cartools = derive2 { name="cartools"; version="0.1.0"; sha256="0gc5502373f0c2m2rh6awvyfqrg1wx1f341dm2byk9znba887lgs"; depends=[animation devtools dplyr gapminder ggplot2 knitr rlist rmarkdown roxygen2 sde shiny tidyverse usethis]; };
   carx = derive2 { name="carx"; version="0.7.1"; sha256="1qyqsj6pfzzqyaj6076zvgcimhl4cll6sxfb6aigm02rwfkq5gvh"; depends=[matrixStats mvtnorm nlme tmvtnorm xts zoo]; };
   caschrono = derive2 { name="caschrono"; version="2.1"; sha256="0p103r6v37c4li1j9x5mdflhx24zil8nhgpdvw5ijrvyixds0nn2"; depends=[Hmisc zoo]; };
@@ -5653,8 +5748,9 @@ in with self; {
   casebase = derive2 { name="casebase"; version="0.1.0"; sha256="0216qzyxv44cl9f806lal9lx4n0zzr9csx8ggyjva04h5iiqrq6w"; depends=[data_table ggplot2 survival VGAM]; };
   casino = derive2 { name="casino"; version="0.1.0"; sha256="07fphn46718gr1zm0xr43mwv7yk697xrc40lxxin315cf3gm0cka"; depends=[crayon dplyr ggplot2 magrittr purrr R6 tibble tidyr]; };
   cassandRa = derive2 { name="cassandRa"; version="0.1.0"; sha256="0rwqzxbflxn1iyggm3mq6pkbl61mhk4vdwqwzlwrhrvvr2ib236r"; depends=[bipartite boot dplyr ggplot2 magrittr purrr reshape2 tidyr vegan]; };
-  castor = derive2 { name="castor"; version="1.4.2"; sha256="02z000ngy63nk4hq6cv0drn5jcm4il4c4pbrc39byaq9ihf0iy3c"; depends=[naturalsort nloptr Rcpp]; };
+  castor = derive2 { name="castor"; version="1.4.3"; sha256="14lh14im15fqc9yrc3is9fxlwsfiji5jbkwg1gjsz35zlq2b2lw7"; depends=[naturalsort nloptr Rcpp]; };
   cat = derive2 { name="cat"; version="0.0-6.5"; sha256="1gv7chqp6kccipkrxjwhsa7yizizsmk4pj8672rgjmpfcc64pqfm"; depends=[]; };
+  cat_dt = derive2 { name="cat.dt"; version="0.1.0"; sha256="1rxq1kaw03c7m2jz4n6v5x4l9fiaqahdrvh9624zapf9mfhky0lm"; depends=[Matrix Rglpk]; };
   catIrt = derive2 { name="catIrt"; version="0.5-0"; sha256="09010z1q96nbnpys6mybspaqy57lvgd2cvwgnfijzgx3kl87pwnl"; depends=[numDeriv]; };
   catR = derive2 { name="catR"; version="3.16"; sha256="1w39dxfzqk065v64qzmfamx8p1njsv13a461s6clagbqmhysmzbx"; depends=[]; };
   catSurv = derive2 { name="catSurv"; version="1.0.3"; sha256="1qjmjdmc81inim5kpwh4k2r3cffmkyp2wpcqqzv731hciqrad8a8"; depends=[BH ltm Rcpp RcppArmadillo RcppGSL RcppParallel]; };
@@ -5663,7 +5759,7 @@ in with self; {
   catcont = derive2 { name="catcont"; version="0.5.0"; sha256="0ix6ipm3nn9aq5vxirjga2kwwfnxn4v8ggfjlg5v9027v2r8rb96"; depends=[dplyr]; };
   catdap = derive2 { name="catdap"; version="1.3.4"; sha256="0i877l61f6c75pczi235rzci67w29zv1d7z5zn5p5ymndclvlpl2"; depends=[]; };
   catdata = derive2 { name="catdata"; version="1.2.1"; sha256="0fjylb55iw8w9sd3hbg895pzasliy68wcq95mgrh7af116ss637w"; depends=[MASS]; };
-  cate = derive2 { name="cate"; version="1.0.4"; sha256="0qck6675xm5xbw440m1b6n38wjwk7izx3s0zpxbmhc9wh12c5prk"; depends=[corpcor esaBcv leapp MASS ruv sva]; };
+  cate = derive2 { name="cate"; version="1.1"; sha256="1mw4h03gbrrf69jhw3g8a761gxrz2i7aiqdb0vc1dv75pkjspwmj"; depends=[corpcor esaBcv leapp MASS Matrix ruv sva]; };
   catenary = derive2 { name="catenary"; version="1.1.2"; sha256="1n64kq3lkaf00a2mghs67hnxvi4dp6g12pwifyx0bd418wkw9wf3"; depends=[boot broom dplyr ggplot2 tidyverse]; };
   catfun = derive2 { name="catfun"; version="0.1.4"; sha256="1482rll333fvy4h58f15flfs7qrck3vk9bzpdn3hayhnmc7svmma"; depends=[broom cli DescTools epitools Hmisc magrittr rlang]; };
   catlearn = derive2 { name="catlearn"; version="0.6.2"; sha256="0b038qgx6jksshi68iin1wwi66hng1fdbcr8dg7q6nqmx78bhc3k"; depends=[doParallel dplyr foreach Rcpp tidyr]; };
@@ -5674,7 +5770,7 @@ in with self; {
   cattonum = derive2 { name="cattonum"; version="0.0.2"; sha256="0flsfyiymg8p1wik6yldas0ai1bq973rhhh4s3dblf1il4fdl4bv"; depends=[dplyr tidyselect]; };
   causalMGM = derive2 { name="causalMGM"; version="0.1.1"; sha256="13qx71rfc6m7mvlpwma7ks09f3mlxknxw3jlv3b4iq5pjs8f1v5r"; depends=[rJava]; };
   causaldrf = derive2 { name="causaldrf"; version="0.3"; sha256="16gqx8b8alwm8a4lm69qamnqr3bg2qbz0d6q4lyqyrwsk12grid6"; depends=[mgcv survey]; };
-  causaleffect = derive2 { name="causaleffect"; version="1.3.9"; sha256="1zmj9m38ya7r7pqkqb87pgs4gfw0cq1ssa4dxn35mrqnf9gldba0"; depends=[ggm igraph XML]; };
+  causaleffect = derive2 { name="causaleffect"; version="1.3.10"; sha256="0z7vdhm9g95s9nkyx4jdzqrap24nb63n8mr23b9gqm6s1m47sc0z"; depends=[ggm igraph XML]; };
   causalsens = derive2 { name="causalsens"; version="0.1.2"; sha256="1xy8nybflbw6hymc15mmz27ic6hcq89wryb8q6d4zi216lwv2nww"; depends=[]; };
   causalweight = derive2 { name="causalweight"; version="0.1.2"; sha256="0xl49r2dgcns3162b651bn9bbc4gr7cd97jbdwzg21bjzp6v4ic1"; depends=[mvtnorm np]; };
   cba = derive2 { name="cba"; version="0.2-21"; sha256="0j2hbp0xlfp28gqgnkcvmb4yp1kc5m2bp5x7pr4m1pz2b1s7h7m6"; depends=[proxy]; };
@@ -5684,7 +5780,7 @@ in with self; {
   cbird = derive2 { name="cbird"; version="1.0"; sha256="0kzylylk46swd7f0j6kjyrcs3plbx9799q9kb8hjxmgh0qcjk2p6"; depends=[]; };
   cblasr = derive2 { name="cblasr"; version="1.0.0"; sha256="1bz8d4124qpja4bvzn6k1swi89cfyrcpwg2nwyj4r8y0m1hbpc71"; depends=[Rcpp]; };
   cbsem = derive2 { name="cbsem"; version="1.0.0"; sha256="0gc14rhfy566yw2yqzq7yk0xanpzcz7zp3km483azgk816vakbn4"; depends=[]; };
-  cbsodataR = derive2 { name="cbsodataR"; version="0.3.2"; sha256="035b9lad5jf5scrhsnfp4b7bxnlp5l7j8ybj265h3ipi841svif5"; depends=[jsonlite whisker]; };
+  cbsodataR = derive2 { name="cbsodataR"; version="0.3.4"; sha256="197x0i1v4cxra79zpdi0rgbbibgx5l37mb88pd81gnyd97vcnp8s"; depends=[jsonlite whisker]; };
   ccChooser = derive2 { name="ccChooser"; version="0.2.6"; sha256="1vgp4zhg46hcf9ma2cmwgnfrqkmq1arh0ahyzjpfk3817vh7disc"; depends=[cluster]; };
   ccRemover = derive2 { name="ccRemover"; version="1.0.4"; sha256="1npd0vx2hyg7qbwd650987i49v5cxr6i1hlj5rw6fxc0b808s596"; depends=[]; };
   ccaPP = derive2 { name="ccaPP"; version="0.3.2"; sha256="166spwqsqbp42mr1acglydlxspcpn8vhnim8r3s9m81sa9pmazpj"; depends=[pcaPP Rcpp RcppArmadillo robustbase]; };
@@ -5692,19 +5788,21 @@ in with self; {
   cccd = derive2 { name="cccd"; version="1.5"; sha256="0m364zsrgr7mh1yhl2lqxpaf71gzq3y3pp9qgnj4spiy4iadyy7i"; depends=[deldir FNN igraph proxy]; };
   cccp = derive2 { name="cccp"; version="0.2-4"; sha256="1hw0xzfdycrnhkym5va430jk1b9ywf7wbm9qyj4a62n210hk4nzc"; depends=[Rcpp RcppArmadillo]; };
   cccrm = derive2 { name="cccrm"; version="1.2.1"; sha256="180hzxm4z91hh008lysq1f0zky7qngg5z1laa1c119g4rqqcdskl"; depends=[gdata nlme]; };
-  ccda = derive2 { name="ccda"; version="1.1"; sha256="0ya9x1b41l0pjyyfdswjyip0c2v8z7gncbj7cdz0486ad75229x7"; depends=[MASS]; };
+  ccda = derive2 { name="ccda"; version="1.1.1"; sha256="1kka4vmhpcnl4skdmijzsxrfj6dgax6hhlxvp7gkqlfaazq8pzf0"; depends=[MASS]; };
   ccdrAlgorithm = derive2 { name="ccdrAlgorithm"; version="0.0.5"; sha256="171k70p4qyasr385ma3cvcga2b4nbz2dfry78wqx5yb1aa6wwcyc"; depends=[Rcpp sparsebnUtils]; };
   ccfa = derive2 { name="ccfa"; version="1.1.0"; sha256="1paxk1jkkl8yy71h8zqw7kmhy5yz93sp7z9mpnckwyxmsbs58ps8"; depends=[BMisc doParallel foreach formula_tools ggplot2 pbapply quantreg TempleMetrics tidyr]; };
   cchs = derive2 { name="cchs"; version="0.4.1"; sha256="1aq6mc3hyhp3g8yzk6y82zz8nriwmxms9lgpw06rf857im6bn5ls"; depends=[survival]; };
   cclust = derive2 { name="cclust"; version="0.6-21"; sha256="1n5hh0017bcq8ck52qq89jm9zgdfpmiksrypsnv2vvhk3nr0s91c"; depends=[]; };
   ccmm = derive2 { name="ccmm"; version="1.0"; sha256="0855nr74xxpy7in2vrw15g8pv7nm1374irc1c5hikr5hadk5pf8v"; depends=[MASS]; };
+  ccostr = derive2 { name="ccostr"; version="0.1.0"; sha256="0yfmj8v7ip595v87w9dmlzl5rih2j0lsapswh9b9vvc20wnk48ld"; depends=[data_table dplyr forcats ggplot2 knitr msm Rdpack rlang survival tibble]; };
   ccrs = derive2 { name="ccrs"; version="0.1.0"; sha256="1nyw4ip9v7y6yfbfdz3bwhy4r6hpp1hiip3ycldxlkl9wrxkxgrw"; depends=[cds colorspace dplyr limSolve lsbclust msm]; };
   cctools = derive2 { name="cctools"; version="0.1.2"; sha256="03lp9pa9qr2hi584ivvmswxmwjw1c3a6xqladpqldjhzvzpxvcwi"; depends=[qrng Rcpp RcppArmadillo]; };
-  cdata = derive2 { name="cdata"; version="1.1.1"; sha256="03kfhpi5cbj2rwjmhrd8h95frz68p82as1wi4js0pgb0vj7hjq6h"; depends=[rqdatatable rquery wrapr]; };
+  cdata = derive2 { name="cdata"; version="1.1.2"; sha256="1h28xcnwzxbm749hmqciqzjca7kd4r7hvqi50la0zqh371fv98xs"; depends=[rqdatatable rquery wrapr]; };
   cdb = derive2 { name="cdb"; version="0.0.1"; sha256="1rdb4lacjcw67apdyiv7cl1xvv9d1mrzck1qk605n6794k7wf2ys"; depends=[bitops]; };
   cdcfluview = derive2 { name="cdcfluview"; version="0.9.0"; sha256="0i6jipzpfcqs48w0cwjyynf3lpdppa7xh27q1rwv3jsqd246880v"; depends=[dplyr httr jsonlite MMWRweek purrr readr sf units xml2]; };
   cdcsis = derive2 { name="cdcsis"; version="2.0.3"; sha256="0hv52valyig3zzywm3058c5nxb2n7y3j2vfibxdbfg8414wwapd9"; depends=[ks mvtnorm Rcpp]; };
-  cder = derive2 { name="cder"; version="0.1-0"; sha256="1cbvb8va9if520a5wg568cd06dyf3p477ma534ygapckajy9mbv1"; depends=[curl dplyr glue lubridate readr rlang stringr tibble]; };
+  cde = derive2 { name="cde"; version="0.4.1"; sha256="19aifi2wh3hi929bf15v96z6gbzawgawjdipvx1v95krzij8fl2n"; depends=[data_table viridisLite]; };
+  cder = derive2 { name="cder"; version="0.2-0"; sha256="0ajr99m7gdwzyxavn192y9isf3zpn4vpa3nzkn664clsmd5m7rny"; depends=[curl dplyr glue lubridate readr rlang stringr tibble]; };
   cdfquantreg = derive2 { name="cdfquantreg"; version="1.2.2"; sha256="094mk2hvxww2lndx5wkw368ynqx6klbdwl30d1yv7kqmr2yy7388"; depends=[Formula MASS pracma]; };
   cdlTools = derive2 { name="cdlTools"; version="0.14"; sha256="0zf00y8qcklz2yp7vx6mjvx2h2p4kq44r51z4qy88kq9v62rqz3k"; depends=[httr raster]; };
   cdom = derive2 { name="cdom"; version="0.1.0"; sha256="00xqqqhskjlkz8ii7kqyabxk8995w7g9jiz1isyqjpwg8nsa3x28"; depends=[broom ggplot2 minpack_lm tidyr]; };
@@ -5727,7 +5825,7 @@ in with self; {
   censusGeography = derive2 { name="censusGeography"; version="0.1.0"; sha256="1ncgd05ml571g3vy1g4p5xxg2bm08hbb6d5r3hpz7frn7w3l8l1d"; depends=[qdapTools]; };
   censusapi = derive2 { name="censusapi"; version="0.6.0"; sha256="03h1np7v539mgnxlmwp1d5jv3nlm2fsylw53hqxd736q3h2rjz0s"; depends=[httr jsonlite]; };
   censusr = derive2 { name="censusr"; version="0.0.4"; sha256="1n9571fyr46wj1dcxc2xgns9865655yzlq7yfz8im014wh0ycwqc"; depends=[dplyr httr stringr]; };
-  censusxy = derive2 { name="censusxy"; version="0.1.1"; sha256="16mk90xksk0v5zbrlkd91ddqjca97n2vv11h1sr18ay8208l5vji"; depends=[dplyr httr readr rlang sf tibble tidyr]; };
+  censusxy = derive2 { name="censusxy"; version="0.1.2"; sha256="0cd1fylsxmqi4lp39zliw8v3hyka85jnpq492jfg43y65rdbj5mg"; depends=[dplyr httr readr rlang sf tibble tidyr]; };
   censys = derive2 { name="censys"; version="0.1.0"; sha256="0r0yvaidn0qn96hx461415hywsjfgaz9wvvdssx7w97v2ndnk9sy"; depends=[httr jsonlite purrr stringi]; };
   centiserve = derive2 { name="centiserve"; version="1.0.0"; sha256="1m6gqz2rk7023340laa5pc0ncbfka2qi9ajvh65fwijd7xvv3n5c"; depends=[igraph Matrix]; };
   centralplot = derive2 { name="centralplot"; version="0.1.0"; sha256="1slzvbm1vvgj1gkcx9pb46fz8q55vfyqrxsvx4qzi5kp7d9h4dy2"; depends=[ggplot2]; };
@@ -5758,36 +5856,36 @@ in with self; {
   changepoint = derive2 { name="changepoint"; version="2.2.2"; sha256="1jbki95pck10phpxna0b4i79hhl912zqi5ii9mjqb673y64dszkj"; depends=[zoo]; };
   changepoint_mv = derive2 { name="changepoint.mv"; version="1.0.1"; sha256="1cv7gkfzzb8qmm49ygrkcsvlj3hx41wj8h2msa9rrawj33awj1c6"; depends=[assertive ggplot2 Rcpp Rdpack reshape2 tbart zoo]; };
   changepoint_np = derive2 { name="changepoint.np"; version="1.0.1"; sha256="0ai5p77x3261ps22x8z00qiv1d3z2mf8qgi0bfc5bqnnzf44k0c2"; depends=[changepoint Rdpack zoo]; };
-  changepointsHD = derive2 { name="changepointsHD"; version="0.3.1"; sha256="07dasdgyw6m5s58l08j4xz2l6f2l2r48jjrcrc5j3qj7mak715jk"; depends=[Rcpp RcppArmadillo]; };
+  changepointsHD = derive2 { name="changepointsHD"; version="0.3.3"; sha256="1wdhmkg21kb5jd95a0aqqp2qgdkndc69rbdxjf792gq8f1rigarh"; depends=[Rcpp RcppArmadillo]; };
   changepointsVar = derive2 { name="changepointsVar"; version="0.1.0"; sha256="0kj9m9jik1dm5fx4c4hb559f5irpl1mvxk4wwajd5577a2fdqxb5"; depends=[lars MASS]; };
   changer = derive2 { name="changer"; version="0.0.3"; sha256="1pmnspadkshz7z9f275vks1xjh6a9k37h7j51dqdjrqilzq7y6sf"; depends=[available devtools git2r]; };
   charlatan = derive2 { name="charlatan"; version="0.3.0"; sha256="1i8n6kmdv8f2mnd626qja979qx35fdl1a8r9akgqznh5bhjqiq42"; depends=[R6 tibble whisker]; };
   chartql = derive2 { name="chartql"; version="0.1.0"; sha256="108csn7q8qrjhiss54f5bliv3av7psq7kfryspajbdb6wm9ciz3p"; depends=[ggplot2 stringr]; };
   cheb = derive2 { name="cheb"; version="0.3"; sha256="0vqkdx7i40w493vr7xywjypr398rjzdk5g410m1yi95cy1nk4mc7"; depends=[]; };
-  chebpol = derive2 { name="chebpol"; version="2.1"; sha256="0dvmdcrdk7mc2gxbmz645x42rras8iqdp8yzg1kslcynaj665arb"; depends=[geometry]; };
+  chebpol = derive2 { name="chebpol"; version="2.1-1"; sha256="0zjw1fz9ql8zpv61qwhqkhdigqrk729hp8hhpbnwif57wv3lfvnx"; depends=[geometry]; };
   checkLuhn = derive2 { name="checkLuhn"; version="1.1.0"; sha256="1s1ix5n98bcbzcvrz5h19sk9pchdvrhpy3ppmw96ys8vylzm58mv"; depends=[dplyr stringr]; };
   checkarg = derive2 { name="checkarg"; version="0.1.0"; sha256="0rkdjs2c4yx9laqgayxz57bwxhwgdh6ndrr4i3b1kh31lcmk1xc6"; depends=[]; };
   checkmate = derive2 { name="checkmate"; version="1.9.4"; sha256="08ddpgs4mv5d5y4j054pm8drmxkn7yvhfpbghwxlizjpnxa5g8ps"; depends=[backports]; };
-  checkpoint = derive2 { name="checkpoint"; version="0.4.6"; sha256="1cpb0dm5f0y08zlv8w1fyqpgw431avg9dcbbs9z0v95ibkdmw6px"; depends=[]; };
+  checkpoint = derive2 { name="checkpoint"; version="0.4.7"; sha256="009dih2cp696fddbxy634gc1y94hn3irhi13dbjdmr0s1vi38596"; depends=[]; };
   checkr = derive2 { name="checkr"; version="0.5.0"; sha256="14hkpfbw5ibdwz2jygir2f2bb2qgrj62gn3449n4dif31nswaj2f"; depends=[err]; };
   cheddar = derive2 { name="cheddar"; version="0.1-633"; sha256="09mw8rr5xb06gw3hbk7zv2nnx6mwhs6i19ffbp9pv3yv2945cjlf"; depends=[]; };
   cheese = derive2 { name="cheese"; version="0.0.1"; sha256="0yjb68qlz62vmvjf6c8qfblihkkigfbhxpw42mm6qdy4f483mpr2"; depends=[dplyr forcats kableExtra knitr magrittr purrr rlang stringr tibble tidyr tidyselect]; };
   chemCal = derive2 { name="chemCal"; version="0.2.1"; sha256="1kq82x57qm68im6lyqjqmh4p34s4y7fn5v6ymclxjr47mdv8npb5"; depends=[]; };
   chemmodlab = derive2 { name="chemmodlab"; version="1.0.0"; sha256="0lzibshhfz52m61xldf0xq4cc1xx64fjlw18hlkiv65dj3gcj2mh"; depends=[caret class e1071 elasticnet foreach lars MASS nnet pls pROC randomForest rpart tree]; };
   chemometrics = derive2 { name="chemometrics"; version="1.4.2"; sha256="0shqns0n964pfwnd0q5sadglrlpgs4g5fbv45fsj9p37l4pq61dp"; depends=[class e1071 lars MASS mclust nnet pcaPP pls robustbase rpart som]; };
-  cherry = derive2 { name="cherry"; version="0.6-12"; sha256="1b74wlvjqxa532gxs400m1k4qs7xwpdap9ms60nlcwr7x1857mk6"; depends=[bitops lpSolve Matrix]; };
+  cherry = derive2 { name="cherry"; version="0.6-13"; sha256="1bpahdymkc2w6mc5pjyq4q59iwzskw37swx3sw4rnbmnhzhwaf8n"; depends=[bitops hommel lpSolve Matrix]; };
   chi = derive2 { name="chi"; version="0.1"; sha256="1y91mwahj4j2wz0y5k5vdpq7ygq834h8jkn37n74lqnwvv1968rr"; depends=[]; };
   chi2x3way = derive2 { name="chi2x3way"; version="1.1"; sha256="13qc8sigiw4gcxk8y50q7yfgzbssjyl41fizzjqzcp3p14kpsmzw"; depends=[]; };
-  chicane = derive2 { name="chicane"; version="0.1.0"; sha256="1f7sxqwg9s8l3lz538kyq8x5csqyq8g67vpm4zh9c962kg5m3f55"; depends=[data_table doParallel foreach gamlss gamlss_tr MASS]; };
+  chicane = derive2 { name="chicane"; version="0.1.1"; sha256="1d2rvaxdcambawf8l4sn566nr3s8xgf8nfpqa5n6lazvik8vb7kb"; depends=[data_table doParallel foreach gamlss gamlss_tr iterators MASS]; };
   childesr = derive2 { name="childesr"; version="0.1.1"; sha256="0jbyby215dizcsp27mb2a4fbjmpfyj2br6m2j43wchlbhjidz70i"; depends=[DBI dbplyr dplyr jsonlite magrittr purrr RMySQL]; };
   childhoodmortality = derive2 { name="childhoodmortality"; version="0.3.0"; sha256="1ixd10jyzgr1ssnjas35kngpsqyjzl73wwpvcspv06cn12sv2b8d"; depends=[dplyr matrixStats plyr]; };
   childsds = derive2 { name="childsds"; version="0.7.4"; sha256="1dyzidmbr7608y65kymf7x5s19qjsz9hxzfv51ml1kaymml1hbf3"; depends=[boot class dplyr gamlss gamlss_dist magrittr purrr purrrlyr reshape2 tibble tidyr VGAM]; };
   chillR = derive2 { name="chillR"; version="0.70.17"; sha256="0nlb7clbq12j8llk95f6yc5k81a2n3vmcbisk912h2wxn8qxnkwd"; depends=[assertthat dplyr fields ggplot2 httr jsonlite Kendall pls plyr R_utils raster RCurl readxl reshape2 rlang RMAWGEN sp XML]; };
   chinese_misc = derive2 { name="chinese.misc"; version="0.2.1"; sha256="17sffxjpga8mq8xfxhas9jqj71bb80ayz4m2dgnmg1w6bb3p7bsp"; depends=[jiebaR Matrix NLP purrr slam stringi tm]; };
   chipPCR = derive2 { name="chipPCR"; version="0.0.8-10"; sha256="1mff7n7ga4sfwvcq7zkjkrl68nybnm2zkn37hmxvnw9yl3ls9lnw"; depends=[lmtest MASS outliers ptw quantreg Rfit robustbase shiny signal]; };
-  chngpt = derive2 { name="chngpt"; version="2019.3-12"; sha256="0adni2ikx19hd3r9mhwm2z5c39pihnmxzjxqrc8ycg3nbh5p53kd"; depends=[boot kyotil MASS Rcpp RcppArmadillo survival]; };
+  chngpt = derive2 { name="chngpt"; version="2019.9-2"; sha256="0dx4y104108y5ig8339d17a30m9ghiay8p962fvk7rbmgasaa4a2"; depends=[boot kyotil MASS survival]; };
   choiceDes = derive2 { name="choiceDes"; version="0.9-3"; sha256="1nsc8p4svfc6z7ckffl24c0acnaxi6cnpz7jq03vzn6spxvpjcmw"; depends=[AlgDesign]; };
-  cholera = derive2 { name="cholera"; version="0.6.5"; sha256="0mw44c10adh02mymgmyli3lkmyd9hlvnp3vr14my2gnhbxvd8vr5"; depends=[deldir ggplot2 HistData igraph KernSmooth pracma RColorBrewer sp threejs TSP]; };
+  cholera = derive2 { name="cholera"; version="0.7.0"; sha256="0ja013k431vd0sjy74y2mlrii46rbwb5x886jaza4ihb48mgz7ah"; depends=[deldir ggplot2 HistData igraph KernSmooth pracma RColorBrewer sp threejs TSP]; };
   choplump = derive2 { name="choplump"; version="1.0-0.4"; sha256="0fn6m3n81jb7wjdji4v04m53gakjfsj3ksm546xxz5zm7prk237s"; depends=[]; };
   chopthin = derive2 { name="chopthin"; version="0.2.2"; sha256="1ixmgq6igd2ji88qba7scny1j8rrizcf76dk4ymk3hah5dln97fz"; depends=[Rcpp]; };
   chords = derive2 { name="chords"; version="0.95.4"; sha256="1v6zvl1mv9fyf6hx1fpbj3i7s893n4y1w4j9rw1arps006qz2jqn"; depends=[MASS Matrix]; };
@@ -5798,7 +5896,7 @@ in with self; {
   chromer = derive2 { name="chromer"; version="0.1"; sha256="0fzl2ahvzyylrh4247w9yjmwib42q96iyhdlldchj97sld66c817"; depends=[data_table dplyr httr]; };
   chromoMap = derive2 { name="chromoMap"; version="0.2"; sha256="1ljjwkv7rdy1mcrkb8dd5lfkg54gxzclsjvla4qnc8j5hmfp0p8g"; depends=[htmltools htmlwidgets]; };
   chromoR = derive2 { name="chromoR"; version="1.0"; sha256="1x11byr6i89sdk405h6jd2rbvgwrcvqvb112bndv2rh9jnrvcw4z"; depends=[gdata haarfisz]; };
-  chron = derive2 { name="chron"; version="2.3-53"; sha256="02bkywwsxwrxc035hv51dxgdm1fjxdm7dn19ivifln59dfs1862j"; depends=[]; };
+  chron = derive2 { name="chron"; version="2.3-54"; sha256="0vc7dxqwx0jqzwszax6di3091npsxnhnbvr7sy7rlip0jqzarwqd"; depends=[]; };
   chunkR = derive2 { name="chunkR"; version="1.1.1"; sha256="1kw3hsx5k4cdicx0hc1v0mf2nzvqg95shx2xv05vb2pass48qw48"; depends=[Rcpp]; };
   chunked = derive2 { name="chunked"; version="0.4"; sha256="0pqk6nnxxnlsw9zal62ajjalrlmvkdrzyz2l8r10jd7s61vhra40"; depends=[DBI dplyr LaF lazyeval]; };
   ciTools = derive2 { name="ciTools"; version="0.5.1"; sha256="02jgi09vkzsan47mvg65ciqc1q4vmrl14v2i5bsaqxbvxwd65lww"; depends=[arm boot dplyr lme4 magrittr MASS survival tibble]; };
@@ -5808,15 +5906,16 @@ in with self; {
   cinterpolate = derive2 { name="cinterpolate"; version="1.0.0"; sha256="1aw6hs41xin2hhgmi4pr5510v4sn6x735lachpc5gpbxch5h3f82"; depends=[]; };
   cir = derive2 { name="cir"; version="2.0.0"; sha256="0ycjnbikpyhcfdik7c5knw4s9gl8y5h4219c4fhs4axs04np004v"; depends=[]; };
   circglmbayes = derive2 { name="circglmbayes"; version="1.2.3"; sha256="1a60d8jpvwx2qwmy2if60c5vni9hp73fdwgz7mwi5xd5l67zwd3h"; depends=[BH coda ggplot2 Rcpp RcppArmadillo reshape2 shiny]; };
-  circlize = derive2 { name="circlize"; version="0.4.6"; sha256="1yjnb88pnzk5c1p0vjxykc7cr3394ln5axviqcf12ajibvy8rj6f"; depends=[colorspace GlobalOptions shape]; };
+  circlize = derive2 { name="circlize"; version="0.4.8"; sha256="0jvr9hmxyhg0zx101iiqkrg8wfaj86kp62xpv42n2j9fkn5r1mi2"; depends=[colorspace GlobalOptions shape]; };
   circular = derive2 { name="circular"; version="0.4-93"; sha256="0hki85rs8wc5950pjaw28q54rly2napfbcrx3pchlfap6wwy5kkn"; depends=[boot mvtnorm]; };
-  circumplex = derive2 { name="circumplex"; version="0.3.1"; sha256="1v9xj3yiyjdmikrhnrh766jf387kqscyfbg5zhjwjg095b2086px"; depends=[assertthat boot dplyr ggforce ggplot2 glue htmlTable magrittr purrr Rcpp RcppArmadillo rlang tibble tidyr]; };
+  circumplex = derive2 { name="circumplex"; version="0.3.3"; sha256="11n3zj6mdv4hv0gfg7i2m1kw1ghz20frwdaq22qx5pcpzz6d7yzc"; depends=[assertthat boot dplyr ggforce ggplot2 glue htmlTable magrittr purrr Rcpp RcppArmadillo rlang tibble tidyr]; };
   cit = derive2 { name="cit"; version="2.2"; sha256="1lf8r3r4zwvs08vl4byhw6rvf54nb7vg83558pi0b5866m7in4sc"; depends=[]; };
   citbcmst = derive2 { name="citbcmst"; version="1.0.4"; sha256="1zkd117h9nahwbg5z6byw2grg5n3l0kyvv2ifrkww7ar30a2yikl"; depends=[]; };
   citccmst = derive2 { name="citccmst"; version="1.0.2"; sha256="1b7awn1hjckxisfdi4ck697hwd4a5sqklwi7xzh6kgqhk9pv7vjn"; depends=[]; };
-  citr = derive2 { name="citr"; version="0.3.0"; sha256="0pik6s6xk5768s3kkppw2192dj455py53gsn6k2b7xgg96ircy0g"; depends=[assertthat bibtex curl httr miniUI RefManageR rstudioapi shiny shinyjs yaml]; };
+  citecorp = derive2 { name="citecorp"; version="0.1.0"; sha256="1xp5vwrqxin0gp2kx8wn3bxajin0c7pa5f352csk6ivr2y7czl0p"; depends=[crul data_table fauxpas jsonlite]; };
+  citr = derive2 { name="citr"; version="0.3.2"; sha256="1qbarvafjb8jgkrnrhh6jw7mcglmjwf7dpdiibxf39jkmlhf7las"; depends=[assertthat curl httr miniUI RefManageR rstudioapi shiny shinyjs yaml]; };
   ciuupi = derive2 { name="ciuupi"; version="1.1.0"; sha256="0czfmmf62p1vml24s87pdwv52spqycchpkqzwk8vyd4n1z27r5s2"; depends=[functional nloptr pracma statmod]; };
-  civis = derive2 { name="civis"; version="2.0.0"; sha256="1hbwbpwbnlg08gh8fg15fa254m7ibnq7x020yd4q75pzbdwlj4v2"; depends=[future httr jsonlite memoise]; };
+  civis = derive2 { name="civis"; version="2.1.0"; sha256="0bpm42q243ghq03x9vajs0yjdhy4lgn7fqndc53172inmkxwp7dy"; depends=[future httr jsonlite memoise]; };
   cjoint = derive2 { name="cjoint"; version="2.1.0"; sha256="1bs380ji9vsc1d77wqhl0ij9xblww3g9x3hiwpcpz26wihqcx7ac"; depends=[DT ggplot2 lmtest Matrix sandwich shiny shinyBS shinyjs survey]; };
   ck37r = derive2 { name="ck37r"; version="1.0.0"; sha256="0nn2sfsfs8mhgjrz0ghn041ybhj2qim4rs3lkci7s4n95c8hbgdi"; depends=[caret cvAUC doParallel doSNOW foreach ggplot2 pryr randomForest RANN reader RhpcBLASctl ROCR snow stringr SuperLearner tmle]; };
   ckanr = derive2 { name="ckanr"; version="0.3.0"; sha256="0qbsq40yxy9j7q49k5712gk8iv0c7rcr8w0hnv410035i1rddlfj"; depends=[DBI dbplyr dplyr httr jsonlite magrittr]; };
@@ -5827,14 +5926,14 @@ in with self; {
   clarifai = derive2 { name="clarifai"; version="0.4.2"; sha256="0igi4xl27nz0r85hpws2zfc2gn5z2nmywp3saxgp74mh2y99lg6s"; depends=[curl jsonlite]; };
   class = derive2 { name="class"; version="7.3-15"; sha256="1x1hqz8xyhbpq4krsh02glqnlzcch25agkmn4a3da9n723b37gzn"; depends=[MASS]; };
   classGraph = derive2 { name="classGraph"; version="0.7-5"; sha256="19jb9jr1gfg4karymrbilh0zjrlsczhy2q03x5b0jxnh4ykhxfj8"; depends=[graph Rgraphviz]; };
-  classInt = derive2 { name="classInt"; version="0.3-3"; sha256="0c2z6shlxa928xa20yl956r06lx20mji3mwipdvmj3f4z5g6hgm9"; depends=[class e1071 KernSmooth]; };
+  classInt = derive2 { name="classInt"; version="0.4-1"; sha256="00q1bpgblrldckn1rk166q1b0hgap2sjjyfmfcyh6ydk6y73ziir"; depends=[class e1071 KernSmooth]; };
   classiFunc = derive2 { name="classiFunc"; version="0.1.1"; sha256="1qaima3sii394741p5n06lcqkk4fiv9apb7qqnpi6srx5h02lfl5"; depends=[BBmisc checkmate dtw fda fda_usc fdasrvf proxy rucrdtw zoo]; };
   classifierplots = derive2 { name="classifierplots"; version="1.3.3"; sha256="01rvn0jwliyxj7q4cmyv8an5g7fzn6y3sccp8mj6bcqjyblfcfaa"; depends=[caret data_table ggplot2 gridExtra png Rcpp ROCR]; };
   classifly = derive2 { name="classifly"; version="0.4"; sha256="0mw1vcas0gr1r4yvh0j02zhk7kp5342r0bhhg776hqgqdczgh5zj"; depends=[class plyr]; };
-  classyfireR = derive2 { name="classyfireR"; version="0.2.1"; sha256="0a3di6agn6vvyzx1w8c3wcij6l313hnaxdbhpfa72rlsfdj68mqn"; depends=[clisymbols crayon dplyr httr jsonlite magrittr purrr stringr tibble]; };
+  classyfireR = derive2 { name="classyfireR"; version="0.2.2"; sha256="1v7sqwak8wczr6611aw0kzjhnyr6xsdzlmm8080w9dgcs2aani9b"; depends=[clisymbols crayon dplyr httr jsonlite magrittr purrr stringr tibble]; };
   cld2 = derive2 { name="cld2"; version="1.2"; sha256="03ffg1nxdlmg66sgg0w2jdx2s5jzdp8qhja24z0il2qy3qsa915k"; depends=[Rcpp]; };
   cld3 = derive2 { name="cld3"; version="1.2"; sha256="11bjkbhjxaf6lc96qm8zk4k1i66b69f8dmc303i1560b2jj2zah3"; depends=[Rcpp]; };
-  clean = derive2 { name="clean"; version="1.0.0"; sha256="09nm205hszcmhs227ia1lhigrnkkwh45rjrxp31gmxipz5gbw32p"; depends=[crayon knitr rlang]; };
+  clean = derive2 { name="clean"; version="1.1.0"; sha256="11jfg9xh6xyhcva4pq5bl7bg2d2ar12mp568j8j79dqlci3f53zx"; depends=[crayon knitr pillar rlang]; };
   cleanEHR = derive2 { name="cleanEHR"; version="1.0"; sha256="0i8q7y4izc7q1pshdajy0n9wyihj4wlzzkd52ykam3dxqnwlnyh4"; depends=[data_table ggplot2 knitr pander Rcpp XML yaml]; };
   cleanNLP = derive2 { name="cleanNLP"; version="2.3.0"; sha256="0d3v87ylp5vxkg6x5wfc1v482a3wcy02bb5xl3k2s8jpsawf2vxd"; depends=[dplyr Matrix stringi]; };
   cleancall = derive2 { name="cleancall"; version="0.1.0"; sha256="0g52nvr8fnwlhfzx0ja87xkg4ff3jafj08qz9xkwc790zfszc6z1"; depends=[]; };
@@ -5852,7 +5951,7 @@ in with self; {
   clifro = derive2 { name="clifro"; version="3.2-2"; sha256="11bfvaf1b1wv83dw8ggj7ldsc6fs8s3gl7jdzyq7l1w7innihp9s"; depends=[ggplot2 lubridate magrittr RColorBrewer RCurl reshape2 scales xml2]; };
   clikcorr = derive2 { name="clikcorr"; version="1.0"; sha256="0zdnbcl5q293mmm6pbn4ri7p1q6z6sff74axsb3nyd153v2xamr5"; depends=[mvtnorm]; };
   climateStability = derive2 { name="climateStability"; version="0.1.1"; sha256="0zmxcf4l79rgq2ar7v3asrjr8hci1ba6xl1xwb56mm3qnkc75q7d"; depends=[knitr raster]; };
-  climatol = derive2 { name="climatol"; version="3.1.1"; sha256="012spjgw20bg4rlxgwh05rhaswa4afbd35sq1isidm6i73ma0yjq"; depends=[mapdata maps]; };
+  climatol = derive2 { name="climatol"; version="3.1.2"; sha256="0p3nk4n7izj0cmmqd9apa1gix5lfdzp08ydy0n7rkl5kbkmrkb6n"; depends=[mapdata maps]; };
   climbeR = derive2 { name="climbeR"; version="0.0.1"; sha256="10i74bph7dhv2xj01qdhymlmfwj32lzxivanif11zmzmq9p5bqsw"; depends=[ggplot2]; };
   climdex_pcic = derive2 { name="climdex.pcic"; version="1.1-9.1"; sha256="13wjkz2ldpvw9ri58vqpzdrqqyvzygmhzshx10v25d757x6h1qvb"; depends=[PCICt Rcpp]; };
   clime = derive2 { name="clime"; version="0.4.1"; sha256="0qs9i7cprxddg1cmxhnmcfhl7v7g1r519ff2zfipxbs59m5xk9sf"; depends=[lpSolve]; };
@@ -5871,7 +5970,7 @@ in with self; {
   clordr = derive2 { name="clordr"; version="1.5.0"; sha256="0yzkkzp60gnap96hlfpjncxfkfvvma15yxpwf5pv5fgffacb8281"; depends=[doParallel foreach MASS pbivnorm rootSolve tmvmixnorm ttutils]; };
   cloudSimplifieR = derive2 { name="cloudSimplifieR"; version="0.1.9"; sha256="0wp582y817f6z7kpw9nn665d6pdn0zqyadjbragw7ij4x73ncksq"; depends=[aws_s3 aws_signature jsonlite readr]; };
   cloudUtil = derive2 { name="cloudUtil"; version="0.1.12"; sha256="18g946j00anlk20d0fh01w0xyj1kwyy7jhlgz5a85wmp6s2gkz74"; depends=[]; };
-  cloudml = derive2 { name="cloudml"; version="0.6.0"; sha256="0p34wrrs06c17lbjlkjhm04ffg3l3zfkxb7swikjbim0j5aww2kh"; depends=[config jsonlite packrat processx rprojroot rstudioapi tfruns withr yaml]; };
+  cloudml = derive2 { name="cloudml"; version="0.6.1"; sha256="1j15q9yb2rc4fbjxfh21fiq6is8dnb8nfyi7g8iazgfwb3p9ahpx"; depends=[config jsonlite packrat processx rprojroot rstudioapi tfruns withr yaml]; };
   clpAPI = derive2 { name="clpAPI"; version="1.2.11"; sha256="0xwwv4ccflrrapqlzwccblyhda5bmbhs7agwwwjriwxnhxghlpbm"; depends=[]; };
   clr = derive2 { name="clr"; version="0.1.2"; sha256="088ks9lrhlyvg3yvlfmb0091yp6qp5bzg9h5r6ryv3bk6y56sajx"; depends=[dplyr lubridate magrittr]; };
   clrdag = derive2 { name="clrdag"; version="0.6.0"; sha256="1py5x1783c9d83hgar3g70qgbsakgs6n5ckpx87fiw32l040abwa"; depends=[Rcpp RcppArmadillo]; };
@@ -5895,20 +5994,20 @@ in with self; {
   clusterGenomics = derive2 { name="clusterGenomics"; version="1.0"; sha256="127hvpg06is4x486g1d5x7dfkrbk7dj35qkds0pggnqxkq3wsc1c"; depends=[]; };
   clusterPower = derive2 { name="clusterPower"; version="0.6.111"; sha256="1mwq188x9d495my75cdcahfjm3w46cas9jqxks5c0j63395cw9g3"; depends=[lme4]; };
   clusterRepro = derive2 { name="clusterRepro"; version="0.9"; sha256="0s7qqvaf5yxxwhw6qyzfmk65c49yz405gljarwav6aglkx9883cl"; depends=[]; };
-  clusterSEs = derive2 { name="clusterSEs"; version="2.6.1"; sha256="0mlhrqnf3wrqkfn57448fvca8wajdgv2wmci9p8fmnswsmnwfi4j"; depends=[AER Formula lmtest mlogit plm sandwich]; };
+  clusterSEs = derive2 { name="clusterSEs"; version="2.6.2"; sha256="15a9hn8g70y64v5lq91mwjbx411ji2b5zvm1wm4qz820jri5wy20"; depends=[AER Formula lmtest mlogit plm sandwich]; };
   clusterSim = derive2 { name="clusterSim"; version="0.47-4"; sha256="06x8qhsxbv9qgad9h24bpylzc06p6w1fdpzm5bmmvaddmg6ghkkg"; depends=[ade4 cluster e1071 MASS R2HTML rgl]; };
   clusteredinterference = derive2 { name="clusteredinterference"; version="1.0.1"; sha256="01w7i9pmvwmrlf5q6y2d48ib0bm16j16xiw4pqnrvbndx4d6wf6n"; depends=[cubature Formula lme4 numDeriv rootSolve]; };
   clusterfly = derive2 { name="clusterfly"; version="0.4"; sha256="0mxpn7aywqadyk43rr7dlvj0zjcyf4q7qbqw5ds38si7ik34lkrg"; depends=[e1071 plyr reshape2 rggobi RGtk2]; };
   clusterhap = derive2 { name="clusterhap"; version="0.1"; sha256="1ic6588mqp146jsvrxlxk449zw4n81xixgrny9r29497z7hg5a1m"; depends=[]; };
   clustering_sc_dp = derive2 { name="clustering.sc.dp"; version="1.0"; sha256="0cppka7613cbjjf1q2yp6fln511wbqdhh8d4gs6p0fbq379kzmvc"; depends=[]; };
-  clusterlab = derive2 { name="clusterlab"; version="0.0.2.7"; sha256="18np2laaarv2iarlyq71ddazkpchfv6bylfxlxhvg3jbb68vrwj5"; depends=[ggplot2 reshape]; };
+  clusterlab = derive2 { name="clusterlab"; version="0.0.2.8"; sha256="10z5p79a7nafnljl3s17mw22zasxp45nfbxmhilmyfq6kblxj1zm"; depends=[ggplot2 reshape]; };
   clustermq = derive2 { name="clustermq"; version="0.8.8"; sha256="0znyfrsnzrvizpazk8630szln3gxqm5c47x1z1749bqciy39g25m"; depends=[narray progress purrr R6 rzmq]; };
   clusternomics = derive2 { name="clusternomics"; version="0.1.1"; sha256="05nkw6h2dvky07fj50myzw5xlkqyiflbn4vwqw8a1q2idv4awi7b"; depends=[magrittr MASS plyr]; };
   clusternor = derive2 { name="clusternor"; version="0.0-3"; sha256="0qf1k5y9i60skdqz7glq7czwg84gafnxfg0npx772xydvivan210"; depends=[Rcpp]; };
   clustertend = derive2 { name="clustertend"; version="1.4"; sha256="1aqg8cy1hk3lmzvyqh9qc1mcknrva2i0c77hyd0yff9whz80ik4j"; depends=[]; };
   clusteval = derive2 { name="clusteval"; version="0.1"; sha256="1ld0bdl4fy8dsfzm3k7a37cyxc6pfc9qs31x4pxd3z5rslghz7rj"; depends=[mvtnorm Rcpp]; };
-  clustrd = derive2 { name="clustrd"; version="1.3.2"; sha256="06i8rny2fbpk32mj0r1br9dymf2y98xjzbj7cikyp7k481693a0m"; depends=[ca cluster corpcor dplyr dummies fpc GGally ggplot2 ggrepel plyr rARPACK tibble]; };
-  clustree = derive2 { name="clustree"; version="0.4.0"; sha256="0lcky7sacp2m3mrxcp7h6xs8x7l97w6qi3277wddvs4q3v0q8hkb"; depends=[checkmate dplyr ggplot2 ggraph ggrepel igraph rlang tidygraph viridis]; };
+  clustrd = derive2 { name="clustrd"; version="1.3.5"; sha256="0i9zp7084biym29dx87ljjpcvcbl1wi7bn50hh6v4y54ws0fgyh9"; depends=[ca cluster corpcor dplyr fpc GGally ggplot2 ggrepel plyr rARPACK tibble]; };
+  clustree = derive2 { name="clustree"; version="0.4.1"; sha256="0jsffqd25ad08q35a3ggzblhia7y6m5gj972kij6nrbah920qk0x"; depends=[checkmate dplyr ggplot2 ggraph ggrepel igraph rlang tidygraph viridis]; };
   clustringr = derive2 { name="clustringr"; version="1.0"; sha256="07f0ywpkf8igic7ijvvrjlngq3smjcv9nqnah41fp6wfgvh49ifq"; depends=[assertthat dplyr forcats ggplot2 ggraph igraph magrittr rlang stringdist stringi stringr tidygraph]; };
   clustsig = derive2 { name="clustsig"; version="1.1"; sha256="0n5nf712vsa8zb0c2lv4gjqsgva62678vjngr9idgswb73shxm8v"; depends=[]; };
   clustvarsel = derive2 { name="clustvarsel"; version="2.3.3"; sha256="1dw9iniy2vw4yz1jip4jja6fsp03kbr86mm5knbhhyc0l24i0wrz"; depends=[BMA foreach iterators Matrix mclust]; };
@@ -5916,18 +6015,18 @@ in with self; {
   cmaes = derive2 { name="cmaes"; version="1.0-11"; sha256="1hwf49d1m660jdngqak9pqasysmpc4jcgr8m04szwbyzyy6xrm5k"; depends=[]; };
   cmaesr = derive2 { name="cmaesr"; version="1.0.3"; sha256="03zx2nrw24wmmjjpyh8pswasjjq0amf0g375fm2b3s111dx8fbj9"; depends=[BBmisc checkmate ggplot2 ParamHelpers smoof]; };
   cmce = derive2 { name="cmce"; version="0.1.0"; sha256="0d52ci906zbd4q43qylcyw93acxh7f20jn3r0k74ynyy47131dnd"; depends=[]; };
-  cmenet = derive2 { name="cmenet"; version="0.1.0"; sha256="19cqd3ppama2g4a7mwnq4fry0nzkyny1z1irln3xqd22gb8lz38r"; depends=[glmnet hierNet MASS Rcpp RcppArmadillo]; };
+  cmenet = derive2 { name="cmenet"; version="0.1.1"; sha256="0f7bci6nn63q243i7wvhr9mqlf64gw8w042nc1lqb986p7zfxihk"; depends=[glmnet hierNet MASS Rcpp RcppArmadillo sparsenet]; };
   cmm = derive2 { name="cmm"; version="0.12"; sha256="0q6hs56hhi9vaanx7i7gg7ncv0h29lndla66g9chzmh3lchq3r20"; depends=[]; };
   cmmr = derive2 { name="cmmr"; version="0.1.2"; sha256="0nik1pzd1rckalvn7xh6s699kkdjnra3q3bn5x16c1lmpz5bp2s4"; depends=[httr progress RJSONIO]; };
   cmna = derive2 { name="cmna"; version="1.0.2"; sha256="18vbqa258m0g5pvfhqi2vbr8n2bil07n9spgz1wh2axw1c3bcf76"; depends=[]; };
   cmocean = derive2 { name="cmocean"; version="0.2"; sha256="0v1bm2qgvjb82ynakglr61swx5jy41ngn6vml5gllv3r7skqr1is"; depends=[]; };
   cmpprocess = derive2 { name="cmpprocess"; version="1.0"; sha256="0gqfmbm86bfi2l81pf2dn70rxg58h1y8hiyrp8sv9v84cx20422v"; depends=[compoisson numDeriv]; };
   cmprsk = derive2 { name="cmprsk"; version="2.2-8"; sha256="1nacbzx950ygaqgnj0949skhwpzar5i3xlscd44jsimk2gsppx6z"; depends=[survival]; };
-  cmprskQR = derive2 { name="cmprskQR"; version="0.9.1"; sha256="002s6ls670sdzrxgqv9gbl646b675q1gn6dzkngnf6rgcdqwid7n"; depends=[quantreg survival]; };
+  cmprskQR = derive2 { name="cmprskQR"; version="0.9.2"; sha256="1b3di5fsgglriv00fxydpc4p8lh0xcgi6jc04awq2vmp6s8kvjmw"; depends=[quantreg survival]; };
   cmrutils = derive2 { name="cmrutils"; version="1.3.1"; sha256="0nrq84bkd23lvvg8ls2smkjcnfnydhbcni3n6s8w0579i9xga8dv"; depends=[chron]; };
-  cmsaf = derive2 { name="cmsaf"; version="1.9.5"; sha256="14581zk65w11dkk57privfdgy5ynw4bv06lwz8r0bkyqmg1bzs05"; depends=[fields ncdf4 raster sp]; };
+  cmsaf = derive2 { name="cmsaf"; version="2.0.1"; sha256="0ampq493i8x40jk8p8acgizy1vlhm05i5nllk5a0xk81vywf7ifi"; depends=[fields FNN ncdf4 rainfarmr raster sp]; };
   cmvnorm = derive2 { name="cmvnorm"; version="1.0-6"; sha256="1wf23w9gxrrgw7j740r381xrss09inzd7mrg6g7wz883c9madbfn"; depends=[elliptic emulator]; };
-  cna = derive2 { name="cna"; version="2.2.0"; sha256="1y4q2i5i7kjybr3x1z1lcijwfsf6x4sckzqphchvqzxbg0qqjrgh"; depends=[matrixStats Rcpp]; };
+  cna = derive2 { name="cna"; version="2.2.1"; sha256="1yzr3r8jykr25i52f5rvq9h68gnkqksy9qkkmib771kmdy1k310a"; depends=[matrixStats Rcpp]; };
   cnbdistr = derive2 { name="cnbdistr"; version="1.0.1"; sha256="05qi41jimslbngjgbwzfda0q25hb28ax79v9yckvrbpgjc8dk990"; depends=[hypergeo]; };
   cncaGUI = derive2 { name="cncaGUI"; version="1.0"; sha256="1v55kvrc05bsm1qdyfw3r3h64wlv3s6clxbr8k512lfk99ry42kn"; depends=[MASS plotrix rgl shapes tcltk2 tkrplot]; };
   cnmlcd = derive2 { name="cnmlcd"; version="1.2-0"; sha256="1vpn926wf8vkifscnb35y4c74721iar2wykrl50fcv0fg16yggnd"; depends=[lsei]; };
@@ -5936,7 +6035,7 @@ in with self; {
   coalescentMCMC = derive2 { name="coalescentMCMC"; version="0.4-1"; sha256="0xxv1sw5byf84wdypg5sfazrmj75h4xpv7wh4x5cr9k0vgf80b3s"; depends=[ape coda lattice Matrix phangorn]; };
   coalitions = derive2 { name="coalitions"; version="0.6.10"; sha256="1yfibzkg4psmghfwpv5rivaxzizilbd8frgpd0z05hx519lmx9h7"; depends=[checkmate dplyr forcats ggplot2 gtools jsonlite lubridate magrittr purrr RCurl reshape2 rlang rvest stringr tidyr xml2]; };
   coarseDataTools = derive2 { name="coarseDataTools"; version="0.6-4"; sha256="1y6msvcr1j9cvnc1v87p6wkwvnn7iszwsr9sl6ixjjwgnpc05ayc"; depends=[MCMCpack]; };
-  cobalt = derive2 { name="cobalt"; version="3.7.0"; sha256="02d7p242kz95j41cqcjhrs2bsfwpjf7512rn0g1smwn78axq30f0"; depends=[backports crayon ggplot2 ggstance]; };
+  cobalt = derive2 { name="cobalt"; version="3.8.0"; sha256="0bgcdlars0diql3x60nvizlvn3ny5if1jac2whhzvnm5pbchlqf1"; depends=[backports crayon ggplot2 ggstance gridExtra gtable]; };
   cobiclust = derive2 { name="cobiclust"; version="0.1.0"; sha256="068cqrhx7lxsvcjb62rgrca7y20cybz4445bl1qc6k16ca4bh0m9"; depends=[cluster]; };
   cobs = derive2 { name="cobs"; version="1.3-3"; sha256="1pqvz7czcchri4x79g78hbwyagb3bqzdqb047zkbdinyz067c7kb"; depends=[quantreg SparseM]; };
   cocktailApp = derive2 { name="cocktailApp"; version="0.2.1"; sha256="1aq7m3qb4s5v59ym8p5vh7lr5s1xfp8b04x64a014k47gakgiw1d"; depends=[dplyr DT forcats ggplot2 ggtern magrittr shiny shinythemes tibble tidyr]; };
@@ -5953,16 +6052,17 @@ in with self; {
   codetools = derive2 { name="codetools"; version="0.2-16"; sha256="00bmhzqprqfn3w6ghx7sakai6s7il8gbksfiawj8in5mbhbncypn"; depends=[]; };
   codified = derive2 { name="codified"; version="0.2.0"; sha256="1hmw7yrw4qx8v9rkqqvqf4013s9whq5qlgwz7v882j4slpvm6gb1"; depends=[checkmate dplyr kableExtra knitr magrittr readr rlang tibble tidyr]; };
   codingMatrices = derive2 { name="codingMatrices"; version="0.3.2"; sha256="0kldx2h3mksw4644d0ask6ij7i63rrwk0njlsvkbdjz3bf7pdv1b"; depends=[fractional Matrix]; };
-  codyn = derive2 { name="codyn"; version="2.0.2"; sha256="006mwn4ijpx1qn52i0wp8yqvxagidvhcrk4zfp77ncmns9cw5zxq"; depends=[assertthat permute vegan]; };
+  codyn = derive2 { name="codyn"; version="2.0.3"; sha256="1jmnkipalxfy8dwgskrx3npcmb717bpvkpx97md44xhh8l7mmk2s"; depends=[assertthat permute vegan]; };
   coefficientalpha = derive2 { name="coefficientalpha"; version="0.5"; sha256="0pfw64z7f0gp415nn7519rcw829a7wnwnjx94sc55jsvgb1di3kc"; depends=[lavaan rsem]; };
   coefplot = derive2 { name="coefplot"; version="1.2.6"; sha256="036njf2xwmjvyamanb7nfn2n09ps2rdgk3zrxn6khwp8ly245nps"; depends=[dplyr dygraphs ggplot2 magrittr plyr purrr reshape2 tibble useful]; };
   coenocliner = derive2 { name="coenocliner"; version="0.2-2"; sha256="0r4h0r3av2d1cxmjpwaabjn807626pzqnra2x542wdnnf7h8nmdf"; depends=[]; };
   coenoflex = derive2 { name="coenoflex"; version="2.2-0"; sha256="06f75spl4wkbgicm0bksnid2lb1gkvi05915wn5y4km45d82fkkr"; depends=[mgcv]; };
   coexist = derive2 { name="coexist"; version="1.0"; sha256="15ydhrx996i6caa0360c2bgn2zvgwfg5wdhsqq1gvrggs15w7nml"; depends=[]; };
+  cofad = derive2 { name="cofad"; version="0.1.0"; sha256="034ihvg2bqlfhpwivza15slksn7zxk3k20rdyx9zlriqzfgvlwws"; depends=[]; };
   cofeatureR = derive2 { name="cofeatureR"; version="1.1.1"; sha256="1awfrlnbpw9ivfvaahznx6dx5jp8ln0154vh2pznp520q59h1mbs"; depends=[dplyr ggplot2 lazyeval tibble]; };
   coga = derive2 { name="coga"; version="1.0.0"; sha256="0mx3jdjd1s855lk451zmjf6w5rpajx39q6w7aw3kng68snyalz16"; depends=[Rcpp RcppGSL]; };
   cogmapr = derive2 { name="cogmapr"; version="0.9.1"; sha256="1iz776avw05a0lcna78fycixacby4bjf8ar1jazsf34yss6zka23"; depends=[car dplyr ggplot2 graph magrittr Rgraphviz tidyr]; };
-  coin = derive2 { name="coin"; version="1.3-0"; sha256="1y0yl4mjaxca0jqz53sv1gcpdg89m099rq61iszxvpx7w0vvpkmd"; depends=[libcoin matrixStats modeltools multcomp mvtnorm survival]; };
+  coin = derive2 { name="coin"; version="1.3-1"; sha256="0qi03fyqw42a2vnqcia5l2m1mzyarj2q1iblknx9n19bdsd53qjx"; depends=[libcoin matrixStats modeltools multcomp mvtnorm survival]; };
   coindeskr = derive2 { name="coindeskr"; version="0.1.0"; sha256="0iwkg9qx5gymzjxw3w1zlwq9336kbqp4z8a9wf9a1p2gp9727qcm"; depends=[httr jsonlite]; };
   coinmarketcapr = derive2 { name="coinmarketcapr"; version="0.2"; sha256="1r3r5ifl663pdmkvkrf6yhdg1kwmwdjg9kvp0ykbdvpbvqjcjhkv"; depends=[curl ggplot2 jsonlite]; };
   cointReg = derive2 { name="cointReg"; version="0.2.0"; sha256="0n4s809avhlrmrjdqzc2s752m7x96c4432gnjd4qv77r2nns7dw4"; depends=[checkmate MASS matrixStats]; };
@@ -5973,19 +6073,19 @@ in with self; {
   collapsibleTree = derive2 { name="collapsibleTree"; version="0.1.7"; sha256="0b65pbp1wnpsrayqi630ds4r98jvcvynnlp6wxdqrnnr9nzw5343"; depends=[data_tree htmlwidgets]; };
   collateral = derive2 { name="collateral"; version="0.4.2"; sha256="1i1fzvm838s2cfmxw654vwmp9rl9f9985vjildkxyx2f6571sjfm"; depends=[crayon pillar purrr]; };
   collectArgs = derive2 { name="collectArgs"; version="0.4.0"; sha256="0fz5w1xsxiddzrwahrg50px4igyhd4plq655jaix6grancs7kvix"; depends=[magrittr]; };
-  collections = derive2 { name="collections"; version="0.1.6"; sha256="1wd2wz6xg7nk54kwb142fw8qi0zbwk3j07v0kj7myradhcs6a29b"; depends=[R6]; };
-  collector = derive2 { name="collector"; version="0.1.2"; sha256="02w4rlxqmag43qb424hpnqpb8rnkgkx7rz2g8hnp9iyj7h125p94"; depends=[dplyr EnvStats evaluator flextable ggplot2 ggpubr magrittr officer purrr quanteda readr rlang rmarkdown stringr tibble tidyr xaringan]; };
-  collidr = derive2 { name="collidr"; version="0.1.1"; sha256="08rmasvm9c01li29c1k8hbmcjnks6k9himxc6j6789iz48pzccpj"; depends=[dplyr jsonlite stringr]; };
+  collections = derive2 { name="collections"; version="0.2.0"; sha256="04rnfz2ljfsimi98mjy9f6mzw73z8n6v9lji0sfz6kv1ma2asibi"; depends=[xptr]; };
+  collidr = derive2 { name="collidr"; version="0.1.2"; sha256="1b8yy0p1r4gs6azcl1aqkny3hws5hhl9bvsrkrhgk2r2xni9sk6f"; depends=[dplyr jsonlite stringr]; };
   collpcm = derive2 { name="collpcm"; version="1.0"; sha256="15k6khsgikjpsasyz02bhgd43nij2n7nl0m0sgxvjlcn0nv95y2n"; depends=[latentnet network vegan]; };
   colmozzie = derive2 { name="colmozzie"; version="1.1.1"; sha256="0sn7dqg7rnddnmdb10c6scws6kgi1lz4lw8nc698x63z431ah1p8"; depends=[]; };
   coloc = derive2 { name="coloc"; version="3.2-1"; sha256="0sm2mji8bihvcshkh9g18sgbwznhh8j4hip50rk7ckac3vc8y75h"; depends=[BMA data_table ggplot2 reshape snpStats]; };
   colocalization = derive2 { name="colocalization"; version="1.0.0"; sha256="0szdxjj5nbb3ncxsg0b7jphlqqxnizs2lymcafk42sdgvlfkx8sr"; depends=[ggplot2]; };
+  colocalized = derive2 { name="colocalized"; version="0.1.0"; sha256="1c25bq618bhgc6s7rv20ih94pzchrwgmizssnjy3m1z2czmhpnr3"; depends=[doParallel foreach purrr]; };
   colocr = derive2 { name="colocr"; version="0.1.0"; sha256="0lfwhn3hd7kwhm6dwbpfqhsphz2249vb0mpjvma18zym93x6gj2i"; depends=[imager magick magrittr scales shiny]; };
   colorRamps = derive2 { name="colorRamps"; version="2.3"; sha256="0shbjh83x1axv4drm5r3dwgbyv70idih8z4wlzjs4hiac2qfl41z"; depends=[]; };
   colorSpec = derive2 { name="colorSpec"; version="1.0-1"; sha256="1fgikg5x9ir2n7nhjvsflnz99g2wjh3jj1yh59jiirq725dw573d"; depends=[MASS spacesXYZ]; };
   colordistance = derive2 { name="colordistance"; version="1.1.0"; sha256="0aiqvx0mlraczkcfhzfcaavmqqmxiffnghhw266f84bphxw6b5q2"; depends=[abind ape clue emdist gplots jpeg magrittr mgcv plotly png scales scatterplot3d spatstat]; };
   coloredICA = derive2 { name="coloredICA"; version="1.0.0"; sha256="1xj4dsrwgqzm2644nk3y8nj47m036b4ylh6v60jccj3707spb32r"; depends=[MASS]; };
-  colorednoise = derive2 { name="colorednoise"; version="1.0.4"; sha256="0y218mkryy1jja6qa71z1sr64rny40x7sk9f8l8jbjqqkjxr6q53"; depends=[dplyr purrr Rcpp RcppArmadillo tibble tidyr]; };
+  colorednoise = derive2 { name="colorednoise"; version="1.0.5"; sha256="094iil7f8w5cinw5j1ja3a2l1w352hlj6f3vfsvs6k1ww5f1sd6l"; depends=[dplyr purrr Rcpp RcppArmadillo tibble tidyr]; };
   colorfindr = derive2 { name="colorfindr"; version="0.1.4"; sha256="175h476dzq1f2x25vdd268xj4ja4lv8fhfj9vld85waqi0sq515g"; depends=[bmp dplyr jpeg magrittr pixmap plotly plotwidgets png purrr rsvg stringr tibble tiff treemap]; };
   colorfulVennPlot = derive2 { name="colorfulVennPlot"; version="2.4"; sha256="01b3c060fbnap78h9kh21v3zav547ak2crdkvraynpd2096yk51w"; depends=[]; };
   colorhcplot = derive2 { name="colorhcplot"; version="1.3.1"; sha256="009pyyb30kwshldd7v7zfy5rxys6i0dhlc5w8ail61acbg4rlrmz"; depends=[]; };
@@ -5997,10 +6097,11 @@ in with self; {
   colortools = derive2 { name="colortools"; version="0.1.5"; sha256="0z9sx0xzfyb5ii6bzhpii10vmmd2vy9vk4wr7cj9a3mkadlyjl63"; depends=[]; };
   colourlovers = derive2 { name="colourlovers"; version="0.3.5"; sha256="172ny0w9n2ys8pa7zxkfjsl7lv6fa59bmmbkzlwfx59wamxahmky"; depends=[httr jsonlite png XML]; };
   colourpicker = derive2 { name="colourpicker"; version="1.0"; sha256="0z3v2083g7kwdp21x9s2n1crfh24agpdq3yxkcdzc2awn2pwpnpi"; depends=[ggplot2 htmltools htmlwidgets jsonlite miniUI shiny shinyjs]; };
-  colourvalues = derive2 { name="colourvalues"; version="0.2.2"; sha256="0i6p7xn9b59ywgbrby78zqxz3bc45bkqyc131kb3987zy4wvh438"; depends=[BH Rcpp]; };
+  colourvalues = derive2 { name="colourvalues"; version="0.3.0"; sha256="1r762z0dkm0f8agj29mry8k5b9m4yby9kw3bgywbvw3z4mrwic0d"; depends=[BH Rcpp]; };
   colourvision = derive2 { name="colourvision"; version="2.0.2"; sha256="15ndhqpp5fi9jgiri9ysl68nf4rdamh9c25svf5nvh2wvv8shrd9"; depends=[Matrix rgl]; };
   colr = derive2 { name="colr"; version="0.1.900"; sha256="0ilz1y0jd2vgyh81g3dwx2l64sir6z6sgmqx7lnvr1hafsqnwfc8"; depends=[]; };
   colt = derive2 { name="colt"; version="0.1.1"; sha256="028jqvgr14ig8jxp8h2lrf7mainzppgqh6v1479qfv4l9is3bnwy"; depends=[crayon]; };
+  comat = derive2 { name="comat"; version="0.3.0"; sha256="0lqkhj4ina7zfrlpn55ac68f79asd3fhcx086ll6gjibfn3vf68f"; depends=[raster Rcpp RcppArmadillo]; };
   comato = derive2 { name="comato"; version="1.1"; sha256="0lidwr5vw10655p7q0iqzq3phq5y1i86w3bjdv87cwx3m6333bz6"; depends=[cluster clusterSim gdata igraph lattice Matrix XML]; };
   combinat = derive2 { name="combinat"; version="0.0-8"; sha256="1h9hr88gigihc4na7lb5i7rn4az1xa7sb34zvnznaj6pdrmwy4qm"; depends=[]; };
   combiter = derive2 { name="combiter"; version="1.0.3"; sha256="11pcvrpbvkzkjwks2z6ww7s9d5fkh8zl0jw52a5ya3y1wkqcs3n6"; depends=[iterators itertools Rcpp]; };
@@ -6011,13 +6112,13 @@ in with self; {
   commentr = derive2 { name="commentr"; version="1.0.4"; sha256="0anlcbk8rj0yr8i23qmr6v5ws0695nkc3mvgr6pnq1fg2d4c4brj"; depends=[stringr]; };
   commonmark = derive2 { name="commonmark"; version="1.7"; sha256="024iz1qp2kv6iz6y69ir0jk3qhjps86rhkzlcmhqsxx97rx7cjni"; depends=[]; };
   commonsMath = derive2 { name="commonsMath"; version="1.2.4"; sha256="12hwl3xjm7kl5y36v3y4jyr2gk4l87mff237qms2hy8y41nwwagr"; depends=[]; };
-  comorbidity = derive2 { name="comorbidity"; version="0.4.1"; sha256="0dgbhbm5jjxqy6spm0sw9gmx6v0b426m6aj6gr9jjnd06vraw6pc"; depends=[checkmate stringi]; };
+  comorbidity = derive2 { name="comorbidity"; version="0.5.0"; sha256="137j4lyg2l0qlzsdpzlghx39gb6zlwm8jfvn57srq4ybmpsydp18"; depends=[checkmate data_table reshape2]; };
   compHclust = derive2 { name="compHclust"; version="1.0-3"; sha256="0agay7rn5mrw07imz4l547b7m9pfcg3rhz4krfxrvg1q2z2kryvj"; depends=[]; };
   compactr = derive2 { name="compactr"; version="0.1"; sha256="0f2yds6inmx0lixj08ibqyd2i61l2cbg1ckgpb8dl2q7kcyyd6mx"; depends=[]; };
   compare = derive2 { name="compare"; version="0.2-6"; sha256="0k9zms930b5dz9gy8414li21wy0zg9x9vp7301v5cvyfi0g7xzgw"; depends=[]; };
   compareC = derive2 { name="compareC"; version="1.3.1"; sha256="0dachfr23lps2jj1y5gc958k54vskmww84gdgk4amihsdgjsnphg"; depends=[]; };
   compareDF = derive2 { name="compareDF"; version="1.8.0"; sha256="199yd4qd6w07bd2hjfpkva9qzmq3f03arjgia9md56rwi7kp2bv8"; depends=[dplyr htmlTable magrittr stringr tidyr]; };
-  compareGroups = derive2 { name="compareGroups"; version="4.1.0"; sha256="18almqkvmc89ians4zs9r6b61w1k74a918s0dhaiqj584px0rx09"; depends=[chron epitools HardyWeinberg kableExtra knitr rmarkdown SNPassoc survival writexl]; };
+  compareGroups = derive2 { name="compareGroups"; version="4.2.0"; sha256="0lq5yd6d1vz8lzy1lnfav2726g3xdfxlbza055g0paxbxzxgs2n0"; depends=[chron epitools flextable HardyWeinberg kableExtra knitr officer rmarkdown SNPassoc survival writexl]; };
   compareODM = derive2 { name="compareODM"; version="1.2"; sha256="019hq8j56asjvh4x1p65785mf38xr05j3by0749gl9k9yl8645da"; depends=[XML]; };
   comparer = derive2 { name="comparer"; version="0.2.0"; sha256="1m5kwk0zqqn07f81z4fpl0yfkpfkvg2hjpp4cim0jdnz08cm0wnq"; depends=[R6]; };
   comparison = derive2 { name="comparison"; version="1.0-4"; sha256="0pc462rhk8gr8zrf08ksi315kmhydlp027q5gd40ap5mmhk7rd82"; depends=[isotone]; };
@@ -6027,14 +6128,16 @@ in with self; {
   compendiumdb = derive2 { name="compendiumdb"; version="1.0.3"; sha256="0glaqlzz5wr14yfhka1y7yw5ha6yc4waw61msbz0vkwj5z2hd2hk"; depends=[Biobase GEOquery RMySQL]; };
   comperank = derive2 { name="comperank"; version="0.1.0"; sha256="0fxg32kp4v42455fia48rnbd3v84g4vsh4r4qc29d0gg93ymz9hp"; depends=[comperes dplyr Rcpp rlang tibble]; };
   comperes = derive2 { name="comperes"; version="0.2.2"; sha256="1kybykamzzgx00l758304n4m4q02cssqmq14cf93rlzy23348sw5"; depends=[dplyr magrittr rlang tibble tidyr]; };
+  competitiontoolbox = derive2 { name="competitiontoolbox"; version="0.1.2"; sha256="1k45y7zcckvpcx4pdin9zlsx1vrqlqx9lz67cbsawb254wbylc4l"; depends=[antitrust ggplot2 rhandsontable shiny trade]; };
+  completejourney = derive2 { name="completejourney"; version="1.1.0"; sha256="0ysbpmd7rglz3diy2cpcgvmmcnysradb4ddiwix7kbhzrhvhrdrs"; depends=[curl dplyr progress stringr tibble zeallot]; };
   complexity = derive2 { name="complexity"; version="1.1.1"; sha256="1lpsvry88jpqfw0wkdlwjzkqjl17f4adjcqvq0dwk483mi54xnfk"; depends=[combinat shiny]; };
   complexplus = derive2 { name="complexplus"; version="2.1"; sha256="16w9v7d1ckavqmr86l34frr37pkvdn0iqnb17ssb8xaggns5lgqx"; depends=[expm Matrix]; };
-  complmrob = derive2 { name="complmrob"; version="0.6.2"; sha256="0r8yz1zsqd030k0qqsfvqh9z5vx632cwynnz5ch6ndg6g89baxmf"; depends=[boot ggplot2 robustbase scales]; };
+  complmrob = derive2 { name="complmrob"; version="0.7.0"; sha256="0dvkc5y53041agkjz3rl898hkq686pxzr6flf2qx1g3jbza3pk1y"; depends=[boot ggplot2 robustbase scales]; };
   compoisson = derive2 { name="compoisson"; version="0.3"; sha256="0v5dl7xydqi4p97nipn4hyhpq2gghmx81ygvl0vc8b65jhq89y0p"; depends=[MASS]; };
   compositions = derive2 { name="compositions"; version="1.40-2"; sha256="12mp05yi7jkdqg9iwh6bc9sx6sdxagcnrirznxy9hq8502p7238i"; depends=[bayesm energy robustbase tensorA]; };
-  compound_Cox = derive2 { name="compound.Cox"; version="3.18"; sha256="1ksgh94k2qqq6xs9fdar88564pkdgsvbqs4yrkah6q60n406qh7r"; depends=[numDeriv survival]; };
+  compound_Cox = derive2 { name="compound.Cox"; version="3.19"; sha256="1wl8jg916567nk0wy37in6syh7z2rw70v5jm7s0w3ifiqs5v7nzb"; depends=[numDeriv survival]; };
   comprehenr = derive2 { name="comprehenr"; version="0.6.7"; sha256="0c0wid4lch7yrz41b8n773hy4zj80sfb1lhy4pclvlsjdr5zryk6"; depends=[]; };
-  compstatr = derive2 { name="compstatr"; version="0.1.1"; sha256="0lamnhch443rz01gpjyyva7k7fcxg4ca7szxzxvwpmln5vvpsagr"; depends=[dplyr fs lubridate purrr readr rlang sf stringr tibble tidyr]; };
+  compstatr = derive2 { name="compstatr"; version="0.2.0"; sha256="07kak4dc1q44m58wb7ps4bf5ikcnjfkvd7fn1mxfxvqljrdy6978"; depends=[dplyr fs httr janitor lubridate purrr readr rlang rvest sf stringr tibble tidyr xml2]; };
   compute_es = derive2 { name="compute.es"; version="0.2-4"; sha256="1b5i8z66zbag0vdv98mmpwmizpm68vc3ajh0n3q94zdcmhcbx12d"; depends=[]; };
   comtradr = derive2 { name="comtradr"; version="0.2.2"; sha256="177gnmgwqns65z5y9nw4xp8qmw5z70454zb54jw1879xrgfsrciz"; depends=[httr jsonlite magrittr purrr]; };
   con2aqi = derive2 { name="con2aqi"; version="0.1.0"; sha256="1gdd1y6xg26fz199hvryzsnp16qbsz13chqqxyxnkgrai1l72mhf"; depends=[]; };
@@ -6045,7 +6148,7 @@ in with self; {
   concor = derive2 { name="concor"; version="1.0-0.1"; sha256="0hjyvi6p16cyrmq0bq7fph1r5f3adp7zpf123wkm5bkjnc5122k0"; depends=[]; };
   concordance = derive2 { name="concordance"; version="1.6"; sha256="0pb4mndrh1nimf59ajjcydlvc79nm6p7c219iymkn0b1hbrnx7lf"; depends=[]; };
   concreg = derive2 { name="concreg"; version="0.6"; sha256="1ncs9cpviv5kd49hahlhi7wn2yk70msi22qv8fw91hf81ccimlp2"; depends=[survival]; };
-  concurve = derive2 { name="concurve"; version="2.0"; sha256="090j7fv9c1m13xynq5sdrdrl0g2c1lamlb2nwg5xsjlv93ckm3az"; depends=[dplyr ggplot2 metafor scales survival survminer tibble]; };
+  concurve = derive2 { name="concurve"; version="2.1.0"; sha256="17kf5fl90a28rm2cnkjz0cp572xam63yq1j4p3r556gp0nf8553p"; depends=[dplyr ggplot2 metafor scales survival survminer tibble]; };
   cond = derive2 { name="cond"; version="1.2-3.1"; sha256="1j0gf28mg2j6ahs83nk662bix1lb2c9184vn8sblw433zxqaa2ny"; depends=[statmod survival]; };
   condGEE = derive2 { name="condGEE"; version="0.1-4"; sha256="0mqj2pc91n8h3arpd4b9f7ndbcnai21c67is22qg22wj7vhhs87h"; depends=[numDeriv rootSolve]; };
   condMVNorm = derive2 { name="condMVNorm"; version="2015.2-1"; sha256="04563jljnjhbiaiq33gn5dxjfvv05xp3lhl3w942v0smy0cdhrh4"; depends=[mvtnorm]; };
@@ -6053,7 +6156,6 @@ in with self; {
   condformat = derive2 { name="condformat"; version="0.8.0"; sha256="1x3sm3fn5lb07gmxvfaa0xnhk5mjnim90p7mwail8dmi9nygrb9d"; depends=[dplyr gridExtra gtable htmlTable htmltools knitr lazyeval magrittr rlang rmarkdown scales tibble tidyselect]; };
   condir = derive2 { name="condir"; version="0.1.1"; sha256="133598h1ga4jyr77lchnby6m8bh3adq6s38cgw45q4fyvzad4qds"; depends=[BayesFactor effsize knitr psych shiny xtable]; };
   conditionz = derive2 { name="conditionz"; version="0.1.0"; sha256="0ijnsg6n3p3y8y9il012xg5if57hdzvrgxjcykfrrlil4m7ixn6c"; depends=[R6 uuid]; };
-  condmixt = derive2 { name="condmixt"; version="1.0"; sha256="05q1fj7akf6lsq9rbcqqkzlx82jvk6mlvmwx6jzk8j228fwqmg90"; depends=[evd]; };
   condusco = derive2 { name="condusco"; version="0.1.0"; sha256="0zydinzlksynkz4r712rzv9qqdx8dkdz3h1ygi9cfmd6hya3580s"; depends=[assertthat bigrquery DBI jsonlite]; };
   condvis = derive2 { name="condvis"; version="0.5-1"; sha256="1ngxqfa0mr86cv610da4ljypxpdvx0n5pfgj3zfksnwxlwc0dvbj"; depends=[MASS]; };
   condvis2 = derive2 { name="condvis2"; version="0.1.0"; sha256="1xvxqr311wwi8ns31zqnxxb7bji3vl296j3qfq7vh0alxlhd4n4r"; depends=[cluster DendSer ggplot2 kmed plyr RColorBrewer scales shiny]; };
@@ -6068,6 +6170,7 @@ in with self; {
   confinterpret = derive2 { name="confinterpret"; version="1.0.0"; sha256="0qldaqpx7kpk71zfwv465jrscwzc9w3xfv52i4h01k9aw3q6m8ja"; depends=[]; };
   conflicted = derive2 { name="conflicted"; version="1.0.4"; sha256="0xp04cdvmp3b1phazhmjqn0vmax1b2218xsb5854ffv43m7qvrra"; depends=[memoise rlang]; };
   conformalClassification = derive2 { name="conformalClassification"; version="1.0.0"; sha256="03v6xbgipb97byarqj0d38z9yb2g54mkkw343jxmi2j058z26yw7"; depends=[doParallel foreach mlbench randomForest]; };
+  confoundr = derive2 { name="confoundr"; version="1.2"; sha256="000vf828qv04pplx8yc8q3mafxf4g0axip6z5zbsj2581yxv9jjh"; depends=[dplyr ggplot2 gridExtra magrittr purrr rlang Rmpfr scales stringr tidyr]; };
   confreq = derive2 { name="confreq"; version="1.5.4-3"; sha256="1jn9v9z04a2yni4l3i7969kzzpgaxkdfdggi74dgp3jchda6vip7"; depends=[gmp]; };
   congressbr = derive2 { name="congressbr"; version="0.2.1"; sha256="1vfjyg05ssk7cnhy71cqvx38h65yrp0mm4fp6lh2q7bzh1lx69ad"; depends=[dplyr glue httr janitor lubridate magrittr progress pscl purrr stringi stringr tibble tidyr xml2]; };
   conicfit = derive2 { name="conicfit"; version="1.0.4"; sha256="1d704xgiyqmbwfxnsmhqg885x10q8yqxmrk4khqpg3lh696bw97d"; depends=[geigen pracma]; };
@@ -6112,36 +6215,40 @@ in with self; {
   corclass = derive2 { name="corclass"; version="0.1.1"; sha256="0ai8si992f58mrvc8hq598zbw9d4jslnc96lpzj5d89lljjv3hf5"; depends=[igraph]; };
   cord = derive2 { name="cord"; version="0.1.1"; sha256="18xj6cwmx1a7p3vqx5img8qf8s75nc6pcv78v15j081pgn786ma5"; depends=[Rcpp RcppArmadillo]; };
   cordillera = derive2 { name="cordillera"; version="0.8-0"; sha256="0cpysfivwmim36gcqn1i7450a33hv4pdbvil7syb0hr7vdm083dd"; depends=[dbscan yesno]; };
-  coreCT = derive2 { name="coreCT"; version="1.2.3"; sha256="1h4qvcdbx9y0q911xw5j66l16my7wdifvq2z6vbr17s0cmjfywbf"; depends=[igraph oro_dicom plyr raster]; };
+  coreCT = derive2 { name="coreCT"; version="1.3.0"; sha256="0q10w57d5r2v8xxv7rv3xppmlci09zbwlrxjwlvargzzp6ilk8in"; depends=[igraph oro_dicom plyr raster]; };
   coreNLP = derive2 { name="coreNLP"; version="0.4-2"; sha256="0rvyqj7s3lijq4rzil65060b29m393m7zmg99mykp1g1kby5bjd8"; depends=[rJava XML]; };
   coreSim = derive2 { name="coreSim"; version="0.2.4"; sha256="1fhlss420rhs21l9i2ag5g3j0vnrkpqdh13ca4rwfan6h35qr3sm"; depends=[dplyr MASS]; };
   coreTDT = derive2 { name="coreTDT"; version="1.0"; sha256="14rnh61gk3m6g8rq77hm9ybds0px15di2mxm3jiyfdfynx5ng58f"; depends=[]; };
   corehunter = derive2 { name="corehunter"; version="3.2.1"; sha256="0cxvhmi768kz3q8hydb6y9nqvc8hvkmq8nc5yfry4k94whk12wax"; depends=[naturalsort rJava]; };
   corkscrew = derive2 { name="corkscrew"; version="1.1"; sha256="1nb81r4lsrajcj3xz3f7p6xznnb38yg3rnnh44rd3kabca4d8r1s"; depends=[ggplot2 gplots igraph RColorBrewer]; };
   corlink = derive2 { name="corlink"; version="1.0.0"; sha256="06n9pcvbn8y9gy0mn9c0sw05424ss8smpaw3ly6a785cmj3d9b6m"; depends=[]; };
-  cornet = derive2 { name="cornet"; version="0.0.1"; sha256="0kwzpbr69gvkajwvyykbpqfvp5ndsks1a70iwnlvbkdyl4vl3fck"; depends=[glmnet palasso]; };
+  cornet = derive2 { name="cornet"; version="0.0.2"; sha256="0m611rq7m9ki57q8n5zwp5i0l95w6nrd6cwr03q3mxg58bnh01p3"; depends=[glmnet palasso]; };
   coroICA = derive2 { name="coroICA"; version="1.0.1"; sha256="0hjy1sdii8kk859bj1xv3vh1hzxznhymhgdb583z57i0hqxnijiv"; depends=[MASS]; };
   corpcor = derive2 { name="corpcor"; version="1.6.9"; sha256="1hi3i9d3841snppq1ks5pd8cliq1b4rm4dpsczmfqvwksg8snkrf"; depends=[]; };
   corpora = derive2 { name="corpora"; version="0.5"; sha256="0b4yw37msx9h8hf5mjs4h10gdmc1qc2gv5bzyj1r90n4gcli042d"; depends=[]; };
+  corporaexplorer = derive2 { name="corporaexplorer"; version="0.6.2"; sha256="05dk3rb1ys3fifvscqwfgqabkbg9cxm9khd3nca7ffcwhmqbkh9g"; depends=[data_table dplyr forcats ggplot2 lubridate magrittr padr plyr RColorBrewer re2r rlang rmarkdown scales shiny shinycssloaders shinydashboard shinyjs shinyWidgets stringi stringr tibble tidyr zoo]; };
   corpus = derive2 { name="corpus"; version="0.10.0"; sha256="0c984rsnbai2qrm2s10lkdfgx31m0ax46zhl74bns2bxfmagcn3l"; depends=[utf8]; };
   corpustools = derive2 { name="corpustools"; version="0.3.3"; sha256="1hgcwnjhqfyylvqcy2j5f2k6chwyybnx38vzzvq62s6qf6p9p7by"; depends=[data_table Matrix memoise plyr R6 Rcpp SnowballC stringi udpipe wordcloud]; };
   corr2D = derive2 { name="corr2D"; version="1.0.0"; sha256="12k6vbqyb33kfj2xdg8rbydnp2yk15kv4b0m4lid4gf2lqmy3jwz"; depends=[colorspace doParallel fields foreach mmand profr rgl xtable]; };
   corrDNA = derive2 { name="corrDNA"; version="1.0.1"; sha256="1mfjrzpcb63ydyj1yxa0wd3vh4z0rdwsqv09w0a0l4l7mhb5jz2k"; depends=[mvtnorm]; };
+  corrcoverage = derive2 { name="corrcoverage"; version="1.1.0"; sha256="194fb6j8pngqwnsndjld8709hj1637mswbx7ck6m3334f196af59"; depends=[magrittr matrixStats Rcpp]; };
   correctedAUC = derive2 { name="correctedAUC"; version="0.0.3"; sha256="0c2kq7asq5mp48p8niqb84wnw4q2q2985wxbrywrhsszm9p3xspb"; depends=[ICC mnormt]; };
   corregp = derive2 { name="corregp"; version="2.0.2"; sha256="1v048dibn2x3y5mi2damcsr9i5kdig5n53g5j9gf31lqkzzjmnh3"; depends=[data_table diagram ellipse gplots rgl]; };
+  correlationfunnel = derive2 { name="correlationfunnel"; version="0.1.0"; sha256="0kg770nfr1cd31b8y8g1kx046k401lha9hbj7lq543gl7s77aw2x"; depends=[cli crayon dplyr forcats ggplot2 ggrepel magrittr plotly purrr recipes rlang rstudioapi stringr tibble tidyr]; };
   correlbinom = derive2 { name="correlbinom"; version="0.0.1"; sha256="1ix3ccxzr7vqblbda5awsva3h95b69v7kc6adz622bbi8r36xxcq"; depends=[Rmpfr]; };
   corrgram = derive2 { name="corrgram"; version="1.13"; sha256="1g5159vihsz5a2cfmg4g4i1lildn2x2wzck5sd0vml5810rxjpma"; depends=[seriation]; };
   corrplot = derive2 { name="corrplot"; version="0.84"; sha256="1k03qd8db7pwg1v318xapx5mpiypiz2n07qr19c4b45diri5xkhd"; depends=[]; };
   corrr = derive2 { name="corrr"; version="0.4.0"; sha256="0zjqkgsnwgcyi8hdskr7in0liqhpj9qml96agawzj11iy0bf6387"; depends=[dplyr ggplot2 ggrepel purrr rlang seriation tibble]; };
   corrsieve = derive2 { name="corrsieve"; version="1.6-8"; sha256="0ak3j9khcwv5rxbicck2sr260wpmd3xj254y7pdavx2fk0b72yxs"; depends=[]; };
   corset = derive2 { name="corset"; version="0.1-4"; sha256="0ladyqvkys4cldvbhkii9jwn1k5p1ym2g5bgdlz1hq1sv30ixn2f"; depends=[]; };
-  cosa = derive2 { name="cosa"; version="1.2.2"; sha256="10cfpzrccqg9i6pb2z1m57lxr7yf7bfdhvcxhmamdn1ps9mjkmlw"; depends=[nloptr]; };
+  cosa = derive2 { name="cosa"; version="2.0.0"; sha256="1ra1m75ay829xlhjax82px4ffflnfgh2mrmzzj4i8ml545d9hmgr"; depends=[msm nloptr]; };
   cosinor = derive2 { name="cosinor"; version="1.1"; sha256="02nnqg51vq48lzk667cyarnmhcf5mifnsdij7dlgqvz2k4fdq4pl"; depends=[ggplot2 shiny]; };
   cosinor2 = derive2 { name="cosinor2"; version="0.2.1"; sha256="1pp0z86fflqkkllfrzx3vj98kzxjwnawr4a2d8z5q6zhq6v5qrvf"; depends=[cosinor cowplot ggplot2 Hmisc magrittr matrixStats purrr scales stringr]; };
   cosmoFns = derive2 { name="cosmoFns"; version="1.0-1"; sha256="0a6xhbgxxnymlvicg99yhgny2lscxcbmvqmy17kxmahdi797dsg6"; depends=[]; };
   cosso = derive2 { name="cosso"; version="2.1-1"; sha256="1wyq27qak0kz4bbzynm24r5ksvb6ddd43h2ykh6m935xck16blyb"; depends=[glmnet quadprog Rglpk]; };
   costat = derive2 { name="costat"; version="2.4"; sha256="0c47bklqjgjmdglw3mi9lvygwjr5w6i1zv91ll3vpnl5dnay0692"; depends=[wavethresh]; };
   costsensitive = derive2 { name="costsensitive"; version="0.1.2.10"; sha256="192q55123yzcjjh4047ppxa3h7gk9afqnvm1nlhzs4ccqz71g411"; depends=[]; };
+  cotram = derive2 { name="cotram"; version="0.1-1"; sha256="0rjwx94gpdndpwagy2wdjdvr5b8n8qrjv9yjyxph9xw533paiz49"; depends=[basefun mlt tram variables]; };
   cotrend = derive2 { name="cotrend"; version="1.0.1"; sha256="14yzfq5a3wi26gn45mp2zm2yn6gic90csk9by66m08fgpzznz4dq"; depends=[xts]; };
   couchDB = derive2 { name="couchDB"; version="1.4.1"; sha256="1n99amvnsjp88y091603hjsvp243c5i6dbrsvdjfmzgj5dsrv70m"; depends=[bitops httr RCurl rjson]; };
   countHMM = derive2 { name="countHMM"; version="0.1.0"; sha256="12z0nz7in2msb5wa5yyjxx19ih8psw06m7xwlapvjksslippp6gs"; depends=[]; };
@@ -6163,7 +6270,7 @@ in with self; {
   coveffectsplot = derive2 { name="coveffectsplot"; version="0.0.3"; sha256="0d6s7kk38px3y8132493kksa45krmjmqc3w0c3zid4r1x35h73la"; depends=[colourpicker dplyr egg ggplot2 ggstance markdown shiny shinyjs tidyr]; };
   covequal = derive2 { name="covequal"; version="0.1.0"; sha256="1qj6djqf1rnjmnaz1nryj9dc104082w258dzjjp5q18gg1ck8v0c"; depends=[corpcor RMTstat]; };
   covfefe = derive2 { name="covfefe"; version="0.1.0"; sha256="178qc77y4bn04qad3g70wr8y4v0ggyg807w67m8wvhbcxqr8yq7c"; depends=[tokenizers]; };
-  covr = derive2 { name="covr"; version="3.2.1"; sha256="187hvqp7mvxy3hl00fgw56sm93yrz81fwixf652arr0ih2jdm47a"; depends=[crayon digest httr jsonlite rex withr]; };
+  covr = derive2 { name="covr"; version="3.3.1"; sha256="0fvd7v53w11x6kaw61hbml8n1j2ck9l2fv2wvqdsg689xic9rqcs"; depends=[crayon digest httr jsonlite rex withr yaml]; };
   covreg = derive2 { name="covreg"; version="1.0"; sha256="0v19yhknklmgl58zhvg4szznb374cdh65i7s8pcj2nwrarycwzaq"; depends=[]; };
   covsep = derive2 { name="covsep"; version="1.1.0"; sha256="19dvwhl85yx9ddwxvnq5sdd534s6llcw61gckrav48hq49x1bqld"; depends=[mvtnorm]; };
   cowbell = derive2 { name="cowbell"; version="0.1.0"; sha256="1zz0g30zvqfk5lh09y90iq3s7x2wwbs852i3d56mfp926gxdxc2y"; depends=[ggplot2 misc3d rgl]; };
@@ -6172,6 +6279,7 @@ in with self; {
   coxed = derive2 { name="coxed"; version="0.3.0"; sha256="01fwkw6ba8zj09a7mzm7rja188rapd6knwjq247pm4panqih8m5l"; depends=[dplyr ggplot2 gridExtra mgcv PermAlgo rms survival tidyr]; };
   coxinterval = derive2 { name="coxinterval"; version="1.2"; sha256="0vb7vmzbb2dsihx04jbp2yvzcr033g435mywmwimqhfqdrmjx3fi"; depends=[Matrix survival timereg]; };
   coxme = derive2 { name="coxme"; version="2.2-14"; sha256="0pcmf44c3v1hvr8031lwgib58j6la5hsphsbc57mcgz09ppw30zg"; depends=[bdsmatrix Matrix nlme survival]; };
+  coxmeg = derive2 { name="coxmeg"; version="1.0.7"; sha256="0mgjipbaa8qm23gyndi4x1pllzrkvfs5lnlifk6mya5vgkxxzm3g"; depends=[coxme knitcitations MASS Matrix matrixcalc nloptr rARPACK Rcpp RcppEigen SNPRelate]; };
   coxphMIC = derive2 { name="coxphMIC"; version="0.1.0"; sha256="0lmma5wzcczr762xqa4yamvwvyviqxk8gdrps3sydg3n14hckp6d"; depends=[numDeriv survival]; };
   coxphSGD = derive2 { name="coxphSGD"; version="0.2.1"; sha256="17ga33v7a89dsygk5yypkz03x7dvjhibnwlvwfvgb2p7djd8w465"; depends=[survival]; };
   coxphf = derive2 { name="coxphf"; version="1.13"; sha256="16bman8xv5xx7gg8s54sj3hc4isqxk4h3q93h4q3h3j0bdvww2yy"; depends=[survival]; };
@@ -6189,7 +6297,7 @@ in with self; {
   cplm = derive2 { name="cplm"; version="0.7-8"; sha256="0gvl3xwqbyqgqd42l97ryy8qsf23njqfgvc16w21124s77wsixaw"; depends=[biglm coda ggplot2 Matrix minqa nlme reshape2 statmod tweedie]; };
   cplots = derive2 { name="cplots"; version="0.4-0"; sha256="1k4kazw7lw2d991brnzhma6qvg8kwslrbi9q4gy61x02wcig927n"; depends=[circular]; };
   cpm = derive2 { name="cpm"; version="2.2"; sha256="1n1iqhalp99mbh8jha0pv759fb97sqxdiiq9bxy3wm6aqmssvdb1"; depends=[]; };
-  cppRouting = derive2 { name="cppRouting"; version="1.1"; sha256="098pldb1lld6i0v1nhnmaysns92znm66d55i9a8dixhw8bq0n4m2"; depends=[Rcpp]; };
+  cppRouting = derive2 { name="cppRouting"; version="1.2"; sha256="14h23wk7r3xr34mscp4dgc6i2vj4n810wgb4186qfym43rwzq5r2"; depends=[Rcpp]; };
   cpr = derive2 { name="cpr"; version="0.2.3"; sha256="1a2lza1bw74xzrs17a9gr9mnpvnnrykhwd73yqi63wp3k4sm42rb"; depends=[dplyr ggplot2 lazyeval lme4 magrittr plot3D Rcpp RcppArmadillo rgl tibble tidyr]; };
   cprr = derive2 { name="cprr"; version="0.2.0"; sha256="049xnma0rdnya7zp05iraq15nwjgmdmli9g7xxprab822047vld7"; depends=[]; };
   cpsurvsim = derive2 { name="cpsurvsim"; version="1.1.0"; sha256="1ywxzn20nx13yq9570farivfqn8i9ap6hz5szy2xm6g6pf2i8p4z"; depends=[Hmisc knitr plyr]; };
@@ -6209,9 +6317,9 @@ in with self; {
   crawl = derive2 { name="crawl"; version="2.2.1"; sha256="18mr7vp72jj5msj9mbq45jy3f6qhn45azsmkq07i2d30gwdj0c3a"; depends=[dplyr gdistance lubridate magrittr mvtnorm purrr raster Rcpp RcppArmadillo rmapshaper sf shiny sp tibble]; };
   crayon = derive2 { name="crayon"; version="1.3.4"; sha256="0s7s6vc3ww8pzanpjisym4jjvwcc5pi2qg8srx7jqlz9j3wrnvpw"; depends=[]; };
   crblocks = derive2 { name="crblocks"; version="1.0-0"; sha256="0y101kgi7ryjv18fyjp0ralp4qj7kgshmbd4mf7n3hdjay0znss5"; depends=[]; };
-  crch = derive2 { name="crch"; version="1.0-3"; sha256="0f1kby790symj5r3z1dhmnzjs6xbfirsbkzapkmn1hs8i5la2rqr"; depends=[Formula ordinal sandwich scoringRules]; };
+  crch = derive2 { name="crch"; version="1.0-4"; sha256="18qjvh1lkw1f6rrhnb21f30xxrcq8whbs3x1jgkw6q14rf1483ri"; depends=[Formula ordinal sandwich scoringRules]; };
   credentials = derive2 { name="credentials"; version="1.1"; sha256="0izwskymymkxdwsdj7zapqpkc6g37c0m6c2na0y00s1kwr73d2qd"; depends=[askpass curl jsonlite openssl sys]; };
-  creditmodel = derive2 { name="creditmodel"; version="1.1.1"; sha256="06nxbvwlg0j7z3x31jm767faqdfnppbzxzsn3razv35s69sq1k83"; depends=[car data_table doParallel dplyr foreach gbm ggcorrplot ggplot2 glmnet gridExtra pmml randomForest rpart sqldf stringr xgboost XML]; };
+  creditmodel = derive2 { name="creditmodel"; version="1.1.4"; sha256="1vk7y3xc3wjaq7yba2pa4llb3zqrqxgy0b0wa3qc50ncg61n7r2m"; depends=[cli data_table doParallel dplyr foreach gbm ggplot2 glmnet pdp randomForest rpart xgboost]; };
   credsubs = derive2 { name="credsubs"; version="1.0.1"; sha256="0n3684fxknvvs57g2vjqykgdjfbpl6242nd23sm9nv2fn57q8k2c"; depends=[]; };
   credule = derive2 { name="credule"; version="0.1.3"; sha256="1vciqkxkf93z067plipvhbks9k9sfqink5rhifzbnwc2c5gxp5mx"; depends=[]; };
   cregg = derive2 { name="cregg"; version="0.3.0"; sha256="08dhn4i5i27zw3ayqp7lkw5z8dzckv8fhflpvz0mphax34pm3z72"; depends=[ggplot2 ggstance lmtest sandwich scales survey]; };
@@ -6228,7 +6336,7 @@ in with self; {
   crochet = derive2 { name="crochet"; version="2.2.0"; sha256="1cbv79nyycxk6f8ldcsnn2pvgxqlnrj0qs19nhafnq2clxy863k6"; depends=[]; };
   cromwellDashboard = derive2 { name="cromwellDashboard"; version="0.5.1"; sha256="0d57c1wdd1ds9fr7p256la63qbv8mirljgrvl1k8fp5gcnkps5wb"; depends=[dplyr DT httr shiny shinydashboard stringr]; };
   cronR = derive2 { name="cronR"; version="0.4.0"; sha256="0ydlwhlzb57vbr8ya6hdsw2mhsjkb01jspn0jw081anrxfy5m2jw"; depends=[digest]; };
-  crone = derive2 { name="crone"; version="0.1.0"; sha256="02k9n6ajfgxkpkssac788dvr4fwjakggh9dim9dzmw2nvir23cc8"; depends=[]; };
+  crone = derive2 { name="crone"; version="0.1.1"; sha256="03qznxml940rl3kfxy4jkg9nsx9ss0gf2ck0ry000xglw6rm2s42"; depends=[]; };
   crop = derive2 { name="crop"; version="0.0-2"; sha256="1yjpk7584wrz9hjqs21irjnrlnahjg8lajra9yfdp6r927iimg1l"; depends=[]; };
   cropdatape = derive2 { name="cropdatape"; version="1.0.0"; sha256="19bn0apx4p8hnz388zg7sq59qv89vv8k5php317kcv7ai2k2gh34"; depends=[]; };
   crossReg = derive2 { name="crossReg"; version="1.0"; sha256="1866jhfnksv9rk89vw7w4gaxi76bxfjvqxx7cfa8nlrcsmaqd7rf"; depends=[]; };
@@ -6247,7 +6355,7 @@ in with self; {
   crrp = derive2 { name="crrp"; version="1.0"; sha256="1fq54jr6avrli91a4z1hp5img4kghyw1yvjr5xyccsanf9i35x8r"; depends=[cmprsk Matrix survival]; };
   crrstep = derive2 { name="crrstep"; version="2015-2.1"; sha256="03vd97prws9gxc7iv3jfzffvlrzhjh0g6kyvclrf87gdnwifyn1z"; depends=[cmprsk]; };
   crs = derive2 { name="crs"; version="0.15-31"; sha256="0h8hhxnyy8lf7jpnvriaa5dn3zgp1yqhfrnc5rpjlzsx2lnyyv9r"; depends=[boot np quantreg rgl]; };
-  crseEventStudy = derive2 { name="crseEventStudy"; version="1.1"; sha256="0xq8shwdiri8v35s016g1wfpgbpal4j8psazgwmi9h220rh5b6p5"; depends=[sandwich]; };
+  crseEventStudy = derive2 { name="crseEventStudy"; version="1.2"; sha256="1fgjj78p54fk0bkvx0fq1h7c5j4c64g10cdjzmmqhhxlyjwp5z7y"; depends=[sandwich]; };
   crskdiag = derive2 { name="crskdiag"; version="1.0.1"; sha256="0100wbyvchx6jwlrwc6rwhdjanips5c0f5zqzs2c0dgwygpqw30w"; depends=[cmprsk]; };
   crsnls = derive2 { name="crsnls"; version="0.2"; sha256="0rv0xrdl9ix6bhaf554gma8zf923w47f8j1dkbs8g6xjqjr1c40a"; depends=[]; };
   crso = derive2 { name="crso"; version="0.1.1"; sha256="1r10vz8z5y52a5v5phw22fhqwv9p7g66xfsx0906bcx74dn3f2b3"; depends=[foreach]; };
@@ -6282,19 +6390,20 @@ in with self; {
   ctrdata = derive2 { name="ctrdata"; version="0.18.2"; sha256="1nnqfg7x6wq5lzb4xxb52fb8ljxgnbwswfywv1d4ibcn7m5y0947"; depends=[clipr curl httr jsonlite mongolite rvest xml2]; };
   ctrlGene = derive2 { name="ctrlGene"; version="1.0.1"; sha256="0x7j11v7jj4k1jml6lrnjq79awhrvsm3pig1yxsd337jlfml3ra9"; depends=[psych]; };
   cts = derive2 { name="cts"; version="1.0-22"; sha256="0kcbppfsx1hvnsz6nmj8frrqrglcr6cmasd1ma34qkqb9f6q0xry"; depends=[]; };
-  ctsem = derive2 { name="ctsem"; version="3.0.0"; sha256="1w8rw7wsgv6vdc1mvpan4yz0rx4nnrizv7n4371pkrnx1j7vj23j"; depends=[BH cOde data_table Deriv ggplot2 MASS Matrix mize mvtnorm OpenMx pkgbuild plyr Rcpp RcppEigen rstan rstantools StanHeaders]; };
+  ctsem = derive2 { name="ctsem"; version="3.0.4"; sha256="0q21xf7f1njjdlvvwbp1nls18phrhdi67s2xwb2qhj078qra7zwb"; depends=[BH cOde data_table Deriv ggplot2 MASS Matrix mize mvtnorm OpenMx pkgbuild plyr Rcpp RcppEigen rstan rstantools StanHeaders]; };
   ctv = derive2 { name="ctv"; version="0.8-5"; sha256="0kl6z8dbbjgm29q0c5xy6lihjgf5cdihrllm27x0zbcvy8lyl51p"; depends=[]; };
   cubature = derive2 { name="cubature"; version="2.0.3"; sha256="0wvs80i4axj7pdcy9gjl08qzjbcjkldha94xy4gdxc34vgmh7gvr"; depends=[Rcpp]; };
-  cubeview = derive2 { name="cubeview"; version="0.1.0"; sha256="1gy023qnkxmkfmcrihjlwd504z7n3c4a8baxa2wkz0l45pf4y2c1"; depends=[base64enc htmltools htmlwidgets lattice raster viridisLite]; };
+  cubeview = derive2 { name="cubeview"; version="0.2.0"; sha256="1352hi2j9x9rx4iy3xvsca86nsh39x1vnymd17f5qc8c3plfm8db"; depends=[base64enc htmltools htmlwidgets lattice raster stars viridisLite]; };
   cubfits = derive2 { name="cubfits"; version="0.1-3"; sha256="0i2iybm9vpyqnahzka66yms1namdd36bz1i1yjy74qsc1h995rga"; depends=[coda foreach]; };
   cubing = derive2 { name="cubing"; version="1.0-5"; sha256="1q23fplvklaaldicqic0zpnh301m08zb9k21l47zj47g9m9pj4bc"; depends=[rgl]; };
   cultevo = derive2 { name="cultevo"; version="1.0.2"; sha256="0rmncp4mrdpf3izhhqn9406i36j3d3d7i8cglip04lkfbypl9jvy"; depends=[combinat Hmisc pspearman stringi]; };
   cumSeg = derive2 { name="cumSeg"; version="1.2"; sha256="0ix8g3w04n799pppyhyd365bdx9cwrgn7k7qljs1fdiq8s135wzk"; depends=[lars]; };
   cumplyr = derive2 { name="cumplyr"; version="0.1-1"; sha256="07sz1wryl3kxbk67qyvnkrkdrp4virlsaia0y6rf9bqdw7rc6vi2"; depends=[]; };
   cumstats = derive2 { name="cumstats"; version="1.0"; sha256="119w751z9dg6pjyk389pbl8ab8pirf9sqndi4nxi89ix2bby4xz8"; depends=[]; };
-  curl = derive2 { name="curl"; version="4.0"; sha256="0wb1j87fa2nd4a9x1w2nmc453nzvx6qiq8dviwc4jr36hsf9ra89"; depends=[]; };
+  curl = derive2 { name="curl"; version="4.2"; sha256="0xh227gvb056wlipjxxbf555z1i1qcs7rr1igvs6k6645y9irrlp"; depends=[]; };
   currentSurvival = derive2 { name="currentSurvival"; version="1.0"; sha256="0bqpfwf4v4pb024a98qwg81m6zd7ljg1ps42ifhxpqx7b9gdyi6c"; depends=[cmprsk survival]; };
   curry = derive2 { name="curry"; version="0.1.1"; sha256="1ps9hvbnb02m0b8hlw4admwbziyjvswj08ldi2dk3ymnrpawcc29"; depends=[]; };
+  cursory = derive2 { name="cursory"; version="1.0.0"; sha256="0jyfp0i43fxh91n4s8r54hnzmq1y037176c8bv2q3fqjm1adibxy"; depends=[dplyr pkgcond purrr rlang tibble tidymargins tidyr tidyselect]; };
   curstatCI = derive2 { name="curstatCI"; version="0.1.1"; sha256="0igqdv0fzzji10gz3j3ir8qxpy7vdjfl137067rc28qzbrl2sy2c"; depends=[Rcpp]; };
   curvHDR = derive2 { name="curvHDR"; version="1.2-1"; sha256="1a6b29kklyphv9iirm8xaxcdfcssk7ah4wm9ll53ls0alnzb15nw"; depends=[feature geometry hdrcde KernSmooth ks misc3d ptinpoly rgl]; };
   curveDepth = derive2 { name="curveDepth"; version="0.1.0.9"; sha256="10mhy2nyll4d1q71qnlsal0raccz3awd0j0vi5w58di9wlv1c241"; depends=[ddalpha Rcpp RcppArmadillo]; };
@@ -6303,18 +6412,19 @@ in with self; {
   customLayout = derive2 { name="customLayout"; version="0.3.0"; sha256="0zarqsdcjy8cymwrb6648nil509q9rhmp4633sidmmjclpyjca2q"; depends=[assertthat flextable gridExtra officer RColorBrewer rvg]; };
   customizedTraining = derive2 { name="customizedTraining"; version="1.2"; sha256="0kjp22bzv7a3xynhm9xmabfcms21586p8caz1nk1w88qdvidqfqd"; depends=[FNN glmnet]; };
   customsteps = derive2 { name="customsteps"; version="0.7.1.0"; sha256="1v6ks8j1mj623yai515xnrpx60hvilbrsn59r3zw30n68555cvw8"; depends=[dplyr generics magrittr purrr recipes rlang tibble tidyselect]; };
-  cusum = derive2 { name="cusum"; version="0.3.0"; sha256="1vw23q5y4m2pc2kc3c1dk7cajzhrgsiz0bycb8zl7v9swyk642lp"; depends=[checkmate data_table Rcpp]; };
+  cusum = derive2 { name="cusum"; version="0.4.1"; sha256="0vjq3slkjdgls41xm637xkrg8jhv6y75xiyfcgpwrp32ixmakpcd"; depends=[checkmate data_table Rcpp]; };
   cutoffR = derive2 { name="cutoffR"; version="1.0"; sha256="1801jylmpp4msyf07rhg4153kky1zvi4v0kkjb9d51dc7zkhh531"; depends=[ggplot2 reshape2]; };
-  cutpointr = derive2 { name="cutpointr"; version="0.7.6"; sha256="0mwpl807h8mdzlw710jngwimwgq4hns79mv2pd5lh36pd9s5qx6b"; depends=[dplyr foreach ggplot2 gridExtra purrr Rcpp rlang tibble tidyr]; };
+  cutpointr = derive2 { name="cutpointr"; version="1.0.0"; sha256="043gl2vr166cr0l7a33grya3cvg2ligsaimw43f3g5l4y2nsndj4"; depends=[dplyr foreach ggplot2 gridExtra purrr Rcpp rlang tibble tidyr]; };
   cuttlefish_model = derive2 { name="cuttlefish.model"; version="1.0"; sha256="1rmkfyfd1323g2ymd5gi1aksp160cwy5ha5cjqh5r6fzd8hhqjxs"; depends=[]; };
   cvAUC = derive2 { name="cvAUC"; version="1.1.0"; sha256="13bk97l5nn97h85iz93zxazhr63n21nwyrpnl856as9qp59yvn64"; depends=[data_table ROCR]; };
   cvGEE = derive2 { name="cvGEE"; version="0.3-0"; sha256="085qjm520l2441nakfxy851s6bfy5832b5fy54z5fp4xr1jn6snm"; depends=[]; };
   cvTools = derive2 { name="cvTools"; version="0.3.2"; sha256="0b7xb6dmhqbvz32zyfbdvm9zjyc59snic6wp1r21ina48hchn3sj"; depends=[lattice robustbase]; };
   cvar = derive2 { name="cvar"; version="0.4-0"; sha256="1rfsmw2a639pkj8l5g2xm6z48jrxsywbysk7c0czpdvrh4h9h84f"; depends=[fGarch gbutils Rdpack]; };
+  cvcqv = derive2 { name="cvcqv"; version="1.0.0"; sha256="0327r4jw6m4avcz1zvdkxszqwaw2s9sh1i1jagl6aggd7aaiiyg0"; depends=[boot dplyr MBESS R6 SciViews]; };
   cvcrand = derive2 { name="cvcrand"; version="0.0.4"; sha256="1150vn753m95gpc1clyf4xzzgwmnzdh83prw8a3ikps0l6grvrps"; depends=[tableone]; };
   cvequality = derive2 { name="cvequality"; version="0.2.0"; sha256="1im839vzfqylphp2vr20avnzkyl02n88fngbs63d4ik7c72d9992"; depends=[]; };
   cvmgof = derive2 { name="cvmgof"; version="1.0.0"; sha256="0rnd7icqjprhbpmn383ah4fi5nz0hmg88fa612fmivkvnpn79v6j"; depends=[lattice]; };
-  cvms = derive2 { name="cvms"; version="0.1.1"; sha256="11kszmhibds0axy0ha78bc6y1bwj19k93zirfp7a00c5hwvd3jnf"; depends=[AICcmodavg broom caret data_table dplyr ggplot2 lme4 mltools MuMIn plyr pROC purrr rlang stringr tibble tidyr]; };
+  cvms = derive2 { name="cvms"; version="0.3.1"; sha256="0916wzyh4rg3m2visnm8nc9qsab6rj4xvwyc3jqryciw2a10c59n"; depends=[broom caret data_table dplyr ggplot2 lifecycle lme4 mltools MuMIn plyr pROC purrr rlang stringr tibble tidyr]; };
   cvq2 = derive2 { name="cvq2"; version="1.2.0"; sha256="19k95xg2y3wd4mx3wvbrc1invybd446g13vsp3dv05nw2kx4f6w8"; depends=[]; };
   cvxbiclustr = derive2 { name="cvxbiclustr"; version="0.0.1"; sha256="00k75zy8v6qd5fg0h258i5z8ljjkfgkxz45cspysl1ap89d5n7df"; depends=[igraph Matrix]; };
   cvxclustr = derive2 { name="cvxclustr"; version="1.1.1"; sha256="0idmx4wgz4d0b1xzmlq5bsk2f2q38lpf9c117hg97xsfndzn7vqj"; depends=[igraph Matrix]; };
@@ -6322,6 +6432,7 @@ in with self; {
   cwm = derive2 { name="cwm"; version="0.0.3"; sha256="1ln2l12whjhc2gx38hkf3xx26w5vz7m377kv67irh6rrywqqsyxn"; depends=[MASS matlab permute]; };
   cxhull = derive2 { name="cxhull"; version="0.2.0"; sha256="1m03ym83ghgmb0j14aihfj6divmnr13f5s9jwknicjsxz3p3divk"; depends=[]; };
   cxxfunplus = derive2 { name="cxxfunplus"; version="1.0"; sha256="0kyy5shgkn7wikjdqrxlbpfl3zkkv4v1p8a1vv0xkncwarjs4n8d"; depends=[inline]; };
+  cyanoFilter = derive2 { name="cyanoFilter"; version="0.1.1"; sha256="1fgmh9138zwajply3namh4wnq5z29w9khajf9hna7pg2p6ks8vby"; depends=[Biobase flowCore flowDensity RColorBrewer Rdpack stringr]; };
   cycleRtools = derive2 { name="cycleRtools"; version="1.1.1"; sha256="1l7w2lm4s149ndd85v41pkdrdig6l3nmhl14bdx56aw8q57fxmb0"; depends=[Rcpp xml2]; };
   cyclestreets = derive2 { name="cyclestreets"; version="0.1.5"; sha256="1wvg43wrnh0lz2pkkrbidzdsrkypdl2r4ccs9jhdsj8ixm158dvf"; depends=[httr jsonlite magrittr sf stringr]; };
   cyclocomp = derive2 { name="cyclocomp"; version="1.1.0"; sha256="0gky3svk02wiajw7nfjh30684h3qxili4bvsab0m7b6cggw6bgyd"; depends=[callr crayon desc remotes withr]; };
@@ -6332,20 +6443,20 @@ in with self; {
   cystiSim = derive2 { name="cystiSim"; version="0.1.0"; sha256="0pz8jxi4lgcwzrb4dh8xn63xhpaga5rzg5hwqicwv8isc16iqizd"; depends=[ggplot2 knitr magrittr]; };
   cytoDiv = derive2 { name="cytoDiv"; version="0.5-3"; sha256="00c0gqgypywgbhavb15bvj6ijrk4b5zk86w85n9kwr4069b7jvwc"; depends=[GenKern plotrix]; };
   cytofan = derive2 { name="cytofan"; version="0.1.0"; sha256="0gqs98mnwiawnyfb9hs5nlin8d1fj64bszn4b40gs8ajyh36r9pp"; depends=[ggplot2 RColorBrewer]; };
-  cytometree = derive2 { name="cytometree"; version="1.3.0"; sha256="031dzyah0xlgp2rrkardpvl8l7f3w4pzqb2i1yv707yj7y4yajhj"; depends=[cowplot ggplot2 igraph mclust Rcpp RcppArmadillo robustbase]; };
+  cytometree = derive2 { name="cytometree"; version="2.0.0"; sha256="1amyqnzaz8pb74s30dg1kgqnmwi66yx88cwai9x82pl9h2mcc9ki"; depends=[cowplot ggplot2 GoFKernel igraph mclust Rcpp RcppArmadillo]; };
   d3Network = derive2 { name="d3Network"; version="0.5.2.1"; sha256="1gh979z9wksyxxxdzlfzibn0ysvf6h1ij7vwpd55fvbwr308syaw"; depends=[plyr rjson whisker]; };
   d3Tree = derive2 { name="d3Tree"; version="0.2.0"; sha256="0xjr36hdd00dy8s8z1a1s44dn2wg0nm6yqc1rri2l0dqrbh4nrbn"; depends=[dplyr htmlwidgets magrittr plyr stringr]; };
   d3heatmap = derive2 { name="d3heatmap"; version="0.6.1.2"; sha256="1ici8j0wzzklhmw94qlxm292qs562vc32wq8mnjsas2n1p35vkmk"; depends=[base64enc dendextend htmlwidgets png scales]; };
   d3plus = derive2 { name="d3plus"; version="0.1.0"; sha256="0kadz83pals03n0v3zqhmhf6visigk52yn58xckhb57fid4xzj5w"; depends=[htmlwidgets magrittr]; };
-  d3r = derive2 { name="d3r"; version="0.8.6"; sha256="0vcmiyhd000xyl28k6rm7ba50x5sz5b2cpllxnq36q13qhdnqw6k"; depends=[dplyr htmltools tidyr]; };
+  d3r = derive2 { name="d3r"; version="0.8.7"; sha256="0xl3im76lp7pd5lhp8jfyqdm4j4zvjrx5a5fl81xv2cf7x3n4f2a"; depends=[dplyr htmltools tidyr]; };
   dChipIO = derive2 { name="dChipIO"; version="0.1.5"; sha256="1xrafw5h071d8rfqaic3gifc80jpiddjz5x6l2cr8kgjvph60gqh"; depends=[]; };
   dCovTS = derive2 { name="dCovTS"; version="1.1"; sha256="1pd50nfmfcqpi8zj20ngl0hc23qa4rabqhc1xci3ivyhs0valhsl"; depends=[doParallel energy foreach]; };
   dGAselID = derive2 { name="dGAselID"; version="1.2"; sha256="0da7fi872i3ycb3j5v4isr4x2z39a68w4mdq859zslmqhiqd43b6"; depends=[ALL Biobase genefilter MLInterfaces]; };
   dHSIC = derive2 { name="dHSIC"; version="2.1"; sha256="1c1xz1f1fp937w4rlylvqv3ii0p9dafvmn4fqq8rzxhcg5rn9j4l"; depends=[Rcpp]; };
-  dLagM = derive2 { name="dLagM"; version="1.0.15"; sha256="188hm82f6g0n3asj560kbxlqbhikvnn4a375ph1kd13zdijjyj3i"; depends=[AER dynlm formula_tools lmtest nardl plyr strucchange wavethresh]; };
+  dLagM = derive2 { name="dLagM"; version="1.0.17"; sha256="01jm0y4br86iznlr8mpvvfwz12rqipwyy3adlic97mr401845bqq"; depends=[AER dynlm formula_tools lmtest MASS nardl plyr roll strucchange wavethresh]; };
   dMod = derive2 { name="dMod"; version="1.0.0"; sha256="1mj2a9hpfldxbsiggi27nz3w0klp7qwpplpwh4bi9ik25vll25a0"; depends=[cOde deSolve doParallel dplyr foreach ggplot2 plyr rootSolve stringr]; };
   dSVA = derive2 { name="dSVA"; version="1.0"; sha256="0vy0flyg82x0n9vw6jf9f76qy84sp0wnis91faj37ac5hdv3pvsb"; depends=[sva]; };
-  daarem = derive2 { name="daarem"; version="0.3"; sha256="006sm1npxi812x3yd8cnd1hrz85j44wn5vz3kid8hw5yxm10l6nn"; depends=[]; };
+  daarem = derive2 { name="daarem"; version="0.4"; sha256="00gcy23yzwsfxvys7hncgshma73df0wzwnxgwvccppn3z213sg50"; depends=[]; };
   dabestr = derive2 { name="dabestr"; version="0.2.2"; sha256="10vzp28bx4vf9jc3l9jjw94wir75j8h60lcncafbdwvxjh5alpfs"; depends=[boot cowplot dplyr ellipsis forcats ggbeeswarm ggforce ggplot2 magrittr rlang simpleboot stringr tibble tidyr]; };
   dad = derive2 { name="dad"; version="3.3.0"; sha256="1154jk4j1h5wr3c68pj0slh90jxccia28wpmygn9mz0mlvx9km9l"; depends=[DescTools e1071 lattice]; };
   dae = derive2 { name="dae"; version="3.0-32"; sha256="0syv6kjnicb0x7sxbaavxhiv9mcqvc2zzbf4wyar933q3hzrxnrd"; depends=[ggplot2 plyr]; };
@@ -6366,7 +6477,7 @@ in with self; {
   darts = derive2 { name="darts"; version="1.0"; sha256="07i5349s335jaags352mdx8chf47ay41q7b0mh2xjwn2h9kzgqib"; depends=[]; };
   dashboard = derive2 { name="dashboard"; version="0.1.0"; sha256="1znqwvz49r47lp6q48qaas0s63wclgybav82a247qvcavzns3kip"; depends=[Rook]; };
   dat = derive2 { name="dat"; version="0.4.0"; sha256="1nw16hsw9b4hpcl5rqrlw6yk9y2h1pd0ra1c7iz82sknkyd5afi6"; depends=[aoos data_table dplyr Formula magrittr progress tibble]; };
-  data_table = derive2 { name="data.table"; version="1.12.2"; sha256="1x929lwhai6nkppm4zvicyw5qh5va5sizp86r30qnfkh1n7w2mfv"; depends=[]; };
+  data_table = derive2 { name="data.table"; version="1.12.4"; sha256="0zdcbr4nixvl8ga4mp9pw1dfww35dzhzpb6ixajqasiri824m7i9"; depends=[]; };
   data_tree = derive2 { name="data.tree"; version="0.7.8"; sha256="05svd1h70dn92imadw2djqqvchx30md74d4z6a00grkajj16cchb"; depends=[DiagrammeR R6 stringr]; };
   data_world = derive2 { name="data.world"; version="1.2.2"; sha256="1d9hh4965f2d0lwh2xxhnxzc948ailkjzdax3d3z9l8lakqfrx0h"; depends=[dwapi httr ini miniUI shiny stringi]; };
   dataCompareR = derive2 { name="dataCompareR"; version="0.1.2"; sha256="0n10dqnrlpwafxys68b3ly156235lhqby71qay0vb0r6bvl2g349"; depends=[dplyr knitr markdown stringi]; };
@@ -6391,7 +6502,7 @@ in with self; {
   datapackage_r = derive2 { name="datapackage.r"; version="0.1.1"; sha256="1f5mm3cb2yz3dzxj26pp7w1rb8jccyj7zjl602d3mcfxc9d99643"; depends=[config future httr iterators jsonlite jsonvalidate purrr R_utils R6 readr rlist stringr tableschema_r urltools V8]; };
   datapasta = derive2 { name="datapasta"; version="3.0.0"; sha256="022ci7iy683lh3fh13a4b3szzqp6j4fchil695bifhi0a34bnxyr"; depends=[clipr readr rstudioapi]; };
   datarium = derive2 { name="datarium"; version="0.1.0"; sha256="1v98yxsxhfqlalz5qy3x5axb7fy067vf3y0qg7ngixphmy9qybym"; depends=[]; };
-  datarobot = derive2 { name="datarobot"; version="2.14.1"; sha256="1k5rrwhbxa7x8j6mr35f7245ljxnvs219f2zhi5di4iljzy4phvy"; depends=[curl httr jsonlite yaml]; };
+  datarobot = derive2 { name="datarobot"; version="2.14.2"; sha256="0vjka8sdn4ywxwwf6jwrsjp2c17gx7lz62cgqbp3l2ry7jx4acfd"; depends=[curl httr jsonlite yaml]; };
   datasauRus = derive2 { name="datasauRus"; version="0.1.4"; sha256="1w1yhwwrmh95bklacz44wjwynxd8cj3z8b9zvsnzmk18m5a4k0fl"; depends=[]; };
   dataseries = derive2 { name="dataseries"; version="0.2.0"; sha256="11wc2p5m8qbdmkpbd21lpwl28a1dpab88c3gqyrhsn0298lpnip4"; depends=[]; };
   datasets_load = derive2 { name="datasets.load"; version="0.3.0"; sha256="13ywnqln831i5hlf1cpqcyc77blg99w8jvy8jic17z86fjxh4gim"; depends=[DT miniUI shiny]; };
@@ -6405,7 +6516,7 @@ in with self; {
   datetime = derive2 { name="datetime"; version="0.1.4"; sha256="0nn1yxknsn3crmwbkws5kvfjhd65dw0fkfbg67gba0dyaqp1jg37"; depends=[]; };
   datetimeutils = derive2 { name="datetimeutils"; version="0.3-0"; sha256="1f63vzinj39pf85bw9xa4szkwmy4d4rxxnqm1jd396ywppgxzn7c"; depends=[]; };
   datoramar = derive2 { name="datoramar"; version="0.1.0"; sha256="0zq6vhq6dmsyagmqrmb85z6fy9qhwra3s3iasr3jgc4ryr009pml"; depends=[httr jsonlite tibble]; };
-  datos = derive2 { name="datos"; version="0.1.0"; sha256="01pfvdz9vy4dqjb90j8bz39nvnk5ql6yags1nip4049999w1lswk"; depends=[tibble yaml]; };
+  datos = derive2 { name="datos"; version="0.2.0"; sha256="0ndwgqh8jvnl328k4zg2mn8j6nvz9526jk6h10y676v2pffcfgvw"; depends=[dplyr rlang yaml]; };
   datr = derive2 { name="datr"; version="0.1.0"; sha256="0sqwhn6zdaq8i45ry207mpbda1djjaxp9mcn13hi5wkry6z0bmlr"; depends=[devtools]; };
   datrProfile = derive2 { name="datrProfile"; version="0.1.0"; sha256="1bhyk3xjgwf92i765z3bkdnzkxg8fshriz9r6m371q1c75xysfil"; depends=[dplyr odbc RSQLite]; };
   dave = derive2 { name="dave"; version="2.0"; sha256="1rraphpp34czyjj15xzvj1ihlnqzcppqls9n2g85n49zv0n1ngn8"; depends=[cluster labdsv nnet tree vegan]; };
@@ -6414,21 +6525,23 @@ in with self; {
   dbConnect = derive2 { name="dbConnect"; version="1.0"; sha256="1vab5l4cah5vgq6a1b9ywx7abwlsk0kjx8vb3ha03hylcx546w42"; depends=[gWidgets RMySQL]; };
   dbEmpLikeGOF = derive2 { name="dbEmpLikeGOF"; version="1.2.4"; sha256="0vhpcxy702cp3lvlif2fzmvccys8iy7bv1fbg6ki2l8bvn2f7c5p"; depends=[]; };
   dbEmpLikeNorm = derive2 { name="dbEmpLikeNorm"; version="1.0.0"; sha256="0h5r2mqgallxf9hin64771qqn9ilgk1kpsjsdj2dqfl3m8zg967l"; depends=[dbEmpLikeGOF]; };
+  dbarts = derive2 { name="dbarts"; version="0.9-13"; sha256="1i9f1nc1ky6bav639x6kgszy91986q2m64147icdiv4diijzdcfx"; depends=[]; };
   dbfaker = derive2 { name="dbfaker"; version="0.1.0"; sha256="00n2z4q5drpg26pw826i16rg07m7w66a0r466q2lrl14hxs4rcaq"; depends=[assertive DBI dplyr foreach parsedate RPostgreSQL tidyr]; };
-  dbhydroR = derive2 { name="dbhydroR"; version="0.2-7"; sha256="1yp3n8hw2dc1ar3nz5k5zvj7s8f1bjckxrd0jnbxv73il75gx4k0"; depends=[httr reshape2 XML]; };
+  dbflobr = derive2 { name="dbflobr"; version="0.0.1"; sha256="1j97gwmqr8mv05yfd1dxm0v3l0vxrjrqf0drvkms2nja5asbhinq"; depends=[checkr DBI flobr glue RSQLite]; };
   dblcens = derive2 { name="dblcens"; version="1.1.7"; sha256="02639vyaqg7jpxih8cljc8snijb78bb084f4j3ns6byd09xbdwcw"; depends=[]; };
   dblr = derive2 { name="dblr"; version="0.1.0"; sha256="0wzmhmp706mw0pkh81nsb7qzclwyhm6f2mjvpvz043ng5xrxwvvw"; depends=[CatEncoders data_table Metrics xgboost]; };
   dbmss = derive2 { name="dbmss"; version="2.7-0"; sha256="0fhvbn5v4b5n447hwljdzwfb68bpmrskwd7ni1vpqwcbix903rm4"; depends=[cubature ggplot2 Rcpp RcppParallel reshape2 spatstat spatstat_utils]; };
-  dbparser = derive2 { name="dbparser"; version="1.0.3"; sha256="1yv4nbaigc9x0p8s68i4nkmvrp23qpd2awraks4d3pnmwc2jy94b"; depends=[DBI odbc purrr tibble tidyr XML]; };
+  dbparser = derive2 { name="dbparser"; version="1.0.4"; sha256="0s69da7czznnmv2kgipss1cdklx5ijh0q5aa2lg2gx3an1rjbgp2"; depends=[DBI odbc purrr readr RMariaDB tibble tidyr XML]; };
   dbplot = derive2 { name="dbplot"; version="0.3.2"; sha256="0xw1zjvf1fa092kyryq2pk7dd4y60ka8yczaxk0f231mmsm1741p"; depends=[dplyr ggplot2 purrr rlang]; };
   dbplyr = derive2 { name="dbplyr"; version="1.4.2"; sha256="1q2dflr88s5a1amzfld3087q422vf70052qn84zyd8895kdg10xp"; depends=[assertthat DBI dplyr glue purrr R6 rlang tibble tidyselect]; };
-  dbscan = derive2 { name="dbscan"; version="1.1-3"; sha256="1q0vlrp0abzci2zsjgh7jp3sk1wflcvwjmy9fp0gsay8sgdcixgk"; depends=[Rcpp]; };
+  dbscan = derive2 { name="dbscan"; version="1.1-4"; sha256="1ps5fyxsshk08jv1y9mapsa14pdk2y4nvf9q10n80lwl5idigy21"; depends=[Rcpp]; };
   dbstats = derive2 { name="dbstats"; version="1.0.5"; sha256="0pr80mx8y87l96hhg0rp3ajxl7yx2f8qr0y1zrjkbzxavjmp9k34"; depends=[cluster pls]; };
   dbx = derive2 { name="dbx"; version="0.2.5"; sha256="1g1pm0zw667m0wdzndak1qzym527lcl6gmdfzi5b3rlinkk2y0s2"; depends=[DBI]; };
   dc3net = derive2 { name="dc3net"; version="1.2.0"; sha256="19ibsvbnq6y88vqvgkm31zrqwjhpml59d792bz0zkk50r1q5bnyr"; depends=[c3net igraph RedeR]; };
   dcGOR = derive2 { name="dcGOR"; version="1.0.6"; sha256="0rvwa25r23yayx1i6xhkfaw2z85d2iyfx3slg3aq1m0fa7kj380p"; depends=[dnet igraph Matrix]; };
   dcemriS4 = derive2 { name="dcemriS4"; version="0.55"; sha256="15x4hjc5fwpn80h90q5x9a3p84pp3mxsmcx4hq5l0j52l9dy9nv3"; depends=[oro_nifti]; };
   dclone = derive2 { name="dclone"; version="2.3-0"; sha256="0w1bhzsnmnhsrrw5ffm89pj2wy2fmx14y7g6b1mb2wlwbczjzzsh"; depends=[coda Matrix rjags rstan]; };
+  dclust = derive2 { name="dclust"; version="0.1.0"; sha256="1icfx52v3g7kkkc11pw0xlrc8dlx5q3n2zbrd3fccmw17jzxqbg7"; depends=[openssl phylogram]; };
   dcminfo = derive2 { name="dcminfo"; version="0.1.7"; sha256="03r0ynzc5cck2rz20zbg5zx8v6s66ivizqav1pjkyvp6kxkmnf8q"; depends=[CDM]; };
   dcmle = derive2 { name="dcmle"; version="0.3-1"; sha256="1d6zk9413h30wcw8q1gnjzk67vshmjcpnh8zjxrsh1h69i1z6rpy"; depends=[coda dclone lattice]; };
   dcmodify = derive2 { name="dcmodify"; version="0.1.2"; sha256="093rh3r3n0wjdpx861xiqd1zqd5v1v9rzxgcynz4awr7jbm5xszi"; depends=[settings validate yaml]; };
@@ -6437,15 +6550,15 @@ in with self; {
   ddalpha = derive2 { name="ddalpha"; version="1.3.9"; sha256="1vzs0cvl6xw3h9i00rg3hs02xwgxcnh8326y10kxmhs3qq4m7nb2"; depends=[BH class geometry MASS Rcpp robustbase sfsmisc]; };
   dde = derive2 { name="dde"; version="1.0.0"; sha256="0fsj7n66j0dhp65c6f9k0dsrkklj1hy4w376j150f91jc7m3wliv"; depends=[ring]; };
   ddiv = derive2 { name="ddiv"; version="0.1.0"; sha256="1r2sxlkw1vxf2svdi1nary3hb7c5k1b4j820mj268r9swmy632ch"; depends=[MASS segmented]; };
-  ddpca = derive2 { name="ddpca"; version="1.0"; sha256="02dfpx696canbdyiz6fn9qk5qrn53ghv2asa6737l59xs92rzdm2"; depends=[MASS Matrix quantreg RSpectra]; };
+  ddpca = derive2 { name="ddpca"; version="1.1"; sha256="1qsanid7sr2nc9pwzyz4cbjc1vg0rj255d3rnh1rb22agrgj2bc1"; depends=[MASS Matrix quantreg RSpectra]; };
   ddpcr = derive2 { name="ddpcr"; version="1.11"; sha256="0slfgxp223mnn0f9k72p58m2frnp4c1dvdwsv5fwxw0h022wcrwr"; depends=[dplyr DT ggplot2 lazyeval magrittr mixtools plyr readr shiny shinyjs]; };
-  ddsPLS = derive2 { name="ddsPLS"; version="1.0.61"; sha256="18q2mzpn0h93bxx1igms379nfs1d28jdngd8y5gcsjyway5yi392"; depends=[doParallel foreach MASS RColorBrewer Rdpack]; };
+  ddsPLS = derive2 { name="ddsPLS"; version="1.1.1"; sha256="03vi7dwg24sa3bmwkhvvw8x0vll2i59zlqa5w17fs9c7cbc77w3y"; depends=[corrplot doParallel foreach MASS RColorBrewer Rcpp Rdpack]; };
   ddst = derive2 { name="ddst"; version="1.4"; sha256="1y0immm337adkd2bjx8c5pf02w9wysv3gj26f4qf0jiba0f2wk8n"; depends=[evd orthopolynom]; };
   deBInfer = derive2 { name="deBInfer"; version="0.4.2"; sha256="108vijk71sgsj14hwfv78r4lnn68cybvnpr92zvrvl0d82b7qxfd"; depends=[coda deSolve MASS mvtnorm PBSddesolve plyr RColorBrewer truncdist]; };
   deGradInfer = derive2 { name="deGradInfer"; version="1.0.0"; sha256="1wl1pw1rwins4gr47a8ii4diw6wd6cx8ib4l5bhri5f3crbw7l86"; depends=[deSolve gdata gptk]; };
   deSolve = derive2 { name="deSolve"; version="1.24"; sha256="0hkvspq0fp8j64l9zayab2l2nazazhwfgfym0jllh0xv5a12r99s"; depends=[]; };
   deTS = derive2 { name="deTS"; version="1.0"; sha256="08yq7vfcd8fv8qw2w0f1rnj3rzys9kslmkqspmiz6prmzqvj1zf1"; depends=[pheatmap RColorBrewer]; };
-  deTestSet = derive2 { name="deTestSet"; version="1.1.5"; sha256="07wbgniwkpp0yry6wvchvszr8isxs1i9k6km951r5c009w1iviwk"; depends=[deSolve]; };
+  deTestSet = derive2 { name="deTestSet"; version="1.1.6"; sha256="0n04p05fcaksiqm59pn3r58ihqwbd5r7jxgfvbw05s9l4q46nh3c"; depends=[deSolve]; };
   deaR = derive2 { name="deaR"; version="1.1.0"; sha256="0q36cfjb1vypn2d581rpfilzspvxmfb97phcnvp2w6l98kx8gcvj"; depends=[dplyr ggplot2 gridExtra igraph lpSolve plotly tidyr writexl]; };
   deadband = derive2 { name="deadband"; version="0.1.0"; sha256="02pq3d0l0wy8bdlyfir3zf46j1ascx4qajyq5cf28yl62q6ngq5d"; depends=[TTR]; };
   deal = derive2 { name="deal"; version="1.2-39"; sha256="0sw0v1mm004ky1gjw3dmvf2vb7nf2j9s9386bhqxijw63j7xnjd3"; depends=[]; };
@@ -6500,7 +6613,7 @@ in with self; {
   densityClust = derive2 { name="densityClust"; version="0.3"; sha256="1zry0vafajzmr37aylglxfvwplhdygbkb9cvzvh8cy0xgnjrnx13"; depends=[FNN ggplot2 ggrepel gridExtra RColorBrewer Rcpp Rtsne]; };
   densratio = derive2 { name="densratio"; version="0.2.1"; sha256="0x333kfx5mdzzjsqy37j4bmv9iddlgp3wi4774lx8d159lbr6irp"; depends=[]; };
   denstrip = derive2 { name="denstrip"; version="1.5.4"; sha256="0hzxphj740q6pfa1q42knr7n12bmnawg7b2fs74msxn83dka5cmq"; depends=[lattice]; };
-  denvax = derive2 { name="denvax"; version="0.1.0"; sha256="0r8w5b80abrbf0qyvlhl0byv3d8lic9jydlisk5yyccfv8wrh1xf"; depends=[]; };
+  denvax = derive2 { name="denvax"; version="0.1.1"; sha256="0yc7cks18k1pq6cdjpqmyvb2n8ljbw201fbnwx18r8p93c9493ry"; depends=[]; };
   depend_truncation = derive2 { name="depend.truncation"; version="3.0"; sha256="1jym52qxx8v4kbq2578d03q2593q96jccr85if47djikw0aaxmcr"; depends=[mvtnorm]; };
   depmix = derive2 { name="depmix"; version="0.9.15"; sha256="1dnps6s5bfa834akjgx4zbg49danpy54mhiz1kjb4nmrnlb0zq7q"; depends=[MASS]; };
   depmixS4 = derive2 { name="depmixS4"; version="1.4-0"; sha256="0v8hvkg7ia7c6a0x7rw5fddm06vv1n0kwjk7g0kj3g18chvpnvw2"; depends=[MASS nlme nnet Rsolnp]; };
@@ -6524,7 +6637,7 @@ in with self; {
   designmatch = derive2 { name="designmatch"; version="0.3.1"; sha256="0px6iyqik4sfs25yybamvf3ay0vd6r75acj8hin76jl6l7fwk30f"; depends=[lattice MASS Rglpk slam]; };
   desirability = derive2 { name="desirability"; version="2.1"; sha256="094gxvp6a60lfcc0a0gk9rv1p6ajnzq9m58sy8cvhcj5337g4fmk"; depends=[]; };
   desire = derive2 { name="desire"; version="1.0.7"; sha256="0jmj644nj6ck0gsk7c30af9wbg3asf0pqv1fny98irndqv508kf6"; depends=[loglognorm]; };
-  desplot = derive2 { name="desplot"; version="1.5"; sha256="0macg3ds79jl2v44arfhbb26i8yk19cz4jn04raml8758829caql"; depends=[ggplot2 lattice reshape2]; };
+  desplot = derive2 { name="desplot"; version="1.6"; sha256="1vxczs14afsapagvvsvcwi9ar3z74szs0m1g14zqkkkd47h3cij3"; depends=[ggplot2 lattice reshape2]; };
   detect = derive2 { name="detect"; version="0.4-2"; sha256="03xzv13y2l15afyp00lgvbh51vxg1jaakxjcbnsxzdgb11039x2g"; depends=[Formula Matrix pbapply]; };
   detectRUNS = derive2 { name="detectRUNS"; version="0.9.5"; sha256="0w4pz7waaabgsb47xcmgiz8bzlrs2a83y3v6j7bqb5125y1wn8hw"; depends=[data_table ggplot2 gridExtra iterators itertools plyr Rcpp reshape2]; };
   detector = derive2 { name="detector"; version="0.1.0"; sha256="010i063b94hzx7qac8gpl67gmk7hzgqm9i1c7pbbw4la3wcd9lz7"; depends=[stringr]; };
@@ -6532,17 +6645,18 @@ in with self; {
   detrendeR = derive2 { name="detrendeR"; version="1.0.4"; sha256="1z10gf6mgqybb9ml6z3drq65n7g28h2pqpilc2h84l6y76sy909c"; depends=[dplR]; };
   detrendr = derive2 { name="detrendr"; version="0.6.4"; sha256="0n7mrh05y5jg2y77xv25yadw01lr8ms5ki32i32k38zlc635c1sl"; depends=[assertthat autothresholdr checkmate doParallel dplyr filesstrings foreach fs glue ijtiff iterators magrittr matrixStats plyr purrr Rcpp RcppParallel rlang sigmoid stringi stringr withr]; };
   detzrcr = derive2 { name="detzrcr"; version="0.2.6"; sha256="0ip4fywrpq8gf4xy0h302l5hpbgg0f9xi3lrnbzqm3701bas3c7m"; depends=[ggplot2 MASS shiny]; };
-  devEMF = derive2 { name="devEMF"; version="3.6-3"; sha256="1zyap005md3ylg0d84fkjj3m024j8gmaz310dymgv9zw7hwfb7x7"; depends=[]; };
+  devEMF = derive2 { name="devEMF"; version="3.7"; sha256="0fv44y440xr52xymh1zyrryf7xrkm9lbs3qgybwfzz0ssx2iy6al"; depends=[]; };
   devFunc = derive2 { name="devFunc"; version="0.1"; sha256="0f2s5gssk9napmah7zcss1rnh7pzlq90gzwcnvyr9rrq6k118n8q"; depends=[plyr stringr]; };
   devRate = derive2 { name="devRate"; version="0.1.10"; sha256="0c5hg98w83d02lvb7rbgx8c24li58vpxjy71if337p7cyzzd1lqg"; depends=[]; };
   devoid = derive2 { name="devoid"; version="0.1.0"; sha256="1aq7yyfpid3r41c6v5v92im2iq9m3d7gnisc9rkc9zpjfpbpzpx8"; depends=[]; };
-  devtools = derive2 { name="devtools"; version="2.1.0"; sha256="0393v7nr22gr5g9afgrhq4ab3lwbqy6fd3shnmlhdpqam5357xy1"; depends=[callr cli digest git2r httr jsonlite memoise pkgbuild pkgload rcmdcheck remotes roxygen2 rstudioapi sessioninfo testthat usethis withr]; };
-  dexter = derive2 { name="dexter"; version="0.8.5"; sha256="0q7b6ffmz5hfyr0m4b942rxn4xvmdmi84w92d6r8k6m85cgxdy1b"; depends=[colorspace DBI dbplyr dplyr DT fastmatch RColorBrewer rlang rprintf RSQLite shiny shinyBS shinydashboard tibble tidyr]; };
-  dexterMST = derive2 { name="dexterMST"; version="0.1.1"; sha256="0i9y5qngg85x6h9zm4rf8p7fydl3s72rmc2bh3qpb9vc8js99m35"; depends=[crayon DBI dbplyr dexter dplyr fastmatch igraph Rcpp rlang RSQLite tibble tidyr]; };
-  dextergui = derive2 { name="dextergui"; version="0.1.6"; sha256="1brkkq140z3dv0xflw0dinww2nja9c6iajqv0a0l0m13r1c5caja"; depends=[Cairo DBI dexter dplyr DT ggExtra ggplot2 ggridges htmltools htmlwidgets igraph jsonlite networkD3 RColorBrewer RCurl readODS readxl rlang shiny shinyBS shinyFiles shinyjs tibble tidyr writexl]; };
+  devtools = derive2 { name="devtools"; version="2.2.1"; sha256="0i2f549hxkn0j1x1avkhwy68c9r48v9284j7x9cak2q6dfsqz61f"; depends=[callr cli covr crayon desc digest DT ellipsis git2r glue httr jsonlite memoise pkgbuild pkgload rcmdcheck remotes rlang roxygen2 rstudioapi rversions sessioninfo testthat usethis withr]; };
+  dexter = derive2 { name="dexter"; version="1.0.0"; sha256="08w1k6hw9dfw6ppbwcvsxwra85f14bb2v455cnhhqrrp1klkz1n6"; depends=[DBI dplyr Rcpp RcppArmadillo rlang RSQLite tidyr]; };
+  dexterMST = derive2 { name="dexterMST"; version="0.1.2"; sha256="1h56dr2z2pzi4zdy3dmyb2vg2jg1v5602c497khkvrbr7qfx8zra"; depends=[crayon DBI dbplyr dexter dplyr fastmatch igraph Rcpp rlang RSQLite tibble tidyr]; };
+  dextergui = derive2 { name="dextergui"; version="0.2.0"; sha256="1mz88nydyv469jl26hv2w8xmig45745wx90zqqv8xlr4a7g1xzpy"; depends=[Cairo DBI dexter dplyr DT ggExtra ggplot2 ggridges htmltools htmlwidgets jsonlite networkD3 RCurl readODS readxl rlang shiny shinyBS shinyFiles shinyjs tibble tidyr writexl]; };
   df2json = derive2 { name="df2json"; version="0.0.2"; sha256="10m7xn7rm4aql1bzpckjcx5kvdw44m1pxgzqkgkd40lzqb1cwk18"; depends=[rjson]; };
   dfCompare = derive2 { name="dfCompare"; version="1.0.0"; sha256="1lhx69j0bkjbnp5jz23hrbxjcf04vf3big4k593ixz003xs2077f"; depends=[]; };
   dfConn = derive2 { name="dfConn"; version="0.2.1"; sha256="03yl00mqj6r7p2xmrwam2chgqlq4qpfcm85n4b3b41vrm27xg11g"; depends=[data_table doParallel fields foreach ggplot2 gplots gtools nlme Rcpp RcppArmadillo stringr]; };
+  dfadjust = derive2 { name="dfadjust"; version="1.0.0"; sha256="17x6vnj1b7b9lrkn5a1nlgccpw77y9bhkrwv24hh7wji84gn8j76"; depends=[]; };
   dfcomb = derive2 { name="dfcomb"; version="3.0-0"; sha256="1vsqlhmajv33nbnh8igisyv3rzzh2fdwbk5y0zlnrwvr79r19k5w"; depends=[BH Rcpp RcppProgress]; };
   dfcrm = derive2 { name="dfcrm"; version="0.2-2.1"; sha256="01rn3zvi9xljmx48lkclckhnixian1vwq1frr8n784dsclp86spg"; depends=[]; };
   dfexplore = derive2 { name="dfexplore"; version="0.2.1"; sha256="04nbhn59l1kas26nwj4qflkjvvr33sj1mm7zg7fhvya85gvlhrbf"; depends=[ggplot2]; };
@@ -6570,7 +6684,7 @@ in with self; {
   diagram = derive2 { name="diagram"; version="1.6.4"; sha256="0f6ffprn5k0ir1s7m9s7izc64aa17r3gnygagz5bihrlsvawaavw"; depends=[shape]; };
   dialr = derive2 { name="dialr"; version="0.3.0"; sha256="1wdl3m6mlpxhy75kyzxypf053n2zaf8skk0xq1m4gklq4disbg32"; depends=[dialrjars rJava]; };
   dialrjars = derive2 { name="dialrjars"; version="8.10.14"; sha256="0xzgrqgydgrljp3ylqk24hwgj9mcpxsfd4xp3wx8k1d4jmz80gw8"; depends=[rJava]; };
-  dials = derive2 { name="dials"; version="0.0.2"; sha256="1ip8hdv293lcj0jiycinc66fib1q1vsnb3px26zsmlw49nb32q5h"; depends=[dplyr glue purrr rlang scales tibble withr]; };
+  dials = derive2 { name="dials"; version="0.0.3"; sha256="0ynq6baiyc0iasyhrp1imivha00vy2fndda7gr983p246f38hg82"; depends=[DiceDesign dplyr glue purrr rlang scales tibble withr]; };
   diaplt = derive2 { name="diaplt"; version="1.3.0"; sha256="1kkqhkv3s8rrpqd05jidjdnqmlnb3s9f8rr34rfqj7k4nh0qzzcz"; depends=[]; };
   dice = derive2 { name="dice"; version="1.2"; sha256="0gic7lqnsdmwv3dbzwwmcwdfyfqlq8kpr2pciqphd1j2ligzwl3s"; depends=[gtools]; };
   diceR = derive2 { name="diceR"; version="0.6.0"; sha256="1jwgngvajnm80g079z4jks5f3y2hy7hz3h9cf7c6wlb8spmaffxr"; depends=[abind apcluster assertthat blockcluster caret class cli clue cluster clusterCrit clValid dbscan dplyr e1071 flux ggplot2 gplots Hmisc infotheo kernlab klaR kohonen magrittr mclust NMF poLCA progress purrr quantable RankAggreg RColorBrewer Rcpp Rtsne sigclust stringr tibble tidyr]; };
@@ -6581,7 +6695,7 @@ in with self; {
   dief = derive2 { name="dief"; version="1.2"; sha256="1i4icdfqvw7imaj1fh392zmzfyz8aqlv9s5naqxm1pm0lqfxl6ca"; depends=[flux fmsb ggplot2 plyr]; };
   dielectric = derive2 { name="dielectric"; version="0.2.3"; sha256="1p1c0w7a67zxp1cb99yinylk5r1v89mmpfybcy94ydydhydbhivk"; depends=[]; };
   diezeit = derive2 { name="diezeit"; version="0.1-0"; sha256="0rq1k08byvqn99wpql7drnrcxlzcqrcxixh7bczbc8dv1hhsgk9i"; depends=[brew httr jsonlite]; };
-  difNLR = derive2 { name="difNLR"; version="1.2.2"; sha256="0d9454vy0wdl60alvwyw4y8aqwhggkr9ffq4l1mxhwfvj8ypwch0"; depends=[CTT ggplot2 msm nnet reshape2]; };
+  difNLR = derive2 { name="difNLR"; version="1.3.0"; sha256="1p3iiaw1wy9ni74y96yp4003406wy1jz773nq919hmrqj0agxkg7"; depends=[CTT ggplot2 msm nnet plyr reshape2 VGAM]; };
   difR = derive2 { name="difR"; version="5.0"; sha256="0k0vw5l3pig514ngpvf0rwhwxc316ws352fgw49c3c95ydsz6wd8"; depends=[deltaPlotR lme4 ltm mirt]; };
   difconet = derive2 { name="difconet"; version="1.0-4"; sha256="0cjadi4mnpfmy18vyp0dw55mnhs0zddf51w59gvq6gszk145z3bq"; depends=[data_table gplots mvtnorm stringr]; };
   diffEq = derive2 { name="diffEq"; version="1.0-1"; sha256="1xmb19hs0x913g45szmm26xx5xp85v182wqf0lnl4raxaf47yhkm"; depends=[bvpSolve deSolve deTestSet ReacTran rootSolve shape]; };
@@ -6592,16 +6706,17 @@ in with self; {
   diffdf = derive2 { name="diffdf"; version="1.0.3"; sha256="0nz0jwa02yc16cx51z5hp5zaw40gbcyqli3jpxgrnzw76f8jhkah"; depends=[tibble]; };
   diffeR = derive2 { name="diffeR"; version="0.0-6"; sha256="0ivdcfirs3jbd6m3rryq590szkhplm2kr9chjgcgd88ar5nrqfg7"; depends=[ggplot2 raster reshape2 rgdal]; };
   diffee = derive2 { name="diffee"; version="1.1.0"; sha256="01lb1prz70mxgymhhsvx48kbfy69xyyaabsmfhf28af9wfb89662"; depends=[igraph pcaPP]; };
-  diffeqr = derive2 { name="diffeqr"; version="0.1.2"; sha256="17h76myfzl4xxd5wrhyd6b0h78dz42j5zac7fb5j0xq2qj6k7l7d"; depends=[JuliaCall stringr]; };
+  diffeqr = derive2 { name="diffeqr"; version="0.1.3"; sha256="1696bxh916688zlfxbm6jaqk245xw51ar7rqz7m2nla0ibka86sj"; depends=[JuliaCall stringr]; };
+  diffman = derive2 { name="diffman"; version="0.1.0"; sha256="03m8qbzxyinknx0d87kq8hnag8xdv09vwaafahk80x1lvg389559"; depends=[data_table dplyr igraph Matrix progress Rcpp sf tidyverse]; };
   diffobj = derive2 { name="diffobj"; version="0.2.3"; sha256="17wq3haj2i8x5cy1xx2c8hj2p65hasrjyiqxcq61kzvxd0zyjxzw"; depends=[crayon]; };
   diffpriv = derive2 { name="diffpriv"; version="0.4.2"; sha256="12q2v93369bshid83rsy1csbr9ay6rfpd8zdxm12zi7py3f9sjs8"; depends=[gsl]; };
   diffr = derive2 { name="diffr"; version="0.1"; sha256="0ydwnpyzirynffsnvip667y0jqzy7yfqlfpqhb38xvmd9rmwfbp8"; depends=[htmlwidgets]; };
   diffrprojects = derive2 { name="diffrprojects"; version="0.1.14"; sha256="1mnqf5zs1w8dx9y5iwn4blyzb9j60ayzc04zxj5l8804nd527n25"; depends=[dplyr hellno magrittr R6 Rcpp RSQLite rtext stringb stringdist]; };
   diffrprojectswidget = derive2 { name="diffrprojectswidget"; version="0.1.5"; sha256="1h69mc1wayi80vz4b9cqydylf4kp9mxsigv05r0f903pqakdrzcw"; depends=[diffrprojects dplyr hellno htmlwidgets jsonlite magrittr tidyr]; };
   diffusion = derive2 { name="diffusion"; version="0.2.7"; sha256="1j9s9vw5sc4k956bk4yp3bf4fnp7lhhkwcvlzvsh1w4dyaj8l35h"; depends=[dfoptim nloptr systemfit]; };
-  diffusionMap = derive2 { name="diffusionMap"; version="1.1-0.1"; sha256="11l4kbciawvli5nlsi4qaf8afmgk5xgqiqpdyhvaqri5mx0zhk5j"; depends=[igraph Matrix scatterplot3d]; };
+  diffusionMap = derive2 { name="diffusionMap"; version="1.2.0"; sha256="1rvk7069brlm1s9kqj4c31mwwr3mw4hmhay95cjjjfmw5xclff2j"; depends=[igraph Matrix scatterplot3d]; };
   diffusr = derive2 { name="diffusr"; version="0.1.4"; sha256="1f3h387kblw1xzdnxphwgfl1n7f6i07kk7kfslvbfxkalbish6ii"; depends=[igraph Rcpp RcppEigen]; };
-  digest = derive2 { name="digest"; version="0.6.20"; sha256="1irhk2jaj9cg57cxprgyn1if06x121xwcxh1fzzn3148bl5lnrq5"; depends=[]; };
+  digest = derive2 { name="digest"; version="0.6.21"; sha256="0qycqchmv59fb6jp369d82mcx9xgbv70m18qzam0vrs8zkmajb17"; depends=[]; };
   digitalPCR = derive2 { name="digitalPCR"; version="1.1.0"; sha256="0hwqq84yr1hnvf4bygc5425887dhqjjjyy1ils71iavcal04s8pb"; depends=[]; };
   digitize = derive2 { name="digitize"; version="0.0.4"; sha256="1qw4x4z9vrs79sd9b2daw668nc6nvjl4qhayfqmd87yxa2ydv6x0"; depends=[readbitmap]; };
   dils = derive2 { name="dils"; version="0.8.1"; sha256="1q6ba9j14hzf7xy895mzxc6n9yjgind55jf350iqscwzxf7ynp33"; depends=[igraph Rcpp]; };
@@ -6632,20 +6747,21 @@ in with self; {
   discretization = derive2 { name="discretization"; version="1.0-1"; sha256="00vq2qsssnvgpx7ihbi9wcafpb29rgv01r06fwqf9nmv5hpwqbmp"; depends=[]; };
   discrimARTs = derive2 { name="discrimARTs"; version="0.2"; sha256="088v4awic4bhzqcr7nvk2nldf8cm1jqshg2pzjd2l2p1cgwmlxib"; depends=[RUnit]; };
   diseasemapping = derive2 { name="diseasemapping"; version="1.4.6"; sha256="16y2w8qjq442qdbqlrg3s2mn53rlcipl22m3q168gda5klm4f7sl"; depends=[sp]; };
+  disk_frame = derive2 { name="disk.frame"; version="0.1.1"; sha256="0hp3svp4krx0bssmx7l93fm15lyx1aiml6s0jc6ffcbmc4gyckf1"; depends=[assertthat benchmarkme bigreadr bit64 crayon data_table dplyr fs fst furrr future future_apply globals glue jsonlite pryr purrr Rcpp rlang stringr]; };
   diskImageR = derive2 { name="diskImageR"; version="1.0.0"; sha256="1r19k5fdjn6vkn11p5df77fnxfqaz3nciiaai0f3pr2bgpfppzka"; depends=[subplex zoo]; };
   dismo = derive2 { name="dismo"; version="1.1-4"; sha256="1j4pzbyvn8msi3k2y79nc6pqlrald46168ibznjwrr6rdiqhy4gj"; depends=[raster sp]; };
-  dispRity = derive2 { name="dispRity"; version="1.2.3"; sha256="1218sfm7spl7lqdjfn35wg69bcxwdfypwv4hqff22shkyvvm6lh7"; depends=[ade4 ape Claddis geiger geometry geoscale mnormt paleotree phangorn phyclust vegan]; };
+  dispRity = derive2 { name="dispRity"; version="1.3.1"; sha256="0pf6c1byw095q7a6zx0sgwl84a5djkaaq1ly5jpcv0q0l0c9kxxh"; depends=[ade4 ape Claddis geiger geometry geoscale mnormt paleotree phangorn phyclust vegan]; };
   disparityfilter = derive2 { name="disparityfilter"; version="2.2.3"; sha256="0dkk3qws631mf0g02di5rsrvh5954cykysyri0g8aqgik0j9dg06"; depends=[igraph]; };
   displayHTS = derive2 { name="displayHTS"; version="1.0"; sha256="0mqfdyvn2c5c3204ykyq29ydldsq0kb3a1d7mrzqr7cvrj1ahlqa"; depends=[]; };
   dispmod = derive2 { name="dispmod"; version="1.2"; sha256="16r6is0pchzc9mxpz0c44f72j76vsh3j9damalcxajrha06dkdq4"; depends=[]; };
   disposables = derive2 { name="disposables"; version="1.0.3"; sha256="0q5wacjclspn2fh7z1pg2l67ll51n75wck5h2fdq2vxy3qn3vwis"; depends=[]; };
   dissUtils = derive2 { name="dissUtils"; version="1.0"; sha256="00fzlmkdfw2s3k824wp2pk3v7cvxnywi1hfp86g4mm95z2qlw9br"; depends=[]; };
   dissever = derive2 { name="dissever"; version="0.2-3"; sha256="1lgs5nmv3lpm4gsryxvcwiwibvvg9flv23q8maisp77x49c18qcp"; depends=[boot caret dplyr foreach magrittr plyr raster sp viridis]; };
-  distTails = derive2 { name="distTails"; version="0.1.1"; sha256="0i0xajdsbd03jrf0y2vx3hm830n5xy1g0md1bl576g6rdxsvln2l"; depends=[ercv gsl MASS]; };
+  distTails = derive2 { name="distTails"; version="0.1.2"; sha256="10p7rfqfkhcwq10lhz3cq9i4k1jdccks4y3791lajljsxz5jrca4"; depends=[ercv gsl MASS]; };
   distance_sample_size = derive2 { name="distance.sample.size"; version="0.0"; sha256="0hlf3kp34rg1gnkxp4k3rnv0shv4fpgb0rhx3a6x5692lhyigbcs"; depends=[MASS]; };
-  distances = derive2 { name="distances"; version="0.1.7"; sha256="1xhv7mf5753d6jnbrmmy6k670li5h2gd8c789mm5w9hxb40rwald"; depends=[]; };
-  distantia = derive2 { name="distantia"; version="1.0.0"; sha256="13klrjqw4xfn4qh1xs2wlcccdrjcihz0zc9mxnf7q5dd1ffwpryw"; depends=[doParallel fields foreach plyr RColorBrewer viridis viridisLite]; };
-  distcomp = derive2 { name="distcomp"; version="1.0-1"; sha256="0f69bxw52ai39dmkmfvrs0lbibcgmv6n849xa9xgd2jm5mvbc58f"; depends=[digest httr jsonlite R6 shiny stringr survival]; };
+  distances = derive2 { name="distances"; version="0.1.8"; sha256="0mmwks1qzx680izv26x8mcfs4i16mnmf6s9arz1ssx470xwxljxy"; depends=[]; };
+  distantia = derive2 { name="distantia"; version="1.0.1"; sha256="0vmq90x2mlbhbgqq37vriwqbh0lr7hgjbbjp5im24qs9xf7jhv90"; depends=[arrangements data_table doParallel fields foreach iterators plyr RColorBrewer viridis]; };
+  distcomp = derive2 { name="distcomp"; version="1.1"; sha256="1b2rxn7x6sa3kiip1sv8yd556mkjqvq38v3cycb5084x3k6prhp4"; depends=[digest httr jsonlite R6 shiny stringr survival]; };
   distcrete = derive2 { name="distcrete"; version="1.0.3"; sha256="0sa6z2mpmk51ig1r7bmpbyv2jd8z6z7mixki2vlq1kybg8cx3wmi"; depends=[]; };
   distdichoR = derive2 { name="distdichoR"; version="0.1-1"; sha256="0v19m3n1jgipg65yrv75rm4v27b5aq58cbsmbp7lxvfxmj5ra328"; depends=[boot emmeans nlme sn]; };
   distdrawr = derive2 { name="distdrawr"; version="0.1.3"; sha256="1c8wznfml8k5gwyanfg7rqr22a96xx8rgm7f4z3bv5gsgsbps49y"; depends=[]; };
@@ -6655,7 +6771,7 @@ in with self; {
   disto = derive2 { name="disto"; version="0.2.0"; sha256="09pafy8y1ifgglqmal32dy34acx06ypsq2bgwsn6fjiqr9kw401j"; depends=[assertthat broom dplyr factoextra fastcluster fastmatch ggplot2 pbapply proxy tidyr]; };
   distory = derive2 { name="distory"; version="1.4.3"; sha256="1mszk8fv1z46d7y1q37mhq9b5yk39w2i9rq6mgdf03afdslrmrip"; depends=[ape]; };
   distr = derive2 { name="distr"; version="2.8.0"; sha256="1dyff4m33xmw6hxb3jxzr8vvajg3qz3rfcrfxjxwsswlddfz0zdv"; depends=[MASS sfsmisc startupmsg]; };
-  distr6 = derive2 { name="distr6"; version="1.0.1"; sha256="142kqbnnl8d80vggmbpg363sqdkhni6rbk25dqkwhryl1y712pib"; depends=[checkmate crayon data_table expint extraDistr GoFKernel pracma R6 R62S3]; };
+  distr6 = derive2 { name="distr6"; version="1.2.0"; sha256="1d68k6b7id5jh39g79lw6l09xml3v5k99nd7wvpilq5j4h2jwk7x"; depends=[checkmate data_table pracma R6 R62S3]; };
   distrDoc = derive2 { name="distrDoc"; version="2.8.0"; sha256="1iq2gbfbsf3h279yh3fnqsi39gdw15vc6r1g33xcb8kgmmqmvf0p"; depends=[distr distrEx distrMod distrSim distrTeach distrTEst MASS RandVar startupmsg]; };
   distrEllipse = derive2 { name="distrEllipse"; version="2.8.0"; sha256="1ymfa8xpgs8zjp4psiwmll5z0vji496fivxmcavspzxy31cw70wx"; depends=[distr distrEx distrSim mvtnorm setRNG startupmsg]; };
   distrEx = derive2 { name="distrEx"; version="2.8.0"; sha256="1gwhsnlrnzyp2x97d9wfdy5pa9z3q5il934wjv4kxs9wsvkwsr5h"; depends=[distr startupmsg]; };
@@ -6664,7 +6780,8 @@ in with self; {
   distrSim = derive2 { name="distrSim"; version="2.8.0"; sha256="0g16mljlz7fnb5k6c9h5vplm3n51sdbybv9cifbia0y6p9zml383"; depends=[distr setRNG startupmsg]; };
   distrTEst = derive2 { name="distrTEst"; version="2.8.0"; sha256="06rdcwfgbhc81zqisg414nj0kji59xvhm782b63hk54a8b2zwhh5"; depends=[distrSim setRNG startupmsg]; };
   distrTeach = derive2 { name="distrTeach"; version="2.8.0"; sha256="1qgkd4yipk29q8k334fz97n6dxlxnsback7v5a05m6ragc37wzag"; depends=[distr distrEx startupmsg]; };
-  distreg_vis = derive2 { name="distreg.vis"; version="1.5.0"; sha256="1imbrhmiyraaqv6kkbmd5wyvwhchijwgf82dp3psh7cxwxpmbcdz"; depends=[bamlss formatR gamlss gamlss_dist ggplot2 magrittr mvtnorm RColorBrewer rhandsontable shiny viridis]; };
+  distreg_vis = derive2 { name="distreg.vis"; version="1.7.0"; sha256="1rfv4ifhai6ig0x2xwca1pjin8vqp8k8jvbmj45rxdzg8b384zly"; depends=[bamlss betareg formatR gamlss gamlss_dist ggplot2 magrittr rhandsontable shiny]; };
+  distributions3 = derive2 { name="distributions3"; version="0.1.1"; sha256="06wfyn37x2r00szfzgjpcxy5fhx72p2pf44llpymcsjyp8k790na"; depends=[ellipsis glue]; };
   distrom = derive2 { name="distrom"; version="1.0"; sha256="0wylw7yaylf5j8cy8g45jrw91mwx6w0i7vf9ysnj5kxyznq1gl6y"; depends=[gamlr Matrix]; };
   distrr = derive2 { name="distrr"; version="0.0.5"; sha256="06zmknpdldh4yy3gd1ki6p856pwllb605z1142j4kqxj2ni3lkq7"; depends=[dplyr magrittr rlang tidyr]; };
   disttools = derive2 { name="disttools"; version="0.1.7"; sha256="1wdcggphyxy58zyqdsyz2z3q4rb69wady63l79s1ivjwzgjrsxmi"; depends=[]; };
@@ -6685,8 +6802,8 @@ in with self; {
   dlm = derive2 { name="dlm"; version="1.1-5"; sha256="1aksm66sfa7ipl5xgs4j5giac7q2m744wjl40mva56xn6i674h4r"; depends=[]; };
   dlmap = derive2 { name="dlmap"; version="1.13"; sha256="0s6wlkggkm3qndwyvw72xv1n0mcjb7ss3ajbq2ll6rv30splq0db"; depends=[ibdreg mgcv nlme qtl wgaim]; };
   dlnm = derive2 { name="dlnm"; version="2.3.9"; sha256="0vbrp9x7n94wjrigw124i3i7szy0bsh4sdggi8nsizn2ccsv5pnq"; depends=[mgcv nlme tsModel]; };
-  dlookr = derive2 { name="dlookr"; version="0.3.9"; sha256="12c7lq8vswmmgjplk9j9qmhxi54yn0xh3q01qn2kp896hg0sp61q"; depends=[classInt corrplot DMwR dplyr ggplot2 gridExtra kableExtra knitr magrittr mice moments prettydoc purrr RcmdrMisc RColorBrewer rlang rmarkdown rpart smbinning tibble tidyr tidyselect tinytex xtable]; };
-  dlsem = derive2 { name="dlsem"; version="2.4.2"; sha256="07dwkj8wliivggyz75chhh5s7g6n4l16xk6dpvxnva7fjx2fvf3k"; depends=[graph Rgraphviz]; };
+  dlookr = derive2 { name="dlookr"; version="0.3.11"; sha256="0a0ar7alfngv0fmbklv7jvlsbjk3sbvmssapjvng22w4swcnk2py"; depends=[classInt corrplot DMwR dplyr ggplot2 gridExtra kableExtra knitr magrittr mice moments prettydoc purrr RcmdrMisc RColorBrewer rlang rmarkdown rpart smbinning tibble tidyr tidyselect tinytex xtable]; };
+  dlsem = derive2 { name="dlsem"; version="2.4.3"; sha256="1x5l63a1789lbim91msw0g98yrw86s0pavws0bf5cpvj23la8i9h"; depends=[graph Rgraphviz]; };
   dlstats = derive2 { name="dlstats"; version="0.1.0"; sha256="0s92rdpw3m534wgjaic4srsp9i1pa3ibfmr4h7p3ly51zhza6l5h"; depends=[ggplot2 jsonlite magrittr RColorBrewer scales]; };
   dma = derive2 { name="dma"; version="1.4-0"; sha256="003snr09hazszwqnvjrbv8vyz6ihgcfcfhrlshg451dddn920615"; depends=[MASS]; };
   dmai = derive2 { name="dmai"; version="0.4.0"; sha256="0ma89jl0l598sffpikvjj40f2djjcnjq29k6y1bav4dm2g51qgmq"; depends=[dplyr ggplot2 magrittr stringr tibble tidyr]; };
@@ -6697,6 +6814,7 @@ in with self; {
   dnet = derive2 { name="dnet"; version="1.1.4"; sha256="0xccb50a85d9fcxfg0shxf430hzgjyh4qgb3js4sgzi02iagim58"; depends=[graph igraph Matrix Rgraphviz supraHex]; };
   dng = derive2 { name="dng"; version="0.2.1"; sha256="0yi1fs4yvlsy3j128l7s5kwq8mhdd5fr74y2bzj7cjrxi7wgz2hg"; depends=[Rcpp]; };
   dnr = derive2 { name="dnr"; version="0.3.4"; sha256="0hzaa308pppq2cqpb067f3y3nyv1p2xdmgy3dykf90psnn5v011p"; depends=[arm ergm glmnet igraph network sna]; };
+  do = derive2 { name="do"; version="1.0.0.0"; sha256="1r7c4n4821b27czyqy7162wwbnwg6ps74diwd4s8zyilxjs782gn"; depends=[plyr reshape2]; };
   doBy = derive2 { name="doBy"; version="4.6-2"; sha256="02vbv9nfgywg6lsiialkmfnax5z3rkyb9nr8j9l2cp8xi6ml95mb"; depends=[dplyr magrittr MASS Matrix plyr]; };
   doFuture = derive2 { name="doFuture"; version="0.8.1"; sha256="1akjzzqsa768y6d4ligr4mrcb107g5jwcl0rm34hbnqm81qms0bz"; depends=[foreach future globals iterators]; };
   doMC = derive2 { name="doMC"; version="1.3.6"; sha256="1cn9gxavhvjswip8pwvkpi7q6wpzdllcsdjabga8akf55nggqxr9"; depends=[foreach iterators]; };
@@ -6705,6 +6823,7 @@ in with self; {
   doRNG = derive2 { name="doRNG"; version="1.7.1"; sha256="1sb75aqkliprglfxc4x4wds6alqgzhvl2n812g1d32a88ra3slr7"; depends=[foreach iterators pkgmaker rngtools]; };
   doRedis = derive2 { name="doRedis"; version="1.1.1"; sha256="10ldfzq6m83b9w24az9bf5wbfm6y9gi233s8qgsk4dnr84n3nizx"; depends=[foreach iterators rredis]; };
   doSNOW = derive2 { name="doSNOW"; version="1.0.18"; sha256="0rj72z5505cprh6wykhhiz08l9bmd966srqh2qypwivf321bvrvh"; depends=[foreach iterators snow]; };
+  dobin = derive2 { name="dobin"; version="1.0.0"; sha256="023s1gq9wqsaf9390nxqclpwwmxfpyv0sxxb8nnck7lpsl5g1pkl"; depends=[FNN pracma]; };
   dobson = derive2 { name="dobson"; version="0.4"; sha256="0xfn7s3wzrv1md40bdjrnjfiqyxg5c6lrcpnvayjdgrhxq161hhq"; depends=[]; };
   dockerfiler = derive2 { name="dockerfiler"; version="0.1.3"; sha256="128648s9lj96p3nlxwy4gs108w5kjcg6w48nfx3r52gb8w2z7948"; depends=[attempt glue R6]; };
   docopt = derive2 { name="docopt"; version="0.6.1"; sha256="06zknnd0c5s2y0hbddzdlr3m63ib783izpck6pgz7sjbab5pd068"; depends=[]; };
@@ -6716,9 +6835,8 @@ in with self; {
   documenter = derive2 { name="documenter"; version="0.1.1"; sha256="0y6zrvmb9bhc1ni4v89h9pq5ara8p2v4b35ylasia5s9x1y93mcp"; depends=[htmltools magrittr officer xml2 yaml]; };
   docxtools = derive2 { name="docxtools"; version="0.2.1"; sha256="09fcamrr3yw1zrj4bx8ra9yidprk1h44p48by85zjqwd1ly4gqbf"; depends=[dplyr ggplot2 lubridate purrr rlang stringr tidyr]; };
   docxtractr = derive2 { name="docxtractr"; version="0.6.1"; sha256="03bcaiwxxybbdxh26rp4bl66aiv4hxmgn21w6dxm383xha03iqfw"; depends=[dplyr httr magrittr purrr xml2]; };
-  dodgr = derive2 { name="dodgr"; version="0.2.0"; sha256="1dibvhn9gjihlqma2rka7xk803rb2f913315ndwf1sm8z2hpbafc"; depends=[callr digest igraph magrittr osmdata rbenchmark Rcpp RcppParallel]; };
   doex = derive2 { name="doex"; version="1.1"; sha256="1md7l1kr7i258kycxlpsar6aq5vll6qjqyabjgi14f2hp5p8b6ah"; depends=[]; };
-  dominanceanalysis = derive2 { name="dominanceanalysis"; version="1.0.0"; sha256="1870qg17jiq1g2693d912y5jxp2b2692hfdg2qbqa0h2w0lf0lx1"; depends=[]; };
+  dominanceanalysis = derive2 { name="dominanceanalysis"; version="1.2.0"; sha256="04x0l37lbdjflz2jr5h95hd9a3c858p7j1p2mscyn08c986j04mb"; depends=[]; };
   domino = derive2 { name="domino"; version="0.3.1"; sha256="0f67w0z5jy82kgm3l1rji430ayigw30vmmwp3i1nz0xibsx7jxv4"; depends=[]; };
   doremi = derive2 { name="doremi"; version="0.1.1"; sha256="1h36sj60l5sd5ybbdyrv0wkr9p18j7iwg111khq0znb71xi5nzp7"; depends=[data_table ggplot2 lme4 lmerTest zoo]; };
   dosearch = derive2 { name="dosearch"; version="1.0.2"; sha256="090k7fbla5xsczbbz7qglnbnngi1gdhjis4yy6bccw9v9s4mfg9s"; depends=[Rcpp]; };
@@ -6751,15 +6869,15 @@ in with self; {
   dr = derive2 { name="dr"; version="3.0.10"; sha256="0dmz4h7biwrn480i66f6jm3c6p4pjvfv24pw1aixvab2vcdkqlnf"; depends=[MASS]; };
   dr4pl = derive2 { name="dr4pl"; version="1.1.8"; sha256="13ic6lmk2cdh6pvjfpkcnv41mgr27amay2g501ag5ppl4b95lc2q"; depends=[ggplot2 Matrix matrixcalc Rdpack tensor]; };
   drLumi = derive2 { name="drLumi"; version="0.1.2"; sha256="09ps8rcqrm6a1y8yif2x82l0k4jywq60pkndh9nzfpbsw4ak2lby"; depends=[chron gdata ggplot2 Hmisc irr minpack_lm msm plyr reshape rootSolve stringr]; };
-  dragon = derive2 { name="dragon"; version="0.1.0"; sha256="0vnhp901xnvj7w8si8s2nd880c5b1zc30qq61zv7zkxd7bhzxp7g"; depends=[colorspace colourpicker DT igraph magrittr RColorBrewer shiny shinythemes shinyWidgets tidyverse visNetwork]; };
+  dragon = derive2 { name="dragon"; version="0.2.0"; sha256="16jf6b0zkps9z5z8nsgfgny2jp3fbbwihd2v20w41b0lb3swj757"; depends=[broom colorspace colourpicker cowplot DT igraph magrittr RColorBrewer shiny shinyBS shinydashboard shinythemes shinyWidgets tidyverse visNetwork]; };
   dragonking = derive2 { name="dragonking"; version="0.1.0"; sha256="01b01wd1s2b8sa9f0kfbf2pbzhaqra7xxskigqh3vlj389xqm1id"; depends=[]; };
   dragulaR = derive2 { name="dragulaR"; version="0.3.1"; sha256="1cw5v7m1b4pxsizsjb3zdzhydxj577p6q5fcjklsvpzmiixzlyav"; depends=[htmlwidgets shiny shinyjs]; };
-  drake = derive2 { name="drake"; version="7.5.2"; sha256="18ch0wkjv3lc3fhw8msljlqpxlwb9a13m47majgipfm6ylq7nx30"; depends=[base64url digest igraph rlang storr txtq]; };
+  drake = derive2 { name="drake"; version="7.6.2"; sha256="1hkvb7hs2yh4vwm76lzkyi9kxmvjrmrwf08gykkvypc6xa9vnvvf"; depends=[base64url digest igraph rlang storr txtq]; };
   drat = derive2 { name="drat"; version="0.1.5"; sha256="0i80c4hyclwnq8g8amvdid9pwr11mwbscwydaxmvbrbhv3qzjg6d"; depends=[]; };
   draw = derive2 { name="draw"; version="1.0.0"; sha256="0kbz8rcgygl4fhmljzaan5jl7wjvfljcaykm7q9lw9s6m78p06gz"; depends=[]; };
   drc = derive2 { name="drc"; version="3.0-1"; sha256="0c8xn8ripzq270hy8d16fcnx02l02alddznd7fqwk3jyi6113h1y"; depends=[car gtools MASS multcomp plotrix scales]; };
   drfit = derive2 { name="drfit"; version="0.7.2"; sha256="03ahzmjzrkdrv36yj6vfg3g5bwn6lb7mlxmli68sixag5h83xq7f"; depends=[DBI drc MASS odbc qcc reshape2]; };
-  drgee = derive2 { name="drgee"; version="1.1.8"; sha256="08zf2yjcnqqjr6l9a99y8mygcl6lhb1ih82qhfyqrw5zk7l0gmjh"; depends=[data_table nleqslv Rcpp RcppArmadillo survival]; };
+  drgee = derive2 { name="drgee"; version="1.1.9"; sha256="0nblv7yrbq9kvnbjs13adhj5lmwim6p6sz0550fk78lh7h99hl0q"; depends=[data_table nleqslv Rcpp RcppArmadillo survival]; };
   driftR = derive2 { name="driftR"; version="1.1.0"; sha256="0mvrmwfqg234kk5klhmw7vmf8i0g485xkx5nk73iam16fbzl9y5g"; depends=[dplyr glue janitor lubridate magrittr readr readxl rlang stringr tibble]; };
   drifter = derive2 { name="drifter"; version="0.2.1"; sha256="1xsp8cm02wd8zink0jqrdaii7s2dh0rw96rs6k8zr2g0341wmfba"; depends=[DALEX dplyr ingredients tidyr]; };
   drmdel = derive2 { name="drmdel"; version="1.3.1"; sha256="1bpm9jj9dxk2daxp1yb7pn9jd750p27qa84vdfxpacm5r0mggnys"; depends=[]; };
@@ -6768,7 +6886,9 @@ in with self; {
   drsmooth = derive2 { name="drsmooth"; version="1.9.0"; sha256="1wgi961bvbsnq4bygxbpy4sy5fy34lrrkaaj0r2rxcahwa1sc38n"; depends=[boot car DTK lubridate mgcv multcomp pgirmess segmented]; };
   drtmle = derive2 { name="drtmle"; version="1.0.4"; sha256="0k8cps3kpfrlv33a0czjp327qzdj69lwbpv4k5q7qjcv0878yypg"; depends=[doFuture future future_apply future_batchtools np plyr SuperLearner]; };
   drugCombo = derive2 { name="drugCombo"; version="1.1.0"; sha256="0y8zjcbaympczrvr4dfbd1n83iliv5qv4xz9za4zm412c1dkdd24"; depends=[BIGL Deriv ggplot2 minpack_lm nlme rgl]; };
+  drumr = derive2 { name="drumr"; version="0.1.0"; sha256="09xi3sf424bpq10fq25j209dylfbi1lfd911r44ffadkxzvp5p1s"; depends=[audio stringr]; };
   ds = derive2 { name="ds"; version="4.0"; sha256="1iic5fb27cnhsa83zg28hydrhzc01i9z0711xvk95c3gv7mbfp2p"; depends=[]; };
+  ds4psy = derive2 { name="ds4psy"; version="0.1.0"; sha256="15knnl0ld8vnb3mv06p7425h7w5y5m598k4dny8svqwranhs856a"; depends=[cowplot ggplot2 here readr stringr tibble tidyr tidyverse unikn]; };
   dsa = derive2 { name="dsa"; version="0.70.3"; sha256="0ilfrrfdvw86p6q5jskh0fqnqrcz75j2ldzhvwfpbdr9bh65jfai"; depends=[dygraphs extrafont forecast ggplot2 gridExtra htmlwidgets R2HTML reshape2 rJava timeDate tsoutliers xtable xts zoo]; };
   dsample = derive2 { name="dsample"; version="0.91.2.2"; sha256="18c0zxaqwgbn9kmkwlnicwd74ljy2sxj0b9ksif13pdlj3zn57h1"; depends=[MASS]; };
   dse = derive2 { name="dse"; version="2015.12-1"; sha256="1976h57zallhzq43nshg77bsykcvkfwnasha1w59c44fjpl1gs9w"; depends=[setRNG tfplot tframe]; };
@@ -6776,22 +6896,23 @@ in with self; {
   dslice = derive2 { name="dslice"; version="1.2.0"; sha256="1k9hxpmr563p8bpd9m991lx5ig366mzk9j1lzldci9pq4jiayin1"; depends=[ggplot2 Rcpp scales]; };
   dsm = derive2 { name="dsm"; version="2.2.17"; sha256="0n2nn05zb8zd2wah1cfzv8a9qwbh6an3jwsfy0x6lbkk63bs5mxw"; depends=[ggplot2 mgcv mrds nlme numDeriv plyr statmod]; };
   dsmodels = derive2 { name="dsmodels"; version="1.1.0"; sha256="0gidxi4ph49mjm2hdf9flphfb9916al4cpdkiig504n7ms2sbpbg"; depends=[latex2exp pryr shape]; };
-  dsr = derive2 { name="dsr"; version="0.2.1"; sha256="0vkj41w7hqxdiv0v1hn24fisfmp2hjz7bwfv4abl9j4ngh6hq5f5"; depends=[dplyr frailtypack rlang]; };
+  dsr = derive2 { name="dsr"; version="0.2.2"; sha256="0bs5aspi2khs9n60q7d2ah6zv4rzhbyk2bafd17c12jzjqlh1228"; depends=[dplyr frailtypack rlang]; };
   dsrTest = derive2 { name="dsrTest"; version="0.2.1"; sha256="1kljlfi7jf6fa8b5f3wxjsa9rlmzcp4qix3m2qyapz2lqd85mbb7"; depends=[asht exactci loglognorm]; };
-  dst = derive2 { name="dst"; version="1.3.0"; sha256="1pck09g2430d08x2f72zc2zxx6yaybcpzramjvjldwj1kmz32l1w"; depends=[]; };
+  dssd = derive2 { name="dssd"; version="0.1.0"; sha256="1pcky2rwm0811y2b8lpsm4nv0s4hs5idkk6jwc9kr67kciqziqs3"; depends=[plot3D sf]; };
+  dst = derive2 { name="dst"; version="1.4.0"; sha256="0zr04m33ky98y5n6jbczcfn898i7y8zc1hygfm8p9rrnw93d2lin"; depends=[]; };
   dstat = derive2 { name="dstat"; version="1.0.4"; sha256="023jp0xdbg200ww1gnr3fzgjqd82acag0jps7q6j6m27q11psvgz"; depends=[]; };
   dtables = derive2 { name="dtables"; version="0.2.0"; sha256="0ikgip3p4b7q97b2dshlx0fq09xsk304gfk5prw4rk95w9wck3qs"; depends=[psych]; };
   dtangle = derive2 { name="dtangle"; version="0.3.1"; sha256="0kvds49gx850rmrcja0xr3j9nja5zqnsg1q2zjb07qp425jc3j46"; depends=[]; };
-  dti = derive2 { name="dti"; version="1.4.1"; sha256="0dwrs6bkrznwybpr5g5hsl6si107l3xwzi4g3wqyx0hr03447p9i"; depends=[adimpro awsMethods gsl oro_dicom oro_nifti quadprog rgl]; };
+  dti = derive2 { name="dti"; version="1.4.2"; sha256="0f4ck215p3i1dnl0hzjzrx1llgjd67zyabzwmbj0s5my4byj8xiz"; depends=[adimpro awsMethods gsl oro_dicom oro_nifti quadprog rgl]; };
   dtp = derive2 { name="dtp"; version="0.1.0"; sha256="0qy8nrbq22bfbajkxq6blkq7583pc5mb392gmqb3c9daxmqn42vb"; depends=[Formula gtools plyr]; };
-  dtpcrm = derive2 { name="dtpcrm"; version="0.1.0"; sha256="1zrgg4pz2zr001bl1rvkqxqpyqch4xp97wwfrn9wkf8ylbl08iqv"; depends=[dfcrm diagram]; };
+  dtpcrm = derive2 { name="dtpcrm"; version="0.1.1"; sha256="0k25fm0z3snpx1v2kwd50svgnkjhn5c0hy1gnlw2lif6rjz1fzd9"; depends=[dfcrm diagram]; };
   dtplyr = derive2 { name="dtplyr"; version="0.0.3"; sha256="04yawjzyij0hlarifb9w4bnxybf73crwidvd5nwclscbis22a29r"; depends=[data_table dplyr lazyeval rlang]; };
   dtree = derive2 { name="dtree"; version="0.4.2"; sha256="1cpv0pyf515610djxzfw1c83p3alk5a93clg4x9gk7a7qy4cyhr1"; depends=[caret evtree party partykit rpart]; };
   dtt = derive2 { name="dtt"; version="0.1-2"; sha256="0n8gj5iylfagdbaqirpykb01a9difsy4zl6qq55f0ghvazxqdvmn"; depends=[]; };
   dttr2 = derive2 { name="dttr2"; version="0.0.1"; sha256="042zll9hw4ljwr85x4dmkv8nz6r0mpawaa5s58ngxypshss8sbg0"; depends=[checkr hms]; };
-  dtw = derive2 { name="dtw"; version="1.20-1"; sha256="1w301xwizncy5r8v9rwwdxfshydgp3l1pnjla1fjn6n8lx3imjj3"; depends=[proxy]; };
+  dtw = derive2 { name="dtw"; version="1.21-3"; sha256="02hyhx1sy5h3vzh9zixy18a7d47df4k5d0wyflcvlcbsbcl6p90s"; depends=[proxy]; };
   dtwSat = derive2 { name="dtwSat"; version="0.2.5"; sha256="0qvjzqmi6plkq5l4r52c7wil58n41l5f5dxzpk9r4yis8bdm5zlq"; depends=[caret dtw ggplot2 lubridate mgcv plyr proxy raster RColorBrewer Rdpack reshape2 rgdal scales snow sp xtable zoo]; };
-  dtwclust = derive2 { name="dtwclust"; version="5.5.4"; sha256="0vjgi2j0p1jbbd3dqcrgi9mm6nwyzgjbifyidgdpdshwlxiardvd"; depends=[bigmemory clue cluster dplyr dtw flexclust foreach ggplot2 ggrepel Matrix nloptr proxy Rcpp RcppArmadillo RcppParallel RcppThread reshape2 RSpectra shiny shinyjs]; };
+  dtwclust = derive2 { name="dtwclust"; version="5.5.5"; sha256="1jmbcmkw7kvd0vr8rlnqyi5i8kgnlxm5rwbgjzl8cv2d3v67rm18"; depends=[bigmemory clue cluster dplyr dtw flexclust foreach ggplot2 ggrepel Matrix nloptr proxy Rcpp RcppArmadillo RcppParallel RcppThread reshape2 RSpectra shiny shinyjs]; };
   duawranglr = derive2 { name="duawranglr"; version="0.6.3"; sha256="0swvrdwnbyigsvds3s32nw79b245q3cgv7xskjx7qjcpnvzr7x7q"; depends=[digest dplyr haven readr readxl]; };
   dub = derive2 { name="dub"; version="0.2.0"; sha256="066lzyk44380mf17vx4db4a3a4rs7zl85mj5hjg172khjbqnbixw"; depends=[]; };
   duckduckr = derive2 { name="duckduckr"; version="1.0.0"; sha256="1wki8xvqp5hr27iafd9jbryl9faywfkdkpn0pa0afywbic39k2cm"; depends=[crul jsonlite]; };
@@ -6799,9 +6920,10 @@ in with self; {
   dummy = derive2 { name="dummy"; version="0.1.3"; sha256="081a5h33gw6ym4isy91h6mcf247c2vsdygv9ll07a3mgjcjnk79p"; depends=[]; };
   dunn_test = derive2 { name="dunn.test"; version="1.3.5"; sha256="0lqwvyl3pyygfc73nf81gzw3zl3w43r7ki0yw2dgrzhkpb2iji4a"; depends=[]; };
   dupiR = derive2 { name="dupiR"; version="1.2"; sha256="0p649yw7iz6hnp7rqa2gk3dqkjbqx1f6fzpf1xh9088nbf3bhhz3"; depends=[plotrix]; };
-  durmod = derive2 { name="durmod"; version="1.1-1"; sha256="0v8ww13d71nlhxz6512hc1cdakvn9mb54npvy3zyc2i73avqgisl"; depends=[data_table mvtnorm nloptr numDeriv Rcpp]; };
+  durmod = derive2 { name="durmod"; version="1.1-2"; sha256="1mp97x8px4s53m91m5vnkixgz087wgd4bas64xdbki6y53zimzjj"; depends=[data_table mvtnorm nloptr numDeriv Rcpp]; };
   dvmisc = derive2 { name="dvmisc"; version="1.1.3"; sha256="0x391pxg5mqgp5xxc8qwhwxky8ds7d9gr9iwmsb12c92kxfk00bv"; depends=[cubature data_table dplyr ggplot2 MASS mvtnorm pracma purrr rbenchmark Rcpp survey]; };
   dwapi = derive2 { name="dwapi"; version="0.1.3.1"; sha256="1sz4n8vn7cmlilxzhkm4rdfca0904cbh28n5383p9pr46bdi69q5"; depends=[httr jsonlite readr rjson xml2]; };
+  dwlm = derive2 { name="dwlm"; version="0.1.0"; sha256="0n5dil9qvyy4gish3wnv8bzq0ci1p0dr2vmbbadl29jl7rd1v0rc"; depends=[]; };
   dyads = derive2 { name="dyads"; version="1.1.2"; sha256="014gphxkn0wkdq5zgd71vv9dmzyswgpari59w5mf2070c0rr56n5"; depends=[MASS mvtnorm]; };
   dydea = derive2 { name="dydea"; version="0.1.0"; sha256="15alr3f6wkkpjd5wmcjazi58yc8gwcqr662mjwlfg15r94fzqrlg"; depends=[Chaos01]; };
   dygraphs = derive2 { name="dygraphs"; version="1.1.1.6"; sha256="022j007mzfa9k2n31yg4aizcsf571vv3jip092h23rqj03rk3ly3"; depends=[htmltools htmlwidgets magrittr xts zoo]; };
@@ -6811,14 +6933,14 @@ in with self; {
   dynOmics = derive2 { name="dynOmics"; version="1.2"; sha256="0fsck5wx4rcfckjr6xg0s3a6cvh4881cqzy0af91icqg0p3zjj2l"; depends=[ggplot2 gplots]; };
   dynRB = derive2 { name="dynRB"; version="0.15"; sha256="0fa6g4aj2cncg6mi0yc2yn6321qi7fz9d9cvqrnxhcnbbghdyzq9"; depends=[corrplot dplyr foreign ggplot2 RColorBrewer reshape2 vegan]; };
   dynaTree = derive2 { name="dynaTree"; version="1.2-10"; sha256="1ng672mlv98xnsbd4xq70hxc8j158la4n63y46rw74granaz29ya"; depends=[]; };
-  dynamac = derive2 { name="dynamac"; version="0.1.8"; sha256="1ffpqfsfjkrpgx7lxd16yzddp6izaw8idj8q2k4234ck6349wjmp"; depends=[lmtest MASS]; };
+  dynamac = derive2 { name="dynamac"; version="0.1.9"; sha256="09lbhs1k5n9l57ml7wzrp63rzx4j79vb86jqfdd8zpf1jl512ffh"; depends=[lmtest MASS]; };
   dynamicGraph = derive2 { name="dynamicGraph"; version="0.2.2.6"; sha256="1xnsp8mr3is4yyn0pyrvqhl893gdx2y1zv8d2d55aah2xbfk0fjj"; depends=[ggm]; };
   dynamicTreeCut = derive2 { name="dynamicTreeCut"; version="1.63-1"; sha256="1fadbql7g5r2vvlkr89nlrjxwp4yx4xrdqmv077qvmnx9vv0f4w3"; depends=[]; };
   dynamichazard = derive2 { name="dynamichazard"; version="0.6.5"; sha256="1f12c89p5b6yfhha5gzacf82bjgmvri5xnhhpwcqrxa3mli4d1hb"; depends=[boot nloptr Rcpp RcppArmadillo survival]; };
   dynamo = derive2 { name="dynamo"; version="1.0"; sha256="0arsv686ix7xpca57ayqgifim1q35dl4w2mx7fw8bc0lidapilyp"; depends=[abind glamlasso MortalitySmooth Rcpp RcppArmadillo]; };
   dynatopmodel = derive2 { name="dynatopmodel"; version="1.2.1"; sha256="0lpfhj69bvagqzzg2kjqvn9xx8f93ii34flrrns20z3bxla6gds9"; depends=[deSolve lubridate maptools raster rgdal rgeos sp topmodel xts zoo]; };
   dyncomp = derive2 { name="dyncomp"; version="0.0.2-1"; sha256="13wp2k8nbgrbrqng2dmgy0ixgidk51wq9y7mv5pdbvdajxdsyh11"; depends=[zoo]; };
-  dyndimred = derive2 { name="dyndimred"; version="1.0.1"; sha256="1gj51q88gqdcmrzp1xgs39bidpm2d3v8n586nfbd7cjkyg8dqfrv"; depends=[dynutils irlba Matrix]; };
+  dyndimred = derive2 { name="dyndimred"; version="1.0.2"; sha256="1iqn28vl1vf0jbs0jrngg711lzsrliksvxyf1c8d9zp8k4glris0"; depends=[dynutils irlba]; };
   dynetNLAResistance = derive2 { name="dynetNLAResistance"; version="0.1.0"; sha256="018y3m648ni31rlisjfnrx1d10mm48wpxanlnnxxpnqxjcywg2x8"; depends=[doParallel foreach igraph]; };
   dynfrail = derive2 { name="dynfrail"; version="0.5.2"; sha256="1q7ml24j0ycy2bwpa14vl96315ni7x9rfp0qmf36w00mylgc3ry6"; depends=[dplyr magrittr Rcpp RcppArmadillo survival tibble tidyr]; };
   dynia = derive2 { name="dynia"; version="0.2"; sha256="1swip4kqjln3wsa9xl0g92zklqafarva923nw7s44g4pjdy73d5l"; depends=[]; };
@@ -6827,11 +6949,11 @@ in with self; {
   dynparam = derive2 { name="dynparam"; version="1.0.0"; sha256="0rzkksb0j7vybz4mk9c4sm3zcxdjll1bqx54cbal8a0iq259rigp"; depends=[assertthat carrier dplyr dynutils Hmisc magrittr purrr stringr testthat tibble tidyr]; };
   dynpred = derive2 { name="dynpred"; version="0.1.2"; sha256="111ykasaiznn3431msj4flfhmjvzq7dd1mnzn1wklc5ndix1pvf9"; depends=[survival]; };
   dynprog = derive2 { name="dynprog"; version="0.1.0"; sha256="1rvn2zyhdi60y01zbvfv4him6iz2ljdr7ivkr7m7y7yd1lg547ax"; depends=[rlang]; };
-  dynr = derive2 { name="dynr"; version="0.1.14-9"; sha256="0cxi295kl4kj6h43wclaqmdk0q92l7fgn08kak9gx0vy2f78wjas"; depends=[ggplot2 latex2exp magrittr MASS Matrix mice numDeriv plyr Rdpack reshape2 xtable]; };
+  dynr = derive2 { name="dynr"; version="0.1.14-85"; sha256="0b0fyiyqr2hhzglr6l7k4qfxz2pq3wkq1xcmmsyjyyxj1zj4d5a6"; depends=[ggplot2 latex2exp magrittr MASS Matrix mice numDeriv plyr Rdpack reshape2 xtable]; };
   dynsbm = derive2 { name="dynsbm"; version="0.6"; sha256="0sdy42ihymhzx577jc2qr7lwirc9lviz3sagfy09zhbwizz5a4kw"; depends=[RColorBrewer Rcpp riverplot]; };
   dynsim = derive2 { name="dynsim"; version="1.2.1"; sha256="0nkxn9v4f353fhcn1vsdrh29mrms10zid63b84flg3c6hvc0x4qr"; depends=[ggplot2 gridExtra MASS]; };
-  dynsurv = derive2 { name="dynsurv"; version="0.3-6"; sha256="12bfv6bykgsyxryydhjs89yvk7akam5gy89mzn1hv4ilrpc5mlmw"; depends=[BH ggplot2 nleqslv plyr reshape survival]; };
-  dynutils = derive2 { name="dynutils"; version="1.0.3"; sha256="1cx7r7bji45x0b17cqkr7j68ckdm60dpqvl68sl7v6yd7dkf6h72"; depends=[assertthat crayon desc dplyr magrittr Matrix proxyC purrr Rcpp remotes stringr tibble]; };
+  dynsurv = derive2 { name="dynsurv"; version="0.3-7"; sha256="0ar8n84fpfy68cx321syg8hvjxjnh00mw0a9sid9dw58f956phf8"; depends=[BH ggplot2 nleqslv plyr reshape survival]; };
+  dynutils = derive2 { name="dynutils"; version="1.0.4"; sha256="1rzwcfbv5aqa08fy9i1fiz4a7v3z2skyyjz392rjsbwpnlk77ryh"; depends=[assertthat crayon desc dplyr magrittr Matrix proxyC purrr Rcpp remotes stringr tibble]; };
   e1071 = derive2 { name="e1071"; version="1.7-2"; sha256="0lipj692rjjw8rrhqh2k9i5dh8y2sjrw9q53rwm32irhx2f2j73j"; depends=[class]; };
   eAnalytics = derive2 { name="eAnalytics"; version="0.1.4"; sha256="15hhd4q2yxzq3a3awvk81ixa43hk519ym8ap7v1ahghyr0njnyyf"; depends=[dplyr DT energyr googleVis leaflet plotly shiny shinydashboard shinytest shinyWidgets]; };
   eChem = derive2 { name="eChem"; version="1.0.0"; sha256="0wmf204hqd4s5har5l9bkcbrbmbqbb8m11w2aivi2gs98f3hy51p"; depends=[animation plot3D]; };
@@ -6839,10 +6961,11 @@ in with self; {
   eGST = derive2 { name="eGST"; version="1.0.0"; sha256="0qi4vg0pwy55js9ww1cw85ssim3x7s2p98cjijxvlrvid8sns5bq"; depends=[MASS matrixStats mvtnorm purrr]; };
   eHOF = derive2 { name="eHOF"; version="1.8"; sha256="0g0sb98mlgvhs27s0a1x0ysj3r4p3r7i382fqzfv29kn1ayw0r5c"; depends=[lattice mgcv]; };
   eMLEloglin = derive2 { name="eMLEloglin"; version="1.0.1"; sha256="087zw48lykls2jcsmpqd5jkrlpr0j423snp00liszjhdpdh59saq"; depends=[lpSolveAPI]; };
-  eNetXplorer = derive2 { name="eNetXplorer"; version="1.0.2"; sha256="1rcqy5r3hzra57rdjl477w2khv74s4zk0vcbnp6ypnym0c8k6vzz"; depends=[calibrate expm glmnet gplots Matrix progress RColorBrewer]; };
+  eNetXplorer = derive2 { name="eNetXplorer"; version="1.1.0"; sha256="1n84rf9axvvjf6s0mamf5z889hg3y32mhypasmxc455698z3d1k5"; depends=[calibrate expm glmnet gplots Matrix progress RColorBrewer survcomp survival survivalROC]; };
   ePCR = derive2 { name="ePCR"; version="0.9.9-9"; sha256="0ix7rvh9w4zcp7k0m5bm16wdjs6yr7wvnsc9mssfrwcjx0p57nlx"; depends=[Bolstad2 glmnet hamlet impute pracma survival timeROC]; };
+  eRTG3D = derive2 { name="eRTG3D"; version="0.6.2"; sha256="04m39jkp4lvv145wmcswc87qx36wpfkm95kq9fik8a3jb5myvjll"; depends=[CircStats ggplot2 gridExtra pbapply plotly plyr raster rasterVis sp tiff]; };
   eRm = derive2 { name="eRm"; version="1.0-0"; sha256="11p8j61arq1ih2qi33wf0442vcdbp3zvknzm5aknsifwl4mbzzly"; depends=[lattice MASS Matrix]; };
-  eSDM = derive2 { name="eSDM"; version="0.2.1"; sha256="0s1njyc5xg8wwq1lhajzqx19i5201i92rvavkghkzd0c13kj8dhz"; depends=[colorRamps colourpicker dichromat dplyr DT leaflet lwgeom purrr raster RColorBrewer rlang ROCR sf shiny shinycssloaders shinydashboard shinyjs tmap units viridis]; };
+  eSDM = derive2 { name="eSDM"; version="0.3.0"; sha256="15slr528qbf4nhmwlcbj96gsjhmf8y3pc7dzicy6x5xc5c7r6ywf"; depends=[colorRamps colourpicker dichromat dplyr DT leaflet lwgeom purrr raster RColorBrewer rlang ROCR sf shiny shinycssloaders shinydashboard shinyjs tmap units viridis zip]; };
   eaf = derive2 { name="eaf"; version="1.8"; sha256="1plzvfa2vs3njky7xk9dvic2xapdnzb5iycrksv0qj03ylbh6410"; depends=[modeltools]; };
   earlyR = derive2 { name="earlyR"; version="0.0.1"; sha256="14davqhh3n5dfsddnfd79ni56bssrpwhvkqkdb77a8x9fn8w32pv"; depends=[distcrete EpiEstim epitrix]; };
   earlygating = derive2 { name="earlygating"; version="1.0"; sha256="0y6xjkh9p8bvanc9p5sycah8v81k85xr8i7vyvjb9g4a64srwhd7"; depends=[betareg doParallel foreach]; };
@@ -6859,13 +6982,13 @@ in with self; {
   easySVG = derive2 { name="easySVG"; version="0.1.0"; sha256="03gl5gl0yqgpygd4kna79wrhflbnq3zrz3iq2i8hk9xqd83mszh3"; depends=[]; };
   easySdcTable = derive2 { name="easySdcTable"; version="0.3.3"; sha256="0hhi1nwc84b0mjs2sw2qmvj3cmfkk9kr3rni9fkyyds1dhwgrvvh"; depends=[sdcTable shiny SSBtools]; };
   easyVerification = derive2 { name="easyVerification"; version="0.4.4"; sha256="08mih1arx01vj7cs1jsln644pcvslpyw1rgr6jmv2czr6xd8qb7d"; depends=[pbapply Rcpp SpecsVerification]; };
-  easyalluvial = derive2 { name="easyalluvial"; version="0.2.0"; sha256="1bbygr512zzlyjzmf5lh9bks2f10k1mja5scrrrgf0ls3gnyw8ln"; depends=[caret dplyr e1071 forcats ggalluvial ggplot2 ggridges gridExtra magrittr progress purrr randomForest RColorBrewer recipes rlang stringr tibble tidyr]; };
+  easyalluvial = derive2 { name="easyalluvial"; version="0.2.1"; sha256="1lrlakq84q0xgyh930img6mzz1ffjbcyxqfh80zy7fndwixzwpys"; depends=[caret dplyr e1071 forcats ggalluvial ggplot2 ggridges gridExtra magrittr progress purrr randomForest RColorBrewer recipes rlang stringr tibble tidyr]; };
   easyanova = derive2 { name="easyanova"; version="7.0"; sha256="1zpwh3r1r0n11hgqzph8f2aac44qb6rpnhk73hcblq0f9vs0an55"; depends=[nlme]; };
   easycsv = derive2 { name="easycsv"; version="1.0.8"; sha256="1i2k5372b6a5pypk6m0rsvvkcy0y51pvh57a60rpgqk8q0yq8pig"; depends=[data_table]; };
   easynls = derive2 { name="easynls"; version="5.0"; sha256="1ma2q4y5dxk6q99v880vqfsgy1fha96j7pi8ch699l0pi6bx0d6c"; depends=[]; };
   easypackages = derive2 { name="easypackages"; version="0.1.0"; sha256="00paxdwz4bw3imqhcsw6hj1h0gmnpishlxcj79n826vhdy23jc4y"; depends=[assertthat devtools]; };
   easypower = derive2 { name="easypower"; version="1.0.1"; sha256="1vf0zv55yf96wjxja6ifdjvgc9nw0jl0hnc1ygyjd8pmwbgdz9bl"; depends=[pwr]; };
-  easyreg = derive2 { name="easyreg"; version="3.0"; sha256="09gjxwhwdkz2xfrhllf9g6ylvd7xw6sm5m9zn1983d12xld7kfvm"; depends=[nlme]; };
+  easyreg = derive2 { name="easyreg"; version="4.0"; sha256="1w4wlhziyhdyldm0zgnm73fnxrh0fv8hwcw5j8ircxb4npx7bcgg"; depends=[nlme]; };
   ebGenotyping = derive2 { name="ebGenotyping"; version="2.0.1"; sha256="1jllzc7kvvckrws8qhgvwy626llyb68sp1davp7swx48sf7rwcxc"; depends=[]; };
   ebSNP = derive2 { name="ebSNP"; version="1.0"; sha256="0x3ijwg4yycsfy6jch1zvakzfvdgpiq8i7sqdp5assb8z1823w0b"; depends=[]; };
   eba = derive2 { name="eba"; version="1.9-0"; sha256="1xbjd7n895wzzybpjf634a1jpbwqxwh7l17phz6zv7h6dfw19nx4"; depends=[nlme psychotools]; };
@@ -6881,7 +7004,7 @@ in with self; {
   echarts4r = derive2 { name="echarts4r"; version="0.2.3"; sha256="0yxgxwsyhmbnw3llcgr4xh0i0d74awgsapdw7xsh57wzc539666m"; depends=[broom corrplot countrycode d3r data_tree dplyr htmltools htmlwidgets jsonlite magrittr purrr scales shiny stringi]; };
   echo_find = derive2 { name="echo.find"; version="3.0"; sha256="15rrja2z01y4pbh2w4h2xcnwv9c81ppnb848203vavvlilm475y1"; depends=[boot minpack_lm]; };
   echogram = derive2 { name="echogram"; version="0.1.1"; sha256="0f93s9f1ghin8129vb3bvsp7jmy2hfrx97p86hci8b2y4f7b83qh"; depends=[geosphere readHAC]; };
-  echor = derive2 { name="echor"; version="0.1.2"; sha256="1b2d8xbjnj3daqini1i3hccnpng0ilz9m6rk6ns8qvz7kpaxkjmn"; depends=[dplyr geojsonsf httr lubridate plyr purrr readr rlang tibble tidyr]; };
+  echor = derive2 { name="echor"; version="0.1.3"; sha256="1m843219038jvmwd5fsnlh63nl7as7d4030i6wnksg6pw6v6f1s8"; depends=[dplyr geojsonsf httr lubridate plyr purrr readr rlang tibble tidyr]; };
   ecipex = derive2 { name="ecipex"; version="1.0"; sha256="0pzmrpnis52hvy80p3k60mg9xldq6fx8g9n3nnqi3z56wxmqpdv7"; depends=[CHNOSZ]; };
   eclust = derive2 { name="eclust"; version="0.1.0"; sha256="01x327w02m357lngmgv3drni2s67sass25xk9vni1z434n8i4428"; depends=[caret data_table dynamicTreeCut magrittr pacman pander stringr WGCNA]; };
   ecm = derive2 { name="ecm"; version="4.4.0"; sha256="1f9x3lcihvnkc5fr4g94h0m5a9h4rjmq9hkjs34il2id8bw92gj7"; depends=[car]; };
@@ -6893,7 +7016,7 @@ in with self; {
   ecolottery = derive2 { name="ecolottery"; version="1.0.0"; sha256="0w5aq1aaqzz74vlj8hgnmn60l8rdrchx022dpspqnpvpzdlh65z5"; depends=[abc ggplot2]; };
   econet = derive2 { name="econet"; version="0.1.81"; sha256="0hm1v4fjzyzdaxiw6lar7fxnqsckis3n7nrsravhbllhcf0aqq7w"; depends=[bbmle dplyr igraph intergraph MASS Matrix minpack_lm plyr sna spatstat_utils tnet]; };
   econetwork = derive2 { name="econetwork"; version="0.2"; sha256="0ilqxyvpkiwhhgml19f1rf08bn061nf76d7fby3084ypgc4iwi1b"; depends=[igraph Matrix_utils rdiversity]; };
-  economiccomplexity = derive2 { name="economiccomplexity"; version="0.1.2"; sha256="1g8f9l5p1jzqf1w81n88idq2kwrvq56ss6mgcm4lcirblcrf2jk2"; depends=[dplyr igraph magrittr Matrix rlang tibble tidyr]; };
+  economiccomplexity = derive2 { name="economiccomplexity"; version="0.2.2"; sha256="0hlrpj6mzcvkb7vv4rk32aq7c3782rkd294f59lsbzvfsjzlrz4b"; depends=[dplyr igraph magrittr Matrix rlang tibble tidyr]; };
   econullnetr = derive2 { name="econullnetr"; version="0.1.0.1"; sha256="1ssgvz17a2cpwag786rc6azi3cz74cc4bxz5jjrn1bfq8ch8xqd3"; depends=[bipartite gtools reshape2]; };
   ecoreg = derive2 { name="ecoreg"; version="0.2.2"; sha256="1yzyqvhshgc7ip251y7hsvip4xwf8i92bvvz84mn0mzv5b4mq3im"; depends=[]; };
   ecoseries = derive2 { name="ecoseries"; version="0.1.5"; sha256="1q35hp5hl6z28hns5rnp3mjn6hqp5qh714pagw7fw4d4a6wnvacy"; depends=[magrittr RCurl readr rjson rvest tibble xml2 zoo]; };
@@ -6902,7 +7025,7 @@ in with self; {
   ecospat = derive2 { name="ecospat"; version="3.0"; sha256="1c9cbxs022f2bjnvgdfxhmqkzr30svna596r1fn5i7zsqd7dm0w6"; depends=[ade4 adehabitatHR adehabitatMA ape biomod2 classInt dismo doParallel ecodist foreach gbm gtools iterators maptools MigClim poibin PresenceAbsence randomForest raster rms snowfall sp spatstat vegan]; };
   ecotox = derive2 { name="ecotox"; version="1.4.0"; sha256="1x048njvlq7mp0fpx2nal8znhnkw5cnq2z0rmvknm2m66lfhds7a"; depends=[ggplot2 tibble]; };
   ecotoxicology = derive2 { name="ecotoxicology"; version="1.0.1"; sha256="084xkr59d7x9zxmsnsyym2x8jshz6ag6rvnmhd1i6fzar8ypwccb"; depends=[]; };
-  ecoval = derive2 { name="ecoval"; version="1.2.4"; sha256="1ch5mdzc4w6j84gy02k1bxxi8q0zp9nxr7g2g355gl26v1gb885a"; depends=[jpeg rivernet utility]; };
+  ecoval = derive2 { name="ecoval"; version="1.2.5"; sha256="0rlgi8cd7jdybb2dqx6ndp8rg02bvsvhksmh8vk8g5fg2wk0rll3"; depends=[jpeg rivernet utility]; };
   ecp = derive2 { name="ecp"; version="3.1.1"; sha256="0s0286ky1imhhs89bp1ylx8wvii55v7wzg1g49l03az64971kayj"; depends=[Rcpp]; };
   ecr = derive2 { name="ecr"; version="2.1.0"; sha256="0vvkdxlcqaim9mkgwgdxrx1xhw3lshi1nxfw3kqllq14p3l6xss4"; depends=[BBmisc checkmate ggplot2 parallelMap ParamHelpers reshape2 smoof]; };
   ectotemp = derive2 { name="ectotemp"; version="0.1.2"; sha256="0dy6n2gaz6qgfj2gvavlgl4ic15wq1lb9ykynihi77nyxnz67i46"; depends=[dplyr psych]; };
@@ -6913,12 +7036,12 @@ in with self; {
   edci = derive2 { name="edci"; version="1.1-3"; sha256="1f1ry2adfranfrrvf1gkiy58pra3z6bray4v5fgr0z9n1ybcaff0"; depends=[]; };
   eddi = derive2 { name="eddi"; version="0.0.1"; sha256="19cgrqdcji509igb6rmlwb75xyyvrh34nv6zyjjfcsc31p5nvf95"; depends=[raster rgdal]; };
   edeR = derive2 { name="edeR"; version="1.0.0"; sha256="1dg0aqm5c4zyf015hz1hhn3m4lfvybc4gc1s7sp8jcsk46rxz0cc"; depends=[rJava rjson rJython]; };
-  edeaR = derive2 { name="edeaR"; version="0.8.2"; sha256="1ypicc3vvyal9cswv0jv79p1k6bfgiknh9sgik9187jrsbfcwb99"; depends=[bupaR data_table dplyr ggplot2 ggthemes glue hms lubridate miniUI purrr rlang shiny shinyTime stringr tibble tidyr zoo]; };
+  edeaR = derive2 { name="edeaR"; version="0.8.3"; sha256="18v85mzs5gys3x4vj9dh941xxbfajlp6zly2q7pf842hs33fipbi"; depends=[bupaR data_table dplyr ggplot2 ggthemes glue hms lubridate miniUI purrr rlang shiny shinyTime stringr tibble tidyr zoo]; };
   edesign = derive2 { name="edesign"; version="1.0-13"; sha256="0fc3arr8x9x9kshp6jq4m4izzc5hqyn5vl0ys6x0ph92fc6mybp3"; depends=[]; };
   edf = derive2 { name="edf"; version="1.0.0"; sha256="14ikm6j0ndxrk7c7lh5mbd2aci46d4j9a30mvcgnxy3kq6046a7b"; depends=[]; };
   edfReader = derive2 { name="edfReader"; version="1.2.1"; sha256="076far4fhd6rpa6fwffad4cgchjvar135yblvlrm33s9pd5bf0hn"; depends=[]; };
   edfun = derive2 { name="edfun"; version="0.2.0"; sha256="1wxx6bgy03z7c1d6556bbjl1cb49n2vn734fw2d5c1jk0zsh3fmz"; depends=[]; };
-  edgar = derive2 { name="edgar"; version="2.0.1"; sha256="132wyaf5w1vbvghr079icrra71hk5p8plrk4wx8anag54b5m0q4r"; depends=[qdapRegex R_utils stringi stringr tm XML]; };
+  edgar = derive2 { name="edgar"; version="2.0.2"; sha256="1cxx08l06dv38n5af7wyb22zslwzz5pxvg5r4520zd2k7w2m7k1l"; depends=[qdapRegex R_utils stringi stringr tm XML]; };
   edgarWebR = derive2 { name="edgarWebR"; version="1.0.0"; sha256="0rnf3s5d5sclvd4y195mfkrazg4qvpyyrgl6jcqikygbcz8hg3j8"; depends=[httr xml2]; };
   edgeCorr = derive2 { name="edgeCorr"; version="1.0"; sha256="19n67yc58ksin7xydrnfsyyw7fqawm5xli67cz4lv4wb62w6r6ld"; depends=[]; };
   edgeRun = derive2 { name="edgeRun"; version="1.0.9"; sha256="0d5nc8fwlm61dbi00dwszj1zqlij4gfds3w1mpcqnnfilr2g3di1"; depends=[data_table edgeR]; };
@@ -6938,7 +7061,7 @@ in with self; {
   eesim = derive2 { name="eesim"; version="0.1.0"; sha256="0ljj1jp9cl0im8k7sfjd28ggj4q9a14df3554kwxkssr1vsn1wbc"; depends=[dplyr lubridate purrr viridis]; };
   effectFusion = derive2 { name="effectFusion"; version="1.1.1"; sha256="1z3m1wadl5qs37mbj335xghinji9qx9njrd9ckvz63xh1sgpz89i"; depends=[bayesm cluster ggplot2 GreedyEPL gridExtra MASS Matrix mcclust]; };
   effectR = derive2 { name="effectR"; version="1.0.2"; sha256="1icr1sx98x3h8rbky1agdh809arhjqcypyajl7y50yis8a5pkycb"; depends=[ggplot2 reshape2 rmarkdown seqinr shiny viridis]; };
-  effects = derive2 { name="effects"; version="4.1-1"; sha256="1j3arsysyxssq5rhz779h8ffryxvashxhf5j0z08p2p7xhv7s3ns"; depends=[carData colorspace estimability lattice lme4 nnet survey]; };
+  effects = derive2 { name="effects"; version="4.1-2"; sha256="08v77w52ds5v20vj6brqfri714mr8i65jffsqaa4brkg4li4bjqi"; depends=[carData colorspace estimability lattice lme4 nnet survey]; };
   effectsizescr = derive2 { name="effectsizescr"; version="0.1.0"; sha256="0shfjk6r3bz04jakrn5nwgymjx60lk83i0akcx7zqfxp3k8yncs5"; depends=[Kendall]; };
   efflog = derive2 { name="efflog"; version="1.0"; sha256="1sfmq7xrr6psa6hwi05m44prjcpixnrl7la03k33n0bksj8r1w6b"; depends=[]; };
   effsize = derive2 { name="effsize"; version="0.7.6"; sha256="129vs8kp10h6yhrrmn77518120bmfr55l6nkpbxkvylnr641b5a2"; depends=[]; };
@@ -6947,15 +7070,14 @@ in with self; {
   ega = derive2 { name="ega"; version="2.0.0"; sha256="04kwh24aap22yclmcrix3vi553qb30hd43mgfzpdl0cw3ibrh7xg"; depends=[ggplot2 mgcv]; };
   egcm = derive2 { name="egcm"; version="1.0.12"; sha256="0nssf5six1j7z6fss7478zdbsfx60myzw833m7nsnaf1r8n4ixaf"; depends=[ggplot2 MASS pracma quantmod tseries urca xts zoo]; };
   egg = derive2 { name="egg"; version="0.4.5"; sha256="1fy7srpiavfn8kyrr1m84an7acgwi6ydzrg71m3b0vk7y9ybmj0m"; depends=[ggplot2 gridExtra gtable]; };
-  eggCounts = derive2 { name="eggCounts"; version="2.2"; sha256="0y1335m8cmayaprgkzs7ws959mxlr3l71p203s3n732dz51smmbz"; depends=[BH boot coda lattice numbers Rcpp RcppEigen rootSolve rstan StanHeaders]; };
+  eggCounts = derive2 { name="eggCounts"; version="2.2-1"; sha256="01lbinwc91pyynhny3lpdh0gb8fffk4dq8a99ps0mbsk8aa5735j"; depends=[BH boot coda lattice numbers Rcpp RcppEigen rootSolve rstan StanHeaders]; };
   egoTERGM = derive2 { name="egoTERGM"; version="2.1.1"; sha256="1zp3kr7s43rjp45qbd6lv48mbmby5rrz1vdz9s64v43rjm8v2jyz"; depends=[boot btergm ergm GGally Matrix network sna speedglm xergm_common]; };
-  egor = derive2 { name="egor"; version="0.19.1"; sha256="0sfms7yvdhqk5qn9dh4j1fp8b2md6l04hdv2psjdzhqyxl29bxfw"; depends=[dplyr igraph network plyr purrr shiny survey tibble tidyr]; };
-  eha = derive2 { name="eha"; version="2.6.0"; sha256="0nw72jcwcx2rzlzsrmdvg7pymyzf5icynidlr1m9b70v6rnqr84b"; depends=[survival]; };
+  eha = derive2 { name="eha"; version="2.7.6"; sha256="01q75bn3r06zwbfa6p69whdkilqx53ysxa3cz2d50jvd79bqlf4h"; depends=[survival]; };
   ei = derive2 { name="ei"; version="1.3-3"; sha256="0i8pvpal23zwsqldhmm3iis4vw9s08mlydpshaig2dsd9549gn11"; depends=[cubature eiPack ellipse foreach MASS mnormt msm mvtnorm plotrix sp tmvtnorm ucminf]; };
   eiCompare = derive2 { name="eiCompare"; version="2.1"; sha256="0kv4k1zk1gz3fapy2i2ydy0n38hy95i10r3hr3dx8mkkf3nsj46h"; depends=[cubature data_table ei eiPack ellipse foreach ggplot2 magrittr mnormt msm mvtnorm plotrix plyr R_utils stringr tidyr tmvtnorm ucminf]; };
   eiPack = derive2 { name="eiPack"; version="0.1-9"; sha256="1rivccqfr5hz80xgfw652993zg0pw7yd0by52hyp7bwm89gsjksq"; depends=[coda MASS msm]; };
   eiPartialID = derive2 { name="eiPartialID"; version="0.1.2"; sha256="0721p89llzjznz2b6zlf54v7fy9lb9c5qb7w8q0l582iy5cwaw35"; depends=[eco MASS sandwich]; };
-  eia = derive2 { name="eia"; version="0.3.2"; sha256="1p994salk4rn86fjcwm3m9y5lfalmx0wac3xnrfm48w9qx7ms15z"; depends=[dplyr httr jsonlite lubridate magrittr memoise purrr tibble]; };
+  eia = derive2 { name="eia"; version="0.3.3"; sha256="0yl09g4gbcig6c1hkd4qb2vnnf77inc02mb6c96h5mjykazbn8s5"; depends=[dplyr httr jsonlite lubridate magrittr memoise purrr tibble]; };
   eigeninv = derive2 { name="eigeninv"; version="2011.8-1"; sha256="18dh29js824d7mrvmq3a33gl05fyldzvgi8mmmr477573iy9r30g"; depends=[]; };
   eigenmodel = derive2 { name="eigenmodel"; version="1.11"; sha256="1l3n0z736xf3x6cyxzmmq1jb2glxi2b75z7v39y4471knh6nbb4d"; depends=[]; };
   eigenprcomp = derive2 { name="eigenprcomp"; version="1.0"; sha256="156qyv7sl8nng55n3ay6dnpayyfrqv27ndz40xf4w92is9zmymy0"; depends=[]; };
@@ -6974,6 +7096,7 @@ in with self; {
   elect = derive2 { name="elect"; version="1.2"; sha256="1hjqhmdklspssa75x8xdhv2narqgw80qh259hyfwfgnvva97w2ja"; depends=[msm nnet]; };
   elections = derive2 { name="elections"; version="1.0"; sha256="0ig3pd1dw978g2sg4ynzd3p15nk6hx17pxvbxfi5rm131mjdmjdm"; depends=[]; };
   electionsBR = derive2 { name="electionsBR"; version="0.3.1"; sha256="0yxaxd84d13mb6xbixgm9rd56alrh5qnrmh54n1h94mna89jb103"; depends=[data_table dplyr haven magrittr readr]; };
+  electivity = derive2 { name="electivity"; version="1.0.2"; sha256="0clxsn9zkpdlq9jgq029ag310ji0hd0l23wfyqh8gkkj0091ip5a"; depends=[]; };
   electoral = derive2 { name="electoral"; version="0.1.1"; sha256="0lmw9kwr189dzfxzlns9fmhrdy93ja8jl2s4jir07lichyiavs03"; depends=[dplyr ineq tibble]; };
   elementR = derive2 { name="elementR"; version="1.3.6"; sha256="12gg2x6xzms2ni80qdm04bfajg55ff6zkki0y2cz47kq70wzfkmg"; depends=[abind colourpicker devtools EnvStats gdata gnumeric httpuv lmtest outliers R6 reader readODS readxl shiny shinydashboard shinyjs stringr tcltk2 zoo]; };
   elevatr = derive2 { name="elevatr"; version="0.2.0"; sha256="0721w28pb07ndw24k4zssh5r90fd4mf33yxigricnz23z29ql120"; depends=[httr jsonlite progress raster sf sp]; };
@@ -6982,14 +7105,15 @@ in with self; {
   elitism = derive2 { name="elitism"; version="1.0.4"; sha256="0n5g1nd1dd5wc76qa2va1lyxahg9p062l8wdqzq43ah6943pjzgr"; depends=[MASS]; };
   elliplot = derive2 { name="elliplot"; version="1.2.0"; sha256="186i4gr8k9bifzssblln8z6wxfmnplls3kc4m2liiz86mzsnim9r"; depends=[]; };
   ellipse = derive2 { name="ellipse"; version="0.4.1"; sha256="0g82vc51m3c1k0hnpp2zla6amxxgk2mmkl8ssnsc49jv3599r6hs"; depends=[]; };
-  ellipsis = derive2 { name="ellipsis"; version="0.2.0.1"; sha256="0hx9l043433bwm1np9sypph77c7y9dddpz0wrhbkcv01x32jhr8f"; depends=[rlang]; };
+  ellipsis = derive2 { name="ellipsis"; version="0.3.0"; sha256="01z9gq311nzwv3a0sa49jhm5ylqd59srip4vjkrf23hzgb5i9y0b"; depends=[rlang]; };
   elliptic = derive2 { name="elliptic"; version="1.4-0"; sha256="1dhba0yfxjd5rlqsxp5a7s2hclfkla9wigsr39dlma67l6qjjmxn"; depends=[MASS]; };
   elmNNRcpp = derive2 { name="elmNNRcpp"; version="1.0.1"; sha256="1n71b5pqd1szhmp4q1h9aqgkx7s54f5i3xk5nljwzsn7cyih1kb3"; depends=[KernelKnn Rcpp RcppArmadillo]; };
   elo = derive2 { name="elo"; version="2.0.0"; sha256="0cryr1cgvs5z54piw6yrv9fd7nrqv1kwxw5ahx46k7qxdgr5bb2s"; depends=[pROC Rcpp]; };
+  elrm = derive2 { name="elrm"; version="1.2.4"; sha256="11xcny3kxjcqyp37v7pcnmsinz9b8n13xlng7649r4p0vdkjf774"; depends=[coda]; };
   emIRT = derive2 { name="emIRT"; version="0.0.8"; sha256="17igda5phgfapjzg7dkid5jj49gmwgpadjr27z7s21365i7md9mz"; depends=[pscl Rcpp RcppArmadillo]; };
   emax_glm = derive2 { name="emax.glm"; version="0.1.2"; sha256="04di6bp97cxjbbszakb64y15bjmnd2j8zvxdj8gdbgmhxk9wmbwd"; depends=[AER MASS pander pracma pROC]; };
-  embed = derive2 { name="embed"; version="0.0.3"; sha256="1kjrnjh683ly3mi4rshyw8hz2sci38n8zmin4llkhgcs249z99hz"; depends=[dplyr generics keras lme4 purrr recipes rlang rstanarm tensorflow tibble tidyr uwot withr]; };
-  embryogrowth = derive2 { name="embryogrowth"; version="7.4.1"; sha256="1qha6l7q0565fn9yfvp04dmlpf21hr754gh6fpzhqnrh58h371v1"; depends=[deSolve HelpersMG numDeriv optimx]; };
+  embed = derive2 { name="embed"; version="0.0.4"; sha256="02rwifkpghwymsqnkn43p2gylnlxk2a3bqmssh7amd3d6rpl3wl8"; depends=[dplyr generics keras lme4 purrr recipes rlang rstanarm tensorflow tibble tidyr uwot withr]; };
+  embryogrowth = derive2 { name="embryogrowth"; version="7.6"; sha256="0bsg904jikb1dqichkinpgm0difg17sfczw6q4zab6r02s7yb53s"; depends=[deSolve HelpersMG numDeriv optimx]; };
   emdbook = derive2 { name="emdbook"; version="1.3.11"; sha256="0a515jdzvg87npvrh7md7zp0v5nlz7c2jr7pba5dql6slb0d8j7q"; depends=[bbmle coda lattice MASS plyr]; };
   emdi = derive2 { name="emdi"; version="1.1.5"; sha256="06v982rw8sz22w624hr68vdgxmfmi5na11ywsg6qr77jvgbprgz4"; depends=[boot ggplot2 gridExtra HLMdiag maptools MASS moments MuMIn nlme openxlsx parallelMap readODS reshape2 rgeos]; };
   emdist = derive2 { name="emdist"; version="0.3-1"; sha256="1z14pb9z9nkd0f2c8pln4hzkfqa9dk9n3vg8czc8jiv0ndnqi7rq"; depends=[]; };
@@ -6998,7 +7122,7 @@ in with self; {
   emld = derive2 { name="emld"; version="0.2.0"; sha256="08kncxrc4yj32wcl6h1sszrajfi41m87sivc94py40c9bxpmnmmf"; depends=[jsonld jsonlite xml2 yaml]; };
   emma = derive2 { name="emma"; version="0.1-0"; sha256="0psd8lrbcqla8mkhp0wlassaaimgwlmqy5yv2wwcq59mc5k1v27f"; depends=[clusterSim earth]; };
   emme2 = derive2 { name="emme2"; version="0.9"; sha256="035s4h95ychqb14wib0dqbg4sjy9q01fsryr0ri25g1hsi5f8lpm"; depends=[reshape]; };
-  emmeans = derive2 { name="emmeans"; version="1.4"; sha256="1ynf9hhbch83k63lwps69ijfch30fk5v0sc418ck264c5vih26dh"; depends=[estimability mvtnorm numDeriv plyr xtable]; };
+  emmeans = derive2 { name="emmeans"; version="1.4.1"; sha256="1fpawaxnmj67md169a9mzrnnh2d0c973xydfg6hw865933jil9lq"; depends=[estimability mvtnorm numDeriv plyr xtable]; };
   emoa = derive2 { name="emoa"; version="0.5-0"; sha256="1wcnsnkdmpcn21dyql5dmj728n794bmfr6g9hgh9apzbhn4cri8p"; depends=[]; };
   emojifont = derive2 { name="emojifont"; version="0.5.2"; sha256="0s1as6i5dz2rbd1aashn99fji2iksjzrkdkfi7wqnnxxpmkha3yx"; depends=[ggplot2 proto showtext sysfonts]; };
   emon = derive2 { name="emon"; version="1.3.2"; sha256="19khjjpyxvzhzihqq15w02l5v5ryyvxlklz1ch2gkmqcpnvyga32"; depends=[MASS mgcv]; };
@@ -7009,7 +7133,7 @@ in with self; {
   emplik2 = derive2 { name="emplik2"; version="1.21"; sha256="1980bwc4fc4rwzlwya030n5rv8rq0s82hnw955mvaxrbmicnqlla"; depends=[]; };
   ems = derive2 { name="ems"; version="1.2.7"; sha256="1l4javnfhlb6y40dpdvri2795yj0s9zqf8bi02s5llx5lcq3bxbd"; depends=[]; };
   emstreeR = derive2 { name="emstreeR"; version="2.2.0"; sha256="1qbv61j2ya6zvyp8494xi8dhjlb58jmqil9cm5z0pr7p2sr6l32r"; depends=[BBmisc BH ggplot2 Rcpp RcppArmadillo RcppMLPACK scatterplot3d]; };
-  emuR = derive2 { name="emuR"; version="2.0.2"; sha256="1a5ylfw9x6bbycamj5dj4hj3ssx701nkn11rngcysy50ppdwr2ll"; depends=[base64enc compare DBI dplyr git2r httpuv jsonlite MASS mime purrr RCurl readr rlang RSQLite rstudioapi shiny stringr tibble tidyr uuid wrassp]; };
+  emuR = derive2 { name="emuR"; version="2.0.3"; sha256="1js04f9id5v3mf1kqwffrxag6949grma088cvzir4fp356izz8zs"; depends=[base64enc compare DBI dplyr git2r httpuv jsonlite MASS mime purrr RCurl readr rlang RSQLite rstudioapi shiny stringr tibble tidyr uuid wrassp]; };
   emulator = derive2 { name="emulator"; version="1.2-20"; sha256="11z25iqyzck0s4hw0i86i9jsi52w9bjxx3zdpafssyfqfk7z5avw"; depends=[mvtnorm]; };
   enaR = derive2 { name="enaR"; version="3.0.0"; sha256="0sy7k8l6b8p34bcf9bpjr1y6qkjkvn77y2w2ws7ivcr1fynrhm5p"; depends=[gdata limSolve MASS network sna stringr]; };
   enc = derive2 { name="enc"; version="0.2.1"; sha256="0lx159hj464i9libaa3qy96avdwq220333h7pbdh94xz6jrn7k73"; depends=[]; };
@@ -7025,7 +7149,7 @@ in with self; {
   english = derive2 { name="english"; version="1.2-3"; sha256="1gyj3wzx9spibmly7blw2i3gx9gvy22iy8js4r9gn8d3hpv4yf98"; depends=[]; };
   engsoccerdata = derive2 { name="engsoccerdata"; version="0.1.5"; sha256="06fdgjgnk4lwshrkd0jad411x5nz9sxlri9fdhxrf2dr2hik4l8q"; depends=[dplyr magrittr tidyr]; };
   enpls = derive2 { name="enpls"; version="6.1"; sha256="12088v9xnj5b3dlakqz1hbzxz4mdai7xi7s2fpx8lj3y3lx7znmb"; depends=[doParallel foreach ggplot2 plotly pls reshape2 spls]; };
-  enrichR = derive2 { name="enrichR"; version="2.0"; sha256="056m6hksfss29fj7zvlk7pbh8g3gq84kjh3240isrsnhp9m1h9iz"; depends=[httr rjson]; };
+  enrichR = derive2 { name="enrichR"; version="2.1"; sha256="0ymhzs9d2wl0s9rvbqc1hqb78mlzwhlc7mmijpfqkm5r720pf6m1"; depends=[httr rjson]; };
   enrichvs = derive2 { name="enrichvs"; version="0.0.5"; sha256="0x91s03hz1yprddm6mqi75bm45ki3yapfrxmap7d4qc0hi06h22k"; depends=[]; };
   enrichwith = derive2 { name="enrichwith"; version="0.2"; sha256="063q4jbs6054djk6qf3105p7na4kndvr549w5c4fiz8264r8bnvv"; depends=[]; };
   ensembleBMA = derive2 { name="ensembleBMA"; version="5.1.5"; sha256="0p744151pbj278lyc8d8p7rc20n70abpfgxz6jr10jarmq3r6x7l"; depends=[chron]; };
@@ -7036,10 +7160,10 @@ in with self; {
   ensurer = derive2 { name="ensurer"; version="1.1"; sha256="1gbbni73ayzcmzhxb88pz6xx418lqjbp37sdkggbrxcyhsxpdkid"; depends=[]; };
   entropart = derive2 { name="entropart"; version="1.6-1"; sha256="0cc40xf2lf2vxxnamn26fkrch9lmpbqm4am743yq7bmprfbn4cc4"; depends=[ade4 ape EntropyEstimation geiger ggplot2 ggpubr reshape2 vegan]; };
   entropy = derive2 { name="entropy"; version="1.2.1"; sha256="10vg4818q5g54pv2nn9x5i7pvky5nsv96syy47pz2mgqp1273cpd"; depends=[]; };
-  envDocument = derive2 { name="envDocument"; version="2.4.0"; sha256="0r7h9p0b0gr2l18mv1ydlamsc0iq474dfhp450mdfnw2q289mhrn"; depends=[]; };
+  envDocument = derive2 { name="envDocument"; version="2.4.1"; sha256="074m7adnasvys28kjdgj9071fi90vsl4yv5zvpxik4crlx098dlw"; depends=[]; };
   envalysis = derive2 { name="envalysis"; version="0.3.3"; sha256="1ys93g5gxr9x1v4hg98dcpwa40n5xkh1j8drrmpnmxwq6gv01r6r"; depends=[drc ggplot2]; };
   enveomics_R = derive2 { name="enveomics.R"; version="1.4.4"; sha256="06pj5mla76w90mrzqlv7szcs7psaxhl6y0w0v0w6f8nlxx06nm3v"; depends=[fitdistrplus investr sn]; };
-  enviGCMS = derive2 { name="enviGCMS"; version="0.5.5"; sha256="15jrkc7yc9s2xh2zlh9gq9y1vz8ajh4k3vlj73393sxr6cc8g4l9"; depends=[animation BiocParallel broom crosstalk data_table dplyr DT genefilter ggplot2 ggraph ggridges igraph iterators itertools mixtools plotly rcdk RColorBrewer reshape2 rmarkdown shiny shinythemes]; };
+  enviGCMS = derive2 { name="enviGCMS"; version="0.5.7"; sha256="00hydrvawm2zx6d8dcfd5p5l01lvrk5hsfq8k67b2iysjn2sh531"; depends=[animation BiocParallel broom crosstalk data_table dplyr DT genefilter ggplot2 ggraph ggridges igraph iterators itertools mixtools plotly rcdk RColorBrewer reshape2 rmarkdown shiny shinythemes]; };
   enviPat = derive2 { name="enviPat"; version="2.4"; sha256="1gvb7jmwwh4l44b50xmrq3bysr2iv6442yh9pdk6n81g3bgpz1d0"; depends=[]; };
   enviPick = derive2 { name="enviPick"; version="1.5"; sha256="04q6zwqq2ip8b8h2n1jpgx1bzcvi7lazljs0806wiakbc79x232p"; depends=[readMzXmlData shiny]; };
   envirem = derive2 { name="envirem"; version="2.0"; sha256="150sqyc4k3cq12dl4ivbc4w0gmqfrkxj80mfk4ak4f5zp770k30a"; depends=[huxtable palinsol raster RSAGA sp]; };
@@ -7050,18 +7174,19 @@ in with self; {
   epandist = derive2 { name="epandist"; version="1.1.1"; sha256="0hxgbjns5bk82rgcmykxifnnxcnqdzmkimkkmpdif64zr5g3gjdg"; depends=[]; };
   epanet2toolkit = derive2 { name="epanet2toolkit"; version="0.3.2"; sha256="0j64riiy7b2v1m8ki6d43jm61s7yjwlx4kxxdvlz3fx1xw7qf522"; depends=[]; };
   epanetReader = derive2 { name="epanetReader"; version="0.7.3"; sha256="05pwa6z03qsjwr9pxpbxycsd21p7mf5j5ajyg4yaas5g100s1k8c"; depends=[]; };
+  eph = derive2 { name="eph"; version="0.1.1"; sha256="1j555gqyvk8zmiqijm50zxr7isgn8adinj9545s4qjzz2s6n52l8"; depends=[assertthat dplyr expss glue janitor magrittr purrr questionr readr readxl stringr tidyr]; };
   epiDisplay = derive2 { name="epiDisplay"; version="3.5.0.1"; sha256="08ym6hcbmajzr4rasdb35fxk79vgpzfc16rmcm34f7f3zzz09dyl"; depends=[foreign MASS nnet survival]; };
-  epiGWAS = derive2 { name="epiGWAS"; version="1.0.1"; sha256="07cvk1lz76j5l69s3w4f57xagi2iqk99xl6ckf56i7xb5liqwgvc"; depends=[DescTools glmnet matrixStats SNPknock]; };
-  epiR = derive2 { name="epiR"; version="1.0-2"; sha256="0phmmckac4b312aq83m6fx52w8m5hmkpv10w912b3dgyj0vysm17"; depends=[BiasedUrn survival]; };
+  epiGWAS = derive2 { name="epiGWAS"; version="1.0.2"; sha256="0jqblfmz02za3b2pgi15379bzgh98yv5kyv8kh0lkzhrmpgph2zj"; depends=[DescTools glmnet matrixStats SNPknock]; };
+  epiR = derive2 { name="epiR"; version="1.0-4"; sha256="0qdcav8dix8bgp5cp54g288sccqinrv1zj1wp49rgnzcy4n6a0c2"; depends=[BiasedUrn survival]; };
   epibasix = derive2 { name="epibasix"; version="1.5"; sha256="0ivr51x37cbdryli9b4p4iq9v2c90zwmywrwdmg7ryq5vprvvbp0"; depends=[]; };
   epicontacts = derive2 { name="epicontacts"; version="1.1.0"; sha256="0f4a1y311z3fxw7ygj6fgsq6d2qn0ivxsjlh742pkmg3jb63s0f3"; depends=[colorspace dplyr igraph magrittr threejs visNetwork]; };
   epidata = derive2 { name="epidata"; version="0.3.0"; sha256="1b00k086wiwhhrlh4348wqqza1v0whakwy5h7q95rmgxz7lppiim"; depends=[dplyr httr jsonlite purrr readr rvest stringi tidyr xml2]; };
   epiflows = derive2 { name="epiflows"; version="0.2.0"; sha256="09ri1p73ih0i08irc06ff169hi5vcl8bdi63b056kzxgmv17yqkp"; depends=[epicontacts geosphere ggmap ggplot2 htmltools htmlwidgets leaflet sp tibble visNetwork]; };
-  epimdr = derive2 { name="epimdr"; version="0.6-3"; sha256="1lrfmaggxifnm85b45x7jfq0i8nxswggmrzaxbpxjh6p1mdjaism"; depends=[deSolve phaseR polspline shiny]; };
+  epimdr = derive2 { name="epimdr"; version="0.6-4"; sha256="15j0gz8pqvmjb8q7bp1bnpv8mz63cq0j5kikp3h1146nzcnlxmaw"; depends=[deSolve polspline shiny]; };
   epinet = derive2 { name="epinet"; version="2.1.8"; sha256="10bgq66n99kkz0nhmsz508aypxk57zk19p5l3xrb28n72k4rfgrf"; depends=[network]; };
   epiphy = derive2 { name="epiphy"; version="0.3.4"; sha256="04wsppjycnrzrml3zxrpr0xdxxas3hj8rskiivx5vfmfjpwipq4r"; depends=[ggplot2 msm pbapply Rcpp transport]; };
   episcan = derive2 { name="episcan"; version="0.0.1"; sha256="02687f8gpc2czn19lapvazd6mnm8902ay0lhgi3wdrzfhir42m4r"; depends=[]; };
-  episensr = derive2 { name="episensr"; version="0.9.3"; sha256="0c7sk0bff0sssh0k92k213n6w4im9d8jnr0dkr8417mah5x16ahb"; depends=[actuar boot ggplot2 gridExtra magrittr plyr reshape trapezoid triangle]; };
+  episensr = derive2 { name="episensr"; version="0.9.4"; sha256="1cjfmj9alf46mpfzx7jfh6yrn7i4ldpnks28zxk42ln1zhb6jh6f"; depends=[actuar boot ggplot2 gridExtra magrittr plyr reshape trapezoid triangle]; };
   episheet = derive2 { name="episheet"; version="0.4.0"; sha256="0y3wy91hr3b9iky5k81mf897wg2gcdv05afhndjqwcfb0xkn2f9q"; depends=[assertthat dplyr ggplot2 magrittr rlang tidyr]; };
   episode = derive2 { name="episode"; version="1.0.0"; sha256="1djk36jkvr8xvhfddqg6xsmhxc3yrgivkm8g2hr4n1qixsk1ad8m"; depends=[glmnet Matrix nnls Rcpp RcppArmadillo]; };
   episplineDensity = derive2 { name="episplineDensity"; version="0.0-1"; sha256="0nmh97xajnnh54i04yq8fdici4n5xvcbpdbjdbz79483gnils4vn"; depends=[nloptr pracma]; };
@@ -7071,13 +7196,13 @@ in with self; {
   epitrix = derive2 { name="epitrix"; version="0.2.2"; sha256="1rqpvdky002h6mz636b77l4kd0im16pww62l6vnwh83si1m9pkki"; depends=[distcrete sodium stringi]; };
   eplusr = derive2 { name="eplusr"; version="0.10.3"; sha256="1mmzqbn1zhc742cqblmwpc4k94r0zqmzwyxi5sv5d11dfj5mszzd"; depends=[callr cli crayon data_table later lubridate processx progress R6 RSQLite stringi units]; };
   eply = derive2 { name="eply"; version="0.1.2"; sha256="0al44pvqf6ls3dh129vlv3g56hk1nbql09rj0qsb04d9kaz9anrp"; depends=[magrittr]; };
-  epoc = derive2 { name="epoc"; version="0.2.6-1"; sha256="0q17sf2q3yj9sia9m1d23q6li6fkvgmj2a73kl1im8aiaxwcq2m1"; depends=[elasticnet irr lassoshooting Matrix survival]; };
+  epoc = derive2 { name="epoc"; version="0.2.6-1.1"; sha256="1qlj4cl7mh5k52v2ippfs3cish5iadnix5w46p25hjqiriksclna"; depends=[elasticnet irr lassoshooting Matrix survival]; };
   epos = derive2 { name="epos"; version="0.1.0"; sha256="0b9r552hbrs281z7pxxw1hxgv9d15qmyzvgk5xsrgh8wivkh4lwp"; depends=[dplyr ggplot2 gridExtra hashmap stringr testthat tidyr TopKLists xtable]; };
   epr = derive2 { name="epr"; version="3.0"; sha256="0czfz6qkcpa2qqs3pqii27hgpdvdzfrvxl0ip67v58hamq7kvjfv"; depends=[car lme4]; };
   epsiwal = derive2 { name="epsiwal"; version="0.1.0"; sha256="0lmcmiqcc1pjj1d0zyn0hc23if1lkm85p6vcjqbddpnv9ags2mbh"; depends=[]; };
   epubr = derive2 { name="epubr"; version="0.6.0"; sha256="0zzra5vpfsw62c19yah7fwm8xlrwnrlsb34d46wd1ssays6arf01"; depends=[dplyr magrittr tidyr xml2 xslt]; };
-  epxToR = derive2 { name="epxToR"; version="0.3-0"; sha256="0ckz7cvqsdilfkqap88brh4av9zv1fl3ijs4h4vlwwn7qvdcnhay"; depends=[httr XML]; };
-  eq5d = derive2 { name="eq5d"; version="0.2.0"; sha256="1h2mpj3l6wcwfkj1yzc4w17yzr2ir21zvz7qpv1h1b7qjdkbcrw4"; depends=[]; };
+  epxToR = derive2 { name="epxToR"; version="0.4-0"; sha256="1vw9czdxp80jpvcc8bj5m4fshlavlawc1735m0s0d0x14z3giy6g"; depends=[httr XML]; };
+  eq5d = derive2 { name="eq5d"; version="0.3.0"; sha256="1a2x3zmil76vkvp47iynxhbixsywv4a5i1vxmnqyqigv5v03bqnf"; depends=[]; };
   eqs2lavaan = derive2 { name="eqs2lavaan"; version="3.0"; sha256="1lj6jwkfd84h9ldb6l74lrx2pnsl1c0d7mnrcrjkska87djb2nzd"; depends=[lavaan stringr]; };
   eqtl = derive2 { name="eqtl"; version="1.1-7"; sha256="0xfr8344irhzyxs9flnqn4avk3iv1scqhzac5c2ppmzqhb398azr"; depends=[qtl]; };
   equSA = derive2 { name="equSA"; version="1.2.1"; sha256="0gbv7jvjivnril3cmvknzmqlmpb4mv0rhqwk1i87wqxsvrgplik1"; depends=[bnlearn doParallel foreach huge igraph mvtnorm ncvreg SIS speedglm survival XMRF ZIM]; };
@@ -7119,13 +7244,13 @@ in with self; {
   eshrink = derive2 { name="eshrink"; version="0.1.0"; sha256="0s1jl652za7qwv70kmc1h3vbwlijl49527pwpm0z347lz2jdcigj"; depends=[glmnet MASS]; };
   esmisc = derive2 { name="esmisc"; version="0.0.3"; sha256="1d6xrdxwn85c8s60s7vzaymh7wa9f7fzd79hq5spzd12fr3zisvj"; depends=[ggplot2 raster readr]; };
   esmprep = derive2 { name="esmprep"; version="0.2.0"; sha256="076sm26mkkvig2g04k32z2dlp2h9gnqgzckhirl4pqm01siknl61"; depends=[lubridate]; };
-  esquisse = derive2 { name="esquisse"; version="0.2.1"; sha256="0639b0hd83hx1qbp5rymqif5bcziv883xawx8fs89pwp4484lnkz"; depends=[ggplot2 ggthemes hrbrthemes htmltools jsonlite miniUI RColorBrewer rlang rstudioapi scales shiny shinyWidgets stringi]; };
+  esquisse = derive2 { name="esquisse"; version="0.2.2"; sha256="1k18lrg5417s1mjm01m6nn81w959naybdqj74zrr8gbphlk8s4xx"; depends=[ggplot2 ggthemes hrbrthemes htmltools jsonlite miniUI RColorBrewer rlang rstudioapi scales shiny shinyWidgets stringi]; };
   esreg = derive2 { name="esreg"; version="0.4.0"; sha256="1qfidbmdrm4vy72yjnpaadhm993xv6qqy44a8hk0l4isvmg51a5i"; depends=[Formula quantreg Rcpp RcppArmadillo]; };
   essHist = derive2 { name="essHist"; version="1.2.2"; sha256="0rvlxfcl42h4pjqf37mx7bc4k21iwvnys6l5rf2jsl7yk1b9hmbn"; depends=[Rcpp]; };
   essurvey = derive2 { name="essurvey"; version="1.0.2"; sha256="0r1hkdksidx974pi08hg25qlzfxazqmzamwqg2njks2r9xk299p8"; depends=[haven httr rvest stringr xml2]; };
   estatapi = derive2 { name="estatapi"; version="0.3.0"; sha256="0gjc5x1b2l5qnwdg77nzy6d7bf9q93ll39sfy89izqm8wsydwwkp"; depends=[dplyr httr purrr readr]; };
   estimability = derive2 { name="estimability"; version="1.3"; sha256="0cifdaa71spkcxl4db4z884jrya865sg3dhcv4isd8fnzg2pjcd3"; depends=[]; };
-  estimatr = derive2 { name="estimatr"; version="0.18.0"; sha256="1284vxlr4vrivvf03kbx6y4851xm9kj31fw6cizgq2y57mzlrddd"; depends=[Formula generics Rcpp RcppEigen rlang]; };
+  estimatr = derive2 { name="estimatr"; version="0.20.0"; sha256="0mrx14chg9qb90hlivn90l1jv9la4n1bkznbdx58ghli73k8dvdz"; depends=[Formula generics Rcpp RcppEigen rlang]; };
   estmeansd = derive2 { name="estmeansd"; version="0.2.0"; sha256="07xbdsfz8vidp8pv2ix5g2y6y2cks14fzbjx74pa17696rnklrw3"; depends=[metaBLUE]; };
   estout = derive2 { name="estout"; version="1.2"; sha256="0whrwlh4kzyip45s4zifj64mgsbnrllpvphs6i5csb7hi3mdb3i5"; depends=[]; };
   estprod = derive2 { name="estprod"; version="1.1"; sha256="15grcpyhaazd1sl8544gx4zpjqi9p17d6siyb6a1ykzzyy1v1fln"; depends=[boot Formula gmm lazyeval minpack_lm]; };
@@ -7134,14 +7259,13 @@ in with self; {
   etable = derive2 { name="etable"; version="1.2.0"; sha256="17xahaf2fz1qgqjaw8qbnss95il6g47m3w00yqc5nkvv37gs0q7c"; depends=[Hmisc xtable]; };
   etasFLP = derive2 { name="etasFLP"; version="1.4.0"; sha256="04d526yajakzivlcsz8631p0j482cbbgfpdmzkc9zr1m4495xxif"; depends=[fields mapdata maps rgl]; };
   ether = derive2 { name="ether"; version="0.1.5"; sha256="03skydbw4ch0lhhlm57qgg4q0vyd4rwzsq3v2w40jrczpxpdsn9q"; depends=[dplyr httr jsonlite Rmpfr]; };
-  ethnobotanyR = derive2 { name="ethnobotanyR"; version="0.1.4"; sha256="09mdcck23a90crdw6avi245sq8ch9kyycic6zqa1ny017mw3b8wk"; depends=[assertthat circlize dplyr ggplot2 magrittr reshape]; };
+  ethnobotanyR = derive2 { name="ethnobotanyR"; version="0.1.5"; sha256="08h7wym5vnbmqws17bzs27zj7c2rzz5l37rvhj0y71m4s1pz1fkc"; depends=[assertthat circlize cowplot dplyr ggplot2 magrittr reshape]; };
   etl = derive2 { name="etl"; version="0.3.7"; sha256="045hkh95ki3s10l9mz4710ws2i9and4rqb0qk1c5sfslglc0riq5"; depends=[DBI downloader dplyr lubridate readr rlang rvest stringr tibble xml2]; };
   etm = derive2 { name="etm"; version="1.0.5"; sha256="1yivbq8y0ijcl1m4nir4q9hp4pi6iphwxgjprygsdf7vp98wq677"; depends=[data_table lattice Rcpp RcppArmadillo survival]; };
   etma = derive2 { name="etma"; version="1.1-1"; sha256="0g9244yx50y1gw0f37hskbcgyv4nldmzr86v3rmf3afabmjbyzjj"; depends=[]; };
   etrunct = derive2 { name="etrunct"; version="0.1"; sha256="0ayazgyqlc8jcqr03cwfmfhm4pck6xri1r6vkgqy4arqkrrnrcqr"; depends=[]; };
-  etseed = derive2 { name="etseed"; version="0.1.0"; sha256="1kqbhvryqzmckk91ynn68yd7msqdsl6h818r164180f10flszr37"; depends=[httr jsonlite R6]; };
   eulerian = derive2 { name="eulerian"; version="1.0"; sha256="0yhpnx9vnfly14vn1c2z009m7yipv0j59j3s826vgpczax6b48m0"; depends=[graph]; };
-  eulerr = derive2 { name="eulerr"; version="5.1.0"; sha256="1224g5s1a610xa9smadqdl221y9xx2i17b1sfrw89nzbv4danyqz"; depends=[GenSA polyclip polylabelr Rcpp RcppArmadillo]; };
+  eulerr = derive2 { name="eulerr"; version="6.0.0"; sha256="0pvyg91xamhmz4k1b18g96imkddk64d6dadg74v1mnbzjiq742wh"; depends=[GenSA polyclip polylabelr Rcpp RcppArmadillo]; };
   europepmc = derive2 { name="europepmc"; version="0.3"; sha256="1ngqs1sqzkbwv98dd5z4cxj8bnz41wyd0g060a2vpqi3s99s4i2h"; depends=[dplyr httr jsonlite plyr progress purrr urltools xml2]; };
   europop = derive2 { name="europop"; version="0.3.1"; sha256="1ym257bxr4a0dmln1j8x3pf87wrryzgqyzhvk61whc6n2bj62x1s"; depends=[]; };
   eurostat = derive2 { name="eurostat"; version="3.3.5"; sha256="0gsycqcpvc0042iv8pa0bg64fmkkw9gzxw81f4gndpl50q8iq68y"; depends=[broom classInt countrycode dplyr httr jsonlite RColorBrewer readr RefManageR sf sp stringi stringr tibble tidyr]; };
@@ -7161,7 +7285,7 @@ in with self; {
   evidence = derive2 { name="evidence"; version="0.8.10"; sha256="02kqk95kx4nv13fg6z55a5rv6sq6lv8azg0jjxbkg1j6hg15p7ai"; depends=[LaplacesDemon lattice LearnBayes loo rstan rstanarm]; };
   evidenceFactors = derive2 { name="evidenceFactors"; version="1.00"; sha256="12wndimbygn7h57f3q0xmxmvqrcdj98f0a58m22z2l0vmym53rhb"; depends=[sensitivitymv]; };
   evir = derive2 { name="evir"; version="1.7-4"; sha256="1h7a7z7v5k33y5hsdfczsri3vpbwspfgazhv4saknv2h11rgfpki"; depends=[]; };
-  evmix = derive2 { name="evmix"; version="2.11"; sha256="15ak02vfhf54b5r9savf1lmcyf6mfwashr00z913nw2aajswny1h"; depends=[gsl MASS SparseM]; };
+  evmix = derive2 { name="evmix"; version="2.12"; sha256="02rabc9snci00s1x7h0svfr66lmw1wjcdg0149wc52mnccsdaivf"; depends=[gsl MASS SparseM]; };
   evobiR = derive2 { name="evobiR"; version="1.1"; sha256="0502xj1gv2g943vfqyllz4sr5z4mixf5vqlqi2v96mymnv9iwsr8"; depends=[ape geiger phytools seqinr shiny]; };
   evolqg = derive2 { name="evolqg"; version="0.2-6"; sha256="1jc6mndlmd0y8wxcqqrlyk211i4ay3yna9clm0p1cnxy4cbn8lq5"; depends=[ape coda expm ggplot2 igraph Matrix matrixcalc MCMCpack mvtnorm plyr Rcpp RcppArmadillo reshape2 vegan]; };
   evolvability = derive2 { name="evolvability"; version="1.1.0"; sha256="0lbyidb86yzvcfw86jfwnzbpijn64jr8fasycqq4h3r9c0x2by3j"; depends=[coda]; };
@@ -7175,14 +7299,15 @@ in with self; {
   exactLoglinTest = derive2 { name="exactLoglinTest"; version="1.4.2"; sha256="0j146ih9szzks9r45vq1jf47hrwjq081q1nsja5h1gpllks8217h"; depends=[]; };
   exactRankTests = derive2 { name="exactRankTests"; version="0.8-30"; sha256="02lqs5pw9vii398jz8yr55jk8158xxxqrk1bf55b08xcccxdwrff"; depends=[]; };
   exactci = derive2 { name="exactci"; version="1.3-3"; sha256="03r35f6dyrck5pf43ypb1sjwfnvkhjkm1mbms3wh67ayfs2ypn0s"; depends=[ssanv]; };
-  exactextractr = derive2 { name="exactextractr"; version="0.1.0"; sha256="01pyzgyb7my8b3fcyg907x6m15lg9ma53i4nyp62x2iz5g120ijn"; depends=[raster Rcpp sf]; };
+  exactextractr = derive2 { name="exactextractr"; version="0.1.1"; sha256="0jazvagfy9m68f0z3imvs9vdbmviybssiw7vzragxy85m4dgkvzm"; depends=[raster Rcpp sf]; };
   exactmeta = derive2 { name="exactmeta"; version="1.0-2"; sha256="1v807ns799qajffky4k18iah0s3qh2ava6sz5i85hwx9dhkz19h4"; depends=[]; };
   exampletestr = derive2 { name="exampletestr"; version="1.5.1"; sha256="1rk92ld5s812a2njs4fwidz7s2yjwbs7gf8chp7hcjw7pw81nbm4"; depends=[checkmate filesstrings fs glue magrittr ore purrr readr rlang roxygen2 stringr styler usethis withr]; };
   exams = derive2 { name="exams"; version="2.3-4"; sha256="1sa76qnzf7llj97xc41l2s8n4fqlg1wcvyq9sq59f1blfwxcnnd7"; depends=[]; };
-  excelR = derive2 { name="excelR"; version="0.2.0"; sha256="1cp8hkpj54nwi1jh3ywn17lkjjs4l88b3x50a31636xs12x01nnh"; depends=[htmlwidgets jsonlite]; };
+  exceedProb = derive2 { name="exceedProb"; version="0.0.1"; sha256="02pb8b0rxygbv6501rcr2hb0bhz1r78k5znav161kk25fb9bxs5v"; depends=[BH Rcpp]; };
+  excelR = derive2 { name="excelR"; version="0.3.1"; sha256="15frhi1laiwbd2izfm91ilvzcyl97svmx6slca5j2c6v5db3vzmq"; depends=[htmlwidgets jsonlite]; };
   excerptr = derive2 { name="excerptr"; version="2.0.0"; sha256="1xglpg9i45dd103ahj46lin42x9c8lgff2b5c4k3799gaki9sjzz"; depends=[checkmate reticulate]; };
   excursions = derive2 { name="excursions"; version="2.4.4"; sha256="140p0vks40vsj1bi89rhdqih5jh7795pxzzqm9140vfiv8b0aya5"; depends=[Matrix sp]; };
-  exdex = derive2 { name="exdex"; version="1.0.0"; sha256="0yl7m70k1lrs14v6v98p0m0cqmzyi0gn475wsiiy6z49kbwd7ys4"; depends=[chandwich Rcpp RcppArmadillo RcppRoll]; };
+  exdex = derive2 { name="exdex"; version="1.0.1"; sha256="15wdi24fq8q4ja4527k1adv6lkzyhylp8nwlsrb91q0sbmmprrqs"; depends=[chandwich Rcpp RcppArmadillo RcppRoll]; };
   exif = derive2 { name="exif"; version="0.1.0"; sha256="12phqn5x1x0xs2xczl3064q983dalm261vqpyafhdcndm1y3gwbc"; depends=[Rcpp]; };
   exifr = derive2 { name="exifr"; version="0.3.1"; sha256="0394f04wq5dnqbnbaq7gxv4ggis4kf3b8dhhjzlybsbip6nmv54x"; depends=[curl jsonlite plyr rappdirs tibble]; };
   exiftoolr = derive2 { name="exiftoolr"; version="0.1.2"; sha256="18q23lmazqw5vjvpz9kbd8i8ljchm8nakh726ic3qqzsckl98psp"; depends=[curl jsonlite]; };
@@ -7190,11 +7315,11 @@ in with self; {
   expSBM = derive2 { name="expSBM"; version="1.1"; sha256="10l2in6l5l61lrj2rrf5rjgphb7px3xb8alx976vksq96c5l9rdj"; depends=[gtools mclust Rcpp RcppArmadillo]; };
   expandFunctions = derive2 { name="expandFunctions"; version="0.1.0"; sha256="0661l4ab0xhjidmh8ycvymhp3wgxafm7nd1c59bfpxhyhz76n1p4"; depends=[glmnet orthopolynom plyr polynom]; };
   expands = derive2 { name="expands"; version="2.1.2"; sha256="15r5wld63kwk3kcl5x09dj0n1mgcl076lcjsmf0vbh10x4n0avrk"; depends=[ape commonsMath flexclust flexmix gplots matlab moments NbClust plyr RColorBrewer rJava]; };
-  experiment = derive2 { name="experiment"; version="1.1-4"; sha256="08d9m72l6n2ygy5x8aakzv3n71ybqy1i8yzv55f7r4w1kk4pbk5i"; depends=[boot MASS]; };
+  experiment = derive2 { name="experiment"; version="1.2.0"; sha256="0f8h4pj2y7cd2s1q44q4mrg9cirnpz0bkn4xm04hz1rpjxb4xlv1"; depends=[boot MASS]; };
   expert = derive2 { name="expert"; version="1.0-0"; sha256="0y9vcigvzhymalpv31b9nvmr86z1dz7x29yj838vks0dsv23rgrf"; depends=[]; };
   expint = derive2 { name="expint"; version="0.1-5"; sha256="12ki8j17p070kq2mdzzai755wy1n6kvinax0ldd63kynij9n0gdh"; depends=[]; };
   explor = derive2 { name="explor"; version="0.3.5"; sha256="1v3z067w5kskwr0wmrr26m3yfsmg9pf17ma9ck2srgyxqmddc0sj"; depends=[dplyr DT formatR ggplot2 highr RColorBrewer scatterD3 shiny tidyr]; };
-  explore = derive2 { name="explore"; version="0.4.3"; sha256="16m8xqzgnndrlw24n3bx6xvqdgbpi6zv8hwpbr47nd83zl77yvhw"; depends=[broom DBI dplyr DT ggplot2 gridExtra magrittr MASS odbc rlang rmarkdown rpart rpart_plot shiny]; };
+  explore = derive2 { name="explore"; version="0.5.0"; sha256="1065mn2dvh29bs3yn4m8djni17fnl3icsqs9yg317617pw31xf14"; depends=[broom DBI dplyr DT forcats ggplot2 gridExtra magrittr MASS odbc rlang rmarkdown rpart rpart_plot shiny]; };
   exploreR = derive2 { name="exploreR"; version="0.1"; sha256="154j5wiiy9vqdvh1qvdkz2fdp2phcygbbjl7nj5nkn07xwxbsc77"; depends=[ggplot2]; };
   expm = derive2 { name="expm"; version="0.999-4"; sha256="15k0acg2aqb2ajhwal6l7vhhp03m4lg579805d34554cl0kn9l2q"; depends=[Matrix]; };
   expoRkit = derive2 { name="expoRkit"; version="0.9.4"; sha256="186wnnx0gygnzrhhnsjysvwqccpxrcgy4pnvkyz6v3kcgg0n2x6j"; depends=[Matrix SparseM]; };
@@ -7204,7 +7329,7 @@ in with self; {
   expperm = derive2 { name="expperm"; version="1.6"; sha256="0cybna0q3qn3slyc4lv5rby4pr0xkwq0h6n7hl1zhsaqv4c2zc5b"; depends=[Rcpp]; };
   exprso = derive2 { name="exprso"; version="0.5.1"; sha256="02fz2awxxgf5avnnvv10kr20zvzdmal7z9jbmjxzw5kjqrcv7jci"; depends=[cluster e1071 frbs glmnet kernlab lattice MASS nnet plyr randomForest ROCR rpart sampling]; };
   expsmooth = derive2 { name="expsmooth"; version="2.3"; sha256="0alqg777g7zzbjbg86f00p2jzzlp4zyswpbif7ndd0zr8xis6zdc"; depends=[forecast]; };
-  expss = derive2 { name="expss"; version="0.9.0"; sha256="0kbbz8h2cy69d0jw7mxc673i64pns6nj3kc594k4r2b4jp867igg"; depends=[data_table foreign htmlTable magrittr matrixStats]; };
+  expss = derive2 { name="expss"; version="0.9.1"; sha256="1lz09kwwvsqxcyj4qkikdl4sxcr9vni01xgxv8ivisg110xhi3ls"; depends=[data_table foreign htmlTable magrittr matrixStats]; };
   expstudies = derive2 { name="expstudies"; version="0.0.5"; sha256="07li3lf7gnziws452arv38dayc30dym30qkw5d3ifp6za1aih5pv"; depends=[dplyr lubridate magrittr Rcpp]; };
   exptest = derive2 { name="exptest"; version="1.2"; sha256="0wgjg62rjhnr206hkg5h2923q8dq151wyv54pi369hzy3lp8qrvq"; depends=[]; };
   exreport = derive2 { name="exreport"; version="0.4.1"; sha256="0vj60rchhrc5q6x1kv7b95fcmh2a5qynli2w54rrrw1nx54xm8c2"; depends=[ggplot2 reshape2]; };
@@ -7226,14 +7351,14 @@ in with self; {
   extremis = derive2 { name="extremis"; version="0.90"; sha256="1cnwn70d9swks5b2y915l18gky9v23vaqlaaggshi0ghn3snb4sm"; depends=[emplik]; };
   extremogram = derive2 { name="extremogram"; version="1.0.2"; sha256="13k869v6j4ik9p8w0gf1absvb45xbd3nnwghsz0ix7y0vyvry358"; depends=[boot MASS]; };
   exuber = derive2 { name="exuber"; version="0.3.0"; sha256="1g0cr7lgj8j5qdvrm7zmafhqafi1iwln590pcmfrfs37cynd5fkx"; depends=[cli doSNOW dplyr foreach generics ggplot2 glue gridExtra lubridate purrr Rcpp RcppArmadillo rlang tibble tidyr zoo]; };
-  eyelinker = derive2 { name="eyelinker"; version="0.1"; sha256="1lwpm247czqm26zvv5c6lkhdxpp4svszfw74g9ys9vwvwhry9c15"; depends=[intervals magrittr plyr readr stringi stringr]; };
+  eyelinker = derive2 { name="eyelinker"; version="0.2.0"; sha256="14rfcdxad9iazwd46q6bm8gg1ryh6s8kf7arj00hhb7xz3gvk9c2"; depends=[intervals readr stringi stringr tibble]; };
   eyetracking = derive2 { name="eyetracking"; version="1.1"; sha256="0ajas96s25hjp3yrg42hp78qjhl1aih04mjirkskx32qsyq5hfpv"; depends=[]; };
   eyetrackingR = derive2 { name="eyetrackingR"; version="0.1.8"; sha256="18bz8fhy2hph7h8mm7hdhjfhi5gznj4qcl05rk3n99hkxl24qn73"; depends=[broom dplyr ggplot2 lazyeval purrr tidyr zoo]; };
   ez = derive2 { name="ez"; version="4.4-0"; sha256="0a58s94x576dfz7wcbivrr2hmdh5x1vy16zwkqp9fmdzqx38pagq"; depends=[car ggplot2 lme4 MASS Matrix mgcv plyr reshape2 scales stringr]; };
   ezec = derive2 { name="ezec"; version="1.0.1"; sha256="0lpx55a8fhy6fqdv3zvzx9mh75q34r71v5kp96hkm9jzl4yvrpd2"; depends=[dplyr drc]; };
   ezglm = derive2 { name="ezglm"; version="1.0"; sha256="0x7ffk3ipzbdr9ddqzv0skmpj5zwazkabibhs74faxnld7pcxhps"; depends=[]; };
   ezknitr = derive2 { name="ezknitr"; version="0.6"; sha256="060a2175zh1nhzmqgz1mpj2c6721n5w5bv695jj4rbl2s2b2h4qj"; depends=[knitr markdown R_utils]; };
-  ezpickr = derive2 { name="ezpickr"; version="1.0.5"; sha256="1x45ccma78cx9blxr0zsnmvrpja8mb1p89gk4mpip299f6bza869"; depends=[haven jsonlite magrittr mboxr purrr readr readxl stringr textreadr tibble writexl]; };
+  ezpickr = derive2 { name="ezpickr"; version="1.1.0"; sha256="0l547xf0k3y0v8yqn2pxrd1m1p5j5sbdsvrljlk7nn470jk54048"; depends=[haven jsonlite magrittr mboxr purrr readr readxl rmarkdown stringr textreadr tibble vroom writexl]; };
   ezplot = derive2 { name="ezplot"; version="0.3.1"; sha256="1cs5i3ik6q6s30z8nh6ckc68vcqkf1hnzy3wn6d0rypmny7jkfkc"; depends=[dplyr forcats ggplot2 rlang]; };
   ezsim = derive2 { name="ezsim"; version="0.5.5"; sha256="03x75vmf75qsmk4zb09j7xrb11w31rpfwd3dvv12nwjgndh9bnld"; depends=[digest foreach ggplot2 Jmisc plyr reshape]; };
   fANCOVA = derive2 { name="fANCOVA"; version="0.5-1"; sha256="034m2mmm6wmsjd41sg82m9ppqjf4b1kgw5vl2w7kzqfx0lypaiwv"; depends=[]; };
@@ -7262,20 +7387,26 @@ in with self; {
   fUnitRoots = derive2 { name="fUnitRoots"; version="3042.79"; sha256="1hsv47dm0hx3s04g9h0bjdgi79zbfihnfxxdc2jskqp94yl7azsy"; depends=[fBasics timeDate timeSeries urca]; };
   fabCI = derive2 { name="fabCI"; version="0.1"; sha256="123bc56nnx6hcj257imsd8sc6d0pggw08lf4m0lr90631gcm1mkn"; depends=[]; };
   fabMix = derive2 { name="fabMix"; version="4.5"; sha256="0d396a3ns3h2p4rdi45xcs3rfb18aqd95n8dszgdh8snf1776b9r"; depends=[coda corrplot doParallel doRNG foreach ggplot2 label_switching MASS mclust mvtnorm RColorBrewer Rcpp RcppArmadillo]; };
-  fabricatr = derive2 { name="fabricatr"; version="0.8.0"; sha256="1lx53424g6g5bn914dx42zsdjfsmk6s5xxcl7k2wcpr5bvnpir3x"; depends=[rlang]; };
+  fable = derive2 { name="fable"; version="0.1.0"; sha256="1gv5dlvqm7fwp4az9qy3zr8g3cw1zlqfal3m8c20agw3966z011j"; depends=[dplyr fabletools Rcpp rlang tidyr tsibble]; };
+  fabletools = derive2 { name="fabletools"; version="0.1.1"; sha256="0cbiqd7cx4kws9lhwydrjlcxcm46vl6srslzw1h5ljfmgjkvkf8p"; depends=[dplyr generics ggplot2 R6 rlang tibble tidyr tidyselect tsibble]; };
+  fabricatr = derive2 { name="fabricatr"; version="0.10.0"; sha256="0kh2mfgyqz3fpilc4wycxj3vihhbdnjzsjrsp88nmsk0p5mjmljj"; depends=[rlang]; };
   face = derive2 { name="face"; version="0.1-5"; sha256="0n7vlq29krsdcp8r32irhvf7xbcxy5g7663qncmbhj5x45sviqh6"; depends=[Matrix matrixcalc mgcv]; };
   facebook_S4 = derive2 { name="facebook.S4"; version="1.1.0"; sha256="1if3fgyvj6pbf48yjwa5fkn3s4rl6kj9s1nk6dwphykhx72ghzrj"; depends=[httr magrittr plyr rjson]; };
   facerec = derive2 { name="facerec"; version="0.1.0"; sha256="1dipcnxjz6yd34w0jrrvj5p0pwdgz1l5m9zvri7mflnz7g34gmaj"; depends=[dplyr httr jsonlite knitr magrittr rlang snakecase stringr]; };
   facilitation = derive2 { name="facilitation"; version="0.5.2"; sha256="0gyqa3njyynvdhfziq33xqc7cjhszii67mk8809ncvh6abkdx1hw"; depends=[animation Matrix Rcpp]; };
   factoextra = derive2 { name="factoextra"; version="1.0.5"; sha256="1l6m8k7qhdw8ndar8nhmym0lfyd1i2iszl1cicjax0vq23ss6xw1"; depends=[abind cluster dendextend FactoMineR ggplot2 ggpubr ggrepel reshape2 tidyr]; };
   factoptd = derive2 { name="factoptd"; version="1.0.3"; sha256="1ir50im3kr1xhqk4qwrm2h5fq9gqgrwshbamvjlf8n1wnn03mcb6"; depends=[MASS partitions]; };
+  factorEx = derive2 { name="factorEx"; version="1.0.0"; sha256="12ykf42x5fqddlsvv3556sawfakribj0pwm5vfcg3y2y99a26qxg"; depends=[arm doParallel estimatr foreach genlasso igraph mvtnorm pbapply pbmcapply prodlim sandwich stringr]; };
   factorMerger = derive2 { name="factorMerger"; version="0.4.0"; sha256="127k5h1gbbnjr6gxgck2n9glvvwkd69xq7n6gzmrq8gszk8v1x5m"; depends=[agricolae colorRamps dplyr forcats formula_tools ggplot2 ggpubr knitr magrittr MASS mvtnorm proxy reshape2 scales survival]; };
   factorQR = derive2 { name="factorQR"; version="0.1-4"; sha256="1vl01fm5qfyhnqbl5y86vkr50b8cv07vzlqs3v6smqaqq6yp4lv4"; depends=[lattice]; };
   factorcpt = derive2 { name="factorcpt"; version="0.1.2"; sha256="17hwlsrj0fx4x05p6xvs6kl43a24icmnrzyvpf2vam5imwvmpvmm"; depends=[doParallel fields foreach iterators Rcpp RcppArmadillo]; };
+  factorial2x2 = derive2 { name="factorial2x2"; version="0.1.0"; sha256="186qnz09hkf3njb07rfrs42m3m3288h89ppzlfzrv00765r74yq6"; depends=[mvtnorm survival]; };
   factorplot = derive2 { name="factorplot"; version="1.1-2"; sha256="025lfk122w66yxym3njcpzwnbhg40xi7p1c9vnxczcb8kz31745s"; depends=[multcomp nnet]; };
   factorstochvol = derive2 { name="factorstochvol"; version="0.9.2"; sha256="0yaf7j2d77m0kmgm8n2j4a0ai9b0lz29r9xjk3zk8sw8aabjlkaw"; depends=[corrplot GIGrvg Rcpp RcppArmadillo stochvol]; };
+  factory = derive2 { name="factory"; version="0.1.0"; sha256="1715bx2rn8kk5qd196jnrv5f95l54n4y0aqqdzfkgrmqihcy8ahx"; depends=[purrr rlang]; };
   factualR = derive2 { name="factualR"; version="0.5"; sha256="1wz8ibcmilcx62yy29nd2i1pdmjf7fm0g9i5s58gdn8cjlhnw1jl"; depends=[RCurl RJSONIO]; };
   fail = derive2 { name="fail"; version="1.3"; sha256="0vfm6kmpmgsamda5p0sl771kbnsscan31l2chzssyw93kwmams7d"; depends=[BBmisc checkmate]; };
+  fairness = derive2 { name="fairness"; version="1.0.1"; sha256="1n17vrp0a3zii3444a2a7k33ffmyxmm15c8m7ln2fypya1z2pc5l"; depends=[caret devtools e1071 ggplot2 pROC]; };
   faisalconjoint = derive2 { name="faisalconjoint"; version="1.15"; sha256="08sb4za8qyadvigq2z7b0r44qk2lpahpnz9nv16xfjb1zhdkz5w3"; depends=[]; };
   fakeR = derive2 { name="fakeR"; version="1.0"; sha256="0f4ngnd8s34j1327zp3aqnsiw0gfxkp1i24ng20hrmfl13s1qmxp"; depends=[mvtnorm polycor pscl VGAM]; };
   fakemake = derive2 { name="fakemake"; version="1.4.1"; sha256="0jmcbdq5gp7abqiihn8zi2l0whiwnc763lqrk2wflac4d0zw275z"; depends=[callr igraph MakefileR withr]; };
@@ -7297,7 +7428,7 @@ in with self; {
   fasjem = derive2 { name="fasjem"; version="1.1.2"; sha256="1bbrcyyg96hakgla3604byrkn9034197vy2is048kdq20yr2y11n"; depends=[igraph]; };
   fast = derive2 { name="fast"; version="0.64"; sha256="098rk6kszdx3szcwvwzcv7zlcd6qvqvbqch7q8ilas6vbki81ba4"; depends=[zoo]; };
   fastAdaboost = derive2 { name="fastAdaboost"; version="1.0.0"; sha256="1pv1y6znvc37pgwk99v4r0hljhipq8v6r3r5cb5vhgyl0bfi8g38"; depends=[Rcpp rpart]; };
-  fastDummies = derive2 { name="fastDummies"; version="1.4.0"; sha256="1sakgfzgdf1mcaqqpbb808xsdalz8jxpyfb6ilal2rcy9s11ds0q"; depends=[data_table tibble]; };
+  fastDummies = derive2 { name="fastDummies"; version="1.5.0"; sha256="043289gfyc3f1crfy1861jzs2gsc4pwxl0inxv9xi9scxazwyphi"; depends=[data_table tibble]; };
   fastGHQuad = derive2 { name="fastGHQuad"; version="1.0"; sha256="1rjia8wggadr9xwxcmzmal0rc4g6pa3dr5888fbbnb6abl8b2lrj"; depends=[Rcpp]; };
   fastGraph = derive2 { name="fastGraph"; version="2.1"; sha256="0lz199607hqpwxzhff4jzhmjq6cbakd335iyclmlscllgfzgnhql"; depends=[]; };
   fastHICA = derive2 { name="fastHICA"; version="1.0.2"; sha256="1h794ybbii0k7v3x0r1499zxdqa1i1dpi3i7idzqdrffnb5kmwlv"; depends=[energy fastICA]; };
@@ -7305,7 +7436,7 @@ in with self; {
   fastJT = derive2 { name="fastJT"; version="1.0.5"; sha256="1knk4zjrkkv1i3a8n68vdrpxkwdkf19zw75p93hygfmbbz6r88v4"; depends=[Rcpp]; };
   fastLink = derive2 { name="fastLink"; version="0.5.0"; sha256="1hgz4c26qlsdlp7gx0rsvkwn6xv86d7yk186sp7j6nfh2p9b1ccz"; depends=[adagio data_table doParallel dplyr FactoClass foreach gtools Matrix plotrix Rcpp RcppArmadillo RcppEigen stringdist stringi stringr]; };
   fastM = derive2 { name="fastM"; version="0.0-4"; sha256="1n9a431w0hl4kr3pa32kcyd1d73acz4vb9vhfkckk3099mg46d9m"; depends=[Rcpp RcppArmadillo]; };
-  fastNaiveBayes = derive2 { name="fastNaiveBayes"; version="1.1.2"; sha256="0l50lyqwn0qxpnfp5aksw7ib5asigj43fbhmk2fza6a8ljgg4alg"; depends=[Matrix]; };
+  fastNaiveBayes = derive2 { name="fastNaiveBayes"; version="2.1.0"; sha256="0gjhprbgrvc42nzz6ya6331cgrfqn08q3vwnd3s3fd4a2ig5xn2k"; depends=[Matrix]; };
   fastR = derive2 { name="fastR"; version="0.10.3"; sha256="1sz6krxiamq3rp4h9ah2b1zvyyrlvsn7lpvrjv1xda2c1kqqkvmk"; depends=[lattice mosaic mosaicCalc mosaicData]; };
   fastR2 = derive2 { name="fastR2"; version="1.2.1"; sha256="15mqsdy79zvd4srrszdjp0kh9lfcq3yxp7j5d4xcqbjbwsgy68il"; depends=[dplyr ggplot2 lattice maxLik miscTools mosaic numDeriv]; };
   fastSOM = derive2 { name="fastSOM"; version="1.0.0"; sha256="1x4kxys7mxlxz7cfbjig44za8m8p19xgzcs5y2wn9320sx8b0wc0"; depends=[]; };
@@ -7314,6 +7445,7 @@ in with self; {
   fastclime = derive2 { name="fastclime"; version="1.4.1"; sha256="0zcir8r11b2hxr9vvkmvxlzmhfcaxbr0wbjy86ysr912mp8fs9i3"; depends=[igraph lattice MASS Matrix]; };
   fastcluster = derive2 { name="fastcluster"; version="1.1.25"; sha256="01a2xnhhvv1swd4g8p4lzyn7ww7kg49jlnzc7kfz60jqjzpisrpk"; depends=[]; };
   fastcmh = derive2 { name="fastcmh"; version="0.2.7"; sha256="0hib3r3pkfdi67bdy4pf1pw6869vq4b3pg1pq1zwpyy76nbnq9vl"; depends=[bindata Rcpp]; };
+  fastcmprsk = derive2 { name="fastcmprsk"; version="1.1.1"; sha256="00jpmmlpldrqamgw7q7gx6s4rl1bxqlzw2jglw36k5zawcdb69y6"; depends=[dynpred foreach survival]; };
   fastcox = derive2 { name="fastcox"; version="1.1.3"; sha256="0jn19v6mkwgyz8x63xrfgkgnf0f2rq338r5qkhz690mdzr4c47a3"; depends=[Matrix]; };
   fastdigest = derive2 { name="fastdigest"; version="0.6-3"; sha256="02csl261v7nassi5119ygw6jglm8q6rssg7lgyxzj73mkyilm832"; depends=[]; };
   fasterElasticNet = derive2 { name="fasterElasticNet"; version="1.1.2"; sha256="1hr0wc6s6zpq1hkfgshf0dqjxb7s2849bb8lb04nmi6p42r3628g"; depends=[Rcpp RcppArmadillo]; };
@@ -7326,7 +7458,6 @@ in with self; {
   fastnet = derive2 { name="fastnet"; version="0.1.6"; sha256="16jdwvk1xhl6bn9fx5s8pzvbizx6c0jmg6arqf201a7ghw2wi4xh"; depends=[doParallel foreach igraph tidygraph]; };
   fastpseudo = derive2 { name="fastpseudo"; version="0.1"; sha256="0paag4pjh3gs270j663bsl65sfrq43gk2zzqmalr03fmcckp6aaj"; depends=[]; };
   fastqcr = derive2 { name="fastqcr"; version="0.1.2"; sha256="12x3lkg5zc4ckyg4x3xxqb779yhrr0fys7asf5b8shz49f86fmm9"; depends=[dplyr ggplot2 gridExtra magrittr readr rmarkdown rvest scales tibble tidyr xml2]; };
-  fastrtext = derive2 { name="fastrtext"; version="0.3.3"; sha256="0skxmdgai587949hzm21jaqskp8fq2db4p6d05s4flglhc9ic136"; depends=[assertthat Rcpp]; };
   fasttime = derive2 { name="fasttime"; version="1.0-2"; sha256="11i4c0zrkvvqsax0az1fvmc0jxfsjyx28434k1qgzhj9g2j9m9cf"; depends=[]; };
   fat2Lpoly = derive2 { name="fat2Lpoly"; version="1.2.3"; sha256="00pnzr3v7vm965b3cvgplasw00akmixybvm6l9bn609c2kqbf5p3"; depends=[kinship2 multgee]; };
   fauxpas = derive2 { name="fauxpas"; version="0.2.0"; sha256="0l77gxcf06p984z9vgaf1kag609h9qyrgav84lxkv97h6f3fflnc"; depends=[httpcode R6 whisker]; };
@@ -7338,7 +7469,7 @@ in with self; {
   fbroc = derive2 { name="fbroc"; version="0.4.1"; sha256="1v73wl3yckcqx43fz1lzcsy6v08vmbmi7yi623yhgqywixxv2bx3"; depends=[ggplot2 Rcpp]; };
   fc = derive2 { name="fc"; version="0.1.0"; sha256="0x41xfchy499kz0qi7fp12vpkbcddprv19mmk48lxzavv4f5avfh"; depends=[codetools]; };
   fcd = derive2 { name="fcd"; version="0.1"; sha256="091wbf5iskcgyr7jv58wrf590qijb0qcpninmvm3xrwxi34r37xr"; depends=[combinat glmnet MASS]; };
-  fclust = derive2 { name="fclust"; version="2.1"; sha256="0026msnpmsw31y01f676wfybvv8sxcijac7km25ih6178jyyb2in"; depends=[MASS Rcpp RcppArmadillo]; };
+  fclust = derive2 { name="fclust"; version="2.1.1"; sha256="11dsf7mb075m1m1ilqsacc0s4907wq6alvdfh6nizsyr01wiqw3b"; depends=[MASS Rcpp RcppArmadillo]; };
   fcm = derive2 { name="fcm"; version="0.1.3"; sha256="1mqk6szczsixdvw0inkypij4cw2syng5l5ccw0xk55kc21l1lzn0"; depends=[ggplot2 reshape2]; };
   fcr = derive2 { name="fcr"; version="1.0"; sha256="17jrz5zp1msd2khl1lwnb5sgxcigagni556rhn7qm9g0aykbh8yj"; depends=[face fields mgcv]; };
   fcros = derive2 { name="fcros"; version="1.6.1"; sha256="04yr6lqs38lczsmdvdm78qn63836qj7xwspgh3h3n3gh8cssd83x"; depends=[]; };
@@ -7346,29 +7477,31 @@ in with self; {
   fdANOVA = derive2 { name="fdANOVA"; version="0.1.2"; sha256="1pycq5a4czqzi8wcfmlc9ncg827j7n0qxyj90wcv39nbcrnl3da1"; depends=[doBy doParallel fda foreach ggplot2 magic MASS]; };
   fda = derive2 { name="fda"; version="2.4.8"; sha256="0n39rzbhg1hipzn51rzmbchn2358qgapg08iv7lmiqj5y7i9qns2"; depends=[Matrix]; };
   fda_usc = derive2 { name="fda.usc"; version="1.5.0"; sha256="135ggfmmbn2crnzmk34hpqxdi51pflqihkz7zpnhx49860fad0fd"; depends=[fda MASS mgcv nlme rpart]; };
-  fdaMixed = derive2 { name="fdaMixed"; version="0.5"; sha256="1k2b3z2jj37j6njvxalg8640zlcvi1cm7wkcwp0pia21wydz75ip"; depends=[Formula Rcpp RcppArmadillo]; };
-  fdaPDE = derive2 { name="fdaPDE"; version="0.1-4"; sha256="0n72x5h00n17yxjniim2qxz2phy1srk04dn6ivvc58k3x252fzkh"; depends=[RcppEigen rgl]; };
+  fdaMixed = derive2 { name="fdaMixed"; version="0.6"; sha256="0hyhb67qvvhyq68k5h4ffvsl4lmw66nfy5l14kwxnn42h3b810sc"; depends=[Formula Rcpp RcppArmadillo]; };
   fdadensity = derive2 { name="fdadensity"; version="0.1.1"; sha256="0jj5gprv3ihdjic261czqnv7c13mxsmjmv7gn2gv4483kgijlkz9"; depends=[fdapace Rcpp]; };
   fdakma = derive2 { name="fdakma"; version="1.2.1"; sha256="0j9qgblrl7v4586dd6v0hjicli6jh8pkk5lzn8afpl75xfs24six"; depends=[]; };
-  fdapace = derive2 { name="fdapace"; version="0.4.1"; sha256="1k10j6nlsidyms1a0nnki46ddyyywpz8gnnnjm3k17wxyi69bmg1"; depends=[Hmisc MASS Matrix numDeriv pracma Rcpp RcppEigen]; };
+  fdapace = derive2 { name="fdapace"; version="0.5.1"; sha256="0i9y9vz676jspanbbrfbygyq5bxplcv4c5q4yql1y0r8zkg4xq2z"; depends=[Hmisc MASS Matrix numDeriv pracma Rcpp RcppEigen]; };
   fdasrvf = derive2 { name="fdasrvf"; version="1.9.2"; sha256="0hdxpin1ydc9sl9wp5axn6sj2mwlhndxya92ss1i8lj1cxmlz42d"; depends=[coda doParallel fields foreach matrixcalc mvtnorm Rcpp RcppArmadillo testthat tolerance viridisLite]; };
   fdatest = derive2 { name="fdatest"; version="2.1"; sha256="0zdnmssir5jz2kbfz4f4xshjfv4pivqx7cbh2arlx6ypkjrjws8n"; depends=[fda]; };
   fdcov = derive2 { name="fdcov"; version="1.1.0"; sha256="0savsgcifcjjqrmbpn6m30gncq5iigqxpb19l710wlx8nm98svjh"; depends=[corrplot matlab]; };
+  fdm2id = derive2 { name="fdm2id"; version="0.9.0"; sha256="0mdqgq6jff1dnnnyhlh0fhdnir88b49aqzaph38f2k57fliaydq8"; depends=[arules car caret class cluster e1071 FactoMineR flexclust fpc glmnet ibr irr kohonen leaps MASS mclust mda meanShiftR NMF nnet pls questionr randomForest ROCR rpart Rtsne SnowballC stopwords text2vec wordcloud xgboost]; };
   fdq = derive2 { name="fdq"; version="0.11"; sha256="1lzv1pmzjixp8wpap0w3lad1ns9z2hjbxkfpyp9jy9mxprj1w3q9"; depends=[data_table Fgmutils ggplot2 plyr randomcoloR sqldf]; };
   fdrDiscreteNull = derive2 { name="fdrDiscreteNull"; version="1.3"; sha256="17nzqy4i1c5kcqyps52827q5apyjn4znb1ql4qvfm8v2m1fvily3"; depends=[MCMCpack qvalue]; };
   fdrci = derive2 { name="fdrci"; version="2.1"; sha256="1sgrsmlz7sbr1maw3qnpzqz3z75fh5nyiibpsq8j0y12xac8d0x3"; depends=[]; };
   fdrtool = derive2 { name="fdrtool"; version="1.2.15"; sha256="1h46frlk7d9f4qx0bg6p55nrm9wwwz2sv6d1nz7061wdfsm69yb5"; depends=[]; };
   fds = derive2 { name="fds"; version="1.8"; sha256="1284vncixrzrz9x6b52gslrbrbia07sd0xac7nwdqhp5f5v5wfi0"; depends=[rainbow RCurl]; };
   fdth = derive2 { name="fdth"; version="1.2-1"; sha256="0rr9p2rns5ws111iqcicrlpcv47fkbxf161yxkkzfs2l3f1kgw14"; depends=[]; };
-  feather = derive2 { name="feather"; version="0.3.3"; sha256="0ls8lmygyjq60467s88h66d7fczjp1d3a2106rfq4dx9lyfvdfsa"; depends=[hms Rcpp tibble]; };
+  feasts = derive2 { name="feasts"; version="0.1.1"; sha256="0jzl2rqzdfdn2z5azpwhz6gllg0wkq6afdlllpiysfg7vfm6w51n"; depends=[dplyr fabletools ggplot2 rlang scales tibble tidyr tsibble]; };
+  feather = derive2 { name="feather"; version="0.3.5"; sha256="1gxd0h2m56sjjlzn4dry6s13nddxc4l5i11gsvavaf2dwbahdzsh"; depends=[hms Rcpp tibble]; };
   feature = derive2 { name="feature"; version="1.2.13"; sha256="07hkw0bv38naj2hdsx4xxrm2dngi6w3rbvgr7s50bjic8hlgy1ra"; depends=[ks misc3d rgl]; };
   featurefinder = derive2 { name="featurefinder"; version="1.1"; sha256="024g3adhxx1ynl9wnc2yl3illj4347ak6wkfmvqxfwd6llsa79ld"; depends=[plyr rpart rpart_plot]; };
   features = derive2 { name="features"; version="2015.12-1"; sha256="0rd8r1dxzddb6718hcm8ck7531c9wdrjfy8n67875bbxgzcvds61"; depends=[lokern]; };
+  featuretoolsR = derive2 { name="featuretoolsR"; version="0.4.3"; sha256="1qgk9z8ld9yyw37r3birbds4a7jffq3qqkvlnldvz3yk81ir7kw7"; depends=[caret cli dplyr magrittr purrr reticulate stringr testthat tibble]; };
   featurizer = derive2 { name="featurizer"; version="0.2"; sha256="05jvwsvpbdj94q3wl7ld6xmfc9p7ff9zsmryd3mmxz0hzbq2cnkc"; depends=[]; };
   febr = derive2 { name="febr"; version="1.0.2"; sha256="0hsfmp6ay2c64wpwhaibxbbjc6s958nkrch64r6z3rbjina5avam"; depends=[dplyr glue googlesheets pedometrics readr sp stringr xlsx]; };
   fechner = derive2 { name="fechner"; version="1.0-3"; sha256="0bassigcipwlr2g8cdjh8jyhmb903k3hla9gnigcbz7qwzlfwa86"; depends=[]; };
   federalregister = derive2 { name="federalregister"; version="0.2.0"; sha256="0qr8nd3ylnwcv1wxspw5i7ray5sh30zr648spg0lpqq8dp2b8p7b"; depends=[curl httr jsonlite]; };
-  fedregs = derive2 { name="fedregs"; version="0.1.1"; sha256="17z8my2y5d211q548px55yhw9g42bwm6q599fndj9pia8qpps4gi"; depends=[dplyr httr magrittr purrr rvest stringi tidytext xml2]; };
+  fedregs = derive2 { name="fedregs"; version="1.0.0"; sha256="171j6r6qxnx9gk9x9gpdyh51ssrgmf7sczc4889qr3qqw15sm4bn"; depends=[dplyr httr magrittr purrr rvest stringi tidyr tidytext xml2]; };
   fedreporter = derive2 { name="fedreporter"; version="0.2.1"; sha256="18hs358iyxmbh28jy9f65zvanpr6bk4gq75qbj255y1zzdsjr9x1"; depends=[httr jsonlite]; };
   feedeR = derive2 { name="feedeR"; version="0.0.7"; sha256="08mnfi96qkr1fj53ywqmya957swcwrfd3hqk0qaf2ni96sxxnp98"; depends=[digest dplyr lubridate RCurl XML]; };
   feisr = derive2 { name="feisr"; version="1.0.1"; sha256="0pwaj509qz6z4rz54b10xmv2476qygmrm4bpc3szah6pf2pf0zmm"; depends=[aod Formula plm Rdpack]; };
@@ -7393,12 +7526,12 @@ in with self; {
   fgof = derive2 { name="fgof"; version="0.2-1"; sha256="0bclkb3as0fl2gyggqxczndfyj9pfnni5pa3inpn5msrnjg4g2j2"; depends=[mvtnorm numDeriv]; };
   fgpt = derive2 { name="fgpt"; version="2.3"; sha256="1d0qzsn4b68jhk07k97iv765jpmzzh1gwqpid0r76vg4cwqfs3n7"; depends=[]; };
   fgui = derive2 { name="fgui"; version="1.0-8"; sha256="024fzd1c7iwqprn26hwjb9l2qlvvyzl449d7iixy0x69djwsrysv"; depends=[]; };
-  fhidata = derive2 { name="fhidata"; version="2019.6.24"; sha256="1lzv49nzf5j0gn88g8ilgp1vxwq2k7rji2vzzcxhmcdc1wir2nhk"; depends=[data_table]; };
+  fhidata = derive2 { name="fhidata"; version="2019.8.27"; sha256="0cm8ixpr3gjzprjcv43zdnysw8qhv72pf3fd2vckql01mlk16p42"; depends=[data_table]; };
   fiberLD = derive2 { name="fiberLD"; version="0.1-6"; sha256="1i3bl2qsc77m81l11an9ihl4vy86s8jd5x6pasib77rl2877ad4x"; depends=[doParallel foreach Matrix VGAM]; };
   fic = derive2 { name="fic"; version="1.0.0"; sha256="18xz94w1ab17jfi61bdg9z3pm63g488v17ns2ivizkza4gg07pv8"; depends=[abind ggplot2 mvtnorm numDeriv scales survival tensor]; };
   fieldRS = derive2 { name="fieldRS"; version="0.2.2"; sha256="0jrcdsv46zx7six9ll5sha32wx36wqajaladj6z8xym2n9ay8d5b"; depends=[caret concaveman ggplot2 raster rgeos sp spatialEco stringdist]; };
-  fields = derive2 { name="fields"; version="9.8-3"; sha256="1q9x68dczjym56v7x90x4x5br59vj3dww6w8v42zd3yl17h7c1h1"; depends=[maps spam]; };
-  fiery = derive2 { name="fiery"; version="1.1.1"; sha256="07cfrzajr5knmz5ngczkdd2kzjfdnn1y4b0z73daxwhk4dq8j6ji"; depends=[assertthat crayon future glue httpuv later R6 reqres stringi uuid]; };
+  fields = derive2 { name="fields"; version="9.8-6"; sha256="07x95vk1idjfzi5ikn0ijal754mssdmgr1p4nswmx9w3i5ndcqaz"; depends=[maps spam]; };
+  fiery = derive2 { name="fiery"; version="1.1.2"; sha256="01ahdvcag8ifpp6jl6cgjjrchwxbr9fzvzqysj77kg3n5dcqm6cl"; depends=[assertthat crayon future glue httpuv later R6 reqres stringi uuid]; };
   filehash = derive2 { name="filehash"; version="2.4-2"; sha256="14zv7h5195dmfksgk8qvjgc2qq8253vga6267aa1bqs5bpvmdl5n"; depends=[]; };
   filehashSQLite = derive2 { name="filehashSQLite"; version="0.2-4"; sha256="1higvkmj4wvnwpvayqinzaygiksij20d77dx118q0gffsczadamh"; depends=[DBI filehash RSQLite]; };
   filelock = derive2 { name="filelock"; version="1.0.2"; sha256="00ql5fw1hidpfnm0szaavf43ahmsnvdbi8i5lr1nrcc90yaiaadc"; depends=[]; };
@@ -7409,17 +7542,18 @@ in with self; {
   filesstrings = derive2 { name="filesstrings"; version="3.1.5"; sha256="072alawp6j08mwlw1pz50g3lfi726kpsc744x5fvy71d7w4gqn6l"; depends=[checkmate magrittr matrixStats ore rlang strex stringi stringr tibble withr]; };
   filling = derive2 { name="filling"; version="0.2.0"; sha256="0yxixwgvn7jq09j4r3q33mmdda9a4anfi7y0xqscbdjz6p9bx48w"; depends=[CVXR nabor Rcpp RcppArmadillo Rdpack ROptSpace RSpectra]; };
   fillr = derive2 { name="fillr"; version="0.1.1"; sha256="01z4841hxnpf8s9s327fqprb4gl9k8pkyv2mgc5vfl86r1pd7m1b"; depends=[]; };
-  finalfit = derive2 { name="finalfit"; version="0.9.4"; sha256="01qyigr29pxk89bn9qkmbjzxsks06an15r8apbh1ks5ykj442a70"; depends=[boot broom dplyr forcats GGally ggplot2 gridExtra Hmisc lme4 magrittr mice pillar plyr pROC purrr readr scales stringr survival survminer tibble tidyr]; };
+  finalfit = derive2 { name="finalfit"; version="0.9.5"; sha256="1r4gv3yxwyqy9bh63n3zajbz3jzn7lnvj5nzzvxhmi01ig43x6c1"; depends=[boot broom dplyr forcats GGally ggplot2 gridExtra Hmisc lme4 magrittr mice pillar plyr pROC purrr readr scales stringr survival survminer tibble tidyr]; };
   finch = derive2 { name="finch"; version="0.3.0"; sha256="1cglyq3b0cvl05yrnpy6xn0nj0n817hgpcsxp3m07cvj8xidib02"; depends=[data_table digest EML hoardr plyr rappdirs xml2]; };
   findR = derive2 { name="findR"; version="0.2.1"; sha256="1a7cf6kd7i2l4ffr2b17nb9xnpsjhf6fcwpjy06r0qgcapnfp54b"; depends=[pdftools stringr]; };
   findpython = derive2 { name="findpython"; version="1.0.5"; sha256="0icifm4z6hhpmcjrg75a875iph0ci890ss02kdv3725pijc236iy"; depends=[]; };
   findviews = derive2 { name="findviews"; version="0.1.3"; sha256="1l1yhw5hvrn0rpkdsch8m69d2q5284jwccvv7r4ia4m0iqjfipj7"; depends=[ggplot2 gridExtra scales shiny]; };
   fingerPro = derive2 { name="fingerPro"; version="1.1"; sha256="1a1lj8gyrbgcg8hr03cj2bjzlaafddspri7abc83ys1raqwd4j68"; depends=[car GGally ggplot2 gridExtra klaR MASS plyr Rcmdr Rcpp RcppGSL RcppProgress reshape rgl scales]; };
   fingerprint = derive2 { name="fingerprint"; version="3.5.7"; sha256="04jcwkydjrs31pia6kq8z2n9s54im950q08hs2ay15xjxxkmb8ic"; depends=[]; };
-  fingertipsR = derive2 { name="fingertipsR"; version="0.2.7"; sha256="0yriyw3qzxs9g0cfl9mk80mfpmfdx8l554gk03ps8ji497w94rql"; depends=[curl dplyr DT httr jsonlite miniUI purrr readr shiny shinycssloaders]; };
-  fingertipscharts = derive2 { name="fingertipscharts"; version="0.0.8"; sha256="0hcbmzkzh3mnh6mk2yg21midkjgj5w03xw18qhq6mgpz8rcv7jm7"; depends=[curl dplyr fingertipsR geojsonio ggplot2 leaflet lemon mapproj purrr rlang scales sf stringr tibble tidyr]; };
+  fingertipsR = derive2 { name="fingertipsR"; version="0.2.9"; sha256="03zj7qqh3yzsvw3a36c8jfci9fz4n0ylzzvlw3dlsi9637xcc9pz"; depends=[curl dplyr DT httr jsonlite miniUI readr shiny shinycssloaders]; };
+  fingertipscharts = derive2 { name="fingertipscharts"; version="0.0.9"; sha256="18lm9xn464grcrw97gdl0yhmb4j0wkwwfbsxpz3zqk5cmbgljamy"; depends=[curl dplyr fingertipsR geojsonio ggplot2 httr leaflet lemon mapproj purrr rlang scales sf stringr tibble tidyr]; };
   finiteruinprob = derive2 { name="finiteruinprob"; version="0.6"; sha256="0z4l0crymh58chxniqq70fqmvi6f5jkgvz72vbc7s3l9lrrapgr3"; depends=[numDeriv sdprisk]; };
   finreportr = derive2 { name="finreportr"; version="1.0.1"; sha256="1mansiyl4p4zqc1h2aw9zgzb3fy4mppgmshdm8mcf4nbm340g4vk"; depends=[curl dplyr httr rvest XBRL xml2]; };
+  fipe = derive2 { name="fipe"; version="0.0.1"; sha256="055jav8h4wws76jahm2d5dj49wkvzchh3f2vk5d50pny4dc7smar"; depends=[dplyr forcats furrr future httr jsonlite lubridate magrittr purrr readr stringr tibble tidyr]; };
   firebehavioR = derive2 { name="firebehavioR"; version="0.1.2"; sha256="10krny60dkpgwjjnriap91qmrnfq1rl5ck4ynf4h6x016bv0m374"; depends=[ggplot2]; };
   fishMod = derive2 { name="fishMod"; version="0.29"; sha256="0pbs4z27vwa3c42xdw3mr6l2i581bgvn2pk52kawbcnnlsff92ar"; depends=[]; };
   fishdata = derive2 { name="fishdata"; version="0.1.3"; sha256="04162m1j570cdwhffkwjs1x1qlsc20djj1jwx2hl2cqmbp584ppq"; depends=[]; };
@@ -7443,14 +7577,17 @@ in with self; {
   fivethirtyeight = derive2 { name="fivethirtyeight"; version="0.5.0"; sha256="00cc7kjs54wk2cxbkd14gldsrjmf4i35vwr6c2kfsassvjjhbmpm"; depends=[]; };
   fixedTimeEvents = derive2 { name="fixedTimeEvents"; version="1.0"; sha256="0z7ji8yzp4pj76ad64l7ivknkbi82ijx6abd3a18wicqhrh433sj"; depends=[]; };
   fixerapi = derive2 { name="fixerapi"; version="0.1.6"; sha256="0ikf8dn0l9c9gshp4bph3wasl0bh6lfybinc8n1rvb202231hmgb"; depends=[jsonlite tibble tidyr]; };
+  fixest = derive2 { name="fixest"; version="0.1.1"; sha256="0jnhnxxky8p0wisc5xd031sv1qy8szg163vidl13lqpsahjri3pq"; depends=[Formula MASS nlme numDeriv Rcpp]; };
   fizzbuzzR = derive2 { name="fizzbuzzR"; version="0.1.1"; sha256="119gbi9y4n8r52hk9vj7zf795dv9xnk7lnngljjcd7ydnhygwd4h"; depends=[]; };
   flacco = derive2 { name="flacco"; version="1.7"; sha256="1w77smmbrwglayr2rj88b00x7wan9f3x1fq8h6xyhybfvrw7vr0r"; depends=[BBmisc checkmate mlr]; };
   flagr = derive2 { name="flagr"; version="0.3.2"; sha256="195c78cml2pjzfvpkaxbzcg1dfdqxi76138p0v3x3zzva9d8nlji"; depends=[]; };
   flam = derive2 { name="flam"; version="3.2"; sha256="0v6kcl4n7wq052p7jdgbzlh9fpk8bzlrqw12i6pib1wd3slj0asa"; depends=[MASS Rcpp]; };
+  flamingos = derive2 { name="flamingos"; version="0.1.0"; sha256="0gic6y8wpxffpyi3zy0wh7apy4z6argxbz284n80k2mzh6lh029k"; depends=[Rcpp RcppArmadillo]; };
   flan = derive2 { name="flan"; version="0.7"; sha256="1r1vkf207k0il7r314gq1lxz0ndhdbbvx338mn8zhrkrd2ln9hpq"; depends=[lbfgsb3 Rcpp RcppArmadillo RcppGSL]; };
   flare = derive2 { name="flare"; version="1.6.0.2"; sha256="1ybrsx1djqldw0l5l1iz4pfh6xxb8ckkg1ric7wnsr51wm9ljlh5"; depends=[igraph lattice MASS Matrix]; };
   flars = derive2 { name="flars"; version="1.0"; sha256="06qma1ar1nj7n6g9alk1qydm5bkj6lsjx0pqkikxpb41d91civqk"; depends=[fda MASS Matrix Rcpp RcppEigen]; };
   flashClust = derive2 { name="flashClust"; version="1.01-2"; sha256="0l4lpz451ll7f7lfxmb7ds24ppzhfg1c3ypvydglcc35p2dq99s8"; depends=[]; };
+  flashlight = derive2 { name="flashlight"; version="0.2.0"; sha256="0ff3v44kpz1dyf7g6vsk8hlw3iwgp5rar7adcx7dy0a87w7kfh99"; depends=[dplyr ggplot2 ggpubr MetricsWeighted rlang tidyr]; };
   flatr = derive2 { name="flatr"; version="0.1.1"; sha256="10l98a3f57wahfpdqxj70r25zfhk4vzzd014pdnriy458yrfd7rw"; depends=[dplyr magrittr tibble]; };
   flatxml = derive2 { name="flatxml"; version="0.0.2"; sha256="1f7pc3chzimkg23490qvppy63sk4ds3aaahc36sa4dc4qmhabyms"; depends=[RCurl xml2]; };
   flexPM = derive2 { name="flexPM"; version="2.0"; sha256="0h3qs9w9pc2nc24q1diz7j3s93y40ijpmgq2l0xg9mzcgjz9kz8c"; depends=[survival]; };
@@ -7461,9 +7598,10 @@ in with self; {
   flexmixNL = derive2 { name="flexmixNL"; version="0.0.1"; sha256="0bk5v0cnsn1qkd1b86vj0bnpr4l9d6523kpkgzb1l1sqyscawfmm"; depends=[flexmix gnm]; };
   flexrsurv = derive2 { name="flexrsurv"; version="1.4.1"; sha256="13jq7yk7rz2148wkf7dv28l79zwdf1gpfkd5khgacb8hl5kml3p0"; depends=[Epi formula_tools matrixcalc orthogonalsplinebasis survival]; };
   flexsurv = derive2 { name="flexsurv"; version="1.1.1"; sha256="0x7p1rv51pplfyyzcg63ssb8z56mig7y0363hkr0219w3cvyq9nr"; depends=[deSolve mstate muhaz mvtnorm quadprog Rcpp survival tibble tidyr]; };
-  flexsurvcure = derive2 { name="flexsurvcure"; version="0.0.2"; sha256="1lhw2z8i4l822ncziwpw6hg0dzc244q60n7l5aahgdhcr0xgylhz"; depends=[flexsurv gtools survival]; };
+  flexsurvcure = derive2 { name="flexsurvcure"; version="1.0.0"; sha256="1blhwbkp0a3a7xnqyxp952wxkihdxb0xh68sk827h8rxis9zr4z4"; depends=[flexsurv gtools survival]; };
   flextable = derive2 { name="flextable"; version="0.5.5"; sha256="1q6x9mfk5gikqjbbra1dn8hs1rq5ws99jdjav3m113gx9f2j5yxh"; depends=[base64enc data_table gdtools htmltools knitr officer rlang rmarkdown xml2]; };
   flifo = derive2 { name="flifo"; version="0.1.5"; sha256="03x66l3ryrjvwbxxd0ncjrb5w9kc7fswmp5psb1cb7r87f395gm3"; depends=[bazar pryr]; };
+  flightplanning = derive2 { name="flightplanning"; version="0.7.2"; sha256="0l7pm4sdjdr0n5njnh4lxydayr55p4i5w2a6i3b998z8fdl0vpv9"; depends=[rgdal rgeos sp]; };
   flip = derive2 { name="flip"; version="2.5.0"; sha256="08x5hwxaxbgc745gblja7gcy0b5wbp7jf90lkha75zl5cc9iyksl"; depends=[cherry e1071 plyr someMTP]; };
   flippant = derive2 { name="flippant"; version="1.1.0"; sha256="06aj90y7c33c1q0nw1c67vr1pfmp9fw78az6ivrbq110f2k1m12w"; depends=[assertive_files assertive_numbers assertive_properties assertive_strings assertive_types data_table ggplot2 magrittr minpack_lm plyr RcppRoll stringi withr wmtsa]; };
   flipscores = derive2 { name="flipscores"; version="0.2"; sha256="0b55qxdrn6m0pbk4aj9zr1d9s7id6pclsaz939p48jmqx07zayjg"; depends=[]; };
@@ -7485,6 +7623,7 @@ in with self; {
   flyio = derive2 { name="flyio"; version="0.1.2"; sha256="1s5j8gdrxz9xwdfs1b2fypm9679apbk4nn1bik17zwv4shfwyzvy"; depends=[assertthat aws_s3 googleCloudStorageR stringr]; };
   fma = derive2 { name="fma"; version="2.3"; sha256="1z7shh9ng3q7ax22cwg86y79jzz5gbchdny2rppzzm0lkvvyy5pm"; depends=[forecast]; };
   fmbasics = derive2 { name="fmbasics"; version="0.3.0"; sha256="1dnf09rgwpc7n7ydlp7r5cwy2fa4vh1h9mbjqzfhk0208kz6jpl0"; depends=[assertthat fmdates lubridate tibble]; };
+  fmcmc = derive2 { name="fmcmc"; version="0.2-0"; sha256="0hczf41pykxz8j9y8d2mqawzk5q9w44875jk4p4pf7jbkff5rzxf"; depends=[coda]; };
   fmdates = derive2 { name="fmdates"; version="0.1.4"; sha256="1bbcwkh65nf2gak9b81zgg32c5ihwhmai3nc43ayf6ivhqsxw8x0"; depends=[assertthat lubridate]; };
   fmri = derive2 { name="fmri"; version="1.9"; sha256="1v7aicpds7zbh7p0vizrg5730f98ikqzrp6gmjw9psjwfxv0kmf6"; depends=[aws awsMethods metafor nlme]; };
   fmriqa = derive2 { name="fmriqa"; version="0.3.0"; sha256="1z09nf1c305a78c129jvs21b9z91wyhazz41wrn4bimmhfhx7szv"; depends=[ggplot2 gridExtra imager optparse pracma RcppEigen reshape2 RNifti tidyr viridisLite]; };
@@ -7508,9 +7647,9 @@ in with self; {
   foreSIGHT = derive2 { name="foreSIGHT"; version="0.9.8"; sha256="1kpk8p50xq3jrmapqyf56a5lnxkdvlafp5709wvqxq9rnsslpv2g"; depends=[cowplot directlabels doParallel GA ggplot2 moments zoo]; };
   foreach = derive2 { name="foreach"; version="1.4.7"; sha256="0q7iyniw5iri4hl57bhil3r69s5wnaijzn0q0x4h3z42245jqqwm"; depends=[codetools iterators]; };
   forecTheta = derive2 { name="forecTheta"; version="2.2"; sha256="1a7ip3czm8k82kb8dx95m8q47kjhifdj51gzavd1zj9ni3vwbhfn"; depends=[forecast tseries]; };
-  forecast = derive2 { name="forecast"; version="8.8"; sha256="079c3h4dxpnznadqbrpidahl3j58i4v8p0jw47lh1snkfx6hfxyh"; depends=[colorspace fracdiff ggplot2 lmtest magrittr nnet Rcpp RcppArmadillo timeDate tseries urca zoo]; };
+  forecast = derive2 { name="forecast"; version="8.9"; sha256="013xnpj3czcjkwqyzjjjhgy9nd56lwvh6y05ys2lndvcy4vyrqxd"; depends=[colorspace fracdiff ggplot2 lmtest magrittr nnet Rcpp RcppArmadillo timeDate tseries urca zoo]; };
   forecastHybrid = derive2 { name="forecastHybrid"; version="4.2.17"; sha256="1k3jwxqwkprcf2qr5x1b8hzzdvbyzdiablpvqnr0482x4vza8lmc"; depends=[doParallel foreach forecast ggplot2 purrr thief zoo]; };
-  forecastSNSTS = derive2 { name="forecastSNSTS"; version="1.2-0"; sha256="1rnf2a7sri52sm976iicab660qk07pmz8jmd3q71dg4hmc30yf9j"; depends=[Rcpp]; };
+  forecastSNSTS = derive2 { name="forecastSNSTS"; version="1.3-0"; sha256="0p47x7ic2ib7znqbp8br4b2ci75f5w8x413z9g4n30m002p7irp1"; depends=[Rcpp]; };
   foreign = derive2 { name="foreign"; version="0.8-72"; sha256="124c9229is44p2rv7xyh2q86nsfi7vzyyh5n3c5ihziqrp4ig723"; depends=[]; };
   forensic = derive2 { name="forensic"; version="0.2"; sha256="0kn8wn6p3fm67w88fbarg467vfnb42pc2cdgibs0vlgzw8l2dmig"; depends=[combinat genetics]; };
   forensim = derive2 { name="forensim"; version="4.3"; sha256="1jhlv9jv832qxxw39zsfgsf4gbkpyvywg11djldlr9vav7dlh3iw"; depends=[tcltk2 tkrplot]; };
@@ -7530,21 +7669,23 @@ in with self; {
   formatR = derive2 { name="formatR"; version="1.7"; sha256="1nsxbrx31k3y6yql30qkrvdfyznlia2qfvwv95mfiy7m7wdn4rm3"; depends=[]; };
   formattable = derive2 { name="formattable"; version="0.2.0.1"; sha256="1s7jjgm0j24vdwm39933ygh6xnxcfvzy4kl2mmfgas4czfcmd4rf"; depends=[htmltools htmlwidgets knitr rmarkdown]; };
   formula_tools = derive2 { name="formula.tools"; version="1.7.1"; sha256="15d3ikfmsh9zszfgfkrxb3jkipl41inm7n6bhs73kwlnklnygq2g"; depends=[operator_tools]; };
+  formulaic = derive2 { name="formulaic"; version="0.0.3"; sha256="0y2sq6ql3q2bf050dp9v0z6fn0f36z5k5777ymc8yjnj603xhfkd"; depends=[data_table DT]; };
   formulize = derive2 { name="formulize"; version="0.1.0"; sha256="1fz8q48z4zvfglxzmmjznb7lcfrrfqmnws85jfkihs3ff43h7ccc"; depends=[recipes rlang]; };
   fortunes = derive2 { name="fortunes"; version="1.5-4"; sha256="109ly9kpfn6hy294ava8795wy5z9l1bnl98hhhv8kn9naf4camdg"; depends=[]; };
   forward = derive2 { name="forward"; version="1.0.4"; sha256="0qhssp8mymy5wgzfkp1xa8s81j803g0ckg647ind6ms26320hq0x"; depends=[MASS]; };
   forwards = derive2 { name="forwards"; version="0.1.3"; sha256="07374a1ak5h8q3diqyvsw3q1grqi3679w9sshf1jkhlrj7wn0dmv"; depends=[]; };
   fossil = derive2 { name="fossil"; version="0.3.7"; sha256="188hyb3r1dnxkmqf2czh1kdzmk4mjc0v1kn1zml2yvxaxk7adsrz"; depends=[maps shapefiles sp]; };
   foto = derive2 { name="foto"; version="1.0.0"; sha256="10mfxgg5f1r85cwr0jjnsa4csp1afcrjvyjvp31060nm638clcgh"; depends=[raster]; };
-  fourPNO = derive2 { name="fourPNO"; version="1.0.5"; sha256="0nx6rl34jklsn48wphh16rxm57hfxndc1zfddgl9yw5nfmfll7gs"; depends=[Rcpp RcppArmadillo]; };
+  fourPNO = derive2 { name="fourPNO"; version="1.1.0"; sha256="0a0z2403kdh3fjb0ypjjk3m6fg77bg6m7hwb5jhlymcy2rwkay7w"; depends=[Rcpp RcppArmadillo]; };
   fourierin = derive2 { name="fourierin"; version="0.2.4"; sha256="140721p4h5mjr7r25ckv8wfhbj88xw6v47b613r5bpalg8gw650l"; depends=[Rcpp RcppArmadillo]; };
-  fpCompare = derive2 { name="fpCompare"; version="0.2.2"; sha256="10a87bpbpvrbrpyfx7ygyr9b7wd3fp79nd4g2ggl1gz3b1daqgxq"; depends=[]; };
+  fpCompare = derive2 { name="fpCompare"; version="0.2.3"; sha256="1pyv52rvbqd5v6ns86pc119q019ps070bd819x7a98s4hmbf76zq"; depends=[]; };
   fpa = derive2 { name="fpa"; version="1.0"; sha256="0kgpl9qq0l10h0vdd2f8vnir0kdylh1jvvv5z4d9ygj1pl9qywhk"; depends=[fields reshape]; };
   fpc = derive2 { name="fpc"; version="2.2-3"; sha256="1dy3pla4jjgs46izqg2kxajlxr80sbr9896jbzb1qszrdx7af041"; depends=[class cluster diptest flexmix kernlab MASS mclust prabclus robustbase]; };
   fpca = derive2 { name="fpca"; version="0.2-1"; sha256="13b102026xlfb7c2rb3xsqsymm7xpmaxppaafjkb5dx0b1lz0jrc"; depends=[sm]; };
   fpeek = derive2 { name="fpeek"; version="0.1.1"; sha256="0x7q5rl02ih0zmjfzvsc1vmn7s7yzdkf2gbmzc3mh7qadwpnf89p"; depends=[Rcpp]; };
   fpest = derive2 { name="fpest"; version="0.1.1"; sha256="013r8295spm02j558aqvnrnbkg2g73gl5vi4lqzngbw8yr8qlkri"; depends=[]; };
   fpmoutliers = derive2 { name="fpmoutliers"; version="0.1.0"; sha256="108bp3smk9jnckd5237xly4ywmal03rq1kidq5z61l6zrhc3yfh9"; depends=[arules doParallel foreach Matrix pmml pryr R_utils XML]; };
+  fpop = derive2 { name="fpop"; version="2019.08.26"; sha256="1gz5db9hlkvzkp5y7zzn9h57qz7ilpdyxyf05vy9kxbj36kgc19n"; depends=[]; };
   fpow = derive2 { name="fpow"; version="0.0-2"; sha256="0am3nczimcfrm9hi02vl2xxsh703qjmr2j11y014mll3f2v1l8cy"; depends=[]; };
   fpp = derive2 { name="fpp"; version="0.5"; sha256="1jqnx6bgpvnbbj2fa2b6m6aj8jd5cb9kz877r8kp7a5qj62xv1ww"; depends=[expsmooth fma forecast lmtest tseries]; };
   fpp2 = derive2 { name="fpp2"; version="2.3"; sha256="1krrvwg25qjfpfjdwd3n0d87ihl4zf7y1bnh6gbi92sdja3ljq48"; depends=[expsmooth fma forecast ggplot2]; };
@@ -7556,7 +7697,7 @@ in with self; {
   fractalrock = derive2 { name="fractalrock"; version="1.1.0"; sha256="15f4w8hq3d8khgq269669ri16qxhar9646w40cw7wzh79r9gpf00"; depends=[futile_any futile_logger quantmod timeDate]; };
   fractional = derive2 { name="fractional"; version="0.1.3"; sha256="1jz83y53s0xdphh1z3v3z7xhcmhx7rp0iiazw2vdsx2747r3rirn"; depends=[Rcpp]; };
   fragilityindex = derive2 { name="fragilityindex"; version="0.1.0"; sha256="06f7w0ff8mmydgylz5a0z29fc78spvmay3sjq0rz9k44w4bb9z3q"; depends=[pbapply stringr survival]; };
-  frailtyEM = derive2 { name="frailtyEM"; version="1.0.0"; sha256="19rsn07knc4ifj4v4v37s7k1dh0a4sdsxgbk5w7slzwh816spmjl"; depends=[expint ggplot2 magrittr Matrix msm numDeriv Rcpp survival tibble]; };
+  frailtyEM = derive2 { name="frailtyEM"; version="1.0.1"; sha256="0ajqmn8353va8k3idsl90xsrhpdqarfmvg84d4kwayxlqy6dmbb0"; depends=[expint ggplot2 magrittr Matrix msm numDeriv Rcpp survival tibble]; };
   frailtyHL = derive2 { name="frailtyHL"; version="2.2"; sha256="0i6r889i4f07w6992nfsfr439psz6k3q79nkkk3zwf5fv5r6bcky"; depends=[cmprsk Matrix survival]; };
   frailtySurv = derive2 { name="frailtySurv"; version="1.3.6"; sha256="0k41a5x7qzrajk2l59q5b8kjj084vids4ailr8r7r2lnf6r9xrav"; depends=[ggplot2 nleqslv numDeriv Rcpp reshape2 survival]; };
   frailtypack = derive2 { name="frailtypack"; version="3.0.3.2"; sha256="0kwp7z5m73nx6jcgh6j76lmirpzh2kz3yirwn4iii9qkccrh6jps"; depends=[boot doBy MASS nlme statmod survC1 survival]; };
@@ -7566,10 +7707,12 @@ in with self; {
   frapplot = derive2 { name="frapplot"; version="0.1.3"; sha256="12924szk2p0582nv97gi8pxrbv41zqpjryc6jqgg4llhp7ydz7xf"; depends=[]; };
   frbs = derive2 { name="frbs"; version="3.1-0"; sha256="0ngvi7lg6aviwic8f4ya03khyzh3ksglpmsnrdjjznwj874y2wim"; depends=[]; };
   fredr = derive2 { name="fredr"; version="1.0.0"; sha256="1hv51m0ihdpb73rp2gwj2q2xpjzlqpf9p3xzqdmy9nhwpfbj14nh"; depends=[httr jsonlite rlang tibble]; };
+  freealg = derive2 { name="freealg"; version="1.0-0"; sha256="0a3s89379lxr0dw068wfwzlqjq70zbaxil1vwwa4bf2i7s46mcgl"; depends=[Rcpp]; };
   freegroup = derive2 { name="freegroup"; version="1.1-0"; sha256="0ssshs2d6l2ip1xx9x581w0cdnd2459a1mh360ybwajkjgak2ci6"; depends=[magic magrittr plyr]; };
   freeknotsplines = derive2 { name="freeknotsplines"; version="1.0.1"; sha256="1yl53rnngrpj5mv1fgd0rgiqaw431g4ckxl1bq0l712647njx02a"; depends=[]; };
   freestats = derive2 { name="freestats"; version="0.0.3"; sha256="0b18n8idap089gkmjknzzb94dvs2drpdqs0mrw7dqnacxgbbqwfj"; depends=[MASS mvtnorm]; };
   freesurfer = derive2 { name="freesurfer"; version="1.6.5"; sha256="0g5rpskwgxx37b60vxn89kf2d6b2y66v508xyrsx3h47q973kjia"; depends=[neurobase R_utils reshape2]; };
+  freesurferformats = derive2 { name="freesurferformats"; version="0.1.2"; sha256="1w0a1dvqba6iywab5jnji3ky4l36r4q1jmg773dqwjjwsss2g8n1"; depends=[]; };
   freetypeharfbuzz = derive2 { name="freetypeharfbuzz"; version="0.2.5"; sha256="11agmqdp6sy32jk2840cj8wmgywq0yjar18zsnsn56qfvn4b1k1c"; depends=[fontquiver]; };
   freqdist = derive2 { name="freqdist"; version="0.1"; sha256="1pb45jabv9s3qa7v1isd5wm9b0g9p04q5h18spcaax8397s0d2fv"; depends=[]; };
   freqdom = derive2 { name="freqdom"; version="2.0.1"; sha256="0ig0ygnlcb5ndjjm5x8jpp37gvgwli9xv6zsvbbgfh72q418qswp"; depends=[matrixcalc mvtnorm]; };
@@ -7592,7 +7735,7 @@ in with self; {
   fscaret = derive2 { name="fscaret"; version="0.9.4.4"; sha256="18fhyfl3f8syyc3g937qx87dmwbv7dray6b97p1s6lnssiv61gsw"; depends=[caret gsubfn hmeasure]; };
   fsdaR = derive2 { name="fsdaR"; version="0.4-6"; sha256="0lj2kaan5n4g2ckj6d4sfvab0a45h164m1fjvqf57c0ymhaswz76"; depends=[ggplot2 reshape2 rJava rrcov]; };
   fsia = derive2 { name="fsia"; version="1.1.1"; sha256="0id7cnswrqylgpwjil1zfn89ryrdpl20fim8x1srl8s1hm5bg35r"; depends=[]; };
-  fslr = derive2 { name="fslr"; version="2.23.0"; sha256="1sx4mw9cknbn7q7qc5rqqzzzly7wsq09dsdlmhb98ycqq631hx8c"; depends=[neurobase oro_nifti R_utils]; };
+  fslr = derive2 { name="fslr"; version="2.24.1"; sha256="1psjqvjv8krlkj7dcfwygz563a4cpn7h21z330hxh5q10rwhabi8"; depends=[neurobase oro_nifti R_utils]; };
   fso = derive2 { name="fso"; version="2.1-1"; sha256="0hn2ypm0nwfbmnh9il78pi30x7gfmayfangqyh0d63ngyz40bvma"; depends=[labdsv]; };
   fssemR = derive2 { name="fssemR"; version="0.1.5"; sha256="1pxyl8b6nfaxdc86zlfjgyjvmx8ifh46d1lbwc2dknhp7sxc95q5"; depends=[glmnet igraph MASS Matrix mvtnorm qtl Rcpp RcppEigen stringr]; };
   fst = derive2 { name="fst"; version="0.9.0"; sha256="0ya5lh8p0qy5pcr6wxsrn43wj1r9gb9qycyn8gvl26ic3hxwk2rf"; depends=[Rcpp]; };
@@ -7605,14 +7748,14 @@ in with self; {
   fueleconomy = derive2 { name="fueleconomy"; version="0.1"; sha256="1svy5naqfwdvmz98l80j38v06563vknajisnk596yq5rwapl71vj"; depends=[]; };
   fugeR = derive2 { name="fugeR"; version="0.1.2"; sha256="0kd90s91vzv0g3v9ii733h10d8y6i05lk21p5npb3csizqbdx94l"; depends=[Rcpp snowfall]; };
   fugue = derive2 { name="fugue"; version="0.1.7"; sha256="1myvi9cizxvahb6wn2k26v3x958xsrm2p414ar05injmfjdfnsmi"; depends=[]; };
-  fullfact = derive2 { name="fullfact"; version="1.2"; sha256="13729m2s8b32d9i9c6g2r0zkcqsw9p7nhdig8isarfn4bjzqhf71"; depends=[afex lme4]; };
+  fullfact = derive2 { name="fullfact"; version="1.3"; sha256="1dy5ppa22i9axqcwx2184qv2vjcbml0yh5b89zx9rg2zsnv4ygym"; depends=[afex lme4]; };
   fulltext = derive2 { name="fulltext"; version="1.3.0"; sha256="1wh120zdv4kfz1ai3zsnk7j6acyhx439hr9aj92j0mzmb3pzxs7j"; depends=[aRxiv crminer crul data_table digest hoardr jsonlite magrittr microdemic pdftools rcrossref rentrez rplos storr tibble xml2]; };
   fun = derive2 { name="fun"; version="0.2"; sha256="0944m10nym4rsb6rhdwqn04c7l3bz43jcw3q8hv4vljdf5kyg9ar"; depends=[]; };
   funData = derive2 { name="funData"; version="1.3-3"; sha256="01aklp1k3k0bhs3dzlcr3phyk27d2nw0b8r154chiix5m67nfhbf"; depends=[abind fields foreach]; };
   funFEM = derive2 { name="funFEM"; version="1.1"; sha256="08798lvryykrxfvp2297anzl4gi81gwvc1qyyzq16nafjf65kwfy"; depends=[elasticnet fda MASS]; };
   funHDDC = derive2 { name="funHDDC"; version="2.3.0"; sha256="1dym1bzywng5yjfzpppxx043pwcbvrxxq0bn1d6xqqkqcpzn2zhp"; depends=[fda MASS]; };
   funLBM = derive2 { name="funLBM"; version="1.0"; sha256="0krx5v1lakrrxk0j249k7sr7c6r40yg1l8l10laf4444j2qn8rjp"; depends=[fda funFEM]; };
-  funModeling = derive2 { name="funModeling"; version="1.8"; sha256="1vcbrskl3kmiz6p75083gfk8r058w1ynjvk9qa1fm4x62ab3i9bk"; depends=[dplyr entropy ggplot2 gridExtra Hmisc lazyeval moments pander pROC RColorBrewer reshape2 ROCR scales]; };
+  funModeling = derive2 { name="funModeling"; version="1.9.2"; sha256="03kg0iqdijawly1nfw57x8d7sh9s8fd6p83l9450hghg77fbgdpn"; depends=[cli dplyr entropy ggplot2 gridExtra Hmisc lazyeval moments pander RColorBrewer reshape2 ROCR scales stringr]; };
   funbarRF = derive2 { name="funbarRF"; version="1.0.2"; sha256="14xfhwp4vffl215fqdxdxpmjblyw75ylxqjzja794adywm06sz19"; depends=[BioSeqClass Biostrings randomForest]; };
   funchir = derive2 { name="funchir"; version="0.1.4"; sha256="1mbsy65628q117c2k01wvibpjd3ibigy4yc1c8m0rf9jwsc67qjb"; depends=[data_table]; };
   functional = derive2 { name="functional"; version="0.6"; sha256="120qq9apg6bf39n9vnp68db5rdhwvnj2vi12a8j8243vq8kqxdqr"; depends=[]; };
@@ -7627,6 +7770,7 @@ in with self; {
   funtimes = derive2 { name="funtimes"; version="6.1"; sha256="1qr0z0nn3dv2yxq4sacsm0xs4pnda31zc10rz427rdyjrps85838"; depends=[dbscan Jmisc Kendall Rdpack]; };
   furniture = derive2 { name="furniture"; version="1.9.0"; sha256="17cik8r3dbv1a4d17ail7im65s8q2jmyzwiq1cbma7rldszs0x5j"; depends=[cli crayon dplyr forcats knitr magrittr rstudioapi tibble]; };
   furrr = derive2 { name="furrr"; version="0.1.0"; sha256="1ld9aa9hydna94hgm6p91zjbfv1dz1vsgchjlpknkg6irbvkfafx"; depends=[future globals purrr rlang]; };
+  fusedest = derive2 { name="fusedest"; version="1.3"; sha256="1i41bhrbdm501qs3dqh2y36mzfa5v94fqlhk625i2zwmf2ia7zas"; depends=[igraph Matrix Rcpp RcppEigen]; };
   fuser = derive2 { name="fuser"; version="1.0.1"; sha256="17lsfpd9hdichj3wflac896zyjbq7a8w2gmlgj8nbgg80f646fgr"; depends=[glmnet irlba Matrix Rcpp RcppEigen RSpectra]; };
   fusionclust = derive2 { name="fusionclust"; version="1.0.0"; sha256="1h03nlk4gnz4j5h2h5bxazkka2qq983h7nglm1ghzqvbqjk6sv37"; depends=[bbmle]; };
   futile_any = derive2 { name="futile.any"; version="1.3.2"; sha256="09z12dlj7cnkfwnmgsjknsghirv1cry83w4a9k4d0w5a1jnlr5jg"; depends=[lambda_r]; };
@@ -7636,20 +7780,19 @@ in with self; {
   futile_paradigm = derive2 { name="futile.paradigm"; version="2.0.4"; sha256="14xsp1mgwhsawwmswqq81bv6jfz2z6ilr6pmnkx8cblyrl2nwh0v"; depends=[futile_options RUnit]; };
   futility = derive2 { name="futility"; version="0.4"; sha256="0zjb87brz7pkx3nq3q30y69cmcxpqqsra447p60qh7005kgr9vx4"; depends=[]; };
   future = derive2 { name="future"; version="1.14.0"; sha256="1jyv2wlmpfqbk3hw269h4xg36na3wh1kd1lxmwdb40bsv4850lqa"; depends=[digest globals listenv]; };
-  future_BatchJobs = derive2 { name="future.BatchJobs"; version="0.16.1"; sha256="0isisl38gy59ws6w2qvz5ljp7j88lr6kqnq9g6pdw7njph1p6ayn"; depends=[BatchJobs future R_utils]; };
+  future_BatchJobs = derive2 { name="future.BatchJobs"; version="0.16.2"; sha256="08lh1sp0v1vagi34s218a1ygj63whkf3s9w0kyf25v64gsdavkzc"; depends=[BatchJobs future R_utils]; };
   future_apply = derive2 { name="future.apply"; version="1.3.0"; sha256="0wd3bh114zkvrqlpn8gqz4ix1igr9hr8x72h2g00a7mqkfjfqx33"; depends=[future globals]; };
-  future_batchtools = derive2 { name="future.batchtools"; version="0.8.0"; sha256="1ga29dhbfgjv5gxih8phad4y1yysdfljn0q218r0gdbnqw3gmzwb"; depends=[batchtools future]; };
-  future_callr = derive2 { name="future.callr"; version="0.4.0"; sha256="00anpp721chznl2hqa6dwv4mn7qjqcf3s6dxxiq3aqzwx30jblr6"; depends=[callr future]; };
+  future_batchtools = derive2 { name="future.batchtools"; version="0.8.1"; sha256="034sgd5pcv6d4jbi21ishwz5r1ym82g1pvyv3s0sl1jsy5g55v0w"; depends=[batchtools future]; };
+  future_callr = derive2 { name="future.callr"; version="0.5.0"; sha256="0rjvjmffc4m9kr4p40q1gyv1zf49m8q0fb04kmdi7a8q2jfflpna"; depends=[callr future]; };
   futureheatwaves = derive2 { name="futureheatwaves"; version="1.0.3"; sha256="122b2z86bzxfch67y6cpq8wj62mw0dgkzbmnpwi247kdx7w5mw1f"; depends=[data_table dplyr ggplot2 ggthemes leaflet Rcpp stringr tidyr]; };
   fuzzr = derive2 { name="fuzzr"; version="0.2.2"; sha256="1cwq7a5j6lzrlz9dw3hsfap988rh1kkgf03yni7c33zl69xp5w77"; depends=[assertthat progress purrr]; };
   fuzzyFDR = derive2 { name="fuzzyFDR"; version="1.0"; sha256="0zd8i9did0d9gp42xjmwrccm32glabvvy08kl8phhwb1yaq53h7w"; depends=[]; };
   fuzzyRankTests = derive2 { name="fuzzyRankTests"; version="0.3-10"; sha256="1xj5xsm2s4ylv3b8v80qny201iddjym07h8d50asas7xy1k7945z"; depends=[]; };
   fuzzySim = derive2 { name="fuzzySim"; version="2.0"; sha256="00rl5npz656hwpd1ah8bgh9baqpa9z2lgxc44amm5w3pb9pqjkbs"; depends=[]; };
   fuzzyforest = derive2 { name="fuzzyforest"; version="1.0.5"; sha256="1ifhvdzn0rs8gxqmpz8w1prxg3pxs5jqx5lh0r4i5rai49qjy3sb"; depends=[doParallel doRNG foreach ggplot2 mvtnorm randomForest]; };
-  fuzzyjoin = derive2 { name="fuzzyjoin"; version="0.1.4"; sha256="06r103hshc6xcjllv5qfiw3i1ddz4c8svy0i4j0avnffaarlc2wa"; depends=[dplyr geosphere purrr stringdist stringr tidyr]; };
+  fuzzyjoin = derive2 { name="fuzzyjoin"; version="0.1.5"; sha256="1lz7zxpqn206rgk956c4z9sfj3rg66pwcyci7d3r63cbgynq1gcs"; depends=[dplyr geosphere purrr stringdist stringr tibble tidyr]; };
   fuzzyreg = derive2 { name="fuzzyreg"; version="0.5.1"; sha256="19ppb1m655z3n7h4wcd5bwjciw4ynjbi883ki50mr5di3zy64n4r"; depends=[limSolve quadprog]; };
   fuzzywuzzyR = derive2 { name="fuzzywuzzyR"; version="1.0.3"; sha256="1kbli1m44317m95a0r34vza9p27vd9ala05jrbrdkadninwdynal"; depends=[R6 reticulate]; };
-  fwdmsa = derive2 { name="fwdmsa"; version="0.2"; sha256="0p0kh8am6gajfaixkvq61f12hfbm6chl9372yzn1yilhiyvqdxgp"; depends=[]; };
   fwi_fbp = derive2 { name="fwi.fbp"; version="1.7"; sha256="1wk9cr0kk6zkbf111bv87n7b1wwx1qrsbjxydvbjvy8bgz0nfa62"; depends=[]; };
   fwsim = derive2 { name="fwsim"; version="0.3.4"; sha256="0fy87c1x5hihfcppv1pvk3b0pwl6ygqpka40x55gbpkgssdigb1l"; depends=[Rcpp]; };
   fxregime = derive2 { name="fxregime"; version="1.0-3"; sha256="15fh8yhcba2gw2xfd0yiw5ssvbgb62l6vb28bxz71ckdyv9nsahk"; depends=[car sandwich strucchange zoo]; };
@@ -7663,21 +7806,22 @@ in with self; {
   gIPFrm = derive2 { name="gIPFrm"; version="3.1"; sha256="08rfdac442picbw1r3xyxjzf2dc57svg44am0714z4r72mshvj04"; depends=[]; };
   gLRTH = derive2 { name="gLRTH"; version="0.2.0"; sha256="1drmmr576n3pbr0q1cnnx4k7r4iz061n2cizv1kpr3wcc1g291pn"; depends=[]; };
   gMCP = derive2 { name="gMCP"; version="0.8-14"; sha256="11q2d4a352z7c0ln10mdpms1cl4bh5hqmg9avmbxw54z4i00mdvy"; depends=[CommonJavaJars JavaGD MASS Matrix multcomp mvtnorm PolynomF rJava xlsxjars]; };
-  gMOIP = derive2 { name="gMOIP"; version="1.1.0"; sha256="122yzwicsq7q98x5dxk1mmf148v2w64jz3pd3535himx85gy9zy3"; depends=[ggplot2 ggrepel]; };
+  gMOIP = derive2 { name="gMOIP"; version="1.3.0"; sha256="0v3hxy95g9nl5njmlskb18c5icsyq5n1sg41lm8gpgx4qp5fd4zb"; depends=[geometry ggplot2 ggrepel MASS plyr rgl]; };
   gMWT = derive2 { name="gMWT"; version="1.1"; sha256="1ws96x3vjswh6m6s9zn3r9gp7xp6ybdkkxsq9a73ng2zqz2qjdl0"; depends=[clinfun Rcpp RcppArmadillo]; };
   gPCA = derive2 { name="gPCA"; version="1.0"; sha256="1ylb1d24dxnzpws9bbanwhyizjr3ljky2bhrph4c5yaq0zwwbrkw"; depends=[]; };
   gPdtest = derive2 { name="gPdtest"; version="0.4"; sha256="00dlhnklfg2yp4hp7yjgr2nfswv22c007xq1mxdbkll62zgd94mq"; depends=[]; };
-  gProfileR = derive2 { name="gProfileR"; version="0.6.7"; sha256="12nwidbnqmnfy5dnqga26byslvdnkrpz2fi19qfcby6xx0wbndk7"; depends=[plyr RCurl]; };
+  gProfileR = derive2 { name="gProfileR"; version="0.6.8"; sha256="05d6y6b7vkkzp2qhs1cwlvp02djij1b28dbwxnrms08f8qi35iaj"; depends=[plyr RCurl]; };
   gRain = derive2 { name="gRain"; version="1.3-0"; sha256="0xb746pyh8k8w1a8nz7z41bflx5xr0cqdq5l5wj7j464zv2cw6jy"; depends=[functional graph gRbase igraph magrittr Rcpp RcppArmadillo RcppEigen]; };
   gRapfa = derive2 { name="gRapfa"; version="1.0"; sha256="07yzwzna9pdyzndxk6wwyl6v3gkfc7dvy1ixmdl3d38mcl1ahwyq"; depends=[igraph]; };
-  gRbase = derive2 { name="gRbase"; version="1.8-3.4"; sha256="0b6cl9p3px99vw9jx8wdcm4sh8v7zr6l4w0mk7ilrgbwzg198pyk"; depends=[graph igraph magrittr Matrix RBGL Rcpp RcppArmadillo RcppEigen]; };
+  gRbase = derive2 { name="gRbase"; version="1.8-4.5"; sha256="01mq9c5prkb9vhpp46i369i9a66vc1knh54vk57rb9mndlr8kinv"; depends=[graph igraph magrittr Matrix RBGL Rcpp RcppArmadillo RcppEigen Rgraphviz]; };
   gRc = derive2 { name="gRc"; version="0.4-3.2"; sha256="0f8m83wqhmsn6p0v0msdzyy9vl900nc9ddr8y78181jxcd9mqd0d"; depends=[gRbase MASS]; };
   gRim = derive2 { name="gRim"; version="0.2-0"; sha256="0ihl4vsnp6xkcpcf37p2xcqnbvyvjamcz5060f1kirn8xzwzq29y"; depends=[gRain graph gRbase igraph Rcpp RcppArmadillo]; };
   gSEM = derive2 { name="gSEM"; version="0.4.3.4"; sha256="18kh41ibvfflz59gykiq7j2c6a72i8b0w8c2mcprd1nzhnyhvmhy"; depends=[DiagrammeR htmlwidgets knitr MASS]; };
   gSeg = derive2 { name="gSeg"; version="0.6"; sha256="19njl093qidwjcwzxkzip78ahgq3zwhc0kscvhjpzb49qkg3srrj"; depends=[]; };
   gStream = derive2 { name="gStream"; version="0.2.0"; sha256="1f4xnbavm99yhjmaahazigps41mqlfvvl29kf4fs1yjqr531y36b"; depends=[]; };
   gTests = derive2 { name="gTests"; version="0.2"; sha256="1h1sd8mrzcniq7rx7frdlxwpnsn8lifng1x99fqq703hs3znl1yq"; depends=[ade4]; };
-  gWQS = derive2 { name="gWQS"; version="1.1.1"; sha256="147ygks66yhkg05c7rwnj2i6lhwdy3vx9z0yj6z5aj9p8yj7qxqr"; depends=[ggplot2 Rsolnp tableHTML ztable]; };
+  gWQS = derive2 { name="gWQS"; version="2.0.0"; sha256="1ip8zmnvdrw5m2rcfzj4xw9fv5i74909lnxk9m3y8l3vl5iavn8y"; depends=[broom dplyr future future_apply ggplot2 ggrepel kableExtra knitr MASS nnet plotROC pscl reshape2 rlist Rsolnp]; };
+  gWQSRS = derive2 { name="gWQSRS"; version="1.0.0"; sha256="09avy1xclzy5rb1wg8b7wmh4rcdi70b1xhbm9y93k0242p0yfb0r"; depends=[broom dplyr future future_apply ggplot2 ggrepel gWQS kableExtra knitr MASS nnet plotROC pscl reshape2 rlist Rsolnp]; };
   gWidgets = derive2 { name="gWidgets"; version="0.0-54.1"; sha256="1vwwjpi4lbgzw3fw3j9cccs9qhqa11v5hvq4hv5px373dla8pcn2"; depends=[]; };
   gWidgets2 = derive2 { name="gWidgets2"; version="1.0-8"; sha256="0p6lav6lrwgsw29sl8vshzgi8j2smcavx047qq31s9bsn2dcw58n"; depends=[digest]; };
   gWidgets2RGtk2 = derive2 { name="gWidgets2RGtk2"; version="1.0-7"; sha256="14c933j0wj3lb5da75zxg3w3mfqh0nqk8rczbi4dnqd8sna6jks9"; depends=[gWidgets2 memoise RGtk2]; };
@@ -7694,7 +7838,7 @@ in with self; {
   gamCopula = derive2 { name="gamCopula"; version="0.0-5"; sha256="08dw2i7h8maymqxr882kdv5938dz08n44969fisj2zya00zsrr4y"; depends=[copula doParallel foreach gsl igraph MASS mgcv numDeriv VineCopula]; };
   gamRR = derive2 { name="gamRR"; version="0.6.0"; sha256="0l7ql1qp3xgky82d88l143nl7l11zsj4mnkdsx10f3nmf7kykj3d"; depends=[boot mgcv]; };
   gama = derive2 { name="gama"; version="1.0.3"; sha256="1k79m01r3y9am62414947zfwb1w1gh0nn48najivbjyk9i2avn9r"; depends=[ArgumentCheck cluster clusterCrit GA ggplot2 NbClust Rfast]; };
-  gamair = derive2 { name="gamair"; version="1.0-0"; sha256="13n2n4b7givzvia93awy7ym0gihl4lr08w3a6ny2pq0f3zbhzw97"; depends=[]; };
+  gamair = derive2 { name="gamair"; version="1.0-2"; sha256="1cjrd576l9md1jb1fc1y6iay5y49i0d8by024qsc7yik6f6mdl13"; depends=[]; };
   gambin = derive2 { name="gambin"; version="2.4.1"; sha256="03n5zcwfq8g1vk5w22hw8fhqkc63zz4g9d3gdxa5g8v7v56l3dqy"; depends=[doParallel foreach gtools]; };
   gamboostLSS = derive2 { name="gamboostLSS"; version="2.0-1"; sha256="06n2xk7k24gz95jy1cr6shpfd89ylispq6mn3fvxblqdf8vhdixj"; depends=[mboost stabs]; };
   gamboostMSM = derive2 { name="gamboostMSM"; version="1.1.87"; sha256="0if0x92lch57ksll8d5i3jzk0kh40593b20c17g3hvc33920c7r0"; depends=[mboost]; };
@@ -7736,13 +7880,13 @@ in with self; {
   gaston = derive2 { name="gaston"; version="1.5.5"; sha256="0xiy36wrl480lzfcidw5k39arjmwzx4vx5qq8d4qb7ykq25hkjzz"; depends=[Rcpp RcppEigen RcppParallel]; };
   gatepoints = derive2 { name="gatepoints"; version="0.1.3"; sha256="02qxxf4a6rl3l0jdgqxmzxfnqd9lh5i0q2knaxxsiz0nd74c1jg5"; depends=[]; };
   gaussDiff = derive2 { name="gaussDiff"; version="1.1"; sha256="0fqjdxp2ibbami75ba16d02dz4rz5sk8mni45di9anydx44g9d45"; depends=[]; };
-  gausscov = derive2 { name="gausscov"; version="0.0.1"; sha256="0spik814lniy3jvzykfdgfp3pxpk23brpyljkb705wdr1wggg1gk"; depends=[]; };
+  gausscov = derive2 { name="gausscov"; version="0.0.2"; sha256="1a0m7br0yrj8k30rhqxq63jr6vdqhr6n983l34d1c9snspiyqxck"; depends=[]; };
   gaussfacts = derive2 { name="gaussfacts"; version="0.0.2"; sha256="095x7k7m7sy1gqkbm6wiqn26252dclz62sbnkv6cjvmbdxajl7m9"; depends=[]; };
   gaussquad = derive2 { name="gaussquad"; version="1.0-2"; sha256="0bcvkssmwwngcd4cnv924n9h3c8z1w3x9c9bkwn5jbz9zyv1lfms"; depends=[orthopolynom polynom]; };
   gazepath = derive2 { name="gazepath"; version="1.2"; sha256="0h5a9bpgx268yh0zy3y4xfvij1ncx92x5qphjc94xmzbrl0br1mf"; depends=[jpeg scales SDMTools shiny zoo]; };
   gb = derive2 { name="gb"; version="2.3.3"; sha256="0gkdkbwr168vi7lgccla49l43rkmjcfrwlqdr65mg5syzcxrh7nh"; depends=[boot KernSmooth]; };
   gbRd = derive2 { name="gbRd"; version="0.4-11"; sha256="06x97rw5i6v6cgjxkfhxnw4dn7lghn5q6ra7ri5ag1x9dkfzcl82"; depends=[]; };
-  gbfs = derive2 { name="gbfs"; version="1.1.0"; sha256="1c68p384fh53vi73xjk6kg51q62w49r74d1miyhxg5w56bwyw9n4"; depends=[dplyr jsonlite lubridate readr stringr]; };
+  gbfs = derive2 { name="gbfs"; version="1.2.0"; sha256="1nnsjcs5yghf5nq4hzxzfqi2l5q5wc78zn7rvknanvagliw5zdxh"; depends=[dplyr jsonlite lubridate readr stringr]; };
   gbm = derive2 { name="gbm"; version="2.1.5"; sha256="0vs6ljaqhwwpgr8wlbhmm4v147rd82kl16rpaijqiylxcc8dxyq6"; depends=[gridExtra lattice survival]; };
   gbm2sas = derive2 { name="gbm2sas"; version="2.1"; sha256="0ssjlv849vssmncn01ccpp2myqib5f3g88g0d4rqma2z0ivdpk23"; depends=[gbm]; };
   gbp = derive2 { name="gbp"; version="0.1.0.4"; sha256="0awg724gsfwlb0fjcvw0450qdsk4m8x8is16pj5c8fx6nc8rn8bv"; depends=[data_table magrittr Rcpp RcppArmadillo rgl]; };
@@ -7761,7 +7905,7 @@ in with self; {
   gcookbook = derive2 { name="gcookbook"; version="2.0"; sha256="11g1q187l4j31b6cdzdx5z3s14z3s09l7ynl36pzzn9j19l8cmrc"; depends=[]; };
   gdalUtilities = derive2 { name="gdalUtilities"; version="1.0.0"; sha256="1z452lh1n65g78dqynnwq3rcrmm7g4jz7qr25px7qav0zi6944mf"; depends=[raster sf]; };
   gdalUtils = derive2 { name="gdalUtils"; version="2.0.1.14"; sha256="0dvp1qzxxp6rjqfxpxckbfhdqanksnm4rfgsalvb5wdm5qmm02l9"; depends=[foreach R_utils raster rgdal sp]; };
-  gdalcubes = derive2 { name="gdalcubes"; version="0.1.0"; sha256="1w8ll08icdddr07zazkkj6gdnxsdlzq1wpsbbd8kbs8rgfnq6zjg"; depends=[jsonlite ncdf4 Rcpp RcppProgress]; };
+  gdalcubes = derive2 { name="gdalcubes"; version="0.2.1"; sha256="0i4dpxf9wx3sd3zi9vr0crinw449y98258plallmw47zvggwhiqv"; depends=[jsonlite ncdf4 Rcpp RcppProgress]; };
   gdata = derive2 { name="gdata"; version="2.18.0"; sha256="0zwdj7lscgxr8r62ii8hbdh4mb7sa9w4f5nv32zzrxdvymcpya2b"; depends=[gtools]; };
   gdimap = derive2 { name="gdimap"; version="0.1-9"; sha256="0ksbpcy739bvsiwis0pzd03zb4cvbd8d5wdf8whfn9k6mkj4x9rs"; depends=[abind colorspace geometry gridExtra gsl movMF oro_nifti rgl]; };
   gdistance = derive2 { name="gdistance"; version="1.2-2"; sha256="0lqpxsg01ibkaq50qyccdhsl2sbb4kh9bcfifs1yzsg45bq27jf8"; depends=[igraph Matrix raster sp]; };
@@ -7770,7 +7914,7 @@ in with self; {
   gdns = derive2 { name="gdns"; version="0.3.1"; sha256="1vydl7jacldidzx1hhqang9fw8zar8wy4cgdmr9pbw22ffw2qq7s"; depends=[httr jsonlite stringi]; };
   gdpc = derive2 { name="gdpc"; version="1.1.0"; sha256="1q1c9pypkb8dv6bvgizaca4p43krc52fvlvjz9l6nkpazr1qx33d"; depends=[doParallel foreach Rcpp RcppArmadillo xts zoo]; };
   gds = derive2 { name="gds"; version="0.1.0"; sha256="0kc3l93640x8d6g3pa9gbr7ci5hmryg9i1nqpasgnvb6ixv6azbm"; depends=[]; };
-  gdtools = derive2 { name="gdtools"; version="0.1.9"; sha256="0w4fihf52q5qxxk0lg36x6yvjjl8vw66y60ncdjs5fvnxqn5z2vb"; depends=[Rcpp withr]; };
+  gdtools = derive2 { name="gdtools"; version="0.2.0"; sha256="1mvpkp8cj30fwd4bwlz96x3cff7yzfbfz7iswmf77zl0a6122inh"; depends=[Rcpp systemfonts]; };
   gear = derive2 { name="gear"; version="0.1.4"; sha256="1wa35965fw4ga3p72z9w40pcc3jdc3fl7gdkfbwgakg7vc6f24xq"; depends=[lattice optimx sp]; };
   gee = derive2 { name="gee"; version="4.13-19"; sha256="14n2fa2jmibw5j8n4qgbl8xbxhapmx4z3zrmkbcci39k9dsyplzb"; depends=[]; };
   gee4 = derive2 { name="gee4"; version="0.1.0.0"; sha256="1vvzb9sc69g292zmh9djd15jgc7falypd5p7mzw6ps7mirpbnicf"; depends=[Formula Rcpp RcppArmadillo]; };
@@ -7783,6 +7927,7 @@ in with self; {
   geiger = derive2 { name="geiger"; version="2.0.6.2"; sha256="0780mrs5accmlscg8ya3i341gxdk1d2x21hj4lhjhrcdc1xh8lwi"; depends=[ape coda colorspace deSolve digest MASS mvtnorm ncbit Rcpp subplex]; };
   gelnet = derive2 { name="gelnet"; version="1.2.1"; sha256="10ygdfz9f5xhahlqb2divwvaljhiz8jhsd12wvq0qalx0v1h5j0p"; depends=[]; };
   gemlog = derive2 { name="gemlog"; version="0.36"; sha256="06av0gg9b96fdfq275wany036jxzrym3g5klbjmj1cjvl1kyvjim"; depends=[signal]; };
+  gemma2 = derive2 { name="gemma2"; version="0.1.1"; sha256="1kbjb5cjgrbdf695nz916w40a78zy5xjmr99l835iy27k3i2p61i"; depends=[Matrix readr]; };
   gems = derive2 { name="gems"; version="1.1.1"; sha256="174mjnpldb0rwjvwdgpcg1acm526gs0pjf9gi5mn9d3x9yz4r5jx"; depends=[data_table MASS msm plyr]; };
   gemtc = derive2 { name="gemtc"; version="0.8-2"; sha256="0c2a9gz6rvsc5qh66ixxa4dz6lwhcmmsf2vnvxl98c9kbvdwfqm9"; depends=[coda igraph meta plyr Rglpk rjags truncnorm]; };
   gen2stage = derive2 { name="gen2stage"; version="1.0"; sha256="16xbzgkjskzm1wik3dznvwhqddrpmcgsgd372n4a67rbb46jgx6r"; depends=[clinfun]; };
@@ -7795,7 +7940,6 @@ in with self; {
   gendata = derive2 { name="gendata"; version="1.1"; sha256="1r5bhmfblhk6d31v0byhp4a0pmpri6vk697zmmx9b0hvhda7mllf"; depends=[]; };
   gender = derive2 { name="gender"; version="0.5.2"; sha256="1kd5024z9mbyiwmj7rpn7zflmpw6jsj2sz153g3ckzyhxjbc3x36"; depends=[dplyr httr jsonlite]; };
   genderBR = derive2 { name="genderBR"; version="1.1.0"; sha256="0j5wsbv797wc48lc65yhaqhpwqyr662460vj59x7r9p7d7m1ncd0"; depends=[dplyr httr jsonlite]; };
-  genderizeR = derive2 { name="genderizeR"; version="2.1.1"; sha256="17lngcn0plyf7cjh5yizkp05w87jpr7rf1py4v5nw96f18wr4gjg"; depends=[data_table httr magrittr stringr tm]; };
   gendist = derive2 { name="gendist"; version="2.0"; sha256="0rs0sn1sb6j3pk2xncix04a093awlm2nw70g0rjhr7dlzmigspgb"; depends=[]; };
   geneHummus = derive2 { name="geneHummus"; version="1.0.11"; sha256="1m6yyjsvmn3w87cw4da8js5vi74k5y739gxdx1yscx1n50bc3m34"; depends=[curl dplyr httr rentrez stringr]; };
   geneListPie = derive2 { name="geneListPie"; version="1.0"; sha256="0z2gawfzhm05dafj4zlj6ifmf0dy7p1hrpa59lzxrnrc0wr6laji"; depends=[]; };
@@ -7803,12 +7947,12 @@ in with self; {
   geneSignatureFinder = derive2 { name="geneSignatureFinder"; version="2014.02.17"; sha256="1s9jj87wnzzgm9hnws09yhrxdlb6jw56i3ddwznvmh8vpzrspv4h"; depends=[class cluster survival]; };
   genemodel = derive2 { name="genemodel"; version="1.1.0"; sha256="1x6n6k9ifv2swhyrghvm6fsz5vh85cdik8225175i9msvmkh928n"; depends=[stringr]; };
   genepi = derive2 { name="genepi"; version="1.0.1"; sha256="1whhdlq9p8gmygv7464hvfz6dhm65gqq1dqls6hgpmw822zxgbd5"; depends=[]; };
-  genepop = derive2 { name="genepop"; version="1.1.2"; sha256="134qk4nd78ka6msy5ikckis8lrim1g96vlxwxkn4q9h5mfq3im32"; depends=[Rcpp RcppProgress stringr]; };
+  genepop = derive2 { name="genepop"; version="1.1.3"; sha256="0qj6bjhaxq3d5n94qsrhgpy6yh2m9ldk2ch3xffl2bdg3df79jlk"; depends=[Rcpp RcppProgress stringr]; };
   generalCorr = derive2 { name="generalCorr"; version="1.1.2"; sha256="19kr8gs41lxfn2k6azz3200p3c98fhq63skx9ga3glas8cmxph0i"; depends=[meboot np psych xtable]; };
   generalhoslem = derive2 { name="generalhoslem"; version="1.3.4"; sha256="0fmfhmdb16gf3v9h50vif4f3f6bm03qq7wplnmzyxa80jb60fcc0"; depends=[MASS reshape]; };
   generator = derive2 { name="generator"; version="0.1.0"; sha256="0xjvnmnpdms8rrxxcz6pd8w4rnbv3ghzqv4m63zxia2l98x7z4rf"; depends=[]; };
   generics = derive2 { name="generics"; version="0.0.2"; sha256="0xk1xhpy7gpv3pvaygzhpfdxj72zmb38pb4nscfyg2ff36vx3cvi"; depends=[]; };
-  genesysr = derive2 { name="genesysr"; version="0.9.1"; sha256="0cwx00bikhr32h2mxnd9v5z80zjy3y9i7b30achhlrjzvylh6q4j"; depends=[httr jsonlite]; };
+  genesysr = derive2 { name="genesysr"; version="0.9.2"; sha256="1mzp52hiyh7ccqflyck96mv51f300lb2zil0ndsda2h3cnd4ibz2"; depends=[httr jsonlite]; };
   genetics = derive2 { name="genetics"; version="1.3.8.1.2"; sha256="1v0ylnia6c44v356dsmnkx6054vcxazpzsrdh3yph5ch5vg6gjrh"; depends=[combinat gdata gtools MASS mvtnorm]; };
   genie = derive2 { name="genie"; version="1.0.4"; sha256="0ymrn42ik0rfildmyq4z0gsd7injda0dsjgx69nqb6hq0x8s5hqa"; depends=[Rcpp]; };
   genio = derive2 { name="genio"; version="1.0.10"; sha256="0l29rz9nap2rglansv8sbldhgngv04v1kdgy0zzxjzwwmsdcjrqp"; depends=[Rcpp readr tibble]; };
@@ -7818,13 +7962,14 @@ in with self; {
   genlogis = derive2 { name="genlogis"; version="1.0.0"; sha256="01av5invhviii7adqihh10ib47rjzwfsqdgw3lfg1c72kzrqywgr"; depends=[distr doParallel foreach ggplot2 manipulate]; };
   geno2proteo = derive2 { name="geno2proteo"; version="0.0.3"; sha256="1q054ai42f5gmrj791abj02f663zs7ymdh3pfs3b2lq6i4w9s2fb"; depends=[BiocGenerics GenomicRanges IRanges R_utils RUnit S4Vectors]; };
   genoPlotR = derive2 { name="genoPlotR"; version="0.8.9"; sha256="07901qv2lzzflda0p8qxmla6syvq2c9y230xipvn1i0p4izdqk5s"; depends=[ade4]; };
-  genogeographer = derive2 { name="genogeographer"; version="0.1.8"; sha256="1sawxazfyi29h27lyrkkg0cqirmca59387z77r2jamcj6yx4lpxg"; depends=[dplyr DT forcats ggplot2 knitr leaflet magrittr purrr readr rio rmarkdown shiny shinycssloaders shinyjs tibble tidyr]; };
+  genodds = derive2 { name="genodds"; version="1.0.0"; sha256="00sh561qcabcz5igcfvkjjila0qi2i5imj8cn0msa1gvqf27ps4d"; depends=[Rcpp]; };
+  genogeographer = derive2 { name="genogeographer"; version="0.1.19"; sha256="0q56ysv5333i27iv1gmd9ilbgn3rw8sb9yq7z76gmn1fak5aqci8"; depends=[dplyr DT forcats ggplot2 knitr leaflet magrittr maps purrr readr rio rlang rmarkdown shiny shinycssloaders shinyjs shinyWidgets tibble tidyr]; };
   genomeplot = derive2 { name="genomeplot"; version="1.0"; sha256="15v01ngxq7kxav1bhw1mvqradrmvwsad5xh9l5skivb5smh9795w"; depends=[ggplot2]; };
   genomic_autocorr = derive2 { name="genomic.autocorr"; version="1.0-1"; sha256="1lidrjz1flxw4jvhqdi8y813m7ss4kkvm7bxsdpz60dxxw3204gm"; depends=[data_table magrittr reshape]; };
   genomicper = derive2 { name="genomicper"; version="1.6"; sha256="12msl6syw5a3dvxg9fr1yprcpb9qwn8v2dvkpxgagal11p9q1kx7"; depends=[DBI]; };
   genotypeR = derive2 { name="genotypeR"; version="0.0.1.8"; sha256="1kwzjn6hrnfizs44cz4a8qa4mdhdzqssc4axx0s6vngmkmsrffig"; depends=[colorspace doBy plyr reshape2 zoo]; };
   genpathmox = derive2 { name="genpathmox"; version="0.3"; sha256="0r1iqwm5jh93lbh87ks5qm4qqsp98928vg7qmv1pkahdlvl3ramw"; depends=[diagram mice plspm quantreg]; };
-  genpwr = derive2 { name="genpwr"; version="1.0.0"; sha256="0wnr4xxjmxp7fs65frwrm2ajcg1pc1f7rsj0jxi102wpy1d93h8q"; depends=[ggplot2 MASS nleqslv]; };
+  genpwr = derive2 { name="genpwr"; version="1.0.1"; sha256="1vz4pq8rfvw0pbxhm83mbgsrj17ldcssq92b48p6vlpb403jsm91"; depends=[ggplot2 MASS nleqslv]; };
   genridge = derive2 { name="genridge"; version="0.6-6"; sha256="1hqarvd767h2vbjqfjzdr0548hxj87kv1073hfqyq5fybdlzsjx3"; depends=[car]; };
   gensemble = derive2 { name="gensemble"; version="1.0.1"; sha256="03ql1qxrxixr70hs9mwiqw92qyrg9pj4046pb42g435yncw321ad"; depends=[]; };
   gensphere = derive2 { name="gensphere"; version="1.1"; sha256="1xzli40fw94n89cv2qyb321csad1w9zidqc226wlifl2m44cw6f7"; depends=[geometry mvmesh rgl SimplicialCubature SphericalCubature]; };
@@ -7836,23 +7981,25 @@ in with self; {
   geoRglm = derive2 { name="geoRglm"; version="0.9-11"; sha256="0qf3nm0snrmplbwgcac0iinni7h2wqm13lm34zzfl00idzv0k9b9"; depends=[geoR sp]; };
   geoSpectral = derive2 { name="geoSpectral"; version="0.17.4"; sha256="0i2k5k66gmf7zvipcd0a489rnpj14j4a4xw9k5dccpj6ybwd47l7"; depends=[dplyr leaflet maps plotly rbokeh rgdal sp spacetime xts]; };
   geoaxe = derive2 { name="geoaxe"; version="0.1.0"; sha256="043y7kb24hp66j7pnpqsdixvdmppwp72y8i4f8q7xrkhaqlfb93v"; depends=[jsonlite rgeos sp]; };
+  geobr = derive2 { name="geobr"; version="1.0"; sha256="139wqhw90irx02byqph1klhmjr6f9wackhffr1a148c9c8bhs0i4"; depends=[dplyr httr readr sf]; };
   geodetector = derive2 { name="geodetector"; version="1.0-3"; sha256="1x6mr05976vdxxgcb4fd3v7mq2lanrl44nqz6f6rk2dy3yhdqi5c"; depends=[maptools rgdal rgeos sp]; };
   geodist = derive2 { name="geodist"; version="0.0.3"; sha256="1qxrbpx265l5vwvicspbqzr2s0k3k6lsrzvxnbhnds95jgq9yw4q"; depends=[]; };
   geoelectrics = derive2 { name="geoelectrics"; version="0.2.0"; sha256="1dmpaf16750ni4yr36cglfz9pv9jax8jxb3kwn47kxgnx3l8qq98"; depends=[fields lattice rgl]; };
   geofacet = derive2 { name="geofacet"; version="0.1.10"; sha256="07viqfm8h469zjmpk4vp6zxmvwdcsn2wi0j8plyx1nirmxl7s0mw"; depends=[geogrid ggplot2 ggrepel gridExtra gtable imguR rnaturalearth sp]; };
   geofd = derive2 { name="geofd"; version="1.0"; sha256="16312g9mgw52mpsfky1j20zcqkkv91ihl0xhvv1bl80diffzf0zi"; depends=[fda geoR]; };
   geogrid = derive2 { name="geogrid"; version="0.1.1"; sha256="0b8afwgj9x56z6zh525y7qkiwbv77mjcw3v19kfba0426jn4vi87"; depends=[Rcpp RcppArmadillo rgeos sf sp]; };
+  geohashTools = derive2 { name="geohashTools"; version="0.3.0"; sha256="0lc5ib6iylbxn02bl72sh3b6j51zm3b1rnjrj5jdyjj22hm7n7sa"; depends=[]; };
   geojson = derive2 { name="geojson"; version="0.3.2"; sha256="0iqf8jkqgl97a07v8ixr2pbvamwyjswqckdwl3kkxgx7bycndprv"; depends=[jqr jsonlite lazyeval magrittr protolite sp]; };
-  geojsonR = derive2 { name="geojsonR"; version="1.0.6"; sha256="17zcrkazcnn1507m5cpphzp14m40w1wzrhrb77rl5hn1jrxqvhh5"; depends=[R6 Rcpp RcppArmadillo]; };
+  geojsonR = derive2 { name="geojsonR"; version="1.0.7"; sha256="11d6rn7z2i8x4j3myzk9gkaw6y5asi92ya9lxc9cn1zv8jlsamvr"; depends=[R6 Rcpp RcppArmadillo]; };
   geojsonio = derive2 { name="geojsonio"; version="0.7.0"; sha256="1fhj4si2m60wy95badq31ip98r6wpnn20jnw7bmy2ps0103klmbz"; depends=[geojson httr jqr jsonlite magrittr maptools readr rgdal rgeos sf sp V8]; };
   geojsonlint = derive2 { name="geojsonlint"; version="0.3.0"; sha256="1ww52fg80mqwpn9rxz7qy698djjgzngp3fdhhhvixfrzl0ha810r"; depends=[crul jsonlite jsonvalidate V8]; };
   geojsonsf = derive2 { name="geojsonsf"; version="1.3.0"; sha256="1wr3g4rcvv7wh0gjw5mic3msz7wgcg6ra3zai5kxbv3wq2i9hfcg"; depends=[BH curl jsonify rapidjsonr Rcpp]; };
   geoknife = derive2 { name="geoknife"; version="1.6.3"; sha256="092in9wihgijhbkawzjqwfyazz22n4sc06x2gj14yvmp63x5dj36"; depends=[curl httr progress sp whisker xml2]; };
   geomapdata = derive2 { name="geomapdata"; version="1.0-4"; sha256="1g89msnav87kim32xxbayqcx1v4439x4fsmc8xhlvq4jwlhd5xxw"; depends=[]; };
-  geomedb = derive2 { name="geomedb"; version="1.0.0"; sha256="1bmprzm0xm78vixifl5sx6ig31l8pmbscjb382yyhh1i0qdd7bim"; depends=[ape data_table httr jsonlite]; };
+  geomedb = derive2 { name="geomedb"; version="2.0.0"; sha256="1lrxhgrrx12irbk9rlvyqcvzhw842c4hp9mqw7gzqcldhpc40isd"; depends=[ape data_table httr jsonlite]; };
   geomerge = derive2 { name="geomerge"; version="0.3.1"; sha256="0pvyhpv4vq8mvvlybxhviq8rbazw29dgf9m0xnldaxg9r6lqdp4d"; depends=[geosphere ggplot2 gridExtra inlmisc lubridate raster scales sp spdep]; };
-  geometa = derive2 { name="geometa"; version="0.5-0"; sha256="1p2yr1xlxyslichy39krqhm0ag93mlc4vmvzn3frk5ay9by0prx6"; depends=[httr R6 XML]; };
-  geometry = derive2 { name="geometry"; version="0.4.2"; sha256="0vq334115qi039vy198ggv1dsp6n1s6jwcm9ivipf5r8lbm287zz"; depends=[linprog lpSolve magic Rcpp RcppProgress]; };
+  geometa = derive2 { name="geometa"; version="0.6-0"; sha256="0hnzj6i4czg4n39bf2bk2m285j53ys80nnzy98gd884dr6zry2gq"; depends=[httr jsonlite R6 XML]; };
+  geometry = derive2 { name="geometry"; version="0.4.4"; sha256="1mx5n5mw63nij4n6crs9165mlls4fnh1ipw5ch467rjsidgl0mg8"; depends=[linprog lpSolve magic Rcpp RcppProgress]; };
   geomnet = derive2 { name="geomnet"; version="0.2.0"; sha256="0xanzx8p34bac4zcf9j69nivwhllvsrw7x70mzgl95jhg3gvv96a"; depends=[dplyr ggplot2 network plotly readr sna tidyr]; };
   geomorph = derive2 { name="geomorph"; version="3.1.2"; sha256="1wd8pnpcb5zkqg39hvsw1jyw9yx66w0w5nyg114b8v3m9x41rkr9"; depends=[ape jpeg rgl RRPP]; };
   geonames = derive2 { name="geonames"; version="0.999"; sha256="0yz1b7y3vwa4izrhpry4n3iwzb7y67s5p3kgnd7d29cl5pcbpmqx"; depends=[rjson]; };
@@ -7863,8 +8010,9 @@ in with self; {
   geophys = derive2 { name="geophys"; version="1.4-1"; sha256="1s64sbr0chv0z2vaw059khfkv8iga1kr6428kkglgafq5x2d6h3q"; depends=[cluster GEOmap RFOC RPMG RSEIS]; };
   georob = derive2 { name="georob"; version="0.3-10"; sha256="1d9chcvncf8ywrhb43slf86zl2mxzhhsmyifsg9jkbfn8ibbb720"; depends=[abind constrainedKriging fields lmtest nleqslv nlme quantreg RandomFields robustbase snowfall sp]; };
   geosample = derive2 { name="geosample"; version="0.2.1"; sha256="1gpzrsza8ys2jdazb2ixc70y1w5lrkahlmvws1i071zby1la01iy"; depends=[pdist sf sp splancs]; };
-  geosapi = derive2 { name="geosapi"; version="0.4-0"; sha256="0n1w276xyidwhj858h28ai7npbmkl7rvg1plsa9hhmx5zijzihsk"; depends=[httr openssl R6 XML]; };
+  geosapi = derive2 { name="geosapi"; version="0.4-1"; sha256="00c2566r50v4vgqzjvghf4spyfqqxnwkhxj38ivym3l8b0d5fd2x"; depends=[httr openssl R6 XML]; };
   geoscale = derive2 { name="geoscale"; version="2.0"; sha256="0gisds0in32xhw54fxfyxvwxgrfjs871wmqf6l915nr896rlx0bm"; depends=[]; };
+  geosed = derive2 { name="geosed"; version="0.1.1"; sha256="07j4q6sgrf83h2gi2j5qap5rifz8gimdacd3b7ld1p3b6ai6kv3r"; depends=[]; };
   geospacom = derive2 { name="geospacom"; version="0.5-8"; sha256="14qyjbq0n43c2zr9gp11gdqgarvmicx3gpq2ql2vjfzrmirxwjgg"; depends=[classInt geosphere maptools rgeos sp]; };
   geosphere = derive2 { name="geosphere"; version="1.5-10"; sha256="15xlgsmn0vwky1l13n6acdz6jn2b2na3gf6x367y3qh1f5w4zkan"; depends=[sp]; };
   geospt = derive2 { name="geospt"; version="1.0-2"; sha256="1814nn0naxvbn0bqfndpmizjbqcs6rm87g2s378axkn6qpii4bh8"; depends=[fields genalg gsl gstat limSolve MASS minqa plyr sgeostat sp TeachingDemos]; };
@@ -7884,23 +8032,27 @@ in with self; {
   gesca = derive2 { name="gesca"; version="1.0.4"; sha256="1ndn8wgp22pr017x6v7jw8jy4gd06x8110qa860hw8i6pn47wfwv"; depends=[]; };
   gestalt = derive2 { name="gestalt"; version="0.1.8"; sha256="1cb04rd3yvkd47byynrn0pq6brlsi2z2iavh4gfrwmqyvks34k51"; depends=[rlang]; };
   gestate = derive2 { name="gestate"; version="1.3.2"; sha256="1fr811f4d7zc75wxdrasd91wsa5ngzzb0p73ycy6lfwpm839i28q"; depends=[doParallel foreach shiny shinythemes survival survRM2]; };
-  getCRUCLdata = derive2 { name="getCRUCLdata"; version="0.3.0"; sha256="15jcfbvad0zrnpaigd1n0wpvcvwms2q37ryscf1v1jj4bv931bn5"; depends=[curl data_table hoardr raster tibble]; };
+  getCRUCLdata = derive2 { name="getCRUCLdata"; version="0.3.1"; sha256="1961w8vpgamna5a9m367mc9szl3vlv8wgmbhfjc0yxp818p07g3a"; depends=[curl data_table hoardr raster tibble]; };
   getMet = derive2 { name="getMet"; version="0.3.2"; sha256="0j1h1vy8rd7czpnb4msdb9k560pnh7kjkmpqqwzwin2ms1c0mggb"; depends=[EcoHydRology jsonlite]; };
   getPass = derive2 { name="getPass"; version="0.2-2"; sha256="03ydafhh0sk3rcnpr3paajyji64x2ddp6p814p9mvbmyrblcgzcc"; depends=[rstudioapi]; };
   getProxy = derive2 { name="getProxy"; version="1.12"; sha256="0qcxihgwy3h2b98z2hwjszwqbz117d89xjys7fy0f8m9hv7rf6ph"; depends=[bitops data_table dplyr httr jsonlite RCurl]; };
-  getTBinR = derive2 { name="getTBinR"; version="0.6.1"; sha256="1r4pqcyhd64g77xckmhwpnsrxlla4qm67fq04byzb6f96j5d50wl"; depends=[data_table dplyr ggplot2 ggthemes magrittr plotly purrr rlang scales tibble tidyr viridis]; };
+  getTBinR = derive2 { name="getTBinR"; version="0.7.0"; sha256="03xfi6cdsw5h7pmnzaxh9ig2j05jmyzzcjrslayanwdfwk370zas"; depends=[data_table dplyr ggplot2 ggthemes magrittr plotly purrr rlang scales tibble tidyr viridis]; };
   gethr = derive2 { name="gethr"; version="0.1.0"; sha256="0kpi9b9yg2nh332zkml24pmj6vgjfh8mrfjjg5a636s2rg98g5g7"; depends=[httr jsonlite]; };
   getlandsat = derive2 { name="getlandsat"; version="0.2.0"; sha256="15450v93lc4i2qda0zlb5vplwbarkmf3f6sb4rlrdpv9vlj85hff"; depends=[crul data_table rappdirs readr tibble xml2]; };
   getmstatistic = derive2 { name="getmstatistic"; version="0.2.0"; sha256="0rxj1dyfqy3fw2jhv05sw9x70p67rxmq3aqffymzal61rz6cnr3y"; depends=[ggplot2 gridExtra gtable metafor psych stargazer]; };
   getopt = derive2 { name="getopt"; version="1.20.3"; sha256="0zzmzgwl9a4y3s34600vmih22d6y32294f9bvxrnmffnvkgmy7sk"; depends=[]; };
-  gets = derive2 { name="gets"; version="0.19"; sha256="18qd0rnl8w307laykyv93ahrblxz2nsvrcn0qfwar23g3n9vnzx5"; depends=[zoo]; };
+  gets = derive2 { name="gets"; version="0.21"; sha256="0frpfwb1sbbnhs1j77dlxrpsfl9nk6nyjg6aly0hn2vpi9p934ns"; depends=[zoo]; };
+  getspres = derive2 { name="getspres"; version="0.1.0"; sha256="1y51l9bq5p025nyv37q7mmda7yw2qrw42dz50pwlrmi8h27l9zkf"; depends=[colorRamps colorspace dplyr metafor plotrix RColorBrewer]; };
   gettz = derive2 { name="gettz"; version="0.0.3"; sha256="1i06nfm824131q8lwwhrbzg2g9lbnmyp8k57w2vag7v8jj5rdrda"; depends=[]; };
   gexp = derive2 { name="gexp"; version="1.0-0"; sha256="0jasxyr9rwdj1lmsc5zr77kkzm4nci3pxgc4npr7j0wcim7k8lby"; depends=[jpeg mvtnorm png]; };
   gfcanalysis = derive2 { name="gfcanalysis"; version="1.5.0"; sha256="1cg34c4hr8kwc23qlv2m6qw2k7ah4w8s70q0hf4hnvp66rw4kaqh"; depends=[animation geosphere ggplot2 plyr raster rasterVis RCurl rgdal rgeos sp stringr]; };
   gfer = derive2 { name="gfer"; version="0.1.10"; sha256="1y0ra8k7zka43ibiii16vbwnc3m1i77yc9zj8rhzhmvhajjwad3l"; depends=[circlize data_table ggplot2 ggrepel googlesheets gsheet httr jsonlite rvest scatterpie stringi tidyr V8 xml2]; };
   gfmR = derive2 { name="gfmR"; version="1.1-0"; sha256="0qzzbcra1fnbp0h31b1as20yhmqmi7p62xrhikj64an9avg9b277"; depends=[faraway nnet]; };
+  gfoRmula = derive2 { name="gfoRmula"; version="0.2.1"; sha256="0hqjpav6zaxgk5mwx72qphcpc4gvm2072kl15419arr6aqf79kkq"; depends=[data_table ggplot2 ggpubr nnet stringr survival truncnorm truncreg]; };
+  gg_gap = derive2 { name="gg.gap"; version="1.3"; sha256="0m66050ryn31xmsmmikjsssllasvjdmp9yjbwfdwfpwdv106zn9h"; depends=[cowplot ggplot2]; };
+  ggBubbles = derive2 { name="ggBubbles"; version="0.1.4"; sha256="116rl8j0s9xwhh9jl5yj9fspkhv2zrirbx9247hhns9ngrdn4i3x"; depends=[dplyr ggplot2]; };
   ggChernoff = derive2 { name="ggChernoff"; version="0.2.0"; sha256="09bh9isvx3hwwvg72fv6z3fvp8dimpbhvbp328z8amq8jjhph4vf"; depends=[ggplot2 scales]; };
-  ggExtra = derive2 { name="ggExtra"; version="0.8"; sha256="1m5zpn3l3p1y3d2692gyz50m63d58m2a3b7zb595kvcffdx2qr5b"; depends=[colourpicker ggplot2 gtable miniUI scales shiny shinyjs]; };
+  ggExtra = derive2 { name="ggExtra"; version="0.9"; sha256="18mbi6gblqmrsciad1d2c9ngllk6mayaqj43k40hjq9ydqnvjbgj"; depends=[colourpicker ggplot2 gtable miniUI R6 scales shiny shinyjs]; };
   ggPMX = derive2 { name="ggPMX"; version="0.9.4"; sha256="11ccgklx1zdnv0klxrdyd27a848744srywijfi4j24cxg30c0yyg"; depends=[assertthat checkmate data_table GGally ggplot2 gtable knitr magrittr R6 rmarkdown stringr yaml zoo]; };
   ggQC = derive2 { name="ggQC"; version="0.0.31"; sha256="1j9cs97hcj5zmqvn5rjr3gl0b9748s3pv2nb7v66dsyjdwvj7wyy"; depends=[dplyr ggplot2 tidyr]; };
   ggQQunif = derive2 { name="ggQQunif"; version="0.1.5"; sha256="0vrxmqxy946mwdq0mb2m1ch41r0chrw7hcn18dr3mp10bv7pl7wj"; depends=[dplyr ggplot2 scales]; };
@@ -7910,7 +8062,7 @@ in with self; {
   ggThemeAssist = derive2 { name="ggThemeAssist"; version="0.1.5"; sha256="1biw91a8p13h62v4w3yim6ghr98khmyhb3qd0h04asf91vvmpxbv"; depends=[formatR ggplot2 miniUI rstudioapi shiny]; };
   ggTimeSeries = derive2 { name="ggTimeSeries"; version="1.0.1"; sha256="12gi0zfl8g3x78skpkhska8b3z1pp636shrbx33rkq0iacsipqga"; depends=[data_table ggplot2]; };
   ggallin = derive2 { name="ggallin"; version="0.1.1"; sha256="0hrxa7m07ppvnndivxcgxksdyblb6fw17aw46maqavlvcrz3fjgm"; depends=[ggplot2 scales]; };
-  ggalluvial = derive2 { name="ggalluvial"; version="0.9.1"; sha256="0np4dwhxz9q3p9y1w45fyvs4cphi50mbgi9wrinpi3k5i3anv6zf"; depends=[dplyr ggplot2 lazyeval rlang tidyr tidyselect]; };
+  ggalluvial = derive2 { name="ggalluvial"; version="0.10.0"; sha256="05435i5859mi0dyahh9vgfdcqd4wjwznx9ixw1nkaqcdbv843v30"; depends=[dplyr ggplot2 lazyeval rlang tidyr tidyselect]; };
   ggalt = derive2 { name="ggalt"; version="0.4.0"; sha256="0ssa274d41vhd6crzjz7jqzbwgnjimxwxl23p2cx35aqs5wdfjpc"; depends=[ash dplyr extrafont ggplot2 gtable KernSmooth maps MASS plotly proj4 RColorBrewer scales tibble]; };
   gganimate = derive2 { name="gganimate"; version="1.0.3"; sha256="0ngx4xjq0zvjf4fi433qyk8nxk1zvkimll0z6hs48y9k6b5mi4ch"; depends=[ggplot2 glue plyr progress rlang scales stringi tweenr]; };
   ggasym = derive2 { name="ggasym"; version="0.1.1"; sha256="01mx5yz2b4y4vh76gq323pf66r5a6d0x5pbdzfaiakiav3hdw9gf"; depends=[broom dplyr ggplot2 magrittr purrr rlang scales stringr tibble tidyr]; };
@@ -7918,29 +8070,30 @@ in with self; {
   ggbuildr = derive2 { name="ggbuildr"; version="0.1.0"; sha256="0pld635v6fv46ky7s4icwxlcnr7z6bp5ikf20adpkljwhy0wwxak"; depends=[ggplot2 purrr readr]; };
   ggconf = derive2 { name="ggconf"; version="0.1.3"; sha256="0g4xasqhdiqfqahakv6p5npl56f2iakx4bnc9v9zcjr077kdda4n"; depends=[ggplot2 rly]; };
   ggcorrplot = derive2 { name="ggcorrplot"; version="0.1.3"; sha256="0hi9lz121ya1l2lbm7rqlxg6fs6bvxck396dngnidrhl5fvqb41b"; depends=[ggplot2 reshape2]; };
-  ggdag = derive2 { name="ggdag"; version="0.1.0"; sha256="0ja3v8pmlzl55n8y8n9zcg5n17w8w4vdq42bqf6h8hgyqj63rcg9"; depends=[dagitty dplyr forcats ggforce ggplot2 ggraph ggrepel igraph magrittr plyr purrr stringr tibble tidygraph]; };
+  ggdag = derive2 { name="ggdag"; version="0.2.0"; sha256="0jds4yqnf2pjbq0b2a81mx1akjzcvc21v2lh8z91h9frxw47g63g"; depends=[dagitty dplyr forcats ggforce ggplot2 ggraph ggrepel igraph magrittr pillar plyr purrr stringr tibble tidygraph]; };
   ggdark = derive2 { name="ggdark"; version="0.2.1"; sha256="1w93g2j4g45x9s841v9zi18lxzda81ipa13fajqc6p9xk8frvgrf"; depends=[ggplot2]; };
-  ggdemetra = derive2 { name="ggdemetra"; version="0.2.0"; sha256="187dxvpdy95hhzzxl5k9766yk72a5g36vvgy0y89mzvc6mvnb8f8"; depends=[ggplot2 ggrepel gridExtra RJDemetra]; };
+  ggdemetra = derive2 { name="ggdemetra"; version="0.2.1"; sha256="1d5adnamv2gnnj3q8779brl827d2zbqpkgfz2r097jndy5ng1021"; depends=[ggplot2 ggrepel gridExtra RJDemetra]; };
   ggdendro = derive2 { name="ggdendro"; version="0.1-20"; sha256="1zzq1hxd0d1qa5hrzwfkdw6fzscpcafbwbpkrb62dm559y8awp0j"; depends=[ggplot2 MASS]; };
   ggdistribute = derive2 { name="ggdistribute"; version="1.0.3"; sha256="07bsnfp1chf52gprw7g5kyqf6l6yzmnlv13x9dj1wa6rjwq1342i"; depends=[data_table dplyr ggplot2 magrittr tibble]; };
   ggdmc = derive2 { name="ggdmc"; version="0.2.6.0"; sha256="1gncv7npl548k3zd41x2gwg5qywn5rp6zb4i7ga78sy77mvi3x92"; depends=[coda data_table ggplot2 matrixStats Rcpp RcppArmadillo]; };
   gge = derive2 { name="gge"; version="1.4"; sha256="0plwk5j2n0309ghgn8r4ws3azwn7n4jb7yfykiiwwalhs3k05lsa"; depends=[nipals reshape2 rgl]; };
   ggedit = derive2 { name="ggedit"; version="0.3.0"; sha256="1v9apfkm47jcqyhjrvv8ig09gz6zsss5xj5mrckfjybd5ca08rzn"; depends=[colourpicker dplyr ggplot2 magrittr miniUI plyr purrr rlang rstudioapi scales shiny shinyAce shinyBS tidyr]; };
-  ggeffects = derive2 { name="ggeffects"; version="0.11.0"; sha256="1b0lxa8bljdh6h4lk7pql1lrhjlvh7p5c8qlgb8ac6ay8hb79vmi"; depends=[dplyr insight magrittr MASS purrr rlang scales sjlabelled sjmisc]; };
+  ggeffects = derive2 { name="ggeffects"; version="0.12.0"; sha256="0idfycjk05gyykfp9ibmhxfcjvd01ikh1dl0fb4nqw6znw3ar0xp"; depends=[dplyr insight magrittr MASS purrr rlang scales sjlabelled sjmisc]; };
   ggenealogy = derive2 { name="ggenealogy"; version="1.0.0"; sha256="1wi29f7allky84w9w2512v8gs687gvypsbd7r4vyxs24l6pfssyc"; depends=[ggplot2 igraph plotly plyr reshape2 tibble]; };
   ggetho = derive2 { name="ggetho"; version="0.3.4"; sha256="05wh0qk5cbcvcfgj5wf12qqbjgl1bbwcxywc16qdby7r4h5wy0gn"; depends=[behavr data_table ggplot2 labeling rlang scales stringr]; };
   ggfan = derive2 { name="ggfan"; version="0.1.3"; sha256="1p3hbznpsaznlk0lnjyazc130www0p5919qplg3kspng7qh8p22w"; depends=[colorspace dplyr ggplot2 rstan]; };
   ggfittext = derive2 { name="ggfittext"; version="0.8.1"; sha256="1a5k8fba2qjxnpd14vqkakpzcwkzqbpvs8h6fb9zh62y91n6p26v"; depends=[ggplot2 shades stringi]; };
   ggfocus = derive2 { name="ggfocus"; version="0.9"; sha256="03adq3pdhlgckqc20aw6r70kdcrw0v4rmm848ivv6wkck4qyla3m"; depends=[dplyr ggplot2 magrittr RColorBrewer rlang]; };
-  ggforce = derive2 { name="ggforce"; version="0.2.2"; sha256="0snxx9zhcccxa7pz9pf3bjqmcmv9mz4m47v81hklnhm25jj40xg2"; depends=[ggplot2 gtable MASS polyclip Rcpp RcppEigen rlang scales tweenr]; };
-  ggformula = derive2 { name="ggformula"; version="0.9.1"; sha256="01ngx8qh9lhmagng6abx2ky54zi3iyj5bpxlnw59slagwv7l6icx"; depends=[ggplot2 ggstance magrittr mosaicCore rlang stringr tibble tidyr]; };
+  ggforce = derive2 { name="ggforce"; version="0.3.1"; sha256="04926cqrda6psvy2nzkkw4czwyxdp7fnxg76byp14v12kgd72lm0"; depends=[ggplot2 gtable MASS polyclip Rcpp RcppEigen rlang scales tidyselect tweenr withr]; };
+  ggformula = derive2 { name="ggformula"; version="0.9.2"; sha256="16ycabhnp78fsiv1dc63ccgh9gmpsy2683vbmq0fdzl6w3pd87sr"; depends=[ggplot2 ggstance magrittr mosaicCore rlang stringr tibble tidyr]; };
   ggfortify = derive2 { name="ggfortify"; version="0.4.7"; sha256="1wk9j0xg5hj9i1vf62qjiphv8cbsgq7y6baay3pfl3wyb2dwgci0"; depends=[dplyr ggplot2 gridExtra scales stringr tibble tidyr]; };
   gggenes = derive2 { name="gggenes"; version="0.4.0"; sha256="13hrjh80rlri8vm736p85v2jwwpck8gc5jfps1qrqcq86kv2xgkn"; depends=[ggfittext ggplot2 rlang]; };
   ggghost = derive2 { name="ggghost"; version="0.2.1"; sha256="0kvsjadxxdf6yvzk4a6yqkg02q1ysslvf3m0a369bdim396z4hnv"; depends=[animation ggplot2]; };
   ggguitar = derive2 { name="ggguitar"; version="0.1.1"; sha256="1lmfs54h91gzcxin37v4flkywbq3fs648mm1h9ak03xlj5nagzsi"; depends=[dplyr ggplot2 gridExtra lazyeval readr tibble]; };
   gghalfnorm = derive2 { name="gghalfnorm"; version="1.1.2"; sha256="1sy0m6pqmnjbqv60rljyblhis0dxwkhw751jhlad5arcgrcwf4k8"; depends=[ggplot2 ggrepel]; };
+  gghalves = derive2 { name="gghalves"; version="0.0.1"; sha256="03s1wrfgkd55zmf3scv6kp32s3lcpbm5prnc5ndgad43zq8jyi09"; depends=[ggplot2 gtable]; };
   gghighlight = derive2 { name="gghighlight"; version="0.1.0"; sha256="1mfjvfm5xbih7k7qz6x8akbqgh0b18dz9pybfgh7rbq2ppwnhpy9"; depends=[dplyr ggplot2 ggrepel magrittr purrr rlang tibble]; };
-  ggimage = derive2 { name="ggimage"; version="0.2.1"; sha256="1713xghrc77y8s7gwvjwz6w70psmrqxgk7sph5jzsfvjfjdnl3xv"; depends=[ggplot2 ggplotify jsonlite magick rvcheck scales tibble]; };
+  ggimage = derive2 { name="ggimage"; version="0.2.3"; sha256="00hxl1c2l63aw66v16ybhj6j2391kmqcisk3dyahvq1gz777rarz"; depends=[ggplot2 ggplotify jsonlite magick rvcheck scales tibble]; };
   gginference = derive2 { name="gginference"; version="0.1.0"; sha256="0dikyqryz25ikm047clkwn0ihlxa5zia2bxp71fh8ynxxvzixz3k"; depends=[ggplot2 rlang]; };
   gginnards = derive2 { name="gginnards"; version="0.0.2"; sha256="10a4mrp2sn9c1s1bjyk8h9fxd9a2qqsggpcb2spgcha37mhz8cak"; depends=[ggplot2 magrittr rlang stringr tibble]; };
   ggiraph = derive2 { name="ggiraph"; version="0.6.1"; sha256="1ir62rxnas6whqlxf7lwvsaj731mnp1ixw391gp3sb6vigh5cair"; depends=[gdtools ggplot2 htmltools htmlwidgets Rcpp xml2]; };
@@ -7954,7 +8107,8 @@ in with self; {
   ggmap = derive2 { name="ggmap"; version="3.0.0"; sha256="13dmzl6z62pzjiffilarkji46vy0sacxa8a7mhrhc3biq3ylzhln"; depends=[bitops digest dplyr ggplot2 glue httr jpeg magrittr plyr png purrr RgoogleMaps rjson scales stringr tibble tidyr]; };
   ggmcmc = derive2 { name="ggmcmc"; version="1.3"; sha256="0p3akjbi0044nma8ynvqa42bkrgrb0jjx323k2pbrnlkq8x3ma1b"; depends=[dplyr GGally ggplot2 tidyr]; };
   ggmosaic = derive2 { name="ggmosaic"; version="0.2.0"; sha256="0byhp7125r015wbbnv6fq13bx38krf11r39jx9dzbr0ci6kqzkdb"; depends=[dplyr ggplot2 plotly productplots purrr rlang tidyr]; };
-  ggmuller = derive2 { name="ggmuller"; version="0.5.3"; sha256="0qcphgal4c28lcwa1qdbryk40rkqpd4hz6phvcp6jy0n75lqi9f3"; depends=[ape dplyr ggplot2]; };
+  ggmr = derive2 { name="ggmr"; version="0.1.1"; sha256="0941rvh7m5knlhp0m0mhm4j8spmch0pyvwhzs3bycq3vzlvzv1w7"; depends=[MASS]; };
+  ggmuller = derive2 { name="ggmuller"; version="0.5.4"; sha256="0y7bm9fm5i8acpy6fa903ca2r9yasky7kg2hicm4xz5ni09jm20x"; depends=[ape dplyr ggplot2]; };
   ggnetwork = derive2 { name="ggnetwork"; version="0.5.1"; sha256="13qisn4msjzkpcmn7rh2c4ymqfxp9bayrvqngp9pysfmr6wvc6ia"; depends=[ggplot2 ggrepel network sna]; };
   ggnewscale = derive2 { name="ggnewscale"; version="0.3.0"; sha256="0nh5577if0qiqlksg028j4bkz058bm3qqwxm4nlqsssi4spja22f"; depends=[ggplot2 stringi]; };
   ggnormalviolin = derive2 { name="ggnormalviolin"; version="0.1.2"; sha256="1gbv2b86nznw5bs05c4ns96b8hsxkhikhcf8syl2qbbafzy8vx6y"; depends=[dplyr ggplot2 magrittr scales]; };
@@ -7963,20 +8117,21 @@ in with self; {
   ggparliament = derive2 { name="ggparliament"; version="2.0.0"; sha256="04za4lm3lir95bgda1rzlsyil2fkac3j5f5f1pjw2samy6pjz80r"; depends=[dplyr ggplot2 rlang]; };
   ggparty = derive2 { name="ggparty"; version="1.0.0"; sha256="0s6hr5p930kl3pj6ajwgwqz6yikc3l9hhzy1yn0nqc0r8pp2jyqf"; depends=[checkmate ggplot2 gtable partykit rlang survival]; };
   ggperiodic = derive2 { name="ggperiodic"; version="1.0.0"; sha256="1cig715qy1kjjrn89cf505njdl2xccvjc5l0fwbqh86xgjayslxb"; depends=[data_table dplyr ggplot2 sticky tidyselect]; };
-  ggplot2 = derive2 { name="ggplot2"; version="3.2.0"; sha256="1cvk9pw59kxx19kamqwa15h26rbznp0vvqpn7y8kgjssnrzqkdii"; depends=[digest gtable lazyeval MASS mgcv reshape2 rlang scales tibble viridisLite withr]; };
+  ggplot2 = derive2 { name="ggplot2"; version="3.2.1"; sha256="0mjswqiqcwm0aqxll16bx2kwa6c9km3aql87bdj4347n1ali94g3"; depends=[digest gtable lazyeval MASS mgcv reshape2 rlang scales tibble viridisLite withr]; };
   ggplot2movies = derive2 { name="ggplot2movies"; version="0.0.1"; sha256="067ld6djxcpbliv70r2c1pp4z50rvwmn1xbvxfcqdi9s3k9a2v8q"; depends=[]; };
   ggplotAssist = derive2 { name="ggplotAssist"; version="0.1.3"; sha256="1g0s1dkbrxmwqjqppagdbnx24s0nbjn09xwxix3dkfssz6drhala"; depends=[dplyr editData gcookbook ggplot2 ggthemes magrittr miniUI moonBook rstudioapi scales shiny shinyAce shinyWidgets stringr tibble tidyverse]; };
   ggplotgui = derive2 { name="ggplotgui"; version="1.0.0"; sha256="1yfglg5438mwyml845isimzma5q6824x19jka509ng49bzmf1za0"; depends=[ggplot2 haven plotly RColorBrewer readr readxl shiny stringr]; };
-  ggplotify = derive2 { name="ggplotify"; version="0.0.3"; sha256="14hqlpvnaq5psz1ljcpw9isa06827rg3fm5c1dx159rsjfi56yby"; depends=[ggplot2 gridGraphics rvcheck]; };
+  ggplotify = derive2 { name="ggplotify"; version="0.0.4"; sha256="0nv3wdmxnc5ww9m3xlgnb0jp30j45dg33nqc6gg3y36svg8anjcg"; depends=[ggplot2 gridGraphics rvcheck]; };
   ggpmisc = derive2 { name="ggpmisc"; version="0.3.1"; sha256="1kcjdpq7xz3609prbcf3ikj87wgcq9rk1pzhb62bh885plczsfz2"; depends=[broom dplyr ggplot2 gridExtra lubridate magrittr MASS plyr polynom rlang scales splus2R stringr tibble xts zoo]; };
+  ggpointdensity = derive2 { name="ggpointdensity"; version="0.1.0"; sha256="0c9a14j3b0hvamqylhzldw2hjdxmfbllwahjkf3gg2rw337ld9iy"; depends=[ggplot2]; };
   ggpol = derive2 { name="ggpol"; version="0.0.5"; sha256="0n54mmk9alc3bd9q3jb64xvxnszqndfwpi6h6n09gpvlrbj8mkdx"; depends=[dplyr ggplot2 gtable plyr rlang]; };
   ggpolypath = derive2 { name="ggpolypath"; version="0.1.0"; sha256="0g9zfal3vqcx16fi4abxm6l5sam475lk1f6bdik487wc2v0dkq83"; depends=[ggplot2]; };
-  ggpubr = derive2 { name="ggpubr"; version="0.2.1"; sha256="0a4dv6a752hwvc7l31xs7bgqhfzfdy94xp6wgwaxf5dxm46na7k1"; depends=[cowplot dplyr ggplot2 ggrepel ggsci ggsignif glue gridExtra magrittr polynom purrr scales tidyr]; };
-  ggpval = derive2 { name="ggpval"; version="0.2.2"; sha256="1l5m925ajbqffn7yccx3kg6hsgwbqalqgid04133p8m1vwm6dvyf"; depends=[data_table ggplot2]; };
-  ggquickeda = derive2 { name="ggquickeda"; version="0.1.3"; sha256="09b074rqyr93n3j60sm81qh3bdhrkwlkv4mxmcjcj3hivd6b2vck"; depends=[colourpicker dplyr DT Formula GGally ggplot2 ggpmisc ggpubr ggrepel ggstance gridExtra Hmisc lazyeval markdown plotly quantreg rlang scales shiny shinyjs stringr survival survminer table1 tidyr]; };
+  ggpubr = derive2 { name="ggpubr"; version="0.2.3"; sha256="0i81mmz4qn9yzcgfa6dhkcrx4ddlflkm2c3b40isc8all43rm8rn"; depends=[cowplot dplyr ggplot2 ggrepel ggsci ggsignif glue gridExtra magrittr polynom purrr rlang scales tidyr]; };
+  ggpval = derive2 { name="ggpval"; version="0.2.3"; sha256="04s0pwi0pljdd8r6wnjyb3i3php6qgvpc1mdvhywcx2i2zqip2qx"; depends=[data_table ggplot2]; };
+  ggquickeda = derive2 { name="ggquickeda"; version="0.1.4"; sha256="0rv7q7fvc9c9ca7w90ib9jrrk96vrkmayhv80nyymnc9ybknw59l"; depends=[colourpicker dplyr DT Formula GGally ggplot2 ggpmisc ggpubr ggrepel ggstance gridExtra Hmisc lazyeval markdown plotly quantreg rlang scales shiny shinyjs stringr survival survminer table1 tidyr]; };
   ggquiver = derive2 { name="ggquiver"; version="0.2.0"; sha256="1hsayqxf4brck1rx97yyprw1axc83lksgf7mn3rh8hqx4h1f5f0f"; depends=[dplyr ggplot2]; };
-  ggraph = derive2 { name="ggraph"; version="1.0.2"; sha256="0fpmp326mryd1k1qvacjadksrnhbla8h960i18lmrimzrag7692c"; depends=[digest dplyr ggforce ggplot2 ggrepel gtable igraph MASS plyr Rcpp scales viridis]; };
-  ggraptR = derive2 { name="ggraptR"; version="1.1"; sha256="1lknd3vibysc00c6b59c0yq2r3dda7zn8bj7gxjzjv90jwpgl0b8"; depends=[dplyr ggplot2 pacman purrr shiny]; };
+  ggraph = derive2 { name="ggraph"; version="2.0.0"; sha256="0qj7w3af0pgmd9mil6y571jikfkln7b8csvzg6b08spwbglfy1s3"; depends=[digest dplyr ggforce ggplot2 ggrepel graphlayouts gtable igraph MASS Rcpp rlang scales tidygraph viridis]; };
+  ggraptR = derive2 { name="ggraptR"; version="1.2"; sha256="18r70pnz7x8728lg447ds7swgk539gga9shax7rs4x56a710pf3q"; depends=[dplyr ggplot2 pacman purrr shiny]; };
   ggrasp = derive2 { name="ggrasp"; version="1.0"; sha256="0lini89mcxl30kx38vny9896hdf4afrz5dgivbbikkb2yyfh2cq1"; depends=[ape bgmm colorspace ggplot2 mixtools]; };
   ggrepel = derive2 { name="ggrepel"; version="0.8.1"; sha256="10vjrcmx8yknfbx93d9a4y3z8gafri0fhimw6hcq733dmdvkml6m"; depends=[ggplot2 Rcpp scales]; };
   ggridges = derive2 { name="ggridges"; version="0.5.1"; sha256="0dhwcpy785ac2ny5bjp284595nnybi3554wd0yffsli0vzf7ry01"; depends=[ggplot2 plyr scales withr]; };
@@ -7984,15 +8139,15 @@ in with self; {
   ggsci = derive2 { name="ggsci"; version="2.9"; sha256="0g73x6grbka7ahjh6z23m3wrcifp5rdfdiasbl8lq4sp6rplxwaa"; depends=[ggplot2 scales]; };
   ggseas = derive2 { name="ggseas"; version="0.5.4"; sha256="1jpdijwll5l7bg7cmjnklkxffysi9ckzg50rw2a2cd00zwby11q9"; depends=[ggplot2 rlang seasonal zoo]; };
   ggseqlogo = derive2 { name="ggseqlogo"; version="0.1"; sha256="13q6kcpxrqxqbji889fx63p0nsi08lk5yymkchig75r5k1d18ky1"; depends=[ggplot2]; };
-  ggsignif = derive2 { name="ggsignif"; version="0.5.0"; sha256="0z04g5kqdj66fyfxb5d2m7njkqd7idbiy4xgsnxdh5pbh3cr643x"; depends=[ggplot2]; };
+  ggsignif = derive2 { name="ggsignif"; version="0.6.0"; sha256="17j9hg967k1wp9xw3x84mqss58jkb8pvlrnlchz4i1hklgykxqbg"; depends=[ggplot2]; };
   ggsn = derive2 { name="ggsn"; version="0.5.0"; sha256="04vnap83w06hbqqi5kgxmrdb3a13n5mcdk5lllymv6nrzvl84f2x"; depends=[ggmap ggplot2 maptools png sf]; };
   ggsoccer = derive2 { name="ggsoccer"; version="0.1.4"; sha256="126czg8xyms959pc398d63fwrs6p9f253xnrgig5sw4vfxl9hqgm"; depends=[ggplot2]; };
   ggsolvencyii = derive2 { name="ggsolvencyii"; version="0.1.2"; sha256="0jzj4iglgzwp6pfs5zr7mirdiqrrmbwdvl245b1fwf42rnxbqrq6"; depends=[dplyr ggplot2 magrittr tidyr]; };
   ggsom = derive2 { name="ggsom"; version="0.2.1"; sha256="0gycd3yzdy58m22r62my5v0s00mr7ga7mcfa6i300arp47lzdwq1"; depends=[dplyr ggplot2 ggthemes kohonen tidyr tidyverse]; };
   ggspatial = derive2 { name="ggspatial"; version="1.0.3"; sha256="0ka15qj3f0yq9nfkgk77wp490nz9ymi80918apv9zp6x39kcprj9"; depends=[abind ggplot2 plyr raster reshape2 rlang rosm scales sf tibble tidyr]; };
-  ggspectra = derive2 { name="ggspectra"; version="0.3.3.1"; sha256="0mwpa4my9z377h5z9skaw4dy82cci6mkcyrw64c14kjv3rmx6xb7"; depends=[dplyr ggplot2 ggrepel lubridate photobiology photobiologyWavebands scales tidyr]; };
-  ggstance = derive2 { name="ggstance"; version="0.3.2"; sha256="078ih9s5b0xzf582qg0vjnxvg5qad5ms1v2vdd062ckahi8zz1r8"; depends=[ggplot2 plyr rlang withr]; };
-  ggstatsplot = derive2 { name="ggstatsplot"; version="0.0.12"; sha256="0fmf5619yzq9qv4x73bai6qi2lrmldk0n354dznk5ywpqw9xsnp4"; depends=[BayesFactor boot broomExtra cowplot crayon DescTools dplyr ellipsis ez forcats ggcorrplot ggExtra ggplot2 ggrepel ggsignif glue groupedstats jmv magrittr MCMCpack metaBMA metafor paletteer psych purrr purrrlyr rcompanion rlang scales sjstats stringr tibble tidyr WRS2]; };
+  ggspectra = derive2 { name="ggspectra"; version="0.3.4"; sha256="18p0wfcnkgahs43j2msrm6x5h91bpi3pnwlqlckniyfixhfdlycy"; depends=[dplyr ggplot2 ggrepel lubridate photobiology photobiologyWavebands scales tidyr]; };
+  ggstance = derive2 { name="ggstance"; version="0.3.3"; sha256="0kdksay61hyb6612b07r84chh7a9aibjyclk3qcypvr9aang8hkh"; depends=[ggplot2 plyr rlang withr]; };
+  ggstatsplot = derive2 { name="ggstatsplot"; version="0.1.2"; sha256="03gny7svwjxiylwg5g0hlymla85img2gb2il8kvkzm93k76bci0x"; depends=[broomExtra cowplot crayon dplyr forcats ggcorrplot ggExtra ggplot2 ggrepel ggsignif groupedstats insight metaBMA metafor pairwiseComparisons paletteer psych purrr rlang scales sjstats statsExpressions tibble tidyr WRS2]; };
   ggswissmaps = derive2 { name="ggswissmaps"; version="0.1.1"; sha256="0is48x6k2p5dgj9q4km0dv33a9pcpfhlai9vz295y3acpyrkmnn4"; depends=[ggplot2]; };
   ggtern = derive2 { name="ggtern"; version="3.1.0"; sha256="1fhs5s3sxhb46abzni7cyymyknk9z7ff8fanln41pkih76s5i18j"; depends=[compositions ggplot2 gridExtra gtable latex2exp lattice MASS plyr proto scales]; };
   ggthemes = derive2 { name="ggthemes"; version="4.2.0"; sha256="0rrkzfggc1nlda1w1lbqdycx6nawxbkac1szhvkwrqlzh6agxcsv"; depends=[ggplot2 purrr scales stringr tibble]; };
@@ -8002,21 +8157,21 @@ in with self; {
   ggvoronoi = derive2 { name="ggvoronoi"; version="0.8.3"; sha256="04dv33vnip0rrli1diq43v7vhr86bmxjdyxjbxz5x4371kbb312j"; depends=[deldir ggplot2 raster rgeos sp]; };
   ggwordcloud = derive2 { name="ggwordcloud"; version="0.5.0"; sha256="0mr92738s3j9wm6mkr5hd2flqsqw3vfjifv3fajsygysbwrl8dn8"; depends=[colorspace ggplot2 png Rcpp scales]; };
   gh = derive2 { name="gh"; version="1.0.1"; sha256="1llinfajb0g7006jd2w1hpskxpmkjhnqarcjb71r1qvsccb2ph7k"; depends=[httr ini jsonlite]; };
-  ghibli = derive2 { name="ghibli"; version="0.2.0"; sha256="1wikcipj1gd45a0a22i7bf4j25ixv2q9ppyfdv41vfg86fzri59f"; depends=[]; };
+  ghibli = derive2 { name="ghibli"; version="0.3.0"; sha256="1527225yp9czmq7y1r08jvzwhxdxi50n5szay92hl9ln829x9phh"; depends=[]; };
   ghyp = derive2 { name="ghyp"; version="1.5.7"; sha256="195hsskh2ykafqr93f675xqsmhbrki3abi61hk78bzy09n1d4jfk"; depends=[gplots numDeriv]; };
   gibble = derive2 { name="gibble"; version="0.2.0"; sha256="11fhswszdgackwkvals4k7pn8syfphkwvfx7kiv7psnsr94q376n"; depends=[dplyr rlang tibble]; };
   gibbs_met = derive2 { name="gibbs.met"; version="1.1-3"; sha256="1yb5n8rkphsnxqn8rv8i54pgycv9p7x1xhinx4l5wzrds3xhf2dc"; depends=[]; };
   gifski = derive2 { name="gifski"; version="0.8.6"; sha256="00w4bzp0rrp4isy1rnxs6g1q07r3wndadk3mqdrxk2wxi7jmghna"; depends=[]; };
   gifti = derive2 { name="gifti"; version="0.7.5"; sha256="1y64bc33b5f64a4khp916s9zb7kbb24xgdg3pdlh0f8m6zrbmp4a"; depends=[base64enc R_utils xml2]; };
   gim = derive2 { name="gim"; version="0.11.0"; sha256="1psmziq03k1nbdl64sy152ih4g625qkbp5l7msfibrcbpgz0hg7y"; depends=[numDeriv]; };
-  gimme = derive2 { name="gimme"; version="0.6-0"; sha256="04l1jywx5dpvj3vjq1aw53jqrb6yp34syqcd7i1xvmyih9h35wgr"; depends=[data_tree igraph imputeTS lavaan MIIVsem qgraph]; };
+  gimme = derive2 { name="gimme"; version="0.6-1"; sha256="1ipak83ma1fl24snsd7xlbbhgv67m03r3g8xh9rhvmr6ajag7ada"; depends=[data_tree igraph imputeTS lavaan MIIVsem qgraph]; };
   gimmeTools = derive2 { name="gimmeTools"; version="0.1"; sha256="1g170rz3c3qx27yy67f7xab4gkm0pbbvwlwkcsczfxphad609ryl"; depends=[easycsv magrittr miniUI rhandsontable rintrojs rstudioapi shiny shinyjs shinyWidgets]; };
   gimms = derive2 { name="gimms"; version="1.1.1"; sha256="06vq0apsadyfgnz7906v2kjy0nx3yn0agq4yschxz1r1zmgrnyki"; depends=[curl Kendall ncdf4 raster RCurl zyp]; };
   giphyr = derive2 { name="giphyr"; version="0.2.0"; sha256="0273f7lama8bhaalafs66m6ksp32vx0j6rmh1qr4484i7wkmdfqn"; depends=[dplyr httr miniUI purrr rstudioapi shiny tibble]; };
   gistr = derive2 { name="gistr"; version="0.4.2"; sha256="0bh325pf37v307isdlvdglripfki8xr6gh7n8mgi4cjparzhrh23"; depends=[assertthat dplyr httr jsonlite knitr magrittr rmarkdown]; };
   git2r = derive2 { name="git2r"; version="0.26.1"; sha256="0dbl845sahv2i641ncaf06w06djravwc5wknp9syzx0ad8l0kmhk"; depends=[]; };
   git2rdata = derive2 { name="git2rdata"; version="0.1"; sha256="1nq9pxvxk05xqsknwyfx30r7gzidl0whqiix56mbgy6zi3ma2pvj"; depends=[assertthat git2r yaml]; };
-  gitgadget = derive2 { name="gitgadget"; version="0.4.0"; sha256="0v6a205x493zycw4ky6ji8zd81jyw0ia47bxyklmiapxrzx8mpbd"; depends=[callr curl dplyr jsonlite markdown miniUI rstudioapi shiny shinyFiles usethis]; };
+  gitgadget = derive2 { name="gitgadget"; version="0.4.4"; sha256="03p9ci5lbgh7avn4w9wy50d61yc6m0n1d97vsk62lia1xrnyhvyv"; depends=[callr curl dplyr jsonlite markdown miniUI rstudioapi shiny shinyFiles usethis]; };
   githubinstall = derive2 { name="githubinstall"; version="0.2.2"; sha256="0hqh86r2007hzdbm8rr0fwqhhsna7ji8sdgmdnrxkxraa5f2pfz3"; depends=[curl data_table devtools httr jsonlite mockery]; };
   gitignore = derive2 { name="gitignore"; version="0.1.3"; sha256="0ckvl5i99k9sjvlk3cfjyclhmchrlqdz4379nmlckh4jpmnckzk0"; depends=[clipr clisymbols crayon curl glue here jsonlite purrr xfun]; };
   gitlabr = derive2 { name="gitlabr"; version="1.1.6"; sha256="1p68w0q8mjpz2hr6ys1qbfw1y4b35hgs27kzfkzv9hfi1vxqfd1h"; depends=[arpr base64enc dplyr httr magrittr purrr stringr tibble yaml]; };
@@ -8031,33 +8186,33 @@ in with self; {
   glancedata = derive2 { name="glancedata"; version="1.0.0"; sha256="0v72zpf6njg90dggdvw7sqvpcq26izdx334yid8cfk2hidmj5a2k"; depends=[dplyr forcats GGally ggplot2 gridExtra openxlsx purrr tibble tidyr]; };
   glarma = derive2 { name="glarma"; version="1.6-0"; sha256="0n0mv4xvh5q3y383cs224x6r608ciw4822pkanvmcjsc9zl0z1ar"; depends=[MASS]; };
   glassdoor = derive2 { name="glassdoor"; version="0.8.1"; sha256="0r85k1fyk8979ahfmd4vmzkhyvrlnpkgjwg1yi7092kpx8877lj0"; depends=[httr]; };
-  glasso = derive2 { name="glasso"; version="1.10"; sha256="0nshpx14v2yny7lr8ll6nnz71n0f02sddh2c2dglfprbk89p9yp6"; depends=[]; };
+  glasso = derive2 { name="glasso"; version="1.11"; sha256="02p3612rpydk195n2qr77lp1j2w8zsw1ckkk98c8angm4r5q8dsc"; depends=[]; };
   glassoFast = derive2 { name="glassoFast"; version="1.0"; sha256="1sgmh4l06q7mrmgnimphpqgix4k4jzaj2l30kpmnf92caa2v7ngw"; depends=[]; };
   glba = derive2 { name="glba"; version="0.2"; sha256="0ckcz6v6mfbv34s8sp086czhb5l58sky79k84332rrz6wj47p3md"; depends=[]; };
   glcm = derive2 { name="glcm"; version="1.6.4"; sha256="1al4i8r9g7izl5d4c3ccqx6zw9vfcvdr6zgzql8wjkq9fsdrrnq1"; depends=[Rcpp RcppArmadillo]; };
-  gld = derive2 { name="gld"; version="2.5"; sha256="00bqyr22llsnxm2pjj8bzf9h64gx1vlrzdgagfsskwixccbhhsax"; depends=[e1071 lmom]; };
+  gld = derive2 { name="gld"; version="2.6"; sha256="04apyfv5xxwwpfv3a7wmc5f0xgpp3im97zmwl8ppiwrzrcnk9lgr"; depends=[e1071 lmom]; };
   gldrm = derive2 { name="gldrm"; version="1.5"; sha256="1mbdxqjw6sa47kigwrjq1gn6vi36zhg9j2lck144iwa10ms0y9xp"; depends=[]; };
   glinternet = derive2 { name="glinternet"; version="1.0.10"; sha256="15dikazmhs7md7j8p45f67h3947br18hsrjl74cjk10vazd0ihng"; depends=[]; };
   gllm = derive2 { name="gllm"; version="0.37"; sha256="169y3yz947d8qdphqv2a6yrdash6v2h9jfvj2fk7rcpmz0r45kl6"; depends=[]; };
-  gllvm = derive2 { name="gllvm"; version="1.1.3"; sha256="06kz66bbc29a11xp09nza6gvpgbxih4bzps5n8228sgk561vvw3w"; depends=[fishMod MASS Matrix mgcv mvabund mvtnorm RcppEigen statmod TMB]; };
+  gllvm = derive2 { name="gllvm"; version="1.1.7"; sha256="1m5qm66ca96lfp6b3c0zls2l0yvifvmys729gbaahjp16jq320yc"; depends=[fishMod MASS Matrix mgcv mvabund mvtnorm RcppEigen statmod TMB]; };
   glm_deploy = derive2 { name="glm.deploy"; version="1.0.4"; sha256="1akklvbhz2pp0sv1hax1jq0s9ajbfv1597z643gh5l9hwizj2h9m"; depends=[Rcpp]; };
-  glm_predict = derive2 { name="glm.predict"; version="3.0-1"; sha256="0miba0xha99rmriqs7ifriq86ykn04j04f3ywk29bpph4iwc5faq"; depends=[MASS nnet]; };
+  glm_predict = derive2 { name="glm.predict"; version="3.1-0"; sha256="16ahl6jvydmx48hzixv8whsr55w527k0a1xbic20crinblx0ncb4"; depends=[MASS nnet]; };
   glm2 = derive2 { name="glm2"; version="1.2.1"; sha256="1byqlvpls23gzy7xlbs1kgfr4bsrmsrpc8rzzacf9czap1nlw39y"; depends=[]; };
   glmBfp = derive2 { name="glmBfp"; version="0.0-51"; sha256="15jm450j1f0nl7vqvpb2mwapdlvn7kq2kxf5s96x21siwsz7sssv"; depends=[coda Rcpp RcppArmadillo rms Runuran statmod survival]; };
   glmaag = derive2 { name="glmaag"; version="0.0.6"; sha256="1yk5bx1gyj97b5qjy30q1gsjlp9amklwf070i0129f8dj7vjyaf0"; depends=[data_table foreach ggplot2 gridExtra huge Matrix maxstat OptimalCutpoints plotROC pROC Rcpp RcppArmadillo shiny survival survminer]; };
   glmbb = derive2 { name="glmbb"; version="0.3"; sha256="12yabwswps0fmprh8nb9jdny9xrm13jvc0d9m3w04ppmsvalrmwl"; depends=[digest]; };
   glmc = derive2 { name="glmc"; version="0.3-1"; sha256="0x6jk2l5rpjkp5x815gpiwv8maa7mhmy6m8gaxbv1cbn3zyccynn"; depends=[emplik]; };
-  glmdisc = derive2 { name="glmdisc"; version="0.1"; sha256="1psmcgd5g6v3nq2npl3rvp2ag6g8nqcjgdkknv0b5qwkrpin8mpy"; depends=[caret gam MASS nnet Rcpp RcppEigen RcppNumerical]; };
+  glmdisc = derive2 { name="glmdisc"; version="0.2"; sha256="0f5bn307xvq1n9zvw6y8324v6i89vh2bam8z6s0q581xyzpbvmlg"; depends=[caret gam MASS nnet Rcpp RcppEigen RcppNumerical]; };
   glmdm = derive2 { name="glmdm"; version="2.60"; sha256="09vljki24fccqkvxkmg2i6a8pxqhfwm155b41m2q51lqaq29bfw7"; depends=[]; };
   glmertree = derive2 { name="glmertree"; version="0.1-2"; sha256="0p498kg873m7g90a05ki2zbki61f3ppnv874p79hlnm24hricasa"; depends=[Formula lme4 partykit]; };
   glmgraph = derive2 { name="glmgraph"; version="1.0.3"; sha256="16sq6i7kbw20nvwikpa02z3pb7wqw3270j6ss7f8sgf548skhmx0"; depends=[Rcpp RcppArmadillo]; };
   glmlep = derive2 { name="glmlep"; version="0.2"; sha256="0rq2vxbr732r725pn8qdvppxcrhjhyvlr550svfgy1inq985c1w4"; depends=[]; };
   glmm = derive2 { name="glmm"; version="1.3.0"; sha256="088m626c2f75ij457mskdyi927y6g01m5rgfsjaxpm7xbywk51sw"; depends=[doParallel foreach itertools Matrix mvtnorm trust]; };
-  glmmEP = derive2 { name="glmmEP"; version="1.0-1"; sha256="0w6q504map1frx7ch2gb7557xmc361lngsw2f80bnrlchj43rdgg"; depends=[lme4 matrixcalc]; };
+  glmmEP = derive2 { name="glmmEP"; version="1.0-2"; sha256="0j7i1pgykrxyb1z8c7pl1i2w02ypmn0r324p5wcqlxvas3w5bva5"; depends=[lme4 matrixcalc]; };
   glmmLasso = derive2 { name="glmmLasso"; version="1.5.1"; sha256="1az9vdnyqyrfn1q7zrn6x4ywx77b0vg65cni45x37b0ybkwpis39"; depends=[Matrix minqa]; };
   glmmML = derive2 { name="glmmML"; version="1.1.0"; sha256="121iclp86nfm9mybvfwascs937i0z2mbv982hn894q6g7jkqiw1l"; depends=[]; };
   glmmTMB = derive2 { name="glmmTMB"; version="0.2.3"; sha256="035hkywa37bz555fv6znxd4hfcs5w884365wfnwk4jx5vann4vvb"; depends=[lme4 Matrix nlme RcppEigen TMB]; };
-  glmmboot = derive2 { name="glmmboot"; version="0.3.0"; sha256="145sz9gs2rncc9bygzjh24drmg8qgi1b02vxld5apmp3kayw5dby"; depends=[]; };
+  glmmboot = derive2 { name="glmmboot"; version="0.4.0"; sha256="1n25175nxmgirs41nhavrjgfqnl74hn63nxi6rdjbk40ngj0aq78"; depends=[]; };
   glmmfields = derive2 { name="glmmfields"; version="0.1.3"; sha256="1sygppwm58hvwj95nlyz59cjlnkrq82kpws6izbivl7p6wb06lil"; depends=[assertthat BH broom cluster dplyr forcats ggplot2 loo mvtnorm nlme Rcpp RcppEigen reshape2 rstan rstantools StanHeaders]; };
   glmmsr = derive2 { name="glmmsr"; version="0.2.3"; sha256="1fbg5zji0xjr9q1yc6phsp37nsrj7nfs8yiri0j9s84wzgwjili1"; depends=[BH lme4 Matrix numDeriv R6 Rcpp RcppEigen]; };
   glmnet = derive2 { name="glmnet"; version="2.0-18"; sha256="0sr5akaiaab1sdh9c8gfmc4kp9b4vqhd90d9ig0rqpqhp3bykp78"; depends=[foreach Matrix]; };
@@ -8065,6 +8220,7 @@ in with self; {
   glmnetcr = derive2 { name="glmnetcr"; version="1.0.4"; sha256="1fizw48lwhdyzfdmhl1hhcv7pfjf2zm8b96m2hcwm1ckvshf5j76"; depends=[glmnet]; };
   glmpath = derive2 { name="glmpath"; version="0.98"; sha256="1jbiqqd1s93i941dhyyx50zlgwavhyjfw8bx13z4gz05rdvi4gn8"; depends=[survival]; };
   glmpathcr = derive2 { name="glmpathcr"; version="1.0.7"; sha256="18i0ivvxyirgbp5qjc2av1wanang9pbjimwva448ighad7m2dsqr"; depends=[glmpath]; };
+  glmpca = derive2 { name="glmpca"; version="0.1.0"; sha256="19fiivv72nnz4cax5nibcpzm47vma54h3myxcb9bhz3rm04b5srv"; depends=[]; };
   glmtlp = derive2 { name="glmtlp"; version="1.1"; sha256="01kyw0xipyr9z7x9z41wz7rqargzqd8s8ri34ffdvd3ggrdznl0p"; depends=[glmnet]; };
   glmulti = derive2 { name="glmulti"; version="1.0.7.1"; sha256="0ph47c3f1bqljmj2jdaaydqf0vhn5rld9257sn4x6jicy550l6r2"; depends=[rJava]; };
   glmvsd = derive2 { name="glmvsd"; version="1.4"; sha256="03axsn85axs4d6fdlr3wcdwq6qa4991svkqc7k9r52kk1ar0w5zz"; depends=[brglm glmnet MASS ncvreg]; };
@@ -8081,9 +8237,9 @@ in with self; {
   gluvarpro = derive2 { name="gluvarpro"; version="1.0"; sha256="0knqn4cz14j5hq2w2s71aj8girf68a7v10w5jy0r04zvl4xlr3y7"; depends=[ggplot2 pracma scales tidyr zoo]; };
   gmDatabase = derive2 { name="gmDatabase"; version="0.5.0"; sha256="0prap4a8pvylmvakd2ii87jz9bqf0vvfsxdi4iwa40nx444hqhx2"; depends=[DBI digest foreach RMySQL shiny]; };
   gma = derive2 { name="gma"; version="1.0"; sha256="08hxbs9z4vq5zjis0lgdcvlysaj1k7i0icdk3wsyqf3wd9znsibi"; depends=[car MASS nlme]; };
-  gmailr = derive2 { name="gmailr"; version="0.7.1"; sha256="1gniwwl0ci0wm7a3ai2lqrr590smmkdgyf3aarw6bdygn8hr3s3y"; depends=[base64enc crayon httr jsonlite magrittr mime]; };
+  gmailr = derive2 { name="gmailr"; version="1.0.0"; sha256="0wgh428qrwn6rxkcv9xmpya4ygrmc5pblxp0fw0ddgwbl99dhhi5"; depends=[base64enc crayon gargle httr jsonlite lifecycle magrittr mime rematch2]; };
   gmapsdistance = derive2 { name="gmapsdistance"; version="3.4"; sha256="1hazf6xb4ja6h2lrl63kbd78wzny9sljiid9rq1r3szn3l1mc7dn"; depends=[RCurl XML]; };
-  gmat = derive2 { name="gmat"; version="0.2.0"; sha256="1zrzxjgyw1izxcisvq1p2zpn2zs280ch4pm0g88g4413hb5kbsmr"; depends=[igraph]; };
+  gmat = derive2 { name="gmat"; version="0.2.1"; sha256="035x8b982qk3ik9qhxa9jhkczmafix6nbpbz0r5smby6q6bhj6jz"; depends=[gRbase igraph]; };
   gmediation = derive2 { name="gmediation"; version="0.1.1"; sha256="0md4h298vqw67qrjcaia6xz8s7akdpcmxa83irm12qgbh56a5rpr"; depends=[MASS plyr VGAM]; };
   gmeta = derive2 { name="gmeta"; version="2.3-0"; sha256="1izfz6gkisa8rskhfka6q73rcgzwdsmkdhy79jwcaqk25jrwfk60"; depends=[BiasedUrn binom]; };
   gmfd = derive2 { name="gmfd"; version="1.0.1"; sha256="03sag09x7pjyzsp6w1z06108ig068krmw75064cnl3pqfvfyjfgr"; depends=[]; };
@@ -8092,28 +8248,30 @@ in with self; {
   gmodels = derive2 { name="gmodels"; version="2.18.1"; sha256="0s8kd8krqk4kwv2zqxpsfy3w8qdwf5naf4b5l383vidq9sil0qb2"; depends=[gdata MASS]; };
   gmp = derive2 { name="gmp"; version="0.5-13.5"; sha256="042mzsl6z6s61fy5m21yf9q83l08vnyqljn4iax7kqyiycpsp0gn"; depends=[]; };
   gmt = derive2 { name="gmt"; version="2.0-1"; sha256="1g1sj9gq3h3s0pdcfvzg7iifkns5azn3pa83if0d3yzc28cjf0yz"; depends=[]; };
-  gmvarkit = derive2 { name="gmvarkit"; version="1.1.0"; sha256="1zzv050j1kxdz84dwrpvnnbxr5qxdgd3lvrdg8dy3a2kzclmywmh"; depends=[Brobdingnag mvnfast pbapply]; };
+  gmvarkit = derive2 { name="gmvarkit"; version="1.1.1"; sha256="193ka13ka3vczc0kaxxwp1j55yczclarsjdc7nqj3hbk6b7124ma"; depends=[Brobdingnag mvnfast pbapply]; };
   gnFit = derive2 { name="gnFit"; version="0.2.0"; sha256="0cji4zjslh18dfj0l827r6br4hx2f0akiaxrg7fhhyyyhgdcjnsm"; depends=[ismev rmutil]; };
   gnlm = derive2 { name="gnlm"; version="1.1.1"; sha256="1krbz791l5qc06sh6my0bkq420b5afncw87lhyx1yiml2yg46zrk"; depends=[rmutil]; };
   gnm = derive2 { name="gnm"; version="1.1-0"; sha256="01d7wxsh4d9w4jh8vn62sjzgpll650yl3klfhlaa8j0qwpxr2fml"; depends=[MASS Matrix nnet qvcalc relimp]; };
   gnmf = derive2 { name="gnmf"; version="0.7.1"; sha256="1vbcsxg61mlsdir8szd0rdxfswr7kr6a07750ar2l9b4rkg3yfqz"; depends=[]; };
+  gnn = derive2 { name="gnn"; version="0.0-1"; sha256="1wjir501l9cfkl9xrga06h3nwrz9lqsl9ypqxjj3iz6yi7jd12w1"; depends=[keras qrng tensorflow]; };
   gnorm = derive2 { name="gnorm"; version="1.0.0"; sha256="17h43qwb07wk5hiif89k6dgn6bbdsqfy2jy3k5blbdhhp3b9jcqp"; depends=[]; };
   gnumeric = derive2 { name="gnumeric"; version="0.7-8"; sha256="0iwl00mzsg8h8q67bjp6485idjlmj24362b1rbmkifckss8hrc98"; depends=[XML]; };
   goeveg = derive2 { name="goeveg"; version="0.4.2"; sha256="0k9pyph065x8wp452x8kz28ikhsbrm80ln4yssmcgqm7085dyyya"; depends=[cluster fields Hmisc mgcv vegan]; };
-  gof = derive2 { name="gof"; version="0.9.1"; sha256="1s12gga9d6yizn2y7lzql4jd80lp5jpyml8ybn7xqswp8am82vpg"; depends=[]; };
   gofCopula = derive2 { name="gofCopula"; version="0.2-4"; sha256="1v54vhjhavz74bmnppp2cda4qsd57s2vh2j2d3ilwzbycva7kmkl"; depends=[copula doParallel foreach MASS numDeriv R_utils SparseGrid VineCopula]; };
   gofMC = derive2 { name="gofMC"; version="1.1.2"; sha256="0hbqx0z2517qgmp6sjg76hv74yrkfbswb9rmfjmsmcyzj2x67w86"; depends=[ggplot2 scales]; };
   gofastr = derive2 { name="gofastr"; version="0.3.0"; sha256="02jn4xbbafl7siwvkqns1818wmw813x9cvqfcnpnmcippiqhrb0b"; depends=[data_table quanteda slam SnowballC tm]; };
+  goffda = derive2 { name="goffda"; version="0.0.5"; sha256="1766fzk32072pq2m12bq0kyh1n6a7ij2j2j76jmqp8l3zkj722ha"; depends=[fda_usc glmnet ks Rcpp RcppArmadillo]; };
   goft = derive2 { name="goft"; version="1.3.4"; sha256="15n1av7r6w8hihxlgw9pd570qgrlcprkkacln15chvjs3b0i60la"; depends=[fitdistrplus]; };
   goftest = derive2 { name="goftest"; version="1.1-1"; sha256="183imn6dy28ama8bywxgyh32vgakv7bsbz4k5qbhnlhqdvzv2v6v"; depends=[]; };
   goftte = derive2 { name="goftte"; version="1.0.5"; sha256="0mqibs8kpj8qq3wpnlpfdzxx33q77clwli1q7yaxllwzbq0b99hw"; depends=[survival]; };
   gogarch = derive2 { name="gogarch"; version="0.7-2"; sha256="03gpl73zc6kx4gni59xbg7b38dkpd7p4c7kvlqm46f58j257viik"; depends=[fastICA fGarch]; };
   goldi = derive2 { name="goldi"; version="1.0.1"; sha256="191ac02bwrxr3khq6qirhxzfhv7pqfhqyg7jb473p5vwygpvc53l"; depends=[dplyr futile_logger magrittr Rcpp RcppArmadillo SnowballC tm]; };
+  golem = derive2 { name="golem"; version="0.1"; sha256="06nn0a3l4zxjz732wsglyqjgz39frzn8dcr2k39h7b37vkwwkk2m"; depends=[attempt cli crayon desc dockerfiler DT glue htmltools pkgload processx remotes rlang roxygen2 rsconnect rstudioapi shiny stringr testthat usethis yesno]; };
   gomms = derive2 { name="gomms"; version="1.0"; sha256="1i9d5y28wrhal990x7xxy99v3z9y2pzlakj7wnynd3dpx5pqr0jj"; depends=[]; };
   goodpractice = derive2 { name="goodpractice"; version="1.0.2"; sha256="08rnm8z0pry5mwpc7p37r6f2rd56dry9djpcvvs9yl170w56psx0"; depends=[clisymbols covr crayon cyclocomp desc jsonlite lintr praise rcmdcheck rstudioapi whoami withr xml2 xmlparsedata]; };
-  googleAnalyticsR = derive2 { name="googleAnalyticsR"; version="0.6.0"; sha256="0amhhp7h7f6a2qmmbxjg5rqhj6jdvmjv9rsvcx83ql3b6vbaxrpz"; depends=[assertthat dplyr googleAuthR httr jsonlite magrittr memoise purrr rlang tidyr]; };
-  googleAuthR = derive2 { name="googleAuthR"; version="0.8.1"; sha256="0mgw9k6hmgd0yyan6d73kczya012caypy71ablhqdzvvykbsa8wi"; depends=[assertthat digest httr jsonlite memoise R6]; };
-  googleCloudStorageR = derive2 { name="googleCloudStorageR"; version="0.5.0"; sha256="1wkmg7jrvzb9a2avdmvw5h4nqnf0745hqvjkfn82inaf6pyzb3b4"; depends=[assertthat curl googleAuthR httr jsonlite openssl yaml zip]; };
+  googleAnalyticsR = derive2 { name="googleAnalyticsR"; version="0.7.0"; sha256="1rh5aywrfhr32hvwscn2vvwvamnn8cf9572009rzr6ni736v2a5h"; depends=[assertthat dplyr googleAuthR httr jsonlite magrittr memoise purrr rlang tibble tidyr]; };
+  googleAuthR = derive2 { name="googleAuthR"; version="1.1.1"; sha256="053s6n28cq35gn18ywipygw3bpwsi1qv6rr4vv2bi9q6sy6rb8q3"; depends=[assertthat digest gargle httr jsonlite memoise rlang]; };
+  googleCloudStorageR = derive2 { name="googleCloudStorageR"; version="0.5.1"; sha256="0sd6ca1ksv22avr5rcvkf5089f9igb8gqa83kidlc4xklaj6g92m"; depends=[assertthat curl googleAuthR httr jsonlite openssl yaml zip]; };
   googleCloudVisionR = derive2 { name="googleCloudVisionR"; version="0.1.0"; sha256="1n7lbqx7qiahmirydli9nvq4w4i26qnyk3s2kxy4aj413619ym67"; depends=[caTools data_table googleAuthR jsonlite purrr]; };
   googleComputeEngineR = derive2 { name="googleComputeEngineR"; version="0.3.0"; sha256="1s0qvnijzkja645lim373swk815n3s1292q6sk3q36ss70q42cfg"; depends=[assertthat future googleAuthR httr jsonlite]; };
   googleLanguageR = derive2 { name="googleLanguageR"; version="0.2.0"; sha256="1l0gnynild95k9fw1d398zd4dkws97p13vvfv6jaklqj0xmh9ib8"; depends=[assertthat base64enc googleAuthR jsonlite magrittr purrr tibble]; };
@@ -8121,9 +8279,10 @@ in with self; {
   googlePrintr = derive2 { name="googlePrintr"; version="0.0.1"; sha256="19rm78x8qd61ilc6h1kn3dw63m6dfsckqkd3n76krvi0akgl72w5"; depends=[googleAuthR httr jsonlite]; };
   googlePublicData = derive2 { name="googlePublicData"; version="0.16.1"; sha256="15hyslpqvncg21q581h061rfyg99y8lavqw1x8hzl7xzd49bn9r5"; depends=[readxl XML]; };
   googleVis = derive2 { name="googleVis"; version="0.6.4"; sha256="1f3yvcg8g78v8f49gc3q4pmpxqwdf10l2ixxx0bqqng5splz1jkx"; depends=[jsonlite]; };
-  googledrive = derive2 { name="googledrive"; version="0.1.3"; sha256="1vv5vk3z93w1pm3jylj94ivdis2vi9wk10gakww11snpi3x2by4h"; depends=[curl glue httr jsonlite purrr rlang tibble uuid]; };
+  googledrive = derive2 { name="googledrive"; version="1.0.0"; sha256="08hz215zhprwnzlcja8jrp29al1j4ind1zq7cch90xj02wlcz8nc"; depends=[curl gargle glue httr jsonlite magrittr purrr rlang tibble uuid]; };
   googleformr = derive2 { name="googleformr"; version="0.0.3"; sha256="0smykcjyqmk61ws5jk462l8x5hg0h9nwq55q5pqfgcq1j3yfniqh"; depends=[httr rvest xml2]; };
   googlenlp = derive2 { name="googlenlp"; version="0.2.0"; sha256="0d0g18i3im2s5f14k69ym3vwf9a7zkaval3nwrip97xcl6kf4x9h"; depends=[dplyr httr jsonlite purrr readr rlang]; };
+  googler = derive2 { name="googler"; version="0.0.1"; sha256="1aayji3ncqxl58k29d93dbx05s9rp9bc63fl2cpl1cys7gilblxx"; depends=[jsonlite tibble]; };
   googlesheets = derive2 { name="googlesheets"; version="0.3.0"; sha256="11q07nxys72wkxx9mawmjyf20gvwvrb7h3gpa73h6lgh2vgrwnv8"; depends=[cellranger dplyr httr jsonlite purrr readr stringr tibble tidyr xml2]; };
   googleway = derive2 { name="googleway"; version="2.7.1"; sha256="0axpr81p3gdp1nmfn000lk288sdn8z5qmzjvagdxqn5j44hq6sj1"; depends=[curl googlePolylines htmltools htmlwidgets jpeg jqr jsonlite magrittr scales shiny viridisLite]; };
   goric = derive2 { name="goric"; version="1.1-0"; sha256="1smjq9vljszgngs5i6x55jwg0imzc5gsfdqxzcs4541fp3pvk999"; depends=[MASS Matrix mvtnorm nlme quadprog]; };
@@ -8132,14 +8291,14 @@ in with self; {
   gpDDE = derive2 { name="gpDDE"; version="0.8.2"; sha256="100g2f8zlpbwxb46h62pgvidll8aflz1zl4inyh8dml6vhm9pilp"; depends=[CollocInfer deSolve fda forecast lars limSolve MASS nnls penalized trustOptim TSA]; };
   gpairs = derive2 { name="gpairs"; version="1.2"; sha256="09mkdbs9hklxnmqcsnf65s3dfsfcr7kppp6zxj08v5hxym1gpz3l"; depends=[barcode colorspace lattice MASS vcd]; };
   gpclib = derive2 { name="gpclib"; version="1.5-5"; sha256="08j81b8wymsgin20n54gvm6m54rmdic51p6qzs9cz4pmgl7dkkjv"; depends=[]; };
-  gpg = derive2 { name="gpg"; version="1.2"; sha256="1p7vylakck556162cjsj5b04x7xsg2fhf844hla4vfkgamcg529r"; depends=[askpass curl]; };
+  gpg = derive2 { name="gpg"; version="1.2.1"; sha256="0m6pn9ssjy74gg4nr7lg2csfkp5m9fwp3bk72vld5als2knzj90c"; depends=[askpass curl]; };
   gpk = derive2 { name="gpk"; version="1.0"; sha256="1zfhkqyypb24mhbj2zi9qy3gw0kqxvlp8j5ni3zm7k5rz1bnrygg"; depends=[]; };
   gplm = derive2 { name="gplm"; version="0.7-4"; sha256="0apvj14nl5qbi4dhhdx5nih5lvjwfcipvr8cyk6xsz4r5gfr2iw4"; depends=[AER]; };
   gplots = derive2 { name="gplots"; version="3.0.1.1"; sha256="033plcfs9w8pmn84n24mdhiixdirc2a7pz6dvm61fpd20gwh7cbx"; depends=[caTools gdata gtools KernSmooth]; };
   gpmap = derive2 { name="gpmap"; version="0.1.1"; sha256="00jhslbxbp6dgq7bw346hfpw0gans048vsn7chyzjhyr7ah5xrfg"; depends=[foreach ggplot2 isotone plyr]; };
   gppm = derive2 { name="gppm"; version="0.2.0"; sha256="1n9is3xj52lsck2fiy9j320p2ca6ib36s251i7g3iz99a77b0ahh"; depends=[ggplot2 ggthemes MASS mvtnorm Rcpp rstan]; };
   gpr = derive2 { name="gpr"; version="1.1"; sha256="03ywik11kc6cnaqrzzzi94jkrdbd378m3sf26f2vpb7d834nl728"; depends=[]; };
-  gprofiler2 = derive2 { name="gprofiler2"; version="0.1.5"; sha256="07w6bihz6rbd4ldgdyvx1xabvhhnif2wdc3251a7bpdm9381m0xa"; depends=[crosstalk dplyr ggplot2 gridExtra jsonlite plotly plyr RCurl tidyr viridisLite]; };
+  gprofiler2 = derive2 { name="gprofiler2"; version="0.1.6"; sha256="0dx3dcfjwkxncgd86as3xrw2a3q07bfahigsdyqi2rjrg3ydqbgz"; depends=[crosstalk dplyr ggplot2 gridExtra jsonlite plotly plyr RCurl tidyr viridisLite]; };
   gptk = derive2 { name="gptk"; version="1.08"; sha256="0fk6c8f8fni4y2n2cbfwywlfyz74xlb8lx25wajsxr2v4x74pa7l"; depends=[fields Matrix]; };
   gpuR = derive2 { name="gpuR"; version="2.0.3"; sha256="1afbnrnk0hrsd3qa7gh269wxn1maq7dpi6wpjhhbp2gwr6100vqy"; depends=[assertive BH Rcpp RcppEigen RViennaCL]; };
   gqlr = derive2 { name="gqlr"; version="0.0.1"; sha256="0qvyvy514ma5wi2qm6a8praqa7js9wl0hh0ack1hknw33g2gyqhy"; depends=[graphql jsonlite magrittr pryr R6]; };
@@ -8148,9 +8307,10 @@ in with self; {
   grImport2 = derive2 { name="grImport2"; version="0.1-5"; sha256="0dyb3nrrvxnkk9q5b136bdivcz1jj3ajx1kscm3k0kkpqjif0pls"; depends=[base64enc jpeg png XML]; };
   gradDescent = derive2 { name="gradDescent"; version="3.0"; sha256="1jxgvnjw9qk5bkb0fw4kyks4vb9d1933jn79ry0w6956mq2xbb79"; depends=[]; };
   grade = derive2 { name="grade"; version="0.2-1"; sha256="085hfvqn880yk19axdjv3z9jr33kls212vs172a8mzhnkallph1r"; depends=[]; };
-  gradeR = derive2 { name="gradeR"; version="1.0.1"; sha256="15vjzc3y8gs433y47kp5cyrqrn3wphj1xb4q4wryn2bbhgf2m13y"; depends=[testthat]; };
+  gradeR = derive2 { name="gradeR"; version="1.0.3"; sha256="1hk2kjrd5r3gsfkv83x86727rdzzqn0h4cy81falnz8lakkwcgml"; depends=[testthat]; };
   gradientPickerD3 = derive2 { name="gradientPickerD3"; version="0.1.0.0"; sha256="0b20iqfipr7migwk1fl4lvdf4ghprqivcgmchfshhr8q82hyd1q0"; depends=[htmlwidgets jsonlite shiny]; };
   grainchanger = derive2 { name="grainchanger"; version="0.2.0"; sha256="00gxzzl47kpghwzz22z5b1m1gcpsfg5pay3hcdwdqr00mz2albg2"; depends=[checkmate furrr raster sf usethis]; };
+  grainscape = derive2 { name="grainscape"; version="0.4.0"; sha256="1i5bc1a0rh2grvd4xls2iz428jxspjrk038hm37cn2n0h88yx1xl"; depends=[ggplot2 igraph raster Rcpp rgdal sp]; };
   gramEvol = derive2 { name="gramEvol"; version="2.1-3"; sha256="0z2511zhs2gcdkwp29n6fpafhn49h69yi56nmrhh9zc8jqj1rwpa"; depends=[]; };
   grangers = derive2 { name="grangers"; version="0.1.0"; sha256="15q8hv7p5g5m7v6lx6nq5394fa6p05xgawnsrn1v5aslmmbbzyvl"; depends=[tseries vars]; };
   granova = derive2 { name="granova"; version="2.1"; sha256="161fznqlnwmw53abmg2n62lhxxda7400ljnadvcdvsm8f6kcjf80"; depends=[car]; };
@@ -8163,7 +8323,7 @@ in with self; {
   graphicalVAR = derive2 { name="graphicalVAR"; version="0.2.2"; sha256="1jzhqbdylpzc8d28vz2k34i9dpxx5x34bgvx73z8wjglnn6j27b8"; depends=[dplyr glasso glmnet igraph Matrix mvtnorm qgraph Rcpp RcppArmadillo]; };
   graphicsQC = derive2 { name="graphicsQC"; version="1.0-8"; sha256="12vg93xfmkv73i19vkb10q2qngmsxd3y42z3l6izdywbdc3cdfkg"; depends=[XML]; };
   graphkernels = derive2 { name="graphkernels"; version="1.6"; sha256="1gn3ihqz7m0rdvvc2fp7hsgq583wh5cnz7200a2ff89xc04zs3dc"; depends=[igraph Rcpp RcppEigen]; };
-  graphlayouts = derive2 { name="graphlayouts"; version="0.2.0"; sha256="009hy3byr5giysmylkjrkskzhb40zcmpw445a5yqyifjqpfvfm8g"; depends=[gbp igraph oaqc Rcpp scales]; };
+  graphlayouts = derive2 { name="graphlayouts"; version="0.5.0"; sha256="03dizbhhdhnzbj2i5zvqgs617kwcv4h2pha4f16adic0fph1rxl3"; depends=[igraph Rcpp RcppArmadillo]; };
   graphon = derive2 { name="graphon"; version="0.3.2"; sha256="0bh542ffxklydb826srnacmw3cncd8cxnkj76r40mbkaxq7vxxlp"; depends=[Rdpack ROptSpace]; };
   graphql = derive2 { name="graphql"; version="1.5"; sha256="0zi1l93yk5rlgdy4j2nph14w0h8kgvnbzk9fi2jfys8s3fz54ksr"; depends=[jsonlite Rcpp]; };
   graphscan = derive2 { name="graphscan"; version="1.1.1"; sha256="1dgjb0grdymhimdgwnddjcivgy2i9r1i1nni4v9mx0447skcahk9"; depends=[ape rgl snowfall sp]; };
@@ -8176,11 +8336,12 @@ in with self; {
   gremlin = derive2 { name="gremlin"; version="0.1.0.1"; sha256="1qsjj910lmwdnmbn0fxakw713sk7myavgrmp5xm86my7cm866hmb"; depends=[Matrix]; };
   gren = derive2 { name="gren"; version="0.0.1"; sha256="1wb5wwdjxi7q36md7xzmbw5lrggcgghkz3pmxipjpxw8kfv804xp"; depends=[glmnet Iso pROC Rcpp RcppArmadillo]; };
   greport = derive2 { name="greport"; version="0.7-1"; sha256="1h1g3khb30n3y8l1sxpas2s6s667az4yxvsq42x5dfx8fic42p6n"; depends=[data_table Formula ggplot2 Hmisc lattice latticeExtra rms survival]; };
-  greta = derive2 { name="greta"; version="0.3.0"; sha256="03yjf8cs4z2y1pjl7qvv2icp16f5xykd725mf1vs4zk04asq4xna"; depends=[coda future progress R6 reticulate tensorflow]; };
+  greta = derive2 { name="greta"; version="0.3.1"; sha256="0wy1619drj8ir6r44xcliiirgibksd80gmjx21am2h580k0x0xq2"; depends=[coda future progress R6 reticulate tensorflow]; };
+  gretel = derive2 { name="gretel"; version="0.0.1"; sha256="1yyj4aing56f2vy0gshxwb623g9idg8k4701v3s53lqn4m2ybazk"; depends=[Rcpp ResistorArray]; };
   grex = derive2 { name="grex"; version="1.9"; sha256="0s6nan76rrmh3yhgvzb7pqdrzx2w9px8ay4v9yiib4bamy9wmhpb"; depends=[]; };
-  greybox = derive2 { name="greybox"; version="0.5.3"; sha256="0q57vyl5cz3xyl4ybij85nvnqqnmnfh7r4gw6gr9q1ynjsxam25h"; depends=[forecast lamW nloptr numDeriv Rcpp]; };
+  greybox = derive2 { name="greybox"; version="0.5.5"; sha256="0kqi02jb7wvmgi4k98iz0bygy47hislkmm03vdwj3m2gh10fbcpz"; depends=[forecast lamW nloptr numDeriv Rcpp]; };
   greyzoneSurv = derive2 { name="greyzoneSurv"; version="1.0"; sha256="115i0d4fy4p4g4vd419hj9f23hi8cbiyfilgpgmag91ilr1xpcdp"; depends=[Hmisc survAUC survival]; };
-  grf = derive2 { name="grf"; version="0.10.3"; sha256="10fp79w533b6ffrdy9ch94xq1xqzmlz8dsly5h3rznhcbidk8s46"; depends=[DiceKriging lmtest Matrix Rcpp RcppEigen sandwich]; };
+  grf = derive2 { name="grf"; version="0.10.4"; sha256="1nlrmvx1awd0zhbanw8p86xsdawza807hxiqxsdh3ydspcwh43x3"; depends=[DiceKriging lmtest Matrix Rcpp RcppEigen sandwich]; };
   gridBase = derive2 { name="gridBase"; version="0.4-7"; sha256="09jzw4rzwf2y5lcz7b16mb68pn0fqigv34ff7lr6w3yi9k91i1xy"; depends=[]; };
   gridBezier = derive2 { name="gridBezier"; version="1.1-1"; sha256="1n5d6svxblcxpzf79px0qjxsydpwjpnfcagnwk35ljinyd0wv68z"; depends=[]; };
   gridDebug = derive2 { name="gridDebug"; version="0.5-0"; sha256="12zrl7p8p7071w5viymdipycja7a2arvy0aahgahd5nlx1k1gha0"; depends=[graph gridGraphviz gridSVG]; };
@@ -8191,16 +8352,16 @@ in with self; {
   gridSVG = derive2 { name="gridSVG"; version="1.7-0"; sha256="0wdjj6jyk1zflglhimjzhws51ifwz3yb044j5nfsynn6kjdgfn32"; depends=[jsonlite XML]; };
   gridsample = derive2 { name="gridsample"; version="0.2.1"; sha256="062aryy26x07m31r6m0fj1zgnjhivlh1fikx9lv2rdgk0rh4yzz0"; depends=[data_table geosphere maptools raster rgdal rgeos sp spatstat spatstat_utils]; };
   gridsampler = derive2 { name="gridsampler"; version="0.6"; sha256="0wqpqg9c372sv8zqks6v93gawiyfghw58hn7m8q45dxpqm16ss3k"; depends=[BiasedUrn ggplot2 plyr reshape2 shiny shinyBS shinythemes]; };
-  gripp = derive2 { name="gripp"; version="0.2.19"; sha256="096mz1czp2mx4ny5q4frbqnx99ymw39p7lp5qfna7ydnwiiajkd2"; depends=[GA GenSA usethis]; };
+  gripp = derive2 { name="gripp"; version="0.2.20"; sha256="0rshipm8rdynl19a4dsvvvlhkd0n4vjfkidwnv5iilc5ini7c4qr"; depends=[GA GenSA usethis]; };
   grnn = derive2 { name="grnn"; version="0.1.0"; sha256="1dxcmar42g9hz4zlyszlmmnnsnja0gxfggav5jxv0gkp32rkd0wh"; depends=[]; };
   groc = derive2 { name="groc"; version="1.0.6"; sha256="0x7rrf5bw05s257xhzklpc6hslpjnzjx02hlrz4r9zixbfffmawc"; depends=[MASS mgcv pls robust robustbase rrcov]; };
   gromovlab = derive2 { name="gromovlab"; version="0.7-6"; sha256="02s7x23610dbpmrqh7pimspa10v3fnmj48fwmh0a6igd74rmj2mg"; depends=[ape cluster glpkAPI igraph quadprog]; };
   groupICA = derive2 { name="groupICA"; version="0.1.1"; sha256="1wl828ligvvw55xic383gdn7aq4mbwsnkl4ym6f71jn5g3p36d0i"; depends=[MASS]; };
   groupRemMap = derive2 { name="groupRemMap"; version="0.1-0"; sha256="1bfp746j0dx7kk44nyjqmimvgw14par9ayvqxnzldc05qsazjdwx"; depends=[]; };
-  groupdata2 = derive2 { name="groupdata2"; version="1.1.1"; sha256="1hnr5gd9gqh8wf1vign6wa95n4jw2xn0vmwlxdgczy7b77xqbs24"; depends=[dplyr numbers plyr rlang tibble]; };
+  groupdata2 = derive2 { name="groupdata2"; version="1.1.2"; sha256="0v206sq4h50v1scb2i8qwwi3kxiqamxwrnn1gblwk9i3xkmqs48y"; depends=[dplyr numbers plyr rlang tibble]; };
   grouped = derive2 { name="grouped"; version="0.6-0"; sha256="1glxgacpwk7yjbkwg5ci6bmb2il6hf5zhydwi5bbq6hc032m9976"; depends=[MASS]; };
   groupedSurv = derive2 { name="groupedSurv"; version="1.0.3"; sha256="15ah8v1mfyq9xi27kkl0vwwbhf16vd4hy9h809jlw1i7b1zwg4pm"; depends=[BH doParallel doRNG foreach qvalue Rcpp RcppEigen]; };
-  groupedstats = derive2 { name="groupedstats"; version="0.0.7"; sha256="087y0pb3hsk4djhf2pcfkflgia3pngjx1c6i9d79dm5wcrhhk4q4"; depends=[broomExtra crayon dplyr glue lme4 magrittr purrr rlang robust rstudioapi sjstats skimr tibble tidyr]; };
+  groupedstats = derive2 { name="groupedstats"; version="0.0.9"; sha256="0x2dz25prk21vm0a8z1jvjqy19ncv6q6rkwd6akxv68p120pyj21"; depends=[broomExtra crayon dplyr glue lme4 magrittr purrr rlang robust rstudioapi sjstats skimr tibble tidyr]; };
   groupsubsetselection = derive2 { name="groupsubsetselection"; version="1.0.3"; sha256="118cj5xc8nbq4fs2gbzg1nhynixaflbl0si77gyy4ybw0drsz4nj"; depends=[]; };
   grove = derive2 { name="grove"; version="1.1"; sha256="0fqsj5dx7py7cin3hvfkxglh8v3x0dwj6cxy4h5vbddjl687db5x"; depends=[Rcpp RcppArmadillo wavethresh]; };
   growfunctions = derive2 { name="growfunctions"; version="0.14"; sha256="1pvyiw20fxm3l4giyq4iizc67yy36i6wq4ch2qyqg4mfd4bki2g4"; depends=[ggplot2 mvtnorm Rcpp RcppArmadillo reshape2 spam]; };
@@ -8235,7 +8396,7 @@ in with self; {
   gss = derive2 { name="gss"; version="2.1-10"; sha256="1qhywsn9244fc7ir705xc8s832ygd7w0j72k3d58bdx9wv57xi16"; depends=[]; };
   gsscopu = derive2 { name="gsscopu"; version="0.9-3"; sha256="0bvhhs5wn4y1dcff2g87f80jdn3i4mdbvdbydsbx80ng38rfxhhg"; depends=[gss]; };
   gstar = derive2 { name="gstar"; version="0.1.0"; sha256="1582f7jcphb32j3wdc345qa5sgm2xyimlc6r5r5jay7ca5ll8c98"; depends=[dplyr ggplot2 reshape2 xts zoo]; };
-  gstat = derive2 { name="gstat"; version="2.0-2"; sha256="0rhc1i385273vsj9wbv2hjhf991lpszy8hpwnij8jmmji2p3cy92"; depends=[FNN lattice sp spacetime zoo]; };
+  gstat = derive2 { name="gstat"; version="2.0-3"; sha256="1qfcg8zb3hlpcb6x6z2hdn08g0d9z7fkn9yyi1c1l8l9pzk3za90"; depends=[FNN lattice sp spacetime zoo]; };
   gsubfn = derive2 { name="gsubfn"; version="0.7"; sha256="00j6b8b6xsx6v370h220x233rpk6asca78165y3d48jpwvwisdc9"; depends=[proto]; };
   gsw = derive2 { name="gsw"; version="1.0-5"; sha256="0lv4x4is53xybgg205dncizpnqnakqk47b5wgys2kr4ixqc8jipb"; depends=[testthat]; };
   gsynth = derive2 { name="gsynth"; version="1.0.9"; sha256="1m9s3gymm0z6frfzmz7kv8cbdnla2vp4aam5b2zzcxwflzwbplm3"; depends=[abind doParallel foreach GGally ggplot2 MASS mvtnorm Rcpp RcppArmadillo]; };
@@ -8248,8 +8409,8 @@ in with self; {
   gtheory = derive2 { name="gtheory"; version="0.1.2"; sha256="1xc1jl69z5csalqk3hx83s53awcl1fjq6p0x2pczhs7dsvwd6lks"; depends=[lme4]; };
   gtools = derive2 { name="gtools"; version="3.8.1"; sha256="0f5syk1qq6cjq6hwymvkiyhzwa389z94722v881ipbfqkd2q8505"; depends=[]; };
   gtop = derive2 { name="gtop"; version="0.2.0"; sha256="1nvvbf181x0miw3q0r2g0nklz29ljdsd07cazaajfls7pmhi0xw9"; depends=[hts lassoshooting quadprog]; };
-  gtrendsR = derive2 { name="gtrendsR"; version="1.4.3"; sha256="0zblbap8x477nw9prxhb93f068wq89g9bk3r7qdxi0ns0mv6fr3d"; depends=[anytime curl ggplot2 jsonlite]; };
-  gtsummary = derive2 { name="gtsummary"; version="0.1.0"; sha256="1jv22v4pc7nvj23qx7pl7yvjjiwhvcds4v9hhja3xyigcq8lrfdk"; depends=[broom broom_mixed car dplyr glue knitr magrittr MASS purrr rlang stringr tibble tidyr]; };
+  gtrendsR = derive2 { name="gtrendsR"; version="1.4.4"; sha256="0b05m5jbgbhdjmwp89zaa276z1h2qib2h30msg69lhwbdcsva96q"; depends=[anytime curl ggplot2 jsonlite]; };
+  gtsummary = derive2 { name="gtsummary"; version="1.2.1"; sha256="1ckcnng2768j0kmibgcdl34h7ss7ydycxlc6b3dvpvrq01wqahnk"; depends=[broom broom_mixed crayon dplyr glue knitr magrittr purrr rlang stringr survival tibble tidyr tidyselect]; };
   gtx = derive2 { name="gtx"; version="0.0.8"; sha256="0x71jji2yldi9wpx8d3nldbjfj4930j7zcasayzbylf9094gmg26"; depends=[survival]; };
   guardianapi = derive2 { name="guardianapi"; version="0.1.1"; sha256="17xmmr6pfzhdnmf45jzvk84gbfnmlw1qfv1gqjaw85vgm8b6jn6l"; depends=[dplyr httr jsonlite rlang tibble]; };
   guess = derive2 { name="guess"; version="0.1"; sha256="198pxi0yipgm9wccpj3y4a0gkibhyxcmb7v5dz7ipzrk44ha5g6j"; depends=[Rsolnp]; };
@@ -8257,7 +8418,7 @@ in with self; {
   gunit = derive2 { name="gunit"; version="1.0.0"; sha256="0vmm47f21n9f334aj38gzrmv1c4sp76njk95ld9gv6fcfxgsipyh"; depends=[magrittr stringr tibble units]; };
   gunsales = derive2 { name="gunsales"; version="0.1.2"; sha256="02vz16lhym72vvf48yai1g371wygdlmi63a6ylc147l0b69jgw31"; depends=[data_table dplyr ggplot2 seasonal x13binary zoo]; };
   gustave = derive2 { name="gustave"; version="0.4.0"; sha256="1swnkb1134mnlnfpdchyhmrhr0r5nw90yczsg52hwbhj8hjl2axp"; depends=[Matrix]; };
-  gutenbergr = derive2 { name="gutenbergr"; version="0.1.4"; sha256="1xf9h0ikfzgq6bzzxa7wih29cgbfk6lgdv041fprxbd9rz38agi9"; depends=[dplyr lazyeval purrr readr stringr urltools]; };
+  gutenbergr = derive2 { name="gutenbergr"; version="0.1.5"; sha256="1c6n2vj38srqmlcl0d2yp749rhn9n5mmz31x98fij4x55km53sci"; depends=[dplyr lazyeval purrr readr stringr urltools]; };
   gvc = derive2 { name="gvc"; version="0.5.2"; sha256="0cfvli6ap5kw3agv94d7g7rhmlxd66yyngc7c9pl4fsxf7sm6nx4"; depends=[decompr diagonals]; };
   gvcR = derive2 { name="gvcR"; version="0.1.0"; sha256="0r54924b9a65k11p8y3p7jxbvmpb7s7vs87v65hhl98gxacj5hk8"; depends=[dplyr eda4treeR lme4 magrittr]; };
   gvcm_cat = derive2 { name="gvcm.cat"; version="1.9"; sha256="1kwfcmnl1ivv1lh3zxccwls2xfyx3l8v71ngc0bg6441i81d4xp5"; depends=[MASS Matrix mgcv]; };
@@ -8273,20 +8434,21 @@ in with self; {
   h2o = derive2 { name="h2o"; version="3.26.0.2"; sha256="1ldjk1gm6jb5zvk2rmlfah4zm827dpmj4c5q83ysd4arwqqz5gna"; depends=[jsonlite RCurl]; };
   h2o4gpu = derive2 { name="h2o4gpu"; version="0.2.0"; sha256="06d2rrr27xvnsai6zjiaiw0jjfzdza1cc39c03d6pjkvnh0mqh2c"; depends=[magrittr reticulate]; };
   h5 = derive2 { name="h5"; version="0.9.9"; sha256="14p7i1sj24ky87kd7qr3n9fc9l64s0bp0rwbyl6i2x69xn75gpsx"; depends=[Rcpp]; };
-  hBayesDM = derive2 { name="hBayesDM"; version="0.7.2"; sha256="0k1gcnjmblk8ign6fzv7cl9qv964mi6jaams5z22x82jnw1sx47c"; depends=[BH data_table ggplot2 loo Rcpp RcppEigen rstan StanHeaders]; };
+  hBayesDM = derive2 { name="hBayesDM"; version="1.0.1"; sha256="0f1w21xgbkdmk72zlfb2vyv53fv4zsdnkqr9sj0cmj83rkh5nhcq"; depends=[BH data_table ggplot2 loo Rcpp RcppEigen rstan StanHeaders]; };
   hIRT = derive2 { name="hIRT"; version="0.2.0"; sha256="1vgmr36dbcn2ah9pzhc46zh1va7y7w3zr4mpmyf626m1bq0alb39"; depends=[pryr rms]; };
   hNMF = derive2 { name="hNMF"; version="0.9"; sha256="0qavavgiqah4dv0gz8v5ssz637sd341n9s0pyc232n2jhqpzl0cz"; depends=[MASS NMF nnls oro_nifti R_matlab rasterImage spatialfil]; };
   hR = derive2 { name="hR"; version="0.2.0"; sha256="1rh411g6as52l9y54y922fdmrisx7j98835n80y1czymk7ba2whh"; depends=[data_table data_tree knitr rhandsontable shiny]; };
   hSDM = derive2 { name="hSDM"; version="1.4.1"; sha256="1jwqjzr0zpckzh2jpqh17v6ypq4mzn5khlv6p37y59zz8bh9mvxp"; depends=[coda]; };
   haarfisz = derive2 { name="haarfisz"; version="4.5"; sha256="1qmh4glwzqwqx3pvxc71rlcimp1l0plgdf380v9hk0b4gj7g3pkf"; depends=[wavethresh]; };
   hablar = derive2 { name="hablar"; version="0.2.0"; sha256="0242gqcjh04kgv1zf9idm4v2vrxm1vm8nvwhcl3mf08w9a8la2aw"; depends=[dplyr]; };
-  hagis = derive2 { name="hagis"; version="2.0.0"; sha256="17dvyqn5qsy84wdwx4yzmgls6aah6x8026w7fk2yxypn17yqch8i"; depends=[data_table ggplot2 pander vegan]; };
+  hagis = derive2 { name="hagis"; version="3.0.0"; sha256="0kryzv26f79wsg68nhh4y1yqp6958gmrg5cqdxmy7gps3w3vq12d"; depends=[data_table ggplot2 pander]; };
   hail = derive2 { name="hail"; version="0.1.1"; sha256="1nrc9msqyy5iq2i6p8875anbqswxl2z6vdd4hvihnl22qh5fnbvh"; depends=[]; };
   halfcircle = derive2 { name="halfcircle"; version="0.1.0"; sha256="1gbqbv3cn8w09i3f2ji3qq0snb4fy9243y12agw686fx46dfmhxs"; depends=[scales]; };
   hamlet = derive2 { name="hamlet"; version="0.9.6"; sha256="076fh28grlrv38qywshi79m84jsz1ck9k4n0rg4svvr3gqkdbcn2"; depends=[]; };
-  handlr = derive2 { name="handlr"; version="0.1.0"; sha256="10mcal9chrhbk4bw23lkl20smmbjqrib07pfl5wf2fh93a3grfga"; depends=[crul jsonlite mime RefManageR urltools xml2]; };
+  handlr = derive2 { name="handlr"; version="0.2.0"; sha256="1p14q9swvy8yvd52wcms777vfcb9vandi0pd4cmqmyz1hpsi31d8"; depends=[crul jsonlite mime RefManageR urltools xml2]; };
   handyplots = derive2 { name="handyplots"; version="1.1.3"; sha256="0pcl0iichdw2lkv8y00mv6n6c0rvrnsk75ka5lwm2g7b64pphsvk"; depends=[]; };
-  hansard = derive2 { name="hansard"; version="0.7.0"; sha256="0xbidxixbygwl7kpvcjv95cv9nwp6sghna47f393x9vhmwmrk54q"; depends=[dplyr jsonlite lubridate snakecase tibble tidyr]; };
+  hans = derive2 { name="hans"; version="0.1"; sha256="0hh2nlzxs2kj93yb7yfm873m6nymjw5qmkin3qqn3acza6dr0k6q"; depends=[Rcpp]; };
+  hansard = derive2 { name="hansard"; version="0.7.1"; sha256="10xx8dfgpgggyv9h0ywvzqh4v620ln8whjlm6flcz1fy8ipf4274"; depends=[dplyr jsonlite lubridate snakecase tibble tidyr]; };
   hapassoc = derive2 { name="hapassoc"; version="1.2-8"; sha256="0qs5jl0snzfchgpp6pabncwywxcmi743g91jvjiyyzw0lw85yv4s"; depends=[]; };
   haplo_stats = derive2 { name="haplo.stats"; version="1.7.9"; sha256="19kxascqq5qz0zdxx0w837ji207y1z2ggxkl4vmlbay03k2dw2mx"; depends=[rms]; };
   haploR = derive2 { name="haploR"; version="3.0.1"; sha256="162wqjpmgapy54n8msrw5apgzj586ps0kkc5wmbqay3l94xgnvzk"; depends=[DT httr plyr RCurl RUnit tibble XML]; };
@@ -8296,7 +8458,7 @@ in with self; {
   happybiRthday = derive2 { name="happybiRthday"; version="0.0.1"; sha256="0rrvi5kx09p74xwxvqcwibbh4qjlk4jxb89grx74chjxk9ak2yv8"; depends=[data_table dplyr gh lubridate tidyr]; };
   happytime = derive2 { name="happytime"; version="0.1.0"; sha256="03iblwb6w2dh9sibfi4nlswidck13hzsn7123838zp4sxfnrp041"; depends=[]; };
   hapsim = derive2 { name="hapsim"; version="0.31"; sha256="0jw6iw89d4y8wjy58biv40szp123ql7frz1mmdjdxljmwaby963h"; depends=[MASS]; };
-  harmonicmeanp = derive2 { name="harmonicmeanp"; version="2.0"; sha256="08f3p2ig3lm1n70qr05chldp04ycv420fa8hvd4nmadas12gfb5m"; depends=[FMStable]; };
+  harmonicmeanp = derive2 { name="harmonicmeanp"; version="3.0"; sha256="17irfw8788yhh36698p9w8wab6wcin1yzfinlbs3gdg70d42zcnd"; depends=[FMStable]; };
   harrietr = derive2 { name="harrietr"; version="0.2.3"; sha256="0n6vsqysj4ijh06z6nqmj8x1z4w9711dxhbfp8p8fwi0l75pj0cj"; depends=[ape dplyr ggtree lazyeval magrittr rlang tidyr]; };
   harrypotter = derive2 { name="harrypotter"; version="2.1.0"; sha256="151kpg47b1hyv6rc3cksykqw8pz0xqm0q9xf9sxa2w14ibymvc8k"; depends=[ggplot2 gridExtra]; };
   hash = derive2 { name="hash"; version="2.2.6.1"; sha256="0b3fl0rvgwb992knl81vm99lsldg5clvaqjh6mamm6zqmb6dz056"; depends=[]; };
@@ -8316,14 +8478,16 @@ in with self; {
   hcandersenr = derive2 { name="hcandersenr"; version="0.2.0"; sha256="0r8z8kb9hwvgcsxbd7arbmqclhwlbcjpnf3p9mp5vgyxm84iz515"; depends=[]; };
   hcc = derive2 { name="hcc"; version="0.54"; sha256="14b3pamkywb0wsjpbm0wpflcds0b5mfymvgk92rmf6ngz1bkpdbq"; depends=[]; };
   hcci = derive2 { name="hcci"; version="1.0.0"; sha256="11piy1ajg3j3dbh66szzf7lhc3x28fz75ai39vlx0gl5nc2v5zs5"; depends=[]; };
+  hchinamap = derive2 { name="hchinamap"; version="0.1.0"; sha256="1pia593g50zf3286f9g51slkvrpj1iy7lws9d7a3nqgb2v3yji1y"; depends=[htmlwidgets]; };
   hcp = derive2 { name="hcp"; version="0.1"; sha256="0hhcy70g13kclxv733kgiys7qn5bi28abpkli5n2vj0a58ac333m"; depends=[]; };
   hctrial = derive2 { name="hctrial"; version="0.1.0"; sha256="19li8i8hx0r3b63q80cnj6pr72rdbmykxq0kcfbn4azq3sdd046y"; depends=[clinfun GenBinomApps]; };
   hda = derive2 { name="hda"; version="0.2-14"; sha256="0azfxyws7yslcqplfddmdp5ngk91j5h7llvrg77yh5z0kkd09j1b"; depends=[e1071]; };
   hdbinseg = derive2 { name="hdbinseg"; version="1.0.1"; sha256="0fy9cqrygsnxkb3nxg56md19svrvkbijpxkqfk9p18cj5ibwrq94"; depends=[doParallel foreach iterators Rcpp RcppArmadillo]; };
+  hdbm = derive2 { name="hdbm"; version="0.9.0"; sha256="0lvaica195chl6bb10wvvr7fbmh8b954fpxcm9r0gyp0d0i2a2w4"; depends=[Rcpp RcppArmadillo]; };
   hddplot = derive2 { name="hddplot"; version="0.59"; sha256="18llkpawm12cjxlcrlra60m16virfpjqiaqkvy9mb3wq1zif61rh"; depends=[MASS multtest]; };
   hddtools = derive2 { name="hddtools"; version="0.8.2"; sha256="02gbqlzwxc77gllgz9sf2s73y4ngyb4warabdfyj2sm2g7jl6y12"; depends=[gdata Hmisc raster RCurl rgdal rnrfa sp stringr tibble XML zoo]; };
   hdf5r = derive2 { name="hdf5r"; version="1.2.0"; sha256="10gynjwaaxks8y9c2fl8k040j0nbwn372nil70009yfk9wrkx0aq"; depends=[bit64 R6]; };
-  hdfqlr = derive2 { name="hdfqlr"; version="0.6-0"; sha256="0hvg23fcx5basy8fnqbnrrkqaddmj0lkqldqgxkj5gdnwshrhkl3"; depends=[]; };
+  hdfqlr = derive2 { name="hdfqlr"; version="0.6-1"; sha256="1z8sylaaki8ab9k7m4hp3530rnkxjh39zvw4n962fw5fb9a11dx3"; depends=[]; };
   hdi = derive2 { name="hdi"; version="0.1-7"; sha256="1q58bvlqh59hv3vb3dw92r0w1nwyifnqm5ccss54fzmf2gjsj1cj"; depends=[glmnet linprog MASS scalreg]; };
   hdlm = derive2 { name="hdlm"; version="1.3.1"; sha256="1zl6bksw0apkmn5shf8qjpxjyx6vb40dc4m4db76hhn5nhcp10ic"; depends=[foreach glmnet iterators MASS Matrix]; };
   hdm = derive2 { name="hdm"; version="0.3.1"; sha256="1kibfc1fc94y1vk06nn0yfvpdzcm30a1jn89lqqfma70x5jpa25s"; depends=[checkmate Formula ggplot2 glmnet MASS]; };
@@ -8333,12 +8497,13 @@ in with self; {
   hdrcde = derive2 { name="hdrcde"; version="3.3"; sha256="0c2qbw4c3mq1cb068kjs72rxlbibz8svwcrx853jyr8ybs23z7ab"; depends=[ash ggplot2 KernSmooth ks locfit RColorBrewer]; };
   hds = derive2 { name="hds"; version="0.8.1"; sha256="1smg5ixrl7f2x3wn7s5i26dyadn5sigpf4jsk236z1bhnz617ax4"; depends=[survival tensor]; };
   healthcareai = derive2 { name="healthcareai"; version="2.3.0"; sha256="0lyx9fldw28gx2lr2cpi7lyrwf5qz549v2vqxjx83ih5kxm6mlnp"; depends=[caret cowplot data_table dbplyr dplyr e1071 forcats generics ggplot2 glmnet lubridate MLmetrics purrr ranger recipes rlang ROCR stringr tibble tidyr xgboost]; };
+  healthforum = derive2 { name="healthforum"; version="0.1.0"; sha256="13ih00amv9hrpngm6pxc8vzqzhx8c0yqgaprxdcp5li90lg5r3av"; depends=[magrittr purrr rvest stringr tokenizers xml2]; };
   heatex = derive2 { name="heatex"; version="1.0"; sha256="0c7bxblq24m80yi24gmrqqlcw8jh0lb749adsh51yr6nzpap6i9n"; depends=[]; };
   heatmap_plus = derive2 { name="heatmap.plus"; version="1.3"; sha256="0rzffm15a51b7l55k0krk6w7v8czy3vpwz1qmbybr7av0pln7wn3"; depends=[]; };
   heatmap3 = derive2 { name="heatmap3"; version="1.1.6"; sha256="13aa9rd16k67b1fr6471bdz2a1i04k7279ck1i4rjdly9rbksnjx"; depends=[fastcluster]; };
   heatmapFit = derive2 { name="heatmapFit"; version="2.0.4"; sha256="1rswp1wp58f21fpyjybcvvmnn53kr54ij83hp05qbvl7yn1fsnrb"; depends=[]; };
   heatmaply = derive2 { name="heatmaply"; version="0.16.0"; sha256="1qhxk48qh61qjxdlhl0qffdh3yh8iiwccid5ssngdv433q0cmyc1"; depends=[assertthat colorspace dendextend ggplot2 htmlwidgets magrittr plotly RColorBrewer reshape2 scales seriation viridis webshot]; };
-  heatwaveR = derive2 { name="heatwaveR"; version="0.4.0"; sha256="184rm4jiw3s0xi0jsadbs7pzbwdcvgkqwcs2c7fl9aaayf4m7v1h"; depends=[data_table dplyr ggplot2 lubridate plotly Rcpp RcppArmadillo RcppRoll tibble zoo]; };
+  heatwaveR = derive2 { name="heatwaveR"; version="0.4.1"; sha256="1dqqk3mjqlz60h54zfryqqcf11ikmja7fnf6s7wphld765am7ll8"; depends=[data_table dplyr ggplot2 lubridate plotly Rcpp RcppArmadillo RcppRoll tibble zoo]; };
   heavy = derive2 { name="heavy"; version="0.38.19"; sha256="15bg2qqkslkqfnsq3ixbgmq72xagh8laji0265l06xgf2l6045kx"; depends=[]; };
   hedgehog = derive2 { name="hedgehog"; version="0.1"; sha256="1mvjnm2zlc4pvw9vnhxr0dj1g1sfqvlrnnhcipzfbvr147yan9l5"; depends=[rlang testthat]; };
   heemod = derive2 { name="heemod"; version="0.10.0"; sha256="0vkmjsi8dya6zyhh6bxisvwaydk6w2q9k31gkbkvwjcjrv09dnnv"; depends=[dplyr ggplot2 lazyeval memoise mvnfast plyr pryr tibble]; };
@@ -8350,7 +8515,7 @@ in with self; {
   helsinki = derive2 { name="helsinki"; version="0.9.29"; sha256="0bn5iyxjn9qs6f0dmhv51ssayywbx1rayh80zbzk0gsm94nhs0d9"; depends=[maptools RCurl rjson sp]; };
   heplots = derive2 { name="heplots"; version="1.3-5"; sha256="1vyhfkp66gi17jni3gsbv9kn1s0n00qigr13q8xbzbgylz5jjiln"; depends=[car MASS]; };
   here = derive2 { name="here"; version="0.1"; sha256="1vb5dxqdpimy51q1gjsypyq14p2hhvj7wsvh6g35pj1g03cyg9av"; depends=[rprojroot]; };
-  hergm = derive2 { name="hergm"; version="4.1-3"; sha256="15cqn45c81a98n1s166hryd5kjm0qaq2f9xjyr10j1kr8lagzbcb"; depends=[ergm igraph intergraph latentnet Matrix mcgibbsit mlergm network Rcpp sna stringr]; };
+  hergm = derive2 { name="hergm"; version="4.1-4"; sha256="16nxarmn1syx8k0ijmqg41r0h5sciwsavpbiq7wfp2wysh8irwsk"; depends=[ergm igraph intergraph latentnet Matrix mcgibbsit mlergm network Rcpp sna stringr]; };
   heritability = derive2 { name="heritability"; version="1.2"; sha256="18snrfsjj5jw5qicj92d5qch9v4ciqw1hbiwg6q8kfjka9nmqpma"; depends=[MASS]; };
   hermite = derive2 { name="hermite"; version="1.1.2"; sha256="0j9s7ayvbvmgwybrvf703b72qbn8gskb105pis19ig2sslllzda3"; depends=[maxLik]; };
   hero = derive2 { name="hero"; version="0.0.3"; sha256="166jqxlp2x459ixm83kw55ssd86041qiwfymsk035r5aaf7nvjq1"; depends=[]; };
@@ -8359,7 +8524,7 @@ in with self; {
   hetGP = derive2 { name="hetGP"; version="1.1.1"; sha256="1f0lb91hb6lp9cfil1qpbqf032xv697jazcqyc1y694hdbx0jwqj"; depends=[DiceDesign MASS Rcpp]; };
   hett = derive2 { name="hett"; version="0.3-2"; sha256="1kmspw0738pdall5scmllsa79dynliai2glk1h5rzm4030r5rd6j"; depends=[lattice MASS]; };
   hettx = derive2 { name="hettx"; version="0.1.1"; sha256="0zfxg88l83pzj37c5khpv4vi0v28fdnp0p8yz39scm8d8lya1dkm"; depends=[doParallel dplyr foreach formula_tools MASS moments mvtnorm plyr purrr quantreg tidyverse]; };
-  heuristica = derive2 { name="heuristica"; version="1.0.1"; sha256="1myivlqw6a8wh97ma9lrpgvaqb0vn4kj8yp9r4z5vc4pxgmm48g6"; depends=[Hmisc]; };
+  heuristica = derive2 { name="heuristica"; version="1.0.2"; sha256="1wqdwggnma6p667ivr0xja4vvn3jgzbkc5whkkijmdmxpjzg1wz6"; depends=[Hmisc]; };
   heuristicsmineR = derive2 { name="heuristicsmineR"; version="0.2.1"; sha256="0zpkkz20jlppdvsxcxs0w2n79af21ry1vvmbqlm1scgkr86674yd"; depends=[BH bupaR data_table DiagrammeR dplyr ggplot2 ggthemes magrittr petrinetR processmapR purrr Rcpp rlang scales tidyr]; };
   hexSticker = derive2 { name="hexSticker"; version="0.4.6"; sha256="02zdnxnhci0d9dclb6z3zc8sm1c4bj8zzbapwy34h8bs3sz1c8xn"; depends=[ggimage ggplot2 hexbin showtext sysfonts]; };
   hexView = derive2 { name="hexView"; version="0.3-4"; sha256="01hiqyibsd4as7jcklzg09pl12la341mg561vn16z4jzdarfvkfc"; depends=[]; };
@@ -8371,7 +8536,7 @@ in with self; {
   hglm = derive2 { name="hglm"; version="2.2-1"; sha256="1lyxkvqzfll1qrz5c2km9ikhq0dm63x39by4vc1nmkd24yza93nc"; depends=[hglm_data MASS Matrix]; };
   hglm_data = derive2 { name="hglm.data"; version="1.0-1"; sha256="0mw1s0kahsh9jmwkxysfy5f7vbld7mpzmdnnww6im5h21jhnczx2"; depends=[MASS Matrix sp]; };
   hgm = derive2 { name="hgm"; version="1.17"; sha256="11hv4pfv3gqiargvwvrxqzfji75j291w1nilawf8yjc3isnc4wjp"; depends=[deSolve]; };
-  hgutils = derive2 { name="hgutils"; version="0.2.5"; sha256="1wj2h1k1sfji5aph8r4pg94zlgq4rvxwilqhnp5q0pfvw8j656zh"; depends=[crayon limSolve magrittr stringr]; };
+  hgutils = derive2 { name="hgutils"; version="0.2.7"; sha256="1svxhz80h84wn1fj58p8g3rp553ima1wfdbbkm2cqnihwjxhha62"; depends=[crayon dplyr limSolve magrittr stringr]; };
   hhh4contacts = derive2 { name="hhh4contacts"; version="0.13.0"; sha256="17f31xhh6kk7sx5d5dvpwpvl72wd45zgb4fcpdayx3yrm719csz9"; depends=[surveillance]; };
   hhi = derive2 { name="hhi"; version="1.2.0"; sha256="1yl52c3nqdi8v60sr01l0vv8359803dm2i4c9ifazgj3h3a4h0yp"; depends=[ggplot2]; };
   hht = derive2 { name="hht"; version="2.1.3"; sha256="022a8zz2m34q89h29jglfj21knlqd8dwi85qmsi78ly1vacnzap8"; depends=[EMD fields spatstat]; };
@@ -8389,7 +8554,7 @@ in with self; {
   highSCREEN = derive2 { name="highSCREEN"; version="0.3"; sha256="179l82n7l7dfn40k6zgigw56ggwqyi34gllc2wvcw3yvfnd3l7s4"; depends=[gplots]; };
   highTtest = derive2 { name="highTtest"; version="1.1"; sha256="18hgxlr0y8y1d4ldqmfcg4536lhyn5p6w88sq1vj74qr5wzydga1"; depends=[]; };
   highcharter = derive2 { name="highcharter"; version="0.7.0"; sha256="0qfv25dqr7l54jq3vrnwphsj7wzk0an3vfx1zik36wi05yf2w8br"; depends=[assertthat broom crosstalk dplyr htmltools htmlwidgets igraph jsonlite lubridate magrittr purrr quantmod rlang rlist stringr tibble tidyr whisker xts yaml zoo]; };
-  highfrequency = derive2 { name="highfrequency"; version="0.5.3"; sha256="1d218504ghg8d3cwmsxwkznxpr2wy5li062i2lynbxzrhrk59i0l"; depends=[chron cubature MASS mvtnorm numDeriv robustbase sandwich timeDate xts zoo]; };
+  highfrequency = derive2 { name="highfrequency"; version="0.6.1"; sha256="0531kvsd06h684kksci63vyl865hiiic624fqdqicf0sis2bd1sd"; depends=[cubature data_table lubridate mvtnorm Rcpp RcppArmadillo RcppRoll readr robustbase xts zoo]; };
   highlight = derive2 { name="highlight"; version="0.4.7.2"; sha256="0xc1akglgby3qd6c9y2rhcd0gpfihx5jvakji38vzlxb1m21sn10"; depends=[]; };
   highlightHTML = derive2 { name="highlightHTML"; version="0.2.1"; sha256="06k2idx9aadjd6xp6kadm9jh7ap1hwg7vh0bc8vw9ll82wcp1nv1"; depends=[]; };
   highmean = derive2 { name="highmean"; version="3.0"; sha256="1lq7z0l1737j4wvsy7951405afylyywp7vf2i7girzh459fdfzpc"; depends=[MASS mnormt mvtnorm]; };
@@ -8397,6 +8562,7 @@ in with self; {
   highriskzone = derive2 { name="highriskzone"; version="1.4.5"; sha256="09ad025ydpfsrkcfqsfm4cj6lk8shrdh6vyya7isqwrd5jfyf1qc"; depends=[deldir fields ks maps Matrix mvtnorm rgeos spatstat]; };
   higrad = derive2 { name="higrad"; version="0.1.0"; sha256="0q9av8qyvmvgy6a3l7svcmbkjjgnp4iny1cld4g3qsbaz3yp3jaj"; depends=[Matrix]; };
   hillR = derive2 { name="hillR"; version="0.4.0"; sha256="0wivagbn4clfm3vbxbl3p93d9yxms94gkvi7p15lh0jfdppzm4c9"; depends=[ade4 ape FD plyr tibble]; };
+  hilldiv = derive2 { name="hilldiv"; version="1.5.1"; sha256="1jp4xvrpqd575y2x0i73s0bq708bzi6gdhqgz85bia6d5kf05lq9"; depends=[ape data_table FSA geiger ggplot2 ggpubr qgraph RColorBrewer scales vegan]; };
   hillmakeR = derive2 { name="hillmakeR"; version="0.2"; sha256="1baynibgn4xqmpsxna8irggxvdc484mq5nza00rwg58vh1bc7wzq"; depends=[]; };
   hindex = derive2 { name="hindex"; version="0.1.0"; sha256="12w1zz467grihjvan1db7c30psm0j85k82p01fzqgwdam3cd8as3"; depends=[foreach ggplot2]; };
   hindexcalculator = derive2 { name="hindexcalculator"; version="1.0.0"; sha256="06b4dn629avmnyqxb0l39m00wz9cg9dddmm6qhgwgnzlxh14ifgk"; depends=[]; };
@@ -8416,9 +8582,10 @@ in with self; {
   hmeasure = derive2 { name="hmeasure"; version="1.0-2"; sha256="0l4nlny532kddiaa1nmgd37971whhwzb54mb1pvbwax7fsg6hmhw"; depends=[]; };
   hmi = derive2 { name="hmi"; version="0.9.16"; sha256="128rwbflxy9j49xpgmwjsw35jhsz586r5b0hn80jkjmpfshnffx3"; depends=[boot coda linLIR lme4 MASS Matrix MCMCglmm mice msm mvtnorm nlme nnet ordinal pbivnorm rlang tmvtnorm VGAM]; };
   hmlasso = derive2 { name="hmlasso"; version="0.0.1"; sha256="0ydcyz9pw30ji8ghrvkgcbmp27d661vajl97b8cwis52605a3gfx"; depends=[BH MASS Matrix Rcpp RSpectra]; };
-  hmm_discnp = derive2 { name="hmm.discnp"; version="2.1-5"; sha256="1nawdj5rxh54gxyrr9xw1zw1k1b20ds397mz07x6n7nyjmj4lak2"; depends=[nnet]; };
+  hmm_discnp = derive2 { name="hmm.discnp"; version="2.1-11"; sha256="0s0qzwg5lidmzcxgdbjnq6dqal8xm28h75drrjm712pg36577fcg"; depends=[nnet]; };
+  hmmhdd = derive2 { name="hmmhdd"; version="1.0"; sha256="16jz951d1ssai0gmfnnfikkkvc8yca29a82dq7092kbzwc4i90sk"; depends=[gmfd mvtnorm roahd]; };
   hmmm = derive2 { name="hmmm"; version="1.0-4"; sha256="1sbr85lcmcw3lv0ygqwfbarr91dp3br1xnlygy49145cvl93nfci"; depends=[MASS mvtnorm nleqslv quadprog]; };
-  hms = derive2 { name="hms"; version="0.5.0"; sha256="06snfqdczr0x0nbp7qnvwhlp2pw0wx9c2y3xb4gr1wrvbik74y58"; depends=[pkgconfig rlang vctrs]; };
+  hms = derive2 { name="hms"; version="0.5.1"; sha256="1v4cxfpvp85la4gqla6b4q2bwx4jv1fxqwndcnjsibbnybz6wcvd"; depends=[pkgconfig rlang vctrs]; };
   hmstimer = derive2 { name="hmstimer"; version="0.0.2"; sha256="0qv2pls6mplnv3mylbiwh83gnvq2qkdpnnjnxnhrgmwia9fapixs"; depends=[]; };
   hnp = derive2 { name="hnp"; version="1.2-6"; sha256="12cbc353ipr2rcc93skf1766g38j1pvpdkqk3cswv0cxsjl2x7pl"; depends=[MASS]; };
   hoa = derive2 { name="hoa"; version="2.1.4.1"; sha256="152vz6cddphmxvm7vi6f3b7jjpib0nsb6qv2k1wrmfrpvv3hgsxx"; depends=[statmod survival]; };
@@ -8429,7 +8596,7 @@ in with self; {
   holodeck = derive2 { name="holodeck"; version="0.2.0"; sha256="1p7crpwa56a4363x4c888475xajga3blp544as4ad85br1k8vpjl"; depends=[assertthat dplyr MASS purrr rlang tibble]; };
   homals = derive2 { name="homals"; version="1.0-8"; sha256="0gad0jmflw5zmzf9hk5qqmxxpbncm9gngsi24i3rgiz7565kli1r"; depends=[ape rgl scatterplot3d]; };
   homeR = derive2 { name="homeR"; version="0.3.0"; sha256="0gi383392rs7snb2l9760vkws5hqfikyaj3i7cyby9g1sc2s6yx8"; depends=[]; };
-  hommel = derive2 { name="hommel"; version="1.2"; sha256="006m28kfpzsz02nz8mhwjcn5b761fcpvhaw63c91x08ka89x4frl"; depends=[Rcpp]; };
+  hommel = derive2 { name="hommel"; version="1.4"; sha256="1bzall7xfg4fyjx9i4ck24yfdp5s9gwcm2324y75a4hc088wpspl"; depends=[Rcpp]; };
   homologene = derive2 { name="homologene"; version="1.4.68.19.3.27"; sha256="0d7wxisk0vqk1n165v1i19bc02zv78h5r5d3jqai5y6nkmwn01sh"; depends=[dplyr magrittr purrr R_utils readr]; };
   homomorpheR = derive2 { name="homomorpheR"; version="0.2-2"; sha256="1iahq16nswlc3b87598206xdp24bg9v8acyjp1jivybl3fr4k3pq"; depends=[gmp R6 sodium]; };
   homtest = derive2 { name="homtest"; version="1.0-5"; sha256="1lnqlg3dwq174ic6dbjllysw5fjy5kvvgbl6gvabjmcs66z27fp0"; depends=[]; };
@@ -8444,6 +8611,8 @@ in with self; {
   hotspots = derive2 { name="hotspots"; version="1.0.3"; sha256="12v88k3yz1bsxx9p5dx8y54ccqcglwknm2jr7ybygdj2yasjr5l0"; depends=[ineq lattice]; };
   housingData = derive2 { name="housingData"; version="0.3.0"; sha256="0ngfx2vjx705xixzpz0rgx1481cr2szj4yfi5g7ma1hhivddl7d1"; depends=[]; };
   howmany = derive2 { name="howmany"; version="0.3-1"; sha256="045ck8qahfg2swbgyf7dpl32ryq1m4sbalhr7m5qdgpm62vz8h7f"; depends=[]; };
+  hpa = derive2 { name="hpa"; version="1.0.1"; sha256="18055gh3nasdh6fh1xw95zl2vidqkw5b99b1zhh78j84lzs6r3gm"; depends=[Rcpp RcppArmadillo]; };
+  hpackedbubble = derive2 { name="hpackedbubble"; version="0.1.0"; sha256="1br7q4958f1zgvisglsaf41nz2ahnqi3bzazvlfnmk3nq03cb1ri"; depends=[htmlwidgets]; };
   hpcwld = derive2 { name="hpcwld"; version="0.5"; sha256="17k4mw41gygwgvh7h78m0jgzh1bivrvrsr8lgxxw3sbkw88lwb40"; depends=[multicool partitions]; };
   hpiR = derive2 { name="hpiR"; version="0.2.0"; sha256="0l9x0w6a3ssqcysw8bwmml541nags3b1wxbvipg4rqjfazpdxji4"; depends=[caret dplyr forecast ggplot2 gridExtra imputeTS knitr lubridate magrittr MASS plyr purrr rlang robustbase zoo]; };
   hpoPlot = derive2 { name="hpoPlot"; version="2.4"; sha256="176bf93gjwbi2z7nz81w4aycwax6f7jxvs3236zrmf0f0f4m7bkc"; depends=[functional magrittr Rgraphviz]; };
@@ -8456,25 +8625,26 @@ in with self; {
   hsm = derive2 { name="hsm"; version="0.2.0"; sha256="066shjikqrrkxpnra4zknax1a0sk5nx9ms1br58vwqqvqq479rym"; depends=[]; };
   hsmm = derive2 { name="hsmm"; version="0.4"; sha256="1fh8c5kfv4brygdq6bfkrhrhkm99mxl4ljb1mhp9nf2bjlla11mc"; depends=[mvtnorm]; };
   hsphase = derive2 { name="hsphase"; version="2.0.2"; sha256="1b62k9sc6604djy37anslvqjpbrj9wsc9mvnfbrnmhqf4g0nnpdq"; depends=[Rcpp RcppArmadillo snowfall]; };
+  hsstan = derive2 { name="hsstan"; version="0.6"; sha256="14k63agcq8m2lg5pw2309pi78950254v3z2m92pl4wjsikmsqrc1"; depends=[BH ggplot2 loo pROC Rcpp RcppEigen rstan rstantools StanHeaders]; };
   htdp = derive2 { name="htdp"; version="0.1.4"; sha256="0w579qp0p544xryb5r08m1nhqf7rmgv9q0lyx6my4av62l70ka5w"; depends=[Rcpp]; };
   htm2txt = derive2 { name="htm2txt"; version="2.1.1"; sha256="09q026yy8qm1fb3a4bf9vsp4j09kayl7xmk0p58ikar5l3bmfdjv"; depends=[]; };
-  htmlTable = derive2 { name="htmlTable"; version="1.13.1"; sha256="1l44b33xgj2698k6nz17r8fl0ink14ryzng803apm9d6bnv357v8"; depends=[checkmate htmltools htmlwidgets knitr magrittr rstudioapi stringr]; };
+  htmlTable = derive2 { name="htmlTable"; version="1.13.2"; sha256="0h6jslchlx1dzqqdb70c3n9xlapcym9ykycvr0hc4q3450y8qmvh"; depends=[checkmate htmltools htmlwidgets knitr magrittr rstudioapi stringr]; };
   htmltab = derive2 { name="htmltab"; version="0.7.1"; sha256="0lymagm7z6zn0ddygqxi831ikk74112lkqkbvs5j1djhmr359ajc"; depends=[httr XML]; };
-  htmltidy = derive2 { name="htmltidy"; version="0.4.0"; sha256="090rj1fzdsa8m4g33d4mx92dm8afh173i4hqa4zym8c909jwh9qn"; depends=[htmltools htmlwidgets Rcpp XML xml2]; };
+  htmltidy = derive2 { name="htmltidy"; version="0.5.0"; sha256="1djkjff3750fm1sp54kf9cjvsqz2x7ia1ns12h5vqqcvwzfd0701"; depends=[htmltools htmlwidgets Rcpp XML xml2]; };
   htmltools = derive2 { name="htmltools"; version="0.3.6"; sha256="18k8r1s8sz1jy7dkz35n69wj20xhmllr53xmwb4pdzf2z61gpbs4"; depends=[digest Rcpp]; };
   htmlwidgets = derive2 { name="htmlwidgets"; version="1.3"; sha256="04jsdh14l2zifbjpbbh23w7bxz1wpsas0zb2gy2zwv4yqamzzr7i"; depends=[htmltools jsonlite yaml]; };
   htree = derive2 { name="htree"; version="2.0.0"; sha256="15bi5c2p4aghihp3k12s78447j2x9hbsaq56b5lc8jmd1vf0jdwb"; depends=[]; };
   hts = derive2 { name="hts"; version="5.1.5"; sha256="0mvsxrk7wkfn81hbk8a80fckiqiwdbvhq42k7c6lm69gamnbak2f"; depends=[forecast Matrix matrixcalc Rcpp RcppEigen SparseM]; };
-  httk = derive2 { name="httk"; version="1.10.0"; sha256="0bczjhykq03wcgjymzyhbk4i8vsd4sr0g6plx8lrfsjqirxf3k72"; depends=[data_table deSolve magrittr msm mvtnorm survey truncnorm]; };
+  httk = derive2 { name="httk"; version="1.10.1"; sha256="05zbxyxlq94i6v4wwx7znr9p4k5gn9z7yi818v9f76bv8xi7mxv2"; depends=[data_table deSolve magrittr msm mvtnorm survey truncnorm]; };
   httpRequest = derive2 { name="httpRequest"; version="0.0.10"; sha256="0f6mksy38p9nklsr44ki7a79df1f28jwn2jfyb6f9kbjzh98746j"; depends=[]; };
   httpcache = derive2 { name="httpcache"; version="1.1.0"; sha256="11hdc1jj2jbgvsps1h55azq0cr2fl556k631ns9k0747sjfmy2k9"; depends=[digest httr]; };
   httpcode = derive2 { name="httpcode"; version="0.2.0"; sha256="06k853ihwzkcx4z3jzazpb03p91frqkwz18jy4fwr8j2nwyqbhgv"; depends=[]; };
   httping = derive2 { name="httping"; version="0.2.0"; sha256="0hdcf51yak8yagy4xj9cyck934lgmvpkd08jvlql33ir5mqvvv3i"; depends=[httpcode httr jsonlite magrittr pryr]; };
   httptest = derive2 { name="httptest"; version="3.2.2"; sha256="1q2lhqi5lhdc15wjrcr4z2yxjrfhjkgn0wwxr0mawsfz8cy3703q"; depends=[digest httr jsonlite testthat]; };
-  httpuv = derive2 { name="httpuv"; version="1.5.1"; sha256="042piypg4c8sqrlcdl3dwajkafkbglsky3x7d0jpjv8s5wxnpfxm"; depends=[BH later promises R6 Rcpp]; };
-  httr = derive2 { name="httr"; version="1.4.0"; sha256="0j6vknwyvkjpjsxwch4q02aik4dnm3h4l0wc7dgzc555bm1g2cyn"; depends=[curl jsonlite mime openssl R6]; };
+  httpuv = derive2 { name="httpuv"; version="1.5.2"; sha256="13ax0hs2lc39ilznh1zarwqdzahcbhb8adilrfik3xg0fkljpcwk"; depends=[BH later promises R6 Rcpp]; };
+  httr = derive2 { name="httr"; version="1.4.1"; sha256="0mp1il13q6n49n2hv1p2p8x6avjan6dr5az19ql4hb78pc3pwp37"; depends=[curl jsonlite mime openssl R6]; };
   hues = derive2 { name="hues"; version="0.1"; sha256="0b6y4ld242fqzx4ccxzk4i4zbx7myk7v3a03r0klgbh2mmw3ixm0"; depends=[colorspace]; };
-  huge = derive2 { name="huge"; version="1.3.2"; sha256="1j93gvi1jyq3ld9jhdqhrpm2is54rk3ilmf3yw7fx6gva0y6hjqd"; depends=[igraph MASS Matrix Rcpp RcppEigen]; };
+  huge = derive2 { name="huge"; version="1.3.3"; sha256="18f8w4hdp9fdi2k5ip6fnrn5z47w4ybgxs2m6a7jdvd2v4wfdr69"; depends=[igraph MASS Matrix Rcpp RcppEigen]; };
   humanFormat = derive2 { name="humanFormat"; version="1.0"; sha256="0zwjbl8s5dx5d57sfmq6myc6snximc56zl88h8y1s1jqphyn9sir"; depends=[testthat]; };
   humaniformat = derive2 { name="humaniformat"; version="0.6.0"; sha256="0vaynjzz57pk4y1liag9lpn9jkag2033a6bkn28zzm7ndg3344l6"; depends=[Rcpp]; };
   humanize = derive2 { name="humanize"; version="0.2.0"; sha256="0hhhd640n77s8xaa2gbd9fckdk2yjg68gdb7wjy56a2khzqfssxr"; depends=[assertthat glue lubridate]; };
@@ -8484,9 +8654,10 @@ in with self; {
   hurdlr = derive2 { name="hurdlr"; version="0.1"; sha256="1ryrqsxa07isxv2zx156bcn36d4yjvwpirb8jqcmqm97q7rmihmq"; depends=[]; };
   hurricaneexposure = derive2 { name="hurricaneexposure"; version="0.1.0"; sha256="1wwa1b96yglmnkvn209v8g0cvx567i2mxd7y6vjzzy5l428cf9f0"; depends=[data_table dplyr ggmap ggplot2 lazyeval lubridate mapproj maps purrr RColorBrewer rlang stringr tidyr]; };
   hutils = derive2 { name="hutils"; version="1.5.0"; sha256="053zraq4c35w0lmpzgw03gw3r7dmq97yjfdldsv8d6sb1m4va7rk"; depends=[data_table fastmatch magrittr]; };
-  hutilscpp = derive2 { name="hutilscpp"; version="0.1.0"; sha256="17761crl71mhhc1k0g9gb6bq3df1w9s5508k0i7b3p3zam6r40l1"; depends=[data_table hutils Rcpp]; };
-  huxtable = derive2 { name="huxtable"; version="4.6.0"; sha256="1dcdzv679czq797xagi6sxq1s8vn8clchhdr1zk6bbajv06jxxhb"; depends=[assertthat generics glue memoise rlang stringr tibble tidyselect]; };
+  hutilscpp = derive2 { name="hutilscpp"; version="0.2.0"; sha256="1wp51xsy9wx7y8nf6b9k2dqvc9bamikqjwnihnndsgajfygr6jwj"; depends=[data_table hutils Rcpp]; };
+  huxtable = derive2 { name="huxtable"; version="4.7.0"; sha256="0pnba6k8mnn6wi4inlcap3ir7w784sxnvfvrc6g4iwql5s3rz6cz"; depends=[assertthat generics glue memoise rlang stringr tibble tidyselect]; };
   hwde = derive2 { name="hwde"; version="0.67"; sha256="0wb2f9i5qi7w77ygh8bvydfpr7j5x8dyvnnhdkajaz0wdcpkyaqy"; depends=[]; };
+  hwordcloud = derive2 { name="hwordcloud"; version="0.1.0"; sha256="0civbwv276lcwvfs4qzz14r8rk14kg1ml4zzhi3msnkkh29v70y2"; depends=[colourpicker htmlwidgets shiny wordcloud2]; };
   hwriter = derive2 { name="hwriter"; version="1.3.2"; sha256="0arjsz854rfkfqhgvpqbm9lfni97dcjs66isdsfvwfd2wz932dbb"; depends=[]; };
   hwwntest = derive2 { name="hwwntest"; version="1.3.1"; sha256="1mz5svx5vbisdl5wxdnwip13pq4slyigc7j52l526rr9n0l0pr5v"; depends=[polynom wavethresh]; };
   hybridEnsemble = derive2 { name="hybridEnsemble"; version="1.0.0"; sha256="08y11cmlhnl456wxsvh3ll1f9ywkmgqjwlwr3v3qhm54nlanwvkr"; depends=[ada AUC e1071 FNN genalg GenSA glmnet kernelFactory NMOF nnet nnls pso quadprog randomForest reportr Rmalschains ROCR rotationForest rpart soma tabuSearch]; };
@@ -8506,7 +8677,7 @@ in with self; {
   hyper2 = derive2 { name="hyper2"; version="1.0-7"; sha256="155ycb26mgk0ic899ji1pv1k2mmwfzwaa0zj38a9v6fwdgw87rpl"; depends=[cubature magrittr partitions Rcpp]; };
   hyperSMURF = derive2 { name="hyperSMURF"; version="2.0"; sha256="1aczsph6ax5xfd5rfvsd9bmgaq3j2f5f82fx8whrgbin0hxz19d8"; depends=[randomForest unbalanced]; };
   hyperSpec = derive2 { name="hyperSpec"; version="0.99-20180627"; sha256="12bgp3nm9mwi5w3v8a9fnm4a2cxid3la0r3sxs10azikn5yw0ib5"; depends=[ggplot2 lattice latticeExtra lazyeval testthat XML]; };
-  hypercube = derive2 { name="hypercube"; version="0.1.0"; sha256="0iv3cfs636mwijm2rjk427izf0gk5lh2fknd7bmb8pd188ckwqmf"; depends=[stringr]; };
+  hypercube = derive2 { name="hypercube"; version="0.2.0"; sha256="13b521vpxzk80ldr0v4bayxm4kwssqzpmzlykv5xhghvfdsqxqri"; depends=[dplyr plotly stringr]; };
   hypergate = derive2 { name="hypergate"; version="0.8.1"; sha256="17n8bs869c56jm76nq82alkajbyhbgn6nydzb1zh82i0ns269rlz"; depends=[]; };
   hypergea = derive2 { name="hypergea"; version="1.3.6"; sha256="1k1525bkkj83j2nn9ixidb8vjvdmc4l9jvfarzgg532gg7wn3841"; depends=[]; };
   hypergeo = derive2 { name="hypergeo"; version="1.2-13"; sha256="13jdiy216znwhr91iqnh03mvkmyscw439syb3h4i67dd78sphnvd"; depends=[contfrac deSolve elliptic]; };
@@ -8516,17 +8687,18 @@ in with self; {
   hypothesisr = derive2 { name="hypothesisr"; version="0.1.1"; sha256="0z06risagphhvqiw4lrxy52q6q2yr10w2yxsm8iz1wh9ik097pcv"; depends=[dplyr httr jsonlite]; };
   hysteresis = derive2 { name="hysteresis"; version="2.6"; sha256="00v19m52bg2i3zg8p7yj56axzj9sm64qr61226p5h7sn0zrpws3b"; depends=[car MASS msm]; };
   hzar = derive2 { name="hzar"; version="0.2-5"; sha256="000l4ki3hvznnhkxc5j422h5ifnsfqalv666j48yby1hsf1lc3kg"; depends=[coda foreach MCMCpack]; };
+  iAdapt = derive2 { name="iAdapt"; version="0.1.0"; sha256="0ykcvqm1aswc4iypapml22194nxi6mxvxipy6wj7l9g4cazfa8j8"; depends=[shiny shinydashboard]; };
   iBATCGH = derive2 { name="iBATCGH"; version="1.3"; sha256="0pnkkabzi57czcwd9i15nwv8ggwvyxmvn1wam7yrrrbvmi17lmrm"; depends=[msm Rcpp RcppArmadillo]; };
   iBST = derive2 { name="iBST"; version="1.0"; sha256="02p7lcr1wrf21v4568jc8hmjcijy3fnbv77s8nlhv2s4p0pgzh5x"; depends=[Rcpp rpart survival]; };
-  iBreakDown = derive2 { name="iBreakDown"; version="0.9.6"; sha256="00vlm149ryak7xk059lnv2cic4h4fzlrp9c6jls2dffrpsn0ii02"; depends=[DALEX ggplot2]; };
+  iBreakDown = derive2 { name="iBreakDown"; version="0.9.9"; sha256="1sxd2x837qmi47p0c9bmy1lqldv2l214qw5n28w3bkwalbdaizyk"; depends=[DALEX ggplot2]; };
   iC10 = derive2 { name="iC10"; version="1.5"; sha256="1xq6xv582wxdb0nc2nia3q38155gx8z26idiqyx7h1rjb20hhwdl"; depends=[iC10TrainingData impute pamr]; };
   iC10TrainingData = derive2 { name="iC10TrainingData"; version="1.3.1"; sha256="175ymib3h359296hk36psryksisipx63ybvacz8hys21irzx58j1"; depends=[]; };
   iCARH = derive2 { name="iCARH"; version="2.0.0"; sha256="08krf7if4nlj7whchjqsr3gzvhz81w24wa2vxzs6znf9m0k5aqay"; depends=[abind ggplot2 igraph KEGGgraph MASS Matrix mc2d RCurl reshape2 rstan]; };
-  iCellR = derive2 { name="iCellR"; version="1.0.0"; sha256="13hfzvi4lqpcngkp757nl7mixbq8bscpxp91wz0rd3gndrgiccv1"; depends=[ape ggdendro ggplot2 ggpubr ggrepel gridExtra Hmisc htmlwidgets knitr Matrix NbClust pheatmap plotly plyr RColorBrewer reshape Rtsne scatterplot3d shiny umap]; };
+  iCellR = derive2 { name="iCellR"; version="1.1.4"; sha256="0gamxpn63rvj9pr33z0gdgc5fh5g71sz9vi94bah5271lqfbwqzx"; depends=[ape ggdendro ggplot2 ggpubr ggrepel gridExtra Hmisc htmlwidgets knitr Matrix NbClust pheatmap plotly plyr RColorBrewer reshape Rtsne scatterplot3d shiny umap]; };
   iCiteR = derive2 { name="iCiteR"; version="0.1.0"; sha256="1h38m3blnpivrdz1hdgakl502zxb92gjkczra0a7izbq9fn19mfw"; depends=[httr jsonlite]; };
   iClick = derive2 { name="iClick"; version="1.5"; sha256="0yq0r9nz1mf9ci6l30ylqxbgl8mf1ahyqzr7m6nks0ygxabipdnd"; depends=[boot car coefplot fBasics forecast lattice lmtest lubridate openair papeR rugarch sandwich timeDate timeSeries xts zoo]; };
   iCluster = derive2 { name="iCluster"; version="2.1.0"; sha256="09j36xv87d382m5ijkhmp2mxaajc4k97cf9k1hb11ksk7fxdqz6r"; depends=[caTools gdata gplots gtools lattice]; };
-  iDINGO = derive2 { name="iDINGO"; version="1.0.2"; sha256="041yvp3nzk3ipjlx17xcn9yiwr1hlns0pd3vzqrck5v9glnp4sbr"; depends=[GGMridge glasso igraph mvtnorm scales visNetwork]; };
+  iDINGO = derive2 { name="iDINGO"; version="1.0.3"; sha256="0aa7g7shcbjzjwhnrh6hd4idjdka9rd7jawkvqvyjnwcql2qlapv"; depends=[GGMridge glasso igraph mvtnorm scales visNetwork]; };
   iDOS = derive2 { name="iDOS"; version="1.0.0"; sha256="1jj98ikzvfp6qbnh2j6msi0m89sbmjjafgry43rq7qmczzs81hl8"; depends=[VennDiagram]; };
   iDynoR = derive2 { name="iDynoR"; version="1.0"; sha256="01702vl10191mbq2wby1m0y6h8i6y6ic4pa83d27cg3yccsrhziz"; depends=[vegan XML]; };
   iECAT = derive2 { name="iECAT"; version="0.8"; sha256="0kv8db7ss3vk21ccl8qfj4x69npfzwmm3piddj9l0vwrwd3ccl32"; depends=[MetaSKAT SKAT]; };
@@ -8544,11 +8716,12 @@ in with self; {
   iRegression = derive2 { name="iRegression"; version="1.2.1"; sha256="1kwsrmsflmqan96aj0dczlszfww1dlg6rwycyid52f7ghg9810rn"; depends=[mgcv]; };
   iRepro = derive2 { name="iRepro"; version="1.1"; sha256="1sqg1n83m1308v6bk8ilra8w01frqyd8vpvmv63rllxz38r3vyhz"; depends=[]; };
   iSDM = derive2 { name="iSDM"; version="1.0"; sha256="1hzs187mwv3k2wx6dpvkizjhkcx63mznd06wiw6047lf5jrlif0a"; depends=[ade4 colorRamps geometry geosphere maptools MASS pdist raster rgdal rgl sp virtualspecies]; };
+  iSTATS = derive2 { name="iSTATS"; version="0.1.0"; sha256="0dv1hrhx0gf327fdfrn3j73i64v8kd8109ywz75s3xfacwn98yr2"; depends=[Cairo ggplot2 gtools shiny shinyBS shinyWidgets]; };
   iTOP = derive2 { name="iTOP"; version="1.0.2"; sha256="1n6nlmmx2h63nksycgzr7qsnd1j6bxa629av7cfd3ihriim7dj47"; depends=[corpcor Matrix]; };
   iWISA = derive2 { name="iWISA"; version="1.0-2"; sha256="0jqi1kh7jlc04nb9d1w711q4i8j1vgwbxjls09z7853kv22wxfyz"; depends=[fda ggplot2 waveslim]; };
   iWeigReg = derive2 { name="iWeigReg"; version="1.0"; sha256="09ajbqllr4ajmpk8qs6qw019fx8a7vsabm37867zycssn77z9nc8"; depends=[MASS trust]; };
   iadf = derive2 { name="iadf"; version="0.1.0"; sha256="02zx9n4ncg10bbydrr05631vzc4w2b1jg3x6xiaffg7x5rh4mnyf"; depends=[dplR dplyr manipulate rlang tibble tidyr]; };
-  iai = derive2 { name="iai"; version="1.0.0"; sha256="12alm0vhzaszacwpgzcbds00hj7xjfjq06zy337y81zqjgl8balp"; depends=[JuliaCall rlang stringr]; };
+  iai = derive2 { name="iai"; version="1.1.0"; sha256="1ck5znn3l80ahh6n6qvp8rw4307blkqyr1jmq9ksifb5hkqpxyfw"; depends=[JuliaCall rlang stringr]; };
   iarm = derive2 { name="iarm"; version="0.2.0"; sha256="0lg1q5z40hjm8wicniimv4wlb210qj7d5lmmknilzkpz4shwr44k"; depends=[eRm mRm PP psychotools vcdExtra]; };
   ibd = derive2 { name="ibd"; version="1.5"; sha256="0rxvy4hn4fpbv6y214ggkmgfvzwns5mkanp4h8201rjk3v84mk2r"; depends=[car emmeans lpSolve multcomp]; };
   ibdreg = derive2 { name="ibdreg"; version="0.2.5"; sha256="1kaa5q1byi30wzr0mw4w2cv1ssxprzcwf91wrpqwkgcsdy7dkh2g"; depends=[]; };
@@ -8567,7 +8740,7 @@ in with self; {
   ical = derive2 { name="ical"; version="0.1.6"; sha256="1raanaagas1c8w66d8s045z5ip1i97xca4233d55jk6cazv0mb1w"; depends=[V8]; };
   icamix = derive2 { name="icamix"; version="1.0.6"; sha256="0jys9r7wjxlwsq5rssih2lvsar1192w8vigdhhrcmf3d5z5ic1kp"; depends=[Rcpp RcppArmadillo]; };
   icapca = derive2 { name="icapca"; version="1.1"; sha256="131gdrk8vsbac0krmsryvsp21bn9hzxqxq847zn16cxjf6y5i3xb"; depends=[]; };
-  icarus = derive2 { name="icarus"; version="0.3.0"; sha256="1656bz0av59dpgndibn0bc5zr9zka9pmw7qmhjz2b956bh7sh4ag"; depends=[]; };
+  icarus = derive2 { name="icarus"; version="0.3.1"; sha256="0ipbhzvwdn1cnzgdw33cwv901768srxfi588bimjx2ssl80mqn3a"; depends=[]; };
   iccbeta = derive2 { name="iccbeta"; version="1.2.0"; sha256="03ms1c8qpbgxabj3hh4n0gwcazw6cd0cvixck5rz8fkvj04xzjak"; depends=[lme4 Rcpp RcppArmadillo]; };
   icd = derive2 { name="icd"; version="4.0.6"; sha256="0zi56c6x2jy1yihrar6whhyb5csyhzwdxw0nr8c05xm28w1j6xwb"; depends=[rappdirs Rcpp RcppEigen]; };
   icd_data = derive2 { name="icd.data"; version="1.0"; sha256="0cynr9327wfg88661w4hali48mb6ghyvlqgybsa38k9bbf57v8aa"; depends=[]; };
@@ -8597,9 +8770,10 @@ in with self; {
   identity = derive2 { name="identity"; version="0.2-1"; sha256="1j5wb5cj5j49in2g6r1shdm4ri4cfzj22hpqazvcmq4dm291sdi9"; depends=[]; };
   ideq = derive2 { name="ideq"; version="0.1.1"; sha256="1lp1mxckj4znngavv701mxcx84n9409irnpcsadj5v1grmy9352x"; depends=[matrixcalc mvtnorm pdist Rcpp RcppArmadillo rgen]; };
   ider = derive2 { name="ider"; version="0.1.0"; sha256="021s4fybki7a6mdsr6gkjrzfhaqdcg0m2a6r24y91jklxlxqxmws"; depends=[FNN]; };
+  idiogramFISH = derive2 { name="idiogramFISH"; version="1.5.1"; sha256="0snb8im0xxda3nymvn08x5677r97cvpdixa19v7zc2xiv6vchimp"; depends=[badger crayon kableExtra knitr prettydoc rmarkdown rvcheck]; };
   idm = derive2 { name="idm"; version="1.8.2"; sha256="04f0i0kwdxywmj2i184knx5a5v9svx0lbam6wpz49hghg7qpy0w5"; depends=[animation ca corpcor dummies ggplot2 ggrepel]; };
   idmTPreg = derive2 { name="idmTPreg"; version="1.1"; sha256="1329sjb4dnw3yiyg16whbj4l2v0kg8phg1x4ysvyp2kqkmw14yq6"; depends=[doParallel foreach survival]; };
-  idmodelr = derive2 { name="idmodelr"; version="0.3.0"; sha256="0rnfv7jwl5x3a67nbj2k2cs15b7xqzdcs9v8nlx2zxfsnf95s68s"; depends=[deSolve dplyr furrr future ggplot2 magrittr purrr rlang stringr tibble tidyr viridis]; };
+  idmodelr = derive2 { name="idmodelr"; version="0.3.1"; sha256="147rlcm7dj20xbwi392w82m1mnw90mvcp4yjgfplm34z6y90ljir"; depends=[deSolve dplyr furrr future ggplot2 magrittr purrr rlang stringr tibble tidyr viridis]; };
   idr = derive2 { name="idr"; version="1.2"; sha256="05nvgw1xdg670bsjjrxkgd1mrdkciccpw4krn0zcgdf2r21dzgwb"; depends=[]; };
   ids = derive2 { name="ids"; version="1.0.1"; sha256="1s6ga94gds5ydr9f8qbjfgfpg2dvbnkcrlybqlb33hk3c0c2l8dn"; depends=[openssl uuid]; };
   idx2r = derive2 { name="idx2r"; version="1.0.0"; sha256="14d3rasnf8mghwzpg6h4larybgy7drrv0jh71x28qwry49acsqyh"; depends=[]; };
@@ -8614,17 +8788,21 @@ in with self; {
   ifs = derive2 { name="ifs"; version="0.1.5"; sha256="03g9cgs0zp89b1d7rpcn5clkvmg0spnariwrifd8hha476ldvfcy"; depends=[]; };
   ifultools = derive2 { name="ifultools"; version="2.0-5"; sha256="040kvbczcmmbaiaz0k0pdq9af541pjj6iwzh1a3w4szh9w6b5a3j"; depends=[MASS splus2R]; };
   ig_vancouver_2014_topcolour = derive2 { name="ig.vancouver.2014.topcolour"; version="0.1.2.0"; sha256="0yclvm6xppf4w1qf25nf82hg1pliah68z7h3f683svv0j62q748h"; depends=[]; };
+  igate = derive2 { name="igate"; version="0.3.3"; sha256="0b8dk976z0764cmxwcq6w2f3akv7iivivharinq029p90b600qza"; depends=[dplyr ggplot2 kableExtra knitr rmarkdown stringr xtable]; };
   igraph = derive2 { name="igraph"; version="1.2.4.1"; sha256="1074y8mvprrqlkb4vwa2qc9l03r8d7p5vaaqacj4ljjs7dvcq6l9"; depends=[magrittr Matrix pkgconfig]; };
   igraphdata = derive2 { name="igraphdata"; version="1.0.1"; sha256="19w5npa4b8c054v94xlr7nmhhg2fhq4m8jbds86skp8zvipl4rkl"; depends=[]; };
   igraphinshiny = derive2 { name="igraphinshiny"; version="0.1"; sha256="1ww5s4jfihzcx4k35lbhzsf54z720xh7b2p5alzk843m6rx77986"; depends=[igraph shiny]; };
   igraphtosonia = derive2 { name="igraphtosonia"; version="1.0"; sha256="0vy9jnpjp68l8s0hi1l57j9p41c543h3iqv16pwl550f38zqp8j6"; depends=[igraph]; };
   iheatmapr = derive2 { name="iheatmapr"; version="0.4.8"; sha256="0rypfhr05x3yqaywpkkd2mjn1vwbj6hw7v8nkwm2mbff9z87aam7"; depends=[fastcluster ggdendro htmlwidgets jsonlite knitr magrittr plyr RColorBrewer S4Vectors scales]; };
+  ihpdr = derive2 { name="ihpdr"; version="1.0.0"; sha256="1z1cz6md8vzli1115q0qjcw6xiy485nkxawx0xwnzg07mwbqp2d4"; depends=[dplyr httr lubridate magrittr purrr readxl rlang rvest tidyr xml2]; };
   ihs = derive2 { name="ihs"; version="1.0"; sha256="1c5c9l6kdalympb19nlgz1r9zq17575ivp3zrayb9p6w3fn2i06h"; depends=[maxLik]; };
   iilasso = derive2 { name="iilasso"; version="0.0.2"; sha256="043m1n5840459zsknkb54801apb0a2cqfprncmj2wp235rbqj832"; depends=[BH Matrix Rcpp]; };
-  ijtiff = derive2 { name="ijtiff"; version="2.0.2"; sha256="0i1bs5pns83r1f97ypr0xbq4z7kwgldkaff2iwvqrnalj0rgfm8b"; depends=[checkmate dplyr filesstrings fs glue magrittr purrr Rcpp readr rlang stringr withr]; };
+  ijtiff = derive2 { name="ijtiff"; version="2.0.3"; sha256="1zgjfc5vyz56cx63j28jkjxgl6y6q8n5f0mbkji6gr15p5f2hrls"; depends=[checkmate dplyr filesstrings fs glue magrittr purrr Rcpp readr rlang stringr withr]; };
   iki_dataclim = derive2 { name="iki.dataclim"; version="1.0"; sha256="1yhvgr8d3j2r8y9c02rzcg80bz4cx58kzybm4rch78m0207wqs7p"; depends=[climdex_pcic lubridate PCICt zoo]; };
   ilc = derive2 { name="ilc"; version="1.0"; sha256="0hs0nxv7cd300mfxscgvcjag9f2igispcskfknb7sn7p8qvwr5ki"; depends=[date demography forecast rainbow survival]; };
   imageData = derive2 { name="imageData"; version="0.1-59"; sha256="096y589r1mrbvzax5i7sdczkl613kyn8g93qcddqb6jjljw03qmi"; depends=[dae GGally ggplot2 Hmisc RColorBrewer reshape XLConnect]; };
+  imagefluency = derive2 { name="imagefluency"; version="0.2.1"; sha256="1hb38gv8bj9fshcwp0vjqh29pi0ynmh4hj4hf3izrgqiiy42hvxf"; depends=[magick OpenImageR pracma quadprog R_utils readbitmap]; };
+  imagefx = derive2 { name="imagefx"; version="0.2.0"; sha256="0yvmxshc35y8gmwvwwj46g9rni53rv2k68gg3rw6qjzja8r4njls"; depends=[moments]; };
   imager = derive2 { name="imager"; version="0.41.2"; sha256="19fqgjhg04garbipx20g72h9dd6k0jj4ac48nby6km4h665vrs4v"; depends=[Cairo downloader igraph jpeg magrittr plyr png purrr Rcpp readbitmap stringr]; };
   imagerExtra = derive2 { name="imagerExtra"; version="1.3.2"; sha256="1f6mxfn7am4ph9acbbx53r4bk4vsm73p7arh8rvrsic9pgma3gqf"; depends=[fftwtools imager magrittr Rcpp]; };
   imageviewer = derive2 { name="imageviewer"; version="0.1.0"; sha256="1rsrwy5v0gnsmbay1zqijhvll2l1bs844m52w65588j9nlx4fci9"; depends=[htmlwidgets]; };
@@ -8635,14 +8813,17 @@ in with self; {
   imgpalr = derive2 { name="imgpalr"; version="0.2.1"; sha256="0ppzk0rza1rbaz69i8rxjmj7j1q26q75cn2yim8ji31j5hknqj23"; depends=[downloader dplyr jpeg magrittr tibble]; };
   imgrec = derive2 { name="imgrec"; version="0.1.0"; sha256="1v4q2hxil7f0jnj4nql44d9dssh8kz1mnj8ah5slndnn1fbymy8f"; depends=[base64enc dplyr httr jsonlite knitr rlang]; };
   imguR = derive2 { name="imguR"; version="1.0.3"; sha256="14f7ghgc8rbrpqb21rinfbrj1wh80i6ii0awwi814152v5qzj4b3"; depends=[httr jpeg png]; };
-  imgw = derive2 { name="imgw"; version="0.1.0"; sha256="1x9di7imfk5mrwx19j3xjsanykdng5w9w2dpk3xfkwzvvqyrlpg1"; depends=[RCurl XML]; };
+  imgw = derive2 { name="imgw"; version="0.2.0"; sha256="00zkjxqnw1zwcpj8mmdw1ydpcq0sbhs54ismm1i8r6ymb13j5fgj"; depends=[RCurl XML]; };
   iml = derive2 { name="iml"; version="0.9.0"; sha256="15rv943q1kqilsr1h0pkm2gci1cl7775xma4swjfmbqmdc6acjq0"; depends=[checkmate data_table foreach Formula ggplot2 glmnet gridExtra Metrics partykit prediction R6 yaImpute]; };
   immer = derive2 { name="immer"; version="1.1-35"; sha256="1nmf9wxxyq3p8b5kikpsr8b0v4s84zjpahg1rxvcrhc8blg26hjq"; depends=[CDM coda MASS psychotools Rcpp RcppArmadillo sirt TAM]; };
-  imp4p = derive2 { name="imp4p"; version="0.7"; sha256="1hpxx1jpwd4v19xnpjjbwcvfzvb63jfd0jq3vcq000w7am9pwwba"; depends=[Iso norm Rcpp truncnorm]; };
+  immuneSIM = derive2 { name="immuneSIM"; version="0.8.7"; sha256="0brj12xnkzmn3n91vb39fq3q68wmzmwx9l38dl38yypp0l8pknjl"; depends=[Biostrings data_table ggplot2 ggthemes igraph Metrics plyr poweRlaw RColorBrewer repmis reshape2 stringdist stringr]; };
+  imp4p = derive2 { name="imp4p"; version="0.8"; sha256="0k126zp38n1bw3q0b77smr6plpcim87i66amvwbv61w84ansgbv6"; depends=[Iso norm Rcpp truncnorm]; };
   impimp = derive2 { name="impimp"; version="0.3.1"; sha256="0xkxph4f1rcpkryx9v339bfbsnq3xwdj1flb4j2dgh99apj126sq"; depends=[]; };
+  implicitMeasures = derive2 { name="implicitMeasures"; version="0.1.0"; sha256="0j0mzsfli9m063nmy547jcwrzbdqs3m06k9jj4bjn8fdv45pabzk"; depends=[dplyr ggplot2 plyr qpdf tidyr xtable]; };
   implyr = derive2 { name="implyr"; version="0.3.0"; sha256="1i0m95azyi46wnh59dcs52l78i1yqy677rlr4b6c0r945m67advn"; depends=[assertthat DBI dbplyr dplyr rlang tidyselect]; };
   r_import = derive2 { name="r_import"; version="1.1.0"; sha256="0blf9539rbfwcmw8zsb4k58slb4pdnc075v34vmyjw752fznhcji"; depends=[]; };
   importar = derive2 { name="importar"; version="0.1.1"; sha256="0xv445fmjhsbdlsq03k2rlycnggn3rcyq5a49zrg4jvjamzr0rgr"; depends=[]; };
+  importinegi = derive2 { name="importinegi"; version="1.0.0"; sha256="0rlnvc2m0cy5jqvylfbgg31dxpdsd37ca1bcpwcpgwcx3d3l373j"; depends=[data_table dplyr foreign haven rgdal]; };
   imprProbEst = derive2 { name="imprProbEst"; version="1.0.1"; sha256="09y8yd9sw0b79ca45ryi7p82vy5s8cx0gg603rlc39lgwcdv45i3"; depends=[inline lpSolve]; };
   imptree = derive2 { name="imptree"; version="0.5.1"; sha256="0f087000092ydnpj3ch4mbip8wp32scn8xw4vlkq5lf6130gfs1b"; depends=[Rcpp]; };
   imputeLCMD = derive2 { name="imputeLCMD"; version="2.0"; sha256="10v3iv1iw6mnss6ry836crq9zdgid2y1h3pvigzjsrmnp5n89mfz"; depends=[impute norm pcaMethods tmvtnorm]; };
@@ -8661,7 +8842,7 @@ in with self; {
   inarmix = derive2 { name="inarmix"; version="0.4"; sha256="11a1vaxq22d5lab07jp5pw0znkaqj6bmkn6vsx62y6m4mmqk04yr"; depends=[Matrix Rcpp]; };
   inbreedR = derive2 { name="inbreedR"; version="0.3.2"; sha256="09fr13ckyn2skiigkn4qdx5g080gcmyyrvzhcp0wrml9wpmy0h4z"; depends=[data_table]; };
   incR = derive2 { name="incR"; version="1.1.0"; sha256="0q41bs7pf6hqyfwvcwc2sxq44jq95qq3qsddz53f8gphwjsyf1v7"; depends=[dplyr ggplot2 lubridate maptools rgeos]; };
-  inca = derive2 { name="inca"; version="0.0.3"; sha256="1g9js84xa5b6jl8gp4k0c55kjazfaw5g9biwk4v6vz3vwkwayyzh"; depends=[Matrix Rcpp RcppArmadillo]; };
+  inca = derive2 { name="inca"; version="0.0.4"; sha256="1r3niibd6pja59am8in9gpyvxi2g5bh8bqqhdixzwaj3xzyyipii"; depends=[Matrix Rcpp RcppArmadillo]; };
   incadata = derive2 { name="incadata"; version="0.8.2"; sha256="1ayr7krqcs25b5zg80m2s4g3pdasfaj2qfdnjp871im5i6bplai5"; depends=[backports decoder dplyr rvest sweidnumbr xml2]; };
   incgraph = derive2 { name="incgraph"; version="1.0.1"; sha256="0zjvxk2krdlm5bcr0m80nxy46f69a1xadfjw5sjw249b28wdclml"; depends=[BH dplyr orca purrr Rcpp testthat tibble]; };
   incidence = derive2 { name="incidence"; version="1.7.0"; sha256="1ljn9phxsf47qp12xv1ly76lm4gcqfnhrisx4sy9f6pz5rx6k5s3"; depends=[aweek ggplot2]; };
@@ -8671,7 +8852,8 @@ in with self; {
   indirect = derive2 { name="indirect"; version="0.2.0"; sha256="1k7xwsx655nzl43s1mkaysyn5gydq973gynmqip67lssnm7cnch4"; depends=[gplots MASS]; };
   inegiR = derive2 { name="inegiR"; version="3.0.0"; sha256="1rhkdmpz7mxi7ddyygss5rlh3c8hgxhzdk3fnvnlizc1l55cc6c0"; depends=[jsonlite lubridate plyr tibbletime XML zoo]; };
   ineq = derive2 { name="ineq"; version="0.2-13"; sha256="09fsxyrh0j7mwmb5hkhmrzgcy7kf85jxkh7zlwpgqgcsyl1n91z0"; depends=[]; };
-  infer = derive2 { name="infer"; version="0.4.0.1"; sha256="0klb1zvmr8fplby8799yca1k6bs3dmacxm1sa0jja9ar23kcq09n"; depends=[dplyr ggplot2 glue magrittr rlang tibble]; };
+  ineqJD = derive2 { name="ineqJD"; version="1.0"; sha256="0anv384jwzn5gkc0jqsl81bkmrjd21br99c5q30xd6ncxavj4s57"; depends=[]; };
+  infer = derive2 { name="infer"; version="0.5.0"; sha256="05h793inpvpi0nijkz9afny00l3mjwws3392hzg9fhvqjf3xddik"; depends=[dplyr ggplot2 glue magrittr purrr rlang tibble]; };
   inference = derive2 { name="inference"; version="0.1.0"; sha256="0j92isfkbhk13yx2hd3a5dd7ikcbgjc04zisd1n5kmg6ajw2aj6r"; depends=[sandwich]; };
   inferference = derive2 { name="inferference"; version="1.0.0"; sha256="1x6i8ycba9z57m1n143p1j9pmlfrhjhi4iw0fsny8xmcvqrlr85p"; depends=[Formula lme4 numDeriv]; };
   inferr = derive2 { name="inferr"; version="0.3.0"; sha256="1z5bfq0gv1h6iw8nwc19ar6f2sgsvgs3ghq52s09wclqk2yy4azz"; depends=[dplyr magrittr purrr Rcpp rlang shiny tibble tidyr]; };
@@ -8687,19 +8869,19 @@ in with self; {
   infra = derive2 { name="infra"; version="0.1.2"; sha256="0jycnnmrrjq37lv67xbvh6p63d6l4vbgf3i1z9y7r75d6asspzn1"; depends=[]; };
   infraFDTD_assist = derive2 { name="infraFDTD.assist"; version="0.6"; sha256="04j5nl5vxk79iciz6s9bpiyn319c2dbh7fdahgwira2r30w2fxv9"; depends=[fields]; };
   infutil = derive2 { name="infutil"; version="1.0"; sha256="02d0hfbkdqjj0lm1fzwwxy60831kbcjn2m4rfblpib0krkbpz72n"; depends=[ltm]; };
-  ingredients = derive2 { name="ingredients"; version="0.3.3"; sha256="18ylrdadl1c67aqdgzm687a4203yd1sf3q1dwwmj57370gvvf3ca"; depends=[DALEX ggplot2 scales]; };
+  ingredients = derive2 { name="ingredients"; version="0.3.9"; sha256="1w6hz0wjas3p5qkn21wksp8m1rmmpfihjs3gfqajm182y3yrcyyz"; depends=[DALEX ggplot2 glmnet scales]; };
   ini = derive2 { name="ini"; version="0.3.1"; sha256="04yqij344dwm0xqgara8xia42mlmij3i8711qbb5534w05a1l6bv"; depends=[]; };
   injectoR = derive2 { name="injectoR"; version="0.2.4"; sha256="0sa32cspp6y3m04yfmd02kxx55mk7l9jxf4r9pk1a6k3sqnj6fl8"; depends=[]; };
   inlabru = derive2 { name="inlabru"; version="2.1.12"; sha256="0ry32hsf9f4hd1jka51d7jbxlalhknwnc3zj9i9bggx38bb9w9fg"; depends=[ggplot2 Matrix rgdal rgeos sp]; };
   inline = derive2 { name="inline"; version="0.3.15"; sha256="0s4wssvpan189fijahknxq5s22ww9bzmdlmyhnra748r7khky17z"; depends=[]; };
-  inlmisc = derive2 { name="inlmisc"; version="0.4.5"; sha256="1mvxdci27ngpmi4s7hi1dvljdzambfd82izgg6q5xhn9bgmc7bw2"; depends=[checkmate data_table GA htmltools htmlwidgets igraph knitr leaflet raster rgdal rgeos scales sp xtable]; };
+  inlmisc = derive2 { name="inlmisc"; version="0.4.8"; sha256="1zgpc4rfbx7l4hlaav3fyl68gd7xj8ff2fj1k4xy98jafi9j86mg"; depends=[checkmate data_table GA htmltools htmlwidgets igraph knitr leaflet raster rgdal rgeos rmarkdown scales sp tinytex xtable yaml]; };
   inpdfr = derive2 { name="inpdfr"; version="0.1.8"; sha256="1xscrqkwl15l5r1sik6mnhzl868s9yxscm74sp740n3107md92hx"; depends=[ca cluster entropart metacom R_devices RColorBrewer SnowballC stringi tm wordcloud]; };
   inplace = derive2 { name="inplace"; version="0.1.0"; sha256="1lmvfjxgficlzxbn953wvfa1n9lys9gqprix6zbqqr4d6vkm0srj"; depends=[Rcpp]; };
   insect = derive2 { name="insect"; version="1.2.0"; sha256="0lbck8jbhymzkhm1iqd2y2xg8a26yjizw7x31b1l1kqc1l0p3kmv"; depends=[ape aphid kmer openssl phylogram RANN seqinr xml2]; };
   insideRODE = derive2 { name="insideRODE"; version="2.0"; sha256="1ffndk8761cpkririb3g1qsq9nwmh82lcrpql9i5fksdprvdjzcw"; depends=[deSolve lattice nlme]; };
-  insight = derive2 { name="insight"; version="0.4.1"; sha256="1lw1r3mb97z5p9z25jfzlhs0sbnwp6v8kzysf0am01x4m7l3iz82"; depends=[]; };
+  insight = derive2 { name="insight"; version="0.5.0"; sha256="0lrh2l9n2zd9n3zzknsxz6nlasnrayx3bplxlz7m616g56gr5nfp"; depends=[]; };
   insol = derive2 { name="insol"; version="1.2"; sha256="14ikz05375pjn9hby7kwkhcnykjilbnkdy5i8lsl7c5qdbhmqcm5"; depends=[raster rgdal]; };
-  inspectdf = derive2 { name="inspectdf"; version="0.0.4"; sha256="0ydhh4nilmvf1gfba9cv7sgpvw60krqy2xk1p76d2vh0rzx8sacd"; depends=[dplyr ggfittext ggplot2 magrittr progress Rcpp tibble tidyr]; };
+  inspectdf = derive2 { name="inspectdf"; version="0.0.6"; sha256="1073yw26178f9ndx62wgqipim1irrdavka0p86m9c2q54cm13w1s"; depends=[dplyr ggfittext ggplot2 magrittr progress Rcpp tibble tidyr]; };
   inspectr = derive2 { name="inspectr"; version="1.0.0"; sha256="04rpr5ajpdx1d49y327dryxwxk27yljj4c96i9qglf02i9kmplkg"; depends=[openxlsx]; };
   instaR = derive2 { name="instaR"; version="0.2.4"; sha256="0c4m471ragkpksr0h21cdgnjxcknf01xqz543dahxgzjg9ncjwhg"; depends=[httr jsonlite]; };
   install_load = derive2 { name="install.load"; version="1.2.1"; sha256="148q0rjal5hfcb8ilxzd1bz38mn8vxqrsfg5x4jy48psk00fk3d9"; depends=[]; };
@@ -8724,6 +8906,7 @@ in with self; {
   interfr = derive2 { name="interfr"; version="0.1.0"; sha256="1wn7i8dsll1qq3v39hgpbqnkjc8f4wlffy73453rw9lpq61y2fgj"; depends=[CircStats colorSpec plotrix]; };
   intergraph = derive2 { name="intergraph"; version="2.0-2"; sha256="1ipxdrfxhcxhcbqvrzqh3impwk4xryqlqlgjl7f2mwrf365zs6ph"; depends=[igraph network]; };
   interim = derive2 { name="interim"; version="0.8.0"; sha256="1hcq1cx6fv4ivvyd3ww3gsbw12g6rw83qqqbrcgzlnjl1q0jh3nf"; depends=[]; };
+  interimApp = derive2 { name="interimApp"; version="0.0.1"; sha256="1g2f1plsgzqf277jy2afhchjlcamr9znm02rj4rvky7nnp63gph0"; depends=[interim shiny shinyBS]; };
   interlineaR = derive2 { name="interlineaR"; version="1.0"; sha256="0y1ym6iwly8sv94pdzwv2qy1g7z4hpqlrbcrpb1ds5a62a6axqj5"; depends=[reshape2 xml2]; };
   internetarchive = derive2 { name="internetarchive"; version="0.1.6"; sha256="1cx9dxlrdz1xak4jrrjs2wsq6ml8n2xl0n0s6n9h3g247j4lfvnm"; depends=[dplyr httr]; };
   interp = derive2 { name="interp"; version="1.0-32"; sha256="10ccsyz9wy31mdf58g7drifnb2zpbzcpk6pbffqxa6b0yxrmfwsa"; depends=[deldir Rcpp RcppEigen]; };
@@ -8739,6 +8922,7 @@ in with self; {
   introgress = derive2 { name="introgress"; version="1.2.3"; sha256="1j527gf7pmfy5365p2j2jbxq0fb0xh2992hj4d7dxapn4psgmvsk"; depends=[genetics nnet RColorBrewer]; };
   intrval = derive2 { name="intrval"; version="0.1-1"; sha256="1p66cjpn43xib7rrnyv3jqr6bb49d3dxf888p8hxnr7kx9wfalkn"; depends=[]; };
   intsurv = derive2 { name="intsurv"; version="0.2.0"; sha256="1y6q7jyb5f01w3z7slwlpjz89m4vl77jg1pw4lab8q0aw27kfrfd"; depends=[Rcpp RcppArmadillo]; };
+  intsurvbin = derive2 { name="intsurvbin"; version="0.0.4"; sha256="119zjn1agl2j4fj4yg1pq1sqskzw93xfzppmc5n1x8llmfbxkqsj"; depends=[mgcv MHadaptive msm mvtnorm tmvtnorm]; };
   intsvy = derive2 { name="intsvy"; version="2.4"; sha256="19anm90rqhvdv0fsr2hbzkwsr3zc7pimq4gcg2mgj06gxqbwhym7"; depends=[foreign ggplot2 Hmisc memisc plyr reshape]; };
   intubate = derive2 { name="intubate"; version="1.0.0"; sha256="03ikqwai7wdahdfyzdy42xs8qpdhl9gmbak2qd82yxjl62956i8c"; depends=[]; };
   inum = derive2 { name="inum"; version="1.0-1"; sha256="16d09391l65w557dkzhhx1aqn1ljamcmjj3yh42pwq037k0r8brw"; depends=[libcoin]; };
@@ -8746,6 +8930,7 @@ in with self; {
   invLT = derive2 { name="invLT"; version="0.2.1"; sha256="0dcr2cclgzkvsw1lysmjrkwgahas96rjc328yc7a1a56pf62kw2v"; depends=[]; };
   invctr = derive2 { name="invctr"; version="0.1.0"; sha256="0jrbr53kvwrf800z18vz9df9bk7swpd4avnyf59ggz2bc0z2ijwk"; depends=[plyr rlang]; };
   inventorize = derive2 { name="inventorize"; version="1.0.2"; sha256="14pdmqp4h5041gn18wl5imsj4nha6n0wxnjmfbiry3n1lz4id584"; depends=[dplyr ggplot2 magrittr plyr]; };
+  inverseRegex = derive2 { name="inverseRegex"; version="0.1.0"; sha256="1wk3ac2rfy0m8442sa2m75s6l3wadx4d4cwas6c8n2xqkrphci87"; depends=[]; };
   investr = derive2 { name="investr"; version="1.4.0"; sha256="0l47bfwxssfr3maprkpwnmgxnxccl3ch4grc7f968iiqk83mcxw9"; depends=[nlme]; };
   invgamma = derive2 { name="invgamma"; version="1.1"; sha256="12ga2y4wc9bc5zz6vimvxwgjpsx3ys3209nq63gscbw559ydxa5a"; depends=[]; };
   io = derive2 { name="io"; version="0.3.0"; sha256="16mnbxq217ixfg2qfqrj97qqfpc5dj622hf80nwray6hp47lbw2s"; depends=[filenamer stringr]; };
@@ -8764,6 +8949,7 @@ in with self; {
   ipeadatar = derive2 { name="ipeadatar"; version="0.1.0"; sha256="1qg67xmp9x5yv1gm0k6czycg89rpfa8cscrihmqibhscp5dansnj"; depends=[curl dplyr jsonlite lubridate magrittr purrr sjlabelled]; };
   ipflasso = derive2 { name="ipflasso"; version="0.2"; sha256="1awwwycad7bvpnnla5v5aqjqisxwc0wmc6wvs3k2gr4hcrkkcbcw"; depends=[glmnet survival]; };
   ipfp = derive2 { name="ipfp"; version="1.0.1"; sha256="12aklhf9p70r9b2wi0qgbl835b4lil805c31n1ka4kdix4b4cpr4"; depends=[]; };
+  ipfr = derive2 { name="ipfr"; version="1.0.0"; sha256="1rfzpssjb3mnky03zhzgah0h1fccda0aq8idpg22pxf4sk09pg9p"; depends=[dplyr ggplot2 magrittr mlr tidyr]; };
   ipft = derive2 { name="ipft"; version="0.7.2"; sha256="0jifmkwac5yfl110200ljm3pas3321j068af9xqzqs0av20m8hps"; depends=[apcluster cluster dplyr ggplot2 Rcpp]; };
   iplots = derive2 { name="iplots"; version="1.1-7.1"; sha256="1bz8n9cnx6zy3wsr49h55r0l5ikfl0xjg4r76fi4giid2a3ba4lf"; depends=[png rJava]; };
   ipptoolbox = derive2 { name="ipptoolbox"; version="1.2"; sha256="0scbny4crgr23qcp0vgsxhwmj5g5q5c1c4mb5mmb5njyvc34s01l"; depends=[AlgDesign copula evd kolmim triangle]; };
@@ -8781,11 +8967,14 @@ in with self; {
   irg = derive2 { name="irg"; version="0.1.1"; sha256="0g5rhahiq2k269n8ip4yj6ncra07j7flraphzxmis931sfpdsvam"; depends=[data_table RcppRoll]; };
   irlba = derive2 { name="irlba"; version="2.3.3"; sha256="1h7mzrqdjc41814cf6c93sbyl7nxwvsf3x8apl9rhmydgdlk7qkf"; depends=[Matrix]; };
   irr = derive2 { name="irr"; version="0.84.1"; sha256="1hs4ylqm51smrmgsph7z9arwkz5px2a320acar324fkjdd3yifp7"; depends=[lpSolve]; };
+  irrCAC = derive2 { name="irrCAC"; version="1.0"; sha256="1j9z8vz5zcl51a8qq6maf9sw0dqaknkrai7gp31mzag7b6vwms06"; depends=[]; };
+  irrICC = derive2 { name="irrICC"; version="1.0"; sha256="0vi5g97kbyhwxz242d1hpqf11izd3kmlzh3997v07md1llcsp6s3"; depends=[]; };
   irrNA = derive2 { name="irrNA"; version="0.1.4"; sha256="1i7s4c285dw1s2kiq01a81cfpd2v40y26yklr06xlmqp28iwslbr"; depends=[irr]; };
   irregulAR1 = derive2 { name="irregulAR1"; version="1.0.0"; sha256="0pccasqcya99j4n0qdcjjnvmigj53axji9ddxbpmrgvzsyamb8ja"; depends=[Matrix Rcpp RcppArmadillo]; };
   irtDemo = derive2 { name="irtDemo"; version="0.1.4"; sha256="0rpwryybnj7b4bxn0mn1m496y85s2fpqdd78lmdl6jg1ck4j4pb3"; depends=[fGarch shiny]; };
   irtProb = derive2 { name="irtProb"; version="1.2"; sha256="12wnvbzkh0mx9i3iyh1v2n2f2wjsjj7ad3dgv9xj949x4nbz16j0"; depends=[lattice moments]; };
   irtoys = derive2 { name="irtoys"; version="0.2.1"; sha256="0h6iiaxikhbxhbyksbjnb09qdxinlkwr2v9yzs5wslbni14paq5q"; depends=[ltm sm]; };
+  irtplay = derive2 { name="irtplay"; version="1.1.0"; sha256="0wln9fw36j659k8dvk0kq63nhi39nxbsaym79wrfk0xl56c76ln3"; depends=[dplyr ggplot2 gridExtra pbapply purrr reshape2 rlang statmod tidyr]; };
   irtrees = derive2 { name="irtrees"; version="0.1.0"; sha256="03jmfyx1ia987zhi74fmmcdz70wnm8c7z5z30rwzd1cs11dijjwv"; depends=[]; };
   irtreliability = derive2 { name="irtreliability"; version="0.1-1"; sha256="15qs8bvgrwajj5kfd57rd34l1p2805ilyd7w60ngrqc14d6az9d2"; depends=[fastGHQuad ltm mirt]; };
   isa2 = derive2 { name="isa2"; version="0.3.5"; sha256="17vm0906szhrh2k5x694vwcfijbzmd1v3axpszfybc0lgds437cv"; depends=[lattice]; };
@@ -8805,7 +8994,7 @@ in with self; {
   isoph = derive2 { name="isoph"; version="1.1.3"; sha256="0905qw3aa7l09ljzm4q78pgy1z8kzv0jzhxa49293z9jy6g3x0mm"; depends=[Iso survival]; };
   isotone = derive2 { name="isotone"; version="1.1-0"; sha256="0alk0cma5h3yn4w2nqcahprijsm89b0gby9najbngzi5vnxr6nvn"; depends=[nnls]; };
   isotonic_pen = derive2 { name="isotonic.pen"; version="1.0"; sha256="1lgw15df08f4dhrjjfr0jqkcvxwad92kflj2px526pcxwkj7cj3i"; depends=[coneproj Matrix]; };
-  ispd = derive2 { name="ispd"; version="0.1"; sha256="0dq7dkb2bvrw0yxh2i19ncjim641rqyph9kq9np00wsb3aiz1559"; depends=[ibd]; };
+  ispd = derive2 { name="ispd"; version="0.2"; sha256="06h4z342d17rkpr2wwck4sq79kprdq6fgqf10jg8cs1f52q6pq0h"; depends=[ibd]; };
   isqg = derive2 { name="isqg"; version="1.2"; sha256="1g4nwngljx6sp2k29pn2v8zgp2nh61w75bg36ihlq093hiq6w7gd"; depends=[BH R6 Rcpp]; };
   istacr = derive2 { name="istacr"; version="0.1.0"; sha256="0vzf4zvh4qk7nflndmicz510859hh6sxwh0agwzygg80pbdrf02c"; depends=[curl jsonlite]; };
   isva = derive2 { name="isva"; version="1.9"; sha256="05qx9q0kg4ma23v4abhihw0vz017nq6hv2jzsiqx4d20ngh1dl4z"; depends=[fastICA JADE qvalue]; };
@@ -8838,6 +9027,7 @@ in with self; {
   jSonarR = derive2 { name="jSonarR"; version="1.1.1"; sha256="054q3ly471xa64yyz2as6vkr440ip1y8n5wl6s3zbhqy3bqkdqif"; depends=[jsonlite RCurl]; };
   jaatha = derive2 { name="jaatha"; version="3.2.1"; sha256="0zqvylknvymggw5jl40cfyahfjy64wb25f0qymh78xbamv1hc85w"; depends=[assertthat R6]; };
   jaccard = derive2 { name="jaccard"; version="0.1.0"; sha256="1dmla6qc1k8iw2d7zfjqhf13gqd2lpsrj09yh47ljf994fpab936"; depends=[dplyr magrittr qvalue Rcpp]; };
+  jack = derive2 { name="jack"; version="1.1.1"; sha256="1mp7cfmh3bzfansb3dyqq347qk6kkf4ndn23pbd78h1xcb54555b"; depends=[DescTools gmp multicool mvp partitions]; };
   jackalope = derive2 { name="jackalope"; version="0.1.2"; sha256="0mjlilsjh8y3rwskqa1xqhdz4f2za1a25jvhl4d3j54rc6ldkj0k"; depends=[ape R6 Rcpp RcppArmadillo RcppProgress Rhtslib zlibbioc]; };
   jackknifeKME = derive2 { name="jackknifeKME"; version="1.2"; sha256="0c5shl6s46kz7a623gccqk2plrrf2g29nwr6vbny6009pq3jvzam"; depends=[imputeYn]; };
   jackstraw = derive2 { name="jackstraw"; version="1.3"; sha256="02qcaf2p0fyni6n2zhd7vp65kniz74di0pf5jzz79jwj15cfd1b0"; depends=[cluster ClusterR corpcor irlba lfa qvalue rsvd]; };
@@ -8847,7 +9037,7 @@ in with self; {
   james_analysis = derive2 { name="james.analysis"; version="1.0.1"; sha256="1b2n4ds4ivfk564z87s2rxjl9j0y4drd3cmyv8jqpccmdvx1137d"; depends=[naturalsort rjson]; };
   janeaustenr = derive2 { name="janeaustenr"; version="0.1.5"; sha256="1wyn4qc28a3sval8shmyi2d7s4nl3jh96s8pzq871brxcmrncbwr"; depends=[]; };
   janitor = derive2 { name="janitor"; version="1.2.0"; sha256="131bld44bkjahpby0aqscl9sh1abc31dx2822vbdvib55hls45ay"; depends=[dplyr magrittr purrr rlang snakecase tidyr]; };
-  jaod = derive2 { name="jaod"; version="0.1.0"; sha256="0wh1nlfhks4c1dga6h7554pg44pamj73x5in71k2xw0yp292zm6x"; depends=[crul jsonlite tibble]; };
+  jaod = derive2 { name="jaod"; version="0.2.0"; sha256="0cphwfmv5pbkf9hvz9w25gncldycgdfxmg6ajbvj9mdl46z3jddw"; depends=[crul jsonlite tibble]; };
   jarbes = derive2 { name="jarbes"; version="1.7.2"; sha256="0qjnx0m65f6a8r6y5mwplaq518lrsf73k8zbf728v857nbjlhf2l"; depends=[ggExtra ggplot2 gridExtra MASS mcmcplots R2jags rjags]; };
   jcext = derive2 { name="jcext"; version="0.1.1"; sha256="02zppiyq3gy551zi1g00gam1w4y1wgzn5zi9wrcz8yw915dla0ix"; depends=[ggplot2 maps RColorBrewer rworldmap sp stringr]; };
   jcolors = derive2 { name="jcolors"; version="0.0.4"; sha256="18dmjcrci0z1xy2kglrarzm0idr9g3nhbbw7f1ijls3i0piqdri6"; depends=[ggplot2 scales]; };
@@ -8867,17 +9057,17 @@ in with self; {
   jmdl = derive2 { name="jmdl"; version="0.3.0"; sha256="0167yj368lh1n79jwbqs4g2asb67hfmgh97519linmfpx0n6xdpa"; depends=[boot Formula MASS minqa mnormt mvtnorm]; };
   jmetrik = derive2 { name="jmetrik"; version="1.1"; sha256="1if1kxx8apgkbxpkjnlj2lpsfnyj2splsg1p3j5vxa7q6wx70f9j"; depends=[]; };
   jmotif = derive2 { name="jmotif"; version="1.0.3"; sha256="1llmrksajrd35kfdzq2vqfm17yv5kwark6gz3rvyzcmbrqk5spqv"; depends=[Rcpp RcppArmadillo]; };
-  jmuOutlier = derive2 { name="jmuOutlier"; version="2.1"; sha256="0nmaxmqx0h7qmv0cl0j51945glxvchlvvbj58i90gds61fngi5wh"; depends=[]; };
+  jmuOutlier = derive2 { name="jmuOutlier"; version="2.2"; sha256="1vj9n1hsf780f7l0a22kmi3qm84j4dzjybjkh5zwh6bhwfjnjws3"; depends=[]; };
   jmv = derive2 { name="jmv"; version="0.9.6.1"; sha256="10b59415wb48k2wv2n74v89acgj843qk4pp0jkpns6nhymw41m0q"; depends=[afex BayesFactor car emmeans GGally ggplot2 ggridges GPArotation jmvcore lavaan MASS multcomp mvnormtest nnet PMCMR psych R6 ROCR vcd vcdExtra]; };
-  jmvconnect = derive2 { name="jmvconnect"; version="1.0.8"; sha256="0r2idgvhhz2dqh3svc4l8is29h4zwl0qicv8961v646c8k1pdl0i"; depends=[BH evaluate httr jmvcore rappdirs Rcpp]; };
+  jmvconnect = derive2 { name="jmvconnect"; version="1.0.9"; sha256="1x74zwnp3cdwqsv7djnqcv6k0nrf7v7ng6pk79lzninbssm24sr1"; depends=[BH evaluate httr jmvcore rappdirs Rcpp]; };
   jmvcore = derive2 { name="jmvcore"; version="1.0.0"; sha256="1agwzmd24b22x303dpmb5qjbzsrxp287n52c7iavzx42sfishayi"; depends=[base64enc R6 rjson rlang stringi]; };
   jocre = derive2 { name="jocre"; version="0.3.3"; sha256="1i9n3r16pq6r4sy3fc1rxpil5ws8v2is0xdxafinvwr1hzkv1gz6"; depends=[boot KernSmooth plyr TSP]; };
   joinXL = derive2 { name="joinXL"; version="1.0.1"; sha256="1l76bckjz5r1kdsh0s10i0gpca12rkfkp14346fn7avdcw73v23i"; depends=[data_table openxlsx R_utils rChoiceDialogs Rcpp readxl rJava timeDate timeSeries]; };
   joineR = derive2 { name="joineR"; version="1.2.4"; sha256="05wr7gr3mnsfj8a1m5v1b71gh3fc4pyhj6rqapls7iwrkywbf1b6"; depends=[lattice MASS nlme statmod survival]; };
   joineRML = derive2 { name="joineRML"; version="0.4.2"; sha256="06a7iicq3fngsmmi8qcz2fdzdzvym5s70s3aaqlzxnl4sj9km3g2"; depends=[cobs doParallel foreach ggplot2 lme4 MASS Matrix mvtnorm nlme randtoolbox Rcpp RcppArmadillo survival]; };
   joineRmeta = derive2 { name="joineRmeta"; version="0.1.1"; sha256="0d9wwb3v43v30xjy67j366mhwixzz79bm67j01fqmcdsnmn3qpjn"; depends=[ggplot2 gridExtra gtools JM joineR lme4 MASS Matrix meta msm nlme statmod survival]; };
-  joinet = derive2 { name="joinet"; version="0.0.1"; sha256="0yljnyfba49pzayhlq7ksfbkyx30r6ychky79041g57bdil85ywj"; depends=[cornet glmnet palasso]; };
-  joint_Cox = derive2 { name="joint.Cox"; version="3.4"; sha256="0xq7rvqbc6mrxpn90a7wid4kx5fhq42mynsxnhdnppwshb9zr46y"; depends=[survival]; };
+  joinet = derive2 { name="joinet"; version="0.0.2"; sha256="16jzx1jdxig6i5qq313n261h0mnq3jyzr8dcxzpkdq2ckxqr9gbi"; depends=[cornet glmnet palasso]; };
+  joint_Cox = derive2 { name="joint.Cox"; version="3.6"; sha256="161szy444p1yg21d9r76s3ibwmni8ydsh8frvwjjy9qp8nzcvqd1"; depends=[survival]; };
   jointDiag = derive2 { name="jointDiag"; version="0.3"; sha256="0pra70jcnkqkzrxz5vc6lzi637rp5w8n9wbv9ix718vnd0j3fm3n"; depends=[]; };
   jointMeanCov = derive2 { name="jointMeanCov"; version="0.1.0"; sha256="1cai5g63n11dirn9fldzkqxcnkxc20ndr9ygrr9rk0s1qz8x63pb"; depends=[glasso]; };
   jointNmix = derive2 { name="jointNmix"; version="1.0"; sha256="0ibh7hqkpzlfk3bk4d2dd64jhr8cvw563k082vwnljiam7k5nj4b"; depends=[]; };
@@ -8890,14 +9080,14 @@ in with self; {
   jpmesh = derive2 { name="jpmesh"; version="1.1.3"; sha256="0ybv19bmrcwzan151p4px0vv6qnaqmk4fgqvqlh4syjnrb6xv0c5"; depends=[leaflet magrittr miniUI purrr rlang sf shiny tibble units]; };
   jpndistrict = derive2 { name="jpndistrict"; version="0.3.4"; sha256="1z1rgqibksxrz0048zk78xlsm595jbm3y6xkrqcifm1xnqgh1fys"; depends=[dplyr jpmesh leaflet magrittr miniUI purrr rlang sf shiny tibble tidyr tidyselect]; };
   jqr = derive2 { name="jqr"; version="1.1.0"; sha256="00x5a61bsn2ywzc2haz19f6h0sqhlx7z3k1n9y0729dwm4id89ms"; depends=[lazyeval magrittr]; };
-  jrc = derive2 { name="jrc"; version="0.1.1"; sha256="0ywvdipbiavaifksy5nmgk9x10p4pxjflgzjzj1igxav3lsh2wpd"; depends=[httpuv jsonlite stringr]; };
+  jrc = derive2 { name="jrc"; version="0.2.0"; sha256="0rz32341najd7jyd8lkjf13g66a0kqdx5xa0a898wpq2g1lxi32c"; depends=[httpuv jsonlite stringi stringr]; };
   jrich = derive2 { name="jrich"; version="0.60-35"; sha256="1y486bfqmfg3f22wm0lfk3lh20ljgi8qrgn5jji0f417wh48nf0x"; depends=[ape]; };
   jrt = derive2 { name="jrt"; version="1.0.1"; sha256="023i0xqz8mhnjnii92vjw64mjnnlf8jaji99i4c2vxcr7m83jm0r"; depends=[directlabels dplyr ggplot2 ggsci irr mirt psych tidyr]; };
   jrvFinance = derive2 { name="jrvFinance"; version="1.4.1"; sha256="1gkivmvc0njm32w7yhbh02h9p212xa3m4cvrwcy7yray8g6phdxp"; depends=[]; };
   js = derive2 { name="js"; version="1.1"; sha256="1xsdr14k4djcd1nqybvfzhviics4igsj8yz3r0j2nqhin2wjynlf"; depends=[V8]; };
   jsTree = derive2 { name="jsTree"; version="1.0.1"; sha256="0n754illyw29bprll676k9qm5vk5h8qss6gb8lls57kdzj51x2jz"; depends=[data_table htmlwidgets jsonlite]; };
-  jskm = derive2 { name="jskm"; version="0.3.5"; sha256="19r1517ismcm5393gi1vwjd32zhgwk65zr3ghaxrn1br6sgdy57s"; depends=[ggplot2 gridExtra plyr scales survey survival]; };
-  jsmodule = derive2 { name="jsmodule"; version="0.9.9"; sha256="1hzw7ib59l4dckmwqf8xv5h34y7xiglg9jll6qv459nqj3nwjyw7"; depends=[data_table devEMF DT epiDisplay geepack GGally ggplot2 haven Hmisc jskm jstable labelled MatchIt maxstat pROC purrr readxl rstudioapi see shiny shinycustomloader shinyWidgets survC1 survey survIDINRI survival tableone timeROC]; };
+  jskm = derive2 { name="jskm"; version="0.3.7"; sha256="006k7prql4i18pbjksy4k16mlv1j288gc9l3b5l5j8m3xh70n8cp"; depends=[ggplot2 gridExtra plyr scales survey survival]; };
+  jsmodule = derive2 { name="jsmodule"; version="1.0.1"; sha256="0sga88gdgn7dnafamnqba6iqlmbwgz0cgk4l17fv17qz1va2lsz7"; depends=[data_table devEMF DT epiDisplay geepack GGally ggplot2 haven Hmisc jskm jstable labelled MatchIt maxstat pROC purrr RColorBrewer readr readxl rstudioapi see shiny shinycustomloader shinyWidgets survC1 survey survIDINRI survival tableone timeROC]; };
   json64 = derive2 { name="json64"; version="0.1.3"; sha256="19q8qgf4wnd3np12ajy180klpjy0g2csw5micwb4sl7qfzl6wc7j"; depends=[jsonlite]; };
   jsonify = derive2 { name="jsonify"; version="0.2.1"; sha256="1jrc7w9i0riy6ls18d127i5ac6wlpc03n01bw74kkrwl4f6f17fn"; depends=[BH rapidjsonr Rcpp]; };
   jsonld = derive2 { name="jsonld"; version="2.1"; sha256="0lp0lp9nbk31dia2nq6xba29ymak9h5wl4zbq4pdqw6qm9iwz6ww"; depends=[curl jsonlite V8]; };
@@ -8905,8 +9095,8 @@ in with self; {
   jsonstat = derive2 { name="jsonstat"; version="0.0.2"; sha256="0p0d3snl1971p5ikrkmwqrjjh4fy0b89qk3rnd1dayfb0r80xnnj"; depends=[cli dplyr jsonlite rlang]; };
   jsonvalidate = derive2 { name="jsonvalidate"; version="1.1.0"; sha256="1vxklvkva547mzbgi7hll46sfx274c6j4m70algygphz783x3dsx"; depends=[V8]; };
   jsr223 = derive2 { name="jsr223"; version="0.3.3"; sha256="0i00nbsj6b4mx9pgp5rana1kj57hi4lz3lsiniv7baz5avmhp65n"; depends=[curl jdx R6 rJava]; };
-  jstable = derive2 { name="jstable"; version="0.8.5"; sha256="00l88jxrrxkp1ijvfswr32xy5sqzqaa8q783layc0jf9b8fgf59z"; depends=[car coxme data_table dplyr geepack labelled lme4 magrittr purrr survey survival tableone tibble]; };
-  jstor = derive2 { name="jstor"; version="0.3.6"; sha256="00sd4mq21al8f8ixgy8f65xbgp90if1jpp7mcm50jrbajdwwflmk"; depends=[cli crayon dplyr furrr magrittr pryr purrr readr rlang stringr tibble tidyr xml2]; };
+  jstable = derive2 { name="jstable"; version="0.8.6"; sha256="0gklfmz4jvxnqb1riijhyz65bj6n53kc3kjmbi17acan0s7bvl01"; depends=[car coxme data_table dplyr geepack labelled lme4 magrittr purrr survey survival tableone tibble]; };
+  jstor = derive2 { name="jstor"; version="0.3.7"; sha256="0if7ngqs9ncnkg9kiag3k51ipxiyrkaqm7lzmvp84hysqq8536jc"; depends=[cli crayon dplyr furrr magrittr pryr purrr readr rlang stringr tibble tidyr xml2]; };
   jtGWAS = derive2 { name="jtGWAS"; version="1.5.1"; sha256="06cgsncgrqslxcc7s0lb3zwa85bhzkmjzz3f04716xpzwa186vxq"; depends=[Rcpp]; };
   jtools = derive2 { name="jtools"; version="2.0.1"; sha256="03c3nii7il8wjdpv99xqlbpf12hjpw7ni4vdqxmkffybra6c97nx"; depends=[crayon ggplot2 magrittr pander pkgconfig rlang tibble]; };
   jtrans = derive2 { name="jtrans"; version="0.2.1"; sha256="18zggqdjzjhjwmsmdhl6kf35w9rdajpc2nffag4rs6134gn81i3m"; depends=[]; };
@@ -8918,12 +9108,13 @@ in with self; {
   jvnVaR = derive2 { name="jvnVaR"; version="1.0"; sha256="0zh0dc6wqlrxn5r2yv9vkpyfb8xsbdidkjv9g6qr94fyxlbs4yci"; depends=[]; };
   jwutil = derive2 { name="jwutil"; version="1.2.3"; sha256="1cqqbz6n26gmv9jbsf8d2lmzcbyppc8hs882ms56d8fkv3ism4zl"; depends=[Rcpp testthat]; };
   kSamples = derive2 { name="kSamples"; version="1.2-9"; sha256="1zs22p68d6320kcylisnk0b5wmpapxkyz15py09czxzw7npw8gms"; depends=[SuppDists]; };
+  kStatistics = derive2 { name="kStatistics"; version="1.0"; sha256="1bfxn38lx5yvz65l9kn29wmqjlv80jar3sra6d89rn58l6rszj6n"; depends=[]; };
   kableExtra = derive2 { name="kableExtra"; version="1.1.0"; sha256="1nicvw06xsf3a1f5c10mih07b76m2v5s5h165vmz0qx6n1a3492i"; depends=[digest glue htmltools knitr magrittr readr rmarkdown rstudioapi rvest scales stringr viridisLite webshot xml2]; };
   kader = derive2 { name="kader"; version="0.0.8"; sha256="15f2swgngw5rdjdsh5kd55wm2nivlfs8pv4mdn0b75qihwgg1zkk"; depends=[]; };
   kamila = derive2 { name="kamila"; version="0.1.1.3"; sha256="0ssyqn6n1jlslg5kvimakjq9xnb4r8k6ri1a76b13lr11zbl4l10"; depends=[abind gtools KernSmooth plyr Rcpp]; };
   kangar00 = derive2 { name="kangar00"; version="1.3"; sha256="1gxz2lq8vbpjvnriakwipy4fl3mvhrdpnyrnyra3w7zmhlbfp2dd"; depends=[bigmemory biomaRt CompQuadForm data_table igraph lattice sqldf]; };
   kantorovich = derive2 { name="kantorovich"; version="2.0.0"; sha256="0y965nkhgk0z2q2j3sycfg76aqqi3ry8avg0bz9xggpd60bhh5vd"; depends=[gmp lpSolve rcdd Rglpk]; };
-  kaos = derive2 { name="kaos"; version="0.1.1"; sha256="08fpzxag4ckwhgy634rvh1xyqy0v1gm4h1y74x33fip9il00l2cq"; depends=[ggplot2 reshape2]; };
+  kaos = derive2 { name="kaos"; version="0.1.2"; sha256="0hzzb8ldydl4g3cl1579q8jv835q4cdmn8agafp6qqdhwi1xxw8k"; depends=[ggplot2 reshape2]; };
   kaphom = derive2 { name="kaphom"; version="0.3"; sha256="081drgckirc0wv2viyhhnabrlfzi0nkpq6pffw2rxfjyxdsyvnwa"; depends=[]; };
   kappaSize = derive2 { name="kappaSize"; version="1.2"; sha256="0lrcyj85zcl73m6bhbzl6rkprrfpfwmm4amyjkg1xsasy5zlwk67"; depends=[]; };
   kappalab = derive2 { name="kappalab"; version="0.4-7"; sha256="16bwbwwqmq2w7vy8p3wg0y80wfgc8q5l1ly1mqh51xi240z1qmq0"; depends=[kernlab lpSolve quadprog]; };
@@ -8950,17 +9141,17 @@ in with self; {
   kerasR = derive2 { name="kerasR"; version="0.6.1"; sha256="1yi7710vgcwz0jhishbga41sc6qyk83a0avmq01dvqjsz3cdfsfc"; depends=[reticulate]; };
   kerasformula = derive2 { name="kerasformula"; version="1.5.1"; sha256="1b4mq1y41lz8maszlrm7w907vcz7in8napfnhas7dgal1kid4mcf"; depends=[dplyr ggplot2 keras Matrix]; };
   kerdiest = derive2 { name="kerdiest"; version="1.2"; sha256="16xj2br520ls8vw5qksxq9hqlpxlwmxccfk5balwgk5n2yhjs6r3"; depends=[chron date evir]; };
-  kergp = derive2 { name="kergp"; version="0.4.0"; sha256="0b5milibiacxmflrbddl6fjkc54cv0q5w8dqpxikx2vly4as9g5z"; depends=[doFuture doParallel MASS nloptr numDeriv Rcpp testthat]; };
+  kergp = derive2 { name="kergp"; version="0.5.0"; sha256="000hs9mi22k0wyafnj5a3vnhfq9la0s159afnd9133bjx0l6q2g7"; depends=[doFuture doParallel lattice MASS nloptr numDeriv Rcpp testthat]; };
   kernDeepStackNet = derive2 { name="kernDeepStackNet"; version="2.0.2"; sha256="04bdggxvggmppp289n2zw6ijdm7y05gws6z7bp6fr8n1zsxy2w3c"; depends=[caret DiceKriging DiceOptim GA GenSA glmnet globalOptTests lhs matrixStats mvtnorm Rcpp RcppEigen]; };
   kerndwd = derive2 { name="kerndwd"; version="2.0.2"; sha256="0nf5hyb274gn02n4lygwryv1jaqff77i040bd8gs1xykgvy6jxny"; depends=[]; };
   kernelFactory = derive2 { name="kernelFactory"; version="0.3.0"; sha256="001kw9k3ivd4drd4mwqapkkk3f4jgljiaprhg2630hmll064s89j"; depends=[AUC genalg kernlab randomForest]; };
-  kernelPSI = derive2 { name="kernelPSI"; version="1.0.0"; sha256="1a5pg8y4p86558d6rkvzzw41vadkpvw0vxnnksc2lrc6xj7nx25y"; depends=[CompQuadForm kernlab lmtest pracma Rcpp RcppArmadillo tmg]; };
+  kernelPSI = derive2 { name="kernelPSI"; version="1.1.0"; sha256="09fdh3zgc13a6i66kw9qmsy8wa7mq7359ym3srf5dzv57hz9x8md"; depends=[CompQuadForm kernlab lmtest pracma Rcpp RcppArmadillo]; };
   kernelTDA = derive2 { name="kernelTDA"; version="0.1.1"; sha256="0rghj0yx32r6565mb06k83qfmnf7lajdhdg2zf8kjd9jyzidqdrn"; depends=[BH mvtnorm Rcpp RcppEigen Rdpack]; };
   kernelboot = derive2 { name="kernelboot"; version="0.1.5"; sha256="0m31akhya7390lbkw0cjxcrzw28njbz4smd35m93aarb2lgpcj4k"; depends=[future future_apply Rcpp]; };
   kernhaz = derive2 { name="kernhaz"; version="0.1.0"; sha256="1cxwjnfyhxfjdbhs21airycs704jic21pdpsbxsx37wkl11cxpai"; depends=[doParallel foreach GA rgl]; };
   kernlab = derive2 { name="kernlab"; version="0.9-27"; sha256="1m0xqf6gyvwayz7w3c83y32ayvnlz0jicj8ijk808zq9sh7dbbgn"; depends=[]; };
   kernplus = derive2 { name="kernplus"; version="0.1.2"; sha256="0z5zpj89nw7cdphg6frmjwqjxsl6g95xsa8zgsxmw2q75wwj1saz"; depends=[circular KernSmooth mixtools]; };
-  kernscr = derive2 { name="kernscr"; version="1.0.3"; sha256="0h3xv76dxch8kv4z7cgx60iaikk6906n75c4kc1mccpw0jvyxrvb"; depends=[MASS mvtnorm]; };
+  kernscr = derive2 { name="kernscr"; version="1.0.5"; sha256="1kcj710q8jbc34g6fcv2nk07hpsb81mfx8hvivgxq8x58028gjzs"; depends=[MASS mvtnorm]; };
   kexpmv = derive2 { name="kexpmv"; version="0.0.3"; sha256="1nx2bpyc06vlr78nhig4zaaygphjp4wqsz9jzhs4qx8wy3kh7rmy"; depends=[Rcpp SparseM]; };
   keyholder = derive2 { name="keyholder"; version="0.1.3"; sha256="0r45wd36bf3ir3j3llcy40w6l8440ncvx3c1f6qvb8zgl4bl6z22"; depends=[dplyr rlang tibble]; };
   keyplayer = derive2 { name="keyplayer"; version="1.0.3"; sha256="0j4n46r9ivkbzqz8g22dq2bpmx7bs05yb5qp27p9jnfh5x19v2ds"; depends=[igraph matpow sna]; };
@@ -8971,7 +9162,7 @@ in with self; {
   kfigr = derive2 { name="kfigr"; version="1.2"; sha256="0hmfh4a95883p1a63lnziw8l9f2g0fn0xzxzh36x9qd9nm7ypmkw"; depends=[knitr]; };
   kgc = derive2 { name="kgc"; version="1.0.0.2"; sha256="14zbcimnglh5jj07dcaxp1dfjaz8syswy29nf8z39qmslv1hg9kk"; depends=[plyr shiny shinythemes]; };
   kgschart = derive2 { name="kgschart"; version="1.3.5"; sha256="1gdsrmnv8z99cldvig7grlq8gsbv3wpx7zdamw85lz563n4ln94d"; depends=[abind deepnet ggplot2 gridExtra magrittr matrixStats nnet png shiny stringr]; };
-  khroma = derive2 { name="khroma"; version="1.1.3"; sha256="1d8mqaq3702vfz8m66rgaw1jad6v2kk5z8q2zkxknwlab5xck3x4"; depends=[ggplot2 scales]; };
+  khroma = derive2 { name="khroma"; version="1.2.0"; sha256="09a9fkk8jds8byyh0si4bnadyzqkljndfgayr4kiazyify3i0nqw"; depends=[ggplot2 scales]; };
   kidney_epi = derive2 { name="kidney.epi"; version="1.1.0"; sha256="191yrqdviwvfl62c62qqfa154hglxpfwcxllhgwlm8nsysg46z5i"; depends=[]; };
   kimisc = derive2 { name="kimisc"; version="0.4"; sha256="0nbjspbq9akhmamfdn192p5b6ki7xqhp422ih6v77xsnrhl5m24z"; depends=[memoise plyr pryr]; };
   kin_cohort = derive2 { name="kin.cohort"; version="0.7"; sha256="0wijsjz0piz5j9rm2nr3d5dfpiyba740mbfbkmfll9pz72s58wz8"; depends=[survival]; };
@@ -8982,7 +9173,7 @@ in with self; {
   kirby21_t1 = derive2 { name="kirby21.t1"; version="1.7.0"; sha256="0bv8rrk9jh02h3gill1g2w246j4zv98cjchz7i2c092lvqps8szs"; depends=[kirby21_base]; };
   kissmig = derive2 { name="kissmig"; version="1.0-3"; sha256="1pi1x3gdbqrhr1km1hqj15k8wyrgs697fnxgjgxga1irbn8bi482"; depends=[raster]; };
   kitagawa = derive2 { name="kitagawa"; version="2.2-2"; sha256="0hl2l42jz4wkcx94cqycw8zb3ffg72fp2f310sh5icrcnyw43bmp"; depends=[kelvin]; };
-  kiwisR = derive2 { name="kiwisR"; version="0.1.6"; sha256="0ddqjqw97742fjjzxvhplpi3dqmcmwfhnifad5qbj1lp1hh18mwm"; depends=[dplyr httr jsonlite lubridate tibble]; };
+  kiwisR = derive2 { name="kiwisR"; version="0.1.7"; sha256="0xyrxk8109s1wfbacfjip0ch77jbhb4y8rqxz4cyml4l5kyw4zf6"; depends=[dplyr httr jsonlite lubridate tibble]; };
   kknn = derive2 { name="kknn"; version="1.3.1"; sha256="1nzkg3dxaiqp87p56wm895qx5xn86hv5hjr73qvl1yiaxiq0x112"; depends=[igraph Matrix]; };
   klaR = derive2 { name="klaR"; version="0.6-14"; sha256="1g995df6286sd64nw7q9bihzkqhrasks45n8xk678y57kcadksai"; depends=[combinat MASS questionr]; };
   klausuR = derive2 { name="klausuR"; version="0.12-10"; sha256="12fjs4dnwaki8sz718xgsg8qrqhsgf87cs0bylf0p3f5k8hrmk4b"; depends=[polycor psychometric xtable]; };
@@ -9002,8 +9193,8 @@ in with self; {
   kmlcov = derive2 { name="kmlcov"; version="1.0.1"; sha256="09s9ganfsnwp22msha78g6pjr45ppyfyqjf6ci64w3w15q5qlcd9"; depends=[]; };
   kmodR = derive2 { name="kmodR"; version="0.1.0"; sha256="1y1pqrrralklflyb1dw8bslfcyqrw8ryijfbhkwba7ykpxcf9fda"; depends=[]; };
   knitLatex = derive2 { name="knitLatex"; version="0.9.0"; sha256="1igacc2sx8897wmnhh8kngd0fq6zqbi30chy5c8jw60zc38mi3wi"; depends=[knitr]; };
-  knitcitations = derive2 { name="knitcitations"; version="1.0.8"; sha256="07h8d5cp52qcm0912c55j59k2p3c7s4af87qa7a9hafhgimnsdiv"; depends=[digest httr RefManageR]; };
-  knitr = derive2 { name="knitr"; version="1.23"; sha256="16ba4258c915xydhniw4cw7fvv1vp4cnwd1w49ykx7zw00rznfq6"; depends=[evaluate highr markdown stringr xfun yaml]; };
+  knitcitations = derive2 { name="knitcitations"; version="1.0.10"; sha256="0d73qr1zhkx0255vzzf7fs8vpmfnzl91ni4zp5y0l42h8p98vdn5"; depends=[digest httr RefManageR]; };
+  knitr = derive2 { name="knitr"; version="1.25"; sha256="0lsc201a4f6xksmsklhr6gmhl0mxih0xhlcdvhs2ypzcx1pvkpnv"; depends=[evaluate highr markdown stringr xfun yaml]; };
   knitrBootstrap = derive2 { name="knitrBootstrap"; version="1.0.2"; sha256="1aj60j7f0gcs120fdrnfbnb7vk7lfn1phil0mghg6a5zldz4cqs3"; depends=[knitr markdown rmarkdown]; };
   knitrProgressBar = derive2 { name="knitrProgressBar"; version="1.1.0"; sha256="18v5jrscfrin3mcs63bpj0q1drxk3zkhlbw93sqh0qrq04d4x02v"; depends=[R_oo R6]; };
   knnGarden = derive2 { name="knnGarden"; version="1.0.1"; sha256="1gmhgr42l6pvc6pzlq5khrlh080795b0v1l5xf956g2ckgk5r8m1"; depends=[cluster]; };
@@ -9013,15 +9204,16 @@ in with self; {
   knockoff = derive2 { name="knockoff"; version="0.3.2"; sha256="1ky69f3hwwgy2il097mx0z7aakxsq692g9ink8z8cb4wnrp4bk07"; depends=[corpcor glmnet gtools Matrix Rdsdp RSpectra]; };
   knor = derive2 { name="knor"; version="0.0-6"; sha256="0mri7lw6jwkksyxidyqm2xrkjh1vd6dylxd24gd18j9blf342p7d"; depends=[Rcpp]; };
   knotR = derive2 { name="knotR"; version="1.0-2"; sha256="0kd1b9wibpwyaanz9ny61qgfvcg4d3rzpy05sfshlpp0b1y8d3xj"; depends=[]; };
-  kntnr = derive2 { name="kntnr"; version="0.4.1"; sha256="0d78mgmz2yhfbf4m5jaa28aazaw2wf9vf1vxl53wrnpy0hxw329y"; depends=[base64enc dplyr httr jsonlite lazyeval lubridate purrr rstudioapi stringr tibble]; };
+  kntnr = derive2 { name="kntnr"; version="0.4.2"; sha256="0y2is6ww13dzkm9p7wl8n5rmbcx4qlnzhbidc1h6bg75r5anpphq"; depends=[base64enc dplyr httr jsonlite lubridate purrr rlang rstudioapi stringr tibble tidyr]; };
   koRpus = derive2 { name="koRpus"; version="0.11-5"; sha256="053882fnz6c7yjiz72jg6sawd9q57h110nd4yjay65piadi9mci5"; depends=[data_table sylly]; };
   koRpus_lang_en = derive2 { name="koRpus.lang.en"; version="0.1-3"; sha256="013zxm5x5hwdx1hqgb7mh3zmn8dri3fhq1brmzg936gddhxap6is"; depends=[koRpus sylly_en]; };
+  kofdata = derive2 { name="kofdata"; version="0.1.3.3"; sha256="08rmqm8z1xqf2kdjrxlj90v2fc2cqj43yynm1k46vmcs9m224y9k"; depends=[httr jsonlite xts zoo]; };
   kofnGA = derive2 { name="kofnGA"; version="1.3"; sha256="0w0881ydnqdah04sifi25ypzxdwnsiqxfq1xam4yhr670bdak1vm"; depends=[bigmemory]; };
   kohonen = derive2 { name="kohonen"; version="3.0.8"; sha256="1zbfqa1qdlry8w6xhypkiknc5gn98v1ijhlsfka8zjg8ajhqgn1q"; depends=[MASS Rcpp]; };
   kokudosuuchi = derive2 { name="kokudosuuchi"; version="0.4.2"; sha256="1nwydfyr9waa5h8h8nrmwxy0jx7i4893g5khfv6b4g09z6g5cyly"; depends=[curl dplyr glue httr purrr rlang sf shiny stringr tibble xml2]; };
   kolmim = derive2 { name="kolmim"; version="1.0"; sha256="0g1i0cazi4nhfwdd3ywqrar1sn7bw77w38qjii045w5vqg05srkp"; depends=[]; };
   komadown = derive2 { name="komadown"; version="0.2.0"; sha256="0mw1bcrg10yy1y844lpik70979420h0nsar48v5p3qk783pymbdp"; depends=[bookdown rmarkdown]; };
-  komaletter = derive2 { name="komaletter"; version="0.3.0"; sha256="09yvb8ijm1s5d89mrl8j56n8x8q1lq2siprw8191ys3jidmk6ha7"; depends=[rmarkdown]; };
+  komaletter = derive2 { name="komaletter"; version="0.3.1"; sha256="1nnn0gzqcy0551i7ylgnmcxff3g06w9y0s3bwmdrdc1bcavbb0ic"; depends=[rmarkdown]; };
   konfound = derive2 { name="konfound"; version="0.1.2"; sha256="1sza54hvg16jxrl37zmsrqvdlxjqhyd0kaxpb9fqd7rkbjqdp0m2"; depends=[broom dplyr ggplot2 margins pbkrtest purrr rlang tidyr]; };
   kosel = derive2 { name="kosel"; version="0.0.1"; sha256="1gdsy4i58byqxddpsm5nk1r3hlgik5gs2b8jqcm8n1r4ib6pg0ay"; depends=[glmnet ordinalNet]; };
   kpcalg = derive2 { name="kpcalg"; version="1.0.1"; sha256="1gd5bisyfwb12l9jmwhi2arlxrabc01vgv4m1qqs23vybsd6yh52"; depends=[energy graph kernlab mgcv pcalg RSpectra]; };
@@ -9042,11 +9234,12 @@ in with self; {
   ktaucenters = derive2 { name="ktaucenters"; version="0.1.0"; sha256="15ddjr4c90b5hc4977gk35zb2kswrcvai3xighy7qj6g9lgiszgf"; depends=[dbscan dplyr GSE MASS]; };
   ktsolve = derive2 { name="ktsolve"; version="1.2"; sha256="1606b9anlqjwcbf3jp1rpwzvyx94k79q6zw3p9j0a4nxdvgxlx1j"; depends=[BB nleqslv rootSolve]; };
   ktspair = derive2 { name="ktspair"; version="1.0"; sha256="1v63982jidxlcf2syahcb29myv34kc790l7lwyfxx9l50ssb812n"; depends=[Biobase]; };
+  kubik = derive2 { name="kubik"; version="0.1.1"; sha256="0f0gvnqlip3mhp1ss82c9iwba5y9qmgdplvvpycs94x3fs5gjqlm"; depends=[intoo]; };
   kuiper_2samp = derive2 { name="kuiper.2samp"; version="1.0"; sha256="0gcgayh7qdic9zprdvs6r8qvpqs467zrm0qzp2acb7alcp01jhpi"; depends=[]; };
   kulife = derive2 { name="kulife"; version="0.1-14"; sha256="070ayy6fr9nsncjjljikn2i5sp2cx3xjjqyc64y2992yx74jgvvd"; depends=[]; };
   kutils = derive2 { name="kutils"; version="1.69"; sha256="12pg26a85h0jxlfcyai68dbh4bq1gnq8v1ngi8k9qvafbrpc6gx8"; depends=[foreign lavaan openxlsx plyr RUnit xtable]; };
   kvh = derive2 { name="kvh"; version="1.4.1"; sha256="0hnqlybphx8qnx98ynykxpz4ys4prp9zbmkak02qlvmnxwc2cqg0"; depends=[Rcpp]; };
-  kwb_hantush = derive2 { name="kwb.hantush"; version="0.2.1"; sha256="0rjnhhzvjhhl0r2ixz9vkgnqkrnnk772253zy7xkpadj7ws69jsf"; depends=[hydroGOF lattice]; };
+  kwb_hantush = derive2 { name="kwb.hantush"; version="0.3.0"; sha256="1rlm7i95yw66asgkag93phig2y9lic4xl2fv3cbnr3v751f6a59m"; depends=[hydroGOF lattice]; };
   kyotil = derive2 { name="kyotil"; version="2018.10-17"; sha256="12rrr7ynjwhcskjkfkv11q5xpdfn9j27vmnsd0r0vc2w2b25217k"; depends=[]; };
   kza = derive2 { name="kza"; version="4.1.0"; sha256="128r4xmqxy1i1svcmv8786qqmriyqygd8d49cp53x8gb56k011xa"; depends=[]; };
   kzfs = derive2 { name="kzfs"; version="1.5.0.2"; sha256="0x0fc807p0pwsjkhjq51ymwr9nhs6cb0m82029cz8bbn3yf6cymq"; depends=[digest kzft]; };
@@ -9055,7 +9248,7 @@ in with self; {
   l0ara = derive2 { name="l0ara"; version="0.1.5"; sha256="15qajzpvqnikg9k199cqvwp9qbrxx4zr9lsvyad96pa9qr156gvb"; depends=[Rcpp RcppArmadillo]; };
   l1kdeconv = derive2 { name="l1kdeconv"; version="1.2.0"; sha256="1mk92sz9nsmxsn7yplhfcz07k022lrr61114ckrmm0x8hfd89zj8"; depends=[ggplot2 mixtools]; };
   l2boost = derive2 { name="l2boost"; version="1.0.1"; sha256="0f2gapzpvjnr8n1jgn60jpmcas4s8nk2q8q4k5v4ypwvpfqp7kk1"; depends=[MASS]; };
-  laGP = derive2 { name="laGP"; version="1.5-3"; sha256="1bn7mj42kjgqa350ikkk7dlvash3l1fw9wdzrbjb2y41mnv8ipav"; depends=[tgp]; };
+  laGP = derive2 { name="laGP"; version="1.5-5"; sha256="1a269cy9qmjldb5hv1nl9naq1rr35z37xjpp4kannj6p560fm476"; depends=[tgp]; };
   labdsv = derive2 { name="labdsv"; version="2.0-1"; sha256="099rzl9hy70rmb5fg0vx26mlhr4ra2s0hl3jgv22s8hqpvlmakas"; depends=[cluster MASS mgcv Rtsne]; };
   label_switching = derive2 { name="label.switching"; version="1.8"; sha256="0xwwhn249aibip12yxjwlrpyqj6zvc95zc7n9jf2vjjpashyc3yk"; depends=[combinat lpSolve]; };
   labelVector = derive2 { name="labelVector"; version="0.1.0"; sha256="08ydgmvks09hbln10zmqxv9hxgiha0n9w5cgych9bnkqdca74gah"; depends=[]; };
@@ -9066,6 +9259,7 @@ in with self; {
   labstatR = derive2 { name="labstatR"; version="1.0.9"; sha256="1ysk23dwan1lsfwnf9v86yqyzc8wsgzmy18ycz34s4d9biq6y1zd"; depends=[]; };
   labstats = derive2 { name="labstats"; version="1.0.1"; sha256="1780slp9l1rqwr5ika6hv606jzbaa3g1ywzkjkd3ff2gb0cby3ni"; depends=[]; };
   lacm = derive2 { name="lacm"; version="0.0.3"; sha256="0qhvffiw2bcpnv6l4y4h12ss59yc2j0hwsg2nr4a7w4nh6yk9fwc"; depends=[numDeriv statmod]; };
+  lactcurves = derive2 { name="lactcurves"; version="1.0.0"; sha256="06dj8ajg6ndnyakywy16wbqjjr2jkidvnjv33vxcacwijympaqqy"; depends=[orthopolynom]; };
   lacunaritycovariance = derive2 { name="lacunaritycovariance"; version="1.0-8"; sha256="1dya5jbrr76p20k37v07g8wck8vrdr2j3r04pqhmwq6i7h0w2c30"; depends=[RcppRoll spatstat]; };
   laeken = derive2 { name="laeken"; version="0.5.0"; sha256="1g9r3y7b0gl91hijk9awa8rjk97mqpkxinzq2cgmx0m38ng9ylpa"; depends=[boot MASS]; };
   laercio = derive2 { name="laercio"; version="1.0-1"; sha256="0la6fxv5k9zq4pyn8dxjiayx3vs9ksm9c6qg4mnyr9vs12z53imm"; depends=[]; };
@@ -9074,7 +9268,7 @@ in with self; {
   lakemorpho = derive2 { name="lakemorpho"; version="1.1.1"; sha256="0asrp9rvyi5ykxw922qx25rgxvyc9mh4sc7qkbpwzqw8xvgpad2z"; depends=[cluster geosphere raster rgdal rgeos sp]; };
   laketemps = derive2 { name="laketemps"; version="0.5.1"; sha256="04742r379bzgbfr4243wwkb26cvfmnw50jzgygq7vblq00grzska"; depends=[dplyr reshape2]; };
   lamW = derive2 { name="lamW"; version="1.3.0"; sha256="00qa1sxyqb2r7f9yidg43cq2v1285f45xpm3z928jpi424mpg0fc"; depends=[Rcpp RcppParallel]; };
-  lambda_r = derive2 { name="lambda.r"; version="1.2.3"; sha256="0cc6pszs6yccn0hgjpyn9gspv9aiva9d91ba0640i5m0l5xy7n0c"; depends=[formatR]; };
+  lambda_r = derive2 { name="lambda.r"; version="1.2.4"; sha256="1mh1g0gsd58gng0hb29vww2yqb2jfs07kba5kxnnqck5j3izwlnj"; depends=[formatR]; };
   lambda_tools = derive2 { name="lambda.tools"; version="1.0.9"; sha256="1wslxxh6rxny3n06y16dqwpczi3k42vrq4pbwwshl6kzhl56r45b"; depends=[lambda_r]; };
   lamme = derive2 { name="lamme"; version="0.0.1"; sha256="1x9jl79iqikpjixajly1k8w2nkzskns2m0v242giknl0ikw298h1"; depends=[]; };
   landest = derive2 { name="landest"; version="1.0"; sha256="1lp5sfqk0n7i23fmwjgzsabml1fsji1h9xq5khxzaz1bzqv1s08g"; depends=[survival]; };
@@ -9082,12 +9276,12 @@ in with self; {
   landsat = derive2 { name="landsat"; version="1.0.8"; sha256="07zvj1yyryxk7rwgcrf1kl32p2karkkqz6xrnwy1096dg9iw2js7"; depends=[lmodel2 mgcv rgdal sp]; };
   landsat8 = derive2 { name="landsat8"; version="0.1-10"; sha256="169b5ka98ka9chbmksz6syaygc9wgl8i2gz1h2xkxj3lk9jcg01r"; depends=[rgdal sp]; };
   landscapeR = derive2 { name="landscapeR"; version="1.2"; sha256="1zm5mj861ycbc2m28yjqnkifx8grc4l718mf8r422m78jfakvcjy"; depends=[raster Rcpp]; };
-  landscapemetrics = derive2 { name="landscapemetrics"; version="1.2"; sha256="0k9algml4yj4yp0zsj742vcmjwml1sqfval8759060v0fbn4fj5h"; depends=[cli ggplot2 raster Rcpp RcppArmadillo sp tibble]; };
+  landscapemetrics = derive2 { name="landscapemetrics"; version="1.2.2"; sha256="1f6s166khqzz9vlw58wal21rp9cf5p7892vq3lz5ywq4bs8pg7fd"; depends=[cli ggplot2 raster Rcpp RcppArmadillo sp tibble]; };
   landscapetools = derive2 { name="landscapetools"; version="0.5.0"; sha256="11zp6r414nkj8vhsbryzhkxmpal2bva8msaxf1v69xax70ilxyf1"; depends=[ggplot2 raster Rcpp tibble]; };
   landsepi = derive2 { name="landsepi"; version="0.0.7"; sha256="00ckjjyq33y362xhwjic8rwz06ml3s5l8wxxf7cgh0xkzv5hwcnr"; depends=[fields maptools MASS Matrix Rcpp rgdal rgeos sf sp splancs]; };
   languageR = derive2 { name="languageR"; version="1.5.0"; sha256="1iipnr2b4hd2w718prbh075j56m5xnchlcb2vg26m16qpydp6afn"; depends=[]; };
   languagelayeR = derive2 { name="languagelayeR"; version="1.2.4"; sha256="1q82shdcdd84nr6bnfwgyyb81z8dycvj1i3vhwvdg710s15rgiyk"; depends=[attempt curl httr jsonlite]; };
-  languageserver = derive2 { name="languageserver"; version="0.2.9"; sha256="0jg652pj6y99kdvgpvh0ggyxks7xdbp15jzwjpfkv2d75rwqpw5p"; depends=[callr collections desc jsonlite lintr R6 repr stringr styler]; };
+  languageserver = derive2 { name="languageserver"; version="0.3.1"; sha256="19dq4x4lz89gzmcv1fksq95hw9xq86g4x75cz82jrnsqmiyf135x"; depends=[callr collections desc jsonlite lintr R6 readr repr stringr styler]; };
   lans2r = derive2 { name="lans2r"; version="1.0.5"; sha256="1m3hz85gl9m4vafdy7mj3z560d11mdwlwvnzy8n7d1cjqryn7a2b"; depends=[dplyr ggplot2 lazyeval R_matlab reshape2 tidyr]; };
   lar = derive2 { name="lar"; version="0.1-2"; sha256="0qda0y4ag10kg83wxs3z754kc8c1dg2rwciy64klk7an4ln43i5b"; depends=[data_table treemap xlsx]; };
   largeList = derive2 { name="largeList"; version="0.3.1"; sha256="0csijzlxajj0rh24w5n7fs6ss301zr6zfv5khyq4a9g437bwhc2i"; depends=[]; };
@@ -9109,12 +9303,13 @@ in with self; {
   lava = derive2 { name="lava"; version="1.6.6"; sha256="0nfab5fgnmxh8cplg8rd8cp34fny5j0k5wn4baj51r6ck7fq9g3s"; depends=[numDeriv SQUAREM survival]; };
   lava_tobit = derive2 { name="lava.tobit"; version="0.5"; sha256="15dlcjgnvrpdxymcwf4rvk72ssr650dy1ayp50zlrp2va0p6h4kw"; depends=[lava mets mvtnorm survival]; };
   lavaSearch2 = derive2 { name="lavaSearch2"; version="1.5.4"; sha256="0zq5i568pd0xwjbxwi0ndhmjxglyd9y2x8yfvnrmg3pq1wxqys6h"; depends=[doParallel ggplot2 lava MASS Matrix multcomp mvtnorm nlme Rcpp RcppArmadillo reshape2 sandwich]; };
-  lavaan = derive2 { name="lavaan"; version="0.6-4"; sha256="1zf0sxpms35rhq2syb7r3sshhc8kjvc3pv97dk9x0gf4xl7pck4g"; depends=[MASS mnormt numDeriv pbivnorm]; };
+  lavaan = derive2 { name="lavaan"; version="0.6-5"; sha256="04kvsh2m6mnzlhv83phr3hjzy4sx1ck6f7dgsm7xb8cs84dnxszy"; depends=[MASS mnormt numDeriv pbivnorm]; };
   lavaan_shiny = derive2 { name="lavaan.shiny"; version="1.2"; sha256="0qgswdpxb5af0l3v70sg0jrgsdwr88gz6zzwbk3pw5x6qnvnwb6r"; depends=[lavaan psych semPlot shiny shinyAce]; };
   lavaan_survey = derive2 { name="lavaan.survey"; version="1.1.3.1"; sha256="133hpy8s00y6jzwwzl9brdh70w26jycdm3n1c6bcryghwh3ai4xr"; depends=[lavaan MASS survey]; };
   lavaanPlot = derive2 { name="lavaanPlot"; version="0.5.1"; sha256="01bx1snd3zhc8dmq0f407qhw2d00f6d38qpr791qc1mq5kr3d8qj"; depends=[DiagrammeR lavaan stringr]; };
   lawn = derive2 { name="lawn"; version="0.5.0"; sha256="0yvlps6g9ya383615y7x624hnwb6qfs6i5yg4cchp6lkvz2xdd5y"; depends=[jsonlite magrittr V8]; };
   lawstat = derive2 { name="lawstat"; version="3.3"; sha256="117w8b1skw9kh03dm67p17q6ifyh3zq2ivm85ix1nvpyrq3pcfvp"; depends=[Kendall mvtnorm Rdpack VGAM]; };
+  lax = derive2 { name="lax"; version="1.0.0"; sha256="1c386hx83i344byc6p77whz71kgwbjzqpgm6y6ykila06lsp7fip"; depends=[chandwich numDeriv revdbayes sandwich]; };
   lazy = derive2 { name="lazy"; version="1.2-16"; sha256="1psh3sng1pm23pjwy7iszb21ys7d29ry34ymvpgxj6zdhywwi5n7"; depends=[]; };
   lazyData = derive2 { name="lazyData"; version="1.1.0"; sha256="0mbmmx6dh8ph4lrx1b4gxbwz3jwxv4nqi0xvfzpzrm3bwbsjc634"; depends=[]; };
   lazyWeave = derive2 { name="lazyWeave"; version="3.0.2"; sha256="1a7l0rgkp3xq2s6bikciq778fwyr282baa6jk9ip4a71s931p2ag"; depends=[Hmisc labelVector]; };
@@ -9159,6 +9354,7 @@ in with self; {
   leaflet_providers = derive2 { name="leaflet.providers"; version="1.8.0"; sha256="1rbx3n59hrbh3ncfzcv442shdyx64d67nlviisyfixvc1jlmjr2h"; depends=[htmltools]; };
   leafletCN = derive2 { name="leafletCN"; version="0.2.1"; sha256="1rg39n4bjacwss9nbdnz8y2zh8hxlc7a5ygndhjbmzajnbxfh09b"; depends=[htmltools jsonlite leaflet magrittr rgeos sp]; };
   leafletR = derive2 { name="leafletR"; version="0.4-0"; sha256="0j1i971dl3smq8rcsa5s4rfmmk936k2q6xa4hppfzwhrxs3xkkkx"; depends=[brew jsonlite]; };
+  leaflethex = derive2 { name="leaflethex"; version="0.1.0"; sha256="0wdph5xs2n7brdj7x1kgza0vxghl519hmva5xzkjc2yaj2dkpyrk"; depends=[dplyr htmltools htmlwidgets leaflet readr tibble]; };
   leafpm = derive2 { name="leafpm"; version="0.1.0"; sha256="06d2k5x6bnv7bf4aw2bayi8sh5bw8z6akwnp7da5s7454hyqn0vv"; depends=[dplyr htmltools htmlwidgets jsonlite leaflet sf]; };
   leafpop = derive2 { name="leafpop"; version="0.0.1"; sha256="1bcab4f0g9xf7w5zh9xma93lv9ywbn9zqdy46k7cm0y6vnzggsy8"; depends=[base64enc brew gdalUtils htmlwidgets Rcpp svglite uuid]; };
   leafsync = derive2 { name="leafsync"; version="0.1.0"; sha256="0p6pb7w5yz2wj33kdh7ixii9f6b8zv018psp6b7ifr7npgdxi3vx"; depends=[htmltools htmlwidgets leaflet]; };
@@ -9167,11 +9363,11 @@ in with self; {
   leaps = derive2 { name="leaps"; version="3.0"; sha256="11gjmn1azrjw5xlvdb4gknj9985kck9x8zb9np1rnk2smp6pka2m"; depends=[]; };
   learNN = derive2 { name="learNN"; version="0.2.0"; sha256="0q0j25vi7hrwaf38y10m24czf3rsvj937jvkz3ns12bd8srlflah"; depends=[]; };
   learnPopGen = derive2 { name="learnPopGen"; version="1.0.4"; sha256="04wxina3n2bspxdp3d4bgqrwyxqxx46pfp8zgzr3rsj89ml8if9l"; depends=[gtools phytools]; };
-  learningr = derive2 { name="learningr"; version="0.29"; sha256="1nr4ydcq2mskv4c0pmf0kxv5wm8pvjqmv19xz5yaq0j834b0n5q7"; depends=[plyr]; };
+  learningr = derive2 { name="learningr"; version="0.29.1"; sha256="0z3rs7y9yd81f14sbk3dwq1ifr4vca2s3kl1gnkqlns3dycgyp08"; depends=[plyr]; };
   learnr = derive2 { name="learnr"; version="0.9.2.1"; sha256="0jbk0g6fkw7zs8ykzhsvh9vvz8xmc4v03bqzjsa5mmpxpqan5vx5"; depends=[evaluate htmltools htmlwidgets jsonlite knitr markdown rappdirs rmarkdown rprojroot shiny withr]; };
   learnrbook = derive2 { name="learnrbook"; version="0.0.2"; sha256="1k17dk8ahn1ifwid1hhx0k7fpgc62zg82y66bbf6nhd4dgdbbv2p"; depends=[]; };
   learnstats = derive2 { name="learnstats"; version="0.1.1"; sha256="1sa064cr7ykl4s1ssdfmb3v1sjrnkbwdh04hmwwd9b3x0llsi9vv"; depends=[ggplot2 Rcmdr shiny]; };
-  ledger = derive2 { name="ledger"; version="2.0.1"; sha256="1cfbd7i9m8xk46s4g60004yyvmmwb9w9pnf0cl7bnpn2280q4r5q"; depends=[dplyr rio rlang stringr tibble tidyr tidyselect]; };
+  ledger = derive2 { name="ledger"; version="2.0.2"; sha256="0s0z4s4fmr8iz2d4xlrm5icqxbc5bmfrh60hmr5j0s3s7ynij8as"; depends=[dplyr rio rlang stringr tibble tidyr tidyselect]; };
   leerSIECyL = derive2 { name="leerSIECyL"; version="1.0.2"; sha256="1zx28gpnys9mmhq7wwljfnq92wj1h1vxgqiirnfmn36z942nvmxl"; depends=[RCurl]; };
   lefse = derive2 { name="lefse"; version="0.1"; sha256="1zdmjxr5xa5p3miw79mhsswsh289hgzfmn3mpj1lyzal1qgw1h5m"; depends=[ape fBasics geiger picante SDMTools vegan]; };
   legocolors = derive2 { name="legocolors"; version="0.2.0"; sha256="06jbq12jzga1p5jajhnnkk11s9gjw5ngmnrvhmbvirhsbafp0fjv"; depends=[]; };
@@ -9179,12 +9375,12 @@ in with self; {
   leiv = derive2 { name="leiv"; version="2.0-7"; sha256="15ay50886xx9k298npyksfpva8pck7fhqa40h9n3d7fzvqm5h1jp"; depends=[]; };
   lemon = derive2 { name="lemon"; version="0.4.3"; sha256="0wsn5bfg10wq4dnrgpyraz2bzx9p19c7hf1pwj3h4zmpqfgsdbpw"; depends=[ggplot2 gridExtra gtable knitr lattice plyr scales]; };
   lenses = derive2 { name="lenses"; version="0.0.3"; sha256="08akwzlc5gk2rxbh9xp67n5ahdcld60932ascczjv0accrkxizhk"; depends=[magrittr rlang tidyselect]; };
+  leri = derive2 { name="leri"; version="0.0.1"; sha256="1309v58xdw3p6y2wpnl64vgsds5kvfiary2a3fa041kz23jzbp3c"; depends=[ncdf4 raster]; };
   lero_lero = derive2 { name="lero.lero"; version="0.2"; sha256="03ll7jzcay0swwpmxyf0y9k2h8mxx4p5v3ggm9dgdz4j99934l70"; depends=[]; };
-  lessR = derive2 { name="lessR"; version="3.8.8"; sha256="1izkxy1cwsii0075xby3lkjrbgycpgkn9yk6akq6wgl758qpw5ab"; depends=[colorspace ellipse foreign lattice latticeExtra leaps openxlsx png rmarkdown robustbase sas7bdat triangle viridisLite wesanderson]; };
+  lessR = derive2 { name="lessR"; version="3.8.9"; sha256="00k1ar4nnsj89zvsqp3b0nwyiwbprpgznzkn53d0csgrm473lwyf"; depends=[colorspace ellipse foreign lattice latticeExtra leaps openxlsx png rmarkdown robustbase sas7bdat triangle viridisLite wesanderson]; };
   lest = derive2 { name="lest"; version="1.0.0"; sha256="06ng0dpj37bhhwc34ilpks2ics97m9yjdpj4q993h3s2fn8kdgxw"; depends=[]; };
   lestat = derive2 { name="lestat"; version="1.9"; sha256="1skxymdf3ncmdbskh7711xxgwsmwxfxnl52gcgw06jscx6s6wrsd"; depends=[MASS]; };
   letsR = derive2 { name="letsR"; version="3.1"; sha256="0wyqqq7w21k87md3pwsz3kdaws345fdhh2xgavwiiywalg0gvxxx"; depends=[fields geosphere maps maptools raster rgdal rgeos sp XML]; };
-  lettercase = derive2 { name="lettercase"; version="0.13.1"; sha256="0s2s42v6a3mlz6084sk5wcbap3czgbd53f9p64pxwd1yfj18lbyx"; depends=[stringr]; };
   lexRankr = derive2 { name="lexRankr"; version="0.5.2"; sha256="0vb4m4g88k05yhjla1gwp8ck08356r9dzwal6cq7lb6xm6pl5gvi"; depends=[igraph Rcpp SnowballC]; };
   lexicon = derive2 { name="lexicon"; version="1.2.1"; sha256="0x7rscsh6par2lj11sby7bmz41cxn63iiw51lgh29z09cg8j606c"; depends=[data_table syuzhet]; };
   lexiconPT = derive2 { name="lexiconPT"; version="0.1.0"; sha256="0w53gnr29nzc1ib54rnxdycs0c5f7vpv586qmvxxzy4ar16kisaq"; depends=[]; };
@@ -9193,23 +9389,22 @@ in with self; {
   lfe = derive2 { name="lfe"; version="2.8-3"; sha256="0hpgk0k0xq47p71002xvl9p9xhw5yv9vsh0c4xyg1sjd5mdvhvy4"; depends=[Formula Matrix sandwich xtable]; };
   lfl = derive2 { name="lfl"; version="1.4.2"; sha256="0lr7r04jpsrp54g4flpwihymvwa3idxhzfjxfbx4ah16rd47nk5x"; depends=[e1071 foreach forecast plyr Rcpp tseries zoo]; };
   lfstat = derive2 { name="lfstat"; version="0.9.4"; sha256="0lm9fyw45kdkkjldkmagykn9p3l3jlw2ky3h00f7j6rqkizjm6r0"; depends=[dygraphs lattice latticeExtra lmom lmomRFA plyr xts zoo]; };
-  lg = derive2 { name="lg"; version="0.3.0"; sha256="1kbsfkv8py627l2zm96l05r19d2yx7zajf3nqy67rclcj869jg1n"; depends=[ggplot2 ks localgauss logspline mvtnorm np tseries]; };
+  lg = derive2 { name="lg"; version="0.4.0"; sha256="0m4jsvqrf1l41qlwl6g4w0f8v5gsfqniakz2xl263jj0l5micwf6"; depends=[ggplot2 ks localgauss logspline mvtnorm np tseries]; };
   lga = derive2 { name="lga"; version="1.1-1"; sha256="1nkvar9lmdvsc3c21xmrnpn0haqk03jwvc9zfxvk5nwi4m9457lg"; depends=[boot lattice]; };
   lgarch = derive2 { name="lgarch"; version="0.6-2"; sha256="05xksc4d6dbf5ls4lf2gpk9xyi99fikr7dva88b84rfgads1yhrh"; depends=[zoo]; };
   lgcp = derive2 { name="lgcp"; version="1.5"; sha256="1n1f87qg0y9r22p3q1qjnfrs7xarvsidgqgg6v2bsb55viwy11g3"; depends=[fields iterators maptools Matrix ncdf4 RandomFields raster rgeos rpanel sp spatstat spatstat_utils]; };
-  lgr = derive2 { name="lgr"; version="0.3.1"; sha256="0i3ghzp4861wwqql49i4ypm41yiv32v72ggj1c09sfn7shddm7hw"; depends=[R6]; };
+  lgr = derive2 { name="lgr"; version="0.3.3"; sha256="1ivab8vw4bp206yq21dz7ix3slghjdzh4k6q6w9xpvphwscx0h48"; depends=[R6]; };
   lgrdata = derive2 { name="lgrdata"; version="0.1.1"; sha256="0h1crdhqfp6hzx30lp0w015scf2566hhrl2i7mkxy868rkl3aig9"; depends=[]; };
   lgtdl = derive2 { name="lgtdl"; version="1.1.5"; sha256="1sixq56d2px36q0xq3kl0zwj2yzm3q8fhgqjvmajcdd5jl8l7130"; depends=[]; };
   lhmixr = derive2 { name="lhmixr"; version="0.1.0"; sha256="1c4ydgq1z2y0xk8xqdsim6xvgxdbl3gglfk5kcr9k4m01arvv0rf"; depends=[]; };
   lhs = derive2 { name="lhs"; version="1.0.1"; sha256="0lzaqr7xi3ckln5nglv5xf5njm359slpz1jc6s02hpsqdw6armd4"; depends=[Rcpp]; };
   liayson = derive2 { name="liayson"; version="1.0.2"; sha256="1kz7svfjd8wr826kwqkisiyhszb5df7inf77w2yb2rahkza50m49"; depends=[ape arules biomaRt distances e1071 gplots matlab phangorn plyr proxy RColorBrewer]; };
-  libamtrack = derive2 { name="libamtrack"; version="0.6.3"; sha256="0pdwrz19q1yls0rgr4579f31j86awizx3j31h7vdh6y70ngpmb82"; depends=[]; };
-  libcoin = derive2 { name="libcoin"; version="1.0-4"; sha256="1i893ij9vkmc4y721npw1s3prmmcs2da5vf3ajm0j8ccmfhbmp4i"; depends=[mvtnorm]; };
+  libcoin = derive2 { name="libcoin"; version="1.0-5"; sha256="1cm9x1dlg9f7fh7n5nw3x4a7rl88c7ylrlc8x3rx4mq5w1j42x0a"; depends=[mvtnorm]; };
   librarian = derive2 { name="librarian"; version="1.7.0"; sha256="0n3q2ppa3p0w8ypgx9s738pmprfbqi9qg8n58xzplp809p903dj9"; depends=[BiocManager remotes]; };
   librarysnapshot = derive2 { name="librarysnapshot"; version="0.1.2"; sha256="0v4x564zpm58kxs5n84bi6mcjhbzjg6a2lc30vsc8kbm3qy0nq38"; depends=[]; };
   libsoc = derive2 { name="libsoc"; version="0.7"; sha256="1r548rvj98wl0yp6jx5d2qhvy1y4883qp0w3jjk97vp07a1cywn8"; depends=[]; };
   libstableR = derive2 { name="libstableR"; version="1.0.2"; sha256="1gkcgbc8a7ks9x8mqmlz98hk55q3qy62izam7csz1s0r5dzsyqcr"; depends=[Rcpp RcppGSL]; };
-  lidR = derive2 { name="lidR"; version="2.1.0"; sha256="1rpln2ngqy7p5809ip557xila4c4xvmm7skmh4l7q07lmplxc5wl"; depends=[BH data_table future gdalUtils geometry glue gstat imager lazyeval raster Rcpp RcppArmadillo RCSF rgdal rgeos rgl rlas sf sp]; };
+  lidR = derive2 { name="lidR"; version="2.1.3"; sha256="0arpdqkkhh0dw23z8h4klm5kp8cmr3ci5sd4bla514zw482im1gy"; depends=[BH data_table future gdalUtils geometry glue imager lazyeval raster Rcpp RcppArmadillo RCSF rgdal rgeos rgl rlas sf sp]; };
   lifecontingencies = derive2 { name="lifecontingencies"; version="1.3.6"; sha256="0v8xrnmviq938x779f3h55iq8bhvbkwgz35v1dxgzbxwclj7jycl"; depends=[markovchain Rcpp]; };
   lifecourse = derive2 { name="lifecourse"; version="2.0"; sha256="1m8ihqvzhzpq2m2pdvh37bpq9pdbj23r3y0jkl3q8farh3qj473d"; depends=[TraMineR]; };
   lifecycle = derive2 { name="lifecycle"; version="0.1.0"; sha256="11rk7hkw63rfrf4aqmb4xrb88kg95xh8hajpjvjfwjym2v02h74n"; depends=[glue rlang]; };
@@ -9238,9 +9433,9 @@ in with self; {
   linemap = derive2 { name="linemap"; version="0.1.0"; sha256="0qkbmpfr742xbs3xn5ppx6q0prwrr9mk1c1mv050cm47dm7jcs6l"; depends=[sf]; };
   lineqGPR = derive2 { name="lineqGPR"; version="0.0.4"; sha256="1z7114c303cjh0wdbvsza5p0vsq6dz2kd425vg91r4bayhy4wd0k"; depends=[broom ggplot2 MASS Matrix mvtnorm nloptr quadprog restrictedMVN tmg TruncatedNormal]; };
   lineup = derive2 { name="lineup"; version="0.37-11"; sha256="0lk2wm8wsaaxw3j7yvmg6qif0r0s1jlwqyg73d3xjnjhxgy03zp4"; depends=[class qtl]; };
-  lingtypology = derive2 { name="lingtypology"; version="1.0.13"; sha256="1v6n2wdz5zkkc1k88jpjrh6nwias496dg2vvglrjd7g4bymb7715"; depends=[leaflet leaflet_minicharts magrittr MASS rgeos rowr sp stringdist]; };
+  lingtypology = derive2 { name="lingtypology"; version="1.0.14"; sha256="07pv6815a37nhab578zk677wzx8sbjf5ii4kvdg5q4jbrldmp5ia"; depends=[leaflet leaflet_minicharts rowr stringdist]; };
   linguisticsdown = derive2 { name="linguisticsdown"; version="1.2.0"; sha256="1y2g8h0p4q4mjrawzyprsdw8ynqcbpnjypyhdaf03pcwqglcirkl"; depends=[DT knitr magrittr miniUI rstudioapi shiny stringr]; };
-  link2GI = derive2 { name="link2GI"; version="0.3-5"; sha256="1mxbahxn5kfkvqdyg5mr4gqpbw90ik1xmxvl6a7d4dcacpsqzkl8"; depends=[devtools gdalUtils raster rgdal rgrass7 roxygen2 RSAGA sf sp]; };
+  link2GI = derive2 { name="link2GI"; version="0.3-7"; sha256="1zpl0lm8grcahyx4xd9axymqbja7v87p03jnhqjc8yih0227867x"; depends=[devtools R_utils roxygen2 sf]; };
   linkR = derive2 { name="linkR"; version="1.1.1"; sha256="1748r7s5g0gvsmghrb7l5lmdbzb9f4vkbgj51v308jr64r1k7l93"; depends=[svgViewR]; };
   linkcomm = derive2 { name="linkcomm"; version="1.0-11"; sha256="1w5sfmzvrk30fr161pk0cy5nj8kasqm6hqgyafq6r280b5s272cb"; depends=[dynamicTreeCut igraph RColorBrewer]; };
   linkim = derive2 { name="linkim"; version="0.1"; sha256="0yvyid9x59ias8h436a202hd2kmqvn8k1zcrgja2l4z2pzcvfn91"; depends=[]; };
@@ -9250,8 +9445,9 @@ in with self; {
   linpk = derive2 { name="linpk"; version="1.0"; sha256="14l3vv507z7x63ziynp07902599syah0icvzq4rxfjf48bf96l63"; depends=[mvtnorm]; };
   linprog = derive2 { name="linprog"; version="0.9-2"; sha256="1ki14an0pmhs2mnmfjjvdzd76pshiyvi659zf7hqvqwj0viv4dw9"; depends=[lpSolve]; };
   lintools = derive2 { name="lintools"; version="0.1.2"; sha256="18layj6a202p0sy9rs022fp0a6fwvixwwmwlyzn7h9kh4y9gvxjz"; depends=[]; };
-  lintr = derive2 { name="lintr"; version="1.0.3"; sha256="0vlsgq13g2ddv3wqcxaaf7yki9yjj3j1agkh91vqlvbi90i6s8mx"; depends=[codetools crayon digest httr igraph jsonlite knitr rex rstudioapi stringdist testthat]; };
+  lintr = derive2 { name="lintr"; version="2.0.0"; sha256="09gbci4v5n4gsfzminly8332fw7faxdi1kkyvpa10dydx02sjcwb"; depends=[codetools crayon cyclocomp digest httr jsonlite knitr rex rstudioapi stringdist testthat xml2 xmlparsedata]; };
   liqueueR = derive2 { name="liqueueR"; version="0.0.1"; sha256="0rpjib0dz39la63gy9bw9gmdfq2fcx40y4y4wcb6ky41qcjdp1nd"; depends=[itertools]; };
+  liquidSVM = derive2 { name="liquidSVM"; version="1.2.4"; sha256="1fka0jbc200n0il1qbp5nb9819afi11b1ndwqpsd6bhfjgrcga8m"; depends=[]; };
   lira = derive2 { name="lira"; version="2.0.1"; sha256="10bjmapnlw5z5cnbdpkwisvjkmk7zi9xqrvgmb5psj317zcxfc2p"; depends=[coda rjags]; };
   lisa = derive2 { name="lisa"; version="0.1.0"; sha256="042492w4gq3myqr6kpy272cxdmbr3lynja3ggrfzicvfbnrs6mzz"; depends=[]; };
   lisp = derive2 { name="lisp"; version="0.1"; sha256="025sq46277q9i21189cbmx5dnrh5wfshc5k6la1wjilhr1iqf6nj"; depends=[]; };
@@ -9282,6 +9478,7 @@ in with self; {
   lmSubsets = derive2 { name="lmSubsets"; version="0.4"; sha256="1qlljv5mdy648wk0r1ac6ak62f9n4x0dwxv8ic0v0rsxaq9q0pjz"; depends=[]; };
   lmSupport = derive2 { name="lmSupport"; version="2.9.13"; sha256="0ln5c91mbxkymgnv2nw5m3nrm5bwckpikgb9x1qhmjc55m98wkb8"; depends=[AICcmodavg car gplots gvlma lme4 pbkrtest psych pwr]; };
   lmboot = derive2 { name="lmboot"; version="0.0.1"; sha256="1v7a3vlv0187mpg3y3pj7f3pbk1v5n6amw732chy10vdw5nmfkwd"; depends=[evd]; };
+  lmds = derive2 { name="lmds"; version="0.1.0"; sha256="130azb0nc2wwxv0qi8v5s4rd02p9lc92zwn634pv7b8awbw81i65"; depends=[assertthat dynutils irlba Matrix]; };
   lme4 = derive2 { name="lme4"; version="1.1-21"; sha256="035j2hqkwv939xl07pm2vykvf3wlx8qj317846n9pkpqkyv58mbz"; depends=[boot lattice MASS Matrix minqa nlme nloptr Rcpp RcppEigen]; };
   lmeNB = derive2 { name="lmeNB"; version="1.3"; sha256="03khn9wgjbz34sx0p5b9wd3mhbknw8qyvyd5pvllmjipnir63d3q"; depends=[lmeNBBayes numDeriv statmod]; };
   lmeNBBayes = derive2 { name="lmeNBBayes"; version="1.3.1"; sha256="13shfsh9x6151xy8gicb25sind90imrwclnmfj96b76p5dvhzabm"; depends=[]; };
@@ -9309,7 +9506,7 @@ in with self; {
   lmtest = derive2 { name="lmtest"; version="0.9-37"; sha256="02nasm0j2vwkhz11dxqixs23msy1s3yj0jps6949fmgh9gwjkjfx"; depends=[zoo]; };
   lmvar = derive2 { name="lmvar"; version="1.5.2"; sha256="0wrny8yzk5y4mzpri6xv5wibbnbaxm0195lcbk5jrl5l5gs99bn6"; depends=[Matrix matrixcalc maxLik]; };
   lmviz = derive2 { name="lmviz"; version="0.1.2"; sha256="06pl0gzsbpk6l7l5np2c2rv37d2b3mr7qhxd7z4yiqiaffdrmrpz"; depends=[lmtest mgcv shiny shinyjs]; };
-  loa = derive2 { name="loa"; version="0.2.44.2"; sha256="16yrkl8l4wa4i3iizncm58l75l46acfr2lf4vn53crcci9xra333"; depends=[lattice MASS mgcv plyr png RColorBrewer RgoogleMaps]; };
+  loa = derive2 { name="loa"; version="0.2.45.4"; sha256="0dcpadv453885a2s8l064zn1xswi2v819154j822jr22kd7bj57v"; depends=[lattice MASS mgcv plyr png RColorBrewer rgdal RgoogleMaps sp]; };
   loadr = derive2 { name="loadr"; version="0.1.2"; sha256="1zqg90hxw6c3k3gd0caj8fh5ym3f97gsr9cvi6ndlzqh4957cd5n"; depends=[]; };
   lobstr = derive2 { name="lobstr"; version="1.1.1"; sha256="0vkif17825x33cz8r89j0qph4wj5l8fzfgl8nh2g7m2v140cxjdq"; depends=[crayon Rcpp rlang]; };
   localICE = derive2 { name="localICE"; version="0.1.0"; sha256="0pch4mdn0bj3rlqsai3lqrkv6pw04238n9qvlwzwcwii3wyqhkgs"; depends=[checkmate ggplot2]; };
@@ -9323,9 +9520,9 @@ in with self; {
   locpol = derive2 { name="locpol"; version="0.7-0"; sha256="1p915n0l09kbwkly627074jslxl01yssp1rf0c7sygvsw6sgy5lm"; depends=[]; };
   lodGWAS = derive2 { name="lodGWAS"; version="1.0-7"; sha256="0g5b44d3wb5hnx5l2n76myb1pc9ml3a052n1a4gvgqapa5as35s2"; depends=[rms survival]; };
   loder = derive2 { name="loder"; version="0.2.0"; sha256="0m6g8c25dmq0wgpy8y6cbggymxdvqwb6lp2yzs5bgpq183512spb"; depends=[]; };
-  lodi = derive2 { name="lodi"; version="0.9.0"; sha256="06ljky3r168navs9dys3dv22cb35lnz47wa3pqkxaiy94h254hvh"; depends=[rlang]; };
+  lodi = derive2 { name="lodi"; version="0.9.1"; sha256="1207lbin53wlacs6kk8gwzbwllddh4byvs6ai6b9d345k6f9gr56"; depends=[rlang]; };
   loe = derive2 { name="loe"; version="1.1"; sha256="1n16pgfxg9vcn729xxjbbvavg2ywbdcch9v2ph8nv3z7psc0q46c"; depends=[MASS]; };
-  log4r = derive2 { name="log4r"; version="0.3.0"; sha256="14d66xgv1z8v8wqxkycjhpl4r0z14cx9i6lxxs5y844454hh4pcf"; depends=[]; };
+  log4r = derive2 { name="log4r"; version="0.3.1"; sha256="081fsfgs1shn2002hbvx974421s1294b2l9878q591a4gmv61n1n"; depends=[]; };
   logKDE = derive2 { name="logKDE"; version="0.3.2"; sha256="09gachibj0klqa9ijw572lwphbh9qj6zqray5byq1dh7zsiq516q"; depends=[pracma Rcpp]; };
   logNormReg = derive2 { name="logNormReg"; version="0.2-0"; sha256="1mry2vqb9sqv17xw26k637w3i3zqjgayz2ql43rbz2f5248lm0yc"; depends=[]; };
   logOfGamma = derive2 { name="logOfGamma"; version="0.0.1"; sha256="0r7di0l646ycfmdjk8hli6b0v7qj0i8z3i8i7rwd3fsblb2q22vd"; depends=[]; };
@@ -9358,14 +9555,14 @@ in with self; {
   longclust = derive2 { name="longclust"; version="1.2.3"; sha256="1g45d5pak2vhbjrcmxxrk9jyrdxkqwy45phzpsw6b2bjyrgr4i7g"; depends=[]; };
   longitudinal = derive2 { name="longitudinal"; version="1.1.12"; sha256="1d83ws28nxi3kw5lgd5n5y7865djq7ky72fw3ddi1fkkhg1r9y6l"; depends=[corpcor]; };
   longitudinalData = derive2 { name="longitudinalData"; version="2.4.1"; sha256="0lnvcfgj721bawl1ciz0jw83mfsnzkhg6jn824vr3qdm4rbib2vd"; depends=[class clv misc3d rgl]; };
-  longitudinalcascade = derive2 { name="longitudinalcascade"; version="0.3.1.1"; sha256="1xm2w8qif34sv2f57996pxf1j52lyrmzaswmszpxiy1lvf2h362g"; depends=[dplyr ggplot2 lubridate rlang scales survival tidyr zoo]; };
+  longitudinalcascade = derive2 { name="longitudinalcascade"; version="0.3.2.1"; sha256="03nqglxyz6qfalxdnyh2aarxv3agn0b3r4nhsji4v9703h4m1fvg"; depends=[dplyr ggplot2 lubridate rlang scales survival tidyr zoo]; };
   longmemo = derive2 { name="longmemo"; version="1.1-1"; sha256="0myn2xpg0mw3x5zma0y1dza2jg3x9zj9z8xv2z8l2q9pm228xn0d"; depends=[]; };
   longpower = derive2 { name="longpower"; version="1.0-19"; sha256="0m5c544d6vl2zhbyi0spy7ylvr366m7vrmk3xfghcvd5anbzpjk6"; depends=[lme4 nlme]; };
   longurl = derive2 { name="longurl"; version="0.3.0"; sha256="0ysa70zlkk3ybddj3yd3vbhjnkjbrisiz5a2hgbjx10p33m1r3am"; depends=[dplyr httr purrr]; };
   loo = derive2 { name="loo"; version="2.1.0"; sha256="0zg8a11qhifg1p3hisxin1q47wlykjig4k3dz5zmflfihpps3x0v"; depends=[checkmate matrixStats]; };
   lookupTable = derive2 { name="lookupTable"; version="0.1"; sha256="0ipy0glrad2gfr75kd8p3999xnfw4pgpbg6p064qa8ljqg0n1s49"; depends=[data_table dplyr]; };
   loon = derive2 { name="loon"; version="1.2.2"; sha256="1mb6jys2pipac31x8a7rm265zvx1l11w1gl2b82afl8as2v7s90j"; depends=[gridExtra]; };
-  loon_data = derive2 { name="loon.data"; version="0.0.5"; sha256="0hvgvsv1vxx7m1fh8kjj7kfpl0c44n8xw9v8vaxlnz30s8rwhplc"; depends=[]; };
+  loon_data = derive2 { name="loon.data"; version="0.0.6"; sha256="01bd3w5xfr7lnbdhi9al5svlg7x3xs4l0jbqsrlamzc96izkm952"; depends=[]; };
   loop = derive2 { name="loop"; version="1.1"; sha256="1gr257fm92rfh1sdhsb4hy0fzwjkwvwm3v85302gzn02f86qr5dm"; depends=[MASS]; };
   loopr = derive2 { name="loopr"; version="1.0.1"; sha256="1qzfjv15ymk8mnvb556g2bfk64jpl0qcvh4bm3wihplr1whrwq6y"; depends=[dplyr lazyeval magrittr plyr R6]; };
   loose_rock = derive2 { name="loose.rock"; version="1.0.16"; sha256="0vk9zmiy730c1d397v5p7v8ywjv1wv9vabmhdjyrfdx7bijfy57m"; depends=[digest dplyr futile_options ggplot2 MASS reshape2]; };
@@ -9375,8 +9572,8 @@ in with self; {
   lori = derive2 { name="lori"; version="2.1.3"; sha256="09wk6pfrfazh8s4zc7v1x5gsra9klh7whc3jnpasvhgnna5515ys"; depends=[data_table FactoMineR rARPACK svd]; };
   lotri = derive2 { name="lotri"; version="0.1.1"; sha256="1zqp56hxqyf9a820p2d272ykqnrym2qc5sbmah68qv8ql9n1z9qg"; depends=[Matrix]; };
   lowmemtkmeans = derive2 { name="lowmemtkmeans"; version="0.1.2"; sha256="08zhdw48rzw47yzhg4s37bkliyngxs46cyb57dvng1s3m0w0dhvi"; depends=[Rcpp RcppArmadillo]; };
-  lpSolve = derive2 { name="lpSolve"; version="5.6.13.2"; sha256="0fc5m259ayc880f5hvnq59ih6nb2rlp394n756n1khmxbjpw1w3m"; depends=[]; };
-  lpSolveAPI = derive2 { name="lpSolveAPI"; version="5.5.2.0-17.3"; sha256="116adayi5xwg7l049bszz7452avfbyphivnzvy9l3k48awfimfi9"; depends=[]; };
+  lpSolve = derive2 { name="lpSolve"; version="5.6.13.3"; sha256="1xazby8amb47vw5n12k13awv7x3bjci3q8vdd3vk1ms0ii16ahg6"; depends=[]; };
+  lpSolveAPI = derive2 { name="lpSolveAPI"; version="5.5.2.0-17.4"; sha256="13z8ij045zsbn1ip7f2924ppj41bbf8kzpdsbm2h5gkplnw1yqvk"; depends=[]; };
   lpbrim = derive2 { name="lpbrim"; version="1.0.0"; sha256="1cbkzl23vgs9hf83ggkcnkmxvvj8867k5b9vhfdrznpqyqv1f2gp"; depends=[Matrix plyr RColorBrewer]; };
   lpc = derive2 { name="lpc"; version="1.0.2.1"; sha256="1g1dzm7pcrbrdk1dmhbdhj58j69dzar41al3i8q4gysf3adqzsvv"; depends=[]; };
   lpdensity = derive2 { name="lpdensity"; version="1.0"; sha256="1rmddq8drvwdlqw9ggf3h8dcvx64hh6ha2v9zdxfjmi50zlcirg5"; depends=[ggplot2]; };
@@ -9392,7 +9589,7 @@ in with self; {
   lrgs = derive2 { name="lrgs"; version="0.5.3"; sha256="0aqz07vg3z52lq224mapwgwr9mspa7aswzdfngg6x933aqsha4gj"; depends=[mvtnorm]; };
   lrmest = derive2 { name="lrmest"; version="3.0"; sha256="1yddkgza672z9y0ipgl92pg9prhmr387zsqf0qbi9k2yzfz2vvs6"; depends=[MASS psych]; };
   lsa = derive2 { name="lsa"; version="0.73.1"; sha256="1af8s32hkri1hpngl9skd6s5x6vb8nqzgnkv0s38yvgsja4xm1g5"; depends=[SnowballC]; };
-  lsasim = derive2 { name="lsasim"; version="1.0.1"; sha256="0bwk6bv0wp30v6p55nyd1hcvwnjjddwccyy1swf6sg7lw3fy657p"; depends=[]; };
+  lsasim = derive2 { name="lsasim"; version="2.0.0"; sha256="1dy9rvjn88rldqsi8vyl5vf544n65xwmqxd7cwpyk7j8sa845wxk"; depends=[mvtnorm]; };
   lsbclust = derive2 { name="lsbclust"; version="1.1"; sha256="1pbai58pfvhfcrd0nj13d54vrn9wrx2xapqhgqa1pkrjwbk5amj7"; depends=[clue doParallel foreach ggplot2 gridExtra mvtnorm plyr Rcpp reshape2]; };
   lsbs = derive2 { name="lsbs"; version="0.1"; sha256="14aq80zg89lq7hffv1v1m4n7hbzqzxkazcga4y2fq40ij3v7kv6n"; depends=[ks Matrix numDeriv]; };
   lsdv = derive2 { name="lsdv"; version="1.1"; sha256="0rl1xszr9r8v71j98gjpav30n2ncsci19hjlc9flzs1s20sb1xpr"; depends=[]; };
@@ -9402,7 +9599,7 @@ in with self; {
   lslx = derive2 { name="lslx"; version="0.6.8"; sha256="0x1xfgk0k77k3qvsqqi5cy73v1a2ra5rbfwvhm3wdjk928n1c9dv"; depends=[ggplot2 lavaan R6 Rcpp RcppEigen]; };
   lsm = derive2 { name="lsm"; version="0.1.8"; sha256="0h7gyc4wb0y3hvs21h22l57czdd3xfycg400ncz5c9s63r47wzx3"; depends=[]; };
   lsmeans = derive2 { name="lsmeans"; version="2.30-0"; sha256="1z35dzfgib0fk201gzjhgmnryhl3mkz50gz8g6nfv4mj9kzc5x5f"; depends=[emmeans]; };
-  lspartition = derive2 { name="lspartition"; version="0.3"; sha256="1pz636g60vp01z50kl9qp9yfb9bm83x761s0i901absdsqjs35a8"; depends=[combinat dplyr ggplot2 MASS matrixStats mgcv pracma]; };
+  lspartition = derive2 { name="lspartition"; version="0.4"; sha256="1n0pag5l4kx211dl5z9xbqijp7l04jcm0i6jgvkk2b0x9v32q4r5"; depends=[combinat dplyr ggplot2 MASS matrixStats mgcv pracma]; };
   lspline = derive2 { name="lspline"; version="1.0-0"; sha256="0bc1nfpp1r5fi8rrg295k4r8pm03baqplrzwmk3sn4kdbp0apvgk"; depends=[]; };
   lspls = derive2 { name="lspls"; version="0.2-2"; sha256="1cmffkyc881659l9m1miwhr3jfpwb0xb9n5chg317vcm8l9r4wcn"; depends=[pls]; };
   lsplsGlm = derive2 { name="lsplsGlm"; version="1.0"; sha256="1qh68r033fwq1hc19h2srl1k6znvvvrcp38ghxadsksjfxllvniy"; depends=[]; };
@@ -9418,10 +9615,10 @@ in with self; {
   ltxsparklines = derive2 { name="ltxsparklines"; version="1.1.2"; sha256="1jnygg7wm2768lrrzball8rn8f60xy4nc3a18h4d32jpnbhifj13"; depends=[]; };
   lubridate = derive2 { name="lubridate"; version="1.7.4"; sha256="14a823il77w3wmmnzr89vwrqp50y56dh5raycnaw6c8nv5xsh32i"; depends=[Rcpp stringr]; };
   lucid = derive2 { name="lucid"; version="1.7"; sha256="0hrb8qlm8g4h1ziwxq7m53pf7g8fxhcb2xryavm6rniqpcx8yb7g"; depends=[nlme]; };
-  ludic = derive2 { name="ludic"; version="0.1.6"; sha256="0srs3bx9cw89mlpg8b8vcmz2gnsv729j3n23pnnxgbh2w7xf705b"; depends=[fGarch landpred Matrix Rcpp RcppArmadillo]; };
+  ludic = derive2 { name="ludic"; version="0.1.7"; sha256="17cnd25pnllczccjcsslrldbzg3shcjjxcck5dx0f3pqkkxzjkih"; depends=[fGarch landpred Matrix Rcpp RcppArmadillo]; };
   lue = derive2 { name="lue"; version="0.2.1"; sha256="0is5rd1dz91bzphmfbbzi3s6rgc5g9qza2r26k70xs67dgn0qbjq"; depends=[ncdf4 raster]; };
   lulcc = derive2 { name="lulcc"; version="1.0.4"; sha256="00ymbp20kbjyzrsrxa262y0y7fj4jgsbqf56aapb657xvafxvy5q"; depends=[lattice raster rasterVis ROCR]; };
-  lumberjack = derive2 { name="lumberjack"; version="0.3.0"; sha256="00br82x9n6x96ksqqgahc1ydffl9cv8lysm57pk2mxm0fzbcph2p"; depends=[R6]; };
+  lumberjack = derive2 { name="lumberjack"; version="1.0.3"; sha256="164yajzl7c2bg5vmf32kyr49a2g5pd0ng64nqy1qrypg7dppff21"; depends=[R6]; };
   lunar = derive2 { name="lunar"; version="0.1-04"; sha256="0nkzy6sf40hxkvsnkzmqxk4sfb3nk7ay4rjdnwf2zym30qax74kk"; depends=[]; };
   lutz = derive2 { name="lutz"; version="0.3.1"; sha256="15b8gzwykxyqycjba319jpsbny07j8ny9y4lnrg8mcf488ycz57y"; depends=[lubridate Rcpp]; };
   luzlogr = derive2 { name="luzlogr"; version="0.2.0"; sha256="0n0cm94aianwcypa0gwdjvyy3dwbkfv6zi1gq2jn57b41fg20lq5"; depends=[assertthat]; };
@@ -9437,7 +9634,7 @@ in with self; {
   m2r = derive2 { name="m2r"; version="1.0.0"; sha256="07zrqhva00jsp9da9ryzi8pjdrwri2mw0mqgg91r3rnl7id8safq"; depends=[gmp memoise mpoly pryr stringr]; };
   mAr = derive2 { name="mAr"; version="1.1-2"; sha256="0i9zp8n8i3fxldgvwj045scss533zsv8p476lsla294gp174njr7"; depends=[MASS]; };
   mBvs = derive2 { name="mBvs"; version="1.3"; sha256="0vxwdi45pd79c3lz507wlw2alvf501q27lwvd34j6y68p3vyv1vj"; depends=[]; };
-  mDAG = derive2 { name="mDAG"; version="1.2"; sha256="03f60k4705jcm147jpz7srqjxrn8v0li7w0rp9ryp44mccg9qjrl"; depends=[bnlearn logistf mgm nnet pcalg Rcpp RcppArmadillo]; };
+  mDAG = derive2 { name="mDAG"; version="1.2.2"; sha256="0k85sl0jmpcpiz92cz6x3kd8jc6yyfv9z4wm1kyaikcf5q4qlad4"; depends=[bnlearn logistf mgm nnet pcalg Rcpp RcppArmadillo]; };
   mExplorer = derive2 { name="mExplorer"; version="1.0.0"; sha256="1563d9r7f25vw5vsph21z3dwz9n40dpaiyx28ay1bbp5i1x2l3rb"; depends=[nnet qusage]; };
   mFilter = derive2 { name="mFilter"; version="0.1-5"; sha256="0anc93mciq8j64knd0i38sfgv10w1gd375wnfzn1fq8sj3lby7kb"; depends=[]; };
   mGSZ = derive2 { name="mGSZ"; version="1.0"; sha256="08l98i75h2h8kx9ksvzp5qr8jhf0l6n4j7rg8fcn7hk8chn8v5zh"; depends=[Biobase GSA ismev limma MASS]; };
@@ -9446,6 +9643,8 @@ in with self; {
   mQTL = derive2 { name="mQTL"; version="1.0"; sha256="0k80xvkr0b0mp3bj2s558fjxi2zf4k7ggnw6hsjm8lr84i108dks"; depends=[MASS outliers qtl]; };
   mRMRe = derive2 { name="mRMRe"; version="2.0.9"; sha256="1zk09w9s8sc11j5cl0v93i09yn83f11diqib27rrph37aix2vs3p"; depends=[igraph survival]; };
   mRm = derive2 { name="mRm"; version="1.1.6"; sha256="1d897c5xflbkkj25hw15rd62nggv000cv2j481x0lhdgmgldjhrh"; depends=[]; };
+  mRpostman = derive2 { name="mRpostman"; version="0.2.0"; sha256="16l6531s5ljas75gm2l744nwq134v61qrq1xjn4g26zbr1q1y3c9"; depends=[assertthat base64enc curl magrittr stringr]; };
+  mSTEM = derive2 { name="mSTEM"; version="1.0-1"; sha256="0mh09mqqpq9k8jrxs9d39009idld3b4y98ik75czdy580jmdg7mm"; depends=[doParallel foreach latex2exp]; };
   mSimCC = derive2 { name="mSimCC"; version="0.0.1"; sha256="1f15r214srcdb4yacmy4hq890a674iqd2s7bry5dk20k46qdl026"; depends=[doParallel foreach]; };
   maGUI = derive2 { name="maGUI"; version="2.3"; sha256="0dr0f90ldisqxklhysipbca6di7j6ks6an5k44g65h57b85z4n3q"; depends=[affy amap annotate beadarray Biobase BiocManager Biostrings Category convert genefilter GEOmetadb GEOquery globaltest GO_db GOstats graph gWidgets gWidgetsRGtk2 impute KEGGgraph KEGGREST limma lumi marray oligo pdInfoBuilder RBGL Rgraphviz RGtk2 RSQLite simpleaffy ssize WGCNA]; };
   maSAE = derive2 { name="maSAE"; version="0.1-5"; sha256="0v0vlj41j3ddyxv8lld39k1ryrdjin7r6bj13x2agbklb1fd4an1"; depends=[]; };
@@ -9455,7 +9654,7 @@ in with self; {
   machQA = derive2 { name="machQA"; version="0.1.4"; sha256="1rdrjy9sxql2c9y691a1jrmgsv7m1ihsschixxb6wc7aahf7mav6"; depends=[machina plyr]; };
   machina = derive2 { name="machina"; version="0.1.6"; sha256="009mzqb5jgnilj9b5ldmm5600008bljlqacm8jjxvqsfnfdfg8zv"; depends=[DT httr jsonlite lubridate rhandsontable xts]; };
   macleish = derive2 { name="macleish"; version="0.3.4"; sha256="18pxb1ayqiw8irh05hib6gi5fqyxxgx93jrdd69wwcd455lmn7dv"; depends=[dplyr etl lubridate readr sf]; };
-  mada = derive2 { name="mada"; version="0.5.8"; sha256="17d41kpxjf6h8j83w6jhxm71f03nc8i2aw0xaqzrpcf5rxxy8wv8"; depends=[ellipse mvmeta mvtnorm]; };
+  mada = derive2 { name="mada"; version="0.5.9"; sha256="1l07dbgm9ghvqq9gh7g6yjfvxk0iq8xfyxz03j4nklbs10k3a0pz"; depends=[ellipse mvmeta mvtnorm]; };
   maddison = derive2 { name="maddison"; version="0.1"; sha256="1ji51wnj0ybjd30b4bwn5npyswrmcfrbxcmdlngwzvca1knh8g1c"; depends=[]; };
   maditr = derive2 { name="maditr"; version="0.6.2"; sha256="0g739j2rg3g69xnkfik94gapnwaj9v0dk1fiw3f8m2hvxyr2wf3k"; depends=[data_table magrittr]; };
   madness = derive2 { name="madness"; version="0.2.6"; sha256="1nk6kzjv0fgzbsp3crldq12id2k2wzm4bk9h9bnlkyrjf1hmfiaf"; depends=[expm Matrix matrixcalc]; };
@@ -9469,8 +9668,8 @@ in with self; {
   magicLamp = derive2 { name="magicLamp"; version="0.1.0"; sha256="1nfcnbqd6vawz8l3vgkbhmm462xdvaa4pn6axzmz8hl05xv2k3cv"; depends=[httr tibble]; };
   magicaxis = derive2 { name="magicaxis"; version="2.0.10"; sha256="053l455si22mddc5cgihhnpkmxr2anfqvbzsa89djjpw5ah2vg1x"; depends=[celestial mapproj MASS plotrix RColorBrewer sm]; };
   magicfor = derive2 { name="magicfor"; version="0.1.0"; sha256="07l33fczr1x42sfxrsqq4q6r65sdflin6l8f5cgclnvx1858jdip"; depends=[]; };
-  magick = derive2 { name="magick"; version="2.1"; sha256="1pz71maz05gx4ds1wfw0alggc8nn2w75lj12dg1zr72s3kybhkzg"; depends=[curl magrittr Rcpp]; };
-  magickGUI = derive2 { name="magickGUI"; version="1.1.0"; sha256="1grwrp7jj0p2h5aafmrbwdi3d49ck6k6bjqv9742apdvlcq8ydj7"; depends=[magick]; };
+  magick = derive2 { name="magick"; version="2.2"; sha256="1xh5mhaks3wk1iwqs9d3lnbfv121lc1yz5fqdzk5il9ppr831l85"; depends=[curl magrittr Rcpp]; };
+  magickGUI = derive2 { name="magickGUI"; version="1.1.1"; sha256="0p2266vpy6snvn0a4winwv3qygz1gkhh3kxa8qmf7qdx34xv4qwd"; depends=[magick]; };
   magree = derive2 { name="magree"; version="1.0"; sha256="1qkd6p5g3aigcb0f4d08gc5323alvahzmazm3bzsmz1w033xd1hh"; depends=[]; };
   magrittr = derive2 { name="magrittr"; version="1.5"; sha256="1s1ar6rag8m277qcqmdp02gn4awn9bdj9ax0r8s32i59mm1mki05"; depends=[]; };
   mail = derive2 { name="mail"; version="1.0"; sha256="1m89cvw5ba4d87kp2dj3f8bvd6sgj9k56prqmw761q919xwprgw6"; depends=[]; };
@@ -9507,27 +9706,27 @@ in with self; {
   mapr = derive2 { name="mapr"; version="0.4.0"; sha256="169ah9v7cpw3hmaj6n575gi1zwazf4vh59n46zghb1x68nc2gqs0"; depends=[data_table ggplot2 gistr jsonlite leaflet RColorBrewer rworldmap sp spocc]; };
   maps = derive2 { name="maps"; version="3.3.0"; sha256="05i2ppl5z4p8rawgqmy3z4ia05fcblpq1vvrmrkgkkpdlhczx6hr"; depends=[]; };
   mapsRinteractive = derive2 { name="mapsRinteractive"; version="1.0.0"; sha256="0lpmizhaan7zp201wjaq544wadizwpswch7sn6m3sjwn8rswg6av"; depends=[gstat raster rgdal rgeos sp]; };
-  mapsapi = derive2 { name="mapsapi"; version="0.4.1"; sha256="0p24snsgk95wlcpga23fdy1z192i4nzc5ags2dwz2hi3yi9qb0f1"; depends=[bitops magrittr plyr sf xml2]; };
+  mapsapi = derive2 { name="mapsapi"; version="0.4.2"; sha256="1l7sp65ghdcli6ajkvlnhfizjq16mw2cmlf8jbif3al1vhbv4dvw"; depends=[bitops magrittr plyr sf xml2]; };
   maptools = derive2 { name="maptools"; version="0.9-5"; sha256="1pbvcn9xfx0hxq1ppbfg9xm5j04q4c15nj983yjmg7dlkzq135ax"; depends=[foreign lattice sp]; };
   maptpx = derive2 { name="maptpx"; version="1.9-2"; sha256="1i5djmjg0lsi7xlkbvn90njq1lbyi74zwc2nldisay4xsbgqg7fj"; depends=[slam]; };
   maptree = derive2 { name="maptree"; version="1.4-7"; sha256="1k7v84wvy6wz6g0dyiwvd3lvf78rlfidk60ll4fz7chvr2nrqdp4"; depends=[cluster rpart]; };
   mapview = derive2 { name="mapview"; version="2.7.0"; sha256="1cqa7hw7h0n6ing87bq903ax2m4iw82xb2jdgl55z9v9rdhxp0xh"; depends=[base64enc brew htmltools htmlwidgets lattice leafem leaflet leafpop png raster Rcpp satellite scales sf sp svglite uuid viridisLite webshot]; };
   mar1s = derive2 { name="mar1s"; version="2.1.1"; sha256="1ljkvgxrramfx1rnp2rg6516mjxaa6s96amrnmqymnyjz7wlf37l"; depends=[cmrutils fda zoo]; };
-  march = derive2 { name="march"; version="1.4"; sha256="1wfhm33k2j5yim56sg0wd02ypfhlp9fc138vmdsdjp6nh4y23hnj"; depends=[]; };
+  march = derive2 { name="march"; version="3.1"; sha256="1y3ndnkxrqxavp7b5dwhn1mijhhn06k5b6iickzjr4bfmpfnk340"; depends=[]; };
   marcher = derive2 { name="marcher"; version="0.0-2"; sha256="0hcxbfrwniih4kvx5sxhlffz1pc87kf52v8hvaf193rhhdykis5q"; depends=[magrittr Matrix minpack_lm mvtnorm numDeriv plyr RColorBrewer scales zoo]; };
   marelac = derive2 { name="marelac"; version="2.1.9"; sha256="07xhlsdzz2j5smh3v4hpm8zp4ljg9aa3i67j65hs1cq27q1jg1n7"; depends=[seacarb shape]; };
   marg = derive2 { name="marg"; version="1.2-2.1"; sha256="1r6rl7dhvm8dghm7pm4hfw3924qja65hczl6d47v9ixnv4rxyzr9"; depends=[statmod survival]; };
   margins = derive2 { name="margins"; version="0.3.23"; sha256="1gn18bmz7zwdv5fm62g4kj1x0y4lzhwvwgk4xc9hfi2mh5w08j4f"; depends=[data_table MASS prediction]; };
   marima = derive2 { name="marima"; version="2.2"; sha256="03nvh93r4052li84yjqzc106gwh1542q9s192s980gs6sgy8scm6"; depends=[]; };
   marinespeed = derive2 { name="marinespeed"; version="0.1.0"; sha256="1r9bpggb88px8149dsga3xmkjhjq6ybs6a5kp60qz28iyr183mar"; depends=[bit geosphere sp]; };
-  markdown = derive2 { name="markdown"; version="1.0"; sha256="19nrz0ba1yd5kicd65crkkz2r3kialm2hm6zdkp495l2s5r80b8p"; depends=[mime]; };
+  markdown = derive2 { name="markdown"; version="1.1"; sha256="06zwbrp14bri3470anadd7dvgmw06xf8df6v2pk64wx3f9sd934d"; depends=[mime xfun]; };
   marked = derive2 { name="marked"; version="1.2.1"; sha256="138m1clidyhahpz111iblff2w44m8zp0302vcj46frk1c60c46qi"; depends=[coda expm lme4 Matrix numDeriv optimx R2admb Rcpp TMB truncnorm]; };
   markmyassignment = derive2 { name="markmyassignment"; version="0.8.2"; sha256="1jrx72k3glwv5nci3h3qbqbs0x9mqld92v4irw2sfjzcmb7qyma3"; depends=[checkmate codetools httr lazyeval rlang testthat yaml]; };
   markophylo = derive2 { name="markophylo"; version="1.0.7"; sha256="09rg5rwm0dm881fpm9yzygd6d3dyrxjsrvl0yhfpkzbpdihfympn"; depends=[ape numDeriv phangorn Rcpp RcppArmadillo]; };
-  markovchain = derive2 { name="markovchain"; version="0.6.9.16"; sha256="1mi9wr5s1a422v6fhjxjw2038bmaip1dij90v4ckg8nqp0q9zm14"; depends=[expm igraph matlab Matrix Rcpp RcppArmadillo RcppParallel]; };
+  markovchain = derive2 { name="markovchain"; version="0.8.0"; sha256="1s9qdc3jaar1m68a2j368sp7n6c8zbjz7y4c1cj8y54g0fiydqhj"; depends=[expm igraph matlab Matrix Rcpp RcppArmadillo RcppParallel]; };
   marl = derive2 { name="marl"; version="1.0"; sha256="0rndnf3rbcibv3gsrw1kfp5zhg37cw9wwlz0b7dbwprd0m71l3pm"; depends=[]; };
   marmap = derive2 { name="marmap"; version="1.0.3"; sha256="0hjy58kk2kg7v2nq7kfw5rdcrpfhikwr30lz71pfgis34833i7yy"; depends=[adehabitatMA DBI gdistance geosphere ggplot2 ncdf4 plotrix raster reshape2 RSQLite shape sp]; };
-  marqLevAlg = derive2 { name="marqLevAlg"; version="1.1"; sha256="1wmqi68g0flrlmj87vwgvyxap0miss0n42qiiw7ypyj4jw9kwm8j"; depends=[]; };
+  marqLevAlg = derive2 { name="marqLevAlg"; version="2.0.1"; sha256="0lcr5bn101krgqwjnbk9r3xizwwxnsgyi84hg95jpb5f2sa2bpg8"; depends=[doParallel foreach]; };
   mase = derive2 { name="mase"; version="0.1.2"; sha256="1023xvv6yngbc183hb13057spjildywqd0jw2w9jway3zv4dbw9v"; depends=[boot dplyr foreach glmnet magrittr Matrix Rdpack rpms survey]; };
   mason = derive2 { name="mason"; version="0.2.6"; sha256="01ppc7f18kf4xv4lrhib0cfm85v658grmxpny3h3kdb4pi4rbspy"; depends=[broom dplyr lazyeval magrittr tidyr]; };
   mastif = derive2 { name="mastif"; version="1.0"; sha256="1xxfql4d298ib9h8821jp717a60vgxq7nzs08yb3xyzp0c3djja2"; depends=[corrplot RANN Rcpp RcppArmadillo repmis xtable]; };
@@ -9549,12 +9748,12 @@ in with self; {
   matrixLaplacian = derive2 { name="matrixLaplacian"; version="1.0"; sha256="1ixqdv3sz3sc79wn3vqhlq79j7x7cvl878m5hgvbcg6klfvlmmci"; depends=[scatterplot3d]; };
   matrixNormal = derive2 { name="matrixNormal"; version="0.0.1"; sha256="1nvsgcp8x691pa2rjz2fgknybwpni6fppm16l5bjkrg47ka0pbcd"; depends=[mvtnorm]; };
   matrixProfile = derive2 { name="matrixProfile"; version="0.5.0"; sha256="0nd54k878xf7hzwxawh03c3na4jfvb68afarkwrmmffjlp3i8a9g"; depends=[fftw signal TTR zoo]; };
-  matrixStats = derive2 { name="matrixStats"; version="0.54.0"; sha256="0vx00ldsg2zvdrjn49jxczk2c9iaabgvzgpdka5j02ihh7hv83cg"; depends=[]; };
+  matrixStats = derive2 { name="matrixStats"; version="0.55.0"; sha256="06fvx0rlaz80k0lkqq2n7v0309xpz7h7ss0m9kgyikp4xs8bvmhn"; depends=[]; };
   matrixStrucTest = derive2 { name="matrixStrucTest"; version="1.0.0"; sha256="06la9xmpi1viyjml4m1akbna3lwkz5lnq95v1nnf73i9zpfwz03k"; depends=[]; };
-  matrixTests = derive2 { name="matrixTests"; version="0.1.5"; sha256="0grgvi4avlf3l4kmpn60ihnyvaxlw1fz14sx3ycgynip7b17kb24"; depends=[matrixStats]; };
+  matrixTests = derive2 { name="matrixTests"; version="0.1.6"; sha256="0kc7qh0a0m598irpbgd78h8rks3sp497w8klcr2wgm6q29dfm4c7"; depends=[matrixStats]; };
   matrixcalc = derive2 { name="matrixcalc"; version="1.0-3"; sha256="1c4w9dhi5w98qj1wwh9bbpnfk39rhiwjbanalr8bi5nmxkpcmrhp"; depends=[]; };
   matrixpls = derive2 { name="matrixpls"; version="1.0.5"; sha256="04sshb88rq2mp3y4rrs6nkzr4kc380vx380r911c7j975l55a183"; depends=[assertive lavaan MASS matrixcalc psych]; };
-  matrixsampling = derive2 { name="matrixsampling"; version="1.1.0"; sha256="1q0vcail34iwxc0wnwg2nw9n710fsjg5lgil5hib74vwrww1x1h7"; depends=[keep]; };
+  matrixsampling = derive2 { name="matrixsampling"; version="2.0.0"; sha256="05dbn7rj07jx1hj7i6k3akf11hysxg6v32kav9fvsqmiy2zkippa"; depends=[keep]; };
   matsbyname = derive2 { name="matsbyname"; version="0.4.10"; sha256="004947nqy3mps34ym506y8q31awfca7g2y2d4wdq7kncxdk4a388"; depends=[dplyr Hmisc magrittr]; };
   matsindf = derive2 { name="matsindf"; version="0.3.0"; sha256="0bvy81wj5hhgqqdyvnzk4vn883zxxzppzvrralkj6ag7q17d07dj"; depends=[dplyr magrittr matsbyname purrr rlang rlist tibble tidyr]; };
   mau = derive2 { name="mau"; version="0.1.2"; sha256="1wgiai8f1kbjh9hfwv4m0kavd44ib5xb33p8m16zpawnw14m7sj5"; depends=[data_table ggplot2 gtools igraph RColorBrewer Rdpack stringr]; };
@@ -9588,7 +9787,7 @@ in with self; {
   mcStats = derive2 { name="mcStats"; version="0.1.0"; sha256="0hwn34w3w4b09a4yl586df8wkwsvbmhpi3lh2kzkna6q0kzc380k"; depends=[dplyr ggplot2 ggthemes gridExtra magrittr tidyr]; };
   mcbiopi = derive2 { name="mcbiopi"; version="1.1.6"; sha256="1caw2sy15hw2zw0bdynwnsa7hn4rly34hlxp06nwm5lssz8l2597"; depends=[]; };
   mcc = derive2 { name="mcc"; version="1.0"; sha256="0p661a870bvh3xhcahqqq85azn9rjl3vacjy96jsdn86irj4s0vi"; depends=[]; };
-  mcca = derive2 { name="mcca"; version="0.5.0"; sha256="01biwf3jnwhd2slmw5k2kkihmg73wakqm012a3akpar9ln1q5i60"; depends=[caret e1071 MASS nnet pROC rpart]; };
+  mcca = derive2 { name="mcca"; version="0.6.0"; sha256="0frac86ahljc0pamky1zds32amh3sadd1299x8k7qcfmlv1rh4ym"; depends=[caret e1071 MASS nnet pROC rgl rpart]; };
   mccf1 = derive2 { name="mccf1"; version="1.0"; sha256="1d8dw3kb2p3n3kgpihbxmwvg4blvaiss4s09452xz0d1gkjk4y01"; depends=[ggplot2 ROCR]; };
   mcclust = derive2 { name="mcclust"; version="1.0"; sha256="00qprmsjwbn2d0jl7p9mz8pv7k8ld3mzk862pr1grigk0lqwhx06"; depends=[lpSolve]; };
   mccmeiv = derive2 { name="mccmeiv"; version="2.1"; sha256="1lkghvvwxvg474p37h1mpbackr5qmy05qkx8yiq4x066wrfq1w1i"; depends=[MASS numDeriv survival]; };
@@ -9630,7 +9829,7 @@ in with self; {
   mdmb = derive2 { name="mdmb"; version="1.3-18"; sha256="0jvwwdblky080j8cwfjna2d11z7hr672cdw9bkjz7ngd44blyp8x"; depends=[CDM coda miceadds Rcpp RcppArmadillo sirt]; };
   mdpeer = derive2 { name="mdpeer"; version="1.0.1"; sha256="1vsqhah8h47s8k687fwa352549mdz16mwk1g7rcmhx75c2k85w2q"; depends=[boot ggplot2 glmnet magic nlme nloptr psych reshape2 rootSolve]; };
   mds = derive2 { name="mds"; version="0.3.0"; sha256="098ynvwra7ylli1pklmmfl9xnmiyd13iw5zd7g2xlqmg3rrphysg"; depends=[lubridate parsedate]; };
-  mdsOpt = derive2 { name="mdsOpt"; version="0.4-1"; sha256="02na4hrv1id06gv2fwn8nxbddiz4bs4lgf3yzgxsca1k9qbsj99q"; depends=[animation clusterSim plotrix smacof smds spdep symbolicDA]; };
+  mdsOpt = derive2 { name="mdsOpt"; version="0.4-2"; sha256="1f31d3snn99bzcc4rh8dmasis9nag3q3gvbc43733q6izcjq0aa9"; depends=[animation clusterSim plotrix smacof smds spdep symbolicDA]; };
   mdscore = derive2 { name="mdscore"; version="0.1-3"; sha256="10cl5r6kd9chdik5v0q91x40xpw2cjvvyi220z4bvngpb0989x8j"; depends=[MASS]; };
   mdsdt = derive2 { name="mdsdt"; version="1.2"; sha256="0nbzc54jac4wmfyrs821ycxh749cb1zfxcws0nbpk35rydqkc627"; depends=[ellipse mnormt polycor]; };
   mdsr = derive2 { name="mdsr"; version="0.1.7"; sha256="1angy75nyhzwfhmb4axs14yl0jsxjaiqh5nz2jpmi5j890y32zda"; depends=[babynames DBI dbplyr downloader dplyr fs ggplot2 mosaic RMySQL]; };
@@ -9662,12 +9861,13 @@ in with self; {
   melviewr = derive2 { name="melviewr"; version="0.0.1"; sha256="19syc3d6zc0hmcjjdj7ibrdqxcdlh95ny970f3ska453qh1898b2"; depends=[cairoDevice gtools gWidgets gWidgetsRGtk2 jsonlite RColorBrewer RGtk2 RNifti]; };
   mem = derive2 { name="mem"; version="2.15"; sha256="1q8h6mbpzybg1vzi2pgp8fpxfrp4d729n5ghh0a54wjdwdjgkpq1"; depends=[boot dplyr EnvStats ggplot2 mclust RColorBrewer RcppRoll sm tidyr]; };
   memapp = derive2 { name="memapp"; version="2.13"; sha256="0n4awpxsz34rrz53bp4dyfgs9zssrxd4f8zyj6zw89j6ahkz85w6"; depends=[dplyr DT foreign formattable ggplot2 haven mem openxlsx plotly RColorBrewer readxl RODBC shiny shinyBS shinydashboard shinyjs shinythemes shinyWidgets stringi stringr tidyr]; };
-  meme = derive2 { name="meme"; version="0.2.1"; sha256="0ddrm82190f8yahnann1l5fwn55msfhhcizbr0vkb098x6m2l251"; depends=[ggplot2 gridGraphics magick showtext sysfonts]; };
+  meme = derive2 { name="meme"; version="0.2.2"; sha256="1q78q8080vvqni8ncqp326pidfjfia0f2b6pis08m7fr1q1gcqca"; depends=[ggplot2 gridGraphics magick showtext sysfonts]; };
   memery = derive2 { name="memery"; version="0.5.2"; sha256="1hr52g69lr2n84yczm8i8yxh7rys5nr8jk1hcmv548p5y79l8k9s"; depends=[Cairo colourpicker cowplot ggplot2 jpeg magrittr png purrr shiny shinyBS shinycssloaders showtext sysfonts]; };
   memgene = derive2 { name="memgene"; version="1.0.1"; sha256="1x3vf2f1yh40xw5vqcjlrn07zn9zh3sx4kc9dijxzygd9crl5a29"; depends=[ade4 gdistance raster vegan]; };
   memisc = derive2 { name="memisc"; version="0.99.17.2"; sha256="0w3pjgf7vr26gcva2hcrh9kab70bcnpc1nz4lxjxr9sywm7czmav"; depends=[lattice MASS repr]; };
   memnet = derive2 { name="memnet"; version="0.1.0"; sha256="1lhpij3dm4whsawy6cxcfcwn9q881i8jbjpkrwvdsn63ibxrm55s"; depends=[BH igraph Rcpp]; };
   memo = derive2 { name="memo"; version="1.0.1"; sha256="14nvqi1qsin45ksd0wp9cigjk1gghr4jijdqkaqh177dwa244r9j"; depends=[digest]; };
+  memochange = derive2 { name="memochange"; version="1.0.0"; sha256="1hisd1f4chcavhw4rnalz1wj16rnd12p1fxmvghmj8gcnm4b5sx2"; depends=[fracdiff longmemo LongMemoryTS sandwich strucchange urca]; };
   memoise = derive2 { name="memoise"; version="1.1.0"; sha256="034qfc2xlh30x1q2vya239w34a3ir3y2fwnx2agbgbi6592zjxmj"; depends=[digest]; };
   memor = derive2 { name="memor"; version="0.2"; sha256="10w2jw9ma7yds2d179l7bv4rzpggp3l04kvqnncii6yf5f4lj9cd"; depends=[knitr rmarkdown yaml]; };
   memoria = derive2 { name="memoria"; version="1.0.0"; sha256="05nx6xkgf1mkn1ajjizwp66xhn7ddbvgdnmkdbcl4s7sq456vczw"; depends=[cowplot ggplot2 HH ranger stringr tidyr viridis viridisLite zoo]; };
@@ -9683,10 +9883,10 @@ in with self; {
   metR = derive2 { name="metR"; version="0.4.0"; sha256="1j4y2nn2r1i29h2invid8s695nv7b1lfanqspc281gjkrkns77ps"; depends=[checkmate curl data_table digest dplyr fields Formula formula_tools ggplot2 gridExtra gtable lubridate maps maptools Matrix memoise plyr purrr RCurl scales sp stringr]; };
   metRology = derive2 { name="metRology"; version="0.9-28-1"; sha256="1syjwblyd18myxrs0hx4m91fgb6zs3r4g7w701j2f2pw6j9mvz0y"; depends=[MASS numDeriv robustbase]; };
   metScanR = derive2 { name="metScanR"; version="1.2.2"; sha256="07j9y54z039gnrp8w6xi0xj4xzl8x2qjlzgf4nh9frmwqd6cld2i"; depends=[geosphere leaflet matlab plyr RCurl]; };
-  meta = derive2 { name="meta"; version="4.9-5"; sha256="1yk8akhxa6nzmj4y6q82jgyhfjdv5bz2x52ppp5jdrw61nmx4qc3"; depends=[lme4 metafor]; };
+  meta = derive2 { name="meta"; version="4.9-7"; sha256="0fwas40007sm6x6zf7vv8527qj7kq6h6amqsyl68nilvwfg4d0ap"; depends=[lme4 metafor]; };
   meta4diag = derive2 { name="meta4diag"; version="2.0.8"; sha256="1ila8x9r1rdmlwfpzfx1zj5yx1m4yrbhyb74db4wqbh1dswn7zsm"; depends=[caTools shiny shinyBS sp]; };
   metaBLUE = derive2 { name="metaBLUE"; version="1.0.0"; sha256="0ppn4bvr10z32pghmv4wjv86k6n5y5bkfxc6h5mvb556v6jnl6d8"; depends=[Matrix]; };
-  metaBMA = derive2 { name="metaBMA"; version="0.6.1"; sha256="1m6q027hf3ysdjajv348x3cdwgxmf0x273swfpmg88h7p91xn1j7"; depends=[BH bridgesampling coda LaplacesDemon logspline mvtnorm Rcpp RcppEigen rstan rstantools StanHeaders]; };
+  metaBMA = derive2 { name="metaBMA"; version="0.6.2"; sha256="0g2npgr9rqf0f9xqdp4wl3263shrp28j4i63j4fwd91xk9qmy8my"; depends=[BH bridgesampling coda LaplacesDemon logspline mvtnorm Rcpp RcppEigen rstan rstantools StanHeaders]; };
   metaDigitise = derive2 { name="metaDigitise"; version="1.0.0"; sha256="04hycv9dpy39l8fhql69mcn5w97f7sjxrhiz5vbpbawvfbkl0f0l"; depends=[magick purrr]; };
   metaLik = derive2 { name="metaLik"; version="0.43.0"; sha256="1li40pgd9z00nrph9njwn6wysb1i9dkpqzcp6fzds6asvcxlqqfl"; depends=[]; };
   metaMA = derive2 { name="metaMA"; version="3.1.2"; sha256="1mjyz06q1kc8lhfixpym4ndpnisi1r849fj3da6riwfd6ab1v181"; depends=[limma SMVar]; };
@@ -9698,8 +9898,8 @@ in with self; {
   metacart = derive2 { name="metacart"; version="2.0-1"; sha256="1dv4vq3pxbmjg8xxjjxxqnl3njy4v7j20ha90sj1i2dd814y0r72"; depends=[ggplot2 gridExtra Rcpp rpart]; };
   metacoder = derive2 { name="metacoder"; version="0.3.3"; sha256="0d7fpx5zpggc8k3y882mlw4szn7ghzckyiaxj9x652xink8zi397"; depends=[ape biomformat cowplot crayon dplyr GA ggfittext ggplot2 ggrepel igraph lazyeval magrittr phylotate RColorBrewer Rcpp RCurl readr reshape reshape2 rlang scales seqinr stringr svglite taxa taxize tibble traits vegan viridisLite zoo]; };
   metacom = derive2 { name="metacom"; version="1.5.1"; sha256="18n3mbmjna3db44gscsdgv1j8f11jhikiw7yg3vbw2a9v5w3ypkv"; depends=[vegan]; };
-  metacor = derive2 { name="metacor"; version="1.0-2"; sha256="04k3ph0yg3jp8x4g6l1h4m0qwl51mx0626xmm0fzr1pv4b4a1ypw"; depends=[gsl rmeta]; };
-  metadynminer = derive2 { name="metadynminer"; version="0.1.5"; sha256="0lbhw29ymgp23cffn0qq451fngwqqsr9a9azx8qfwfjl40gh86j1"; depends=[Rcpp]; };
+  metacor = derive2 { name="metacor"; version="1.0-2.1"; sha256="0y3z7jbhw5c2dbn9fx9wlw1311irjc2xvnm5hnaixbbj53qz24n0"; depends=[gsl rmeta]; };
+  metadynminer = derive2 { name="metadynminer"; version="0.1.6"; sha256="0zg08lwnimnmfwac0d5kg8yhsl88gmn029dra18phy1jzkfnsx34"; depends=[Rcpp]; };
   metadynminer3d = derive2 { name="metadynminer3d"; version="0.0.1"; sha256="0riqr2hhk4h0rm7m4njb2dd2f24jff7lzf9chh83sq4q3wldgpz5"; depends=[metadynminer misc3d Rcpp rgl]; };
   metafolio = derive2 { name="metafolio"; version="0.1.0"; sha256="18s78lljwnn3j0l3mqc0svszcb3c8yzyzlpnimndbiq9yxagxnnf"; depends=[colorspace MASS plyr Rcpp RcppArmadillo]; };
   metafor = derive2 { name="metafor"; version="2.1-0"; sha256="009x5w163g4pbak23i5xw3ipk5s9xljkdj9py5vir3vpxxazk267"; depends=[Matrix nlme]; };
@@ -9710,7 +9910,8 @@ in with self; {
   metaheur = derive2 { name="metaheur"; version="0.2.0"; sha256="1rr5mjx3v87alj7cl9hxldvhhbpkz1fzmymmkqv0hs65pny6gbqw"; depends=[doParallel foreach ggplot2 preprocomb reshape2]; };
   metaheuristicOpt = derive2 { name="metaheuristicOpt"; version="2.0.0"; sha256="0ra4hl9l1jlzymj218m2i6xrxfacyx4aaln5pk7q4di2ks0nq11m"; depends=[]; };
   metamedian = derive2 { name="metamedian"; version="0.1.4"; sha256="00jzgf8zdcbgnz89g55lq9c6ybh3praa68b9wwj6sx63hnkicvgd"; depends=[estmeansd Hmisc metafor]; };
-  metamer = derive2 { name="metamer"; version="0.1.0"; sha256="03a7r5dsqjxhjmdq5ybg18l9nf7szn848q9zr4jdyfxw8wi2y75k"; depends=[FNN progress]; };
+  metamer = derive2 { name="metamer"; version="0.2.0"; sha256="0wdhr83mph9v7vb9mfhf7lcwmp0smz72sniass7kxcbj6j9hga4g"; depends=[FNN progress]; };
+  metamicrobiomeR = derive2 { name="metamicrobiomeR"; version="1.1"; sha256="16ymdhhr7h2785gfgrw7qi1fjvawiz599h42qi7l0v6djinbxlw2"; depends=[caret compositions dplyr foreign gamlss gdata ggplot2 gplots gridExtra httr jsonlite knitr lme4 lmerTest magrittr matrixStats meta mgcv plyr randomForest RColorBrewer RCurl repmis reshape2 rmarkdown tidyr zCompositions]; };
   metamisc = derive2 { name="metamisc"; version="0.2.0"; sha256="052hvnf9dvz9x8jbq7358jgg23iw4zpx7yqdrbrl1gdyahn0k75g"; depends=[ggplot2 lme4 metafor mvtnorm plyr pROC]; };
   metansue = derive2 { name="metansue"; version="2.3"; sha256="18vy294862lfgxiw9cikai9svy3wpwk2bvz3vp20fcslg90mn3xp"; depends=[]; };
   metap = derive2 { name="metap"; version="1.1"; sha256="10kv7z8pik5iy374h399vws0ldf41y2nczlwh8axqf9dcwl084i0"; depends=[lattice Rdpack]; };
@@ -9719,7 +9920,7 @@ in with self; {
   metaplus = derive2 { name="metaplus"; version="0.7-11"; sha256="05pkgw0zlq3q9mvdw2yxz9mxzqwq3c8q6cwvh87cigw1pf8y9an7"; depends=[bbmle boot fastGHQuad lme4 MASS metafor numDeriv]; };
   metapost = derive2 { name="metapost"; version="1.0-6"; sha256="098f7sifg814mc4sb1nb4d6dlr1xms5hwyp08ksxg0i4ayf9jf3c"; depends=[gridBezier]; };
   metapro = derive2 { name="metapro"; version="1.5.8"; sha256="0ymbqzm317fiywzxaizddhvjzwp2wyx9y7zgbg4nrz11l3r2bp2n"; depends=[metap rSymPy]; };
-  metasens = derive2 { name="metasens"; version="0.3-2"; sha256="1wxp6gzq3wmas8hm8vqxclawxkc4p8dw2apzmg0nciqvas6dzic8"; depends=[meta]; };
+  metasens = derive2 { name="metasens"; version="0.4-0"; sha256="1rgb2b48lwvrg1f39dzg6d9jr1ya2p7la2jrc3zs3jks28arjr2x"; depends=[meta]; };
   metatest = derive2 { name="metatest"; version="1.0-5"; sha256="1h3dcs1m7606b3a41yw2lak3lrqmsbpnx67qv24wvq003apz1sfd"; depends=[]; };
   metavcov = derive2 { name="metavcov"; version="1.1"; sha256="1x87knvypkfg0x223aiak7fy7zdlfn74crmvnqzhxf2vmxljnvnh"; depends=[corpcor]; };
   metaviz = derive2 { name="metaviz"; version="0.3.0"; sha256="1ayz9za3zwmyna1hanzm83gb7vw3dclj3z4g35rk5dz6s4zgqsvm"; depends=[dplyr ggplot2 ggpubr gridExtra metafor nullabor RColorBrewer]; };
@@ -9729,28 +9930,28 @@ in with self; {
   meteoForecast = derive2 { name="meteoForecast"; version="0.53"; sha256="15bjhkcn4zcll3cfgpzcdj0zv753x29qsjndy3h2zzqn83qywx9s"; depends=[ncdf4 raster sp XML zoo]; };
   meteogRam = derive2 { name="meteogRam"; version="1.0"; sha256="167gyxjnl4dyfqs3znv8sdpkvpqdxzdqi1g730s30gycrm9snap9"; depends=[ggplot2 RadioSonde]; };
   meteoland = derive2 { name="meteoland"; version="0.8.1"; sha256="1896cqfm8c2ck4w5fkvjwi9kxf713r9bxfjsakv10ii02r78hk95"; depends=[httr jsonlite ncdf4 ncdf4_helpers Rcpp rgdal sp spdep]; };
+  meteor = derive2 { name="meteor"; version="0.3-4"; sha256="01009d9wpxybig4n82m48hqqg1k4x4shcjxfy8y0kk7cgfdb4naw"; depends=[Rcpp]; };
   metricTester = derive2 { name="metricTester"; version="1.3.4"; sha256="1z4z8km1jr0azh2zxp1sffm5picc9y6w9yn68zr1axli0l64y3a0"; depends=[ape doParallel dplyr foreach geiger MASS picante plotrix spacodiR]; };
   metricsgraphics = derive2 { name="metricsgraphics"; version="0.9.0"; sha256="1zbx82b34y0rr4w7rzvyc1nzk95w6cdkg0j1kkshbmkvplq6v9i4"; depends=[htmltools htmlwidgets magrittr]; };
-  mets = derive2 { name="mets"; version="1.2.5"; sha256="00vib9a7y031parj1yw5v3c9skz1bp1a0j104vprr40phbqlh9rm"; depends=[lava numDeriv Rcpp RcppArmadillo survival timereg]; };
+  mets = derive2 { name="mets"; version="1.2.6"; sha256="0vaqizmr27144dkh5mh095vih0p70j3ly9zwk5h0fklmn8bf2qhl"; depends=[lava mvtnorm numDeriv Rcpp RcppArmadillo survival timereg]; };
   metsyn = derive2 { name="metsyn"; version="0.1.2"; sha256="0iwp0nz07yd33qd93fjblmvik1l1xkv6rkccn3054zs2bkrzjq4f"; depends=[foreach readr stringr tibble]; };
   mev = derive2 { name="mev"; version="1.12"; sha256="1vq2l6znwagxs6h216lzf8x14656x192ylwvc5gr3b0y7ry0rqdf"; depends=[alabama boot evd nleqslv nloptr Rcpp RcppArmadillo TruncatedNormal]; };
   mewAvg = derive2 { name="mewAvg"; version="0.3.0"; sha256="16gc78ccjffp9qgc7rs622jql54ij83ygvph3hz19wpk22m96glm"; depends=[]; };
   mexhaz = derive2 { name="mexhaz"; version="1.6"; sha256="18gaji566hwfmpfznhlcvvk6f667vhadap3qcklpgddjaca2yc0v"; depends=[MASS numDeriv statmod survival]; };
   mfGARCH = derive2 { name="mfGARCH"; version="0.1.8"; sha256="1pzzn4s98fsyqkrldnpqgxg7ia60dikq73bbfn6xgc63gr6l78r2"; depends=[maxLik numDeriv Rcpp zoo]; };
-  mfbvar = derive2 { name="mfbvar"; version="0.4.0"; sha256="1bxfs7081nd7l0lknag2n184rd1d91cr5sgsnjsfwgdbws8sl8d3"; depends=[ggplot2 pbapply Rcpp RcppArmadillo]; };
-  mfe = derive2 { name="mfe"; version="0.1.2"; sha256="0vckvabk50zmrspjwc36g8l216rfcyc33ah1f4sg1nsi6g8i03k3"; depends=[cluster e1071 infotheo MASS rpart rrcov]; };
+  mfbvar = derive2 { name="mfbvar"; version="0.5.1"; sha256="1s6qmjsj6d5yds06m3fjqqvvfa19ara4rv8b04r8ax8wjci66ix9"; depends=[dplyr ggplot2 GIGrvg lubridate magrittr Rcpp RcppArmadillo RcppParallel RcppProgress stochvol tibble]; };
+  mfe = derive2 { name="mfe"; version="0.1.3"; sha256="1y0l81z2ds3fv3j9jbqgv0s0hwizy246a3iwfp60phqy47rbd8jj"; depends=[cluster clusterCrit e1071 infotheo MASS rpart rrcov]; };
   mfp = derive2 { name="mfp"; version="1.5.2"; sha256="1i90ggbyk2p1ym7xvbf4rhyl51kmfp6ibc1dnmphgw15wy56y97a"; depends=[survival]; };
   mfx = derive2 { name="mfx"; version="1.2-2"; sha256="04pwp67i4sn4rf497pgy6qifwvrcmwyxn8x5sn96fy8qyrdzjfhj"; depends=[betareg lmtest MASS sandwich]; };
   mgarchBEKK = derive2 { name="mgarchBEKK"; version="0.0.2"; sha256="1k4c34srnckbh5kchzmm44l91ma9sw0gi4y225igs3cl79212q9c"; depends=[mvtnorm tseries]; };
   mgc = derive2 { name="mgc"; version="1.0.1"; sha256="0bdj890v2rinsddny8kwa48cgqh9qlzfd7k5s4i9mg40ajr0f291"; depends=[MASS SDMTools]; };
   mgcViz = derive2 { name="mgcViz"; version="0.1.4"; sha256="0gxxmnawvq88jljdszhjw85px4w0q73nmgyq61hlfvjd2k8lscc8"; depends=[gamm4 GGally ggplot2 gridExtra KernSmooth matrixStats mgcv miniUI plyr qgam rgl shiny viridis]; };
-  mgcv = derive2 { name="mgcv"; version="1.8-28"; sha256="1snkpnkkigwrj9zm31j1nlivv9ls56imz263cv167hnmghiahpmm"; depends=[Matrix nlme]; };
+  mgcv = derive2 { name="mgcv"; version="1.8-29"; sha256="1236gz25nap1aprbvcrqvmmnl6f8cvbjy8dcl4j968cpalqax5ww"; depends=[Matrix nlme]; };
   mglmn = derive2 { name="mglmn"; version="0.0.2"; sha256="1ijkmr85s4yya0hfwcyqqskbprnkcbq8sc9c889i0gy0543fgqz4"; depends=[mvabund snowfall]; };
-  mgm = derive2 { name="mgm"; version="1.2-6"; sha256="1pgw9gfrq1md8cpm8wf39f0n26hrynil1hc4px0vvilzal5yj3bc"; depends=[glmnet gtools Hmisc matrixcalc qgraph stringr]; };
+  mgm = derive2 { name="mgm"; version="1.2-7"; sha256="1s0m9xjq2d067ba2cx87q83nqmdza34vw9g0g0mqd8ap53rmqhas"; depends=[glmnet gtools Hmisc matrixcalc qgraph stringr]; };
   mgpd = derive2 { name="mgpd"; version="1.99"; sha256="0cxpgza9i0hjm5w1i5crzlgh740v143120zwjn95cav8pk8n2wyb"; depends=[corpcor evd fields numDeriv]; };
   mgsub = derive2 { name="mgsub"; version="1.7.1"; sha256="0v3386a7i71ixqidqfqakl428rnq0z9pjz08lgmyvray0ls5vmvi"; depends=[]; };
   mgwrsar = derive2 { name="mgwrsar"; version="0.1"; sha256="13h56fgq3fs28fqh19hwbcza622xd921qnjwcgw2rjwaabqz70w5"; depends=[doParallel foreach htmltools leaflet Matrix nabor Rcpp RcppEigen sp spgwr]; };
-  mhde = derive2 { name="mhde"; version="1.0-1"; sha256="1q7lbj2is024f5rmfpdn3a0hsb78bf62ddal3chhnh3bi1z3jrjk"; depends=[]; };
   mhsmm = derive2 { name="mhsmm"; version="0.4.16"; sha256="009dj0zkj1zry7jr9hf4cknb686z50a2l967if64xm0dvjmp7dgs"; depends=[mvtnorm]; };
   mht = derive2 { name="mht"; version="3.1.2"; sha256="01zcaf9k0qayzm8dn5dvnm5n3qgqpj8r96qhqaa5vbjcr6ci2x2r"; depends=[glmnet Matrix]; };
   mhtboot = derive2 { name="mhtboot"; version="1.3.3"; sha256="1z0p8ny9lpnrshgas7cad2lv7j0blw0n6ihiimw600n70h73jwrn"; depends=[ggplot2 reshape2]; };
@@ -9769,18 +9970,19 @@ in with self; {
   micEconSNQP = derive2 { name="micEconSNQP"; version="0.6-6"; sha256="1n3pxapc90iz1w3plaqflayd0b1jqd65yw5nbbm9xz0ih132dby9"; depends=[MASS miscTools systemfit]; };
   micar = derive2 { name="micar"; version="1.1.1"; sha256="09vpijva39fwpvdpfglwr3xmz469pnmz371ms7z5av6w2193ls5n"; depends=[httr jsonlite]; };
   mice = derive2 { name="mice"; version="3.6.0"; sha256="0pgcxdmp77604h6f4x8hhs6j4xdjgf5b9zvnixyzdj8vcgdjpivv"; depends=[broom dplyr lattice MASS mitml nnet Rcpp rlang rpart survival]; };
-  miceFast = derive2 { name="miceFast"; version="0.2.3"; sha256="0ngb2qs71x0i8ffyb1qlbz2wk6c87m1r74l547c5pc9agnc227m0"; depends=[Rcpp RcppArmadillo]; };
+  miceFast = derive2 { name="miceFast"; version="0.5.1"; sha256="0n09l6y7jwcskv2lfynyzl614c7x84yyc52wqwyhnzvd8lzapp5d"; depends=[data_table Rcpp RcppArmadillo]; };
   miceMNAR = derive2 { name="miceMNAR"; version="1.0.2"; sha256="1s607icaf3c25mn8xdi3zkzmm8m7qd9a6vjdlz5j7ig2gc9f2y2d"; depends=[GJRM mice mvtnorm pbivnorm sampleSelection]; };
-  miceadds = derive2 { name="miceadds"; version="3.4-17"; sha256="1yf6shdgz9hbz37y9hz5zbg17m5cd79ik49nwr6sb6ml8lxxi0s9"; depends=[mice mitools Rcpp RcppArmadillo]; };
+  miceadds = derive2 { name="miceadds"; version="3.5-14"; sha256="1fk554wkjz6xmqc5ymimp96xvcv57c91g1wsykb8yql9x11c9gbz"; depends=[mice mitools Rcpp RcppArmadillo]; };
   micemd = derive2 { name="micemd"; version="1.6.0"; sha256="1n8kzdf2713dw9mbzvbwl0gknzi9amdqnabfw2wmb70gsvma3f48"; depends=[abind digest jomo lme4 MASS Matrix mice mvmeta mvtnorm nlme]; };
   michelRodange = derive2 { name="michelRodange"; version="1.0.0"; sha256="1pykqb9hmpvn77k0vhfh36iyhamz9h5kpswq3ql31h9nknfy3ixi"; depends=[magrittr]; };
   micompr = derive2 { name="micompr"; version="1.1.0"; sha256="0qsxs35mmqx8hpszcb1z87xczh0vh0m0plqrj22af5mjjvif76n9"; depends=[]; };
-  microPop = derive2 { name="microPop"; version="1.4.1"; sha256="1xm1yfdbv0kp0dvk4dhjrr2rjydpnh13vm5kfzyj39rwpmrrim3f"; depends=[deSolve]; };
+  microPop = derive2 { name="microPop"; version="1.5"; sha256="1gikp20n2b50fkybbg2hmlfjdcm0imjwygjsjnyv3wrjzypm2i78"; depends=[deSolve]; };
   microbats = derive2 { name="microbats"; version="0.1-1"; sha256="1mahvblaiwg1xk2s34wd1ic8ddc9lh6g0azik2pd97bsf0krkyw8"; depends=[]; };
-  microbenchmark = derive2 { name="microbenchmark"; version="1.4-6"; sha256="1sn1fxgzakm5iqbgc35g3k4yi0iqrkmwz33cvdrphrzh1lxnmi3s"; depends=[]; };
+  microbenchmark = derive2 { name="microbenchmark"; version="1.4-7"; sha256="1xl4m4yl4h2zcjiz8wsa7f3sh55qg2xr3sgpvz18rlix6b3173r6"; depends=[]; };
   microclass = derive2 { name="microclass"; version="1.1"; sha256="0hl2s4135k187f0vqmj9snvmnwa5k9fg8ahivfs7ciknrcxfv3nk"; depends=[microcontax microseq Rcpp RcppEigen RcppParallel]; };
   microcontax = derive2 { name="microcontax"; version="1.0"; sha256="0l5mfgda5xagjbh9bwv328k3m7kgggdm90rc8fr1ic59hvg56f3g"; depends=[microseq]; };
   microdemic = derive2 { name="microdemic"; version="0.4.0"; sha256="0i4pkrw02ad8ssvryndf7pxgk5wcyn4126yvl28fxk38249kvc9v"; depends=[crul data_table jsonlite tibble]; };
+  microhaplot = derive2 { name="microhaplot"; version="1.0.1"; sha256="0g15g7d19yz11nn2g0h8h2m8k1cvmpryz72pnalgv5yi58md5l5i"; depends=[dplyr DT ggiraph ggplot2 gtools magrittr scales shiny shinyBS shinyWidgets tidyr]; };
   micromap = derive2 { name="micromap"; version="1.9.3"; sha256="1iciwy0kcg4qa0xc4gkqcilq33ac1s184vw13cbbkv0d1b5cgkgv"; depends=[ggplot2 maptools RColorBrewer rgdal sp]; };
   micromapST = derive2 { name="micromapST"; version="1.1.1"; sha256="15ch132x3wnpf7rmy25nah7iyfxfk90p7lvavqjhrnavhjsfxbxx"; depends=[labeling RColorBrewer stringr]; };
   micropan = derive2 { name="micropan"; version="1.2"; sha256="1b3hd5c6l9njns372zhqfryibrpqmrjxmc1p5gzdwm7450cs7qky"; depends=[BH igraph microseq Rcpp]; };
@@ -9819,7 +10021,8 @@ in with self; {
   minxent = derive2 { name="minxent"; version="0.01"; sha256="1a0kak4ff1mnpvc9arr3sihp4adialnxxyaacdgmwpw61wgcir7h"; depends=[]; };
   mipfp = derive2 { name="mipfp"; version="3.2.1"; sha256="1gxazpg81vj5dywpb6jb29188jw28qil6pfygawa7znnjn3k5ca6"; depends=[cmm numDeriv Rsolnp]; };
   mipred = derive2 { name="mipred"; version="0.0.1"; sha256="0kijn2xj0dh28rm2sjgd8j1a3c5avc3fjfvvcmzfasvxqdjflv6j"; depends=[mice]; };
-  mirt = derive2 { name="mirt"; version="1.30"; sha256="1j4l7hnx2rj6nixs7ylcvc7d24wbj1mfs9fccsyhzrrwadn6drvq"; depends=[dcurver Deriv GPArotation lattice mgcv Rcpp RcppArmadillo vegan]; };
+  miraculix = derive2 { name="miraculix"; version="0.9.4"; sha256="14wc1bagrlcpa6r563r8slp5kb5v2vz1il6wh105qns1w8i9rrgi"; depends=[RandomFieldsUtils]; };
+  mirt = derive2 { name="mirt"; version="1.31"; sha256="1jfpb69ih0kyffjf9k7z8yhfyw6ngqhkjxmpzgmm0v8lr2mnw0gq"; depends=[dcurver Deriv GPArotation lattice mgcv Rcpp RcppArmadillo vegan]; };
   mirtCAT = derive2 { name="mirtCAT"; version="1.9.3"; sha256="1yd03rkviqxl9rsqnny3fgn2rj0hss49nav11b9w4np8lv9zkwgh"; depends=[lattice lpSolve markdown mirt pbapply Rcpp RcppArmadillo shiny]; };
   mirtjml = derive2 { name="mirtjml"; version="1.2"; sha256="0vjcbgl1s8haqc0xi4k8dsqvhr2qyz4ikhjwmqrxyl5xssjy330r"; depends=[GPArotation Rcpp RcppArmadillo]; };
   misaem = derive2 { name="misaem"; version="0.9.1"; sha256="1790igbb4nlp9d9h17gzp3backazpf8bi66n1ik3h58qwv4610hj"; depends=[MASS mvtnorm]; };
@@ -9838,8 +10041,8 @@ in with self; {
   missForest = derive2 { name="missForest"; version="1.4"; sha256="0y02dhrbcx10hfkakg5ysr3kpyrsh2d9i5b0qzhj9x5x0d5q11gp"; depends=[foreach itertools randomForest]; };
   missMDA = derive2 { name="missMDA"; version="1.14"; sha256="1pqwfs1p7i624ilddj48i4kig6pjw5b28ic33l09g0c4bq7nw5lh"; depends=[doParallel FactoMineR foreach mice mvtnorm]; };
   missRanger = derive2 { name="missRanger"; version="2.1.0"; sha256="06ic99zg91ikzvmwbj05ma46rc4ayfwylv8cnj21sbr5nxw0qpz9"; depends=[FNN ranger]; };
-  missSBM = derive2 { name="missSBM"; version="0.2.0"; sha256="0lszypzz0qdp1jw7l9i3gajzmk54acai32w4xbxqcc6pi4q057r6"; depends=[ape corrplot igraph magrittr nloptr R6 Rcpp RcppArmadillo]; };
-  missingHE = derive2 { name="missingHE"; version="1.1.1"; sha256="02k2n5kap5n1zhzjv7y2dd5hrxh979ha5w66hixlhylhc1ar0w20"; depends=[BCEA coda ggmcmc ggplot2 ggthemes gridExtra loo mcmcplots mcmcr R2jags]; };
+  missSBM = derive2 { name="missSBM"; version="0.2.1"; sha256="00jxj1f7hr78srlm49finf9j2q14y1cl66rwdkm1i81l8db5fvcp"; depends=[ape corrplot ggplot2 igraph magrittr nloptr R6 Rcpp RcppArmadillo]; };
+  missingHE = derive2 { name="missingHE"; version="1.2.1"; sha256="1ckkszq9c095svg3syfnrcdxy64yfm14rskglpsiyl1d4im9h9c8"; depends=[bayesplot BCEA coda ggmcmc ggplot2 ggthemes gridExtra loo mcmcplots mcmcr R2jags]; };
   mistat = derive2 { name="mistat"; version="1.0-5"; sha256="1vyx918b7iv1wcnk23bnlxljwy0hglpdx5drhrs5qcd45f6jrghc"; depends=[]; };
   mistr = derive2 { name="mistr"; version="0.0.2"; sha256="12zh6ys3lfc5ylidjhbmbxvbhjd3rg9vd89pv94547z9y1yf6sx5"; depends=[bbmle]; };
   mistral = derive2 { name="mistral"; version="2.1.0"; sha256="1cr79p8q82lpj9d0y6q24xmfkxmnlqv8ivkd0baj7fxfb1nb8sak"; depends=[DiceKriging doParallel e1071 emoa foreach ggplot2 iterators Matrix mvtnorm quadprog]; };
@@ -9852,18 +10055,19 @@ in with self; {
   mixPHM = derive2 { name="mixPHM"; version="0.7-2"; sha256="1wvkdb9zj2j8dpppnyins05rg877zbydqsl3qaan62wznkknxcac"; depends=[lattice survival]; };
   mixR = derive2 { name="mixR"; version="0.1.1"; sha256="1xd3v5rk59380zh7r6l5blmcy4gib9xp44j5dcrk6ivs6fgycsxh"; depends=[ggplot2 Rcpp]; };
   mixRasch = derive2 { name="mixRasch"; version="1.1"; sha256="1r067pv7b54y1bz8p496wxv4by96dxfi2n1c99gziqf5ramx3qzp"; depends=[]; };
-  mixRaschTools = derive2 { name="mixRaschTools"; version="1.1"; sha256="17idr4gyc2pv4zdwk6rgm15z32cn4271lf4hf64n8dgi0rbjlpxh"; depends=[]; };
+  mixRaschTools = derive2 { name="mixRaschTools"; version="1.1.1"; sha256="1giq6d97sg6f66sh0gw6x1f2ax4ys91kfnrlpdv37m7qakk5npyj"; depends=[]; };
   mixSPE = derive2 { name="mixSPE"; version="0.1.1"; sha256="103lr74wryrk7sakss9cn774fjwy5xqc4hrcr7ig6m0dzyx4gqzl"; depends=[mvtnorm]; };
   mixchar = derive2 { name="mixchar"; version="0.1.0"; sha256="1az2gggwipkzg86pvn9w2csgfgrpdc88kca51f5qcw0zk4wx5hlx"; depends=[minpack_lm nloptr tmvtnorm zoo]; };
-  mixdir = derive2 { name="mixdir"; version="0.2.0"; sha256="0z6scpvayfr2j1577s80pf9qh69f6qdczh488xvsm1rmf595s699"; depends=[extraDistr Rcpp]; };
+  mixdir = derive2 { name="mixdir"; version="0.3.0"; sha256="1vgxxzsrl660agk4cjw4q4gx28fv5mkzpjy4qanq5c9mqpcxbxkc"; depends=[extraDistr Rcpp]; };
   mixdist = derive2 { name="mixdist"; version="0.5-5"; sha256="1wchhysd33xz395hq4wgd3zv1qc92pbiqxqd7g2v6m1pb0j8ma9g"; depends=[]; };
+  mixedClust = derive2 { name="mixedClust"; version="1.0.1"; sha256="1izbij6l3rnq8gvv5b53jcvdpi42kwwybdqak43y0nlb2rhvdq95"; depends=[fda Rcpp RcppArmadillo RcppProgress]; };
   mixedMem = derive2 { name="mixedMem"; version="1.1.0"; sha256="0j8w3qfhanyrkkxipdxfdajv15qba8r2rm06iiv3kywficzgkxgv"; depends=[BH gtools Rcpp RcppArmadillo]; };
   mixedsde = derive2 { name="mixedsde"; version="5.0"; sha256="0ss1ng4nx91gxj85wxxfyh9ljxsj3ag6lsj1a5d2815p9jzl7dsv"; depends=[MASS moments plot3D sde]; };
   mixexp = derive2 { name="mixexp"; version="1.2.5"; sha256="0nbf10xhrr51rb1b2apcj4p3ci8xbi7flgz500ar3mxh8h8l74sq"; depends=[daewr gdata lattice]; };
   mixggm = derive2 { name="mixggm"; version="1.0"; sha256="1wiiayld7rwp3mwz93zizrv0dzw02mqrzprc4z6c4jj25c8pypw5"; depends=[foreach GA mclust memoise network Rcpp RcppArmadillo]; };
   mixlink = derive2 { name="mixlink"; version="0.1.5"; sha256="0ywgrcplhspc0x5fniw52xqz20y7j9mwgy4ky8lv3vii659mr52m"; depends=[mvtnorm numDeriv Rcpp RcppGSL]; };
   mixlm = derive2 { name="mixlm"; version="1.2.3"; sha256="0i7nrn31yaicdpwfssnid1x8w51iv17lcl96zfr1pgrf97d7gkqd"; depends=[car leaps multcomp pls pracma]; };
-  mixmeta = derive2 { name="mixmeta"; version="0.2.2"; sha256="1h52pmybammhhr15sl0jkm5n83rsyy1km4g4rpwry1mxrxc4ql1v"; depends=[]; };
+  mixmeta = derive2 { name="mixmeta"; version="1.0.3"; sha256="1bg7qgw1ixv510lallq9m3313bcv2dms8id6gx0sdhj4fab8ga5b"; depends=[]; };
   mixor = derive2 { name="mixor"; version="1.0.4"; sha256="1l296z0a3kamb1m94pfx3vczp36pa0np101fy5c23kh45s59pbs7"; depends=[survival]; };
   mixreg = derive2 { name="mixreg"; version="0.0-6"; sha256="04g863yxrlj0wqsmzzxph5110g3gjk094r59zzk0b9r89m8vhpsl"; depends=[]; };
   mixsep = derive2 { name="mixsep"; version="0.2.1-2"; sha256="1ywwag02wbx3pkd7h0j9aab44bdmwsaaz0p2pcqn1fs3cpw35wa2"; depends=[MASS RODBC tcltk2]; };
@@ -9892,10 +10096,10 @@ in with self; {
   mleap = derive2 { name="mleap"; version="0.1.3"; sha256="17i6rjbrf14g6857jpkpjwcac028861m1nn073wzf2kmznd2rfkk"; depends=[digest fs jsonlite purrr rJava sparklyr tibble]; };
   mlearning = derive2 { name="mlearning"; version="1.0-0"; sha256="0r8xfaxw83s2r27b8x5qd0k4r5ayxpkafzn9b1a0jvsr87i6520r"; depends=[class e1071 ipred MASS nnet randomForest]; };
   mlegp = derive2 { name="mlegp"; version="3.1.7"; sha256="1q0mxvr23qcxvf8k2cgs4m8yfp1gbkmprp964w8viy30japmx16l"; depends=[]; };
-  mlergm = derive2 { name="mlergm"; version="0.2"; sha256="1naapdm8lbqsjgdr2whs36w8jk432mhnki3cvi55abj3v16y94sl"; depends=[cowplot ergm GGally ggplot2 Matrix network plyr reshape2 sna stringr]; };
+  mlergm = derive2 { name="mlergm"; version="0.3"; sha256="0nh1dzddamlsj31z8cns11gysrbziha0amdig873x5hj4qxfp3yr"; depends=[cowplot ergm GGally ggplot2 Matrix network plyr reshape2 sna stringr]; };
   mleur = derive2 { name="mleur"; version="1.0-6"; sha256="0mddphq3b6y2jaafaa9y41842kcaqdl3dh7j4pva55q2vcjcclj7"; depends=[fGarch lattice stabledist urca]; };
   mlf = derive2 { name="mlf"; version="1.2.1"; sha256="09ihnibpknpp26hdlbxyr99yz7z0n8qpsjs5aq3zngng0yh3wdn9"; depends=[]; };
-  mlflow = derive2 { name="mlflow"; version="1.1.0"; sha256="04vr3viipyh6fdv9rg8hzwmynzjc75gyzz81fvkqqgkmlfnc9yrv"; depends=[base64enc forge fs git2r glue httpuv httr ini jsonlite openssl processx purrr reticulate rlang swagger tibble withr xml2 yaml zeallot]; };
+  mlflow = derive2 { name="mlflow"; version="1.3.0"; sha256="15q041pfnzxvr8q5fp0jnk1lplszg44mmv5gg9grikyw3211n1xg"; depends=[base64enc forge fs git2r glue httpuv httr ini jsonlite openssl processx purrr reticulate rlang swagger tibble withr xml2 yaml zeallot]; };
   mlgt = derive2 { name="mlgt"; version="0.16"; sha256="1nvdq6mvgr39ikkf73aggsb6pmbw132injj8fdkr8hgcmwm6lgd9"; depends=[seqinr]; };
   mlica2 = derive2 { name="mlica2"; version="2.1"; sha256="0c3m1zd9x99n6lw12hfzmd59355z51xa8rhg1h7qwfn9p86r826f"; depends=[]; };
   mljar = derive2 { name="mljar"; version="0.1.1"; sha256="1mw45aqjwklsnrfwf8656jf30miyrlxpz87z97nkv9i135yhwfx3"; depends=[httr jsonlite readr]; };
@@ -9903,15 +10107,18 @@ in with self; {
   mlma = derive2 { name="mlma"; version="4.0-1"; sha256="0pk2h4m74r95dfkqzliixi6z1rwdfc6gbz8c3162y22m919f00vc"; depends=[car gplots lme4]; };
   mlmc = derive2 { name="mlmc"; version="1.0.0"; sha256="01h7w0ajyg3bccynlpbi3yjpy089wczbfbajpg6yw5v4dppw7k7a"; depends=[ggplot2 Rcpp]; };
   mlmi = derive2 { name="mlmi"; version="1.0.0"; sha256="08sm836y40af3jd5gcl5pnyv1gqpx4ngkkw4xfp82h1j4yk47sy5"; depends=[cat gsl MASS Matrix mix norm]; };
-  mlmm_gwas = derive2 { name="mlmm.gwas"; version="1.0.5"; sha256="0px6pc7mkfzbbymv5qj9m6nnppbpgpanpy7y6jf7xl8gv3hwip32"; depends=[coxme Matrix multcomp multcompView sommer]; };
+  mlmm_gwas = derive2 { name="mlmm.gwas"; version="1.0.6"; sha256="14xp8k7sww1skyw5l2006gpaw2c6yrri5nmfx4yav4vqdlhcj2k1"; depends=[coxme Matrix multcomp multcompView sommer]; };
   mlmmm = derive2 { name="mlmmm"; version="0.3-1.2"; sha256="1m5ziiqs3ll1xjm1yf7x4sdc910jypn3kjnbadf95xxkvqmfrsqq"; depends=[]; };
   mlogit = derive2 { name="mlogit"; version="1.0-1"; sha256="1cjh0dl0yvzyz5wsplygm4al2zfvs7cgdg5fhbcjnv159qfvflml"; depends=[Formula lmtest MASS Rdpack statmod zoo]; };
   mlogitBMA = derive2 { name="mlogitBMA"; version="0.1-6"; sha256="1wl8ljh6rr1wx7dxmd1rq5wjbpz3426z8dpg7pkf1x9wr94a2q25"; depends=[abind BMA maxLik]; };
-  mlr = derive2 { name="mlr"; version="2.14.0"; sha256="0jlldr44x3a3l1dxy077ila512s45b4w95s2qk3qd0v70121hwhz"; depends=[backports BBmisc checkmate data_table ggplot2 parallelMap ParamHelpers stringi survival XML]; };
-  mlr3 = derive2 { name="mlr3"; version="0.1.1"; sha256="18yqjdg4a3lknic0pzg5xqa5h5nvaz4zh2g27k4fvg2d3v9b90jm"; depends=[backports checkmate data_table digest lgr Metrics mlbench mlr3misc paradox R6]; };
-  mlr3db = derive2 { name="mlr3db"; version="0.1.1"; sha256="0453q5a4a2nzpglim5lmbk2c2a6i95ww5hp2z28iv12xrli5sw72"; depends=[checkmate data_table digest dplyr mlr3 R6]; };
-  mlr3misc = derive2 { name="mlr3misc"; version="0.1.1"; sha256="0q4vr1gh0na02n22n4zijyf6zhg70nck1ly2k6i51hk9dncy815m"; depends=[backports checkmate data_table R6]; };
-  mlrCPO = derive2 { name="mlrCPO"; version="0.3.4-3"; sha256="1446xv4qawyhxi76wp6dfq3xjrmh6gzky4nbcs36zr18zis3ipyz"; depends=[backports BBmisc checkmate mlr ParamHelpers stringi]; };
+  mlr = derive2 { name="mlr"; version="2.15.0"; sha256="092kr9h1hak7d4zhsrmi9rmyf4kpivpv2xz8wnsr0zd8cnyw5hm3"; depends=[backports BBmisc checkmate data_table ggplot2 parallelMap ParamHelpers stringi survival XML]; };
+  mlr3 = derive2 { name="mlr3"; version="0.1.3"; sha256="0gd573vw026pjhvf8zbqs2avs1nvsd88w0ld6x12azmz9kbnla8s"; depends=[backports checkmate data_table digest lgr Metrics mlbench mlr3misc paradox R6 uuid]; };
+  mlr3db = derive2 { name="mlr3db"; version="0.1.2"; sha256="15hyi1bp9sk4yznv2rfrq9ryi4dy2v5m0k797sg1i9q81bdwqwsp"; depends=[checkmate data_table digest dplyr mlr3 R6]; };
+  mlr3filters = derive2 { name="mlr3filters"; version="0.1.0"; sha256="12ss7w68s6dmq6dy8iap2kipc1m8d8di5iywghcqspdbzcx5ynmz"; depends=[backports checkmate data_table mlr3 mlr3misc paradox R6]; };
+  mlr3learners = derive2 { name="mlr3learners"; version="0.1.3"; sha256="0a6j4k883ykv4li22a9v3l8hli8db21bkg5kilnngnljhrpdmjlc"; depends=[data_table mlr3 mlr3misc paradox R6]; };
+  mlr3misc = derive2 { name="mlr3misc"; version="0.1.5"; sha256="1ni8a318gc6slscb28vl3a33kr5qfwmjbc66igmi7bn5brk7iik1"; depends=[backports checkmate data_table R6]; };
+  mlr3tuning = derive2 { name="mlr3tuning"; version="0.1.0"; sha256="065vwq830hb388r8767dlr1k80rq27zhpmfjnvh9w64jn46wz763"; depends=[checkmate data_table lgr mlr3 mlr3misc paradox R6]; };
+  mlrCPO = derive2 { name="mlrCPO"; version="0.3.4-4"; sha256="0v8d336f7xghs2pdh6r5j21i6mcy0p2wdzx4nkj69fsc5gn0n058"; depends=[backports BBmisc checkmate mlr ParamHelpers stringi]; };
   mlrMBO = derive2 { name="mlrMBO"; version="1.1.2"; sha256="1ziyiycgwr4vgilji8dkf1c0kyqjnbmqi3qj35q3si2xbnmcm14f"; depends=[backports BBmisc checkmate data_table lhs mlr parallelMap ParamHelpers smoof]; };
   mlsjunkgen = derive2 { name="mlsjunkgen"; version="0.1.1"; sha256="109ag52x4y3rzx8yccilrnl24mz4ximzx6v4lrbak7dpiclqrw7a"; depends=[]; };
   mlt = derive2 { name="mlt"; version="1.0-5"; sha256="0c0w54yrynsz270aqc2l61lggqfp0hrcxnazjd1bgprim99m5nv0"; depends=[alabama basefun BB coneproj numDeriv sandwich survival variables]; };
@@ -9919,7 +10126,7 @@ in with self; {
   mltest = derive2 { name="mltest"; version="1.0.1"; sha256="14gyssfph088v936mpywmd4y8z9vdv0zk8638vlg23j8cf5j4al2"; depends=[]; };
   mltools = derive2 { name="mltools"; version="0.3.5"; sha256="045v28w7vz1zjxim8vfc6ncvg2mavr1q332x0hzlqpfzrk7gz4vh"; depends=[data_table Matrix]; };
   mlxR = derive2 { name="mlxR"; version="4.0.6"; sha256="0865lmj6mavfymmmnxq95x37yr1kqfqsnad322cibqvbkswlr39r"; depends=[ggplot2]; };
-  mma = derive2 { name="mma"; version="8.0-0"; sha256="14vhs97sfhhm3x5pl346b8azmyv1s6ffc7i50zy2amrxg4wkpmqc"; depends=[car doParallel foreach gbm gplots lattice plotrix survival]; };
+  mma = derive2 { name="mma"; version="9.0-0"; sha256="1nam7gn3a7jp4dcy9q6ypk7icknflvgmsdzv218qhf28zaw2ybza"; depends=[car doParallel foreach gbm gplots lattice plotrix survival]; };
   mmabig = derive2 { name="mmabig"; version="2.0-0"; sha256="1kp7q2xvkbwa8syk82dsynzizjmhh9z3p7r5hnnvp169as0yvgwl"; depends=[car glmnet gplots mma survival]; };
   mmand = derive2 { name="mmand"; version="1.5.4"; sha256="04kqxdbj54nflgx9lb80xxp121ligdzjkym850z3kbw60ashxybh"; depends=[Rcpp]; };
   mmap = derive2 { name="mmap"; version="0.6-17"; sha256="1dh1i2v2pzhag8brc9c0z8vfs858rpbkg1xqqi4fi866w7g4lhxy"; depends=[]; };
@@ -9951,8 +10158,9 @@ in with self; {
   mobsim = derive2 { name="mobsim"; version="0.1.0"; sha256="077hw1162giwc90y5dvj9052i5hxdf2ii29m9q8ky028375dsd0f"; depends=[Rcpp sads vegan]; };
   moc = derive2 { name="moc"; version="2.0"; sha256="0fgp8dg9qf7aw1qawmszlxs4bcccqmd87y4kkzdqggm807c2k5gh"; depends=[]; };
   moc_gapbk = derive2 { name="moc.gapbk"; version="0.1.0"; sha256="0gg64srdb17dx712hilnlrii9i5vi9vjrk17acaynaz307akdw08"; depends=[amap doMPI doParallel doSNOW fields foreach matrixStats mco miscTools nsga2R plyr reshape2 Rmisc]; };
-  mockery = derive2 { name="mockery"; version="0.4.1.1"; sha256="1vfmjcjjyw2v5y64hmpfib6v0f6ms4k5ycvc9pmj9l4nkzq2al6b"; depends=[testthat]; };
+  mockery = derive2 { name="mockery"; version="0.4.2"; sha256="16zayzi2qdmiy513hvlci9f4p8jwry24006yfzrgmrvf6sf293lq"; depends=[testthat]; };
   mockr = derive2 { name="mockr"; version="0.1"; sha256="0340v6189ivlzzriwk7yhf3v2k651x05fd1xrqfxxjgwhysaqj6z"; depends=[lazyeval]; };
+  mod = derive2 { name="mod"; version="0.1.3"; sha256="0z5a6ps2m0cbw0n9kn44767m5jnbf1dl077i2p40fipv8xali9fb"; depends=[]; };
   mod09nrt = derive2 { name="mod09nrt"; version="0.14"; sha256="1wn1y33bj9r712l0f063j5gcl423anjzmvgfy0ddihcrbpz4l7a0"; depends=[]; };
   modEvA = derive2 { name="modEvA"; version="1.3.2"; sha256="0p41fl0k780rx1vmq9laknz01ar6507sj8ss8kphrqkjnymsi2a0"; depends=[]; };
   modMax = derive2 { name="modMax"; version="1.1"; sha256="1mx4623az7vzaqf530pklx7j92qwwq93pa2416lnr24jjcxgva2h"; depends=[gtools igraph]; };
@@ -9966,11 +10174,12 @@ in with self; {
   model4you = derive2 { name="model4you"; version="0.9-3"; sha256="03s87dklil69znflny9vcl934yisfb13d0gdk94279cb4hb693c0"; depends=[Formula ggplot2 gridExtra partykit sandwich survival]; };
   modelDown = derive2 { name="modelDown"; version="1.0.1"; sha256="0rdpma8g461a17n6qsdvjb9s5nnhap1n05mavjy8cpj7d8j7ikkv"; depends=[archivist auditor breakDown DALEX devtools drifter DT ggplot2 kableExtra psych svglite whisker]; };
   modelObj = derive2 { name="modelObj"; version="4.0"; sha256="1py2y80x37mmnl2y0pxdbhqkjrln6x210hg0g224d34lxk71m172"; depends=[]; };
+  modelStudio = derive2 { name="modelStudio"; version="0.1.7"; sha256="01w1ipjmbfpfjj4cvgc3spp0qjk0q4q49w1njm920mabi61a144n"; depends=[iBreakDown ingredients jsonlite r2d3]; };
   modeldb = derive2 { name="modeldb"; version="0.2.0"; sha256="1qcgmv31gd1x0mzxq4lcarmswsr75qgq5zpfcwchxzrz97ncbwgd"; depends=[dplyr ggplot2 progress purrr rlang tibble tidypredict]; };
   modelfree = derive2 { name="modelfree"; version="1.1-1"; sha256="0ammka2wxx90z31zfzypw9dk5n118l0vxhykxbx6srfig2vdyn82"; depends=[PolynomF SparseM]; };
   modelgrid = derive2 { name="modelgrid"; version="1.1.1.0"; sha256="1z6g0akczry7vldkk6anfq572zbsfzbd6qnyllgjpbxhy3rrrq0r"; depends=[caret dplyr ggplot2 lattice magrittr purrr]; };
   modelplotr = derive2 { name="modelplotr"; version="1.0.0"; sha256="1b1pcah28b2fsr5l7v3lwxgvl03jr2cyxk5x5plnc3vwy5g0bnpm"; depends=[dplyr ggfittext ggplot2 gridExtra magrittr RColorBrewer rlang scales]; };
-  modelr = derive2 { name="modelr"; version="0.1.4"; sha256="1ngxphbjkv7yl1rg30sj36mfwhc76g452drjrq9abgab4k0pgnml"; depends=[broom dplyr magrittr purrr rlang tibble tidyr]; };
+  modelr = derive2 { name="modelr"; version="0.1.5"; sha256="0nnfhlzz75ihs8azy963cc4cwg1kx81rybk4z3wm98bbghwfxfs5"; depends=[broom dplyr magrittr purrr rlang tibble tidyr]; };
   modelsummary = derive2 { name="modelsummary"; version="0.1.0"; sha256="1g6yc89q267zjplqpwiy6wwvdswyhr6lhg2sldm8zhmbm81jcvks"; depends=[broom checkmate dplyr generics magrittr purrr stringr tibble tidyr]; };
   modeltools = derive2 { name="modeltools"; version="0.2-22"; sha256="1s9lmkac3rl0nknf4wizfhg7ryq7c8yvvyc4z619238br27hhsi5"; depends=[]; };
   modelwordcloud = derive2 { name="modelwordcloud"; version="0.1"; sha256="0ardib0h923i7jk8bgcq6pn2zazx9acf9sdggifsk46hdz8hvqnm"; depends=[]; };
@@ -10004,14 +10213,14 @@ in with self; {
   monographaR = derive2 { name="monographaR"; version="1.2.0"; sha256="0sis2kw07ifq54w6p56zspmlnvxvq6ajb0sdvc9fk480sfxg9806"; depends=[circular maptools png raster rmarkdown sp]; };
   monomvn = derive2 { name="monomvn"; version="1.9-10"; sha256="13v7rk22a200wcv21phpmhkahw40p9avx8pjxadhgxw9acxcsasb"; depends=[lars MASS mvtnorm pls quadprog]; };
   monoreg = derive2 { name="monoreg"; version="1.2"; sha256="16n622j1j998a5fhn1c1qbzk5bfa5h09d95ry89gsd00p40hqg0a"; depends=[]; };
-  monotonicity = derive2 { name="monotonicity"; version="1.2"; sha256="119p6j0pry51dinmkyzc5v2k8035hd297sg0k8zx3zxykvfzha6k"; depends=[lmtest MASS sandwich]; };
+  monotonicity = derive2 { name="monotonicity"; version="1.3"; sha256="1h82aikpq5m54zfs1pg4mrajnss6hl0i65ka3rdywv96wmhwsdnr"; depends=[lmtest MASS sandwich]; };
   monreg = derive2 { name="monreg"; version="0.1.3"; sha256="08rcg2xffa61cgqy8g98b0f7jqhd4yp8nx6g4bq3g722aqx4nfg3"; depends=[]; };
   moonBook = derive2 { name="moonBook"; version="0.2.3"; sha256="0hys56mwbm776ff7dibi8wzyf69qiais9rs1jazv79lk6h56s9s6"; depends=[magrittr nortest purrr sjmisc stringr survival]; };
   mopa = derive2 { name="mopa"; version="1.0.1"; sha256="1v876al1afli002v44b4j2acb6n66f0hzz4bmcl60jyny43d1n0c"; depends=[abind dismo e1071 earth gtools lattice PresenceAbsence randomForest ranger raster rpart sampling sp spam spatstat splancs tree]; };
   mopsocd = derive2 { name="mopsocd"; version="0.5.1"; sha256="10hssnm1afqmxa9kw6ifqnz3p3yyjrmxgi98zlj31a5g4nis8wb1"; depends=[]; };
   morgenstemning = derive2 { name="morgenstemning"; version="1.0"; sha256="17y90cf8ajmkfwla0hm4jgkbkd1mxnym63ph2468sfxkhn0r3v88"; depends=[]; };
   morpheus = derive2 { name="morpheus"; version="0.2-0"; sha256="07gk05qpabbg96svgnp2m9sw3fxsh2mgfwyda423c03yhxn1pnsm"; depends=[jointDiag MASS pracma]; };
-  morse = derive2 { name="morse"; version="3.2.4"; sha256="0iar2lj2czdgpvmrdx0y98frh452nr4v2m4zmmrs9jr6by46d6nj"; depends=[coda deSolve dplyr epitools ggplot2 gridExtra magrittr reshape2 rjags tibble tidyr zoo]; };
+  morse = derive2 { name="morse"; version="3.2.5"; sha256="1y3daw8ccn0n61kj6lj6m3m4pfj936k786d385lyq05211rkdgqr"; depends=[coda deSolve dplyr epitools ggplot2 gridExtra magrittr reshape2 rjags tibble tidyr zoo]; };
   mortAAR = derive2 { name="mortAAR"; version="1.0.2"; sha256="047xagjmqj6sla0zlz0ljdivggkv04i45yn7637a33ni1pmb83al"; depends=[magrittr Rdpack reshape2]; };
   mortyr = derive2 { name="mortyr"; version="0.0.1"; sha256="1mpgb9rcknghwm9xsn3d8s6fy4j319sinb6l76s8aq06n4f3hr7g"; depends=[httr jsonlite tibble]; };
   mosaic = derive2 { name="mosaic"; version="1.5.0"; sha256="1j3dq8y2zpr3cad5pgbd3qm9ls17z0s6f9qqp5ddh110wf5kz0h4"; depends=[broom dplyr ggdendro ggformula ggplot2 ggrepel glue gridExtra lattice latticeExtra lazyeval leaflet MASS Matrix mosaicCore mosaicData readr tidyr]; };
@@ -10027,7 +10236,7 @@ in with self; {
   mousetrack = derive2 { name="mousetrack"; version="1.0.0"; sha256="0lf0xh0c3xl27nh5w8wwyrm2jfzfajm2f73xjdgf746dp365qc8n"; depends=[pracma]; };
   mousetrap = derive2 { name="mousetrap"; version="3.1.2"; sha256="0kk5i0xzxbcdjx9i2ck429z8pa98rxrqcb5xvck5k9fisprp5xi6"; depends=[cstab diptest dplyr fastcluster fields ggplot2 magrittr pracma psych RColorBrewer Rcpp scales tidyr]; };
   movMF = derive2 { name="movMF"; version="0.2-4"; sha256="0j5gp1l374479lsijw1hz00pxs09zzh7hapljv80lsvr24vfscpa"; depends=[clue skmeans slam]; };
-  move = derive2 { name="move"; version="3.2.0"; sha256="0fhanwxbsxs35dz7lkip390qvm9cc2rx6gc4irfgkzn0f8swzjqk"; depends=[geosphere httr memoise raster Rcpp rgdal sp xml2]; };
+  move = derive2 { name="move"; version="3.2.2"; sha256="14wmiyk52iar90kbzi6ksl75i0kg2nmsq08sms9rr2wgswr9f7km"; depends=[geosphere httr memoise raster Rcpp rgdal sp xml2]; };
   moveHMM = derive2 { name="moveHMM"; version="1.7"; sha256="031msh427hgjyr37imalr7smd79yqscw9xq5rjrixxc2w5qly9jj"; depends=[boot CircStats geosphere ggmap ggplot2 MASS numDeriv Rcpp RcppArmadillo sp]; };
   moveVis = derive2 { name="moveVis"; version="0.10.2"; sha256="18crhndhgnhd73r7yx3660z0328vrng94ihm5g8brq2b4iz1wxw3"; depends=[av cowplot curl dplyr geosphere ggplot2 gifski lubridate magick magrittr move pbapply plyr raster RStoolbox sf slippymath sp zoo]; };
   moveWindSpeed = derive2 { name="moveWindSpeed"; version="0.2.3"; sha256="14a2iymn4j831xlh42z5qxmhnh7xpp5bxasgpkhnb3v0b5ldyilh"; depends=[move Rcpp]; };
@@ -10055,11 +10264,13 @@ in with self; {
   mrMLM_GUI = derive2 { name="mrMLM.GUI"; version="3.2"; sha256="0xhbkvq9bd0spnpd8acnmf3spsi1kz43wf2na5b122iv7ppwl3ix"; depends=[bigmemory coin data_table doParallel foreach ggplot2 lars MASS mrMLM ncvreg openxlsx qqman sampling shiny shinyjs stringr]; };
   mra = derive2 { name="mra"; version="2.16.11"; sha256="0268msdy4cs2ifpagmwiabi6aav54ckn214ai18aqv2h97hmixw0"; depends=[]; };
   mratios = derive2 { name="mratios"; version="1.4.0"; sha256="0pjcwqx3zykpwyykwgqziwignd41sjm2s1blyjwc1lhymis4ldzq"; depends=[mvtnorm]; };
+  mrbayes = derive2 { name="mrbayes"; version="0.1.0"; sha256="0p0a1g6xv7g3scmn290ja4bicbdz5c9y6c4hfn4c7advd6ha6ang"; depends=[]; };
   mrbsizeR = derive2 { name="mrbsizeR"; version="1.1.1"; sha256="0a69yyxxf4p84c2sx9kkaxgpfyck88cn0ajlnm64arrr9r99iiir"; depends=[fields maps Rcpp]; };
   mrds = derive2 { name="mrds"; version="2.2.0"; sha256="08m5a61rpbw5pv0v0yspihkzihcxazsh6w5kmfvg68s4akjwcnqi"; depends=[mgcv numDeriv optimx Rsolnp]; };
   mreg = derive2 { name="mreg"; version="1.1"; sha256="06la0yy2yys161jhlzlcm5lcv0664wm6sa8gjdnpd1s1nx52jkqf"; depends=[]; };
   mregions = derive2 { name="mregions"; version="0.1.6"; sha256="0ix77hqcllhcpldchlnvciiflm6ysylynnnqvczpf8vx7gwa3lrk"; depends=[data_table httr jsonlite rappdirs sp tibble wellknown xml2]; };
   mrfDepth = derive2 { name="mrfDepth"; version="1.0.11"; sha256="0x4z4agwbzlyzbkf6aj7y9061cm05dvhzpg05wc7k59xbq1ns1sv"; depends=[abind geometry ggplot2 matrixStats Rcpp RcppArmadillo RcppEigen reshape2]; };
+  mrfse = derive2 { name="mrfse"; version="0.1"; sha256="156qy6g2s6cxyd1ijzn709jniml6308gdzvkzcks5q6s7gs9sl2m"; depends=[]; };
   mrgsolve = derive2 { name="mrgsolve"; version="0.9.2"; sha256="1y3dh5myswghals4nz2m4jb8qk3q6dzgnqm0bf4dilzgpbj3gdx6"; depends=[BH dplyr magrittr Rcpp RcppArmadillo rlang tibble tidyselect]; };
   mri = derive2 { name="mri"; version="1.0.1"; sha256="1dssq556kid6c3djp0s6v853cranv2wjs2c9521l5ykg5g33hfmv"; depends=[]; };
   mritc = derive2 { name="mritc"; version="0.5-1"; sha256="12sfyw5b1lryczl92xvyvhl37qfx3ybg4y9awsl0b7f51zi0lzy3"; depends=[lattice misc3d oro_nifti]; };
@@ -10081,14 +10292,15 @@ in with self; {
   msgl = derive2 { name="msgl"; version="2.3.9"; sha256="0793d12cd1mcnr97byhfwpnvm329w78f56n7dcs4116hlizp8l9h"; depends=[BH Matrix Rcpp RcppArmadillo RcppProgress sglOptim]; };
   msgpackR = derive2 { name="msgpackR"; version="1.1"; sha256="0a6vm4q1zfy8wlvhl9wfy09ig1iag9fvjasz5w9bll7idky4ldx5"; depends=[]; };
   msgps = derive2 { name="msgps"; version="1.3.1"; sha256="0r8i0sw412jr148bid8sfpjcfbkf5589dqcqyvf5cm84cj7axnpz"; depends=[]; };
-  msigdbr = derive2 { name="msigdbr"; version="6.2.1"; sha256="1264j1hs74kq7hyh68vfynadfi6mdpq46qm1hnwzkzzhmbzpb9cg"; depends=[dplyr magrittr rlang tibble]; };
+  msigdbr = derive2 { name="msigdbr"; version="7.0.1"; sha256="19p8z617m3my8la7n1qgb1s2msf940r372im3q30qkbcx3qxg3sd"; depends=[dplyr magrittr rlang tibble]; };
   msir = derive2 { name="msir"; version="1.3.2"; sha256="0pvc3q162vqq3k39nni732x05zzfz4y9y2zf56d83185ypszv9kb"; depends=[mclust]; };
   msltrend = derive2 { name="msltrend"; version="1.0"; sha256="1rwy77ijf3hzq2zp47cijwvqcq34rdlfxwhrd9l56bvmlmzr1dqx"; depends=[changepoint forecast plyr Rssa tseries zoo]; };
   msm = derive2 { name="msm"; version="1.6.7"; sha256="0fp2s8jbj75wf4mk03rp5pzjkrmwd1rp4m5dxz83w0qn37vc00vm"; depends=[expm mvtnorm survival]; };
-  msma = derive2 { name="msma"; version="1.2"; sha256="0pxf7vwyhqds42pj6pbbbaxjmvis8i9hallf0lfg4552axiad5id"; depends=[mvtnorm]; };
+  msma = derive2 { name="msma"; version="2.0"; sha256="15g8cwafbd5bsff3cd53yzgxacsswgl0rzygr40drs7nwsi4qbk1"; depends=[mvtnorm]; };
   msme = derive2 { name="msme"; version="0.5.3"; sha256="0mq57zdas1s87nblnvbif9lisgahfhvmabglvp9imr1mvpwybpbh"; depends=[lattice MASS]; };
   msmtools = derive2 { name="msmtools"; version="1.3"; sha256="0p7xpj78cjc1s015ma7vc38kqiy6wvpyixrdinx4ngig1pqfrq4p"; depends=[data_table msm survival]; };
   msos = derive2 { name="msos"; version="1.1.0"; sha256="1dlqmjz5f8h71334kzdjbzvkn0dhysp7fb18g45qqs79cqpf1vzf"; depends=[mclust tree]; };
+  mssm = derive2 { name="mssm"; version="0.1.2"; sha256="1x788jlr1jr1nsy5jlmqrrdgh2r7vgk6qwwvmals5n47avv7sxaw"; depends=[nloptr Rcpp RcppArmadillo testthat]; };
   mssqlR = derive2 { name="mssqlR"; version="1.0.0"; sha256="0qdnm7cx9cg14vfcnkmcjqr1jpxsw8xlrbnxldvzz44mzv2n878l"; depends=[magrittr RODBC]; };
   mstR = derive2 { name="mstR"; version="1.2"; sha256="0v8cv9pswkvw0lva6jx5vavsb20dawgq83gn4rgydyhvigcl5szd"; depends=[]; };
   mstate = derive2 { name="mstate"; version="0.2.11"; sha256="13kw1n1p2f1f0k5hkcc4732wlhiy3csx8nx2ajrgw06svzksgh3y"; depends=[RColorBrewer survival]; };
@@ -10100,12 +10312,11 @@ in with self; {
   mthapower = derive2 { name="mthapower"; version="0.1.1"; sha256="0g6dn0qn7z6qc1gbzspy1n7b803427bc9fv5yqk7j8i1is1p8h94"; depends=[]; };
   mtk = derive2 { name="mtk"; version="1.0"; sha256="0vq2xlxf86l92fl91qm8m4yfjyz1h8szmwxiics7sc9f0as0dkmy"; depends=[lhs rgl sensitivity stringr XML]; };
   mtsdi = derive2 { name="mtsdi"; version="0.3.5"; sha256="0j4hl690n8x7zfpygw5qv0m0jyl8dnz1d3r4314w06h7c578n2kp"; depends=[gam]; };
-  muHVT = derive2 { name="muHVT"; version="0.2.1"; sha256="0qndbg9m3267s8h7gphcm4rkchfgkyzd1301wr6iajv0shrc98rv"; depends=[conf_design deldir dplyr ggplot2 Hmisc magrittr MASS purrr sp splancs]; };
   muRL = derive2 { name="muRL"; version="0.1-11"; sha256="1pyspp1wpd80hcla1zwnl3misqggfk0ls54akwnx5aa617bibzz8"; depends=[maps stringr]; };
   muRty = derive2 { name="muRty"; version="0.3.0"; sha256="1125182flpz6a90dh3gldyhlnh9l605cb59b92j3d0p754ansdrm"; depends=[clue lpSolve]; };
   muStat = derive2 { name="muStat"; version="1.7.0"; sha256="18727xj9i9hcnpdfnl1b9wd6cp7wl1g74byqpda2gsrcardl57wz"; depends=[]; };
   muckrock = derive2 { name="muckrock"; version="0.1.0"; sha256="16lm1iiaaws7clby7qgblqdiznw6abjjgvsxlfpza7l2xdvplxpg"; depends=[]; };
-  mudata2 = derive2 { name="mudata2"; version="1.0.6"; sha256="0crknwlnnr1x6hvlmfny8b5x7d2wp5v4y20kbqc2n8linrc63s97"; depends=[dplyr fs ggplot2 jsonlite lubridate magrittr readr rlang stringr tibble tidyr tidyselect withr]; };
+  mudata2 = derive2 { name="mudata2"; version="1.0.7"; sha256="11njbm97ipzlkjx9vbijq5i1s3w509bgj1g2mgz1h624qa0lf5pa"; depends=[dplyr fs ggplot2 jsonlite lubridate magrittr readr rlang stringr tibble tidyr tidyselect withr]; };
   mudens = derive2 { name="mudens"; version="1.3.2"; sha256="18kv8xfmmmk0dyw64lwrlrks0gana0s7gaff6nxs59ndgb1pj6yp"; depends=[Rcpp survival]; };
   mudfold = derive2 { name="mudfold"; version="1.1.1"; sha256="1lxlzzjvjqyivc8g8z6f8s0zkxf0k6mi76y5zm36r1kalhxyhkdy"; depends=[boot ggplot2 gtools reshape2 zoo]; };
   mueRelativeRisk = derive2 { name="mueRelativeRisk"; version="0.1.1"; sha256="16yclfmgxc32pv00vyb9fjdh4syax8ynizr8a29haiq22q5fqclh"; depends=[]; };
@@ -10118,23 +10329,23 @@ in with self; {
   multdyn = derive2 { name="multdyn"; version="1.6"; sha256="06yab2lmxp7lc7zjk8n194mn5vza0yjbp276iair3ry35my4h3v8"; depends=[data_table ggplot2 Rcpp RcppArmadillo reshape2]; };
   multfisher = derive2 { name="multfisher"; version="1.1"; sha256="0vzvq7v2xz35fx8pg25c9xqkic09k6fcg9zh81j7pgqmzi2wwrp8"; depends=[]; };
   multgee = derive2 { name="multgee"; version="1.6.0"; sha256="17qrfvxxapqzjy2ps7kk9k9hkmb9zdxflwclyagp1amgv50la49f"; depends=[gnm VGAM]; };
-  multiApply = derive2 { name="multiApply"; version="2.0.1"; sha256="0kdbv76kp03cwh1fhgf2llkql8z0zlqqzwb6khywclm6y9dwd7n6"; depends=[doParallel foreach plyr]; };
+  multiApply = derive2 { name="multiApply"; version="2.1.1"; sha256="1vsknqzwkimmb9axa72slzpzij4mvkcy3578i7xjx3grfa6kbnlh"; depends=[doParallel foreach plyr]; };
   multiAssetOptions = derive2 { name="multiAssetOptions"; version="0.1-1"; sha256="1kb4qxyl9shvrpqfxq26lhh3sssmyjcnhhcl6gcbb0s86snh9ms9"; depends=[Matrix]; };
   multiCA = derive2 { name="multiCA"; version="1.1"; sha256="1vgb13cfq10g8hxykgi3is3mrlbm76vh40cznapl7xxmw226ccrl"; depends=[bitops multcomp]; };
   multiColl = derive2 { name="multiColl"; version="1.0"; sha256="01csf5gjk2wrv6d0m1j23gk6dcixck318ywfq1a1a0j1dl9wmvx4"; depends=[]; };
-  multiDimBio = derive2 { name="multiDimBio"; version="1.1.1"; sha256="0b0lymnli7w91bfd67dsvzbj3flxsrsmbg4a18mzch0j9y6a40x0"; depends=[ggplot2 gridGraphics lme4 MASS misc3d pcaMethods RColorBrewer]; };
+  multiDimBio = derive2 { name="multiDimBio"; version="1.2.1"; sha256="1zykfchfl4icjp5y2pjd5vlfrpzhd13xbh2fy3indhh6kdzbdkyy"; depends=[ggplot2 gridGraphics lme4 MASS misc3d pcaMethods RColorBrewer]; };
   multiPIM = derive2 { name="multiPIM"; version="1.4-3"; sha256="0j7d0cgs8zcyiyibzmfhcandad76sf4gm57wkcv98bf96wkls58l"; depends=[lars penalized polspline rpart]; };
   multiRDPG = derive2 { name="multiRDPG"; version="1.0.1"; sha256="0r6n148pakixw4caj0zwib8zirgl98lm0mxqmhvmqjh389icskxc"; depends=[]; };
   multiROC = derive2 { name="multiROC"; version="1.1.1"; sha256="15ydbxpkdyvsc55di13jvwh9p6dzxc1yj93w1cwsd8jp2y10wsd3"; depends=[boot magrittr zoo]; };
   multiband = derive2 { name="multiband"; version="0.1.0"; sha256="1f4gmy0yf9zid7kl05zncvvig6hs4nl1h9wkrkc24rxx9risw9k9"; depends=[]; };
   multibiplotGUI = derive2 { name="multibiplotGUI"; version="1.0"; sha256="0ig7r4p8mq594cjwclbqwjk8saqkvjqjbbnnxj1hc1sdj7qdlcpf"; depends=[cluster dendroextras Matrix rgl shapes tcltk2 tkrplot]; };
-  multicastR = derive2 { name="multicastR"; version="1.1.0"; sha256="1wxa3d42aapa081kiial1y5n3362k5b8sxncizs570bjkajg8i5q"; depends=[data_table gsubfn stringi XML xml2 xtable]; };
+  multicastR = derive2 { name="multicastR"; version="1.3.0"; sha256="07y3a7apk6pjnfqki52jc5vbzb1w53fla7wcpc184f4zpqfc783q"; depends=[curl data_table gsubfn stringi XML xml2 xtable]; };
   multichull = derive2 { name="multichull"; version="1.0.0"; sha256="1gc7kxxlbanc6rmmbf6h85jf7kj0a78h23m5vwwqqliv018qsv2n"; depends=[igraph plotly shiny shinythemes]; };
   multicmp = derive2 { name="multicmp"; version="1.1"; sha256="0mz7ksc5h6dy95l3kbsamm191372blhlrj573krc57bj93lmp1a5"; depends=[numDeriv]; };
   multicolor = derive2 { name="multicolor"; version="0.1.3"; sha256="0jniqa8zrl13534pyl200i54m52lhfwq7h7irf806ga70lvfgk0k"; depends=[cowsay crayon dplyr glue magrittr purrr stringi stringr tibble tidyr]; };
   multicon = derive2 { name="multicon"; version="1.6"; sha256="16glkgnm4vlpxkhf1xw1gl1q10yavx9479i21v29lldag35z8pqx"; depends=[abind foreach mvtnorm psych sciplot]; };
   multicool = derive2 { name="multicool"; version="0.1-10"; sha256="1ybg9piya9psqg42w9i3zsnavbxhkfklfwl7cb420i5nkq6wpc2v"; depends=[Rcpp]; };
-  multicross = derive2 { name="multicross"; version="1.0.0"; sha256="1nbdq1nmgyg00qx6fclnx0nbbx7k6lrx149p0d5ckj5q19jdnmdf"; depends=[crossmatch MASS nbpMatching]; };
+  multicross = derive2 { name="multicross"; version="2.0.0"; sha256="1ic632ig0mzvq00hrkjs8vfa5mzp8vwrqflfqfdr5wkdvcqqnhbb"; depends=[AnnotationDbi crossmatch MASS Matrix nbpMatching org_Ce_eg_db org_Hs_eg_db org_Mm_eg_db Seurat]; };
   multifluo = derive2 { name="multifluo"; version="1.1"; sha256="1hnh1gj6lfnh2fn0v064bszydgsr6p9f7p8yxyw5rdxfrxymiw09"; depends=[agricolae ellipse imager]; };
   multifwf = derive2 { name="multifwf"; version="0.2.2"; sha256="1l6z3pzz6g6w1spp1f918jh6w0jm93qyc882rj8jhn1198d2s8nd"; depends=[]; };
   multigraph = derive2 { name="multigraph"; version="0.91"; sha256="1ind8zqqcy4k97sdimn7bn85nbqwda92z0dp80kilcsvlhf47y35"; depends=[multiplex]; };
@@ -10164,11 +10375,11 @@ in with self; {
   multitaper = derive2 { name="multitaper"; version="1.0-14"; sha256="04wd9bbhyx7697pfy0fpj02v1csr48hkpqj62h9p8a6w84ji4k68"; depends=[]; };
   multivariance = derive2 { name="multivariance"; version="2.2.0"; sha256="1877yym7fhnjhjdfchpdjrcyz10w7flsvjq78s51y0km0rblycph"; depends=[igraph microbenchmark Rcpp]; };
   multivator = derive2 { name="multivator"; version="1.1-9"; sha256="0vbqvhmym46zjr1h4s53sjrddfjpv8wi0sq4lrh2rmqarq068416"; depends=[emulator mvtnorm]; };
-  multiviewtest = derive2 { name="multiviewtest"; version="1.0"; sha256="03m64cqwlx8fyridkms2rz4xwvql2lfijck5wisvd3ggv4bp9cgh"; depends=[matrixStats mclust]; };
+  multiviewtest = derive2 { name="multiviewtest"; version="2.0.0"; sha256="09svd9jbvn92vkaifr33vg5scyh6311kpkr0lgsdj6lycz9cb4q7"; depends=[doParallel foreach irlba Matrix matrixStats mclust randnet]; };
   multiwave = derive2 { name="multiwave"; version="1.4"; sha256="19581kjcyw86cnzhvhhpn997fixm811ggmvb8jkb3dsxg8vp60jc"; depends=[]; };
   multiway = derive2 { name="multiway"; version="1.0-6"; sha256="1y9cykarr2aysdrnyab5aklsrc5id5b58881q03lcb5kc385v3gv"; depends=[CMLS]; };
   multiwayvcov = derive2 { name="multiwayvcov"; version="1.2.3"; sha256="1znsmca16jac8s5z0j64cck27pvf88anm1mfblabqchqqcz1ykfc"; depends=[boot sandwich]; };
-  multxpert = derive2 { name="multxpert"; version="0.1"; sha256="03mvf4m0kabm22vy4zkj1cfh884larpj8cbgg3p9l3pag20snf1l"; depends=[mvtnorm]; };
+  multxpert = derive2 { name="multxpert"; version="0.1.1"; sha256="1lq5lgdjaaacipkjqxz6jxsm6b8zfbjsf7rs135a7n6w7qh35pvw"; depends=[mvtnorm]; };
   muma = derive2 { name="muma"; version="1.4"; sha256="0midx3wzyvcz8rk9kvsfll3xg41pkz40si4jw2ps54ykkf9rkm99"; depends=[bitops car caTools gplots gtools mvtnorm pcaPP pdist pls robustbase rrcov]; };
   mumm = derive2 { name="mumm"; version="0.2.1"; sha256="1wjg2pqn2wb9hk9mqgpi3k26qwjnkmp4apx09lxcwrz35bbwhfzv"; depends=[lme4 Matrix Rcpp RcppEigen stringr TMB]; };
   munfold = derive2 { name="munfold"; version="0.3.5"; sha256="17zizx9r0f8dxb7dkgn1nn0fp7ydy6r155p1zfz0v93jc26lc1hb"; depends=[MASS memisc]; };
@@ -10182,7 +10393,7 @@ in with self; {
   mutSignatures = derive2 { name="mutSignatures"; version="1.2"; sha256="1kbp221lm43a5wiw754yjkd3qidmca20m0i8jlxsqk8ijbp40ky2"; depends=[cluster doParallel foreach ggplot2 pracma proxy]; };
   mutoss = derive2 { name="mutoss"; version="0.1-12"; sha256="1yk7p7pb2xm38d3j19ysgwmix48lvimbhkhjjwk5jmr1a0ysx298"; depends=[multcomp multtest mvtnorm plotrix]; };
   mutossGUI = derive2 { name="mutossGUI"; version="0.1-11"; sha256="08pcca9gzns83az6jbjzv4xhm1wgmchhzz4f54x1aq0nmvsz3qq1"; depends=[CommonJavaJars JavaGD JGR multcomp mutoss plotrix rJava]; };
-  mvLSW = derive2 { name="mvLSW"; version="1.2.2"; sha256="19bz1hryw9jhw2y3cnx4bqykdqpfgdlnmkx7ka8i96yb5xg4791q"; depends=[fields wavethresh xts zoo]; };
+  mvLSW = derive2 { name="mvLSW"; version="1.2.3"; sha256="05g6v4jbg1km2215lxbwzx8frr4in7xal9pai3y6l23d66lvh1iz"; depends=[fields wavethresh xts zoo]; };
   mvMISE = derive2 { name="mvMISE"; version="1.0"; sha256="0lnc5g3ksl5cvwylh8p8baxyvq3z32a2i337q7lhg00j031ccy5c"; depends=[lme4 MASS]; };
   mvMORPH = derive2 { name="mvMORPH"; version="1.1.0"; sha256="0v63wi4la5kw59xdl1bmsc8hh8gfpm89s79dzrkbdkmakm740vvx"; depends=[ape corpcor glassoFast phytools spam subplex]; };
   mvMonitoring = derive2 { name="mvMonitoring"; version="0.1.0"; sha256="03nvq8nmrmrpzyxlsqzww5ghk640115l1jgmgwfahhjxkdpkzfxx"; depends=[BMS dplyr lazyeval plyr rlang robustbase xts zoo]; };
@@ -10210,9 +10421,9 @@ in with self; {
   mvnmle = derive2 { name="mvnmle"; version="0.1-11.1"; sha256="131k2bnn6194y3f35r9cgys8g1z2y52123ng8iijpkpbfd147y92"; depends=[]; };
   mvnormtest = derive2 { name="mvnormtest"; version="0.1-9"; sha256="1iaxjwp7bgxhaa4xqvgqb61316mq2fb0452d0pabhmbxkvmvdnj6"; depends=[]; };
   mvnpermute = derive2 { name="mvnpermute"; version="1.0.0"; sha256="0mbyj5i5vysrnl3pgypl0cjf3sylsvzfl1pcxkn0q16560vqh2ba"; depends=[]; };
-  mvord = derive2 { name="mvord"; version="0.3.5"; sha256="04xbv0wyxccymmwqgx8gy5695rbcx2qyqf94zpf5ng39vmjs1mqb"; depends=[BB dfoptim MASS Matrix minqa mnormt numDeriv optimx pbivnorm ucminf]; };
+  mvord = derive2 { name="mvord"; version="0.3.6"; sha256="0xg73pa7bj42ya69w8bmcgf1nfxa5yh1aq8fc0dk0ygcg3h0g21k"; depends=[BB dfoptim MASS Matrix minqa mnormt numDeriv optimx pbivnorm ucminf]; };
   mvoutlier = derive2 { name="mvoutlier"; version="2.0.9"; sha256="1d562h3xicq962h27fi95qhrz9vkwxk0p8axhps1cy4b49w4bygi"; depends=[robCompositions robustbase sgeostat]; };
-  mvp = derive2 { name="mvp"; version="1.0-6"; sha256="0m6q2yha1lk2l83072yk3d9793hyci5frn4cjmssrl3xxs2crcnd"; depends=[magic magrittr mpoly partitions Rcpp]; };
+  mvp = derive2 { name="mvp"; version="1.0-8"; sha256="0i2fd9s0dlpaa4vwkiq5is2d4vxc90hkdl0yk57gl651i8nxwnha"; depends=[magic magrittr mpoly partitions Rcpp]; };
   mvprpb = derive2 { name="mvprpb"; version="1.0.4"; sha256="1kcjynz9s7vrvcgjb9sbqv7g50yiymbpkpg6ci34wznd33f7nrxm"; depends=[]; };
   mvrtn = derive2 { name="mvrtn"; version="1.0"; sha256="0k0k76wk5zq0cjydncsrb60rdhmb58mlf7zhclhaqmli1cy697k8"; depends=[]; };
   mvsf = derive2 { name="mvsf"; version="1.0"; sha256="1krvsxvj38c5ndvnsd1m18fkqld748kn5j2jbgdr3ca9m3i5nlwf"; depends=[mvnormtest nortest]; };
@@ -10235,7 +10446,7 @@ in with self; {
   nCal = derive2 { name="nCal"; version="2018.8-20"; sha256="1idgpzivw5wa423z86rf60ri50cyh8p38p4r493i9b2m9qzzqf1x"; depends=[drc gdata gWidgets kyotil]; };
   nCopula = derive2 { name="nCopula"; version="0.1.1"; sha256="03qbfvx0lg9prg52fk1jxar2bng2x6scac4g2c64kvp6vmf6x4mv"; depends=[copula Deriv stringi stringr]; };
   nFCA = derive2 { name="nFCA"; version="0.3"; sha256="1jyyzagmppm3i7vh3ia4ic0zql1w04f66z81v0zpdihd4cbl5ra7"; depends=[]; };
-  nFactors = derive2 { name="nFactors"; version="2.3.3"; sha256="016d76yfxz7gx7zz5dgwjmj2c5m6kxdmqj0lln5w6d70r9g1kxg7"; depends=[boot lattice MASS psych]; };
+  nFactors = derive2 { name="nFactors"; version="2.3.3.1"; sha256="0qylbwn064smdw2adyx1hxwy4m320g78ihllfnss4kkmxk0ki05z"; depends=[boot lattice MASS psych]; };
   nLTT = derive2 { name="nLTT"; version="1.4.1"; sha256="1m4q4s6dwl3yz403w8bpzxakcckd8wylws0hvh6ab72bin74fdid"; depends=[ape coda deSolve testit]; };
   nVennR = derive2 { name="nVennR"; version="0.2.1"; sha256="11qkwd8laf67iqyzx3ia424vykvsvy0k9d7labdgqfx2ihd95hh2"; depends=[Rcpp]; };
   na_tools = derive2 { name="na.tools"; version="0.3.1"; sha256="1lbzsckfg297n85kzbin65x1l6qgg9l50hd3xi2gflxc7n2xb8bw"; depends=[]; };
@@ -10246,7 +10457,7 @@ in with self; {
   namedCapture = derive2 { name="namedCapture"; version="2019.7.30"; sha256="12cnd16015ig0qx41gfkf7915iyzlaa7ixdv72x9vx3rylw86y4q"; depends=[]; };
   namer = derive2 { name="namer"; version="0.1.4"; sha256="0ika1imdrslfycbsg6zrssgghsc729ah4yvgjpv9kykppw098qwd"; depends=[dplyr fs glue magrittr purrr rstudioapi tibble]; };
   namespace = derive2 { name="namespace"; version="0.9.1"; sha256="1bsx5q19l7m3q2qys87izvq06zgb22b7hqblx0spkvzgiiwlq236"; depends=[]; };
-  nandb = derive2 { name="nandb"; version="2.0.4"; sha256="194lkrigcaa6vamd0060l9cf4ll7g57q2ljk4h4vddkqg31x91cj"; depends=[assertthat autothresholdr BBmisc checkmate detrendr dplyr filesstrings ggplot2 glue ijtiff magrittr purrr Rcpp reshape2 rlang stringr viridis withr]; };
+  nandb = derive2 { name="nandb"; version="2.0.5"; sha256="0y1lw79mpvyfbxfzjrdfnpgny4s2axbl23gl67fj45jrbjh56wxz"; depends=[assertthat autothresholdr BBmisc checkmate detrendr dplyr filesstrings ggplot2 glue ijtiff magrittr purrr Rcpp reshape2 rlang stringr viridis withr]; };
   naniar = derive2 { name="naniar"; version="0.4.2"; sha256="0qy3wgb4wixn01yyhbjf0dmx5xq42m4c3d46y2ysfj59181p39lm"; depends=[dplyr forcats ggplot2 glue magrittr purrr rlang tibble tidyr UpSetR viridis visdat]; };
   nanop = derive2 { name="nanop"; version="2.0-6"; sha256="007gdc93pk0vpfmsw7zgfma2k1045n2cxwwsyy276smy0ys9fdhp"; depends=[distrEx rgl]; };
   nanostringr = derive2 { name="nanostringr"; version="0.1.4"; sha256="1g1hm5kz2bl3qqs2cz4nhvmak7mbh5pry34lp6lwnbxrgi97i1iz"; depends=[assertthat ccaPP dplyr epiR magrittr purrr rlang]; };
@@ -10255,9 +10466,9 @@ in with self; {
   nardl = derive2 { name="nardl"; version="0.1.5"; sha256="1xi1fkwgkfc1b8qsgi4lrjx419778qk0vxzl23azcziwa6fha5p8"; depends=[Formula gtools strucchange tseries]; };
   narray = derive2 { name="narray"; version="0.4.1"; sha256="09n50shk2gy1m85kmvq8g3zh2nrikpllv8gph9x2id1p62rbqf1y"; depends=[progress stringr]; };
   nasadata = derive2 { name="nasadata"; version="0.9.0"; sha256="0y88qdy8c1y0prsajxic5vdqfixv9knjsbhw3vbfac8wv3a69bjl"; depends=[dplyr jsonlite plyr png]; };
-  nasapower = derive2 { name="nasapower"; version="1.1.1"; sha256="1445wz92fyhsfj93v4m7a53rc8p1x2m90m9w9v5zvpry4yq2y1kp"; depends=[APSIM crul curl jsonlite lubridate readr tibble]; };
+  nasapower = derive2 { name="nasapower"; version="1.1.2"; sha256="182nwk0b1i268l9i2kgybkgvw5hc5bcyzd6p2nw8kf2pcqwn8x1i"; depends=[APSIM crul curl jsonlite lubridate readr tibble]; };
   nasaweather = derive2 { name="nasaweather"; version="0.1"; sha256="05pqrsf2vmkzc7l4jvvqbi8wf9f46854y73q2gilag62s85vm9xb"; depends=[]; };
-  nat = derive2 { name="nat"; version="1.8.11"; sha256="1s5hbi1b20jq0qv4px0zrwsivhi2mdlqbwx4lv55mdhj447rxk1x"; depends=[digest filehash igraph nabor nat_utils plyr rgl yaml]; };
+  nat = derive2 { name="nat"; version="1.8.13"; sha256="12n81jzlzamnpkf5inczfc1x8qmfibszpkakpyc0q7r7wgpykbgv"; depends=[digest filehash igraph nabor nat_utils plyr rgl yaml]; };
   nat_nblast = derive2 { name="nat.nblast"; version="1.6.2"; sha256="0b2gzyzszj2v5girxyv31nvds0837lzvim7x7bs9h897yrxs57k8"; depends=[dendroextras nabor nat plyr rgl spam]; };
   nat_templatebrains = derive2 { name="nat.templatebrains"; version="0.9"; sha256="0r0ydhxnax4x4gwp60bgarhgp59g4sis7msa3rq4kddv8qdi3gix"; depends=[digest igraph memoise nat rappdirs rgl]; };
   nat_utils = derive2 { name="nat.utils"; version="0.5.1"; sha256="12g87ar795xfbz7wljksb24x9hqvcirjr50y4mbpx1427r0l7clv"; depends=[]; };
@@ -10267,17 +10478,18 @@ in with self; {
   nbc4va = derive2 { name="nbc4va"; version="1.1"; sha256="025p9h1ghrsq4h439gx25ffpyvh2kp1i51hm7kbzx8nmh4ka8aff"; depends=[]; };
   nbconvertR = derive2 { name="nbconvertR"; version="1.0.2"; sha256="1dc9jxfibvb27qwiykj93322nb1ahwrg69zqcc0p9xp0rpsim02w"; depends=[]; };
   nbpMatching = derive2 { name="nbpMatching"; version="1.5.1"; sha256="0f90k9vq05gkc0sgywb98frig63df0ih4z41dq7m2inx1zk5rqns"; depends=[Hmisc MASS]; };
+  nc = derive2 { name="nc"; version="2019.9.16"; sha256="07bl48k4hkz7rp16h8la8z3d313vgarqb00a65grg1v1cc4sa6r3"; depends=[data_table]; };
   ncappc = derive2 { name="ncappc"; version="0.3.0"; sha256="0bf00iskrd3x43839bwn957mi3qvm2dhcmqa7hl1ib0gp2r1cnzx"; depends=[bookdown Cairo dplyr ggplot2 gridExtra gtable knitr lazyeval magrittr PopED purrr readr reshape2 rlang rmarkdown scales tibble tidyr xtable]; };
-  ncar = derive2 { name="ncar"; version="0.4.1"; sha256="0nqc3ari3ghxygqvb3vfzdqclh77mbhyh3pki86wwx6ym62b1bx0"; depends=[NonCompart rtf]; };
+  ncar = derive2 { name="ncar"; version="0.4.2"; sha256="12cz4mlcmg8vdcn6747q1vz20wyypf89jq3nzx17s3aki0vlnwmj"; depends=[NonCompart rtf]; };
   ncbit = derive2 { name="ncbit"; version="2013.03.29"; sha256="0f07h8v68119rjvgm84b75j0j7dvcrl6dq62vp41adlm2hgjg024"; depends=[]; };
   ncdf_tools = derive2 { name="ncdf.tools"; version="0.7.1.295"; sha256="1jgxivmg2gzvkn09n13i5xr1v0xcyp5ckhwxz6g5kdh9z2dkjhc2"; depends=[abind chron JBTools plotrix raster RColorBrewer RNetCDF]; };
   ncdf4 = derive2 { name="ncdf4"; version="1.16.1"; sha256="083sb24anyd4sw0il3x07pqn9rbx5y5ayqass6mz8x443rnjvphd"; depends=[]; };
   ncdf4_helpers = derive2 { name="ncdf4.helpers"; version="0.3-3"; sha256="051akd7r6zx805a0xwcs95q5sd8alag0f1gzqjk3n188q8r3ji5j"; depends=[abind ncdf4 PCICt]; };
-  ncdfgeom = derive2 { name="ncdfgeom"; version="1.0.0"; sha256="0nd84223msmpazcdnfzk4rc4a3kaxdcwla2shnlkb0zxkz6v5ddn"; depends=[dplyr ncmeta RNetCDF sf]; };
+  ncdfgeom = derive2 { name="ncdfgeom"; version="1.1.0"; sha256="19gbpf19vjzfigi9awhqjx6zsv92h4w1lg3dps3sgaibym9lq3zk"; depends=[dplyr ncmeta RNetCDF sf]; };
   ncdump = derive2 { name="ncdump"; version="0.0.3"; sha256="09g98mzpky32z41jf23ahzhyv34l34y1gqq99j2hl4pqlvvhxs9i"; depends=[dplyr ncdf4]; };
   ncf = derive2 { name="ncf"; version="1.2-8"; sha256="1j2q1dqhr8xk9fhzjkpnx8ff427d1m8qr07l2zj5lwyh9wbr1jzn"; depends=[]; };
   ncg = derive2 { name="ncg"; version="0.1.1"; sha256="1jzkzp61cc5jxmdnl867lcrjjm7y2iw9imzprbd098p1j3w8fvj7"; depends=[]; };
-  ncmeta = derive2 { name="ncmeta"; version="0.0.4"; sha256="10mq7fb2a8hn1nmgrcvgfz0dc6dh39icn9b3109027g6xqdb7792"; depends=[dplyr rlang RNetCDF tibble tidyr]; };
+  ncmeta = derive2 { name="ncmeta"; version="0.1.0"; sha256="0b02nqz0757jm55yh5zw4pd52v0af8hkq84is50fr1vpp9pdpshc"; depends=[dplyr rlang RNetCDF tibble tidyr]; };
   ncodeR = derive2 { name="ncodeR"; version="0.1.3.0"; sha256="03jwvxks4db3dngrmmz7bhwq2j072lqwvnhi7xwg1pgbba02wlz7"; depends=[cli R6 rhoR]; };
   ncpen = derive2 { name="ncpen"; version="1.0.0"; sha256="0vl4cbrsifr5s1691gacmp0lk3aqyq0yfafafzv6g3zygi4igrsa"; depends=[Rcpp RcppArmadillo]; };
   ncvreg = derive2 { name="ncvreg"; version="3.11-1"; sha256="09s8k8gqsnwm6f5x1rr1f32pzam67migxwkbj4lfvw85v3pljdmr"; depends=[]; };
@@ -10292,7 +10504,7 @@ in with self; {
   needmining = derive2 { name="needmining"; version="0.1.1"; sha256="0qsj0ihjchrnl4s44rpsizbcz033z00dmzvic2y1msv0bnfawl6p"; depends=[randomForest rtweet SnowballC SparseM stringr tau tm]; };
   needs = derive2 { name="needs"; version="0.0.3"; sha256="16dkjpijz3rz7kd5ggxsdg55iwd42nll1vk6g5ix4xdbqrx6cp9x"; depends=[]; };
   needy = derive2 { name="needy"; version="0.2"; sha256="1ixgpnwrg6ph1n5vy91qhl1mqirli9586nzkmfvzjrhdvrm0j5l0"; depends=[]; };
-  negenes = derive2 { name="negenes"; version="1.0-8"; sha256="0qyhypryp3p8c876jffg1syg05b370mw24clwlx733yx86qhmb1v"; depends=[]; };
+  negenes = derive2 { name="negenes"; version="1.0-12"; sha256="0b82822vl86gni0pv5f6pjfzmks35i7q2rqkhgyb9z9c677g991q"; depends=[]; };
   neighbr = derive2 { name="neighbr"; version="1.0.2"; sha256="1l85x3p4h2z2npj1xqggviyd3kvkgni5cnx5p3g52s9jwqrj43kb"; depends=[]; };
   neldermead = derive2 { name="neldermead"; version="1.0-11"; sha256="0gf9rfwz48sadl6960mpfb6a3l9n5p28yq3n0a9vz8mr57vh1dzg"; depends=[optimbase optimsimplex]; };
   neo4r = derive2 { name="neo4r"; version="0.1.1"; sha256="0s4rjhn2mc8ca4p8p474a83dc277vrf7l968xwxkiac0d4fgbra7"; depends=[attempt data_table glue httr igraph jsonlite magrittr purrr R6 rlang rstudioapi shiny tibble tidyr tidyselect]; };
@@ -10300,7 +10512,7 @@ in with self; {
   neotoma = derive2 { name="neotoma"; version="1.7.4"; sha256="1fknzp7qg5l5lkfvqfld0x67zj3xmi8vivsg70m47mbpcs92hmcf"; depends=[analogue dplyr httr jsonlite leaflet plyr reshape2 xml2]; };
   nephro = derive2 { name="nephro"; version="1.2"; sha256="1izmzx8lah322xzb42asfnrvr2c9yqd0zf7fmrhwd3p4rr1rqa7d"; depends=[]; };
   nesRdata = derive2 { name="nesRdata"; version="0.2.0"; sha256="1cr5d600bnslxbm2kknzwivvb4zyfsrf8rbrk3kk0j6dpclx5x6s"; depends=[dataone dplyr purrr rappdirs readr]; };
-  nestfs = derive2 { name="nestfs"; version="0.9.2"; sha256="0zr9637c80qrdsf661kishhsrjhlrzvczxgb1kyvcsigvd5g9dvj"; depends=[dgof foreach pROC]; };
+  nestfs = derive2 { name="nestfs"; version="1.0"; sha256="0lzbjj287s5kmw9635gfyl3jdgfh5mxbwxqxmnwynbwccixk0akc"; depends=[dgof pROC]; };
   netCoin = derive2 { name="netCoin"; version="0.3.2"; sha256="04fi08879yisdmkla93rvr029inwlgg5c5vz8k24d535m8k6mjhp"; depends=[haven igraph Matrix]; };
   netSEM = derive2 { name="netSEM"; version="0.5.1"; sha256="0k4ngl4p1v2rp1sf2x65m7p0cd6ha98fyx21b73ki0531q0d9fil"; depends=[DiagrammeR DiagrammeRsvg gtools htmlwidgets knitr magrittr MASS png rsvg segmented svglite]; };
   netassoc = derive2 { name="netassoc"; version="0.6.3"; sha256="1hyshnbpq60a3y13b4sh1c2rk78x09q01b7q6xrgv10w7bn9r2sg"; depends=[corpcor huge igraph infotheo vegan]; };
@@ -10313,7 +10525,7 @@ in with self; {
   netgsa = derive2 { name="netgsa"; version="3.1.0"; sha256="0mn4dnvckdskigdfbszjnfmb3m6yfbz4qc26qwh1wznwx5wmcbf0"; depends=[corpcor dplyr glassoFast glmnet graph graphite igraph magrittr Matrix msigdbr quadprog rlang]; };
   netgwas = derive2 { name="netgwas"; version="1.10"; sha256="19gqsilw9i4hinz6qsms7cnlrrrnpriq2ws8l1naivfz94bdi7dx"; depends=[glasso huge igraph MASS Matrix qtl RBGL tmvtnorm]; };
   netjack = derive2 { name="netjack"; version="1.2.0"; sha256="060ygb0kxi0gx1ya38cmf5hhyy6jkwq5519azdqhq5i324cwzzm7"; depends=[brainGraph ggplot2 igraph Rdpack]; };
-  netmeta = derive2 { name="netmeta"; version="1.0-1"; sha256="1fsm41xz1dv6gwc354nxx4bj0xfmvamqhnhlbp5pn2g4y66wqm7s"; depends=[magic MASS meta]; };
+  netmeta = derive2 { name="netmeta"; version="1.1-0"; sha256="16cf7cam63f07lfmvj5g8rqrdagyzphnsp4pxaklgnx5wwjwj3wj"; depends=[ggplot2 magic MASS meta]; };
   netrankr = derive2 { name="netrankr"; version="0.2.1"; sha256="0csgi09ijp7ygwk7x057l9xjrzyhr7sav8hamh0p6i72l6719ssl"; depends=[igraph Rcpp RcppArmadillo]; };
   netregR = derive2 { name="netregR"; version="1.0.1"; sha256="0n5absjra0imddz1spy1piij5rdz76wi4g568yby3rbhkm1896rs"; depends=[Matrix]; };
   nets = derive2 { name="nets"; version="0.9"; sha256="1wcr0fj50w3rqxw0k9cb81c2psdkb0dwwwzrjvxv50hksbhyi8kn"; depends=[igraph]; };
@@ -10323,7 +10535,7 @@ in with self; {
   networkDynamic = derive2 { name="networkDynamic"; version="0.10.0"; sha256="1dgk3lj1fx0x6ccyp6h6rkzbjqqd8nflilqs4dfi8sm0fcndfcgb"; depends=[network statnet_common]; };
   networkDynamicData = derive2 { name="networkDynamicData"; version="0.2.1"; sha256="176al8jp0gha6yzhyn5flmyackmmdnh1h8sasqrdcmba7ha7cya6"; depends=[network networkDynamic]; };
   networkGen = derive2 { name="networkGen"; version="0.1.1"; sha256="1vnh5dajiaf47kx1sxyp744mlk3yvl4sxj380i3b3ic1wlgyd2h1"; depends=[igraph mgcv]; };
-  networkR = derive2 { name="networkR"; version="0.1.0-0"; sha256="1apgvnny2ynhnyn1a2kjiyvxrdqgkqar2w543wph4lnavsi4i0cp"; depends=[data_table fastmatch Matrix Rcpp RcppArmadillo]; };
+  networkR = derive2 { name="networkR"; version="0.1.2"; sha256="07dq3syk0hr1kc2mqd70g0ih09hamd7rxxms60dyvnpm8978c1wz"; depends=[data_table fastmatch Matrix Rcpp RcppArmadillo]; };
   networkTomography = derive2 { name="networkTomography"; version="0.3"; sha256="1hd7av231zz0d2f9ql5p6c95k7dj62hp0shdfshmyfjh8900amw7"; depends=[coda igraph KFAS limSolve plyr Rglpk]; };
   networkreporting = derive2 { name="networkreporting"; version="0.1.1"; sha256="1ssbz8lw4mlwcblwfbyffvayvb2gmihq4qlz5q9222fn4aa3raxd"; depends=[dplyr functional ggplot2 lazyeval plyr reshape2 stringr surveybootstrap]; };
   networksis = derive2 { name="networksis"; version="2.1-3"; sha256="1kvil3qs7xd94ak9jgvj1nss55gjg0y7d35zmass9h1hjkcrq7bg"; depends=[network]; };
@@ -10332,7 +10544,7 @@ in with self; {
   neuRosim = derive2 { name="neuRosim"; version="0.2-12"; sha256="1hsnw9xipdr74fydq9013252ycbi9igh28s0j4dbdx52pv3iixzl"; depends=[deSolve]; };
   neural = derive2 { name="neural"; version="1.4.2.2"; sha256="05hrqgppgwp38rdzw86naglxj0bz3wqv04akq7f0jxbbjc6kwy4j"; depends=[]; };
   neuralnet = derive2 { name="neuralnet"; version="1.44.2"; sha256="09l808vgjh059a3f94vgsprfyp5c1hrbjn6i1cn34cxnbljwsrjz"; depends=[Deriv MASS]; };
-  neurobase = derive2 { name="neurobase"; version="1.27.6"; sha256="1m52yk1wdn65cbxbd2cbn38px0qh4z3cl8h6r63k2jd4asvk4wvf"; depends=[abind matrixStats oro_nifti R_utils RNifti]; };
+  neurobase = derive2 { name="neurobase"; version="1.27.11"; sha256="12qjxvr1s0k2hrbnxs7cysz458z3m5wcgia8d64zih16hzbrjg9v"; depends=[abind matrixStats oro_nifti R_utils RNifti]; };
   neuroblastoma = derive2 { name="neuroblastoma"; version="1.0"; sha256="0hs87fvwaq53xxbh2dw3hjsmf1zkyqli9qyacxf72fnkyhhl8b45"; depends=[]; };
   neurohcp = derive2 { name="neurohcp"; version="0.8.1"; sha256="01q9dkrpmwfj4r7is97f3lsmn84vm5qpvf44zfm1a6hhpxa0n7z0"; depends=[base64enc digest httr xml2]; };
   neuroim = derive2 { name="neuroim"; version="0.0.6"; sha256="00cjr6pkip6zi2d0q3qbn3lb3k0z82v6c19qslvgpa9n0g63dr5p"; depends=[abind assertthat hash iterators Matrix Rcpp readr rgl stringr yaImpute]; };
@@ -10348,11 +10560,12 @@ in with self; {
   ngstk = derive2 { name="ngstk"; version="0.2.3"; sha256="0196hnbqw9bji3bl2phjs9z5n84x5fs7iiirfd6gjyqv9xlfwd2p"; depends=[configr data_table future optparse stringi stringr]; };
   nhanesA = derive2 { name="nhanesA"; version="0.6.5"; sha256="0bb53s379qrm8xqp4bsi5vgk6v6hvwadzjv09pvdp1n45z7rqj86"; depends=[Hmisc magrittr plyr rvest stringr xml2]; };
   nhdR = derive2 { name="nhdR"; version="0.5.2"; sha256="0qi7ls10pdjcihkdnhbvbnv8dwcy1448pd5fzhpy0kjky7hfi7bj"; depends=[curl dplyr foreign gdalUtils ggplot2 httr maps memoise purrr rappdirs rgdal rlang rvest sf stringr units xml2]; };
+  nhdplusTools = derive2 { name="nhdplusTools"; version="0.3.8"; sha256="06vxs30iymvmdvr0ag9rywp270ya0aqkpb9wy4grv6bn9lw4n36q"; depends=[dplyr httr igraph jsonlite magrittr RANN sf units xml2]; };
   nhds = derive2 { name="nhds"; version="1.0.3"; sha256="1cgw3hmsik3vlnb1lgalhvhrqzwdv08dp80vwpw1nwbf8whcbxjn"; depends=[]; };
   nhstplot = derive2 { name="nhstplot"; version="1.0.1"; sha256="1f07gfmbx80as54mlzdbs2z1vzc78rjy6i6m7zd4jplgcqdcynws"; depends=[ggplot2]; };
   nice = derive2 { name="nice"; version="0.4-1"; sha256="1p8vmimiq9sbjvbx6c2wqwwkpnzw4kkdvjry6qyadmm3frwhj5qb"; depends=[]; };
   nicheROVER = derive2 { name="nicheROVER"; version="1.0"; sha256="0sa7wfpzkin78vz48vwa5iac82v5l1s3zczdxz8sc2kyg22fj0aw"; depends=[mvtnorm]; };
-  nilde = derive2 { name="nilde"; version="1.1-2"; sha256="07m52c4gw0vcyb6pya5z7m4y1kiy2zvh0gnhp80hxc7nhyx0rnqd"; depends=[]; };
+  nilde = derive2 { name="nilde"; version="1.1-3"; sha256="0h88if7dh16inyy5zh0yjqmc0c57k99la038p5vlwkj62vvjscmm"; depends=[]; };
   nima = derive2 { name="nima"; version="0.5.0"; sha256="1xpzq1mg2l9hnh83hbmxcqz3v0ai62ii7k688i8lpj0xnpsm25pl"; depends=[assertthat devtools ggplot2 ggthemes gridExtra gtools plyr ProjectTemplate scales survival]; };
   nimble = derive2 { name="nimble"; version="0.8.0"; sha256="0zfxv1bvvdyzdg2b0wvrc9x6y52jyqjm9ffikaql1acalblqws5y"; depends=[coda igraph R6]; };
   nipals = derive2 { name="nipals"; version="0.5"; sha256="1zrn1ykl9scd988wj3mm0j6g5q6lq04iwn2ibgap1lrsd0rw1zbf"; depends=[]; };
@@ -10368,13 +10581,15 @@ in with self; {
   nlme = derive2 { name="nlme"; version="3.1-141"; sha256="0ml00g79bimjcl0sgn6h55l5b4gfmnsnc1vvmivggn0318k4c04i"; depends=[lattice]; };
   nlmeODE = derive2 { name="nlmeODE"; version="1.1"; sha256="1zp1p98mzbfxidl87yrj2i9m21zlfp622dfnmyg8f2pyijhhn0y2"; depends=[deSolve lattice nlme]; };
   nlmeU = derive2 { name="nlmeU"; version="0.70-3"; sha256="05kxymgybziiijpb17bhcd9aq4awmp5km67l2py9ypakivi0hc6l"; depends=[nlme]; };
+  nlmixr = derive2 { name="nlmixr"; version="1.1.1-2"; sha256="1x9df3w8093ri858yjmkp963pnrjx4hny2s74chf5q85q13dib0k"; depends=[BH brew cli crayon digest dparser fastGHQuad flextable generics ggplot2 huxtable lattice lbfgs lbfgsb3c magrittr Matrix memoise minqa n1qn1 nlme R_utils Rcpp RcppArmadillo RcppEigen rex RxODE StanHeaders stringr sys tidyr vpc yaml]; };
   nlmrt = derive2 { name="nlmrt"; version="2016.3.2"; sha256="1g0qq0a933ay65gkp04qgn2wqk6vw79pj2a228c2ski4rcmkjxyn"; depends=[]; };
   nlnet = derive2 { name="nlnet"; version="1.2"; sha256="00lcyz5csjj9qbhh7yw0qlbnyv32k0c2dpm23v04n9wkdgs67jy0"; depends=[coin e1071 earth fdrtool igraph randomForest ROCR TSP]; };
   nloptr = derive2 { name="nloptr"; version="1.2.1"; sha256="15yz60kljxwnhm2m3gryjzxl3ynhkhd5jiwc179b1hz6rlzf71hz"; depends=[]; };
+  nlpred = derive2 { name="nlpred"; version="1.0.0"; sha256="0a13agsacn7qw2i8ggd9v8w7k44r4faby1vv163gsa764ppj70m4"; depends=[assertthat bde cvAUC data_table np Rdpack ROCR SuperLearner]; };
   nlr = derive2 { name="nlr"; version="0.1-3"; sha256="19zcnigijr3jfy4da945z4fdnrirvlmpqminaf5wwk0bz71f3b61"; depends=[GA MASS nlme quantreg robcor TSA tseries]; };
   nlreg = derive2 { name="nlreg"; version="1.2-2.2"; sha256="0gkcxg5m287axhvkl00xy26vidawhhb1ii1s13rh49v0yccwvvqh"; depends=[statmod survival]; };
   nlrr = derive2 { name="nlrr"; version="0.1"; sha256="09wm8s5sadkhkq9pb3fjk66cb2xn8py46w1d7yp7fjhczh31bjsq"; depends=[Hmisc rms]; };
-  nlrx = derive2 { name="nlrx"; version="0.2.0"; sha256="0ahgw0lmfpfb03fzhvp8a4rhvn0r84s90aiada4slss47g63iclq"; depends=[dplyr furrr genalg GenSA igraph lhs magrittr purrr raster readr rstudioapi sensitivity sf stringr tibble tidyr XML]; };
+  nlrx = derive2 { name="nlrx"; version="0.3.0"; sha256="01wvhl339qizi7hlz7dclmn6nv489vh71mpk8c8imyj9ckx3z18c"; depends=[dplyr furrr genalg GenSA igraph lhs magrittr purrr raster readr rstudioapi sensitivity sf stringr tibble tidyr XML]; };
   nls_multstart = derive2 { name="nls.multstart"; version="1.0.0"; sha256="08zdyx5hp1xbqjspk0f89fca5gc0b5j87hsccvn9dxn2lrnwk8nb"; depends=[dplyr minpack_lm purrr tibble tidyr]; };
   nls2 = derive2 { name="nls2"; version="0.2"; sha256="0k46i865p6jk0jchy03jiq131pc20h9crn3hygzy305rdnqvaccq"; depends=[proto]; };
   nlsMicrobio = derive2 { name="nlsMicrobio"; version="0.0-1"; sha256="0676n78265z00dacmq593c9l2239ii574djm9s7i7w8jk1kdhzx2"; depends=[nlstools]; };
@@ -10382,7 +10597,7 @@ in with self; {
   nlshelper = derive2 { name="nlshelper"; version="0.2"; sha256="02xnx0j8p1im1hdwnia3n51dicscjf8s33y475i3dczvhmivvbmf"; depends=[broom dplyr magicaxis mgcv nlme]; };
   nlshrink = derive2 { name="nlshrink"; version="1.0.1"; sha256="0adnr7g3n3brwlvyix8wa7h59gj036l5anv8abqy80ysmfcmsp0y"; depends=[MASS nloptr]; };
   nlsmsn = derive2 { name="nlsmsn"; version="0.0-4"; sha256="1gvpy8rq020l64bdw6n7kv354l7gwa2rgxarm6k0mqq7z21fxf58"; depends=[]; };
-  nlsr = derive2 { name="nlsr"; version="2018.1.28"; sha256="113g656j6zqdqip6dw55pimmwq36xrxgfyix10y3qqn9lxvqrpqq"; depends=[digest]; };
+  nlsr = derive2 { name="nlsr"; version="2019.9.7"; sha256="1zhfnv09khd2k236jzka9znc0nlps452gwl7db0grb0ylfyxbqg4"; depends=[digest]; };
   nlsrk = derive2 { name="nlsrk"; version="1.1"; sha256="0yqcsz5pdhqsrd86g0yx8bdac13fbmvg89phj3v4qvla2jfznjba"; depends=[]; };
   nlstimedist = derive2 { name="nlstimedist"; version="1.1.4"; sha256="1c9yxpaxdx03yav4x0vk67f1j6w70jv212sfxrfxkz61ivyqcmlb"; depends=[broom dplyr ggplot2 lazyeval minpack_lm nlstools]; };
   nlstools = derive2 { name="nlstools"; version="1.0-2"; sha256="0mjn1j9fqqgr3qgdr0ki4lfbd0yrkanvya4y2483q3wklqa6qvjc"; depends=[]; };
@@ -10397,26 +10612,28 @@ in with self; {
   nmixgof = derive2 { name="nmixgof"; version="0.1.0"; sha256="0cbwrsxrcf8pn4ycn6r0z8jdidw5l6kdvwyrks69fq4pjzx988d6"; depends=[Rcpp unmarked]; };
   nmslibR = derive2 { name="nmslibR"; version="1.0.3"; sha256="1m3bq0vg774kqragdx1ydm4q2if3yn9llbd6ybv3c8bmbdb9h405"; depends=[KernelKnn Matrix R6 Rcpp RcppArmadillo reticulate]; };
   nmw = derive2 { name="nmw"; version="0.1.4"; sha256="1vj7b2p40x0h3xp45qzar86i9439mj8y3r5hnlbwa025jqdf2g0q"; depends=[numDeriv]; };
-  nnTensor = derive2 { name="nnTensor"; version="1.0.0"; sha256="07cdc8givv0mzszq418hgl5ic77mg7dh40q03gnv9iki6k5lc31a"; depends=[fields plot3D rTensor tagcloud]; };
+  nnTensor = derive2 { name="nnTensor"; version="1.0.1"; sha256="0h6m601wjj8xzzgc6m8fal6mhvlxpiajg2d53vyjw1hxm4ilqk4x"; depends=[fields plot3D rTensor tagcloud]; };
   nna = derive2 { name="nna"; version="0.0.2.1"; sha256="17cz1jf7iv61wspqldfdwbdjhlr0wq09idkzlivfb8aik5w9f0z5"; depends=[]; };
   nnet = derive2 { name="nnet"; version="7.3-12"; sha256="17amqnw9dpap2w8ivx53hxha2xrm0drwfnj32li0xk41hlz548r7"; depends=[]; };
   nnetpredint = derive2 { name="nnetpredint"; version="1.2"; sha256="1c6s9wm6vhylwv4xhp2hkllw18zj8hdr17ls9vlxm9qs3wx1v48w"; depends=[RSNNS]; };
   nnfor = derive2 { name="nnfor"; version="0.9.6"; sha256="0bciy6k79g7abvj3pmmdc4wzg5mp11zgmdbx17x4by993p2clhw9"; depends=[forecast glmnet MASS neuralnet plotrix tsutils uroot]; };
-  nngeo = derive2 { name="nngeo"; version="0.2.8"; sha256="019nv59a11n0j1q6x8l3jmzy7r51zkjwzmrfsbcn3visb755pagb"; depends=[lwgeom RANN Rcpp sf sp units]; };
+  nngeo = derive2 { name="nngeo"; version="0.2.9"; sha256="1cxrr7k2rjzg2bw43c2mr9jnr9mwwaln5j2xivmrfq2lcrhll0fi"; depends=[igraph lwgeom RANN raster Rcpp sf sp stars units]; };
   nnlasso = derive2 { name="nnlasso"; version="0.3"; sha256="1n7karlmgq61z9ywfx9xb5wvmxx40ydpnzzazj1xr70qlv5m0qk4"; depends=[]; };
   nnls = derive2 { name="nnls"; version="1.4"; sha256="07vcrrxvswrvfiha6f3ikn640yg0m2b4yd9lkmim1g0jmsmpfp8f"; depends=[]; };
   noaaoceans = derive2 { name="noaaoceans"; version="0.1.0"; sha256="15spkivnc6kv3w2z5m8gvlqpa6pfqxmggjchnsd3r0v61nz64ab3"; depends=[httr jsonlite rvest xml2]; };
   noaastormevents = derive2 { name="noaastormevents"; version="0.1.1"; sha256="1ra852r5hw1ng3f4jk866jx0z2dszwvbidmfrdjchv9bfrjwmlmx"; depends=[choroplethr choroplethrMaps data_table dplyr forcats ggplot2 htmltab hurricaneexposure lubridate maps plyr RColorBrewer rlang stringr tidyr viridis XML]; };
-  nodbi = derive2 { name="nodbi"; version="0.2.0"; sha256="17qgdy9gb2a5vqq26b60gbykyyalgb9dnh5g1w83cn7bz8akmqsj"; depends=[data_table jsonlite]; };
+  nodbi = derive2 { name="nodbi"; version="0.3.0"; sha256="1yb1g4xbjzadm5rljxhk7bc22s888hwj8r3yxzzik4p3pksy634h"; depends=[data_table jsonlite]; };
   nodeHarvest = derive2 { name="nodeHarvest"; version="0.7-3"; sha256="0nh3g50rk9qzrarpf29kijwkz9v60682i0ag77j2ipyvhhbpwpkc"; depends=[quadprog randomForest]; };
   nodiv = derive2 { name="nodiv"; version="1.3.0"; sha256="1z0xqdfplg5rz94qcnks435md3q7jpd5f32jfm0pqnyr3536gs03"; depends=[ape picante raster sp vegan]; };
   nofrills = derive2 { name="nofrills"; version="0.3.0"; sha256="18hryq6clywlr2f45az6ryslkkarly45nacln4bwk6ip0yfl5s98"; depends=[rlang]; };
   noia = derive2 { name="noia"; version="0.97.1"; sha256="0yldfmnb4ads4s9v9cj1js8zf1w1hxasqq6qjyzwknmvmp7kh62h"; depends=[]; };
   noise = derive2 { name="noise"; version="1.0"; sha256="1a48s9vpz3nc058966lad8hydmg7z0vbzfwcf6nxc9g3c8mw4nig"; depends=[preprocessCore]; };
+  noisyCE2 = derive2 { name="noisyCE2"; version="1.0.0"; sha256="11cf7b472i6lsb4kh04rhp5mhj7l8ig0kxmkz05kazkr6cs41s6i"; depends=[magrittr]; };
   nomclust = derive2 { name="nomclust"; version="1.1.1106"; sha256="17hb89k72sw3ya0wm3n95mpx4vj7mpl4mzs8qwl2773dh2mcjgjq"; depends=[cluster dummies]; };
   nomisr = derive2 { name="nomisr"; version="0.4.1"; sha256="0a94s1xqij6k2kkzdzxp5837qgv9czzgl6wp0z9a95xizy3hkjsx"; depends=[dplyr httr jsonlite readr rlang rsdmx tibble]; };
   nomnoml = derive2 { name="nomnoml"; version="0.1.0"; sha256="0yzbs9by2fvwvxpl2xzjikzcjv8dvcr5v2v82ibz5jpnnsbl1ac4"; depends=[htmlwidgets png webshot]; };
   nomogramEx = derive2 { name="nomogramEx"; version="3.0"; sha256="16235rwblnzn8k53817llwy2pzhnpifh6ij159nxymjm8ar9qpbp"; depends=[pracma rms]; };
+  nomogramFormula = derive2 { name="nomogramFormula"; version="1.1.0.0"; sha256="1cblsxyyizsjz079qlbvhmb51n2cmxxsrh1ca7xwxc0zj6ihg02w"; depends=[rms]; };
   noncensus = derive2 { name="noncensus"; version="0.1"; sha256="0cfj17bfzddfshhhzv2ijhrp9ylcscmsysswjcsjfxmy3gbkd00q"; depends=[]; };
   noncompliance = derive2 { name="noncompliance"; version="0.2.2"; sha256="1lcybgj95z7lz7p26xbsdiv0vvms4ab4f8kad0pclacf1l43v0j6"; depends=[data_table Rcpp]; };
   noncomplyR = derive2 { name="noncomplyR"; version="1.0"; sha256="1a9m6r9cizw42nmy24jdsrsbllg5z84fs8b239axnh1fxzskg2qy"; depends=[MCMCpack]; };
@@ -10425,7 +10642,7 @@ in with self; {
   nonlinearTseries = derive2 { name="nonlinearTseries"; version="0.2.6"; sha256="0nsfpcqmfsn31gi5dyyc7y7zcafhqmv5931vkphbg51lgs6va0qp"; depends=[Matrix Rcpp RcppArmadillo rgl TSA tseries zoo]; };
   nonmem2R = derive2 { name="nonmem2R"; version="0.2.1"; sha256="0a7h9wb8dqjgzyk4hd9ivhy90n80wrrp4zkrxnvgfvza1619qd52"; depends=[ggplot2 gridExtra lattice latticeExtra MASS mvtnorm reshape2 splines2]; };
   nonmemica = derive2 { name="nonmemica"; version="0.9.0"; sha256="1vn70qynw2j2sf0z55dr9cl0inqzdk48xybsavcivn5dbl5lzzg2"; depends=[csv dplyr encode lazyeval magrittr metaplot rlang spec tidyr xml2]; };
-  nonneg_cg = derive2 { name="nonneg.cg"; version="0.1.1"; sha256="18jsn8pj9417w2as458gbl4y0zs08fcclhfsydgdvnyi9f358hav"; depends=[Rcpp]; };
+  nonneg_cg = derive2 { name="nonneg.cg"; version="0.1.6"; sha256="15361k0kjy1465s8pr9jb5jy22mibi37zcnza7mbfh5l66hr29kh"; depends=[Rcpp]; };
   nonnest2 = derive2 { name="nonnest2"; version="0.5-2"; sha256="1bq44qqmm59j91m0sny4xnqmxqlga4cm48qdsw8xfs3x19xwmxk6"; depends=[CompQuadForm lavaan mvtnorm sandwich]; };
   nonpar = derive2 { name="nonpar"; version="1.0.1"; sha256="0pxks3nga7jrcvq0pzr1axj3a9xvzky836fl7966a09ws1vff7i4"; depends=[]; };
   nonparaeff = derive2 { name="nonparaeff"; version="0.5-8"; sha256="1kkn68m7cqlzx3v539cjxw3x5a2y86lvmyv2k98s87m3yvqg0gdk"; depends=[gdata geometry Hmisc lpSolve psych pwt rms]; };
@@ -10434,7 +10651,7 @@ in with self; {
   nopaco = derive2 { name="nopaco"; version="1.0.6"; sha256="0q705b7bjzq0b6vfp6yargybc8h07adx8al1ip7pxkmfcpilj66v"; depends=[Matrix]; };
   nopp = derive2 { name="nopp"; version="1.1.0"; sha256="1zn3ss89i7fwqps6b8syd9jzm68k95p3fdlf285q819dzlk61ypk"; depends=[MASS mlogit]; };
   nor1mix = derive2 { name="nor1mix"; version="1.3-0"; sha256="1817wcvlmxs70vs4db0jkxd7i037744zz8ay3c2a9949z29fxr4w"; depends=[]; };
-  nord = derive2 { name="nord"; version="0.0.1"; sha256="0ajymjn2xw7zik62nhjp11g8bkvsqhhsrzi3bl2k70y544wbl3kn"; depends=[ggplot2]; };
+  nord = derive2 { name="nord"; version="1.0.0"; sha256="1gisqca85vzbqq5hs5bgqjgrjyksxj176x97kv9vv6mwll8kijl9"; depends=[ggplot2]; };
   nordklimdata1 = derive2 { name="nordklimdata1"; version="1.2"; sha256="0c2hbh3qy8nrs275lxpzfgqsfgwp81m4kv0layvnjj09fcybm54x"; depends=[]; };
   norm = derive2 { name="norm"; version="1.0-9.5"; sha256="01j1h412yfjx5r4dd0w8rhlf55997spgb6zd6pawy19rgw0byp1h"; depends=[]; };
   norm2 = derive2 { name="norm2"; version="2.0.2"; sha256="1bpkxgcz940mn7r62sn1w38kii93sjdxbvfayp0nhl4a2qanwxsm"; depends=[]; };
@@ -10466,6 +10683,7 @@ in with self; {
   npcopTest = derive2 { name="npcopTest"; version="1.03"; sha256="1kpa3avi95aa93y038f4zqhhdp8vdscdk0c6397qmqjg34hf1dnr"; depends=[]; };
   npcp = derive2 { name="npcp"; version="0.1-11"; sha256="0zkf01rv065x6sg8b8yal6125wbvjzaris5l9ghn2279q1fwdqz3"; depends=[]; };
   npcure = derive2 { name="npcure"; version="0.1-4"; sha256="0fdl903akry53cbk3cpmsfgzj71vmpz9qksk1dzrg8yzsql37mf6"; depends=[permute zoo]; };
+  nph = derive2 { name="nph"; version="1.9"; sha256="0myy7rq3l1qjfkih6idggg7p9rfh352pvzmasbihi71wcdyibhni"; depends=[ggplot2 mvtnorm]; };
   nplplot = derive2 { name="nplplot"; version="4.5"; sha256="1dpbs0jb34gv0zj528357z1j2pwahjbp04rm7jir6qk0jhyaxxgh"; depends=[]; };
   nplr = derive2 { name="nplr"; version="0.1-7"; sha256="1h3qv9dlw2gx8km3slyvrl588nif1n87df8xwmm6p75ziqhn2f56"; depends=[]; };
   npmlda = derive2 { name="npmlda"; version="1.0.0"; sha256="1dr25an7cac89jyb8zhmj3ry6lq7sh7zxci1injplnk4gzy17mc5"; depends=[]; };
@@ -10473,13 +10691,14 @@ in with self; {
   npmr = derive2 { name="npmr"; version="1.2"; sha256="073i9zcnyp8l5fxblx2sfyn0b4lr6i595q6kl6ispvzmylwqj8na"; depends=[]; };
   npmv = derive2 { name="npmv"; version="2.4.0"; sha256="04lfks2rlax59gxdnbgkpmk2vaax718z6hkgsvmyxf52iby6rvlr"; depends=[Formula]; };
   npordtests = derive2 { name="npordtests"; version="1.1"; sha256="1g8s9nmqqawq65hvpg82c78l3ffsih057665hw98mkipqb9r0vs5"; depends=[]; };
-  nppbib = derive2 { name="nppbib"; version="1.0-0"; sha256="075jb13zckkh66jwdmdlq4d2drjcc3lkj26px3w79b91223yymf2"; depends=[]; };
+  nppbib = derive2 { name="nppbib"; version="1.1-0"; sha256="1dcqcf2jhlz3n4d2kjix8wray9c7yaawfdbdg9lcrih1m7b8gmsy"; depends=[]; };
   npphen = derive2 { name="npphen"; version="1.1-0"; sha256="0pbf9sqdapl5q09g1hj5hi4j2wigrd0b6s0gbv1gx4wn68alrals"; depends=[ks lubridate raster rgdal rts snow]; };
+  npreg = derive2 { name="npreg"; version="1.0-0"; sha256="0idbradahyj6qm7nqrhvnfzly38x4apnbxslkk2i15ldvv50bfh7"; depends=[]; };
   npregfast = derive2 { name="npregfast"; version="1.5.1"; sha256="0s9ci3nybzwykrgi9z2rqp6l15mqbxf759ks0clvkbm7wxv3whk5"; depends=[doParallel foreach ggplot2 mgcv sfsmisc shiny shinyjs wesanderson]; };
   nprobust = derive2 { name="nprobust"; version="0.1.4"; sha256="0ndn1a54i7zk7ixyimm1jdviz3x5l3qa0rpgsdd30jqv8fldfjpz"; depends=[ggplot2 Rcpp RcppArmadillo]; };
   nproc = derive2 { name="nproc"; version="2.1.4"; sha256="1gj38yppip0ygxcgp0x9ba9kpr12ahmz2k0956x3h7py2rl8b098"; depends=[ada e1071 glmnet MASS naivebayes randomForest ROCR tree]; };
   nprotreg = derive2 { name="nprotreg"; version="1.0.0"; sha256="06n82i5m7sgfj759zdwwh8fqybkbchvnaaqcds64m6hbms592bh3"; depends=[expm]; };
-  npsf = derive2 { name="npsf"; version="0.5.1"; sha256="0xpzfskwsc7g7flvfxnzcfjsfdlqdgy4ypxp84xcpaqampgfgd13"; depends=[Formula randtoolbox Rcpp sfsmisc]; };
+  npsf = derive2 { name="npsf"; version="0.5.2"; sha256="0iz4dh2cv1bi90wdf08x70rdm44xmzblck69rlg7vnsb6n2q2is9"; depends=[Formula randtoolbox Rcpp sfsmisc]; };
   npsm = derive2 { name="npsm"; version="0.5.1"; sha256="00xh3x731lqb5vbzmfmlldrvc8s4s88dc394iifsn2g7r5naxks0"; depends=[plyr Rfit]; };
   npsp = derive2 { name="npsp"; version="0.7-5"; sha256="0ci3am6lbmb1raxdqj4ckcm7y1889j0zsk52awl15sjhkx8l2saa"; depends=[quadprog sp spam]; };
   npsr = derive2 { name="npsr"; version="0.1.1"; sha256="1fzvilzjg9z05991sr1s1bdp17kfl6d1580qdllk8is9ac06np0v"; depends=[gmp infotheo MASS]; };
@@ -10490,6 +10709,7 @@ in with self; {
   nsRFA = derive2 { name="nsRFA"; version="0.7-14"; sha256="0sd3br2a5jf6mqbxk8s2i7px9vi9bk3pl8bd5884k40xqcj77irs"; depends=[]; };
   nsROC = derive2 { name="nsROC"; version="1.1"; sha256="1fi7k61fja98kpn528jprjdycwz01rnqm368m82anxh21k7q4s1m"; depends=[sde survival]; };
   nsapi = derive2 { name="nsapi"; version="0.1.1"; sha256="06xf2p6f911vwpzky47r35fjgjvlhp13p9pf1zlvjrv66kdw8vbp"; depends=[crul xml2]; };
+  nsarfima = derive2 { name="nsarfima"; version="0.1.0.0"; sha256="0iw1daha6c2l4zmqa0m917kgbx3d7mh7bhwbrsyxmvr5qs81drhk"; depends=[]; };
   nscancor = derive2 { name="nscancor"; version="0.6.1-25"; sha256="183kvzlln5lhmi51dm0skq1165c3hhy1yz5h2g7nxwqk2b4p23xj"; depends=[]; };
   nscprepr = derive2 { name="nscprepr"; version="0.1.1"; sha256="1rd32zywrzyxz6hpn9s6cwjlg8q8rz3cc0p3b5gan8bicx0ilwjc"; depends=[dplyr lubridate stringr]; };
   nse = derive2 { name="nse"; version="1.19"; sha256="107ri9325ga4kgvs5a3j3698dc3m4v28cb02ypc4dan6f3fa9h8i"; depends=[coda mcmc mcmcse np Rcpp sandwich]; };
@@ -10499,7 +10719,7 @@ in with self; {
   nsgp = derive2 { name="nsgp"; version="1.0.5"; sha256="0piajjz3r71dnjw7lwpjhbaygxcrbbxfvhf8p3n2izyr2pw5fml9"; depends=[MASS]; };
   nspmix = derive2 { name="nspmix"; version="1.4-0"; sha256="1cd133ncnr4g0n6w4c44q6mda8y1n7cfmsgy1x1kczvwp7cm9kk2"; depends=[lsei]; };
   nsprcomp = derive2 { name="nsprcomp"; version="0.5.1-2"; sha256="1zlc1ximx96f235c0l8qfs6vbp1kpnbf943wxsfahnnlnxvwi59f"; depends=[]; };
-  nsrr = derive2 { name="nsrr"; version="0.1.2"; sha256="0g0s8zw2dqi6r0v0mhkjdc40czc9njxk6w4ak380n4g4224cxwzn"; depends=[digest httr jsonlite]; };
+  nsrr = derive2 { name="nsrr"; version="0.1.3"; sha256="11g0xgznd2n29cc9zxr0rrkqhxhjnp277gb7z871kgk6qnjswpwv"; depends=[digest httr jsonlite]; };
   nucim = derive2 { name="nucim"; version="1.0.6"; sha256="0bw9a2xz2w5jlr2qlbia6jfm2yp09n3gzg8a630p1ks75xvlmkbx"; depends=[bioimagetools EBImage fields stringr]; };
   nullabor = derive2 { name="nullabor"; version="0.3.5"; sha256="0hnrawf8s2g0xjc9kh2p3pbdnbai7q71z7arab5mnrz6qbiyym34"; depends=[dplyr forecast fpc ggplot2 magrittr MASS moments purrr rlang tibble tidyr tidyverse tsibble]; };
   numDeriv = derive2 { name="numDeriv"; version="2016.8-1.1"; sha256="0idk02pqkziik932bd8k72d1q775g1is3m4bc861pcxfz6gx3i6q"; depends=[]; };
@@ -10516,14 +10736,14 @@ in with self; {
   nvctr = derive2 { name="nvctr"; version="0.1.1"; sha256="0hjrimg0hvwgkx2hbln6k8z0f2bp9kln7mxxh623qjp0hg4mcvcn"; depends=[magrittr pracma]; };
   nvmix = derive2 { name="nvmix"; version="0.0-1"; sha256="13pp664n5f06gavny586xrwm1n18jndr0hlqx5fdy68n6py0vz9r"; depends=[qrng]; };
   nws = derive2 { name="nws"; version="1.7.0.1"; sha256="1fn92n6brjhh8hpvhax7211cphx2cn0rl99kjqksig6z7242c316"; depends=[]; };
-  nycflights13 = derive2 { name="nycflights13"; version="1.0.0"; sha256="10b05cxpiysvlif59lriprxcyhgk59d3qmcpwwzk88wy6bicl9hn"; depends=[tibble]; };
+  nycflights13 = derive2 { name="nycflights13"; version="1.0.1"; sha256="0h4jzg4q5qpvjp5b2wlk3a2mh0jhyz9c1acdjcmg70pap7fyh0fj"; depends=[tibble]; };
   nzelect = derive2 { name="nzelect"; version="0.4.0"; sha256="19kcbq454yg9g76ix7v3nibgw2203d7vv6f2d6d2zkcc0h08bjm7"; depends=[]; };
   nzilbb_labbcat = derive2 { name="nzilbb.labbcat"; version="0.2-2"; sha256="0424kf53wrs8q5iqs08zbq6srjnz7z5pakz98fmvznlv9ximzvhc"; depends=[httr jsonlite rstudioapi stringr]; };
   nzpullover = derive2 { name="nzpullover"; version="0.3.0"; sha256="0b3mz5i58m48fa1x7gv4l3gqj0gvrar201ph2l1gkbcnfmazwjp8"; depends=[]; };
   oXim = derive2 { name="oXim"; version="1.2.2"; sha256="1hi4ps36amvgqgj64yc3cvy4sx32z1az6lk5yy1sciy6074k5byb"; depends=[gstat imagine R_matlab sp]; };
   oaColors = derive2 { name="oaColors"; version="0.0.4"; sha256="040sdqrk9dciylnnrrshlj06s9qhvngii9shx1p8412ip7mk8r1m"; depends=[MASS RColorBrewer]; };
   oaPlots = derive2 { name="oaPlots"; version="0.0.25"; sha256="0c5ig1ar02vg38pjjmp3gd53ij1j7pzajs0zrlfajz141qkv2ysr"; depends=[ggplot2 oaColors]; };
-  oai = derive2 { name="oai"; version="0.2.2"; sha256="0q1w29wrppi5sfabdw8px7zr92bgri3jhy0y7dhi46xggxfg9vm1"; depends=[httr plyr stringr tibble xml2]; };
+  oai = derive2 { name="oai"; version="0.3.0"; sha256="1ipw9bq3ra66d1ddj1rylyyd20mlcb2i7phzhywra53s1fdifq1g"; depends=[httr plyr stringr tibble xml2]; };
   oak = derive2 { name="oak"; version="0.2.3"; sha256="1119llsv9pik6fpw3zhiz6xnqc2svsf0dfwcg9iywdjclv4bqqbs"; depends=[foreach purrr R6 rlang rlist rstudioapi]; };
   oaqc = derive2 { name="oaqc"; version="1.0"; sha256="1rc0l79xygmr2rp5sjadzigbj65a13z5xlvrxzy26cl0wsxwhmjf"; depends=[]; };
   oasis = derive2 { name="oasis"; version="3.0.4"; sha256="1h1w46rbkbsjvh3fjniy3v7y30r2vf1kiqs807kavf0bpb6a1202"; depends=[fslr mmand neurobase oro_nifti]; };
@@ -10542,10 +10762,11 @@ in with self; {
   oc = derive2 { name="oc"; version="1.01"; sha256="12idrh4jxxq28lgqzr6jzgrvmmwysh5amzhmmaqn3yz49i17gcaf"; depends=[pscl]; };
   occ = derive2 { name="occ"; version="1.1"; sha256="1aka29qqwbd494kvi15yyyqkb9hks4ky2gcvykxhx2drm2fnsn4g"; depends=[]; };
   oce = derive2 { name="oce"; version="1.1-1"; sha256="0hwfnpb6q6pmckzgh67ryvqd1jkrzzhn187x1655rnmkmp9zis1c"; depends=[gsw Rcpp testthat]; };
-  oceanis = derive2 { name="oceanis"; version="0.8.6"; sha256="1snlad2fdhjvyp2px55qa0rf057fsfidn4sg4hd19jny0jkrsi4s"; depends=[classInt dplyr DT foreign ggplot2 leaflet leaflet_extras lwgeom mapview munsell readODS sf sfc shiny shinyBS shinyjs shinythemes stringr tidyr units xlsx]; };
-  oceanmap = derive2 { name="oceanmap"; version="0.1.0"; sha256="1kkjc213nn2ks7cqzchbmjvyp9hci8qndv8migpmyf5vjbm7d297"; depends=[abind extrafont fields lubridate mapdata maps maptools ncdf4 plotrix raster sp]; };
+  oceanis = derive2 { name="oceanis"; version="1.0.4"; sha256="1wdqfbvl0d92s0rpc3l9vnck5ln9q144msbb60n6bgra9w6vx8b0"; depends=[classInt dplyr DT foreign ggplot2 leaflet leaflet_extras lwgeom mapview munsell readODS sf sfc shiny shinyBS shinyjs shinythemes stringr tidyr units xlsx]; };
+  oceanmap = derive2 { name="oceanmap"; version="0.1.0.1"; sha256="0cdv5rizrlbzz1ifcqh726kmki0j68w829k9f0cfnckmh3rwj2y6"; depends=[abind extrafont fields lubridate mapdata maps maptools ncdf4 plotrix raster sp]; };
   ocedata = derive2 { name="ocedata"; version="0.1.5"; sha256="0rs3nzacvg5mbbmbhcj8g9ikjlw26x2mka7lp644l17kgmzzynh6"; depends=[testthat]; };
   ockc = derive2 { name="ockc"; version="1.0"; sha256="0chzrs3ipa2518r4d35z4fxffgq12p1mwj0hzkxw19gdgq6aa8s7"; depends=[flexclust modeltools]; };
+  oclust = derive2 { name="oclust"; version="0.1.0"; sha256="005ml6vhi9rw6js2v4f1dc2ci8kcd7iwrkgbs4c1qxc836ygq0yx"; depends=[entropy mclust]; };
   ocomposition = derive2 { name="ocomposition"; version="1.1"; sha256="0fk8ia95yjlvyvmjw7qg72piqa40kcqq9wlb3flc6a81pys1ycb5"; depends=[bayesm coda]; };
   ocp = derive2 { name="ocp"; version="0.1.1"; sha256="0q52s8j3z3xwnma3sxx6019qxid66bf0a43w4g8xjagplwps57dx"; depends=[]; };
   odbc = derive2 { name="odbc"; version="1.1.6"; sha256="146phrsks0hfd1bfxx452kkq7ximk3fwjz9lqg9fdykar5sr6vjj"; depends=[BH bit64 blob DBI hms Rcpp]; };
@@ -10574,11 +10795,11 @@ in with self; {
   ompr_roi = derive2 { name="ompr.roi"; version="0.8.0"; sha256="1cbrchvpd31lxpxvw2l3q9k5jmffarb1shca8kwm76y5a6zxxq63"; depends=[Matrix ompr ROI slam]; };
   omu = derive2 { name="omu"; version="1.0.2"; sha256="03mj5xk447gadsnvqrm97cjcyfq4xzkgc46kw85gishv7w9qmqrk"; depends=[dplyr ggfortify ggplot2 KEGGREST magrittr plyr reshape2 stringr tidyr]; };
   oncomodel = derive2 { name="oncomodel"; version="1.0"; sha256="1jyyq9znffiv7rg26mjldbwc5yi2f4f8npsd2ykhxyacb3g96fp1"; depends=[ade4]; };
-  oncrawlR = derive2 { name="oncrawlR"; version="0.1.5"; sha256="07zhc76dz0ngvwmj1nq80hqp105wwsx85wcqxcma2vlh5k19j6hf"; depends=[caret DALEX dplyr ggplot2 jsonlite pROC RCurl readr rlang rlist xgboost]; };
+  oncrawlR = derive2 { name="oncrawlR"; version="0.1.6"; sha256="1nf5ycmfjy4d8p00clvzsinvj9y845iaqrpd1q5bv6bdc916qzbf"; depends=[caret DALEX dplyr e1071 formattable fs ggplot2 htmltools jsonlite pdp pROC RCurl readr rlang rlist scales sparkline tidyr webshot xgboost]; };
   onehot = derive2 { name="onehot"; version="0.1.1"; sha256="1cdsz007wr054k5phvihhg4qx0fc039k2s6484m92kws8mb2ziix"; depends=[]; };
-  onelogin = derive2 { name="onelogin"; version="0.1.0"; sha256="1fdh3hn8paasf7zq29k4h4ng26bl63sps0lbv84g60pxhsay2bma"; depends=[glue R6 safer]; };
-  onemap = derive2 { name="onemap"; version="2.1.1"; sha256="0j9c0ynwpzyr548n72wzmmk8gi52qvxlxgzqzn8g6n4v5zmzlkhy"; depends=[fields ggplot2 maps Rcpp reshape2 tkrplot]; };
-  onewaytests = derive2 { name="onewaytests"; version="2.3"; sha256="0wi623f7jh8msnsfbsc5va4c2qy3h6l68g5rx7wrjz6nxwlqzi8y"; depends=[car ggplot2 moments nortest]; };
+  onelogin = derive2 { name="onelogin"; version="0.2.0"; sha256="06p3a8kaxmvsj8nn7dy8w6wv1jjw67is991hqg9q0fa20ifym3dl"; depends=[glue jsonlite magrittr R6 safer tibble]; };
+  onemap = derive2 { name="onemap"; version="2.1.2"; sha256="142yasn8pyd046d8s0k3i4ynmpq7rh6v2vjdnj88yn99zshaxfig"; depends=[ggplot2 MDSMap plotly Rcpp reshape2]; };
+  onewaytests = derive2 { name="onewaytests"; version="2.4"; sha256="1rsamf6mwpah02zwpv270sn17aaav0c030wlsv90k2awmkms2ka6"; depends=[car ggplot2 moments nortest]; };
   onion = derive2 { name="onion"; version="1.2-7"; sha256="17jx7saxcsahyyivln4v9fzzcmidy6ygjd9n81skv5jpr491zkgk"; depends=[]; };
   onlinePCA = derive2 { name="onlinePCA"; version="1.3.1"; sha256="08qivsfnwz5vp089lv9czsaz3nfi42kn9yhgzf27dji18y2xscic"; depends=[Rcpp RcppArmadillo RSpectra]; };
   onlineVAR = derive2 { name="onlineVAR"; version="0.1-1"; sha256="01z2d91mbdjvwwiqjq1dbqp50jbc9v6d7nw4gs7d1abhsqyiqa13"; depends=[lattice]; };
@@ -10587,9 +10808,10 @@ in with self; {
   ontologyIndex = derive2 { name="ontologyIndex"; version="2.5"; sha256="127hlf0z5fmbgnq4p9h8nvn6p72d2fpcn846zzb99s213421jnry"; depends=[]; };
   ontologyPlot = derive2 { name="ontologyPlot"; version="1.4"; sha256="0sj1jg9lr1w3ahzw7fj86vp2bnvf4nq0x3hiqb3hzngwyj9bykpn"; depends=[ontologyIndex paintmap Rgraphviz]; };
   ontologySimilarity = derive2 { name="ontologySimilarity"; version="2.2"; sha256="1g1ag2bnfczdx2xyswrc9xbl9krnyibb4639wynm7c0lf2876964"; depends=[ontologyIndex Rcpp]; };
-  oompaBase = derive2 { name="oompaBase"; version="3.2.8"; sha256="0w2rgrnk0n6nbygl6i54rh9a4cqi9ssksaxn7a8rszyp9i3md323"; depends=[cluster]; };
+  oompaBase = derive2 { name="oompaBase"; version="3.2.9"; sha256="1cmw2s5dznmv675484jgvkzgvi6vhg0zbxsq6zhpqsisf672pjhl"; depends=[cluster]; };
   oompaData = derive2 { name="oompaData"; version="3.1.1"; sha256="0by9qfxlx6fdmp12qnphlli5hdn5balvx4ckg64fw6vwa291g7b0"; depends=[]; };
-  opalr = derive2 { name="opalr"; version="1.1.0"; sha256="0z6fxfa8siyvbp44kq4myhg9rzm10qraqx9h1d3zpx4f6ha7ygiw"; depends=[httr jsonlite mime xml2]; };
+  opalr = derive2 { name="opalr"; version="1.2.0"; sha256="1kix8lndy741bm9rksy7bgmwj1g8ndzjdbq26b4z7xpkscbrmkx7"; depends=[httr jsonlite mime xml2]; };
+  opart = derive2 { name="opart"; version="2019.1.0"; sha256="0yw4vlip4whhvp23yjr57h5j0ii8ighp77g3fjjzr3l56slmrmcz"; depends=[]; };
   openCR = derive2 { name="openCR"; version="1.4.1"; sha256="046ijw5ss8nb0m11p7r682zi7242m0ljydnsrr3gwrnmc4ayk6xv"; depends=[abind MASS nlme plyr Rcpp RcppParallel secr stringr]; };
   openEBGM = derive2 { name="openEBGM"; version="0.8.2"; sha256="0v6jr1yry937knvkrn448rkilwfl7w90169lm5vnp53ds6fhh7bj"; depends=[data_table ggplot2]; };
   openNLP = derive2 { name="openNLP"; version="0.2-6"; sha256="1173cng877sg6ynbs3csfnn956wwrq3yldhhzfbqdsz35draganj"; depends=[NLP openNLPdata rJava]; };
@@ -10597,9 +10819,10 @@ in with self; {
   openSTARS = derive2 { name="openSTARS"; version="1.1.0"; sha256="1cjws49r22cmdax136zcy3k35yzbajkm6pyfibgcw2iqdxy1vcxg"; depends=[data_table progress raster rgdal rgrass7 sf sp SSN]; };
   openVA = derive2 { name="openVA"; version="1.0.8"; sha256="17nqh43gmhlb383ack1pbjkdfdb2g0k527zprdp1xkyxbp92v7xa"; depends=[cli crayon ggplot2 InSilicoVA InterVA4 InterVA5 Tariff]; };
   openadds = derive2 { name="openadds"; version="0.2.0"; sha256="1jb8zd3rpxfkjkg895iab6m4cfi53p5vy3nnpjkgq7ym6499qjcv"; depends=[crul dplyr jsonlite maptools rappdirs readr tibble xml2]; };
-  openair = derive2 { name="openair"; version="2.6-5"; sha256="1v1s6ld8f78svgjjr0nmvwrpfrqrl0d0ymi85v0slzg3b9ml3a7b"; depends=[cluster dplyr hexbin lattice latticeExtra lubridate mapproj MASS mgcv purrr RColorBrewer Rcpp rlang tidyr]; };
+  openair = derive2 { name="openair"; version="2.6-6"; sha256="0ikk3f034hsqv1qxsbxnhhp827b2xpxj4r6p9k0r036f0nssgynl"; depends=[cluster dplyr hexbin lattice latticeExtra lubridate mapproj MASS mgcv purrr Rcpp rlang tidyr]; };
+  openblender = derive2 { name="openblender"; version="0.2.0"; sha256="1awndp29gcsbrx4m4lwm32vsw2jwhkw2xjp401vx7fc3g3nsm0js"; depends=[httr jsonlite xml2]; };
   opencage = derive2 { name="opencage"; version="0.1.4"; sha256="1lqs38lml73axsjlsjkmcsb2irgs40mjrx2cn3k0bjb63qyb9hf5"; depends=[dplyr httr jsonlite memoise]; };
-  opencpu = derive2 { name="opencpu"; version="2.1.2"; sha256="0rgzgrnwvcg13advszk8skyvnx1pnhy1fv2m6gjp5rp4m3frfz3y"; depends=[brew curl evaluate httpuv jsonlite knitr mime openssl protolite rappdirs remotes sendmailR sys webutils zip]; };
+  opencpu = derive2 { name="opencpu"; version="2.1.4"; sha256="06jsymwgckgnzp49brnxb5d250kybzxggy99wlkhlfgnchdisgkh"; depends=[brew curl evaluate httpuv jsonlite knitr mime openssl protolite rappdirs remotes sys webutils zip]; };
   opencv = derive2 { name="opencv"; version="0.1"; sha256="0m649g6k6cgxnljjx8czypjawbyzx7xjcg32wddxkrgi2b236lwh"; depends=[magrittr Rcpp]; };
   opendotaR = derive2 { name="opendotaR"; version="0.1.4"; sha256="17cygsw3nkg6zincfrcdh1509rlz3n5zrv9wvv7mjngm61sn79nf"; depends=[dplyr jsonlite lubridate]; };
   openintro = derive2 { name="openintro"; version="1.7.1"; sha256="059azlasdkmp8f54qpjf3mq5dyqakw0dgx0kx85wfdmhq38zal5n"; depends=[]; };
@@ -10609,7 +10832,7 @@ in with self; {
   opera = derive2 { name="opera"; version="1.0"; sha256="0p2wg3srg088l420ykrq0wqvzh1mp6l753rdw35f7kdmaj08mqfq"; depends=[quadprog quantreg RColorBrewer]; };
   operator_tools = derive2 { name="operator.tools"; version="1.6.3"; sha256="1v4dg7xhz24dnp0zxn815x1405ig64ibii6y40la1gvmzcc41dz5"; depends=[]; };
   operators = derive2 { name="operators"; version="0.1-8"; sha256="0zgcv2q46qyqv4dhbd33s4044zjw38w8dqfpzs0c1lxjpkil3dnx"; depends=[]; };
-  oppr = derive2 { name="oppr"; version="0.0.3"; sha256="12ix8qbns83cff642105rnl609f6gqn8avpypiil2m0mbcwz8cc5"; depends=[ape assertthat cli ggplot2 lpSolveAPI magrittr Matrix proto Rcpp RcppArmadillo RcppProgress tibble tidytree uuid viridisLite]; };
+  oppr = derive2 { name="oppr"; version="0.0.4"; sha256="1wxdrcchg8izdr4zdvq8dpgz5n2m4b5w4lavmvd3vhvjs6i6bb60"; depends=[ape assertthat cli ggplot2 lpSolveAPI magrittr Matrix proto Rcpp RcppArmadillo RcppProgress tibble tidytree uuid viridisLite]; };
   ops = derive2 { name="ops"; version="1.0"; sha256="0cvwyn5sz5lx8sin8w4k8ymslfl4nfaa012a9vcl2hvp4850rk25"; depends=[]; };
   optAUC = derive2 { name="optAUC"; version="1.0"; sha256="0j1llzqa3n7kqw3i5bb7284z0hi6s5jbjfl9zap0l7xf6hg4x1dn"; depends=[MASS]; };
   optBiomarker = derive2 { name="optBiomarker"; version="1.0-27"; sha256="1kkj602d4klwyd8kylawgfysg8dlp2g6j7afkppzv5x8mbhs5ji4"; depends=[e1071 ipred MASS Matrix msm randomForest rgl rpanel]; };
@@ -10637,15 +10860,15 @@ in with self; {
   optimus = derive2 { name="optimus"; version="0.2.0"; sha256="01njyjfrm6kjwx2qq41c0hsgxzydnrmr3538cpbfdn5i0z5blgyx"; depends=[mvabund ordinal]; };
   optimx = derive2 { name="optimx"; version="2018-7.10"; sha256="0npzgb5ky3p2iky4917grmysawh7mb5gwz4i7ssmh73ypqnndfhk"; depends=[numDeriv]; };
   optional = derive2 { name="optional"; version="2.0"; sha256="0hj0gwvk9svllv44kfdgv3a2mriwqnaxvn3rj7w1djha7mryl6jl"; depends=[magrittr]; };
-  optionstrat = derive2 { name="optionstrat"; version="1.3.0"; sha256="0aapgga8a4rnffns0jq1l3gv319i3cq1h49wgprh6cafvb5nm61l"; depends=[]; };
+  optionstrat = derive2 { name="optionstrat"; version="1.4.0"; sha256="0mb3hsr5dxlam1a8zi337jgg0qcvhaxa84qdni0q4b4500r2yy7w"; depends=[]; };
   optiscale = derive2 { name="optiscale"; version="1.1"; sha256="1c263w9df66m7lgvzpdfm2zwx9nj8wcdpgh5gijachr2dzffmrp2"; depends=[lattice]; };
   optismixture = derive2 { name="optismixture"; version="0.1"; sha256="0nacfbqlnzajp1hfhf0yzm2d86fxpp4kw2zy33q8k2d4sr56bird"; depends=[Matrix mvtnorm]; };
   optmatch = derive2 { name="optmatch"; version="0.9-11"; sha256="0lvba8gca1bvf7b46kmjqpkb3ykip07niw1w2qghgqrfxkq0s6yi"; depends=[digest Rcpp RItools survival]; };
-  optparse = derive2 { name="optparse"; version="1.6.2"; sha256="0zrp6jakjhawrwfri270ym83vj5a7nvjk0w6b41z41ahw2da99dm"; depends=[getopt]; };
+  optparse = derive2 { name="optparse"; version="1.6.4"; sha256="0wyrc42ja3ab5szx46zmz8lm7vzfqxkjca0m0sms8g9hqbmmay6d"; depends=[getopt]; };
   optpart = derive2 { name="optpart"; version="2.3-0"; sha256="125b9sfdk4bdcj1vq5rxlrskv1zra31x8d96pdxnqvcnkmwxm4zh"; depends=[cluster labdsv MASS plotrix]; };
   optrcdmaeAT = derive2 { name="optrcdmaeAT"; version="1.0.0"; sha256="16g4612mwyfsckn6l71fbrjnnjv4yvnac1cccbrn3k8jh07qgb1h"; depends=[igraph MASS Matrix]; };
   optrees = derive2 { name="optrees"; version="1.0"; sha256="1zqpjii8dsfs98n58qpif81ckvyxkr0661svhlbgzi19xb2vszqs"; depends=[igraph]; };
-  optweight = derive2 { name="optweight"; version="0.2.2"; sha256="10pk2099xqnk5hkhg8rdaqkzhdw0lx3hmyknh4hg29j41iph76by"; depends=[ggplot2 Matrix rosqp]; };
+  optweight = derive2 { name="optweight"; version="0.2.5"; sha256="1mfk9sp47flqq7i762wip5191j8m0q9kbyxs4a7f0pd76qwf67q2"; depends=[ggplot2 Matrix osqp]; };
   opusminer = derive2 { name="opusminer"; version="0.1-0"; sha256="1m4gsjylz58pbmhgcy4l9hqdsgy8ra1zg0d3rb6h2qiwfyfm0yh4"; depends=[arules Matrix Rcpp]; };
   orQA = derive2 { name="orQA"; version="0.2.1"; sha256="0vivjrpcbql42y078gi91kfpfdpv73j23jkiv8fpazzwzdi8ydqq"; depends=[genefilter gtools nlme Rcpp]; };
   ora = derive2 { name="ora"; version="2.0-1"; sha256="0albxqma220rnrpfdq3z9cawr83q1a0zzczbbcy4nijjm4mswphy"; depends=[DBI ROracle]; };
@@ -10687,7 +10910,7 @@ in with self; {
   oro_pet = derive2 { name="oro.pet"; version="0.2.6"; sha256="1dczii7knh9241ksswxk9zg1d69mhk2ilrk4kjv7cj9nfm8fgmja"; depends=[minpack_lm msm oro_dicom oro_nifti]; };
   orsifronts = derive2 { name="orsifronts"; version="0.1.1"; sha256="1js4q2s1mn263x8szl5q47ajfxv9lsjd5zyphwyhbkqrnd8ijd3w"; depends=[sp]; };
   orsk = derive2 { name="orsk"; version="1.0-5"; sha256="19bpvsdjwjm62a2kfh3xjpqnn39kls656kh832frkqa08bdd7zjk"; depends=[BB BHH2]; };
-  orthoDr = derive2 { name="orthoDr"; version="0.5.1"; sha256="0zpi3g6pkid40cblzsxck254wxljn5bfs354l51xfb182qr76x6k"; depends=[dr MASS plot3D pracma Rcpp RcppArmadillo rgl survival]; };
+  orthoDr = derive2 { name="orthoDr"; version="0.6.4"; sha256="1h2djq1s67yx1mkc5hl81471q4qwv8z71hmyl5rvbwy8kfyxfc6b"; depends=[dr MASS plot3D pracma Rcpp RcppArmadillo rgl survival]; };
   orthogonalsplinebasis = derive2 { name="orthogonalsplinebasis"; version="0.1.6"; sha256="07rbd0fhs2gsk7wj41y2h7wf6pfg324vzv2al753d8kqyx5ns2dj"; depends=[]; };
   orthopolynom = derive2 { name="orthopolynom"; version="1.0-5"; sha256="1gvhqx6jlh06hjmkmbsl83gri0gncrm3rkliyzyzmj75m8vz993d"; depends=[polynom]; };
   osDesign = derive2 { name="osDesign"; version="1.7"; sha256="0y68pnsmq4nlmfsn28306q2kxab200pirr6ha0w4himzpnw1sil3"; depends=[]; };
@@ -10698,13 +10921,13 @@ in with self; {
   osmdata = derive2 { name="osmdata"; version="0.1.1"; sha256="0n297bhdb5klbk7a2n3lm4iicdggwmz82njsxqdfvzbq85j2s96v"; depends=[curl httr jsonlite lubridate magrittr Rcpp rvest sp tibble xml2]; };
   osmose = derive2 { name="osmose"; version="0.1.1"; sha256="0fiijnrvvydhj6j9yb02rn5sg8arcpj3jz977m2zwjgqy878cffg"; depends=[rlist stringr]; };
   osmplotr = derive2 { name="osmplotr"; version="0.3.2"; sha256="0k5rjxsi1sfcxcl6lf8zcncqnshz2jaz7hcwn2ifg4yhvxvkfma8"; depends=[curl e1071 ggm ggplot2 httr mapproj osmdata rgeos sp spatstat]; };
-  osqp = derive2 { name="osqp"; version="0.5.0"; sha256="12gm5mhmnzvfmziiln0lnqs173gan10ihwkcj07dcjii4nvkg4p9"; depends=[Matrix R6 Rcpp]; };
-  osrm = derive2 { name="osrm"; version="3.3.1"; sha256="0l672jkw3hr8dncq2al8345bd5v2vgvyqhb4cv753b6fdljxmrhk"; depends=[gepaf isoband jsonlite lwgeom RCurl sf sp]; };
+  osqp = derive2 { name="osqp"; version="0.6.0.2"; sha256="0lc56gbakh3b92rij85rmqva7i81rrgmbj5qr3h6ysm9j347zzqm"; depends=[Matrix R6 Rcpp]; };
+  osrm = derive2 { name="osrm"; version="3.3.2"; sha256="10adkq8sm0jvyd35m8vvjxiqvay976fsgffyxh9sh564l053srkp"; depends=[gepaf isoband jsonlite lwgeom RCurl sf sp]; };
   osrmr = derive2 { name="osrmr"; version="0.1.35"; sha256="1pmsybyqkgpqz0yhfmwrsa2smgmclxzk9mlzcqmm8ph6dcd1x0s8"; depends=[assertthat bitops R_utils rjson stringr]; };
   otinference = derive2 { name="otinference"; version="0.1.0"; sha256="1l75jjnkyk8yzaw9zyk45jq9ys304i6pzm2xd5apxrb1jk75a3li"; depends=[MASS Rglpk sm transport]; };
-  otpr = derive2 { name="otpr"; version="0.1.0"; sha256="1g2wy64fad67yqvq6mj1hy05vp6kjdm9b6nj0ba395c7hfxvkc7f"; depends=[checkmate curl httr jsonlite]; };
-  otrimle = derive2 { name="otrimle"; version="1.1"; sha256="0c3wlj6cxpikrfr0knldd1z2kfihpfsppnyb9n3rflnxhk7pwij2"; depends=[doParallel foreach mclust]; };
-  otsad = derive2 { name="otsad"; version="0.1.0"; sha256="1cg73p2fqa8wpmx5wimq5bch7g7a2pyqpqm7cw8lplf2l3yyl74f"; depends=[ggplot2 plotly reticulate sigmoid]; };
+  otpr = derive2 { name="otpr"; version="0.2.0"; sha256="1l34fda1y1y359khr1flwk7848rq7hhfmkqnifxhdsz73i2hcrr0"; depends=[checkmate geojsonsf httr jsonlite]; };
+  otrimle = derive2 { name="otrimle"; version="1.3"; sha256="1vq2sm3g32cr8x0nzxq9g3zk0qhcd2syzrcvrfx5ncf3i3f9gq5n"; depends=[doParallel foreach mclust]; };
+  otsad = derive2 { name="otsad"; version="0.2.0"; sha256="1jb6raxm70aywbgs7bdyw8vccy1nj924f4hkpjrlgnvzmy0hyhvs"; depends=[ggplot2 plotly reticulate sigmoid]; };
   otuSummary = derive2 { name="otuSummary"; version="0.1.0"; sha256="15sjjkivh37kjcj02s2l8xabn3x1kg348i69kyhbvsbqawh2s9y0"; depends=[fossil reldist reshape2 vegan]; };
   otvPlots = derive2 { name="otvPlots"; version="0.2.1"; sha256="0fjx0kl9y77mazwy7lg4mxc9sg8ysvvbl4h3k6bvfpnjm5x62hff"; depends=[data_table ggplot2 gridExtra Hmisc moments quantreg scales stringi]; };
   ouch = derive2 { name="ouch"; version="2.14-1"; sha256="0ddf9bw5lhj8vb0ja78jf99i0smq4rgmm842k4a4ygap41vdyn2b"; depends=[subplex]; };
@@ -10713,12 +10936,13 @@ in with self; {
   outbreaks = derive2 { name="outbreaks"; version="1.5.0"; sha256="00369lnh65nfkcbjd5i39irdv2hcwy5cinb2dvv2x4c2q2ax9f0d"; depends=[]; };
   outcomerate = derive2 { name="outcomerate"; version="1.0.1"; sha256="07mwml7r98qjgvrp938sqf7klyspz110583j0zwb72j69n4whmrj"; depends=[Rdpack]; };
   outliers = derive2 { name="outliers"; version="0.14"; sha256="0vcqfqmmv4yblyp3s6bd25r49pxb7hjzipiic5a82924nqfqzkmn"; depends=[]; };
-  outliertree = derive2 { name="outliertree"; version="1.0"; sha256="02niplg9110f6m0g030a35y9jjizrfhi4q9g20phlllw74q2dnap"; depends=[Rcereal Rcpp]; };
+  outliertree = derive2 { name="outliertree"; version="1.0.4"; sha256="1x5b3dz7vyyfskgxrsmjmzhkrj8y81621kilj649wgm89bm95vkr"; depends=[Rcereal Rcpp]; };
   outreg = derive2 { name="outreg"; version="0.2.2"; sha256="04f1x7mxq4swbd7bfwjjgx4838jm6qj4piaighmhcscwrdkxa1cp"; depends=[magrittr reshape2 sandwich stringr tidyr]; };
+  ouxy = derive2 { name="ouxy"; version="1.1"; sha256="0f07m8zs4vnr0vpsdw1qdzdrq80qyq4477l06w9i3bb0n64yxcaa"; depends=[abc adephylo ape coda EasyABC geiger maps MCMCpack nlme phytools Sim_DiffProc TreeSim]; };
   overlap = derive2 { name="overlap"; version="0.3.2"; sha256="1j3m6ir1chdz0si2fhcw6gs7c9h09bv0chz18rpzxsywww6d4rzy"; depends=[]; };
-  overlapping = derive2 { name="overlapping"; version="1.5.3"; sha256="1hikhgs0s9zwqn29yqmgr29k4a95x0s2sxz1lhvv0xpfjd8fnrmz"; depends=[ggplot2 testthat]; };
+  overlapping = derive2 { name="overlapping"; version="1.5.4"; sha256="1j3jmv15hy6h4d3v4rwg0796dz6np3pv67xrn2vcgvh1s1rmqnzs"; depends=[ggplot2 testthat]; };
   overlapptest = derive2 { name="overlapptest"; version="1.1"; sha256="0r732za6lm7dk5r237nhadgbpinaz5dmb6f7pn3mbg0plkdy3mff"; depends=[spatstat]; };
-  overture = derive2 { name="overture"; version="0.2-0"; sha256="1cn268mjq64h5hsxllbgbrg80mdfnfrzcdx93rg292jd7issnbng"; depends=[bigmemory]; };
+  overture = derive2 { name="overture"; version="0.4-0"; sha256="1s16x5kn0apb0w1f7hqzcsqvw3x621y5n6yr1qn7yb7431pdw3cz"; depends=[bigmemory]; };
   owdbr = derive2 { name="owdbr"; version="1.0.1.0"; sha256="1sdlvkirp15hzby26lwviz2jclggl3da8r105mr8c821377q5smy"; depends=[data_table dplyr httr jsonlite magrittr tibble]; };
   owmr = derive2 { name="owmr"; version="0.8.1"; sha256="11krzrkr1ga41nv9c2fb8cb2mgy3ias7qx85d4cdv4k68lsksv18"; depends=[httr jsonlite magrittr plyr tibble tidyr]; };
   ows4R = derive2 { name="ows4R"; version="0.1-2"; sha256="0zqmzv7p693zza48dijg6fah601y4r8lcp5v67p2lpi73r8vhbil"; depends=[geometa httr openssl R6 rgdal sf XML]; };
@@ -10759,7 +10983,7 @@ in with self; {
   padr = derive2 { name="padr"; version="0.5.0"; sha256="1lckaizlffgdzs7rhlkafam2clqkn3130r4fdnanm2bvd6b0z220"; depends=[dplyr lubridate Rcpp rlang]; };
   paf = derive2 { name="paf"; version="1.0"; sha256="0wrqn67jfrjjxwcrkka6dljgi3mdk00vfjkzzcv2v7c97gx1zvwn"; depends=[survival]; };
   pafdR = derive2 { name="pafdR"; version="1.0"; sha256="1yimsd4h23hcf752p5flda3dqk8hgn6qm9k0pmbapxj4jbsw14w5"; depends=[curl exams stringr]; };
-  pagedown = derive2 { name="pagedown"; version="0.3"; sha256="0r4vybm7in39fbw36jlj27sv0g5rw6wm4gwjnz8nfixxh6cbbpb0"; depends=[bookdown htmltools httpuv jsonlite later processx rmarkdown servr websocket xfun]; };
+  pagedown = derive2 { name="pagedown"; version="0.5"; sha256="0kzrak17qxbbaj20vg4c6iwynwiy5q2psqmhmzlz1xkxkmk4gmdb"; depends=[bookdown htmltools httpuv jsonlite later processx rmarkdown servr websocket xfun]; };
   pagenum = derive2 { name="pagenum"; version="1.1"; sha256="0908rlr9sd1a2qwz0idw8ccxhji73sk24gyrdl071lpnd1rs2wl7"; depends=[]; };
   pageviews = derive2 { name="pageviews"; version="0.3.0"; sha256="031y67nqqvf3fa2273m7z2cldda0ijh63qwkh4gis3hz9hfril0v"; depends=[curl httr jsonlite]; };
   painter = derive2 { name="painter"; version="0.1.0"; sha256="0qr6p13h50rlavcsamxmijfr4dfrbv1k088m28qf8a4gam3ap85b"; depends=[]; };
@@ -10769,6 +10993,7 @@ in with self; {
   pairsD3 = derive2 { name="pairsD3"; version="0.1.0"; sha256="0ql6pqijf24pfyid52hmf5fmh4w1ca3sm47z9vknqpnjbn47v8q2"; depends=[htmlwidgets shiny]; };
   pairwise = derive2 { name="pairwise"; version="0.4.4-5.1"; sha256="0j15qbpym0y9ipc4l3z95f0bzc0pgzayspyqv81p7xakksnj2y02"; depends=[]; };
   pairwiseCI = derive2 { name="pairwiseCI"; version="0.1-27"; sha256="0yp9nibdrsddjqq6vdlfbpvmfgm209h99b6qqqd6wgfzng327822"; depends=[boot coin MASS MCPAN mcprofile]; };
+  pairwiseComparisons = derive2 { name="pairwiseComparisons"; version="0.1.1"; sha256="1a3kvwwq2541axiinv0k3rw79cgm8az2db7f5lwb857wd5rlzs1b"; depends=[broomExtra crayon dplyr forcats groupedstats jmv purrr rlang stringr tibble tidyr WRS2]; };
   pak = derive2 { name="pak"; version="0.1.2"; sha256="05s8rg84w4xhpbaa98p3lgvsnbjrxfbcz5izgkamqa1dw4gdxml4"; depends=[assertthat base64enc callr cli cliapp crayon curl desc filelock glue jsonlite lpSolve pkgbuild pkgcache prettyunits processx ps R6 rematch2 rprojroot tibble]; };
   palaeoSig = derive2 { name="palaeoSig"; version="2.0-3"; sha256="1sn2nbiq037l81qvrqbg7gf1312g8vy574hsfng07qk1jpx7vwkk"; depends=[assertr dplyr forcats ggplot2 ggrepel magrittr MASS mgcv purrr rioja rlang TeachingDemos tibble tidyr vegan]; };
   palasso = derive2 { name="palasso"; version="0.0.5"; sha256="1ckxrkk2b8dri8pw0hj0g1sdlpwn6p436748sv86lj5b1m02yf3w"; depends=[glmnet Matrix survival]; };
@@ -10788,7 +11013,7 @@ in with self; {
   pals = derive2 { name="pals"; version="1.5"; sha256="0zc4dw8ipvhdm2qvy71k16vf8fmjs08nqbvvdi1k8h4fs648ddhi"; depends=[colorspace dichromat mapproj maps rgl]; };
   pamctdp = derive2 { name="pamctdp"; version="0.3.2"; sha256="0qs8lj5g2fx5rfd0afv76x9x7wqm333qmjv6zzip6pf11dzkghyj"; depends=[ade4 FactoClass xtable]; };
   pamm = derive2 { name="pamm"; version="0.9"; sha256="01dv70ca3zif2b2fkx4xjl24x9p9kc63wf0dj5agdjp5qgbkp1p5"; depends=[gmodels lattice lme4 lmerTest mvtnorm]; };
-  pammtools = derive2 { name="pammtools"; version="0.1.11"; sha256="15qz78wqrclcavj7bl9fnm9cwxf0n07adsq1n2p164q147c6l347"; depends=[checkmate dplyr Formula ggplot2 lazyeval magrittr mgcv msm mvtnorm purrr rlang survival tibble tidyr]; };
+  pammtools = derive2 { name="pammtools"; version="0.1.14"; sha256="1zr8n6j9220qv3a2q309n1ckjd4b6l2k24kfx3p4wibam8g9pqbc"; depends=[checkmate dplyr Formula ggplot2 lazyeval magrittr mgcv msm mvtnorm purrr rlang survival tibble tidyr]; };
   pampe = derive2 { name="pampe"; version="1.1.2"; sha256="092n04nrp886kd163v32f5vhp9r7gnayxzqb6pj57ilm5w1yrcsk"; depends=[leaps]; };
   pamr = derive2 { name="pamr"; version="1.56.1"; sha256="0ycpgkk23y3zzkb42n2skcyl35ps1n7jmyzfj7pbxr3f6gr2grfh"; depends=[cluster survival]; };
   pan = derive2 { name="pan"; version="1.6"; sha256="1dk3jjj826p7xrz10qz04vyc068xnypg7bp0pj4c32z3da0xzh5d"; depends=[]; };
@@ -10796,10 +11021,11 @@ in with self; {
   pandocfilters = derive2 { name="pandocfilters"; version="0.1-3"; sha256="1qic94kmw6qqdzy362x2wiba5l3ghc4vh8wfbg7abzb04ysbdznf"; depends=[jsonlite]; };
   panelAR = derive2 { name="panelAR"; version="0.1"; sha256="1ka2rbl9gs65xh2y2m4aqwh5qj4szibjy101hqfmza9wmdh25gpq"; depends=[car]; };
   panelView = derive2 { name="panelView"; version="1.1.2"; sha256="0kbh2g8yynv2mvvndy89lkm5yhy2hr04z52i2ccv9yfrkyignlfp"; depends=[ggplot2 gridExtra]; };
+  panelWranglR = derive2 { name="panelWranglR"; version="1.2.13"; sha256="0zj0m08518zi6xsa7qik61ys1qqa2lqiar4l7acclkw58w5zrmbc"; depends=[caret data_table Hmisc]; };
   panelaggregation = derive2 { name="panelaggregation"; version="0.1.1"; sha256="0x8ldqb9216pclfvs4ymdpian43v2ydkyflpf0k6lcn35r04xfr6"; depends=[data_table]; };
   panelr = derive2 { name="panelr"; version="0.7.1"; sha256="0xd3f3acfjvnryhwdf3aqa3vgpagl87sgd7annn29rk3lznv8rv2"; depends=[crayon dplyr Formula ggplot2 jtools lme4 lmerTest magrittr purrr rlang stringr tibble]; };
   panelvar = derive2 { name="panelvar"; version="0.5.2"; sha256="1rr7d0cyz6afxhwqslvcnbfb03cizpfldzwsfnkzxqmxpqasbw80"; depends=[ggplot2 knitr MASS Matrix matrixcalc progress reshape2 texreg]; };
-  pangaear = derive2 { name="pangaear"; version="0.6.0"; sha256="0dykacf5ckhck08rbk6l5kyw51i2p1ncy44agcxj79cr290cd5ck"; depends=[crul jsonlite oai png rappdirs tibble xml2]; };
+  pangaear = derive2 { name="pangaear"; version="0.8.2"; sha256="1dy8fgfsm6n88mchc8c6z918iih0myg04xh8hjhnss1idhy5206f"; depends=[crul hoardr jsonlite oai png tibble xml2]; };
   papayar = derive2 { name="papayar"; version="1.0"; sha256="11vkjhazfwfixsr6dba5jrcsr3r3mqgvj5s070b4gp70d6k1z8s5"; depends=[htmltools neurobase oro_nifti servr]; };
   papeR = derive2 { name="papeR"; version="1.0-4"; sha256="1sc336haqsx6825g7m0z3a4pjklrmnzkq4995dpqwhvdvcikk9jd"; depends=[car gmodels xtable]; };
   paperplanes = derive2 { name="paperplanes"; version="0.0.1.9"; sha256="1d9grc95xqxn91lvk8v7w3z90bhl8savkhihwshyjp8ij2xpzfkl"; depends=[]; };
@@ -10813,6 +11039,7 @@ in with self; {
   parallelSVM = derive2 { name="parallelSVM"; version="0.1-9"; sha256="0nhxkllpjc3775gpivj8c5a9ssl42zgvswwaw1sdhwg3cxcib99h"; depends=[doParallel e1071 foreach]; };
   parallelize_dynamic = derive2 { name="parallelize.dynamic"; version="0.9-1"; sha256="03zypcvk1iwkgy6dmd5bxg3h2bqvjikxrbzw676804zi6y49mhln"; depends=[]; };
   paramGUI = derive2 { name="paramGUI"; version="2.1.3"; sha256="1z7k4wgzm1bga8djyk44r1kr1mzdb9mrd6fvb5nrd69d76pvldji"; depends=[colorspace fields shiny shinydashboard TIMP]; };
+  parameters = derive2 { name="parameters"; version="0.2.0"; sha256="1mgggb3l67wgjiccq4y84wbs2dw9qk01akd553yiwbwky9rpawgh"; depends=[bayestestR insight]; };
   paramhetero = derive2 { name="paramhetero"; version="0.1.0"; sha256="16ydhp401f1iqh2b8gdi100j5dncb7khb8c6f81dak4hhs8lv4if"; depends=[ggplot2 ggpubr]; };
   paramlink = derive2 { name="paramlink"; version="1.1-2"; sha256="0y6wsrxwyavipmrjjznr2n920w0p6qlwapxc9mnkh9c6w3yznka2"; depends=[assertthat kinship2 maxLik]; };
   params = derive2 { name="params"; version="0.6.1"; sha256="0w7k8k7z8p1y2w0dhpfssa868xaikfzfdjw2vlj1yl299k5yisax"; depends=[whisker]; };
@@ -10822,9 +11049,8 @@ in with self; {
   parcoords = derive2 { name="parcoords"; version="1.0.0"; sha256="15w0g789a2igagfrgv1978ib4ipxpfkid5jpj4q344mpdvgp6ip2"; depends=[crosstalk htmlwidgets]; };
   parcor = derive2 { name="parcor"; version="0.2-6"; sha256="10bhw50g8c4ln5gapa7wghhb050a3jmd1sw1d1k8yljibwcbbx36"; depends=[Epi GeneNet glmnet MASS ppls]; };
   parfm = derive2 { name="parfm"; version="2.7.6"; sha256="1n548gaf62m56n8rlcz1mhpqxikd33vydjwl4wps441drp1dbvs0"; depends=[msm optimx sn survival]; };
-  parfossil = derive2 { name="parfossil"; version="0.2.0"; sha256="12gsc5n4ycvhzxvq5j0r3jnnrzw1q412dbvmakipyw2yx2l2s7jn"; depends=[foreach fossil]; };
   parglm = derive2 { name="parglm"; version="0.1.3"; sha256="1d6s2fjggx5mkcvqb40k5vkh53j1c6v0rjdl1yqs968b547468jh"; depends=[Matrix Rcpp RcppArmadillo]; };
-  parlitools = derive2 { name="parlitools"; version="0.3.3"; sha256="1py01f0hh7xsxg5p9szp6mharh06yf9an6ip4m776j5l9bzbfzif"; depends=[dplyr hansard mnis readr sf snakecase stringi]; };
+  parlitools = derive2 { name="parlitools"; version="0.3.4"; sha256="1qzb8rb91x74698mj5w48ig7a7i3qvg9whpwqihkh7zxn4mpj699"; depends=[dplyr hansard mnis readr sf snakecase stringi]; };
   parma = derive2 { name="parma"; version="1.5-3"; sha256="0yjpmxz20v6k107qylw42yf1b231hzym9dizjcq1kalivvscczc5"; depends=[corpcor nloptr quadprog Rglpk slam truncnorm]; };
   parmigene = derive2 { name="parmigene"; version="1.0.2"; sha256="1fsm6pkr17jcbzkj1hbn91jf890fviqk1lq6ls8pihsdgah1zb4d"; depends=[]; };
   parmsurvfit = derive2 { name="parmsurvfit"; version="0.1.0"; sha256="0d3614q76dw3f7y9p8378hdny7bz5fymma5l0zpygr1cfnacdhh6"; depends=[fitdistrplus flexsurv ggplot2]; };
@@ -10832,13 +11058,14 @@ in with self; {
   parsedate = derive2 { name="parsedate"; version="1.2.0"; sha256="0gb3w6hmwxayhijpf36p5dk4h6bbdps57x3cgikwvvxkgi83rarr"; depends=[rematch2]; };
   parsemsf = derive2 { name="parsemsf"; version="0.1.1"; sha256="0ks4503k06ib5lq4ar2rg0sdni99rjcqxj76b0mclasxbi07kjsa"; depends=[DBI dbplyr dplyr lazyeval RSQLite stringr tidyr]; };
   parsetools = derive2 { name="parsetools"; version="0.1.1"; sha256="0fl06h4aph0rr55n3c4gw9wkblvjipgyl5drpycmpldj8kix1nz2"; depends=[]; };
-  parsnip = derive2 { name="parsnip"; version="0.0.3"; sha256="1s9nm831q5kjmpym2lalcqx7jb1fh58v0vpljjqj5w1vxfbv83kg"; depends=[dplyr generics globals glue magrittr purrr rlang tibble tidyr vctrs]; };
+  parsnip = derive2 { name="parsnip"; version="0.0.3.1"; sha256="1p0md1s08dd8w3md1cx8n00rfpbnsayqv0bnvc9mcwljmmw6wb2s"; depends=[dplyr generics globals glue magrittr purrr rlang tibble tidyr vctrs]; };
   partDSA = derive2 { name="partDSA"; version="0.9.14"; sha256="1kp0cdsdjiay349jz22iqfzvspny8s343cfan8xahgf931k9h8p6"; depends=[survival]; };
   partialAR = derive2 { name="partialAR"; version="1.0.11"; sha256="1x7vsrjn91nr4bbkzz9mp8h93j9yhwwaqw1abh5n3bsrkq3xmgqj"; depends=[data_table ggplot2 KFAS MASS plot3D Rcpp tseries urca zoo]; };
   partialCI = derive2 { name="partialCI"; version="1.2.0"; sha256="0hi936yg4g5bg61ix2i68f8q4c5nvvshl2728ynz1rl970qfcrp7"; depends=[data_table ggplot2 glmnet KFAS MASS partialAR Rcpp TTR zoo]; };
   partialOR = derive2 { name="partialOR"; version="0.9"; sha256="02vbvln8lswysaafpxq5rxb6crp7yhlc13i42kybv8fr10jaagjj"; depends=[nnet]; };
   particles = derive2 { name="particles"; version="0.2.2"; sha256="0pncfpk89hsfjch8h5b86rx7hsgdyg9bsxc54f5bf0y8gh9v98qj"; depends=[digest dplyr igraph magrittr mgcv Rcpp rlang tidygraph]; };
   partition = derive2 { name="partition"; version="0.1.0"; sha256="1717cl7dz2zh4zx143qblb519yixhbr9l2x3hg0vaa4ddy6v02wx"; depends=[crayon dplyr forcats ggplot2 infotheo magrittr MASS pillar purrr Rcpp RcppArmadillo rlang stringr tibble tidyr]; };
+  partitionBEFsp = derive2 { name="partitionBEFsp"; version="1.0"; sha256="0rirqk9v5jbjs2jpjjkg7kvay9f093q2gwx5fx3bm9b0f5869w1b"; depends=[]; };
   partitionComparison = derive2 { name="partitionComparison"; version="0.2.5"; sha256="0wzg2r4c61fd3cp8kwsc313gwcizh5aavw361lc9gqn57p1kml1j"; depends=[lpSolve Rdpack]; };
   partitionMap = derive2 { name="partitionMap"; version="0.5"; sha256="0pi066xaaq0iqr0d7cncdzjd7bacmgrivc4qvhqx0y7q1vifrdjm"; depends=[randomForest]; };
   partitionMetric = derive2 { name="partitionMetric"; version="1.1"; sha256="1wry9d3s814yp79ayab7rzf8z5l2mwpgnrc5j7d2sac24vp4pd48"; depends=[]; };
@@ -10848,6 +11075,7 @@ in with self; {
   party = derive2 { name="party"; version="1.3-3"; sha256="1sbwpwxdz81ikp64kc0s06vdwy04bccff2kr0phwx9235nhfwwlz"; depends=[coin modeltools mvtnorm sandwich strucchange survival zoo]; };
   partykit = derive2 { name="partykit"; version="1.2-5"; sha256="17324y5v65i0va2mvm26gl89s01xwcffg34fwq1mvylk1xwk13pl"; depends=[Formula inum libcoin mvtnorm rpart survival]; };
   parviol = derive2 { name="parviol"; version="1.1"; sha256="1sfgic86ssd5wjf9ydss9kjd3m4jmm2d1v896sjsv8bydwymbpx3"; depends=[vioplot]; };
+  pass_lme = derive2 { name="pass.lme"; version="0.9.0"; sha256="1rxm509vnkdvdxii4jwniirdb2pv90rjkf6wjc9zrjh88jrl678k"; depends=[]; };
   passport = derive2 { name="passport"; version="0.2.0"; sha256="1jiwivrz7781zmwxmw13rxl80cr9r5pinnk5bvqz8nhfmlx0zmgd"; depends=[]; };
   password = derive2 { name="password"; version="1.0-0"; sha256="1ijzqdw54l8wvpy6ys28njvhplzjxzzi5i9y41vjnrr88n13977v"; depends=[]; };
   pastecs = derive2 { name="pastecs"; version="1.3.21"; sha256="0z4dic94ar646w7zc2ggi5hgvf2qnznsani94c5pyql8zspz47lc"; depends=[boot]; };
@@ -10857,7 +11085,7 @@ in with self; {
   patchPlot = derive2 { name="patchPlot"; version="0.1.5"; sha256="1b4k0dvvj6qwyxbqb36knyrawvy5qq8hl45pz896c9rkqhlg02bx"; depends=[datautils]; };
   patchSynctex = derive2 { name="patchSynctex"; version="0.1-4"; sha256="1li3kw7a77sx6dss8pnxzb0p0sdy1kfm1zdnmhhj043zihrryd5p"; depends=[stringr]; };
   patentsview = derive2 { name="patentsview"; version="0.2.2"; sha256="003pcddz6adsh893xvlb9d72r316z14nlp3fwm1vbc50hpa24w6z"; depends=[httr jsonlite]; };
-  pathdiagram = derive2 { name="pathdiagram"; version="0.1.9"; sha256="1j2h9mmwfi95nwhk9214kcfpb1qrmw249mjaza7i9gijmlicraxz"; depends=[shape]; };
+  pathdiagram = derive2 { name="pathdiagram"; version="0.1.9.1"; sha256="018frv1n3x0bf1682jibnm5k2dlkg85xa9mps28l22a0z8bplbv5"; depends=[shape]; };
   pathfindR = derive2 { name="pathfindR"; version="1.3.0"; sha256="1pljw5pz6g1jpk92smbmzwgwx7p3jvjyvr7fciajay39gfvj7fd5"; depends=[AnnotationDbi DBI doParallel foreach fpc ggplot2 igraph knitr org_Hs_eg_db pathview rmarkdown]; };
   pathlibr = derive2 { name="pathlibr"; version="0.1.0"; sha256="0z8iz765fi1s2770p7dwwv2anihfw86kb5dwg081wb6474wiq6v8"; depends=[glue logging magrittr purrr R6 rlang]; };
   pathmapping = derive2 { name="pathmapping"; version="1.0.2"; sha256="0kx4wxf6lhi58sif8fzr5w4wa0i5253fq4v0ynp721fv1hkvmhvz"; depends=[]; };
@@ -10870,20 +11098,20 @@ in with self; {
   pavo = derive2 { name="pavo"; version="2.2.0"; sha256="0bbmgjc63i6vx0grs97y6jg9q44vnjhik93zzkagq532mnggjiqv"; depends=[cluster geometry magick pbmcapply plot3D rcdd sp viridisLite]; };
   pawacc = derive2 { name="pawacc"; version="1.2.2"; sha256="0d5k0bq8zmb7sjvba3ljp97mba2iycnw44rnsnn2aajs02l1c2xg"; depends=[SparseM]; };
   pawls = derive2 { name="pawls"; version="1.0.0"; sha256="01sf1cmd216ca5iwmw4hfnxi9lvh16r441cfcaa3n77zhq0i4w7n"; depends=[]; };
-  paws = derive2 { name="paws"; version="0.1.3"; sha256="0958g52pvs17kqxv849ycr3zw3vhk509yazqw03aahp0aqm64jhf"; depends=[paws_analytics paws_application_integration paws_compute paws_cost_management paws_customer_engagement paws_database paws_machine_learning paws_management paws_networking paws_security_identity paws_storage]; };
-  paws_analytics = derive2 { name="paws.analytics"; version="0.1.3"; sha256="0bhmhlbads3ycsz018jv5xfznv71gg8whskf0qlfq7kdq61z05mh"; depends=[paws_common]; };
-  paws_application_integration = derive2 { name="paws.application.integration"; version="0.1.3"; sha256="1vk4mif4mk5zjwmpfvh8sywp706ibwf3hv1bw0miih7rn8z44bl2"; depends=[paws_common]; };
-  paws_common = derive2 { name="paws.common"; version="0.1.1"; sha256="02cxcgpjla9cfnkfh1pllr9x58whsnnl81rwqq9xj7mficrbl2vj"; depends=[base64enc digest httr ini jsonlite xml2]; };
-  paws_compute = derive2 { name="paws.compute"; version="0.1.3"; sha256="0wf516y5xla3bgj1m84qx760xk4v10zpb9wkn4wyh94jx1pb9vl1"; depends=[paws_common]; };
-  paws_cost_management = derive2 { name="paws.cost.management"; version="0.1.3"; sha256="0axk4lwhq56q6sg5lcycp5y5isd6gwymiim65swkb1n28qxdcymq"; depends=[paws_common]; };
-  paws_customer_engagement = derive2 { name="paws.customer.engagement"; version="0.1.3"; sha256="1qchc8sn7prd9612fw7h63r1xl0hdrygwfs488kxbl5h3blikl58"; depends=[paws_common]; };
-  paws_database = derive2 { name="paws.database"; version="0.1.3"; sha256="0p1ykkmk3j8szz76ga84rph7zm56c5h5bkwig3wbdaj8y5p5wdf1"; depends=[paws_common]; };
-  paws_machine_learning = derive2 { name="paws.machine.learning"; version="0.1.3"; sha256="17b9nih71d5agcqg9g2w59qfqcggp3krw7l1wfga5vrgdq1zgbdq"; depends=[paws_common]; };
-  paws_management = derive2 { name="paws.management"; version="0.1.3"; sha256="1qyi0zpqgjkh1sfqqxaj5yjk8sml2p27gvm5hpbam33crldcbf7h"; depends=[paws_common]; };
-  paws_networking = derive2 { name="paws.networking"; version="0.1.3"; sha256="08whzrwgk1aj2g3j968v56y3bavxvgalm6wxw3ay5dbcwinj15nl"; depends=[paws_common]; };
-  paws_security_identity = derive2 { name="paws.security.identity"; version="0.1.3"; sha256="0mq3p1j0fa8clmja4q1i4m8w5qc1icyq39zl0q003h46128biywm"; depends=[paws_common]; };
-  paws_storage = derive2 { name="paws.storage"; version="0.1.3"; sha256="1c02nazvp4dcnpb4yf75lg7ppk885qv7r1v0yq86i17rb37rg60f"; depends=[paws_common]; };
-  pbapply = derive2 { name="pbapply"; version="1.4-1"; sha256="1bbws9n90cqnnp5k58hp852jwmm6513jnhn4vzhl9f8x314k6qxk"; depends=[]; };
+  paws = derive2 { name="paws"; version="0.1.4"; sha256="0qz1h7mys6mpf4yl53x7m2lvp9s4i31axqky24mi41j87g67bsag"; depends=[paws_analytics paws_application_integration paws_compute paws_cost_management paws_customer_engagement paws_database paws_machine_learning paws_management paws_networking paws_security_identity paws_storage]; };
+  paws_analytics = derive2 { name="paws.analytics"; version="0.1.4"; sha256="08ifbx7958ibb3x59xzxj73inrq1iqj5g6q9a0pdk4iihg828ill"; depends=[paws_common]; };
+  paws_application_integration = derive2 { name="paws.application.integration"; version="0.1.4"; sha256="04szgz9lmnp5nafknsqdkpa40x5d2qgwyiib5gvi2vp2a97nl0k4"; depends=[paws_common]; };
+  paws_common = derive2 { name="paws.common"; version="0.2.2"; sha256="0fax6brbj5pkcbj11r9jizn8zx993rbwdpfl84vajxdqqq6q461y"; depends=[base64enc digest httr ini jsonlite xml2]; };
+  paws_compute = derive2 { name="paws.compute"; version="0.1.4"; sha256="12p7lmxjya8y73l8xynm4jnwd0ri7hh9rh5nr375y0vvf2lfvxl3"; depends=[paws_common]; };
+  paws_cost_management = derive2 { name="paws.cost.management"; version="0.1.4"; sha256="1y53ckj98hsj15r9i21gs53198a4ib7h7maf6x931gz4j8l5i3vj"; depends=[paws_common]; };
+  paws_customer_engagement = derive2 { name="paws.customer.engagement"; version="0.1.4"; sha256="0zzk8b07q2774jd7f69lszrw4iljk68fq104akvikiw96cm9786m"; depends=[paws_common]; };
+  paws_database = derive2 { name="paws.database"; version="0.1.4"; sha256="0nxh9krj062zm3x7x1aqzbwv6iv7n5ivypv12xa49klv9h6cam2l"; depends=[paws_common]; };
+  paws_machine_learning = derive2 { name="paws.machine.learning"; version="0.1.4"; sha256="0anbhx7c47v36zzpb13myjvki4xjb04xybyg7gq2li8c0rlbnmas"; depends=[paws_common]; };
+  paws_management = derive2 { name="paws.management"; version="0.1.4"; sha256="1q0bbwgsjwbqv808pyf8nz33xaqfci933ng375i8pb0bgiyqy7mz"; depends=[paws_common]; };
+  paws_networking = derive2 { name="paws.networking"; version="0.1.4"; sha256="1556x2c2li0fdxrnpcblz4yijkanmmw3wshmd1ad4hbvh8xa7mqk"; depends=[paws_common]; };
+  paws_security_identity = derive2 { name="paws.security.identity"; version="0.1.4"; sha256="09kna71xaizd2878qym6lyxafjf370qh3paknv4gyzf8z43c9na6"; depends=[paws_common]; };
+  paws_storage = derive2 { name="paws.storage"; version="0.1.4"; sha256="1ln3cdbp1bgsnq1s8v7kwbgx1ih5fzv3n1fglwl4yp8q3vag8ab5"; depends=[paws_common]; };
+  pbapply = derive2 { name="pbapply"; version="1.4-2"; sha256="1xmk4p006v8gij26rs6kp5prjyf2n32nqjxiyp8a6kvgyc4z46dc"; depends=[]; };
   pbatR = derive2 { name="pbatR"; version="2.2-13"; sha256="01ra1ggdpxdl1xqjdh86qynr5gkgzw01ww6j9bwgx4mj20i6j1ha"; depends=[rootSolve survival]; };
   pbdBASE = derive2 { name="pbdBASE"; version="0.5-0"; sha256="11jlfr0pswldd5h06swfrc8bm785dv09iqgg3kfnc53yvrs0d7qv"; depends=[pbdMPI pbdSLAP]; };
   pbdDEMO = derive2 { name="pbdDEMO"; version="0.3-1"; sha256="0vr3dvvhr8j6xvdf308nn37y0lkl2ysm93yf0h7rclvqvsk1pf66"; depends=[pbdBASE pbdDMAT pbdMPI]; };
@@ -10901,7 +11129,7 @@ in with self; {
   pbo = derive2 { name="pbo"; version="1.3.4"; sha256="0v522z36q48k4mx5gym564kgvhmf08fsadp8qs6amzbgkdx40yc4"; depends=[lattice]; };
   pbs = derive2 { name="pbs"; version="1.1"; sha256="0cpgs6k5h8y2cia01zs1p4ri8r7ljg2z4x8xcbx73s680dvnxa2w"; depends=[]; };
   pbv = derive2 { name="pbv"; version="0.2-16"; sha256="1jr0xvk56d7qqpj7azw64lidwc3604iw87k7cccswv4yvbihvzzk"; depends=[Rcpp RcppArmadillo]; };
-  pcFactorStan = derive2 { name="pcFactorStan"; version="1.0.2"; sha256="190hvyl957hffy8s65iaxyirgja04b2l37hmd9sg1aldmixz0cym"; depends=[BH igraph loo mvtnorm Rcpp RcppEigen reshape2 rstan StanHeaders]; };
+  pcFactorStan = derive2 { name="pcFactorStan"; version="1.1.0"; sha256="08lgi8j5q64nwix1npz0dw4vmzc9pfv8cdrn8jm1vsa2dazssnm4"; depends=[BH igraph loo mvtnorm Rcpp RcppEigen reshape2 rstan StanHeaders]; };
   pcIRT = derive2 { name="pcIRT"; version="0.2.4"; sha256="0crll51s14nisnaxjln7bc3b1a181v358nfkh1p5iiyn98clacl6"; depends=[combinat Rcpp]; };
   pcLasso = derive2 { name="pcLasso"; version="1.1"; sha256="1wdwin6xszysydspxjb8b6r3y416ri3zndh0s142b2487lhmqkb6"; depends=[svd]; };
   pca3d = derive2 { name="pca3d"; version="0.10"; sha256="1bpm4sbj7h2fd0h5ybjhq8g61l8v2fbc92yiiascdgfili85zsf3"; depends=[ellipse rgl]; };
@@ -10909,8 +11137,8 @@ in with self; {
   pcaL1 = derive2 { name="pcaL1"; version="1.5.2"; sha256="1f7481wn2c935llb9visfdlv958ixxqybp5r2dy7nm18jacf2a0l"; depends=[]; };
   pcaPP = derive2 { name="pcaPP"; version="1.9-73"; sha256="1z2kdf9gfp965xbcd4rg6vf20d1bl443na0qjkpq7gmzpaq6cifa"; depends=[mvtnorm]; };
   pcadapt = derive2 { name="pcadapt"; version="4.1.0"; sha256="0631qx37ffz21bgwvjq2y5xn4dvz6kpmwg3rlmkxa93kwsx2b7rb"; depends=[data_table ggplot2 magrittr mmapcharr plotly Rcpp rmio robust RSpectra vcfR]; };
-  pcalg = derive2 { name="pcalg"; version="2.6-2"; sha256="02k11cdq7lg2cwg8b43sqdvklppx1cjj5frffvfhlffi3szm3lgr"; depends=[abind bdsmatrix BH clue corpcor dagitty fastICA ggm graph igraph RBGL Rcpp RcppArmadillo robustbase sfsmisc vcd]; };
-  pccc = derive2 { name="pccc"; version="1.0.2"; sha256="0ha15prf6zaa2kq4hhaadr5s0mr765b4rpx4q608136sh3hps574"; depends=[dplyr Rcpp]; };
+  pcalg = derive2 { name="pcalg"; version="2.6-6"; sha256="01irqkw7lv5m4svrjalpgpgp28y1m6w3jsgz0hlzwfdz2z5gkkhh"; depends=[abind bdsmatrix BH clue corpcor fastICA ggm graph igraph RBGL Rcpp RcppArmadillo robustbase sfsmisc vcd]; };
+  pccc = derive2 { name="pccc"; version="1.0.3"; sha256="1dd1kh0gx7ffwnmxqn3zbcsxiav4z70psis24dgqxwq42r0kw5mk"; depends=[dplyr Rcpp]; };
   pcdpca = derive2 { name="pcdpca"; version="0.4"; sha256="0ys4hrin0w3f87d1d986wvrfkfwapzj9hz7d7v92r60ns74g7r5m"; depends=[fda freqdom]; };
   pcensmix = derive2 { name="pcensmix"; version="1.2-1"; sha256="1yrz4hdj52in8z65qyl18kh7frv75rb8ss5ljv3vbm6yhxi32jnd"; depends=[]; };
   pcev = derive2 { name="pcev"; version="2.2.2"; sha256="1l0afcdzkxzkhkc8ln2fzi50hc7nfq46lg6hhx6rrzkb41w82iqw"; depends=[corpcor RMTstat]; };
@@ -10920,15 +11148,15 @@ in with self; {
   pcmabc = derive2 { name="pcmabc"; version="1.0.4"; sha256="1s6j9353azn0561is4dlisi6lnam9ng2rlwdnrj7hpbhr3hskpxl"; depends=[ape distory geiger mvSLOUCH phangorn TreeSim yuima]; };
   pcnetmeta = derive2 { name="pcnetmeta"; version="2.6"; sha256="0rpd1bgg932xhj03fnskhbg7ni9nfd8qrvxvix8qmbgw8bwdsbgd"; depends=[coda rjags]; };
   pco = derive2 { name="pco"; version="1.0.1"; sha256="0k1m450wfmlym976g7p9g8arqrvnsxgdpcazk5kh3m3jsrvrcchf"; depends=[]; };
-  pcr = derive2 { name="pcr"; version="1.1.2"; sha256="0sms024irkhqyb001lcicrm3dwnnyr2kw9kx10q3v9j6p7rxzhz2"; depends=[devtools dplyr ggplot2 magrittr purrr readr tidyr]; };
+  pcr = derive2 { name="pcr"; version="1.2.0"; sha256="0817ibih6rs52g560z8cbw2zpr0hbzrz94c913x4114w1k737bq9"; depends=[ggplot2]; };
   pcrcoal = derive2 { name="pcrcoal"; version="1.2.0"; sha256="0rd610ny8p7by3gi6kk130ii0qcswqsng5mzmxz8hrxqk0cs4c9x"; depends=[ape ggplot2 phylosim]; };
   pcrsim = derive2 { name="pcrsim"; version="1.0.2"; sha256="04177xl513k01prmf93kha91dyxmb9v80d1y4lz73fxsifj6bhar"; depends=[data_table ggplot2 gWidgets mc2d plyr strvalidator]; };
   pcse = derive2 { name="pcse"; version="1.9.1.1"; sha256="1rb9146vjkf36vc5v3frykmsff7kp6qp1hhmj8pak583in4rz8f8"; depends=[]; };
-  pct = derive2 { name="pct"; version="0.2.4"; sha256="02nskkrl6qasbzhvwijs9q7sk4j7ylkam9wfmhrqa6m8bkhxqg7s"; depends=[boot readr sf stplanr]; };
+  pct = derive2 { name="pct"; version="0.2.7"; sha256="1bpmfrdidnz1aqg8llz00rrvk70f7gy2jdb0i8l3kvf8gg3ws3qb"; depends=[boot readr sf stplanr]; };
   pdR = derive2 { name="pdR"; version="1.7"; sha256="05rnyb9znb71ilr9kf62x30knby1rm0p4ain220wvb62vkz054d7"; depends=[boot car coefplot lmtest papeR plm sandwich]; };
   pdSpecEst = derive2 { name="pdSpecEst"; version="1.2.3"; sha256="0kqph8134g1fyzc9b06nighkqsh6jjpckvwxhpslihj5sj3kapdd"; depends=[ddalpha multitaper Rcpp RcppArmadillo Rdpack]; };
   pdc = derive2 { name="pdc"; version="1.0.3"; sha256="0503n7aiy0qrl790yfjvpm7bbyz1i4818rlg96q0fvzb58zqmyvc"; depends=[]; };
-  pder = derive2 { name="pder"; version="1.0-0"; sha256="097klk334bjhlss8x73f27l7jcp7d7vh10jr5sazm5kcvi95619i"; depends=[]; };
+  pder = derive2 { name="pder"; version="1.0-1"; sha256="147fc5swmh0qrg7k3q3gpnvl9f7hhjjzwi8f5dc4fkyj14qi5bm5"; depends=[]; };
   pdfCluster = derive2 { name="pdfCluster"; version="1.0-3"; sha256="13m7b2wivvf58vyqbysj4r04w0nj2b5x0xnaxip712a6c66x1h7l"; depends=[geometry]; };
   pdfetch = derive2 { name="pdfetch"; version="0.2.4"; sha256="0qskxak1mb8h038ly4hlsjvkz8nyinaraqh5f91d8nyzjzhj7x3c"; depends=[curl httr jsonlite lubridate readr reshape2 XML xml2 xts zoo]; };
   pdfsearch = derive2 { name="pdfsearch"; version="0.3.0"; sha256="0mk1s8b7cdz025xn9kg5xnw388sndhjm80ckf71daxviknrzcscf"; depends=[pdftools stringi tibble tokenizers]; };
@@ -10951,6 +11179,7 @@ in with self; {
   pedigree = derive2 { name="pedigree"; version="1.4"; sha256="1dqfvzcl6f15n4d4anjkd0h8vwsbxjg1lmlj33px8rpp3y8xzdgw"; depends=[HaploSim Matrix reshape]; };
   pedigreeTools = derive2 { name="pedigreeTools"; version="0.1"; sha256="0kgbjyw9dlp4s91cyg5w0p2vn2h9pg9ixrhc5pwvkp3v1acd0xfm"; depends=[Matrix]; };
   pedigreemm = derive2 { name="pedigreemm"; version="0.3-3"; sha256="1bpkba9nxbaxnivrjarf1p2p9dcz6smf9k2djawis1wq9dhylvsb"; depends=[lme4 Matrix]; };
+  pedmut = derive2 { name="pedmut"; version="0.1.0"; sha256="0b8qlcl4g8kjix4q1drs1yk7wnilxqslv4p8svyabcg8wb4bnvwa"; depends=[]; };
   pedometrics = derive2 { name="pedometrics"; version="0.6-6"; sha256="1w9wa73wva6z0d56g221l8qmc5igfypwsa2xq4sn4r501bdy8qpq"; depends=[lattice latticeExtra Rcpp]; };
   pedquant = derive2 { name="pedquant"; version="0.1.2"; sha256="18shjp241ihy01ksmp2sqrpq5y693njml4wqaayypb961s1850kj"; depends=[curl data_table ggplot2 gridExtra httr jsonlite readr readxl rvest scales stringi TTR webdriver xml2 zoo]; };
   pegas = derive2 { name="pegas"; version="0.11"; sha256="0l21bapzbjcvblbvks3jh9rpy9hng1ccd7f0glhqw695lc737bpx"; depends=[adegenet ape]; };
@@ -10973,10 +11202,10 @@ in with self; {
   perccal = derive2 { name="perccal"; version="1.0"; sha256="1akak068d0g70amj5sbvnqbywzy21l4wz11mhp71b7cp4xmr9n12"; depends=[Rcpp RcppArmadillo RcppEigen]; };
   perccalc = derive2 { name="perccalc"; version="1.0.3"; sha256="0x895b75fjipzv7ff9mz7qpcabm9zys3bjsalk6h2q2350lwjmq1"; depends=[broom dplyr magrittr multcomp purrr tibble tidyr]; };
   perfectphyloR = derive2 { name="perfectphyloR"; version="0.1.3"; sha256="05awwlsams9qc75hxl362scjsfz65kd250a5a545yniljr6wm6zl"; depends=[ape dendextend HHG phytools Rcpp RcppArmadillo]; };
-  performance = derive2 { name="performance"; version="0.2.0"; sha256="1pzd6z7i1jxr2xi1shg3d0bxlbpmjl7kpmwgjnfys6syv57znd1z"; depends=[bayestestR insight]; };
+  performance = derive2 { name="performance"; version="0.3.0"; sha256="13j74ffhx950kacs86ixx84nviq9qlwzr7hjnhkmzw2hspjxq99w"; depends=[bayestestR insight]; };
   performanceEstimation = derive2 { name="performanceEstimation"; version="1.1.0"; sha256="08jx2zl6xh0rp54xa70gb717wbfdzfrx9b47i3b3ly41qaf85vrc"; depends=[dplyr ggplot2 parallelMap tidyr]; };
   pergola = derive2 { name="pergola"; version="1.0"; sha256="1650ipp2b455xdkznwm7bnxvimad7nbyr9i1lg2vdh64j1qfh7gl"; depends=[seriation]; };
-  periscope = derive2 { name="periscope"; version="0.4.3"; sha256="1mnqav4f5m2jj17853xwy0fmndm6ywk3q6qq4m5j60f2cb866mbl"; depends=[DT ggplot2 logging lubridate openxlsx shiny shinyBS shinydashboard]; };
+  periscope = derive2 { name="periscope"; version="0.4.6"; sha256="0544b525nbq26sr5zwxgvcw9mpg6v4qgbzjjji5xirzfj0ra1v1h"; depends=[DT ggplot2 logging lubridate openxlsx shiny shinyBS shinydashboard]; };
   perm = derive2 { name="perm"; version="1.0-0.0"; sha256="0075awl66ynv10vypg63fcxk33qzvxddrp8mi4w08ysvimcyxijk"; depends=[]; };
   permDep = derive2 { name="permDep"; version="1.0.2"; sha256="0dv740vnjy99rc6px8w4ngis3w6zc4c67m0bx2lh327sqb7q3zsd"; depends=[BB survival]; };
   permGPU = derive2 { name="permGPU"; version="0.14.9"; sha256="10r2qxbvzjxv3520lrn6cwi5akhhwgkhz7yaqxi5vh2f5l0s49wy"; depends=[Biobase foreach RUnit survival]; };
@@ -11019,7 +11248,6 @@ in with self; {
   phantom = derive2 { name="phantom"; version="0.1.3"; sha256="0kgw65jziw5s03isq5ywmqijhkbik5i84k30hx5gbi0zzgj8y0h1"; depends=[gplots MASS NMF qusage RColorBrewer Rcpp RcppArmadillo]; };
   phase1PRMD = derive2 { name="phase1PRMD"; version="1.0.1"; sha256="1gg11rvs5zqza66f7r7sw7g3w8nzi3il1883wpwzqhp58hsphjdw"; depends=[arrayhelpers coda dplyr ggplot2 gridExtra kableExtra knitr MASS phase1RMD plyr RColorBrewer reshape2 rjags]; };
   phase1RMD = derive2 { name="phase1RMD"; version="1.0.8"; sha256="1wvlajsqb8y8f30asq1lyk87kmakh2risnky98g5gday765y90qa"; depends=[arrayhelpers boot coda ggplot2 mvtnorm rjags]; };
-  phaseR = derive2 { name="phaseR"; version="2.0"; sha256="14shpsyrcz1j0bl60vh37cpcvmry48s76xlf4f9lmq4l5vynhrcn"; depends=[deSolve]; };
   phateR = derive2 { name="phateR"; version="0.4.1"; sha256="13vqrxbshk62wk4myhwyp4a7k6i9synknvmfah3l1pg2b3b3dqmj"; depends=[ggplot2 Matrix reticulate]; };
   phd = derive2 { name="phd"; version="0.1"; sha256="1scwan3pkhdl0nyhpjrkcal1f58x0jkdkhixdcxppr1363r1v22a"; depends=[glmnet]; };
   pheatmap = derive2 { name="pheatmap"; version="1.0.12"; sha256="1hdh74az3vyzz6dqa311rhxdm74n46lyr03p862kn80p0kp9d7ap"; depends=[gtable RColorBrewer scales]; };
@@ -11043,10 +11271,11 @@ in with self; {
   phonR = derive2 { name="phonR"; version="1.0-7"; sha256="0al2cbynnbvmd90lk1w1g1ppslqq0ng8vbb6bl7m4kqwd2lgv056"; depends=[deldir plotrix splancs]; };
   phonTools = derive2 { name="phonTools"; version="0.2-2.1"; sha256="01i481mhswsys3gpasw9gn6nxkfmi7bz46g5c84m13pg0cv8hxc7"; depends=[]; };
   phonenumber = derive2 { name="phonenumber"; version="0.2.2"; sha256="1m5idp538lvynmfp8m7l89js6hk5lpp26k419bdvj3hd3ap0n9lg"; depends=[]; };
+  phonfieldwork = derive2 { name="phonfieldwork"; version="0.0.2"; sha256="1flpk6d6q3fh5b855wk0v9gl7m810qjkv10papg1r9iflb9k41rp"; depends=[DT phonTools rmarkdown tuneR]; };
   phonics = derive2 { name="phonics"; version="1.3.2"; sha256="03iacdpzzw90jgh38mhs49gswz3292nlkizc1xr02xry6nd7357a"; depends=[BH data_table Rcpp]; };
-  photobiology = derive2 { name="photobiology"; version="0.9.28"; sha256="0aw7baxgb24fddcpsh9zlg1njvkb6kppz825b6xzqa6v0yigr0id"; depends=[dplyr lubridate plyr polynom rlang splus2R tibble zoo]; };
+  photobiology = derive2 { name="photobiology"; version="0.9.29"; sha256="1ins3554jydgvisg08ngp7f7h98hxihnkj8kwnk65xyiziy11g09"; depends=[dplyr lubridate plyr polynom rlang splus2R tibble zoo]; };
   photobiologyFilters = derive2 { name="photobiologyFilters"; version="0.5.0"; sha256="1zijk6g9xf29ql7pybjs1zqkyn8s2zav4vz2pskj548v6hmrcw3x"; depends=[photobiology]; };
-  photobiologyInOut = derive2 { name="photobiologyInOut"; version="0.4.20"; sha256="1pmga655hcnm8f8vxk3559p2cdc2i9srx4wmn4z5l0xmfpq14402"; depends=[colorSpec dplyr hyperSpec lazyeval lubridate photobiology readr readxl stringr tibble tidyr]; };
+  photobiologyInOut = derive2 { name="photobiologyInOut"; version="0.4.21"; sha256="1h24bwmjchhhicxiyfylm65bl12dakn0b4q0zpgk6xlxk13n7fbb"; depends=[colorSpec dplyr lazyeval lubridate photobiology readr readxl stringr tibble tidyr]; };
   photobiologyLEDs = derive2 { name="photobiologyLEDs"; version="0.4.3-1"; sha256="0inhl6ba1fzkak4752m60hkm6fzapzyz5kchvz18yv33dmm13v1c"; depends=[photobiology]; };
   photobiologyLamps = derive2 { name="photobiologyLamps"; version="0.4.3"; sha256="1df7ngcyrmvhab80w1ggyv1p9srsvwr9f6pm8yl7hvkpkv6jbdsk"; depends=[photobiology]; };
   photobiologyPlants = derive2 { name="photobiologyPlants"; version="0.4.2"; sha256="0ab5ks72mb5x03xc0ww9fcl0h13ja8402b1s670lqmmhyvp6fj3s"; depends=[photobiology photobiologyWavebands]; };
@@ -11060,7 +11289,7 @@ in with self; {
   phuassess = derive2 { name="phuassess"; version="1.1"; sha256="0jplj9gih32dllx2hw5aqvc9b94sbrbv66s3a5r8mdbpjh93rhng"; depends=[]; };
   phuse = derive2 { name="phuse"; version="0.1.8"; sha256="1ppinprmanpkhvf9apmjzsqc1q26m0mmgxl97iqqnrpk8cpln54d"; depends=[git2r httr jsonlite RCurl rlist shiny stringr yaml]; };
   phybreak = derive2 { name="phybreak"; version="0.2.0"; sha256="0vapc0w308wv1cd72p2xbj3q7jfnxwp08g5g8855a38pcn3njbfg"; depends=[ape phangorn Rcpp stringr]; };
-  phyclust = derive2 { name="phyclust"; version="0.1-24"; sha256="1gsl0zzr4m1vxbixlsd80bl05kyxvbawca8qk65b935v67z6c6hb"; depends=[ape]; };
+  phyclust = derive2 { name="phyclust"; version="0.1-26"; sha256="1zapp8252przxlbi9knx9qvv8vc1cm3ywf65m07j9n2cdl31iqbw"; depends=[ape]; };
   phyext2 = derive2 { name="phyext2"; version="0.0.4"; sha256="0j871kgqm9fll0vdgh071z77ib51y8pxxm0ssjszljvvpx1mb8rb"; depends=[ape phylobase]; };
   phylin = derive2 { name="phylin"; version="2.0"; sha256="1j7v79ga6d4ysfmsh8na4s6mgs04wi4c89l5kxvwaqvj8ic0jlpn"; depends=[]; };
   phyloTop = derive2 { name="phyloTop"; version="2.1.1"; sha256="1n44kr3a9yg8yvy3m493zi04x6aiqm424fp2ls9yzyx1cga2h9nk"; depends=[ape igraph NHPoisson phylobase]; };
@@ -11073,7 +11302,7 @@ in with self; {
   phyloland = derive2 { name="phyloland"; version="1.3"; sha256="10g40m6n2s4qvnzlqcwpy3k0j7bxdp79f586jj910b8p00ymrksp"; depends=[ape]; };
   phylolm = derive2 { name="phylolm"; version="2.6"; sha256="0vah8ibicldi57wab4sk1kx7gdq6h34bm6swmxzhq7kikxfwmmyj"; depends=[ape future_apply]; };
   phylometrics = derive2 { name="phylometrics"; version="0.0.1"; sha256="1pmr6l3wmaf91wdlsc5m63l07fibngnly2qzkma0rdi463ii03il"; depends=[mvtnorm]; };
-  phylopath = derive2 { name="phylopath"; version="1.1.0"; sha256="14waw2kw624vlnk786hdyq06vmvrmnl24a05hwwycn7bbmhbr2cx"; depends=[ape ggm ggplot2 ggraph igraph MuMIn pbapply phylolm purrr tibble]; };
+  phylopath = derive2 { name="phylopath"; version="1.1.1"; sha256="02wx4hav2p81hpzyd2k589h7d56ziki7gmk16bi28c6z49pn2cfx"; depends=[ape ggm ggplot2 ggraph igraph MuMIn pbapply phylolm purrr tibble]; };
   phyloseqGraphTest = derive2 { name="phyloseqGraphTest"; version="0.0.2"; sha256="1xgv2kf7j3ia5vk10r7w9588rfv7asdaf8f3yxwp5q7aqn3krm6q"; depends=[ggnetwork ggplot2 igraph intergraph phyloseq]; };
   phylosignal = derive2 { name="phylosignal"; version="1.2.1"; sha256="10ds4vn5rw3nrgvsg2n0b53bivy54p5j7fmnqn81alzz9irgrkcs"; depends=[adephylo ape boot DBI igraph phylobase Rcpp RcppArmadillo]; };
   phylosim = derive2 { name="phylosim"; version="3.0.4"; sha256="08ajpb3gjglgx2s4jqbpgpcm01hz4p9c3wacfmq0wl1l7sjgsnrs"; depends=[ape compoisson ggplot2 R_methodsS3 R_oo]; };
@@ -11093,7 +11322,7 @@ in with self; {
   piggyback = derive2 { name="piggyback"; version="0.0.10"; sha256="08d7jxw7mvfyhjbr8zy95p952j2p94ii6zq38b8xw96g6k1380bz"; depends=[clisymbols crayon fs gh git2r httr jsonlite lubridate magrittr memoise usethis]; };
   pillar = derive2 { name="pillar"; version="1.4.2"; sha256="0988047mf0xdhdkqqmavzx4ifjhndjnxniyrrhrdq1nvnrvbpfms"; depends=[cli crayon fansi rlang utf8 vctrs]; };
   pim = derive2 { name="pim"; version="2.0.1"; sha256="1m804clxc8m4nyzi4hhfy118527lgf2sb7589qd61fb83yh6hi8p"; depends=[BB nleqslv]; };
-  pimeta = derive2 { name="pimeta"; version="1.1.2"; sha256="06x22l3x0l4qg4b4mkj069mqw2ylkb6sqad7s613fp2xhry5crbr"; depends=[ggplot2 Rcpp RcppEigen]; };
+  pimeta = derive2 { name="pimeta"; version="1.1.3"; sha256="1mx0m438db4n041bns6sm8sr8vrj6w8b2kvpmrkkp0bly2vpv40q"; depends=[ggplot2 Rcpp RcppEigen scales]; };
   pinbasic = derive2 { name="pinbasic"; version="1.2.2"; sha256="0mcw68wrixz2jf62nfifdgg8bnp4h1p3byivz28wi61blj8iaa75"; depends=[fastcluster ggplot2 lubridate Rcpp reshape2 scales]; };
   pinfsc50 = derive2 { name="pinfsc50"; version="1.1.0"; sha256="1fja8xdqwsm4g223wmb2yg5fqmsg94hchzjd4qrqah1zb8vbdfdn"; depends=[]; };
   pingers = derive2 { name="pingers"; version="0.1.1"; sha256="09np6aph6rhvdh6mwky8a57i38bi2amwi7x91p9kfb2mzkql8k8w"; depends=[data_table dplyr lubridate plotly reshape2 stringr tibble tictoc tidyselect]; };
@@ -11101,7 +11330,8 @@ in with self; {
   pinnacle_API = derive2 { name="pinnacle.API"; version="2.3.3"; sha256="1b6adns1xr3cgcj2mdjvl16cm2vjjgsj2l8m2c47plyc5jh05qmb"; depends=[data_table httr jsonlite magrittr openssl purrr rjson uuid]; };
   pinnacle_data = derive2 { name="pinnacle.data"; version="0.1.4"; sha256="1sl36i2857b3xwx7iwgy8mkgjvz7nfa74ch1n8kcxbj59ib7mp8p"; depends=[tibble]; };
   pinochet = derive2 { name="pinochet"; version="0.1.0"; sha256="0qy18mlw34cv9p7b3qb5bidxyq44k0hzj91hm5vp6wkjhik4knvi"; depends=[]; };
-  pinp = derive2 { name="pinp"; version="0.0.7"; sha256="0m7k8z6gnkqwxf5iggdxgi4i1g0xnw2s3w94srz2mmwmyqa4zfpi"; depends=[knitr rmarkdown]; };
+  pinp = derive2 { name="pinp"; version="0.0.9"; sha256="1hdj0mqwz0hwl6jsh5zknbgg10bj49giqnr4y3lavfbk8d7qmmvs"; depends=[knitr rmarkdown]; };
+  pins = derive2 { name="pins"; version="0.2.0"; sha256="07mjrpfd4mvczlfg4dhradacirlrf8lq9mhrfjf71v2vlhzv54da"; depends=[base64enc httr jsonlite magrittr openssl rappdirs withr yaml zip]; };
   pinyin = derive2 { name="pinyin"; version="1.1.6"; sha256="0rw9qd5hbcmpi30vdqs31ijy37d8jlpqv0xif2nndb8cwj8x5bw2"; depends=[data_table splitstackshape]; };
   pipe_design = derive2 { name="pipe.design"; version="0.5.1"; sha256="0r0szkdzifxmnnbr6675w8ij4zwqgxj3gwahc7a74mxr51f7qh8j"; depends=[ggplot2 gtools xtable]; };
   pipeGS = derive2 { name="pipeGS"; version="0.4"; sha256="0ki4i70r5f195b4jfv3hxlxz3zj57mhy2yf4984bwr11impilz5w"; depends=[]; };
@@ -11114,16 +11344,16 @@ in with self; {
   piton = derive2 { name="piton"; version="0.1.1"; sha256="1265y4lv2m5nwrh25sahjkxwmivpxgh9shrdidlmaman7zs6cclr"; depends=[Rcpp]; };
   pivmet = derive2 { name="pivmet"; version="0.2.0"; sha256="0xcm0pb5qn2vikhnf7fnp6942syq0xax7fgwmspixa6la5bdkksg"; depends=[bayesmix cluster corpcor MASS mclust mvtnorm RcmdrMisc rjags rstan runjags]; };
   pivotaltrackR = derive2 { name="pivotaltrackR"; version="0.1.0"; sha256="024srncm288mn3bz6hv7ljzkchmnljk4yc2d4z7i05vsn7dzd2c6"; depends=[curl httr]; };
-  pivottabler = derive2 { name="pivottabler"; version="1.2.0"; sha256="07d69r367h7dzyfd8gg9d63xjnanrkw7qdgpmhcpngxnqpmir79i"; depends=[data_table dplyr htmltools htmlwidgets jsonlite R6]; };
+  pivottabler = derive2 { name="pivottabler"; version="1.2.2"; sha256="1j74jd48xh2x3jzgi5v45g4lg8xp7fwqw0pkhx1c0dhdp4d1wf02"; depends=[data_table dplyr htmltools htmlwidgets jsonlite R6]; };
   pixels = derive2 { name="pixels"; version="0.1.0"; sha256="0lna0z2shs49kh48ipjnyigaa22wb9gm4mq970ldhh9msb7wcv55"; depends=[htmlwidgets miniUI shiny]; };
   pixiedust = derive2 { name="pixiedust"; version="0.8.6"; sha256="1dajiblpm51szndz026lmwh6swx8f9f03s6md26d84awcx0q1dpc"; depends=[broom checkmate dplyr htmltools knitr labelVector magrittr scales tidyr]; };
   pixmap = derive2 { name="pixmap"; version="0.4-11"; sha256="04klxp6jndw1bp6z40v20fbmdmdpfca2g0czmmmgbkark9s1183g"; depends=[]; };
   pkgKitten = derive2 { name="pkgKitten"; version="0.1.4"; sha256="0c44zrvpyz87s5mjhsqdrkyrvyzhyldnq371bwnn9crbpbac3wnd"; depends=[]; };
-  pkgbuild = derive2 { name="pkgbuild"; version="1.0.3"; sha256="0k8zwa66rm1ncx19ld5mbaxcjxkswiczpdqyssy44vl8k6scwfn9"; depends=[callr cli crayon desc prettyunits R6 rprojroot withr]; };
+  pkgbuild = derive2 { name="pkgbuild"; version="1.0.5"; sha256="0y4i85axwajrk67h3w6fiqfm6wxmhn3dr240w5l2nvqg3ahpxc8q"; depends=[callr cli crayon desc prettyunits R6 rprojroot withr]; };
   pkgcache = derive2 { name="pkgcache"; version="1.0.5"; sha256="0d0w3gqw3429dwmfc9804f9pl71l14phh03ppk2q5q1kyp49xw92"; depends=[assertthat cli cliapp crayon curl digest filelock glue prettyunits R6 rappdirs rematch2 rlang tibble uuid withr]; };
   pkgcond = derive2 { name="pkgcond"; version="0.1.0"; sha256="0pxj798042g23cf19r67nbgdyhpd868n2pkqjvjgrgr8ivwnkf1h"; depends=[]; };
-  pkgconfig = derive2 { name="pkgconfig"; version="2.0.2"; sha256="1jk9ip549xphb3anfixqv1yx5kidnndqgy9v3qjpmgmds5a7g695"; depends=[]; };
-  pkgdown = derive2 { name="pkgdown"; version="1.3.0"; sha256="1avjd93hnnh1yicx46gnbv8ps0cifg8rrjgvhw03k674gw11mgb7"; depends=[callr cli crayon desc digest evaluate fansi fs highlight httr magrittr MASS memoise openssl pkgload processx purrr R6 rematch2 rlang rmarkdown roxygen2 rsconnect rstudioapi tibble whisker withr xml2 yaml]; };
+  pkgconfig = derive2 { name="pkgconfig"; version="2.0.3"; sha256="0l1qph8zyi2sic3k2qcd7vlfl7rzfh1q7z7zvjkl5f7y1x2fy3rk"; depends=[]; };
+  pkgdown = derive2 { name="pkgdown"; version="1.4.1"; sha256="1y0mnsiq05snzschh2y5a0y1wrwh79c4jclsljjyflibbffhxxcf"; depends=[callr cli crayon desc digest evaluate fansi fs highlight httr magrittr MASS memoise openssl processx purrr rematch2 rlang rmarkdown rstudioapi tibble whisker withr xml2 yaml]; };
   pkggraph = derive2 { name="pkggraph"; version="0.2.3"; sha256="1isiywgm20rypc5qr03p0k7lis76zzd96x5ncbvia644d2n13brm"; depends=[curl data_table dplyr ggnetwork ggplot2 htmltools igraph intergraph Matrix network networkD3 plyr RColorBrewer tibble]; };
   pkgload = derive2 { name="pkgload"; version="1.0.2"; sha256="0z7jvharafahi2gv5547mk1n499isjzw06kfwymmxc0gd575d1ii"; depends=[desc pkgbuild rlang rprojroot rstudioapi withr]; };
   pkgmaker = derive2 { name="pkgmaker"; version="0.27"; sha256="0spcamjncj78kzjps2rw4v1a4494yazv6xvhn0vmdflnypc8k8hp"; depends=[bibtex codetools digest magrittr registry stringi stringr withr xtable]; };
@@ -11133,13 +11363,15 @@ in with self; {
   pkmon = derive2 { name="pkmon"; version="1.0"; sha256="0j2v4zlf7vgy5gld29xiii15m9i85cpiwc25rmzjm02cz2p32c72"; depends=[]; };
   pkr = derive2 { name="pkr"; version="0.1.2"; sha256="0m045dlcq3rls1w0smy4jvk3c57ckpqdv8xnz261k1gnnyjmz1k2"; depends=[binr foreign forestplot rtf]; };
   pks = derive2 { name="pks"; version="0.4-1"; sha256="1lwm65s2b9y6vr1yr683n535yz8hbzc6j289a6yp45v2yai72m07"; depends=[sets]; };
-  pksensi = derive2 { name="pksensi"; version="1.1.2"; sha256="16p2h15xya711i64s7m324x982zgvnxkd5z9045vsqi7ay4syjr0"; depends=[data_table deSolve dplyr getPass ggplot2 magrittr reshape]; };
+  pksensi = derive2 { name="pksensi"; version="1.1.4"; sha256="0bsl7w96z6hsljdsg9g9xng1sspq2h3ik064g238firxvdyclb46"; depends=[data_table deSolve dplyr getPass ggplot2 magrittr reshape]; };
   plRasch = derive2 { name="plRasch"; version="1.0"; sha256="1rnpvxw6pzl5f6zp4xl2wfndgvqz5l3kiv9sh4cpvhga0gl8zjaw"; depends=[survival]; };
   pla = derive2 { name="pla"; version="0.2"; sha256="1qb71zjcxvs3zbfy0sryyxizwix0nw530zsfw661a8vm8sk054kw"; depends=[]; };
   plac = derive2 { name="plac"; version="0.1.1"; sha256="08kqnjzbfygnbqvqg5wyw148kfhjqxy46y4vaiq9zzwzj58w8vzn"; depends=[Rcpp RcppEigen survival]; };
+  placer = derive2 { name="placer"; version="0.1.3"; sha256="0d7b6mkyyrcjn1pqxlj9mjis6vzks986i7vhc8ffkp8hz8sc7271"; depends=[]; };
   plainview = derive2 { name="plainview"; version="0.1.0"; sha256="0yvw357p1hwrlj4c2sjr4klmy6j98a3kbdfwg0snaiv0drdyhznk"; depends=[gdalUtils htmltools htmlwidgets lattice png raster viridisLite]; };
   plan = derive2 { name="plan"; version="0.4-3"; sha256="0j3mvcy97r7adcs7q6z0w9ng74jcfwii1xp8kcl2cwbzs2fd425r"; depends=[]; };
   planar = derive2 { name="planar"; version="1.6"; sha256="0x5xdb2afpc1w8s217hy765mz938kg5b5j7vzqzhlsh2dzdjccpj"; depends=[cubature dielectric ggplot2 plyr Rcpp RcppArmadillo reshape2 statmod]; };
+  planets = derive2 { name="planets"; version="0.1.0"; sha256="01zh7lgaykr9p186yy0vksn2pmc69b3xxh78w7z6wclvqjb7zh1p"; depends=[]; };
   planor = derive2 { name="planor"; version="1.5-1"; sha256="06xkn12v7ld5fxqjvpmx01jb0a87hnzs8d2clia67sk2h33nlnka"; depends=[bit64 conf_design Rcpp RcppArmadillo]; };
   plantecophys = derive2 { name="plantecophys"; version="1.4-4"; sha256="005js9r7xg4jf2aqgsqddkkxhcdnhsiyzc1cqa7j59r4g5xbmh1j"; depends=[]; };
   plaqr = derive2 { name="plaqr"; version="2.0"; sha256="15pdb57123m3cahvcsyrrvxjwxvs2f389yxip91gjxn68jf6cx1l"; depends=[quantreg]; };
@@ -11154,15 +11386,15 @@ in with self; {
   plgp = derive2 { name="plgp"; version="1.1-7"; sha256="02g6saabrsd8pra0szbwcbilf6w5ywg2gxqb5zdvbxds2vw36hn0"; depends=[mvtnorm tgp]; };
   pliable = derive2 { name="pliable"; version="1.1"; sha256="0z1hm4k0q3dgwgd1dy6wl0ydsqzygmn85m6yimffzqvnlmrq3vjg"; depends=[class glmnet]; };
   plink = derive2 { name="plink"; version="1.5-1"; sha256="0rn2i9i8af9aq0xgxhpcdchs2952lq2d2sg8x3js0zi3vcml76k0"; depends=[lattice MASS statmod]; };
-  plinkQC = derive2 { name="plinkQC"; version="0.2.2"; sha256="16kjzfp1prqhai16kvh5sp7wqk54pidydkwn717q6dij1sh0jlaf"; depends=[cowplot data_table dplyr ggforce ggplot2 ggrepel optparse R_utils sys UpSetR]; };
-  plm = derive2 { name="plm"; version="2.1-0"; sha256="0dw6nmjc8acmlbpwvsjdwbf3cxgrjf5sli92rbd3j6snxnsg4qps"; depends=[bdsmatrix Formula lattice lmtest MASS maxLik nlme Rdpack sandwich zoo]; };
+  plinkQC = derive2 { name="plinkQC"; version="0.2.3"; sha256="1xjwa5zc69m4p9x4vx0fi5xi8zhwv1a5b4l3b1z3l3vw800ngjjq"; depends=[cowplot data_table dplyr ggforce ggplot2 ggrepel igraph optparse R_utils sys UpSetR]; };
+  plm = derive2 { name="plm"; version="2.2-0"; sha256="0sn8a3f5xaa1c98br454c6h5jfba7s3jscl61km1gm47qcr8a0vz"; depends=[bdsmatrix Formula lattice lmtest MASS maxLik nlme Rdpack sandwich zoo]; };
   plmm = derive2 { name="plmm"; version="0.1-1"; sha256="1dfxd1mqqjy2mf7qc6mh4wx5ya9q8fkqgrf01apisb66xxx5zya7"; depends=[Formula nlme sm]; };
   pln = derive2 { name="pln"; version="0.2-1"; sha256="09zg7zwmmqpjr1j59lqsjf4blrkya9wfwddgzfm9rr5jxrzvqcv8"; depends=[]; };
   plogr = derive2 { name="plogr"; version="0.2.0"; sha256="0a8dhzlna79ggyhfr0nncgh15a9n6r0dsz664pz0ah323wpblqqf"; depends=[]; };
   plot_matrix = derive2 { name="plot.matrix"; version="1.2"; sha256="1d2vhqqnkr113z3rw7vcr5m8izjzz0hn2rggbr5rf23kjdbyrzjj"; depends=[]; };
   plot3D = derive2 { name="plot3D"; version="1.1.1"; sha256="0chn70fqwyca8lbnjnpbcj08ni0dfbax2gjmzhk2c4w72c04mzpn"; depends=[misc3d]; };
   plot3Drgl = derive2 { name="plot3Drgl"; version="1.0.1"; sha256="12p4qc9vmhr86ssx6xnz3cmx84q5jgd28bw9dp4wjrn04n6l4va6"; depends=[plot3D rgl]; };
-  plot3logit = derive2 { name="plot3logit"; version="1.0.1"; sha256="14abmxx2fgngximvgrrj8pjy4nyvliydhkp1h7p9xicdfj74pwl5"; depends=[ggplot2 ggtern magrittr reshape2 Ternary]; };
+  plot3logit = derive2 { name="plot3logit"; version="1.0.2"; sha256="0pgqlq8rpkrv277d1mfy2z22mkykc5zmhvkg07wsz3hdxr0ifx80"; depends=[ellipse ggplot2 ggtern magrittr reshape2 Ternary]; };
   plotGMM = derive2 { name="plotGMM"; version="0.2.1"; sha256="1gp99gvb886kcwjk9yvfd7s6mgy3jf3x0zhpaj9zp0fky12ivz7b"; depends=[amerika ggplot2 wesanderson]; };
   plotGoogleMaps = derive2 { name="plotGoogleMaps"; version="2.2"; sha256="0qv57k46ncg0wrgma0sbr3xf0j9j8cii3ppk3gs65ardghs3bf6b"; depends=[lattice maptools raster rgdal sp spacetime]; };
   plotKML = derive2 { name="plotKML"; version="0.5-9"; sha256="08pbpa3j4m4vngl902z7hr1p7yjimhxmajx7lw45p226x654x6xr"; depends=[aqp classInt colorRamps colorspace dismo gstat pixmap plotrix plyr raster RColorBrewer rgdal RSAGA scales sp spacetime stringr XML zoo]; };
@@ -11183,7 +11415,7 @@ in with self; {
   plotrr = derive2 { name="plotrr"; version="1.0.0"; sha256="07ilqpa3ypqb2gpnq23r9v4kkfxz06mcak9si9adr9sf6c7gqwxz"; depends=[dplyr ggplot2]; };
   plotscale = derive2 { name="plotscale"; version="0.1.6"; sha256="0h2g0rv1lh70nqmqydgg5swwnwmy08wbjajxyb1c2a716rad765j"; depends=[]; };
   plotwidgets = derive2 { name="plotwidgets"; version="0.4"; sha256="1w7c9grw4pyyra230196yq32snr4wdg6xi8vh4dx5df2v500wz22"; depends=[]; };
-  pls = derive2 { name="pls"; version="2.7-1"; sha256="0jw3zl5z06023zxr74phnvwax8m3i4a4i6lsqiq6j15aq9zq3zgq"; depends=[]; };
+  pls = derive2 { name="pls"; version="2.7-2"; sha256="121byimd6bg7jbrq5wz5fpi0vxq0vh8g724vkhnjzszbvcv1xsb7"; depends=[]; };
   plsRbeta = derive2 { name="plsRbeta"; version="0.2.5"; sha256="1p6vj9sw3hm6nax3vahmr6z58bgc8wl787949dszckn03pxhgvpb"; depends=[betareg boot Formula MASS mvtnorm plsRglm]; };
   plsRcox = derive2 { name="plsRcox"; version="1.7.4"; sha256="1cpbhz85c8zpxcwi7ads981dynf83r5ka2zqy6i2swbi83jb5p4x"; depends=[kernlab lars mixOmics pls plsRglm risksetROC rms survAUC survcomp survival]; };
   plsRglm = derive2 { name="plsRglm"; version="1.2.5"; sha256="004x934c34rgggwb25pcfm3vlj6gc1nfnigjxnxycxjqlx8g567b"; depends=[bipartite boot car MASS mvtnorm]; };
@@ -11207,9 +11439,10 @@ in with self; {
   pmc = derive2 { name="pmc"; version="1.0.3"; sha256="06bsab09i9ydgsjx5i50kdb22ldp4g1v83a01kz3mswybi4lv9w2"; depends=[dplyr geiger ggplot2 ouch tidyr]; };
   pmcgd = derive2 { name="pmcgd"; version="1.1"; sha256="1pybzvyjmzpcnxrjsas06diy3x83i1r5491s6ccyr63l56hs55d5"; depends=[mixture mnormt]; };
   pmclust = derive2 { name="pmclust"; version="0.2-0"; sha256="1bpfix76ylmn5ds6y0v40mfad7znaa6dj5ngr4mzv96yy6mg13ns"; depends=[MASS pbdBASE pbdDMAT pbdMPI]; };
-  pmd = derive2 { name="pmd"; version="0.1.1"; sha256="07s5b2izsqzryrcasdpa9z7cva03afl2zkb7cpxqgs4bjrd6vprw"; depends=[RColorBrewer rmarkdown shiny]; };
+  pmd = derive2 { name="pmd"; version="0.1.5"; sha256="18a7j5lvsl2jsay4g7790slj12xkljlnrpvg66cq5cvsid8qm8x8"; depends=[rcdk RColorBrewer rmarkdown shiny]; };
+  pmdplyr = derive2 { name="pmdplyr"; version="0.3.0"; sha256="1gyd55h718zf3crhgkdln48jw7y7djgsdjf4j06zr3rgy5mk2sp3"; depends=[dplyr lubridate magrittr pillar rlang tibble tidyr tidyselect vctrs]; };
   pmhtutorial = derive2 { name="pmhtutorial"; version="1.5"; sha256="1hcw8hwpsivbhz86lnzy08q9n8vahnq8f7rmi4xkmg6b44582cqx"; depends=[mvtnorm Quandl]; };
-  pmml = derive2 { name="pmml"; version="2.0.0"; sha256="0w2324v4rlmxa9gnlvrz8r17ih70ln51ad3fyhd2x21j9m75ygyd"; depends=[stringr XML]; };
+  pmml = derive2 { name="pmml"; version="2.1.0"; sha256="0vcfwc4gwc2cgf1v2008wf3mkbw77vq5dqziw13ivir49qnzjf2g"; depends=[stringr XML]; };
   pmmlTransformations = derive2 { name="pmmlTransformations"; version="1.3.3"; sha256="0315kb5x04pidpzr04yaxyynp0mz4ilzp7vkspq4agjkds5hyc88"; depends=[]; };
   pmpp = derive2 { name="pmpp"; version="0.1.0"; sha256="1vmv7aav0rvp7kd5f16ym422ygw1wpnwrhmmp2w1c2fl8i263zh9"; depends=[data_table dplyr ggplot2 magrittr MASS Matrix minqa moments plm pracma]; };
   pmr = derive2 { name="pmr"; version="1.2.5"; sha256="0dq97dfjmgxlhr3a2n20vyyzfmamcicw878hdxpw31lw02xs6yls"; depends=[]; };
@@ -11225,14 +11458,14 @@ in with self; {
   poibin = derive2 { name="poibin"; version="1.3"; sha256="0lkqxpk5f27ghjia2akzi1c51hk9p9qkw8vysa0qwkbsgasq86p3"; depends=[]; };
   poilog = derive2 { name="poilog"; version="0.4"; sha256="0bg03rd5rn4rbdpiv87i8lamhs5m7n7cj8qf48wpnirg6jpdxggs"; depends=[]; };
   pointRes = derive2 { name="pointRes"; version="1.1.3"; sha256="0yfzidc93ghpf116lxbx4fr0d71wl79y3nz6mkirx4pli6gb8x8d"; depends=[ggplot2 gridExtra plyr TripleR]; };
-  pointblank = derive2 { name="pointblank"; version="0.2.0"; sha256="102ra763wwz0445wlvsr975ynrf4ywgggjw8hvwrqkjcvrk4rq8x"; depends=[commonmark DBI dplyr glue httr magrittr purrr readr rlang rmarkdown RMySQL RPostgreSQL stringr tibble tidyr]; };
+  pointblank = derive2 { name="pointblank"; version="0.2.1"; sha256="01rg3fpnvrrp1cvg472fnk1q872ncalsrig4jipnpyzkgi2y4xcq"; depends=[commonmark DBI dplyr glue htmltools httr lubridate magrittr messaging purrr readr rlang rmarkdown RMySQL RPostgreSQL stringr tibble]; };
   pointdensityP = derive2 { name="pointdensityP"; version="0.3.4"; sha256="0vv8j1yz8n2vmmp6bg2i8w3dchdbybsdxn3sk5d1ync2knih8l2s"; depends=[data_table]; };
   pointdexter = derive2 { name="pointdexter"; version="0.1.1"; sha256="058iv9pk3byyvddbkm8g1vc7kmrkbwglbw0v2ns6w066fwiysv70"; depends=[sp splancs]; };
   poio = derive2 { name="poio"; version="0.0-3"; sha256="1smbnqjlicaqq2hswl910yiirzb9zikbk4pqxm9pwpixywj0nkys"; depends=[assertive_base assertive_files assertive_properties assertive_sets assertive_strings assertive_types devtools digest dplyr magrittr R6 stringi tibble whoami]; };
   poisDoubleSamp = derive2 { name="poisDoubleSamp"; version="1.1"; sha256="13wyj9jf161218y4zjv2haavlmanihp9l59cvh7x8pfr9dh2dwr8"; depends=[Rcpp]; };
   poisFErobust = derive2 { name="poisFErobust"; version="1.0.1"; sha256="0qgwl5gb2rw043zb0h1rrv038ymsd72r8h9gqdr2xkfbi3mnr24r"; depends=[data_table glmmML]; };
   poisbinom = derive2 { name="poisbinom"; version="1.0.1"; sha256="0mjxg0s3nck7qrmq4bbrhwxfwr6fqml54s9k8q1mkfzlifa7qyf7"; depends=[Rcpp]; };
-  poismf = derive2 { name="poismf"; version="0.1.1"; sha256="0pwf8wazqmg7lw36ypzzx4ygv4by1kbl0614i5g180qpzmw2jg1j"; depends=[Matrix nonneg_cg Rcpp SparseM]; };
+  poismf = derive2 { name="poismf"; version="0.1.3"; sha256="19jznsz59ch3ksgxii9j7lzaqlpc0wlvxx59ax60w76w2c9m0ify"; depends=[Matrix nonneg_cg Rcpp SparseM]; };
   poisson = derive2 { name="poisson"; version="1.0"; sha256="1diyf1b84sr6iai3ghd3kcp6fc6w7fan49wzs1lzvxxsmp15ag2d"; depends=[]; };
   poisson_glm_mix = derive2 { name="poisson.glm.mix"; version="1.2"; sha256="0328m279jfa1fasi9ha304k4wcybzr7hldww7wn0cl7anfxykbv8"; depends=[]; };
   poissonMT = derive2 { name="poissonMT"; version="0.3-5"; sha256="14qkc8qz3423b13gp6gsp8cbb1nv9wwjjfa4i9zc15qy5i99ha26"; depends=[checkmate MASS robcbi robustbase]; };
@@ -11240,7 +11473,7 @@ in with self; {
   poker = derive2 { name="poker"; version="0.8.8"; sha256="14ik77440z22k4kwq0p1fn7adzi0p8mh8j8hd7ayinvrab4b5r85"; depends=[]; };
   polidata = derive2 { name="polidata"; version="0.1.0.1"; sha256="0mfjcjhv2prc2xdg9672z1cjxd2wp541hb7lz497cqlig2p6qgb4"; depends=[jsonlite RCurl]; };
   poliscidata = derive2 { name="poliscidata"; version="2.2.3"; sha256="18mmdzf9hrfz36rh1rg1j5q1m131xadppy272y4f4yay0ljafbm2"; depends=[abind car descr ENmisc gplots Hmisc plotrix plyr survey weights xtable]; };
-  politeness = derive2 { name="politeness"; version="0.3.2"; sha256="0c0ag3g8kwiy835mfc0nacxybk1lc210k26ngc546qzi9kpljx34"; depends=[data_table ggplot2 glmnet quanteda spacyr stringr textir tm]; };
+  politeness = derive2 { name="politeness"; version="0.3.3"; sha256="1v9xm67lgn3bj4cf9x996ymb21l7l15jfarikbs1zf1vxb7qpq21"; depends=[data_table ggplot2 glmnet quanteda spacyr stringr textir tm]; };
   politicaldata = derive2 { name="politicaldata"; version="0.1.3"; sha256="1n25k53mmlmmg9p9a36jh4z6xhl1yyv9v1c56mav873105h359wi"; depends=[]; };
   pollen = derive2 { name="pollen"; version="0.71.0"; sha256="0g0g6n8y87jyk7l4s6xpdk60dz4lkg2xp5c5agakkrah8a233920"; depends=[dplyr lubridate purrr]; };
   pollimetry = derive2 { name="pollimetry"; version="1.0.1"; sha256="09zmcwlgzl4fnkdg2m424ibv3izzrm595c7pi4mc3bd1g8sa2ypn"; depends=[brms repmis]; };
@@ -11255,7 +11488,7 @@ in with self; {
   polyaAeppli = derive2 { name="polyaAeppli"; version="2.0"; sha256="0kyz3ap92xz7aqyviyrpggfmicy1gybrx7y19djsmixcwz53zqch"; depends=[]; };
   polyapost = derive2 { name="polyapost"; version="1.5"; sha256="0r2h51l2y0sj0xahdzfy1lyq4kh166crh2j02sk85q577q9d883y"; depends=[boot rcdd]; };
   polyclip = derive2 { name="polyclip"; version="1.10-0"; sha256="0jyk4maqiblvj095jd59dr76kbniyli3v3xvy0a72ljszq6vrnkl"; depends=[]; };
-  polycor = derive2 { name="polycor"; version="0.7-9"; sha256="0d0756faksviic5jrc47fg6l3wsm9r2wlbnxiw08563rv7shbvb7"; depends=[Matrix mvtnorm]; };
+  polycor = derive2 { name="polycor"; version="0.7-10"; sha256="0wzwzklflbhi8sv9m7ijwr16v9zmkk0j0v4pbcpf32f8lbn3psna"; depends=[Matrix mvtnorm]; };
   polyfreqs = derive2 { name="polyfreqs"; version="1.0.2"; sha256="13859vbpys5yj1qiapyzv9wlvi6x6k0rm335bsi1v07ch3x2bh3b"; depends=[Rcpp]; };
   polyglot = derive2 { name="polyglot"; version="0.2.1"; sha256="1w52vhix5pynx2gz9f71yi9x5cdkp4sbs98zz2d5z993qbbf1wyq"; depends=[magick]; };
   polylabelr = derive2 { name="polylabelr"; version="0.1.0"; sha256="1bki35p6a8bgmdwll9sczdicdkvmxcl55vbx5xiabkz58imvcmym"; depends=[Rcpp]; };
@@ -11267,20 +11500,20 @@ in with self; {
   polywog = derive2 { name="polywog"; version="0.4-1"; sha256="02qk1cyvkd77mwlvhj1zzzi0bmy7qxz29j2v730wp7rz4w7h5x5n"; depends=[foreach Formula glmnet iterators Matrix miscTools ncvreg Rcpp stringr]; };
   pom = derive2 { name="pom"; version="1.1"; sha256="02jv19apn0kmp1ric2cxajlaad2fmsz4nm4izd2c3691vzas7l83"; depends=[matrixcalc]; };
   pomdp = derive2 { name="pomdp"; version="0.9.1-1"; sha256="16vbriv5ssb75qcp6c6gaz796wryf5b4d09vc9i3dd37gdf09d4s"; depends=[igraph]; };
-  pomp = derive2 { name="pomp"; version="2.2"; sha256="1314d7878535a9wvrpx86my9v6n66cmyag35p7a3v2v6ii4wyky9"; depends=[coda deSolve digest magrittr mvtnorm plyr reshape2]; };
+  pomp = derive2 { name="pomp"; version="2.3"; sha256="0zkb6h2i34p2y4vhhrfwhqcdw0jqps7yafgry7wlpczdfjjdnqh2"; depends=[coda deSolve digest magrittr mvtnorm plyr reshape2]; };
   pompom = derive2 { name="pompom"; version="0.2.0"; sha256="1alz3lrj7m16vhymsvvrcmf0kmgx88q2f3v4j6wiciqv77bnyai1"; depends=[ggplot2 lavaan qgraph reshape2]; };
   pooh = derive2 { name="pooh"; version="0.3-2"; sha256="0qwa5j91aypasvsf4xcfbl6lz7llawdr38jiflzmfak2ad72rv7j"; depends=[]; };
-  pool = derive2 { name="pool"; version="0.1.4.2"; sha256="19xspgzvhj9kzdk4pmsh8qd0lz3ly5qvxyp49l8qbgwrnj4jvza6"; depends=[DBI dbplyr dplyr later R6]; };
+  pool = derive2 { name="pool"; version="0.1.4.3"; sha256="065pbvhgvvgv00df4kj4zn7mlbrv2iqa1583k0hlgavn15gfm6d2"; depends=[DBI dbplyr dplyr later R6]; };
   poolVIM = derive2 { name="poolVIM"; version="1.0.0"; sha256="19yw6pp5l3jmla4wjbvpjq132f645yks49pzsdv123f3qfr8f0m6"; depends=[EmpiricalBrownsMethod Hmisc ranger]; };
   poolfstat = derive2 { name="poolfstat"; version="1.1.0"; sha256="126rlvjnssh7s0r637in75wzjyv9f1pb35ivfinib5paw2nx1sy5"; depends=[doParallel foreach]; };
   pooling = derive2 { name="pooling"; version="1.1.1"; sha256="0011w80pxz01scj2sa69m1bcfq797hq3ihpw46fdlxsxavz8prwy"; depends=[cubature dplyr dvmisc ggplot2 ggrepel mvtnorm pracma]; };
   pop = derive2 { name="pop"; version="0.1"; sha256="0hbxdrkasb69x7ipddvyrzl5vvc7dd6rzj1vy7v3chg3rzgq89cj"; depends=[igraph MASS]; };
   pop_wolf = derive2 { name="pop.wolf"; version="0.1"; sha256="19n00xv47v9j7slvm2ykzlksjfwjzimf88b3nk0y0192c29sdc9x"; depends=[abind]; };
-  popEpi = derive2 { name="popEpi"; version="0.4.7"; sha256="0215r779141b8a2wnbxgsapn13k4p5cx1mr30c0ka7szv6bsgnqm"; depends=[data_table Epi survival]; };
+  popEpi = derive2 { name="popEpi"; version="0.4.8"; sha256="1gc7kyik0209pc8mvl6c69lzb3dnkif0mby4l4pq8zfdz73lmi06"; depends=[data_table Epi survival]; };
   popKorn = derive2 { name="popKorn"; version="0.3-0"; sha256="1zcl6ms7ghbcjyjgfg35h37ma8nspg15rk2ik82yalqlzxjf7kxw"; depends=[boot]; };
   popRange = derive2 { name="popRange"; version="1.1.3"; sha256="0kkz6va0p8zv3skaqqcpw42014d9x9x4ilx0czz91qf46h61jgb0"; depends=[findpython]; };
   popReconstruct = derive2 { name="popReconstruct"; version="1.0-5"; sha256="0fvrjb3b3bahi5da0ikzv164p49zvgm43mskqd7p9dgadbg1xpi2"; depends=[coda]; };
-  popbio = derive2 { name="popbio"; version="2.4.4"; sha256="165rs8w9h71qip3aw47wq48xnzv8zg8ixm7r6qqmkg3knw095hwh"; depends=[]; };
+  popbio = derive2 { name="popbio"; version="2.6"; sha256="1j8q4rdq8b9r56p0slwkfsknv6linjnmcprrzbck9yr99zfqp067"; depends=[]; };
   popdemo = derive2 { name="popdemo"; version="1.3-0"; sha256="0760ajqaq822m0j092gdqzhgw1mk413k09mmmwyzb0jzj6bd15q3"; depends=[expm MCMCpack]; };
   popkin = derive2 { name="popkin"; version="1.2.2"; sha256="1dc1p791v20zq6wxc3n45g6bqpvjvhy9pn4s5v1y6sw69myxlhj3"; depends=[RColorBrewer Rcpp RcppEigen]; };
   poplite = derive2 { name="poplite"; version="0.99.23"; sha256="0kf5k4iz4cvzd3avq753jn1gkpnhzi9m4148lq7rgv7h433qydwn"; depends=[DBI dbplyr dplyr igraph lazyeval RSQLite]; };
@@ -11294,14 +11527,15 @@ in with self; {
   portes = derive2 { name="portes"; version="3.0"; sha256="144fipskh6yb6xcz3m5bgh2kwjwa58zaw24y88hzzrdvh9glvyrc"; depends=[forecast]; };
   portfolio = derive2 { name="portfolio"; version="0.4-7"; sha256="0gs1a4qh68xsvl7yi6mz67lamwlqyqjbljpyax795piv46kkm06p"; depends=[lattice nlme]; };
   portfolio_optimization = derive2 { name="portfolio.optimization"; version="1.0-0"; sha256="1rdhwffsjc1pa1qq7rqy6dwk8yrcblkmijz94p2w7sf2v4jmwxxr"; depends=[magrittr MASS modopt_matlab xts]; };
-  portfolioBacktest = derive2 { name="portfolioBacktest"; version="0.1.1"; sha256="1g1iwla5ldan94vs4dhpggfj9q9hgs9nxjimrcnjg2i3x7cj1kmg"; depends=[doSNOW evaluate foreach PerformanceAnalytics quantmod R_utils snow xts zoo]; };
+  portfolioBacktest = derive2 { name="portfolioBacktest"; version="0.2.0"; sha256="0y905km1kj8v2nvs88f4kl7w9bmhhs7qx9ain3mwm1i488viz65g"; depends=[digest doSNOW evaluate foreach ggplot2 PerformanceAnalytics quantmod R_utils snow xts zoo]; };
   portfolioSim = derive2 { name="portfolioSim"; version="0.2-7"; sha256="1vf46882ys06ia6gfiibxx1b1g81xrg0zzman9hvsj4iky3pwbar"; depends=[lattice portfolio]; };
   portsort = derive2 { name="portsort"; version="0.1.0"; sha256="0swl39dn7lzwvps18bva4l64a441gkf6lbwcwrhlf93f1ardvxji"; depends=[xts zoo]; };
-  postGIStools = derive2 { name="postGIStools"; version="0.2.3"; sha256="1ig404p1ym4v1cw0a7jk2zjy9vdpg1y39mckkn8mpic29w9ra4b1"; depends=[DBI jsonlite rgdal rgeos RPostgreSQL sp stringr]; };
+  postGIStools = derive2 { name="postGIStools"; version="0.2.4"; sha256="04d6iqnk7j2lgv1h5c94j6y89jk75pmv26sxa51s5iwkjq7rchym"; depends=[DBI jsonlite rgdal rgeos RPostgreSQL sp stringr]; };
   postinfectious = derive2 { name="postinfectious"; version="0.1.0"; sha256="1v327zxxiwc1cdksk6s39lkkgck5dxg169pp3jiqmm7xs35dcl6y"; depends=[]; };
   postlightmercury = derive2 { name="postlightmercury"; version="1.2"; sha256="1345ckp50jplcdqp3a250c6mhapqh9322jzpxj5dyqmbg2nmgp9i"; depends=[crul jsonlite purrr rvest tibble xml2]; };
   postlogic = derive2 { name="postlogic"; version="0.1.0"; sha256="1m4z92y9kjjgz5xh0x74i1sgsybm8gv36l25fbbcwlg1jazwgrwn"; depends=[]; };
   potts = derive2 { name="potts"; version="0.5-8"; sha256="0j3c7sh50r1lqd8gl0rq7pq8j9v33wcz46gv7lm0n7y89qj6f45x"; depends=[]; };
+  povcalnetR = derive2 { name="povcalnetR"; version="0.1.0"; sha256="11hwb52lrvdxplsx85ps54k2k7cvr0k4g5s2cj2a5l3rlqbyayx8"; depends=[dplyr ggplot2 ggthemes httr js jsonlite memoise naniar purrr readr stringr tibble tidyr]; };
   powdR = derive2 { name="powdR"; version="1.0.0"; sha256="1pc9s7kh19ri9p7fwz3g8binab8nlcypzgmg56gn0qwpgnjvzdx1"; depends=[baseline ggplot2 ggpubr memisc nnls plotly reshape shiny shinyWidgets tidyr]; };
   powdist = derive2 { name="powdist"; version="0.1.4"; sha256="1my88ag5q9hwkn2wy79jl9008gpvg0bsrnyc81gkdfi7pjh2mp1z"; depends=[gamlss_dist normalp rmutil]; };
   poweRlaw = derive2 { name="poweRlaw"; version="0.70.2"; sha256="1asr6ikr7hmj78jyg8r1gwvcjg14addkxdiz92nh06lv71a183r4"; depends=[VGAM]; };
@@ -11320,7 +11554,7 @@ in with self; {
   ppclust = derive2 { name="ppclust"; version="0.1.3"; sha256="1480fcjzz1vfmz3sgcdrpfilqklmb1f0h4vna6xkfib5xh624lxb"; depends=[inaparc MASS]; };
   ppcor = derive2 { name="ppcor"; version="1.1"; sha256="1x9b2kb8s0bp92b17gby0jwzzr3i4cf3ap9c4nq7m8fav72g0y3a"; depends=[MASS]; };
   ppgmmga = derive2 { name="ppgmmga"; version="1.2"; sha256="1dq0p3xna5r1kiyhiziz3wc78dfqh362qhna5hmkjzhljawr9jg0"; depends=[cli crayon GA ggplot2 ggthemes mclust Rcpp RcppArmadillo]; };
-  ppitables = derive2 { name="ppitables"; version="0.5.0"; sha256="0k4ql8za6kdplz7fq4cas2rz8vad5ssbiyv95iaqwzgslwnr7m3m"; depends=[tibble tidyr]; };
+  ppitables = derive2 { name="ppitables"; version="0.5.1"; sha256="1gc0hh2g1wmqk49cmswq9drxw8h94xpriibs76n287nmvrg6ip7d"; depends=[tibble tidyr]; };
   ppls = derive2 { name="ppls"; version="1.6-1.1"; sha256="1zyrisy3c4cz896j1bjh61sf57wdl9p8ywdq268cl819szfq78mx"; depends=[MASS]; };
   ppmlasso = derive2 { name="ppmlasso"; version="1.1"; sha256="1w13p1wjl1csds1xfc79m44rlym9id9gwnp3q0bzw05f35zbfryg"; depends=[spatstat]; };
   pps = derive2 { name="pps"; version="0.94"; sha256="0sirxpagqc2ghc01zc6q4dk691six9wkgknfbwaqxbxvda3hcmyq"; depends=[]; };
@@ -11333,7 +11567,7 @@ in with self; {
   prais = derive2 { name="prais"; version="1.1.1"; sha256="027qsa1nc680bcs61dlyz0wwap5pgxdfzasg9ny37a55hnikxid5"; depends=[lmtest sandwich]; };
   praise = derive2 { name="praise"; version="1.0.0"; sha256="1gfyypnvmih97p2r0php9qa39grzqpsdbq5g0fdsbpq5zms5w0sw"; depends=[]; };
   praktikum = derive2 { name="praktikum"; version="0.1"; sha256="0kkydgglvqw371fxh46fi86fmdndhwq1n8qj0ynbh2gz1cn86aw1"; depends=[]; };
-  praznik = derive2 { name="praznik"; version="6.0.0"; sha256="170cwkjfbmnc3ph8brhf1ii3x2z711v6c7bxg9ingv46i2a9ibl6"; depends=[]; };
+  praznik = derive2 { name="praznik"; version="7.0.0"; sha256="0v0z8d2cxisfqci9kr19z8q15pckzmh8z5n753b8kahg2xn0zhj4"; depends=[]; };
   prc = derive2 { name="prc"; version="2019.1-23"; sha256="1aw02sj7kkzzkrxs1jpm2skfz2jrd7fyqlfc1mvkqwac39c6a9ma"; depends=[kyotil nlme]; };
   prcbench = derive2 { name="prcbench"; version="0.8"; sha256="0bidf7268c130xj4c2pxljgkrppvjg8bmivj9zq0cm9nwhm0fdf5"; depends=[assertthat ggplot2 gridExtra memoise precrec PRROC R6 rJava ROCR]; };
   prclust = derive2 { name="prclust"; version="1.3"; sha256="0p0sf8248aigs99py8mpzz743jnrf7n1nv5shag15arxz9yx7zn3"; depends=[Rcpp]; };
@@ -11342,7 +11576,7 @@ in with self; {
   preText = derive2 { name="preText"; version="0.6.2"; sha256="0pcnqssv542cfajzrqfsbq0jf628nnmcb3nryvd7d5wk4wdkji4q"; depends=[cowplot ecodist ggplot2 proxy quanteda reshape2 topicmodels vegan]; };
   precintcon = derive2 { name="precintcon"; version="2.3.0"; sha256="1sf0mfqa77aqhbx3hg8pv582ibmfnv6vigqcd3xqsbq7nigy2ms9"; depends=[ggplot2 scales]; };
   precrec = derive2 { name="precrec"; version="0.10.1"; sha256="008vcnbg0rl9x70ly1xzz1xn4fs7mjhnp2c0a7jxzwiri5gymh09"; depends=[assertthat data_table ggplot2 gridExtra Rcpp]; };
-  predict3d = derive2 { name="predict3d"; version="0.1.0"; sha256="0jas5vizl5hn04kkqdd4kr54kk91gywri9jk2j5zxzq16js6292i"; depends=[dplyr ggiraphExtra ggplot2 magrittr modelr plyr prediction purrr reshape2 rgl rlang stringr TH_data tidyr]; };
+  predict3d = derive2 { name="predict3d"; version="0.1.3.3"; sha256="1kb3jacpgzln1ddnkfzhvfpzzf9wig60lppca6iy0fvq5cm8ddr4"; depends=[dplyr ggiraphExtra ggplot2 magrittr modelr moonBook plyr prediction purrr reshape2 rgl rlang stringr TH_data tidyr]; };
   prediction = derive2 { name="prediction"; version="0.3.14"; sha256="0awlq5lxfia6m2b91w73rksp93rbwv5gwqb36wbji4rgq41rzbrx"; depends=[data_table]; };
   predictionInterval = derive2 { name="predictionInterval"; version="1.0.0"; sha256="029hc57cblfcbqckrghf95l2rkn7acgb4yr36da01bx8bmpww0bn"; depends=[ggplot2 MASS MBESS pbapply]; };
   predictmeans = derive2 { name="predictmeans"; version="1.0.1"; sha256="06zspg1v0x1qqaah7xj5jdaqjv7asnzmgybyyzx3j26v4h59p350"; depends=[ggplot2 lme4 Matrix nlme numDeriv pbkrtest plyr]; };
@@ -11375,17 +11609,17 @@ in with self; {
   prevederer = derive2 { name="prevederer"; version="0.0.1"; sha256="0vkx9nrlgp36xbl95lrb5sb5yivxlcw4yvbs8hgbm31kh0vbz32f"; depends=[httr]; };
   prevtoinc = derive2 { name="prevtoinc"; version="0.12.0"; sha256="0ypdxcx9gh87a7ih3cw3yai47rzv41qwh4kpk6007ai8jkjv4n9w"; depends=[dplyr purrr rlang tibble]; };
   priceR = derive2 { name="priceR"; version="0.1.0"; sha256="09jlf8c1lfiqmpm2vdgkacsracwcjgi6xgvlakny2c4iyir45sh5"; depends=[dplyr gsubfn stringr]; };
-  pricesensitivitymeter = derive2 { name="pricesensitivitymeter"; version="1.0.1"; sha256="0sgpnfx4qs7xzcwnlwjkwrqj39w5b4h8133ma527z845nkfixncl"; depends=[survey]; };
+  pricesensitivitymeter = derive2 { name="pricesensitivitymeter"; version="1.1.1"; sha256="0zlvrzrqndnrwawwzqwpj7c7r86mb80njhv7dcm8l5qygnc4xz3b"; depends=[survey]; };
   prim = derive2 { name="prim"; version="1.0.16"; sha256="0i5jpk798qbvyv9adgjbzpg4dvf7x51bcgbdp38fzdnam6g88y5a"; depends=[misc3d rgl]; };
   primePCA = derive2 { name="primePCA"; version="1.0"; sha256="0kpyqv3l58xcyd98a7c7ggsna30j6k62aliidlyxgv2ya0g0dshv"; depends=[MASS Matrix softImpute]; };
   primefactr = derive2 { name="primefactr"; version="0.1.1"; sha256="11hi75jwjxrl9p5m8yjwjb20pc9y9vkhi8sjrnisdq2hm53m483w"; depends=[]; };
-  primer = derive2 { name="primer"; version="1.0"; sha256="0vkq794a9qmz9klgzz7xz35msnmhdaq3f91lcix762wlchz6v7sg"; depends=[deSolve lattice]; };
   primerTree = derive2 { name="primerTree"; version="1.0.4"; sha256="15am88swc9h8igjnjqr4jg105i91lsl28nncqly03cgy4vm814kk"; depends=[ape directlabels foreach ggplot2 gridExtra httr lubridate plyr reshape2 scales stringr XML]; };
   primes = derive2 { name="primes"; version="0.1.0"; sha256="0hhkgpkadvai9xcivfalsvr5w0irsxygyz3p2zngwl3g5rvvh5g9"; depends=[Rcpp]; };
   princurve = derive2 { name="princurve"; version="2.1.4"; sha256="1b3grra328wkfsmqkkwp3lwdzhbdiwyq380qi5pl9r2jc6arnppj"; depends=[Rcpp]; };
   prinsimp = derive2 { name="prinsimp"; version="0.8-8"; sha256="074a27ml0x0m23hlznv6qz6wvfqkv08qxh3v1sbkl9nxrc7ak4vn"; depends=[]; };
   printr = derive2 { name="printr"; version="0.1"; sha256="13yqqcwfqnbhvcxwrr6j45qhnbxng3qwn2ygkr809gibg9grw471"; depends=[knitr]; };
-  prioritizr = derive2 { name="prioritizr"; version="4.1.1"; sha256="162hwgypjd0j5sfclbg8kp0f5acyj3pd4d4c6f7w7qksb85zy4jh"; depends=[ape assertthat BH data_table doParallel igraph magrittr Matrix plyr proto raster Rcpp RcppArmadillo rgeos sp tibble uuid]; };
+  prioGene = derive2 { name="prioGene"; version="0.99.0"; sha256="0ksbv1qqbq6wabykrkhiak3rmnn2x74i3j090bvwgax5a2dma5s2"; depends=[]; };
+  prioritizr = derive2 { name="prioritizr"; version="4.1.4"; sha256="1z8p9faacbi61sfxyqz0k7zlxyqc03gg9rc9f4a5zbdcnx83bhf3"; depends=[ape assertthat BH data_table doParallel igraph magrittr Matrix plyr proto raster Rcpp RcppArmadillo rgeos sp tibble uuid]; };
   prioritizrdata = derive2 { name="prioritizrdata"; version="0.2.2"; sha256="1gljrll89r2y6nb4jwcp1pyjs5qrahqawi84kgg74w2q6xq65kga"; depends=[raster sp]; };
   prioritylasso = derive2 { name="prioritylasso"; version="0.2.2"; sha256="1wdnizwq0mgjqbaxp6swf3z4wkdfig390i2d8jy86lg0q7gym5af"; depends=[glmnet survival]; };
   prism = derive2 { name="prism"; version="0.1.0"; sha256="0d2llrpw5y0svrdzbk52pjrfp76lknrw4r8ciqq0cq3l6kbynh9r"; depends=[dplyr ggplot2 httr lubridate magrittr purrr raster readr stringr]; };
@@ -11427,11 +11661,11 @@ in with self; {
   progenyClust = derive2 { name="progenyClust"; version="1.2"; sha256="0azp5pvk316s8xbawcqwqfd80fxb4xn8hc6aq87xwksc6fhwp94l"; depends=[Hmisc]; };
   prognosticROC = derive2 { name="prognosticROC"; version="0.7"; sha256="0lscsyll41hpfzihdavygdzqw9xxjp48dmy4i17qsx5h01jl1h4i"; depends=[survival]; };
   progress = derive2 { name="progress"; version="1.2.2"; sha256="0dgzb362641aqm8xd88iqa8jmpdm43xs0aba0d5kk6fvapnxi95l"; depends=[crayon hms prettyunits R6]; };
-  proj4 = derive2 { name="proj4"; version="1.0-8"; sha256="06r3lavgixrsa52d1v31laqcbw6fb9xn23akv39hvaib78diglv9"; depends=[]; };
+  proj4 = derive2 { name="proj4"; version="1.0-8.1"; sha256="0zhal76wd9k8l1hjm00sgzlxi6c2sc7l8msr9firzmsg07qai8m3"; depends=[]; };
   projections = derive2 { name="projections"; version="0.3.1"; sha256="12vskql6x04jzik72a0vx83amfj01w9f7mxn052vsv7aaljbi124"; depends=[distcrete ggplot2 incidence]; };
-  projector = derive2 { name="projector"; version="0.0.2"; sha256="15n5b2xgs0zj87pc3svlmnkjrxgkjkx941g8bs3ms90fg7nh2drc"; depends=[assertthat dbscan plotly RColorBrewer RcppAnnoy Rtsne shiny shinyjs shinythemes]; };
-  projects = derive2 { name="projects"; version="1.3.0"; sha256="1wl23xyzr772qcn94zqh5s2p97lpd1n8f94qq653c8ghz5w5zq7s"; depends=[dplyr fs magrittr purrr readr rlang rstudioapi sessioninfo stringr tibble zip]; };
-  projpred = derive2 { name="projpred"; version="1.1.2"; sha256="1df26cpk1ksfjbcl2k9h6b14n7kx6137h5i33n0vc308722yrjph"; depends=[ggplot2 loo Rcpp RcppArmadillo]; };
+  projects = derive2 { name="projects"; version="2.0.0"; sha256="0m9177ldp0d3f9k2ifrbww5snhvaql8h96shcdm46i1kjnzj4070"; depends=[dplyr fs lubridate magrittr purrr readr rlang rstudioapi sessioninfo stringr tibble zip]; };
+  projmgr = derive2 { name="projmgr"; version="0.1.0"; sha256="1iysxcl6awvp7zbm04zyq4d9659fcz3sy711jnycsxhsk8hsvmc2"; depends=[gh magrittr]; };
+  projpred = derive2 { name="projpred"; version="1.1.4"; sha256="1zlay8pj86mj68nh332ki53pz1lpdbl1k181lpmkh9dxpak0nwg0"; depends=[ggplot2 loo Rcpp RcppArmadillo]; };
   promises = derive2 { name="promises"; version="1.0.1"; sha256="0n2mlv6bvfb4yhgcml696l9vkbw21pz0smqylivr606z99rwgny2"; depends=[later magrittr R6 Rcpp rlang]; };
   promote = derive2 { name="promote"; version="1.1.1"; sha256="1cdz4xqinyzpbbgkxxd4f86n1h8zj88vp5z6w01cxd5ykyjf5411"; depends=[httr jsonlite stringr]; };
   promotionImpact = derive2 { name="promotionImpact"; version="0.1.2"; sha256="1mx745q37fqgn46y9qj3ql54r747qfab1yq8878g08cq6y696rmp"; depends=[crayon data_table dplyr ggplot2 ggpubr KernSmooth lmtest prophet Rcpp reshape2 scales stringr strucchange]; };
@@ -11444,6 +11678,7 @@ in with self; {
   propr = derive2 { name="propr"; version="4.1.6"; sha256="1zpqx0xcf0di3p8x48g8icjwisfans0b1x902mq9fcal0qyc5mi1"; depends=[fastcluster ggplot2 igraph Rcpp]; };
   prospectr = derive2 { name="prospectr"; version="0.1.3"; sha256="18lh03xg6bgzsdsl56bjd63xdp16sqgr3s326sgifkkak8ffbv7q"; depends=[foreach iterators Rcpp RcppArmadillo]; };
   protViz = derive2 { name="protViz"; version="0.4.0"; sha256="150i2q4nakz28f39kmhrchz4qsr8ax6y02512md94k8hq4hamxg1"; depends=[Rcpp]; };
+  protag = derive2 { name="protag"; version="1.0.0"; sha256="1iaw2w1d7hdvlg5vplpqc49wq08dgmm0ifvp2v0ggqb8invvdnw8"; depends=[dplyr ggplot2 RColorBrewer]; };
   proteomicdesign = derive2 { name="proteomicdesign"; version="2.0"; sha256="01s47pgwxy4xx10f3qmbfv59gbaj0qw017kpkpsn33s8w7ad63r0"; depends=[MASS]; };
   proteomics = derive2 { name="proteomics"; version="0.2"; sha256="01cd4sb79gcx8gbzl624scvjbwhgcsca1wdvvfkhsv7jfwdd2ry2"; depends=[foreach ggplot2 plyr reshape2]; };
   protiq = derive2 { name="protiq"; version="1.2"; sha256="1d5wr9w540a79i57nr0arn5xg7s6jhhy5nrgsk8r3ljidld2s2sa"; depends=[graph mvtnorm RBGL]; };
@@ -11455,9 +11690,9 @@ in with self; {
   prototest = derive2 { name="prototest"; version="1.2"; sha256="07g58hq2qdpczqhjsv6dq1bya9rs958r103n91icw5yc19bvyhi2"; depends=[glmnet intervals MASS Rcpp RcppArmadillo]; };
   protr = derive2 { name="protr"; version="1.6-2"; sha256="13vgiqkqqq1w2yj5f6i6scag0mr189zmisyvi6fgaw8g9dgxpxan"; depends=[]; };
   proustr = derive2 { name="proustr"; version="0.4.0"; sha256="1qp4v4vb1qh137qn7zi1d2g999z17kq6kpyxy9355mj8c49iy8pn"; depends=[attempt rlang SnowballC stringr tidyr tokenizers]; };
-  provParseR = derive2 { name="provParseR"; version="0.1.2"; sha256="156dd74dxh2i51fyb3axmyq39lna51j7scfzypwrjl05vm393l0n"; depends=[jsonlite]; };
-  provSummarizeR = derive2 { name="provSummarizeR"; version="1.1"; sha256="0kjqbfkvsdshvb34k1y958abp9i513zngd3q4fji1i4qrym0a6ib"; depends=[dplyr provParseR]; };
-  provViz = derive2 { name="provViz"; version="1.0.5"; sha256="11gzc9wjich7hmb47aj1fxsz39hmfq1629wag0p7l7205p0vsadl"; depends=[]; };
+  provParseR = derive2 { name="provParseR"; version="0.2"; sha256="13fb4fl395aqjcs2kyvm5z1ac5jkqn5nh2ylzig2p54h313bg0dk"; depends=[jsonlite]; };
+  provSummarizeR = derive2 { name="provSummarizeR"; version="1.2"; sha256="1vdiqw9yzbihrdqqaf6796dhvw1xh93cb9wnyh804b4xvfmj1by8"; depends=[dplyr provParseR]; };
+  provViz = derive2 { name="provViz"; version="1.0.6"; sha256="0pnrprybn48jb02888pzn2y7vi1l24fxk6063sv6aiwpncminf9n"; depends=[]; };
   provenance = derive2 { name="provenance"; version="2.3"; sha256="1nzgnjfy91r9995jhn7s96jqqlc35s4kxhqscpj9jv93ngddq3zd"; depends=[IsoplotR MASS]; };
   proxy = derive2 { name="proxy"; version="0.4-23"; sha256="17b6qfllqrhzrxqgx7dccffgybnkcria5a68ap5ly3plg04ypm4x"; depends=[]; };
   proxyC = derive2 { name="proxyC"; version="0.1.5"; sha256="159bc42x4shm6n3rh9fc8ziv3ivq0ipmpbasrh279hhn1prc8gg6"; depends=[Matrix Rcpp RcppArmadillo RcppParallel]; };
@@ -11466,7 +11701,7 @@ in with self; {
   pryr = derive2 { name="pryr"; version="0.1.4"; sha256="06vj5xl9x37kbd3l5bw7sbgfdnp37spvrjrn976rxi04clqk966k"; depends=[codetools Rcpp stringr]; };
   ps = derive2 { name="ps"; version="1.3.0"; sha256="1lcq7r0q4jb8x6k023zr2ydj2dg925bqqbkhx1phpnyjrk897498"; depends=[]; };
   psData = derive2 { name="psData"; version="0.2.2"; sha256="013hb6lk9rm2w08m5jbw90ndrcd4wyy2h125jx07c9bs60wh4mp4"; depends=[countrycode DataCombine reshape2 rio xlsx]; };
-  psSubpathway = derive2 { name="psSubpathway"; version="0.1.0"; sha256="164klphmhszcrmlxq9aj141j3ra2kc8yc94k9q59s2mzpvcnkzlm"; depends=[GSVA igraph mpmi pheatmap]; };
+  psSubpathway = derive2 { name="psSubpathway"; version="0.1.1"; sha256="1jzymhh1dy5w735fppqza7ilspsvyidkrdpq2yd3j5xfjckzfh5w"; depends=[GSVA igraph mpmi pheatmap]; };
   psbcGroup = derive2 { name="psbcGroup"; version="1.4"; sha256="0l1hmgw4sislryws8hv7r2nglhcs6g9khg0372a70djvhz2l6gfi"; depends=[LearnBayes mvtnorm SuppDists]; };
   pscl = derive2 { name="pscl"; version="1.5.2"; sha256="1phf3awsfr4ncqfqzin5m1pz0g7y1zhbcm2sz7358ssw914fd7rc"; depends=[MASS]; };
   pscore = derive2 { name="pscore"; version="0.1-2"; sha256="1sfkxs2kv8lq87j3q9ci7j38c7gzfkp2l36lwcdhiidr2nls2x0c"; depends=[ggplot2 lavaan reshape2]; };
@@ -11486,10 +11721,11 @@ in with self; {
   pspline = derive2 { name="pspline"; version="1.0-18"; sha256="1iwsw52miil1v1yl99mzl28qi8gdjr56rlasmh8faqjlpn9z477p"; depends=[]; };
   pssm = derive2 { name="pssm"; version="1.1"; sha256="0r3d1mzc7bcz238lqq4y518400m2dqm5a1fb9gkfiari1ax099lv"; depends=[abind MASS MHadaptive numDeriv]; };
   pssmooth = derive2 { name="pssmooth"; version="1.0.2"; sha256="09x5dhwx40j1fy7bzj0z0lj7sbjlwrqn2b8ph0387prbbp9q2lxs"; depends=[chngpt MASS np osDesign]; };
+  pstest = derive2 { name="pstest"; version="0.1.3.900"; sha256="1rhd4vgqpr9yq0pc3xql3nfgl30v20ldywapp9n967ky2dja4k0z"; depends=[glmx MASS]; };
   psy = derive2 { name="psy"; version="1.1"; sha256="027whr670w65pf8f7x0vfk9wmadl6nn2idyi6z971069lf01wdlk"; depends=[]; };
   psych = derive2 { name="psych"; version="1.8.12"; sha256="0hvp0dkkkn0szaf5rkirr3kb8qmr4bxwl775m5wmpvn1kc25w5vf"; depends=[foreign lattice mnormt nlme]; };
   psychNET = derive2 { name="psychNET"; version="0.0.1"; sha256="0lrc6klf0q8h49f3yphzmd8b9zi1ljhj7bb6vzgd5m5n8q3jyr4b"; depends=[bigtime car crayon fastDummies glmnet graphicalVAR gtools Hmisc igraph imputeTS longitudinal MASS Matrix mgm mlVAR networktools ordinalNet qgraph SparseTSCGM sparsevar vars]; };
-  psychReport = derive2 { name="psychReport"; version="0.4"; sha256="0025m39gxjv63p230xg6vmyndni8bqx5nfs6dzz7xlc8qys56jqs"; depends=[cli crayon dplyr ez testthat xtable]; };
+  psychReport = derive2 { name="psychReport"; version="0.7"; sha256="1dapzq20aw9l4r5grfjd2sf14ga3wcxg67pq5fj6q4bcg5dggc9l"; depends=[cli crayon dplyr ez testthat xtable]; };
   psychTools = derive2 { name="psychTools"; version="1.9.5.26"; sha256="1a6g78glnml22mvfkn4gjzbpmqkznsgv1pga6c0dkx4db94pcfn2"; depends=[foreign psych]; };
   psychmeta = derive2 { name="psychmeta"; version="2.3.3"; sha256="1skvhbhkidfi9v8yk2r1qpvsmc6axvvjaiqr0rsa8wc2idavfjhd"; depends=[boot cli crayon data_table dplyr ggplot2 MASS metafor nor1mix progress purrr RCurl reshape2 rlang stringi stringr tibble tidyr tmvtnorm xml2]; };
   psycho = derive2 { name="psycho"; version="0.4.91"; sha256="0yfjgsxkbp878phjvxyb2caiy5nkknkv66294arqvmadh4an7ip3"; depends=[BayesFactor blavaan broom DescTools dplyr emmeans ggcorrplot ggplot2 lavaan lme4 lmerTest loo MASS MuMIn nFactors ppcor psych purrr qgraph rstanarm rstantools scales stringr tibble tidyr]; };
@@ -11504,7 +11740,7 @@ in with self; {
   pterrace = derive2 { name="pterrace"; version="1.0"; sha256="15k5149jqjy20cck5121zsv2mk63amn5b8qgdlacivri9dpxjns1"; depends=[doParallel foreach plotly TDA viridis]; };
   ptest = derive2 { name="ptest"; version="1.0-8"; sha256="1d30a23yknf7xgqj8adgr36pnh9dpffl1v5fq682f26fk3ss30qp"; depends=[quantreg]; };
   ptinpoly = derive2 { name="ptinpoly"; version="2.4"; sha256="1jbj8z7lqg7w1mqdh230qjaydx2yb6ffgkc39k7dx8xl30g00i5b"; depends=[misc3d]; };
-  ptmixed = derive2 { name="ptmixed"; version="0.2.1"; sha256="03mr26xx4i93pa6hjkp5pfd9i4pialpcwxiw8pnk3zifqiq3168b"; depends=[GLMMadaptive lme4 matrixcalc moments mvtnorm numDeriv tweeDEseq]; };
+  ptmixed = derive2 { name="ptmixed"; version="0.3.1"; sha256="160d7a0h2qpa4mpg6al2jh73arxcx2ljqz15d1yydi8fy1yxrldw"; depends=[GLMMadaptive lme4 matrixcalc moments mvtnorm numDeriv tweeDEseq]; };
   pts2polys = derive2 { name="pts2polys"; version="0.1.1"; sha256="1pnh8ajh95c8xzfa4bvd2w41fi7h0jcg003rsji6xsasly3q34vr"; depends=[Rcpp]; };
   ptstem = derive2 { name="ptstem"; version="0.0.4"; sha256="0dx677c7qh7rbalsys1n3xv4hjdhd6qypjd1mrggfwz1bd4vig4j"; depends=[dplyr hunspell magrittr rslp SnowballC stringr tidyr tokenizers]; };
   ptsuite = derive2 { name="ptsuite"; version="1.0.0"; sha256="1df273p8v6zvhy2jj6imhjigwj77grx6sxqmg0sidxwqny5d1d9c"; depends=[Rcpp]; };
@@ -11516,10 +11752,10 @@ in with self; {
   pubmed_mineR = derive2 { name="pubmed.mineR"; version="1.0.16"; sha256="1dcviy347lypbzwwz506d37wy5swla2vjgyqijwc37daic71bnih"; depends=[boot R2HTML RCurl XML]; };
   pubtatordb = derive2 { name="pubtatordb"; version="0.1.3"; sha256="0k16nq7fbsd07wkv6zys0jqdd35ikq3aiax3jdihk94gq46raqc1"; depends=[assertthat DBI dplyr R_utils readr RSQLite]; };
   pullword = derive2 { name="pullword"; version="0.2"; sha256="14rln0nbd4k2cvf18iwvc56776b9g3m3cs67i7fgzabfrgj8y6db"; depends=[RCurl]; };
-  pulsar = derive2 { name="pulsar"; version="0.3.5"; sha256="0n16jcjxaz19gc12idj3vva9bb0ljxwimgcgil57pi9rmflv9jm1"; depends=[Matrix]; };
+  pulsar = derive2 { name="pulsar"; version="0.3.6"; sha256="0r1myng3wmirlp1ixqkkzlgv5i0my37irligah3wwfh0cprip1dm"; depends=[Matrix]; };
   pulseTD = derive2 { name="pulseTD"; version="0.1.0"; sha256="0sdnswinpnm0vvplrh5gl9gx4p03dx175mqxzg5r52rkzd3rfbsr"; depends=[AnnotationDbi Biobase GenomicAlignments GenomicFeatures ggplot2 Rsamtools S4Vectors SummarizedExperiment]; };
   pumilioR = derive2 { name="pumilioR"; version="1.3.1"; sha256="1791r5lkr6hafd2rz9f9nfy5vc03c4833f292khvd2cg43sb0bfc"; depends=[RCurl XML]; };
-  puniform = derive2 { name="puniform"; version="0.1.1"; sha256="1im6sa2vhcv5yszrsrp5dy0qdnjijm153cjvb0w0v2yzhf0kfhzb"; depends=[ADGofTest metafor Rcpp]; };
+  puniform = derive2 { name="puniform"; version="0.2.1"; sha256="0pizpq3v0jlvl41pqypk5i5ghyg2na8mysf2pcvihx4ha7415i51"; depends=[ADGofTest metafor Rcpp]; };
   purge = derive2 { name="purge"; version="0.2.1"; sha256="1faf8mkaxsnj63wnig5rs50hd3j6vzaj0xkdz8kn0j7y2vvshp9p"; depends=[]; };
   purging = derive2 { name="purging"; version="1.0.0"; sha256="1b8f87jn6wyh4fp6b1660bd484wcf7xiajdg9dz2594aj1r94qsr"; depends=[MASS]; };
   purrr = derive2 { name="purrr"; version="0.3.2"; sha256="0ccs78a2ylr60f3z0f7iywi8h1pwr8mz4ga78bs4pwgnwkclvir7"; depends=[magrittr rlang]; };
@@ -11543,6 +11779,7 @@ in with self; {
   pwt9 = derive2 { name="pwt9"; version="9.1-0"; sha256="0m2df89lali9945avcv4gdjpxch9in7vdd042nx0q8nv0alb4ijd"; depends=[]; };
   pxR = derive2 { name="pxR"; version="0.42.2"; sha256="1q1xwsrs1ch1a1d1clz6sl7vnsyz5wjqivczk5n5d772y4w60bz5"; depends=[plyr reshape2 RJSONIO stringr]; };
   pxweb = derive2 { name="pxweb"; version="0.9.1"; sha256="00xp7idhsirmpl970yxnxp6xn128jm5kwsmdwhys32wlbd9kzspc"; depends=[checkmate httr jsonlite]; };
+  pyMTurkR = derive2 { name="pyMTurkR"; version="1.1"; sha256="0pvv8fgg40vv36mf3cc8ysrjj3gk9hnmzyvwix2ndxvc1nlzzahc"; depends=[curl reticulate XML]; };
   pycno = derive2 { name="pycno"; version="1.2"; sha256="0ha5css95xb98dq6qk98gnp1al32gy6w5fkz74255vs4hmkwfzw2"; depends=[maptools rgeos sp]; };
   pyinit = derive2 { name="pyinit"; version="1.0.3"; sha256="0sj7r52a53x57ff8b34s6p2y638b85fin0cxrndhpsk392sds0ki"; depends=[robustbase]; };
   pyramid = derive2 { name="pyramid"; version="1.5"; sha256="0lakn9knmhqvhrp98sc3hhwd4bilpplxbr5j9bv8w6li0qd3d04a"; depends=[]; };
@@ -11595,7 +11832,7 @@ in with self; {
   qrLMM = derive2 { name="qrLMM"; version="1.3"; sha256="1k85d09yvhx3pgmvqrsmhd14hqaah4pdr87vp4kg60dp9w5sydjz"; depends=[ald ghyp matrixcalc mvtnorm psych quantreg]; };
   qrNLMM = derive2 { name="qrNLMM"; version="1.4"; sha256="0h1jra247flipv4pwww8rn61pj8jxpiaw74f2czs950klnznp1xm"; depends=[ald ghyp matrixcalc mvtnorm psych quantreg]; };
   qrage = derive2 { name="qrage"; version="1.0"; sha256="00j74bnkcpp0h8v44jwzj67q9aaw47ajc2fvgr6dckj9rymydinl"; depends=[htmlwidgets]; };
-  qrandom = derive2 { name="qrandom"; version="1.1"; sha256="0sdi2xv2y2gxw1qvpzamgn6s6j4x280bxk84b3nxbpl77rviqy15"; depends=[curl jsonlite Rmpfr]; };
+  qrandom = derive2 { name="qrandom"; version="1.2"; sha256="1y8yybb2q4ngxvsgzm44xmhl98pdr85i80f2a7hqi8i520clwl4q"; depends=[curl jsonlite Rmpfr]; };
   qrcm = derive2 { name="qrcm"; version="2.1"; sha256="0wp6ynckh66gxi569wbvn5szwih4g0c21zrrpz3zfavhqwk7srgf"; depends=[pch survival]; };
   qrcmNP = derive2 { name="qrcmNP"; version="0.1.2"; sha256="0psgnz2fdj530wjj14pv5x2889yzphnlsg10lry9i6dvmxd8m47k"; depends=[qrcm survival]; };
   qrcode = derive2 { name="qrcode"; version="0.1.1"; sha256="12j0db8vidlgkp0dcjyrw5mhhvazl7v7gpn9wsf2m0qnz1rm4igq"; depends=[R_utils stringr]; };
@@ -11604,10 +11841,10 @@ in with self; {
   qrmdata = derive2 { name="qrmdata"; version="2016-01-03-1"; sha256="192dcsmvl3xbzlk658cfp2sk5fkgbjhjd4g1mrcs8s63hmzbwdzc"; depends=[xts]; };
   qrmix = derive2 { name="qrmix"; version="0.9.0"; sha256="1r695d9bmmngvblh9jj0rnjymdaln9w0jywz51wla0bdssssf845"; depends=[MASS quantreg]; };
   qrmtools = derive2 { name="qrmtools"; version="0.0-10"; sha256="0mkd4xigz1cg52dldbws3va7251pjzss8z0al25izmp9dbknb3gw"; depends=[lattice Quandl quantmod rugarch xts zoo]; };
-  qrng = derive2 { name="qrng"; version="0.0-5"; sha256="0ddwbbw5w7y8vns83z4dyh8inl976k2cg55rxbynaks8bdxr38mj"; depends=[]; };
-  qrnn = derive2 { name="qrnn"; version="2.0.4"; sha256="0i0hyb97xb3kwpvg6cqkwvl612cx11bszkm7pzhiy6ss598r6wwi"; depends=[]; };
+  qrng = derive2 { name="qrng"; version="0.0-7"; sha256="1dw1qqajxavlnfyh6xn58069fpfza28x1xjzd3diqlcxxlb4hjaf"; depends=[copula randtoolbox]; };
+  qrnn = derive2 { name="qrnn"; version="2.0.5"; sha256="0ligz67kbfg5cmvacnb7y0ms1v0c7mbvbcfsxyfiz543ppl3xn1v"; depends=[]; };
   qrsvm = derive2 { name="qrsvm"; version="0.2.1"; sha256="0qpj3c8qwrwr2asvp921av0mbdba1ayz0pdq4a52i1waqng4fgis"; depends=[doParallel foreach kernlab Matrix quadprog]; };
-  qs = derive2 { name="qs"; version="0.17.3"; sha256="1z0q9kgyf1rkkbjl8b4rm444c3war4drqbi2lgbvzm6q8jy6pdh1"; depends=[RApiSerialize Rcpp]; };
+  qs = derive2 { name="qs"; version="0.18.3"; sha256="1rlfm2s7yx97z1fwi6prw7y8kpzfy902bxjqqk1znxmarza2wa13"; depends=[RApiSerialize Rcpp]; };
   qsort = derive2 { name="qsort"; version="0.2.3"; sha256="1xvp29dijfa2207wyw3z09rmffn61fngfy0f00qjk284n1jnnvrg"; depends=[cowplot ggplot2 gridExtra purrr]; };
   qsub = derive2 { name="qsub"; version="1.1.0"; sha256="0i52bibc782k09f5hp3ic9ll14fsrwjnkdxlb0mhkjvsqm7m5hc5"; depends=[dplyr glue pbapply processx purrr random readr ssh stringr tidyr]; };
   qtbase = derive2 { name="qtbase"; version="1.0.14"; sha256="1pcgjycq61x9h52sqr6fz83qjnlpbawvpavnn9hyw2b7jlv3nwfd"; depends=[]; };
@@ -11627,13 +11864,13 @@ in with self; {
   quadmesh = derive2 { name="quadmesh"; version="0.4.0"; sha256="196p1qiis1hbs8yxd5570cqln0zcp3ngbajf3rsc0rwgjzqgm3wv"; depends=[geometry gridBase png raster reproj scales sp viridis]; };
   quadprog = derive2 { name="quadprog"; version="1.5-7"; sha256="0vg7i9p241bwvfdspjbydjrsvgipl6nsb8bjigp0hbbgvxbixx0s"; depends=[]; };
   quadprogXT = derive2 { name="quadprogXT"; version="0.0.4"; sha256="1bqjlqihb371ggds60219x474b6n4wsl6fnia8hd410iyn9wm05g"; depends=[quadprog]; };
-  quadrupen = derive2 { name="quadrupen"; version="0.2-6"; sha256="0din0b4iaixjfkdiy4gbl83hq6z7v7aca2xk65hzfsalp6llk91x"; depends=[ggplot2 Matrix Rcpp RcppArmadillo reshape2 scales]; };
+  quadrupen = derive2 { name="quadrupen"; version="0.2-7"; sha256="05yn9cnnc1481k8yqc6dg5hcv0ll4v3h2yw3qyaarwhgyxiips11"; depends=[ggplot2 Matrix Rcpp RcppArmadillo reshape2 scales]; };
   qualCI = derive2 { name="qualCI"; version="0.1"; sha256="09mzsy5ryyrn1gz9ahrh95cpfk7g09pmjjy0m82fh4xc7j5w6kpf"; depends=[combinat]; };
   qualV = derive2 { name="qualV"; version="0.3-3"; sha256="1yyqk223ydcc0125gsn33a4mcdp8bd76fpn8kj9bfz9g78b8dqmx"; depends=[KernSmooth]; };
   qualityTools = derive2 { name="qualityTools"; version="1.55"; sha256="1c2p78dhwqvzb2k01dvwb41a6hlr2iwpw6fv91036x30rphjzb88"; depends=[MASS Rsolnp]; };
   qualmap = derive2 { name="qualmap"; version="0.1.1"; sha256="1z085zyqxnizpx4y1891shhijs2a9gg5ap800ryvfxncg6gk35wa"; depends=[dplyr glue leaflet purrr rlang sf]; };
   qualpalr = derive2 { name="qualpalr"; version="0.4.3"; sha256="1hlssqj2129796d00gnip3ih5b705qasw0hkj25xfz7xak0vdbkm"; depends=[assertthat randtoolbox Rcpp RcppArmadillo RcppParallel]; };
-  qualtRics = derive2 { name="qualtRics"; version="3.1.0"; sha256="06lbjck0a7rnh5j67y8x1r1ryzy1pjmhvzdzxj9r7sdqgw767p26"; depends=[assertthat dplyr httr jsonlite readr rlang sjlabelled stringr yaml]; };
+  qualtRics = derive2 { name="qualtRics"; version="3.1.1"; sha256="092f8d59g5b5619q6v4vkpjw8za5rrmhv805xg95m3z0xcscg1rl"; depends=[assertthat dplyr httr jsonlite purrr readr rlang sjlabelled stringr tibble yaml]; };
   qualvar = derive2 { name="qualvar"; version="0.2.0"; sha256="1c7b7lcyq2l46sslk185r6xfh5fb35z9qihrhnh294sw1k52bffa"; depends=[]; };
   quantable = derive2 { name="quantable"; version="0.3.6"; sha256="15q4phc2j7aihl8f4qzpdwxcvshq2cfzkfcxc8k4qypsxk9a00sb"; depends=[caret dplyr e1071 ggplot2 ggrepel gplots Matrix plyr pROC RColorBrewer readr reshape2 rlang scales stringr tibble tidyr]; };
   quanteda = derive2 { name="quanteda"; version="1.5.1"; sha256="08hzgqza853jrk0r6cgn5398k0llfpm6jk4hs4rw8l2dn0520nq5"; depends=[data_table extrafont fastmatch ggplot2 ggrepel lubridate magrittr Matrix network proxyC Rcpp RcppArmadillo RcppParallel RSpectra sna SnowballC spacyr stopwords stringi xml2 yaml]; };
@@ -11642,13 +11879,14 @@ in with self; {
   quantities = derive2 { name="quantities"; version="0.1.2"; sha256="01h0d2cmqqyqch98d8pgv3n2rvp3vc3sby95srahgcrrlxmmrrvj"; depends=[errors Rcpp units]; };
   quantmod = derive2 { name="quantmod"; version="0.4-15"; sha256="0lyzaf5ypk93v6zj9gdghy05cc7cxgn9yasv1apx5r6qsjcfgwky"; depends=[curl TTR xts zoo]; };
   quantoptr = derive2 { name="quantoptr"; version="0.1.3"; sha256="0f9vy9yhya4wpya8n345s6n7a5sb29chdkl5fz6dwa31lp1mvvj3"; depends=[quantreg Rdpack rgenoud stringr]; };
-  quantreg = derive2 { name="quantreg"; version="5.42.1"; sha256="1aycnghci329yqw63kybv7sfjjx5whq3xs7xzic4wsaj7j4b1hjc"; depends=[Matrix MatrixModels SparseM]; };
+  quantreg = derive2 { name="quantreg"; version="5.51"; sha256="1cdx51a9g6fjq2g9arr6wp6ghkyl2m6bs2dj4kcycvpn8p9304yz"; depends=[Matrix MatrixModels SparseM]; };
   quantreg_nonpar = derive2 { name="quantreg.nonpar"; version="1.0"; sha256="1f9120awnkwsgdiqg98lg7xs5l4y80930869x6k9q76595r5m92k"; depends=[fda mnormt quantreg Rearrangement]; };
   quantregForest = derive2 { name="quantregForest"; version="1.3-7"; sha256="0lk7r02i6zpx9sdl2rp0r7fc3a84s8qhg49nh2x7k3vxwa095pjz"; depends=[randomForest RColorBrewer]; };
   quantregGrowth = derive2 { name="quantregGrowth"; version="0.4-3"; sha256="0q2yk51hcn7jnvh14nxa7szfj4pr9grh5rdfwazaziilbwqdmw4f"; depends=[quantreg]; };
   quantregRanger = derive2 { name="quantregRanger"; version="1.0"; sha256="1a9q2prr790bpw6s0y5ni5ppd3vqkjr0v4nqp6ywcj5n3sk69pvx"; depends=[ranger Rcpp]; };
   quantspec = derive2 { name="quantspec"; version="1.2-1"; sha256="0kvwifdwy3big0lls5h3wcb48v3jvlfp1l0zjd07jnvj43zj3ysd"; depends=[abind quantreg Rcpp snowfall zoo]; };
   quarrint = derive2 { name="quarrint"; version="1.0.0"; sha256="13fdmmrgn23xd9vpywmcl7pf729gmcxjfl1wxs30axsbp4h1s6rk"; depends=[neuralnet]; };
+  queryparser = derive2 { name="queryparser"; version="0.1.1"; sha256="1rnw653y7jykqs2knfhyjwsnq22lx7x47rli5v1b7lvgly7b2agr"; depends=[]; };
   questionr = derive2 { name="questionr"; version="0.7.0"; sha256="1cschww3g2jhrfh87bxcaaig84yr0zcj0virmpx033yal606hmn4"; depends=[classInt highr htmltools labelled miniUI rstudioapi shiny]; };
   queuecomputer = derive2 { name="queuecomputer"; version="0.8.3"; sha256="0ravk2bxzq3zhk6mmh6iv11ql3bkpp2318vvrl39ghm5bh6pp6mg"; depends=[dplyr Rcpp RcppArmadillo tidyr]; };
   queueing = derive2 { name="queueing"; version="0.2.11"; sha256="1rgavpivvxwww1qiphbjm25d1avhjcjv31imsrzrkwh1d12b2k7x"; depends=[]; };
@@ -11658,7 +11896,7 @@ in with self; {
   quickblock = derive2 { name="quickblock"; version="0.2.0"; sha256="0ij4ivpnkjzdixbq7pg4g1xkb031qawadr22qhzp0q210qhmhc0m"; depends=[distances scclust]; };
   quickmapr = derive2 { name="quickmapr"; version="0.3.0"; sha256="0962qm8ak0wpqld8nrb8rvvb78743zfrfsq2xrwdlql681j2nv8c"; depends=[httr raster rgdal rgeos sf sp]; };
   quickmatch = derive2 { name="quickmatch"; version="0.2.1"; sha256="1qfslhjlbjpzigz8n6b7w41g8pwdiwri091ivd5igp1xy5pv8a3w"; depends=[distances sandwich scclust]; };
-  quickpsy = derive2 { name="quickpsy"; version="0.1.5"; sha256="0r1xjcx02p0fsgfcd2h0dxcagzxxan405cjwh8sjdgi5p01jrym8"; depends=[DEoptim dplyr ggplot2 MPDiR]; };
+  quickpsy = derive2 { name="quickpsy"; version="0.1.5.1"; sha256="0dfqlpghnw79idw3ir03cxx9n88sqs5p14jz7jgpkdwvjpw1y4q9"; depends=[DEoptim dplyr ggplot2 MPDiR]; };
   quickregression = derive2 { name="quickregression"; version="0.2"; sha256="1z0sspi8q7dvgxqbj5na56v458pv6jhxrssnm6j23156dchgw39h"; depends=[car]; };
   quiddich = derive2 { name="quiddich"; version="1.0.0"; sha256="10kiyn1all58klyygmz6zw0w9nfl9vq19qybmkqh410rd5ryjz3p"; depends=[ape]; };
   quietR = derive2 { name="quietR"; version="0.1.0"; sha256="1f923dllhchgf49bp2d9186v3cxzdya6i56ww6cj0n0mh8gfi27z"; depends=[]; };
@@ -11682,7 +11920,7 @@ in with self; {
   r6extended = derive2 { name="r6extended"; version="0.1.2"; sha256="1kq1j5rx57053mslj8jx1s0wjvhis7x3y264zw44q4k2x48q9wxs"; depends=[digest hellno magrittr R6]; };
   rARPACK = derive2 { name="rARPACK"; version="0.11-0"; sha256="12h2y46xcfldhjdmm960swgn9b23zvkj5vg2bi42s9qxwgi02d63"; depends=[RSpectra]; };
   rAltmetric = derive2 { name="rAltmetric"; version="0.7.0"; sha256="1vbvjv273vg3pi30vxxa2bivlajfsbqrzflk3payp6ym9myi27mg"; depends=[httr jsonlite rlist]; };
-  rAmCharts = derive2 { name="rAmCharts"; version="2.1.10"; sha256="1yp45ppg8hwnh3l6f394b0x29jw997mqii83mbv821b6i2p9whgp"; depends=[data_table htmltools htmlwidgets knitr pipeR yaml zoo]; };
+  rAmCharts = derive2 { name="rAmCharts"; version="2.1.11"; sha256="1r8k2ri03pyxkh76hcbsxmmmyy4dqdx7dfldpkni4s9m0kj1bcqn"; depends=[data_table htmltools htmlwidgets knitr pipeR yaml zoo]; };
   rAverage = derive2 { name="rAverage"; version="0.5-8"; sha256="09yap3qv02k5nidi6a4png9xa5yy7cb8hg8s2dq99wnc88s42d26"; depends=[]; };
   rAvis = derive2 { name="rAvis"; version="0.1.4"; sha256="0svplnrn8rrr59v04nr1pz7d5r4dr1kdl0bd3kg8c3azxv47mxbp"; depends=[gdata maptools raster RCurl rgdal scales scrapeR sp stringr XML]; };
   rBayesianOptimization = derive2 { name="rBayesianOptimization"; version="1.1.0"; sha256="194j445nirvvkz880ax0zw2q1mkiy0khdfjl7bwiwj8knhhvkrhw"; depends=[data_table foreach GPfit magrittr]; };
@@ -11726,6 +11964,7 @@ in with self; {
   rLindo = derive2 { name="rLindo"; version="8.0.1"; sha256="05qyc4wvpjgw8jxmwn2nwybi695fjn0cdilkprwmjg07c82f0q5n"; depends=[]; };
   rMEA = derive2 { name="rMEA"; version="1.1.0"; sha256="1aarnik0qjxg6h55xpskx1dwkp78nfdyrwpy9r6ffyxhz9jbplnj"; depends=[]; };
   rMR = derive2 { name="rMR"; version="1.1.0"; sha256="0da1hclfnnlkp9by6zf2p079643p8nimplr9p3ipbjdy739j344z"; depends=[biglm]; };
+  rMVP = derive2 { name="rMVP"; version="0.99.16"; sha256="1fmnbz7cmmf0zkikag3q2nfw7fmjizki8db0lwgvx3kw48p4l912"; depends=[BH bigmemory MASS Rcpp RcppArmadillo RcppEigen RcppProgress]; };
   rMouse = derive2 { name="rMouse"; version="0.1"; sha256="0pzxasap5kwxqq36mb4zi139jllsl4vk06dw2pv9xnwdxiszr3gp"; depends=[rJava]; };
   rNMF = derive2 { name="rNMF"; version="0.5.0"; sha256="1nz6h0j5ywdh48m0swmhp34hbkycd7n13rclrxaw85qi9wc42597"; depends=[knitr nnls]; };
   rNOMADS = derive2 { name="rNOMADS"; version="2.4.1"; sha256="0qag0riwkrzgybwfbhpkapjcf7ccqrqa4j8zqh3xx0548k8mm37l"; depends=[fields GEOmap MBA RCurl rvest stringr uuid XML]; };
@@ -11739,10 +11978,11 @@ in with self; {
   rQCC = derive2 { name="rQCC"; version="0.19.8.2"; sha256="091c53jggq3k9sf48pnds8s4kkqia6x268lbkb2fx88b408i0iny"; depends=[]; };
   rRAP = derive2 { name="rRAP"; version="1.1"; sha256="1nzvs8bjkbjraa33azxf9mrxsxh87qhh3qlldrcs5y4fq4ancyqb"; depends=[lars lassoshooting MASS]; };
   rSCA = derive2 { name="rSCA"; version="3.0"; sha256="1ka8p1slqb3a9hfc8z4j7v90k0wn6y35vmwxqaf8jlgwfhhc1v9f"; depends=[]; };
-  rSEA = derive2 { name="rSEA"; version="1.0.1"; sha256="0a1lx1x2xd05a07qbqg5d1v21fqqknlmrl9gbjg3k6wmydxwcly8"; depends=[hommel]; };
+  rSEA = derive2 { name="rSEA"; version="2.0.0"; sha256="129qj44x4151f5516fv041l0hmzj38l9xjqhvmbvq240iflgqmf1"; depends=[hommel]; };
   rSFA = derive2 { name="rSFA"; version="1.04"; sha256="0gd6ji1ynbb04rfv8jfdmp7dqnyz8pxcl5636fypd9a81fggl0gs"; depends=[MASS]; };
   rSHAPE = derive2 { name="rSHAPE"; version="0.3.2"; sha256="0z6dizsxlkmaymbd24b1m1i8kmndcf21nxxnyfzq6gvdii7bal4h"; depends=[abind DBI doParallel evd foreach RSQLite sn VGAM]; };
-  rSPARCS = derive2 { name="rSPARCS"; version="0.0.4"; sha256="1w2w5gx82dd4s0zbqk376195svs0z9f9cgx8zcy7gig94ilbrv5l"; depends=[data_table foreign geosphere plyr raster sp spatialEco tigris]; };
+  rSPARCS = derive2 { name="rSPARCS"; version="0.0.6"; sha256="0fvzvsi33lhgr6ik7038blv45wyfl5s4whd2qvyy7m945y0f7dzd"; depends=[data_table geosphere plyr raster sp spatialEco tigris]; };
+  rSPDE = derive2 { name="rSPDE"; version="0.4.6"; sha256="1fdk7mhrkp5r7lr9rn9wz1rbxinrr8yvfcss9ky8namp7f65vwa1"; depends=[Matrix]; };
   rSQM = derive2 { name="rSQM"; version="1.3.14"; sha256="0m69n2pnfv2085dln6p149a5gw0gif9xk00xmad5s9j68hwjdmym"; depends=[dplyr EcoHydRology ggplot2 gsubfn mise ncdf4 qmap reshape2 stringr yaml zoo]; };
   rSymPy = derive2 { name="rSymPy"; version="0.2-1.2"; sha256="0jdl8ss3dbgjqrmmppb0ix1gqk9g28pbh6w5sybil046ic83s13i"; depends=[rJython]; };
   rSymbiota = derive2 { name="rSymbiota"; version="1.0.0"; sha256="0dld8li5b8ylhdmll6iz5pk4pxh2dk37hbx0458jn0zhd4fl1cm7"; depends=[crayon dplyr ggplot2 Hmisc httr knitr magick maps mapview RCurl RSelenium rvest rworldmap sf sp stringr sys treemap XML xml2]; };
@@ -11750,6 +11990,7 @@ in with self; {
   rTableICC = derive2 { name="rTableICC"; version="1.0.7"; sha256="1z896675kmm9p5dnmcnsz2205ynf05laqcxvlc9y0g5i0x8rf8v6"; depends=[aster partitions]; };
   rTensor = derive2 { name="rTensor"; version="1.4"; sha256="08i94vvk5i25j40dwn497svgrmz90iwzp6qgiir37wgvx355xwzr"; depends=[]; };
   rTephra = derive2 { name="rTephra"; version="0.1"; sha256="045f2sp2j4hiwa9k1vs6cxr59x1yr34jq1z2crasxflsxbwa3xz8"; depends=[]; };
+  rTorch = derive2 { name="rTorch"; version="0.0.3"; sha256="1v7zvjkbllcjria7slv958bpwv1r0p3li2i8wq55hgm7g7iyfz1j"; depends=[data_table jsonlite logging R6 reticulate rstudioapi]; };
   rUnemploymentData = derive2 { name="rUnemploymentData"; version="1.1.0"; sha256="0p5hba8iv060szp23s05hvpmwan518ykakm6vqzdcki0inxw0hyv"; depends=[choroplethr rvest stringr]; };
   rWBclimate = derive2 { name="rWBclimate"; version="0.1.3"; sha256="0vs56hx7a85pw4jx8nb8bdlr9dbkl4zdhzhqsm0505xc3qz18vxh"; depends=[ggplot2 httr jsonlite plyr reshape2 rgdal sp]; };
   rWind = derive2 { name="rWind"; version="1.1.3"; sha256="1q9f7mrjks7nb9lgkmi6w774dz479d2hhzhns0v0mrllmv9nck1s"; depends=[gdistance lubridate Matrix raster]; };
@@ -11757,12 +11998,13 @@ in with self; {
   rYoutheria = derive2 { name="rYoutheria"; version="1.0.3"; sha256="1r63ggy4knwzxnpjkmsn7zwmwfaznm8mmxl7r9ph10wz4sblgygl"; depends=[plyr RCurl reshape2 RJSONIO]; };
   rabhit = derive2 { name="rabhit"; version="0.1.1"; sha256="010ayd8hyk02gwpnpa06n2rymxl1hy3j4jm5cn4x2xl3mj2kzg8h"; depends=[alakazam cowplot data_table dendextend dplyr ggdendro ggplot2 gridExtra gtable gtools htmlwidgets plotly RColorBrewer reshape2 rlang stringi tidyr tigger]; };
   rabi = derive2 { name="rabi"; version="1.0.0"; sha256="1ljs6wgdw045q1acdmci5b3p8qxhhm4d6bdj64nha76fnq2rr76x"; depends=[numbers polynom shiny stringdist]; };
+  raceland = derive2 { name="raceland"; version="1.0.0"; sha256="058hpimpbzxda7h6walxczp9ndfs7480189w0rml085cpl2g3mwm"; depends=[comat fasterize plotwidgets raster Rcpp RcppArmadillo sf]; };
   radar = derive2 { name="radar"; version="1.0.0"; sha256="1wh5j3cfbj01jx2kbm9ca5cqhbb0vw7ifjn426bllm4lbbd8l273"; depends=[]; };
   radarBoxplot = derive2 { name="radarBoxplot"; version="1.0.0"; sha256="16s38yy984mb1hmsdw17z4nk2z4xg03xi0yrp7445yqv3fs1fghl"; depends=[]; };
   radarchart = derive2 { name="radarchart"; version="0.3.1"; sha256="0gcxnbgj8ja1m4wzhbjy67m6zphf0c5ni9yx7sr7f0abm03ry753"; depends=[htmltools htmlwidgets]; };
   radiant = derive2 { name="radiant"; version="0.9.9.1"; sha256="18zj6lbs04vqslm4zgga6fvm868a0m55sk45kj5vl46jadb6a52f"; depends=[r_import radiant_basics radiant_data radiant_design radiant_model radiant_multivariate shiny]; };
   radiant_basics = derive2 { name="radiant.basics"; version="1.0.0"; sha256="188dzsr8lwbam9hvvwqgcf08aj4ja04fvfcw315g4jy1nbhbvg33"; depends=[dplyr ggplot2 gridExtra magrittr psych r_import radiant_data scales shiny tidyr]; };
-  radiant_data = derive2 { name="radiant.data"; version="1.0.0"; sha256="0b35jn4mcj10hqra18l8pi6s4pvj6fxipslbn6hkr4zza1z27gzw"; depends=[base64enc broom car curl dplyr DT ggplot2 glue gridExtra jsonlite knitr lubridate magrittr markdown plotly psych r_import readr readxl rlang rmarkdown rstudioapi scales shiny shinyAce shinyFiles stringi tibble tidyr writexl]; };
+  radiant_data = derive2 { name="radiant.data"; version="1.0.6"; sha256="08x7zasxf429m021482p86lx3zc6dqz2mih0id8s34isg4gafapg"; depends=[base64enc broom car curl dplyr DT ggplot2 glue gridExtra jsonlite knitr lubridate magrittr markdown plotly psych r_import readr readxl rlang rmarkdown rstudioapi scales shiny shinyAce shinyFiles stringi tibble tidyr writexl]; };
   radiant_design = derive2 { name="radiant.design"; version="0.9.9"; sha256="1d5ds24b7mp8xad5pgzvjr17akr7p8m6w0ryd5fkwylnfgnhznrb"; depends=[AlgDesign dplyr mvtnorm polycor pwr r_import radiant_data shiny]; };
   radiant_model = derive2 { name="radiant.model"; version="1.0.0"; sha256="14zk2yl40694kyri5wr7czc2ymwqa68n7jzk6j1a28l7cbgs8xfx"; depends=[car data_tree DiagrammeR dplyr e1071 ggplot2 gridExtra lubridate magrittr NeuralNetTools nnet psych r_import radiant_basics radiant_data rlang rpart sandwich shiny stringr tidyr yaml]; };
   radiant_multivariate = derive2 { name="radiant.multivariate"; version="0.9.9.1"; sha256="154q06vbj13y15rz2apvy521gda8jh66yhr87kqvlv9mh2k9ws2h"; depends=[car dplyr ggplot2 ggrepel Gmedian GPArotation gridExtra magrittr MASS psych r_import radiant_data radiant_model rlang scales shiny]; };
@@ -11774,7 +12016,7 @@ in with self; {
   radmixture = derive2 { name="radmixture"; version="0.0.1"; sha256="0rs60xjd43lg5c9972qhpg6bsqfg2578qvrz7gz3bdip10jb1ryj"; depends=[magrittr MCMCpack plyr quadprog]; };
   radsafer = derive2 { name="radsafer"; version="2.0.1"; sha256="0qzd7zzflyr5gzk1ad3wwn8mxrzijzv9fnj76q43qb1mgr4d5sww"; depends=[dplyr ggplot2 magrittr RadData readr rlang stringr]; };
   rafalib = derive2 { name="rafalib"; version="1.0.0"; sha256="1dmxjl66bfdgrybhwyaa8d4i460liqcdw8b29a6w7shgksh29m0k"; depends=[RColorBrewer]; };
-  ragg = derive2 { name="ragg"; version="0.1.2"; sha256="0bb6sa8zs42p5p4hcyip89rlgyzymzfdr7n7bxfyb61l2aj5x9db"; depends=[systemfonts]; };
+  ragg = derive2 { name="ragg"; version="0.1.3"; sha256="116dmzy81y3r4jpbv7gqx76y33rgrsdzklr0vhblzsph52a59i7m"; depends=[systemfonts]; };
   rags2ridges = derive2 { name="rags2ridges"; version="2.2.1"; sha256="0xiv4dhzxbxy9bqjpz8rfrh0pzxbsnkg5wgz61c643slidgs0h0d"; depends=[expm fdrtool ggplot2 graph gRbase Hmisc igraph RBGL Rcpp RcppArmadillo reshape RSpectra sfsmisc snowfall]; };
   ragt2ridges = derive2 { name="ragt2ridges"; version="0.3.2"; sha256="03613amz11ixgkjhc8rg4vp3ih60g1ibhdjrldr9mazzkak46y91"; depends=[abind expm fdrtool igraph MASS Matrix mvtnorm rags2ridges Rcpp RcppArmadillo]; };
   ragtop = derive2 { name="ragtop"; version="1.1.0"; sha256="1gz4hdfb4yxjqcmclxw2yacpk0km29n3gfpqkcj48wr1s6vv7djb"; depends=[futile_logger limSolve]; };
@@ -11799,7 +12041,7 @@ in with self; {
   random = derive2 { name="random"; version="0.2.6"; sha256="0sdhagwjlhldb8hn6h4nd1sflzhwkapzybdlb8hzisy3w2ygjn9b"; depends=[curl]; };
   random_polychor_pa = derive2 { name="random.polychor.pa"; version="1.1.4-2"; sha256="1ybwfn3hdwisxjn85vqrib1zhk8dcddbarbwjdf1vn27ih3c4h2c"; depends=[boot MASS mvtnorm nFactors psych sfsmisc]; };
   randomForest = derive2 { name="randomForest"; version="4.6-14"; sha256="0kbmm0l42fc2d1rdq0l7k09d34kd87q4lx651ffsic4y84h8kf7l"; depends=[]; };
-  randomForestExplainer = derive2 { name="randomForestExplainer"; version="0.9"; sha256="0gqqm3784krl6xdx7j6xvvyi2rjbyi6c8shm44yvq59is5i7fypc"; depends=[data_table dplyr DT dtplyr GGally ggplot2 ggrepel MASS randomForest reshape2 rmarkdown]; };
+  randomForestExplainer = derive2 { name="randomForestExplainer"; version="0.10.0"; sha256="08j4mj6r595kzkrgkvjhkda9x6w275nmnvmmhmyk0knq2p2g7p2r"; depends=[data_table dplyr DT GGally ggplot2 ggrepel randomForest ranger reshape2 rmarkdown]; };
   randomForestSRC = derive2 { name="randomForestSRC"; version="2.9.1"; sha256="1vylj5mdhy11nda644yn7mdz9kf64a9zz8j317y5n1jmzvx4fyii"; depends=[]; };
   randomGLM = derive2 { name="randomGLM"; version="1.02-1"; sha256="031338zxy6vqak8ibl2as0l37pa6qndln0g3i9gi4s6cvbdw3xrv"; depends=[doParallel foreach MASS]; };
   randomLCA = derive2 { name="randomLCA"; version="1.0-15"; sha256="10rx2ah50dcjxz5y492c59d3pn0dvlgjaxfdf8sknkf6s4pmwkis"; depends=[boot fastGHQuad lattice Matrix]; };
@@ -11807,11 +12049,10 @@ in with self; {
   randomUniformForest = derive2 { name="randomUniformForest"; version="1.1.5"; sha256="1amr3m7h5xcb8gahrr58233chsnx1naf9x5vpjy9p5ivh71xcxf7"; depends=[cluster doParallel foreach ggplot2 gtools iterators MASS pROC Rcpp]; };
   randomcoloR = derive2 { name="randomcoloR"; version="1.1.0"; sha256="0sirxgrf7xf470d7lls45c698l6c078hqjkjcswmwz6kphykrzhg"; depends=[cluster colorspace Rtsne scales stringr V8]; };
   randomizationInference = derive2 { name="randomizationInference"; version="1.0.3"; sha256="0x36r9bjmpx90fz47cha4hbas4b31mpnbd8ziw2wld4580jkd6mk"; depends=[matrixStats permute]; };
-  randomizeBE = derive2 { name="randomizeBE"; version="0.3-4"; sha256="1x1lh1rrw7ma2wls0dflz18lk9h0qdy9gb11af95hqpabqc85rd7"; depends=[]; };
+  randomizeBE = derive2 { name="randomizeBE"; version="0.3-5"; sha256="08yfdrf56i8php48ycilc79jk7ms0f6k40swg56mccnqm2yb3b12"; depends=[]; };
   randomizeR = derive2 { name="randomizeR"; version="1.4.2"; sha256="0jv0mc40cy4w17jrsb2023l7k7cnzl9czdigl4shq9nx67mccdwx"; depends=[ggplot2 plotrix]; };
-  randomizr = derive2 { name="randomizr"; version="0.18.0"; sha256="115c8wzimblc9vd7m9wn530l8saarg3595758b8rlkz7dhds5rpk"; depends=[]; };
+  randomizr = derive2 { name="randomizr"; version="0.20.0"; sha256="0dljyfldnardaps3fq6vi5wcs9x6qfaq5apapa78c51lnaa6fn9h"; depends=[]; };
   randomsearch = derive2 { name="randomsearch"; version="0.2.0"; sha256="0ywr4ms66p5nmq8bzy04gbvmpp0nhfyf8rvynhr2c4alqva9x3yi"; depends=[checkmate fs parallelMap ParamHelpers smoof]; };
-  randquotes = derive2 { name="randquotes"; version="0.1.0"; sha256="1rpcmxkpq8lgfzrjaipf5x573gm6rc31c9fafghiy99c0iphf46w"; depends=[curl jsonlite xml2]; };
   randstr = derive2 { name="randstr"; version="0.2.0"; sha256="17593lbk6r089yasafd21i3v90ya9n92rflpzl0qicd2kqqk2gdh"; depends=[random stringi truncnorm]; };
   randtests = derive2 { name="randtests"; version="1.0"; sha256="03z3kxl4x0l91dsv65ld9kgc58z82ld1f4lk18i18dpvwcgkqk82"; depends=[]; };
   randtoolbox = derive2 { name="randtoolbox"; version="1.30.0"; sha256="141p13ajgzmb2s89rlac7zrra92mi1izvpfrngb4kqzlf3igdsqd"; depends=[rngWELL]; };
@@ -11823,6 +12064,7 @@ in with self; {
   rankFD = derive2 { name="rankFD"; version="0.0.3"; sha256="0cqvr01hbq3cz2zxmysl2k88wfckyvnlsdk8ypdxdkap4gavnvqv"; depends=[coin lattice MASS Matrix]; };
   rankdist = derive2 { name="rankdist"; version="1.1.4"; sha256="1xqrkss8d5vv3blqpvrvdczsygphbx259hy9j7w9b2ahssw8cjr5"; depends=[hash optimx permute Rcpp]; };
   rankhazard = derive2 { name="rankhazard"; version="1.1.0"; sha256="0kljn9b74alrd22b5pwfnamdbaqi2wa2z6yzpmgpfs3x0hv72fw7"; depends=[survival]; };
+  rapbase = derive2 { name="rapbase"; version="1.10.0"; sha256="0x1xr0qw5qq9rsas3ysxlvmim3jhkf5za4lxr6f15vx4rjfx77wv"; depends=[DBI devtools digest gistr httr knitr magrittr readr RJDBC RMariaDB sendmailR shiny yaml]; };
   rapiclient = derive2 { name="rapiclient"; version="0.1.2"; sha256="072rlr7z9rj4agkzmy12cz4axh4pajavfd83lpcx2b1lgxpj6ck4"; depends=[httr jsonlite]; };
   rapidjsonr = derive2 { name="rapidjsonr"; version="1.1"; sha256="0h4phjjhykbb45rg5b1xn48vqxdcvcngbm0416ds8in7j469wbwd"; depends=[]; };
   rapidraker = derive2 { name="rapidraker"; version="0.1.0"; sha256="17jzkzm5hvd8vcqql40bwl89sfgz8yicvi0753nzgkmbvanzjhjx"; depends=[openNLPdata rJava slowraker]; };
@@ -11838,12 +12080,13 @@ in with self; {
   rasciidoc = derive2 { name="rasciidoc"; version="2.0.0"; sha256="1bqabjr8h0ldhmf7mirk0fkv6nrv80zrm2vrx836ib5cxb2hw1yv"; depends=[document highr knitr]; };
   rasclass = derive2 { name="rasclass"; version="0.2.2"; sha256="1lsmv8kh519mz3szb4k9s17fz1480cw0i4qk12givhhm2rpzjy50"; depends=[car e1071 nnet randomForest RSNNS]; };
   rase = derive2 { name="rase"; version="0.3-3"; sha256="03jqf5y5vj354m9psp81wzw6d7dfqr76bfjqv9kannsakkj587sy"; depends=[ape mvtnorm polyCub rgl sm spatstat]; };
-  raster = derive2 { name="raster"; version="2.9-23"; sha256="1brqigic8ygr223bp2hgk5qjz3q03r4sfglrv4an0ghy7fgfralh"; depends=[Rcpp sp]; };
+  raster = derive2 { name="raster"; version="3.0-7"; sha256="0faxv71hlxkblvbi3ps1vfzm3wwi0brwzmpsr5114bddcqyiqkvn"; depends=[Rcpp sp]; };
   rasterImage = derive2 { name="rasterImage"; version="0.3.0"; sha256="0csx7wqwxdsddypd1c9wv74gcyymasn9n6pn05a35j6xhqbk2zp3"; depends=[plotrix]; };
   rasterKernelEstimates = derive2 { name="rasterKernelEstimates"; version="1.0.1"; sha256="1733ic1hxym3gyibk2ysy5zzq7s9rbf6jx63x7irnrcavq151f8s"; depends=[raster]; };
   rasterList = derive2 { name="rasterList"; version="0.5.8"; sha256="0q7apglxzpah04463z07cpkzyd6l6dbbdhm601brzh6yk75z20vh"; depends=[raster]; };
   rasterVis = derive2 { name="rasterVis"; version="0.46"; sha256="0lzjqkm22qfcmzgnjv9k9b49hx9xa3vjwcl9935a5kjqsn57ipdy"; depends=[hexbin lattice latticeExtra raster RColorBrewer sp viridisLite zoo]; };
   rasterize = derive2 { name="rasterize"; version="0.1"; sha256="18nrhmq1qmi05rkyr86xsyc8nz0fbdpf2d45h62bbfzbfynqd4qy"; depends=[png]; };
+  rasterpdf = derive2 { name="rasterpdf"; version="0.1.0"; sha256="00l83a26b76wpg0nd9cqms7d5yqw8cg4k5f94j34bxl3d7bzx5vc"; depends=[png]; };
   ratelimitr = derive2 { name="ratelimitr"; version="0.4.1"; sha256="06x759jxr5zcnvg9q120n5bpipkb16piw15kxrpk7i918mby889b"; depends=[assertthat]; };
   ratematrix = derive2 { name="ratematrix"; version="1.2.1"; sha256="0hbwfgwkkd5a83f3nqk5gdyiqbpzsgshvcjcslaz73si05zsrkgs"; depends=[ape coda corpcor ellipse geiger MASS mvMORPH phylolm Rcpp RcppArmadillo readr]; };
   rateratio_test = derive2 { name="rateratio.test"; version="1.0-2"; sha256="1a2v12z2dr893ha80fhada1820z5ih53w4pnsss9r9xw3hi0m6k5"; depends=[]; };
@@ -11855,6 +12098,7 @@ in with self; {
   rattle_data = derive2 { name="rattle.data"; version="1.0.2"; sha256="0cnmyzvy23jc4vz521c3jg0w4165waycvy5014l5773fy19zq75c"; depends=[]; };
   raustats = derive2 { name="raustats"; version="0.1.0"; sha256="0wyq45v4d5gyrn2zbn0qj7wm4a0jh0xjlp6wzzpdiy2w3c9xwx5z"; depends=[dplyr httr jsonlite lubridate readxl rvest tidyr xml2]; };
   raw = derive2 { name="raw"; version="0.1.6"; sha256="0hnqwa9pwj3k2y0bs6hxrvbwksjyq0q6m73c9hhlafg8g3lkyxnf"; depends=[]; };
+  rawr = derive2 { name="rawr"; version="0.1.0"; sha256="1a8r1vyvki3z2ms4miqv6wq9pzympgifsjx0pzzs6f4b40m083lq"; depends=[dplyr jsonlite rvest xml2]; };
   raws_profile = derive2 { name="raws.profile"; version="0.1.0"; sha256="04f7wk7x9j3rb6nn3zqss9vw0h9a4vpcjyilc2vqy0fm2by41xkg"; depends=[stringr tibble withr]; };
   rayshader = derive2 { name="rayshader"; version="0.11.5"; sha256="1sycybfpw0d5d7f2579047jr60vay26hzqlvj8a5c9czdyrvlcxs"; depends=[doParallel foreach ggplot2 imager magrittr png progress raster Rcpp RcppArmadillo rgl scales]; };
   rbacon = derive2 { name="rbacon"; version="2.3.9.1"; sha256="0gnvi0aaw4yyg1cvrdyps2590gx1lwcjl21y4q9zn3k00mnwmc12"; depends=[coda Rcpp]; };
@@ -11898,10 +12142,9 @@ in with self; {
   rcicr = derive2 { name="rcicr"; version="0.3.4.1"; sha256="1sa13sbhx64cf8szr2811iq4a1asb8d3k0igxw6fbssij2lwbxzp"; depends=[aspace dplyr jpeg matlab scales]; };
   rcites = derive2 { name="rcites"; version="1.0.1"; sha256="1rpalysmv0c7f23aj3k6h80cw9cmsv0vn82da07km5qfll5pis6y"; depends=[cli httr jsonlite]; };
   rcitoid = derive2 { name="rcitoid"; version="0.1.0"; sha256="11iqdj1q983w28fh17rqvmhs41ks09b24p408nl7hz4iqg9c7lpi"; depends=[crul curl fauxpas jsonlite]; };
-  rclimateca = derive2 { name="rclimateca"; version="1.0.2"; sha256="012p6vj78m43y8n85diaf5z11h4v0p4s898jmlipvsha11q60csn"; depends=[digest dplyr httr lubridate magrittr mudata2 prettymapr purrr readr reshape2 rlang stringr tibble tidyr]; };
   rclipboard = derive2 { name="rclipboard"; version="0.1.2"; sha256="04vkxz2wqb3q3igjqgaaim3sb71h046c2b8rhvg51hkp1win8s5w"; depends=[shiny]; };
   rcmdcheck = derive2 { name="rcmdcheck"; version="1.3.3"; sha256="1d4kzgfqy72r6b7bn1j4znyksrycgypx1jjvpv9lrmvn37mpkdhs"; depends=[callr cli crayon desc digest pkgbuild prettyunits R6 rprojroot sessioninfo withr xopen]; };
-  rcompanion = derive2 { name="rcompanion"; version="2.2.2"; sha256="1jlyd4cgzksxw7sjhjdvl10vr741ybidml95qi2gwp2r3x3nw4a3"; depends=[boot coin DescTools EMT lmtest multcompView nortest plyr]; };
+  rcompanion = derive2 { name="rcompanion"; version="2.3.7"; sha256="19s39khwnlilqgrq7a0dxphw5d5nzrb5550db3c61j2m1fxvy15z"; depends=[boot coin DescTools EMT lmtest multcompView nortest plyr]; };
   rcoreoa = derive2 { name="rcoreoa"; version="0.3.0"; sha256="0z9kllhk1j7c4sgnd88ngxv7xvr396azg9vr9p6i72ficr7flr64"; depends=[crul hoardr jsonlite pdftools]; };
   rcorpora = derive2 { name="rcorpora"; version="2.0.0"; sha256="1b8xa81mn3afadz77576vda9b0d99f1k096drxrpqd989g993aqy"; depends=[jsonlite]; };
   rcosmo = derive2 { name="rcosmo"; version="1.1.1"; sha256="195cxjgkcgz9qx51hsg9bd2y7c96dk69c8yvy9s2w59jy9iy5i7y"; depends=[cli entropy FITSio geoR mmap nnls Rcpp rgl tibble]; };
@@ -11916,7 +12159,7 @@ in with self; {
   rda = derive2 { name="rda"; version="1.0.2-2.1"; sha256="1y4fawslr3i6crjaxhsdb47kfsqkyszdx6avq3r5far5a4pvc639"; depends=[]; };
   rdatacite = derive2 { name="rdatacite"; version="0.4.2"; sha256="0ix2z8xrnv16qwnwhil7d0zr9bnzhhgd3i7r4m9xylayj80r0pcd"; depends=[crul jsonlite oai solrium]; };
   rdataretriever = derive2 { name="rdataretriever"; version="2.0.0"; sha256="0gnvvxvlfh6j887y5w83q5kg6lqqcb0c54lfcx9qp3r28hpdlxkz"; depends=[reticulate]; };
-  rdbnomics = derive2 { name="rdbnomics"; version="0.4.7"; sha256="1qbng6hml3nafs9vv1vrpaj0755di6bcxrzvp2ng9psh2yv0plz2"; depends=[curl data_table jsonlite]; };
+  rdbnomics = derive2 { name="rdbnomics"; version="0.5.0"; sha256="04zmipmkx8yr09q8kbdl4a76hly5yy3v67fcqny14xnx3iga3vja"; depends=[curl data_table jsonlite]; };
   rdd = derive2 { name="rdd"; version="0.57"; sha256="1lpkzcjd18x51wzr4d1prdjfsw5978z6zap65psfs02nszy69nqp"; depends=[AER Formula lmtest sandwich]; };
   rddapp = derive2 { name="rddapp"; version="1.1.0"; sha256="0zdm54hlxqp7r21fwdka33syjsrf6flrvwqm86hpwhg95880ixkk"; depends=[AER Formula lmtest R_utils sandwich shiny]; };
   rddensity = derive2 { name="rddensity"; version="1.0"; sha256="0v94izsghy35b33dq5b28p2lqs1fw1snyipdf9vgjz5s3qkzjkd8"; depends=[ggplot2 lpdensity]; };
@@ -11930,7 +12173,7 @@ in with self; {
   rdian = derive2 { name="rdian"; version="0.1.1"; sha256="0i4ljcqhmrwrqbhi321iffypxj4kndx47ssljnixr3fx2lmqh0q1"; depends=[curl httr]; };
   rdist = derive2 { name="rdist"; version="0.0.3"; sha256="1jp3s4293h973dpz0waq9abpd8ibp4gxdyk3bwn7a32zfpk4kjza"; depends=[Rcpp RcppArmadillo]; };
   rdiversity = derive2 { name="rdiversity"; version="1.2.1"; sha256="0j67b9mnq2xfbi2hrn1x9vgdv63779d0rcbzndljh37b1x5zlr22"; depends=[ape ggplot2 ggthemes phangorn phytools plyr reshape2 tibble tidyr]; };
-  rdlocrand = derive2 { name="rdlocrand"; version="0.4"; sha256="06cm6lsb4fzw26bip6l2ggpins5wp07lw7rnpr573klbwfnw5ksm"; depends=[AER sandwich]; };
+  rdlocrand = derive2 { name="rdlocrand"; version="0.5"; sha256="1dadb3yazk9kn051rswq3568m77x44485l2268ahm0im6bj2i7al"; depends=[AER sandwich]; };
   rdmulti = derive2 { name="rdmulti"; version="0.2"; sha256="1sl677kaq5qr2m9nzxfslwzai7h07mdfqjjzrak2xbpgqa44288z"; depends=[rdrobust]; };
   rdnb = derive2 { name="rdnb"; version="0.1-3"; sha256="0g85masa1a2c26l12i6ck1hdjvm2saqdlqnwb2p29rm9spmc04qg"; depends=[brew httr stringr xml2]; };
   rdoc = derive2 { name="rdoc"; version="0.1.0"; sha256="0ac6413jyrr7m25z30n3bpiafsvjx38ik6rrjzsiqxrfp41j6l9x"; depends=[cli crayon prettycode R6]; };
@@ -11940,7 +12183,7 @@ in with self; {
   rdrobust = derive2 { name="rdrobust"; version="0.99.4"; sha256="0ykz9lgkr95l6h7jk9k8k0yv26hd4iyvgr9j298l388ry9w1ph9w"; depends=[]; };
   rdrop2 = derive2 { name="rdrop2"; version="0.8.1"; sha256="1f4ysck58dm40k4wn9nfjaxym0mbgfkm146iidfkz7agmd1x0xyl"; depends=[assertive digest dplyr httr jsonlite magrittr purrr]; };
   rdryad = derive2 { name="rdryad"; version="0.4.0"; sha256="19ca618hymvpk5byrrglc6iidsgm6wn43fypspssa7b3r1c4xhdc"; depends=[crul curl data_table oai solrium tibble xml2]; };
-  rdtLite = derive2 { name="rdtLite"; version="1.1.0"; sha256="1kbvfyfah217z8pdr2i9c6wvkhxi28yjpy5mg70k6apiwf4lxd14"; depends=[curl digest ggplot2 gtools jsonlite knitr sessioninfo XML]; };
+  rdtLite = derive2 { name="rdtLite"; version="1.2"; sha256="1g4y8rsq7hy8kwradlmkmf4r309128mb3mfdyxjb24acazmaybyl"; depends=[curl digest ggplot2 gtools jsonlite knitr rmarkdown sessioninfo stringi XML]; };
   rdwd = derive2 { name="rdwd"; version="1.1.0"; sha256="1zx00bbfh0nqycs3h2f05kridikxqq59xaqkvbxv4rm827y8356x"; depends=[berryFunctions pbapply]; };
   re2r = derive2 { name="re2r"; version="0.2.0"; sha256="0xv355h4bps4a0picxmi6i15niq4knlail80fp9xvszyn72pm8gq"; depends=[htmlwidgets Rcpp RcppParallel stringi]; };
   reGenotyper = derive2 { name="reGenotyper"; version="1.2.0"; sha256="13g4fhj25kdk6wbl1hcabcaxcpv0dj0hj2l502wl1aywk1fvmy8m"; depends=[gplots MatrixEQTL zoo]; };
@@ -11957,7 +12200,7 @@ in with self; {
   readMzXmlData = derive2 { name="readMzXmlData"; version="2.8.1"; sha256="03lnhajj75i3imy95n2npr5qpm4birbli922kphj0w3458nq8g8w"; depends=[base64enc digest XML]; };
   readODS = derive2 { name="readODS"; version="1.6.7"; sha256="1nvkhjv3i6l7d15v2abxg4141hrgv2jmc4agxi2d0wv6j1fc1ya1"; depends=[cellranger readr stringi xml2]; };
   readOffice = derive2 { name="readOffice"; version="0.2.2"; sha256="0dg7fwxdl41nrjqnxvh9rpz0la99iid0wy51gncjwrh3s85fj2ks"; depends=[magrittr purrr rvest xml2]; };
-  readabs = derive2 { name="readabs"; version="0.4.0"; sha256="0qf35milmxjawx5qahjra1ixj3i0xvwv93wzxbpmmzyxk4jphf3k"; depends=[curl dplyr purrr readr readxl rsdmx stringr tibble tidyr XML]; };
+  readabs = derive2 { name="readabs"; version="0.4.1"; sha256="1kjvvasc780icfx8wn456y9fsa1rllg09vbsy6ym4cifnws74100"; depends=[curl dplyr purrr readr readxl rsdmx stringr tibble tidyr XML]; };
   readbitmap = derive2 { name="readbitmap"; version="0.1.5"; sha256="14825906l326w59g6apy00j55jg3h5kx2r6s031f4gdkbrc7szbk"; depends=[bmp jpeg png tiff]; };
   readbulk = derive2 { name="readbulk"; version="1.1.2"; sha256="0341sp9jqqci62zx6my4r50dwrysgjppjasx2lf1dj8w5bv559rd"; depends=[jsonlite plyr]; };
   reader = derive2 { name="reader"; version="1.0.6"; sha256="1x489q3ljap4zpny68mx83mgxaqiwlkglcy57whwhnh33dd7qp4h"; depends=[NCmisc]; };
@@ -11966,12 +12209,12 @@ in with self; {
   readobj = derive2 { name="readobj"; version="0.3.2"; sha256="0n25n02f5kn8zv90n2xzdasjnrqisl4n5szb667jw57v40b726cw"; depends=[Rcpp]; };
   readr = derive2 { name="readr"; version="1.3.1"; sha256="1wz496rw0ah433p755n3xac8gh7yzid4xgdjzd1a7wmpkgilvy9k"; depends=[BH clipr crayon hms R6 Rcpp tibble]; };
   readroper = derive2 { name="readroper"; version="0.9.1"; sha256="153iy144c4yxcs2cwr73czy69b4fj4q1g77rb8qmvp6blfwdcd71"; depends=[readr]; };
-  readsdmx = derive2 { name="readsdmx"; version="0.2.2"; sha256="1ja6fpjsbx5jzv9ys12wkcn3jrj8a2gnxpbswqk6ppckryi9hnp7"; depends=[Rcpp]; };
+  readsdmx = derive2 { name="readsdmx"; version="0.3.0"; sha256="188yzkjblbjly032312w0fazj7k7j4ynqfc69xpblnw4gs708sx0"; depends=[Rcpp]; };
   readstata13 = derive2 { name="readstata13"; version="0.9.2"; sha256="02mqwpzn7n3pqjxivnd1vlfc47xkyiywfz594x0f6vd2dym8rdwd"; depends=[Rcpp]; };
   readtext = derive2 { name="readtext"; version="0.75"; sha256="0xbl4q3y4kzigr6rgqb04sq1xqddfzqivkjmbd0v5sfammrhla8n"; depends=[antiword data_table digest httr jsonlite pdftools readODS readxl streamR stringi striprtf tibble xml2]; };
   readwritesqlite = derive2 { name="readwritesqlite"; version="0.0.2"; sha256="064imgjl197avdsjhqvlg9yzgsp4p4yisvk62l6arcnkixwlz086"; depends=[checkr DBI dttr2 err hms RSQLite sf tibble units]; };
   readxl = derive2 { name="readxl"; version="1.3.1"; sha256="15mambxr8c7k2ikdfsl1w3vxvm54dsnk0cl1qvks6iig7rql3d14"; depends=[cellranger progress Rcpp tibble]; };
-  realestateDK = derive2 { name="realestateDK"; version="0.1.0"; sha256="02y3c2zww9jakh9a0jqxkgcwshjz1hd5mw63603hyic7q4a07iv3"; depends=[statsDK]; };
+  readxlsb = derive2 { name="readxlsb"; version="0.1.2"; sha256="0vm1hl8rjmcly6wkq06x9q5yswcdxasdc66xgpvhvw8mf0q6rlkd"; depends=[cellranger Rcpp xml2]; };
   reams = derive2 { name="reams"; version="0.1"; sha256="07hqi0y59kv5lg0nl75xy8n48zw03y5m71zx58aiig94bf3yl95c"; depends=[leaps mgcv]; };
   rebird = derive2 { name="rebird"; version="1.0.0"; sha256="0gp8afj6y3vss2b11v0fqyc3ai67kilicr4fnk5zghljfvbxsxm8"; depends=[assertthat dplyr httr jsonlite]; };
   rebmix = derive2 { name="rebmix"; version="2.10.3"; sha256="0yhazicibq8h2d7ldv59isapc6f68psawa3vrs1fdzwkrraj6893"; depends=[mvtnorm]; };
@@ -11982,13 +12225,13 @@ in with self; {
   rebus_unicode = derive2 { name="rebus.unicode"; version="0.0-2"; sha256="185313wh4zpp6addfdr78pjhxzazlfwgsddwk02zrzblf4iwzjdm"; depends=[rebus_base]; };
   recexcavAAR = derive2 { name="recexcavAAR"; version="0.3.0"; sha256="0b91jbgqzkgzvk658ckk639yyz1daa0xql3qgl0kzgqg68d53x20"; depends=[kriging Rcpp]; };
   rechonest = derive2 { name="rechonest"; version="1.2"; sha256="0vpff8q5p6in7vjyl62bx3wmksravcg4mpx20qlgy5ia47vyhqp2"; depends=[httr jsonlite RCurl]; };
-  recipes = derive2 { name="recipes"; version="0.1.6"; sha256="1ndz9h0zvdj141r63l8047wbhaj0x8fwzzyq7b8mh78pvrrdpq2i"; depends=[dplyr generics glue gower ipred lubridate magrittr Matrix purrr rlang tibble tidyr tidyselect timeDate withr]; };
+  recipes = derive2 { name="recipes"; version="0.1.7"; sha256="1gw8x7vqj7k18mfpiqinyfwzv9i5r0pb51k7xcfxsjap6m9nks98"; depends=[dplyr generics glue gower ipred lubridate magrittr Matrix purrr rlang tibble tidyr tidyselect timeDate withr]; };
   reclin = derive2 { name="reclin"; version="0.1.1"; sha256="15qrdgjmclffivnljgmmipws9ks41fj4q40wnq0fk14mbv2045g2"; depends=[dplyr ldat lpSolve lvec Rcpp stringdist]; };
   recluster = derive2 { name="recluster"; version="2.8"; sha256="05g8k10813zbkgja6gvgscdsjd99q124jx31whncc4awdsgk69s4"; depends=[ape cluster phangorn phytools picante vegan]; };
   recmap = derive2 { name="recmap"; version="1.0.5"; sha256="1xl2j6zjk1vyf2zz8zcl4532k0c1jkrjqhp3vndnl5ynqr5nqlph"; depends=[GA Rcpp sp]; };
   recoder = derive2 { name="recoder"; version="0.1"; sha256="0wh0lqp7hfd4lx2xnmszv1m932ax87k810aqxdb6liwbmvwqnfgd"; depends=[stringr]; };
   recombinator = derive2 { name="recombinator"; version="1.0.1"; sha256="1dbsqig2jjp3zypcqxf9c2brb09pv6xikmh6fhz5vgxy5wkyivks"; depends=[crayon]; };
-  recommenderlab = derive2 { name="recommenderlab"; version="0.2-4"; sha256="1bpnag4sizqn9r6m5p3w3p8sv1r1jb7y9hz92v3bryrbl8z93fkp"; depends=[arules irlba Matrix proxy registry]; };
+  recommenderlab = derive2 { name="recommenderlab"; version="0.2-5"; sha256="1mhs7yniabpbjpq7w04jfrzng3apz2lcg5izjk8hjnl5pww684hk"; depends=[arules irlba Matrix proxy recosystem registry]; };
   recommenderlabBX = derive2 { name="recommenderlabBX"; version="0.1-1"; sha256="042yh0h8qxj7n9hysrfdxnpb3g0zb6s5b683s7hn5mjc55q7nn4g"; depends=[recommenderlab]; };
   recommenderlabJester = derive2 { name="recommenderlabJester"; version="0.1-2"; sha256="0kr9xc2gih2myn1a8h8dxxmdhibv1sjwjsvlrj9d5hvd1mgfhks5"; depends=[recommenderlab]; };
   reconstructr = derive2 { name="reconstructr"; version="2.0.2"; sha256="0pzpd2l1b6y1b1lnd95lpc5s8niz7p56vkmxgyi6g6b25vh9c2vi"; depends=[openssl Rcpp]; };
@@ -12026,14 +12269,14 @@ in with self; {
   regplot = derive2 { name="regplot"; version="0.2"; sha256="0j2mra5fqcixyl4wqwpzfng98rdh4xnl79ka7ilfi0jvz2jix84x"; depends=[beanplot sm survival vioplot]; };
   regpro = derive2 { name="regpro"; version="0.1.1"; sha256="02axbq63hsqwg3q2ixr0lpsdai9q6wj57s5k1343q9m0pw90vr73"; depends=[denpro]; };
   regress = derive2 { name="regress"; version="1.3-15"; sha256="1cgr0r49cmr8nzs2lr2cm8lli1i8azyas0lbnf1681kyab15c0r7"; depends=[]; };
-  regressoR = derive2 { name="regressoR"; version="1.1.7"; sha256="01qgl58vgq9dp7588dkfd2rd1417h0zgqr32jjw41ksgy12gpx0g"; depends=[colourpicker corrplot dplyr DT e1071 flexdashboard gbm ggplot2 glmnet htmltools kknn neuralnet pls randomForest rattle ROCR rpart shiny shinyAce shinydashboardPlus shinyjs shinyWidgets xgboost zip]; };
+  regressoR = derive2 { name="regressoR"; version="1.1.8"; sha256="1a8whcr32sjv6lncch8y1n7xs44djm3nx90lpvh8z8r5ggc8bw21"; depends=[colourpicker corrplot dplyr DT e1071 flexdashboard gbm ggplot2 glmnet htmltools kknn neuralnet pls randomForest rattle ROCR rpart shiny shinyAce shinydashboardPlus shinyjs shinyWidgets xgboost zip]; };
   regrrr = derive2 { name="regrrr"; version="0.1.0"; sha256="0h9vag1ypf5ycvz5fbfvw4nh4l8dgn2kmsgzq9kmn7hw2qsjwbbl"; depends=[dplyr ggplot2 magrittr MuMIn purrr rlang robustbase scales spatstat stringr tidyr usdm]; };
   regsel = derive2 { name="regsel"; version="0.2"; sha256="0wwwpawqsqimaldy0zxnqsy23nwp30ypa5dnrnndwhbs4qz99c9w"; depends=[elasticnet glmnet]; };
   regsem = derive2 { name="regsem"; version="1.3.9"; sha256="1klml4bp76mplipxaca7fk653cjxgdmmiciksxgiglxkzmf2bdps"; depends=[lavaan Rcpp RcppArmadillo Rsolnp]; };
   regspec = derive2 { name="regspec"; version="2.4"; sha256="18i6k2wqaddrc0dz7v8x3s9205dcfwanqhpnxa9hkpyqzbb17pd3"; depends=[]; };
   regsubseq = derive2 { name="regsubseq"; version="0.12"; sha256="0879r4r8kpr8jd6a3fa9cifm7cv0sqzz8z1alkm1b2fr1625md3g"; depends=[]; };
   regtest = derive2 { name="regtest"; version="0.05"; sha256="1wrrpp2hvkas0yc512gya3pvd0v97pn4v51k5jxkwyd1pp68zd1q"; depends=[]; };
-  regtools = derive2 { name="regtools"; version="1.0.1"; sha256="0807r8721qmdl8ahvlzcvqaq2rfvlvhblwbwdpi79fm7dk8vvq1i"; depends=[car dummies FNN mvtnorm]; };
+  regtools = derive2 { name="regtools"; version="1.1.0"; sha256="1kia4h4bwjjfq7jm57ihdgspbqfn683ssbzngp5r069ki931h3nb"; depends=[dummies FNN mvtnorm sandwich]; };
   rehh = derive2 { name="rehh"; version="3.0.1"; sha256="061nk9xmlbllisszpscfpa95653745v645jm3qls1cp42d73rz6k"; depends=[rehh_data]; };
   rehh_data = derive2 { name="rehh.data"; version="1.0.0"; sha256="1jkvwmnnmfa7iyvrabgcfzw3vfzx0dlgq47s6yf4zayi437v4di0"; depends=[]; };
   rehydratoR = derive2 { name="rehydratoR"; version="0.5.2"; sha256="1d94m9hv1l72l9lph2vzbq4qqbfcgyhv2qk82p9vb8l2ckavjzvv"; depends=[dplyr jsonlite rtweet tibble]; };
@@ -12071,7 +12314,7 @@ in with self; {
   repeated = derive2 { name="repeated"; version="1.1.2"; sha256="19kcsj96i1zpnwfan3gz5vrzc2gqlah0wrdr9vb4vvacz45wcdfq"; depends=[rmutil]; };
   repec = derive2 { name="repec"; version="0.1.0"; sha256="0alr9fbmfxmnnnn1qymy65crcycynwz435jj0vangbb4p0qhv8pm"; depends=[jsonlite]; };
   repfdr = derive2 { name="repfdr"; version="1.2.3"; sha256="0jpk44arg1jib0h2w90h851bs5cd1ss32fab9bfvf9iir2jk8985"; depends=[Rcpp]; };
-  replicateBE = derive2 { name="replicateBE"; version="1.0.10"; sha256="0f9ws632b1gi5v3q0zxp94b30m4rzz6cg7p5vqbq88fsab1hm52a"; depends=[lmerTest nlme pbkrtest PowerTOST readxl]; };
+  replicateBE = derive2 { name="replicateBE"; version="1.0.11"; sha256="0j958jzkw67yjjmfxh9y42bdv0z3dyki6qcxvacj4c6qmb26b0jq"; depends=[lmerTest nlme pbkrtest PowerTOST readxl]; };
   replicatedpp2w = derive2 { name="replicatedpp2w"; version="0.1-2"; sha256="0nskwkqm9z2aphpim6pvykhc3fphlsbap3r49nghkwjpngd0qzj8"; depends=[spatstat spatstat_utils]; };
   replicationInterval = derive2 { name="replicationInterval"; version="2.0.1"; sha256="1jyvyqr8r2fs1cmbz7zjcc8p116bnkslvx27pqi92y5pxgqvsqvr"; depends=[ggplot2 MASS MBESS pbapply]; };
   replyr = derive2 { name="replyr"; version="1.0.4"; sha256="1vz2lw2b587c7yc2l9x2rx9wdb2l3nfr3cjv1jy0h4y9k5rmzfpg"; depends=[DBI dbplyr dplyr rlang wrapr]; };
@@ -12086,28 +12329,28 @@ in with self; {
   reporttools = derive2 { name="reporttools"; version="1.1.2"; sha256="1i87xmp7zchcb8w8g7nypid06l2439qyrvpwsjz6qny954w6fa2b"; depends=[xtable]; };
   repr = derive2 { name="repr"; version="1.0.1"; sha256="0jy43g34r38fqprcdys0p9pliahrj5l64a9bbkzy206qgz0j5ppc"; depends=[base64enc htmltools jsonlite pillar]; };
   represent = derive2 { name="represent"; version="1.0"; sha256="0jvb40i6r1bh9ysfqwsj7s1g933d7z5fq9d618yjrqr6hbbqsvac"; depends=[]; };
-  represtools = derive2 { name="represtools"; version="0.1.2"; sha256="1zkabch49q23kd1786km5cb9wcaccbxds11v9hwjzsgrs15g5w35"; depends=[whisker]; };
+  represtools = derive2 { name="represtools"; version="0.1.3"; sha256="00hnvzkkcl9d3k115i5l9gs0wah5d11amn7q62m1j158lkqlcfza"; depends=[whisker]; };
   reprex = derive2 { name="reprex"; version="0.3.0"; sha256="0v7vxzs8alwz8y1cjicpimp5yimf1g9gb8x5wy3zhvrz6kk2lg10"; depends=[callr clipr fs rlang rmarkdown whisker withr]; };
   reproducer = derive2 { name="reproducer"; version="0.3.0"; sha256="0z0gkikr5219wb20hndqlflxar1mn3638zn2095ja0b2d1cn40nk"; depends=[dplyr GetoptLong ggplot2 gridExtra httr jsonlite lme4 magrittr MASS metafor openxlsx readr reshape stringr tibble tidyr xtable]; };
-  reproducible = derive2 { name="reproducible"; version="0.2.9"; sha256="1q7lvvz7sxd5a6248rzgyx3smqih0gjncz3y05qbmy77rpkv0h7x"; depends=[archivist backports crayon data_table digest dplyr fastdigest fasterize fpCompare gdalUtils git2r googledrive httr magrittr memoise quickPlot R_utils raster RCurl remotes rgdal rgeos rlang sf sp testthat versions]; };
+  reproducible = derive2 { name="reproducible"; version="0.2.10"; sha256="08k9kly2fhim2zv7dv8sd79wxpaqaf1ssb0jyvn2ci9hb1rvv7ms"; depends=[archivist backports crayon data_table digest dplyr fastdigest fasterize fpCompare gdalUtils git2r googledrive httr magrittr memoise quickPlot R_utils raster RCurl remotes rgdal rgeos rlang sf sp testthat versions]; };
   reproj = derive2 { name="reproj"; version="0.4.0"; sha256="0liwv4sgxdm42vyykjyc3jihcxk3b5q0d7cwgai8349nn1ah0wdh"; depends=[proj4 tibble]; };
   repurrrsive = derive2 { name="repurrrsive"; version="1.0.0"; sha256="1nmy88h2bfv2bad282kbrmnkjx9d8klgzv4mm8nspm049s09ydmz"; depends=[tibble]; };
-  reqres = derive2 { name="reqres"; version="0.2.2"; sha256="18ib0qbfw3sih7xs1z4szjqppr7lbj5wx0w0kx80g810m7q27wyp"; depends=[assertthat brotli jsonlite R6 stringi urltools webutils xml2]; };
+  reqres = derive2 { name="reqres"; version="0.2.3"; sha256="0dly09h8dpjlmvrd1wfg1gqcqhm03ax97qr0nd1p0fg9y0pdapya"; depends=[assertthat brotli jsonlite R6 stringi urltools webutils xml2]; };
   request = derive2 { name="request"; version="0.1.0"; sha256="1q7zd6q00gdqmgq7s7nq1ixmns8zn2amr5zah9rwnsn8dkllj9yh"; depends=[curl httr jsonlite lazyeval magrittr R6 whisker]; };
   requireR = derive2 { name="requireR"; version="1.0.0.1"; sha256="192l7i3q7s2a6n737an3fn258agjsdzh0q2w0vc8jbz7v4f3i92d"; depends=[]; };
   rerddap = derive2 { name="rerddap"; version="0.6.5"; sha256="1pmpf9jdgp71ganzslwlp5qhkxhy7snaxgbrrym7swx6v2jnwhmv"; depends=[crul data_table digest dplyr hoardr jsonlite ncdf4 tibble xml2]; };
-  rerddapXtracto = derive2 { name="rerddapXtracto"; version="0.4.0"; sha256="1a99acffmpywv9lx59fphy2p27xdmxsrmf9crj4m6ykj5rack7fj"; depends=[abind dplyr ggplot2 httr maps ncdf4 parsedate plotdap readr rerddap sf sp]; };
+  rerddapXtracto = derive2 { name="rerddapXtracto"; version="0.4.4"; sha256="03sd24hbm9s3q014ys77avjbqpm9mpl8lmaw9r6bwbq81jw2ak9c"; depends=[abind dplyr ggplot2 httr maps ncdf4 parsedate plotdap readr rerddap sf sp]; };
   rerf = derive2 { name="rerf"; version="2.0.4"; sha256="0ykgxdmkqapdpk5zwi8h1cbsvjv6jpscqpr5cjmdzdan22m09l6k"; depends=[dummies mclust Rcpp RcppArmadillo RcppZiggurat]; };
   resample = derive2 { name="resample"; version="0.4"; sha256="1rckzm2p0rkf42isc47x72j17xqrg8b7jpc440kn24mqw4szgmgh"; depends=[]; };
-  resampledata = derive2 { name="resampledata"; version="0.3.0"; sha256="09hp97zk31f016d65vq64gv413c6bx1dwqy74ai34xk00flkwady"; depends=[]; };
+  resampledata = derive2 { name="resampledata"; version="0.3.1"; sha256="1nxjqvxxvycccmh1n7lpc4k8zmwnciicfr5rzfid1icij5fzw3ak"; depends=[]; };
   resautonet = derive2 { name="resautonet"; version="1.0"; sha256="0kp6gp79j8cc5xbwr94vf6nh41msw7sqgrz9xkjzrj4asb9yjln5"; depends=[dplyr keras magrittr Rcpp RcppArmadillo rstack]; };
   resemble = derive2 { name="resemble"; version="1.2.2"; sha256="189a6b1y720w9ff8cyqazd2d3v1msbfw8zdqr5rmilxvxmnspccs"; depends=[foreach iterators Rcpp RcppArmadillo]; };
   reservoir = derive2 { name="reservoir"; version="1.1.5"; sha256="1qvjq8j2gxp6b8m3k3822f9na8a1kbwzzsmq70m763dcq293rgiz"; depends=[gtools]; };
   reshape = derive2 { name="reshape"; version="0.8.8"; sha256="0s6i0sqxg1vldxs6miv8mi0zydxbqzgpmzfiwkj8y7jix3yrfmad"; depends=[plyr]; };
   reshape2 = derive2 { name="reshape2"; version="1.4.3"; sha256="03ki5ka1dj208fc0dclbm0b4xp9d769pah2j9cs34l776p4r9zwa"; depends=[plyr Rcpp stringr]; };
   reshapeGUI = derive2 { name="reshapeGUI"; version="0.1.0"; sha256="0kb57isws8gw0nlr6v9lg06c8000hqw0fvhfjsjyf8w6zwbbq3zs"; depends=[gWidgets gWidgetsRGtk2 plyr reshape2]; };
-  respirometry = derive2 { name="respirometry"; version="1.0.0"; sha256="1cwgs951sy36fyzcm256wqbwadl4j3kvbhzw991vnlml1b48c0cy"; depends=[birk lubridate marelac measurements minpack_lm PKNCA seacarb segmented]; };
-  restatapi = derive2 { name="restatapi"; version="0.2.3"; sha256="1rf6kl6r0i13l2zrir2y8ha3lmy3zgbjr1fwbsg1dnkgg4lq7rrc"; depends=[data_table rjson rsdmx xml2]; };
+  respirometry = derive2 { name="respirometry"; version="1.0.1"; sha256="1syc2gf3jri90pi0qmrhwg472rn6dx8abpr9yb8jb5q1f1qs07p0"; depends=[birk lubridate marelac measurements minpack_lm PKNCA seacarb segmented]; };
+  restatapi = derive2 { name="restatapi"; version="0.3.6"; sha256="1g82vnka0nq98rxjjx6ph8dsd7dgarq4fwsf4c8jfsna6r1prrcx"; depends=[data_table rjson rsdmx xml2]; };
   restfulr = derive2 { name="restfulr"; version="0.0.13"; sha256="1dk45mzrr6ka92yjz7hfhkj12kpx1wg4szv1h1mg80mgga4ganbv"; depends=[RCurl rjson S4Vectors XML yaml]; };
   restimizeapi = derive2 { name="restimizeapi"; version="1.0.0"; sha256="1ss6fng5pmqg6cafc256g9ddz8f660c68ysxfan6mn4gdaigz7lb"; depends=[RCurl RJSONIO]; };
   restlos = derive2 { name="restlos"; version="0.2-2"; sha256="083w1ldax8bnf3w4119damma2nz75c3ki187b0275i1mqxqrixp7"; depends=[geometry igraph limSolve rgl som]; };
@@ -12124,7 +12367,7 @@ in with self; {
   reutils = derive2 { name="reutils"; version="0.2.3"; sha256="09dhf4s7wz3anrkzqi16abx64gk8ck2142kfd8pv71mjy3x548l7"; depends=[assertthat jsonlite RCurl tibble XML]; };
   reval = derive2 { name="reval"; version="2.0.0"; sha256="1yxkyc6wdp5h3cp8i42a9cf0b1cwr4nmpd7svlp7bpfxlcnqqa0d"; depends=[doParallel foreach]; };
   revdbayes = derive2 { name="revdbayes"; version="1.3.4"; sha256="0aqj2hvav3k4b1xiaz2adrqjdm87074a14p58ddclywq609cy2zk"; depends=[bayesplot Rcpp RcppArmadillo rust]; };
-  revealedPrefs = derive2 { name="revealedPrefs"; version="0.4"; sha256="1xd1bvji99mgnz772naz95i0xnrvqdkwxjj7mjblk2qdym95s1d0"; depends=[pso Rcpp RcppArmadillo]; };
+  revealedPrefs = derive2 { name="revealedPrefs"; version="0.4.1"; sha256="1m8y1mj39bnf9q0n9mi0ashvb79lksx5dfkxb04qj2h5kkyxg49g"; depends=[pso Rcpp RcppArmadillo]; };
   revealjs = derive2 { name="revealjs"; version="0.9"; sha256="0h4csxrcl1rzmj3g01nf0mr990zc8swrf4jvmxwqsyzx9v2cqbnc"; depends=[rmarkdown]; };
   revengc = derive2 { name="revengc"; version="1.0.4"; sha256="1nipkff9zmkdi509qfdrmvsq5c643xd7bzzw5bchxd8nmfqb412i"; depends=[dplyr mipfp stringr truncdist]; };
   reverseR = derive2 { name="reverseR"; version="0.1"; sha256="0pzk97q1zs5g1v4ngqd6bkwwxcp89j890nycpc99ipycbgm2r9yw"; depends=[DT knitr markdown shiny]; };
@@ -12134,16 +12377,16 @@ in with self; {
   rex = derive2 { name="rex"; version="1.1.2"; sha256="0alsadgjgass3wr8y5d247j12qqzg454sc84vpskclrkmz778g5x"; depends=[lazyeval magrittr]; };
   rexpokit = derive2 { name="rexpokit"; version="0.26.6.4"; sha256="0flqf57zsf0a70yrkgp9jfq3bmj36wyfzwldpkmfvw3qvfhddysw"; depends=[Rcpp]; };
   rfPermute = derive2 { name="rfPermute"; version="2.1.7"; sha256="0dhgxm9b2djgadr1wnwgd0gbqv7751y0ln4jis32p0qmwi30v76d"; depends=[abind dplyr ggplot2 gridExtra magrittr plyr randomForest reshape2 rlang scales swfscMisc tibble tidyr]; };
-  rfUtilities = derive2 { name="rfUtilities"; version="2.1-4"; sha256="15784vhfp5sxmy58p2xgmc1v3bxx2f78i1pzc186q77zs88c5sq9"; depends=[cluster randomForest]; };
+  rfUtilities = derive2 { name="rfUtilities"; version="2.1-5"; sha256="1anwvmxn3xrc1aqxl75rzlk4wby8l54rmkp0bgi8dgbz2l223xr0"; depends=[cluster randomForest]; };
   rfVarImpOOB = derive2 { name="rfVarImpOOB"; version="1.0"; sha256="1341bicd65qw3pz1j8d6c9baj9d6s70ljdaaf87xvx8pjnajrfsw"; depends=[binaryLogic dplyr ggplot2 ggpubr magrittr prob randomForest titanic]; };
-  rfacebookstat = derive2 { name="rfacebookstat"; version="1.9.1"; sha256="04jd2w5g0y9m6wbk09rqfskcwixvxvv2j7blxid791jvj4jn8c74"; depends=[bitops data_table dplyr httr jsonlite purrr RCurl stringr tidyr]; };
+  rfacebookstat = derive2 { name="rfacebookstat"; version="1.10.1"; sha256="0a0qd9ha520z0smkb3pkjqc6a2f6vhy5m311wh9cmldnq633ycck"; depends=[bitops data_table dplyr httr jsonlite purrr RCurl stringr tidyr]; };
   rfbCNPJ = derive2 { name="rfbCNPJ"; version="0.1.1"; sha256="0zvpazxi184ia2wql0120kw7665dn9cs8a2kv91n79pncabb4xfg"; depends=[fs glue httr magrittr progress purrr readr stringr tibble xml2]; };
   rfigshare = derive2 { name="rfigshare"; version="0.3.7"; sha256="1qgzn0mpjy4czy0pnbi395fxxx84arkg8r7rk8aidmd34584gjiq"; depends=[ggplot2 httpuv httr plyr RJSONIO XML yaml]; };
   rfinterval = derive2 { name="rfinterval"; version="1.0.0"; sha256="1z7v0sbql6g2h3fr1268nj79rbx1d33hjfaraxhbikrjgb8mbp0w"; depends=[MASS ranger]; };
   rfishbase = derive2 { name="rfishbase"; version="3.0.4"; sha256="1km3xjbf3l81sfmmjs55criq4xw6l3xa74f8g1rxsbr5bci9xlia"; depends=[dplyr gh magrittr memoise purrr readr rlang stringr]; };
   rfisheries = derive2 { name="rfisheries"; version="0.2"; sha256="16j3hn1py8khqadmh81qsg76c62wzqkaq3fn39z0z5mgynmcm62j"; depends=[assertthat data_table ggplot2 httr rjson]; };
-  rflexscan = derive2 { name="rflexscan"; version="0.1"; sha256="1akja9nm7hzkf2q6r2vd29g0xsb6hivkjx40cvdg1di6zc7q9dnq"; depends=[igraph Rcpp rgdal sp]; };
-  rflights = derive2 { name="rflights"; version="0.1.0"; sha256="0jzmsv90waw8l3816qk4mprzagysfg5mhcqd05rqlnlszwyvb1r2"; depends=[httr]; };
+  rflexscan = derive2 { name="rflexscan"; version="0.2.0"; sha256="008xpbdqix18lwdqcx0mixwhv8v47kzpkblr53igp5766l04nfyj"; depends=[igraph Rcpp rgdal sp]; };
+  rflights = derive2 { name="rflights"; version="0.1.103"; sha256="1gxfsc3dhlzy6bpqjdxk5x309jmjgvxr8d9amnhrjdygzj6icf18"; depends=[httr]; };
   rfm = derive2 { name="rfm"; version="0.2.0"; sha256="1d07bms5ykfkw0ynfl21fhs9s6yvs44fn570vzi2dj8h5ywbsz15"; depends=[assertthat dplyr forcats ggplot2 ggthemes lubridate magrittr purrr RColorBrewer rlang tidyr xplorerr]; };
   rfml = derive2 { name="rfml"; version="0.1.0"; sha256="133adpfjpp14m47841k6ybq9lrvby9bxgr5zs4i3akjr2575nq1j"; depends=[httr jsonlite PKI XML]; };
   rfoaas = derive2 { name="rfoaas"; version="2.0.0"; sha256="04wx3d6v9zci6i5k3c4nfdycgjmng7f533b9k84kf1pa4lwp45ad"; depends=[httr]; };
@@ -12152,22 +12395,22 @@ in with self; {
   rfviz = derive2 { name="rfviz"; version="1.0.0"; sha256="0rzyy7r2ybqjnp1g5bbkxydpa93h8q4r71kdaj77r475m2i4kb6b"; depends=[loon randomForest]; };
   rgabriel = derive2 { name="rgabriel"; version="0.7"; sha256="1c6awfppm1gqg7rm3551k6wyhqvjpyidqikjisg2p2kkhmyfkyzx"; depends=[]; };
   rgbif = derive2 { name="rgbif"; version="1.3.0"; sha256="1lamyylaj51vn693964xhgmx2fyrnlc4yljh63cb74gx9qjc9yga"; depends=[crul data_table geoaxe ggplot2 jsonlite lazyeval magrittr oai tibble whisker wicket xml2]; };
-  rgdal = derive2 { name="rgdal"; version="1.4-4"; sha256="1my56hdc9x40ynxx1qwqwqxjvjxybmm00w4xg5gi8zgj19pffci5"; depends=[sp]; };
+  rgdal = derive2 { name="rgdal"; version="1.4-6"; sha256="0lj1dax56dxxsj1hindxcvgz169p9dxd0y4wjypbyr01nja8rz4d"; depends=[sp]; };
   rgdax = derive2 { name="rgdax"; version="1.0.0"; sha256="16ph6n1nyl2v2w51ih6wzkpw0j0hfa3f60q1g6p9zis59j0rh7d9"; depends=[digest httr jsonlite RCurl]; };
   rgen = derive2 { name="rgen"; version="0.0.1"; sha256="0gl82v09q1ha58wd1014s46wzkx1yf348bc7jkl6s4qdc6c4vsb8"; depends=[]; };
   rgenoud = derive2 { name="rgenoud"; version="5.8-3.0"; sha256="0p93wf6ghgz2nifxbscb6bhahh5jd2ba7nh1c2mb6fmbxnsi3swv"; depends=[]; };
   rgeolocate = derive2 { name="rgeolocate"; version="1.0.1"; sha256="1v9kd71wpxna1war0rbp91pc5wdqlganmj2c2fc5m5176dnxd2v3"; depends=[httr Rcpp]; };
   rgeopat2 = derive2 { name="rgeopat2"; version="0.2.6"; sha256="04r8q3mig7sp38f3m9g20xlb0h046c04hhrzg4n06b5wkn7298s5"; depends=[readr sf stringr]; };
-  rgeos = derive2 { name="rgeos"; version="0.4-3"; sha256="19z01mw8kkvcdnyhrwr78lmg5bk76sv164m69w6jszqmzj5fr1hy"; depends=[sp]; };
+  rgeos = derive2 { name="rgeos"; version="0.5-2"; sha256="0ajrrxfwfp184c6rnby3dq54hzp3rrx3px72dn7gbdn6c4li2bqz"; depends=[sp]; };
   rgexf = derive2 { name="rgexf"; version="0.15.3"; sha256="0iw1vk32ad623aasf6f8hl0qkj59f1dsc2riwqc775zvs5w7k2if"; depends=[igraph Rook XML]; };
   rggobi = derive2 { name="rggobi"; version="2.1.22"; sha256="1g7k4xais9xkjlbvrkadr5d6c5rw4jp9c0gljhm71pa1fc9fcqff"; depends=[RGtk2]; };
   rgho = derive2 { name="rgho"; version="1.0.1"; sha256="0jkfmyn3i50vsqciy96wd2fpik6yfg0sz6rrhwb04jv1dmyz2nfa"; depends=[curl dplyr httr jsonlite lazyeval magrittr memoise readr tibble tidyr]; };
-  rgl = derive2 { name="rgl"; version="0.100.26"; sha256="0h77akviwjd86j2qyx326xynbmwhypd6ydprzlwqnidd4ckrr271"; depends=[crosstalk htmltools htmlwidgets jsonlite knitr magrittr manipulateWidget shiny]; };
-  rglobi = derive2 { name="rglobi"; version="0.2.19"; sha256="13mzx7gmpz5zhp4nplkzigipyn3vkp8d5whz617fqrv8n3hy8ybm"; depends=[curl RCurl rjson]; };
+  rgl = derive2 { name="rgl"; version="0.100.30"; sha256="0rzqzskcwf2ah4yr62x5rjwf7yh90d43h39gk7jmfc5lc08zaxc5"; depends=[crosstalk htmltools htmlwidgets jsonlite knitr magrittr manipulateWidget shiny]; };
+  rglobi = derive2 { name="rglobi"; version="0.2.20"; sha256="0fygxl5bfkkl5d2wadpbk5xg0y6kab4c99mliwlzvl9d3mqpnpsp"; depends=[curl RCurl readr rjson]; };
   rglwidget = derive2 { name="rglwidget"; version="0.2.1"; sha256="0siqxn3gyl98i84p0yha821b4rdrp2i0942mkx819wnf7qwrpqcv"; depends=[rgl]; };
   rgoogleslides = derive2 { name="rgoogleslides"; version="0.3.1"; sha256="06i1ljrib0ap87bxlbpnvx5fr05pwzcmza48gbicvg7fwhz9hs05"; depends=[assertthat httr jsonlite R6]; };
   rgr = derive2 { name="rgr"; version="1.1.15"; sha256="1mrnmbh2crhkwdi37q59hx76afvkhgzgaacg3688q7jp23d58z6x"; depends=[fastICA MASS]; };
-  rgrass7 = derive2 { name="rgrass7"; version="0.1-12"; sha256="1gsy45j6nq4i6lbr4gyhgmnc9l8g6qxbhsqby9r59d6xz49b2xlv"; depends=[sp XML]; };
+  rgrass7 = derive2 { name="rgrass7"; version="0.2-1"; sha256="0rhizda58hmglgr4aq6sr5y11y615w0pwpgdk3mylm9pjgj5i5vn"; depends=[XML]; };
   rgsp = derive2 { name="rgsp"; version="0.2.0"; sha256="1fk0k479srfr0f4a5abyzcrzwy9hr1v5xf0jgs36fbim9bh7njlc"; depends=[dplyr magrittr tibble]; };
   rgw = derive2 { name="rgw"; version="0.1.0"; sha256="12f7bsfg24cld9y47jyqxswgc1bk4adbhhdpycapinbcfhyzc91p"; depends=[]; };
   rhandsontable = derive2 { name="rhandsontable"; version="0.3.7"; sha256="1y6dlpzid5apjx0gphkym7gq3lhwp0bxan8ca274pg170xyb33h8"; depends=[htmlwidgets jsonlite magrittr]; };
@@ -12198,12 +12441,12 @@ in with self; {
   rio = derive2 { name="rio"; version="0.5.16"; sha256="0rfl56fdawlhc98451a9lcb6a6m56kw0i7dvd5hx58z025d8vsyk"; depends=[curl data_table foreign haven openxlsx readxl tibble]; };
   rioja = derive2 { name="rioja"; version="0.9-21"; sha256="01vc7zfw13zdri0rx93adx86gprzcmw9d454848ach95hdkwipk5"; depends=[mgcv vegan]; };
   rise = derive2 { name="rise"; version="1.0.4"; sha256="12r7mbaxp9pjypbpjxlsbqg7spw80gjgm2w0lsvgvclffc50a6ni"; depends=[dplyr ggplot2]; };
-  riskParityPortfolio = derive2 { name="riskParityPortfolio"; version="0.1.2"; sha256="0bn2yyb828q3kw5q4wvybspvalrzrjvwxamcn79s0a79i9swssa8"; depends=[alabama nloptr quadprog Rcpp RcppEigen]; };
+  riskParityPortfolio = derive2 { name="riskParityPortfolio"; version="0.2.0"; sha256="1blswxlxf5iyrjixcabwmn1c5a3kkpyn57pw89a0k36cijry30pk"; depends=[alabama Matrix nloptr quadprog Rcpp RcppEigen]; };
   riskPredictClustData = derive2 { name="riskPredictClustData"; version="0.2.6"; sha256="0mvy9299pg374gvvqs9lmj2j0f3bzyy279kjpz7jq35hkgz5wif3"; depends=[gee Hmisc MASS mvtnorm]; };
   riskR = derive2 { name="riskR"; version="1.1"; sha256="1qadfyb07idfw0bs006kb3917rzda83di6jmsr22941gv78z1wyv"; depends=[]; };
   riskRegression = derive2 { name="riskRegression"; version="2019.01.29"; sha256="0nvp42j2bzqmiffni2yxg7170z1hl9xli614v6ji65nhy27gnr85"; depends=[abind cmprsk data_table doParallel foreach ggplot2 lava plotrix prodlim ranger Rcpp RcppArmadillo rms survival timereg]; };
   riskSimul = derive2 { name="riskSimul"; version="0.1"; sha256="0s2a1mn6g11m96gqscb916caj2aykcs3rkacpqcdnlyzryk1gsnb"; depends=[Runuran]; };
-  riskclustr = derive2 { name="riskclustr"; version="0.1.0"; sha256="016479l8q28mblapc7rhm16wr99fp4127h03yv62cxphiw90pvyg"; depends=[aod gtools knitr mlogit usethis]; };
+  riskclustr = derive2 { name="riskclustr"; version="0.2"; sha256="0j5gcm9a57yrg5ppqmacdjr16b9d8rwqkhq1mawy1fjpf18d2max"; depends=[aod gtools Matrix mlogit stringr]; };
   risksetROC = derive2 { name="risksetROC"; version="1.0.4"; sha256="1fh0jf8v536qzf1v3awx3f73wykzicli4r54yg1z926ccqb4h80l"; depends=[MASS survival]; };
   riskyr = derive2 { name="riskyr"; version="0.2.0"; sha256="0zq5qybqisbh9k7i57s8yw9xcm7yckcjk17h4ybcx4p8788gg5m3"; depends=[]; };
   ritis = derive2 { name="ritis"; version="0.7.6"; sha256="1a1q44dmagzf4k67pxa5x0s5s5jx9kpqg4s193c8r3m7kk3xwna6"; depends=[crul data_table jsonlite solrium tibble]; };
@@ -12214,10 +12457,10 @@ in with self; {
   rivervis = derive2 { name="rivervis"; version="0.46.0"; sha256="19jsl5g46jcbc0kg47bsif1wrw9z9brgvwdcxqjc89shnx3hzzfv"; depends=[]; };
   rivr = derive2 { name="rivr"; version="1.2-1"; sha256="17kh5kin2id8imarvwkjikrmz266x2ldja6b7xpj34s35dzap682"; depends=[Rcpp]; };
   rjade = derive2 { name="rjade"; version="0.1"; sha256="0f1jljj6m1almz0na984n0g314y0rl6a0mx04rbrpipgfgz1h37c"; depends=[V8]; };
-  rjags = derive2 { name="rjags"; version="4-8"; sha256="17xmjksj69f9wk4x71jxk4cgiqhaf2fj6bjm0mgzp4qln5x84a8m"; depends=[coda]; };
+  rjags = derive2 { name="rjags"; version="4-9"; sha256="1vrmxxfnia2mkmfkp5yaq5qrlh4xg3ggab6fnj14mrp1231wb91a"; depends=[coda]; };
   rjazz = derive2 { name="rjazz"; version="0.1.7"; sha256="0wmqlpgcr98dvapfmdcph5mdv202rzzsvb06iy5sqvpizpg7pbsz"; depends=[RCurl]; };
   rjdqa = derive2 { name="rjdqa"; version="0.1.0"; sha256="07qvvy3i0ak7p717wf68gx8d1m9l4lhibf0ynmc0jny58i56fiw8"; depends=[plotrix RJDemetra]; };
-  rje = derive2 { name="rje"; version="1.9"; sha256="1dyd34z6lb0p6zmyax5dpzflgc9a4saka33mvdfcxi5pj0rnygaz"; depends=[]; };
+  rje = derive2 { name="rje"; version="1.10.10"; sha256="1i0v8v5sdc9dwwljgnv3365sxyshp9dqbmamr3fa5gmhsjly3zs2"; depends=[knitr]; };
   rjmcmc = derive2 { name="rjmcmc"; version="0.4.5"; sha256="14rzvp6z5avlcnmlmvb6w4gvlh6v4ncbcai3v4c4svnjv555vz45"; depends=[coda madness mvtnorm]; };
   rjson = derive2 { name="rjson"; version="0.2.20"; sha256="0v1zvdd3svnavklh7y5xbwrrkbvx6053r4c5hgnk7hz7bqg7qa1s"; depends=[]; };
   rjsonapi = derive2 { name="rjsonapi"; version="0.1.0"; sha256="0qshll0y8b6lbfrqmp69w9kc9hgfrz94dk68nddshk9ilg14lx4d"; depends=[crul jsonlite plumber R6]; };
@@ -12229,25 +12472,26 @@ in with self; {
   rkt = derive2 { name="rkt"; version="1.5"; sha256="1rgf7dnk4d1b46rns2mb2s1ilxq7hqrh057vrrl00324r4h8bs1k"; depends=[]; };
   rkvo = derive2 { name="rkvo"; version="0.1"; sha256="0ci8jqf9nc8hb063nckxdnp0nlyr4ghby356lxm00anw44jlmw8v"; depends=[Rcpp]; };
   rlang = derive2 { name="rlang"; version="0.4.0"; sha256="038mmbmklw17ncgz53vrdx2506c1jj6di3y165bbx2sl2yia8j4p"; depends=[]; };
-  rlas = derive2 { name="rlas"; version="1.3.2"; sha256="0sd1lwkvw4k4s52x9ym5xlr1aqjq0i05k781lkx4chjwk69y40nq"; depends=[BH data_table Rcpp]; };
+  rlas = derive2 { name="rlas"; version="1.3.4"; sha256="0ccdbg634ibdjh1c7bri4l6achfrb4agy4iilr4z1pc1yzgsnk6r"; depends=[BH data_table Rcpp]; };
   rld = derive2 { name="rld"; version="1.0"; sha256="1glv4q25z14hcwifwg623h77p4awpsn3nk843pnph4sb3p5qbmn3"; depends=[emdbook MASS survival]; };
   rleafmap = derive2 { name="rleafmap"; version="0.2"; sha256="1i2qczipg7lr6fl35lcl896r54jia7libxx83darrfzc1hd9sdcq"; depends=[knitr raster sp]; };
   rlecuyer = derive2 { name="rlecuyer"; version="0.3-4"; sha256="0d5mcdzn6f5nhwzs165a24z36d0b8gd0cyfyzffvr6p96h8qydy7"; depends=[]; };
   rless = derive2 { name="rless"; version="0.1.1"; sha256="0ham8kf2hbswrcnc5i5b3svywdwq3kwp9n66n4k9sllahl4x9jdn"; depends=[V8]; };
-  rlfsm = derive2 { name="rlfsm"; version="0.3.0"; sha256="1b8wkj333x845ss2j8daxixzhgk81pc0b3a1ahz159n2a1ha0afr"; depends=[doParallel elliptic foreach ggplot2 plyr Rdpack reshape2 stabledist]; };
+  rlfsm = derive2 { name="rlfsm"; version="0.3.1"; sha256="1pqhm25xc1i7lx99vapflcdp7i82sw3zd20avx3p71j60wyngdx0"; depends=[doParallel foreach ggplot2 plyr Rdpack reshape2 stabledist]; };
   rlist = derive2 { name="rlist"; version="0.4.6.1"; sha256="08awy2p7rykc272wvvya4ddszbr7b7s7qv4wr3hs8ylr4jqlh0dv"; depends=[data_table jsonlite XML yaml]; };
   rlm = derive2 { name="rlm"; version="1.2"; sha256="18y735z05k9pms6iv1739qg3q12w099qhs42icxhqs5gcdhz92fm"; depends=[]; };
-  rlmDataDriven = derive2 { name="rlmDataDriven"; version="0.3.0"; sha256="0xq5dh3p94cqnhbbippqflmdlwy3f53hx8rph2bhdgkrwqm1751i"; depends=[MASS tseries]; };
+  rlmDataDriven = derive2 { name="rlmDataDriven"; version="0.4.0"; sha256="1fhh2siafpqmvpxi2piccxvvn5n38s5d6as6iyn43rgpsslswc8g"; depends=[MASS tseries]; };
   rlme = derive2 { name="rlme"; version="0.5"; sha256="0p26mw4g12l279lh80vqcjs3pvjr759ap2m622490k1i2ralxzif"; depends=[magic MASS mgcv nlme quantreg Rcpp robustbase stringr]; };
   rlo = derive2 { name="rlo"; version="0.3.2"; sha256="0abq42dhapzmh6hvmildbn8zya29c6p1aqbv8avc03g014dwbrd0"; depends=[PythonInR]; };
   rly = derive2 { name="rly"; version="1.6.2"; sha256="1bb55g3rip524dccaxvahjxsi2cimxqvzc897pxplv3bb10pm0r2"; depends=[futile_logger R6]; };
   rma_exact = derive2 { name="rma.exact"; version="0.1.0"; sha256="1igs92la79akyqj84ah23lpcay7i33k7zgzcwm7sii782fhirivx"; depends=[abind metafor]; };
   rmaf = derive2 { name="rmaf"; version="3.0.1"; sha256="0w247mamwgibr5576p5c2lzaiz2lv2c25n7gw9q99s7rc4bps7j7"; depends=[]; };
   rmake = derive2 { name="rmake"; version="1.1.0"; sha256="00qlki2vps505nxzmfykf1iyq4b0y20nb75hbfcj63ap46z7zk3c"; depends=[assertthat pryr rmarkdown visNetwork]; };
+  rmangal = derive2 { name="rmangal"; version="2.0.0"; sha256="0vn5i6hwi64kzi481m3y696cqdxz6frv1n7xxm72a3vbz1jsqcrf"; depends=[httr igraph jsonlite memoise purrr]; };
   rmapshaper = derive2 { name="rmapshaper"; version="0.4.1"; sha256="0kd8hppn4d3z527s3kqz0mll7qjy0pbxbif46dfqx3rci6m62a68"; depends=[geojsonio geojsonlint jsonlite readr sf sp V8]; };
-  rmapzen = derive2 { name="rmapzen"; version="0.4.1"; sha256="1vql1cy38c4kv8pyl81877s587kq4l9sx9nslbgk3l41wvyyvphk"; depends=[assertthat digest dplyr geojsonio httr jsonlite maps maptools purrr rgdal sf sp tibble tidyr]; };
+  rmapzen = derive2 { name="rmapzen"; version="0.4.2"; sha256="1vybg3lmrqghvd23jwpfmypvqz2b65bc0m2pwbpizwkkg35iza70"; depends=[assertthat digest dplyr geojsonio httr jsonlite maps maptools purrr rgdal sf sp tibble tidyr]; };
   rmargint = derive2 { name="rmargint"; version="1.0.2"; sha256="1hl2nxmgknw74jvmc05wz6zkf7i151xl7h7hdpcivvm60yizlx8i"; depends=[]; };
-  rmarkdown = derive2 { name="rmarkdown"; version="1.14"; sha256="0qfw5rkvwqpgix32g6qy9xrr50awmm146aqbm836xravih2b2dpn"; depends=[base64enc evaluate htmltools jsonlite knitr mime stringr tinytex xfun yaml]; };
+  rmarkdown = derive2 { name="rmarkdown"; version="1.16"; sha256="1p11g9lma604ndrhvyvriqxxp91lardc543nmvmr49n1m7309qvz"; depends=[base64enc evaluate htmltools jsonlite knitr mime stringr tinytex xfun yaml]; };
   rmatio = derive2 { name="rmatio"; version="0.14.0"; sha256="072fxg81r4rsc71qrf5p6lr5s3gchbgvxhyzwlx3wxw7y2px6w7y"; depends=[Matrix]; };
   rmcfs = derive2 { name="rmcfs"; version="1.3.0"; sha256="0mvrf6d2pfdvsgfgwkkb7k7q367k5i71wbq96gjhfimxr2lxwf7f"; depends=[data_table dplyr ggplot2 gridExtra igraph reshape2 rJava stringi yaml]; };
   rmcorr = derive2 { name="rmcorr"; version="0.3.0"; sha256="1p05ln653yrd02wmn8wfzawiw6a924d8an0568fcbgl1pdna43b1"; depends=[psych RColorBrewer]; };
@@ -12262,7 +12506,7 @@ in with self; {
   rmeta = derive2 { name="rmeta"; version="3.0"; sha256="0vkbnxp579v8zmcv1isdbzj5swpr6fq17zwparxcvzswjc2x9ydr"; depends=[]; };
   rmetalog = derive2 { name="rmetalog"; version="1.0.0"; sha256="1ndw8drzhf74sjx31zfhhx9q1l6pdn4yx2i8l7klp38d5bsc27xm"; depends=[ggplot2 lpSolve]; };
   rmetasim = derive2 { name="rmetasim"; version="3.1.7"; sha256="0sz4mdprdi6sgkfwfdvh2hr9nxiwq17sw0vggq3cvs7lzb0i6m9r"; depends=[ade4 adegenet gtools pegas]; };
-  rmgarch = derive2 { name="rmgarch"; version="1.3-6"; sha256="0x1zc9i0hpzxsng2lg4k0jikj3jd705lh6229jmhrh1zk77jzskd"; depends=[Bessel corpcor ff MASS Matrix pcaPP Rcpp RcppArmadillo Rsolnp rugarch shape spd xts zoo]; };
+  rmgarch = derive2 { name="rmgarch"; version="1.3-7"; sha256="108wrbqj4c02c9cyv5m5xlswb1mlfdrhggb005sixr2dcqghb163"; depends=[Bessel corpcor ff MASS Matrix pcaPP Rcpp RcppArmadillo Rsolnp rugarch shape spd xts zoo]; };
   rmi = derive2 { name="rmi"; version="0.1.1"; sha256="1y0395l9lhskdrk3x9ps2dmv0sznsba0n6a9fmma33dc9dhywgf9"; depends=[BH Rcpp RcppArmadillo]; };
   rminer = derive2 { name="rminer"; version="1.4.2"; sha256="1hjgcawjrwsf0nv2hlznr1cvpm445yyxc6cq28k2yzyivk74si34"; depends=[adabag Cubist e1071 glmnet kernlab kknn lattice MASS mda nnet party plotrix pls randomForest rpart xgboost]; };
   rmio = derive2 { name="rmio"; version="0.1.2"; sha256="0lhfwjmi5s7ysm4jrb0r18cm3sdcswdrsx9kps4dv7v2yab4jkvx"; depends=[]; };
@@ -12272,12 +12516,12 @@ in with self; {
   rms_gof = derive2 { name="rms.gof"; version="1.0"; sha256="1n0h3nrp11f2x70mfjxpk2f3g4vwjaf4476pjjwy49smxxlxwz82"; depends=[]; };
   rmsfact = derive2 { name="rmsfact"; version="0.0.3"; sha256="05s23rfs9prr2ia3h4h9y614xhv91lbgppgf3mrrssxkwz220kd5"; depends=[]; };
   rmsfuns = derive2 { name="rmsfuns"; version="0.0.0.2"; sha256="0by2d6l25lf5vidxbkcxghpxycffyldzzbxcw6h4rm86zmkkv1m0"; depends=[magrittr purrr readr tidyverse xts zoo]; };
-  rmumps = derive2 { name="rmumps"; version="5.1.2-6"; sha256="158h0h9478w00ikjqprkdc182xzvv591m9nyay8s5n1iwzcflpmx"; depends=[Rcpp]; };
+  rmumps = derive2 { name="rmumps"; version="5.2.1-5"; sha256="0pgfmnkj3v4raf49w5229m27a54jpkhd000r202xyp679vcwsapc"; depends=[Rcpp]; };
   rmutil = derive2 { name="rmutil"; version="1.1.3"; sha256="1nl20nyahnm55z41d096ni9iqhn19ab98i9c13ja1i6ik4gg9fks"; depends=[]; };
   rmweather = derive2 { name="rmweather"; version="0.1.3"; sha256="1qdf511vmpffrdfcxlll54km2s0pf6pdswj8401k4ymv5iif91hl"; depends=[dplyr ggplot2 lubridate magrittr pdp purrr ranger stringr strucchange tibble viridis]; };
-  rmytarget = derive2 { name="rmytarget"; version="2.1.7"; sha256="1n6cazd0p28da8y1p8byggk86zh826c6x41cidih0mmbrsdqww9z"; depends=[dplyr httr lubridate purrr stringr]; };
+  rmytarget = derive2 { name="rmytarget"; version="2.1.8"; sha256="1sn1pncxnv2jgxhmbm4zlq6zyi8nsz90x8b7697qlqf2la837v96"; depends=[dplyr httr lubridate purrr stringr]; };
   rnaseqWrapper = derive2 { name="rnaseqWrapper"; version="1.0-1"; sha256="1fa3hmwrpccf09dlpginl31lcxpj5ypxspa0mlraynlfl5jrivch"; depends=[ecodist gplots gtools]; };
-  rnassqs = derive2 { name="rnassqs"; version="0.4.0"; sha256="1vzkcw1rmrc4vq453jz63ldypnagv5vlwvczv5c938574g2yjwix"; depends=[httr jsonlite]; };
+  rnassqs = derive2 { name="rnassqs"; version="0.5.0"; sha256="1mbkv32zidax9i6km93bbi3m7xpnsy805cz4ikdrid84qg94an09"; depends=[httr jsonlite]; };
   rnaturalearth = derive2 { name="rnaturalearth"; version="0.1.0"; sha256="193b31a7n9jhc607mhwxbpx5gr0fpj3qasm9dbi6kcc7vac3ilgm"; depends=[sf sp]; };
   rnaturalearthdata = derive2 { name="rnaturalearthdata"; version="0.1.0"; sha256="1z32j5lz2lb8xgpkr73majw22k0b49iazj6jjc7j4w9k4zxxa102"; depends=[sp]; };
   rnbp = derive2 { name="rnbp"; version="0.1.0"; sha256="01hx9r7ai42kcj8l7bmqrma8w3l1f9bmg2ingpqxirimxkfwv2k8"; depends=[curl httr jsonlite]; };
@@ -12289,11 +12533,11 @@ in with self; {
   rngtools = derive2 { name="rngtools"; version="1.4"; sha256="1kivj594bn774lbn29ws2rmzy2km99sza0j3jqvhal6hwmk27a9s"; depends=[digest pkgmaker stringr]; };
   rngwell19937 = derive2 { name="rngwell19937"; version="0.6-0"; sha256="0m6icqf7nckdxxvmqvwfkrpjs10hc7l8xisc65q8iqpnpwl5p2f6"; depends=[]; };
   rnn = derive2 { name="rnn"; version="0.9.8"; sha256="1f1h7x9vff0jrdkv1gpxlmlr5v1c81gsfxy4z83rq3v0drpxahnv"; depends=[shiny sigmoid]; };
-  rnoaa = derive2 { name="rnoaa"; version="0.8.4"; sha256="1gyvsaz3whql4jzphrlawv3rrzyjp852kwzgq4wgdm8x25qyg6pv"; depends=[crul dplyr geonames ggplot2 gridExtra hoardr isdparser jsonlite lubridate rappdirs scales tibble tidyr XML xml2]; };
+  rnoaa = derive2 { name="rnoaa"; version="0.9.0"; sha256="1hhp2axqpqrfvn5isxay1ci032inagir57b0z52apcjk1y271c4r"; depends=[crul dplyr geonames ggplot2 gridExtra hoardr isdparser jsonlite lubridate rappdirs scales tibble tidyr tidyselect XML xml2]; };
   rnpn = derive2 { name="rnpn"; version="0.1.0"; sha256="10xx8fxgdknv71ks42xxvf38xsmjy6s87y67wi21673v0n07fxb5"; depends=[data_table httr jsonlite plyr]; };
   rnr = derive2 { name="rnr"; version="0.2.1"; sha256="1z9bab3qmq8d79bcvjzldbxlah2w8mqp2ifd0cn1348dafwa0dhi"; depends=[assertthat purrr]; };
   rnrfa = derive2 { name="rnrfa"; version="2.0"; sha256="0ymfgas1hzmmmf56ax47nfjm9mf9yzj48np1fzyshhzavnlymg0s"; depends=[curl dplyr ggmap ggplot2 httr jsonlite lubridate rgdal sp tibble xts]; };
-  roadoi = derive2 { name="roadoi"; version="0.5.2"; sha256="0fzvg75m5yyz2181n2i208525cixyiwclfij47qd3d61qqzlmlp3"; depends=[dplyr httr jsonlite miniUI plyr purrr shiny tibble tidyr]; };
+  roadoi = derive2 { name="roadoi"; version="0.6"; sha256="1mlf63018qpgyqma51fas1nvags7qcrsw11hm6c1idnxjh0sz82z"; depends=[dplyr httr jsonlite miniUI plyr purrr shiny tibble tidyr]; };
   roahd = derive2 { name="roahd"; version="1.4.1"; sha256="0d89d21s32bsjkm8bdiqrbccd3m9badh87vrsb1laawhl4hr3dn9"; depends=[dplyr magrittr robustbase scales]; };
   robCompositions = derive2 { name="robCompositions"; version="2.1.0"; sha256="17kpl35lynm1fwsl8ljwl6yjph1fps8vk2m8qxsx0x64wwfvccim"; depends=[car cluster cvTools data_table e1071 fpc GGally ggplot2 kernlab MASS mclust pls Rcpp robustbase rrcov sROC tidyr VIM zCompositions]; };
   robFitConGraph = derive2 { name="robFitConGraph"; version="0.1.0"; sha256="092nc0xnjs2zxd9ij0dl1xggb8mwl8nly284yjhhygmwlwsvhzxm"; depends=[MASS mvtnorm Rcpp]; };
@@ -12304,7 +12548,7 @@ in with self; {
   robets = derive2 { name="robets"; version="1.4"; sha256="0lvzfpv6569pjysblhadd05sglx0qvyr9wipb9cpiya4a1992n61"; depends=[forecast Rcpp]; };
   robfilter = derive2 { name="robfilter"; version="4.1.1"; sha256="1fxqva2khk16sj5ka5zdpaknh2w9n925ys0i4v7ahqvzhnxg6l3b"; depends=[lattice MASS robustbase]; };
   robis = derive2 { name="robis"; version="2.1.8"; sha256="1qi6ay0v3vc2gz5xalgj8vfx7zaiz5726mkkgwawxfj35gmdq0mk"; depends=[dplyr ggplot2 httr jsonlite leaflet]; };
-  robmed = derive2 { name="robmed"; version="0.3.0"; sha256="1q5l11khsx0wilcdp157jp3jfkks88rfraf2rcwjhcq28yw1sjcj"; depends=[boot ggplot2 quantreg robustbase shiny]; };
+  robmed = derive2 { name="robmed"; version="0.4.0"; sha256="1wds9yh2sjjwmfmkjaxarmbmq226gm55m2r1y6ry41i3kjjrr83b"; depends=[boot ggplot2 quantreg robustbase shiny]; };
   robmixglm = derive2 { name="robmixglm"; version="1.0-2"; sha256="0z23frjv9yscw0q33s5vlrmisg9an5hksyhcrgcnlan6x63r91kq"; depends=[actuar bbmle boot fastGHQuad MASS numDeriv Rcpp VGAM]; };
   robotstxt = derive2 { name="robotstxt"; version="0.6.2"; sha256="1c1rhiwkdzvbspwa5km6gp3sjhzmb60ljibb2pf26s931lkr5b6l"; depends=[future future_apply httr magrittr spiderbar stringr]; };
   robreg3S = derive2 { name="robreg3S"; version="0.3"; sha256="0rv8qh98wws1f40d1kmysyy9qin0ngsvwq63cnxbwi290wsnrvls"; depends=[GSE MASS robustbase]; };
@@ -12366,22 +12610,22 @@ in with self; {
   rospca = derive2 { name="rospca"; version="1.0.4"; sha256="1pxm34xsc2610n0i6dwcm4rhn016yqb03f8vrm93r7285c04n4q7"; depends=[elasticnet mrfDepth mvtnorm pcaPP pracma robustbase rrcov rrcovHD]; };
   rosqp = derive2 { name="rosqp"; version="0.1.0"; sha256="0975g7p75bq238g7lr200svsqm9i11z7l331r0igm5ycahljrlsm"; depends=[Matrix R6 Rcpp]; };
   rosr = derive2 { name="rosr"; version="0.0.8"; sha256="1v1lllqim6m6c2j3s7zgd9nxbxja719995lqlawijifrksrkncds"; depends=[blogdown bookdown bookdownplus clipr devtools htmlwidgets knitr mindr rmarkdown rstudioapi shiny tinytex]; };
-  rotasym = derive2 { name="rotasym"; version="1.0-5"; sha256="15kw50c08vdamsxmi2ybripzh0vqif14jyrclyyflihrsw9l8p9p"; depends=[Rcpp RcppArmadillo RcppZiggurat]; };
+  rotasym = derive2 { name="rotasym"; version="1.0-6"; sha256="134gpkcryqy4kwnm89d0ihzx4s7m7bs1wypq6mp2ajdnn8qh6zv1"; depends=[Rcpp RcppArmadillo]; };
   rotationForest = derive2 { name="rotationForest"; version="0.1.3"; sha256="1z2wk3mcs5hrahsxralidbc0dd8gxdbwjpr2f71g4g3isfx1ic8d"; depends=[rpart]; };
   rotations = derive2 { name="rotations"; version="1.5"; sha256="1zksh6hyxdkm0lvvrld6dgkmhszn6wsjrjzr2xbn3af3gsvsydaa"; depends=[ggplot2 Rcpp RcppArmadillo rgl sphereplot]; };
-  rotl = derive2 { name="rotl"; version="3.0.9"; sha256="10kgaaghb8yh6nkchb24difzpkaa9lsxci6qw878ywxlh9my8yyc"; depends=[ape assertthat httr jsonlite rentrez rncl]; };
+  rotl = derive2 { name="rotl"; version="3.0.10"; sha256="0fh7fmaylv9490yhw6sknv03xmx5isp29mlr0xypyh6mwagngd1q"; depends=[ape assertthat httr jsonlite rentrez rncl]; };
   rotor = derive2 { name="rotor"; version="0.2.3"; sha256="1gydvlaby84mw5av6sgv6lsvzp2p4znc3mqsdv5gdx1l2sngfmcm"; depends=[dint R6]; };
   roughrf = derive2 { name="roughrf"; version="1.0"; sha256="0nwdynqfb9yzjvi1lykgdkch3b4g09aj8vbd6sf5pyx473s066y4"; depends=[mice nnet randomForest]; };
   roundhouse = derive2 { name="roundhouse"; version="0.0.1"; sha256="142dw9ky6fyp5n8zf5lymx083gi56q6wxj4jm0m8cjb0khiqw2lq"; depends=[httr jsonlite]; };
-  routr = derive2 { name="routr"; version="0.3.0"; sha256="1mjf1vwrh1k1kjl1kcgqs29zb8h9m05630czsjkz7li3pmvy9mrv"; depends=[assertthat digest httpuv R6 reqres stringi uuid]; };
+  routr = derive2 { name="routr"; version="0.4.0"; sha256="1vswq7vm80nwb50grr4cs290kbq5lx9b19dq0c2wlp9d2dxk50si"; depends=[assertthat digest httpuv R6 reqres stringi uuid]; };
   rowr = derive2 { name="rowr"; version="1.1.3"; sha256="1f93c2yni956flwnxgphn340pc7p6yagr5xnmhinjgk9kvsd07yh"; depends=[]; };
   roxygen2 = derive2 { name="roxygen2"; version="6.1.1"; sha256="0wq29ilqas8yn2z8v49fk0hbgchg29nmyyhwczgdipz0cbhbfipd"; depends=[brew commonmark desc digest pkgload purrr R6 Rcpp stringi stringr xml2]; };
   roxygen2md = derive2 { name="roxygen2md"; version="1.0.0"; sha256="1gvrfy0sk5qi8d93zxj5f7xgnnw0w38zyxdik4ckf0pkk0zdm27a"; depends=[desc devtools enc rex rlang tibble usethis withr]; };
   royston = derive2 { name="royston"; version="1.2"; sha256="1rywc89qzx0hldbq10201bjdhz60pq2gmgd9b9j52mza3w4canjz"; depends=[moments nortest]; };
-  rpact = derive2 { name="rpact"; version="2.0.2"; sha256="0g5r0mqrp48bl3jsq83ga0b7b7fypv84idwxfgnrsj0gvjyzrgny"; depends=[Rcpp]; };
+  rpact = derive2 { name="rpact"; version="2.0.4"; sha256="1x4jrvprss2s4qgagypqrq0flalkqlxha8ap2bcf5wc7i63c5c8m"; depends=[Rcpp]; };
   rpanel = derive2 { name="rpanel"; version="1.1-4"; sha256="0yzasb4k5jcx3wfsll9k9alyrwc0l1x6pk91nj7cqrdiapw8j519"; depends=[]; };
   rpart = derive2 { name="rpart"; version="4.1-15"; sha256="0p5frya963ppn476p5dxs2mnarsalksr6gw9zzmjsn8ikq7bx3ib"; depends=[]; };
-  rpart_plot = derive2 { name="rpart.plot"; version="3.0.7"; sha256="0i4ix8vabnfvcaf7vs2mvyx85ix0wkxfrhr98nvhfxchzanzrrq4"; depends=[rpart]; };
+  rpart_plot = derive2 { name="rpart.plot"; version="3.0.8"; sha256="0y8054jw44jkjg8ijp3p2grsqwrmsdfzk8vps9ksgm7mgfq5732d"; depends=[rpart]; };
   rpart_utils = derive2 { name="rpart.utils"; version="0.5"; sha256="00ahvmly6cdf7qhhcic0dbjlljqq8kbhx15rc7vrkd3hzd55c0im"; depends=[rpart]; };
   rpartScore = derive2 { name="rpartScore"; version="1.0-1"; sha256="15zamlzbf6avir8zfw88531zg5c0a6sc5r9v5cy9h08ypf34xf4y"; depends=[rpart]; };
   rpartitions = derive2 { name="rpartitions"; version="0.1"; sha256="1gklsi4pqhk16xp9s49n1lr9ldm1vx61pvphjqsqkzrlxwcpx3j8"; depends=[hash]; };
@@ -12415,12 +12659,11 @@ in with self; {
   rptR = derive2 { name="rptR"; version="0.9.22"; sha256="0vvjc6qiq71d5wckl77z606q1fp43mgrfzp1bxcab96n5whb2r9k"; depends=[lme4 pbapply]; };
   rpubchem = derive2 { name="rpubchem"; version="1.5.10"; sha256="06j9ir65ykky5hdbyv74fnddwqd39jxvr6jig0kjqisc75k4spjz"; depends=[base64enc car data_table fingerprint iterators itertools RCurl RJSONIO stringr XML]; };
   rqPen = derive2 { name="rqPen"; version="2.1"; sha256="195s2l60llw2hb5abykydajadzg44700j5kahkw57413hh86qrh0"; depends=[quantreg regpro]; };
-  rqdatatable = derive2 { name="rqdatatable"; version="1.1.9"; sha256="1j8cczhid1im0afxnfhqcsy36vmcyrnqfwfbvns11ysjw5i6gh2v"; depends=[data_table rquery wrapr]; };
-  rquery = derive2 { name="rquery"; version="1.3.7"; sha256="05zygsf02p3dlbaap1mfi5whhq55mwj2h2p0wcx60hqwbfq2xj4k"; depends=[wrapr]; };
+  rqdatatable = derive2 { name="rqdatatable"; version="1.2.2"; sha256="1r1i8g17ij5397xa86rzax4iw3v5gniy2d2s4a724zj8fxwcws34"; depends=[data_table rquery wrapr]; };
+  rquery = derive2 { name="rquery"; version="1.3.8"; sha256="1pmxs1w2c84wljrq10lch8bs0l4nbx6l5nwm5mq9ynal9xhp4qas"; depends=[wrapr]; };
   rr = derive2 { name="rr"; version="1.4"; sha256="1c2h6ibjfwrjfqh1if3c90pdh0g2rf3p71j4p9w23xbbrx2l80pl"; depends=[arm coda magic MASS]; };
   rr2 = derive2 { name="rr2"; version="1.0.2"; sha256="099vjg91ni2bnxlra18pvgsvzrl28zrj639cdjrh3wkpqv99d04q"; depends=[ape lme4 Matrix nlme phylolm]; };
   rrBLUP = derive2 { name="rrBLUP"; version="4.6"; sha256="1bw4pjj9hm9ik5bvvklnlkykhlqm6k7pbkma1iwc3kbg8shpbd18"; depends=[]; };
-  rrBlupMethod6 = derive2 { name="rrBlupMethod6"; version="1.3"; sha256="1qwv954mhry46ff2ax48xcmnasygi5alv8d413g3qbk2da6i0d8l"; depends=[]; };
   rray = derive2 { name="rray"; version="0.1.0"; sha256="0x4wavvjsiy8b9bhgxddisx82k6q52qhngr2am50bf38d3x2n58h"; depends=[glue Rcpp rlang vctrs xtensor]; };
   rrcov = derive2 { name="rrcov"; version="1.4-7"; sha256="14zjyqcdiqx6js99nx5s8hmyx564ixy2d8s6i7wa50xmx368rl6b"; depends=[cluster lattice mvtnorm pcaPP robustbase]; };
   rrcov3way = derive2 { name="rrcov3way"; version="0.1-10"; sha256="0ybl759mfva185z2mjs5s8cjim9h8dk4gkqnva2rj9kxp7i45srd"; depends=[robustbase rrcov ThreeWay]; };
@@ -12438,7 +12681,7 @@ in with self; {
   rrlda = derive2 { name="rrlda"; version="1.1"; sha256="06n9jah190cz25n93jlb5zb0xrx91bjvxgswwdx9hdf0fmwrpkvz"; depends=[glasso matrixcalc mvoutlier pcaPP]; };
   rroad = derive2 { name="rroad"; version="0.0.5"; sha256="09q5r9wq3vm5wy5aigx9wffv7m0njlp3sma1djm6cp7hhwgss0nj"; depends=[]; };
   rromeo = derive2 { name="rromeo"; version="0.1.0"; sha256="0dab3gcdpc5w9nxjw02348vj8cbrr8324aw982kjlrwkpjnvmfv5"; depends=[httr xml2]; };
-  rrpack = derive2 { name="rrpack"; version="0.1-7"; sha256="0svrw2ik59hjyfb0kag4nv8ilcaz7irmkp7ndbxxn0jg7dacb411"; depends=[ggplot2 glmnet lassoshooting MASS Rcpp RcppArmadillo]; };
+  rrpack = derive2 { name="rrpack"; version="0.1-10"; sha256="03lr72327fa8sim2n4bfrwni4hhn5rf27mnpw0lrscjw37gjd7bz"; depends=[ggplot2 glmnet lassoshooting MASS Rcpp RcppArmadillo]; };
   rrr = derive2 { name="rrr"; version="1.0.0"; sha256="0sv6k70mv325yjm8yjy4dw8cqc0xc071iiv94fk1l1yfz0n67prz"; depends=[dplyr GGally ggplot2 magrittr MASS plotly Rcpp]; };
   rrscale = derive2 { name="rrscale"; version="0.1.3"; sha256="0pf5pac883f1p6gidy2k1nrbrygi1va8r5h785449dhphx806bf5"; depends=[abind DEoptim doParallel foreach]; };
   rrtable = derive2 { name="rrtable"; version="0.1.0"; sha256="1rvqb32fr63dkm5kz291pxzli8yi10k76v0lm1qdn28cx1l6ff3y"; depends=[devEMF editData flextable ggplot2 magrittr moonBook officer purrr readr rmarkdown rvg shiny stringr ztable]; };
@@ -12447,19 +12690,21 @@ in with self; {
   rsae = derive2 { name="rsae"; version="0.1-5"; sha256="1f3ry3jwa6vg2vq2npx2pzzvfwadz8m48hjrqjk860nfjrymwgx5"; depends=[]; };
   rsample = derive2 { name="rsample"; version="0.0.5"; sha256="0lkwhydb8csg24zkpsblyykzfsjqr930h46kbpm2wk9kgygkfspd"; depends=[dplyr furrr generics purrr rlang tibble tidyr tidyselect]; };
   rsatscan = derive2 { name="rsatscan"; version="0.3.9200"; sha256="00vgby24jknq8nl7rnqcwg7gawcxhwq8b7m98vjx2hkqx39n4g21"; depends=[foreign]; };
-  rscala = derive2 { name="rscala"; version="3.2.15"; sha256="1d1aiy07cgfnp51vpqfypypkfwzmvw3y81xi81i33p6ylk3mmzi8"; depends=[]; };
+  rscala = derive2 { name="rscala"; version="3.2.16"; sha256="0c07lq3qhg4h5n0g0s1i11q5jrlijvidrdy3h1ln262mn2wqn8az"; depends=[]; };
+  rscielo = derive2 { name="rscielo"; version="1.0.0"; sha256="005nmi18831a2krl2xhj74ya9mfjq8zzccjafnfxha89x8ygxsa3"; depends=[dplyr httr magrittr purrr rvest stringr tibble xml2]; };
   rscimark = derive2 { name="rscimark"; version="1.0"; sha256="1jsjz4d5bnxb90qqzz42m4nyvm8d8w8bs0m1r5g2n78zmckqb8vy"; depends=[checkmate]; };
   rsconnect = derive2 { name="rsconnect"; version="0.8.15"; sha256="018cdbcxlbvqpwzv0qxvvz8yhl0d6gcavpbk1m5fyrgpvys1brri"; depends=[curl jsonlite openssl packrat rstudioapi yaml]; };
-  rscopus = derive2 { name="rscopus"; version="0.6.3"; sha256="1fplb7wmzp78a1xi9b4bw6xis16gixhvl227yfhip650ib4srpv1"; depends=[dplyr httr plyr tidyr]; };
-  rscorecard = derive2 { name="rscorecard"; version="0.12.0"; sha256="112gcziyg8cpdw5aiyzc8473sqp8nr9q1ih4hh68hpvmxk8b407p"; depends=[dplyr httr jsonlite lazyeval magrittr tidyselect]; };
+  rscopus = derive2 { name="rscopus"; version="0.6.6"; sha256="0kl6rv0j2396b8izvy0lp1f588il6w3yhq6d4swv8x8z14rsgcpw"; depends=[dplyr glue httr jsonlite plyr tidyr]; };
+  rscorecard = derive2 { name="rscorecard"; version="0.13.0"; sha256="1iahfdgjslcnhm24ynvyzdvlrkdkjy1s6hhxqaqc56wprd5bhx27"; depends=[dplyr httr jsonlite lazyeval magrittr tidyselect]; };
   rsdepth = derive2 { name="rsdepth"; version="0.1-5"; sha256="064jbb6gnx0sm41w3sbi6mvsbzsfkjqfici6frk8sfm9ybvm591j"; depends=[]; };
   rsdmx = derive2 { name="rsdmx"; version="0.5-13"; sha256="1lgy5nbrl4frfn805lghyx1gl2h8lkvgk07365jyvb8rzfcl43av"; depends=[plyr RCurl XML]; };
   rsed = derive2 { name="rsed"; version="0.1.2"; sha256="1rk7wkidvdn1d39a11cbgglz2dg74bbv3v1ijjdx903kgwg3nnrc"; depends=[Smisc]; };
   rseedcalc = derive2 { name="rseedcalc"; version="1.3"; sha256="18zmpjv6g8f7pmvqlp6khxyys9kdnq5x4zxwb6gwybsh4jxrymkp"; depends=[]; };
   rsem = derive2 { name="rsem"; version="0.4.6"; sha256="16nsbp4s20396h2in0zymbpmsn24gqlbik0vgv86zhy1yg1rz9ia"; depends=[lavaan MASS]; };
+  rsf = derive2 { name="rsf"; version="0.1.0"; sha256="1jnay391jqylhg4d5fjg0mr38apa64v42gv4y83fqx3x04q3l9zx"; depends=[bookdown stringr usethis whoami yaml]; };
   rsgcc = derive2 { name="rsgcc"; version="1.0.6"; sha256="12f8xsg6abmhdgkrrc8sfzmv4i1pycq1g0jfad664d17yciw7rhh"; depends=[biwt cairoDevice fBasics gplots gWidgets gWidgetsRGtk2 minerva parmigene snowfall stringr]; };
-  rsggm = derive2 { name="rsggm"; version="0.3"; sha256="17yzvd5vs2avp0nzk7x9bi4d7p6n9nv7675qpgfpwkfqp25lax73"; depends=[glasso MASS Matrix QUIC]; };
-  rsimsum = derive2 { name="rsimsum"; version="0.6.0"; sha256="0awb07dqi8cb6pqh81nw522aqrx29v981vpv62281nak9s4bjryg"; depends=[checkmate ggplot2 ggridges rlang scales]; };
+  rsggm = derive2 { name="rsggm"; version="0.3.1"; sha256="1yl0gq5qyw7vgagdnvwgkzc0cfnb62ydcndmzxvrlg1jpbkmq7yl"; depends=[glasso MASS Matrix QUIC]; };
+  rsimsum = derive2 { name="rsimsum"; version="0.6.1"; sha256="1ypkh27n71il64l1v2qbgkmss62j965ybf89asprdp15vcbhld33"; depends=[checkmate ggplot2 ggridges rlang scales]; };
   rsinaica = derive2 { name="rsinaica"; version="0.6.1"; sha256="1ba19b2fgnnl50qp6hgjppgxbadghq68qap9f0m51k2k3ijgfiwn"; depends=[dplyr httr jsonlite lubridate stringr]; };
   rskey = derive2 { name="rskey"; version="0.4.1"; sha256="0l9z5zbii4wi7da6cl9mr62zn72pc3dgfhk6dp8sjx4jbzpa94s3"; depends=[berryFunctions miniUI rstudioapi shiny]; };
   rsleep = derive2 { name="rsleep"; version="1.0.1"; sha256="0kjb5sgv1y50cqg54dy5cx9ngr64hx2bhfav314vm2alnxsk19jh"; depends=[edfReader ggplot2 jsonlite phonTools signal]; };
@@ -12477,11 +12722,11 @@ in with self; {
   rstack = derive2 { name="rstack"; version="1.0.0"; sha256="19vbfmkd6ymadah1y1w5rn52f4hviddccyc6qj2cv5viqwbwws2z"; depends=[R6]; };
   rstackdeque = derive2 { name="rstackdeque"; version="1.1.1"; sha256="0i1qqbfj0yrqbkad8bqc1qlxmyxpn7zycbnq83cdmfbilcmi87ql"; depends=[]; };
   rstan = derive2 { name="rstan"; version="2.19.2"; sha256="1nh8sm97ck1fwmqj5ia70p5w8alcagx7y2956a3n5k97qfwwxr1i"; depends=[BH ggplot2 gridExtra inline loo pkgbuild Rcpp RcppEigen StanHeaders]; };
-  rstanarm = derive2 { name="rstanarm"; version="2.18.2"; sha256="0jflfj7g1rx0zhq0kbi1b1zwad1m7lhbvymz43g5c9cx3hh4gi68"; depends=[bayesplot BH ggplot2 lme4 loo Matrix nlme Rcpp RcppEigen rstan rstantools shinystan StanHeaders survival]; };
+  rstanarm = derive2 { name="rstanarm"; version="2.19.2"; sha256="1k4sal4pmyyfb0n9k0x6n7kd04xq75scr6j357vpryaz8dfn46iz"; depends=[bayesplot BH ggplot2 lme4 loo Matrix nlme Rcpp RcppEigen rstan rstantools shinystan StanHeaders survival]; };
   rstanemax = derive2 { name="rstanemax"; version="0.1.0"; sha256="0xwacxaj99qz4i2npgpiq4jggx73q53il3jm4qlhmpapbwrkbl5f"; depends=[BH dplyr ggplot2 magrittr Rcpp RcppEigen rstan rstantools StanHeaders tidyr]; };
-  rstantools = derive2 { name="rstantools"; version="1.5.1"; sha256="11dlrz3mj1j9qigh2qff0ixdcfds4ppxd37112yq8bn16b0idasw"; depends=[]; };
+  rstantools = derive2 { name="rstantools"; version="2.0.0"; sha256="1il0pn4ksbdkska5fmhvgaicvwnnc6cs08g6ags9fj1xkjiqmrsa"; depends=[desc Rcpp]; };
   rstap = derive2 { name="rstap"; version="1.0.3"; sha256="176z39k54l5r60md6wziz828c46alv2pmqivvmhvb358crrb8x7n"; depends=[abind bayesplot BH dplyr ggplot2 lme4 loo Matrix nlme pracma Rcpp RcppEigen rstan rstantools StanHeaders]; };
-  rstatix = derive2 { name="rstatix"; version="0.1.2"; sha256="0jww4div56b57bnf7pxkhnhgrdbyf6wfbxlbd74bl974vdg0dxv3"; depends=[broom car corrplot dplyr magrittr purrr rlang tibble tidyr tidyselect]; };
+  rstatix = derive2 { name="rstatix"; version="0.2.0"; sha256="16xln4skyp222834glzzkck82p1dcfqhhkzhrnrbla81b9isziwn"; depends=[broom car corrplot dplyr magrittr purrr rlang tibble tidyr tidyselect]; };
   rstatscn = derive2 { name="rstatscn"; version="1.1.3"; sha256="07w7ixq1faq7mif2ksxcgl8n6ali9h0wx0nb2yz4kbdgvz68r7b9"; depends=[httr jsonlite]; };
   rstiefel = derive2 { name="rstiefel"; version="1.0.0"; sha256="0g09fpp3432v78gqgn0hiva6zqr8yqn379wz4428wanmiskqr3f0"; depends=[]; };
   rstpm2 = derive2 { name="rstpm2"; version="1.4.5"; sha256="0xdvv27cf3b45ahvlzbn8n0kmj4kyc7sl52xjr71757ymf154q3g"; depends=[bbmle fastGHQuad mgcv Rcpp RcppArmadillo survival]; };
@@ -12501,7 +12746,7 @@ in with self; {
   rtext = derive2 { name="rtext"; version="0.1.21"; sha256="0j2jfz0mz9552dwa78d527lxipmj5ql8q8np8qq5jw4ka6wj5lbs"; depends=[digest hellno magrittr R6 Rcpp RSQLite stringb]; };
   rtf = derive2 { name="rtf"; version="0.4-14"; sha256="1v4vb2ijqlbqcjqdhf85kfzs67whkhm6ygp5cw8xa6qw179vkgd5"; depends=[R_methodsS3 R_oo]; };
   rtfbs = derive2 { name="rtfbs"; version="0.3.9"; sha256="02irj6c7nfgp42yb5zdmhbr5pi09xgx0z76d1ccfczjf0r1cyvfz"; depends=[rphast]; };
-  rticles = derive2 { name="rticles"; version="0.9"; sha256="19kp0fk2skdnsk6vmgf5p9m9c2lf112kir1kpw33hmzyn8cf1fjv"; depends=[knitr rmarkdown tinytex xfun yaml]; };
+  rticles = derive2 { name="rticles"; version="0.11"; sha256="1gzbm7hj8xbml1rs2f2g5baqh3g5073j1vjq5l77i90s7gklvh5m"; depends=[knitr rmarkdown tinytex xfun yaml]; };
   rtide = derive2 { name="rtide"; version="0.0.5"; sha256="0ns79xkkl141bbns8zlvx3gf48k4a03qa21pjyhnhgkm9lsihwfc"; depends=[abind checkr lubridate]; };
   rtiff = derive2 { name="rtiff"; version="1.4.6"; sha256="09p4rki1z6zy79z9hb8pajglznnklr4hg7fcyrdxnqs1sjbw1iwy"; depends=[pixmap]; };
   rtika = derive2 { name="rtika"; version="1.22"; sha256="1vlv2v7s7p6plahph1wvki68ssyqq8l49brj3pp3r0cnz082askl"; depends=[curl digest rappdirs sys]; };
@@ -12528,19 +12773,19 @@ in with self; {
   ruin = derive2 { name="ruin"; version="0.1.1"; sha256="124xs1c2mjfy6z0bp83rwkqw2y73g77xwn3q4yd2xw0v2frnpvpz"; depends=[ggplot2]; };
   ruler = derive2 { name="ruler"; version="0.2.1"; sha256="01b5qn6b69hhl9df6sr187w16z5hj6vxb8yi77y2rghkcrnm12i9"; depends=[dplyr keyholder rlang tibble tidyr]; };
   runittotestthat = derive2 { name="runittotestthat"; version="0.0-2"; sha256="15zdcvqkr5ivq6wk6dw8k6diginc6z7mdc18pswim90d99j2g9sm"; depends=[assertive RUnit]; };
-  runjags = derive2 { name="runjags"; version="2.0.4-2"; sha256="035sxmh0b0m6dwz8qbpsmw2p7ihkx3cxgkhj27i0j6dsjryl3x4p"; depends=[coda lattice]; };
-  runner = derive2 { name="runner"; version="0.2.0"; sha256="17scm3kvv4gklwfqwc8kjxa4ycdk0f7vxi8ixfy29lif9wlanmrw"; depends=[Rcpp]; };
+  runjags = derive2 { name="runjags"; version="2.0.4-4"; sha256="0wqc3kmilvn3szyqvwrvqlins6smpvwv2fj80yflxcr553kph7xd"; depends=[coda lattice]; };
+  runner = derive2 { name="runner"; version="0.2.1"; sha256="107mf3c0paxbncfzm4l1xjiig4gl25ww3ncvbs0j6a13q6pfgjif"; depends=[Rcpp]; };
   runstats = derive2 { name="runstats"; version="1.0.1"; sha256="05kaw3wkvr6csaa17ivib0hssh2c4nmmkqyba796zpixwmmmb7wq"; depends=[]; };
   rusda = derive2 { name="rusda"; version="1.0.8"; sha256="0xx72jjf1pyixwpnvvgx5n2vc5gl46bam1caav043iqki68wb338"; depends=[foreach httr plyr RCurl stringr taxize testthat XML]; };
   rusk = derive2 { name="rusk"; version="0.1.1"; sha256="0a6vbcnfzlfq9fmibiy0cwcfix65qhxq4f7wc7d53riga82s00lk"; depends=[dplyr ggforce ggplot2 reshape2 shiny tidyr]; };
   rust = derive2 { name="rust"; version="1.3.6"; sha256="1qh7cf9h1v1fhh2cibrz5afdri6zhcdx0nv0d2y2i6mam0xljf6x"; depends=[Rcpp RcppArmadillo spatstat]; };
   ruta = derive2 { name="ruta"; version="1.1.0"; sha256="1qr2ryz55h2j3wlwg0535lhmk2ydm0idfxl07rlfxq1pi32cjms1"; depends=[keras purrr R_utils]; };
-  ruv = derive2 { name="ruv"; version="0.9.7"; sha256="1ynxmax9sz74s8abmmizla6jas385mn5ij151mq35k0yv1xszzj5"; depends=[ggplot2 gridExtra scales]; };
+  ruv = derive2 { name="ruv"; version="0.9.7.1"; sha256="1n4q9mrp9f644spbns6bbnzmlabrg90hwkdfg3hnm3rxp9b4xid0"; depends=[ggplot2 gridExtra scales]; };
   rv = derive2 { name="rv"; version="2.3.3"; sha256="1h5lhy87v88b70a7pbq5xirskm6ih9fk90n6mzp1nmkr7w1d3zai"; depends=[]; };
   rvHPDT = derive2 { name="rvHPDT"; version="3.0"; sha256="05nrfnyvb8ar7k2bmn227rn20w1yzkp1smwi4sysc00hyjrlyg8s"; depends=[gtools]; };
   rvTDT = derive2 { name="rvTDT"; version="1.0"; sha256="09c2fbqnlwkhaxfmgpsdprl0bb447ajk9xl7qdlda201fvxkdc8v"; depends=[CompQuadForm]; };
   rvalues = derive2 { name="rvalues"; version="0.6.3"; sha256="1bsdvwcijb75f27c8padjx8663as667axc4skwa6xgv5y423kbd0"; depends=[]; };
-  rvcheck = derive2 { name="rvcheck"; version="0.1.3"; sha256="1i2g6gyiqyd1pn6y0h6vmlcmg1qb5pv7rym8mkw8jnyc3in9hn8b"; depends=[rlang]; };
+  rvcheck = derive2 { name="rvcheck"; version="0.1.5"; sha256="15222q3sglq0mad5q806p99fhrb96qizmpqw35fa1rb148f95paf"; depends=[BiocManager rlang]; };
   rversions = derive2 { name="rversions"; version="2.0.0"; sha256="0mkg9zrjxlbwqzijiysivrs523x48syqj30xdfp88clpkqfk435m"; depends=[curl xml2]; };
   rvertnet = derive2 { name="rvertnet"; version="0.7.0"; sha256="01z3ij5z21v901hz4l9173r4pa9jz2nl7bx086ka1bxvcy0dgqgj"; depends=[crul dplyr ggplot2 jsonlite maps]; };
   rvest = derive2 { name="rvest"; version="0.3.4"; sha256="0ji5lk8g1gbv4d9c4jg1fg6rgsqrrwkm05j1id7drdw9kqdifgj1"; depends=[httr magrittr selectr xml2]; };
@@ -12555,6 +12800,7 @@ in with self; {
   rwc = derive2 { name="rwc"; version="1.11"; sha256="1qhgkbkp4nz0wq5c4x8232xiszpiyzcdklfgvpnx4cbp3bbfdi4g"; depends=[MASS Matrix mvtnorm raster]; };
   rwebstat = derive2 { name="rwebstat"; version="1.0.2"; sha256="14mzqs4qjb3qgpci1a1c4sj803mjnzv9j910zmhkg5l8bx9nj5xw"; depends=[dplyr getPass httr readr]; };
   rwfec = derive2 { name="rwfec"; version="0.2"; sha256="0wmalfms59zi8jdn2s2qbcdckfkifl9vg19hzx4389mm5gk6qsbh"; depends=[Rcpp]; };
+  rwhatsapp = derive2 { name="rwhatsapp"; version="0.2.0"; sha256="124jy73nb9w5gwzg6007nffgvmii8528vn93pqqh8q78ays198qq"; depends=[dplyr rlang stringi tibble tidytext]; };
   rworldmap = derive2 { name="rworldmap"; version="1.3-6"; sha256="1q1h0n9qr0m5pdx10swrh9ddsvdj8kv5nqngrf3lnx9rg9iwivjk"; depends=[fields maptools sp]; };
   rworldxtra = derive2 { name="rworldxtra"; version="1.01"; sha256="183z01h316wf1r4vjvjhbj7cg4xarn4b8qbmnn5y7nrrdndzi163"; depends=[sp]; };
   rwt = derive2 { name="rwt"; version="1.0.0"; sha256="112wp682z4gkxsd3bqnlkdrh42bfzwnnhzyangxi2dh0qw63bgcr"; depends=[matlab]; };
@@ -12562,13 +12808,13 @@ in with self; {
   rwunderground = derive2 { name="rwunderground"; version="0.1.8"; sha256="02p26gkicd5v511kb04p1h3wxj57r7j5vr97n3ibywc6ivz7nqxa"; depends=[countrycode dplyr httr lubridate tibble]; };
   rxSeq = derive2 { name="rxSeq"; version="0.99.3"; sha256="0g0n2pzbssz61psghjp1vrlspgph4s39x1k1zhcz7ivdn5pjb2nx"; depends=[MASS numDeriv VGAM]; };
   rxylib = derive2 { name="rxylib"; version="0.2.4"; sha256="0va7kw40nycjn8gh9blzpbph4z319r5a16yim8lwx3hi6rs9myhr"; depends=[BH Rcpp]; };
-  ryandexdirect = derive2 { name="ryandexdirect"; version="3.2.0"; sha256="0mzdxkbndyjqn0hx2hchcfnpfj2n2fc1gfgfgrj66r3cdvxsazsy"; depends=[bitops data_table dplyr httr jsonlite magrittr readr xml2]; };
+  ryandexdirect = derive2 { name="ryandexdirect"; version="3.2.1"; sha256="0rfvwi4nhqvifqr54zvin2fzfrhjr6w8jq1srk71mm4mjwvaq37y"; depends=[bitops data_table dplyr httr jsonlite magrittr readr xml2]; };
   rym = derive2 { name="rym"; version="0.5.2"; sha256="1j69fmc0wgj8w5y68ix13kh3rsc4blmyc9hsmp41crgr10mi3nvi"; depends=[httr stringr]; };
   ryouready = derive2 { name="ryouready"; version="0.4"; sha256="1d9z3paxcrkwsgn5g83x57jwz2iqarks30x0bwg48i5ispw6xbr3"; depends=[car ggplot2 stringr]; };
   rysgran = derive2 { name="rysgran"; version="2.1.0"; sha256="1l2mx297iyipap8cw2wcw5gm7jq4076bf4gvgvij4q35vp62m85z"; depends=[lattice soiltexture]; };
   rzeit2 = derive2 { name="rzeit2"; version="0.2.3"; sha256="0fvkpc6l57s64m0zx8fzazvyhpn5wxa1cb185h20x8hjf069i5lf"; depends=[anytime httr jsonlite openssl rvest stringr xml2]; };
   rzmq = derive2 { name="rzmq"; version="0.9.6"; sha256="05j34fwwqlzq9nfkaafl39aqc0nvljf22pndqhj151gpnrpgr8w0"; depends=[]; };
-  s2 = derive2 { name="s2"; version="0.4-0"; sha256="1mpivllq3r3kn7msb7qn9h8fr31jl5cvfg1pdq1wi69k4bznd8y0"; depends=[Rcpp]; };
+  s2 = derive2 { name="s2"; version="0.4-2"; sha256="17r3xn2ldlz7qpdwrp0mdm7pfrdfwibyv8biaxq4b6qx0p7wvw6n"; depends=[Rcpp]; };
   s20x = derive2 { name="s20x"; version="3.1-28"; sha256="1fx5206gy7cq4n0xrdxcvnd913i08yjjz39ldjm3a98sfz6xj636"; depends=[]; };
   s2dverification = derive2 { name="s2dverification"; version="2.8.5"; sha256="1y4sj5dkjr9kx3m0iwxpsrq7x1rqjfrz2wxbngk1a6qnxyk52aim"; depends=[abind bigmemory GEOmap geomapdata mapproj maps NbClust ncdf4 plyr SpecsVerification]; };
   s4vd = derive2 { name="s4vd"; version="1.1-1"; sha256="1rp3z42nxmrvb942h3c5cl544lngzx7nrnnr4zjw7dq495bym7yp"; depends=[biclust foreach irlba]; };
@@ -12584,6 +12830,7 @@ in with self; {
   sSDR = derive2 { name="sSDR"; version="1.2.0"; sha256="1fqsglqzsbzdvcdnwwf7mg6x20zfpw66x63r6avac3w1pz3n7kvx"; depends=[MASS Matrix]; };
   sValues = derive2 { name="sValues"; version="0.1.6"; sha256="0830f4w6jgpiysk0vz0bxaxwa8m3k94fgj9l3qb42r3jjf9cdn29"; depends=[ggplot2 reshape2]; };
   saasCNV = derive2 { name="saasCNV"; version="0.3.4"; sha256="12h5vrl55sb4wmx0hzib5iax8p0q2qzk19h15r0asfkh9l7qz94l"; depends=[DNAcopy RANN]; };
+  sabarsi = derive2 { name="sabarsi"; version="0.1.0"; sha256="14c94zby3jjm6jr28nrg3qp6r6iw68wsb5l5bpd6jjz9pkljrk9i"; depends=[]; };
   sabre = derive2 { name="sabre"; version="0.3.1"; sha256="0yqw126yr7syjdwq780b395b9qwncqr86vjkmwcvs2w6v1j3nppi"; depends=[dplyr entropy raster rlang sf tibble tidyr]; };
   sac = derive2 { name="sac"; version="1.0.1"; sha256="1rl5ayhg5y84fw9w3zf43dijjlw9x0g0w2z4haw5xmxfni72ms8w"; depends=[]; };
   saccades = derive2 { name="saccades"; version="0.1-1"; sha256="138a6g3hjmcyvflpxx1lhgxnb8svrynplrjnvzij7c4bzkp8zip6"; depends=[zoom]; };
@@ -12599,12 +12846,14 @@ in with self; {
   safer = derive2 { name="safer"; version="0.2.1"; sha256="1lmhaj9y0hi4ybxfkllxl99vsagcg73sy4kkcmlvn3bs69jky1r9"; depends=[assertthat base64enc sodium]; };
   safetyGraphics = derive2 { name="safetyGraphics"; version="1.0.0"; sha256="0vkl31bwh2ishijby2xhp5jcnjxzvy6bsv83f3cfpv4qcw4wbd4k"; depends=[dplyr DT haven htmlwidgets jsonlite magrittr purrr rlang rmarkdown shiny shinyjs shinyWidgets stringr tibble tidyr]; };
   salesforcer = derive2 { name="salesforcer"; version="0.1.3"; sha256="1nhw7l6bg375dqqcaxjfvhjm9sb1jsil5wayhffdxc9lqdxrd5a2"; depends=[data_table dplyr httr jsonlite lubridate purrr readr XML xml2]; };
+  salso = derive2 { name="salso"; version="0.1.3"; sha256="1skqr5q42xrx9l6jikfvhqqbqjgy2jsp79n1r2z8wj97cw5g30m8"; depends=[]; };
   salty = derive2 { name="salty"; version="0.1.0"; sha256="1dxq62yrkv416fy09l03slc7ci6mnwiyvjlsxhbqnj8yjy3kbhr6"; depends=[assertthat purrr stringr]; };
   sambia = derive2 { name="sambia"; version="0.1.0"; sha256="15yz5lrjav5bs8m52crg3l43xmi4gf7wydji76p181ssyg43z2ln"; depends=[dplyr e1071 FNN mvtnorm pROC ranger smotefamily]; };
+  samc = derive2 { name="samc"; version="1.0.3"; sha256="1jhlxyh1h4p29axrpncpjhqxaziybf8hpfa52nxgnif0c9hwjn4b"; depends=[gdistance Matrix raster Rcpp RcppEigen]; };
   samon = derive2 { name="samon"; version="4.0.0"; sha256="0pvv93ahh0i69ncc3sic9481wd5rv5dfxysxyzkl61ds3yvrr09v"; depends=[]; };
   sampSurf = derive2 { name="sampSurf"; version="0.7-4"; sha256="0azs8d1d4cp5vzrlzpn2lbqmbha6rxq109apg6hr2hf7i81g19d7"; depends=[boot lattice latticeExtra raster rasterVis sp]; };
   sampleSelection = derive2 { name="sampleSelection"; version="1.2-6"; sha256="1ph26v78sy8341d9iir6243vmvnrnan7gj5mr31913kpgkblcwfj"; depends=[Formula maxLik miscTools mvtnorm systemfit VGAM]; };
-  sampler = derive2 { name="sampler"; version="0.2.3"; sha256="0kp11b252d20kjcb9w92057mm4kzp9z6zcz44vcc5wsjmrg1nc09"; depends=[dplyr purrr reshape tidyr]; };
+  sampler = derive2 { name="sampler"; version="0.2.4"; sha256="12jjx3ci1yss8dj64bjdmz73cyjfkwb7b9zk4zm48lqv78k6wlv7"; depends=[dplyr purrr reshape tidyr]; };
   samplesize = derive2 { name="samplesize"; version="0.2-4"; sha256="0n6z7jmf665lbj3g1mjy87a9fh53z85546bhrkmkgsysb0r9q6iq"; depends=[]; };
   samplesize4surveys = derive2 { name="samplesize4surveys"; version="3.7.5.1"; sha256="01d42sj5sq95h14hdkrq4191pn66c3hhmymqvgl90mrpbcgzk5bw"; depends=[TeachingSampling timeDate]; };
   samplesizeCMH = derive2 { name="samplesizeCMH"; version="0.0.0"; sha256="0gdywqmylid4fkz5syzf1wgcan71whhm9gjylmsg4p05hlwvpv1d"; depends=[]; };
@@ -12630,12 +12879,13 @@ in with self; {
   sars = derive2 { name="sars"; version="1.2.0"; sha256="03pqdnfchin541fb5awb5i5xl8ryh382wh898hxgxi05qaz1cv07"; depends=[cli crayon dplyr nortest numDeriv]; };
   sas7bdat = derive2 { name="sas7bdat"; version="0.5"; sha256="0qxlapb6wdhzpwlmzlhscy3av7va3h6gkzsppn4sx5q960310an3"; depends=[]; };
   sasMap = derive2 { name="sasMap"; version="1.0.0"; sha256="11vhhxhakqm1gsb3p4s4966sapmrqfyw79zfppbx5lnqi3xr0ngn"; depends=[readr stringi stringr]; };
+  sass = derive2 { name="sass"; version="0.1.2.1"; sha256="02a5n0l8wya5v1iq2rb4hvc0gm23790jnjl7i3pzw2b5vkqd3l7s"; depends=[digest]; };
   satellite = derive2 { name="satellite"; version="1.0.1"; sha256="1g8zzlsdvb56l2jph7i5wjgbpyx5dkwa3nv8mzmg0qyh3zd9pyi0"; depends=[plyr raster Rcpp]; };
   satscanMapper = derive2 { name="satscanMapper"; version="1.0.1"; sha256="1qr7xz7qp39nylkrx3smzga7rvi2z9yws8kbpmfk13avixr4asvy"; depends=[foreign RColorBrewer SeerMapper sp stringr]; };
   saturnin = derive2 { name="saturnin"; version="1.1.1"; sha256="0cjp4h1s9ivn17v8ar48mxflaj9vgv92c8p9l2k5bc9yqx9mcs36"; depends=[Rcpp RcppEigen]; };
   saves = derive2 { name="saves"; version="0.5"; sha256="1b4mfi2851bwcp0frx079h5yl6y1bhc2s8ziigmr8kwy1y1cxw10"; depends=[]; };
   saws = derive2 { name="saws"; version="0.9-6.1"; sha256="0w40j6xczqs74z1z3na4510w06px7yn55s2mw9mddd6736l56fv1"; depends=[gee]; };
-  sazedR = derive2 { name="sazedR"; version="2.0.0"; sha256="0jaqjp9xnnq6par44i2vbcirwgnma44zjaccir3ma86kgj9wzdbi"; depends=[bspec dplyr fftwtools pracma zoo]; };
+  sazedR = derive2 { name="sazedR"; version="2.0.1"; sha256="1y8vlffvw7ff6j6pqwd0r2zxx1an846znajgcl8mdcbjimvf7fg5"; depends=[bspec dplyr fftwtools pracma zoo]; };
   sbart = derive2 { name="sbart"; version="0.1.1"; sha256="0552dbdj7rm1h7dbl34m4r4disra6x3p919d9c4719ks88i78255"; depends=[LaplacesDemon msm Rcpp]; };
   sbfc = derive2 { name="sbfc"; version="1.0.1"; sha256="1xz8h1m5d5ahrz4wsy55amd5mxh3acjs5qmcn7gl6yh3pn0c8phf"; depends=[DiagrammeR discretization Matrix Rcpp RcppArmadillo]; };
   sbgcop = derive2 { name="sbgcop"; version="0.980"; sha256="0vmg8b4462qghlyx6hq0raf9xqvygzgwi5y0cbqcljhmbmqjrwxs"; depends=[]; };
@@ -12646,7 +12896,7 @@ in with self; {
   sbpiper = derive2 { name="sbpiper"; version="1.9.0"; sha256="0pjq88ixk494wlz4nh5anbsn59mmh9wg564qh3vzwwqgxf1k61cg"; depends=[colorRamps data_table factoextra FactoMineR ggplot2 Hmisc reshape2 scales stringr]; };
   sbrl = derive2 { name="sbrl"; version="1.2"; sha256="1d0f2mlzzcghhvqagrr954qa69b5v47milw3iazxihh8q1qlird2"; depends=[arules Rcpp]; };
   scBio = derive2 { name="scBio"; version="0.1.5"; sha256="12wch9dp7n9vigv7rp7i5b5sckn9vvckpclylinnbi1mhawxprv9"; depends=[doSNOW fields foreach LiblineaR limma raster sp]; };
-  scModels = derive2 { name="scModels"; version="1.0.0"; sha256="1f7inj7fr9yig7af2kz6j5fkb0gmmrbhmkanjwcc6q12xlg1l1rc"; depends=[Rcpp]; };
+  scModels = derive2 { name="scModels"; version="1.0.1"; sha256="0n2sc2l3wy08i0xq7jwigkr42wz9gyhlirmjmma9plnmkbrx0rp4"; depends=[Rcpp]; };
   scPDSI = derive2 { name="scPDSI"; version="0.1.3"; sha256="00z5qk14c1ndrd63rhvknkp3dn3ad8z8mf00p9sb8wbsi908md44"; depends=[Rcpp]; };
   scRNAtools = derive2 { name="scRNAtools"; version="1.0"; sha256="0x0lniqhq6q87y08kkkyvmk1g5b8i73hm3h86ba8rcv0v0n7ap9a"; depends=[ALL ConsensusClusterPlus corrplot edgeR foreach ggplot2 ggthemes Hmisc igraph lattice limma PerformanceAnalytics plyr reshape2 Rmisc Rtsne scatterplot3d survival TPEA]; };
   scaRabee = derive2 { name="scaRabee"; version="1.1-3"; sha256="1yap3hi36f8hk93jn59nxrbgq8iw0xwkkm3pc2gb50cpcpaq41pd"; depends=[deSolve lattice neldermead]; };
@@ -12655,17 +12905,18 @@ in with self; {
   scales = derive2 { name="scales"; version="1.0.0"; sha256="0353dkh3d7x78463c6ds80hcml59lrqwr8rlv82a8dnkxla4l7qc"; depends=[labeling munsell R6 RColorBrewer Rcpp viridisLite]; };
   scalpel = derive2 { name="scalpel"; version="1.0.1"; sha256="18mapg96xl9a1g85h5xhqsz1333hkc28z0ivfjaff933p1kc6sng"; depends=[gam igraph Matrix protoclust R_matlab SDMTools]; };
   scalreg = derive2 { name="scalreg"; version="1.0.1"; sha256="0kfcgl9cpp6g1qx23s1yrjzn0hi74vmrw567vy9wpsmhk04a5bkx"; depends=[lars]; };
-  scam = derive2 { name="scam"; version="1.2-4"; sha256="058jwvsrk5ygh0ripc9n1v07yjw4kilyrbwv3hk1hw2wvznli0j3"; depends=[Matrix mgcv]; };
-  scan = derive2 { name="scan"; version="0.20"; sha256="1xyng9dlfmp7n2h91n4xy9lx3jm205gjiizdqk1yj1qw8mmahvqc"; depends=[nlme]; };
+  scam = derive2 { name="scam"; version="1.2-5"; sha256="0c8pp2cr3khaibpv3m8kkw73q2pdx6931kh8w64s38wgvjv293fp"; depends=[Matrix mgcv]; };
+  scan = derive2 { name="scan"; version="0.40"; sha256="1khmg05dzs1va66bm26wxx440nlkl0r70wbh814fdlmij3py7m54"; depends=[car kableExtra knitr MASS mblm nlme readxl]; };
   scanstatistics = derive2 { name="scanstatistics"; version="1.0.1"; sha256="147fhq34vqkq50bw0g3a112048s5jaxxcwm3iv5wykp8zl45msmz"; depends=[dplyr emdbook ismev magrittr plyr purrr Rcpp RcppArmadillo reliaR sets tibble tidyr]; };
   scape = derive2 { name="scape"; version="2.3-2"; sha256="1i3k37r7lisrj1pblni5xn76kf6py52s4yd51fm78c3286yfaasf"; depends=[coda Hmisc lattice]; };
   scar = derive2 { name="scar"; version="0.2-1"; sha256="04x42414qxrz8c7xrnmpr00r46png2jy5giwicdx6gx8jwrkzhzs"; depends=[]; };
   scatr = derive2 { name="scatr"; version="1.0.1"; sha256="1c2z722i7d7qflh4mzb8kkix5i22wph98kwz2p98x2mhaml8802d"; depends=[cowplot ggplot2 ggridges ggstance jmvcore R6]; };
   scatterD3 = derive2 { name="scatterD3"; version="0.9"; sha256="0miadn406viqzw1sc27fl3xb1l0vvachrfiv72jl9r7qgk2ga5jv"; depends=[digest ellipse htmlwidgets]; };
-  scatterpie = derive2 { name="scatterpie"; version="0.1.2"; sha256="0r3m3781jvzxr0ry7rhd085c0xl5620sf5zcq9nnfl613imwxj2b"; depends=[ggforce ggplot2 rlang rvcheck tidyr]; };
+  scatterpie = derive2 { name="scatterpie"; version="0.1.3"; sha256="1h89dbcnkqc3l1b8rvdcxsw2d2ak2wcvlj7xg3wzgf7pjah1i6g9"; depends=[ggforce ggplot2 rlang rvcheck tidyr]; };
   scatterplot3d = derive2 { name="scatterplot3d"; version="0.3-41"; sha256="152xqz9c70qab86mpgng049gxsg5f4fpf1m8dh93fb9v1avjd0sc"; depends=[]; };
   scbursts = derive2 { name="scbursts"; version="1.6"; sha256="09yxnq6m35xmp0priavjnh0bdcwkr5hhy7j33cz13xwkrd1cgw5j"; depends=[readxl tibble]; };
   scclust = derive2 { name="scclust"; version="0.2.2"; sha256="0w0qwz8wfdprs2bgv1cjvd2yb6g12jylad21a9rr3w5bkgxprcrp"; depends=[distances]; };
+  sccr = derive2 { name="sccr"; version="1.0"; sha256="1x0ynm64nk1ilknmxgskan8nxymb2y5hmg8i2xw5pbjagyag17lx"; depends=[dplyr]; };
   scdensity = derive2 { name="scdensity"; version="1.0.2"; sha256="173xm3bf8vxl30zk4n451al7m003byg9q4d1l1pfyfa4xnv8qdg9"; depends=[lpSolve quadprog]; };
   scdhlm = derive2 { name="scdhlm"; version="0.3.1"; sha256="1b5x4kqvmkpb8wbgfhnwqakisw6hfnvama2bsnd8kvw4alfanxhm"; depends=[nlme]; };
   scenario = derive2 { name="scenario"; version="1.0"; sha256="0v1b00kiny21yx4qkk2x51cy1zqibdnd68z76qia7h5py28yhxsi"; depends=[]; };
@@ -12682,15 +12933,17 @@ in with self; {
   scio = derive2 { name="scio"; version="0.6.1"; sha256="0h15sscv7k3j7qyr70h00n58i5f44k96qg263mxcdjk9mwqr0y65"; depends=[]; };
   sciplot = derive2 { name="sciplot"; version="1.1-1"; sha256="1ydwx9kh778z3x7s3i6gqinqi6bmsf6bslaf0mgszj0nrgcmj6y3"; depends=[]; };
   sclero = derive2 { name="sclero"; version="0.2"; sha256="1vqysby822s958msnwcqmz78193vrgmpf6si1jnfb9cj90hh7wgg"; depends=[plyr RImageJROI spatstat]; };
+  sclr = derive2 { name="sclr"; version="0.1.0"; sha256="0fl8zqxqfvrcbs1x7lxb99dfl0z6kfka38fvvclkd1agrw2csks9"; depends=[broom dplyr rlang tibble]; };
   scmamp = derive2 { name="scmamp"; version="0.2.55"; sha256="17qhj9l1akxachaimy9d5rls8adph8aalj3qr6ckip29a8ma9gf7"; depends=[ggplot2 graph reshape2 Rgraphviz]; };
-  scoper = derive2 { name="scoper"; version="0.1.0"; sha256="1a170x1h2wglsmqp0fjga2q29yfnfdbgjcm62412n575j9d4xp5n"; depends=[alakazam doParallel dplyr foreach ggplot2 iterators lazyeval shazam stringi]; };
+  scoper = derive2 { name="scoper"; version="0.2.0"; sha256="1b4kyrml5yk46fw9hrp21i6w6ylck5qs64y0mzkbqr2wf1x4ncvs"; depends=[alakazam data_table doParallel dplyr foreach ggplot2 Rcpp rlang seqinr shazam stringi stringr]; };
   scopr = derive2 { name="scopr"; version="0.3.3"; sha256="1j45l5zcrpc4dnb6ik1v0jlqizpkijl0p656s869jhhvv55r6v2i"; depends=[behavr data_table memoise readr RSQLite stringr]; };
   score = derive2 { name="score"; version="1.0.2"; sha256="1p289k1vmc7qg70rv15x05dyb92r7s6315whr1ibi40sqln62a5s"; depends=[msm]; };
-  scorecard = derive2 { name="scorecard"; version="0.2.5"; sha256="1amy5qbc7xcqa46rk9dbcvkpsndvjv7hm2vl9lvylv44xg98sb8a"; depends=[data_table doParallel foreach ggplot2 gridExtra openxlsx]; };
+  scorecard = derive2 { name="scorecard"; version="0.2.6"; sha256="18irjp8y8mdn1aiqr50h67w18c3m9yd0ywp5f2vd4l7rw7h5jj23"; depends=[data_table doParallel foreach ggplot2 gridExtra openxlsx]; };
   scorecardModelUtils = derive2 { name="scorecardModelUtils"; version="0.0.1.0"; sha256="09znaxrv14m58hsk5pac458xbpcsidc6ygcsw4q9j0p4yd80qbvl"; depends=[car e1071 gbm ggplot2 partykit randomForest reshape2 sqldf stringr]; };
+  scorepeak = derive2 { name="scorepeak"; version="0.1.2"; sha256="1g9n7kjqb9qk5b7hw8ysrc069w9dzc4z29ay6z1kbm0v4kkzp7bi"; depends=[checkmate Rcpp]; };
   scorer = derive2 { name="scorer"; version="0.2.0"; sha256="1mc4hxcrqzh4dmz5fy40740bnrp4fxia81fj3cdw9382p67ivhim"; depends=[Rcpp]; };
   scoring = derive2 { name="scoring"; version="0.6"; sha256="114jlpbnm15fdan5lr40adxdzwajy3yhdw6dm4kvkvky6qhcx7q5"; depends=[]; };
-  scoringRules = derive2 { name="scoringRules"; version="0.9.6"; sha256="1kjxi7d2qp3b302pikkscgk3z3blp2w5g9p1v0f390x6xmwkcjcm"; depends=[knitr MASS Rcpp RcppArmadillo]; };
+  scoringRules = derive2 { name="scoringRules"; version="1.0.0"; sha256="1jksv22hy8kazqwy6yjdjl32k7i558vcn7i13wc7fmary7v500km"; depends=[knitr MASS Rcpp RcppArmadillo]; };
   scout = derive2 { name="scout"; version="1.0.4"; sha256="0vr497g7g1xhf75cwjbjsns2fvdzy86iibbf5w0g2xylw82s4lh2"; depends=[glasso]; };
   scpm = derive2 { name="scpm"; version="1.0-2"; sha256="0jrr90lcalchfqmq5c8ja7ws88rpri3gjdc5z4jfpazn2vznx26n"; depends=[geoR interp lattice MASS Matrix mvtnorm RandomFields rgl]; };
   scraEP = derive2 { name="scraEP"; version="1.1"; sha256="0dimvdjlgaymjmd3gf60hxcavpr58bpffrfhlksnrfzbb7an65dd"; depends=[data_table RCurl XML]; };
@@ -12703,6 +12956,7 @@ in with self; {
   scrm = derive2 { name="scrm"; version="1.7.3-1"; sha256="090gsa23l9s4x92q4n7ggp491fc8ghgnjw5p7j67gd1i1iwr55n8"; depends=[Rcpp]; };
   scrobbler = derive2 { name="scrobbler"; version="0.1.0"; sha256="166ria9pw1v8ky4975xb0jhqrl9jr3y95p7jl8bsmsgyii6lxcia"; depends=[anytime]; };
   scrubr = derive2 { name="scrubr"; version="0.1.1"; sha256="0dqsk6vvc79qmjcr1gdksqzbd064nkyqfj2mxg6z7aifqgxs8zzz"; depends=[lazyeval magrittr Matrix qlcMatrix]; };
+  scrypt = derive2 { name="scrypt"; version="0.1.3"; sha256="14iblgbp9v2by8fjbrpsd59iknp5babcz7j3yv1yxxzcwyb6wrrm"; depends=[Rcpp]; };
   scs = derive2 { name="scs"; version="1.2-3"; sha256="0kljqx0f6x1s98896vwckd3yhmzrilh3k27mvmyvw8nxadkapys7"; depends=[]; };
   sctransform = derive2 { name="sctransform"; version="0.2.0"; sha256="1r5kiqqs318q59h2i8m7c6nhghp9w6q26ss2y5a390lkhsawgx6p"; depends=[future future_apply ggplot2 gridExtra MASS Matrix Rcpp RcppEigen reshape2]; };
   scuba = derive2 { name="scuba"; version="1.9-1"; sha256="1b92b6p9dn54rmcaw2ng41pvvvkmrzgg12d6zcr3yh8qgi89pvdi"; depends=[]; };
@@ -12713,7 +12967,7 @@ in with self; {
   sdcHierarchies = derive2 { name="sdcHierarchies"; version="0.18.1"; sha256="0k7kks4kg62pk00zs7y5gbikaz2fpgkldw9p5jzhghdlkykz03xw"; depends=[cli data_table jsonlite rlang shiny shinyjs shinythemes shinyTree]; };
   sdcMicro = derive2 { name="sdcMicro"; version="5.4.0"; sha256="0qh9rcjg5pbq2lnymjzf5xh3h22f0j30xmq5hqsk9lkhr863mbn6"; depends=[car carData cluster data_table DT e1071 ggplot2 haven knitr MASS prettydoc Rcpp rhandsontable rmarkdown robustbase sets shiny shinyBS VIM xtable]; };
   sdcSpatial = derive2 { name="sdcSpatial"; version="0.1.1"; sha256="1szv2nb758k3x5scxml2ns11fi99rlmd11r3fhzy3dgylf0m0xnm"; depends=[raster]; };
-  sdcTable = derive2 { name="sdcTable"; version="0.28"; sha256="1r15gz107mm2s3bnbxbrn2py80ran0753qcbqlgy61kr9dwbhh5x"; depends=[data_table knitr lpSolveAPI Rcpp Rglpk rlang sdcHierarchies slam stringr]; };
+  sdcTable = derive2 { name="sdcTable"; version="0.30"; sha256="1sbdnm2na36jx76hcpfks3kr5milid5sn0cpzjky90ldfii2pqf9"; depends=[data_table knitr lpSolveAPI Rcpp Rglpk rlang sdcHierarchies slam stringr]; };
   sdcTarget = derive2 { name="sdcTarget"; version="0.9-11"; sha256="18cf276mh1sv16xn0dn8par4zg8k7y8710byxiih6db4i616fjpi"; depends=[doParallel foreach magic tuple]; };
   sddpack = derive2 { name="sddpack"; version="0.9"; sha256="1963l8jbfwrqhqcpif73di9i5mb996r4f8smjyil6l7sdir7cg9l"; depends=[]; };
   sde = derive2 { name="sde"; version="2.0.15"; sha256="0gxyhq9lafd62y68h7fd746a3jz3jdsm0shgwm2ylmp4a2f5cdmm"; depends=[fda MASS zoo]; };
@@ -12722,7 +12976,7 @@ in with self; {
   sdmpredictors = derive2 { name="sdmpredictors"; version="0.2.8"; sha256="18374f2bnhh3nb62xf1h6fbqgpimlnkc2vbx5xkg5gyfylydz0v9"; depends=[R_utils raster rgdal]; };
   sdmvspecies = derive2 { name="sdmvspecies"; version="0.3.2"; sha256="19avkag13ij1k65vqhmvcy8j50j8vrgw4mjc49x8i63w3d4z1wxh"; depends=[psych raster]; };
   sdnet = derive2 { name="sdnet"; version="2.4.1"; sha256="0z0wqc4hcmxqbavj9zma9j3dkg978l8dxcbyh9mlsbpfi4d1zph8"; depends=[]; };
-  sdols = derive2 { name="sdols"; version="1.7.5"; sha256="0pdd63pm56prvy7b3bagpnc5ri6n0xj7p0jkndyfzj9cvgwbhb0f"; depends=[commonsMath rscala]; };
+  sdols = derive2 { name="sdols"; version="2.0.0"; sha256="0rwdfb34g1l58ad02jf7wxidgqlccqvijdsvdxqdq8f5p15cl30m"; depends=[salso]; };
   sdprisk = derive2 { name="sdprisk"; version="1.1-6"; sha256="061x78irryc5phd8bv9cs2mfgiajgwmr85ryp1r47anadydb2haa"; depends=[numDeriv PolynomF rootSolve]; };
   sdpt3r = derive2 { name="sdpt3r"; version="0.3"; sha256="02qv889mkzcilxzszzqcqgn9z5zmki0093mdriradbl1y8a27bp5"; depends=[Matrix]; };
   sdtoolkit = derive2 { name="sdtoolkit"; version="2.33-1"; sha256="0pirgzcn8b87hjb35bmg082qp14idc5pfvm6dikpgkswag23hwh8"; depends=[]; };
@@ -12730,7 +12984,7 @@ in with self; {
   seaaroundus = derive2 { name="seaaroundus"; version="1.2.0"; sha256="09nyypzylb0y04ssd9ak2cw8wpy6a3nmabg9p7jrc8qz54wl6z4q"; depends=[crul ggplot2 jsonlite maps rgdal scales sp wicket]; };
   seacarb = derive2 { name="seacarb"; version="3.2.12"; sha256="1gb7ma2qpw8vnwfblwhalagar1cjqfd4la61bw652kk28v98y9bs"; depends=[gsw oce]; };
   sealasso = derive2 { name="sealasso"; version="0.1-2"; sha256="0cjy3fj170p5wa41c2hwscmhqxwkjq22vhg9kbajnq7df2s20jcp"; depends=[lars]; };
-  searchConsoleR = derive2 { name="searchConsoleR"; version="0.3.0"; sha256="1z8bdlxq2sk8bcg164wy0yrmsx0inf0aj5ya2pybvadss8wr0qlr"; depends=[googleAuthR stringr]; };
+  searchConsoleR = derive2 { name="searchConsoleR"; version="0.4.0"; sha256="1ffg5359pbwylw265wbahwl3hy1b0qqv4al71v5r8lgfircibn0j"; depends=[googleAuthR stringr]; };
   searchable = derive2 { name="searchable"; version="0.3.3.1"; sha256="0xc87i2q42j7dviv9nj4hkgjvpfiprkkjpgzwsy47vp7q8024dv0"; depends=[magrittr stringi]; };
   searcher = derive2 { name="searcher"; version="0.0.4"; sha256="0xxawwa95vfcbq8gg61ylnsg1qg6q1ng9iq4r1a1ai9440p5mvh3"; depends=[]; };
   seas = derive2 { name="seas"; version="0.5-2"; sha256="0hn4d5dc01zyycd7l3vj1sx6bq668n7fzffw9ypaa5l20fizs0ay"; depends=[MASS]; };
@@ -12745,7 +12999,7 @@ in with self; {
   secrlinear = derive2 { name="secrlinear"; version="1.1.1"; sha256="0jcvraypkss1gphh4cjb0b4v9460fj4dw80yd057ah11p9942ggs"; depends=[igraph maptools MASS rgdal secr sp]; };
   secsse = derive2 { name="secsse"; version="2.0.0"; sha256="0qsbn56vc6y19hmc94bimv1mf86ayxa8rj38qvvsxjfm9czmw2ac"; depends=[ape apTreeshape DDD deSolve doParallel foreach geiger phylobase]; };
   secure = derive2 { name="secure"; version="0.5"; sha256="16pv5m7rrcs8hcjj3kylq7smyzf2qk8rkg9m1b421w0ac7lg04x1"; depends=[MASS Rcpp RcppArmadillo]; };
-  securitytxt = derive2 { name="securitytxt"; version="0.1.0"; sha256="117xmhclv219ci8vki8ni8yqvlnwgj0pd8n0r752wd8333y130wr"; depends=[Rcpp]; };
+  securitytxt = derive2 { name="securitytxt"; version="0.1.1"; sha256="0yrydcc68qcsq5wrdfgwfi347pdd0zc8hp2ikmw3iz31anm3b4yw"; depends=[Rcpp]; };
   see = derive2 { name="see"; version="0.2.1"; sha256="0c4hw3x30zip8rp04knw07b3cvczfkpx7zi7m6n411d5bl90xiij"; depends=[bayestestR dplyr ggplot2 ggridges gridExtra insight magrittr rlang scales]; };
   seeclickfixr = derive2 { name="seeclickfixr"; version="1.1.0"; sha256="1agsqq2msrqrssffc6liyjjs6nqm90xy2inlcjbkdac5dhinjc4n"; depends=[jsonlite RCurl]; };
   seedCCA = derive2 { name="seedCCA"; version="1.0"; sha256="1grs6ykiyp8p5gh93hgb4niggppbh2wzwl6yx0l1qs9fkcz5zvy7"; depends=[CCA corpcor]; };
@@ -12758,8 +13012,8 @@ in with self; {
   segmag = derive2 { name="segmag"; version="1.2.4"; sha256="1i717xg1z7s35pkwzywgjf9wx7zj9xksv0k87h7p1q62y073qbqm"; depends=[plyr Rcpp]; };
   segmenTier = derive2 { name="segmenTier"; version="0.1.2"; sha256="01xbcddinjbkbqkwq2lnsxd3gw8fxys58p498dc2lw8psz3g2wgc"; depends=[Rcpp]; };
   segmented = derive2 { name="segmented"; version="1.0-0"; sha256="1igsfkffpa60zn6j45lhw1zgr5pz6rjknv2f3sylnx5l9fdwibgf"; depends=[]; };
-  segmentr = derive2 { name="segmentr"; version="0.1.1"; sha256="0lil0fgbg8ah99frap2hnkmn3dsg93lylppz81rs5ggbg654sfh4"; depends=[foreach glue Rcpp]; };
-  segregation = derive2 { name="segregation"; version="0.2.0"; sha256="0ly4r93f6abkbz0g8wi9l21c9zh3pdxwbc3idkvkjkpk6aavijic"; depends=[data_table]; };
+  segmentr = derive2 { name="segmentr"; version="0.2.0"; sha256="0q5kxxiw0akpk7w2a2l9zp7v4pvqblzdvrld5fjyl5f6h8hsb40z"; depends=[foreach glue Rcpp]; };
+  segregation = derive2 { name="segregation"; version="0.3.0"; sha256="0bx3w2dhbikx7vk5gs0b2jc4q4zvwlrj4crv6agmc2pn3ap7i88k"; depends=[data_table]; };
   seismic = derive2 { name="seismic"; version="1.0"; sha256="02d11c3filzghi8cvryikaidmk40d4z3qxsqs7bjdhxyf814caw8"; depends=[]; };
   seismicRoll = derive2 { name="seismicRoll"; version="1.1.3"; sha256="1868g8mlmhhlc6d6p86xlp6qhfbbrhba02dmx1zcvydsbqdvnpjj"; depends=[Rcpp]; };
   sejmRP = derive2 { name="sejmRP"; version="1.3.4"; sha256="1j3sadbp12fip3n96s0hx1sg4kzwx8z01p1c905kv8gffhkz9bh0"; depends=[cluster DBI dplyr factoextra RPostgreSQL rvest stringi tidyr XML xml2]; };
@@ -12767,7 +13021,7 @@ in with self; {
   selectMeta = derive2 { name="selectMeta"; version="1.0.8"; sha256="0i0wzx5ggd60y26lnn4qk4n8h27ahll9732026ppks1djx14cdy0"; depends=[DEoptim]; };
   selectapref = derive2 { name="selectapref"; version="0.1.1"; sha256="0pn0s8dxbshwmv0qdrf670cjk3inf5w7jgac3fq29gmcx4f3fhl2"; depends=[]; };
   selectiongain = derive2 { name="selectiongain"; version="2.0.591"; sha256="11gd9xdn3jl3mg3c9ykw8bqvcxhihn19iqsy8dl8bacijjv84bva"; depends=[mvtnorm]; };
-  selectiveInference = derive2 { name="selectiveInference"; version="1.2.4"; sha256="1k7lnf6fplnxp3giwinldg9g5spi21infln21k413dv3wkksk71f"; depends=[glmnet intervals survival]; };
+  selectiveInference = derive2 { name="selectiveInference"; version="1.2.5"; sha256="07kzpvdmflca1sriqfzn20f84fx2b9kwwiqm91lqjpx854bsx5kh"; depends=[adaptMCMC glmnet intervals MASS Rcpp survival]; };
   selectr = derive2 { name="selectr"; version="0.4-1"; sha256="1jp27rxks4w29l47k42869hp8hnkzq2rnvsqbr44wd19fqb2zm4b"; depends=[R6 stringr]; };
   selectspm = derive2 { name="selectspm"; version="0.2"; sha256="0wvhlzhl0janhms107xczmilpmr4y26jgk0ag3g34iqba7fbnfqd"; depends=[ecespa spatstat]; };
   seleniumPipes = derive2 { name="seleniumPipes"; version="0.3.7"; sha256="1krpzh2gy3yl07c2n1d8q21xjc2qcv5ac1kv7212710bxkdyfad6"; depends=[httr jsonlite magrittr whisker xml2]; };
@@ -12775,16 +13029,16 @@ in with self; {
   selfingTree = derive2 { name="selfingTree"; version="0.2"; sha256="18ylxmg2ms4ccgm4ahzfl65x614wiq5id7zazjjz5y75h8gs7gzj"; depends=[foreach]; };
   sem = derive2 { name="sem"; version="3.1-9"; sha256="1f9c6g6pfx66gd2pappcsqh484ah6a0x4z47hpd46rah0817hcsa"; depends=[boot MASS matrixcalc mi]; };
   semPLS = derive2 { name="semPLS"; version="1.0-10"; sha256="0q5linjyv5npkw4grx3vq58iq2q1grf06ikivhkg8w7rvb7pqn6b"; depends=[lattice]; };
-  semPlot = derive2 { name="semPlot"; version="1.1.1"; sha256="1xbq5rbajfpfdsi1hw3spmbri9sn87034k8vxb6nvjxsr2gkivw2"; depends=[colorspace corpcor igraph lavaan lisrelToR OpenMx plyr qgraph regsem rockchalk sem semTools XML]; };
+  semPlot = derive2 { name="semPlot"; version="1.1.2"; sha256="0l1v9yi1pv59iwfknw4dh9qskk5y8r347jq1vq13gnfd3bmd71xr"; depends=[colorspace corpcor igraph lavaan lisrelToR OpenMx plyr qgraph regsem rockchalk sem XML]; };
   semPower = derive2 { name="semPower"; version="1.0.0"; sha256="0wciz5qrd40q4mxq96pibnya11ac42n37c9xhjd4zfhznhjz06bb"; depends=[]; };
   semTable = derive2 { name="semTable"; version="1.6"; sha256="125dhdyy4idyxnn8j2ijbj9ikvz78hymr3m3x122ydsln89phsy1"; depends=[kutils lavaan plyr stationery xtable]; };
-  semTools = derive2 { name="semTools"; version="0.5-1"; sha256="0lh10yw888hcj1mdl96p5pw8gi0a1dj8panclghry6b8xaa3w7ni"; depends=[lavaan]; };
+  semTools = derive2 { name="semTools"; version="0.5-2"; sha256="1zj841pszfsikzp82cmh463qyc4xhdrqjqcnhc2r8mcflv12irv6"; depends=[lavaan]; };
   semantic_dashboard = derive2 { name="semantic.dashboard"; version="0.1.1"; sha256="0fd5qnw5jcmf5akkv59z1zjizsczwlmnpkfd8bfminhpa89sgp1y"; depends=[shiny shiny_semantic]; };
   semdiag = derive2 { name="semdiag"; version="0.1.2"; sha256="0kjcflw7dn907zx6790w7hnf5db6bf549whfsc0c2r173kf13irp"; depends=[sem]; };
   semdrw = derive2 { name="semdrw"; version="0.1.0"; sha256="16hm1ifgspnxnlf3rfg5ylmql2fq91ig8nc5953ggyhfrjwbqx15"; depends=[dplyr lavaan psych semPlot semTools shiny shinyAce]; };
   semds = derive2 { name="semds"; version="0.9-6"; sha256="10kvcmcy6qa2r5sram6azqgzl528rghfxgw2f2bq2fvhhq127dzq"; depends=[minpack_lm pracma]; };
   semiArtificial = derive2 { name="semiArtificial"; version="2.3.1"; sha256="1rjf8wsbwi6kfwsh89kblhl0f3m7rrma7gly7b4xm7bj7jdkljkr"; depends=[cluster CORElearn flexclust fpc ks logspline MASS mcclust nnet robustbase RSNNS StatMatch timeDate]; };
-  seminr = derive2 { name="seminr"; version="0.7.0"; sha256="1zf3qyqvlk8f7a5q39980cyci8smn2z326qlp275qs23yawnch9c"; depends=[]; };
+  seminr = derive2 { name="seminr"; version="1.0.0"; sha256="1nq057mgafq7wffsb9bcyvgkmwnbd1cndyaky5k6n304g4bsacsx"; depends=[]; };
   semnar = derive2 { name="semnar"; version="0.7.1"; sha256="0g6l4377i9wdwbcrdhdmsph68bd6qwc5mjlw824mpxn0ggg6vx72"; depends=[jsonlite leaflet lubridate magrittr urlshorteneR]; };
   semsfa = derive2 { name="semsfa"; version="1.1"; sha256="1k6i1m4r9y7j85rlrsgfjm8w15ax4xgf70xyvqwsszmf9950ldxx"; depends=[doParallel foreach gamlss iterators mgcv moments np]; };
   semtree = derive2 { name="semtree"; version="0.9.13"; sha256="0am7fm7f9kgq6kmd17axrswlg191ny3pq6b5sf731diz1ghyncmp"; depends=[bitops cluster digest OpenMx plotrix rpart rpart_plot sets stringr]; };
@@ -12792,6 +13046,7 @@ in with self; {
   sendmailR = derive2 { name="sendmailR"; version="1.2-1"; sha256="0z7ipywnzgkhfvl4zb2fjwl1xq7b5wib296vn9c9qgbndj6b1zh4"; depends=[base64enc]; };
   sendplot = derive2 { name="sendplot"; version="4.0.0"; sha256="0ia2xck94nwirwxi38nv0viz5wb8291yiak6f0wgwh84irsrfp1h"; depends=[rtiff]; };
   sensR = derive2 { name="sensR"; version="1.5-1"; sha256="0hqnk6gvlkl9harz7rh5ikbp0s0vjwi63gxixqjfhkyk02ilaa3z"; depends=[MASS multcomp numDeriv]; };
+  sensemakr = derive2 { name="sensemakr"; version="0.1.2"; sha256="0p5rh511fymbh8vkfwdv62xxwflkmrqwas1b16m0hlzjwyzdn03m"; depends=[]; };
   sensiPhy = derive2 { name="sensiPhy"; version="0.8.3"; sha256="03qrxal0wvgiyr5vnnzc8n95h4460p11idnmr6vnr73c5f8q905h"; depends=[ape caper geiger ggplot2 phylolm phytools]; };
   sensibo_sky = derive2 { name="sensibo.sky"; version="1.0.0"; sha256="0s8gbj7qrcbcnflp7v0s93ykh2xgk7jwpyvzndj1f90hjy20x3bc"; depends=[glue httr jsonlite]; };
   sensitivity = derive2 { name="sensitivity"; version="1.16.1"; sha256="1qzkj0bzyyh42n40a6ihzs08bngrd8bq62rssrgzj7vfs7a14wi3"; depends=[boot ggplot2]; };
@@ -12803,12 +13058,12 @@ in with self; {
   sensitivitymv = derive2 { name="sensitivitymv"; version="1.4.3"; sha256="1ga8mf92niiv1z3g3kv5ha5xdd1089aaqp19dz68kv8a396vhy1j"; depends=[]; };
   sensitivitymw = derive2 { name="sensitivitymw"; version="1.1"; sha256="1bknnfkkqgmchabcjdfikm37sn5k41ar8lpnjw58i8qh7yzq237i"; depends=[]; };
   sensmediation = derive2 { name="sensmediation"; version="0.3.0"; sha256="0pmhlc5aqz1vwl4fpn38nkqy63pbq6q62fk9xjja4khrq35zh9yb"; depends=[maxLik mvtnorm]; };
-  sensobol = derive2 { name="sensobol"; version="0.2.0"; sha256="0fc8f0qlp4qb007ilna6prnvyx8av1lqydl3xjqk7a8zajl9mym3"; depends=[boot data_table ggplot2 magrittr matrixStats randtoolbox Rdpack rlang scales stringr]; };
+  sensobol = derive2 { name="sensobol"; version="0.2.1"; sha256="0m6iqr4wylqgg2r3nqylbzblg2sxa3j4b1rakk99l1giqxlql8nc"; depends=[boot data_table ggplot2 magrittr matrixStats randtoolbox Rdpack rlang scales stringr]; };
   sensors4plumes = derive2 { name="sensors4plumes"; version="0.9.3"; sha256="1r9sddnlxpjck7rhm2w7z8jak7wmrxg3d62dydc5dqcqhgp54r6p"; depends=[automap conf_design emdist FNN genalg gstat lattice raster rgdal sp]; };
   sensory = derive2 { name="sensory"; version="1.1"; sha256="1zd0ajrymxi6gygcq9fqgwgy0g6c3cqz53x0k5m0ihbmh11rc7s7"; depends=[gtools MASS Matrix]; };
   senstrat = derive2 { name="senstrat"; version="1.0.3"; sha256="0j6mb55v5ivqvk8nn8fjlzrbdgj6csa58yc6gy1g07m7gk2qz2np"; depends=[BiasedUrn MASS]; };
   sentimentr = derive2 { name="sentimentr"; version="2.7.1"; sha256="13myh7w9pynmgvqspsxpnj8mz8jz8nwkwjyax4hahvwb9707hf2s"; depends=[data_table ggplot2 lexicon stringi syuzhet textclean textshape]; };
-  sentometrics = derive2 { name="sentometrics"; version="0.5.6"; sha256="073xhygj833a8k249kw5sbg7jmmcs9k4fsva88say5xhkbq62yqr"; depends=[caret data_table foreach ggplot2 glmnet ISOweek quanteda Rcpp RcppArmadillo RcppParallel RcppRoll stringi]; };
+  sentometrics = derive2 { name="sentometrics"; version="0.7.0"; sha256="08vpjpbcyp4r8psi06ql6zij51r1cp2hz45r007r1lz151pd043y"; depends=[caret data_table foreach ggplot2 glmnet ISOweek quanteda Rcpp RcppArmadillo RcppParallel RcppRoll stringi]; };
   separationplot = derive2 { name="separationplot"; version="1.1"; sha256="0qfkrk8n6jj8l7ywngwsaikfwmd9hbrpr43x0l9wkjjp1asgs5l6"; depends=[]; };
   seplyr = derive2 { name="seplyr"; version="0.8.4"; sha256="18z3nfxghzzcn23ilgsimbxz8mqi3q45i7b3ihdmkllc3ln1f0vk"; depends=[dplyr rlang tidyr wrapr]; };
   seqCBS = derive2 { name="seqCBS"; version="1.2.1"; sha256="176ggpdcgmpsjixmz0ldknyd0vw120kjyrid3bq2bn4cgkwzb74z"; depends=[clue]; };
@@ -12817,7 +13072,8 @@ in with self; {
   seqICP = derive2 { name="seqICP"; version="1.1"; sha256="1dfhl7g47icjw38p9c0hyvnn3pwzw7pndywk22vgcyfhiz23xjcp"; depends=[dHSIC mgcv]; };
   seqMeta = derive2 { name="seqMeta"; version="1.6.7"; sha256="11dscdrlnk5jzg0q2g59qis4xjr4xs86bi463jmhq53n9gsb4i1l"; depends=[CompQuadForm coxme Matrix survival]; };
   seqRFLP = derive2 { name="seqRFLP"; version="1.0.1"; sha256="1i98hm8wgwr8b6hd237y2i9i0xgn35w4n2rxy4lqc5zq71gkwkvk"; depends=[]; };
-  seqinr = derive2 { name="seqinr"; version="3.4-5"; sha256="17zv0n5cji17izwmwg0jcbxbjl3w5rls91w15svcnlpxjms38ahn"; depends=[ade4 segmented]; };
+  seqgendiff = derive2 { name="seqgendiff"; version="1.1.1"; sha256="0kj36zbrc96zjha57qx2f2n7wq6fay7c8x49n0jpnmjs66daaxlh"; depends=[assertthat cate clue irlba matchingR pdist sva]; };
+  seqinr = derive2 { name="seqinr"; version="3.6-1"; sha256="0j30za6kji6y3v09cvcydiacnp65pv6ig8aw7cydl47l5s9chky4"; depends=[ade4 segmented]; };
   seqminer = derive2 { name="seqminer"; version="7.1"; sha256="1jydcpkw4rwfp983j83kipvsvr10as9pb49zzn3c2v09k1gh3ymy"; depends=[]; };
   seqmon = derive2 { name="seqmon"; version="2.3"; sha256="0lvjb3mx1h5nbbn3kmjwviy9gzsv9k1bs57jdfc09kid7kisaqmn"; depends=[]; };
   seqtest = derive2 { name="seqtest"; version="0.1-0"; sha256="1bdfww9szh7h278id5xpfc39mxkcix3yvsdwc68wx3q3x0wxhqhq"; depends=[]; };
@@ -12826,25 +13082,27 @@ in with self; {
   sequoia = derive2 { name="sequoia"; version="1.3.3"; sha256="0k0vl7rz9jylry80w8lbqyg3ws3bhkg8axpzy0rrd8xw1lxbpf93"; depends=[plyr]; };
   sergeant = derive2 { name="sergeant"; version="0.5.2"; sha256="02chkyvmwd4nimw62v82rfbid1xqw5b1335na44pdi675g904250"; depends=[DBI dbplyr dplyr htmltools httr jsonlite purrr readr scales]; };
   serial = derive2 { name="serial"; version="2.1.4"; sha256="1wvs3aa9h1dff2jrxszqwrfv2b281zap1dj2mhlx2w4k8hnggas0"; depends=[]; };
-  seriation = derive2 { name="seriation"; version="1.2-7"; sha256="0dbz5b5msy4fr2whhphyriqk1xc6305zpjq59rrwxyz3d7rzwpa6"; depends=[cluster colorspace dendextend gclus gplots MASS qap registry TSP]; };
+  seriation = derive2 { name="seriation"; version="1.2-8"; sha256="1zbdxq0s5rc5v307b69fw9k52m0654ls7pf22lh35ggirig6lwsk"; depends=[cluster colorspace dendextend gclus gplots MASS qap registry TSP]; };
   serieslcb = derive2 { name="serieslcb"; version="0.4.0"; sha256="1ip4k2xzg06hwsni62ai1whs1zzhwlf94507inpfpqz3jmmafrhq"; depends=[gplots shiny]; };
   seroincidence = derive2 { name="seroincidence"; version="2.0.0"; sha256="0sam4y7w6prswz0izkm1a9v2k5rv7z22g1ajy15n9xix9aml5ms4"; depends=[]; };
   serrsBayes = derive2 { name="serrsBayes"; version="0.4-0"; sha256="060zs1n5h9ns9dd004f69qmbwbbqla97bhbldm8narhm84f8pf6i"; depends=[Matrix Rcpp RcppEigen truncnorm]; };
   servosphereR = derive2 { name="servosphereR"; version="0.1.1"; sha256="0m1fjd3f1s2ss54xmcrm3p0c33hhi2dj0vim790g4y0mw2aicc8l"; depends=[data_table dplyr magrittr purrr rlang]; };
-  servr = derive2 { name="servr"; version="0.14"; sha256="0zjjnfgas9d16fihksyk24kgkkqswb4sd0rz51id2ni1ymdyasjk"; depends=[httpuv jsonlite mime xfun]; };
+  servr = derive2 { name="servr"; version="0.15"; sha256="199k9aghwk9rf1rm8pjg60xacqww25cza259h5dfj1ixil0m6dxi"; depends=[httpuv jsonlite mime xfun]; };
   sesem = derive2 { name="sesem"; version="1.0.2"; sha256="0b1xzv38wpkhhlq87xrvlh45b8ksbi8bg4ar5hrf8gxa19r9rmi5"; depends=[gplots lavaan mgcv]; };
   session = derive2 { name="session"; version="1.0.3"; sha256="04mcy1ac75fd33bg70c47nxqxrmqh665m9r8b1zsz5jij1sbl8q5"; depends=[]; };
   sessioninfo = derive2 { name="sessioninfo"; version="1.1.1"; sha256="0j5f3l58fynxx3v0w62vqpii7miabszgljpja36xx9s8hikh8sqn"; depends=[cli withr]; };
+  set = derive2 { name="set"; version="1.0"; sha256="0v17pfrrlncb55n1ag8q9qg9q4c9bq535ax0m0m7jdlpaprnwnf5"; depends=[do]; };
   setRNG = derive2 { name="setRNG"; version="2013.9-1"; sha256="02198cikj769yc32v8m2qrv5c01l2fxmx61l77m5ysm0hab3j6hs"; depends=[]; };
   sets = derive2 { name="sets"; version="1.0-18"; sha256="16v7650p47khqrbbw0z98llmwmmhswqmhri0n7nrfhdqwmby1lbl"; depends=[]; };
   setter = derive2 { name="setter"; version="0.0-1"; sha256="10fwrx8yysp99rrkbnn3rbz79vyzr2h3p7zxxlqapw1k2lllp0r5"; depends=[assertive_base]; };
   settings = derive2 { name="settings"; version="0.2.4"; sha256="092sv6nccm6p2d695l9w0zfi2xgymk12c8p8lhl9nb86mxrb3nry"; depends=[]; };
   severity = derive2 { name="severity"; version="2.0"; sha256="1mp19y2pn7nl9m8xfljc515kk5dirv0r2kypazpmd956lcivziqq"; depends=[]; };
-  sf = derive2 { name="sf"; version="0.7-7"; sha256="192hw52x1qlif8zyai1kff1wiyr3yl5f7jj1rk3k0nr8das0qy6i"; depends=[classInt DBI magrittr Rcpp units]; };
+  sf = derive2 { name="sf"; version="0.8-0"; sha256="05dyq0vcz2f1fl03hk3v1a4nz4s84yyqw4rc9w9cwfq71gvm9qwf"; depends=[classInt DBI magrittr Rcpp units]; };
   sfa = derive2 { name="sfa"; version="1.0-1"; sha256="1acqxgydf8j5csdkx0yf169x3yaa31r0ccdrqarh6vj1hacm89ad"; depends=[]; };
   sfadv = derive2 { name="sfadv"; version="1.0.1"; sha256="1rfpm6km5pckwhqgpvidm6qsj5sjdaqqj5b0sgvpslivfa4c80cr"; depends=[gmm minpack_lm]; };
   sfc = derive2 { name="sfc"; version="0.1.0"; sha256="0cm4mfcfd9bhf2j5fppsihzrfipnldb6q3xradd88z9pwgrkfx2a"; depends=[dplyr sna tidyr triangle zoo]; };
   sfdct = derive2 { name="sfdct"; version="0.0.6"; sha256="0ilh89mfwp1yqn44yn80vz1a6g65hryk6w87ngzvak3pd6jxq6aa"; depends=[dplyr RTriangle sf sp tibble]; };
+  sfheaders = derive2 { name="sfheaders"; version="0.0.1"; sha256="1zx3kqx8p9mhmxlhh39i0lp9lnwl6khn1phm7rl4capfa9d7ry0p"; depends=[Rcpp]; };
   sfinx = derive2 { name="sfinx"; version="1.7.99"; sha256="14v47y00qwvc2s0vzjw19hwn85nzj8lna539c75qq6zkn6kir6va"; depends=[]; };
   sfsmisc = derive2 { name="sfsmisc"; version="1.1-4"; sha256="0zaw617zarmwir8l60riky0z6r1j3mwfnm1f32vqcbljb74akdj4"; depends=[]; };
   sft = derive2 { name="sft"; version="2.2-1"; sha256="0fxz64ba58n6ghfqsgq64n1c7qkvi8c3lsa86732mil9w71yxw33"; depends=[fda SuppDists]; };
@@ -12863,16 +13121,16 @@ in with self; {
   sgr = derive2 { name="sgr"; version="1.3"; sha256="0zxmrbv3fyb686hcgfy2w1w2jffxf41ab8yc90dsgf931s9c55wn"; depends=[MASS]; };
   sgt = derive2 { name="sgt"; version="2.0"; sha256="0qb3maj5idwafs40fpdfrwzkadnh5yg8fvfzfs51p9yy69kbmlkx"; depends=[numDeriv optimx]; };
   shades = derive2 { name="shades"; version="1.4.0"; sha256="1zg95sjhrfvbdlfc387g9p0vnb8nb6agdk1mb3wq3kwkm2da0bqj"; depends=[]; };
-  shadow = derive2 { name="shadow"; version="0.6.1"; sha256="1jlbjx2wcl3rdvidkp8cg33br9z87bic98s8dr74768cgc36hg4k"; depends=[plyr raster rgeos sp]; };
-  shadowtext = derive2 { name="shadowtext"; version="0.0.5"; sha256="1hnkn2pfbsz2ziymx4da34mqxsxa4av9f5ig2q9543227amxb0sk"; depends=[ggplot2 scales]; };
-  shallot = derive2 { name="shallot"; version="0.4.6"; sha256="0p8rbkjizgl9fvl480s53rcc5kwifirlghf5616rb295c512l4vk"; depends=[rscala sdols]; };
+  shadow = derive2 { name="shadow"; version="0.6.2"; sha256="10azq8w2hwd2ff2yvl81jrfsfqjq1qb6dqkhvkb7xnnwmd4488bs"; depends=[plyr raster rgeos sp]; };
+  shadowtext = derive2 { name="shadowtext"; version="0.0.6"; sha256="1cx9wdx99n9k8ysf947vkxry27rvjs24yhg8yqygs84z5rjaahzp"; depends=[ggplot2 scales]; };
+  shallot = derive2 { name="shallot"; version="0.4.7"; sha256="0lvvnia3yngywp7gm68kdwgfmvag4llhzim8nqcbl6iq52lvlj2g"; depends=[commonsMath rscala salso]; };
   shape = derive2 { name="shape"; version="1.4.4"; sha256="0hadk3mapkhbh8xjkiz52vxdagmmgvm15xwpzb90ikw4giyipjzl"; depends=[]; };
   shapeR = derive2 { name="shapeR"; version="0.1-5"; sha256="17fq4gsdvyniq7n4x1xdvb5kk50184i7why3pdf1djjhknym087j"; depends=[gplots jpeg MASS pixmap vegan wavethresh]; };
   shapefiles = derive2 { name="shapefiles"; version="0.7"; sha256="08ghndihs45kylbzd9wnxffn8ixvxjhjnjldjyd526ai2sj8xcgf"; depends=[foreign]; };
   shapes = derive2 { name="shapes"; version="1.2.4"; sha256="1zqykhx8rz1k2ahi2lmmzll1c8k0as6vw4gbd3rpfb5fvpni3ni0"; depends=[MASS minpack_lm rgl scatterplot3d]; };
   shapper = derive2 { name="shapper"; version="0.1.2"; sha256="0z2ad0hk1gwxbr4kqbk26lzl25hrcifcp92i3am5j6y0ys71dwsx"; depends=[ggplot2 reticulate]; };
-  shar = derive2 { name="shar"; version="0.5"; sha256="1vscs19ca5m8hiq280gra7cwwwk6yf4nlab02fd7czvxv6zhlyy1"; depends=[classInt raster Rcpp spatstat]; };
-  sharpData = derive2 { name="sharpData"; version="1.1"; sha256="05gvbf2j3mfrinl4rr8cjrglr6hbjf5xgzyjh2v7j76i1ckkpz4h"; depends=[KernSmooth]; };
+  shar = derive2 { name="shar"; version="1.0.1"; sha256="0qpjmxdfp08lqhn70nh4728scm1ah93qpdyg3215640b3js0d3ik"; depends=[classInt raster Rcpp spatstat]; };
+  sharpData = derive2 { name="sharpData"; version="1.2"; sha256="0pvaq8i1vrra3d0wf6yyqkbin0zgsd1kvdzh4bfnyps6pzn5k789"; depends=[KernSmooth quadprog]; };
   sharpeRratio = derive2 { name="sharpeRratio"; version="1.1"; sha256="0rgsad8idhjyjgwlzk358jlqkqf6sk7g6vl3fchkamjzxnhbb8p9"; depends=[ghyp Rcpp]; };
   sharpr2 = derive2 { name="sharpr2"; version="1.1.1.0"; sha256="1r7anfr296l5sbhgry6rb15hlca6mpcm24qssdzz9bckavyfvqgi"; depends=[Matrix mvtnorm]; };
   sharpshootR = derive2 { name="sharpshootR"; version="1.0"; sha256="1x9cava7b9lg8qpmjqlbkqmpc9a2dn8k4kl71s4himr4wzp9z4y3"; depends=[ape aqp circular cluster digest Hmisc igraph lattice latticeExtra plyr RColorBrewer reshape2 scales soilDB sp vegan]; };
@@ -12884,7 +13142,7 @@ in with self; {
   shiny_i18n = derive2 { name="shiny.i18n"; version="0.1.0"; sha256="15llwr4yrx6rlk32b92wcq3dn360y5cvy4mh2aqkza9ikcvlhcvv"; depends=[jsonlite yaml]; };
   shiny_router = derive2 { name="shiny.router"; version="0.1.1"; sha256="0biwni6bk39qafvsh8w32crlgm4hf8r9kwkmnlc3w5za2x2fja4c"; depends=[magrittr shiny]; };
   shiny_semantic = derive2 { name="shiny.semantic"; version="0.2.1"; sha256="0m0f22qlmf7f2cf33myn72dm48yslqyx4kwzb96i78a3yz6a2awp"; depends=[htmltools htmlwidgets jsonlite magrittr purrr shiny]; };
-  shinyAce = derive2 { name="shinyAce"; version="0.4.0"; sha256="0hvih5g0pswlnz5rf3blx5yqw11ssxvm8w4klxddp1ap20ncbgl1"; depends=[jsonlite shiny]; };
+  shinyAce = derive2 { name="shinyAce"; version="0.4.1"; sha256="1m33dfm2kjirvgix7ybv1kbzgjkicdpv411g9c0q3fw6rnyhfxxn"; depends=[jsonlite shiny]; };
   shinyBS = derive2 { name="shinyBS"; version="0.61"; sha256="0rhim4mbp4x9vvm7xkmpl7mhb9qd1gr96cr4dv330v863ra2kgji"; depends=[htmltools shiny]; };
   shinyDND = derive2 { name="shinyDND"; version="0.1.0"; sha256="0nkvz4hmjzmxlzj4vkjrdy8xlbxapg1amk180irgvwicqldi4jpm"; depends=[htmltools shiny]; };
   shinyEffects = derive2 { name="shinyEffects"; version="0.1.0"; sha256="03fm2i1ydlp90w299nvz7dqs9724g0m2f0bc44ni8m2gz9cfpccs"; depends=[htmltools shiny shinydashboard]; };
@@ -12894,19 +13152,19 @@ in with self; {
   shinyHeatmaply = derive2 { name="shinyHeatmaply"; version="0.1.0"; sha256="1vl80vp7yslnh0dvcrpysfn5rndjavphy31y15546q7ax7d0fn6v"; depends=[dplyr DT heatmaply htmltools htmlwidgets jsonlite plotly RColorBrewer readxl shiny viridis xtable]; };
   shinyKGode = derive2 { name="shinyKGode"; version="1.0.5"; sha256="004zwz4kqfijzvvwkq8v1gi25w1wrdlg8230g93w36gbi6cl2vk1"; depends=[ggplot2 gridExtra KGode mvtnorm pracma pspline reshape2 shiny shinyjs XML]; };
   shinyLP = derive2 { name="shinyLP"; version="1.1.2"; sha256="1sjcll10ciq6pj9h8c6ybjqp8763wc423hddlalcblxxpajf6avz"; depends=[shiny]; };
-  shinyML = derive2 { name="shinyML"; version="0.1.0"; sha256="17400crygl4zz7v6p8if4i3af3r1rz3sjc7281z6cyl82ba7a0wl"; depends=[data_table dplyr DT dygraphs ggplot2 h2o plotly shiny shinycssloaders shinydashboard shinyWidgets sparklyr tidyr]; };
-  shinyMatrix = derive2 { name="shinyMatrix"; version="0.1.0"; sha256="14933x96cchkbdy0pw555vva7d83z5qyyjxxpz3gm6qwiipr9r3q"; depends=[jsonlite shiny]; };
+  shinyML = derive2 { name="shinyML"; version="0.1.1"; sha256="16agyfss9zxigi34qz9823rdfzzi20174ssb3mk3la7rcdpb8chr"; depends=[data_table dplyr DT dygraphs ggplot2 h2o plotly shiny shinycssloaders shinydashboard shinyWidgets sparklyr tidyr]; };
+  shinyMatrix = derive2 { name="shinyMatrix"; version="0.2.0"; sha256="10l85263xkj9mgx8ylpabq8319qlzd712bb46qc50rl7x10k7piz"; depends=[jsonlite shiny]; };
   shinyMolBio = derive2 { name="shinyMolBio"; version="0.2"; sha256="09lq5pvis450il1agcq5n9cilnq84rfv08w2dz1d0bbq1qgrgnvg"; depends=[checkmate dplyr plotly purrr RColorBrewer RDML shiny stringr whisker]; };
   shinyRGL = derive2 { name="shinyRGL"; version="0.1.0"; sha256="07llg1yg5vmsp89jk60ly695zvxky6n06ar77mjxzlyc294akwmy"; depends=[rgl shiny]; };
   shinyShortcut = derive2 { name="shinyShortcut"; version="0.1.0"; sha256="101wz9s4rk7fbaqgm0r2v3v8za20vdxwq4vhkz8xr7y5pr65sxiq"; depends=[]; };
-  shinyTime = derive2 { name="shinyTime"; version="1.0.0"; sha256="16gv01fbvnrn64kxf9kmard2cjjd99n3s37b1hp90ziqw479sgz4"; depends=[htmltools shiny]; };
+  shinyTime = derive2 { name="shinyTime"; version="1.0.1"; sha256="1d830wf7d5ki7frbr1vgy9d0vllyfcylq7pfkspjkz64b2xfhah3"; depends=[htmltools shiny]; };
   shinyTree = derive2 { name="shinyTree"; version="0.2.7"; sha256="0jfx2capckv7hf2yx3fn8i4rcmhi222ah91jnmhg497x8wgz31s3"; depends=[htmlwidgets jsonlite promises shiny stringr]; };
-  shinyWidgets = derive2 { name="shinyWidgets"; version="0.4.8"; sha256="1s4j3w9h843n7x7jkibc29kz9dqgc9dy861470mrc47wmhnbibz2"; depends=[htmltools jsonlite scales shiny]; };
+  shinyWidgets = derive2 { name="shinyWidgets"; version="0.4.9"; sha256="1yxmqvq96hhbnvwsaf7cpp2947bxww5ap3jlz7sjch8jrkwlb4cl"; depends=[htmltools jsonlite scales shiny]; };
   shinyaframe = derive2 { name="shinyaframe"; version="1.0.1"; sha256="1flhgsm4q7p5acb41v73pf8ni92y9dwdppxjb9czlz1sxwf03p1s"; depends=[htmltools htmlwidgets shiny]; };
   shinyalert = derive2 { name="shinyalert"; version="1.0"; sha256="0ngmpbzw6fw1gs6sv9m3xv2c9bmrxg0bs6lnvxn8hm8cwr4440xi"; depends=[digest shiny]; };
   shinyanimate = derive2 { name="shinyanimate"; version="0.3.0"; sha256="0vshid5mfq006cprjj61d0g7ajyc3plc66x55c5jjmijwbp6pw7a"; depends=[shiny]; };
   shinybootstrap2 = derive2 { name="shinybootstrap2"; version="0.2.1"; sha256="17634l3swlvgj1sv56nvrpgd6rqv7y7qjq0gygljbrgpwmfj198c"; depends=[htmltools jsonlite shiny]; };
-  shinybusy = derive2 { name="shinybusy"; version="0.1.2"; sha256="1i8ch9r38j2km5yvim5r7lxh0mhl9k6i4ywh8izn94828mqzcdc4"; depends=[htmltools jsonlite shiny]; };
+  shinybusy = derive2 { name="shinybusy"; version="0.1.3"; sha256="0drkxw1vnhkii12vv8b2k8j3d7mg93dg8iz097a38sd6l7i3wxfj"; depends=[htmltools jsonlite shiny]; };
   shinycssloaders = derive2 { name="shinycssloaders"; version="0.2.0"; sha256="1bpzsm7m7c366sjl1qndp4m5dg2vlm68rjgdy9n1ija9xbp0r2g4"; depends=[digest glue shiny]; };
   shinycustomloader = derive2 { name="shinycustomloader"; version="0.9.0"; sha256="1klx71vr26g0gjf6hbiia1qidqii5d467i1sdjvlrg1hxdcggqff"; depends=[glue shiny]; };
   shinydashboard = derive2 { name="shinydashboard"; version="0.7.1"; sha256="0khac8b27q3swdw07kl609hm0fjfjsjv591b388q99mqqr2rk92i"; depends=[htmltools promises shiny]; };
@@ -12916,7 +13174,7 @@ in with self; {
   shinyhttr = derive2 { name="shinyhttr"; version="1.0.0"; sha256="1l02g0qgvycwpfr6wl7svnms128fhlzbn9p7i4mr7ghgsd5qr58a"; depends=[shinyWidgets]; };
   shinyjqui = derive2 { name="shinyjqui"; version="0.3.2"; sha256="1a73vsq1wc3xf14y64hkgnk5jgxj98b8aj3g0fs7mgayar3an5g0"; depends=[htmltools htmlwidgets jsonlite shiny]; };
   shinyjs = derive2 { name="shinyjs"; version="1.0"; sha256="113zpijri0l80rlgrvqn6bxk0sdqgl79h7yhja2p76f9dc9i2sr8"; depends=[digest htmltools jsonlite shiny]; };
-  shinylogs = derive2 { name="shinylogs"; version="0.1.6"; sha256="0lk69snnazns2883szw0ihlyr6gdihqs28fj92qm9vdn6awjxy9d"; depends=[anytime bit64 data_table DBI digest htmltools jsonlite nanotime RSQLite shiny]; };
+  shinylogs = derive2 { name="shinylogs"; version="0.1.7"; sha256="1b4p0g1vf9wn643rybf382mw6mrrl49qsykh7npa3agcarwznmgr"; depends=[anytime bit64 data_table DBI digest htmltools jsonlite nanotime RSQLite shiny]; };
   shinymanager = derive2 { name="shinymanager"; version="1.0"; sha256="0hg92ij4ixn4xp0fqhpvyfxvnpyzyr88ymzxxk7n55hr50l8vbqi"; depends=[billboarder DBI DT htmltools openssl R_utils R6 RSQLite shiny]; };
   shinymaterial = derive2 { name="shinymaterial"; version="0.5.5"; sha256="0wbi2ccnxjyq4y5xijvn0a38sv56s9cab0c8k86cv5gapyzdzs7x"; depends=[jsonlite shiny]; };
   shinyrecap = derive2 { name="shinyrecap"; version="0.1.0"; sha256="1mic7azxz2in67g3a2ir550w8psh6kc75p6hja6m62a0yy7j2n92"; depends=[CARE1 coda conting dga future ggplot2 ipc LCMCR promises Rcapture reshape shiny shinycssloaders testthat]; };
@@ -12924,7 +13182,7 @@ in with self; {
   shinytest = derive2 { name="shinytest"; version="1.3.1"; sha256="1qn46kgqxfbfimghy5d200rmxpmbp7ckl7dm82m4bnrsf9ivzlgg"; depends=[assertthat callr crayon debugme digest htmlwidgets httpuv httr jsonlite parsedate pingr R6 rematch rstudioapi shiny testthat webdriver withr]; };
   shinythemes = derive2 { name="shinythemes"; version="1.1.2"; sha256="12miz44n2zxfswnia7p8dirxj3miw0aqn4pkx2111ikz67ax84rf"; depends=[shiny]; };
   shinytoastr = derive2 { name="shinytoastr"; version="2.1.1"; sha256="01j2z4gf1wxblrjayykwxdr2s8394i7k930x8g4hmrj7c9pv264n"; depends=[shiny]; };
-  shipunov = derive2 { name="shipunov"; version="1.2"; sha256="020xfdq5k6fw0nisskh7lysj5xrmf4b7n7vajwr6273hx6m08bbi"; depends=[]; };
+  shipunov = derive2 { name="shipunov"; version="1.3"; sha256="0bja3gb837ccyqxncm666749abnlr8bn88k788x0z4mnc8x32zak"; depends=[]; };
   shock = derive2 { name="shock"; version="1.0"; sha256="11m52al591xjznl62q1waxsg5m1a1afmd0yqcc5zsjlrplykg4lp"; depends=[capushe GGMselect glasso igraph mvtnorm]; };
   shopifyr = derive2 { name="shopifyr"; version="1.0.0"; sha256="05hih1v5vvr7vmwarizsdx8517g74s96fdsz3klcz3g12idx1nqn"; depends=[curl jsonlite R6]; };
   shotGroups = derive2 { name="shotGroups"; version="0.7.5.1"; sha256="0il6hlv2hnfx5rmj3vk3q9p24xqii77z6hdz5fsgyh4i3kgcyrjy"; depends=[boot coin CompQuadForm KernSmooth robustbase]; };
@@ -12933,11 +13191,12 @@ in with self; {
   showtextdb = derive2 { name="showtextdb"; version="2.0"; sha256="1qwwj9x2jvadvwn60h75k99c9xi7yhqjsgaakahz5paxgj583bsh"; depends=[sysfonts]; };
   shp2graph = derive2 { name="shp2graph"; version="0-5"; sha256="1l9mg98hkb0bvr5dzd2p26g8mw5hqjxrym2gmbm10kyapvccfk56"; depends=[igraph maptools sp]; };
   shrink = derive2 { name="shrink"; version="1.2.1"; sha256="0pd967wsys8fd7gyvr9y08km118yamfk5c1a1i2k8nr2ifpqmy0w"; depends=[MASS mfp rms survival]; };
-  shrinkTVP = derive2 { name="shrinkTVP"; version="1.0.1"; sha256="1nf6lpl38jyrd4mnfx2gk4wfpccw2mjy9ajlsy0rwnd9dk81wx4n"; depends=[coda GIGrvg Rcpp RcppArmadillo RcppProgress stochvol]; };
+  shrinkTVP = derive2 { name="shrinkTVP"; version="1.0.2"; sha256="0psn20a68fvmr8d94jjvrqhngkzdrqpgq0rr6fz3jximy4856437"; depends=[coda GIGrvg Rcpp RcppArmadillo RcppProgress stochvol]; };
   shuffle = derive2 { name="shuffle"; version="1.0.1"; sha256="0aqb11h340picx7z2jg3k46l3pr6fkknlpyzc0z89hhrc90pss48"; depends=[]; };
   shuffleCI = derive2 { name="shuffleCI"; version="0.1.0"; sha256="1n9k28m1fcnw1my9a7v0gy9waygd48lab45vj9k2wwijbc325zai"; depends=[plotrix]; };
   shutterstock = derive2 { name="shutterstock"; version="0.1.0"; sha256="1vqbrjbwl2gdcf607f51cdzkjbkmk11n08mzx01j7bwcd278ny8r"; depends=[httr jsonlite]; };
   siar = derive2 { name="siar"; version="4.2"; sha256="1c4z72jr81dzkp9xqyrrkwjsalvvksl67pnbaadkc52v84fhzx3r"; depends=[bayesm coda hdrcde MASS mnormt spatstat]; };
+  sicegar = derive2 { name="sicegar"; version="0.2.3"; sha256="0q0sp3aqvd4jh8ncfnls194iqikyxyk28zsyq65jkqd8z26s2dq4"; depends=[dplyr fBasics ggplot2 minpack_lm]; };
   sideChannelAttack = derive2 { name="sideChannelAttack"; version="1.0-6"; sha256="1xcsy1h8gc8a4f9nzs7zv8x6v55g1pg8vy1kg64iqxm0gnz2f20l"; depends=[ade4 corpcor infotheo MASS mmap]; };
   sidier = derive2 { name="sidier"; version="4.0.3"; sha256="0pfzx0a5f597iqigq9xidm9b9xv18zaiqa35yp4xlk1y7gv0nj6c"; depends=[ape ggmap ggplot2 gridBase igraph network]; };
   sidrar = derive2 { name="sidrar"; version="0.2.4"; sha256="1zwxafc4xaa4386a9jdg3gwflpdxql3f33bkqx1l2yl30x3517rw"; depends=[dplyr magrittr RCurl rjson rvest stringr tidyr xml2]; };
@@ -12954,13 +13213,15 @@ in with self; {
   signal = derive2 { name="signal"; version="0.7-6"; sha256="1vsxramz5qd9q9s3vlqzmfdpmwl2rhlb2n904zw6f0fg0xxjfq3b"; depends=[MASS]; };
   signalHsmm = derive2 { name="signalHsmm"; version="1.5"; sha256="1d4v6cbvcbi8pb5zmn58s01h3jb0kv7yr7qvcnx4p2v82knvhik7"; depends=[Rcpp seqinr shiny]; };
   signmedian_test = derive2 { name="signmedian.test"; version="1.5.1"; sha256="05n7a4h2bibv2r64cqschzhjnm204m2lm1yrwxvx17cwdp847hkm"; depends=[]; };
-  sigora = derive2 { name="sigora"; version="3.0.1"; sha256="1pz9jibxjvvbc0wmd7sj2fss6hd8h1fvcg8vg72qwqvfy3f9jdry"; depends=[]; };
+  signs = derive2 { name="signs"; version="0.1.0"; sha256="1kkm8gxwgvbkjz5pvscj7x9c88acara4qnzg311va9fd43li55h8"; depends=[rlang scales]; };
+  sigora = derive2 { name="sigora"; version="3.0.5"; sha256="1240q42kpb4l1idanywzal7c85kp3ncdl5m2irh8qs5xrs02gdc7"; depends=[]; };
   sigr = derive2 { name="sigr"; version="1.0.6"; sha256="01crx8r9bcq1kwlq66vypnv1r48fp3hbl06ykd8g2k5zm06w0yyi"; depends=[wrapr]; };
   siland = derive2 { name="siland"; version="1.2"; sha256="1njn5a4gr4rpf8xwbfvxiyg7h64pfzxijakn9sbhb1agspn5z1zz"; depends=[ggforce ggplot2 lme4 raster rgdal sp]; };
   sim1000G = derive2 { name="sim1000G"; version="1.40"; sha256="1avq6xfc34izavvp9vb5ccc2b9nc4m7cwr06ygnsmpgwi5nswbb8"; depends=[hapsim MASS readr stringr]; };
   simEd = derive2 { name="simEd"; version="1.0.3"; sha256="1yq0qblrz0zddx682rzwdaa0k0r223i123la7wbp73spnn38g4br"; depends=[rstream]; };
   simExam = derive2 { name="simExam"; version="1.0.0"; sha256="10p3y67cli5is2gj23cjy8y7zpbnn2jbxmfiq01ls0hc1jind82w"; depends=[Matrix msm]; };
   simFrame = derive2 { name="simFrame"; version="0.5.3"; sha256="154d4k6x074ib813dp42l5l8v81x9bq2c8q0p5mwm63pj0rgf5f3"; depends=[lattice Rcpp]; };
+  simGWAS = derive2 { name="simGWAS"; version="0.2.0-2"; sha256="1228kbcsv16gmdl3rv816547bkn1nlj5pyipfwbcf3g6ll2x4pk0"; depends=[combinat corpcor dplyr mvtnorm Rcpp]; };
   simIReff = derive2 { name="simIReff"; version="1.0"; sha256="0yi43splda8chnh4bq5x6chbrl5c0y9sv1k2m31763da0czayall"; depends=[bde extraDistr ks MASS np rvinecopulib truncnorm]; };
   simLife = derive2 { name="simLife"; version="0.5.2"; sha256="1dhrjszfgxr0j4dkc2bwykyj515ji5rkb572nmnyjgkyi652j01v"; depends=[splancs]; };
   simMP = derive2 { name="simMP"; version="0.17.3"; sha256="1pzg79dd08ds3pfzxnk9h95gaibicv00mnm0jb4i8v5is4gzrdhr"; depends=[Biostrings BSgenome doParallel foreach GenomeInfoDb GenomicRanges IRanges XVector]; };
@@ -12969,7 +13230,7 @@ in with self; {
   simPH = derive2 { name="simPH"; version="1.3.10"; sha256="0br32m28ynmhr4xal69bsv925rlmih898rk5bskn1s6bhsshalqq"; depends=[data_table dplyr ggplot2 gridExtra lazyeval MASS mgcv quadprog stringr survival]; };
   simPop = derive2 { name="simPop"; version="1.2.0"; sha256="05f1azdz202bap4pkqxiacj7wqkbmw3naw6p7xgmvx8nlh5xl40h"; depends=[colorspace data_table doParallel e1071 EnvStats fitdistrplus foreach laeken lattice MASS nnet party plyr ranger Rcpp RcppArmadillo vcd VIM wrswoR]; };
   simSummary = derive2 { name="simSummary"; version="0.1.0"; sha256="1ay2aq6ajf1rf6d0ag3qghxpwj0f8b3fhpr2k0imzmpbyag1i3gj"; depends=[abind gdata svUnit]; };
-  simTool = derive2 { name="simTool"; version="1.1.3"; sha256="1vjl2hf6nw108vidbrc6hxsl6qdkr56ahldavx2s9klkqg2kmhwr"; depends=[dplyr plyr purrr reshape tibble tidyr]; };
+  simTool = derive2 { name="simTool"; version="1.1.4"; sha256="1jb5r32kwyfv38vij236f3mb2ijqm48iz427zya27dyhps8i305s"; depends=[dplyr plyr purrr reshape tibble tidyr]; };
   simba = derive2 { name="simba"; version="0.3-5"; sha256="14kqxqavacckl5s1518iiwzrmlgbxz1lxy33y8c9qq7xaln41g9h"; depends=[vegan]; };
   simboot = derive2 { name="simboot"; version="0.2-6"; sha256="0bgibrqb9j62p1chldi1lvdsgc6sgsr7afyq4lvyrc2h861f3j9d"; depends=[boot mvtnorm]; };
   simcausal = derive2 { name="simcausal"; version="0.5.5"; sha256="0k1dbg10bmpxc37nq9vk849qsdi09whc8r85rj08pbcfaac8cgfv"; depends=[assertthat data_table igraph Matrix R6 stringr]; };
@@ -12986,7 +13247,7 @@ in with self; {
   simmer_plot = derive2 { name="simmer.plot"; version="0.1.15"; sha256="0g13d6qw6cl7bzmpkckiswvg9n4mrrdbs195r3pyljaw5c5bmvhp"; depends=[DiagrammeR dplyr ggplot2 scales simmer tidyr]; };
   simml = derive2 { name="simml"; version="0.1.0"; sha256="0j3vv3kp8rl4an6r0vzzn6syzi9h058v9040pshz0hldkhi21pby"; depends=[mgcv plyr]; };
   simmr = derive2 { name="simmr"; version="0.4.1"; sha256="0903fh8vhl7r9cspanzkrn23kq68dkxhn01bjhyhf3c8wc9zfdy5"; depends=[bayesplot boot compositions ggplot2 MASS R2jags reshape2 viridis]; };
-  simode = derive2 { name="simode"; version="1.1.4"; sha256="04ld7mf2xi3s7jrcs1w9wqbbnrjjb0kbzn8bn58ma2kxxb4cygq0"; depends=[deSolve pracma quadprog]; };
+  simode = derive2 { name="simode"; version="1.1.6"; sha256="1lqndadcrqc3jix7b9kjlc8a2w712bqnw56k5h5slwrawp7krwxj"; depends=[deSolve pracma quadprog]; };
   simone = derive2 { name="simone"; version="1.0-4"; sha256="09d8kdg2wxpmjgcn4dk6yqr6nmf7mzqqi6x1rz3fv7qknja6l1xi"; depends=[blockmodels]; };
   simpleCache = derive2 { name="simpleCache"; version="0.4.1"; sha256="1prhahphyb4dg9qv813ahpwfngmr9blirb97pvypc5npzvahj5lv"; depends=[]; };
   simpleNeural = derive2 { name="simpleNeural"; version="0.1.1"; sha256="0rm6kvz1mppvgcvwsgg3nz6ci37l95ins64g0jh4rw6lfmy0grjc"; depends=[]; };
@@ -13001,7 +13262,7 @@ in with self; {
   simsalapar = derive2 { name="simsalapar"; version="1.0-10"; sha256="1q7kh44xl7q48vpqbyrp85my6x97l4fqq36bry8vg3k5riihirzf"; depends=[colorspace gridBase sfsmisc]; };
   simsem = derive2 { name="simsem"; version="0.5-14"; sha256="1sg1zmngpviqpbsy8kxnw4f4x93gy3gh02ykmcw8j9falfnd7g6i"; depends=[lavaan]; };
   simstandard = derive2 { name="simstandard"; version="0.3.0"; sha256="0fg5y6n5ydn6qxbd5sdbxh3aqj4i7qk7h9c28i3s5z4s9rxgycdj"; depends=[lavaan magrittr mvtnorm purrr rlang tibble]; };
-  simstudy = derive2 { name="simstudy"; version="0.1.13"; sha256="06lf8srcz5i5glz09sjg61v1a5blr6iv1s4v24syl28pf6f627i8"; depends=[data_table mvnfast mvtnorm Rcpp]; };
+  simstudy = derive2 { name="simstudy"; version="0.1.14"; sha256="1a8hxfvvvyxdja9rihgrwwhsnlsn2painr06qx6lxng7wyql0z0g"; depends=[data_table mvnfast mvtnorm Rcpp]; };
   simsurv = derive2 { name="simsurv"; version="0.2.3"; sha256="0jlacjgrnnlmcl6k83clfkdfb1kr2xbyz2zcmq1f3xg2z0zwypjq"; depends=[]; };
   simtimer = derive2 { name="simtimer"; version="4.0.0"; sha256="1c5017xmh4767d75k4rs1pssyn7p5w41bcsjjmwk4c9g6w1jgx1w"; depends=[]; };
   simts = derive2 { name="simts"; version="0.1.1"; sha256="1b76grf7c14pgyhphplnil4lkzbwn3dih4pv4xdy721ih9n9llby"; depends=[broom dplyr magrittr purrr Rcpp RcppArmadillo robcor scales tidyr]; };
@@ -13009,13 +13270,14 @@ in with self; {
   simulator = derive2 { name="simulator"; version="0.2.0"; sha256="18x0c9bf9anbykq9f46fxnnx7g36bh01s4cdmrn7mdygs6ac9c8z"; depends=[magrittr]; };
   simule = derive2 { name="simule"; version="1.3.0"; sha256="0jzyk1r2jfs7qivmy9x44c5bagy55jpy3hf0xpl9xnk409c3y2wd"; depends=[igraph lpSolve pcaPP]; };
   sinaplot = derive2 { name="sinaplot"; version="1.1.0"; sha256="0zfq6l8wjvdj7rndsfyh0a2xjlxmn2ij1q50hg3xjfpwrjxcsck8"; depends=[plyr]; };
-  sindyr = derive2 { name="sindyr"; version="0.2.1"; sha256="0977qb9f2247y6bzlsp9lqfbmncq2prqr57myrgd6f60jc09n3mj"; depends=[arrangements crqa igraph matrixStats pracma]; };
+  sindyr = derive2 { name="sindyr"; version="0.2.2"; sha256="1clcn864p0kx1rlb9rr9gl2cjsyr5rrbvqd00rsf90vgq2p2aj8x"; depends=[arrangements crqa igraph matrixStats pracma]; };
   sinew = derive2 { name="sinew"; version="0.3.8"; sha256="1ggx7wgmgnsv69nnc55mg9g7rzjv5m23sygz7x8q68pybmjr7fc1"; depends=[cli crayon miniUI rematch2 rstudioapi shiny sos stringi yaml]; };
   sinib = derive2 { name="sinib"; version="1.0.0"; sha256="08x2a5hn41vcsai3r36w1kgzka4ks53pkp6dxn90bsqh40ydb0db"; depends=[]; };
   sinx = derive2 { name="sinx"; version="0.0.12"; sha256="0hv54n6pc8qdxl1kmwbrnnmgmd8mz6fzlplz9nr7iws1y1v0ckf5"; depends=[bookdownplus clipr cowsay crayon jsonlite multicolor pagedown rmsfact rosr xaringan]; };
   siplab = derive2 { name="siplab"; version="1.4"; sha256="1kayskawq9dqwwmk17akl68xw9kwllkmh4i251gdqkfcz61j3bb4"; depends=[spatstat]; };
   sirad = derive2 { name="sirad"; version="2.3-3"; sha256="0vhmk2fmq4797gj6c8803zw1ipmdxfvdfgi2bygzxbn5bqd4da2n"; depends=[raster zoo]; };
   sirt = derive2 { name="sirt"; version="3.6-21"; sha256="0khjjps3q1gdanszmgzi30yrk5qcwi2fxf8jq71raj77hfvgd2s8"; depends=[CDM pbv Rcpp RcppArmadillo TAM]; };
+  sirus = derive2 { name="sirus"; version="0.1.2"; sha256="1ryi9b6vadgmv3ybb2vw7sqy4nr8f8zxb3by0s6f8xqn6vfpmmbg"; depends=[ggplot2 Matrix Rcpp ROCR]; };
   sisVIVE = derive2 { name="sisVIVE"; version="1.4"; sha256="1vh53irxgk8ahw52cdqbbm89dvmzyf54izg4lm8a3v92k5p6nzwz"; depends=[lars]; };
   sisal = derive2 { name="sisal"; version="0.46"; sha256="00szc3l69i0cksxmd0lyrs4p6plf05sl4vxs3nl4gkbja5y4lvpc"; depends=[boot digest lattice mgcv R_matlab R_methodsS3]; };
   sismonr = derive2 { name="sismonr"; version="1.1.4"; sha256="0dimah8lzscg9bx5vd3ll32zyp74va7a4nk9j9k5nzzyg06rs3l4"; depends=[dplyr ggplot2 ggpubr igraph jsonlite magrittr rlang scales stringr tictoc tidyr truncnorm XR XRJulia]; };
@@ -13026,11 +13288,11 @@ in with self; {
   sitreeE = derive2 { name="sitreeE"; version="0.0-5"; sha256="16m8w0rxb40pimzd06znqskz74jk4rrki4gjy8nk24r1zih2cjq1"; depends=[data_table sitree]; };
   sivipm = derive2 { name="sivipm"; version="1.1-4.2"; sha256="0y1wpzvndbyyzf063mzisqdk9ndj29ygiipmmz7i4xdpwidv21p6"; depends=[seqinr]; };
   sizeMat = derive2 { name="sizeMat"; version="1.1.0"; sha256="1pxb99gd0zfrpbq2ndmhciv2bc8xdfgm0q1y771f6ji5665qxgfw"; depends=[MASS matrixStats MCMCpack]; };
-  sjPlot = derive2 { name="sjPlot"; version="2.7.0"; sha256="1m0gy991fmxvqry91kkzdkdapyalhrwql25d0hg2a2naxgfw4zpk"; depends=[bayestestR broom dplyr forcats ggeffects ggplot2 ggrepel glmmTMB insight knitr lme4 magrittr MASS modelr nlme performance psych purrr rlang scales sjlabelled sjmisc sjstats tidyr]; };
+  sjPlot = derive2 { name="sjPlot"; version="2.7.2"; sha256="1kx1qqgp4fhwwwpqn9mv8m1pnpjxfs7ww36ns7j1ja4a7ydwn2hp"; depends=[bayestestR broom dplyr forcats ggeffects ggplot2 ggrepel glmmTMB insight knitr lme4 magrittr MASS modelr nlme parameters performance psych purrr rlang scales sjlabelled sjmisc sjstats tidyr]; };
   sjdbc = derive2 { name="sjdbc"; version="1.6.0"; sha256="17ncgj2s2pjn3w3c1dgxv8g7y17h4p78iic86gsj2ahn0xpsmkcc"; depends=[rJava]; };
-  sjlabelled = derive2 { name="sjlabelled"; version="1.1.0"; sha256="0rnmlwpp41h04dzfjd5ncvzjzs43slaimb4v2in1axznv3haafyc"; depends=[haven insight magrittr purrr rlang tidyselect]; };
-  sjmisc = derive2 { name="sjmisc"; version="2.8.1"; sha256="1a30n3cyd9h9ilaiai9ywy53f03nikafc47rvpws2c2vghc8mbn7"; depends=[dplyr insight magrittr purrr rlang sjlabelled]; };
-  sjstats = derive2 { name="sjstats"; version="0.17.5"; sha256="1x9ybvz84vgaabmqp4z6crbv5q6kqjg6msk1spbr11zx9dbj06ca"; depends=[bayestestR broom dplyr emmeans insight lme4 magrittr MASS modelr performance purrr rlang sjlabelled sjmisc tidyr]; };
+  sjlabelled = derive2 { name="sjlabelled"; version="1.1.1"; sha256="0c9wy0gsr2sbkrv2638xbi7qm0gl6jyr6sfricavhkm7l4hljjkz"; depends=[haven insight magrittr purrr rlang tidyselect]; };
+  sjmisc = derive2 { name="sjmisc"; version="2.8.2"; sha256="0rl0bmk91wc4dxdgy008fl0dwkx3ffvys30vgpnr78lb4pk45nb2"; depends=[dplyr insight magrittr purrr rlang sjlabelled tidyselect]; };
+  sjstats = derive2 { name="sjstats"; version="0.17.6"; sha256="11z1wfi0d74d1rld0320l3vmv6rl41wa0v9bjc44rk06yc90wld2"; depends=[bayestestR broom dplyr emmeans insight lme4 magrittr MASS modelr parameters performance purrr rlang sjlabelled sjmisc tidyr]; };
   skda = derive2 { name="skda"; version="0.1"; sha256="0a6mksr1d0j3pd0kz4jb6yh466gvl4fkrvgvnlmvivpv6b2gqs3q"; depends=[]; };
   skeleSim = derive2 { name="skeleSim"; version="0.9.8"; sha256="1wxdl30cy8vr1cd0wcjxyklp6crw4bv8r77ma2dkzmxm2ma5jw92"; depends=[adegenet ape hierfstat igraph markdown pegas reshape2 rmetasim shiny shinyFiles strataG swfscMisc]; };
   skeletor = derive2 { name="skeletor"; version="1.0.4"; sha256="1jfbfbkjx8mdwamsrkhvcnyn470in702vgcyw3g2dbgs84gl29q8"; depends=[]; };
@@ -13040,7 +13302,7 @@ in with self; {
   sklarsomega = derive2 { name="sklarsomega"; version="2.0"; sha256="05ar391bsaixv83dah3qzfi50avsjhn85niyq5n05sb8d5943z9h"; depends=[extraDistr hash LaplacesDemon Matrix mcmcse numDeriv spam]; };
   skm = derive2 { name="skm"; version="0.1.5.4"; sha256="06g3bdncq2r56d8k3dr87gqnibypbsps0gj4jxkw9q1sq1yaff3v"; depends=[data_table magrittr plyr Rcpp RcppArmadillo RcppParallel]; };
   skmeans = derive2 { name="skmeans"; version="0.2-11"; sha256="1a8nwlym6pf0z13nnw1id2wls9lq788860yhjaqd56c3slzfsymn"; depends=[clue cluster slam]; };
-  skpr = derive2 { name="skpr"; version="0.57.0"; sha256="0n33ymjaf3dx6gb753r03fnjqiwsjk997cy81xv9631n2zfn2aa5"; depends=[car doParallel doRNG foreach future iterators kableExtra knitr lme4 magrittr nlme promises Rcpp RcppEigen rintrojs shiny shinyjs shinythemes survival viridis]; };
+  skpr = derive2 { name="skpr"; version="0.61.3"; sha256="1n3cfsvrrnf3n9yvxwxq9jczc2k208rkbsr809hi0g33lcizcm33"; depends=[car doParallel doRNG foreach future iterators kableExtra knitr lme4 lmerTest magrittr nlme promises Rcpp RcppEigen rintrojs shiny shinyjs shinythemes survival viridis]; };
   skynet = derive2 { name="skynet"; version="1.3.0"; sha256="02kkgrqcrg1x61fip47w6vzi8nya12rxg47qjhn4lw4czaympqpx"; depends=[data_table dplyr ggplot2 ggrepel httr igraph maps stringr]; };
   skyscapeR = derive2 { name="skyscapeR"; version="0.2.2"; sha256="08h3vvn9zglw3xrl0xpyj95r1n3v6lk835a4nbanxdvi21mgpi77"; depends=[astrolibR doParallel foreach MESS numDeriv oce plotrix png pracma RColorBrewer rootSolve]; };
   slackr = derive2 { name="slackr"; version="1.4.2"; sha256="1vm2h5fzcss3xx1annx68wrvv6c0s6h2ci0bipxmdl9amdaqw85w"; depends=[dplyr ggplot2 httr jsonlite]; };
@@ -13048,9 +13310,10 @@ in with self; {
   sld = derive2 { name="sld"; version="0.3.2"; sha256="0za5pw7ki419ni9pqqzddb10d16nvv5rh5jrkl4f77j0ps2ajylp"; depends=[lmom]; };
   sleekts = derive2 { name="sleekts"; version="1.0.2"; sha256="0syk244xrsv8hz5sxm7wizk0kyn1nc6z4c63c8xn57fz130zj75k"; depends=[]; };
   sleepr = derive2 { name="sleepr"; version="0.3.0"; sha256="1ka4pl6a09d1qga5svcirc5ywmzz9pcml09053745lz3p1v8fnn3"; depends=[behavr data_table]; };
-  sleepwalk = derive2 { name="sleepwalk"; version="0.1.0"; sha256="1vfvpxzq16dmh6qrh7kwbndyfnr209frdz5hck3ry4gfz9rqzm5f"; depends=[cowplot ggplot2 httpuv jrc jsonlite scales]; };
+  sleepwalk = derive2 { name="sleepwalk"; version="0.2.1"; sha256="0ddjkqfh9jlafmbif1yr5gfnv1g8fq459rkmxf0v6p8w01a3d867"; depends=[cowplot ggplot2 httpuv jrc jsonlite scales]; };
   slfm = derive2 { name="slfm"; version="1.0.0"; sha256="1q4hm1lp498fqcnwr59agg08l1rh5gd8jqrjgkk4mh89zp3x5vaw"; depends=[coda lattice Rcpp RcppArmadillo]; };
-  slickR = derive2 { name="slickR"; version="0.2.4"; sha256="14y4rwa450xqw6prdgp2l7xs9vv6zqbxwg7hc3hjgq47jy8qsdm1"; depends=[base64enc htmltools htmlwidgets xml2]; };
+  slga = derive2 { name="slga"; version="1.1.0"; sha256="09jrwwms9x9pqbpf9g2gm09nla31m5n1x23czhghj6ih0vp7804r"; depends=[httr raster sf xml2]; };
+  slickR = derive2 { name="slickR"; version="0.4.4"; sha256="0b2d68kmjcrjv0ivp73abrfnvlfg178zx0xdbqb0ilb35ja92ai7"; depends=[base64enc htmltools htmlwidgets lifecycle magick xml2]; };
   slideview = derive2 { name="slideview"; version="0.1.0"; sha256="0zq5s6qdxn6ri88pp0wf2kg2k4byrrsfvwh0ai892p4szqbc3w4v"; depends=[htmltools htmlwidgets lattice raster viridisLite]; };
   slim = derive2 { name="slim"; version="0.1.1"; sha256="0x9bk6w6lmw15s85gw9g8d1wlb57kkvnmx1wsyasn93x9llkjva1"; depends=[data_table MASS]; };
   slimrec = derive2 { name="slimrec"; version="0.1.0"; sha256="1qzcvk7z8y11hwmybvppk1gf8di596zxy7qs22fclp6h6y18s377"; depends=[assertthat bigmemory glmnet Matrix pbapply]; };
@@ -13080,13 +13343,13 @@ in with self; {
   smdc = derive2 { name="smdc"; version="0.0.2"; sha256="1j6xnzjbmmakbmk3lyjck3bsy8w8hyd9d8h04s4gbddhci283mqm"; depends=[proxy tm]; };
   smds = derive2 { name="smds"; version="1.0"; sha256="0aqf3wfn6mlsl8a32gaf9qdpyxwsx19g6mma8qzgaysdmk6vhbpd"; depends=[MASS]; };
   sme = derive2 { name="sme"; version="1.0.2"; sha256="0gszpy1sx2qsypps3iza79sab475wcrscl7wnbbrv97a3ry0ybp6"; depends=[lattice]; };
-  smerc = derive2 { name="smerc"; version="1.0.1"; sha256="0gxqz5v33w428sqalhzx7nrjjkn3sqpx3jk5a7i9g0786m3y9azj"; depends=[maps matrixStats pbapply randtoolbox smacpod sp]; };
+  smerc = derive2 { name="smerc"; version="1.1"; sha256="0kbjb1335wcljwj2nyxipxndzrsrrrims90zbplpdlz3h6afshii"; depends=[maps matrixStats pbapply randtoolbox smacpod sp]; };
   smfsb = derive2 { name="smfsb"; version="1.3"; sha256="1328w7zpwd3nam6ha4bh14g919jjl87v323ijmbp1j71gc64nn2i"; depends=[abind]; };
   smicd = derive2 { name="smicd"; version="1.0.3"; sha256="0z7j14ijyccy6m4mnh3xn1m4pppmm8apbgm5x3cdpfiwfksw3j37"; depends=[formula_tools ineq laeken lme4 MuMIn mvtnorm spatstat truncnorm weights]; };
   smirnov = derive2 { name="smirnov"; version="1.0-1"; sha256="09mpb45wj8rfi6n6822h4c335xp2pl0xsyxgin1bkfw97yjcvrgk"; depends=[]; };
   smnet = derive2 { name="smnet"; version="2.1.1"; sha256="0fa47zgm7jxvs3jfai54wsc6qa9ycqw4f3yr941fvkczwzh4ch02"; depends=[DBI RSQLite spam SSN]; };
   smoof = derive2 { name="smoof"; version="1.5.1"; sha256="01jkldmxn86vmcmmz81mdlhpm1m3bddj4sv550a3b4wm1r3gddng"; depends=[BBmisc checkmate ggplot2 mco ParamHelpers plot3D plotly RColorBrewer Rcpp RcppArmadillo RJSONIO]; };
-  smooth = derive2 { name="smooth"; version="2.5.2"; sha256="08ifnvldjcpnwpmkkg9r6dr2p8k1i1jihjz1g3qdb34axf08jql1"; depends=[forecast greybox nloptr Rcpp RcppArmadillo zoo]; };
+  smooth = derive2 { name="smooth"; version="2.5.3"; sha256="0anmdqsx3yxpj4amjv00igsmrxbn5lx4g10x4gjbf6cns2dl4q29"; depends=[forecast greybox nloptr Rcpp RcppArmadillo zoo]; };
   smoothAPC = derive2 { name="smoothAPC"; version="0.3"; sha256="11f34qqdm8m0hmy9jf29q439slchvmqgdfrmak7vcdhfnjcylr5r"; depends=[colorspace lmtest quantreg rgl SparseM]; };
   smoothHR = derive2 { name="smoothHR"; version="1.0.2"; sha256="0l33xg3p9pyfrp4rhavz8m1jakk4wr8i14g6jjiizb03rpxdpzqy"; depends=[survival]; };
   smoothROCtime = derive2 { name="smoothROCtime"; version="0.1.0"; sha256="03iihjxb5xdaf74cm9cajqqjli754mdmv5v1y4hla9vv23017ca1"; depends=[ks]; };
@@ -13104,7 +13367,7 @@ in with self; {
   smurf = derive2 { name="smurf"; version="1.0.1"; sha256="1jp0dziqpiffj08kkm28bg4jzsijs30xlz237q8xdxdrf64igvik"; depends=[catdata glmnet MASS Matrix mgcv RColorBrewer Rcpp RcppArmadillo speedglm]; };
   sn = derive2 { name="sn"; version="1.5-4"; sha256="0x46gxkplxbnhaqbpiav1r4xlv4ib7n57kxmca7scqwj22y7wrs6"; depends=[mnormt numDeriv]; };
   sna = derive2 { name="sna"; version="2.4"; sha256="1ks8819qvpdfansfqj9p32s1rhvl26frvbi78m4rx1wd1qcv74i2"; depends=[network statnet_common]; };
-  snahelper = derive2 { name="snahelper"; version="0.3.0"; sha256="036pwzs4x1qgb4bsn39afv1c34fxky259vl0zbac6l12wmysnpqv"; depends=[colourpicker DT formatR ggplot2 ggraph graphlayouts igraph miniUI rstudioapi shiny]; };
+  snahelper = derive2 { name="snahelper"; version="1.0.0"; sha256="15x7qp36lzs61ll3gqyjmxix0pqnyf2rz799mxzkzxzwqsp0srwi"; depends=[colourpicker formatR ggplot2 ggraph graphlayouts igraph miniUI rstudioapi shiny]; };
   snakecase = derive2 { name="snakecase"; version="0.11.0"; sha256="1ky1x2cp5rd0ffd9m1fji9sq4z4jsrpxzg30brw8bb4ihfjj114r"; depends=[stringi stringr]; };
   snappier = derive2 { name="snappier"; version="0.1.0"; sha256="0334zwhqdl3lfw7rg8ql7z10qj8jjrm17yi9mgdcxnzaf3f1p859"; depends=[]; };
   snapshot = derive2 { name="snapshot"; version="0.1.2"; sha256="0cif1ybxxjpyp3spnh98qpyw1i5sgi1jlafcbcldbqhsdzfz4q10"; depends=[]; };
@@ -13131,8 +13394,8 @@ in with self; {
   soc_ca = derive2 { name="soc.ca"; version="0.7.3"; sha256="0z3phmvgwd3s6swfaywq851my12a2n48i6k26vhggc6pf9d28phl"; depends=[ellipse ggplot2 ggrepel gridExtra reshape2 shiny]; };
   socceR = derive2 { name="socceR"; version="0.1.1"; sha256="1vd0r3vixavg1br2q3kfn3nvl7dw854vkcfwcvyw411k84ivb13y"; depends=[Rcpp]; };
   social = derive2 { name="social"; version="1.0"; sha256="0ny81bhj80rlwwa6cgbkdz2rxz6bp0f3nvjr1sqxr4s8l8rnf4ic"; depends=[Rcpp]; };
-  socialmixr = derive2 { name="socialmixr"; version="0.1.4"; sha256="0mwbdqbnqii80rgy6yk7q2b427wmqw7inciywrq7mbradqqyag48"; depends=[countrycode curl data_table httr jsonlite oai stringr wpp2015 XML]; };
-  sociome = derive2 { name="sociome"; version="1.0.2"; sha256="0nvzxxchcml8aprva4gn0hlqgik7y3dssl78mw11zbaacldlv99s"; depends=[dplyr magrittr mice psych purrr rlang stringr tibble tidycensus tidyr]; };
+  socialmixr = derive2 { name="socialmixr"; version="0.1.5"; sha256="1kkvhrw28cgijnhcyc8phbq797pcal5h40av8brpbvvcf82yx0xd"; depends=[countrycode curl data_table httr jsonlite oai stringr wpp2015 XML]; };
+  sociome = derive2 { name="sociome"; version="1.2.0"; sha256="12qk3qjxp0sczcawi29fy1gzqzkprr2d1raqhs01rhk2a1hyp2p8"; depends=[dplyr magrittr mice psych purrr rlang stringr tibble tidycensus tidyr]; };
   socviz = derive2 { name="socviz"; version="1.0.0"; sha256="14713g5saa167c5wk06i9v5708cj60znc8a7c3a2wpk0h2idfjlb"; depends=[dplyr fs magrittr rlang tibble]; };
   sodavis = derive2 { name="sodavis"; version="1.2"; sha256="1jf5sml51qxlpgv5b1rvyig4dm4ijw2hpnk85zf790jp22xm64jw"; depends=[MASS mvtnorm nnet]; };
   sodium = derive2 { name="sodium"; version="1.1"; sha256="1zxzi8xvxnhgcd5qrylf08nz1cdq3aslrswjas440qg63ypmbf6w"; depends=[]; };
@@ -13150,7 +13413,7 @@ in with self; {
   solarPos = derive2 { name="solarPos"; version="1.0"; sha256="0004da7vqpq14q5lhs8vyvjl99j8gzxd5wrlw5d1vwfns3ica0q5"; depends=[]; };
   solarius = derive2 { name="solarius"; version="0.3.0.2"; sha256="17c765nxq81xshyyl4lfhqjmgvmhn9xyzc6x4qd33wvhh4148f38"; depends=[data_table ggplot2 plyr]; };
   solartime = derive2 { name="solartime"; version="0.0.1"; sha256="0q6la6d281zgf1kxhrdvi3b91na60szknq0fvldvlnszlqb5vkgs"; depends=[lubridate]; };
-  solitude = derive2 { name="solitude"; version="0.1.3"; sha256="0kgj7psj5q9zz1grj3jpp55gn8d62v84fsiiihlzzmkgkgir0xcy"; depends=[data_table future_apply igraph ranger]; };
+  solitude = derive2 { name="solitude"; version="0.2.0"; sha256="1wvhvzak1jy31z3q0s2m25kbkkn725qdvawpdr4gkcswk3vvr22x"; depends=[data_table future_apply igraph R6 ranger]; };
   solrad = derive2 { name="solrad"; version="1.0.0"; sha256="13ybllvmig1yqsy4md4kazs83hxb9lrlwy64yw1wwr1w6sxpbnp6"; depends=[]; };
   solrium = derive2 { name="solrium"; version="1.0.2"; sha256="011yyn2fwk222w3cn0zr7pf4d8fxwxqp2i6x6b89ns58lipcrbhd"; depends=[crul dplyr jsonlite plyr R6 tibble xml2]; };
   solvebio = derive2 { name="solvebio"; version="2.6.1"; sha256="17zcnfmccfl2njv1ph40jchxb06x0qhgn82fz4yg8nqyf8b9cq5h"; depends=[dplyr httr jsonlite mime]; };
@@ -13160,7 +13423,7 @@ in with self; {
   someKfwer = derive2 { name="someKfwer"; version="1.2"; sha256="0widny5l04ja91fy16x4giwrabwqhx0fs3yl48pv9xh4zj6sx563"; depends=[]; };
   someMTP = derive2 { name="someMTP"; version="1.4.1"; sha256="19bsn8rny1vv9343bvk8xzhh82sskl0zg0f5r59g9k812q5llchn"; depends=[]; };
   somebm = derive2 { name="somebm"; version="0.1"; sha256="1iwwc94k6znh4d3bbjnvwp4chc4wg0iy4v2f99cs4jasrsimb4p8"; depends=[]; };
-  sommer = derive2 { name="sommer"; version="4.0.1"; sha256="1yzi090kj9rqygsjwl80yzf6dlnll68gpnyp1wpp018f6lyg7xww"; depends=[crayon lattice MASS Matrix Rcpp RcppArmadillo]; };
+  sommer = derive2 { name="sommer"; version="4.0.4"; sha256="0ad2ifhhphx5x4kyyjvjlibdp5g84yx41i85668vcxds8r1d1i8h"; depends=[crayon lattice MASS Matrix Rcpp RcppArmadillo]; };
   somplot = derive2 { name="somplot"; version="1.6.4"; sha256="06c8p2lqz3yxmxdl7ji8a3czvxnsbl7bwyiig76pkwc3a5qqfbb9"; depends=[hexbin]; };
   somspace = derive2 { name="somspace"; version="1.0.0"; sha256="1cp7mprapidzfphis697r3jipm1ig5198580mmdygvbajxcjib75"; depends=[data_table ggplot2 kohonen maps]; };
   sonar = derive2 { name="sonar"; version="1.0.2"; sha256="1f0f5iqi3y9vnxyym14nm8dqxw0vcpnxmvvkx4sm612i4fclg1f9"; depends=[]; };
@@ -13172,28 +13435,28 @@ in with self; {
   soql = derive2 { name="soql"; version="0.1.1"; sha256="12wvbxy9xx140b7mga4ma7hkg4q6kv549gkq15fnf4dn8q43x8nf"; depends=[]; };
   sorvi = derive2 { name="sorvi"; version="0.7.26"; sha256="19lfrc4bdiljs437w3a2bpf7abnkv0934dh929bbj2w1w8rzghjn"; depends=[dplyr ggplot2 RColorBrewer reshape2]; };
   sos = derive2 { name="sos"; version="2.0-0"; sha256="0fwv76m0iihzy60kglsdjnlp6800qsll6h0v2435a50lcr53jj8g"; depends=[brew]; };
-  sos4R = derive2 { name="sos4R"; version="0.3.0"; sha256="0ph18zpz3r6gby6bapv7v3c13v7idlfngck4wpzgnbnyd3gvj1n2"; depends=[httr sp stringr xml2]; };
+  sos4R = derive2 { name="sos4R"; version="0.3.1"; sha256="0zcrk8fgg2jsp29wvbw448yp15m4lz0sbf570nyjg3admnpf5whs"; depends=[httr sp stringr xml2]; };
   sotkanet = derive2 { name="sotkanet"; version="0.9.48"; sha256="1jw9agj92zzgad5kk9z6smjacimwinci6aaqlzmshivb8g8rv8zp"; depends=[RCurl rjson]; };
   sotu = derive2 { name="sotu"; version="1.0.2"; sha256="0aqwkawaydsm91hz13msjg1a5llg7xmv6hxmfmsaganrl7iaym3c"; depends=[]; };
   sound = derive2 { name="sound"; version="1.4.5"; sha256="1kbbb614d0fmj9l0yjiwf5yqnl7sby4xklp7qwp6rwjvq9bnm0ab"; depends=[]; };
   soundecology = derive2 { name="soundecology"; version="1.3.3"; sha256="16h6gbdlyav7wbfisdv1f2zsqhr45liidgj7qqk8giwjxgan8q97"; depends=[ineq oce pracma seewave tuneR vegan]; };
-  soundgen = derive2 { name="soundgen"; version="1.4.1"; sha256="13xq7ak4ggrqlpfb2c6xav1kpafvm3i9k1vk9vj28mcack870961"; depends=[dtw mvtnorm phonTools plyr reshape2 seewave shiny tuneR zoo]; };
+  soundgen = derive2 { name="soundgen"; version="1.5.0"; sha256="0qczrspc8gbhxw95gclfmfxi1c098iwfryiwsnwc43g6h6gnm7fi"; depends=[dtw mvtnorm phonTools plyr reshape2 seewave shiny tuneR zoo]; };
   source_gist = derive2 { name="source.gist"; version="1.0.0"; sha256="03bv0l4ccz9p41cjw18wlz081vbjxzfgq3imlhq3pgy9jdwcd8fp"; depends=[RCurl rjson]; };
   sourceR = derive2 { name="sourceR"; version="1.0.1"; sha256="01qxa44s9szaxl0rdcx4p0wn4vby17hdzdjzpsbls3prsnr0jaad"; depends=[assertthat cluster dplyr gplots gtools hashmap R6 reshape2 SPIn tensorA]; };
   sourcetools = derive2 { name="sourcetools"; version="0.1.7"; sha256="1jnjir0q2dj724f1mjm6p5h77yzyx6xcqy9r2g7gmcxkxw349627"; depends=[]; };
   sp = derive2 { name="sp"; version="1.3-1"; sha256="17xm1ig80p9wc860hm3bgishz6lj9fxgwqidj7rkbk4ap99qp62p"; depends=[lattice]; };
   sp23design = derive2 { name="sp23design"; version="0.9"; sha256="1ihvcld19cxflq2h93m9k9yaidhwixvbn46fqqc1p3wxzplmh8bs"; depends=[mvtnorm survival]; };
-  spANOVA = derive2 { name="spANOVA"; version="0.99.0"; sha256="09zzwgl6w3lwynh4b65c5hg9mgx6wn5miv48fj6fwgj9bz3kkb3y"; depends=[ape car devtools DT geoR gtools knitr MASS Matrix multcomp multcompView mvtnorm rmarkdown ScottKnott shiny shinyBS shinythemes spatialreg spdep xtable]; };
+  spANOVA = derive2 { name="spANOVA"; version="0.99.1"; sha256="0dsi1cj0i5gm3b1wlrb2r5nbw1zmnqiwvgz41s0wmm7wwjsbva3x"; depends=[ape car DT geoR gtools knitr MASS Matrix multcomp multcompView mvtnorm rmarkdown ScottKnott shiny shinyBS shinycssloaders shinythemes spatialreg spdep xtable]; };
   spAddins = derive2 { name="spAddins"; version="0.2.0"; sha256="19wbcghcf0f9qvqy92jhsdcpmd9b4lkhxndvr71cyhzga539lh1n"; depends=[magrittr purrr rstudioapi stringr]; };
   spBayes = derive2 { name="spBayes"; version="0.4-2"; sha256="0qmh8sdawhssr1jmx9dc56mxxwsgya8spsss88jgg0npvmpl5khb"; depends=[abind coda Formula magic Matrix]; };
   spBayesSurv = derive2 { name="spBayesSurv"; version="1.1.3"; sha256="0syb4x05j878jhcql8prfw1aqxmpi1idxk1d4xl52j32wngkpn8b"; depends=[coda fields MASS Rcpp RcppArmadillo survival]; };
   spCP = derive2 { name="spCP"; version="1.2"; sha256="0y00k96p96jgp84wbdhqfwsq2fg8c68gc5310rnzpiv3clws27fb"; depends=[msm mvtnorm Rcpp RcppArmadillo]; };
-  spData = derive2 { name="spData"; version="0.3.0"; sha256="162cqb331ki43jx4r8lpkjpn2l712figd896rnawg9j1jmjyl96y"; depends=[]; };
+  spData = derive2 { name="spData"; version="0.3.2"; sha256="190msrrpn226x27pcnck4ac34f9k4xcn26cyz2apdri2nzkr6zbw"; depends=[]; };
   spFSR = derive2 { name="spFSR"; version="1.0.0"; sha256="0094plnjlyhnnjqw3i4an5q95bw6hjy1gzc7zr6wy77faivqsbms"; depends=[class ggplot2 mlbench mlr parallelMap tictoc]; };
-  spGARCH = derive2 { name="spGARCH"; version="0.1.6"; sha256="10ksbqk5s9qq6lz17h07kmg2gr1ppq2rjm06kipscs9v0zldki9l"; depends=[Matrix Rcpp RcppEigen Rsolnp spdep truncnorm]; };
+  spGARCH = derive2 { name="spGARCH"; version="0.2.0"; sha256="03jn5v5szq2nfihwvv3v966bv48wng2bahyaxlkvik2firdl8j9y"; depends=[Matrix nleqslv Rcpp RcppEigen Rsolnp spdep truncnorm]; };
   spMC = derive2 { name="spMC"; version="0.3.10"; sha256="0p0s6w7sif02b91b73a0zb2i4i95a8m86dkqmgx6w1jk9h2mgqaz"; depends=[]; };
   spMaps = derive2 { name="spMaps"; version="0.3"; sha256="0w4rrzbybaf9zgb09zg0zkf2hgvfrwx57yzbxm4px1ygdfxyi4cm"; depends=[raster rgeos sp]; };
-  spNNGP = derive2 { name="spNNGP"; version="0.1.1"; sha256="0b55arvy5xr592bs2082djyzaa48jbv0y85h7nnj479f8c31grqp"; depends=[coda Formula RANN]; };
+  spNNGP = derive2 { name="spNNGP"; version="0.1.2"; sha256="0zr2lfvrjlpi6j3xswi974spvhmkbf1ddfb6d8f2zddkfhppfg00"; depends=[coda Formula RANN]; };
   spTDyn = derive2 { name="spTDyn"; version="2.0"; sha256="0wandd5iqyqb474096lky04rrgj31gnyqnlmgw8ypxsypd0gqdy0"; depends=[coda sp spacetime spTimer]; };
   spTest = derive2 { name="spTest"; version="0.2.5"; sha256="11x2wq3031mqbj4n6hvb4l3sp4382qankdl1v1qh7ab2xa0h6xw8"; depends=[geoR sp]; };
   spThin = derive2 { name="spThin"; version="0.1.0.1"; sha256="1cj859q0i5ldqvndky2jwr5jwnpgj01mfqkw8hb8pibpwaknmy7y"; depends=[fields knitr spam]; };
@@ -13211,18 +13474,18 @@ in with self; {
   spacyr = derive2 { name="spacyr"; version="1.2"; sha256="1xsiz6zx89vs6ykrkkp011d8fz4ksdgnf5nyaq5ynjr6zv865vks"; depends=[data_table reticulate]; };
   spaero = derive2 { name="spaero"; version="0.5.0"; sha256="1r3rgvmkcrkzm6ikbbmnm4rfdrnwgmn4wq21mxgjs2bzg2r72mw6"; depends=[]; };
   spagmix = derive2 { name="spagmix"; version="0.3-1"; sha256="0xfrm4i28sy490g5324bc43dxlrgcnzxg27gsd5b81mqi03sry9j"; depends=[abind mvtnorm RandomFields sparr spatstat]; };
-  spam = derive2 { name="spam"; version="2.2-2"; sha256="024dgfnjfxvsiymbzrhadinamj6qy509f4sbd1zxql8ymkyxn7vi"; depends=[dotCall64]; };
-  spam64 = derive2 { name="spam64"; version="2.2-2"; sha256="15fgspaywfwg06ic2n3cx3mckyc26p17h3vilf5vk0sn0jqp7byy"; depends=[]; };
+  spam = derive2 { name="spam"; version="2.3-0"; sha256="194n5mgvyms9ckjqixl3h33apii8h9kqspqg2si9k741k578qb3w"; depends=[dotCall64]; };
+  spam64 = derive2 { name="spam64"; version="2.3-0"; sha256="1n9gf063r5mfr4aagwcvv2g6wyyp46r744lylpzr9hm4hx04sw0c"; depends=[]; };
   spanel = derive2 { name="spanel"; version="0.1"; sha256="1riyvvfij277mclgik41gyi01qv0k466wyk2wbqqhlvrlj79yzsc"; depends=[]; };
   spanish = derive2 { name="spanish"; version="0.4.2"; sha256="15drc11lh0qxpww50p0smi8qxfbln82bx0yd74jqf71irhk5jxyp"; depends=[magrittr xml2]; };
-  spant = derive2 { name="spant"; version="0.14.0"; sha256="0zz75i8z64w474s5c142rzdc5483xyxamx5gzcxaipqd7vqaracz"; depends=[abind complexplus foreach magrittr matrixcalc minpack_lm nnls plyr pracma readr signal smoother stringr svd tibble tkrplot]; };
+  spant = derive2 { name="spant"; version="0.15.0"; sha256="05pqa0zv9zqykr8xgvd3mm7m62igy1jln70q0qn9lsdbdb79yn5z"; depends=[abind complexplus foreach magrittr matrixcalc minpack_lm nnls plyr pracma readr signal smoother stringr svd tibble tkrplot]; };
   sparcl = derive2 { name="sparcl"; version="1.0.4"; sha256="138krflvfdlx4hlh90mswds51i8aw2vv00gm5lgkfsvxj4w324jg"; depends=[]; };
   spark_sas7bdat = derive2 { name="spark.sas7bdat"; version="1.2"; sha256="1kvzfjhf1q5jzlq5d04s7d96j63vnvqqrh8s03rwkl79h1dhqhhp"; depends=[sparklyr]; };
   sparkTable = derive2 { name="sparkTable"; version="1.3.0"; sha256="1fc2nihxfrjpmxm9g9296mz5czd3ydvi1v37g8qgb20j7b73c64h"; depends=[boot Cairo ggplot2 gridExtra pixmap Rglpk RGraphics shiny StatMatch xtable]; };
   sparkavro = derive2 { name="sparkavro"; version="0.2.0"; sha256="005pdfb08clq2fsabdxcbmd4n8nj5ix6yqk5pxpv3gvrzw8s7y32"; depends=[DBI dplyr sparklyr]; };
   sparkbq = derive2 { name="sparkbq"; version="0.1.0"; sha256="0jcxnivi5zfbixmdywhn1v42lxi085wh7r4c26laclz9j2wvj8mk"; depends=[sparklyr]; };
   sparkline = derive2 { name="sparkline"; version="2.0"; sha256="0lrr1lm7603di7x3mf53cp13d9ssjh9gmb43wa6z9yqapis2djm2"; depends=[htmltools htmlwidgets]; };
-  sparklyr = derive2 { name="sparklyr"; version="1.0.2"; sha256="06l1rjmmgxdg5ala6hzrbnx0swpn9qyv81i98ab8dpfw70lk1fhi"; depends=[assertthat base64enc config DBI dbplyr digest dplyr ellipsis forge generics httr jsonlite openssl purrr r2d3 rappdirs rlang rprojroot rstudioapi tibble tidyr withr xml2]; };
+  sparklyr = derive2 { name="sparklyr"; version="1.0.3"; sha256="16lzr72hf2ryid6m7pf0wbw69ji9r6fv88lxgr6n5l1xbspja301"; depends=[assertthat base64enc config DBI dbplyr digest dplyr ellipsis forge generics httr jsonlite openssl purrr r2d3 rappdirs rlang rprojroot rstudioapi tibble tidyr withr xml2]; };
   sparklyr_nested = derive2 { name="sparklyr.nested"; version="0.0.3"; sha256="0lva7fbjp253kxq3970h52cr8s52xycbi03d5shsyna8grhkbczj"; depends=[dplyr jsonlite listviewer purrr rlang sparklyr]; };
   sparktex = derive2 { name="sparktex"; version="0.1"; sha256="0r6jnn9fj166pdhnjbsaqmfmnkq0qr1cjprihlnln9jad05mrkjx"; depends=[]; };
   sparktf = derive2 { name="sparktf"; version="0.1.0"; sha256="0jd018n7553q0ldv6whxbj2s38myig0m8zq4fbp8fsv34q5wnsx4"; depends=[sparklyr]; };
@@ -13231,7 +13494,7 @@ in with self; {
   sparr = derive2 { name="sparr"; version="2.2-13"; sha256="1cn8bzlfairfrxfwwdap0pnaa97rn9h13jz54il8cn9zacnzb8yc"; depends=[doParallel foreach misc3d spatstat spatstat_utils]; };
   sparseBC = derive2 { name="sparseBC"; version="1.2"; sha256="0a1siyi9kc805qji4alnw3c21spf4iw4wpsbfl50zvs52p8vl8w2"; depends=[fields glasso]; };
   sparseEigen = derive2 { name="sparseEigen"; version="0.1.0"; sha256="0vqcy61rarmp3liz8fr3vs3y40hkb3wfw89b5xsj1byaiap4772s"; depends=[]; };
-  sparseFLMM = derive2 { name="sparseFLMM"; version="0.2.2"; sha256="12143qij3p8vry9i02i52nj00m1ckkwg2rq99dq00dq43axcpvgw"; depends=[data_table MASS Matrix mgcv refund]; };
+  sparseFLMM = derive2 { name="sparseFLMM"; version="0.3.0"; sha256="0xl4zymdl9nxarn0nz8zhb1926lblb7jmyi7h1vp9cdl0hjwbiyy"; depends=[data_table MASS Matrix mgcv refund]; };
   sparseHessianFD = derive2 { name="sparseHessianFD"; version="0.3.3.4"; sha256="1vm853x5vvk745mm68wx0bkimmgwnbrdhj2rwy1nmgpk1lzi8vq6"; depends=[Matrix Rcpp RcppEigen]; };
   sparseIndexTracking = derive2 { name="sparseIndexTracking"; version="0.1.1"; sha256="0bgh29j22jm1yg2jp75xvv9jmqacb66vgv7ygf0xgnrwyrkxkm66"; depends=[]; };
   sparseLDA = derive2 { name="sparseLDA"; version="0.1-9"; sha256="1k3sw9kc40yxnfss4vrsx34qxmv8ssddyhbfjhxrdldvblhbwchb"; depends=[elasticnet MASS mda]; };
@@ -13249,17 +13512,17 @@ in with self; {
   sparsereg = derive2 { name="sparsereg"; version="1.2"; sha256="1ipsang2fppmjx4h5ljgzx3c44z3lggc376ghrqqgmxb5ql8bcp3"; depends=[coda ggplot2 GIGrvg glmnet gridExtra MASS MCMCpack msm Rcpp RcppArmadillo VGAM]; };
   sparsestep = derive2 { name="sparsestep"; version="1.0.0"; sha256="0f3wrwiyn990sn3x9r50zgs8cr76nmyisdc7qismgx1nn5yx5z0g"; depends=[Matrix]; };
   sparsesvd = derive2 { name="sparsesvd"; version="0.2"; sha256="1xm969fjq3fv1p2sqza2apz8picibj4s2agpwf1sx9nwn3b587qs"; depends=[Matrix]; };
-  sparsevar = derive2 { name="sparsevar"; version="0.0.10"; sha256="069r0kbypmx7pw3z2v9l17qidw3d73rzf5zs6yn1adyvpsddjxi8"; depends=[doParallel flare ggplot2 glmnet Matrix mvtnorm ncvreg picasso reshape2]; };
+  sparsevar = derive2 { name="sparsevar"; version="0.0.11"; sha256="18cylbi788ibpry6h9yphrwx2wwsaa25bq2s13h0dcfxyicl2f9p"; depends=[corpcor doParallel ggplot2 glmnet Matrix mvtnorm ncvreg picasso reshape2]; };
   sparsio = derive2 { name="sparsio"; version="1.0.0"; sha256="12nbydgzl3qlanlsfdy8bvg6rxa439lv0z0vbyqssqwky3mmg5c3"; depends=[Matrix Rcpp]; };
   spartan = derive2 { name="spartan"; version="3.0.2"; sha256="040iq7y5fk93zcvbinnmlhj9l8w3bjq3yqcf7v715i77hx5d18bs"; depends=[e1071 ggplot2 gplots lhs mco mlegp neuralnet plotrix psych randomForest XML]; };
-  spate = derive2 { name="spate"; version="1.5"; sha256="1hlh4iwx1lrl8r2gag33z2xdv6k4hg86ch4f0jlqnqkhm9hapshf"; depends=[mvtnorm truncnorm]; };
+  spate = derive2 { name="spate"; version="1.6"; sha256="0jy9rj5xd1f8y97kyx1sx0kml2g7q88m4fz7v8kh0hinc6dzh2sk"; depends=[mvtnorm truncnorm]; };
   spatgraphs = derive2 { name="spatgraphs"; version="3.2-1"; sha256="0n7f3r4ahv1w5mwx5mnib3g4263kz73rh1fcfk5wb12y52x8n1iz"; depends=[Matrix Rcpp]; };
   spatial = derive2 { name="spatial"; version="7.3-11"; sha256="04aw8j533sn63ybyrf4hyhrqm4058vfcb7yhjy07kq92mk94hi32"; depends=[]; };
   spatial_gev_bma = derive2 { name="spatial.gev.bma"; version="1.0"; sha256="1rjn0gsbgiv69brhnm0zj25ya3nyfh4yf6jizng85mvss3viv3hj"; depends=[coda msm SpatialExtremes]; };
   spatial_tools = derive2 { name="spatial.tools"; version="1.6.0"; sha256="1jh9psc2im0mp52mmz596x5h64m6w1d8hibnm7x52di5j2jp29vz"; depends=[abind doParallel foreach iterators mmap raster rgdal sp]; };
   spatialClust = derive2 { name="spatialClust"; version="1.1.1"; sha256="042yrmh1rb0hxynxlbdpcissgy9zazs5aqx7vj388ibynzijck3r"; depends=[ggplot2 maptools rgeos sp]; };
   spatialCovariance = derive2 { name="spatialCovariance"; version="0.6-9"; sha256="1m86s9a059spp97y37dcirrgjshcqzpdj11cq92vji624w4nrhlb"; depends=[]; };
-  spatialEco = derive2 { name="spatialEco"; version="1.2-0"; sha256="110kzq8qhfjqqc2dcvy43a4m2q4a8vs2009kzhcnl1r8j843ibni"; depends=[cluster EnvStats maptools MASS RANN raster RCurl readr rgeos rms SDMTools sf sp SpatialPack spatstat spdep yaImpute]; };
+  spatialEco = derive2 { name="spatialEco"; version="1.2-1"; sha256="12viar7ym2k5w7a6hjwf0vanpm38l6v3fpk8qd3amc162aw8p7nj"; depends=[cluster dplyr EnvStats fasterize maptools MASS RANN raster RCurl readr rgeos rms SDMTools sf sp SpatialPack spatstat spdep yaImpute]; };
   spatialTailDep = derive2 { name="spatialTailDep"; version="1.0.2"; sha256="107yldc43pgbadxdisnc7vq8vyvcps1b1isyvxd0kyf59xldiq47"; depends=[cubature mvtnorm SpatialExtremes]; };
   spatialfil = derive2 { name="spatialfil"; version="0.15"; sha256="01fbn9zblz7rjsgqy3ikdqpf0p0idvb6m96mf7m7qi2ps5f48vzj"; depends=[abind fields]; };
   spatialfusion = derive2 { name="spatialfusion"; version="0.6"; sha256="13bpiw1f847nlrsvg6bpgb62pfgm5j47v7cy7x4bqxh497ci263b"; depends=[fields geoR Rcpp rstan SDraw sp]; };
@@ -13272,20 +13535,21 @@ in with self; {
   spatialwarnings = derive2 { name="spatialwarnings"; version="1.3.1"; sha256="139m6jaw6f5gglwqrd4f5mzr4vkqk2r1a069971y7ap2klzzbhns"; depends=[ggplot2 plyr Rcpp RcppArmadillo reshape2 tidyr VGAM]; };
   spatialwidget = derive2 { name="spatialwidget"; version="0.2"; sha256="105pgsv4dq3pmk9bylb3fxzvp44frfp6xcvq5d01ja4gnwmb35p2"; depends=[BH colourvalues geojsonsf jsonify rapidjsonr Rcpp]; };
   spatsoc = derive2 { name="spatsoc"; version="0.1.9"; sha256="1s7vhn3ywsdp91z4psx7nairxcfhblzyvx44v4an4rwhvvhvys3c"; depends=[adehabitatHR data_table igraph rgeos sp]; };
-  spatstat = derive2 { name="spatstat"; version="1.60-1"; sha256="1xq5za4a6679n66z095kivw7pzp01zzsv7axh04przkgx4qkzbk4"; depends=[abind deldir goftest Matrix mgcv nlme polyclip rpart spatstat_data spatstat_utils tensor]; };
+  spatstat = derive2 { name="spatstat"; version="1.61-0"; sha256="01jr9krizch11mhhkn4134x9p517q83chxyjvm36rn0qs1d6l785"; depends=[abind deldir goftest Matrix mgcv nlme polyclip rpart spatstat_data spatstat_utils tensor]; };
+  spatstat_Knet = derive2 { name="spatstat.Knet"; version="1.11-2"; sha256="0jkpj4m44cqid5jdn7fwg3cl15lsmc0dp3bzp6759spivsx1yzq1"; depends=[Matrix spatstat spatstat_utils]; };
   spatstat_data = derive2 { name="spatstat.data"; version="1.4-0"; sha256="137cf9x6qcp7lw3rpjqizsy73z99yihff8gr434wlz7b5fwmn7hj"; depends=[spatstat_utils]; };
   spatstat_local = derive2 { name="spatstat.local"; version="3.6-0"; sha256="19kv85smy8jp2bx1mgppav50k07xm8zvmf7snzj29rrspiws7sig"; depends=[spatstat spatstat_utils tensor]; };
   spatstat_utils = derive2 { name="spatstat.utils"; version="1.13-0"; sha256="0wijib2fmmvz5sf2sp212ms88ffhcz9c1d0j2ljdxf222lp6v8l1"; depends=[]; };
   spatsurv = derive2 { name="spatsurv"; version="1.2"; sha256="0acg6n5qs3z9c7y2n3amla61dm3z1p16njkx0h52dlgdbj5v1nhn"; depends=[fields geostatsp iterators lubridate Matrix OpenStreetMap RandomFields raster RColorBrewer rgeos rgl sp spatstat stringr survival]; };
   spbabel = derive2 { name="spbabel"; version="0.5.0"; sha256="0jwv3mirm5wkfqja0nwy25nfndis8px4awpjh4hk9bi77dfy14bf"; depends=[dplyr sp tibble]; };
   spc = derive2 { name="spc"; version="0.6.1"; sha256="0pwmwyizpxky50nlm0k7i3rn0985wg0vg7d58a1jphzf2r8pdcp2"; depends=[]; };
-  spc4sts = derive2 { name="spc4sts"; version="0.4.2"; sha256="0sriby7p9p3w886mxc31ii2llk1qr9v7wvpc1kifnc09jjbmw5g1"; depends=[gridExtra rpart]; };
+  spc4sts = derive2 { name="spc4sts"; version="0.5.1"; sha256="0fvmzp222qsprl7jhmj9yz23kf1n7xl4i05infms3nasgac20hcb"; depends=[gridExtra LS2Wstat rpart]; };
   spcadjust = derive2 { name="spcadjust"; version="1.1"; sha256="016i3zaaq800x4niz4fixa57nfj1m10sz5xskff4vq4v9fjn2sl0"; depends=[]; };
   spcosa = derive2 { name="spcosa"; version="0.3-8"; sha256="1hw3njn2c8wj8bk2qpnbi2mbhj485q3gpbjf1gq9k6my4brdp86b"; depends=[ggplot2 rJava sp]; };
   spcov = derive2 { name="spcov"; version="1.01"; sha256="1brmy64wbk56bwz9va7mc86a0ajbfy09qpjafyq2jv7gm7a35ph5"; depends=[]; };
   spcr = derive2 { name="spcr"; version="2.0"; sha256="1n0lva9brpzxysw6p7l88cj8d46jng2zd7zvr5brqldzd3yl63l9"; depends=[]; };
   spd = derive2 { name="spd"; version="2.0-1"; sha256="00zxh4ri47b61jkcjf5idl9hhlfld6rhczsnhmjsax59884f2i8m"; depends=[KernSmooth]; };
-  spdep = derive2 { name="spdep"; version="1.1-2"; sha256="06mk81kc1ml2wjc8wwwgr0wasjcr4mwrxpfa8vfc373bmnha635s"; depends=[boot coda deldir expm gmodels LearnBayes MASS Matrix nlme sf sp spData]; };
+  spdep = derive2 { name="spdep"; version="1.1-3"; sha256="1f8cjffqqc6rnb3n4qym70ca6nz2kvrsd3g587wrqdr79nnbwnrk"; depends=[boot coda deldir expm gmodels LearnBayes MASS Matrix nlme sf sp spData]; };
   spdownscale = derive2 { name="spdownscale"; version="0.1.0"; sha256="0pl560km9629iwy13h7359ab7ixzs09hg986kvk0xbnc348srb86"; depends=[]; };
   spdplyr = derive2 { name="spdplyr"; version="0.3.0"; sha256="1fx0x1p860rq568dzppjvc7npmc6k606m34pqnhf8g13ybzyn878"; depends=[dplyr lazyeval rlang sp spbabel tibble]; };
   spduration = derive2 { name="spduration"; version="0.17.1"; sha256="1hsz4hcw85f1rj2pd8ppzsd1r8fh4yf6axc11yf2hd287ghzzxzy"; depends=[corpcor forecast MASS plyr Rcpp RcppArmadillo separationplot xtable]; };
@@ -13301,7 +13565,6 @@ in with self; {
   spectral_methods = derive2 { name="spectral.methods"; version="0.7.2.133"; sha256="0k8kpk94d2qzqdk3fnf6h9jmwdyp8h3klr0ilm5siwq5wkcz339l"; depends=[abind DistributionUtils foreach JBTools ncdf_tools nnet raster RColorBrewer RNetCDF Rssa]; };
   spectralAnalysis = derive2 { name="spectralAnalysis"; version="3.12.0"; sha256="0mz01hx86qi65k6vzz9k1j9q7gi10dh14cqvrlfy93f3kmi52q0x"; depends=[baseline BiocGenerics data_table ggplot2 hNMF jsonlite magrittr NMF nnls plotly plyr RColorBrewer signal viridis]; };
   spectralGP = derive2 { name="spectralGP"; version="1.3.3"; sha256="1jf09nsil4r90vdj7n1k6ma9dzzx3bwv0fa7svil9pxrd2zlbkbs"; depends=[]; };
-  spectralGraphTopology = derive2 { name="spectralGraphTopology"; version="0.1.1"; sha256="194ibgxkj13gkmyzhw9n5d93p5mi86h7lx59yvqkxg9c7h4774mk"; depends=[MASS Matrix osqp progress Rcpp RcppArmadillo RcppEigen rlist]; };
   spectrolab = derive2 { name="spectrolab"; version="0.0.8"; sha256="1hjvi9na94f7n7yr64p0bvh0mzckwmfh36d6zxisrxr08zxwyxzz"; depends=[devtools prospectr RColorBrewer shiny shinyjs usethis]; };
   speedglm = derive2 { name="speedglm"; version="0.3-2"; sha256="1b25zimk0z7ad62yacqdg0zk0qs0jja4i918ym942xfw4j1z3jjz"; depends=[MASS Matrix]; };
   spef = derive2 { name="spef"; version="1.0.8"; sha256="1c4hpm19zqh869z8qbixkfbidnygc3fy91d0m2l4bp2s6bq1wdnz"; depends=[BB ggplot2 nleqslv plyr sm SQUAREM survival]; };
@@ -13321,15 +13584,17 @@ in with self; {
   sphet = derive2 { name="sphet"; version="1.7"; sha256="0savvqz3v5awsr7kcghg6yzkqdpm01kwp7jrg9ajfb3146gg8mlq"; depends=[Matrix nlme sp spdep]; };
   spi = derive2 { name="spi"; version="1.1"; sha256="0gc504f7sji5x0kmsidnwfm7l5g4b1asl3jkn2jzsf2nvjnplx1z"; depends=[]; };
   spider = derive2 { name="spider"; version="1.5.0"; sha256="1y034v42jxjl3vj87iz5kaizq7fwppmn56z7yyvrrmk5ps4nqr1j"; depends=[ape pegas]; };
-  spiderbar = derive2 { name="spiderbar"; version="0.2.1"; sha256="1mm9g58riyjxpfwjj28shlw9zlycsgcxl6xw8im0gm815v2plyhv"; depends=[Rcpp]; };
+  spiderbar = derive2 { name="spiderbar"; version="0.2.2"; sha256="1ardf7i0s17k8psch7vv29xnvrhw427id5hx3b8jca5cbz1l2ylb"; depends=[Rcpp]; };
   spiders = derive2 { name="spiders"; version="1.2"; sha256="1qklm178bgkgpvrjf024jphsdh9can8300sf0702l4h0rk2daqbq"; depends=[plyr]; };
   spikeSlabGAM = derive2 { name="spikeSlabGAM"; version="1.1-14"; sha256="1ha2ngs5jkrcd3ay26vynrd31fqf9pva5r0p954dyfbpbinizxgf"; depends=[akima cluster coda ggplot2 gridExtra MASS MCMCpack mvtnorm R2WinBUGS reshape scales]; };
   spikes = derive2 { name="spikes"; version="1.1"; sha256="080sna0sgii61kai5sirs6cijnvk1012djwfw705di9y2lvk1hqk"; depends=[emdbook]; };
   spikeslab = derive2 { name="spikeslab"; version="1.1.5"; sha256="0dzkipbrpwki6fyk4hqlql3yhadwmclgbrx00bxahrmlaz1vjzh2"; depends=[lars randomForest]; };
   spinBayes = derive2 { name="spinBayes"; version="0.1.0"; sha256="1qgqxxk4n17wj3q07irm2qj6lwc5188iwwbdkf588hvfy86lwpj8"; depends=[glmnet MASS Rcpp RcppArmadillo]; };
   spind = derive2 { name="spind"; version="2.2.0"; sha256="1qswvj8hcjds3mjffzlxq87g79gijsk3mw26lfr81vyf5zmwm4w4"; depends=[gee geepack ggplot2 lattice MASS RColorBrewer rje rlang splancs stringr waveslim]; };
+  spinebil = derive2 { name="spinebil"; version="0.1.0"; sha256="137ln9av551gp85qbdpvpa1iw738571vsbkry7bpzfwmbc4fz40z"; depends=[dplyr ggplot2 magrittr tibble tictoc tidyr tourr]; };
   spinifex = derive2 { name="spinifex"; version="0.1.0"; sha256="0z6jbxfrj8r3xlw4rkhq9s8yn0zl58wrzir9gyz66qj5f6c3s716"; depends=[dplyr GGally ggplot2 plotly tibble tourr webshot]; };
   spinyReg = derive2 { name="spinyReg"; version="0.1-0"; sha256="0kbg7rncrrl5xdsaw9vj909x97mfp77mjnvghczplmnwmmanyn72"; depends=[]; };
+  spiritR = derive2 { name="spiritR"; version="0.1.1"; sha256="1fjr63rl9hwqxzgm4lkb9v74cxxpi4lrlcgjixdm7zgccm8ihdvh"; depends=[httr magrittr xml2]; };
   splancs = derive2 { name="splancs"; version="2.01-40"; sha256="0qs3lwyllrkahnvqbm8bzrf03bm9zk4s7p1n19s638y4xf0l6x3r"; depends=[sp]; };
   splashr = derive2 { name="splashr"; version="0.6.0"; sha256="0l57w5gwr0p2049z1201nlqsy23h37gsybd1lj3vycxz43ir7213"; depends=[curl dplyr formatR HARtools httr jsonlite lubridate magick openssl purrr scales stevedore stringi xml2]; };
   splines2 = derive2 { name="splines2"; version="0.2.8"; sha256="0ygzqq0swhcss5v8bn7qg98fpvp3wibbnbzkbpw4nvfd8bg51m1v"; depends=[]; };
@@ -13340,7 +13605,7 @@ in with self; {
   splithalfr = derive2 { name="splithalfr"; version="1.0.10"; sha256="08gl60dbjb4nq6ab0w7yj7ac0gnj0zxbvzlg3rkqczvx4r3gwkip"; depends=[dplyr rlang]; };
   splitstackshape = derive2 { name="splitstackshape"; version="1.4.8"; sha256="0mpyf2kkfdl69pdc6brl1r6101vyc6pgr7z17s55ppg3y71k4q35"; depends=[data_table]; };
   splm = derive2 { name="splm"; version="1.4-11"; sha256="15app94mxs6xlmqqhpa0q041skc4n4l2wfi6pmmhwinrgcqgncln"; depends=[bdsmatrix ibdreg MASS Matrix maxLik nlme plm spam spdep]; };
-  splot = derive2 { name="splot"; version="0.4.2"; sha256="1f2bxcq6likg4nl7k63mxh858b7ckss97szcdqh5aidc42rhamg1"; depends=[]; };
+  splot = derive2 { name="splot"; version="0.5.0"; sha256="0r05lbx9zi8prhcc8pb1680amlq32dhpg7vwfssii9bm9xkznlwl"; depends=[]; };
   spls = derive2 { name="spls"; version="2.2-3"; sha256="0bmb0ai5z80njhypd342i711x0bdkwcvlyn374lyyzj8h3d97mmv"; depends=[MASS nnet pls]; };
   splus2R = derive2 { name="splus2R"; version="1.2-2"; sha256="0xrbj8vxy0pc6hl7m8abv71d3hjw47cl51s7j7priadyqczkq6sz"; depends=[]; };
   splusTimeDate = derive2 { name="splusTimeDate"; version="2.5.0-142"; sha256="0l1cb6gvwysca5psnsppllsvmsq7gfrybxy7aiw7phnm6bhb4w67"; depends=[]; };
@@ -13349,7 +13614,7 @@ in with self; {
   spm12r = derive2 { name="spm12r"; version="2.8.1"; sha256="1ndak1ba6gh3hij0x4njr4hv6nfvq91dpgb0zdw0nl11bi6999b0"; depends=[git2r matlabr neurobase oro_nifti R_utils]; };
   spmoran = derive2 { name="spmoran"; version="0.1.7.1"; sha256="0nxg1xl3m4lkpxrkfcbnmf1x0gf43llz7095rj6i3flgmymirnxh"; depends=[doParallel fields foreach ggplot2 Matrix rARPACK spdep vegan]; };
   spnet = derive2 { name="spnet"; version="0.9.1-0"; sha256="1fy0fpgz2k985brfqyza1l49y0w2j9z308n542pgmkzqsnsdscpw"; depends=[shape sp]; };
-  spnn = derive2 { name="spnn"; version="1.1"; sha256="0i77lpxrfa1jxi9znlmn5knmcjpf17q4hf8999b1x8lhqlhiizc1"; depends=[MASS]; };
+  spnn = derive2 { name="spnn"; version="1.2"; sha256="1pfgffcaycv8ym9sal24s7h3zycjnnkkwhp4c2drigh6qvq8bly6"; depends=[MASS Rcpp RcppArmadillo]; };
   spocc = derive2 { name="spocc"; version="0.9.0"; sha256="1azid8girmj4f0j4x9irljpxbsdpsxz572grb4fdjdxmlzpls7sy"; depends=[crul data_table jsonlite lubridate rbison rebird rgbif ridigbio rvertnet tibble whisker wicket]; };
   spongebob = derive2 { name="spongebob"; version="0.4.0"; sha256="1ar5173fwx1am5rgjlnczfla6b49g0azl0h9vn89ipw7f71rr5j7"; depends=[]; };
   spongecake = derive2 { name="spongecake"; version="0.1.2"; sha256="13fxizbfjvqkhkmxk5bwv2fj2xyjkbxrxicpdgwpg0wsk4dhj3s8"; depends=[ggplot2 jpeg magrittr plyr]; };
@@ -13359,10 +13624,12 @@ in with self; {
   spotifyr = derive2 { name="spotifyr"; version="2.1.1"; sha256="0d3n75gyyqi5vgp3z4v3g9l7963xgadi98p1b5iag78zzz1zkcz8"; depends=[dplyr genius httr jsonlite lubridate purrr readr rvest stringr tibble tidyr]; };
   spp = derive2 { name="spp"; version="1.16.0"; sha256="08zxxgyp0h6733b08jmml7k4rhfd3mi5dda3jrzid0s184y0z29w"; depends=[BH caTools Rcpp Rsamtools]; };
   sppmix = derive2 { name="sppmix"; version="1.0.2"; sha256="1924lrxjlijlbvjbkkwb3pfa4klg49ph6hz66b7kyy1371wa2b9y"; depends=[fields ggplot2 mvtnorm Rcpp RcppArmadillo rgl spatstat]; };
-  spray = derive2 { name="spray"; version="1.0-6"; sha256="19j3fmgxwvni73xmldwaf6n8czxrwlhb9psl7iry0skw8vmdp4jy"; depends=[magic partitions Rcpp]; };
+  spray = derive2 { name="spray"; version="1.0-7"; sha256="0lx837swixh02ivpg8b39c895g5xlxwrv95nppkpbqivxkn0zyjp"; depends=[magic partitions Rcpp]; };
+  spread = derive2 { name="spread"; version="2019.8.5"; sha256="1mc25abh1jxgis9p78pdy91a45kanr7y32xbqypyd514jjylnc52"; depends=[data_table fhidata Rcpp RcppProgress readxl stringr zoo]; };
   spreadr = derive2 { name="spreadr"; version="0.1.0"; sha256="1azf1543ijlgmry0f2sxivpy4hk9mcwnn5kqggzwwzwla2ql3lhj"; depends=[extrafont ggplot2 igraph Rcpp]; };
   sprex = derive2 { name="sprex"; version="1.4.1"; sha256="14idml4mipd4wyza7hqf49ww4dparmwaps35hxm8jg5h0w1pgh7j"; depends=[swfscMisc]; };
   sprinter = derive2 { name="sprinter"; version="1.1.0"; sha256="12v4l4fxijh2d46yzs0w4235a8raip5rfbxskl0dw7701ryh7n8g"; depends=[CoxBoost GAMBoost LogicReg randomForestSRC survival]; };
+  sprintr = derive2 { name="sprintr"; version="0.9.0"; sha256="0nnzjn7zrcgcmk3rs0hn56jcjrzrn5z0kc77bv4zzvbz5vr8gbwj"; depends=[glmnet Rcpp RcppArmadillo]; };
   sprm = derive2 { name="sprm"; version="1.2.2"; sha256="0iyijkjnyz4yx2cmazlnhkk0f5ls0c2q2aikwlzl13w6zbj040a8"; depends=[cvTools ggplot2 pcaPP reshape2 robustbase]; };
   sprsmdl = derive2 { name="sprsmdl"; version="0.1-0"; sha256="09klwsjp5w6p7dkn5ddmqp7m9a3zcmpr9vhcf00ynwyp1w7d26gi"; depends=[]; };
   spsann = derive2 { name="spsann"; version="2.2.0"; sha256="00nlrwk50ch128brzvfxld0pcpq1syks9rvwdrcf1i2pcxnva7d0"; depends=[pedometrics Rcpp sp SpatialTools]; };
@@ -13370,7 +13637,7 @@ in with self; {
   spsh = derive2 { name="spsh"; version="1.0.4"; sha256="11xfbhj9g8c99npzs76y30j829gfvhi9zrq2dn97c1idd08200c9"; depends=[DEoptim FME lhs pracma]; };
   spsi = derive2 { name="spsi"; version="0.1"; sha256="0q995hdp7knic6nca0kf5yzkvv8rsskisbzpkh9pijxjmp1wnjrx"; depends=[plot3D]; };
   spsur = derive2 { name="spsur"; version="1.0.0.3"; sha256="101k39g0psvvrf8qkic9ijh2sps444i5bl1z3fr9c4i29yfgzvnm"; depends=[Formula MASS Matrix minqa numDeriv sparseMVN spdep]; };
-  spsurvey = derive2 { name="spsurvey"; version="4.0.0"; sha256="0bx3x4cddsr5r402cxi0321628ab7hjajgcv937ah4km3g2z9ihs"; depends=[crossdes deldir foreign Hmisc MASS rgeos sp]; };
+  spsurvey = derive2 { name="spsurvey"; version="4.1.0"; sha256="1f48jddws3whaakvkcps7kvg179q74mjprh0rs3y6wfhfn0w67hm"; depends=[crossdes deldir foreign Hmisc MASS rgeos sf sp]; };
   spt = derive2 { name="spt"; version="2.5.1"; sha256="04j38d2b35p4798znnc49vqrg8r8bygwi07vybfj3nzimlp2mkrn"; depends=[]; };
   sptemExp = derive2 { name="sptemExp"; version="0.1.4"; sha256="16rp20l65id6jiqify7hii0xpgkiyhgp9xg89b002n0jsy10pgph"; depends=[automap BayesX BayesXsrc bcv deldir doParallel foreach limSolve ncdf4 plyr R2BayesX raster Rcpp RcppEigen rgdal rgeos sp SpatioTemporal]; };
   sptm = derive2 { name="sptm"; version="17.12-7"; sha256="1l5in0jkqg44rr2id3h25jrfbn7x855p31z338hnmdpfwkpm2b1a"; depends=[kyotil survey survival]; };
@@ -13378,12 +13645,13 @@ in with self; {
   spup = derive2 { name="spup"; version="1.3-1"; sha256="0xq9z9iy3bwqhzq783qydgmczxvh7knkk9vdvwnbpbk0rbjgq3kn"; depends=[gstat magrittr mvtnorm purrr raster whisker]; };
   sqldf = derive2 { name="sqldf"; version="0.4-11"; sha256="0q12vsb53p2wchgp8wfz5bk08wfnm0jxjrakclj4jyy6x3a7ksff"; depends=[chron DBI gsubfn proto RSQLite]; };
   sqliter = derive2 { name="sqliter"; version="0.1.0"; sha256="17jjljq60szz0m8p2wc5l56659aap7an5gknc848dp89ycjgj3zx"; depends=[DBI functional RSQLite stringr]; };
+  sqlparseR = derive2 { name="sqlparseR"; version="0.1.0"; sha256="0zcna9y61v1qklpnhrwgv1djg4hyx3k5an32caapszi8qm9nq3x8"; depends=[reticulate]; };
   sqlscore = derive2 { name="sqlscore"; version="0.1.4"; sha256="1wvjiy7g0rxfy10vssdrv5li5sbvrin9wjy0ai0nxk503kw7g74k"; depends=[dbplyr]; };
   sqlutils = derive2 { name="sqlutils"; version="1.2"; sha256="0dq4idg8i4hv9xg8jllllizqf3s75pdfm1wgncdjj52xhxh169pf"; depends=[DBI roxygen2 stringr]; };
   squash = derive2 { name="squash"; version="1.0.8"; sha256="1x1rw0ny2kas0x8y5vv9czyqmwml7s5d2c8a33vqap0x8q52r4z6"; depends=[]; };
-  squid = derive2 { name="squid"; version="0.1.1"; sha256="0qv9lazgiqazhq096ybmllalm2l2h794ry4p1r93c10msxg37sdp"; depends=[arm data_table ggplot2 lme4 MASS shiny]; };
+  squid = derive2 { name="squid"; version="0.1.2"; sha256="1sf7q9pp68inr4ikaxm51f31gwxq9ixrsismrnnsby3agq6nsmkb"; depends=[arm data_table ggplot2 lme4 MASS shiny]; };
   sra = derive2 { name="sra"; version="0.1.1"; sha256="03nqjcydl58ld0wq1f9f5p666qnvdfxb5vhd584sdilw1b730ykd"; depends=[]; };
-  srm = derive2 { name="srm"; version="0.1-166"; sha256="1rqlvmynbcqp8j6jkyrimwkma0x1a4zw8vf0xx84q01qgqf0i8ar"; depends=[Rcpp RcppArmadillo]; };
+  srm = derive2 { name="srm"; version="0.2-10"; sha256="1vcggiifp3h12pb4dcdyz4345n2sr5yjszdjgn6s4jsc99lzmj0a"; depends=[Rcpp RcppArmadillo]; };
   srp = derive2 { name="srp"; version="1.2.0"; sha256="0xdzfvi7z78xmyxwd8fha3lr86jwmgjba1w8hhn4sv3v5gc9vlkh"; depends=[fda mgcv]; };
   srvyr = derive2 { name="srvyr"; version="0.3.5"; sha256="0yy18jaja7w7q6lbc2ky2lranjr6j23s88nplrvvn5a28n72mkdp"; depends=[dplyr magrittr rlang survey tibble tidyselect]; };
   ss3sim = derive2 { name="ss3sim"; version="0.9.5"; sha256="0rdb49bfxvyh0jrqycrv1hxvh7y4kvw81jccjg5ma734x44q0vm5"; depends=[bbmle dplyr foreach ggplot2 gtools lubridate magrittr plyr r4ss]; };
@@ -13394,19 +13662,21 @@ in with self; {
   sscor = derive2 { name="sscor"; version="0.2"; sha256="1kcrr90cxg6k4qkc3pidhkwf4dsnlgbxczxigr2afwpd9cpf104c"; depends=[mvtnorm pcaPP robustbase]; };
   ssd = derive2 { name="ssd"; version="0.3"; sha256="1z61n9m6vn0ijawyz924ak0zfl9z13jsb4k4575b7c424ci2p6gy"; depends=[]; };
   ssdtools = derive2 { name="ssdtools"; version="0.0.3"; sha256="1q6mg28bp48bgzr2ahbw16d9zbadhpq3mnd91c15cm4dq1airksv"; depends=[checkr FAdist fitdistrplus ggplot2 scales VGAM]; };
+  sse = derive2 { name="sse"; version="0.7-13"; sha256="0h2fgp66jyqyfizlz644wdyhdabcflgawx9nqsfibyyqigkicm97"; depends=[lattice]; };
   ssev = derive2 { name="ssev"; version="0.1.0"; sha256="1iw07gw9vhg073s5kkxh5f1si6p998rc1i2zglnpk5c3pi3l55wp"; depends=[MESS pwr]; };
   ssfa = derive2 { name="ssfa"; version="1.1"; sha256="0fkyalhsjmx2sf8xxkppf4vd272n99nbkxh1scidrsgp4jk6z7fx"; depends=[Matrix maxLik sp spdep]; };
   ssfit = derive2 { name="ssfit"; version="1.1"; sha256="1fais0msi2ppgfp0vbx3qri7s9zs51i7n90w36xkwwac4f46bq5y"; depends=[survey]; };
-  ssgraph = derive2 { name="ssgraph"; version="1.8"; sha256="0047h8cg7rv4qckhv3ixplfbpilj9sshd6vvg20zzb4wqnk5h1cr"; depends=[BDgraph igraph]; };
+  ssgraph = derive2 { name="ssgraph"; version="1.10"; sha256="1fd83mfnzhsbvx77ddmmv0zmi3dq3hzvaj3g9x6xa47z0pf057vr"; depends=[BDgraph]; };
   ssh = derive2 { name="ssh"; version="0.6"; sha256="0hsql86hc30lc4aaz0j5pg28gz67fbd1kjvv4mlnfar8f5p8rk8c"; depends=[askpass credentials]; };
   ssh_utils = derive2 { name="ssh.utils"; version="1.0"; sha256="08313zzzgcyvzkrkq0w0yf748ya1a9shx5xnan5891v0lah9v0b1"; depends=[stringr]; };
   ssize_fdr = derive2 { name="ssize.fdr"; version="1.2"; sha256="0y723lwsnmk3rxbhlsrny9hiy07a5p255ygy9qkj6mri64gk1hby"; depends=[]; };
-  ssizeRNA = derive2 { name="ssizeRNA"; version="1.3.1"; sha256="08gkmmn71qra34x00r1vl6zyfwz7bwkbsax09vkqi7a15k1c3dph"; depends=[Biobase edgeR limma MASS qvalue ssize_fdr]; };
+  ssizeRNA = derive2 { name="ssizeRNA"; version="1.3.2"; sha256="1qw10yswzpg28fhvr6rsq0gh7xivfapw64gxc0hakb1nc31jf8ky"; depends=[Biobase edgeR limma MASS qvalue ssize_fdr]; };
   ssmn = derive2 { name="ssmn"; version="1.1"; sha256="1rab9yjb05g5rphqlhwvdwmsyqlv1f4m0rqxfv8c5pbh170nbwbc"; depends=[mnormt moments sn truncdist]; };
   ssmrob = derive2 { name="ssmrob"; version="0.7"; sha256="0asf0r83rzar96lcjm38i85qscbs9gbsrwbd1nfwzz9yl08mh07k"; depends=[MASS robustbase sampleSelection]; };
   ssmsn = derive2 { name="ssmsn"; version="0.2.0"; sha256="0fzqdkqhj5hh8pzcwh7i0rglgdq22a5mriyis8r1vhlkdc7n5m39"; depends=[MCMCpack]; };
   sspline = derive2 { name="sspline"; version="0.1-6"; sha256="0d6ms8szyn39c7v0397d5ar2hrl8v1l2b7m8hlj37hgp70b9s55h"; depends=[]; };
   sspse = derive2 { name="sspse"; version="0.6"; sha256="1296893wgg0s6z5bv9a3k39gbxazvljl4dxiv4ma1s73nhz0xan9"; depends=[coda RDS scam]; };
+  ssr = derive2 { name="ssr"; version="0.1.1"; sha256="0l2f8lsmwv2f4y708g32jy2s4jj0j686830qp4a5ailyrdbbz1ix"; depends=[caret e1071]; };
   ssrm_logmer = derive2 { name="ssrm.logmer"; version="0.1"; sha256="1i9rrsixl3swd04w1gf9gf1r2wb9nkvwhc8ld4bx4zxzm1031f67"; depends=[sfsmisc statmod]; };
   sss = derive2 { name="sss"; version="0.1-0"; sha256="1qg56g60h8c52l8lpxihxsdgnqkxiag1mzh3p388r9hhff7g3g0k"; depends=[assertthat xml2]; };
   sssc = derive2 { name="sssc"; version="1.0.0"; sha256="00m5zfd3jnbxa8x76v4pfyl4qdfq90n8rqx4hngany0ka1z5g7m6"; depends=[changepoint e1071 ggplot2 VGAM]; };
@@ -13416,7 +13686,7 @@ in with self; {
   st = derive2 { name="st"; version="1.2.5"; sha256="0dnyfjcz37gjjv87nrabb11gw2dlkqhq3mrxdpkzahx0w0g0q0pb"; depends=[corpcor fdrtool sda]; };
   stR = derive2 { name="stR"; version="0.4"; sha256="120k8k1l8cfy8x746808jym7lnaplgh4s3lycgyq2wia2c35r0rc"; depends=[foreach forecast Matrix quantreg rgl SparseM]; };
   stUPscales = derive2 { name="stUPscales"; version="1.0.3.4"; sha256="0a6b38lhi1p0n2hjq2j8aw2vkasdv50cpgllxfxla7ddwbhbk3nk"; depends=[data_table doParallel EmiStatR foreach ggplot2 hydroGOF lattice lmom mAr moments msm xts zoo]; };
-  staRdom = derive2 { name="staRdom"; version="1.0.14"; sha256="07j6wa5rspa92b0n98a2c54kqs662qq0231af87yy3j5h4r0v0zr"; depends=[cdom data_table doParallel dplyr drc eemR foreach GGally ggplot2 matrixStats MBA multiway pracma R_matlab readr stringr tibble tidyr zoo]; };
+  staRdom = derive2 { name="staRdom"; version="1.0.18"; sha256="15jgp1i3fs73g2gw3blx85rgww6w94a93632f9292x342bpsy7c4"; depends=[cdom data_table doParallel dplyr drc eemR foreach GGally ggplot2 gtools matrixStats MBA multiway pracma R_matlab readr stringr tibble tidyr zoo]; };
   staTools = derive2 { name="staTools"; version="0.1.0"; sha256="1ksr0sjkhlwh0fkwcxjcxzbyxs1g78m4spkhrmgdpfzmk5zskqf9"; depends=[magicaxis Rcpp VGAM]; };
   stability = derive2 { name="stability"; version="0.5.0"; sha256="0mz7ikfhpfbdcp72klq7fi4zfmx2w18gz46yhwywcc4dyi277m11"; depends=[dplyr ggfortify ggplot2 lme4 magrittr matrixStats reshape2 rlang scales tibble tidyr]; };
   stable = derive2 { name="stable"; version="1.1.4"; sha256="01azqg4yi5wl6wfdpjq57w41x5z2b4dsp5n3vpkz24b9avk6rm8s"; depends=[rmutil stabledist]; };
@@ -13430,6 +13700,7 @@ in with self; {
   stacomiR = derive2 { name="stacomiR"; version="0.5.4.2"; sha256="0dhf91wmv3mz120g9bwspgq9qs6d8sk1a2vxd7xl0jibgx6fk22x"; depends=[dplyr ggplot2 gWidgets gWidgetsRGtk2 Hmisc intervals lattice lubridate magrittr mgcv RColorBrewer reshape2 RGtk2 RODBC RPostgreSQL sqldf stacomirtools stringr xtable]; };
   stacomirtools = derive2 { name="stacomirtools"; version="0.5.3"; sha256="00zpsfrw0gcjbjr3xdxf2wacrr1zfw6wq7a2ycq32pbh2smbkz4k"; depends=[RODBC xtable]; };
   stagePop = derive2 { name="stagePop"; version="1.1-1"; sha256="0949r5ibl3sb10sr5xsswxap3wd824riglrylk7fx43ynsv5hzpy"; depends=[deSolve PBSddesolve]; };
+  stagedtrees = derive2 { name="stagedtrees"; version="1.0.0"; sha256="0jlblkinbf979dpdlsn9zls6wx3l2mmnvlrq4zm38nc5i241ipyz"; depends=[]; };
   stam = derive2 { name="stam"; version="0.0-1"; sha256="1x1j45fir64kffny0nssb2hwn4rcp8gd2cjv6fw4yy0l4d0xi5iv"; depends=[np sp]; };
   stampr = derive2 { name="stampr"; version="0.2"; sha256="10mc71kgnw5712q2gvzd4bmjaw1879r7s599hfsjap21idqb2k2m"; depends=[deldir maptools raster rgdal rgeos sp spdep]; };
   standardize = derive2 { name="standardize"; version="0.2.1"; sha256="0ijyqy09fl478cvqnqwv7fpdmf2yvihw18abkkmgwdnm2v3xqphp"; depends=[lme4 MASS stringr]; };
@@ -13448,6 +13719,7 @@ in with self; {
   statcheck = derive2 { name="statcheck"; version="1.3.0"; sha256="0ivybdcrymlsfv6pg6p5bv70qdvgxf2vgp0kf4r0pf2fcvav1mcp"; depends=[ggplot2 plyr rmarkdown]; };
   statebins = derive2 { name="statebins"; version="1.2.2"; sha256="0qfs796dk5x983qah32w3npv9mxzljp3g7kffdd0ansn3z7i1zbb"; depends=[ggplot2 gridExtra RColorBrewer scales]; };
   states = derive2 { name="states"; version="0.2.2"; sha256="1lw1gljmkn8i8fd4ng5c3jpqrwr0gkiyazppy19dp8xl94m1xa4b"; depends=[dplyr]; };
+  stationaRy = derive2 { name="stationaRy"; version="0.5.0"; sha256="1h6c7iivjqir45rk6qdfr8driqjliqn09sjdm521kkb3c5qv334r"; depends=[downloader dplyr lubridate lutz magrittr progress readr stringr tidyr]; };
   stationery = derive2 { name="stationery"; version="0.98.6"; sha256="0qvvalck0j2bgzvmnl4dl54wx3b2v9mr88ii26zb5hvm7i2i4x9f"; depends=[knitr kutils rmarkdown]; };
   statip = derive2 { name="statip"; version="0.2.0"; sha256="012caxqa04qv3z49cz09qzh9crfbdc4il2d2b96l5d3qnqv9xbh9"; depends=[bazar clue rpart]; };
   statmod = derive2 { name="statmod"; version="1.4.32"; sha256="083yyp84xj85zg4bhz7i90bqzl3p6155ch4abwsfc9k1lv7s2rrg"; depends=[]; };
@@ -13457,10 +13729,10 @@ in with self; {
   statprograms = derive2 { name="statprograms"; version="0.2.0"; sha256="0m7px7fmpz2zzlfdi7rbllcjvcjp8iy94f6fa1w4xinh7vz3y6vq"; depends=[]; };
   statquotes = derive2 { name="statquotes"; version="0.2.2"; sha256="1xzc3ndddjrlyld0p4zcwwxkj7i3m3adj7c78x9l4lhlw9mxbbqg"; depends=[stringr tidytext wordcloud]; };
   stats19 = derive2 { name="stats19"; version="1.0.0"; sha256="1lm2qif0g710n5i7gzqhbwhxm76cabs5zm6504wja343fk3vzb54"; depends=[readr sf]; };
-  statsDK = derive2 { name="statsDK"; version="0.1.1"; sha256="0insx4sivac0nfxaa11iz9dd7374g51fcndsgljj3f14zw1xyq66"; depends=[dplyr ggplot2 httr jsonlite lubridate readr stringr tibble tidyr]; };
+  statsExpressions = derive2 { name="statsExpressions"; version="0.1.1"; sha256="11f3ikrznp21sxk7r8m417f1sad0a7y63g623crvpyjr0cg0zq53"; depends=[BayesFactor boot broomExtra crayon dplyr ellipsis ez groupedstats magrittr MCMCpack psych rcompanion rlang tibble tidyr WRS2]; };
   statsguRu = derive2 { name="statsguRu"; version="0.1.0"; sha256="0pqz0la86mk6zp65zzbfwhxyrqqx040p8mrm2j9wqb53r8fbnmqc"; depends=[devtools htmltab plotrix]; };
   statsr = derive2 { name="statsr"; version="0.1-0"; sha256="1z0wfj1jxz02x7vl6sr651v85k88wg8rx0k2kkrwzc4ynim8shms"; depends=[BayesFactor broom cubature dplyr ggplot2 gridExtra knitr rmarkdown shiny tidyr]; };
-  stcos = derive2 { name="stcos"; version="0.1.0"; sha256="0af36d75miwflq4r6nnw579dqy7bsg1s0kgyykx73bc6ksg5liix"; depends=[Matrix R6 Rcpp RcppArmadillo sf]; };
+  stcos = derive2 { name="stcos"; version="0.2.0"; sha256="0h6j6nypj6siy6ykkksj9zv89b5jd4gm5vgvncm3h1dxxn2b9mcm"; depends=[dplyr Matrix R6 Rcpp RcppArmadillo sf]; };
   stcov = derive2 { name="stcov"; version="0.1.0"; sha256="166w929sgd7nanw1zjhzwv50hd5vqhgsrgxnsga4dzrcvndalw70"; depends=[]; };
   stdReg = derive2 { name="stdReg"; version="3.3.0"; sha256="0m907dcgqprnasq17z3wyx7fampsqhwjvg2r0nji5bg9gzag4253"; depends=[data_table drgee numDeriv survival]; };
   stddiff = derive2 { name="stddiff"; version="2.0"; sha256="0mik01a8agcdpjq4r7lcdf3w2jcy6s9gx9zl7plzvnl2r3s5xw5b"; depends=[]; };
@@ -13486,11 +13758,12 @@ in with self; {
   stlplus = derive2 { name="stlplus"; version="0.5.1"; sha256="14728xsm982z9sg4rbqg307pbwqlsiyzj8z3sr9wr6fi0dayf6z5"; depends=[lattice Rcpp yaImpute]; };
   stm = derive2 { name="stm"; version="1.3.3"; sha256="1b1i4r161i92f5q63zjfghzg39bw9d2rqdxx0y6zjd8n2p0ni3wv"; depends=[data_table glmnet lda Matrix matrixStats quadprog quanteda Rcpp RcppArmadillo slam stringr]; };
   stmCorrViz = derive2 { name="stmCorrViz"; version="1.3"; sha256="1a4pckrbzsihyf1bqvw3cl0hxrc4yq1pnkgxgf4b8jday6zkxwcv"; depends=[jsonlite SnowballC stm tm]; };
-  stmgp = derive2 { name="stmgp"; version="1.0.1"; sha256="0rbskcggshn880d1pcl95ixbg16pzyhy14j1x44ipby5md737w89"; depends=[MASS]; };
+  stmgp = derive2 { name="stmgp"; version="1.0.2"; sha256="14d7aivnm2y5cb6wm3cj1fgaqhv0i59jb4khvrjwqihzcnii90x5"; depends=[MASS]; };
   stmgui = derive2 { name="stmgui"; version="0.1.6"; sha256="1fn2m5l7y3p1riw39g6r3hpjxdccygih7yipp7dvc4msl9fm4h5c"; depends=[markdown shiny shinyBS shinyjs shinythemes stm tm]; };
   stminsights = derive2 { name="stminsights"; version="0.3.0"; sha256="11lhsk7l11bcxsmc7hm8pnwj75634m5gkigr714i16ai2dkvzqpq"; depends=[dplyr ggplot2 ggraph ggrepel huge igraph purrr readr scales shiny shinyBS shinydashboard shinyjs stm stringr tibble tidygraph]; };
   stoRy = derive2 { name="stoRy"; version="0.1.3"; sha256="146xs8as5f8ig2xpj9k2san4bllqxddsnlflnhl0sy6132vshyr1"; depends=[data_tree R6]; };
   stocc = derive2 { name="stocc"; version="1.30"; sha256="0xpf9101094l5l75p9lr64gwh2b8jh4saw6z6m2nbn197la3acpw"; depends=[coda fields Matrix rARPACK truncnorm]; };
+  stochQN = derive2 { name="stochQN"; version="0.1.2"; sha256="1zwxw95jrpkqgbgwhwdy907v9gqmvn5as4v35a75wvy3nhawka9a"; depends=[]; };
   stochprofML = derive2 { name="stochprofML"; version="1.2"; sha256="0gqfm2l2hq1dy3cvg9v2ksphydqdmaj8lppl5s5as2khnh6bd1l1"; depends=[MASS numDeriv]; };
   stochvol = derive2 { name="stochvol"; version="2.0.4"; sha256="1hb2fgnyn8zxq1j74x00msq3j807y70yxx2s3fq4csrb1935vr85"; depends=[coda Rcpp RcppArmadillo]; };
   stockR = derive2 { name="stockR"; version="1.0.68"; sha256="0pgyxh19csv21vgji1sjpqaaqb1wwz62mnsf85a97ba9aph9lxwb"; depends=[gtools]; };
@@ -13500,27 +13773,27 @@ in with self; {
   stormwindmodel = derive2 { name="stormwindmodel"; version="0.1.1"; sha256="16w6si2icpsyhkn0d3l6sh64nj6ynyymp7jxfwa792ds2wrz2mkm"; depends=[dplyr ggplot2 lubridate maps plyr stringr tidyr weathermetrics]; };
   storr = derive2 { name="storr"; version="1.2.1"; sha256="0409gb6wji3cjxkdcd0wc3jvsx61h3rxd8a3nr018y8rh1rpsaj6"; depends=[digest R6]; };
   stosim = derive2 { name="stosim"; version="0.0.14"; sha256="10k8j7manskjsrjc1l44yhy682b1qh0k2jx3cs5k69j2z42mnhmk"; depends=[Rcpp]; };
-  stplanr = derive2 { name="stplanr"; version="0.3.0"; sha256="0jzwpr4gbif44j8c2s0gjfx21lnskwj2vpqi8hx2m9n6lgr2348p"; depends=[curl dplyr geosphere httr igraph jsonlite lubridate lwgeom magrittr maptools nabor openxlsx R_utils raster Rcpp RcppArmadillo readr rgeos rlang sf sp stringi stringr]; };
+  stplanr = derive2 { name="stplanr"; version="0.3.1"; sha256="11r7ijma1v47kjd8ai06r1z4h207823cfrh0iajzjlrnx91qi4qg"; depends=[curl dplyr geosphere httr igraph jsonlite lubridate lwgeom magrittr maptools nabor openxlsx R_utils raster Rcpp RcppArmadillo readr rgeos rlang sf sp stringi stringr]; };
   stpm = derive2 { name="stpm"; version="1.7.7"; sha256="1l40zb9qwshg7saqmgi7c49a3jd93ycrbvmysgzs0q8pl94vgcfs"; depends=[knitcitations MASS nloptr Rcpp RcppArmadillo sas7bdat survival]; };
   stpp = derive2 { name="stpp"; version="2.0-3"; sha256="18icnfrlrcibrpw7vqkrhzfx880ak24xk6llwgiqw18r929mq1hw"; depends=[ggplot2 gridExtra KernSmooth plot3D rgl rpanel spatstat splancs]; };
   strandCet = derive2 { name="strandCet"; version="1.0"; sha256="019cacj0g9f6i8v03rq7qyph7f14d8n0qw0axvczijvnk99q602a"; depends=[boot corpcor MASS minpack_lm mvtnorm numDeriv]; };
   strap = derive2 { name="strap"; version="1.4"; sha256="0gdvx02w0dv1cq9bb2yvap00lsssklfnqw0mwsgblcy2j6fln7b0"; depends=[ape geoscale]; };
-  strapgod = derive2 { name="strapgod"; version="0.0.3"; sha256="1sh716zqh6cc2qddn8v9pwdyf4xq9a59k7h797swzlk0r50y83h9"; depends=[dplyr rlang tibble tidyr]; };
+  strapgod = derive2 { name="strapgod"; version="0.0.4"; sha256="19v4g2wny21lb76crais5wxqkgq4hjh7gn961pr2w10kf4ll1vvx"; depends=[dplyr lifecycle rlang tibble tidyr]; };
   strat = derive2 { name="strat"; version="0.1"; sha256="1axxrp750kjzcgxjdqfscjmryv1mkv4l23zk8k23z8l4ymhd2f5w"; depends=[Hmisc Rcpp RcppArmadillo]; };
   stratEst = derive2 { name="stratEst"; version="0.1.2"; sha256="045wmvkv9jxmazvy0p2dkf3200vy5gf124cv78132ysrnh2vcd4v"; depends=[Rcpp RcppArmadillo]; };
   strataG = derive2 { name="strataG"; version="2.0.2"; sha256="1rf1xf07yb0dzasgig9sfm4i9ggdkjgy5iiysqgdapk3sxs26c8r"; depends=[adegenet ape apex copula data_table DT ggplot2 gridExtra Hmisc pegas phangorn RColorBrewer Rcpp shiny shinyFiles survival swfscMisc]; };
   stratbr = derive2 { name="stratbr"; version="1.2"; sha256="15vkymmc61yz9szhfhc5663hfyqvh499ahwhr9mv1lhv5bikk0kb"; depends=[Rglpk snowfall stratification]; };
   strategicplayers = derive2 { name="strategicplayers"; version="1.0"; sha256="19vijrlzawd701vvk9ig7yhzbirh39dxxcwfz8ywwvxxiaky5x55"; depends=[sna]; };
   stratification = derive2 { name="stratification"; version="2.2-6"; sha256="1jlks3g8wpqlpci6v0ryyv93agiabdiklmk6ij0pc5icrfiynbhw"; depends=[]; };
-  stratifyR = derive2 { name="stratifyR"; version="1.0-1"; sha256="0w135smkgryx29ppa7khpay8w04b3g2pxka0wsqlhksrp5pqa086"; depends=[actuar fitdistrplus mc2d triangle zipfR]; };
+  stratifyR = derive2 { name="stratifyR"; version="1.0-2"; sha256="10qlxkdbym206bvl2wc8ig00fvj1n7553vmjk6rs2n4p945qd47g"; depends=[actuar fitdistrplus mc2d triangle zipfR]; };
   stratvns = derive2 { name="stratvns"; version="1.0"; sha256="1bw9l389lxiji4h7hrsshf24v135h6la9dg3xxjly53d4fi56ifh"; depends=[MultAlloc Rglpk sampling snowfall stratification]; };
   stream = derive2 { name="stream"; version="1.3-1"; sha256="09f26m0fajaw77mb6pk9qkinzkhxpghagd1qhc3nkvcki3vwlcxa"; depends=[BH clue cluster clusterGeneration dbscan fpc MASS mlbench proxy Rcpp]; };
   streamDepletr = derive2 { name="streamDepletr"; version="0.1.0"; sha256="0a8cihwjr5bzw5dw07x2kisi4qycwmxpj5hhv9b4pjvfghdwq4b8"; depends=[dplyr magrittr Rmpfr]; };
   streamMOA = derive2 { name="streamMOA"; version="1.2-2"; sha256="1zm7bcdsyazqksizir5rqibgw6w1bz85gdga0ncirh2s1z0dhi79"; depends=[rJava stream]; };
   streamR = derive2 { name="streamR"; version="0.4.5"; sha256="1clx3b0j2515r1nmnl6ki7qw5n54q3x2jvqv3zrc00kq71mlj7ix"; depends=[ndjson RCurl rjson]; };
-  streambugs = derive2 { name="streambugs"; version="1.0"; sha256="1dyh5rwi47dn584nyy7f7vg5j5nlpz7ygcl8lwkj7prahplmzg5d"; depends=[deSolve]; };
+  streambugs = derive2 { name="streambugs"; version="1.1"; sha256="1r0fnvpmj2z34j3w2nbdvxlw9jnz8y3x1xx9ih3vxna50ldrg2z2"; depends=[deSolve]; };
   stressr = derive2 { name="stressr"; version="1.0.0"; sha256="00b93gfh1jd5r7i3dhsfqjidrczf693kyqlsa1krdndg8f0jkyj7"; depends=[lattice latticeExtra XML xts]; };
-  strex = derive2 { name="strex"; version="1.1.1"; sha256="0c4fciixckz4imp1sjsb9ncq3snx3fhsakxycvdvj977w47mv457"; depends=[checkmate glue magrittr matrixStats ore processx Rcpp rlang stringi stringr tibble]; };
+  strex = derive2 { name="strex"; version="1.2.0"; sha256="1vshbq83szgig93ljhnwqwdsdskayszdzwk85n1n650clriv0b85"; depends=[checkmate glue magrittr matrixStats ore processx Rcpp rlang stringi stringr tibble]; };
   strider = derive2 { name="strider"; version="1.2"; sha256="0kfwanz80ki41yr5m0xw4nbbqgzl6zfvwqx906bxywlqiqi47cb6"; depends=[BH Rcpp]; };
   stringb = derive2 { name="stringb"; version="0.1.13"; sha256="004bp75yhrgr480v9774kfq7z5l9z0761cnrwj4yk7fxygk89a1x"; depends=[backports]; };
   stringdist = derive2 { name="stringdist"; version="0.9.5.2"; sha256="0nw8c317qkfq63pr0prl0hx522ddfq4cbgixb5r4pq3fxk9z303l"; depends=[]; };
@@ -13532,12 +13805,12 @@ in with self; {
   striprtf = derive2 { name="striprtf"; version="0.5.2"; sha256="1ra6aalalig6drsj26z9s24lmb10zssagqrvgqqi4358zbm8gwcd"; depends=[magrittr Rcpp stringr]; };
   strucchange = derive2 { name="strucchange"; version="1.5-1"; sha256="0cdgvl6kphm2i59bmnppn1y3kv65ml111bk7yzpcx7vv8wh2w3kl"; depends=[sandwich zoo]; };
   structSSI = derive2 { name="structSSI"; version="1.1.1"; sha256="06rwmrgqc4qy4x0bhlshjdsjxfmp5fr9d1wjglhlb1gbp72fmkdv"; depends=[ggplot2 igraph multtest reshape2 rjson]; };
-  structree = derive2 { name="structree"; version="1.1.5"; sha256="0m14jzhmkfn8dpxjzj8xh9zf6cggqj3awnfz7zh1xlkkka91jz8d"; depends=[lme4 mgcv penalized]; };
+  structree = derive2 { name="structree"; version="1.1.6"; sha256="0d3ww07grprp908i3h1xaz3jw92g0g0s3gjdnb63wl10yqqsq2vj"; depends=[lme4 mgcv penalized]; };
   strum = derive2 { name="strum"; version="0.6.2"; sha256="0f5cb7cfvqhmnv4sjfr58lns4fclmr8iyka595zddy9f6dv5rqp1"; depends=[graph MASS Matrix pedigree Rcpp RcppArmadillo Rgraphviz]; };
   strvalidator = derive2 { name="strvalidator"; version="2.2.0"; sha256="0pfc6bj5sdik6a3qxsxshd6n3jp27kzap3hp6zlldknwybsavrl3"; depends=[data_table ggplot2 gridExtra gtable gWidgets2 gWidgets2tcltk MASS plyr scales]; };
   stsm = derive2 { name="stsm"; version="1.9"; sha256="18ypmkd7l7m7qkahb0nqf8f1m8g4irxlw48v2ms0dq1bsnhbzx7j"; depends=[KFKSDS]; };
   stsm_class = derive2 { name="stsm.class"; version="1.3"; sha256="19jrja5ff31gh5k2zqhqsyd7w2ivr4s6bkliash6x8fmd22h5zs8"; depends=[]; };
-  stuart = derive2 { name="stuart"; version="0.7.3"; sha256="0xd85ijshhsyzkm22vacjl2p7ni8x3zfypmrwmvvba5x9l82s3hi"; depends=[]; };
+  stuart = derive2 { name="stuart"; version="0.8.0"; sha256="1hcb1jybra0cpibxc1k31nr6xciwd2chxjfdnir4kfzxn2bd2cxd"; depends=[]; };
   stubthat = derive2 { name="stubthat"; version="1.2.1"; sha256="130naxzvswcyadwcgldvwnxxdxbfwx5vljac7901vn3ahjp75d8z"; depends=[testthat]; };
   studentlife = derive2 { name="studentlife"; version="1.0.0"; sha256="1snrsaapjwvcifa91hg5xcbg7n70aqcdyyq69gg20168qg8abkws"; depends=[crayon dplyr ggplot2 jsonlite purrr R_utils readr skimr tibble tidyr visdat]; };
   styler = derive2 { name="styler"; version="1.1.1"; sha256="1k660lpjvd64gnf6bndcb1cq3qxsvik928kcn6271zmkhja5rgyb"; depends=[backports cli magrittr purrr rematch2 rlang rprojroot tibble withr xfun]; };
@@ -13562,14 +13835,14 @@ in with self; {
   subspace = derive2 { name="subspace"; version="1.0.4"; sha256="0p2j0lnwj3ym1v4xla6r97zjikb8alnibdc690xn9c0z21hmv43v"; depends=[colorspace ggvis rJava stringr]; };
   subtee = derive2 { name="subtee"; version="0.3-5"; sha256="14pvfghsd17n9qkznik4vdalqfv5ykgqrhk2g33idl8chi9q7jjn"; depends=[ggplot2 MASS matrixStats survival]; };
   subtype = derive2 { name="subtype"; version="1.0"; sha256="1094q46j0njkkqv09slliclp3jf8hkg4147hmisggy433xwd19xh"; depends=[penalized ROCR]; };
-  suddengains = derive2 { name="suddengains"; version="0.2.1"; sha256="0s6g3z6drysza9jbg1lhdw933lbmnq9iliw9ryjwrzx4yl2df310"; depends=[dplyr ggplot2 ggrepel magrittr psych readr rlang stringr tibble tidyr]; };
+  suddengains = derive2 { name="suddengains"; version="0.3.1"; sha256="0l9dfgf07myi7sgz8xrgh93kzl2am0v3h6fbm3r9wmn63q2kqiml"; depends=[dplyr ggplot2 ggrepel magrittr psych readr rlang stringr tibble tidyr]; };
   sudoku = derive2 { name="sudoku"; version="2.6"; sha256="13j7m06m38s654wn75kbbrin5nqda4faiawlsharxgrljcibcbrk"; depends=[]; };
   sudokuAlt = derive2 { name="sudokuAlt"; version="0.2-0"; sha256="0d530hb4d8i0qziw5iaf5r5c46c9d9ns7n5c1kcb3ffw2c1xi1pl"; depends=[magrittr]; };
-  sugarbag = derive2 { name="sugarbag"; version="0.1.0"; sha256="0iryilbnnb7kiqxbjsaxmycamcc9v5zdqrdkqvi6wygf5kqq9fyl"; depends=[dplyr geosphere purrr rlang rmapshaper sf tibble tidyr]; };
+  sugarbag = derive2 { name="sugarbag"; version="0.1.1"; sha256="1wldsqfgw8mqhwikgaasrz7qrnpj51f0kwi9i7v6hil756y5bhjv"; depends=[dplyr geosphere purrr rlang rmapshaper sf tibble tidyr]; };
   sugrrants = derive2 { name="sugrrants"; version="0.2.4"; sha256="04qfa3falpkbdnjks5vd0izjpp5pmc3wf4bkv0ha89ya556306jv"; depends=[dplyr ggplot2 gtable lubridate rlang]; };
   sumFREGAT = derive2 { name="sumFREGAT"; version="1.1.0"; sha256="1ycdnf5ghrv3czi4lh5yc8n8690m3b8i85s46k7lya2k0rasvac4"; depends=[GBJ Matrix seqminer]; };
   summariser = derive2 { name="summariser"; version="0.1.0"; sha256="0a6wyb0r1i0cynld002q96ylr58jz76n5jqjz8gm6a3csjn9qss7"; depends=[dplyr ggplot2 lazyeval plotrix]; };
-  summarytools = derive2 { name="summarytools"; version="0.9.3"; sha256="1wfbkgvicaic37zgpr6zcm4a58yx43p59h0sqggdj44ncqs7147f"; depends=[checkmate dplyr htmltools lubridate magick matrixStats pander pryr rapportools RCurl tibble tidyr]; };
+  summarytools = derive2 { name="summarytools"; version="0.9.4"; sha256="1n695baz56mg4f13xjjadfq0xalw5xsn6xicil0yap5hgi8fsr3a"; depends=[checkmate dplyr htmltools lubridate magick matrixStats pander pryr rapportools RCurl tibble tidyr]; };
   sunburstR = derive2 { name="sunburstR"; version="2.1.1"; sha256="0r46ca3pvnvak7dqslbn64dg8h6d50nlhh0wrsxi8vcwgsycaf6y"; depends=[d3r dplyr htmltools htmlwidgets]; };
   suncalc = derive2 { name="suncalc"; version="0.5.0"; sha256="1chkl297km313m89h9mbp7vnpz188fhzz5dn8x5cjkqy0mm6c0qc"; depends=[data_table lubridate magrittr]; };
   sundialr = derive2 { name="sundialr"; version="0.1.3"; sha256="1bpqfxbg187g113nzsgk5pnfw9ldg9v7x52frrw8wjjs8b3c0v8z"; depends=[Rcpp]; };
@@ -13581,13 +13854,14 @@ in with self; {
   superdiag = derive2 { name="superdiag"; version="1.1"; sha256="0pa3mv74riabpm7j4587zww2364fszzlw48ijj1apcgz8y6pyqbw"; depends=[boa coda]; };
   superheat = derive2 { name="superheat"; version="0.1.0"; sha256="01v8s6px1k5fajlm6py3ksr1i853kwwlky1yryzhy3p1cxhwgg83"; depends=[dplyr ggdendro ggplot2 gtable magrittr plyr scales]; };
   superml = derive2 { name="superml"; version="0.4.0"; sha256="0lq2mjlapihnz8pfb8y3zzv460pdplkyh0dbsm7cdhr01shwz4n9"; depends=[assertthat data_table doParallel Metrics R6]; };
-  supernova = derive2 { name="supernova"; version="2.0.0"; sha256="0nj7r0nqqhhi6hlwx4c6i57n26gbc4csml58spvmbnsbypbvc7c9"; depends=[]; };
+  supernova = derive2 { name="supernova"; version="2.1.1"; sha256="1vjx0mfnqksgvcgn8hfvpx8j3q8791yifdsaqjqkhc7h56r9gcc5"; depends=[magrittr stringr]; };
   superpc = derive2 { name="superpc"; version="1.09"; sha256="1p3xlg2n7p57n54g2w4frfrng5vjh97kp6ax4mrgvj3pqmd1m69z"; depends=[survival]; };
   supervisedPRIM = derive2 { name="supervisedPRIM"; version="2.0.0"; sha256="1j5gsy119pvrhkkg048lyk6hjvn9x1bhmfy5g824gj3k1w5slrib"; depends=[prim]; };
   suppdata = derive2 { name="suppdata"; version="1.1-1"; sha256="1sysd5w59y9hkm1ab8m9i1d976dv6cxchssc86s27bsibhsj2blc"; depends=[httr jsonlite rcrossref xml2]; };
   support = derive2 { name="support"; version="0.1.4"; sha256="1yahhb9l2f3129av4cj4q77q1s0nfszzd6z7dqkfpnjvvk8gzdq7"; depends=[BH MHadaptive randtoolbox Rcpp RcppArmadillo]; };
   support_BWS = derive2 { name="support.BWS"; version="0.2-0"; sha256="1yfjpr9v9zsbkysm3r6zk9r0a072g038lmj9wk4014a3rk9kmm80"; depends=[]; };
   support_BWS2 = derive2 { name="support.BWS2"; version="0.2-2"; sha256="1pykq297gz42n6scl5s6zjy33wjvcb5590vcrgysdigf3hqb22ra"; depends=[]; };
+  support_BWS3 = derive2 { name="support.BWS3"; version="0.1-1"; sha256="1pzgc98har44kylrg04669lmmfn10pb3km5598p163nzh5s4ymgg"; depends=[]; };
   support_CEs = derive2 { name="support.CEs"; version="0.4-1"; sha256="1rbyl7v6m07dsp08kkk9020bh39rhx89q7d05rc5kxb6f7y66jyz"; depends=[DoE_base MASS RCurl simex XML]; };
   supportInt = derive2 { name="supportInt"; version="1.1"; sha256="14fh75sds05c06xkcfbijd8my3sa9kpnczzh96xx0gwj1193yya9"; depends=[ProfileLikelihood]; };
   sure = derive2 { name="sure"; version="0.2.0"; sha256="0gwr2j321i2vq98rin5b1m4sl123dm1nih1ghcmj0zd1wd6x5x54"; depends=[ggplot2 goftest gridExtra]; };
@@ -13606,12 +13880,12 @@ in with self; {
   survJamda = derive2 { name="survJamda"; version="1.1.4"; sha256="14ly1g548ysm8jgsyrhj12zmd6i2lca7rsgby3jbwikyqyk1mx5q"; depends=[ecodist survcomp survival survivalROC survJamda_data]; };
   survJamda_data = derive2 { name="survJamda.data"; version="1.0.2"; sha256="0a010v2ar48i5m0jiqjvdyqm93ckfgfmcmym9a02h0rclnizd75r"; depends=[]; };
   survMisc = derive2 { name="survMisc"; version="0.5.5"; sha256="00nvvl8gz4477ab24rd0xvfksm8msv8h021b9ld5c9cizc41n2bm"; depends=[data_table ggplot2 gridExtra km_ci KMsurv knitr survival xtable zoo]; };
-  survPen = derive2 { name="survPen"; version="1.1.0"; sha256="1chmpwld48cwygrg4rm6c6771pa7nb2x1a9v90ysa0jlmw156fhr"; depends=[statmod]; };
+  survPen = derive2 { name="survPen"; version="1.2.0"; sha256="0x030p6ihw769mjwjxzprmv3nbza0564mh1zfymwn8s94v86ybkl"; depends=[statmod]; };
   survPresmooth = derive2 { name="survPresmooth"; version="1.1-10"; sha256="0m1037v857g140lypck5zq2zf52rkdxzaqlj9kjn7h7lp6gif6ia"; depends=[]; };
   survRM2 = derive2 { name="survRM2"; version="1.0-2"; sha256="0pvp65c1kkbkcci4l3cvq4a5krmv58jwb9abz5225ql6jyawzlsw"; depends=[survival]; };
   survRM2adapt = derive2 { name="survRM2adapt"; version="1.0-1"; sha256="1r3jvjbc2sb7b00s95b3sdx4d99rmrnd573fx1n4914ydiggi9nn"; depends=[survival]; };
   survSNP = derive2 { name="survSNP"; version="0.24"; sha256="0mzwcp8zfqvsiapa446si9qb6wyymnw5zj6acj6f2cfjpyi76k4w"; depends=[foreach lattice Rcpp survival xtable]; };
-  surveillance = derive2 { name="surveillance"; version="1.17.0"; sha256="0c1y9c850kjwpjanynd67s2lx8iv2jgg7ryf1323yqp7jr66idri"; depends=[MASS Matrix nlme polyCub Rcpp sp spatstat xtable]; };
+  surveillance = derive2 { name="surveillance"; version="1.17.1"; sha256="0fz37ah1ljylmn0sycc2pr1sp757c8iwrm6ijcsj21rzxxyajind"; depends=[MASS Matrix nlme polyCub Rcpp sp spatstat xtable]; };
   survexp_fr = derive2 { name="survexp.fr"; version="1.0"; sha256="12rjpnih0xld4dg5gl7gwxdxmrdmyzsymm7j05v98ynldd1jkjl8"; depends=[survival]; };
   survey = derive2 { name="survey"; version="3.36"; sha256="0xclsy4ram4k48vzh5m5bpmknnpwxnss85v73s4czsjj5ffjxwwh"; depends=[lattice Matrix minqa mitools numDeriv survival]; };
   surveybootstrap = derive2 { name="surveybootstrap"; version="0.0.1"; sha256="13rp6gj1dgdzcjbi2403pldygp1dyqx8zj0r1nvyghpi06x5gpb7"; depends=[dplyr functional plyr Rcpp RcppArmadillo stringr]; };
@@ -13627,7 +13901,7 @@ in with self; {
   survivalMPL = derive2 { name="survivalMPL"; version="0.2"; sha256="05bfa9fx841kh9g2jcs1dimsxkjnf4bxgamcnjpisx3a644c1gkn"; depends=[MASS survival]; };
   survivalROC = derive2 { name="survivalROC"; version="1.0.3"; sha256="0wnd65ff5w679hxa1zrpfrx9qg47q21pjxppsga6m3h4iq1yfj8l"; depends=[]; };
   survivalsvm = derive2 { name="survivalsvm"; version="0.0.5"; sha256="1b4hrdrqq1z0kfn8vpdwg54388m25df2s6w9i574x3mkxkmkjkga"; depends=[Hmisc kernlab Matrix pracma quadprog survival]; };
-  survminer = derive2 { name="survminer"; version="0.4.5"; sha256="03dx3wb2s5yl617sgxb7x002wf0mgdz29c4jhgp260wvibh0b3rm"; depends=[broom dplyr ggplot2 ggpubr gridExtra magrittr maxstat purrr scales survival survMisc tibble tidyr]; };
+  survminer = derive2 { name="survminer"; version="0.4.6"; sha256="0c5q5pp78wsv00rrbhbfl1yrdng8n7z1mgqlrqzgb0pswlvv2w3z"; depends=[broom dplyr ggplot2 ggpubr gridExtra magrittr maxstat purrr scales survival survMisc tibble tidyr]; };
   survsim = derive2 { name="survsim"; version="1.1.5"; sha256="0194w1h3v4p546wibp3xyhy2r84w3p9r6ggzhlf11v8467mjy0l9"; depends=[eha statmod]; };
   survsup = derive2 { name="survsup"; version="0.0.2"; sha256="0q41hn8iqib2w6gkz2mll4h46vr9ca25jrg0g5jr9wgrzsnf5jci"; depends=[broom colorspace dplyr ggplot2 gridExtra survival]; };
   survtmle = derive2 { name="survtmle"; version="1.1.1"; sha256="1l13rvwq4915ij2a55fxdj3b3wkgjca1fbqzcgkjlpzkcn97k1nj"; depends=[dplyr ggplot2 ggsci Matrix plyr speedglm stringr SuperLearner tidyr]; };
@@ -13647,9 +13921,9 @@ in with self; {
   svUnit = derive2 { name="svUnit"; version="0.7-12"; sha256="16iiryj3v34zbnk1x05g30paza7al1frqx52fkw8ka61icizsrf5"; depends=[]; };
   svWidgets = derive2 { name="svWidgets"; version="0.9-45"; sha256="08cpsy4abypjnv33arsgxk5i0gpdvdzj60wa1b22ca1n7d35mc80"; depends=[svMisc]; };
   svapls = derive2 { name="svapls"; version="1.4"; sha256="12gk8wrgp556phdv89jqza22zmsnachsydr5vlz38s664d2lplbg"; depends=[class pls]; };
-  svars = derive2 { name="svars"; version="1.3.1"; sha256="15lmgf1q6cd987f56nf3r8z4mmwjyfs5s9avav8jl7d1l73rzhiw"; depends=[clue copula DEoptim expm ggplot2 pbapply Rcpp RcppArmadillo reshape2 steadyICA strucchange tsDyn vars zoo]; };
+  svars = derive2 { name="svars"; version="1.3.2"; sha256="160y7i39rsqqccv6j13kdjcf4ma81ca2iirq2vqj45gxyf62m9l6"; depends=[clue copula DEoptim expm ggplot2 pbapply Rcpp RcppArmadillo reshape2 steadyICA strucchange tsDyn vars zoo]; };
   svcm = derive2 { name="svcm"; version="0.1.2"; sha256="1lkik65md8xdxzkmi990dvmbkc6zwkyxv8maypv2vbi2x534jkhl"; depends=[Matrix]; };
-  svd = derive2 { name="svd"; version="0.4.3"; sha256="0wlvzqak6fng6v5473hyphrfxrfc2apw5f3fgvg7bz2fj6nzcry4"; depends=[]; };
+  svd = derive2 { name="svd"; version="0.5"; sha256="18bi42pgml9i8jflfk29ws0bfblkj3f69z9p9mkd0m8kcx4d8hnh"; depends=[]; };
   svdvisual = derive2 { name="svdvisual"; version="1.1"; sha256="02mzh2cy4jzb62fd4m1iyq499fzwar99p12pyanbdnmqlx206mc2"; depends=[lattice]; };
   svenssonm = derive2 { name="svenssonm"; version="0.1.0"; sha256="0pvay9vfrcafaq270pq6glp2b74zdfgldksl13cwdb0wk7qx7731"; depends=[]; };
   svgPanZoom = derive2 { name="svgPanZoom"; version="0.3.3"; sha256="09gfa2943bvmjpnhnc2nr85wddkv662k30pxsqvvvq1va64rzpkc"; depends=[htmlwidgets]; };
@@ -13662,7 +13936,7 @@ in with self; {
   svs = derive2 { name="svs"; version="1.1.0"; sha256="0575msaxg04ck76mbr815m29y895qvg8b9qg4y0ggv6b1lvwp5p6"; depends=[gtools]; };
   svyPVpack = derive2 { name="svyPVpack"; version="0.1-1"; sha256="15k5ziy2ng853jxl66wjr27lzc90l6i5qr08q8xgcs359vn02pmp"; depends=[survey]; };
   svydiags = derive2 { name="svydiags"; version="0.3"; sha256="0xgizswdqs8cjac200sqv3ygvrnbcy74h92kgx4r6nv1fhlcljl3"; depends=[MASS Matrix survey]; };
-  swCRTdesign = derive2 { name="swCRTdesign"; version="2.2"; sha256="0kggniy5p900cj074swh7g47zf8bhwjmqph9b5frw86nycxwyn3v"; depends=[]; };
+  swCRTdesign = derive2 { name="swCRTdesign"; version="3.0"; sha256="053d7dhdhv61j30rdl6s0h0sfh28hjzljhj6d4n5sydhn0g2137x"; depends=[]; };
   swa = derive2 { name="swa"; version="0.8.1"; sha256="1zy1a6c17vmdkmkwp8vv3niww2zs1m0hylsa0b2cz68vfhnmpim4"; depends=[ggplot2 reshape ROCR]; };
   swagger = derive2 { name="swagger"; version="3.9.2"; sha256="13scbzv65qzxh7kfwlb2k47zgvv7fz085g5lki6zr5w6a33g45q9"; depends=[]; };
   swamp = derive2 { name="swamp"; version="1.4.1"; sha256="01w44d7rqh6q9wpapd3g7rzllhbm2brwilmna9vk2dwqx57jyim6"; depends=[amap gplots impute MASS]; };
@@ -13671,12 +13945,13 @@ in with self; {
   swdft = derive2 { name="swdft"; version="1.0.0"; sha256="0529rw8nsl48hwiy741alvrzg5d5q1nhnjshrsfwchm5kdv0igva"; depends=[]; };
   sweep = derive2 { name="sweep"; version="0.2.1.1"; sha256="0hfvgvzr5mh9niwpsr9jcly426dz457afrg4q5w13ahsasx7c9jg"; depends=[broom devtools dplyr forecast lazyeval lubridate tibble tidyr timetk]; };
   sweidnumbr = derive2 { name="sweidnumbr"; version="1.4.1"; sha256="014zbp6a66gv7b0f2gmzvifllz266zrc14ihawksvyp1mcxz2ipg"; depends=[lubridate stringr]; };
-  swephR = derive2 { name="swephR"; version="0.2.1"; sha256="0vrhgkz3bafkb6a46g5dx5qyh52ind5fwch0lbn7dnhwibdy209a"; depends=[Rcpp]; };
+  swephR = derive2 { name="swephR"; version="0.3.0"; sha256="0fk5wih3i5vpkcc9y1n30xwc1hyqgfgnad9jkdgdx0m31pn1y9j5"; depends=[Rcpp]; };
   swfscMisc = derive2 { name="swfscMisc"; version="1.2"; sha256="08p2crsx8zi6qprs14mhdyq9x5sjlp3a46c1zzvp6741an4fy640"; depends=[ggplot2 mapdata maps reshape2 spatstat]; };
   swgee = derive2 { name="swgee"; version="1.4"; sha256="1a6zr4nkpj52b0rk01qbwzi8y0c798wlxzw69wyyv576k148rgfq"; depends=[gee geepack mvtnorm]; };
   swirl = derive2 { name="swirl"; version="2.4.4"; sha256="1pw0p72gkrv1cy4ck3jfv2j00qzlm44gk61vxl7zn0jb2yrd913r"; depends=[digest httr RCurl stringr testthat yaml]; };
   swirlify = derive2 { name="swirlify"; version="0.5.3"; sha256="1bpg6yz2adgspjlwsf2q83j1bq0iyvp9938smgc41861nsclngwr"; depends=[base64enc readr rmarkdown shiny shinyAce stringr swirl whisker yaml]; };
   swissMrP = derive2 { name="swissMrP"; version="0.62"; sha256="1vy6h6c4v49zlsli77ilj4df8cfh67rqmki71v6j1aqw6kf3b649"; depends=[arm blme lme4 maptools sp]; };
+  swissdd = derive2 { name="swissdd"; version="1.0.1"; sha256="101na2c5bzsg4glyss8cj34ihly3yih4n05qbwsm2n5qbda63yxd"; depends=[curl dplyr jsonlite magrittr purrr tibble tidyr]; };
   switchnpreg = derive2 { name="switchnpreg"; version="0.8-0"; sha256="1vaanz01vd62ds2g2xv4kjlnvp13h59n8yqikwx07293ixd4qhpw"; depends=[expm fda HiddenMarkov MASS]; };
   switchr = derive2 { name="switchr"; version="0.13.5"; sha256="11y9f8h5qkaykkdk5ya1z8dyw98z5svny56hx0q2b1z2f0iszwc3"; depends=[RCurl RJSONIO]; };
   switchrGist = derive2 { name="switchrGist"; version="0.2.4"; sha256="137kz944qqqrislbm6anknw6n303j441mfhfcrzh33xcb19z320v"; depends=[gistr httpuv RJSONIO switchr]; };
@@ -13691,8 +13966,9 @@ in with self; {
   sylly_en = derive2 { name="sylly.en"; version="0.1-3"; sha256="0jw48qin172vv7skcpvcpi9wzgav5l9afzb09hhgcxvivbz6dl93"; depends=[sylly]; };
   sym_arma = derive2 { name="sym.arma"; version="1.0"; sha256="13fhmgzd50mwlnz9m6nnn4arr4jdqf5h7dgli5lk08da9wx6cy69"; depends=[]; };
   symDMatrix = derive2 { name="symDMatrix"; version="2.0.2"; sha256="1lf0yhid47107c2vnr4g7xz4hrjb2cgr5zpgik4xf5gypli6xh6x"; depends=[bit ff LinkedMatrix]; };
-  symbolicDA = derive2 { name="symbolicDA"; version="0.6-1"; sha256="0daac2ncfxfj07h1bdbgdc6l29cwa5hwi65wx1zgrycj1zp79a2x"; depends=[ade4 cluster clusterSim e1071 rgl RSDA shapes XML]; };
+  symbolicDA = derive2 { name="symbolicDA"; version="0.6-2"; sha256="0fd36dndzs0n0xwz38px5182gc6ng174n433rgch1s1g6bh8dn4s"; depends=[ade4 cluster clusterSim e1071 rgl RSDA shapes XML]; };
   symbols = derive2 { name="symbols"; version="1.1"; sha256="1234rx3divhg60p0h0zn11viqn51fm6b8876m6rip2i6z8vrg319"; depends=[shape]; };
+  symmetry = derive2 { name="symmetry"; version="0.1.1"; sha256="1f4l058sdrdg7jl1rklyd0a3ik9lnnsf2imgaymr56iaxn7y0m79"; depends=[Rcpp RcppArmadillo Rdpack]; };
   symmoments = derive2 { name="symmoments"; version="1.2"; sha256="074k0285c0yri39zags420kjls6kjlvlhymg3r7y24h42zdy82d4"; depends=[combinat cubature multipol mvtnorm]; };
   synRNASeqNet = derive2 { name="synRNASeqNet"; version="1.0"; sha256="05ncwbv8kvvhqqrxa8qq7s0jc6krs5a56ph04z50iwgd91rzyi7x"; depends=[GenKern igraph KernSmooth parmigene]; };
   synbreed = derive2 { name="synbreed"; version="0.12-9"; sha256="0h85z9bhzgsr783qx3zjqyi461a0q52wbqifwm3gc1kapl5irxhd"; depends=[abind BGLR doBy doParallel foreach igraph lattice LDheatmap MASS qtl regress]; };
@@ -13704,7 +13980,7 @@ in with self; {
   syntaxr = derive2 { name="syntaxr"; version="0.8.0"; sha256="1iik9b3x9jx7w31j7hyi3sixg30l5a6w40svhqj1xlchsk60yykn"; depends=[magrittr]; };
   synthACS = derive2 { name="synthACS"; version="1.5.2"; sha256="1y9kvp4fq1602c9876jc8102iidxzqkqsh89ix3m5qf63ldx071f"; depends=[acs data_table Rcpp]; };
   synthpop = derive2 { name="synthpop"; version="1.5-1"; sha256="0cd9g0aa4598l3gyqpywalmkmvibhqkxhkm2qkln11rkwv12lcyv"; depends=[classInt foreign ggplot2 lattice MASS mipfp nnet party plyr polspline proto randomForest rpart]; };
-  sys = derive2 { name="sys"; version="3.2"; sha256="1k5vk5q9wa5sin0n226i05nymg469s24f6lx64yyhb7yc624j698"; depends=[]; };
+  sys = derive2 { name="sys"; version="3.3"; sha256="14wvy46i2iz9jn7lj3cvifmps932s3395wq681hniva0f8m7q8d6"; depends=[]; };
   sysfonts = derive2 { name="sysfonts"; version="0.8"; sha256="0wng902plryf2d8fc7k7m3jx11acz51kb2d91cqbyhq7xpk06z43"; depends=[]; };
   sysid = derive2 { name="sysid"; version="1.0.4"; sha256="0fr9gf5yjin3zvz850z4r4pqc1r4mwx8d46sl64i4csdm9qnqagy"; depends=[bitops ggplot2 polynom reshape2 signal tframe zoo]; };
   systemfit = derive2 { name="systemfit"; version="1.1-22"; sha256="19nmhidnzyk2wcwi5v28n9lkvylfw4in63vg5naqlk3w4fbwm2wb"; depends=[car lmtest MASS Matrix sandwich]; };
@@ -13716,8 +13992,9 @@ in with self; {
   taRifx = derive2 { name="taRifx"; version="1.0.6.1"; sha256="1qnp2562irhb516jfapmpg4260172ckc8jc3vxfkjsj7dnr35j6l"; depends=[plyr reshape2]; };
   tab = derive2 { name="tab"; version="4.1.1"; sha256="0ds8n6gncidb66in7hlqkcmil5yfsf7ihqvmls789hrm2iz9xlfm"; depends=[dplyr gee knitr MASS survey survival xtable]; };
   taber = derive2 { name="taber"; version="0.1.0"; sha256="07a18kn65b4cxxf1z568n7adp6y3qx96nrff3a3714x241sd5p6i"; depends=[dplyr magrittr]; };
+  tabit = derive2 { name="tabit"; version="0.1.1"; sha256="0fk670ws7df77sxf89kp8h608z5400gaia79zj3w9jv3jmfyj1i0"; depends=[]; };
   tablaxlsx = derive2 { name="tablaxlsx"; version="1.2.2"; sha256="1q7ap1dmymf3aj5g860794jfn9zrn3qiwwcdzl95lsbpkhgyspmz"; depends=[openxlsx]; };
-  table_express = derive2 { name="table.express"; version="0.3.0"; sha256="0yrvq0psf6j11cbyhbk3aqskxqm3v9a9dkakmknmynzx4zp6p9fv"; depends=[data_table dplyr magrittr R6 rlang tidyselect]; };
+  table_express = derive2 { name="table.express"; version="0.3.1"; sha256="00f5xi2dkx1h0mv8ld3ds15w30d9vgvmjrldg43z7zskprshqsxx"; depends=[data_table dplyr magrittr R6 rlang tidyselect]; };
   table1 = derive2 { name="table1"; version="1.1"; sha256="01r6zlhv3d0ggniv6aaszmzqbappy9zycayiwwlknbwrgiwkp58z"; depends=[Formula htmltools knitr]; };
   table1xls = derive2 { name="table1xls"; version="0.4.0"; sha256="0ixbshbp9hkcg12hj32vgb5bp0pj4rbc3i6g1xdg2zhqp7zanics"; depends=[XLConnect]; };
   tableHTML = derive2 { name="tableHTML"; version="2.0.0"; sha256="19sa5sda4v5dr449ip9z9ah5hdph9q6vb6zbs93jn4rpkvyijny3"; depends=[htmltools jpeg magrittr png shiny webshot]; };
@@ -13727,13 +14004,14 @@ in with self; {
   tablerDash = derive2 { name="tablerDash"; version="0.1.0"; sha256="1mnp6lxa7d669r325aynq1n3f35r9sy4v1fvdh4cymbf33s8mkmm"; depends=[htmltools knitr shiny]; };
   tables = derive2 { name="tables"; version="0.8.8"; sha256="1cgfwrnmgi1jhv9kj918mv0ib75hvprqjg0nb7ppih73kqpaw5m2"; depends=[Hmisc knitr]; };
   tableschema_r = derive2 { name="tableschema.r"; version="1.1.0"; sha256="0ny683p9kaidj5bayz77hyvsaqg3jk87pb95271znk8hzhl2jlcj"; depends=[config future httr iterators jsonlite jsonvalidate lubridate purrr R6 RCurl rlist stringr urltools]; };
-  tabplot = derive2 { name="tabplot"; version="1.3-2"; sha256="0rhj4gz1w1291w4kjh7y71qqm54iavmna70b3gn7zql444wmk59r"; depends=[bit ff ffbase]; };
+  tabplot = derive2 { name="tabplot"; version="1.3-3"; sha256="0gv27igixcy5vqrk71ckyhlk4yhcprm8r2a2l0lgmn4rbsm20c6h"; depends=[bit ff ffbase]; };
   tabr = derive2 { name="tabr"; version="0.3.0"; sha256="0723yzjnv30bfs4v7ircn17hhpjx0w1hzls6bcqc3xi3awqzkbg3"; depends=[crayon dplyr ggplot2 magrittr purrr]; };
   tabuSearch = derive2 { name="tabuSearch"; version="1.1.1"; sha256="0396a8hla508na1hmyyhfbl8w10dbg810cln2xyhhvxi7rr223dj"; depends=[]; };
-  tabula = derive2 { name="tabula"; version="1.2.0"; sha256="14zbm46ass0whd9pihy7rvivbc2asd10davhwy5fvb76k9n371w2"; depends=[dplyr FactoMineR ggplot2 magrittr plyr rlang tidyr]; };
+  tabula = derive2 { name="tabula"; version="1.3.0"; sha256="12fqkqky2amg9lzm7q1dc7j2i71cbm1mdpzgfkyjwgjkv87b896k"; depends=[ca ggplot2 rlang]; };
   tabularaster = derive2 { name="tabularaster"; version="0.5.0"; sha256="0cqax6hq0pbxmqls3cs21cc86662wdzjyx4lkxw42dbw4v13f728"; depends=[dplyr fasterize gibble magrittr raster rlang sp spatstat spbabel spex tibble viridis]; };
   tabulizer = derive2 { name="tabulizer"; version="0.2.2"; sha256="0zd5cfqwgirqchw1mvziscxvzl8pb1y6rbfywkn9i9pxfydkm5vi"; depends=[png rJava tabulizerjars]; };
   tabulizerjars = derive2 { name="tabulizerjars"; version="1.0.1"; sha256="005n2gyzzmq8h0mpj8xs6ri6llzwag7nqzpm4vnzp81vwy8kmf92"; depends=[rJava]; };
+  tabulog = derive2 { name="tabulog"; version="0.1.1"; sha256="0n6qjd7kmvxx5na71f358pw3bbwa69vh8qjkrs5mkb3izxabcq67"; depends=[yaml]; };
   tacmagic = derive2 { name="tacmagic"; version="0.3.0"; sha256="114qxi2ks5v8p7lr2i7fn1wi5lwzw1dpvbbg515gc8yplccpxwny"; depends=[pracma R_matlab]; };
   tactile = derive2 { name="tactile"; version="0.2.0"; sha256="0jjfbsadxbf9s6vzi82rw5qa6hdc8iz4jci9xpbzwrjkb90dzd08"; depends=[gridExtra lattice latticeExtra MASS RColorBrewer]; };
   tadaatoolbox = derive2 { name="tadaatoolbox"; version="0.16.1"; sha256="0xqvg73l00kskgg7ipcc19rvi9n5ylwnaph5g5x8iwgim5dhcb9s"; depends=[broom car DescTools ggplot2 magrittr nortest pixiedust pwr viridis]; };
@@ -13745,7 +14023,8 @@ in with self; {
   takos = derive2 { name="takos"; version="0.1.0"; sha256="0a26jmxccpyk36sah9nz7pqpkc1rd9kbwrvwh0r0zp7lwvxbjb8w"; depends=[baseline broom colorRamps data_table devEMF MASS minpack_lm pracma segmented sfsmisc smoother]; };
   tanaka = derive2 { name="tanaka"; version="0.1.0"; sha256="1j0xjklwrlzrh0078bk34qzk2fvv0fb3r2rak571hkm3xpl2g5zn"; depends=[isoband lwgeom raster sf]; };
   tangram = derive2 { name="tangram"; version="0.4"; sha256="1yj5vwc8jkiic4zjag9k7w3j6dibqw5zsi78q6gssshsi9z0zbgy"; depends=[base64enc digest htmltools magrittr R6 stringi stringr]; };
-  tapkee = derive2 { name="tapkee"; version="1.0"; sha256="0cd1zkyhrfn33hhy6kdqwnmrs31d9b20750zgq0zm4c68qsnz506"; depends=[]; };
+  tapkee = derive2 { name="tapkee"; version="1.1"; sha256="1s8710m4drhnycfv27bv1w7vqc99dvbcn8zxkahq0lrsx7q8i5mz"; depends=[]; };
+  tashu = derive2 { name="tashu"; version="0.1.0"; sha256="04xvmbcwi84zg1pqw21nmrbnkyx184wc200vl1vhmwxggq1i60np"; depends=[dplyr drat ggplot2 lubridate plyr randomForest RColorBrewer reshape2]; };
   tatest = derive2 { name="tatest"; version="1.0"; sha256="1yd9pdpdhxwpllnj5wxa7ly29qiw8qywx9lx0w3nizczlx35fgjy"; depends=[]; };
   tatoo = derive2 { name="tatoo"; version="1.1.1"; sha256="0w9rm6cnc1mpfyklb8njzjwph2c38niinzxiflrqjqfdp7nd8281"; depends=[assertthat colt crayon data_table magrittr openxlsx stringi withr]; };
   tau = derive2 { name="tau"; version="0.0-21"; sha256="08wfl0pv865clpcvzmzb3rw3hl76f16n3j61fbmrzi50xf2diyx7"; depends=[]; };
@@ -13766,6 +14045,7 @@ in with self; {
   tbrf = derive2 { name="tbrf"; version="0.1.2"; sha256="03n9s2n5y9d669l78v6s2dbk3sz51g5v28301ng2w082njrsvxhv"; depends=[boot dplyr lubridate purrr rlang tibble tidyr]; };
   tcR = derive2 { name="tcR"; version="2.2.4"; sha256="17g26cq6zpcmg9kv32v0rvyqmml5wkbwra7p8f1cdzyc0zajbvn2"; depends=[data_table dplyr ggplot2 gridExtra gtable igraph Rcpp reshape2 scales stringdist]; };
   tcgsaseq = derive2 { name="tcgsaseq"; version="1.8.1"; sha256="1v5b3qghygb81lqc2h1fijgw856b1778xndppq7r4b0zhhvb81ac"; depends=[CompQuadForm ggplot2 GSA KernSmooth statmod]; };
+  tcl = derive2 { name="tcl"; version="0.1.0"; sha256="1ssqx50ii6j2y5n2nxn5ndp20nrjss0xf0fqp8aiwlgnm3d1zggn"; depends=[eRm lattice MASS Matrix numDeriv]; };
   tcltk2 = derive2 { name="tcltk2"; version="1.2-11"; sha256="1ibxld379600xx7kiqq3fck083s8psry12859980218rnzikl65d"; depends=[]; };
   tclust = derive2 { name="tclust"; version="1.4-1"; sha256="17md6l9v9dl9b72l84df01b52h2xiynbcjm437mv9mzcr09fc2sb"; depends=[]; };
   tcpl = derive2 { name="tcpl"; version="2.0.2"; sha256="0xic4jy8ldawmkvvwckiyy57ai5wif9yn7hyfndbxr6mvjl3rbbc"; depends=[data_table DBI numDeriv RColorBrewer RMySQL sqldf]; };
@@ -13773,7 +14053,7 @@ in with self; {
   tdigest = derive2 { name="tdigest"; version="0.3.0"; sha256="17axsir4xig3vm3sc2gziy9n0p80b14vg52nwys23bzkfp0n63bm"; depends=[magrittr]; };
   tdr = derive2 { name="tdr"; version="0.13"; sha256="0i0hnb3fc4d1mbbxcpzmyfh1w2rahfjabg5iyxym3yjd6377al15"; depends=[ggplot2 lattice RColorBrewer]; };
   tdsc = derive2 { name="tdsc"; version="1.0.0.1"; sha256="17nr5fa4f16ww8si8qikbqmixl38jxjy185b80ff2i5v4129mnwd"; depends=[data_table]; };
-  tdthap = derive2 { name="tdthap"; version="1.1-9"; sha256="0y01x0hcf0rw06cpn4pk17b0shf4v2c9was7vfs0zhsbq8qcwx7r"; depends=[]; };
+  tdthap = derive2 { name="tdthap"; version="1.1-11"; sha256="15qlj2bivvz3pizd8dq34wczbkbxhzqh3cqp1ixkdkprlyvcxj5k"; depends=[]; };
   tea = derive2 { name="tea"; version="1.0"; sha256="03wxhbgx17hl9bbzbfjmfa30q4fqszhs5y9imbp768fmzwbppn24"; depends=[eva]; };
   teachingApps = derive2 { name="teachingApps"; version="1.0.4"; sha256="0wi25wdpkz7kh8r1s42wa9kiky8ilmcg8kgw0j1caygwg0bml2fa"; depends=[actuar BH d3heatmap data_table devtools diagram DiagrammeR dplyr DT dygraphs ggplot2 knitr leaflet magrittr markdown metricsgraphics miniUI networkD3 pacman plotly radarchart Rcpp RcppEigen RcppNumerical rprojroot scales shiny shinyAce shinydashboard shinythemes threejs tidyr visNetwork yaml]; };
   tealeaves = derive2 { name="tealeaves"; version="1.0.0"; sha256="0hzih93h8c9gqvsmfaldq9jaw8hgvd4kmrlqlaqr6xhi6zhjqhf1"; depends=[crayon dplyr furrr future ggplot2 glue magrittr purrr rlang stringr tidyr units]; };
@@ -13795,18 +14075,20 @@ in with self; {
   tensorA = derive2 { name="tensorA"; version="0.36.1"; sha256="176hjy3bvg3in62r97wxbhq187sjz6c1gwy9x6spaxl6k4my3zy7"; depends=[]; };
   tensorBF = derive2 { name="tensorBF"; version="1.0.2"; sha256="1dw1a6xqcsl4isbzbfiplgqq5nak5n9ffzm23mzzmkh1r1a8kl1y"; depends=[tensor]; };
   tensorBSS = derive2 { name="tensorBSS"; version="0.3.5"; sha256="1m4g9jr2s37xys2q4gv6rqknrznd4nrppa7qrgygqywwlmnyid44"; depends=[ggplot2 ICtest JADE Rcpp RcppArmadillo tensor tsBSS]; };
-  tensorflow = derive2 { name="tensorflow"; version="1.14.0"; sha256="0lw1k6s9x975w2nly32vp0157qc8jvmda2i6bpfmvf2xmadq0dr8"; depends=[config jsonlite processx reticulate rstudioapi tfruns yaml]; };
+  tensorflow = derive2 { name="tensorflow"; version="2.0.0"; sha256="1cz0l6blr8wan47lslq4lx0aafk61gjxwm6b3nn8zwgx849nqyr4"; depends=[config jsonlite processx reticulate rstudioapi tfruns yaml]; };
   tensorr = derive2 { name="tensorr"; version="0.1.1"; sha256="18xdvp328h96jn8y1iayxh7cyz2s8j5nn43nq18pyaxq271hkfyh"; depends=[assertive_base assertive_properties assertive_types Matrix purrr]; };
+  tensorsparse = derive2 { name="tensorsparse"; version="1.0"; sha256="1qy6s58nkqq4spg7sapq3jafmxda0mx0j0cqjaj9pd34qqxifglf"; depends=[clues fields glasso glmnet HDCI mvtnorm RColorBrewer reshape rgl rTensor viridis]; };
   tensr = derive2 { name="tensr"; version="1.0.1"; sha256="1z6b3ra7fgn88mxbhsq65x3frj5j7p17n119s9kbw7sg9y633vfx"; depends=[assertthat]; };
   tergm = derive2 { name="tergm"; version="3.6.1"; sha256="03yd4l317airz84jfjyczjx43wi6sraid58lmxivm29xjk52xpi1"; depends=[coda ergm MASS network networkDynamic nlme robustbase statnet_common]; };
   ternvis = derive2 { name="ternvis"; version="1.2"; sha256="057i6i3ygxrin0npc18gsg3dpdldzafyb5sr6lix5mhy6b09lkxf"; depends=[dichromat maps quadprog]; };
   tesseract = derive2 { name="tesseract"; version="4.1"; sha256="1a7cf48n7hdd6inqz23ifqhq6kx6wxri34a79ns2vxaj6f4llxf0"; depends=[curl digest pdftools rappdirs Rcpp]; };
   testDriveR = derive2 { name="testDriveR"; version="0.5.1"; sha256="0wjdqvsyv33fsg1lljp9m0bhz38mpfgpgickgj4zdspc9x6lbnv6"; depends=[]; };
   testassay = derive2 { name="testassay"; version="0.1.0"; sha256="06gks3k04m45kn946i525261v33ymwxpvgdy84kc7sp01xxx4rfv"; depends=[]; };
+  testequavar = derive2 { name="testequavar"; version="0.1.2"; sha256="12qfy53rkrasxphcfmch5bmdlvlybd27jfg3azsi3fg4zk4qgdw2"; depends=[]; };
   tester = derive2 { name="tester"; version="0.1.7"; sha256="1x5m43abk3x3fvb2yrb1xwa7rb4jxl8wjrnkyd899ii1kh8lbimr"; depends=[]; };
   testextra = derive2 { name="testextra"; version="0.1.0"; sha256="0n5d3a4fnqb9bc47sha5zyi18gd9k6hm1jkjlb7apk43zry6n0y8"; depends=[assertthat parsetools pkgcond postlogic purrr rlang stringi testthat]; };
   testforDEP = derive2 { name="testforDEP"; version="0.2.0"; sha256="1mgzhj8b35r5cm4bl0nnyxj0h7rwd28d17qvgvaky2kvm2r83cf9"; depends=[Hmisc minerva Rcpp]; };
-  testit = derive2 { name="testit"; version="0.9"; sha256="0mayvbzfg7zkr9n38h0z9rkzxgpsck5vimfbgm70ww1ckggv7xlw"; depends=[]; };
+  testit = derive2 { name="testit"; version="0.10"; sha256="0jhlqv5qfms4mwhaaicn6c3rlijkyvb5akk0qazb37a0msjns0mh"; depends=[]; };
   testthat = derive2 { name="testthat"; version="2.2.1"; sha256="0y0bvggm4pzkzp6xn7b8cf3ybqp9ijxkhhyp3z49a9iipc90bvk7"; depends=[cli crayon digest evaluate magrittr praise R6 rlang withr]; };
   testthis = derive2 { name="testthis"; version="1.1.0"; sha256="1ci7q25f8lq7mvigdj48gvpi75j08s0kll72kwa88xyfx9q8m3yl"; depends=[assertthat devtools fs magrittr pkgload rprojroot stringi testthat usethis]; };
   tetraclasse = derive2 { name="tetraclasse"; version="0.1.21"; sha256="1cl2cah0xi6x3rvvdy56iszai6rkbxc1w3x13v0l1z1nryff7c6a"; depends=[dplyr FactoMineR ggplot2 ggrepel magrittr reshape2 tibble tidyr]; };
@@ -13818,9 +14100,9 @@ in with self; {
   textTinyR = derive2 { name="textTinyR"; version="1.1.3"; sha256="0z9k978yk54zxrrjajcb0nanfhfpxm2bq2vbmk6w5s194da6y3xl"; depends=[BH data_table Matrix R6 Rcpp RcppArmadillo]; };
   textcat = derive2 { name="textcat"; version="1.0-6"; sha256="0639b1qbi8779lskk5ms0sbbnmy2s73b3w96abbr70mrh0s2f9rw"; depends=[slam tau]; };
   textclean = derive2 { name="textclean"; version="0.9.3"; sha256="0kgjh6c4f14qkjc4fds7q7rpf4nkma3p0igm54fplmm3p853nvrz"; depends=[data_table english glue lexicon mgsub qdapRegex stringi textshape]; };
-  textdata = derive2 { name="textdata"; version="0.2.0"; sha256="1rksgkkwm4il3bw3vg19207r331rs0i3aqcn1x83y9cyvn15y8wm"; depends=[fs rappdirs readr tibble]; };
+  textdata = derive2 { name="textdata"; version="0.3.0"; sha256="0khf3j9hwl5jz3mzwzsmisrqchlf19phl4r3x8sk2cdhkb1qf3ix"; depends=[fs rappdirs readr tibble]; };
   texteffect = derive2 { name="texteffect"; version="0.3"; sha256="1qcbr18h3vakh6ymw4axzqcqrpss6z68a592xl879b82l2nlq8a7"; depends=[boot ggplot2 MASS]; };
-  textfeatures = derive2 { name="textfeatures"; version="0.3.2"; sha256="0k0qcw1r76d3igmphw0kg1ncd26zfqz4hbrhf6s3r0j16i14jlx0"; depends=[dplyr purrr rlang text2vec tfse tibble tokenizers]; };
+  textfeatures = derive2 { name="textfeatures"; version="0.3.3"; sha256="0x67kms7ipsadymc9jwja7wymav8y9kc5sbmp2vw4n4l89n32raa"; depends=[dplyr purrr rlang text2vec tfse tibble tokenizers]; };
   textgRid = derive2 { name="textgRid"; version="1.0.1"; sha256="1wi5vq5f7ixhz39l5hqi2jlmjjacx4lyrs4h8xfbd47pj6g16lc6"; depends=[]; };
   textile = derive2 { name="textile"; version="0.1.2"; sha256="067zli6sl7bp9843spgx47hmw55aq61yinqw1lqifmrpk7b0ywk5"; depends=[]; };
   textir = derive2 { name="textir"; version="2.0-5"; sha256="0ban5qiinlxizqpcgafv4b5gwxlil6jdfarjd6l1m48awxh3mlnb"; depends=[distrom gamlr Matrix]; };
@@ -13829,7 +14111,7 @@ in with self; {
   textometry = derive2 { name="textometry"; version="0.1.4"; sha256="17k3v9r5d5yqgp25bz69pj6sw2j55dxdchq63wljxqkhcwxyy9lh"; depends=[]; };
   textrank = derive2 { name="textrank"; version="0.3.0"; sha256="1sjzllz3ixxr043hbmbvwkwvj5wzh3m08x9z7h6hvy8ld8nzmn74"; depends=[data_table digest igraph]; };
   textreadr = derive2 { name="textreadr"; version="0.9.0"; sha256="04nyjrfxgwq8g3bdj12nnkia2xn2zngk1rprlkpyicrisgq36agk"; depends=[antiword curl data_table pdftools readxl rvest striprtf textshape xml2]; };
-  textrecipes = derive2 { name="textrecipes"; version="0.0.1"; sha256="1nnm7cpp99jlahhdl6aqz38dsr9wgm8z1pxblwqqribfh354vm5c"; depends=[dplyr generics magrittr purrr recipes rlang SnowballC stopwords stringr text2vec tibble tokenizers]; };
+  textrecipes = derive2 { name="textrecipes"; version="0.0.2"; sha256="1wks8z8wggx318haplyw4km2nh1vrl805gvyckb79n569f8ks9ah"; depends=[dplyr generics lifecycle magrittr purrr recipes rlang SnowballC stopwords stringr text2vec textfeatures tibble tokenizers]; };
   textreg = derive2 { name="textreg"; version="0.1.5"; sha256="0h44z5hyndnvzd9axix7gpmhbdx347dfgxw9r8w38kyw6dklbjy6"; depends=[NLP Rcpp tm]; };
   textreuse = derive2 { name="textreuse"; version="0.1.4"; sha256="0qfp7ffzb5p3k3wiw8i1zjskni8f38rzkjnss97j9f3vhhb8j4r7"; depends=[assertthat BH digest dplyr NLP Rcpp RcppProgress stringr tidyr]; };
   textshape = derive2 { name="textshape"; version="1.6.0"; sha256="1pl85wjq5rl25gdlh4cp0l14hn76rrmpl7l1fn7kq9lwj9yfpcs8"; depends=[data_table slam stringi]; };
@@ -13856,10 +14138,11 @@ in with self; {
   thermocouple = derive2 { name="thermocouple"; version="1.0.2"; sha256="1rlvhw3i83iq1vibli84gj67d98whvgkxafwpmisva1m4s1bmij4"; depends=[]; };
   theseus = derive2 { name="theseus"; version="0.1.0"; sha256="1f6vl0m8fcchafn78vrfw610d0sp9rf8kd3q5n7b0zd2yby10dq0"; depends=[dplyr ggplot2 gridExtra magrittr phyloseq ShortRead splancs tidyr tidyverse vegan viridis]; };
   thgenetics = derive2 { name="thgenetics"; version="0.4-2"; sha256="1314gry3xs9v4jy13g08q16qy4ax3s0bc7d74gi0wbpkgdrk3lql"; depends=[]; };
+  thickmatch = derive2 { name="thickmatch"; version="0.3.0"; sha256="0j5wajrc0ngmal01hnfw6vbqvmnqfrgii68ws8ypig934h2kv05g"; depends=[DiPs liqueueR mvnfast plyr rcbalance]; };
   thief = derive2 { name="thief"; version="0.3"; sha256="12ymkkisg5p0g1gmvlczhp4dc7mirjg55fqqmz2d90673vlg6rfq"; depends=[forecast ggplot2 hts]; };
   thinkr = derive2 { name="thinkr"; version="0.13"; sha256="1j43mjznriq8d5ki50rb41vgmzj2gq8sahvhj11742ggxd0bzvdb"; depends=[assertthat devtools dplyr ggplot2 lazyeval lubridate magrittr officer rvg stringi stringr tidyr]; };
   thor = derive2 { name="thor"; version="1.1.0"; sha256="0ard98z5kb9r6k4qvnbqq4mx4x6ydhd4b6ppzrp19yilvdb8wgjp"; depends=[R6 storr]; };
-  threeBrain = derive2 { name="threeBrain"; version="0.1.2"; sha256="0gyqkvn9fgxwl0y3vachwbppxjlrqjsczcszima14hh2j7g689ns"; depends=[base64enc crayon future htmltools htmlwidgets jsonlite R6 rlang shiny stringr]; };
+  threeBrain = derive2 { name="threeBrain"; version="0.1.3"; sha256="02jmr2wgmw0qqczpmnlivwrh5s9x36a8rbz6j8dnj30j6hrk1jqi"; depends=[base64enc crayon gifti htmltools htmlwidgets jsonlite R6 reticulate shiny startup stringr]; };
   threeboost = derive2 { name="threeboost"; version="1.1"; sha256="033vwn42ys81w6z90w5ii41xfihjilk61vdnsgap269l9l0c8gmn"; depends=[Matrix]; };
   threejs = derive2 { name="threejs"; version="0.3.1"; sha256="1s3rdlzy7man6177ycayg6xsh6k8y1r9rdj9yzn3b93j2rs0nxbi"; depends=[base64enc crosstalk htmlwidgets igraph]; };
   threewords = derive2 { name="threewords"; version="0.1.0"; sha256="083y5i4qyl1wj017wy5ywl2yx9wvrpjl9g9k9clvnrbwzbycx2cg"; depends=[httr]; };
@@ -13868,41 +14151,46 @@ in with self; {
   threshr = derive2 { name="threshr"; version="1.0.1"; sha256="1v9aba5w1lrjy2ngx9kc2ih8sd4dhq45j8y6vn4mbs3y8f5dvhr0"; depends=[revdbayes rust]; };
   thriftr = derive2 { name="thriftr"; version="1.1.5"; sha256="1s8fn0imja6gh5bb0h2g1pmvkwk5v0dmpml9yvcd5dhz9lxy6vdj"; depends=[R6 rly stringi]; };
   thsls = derive2 { name="thsls"; version="0.1"; sha256="18z7apskydkg7iqrs2hgnzby578qsvyd73wx8v4z3aa338lssdi7"; depends=[Formula]; };
+  thurstonianIRT = derive2 { name="thurstonianIRT"; version="0.9.0"; sha256="0jjrdx5f581h8vh0fw4p85mlqfym467azp7cln48wzi1s28m9mn2"; depends=[BH dplyr lavaan magrittr MplusAutomation mvtnorm Rcpp RcppEigen rlang rstan rstantools StanHeaders tibble tidyr]; };
   tibble = derive2 { name="tibble"; version="2.1.3"; sha256="06jfayiip8j8ibdhw3fvxn4n8aqbqhwanrszpzlsf92xdfgfm34s"; depends=[cli crayon fansi pillar pkgconfig rlang]; };
-  tibbletime = derive2 { name="tibbletime"; version="0.1.2"; sha256="0hv929zcfwhg1by2jkdjh2h42dqis4291ph7k0zlrywmpm4zn6n8"; depends=[assertthat dplyr glue hms lubridate purrr Rcpp rlang tibble zoo]; };
+  tibbletime = derive2 { name="tibbletime"; version="0.1.3"; sha256="0p42g73cmw460v372317as50ijvsg49avg9cf222ypf1v0ls3ig1"; depends=[assertthat dplyr glue hms lifecycle lubridate purrr Rcpp rlang tibble tidyselect vctrs zoo]; };
   tibbrConnector = derive2 { name="tibbrConnector"; version="1.5.1"; sha256="1r58myi7x4hqqvyrphxy4ppa1lnad6x2ginfq2j52ax53zr07ajp"; depends=[RCurl rjson]; };
   tictactoe = derive2 { name="tictactoe"; version="0.2.2"; sha256="1fx8plj5zr04xwk5hfj3zqhcknidxlzya2q14cf0m3y33a86lx42"; depends=[hash]; };
   tictoc = derive2 { name="tictoc"; version="1.0"; sha256="1zp2n8k2ax2jjw89dsri268asmm5ry3ijf32wbca5ji231y0knj7"; depends=[]; };
-  tidyLPA = derive2 { name="tidyLPA"; version="1.0.3"; sha256="0vx2zzajisf2hcwbd1r6b0qmp330pp5x1w4sikm5zdbxrq0ws7y3"; depends=[dplyr ggplot2 mclust mix MplusAutomation tibble]; };
+  tidyLPA = derive2 { name="tidyLPA"; version="1.0.4"; sha256="154jikhm1dnriwdib5ncmkjixlihs3b74ilpi225h8ijq84n31ai"; depends=[dplyr ggplot2 mclust mix MplusAutomation tibble]; };
   tidyRSS = derive2 { name="tidyRSS"; version="1.2.11"; sha256="0ikizs24frvv888zxris6j41lfcvy7hrp5z3h3mk5vxdlqi3rag7"; depends=[dplyr httr jsonlite lubridate magrittr purrr sf stringr testthat tibble xml2]; };
+  tidyUSDA = derive2 { name="tidyUSDA"; version="0.2.0"; sha256="1jxg6q7h90zllm35h2vx5r0y6zihxzvn29pa9c8plfgi4b5pskky"; depends=[dplyr fuzzyjoin ggplot2 jsonlite keyring magrittr nlme rgdal rgeos sf tigris]; };
   tidybayes = derive2 { name="tidybayes"; version="1.1.0"; sha256="1mq6gqr66pqrwdmnk3fmfi508ds086k7jnlazi5mczn4r6pdyzd7"; depends=[arrayhelpers coda dplyr forcats ggplot2 ggstance HDInterval magrittr plyr purrr rlang tibble tidyr tidyselect]; };
   tidyboot = derive2 { name="tidyboot"; version="0.1.1"; sha256="0nss1ci763g9p5f33g163ppamx72axc8xhrils0cql3ka8439pmn"; depends=[dplyr modelr purrr rlang tidyr]; };
+  tidycells = derive2 { name="tidycells"; version="0.2.1"; sha256="161g06ga4wk1sn2qp9ljjq9mrjmvwl2dcs1nc352alk6p7bjbj8p"; depends=[dplyr ggplot2 magrittr purrr rlang stringr tibble tidyr unpivotr]; };
   tidycensus = derive2 { name="tidycensus"; version="0.9.2"; sha256="0dlm5f24rw7zyf5wx1v1rsx1zkkff1c4zqgbysm9xzya059m4m14"; depends=[dplyr httr jsonlite purrr rappdirs readr rvest sf stringr tidyr tigris units xml2]; };
   tidycode = derive2 { name="tidycode"; version="0.1.0"; sha256="16chz6bbj28aa039s57j48qa5fhj9hlj8ijsqmbfp5ib8bnijgc4"; depends=[glue matahari pryr purrr rlang tibble]; };
-  tidygenomics = derive2 { name="tidygenomics"; version="0.1.1"; sha256="186c9hr6ysy3ibm0d2fsyjbzvjlxaxmlqwnwbygnjjp95643wnbx"; depends=[dplyr fuzzyjoin IRanges purrr Rcpp rlang tidyr]; };
+  tidycomm = derive2 { name="tidycomm"; version="0.1.0"; sha256="0xas6nr7fy612r0b5h8ncvirxhzy099zvhdzxbnskm3sa21046ni"; depends=[broom dplyr forcats glue magrittr MBESS purrr rlang stringr tibble tidyr]; };
+  tidygenomics = derive2 { name="tidygenomics"; version="0.1.2"; sha256="1cnwmmmzp9kg4k7iy2kgb22bdllpnz257pv1ahy3l11zy6bl48fc"; depends=[dplyr fuzzyjoin IRanges purrr Rcpp rlang tidyr]; };
   tidygraph = derive2 { name="tidygraph"; version="1.1.2"; sha256="1zpsarm74afbc7p5dlyb0whc09670qdcddw1ckb25cfc9hfh0hjn"; depends=[dplyr igraph magrittr pillar R6 Rcpp rlang tibble tidyr]; };
   tidyhydat = derive2 { name="tidyhydat"; version="0.4.0"; sha256="0k239xixq6x9xb51ipmxn7ph72ibqa9s9sp79gkabgawc0lij6q0"; depends=[cli crayon DBI dbplyr dplyr httr lubridate rappdirs readr rlang RSQLite tidyr]; };
   tidyimpute = derive2 { name="tidyimpute"; version="0.1.0"; sha256="03b475nn206hxq3i0n7j1qws82rwwk5vqivmdg5mff44dvz4gl5s"; depends=[dplyr na_tools rlang]; };
-  tidylog = derive2 { name="tidylog"; version="0.1.0"; sha256="0mwd9crb0a0c8gpchsdjcap56fc602h1x7bk5f0rvvmw41xz06kn"; depends=[dplyr glue]; };
+  tidylog = derive2 { name="tidylog"; version="0.2.0"; sha256="04l9bjfjnc706ya19swywr489wldkr7n9cm6kkyws56kqb571zxv"; depends=[clisymbols dplyr glue tidyr]; };
   tidymargins = derive2 { name="tidymargins"; version="0.1.0"; sha256="1r782h6a5fhk9yb9ixjbpq3a9g56j3xz1871fsndkfigbzz39w51"; depends=[assertthat dplyr forcats magrittr pkgcond purrr rlang tidyr tidyselect]; };
   tidymodels = derive2 { name="tidymodels"; version="0.0.2"; sha256="1hidjrayqxz1g7bn20pqs1bwyx4cxxqx9dq5lwqyfsij0ir0lia9"; depends=[broom cli crayon dials dplyr ggplot2 infer magrittr parsnip pillar purrr recipes rlang rsample rstudioapi tibble tidyposterior tidypredict tidytext yardstick]; };
   tidymv = derive2 { name="tidymv"; version="2.2.0"; sha256="0g550b0frgk4wy3sicsqqinffrlbqzghhcnvh3snci6xd7j37hmm"; depends=[dplyr ggplot2 itsadug magrittr mgcv rlang tibble tidyr]; };
   tidync = derive2 { name="tidync"; version="0.2.1"; sha256="1w6ciyk4024aad6japfar1pq4q9bygcgl5avzg2l8c7mcqd58rvl"; depends=[dplyr forcats magrittr ncdf4 ncmeta purrr rlang RNetCDF tibble tidyr]; };
   tidypmc = derive2 { name="tidypmc"; version="1.7"; sha256="1fijlvdiw4vwm34wizm4xlm0x10vvpkldzk7rrla44apq7y2w3yq"; depends=[dplyr readr stringr tibble tokenizers xml2]; };
   tidyposterior = derive2 { name="tidyposterior"; version="0.0.2"; sha256="1sdbar3ycnjqyjy664zyhr9xks48l6g6mw8p5scp31x3gdh352rs"; depends=[dplyr generics ggplot2 purrr rlang rsample rstanarm tibble tidyr]; };
-  tidypredict = derive2 { name="tidypredict"; version="0.4.2"; sha256="16lrn7gj9vrshhk3kfk57m7pllicmy7f98fm05y12ir5a8mbz9d1"; depends=[dplyr generics knitr purrr rlang tibble]; };
-  tidyquant = derive2 { name="tidyquant"; version="0.5.6"; sha256="0mnhn00fw3xl2k11m4c1ngfh0p6fz2am0dv1pv8hnfp1mp31bxrv"; depends=[dplyr ggplot2 httr lazyeval lubridate magrittr PerformanceAnalytics purrr Quandl quantmod rlang stringr tibble tidyr tidyverse timetk TTR xml2 xts]; };
+  tidypredict = derive2 { name="tidypredict"; version="0.4.3"; sha256="1mn14rd33irgcfrhm9d3zd71jdwdjay5z5xsmas8d9zmf05g0bcr"; depends=[dplyr generics knitr purrr rlang tibble]; };
+  tidyquant = derive2 { name="tidyquant"; version="0.5.7"; sha256="1j987dmg74ah0vs8i46811phn84ccfyglwjmx2l2fg10naflcgzx"; depends=[cli crayon dplyr ggplot2 httr lazyeval lubridate magrittr PerformanceAnalytics purrr Quandl quantmod rlang rstudioapi stringr tibble tidyr timetk TTR xml2 xts]; };
+  tidyquery = derive2 { name="tidyquery"; version="0.1.0"; sha256="0jbkzm2vlzjfwn1849skkinywh7xa0n772qyrdhya7cg53xqp5vd"; depends=[dplyr lubridate queryparser stringr]; };
   tidyqwi = derive2 { name="tidyqwi"; version="0.1.1"; sha256="0qrwclaz6cf2wg3rkg2nqjygflj0a1mx4cfbv5lx4r194km2dmr9"; depends=[dplyr furrr future httr jsonlite labelled magrittr purrr stringr tidyr xml2]; };
-  tidyr = derive2 { name="tidyr"; version="0.8.3"; sha256="0dyc4b03wi65bk7j0ma0y188syh37h57wgxji82i0h8j6pn593x1"; depends=[dplyr glue magrittr purrr Rcpp rlang stringi tibble tidyselect]; };
+  tidyr = derive2 { name="tidyr"; version="1.0.0"; sha256="1403j0xd93l0r7qj738ryd5zc79hbcghrzybib3c3hrnaq5s78cj"; depends=[dplyr ellipsis glue lifecycle magrittr purrr Rcpp rlang stringi tibble tidyselect vctrs]; };
   tidyrules = derive2 { name="tidyrules"; version="0.1.0"; sha256="1pwbgk48rrxcxwjnqfjg4718fw059h4qh3vfni8psgd5snfbsjql"; depends=[assertthat magrittr partykit purrr stringr tibble]; };
   tidyselect = derive2 { name="tidyselect"; version="0.2.5"; sha256="0x3cp36byhfjajikr1lwffjm85ayw3bcs7d7kb0cydgs61ifiqjw"; depends=[glue purrr Rcpp rlang]; };
-  tidystats = derive2 { name="tidystats"; version="0.3"; sha256="11bl4m14n29fcy9g3b0sx10fx2kl6949fczzdzw2cllqn2krfx45"; depends=[dplyr kableExtra knitr magrittr miniUI purrr readr rlang shiny stringr tibble tidyr]; };
+  tidystats = derive2 { name="tidystats"; version="0.4"; sha256="1jxn8la5s3mdh9kbkbvlc5icwa7ymingaxrl0q49ykifrsnbpd4a"; depends=[dplyr jsonlite purrr readr stringr tibble tidyr]; };
   tidystopwords = derive2 { name="tidystopwords"; version="0.9.0"; sha256="1zw6rz8fs8mynaqhrxidrar8vyiq73i8hl4h2lrfz83rxrihbq39"; depends=[dplyr stringr]; };
   tidystringdist = derive2 { name="tidystringdist"; version="0.1.4"; sha256="1srxh5gyspcghzvnmpyq36ky608ipf71vv0s1jg01mgf2i5pdkf4"; depends=[attempt rlang stringdist tibble]; };
   tidytext = derive2 { name="tidytext"; version="0.2.2"; sha256="1h1fpy86fha3jidb1xz0n3mfn7110mmf3dz9hpyfczqpyd62k3qq"; depends=[dplyr generics hunspell janeaustenr Matrix purrr rlang stopwords stringr tokenizers]; };
   tidytidbits = derive2 { name="tidytidbits"; version="0.2.1"; sha256="1hyqk8p4w1mjk9f497f2lh8hlic6fs37jnawqpfmrl39ylx4z6r7"; depends=[dplyr extrafont forcats magrittr purrr rlang stringr tibble tidyr tidyselect]; };
-  tidytransit = derive2 { name="tidytransit"; version="0.5.1"; sha256="1vbcaqjr020qxgx4fpca2hhgjcq2j86rzyhxmsizjj68fr9963p9"; depends=[assertthat data_table digest dplyr here hms htmltools httr lubridate magrittr readr rlang scales sf stringr tibble tidyr zip]; };
-  tidytree = derive2 { name="tidytree"; version="0.2.5"; sha256="0vfjv33352dmk9cr2qn0knzg761068rdk6jg32csd9vpmcma8awp"; depends=[ape dplyr lazyeval magrittr rlang tibble]; };
+  tidytransit = derive2 { name="tidytransit"; version="0.5.2"; sha256="0j2gdljfq6jp833qr30v5nlrqh5vr0hl5hjh69ii8k4fdk0zj4v1"; depends=[assertthat data_table digest dplyr here hms htmltools httr lubridate magrittr readr rlang scales sf stringr tibble tidyr zip]; };
+  tidytree = derive2 { name="tidytree"; version="0.2.8"; sha256="1hkddl8kj1g01dy7xiracx81f6b405b3ga2qp4wlrl552b9xxpby"; depends=[ape dplyr lazyeval magrittr rlang tibble]; };
   tidyverse = derive2 { name="tidyverse"; version="1.2.1"; sha256="0yy3fkjksgcn6wkbgsb0pbnmsyqs4m01mziqafhig578nixs4rxd"; depends=[broom cli crayon dbplyr dplyr forcats ggplot2 haven hms httr jsonlite lubridate magrittr modelr purrr readr readxl reprex rlang rstudioapi rvest stringr tibble tidyr xml2]; };
   tidyxl = derive2 { name="tidyxl"; version="1.0.4"; sha256="19kcm9lfbkf61z0whfkn69b8m36qd1rvyhyk5y0cqbzkxvq8f70i"; depends=[piton Rcpp]; };
   tiff = derive2 { name="tiff"; version="0.1-5"; sha256="0asf2bws3x3yd3g3ixvk0f86b0mdf882pl8xrqlxrkbgjalyc54m"; depends=[]; };
@@ -13913,7 +14201,7 @@ in with self; {
   tightClust = derive2 { name="tightClust"; version="1.1"; sha256="0vqkp2g6z8y3b6dhzglmacjhf2qi1sg80kb941mwfafin2k40zbm"; depends=[]; };
   tigreBrowserWriter = derive2 { name="tigreBrowserWriter"; version="0.1.5"; sha256="0izgx1khci6qc6pz85dxj75kzxvpr30l0vhcv9476jrcbwqs4k8m"; depends=[DBI RSQLite]; };
   tigris = derive2 { name="tigris"; version="0.8.2"; sha256="03hlwykm14j8il53yslii8npfr42plj87maq120crhijafr6m3gd"; depends=[dplyr httr magrittr maptools rappdirs rgdal sf sp stringr uuid]; };
-  tikzDevice = derive2 { name="tikzDevice"; version="0.12"; sha256="0srp7q91714sday4n2nbhnkwjy84q6kw7iihlskr7ckjdcqk7s3v"; depends=[filehash png]; };
+  tikzDevice = derive2 { name="tikzDevice"; version="0.12.3"; sha256="1d8cxb3srmfv54c61c25myiknkm43ysl69lqjknhaj682x0nyz2r"; depends=[filehash png]; };
   tilegramsR = derive2 { name="tilegramsR"; version="0.2.0"; sha256="11cnyvlghg8z7lr9ahzsjpyjrqnxqs77wdcydqvavrsqj745xvi2"; depends=[sf sp]; };
   tiler = derive2 { name="tiler"; version="0.2.1"; sha256="19w772wwv764i2b8i9ym6scf18kyci3albz27hw3mdhjy7i0acm3"; depends=[png raster rgdal sp]; };
   tilting = derive2 { name="tilting"; version="1.1.1"; sha256="0srvxjv3sg35n7f8pam45ny1z1dxwqjkrz9d91hf67a3fi34f5gk"; depends=[mvtnorm]; };
@@ -13929,10 +14217,11 @@ in with self; {
   timelineR = derive2 { name="timelineR"; version="0.1.0"; sha256="1a2pdy5b9nca66khydrb50yzjglr78lxrgzisw6bp2simk5cix51"; depends=[dplyr futile_logger ggplot2 gtable lubridate mtconnectR stringr]; };
   timelineS = derive2 { name="timelineS"; version="0.1.1"; sha256="076w8ckzzl59bc1gnwjgdwynnz86320hyfmzb0k26hl3k13jlmxs"; depends=[dplyr ggplot2 lubridate magrittr]; };
   timeordered = derive2 { name="timeordered"; version="0.9.9"; sha256="0rfga5i6kckmlz2dzqb1pp634dl93wxp7v3kisxlbjl7mgnbck3k"; depends=[igraph plyr]; };
+  timeperiodsR = derive2 { name="timeperiodsR"; version="0.1.0"; sha256="1pb27389ab8s2xz5zx4xi742hwbdf4bny311g7s7m2gvypc38cxi"; depends=[lubridate]; };
   timereg = derive2 { name="timereg"; version="1.9.4"; sha256="0jxm3h2sjc83klxdry5r1wgliadk6967cmiifycfpz282vpfxx7v"; depends=[lava numDeriv survival]; };
   timesboot = derive2 { name="timesboot"; version="1.0"; sha256="1ixmcigi1bf42np93md8d3w464papg9hp85v0c3hg3vl4nsm2bji"; depends=[boot]; };
   timeseriesdb = derive2 { name="timeseriesdb"; version="0.4.1"; sha256="1ghb3lg63fs9zx34l5qczv39mdccnmqzlc74l1zhb8qmsg8sm1g2"; depends=[data_table DBI jsonlite openxlsx RPostgreSQL shiny xtable xts zoo]; };
-  timetk = derive2 { name="timetk"; version="0.1.1.1"; sha256="0ca6xnsidc98yjb52gbafvfgxzdgszj8l9hvc77mwgc33g0ydvs1"; depends=[devtools dplyr forecast lazyeval lubridate padr purrr readr stringi tibble tidyr xts zoo]; };
+  timetk = derive2 { name="timetk"; version="0.1.2"; sha256="0dp7pjydqcdi2nn4q73nqr4i4d9n4md9vb5y3znrlf1m8m9m4k4a"; depends=[dplyr lazyeval lubridate padr purrr readr stringi tibble tidyr xts zoo]; };
   timetools = derive2 { name="timetools"; version="1.14"; sha256="13jchgd9fc8hxj74wm1kg4rwcng4yxblkq04i33djsqghgb5f9mj"; depends=[]; };
   timetree = derive2 { name="timetree"; version="1.0"; sha256="1fpdp6mkwm67svqvkfflvqxn52y2041zl09rxrms28ybbd5f84c0"; depends=[phangorn XML]; };
   timevis = derive2 { name="timevis"; version="0.5"; sha256="1psmnl6pkbizi2kjpaz9w32z2dkxlh4r229mfxsfqnjvf9sc34kj"; depends=[htmltools htmlwidgets jsonlite lubridate magrittr rmarkdown shiny]; };
@@ -13942,8 +14231,8 @@ in with self; {
   tint = derive2 { name="tint"; version="0.1.2"; sha256="0afqlyi6d72x30pzzvmznz1l5pq4n30qiqa9ncbf0wjvqji7a182"; depends=[htmltools knitr rmarkdown]; };
   tinter = derive2 { name="tinter"; version="0.0.1"; sha256="1zw5a79mryqighf8b6gidsi30001749sllpwqwbck26cyal6m8y6"; depends=[checkr]; };
   tinyProject = derive2 { name="tinyProject"; version="0.6.1"; sha256="0cflnfp5mib3j1y3n5yvi867h5a7z6xr6163gq9y9b6nrl2skxfk"; depends=[brew R_utils]; };
-  tinytest = derive2 { name="tinytest"; version="0.9.6"; sha256="0bz37dk875s66niaq301v4gh4b8xxmn776shm5s9lp34kfzqyvfg"; depends=[]; };
-  tinytex = derive2 { name="tinytex"; version="0.14"; sha256="0aab7ybc6kkxxk3lzdmbla8zcpp6nmlahchc33miv28cmnqw363w"; depends=[xfun]; };
+  tinytest = derive2 { name="tinytest"; version="1.1.0"; sha256="1y3f0x56xagf9m5wr2b26qahww13p8i2s66yr51xy9pqxdyjh2yl"; depends=[]; };
+  tinytex = derive2 { name="tinytex"; version="0.16"; sha256="1dadq9l0527v038b1k1dyfs0dklsgxnmplls3qhqprfgskif8mga"; depends=[xfun]; };
   tiobeindexr = derive2 { name="tiobeindexr"; version="0.1.1"; sha256="09vw83hkf7lgd3xyhbmqkyv57g3dz856230xkf8630jiicfvcg3b"; depends=[rvest xml2]; };
   tipom = derive2 { name="tipom"; version="1.0.2-1"; sha256="1gdfv0g5dw742j6ycmi0baqh6xcchp3yf2n1g8vn7jmqgz5mlhdr"; depends=[]; };
   tippy = derive2 { name="tippy"; version="0.0.1"; sha256="0kkyi4s4ffpyjyfl89cd5y788ab1p253rx179k422y3y1z6w1md7"; depends=[htmltools htmlwidgets jsonlite shiny]; };
@@ -13968,11 +14257,11 @@ in with self; {
   tm_plugin_lexisnexis = derive2 { name="tm.plugin.lexisnexis"; version="1.4.0"; sha256="0q4njhfpwqym9d8xfbb577vn6g9ks4nkpb4bh6j31nzg7yp96av7"; depends=[ISOcodes NLP tm xml2]; };
   tm_plugin_mail = derive2 { name="tm.plugin.mail"; version="0.2-1"; sha256="0rn8jqv622qmc0zkz534ka5qnbca2rlabxm3vjbqplr6fh1ahwb1"; depends=[NLP tm]; };
   tm_plugin_webmining = derive2 { name="tm.plugin.webmining"; version="1.3"; sha256="1694jidf01ilyk286q43bjchh1gg2fk33a2cwsf5jxv7jky3gl7h"; depends=[boilerpipeR NLP RCurl RJSONIO tm XML]; };
-  tm1r = derive2 { name="tm1r"; version="1.1.2"; sha256="0ssxp1qfc4fa98l8qy2wnsfqg0hhmq0qs7rhsjp4jgrw1wdff4jk"; depends=[httr jsonlite]; };
-  tmap = derive2 { name="tmap"; version="2.3"; sha256="1vkh2dkyp96d0wpvwkflmhjsi8vhycdchxd0imixpqi4hg5037v2"; depends=[classInt htmltools htmlwidgets leaflet leafsync raster RColorBrewer sf tmaptools units viridisLite]; };
+  tm1r = derive2 { name="tm1r"; version="1.1.3"; sha256="1r1va052aaya70pvvn950833w0q0sbd67yyg3m2qdikgniq3dn6z"; depends=[httr jsonlite]; };
+  tmap = derive2 { name="tmap"; version="2.3-1"; sha256="1d4n5mn7hdyjmmxsprjn9hih0bkg9hsc6vh6rxlgjrjcpv3xcn2s"; depends=[classInt htmltools htmlwidgets leaflet leafsync lwgeom raster RColorBrewer sf tmaptools units viridisLite]; };
   tmaptools = derive2 { name="tmaptools"; version="2.0-2"; sha256="1n8m4c3q7i60p8r2xfhw8rfqmflyaicf8y1bkfkmx74afz6hv184"; depends=[classInt dichromat KernSmooth lwgeom magrittr raster RColorBrewer rgdal rgeos sf sp units viridisLite XML]; };
   tmbstan = derive2 { name="tmbstan"; version="1.0.2"; sha256="1g4b415k36wij028xz15kwpv8hmx92kznsp231bnrprzw2vrninr"; depends=[BH Rcpp RcppEigen rstan StanHeaders TMB]; };
-  tmcn = derive2 { name="tmcn"; version="0.2-12"; sha256="1gqmq3f0plgd44056905l5jd7x9k4ls06hcp006w8skxj1rnwzb9"; depends=[]; };
+  tmcn = derive2 { name="tmcn"; version="0.2-13"; sha256="0rf8mz6kdm83pm85kzfyzb8kd3iwaxv5bgphjpxlnq6z32m9yds7"; depends=[]; };
   tmg = derive2 { name="tmg"; version="0.3"; sha256="0yqavibinzsdh85izzsx8b3bb9l36vzkp5a3bdwdbh410s62j68a"; depends=[Rcpp RcppEigen]; };
   tmle = derive2 { name="tmle"; version="1.3.0-2"; sha256="0krcyky19p60mkq29dvmcfc5jrv38wy0jv8xqqq5glh6yjyyslaj"; depends=[SuperLearner]; };
   tmle_npvi = derive2 { name="tmle.npvi"; version="0.10.0"; sha256="00jav1ql3lv18wh9msxnjvz36z2ds44fdi6lrp1pfphh1in4vdcl"; depends=[geometry MASS Matrix R_methodsS3 R_oo R_utils]; };
@@ -14002,11 +14291,10 @@ in with self; {
   tor = derive2 { name="tor"; version="1.1.1"; sha256="0vibnjm0q8rn73c5xdbfw5z4pk4ja1m1mx9c6p423pz72znwrcpw"; depends=[fs readr rlang tibble]; };
   tosca = derive2 { name="tosca"; version="0.1-4"; sha256="1c7x89b2vh2xl5bc1xgclmnk2gajqalxmz4ipqlwp9axz91w85gs"; depends=[data_table htmltools lda lubridate quanteda RColorBrewer stringr tm WikipediR]; };
   tosls = derive2 { name="tosls"; version="1.0"; sha256="03nqwahap504yvcksvxdhykplbzmf5wdwgpzm7svn8bymdc472v2"; depends=[Formula]; };
-  totalcensus = derive2 { name="totalcensus"; version="0.6.1"; sha256="1ks49iaay0sz345cm77kv61mxsnin5dsggdjabcc4mnsgwh6k1sb"; depends=[data_table magrittr purrr stringr]; };
+  totalcensus = derive2 { name="totalcensus"; version="0.6.2"; sha256="1z0awdzi93r4mmaymdahansss7ccb0y3ym1sqja0jr3dx71zy4jn"; depends=[data_table magrittr purrr stringr]; };
   touch = derive2 { name="touch"; version="0.1-4"; sha256="0xz3mvwhyn7wbqhbfp2klrnf89gvsncrv5y7fmk9ym3nkq7z26cg"; depends=[Rcpp]; };
   touchard = derive2 { name="touchard"; version="2.0.1"; sha256="06491r4x3ycmv3ddbqwig334wj9qvm395xlaifx4hjjyyi65xb3q"; depends=[MASS nleqslv numDeriv plotrix]; };
   tourr = derive2 { name="tourr"; version="0.5.6"; sha256="028pbprq1hjfbzvybpdkwi49arsg9r7ayjb52flw33szfqdpcimw"; depends=[MASS]; };
-  tourrGui = derive2 { name="tourrGui"; version="0.4"; sha256="1g9928q3x9rrd9k3k84r201wss3vjd2pngvbaflk5dqh9yf75jpq"; depends=[Cairo colorspace gWidgets RGtk2 tourr]; };
   toxEval = derive2 { name="toxEval"; version="1.0.4"; sha256="1jz2d1wxw1jnyygsp34y3py8mwxjrnvj64smsifac32mvvi6ka5s"; depends=[dplyr DT ggplot2 leaflet magrittr RColorBrewer readxl shiny shinyAce shinycssloaders shinydashboard tidyr]; };
   toxtestD = derive2 { name="toxtestD"; version="2.0"; sha256="0b7hmpfhwg626r8il12shni0kw94cqnbj49y4vfh8gn98x1s6m48"; depends=[]; };
   tpAUC = derive2 { name="tpAUC"; version="2.1.1"; sha256="0wix9qwcidj7xfqhh7bmrpnadd9qlkvg3515gaamdxkjbz2kyydc"; depends=[pROC]; };
@@ -14021,12 +14309,13 @@ in with self; {
   trackeR = derive2 { name="trackeR"; version="1.5.2"; sha256="1f3giz6naxxyicgy9v0391ang43srwhy9zbiv4zmlc8i9v05b57i"; depends=[fda foreach ggmap ggplot2 ggridges gridExtra gtable jsonlite leaflet raster RSQLite scam sp xml2 zoo]; };
   trackeRapp = derive2 { name="trackeRapp"; version="1.0"; sha256="05r012kcf86j45q00y6ynz9srd0by45w41bpx9mf7q4h8m5nm0jn"; depends=[changepoint colorspace DT foreach mapdeck mgcv plotly sf shiny shinydashboard shinyjs shinyWidgets trackeR V8 zoo]; };
   trackr = derive2 { name="trackr"; version="0.10.5"; sha256="0cngwszax3i9p0095kxrz7w4rnryc0lmylckixzrmhx80qkxcaw1"; depends=[CodeDepends fastdigest ggplot2 gridGraphics histry htmltools lattice miniUI RJSONIO rlang rmarkdown roprov rsolr shiny]; };
+  trackter = derive2 { name="trackter"; version="0.1.0"; sha256="19fjxih3pgiz054x7lind5njc6ddxiq6qh9fnh42i5qplfgrlgk8"; depends=[animation data_table dplyr EBImage features ggplot2 jpeg Momocs pastecs plyr raster wesanderson zoo]; };
   tractor_base = derive2 { name="tractor.base"; version="3.3.2"; sha256="0y5gm0y4chl30f5qqq8qiiw4j8g32s4i9xrvyp3cwg902kf2p86i"; depends=[ore reportr RNifti shades]; };
   trade = derive2 { name="trade"; version="0.5.4"; sha256="05skmm2j826wjhmxdvkln50y0mjy74qcl2hay2l1322qqs7phin6"; depends=[antitrust]; };
-  tradestatistics = derive2 { name="tradestatistics"; version="0.2"; sha256="0g2ag7ns1y1b76q6aygkr15dp7zd51fa01nm7q9fd7had07x3sgd"; depends=[crul dplyr jsonlite magrittr purrr rlang stringr]; };
+  tradestatistics = derive2 { name="tradestatistics"; version="0.2.5"; sha256="0y6xyba3lr7mdd8q4ar8x7v8shkknbd0qhkvnz2ad9kfbwbxv7v1"; depends=[crul dplyr jsonlite magrittr purrr rlang stringr]; };
   trafo = derive2 { name="trafo"; version="1.0.1"; sha256="0gq3snjpkw0ncny7pkfi686qkgdhd8id73jxjk3chhqf5mzrrsbc"; depends=[FNN lmtest moments pryr]; };
   traipse = derive2 { name="traipse"; version="0.1.0"; sha256="0174rxc3p3s848s9ynkkw32f33dq9gnq7zd14i3b9xnp8zr9jnph"; depends=[geodist geosphere magrittr]; };
-  traitdataform = derive2 { name="traitdataform"; version="0.5.5"; sha256="1gf03gyva4f00bhzcb1x1hsghra15yrhfrr9cprmvax6bgrq64bp"; depends=[data_table getPass plyr RCurl reshape2 taxize units XML]; };
+  traitdataform = derive2 { name="traitdataform"; version="0.5.6"; sha256="0wp3z9l9vpniaa2b53qq6a77ya0my9cvkqd8i831zsxyj63vaabl"; depends=[data_table getPass plyr RCurl reshape2 taxize units XML]; };
   traitr = derive2 { name="traitr"; version="0.14"; sha256="1pkc8wcq55229wkwb54hg9ndbhlxziv51n8880z6yq73zac1hbmf"; depends=[digest gWidgets proto]; };
   traits = derive2 { name="traits"; version="0.4.2"; sha256="1aiy7mdwji72rrmf8gwmnpkhfbqbqbblffxghniw5pfpv55j6mib"; depends=[crul data_table hoardr httr jsonlite readr rvest taxize tibble xml2]; };
   traj = derive2 { name="traj"; version="1.2"; sha256="0mq6xdbxjqjivxyy7cwaghwmnmb5pccrah44nmalssc6qfrgys4n"; depends=[cluster GPArotation NbClust pastecs psych]; };
@@ -14039,7 +14328,7 @@ in with self; {
   translate = derive2 { name="translate"; version="0.1.2"; sha256="1w0xrg1xxwfdanlammmixf06hwq700ssbjlc3cfigl50p87dbc5x"; depends=[functional lisp RCurl RJSONIO]; };
   translateR = derive2 { name="translateR"; version="1.0"; sha256="11kh9hjpsj5rfmzybnh345n1gzb0pdksrjp04nzlv948yc0mg5gm"; depends=[httr RCurl RJSONIO textcat]; };
   translation_ko = derive2 { name="translation.ko"; version="0.0.1.5.2"; sha256="1w5xibg4znhd39f3i0vsqckp6iia43nblqxnzgj0ny6s7zmdq1wd"; depends=[]; };
-  transport = derive2 { name="transport"; version="0.11-2"; sha256="1lpzivhv0fbcas6yhri064z2hian8flslz2zq3m33fh43jqqs1qg"; depends=[Rcpp]; };
+  transport = derive2 { name="transport"; version="0.12-1"; sha256="04ds3i372ri0w3qy1nn6gjrhip89978zbpvi9c5dlsbh8wwk583l"; depends=[data_table Rcpp RcppEigen]; };
   trapezoid = derive2 { name="trapezoid"; version="2.0-0"; sha256="0f6rwmnn61bj97xxdgbydi94jizv1dbq0qycl60jb4dsxvif8l3n"; depends=[]; };
   trawl = derive2 { name="trawl"; version="0.2.1"; sha256="1ns4nk8zdnl2z9clc2q38sbb1ijkj86lcifxq7d111mcwsmpb6fi"; depends=[DEoptim MASS rootSolve Runuran squash TSA]; };
   tree = derive2 { name="tree"; version="1.0-40"; sha256="1rr6ws62j9h36f3nl713f8h3ndkh95mv46l055jvgmby5lw1dazz"; depends=[]; };
@@ -14076,18 +14365,19 @@ in with self; {
   trimTrees = derive2 { name="trimTrees"; version="1.2"; sha256="0v75xf5186dy76332x4w7vdwcz7zpqga8mxrb5all2miq2v45fi8"; depends=[mlbench randomForest]; };
   trimcluster = derive2 { name="trimcluster"; version="0.1-2.1"; sha256="0013bpyq6mkvjn38qsmwnsxfiwxgwngnqxycxvgpgmiadhm8fjmn"; depends=[]; };
   trimr = derive2 { name="trimr"; version="1.0.1"; sha256="0gcn18nwxmax9c35is0nldyh74cw8rg3gj60cixzs9qjnpb9xx3d"; depends=[]; };
-  trinROC = derive2 { name="trinROC"; version="0.3"; sha256="0i8f6sy7hl2v6kb5j74lzxmwndcs5rh8nm2skprh4k4bw3nyakjp"; depends=[ggplot2 gridExtra rgl]; };
+  trinROC = derive2 { name="trinROC"; version="0.3.1"; sha256="12kmpypbq3ldh8vn38w7agfq5bn98vp27qyvivvbqryc18y0isk3"; depends=[ggplot2 gridExtra rgl]; };
   trioGxE = derive2 { name="trioGxE"; version="0.1-1"; sha256="1ra86l3i7fhb6nsy8izixyvm6z23shv7fcjmnnpil54995j15ax4"; depends=[gtools mgcv msm]; };
   trip = derive2 { name="trip"; version="1.6.0"; sha256="089wwdbf3mqz2gxskr9pwi124qbmjf6s9gq7vfrjyhcbp4xx8hwp"; depends=[geodist glue maptools MASS raster sp spatstat viridis]; };
   tripEstimation = derive2 { name="tripEstimation"; version="0.0-44"; sha256="1ylpyzlqr6l5haxq4icnlxw6vgvc2lsfz5sm2wqqm4m6h3p0i6s6"; depends=[lattice mgcv rgdal sp zoo]; };
   tripack = derive2 { name="tripack"; version="1.3-8"; sha256="0pf707z6xysxvcs508nadga3mglpvmfk6r061qda8acn58ll1cvb"; depends=[]; };
+  tripsAndDipR = derive2 { name="tripsAndDipR"; version="0.1.0"; sha256="1gm96fxgql9y08w177nyxw0bahyafcs75maz743a9hfb0gjixvy2"; depends=[]; };
   triversity = derive2 { name="triversity"; version="1.0"; sha256="1bar2bpy8jvj91jmzzdwy6rlvirsbxrzqnx4r825irqhc69gc53r"; depends=[data_tree Matrix]; };
   tropAlgebra = derive2 { name="tropAlgebra"; version="0.1.1"; sha256="1idvhxhw2f6z8iq0nfdj6jmzy8913vid84rvln6rx2dkzw3s9wnl"; depends=[]; };
   tropicalSparse = derive2 { name="tropicalSparse"; version="0.1.0"; sha256="1ay6i3pzz5lpvznxqln31mijp86p6z0df7rvp0gm4lxvn294m7f8"; depends=[]; };
   trotter = derive2 { name="trotter"; version="0.6"; sha256="0i8r2f2klkkfnjm7jhvga3gx6m7r97pd73d88004jzlm9ficspgy"; depends=[]; };
   trread = derive2 { name="trread"; version="0.2.7"; sha256="158mwnwkmwjvir8caz42jqc599xn9qkqx6bsi76m8l6szf09s0sl"; depends=[assertthat data_table dplyr here hms htmltools httr lubridate magrittr readr rlang scales stringr tibble tidyr zip]; };
-  trtf = derive2 { name="trtf"; version="0.3-5"; sha256="173xcf9km9016s020hpcjag5rg738q7lkd0n5ir2r8cyxvfwqgbr"; depends=[Formula libcoin mlt partykit sandwich variables]; };
-  truelies = derive2 { name="truelies"; version="0.1.0"; sha256="1kp14zic09r3xhcm3h6lm98wspxlqf83jgf2b9hjzsl8ksbj778j"; depends=[hdrcde]; };
+  trtf = derive2 { name="trtf"; version="0.3-6"; sha256="1h90d3bpfq3nr2c44lynan1scz650nbzjry5i687wxa1c348lvb6"; depends=[Formula libcoin mlt partykit sandwich variables]; };
+  truelies = derive2 { name="truelies"; version="0.2.0"; sha256="1qxzw7x7xgp9x6klnq6jv0fl8al2l24br2sd59r5gq076gkqc47k"; depends=[hdrcde]; };
   trueskill = derive2 { name="trueskill"; version="0.1"; sha256="0mqvm64fcsxjlh789lqdk6l28q31yhh6jjirwjlgbpxxb90c5107"; depends=[]; };
   truncSP = derive2 { name="truncSP"; version="1.2.2"; sha256="1hdi518j3sg9273g01l1jqlmqya3ppim82ma7zakwqpmsjmzw18q"; depends=[boot truncreg]; };
   truncdist = derive2 { name="truncdist"; version="1.0-2"; sha256="02ihw4ixhadwr3sqm6r264i8vpcaz8pn69vkzabd8fwqvn5vcj5q"; depends=[evd]; };
@@ -14098,16 +14388,16 @@ in with self; {
   trustOptim = derive2 { name="trustOptim"; version="0.8.6.2"; sha256="1nsl8jd6cna52b5dd92jw3sh84jqpg7gazskn7166bcjbph19bf7"; depends=[Matrix Rcpp RcppEigen]; };
   trustedtimestamping = derive2 { name="trustedtimestamping"; version="0.2.6"; sha256="1rx7ypy331mq5ni5hxhqcfnicvwdgg9j2pm3aj097a5hhigibdrq"; depends=[digest httr jsonlite]; };
   tryCatchLog = derive2 { name="tryCatchLog"; version="1.1.4"; sha256="0iahbm1zjgrb5x5awlvy1jgylw47p7qa1cxhrzg2mjknwpsd4vwm"; depends=[]; };
-  tsBSS = derive2 { name="tsBSS"; version="0.5.2"; sha256="00brzy0dkvdwrsf5jlpyp6ggwc2wkmdkb3l6h8fx1i3lmhnaqhkg"; depends=[boot forecast ICtest JADE Rcpp RcppArmadillo]; };
+  tsBSS = derive2 { name="tsBSS"; version="0.5.3"; sha256="1x56rm1nnkzfg482gahk4c7fvj5k1jhsqdfd7vcaac84h3a8xd9x"; depends=[boot forecast ICtest JADE Rcpp RcppArmadillo xts zoo]; };
   tsDyn = derive2 { name="tsDyn"; version="0.9-48.1"; sha256="0r8xxzr2z7r7xzpvi3sani169j3irw866gdmml0798czbdarq1qd"; depends=[foreach forecast MASS Matrix mgcv mnormt nnet tseries tseriesChaos urca vars]; };
   tsModel = derive2 { name="tsModel"; version="0.6"; sha256="0mkmhzj4g38ngzfcfx0zsiqpxs2qpw82kgmm1b8gl671s4rz00zs"; depends=[]; };
   tsPI = derive2 { name="tsPI"; version="1.0.2"; sha256="0lw4s7gxn4xldsk5f3dz27bb9jywa14195703b5q1497h9j966gk"; depends=[KFAS]; };
   tsSelect = derive2 { name="tsSelect"; version="0.1.8"; sha256="0ysijzhhwaj5n7h50jacshnla6d0h61q0f6lj19ic0lwvlz4yazy"; depends=[forecast]; };
   tsallisqexp = derive2 { name="tsallisqexp"; version="0.9-3"; sha256="0mzqplsj2w4a7jnav43afyk8ymy6p444j7km6kc8c2g4aifpgxcb"; depends=[]; };
-  tsbox = derive2 { name="tsbox"; version="0.1.0"; sha256="0zq7ph5mh200wjmwg5a3lqwv5ggbcsqd1cbby0zmnvjwdxri9s1v"; depends=[anytime data_table]; };
+  tsbox = derive2 { name="tsbox"; version="0.2.0"; sha256="0kyw276qi20801ps3kd61k1s4vs0znsyzzy8mwjq312cbjisg6mc"; depends=[anytime data_table]; };
   tsc = derive2 { name="tsc"; version="1.0-3"; sha256="1acsdkxizlkix1sskwqv2a80rshw6f14zvcsjhrmmdfd4bmwh36y"; depends=[]; };
   tscount = derive2 { name="tscount"; version="1.4.1"; sha256="0bnzv06wxc1kzjlysljndsjimjsn3g8v6s1vbics1cwcs5jkjwr4"; depends=[ltsa]; };
-  tsdb = derive2 { name="tsdb"; version="0.6-2"; sha256="1kr9dw1wiz376xzal0qn7733va7rf19y7hd3j8g6jjqfwz8vf78g"; depends=[datetimeutils fastmatch zoo]; };
+  tsdb = derive2 { name="tsdb"; version="0.7-1"; sha256="0ngy897fmf48c7k54zq8lx2fyv45c0kzn3bxm5054ay2lkv02idz"; depends=[datetimeutils fastmatch zoo]; };
   tsdecomp = derive2 { name="tsdecomp"; version="0.2"; sha256="1wy37gjp49dr60s4zhwv19iv3mzr1fjz5yilqmqgy78j5d45ns15"; depends=[]; };
   tsdf = derive2 { name="tsdf"; version="1.1-7"; sha256="1c6fmvbpwvzy654c7hs56nxdp27wy9vyb521rdw33mgxvnyjbjqn"; depends=[]; };
   tsdisagg2 = derive2 { name="tsdisagg2"; version="0.1.0"; sha256="1vjypf9d4rdprpgxfsgpccn412kvar59v341ridq2hcdp7hfb70s"; depends=[]; };
@@ -14120,7 +14410,7 @@ in with self; {
   tsfknn = derive2 { name="tsfknn"; version="0.3.0"; sha256="0h44s8bvnd68nhl0rbwvs0sycsjlmpnni0nr2169429a9y3f91f1"; depends=[ggplot2]; };
   tsgui = derive2 { name="tsgui"; version="0.0.3"; sha256="16cx68gq2f63wx7mhbv0aq6pr71wfbc035kjbjjsfrbagaq4ib13"; depends=[RandomFieldsUtils tcltk2 tkrplot]; };
   tsiR = derive2 { name="tsiR"; version="0.4.2"; sha256="1yc9kcyj8yg7zsdkqsxkr7czv3i5gf2146z5h89qfqifrrzmjifa"; depends=[ggplot2 kernlab reshape2]; };
-  tsibble = derive2 { name="tsibble"; version="0.8.3"; sha256="1gvnbnl818jh7vxwdssghsnqh3xwg5rhj6gg7jb8r6zzqjq56l57"; depends=[anytime dplyr lubridate purrr rlang tibble tidyr tidyselect]; };
+  tsibble = derive2 { name="tsibble"; version="0.8.4"; sha256="1qvjhnm7czg5fzpb360xq361sy372f7cnd6r7kqxs9a0dar19vhn"; depends=[anytime dplyr lifecycle lubridate purrr rlang tibble tidyselect vctrs]; };
   tsibbledata = derive2 { name="tsibbledata"; version="0.1.0"; sha256="17qvjfkppg1z4pxgax37ikx2x28ib39syps5vhppc1y3yn8441vq"; depends=[tsibble]; };
   tsintermittent = derive2 { name="tsintermittent"; version="1.9"; sha256="1mrb6yrsjwj6j40n97sgg42ddvwhjnaiq9k7ka249bbq01gf2975"; depends=[MAPA]; };
   tsmp = derive2 { name="tsmp"; version="0.3.5"; sha256="1gilzxxgaa1qqsk56s7ynlqhz6bssxrpc1h7fxkjp0z9amajvb5h"; depends=[audio doSNOW foreach magrittr progress]; };
@@ -14132,12 +14422,13 @@ in with self; {
   tstools = derive2 { name="tstools"; version="0.3.8"; sha256="0daxrp91hxc367hlzla0s7x5dddnx462239jcq0ickx6awkk753g"; depends=[data_table jsonlite xts zoo]; };
   tsutils = derive2 { name="tsutils"; version="0.9.0"; sha256="09xv5iv6icjbj5rhcsspbs8n2rl9k9gml0iizq8rd5a01153zlsm"; depends=[forecast MAPA RColorBrewer]; };
   tsviz = derive2 { name="tsviz"; version="0.1.0"; sha256="099ga750kr9hrkd8vaxhz6h4gha6zfr9jzqwrmgms2h2h1a7jxr7"; depends=[dplyr forecast ggplot2 lubridate magrittr miniUI plotly shiny shinyhelper]; };
-  tsvr = derive2 { name="tsvr"; version="1.0.0"; sha256="07ifcnij78lw29h1yxjyws3z5mxvk4lz33vgs2dr8ka5mwafbbc0"; depends=[]; };
+  tsvr = derive2 { name="tsvr"; version="1.0.1"; sha256="1lkb6lj3lsx25d671gb804brbv74isrjbj9pd09q84qp7jgrpgyd"; depends=[]; };
   tswge = derive2 { name="tswge"; version="1.0.0"; sha256="0wj0kyb1dcwfn8wjp7skgcflc48cr4va0i0jg8x970658if7z6fz"; depends=[astsa MASS PolynomF signal waveslim]; };
   tsxtreme = derive2 { name="tsxtreme"; version="0.3.2"; sha256="1lmvwk83186qb59k3i4ppv85dvz7fww8wr97mvkl8457mf4n6kg0"; depends=[evd MASS mvtnorm]; };
   ttScreening = derive2 { name="ttScreening"; version="1.6"; sha256="1i8c9l3sdkzl99zxxyfqm84vkh6wjdh3a32l5q8ikf74g9dhxkf4"; depends=[corpcor limma MASS matrixStats simsalapar sva]; };
   ttTensor = derive2 { name="ttTensor"; version="0.99.2"; sha256="1qhpsaa0m8g61mhdffnrpfsc66iwm240na2wsa3cnmydk1mqjlxd"; depends=[Matrix PTAk rTensor tensorr]; };
   ttbbeer = derive2 { name="ttbbeer"; version="1.1.0"; sha256="1azffcizm3460kxvrxxkilc6qxspyi247x8drrw5ywfichwhmdhc"; depends=[]; };
+  ttdo = derive2 { name="ttdo"; version="0.0.3"; sha256="1zb09llgfwf039lzs27f3habzz0c8v3af5b8bxklvkp24mly0arg"; depends=[diffobj tinytest]; };
   ttestshiny = derive2 { name="ttestshiny"; version="0.1.0"; sha256="186569p9h3597z9lxyzm7fj8k6bzgm2kw757dcv2qhhf2k7nfch9"; depends=[dplyr shiny shinyAce shinyjs]; };
   tth = derive2 { name="tth"; version="4.3-2-1"; sha256="19rvmyprl1nk9mmngk6dax8rnli10msfvm3vzp86pbdjxnsh3hjc"; depends=[]; };
   tttplot = derive2 { name="tttplot"; version="1.1.1"; sha256="0rmgp1888y07w0h8kwq1azpr6bysjq4pyjf6ygpra75jj4563wx9"; depends=[]; };
@@ -14163,6 +14454,7 @@ in with self; {
   tvReg = derive2 { name="tvReg"; version="0.4.2"; sha256="1ma6jiqlj5jlsyk37vcddyv427xi8980cbplb40ppync18f7psmp"; depends=[bvarsv MASS Matrix systemfit vars]; };
   tvd = derive2 { name="tvd"; version="0.1.0"; sha256="07al7gpm81a16q5nppsyc5rhv6zzkcvw72isx955b1q189v073aw"; depends=[Rcpp]; };
   tvm = derive2 { name="tvm"; version="0.4.0"; sha256="0v5b9s35q08a4z2ccph7g9q211w04x99sh72lrfby43fgl2jwyd1"; depends=[ggplot2 reshape2]; };
+  tvthemes = derive2 { name="tvthemes"; version="1.0.0"; sha256="1817m5w6qcvsc0ci7nqfwcnn4xv36mlz8cx6f3mzh2ad9dkrc9y6"; depends=[extrafont ggplot2 glue magick scales]; };
   twang = derive2 { name="twang"; version="1.5"; sha256="1sp1vb6l0mwpy9b9my5d3spc0q0zs7xg4dkmi4cl7hy7m9xy1dbk"; depends=[gbm lattice latticeExtra survey xtable]; };
   tweedie = derive2 { name="tweedie"; version="2.3.2"; sha256="10fv998qjxsyx0h94fi0xbh6xbf24nwgh254n9zfnmix9vk2cqls"; depends=[]; };
   tweenr = derive2 { name="tweenr"; version="1.0.1"; sha256="0sq90pbln6lkc2q3zflhkxxwpqdw5dd7igrxhdnlynkdrmi83mpg"; depends=[farver magrittr Rcpp rlang]; };
@@ -14177,10 +14469,10 @@ in with self; {
   twostageTE = derive2 { name="twostageTE"; version="1.3"; sha256="0mkxs3lmzja51zdrf5himhwcdygpj6czhdd2bydakm26kvw7znwr"; depends=[isotone]; };
   twoway = derive2 { name="twoway"; version="0.6.2"; sha256="0q053jvb2sa762bjnpzkxzdcq1wk82ynp4rjl4j6qncqccvqq0c3"; depends=[]; };
   txtplot = derive2 { name="txtplot"; version="1.0-3"; sha256="1949ab1bzvysdb79g8x1gaknj0ih3d6g63pv9512h5m5l3a6c31h"; depends=[]; };
-  txtq = derive2 { name="txtq"; version="0.1.4"; sha256="0qvxz3k7as70wvqnxm5myk8ppan6f3c2vnnk5hqvxa370r3b8a9x"; depends=[base64url filelock R6]; };
+  txtq = derive2 { name="txtq"; version="0.1.6"; sha256="062ljbfix54dsfj4kjc7nmmvdhff5jigds60r1z860hf3bxwvlqi"; depends=[base64url filelock R6]; };
   types = derive2 { name="types"; version="1.0.0"; sha256="01shcin8wjbhbmzl979fj3008xqxssw90g3bjg42cnjxkmnaql59"; depends=[]; };
   uCAREChemSuiteCLI = derive2 { name="uCAREChemSuiteCLI"; version="0.2.0"; sha256="1nccgkxv57inhgvgmhwm4fr8cp28sj8n83za5gam9xx1f42mzsqk"; depends=[ChemmineR usethis]; };
-  uGMAR = derive2 { name="uGMAR"; version="3.1.0"; sha256="0dlks1mm5li72ir18nnd4s9ll20700plha0d82h9wxpkkhwzqzng"; depends=[Brobdingnag pbapply]; };
+  uGMAR = derive2 { name="uGMAR"; version="3.2.0"; sha256="09x7wf5lgqrz5vpgbsl13c4p57amf3wp6yaib10zh1xnmw3fa2i6"; depends=[Brobdingnag pbapply]; };
   uHMM = derive2 { name="uHMM"; version="1.0"; sha256="1516ipadxi7rc1dbinr5rva2fbcr5i2zg3rlli5wy7r6naf8fzzl"; depends=[chron class cluster clValid corrplot FactoMineR HMM tcltk2 tkrplot]; };
   uaparserjs = derive2 { name="uaparserjs"; version="0.1.0"; sha256="1zhz39jrvi64sj0wvwkm4y8gakfp6kz1knw4wn08kk4fa9ymyjvq"; depends=[dplyr purrr V8]; };
   uavRmp = derive2 { name="uavRmp"; version="0.5.4"; sha256="0djx6z9489pr03bf01y2d79ar840q4ffj39j72c8phz27yz40y04"; depends=[brew data_table devtools gdalUtils geosphere htmltools htmlwidgets log4r maptools raster rgdal rgeos roxygen2 sf sp spatial_tools stringr zoo]; };
@@ -14191,22 +14483,22 @@ in with self; {
   udapi = derive2 { name="udapi"; version="0.1.3"; sha256="0qyn6fdh8ia913hn2dl0x99xsm20ps8zm52snswlyb00prinm668"; depends=[curl httr]; };
   udpipe = derive2 { name="udpipe"; version="0.8.3"; sha256="1ys4ss700h3xk4z72lsjavd6vic4ihm00b1mzidq41klrgpwzcb0"; depends=[data_table Matrix Rcpp]; };
   udunits2 = derive2 { name="udunits2"; version="0.13"; sha256="0yav7rm2afcx67xqrknybxgz7x63w78zyxa0xifvc0k2gz0d6mfi"; depends=[]; };
-  ufs = derive2 { name="ufs"; version="0.3.0"; sha256="02w784fjkpx6jq9vbrkxvn7c6vjabna1f7gx9jcrgp77xr2b1d4q"; depends=[digest diptest dplyr GGally ggplot2 ggrepel ggridges gridExtra gtable knitr pander plyr scales SuppDists viridis]; };
+  ufs = derive2 { name="ufs"; version="0.3.1"; sha256="079azpicvimjq7qw1790j5f0vq5jis67lv4r28x3390r9fh04m6l"; depends=[digest diptest dplyr GGally ggplot2 ggrepel ggridges gridExtra gtable knitr pander plyr scales SuppDists viridis]; };
   ui = derive2 { name="ui"; version="0.1.0"; sha256="1pc18v99n1psiiv7jxy3as1qwg2y41i1syrpvkbk05yii1qzsw2b"; depends=[Matrix maxLik mvtnorm numDeriv]; };
-  uiucthemes = derive2 { name="uiucthemes"; version="0.2.1"; sha256="1l96mch9r5npsdv1v4qfyj43ana7a2ff7yj04q6fzhh27v0fx7ak"; depends=[rmarkdown]; };
+  uiucthemes = derive2 { name="uiucthemes"; version="0.3.0"; sha256="0bby3a1fdh3y7yia38qy2gjgcqxkkvp4k13b6iabj219yck9a4lq"; depends=[rmarkdown xaringan]; };
   ukbabynames = derive2 { name="ukbabynames"; version="0.1.1"; sha256="0vrwcf3hixd40ag6kb289anq2ys2k6vdhhsrjbizvndkyn8sr0r0"; depends=[]; };
   ukbtools = derive2 { name="ukbtools"; version="0.11.3"; sha256="1j5p9ypn3s781582all64kvywih1ry0lqsh1zirr35g7r46fy783"; depends=[data_table doParallel dplyr foreach ggplot2 magrittr purrr readr scales stringr tibble tidyr XML]; };
   ukgasapi = derive2 { name="ukgasapi"; version="0.16"; sha256="0bj1dpsz4709dcb297b9rcb4nbzvxxhrqh5sv2qbrcypdh0x2m3b"; depends=[RCurl XML]; };
   ukpolice = derive2 { name="ukpolice"; version="0.1.2"; sha256="0jwc57360cr9fkqzs5j2jmnfagci86jzi6p5d5mpm35drsrzm1ca"; depends=[jsonlite purrr tibble]; };
   ulid = derive2 { name="ulid"; version="0.3.0"; sha256="0xxkqrnlz3pkb3s1gacfzqav54w97gc0w8rh0fn1qy5rkmg2bplv"; depends=[Rcpp]; };
-  umap = derive2 { name="umap"; version="0.2.2.0"; sha256="1s82w9gy1387h7cprjfbhp49l89zbmn3gc9s0wzqb1s73nza9n31"; depends=[Rcpp reticulate RSpectra]; };
+  umap = derive2 { name="umap"; version="0.2.3.1"; sha256="0rzz1s029cn1w1bf5va2pav2lg9j1mq97ibwcln39drvm67kj76d"; depends=[openssl Rcpp reticulate RSpectra]; };
   ump = derive2 { name="ump"; version="0.5-8"; sha256="1sg226caq9y41cwl7wr5s9z3bpq2j5p6rj6fy2pasbzimgzw0byx"; depends=[]; };
-  umx = derive2 { name="umx"; version="2.10.0"; sha256="0sh16dwzkib1gzaj18nk2zdp8pq6ri7hwknzzpz1632r956kd7cy"; depends=[cowplot DiagrammeR ggplot2 knitr lavaan MASS Matrix MuMIn mvtnorm nlme numDeriv OpenMx polycor R2HTML RCurl sfsmisc xtable]; };
+  umx = derive2 { name="umx"; version="3.0.0"; sha256="1d72b2i6qcflaqsabl7cy7ndqvw5r0chji15x925s4mm4cd92gvk"; depends=[cowplot DiagrammeR ggplot2 knitr lavaan MASS Matrix MuMIn mvtnorm nlme numDeriv OpenMx polycor R2HTML RCurl sfsmisc xtable]; };
   unbalanced = derive2 { name="unbalanced"; version="2.0"; sha256="18hy9nnq42s1viij0a5i9wzrrfmmbf7y3yzjzymz2wnrx4f2pqwv"; depends=[doParallel FNN foreach mlr RANN]; };
   unbalhaar = derive2 { name="unbalhaar"; version="2.0"; sha256="0v6bkin1cakwl9lmv49s0jnccl9d6vdslbi1a7kfvmr5dgy760hs"; depends=[]; };
   uncertainty = derive2 { name="uncertainty"; version="0.2.0"; sha256="1mq14ny7l3gy3wjsqijnm37azavyapxszjnckd861h4hgcpdcdjz"; depends=[mvtnorm triangle]; };
   uncmbb = derive2 { name="uncmbb"; version="0.2.0"; sha256="0cvbh7a81g52hd2qzp23jwwjd5406iszf4wilgrz8sjfrfgybgfm"; depends=[dplyr rlang]; };
-  understandBPMN = derive2 { name="understandBPMN"; version="1.1.0"; sha256="11ijxr5nzg6ivx2c9shgba9nfjb8ixypbj8jvhl7zjkwjrpb6f1y"; depends=[devtools dplyr purrr R_utils Rcpp tibble tidyr XML]; };
+  understandBPMN = derive2 { name="understandBPMN"; version="1.1.1"; sha256="04wnyxplrn5c6jb76dw25pawwcvvn5xq80lqn5imsf31nbwybpm5"; depends=[devtools dplyr purrr R_utils Rcpp tibble tidyr usethis XML]; };
   unfoldr = derive2 { name="unfoldr"; version="0.7"; sha256="18qjsmlbqy9nhwyv288r9n3plv22fgb4g73jpyjyzy3hzfamcb17"; depends=[]; };
   ungroup = derive2 { name="ungroup"; version="1.1.1"; sha256="0jrxxp93ak9bva98j3nmkhrb7znz7lpywk56415k4b2rzpy3j7fs"; depends=[MortalitySmooth pbapply Rcpp RcppEigen Rdpack rgl]; };
   uniReg = derive2 { name="uniReg"; version="1.1"; sha256="0wjc7pgaisvk26j7grxp2ypsabb5my9wg6c9i5w9zhh5jdx1fdab"; depends=[DoseFinding MASS mvtnorm quadprog SEL]; };
@@ -14215,14 +14507,14 @@ in with self; {
   unifed = derive2 { name="unifed"; version="1.1.1"; sha256="0bh15cvpasgd0ypcmybbss5s9hsilfxgqj4b0mppj44vxm15bzk6"; depends=[]; };
   uniformly = derive2 { name="uniformly"; version="0.1.0"; sha256="0n3s0x05v4d79jn51nwj06gm074rgy269f57y2q5z0bkwyp6yc7n"; depends=[pgnorm]; };
   uniftest = derive2 { name="uniftest"; version="1.1"; sha256="0a37m7l3lc6rznx10w9h9krnn5paim2i2wvw47ckwag7bv0d4pm4"; depends=[orthopolynom]; };
-  unikn = derive2 { name="unikn"; version="0.1.0"; sha256="08ykiwb7379rrrqxi1363vfrm6cq3vdmfas2plf26jkx4n806rm2"; depends=[]; };
+  unikn = derive2 { name="unikn"; version="0.2.0"; sha256="1lw3wn93bb8y76phnqwhvgn14zrs68rq8xx9hl2wbngispvwpwn1"; depends=[ggplot2]; };
   unine = derive2 { name="unine"; version="0.2.0"; sha256="051dk8fss19h4d9815a7994krr1s3n5q0pxq9gir6zns0vvn05pw"; depends=[Rcpp]; };
   uniqtag = derive2 { name="uniqtag"; version="1.0"; sha256="025q71mzdv3n1jw1fa37bbw8116msnfzcia01p1864si04ch5358"; depends=[]; };
   unitedR = derive2 { name="unitedR"; version="0.3.1"; sha256="06plbhjbn1gflpxarn21knhiwfr02vxprak9qcghl30fkkymd02r"; depends=[plyr]; };
   unitizer = derive2 { name="unitizer"; version="1.4.8"; sha256="1q2l32lkxv87vaih5wqfn6n2a2q6mlaw83mgrn4g5ircp5z3r98j"; depends=[crayon diffobj]; };
-  units = derive2 { name="units"; version="0.6-3"; sha256="0kx640h60s3zzkdr302asap7diap6vri6d41scnx507yvkcqiph3"; depends=[Rcpp]; };
+  units = derive2 { name="units"; version="0.6-4"; sha256="1jz0mzd78sdfxkhqw041ji50hmhjk2ha55i31yjvz35nsw30lwi5"; depends=[Rcpp]; };
   unittest = derive2 { name="unittest"; version="1.3-0"; sha256="0haf3s3pc5bhsm6y5njghr9w8ifsjxczm5r7g0ynylwzvd019n8b"; depends=[]; };
-  univOutl = derive2 { name="univOutl"; version="0.1-4"; sha256="041cc1jn95zababc4i84c378i204zkn865k2vd7mk1piwm3qkrj5"; depends=[Hmisc robustbase]; };
+  univOutl = derive2 { name="univOutl"; version="0.1-5"; sha256="193wrpkvgmlrx43nag8w3ivrlqm37nm6g86wcvd3bgw3hchs70gi"; depends=[Hmisc robustbase]; };
   unival = derive2 { name="unival"; version="1.0.2"; sha256="1sw0z7dmicmka3znrc1c5v0s9g8cpqapacdjzl5i4k5ak2qq35qp"; depends=[optimbase psych]; };
   unix = derive2 { name="unix"; version="1.5"; sha256="0sgm1gzfkfilrsgmv567ld79azmfk076xl998sv139kh9dvwgsyx"; depends=[]; };
   unjoin = derive2 { name="unjoin"; version="0.0.3"; sha256="08vjgl4dnh9kycrvdq5ngf57fy61n0nc582bi4znv06pq696rkwp"; depends=[dplyr rlang tibble]; };
@@ -14233,19 +14525,19 @@ in with self; {
   unsystation = derive2 { name="unsystation"; version="0.2.0"; sha256="02da7wzzk5bwd475i67v5x04ay2bn5yd5xffl1asqcqxcc5sy0m8"; depends=[doParallel foreach iterators Rcpp RcppArmadillo]; };
   untb = derive2 { name="untb"; version="1.7-4"; sha256="1i7m4vfslsix98dwx4jlrsldm7fhhfp25gr7aapcxqxms7ryaby6"; depends=[Brobdingnag partitions polynom]; };
   unvotes = derive2 { name="unvotes"; version="0.2.0"; sha256="0wanvivwm1nmqadq2vapg27kasnjnr0a4np2kw54wj9pg21izqic"; depends=[]; };
-  updog = derive2 { name="updog"; version="1.1.0"; sha256="0zyb9n7wlxvigi4w4rz0nrhpzdycvvdgz6hc4bg4v4bk0k8dnkmk"; depends=[assertthat doParallel foreach ggplot2 ggthemes Rcpp RcppArmadillo stringr]; };
+  updog = derive2 { name="updog"; version="1.1.1"; sha256="0gsklxccvp887mr8rmn0vsmv6746fldbr66s900xa7l4lprn84hm"; depends=[assertthat doParallel foreach ggplot2 ggthemes Rcpp RcppArmadillo stringr]; };
   uplift = derive2 { name="uplift"; version="0.3.5"; sha256="11xikfmg6dg8mhwqq6wq9j9aw4ljh84vywpm9v0fk8r5a1wyy2f6"; depends=[coin MASS penalized RItools tables]; };
   uplifteval = derive2 { name="uplifteval"; version="0.1.0"; sha256="1gnn40c47rpx40j210bz6fb48d70p6spv3drr8hd5b3vzfz6686c"; depends=[dplyr ggplot2 gridExtra whisker]; };
   upmfit = derive2 { name="upmfit"; version="0.1.0"; sha256="0f0rk606v17abgw3mwlwihl6fsxprp44h2xbhv1675i18i36vbgx"; depends=[mcmcplots R2jags]; };
-  uptasticsearch = derive2 { name="uptasticsearch"; version="0.3.1"; sha256="0marsngdcpaavkdxdcqv1k2rvivkh4a0kzh977idjc4lm86c9bdl"; depends=[assertthat data_table futile_logger httr jsonlite purrr stringr uuid]; };
+  uptasticsearch = derive2 { name="uptasticsearch"; version="0.4.0"; sha256="19sf3zdj424pz4ms0xg4asplf2bczvhl8p22y13jna1g51xyv92a"; depends=[assertthat data_table futile_logger httr jsonlite purrr stringr uuid]; };
   uptimeRobot = derive2 { name="uptimeRobot"; version="1.0.0"; sha256="1sbr0vs6jqcyxjbs7q45bsfdnp3bc59phw0h3fwajqq1cxjgzdww"; depends=[plyr RCurl rjson]; };
   upwaver = derive2 { name="upwaver"; version="1.2.0"; sha256="0zz8l7nav59l1n5g7bnqzkw3sh9v857zm0ld68ycmdjy9d0q0yb8"; depends=[assertthat httr rjson XLConnect xlsx]; };
   uqr = derive2 { name="uqr"; version="1.0.0"; sha256="0f7isjfb5almp1zypxzw3lfkygkcixmg0xdsw0zznf61r6qhbqyr"; depends=[gtools Hmisc]; };
   urbin = derive2 { name="urbin"; version="0.1-8"; sha256="0nbcs4rjqdqmyq046kx3nnvaxxzi0rxcxjma11lpn4ws1wdm6bng"; depends=[]; };
   urca = derive2 { name="urca"; version="1.3-0"; sha256="1akaqwf3fvvvx4sgfn641fd4sj51s0701pvfl6s5hnz2k0iwh732"; depends=[nlme]; };
-  urlshorteneR = derive2 { name="urlshorteneR"; version="1.1.1"; sha256="091ycw98cqgxsxky3n60iilhgnf3j9vp9k3c2aspfc646c9z7zm1"; depends=[assertthat httr jsonlite lubridate stringr]; };
+  urlshorteneR = derive2 { name="urlshorteneR"; version="1.1.2"; sha256="1gxyc9a81lsn72x7c29lz6k9k5ylqd0j65yhy2qj8lslnmg869vz"; depends=[assertthat httr jsonlite lubridate stringr]; };
   urltools = derive2 { name="urltools"; version="1.7.3"; sha256="04x3my655dd287cbsszbnf75q0swmjlxxrblcsay7a8n3df3a830"; depends=[Rcpp triebeard]; };
-  uroot = derive2 { name="uroot"; version="2.0-10"; sha256="004f5rzrvvm5s63p4inznvisfj2lr8ndimf6dr44699vbpwljdkj"; depends=[]; };
+  uroot = derive2 { name="uroot"; version="2.1-0"; sha256="1hhq7ns2pyiziwx6sx7sb6445p3nynv7l04rksjngai2vpdaj0iw"; depends=[]; };
   usdarnass = derive2 { name="usdarnass"; version="0.1.0"; sha256="10fh9anpmbb7i70q3hjxbplrkqa1q86zgh8nldsf2i526p62hpm1"; depends=[httr jsonlite readr]; };
   usdm = derive2 { name="usdm"; version="1.1-18"; sha256="1sis47fri2lrbx2ll5ps7bvycjqhncnia800izf11szgayim5lrv"; depends=[raster sp]; };
   usedist = derive2 { name="usedist"; version="0.1.0"; sha256="17mldp0888ig2xc8cp1nhldj5g3srwmbx3mfcnzz21n1fz31jkmg"; depends=[]; };
@@ -14255,19 +14547,19 @@ in with self; {
   usfertilizer = derive2 { name="usfertilizer"; version="0.1.5"; sha256="05zjn39hqjjzzp4v4b1zbqq59205s7k0kikms951h57kbyvjz6vk"; depends=[tidyverse]; };
   uskewFactors = derive2 { name="uskewFactors"; version="2.0"; sha256="0ndi5987ak8sa7krgiglsibfg0k7z9j8fg47hg1m8ar0sq4r1yj6"; depends=[MASS MCMCpack mvtnorm tmvtnorm]; };
   usl = derive2 { name="usl"; version="1.8.0"; sha256="04w7p9i08a51smgg11kh4hablic5rjmr5hndrnlg49j5h20i7w1v"; depends=[nlsr]; };
-  usmap = derive2 { name="usmap"; version="0.4.0"; sha256="1sslvh2wbc52dnc9sy8m312amykcl5bvqhws1lvma5d21jn3scmh"; depends=[]; };
+  usmap = derive2 { name="usmap"; version="0.5.0"; sha256="0fjmmw8xhba31gv8mx9k55881yb94z518csbqas3bvssq5s7048f"; depends=[]; };
   ustyc = derive2 { name="ustyc"; version="1.0.0"; sha256="1267bng2dz3229cbbq47w22i2yq2ydpw26ngqa1nbi3ma6hwqsv4"; depends=[plyr XML]; };
   utc = derive2 { name="utc"; version="0.1.5"; sha256="1lhm5rhr78cxp3cz5n6j2zkhjphj7csk026xvvhkjqdi39rrq6i4"; depends=[]; };
   utf8 = derive2 { name="utf8"; version="1.1.4"; sha256="0m0ywg8k3blfiahxvh1i4zn9dksrlc937d2lbza5fc38zjnrrnpn"; depends=[]; };
-  utile_tables = derive2 { name="utile.tables"; version="0.1.5"; sha256="0z3frv84q1hq60b2qdj7wfxqv62cs9986r0dki7lc0vfs7cyai2h"; depends=[dplyr magrittr purrr rlang survival tibble tidyr utile_tools]; };
-  utile_tools = derive2 { name="utile.tools"; version="0.2.0"; sha256="0k3lj94k6ajfpy36rrzwl8b3w2dccshrsmwn8zl70y5159ivm1z2"; depends=[dplyr lubridate purrr rlang stringr tibble]; };
-  utile_visuals = derive2 { name="utile.visuals"; version="0.2.0"; sha256="1wh41iiqi1lwsjifglr5ip1ajz8vhnijzjpb7l9lwbvivphhlcwh"; depends=[ggplot2 gridExtra purrr utile_tools]; };
+  utile_tables = derive2 { name="utile.tables"; version="0.1.6"; sha256="0azsqsz3rl8nwqj8c7chhipl739wfyf0anvfw29lnw8iwvik6a7y"; depends=[dplyr purrr rlang survival tibble utile_tools]; };
+  utile_tools = derive2 { name="utile.tools"; version="0.2.1"; sha256="1advgh7xymviqj9qr84i9ykgwpb0ihj40q42z4i2xghgnnfwyqfy"; depends=[dplyr lubridate purrr rlang stringr tibble]; };
+  utile_visuals = derive2 { name="utile.visuals"; version="0.2.1"; sha256="107gmlispmvafb2yvv8j869xpbcgyy6by6lj7910j5ll8pn74k55"; depends=[dplyr ggplot2 gridExtra purrr utile_tools]; };
   utility = derive2 { name="utility"; version="1.4.3"; sha256="12g2y9xzzi2sl3ya3va1p7nc7hrjhr4arsz06f8xlxw5n8kvdxag"; depends=[]; };
   utilsIPEA = derive2 { name="utilsIPEA"; version="0.0.6"; sha256="07avc0j6qkzqmznbydn0zdg743g7g7kn2bcx5n03m3wg0fqyggr7"; depends=[data_table dplyr RCurl stringdist stringr]; };
   utiml = derive2 { name="utiml"; version="0.1.5"; sha256="02wxsg1gg2y83cii5ly7r8lk376kas261f9qyl03z55p5m72w9zy"; depends=[mldr ROCR]; };
   uuid = derive2 { name="uuid"; version="0.1-2"; sha256="1gmisd630fc8ybg845hbg13wmm3pk3npaamrh5wqbc1nqd6p0wfx"; depends=[]; };
   uwIntroStats = derive2 { name="uwIntroStats"; version="0.0.7"; sha256="0lihcjd79sqnw64bd2d4p02rl7fmzpyykrdi7b5dsnnwjhr0ks6r"; depends=[Exact geepack plyr sandwich survival]; };
-  uwot = derive2 { name="uwot"; version="0.1.3"; sha256="1mq6qi8q9xslh1b99srj480s2a08pfv4bs9m2ykyijj44j9fcdj9"; depends=[dqrng FNN irlba Matrix Rcpp RcppAnnoy RcppParallel RcppProgress RSpectra]; };
+  uwot = derive2 { name="uwot"; version="0.1.4"; sha256="1y9wpzs92d1fl2x5figfywd48lkyhwx37j542z0rf6ckrl46n89n"; depends=[dqrng FNN irlba Matrix Rcpp RcppAnnoy RcppParallel RcppProgress RSpectra]; };
   vMask = derive2 { name="vMask"; version="1.0"; sha256="14zfmgidlvlmm9anjcz3wvz4crc24ysq7jj1j1078fp7px5vvr8z"; depends=[]; };
   vaersNDvax = derive2 { name="vaersNDvax"; version="1.0.4"; sha256="0hvw7vbxs87c9xkdv3617fkjwz2dbawscbd7dgaixhdhcr3k823a"; depends=[]; };
   vaersvax = derive2 { name="vaersvax"; version="1.0.5"; sha256="0bfbpdjnykvb9r0p28bz8lrqxksy4jvwnd28y6gdlprpisiipiic"; depends=[]; };
@@ -14275,19 +14567,22 @@ in with self; {
   vagam = derive2 { name="vagam"; version="1.0"; sha256="01bij09nzb6lg2rac2yjnbpywvllgk5dnm50a5k3qffp6fhywa80"; depends=[gamm4 Matrix mgcv mvtnorm truncnorm]; };
   valaddin = derive2 { name="valaddin"; version="1.0.0"; sha256="0dws2mcjpyw0jn0h6badhlnxg88c6mgzvcp2fjjrpr5mpcgps1c8"; depends=[lazyeval]; };
   valection = derive2 { name="valection"; version="1.0.0"; sha256="0104zcg3cw57ksgmb321hnyv095mn3frxci9vikj1smwarpnrpzc"; depends=[testthat]; };
+  valetr = derive2 { name="valetr"; version="0.1.0"; sha256="0lwdqx3wn8dn5cxypnmhwr8py461iyccgq437az0209akc72a7z4"; depends=[curl jsonlite]; };
   validann = derive2 { name="validann"; version="1.2.1"; sha256="00c0hkjiv8n7mksx6sknb4xkkivxr1ml31k697csv4imwrk09dy5"; depends=[moments]; };
-  validate = derive2 { name="validate"; version="0.2.6"; sha256="0aadfqk02c3qjzyn0n7g62b5dv1mhyic76xprfa2cdy3sg8vp8jd"; depends=[settings yaml]; };
+  validate = derive2 { name="validate"; version="0.9.2"; sha256="1zy94dipyw7cgfq3cp7a5dmri7lw6h4m0nrzgf5gq49dsqpyvnlz"; depends=[settings yaml]; };
   validateRS = derive2 { name="validateRS"; version="1.0.0"; sha256="1ivw9ddr6z2wrsqvhbn87p5pikhkxlz8p45pb5nq13dvs359vkww"; depends=[data_table reshape2 triangle truncnorm]; };
   validatejsonr = derive2 { name="validatejsonr"; version="1.0.4"; sha256="1n8jf7j3hvz47z1x3gqz5yj5wxfjzz0zgzkgckdvy1nbsqf7w3cr"; depends=[Rcpp]; };
   validatetools = derive2 { name="validatetools"; version="0.4.6"; sha256="19qn2azx3yhjmz286bbn37kgvilmhg13mpnxwqj1qaa3791jhq8r"; depends=[lpSolveAPI validate]; };
   valorate = derive2 { name="valorate"; version="1.0-1"; sha256="06vczszpkipsxfs7h6ld33vvxb5ci62rwg3cglwy3lcfifhbnsfi"; depends=[survival]; };
   valottery = derive2 { name="valottery"; version="0.0.1"; sha256="0rlv8agm9ng4jcb9ixqifh7kjczvkx7047brq8yf9kg7rb8mzgpz"; depends=[]; };
   valr = derive2 { name="valr"; version="0.5.0"; sha256="14jhrwkiwmha3vlmm7b50n2xxyizj6ddmy89gb20mpzq7qhz1ika"; depends=[broom dplyr ggplot2 Rcpp readr rlang stringr tibble]; };
+  valueEQ5D = derive2 { name="valueEQ5D"; version="0.4.4"; sha256="05949qd1ydiz86kp4vanv8g6z0mry9iyjr7ja2ni919sz91bw0zs"; depends=[dplyr rstudioapi stringr testthat]; };
   valuer = derive2 { name="valuer"; version="1.1.2"; sha256="0mbwzsvy34ppngyxdzpd9w1r4f00cik4maqab9kpiflrrv9xdp78"; depends=[ggplot2 orthopolynom R6 Rcpp RcppEigen timeDate yuima]; };
   vamc = derive2 { name="vamc"; version="0.1.0"; sha256="1rcyj2zsx33rxmhw7p1i45cm6z6380df0bayxlyizi7vh43ggy6p"; depends=[Rdpack]; };
   vanddraabe = derive2 { name="vanddraabe"; version="1.1.1"; sha256="094kd72slq0n3pk0p6zps241aszb9yql49h4mr007zf0kn8wlf8v"; depends=[bio3d cowplot fastcluster ggplot2 openxlsx reshape2 scales]; };
   vanquish = derive2 { name="vanquish"; version="1.0.0"; sha256="01di1j36npl7vnyhgsagvyf6j8bxcw867dwf9dgi7l1328s7lf0l"; depends=[changepoint e1071 ggplot2 VGAM]; };
-  vapour = derive2 { name="vapour"; version="0.2.0"; sha256="1dqf9avd7nirajy98pz2jsk0nhar4msg5q900brb2kkhpg0kvn3p"; depends=[Rcpp]; };
+  vapour = derive2 { name="vapour"; version="0.4.0"; sha256="0vv8vd5gkhf7vjicm1r3c6liibgvdfnm030b1p7fm71jb7ycg49p"; depends=[Rcpp]; };
+  varEst = derive2 { name="varEst"; version="0.1.0"; sha256="0i6nsxl5w4zipzrmdvx8plmxr33n405w2qhks3s7zzs3kcys32v6"; depends=[caret glmnet lm_beta SAM]; };
   varImp = derive2 { name="varImp"; version="0.3"; sha256="08kqnqv29bmw2lqnsyffnbwr3a0f97mf593pkwzak6wy0mkqrm5z"; depends=[measures party]; };
   varSel = derive2 { name="varSel"; version="0.1"; sha256="0ddj3swfxzchs75kfi6h25h3c33hpapnd5kcwcijnqhlh902b1r0"; depends=[]; };
   varSelRF = derive2 { name="varSelRF"; version="0.7-8"; sha256="0h49rl1j13yfh97rsfsyh9s2c4wajny4rzms2qw77d0cavxqg53i"; depends=[randomForest]; };
@@ -14296,7 +14591,7 @@ in with self; {
   varbvs = derive2 { name="varbvs"; version="2.5-16"; sha256="0pji7vqpbih01y7n0q6zpxhfszznzig4z3hmmpr4jqpdplv13x8d"; depends=[lattice latticeExtra Matrix nor1mix Rcpp]; };
   varclust = derive2 { name="varclust"; version="0.9.4"; sha256="0knmfq3pn38j8p29j6sqapdv3g5335si3gwiw932ml5z49a8ga5m"; depends=[doParallel doRNG foreach pesel RcppEigen]; };
   vardiag = derive2 { name="vardiag"; version="0.2-1"; sha256="07i0wv84sw035bpjil3cfw69fdgbcf2j8wq4k22narkrz83iyi2z"; depends=[]; };
-  vardpoor = derive2 { name="vardpoor"; version="0.15.0"; sha256="1zz3gqri7g24wbz1b76qmsl8s79ry7vdi0dj77hd6zncdgch1bzv"; depends=[data_table foreach ggplot2 laeken MASS plyr pracma stringr surveyplanning]; };
+  vardpoor = derive2 { name="vardpoor"; version="0.16.0"; sha256="09dy1q1lx3b53an7qdszqzl5r4aswddy3046cvz997k1f692mwda"; depends=[data_table foreach ggplot2 laeken MASS plyr pracma stringr surveyplanning]; };
   varhandle = derive2 { name="varhandle"; version="2.0.3"; sha256="11yisjgqc8fq0sj1kzgp51i926cs4yqkpfmbis5ak786wqalc6na"; depends=[]; };
   variables = derive2 { name="variables"; version="1.0-2"; sha256="02q1fyd7r0xclvwbiqz07dr6y5g2sqfjj1qv5hvvhs0vmx93w7f9"; depends=[]; };
   varian = derive2 { name="varian"; version="0.2.2"; sha256="0jyw46qx2w19h02mrwv3w3n8qc1n4b3ckm38qly1y4a4w9ib6c2i"; depends=[Formula ggplot2 gridExtra MASS rstan]; };
@@ -14305,6 +14600,7 @@ in with self; {
   varjmcm = derive2 { name="varjmcm"; version="0.1.0"; sha256="02l0d896faakh9pdq2rzl2psmrj7l2pvacz7nk3r6552glsk7h18"; depends=[expm jmcm MASS Matrix]; };
   varrank = derive2 { name="varrank"; version="0.2"; sha256="19c40wwiadyqwn4z7nd22ynpa4wxr2anr2487mllmpg1d7wz3y38"; depends=[FNN]; };
   vars = derive2 { name="vars"; version="1.5-3"; sha256="0zc6v827ll19n088n31afgjf65zqwvyzmmj4q3ab1xhqzxfsgbw6"; depends=[lmtest MASS sandwich strucchange urca]; };
+  varsExplore = derive2 { name="varsExplore"; version="0.1.0"; sha256="1sscz565i288nmk7sv03kj2xysfppvil4nl2lxxbvp3y4mrkz09b"; depends=[dplyr DT glue magrittr purrr rio rstudioapi stringr tidyr]; };
   vaultr = derive2 { name="vaultr"; version="1.0.2"; sha256="1b7g0jplp5dw1img7d6wm75gaycb3z8a8mzc6s0iwvhbfl8vf574"; depends=[getPass httr jsonlite R6]; };
   vbdm = derive2 { name="vbdm"; version="0.0.4"; sha256="1rbff0whhbfcf6q5wpr3ws1n4n2kcr79yifcni12vxg69a3v6dd3"; depends=[]; };
   vbsr = derive2 { name="vbsr"; version="0.0.5"; sha256="1avskbxxyinjjdga4rnghcfvd4sypv4m39ysfaij5avvmi89bx3b"; depends=[]; };
@@ -14312,7 +14608,7 @@ in with self; {
   vcdExtra = derive2 { name="vcdExtra"; version="0.7-1"; sha256="163x9hhvhgdmrqbcig7b120lk63svy0y652scbrcb11f85zrgb0c"; depends=[ca gnm MASS vcd]; };
   vcfR = derive2 { name="vcfR"; version="1.8.0"; sha256="1684lamsivwaqzvmwzhrrziwczkaqn3mhbdr86zbjdhr1jcgkz2z"; depends=[ape dplyr magrittr memuse pinfsc50 Rcpp stringr tibble vegan viridisLite]; };
   vcov = derive2 { name="vcov"; version="0.0.1"; sha256="1w89mr8dk6436bxap28rszajgm9k7sjfqsr1i4p68dlhw8zk4yq1"; depends=[]; };
-  vcr = derive2 { name="vcr"; version="0.2.6"; sha256="0gqsiphlnq1lh6mqg9ikipxfzyzdiqxcvbwi0gpgfjk10gjj8f13"; depends=[base64enc crul httr lazyeval R6 urltools webmockr yaml]; };
+  vcr = derive2 { name="vcr"; version="0.3.0"; sha256="0wbd6mf2v769rl0h1dw4fzznypaavfr1gw51sk100qiln46jvz05"; depends=[base64enc crul httr lazyeval R6 urltools webmockr yaml]; };
   vcrpart = derive2 { name="vcrpart"; version="1.0-2"; sha256="1xfvsxgyf39d2qxnm40nzkqp7q12y8nbpn9h154n876zxxfs7gh1"; depends=[formula_tools nlme numDeriv partykit rpart sandwich strucchange ucminf zoo]; };
   vctrs = derive2 { name="vctrs"; version="0.2.0"; sha256="05h0y8qzwc899qj84gkhg4jwzscd065as00d4d8smv42h4i8zkjv"; depends=[backports digest ellipsis glue rlang zeallot]; };
   vcvComp = derive2 { name="vcvComp"; version="1.0.1"; sha256="1103hjzd29f8gpsfbagdryq52m6fkhhh9dbqhbmhixxlimc7sd03"; depends=[]; };
@@ -14323,7 +14619,7 @@ in with self; {
   veccompare = derive2 { name="veccompare"; version="0.1.0"; sha256="03nyyxvhhwfxxg5w6qflk7q234ipbhj9fd4abcp50sxz3diabch1"; depends=[corrplot gtools pander purrr qgraph reshape2 VennDiagram]; };
   vecsets = derive2 { name="vecsets"; version="1.2.1"; sha256="086af6swjpbkd140yvb76affy5gn4p9xm41m3akm8axc3qk0hybg"; depends=[]; };
   vegalite = derive2 { name="vegalite"; version="0.6.1"; sha256="0dlzhvrg3nj6knyycdgg3d1vzq3dn9vxb34fjin9hzilszqmarbk"; depends=[base64 clipr digest htmltools htmlwidgets jsonlite magrittr webshot]; };
-  vegan = derive2 { name="vegan"; version="2.5-5"; sha256="0wb90ng02gi13854bjq0b8a2vrknyhb0s0l1v3z38c4zy9k54sw7"; depends=[cluster lattice MASS mgcv permute]; };
+  vegan = derive2 { name="vegan"; version="2.5-6"; sha256="0g60rgn1i7wqf9pf5m1yki1m45gcp7i5hmjic0ci0f6vng70mh5k"; depends=[cluster lattice MASS mgcv permute]; };
   vegan3d = derive2 { name="vegan3d"; version="1.1-2"; sha256="01yyhrapdvs6rr5hw1ij4jnpz7mq005s35pn96snpy8ngn6ir386"; depends=[cluster rgl scatterplot3d vegan]; };
   vegawidget = derive2 { name="vegawidget"; version="0.2.1"; sha256="1afmz3bpd863hghvfbv3yicy9hf29fr9ga741yxbkx5jd8grxzzs"; depends=[assertthat glue htmltools htmlwidgets jsonlite magrittr rlang]; };
   vegclust = derive2 { name="vegclust"; version="1.7.7"; sha256="0f81jw429ib601lvbzi4q23kb5n6lvavlgw56wfqdmvvkl68vwlc"; depends=[circular Kendall MASS Rcpp sp vegan]; };
@@ -14331,7 +14627,7 @@ in with self; {
   vegetarian = derive2 { name="vegetarian"; version="1.2"; sha256="15ys1m8p3067dfsjwz6ds837n6rqd19my23yj8vw78xli3qmn445"; depends=[]; };
   vegperiod = derive2 { name="vegperiod"; version="0.2.6"; sha256="0v8bpxaa0xp8ywnycxs3613scncrhv8g7p99j6n5hs26m4h1km49"; depends=[]; };
   vegtable = derive2 { name="vegtable"; version="0.1.4"; sha256="1gk80i4gi98nigiya4n8ng8d2y7l3j63i1ijg4g80nfr5w64qh5w"; depends=[foreign plotKML qdapRegex sp stringi taxlist vegdata]; };
-  vein = derive2 { name="vein"; version="0.7.12"; sha256="1f2x8bdhfsj5v6gql1qq8g2lrxjj5z9pji2iirsy1samqxnnpirk"; depends=[data_table eixport sf sp units]; };
+  vein = derive2 { name="vein"; version="0.8.0"; sha256="1yaz7vxcb6sspalsdzjjb0i08w0s2f0p3ms0gli1v8z4qfgg5izz"; depends=[data_table eixport sf sp units]; };
   velociraptr = derive2 { name="velociraptr"; version="1.1.0"; sha256="0a67vmv05cxc9f27aqzr6nkgy2mj3fhykwj5nb23qwfqa669a5hi"; depends=[sf]; };
   velox = derive2 { name="velox"; version="0.2.0"; sha256="1jrarfsfflvpc0dqh5gnw92fk8zic222n7pr7hd0lhr5d389k6d0"; depends=[BH raster Rcpp rgdal rgeos sf sp]; };
   vembedr = derive2 { name="vembedr"; version="0.1.3"; sha256="0zg6j0g9l7j36ifwabhxrin5z0dics66bqkc7x6rqijmizk1xpba"; depends=[htmltools httr magrittr stringr]; };
@@ -14349,9 +14645,10 @@ in with self; {
   vfprogression = derive2 { name="vfprogression"; version="0.7.1"; sha256="0kgw1jx0rl9v8qy8qg7zjzdgvwqdi7k1lsvsx3lnpw4sfpkzsq23"; depends=[]; };
   vhica = derive2 { name="vhica"; version="0.2.4"; sha256="0km49lrzn9rm3wxadwxc290dvx3bsblbmna7f9lnkq6g1z5jdqwg"; depends=[]; };
   viafr = derive2 { name="viafr"; version="0.1.0"; sha256="14y5k1vskfzxfpzjkk9602p8mvvyfrf3qpr517zdb714wv3gwk3h"; depends=[assertthat crul dplyr jsonlite magrittr purrr rlang stringr tibble tidyr utf8]; };
+  vici = derive2 { name="vici"; version="0.5.2"; sha256="0qad8ab04ndd29kcmd388piiymablfc7xlv6iml4sxkid7z5kgby"; depends=[cowplot DT ggplot2 ggpubr nlme shiny tidyr]; };
   vietnamcode = derive2 { name="vietnamcode"; version="0.1.1"; sha256="0vc0c1fg30afar2dkch5h27b8jbglcd9ja6d5hcypnibqz4c68vz"; depends=[]; };
   viewshed3d = derive2 { name="viewshed3d"; version="2.0.0"; sha256="0wil1k64clfzjl2j5gl4xi4m4q0l15frxsphvsajp5hqgfpk6fn0"; depends=[data_table doParallel foreach iterators rgl tcltk2 viridis VoxR]; };
-  vimp = derive2 { name="vimp"; version="1.1.4"; sha256="146z6xismk97613cdiz508hn0mgg0w0rqnjb9as66sq57kqgn5yn"; depends=[SuperLearner]; };
+  vimp = derive2 { name="vimp"; version="1.1.6"; sha256="1jczlg8sa62f9skn32gbc094lbm41w5hp65w1k1imqxcvb43n8ql"; depends=[SuperLearner]; };
   vinereg = derive2 { name="vinereg"; version="0.5.0"; sha256="17qni21jaizmfzl975xd39ahlc5flfnmy6xy7n9adfv346f3zwp0"; depends=[cctools furrr future kde1d rvinecopulib]; };
   vines = derive2 { name="vines"; version="1.1.5"; sha256="057d2fdh03cq9kh4vz94arqscahmz14xbr2g59l0vn205lnyilf1"; depends=[ADGofTest copula cubature TSP]; };
   violinmplot = derive2 { name="violinmplot"; version="0.2.1"; sha256="1j3hb03y988xa704kp25v1z1pmpxw5k1502zfqjaf8cy4lr3kzsc"; depends=[lattice]; };
@@ -14361,30 +14658,31 @@ in with self; {
   vipor = derive2 { name="vipor"; version="0.4.5"; sha256="112gc0d7f8iavgf56pnzfxb7hy75yhd0zlyjzshdcfbnqcd2a6bx"; depends=[]; };
   viridis = derive2 { name="viridis"; version="0.5.1"; sha256="060rf1jn29dq53y3nhb0hykvcap6rqsk04rq544ypiiqb18ngwnx"; depends=[ggplot2 gridExtra viridisLite]; };
   viridisLite = derive2 { name="viridisLite"; version="0.3.0"; sha256="1by2l05f0yabwvv64lhnv7bbhx0w683s3wr9j2xda920ghpa23kq"; depends=[]; };
+  viromeBrowser = derive2 { name="viromeBrowser"; version="1.0.0"; sha256="0adyf6ssi0ph7x880inj1vfmpjfbsaavjavjnrpr9cb6p0qdmvyc"; depends=[Biostrings data_table DT ggplot2 markdown plyr rbokeh reshape Rsamtools shiny shinycssloaders shinydashboard shinyWidgets stringr]; };
   virtualPollen = derive2 { name="virtualPollen"; version="1.0.0"; sha256="16q1smwh3ryids3pa7lb4i4pxmjjyl449w6fikkrm9ybj1k8gfcf"; depends=[cowplot ggplot2 mgcv plyr tidyr viridis]; };
   virtualspecies = derive2 { name="virtualspecies"; version="1.5"; sha256="1n6qrh53a12n8ir4r16slb1qxxwm6h5kj96hpxalaqlbrr1sm3yz"; depends=[ade4 raster rworldmap sp]; };
   virtuoso = derive2 { name="virtuoso"; version="0.1.3"; sha256="12rpqrhsj0n3f360w2gh1mwjjd6w9mv42116z86zaxvic8hf5694"; depends=[curl DBI digest fs ini odbc processx ps rappdirs]; };
   virustotal = derive2 { name="virustotal"; version="0.2.1"; sha256="0lky75al8zcvmfgx7a2s3bij8ya4avdsnv046lk7564zfd8rbymw"; depends=[httr plyr]; };
-  visNetwork = derive2 { name="visNetwork"; version="2.0.7"; sha256="0a2ihqg2n9b5nzdb63r4q6d6lnssh1930x763f8f269sd9ih3b8m"; depends=[htmltools htmlwidgets jsonlite magrittr]; };
+  visNetwork = derive2 { name="visNetwork"; version="2.0.8"; sha256="0l9h14k69vfpw64qggjcqy7vv86dvhjsy3aq2hrm2h6bpz503jl9"; depends=[htmltools htmlwidgets jsonlite magrittr]; };
   visTree = derive2 { name="visTree"; version="0.8.1"; sha256="1l07zfr2hagjpdxfw5290wa3ki4bl7iqxrrhda0d1bp3wmwfz0ai"; depends=[colorspace partykit rpart]; };
   visdat = derive2 { name="visdat"; version="0.5.3"; sha256="1ikqp29nncbw1xlwyb9dqqgcdk9q0bs3wxhnhnjpb11vcjv7cz2j"; depends=[dplyr ggplot2 glue magrittr purrr readr tibble tidyr]; };
+  visit = derive2 { name="visit"; version="2.1"; sha256="0kkspih7m18g5pqlwrxpgjdwqxpp23c3xyvcnvv247abl9aq81rd"; depends=[BH Rcpp RcppEigen rstan sqldf StanHeaders]; };
   visreg = derive2 { name="visreg"; version="2.5-1"; sha256="106i8y16iam1kbfqd56447vfhk5mixkm92gpqcl8rf6ycd6vi5y5"; depends=[lattice]; };
   vistime = derive2 { name="vistime"; version="0.8.1"; sha256="0nm7sdbj99nlb46rfs5w2k62v1iikfymmz934rb21rn7cj8hs99p"; depends=[plotly RColorBrewer]; };
   vistributions = derive2 { name="vistributions"; version="0.1.1"; sha256="1s68dpcy55v6yw7ivh2xpshz6qc0qaifjd15h7rjg3zl1cx81mh3"; depends=[ggplot2 magrittr shiny]; };
   visualFields = derive2 { name="visualFields"; version="0.6"; sha256="1w6wkyzjakj6ss9nv4gzkgva4m21jbsz10c2jy660bjb25rf59ih"; depends=[deldir flip gtools Hmisc matrixStats spatstat]; };
-  visualR = derive2 { name="visualR"; version="2.0.1"; sha256="1q0vzxh6zy76yr5bd55781fk9cb7xr1bpf1fywzsi6341ds5qxys"; depends=[dplyr jsonlite optionstrat plotly quantmod zoo]; };
   visualize = derive2 { name="visualize"; version="4.3.0"; sha256="1s49sx828f25d4n93mn28xdbc81zflk2sr3h8ffs2mkjr888qd8y"; depends=[]; };
-  visvow = derive2 { name="visvow"; version="0.6.0"; sha256="0f6w7gv8pglzvnixxk0x418wva2yzc108hm0rr99rdxqixl56lyc"; depends=[Cairo DT ggdendro ggplot2 ggrepel MASS plot3D plyr pracma psych Rdpack readxl Rtsne shiny shinyBS splitstackshape svglite WriteXLS]; };
+  visvow = derive2 { name="visvow"; version="0.8.0"; sha256="1h88sbsdwbf7cpy4y6glhqla9rhi8sbzi3lxxza7yaawhg567pp9"; depends=[Cairo DT ggdendro ggplot2 ggrepel MASS plot3D plyr pracma psych Rdpack readxl Rtsne shiny shinyBS splitstackshape svglite WriteXLS]; };
   vita = derive2 { name="vita"; version="1.0.0"; sha256="114p2lzcr8rn68f0z4kmjdnragqlmi18axda9ma4sbqh8mrmjs9v"; depends=[randomForest Rcpp]; };
   vitae = derive2 { name="vitae"; version="0.2.0"; sha256="0wxd4dlw8s5wi3x9nb6kn1yb3fjg1fbswx4dfg7pl6w19gx8ff4v"; depends=[bookdown dplyr glue knitr RefManageR rlang rmarkdown]; };
   vitality = derive2 { name="vitality"; version="1.3"; sha256="17micfmlksnw167vavvhlk431fm20k74y5ggs47pgz5fwpm854zp"; depends=[]; };
-  vivo = derive2 { name="vivo"; version="0.1.0"; sha256="1xsx7qv30m9zyfqckdzycml563z1xrm0jmsbahs7il55xwg2pndh"; depends=[dplyr ggplot2 ingredients]; };
+  vivo = derive2 { name="vivo"; version="0.1.1"; sha256="0qqzlf1hhalbblx6qsl1i9s4l7hybdpd5xpwjwcv4zgjizvzgbpx"; depends=[DALEX dplyr ggplot2 ingredients]; };
   vkR = derive2 { name="vkR"; version="0.1"; sha256="0rb66am3y009wli8ykl58i02kzm6cdqz5v5d4vvzlbngz8crdkyy"; depends=[httr jsonlite XML]; };
   vlad = derive2 { name="vlad"; version="0.2.0"; sha256="0bq91n51f9cnvbqskk0vg6xn559z3a33csbvyhvcvhyjcws2yahp"; depends=[Rcpp RcppArmadillo]; };
   vmd = derive2 { name="vmd"; version="0.1.0"; sha256="17c06a9l6i90ivpvf3rgv6yrsqv36qmywmmy92y5b81zqhgmh907"; depends=[ggplot2 magrittr R6 Rcpp reshape2 scales]; };
   vmsbase = derive2 { name="vmsbase"; version="2.2.0"; sha256="1hmgi63qwf7530pxl6w8cv74sjnngf83rb5hx7icjlqr1z6x2hms"; depends=[AMORE cairoDevice chron cluster DBI ecodist fields foreign ggmap ggplot2 gmt gsubfn gWidgets gWidgetsRGtk2 intervals mapdata maps maptools marmap outliers PBSmapping plotrix R6 RSQLite sp sqldf VennDiagram]; };
   vocaldia = derive2 { name="vocaldia"; version="0.8.2"; sha256="15314sq2gbi1z47ppvy8y3ljjk12jq4k5a1dfyi56h2lpzrc76ny"; depends=[]; };
-  volesti = derive2 { name="volesti"; version="1.0.2"; sha256="1pqg96dkhiqp2wqpl18hivsxddvvf6ym3zp0rglsnmaxlmqyky1v"; depends=[BH Rcpp RcppEigen]; };
+  volesti = derive2 { name="volesti"; version="1.0.3"; sha256="099c49dy9iqrvmrmcm6h8af4q50q6b0ymnkk0s2bzaqczbpkwibj"; depends=[BH Rcpp RcppEigen]; };
   volleystat = derive2 { name="volleystat"; version="0.2.0"; sha256="0n1r0bvvmba21cs3qgpnw9jxpgl2n82fhxa40sa1w2gav5rch5i6"; depends=[]; };
   voronoiTreemap = derive2 { name="voronoiTreemap"; version="0.2.0"; sha256="1wvnqdrvba4ss4f3k8gzb720irdq2brv2aaq16ywifv8fnjf02r3"; depends=[data_tree DT htmlwidgets rlang shiny shinyjs]; };
   vortexR = derive2 { name="vortexR"; version="1.1.6"; sha256="113ndhf2f3hlhmgbg6gh5fq1az6d314fwl872dwypj2zsvfm7x03"; depends=[betareg data_table GGally ggplot2 glmulti gtools irr plyr R_utils stringr vortexRdata]; };
@@ -14407,7 +14705,7 @@ in with self; {
   vsgoftest = derive2 { name="vsgoftest"; version="0.3-2"; sha256="020kghcfv8h0i7fzq3p2grhhbwvqmc9ya9r7lc1kiqg1bfgljg91"; depends=[fitdistrplus Rcpp]; };
   vstsr = derive2 { name="vstsr"; version="1.0.0"; sha256="0flsw5yw1vmj5x866klxmjqz5aimkvjiwl1zdciz63p9zffmb4gz"; depends=[httr jsonlite magrittr R6 RCurl xml2]; };
   vtable = derive2 { name="vtable"; version="0.5.0"; sha256="02dagwaakf08v9y2lm5j2r5bfz8sg6ac0hv6akmjp0llq2bd725d"; depends=[sjlabelled]; };
-  vtreat = derive2 { name="vtreat"; version="1.4.4"; sha256="0wsa2aaggscaig6zgnxl7xi9a2r6256j6dw85493b3lfifb6bdq4"; depends=[wrapr]; };
+  vtreat = derive2 { name="vtreat"; version="1.4.7"; sha256="1x2z1sc45jnbnj3p2nfb7v1r2f4lca86ky0znl5hlvk174d2nxyf"; depends=[wrapr]; };
   vtree = derive2 { name="vtree"; version="2.0.0"; sha256="1zxsvzbyq6nkghg9dx1zxs2mnxzwv54nv317fh3vq45c6wdj43cn"; depends=[DiagrammeR DiagrammeRsvg rsvg]; };
   vudc = derive2 { name="vudc"; version="1.1"; sha256="0zxz6n3ixa3xjzcinky8ymqjx9w8y8z65mz8d84dl00mxzkmkz4h"; depends=[]; };
   vwline = derive2 { name="vwline"; version="0.2-2"; sha256="1hilr996xn5wh8kfyab55w2i1c02a8x909h4ahag5q6s7603qng5"; depends=[gridBezier polyclip]; };
@@ -14426,7 +14724,7 @@ in with self; {
   waiter = derive2 { name="waiter"; version="0.0.1"; sha256="1zl95v01qbnrs7nh2rcmhjny57wvfylzrdm7gpyyxj753mzwla6b"; depends=[shiny]; };
   wakefield = derive2 { name="wakefield"; version="0.3.3"; sha256="05z9a6g1cdavalp50wss7klnlcdbv3y1jvz1v8ry1x2bziy216y2"; depends=[chron dplyr ggplot2 stringi]; };
   walkalytics = derive2 { name="walkalytics"; version="0.1.0"; sha256="1kl6kwwnl67d45akna01xp389wjxsxlc84l0bcpadbipsqyb3kd1"; depends=[base64enc dplyr httr purrr sp stringr tibble]; };
-  walker = derive2 { name="walker"; version="0.2.5"; sha256="0y2g0pqv2147x6sa5ksyaj6hg6zs14z935cyw06vxc6bbia2isw6"; depends=[bayesplot BH dplyr ggplot2 KFAS Rcpp RcppArmadillo RcppEigen rstan StanHeaders]; };
+  walker = derive2 { name="walker"; version="0.3.0"; sha256="0p45mq6xfpzr82y8pbfv04r85prvygm6z01xda4paicmimynd2r4"; depends=[bayesplot BH dplyr ggplot2 KFAS Rcpp RcppArmadillo RcppEigen rstan StanHeaders]; };
   walkr = derive2 { name="walkr"; version="0.4.0"; sha256="1lra3ard90nzlpwwfiq50ghd3qv5xnmsp8rjhlq9rkpa7xazsnx8"; depends=[hitandrun limSolve MASS Rcpp RcppEigen shinystan]; };
   walkscoreAPI = derive2 { name="walkscoreAPI"; version="1.2"; sha256="1c2gfkl5yl3mkviah8s8zjnqk6lnzma1yilxgfxckdh5wywi39fx"; depends=[]; };
   wallace = derive2 { name="wallace"; version="1.0.6"; sha256="0pnkwdfmimnvyygbz1iz1b9fhcdi7k53wjw44kmnr2b7ln9pbcl2"; depends=[dismo dplyr DT ENMeval leaflet leaflet_extras magrittr maptools raster RColorBrewer rgdal rgeos rmarkdown shiny shinyjs shinythemes spocc spThin XML zip]; };
@@ -14434,7 +14732,7 @@ in with self; {
   walmartAPI = derive2 { name="walmartAPI"; version="0.1.5"; sha256="1nng8izncj2nmmpywn1ggpzvjh8q7y3q6260qhy9kbmvrrl26spf"; depends=[dplyr glue httr magrittr purrr stringr tibble]; };
   walrus = derive2 { name="walrus"; version="1.0.3"; sha256="1nk2glcvy4hyksl5ipq2mz8jy4fss90hx6cq98m3w96kzjni6jjj"; depends=[ggplot2 jmvcore R6 WRS2]; };
   wand = derive2 { name="wand"; version="0.5.0"; sha256="0y9xmh9a93lnadg83i223j2nf77jazz8m1ck1bmdf5jwj4vyzaqa"; depends=[]; };
-  warbleR = derive2 { name="warbleR"; version="1.1.15"; sha256="1vd2yvb1crzxbrbfk8iv31ir09xc646m8glfgqkgazhnj0y6l6yr"; depends=[bioacoustics bitops dtw fftw iterators jpeg maps monitoR NatureSounds pbapply pracma RCurl rjson seewave Sim_DiffProc soundgen tuneR]; };
+  warbleR = derive2 { name="warbleR"; version="1.1.17"; sha256="0chpq5sr1qzv5ymcqg98k2g8rkmwpazjmxi50q0jvlkqijvr1m5j"; depends=[bitops dtw fftw iterators jpeg maps monitoR NatureSounds pbapply pracma RCurl rjson seewave Sim_DiffProc soundgen tuneR]; };
   warpMix = derive2 { name="warpMix"; version="0.1.0"; sha256="13zbl4aifhg7j5b3vpwgzgs09hr7yblz0rckmj5qh40s78j8cpfn"; depends=[fda fields lme4 MASS nlme reshape2]; };
   washdata = derive2 { name="washdata"; version="0.1.2"; sha256="01cnlhymh3qg9c7fda8s6lvm4j2vklmb72dfk17sn4p0kkikf9m8"; depends=[]; };
   washeR = derive2 { name="washeR"; version="0.1.2"; sha256="0sb5sgwf7y9sd291qfj1az3x6h6gmznnnsdmqizkmv2xz9029rxz"; depends=[gplots]; };
@@ -14461,28 +14759,28 @@ in with self; {
   wdm = derive2 { name="wdm"; version="0.2.1"; sha256="05yc366g2lii305ljrhh9939gf8sf517alw5xcr2sdclr00qxal4"; depends=[Rcpp]; };
   wdman = derive2 { name="wdman"; version="0.2.4"; sha256="00q9qk8qgz7fjbd9j8pxknrw8lk1ardifg8w4agyrk8r4q56b1a0"; depends=[assertthat binman semver subprocess yaml]; };
   wdpar = derive2 { name="wdpar"; version="1.0.0"; sha256="1039pf3hz5nym2y00wqwj027dc8m5ny2a1pqavbybn6cxbq0m2r1"; depends=[assertthat cli countrycode curl httr lwgeom progress rappdirs RSelenium sf sp wdman xml2]; };
-  weathercan = derive2 { name="weathercan"; version="0.2.8"; sha256="1hspjij4rhlnl3k1hidpa9sclml95q9igwf9dsy0kihlsl0g35h1"; depends=[dplyr httr lubridate purrr rlang stringi tidyr xml2]; };
+  weathercan = derive2 { name="weathercan"; version="0.3.1"; sha256="1xvbqb6w9w9ynbxgpjr56sq43c7p8hncqy2pdl5hxgc32d51wlkc"; depends=[dplyr httr lubridate purrr rlang rvest stringi tidyr xml2]; };
   weathermetrics = derive2 { name="weathermetrics"; version="1.2.2"; sha256="1hjhgsy3v8328hv4czxxz7kp68sxc10sy10f3dv5j8f6pka6qlsp"; depends=[]; };
   weatherr = derive2 { name="weatherr"; version="0.1.2"; sha256="11sb5bmqccqkvlabsw4siy9n6ivsrvxavywvaffgrs3blmnygql9"; depends=[ggmap lubridate RJSONIO XML]; };
-  webTRISr = derive2 { name="webTRISr"; version="0.1.1"; sha256="044a079fj4ryykj2n8zlfipmjyrfyfvhrqcd1wbb6r440yjkvali"; depends=[dplyr httr jsonlite lubridate magrittr purrr readr stringr]; };
+  webTRISr = derive2 { name="webTRISr"; version="0.2.0"; sha256="10xj8qvibhnywsxd1yb4laz6b38qwn483a7bflizsndsgrbzdi5n"; depends=[dplyr httr jsonlite lubridate magrittr purrr readr sf stringr]; };
   webchem = derive2 { name="webchem"; version="0.4.0"; sha256="032bsfnkn7s33y42fyf8yradsh8jhms4ryjkh0r76hqnx3j00ph0"; depends=[httr jsonlite RCurl rvest stringr xml2]; };
   webddx = derive2 { name="webddx"; version="0.1.0"; sha256="0w72pp0f77glq460mjagm30y3nd9dmhjkbb0w06ycsjdqvr8qji7"; depends=[jsonlite]; };
   webdriver = derive2 { name="webdriver"; version="1.0.5"; sha256="0l3nz7gf62jlkvkn5sfxfvn0prxz3ds7nlpfb1yhnmdljhbzrgzf"; depends=[base64enc callr curl debugme httr jsonlite R6 showimage withr]; };
   webex = derive2 { name="webex"; version="0.9.1"; sha256="0z85cfnjicy3q1n77ilrh43h6xh6bpr1f1iinzfk1r64031h90yl"; depends=[jsonlite knitr rmarkdown]; };
   webglobe = derive2 { name="webglobe"; version="1.0.2"; sha256="1277d6fkgrgixlhikfwf0r6z8g5b7mah905xi219qsfycxmifgn9"; depends=[geojsonio httpuv jsonlite]; };
-  webmockr = derive2 { name="webmockr"; version="0.3.4"; sha256="0dq92xdrmrk42q6f141bj0cpiqgp04ilssbly53nf3fgnlq0h8aw"; depends=[crul curl fauxpas jsonlite magrittr R6 urltools]; };
+  webmockr = derive2 { name="webmockr"; version="0.4.0"; sha256="07bw1clrhl7769xlgkqn4k3dn2lqbj1g9nmz7pl6iyvw0rmllrgb"; depends=[crul curl fauxpas jsonlite magrittr R6 urltools]; };
   webp = derive2 { name="webp"; version="1.0"; sha256="1h17g2zaq6ipsb1w6ix9m68ddmp7dspmaqflqkskylh2n8jhk8cd"; depends=[]; };
   webr = derive2 { name="webr"; version="0.1.0"; sha256="0fjbk933034cgmqd41cw7q5xcvrwgylcic6lxav9jv3b2sspzw06"; depends=[ggplot2 moonBook stringr]; };
   webreadr = derive2 { name="webreadr"; version="0.4.0"; sha256="0l3l5g4zj5faxqi1kqwx9lq91gbj40z2q3csrsmpal08qnwkxs90"; depends=[Rcpp readr]; };
   websearchr = derive2 { name="websearchr"; version="0.0.3"; sha256="1c6dwm5g5rjq0b12zrwwi5k9760jb0ph83v4j2gm8zm0x9dhiqm9"; depends=[]; };
   webshot = derive2 { name="webshot"; version="0.5.1"; sha256="08sb1xi376pfy1vwilk2d68zljsg9yiv04n2dkqz383gdhh0sxdr"; depends=[callr jsonlite magrittr]; };
-  websocket = derive2 { name="websocket"; version="1.0.0"; sha256="1by8xsfwvjpwnh4480wlw3m1i0d4qxl0qiri0pakcvx2srh69fx7"; depends=[AsioHeaders BH later R6 Rcpp]; };
+  websocket = derive2 { name="websocket"; version="1.1.0"; sha256="1qw3cb48ha579cijasq23w946p138k2x9yl37kpf51lyaagikzg1"; depends=[AsioHeaders BH later R6 Rcpp]; };
   webuse = derive2 { name="webuse"; version="0.1.3"; sha256="09xvw0v991cq1ck2kfxblp5cngfh9j6swvh5xv420mvky0kshv32"; depends=[haven]; };
-  webutils = derive2 { name="webutils"; version="0.6"; sha256="1basl7q2m8y9nw5ksi1kdz6an9pybvsmdd4snrm7a37041xymnps"; depends=[curl jsonlite]; };
+  webutils = derive2 { name="webutils"; version="1.0"; sha256="0khvvfrjhzcjbnsjshbsjgqk2pcvhkw34248f9wglwjmmsh6wbs1"; depends=[curl jsonlite]; };
   wec = derive2 { name="wec"; version="0.4-1"; sha256="10lqh43536d44d6082rpp11q1323pmjbmgrgb8v9mrk9c1ysf50w"; depends=[dplyr]; };
   weco = derive2 { name="weco"; version="1.2"; sha256="1prk8hn782pd8g2rbbaj7y10vjimqs9n8i4rab6aw6fc3k759d6b"; depends=[]; };
-  wedge = derive2 { name="wedge"; version="1.0-2"; sha256="1v9fyxdcy86hfx3zdy3wpyhcfjxiy7bzlvccipa690s6qayqqi0s"; depends=[magrittr partitions permutations spray]; };
-  weibullness = derive2 { name="weibullness"; version="1.18.6"; sha256="046fs6b5yb6ckddcb9vplc5478c7xprnafsj4rvzb1gmcpcrqqck"; depends=[]; };
+  wedge = derive2 { name="wedge"; version="1.0-3"; sha256="17w6987b8yh6gxsfn5vchzha8fznyganqp92zxc96h9iv7b40kkj"; depends=[magrittr partitions permutations spray]; };
+  weibullness = derive2 { name="weibullness"; version="1.19.8"; sha256="19s44mxxcnhngifxshsyjr3a9zvbwywmqgby5dxd73yid1p2k9mr"; depends=[]; };
   weibulltools = derive2 { name="weibulltools"; version="1.0.1"; sha256="06blip2dqaz2f3wnghp8yj0qj23s242k3r7bfcka1n52msc58xjz"; depends=[dplyr LearnBayes magrittr plotly Rcpp RcppArmadillo sandwich segmented SPREDA survival]; };
   weightQuant = derive2 { name="weightQuant"; version="1.0"; sha256="1ngz51wr5qpnb98lfbddwvipcra86dq5whm6z8c4xd921anb15bx"; depends=[doParallel foreach quantreg]; };
   weightTAPSPACK = derive2 { name="weightTAPSPACK"; version="0.1"; sha256="0kpfw477qka5qrc6sh73had38xbrwrqp1yv0dj2qiihkiyrp67ks"; depends=[HotDeckImputation mice plyr survey]; };
@@ -14490,20 +14788,20 @@ in with self; {
   weightr = derive2 { name="weightr"; version="2.0.2"; sha256="1qsyak91kdgv48wf6qhpfbiirlg4ba9w6rw8ynjcsnqqdvmly1lb"; depends=[ggplot2 scales]; };
   weights = derive2 { name="weights"; version="1.0"; sha256="0186bfpkhxngrshac6bpg37alp6slwhwd43inrm8hqg0vhpfgc4c"; depends=[gdata Hmisc mice]; };
   weirs = derive2 { name="weirs"; version="0.25"; sha256="17a0ppi7ghikrwn39zvhg2cvhmnr3w0qi7r9lj22x65ii9nzadd7"; depends=[]; };
-  welchADF = derive2 { name="welchADF"; version="0.3.1"; sha256="0vzvbibaxr6baq75ldccv0f3wifabdh9i4qgpmfsn7zv0rypal7v"; depends=[lme4]; };
+  welchADF = derive2 { name="welchADF"; version="0.3.2"; sha256="02a8w1dhc2nd74hml4z3cdlx0d2a9rcx47v341kgav620i8bn88g"; depends=[lme4]; };
   wellknown = derive2 { name="wellknown"; version="0.5.0"; sha256="1y3hi5ajqaxx3s40cx24ayfcd3c6d1ydlhsm0gg2fxgmidm6bhwy"; depends=[jsonlite V8]; };
   wesanderson = derive2 { name="wesanderson"; version="0.3.6"; sha256="09mr6p2jmqdjq27cz974w5hyxgn929zp9z3inhxqmmh1582fmdi2"; depends=[]; };
-  wevid = derive2 { name="wevid"; version="0.6.1"; sha256="1r4ss3vk8yc3vkplf7a24nm3vvbkbk1iz1glrsg3azr0qffyyklk"; depends=[ggplot2 mclust pROC reshape2 zoo]; };
+  wevid = derive2 { name="wevid"; version="0.6.2"; sha256="1ranmqhgfkrky7r4qk563n9nlz2syn3vj85lmfajq01csadzjdpl"; depends=[ggplot2 mclust pROC reshape2 zoo]; };
   wfe = derive2 { name="wfe"; version="1.9.1"; sha256="0lcg7hzdll1wqdwydkk96m4n715h8sjn3qwhabm245m0hqhdf7is"; depends=[arm MASS Matrix]; };
   wfg = derive2 { name="wfg"; version="0.1"; sha256="1r6wb8v42mpapjfhmkmghm9fq21c3s4zmdxy8nlh31nsja71c37d"; depends=[igraph]; };
   wfindr = derive2 { name="wfindr"; version="0.1.0"; sha256="0m5xj50hqdjj4lpbgx1kp3my4njr0nz09hd63rf4qf1ls8r7zil9"; depends=[dplyr magrittr]; };
-  wgaim = derive2 { name="wgaim"; version="1.4-11"; sha256="1jjyp100dcjjczp61xlvhmy48ynniqcys535vzbgswhr7fvijymg"; depends=[lattice qtl]; };
+  wgaim = derive2 { name="wgaim"; version="2.0-1"; sha256="1qiyfkpsbzjr9xsq5kqq6rlqpndngkn2irdfh3gyi45h6hn118j4"; depends=[ggplot2 qtl]; };
   wgeesel = derive2 { name="wgeesel"; version="1.5"; sha256="0lybvsq5168cjybzv2dbyx2z8aakcx7i7ivm8zc90haiispm9n5x"; depends=[bindata CRTgeeDR geepack MASS PoisNor]; };
   wheatmap = derive2 { name="wheatmap"; version="0.1.0"; sha256="1c1xvzy194vw3idkwkqp9kyrfldzczj30cl15jw1bbnw87zcwdzy"; depends=[colorspace RColorBrewer]; };
   whereami = derive2 { name="whereami"; version="0.1.8.1"; sha256="007a5wcg80gapqhn3s0sax83fxm55zx36l8rmipkr0c58wi0nr72"; depends=[cli rstudioapi]; };
   whereport = derive2 { name="whereport"; version="0.1"; sha256="1gdqzr2hrnpxbwl7cfps4m3xja8wkgwfs50i2nailybympvdnxm4"; depends=[dplyr]; };
   whiboclustering = derive2 { name="whiboclustering"; version="0.1.2"; sha256="0bzzr71kbynzj28i8g5li5j40653nyh08ywgs2xww49qxjm3b9lj"; depends=[cluster clusterCrit]; };
-  whisker = derive2 { name="whisker"; version="0.3-2"; sha256="0z4cn115gxcl086d6bnqr8afi67b6a7xqg6ivmk3l4ng1x8kcj28"; depends=[]; };
+  whisker = derive2 { name="whisker"; version="0.4"; sha256="1a7vz0dk95xfjvi38wbpw8vmf5qn3g8p490msz2rw0piwidmk1ks"; depends=[]; };
   whitechapelR = derive2 { name="whitechapelR"; version="0.3.0"; sha256="0mnq5m59mw8w5g1p0h2xzlz738j397b3444km59bm5yln3j0nsbi"; depends=[igraph plyr]; };
   whitening = derive2 { name="whitening"; version="1.1.1"; sha256="0madrdy2pvr7q4lhznw2kyhs7x927npwmpqwfwkv6v5c4zv7mbjp"; depends=[corpcor]; };
   whoa = derive2 { name="whoa"; version="0.0.1"; sha256="1gkm3l0kjf52yc6y437dsfx3hc9bfhnb049hm4qii46nr1plz69x"; depends=[dplyr ggplot2 magrittr Rcpp tibble tidyr vcfR viridis]; };
@@ -14513,11 +14811,11 @@ in with self; {
   widals = derive2 { name="widals"; version="0.5.4"; sha256="1bl59s1r4gkvq4nkf94fk7m0zvhbrszkgmig66lfxhyvk9r84fvb"; depends=[snowfall]; };
   widenet = derive2 { name="widenet"; version="0.1-2"; sha256="1nimm8szbg82vg00f5c7b3f3sk0gplssbl4ggasjnh7dl621vfny"; depends=[glmnet relaxnet]; };
   widgetframe = derive2 { name="widgetframe"; version="0.3.1"; sha256="0j0d73m72nzfc1wyrgsqr99ldx72adis6pd57mpim55hz0n9l224"; depends=[htmltools htmlwidgets magrittr purrr]; };
-  widyr = derive2 { name="widyr"; version="0.1.1"; sha256="14r1qiq4i7lmn3i76aa0d9wcjw1jclm1jf371j25s92w8z36mdln"; depends=[broom dplyr Matrix purrr reshape2 tidyr tidytext]; };
+  widyr = derive2 { name="widyr"; version="0.1.2"; sha256="0mqj9w5sy8m2vqhjxmjrf68bfixbvmkigrsdzfnwvxp18hhfw5mj"; depends=[broom dplyr Matrix purrr reshape2 tidyr tidytext]; };
   wikibooks = derive2 { name="wikibooks"; version="0.2"; sha256="178lhri1b8if2j7y7l9kqgyvmkn4z0bxp5l4dmm97x3pav98c7ks"; depends=[]; };
   wikifacts = derive2 { name="wikifacts"; version="0.1.0"; sha256="01mwzqign59lh7wvf8q8kwkgnfxi9nkk6n0qwfh27q64fajw8clg"; depends=[magrittr rvest xml2]; };
   wikilake = derive2 { name="wikilake"; version="0.4"; sha256="0pm0brzkf2k6aknwl4b3fba5ly7mhah8qfb0h94fckiaqbnpyx9v"; depends=[maps rvest selectr sp stringi stringr units WikipediR xml2]; };
-  wikipediatrend = derive2 { name="wikipediatrend"; version="1.1.14"; sha256="00i38py9n4l0iqkn3257a3jbiwh3hrmx1p9x6rfh9sgfcch8yyj5"; depends=[hellno httr jsonlite RColorBrewer rvest stringr xml2]; };
+  wikipediatrend = derive2 { name="wikipediatrend"; version="2.1.4"; sha256="1skmlw2vmipddrmqmwycb9abq4cgva4lfjdcp9ijk6sgywiz70is"; depends=[ggplot2 glue hellno httr pageviews rvest stringr xml2]; };
   wikisourcer = derive2 { name="wikisourcer"; version="0.1.4"; sha256="0x6yp7hmrasrxpwlbsabzrr316d5yxynafmv0jh6yhx4i36l08wf"; depends=[magrittr purrr rvest tibble urltools xml2]; };
   wikitaxa = derive2 { name="wikitaxa"; version="0.3.0"; sha256="0v681qac33dlcdlah20qf5qb9g5h917rpzv67brx1handjnapnqh"; depends=[crul curl data_table jsonlite tibble WikidataR xml2]; };
   wildcard = derive2 { name="wildcard"; version="1.1.0"; sha256="0qkzab84z95g5f4fv3v4wisccgd7k9m3210pz4nvm1x8rfaqfjf1"; depends=[magrittr stringi]; };
@@ -14526,7 +14824,7 @@ in with self; {
   wilson = derive2 { name="wilson"; version="2.0.2"; sha256="0ivd3cm6swhbcg38f66505rwf8h19wcg69mf3p4f9vjif8l13q4s"; depends=[circlize colourpicker ComplexHeatmap data_table DESeq2 DT factoextra FactoMineR ggplot2 ggrepel gplots heatmaply log4r openssl plotly plyr R6 RColorBrewer reshape rintrojs rje rjson RJSONIO scales shiny shinycssloaders shinydashboard shinyjs viridis]; };
   winRatioAnalysis = derive2 { name="winRatioAnalysis"; version="0.1.0"; sha256="1msvc06bfzw9clinxbvr5fdw38dff0c0xii46182nwnk5kj0libr"; depends=[data_table JM Matrix MLEcens mvtnorm nlme plyr pssm survival]; };
   windex = derive2 { name="windex"; version="1.0"; sha256="0ci10x6mm5i03j05fyadxa0ic0ngpyp5nsn05p9m7v1is5jhxci0"; depends=[ape geiger scatterplot3d]; };
-  windfarmGA = derive2 { name="windfarmGA"; version="2.2.1"; sha256="0pbnq2bd0pn9w09cqp9mbkzqmr9sffhldv85vgcn1014kj57xj1p"; depends=[calibrate doParallel foreach ggplot2 gstat leaflet magrittr maptools plyr raster rayshader RColorBrewer Rcpp rgdal rgeos rworldmap sf sp spatstat]; };
+  windfarmGA = derive2 { name="windfarmGA"; version="2.2.2"; sha256="0gj62b0ppk478xz5f5cwqkb4rhs7fabpx8zl6p0zm1z6dzclq1rc"; depends=[calibrate doParallel foreach ggplot2 gstat leaflet magrittr raster RColorBrewer Rcpp rgdal rworldmap sf sp spatstat]; };
   wingui = derive2 { name="wingui"; version="0.2"; sha256="0yf6k33qpcjzyb7ckwsxpdw3pcsja2wsf08vaca7qw27yxrbmaa3"; depends=[Rcpp]; };
   wiod = derive2 { name="wiod"; version="0.3.0"; sha256="1f151xmc6bm5d28w5123nm0hv7j1v8hay4jk5fk8pwn6yljl1pah"; depends=[decompr gvc]; };
   wiqid = derive2 { name="wiqid"; version="0.2.2"; sha256="0rfv8vnz585p970slm9rw1ikp9ryv8qixvbq4lq3prawhk3x1vhp"; depends=[coda HDInterval MASS truncnorm]; };
@@ -14566,7 +14864,7 @@ in with self; {
   wql = derive2 { name="wql"; version="0.4.9"; sha256="0m16l807mhcjkbqhlzhc24pw4hl78fjyykiszlg337x3qs803fg2"; depends=[ggplot2 reshape2 zoo]; };
   wqs = derive2 { name="wqs"; version="0.0.1"; sha256="14qaa9g9v4nqrv897laflib3wwhflyfaf9wpllmbi5xfv9223rcg"; depends=[glm2 Rsolnp]; };
   wrangle = derive2 { name="wrangle"; version="0.5.2"; sha256="1b6qgwdjvwbrarp9ylgkb5ia1p5a5g7ws0jyqrwc6hii8z5yj2qb"; depends=[dplyr lazyeval magrittr rlang tidyr]; };
-  wrapr = derive2 { name="wrapr"; version="1.8.9"; sha256="153zs72cpm3phcl74ip4l2lgr65jn41509j3xkh34nala02kd8vw"; depends=[]; };
+  wrapr = derive2 { name="wrapr"; version="1.9.0"; sha256="0l51r3f391xs9gbfsaan7yb0ygmabbqjn14w107vk3rnikb2lw24"; depends=[]; };
   wrassp = derive2 { name="wrassp"; version="0.1.8"; sha256="052x0lxpchr6f97yfj3vmhh8gc8qg5pp1m91h5akrav4yfawbs7k"; depends=[]; };
   write_snns = derive2 { name="write.snns"; version="0.0-4.2"; sha256="0sxg7z8rnh4lssbivkrfxldv4ivy37wkndzzndpbvq2gbvbjnp4l"; depends=[]; };
   writexl = derive2 { name="writexl"; version="1.1"; sha256="0w4wnpl3yhaqp63p32bk60xrbmd7xd11kxifjbzrghi7d4483a46"; depends=[]; };
@@ -14576,12 +14874,15 @@ in with self; {
   wskm = derive2 { name="wskm"; version="1.4.28"; sha256="0d9hcriakg6fxzc8wjsahc4zkyjza31mb9dv2h4xcf8298xa96i4"; depends=[clv lattice latticeExtra]; };
   wsrf = derive2 { name="wsrf"; version="1.7.17"; sha256="0gmlvfcy2iqa5sqhwps3hx0hl9fir8nf5xq62f25sn8i3llw752z"; depends=[Rcpp]; };
   wsyn = derive2 { name="wsyn"; version="1.0.1"; sha256="1lsaah5dndg1myx3qgbm4hih2wr1zgjfaracnyljfrri2cb436n6"; depends=[fields MASS]; };
-  wtest = derive2 { name="wtest"; version="3.1"; sha256="1rlas9jn57mcyjic9dhkqj355djldc95q07b076w847cd4pmzqvb"; depends=[]; };
+  wtest = derive2 { name="wtest"; version="3.2"; sha256="063ax9mbb2dy33l1cl533mjzpvhf2akw3613pklfjg6bhprlniz7"; depends=[]; };
   wtss = derive2 { name="wtss"; version="1.1.0"; sha256="019zvmq4z5xy5dwcf4g0z43x2mb14d1lgqhs1zp6821izffpbd0s"; depends=[jsonlite lubridate RCurl roxygen2 zoo]; };
   wux = derive2 { name="wux"; version="2.2-1"; sha256="0iw0kf0wfspnpc83v7gxhcakmp0z34cccnm0jn9c2za9ay9l2swv"; depends=[abind class corpcor fields gdata Hmisc ncdf4 reshape rgdal rgeos rworldmap sp stringr]; };
+  wv = derive2 { name="wv"; version="0.1.0"; sha256="13avx4dydy91aak9bjcqjj2hsbk9f0l4imqmwpg1fdmg6zx7694z"; depends=[coda Rcpp RcppArmadillo simts]; };
   wvtool = derive2 { name="wvtool"; version="1.0"; sha256="0x9awj6g5lzqp2lhwgh9ib7jmfdzyhwazrjvw1vwacqqfhbz8qxv"; depends=[]; };
   wwntests = derive2 { name="wwntests"; version="1.0.0"; sha256="1wsqbhsnzkishqwxz5kjcb5xawafizi3ip4yzxj05p9rx9wja1yc"; depends=[ftsa MASS rainbow sde]; };
-  wyz_code_offensiveProgramming = derive2 { name="wyz.code.offensiveProgramming"; version="1.1.8"; sha256="00zhi7xzay5lppx49j9g18vp4czdzcjajqcy6qf5m4lhxjv2bhw7"; depends=[data_table lubridate tidyr]; };
+  wyz_code_offensiveProgramming = derive2 { name="wyz.code.offensiveProgramming"; version="1.1.12"; sha256="1xj0k9yxk7abh49w85ffxh9zmkgq57xim8409zw9mk8ysx8nv0zv"; depends=[crayon data_table lubridate R6 stringr tidyr]; };
+  wyz_code_rdoc = derive2 { name="wyz.code.rdoc"; version="1.1.6"; sha256="0ch46gxhlgp1y4v8xh7jxqd69gm48ncjnsm2y9021lwpx5vgx75l"; depends=[data_table lubridate tidyr wyz_code_offensiveProgramming]; };
+  wyz_code_testthat = derive2 { name="wyz.code.testthat"; version="1.1.6"; sha256="18y53n3vjgri01ak099r8c98fgf597bn5f83i7289xg3z9bslqsk"; depends=[data_table lubridate R6 tidyr wyz_code_offensiveProgramming]; };
   x_ent = derive2 { name="x.ent"; version="1.1.7"; sha256="15qra77dqhj27g3qx92gram4mq4n9fdidygdpvxfmcx7ww3vc6yh"; depends=[ggplot2 jsonlite statmod stringr xtable]; };
   x12 = derive2 { name="x12"; version="1.9.0"; sha256="0hrcw1d52yp5rr4r120lcnfxw2rgs95njg37m28blcnfbq2flfc2"; depends=[stringr x13binary]; };
   x12GUI = derive2 { name="x12GUI"; version="0.13.0"; sha256="1mga7g9gwb3nv2qs27lz4n9rp6j3svads28hql88sxaif6is3nk1"; depends=[cairoDevice Hmisc lattice RGtk2 stringr x12]; };
@@ -14592,28 +14893,29 @@ in with self; {
   xRing = derive2 { name="xRing"; version="0.1.0"; sha256="17f1jif8yw2508k86p8mjgw1h20ml5wzaff04ix9xq96plqzi8ma"; depends=[dplR imager tcltk2 tkRplotR]; };
   xSub = derive2 { name="xSub"; version="2.0.2"; sha256="00mahp8fi6iskjaf5nwka67a7hqb3i08j8yrd4d2av39zfs268h2"; depends=[countrycode haven RCurl]; };
   xVA = derive2 { name="xVA"; version="0.8.1"; sha256="0wr4i37sya5gg6v63ka16g9077gxbhvjqyqfaahhban8skzl2adf"; depends=[SACCR Trading]; };
-  xaringan = derive2 { name="xaringan"; version="0.11"; sha256="0020vrfimny7a2wa1v5jkfvb040bp17zr6l2wmz9nl505qlqs2j9"; depends=[htmltools knitr rmarkdown servr xfun]; };
+  xaringan = derive2 { name="xaringan"; version="0.12"; sha256="0k7x9cn9pm3dmp88bjzpjf4y8lqnwcmd13sjisrvqkjb82bd3pyq"; depends=[htmltools knitr rmarkdown servr xfun]; };
   xbreed = derive2 { name="xbreed"; version="1.0.1"; sha256="0grrfra9j0k3mqikmrif5qawh4260ayr40irskzpp9ywsixim63h"; depends=[BGLR]; };
   xdcclarge = derive2 { name="xdcclarge"; version="0.1.0"; sha256="1j8wsidwmfjygqlwavxinv4bqc6rddy42jdmlknsjfrrs49yj8kn"; depends=[nlshrink Rcpp RcppArmadillo]; };
   xergm = derive2 { name="xergm"; version="1.8.3"; sha256="155469550rsdwszrhw7vdgwz2h0d72a8f4hirrb6hny7f1q63ykk"; depends=[btergm GERGM rem tnam xergm_common]; };
   xergm_common = derive2 { name="xergm.common"; version="1.7.7"; sha256="0nfls8a1knmnjjrrw0q93qsfrrb9p3yqsm5dxp13z0780vrzxvcj"; depends=[ergm network]; };
   xesreadR = derive2 { name="xesreadR"; version="0.2.3"; sha256="1pvdx0mxg2f885bhy4hb3kqzcgva4q7hzzaipkfzyi5lnjdsbc81"; depends=[bupaR data_table dplyr lubridate purrr stringr tidyr XML xml2]; };
-  xfun = derive2 { name="xfun"; version="0.8"; sha256="05jlbi5byqpw0fkhmmxqglnaxh9gwbcigx77kcpw1pkxnpwfry62"; depends=[]; };
+  xfun = derive2 { name="xfun"; version="0.10"; sha256="065ygh046ah43p5aqyrkv2vkxcnvnb4j7blfdygysg6hmqzp4pbv"; depends=[]; };
   xgb2sql = derive2 { name="xgb2sql"; version="0.1.2"; sha256="1gw5dw0ck5hip8mv347zaswrggk395bg2hgn02bvqs0d31jhmgvi"; depends=[data_table xgboost]; };
   xgboost = derive2 { name="xgboost"; version="0.90.0.2"; sha256="1gy9rzg43mjpfis893vf15drmbigfn0481zrzss9ajnmnk0q8194"; depends=[data_table magrittr Matrix stringi]; };
   xgobi = derive2 { name="xgobi"; version="1.2-15"; sha256="03ym5mm16rb1bdwrymr393r3xgprp0ign45ryym3g0x2zi8dy557"; depends=[]; };
+  xgxr = derive2 { name="xgxr"; version="1.0.3"; sha256="0wjk869viyzd0mb3idgg1ixapc1a7x3v63ndhp2n48wfcbzib9sq"; depends=[assertthat binom dplyr ggplot2 labeling magrittr pander png scales tibble]; };
   xhmmScripts = derive2 { name="xhmmScripts"; version="1.1"; sha256="1qryyb34jx9c64l8bnwp40b08y81agdj5w0icj8dk052x50ip1hl"; depends=[gplots plotrix]; };
   xkcd = derive2 { name="xkcd"; version="0.0.6"; sha256="1z2y0ihn68ppay7xkglhw7djki5654g6z4bbpyy41if57z9q554f"; depends=[extrafont ggplot2 Hmisc]; };
   xkcdcolors = derive2 { name="xkcdcolors"; version="1.0"; sha256="07fnjv01r3b951dqca2zs9b9f6hsgbpbpsrggvb8rps53kpid0i7"; depends=[FNN]; };
-  xlink = derive2 { name="xlink"; version="1.0.0"; sha256="0q5fsd7h067jwh7kgqn534dvnwnbr1xs3iwcpa4ygblp94b50rgm"; depends=[survival]; };
+  xlink = derive2 { name="xlink"; version="1.0.1"; sha256="02ahgjampy92gcwhv269px5w8651a7j50dn1295zwqxj44lk4g9q"; depends=[survival]; };
   xlsimple = derive2 { name="xlsimple"; version="0.0.1"; sha256="1x0b2pb1sg2sqmh4z03bchsc9fhcphi6mxk4nbb6my2cr0kqrrdq"; depends=[]; };
   xlsx = derive2 { name="xlsx"; version="0.6.1"; sha256="1d58qlzdj4vrk4vnlyzri600ix7z3wnc30gnbcc1qz27nlbbv055"; depends=[rJava xlsxjars]; };
   xlsxjars = derive2 { name="xlsxjars"; version="0.6.1"; sha256="1rka5smm7yqnhhlblpihhciydfap4i6kjaa4a7isdg7qjmzm3h9p"; depends=[rJava]; };
   xltabr = derive2 { name="xltabr"; version="0.1.2"; sha256="0pwbpcdiqkhvzxsi6yxly4zza12bw7zc7ji8cvhldw4yl5sxkz1l"; depends=[magrittr openxlsx]; };
   xlutils3 = derive2 { name="xlutils3"; version="0.1.0"; sha256="1cxishi62bd36zlsy5qhzix1p68akdf9kpjg9gfm9aqpcijzccb9"; depends=[magrittr readxl]; };
   xmeta = derive2 { name="xmeta"; version="1.1-4"; sha256="1y9jldi8qn4jpr05g8fnvb23gig180hh36pc2v4y8n8289s9yvg2"; depends=[aod glmmML metafor mvmeta numDeriv]; };
-  xml2 = derive2 { name="xml2"; version="1.2.1"; sha256="0186d7r36xw1z9f8ajz35a0dz4ch6hmrjl9536yc7vq78v4vn5an"; depends=[Rcpp]; };
-  xmlparsedata = derive2 { name="xmlparsedata"; version="1.0.2"; sha256="1npf4ng9d34k56ib1ac4cb3p2x8gqm3jha1sc25nv6546ahcrcjh"; depends=[]; };
+  xml2 = derive2 { name="xml2"; version="1.2.2"; sha256="1x3q3a0xv8j0nx3hs4d3pfjm5g9nvaxmfrapba9f4nrkqi3z2l1h"; depends=[Rcpp]; };
+  xmlparsedata = derive2 { name="xmlparsedata"; version="1.0.3"; sha256="0gjr3l5z5dp276lchr2649as1rkj56d2mlvbr66yg393zzw50lsh"; depends=[]; };
   xmlrpc2 = derive2 { name="xmlrpc2"; version="1.1"; sha256="13rfw0civp3hzi4hn31x1idliid1qb73495x4c31z5msd35lzxrs"; depends=[base64enc curl xml2]; };
   xmrr = derive2 { name="xmrr"; version="1.0.36"; sha256="0xxi8z9sp156508y5a7f4ax8yry7lg4qmn0hyk04dn1xr7syd4gs"; depends=[dplyr ggplot2 tidyr]; };
   xoi = derive2 { name="xoi"; version="0.68-3"; sha256="0swi9zilghkfm17b39sdn7im4pcxcw7fk77jqxwib29q7x6574bk"; depends=[qtl]; };
@@ -14628,7 +14930,7 @@ in with self; {
   xseq = derive2 { name="xseq"; version="0.2.1"; sha256="0bsakbfvkfv39q2ch2g21b17g84470sq4v73355cljlshsi6404i"; depends=[e1071 gptk impute preprocessCore RColorBrewer sfsmisc]; };
   xslt = derive2 { name="xslt"; version="1.3"; sha256="0giqzmdby9ax8gwx9b7xqka28k3hgymv4289k8p8dvg26d683p3l"; depends=[Rcpp xml2]; };
   xsp = derive2 { name="xsp"; version="0.1.2"; sha256="1jbmxa234v52qji8sz4bkg24c2n65b0zh9py1wyyfzw9n1wx5w0r"; depends=[ggplot2 reshape2]; };
-  xspliner = derive2 { name="xspliner"; version="0.0.2"; sha256="07niy8dl4fcp1pv8dl4h9vyw8slxvhjj7qc5x7ywabyfh140pvyh"; depends=[dplyr ggplot2 magrittr mgcv pdp purrr tidyr]; };
+  xspliner = derive2 { name="xspliner"; version="0.0.4"; sha256="1j3wlw39r3ahhdfq3rks1zhnlmz14f4wk7bl7gf94yffasqg6k2r"; depends=[dplyr ggplot2 magrittr mgcv pdp pROC purrr tidyr]; };
   xtable = derive2 { name="xtable"; version="1.8-4"; sha256="077xfm0gphvhsay75amd9v90zk57kjgrrlgih04fyrbqqblc1gjs"; depends=[]; };
   xtal = derive2 { name="xtal"; version="1.15"; sha256="1zq3vd5x3vw6acn47yd2x7kflr9sm3znmdkm68cs64ha54jbl3vs"; depends=[]; };
   xtensor = derive2 { name="xtensor"; version="0.11.1-0"; sha256="1l9216z46m45vnc69j4qx336ln82qgpagi5m9qa5pabvcpz9b23p"; depends=[Rcpp]; };
@@ -14643,8 +14945,8 @@ in with self; {
   yacca = derive2 { name="yacca"; version="1.1.1"; sha256="1hxgkyxipk27p74vdkiy8a3wjymhcsc6ad3y9mf15qsl2xim6wwl"; depends=[]; };
   yakmoR = derive2 { name="yakmoR"; version="0.1.1"; sha256="09aklz79s0911p2wnpd7gc6vrbr9lmiskhkahsc63pdigggmq9f7"; depends=[BBmisc checkmate Rcpp]; };
   yaml = derive2 { name="yaml"; version="2.2.0"; sha256="0in562nd0i23cg91a8kdbqgim656fgscykwi0icsnq53xj3srg2m"; depends=[]; };
-  yardstick = derive2 { name="yardstick"; version="0.0.3"; sha256="1hfj4m35nv96r4qv3rj2dcj5nhr1ldkigvi03gsqqy7hz4fvx02m"; depends=[dplyr generics pROC Rcpp rlang tidyselect]; };
-  yarr = derive2 { name="yarr"; version="0.1.1"; sha256="1bqg188msjfrqnvmwlkqdgc9vhskb26dxlfzpsx261ibwcaqs12y"; depends=[]; };
+  yardstick = derive2 { name="yardstick"; version="0.0.4"; sha256="03pq8wmb6467mkp7ax1gpydg5c6q82r1byhdzjl92g7986p7h3mv"; depends=[dplyr generics pROC Rcpp rlang tidyselect]; };
+  yarr = derive2 { name="yarr"; version="0.1.2"; sha256="16q109jrydckz7s1rkmr2sh8q92cgr1c534fvpbh3h0bc3fvvf8g"; depends=[]; };
   yarrr = derive2 { name="yarrr"; version="0.1.5"; sha256="1258bj7x4icaxfabnnd3fgwydnqbzxkih7zw0sdlwdax3q8fw5c5"; depends=[BayesFactor circlize jpeg]; };
   yasp = derive2 { name="yasp"; version="0.2.0"; sha256="0fza8h9y1wmarsmjcvw4r970d6j4ii795pd2h4xh9nlsirv50adi"; depends=[]; };
   yatah = derive2 { name="yatah"; version="0.0.1"; sha256="1w76a34k3jyiv1ql2bkyh1d77p1lqsyvy2p0ip3sdrsi043a5s4y"; depends=[ape purrr stringr]; };
@@ -14654,6 +14956,7 @@ in with self; {
   yhatr = derive2 { name="yhatr"; version="0.15.1"; sha256="18g2cr1kjxnfw6cwzl62ynppfv1zz732kbx18zq8918l85kx6wbw"; depends=[httr jsonlite stringr]; };
   ykmeans = derive2 { name="ykmeans"; version="1.0"; sha256="0xfji2fmslvc059kk3rwkv575ffzl787sa9d4vw5hxnsmkn8lq50"; depends=[foreach plyr]; };
   yll = derive2 { name="yll"; version="1.0.0"; sha256="0lf3cd6pfzki29nk2iy0vd6v4dw6zlsbrjh2839zq5vlpiimsvck"; depends=[]; };
+  ymlthis = derive2 { name="ymlthis"; version="0.1.0"; sha256="02zazpi109ydgs1p4qljnx4wdvhdyx2hpv7vcavv9fwsnkl6s0a3"; depends=[crayon fs glue magrittr miniUI purrr rlang rmarkdown rstudioapi shiny shinyBS stringr usethis whoami withr yaml]; };
   yonder = derive2 { name="yonder"; version="0.1.1"; sha256="0sb0sahxab1n42cy0kwi6dn9nhbw6vkpdd3k20a62baplxcwabn5"; depends=[htmltools magrittr shiny]; };
   yorkr = derive2 { name="yorkr"; version="0.0.7"; sha256="035pmvignq4lip3y5670kxj1n70ff04yy2jwi4837pimr9d0qjhv"; depends=[dplyr ggplot2 gridExtra reshape2 rpart_plot yaml]; };
   youtubecaption = derive2 { name="youtubecaption"; version="0.1.1"; sha256="0q6ifhgmaby3lj089hld7mwaq81522r2d1zsgijc9a9xfcwfqgv0"; depends=[dplyr magrittr purrr reticulate stringr tibble writexl]; };
@@ -14670,21 +14973,21 @@ in with self; {
   zebu = derive2 { name="zebu"; version="0.1.2"; sha256="0f9fsb4z8s7k5jnz2ayd52dzri0z46kjbm0gi5rfqjlmk13bhgk4"; depends=[foreach ggplot2 iterators plyr reshape2]; };
   zeitgebr = derive2 { name="zeitgebr"; version="0.3.3"; sha256="1g2bqc1xx42q54i6ck0ihpxkzw3hmxqn3cvv416afjc0cm45zw8d"; depends=[behavr data_table lomb pracma]; };
   zeligverse = derive2 { name="zeligverse"; version="0.1.1"; sha256="1hf3hbgzdlhhyy2gvg984dwp8d0qm0ziyn8i9h5x00gwf74vn9dr"; depends=[Amelia dplyr MatchIt purrr rstudioapi tibble WhatIf Zelig ZeligChoice ZeligEI]; };
-  zen4R = derive2 { name="zen4R"; version="0.2"; sha256="064brdzjb42r034mfhwdhq6win6rn5zqwapnbbkk8m7yqbs1xvii"; depends=[httr jsonlite R6 rvest xml2]; };
+  zen4R = derive2 { name="zen4R"; version="0.3"; sha256="029wjw0bay9p4fgd4rnmqzhrpn5q2azx0w9fvlr4mcsnwzjk9kib"; depends=[httr jsonlite R6 rvest xml2]; };
   zendeskR = derive2 { name="zendeskR"; version="0.4"; sha256="06cjwk08w3x6dx717123psinid5bx6c563jnfn890373jw6xnfrk"; depends=[RCurl rjson]; };
   zenplots = derive2 { name="zenplots"; version="1.0.0"; sha256="0jz7b52caymsw010dbls5rbakkilmkl6jnnhwbizybllnf2dg578"; depends=[graph loon MASS PairViz]; };
   zeroEQpart = derive2 { name="zeroEQpart"; version="0.1.0"; sha256="1n24nqyl0irpyspwx4b73xy228a84aa8zsn9fcf2lrlni5vyzmm0"; depends=[MASS ppcor]; };
   zetadiv = derive2 { name="zetadiv"; version="1.1.1"; sha256="0laxp2pd5s0s9wcnvs1r4shid2gi8ap4y9py6gpl207ywq6cxmgz"; depends=[car glm2 Imap mgcv nnls scam vegan]; };
   zfa = derive2 { name="zfa"; version="1.0"; sha256="0lddwpifkzggzvy56ans5pfknfr8laxcg264f3ph2z150gw1plsh"; depends=[SKAT]; };
   zic = derive2 { name="zic"; version="0.9.1"; sha256="1vd64ljigf6iwgzlgdxgj65nlwir176h7ddznddpaz2abh6n6zwp"; depends=[coda Rcpp RcppArmadillo]; };
-  zip = derive2 { name="zip"; version="2.0.3"; sha256="0zii05jg9v9ljd0wd67g9x4bhlmpmsy5dzd093sbnc5n3vjbi32a"; depends=[]; };
+  zip = derive2 { name="zip"; version="2.0.4"; sha256="1c02amk3pl6xir5jnbfiwiv2wvpkpbkkb1w71y6lf2yk7g3d0pdb"; depends=[]; };
   zipR = derive2 { name="zipR"; version="0.1.1"; sha256="1aaw3dslhsw3zgxvkc1v60vsk44x64i4qmjwx0gq4f7dad1rbiqp"; depends=[]; };
   zipcode = derive2 { name="zipcode"; version="1.0"; sha256="1lvlf1h5fv412idpdssjfh4fki933dm5nhr41ppl1mf45b9j7azn"; depends=[]; };
-  zipfR = derive2 { name="zipfR"; version="0.6-10"; sha256="16h5saj0b2qm3qwd7arzamn0n05hn31ybgzq4pb10ri0ajs1cvic"; depends=[]; };
-  zipfextR = derive2 { name="zipfextR"; version="1.0.0"; sha256="007pw5z9rz8ng0llyd2088qxldc3sf0s35pcfqmm85qb94fdksdd"; depends=[tolerance VGAM]; };
+  zipfR = derive2 { name="zipfR"; version="0.6-66"; sha256="0fjqa9a4z2p21ywy8h3pg0gwq4gwzjnrl78kn1nswly3w637574h"; depends=[]; };
+  zipfextR = derive2 { name="zipfextR"; version="1.0.1"; sha256="14p17xxnpnvvinbgjkfxjcmipfanj6vabfh8bzw78k30rl7bj32b"; depends=[copula tolerance VGAM]; };
   ziphsmm = derive2 { name="ziphsmm"; version="2.0.6"; sha256="0lm6m2g9jd1v7gxv4viych8c59phbvz1yly1ydgajl8q251d8n87"; depends=[pracma Rcpp RcppArmadillo]; };
   zoeppritz = derive2 { name="zoeppritz"; version="1.0-7"; sha256="14j9jl2g7gn94nzs96mwsgwlxnfbr1crjfmfwbi3rk367xi197jb"; depends=[]; };
-  zoib = derive2 { name="zoib"; version="1.5.1"; sha256="0lsyr8hfhk4dk129x2l1793v6nmf2k97wnsc44ir6ymip3i4zfld"; depends=[abind coda Formula matrixcalc rjags]; };
+  zoib = derive2 { name="zoib"; version="1.5.3"; sha256="0qm626z679kpzjxjlkq6fy3jg9x75x1k03pcjh57ar3saa2h96df"; depends=[abind coda Formula matrixcalc rjags]; };
   zoltr = derive2 { name="zoltr"; version="0.2.2"; sha256="0nxg37h6vlj5g6rxmgzy060h3lwfgjxvcf5gfpsgpg1mjg9h4k3f"; depends=[base64url httr jsonlite mockery readr webmockr]; };
   zoo = derive2 { name="zoo"; version="1.8-6"; sha256="1k1pmzr9nfwbxq1xf0jzn3nawv4sgnkxkgzxnm1i887jcbrs85r2"; depends=[lattice]; };
   zooaRch = derive2 { name="zooaRch"; version="1.2"; sha256="0grc378xppv0303sf4flfqz5002vq5a23nzbq4bsff41rww7dihc"; depends=[ggplot2]; };
@@ -14694,7 +14997,7 @@ in with self; {
   zoom = derive2 { name="zoom"; version="2.0.4"; sha256="03f5rxfr6ncf1j6vpn7pip21q7ylj4bx0a5xphqb6x6i33lxf1g5"; depends=[]; };
   zoomgrid = derive2 { name="zoomgrid"; version="1.0.0"; sha256="1bjm2b1ll5ikym21ia7k6gfiw1bcplcn4p6fls2298nf20q63kaa"; depends=[]; };
   zoon = derive2 { name="zoon"; version="0.6.3"; sha256="11accyiv9n2zk7fq5bapbmv1ixadab19666i8w41bw642lafgivq"; depends=[dismo plyr randomForest raster RCurl rfigshare rgdal roxygen2 rworldmap SDMTools sp testthat]; };
-  zscorer = derive2 { name="zscorer"; version="0.2.0"; sha256="03crixz3w1v1ahw2fk5qwmz1il07kywrl1445z09yxymgnpcs7gm"; depends=[tidyr]; };
+  zscorer = derive2 { name="zscorer"; version="0.3.0"; sha256="1fhmrkzacbqrsjcwkfc0vv2lz9mwcb1gfdpxajcc06cfkjdq8f4f"; depends=[shiny]; };
   ztable = derive2 { name="ztable"; version="0.2.0"; sha256="0g7khk5ifsdh9p31wlwh2l5mn1hzxzpv6qcn1wh34vsfjdmijjwy"; depends=[flextable magrittr moonBook officer RColorBrewer scales stringr]; };
   ztype = derive2 { name="ztype"; version="0.1.0"; sha256="0brbq2rgkl4mhjbb70kkfv47lzs66k9ppfs2klavcbripirxn5fx"; depends=[assertthat dplyr ggplot2 lubridate magrittr rvest stringr]; };
   zyp = derive2 { name="zyp"; version="0.10-1.1"; sha256="03cxpkfbhrx1fy8l0dl9a13ghz93cqq6877wa8rig09ksdiivaw9"; depends=[Kendall]; };
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 468dc3f1579..6a1a28060f7 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -276,7 +276,6 @@ let
     jqr = [ pkgs.jq.dev ];
     KFKSDS = [ pkgs.gsl_1 ];
     kza = [ pkgs.fftw.dev ];
-    libamtrack = [ pkgs.gsl_1 ];
     magick = [ pkgs.imagemagick.dev ];
     mvabund = [ pkgs.gsl_1 ];
     mwaved = [ pkgs.fftw.dev ];
@@ -647,7 +646,6 @@ let
     "SimpleTable"
     "SOLOMON"
     "soundecology"
-    "SPACECAP"
     "spacodiR"
     "spatsurv"
     "sqldf"
-- 
GitLab


From ca05a50d83a28f9c20067112ce8038f3e4af59be Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 6 Oct 2019 11:44:32 +0200
Subject: [PATCH 2047/2254] r-data.table: add missing zlib dependency to fix
 the build

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 6a1a28060f7..32989e45449 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -249,7 +249,7 @@ let
     ChemmineOB = [ pkgs.openbabel pkgs.pkgconfig ];
     cit = [ pkgs.gsl_1 ];
     curl = [ pkgs.curl.dev ];
-    data_table = lib.optional stdenv.isDarwin pkgs.llvmPackages.openmp;
+    data_table = [pkgs.zlib.dev] ++ lib.optional stdenv.isDarwin pkgs.llvmPackages.openmp;
     devEMF = [ pkgs.xorg.libXft.dev pkgs.x11 ];
     diversitree = [ pkgs.gsl_1 pkgs.fftw ];
     EMCluster = [ pkgs.liblapack ];
-- 
GitLab


From 6ad4468a3004da2851a4ade127c5ba9a80576baf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 6 Oct 2019 11:58:28 +0200
Subject: [PATCH 2048/2254] R: compile with gfortran8 to match the version of
 gcc

Fixes a build errors like https://hydra.nixos.org/build/102692469,
where R mixes C++ and Fortran code into one shared library.
---
 pkgs/top-level/all-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bd7c138f2f1..fdc4f34218f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14503,6 +14503,7 @@ in
   ### DEVELOPMENT / R MODULES
 
   R = callPackage ../applications/science/math/R {
+    gfortran = gfortran8;
     # TODO: split docs into a separate output
     texLive = texlive.combine {
       inherit (texlive) scheme-small inconsolata helvetic texinfo fancyvrb cm-super;
-- 
GitLab


From 1aa3e67c57c4bac158463e2c067067f87377aee4 Mon Sep 17 00:00:00 2001
From: Sam Doshi <sam@metal-fish.co.uk>
Date: Sun, 6 Oct 2019 15:18:42 +0100
Subject: [PATCH 2049/2254] girara: 0.3.2 -> 0.3.3

Source URL and homepage also updated.
---
 pkgs/applications/misc/girara/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix
index c2b7487cd72..6bfb4907807 100644
--- a/pkgs/applications/misc/girara/default.nix
+++ b/pkgs/applications/misc/girara/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "girara";
-  version = "0.3.2";
+  version = "0.3.3";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
-    url = "https://pwmt.org/projects/girara/download/${pname}-${version}.tar.xz";
-    sha256 = "1kc6n1mxjxa7wvwnqy94qfg8l9jvx9qrvrr2kc7m4g0z20x3a00p";
+    url = "https://git.pwmt.org/pwmt/${pname}/-/archive/${version}/${pname}-${version}.tar.gz";
+    sha256 = "13vr62kkkqs2xsrmsn114n6c6084ix1qyjksczqsc3s2y3bdsmj4";
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig gettext check dbus xvfb_run ];
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = https://pwmt.org/projects/girara/;
+    homepage = "https://git.pwmt.org/pwmt/girara";
     description = "User interface library";
     longDescription = ''
       girara is a library that implements a GTK based VIM-like user interface
-- 
GitLab


From 2678b8e8f60b42b9d8c23524bb9b124b83e8420d Mon Sep 17 00:00:00 2001
From: Sam Doshi <sam@metal-fish.co.uk>
Date: Sun, 6 Oct 2019 15:21:38 +0100
Subject: [PATCH 2050/2254] zathura: 0.4.3 -> 0.4.4

Source URL and homepage also updated.
---
 pkgs/applications/misc/zathura/core/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix
index 8afba9353ce..99729125b63 100644
--- a/pkgs/applications/misc/zathura/core/default.nix
+++ b/pkgs/applications/misc/zathura/core/default.nix
@@ -10,11 +10,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "zathura-core";
-  version = "0.4.3";
+  version = "0.4.4";
 
   src = fetchurl {
-    url = "https://pwmt.org/projects/zathura/download/zathura-${version}.tar.xz";
-    sha256 = "0hgx5x09i6d0z45llzdmh4l348fxh1y102sb1w76f2fp4r21j4ky";
+    url = "https://git.pwmt.org/pwmt/zathura/-/archive/${version}/zathura-${version}.tar.gz";
+    sha256 = "0v5klgr009rsxi41h73k0398jbgmgh37asvwz2w15i4fzmw89jgb";
   };
 
   outputs = [ "bin" "man" "dev" "out" ];
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = {
-    homepage = https://pwmt.org/projects/zathura/;
+    homepage = "https://git.pwmt.org/pwmt/zathura";
     description = "A core component for zathura PDF viewer";
     license = licenses.zlib;
     platforms = platforms.unix;
-- 
GitLab


From 1047a165b8a57b7b3c44f48c05dbb0a73ca8f042 Mon Sep 17 00:00:00 2001
From: Alva <alva@skogen.is>
Date: Sun, 6 Oct 2019 17:16:09 +0200
Subject: [PATCH 2051/2254] oil: enable readline

---
 pkgs/shells/oil/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix
index 4796cc27391..656a84a5277 100644
--- a/pkgs/shells/oil/default.nix
+++ b/pkgs/shells/oil/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, fetchpatch }:
+{ stdenv, lib, fetchurl, fetchpatch, readline }:
 
 stdenv.mkDerivation rec {
   pname = "oil";
@@ -26,6 +26,9 @@ stdenv.mkDerivation rec {
     mkdir -p $out/bin
   '';
 
+  buildInputs = [ readline ];
+  configureFlags = [ "--with-readline" ];
+
   # Stripping breaks the bundles by removing the zip file from the end.
   dontStrip = true;
 
-- 
GitLab


From d9cac95878cde76a4bbce7f4790544f45f724357 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Sun, 6 Oct 2019 12:00:00 +0000
Subject: [PATCH 2052/2254] nixos/xfce4-14: add xfce4-volumed-pulse when not
 using the desktop

xfce4-volumed-pulse is not abandoned, but is superseded by a panel
plugin which is not available when not using the desktop.

Fixes: volume up/down keys support
---
 nixos/modules/services/x11/desktop-managers/xfce4-14.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/desktop-managers/xfce4-14.nix b/nixos/modules/services/x11/desktop-managers/xfce4-14.nix
index d75a5a14104..ffc99172e79 100644
--- a/nixos/modules/services/x11/desktop-managers/xfce4-14.nix
+++ b/nixos/modules/services/x11/desktop-managers/xfce4-14.nix
@@ -91,7 +91,11 @@ in
       ++ optional config.powerManagement.enable xfce4-power-manager
       ++ optionals config.hardware.pulseaudio.enable [
         pavucontrol
-        xfce4-pulseaudio-plugin
+        # volume up/down keys support:
+        # xfce4-pulseaudio-plugin includes all the functionalities of xfce4-volumed-pulse
+        # but can only be used with xfce4-panel, so for no-desktop usage we still include
+        # xfce4-volumed-pulse
+        (if cfg.noDesktop then xfce4-volumed-pulse else xfce4-pulseaudio-plugin)
       ] ++ optionals cfg.enableXfwm [
         xfwm4
         xfwm4-themes
-- 
GitLab


From f155360175057c168cc43e8c94247d711a6489d0 Mon Sep 17 00:00:00 2001
From: Christian Kampka <christian@kampka.net>
Date: Sun, 6 Oct 2019 21:16:11 +0200
Subject: [PATCH 2053/2254] drone: 1.3.1 -> 1.6.0

---
 .../tools/continuous-integration/drone/default.nix          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix
index 12386ab2c08..8e63daab2d6 100644
--- a/pkgs/development/tools/continuous-integration/drone/default.nix
+++ b/pkgs/development/tools/continuous-integration/drone/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   name = "drone.io-${version}";
-  version = "1.3.1";
+  version = "1.6.0";
   goPackagePath = "github.com/drone/drone";
 
-  modSha256 = "128nnn8axnr30y3r46d11g8qznbsg82z2qw9qbxkq3bja6nz8fn2";
+  modSha256 = "0l33qib9riknrjdpsvd7n6slqp485vx66xl6w7m24b5sc7yfsg7m";
 
   src = fetchFromGitHub {
     owner = "drone";
     repo = "drone";
     rev = "v${version}";
-    sha256 = "0vp86k1z3r79sx0ln3vndzx8ycf0dbiv7jk56ncmk390iiz2a4g4";
+    sha256 = "0ij4a6rh17ib360bxrpncf8lp839b6sl17bd0fp3xvwmibk6xgjz";
   };
 
   meta = with stdenv.lib; {
-- 
GitLab


From fe30f418900c631c2774dd4310e835cdda062050 Mon Sep 17 00:00:00 2001
From: Alva <alva@skogen.is>
Date: Sun, 6 Oct 2019 23:01:33 +0200
Subject: [PATCH 2054/2254] oil: add passthru.shellPath

---
 pkgs/shells/oil/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix
index 656a84a5277..c88e012a0c3 100644
--- a/pkgs/shells/oil/default.nix
+++ b/pkgs/shells/oil/default.nix
@@ -43,4 +43,8 @@ stdenv.mkDerivation rec {
 
     maintainers = with lib.maintainers; [ lheckemann ];
   };
+
+  passthru = {
+      shellPath = "/bin/osh";
+  };
 }
-- 
GitLab


From 0ce30f8c67db15ae312f1e27f9228468bbdbb528 Mon Sep 17 00:00:00 2001
From: Thomas Depierre <depierre.thomas@gmail.com>
Date: Sun, 6 Oct 2019 23:55:51 +0200
Subject: [PATCH 2055/2254] doc/beam: rebar3-open is now removed (#70523)

---
 doc/languages-frameworks/beam.xml | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/doc/languages-frameworks/beam.xml b/doc/languages-frameworks/beam.xml
index 65f28d0a2d3..74c595cc89b 100644
--- a/doc/languages-frameworks/beam.xml
+++ b/doc/languages-frameworks/beam.xml
@@ -55,20 +55,7 @@
    <title>Rebar3</title>
 
    <para>
-    By default, Rebar3 wants to manage its own dependencies. This is perfectly acceptable in the normal, non-Nix setup, but in the Nix world, it is not. To rectify this, we provide two versions of Rebar3:
-    <itemizedlist>
-     <listitem>
-      <para>
-       <literal>rebar3</literal>: patched to remove the ability to download anything. When not running it via <literal>nix-shell</literal> or <literal>nix-build</literal>, it's probably not going to work as desired.
-      </para>
-     </listitem>
-     <listitem>
-      <para>
-       <literal>rebar3-open</literal>: the normal, unmodified Rebar3. It should work exactly as would any other version of Rebar3. Any Erlang package should rely on <literal>rebar3</literal> instead. See <xref
-            linkend="rebar3-packages"/>.
-      </para>
-     </listitem>
-    </itemizedlist>
+    We provide a version of Rebar3, which is the normal, unmodified Rebar3, under <literal>rebar3</literal>. We also provide a helper to fetch Rebar3 dependencies from a lockfile under <literal>fetchRebar3Deps</literal>.
    </para>
   </section>
 
-- 
GitLab


From dbb72303b1ffd7d2fb152e4bfdd58e266cc415f9 Mon Sep 17 00:00:00 2001
From: Dylan Simon <dylan@dylex.net>
Date: Sun, 6 Oct 2019 19:39:53 -0400
Subject: [PATCH 2056/2254] ghc modules: use specific commit to fetch patches
 (#70546)

rather than master to retrieve patches, some of which have gone stale
---
 .../development/haskell-modules/configuration-ghc-8.8.x.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index cc047e0abc1..0997d2d40b0 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -115,11 +115,11 @@ self: super: {
     broken = false;
   });
   haskell-src-meta = appendPatch (dontCheck (doJailbreak super.haskell-src-meta)) (pkgs.fetchpatch {
-    url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/haskell-src-meta-0.8.3.patch";
+    url = "https://gitlab.haskell.org/ghc/head.hackage/raw/82d0fd9967af0699f0ccb5b38f2f0cbef6ed22de/patches/haskell-src-meta-0.8.3.patch";
     sha256 = "1asl932mibr5y057xx8v1a7n3qy87lcnclsfh8pbxq1m3iwjkxy8";
   });
   asn1-encoding = appendPatch (dontCheck (doJailbreak super.asn1-encoding)) (pkgs.fetchpatch {
-    url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/asn1-encoding-0.9.5.patch";
+    url = "https://gitlab.haskell.org/ghc/head.hackage/raw/82d0fd9967af0699f0ccb5b38f2f0cbef6ed22de/patches/asn1-encoding-0.9.5.patch";
     sha256 = "0a3159rnaw6shjzdm46799crd4pxh33s23qy51xa7z6nv5q8wsb5";
   });
   vault = dontHaddock super.vault;
@@ -139,7 +139,7 @@ self: super: {
 
   # https://github.com/sol/hpack/issues/371
   hpack = appendPatch super.hpack (pkgs.fetchpatch {
-    url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/hpack-0.32.0.patch";
+    url = "https://gitlab.haskell.org/ghc/head.hackage/raw/82d0fd9967af0699f0ccb5b38f2f0cbef6ed22de/patches/hpack-0.32.0.patch";
     sha256 = "11ccl9f7vwbf5cpzknlyvrwgkzpajk4vq9jk9yb5f9la9ggwb244";
   });
 
-- 
GitLab


From cfcd337b96bd537ac1094c653f623c73e89c9204 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 6 Oct 2019 17:46:34 -0700
Subject: [PATCH 2057/2254] angelscript: 2.33.0 -> 2.34.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/angelscript/versions
---
 pkgs/development/interpreters/angelscript/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/angelscript/default.nix b/pkgs/development/interpreters/angelscript/default.nix
index adbfbaf48a4..0209bcaaafc 100644
--- a/pkgs/development/interpreters/angelscript/default.nix
+++ b/pkgs/development/interpreters/angelscript/default.nix
@@ -3,10 +3,10 @@ let
   s = # Generated upstream information
   rec {
     baseName="angelscript";
-    version = "2.33.0";
+    version = "2.34.0";
     name="${baseName}-${version}";
     url="http://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip";
-    sha256 = "18qywbi1k53xgnlr9v6ycin669j5v5qspq7lli4jhf6l4c5hk49n";
+    sha256 = "1xxxpwln4v2yasa35y7552fsfd8fbg50gnbp4vxy0ajj2wvh9akg";
   };
   buildInputs = [
     unzip
-- 
GitLab


From 3bfe0872b9627264482da2bc0a10d3b1b80c2a0a Mon Sep 17 00:00:00 2001
From: Dima <dgoldin+github@protonmail.ch>
Date: Mon, 7 Oct 2019 00:25:04 +0200
Subject: [PATCH 2058/2254] qt5.{qtwebengine, qtwebkit}: fix
 -Wno-class-memaccess warning for clang

With a previous fix for log size issues due to GCC 8
a gcc specific `-W` flag was added that clang does
not know, so it spams the logs.
---
 pkgs/development/libraries/qt-5/modules/qtwebengine.nix | 2 +-
 pkgs/development/libraries/qt-5/modules/qtwebkit.nix    | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
index c96aef3f4da..df444eee2eb 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
@@ -103,7 +103,7 @@ EOF
       --replace 'libs = [ "sandbox" ]' 'libs = [ "/usr/lib/libsandbox.1.dylib" ]'
     '');
 
-  NIX_CFLAGS_COMPILE = [
+  NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [
     # with gcc8, -Wclass-memaccess became part of -Wall and this exceeds the logging limit
     "-Wno-class-memaccess"
   ] ++ lib.optionals (stdenv.hostPlatform.platform.gcc.arch or "" == "sandybridge") [
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
index 78404ddffa8..542afdd55da 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
@@ -50,13 +50,12 @@ qtModule {
     export qmakeFlags="$qmakeFlags CONFIG+=silent"
   '';
 
-  NIX_CFLAGS_COMPILE =
-    [
+  NIX_CFLAGS_COMPILE = [
       # with gcc7 this warning blows the log over Hydra's limit
       "-Wno-expansion-to-defined"
-      # with gcc8, -Wclass-memaccess became part of -Wall and this too exceeds the logging limit
-      "-Wno-class-memaccess"
     ]
+    # with gcc8, -Wclass-memaccess became part of -Wall and this too exceeds the logging limit
+    ++ optional stdenv.cc.isGNU "-Wno-class-memaccess"
     # with clang this warning blows the log over Hydra's limit
     ++ optional stdenv.isDarwin "-Wno-inconsistent-missing-override"
     ++ optionals flashplayerFix
-- 
GitLab


From ec5f28b753b74dc7fa122952b9ac62e31a00b923 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 6 Oct 2019 20:36:34 -0700
Subject: [PATCH 2059/2254] clamav: 0.101.4 -> 0.102.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/clamav/versions
---
 pkgs/tools/security/clamav/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix
index 54932e1200b..de275b6c09a 100644
--- a/pkgs/tools/security/clamav/default.nix
+++ b/pkgs/tools/security/clamav/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "clamav";
-  version = "0.101.4";
+  version = "0.102.0";
 
   src = fetchurl {
     url = "https://www.clamav.net/downloads/production/${pname}-${version}.tar.gz";
-    sha256 = "1kdw0b49hbvja6xn589v4f0q334wav16pmi1hibql5cxj7q99w0b";
+    sha256 = "1qdyj4r39266bmbsd2nwyspm20k9wh3c30awrg8c54y78s61izj8";
   };
 
   # don't install sample config files into the absolute sysconfdir folder
-- 
GitLab


From 39744af51be3780dd015c0b65661778d33c726a3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 6 Oct 2019 20:41:12 -0700
Subject: [PATCH 2060/2254] distgen: 1.3 -> 1.4

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/distgen/versions
---
 pkgs/development/tools/distgen/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/distgen/default.nix b/pkgs/development/tools/distgen/default.nix
index dd4cf4d8eb1..7db4db24689 100644
--- a/pkgs/development/tools/distgen/default.nix
+++ b/pkgs/development/tools/distgen/default.nix
@@ -2,11 +2,11 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "distgen";
-  version = "1.3";
+  version = "1.4";
 
   src = python3.pkgs.fetchPypi {
     inherit pname version;
-    sha256 = "03jwy08wgp1lp6208vks1hv9g1f3aj45cml6k99mm3nw1jfnlbbq";
+    sha256 = "13k940xgpci754gmmnhz3j5rfvlg9hdh21j4yjh8dlr6g88qjc1x";
   };
 
   checkInputs = with python3.pkgs; [
-- 
GitLab


From 795b1555a88627f0739188081527f23259fcc1d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=83=81=E3=83=AB=E3=83=8E?= <okinan@chiru.no>
Date: Sun, 6 Oct 2019 23:02:34 -0500
Subject: [PATCH 2061/2254] vlang: Propagate build inputs, add $LDFLAGS
 (#70466)

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

diff --git a/pkgs/development/compilers/vlang/default.nix b/pkgs/development/compilers/vlang/default.nix
index d49d651a6ca..fba11a06a6e 100644
--- a/pkgs/development/compilers/vlang/default.nix
+++ b/pkgs/development/compilers/vlang/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   };
 
   enableParallelBuilding = true;
-  buildInputs = [ glfw freetype openssl ]
+  propagatedBuildInputs = [ glfw freetype openssl ]
     ++ stdenv.lib.optional stdenv.hostPlatform.isUnix upx;
 
   buildPhase = ''
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     cc -std=gnu11 $CFLAGS -w -o v $vc/v.c -lm $LDFLAGS
     ./v -prod -cflags `$CFLAGS` -o v compiler
     # Exclude thirdparty/vschannel as it is windows-specific.
-    find thirdparty -path thirdparty/vschannel -prune -o -type f -name "*.c" -execdir cc -std=gnu11 $CFLAGS -w -c {} ';'
+    find thirdparty -path thirdparty/vschannel -prune -o -type f -name "*.c" -execdir cc -std=gnu11 $CFLAGS -w -c {} $LDFLAGS ';'
     runHook postBuild
   '';
 
-- 
GitLab


From 54435c94acac1e92e283a248e55070ee84145ccb Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Sun, 6 Oct 2019 18:52:14 -0400
Subject: [PATCH 2062/2254] pythonPackages.awkward: 0.12.6 -> 0.12.12

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

diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix
index a2d19e9ee3c..b515892cfb0 100644
--- a/pkgs/development/python-modules/awkward/default.nix
+++ b/pkgs/development/python-modules/awkward/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "awkward";
-  version = "0.12.6";
+  version = "0.12.12";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0xvphwpa1n5q7kim4dw6fmsg9h5kkk7nd51bv9b36i3n4hilmq32";
+    sha256 = "316abd04dd049d56567082670ae8800c265dc3f06b699cf2a953ea6aea7696ce";
   };
 
   nativeBuildInputs = [ pytestrunner ];
-- 
GitLab


From aec7c30e2ddcacb4b13bea189f44ee72cc666fe9 Mon Sep 17 00:00:00 2001
From: Johannes Schleifenbaum <johannes@js-webcoding.de>
Date: Mon, 7 Oct 2019 08:42:20 +0200
Subject: [PATCH 2063/2254] dbeaver: 6.2.1 -> 6.2.2

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

diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix
index ffa9b4d071b..179dc85b2a9 100644
--- a/pkgs/applications/misc/dbeaver/default.nix
+++ b/pkgs/applications/misc/dbeaver/default.nix
@@ -7,7 +7,7 @@
 
 stdenv.mkDerivation rec {
   pname = "dbeaver-ce";
-  version = "6.2.1";
+  version = "6.2.2";
 
   desktopItem = makeDesktopItem {
     name = "dbeaver";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz";
-    sha256 = "1ix6isahpk7zk741wdx5cf4i13wc5gp0j1gj4ja80bzfswbc38na";
+    sha256 = "0qpa0wh5lr5lxk9cdv5p1cmbdk1kw1lfqmsfgqxvgfysc1mgjgp1";
   };
 
   installPhase = ''
-- 
GitLab


From 3642089bdf493d81fb76523b5e9672f0ffd51c29 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Oct 2019 08:50:13 +0200
Subject: [PATCH 2064/2254] Revert "ghc modules: use specific commit to fetch
 patches (#70546)"

This reverts commit dbb72303b1ffd7d2fb152e4bfdd58e266cc415f9.
---
 .../development/haskell-modules/configuration-ghc-8.8.x.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 0997d2d40b0..cc047e0abc1 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -115,11 +115,11 @@ self: super: {
     broken = false;
   });
   haskell-src-meta = appendPatch (dontCheck (doJailbreak super.haskell-src-meta)) (pkgs.fetchpatch {
-    url = "https://gitlab.haskell.org/ghc/head.hackage/raw/82d0fd9967af0699f0ccb5b38f2f0cbef6ed22de/patches/haskell-src-meta-0.8.3.patch";
+    url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/haskell-src-meta-0.8.3.patch";
     sha256 = "1asl932mibr5y057xx8v1a7n3qy87lcnclsfh8pbxq1m3iwjkxy8";
   });
   asn1-encoding = appendPatch (dontCheck (doJailbreak super.asn1-encoding)) (pkgs.fetchpatch {
-    url = "https://gitlab.haskell.org/ghc/head.hackage/raw/82d0fd9967af0699f0ccb5b38f2f0cbef6ed22de/patches/asn1-encoding-0.9.5.patch";
+    url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/asn1-encoding-0.9.5.patch";
     sha256 = "0a3159rnaw6shjzdm46799crd4pxh33s23qy51xa7z6nv5q8wsb5";
   });
   vault = dontHaddock super.vault;
@@ -139,7 +139,7 @@ self: super: {
 
   # https://github.com/sol/hpack/issues/371
   hpack = appendPatch super.hpack (pkgs.fetchpatch {
-    url = "https://gitlab.haskell.org/ghc/head.hackage/raw/82d0fd9967af0699f0ccb5b38f2f0cbef6ed22de/patches/hpack-0.32.0.patch";
+    url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/hpack-0.32.0.patch";
     sha256 = "11ccl9f7vwbf5cpzknlyvrwgkzpajk4vq9jk9yb5f9la9ggwb244";
   });
 
-- 
GitLab


From 3b40812df50872e32c0e7061cee65d32a79d9346 Mon Sep 17 00:00:00 2001
From: Greg Roodt <greg@canva.com>
Date: Thu, 3 Oct 2019 09:57:49 +1000
Subject: [PATCH 2065/2254] protolock: init at 0.14.1

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

diff --git a/pkgs/development/libraries/protolock/default.nix b/pkgs/development/libraries/protolock/default.nix
new file mode 100644
index 00000000000..a36e9e0fd0d
--- /dev/null
+++ b/pkgs/development/libraries/protolock/default.nix
@@ -0,0 +1,26 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+  pname = "protolock";
+  version = "0.14.1";
+
+  src = fetchFromGitHub {
+    owner = "nilslice";
+    repo = "protolock";
+    rev = "v${version}";
+    sha256 = "0assk7hp9s3m7zm5i1v0pggz00a54yf2w3y0b8mlq5v51y2h8h2z";
+  };
+
+  modSha256 = "079hbv0f8k5lljrb1cr9568wq8sb9yry9smgbrji19yavd9fzcmh";
+
+  postInstall = ''
+    rm $out/bin/plugin*
+  '';
+
+  meta = with lib; {
+    description = "Protocol Buffer companion tool. Track your .proto files and prevent changes to messages and services which impact API compatibility. https://protolock.dev";
+    homepage = "https://github.com/nilslice/protolock";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ groodt ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7fb795aa909..67a338e5a79 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13162,6 +13162,8 @@ in
 
   protobufc = callPackage ../development/libraries/protobufc/1.3.nix { };
 
+  protolock = callPackage ../development/libraries/protolock { };
+
   protozero = callPackage ../development/libraries/protozero { };
 
   flatbuffers = callPackage ../development/libraries/flatbuffers { };
-- 
GitLab


From 4b4b80a68d9a7327a3a5346f0529051163a6d95e Mon Sep 17 00:00:00 2001
From: Yann Hodique <yhodique@google.com>
Date: Sun, 6 Oct 2019 21:22:31 -0700
Subject: [PATCH 2066/2254] prettyping: works on unix platforms

---
 pkgs/tools/networking/prettyping/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/prettyping/default.nix b/pkgs/tools/networking/prettyping/default.nix
index 36700195a1b..fb0508b3c90 100644
--- a/pkgs/tools/networking/prettyping/default.nix
+++ b/pkgs/tools/networking/prettyping/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/denilsonsa/prettyping;
     description = "A wrapper around the standard ping tool with the objective of making the output prettier, more colorful, more compact, and easier to read";
     license = with licenses; [ mit ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = with maintainers; [ qoelet ];
   };
 }
-- 
GitLab


From 787660ea4cd845102c9b905cbd2861c213a3f541 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Mon, 7 Oct 2019 09:50:15 +0200
Subject: [PATCH 2067/2254] jellyfin: 10.3.7 -> 10.4.0

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

diff --git a/pkgs/servers/jellyfin/default.nix b/pkgs/servers/jellyfin/default.nix
index a0cb4dc2eaf..356ae7fee17 100644
--- a/pkgs/servers/jellyfin/default.nix
+++ b/pkgs/servers/jellyfin/default.nix
@@ -18,12 +18,12 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "jellyfin";
-  version = "10.3.7";
+  version = "10.4.0";
 
   # Impossible to build anything offline with dotnet
   src = fetchurl {
     url = "https://github.com/jellyfin/jellyfin/releases/download/v${version}/jellyfin_${version}_portable.tar.gz";
-    sha256 = "1lpd0dvf7x0wgl8bllqzk54nnbn9fj73jcsz292g7nip1ippgibl";
+    sha256 = "0a3n2g8xcxz9syj21v3f3jbzksw22bg0dksbakkvs1kphaygk5q2";
   };
 
   buildInputs = [
-- 
GitLab


From 8c9c942e90e8dce4f587e61fe120bf6e2d152999 Mon Sep 17 00:00:00 2001
From: geistesk <github.jyf300hj@0x21.biz>
Date: Sun, 6 Oct 2019 10:57:00 +0200
Subject: [PATCH 2068/2254] zncModules.fish: fix build

---
 pkgs/applications/networking/znc/modules.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix
index 54e148f0833..5e7bdd09b03 100644
--- a/pkgs/applications/networking/znc/modules.nix
+++ b/pkgs/applications/networking/znc/modules.nix
@@ -79,15 +79,15 @@ in {
 
   fish = zncDerivation rec {
     name = "znc-fish-${version}";
-    version = "git-2014-10-10";
+    version = "git-2017-06-26";
     module_name = "fish";
 
     src = fetchFromGitHub {
-      # this fork works with ZNC 1.6
-      owner = "jarrydpage";
+      # this fork works with ZNC 1.7
+      owner = "oilslump";
       repo = "znc-fish";
-      rev = "9c580e018a1a08374e814fc06f551281cff827de";
-      sha256 = "0yvs0jkwwp18qxqvw1dvir91ggczz56ka00k0zlsb81csdi8xfvl";
+      rev = "7d91467dbb195f7b591567911210523c6087662e";
+      sha256 = "1ky5xg17k5f393whrv5iv8zsmdvdyk2f7z5qdsmxcwy3pdxy6vsm";
     };
 
     meta = {
-- 
GitLab


From 9be4c678ff538f9f434c8a261448b0111a6ba516 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 7 Oct 2019 01:26:38 -0700
Subject: [PATCH 2069/2254] python37Packages.goobook: 3.3 -> 3.4

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-goobook/versions
---
 pkgs/development/python-modules/goobook/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/goobook/default.nix b/pkgs/development/python-modules/goobook/default.nix
index e63c97c6793..4e14b14c2aa 100644
--- a/pkgs/development/python-modules/goobook/default.nix
+++ b/pkgs/development/python-modules/goobook/default.nix
@@ -4,12 +4,12 @@
 
 buildPythonPackage rec {
   pname = "goobook";
-  version = "3.3";
+  version = "3.4";
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0sanlki1rcqvhbds7a049v2kzglgpm761i728115mdracw0s6i3h";
+    sha256 = "089a95s6g9izsy1fzpz48p6pz0wpngcbbrvsillm1n53492gfhjg";
   };
 
   propagatedBuildInputs = [ google_api_python_client simplejson oauth2client ];
-- 
GitLab


From ceefed0723ce291ff810bc8fdfff5fe154cb487b Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 1 Oct 2019 20:38:58 -0700
Subject: [PATCH 2070/2254] pythonPackages.chart-studio: init at 1.0.0

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

diff --git a/pkgs/development/python-modules/chart-studio/default.nix b/pkgs/development/python-modules/chart-studio/default.nix
new file mode 100644
index 00000000000..0eed42dc286
--- /dev/null
+++ b/pkgs/development/python-modules/chart-studio/default.nix
@@ -0,0 +1,44 @@
+{ lib, buildPythonPackage, fetchFromGitHub
+, mock
+, nose
+, plotly
+, pytest
+, requests
+, retrying
+, six
+}:
+
+buildPythonPackage rec {
+  pname = "chart-studio";
+  version = "1.0.0";
+
+  # chart-studio was split from plotly
+  src = fetchFromGitHub {
+    owner = "plotly";
+    repo = "plotly.py";
+    rev = "${pname}-v${version}";
+    sha256 = "14lyqbjdffnlnkzlfnn60k7yxjd99vx3hfcs23apsiyinzipjlbf";
+  };
+
+  sourceRoot = "source/packages/python/chart-studio";
+
+  propagatedBuildInputs = [
+    plotly
+    requests
+    retrying
+    six
+  ];
+
+  checkInputs = [ mock nose pytest ];
+  # most tests talk to a service
+  checkPhase = ''
+    HOME=$TMPDIR pytest chart_studio/tests/test_core chart_studio/tests/test_plot_ly/test_api
+  '';
+
+  meta = with lib; {
+    description = "Utilities for interfacing with Plotly's Chart Studio service";
+    homepage = "https://github.com/plotly/plotly.py/tree/master/packages/python/chart-studio";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ jonringer ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 95b26bacef7..670a7179bad 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1804,6 +1804,8 @@ in {
 
   characteristic = callPackage ../development/python-modules/characteristic { };
 
+  chart-studio = callPackage ../development/python-modules/chart-studio { };
+
   cheetah = callPackage ../development/python-modules/cheetah { };
 
   cherrypy = if isPy3k then
-- 
GitLab


From 7d297e45910cded782e7b2d7a7cff64348364216 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 1 Oct 2019 20:40:20 -0700
Subject: [PATCH 2071/2254] pythonPackages.cufflinks: 0.15 -> 0.16

---
 .../python-modules/cufflinks/default.nix      | 47 +++++++++++++------
 1 file changed, 33 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/cufflinks/default.nix b/pkgs/development/python-modules/cufflinks/default.nix
index 18693a204c5..ed25c2c7371 100644
--- a/pkgs/development/python-modules/cufflinks/default.nix
+++ b/pkgs/development/python-modules/cufflinks/default.nix
@@ -1,40 +1,59 @@
-{ buildPythonPackage, stdenv, fetchPypi, fetchpatch
-, numpy, pandas, plotly, six, colorlover
-, ipython, ipywidgets, nose
+{ lib, buildPythonPackage, fetchPypi, fetchpatch
+, chart-studio
+, colorlover
+, ipython
+, ipywidgets
+, nose
+, numpy
+, pandas
+, six
+, statsmodels
 }:
 
 buildPythonPackage rec {
   pname = "cufflinks";
-  version = "0.15";
+  version = "0.16";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "014098a4568199957198c0a7fe3dbeb3b4010b6de8d692a41fe3b3ac107b660e";
+    sha256 = "163lag5g4micpqm3m4qy9b5r06a7pw45nq80x4skxc7dcrly2ygd";
   };
 
   propagatedBuildInputs = [
-    numpy pandas plotly six colorlover
-    ipython ipywidgets
+    chart-studio
+    colorlover
+    ipython
+    ipywidgets
+    numpy
+    pandas
+    six
+    statsmodels
   ];
 
   patches = [
-    # Plotly 3.8 compatibility. Remove with the next release. See https://github.com/santosjorge/cufflinks/pull/178
+    # Plotly 4 compatibility. Remove with next release, assuming it gets merged.
     (fetchpatch {
-      url = "https://github.com/santosjorge/cufflinks/commit/cc4c23c2b45b870f6801d1cb0312948e1f73f424.patch";
-      sha256 = "1psl2h7vscpzvb4idr6s175v8znl2mfhkcyhb1926p4saswmghw1";
+      url = "https://github.com/santosjorge/cufflinks/pull/202/commits/e291dce14181858cb457404adfdaf2624b6d0594.patch";
+      sha256 = "1l0dahwqn3cxg49v3i3amwi80dmx2bi5zrazmgzpwsfargmk2kd1";
     })
   ];
 
+  # in plotly4+, the plotly.plotly module was moved to chart-studio.plotly
+  postPatch = ''
+    substituteInPlace requirements.txt \
+      --replace "plotly>=3.0.0,<4.0.0a0" "chart-studio"
+  '';
+
   checkInputs = [ nose ];
 
   checkPhase = ''
     nosetests -xv tests.py
   '';
 
-  meta = {
-    homepage = https://github.com/santosjorge/cufflinks;
+  meta = with lib; {
     description = "Productivity Tools for Plotly + Pandas";
-    license = stdenv.lib.licenses.mit;
-    maintainers = with stdenv.lib.maintainers; [ globin ];
+    homepage = "https://github.com/santosjorge/cufflinks";
+    license = licenses.mit;
+    maintainers = with maintainers; [ globin ];
   };
 }
-- 
GitLab


From 13b895ba5a633784615989a6d8b1b29f191d2a5a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 7 Oct 2019 02:27:06 -0700
Subject: [PATCH 2072/2254] hebcal: 4.18 -> 4.19

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/hebcal/versions
---
 pkgs/tools/misc/hebcal/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/hebcal/default.nix b/pkgs/tools/misc/hebcal/default.nix
index 39678abeba4..8b435fcef56 100644
--- a/pkgs/tools/misc/hebcal/default.nix
+++ b/pkgs/tools/misc/hebcal/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  version = "4.18";
+  version = "4.19";
   pname = "hebcal";
 
   src = fetchFromGitHub {
     owner = "hebcal";
     repo = "hebcal";
     rev = "v${version}";
-    sha256 = "13b3gbfl043s6vycf5kdy2lkchy3kg690vy0dpmy3si6x05nl10w";
+    sha256 = "028y2bw0bs0bx58gnxzbrg2c14a2pgkni2carf5i7kb6dg4wnkaq";
   };
 
   nativeBuildInputs = [ autoreconfHook ];
-- 
GitLab


From 8c6ee4fe16c5bc117e017ae1066a2f1c36949130 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 7 Oct 2019 02:48:46 -0700
Subject: [PATCH 2073/2254] gromacs: 2019.3 -> 2019.4

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/gromacs/versions
---
 .../science/molecular-dynamics/gromacs/default.nix          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
index d00b59307c5..a2d3722cde9 100644
--- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
+++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
@@ -8,11 +8,11 @@
 
 
 stdenv.mkDerivation {
-  name = "gromacs-2019.3";
+  name = "gromacs-2019.4";
 
   src = fetchurl {
-    url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2019.3.tar.gz";
-    sha256 = "0wvm6lj4hbasl2qkjcpicqjh7abxji4196dd2hmwlyivpycaa4a2";
+    url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2019.4.tar.gz";
+    sha256 = "0rqqrbjrdhprlw2z6cqid59xwxfdx05ikvywppvdp8f8vzp6chxs";
   };
 
   buildInputs = [cmake fftw]
-- 
GitLab


From fae0bc8936e11e30b9691c0877542d21f3d2b4be Mon Sep 17 00:00:00 2001
From: Sascha Grunert <sgrunert@suse.com>
Date: Mon, 7 Oct 2019 08:53:36 +0200
Subject: [PATCH 2074/2254] buildah: 1.11.1 -> 1.11.3

Signed-off-by: Sascha Grunert <sgrunert@suse.com>
---
 pkgs/development/tools/buildah/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix
index 9e7856c9e3a..2d412050b59 100644
--- a/pkgs/development/tools/buildah/default.nix
+++ b/pkgs/development/tools/buildah/default.nix
@@ -4,13 +4,13 @@
 
 buildGoPackage rec {
   pname = "buildah";
-  version = "1.11.1";
+  version = "1.11.3";
 
   src = fetchFromGitHub {
     owner  = "containers";
     repo   = "buildah";
     rev    = "v${version}";
-    sha256 = "0mbmb7994dcv8i41zgiqmb6qp5hawgygzam7mi4pmdygkx4ckkxw";
+    sha256 = "0gpxlqakfw3r40w6fsd1d6x45slmivxpcbngnv9lv7762irykz12";
   };
 
   outputs = [ "bin" "man" "out" ];
-- 
GitLab


From ea45dc1053d560d8b3b1e2a386a0a014b4b60b4a Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@fysik.su.se>
Date: Mon, 7 Oct 2019 13:03:13 +0200
Subject: [PATCH 2075/2254] gromacs: add perl to buildInputs

---
 .../molecular-dynamics/gromacs/default.nix    | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
index a2d3722cde9..d720f5ea078 100644
--- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
+++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
@@ -1,9 +1,9 @@
-
-{ stdenv, fetchurl, cmake,
-  singlePrec ? true,
-  mpiEnabled ? false,
-  fftw,
-  openmpi
+{ stdenv, fetchurl, cmake
+, singlePrec ? true
+, mpiEnabled ? false
+, fftw
+, openmpi
+, perl
 }:
 
 
@@ -15,13 +15,14 @@ stdenv.mkDerivation {
     sha256 = "0rqqrbjrdhprlw2z6cqid59xwxfdx05ikvywppvdp8f8vzp6chxs";
   };
 
-  buildInputs = [cmake fftw]
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ fftw perl ]
   ++ (stdenv.lib.optionals mpiEnabled [ openmpi ]);
 
   cmakeFlags = ''
     ${if singlePrec then "-DGMX_DOUBLE=OFF" else "-DGMX_DOUBLE=ON -DGMX_DEFAULT_SUFFIX=OFF"}
-    ${if mpiEnabled then "-DGMX_MPI:BOOL=TRUE 
-                          -DGMX_CPU_ACCELERATION:STRING=SSE4.1 
+    ${if mpiEnabled then "-DGMX_MPI:BOOL=TRUE
+                          -DGMX_CPU_ACCELERATION:STRING=SSE4.1
                           -DGMX_OPENMP:BOOL=TRUE
                           -DGMX_THREAD_MPI:BOOL=FALSE"
                      else "-DGMX_MPI:BOOL=FALSE" }
-- 
GitLab


From 97ecdf799c38f3c603d3317a7ca3f1d10ccff633 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 7 Oct 2019 04:16:40 -0700
Subject: [PATCH 2076/2254] jgmenu: 3.3 -> 3.4

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/jgmenu/versions
---
 pkgs/applications/misc/jgmenu/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/jgmenu/default.nix b/pkgs/applications/misc/jgmenu/default.nix
index 879f344a5af..17d5dd87336 100644
--- a/pkgs/applications/misc/jgmenu/default.nix
+++ b/pkgs/applications/misc/jgmenu/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "jgmenu";
-  version = "3.3";
+  version = "3.4";
 
   src = fetchFromGitHub {
     owner = "johanmalm";
     repo = pname;
     rev = "v${version}";
-    sha256 = "02qpvlmcis7217hkqilhszza4g1smb4byx4gihgp5207aj8qhz0l";
+    sha256 = "1cikndf71wi17qld3rwp38gk0q7zic707zzz0mr7cgn86dc4if3d";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From e07345793e2a57d1b6072cbbe3b5c50736d8572d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 7 Oct 2019 04:53:39 -0700
Subject: [PATCH 2077/2254] kodelife: 0.8.3.93 -> 0.8.5.99

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/kodelife/versions
---
 pkgs/applications/graphics/kodelife/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/kodelife/default.nix b/pkgs/applications/graphics/kodelife/default.nix
index b86560d1319..22cd252a3e7 100644
--- a/pkgs/applications/graphics/kodelife/default.nix
+++ b/pkgs/applications/graphics/kodelife/default.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation rec {
   pname = "kodelife";
-  version = "0.8.3.93";
+  version = "0.8.5.99";
 
   src = fetchzip {
     url = "https://hexler.net/pub/${pname}/${pname}-${version}-linux-x86_64.zip";
-    sha256 = "1gidh0745g5mc8h5ypm2wamv1paymnrq3nh3yx1j70jwjg8v2v7g";
+    sha256 = "189i2j6kaygjb5pccynxv4pwqpy67jf9nfi7fjfhbrmjpqnmkp90";
   };
 
   dontConfigure = true;
-- 
GitLab


From 22011b02180d4092867eb41ad0e332ef882a4400 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Mon, 7 Oct 2019 13:58:39 +0200
Subject: [PATCH 2078/2254] linuxPackages.virtualBoxGuestAdditions: fix build

Fixes #70470
---
 .../virtualization/virtualbox/guest-additions/default.nix       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index c17765bc54d..3d1cdb05590 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -55,6 +55,8 @@ in stdenv.mkDerivation {
     ${if stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux" then ''
         isoinfo -J -i $src -x /VBoxLinuxAdditions.run > ./VBoxLinuxAdditions.run
         chmod 755 ./VBoxLinuxAdditions.run
+        # An overflow leads the is-there-enough-space check to fail when there's too much space available, so fake how much space there is
+        sed -i 's/\$leftspace/16383/' VBoxLinuxAdditions.run
         ./VBoxLinuxAdditions.run --noexec --keep
       ''
       else throw ("Architecture: "+stdenv.hostPlatform.system+" not supported for VirtualBox guest additions")
-- 
GitLab


From 39049dbd37fbdc6183526fcda16fc00e0c7423fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Mon, 7 Oct 2019 14:45:54 +0200
Subject: [PATCH 2079/2254] knot-resolver: 4.2.1 -> 4.2.2 (tiny bugfix)

https://gitlab.labs.nic.cz/knot/knot-resolver/tags/v4.2.2
---
 pkgs/servers/dns/knot-resolver/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index 1daa3916925..3fe8499a58c 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -23,11 +23,11 @@ exportLuaPathsFor = luaPkgs: ''
 
 unwrapped = stdenv.mkDerivation rec {
   pname = "knot-resolver";
-  version = "4.2.1";
+  version = "4.2.2";
 
   src = fetchurl {
     url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz";
-    sha256 = "286e432762f8aa5e605e5e8fecf81815b55c4ed0be19a63e81fbc28171ae553b";
+    sha256 = "03b68dff16429aed7a5b0cea7189276c8056e8ecd567b678c2595d48d9a51458";
   };
 
   # https://gitlab.labs.nic.cz/knot/knot-resolver/issues/496
-- 
GitLab


From 001b42db7f18f62cf8853586c1114d66b3889708 Mon Sep 17 00:00:00 2001
From: "Mathieu A.-Tetreault" <alexandretm@amotus.ca>
Date: Fri, 20 Sep 2019 12:00:24 -0400
Subject: [PATCH 2080/2254] breeze-plymouth: allow usage of custom logo

---
 nixos/modules/system/boot/plymouth.nix        | 18 ++++----
 .../plasma-5/breeze-plymouth/default.nix      | 43 +++++++++++--------
 2 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/nixos/modules/system/boot/plymouth.nix b/nixos/modules/system/boot/plymouth.nix
index e4223bae7d3..fd43ea1620c 100644
--- a/nixos/modules/system/boot/plymouth.nix
+++ b/nixos/modules/system/boot/plymouth.nix
@@ -5,17 +5,20 @@ with lib;
 let
 
   inherit (pkgs) plymouth;
+  inherit (pkgs) nixos-icons;
 
   cfg = config.boot.plymouth;
 
-  breezePlymouth = pkgs.breeze-plymouth.override {
-    nixosBranding = true;
-    nixosVersion = config.system.nixos.release;
+  nixosBreezePlymouth = pkgs.breeze-plymouth.override {
+    logoFile = cfg.logo;
+    logoName = "nixos";
+    osName = "NixOS";
+    osVersion = config.system.nixos.release;
   };
 
   themesEnv = pkgs.buildEnv {
     name = "plymouth-themes";
-    paths = [ plymouth breezePlymouth ] ++ cfg.themePackages;
+    paths = [ plymouth ] ++ cfg.themePackages;
   };
 
   configFile = pkgs.writeText "plymouthd.conf" ''
@@ -35,7 +38,7 @@ in
       enable = mkEnableOption "Plymouth boot splash screen";
 
       themePackages = mkOption {
-        default = [];
+        default = [ nixosBreezePlymouth ];
         type = types.listOf types.package;
         description = ''
           Extra theme packages for plymouth.
@@ -52,10 +55,7 @@ in
 
       logo = mkOption {
         type = types.path;
-        default = pkgs.fetchurl {
-          url = "https://nixos.org/logo/nixos-hires.png";
-          sha256 = "1ivzgd7iz0i06y36p8m5w48fd8pjqwxhdaavc0pxs7w1g7mcy5si";
-        };
+        default = "${nixos-icons}/share/icons/hicolor/128x128/apps/nix-snowflake.png";
         defaultText = ''pkgs.fetchurl {
           url = "https://nixos.org/logo/nixos-hires.png";
           sha256 = "1ivzgd7iz0i06y36p8m5w48fd8pjqwxhdaavc0pxs7w1g7mcy5si";
diff --git a/pkgs/desktops/plasma-5/breeze-plymouth/default.nix b/pkgs/desktops/plasma-5/breeze-plymouth/default.nix
index 48b038325fe..5b6abddbcda 100644
--- a/pkgs/desktops/plasma-5/breeze-plymouth/default.nix
+++ b/pkgs/desktops/plasma-5/breeze-plymouth/default.nix
@@ -8,37 +8,42 @@
   imagemagick,
   netpbm,
   perl,
-  # these will typically need to be set via an override
-  # in a NixOS context
-  nixosBranding ? false,
-  nixosName ? "NixOS",
-  nixosVersion ? "",
+  logoName ? null,
+  logoFile ? null,
+  osName ? null,
+  osVersion ? null,
   topColor ? "black",
   bottomColor ? "black"
 }:
 
-let
-  logoName = "nixos";
+let 
+  validColors = [ "black" "cardboard_grey" "charcoal_grey" "icon_blue" "paper_white" "plasma_blue" "neon_blue" "neon_green" ];
+  resolvedLogoName = if (logoFile != null && logoName == null) then lib.strings.removeSuffix ".png" (baseNameOf(toString logoFile)) else logoName;
 in
+  assert lib.asserts.assertOneOf "topColor" topColor validColors;
+  assert lib.asserts.assertOneOf "bottomColor" bottomColor validColors;
+  
+
 mkDerivation {
   name = "breeze-plymouth";
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ plymouth ] ++ lib.optionals nixosBranding [ imagemagick netpbm perl ];
+  buildInputs = [ plymouth ] ++ lib.optionals (logoFile != null) [ imagemagick netpbm perl ];
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
-  cmakeFlags = lib.optionals nixosBranding [
-    "-DDISTRO_NAME=${nixosName}"
-    "-DDISTRO_VERSION=${nixosVersion}"
-    "-DDISTRO_LOGO=${logoName}"
-    "-DBACKGROUND_TOP_COLOR=${topColor}"
-    "-DBACKGROUND_BOTTOM_COLOR=${bottomColor}"
-  ];
+  cmakeFlags = []
+    ++ lib.optional (osName      != null) "-DDISTRO_NAME=${osName}"
+    ++ lib.optional (osVersion   != null) "-DDISTRO_VERSION=${osVersion}"
+    ++ lib.optional (logoName    != null) "-DDISTRO_LOGO=${logoName}"
+    ++ lib.optional (topColor    != null) "-DBACKGROUND_TOP_COLOR=${topColor}"
+    ++ lib.optional (bottomColor != null) "-DBACKGROUND_BOTTOM_COLOR=${bottomColor}"
+  ;
+  
   postPatch = ''
       substituteInPlace cmake/FindPlymouth.cmake --subst-var out
-  '' + lib.optionalString nixosBranding ''
-      cp ${nixos-icons}/share/icons/hicolor/128x128/apps/nix-snowflake.png breeze/images/${logoName}.logo.png
+  '' + lib.optionalString (logoFile != null) ''
+      cp ${logoFile} breeze/images/${resolvedLogoName}.logo.png
 
       # conversion for 16bit taken from the breeze-plymouth readme
-      convert ${nixos-icons}/share/icons/hicolor/128x128/apps/nix-snowflake.png -alpha Background -background "#000000" -fill "#000000" -flatten tmp.png
-      pngtopnm tmp.png | pnmquant 16 | pnmtopng > breeze/images/16bit/${logoName}.logo.png
+      convert ${logoFile} -alpha Background -background "#000000" -fill "#000000" -flatten tmp.png
+      pngtopnm tmp.png | pnmquant 16 | pnmtopng > breeze/images/16bit/${resolvedLogoName}.logo.png
   '';
 }
-- 
GitLab


From c70d7fa7603c7c4ea64211dd2be5995a55310245 Mon Sep 17 00:00:00 2001
From: Marco Maggesi <1809783+maggesi@users.noreply.github.com>
Date: Mon, 7 Oct 2019 15:47:37 +0200
Subject: [PATCH 2081/2254] elpi: 1.6.0 -> 1.7.0

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

diff --git a/pkgs/development/ocaml-modules/elpi/default.nix b/pkgs/development/ocaml-modules/elpi/default.nix
index 2542b5dd913..b69a4900f6f 100644
--- a/pkgs/development/ocaml-modules/elpi/default.nix
+++ b/pkgs/development/ocaml-modules/elpi/default.nix
@@ -4,13 +4,13 @@
 
 buildDunePackage rec {
   pname = "elpi";
-  version = "1.6.0";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "LPCIC";
     repo = "elpi";
     rev = "v${version}";
-    sha256 = "0740a9bg33g7r3injpalmn2jd0h586481vrrkdw46nsaspwcjhza";
+    sha256 = "1q6s3x4gba0hdymlgj4rf1bny4v7ac4jj7q134cwd3sxiwqcyhww";
   };
 
   minimumOCamlVersion = "4.04";
-- 
GitLab


From ad201141a8b45998c0c9ec9a5659df60e3b49ccb Mon Sep 17 00:00:00 2001
From: toonn <toonn@toonn.io>
Date: Mon, 7 Oct 2019 16:34:05 +0200
Subject: [PATCH 2082/2254] wire-desktop: mac 3.10.3133 -> 3.10.3215

---
 .../networking/instant-messengers/wire-desktop/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
index 869dcb9d29b..d79a24ea1c2 100644
--- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
@@ -19,12 +19,12 @@ let
 
   version = {
     x86_64-linux = "3.10.2904";
-    x86_64-darwin = "3.10.3133";
+    x86_64-darwin = "3.10.3215";
   }.${system} or throwSystem;
 
   sha256 = {
     x86_64-linux = "1vrz4568mlhylx17jw4z452f0vrd8yd8qkbpkcvnsbhs6k066xcn";
-    x86_64-darwin = "0d8g9fl3yciqp3aic374rzcywb5d5yipgni992khsfdfqhcvm3x9";
+    x86_64-darwin = "0ygm3fgy9k1dp2kjfwsrrwq1i88wgxc6k8y80yz61ivdawgph9wa";
   }.${system} or throwSystem;
 
   meta = with stdenv.lib; {
-- 
GitLab


From bdf4441d64e71dd1cd5f50729fb7112defcce6cc Mon Sep 17 00:00:00 2001
From: Samuel Leathers <samuel.leathers@iohk.io>
Date: Mon, 7 Oct 2019 10:16:26 -0400
Subject: [PATCH 2083/2254] README: Update to 19.09

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

diff --git a/README.md b/README.md
index b34438e41a8..49550f8fe7a 100644
--- a/README.md
+++ b/README.md
@@ -44,9 +44,9 @@ Nixpkgs and NixOS are built and tested by our continuous integration
 system, [Hydra](https://hydra.nixos.org/).
 
 * [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined)
-* [Continuous package builds for the NixOS 19.03 release](https://hydra.nixos.org/jobset/nixos/release-19.03)
+* [Continuous package builds for the NixOS 19.09 release](https://hydra.nixos.org/jobset/nixos/release-19.09)
 * [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents)
-* [Tests for the NixOS 19.03 release](https://hydra.nixos.org/job/nixos/release-19.03/tested#tabs-constituents)
+* [Tests for the NixOS 19.09 release](https://hydra.nixos.org/job/nixos/release-19.09/tested#tabs-constituents)
 
 Artifacts successfully built with Hydra are published to cache at
 https://cache.nixos.org/. When successful build and test criteria are
-- 
GitLab


From 4d25ec0caf37eeb1f2b8b678f73a894e0f1efe71 Mon Sep 17 00:00:00 2001
From: Samuel Leathers <samuel.leathers@iohk.io>
Date: Mon, 7 Oct 2019 10:31:02 -0400
Subject: [PATCH 2084/2254] nixos/manual: update 19.03 -> 19.09 in upgrading
 section

---
 nixos/doc/manual/installation/upgrading.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/nixos/doc/manual/installation/upgrading.xml b/nixos/doc/manual/installation/upgrading.xml
index 35b4d266e12..8d3f35b7c26 100644
--- a/nixos/doc/manual/installation/upgrading.xml
+++ b/nixos/doc/manual/installation/upgrading.xml
@@ -14,7 +14,7 @@
     <para>
      <emphasis>Stable channels</emphasis>, such as
      <literal
-    xlink:href="https://nixos.org/channels/nixos-19.03">nixos-19.03</literal>.
+    xlink:href="https://nixos.org/channels/nixos-19.09">nixos-19.09</literal>.
      These only get conservative bug fixes and package upgrades. For instance,
      a channel update may cause the Linux kernel on your system to be upgraded
      from 4.19.34 to 4.19.38 (a minor bug fix), but not from
@@ -38,7 +38,7 @@
     <para>
      <emphasis>Small channels</emphasis>, such as
      <literal
-    xlink:href="https://nixos.org/channels/nixos-19.03-small">nixos-19.03-small</literal>
+    xlink:href="https://nixos.org/channels/nixos-19.09-small">nixos-19.09-small</literal>
      or
      <literal
     xlink:href="https://nixos.org/channels/nixos-unstable-small">nixos-unstable-small</literal>.
@@ -63,8 +63,8 @@
  <para>
   When you first install NixOS, you’re automatically subscribed to the NixOS
   channel that corresponds to your installation source. For instance, if you
-  installed from a 19.03 ISO, you will be subscribed to the
-  <literal>nixos-19.03</literal> channel. To see which NixOS channel you’re
+  installed from a 19.09 ISO, you will be subscribed to the
+  <literal>nixos-19.09</literal> channel. To see which NixOS channel you’re
   subscribed to, run the following as root:
 <screen>
 # nix-channel --list | grep nixos
@@ -75,13 +75,13 @@ nixos https://nixos.org/channels/nixos-unstable
 # nix-channel --add https://nixos.org/channels/<replaceable>channel-name</replaceable> nixos
 </screen>
   (Be sure to include the <literal>nixos</literal> parameter at the end.) For
-  instance, to use the NixOS 19.03 stable channel:
+  instance, to use the NixOS 19.09 stable channel:
 <screen>
-# nix-channel --add https://nixos.org/channels/nixos-19.03 nixos
+# nix-channel --add https://nixos.org/channels/nixos-19.09 nixos
 </screen>
   If you have a server, you may want to use the “small” channel instead:
 <screen>
-# nix-channel --add https://nixos.org/channels/nixos-19.03-small nixos
+# nix-channel --add https://nixos.org/channels/nixos-19.09-small nixos
 </screen>
   And if you want to live on the bleeding edge:
 <screen>
@@ -127,7 +127,7 @@ nixos https://nixos.org/channels/nixos-unstable
    current channel. (To see when the service runs, see <command>systemctl
    list-timers</command>.) You can also specify a channel explicitly, e.g.
 <programlisting>
-<xref linkend="opt-system.autoUpgrade.channel"/> = https://nixos.org/channels/nixos-19.03;
+<xref linkend="opt-system.autoUpgrade.channel"/> = https://nixos.org/channels/nixos-19.09;
 </programlisting>
   </para>
  </section>
-- 
GitLab


From 25a36477c8284a93264651aa59623064463efcd7 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Mon, 7 Oct 2019 16:17:57 +0200
Subject: [PATCH 2085/2254] 19.09 notes: document timesyncd issue

See #64922.
---
 nixos/doc/manual/release-notes/rl-1909.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
index 6b2488a6a8d..a33027bdbd1 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -530,6 +530,17 @@
       The <literal>nodejs-11_x</literal> package has been removed as it's EOLed by upstream.
      </para>
    </listitem>
+   <listitem>
+     <para>
+       Because of the systemd upgrade,
+       <application>systemd-timesyncd</application> will no longer work if
+       <option>system.stateVersion</option> is not set correctly. When
+       upgrading from NixOS 19.03, please make sure that
+       <option>system.stateVersion</option> is set to
+       <literal>"19.03"</literal>, or lower if the installation dates back to an
+       earlier version of NixOS.
+     </para>
+   </listitem>
   </itemizedlist>
  </section>
 
-- 
GitLab


From 8044cf3668886a650ac2af1fd644dbe8f7f62436 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Thu, 3 Oct 2019 23:43:06 +0100
Subject: [PATCH 2086/2254] pythonPackages.pandas: 0.25.0 -> 0.25.1

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

diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix
index 6f1c2c68dd3..8abe4d3bf24 100644
--- a/pkgs/development/python-modules/pandas/default.nix
+++ b/pkgs/development/python-modules/pandas/default.nix
@@ -30,11 +30,11 @@ let
 
 in buildPythonPackage rec {
   pname = "pandas";
-  version = "0.25.0";
+  version = "0.25.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "914341ad2d5b1ea522798efa4016430b66107d05781dbfe7cf05eba8f37df995";
+    sha256 = "1xm9dmbngsq46vj836csnb5j0bs88b1d713b0b5vx1q6gdxijbnb";
   };
 
   checkInputs = [ pytest glibcLocales moto hypothesis ];
-- 
GitLab


From 39c0e489d3e3e56ae848075bb6b2257176d48d32 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 7 Oct 2019 17:21:28 +0200
Subject: [PATCH 2087/2254] Revert "make-disk-image: replace nixos-install by
 nix-env calls"

This reverts commit e9bf955fd6d5ffda218878ba561c93c6a28dfe8e. We use
nixos-install to ensure that make-disk-image produces the same result
as a regular installation (9802da517fe4da41d68516029b01c5c1f175b3e4)
and to reduce code duplication. If there is something broken in
nixos-install, it should be fixed there.
---
 nixos/lib/make-disk-image.nix | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix
index de4aacf2319..5e86ea479d5 100644
--- a/nixos/lib/make-disk-image.nix
+++ b/nixos/lib/make-disk-image.nix
@@ -180,17 +180,9 @@ let format' = format; in let
     export NIX_STATE_DIR=$TMPDIR/state
     nix-store --load-db < ${closureInfo}/registration
 
-    mkdir -m 0755 -p "$root/etc"
-    touch "$root/etc/NIXOS"
-
-    echo "copying system..."
-    nix-env --store "$root" --substituters "auto?trusted=1" \
-        -p "$root/nix/var/nix/profiles/system" --set "${config.system.build.toplevel}" --quiet
-
-    echo "copying channel..."
-    mkdir -p "$root/nix/var/nix/profiles/per-user/root"
-    nix-env --store "$root" --substituters "auto?trusted=1" \
-        -p "$root/nix/var/nix/profiles/per-user/root/channels" --set "${channelSources}" --quiet
+    echo "running nixos-install..."
+    nixos-install --root $root --no-bootloader --no-root-passwd \
+      --system ${config.system.build.toplevel} --channel ${channelSources} --substituters ""
 
     echo "copying staging root to image..."
     cptofs -p ${optionalString (partitionTableType != "none") "-P ${rootPartition}"} -t ${fsType} -i $diskImage $root/* /
-- 
GitLab


From 92ca20ef531a79d53f96767efe4bb999dc82e9f7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 7 Oct 2019 07:59:25 -0700
Subject: [PATCH 2088/2254] libxl: 3.8.4 -> 3.8.5

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libxl/versions
---
 pkgs/development/libraries/libxl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libxl/default.nix b/pkgs/development/libraries/libxl/default.nix
index 44949cf2deb..8153fb883ca 100644
--- a/pkgs/development/libraries/libxl/default.nix
+++ b/pkgs/development/libraries/libxl/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libxl";
-  version = "3.8.4";
+  version = "3.8.5";
 
   src = fetchurl {
     url = "http://www.libxl.com/download/${pname}-lin-${version}.tar.gz";
-    sha256 = "0jnvc9ilir3lvs81l6ldnyf6jbfsy7bcs5pkc75qfnvz01y7p6as";
+    sha256 = "15n8gxyznk1nm2kgp86hd36rnivjsby9ccl12lyabv6q3fab6fsx";
   };
 
   phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
-- 
GitLab


From ced0171b3b7a50fa6468fa9764919056bf35995b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 7 Oct 2019 07:56:39 -0700
Subject: [PATCH 2089/2254] libraw: 0.19.3 -> 0.19.5

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libraw/versions
---
 pkgs/development/libraries/libraw/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix
index 360b2c15a63..62fa8c1a675 100644
--- a/pkgs/development/libraries/libraw/default.nix
+++ b/pkgs/development/libraries/libraw/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libraw";
-  version = "0.19.3";
+  version = "0.19.5";
 
   src = fetchurl {
     url = "https://www.libraw.org/data/LibRaw-${version}.tar.gz";
-    sha256 = "0xs1qb6pcvc4c43fy5xi3nkqxcif77gakkw99irf0fc5iccdd5px";
+    sha256 = "1x827sh6vl8j3ll2ihkcr234y07f31hi1v7sl08jfw3irkbn58j0";
   };
 
   outputs = [ "out" "lib" "dev" "doc" ];
-- 
GitLab


From 90ee4a74aa0595fe939ead1ca391eb224b6d99e4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 7 Oct 2019 08:08:08 -0700
Subject: [PATCH 2090/2254] manuskript: 0.9.0 -> 0.10.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/manuskript/versions
---
 pkgs/applications/editors/manuskript/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/manuskript/default.nix b/pkgs/applications/editors/manuskript/default.nix
index a9d8ffec43e..811284491dd 100644
--- a/pkgs/applications/editors/manuskript/default.nix
+++ b/pkgs/applications/editors/manuskript/default.nix
@@ -2,7 +2,7 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "manuskript";
-  version = "0.9.0";
+  version = "0.10.0";
 
   format = "other";
 
@@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec {
     repo = pname;
     owner = "olivierkes";
     rev = version;
-    sha256 = "13y1s0kba1ib6g977n7h920kyr7abdw03kpal512m7iwa9g2kdw8";
+    sha256 = "0q413vym7hzjpyg3krj5y63hwpncdifjkyswqmr76zg5yqnklnh3";
   };
 
   nativeBuildInputs = [ wrapQtAppsHook ];
-- 
GitLab


From 0158bc0f0ea6177f9a8078c57667e9e6b315c06b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 7 Oct 2019 05:17:51 -0700
Subject: [PATCH 2091/2254] jitterentropy: 2.1.2 -> 2.2.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/jitterentropy/versions
---
 pkgs/development/libraries/jitterentropy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/jitterentropy/default.nix b/pkgs/development/libraries/jitterentropy/default.nix
index 726e00b58bb..f6a70deb8c2 100644
--- a/pkgs/development/libraries/jitterentropy/default.nix
+++ b/pkgs/development/libraries/jitterentropy/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub }:
 stdenv.mkDerivation rec {
   pname = "jitterentropy";
-  version = "2.1.2";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "smuellerDD";
     repo = "jitterentropy-library";
     rev = "v${version}";
-    sha256 = "10yl1hi0hysr53wzy2i8brs0qqnxh46mz3dcjh5mk0ad03wvbfsl";
+    sha256 = "0n2l1fxr7bynnarpwdjifb2fvlsq8w5wmfh31yk5nrc756cjlgyw";
   };
 
   enableParallelBuilding = true;
-- 
GitLab


From 4434c123f427f8a5470ef2a14b290f13d8291d5e Mon Sep 17 00:00:00 2001
From: ryanfitzsimon <ryanfitzsimon@outlook.com>
Date: Tue, 8 Oct 2019 02:29:58 +1000
Subject: [PATCH 2092/2254] packer: 1.4.1 -> 1.4.4 (#70623)

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

diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix
index 9e0da00dd52..261ae318a62 100644
--- a/pkgs/development/tools/packer/default.nix
+++ b/pkgs/development/tools/packer/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 buildGoPackage rec {
   pname = "packer";
-  version = "1.4.1";
+  version = "1.4.4";
 
   goPackagePath = "github.com/hashicorp/packer";
 
@@ -11,7 +11,7 @@ buildGoPackage rec {
     owner = "hashicorp";
     repo = "packer";
     rev = "v${version}";
-    sha256 = "13pj48pbhl47rwyi6gd6dhq9wq0z2h8kzjkahhqhf62dfssv35db";
+    sha256 = "00il85qbj5yadm5l5bczv7awmaazn9k3v3i0wsd6dbwpjga6snw9";
   };
 
   meta = with stdenv.lib; {
-- 
GitLab


From 1c32b7235de6dd6f17ad39fe2e38544e1b6afcb4 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Mon, 7 Oct 2019 18:24:49 +0200
Subject: [PATCH 2093/2254] wlroots: 0.7.0 -> 0.8.0

Changelog: https://github.com/swaywm/wlroots/releases/tag/0.8.0
---
 pkgs/development/libraries/wlroots/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix
index 4d820bd9519..520acea292d 100644
--- a/pkgs/development/libraries/wlroots/default.nix
+++ b/pkgs/development/libraries/wlroots/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "wlroots";
-  version = "0.7.0";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "swaywm";
     repo = "wlroots";
     rev = version;
-    sha256 = "0jzxa6psbc7ddxli7rbfqxmv1svxnis51l1vch4hb9fdixqm284a";
+    sha256 = "0w3lfzczry5zk7x2kxdb8anb4bymsby6h1i2gc0w2f8hgx4m2b9x";
   };
 
   # $out for the library and $examples for the example programs (in examples):
-- 
GitLab


From b99357eabd8db12c24d58bb15ffa281d1eebbcb7 Mon Sep 17 00:00:00 2001
From: Quentin Vaucher <quentin.vaucher@protonmail.com>
Date: Sun, 6 Oct 2019 11:40:23 +0200
Subject: [PATCH 2094/2254] formatter: init at 0.3.0

---
 pkgs/applications/misc/formatter/default.nix  | 70 +++++++++++++++++++
 .../misc/formatter/fix-paths.patch            | 53 ++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 125 insertions(+)
 create mode 100644 pkgs/applications/misc/formatter/default.nix
 create mode 100644 pkgs/applications/misc/formatter/fix-paths.patch

diff --git a/pkgs/applications/misc/formatter/default.nix b/pkgs/applications/misc/formatter/default.nix
new file mode 100644
index 00000000000..11e7a4e5241
--- /dev/null
+++ b/pkgs/applications/misc/formatter/default.nix
@@ -0,0 +1,70 @@
+{ stdenv
+, fetchFromGitHub
+, meson
+, ninja
+, pkgconfig
+, pantheon
+, python3
+, substituteAll
+, glib
+, gtk3
+, dosfstools
+, e2fsprogs
+, exfat
+, hfsprogs
+, ntfs3g
+, libgee
+, wrapGAppsHook
+}:
+
+stdenv.mkDerivation rec {
+  pname = "formatter";
+  version = "0.3.0";
+
+  src = fetchFromGitHub {
+    owner = "Djaler";
+    repo = "Formatter";
+    rev = version;
+    sha256 = "145742dk16736zxj30rzn61h4k0xpggfsbqkxllxd302mgbmxlzq";
+  };
+
+  patches = [
+    (substituteAll {
+      src = ./fix-paths.patch;
+      ext4 = "${e2fsprogs}/bin/mkfs.ext4";
+      exfat = "${exfat}/bin/mkfs.exfat";
+      fat = "${dosfstools}/bin/mkfs.fat";
+      ntfs = "${ntfs3g}/bin/mkfs.ntfs";
+      hfsplus = "${hfsprogs}/bin/mkfs.hfsplus";
+    })
+  ];
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pantheon.vala
+    pkgconfig
+    python3
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
+    glib
+    gtk3
+    libgee
+    pantheon.granite
+  ];
+
+  postPatch = ''
+    chmod +x meson/post_install.py
+    patchShebangs meson/post_install.py
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A simple formatter designed for elementary OS";
+    homepage = "https://github.com/Djaler/Formatter";
+    maintainers = with maintainers; [ kjuvi ] ++ pantheon.maintainers;
+    platforms = platforms.linux;
+    license = licenses.lgpl2Plus;
+  };
+}
diff --git a/pkgs/applications/misc/formatter/fix-paths.patch b/pkgs/applications/misc/formatter/fix-paths.patch
new file mode 100644
index 00000000000..67c1d2b43cc
--- /dev/null
+++ b/pkgs/applications/misc/formatter/fix-paths.patch
@@ -0,0 +1,53 @@
+diff --git a/src/Objects/DeviceFormatter.vala b/src/Objects/DeviceFormatter.vala
+index cf6a3b8..0de10a9 100644
+--- a/src/Objects/DeviceFormatter.vala
++++ b/src/Objects/DeviceFormatter.vala
+@@ -62,42 +62,42 @@ namespace Formatter {
+             string drive_identifier = drive.get_identifier ("unix-device");
+             switch (filesystem) {
+                 case Formatter.Filesystems.EXT4:
+-                    spawn_args = {"pkexec", "mkfs.ext4", drive_identifier, "-F"};
++                    spawn_args = {"pkexec", "@ext4@", drive_identifier, "-F"};
+                     if (label != "") {
+                         spawn_args += "-L";
+                         spawn_args += label;
+                     }
+                     break;
+                 case Formatter.Filesystems.EXFAT:
+-                    spawn_args = {"pkexec", "mkfs.exfat", drive_identifier};
++                    spawn_args = {"pkexec", "@exfat@", drive_identifier};
+                     if (label != "") {
+                         spawn_args += "-n";
+                         spawn_args += label;
+                     }
+                     break;
+                 case Formatter.Filesystems.FAT16:
+-                    spawn_args = {"pkexec", "mkfs.fat", "-F16", "-I", drive_identifier};
++                    spawn_args = {"pkexec", "@fat@", "-F16", "-I", drive_identifier};
+                     if (label != "") {
+                         spawn_args += "-n";
+                         spawn_args += label;
+                     }
+                     break;
+                 case Formatter.Filesystems.FAT32:
+-                    spawn_args = {"pkexec", "mkfs.fat", "-F32", "-I", drive_identifier};
++                    spawn_args = {"pkexec", "@fat@", "-F32", "-I", drive_identifier};
+                     if (label != "") {
+                         spawn_args += "-n";
+                         spawn_args += label;
+                     }
+                     break;
+                 case Formatter.Filesystems.NTFS:
+-                    spawn_args = {"pkexec", "mkfs.ntfs", drive_identifier, "-f", "-F"};
++                    spawn_args = {"pkexec", "@ntfs@", drive_identifier, "-f", "-F"};
+                     if (label != "") {
+                         spawn_args += "-L";
+                         spawn_args += label;
+                     }
+                     break;
+                 case Formatter.Filesystems.HFS_PLUS:
+-                    spawn_args = {"pkexec", "mkfs.hfsplus", drive_identifier};
++                    spawn_args = {"pkexec", "@hfsplus@", drive_identifier};
+                     if (label != "") {
+                         spawn_args += "-v";
+                         spawn_args += label;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 67a338e5a79..b01e75138d7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18504,6 +18504,8 @@ in
 
   fomp = callPackage ../applications/audio/fomp { };
 
+  formatter = callPackage ../applications/misc/formatter { };
+
   fractal = callPackage ../applications/networking/instant-messengers/fractal { };
 
   freecad = qt5.callPackage ../applications/graphics/freecad { mpi = openmpi; };
-- 
GitLab


From 5e9eb563e9f45966f06f8044d1d49dd16b192a72 Mon Sep 17 00:00:00 2001
From: Stig Palmquist <stig@stig.io>
Date: Mon, 7 Oct 2019 18:58:57 +0200
Subject: [PATCH 2095/2254] i3status-rust: 0.10.0 -> 0.11.0

---
 pkgs/applications/window-managers/i3/status-rust.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix
index 60edf05892d..c8731408951 100644
--- a/pkgs/applications/window-managers/i3/status-rust.nix
+++ b/pkgs/applications/window-managers/i3/status-rust.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "i3status-rust";
-  version = "0.10.0";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     owner = "greshake";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0i1k884ha08w7r5q5z012q2w7hs333b3c18hkbrhamknpvy6c2i0";
+    sha256 = "15083nagd0kzpkay5jxcq5i16yvybd4sh03g9x4q9xq4cy0qwj11";
   };
 
-  cargoSha256 = "1w43k3ld9ra7blbn593mpi8qg5pgcglwqwddkrb55yxnpnkaxvzy";
+  cargoSha256 = "1cbx2jll0bj547dvwzjprzidndbqn1c4c6hmbfgjgdkxmmrpb0r1";
 
   nativeBuildInputs = [ pkgconfig ];
 
-- 
GitLab


From eec7cab81d787dd5d0c3b476f6b5afd25abec706 Mon Sep 17 00:00:00 2001
From: Greizgh <greizgh@ephax.org>
Date: Sat, 14 Sep 2019 10:49:38 +0200
Subject: [PATCH 2096/2254] mumble,murmur: 1.2.19 -> 1.3.0

---
 .../networking/mumble/default.nix             | 68 +++++--------------
 pkgs/top-level/aliases.nix                    |  4 +-
 pkgs/top-level/all-packages.nix               | 11 ++-
 3 files changed, 27 insertions(+), 56 deletions(-)

diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index 6439991920d..44a83a028f5 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -1,32 +1,28 @@
-{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, pkgconfig
-, qt4, qmake4Hook, qt5, avahi, boost, libopus, libsndfile, protobuf3_6, speex, libcap
+{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, pkgconfig, mkDerivation
+, qtbase, qttools, qtsvg, qmake, avahi, boost, libopus, libsndfile, protobuf, speex, libcap
 , alsaLib, python
 , jackSupport ? false, libjack2 ? null
 , speechdSupport ? false, speechd ? null
 , pulseSupport ? false, libpulseaudio ? null
-, iceSupport ? false, zeroc-ice ? null, zeroc-ice-36 ? null
+, iceSupport ? false, zeroc-ice ? null
 }:
 
 assert jackSupport -> libjack2 != null;
 assert speechdSupport -> speechd != null;
 assert pulseSupport -> libpulseaudio != null;
-assert iceSupport -> zeroc-ice != null && zeroc-ice-36 != null;
+assert iceSupport -> zeroc-ice != null;
 
 with stdenv.lib;
 let
-  generic = overrides: source: (if source.qtVersion == 5 then qt5.mkDerivation else stdenv.mkDerivation) (source // overrides // {
+  generic = overrides: source: mkDerivation (source // overrides // {
     name = "${overrides.type}-${source.version}";
 
     patches = (source.patches or []) ++ optional jackSupport ./mumble-jack-support.patch;
 
-    nativeBuildInputs = [ pkgconfig python ]
-      ++ { qt4 = [ qmake4Hook ]; qt5 = [ qt5.qmake ]; }."qt${toString source.qtVersion}"
+    nativeBuildInputs = [ pkgconfig python qmake ]
       ++ (overrides.nativeBuildInputs or [ ]);
 
-    # protobuf is freezed to 3.6 because of this bug: https://github.com/mumble-voip/mumble/issues/3617
-    # this could be reverted to the latest version in a future release of mumble as it is already fixed in master
-    buildInputs = [ boost protobuf3_6 avahi ]
-      ++ optional (source.qtVersion == 4) qt4
+    buildInputs = [ boost protobuf avahi ]
       ++ (overrides.buildInputs or [ ]);
 
     qmakeFlags = [
@@ -76,9 +72,8 @@ let
   client = source: generic {
     type = "mumble";
 
-    nativeBuildInputs = optional (source.qtVersion == 5) qt5.qttools;
-    buildInputs = [ libopus libsndfile speex ]
-      ++ optional (source.qtVersion == 5) qt5.qtsvg
+    nativeBuildInputs = [ qttools ];
+    buildInputs = [ libopus libsndfile speex qtsvg ]
       ++ optional stdenv.isLinux alsaLib
       ++ optional jackSupport libjack2
       ++ optional speechdSupport speechd
@@ -107,18 +102,18 @@ let
     '';
   } source;
 
-  server = source: let ice = if source.qtVersion == 4 then zeroc-ice-36 else zeroc-ice; in generic {
+  server = source: generic {
     type = "murmur";
 
     postPatch = optional iceSupport ''
-      grep -Rl '/usr/share/Ice' . | xargs sed -i 's,/usr/share/Ice/,${ice.dev}/share/ice/,g'
+      grep -Rl '/usr/share/Ice' . | xargs sed -i 's,/usr/share/Ice/,${zeroc-ice.dev}/share/ice/,g'
     '';
 
     configureFlags = [
       "CONFIG+=no-client"
     ] ++ optional (!iceSupport) "CONFIG+=no-ice";
 
-    buildInputs = [ libcap ] ++ optional iceSupport ice;
+    buildInputs = [ libcap ] ++ optional iceSupport zeroc-ice;
 
     installPhase = ''
       # bin stuff
@@ -126,48 +121,19 @@ let
     '';
   } source;
 
-  stableSource = rec {
-    version = "1.2.19";
-    qtVersion = 4;
-
-    src = fetchurl {
-      url = "https://github.com/mumble-voip/mumble/releases/download/${version}/mumble-${version}.tar.gz";
-      sha256 = "1s60vaici3v034jzzi20x23hsj6mkjlc0glipjq4hffrg9qgnizh";
-    };
-
-    patches = [
-      # Fix compile error against boost 1.66 (#33655):
-      (fetchpatch {
-        url = "https://github.com/mumble-voip/mumble/commit/"
-            + "ea861fe86743c8402bbad77d8d1dd9de8dce447e.patch";
-        sha256 = "1r50dc8dcl6jmbj4abhnay9div7y56kpmajzqd7ql0pm853agwbh";
-      })
-      # Fixes hang on reconfiguring audio (often including startup)
-      # https://github.com/mumble-voip/mumble/pull/3418
-      (fetchpatch {
-        url = "https://github.com/mumble-voip/mumble/commit/"
-            + "fbbdf2e8ab7d93ed6f7680268ad0689b7eaa71ad.patch";
-        sha256 = "1yhj62mlwm6q42i4aclbia645ha97d3j4ycxhgafr46dbjs0gani";
-      })
-    ];
-  };
-
-  rcSource = rec {
-    version = "1.3.0-rc2";
-    qtVersion = 5;
+  source = rec {
+    version = "1.3.0";
 
     # Needs submodules
     src = fetchFromGitHub {
       owner = "mumble-voip";
       repo = "mumble";
       rev = version;
-      sha256 = "00irlzz5q4drmsfbwrkyy7p7w8a5fc1ip5vyicq3g3cy58dprpqr";
+      sha256 = "0g5ri84gg0x3crhpxlzawf9s9l4hdna6aqw6qbdpx1hjlf5k6g8k";
       fetchSubmodules = true;
     };
   };
 in {
-  mumble     = client stableSource;
-  mumble_rc  = client rcSource;
-  murmur     = server stableSource;
-  murmur_rc  = server rcSource;
+  mumble  = client source;
+  murmur  = server source;
 }
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 091824a5239..65bbe42ef6e 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -443,8 +443,8 @@ mapAliases ({
   };
 
   # added 2019-08-01
-  mumble_git = pkgs.mumble_rc;
-  murmur_git = pkgs.murmur_rc;
+  mumble_git = pkgs.mumble;
+  murmur_git = pkgs.murmur;
 
   # added 2019-09-06
   zeroc_ice = pkgs.zeroc-ice;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b01e75138d7..5c7586b915e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19667,13 +19667,18 @@ in
 
   multimon-ng = callPackage ../applications/radio/multimon-ng { };
 
-  inherit (callPackages ../applications/networking/mumble {
+  murmur = (libsForQt5.callPackage ../applications/networking/mumble {
+      avahi = avahi-compat;
+      pulseSupport = config.pulseaudio or false;
+      iceSupport = config.murmur.iceSupport or true;
+    }).murmur;
+
+  mumble = (libsForQt5.callPackage ../applications/networking/mumble {
       avahi = avahi-compat;
       jackSupport = config.mumble.jackSupport or false;
       speechdSupport = config.mumble.speechdSupport or false;
       pulseSupport = config.pulseaudio or false;
-      iceSupport = config.murmur.iceSupport or true;
-    }) mumble mumble_rc murmur murmur_rc;
+    }).mumble;
 
   mumble_overlay = callPackage ../applications/networking/mumble/overlay.nix {
     mumble_i686 = if stdenv.hostPlatform.system == "x86_64-linux"
-- 
GitLab


From 11c93653c71ec84dbc2405a52159d4b6c9157e4d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 10:57:21 -0700
Subject: [PATCH 2097/2254] mgba: 0.7.2 -> 0.7.3

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mgba/versions
---
 pkgs/misc/emulators/mgba/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/emulators/mgba/default.nix b/pkgs/misc/emulators/mgba/default.nix
index 6dc7bc30f32..c2b30f8ce47 100644
--- a/pkgs/misc/emulators/mgba/default.nix
+++ b/pkgs/misc/emulators/mgba/default.nix
@@ -15,13 +15,13 @@ let
   };
 in stdenv.mkDerivation rec {
   pname = "mgba";
-  version = "0.7.2";
+  version = "0.7.3";
 
   src = fetchFromGitHub {
     owner = "mgba-emu";
     repo = "mgba";
     rev = version;
-    sha256 = "0g0xa1mzvan0sl1p5c784j2g5mcw9kd2b7wiahy06gy0c1nmbcnp";
+    sha256 = "1wrmwh50rv8bd328r8cisrihq6h90kx2bfb0vmjfbsd3l1jvgrgm";
   };
 
   enableParallelBuilding = true;
-- 
GitLab


From f4f18c3ddb2a19ad161864e1f5fa1244471e03d5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 09:43:27 -0700
Subject: [PATCH 2098/2254] libx86emu: 2.3 -> 2.4

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libx86emu/versions
---
 pkgs/development/libraries/libx86emu/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libx86emu/default.nix b/pkgs/development/libraries/libx86emu/default.nix
index f361b3e1b1f..cef2c6aeb1b 100644
--- a/pkgs/development/libraries/libx86emu/default.nix
+++ b/pkgs/development/libraries/libx86emu/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libx86emu";
-  version = "2.3";
+  version = "2.4";
 
   src = fetchFromGitHub {
     owner = "wfeldt";
     repo = "libx86emu";
     rev = version;
-    sha256 = "158mrg9xb0sb4l3s60084j6i7nr90smpsks9f02gbssk495h2k8l";
+    sha256 = "0r55ij8f5mab2kg6kvy5n2bw6avzp75nsxigbzy7dgik9zwsxvr4";
   };
 
   nativeBuildInputs = [ perl ];
-- 
GitLab


From 9ac905e03f7fcbf3ae51856099a5e2dfe75029c2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 7 Oct 2019 03:07:18 -0700
Subject: [PATCH 2099/2254] gtkwave: 3.3.101 -> 3.3.102

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/gtkwave/versions
---
 pkgs/applications/science/electronics/gtkwave/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix
index 8dffe580cc6..64c1c3daba8 100644
--- a/pkgs/applications/science/electronics/gtkwave/default.nix
+++ b/pkgs/applications/science/electronics/gtkwave/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gtkwave";
-  version = "3.3.101";
+  version = "3.3.102";
 
   src = fetchurl {
     url    = "mirror://sourceforge/gtkwave/${pname}-${version}.tar.gz";
-    sha256 = "1j6capxwgi8aj3sgqg1r7161icni9y8y93g1rl3bzd3s40jcyhsz";
+    sha256 = "1izyfx6b1n9nr08c7q0gkgcf0q04bb4qz92ckwh74n5l5nwprfw0";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From 1979aced56e8323ed27d28c849d4a1eb69fc854b Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Sun, 6 Oct 2019 16:35:46 +0300
Subject: [PATCH 2100/2254] znc: 1.7.4 -> 1.7.5

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

diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix
index 238864311ef..bf36a6f2bbb 100644
--- a/pkgs/applications/networking/znc/default.nix
+++ b/pkgs/applications/networking/znc/default.nix
@@ -13,11 +13,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "znc";
-  version = "1.7.4";
+  version = "1.7.5";
 
   src = fetchurl {
     url = "https://znc.in/releases/archive/${pname}-${version}.tar.gz";
-    sha256 = "0wcvqkpin8w4i72alnn0nxnrc9ih543qs34hqpk9xmz6m0hjk8xi";
+    sha256 = "08a7yb2xs85hyyz8dpzfbsfjwj2r6kcii022lj3l4rf8hl9ix558";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From 55023876bdc095afbf9d840637257254e41815be Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 7 Oct 2019 00:26:35 -0700
Subject: [PATCH 2101/2254] fossil: 2.9 -> 2.10

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/fossil/versions
---
 pkgs/applications/version-management/fossil/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix
index cc029881133..5c46879e319 100644
--- a/pkgs/applications/version-management/fossil/default.nix
+++ b/pkgs/applications/version-management/fossil/default.nix
@@ -5,7 +5,7 @@
 
 stdenv.mkDerivation rec {
   pname = "fossil";
-  version = "2.9";
+  version = "2.10";
 
   src = fetchurl {
     urls =
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
         "https://www.fossil-scm.org/index.html/uv/fossil-src-${version}.tar.gz"
       ];
     name = "${pname}-${version}.tar.gz";
-    sha256 = "0kwb7pkp7y2my916rhyl6kmcf0fk8gkzaxzy13hfgqs35nlsvchw";
+    sha256 = "041bs4fgk52fw58p7s084pxk9d9vs5v2f2pjbznqawz75inpg8yq";
   };
 
   buildInputs = [ zlib openssl readline sqlite which ed ]
-- 
GitLab


From 33da3a4d3247b372a17256556254000a1a6fbd72 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 6 Oct 2019 22:47:43 -0700
Subject: [PATCH 2102/2254] entr: 4.2 -> 4.3

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/entr/versions
---
 pkgs/tools/misc/entr/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/entr/default.nix b/pkgs/tools/misc/entr/default.nix
index 954b570c79d..7233236216f 100644
--- a/pkgs/tools/misc/entr/default.nix
+++ b/pkgs/tools/misc/entr/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "entr";
-  version = "4.2";
+  version = "4.3";
 
   src = fetchurl {
     url = "http://entrproject.org/code/${pname}-${version}.tar.gz";
-    sha256 = "0w2xkf77jikcjh15fp9g7661ss30pz3jbnh261vqpaqavwah4c17";
+    sha256 = "0ni34sfrssa6njiqm22q2kxv437r6vbs0a6mys8kwwn7vbdw30dh";
   };
 
   postPatch = ''
-- 
GitLab


From e18f8b69095054fa88eb3788091d2767bd08a296 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 7 Oct 2019 00:40:43 -0700
Subject: [PATCH 2103/2254] gitAndTools.git-remote-hg: 1.0.0 -> 1.0.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/git-remote-hg/versions
---
 .../git-and-tools/git-remote-hg/default.nix                   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix
index 7d6b620e223..6df3a97dbbb 100644
--- a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "git-remote-hg";
-  version = "1.0.0";
+  version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "mnauw";
     repo = "git-remote-hg";
     rev = "v${version}";
-    sha256 = "0anl054zdi5rg5m4bm1n763kbdjkpdws3c89c8w8m5gq1ifsbd4d";
+    sha256 = "1by5ygqvq9ww990kdrjndaqsssyf2jc4n380f9pfh2avsr7871wc";
   };
 
   buildInputs = [ mercurial.python mercurial makeWrapper
-- 
GitLab


From 13257650dadeb00fc7f295a46d1e2663f0795d50 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 6 Oct 2019 22:29:10 -0700
Subject: [PATCH 2104/2254] flacon: 5.4.0 -> 5.5.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/flacon/versions
---
 pkgs/applications/audio/flacon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/flacon/default.nix b/pkgs/applications/audio/flacon/default.nix
index 02317fee15f..9dd5da4c1a9 100644
--- a/pkgs/applications/audio/flacon/default.nix
+++ b/pkgs/applications/audio/flacon/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   pname = "flacon";
-  version = "5.4.0";
+  version = "5.5.1";
 
   src = fetchFromGitHub {
     owner = "flacon";
     repo = "flacon";
     rev = "v${version}";
-    sha256 = "1j8gzk92kn10yb7rmvrnyq0ipda2swnkmsavqsk5ws0z600p3k93";
+    sha256 = "05pvg5xhc2azwzld08m81r4b2krqdbcbm5lmdvg2zkk67xq9pqyd";
   };
 
   nativeBuildInputs = [ cmake pkgconfig makeWrapper ];
-- 
GitLab


From 2d272e93c80bfb8eec81f63ccb3db3cfbff1d4fb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 6 Oct 2019 22:36:35 -0700
Subject: [PATCH 2105/2254] python37Packages.foxdot: 0.8.1 -> 0.8.3

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-foxdot/versions
---
 pkgs/development/python-modules/foxdot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/foxdot/default.nix b/pkgs/development/python-modules/foxdot/default.nix
index ed4f950e363..0ba46c1832b 100644
--- a/pkgs/development/python-modules/foxdot/default.nix
+++ b/pkgs/development/python-modules/foxdot/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "FoxDot";
-  version = "0.8.1";
+  version = "0.8.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "147n2c9rwmrby8rr6xfxlh7mfm12lqk2a7v1gxlzhq1i2jj1j5h4";
+    sha256 = "07ll1rh1bkq1dpb7gxd86jsjhxni73kp9iljiy0d2b86ji8h108p";
   };
 
   propagatedBuildInputs = [ tkinter supercollider ];
-- 
GitLab


From 036ed5de726f728a7898a17df492d4c8575b615c Mon Sep 17 00:00:00 2001
From: Christine Koppelt <cko@users.noreply.github.com>
Date: Wed, 2 Oct 2019 22:55:30 +0200
Subject: [PATCH 2106/2254] spark: 2.4.3 -> 2.4.4; remove 1.6.3 (EOL);
 refactoring

---
 .../networking/cluster/spark/default.nix             | 12 ++----------
 pkgs/top-level/all-packages.nix                      |  3 +--
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix
index e675d17491a..b8d4b947e32 100644
--- a/pkgs/applications/networking/cluster/spark/default.nix
+++ b/pkgs/applications/networking/cluster/spark/default.nix
@@ -1,26 +1,18 @@
 { stdenv, fetchzip, makeWrapper, jre, pythonPackages, coreutils, hadoop
 , RSupport? true, R
 , mesosSupport ? true, mesos
-, version
 }:
 
-let
-  sha256 = {
-    "1.6.3" = "142hw73wf20d846l83ydx0yg7qj5qxywm4h7qrhwnd7lsy2sbnjf";
-    "2.4.3" = "1dvvr1q3dz961bl7qigxngrp4ssrbll3g1s6nkra6gyr83pis96c"; 
-  }.${version};
-in
-
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
 
   pname = "spark";
-  inherit version;
+  version = "2.4.4";
 
   src = fetchzip {
-    inherit sha256;
     url    = "mirror://apache/spark/${pname}-${version}/${pname}-${version}-bin-without-hadoop.tgz";
+    sha256 = "1a9w5k0207fysgpxx6db3a00fs5hdc2ncx99x4ccy2s0v5ndc66g"; 
   };
 
   buildInputs = [ makeWrapper jre pythonPackages.python pythonPackages.numpy ]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5c7586b915e..5970fb6117e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9012,8 +9012,7 @@ in
 
   self = pkgsi686Linux.callPackage ../development/interpreters/self { };
 
-  spark = spark_24;
-  spark_24 = callPackage ../applications/networking/cluster/spark { version = "2.4.3"; };
+  spark = callPackage ../applications/networking/cluster/spark { };
 
   spidermonkey_1_8_5 = callPackage ../development/interpreters/spidermonkey/1.8.5.nix { };
   spidermonkey_38 = callPackage ../development/interpreters/spidermonkey/38.nix ({
-- 
GitLab


From 5b19d1e46181b5aa33ca8cee245466c865c04e12 Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Mon, 7 Oct 2019 09:46:43 -0400
Subject: [PATCH 2107/2254] eclipses: 2019-06 -> 2019-09

---
 pkgs/applications/editors/eclipse/default.nix | 16 ++++++++--------
 pkgs/applications/editors/eclipse/plugins.nix | 12 ++++++------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index 972a9daded4..13db2d13567 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -13,10 +13,10 @@ assert stdenv ? glibc;
 
 let
   platform_major = "4";
-  platform_minor = "12";
+  platform_minor = "13";
   year = "2019";
-  month = "06";
-  timestamp = "201906051800";
+  month = "09";
+  timestamp = "201909161045";
 
 in rec {
 
@@ -34,7 +34,7 @@ in rec {
     src =
       fetchurl {
         url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
-        sha512 = "3mfljabrwbwq256vvsp9qjb96hzlbpwgnb3wz806pbyh0ibfq6s1hn8kh5aaa2da5821v0ykcxa12jagj7naqp4g91jqxp1wb1ygz2q";
+        sha512 = "0s9wvxd1bahlcdw7l6cyfi59p78j6gym3a3mn1z6dm6swxgyb2wjjl7hx8bkg0zs8x31bwllpdq22y2vcm6j57h40v53l3xkhy73m8v";
       };
   };
 
@@ -46,7 +46,7 @@ in rec {
     src =
       fetchurl {
         url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-modeling-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
-        sha512 = "18p6xz6rq4w6j39b2k9kjpz8s1nljfq44g2cmvxqjgjfkq8lk4ij73ssyv1raly4wkm7r22ixacswdjmyj942k5vpv9y11i91hp1scv";
+        sha512 = "09nc7ipv67h0gr7lkxsbxrgj9gn48348asn03ylcvflyrcxghqs8n11a75rwvdj98igdzpw922saicx5lqq5g2flfqiga97lwwhfiz5";
       };
   };
 
@@ -58,7 +58,7 @@ in rec {
     src =
       fetchurl {
         url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-platform-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz";
-        sha512 = "0qiyk95qhdqcfgg5hgc7pcpbpjy9jnx7l3vb7s4cgijdz2xz0n5psh11lpj3whk2amh4iwkyx7kn8fxdq7lm03rlgx67cbk7p8my16m";
+        sha512 = "2c40wwrc2ip32n0m5cs8ds0g7cs7018acw8gjkd23msa4pr9x9511c3dj6rbnn1hwzf9yjq6vnjmib5qarxd3vly76jwxhf867l1f7v";
       };
   };
 
@@ -88,7 +88,7 @@ in rec {
     src =
       fetchurl {
         url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz";
-        sha512 = "3bbc8d66ms7nhg6f8gb0bnzjqz26wixpipn4n9qf0azcplrv2j91z8hjw1fx39dx4pqnsf442bkgab4qqhkpks7qq54110l01q6gvy9";
+        sha512 = "2vm646d1crzzzysll3p5pjfljfjzxx4qd37dqcp6xjm91zg8iskli688h0lgla0rmbwz5kj509jp22m4rxkp3cbgd006dd0jr3icdls";
       };
   };
 
@@ -100,7 +100,7 @@ in rec {
     src =
       fetchurl {
         url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-java-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
-        sha512 = "20qs1aagh4drsycvar3x42zy422zl34yg1p3vhxbqfbf7v3z1d3cxs9ah61x4bdxx9bkfwchasqp1wr15nflch9g0i50bdki3cgng1d";
+        sha512 = "3zyxqd8iwrfgjjg91dfi4bda61rd2717hy53swmbygi48zaaam70swx997yp5qzxwjp3macdslfk6sqhq2qlcdwcdl6dmkry018jh7b";
       };
   };
 
diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index cf7980582ff..b2fdeafd37c 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -254,12 +254,12 @@ rec {
 
   cdt = buildEclipseUpdateSite rec {
     name = "cdt-${version}";
-    version = "9.8.1";
+    version = "9.9.0";
 
     src = fetchzip {
       stripRoot = false;
-      url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/9.8/${name}/${name}.zip";
-      sha256 = "0kxmwz75i8mv4wics9n0hspxhzl3glf5ry2v5mnl5j9gcf73b0nv";
+      url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/9.9/${name}/${name}.zip";
+      sha256 = "1vgx7ggilfwmx0bjrhk7mwlwg1c8lb141ilj3vzwxivlffihy054";
     };
 
     meta = with stdenv.lib; {
@@ -474,12 +474,12 @@ rec {
 
   jdt = buildEclipseUpdateSite rec {
     name = "jdt-${version}";
-    version = "4.12";
+    version = "4.13";
 
     src = fetchzip {
       stripRoot = false;
-      url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.12-201906051800/org.eclipse.jdt-4.12.zip;
-      sha256 = "0qscvqg69z4554n1yhl0xg1xz8ln3qsbgfzi7cg3xnnwnxfqz9cb";
+      url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.13-201909161045/org.eclipse.jdt-4.13.zip;
+      sha256 = "0sfpxph0cszcx1cihzzjn60qid8sxgl2xyr9x46fld4ian5a7vbr";
     };
 
     meta = with stdenv.lib; {
-- 
GitLab


From 37c22b9d308a2536eb8a3d07919fcc29ac9c7101 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 7 Oct 2019 20:24:29 +0200
Subject: [PATCH 2108/2254] Revive systemd.coredump.enable

---
 nixos/doc/manual/release-notes/rl-1909.xml | 17 ++++++++++-------
 nixos/modules/rename.nix                   |  1 -
 nixos/modules/system/boot/systemd.nix      | 14 ++++++++++++++
 3 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
index a33027bdbd1..4d9229becc9 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -739,7 +739,7 @@
       </para>
      </listitem>
     </itemizedlist>
-     This also configures the kernel to pass coredumps to <literal>systemd-coredump</literal>,
+     This also configures the kernel to pass core dumps to <literal>systemd-coredump</literal>,
      and restricts the SysRq key combinations to the sync command only.
      These sysctl snippets can be found in <literal>/etc/sysctl.d/50-*.conf</literal>,
      and overridden via <link linkend="opt-boot.kernel.sysctl">boot.kernel.sysctl</link>
@@ -748,12 +748,15 @@
    </listitem>
    <listitem>
     <para>
-      Coredumps are now acquired by <literal>systemd-coredump</literal> by default.
-      <literal>systemd-coredump</literal> behaviour can still be modified via
-      <option>systemd.coredump.extraConfig</option>.
-      To stick to the old behaviour (having the kernel dump to a file called <literal>core</literal>
-      in the working directory), without piping it through <literal>systemd-coredump</literal>, set
-      <option>boot.kernel.sysctl."kernel.core_pattern"</option> to <literal>"core"</literal>.
+      Core dumps are now processed by <literal>systemd-coredump</literal>
+      by default. <literal>systemd-coredump</literal> behaviour can
+      still be modified via
+      <option>systemd.coredump.extraConfig</option>. To stick to the
+      old behaviour (having the kernel dump to a file called
+      <literal>core</literal> in the working directory), without piping
+      it through <literal>systemd-coredump</literal>, set
+      <option>systemd.coredump.enable</option> to
+      <literal>false</literal>.
     </para>
    </listitem>
    <listitem>
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 564c53465e3..df8ebe50584 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -233,7 +233,6 @@ with lib;
     (mkRemovedOptionModule [ "services" "mysql" "rootPassword" ] "Use socket authentication or set the password outside of the nix store.")
     (mkRemovedOptionModule [ "services" "zabbixServer" "dbPassword" ] "Use services.zabbixServer.database.passwordFile instead.")
     (mkRemovedOptionModule [ "systemd" "generator-packages" ] "Use systemd.packages instead.")
-    (mkRemovedOptionModule [ "systemd" "coredump" "enable" ] "Enabled by default. Set boot.kernel.sysctl.\"kernel.core_pattern\" = \"core\"; to disable.")
 
     # ZSH
     (mkRenamedOptionModule [ "programs" "zsh" "enableSyntaxHighlighting" ] [ "programs" "zsh" "syntaxHighlighting" "enable" ])
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 5cf437bfbcb..669eb6a7056 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -546,6 +546,16 @@ in
       '';
     };
 
+    systemd.coredump.enable = mkOption {
+      default = true;
+      type = types.bool;
+      description = ''
+        Whether core dumps should be processed by
+        <command>systemd-coredump</command>. If disabled, core dumps
+        appear in the current directory of the crashing process.
+      '';
+    };
+
     systemd.coredump.extraConfig = mkOption {
       default = "";
       type = types.lines;
@@ -983,6 +993,10 @@ in
     # Don't bother with certain units in containers.
     systemd.services.systemd-remount-fs.unitConfig.ConditionVirtualization = "!container";
     systemd.services.systemd-random-seed.unitConfig.ConditionVirtualization = "!container";
+
+    boot.kernel.sysctl = mkIf (!cfg.coredump.enable) {
+      "kernel.core_pattern" = "core";
+    };
   };
 
   # FIXME: Remove these eventually.
-- 
GitLab


From 681e63ab978e43767ec1a6dac4dde763f2035b91 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 7 Oct 2019 20:34:46 +0200
Subject: [PATCH 2109/2254] pythonPackages.nixpkgs-pytools: 1.0.1 -> 1.3.0

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

diff --git a/pkgs/development/python-modules/nixpkgs-pytools/default.nix b/pkgs/development/python-modules/nixpkgs-pytools/default.nix
index 4a943e32d4c..ebb8b7c70eb 100644
--- a/pkgs/development/python-modules/nixpkgs-pytools/default.nix
+++ b/pkgs/development/python-modules/nixpkgs-pytools/default.nix
@@ -3,22 +3,24 @@
 , fetchPypi
 , jinja2
 , setuptools
+, rope
 , isPy27
 }:
 
 buildPythonPackage rec {
   pname = "nixpkgs-pytools";
-  version = "1.0.1";
+  version = "1.3.0";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0796c6e95daeb3d7e61c9c53126d95ba6a48f84b995b12b60f45619caf28a574";
+    sha256 = "11skcbi1lf9qcv9j5ikifb4pakhbbygqpcmv3390j7gxsa85cn19";
   };
 
   propagatedBuildInputs = [
     jinja2
     setuptools
+    rope
   ];
 
   # tests require network ..
-- 
GitLab


From f9097e329f8a333521a8de98243ede0d2cc95221 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 6 Oct 2019 10:43:10 +0200
Subject: [PATCH 2110/2254] hackage2nix: disable broken builds to avoid
 evaluation errors on Hydra

---
 .../haskell-modules/configuration-hackage2nix.yaml           | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 64d90730ecb..0031f3efde6 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -3566,9 +3566,6 @@ broken-packages:
   - Checked
   - checked
   - checkmate
-  - chell
-  - chell-hunit
-  - chell-quickcheck
   - chessIO
   - chevalier-common
   - chiasma
@@ -8623,6 +8620,7 @@ broken-packages:
   - sensenet
   - sentence-jp
   - sentry
+  - seonbi
   - seqaid
   - SeqAlign
   - seqid
@@ -8857,6 +8855,7 @@ broken-packages:
   - sme
   - smerdyakov
   - smiles
+  - smith
   - smith-cli
   - smith-client
   - Smooth
-- 
GitLab


From ac0b895f239e0f464b0aefba084b0a1e4523979c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Oct 2019 02:30:54 +0200
Subject: [PATCH 2111/2254] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.15.0-2-ge15d08c from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/9033c9206c2ce7931787ca7f01eb39f0806e0180.
---
 .../haskell-modules/hackage-packages.nix      | 1511 +++++++++++++----
 1 file changed, 1200 insertions(+), 311 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index acab9c23765..6b573dbdbb4 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -6011,6 +6011,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "FontyFruity_0_5_3_5" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, deepseq
+     , directory, filepath, text, vector, xml
+     }:
+     mkDerivation {
+       pname = "FontyFruity";
+       version = "0.5.3.5";
+       sha256 = "16hafvgfmxjv6bl67f3691n2ci3k89pbh0296vfwf9jk7ah5psrd";
+       libraryHaskellDepends = [
+         base binary bytestring containers deepseq directory filepath text
+         vector xml
+       ];
+       description = "A true type file format loader";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ForSyDe" = callPackage
     ({ mkDerivation, array, base, containers, directory, filepath, mtl
      , old-time, parameterized-data, pretty, process, random
@@ -10674,14 +10691,14 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
-  "HsYAML_0_2_0_0" = callPackage
+  "HsYAML_0_2_1_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, mtl, parsec
      , QuickCheck, tasty, tasty-quickcheck, text
      }:
      mkDerivation {
        pname = "HsYAML";
-       version = "0.2.0.0";
-       sha256 = "1x8zrnaqvfkap4q2gldj0y4q63kbjka8383s5k4mb0ka1n3dfqhq";
+       version = "0.2.1.0";
+       sha256 = "10qzhsg789h37q22hm9p27dx4rhbykcbxp7p3pvkws8fr7ajgxv0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -11090,6 +11107,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "InternedData" = callPackage
+    ({ mkDerivation, aeson, base, bimaps, binary, bytestring, cereal
+     , cereal-text, compact, containers, criterion, deepseq, hashable
+     , QuickCheck, string-conversions, tasty, tasty-quickcheck, tasty-th
+     , text, text-binary, utf8-string, vector-th-unbox
+     }:
+     mkDerivation {
+       pname = "InternedData";
+       version = "0.0.0.1";
+       sha256 = "0wyxh6hzhxgia66knwbpbkjhx4zk3fw6dswqzfxir0i4bqdn35xx";
+       libraryHaskellDepends = [
+         aeson base bimaps binary bytestring cereal cereal-text compact
+         deepseq hashable string-conversions text text-binary utf8-string
+         vector-th-unbox
+       ];
+       testHaskellDepends = [
+         aeson base binary cereal QuickCheck string-conversions tasty
+         tasty-quickcheck tasty-th
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring containers criterion deepseq text
+       ];
+       description = "Data interning (with compact regions where possible)";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "Interpolation" = callPackage
     ({ mkDerivation, base, haskell-src-meta, syb, template-haskell }:
      mkDerivation {
@@ -11425,6 +11468,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "JuicyPixels_3_3_4" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl
+     , primitive, transformers, vector, zlib
+     }:
+     mkDerivation {
+       pname = "JuicyPixels";
+       version = "3.3.4";
+       sha256 = "0qacrnz2qcykj3f6c4k2p8qd31pa2slpv3ykfblgizrfh3401q6x";
+       libraryHaskellDepends = [
+         base binary bytestring containers deepseq mtl primitive
+         transformers vector zlib
+       ];
+       description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "JuicyPixels-blp" = callPackage
     ({ mkDerivation, attoparsec, base, binary, bytestring, directory
      , filepath, hashable, JuicyPixels, optparse-simple, text-show
@@ -13811,25 +13871,28 @@ self: {
      }) {};
 
   "NaturalLanguageAlphabets" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, binary, cereal
-     , containers, criterion, deepseq, file-embed, hashtables
-     , LinguisticsTypes, mwc-random, QuickCheck, random, tasty
-     , tasty-quickcheck, tasty-th, text, unordered-containers, vector
+    ({ mkDerivation, aeson, ansi-wl-pprint, base, binary, bytestring
+     , cereal, containers, criterion, deepseq, errors, file-embed
+     , hashable, hashtables, InternedData, lens, mtl, mwc-random
+     , parsers, QuickCheck, random, tasty, tasty-hunit, tasty-quickcheck
+     , tasty-th, text, transformers, trifecta, unordered-containers
+     , utf8-string, vector
      }:
      mkDerivation {
        pname = "NaturalLanguageAlphabets";
-       version = "0.1.1.0";
-       sha256 = "12yv4fp9wd8crlz17kfa4h6ccv1amgk0an51g2r8vx6nrgvnkl7z";
+       version = "0.2.1.0";
+       sha256 = "11iybvgzzpaxlwgq71hqpl24f5xymzvnbb7m530wwg3fb9wdkd1y";
        libraryHaskellDepends = [
-         aeson attoparsec base file-embed LinguisticsTypes text
-         unordered-containers
+         aeson ansi-wl-pprint base bytestring containers errors file-embed
+         hashable InternedData lens mtl parsers text transformers trifecta
+         unordered-containers utf8-string
        ];
        testHaskellDepends = [
-         aeson base binary cereal LinguisticsTypes QuickCheck tasty
-         tasty-quickcheck tasty-th text unordered-containers
+         aeson base binary cereal InternedData mtl QuickCheck tasty
+         tasty-hunit tasty-quickcheck tasty-th text unordered-containers
        ];
        benchmarkHaskellDepends = [
-         base containers criterion deepseq hashtables LinguisticsTypes
+         base containers criterion deepseq hashtables InternedData
          mwc-random random unordered-containers vector
        ];
        description = "Simple scoring schemes for word alignments";
@@ -18492,8 +18555,8 @@ self: {
        pname = "Strafunski-StrategyLib";
        version = "5.0.1.0";
        sha256 = "15d2m7ahb3jwriariaff0yz93mmrhpv579wink9838w9091cf650";
-       revision = "1";
-       editedCabalFile = "1hngxq1f7fybg6ixkdhmvgsw608mhnxkwbw04ql5zspcfl78v6l2";
+       revision = "2";
+       editedCabalFile = "1g9ksfgcz8fjasn78zq7w1yw9wk87i4gd5i0pf31gnf4l3963yz8";
        libraryHaskellDepends = [ base directory mtl syb transformers ];
        description = "Library for strategic programming";
        license = stdenv.lib.licenses.bsd3;
@@ -28578,12 +28641,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "ansi-terminal_0_10" = callPackage
+  "ansi-terminal_0_10_1" = callPackage
     ({ mkDerivation, base, colour }:
      mkDerivation {
        pname = "ansi-terminal";
-       version = "0.10";
-       sha256 = "0l96g8m88qbyhp6mvm895b102jc5z3b85i0fvb4w99x2zj4pnv7y";
+       version = "0.10.1";
+       sha256 = "1b168z688b1lg4d2bmbxmm2mj51mwm2wv0smfb1vcwjp2vzpqf9i";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base colour ];
@@ -30308,6 +30371,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "arbor-lru-cache_0_1_1_1" = callPackage
+    ({ mkDerivation, base, containers, hedgehog, hspec, hspec-discover
+     , hw-hspec-hedgehog, stm
+     }:
+     mkDerivation {
+       pname = "arbor-lru-cache";
+       version = "0.1.1.1";
+       sha256 = "0ayr6d5p7x2b2ggck56skbbzsmf44vrsr5jf3bzhnqwcm1lljbv0";
+       libraryHaskellDepends = [ base containers stm ];
+       testHaskellDepends = [
+         base containers hedgehog hspec hw-hspec-hedgehog stm
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "LRU cache based on STM";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "arbor-monad-counter" = callPackage
     ({ mkDerivation, base, containers, generic-lens, hedgehog, hspec
      , hw-hspec-hedgehog, lens, mtl, resourcet, stm, transformers
@@ -30816,6 +30897,34 @@ self: {
        broken = true;
      }) {};
 
+  "arion-compose" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, async, base, bytestring
+     , directory, hspec, lens, lens-aeson, optparse-applicative, process
+     , protolude, QuickCheck, temporary, text, unix
+     }:
+     mkDerivation {
+       pname = "arion-compose";
+       version = "0.1.0.0";
+       sha256 = "11jg7y6gcgsm7pidqnpxi4smd5dbm7fnqw79pcqx60z32b0b99iz";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson aeson-pretty async base bytestring directory lens lens-aeson
+         process protolude temporary text unix
+       ];
+       executableHaskellDepends = [
+         aeson aeson-pretty async base bytestring directory lens lens-aeson
+         optparse-applicative process protolude temporary text unix
+       ];
+       testHaskellDepends = [
+         aeson aeson-pretty async base bytestring directory hspec lens
+         lens-aeson process protolude QuickCheck temporary text unix
+       ];
+       description = "Run docker-compose with help from Nix/NixOS";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "arith-encode" = callPackage
     ({ mkDerivation, arithmoi, array, base, binary, Cabal, containers
      , fgl, hashable, HUnit-Plus, unordered-containers
@@ -30856,8 +30965,8 @@ self: {
      }:
      mkDerivation {
        pname = "arithmetic";
-       version = "1.4";
-       sha256 = "1qydk2sxrm0xfv23b354lfilyl2cnc0gc0842rz3672j3xwzrrfa";
+       version = "1.5";
+       sha256 = "0angjp341sfij8lqns74k6pwazdc679bd19fxphqab91cj9p9s56";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -33867,6 +33976,41 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "avro_0_4_5_3" = callPackage
+    ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors
+     , binary, bytestring, containers, data-binary-ieee754, deepseq
+     , directory, extra, fail, gauge, hashable, hspec, hspec-discover
+     , lens, lens-aeson, mtl, pure-zlib, QuickCheck, random
+     , raw-strings-qq, scientific, semigroups, tagged, template-haskell
+     , text, tf-random, transformers, unordered-containers, vector, zlib
+     }:
+     mkDerivation {
+       pname = "avro";
+       version = "0.4.5.3";
+       sha256 = "0az1mlil8h7scpma16f52zwkbi5iw6mdl6r7vywqhlgsdd2xl9kx";
+       libraryHaskellDepends = [
+         aeson array base base16-bytestring bifunctors binary bytestring
+         containers data-binary-ieee754 deepseq fail hashable mtl scientific
+         semigroups tagged template-haskell text tf-random
+         unordered-containers vector zlib
+       ];
+       testHaskellDepends = [
+         aeson array base base16-bytestring bifunctors binary bytestring
+         containers directory extra fail hashable hspec lens lens-aeson mtl
+         pure-zlib QuickCheck raw-strings-qq scientific semigroups tagged
+         text tf-random transformers unordered-containers vector
+       ];
+       testToolDepends = [ hspec-discover ];
+       benchmarkHaskellDepends = [
+         aeson base bytestring containers gauge hashable mtl random
+         raw-strings-qq template-haskell text transformers
+         unordered-containers vector
+       ];
+       description = "Avro serialization support for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "avwx" = callPackage
     ({ mkDerivation, attoparsec, base, HTTP, lens, optparse-applicative
      , parsers, pretty-show, text
@@ -34642,49 +34786,49 @@ self: {
 
   "axel" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers
-     , directory, filepath, freer-simple, ghcid, hashable
+     , directory, extra, filepath, freer-simple, ghcid, hashable
      , haskell-src-exts, hedgehog, hpack, lens, lens-aeson, megaparsec
      , mono-traversable, optparse-applicative, polysemy, polysemy-plugin
-     , prettyprinter, process, profunctors, random, singletons, split
-     , tasty, tasty-discover, tasty-golden, tasty-hedgehog, tasty-hspec
+     , prettyprinter, process, profunctors, random, split, tasty
+     , tasty-discover, tasty-golden, tasty-hedgehog, tasty-hspec
      , tasty-hunit, template-haskell, text, time, transformers
      , typed-process, uniplate, vector, yaml
      }:
      mkDerivation {
        pname = "axel";
-       version = "0.0.11";
-       sha256 = "1qygq82v70lizbpxmvj1c81qhb9jrmzgi603g03wa41las0sfamy";
+       version = "0.0.12";
+       sha256 = "1136rnh5j47qxyciwmpgcdqy3j4f4pwcgb89wgkl8wixzxjxj6i1";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         aeson ansi-terminal base bytestring containers directory filepath
-         freer-simple ghcid hashable haskell-src-exts hedgehog hpack lens
-         lens-aeson megaparsec mono-traversable optparse-applicative
-         polysemy polysemy-plugin prettyprinter process profunctors random
-         singletons split tasty tasty-discover tasty-golden tasty-hedgehog
-         tasty-hspec tasty-hunit template-haskell text time transformers
-         typed-process uniplate vector yaml
+         aeson ansi-terminal base bytestring containers directory extra
+         filepath freer-simple ghcid hashable haskell-src-exts hedgehog
+         hpack lens lens-aeson megaparsec mono-traversable
+         optparse-applicative polysemy polysemy-plugin prettyprinter process
+         profunctors random split tasty tasty-discover tasty-golden
+         tasty-hedgehog tasty-hspec tasty-hunit template-haskell text time
+         transformers typed-process uniplate vector yaml
        ];
        libraryToolDepends = [ hpack tasty-discover ];
        executableHaskellDepends = [
-         aeson ansi-terminal base bytestring containers directory filepath
-         freer-simple ghcid hashable haskell-src-exts hedgehog hpack lens
-         lens-aeson megaparsec mono-traversable optparse-applicative
-         polysemy polysemy-plugin prettyprinter process profunctors random
-         singletons split tasty tasty-discover tasty-golden tasty-hedgehog
-         tasty-hspec tasty-hunit template-haskell text time transformers
-         typed-process uniplate vector yaml
+         aeson ansi-terminal base bytestring containers directory extra
+         filepath freer-simple ghcid hashable haskell-src-exts hedgehog
+         hpack lens lens-aeson megaparsec mono-traversable
+         optparse-applicative polysemy polysemy-plugin prettyprinter process
+         profunctors random split tasty tasty-discover tasty-golden
+         tasty-hedgehog tasty-hspec tasty-hunit template-haskell text time
+         transformers typed-process uniplate vector yaml
        ];
        executableToolDepends = [ hpack tasty-discover ];
        testHaskellDepends = [
-         aeson ansi-terminal base bytestring containers directory filepath
-         freer-simple ghcid hashable haskell-src-exts hedgehog hpack lens
-         lens-aeson megaparsec mono-traversable optparse-applicative
-         polysemy polysemy-plugin prettyprinter process profunctors random
-         singletons split tasty tasty-discover tasty-golden tasty-hedgehog
-         tasty-hspec tasty-hunit template-haskell text time transformers
-         typed-process uniplate vector yaml
+         aeson ansi-terminal base bytestring containers directory extra
+         filepath freer-simple ghcid hashable haskell-src-exts hedgehog
+         hpack lens lens-aeson megaparsec mono-traversable
+         optparse-applicative polysemy polysemy-plugin prettyprinter process
+         profunctors random split tasty tasty-discover tasty-golden
+         tasty-hedgehog tasty-hspec tasty-hunit template-haskell text time
+         transformers typed-process uniplate vector yaml
        ];
        testToolDepends = [ hpack tasty-discover ];
        description = "The Axel programming language";
@@ -35998,14 +36142,9 @@ self: {
      }:
      mkDerivation {
        pname = "basen";
-       version = "0.1.0.0";
-       sha256 = "0v7dksk1zq17kpa5nknn5am1ywy58d0f6jr2vnb9jzy4v70m6ngx";
-       revision = "1";
-       editedCabalFile = "0iwmv5kmh7lj96jvnllkrmrbivv1kbwk6f3nnd80zcv5iifsdxj8";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.2.0.0";
+       sha256 = "0m5vrj7p8cbjc4wc3i0h8fgj7hy8818aq4ivshq4l1n3v134p8kb";
        libraryHaskellDepends = [ base bytestring text ];
-       executableHaskellDepends = [ base bytestring text ];
        testHaskellDepends = [
          base bytestring quickcheck-instances tasty tasty-discover
          tasty-hspec tasty-quickcheck text
@@ -39181,6 +39320,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bins_0_1_2_0" = callPackage
+    ({ mkDerivation, base, containers, finite-typelits
+     , ghc-typelits-knownnat, ghc-typelits-natnormalise, math-functions
+     , profunctors, reflection, tagged, vector-sized
+     }:
+     mkDerivation {
+       pname = "bins";
+       version = "0.1.2.0";
+       sha256 = "03pzpf8vw7d8cg8raqjpq9dz78r5qqczmjmyc2q5ax3ghcdzx0wa";
+       libraryHaskellDepends = [
+         base containers finite-typelits ghc-typelits-knownnat
+         ghc-typelits-natnormalise math-functions profunctors reflection
+         tagged vector-sized
+       ];
+       description = "Aggregate continuous values into discrete bins";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "binsm" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, bytestring
      , optparse-applicative, parsec
@@ -39456,8 +39614,8 @@ self: {
      }:
      mkDerivation {
        pname = "birch-beer";
-       version = "0.2.0.0";
-       sha256 = "0ks87mqyg0yxg8w2y2332clwjxwi42h2x3x9alvi33c8b9k2ws17";
+       version = "0.2.1.0";
+       sha256 = "0630cs2sfr5w4yva7a5cz9b5ms4cwqp7a027qhgz634sb4ih5q4k";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -40228,15 +40386,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "bitvec_1_0_1_1" = callPackage
+  "bitvec_1_0_1_2" = callPackage
     ({ mkDerivation, base, containers, deepseq, gauge, ghc-prim, gmp
      , integer-gmp, primitive, quickcheck-classes, random, tasty
      , tasty-hunit, tasty-quickcheck, vector
      }:
      mkDerivation {
        pname = "bitvec";
-       version = "1.0.1.1";
-       sha256 = "0r11av150f6gr6l4894195h1iya667vny9crjpgagfhnrbzhmfaq";
+       version = "1.0.1.2";
+       sha256 = "1nhsdq3c96kb2id8ilmglmd5zyq9nhywb4jix7ks2dfb1k9xmsbm";
        libraryHaskellDepends = [
          base deepseq ghc-prim integer-gmp primitive vector
        ];
@@ -40775,6 +40933,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "blaze-html_0_9_1_2" = callPackage
+    ({ mkDerivation, base, blaze-builder, blaze-markup, bytestring
+     , containers, HUnit, QuickCheck, test-framework
+     , test-framework-hunit, test-framework-quickcheck2, text
+     }:
+     mkDerivation {
+       pname = "blaze-html";
+       version = "0.9.1.2";
+       sha256 = "0k1r1hddjgqighazcazxrx6xfhvy2gm8il8l82ainv3cai13yl30";
+       libraryHaskellDepends = [
+         base blaze-builder blaze-markup bytestring text
+       ];
+       testHaskellDepends = [
+         base blaze-builder blaze-markup bytestring containers HUnit
+         QuickCheck test-framework test-framework-hunit
+         test-framework-quickcheck2 text
+       ];
+       description = "A blazingly fast HTML combinator library for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "blaze-html-contrib" = callPackage
     ({ mkDerivation, base, blaze-html, cgi, data-default, network, safe
      , text
@@ -40864,6 +41044,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "blaze-markup_0_8_2_3" = callPackage
+    ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit
+     , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text
+     }:
+     mkDerivation {
+       pname = "blaze-markup";
+       version = "0.8.2.3";
+       sha256 = "1g9m7ansj7fdyzhz1wqkbzn5amjm50vjgjdwkbjc5qqhagnv1y3j";
+       libraryHaskellDepends = [ base blaze-builder bytestring text ];
+       testHaskellDepends = [
+         base blaze-builder bytestring containers HUnit QuickCheck tasty
+         tasty-hunit tasty-quickcheck text
+       ];
+       description = "A blazingly fast markup combinator library for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "blaze-shields" = callPackage
     ({ mkDerivation, base, blaze-html, blaze-markup, blaze-svg, text }:
      mkDerivation {
@@ -49832,8 +50030,6 @@ self: {
        ];
        description = "A simple and intuitive library for automated testing";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "chell-hunit" = callPackage
@@ -49845,8 +50041,6 @@ self: {
        libraryHaskellDepends = [ base chell HUnit ];
        description = "HUnit support for the Chell testing library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "chell-quickcheck" = callPackage
@@ -49858,8 +50052,6 @@ self: {
        libraryHaskellDepends = [ base chell QuickCheck random ];
        description = "QuickCheck support for the Chell testing library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "chessIO" = callPackage
@@ -55809,6 +56001,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "concurrency_1_8_0_0" = callPackage
+    ({ mkDerivation, array, atomic-primops, base, exceptions
+     , monad-control, mtl, stm, transformers
+     }:
+     mkDerivation {
+       pname = "concurrency";
+       version = "1.8.0.0";
+       sha256 = "091nv78c4cfcrg4hwxhn97l0xr5x2n4pfh802ysxmn2zvnm9fbf4";
+       libraryHaskellDepends = [
+         array atomic-primops base exceptions monad-control mtl stm
+         transformers
+       ];
+       description = "Typeclasses, functions, and data types for concurrency and STM";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "concurrency-benchmarks" = callPackage
     ({ mkDerivation, async, base, bench-graph, bytestring, Chart
      , Chart-diagrams, csv, deepseq, directory, gauge, getopt-generics
@@ -55956,6 +56165,23 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "concurrent-output_1_10_11" = callPackage
+    ({ mkDerivation, ansi-terminal, async, base, directory, exceptions
+     , process, stm, terminal-size, text, transformers, unix
+     }:
+     mkDerivation {
+       pname = "concurrent-output";
+       version = "1.10.11";
+       sha256 = "1d1aaqg5814k59b0iws3fh06p3g2siaj922gkhs75qgncj0my2p3";
+       libraryHaskellDepends = [
+         ansi-terminal async base directory exceptions process stm
+         terminal-size text transformers unix
+       ];
+       description = "Ungarble output from several threads or commands";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "concurrent-rpc" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -56754,8 +56980,8 @@ self: {
     ({ mkDerivation, base, conferer, hspec, hspec-core, text }:
      mkDerivation {
        pname = "conferer-hspec";
-       version = "0.1.0.1";
-       sha256 = "1wjn4my0grb62vkswvxa4674s0fid6kskvxz1qll14gqw6wlkx19";
+       version = "0.1.0.2";
+       sha256 = "1hbvqnp1cdhxg3hcywyygby7z56q2xq1c7qgqhi8n7v89dsza27x";
        libraryHaskellDepends = [ base conferer hspec-core text ];
        testHaskellDepends = [ base conferer hspec hspec-core text ];
        description = "conferer's FromConfig instances for hspec Config";
@@ -56763,22 +56989,22 @@ self: {
      }) {};
 
   "conferer-provider-json" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, conferer, directory
-     , hspec, text, unordered-containers, vector
+    ({ mkDerivation, aeson, aeson-qq, base, bytestring, conferer
+     , directory, hspec, text, unordered-containers, vector
      }:
      mkDerivation {
        pname = "conferer-provider-json";
-       version = "0.1.0.2";
-       sha256 = "1iww8w6d7710b58yqiap10jkbgb08ah3szc259p7wn4lnv96cic0";
+       version = "0.1.0.5";
+       sha256 = "1fsqmp48809fygxg1gz9g9ihm46zr98bbqihw72xr938cq0hazbf";
        libraryHaskellDepends = [
          aeson base bytestring conferer directory text unordered-containers
          vector
        ];
        testHaskellDepends = [
-         aeson base bytestring conferer directory hspec text
+         aeson aeson-qq base bytestring conferer directory hspec text
          unordered-containers vector
        ];
-       description = "Configuration for reading json files";
+       description = "conferer's provider for reading json files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -56788,8 +57014,8 @@ self: {
      }:
      mkDerivation {
        pname = "conferer-snap";
-       version = "0.1.0.3";
-       sha256 = "07x1grjqq5dsz7w8vrkzdaknfvqkvjqkmjwjiixn51jxfg6011zq";
+       version = "0.1.0.4";
+       sha256 = "1928k3h6sfgyjs56xvwzkx7fax5larwv7a130gqng8q12w5pblns";
        libraryHaskellDepends = [
          base conferer snap-core snap-server text
        ];
@@ -56805,8 +57031,8 @@ self: {
      }:
      mkDerivation {
        pname = "conferer-warp";
-       version = "0.1.0.1";
-       sha256 = "1alzbcm4bkp2a5p53b3vpnl0zgnz8bm2rpn2aljs24wz3vapgzsa";
+       version = "0.1.0.2";
+       sha256 = "16i84kyhhwy3nm863zf3ap9kv800r8hmn277r5y8gxx7jcqa6caq";
        libraryHaskellDepends = [ base conferer http-types text wai warp ];
        testHaskellDepends = [
          base conferer hspec http-types text wai warp
@@ -59280,6 +59506,8 @@ self: {
        pname = "cpkg";
        version = "0.2.3.4";
        sha256 = "0q54dwhlp9x6k363n5p12722davfalxljxlbiskirky02kba9bdl";
+       revision = "1";
+       editedCabalFile = "0lsc0acz5h62qafg1nsz2gjdwpc3j5jmhgvbdwlv2jark9a045nw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -65463,7 +65691,7 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
-  "dbus_1_2_9" = callPackage
+  "dbus_1_2_11" = callPackage
     ({ mkDerivation, base, bytestring, cereal, conduit, containers
      , criterion, deepseq, directory, exceptions, extra, filepath, lens
      , network, parsec, process, QuickCheck, random, resourcet, split
@@ -65472,8 +65700,8 @@ self: {
      }:
      mkDerivation {
        pname = "dbus";
-       version = "1.2.9";
-       sha256 = "1q9qhl6hjbr9yxmr62md4ycadv04nqdkvsa8l5c0p724rz3faqw3";
+       version = "1.2.11";
+       sha256 = "150agli4ialryxcv6nd3y90pi5ikls8bn9my3fp2j5fwir27abns";
        libraryHaskellDepends = [
          base bytestring cereal conduit containers deepseq exceptions
          filepath lens network parsec random split template-haskell text
@@ -66761,6 +66989,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "dejafu_2_1_0_1" = callPackage
+    ({ mkDerivation, base, concurrency, containers, contravariant
+     , deepseq, exceptions, leancheck, profunctors, random, transformers
+     }:
+     mkDerivation {
+       pname = "dejafu";
+       version = "2.1.0.1";
+       sha256 = "08rm5f4kxwd46si0qkaf2yzsffpndhb3l4x639k11l6n28165nhg";
+       libraryHaskellDepends = [
+         base concurrency containers contravariant deepseq exceptions
+         leancheck profunctors random transformers
+       ];
+       description = "A library for unit-testing concurrent programs";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "deka" = callPackage
     ({ mkDerivation, base, bytestring, mpdec, parsec, transformers }:
      mkDerivation {
@@ -67572,13 +67817,16 @@ self: {
      }) {};
 
   "describe" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, QuickCheck }:
+    ({ mkDerivation, base, bytestring, cereal, fixed-vector, QuickCheck
+     }:
      mkDerivation {
        pname = "describe";
-       version = "0.1.2.1";
-       sha256 = "1k2ik717ab2wnffmkfqm7akp3irp3jsfsb8l49gqgn30wgrx3nk7";
-       libraryHaskellDepends = [ base bytestring cereal ];
-       testHaskellDepends = [ base bytestring cereal QuickCheck ];
+       version = "0.2.0.4";
+       sha256 = "11mm4n9hw7spv8m26wxy6xiqa1kdx60s6jkhs8ndmqf8mas4iawh";
+       libraryHaskellDepends = [ base bytestring cereal fixed-vector ];
+       testHaskellDepends = [
+         base bytestring cereal fixed-vector QuickCheck
+       ];
        description = "Combinators for describing binary data structures";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -70244,8 +70492,8 @@ self: {
      }:
      mkDerivation {
        pname = "discord-haskell";
-       version = "1.1.2";
-       sha256 = "1dwsg3q9jdq58pchc0aylg8acshfjmdidpr09818jr4aawvdn3xr";
+       version = "1.1.3";
+       sha256 = "0q04qh6ia7rlrg0mlbch3n7ai81jn20avrgxlyn9xggdryi5vkb6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -76765,7 +77013,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "emd_0_1_7_0" = callPackage
+  "emd_0_1_8_1" = callPackage
     ({ mkDerivation, array, base, binary, carray, containers, criterion
      , data-default-class, deepseq, fft, finite-typelits
      , ghc-typelits-knownnat, ghc-typelits-natnormalise, HUnit
@@ -76774,8 +77022,8 @@ self: {
      }:
      mkDerivation {
        pname = "emd";
-       version = "0.1.7.0";
-       sha256 = "0r2c3awwy57mxac2imjhbss0kr63miblnz2d1a9bzriy035jwfl0";
+       version = "0.1.8.1";
+       sha256 = "1dijiqcql8n6an1hl8jvm487jqi7v9ji27lgas3ychc65lw7xwca";
        libraryHaskellDepends = [
          array base binary carray containers data-default-class deepseq fft
          finite-typelits ghc-typelits-knownnat ghc-typelits-natnormalise
@@ -78944,6 +79192,25 @@ self: {
        broken = true;
      }) {};
 
+  "evdev" = callPackage
+    ({ mkDerivation, base, bytestring, c2hs, composition, containers
+     , either, evdev, extra, hinotify, posix-paths, process, rawfilepath
+     , streamly, time, unix
+     }:
+     mkDerivation {
+       pname = "evdev";
+       version = "0.1.0.1";
+       sha256 = "17y1rg6p8inzf3zdakfxwp4f3yrak83lqfdjiwg786x4f0ab3jaq";
+       libraryHaskellDepends = [
+         base bytestring composition containers either extra hinotify
+         posix-paths process rawfilepath streamly time unix
+       ];
+       librarySystemDepends = [ evdev ];
+       libraryToolDepends = [ c2hs ];
+       description = "Bindings to libevdev";
+       license = stdenv.lib.licenses.bsd3;
+     }) {evdev = null;};
+
   "eve" = callPackage
     ({ mkDerivation, base, containers, data-default, free, hspec
      , hspec-core, lens, mtl
@@ -81192,7 +81459,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "fakedata_0_3_0" = callPackage
+  "fakedata_0_3_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, directory
      , exceptions, filepath, gauge, hashable, hspec, hspec-discover
      , random, template-haskell, text, time, unordered-containers
@@ -81200,8 +81467,8 @@ self: {
      }:
      mkDerivation {
        pname = "fakedata";
-       version = "0.3.0";
-       sha256 = "11g3vja4kw7ms5bvccl4hpzvd59v2m60sk6ycx9calw13b65ix4p";
+       version = "0.3.1";
+       sha256 = "0y5gnqjgn3n2px80xbpqx0kaxrdkaqhw8n9ah4ry310j80m9z8ma";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers directory exceptions filepath hashable
@@ -81465,6 +81732,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fast-logger_3_0_0" = callPackage
+    ({ mkDerivation, array, auto-update, base, bytestring, directory
+     , easy-file, filepath, hspec, hspec-discover, text, unix-compat
+     , unix-time
+     }:
+     mkDerivation {
+       pname = "fast-logger";
+       version = "3.0.0";
+       sha256 = "0jgzl4gsxb2xf51k2n8m19db3mk4l9pppir2h7cckdr596zy3x83";
+       libraryHaskellDepends = [
+         array auto-update base bytestring directory easy-file filepath text
+         unix-compat unix-time
+       ];
+       testHaskellDepends = [ base bytestring directory hspec ];
+       testToolDepends = [ hspec-discover ];
+       description = "A fast logging system";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "fast-math" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -82101,8 +82388,8 @@ self: {
        pname = "fclabels";
        version = "2.0.3.3";
        sha256 = "1q62p41bj991s7i15ciayw1v1xq8szn4bls50p65lfy2dnj7554s";
-       revision = "3";
-       editedCabalFile = "1wncfnvh4mv87gh0ddhiqf839d63rqs1qzi3y386y6r8hfnvra0l";
+       revision = "4";
+       editedCabalFile = "09pn1q4gjlhw956asmhzva1rhrafmn69xmd1sc80fh3c8vjd3icz";
        libraryHaskellDepends = [ base mtl template-haskell transformers ];
        testHaskellDepends = [
          base HUnit mtl template-haskell transformers
@@ -82384,6 +82671,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "feed_1_2_0_1" = callPackage
+    ({ mkDerivation, base, base-compat, bytestring, HUnit
+     , markdown-unlit, old-locale, old-time, safe, test-framework
+     , test-framework-hunit, text, time, time-locale-compat, utf8-string
+     , xml-conduit, xml-types
+     }:
+     mkDerivation {
+       pname = "feed";
+       version = "1.2.0.1";
+       sha256 = "004lwdng4slj6yl8mgscr3cgj0zzc8hzkf4450dby2l6cardg4w0";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base base-compat bytestring old-locale old-time safe text time
+         time-locale-compat utf8-string xml-conduit xml-types
+       ];
+       testHaskellDepends = [
+         base base-compat HUnit old-time test-framework test-framework-hunit
+         text time xml-conduit xml-types
+       ];
+       testToolDepends = [ markdown-unlit ];
+       description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds.";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "feed-cli" = callPackage
     ({ mkDerivation, base, directory, feed, old-locale, old-time, time
      , xml
@@ -85816,6 +86128,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fold-debounce_0_2_0_9" = callPackage
+    ({ mkDerivation, base, data-default-class, hspec, stm, stm-delay
+     , time
+     }:
+     mkDerivation {
+       pname = "fold-debounce";
+       version = "0.2.0.9";
+       sha256 = "032vk4bpmsd7ix00kpfb2vnabivg9vkkfy3nbazdgm8x01jix4wq";
+       libraryHaskellDepends = [
+         base data-default-class stm stm-delay time
+       ];
+       testHaskellDepends = [ base hspec stm time ];
+       description = "Fold multiple events that happen in a given period of time";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "fold-debounce-conduit" = callPackage
     ({ mkDerivation, base, conduit, fold-debounce, hspec, resourcet
      , stm, transformers, transformers-base
@@ -87159,21 +87488,20 @@ self: {
      }) {};
 
   "free-algebras" = callPackage
-    ({ mkDerivation, base, constraints, containers, data-fix, dlist
-     , free, groups, hedgehog, kan-extensions, mtl, natural-numbers
-     , transformers
+    ({ mkDerivation, base, containers, data-fix, dlist, free, groups
+     , hedgehog, kan-extensions, mtl, transformers
      }:
      mkDerivation {
        pname = "free-algebras";
-       version = "0.0.7.2";
-       sha256 = "0hljd9wsv516jcqp7pkacmadjchkd9sxq42pj5j1my95hvc5apfd";
+       version = "0.0.8.0";
+       sha256 = "0hwvjvly1ab7bnb4knqxz0gpxkw8pn1x5xbqf3g0k98cqr0zpsj7";
        libraryHaskellDepends = [
-         base constraints containers data-fix dlist free groups
-         kan-extensions mtl natural-numbers transformers
+         base containers data-fix dlist free groups kan-extensions mtl
+         transformers
        ];
        testHaskellDepends = [
-         base constraints containers data-fix dlist free groups hedgehog
-         kan-extensions mtl natural-numbers transformers
+         base containers data-fix dlist free groups hedgehog kan-extensions
+         mtl transformers
        ];
        description = "Free algebras in Haskell";
        license = stdenv.lib.licenses.mpl20;
@@ -87614,6 +87942,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "freer-simple_1_2_1_1" = callPackage
+    ({ mkDerivation, base, criterion, extensible-effects, free, mtl
+     , natural-transformation, QuickCheck, tasty, tasty-hunit
+     , tasty-quickcheck, template-haskell, transformers-base
+     }:
+     mkDerivation {
+       pname = "freer-simple";
+       version = "1.2.1.1";
+       sha256 = "0vqbri72xxk6is0kk2yxfpqxixq3h047rn153i16hhpppsp3xk17";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base natural-transformation template-haskell transformers-base
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base QuickCheck tasty tasty-hunit tasty-quickcheck
+       ];
+       benchmarkHaskellDepends = [
+         base criterion extensible-effects free mtl
+       ];
+       description = "Implementation of a friendly effect system for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "freer-simple-catching" = callPackage
     ({ mkDerivation, base, freer-simple, hspec }:
      mkDerivation {
@@ -92495,8 +92849,8 @@ self: {
      }:
      mkDerivation {
        pname = "ghc-heap-view";
-       version = "0.6.0";
-       sha256 = "1j2ygig1m7xq1y5gsaaxbgywv382yzlp1nbf3cp98yias0s61vcr";
+       version = "0.6.1";
+       sha256 = "04lmj3ihdwcz483w2cpjs4zcpld8yk3aslkw2gl4mal3fpwf0vhx";
        enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal filepath ];
        libraryHaskellDepends = [
@@ -96041,16 +96395,22 @@ self: {
 
   "gitlab-haskell" = callPackage
     ({ mkDerivation, aeson, base, bytestring, connection, http-conduit
-     , http-types, text, transformers, unliftio, unliftio-core
+     , http-types, optparse-applicative, text, transformers, unliftio
+     , unliftio-core
      }:
      mkDerivation {
        pname = "gitlab-haskell";
-       version = "0.1.1";
-       sha256 = "1h4cc3ay8bpc11ja2xsy6yxi7s7riscrnjcma4iwf2k35r9jnjxi";
+       version = "0.1.2";
+       sha256 = "0m5gxf7799ds3ff46bz7j3rxycwnbaaik7lffyh22ipp3wlxjxpn";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring connection http-conduit http-types text
          transformers unliftio unliftio-core
        ];
+       executableHaskellDepends = [
+         base http-types optparse-applicative text
+       ];
        description = "A Haskell library for the GitLab web API";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -100025,8 +100385,8 @@ self: {
      }:
      mkDerivation {
        pname = "google-maps-geocoding";
-       version = "0.5.0.0";
-       sha256 = "07myy4q56lnapjxjfiz8skh2h32k5i132mi9sn68aad03a6rx6k1";
+       version = "0.5.0.1";
+       sha256 = "0cc7hhw4bqls6bckpahck5ad2pv6fzw2qkp8iym7y4cylsxvnamq";
        libraryHaskellDepends = [
          aeson base google-static-maps http-client servant servant-client
          text
@@ -100155,8 +100515,8 @@ self: {
      }:
      mkDerivation {
        pname = "google-static-maps";
-       version = "0.6.0.0";
-       sha256 = "0h2vm6yk076n4xcwlqcl7m786bqrk0vgpcx0h3j04bq2qik88sq5";
+       version = "0.6.0.1";
+       sha256 = "0hvkxdwfbn352q642v4n8wj4ikfp97sll87cwkgr3vb23qwmlbyy";
        libraryHaskellDepends = [
          aeson base base64-bytestring bytedump bytestring cryptonite
          double-conversion http-client JuicyPixels memory network-uri
@@ -101772,6 +102132,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "greskell_0_2_3_1" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, doctest, doctest-discover
+     , exceptions, greskell-core, hint, hspec, semigroups, text
+     , transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "greskell";
+       version = "0.2.3.1";
+       sha256 = "0byg8f4m5n2l81y1l6lnd6zyskk1y7wj1983ziw29jkpyckjbpgl";
+       libraryHaskellDepends = [
+         aeson base exceptions greskell-core semigroups text transformers
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring doctest doctest-discover greskell-core hint
+         hspec text unordered-containers
+       ];
+       description = "Haskell binding for Gremlin graph query language";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "greskell-core" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, doctest
      , doctest-discover, hashable, hspec, QuickCheck, scientific
@@ -101793,6 +102175,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "greskell-core_0_1_2_7" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, doctest
+     , doctest-discover, hashable, hspec, QuickCheck, scientific
+     , semigroups, text, unordered-containers, uuid, vector
+     }:
+     mkDerivation {
+       pname = "greskell-core";
+       version = "0.1.2.7";
+       sha256 = "1q7schkwv832wk4yc831q7z6nmnvzsgh9hfscb27hbfdrw0lafd7";
+       libraryHaskellDepends = [
+         aeson base containers hashable scientific semigroups text
+         unordered-containers uuid vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring doctest doctest-discover hspec QuickCheck
+         text unordered-containers vector
+       ];
+       description = "Haskell binding for Gremlin graph query language - core data types and tools";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "greskell-websocket" = callPackage
     ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring
      , greskell-core, hashtables, hspec, safe-exceptions, stm, text
@@ -103294,23 +103698,25 @@ self: {
      }) {};
 
   "h2048" = callPackage
-    ({ mkDerivation, base, HUnit, MonadRandom, mtl, text, transformers
-     , vty, vty-ui
+    ({ mkDerivation, base, brick, hspec, lens, MonadRandom, mtl, text
+     , vty
      }:
      mkDerivation {
        pname = "h2048";
-       version = "0.2.0.1";
-       sha256 = "1s8r476bhvmhpj914n4sjsa1z6dgf26m872rpzhlsyhw1rsxgcfr";
+       version = "0.3.0.0";
+       sha256 = "1jsb2lh22x99rhbzhh76nx97vrnw3p281nfdv18gn8mrzw13mbmm";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base MonadRandom mtl text transformers vty vty-ui
+         base brick lens MonadRandom mtl text vty
        ];
        executableHaskellDepends = [
-         base MonadRandom mtl text transformers vty vty-ui
+         base brick lens MonadRandom mtl text vty
        ];
-       testHaskellDepends = [ base HUnit MonadRandom mtl transformers ];
-       description = "a haskell implementation of Game 2048";
+       testHaskellDepends = [
+         base brick hspec lens MonadRandom mtl text vty
+       ];
+       description = "An Implementation of Game 2048";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
@@ -108989,8 +109395,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-formatter";
-       version = "2.0.1";
-       sha256 = "17cwpvc8yfflzvlhyvdk2kgqpi2k3s55kz1435axgn02ajvdlr75";
+       version = "2.0.2";
+       sha256 = "0rnx34nkgw4zsyagl38vqd322fzp3kfi16p60dhffadga8v4gajd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -111306,6 +111712,33 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "haskoin-core_0_9_1" = callPackage
+    ({ mkDerivation, aeson, array, base, base16-bytestring, bytestring
+     , cereal, conduit, containers, cryptonite, entropy, hashable, hspec
+     , hspec-discover, HUnit, memory, mtl, murmur3, network, QuickCheck
+     , safe, scientific, secp256k1-haskell, split, string-conversions
+     , text, time, transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "haskoin-core";
+       version = "0.9.1";
+       sha256 = "1jpq7dz6gfpgvjgrss4cwgrjmicw9yyfrsfnfq980cjw7h0inc41";
+       libraryHaskellDepends = [
+         aeson array base base16-bytestring bytestring cereal conduit
+         containers cryptonite entropy hashable memory mtl murmur3 network
+         QuickCheck scientific secp256k1-haskell split string-conversions
+         text time transformers unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring cereal containers hspec HUnit mtl QuickCheck
+         safe split string-conversions text unordered-containers vector
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Bitcoin & Bitcoin Cash library for Haskell";
+       license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "haskoin-crypto" = callPackage
     ({ mkDerivation, base, binary, byteable, bytestring, containers
      , cryptohash, haskoin-util, HUnit, mtl, QuickCheck, test-framework
@@ -111340,8 +111773,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskoin-node";
-       version = "0.9.10";
-       sha256 = "05pnj7caia2ifr793pryfdc8q8p203rii4agrgy4i123mcfmxqjq";
+       version = "0.9.11";
+       sha256 = "041qqn35c2iy4axfdl58x7fr4asn7wclra0095hh4zc37m9f9ihn";
        libraryHaskellDepends = [
          base bytestring cereal conduit conduit-extra containers
          data-default hashable haskoin-core monad-logger mtl network nqe
@@ -111414,12 +111847,13 @@ self: {
      , haskoin-node, hspec, hspec-discover, http-types, monad-logger
      , mtl, network, nqe, optparse-applicative, random, resourcet
      , rocksdb-haskell, rocksdb-query, scotty, string-conversions, text
-     , time, transformers, unliftio, unordered-containers, wai
+     , time, transformers, unliftio, unordered-containers, vector, wai
+     , warp
      }:
      mkDerivation {
        pname = "haskoin-store";
-       version = "0.17.1";
-       sha256 = "19vzwxy27xkkkx3lmq554kkyh6iclrxdhbp901vb0rh9v8l3cc74";
+       version = "0.18.0";
+       sha256 = "1ncq1k2l1v3a56d3fs2nx7b94iafyyngi4v4i4y9vf9z6f3lzm91";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -111427,21 +111861,21 @@ self: {
          hashable haskoin-core haskoin-node http-types monad-logger mtl
          network nqe random resourcet rocksdb-haskell rocksdb-query scotty
          string-conversions text time transformers unliftio
-         unordered-containers wai
+         unordered-containers vector wai warp
        ];
        executableHaskellDepends = [
          aeson base bytestring cereal conduit containers data-default
          filepath hashable haskoin-core haskoin-node http-types monad-logger
          mtl network nqe optparse-applicative random resourcet
          rocksdb-haskell rocksdb-query scotty string-conversions text time
-         transformers unliftio unordered-containers wai
+         transformers unliftio unordered-containers vector wai warp
        ];
        testHaskellDepends = [
          aeson base bytestring cereal conduit containers data-default
          hashable haskoin-core haskoin-node hspec http-types monad-logger
          mtl network nqe random resourcet rocksdb-haskell rocksdb-query
          scotty string-conversions text time transformers unliftio
-         unordered-containers wai
+         unordered-containers vector wai warp
        ];
        testToolDepends = [ hspec-discover ];
        description = "Storage and index for Bitcoin and Bitcoin Cash";
@@ -114205,8 +114639,8 @@ self: {
      }:
      mkDerivation {
        pname = "hdocs";
-       version = "0.5.3.2";
-       sha256 = "0x899pa5dw1jrc0vcw8aa1f3cx2xz8z0zqhplivji81lpjnajfgv";
+       version = "0.5.4.0";
+       sha256 = "1qj7kcpfwpsgzbmhiix22n66173kgxqgf3fb6mc2ybdc4zmkfa29";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -116859,8 +117293,8 @@ self: {
      }:
      mkDerivation {
        pname = "hhp";
-       version = "0.0.1";
-       sha256 = "0b3hliz1ags0c17kjwvsvl56ms4ga8wvaf5c7nmfiyzf0s6h0lp0";
+       version = "0.0.2";
+       sha256 = "0c9hcxvkrsz750r7hqviwn19r1slad4y5cj5m8ip84yiww44bfz4";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -118628,14 +119062,14 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
-  "hkgr_0_2_3_3" = callPackage
+  "hkgr_0_2_4" = callPackage
     ({ mkDerivation, base, directory, filepath, simple-cabal
      , simple-cmd, simple-cmd-args
      }:
      mkDerivation {
        pname = "hkgr";
-       version = "0.2.3.3";
-       sha256 = "1a7ibkfdn4xkr89xlps3znr7ry9bdzdijylbqnlsvikri7vibaaz";
+       version = "0.2.4";
+       sha256 = "09mvprpywxxfx2x0fm895k27qhsrhk8n00a5lgc4vglrvr0hyfdq";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -118942,17 +119376,18 @@ self: {
      }) {};
 
   "hledger-irr" = callPackage
-    ({ mkDerivation, base, Cabal, Decimal, hledger-lib, statistics
-     , text, time
+    ({ mkDerivation, base, Cabal, data-default-class, Decimal
+     , hledger-lib, math-functions, text, time
      }:
      mkDerivation {
        pname = "hledger-irr";
-       version = "0.1.1.15";
-       sha256 = "06fbahn3pp73an5xxn0qnh8h7hkjvvl5z4z52vgcpxh13frd65hx";
+       version = "0.1.1.16";
+       sha256 = "1zvr4yrl0s1hiz0k76dmkkx89656jlamdmdi7y2cmsw1m5cf97v4";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base Cabal Decimal hledger-lib statistics text time
+         base Cabal data-default-class Decimal hledger-lib math-functions
+         text time
        ];
        description = "computes the internal rate of return of an investment";
        license = stdenv.lib.licenses.bsd3;
@@ -121250,8 +121685,8 @@ self: {
      }:
      mkDerivation {
        pname = "hopencc";
-       version = "0.1.0.0";
-       sha256 = "1ygldh3r09qzpws28mnmhm3ai7h162gsafdc7nwl2f10kjnpjhyw";
+       version = "0.2.0.0";
+       sha256 = "0bzx6l7j9qjc1dvcaicgayb05n4klb4dg64m1xlfi187jxcnz7jb";
        libraryHaskellDepends = [ base bytestring utf8-string ];
        libraryPkgconfigDepends = [ opencc ];
        libraryToolDepends = [ c2hs ];
@@ -127689,6 +128124,27 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "html-conduit_1_3_2_1" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, conduit
+     , conduit-extra, containers, deepseq, hspec, HUnit, resourcet, text
+     , transformers, xml-conduit, xml-types
+     }:
+     mkDerivation {
+       pname = "html-conduit";
+       version = "1.3.2.1";
+       sha256 = "196c8zcnjp1pc5qvqxd8arx3xkw0a90rvg9mmiw2l4zwnx65709n";
+       libraryHaskellDepends = [
+         attoparsec base bytestring conduit conduit-extra containers
+         resourcet text transformers xml-conduit xml-types
+       ];
+       testHaskellDepends = [
+         base bytestring containers deepseq hspec HUnit text xml-conduit
+       ];
+       description = "Parse HTML documents using xml-conduit datatypes";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "html-email-validate" = callPackage
     ({ mkDerivation, attoparsec, base, criterion, hspec, QuickCheck
      , regex-pcre-builtin, text
@@ -130428,6 +130884,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hw-fingertree-strict_0_1_1_2" = callPackage
+    ({ mkDerivation, base, deepseq, hedgehog, hspec, hspec-discover
+     , HUnit, hw-hspec-hedgehog, QuickCheck, test-framework
+     , test-framework-hunit, test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "hw-fingertree-strict";
+       version = "0.1.1.2";
+       sha256 = "0zgm5x67kmxm1l1c5605rcs3g5kyfcqz5d8lj6b055ysqqcpr14l";
+       libraryHaskellDepends = [ base deepseq ];
+       testHaskellDepends = [
+         base hedgehog hspec HUnit hw-hspec-hedgehog QuickCheck
+         test-framework test-framework-hunit test-framework-quickcheck2
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Generic strict finger-tree structure";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hw-hedgehog" = callPackage
     ({ mkDerivation, base, hedgehog, vector }:
      mkDerivation {
@@ -131017,7 +131493,7 @@ self: {
        broken = true;
      }) {};
 
-  "hw-rankselect_0_13_2_0" = callPackage
+  "hw-rankselect_0_13_3_0" = callPackage
     ({ mkDerivation, base, bytestring, conduit, criterion, deepseq
      , directory, generic-lens, hedgehog, hspec, hspec-discover
      , hw-balancedparens, hw-bits, hw-fingertree, hw-hedgehog
@@ -131026,10 +131502,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-rankselect";
-       version = "0.13.2.0";
-       sha256 = "00k163jalapxdlcmcvi4ddk60bsj34f7ng05agvh1374kybqscb4";
-       revision = "2";
-       editedCabalFile = "12c35s16x77wch32jcbxqy35gwkvnfrx3s1xca4crg7mcwd5lcg4";
+       version = "0.13.3.0";
+       sha256 = "1v0ia935y21zvzk81xiikidsbryadkjd117f8hkxnla0zic729yr";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -137318,6 +137792,27 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "irc-client_1_1_1_1" = callPackage
+    ({ mkDerivation, base, bytestring, conduit, connection, containers
+     , contravariant, exceptions, irc-conduit, irc-ctcp, mtl
+     , network-conduit-tls, old-locale, profunctors, stm, stm-chans
+     , text, time, tls, transformers, x509, x509-store, x509-validation
+     }:
+     mkDerivation {
+       pname = "irc-client";
+       version = "1.1.1.1";
+       sha256 = "08s1qb9dc6icz9fxfp5swcx817685vj833l8ijpf1gdgyzw6wfdq";
+       libraryHaskellDepends = [
+         base bytestring conduit connection containers contravariant
+         exceptions irc-conduit irc-ctcp mtl network-conduit-tls old-locale
+         profunctors stm stm-chans text time tls transformers x509
+         x509-store x509-validation
+       ];
+       description = "An IRC client library";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "irc-colors" = callPackage
     ({ mkDerivation, base, text }:
      mkDerivation {
@@ -137347,6 +137842,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "irc-conduit_0_3_0_4" = callPackage
+    ({ mkDerivation, async, base, bytestring, conduit, conduit-extra
+     , connection, irc, irc-ctcp, network-conduit-tls, profunctors, text
+     , time, tls, transformers, x509-validation
+     }:
+     mkDerivation {
+       pname = "irc-conduit";
+       version = "0.3.0.4";
+       sha256 = "0asaddcbdcnbp0bbhvzaq5514nw2l1cp1gac3jbn4mh7brgfwjc1";
+       libraryHaskellDepends = [
+         async base bytestring conduit conduit-extra connection irc irc-ctcp
+         network-conduit-tls profunctors text time tls transformers
+         x509-validation
+       ];
+       description = "Streaming IRC message library using conduits";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "irc-core" = callPackage
     ({ mkDerivation, attoparsec, base, base64-bytestring, bytestring
      , hashable, HUnit, primitive, text, time, vector
@@ -144066,8 +144580,8 @@ self: {
        pname = "lambdabot-core";
        version = "5.2";
        sha256 = "1wh87wwb8hk3hn2lmdqi1hv77qbdmwqcwjslichygmvac8fjhjss";
-       revision = "1";
-       editedCabalFile = "1srdkvyw1b0cpv2gq497x11zmqkiqpxkhhdhkd0363wayqjpg21s";
+       revision = "2";
+       editedCabalFile = "1khn1j3z7mkzggp7s35p0dixsj81yljfrf5r9d289dvy1dip8akf";
        libraryHaskellDepends = [
          base binary bytestring containers dependent-map dependent-sum
          dependent-sum-template directory edit-distance filepath haskeline
@@ -144712,8 +145226,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-ats";
-       version = "1.7.1.2";
-       sha256 = "057gskb5y57jvh6z71d35qq228kpvf0wk09wf175mgy9qc78vg9p";
+       version = "1.7.3.0";
+       sha256 = "0x7sxg30y2cx6wgq51ysycqqcl2cxqi0fi8g69a6fbw22ndpj4b4";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          ansi-wl-pprint array base composition-prelude containers deepseq
@@ -148549,6 +149063,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "libmpd_0_9_0_10" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, containers
+     , data-default-class, filepath, hspec, mtl, network, old-locale
+     , QuickCheck, safe-exceptions, text, time, unix, utf8-string
+     }:
+     mkDerivation {
+       pname = "libmpd";
+       version = "0.9.0.10";
+       sha256 = "0vy287mn1vk8kvij5i3hc0p02l886cpsq5dds7kl6g520si3abkb";
+       libraryHaskellDepends = [
+         attoparsec base bytestring containers data-default-class filepath
+         mtl network old-locale safe-exceptions text time utf8-string
+       ];
+       testHaskellDepends = [
+         attoparsec base bytestring containers data-default-class filepath
+         hspec mtl network old-locale QuickCheck safe-exceptions text time
+         unix utf8-string
+       ];
+       description = "An MPD client library";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "libnix" = callPackage
     ({ mkDerivation, aeson, base, directory, errors, filepath, process
      , protolude, tasty, tasty-hunit, text
@@ -150481,6 +151018,8 @@ self: {
        pname = "liquid-fixpoint";
        version = "0.8.0.2";
        sha256 = "1x8xbcf2xc9hwfpsl1s15qkmgdhr30fff4gp09dvnwi3z4mgi2wf";
+       revision = "1";
+       editedCabalFile = "013q8xj4ib5llyq9wmnx98dprw2zn4rkc1jndavcjjg2cwwrw56w";
        configureFlags = [ "-fbuild-external" ];
        isLibrary = true;
        isExecutable = true;
@@ -150518,6 +151057,8 @@ self: {
        pname = "liquidhaskell";
        version = "0.8.6.2";
        sha256 = "1hqs1zfcz4fprrrcwj3j731ksldviafivk0kv2hprslmz4m1kfb2";
+       revision = "1";
+       editedCabalFile = "14mvnjgd65n6j2zlzw0c679zvlik02cn6x8rhxm3rb1155zybjil";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -152986,6 +153527,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "loopbreaker_0_1_1_1" = callPackage
+    ({ mkDerivation, base, containers, ghc, hspec, hspec-discover
+     , inspection-testing, syb
+     }:
+     mkDerivation {
+       pname = "loopbreaker";
+       version = "0.1.1.1";
+       sha256 = "0ixy3l0vw4sn5vyqn05mc68sdfab51vxjwvas8ismmg9j6w1mn0q";
+       libraryHaskellDepends = [ base containers ghc syb ];
+       testHaskellDepends = [
+         base containers ghc hspec inspection-testing syb
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "inline self-recursive definitions";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "looper" = callPackage
     ({ mkDerivation, aeson, base, hspec, optparse-applicative, text
      , time, unliftio
@@ -154888,6 +155447,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "mainland-pretty_0_7_0_1" = callPackage
+    ({ mkDerivation, base, containers, srcloc, text, transformers }:
+     mkDerivation {
+       pname = "mainland-pretty";
+       version = "0.7.0.1";
+       sha256 = "0cifvdpqcb1cvjazgqwaxvl2ga7kap5a6f89yw1xn8y5yw7nz1c8";
+       libraryHaskellDepends = [
+         base containers srcloc text transformers
+       ];
+       description = "Pretty printing designed for printing source code";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "majordomo" = callPackage
     ({ mkDerivation, base, bytestring, cmdargs, monad-loops, old-locale
      , threads, time, unix, zeromq-haskell
@@ -158522,6 +159095,17 @@ self: {
        broken = true;
      }) {};
 
+  "metaheuristics" = callPackage
+    ({ mkDerivation, arrows, base, random, Stream }:
+     mkDerivation {
+       pname = "metaheuristics";
+       version = "0.0.8";
+       sha256 = "0rdw0laqx9kypfwzqb4ir18r07sjxgm4pwfs82bjpwq0gf58nzas";
+       libraryHaskellDepends = [ arrows base random Stream ];
+       description = "Generalised local search within Haskell, for applications in combinatorial optimisation";
+       license = "GPL";
+     }) {};
+
   "metamorphic" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -159761,16 +160345,19 @@ self: {
 
   "mini-egison" = callPackage
     ({ mkDerivation, base, containers, haskell-src-meta, hspec, primes
-     , regex-compat, split, template-haskell
+     , regex-compat, sort, split, template-haskell
      }:
      mkDerivation {
        pname = "mini-egison";
-       version = "0.1.1";
-       sha256 = "1b73igp5n2z5z910rfif2ag8ir97vr5bn1jrkmv30rnw6pnp5a5d";
+       version = "0.1.4";
+       sha256 = "16lv1hvd8dqi5z8pb9j2hmi5h8ivf2c01wscswrlmdqwck1cx74a";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base containers haskell-src-meta regex-compat split
          template-haskell
        ];
+       executableHaskellDepends = [ base sort ];
        testHaskellDepends = [ base hspec primes ];
        description = "Template Haskell Implementation of Egison Pattern Matching";
        license = stdenv.lib.licenses.mit;
@@ -161209,19 +161796,26 @@ self: {
      }) {};
 
   "mollie-api-haskell" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, HsOpenSSL, http-client
-     , http-client-openssl, http-types, mtl, text, time
+    ({ mkDerivation, aeson, base, bytestring, currency-codes
+     , data-default, http-client, http-client-tls, http-media
+     , http-types, lens, mtl, servant, servant-client
+     , servant-client-core, tasty, tasty-hunit, text, time
+     , unordered-containers
      }:
      mkDerivation {
        pname = "mollie-api-haskell";
-       version = "0.2.0.1";
-       sha256 = "0hyxfa2diqjlcd0x5fxscn8lsmjkwzpvvj04w2n52q5dnm76qacm";
+       version = "2.0.0.0";
+       sha256 = "196xk0qca5aghmx509m2cgqcpgiw8xlg8qk35ca2irx8jdq6rwch";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         aeson base bytestring HsOpenSSL http-client http-client-openssl
-         http-types mtl text time
+         aeson base bytestring currency-codes data-default http-client
+         http-client-tls http-media http-types lens mtl servant
+         servant-client servant-client-core text time unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson base bytestring currency-codes data-default lens tasty
+         tasty-hunit time
        ];
-       testHaskellDepends = [ base ];
        description = "Mollie API client for Haskell http://www.mollie.com";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -162870,6 +163464,30 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "mono-traversable_1_0_13_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, foldl, gauge
+     , hashable, hspec, HUnit, mwc-random, QuickCheck, semigroups, split
+     , text, transformers, unordered-containers, vector
+     , vector-algorithms
+     }:
+     mkDerivation {
+       pname = "mono-traversable";
+       version = "1.0.13.0";
+       sha256 = "1bqy982lpdb83lacfy76n8kqw5bvd31avxj25kg8gkgycdh0g0ma";
+       libraryHaskellDepends = [
+         base bytestring containers hashable split text transformers
+         unordered-containers vector vector-algorithms
+       ];
+       testHaskellDepends = [
+         base bytestring containers foldl hspec HUnit QuickCheck semigroups
+         text transformers unordered-containers vector
+       ];
+       benchmarkHaskellDepends = [ base gauge mwc-random vector ];
+       description = "Type classes for mapping, folding, and traversing monomorphic containers";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mono-traversable-instances" = callPackage
     ({ mkDerivation, base, comonad, containers, dlist, dlist-instances
      , mono-traversable, semigroupoids, semigroups, transformers
@@ -163426,35 +164044,34 @@ self: {
      }) {};
 
   "morpheus-graphql" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
-     , filepath, lens, megaparsec, mtl, optparse-applicative, scientific
-     , scotty, tasty, tasty-hunit, template-haskell, text, transformers
-     , unordered-containers, utf8-string, uuid, vector, wai
-     , wai-websockets, warp, websockets
+    ({ mkDerivation, aeson, base, bytestring, containers, filepath
+     , lens, megaparsec, mtl, optparse-applicative, scientific, scotty
+     , tasty, tasty-hunit, template-haskell, text, transformers
+     , unordered-containers, uuid, vector, wai, wai-websockets, warp
+     , websockets
      }:
      mkDerivation {
        pname = "morpheus-graphql";
-       version = "0.2.2";
-       sha256 = "1cgf6l6p97dfgj49gyygbd088smah3ichryrr8xvl1mr6pjclq5b";
+       version = "0.3.1";
+       sha256 = "05c1g3bxqd47im1kyx414aaxn4zf7k59wxcdgw7xdr6qf32g3wmw";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         aeson attoparsec base bytestring containers lens megaparsec mtl
-         scientific template-haskell text transformers unordered-containers
-         utf8-string uuid vector wai-websockets websockets
+         aeson base bytestring containers lens megaparsec mtl scientific
+         template-haskell text transformers unordered-containers uuid vector
+         websockets
        ];
        executableHaskellDepends = [
-         aeson attoparsec base bytestring containers filepath lens
-         megaparsec mtl optparse-applicative scientific scotty
-         template-haskell text transformers unordered-containers utf8-string
-         uuid vector wai wai-websockets warp websockets
+         aeson base bytestring containers filepath lens megaparsec mtl
+         optparse-applicative scientific scotty template-haskell text
+         transformers unordered-containers uuid vector wai wai-websockets
+         warp websockets
        ];
        testHaskellDepends = [
-         aeson attoparsec base bytestring containers lens megaparsec mtl
-         scientific tasty tasty-hunit template-haskell text transformers
-         unordered-containers utf8-string uuid vector wai-websockets
-         websockets
+         aeson base bytestring containers lens megaparsec mtl scientific
+         tasty tasty-hunit template-haskell text transformers
+         unordered-containers uuid vector websockets
        ];
        description = "Morpheus GraphQL";
        license = stdenv.lib.licenses.bsd3;
@@ -163934,27 +164551,25 @@ self: {
      }) {};
 
   "mptcp-pm" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, bytestring-conversion
-     , c2hs, c2hsc, cereal, containers, fast-logger, HUnit, ip, netlink
-     , optparse-applicative, process
+    ({ mkDerivation, aeson, aeson-extra, aeson-pretty, base, bytestring
+     , bytestring-conversion, c2hs, c2hsc, cereal, containers
+     , fast-logger, filepath, hslogger, ip, netlink
+     , optparse-applicative, process, temporary, text
+     , unordered-containers
      }:
      mkDerivation {
        pname = "mptcp-pm";
-       version = "0.0.1";
-       sha256 = "0sknhb9i0hshyjc33g301l7lxy5cigilhzdmwc6bi0gxhnkgycki";
-       isLibrary = true;
+       version = "0.0.2";
+       sha256 = "0l55734pa31znn9k0pxvixhh6abcmfkhgx162krn622l4lij3h8m";
+       isLibrary = false;
        isExecutable = true;
-       libraryToolDepends = [ c2hs ];
        executableHaskellDepends = [
-         aeson base bytestring bytestring-conversion c2hsc cereal containers
-         fast-logger ip netlink optparse-applicative process
+         aeson aeson-extra aeson-pretty base bytestring
+         bytestring-conversion c2hsc cereal containers fast-logger filepath
+         hslogger ip netlink optparse-applicative process temporary text
+         unordered-containers
        ];
        executableToolDepends = [ c2hs ];
-       testHaskellDepends = [
-         aeson base bytestring cereal containers HUnit ip netlink
-       ];
-       testToolDepends = [ c2hs ];
-       doHaddock = false;
        description = "A work in progress Multipath TCP path manager";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -167841,8 +168456,8 @@ self: {
      }:
      mkDerivation {
        pname = "net-spider";
-       version = "0.3.2.0";
-       sha256 = "0b9k2gxb9nmjd59pcz7x8jrk2vycf8jk448ifpfc9spk6ylkh4gh";
+       version = "0.3.2.1";
+       sha256 = "012mpn1m6jdpqvfr7bz65v7cjf9acg7xxd5yf8z4cyv9y8sl1rzb";
        libraryHaskellDepends = [
          aeson base containers data-interval extended-reals greskell
          greskell-websocket hashable monad-logger safe-exceptions scientific
@@ -167864,8 +168479,8 @@ self: {
      }:
      mkDerivation {
        pname = "net-spider-cli";
-       version = "0.1.0.1";
-       sha256 = "1qfzdfkiri3v344mk5zkc8mhxig3xmplcbw8382hkhsdmy4ny4ga";
+       version = "0.1.0.2";
+       sha256 = "0p2smq2drxdl7iia3layifmipqbg3sn76dpczwj04gjs9vwjyj2z";
        libraryHaskellDepends = [
          aeson base greskell-core hashable net-spider optparse-applicative
          text
@@ -167885,8 +168500,8 @@ self: {
      }:
      mkDerivation {
        pname = "net-spider-pangraph";
-       version = "0.1.1.0";
-       sha256 = "1j3s379ri05jg3bzhiz6d8fjvxlkz00l7mrphqmr46j4y8d9vrkv";
+       version = "0.1.1.1";
+       sha256 = "135apkmcdlasfvj7nrgghngh5kh7bb1dp30007fj0nihp06c8nhp";
        libraryHaskellDepends = [
          base bytestring greskell net-spider pangraph text time
        ];
@@ -167906,14 +168521,14 @@ self: {
      }:
      mkDerivation {
        pname = "net-spider-rpl";
-       version = "0.3.0.0";
-       sha256 = "1b0035j4y4gd8jhisnjs4fgw2jmyh91az6b29869wxwdcrvk3cm4";
+       version = "0.3.1.0";
+       sha256 = "1nhvr3ybkms7l0m0qmmh7ib147hz2vgjwcsy00bhri054xryx7q2";
        libraryHaskellDepends = [
          aeson base conduit conduit-parse greskell hashable ip monad-logger
          mtl net-spider safe-exceptions text time
        ];
        testHaskellDepends = [
-         base bytestring fast-logger hspec monad-logger net-spider text
+         base bytestring fast-logger hspec ip monad-logger net-spider text
        ];
        description = "NetSpider data model and utility for RPL networks";
        license = stdenv.lib.licenses.bsd3;
@@ -167928,8 +168543,8 @@ self: {
      }:
      mkDerivation {
        pname = "net-spider-rpl-cli";
-       version = "0.1.1.0";
-       sha256 = "1qjh9bnhp94qkf94msqnaga6wlri5bc7n91jz3qxjkn6iczbznhw";
+       version = "0.1.1.1";
+       sha256 = "1hq7lv583h61wv56qhfrq55q1x6xsk53bbd6may80m3dh88ny23m";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -184415,8 +185030,8 @@ self: {
      }:
      mkDerivation {
        pname = "plot";
-       version = "0.2.3.9";
-       sha256 = "1cyg4znyn0w0rll5ghc68rjknyfncfykl15i1984dg0hf1j6q566";
+       version = "0.2.3.10";
+       sha256 = "0dva2kvf3193qc7zb9ydmzpffaj9lm6qy79n5zv66jnbccyp36lf";
        libraryHaskellDepends = [
          array base cairo colour hmatrix mtl pango transformers
        ];
@@ -186630,8 +187245,8 @@ self: {
      }:
      mkDerivation {
        pname = "postgresql-query";
-       version = "3.6.0";
-       sha256 = "1mf9441yb72jl1gm9zpfgwwjdiipcl0gghnazf1871dgvahbx3jz";
+       version = "3.7.0";
+       sha256 = "0raxd0vd6hf772g11x8p0c6h86sipwk74z5kfxb38mbi26yj0p24";
        libraryHaskellDepends = [
          aeson attoparsec base blaze-builder bytestring containers
          data-default exceptions file-embed haskell-src-meta hreader hset
@@ -186946,6 +187561,36 @@ self: {
        broken = true;
      }) {};
 
+  "postgresql-typed_0_6_1_0" = callPackage
+    ({ mkDerivation, aeson, array, attoparsec, base, binary, bytestring
+     , containers, convertible, criterion, cryptonite, data-default
+     , haskell-src-meta, HDBC, HUnit, memory, network, old-locale
+     , postgresql-binary, QuickCheck, scientific, template-haskell, text
+     , time, tls, utf8-string, uuid, x509, x509-store, x509-validation
+     }:
+     mkDerivation {
+       pname = "postgresql-typed";
+       version = "0.6.1.0";
+       sha256 = "1p7bcwbjb0pi96d9zad8kmlb2w3g06g4xra33xmmskynmsdyc0r9";
+       libraryHaskellDepends = [
+         aeson array attoparsec base binary bytestring containers cryptonite
+         data-default haskell-src-meta HDBC memory network old-locale
+         postgresql-binary scientific template-haskell text time tls
+         utf8-string uuid x509 x509-store x509-validation
+       ];
+       testHaskellDepends = [
+         base bytestring containers convertible HDBC HUnit network
+         QuickCheck time tls
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion network time tls
+       ];
+       description = "PostgreSQL interface with compile-time SQL type checking, optional HDBC backend";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "postgresql-typed-lifted" = callPackage
     ({ mkDerivation, base, base-unicode-symbols, bytestring, exceptions
      , lens, monad-control, postgresql-typed, transformers-base
@@ -187652,6 +188297,17 @@ self: {
        broken = true;
      }) {};
 
+  "predicate-transformers" = callPackage
+    ({ mkDerivation, adjunctions, base, lens }:
+     mkDerivation {
+       pname = "predicate-transformers";
+       version = "0.1.0.0";
+       sha256 = "05ksvy1wnkvsmrybfj615aaw49if3gv2zf9f7sad75lyi6cyxm0x";
+       libraryHaskellDepends = [ adjunctions base lens ];
+       description = "A library for writing predicates and transformations over predicates in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "predicates" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -188196,8 +188852,8 @@ self: {
      }:
      mkDerivation {
        pname = "pretty-relative-time";
-       version = "0.0.0.0";
-       sha256 = "0k28jh5mw5qfw4d1hfdj2f53qwmn3apy1yxwyxjbr50m2924j8f2";
+       version = "0.1.0.0";
+       sha256 = "01ijsjilsx79xdkchmxplcm2g6qh81fgxd36r6kwgrk446s0bq9c";
        libraryHaskellDepends = [ base time validity validity-time ];
        testHaskellDepends = [
          base genvalidity-hspec genvalidity-time hspec QuickCheck time
@@ -191222,8 +191878,8 @@ self: {
      }:
      mkDerivation {
        pname = "publicsuffix";
-       version = "0.20190927";
-       sha256 = "1yvv9yjpaj9f4ck1g7qdcglm7xli2h30nbrcc8s9vnl8im4gmy25";
+       version = "0.20191003";
+       sha256 = "1birj2k23v93w89mcrn522mqyfipv3smrdhag6k6pgsi628gihx7";
        libraryHaskellDepends = [ base filepath template-haskell ];
        testHaskellDepends = [ base hspec ];
        benchmarkHaskellDepends = [ base criterion random ];
@@ -197376,8 +198032,8 @@ self: {
     ({ mkDerivation, base, stm, transformers }:
      mkDerivation {
        pname = "ref-fd";
-       version = "0.4.0.1";
-       sha256 = "0dv0bwm952ivs1xi44nq8310k5mqs20i60g1rgwkm7hlpapz25p4";
+       version = "0.4.0.2";
+       sha256 = "1camr7cv1fglicyp2ivv7qv1yidj36zxcglfvmw7giqdj7r7j5w8";
        libraryHaskellDepends = [ base stm transformers ];
        description = "A type class for monads with references using functional dependencies";
        license = stdenv.lib.licenses.bsd3;
@@ -197402,10 +198058,8 @@ self: {
     ({ mkDerivation, base, stm, transformers }:
      mkDerivation {
        pname = "ref-tf";
-       version = "0.4.0.1";
-       sha256 = "03mywifasfvxlz7hy5bbq3i8zi3i99k5cb0kq38gndx4vk2j5dgw";
-       revision = "1";
-       editedCabalFile = "042nn6y3rbx9z88bkidy1ilp32grm6a1n0ny1wrzxdp46xi5r7in";
+       version = "0.4.0.2";
+       sha256 = "0pq9pm8jsx9w1q81pf5pvc361ad8dbyklw94jq47drr2i0dc7n20";
        libraryHaskellDepends = [ base stm transformers ];
        description = "A type class for monads with references using type families";
        license = stdenv.lib.licenses.bsd3;
@@ -198439,16 +199093,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "regex-pcre-builtin_0_95_0_8_8_35" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, regex-base }:
+  "regex-pcre-builtin_0_95_1_1_8_43" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, regex-base
+     , text
+     }:
      mkDerivation {
        pname = "regex-pcre-builtin";
-       version = "0.95.0.8.8.35";
-       sha256 = "071zlipd90vyb0d986a0pnlszjmnwvhfi5vqahpnr2b8zz40lsrk";
+       version = "0.95.1.1.8.43";
+       sha256 = "1akis4b9jp4a0qbwnpwm0nzlg76kb54wn2vlicc6yb4qha210fsd";
        libraryHaskellDepends = [
-         array base bytestring containers regex-base
+         array base bytestring containers regex-base text
        ];
-       description = "Replaces/Enhances Text.Regex";
+       description = "PCRE Backend for \"Text.Regex\" (regex-base)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -204638,7 +205294,7 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
-  "safecopy_0_10_1" = callPackage
+  "safecopy_0_10_2" = callPackage
     ({ mkDerivation, array, base, bytestring, cereal, containers
      , generic-data, HUnit, lens, lens-action, old-time, QuickCheck
      , quickcheck-instances, tasty, tasty-quickcheck, template-haskell
@@ -204646,10 +205302,8 @@ self: {
      }:
      mkDerivation {
        pname = "safecopy";
-       version = "0.10.1";
-       sha256 = "173lkpp6mj0kaklkwx1vypi7bwxgjwrbc3zk9akyfh3f2mlz0wi0";
-       revision = "1";
-       editedCabalFile = "0pgpnpg41p8gkq9l53bj4jj0hq863c5g0hzfjz9y5dqmjrwkvw8w";
+       version = "0.10.2";
+       sha256 = "0x8j27qmvqk009q2jhs1a6rdi81xvgp76bwnbp0y8yvzynjcaagk";
        libraryHaskellDepends = [
          array base bytestring cereal containers generic-data old-time
          template-haskell text time transformers vector
@@ -208087,8 +208741,8 @@ self: {
      }:
      mkDerivation {
        pname = "semantic-source";
-       version = "0.0.0.0";
-       sha256 = "1zvqr8a5pm32hcwxxgnbyp773ld4c29m20v7hghcmkgfdayps5r1";
+       version = "0.0.0.1";
+       sha256 = "0w1iwd67dpvpc43g4x9q686sljrxv6xhx9rlgiw6kzcdil7fcm8z";
        libraryHaskellDepends = [
          aeson base bytestring deepseq generic-monoid hashable semilattices
          text
@@ -208302,8 +208956,8 @@ self: {
      }:
      mkDerivation {
        pname = "semilattices";
-       version = "0.0.0.3";
-       sha256 = "089vgwbcwa3hj53hh9djmilwfknsd9g9z9q1gbl0dad4lr39062f";
+       version = "0.0.0.4";
+       sha256 = "14b182gxg3frcr9572294ds0l1n5jx4cfr6bxc50ybpgl07a98pj";
        libraryHaskellDepends = [
          base containers hashable unordered-containers
        ];
@@ -208617,6 +209271,44 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "seonbi" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal, cases
+     , cassava, containers, data-default, directory, doctest
+     , doctest-discover, file-embed, filepath, hlint, hspec
+     , hspec-discover, html-charset, http-client, http-types
+     , optparse-applicative, QuickCheck, temporary, text, text-trie
+     , unicode-show, wai, warp, zip
+     }:
+     mkDerivation {
+       pname = "seonbi";
+       version = "0.1.0";
+       sha256 = "0305ba46x7fz86m1b991672rq1viqchib9gns5aysp0bldggqqcf";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       setupHaskellDepends = [
+         base bytestring Cabal directory filepath http-client temporary text
+         zip
+       ];
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring cassava containers data-default
+         file-embed filepath text text-trie
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring cases containers html-charset http-types
+         optparse-applicative text wai warp
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers doctest doctest-discover hlint
+         hspec hspec-discover QuickCheck text unicode-show
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "SmartyPants for Korean language";
+       license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "separated" = callPackage
     ({ mkDerivation, base, bifunctors, Cabal, cabal-doctest
      , deriving-compat, directory, doctest, filepath, lens, parsec
@@ -208830,8 +209522,8 @@ self: {
      }:
      mkDerivation {
        pname = "sequenceTools";
-       version = "1.4.0.4";
-       sha256 = "13q9ypr4zxbxj0allkahcc4syvvmmplv2d3qj3mcz1p7704klga0";
+       version = "1.4.0.5";
+       sha256 = "06wi43di0bja83iympx8pvka4zfwc4yyaw7chrddvxasnxqi369q";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -212021,8 +212713,8 @@ self: {
      }:
      mkDerivation {
        pname = "setdown";
-       version = "0.1.0.3";
-       sha256 = "1r4qpp35ksbjswy49knw8ahfh1ja1afg8x3620bvpl3b3q8fs7f4";
+       version = "0.1.0.4";
+       sha256 = "19sj928n2jg9y1s6g1pf2qn58a8likg3v9910vfl1ylvi8agh38y";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -213944,6 +214636,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "shower_0_2_0_2" = callPackage
+    ({ mkDerivation, aeson, base, containers, directory, filepath
+     , megaparsec, pretty, process, QuickCheck, tasty, tasty-golden
+     , tasty-quickcheck, temporary, text, unordered-containers
+     , utf8-string, vector
+     }:
+     mkDerivation {
+       pname = "shower";
+       version = "0.2.0.2";
+       sha256 = "0flad49vvqww2pbf6j8557szffd7wb3z375avhvzwqyklimwipgn";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base megaparsec pretty ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         aeson base containers directory filepath process QuickCheck tasty
+         tasty-golden tasty-quickcheck temporary text unordered-containers
+         utf8-string vector
+       ];
+       description = "Clean up the formatting of 'show' output";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "shpider" = callPackage
     ({ mkDerivation, base, bytestring, containers, curl, mtl
      , regex-posix, tagsoup, tagsoup-parsec, time, url, web-encodings
@@ -214437,12 +215153,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "simple-cabal_0_1_0" = callPackage
+  "simple-cabal_0_1_1" = callPackage
     ({ mkDerivation, base, Cabal, directory, filepath }:
      mkDerivation {
        pname = "simple-cabal";
-       version = "0.1.0";
-       sha256 = "03isazzxy8bhk9mpzyzr5ls235d0ax7vah0js2jx656ksbbbn8v9";
+       version = "0.1.1";
+       sha256 = "116n9ks7d5qhz9lm38yq39dl2jw34lfgs3p8ncws8449v8v7q7kv";
        libraryHaskellDepends = [ base Cabal directory filepath ];
        description = "Cabal file wrapper library";
        license = stdenv.lib.licenses.bsd3;
@@ -216104,14 +216820,14 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
-  "skylighting_0_8_2_2" = callPackage
+  "skylighting_0_8_2_3" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers
      , skylighting-core
      }:
      mkDerivation {
        pname = "skylighting";
-       version = "0.8.2.2";
-       sha256 = "1fw9ay8h22vlf2nk8nvijsq1rqfyahz9h2zw4lkkl0ja71l4d589";
+       version = "0.8.2.3";
+       sha256 = "10byr42qnsrqs368li412n8zz405annwmh4vvq2yh6xskipgb32p";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -216154,7 +216870,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "skylighting-core_0_8_2_2" = callPackage
+  "skylighting-core_0_8_2_3" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, attoparsec, base
      , base64-bytestring, binary, blaze-html, bytestring
      , case-insensitive, colour, containers, criterion, Diff, directory
@@ -216164,8 +216880,8 @@ self: {
      }:
      mkDerivation {
        pname = "skylighting-core";
-       version = "0.8.2.2";
-       sha256 = "18zs0j2ckaryskq6n4pky3dfbd85kkx24d154wkswydvybkn9gl7";
+       version = "0.8.2.3";
+       sha256 = "005ancb8y846xsiagnb4gp4bn4h86r551rvpm3x4xj5zpr795pnc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -217015,6 +217731,8 @@ self: {
        libraryHaskellDepends = [ base bytesmith primitive ];
        description = "Parse arrays of tokens";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "smith-cli" = callPackage
@@ -217097,6 +217815,21 @@ self: {
        broken = true;
      }) {};
 
+  "smt" = callPackage
+    ({ mkDerivation, base, base-unicode-symbols, criterion, smallcheck
+     , tasty, tasty-smallcheck, util
+     }:
+     mkDerivation {
+       pname = "smt";
+       version = "0.0.0.0";
+       sha256 = "18y09ps8a3xxnvddfmlzip7b13747rmn8xxj1422akwmv565ad4l";
+       libraryHaskellDepends = [ base base-unicode-symbols util ];
+       testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
+       benchmarkHaskellDepends = [ base criterion ];
+       description = "Interface to Satisfiability Modulo Theories solvers";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "smt-lib" = callPackage
     ({ mkDerivation, array, base, directory, polyparse }:
      mkDerivation {
@@ -223314,8 +224047,8 @@ self: {
      }:
      mkDerivation {
        pname = "staversion";
-       version = "0.2.3.1";
-       sha256 = "0y3x0bylpiad1l87gzdwbgbaizqas6r9l83cngg3anqsg1gpd7a6";
+       version = "0.2.3.2";
+       sha256 = "059xv38i6mkq7wfvx154m7f7z6byf27q5h68p19nm9mv80l52vv7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -228255,8 +228988,8 @@ self: {
      }:
      mkDerivation {
        pname = "symbiote";
-       version = "0.0.1";
-       sha256 = "1pq5nncn0sg0246a569arncgj98b9d0j7l499yych97r016rg5bf";
+       version = "0.0.1.1";
+       sha256 = "0l0ibxsi57d4g7s6yg55wc1fxf7mpzpis5ag34i84g41syfwzyb7";
        libraryHaskellDepends = [
          abides aeson async base bytestring cereal cereal-text containers
          monad-control mtl QuickCheck quickcheck-instances stm text
@@ -233375,15 +234108,15 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
-  "texmath_0_11_2_3" = callPackage
+  "texmath_0_11_3" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
      , mtl, pandoc-types, parsec, process, split, syb, temporary, text
      , utf8-string, xml
      }:
      mkDerivation {
        pname = "texmath";
-       version = "0.11.2.3";
-       sha256 = "0r9vcvx1ay8s9pgdwyv7ayh5zraa8rhlr2xk5ngds21za27jvyfp";
+       version = "0.11.3";
+       sha256 = "03rpxbp43bjs62mmw4hv4785n6f6nbf8kj2y9mma5nzk6i2xs09f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -237363,6 +238096,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tldr_0_5_0" = callPackage
+    ({ mkDerivation, ansi-terminal, base, bytestring, cmark, directory
+     , filepath, optparse-applicative, semigroups, tasty, tasty-golden
+     , text, typed-process
+     }:
+     mkDerivation {
+       pname = "tldr";
+       version = "0.5.0";
+       sha256 = "1rjnvc62nwiyp95fpx1b75prbr3bg27zfgilmf5kylj82l9xf8q3";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         ansi-terminal base bytestring cmark text
+       ];
+       executableHaskellDepends = [
+         base directory filepath optparse-applicative semigroups
+         typed-process
+       ];
+       testHaskellDepends = [ base tasty tasty-golden ];
+       description = "Haskell tldr client";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tls" = callPackage
     ({ mkDerivation, asn1-encoding, asn1-types, async, base, bytestring
      , cereal, criterion, cryptonite, data-default-class, hourglass
@@ -237825,8 +238582,8 @@ self: {
        pname = "token-bucket";
        version = "0.1.0.1";
        sha256 = "1l3axqdkrjf28pxhrvdvlpf9wi79czsfvhi33w4v2wbj0g00j9ii";
-       revision = "4";
-       editedCabalFile = "19kxi77aqyra00m02751sdfm6qy6mx4mlh7bhqv4wyaggwga707g";
+       revision = "5";
+       editedCabalFile = "049d9bk5f8qa6d7gjgg4nqd56xz1mrxr1rxcwxsrk4vkqcpmzs6q";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base time ];
        description = "Rate limiter using lazy bucket algorithm";
@@ -238217,8 +238974,8 @@ self: {
      }:
      mkDerivation {
        pname = "too-many-cells";
-       version = "0.2.0.0";
-       sha256 = "05ky77q0smz27917zk6k4ladyf8vbg6biidjmfwx0y1mbsq50k4y";
+       version = "0.2.1.0";
+       sha256 = "06sp0c0db4xnik2c361q1g5x8alcfjz9fppxwzz8dbagqbdi110a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -238547,50 +239304,51 @@ self: {
      }) {};
 
   "toysolver" = callPackage
-    ({ mkDerivation, array, base, bytestring, bytestring-builder, clock
+    ({ mkDerivation, ansi-wl-pprint, array, base, bytestring
+     , bytestring-builder, bytestring-encoding, case-insensitive, clock
      , containers, criterion, data-default, data-default-class
      , data-interval, deepseq, directory, extended-reals, filepath
      , finite-field, ghc-prim, hashable, hashtables, haskeline, heaps
      , intern, lattices, log-domain, loop, megaparsec, mtl, multiset
-     , mwc-random, OptDir, parsec, prettyclass, primes, primitive
-     , process, pseudo-boolean, queue, QuickCheck, scientific
+     , mwc-random, OptDir, optparse-applicative, parsec, pretty, primes
+     , primitive, process, pseudo-boolean, queue, QuickCheck, scientific
      , semigroups, sign, stm, tasty, tasty-hunit, tasty-quickcheck
      , tasty-th, template-haskell, temporary, text, time, transformers
      , transformers-compat, unbounded-delays, unordered-containers
-     , vector, vector-space, xml-conduit
+     , vector, vector-space, xml-conduit, zlib
      }:
      mkDerivation {
        pname = "toysolver";
-       version = "0.5.0";
-       sha256 = "0dr34aknbh8p500zj4lcll5mi1km16jxyvjx1gdrp63csdfi1ich";
-       revision = "1";
-       editedCabalFile = "19qbl75mn7kwyvygwc0ad73vj4vkaj5mnkmwpx9mavwl7px2kzps";
+       version = "0.6.0";
+       sha256 = "0hd3rwbv8k62qnw9spwx6gl0j4syivvrigjcdgc53llbqzdjr0v1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         array base bytestring bytestring-builder clock containers
-         data-default-class data-interval deepseq extended-reals filepath
-         finite-field ghc-prim hashable hashtables heaps intern lattices
-         log-domain loop megaparsec mtl multiset mwc-random OptDir
-         prettyclass primes primitive process pseudo-boolean queue
-         scientific semigroups sign stm template-haskell temporary text time
-         transformers transformers-compat unordered-containers vector
-         vector-space xml-conduit
+         array base bytestring bytestring-builder bytestring-encoding
+         case-insensitive clock containers data-default-class data-interval
+         deepseq extended-reals filepath finite-field ghc-prim hashable
+         hashtables heaps intern lattices log-domain loop megaparsec mtl
+         multiset mwc-random OptDir pretty primes primitive process
+         pseudo-boolean queue scientific semigroups sign stm
+         template-haskell temporary text time transformers
+         transformers-compat unordered-containers vector vector-space
+         xml-conduit zlib
        ];
        executableHaskellDepends = [
-         array base bytestring bytestring-builder clock containers
-         data-default data-default-class directory filepath haskeline intern
-         megaparsec mtl mwc-random OptDir parsec process pseudo-boolean
-         scientific temporary text time transformers transformers-compat
+         ansi-wl-pprint array base bytestring bytestring-builder clock
+         containers data-default data-default-class directory filepath
+         haskeline intern megaparsec mtl mwc-random OptDir
+         optparse-applicative parsec process pseudo-boolean scientific
+         temporary text time transformers transformers-compat
          unbounded-delays vector
        ];
        testHaskellDepends = [
          array base bytestring bytestring-builder containers
          data-default-class data-interval deepseq finite-field hashable
-         intern lattices megaparsec mtl mwc-random OptDir parsec prettyclass
-         pseudo-boolean QuickCheck tasty tasty-hunit tasty-quickcheck
-         tasty-th text transformers transformers-compat unordered-containers
-         vector vector-space
+         intern lattices megaparsec mtl mwc-random OptDir parsec pretty
+         pseudo-boolean QuickCheck scientific tasty tasty-hunit
+         tasty-quickcheck tasty-th text transformers transformers-compat
+         unordered-containers vector vector-space
        ];
        benchmarkHaskellDepends = [
          array base criterion data-default-class vector
@@ -239785,8 +240543,9 @@ self: {
     ({ mkDerivation, base, template-haskell, tree-sitter }:
      mkDerivation {
        pname = "tree-sitter-java";
-       version = "0.2.0.1";
-       sha256 = "17dpqd3ddhgaiav332wzgiqzlx8rbnzziv7gal3mvjbz0nv78rk6";
+       version = "0.3.0.0";
+       sha256 = "0cxndrwzs1yfc2sgscxvckjd2hwaxqi4llpnfcdk0mb0la21xczg";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base template-haskell tree-sitter ];
        doHaddock = false;
        description = "Tree-sitter grammar/parser for Java";
@@ -240076,6 +240835,8 @@ self: {
        pname = "trie-simple";
        version = "0.4.1.1";
        sha256 = "0h3wfq4fjakkwvrv35l25709xv528h1c08cr754gvk4l8vqnk6k7";
+       revision = "1";
+       editedCabalFile = "09kzna10hdf2qjialdg6rql0w55si9db7sjd89l661sgidlbq7y0";
        libraryHaskellDepends = [ base containers deepseq mtl ];
        testHaskellDepends = [ base containers hspec QuickCheck vector ];
        benchmarkHaskellDepends = [
@@ -242904,8 +243665,8 @@ self: {
      }:
      mkDerivation {
        pname = "typesafe-precure";
-       version = "0.7.5.1";
-       sha256 = "0n2cnd15gwixk17jqcz4hxishikscwbcn2gnrkcz3a295ng68ins";
+       version = "0.7.6.1";
+       sha256 = "1sc74y1nqydshrycf309636f49h0nbc5bfiix991nxrv9grwslpi";
        libraryHaskellDepends = [
          aeson aeson-pretty autoexporter base bytestring dlist
          monad-skeleton template-haskell text th-data-compat
@@ -248614,6 +249375,42 @@ self: {
        broken = true;
      }) {};
 
+  "verismith" = callPackage
+    ({ mkDerivation, alex, array, base, binary, blaze-html, bytestring
+     , Cabal, cabal-doctest, criterion, cryptonite, deepseq, DRBG
+     , exceptions, fgl, fgl-visualize, filepath, gitrev, hedgehog, lens
+     , lifted-base, memory, monad-control, optparse-applicative, parsec
+     , prettyprinter, random, recursion-schemes, shakespeare, shelly
+     , statistics, tasty, tasty-hedgehog, tasty-hunit, template-haskell
+     , text, time, tomland, transformers, transformers-base
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "verismith";
+       version = "0.4.0.0";
+       sha256 = "1f2yzspw12slmhywvdnqfwzxn3v6qvzwgjm7lsjx72lb3611w4z3";
+       isLibrary = true;
+       isExecutable = true;
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         array base binary blaze-html bytestring cryptonite deepseq DRBG
+         exceptions fgl fgl-visualize filepath gitrev hedgehog lens
+         lifted-base memory monad-control optparse-applicative parsec
+         prettyprinter random recursion-schemes shakespeare shelly
+         statistics template-haskell text time tomland transformers
+         transformers-base unordered-containers vector
+       ];
+       libraryToolDepends = [ alex ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base fgl hedgehog lens parsec shakespeare tasty tasty-hedgehog
+         tasty-hunit text
+       ];
+       benchmarkHaskellDepends = [ base criterion lens ];
+       description = "Random verilog generation and simulator testing";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "versioning" = callPackage
     ({ mkDerivation, aeson, base, bytestring, hspec, semigroupoids }:
      mkDerivation {
@@ -250415,6 +251212,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wai-logger_2_3_6" = callPackage
+    ({ mkDerivation, base, byteorder, bytestring, Cabal, cabal-doctest
+     , doctest, fast-logger, http-types, network, wai
+     }:
+     mkDerivation {
+       pname = "wai-logger";
+       version = "2.3.6";
+       sha256 = "0hbm7if28p6qa36cgpyq6i569275si53z9gsl2g1z8x09z3xiyz2";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         base byteorder bytestring fast-logger http-types network wai
+       ];
+       testHaskellDepends = [ base doctest ];
+       description = "A logging system for WAI";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wai-logger-buffered" = callPackage
     ({ mkDerivation, base, bytestring, containers, data-default
      , http-types, time, wai, warp
@@ -251723,7 +252538,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "warp_3_3_2" = callPackage
+  "warp_3_3_3" = callPackage
     ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked
      , bytestring, case-insensitive, containers, directory, gauge
      , ghc-prim, hashable, hspec, http-client, http-date, http-types
@@ -251733,8 +252548,8 @@ self: {
      }:
      mkDerivation {
        pname = "warp";
-       version = "3.3.2";
-       sha256 = "1sh1jp27azf8zdzhaqg5ab8mky4wgdacwd5cd9zrk3dbbarkf94i";
+       version = "3.3.3";
+       sha256 = "0s01zj1j518ipf22wpyln7zri15qxmg5p198fsy9qwc84k08h19x";
        libraryHaskellDepends = [
          array async auto-update base bsb-http-chunked bytestring
          case-insensitive containers ghc-prim hashable http-date http-types
@@ -252568,23 +253383,22 @@ self: {
 
   "webby" = callPackage
     ({ mkDerivation, aeson, base-noprelude, binary, bytestring
-     , fast-logger, formatting, http-api-data, http-types, monad-logger
-     , relude, resourcet, tasty, tasty-hunit, tasty-quickcheck, text
-     , unliftio, unordered-containers, wai
+     , formatting, http-api-data, http-types, relude, resourcet, tasty
+     , tasty-hunit, tasty-quickcheck, text, unliftio
+     , unordered-containers, wai
      }:
      mkDerivation {
        pname = "webby";
-       version = "0.3.1";
-       sha256 = "05qz3h39nd3pxi000x00ynx5hf5v1yrxhwl0v4kb7sy1p0bhc3aa";
+       version = "0.4.0";
+       sha256 = "0cicjk07cg1fnj07nhlsgg6g1zndr36sinhic3cqjllaxxsmnqia";
        libraryHaskellDepends = [
-         aeson base-noprelude binary bytestring fast-logger formatting
-         http-api-data http-types monad-logger relude resourcet text
-         unliftio unordered-containers wai
+         aeson base-noprelude binary bytestring formatting http-api-data
+         http-types relude resourcet text unliftio unordered-containers wai
        ];
        testHaskellDepends = [
-         aeson base-noprelude binary bytestring fast-logger formatting
-         http-api-data http-types monad-logger relude resourcet tasty
-         tasty-hunit tasty-quickcheck text unliftio unordered-containers wai
+         aeson base-noprelude binary bytestring formatting http-api-data
+         http-types relude resourcet tasty tasty-hunit tasty-quickcheck text
+         unliftio unordered-containers wai
        ];
        description = "A super-simple web server framework";
        license = stdenv.lib.licenses.asl20;
@@ -253153,24 +253967,24 @@ self: {
      }) {};
 
   "websockets-simple" = callPackage
-    ({ mkDerivation, aeson, async, base, bytestring, exceptions
+    ({ mkDerivation, aeson, async, base, bytestring, chan, exceptions
      , extractable-singleton, hspec, monad-control-aligned, profunctors
-     , stm, tasty, tasty-hspec, transformers, vector, wai-transformers
+     , stm, tasty, tasty-hspec, text, transformers, wai-transformers
      , websockets
      }:
      mkDerivation {
        pname = "websockets-simple";
-       version = "0.1.3";
-       sha256 = "1nknnb7zmkcm377q9i9whcw4fd43q2nk5vla2yilr9lnp5g4gqr0";
+       version = "0.2.0";
+       sha256 = "1xcvrvv79vjhm3k026mszbqmgn65mnrm4aws213bx315pjavldg9";
        libraryHaskellDepends = [
-         aeson async base bytestring exceptions extractable-singleton
-         monad-control-aligned profunctors stm transformers vector
+         aeson async base bytestring chan exceptions extractable-singleton
+         monad-control-aligned profunctors stm text transformers
          wai-transformers websockets
        ];
        testHaskellDepends = [
-         aeson async base bytestring exceptions extractable-singleton hspec
-         monad-control-aligned profunctors stm tasty tasty-hspec
-         transformers vector wai-transformers websockets
+         aeson async base bytestring chan exceptions extractable-singleton
+         hspec monad-control-aligned profunctors stm tasty tasty-hspec text
+         transformers wai-transformers websockets
        ];
        description = "Composable websockets clients";
        license = stdenv.lib.licenses.bsd3;
@@ -253759,6 +254573,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wild-bind-x11_0_2_0_8" = callPackage
+    ({ mkDerivation, async, base, containers, fold-debounce, hspec, mtl
+     , semigroups, stm, text, time, transformers, wild-bind, X11
+     }:
+     mkDerivation {
+       pname = "wild-bind-x11";
+       version = "0.2.0.8";
+       sha256 = "1qrh7rkmwfmwlkfn0nqvml2ljx7ai8c6rl1fkdi7vjchxvmb0139";
+       libraryHaskellDepends = [
+         base containers fold-debounce mtl semigroups stm text transformers
+         wild-bind X11
+       ];
+       testHaskellDepends = [
+         async base hspec text time transformers wild-bind X11
+       ];
+       description = "X11-specific implementation for WildBind";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wilton-ffi" = callPackage
     ({ mkDerivation, aeson, base, bytestring, utf8-string }:
      mkDerivation {
@@ -256907,6 +257741,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "xml-lens_0_2" = callPackage
+    ({ mkDerivation, base, case-insensitive, containers, lens, text
+     , xml-conduit
+     }:
+     mkDerivation {
+       pname = "xml-lens";
+       version = "0.2";
+       sha256 = "1jvi8xcsvwzvh44karnsp9br6bfn59s5vhizwycg4fi7ljhm8fm3";
+       libraryHaskellDepends = [
+         base case-insensitive containers lens text xml-conduit
+       ];
+       description = "Lenses, traversals, and prisms for xml-conduit";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "xml-monad" = callPackage
     ({ mkDerivation, base, mtl, transformers, transformers-compose, xml
      }:
@@ -257475,6 +258325,8 @@ self: {
        pname = "xmonad-contrib";
        version = "0.15";
        sha256 = "0r9yzgy67j4mi3dyxx714f0ssk5qzca5kh4zw0fhiz1pf008cxms";
+       revision = "1";
+       editedCabalFile = "15r1mlqs1axh1dp4fqqb54xj3zns47nrvlf2xp5jg5jq51z03xpf";
        libraryHaskellDepends = [
          base bytestring containers directory extensible-exceptions filepath
          mtl old-locale old-time process random semigroups unix utf8-string
@@ -257592,6 +258444,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "xmonad-extras_0_15_2" = callPackage
+    ({ mkDerivation, alsa-mixer, base, bytestring, containers, hint
+     , libmpd, mtl, network, regex-posix, X11, xmonad, xmonad-contrib
+     }:
+     mkDerivation {
+       pname = "xmonad-extras";
+       version = "0.15.2";
+       sha256 = "1p20zc5k0s05ic2jjx01x0mx88y369dvq2ad43sfjbyf95msi7ls";
+       configureFlags = [
+         "-f-with_hlist" "-fwith_parsec" "-fwith_split"
+       ];
+       libraryHaskellDepends = [
+         alsa-mixer base bytestring containers hint libmpd mtl network
+         regex-posix X11 xmonad xmonad-contrib
+       ];
+       description = "Third party extensions for xmonad with wacky dependencies";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "xmonad-screenshot" = callPackage
     ({ mkDerivation, base, gtk, xmonad }:
      mkDerivation {
@@ -260533,6 +261405,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-newsfeed_1_7_0_0" = callPackage
+    ({ mkDerivation, base, blaze-html, blaze-markup, bytestring
+     , containers, shakespeare, text, time, xml-conduit, yesod-core
+     }:
+     mkDerivation {
+       pname = "yesod-newsfeed";
+       version = "1.7.0.0";
+       sha256 = "0g7n99zsrfinal2kcmrfyj3gcxrd390az93yz3c1kxzd5w1ffb4g";
+       libraryHaskellDepends = [
+         base blaze-html blaze-markup bytestring containers shakespeare text
+         time xml-conduit yesod-core
+       ];
+       description = "Helper functions and data types for producing News feeds";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-paginate" = callPackage
     ({ mkDerivation, base, template-haskell, yesod }:
      mkDerivation {
-- 
GitLab


From 23ea4f8738f55607db29851f4950137cde725080 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 6 Oct 2019 10:43:50 +0200
Subject: [PATCH 2112/2254] haskell-glib: patch to fix the build

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 1ddc15a2ca4..7316d5758a0 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1228,4 +1228,12 @@ self: super: {
   # The LTS-14.x version of optparse-applicative is too old.
   cabal-plan = super.cabal-plan.override { optparse-applicative = self.optparse-applicative_0_15_1_0; };
 
+  # https://github.com/gtk2hs/gtk2hs/issues/276
+  glib = appendPatch super.glib (pkgs.fetchpatch {
+    url = https://github.com/gtk2hs/gtk2hs/pull/282.patch;
+    name = "undefine-gcc-attribute-syntax";
+    sha256 = "1s72s683p2n5ri1a030zywciq0020ms64cmsy48axndp6dp9vri7";
+    stripLen = 1;
+  });
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
-- 
GitLab


From fba182f944f2bb92a58014256d012231faa46a9e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 6 Oct 2019 11:39:18 +0200
Subject: [PATCH 2113/2254] ghc-8.8.x: clean up existing overrides

---
 .../configuration-ghc-8.8.x.nix               | 69 +++++--------------
 1 file changed, 19 insertions(+), 50 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index cc047e0abc1..c843e426c44 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -46,6 +46,7 @@ self: super: {
   async = doJailbreak super.async;
   cabal-install = doJailbreak super.cabal-install;
   ChasingBottoms = doJailbreak super.ChasingBottoms;
+  chell = doJailbreak super.chell;
   cryptohash-sha256 = doJailbreak super.cryptohash-sha256;
   Diff = dontCheck super.Diff;
   doctest = doJailbreak super.doctest;
@@ -64,41 +65,29 @@ self: super: {
   test-framework = doJailbreak super.test-framework;
   th-expand-syns = doJailbreak super.th-expand-syns;
 
+  # use latest version to fix the build
+  hackage-db = self.hackage-db_2_1_0;
+  lens = self.lens_4_18_1;
+  memory = self.memory_0_15_0;
+  microlens = self.microlens_0_4_11_2;
+  optparse-applicative = self.optparse-applicative_0_15_1_0;
+  primitive = dontCheck super.primitive_0_7_0_0;  # evaluating the test suite gives an infinite recursion
+  regex-base = self.regex-base_0_94_0_0;
+  regex-pcre-builtin = self.regex-pcre-builtin_0_95_1_1_8_43;
+  regex-posix = self.regex-posix_0_96_0_0;
+  shelly = self.shelly_1_9_0;
+  string-qq = self.string-qq_0_0_4;
+  tls = self.tls_1_5_1;
+  vector-th-unbox = self.vector-th-unbox_0_2_1_7;
+  X11 = self.X11_1_9_1;
+  xmonad-contrib = self.xmonad-contrib_0_16;
+
   # These packages don't work and need patching and/or an update.
-  primitive = overrideSrc (doJailbreak super.primitive) {
-    version = "20180530-git";
-    src = pkgs.fetchFromGitHub {
-      owner = "haskell";
-      repo = "primitive";
-      rev = "97964182881aa0419546e0bb188b2d17e4468324";
-      sha256 = "1p1pinca33vd10iy7hl20c1fc99vharcgcai6z3ngqbq50k2pd3q";
-    };
-  };
-  vector-th-unbox = appendPatch (doJailbreak super.vector-th-unbox) (pkgs.fetchpatch {
-    url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/vector-th-unbox-0.2.1.6.patch";
-    sha256 = "0169yf9ms1g5mmkc5l6hpffzm34zdrqdng4df02nbdmfgba45h19";
-  });
-  regex-base = overrideCabal (appendPatch super.regex-base (pkgs.fetchpatch {
-    url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-base-0.93.2.patch";
-    sha256 = "01d1plrdx6hcspwn2h6y9pyi5366qk926vb5cl5qcl6x4m23l6y1";
-  })) (drv: {
-    preConfigure = "sed -i -e 's/base >=4 && < 4.13,/base,/' regex-base.cabal";
-  });
-  regex-posix = overrideCabal (appendPatch super.regex-posix (pkgs.fetchpatch {
-    url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-posix-0.95.2.patch";
-    sha256 = "006yli58jpqp786zm1xlncjsilc38iv3a09r4pv94l587sdzasd2";
-  })) (drv: {
-    preConfigure = "sed -i -e 's/base >= 4 && < 4.13/base/' regex-posix.cabal";
-  });
-  optparse-applicative = appendPatch (doJailbreak super.optparse-applicative) (pkgs.fetchpatch {
-    url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/optparse-applicative-0.14.3.0.patch";
-    sha256 = "068sjj98jqiq3h8h03mg4w2pa11q8lxkx2i4lmxivq77xyhlwq3y";
-  });
   hackage-security = appendPatch (doJailbreak super.hackage-security) (pkgs.fetchpatch {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/hackage-security-0.5.3.0.patch";
     sha256 = "0l8x0pbsn18fj5ak5q0g5rva4xw1s9yc4d86a1pfyaz467b9i5a4";
   });
-  regex-tdfa = appendPatch super.regex-tdfa (pkgs.fetchpatch {
+  regex-tdfa = appendPatch (doJailbreak super.regex-tdfa) (pkgs.fetchpatch {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-tdfa-1.2.3.1.patch";
     sha256 = "1lhas4s2ms666prb475gaw2bqw1v4y8cxi66sy20j727sx7ppjs7";
   });
@@ -111,9 +100,6 @@ self: super: {
     sha256 = "01b2gnsq0x4fd9na8zpk6pajym55mbz64hgzawlwxdw0y6681kr5";
   });
   foundation = dontCheck super.foundation;
-  chell = overrideCabal (doJailbreak super.chell) (_drv: {
-    broken = false;
-  });
   haskell-src-meta = appendPatch (dontCheck (doJailbreak super.haskell-src-meta)) (pkgs.fetchpatch {
     url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/haskell-src-meta-0.8.3.patch";
     sha256 = "1asl932mibr5y057xx8v1a7n3qy87lcnclsfh8pbxq1m3iwjkxy8";
@@ -131,12 +117,6 @@ self: super: {
     sha256 = "1v40gmnw4lqyk271wngdwz8whpfdhmza58srbkka8icwwwrck3l5";
   });
 
-  # don't use obsolete "defaultUserHooks" in Setup.hs
-  X11 = appendPatch super.X11 (pkgs.fetchpatch {
-    url = "https://github.com/xmonad/X11/commit/8d817617afa1b54e6c50a9cc552dc1c0804c1794.patch";
-    sha256 = "0zsgzn0nvdxvqi5z0za3gzlhql2x5d5cr0kkr19j5c67fy177w6b";
-  });
-
   # https://github.com/sol/hpack/issues/371
   hpack = appendPatch super.hpack (pkgs.fetchpatch {
     url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/hpack-0.32.0.patch";
@@ -152,15 +132,4 @@ self: super: {
   easytest_0_3 = markBroken super.easytest_0_3;
   haskell-src = markBrokenVersion "1.0.3.0" super.haskell-src;
 
-  # use latest version to fix the build
-  hackage-db = self.hackage-db_2_1_0;
-  lens = self.lens_4_18_1;
-  memory = self.memory_0_15_0;
-  microlens = self.microlens_0_4_11_2;
-  regex-pcre-builtin = self.regex-pcre-builtin_0_95_0_8_8_35;
-  shelly = self.shelly_1_9_0;
-  string-qq = self.string-qq_0_0_4;
-  tls = self.tls_1_5_1;
-  xmonad-contrib = self.xmonad-contrib_0_16;
-
 }
-- 
GitLab


From 63faef32e67d4a610ec6ce451c31141926b14834 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 6 Oct 2019 12:42:08 +0200
Subject: [PATCH 2114/2254] haskell-pango: patch to fix the build

---
 .../haskell-modules/configuration-common.nix   | 18 +++++++++---------
 .../haskell-modules/configuration-nix.nix      |  6 ++++++
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 7316d5758a0..748e7fa7d35 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -691,13 +691,8 @@ self: super: {
   # We get lots of strange compiler errors during the test suite run.
   jsaddle = dontCheck super.jsaddle;
 
-  # Tools that use gtk2hs-buildtools now depend on them in a custom-setup stanza
-  cairo = addBuildTool super.cairo self.buildHaskellPackages.gtk2hs-buildtools;
-  pango = disableHardening (addBuildTool super.pango self.buildHaskellPackages.gtk2hs-buildtools) ["fortify"];
-  gtk =
-    if pkgs.stdenv.isDarwin
-    then appendConfigureFlag super.gtk "-fhave-quartz-gtk"
-    else super.gtk;
+  # Enable have-quartz-gtk flag on Darwin.
+  gtk = if pkgs.stdenv.isDarwin then appendConfigureFlag super.gtk "-fhave-quartz-gtk" else super.gtk;
 
   # https://github.com/Philonous/hs-stun/pull/1
   # Remove if a version > 0.1.0.1 ever gets released.
@@ -1230,10 +1225,15 @@ self: super: {
 
   # https://github.com/gtk2hs/gtk2hs/issues/276
   glib = appendPatch super.glib (pkgs.fetchpatch {
-    url = https://github.com/gtk2hs/gtk2hs/pull/282.patch;
-    name = "undefine-gcc-attribute-syntax";
+    url = https://github.com/gtk2hs/gtk2hs/pull/282/commits/4bb428e144ef2de9390f0f2239dcc50b7fc9a259.patch;
     sha256 = "1s72s683p2n5ri1a030zywciq0020ms64cmsy48axndp6dp9vri7";
     stripLen = 1;
   });
+  # https://github.com/gtk2hs/gtk2hs/issues/276
+  pango = appendPatch super.pango (pkgs.fetchpatch {
+    url = https://github.com/gtk2hs/gtk2hs/pull/282/commits/0a6016e89ce98415bb395ca0cfafeaacf3b3fce6.patch;
+    sha256 = "1n9spriinyif4h1h9mfj9k87b80kcs39qlym5yxnxxg0yszqqcpc";
+    stripLen = 1;
+  });
 
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 81662b4e9da..ad7c1917097 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -605,4 +605,10 @@ self: super: builtins.intersectAttrs super {
   hadolint = overrideCabal super.hadolint (drv: {
     preConfigure = "sed -i -e /ld-options:/d hadolint.cabal";
   });
+
+  # gtk2hs-buildtools is listed in setupHaskellDepends, but we
+  # need it during the build itself, too.
+  cairo = addBuildTool super.cairo self.buildHaskellPackages.gtk2hs-buildtools;
+  pango = disableHardening (addBuildTool super.pango self.buildHaskellPackages.gtk2hs-buildtools) ["fortify"];
+
 }
-- 
GitLab


From 7233426fe291e1bc5ca7fe172513689a7e1c6469 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 6 Oct 2019 20:53:29 +0200
Subject: [PATCH 2115/2254] haskell-regex-tdfa: use latest version when
 compiling with ghc-8.8.1

---
 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index c843e426c44..e6568a56c7c 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -75,6 +75,7 @@ self: super: {
   regex-base = self.regex-base_0_94_0_0;
   regex-pcre-builtin = self.regex-pcre-builtin_0_95_1_1_8_43;
   regex-posix = self.regex-posix_0_96_0_0;
+  regex-tdfa = self.regex-tdfa_1_3_0;
   shelly = self.shelly_1_9_0;
   string-qq = self.string-qq_0_0_4;
   tls = self.tls_1_5_1;
@@ -87,10 +88,6 @@ self: super: {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/hackage-security-0.5.3.0.patch";
     sha256 = "0l8x0pbsn18fj5ak5q0g5rva4xw1s9yc4d86a1pfyaz467b9i5a4";
   });
-  regex-tdfa = appendPatch (doJailbreak super.regex-tdfa) (pkgs.fetchpatch {
-    url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-tdfa-1.2.3.1.patch";
-    sha256 = "1lhas4s2ms666prb475gaw2bqw1v4y8cxi66sy20j727sx7ppjs7";
-  });
   socks = appendPatch (doJailbreak super.socks) (pkgs.fetchpatch {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/socks-0.6.0.patch";
     sha256 = "1dsqmx0sw62x4glh43c0sbizd2y00v5xybiqadn96v6pmfrap5cp";
-- 
GitLab


From 261482e243d2b2dcb58301c908c66908bbff4925 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Oct 2019 14:03:16 +0200
Subject: [PATCH 2116/2254] haskell-gtk3: apply patch to fix the build

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 748e7fa7d35..441bbc493d7 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1229,11 +1229,15 @@ self: super: {
     sha256 = "1s72s683p2n5ri1a030zywciq0020ms64cmsy48axndp6dp9vri7";
     stripLen = 1;
   });
-  # https://github.com/gtk2hs/gtk2hs/issues/276
   pango = appendPatch super.pango (pkgs.fetchpatch {
     url = https://github.com/gtk2hs/gtk2hs/pull/282/commits/0a6016e89ce98415bb395ca0cfafeaacf3b3fce6.patch;
     sha256 = "1n9spriinyif4h1h9mfj9k87b80kcs39qlym5yxnxxg0yszqqcpc";
     stripLen = 1;
   });
+  gtk3 = appendPatch super.gtk3 (pkgs.fetchpatch {
+    url = https://github.com/gtk2hs/gtk2hs/pull/282/commits/cc0d8e8ef9bdffc776182a1f92225750bfea8f57.patch;
+    sha256 = "175zs694d04d7jfj8xq33rizw38bc3ninr00n26jyrg39vgkmc5j";
+    stripLen = 1;
+  });
 
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
-- 
GitLab


From 6ef33275b8413b58a7f5f919689cf7cba4dfa1bd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Oct 2019 14:03:57 +0200
Subject: [PATCH 2117/2254] haskell-gio: apply patch to fix the build

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 441bbc493d7..53c71230f63 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1239,5 +1239,10 @@ self: super: {
     sha256 = "175zs694d04d7jfj8xq33rizw38bc3ninr00n26jyrg39vgkmc5j";
     stripLen = 1;
   });
+  gio = appendPatch super.gio (pkgs.fetchpatch {
+    url = https://github.com/gtk2hs/gtk2hs/pull/282/commits/f0f7cf524f1beaf227d8cce140abdf7c45efc8c6.patch;
+    sha256 = "1fadmibpk0q38fzp6a8ss6b1kh7v5d5mw3s9i45cd4dsg86hqb0i";
+    stripLen = 1;
+  });
 
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
-- 
GitLab


From 6d95c7b595ac61191211975e13f764329f7e73f9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Oct 2019 14:09:43 +0200
Subject: [PATCH 2118/2254] haskell-gtk: clean up our existing overrides

---
 pkgs/development/haskell-modules/configuration-common.nix | 3 ---
 pkgs/development/haskell-modules/configuration-nix.nix    | 6 +++++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 53c71230f63..c89ac81d82e 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -691,9 +691,6 @@ self: super: {
   # We get lots of strange compiler errors during the test suite run.
   jsaddle = dontCheck super.jsaddle;
 
-  # Enable have-quartz-gtk flag on Darwin.
-  gtk = if pkgs.stdenv.isDarwin then appendConfigureFlag super.gtk "-fhave-quartz-gtk" else super.gtk;
-
   # https://github.com/Philonous/hs-stun/pull/1
   # Remove if a version > 0.1.0.1 ever gets released.
   stunclient = overrideCabal super.stunclient (drv: {
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index ad7c1917097..bcc7bb31386 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -167,7 +167,11 @@ self: super: builtins.intersectAttrs super {
   gio = disableHardening (addPkgconfigDepend (addBuildTool super.gio self.buildHaskellPackages.gtk2hs-buildtools) pkgs.glib) ["fortify"];
   glib = disableHardening (addPkgconfigDepend (addBuildTool super.glib self.buildHaskellPackages.gtk2hs-buildtools) pkgs.glib) ["fortify"];
   gtk3 = disableHardening (super.gtk3.override { inherit (pkgs) gtk3; }) ["fortify"];
-  gtk = disableHardening (addPkgconfigDepend (addBuildTool super.gtk self.buildHaskellPackages.gtk2hs-buildtools) pkgs.gtk2) ["fortify"];
+  gtk = let gtk1 = addBuildTool super.gtk self.buildHaskellPackages.gtk2hs-buildtools;
+            gtk2 = addPkgconfigDepend gtk1 pkgs.gtk2;
+            gtk3 = disableHardening gtk1 ["fortify"];
+            gtk4 = if pkgs.stdenv.isDarwin then appendConfigureFlag gtk3 "-fhave-quartz-gtk" else gtk4;
+        in gtk3;
   gtksourceview2 = addPkgconfigDepend super.gtksourceview2 pkgs.gtk2;
   gtk-traymanager = addPkgconfigDepend super.gtk-traymanager pkgs.gtk3;
 
-- 
GitLab


From 56e1ea32f4d07d2b02a45be7d1eabef861e3d0d8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Oct 2019 14:25:07 +0200
Subject: [PATCH 2119/2254] haskell-gtk: apply patch to fix the build

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index c89ac81d82e..70cb7dcf3c5 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1241,5 +1241,11 @@ self: super: {
     sha256 = "1fadmibpk0q38fzp6a8ss6b1kh7v5d5mw3s9i45cd4dsg86hqb0i";
     stripLen = 1;
   });
+  gtk = appendPatch super.gtk (pkgs.fetchpatch {
+    url = https://github.com/gtk2hs/gtk2hs/pull/282/commits/a09720ae8fdc2f9391ba88308312e42d091a4f88.patch;
+    sha256 = "12ja6sprzl9si51rng8s2xx66ihpm6d6p00qi5czkpkrhr0457n7";
+    stripLen = 1;
+    postFetch = "sed -i -e s,gtk.cabal-renamed,gtk.cabal, $out";
+  });
 
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
-- 
GitLab


From f760f0ef486815bf7d7223773addc35952d270b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Mon, 7 Oct 2019 20:44:42 +0200
Subject: [PATCH 2120/2254] Revert "Merge #67232: machinectl compliant NixOS
 installation"

This reverts commit 66967ec7521d065f605795d64ddbbbd4fcd448c3, reversing
changes made to fb6595eafdb90ef0bc7a31c2bfc9204e4cad11d9.
Fixes #70442; discussion: https://github.com/NixOS/nixpkgs/pull/70027
---
 .../installing-nspawn-container.xml           | 37 -------------
 nixos/doc/manual/installation/installing.xml  |  3 --
 .../modules/installer/tools/nixos-install.sh  |  3 +-
 .../system/activation/activation-script.nix   |  7 ---
 .../virtualisation/container-config.nix       |  2 +-
 nixos/tests/all-tests.nix                     |  1 -
 nixos/tests/systemd-machinectl.nix            | 52 -------------------
 7 files changed, 2 insertions(+), 103 deletions(-)
 delete mode 100644 nixos/doc/manual/installation/installing-nspawn-container.xml
 delete mode 100644 nixos/tests/systemd-machinectl.nix

diff --git a/nixos/doc/manual/installation/installing-nspawn-container.xml b/nixos/doc/manual/installation/installing-nspawn-container.xml
deleted file mode 100644
index ae893c53c90..00000000000
--- a/nixos/doc/manual/installation/installing-nspawn-container.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-         version="5.0"
-         xml:id="sec-installing-nspawn-container">
- <title>Installing into a nspawn container</title>
-
- <para>
-  For installing a NixOS into a systemd nspawn container the NixOS installation tools are needed.
-  If you run another distribution than NixOS on your host,
-  please follow <xref linkend="sec-installing-from-other-distro"/> steps 1, 2, and 3.
- </para>
-
- <para>
-  Create a NixOS configuration file <filename>/var/lib/machines/my-container/etc/nixos/configuration.nix</filename>.
-  It is important that the container root file system is under <filename>/var/lib/machines</filename>.
-  This is the standard location where <command>machinectl</command> will look for containers.
-  If you choose place the root into another location you need to start the container directly with <command>systemd-nspawn</command>.
-  The file needs to have at least following options enabled:
-<programlisting>
-<xref linkend="opt-boot.isContainer"/> = true;
-<xref linkend="opt-boot.loader.initScript.enable"/> = true;
-</programlisting>
-  If your host uses <command>systemd-networkd</command> to configure the network,
-  you can also enable <xref linkend="opt-networking.useNetworkd"/> to use networkd default network configuration for your host and container.
- </para>
-
- <para>
-  Install the container by running following command:
-   <screen>nixos-install --root /var/lib/machines/my-container \
-     --no-channel-copy --no-root-passwd --no-bootloader</screen>
- </para>
-
- <para>
-  Start the container by running following command:
-  <screen>machinectl start my-container</screen>
- </para>
-
-</section>
diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml
index 270372022fa..f1e1568c034 100644
--- a/nixos/doc/manual/installation/installing.xml
+++ b/nixos/doc/manual/installation/installing.xml
@@ -563,8 +563,5 @@ Retype new UNIX password: ***</screen>
   <xi:include href="installing-from-other-distro.xml" />
 
   <xi:include href="installing-behind-a-proxy.xml" />
-
-  <xi:include href="installing-nspawn-container.xml" />
-
  </section>
 </chapter>
diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh
index be3b5c0687a..8685cb345e1 100644
--- a/nixos/modules/installer/tools/nixos-install.sh
+++ b/nixos/modules/installer/tools/nixos-install.sh
@@ -132,9 +132,8 @@ if [[ -z $noBootLoader ]]; then
     echo "installing the boot loader..."
     # Grub needs an mtab.
     ln -sfn /proc/mounts $mountPoint/etc/mtab
-    export NIXOS_INSTALL_BOOTLOADER=1
+    NIXOS_INSTALL_BOOTLOADER=1 nixos-enter --root "$mountPoint" -- /run/current-system/bin/switch-to-configuration boot
 fi
-nixos-enter --root "$mountPoint" -- /run/current-system/bin/switch-to-configuration boot
 
 # Ask the user to set a root password, but only if the passwd command
 # exists (i.e. when mutable user accounts are enabled).
diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix
index 2f716f92c62..ddfd1af4a31 100644
--- a/nixos/modules/system/activation/activation-script.nix
+++ b/nixos/modules/system/activation/activation-script.nix
@@ -184,14 +184,7 @@ in
         find /var/empty -mindepth 1 -delete
         chmod 0555 /var/empty
         chown root:root /var/empty
-
-        ${ # reasons for not setting immutable flag:
-           # 1. flag is not changeable inside a container
-           # 2. systemd-nspawn can not perform chown in case of --private-users-chown
-           #    then the owner is nobody and ssh will not start
-          optionalString (!config.boot.isContainer) ''
         ${pkgs.e2fsprogs}/bin/chattr -f +i /var/empty || true
-          ''}
       '';
 
     system.activationScripts.usrbinenv = if config.environment.usrbinenv != null
diff --git a/nixos/modules/virtualisation/container-config.nix b/nixos/modules/virtualisation/container-config.nix
index adb2f78a0a6..f7a37d8c9f3 100644
--- a/nixos/modules/virtualisation/container-config.nix
+++ b/nixos/modules/virtualisation/container-config.nix
@@ -11,7 +11,7 @@ with lib;
     services.udisks2.enable = mkDefault false;
     powerManagement.enable = mkDefault false;
 
-    networking.useHostResolvConf = mkDefault (!config.services.resolved.enable);
+    networking.useHostResolvConf = mkDefault true;
 
     # Containers should be light-weight, so start sshd on demand.
     services.openssh.startWhenNeeded = mkDefault true;
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 2c6c3a42970..5643da99e55 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -262,7 +262,6 @@ in
   syncthing-relay = handleTest ./syncthing-relay.nix {};
   systemd = handleTest ./systemd.nix {};
   systemd-confinement = handleTest ./systemd-confinement.nix {};
-  systemd-machinectl = handleTest ./systemd-machinectl.nix {};
   systemd-timesyncd = handleTest ./systemd-timesyncd.nix {};
   systemd-networkd-wireguard = handleTest ./systemd-networkd-wireguard.nix {};
   pdns-recursor = handleTest ./pdns-recursor.nix {};
diff --git a/nixos/tests/systemd-machinectl.nix b/nixos/tests/systemd-machinectl.nix
deleted file mode 100644
index 091f855d043..00000000000
--- a/nixos/tests/systemd-machinectl.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-import ./make-test.nix (let
-
-  container = { ... }: {
-    boot.isContainer = true;
-
-    # use networkd to obtain systemd network setup
-    networking.useNetworkd = true;
-
-    # systemd-nspawn expects /sbin/init
-    boot.loader.initScript.enable = true;
-
-    imports = [ ../modules/profiles/minimal.nix ];
-  };
-
-  containerSystem = (import ../lib/eval-config.nix {
-    modules = [ container ];
-  }).config.system.build.toplevel;
-
-  containerName = "container";
-  containerRoot = "/var/lib/machines/${containerName}";
-
-in {
-  name = "systemd-machinectl";
-
-  machine = { lib, ... }: {
-    # use networkd to obtain systemd network setup
-    networking.useNetworkd = true;
-
-    # open DHCP server on interface to container
-    networking.firewall.trustedInterfaces = [ "ve-+" ];
-
-    # do not try to access cache.nixos.org
-    nix.binaryCaches = lib.mkForce [];
-
-    virtualisation.pathsInNixDB = [ containerSystem ];
-  };
-
-  testScript = ''
-    startAll;
-
-    $machine->waitForUnit("default.target");
-    $machine->succeed("mkdir -p ${containerRoot}");
-    $machine->succeed("nixos-install --root ${containerRoot} --system ${containerSystem} --no-channel-copy --no-root-passwd --no-bootloader");
-
-    $machine->succeed("machinectl start ${containerName}");
-    $machine->waitUntilSucceeds("systemctl -M ${containerName} is-active default.target");
-    $machine->succeed("ping -n -c 1 ${containerName}");
-    $machine->succeed("test `stat ${containerRoot}/var/empty -c %u%g` != 00");
-
-    $machine->succeed("machinectl stop ${containerName}");
-  '';
-})
-- 
GitLab


From 16a0e7d3f011d4a3b61fa0689e99dc36f8329f7c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 7 Oct 2019 12:14:31 -0700
Subject: [PATCH 2121/2254] nmon: 16k -> 16m

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/nmon/versions
---
 pkgs/os-specific/linux/nmon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/nmon/default.nix b/pkgs/os-specific/linux/nmon/default.nix
index cb6dd4ab946..9de18401d7b 100644
--- a/pkgs/os-specific/linux/nmon/default.nix
+++ b/pkgs/os-specific/linux/nmon/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "nmon";
-  version = "16k";
+  version = "16m";
 
   src = fetchurl {
     url = "mirror://sourceforge/nmon/lmon${version}.c";
-    sha256 = "17nbxrnl7kqiaaxn2hwyi65gphbl3wybbyp9vri2q5ifdis3ssib";
+    sha256 = "1hazgrq3m01dzv05639yis1mypcp0jf167n9gqwd3wgxzm2lvv9b";
   };
 
   buildInputs = [ ncurses ];
-- 
GitLab


From 02eca5f31e4c126980be29b1f85c9330437959ea Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Mon, 7 Oct 2019 23:15:20 +0200
Subject: [PATCH 2122/2254] wlroots: 0.8.0 -> 0.8.1

Changelog: https://github.com/swaywm/wlroots/releases/tag/0.8.1
---
 pkgs/development/libraries/wlroots/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix
index 520acea292d..54464ffd4b6 100644
--- a/pkgs/development/libraries/wlroots/default.nix
+++ b/pkgs/development/libraries/wlroots/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "wlroots";
-  version = "0.8.0";
+  version = "0.8.1";
 
   src = fetchFromGitHub {
     owner = "swaywm";
     repo = "wlroots";
     rev = version;
-    sha256 = "0w3lfzczry5zk7x2kxdb8anb4bymsby6h1i2gc0w2f8hgx4m2b9x";
+    sha256 = "1ak86kx617c81dy85wg9rldy1z3n8ch93cjc05a4j6sifv0nkyfm";
   };
 
   # $out for the library and $examples for the example programs (in examples):
-- 
GitLab


From 3fadbf84033b76f9650e9be47fc363cd02051198 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 7 Oct 2019 04:02:07 -0700
Subject: [PATCH 2123/2254] intel-media-sdk: 19.1.0 -> 19.2.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/intel-media-sdk/versions
---
 pkgs/development/libraries/intel-media-sdk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/intel-media-sdk/default.nix b/pkgs/development/libraries/intel-media-sdk/default.nix
index 67bee86bfa9..a411d06ab8f 100644
--- a/pkgs/development/libraries/intel-media-sdk/default.nix
+++ b/pkgs/development/libraries/intel-media-sdk/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "intel-media-sdk";
-  version = "19.1.0";
+  version = "19.2.1";
 
   src = fetchurl {
     url = "https://github.com/Intel-Media-SDK/MediaSDK/archive/intel-mediasdk-${version}.tar.gz";
-    sha256 = "1gligrg6khzmwcy6miikljj75hhxqy0a95qzc8m61ipx5c8igdpv";
+    sha256 = "0w3r6lr2q3kch0vz9sxld1nz6iff129xr8wzg0p2j7mng41imh83";
   };
 
   # patchelf is needed for binaries in $out/share/samples
-- 
GitLab


From 66b338d2c8cc4e08c4f78b83f19227dc70b48ba6 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 7 Oct 2019 17:51:49 -0400
Subject: [PATCH 2124/2254] linux: 4.14.147 -> 4.14.148

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index 1e28f20758f..5c07f84ca82 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.14.147";
+  version = "4.14.148";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "04jvp05spszcxmkdsl21dylbcf76ns9bwxf1zlk4x7cxiil97mwg";
+    sha256 = "1b8ggknvaidsvqnzpgbcmz3ybys9a8jm8iq6aqcnqfp10d0bglhj";
   };
 } // (args.argsOverride or {}))
-- 
GitLab


From 3eeea86ac344062ef3b6e5d167e9c888884495d4 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 7 Oct 2019 17:52:45 -0400
Subject: [PATCH 2125/2254] linux: 4.19.77 -> 4.19.78

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix
index c5b81717d6d..b12127d349b 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.19.77";
+  version = "4.19.78";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1agksl35amjzc6g6d9zjwz6p5qir2cligb5c1d9s2bag9766jav1";
+    sha256 = "0jah57k3q7b674dr544cniwhya667d8h7x9k5886d1g2qrvylqyz";
   };
 } // (args.argsOverride or {}))
-- 
GitLab


From efe13de995bed6cbcbad3c3ce93baed19ef797c3 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 7 Oct 2019 17:53:10 -0400
Subject: [PATCH 2126/2254] linux: 4.4.195 -> 4.4.196

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index 99f2b219165..65ee9634ba4 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.4.195";
+  version = "4.4.196";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1dilaz0ghmkml10cvzzpz7ivcx9d8d6fpb76vmixcg634w2jx962";
+    sha256 = "0vd7fra22ky4sqp6vamracp5xd4900md5vdx0n4i6dhkf03kz7hn";
   };
 } // (args.argsOverride or {}))
-- 
GitLab


From 59dc2fa757abb458aaac87b1a35156b3cd3bdc3b Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 7 Oct 2019 17:53:31 -0400
Subject: [PATCH 2127/2254] linux: 4.9.195 -> 4.9.196

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index 299fce9eab4..c9e72a3264b 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.9.195";
+  version = "4.9.196";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0s4xj8f1dpnz3fbrqmgwq02smhcrq1ni8hgn2bbfqvm15lm5dgjl";
+    sha256 = "1vy6j9ycl5aw0dmj4n9kih5i8igybk0ilahlwbn30mlp9aq15az0";
   };
 } // (args.argsOverride or {}))
-- 
GitLab


From 3610e490b34375eb142e1100f7117a2dc1030c9e Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 7 Oct 2019 17:54:00 -0400
Subject: [PATCH 2128/2254] linux: 5.2.19 -> 5.2.20

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

diff --git a/pkgs/os-specific/linux/kernel/linux-5.2.nix b/pkgs/os-specific/linux/kernel/linux-5.2.nix
index 315c8caaf59..6db0c8471df 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.2.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.2.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.2.19";
+  version = "5.2.20";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "12mi857lyd5vj8qhj2f505hqnwzsnd829hxd78n9kk88iv1f966y";
+    sha256 = "0sddasxka08c1qjhbd9w4z7rzprfly2i67q4iwppbldngi4y48di";
   };
 } // (args.argsOverride or {}))
-- 
GitLab


From 0482c461da819aeb4029e2224c20ccaa931a6e80 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 7 Oct 2019 17:54:26 -0400
Subject: [PATCH 2129/2254] linux: 5.3.4 -> 5.3.5

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

diff --git a/pkgs/os-specific/linux/kernel/linux-5.3.nix b/pkgs/os-specific/linux/kernel/linux-5.3.nix
index 61b7b7b58be..5d5624af2da 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.3.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.3.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.3.4";
+  version = "5.3.5";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "0vi4bgcr921z5l6fbcrcgmhaji5gl2avpmp7njna6v0f7sxism0r";
+    sha256 = "1w2k3q6q9cf3r27z084c9nsxh49bq4cvky39pp6dp3r9zif8rvc0";
   };
 } // (args.argsOverride or {}))
-- 
GitLab


From 0cf6a5035932023c324bfda301b89190801c3f30 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 7 Oct 2019 18:01:57 -0400
Subject: [PATCH 2130/2254] oh-my-zsh: 2019-10-03 -> 2019-10-07

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

diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix
index c732723b30f..927964a13f0 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -4,13 +4,13 @@
 { stdenv, fetchgit }:
 
 stdenv.mkDerivation rec {
-  version = "2019-10-03";
+  version = "2019-10-07";
   pname = "oh-my-zsh";
-  rev = "3848102a5ec8534cef935d594c6abcbfc0f419c8";
+  rev = "7e842cddc45b8bdebe1b198e83eb96fd07b37787";
 
   src = fetchgit { inherit rev;
     url = "https://github.com/robbyrussell/oh-my-zsh";
-    sha256 = "07bkw0517sghgfvjnahiscyjj15zalarprwh6gn380z4czqhfcp4";
+    sha256 = "0caz1yq2rcj08414lcn2k3dgi2v4g8hvchnsxddcbsa8fbl5iis3";
   };
 
   pathsToLink = [ "/share/oh-my-zsh" ];
-- 
GitLab


From 5d65335e4a3534a586c30b45b7e1c3c4cdb71ab6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 7 Oct 2019 15:48:52 -0700
Subject: [PATCH 2131/2254] padthv1: 0.9.9 -> 0.9.10

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/padthv1/versions
---
 pkgs/applications/audio/padthv1/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/padthv1/default.nix b/pkgs/applications/audio/padthv1/default.nix
index b424bce2433..49e40bad0be 100644
--- a/pkgs/applications/audio/padthv1/default.nix
+++ b/pkgs/applications/audio/padthv1/default.nix
@@ -2,11 +2,11 @@
 
 mkDerivation rec {
   pname = "padthv1";
-  version = "0.9.9";
+  version = "0.9.10";
 
   src = fetchurl {
     url = "mirror://sourceforge/padthv1/${pname}-${version}.tar.gz";
-    sha256 = "0axansxwa3vfc1n6a7jbaqyz6wmsffi37i4ggsl08gmqywz255xb";
+    sha256 = "07gpq31a9iwk79yzndqzmw7snap7s4ifnsc4mfwkdga2zx13z0rx";
   };
 
   buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftw ];
-- 
GitLab


From b81de296fbefd585143f223ed86a3c33a6a03d6a Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 7 Oct 2019 21:37:17 +0200
Subject: [PATCH 2132/2254] pythonPackages.devpi-common: 3.3.2 -> 3.4.0

---
 .../python-modules/devpi-common/default.nix         | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/devpi-common/default.nix b/pkgs/development/python-modules/devpi-common/default.nix
index 6bdda6ac5ea..72db5d1b0ec 100644
--- a/pkgs/development/python-modules/devpi-common/default.nix
+++ b/pkgs/development/python-modules/devpi-common/default.nix
@@ -1,16 +1,21 @@
-{ lib, buildPythonPackage, fetchPypi, requests, py, pytest, pytest-flakes }:
+{ lib, buildPythonPackage, fetchPypi
+, requests
+, py
+, pytest
+, pytest-flake8
+}:
 
 buildPythonPackage rec {
   pname = "devpi-common";
-  version = "3.3.2";
+  version = "3.4.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2c7a6471c0f5b07ac9257adec3b3c3a89193ee672fdeb0a6f29487dc9d675e0c";
+    sha256 = "1pfl29pnfn120rqv3zwxc22i1hyywwg60rcck9hzxsllbhmfbjqh";
   };
 
   propagatedBuildInputs = [ requests py ];
-  checkInputs = [ pytest pytest-flakes ];
+  checkInputs = [ pytest pytest-flake8 ];
 
   checkPhase = ''
     py.test
-- 
GitLab


From f5692937cea6bc00be10c2594c30fbbe2a8f880b Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sun, 15 Sep 2019 15:30:10 -0500
Subject: [PATCH 2133/2254] setxkbmap: 1.3.1 -> 1.3.2

https://lists.x.org/archives/xorg-announce/2019-July/003007.html
---
 pkgs/servers/x11/xorg/default.nix   | 6 +++---
 pkgs/servers/x11/xorg/tarballs.list | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index e752f3ad834..a7c78d3fce2 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1288,11 +1288,11 @@ lib.makeScope newScope (self: with self; {
   }) {};
 
   setxkbmap = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libxkbfile }: stdenv.mkDerivation {
-    name = "setxkbmap-1.3.1";
+    name = "setxkbmap-1.3.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/setxkbmap-1.3.1.tar.bz2;
-      sha256 = "1qfk097vjysqb72pq89h0la3462kbb2dh1d11qzs2fr67ybb7pd9";
+      url = mirror://xorg/individual/app/setxkbmap-1.3.2.tar.bz2;
+      sha256 = "1xdrxs65v7d0rw1yaz0vsz55w4hxym99216p085ya9978j379wlg";
     };
     hardeningDisable = [ "bindnow" "relro" ];
     nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 05b035197c1..ccd1b7b74d6 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -20,7 +20,7 @@ mirror://xorg/individual/app/listres-1.0.4.tar.bz2
 mirror://xorg/individual/app/mkfontscale-1.2.1.tar.bz2
 mirror://xorg/individual/app/oclock-1.0.4.tar.bz2
 mirror://xorg/individual/app/sessreg-1.1.2.tar.bz2
-mirror://xorg/individual/app/setxkbmap-1.3.1.tar.bz2
+mirror://xorg/individual/app/setxkbmap-1.3.2.tar.bz2
 mirror://xorg/individual/app/smproxy-1.0.6.tar.bz2
 mirror://xorg/individual/app/transset-1.0.2.tar.bz2
 mirror://xorg/individual/app/twm-1.0.10.tar.bz2
-- 
GitLab


From 27605cebae4c8a8e2703f6cedc24d92059acbf7f Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Tue, 8 Oct 2019 01:44:48 +0200
Subject: [PATCH 2134/2254] mumble/murmur: Fix .override not working

Unfortunately there's no pkgs.libsForQt5.callPackages, which we need here to
get .override attributes on all derivation attributes. It's also
non-trivial to add it without duplicating code.

So instead just use standard pkgs.callPackages and pass refer to qt libs
through pkgs.qt5
---
 pkgs/applications/networking/mumble/default.nix | 12 ++++++------
 pkgs/top-level/all-packages.nix                 |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index 44a83a028f5..b3d945710f0 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, pkgconfig, mkDerivation
-, qtbase, qttools, qtsvg, qmake, avahi, boost, libopus, libsndfile, protobuf, speex, libcap
+{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, pkgconfig, qt5
+, avahi, boost, libopus, libsndfile, protobuf, speex, libcap
 , alsaLib, python
 , jackSupport ? false, libjack2 ? null
 , speechdSupport ? false, speechd ? null
@@ -14,12 +14,12 @@ assert iceSupport -> zeroc-ice != null;
 
 with stdenv.lib;
 let
-  generic = overrides: source: mkDerivation (source // overrides // {
+  generic = overrides: source: qt5.mkDerivation (source // overrides // {
     name = "${overrides.type}-${source.version}";
 
     patches = (source.patches or []) ++ optional jackSupport ./mumble-jack-support.patch;
 
-    nativeBuildInputs = [ pkgconfig python qmake ]
+    nativeBuildInputs = [ pkgconfig python qt5.qmake ]
       ++ (overrides.nativeBuildInputs or [ ]);
 
     buildInputs = [ boost protobuf avahi ]
@@ -72,8 +72,8 @@ let
   client = source: generic {
     type = "mumble";
 
-    nativeBuildInputs = [ qttools ];
-    buildInputs = [ libopus libsndfile speex qtsvg ]
+    nativeBuildInputs = [ qt5.qttools ];
+    buildInputs = [ libopus libsndfile speex qt5.qtsvg ]
       ++ optional stdenv.isLinux alsaLib
       ++ optional jackSupport libjack2
       ++ optional speechdSupport speechd
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 59cd01d0119..d30c04902f3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19672,13 +19672,13 @@ in
 
   multimon-ng = callPackage ../applications/radio/multimon-ng { };
 
-  murmur = (libsForQt5.callPackage ../applications/networking/mumble {
+  murmur = (callPackages ../applications/networking/mumble {
       avahi = avahi-compat;
       pulseSupport = config.pulseaudio or false;
       iceSupport = config.murmur.iceSupport or true;
     }).murmur;
 
-  mumble = (libsForQt5.callPackage ../applications/networking/mumble {
+  mumble = (callPackages ../applications/networking/mumble {
       avahi = avahi-compat;
       jackSupport = config.mumble.jackSupport or false;
       speechdSupport = config.mumble.speechdSupport or false;
-- 
GitLab


From a009dcdb2732ca914e13f3c9ae48a6e32adc5dce Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 4 Oct 2019 22:43:56 -0500
Subject: [PATCH 2135/2254] qtpass: 1.3.0 -> 1.3.1

https://github.com/IJHack/QtPass/releases/tag/v1.3.1
---
 pkgs/applications/misc/qtpass/default.nix | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix
index 1fccada4200..dbeff8a6c17 100644
--- a/pkgs/applications/misc/qtpass/default.nix
+++ b/pkgs/applications/misc/qtpass/default.nix
@@ -1,31 +1,22 @@
-{ stdenv, lib, mkDerivation, fetchFromGitHub, fetchpatch
+{ stdenv, lib, mkDerivation, fetchFromGitHub
 , git, gnupg, pass, qtbase, qtsvg, qttools, qmake
 }:
 
 mkDerivation rec {
   pname = "qtpass";
-  version = "1.3.0";
+  version = "1.3.1";
 
   src = fetchFromGitHub {
     owner  = "IJHack";
     repo   = "QtPass";
     rev    = "v${version}";
-    sha256 = "0v3ca4fdjk6l24vc9wlc0i7r6fdj85kjmnb7jvicd3f8xi9mvhnv";
+    sha256 = "025sdk4fq71jgfs54zj7ssgvlci8vvjkqdckgbwz0nqrynlljy08";
   };
 
   buildInputs = [ git gnupg pass qtbase qtsvg qttools ];
 
   nativeBuildInputs = [ qmake ];
 
-  # Fix missing app icon on Wayland. Has been upstreamed and should be safe to
-  # remove in versions > 1.3.0
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/IJHack/QtPass/commit/aba8c4180f0ab3d66c44f88b21f137b19d17bde8.patch";
-      sha256 = "009bcq0d75khmaligzd7736xdzy6a8s1m9dgqybn70h801h92fcr";
-    })
-  ];
-
   enableParallelBuilding = true;
 
   qtWrapperArgs = [
-- 
GitLab


From 7d733bbc862383dac8e33bc505aeb58eff0db65e Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 4 Oct 2019 22:57:55 -0500
Subject: [PATCH 2136/2254] qtpass: point to lupdate

---
 pkgs/applications/misc/qtpass/default.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix
index dbeff8a6c17..d6b319e1abe 100644
--- a/pkgs/applications/misc/qtpass/default.nix
+++ b/pkgs/applications/misc/qtpass/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, mkDerivation, fetchFromGitHub
+{ lib, mkDerivation, fetchFromGitHub
 , git, gnupg, pass, qtbase, qtsvg, qttools, qmake
 }:
 
@@ -13,12 +13,17 @@ mkDerivation rec {
     sha256 = "025sdk4fq71jgfs54zj7ssgvlci8vvjkqdckgbwz0nqrynlljy08";
   };
 
-  buildInputs = [ git gnupg pass qtbase qtsvg qttools ];
+  buildInputs = [ git gnupg pass qtbase qtsvg ];
 
-  nativeBuildInputs = [ qmake ];
+  nativeBuildInputs = [ qmake qttools ];
 
   enableParallelBuilding = true;
 
+  qmakeFlags = [
+    # setup hook only sets QMAKE_LRELEASE, set QMAKE_LUPDATE too:
+    "QMAKE_LUPDATE=${qttools.dev}/bin/lupdate"
+  ];
+
   qtWrapperArgs = [
     "--suffix PATH : ${lib.makeBinPath [ git gnupg pass ]}"
   ];
@@ -28,7 +33,7 @@ mkDerivation rec {
     install -D artwork/icon.svg $out/share/icons/hicolor/scalable/apps/qtpass-icon.svg
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A multi-platform GUI for pass, the standard unix password manager";
     homepage = https://qtpass.org;
     license = licenses.gpl3;
-- 
GitLab


From a6ab41fdfeb63d53d5c74960c6e4634547b1ed74 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 4 Oct 2019 23:04:16 -0500
Subject: [PATCH 2137/2254] qtpass: install man page

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

diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix
index d6b319e1abe..d2dd308b2c9 100644
--- a/pkgs/applications/misc/qtpass/default.nix
+++ b/pkgs/applications/misc/qtpass/default.nix
@@ -29,8 +29,9 @@ mkDerivation rec {
   ];
 
   postInstall = ''
-    install -D qtpass.desktop $out/share/applications/qtpass.desktop
+    install -D qtpass.desktop -t $out/share/applications
     install -D artwork/icon.svg $out/share/icons/hicolor/scalable/apps/qtpass-icon.svg
+    install -D qtpass.1 -t $out/share/man/man1
   '';
 
   meta = with lib; {
-- 
GitLab


From 6362fecff6b5fd6faeb99be2fcea875219ab1779 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 4 Oct 2019 23:08:51 -0500
Subject: [PATCH 2138/2254] qtpass: add pwgen as optional runtime dep

---
 pkgs/applications/misc/qtpass/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix
index d2dd308b2c9..e6e0860f7ec 100644
--- a/pkgs/applications/misc/qtpass/default.nix
+++ b/pkgs/applications/misc/qtpass/default.nix
@@ -1,5 +1,6 @@
 { lib, mkDerivation, fetchFromGitHub
-, git, gnupg, pass, qtbase, qtsvg, qttools, qmake
+, git, gnupg, pass, pwgen
+, qtbase, qtsvg, qttools, qmake
 }:
 
 mkDerivation rec {
@@ -25,7 +26,7 @@ mkDerivation rec {
   ];
 
   qtWrapperArgs = [
-    "--suffix PATH : ${lib.makeBinPath [ git gnupg pass ]}"
+    "--suffix PATH : ${lib.makeBinPath [ git gnupg pass pwgen ]}"
   ];
 
   postInstall = ''
-- 
GitLab


From 3c3c9013d5dd0dc10bff697b89d2464284790ac2 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Mon, 7 Oct 2019 20:00:00 -0500
Subject: [PATCH 2139/2254] procs: 0.8.9 -> 0.8.11

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

diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix
index 85333ca78f8..b2d173d5aab 100644
--- a/pkgs/tools/admin/procs/default.nix
+++ b/pkgs/tools/admin/procs/default.nix
@@ -4,16 +4,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "procs";
-  version = "0.8.9";
+  version = "0.8.11";
 
   src = fetchFromGitHub {
     owner = "dalance";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0gqbdk4gaxkpval52fsravjgvqz6c9zh1ahry57a2p6kszw96n13";
+    sha256 = "1bds84r5qw1chqd92rlijn4arqaywc5x4yjss3523ka55w3mphmf";
   };
 
-  cargoSha256 = "1k0yl03rxbv009gb2jkc0f7mjq3pzc9bf8hppk2w9xicxpq6l55c";
+  cargoSha256 = "11djms4rj3a1fs6f091gli32w6kww77n0072p0hwvqmc9yy1x57w";
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
 
-- 
GitLab


From c26d471660214cb67197ac309063888830b5f25d Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Mon, 7 Oct 2019 20:00:00 -0500
Subject: [PATCH 2140/2254] terraform: 0.12.9 -> 0.12.10

Changelog: https://github.com/hashicorp/terraform/releases/tag/v0.12.10
---
 pkgs/applications/networking/cluster/terraform/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index ec452a312e4..e0bc882c422 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -97,8 +97,8 @@ in rec {
   terraform_0_11-full = terraform_0_11.full;
 
   terraform_0_12 = pluggable (generic {
-    version = "0.12.9";
-    sha256 = "14js4n08rg30y0jrm0na79syglpb64cb7cxys0x3w47pcbgymrka";
+    version = "0.12.10";
+    sha256 = "0bmqcmzjsrpvvnd9pn40f774c8jy6j810qz0njxqh60yh27f5rhx";
     patches = [ ./provider-path.patch ];
     passthru = { inherit plugins; };
   });
-- 
GitLab


From ca903a46bda85ad149f0baf077b66d61f9f7fed0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 7 Oct 2019 19:36:52 -0700
Subject: [PATCH 2141/2254] prosody: 0.11.2 -> 0.11.3

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/prosody/versions
---
 pkgs/servers/xmpp/prosody/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix
index 549b55705c4..8becdcd6a45 100644
--- a/pkgs/servers/xmpp/prosody/default.nix
+++ b/pkgs/servers/xmpp/prosody/default.nix
@@ -14,12 +14,12 @@ with stdenv.lib;
 
 
 stdenv.mkDerivation rec {
-  version = "0.11.2"; # also update communityModules
+  version = "0.11.3"; # also update communityModules
   pname = "prosody";
 
   src = fetchurl {
     url = "https://prosody.im/downloads/source/${pname}-${version}.tar.gz";
-    sha256 = "0ca8ivqb4hxqka08pwnaqi1bqxrdl8zw47g6z7nw9q5r57fgc4c9";
+    sha256 = "11xz4milv2962qf75vrdwsvd8sy2332nf69202rmvz5989pvvnng";
   };
 
   # A note to all those merging automated updates: Please also update this
-- 
GitLab


From 44beea948408dae6b8eb23d52501f9a37fd87760 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 7 Oct 2019 05:51:12 +0000
Subject: [PATCH 2142/2254] =?UTF-8?q?epiphany:=203.34.0=20=E2=86=92=203.34?=
 =?UTF-8?q?.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix
index d583e8d1f87..bfcf01591e5 100644
--- a/pkgs/desktops/gnome-3/core/epiphany/default.nix
+++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix
@@ -34,11 +34,11 @@
 
 stdenv.mkDerivation rec {
   pname = "epiphany";
-  version = "3.34.0";
+  version = "3.34.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/epiphany/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "04wxnz8i0wbg21lqll2gqaa5j17f4vxqzgwgc7b0nylqi9pyd8bb";
+    sha256 = "1nf1pqv3pdgrlq7fbic06rl3731dx5ihpfsphpai9grcmnbwjyx0";
   };
 
   # Tests need an X display
-- 
GitLab


From 99f16160994015896f9f1260998b1d48e8b0c90a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 7 Oct 2019 05:51:20 +0000
Subject: [PATCH 2143/2254] =?UTF-8?q?gnome3.geary:=203.34.0=20=E2=86=92=20?=
 =?UTF-8?q?3.34.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix
index 870ff56e570..787bdd97ebf 100644
--- a/pkgs/desktops/gnome-3/misc/geary/default.nix
+++ b/pkgs/desktops/gnome-3/misc/geary/default.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   pname = "geary";
-  version = "3.34.0";
+  version = "3.34.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1cxpyjgfrai423vwqc6jv4aqadxkd3ghh2had71drilyywy5bx64";
+    sha256 = "1bx57g8199pcqh1p90dlnca2g1kpyrifr6g8m1rdjmpm2a1r993v";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From c390e86aedb6af6741380ab35478abed98c71355 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 7 Oct 2019 05:51:24 +0000
Subject: [PATCH 2144/2254] =?UTF-8?q?gnome3.accerciser:=203.34.0=20?=
 =?UTF-8?q?=E2=86=92=203.34.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/apps/accerciser/default.nix
index a2556492bb6..ca4a38fb7b2 100644
--- a/pkgs/desktops/gnome-3/apps/accerciser/default.nix
+++ b/pkgs/desktops/gnome-3/apps/accerciser/default.nix
@@ -17,13 +17,13 @@
 
  python3.pkgs.buildPythonApplication rec {
   name = "accerciser-${version}";
-  version = "3.34.0";
+  version = "3.34.1";
 
   format = "other";
 
   src = fetchurl {
     url = "mirror://gnome/sources/accerciser/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1npl1pxqrij9dsmp70ralcfbjbw503jsz2pqm3qjwyba5cf6kcbm";
+    sha256 = "1awf7fcm52r23s51gllyybhywf2kljqkaw4znblajph9sawnfs3l";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From 8f2f12e08e4f00e94483d2f83ffbfa959a97092b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 7 Oct 2019 05:51:38 +0000
Subject: [PATCH 2145/2254] =?UTF-8?q?gnome3.gnome-calendar:=203.34.0=20?=
 =?UTF-8?q?=E2=86=92=203.34.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
index ec09b856f30..f1c2c7617b8 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
@@ -4,13 +4,13 @@
 
 let
   pname = "gnome-calendar";
-  version = "3.34.0";
+  version = "3.34.1";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0gbiqsx3pny2blgfwazy82fbrnn17yilm3rvv1aq8k5w0xd9147b";
+    sha256 = "1qlh7vx5v4mys3rhpaczngpg0zp8apachnz2j9h3ab7ywcippm7y";
   };
 
   passthru = {
-- 
GitLab


From 86dd9b76cd7196ecb62260cc1784a0cea8b71cf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 7 Oct 2019 05:51:45 +0000
Subject: [PATCH 2146/2254] =?UTF-8?q?gnome3.gnome-control-center:=203.34.0?=
 =?UTF-8?q?.1=20=E2=86=92=203.34.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
index b87980f6b65..f94725eb3a6 100644
--- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
@@ -67,11 +67,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-control-center";
-  version = "3.34.0.1";
+  version = "3.34.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1jr3bbpycdzk26b83fsxw1my0aldi86v0733k42y4x45vacaanqa";
+    sha256 = "0pji9r8b81w3dl08frzxknrmhlyrh8xkdicf4iic8dj1apayr0jz";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From 1fe0f526401e7d1835154576a0685ebc3b3ff634 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 7 Oct 2019 20:32:34 -0700
Subject: [PATCH 2147/2254] python37Packages.azure-mgmt-storage: 4.0.0 -> 4.1.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-azure-mgmt-storage/versions
---
 .../development/python-modules/azure-mgmt-storage/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/pkgs/development/python-modules/azure-mgmt-storage/default.nix
index b8b39292e5f..d056a7ad598 100644
--- a/pkgs/development/python-modules/azure-mgmt-storage/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-storage/default.nix
@@ -7,13 +7,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "4.0.0";
+  version = "4.1.0";
   pname = "azure-mgmt-storage";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "1kxd30s2axn3g4qx3v7q3d5l744a29xlfk3q06ra0rqm1p6prvgv";
+    sha256 = "1src3ki3xd8x0m6vmxig6y4lg7w4mg0sz6vmnsxdk8mxaird03jj";
   };
 
   postInstall = if isPy3k then "" else ''
-- 
GitLab


From 0b1eed91e2269c4cf8615a76892dc4453f43d8ac Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 7 Oct 2019 20:51:59 -0700
Subject: [PATCH 2148/2254] python37Packages.cgen: 2017.1 -> 2019.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-cgen/versions
---
 pkgs/development/python-modules/cgen/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cgen/default.nix b/pkgs/development/python-modules/cgen/default.nix
index e0317249fe9..f6cf985349b 100644
--- a/pkgs/development/python-modules/cgen/default.nix
+++ b/pkgs/development/python-modules/cgen/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "cgen";
-  version = "2017.1";
+  version = "2019.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a04525d51ee975d37d590d6d82bf80a46e77f75187cccfd2248a89616a778795";
+    sha256 = "04gxzfjy2f9qsg3scg1sx4q4rhw5p036dyqngxyfsai0wvj5ya6m";
   };
 
   checkInputs = [ pytest ];
-- 
GitLab


From 5253be5a186780469b39081cd5da513af6591600 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 7 Oct 2019 19:52:11 -0700
Subject: [PATCH 2149/2254] python37Packages.azure-mgmt-compute: 5.0.0 -> 8.0.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-azure-mgmt-compute/versions
---
 .../development/python-modules/azure-mgmt-compute/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/pkgs/development/python-modules/azure-mgmt-compute/default.nix
index 3df307242cf..1713ca65405 100644
--- a/pkgs/development/python-modules/azure-mgmt-compute/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-compute/default.nix
@@ -7,13 +7,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "5.0.0";
+  version = "8.0.0";
   pname = "azure-mgmt-compute";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "1zdypc8f825n60341ai2482rwgsc7l8dpr691j8hqz571l80y85w";
+    sha256 = "06hmf9iq2yqpmmvw7pr9zm4v427q03i436lnin3aczizfndrk76i";
   };
 
   postInstall = if isPy3k then "" else ''
-- 
GitLab


From 6fd2133ac5ea712fc840e31fa9eed89b9e68c706 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 7 Oct 2019 20:54:36 -0700
Subject: [PATCH 2150/2254] python37Packages.colorcet: 2.0.1 -> 2.0.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-colorcet/versions
---
 pkgs/development/python-modules/colorcet/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/colorcet/default.nix b/pkgs/development/python-modules/colorcet/default.nix
index b877c4cabd5..4ae6dd8e479 100644
--- a/pkgs/development/python-modules/colorcet/default.nix
+++ b/pkgs/development/python-modules/colorcet/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "colorcet";
-  version = "2.0.1";
+  version = "2.0.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ab1d16aba97f54af190631c7777c356b04b53de549672ff6b01c66d716eddff3";
+    sha256 = "1vkx00im4s6zhr2m1j9r0a5vmhkl488b4xpzxb1pidbl19wi6j2i";
   };
 
   propagatedBuildInputs = [
-- 
GitLab


From a6534965e931713fda6f40a3de7e284890d39847 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 7 Oct 2019 19:08:29 -0700
Subject: [PATCH 2151/2254] python37Packages.ansible-runner: 1.3.4 -> 1.4.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-ansible-runner/versions
---
 pkgs/development/python-modules/ansible-runner/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ansible-runner/default.nix b/pkgs/development/python-modules/ansible-runner/default.nix
index 56850dcf86e..79b1d8fcc97 100644
--- a/pkgs/development/python-modules/ansible-runner/default.nix
+++ b/pkgs/development/python-modules/ansible-runner/default.nix
@@ -13,11 +13,11 @@
 
 buildPythonPackage rec {
   pname = "ansible-runner";
-  version = "1.3.4";
+  version = "1.4.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "087jk00kv0qsqqspyn015nicvbl627wck3fgx2qhqawvrgqk3xb0";
+    sha256 = "1j3jisiy93026ivd28j0c3p2j7ij6zm2k765yjknfx2gg3m5pk14";
   };
 
   checkInputs = [ pytest mock ];
-- 
GitLab


From e8a8ad192bd0943e4fd7b3136093076c6ea9a250 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 7 Oct 2019 16:36:56 -0700
Subject: [PATCH 2152/2254] pagemon: 0.01.16 -> 0.01.17

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/pagemon/versions
---
 pkgs/os-specific/linux/pagemon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/pagemon/default.nix b/pkgs/os-specific/linux/pagemon/default.nix
index 5d7357cb838..772ef56cde2 100644
--- a/pkgs/os-specific/linux/pagemon/default.nix
+++ b/pkgs/os-specific/linux/pagemon/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   pname = "pagemon";
-  version = "0.01.16";
+  version = "0.01.17";
 
   src = fetchFromGitHub {
-    sha256 = "0fpxjw6sg6r9r7yy03brri37wmmc32rhzayzlmwgmzay8rifmm7i";
+    sha256 = "11r84nwjvnjyxc3jqhbvlgb89ajfj7v8212mz61dq5ilq5k7xa3d";
     rev = "V${version}";
     repo = "pagemon";
     owner = "ColinIanKing";
-- 
GitLab


From acfef2ea91da653452776c2b35efbdd01d625dc5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 7 Oct 2019 20:16:42 -0700
Subject: [PATCH 2153/2254] povray: 3.7.0.8 -> 3.8.0-x.10064738

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/povray/versions
---
 pkgs/tools/graphics/povray/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/povray/default.nix b/pkgs/tools/graphics/povray/default.nix
index d2042540d71..ead44897968 100644
--- a/pkgs/tools/graphics/povray/default.nix
+++ b/pkgs/tools/graphics/povray/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "povray";
-  version = "3.7.0.8";
+  version = "3.8.0-x.10064738";
 
   src = fetchFromGitHub {
     owner = "POV-Ray";
     repo = "povray";
     rev = "v${version}";
-    sha256 = "1q114n4m3r7qy3yn954fq7p46rg7ypdax5fazxr9yj1jklf1lh6z";
+    sha256 = "0hy5a3q5092szk2x3s9lpn1zkszgq9bp15rxzdncxlvnanyzsasf";
   };
 
 
-- 
GitLab


From bd43751712196535faa4c1a91ca1d618cc898f28 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 7 Oct 2019 15:46:00 -0500
Subject: [PATCH 2154/2254] cbatticon: 1.6.9 -> 1.6.10

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

diff --git a/pkgs/applications/misc/cbatticon/default.nix b/pkgs/applications/misc/cbatticon/default.nix
index 44612644359..e506829b575 100644
--- a/pkgs/applications/misc/cbatticon/default.nix
+++ b/pkgs/applications/misc/cbatticon/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cbatticon";
-  version = "1.6.9";
+  version = "1.6.10";
 
   src = fetchFromGitHub {
     owner = "valr";
     repo = pname;
     rev = version;
-    sha256 = "0kw09d678sd3m18fmi4380sl4a2m5lkfmq0kps16cdmq7z80rvaf";
+    sha256 = "0ivm2dzhsa9ir25ry418r2qg2llby9j7a6m3arbvq5c3kaj8m9jr";
   };
 
   nativeBuildInputs = [ pkgconfig gettext ];
-- 
GitLab


From 959d30326313fefaec66d9c4b52215e81902b771 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 7 Oct 2019 11:21:47 -0700
Subject: [PATCH 2155/2254] mpop: 1.4.5 -> 1.4.6

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mpop/versions
---
 pkgs/applications/networking/mpop/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mpop/default.nix b/pkgs/applications/networking/mpop/default.nix
index 7d311d4bc70..2cdfd19067f 100644
--- a/pkgs/applications/networking/mpop/default.nix
+++ b/pkgs/applications/networking/mpop/default.nix
@@ -4,11 +4,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "mpop";
-  version = "1.4.5";
+  version = "1.4.6";
 
   src = fetchurl {
     url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz";
-    sha256 = "1m6743j8g777lijvxqw2wz6pv2g5a9wlh6zq7awk0hvd44xp4sav";
+    sha256 = "0q4ifzvl1gcndvqqqk7n9mc599r4s2knxjc7alflwb366fql58gv";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From 9651b3e2b1bd8a326fb2e388f273ecf9cfcb8110 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 7 Oct 2019 11:26:23 -0700
Subject: [PATCH 2156/2254] msmtp: 1.8.5 -> 1.8.6

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/msmtp/versions
---
 pkgs/applications/networking/msmtp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix
index fc720a047b5..6ebc3e66491 100644
--- a/pkgs/applications/networking/msmtp/default.nix
+++ b/pkgs/applications/networking/msmtp/default.nix
@@ -9,11 +9,11 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "msmtp";
-  version = "1.8.5";
+  version = "1.8.6";
 
   src = fetchurl {
     url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz";
-    sha256 = "0fczpfxlr62wkr7bwhp24clxg962k5khgz14h818qyy4v77dl4qn";
+    sha256 = "1qa260xrm0fzlwxpjvgvq39m4dfkskjlyb7m4y2vlr8c8d3z29b6";
   };
 
   patches = [
-- 
GitLab


From c23f0c051046385e9106b50a515bf7d9eda0e1f3 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Mon, 7 Oct 2019 13:18:10 +0200
Subject: [PATCH 2157/2254] whois: 5.5.1 -> 5.5.2

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

diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix
index b6c03c08cff..b0564ad7c74 100644
--- a/pkgs/tools/networking/whois/default.nix
+++ b/pkgs/tools/networking/whois/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, perl, gettext, pkgconfig, libidn2, libiconv }:
 
 stdenv.mkDerivation rec {
-  version = "5.5.1";
+  version = "5.5.2";
   pname = "whois";
 
   src = fetchFromGitHub {
     owner = "rfc1036";
     repo = "whois";
     rev = "v${version}";
-    sha256 = "05dbc58dgq5ln28pahififljdb19gqicwlcmnni0vw4ny4r7r9bg";
+    sha256 = "0587xvw0ifjrwxgisw0nfx7qykmkly1knfdghrpph9vicpzwsidw";
   };
 
   nativeBuildInputs = [ perl gettext pkgconfig ];
-- 
GitLab


From aea94e1b160cfb68b9ddbabff0b1388c9bcc95a3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 7 Oct 2019 01:54:54 -0700
Subject: [PATCH 2158/2254] gdcm: 3.0.1 -> 3.0.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/gdcm/versions
---
 pkgs/development/libraries/gdcm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix
index 29a30a1b157..2b5dabd7abf 100644
--- a/pkgs/development/libraries/gdcm/default.nix
+++ b/pkgs/development/libraries/gdcm/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, cmake, vtk, darwin }:
 
 stdenv.mkDerivation rec {
-  version = "3.0.1";
+  version = "3.0.2";
   pname = "gdcm";
 
   src = fetchurl {
     url = "mirror://sourceforge/gdcm/${pname}-${version}.tar.bz2";
-    sha256 = "1n206rr28f9ysd5yns6hc6vxwhwj1ck59p2j1wqyclm60zr84isq";
+    sha256 = "1kvgyci5wjsn16lwjriml10ci8h1a5ixygzcnif9c29xamxrbaif";
   };
 
   dontUseCmakeBuildDir = true;
-- 
GitLab


From 5a471eaca543816155c49ee9a9807d4ad1cbdad1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 7 Oct 2019 02:23:15 -0700
Subject: [PATCH 2159/2254] geany: 1.35 -> 1.36

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/geany/versions
---
 pkgs/applications/editors/geany/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix
index a30a8f70224..1e1a817f092 100644
--- a/pkgs/applications/editors/geany/default.nix
+++ b/pkgs/applications/editors/geany/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 let
-  version = "1.35";
+  version = "1.36";
 in
 
 stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://download.geany.org/${pname}-${version}.tar.bz2";
-    sha256 = "179xfnvhcxsv54v2mlrhykqv2j7klniln5sffvqqpjmdvwyivvim";
+    sha256 = "0gnm17cr4rf3pmkf0axz4a0fxwnvp55ji0q0lzy88yqbshyxv14i";
   };
 
   nativeBuildInputs = [ pkgconfig intltool libintl ];
-- 
GitLab


From 460bb4a4360fa46b5f0ab477348e01f7d396dcb1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 6 Oct 2019 21:44:03 -0700
Subject: [PATCH 2160/2254] debootstrap: 1.0.115 -> 1.0.116

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/debootstrap/versions
---
 pkgs/tools/misc/debootstrap/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix
index ec594de0c34..da810b3c9d8 100644
--- a/pkgs/tools/misc/debootstrap/default.nix
+++ b/pkgs/tools/misc/debootstrap/default.nix
@@ -15,13 +15,13 @@ let binPath = stdenv.lib.makeBinPath [
   ];
 in stdenv.mkDerivation rec {
   pname = "debootstrap";
-  version = "1.0.115";
+  version = "1.0.116";
 
   src = fetchurl {
     # git clone git://git.debian.org/d-i/debootstrap.git
     # I'd like to use the source. However it's lacking the lanny script ? (still true?)
     url = "mirror://debian/pool/main/d/${pname}/${pname}_${version}.tar.gz";
-    sha256 = "1s6ln7r6y91f0xmzbf9x4yx53hzcpiaa76i9dbmpy0ibw1ji30g4";
+    sha256 = "06gh7hks8flpg327wnrwwmp7h9s6knz2kk794s5wpd91iwnjfcyb";
   };
 
   nativeBuildInputs = [ makeWrapper ];
-- 
GitLab


From 86e68d02b35ab2277f7acffd58ac1fee2af8d86c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 7 Oct 2019 18:41:42 -0700
Subject: [PATCH 2161/2254] python37Packages.azure-mgmt-containerservice: 5.3.0
 -> 7.0.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-azure-mgmt-containerservice/versions
---
 .../python-modules/azure-mgmt-containerservice/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix
index 5e68ef2d383..f66712e6f71 100644
--- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-containerservice";
-  version = "5.3.0";
+  version = "7.0.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "1dhni22n85x76709mvjmby8i8hvginzniq1dna6f5cidfcalc0vs";
+    sha256 = "104w7rxv7hy84yzddbbpkjqha04ghr0zz9qy788n3wl69cj4cv1a";
   };
 
   propagatedBuildInputs = [
-- 
GitLab


From 982d8599fbd9e19bb94e099f07a45697dda38e14 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 6 Oct 2019 12:09:44 +0200
Subject: [PATCH 2162/2254] gfortran: use version 8 by default to match our C
 and C++ compiler
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We recently updated to gcc 8.x, but our default Fortran compiler is still at
version 7.x. This causes trouble for all packages that mix C++ and Fortran
code, like R does.

Unfortunately, gfortran8 is marked broken on Darwin, so we cannot switch on
that platform yet:

 | $ nix-instantiate --arg nixpkg '{ outPath = ./.; revCount = 999999; shortRev = "peti"; }' ./pkgs/top-level/release.nix -A unstable --show-trace
 | [...]
 | while evaluating the attribute 'handled' at /home/simons/src/nixpkgs/pkgs/stdenv/generic/check-meta.nix:251:7:
 | while evaluating 'handleEvalIssue' at /home/simons/src/nixpkgs/pkgs/stdenv/generic/check-meta.nix:147:38, called from /home/simons/src/nixpkgs/pkgs/stdenv/generic/check-meta.nix:252:14:
 | Failed to evaluate gfortran-wrapper-8.3.0: «broken»: is marked as broken
---
 pkgs/top-level/all-packages.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 67a338e5a79..dd7bd8219d9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7746,7 +7746,8 @@ in
     isl = isl_0_17;
   }));
 
-  gfortran = gfortran7;
+  # Version 8.x is marked broken on Darwin: https://gist.github.com/GrahamcOfBorg/bef0231b7129681950f03c4ac06781c8.
+  gfortran = if stdenv.isDarwin then gfortran7 else gfortran8;
 
   gfortran48 = wrapCC (gcc48.cc.override {
     name = "gfortran";
-- 
GitLab


From 75711a10fc199589f2b42478a8248145cc0fe5ca Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 8 Oct 2019 09:48:03 +0200
Subject: [PATCH 2163/2254] R: drop redundant gfortran8 override

---
 pkgs/top-level/all-packages.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dd7bd8219d9..02718cfafbb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14504,7 +14504,6 @@ in
   ### DEVELOPMENT / R MODULES
 
   R = callPackage ../applications/science/math/R {
-    gfortran = gfortran8;
     # TODO: split docs into a separate output
     texLive = texlive.combine {
       inherit (texlive) scheme-small inconsolata helvetic texinfo fancyvrb cm-super;
-- 
GitLab


From 8a97fedb4eed1be6152f6c20ae9ff76dae450cb2 Mon Sep 17 00:00:00 2001
From: justinwoo <moomoowoo@gmail.com>
Date: Sun, 1 Sep 2019 13:55:54 +0300
Subject: [PATCH 2164/2254] purescript: 0.13.0 -> 0.13.3

---
 .../development/compilers/purescript/purescript/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/purescript/purescript/default.nix b/pkgs/development/compilers/purescript/purescript/default.nix
index d25cd9fee77..7a677821687 100644
--- a/pkgs/development/compilers/purescript/purescript/default.nix
+++ b/pkgs/development/compilers/purescript/purescript/default.nix
@@ -18,19 +18,19 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "purescript";
-  version = "0.13.0";
+  version = "0.13.3";
 
   src =
     if stdenv.isDarwin
     then
     fetchurl {
       url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos.tar.gz";
-      sha256 = "0xpisy38gj6fgyyzm6fdl0v819dhjmil4634xxangvhvs7jf5il0";
+      sha256 = "04ylhqadj7wnclhiar9il6fkrxmh9qkz6fpas7z3b37w4qg0gshl";
     }
     else
     fetchurl {
       url = "https://github.com/${pname}/${pname}/releases/download/v${version}/linux64.tar.gz";
-      sha256 = "06g5q69yv6c3alq9vr8zjqqzamlii7xf6vj9j52akjq5lww214ba";
+      sha256 = "1xcn694qfql87pdjh09hhvfvpakzxb2hagss61vh9msqq3s96l3z";
     };
 
 
-- 
GitLab


From 5a952d08220d4690d2d448e6776ddf5d6ac13e09 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 8 Oct 2019 01:37:02 -0700
Subject: [PATCH 2165/2254] libbsd: 0.9.1 -> 0.10.0 (#66948)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libbsd/versions
---
 pkgs/development/libraries/libbsd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix
index fe4af163a54..60c3505f9a1 100644
--- a/pkgs/development/libraries/libbsd/default.nix
+++ b/pkgs/development/libraries/libbsd/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libbsd";
-  version = "0.9.1";
+  version = "0.10.0";
 
   src = fetchurl {
     url = "https://libbsd.freedesktop.org/releases/${pname}-${version}.tar.xz";
-    sha256 = "1957w2wi7iqar978qlfsm220dwywnrh5m58nrnn9zmi74ds3bn2n";
+    sha256 = "11x8q45jvjvf2dvgclds64mscyg10lva33qinf2hwgc84v3svf1l";
   };
 
   # darwin changes configure.ac which means we need to regenerate
-- 
GitLab


From 4c0b3ca7c2dac2f1ea431c314ac18a7b86844baa Mon Sep 17 00:00:00 2001
From: Alva <alva@skogen.is>
Date: Tue, 8 Oct 2019 10:37:34 +0200
Subject: [PATCH 2166/2254] maintainers: add alva

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 3e665bd4918..7be726592f0 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -356,6 +356,16 @@
     github = "alunduil";
     name = "Alex Brandt";
   };
+  alva = {
+    email = "alva@skogen.is";
+    github = "fjallarefur";
+    githubId = 42881386;
+    name = "Alva";
+    keys = [{
+      longkeyid = "ed25519/0xF53E323342F7A6D3";
+      fingerprint = "B422 CFB1 C9EF 73F7 E1E2 698D F53E 3233 42F7 A6D3A";
+    }];
+  };
   amar1729 = {
     email = "amar.paul16@gmail.com";
     github = "amar1729";
-- 
GitLab


From d63593bb4213a9a2c61b146c5bce8c66db96d7d8 Mon Sep 17 00:00:00 2001
From: Alva <alva@skogen.is>
Date: Tue, 8 Oct 2019 10:39:58 +0200
Subject: [PATCH 2167/2254] oil: add alva as maintainer

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

diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix
index c88e012a0c3..d2ecf032d3e 100644
--- a/pkgs/shells/oil/default.nix
+++ b/pkgs/shells/oil/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
       asl20 # Licence for Oil itself
     ];
 
-    maintainers = with lib.maintainers; [ lheckemann ];
+    maintainers = with lib.maintainers; [ lheckemann alva ];
   };
 
   passthru = {
-- 
GitLab


From 59324d1fb9d7deddcec3e7a4db705567880ca59c Mon Sep 17 00:00:00 2001
From: talyz <kim.lindberger@gmail.com>
Date: Tue, 8 Oct 2019 11:24:06 +0200
Subject: [PATCH 2168/2254] gitlab: Build frontend assets from source

Instead of extracting prebuilt assets from the debian build, build
them from the source. This should give faster package updates and
reduces the amount of data needed to be downloaded by more than 500MB.
---
 .../version-management/gitlab/default.nix     |   102 +-
 .../version-management/gitlab/update.py       |    44 +-
 .../version-management/gitlab/yarnPkgs.nix    | 14221 ++++++++++++++++
 3 files changed, 14313 insertions(+), 54 deletions(-)
 create mode 100644 pkgs/applications/version-management/gitlab/yarnPkgs.nix

diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix
index 2c457da1961..969d8e5b3b4 100644
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@@ -1,9 +1,21 @@
 { stdenv, lib, fetchurl, fetchFromGitLab, bundlerEnv
-, ruby, tzdata, git, nettools, nixosTests
-, gitlabEnterprise ? false
+, ruby, tzdata, git, nettools, nixosTests, nodejs
+, gitlabEnterprise ? false, callPackage, yarn
+, yarn2nix-moretea
 }:
 
 let
+  flavour = if gitlabEnterprise then "ee" else "ce";
+  data = (builtins.fromJSON (builtins.readFile ./data.json)).${flavour};
+
+  version = data.version;
+  src = fetchFromGitLab {
+    owner = data.owner;
+    repo = data.repo;
+    rev = data.rev;
+    sha256 = data.repo_hash;
+  };
+
   rubyEnv = bundlerEnv rec {
     name = "gitlab-env-${version}";
     inherit ruby;
@@ -26,28 +38,64 @@ let
     ignoreCollisions = true;
   };
 
-  flavour = if gitlabEnterprise then "ee" else "ce";
-  data = (builtins.fromJSON (builtins.readFile ./data.json)).${flavour};
+  yarnOfflineCache = (callPackage ./yarnPkgs.nix {}).offline_cache;
 
-  version = data.version;
-  sources = {
-    gitlab = fetchFromGitLab {
-      owner = data.owner;
-      repo = data.repo;
-      rev = data.rev;
-      sha256 = data.repo_hash;
-    };
-    gitlabDeb = fetchurl {
-      url = data.deb_url;
-      sha256 = data.deb_hash;
-    };
+  assets = stdenv.mkDerivation {
+    pname = "gitlab-assets";
+    inherit version src;
+
+    nativeBuildInputs = [ rubyEnv.wrappedRuby rubyEnv.bundler nodejs yarn ];
+
+    configurePhase = ''
+      runHook preConfigure
+
+      # Some rake tasks try to run yarn automatically, which won't work
+      rm lib/tasks/yarn.rake
+
+      # The rake tasks won't run without a basic configuration in place
+      mv config/database.yml.env config/database.yml
+      mv config/gitlab.yml.example config/gitlab.yml
+
+      # Yarn and bundler wants a real home directory to write cache, config, etc to
+      export HOME=$NIX_BUILD_TOP/fake_home
+
+      # Make yarn install packages from our offline cache, not the registry
+      yarn config --offline set yarn-offline-mirror ${yarnOfflineCache}
+
+      # Fixup "resolved"-entries in yarn.lock to match our offline cache
+      ${yarn2nix-moretea.fixup_yarn_lock}/bin/fixup_yarn_lock yarn.lock
+
+      yarn install --offline --frozen-lockfile --ignore-scripts --no-progress --non-interactive
+
+      patchShebangs node_modules/
+
+      runHook postConfigure
+    '';
+
+    buildPhase = ''
+      runHook preBuild
+
+      bundle exec rake gettext:po_to_json RAILS_ENV=production NODE_ENV=production
+      bundle exec rake rake:assets:precompile RAILS_ENV=production NODE_ENV=production
+      bundle exec rake webpack:compile RAILS_ENV=production NODE_ENV=production NODE_OPTIONS="--max_old_space_size=4096"
+      bundle exec rake gitlab:assets:fix_urls RAILS_ENV=production NODE_ENV=production
+
+      runHook postBuild
+    '';
+
+    installPhase = ''
+      runHook preInstall
+
+      mv public/assets $out
+
+      runHook postInstall
+    '';
   };
 in
-
 stdenv.mkDerivation {
   name = "gitlab${if gitlabEnterprise then "-ee" else ""}-${version}";
 
-  src = sources.gitlab;
+  inherit src;
 
   buildInputs = [
     rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler tzdata git nettools
@@ -59,7 +107,7 @@ stdenv.mkDerivation {
     # For reasons I don't understand "bundle exec" ignores the
     # RAILS_ENV causing tests to be executed that fail because we're
     # not installing development and test gems above. Deleting the
-    # tests works though.:
+    # tests works though.
     rm lib/tasks/test.rake
 
     rm config/initializers/gitlab_shell_secret_token.rb
@@ -69,27 +117,15 @@ stdenv.mkDerivation {
   '';
 
   buildPhase = ''
-    mv config/gitlab.yml.example config/gitlab.yml
-
-    # Building this requires yarn, node &c, so we just get it from the deb
-    ar p ${sources.gitlabDeb} data.tar.gz | gunzip > gitlab-deb-data.tar
-    # Work around unpacking deb containing binary with suid bit
-    tar -f gitlab-deb-data.tar --delete ./opt/gitlab/embedded/bin/ksu
-    tar -xf gitlab-deb-data.tar
-    rm gitlab-deb-data.tar
-
-    mv -v opt/gitlab/embedded/service/gitlab-rails/public/assets public
-    rm -rf opt # only directory in data.tar.gz
-
-    mv config/gitlab.yml config/gitlab.yml.example
     rm -f config/secrets.yml
     mv config config.dist
+    rm -r tmp
   '';
 
   installPhase = ''
-    rm -r tmp
     mkdir -p $out/share
     cp -r . $out/share/gitlab
+    ln -sf ${assets} $out/share/gitlab/public/assets
     rm -rf $out/share/gitlab/log
     ln -sf /run/gitlab/log $out/share/gitlab/log
     ln -sf /run/gitlab/uploads $out/share/gitlab/public/uploads
diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py
index a14ef572b17..7b6afebcd97 100755
--- a/pkgs/applications/version-management/gitlab/update.py
+++ b/pkgs/applications/version-management/gitlab/update.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#! nix-shell -i python3 -p bundix common-updater-scripts nix nix-prefetch-git python3 python3Packages.requests python3Packages.lxml python3Packages.click python3Packages.click-log vgo2nix
+#! nix-shell -i python3 -p bundix common-updater-scripts nix nix-prefetch-git python3 python3Packages.requests python3Packages.lxml python3Packages.click python3Packages.click-log vgo2nix yarn2nix-moretea.yarn2nix
 
 import click
 import click_log
@@ -46,24 +46,6 @@ class GitLabRepo:
         j = json.loads(out)
         return j['sha256']
 
-    def get_deb_url(self, flavour: str, version: str, arch: str = 'amd64') -> str:
-        """
-        gitlab builds debian packages, which we currently need as we don't build the frontend on our own
-        this returns the url of a given flavour, version and arch
-        :param flavour: 'ce' or 'ee'
-        :param version: a version, without 'v' prefix and '-ee' suffix
-        :param arch: amd64
-        :return: url of the debian package
-        """
-        if flavour not in ['ce', 'ee']:
-            raise Exception(f"don't know how to get deb_url for flavour {flavour}")
-        return f"https://packages.gitlab.com/gitlab/gitlab-{flavour}/packages" + \
-               f"/debian/stretch/gitlab-{flavour}_{version}-{flavour}.0_{arch}.deb/download.deb"
-
-    def get_deb_hash(self, flavour: str, version: str) -> str:
-        out = subprocess.check_output(['nix-prefetch-url', self.get_deb_url(flavour, version)])
-        return out.decode('utf-8').strip()
-
     @staticmethod
     def rev2version(tag: str) -> str:
         """
@@ -93,8 +75,6 @@ class GitLabRepo:
                                                                'GITLAB_SHELL_VERSION', 'GITLAB_WORKHORSE_VERSION']}
         return dict(version=self.rev2version(rev),
                     repo_hash=self.get_git_hash(rev),
-                    deb_hash=self.get_deb_hash(flavour, version),
-                    deb_url=self.get_deb_url(flavour, version),
                     owner=self.owner,
                     repo=self.repo,
                     rev=rev,
@@ -191,6 +171,27 @@ def update_rubyenv(flavour):
     subprocess.check_output(['bundix'], cwd=rubyenv_dir)
 
 
+@cli.command('update-yarnpkgs')
+def update_yarnpkgs():
+    """Update yarnPkgs"""
+
+    # yarn.lock is identical between the repos
+    repo = _flavour2gitlabrepo('ee')
+    yarnpkgs_dir = pathlib.Path(__file__).parent
+
+    # load rev from data.json
+    data = _get_data_json()
+    rev = data['ee']['rev']
+
+    with open(yarnpkgs_dir / 'yarn.lock', 'w') as f:
+        f.write(repo.get_file('yarn.lock', rev))
+
+    with open(yarnpkgs_dir / 'yarnPkgs.nix', 'w') as f:
+        subprocess.run(['yarn2nix'], cwd=yarnpkgs_dir, check=True, stdout=f)
+
+    os.unlink(yarnpkgs_dir / 'yarn.lock')
+
+
 @cli.command('update-gitaly')
 def update_gitaly():
     """Update gitaly"""
@@ -267,6 +268,7 @@ def update_all(ctx):
     for flavour in ['ce', 'ee']:
         ctx.invoke(update_data, rev='latest', flavour=flavour)
         ctx.invoke(update_rubyenv, flavour=flavour)
+    ctx.invoke(update_yarnpkgs)
     ctx.invoke(update_gitaly)
     ctx.invoke(update_gitlab_shell)
     ctx.invoke(update_gitlab_workhorse)
diff --git a/pkgs/applications/version-management/gitlab/yarnPkgs.nix b/pkgs/applications/version-management/gitlab/yarnPkgs.nix
new file mode 100644
index 00000000000..350d8a1ab0d
--- /dev/null
+++ b/pkgs/applications/version-management/gitlab/yarnPkgs.nix
@@ -0,0 +1,14221 @@
+{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec {
+  offline_cache = linkFarm "offline" packages;
+  packages = [
+    {
+      name = "_babel_code_frame___code_frame_7.5.5.tgz";
+      path = fetchurl {
+        name = "_babel_code_frame___code_frame_7.5.5.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.5.5.tgz";
+        sha1 = "bc0782f6d69f7b7d49531219699b988f669a8f9d";
+      };
+    }
+    {
+      name = "_babel_core___core_7.5.5.tgz";
+      path = fetchurl {
+        name = "_babel_core___core_7.5.5.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/core/-/core-7.5.5.tgz";
+        sha1 = "17b2686ef0d6bc58f963dddd68ab669755582c30";
+      };
+    }
+    {
+      name = "_babel_generator___generator_7.5.5.tgz";
+      path = fetchurl {
+        name = "_babel_generator___generator_7.5.5.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.5.5.tgz";
+        sha1 = "873a7f936a3c89491b43536d12245b626664e3cf";
+      };
+    }
+    {
+      name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.0.0.tgz";
+      path = fetchurl {
+        name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0.tgz";
+        sha1 = "323d39dd0b50e10c7c06ca7d7638e6864d8c5c32";
+      };
+    }
+    {
+      name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.1.0.tgz";
+      path = fetchurl {
+        name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.1.0.tgz";
+        sha1 = "6b69628dfe4087798e0c4ed98e3d4a6b2fbd2f5f";
+      };
+    }
+    {
+      name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.3.0.tgz";
+      path = fetchurl {
+        name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.3.0.tgz";
+        sha1 = "a1ac95a5d2b3e88ae5e54846bf462eeb81b318a4";
+      };
+    }
+    {
+      name = "_babel_helper_call_delegate___helper_call_delegate_7.4.4.tgz";
+      path = fetchurl {
+        name = "_babel_helper_call_delegate___helper_call_delegate_7.4.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.4.4.tgz";
+        sha1 = "87c1f8ca19ad552a736a7a27b1c1fcf8b1ff1f43";
+      };
+    }
+    {
+      name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.5.5.tgz";
+      path = fetchurl {
+        name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.5.5.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.5.5.tgz";
+        sha1 = "401f302c8ddbc0edd36f7c6b2887d8fa1122e5a4";
+      };
+    }
+    {
+      name = "_babel_helper_define_map___helper_define_map_7.5.5.tgz";
+      path = fetchurl {
+        name = "_babel_helper_define_map___helper_define_map_7.5.5.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.5.5.tgz";
+        sha1 = "3dec32c2046f37e09b28c93eb0b103fd2a25d369";
+      };
+    }
+    {
+      name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.1.0.tgz";
+      path = fetchurl {
+        name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.1.0.tgz";
+        sha1 = "537fa13f6f1674df745b0c00ec8fe4e99681c8f6";
+      };
+    }
+    {
+      name = "_babel_helper_function_name___helper_function_name_7.1.0.tgz";
+      path = fetchurl {
+        name = "_babel_helper_function_name___helper_function_name_7.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz";
+        sha1 = "a0ceb01685f73355d4360c1247f582bfafc8ff53";
+      };
+    }
+    {
+      name = "_babel_helper_get_function_arity___helper_get_function_arity_7.0.0.tgz";
+      path = fetchurl {
+        name = "_babel_helper_get_function_arity___helper_get_function_arity_7.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz";
+        sha1 = "83572d4320e2a4657263734113c42868b64e49c3";
+      };
+    }
+    {
+      name = "_babel_helper_hoist_variables___helper_hoist_variables_7.4.4.tgz";
+      path = fetchurl {
+        name = "_babel_helper_hoist_variables___helper_hoist_variables_7.4.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.4.4.tgz";
+        sha1 = "0298b5f25c8c09c53102d52ac4a98f773eb2850a";
+      };
+    }
+    {
+      name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.5.5.tgz";
+      path = fetchurl {
+        name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.5.5.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.5.5.tgz";
+        sha1 = "1fb5b8ec4453a93c439ee9fe3aeea4a84b76b590";
+      };
+    }
+    {
+      name = "_babel_helper_module_imports___helper_module_imports_7.0.0.tgz";
+      path = fetchurl {
+        name = "_babel_helper_module_imports___helper_module_imports_7.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.0.0.tgz";
+        sha1 = "96081b7111e486da4d2cd971ad1a4fe216cc2e3d";
+      };
+    }
+    {
+      name = "_babel_helper_module_transforms___helper_module_transforms_7.5.5.tgz";
+      path = fetchurl {
+        name = "_babel_helper_module_transforms___helper_module_transforms_7.5.5.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.5.5.tgz";
+        sha1 = "f84ff8a09038dcbca1fd4355661a500937165b4a";
+      };
+    }
+    {
+      name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.0.0.tgz";
+      path = fetchurl {
+        name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0.tgz";
+        sha1 = "a2920c5702b073c15de51106200aa8cad20497d5";
+      };
+    }
+    {
+      name = "_babel_helper_plugin_utils___helper_plugin_utils_7.0.0.tgz";
+      path = fetchurl {
+        name = "_babel_helper_plugin_utils___helper_plugin_utils_7.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz";
+        sha1 = "bbb3fbee98661c569034237cc03967ba99b4f250";
+      };
+    }
+    {
+      name = "_babel_helper_regex___helper_regex_7.5.5.tgz";
+      path = fetchurl {
+        name = "_babel_helper_regex___helper_regex_7.5.5.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.5.5.tgz";
+        sha1 = "0aa6824f7100a2e0e89c1527c23936c152cab351";
+      };
+    }
+    {
+      name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.1.0.tgz";
+      path = fetchurl {
+        name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.1.0.tgz";
+        sha1 = "361d80821b6f38da75bd3f0785ece20a88c5fe7f";
+      };
+    }
+    {
+      name = "_babel_helper_replace_supers___helper_replace_supers_7.5.5.tgz";
+      path = fetchurl {
+        name = "_babel_helper_replace_supers___helper_replace_supers_7.5.5.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.5.5.tgz";
+        sha1 = "f84ce43df031222d2bad068d2626cb5799c34bc2";
+      };
+    }
+    {
+      name = "_babel_helper_simple_access___helper_simple_access_7.1.0.tgz";
+      path = fetchurl {
+        name = "_babel_helper_simple_access___helper_simple_access_7.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.1.0.tgz";
+        sha1 = "65eeb954c8c245beaa4e859da6188f39d71e585c";
+      };
+    }
+    {
+      name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.4.4.tgz";
+      path = fetchurl {
+        name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.4.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz";
+        sha1 = "ff94894a340be78f53f06af038b205c49d993677";
+      };
+    }
+    {
+      name = "_babel_helper_wrap_function___helper_wrap_function_7.2.0.tgz";
+      path = fetchurl {
+        name = "_babel_helper_wrap_function___helper_wrap_function_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.2.0.tgz";
+        sha1 = "c4e0012445769e2815b55296ead43a958549f6fa";
+      };
+    }
+    {
+      name = "_babel_helpers___helpers_7.5.5.tgz";
+      path = fetchurl {
+        name = "_babel_helpers___helpers_7.5.5.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.5.5.tgz";
+        sha1 = "63908d2a73942229d1e6685bc2a0e730dde3b75e";
+      };
+    }
+    {
+      name = "_babel_highlight___highlight_7.5.0.tgz";
+      path = fetchurl {
+        name = "_babel_highlight___highlight_7.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.5.0.tgz";
+        sha1 = "56d11312bd9248fa619591d02472be6e8cb32540";
+      };
+    }
+    {
+      name = "_babel_parser___parser_7.1.3.tgz";
+      path = fetchurl {
+        name = "_babel_parser___parser_7.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.1.3.tgz";
+        sha1 = "2c92469bac2b7fbff810b67fca07bd138b48af77";
+      };
+    }
+    {
+      name = "_babel_parser___parser_7.5.5.tgz";
+      path = fetchurl {
+        name = "_babel_parser___parser_7.5.5.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.5.5.tgz";
+        sha1 = "02f077ac8817d3df4a832ef59de67565e71cca4b";
+      };
+    }
+    {
+      name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.2.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.2.0.tgz";
+        sha1 = "b289b306669dce4ad20b0252889a15768c9d417e";
+      };
+    }
+    {
+      name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.5.5.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.5.5.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.5.5.tgz";
+        sha1 = "a974cfae1e37c3110e71f3c6a2e48b8e71958cd4";
+      };
+    }
+    {
+      name = "_babel_plugin_proposal_decorators___plugin_proposal_decorators_7.4.4.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_proposal_decorators___plugin_proposal_decorators_7.4.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.4.4.tgz";
+        sha1 = "de9b2a1a8ab0196f378e2a82f10b6e2a36f21cc0";
+      };
+    }
+    {
+      name = "_babel_plugin_proposal_do_expressions___plugin_proposal_do_expressions_7.5.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_proposal_do_expressions___plugin_proposal_do_expressions_7.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-do-expressions/-/plugin-proposal-do-expressions-7.5.0.tgz";
+        sha1 = "ceb594d4a618545b00aa0b5cd61cad4aaaeb7a5a";
+      };
+    }
+    {
+      name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.5.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.5.0.tgz";
+        sha1 = "e532202db4838723691b10a67b8ce509e397c506";
+      };
+    }
+    {
+      name = "_babel_plugin_proposal_export_default_from___plugin_proposal_export_default_from_7.5.2.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_proposal_export_default_from___plugin_proposal_export_default_from_7.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.5.2.tgz";
+        sha1 = "2c0ac2dcc36e3b2443fead2c3c5fc796fb1b5145";
+      };
+    }
+    {
+      name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.5.2.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.5.2.tgz";
+        sha1 = "ccd5ed05b06d700688ff1db01a9dd27155e0d2a0";
+      };
+    }
+    {
+      name = "_babel_plugin_proposal_function_bind___plugin_proposal_function_bind_7.2.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_proposal_function_bind___plugin_proposal_function_bind_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-function-bind/-/plugin-proposal-function-bind-7.2.0.tgz";
+        sha1 = "94dc2cdc505cafc4e225c0014335a01648056bf7";
+      };
+    }
+    {
+      name = "_babel_plugin_proposal_function_sent___plugin_proposal_function_sent_7.5.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_proposal_function_sent___plugin_proposal_function_sent_7.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-function-sent/-/plugin-proposal-function-sent-7.5.0.tgz";
+        sha1 = "39233aa801145e7d8072077cdb2d25f781c1ffd7";
+      };
+    }
+    {
+      name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.2.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.2.0.tgz";
+        sha1 = "568ecc446c6148ae6b267f02551130891e29f317";
+      };
+    }
+    {
+      name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.2.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.2.0.tgz";
+        sha1 = "8a5cea6c42a7c87446959e02fff5fad012c56f57";
+      };
+    }
+    {
+      name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.4.4.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.4.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.4.4.tgz";
+        sha1 = "41c360d59481d88e0ce3a3f837df10121a769b39";
+      };
+    }
+    {
+      name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.2.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.2.0.tgz";
+        sha1 = "646854daf4cd22fd6733f6076013a936310443ac";
+      };
+    }
+    {
+      name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.5.5.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.5.5.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.5.5.tgz";
+        sha1 = "61939744f71ba76a3ae46b5eea18a54c16d22e58";
+      };
+    }
+    {
+      name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.2.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.2.0.tgz";
+        sha1 = "135d81edb68a081e55e56ec48541ece8065c38f5";
+      };
+    }
+    {
+      name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.2.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.2.0.tgz";
+        sha1 = "ae454f4c21c6c2ce8cb2397dc332ae8b420c5441";
+      };
+    }
+    {
+      name = "_babel_plugin_proposal_pipeline_operator___plugin_proposal_pipeline_operator_7.5.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_proposal_pipeline_operator___plugin_proposal_pipeline_operator_7.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-pipeline-operator/-/plugin-proposal-pipeline-operator-7.5.0.tgz";
+        sha1 = "4100ec55ef4f6a4c2490b5f5a4f2a22dfa272c06";
+      };
+    }
+    {
+      name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.4.4.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.4.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.4.4.tgz";
+        sha1 = "307b7db29d8ae2d259e7c0e6e665b1922d7ac856";
+      };
+    }
+    {
+      name = "_babel_plugin_proposal_throw_expressions___plugin_proposal_throw_expressions_7.2.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_proposal_throw_expressions___plugin_proposal_throw_expressions_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-throw-expressions/-/plugin-proposal-throw-expressions-7.2.0.tgz";
+        sha1 = "2d9e452d370f139000e51db65d0a85dc60c64739";
+      };
+    }
+    {
+      name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.4.4.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.4.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.4.4.tgz";
+        sha1 = "501ffd9826c0b91da22690720722ac7cb1ca9c78";
+      };
+    }
+    {
+      name = "_babel_plugin_syntax_async_generators___plugin_syntax_async_generators_7.2.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_syntax_async_generators___plugin_syntax_async_generators_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.2.0.tgz";
+        sha1 = "69e1f0db34c6f5a0cf7e2b3323bf159a76c8cb7f";
+      };
+    }
+    {
+      name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.2.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.2.0.tgz";
+        sha1 = "c50b1b957dcc69e4b1127b65e1c33eef61570c1b";
+      };
+    }
+    {
+      name = "_babel_plugin_syntax_do_expressions___plugin_syntax_do_expressions_7.2.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_syntax_do_expressions___plugin_syntax_do_expressions_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-do-expressions/-/plugin-syntax-do-expressions-7.2.0.tgz";
+        sha1 = "f3d4b01be05ecde2892086d7cfd5f1fa1ead5a2a";
+      };
+    }
+    {
+      name = "_babel_plugin_syntax_dynamic_import___plugin_syntax_dynamic_import_7.2.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_syntax_dynamic_import___plugin_syntax_dynamic_import_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.2.0.tgz";
+        sha1 = "69c159ffaf4998122161ad8ebc5e6d1f55df8612";
+      };
+    }
+    {
+      name = "_babel_plugin_syntax_export_default_from___plugin_syntax_export_default_from_7.2.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_syntax_export_default_from___plugin_syntax_export_default_from_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.2.0.tgz";
+        sha1 = "edd83b7adc2e0d059e2467ca96c650ab6d2f3820";
+      };
+    }
+    {
+      name = "_babel_plugin_syntax_export_namespace_from___plugin_syntax_export_namespace_from_7.2.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_syntax_export_namespace_from___plugin_syntax_export_namespace_from_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.2.0.tgz";
+        sha1 = "8d257838c6b3b779db52c0224443459bd27fb039";
+      };
+    }
+    {
+      name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.2.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.2.0.tgz";
+        sha1 = "a765f061f803bc48f240c26f8747faf97c26bf7c";
+      };
+    }
+    {
+      name = "_babel_plugin_syntax_function_bind___plugin_syntax_function_bind_7.2.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_syntax_function_bind___plugin_syntax_function_bind_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-function-bind/-/plugin-syntax-function-bind-7.2.0.tgz";
+        sha1 = "68fe85b0c0da67125f87bf239c68051b06c66309";
+      };
+    }
+    {
+      name = "_babel_plugin_syntax_function_sent___plugin_syntax_function_sent_7.2.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_syntax_function_sent___plugin_syntax_function_sent_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-function-sent/-/plugin-syntax-function-sent-7.2.0.tgz";
+        sha1 = "91474d4d400604e4c6cbd4d77cd6cb3b8565576c";
+      };
+    }
+    {
+      name = "_babel_plugin_syntax_import_meta___plugin_syntax_import_meta_7.2.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_syntax_import_meta___plugin_syntax_import_meta_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.2.0.tgz";
+        sha1 = "2333ef4b875553a3bcd1e93f8ebc09f5b9213a40";
+      };
+    }
+    {
+      name = "_babel_plugin_syntax_json_strings___plugin_syntax_json_strings_7.2.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_syntax_json_strings___plugin_syntax_json_strings_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.2.0.tgz";
+        sha1 = "72bd13f6ffe1d25938129d2a186b11fd62951470";
+      };
+    }
+    {
+      name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.2.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.2.0.tgz";
+        sha1 = "0b85a3b4bc7cdf4cc4b8bf236335b907ca22e7c7";
+      };
+    }
+    {
+      name = "_babel_plugin_syntax_logical_assignment_operators___plugin_syntax_logical_assignment_operators_7.2.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_syntax_logical_assignment_operators___plugin_syntax_logical_assignment_operators_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.2.0.tgz";
+        sha1 = "fcab7388530e96c6f277ce494c55caa6c141fcfb";
+      };
+    }
+    {
+      name = "_babel_plugin_syntax_nullish_coalescing_operator___plugin_syntax_nullish_coalescing_operator_7.2.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_syntax_nullish_coalescing_operator___plugin_syntax_nullish_coalescing_operator_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.2.0.tgz";
+        sha1 = "f75083dfd5ade73e783db729bbd87e7b9efb7624";
+      };
+    }
+    {
+      name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.2.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.2.0.tgz";
+        sha1 = "7470fe070c2944469a756752a69a6963135018be";
+      };
+    }
+    {
+      name = "_babel_plugin_syntax_object_rest_spread___plugin_syntax_object_rest_spread_7.2.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_syntax_object_rest_spread___plugin_syntax_object_rest_spread_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz";
+        sha1 = "3b7a3e733510c57e820b9142a6579ac8b0dfad2e";
+      };
+    }
+    {
+      name = "_babel_plugin_syntax_optional_catch_binding___plugin_syntax_optional_catch_binding_7.2.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_syntax_optional_catch_binding___plugin_syntax_optional_catch_binding_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.2.0.tgz";
+        sha1 = "a94013d6eda8908dfe6a477e7f9eda85656ecf5c";
+      };
+    }
+    {
+      name = "_babel_plugin_syntax_optional_chaining___plugin_syntax_optional_chaining_7.2.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_syntax_optional_chaining___plugin_syntax_optional_chaining_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.2.0.tgz";
+        sha1 = "a59d6ae8c167e7608eaa443fda9fa8fa6bf21dff";
+      };
+    }
+    {
+      name = "_babel_plugin_syntax_pipeline_operator___plugin_syntax_pipeline_operator_7.5.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_syntax_pipeline_operator___plugin_syntax_pipeline_operator_7.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-pipeline-operator/-/plugin-syntax-pipeline-operator-7.5.0.tgz";
+        sha1 = "8ea7c2c22847c797748bf07752722a317079dc1e";
+      };
+    }
+    {
+      name = "_babel_plugin_syntax_throw_expressions___plugin_syntax_throw_expressions_7.2.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_syntax_throw_expressions___plugin_syntax_throw_expressions_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-throw-expressions/-/plugin-syntax-throw-expressions-7.2.0.tgz";
+        sha1 = "79001ee2afe1b174b1733cdc2fc69c9a46a0f1f8";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.2.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.2.0.tgz";
+        sha1 = "9aeafbe4d6ffc6563bf8f8372091628f00779550";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.5.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.5.0.tgz";
+        sha1 = "89a3848a0166623b5bc481164b5936ab947e887e";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.2.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.2.0.tgz";
+        sha1 = "5d3cc11e8d5ddd752aa64c9148d0db6cb79fd190";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.5.5.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.5.5.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.5.5.tgz";
+        sha1 = "a35f395e5402822f10d2119f6f8e045e3639a2ce";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_classes___plugin_transform_classes_7.5.5.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_classes___plugin_transform_classes_7.5.5.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.5.5.tgz";
+        sha1 = "d094299d9bd680a14a2a0edae38305ad60fb4de9";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.2.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.2.0.tgz";
+        sha1 = "83a7df6a658865b1c8f641d510c6f3af220216da";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.5.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.5.0.tgz";
+        sha1 = "f6c09fdfe3f94516ff074fe877db7bc9ef05855a";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.4.4.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.4.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.4.4.tgz";
+        sha1 = "361a148bc951444312c69446d76ed1ea8e4450c3";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.5.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.5.0.tgz";
+        sha1 = "c5dbf5106bf84cdf691222c0974c12b1df931853";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.2.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.2.0.tgz";
+        sha1 = "a63868289e5b4007f7054d46491af51435766008";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_flow_strip_types___plugin_transform_flow_strip_types_7.4.4.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_flow_strip_types___plugin_transform_flow_strip_types_7.4.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.4.4.tgz";
+        sha1 = "d267a081f49a8705fc9146de0768c6b58dccd8f7";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.4.4.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.4.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.4.4.tgz";
+        sha1 = "0267fc735e24c808ba173866c6c4d1440fc3c556";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.4.4.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.4.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.4.4.tgz";
+        sha1 = "e1436116abb0610c2259094848754ac5230922ad";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_literals___plugin_transform_literals_7.2.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_literals___plugin_transform_literals_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.2.0.tgz";
+        sha1 = "690353e81f9267dad4fd8cfd77eafa86aba53ea1";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.2.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.2.0.tgz";
+        sha1 = "fa10aa5c58a2cb6afcf2c9ffa8cb4d8b3d489a2d";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.5.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.5.0.tgz";
+        sha1 = "ef00435d46da0a5961aa728a1d2ecff063e4fb91";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.5.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.5.0.tgz";
+        sha1 = "425127e6045231360858eeaa47a71d75eded7a74";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.5.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.5.0.tgz";
+        sha1 = "e75266a13ef94202db2a0620977756f51d52d249";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.2.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.2.0.tgz";
+        sha1 = "7678ce75169f0877b8eb2235538c074268dd01ae";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.4.5.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.4.5.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.4.5.tgz";
+        sha1 = "9d269fd28a370258199b4294736813a60bbdd106";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.4.4.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.4.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.4.4.tgz";
+        sha1 = "18d120438b0cc9ee95a47f2c72bc9768fbed60a5";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.5.5.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.5.5.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.5.5.tgz";
+        sha1 = "c70021df834073c65eb613b8679cc4a381d1a9f9";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.4.4.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.4.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.4.4.tgz";
+        sha1 = "7556cf03f318bd2719fe4c922d2d808be5571e16";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.2.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.2.0.tgz";
+        sha1 = "03e33f653f5b25c4eb572c98b9485055b389e905";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.2.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.2.0.tgz";
+        sha1 = "ebfaed87834ce8dc4279609a4f0c324c156e3eb0";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.2.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.2.0.tgz";
+        sha1 = "461e21ad9478f1031dd5e276108d027f1b5240ba";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.5.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.5.0.tgz";
+        sha1 = "583b10c49cf057e237085bcbd8cc960bd83bd96b";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.3.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.3.0.tgz";
+        sha1 = "f2cab99026631c767e2745a5368b331cfe8f5290";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.4.5.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.4.5.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.4.5.tgz";
+        sha1 = "629dc82512c55cee01341fb27bdfcb210354680f";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.2.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.2.0.tgz";
+        sha1 = "4792af87c998a49367597d07fedf02636d2e1634";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.2.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.2.0.tgz";
+        sha1 = "6333aee2f8d6ee7e28615457298934a3b46198f0";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_spread___plugin_transform_spread_7.2.2.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_spread___plugin_transform_spread_7.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.2.2.tgz";
+        sha1 = "3103a9abe22f742b6d406ecd3cd49b774919b406";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.2.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.2.0.tgz";
+        sha1 = "a1e454b5995560a9c1e0d537dfc15061fd2687e1";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.4.4.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.4.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.4.4.tgz";
+        sha1 = "9d28fea7bbce637fb7612a0750989d8321d4bcb0";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.2.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.2.0.tgz";
+        sha1 = "117d2bcec2fbf64b4b59d1f9819894682d29f2b2";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.4.4.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.4.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.4.4.tgz";
+        sha1 = "ab4634bb4f14d36728bf5978322b35587787970f";
+      };
+    }
+    {
+      name = "_babel_preset_env___preset_env_7.5.5.tgz";
+      path = fetchurl {
+        name = "_babel_preset_env___preset_env_7.5.5.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.5.5.tgz";
+        sha1 = "bc470b53acaa48df4b8db24a570d6da1fef53c9a";
+      };
+    }
+    {
+      name = "_babel_preset_flow___preset_flow_7.0.0.tgz";
+      path = fetchurl {
+        name = "_babel_preset_flow___preset_flow_7.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.0.0.tgz";
+        sha1 = "afd764835d9535ec63d8c7d4caf1c06457263da2";
+      };
+    }
+    {
+      name = "_babel_preset_react___preset_react_7.0.0.tgz";
+      path = fetchurl {
+        name = "_babel_preset_react___preset_react_7.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.0.0.tgz";
+        sha1 = "e86b4b3d99433c7b3e9e91747e2653958bc6b3c0";
+      };
+    }
+    {
+      name = "_babel_preset_stage_0___preset_stage_0_7.0.0.tgz";
+      path = fetchurl {
+        name = "_babel_preset_stage_0___preset_stage_0_7.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/preset-stage-0/-/preset-stage-0-7.0.0.tgz";
+        sha1 = "999aaec79ee8f0a763042c68c06539c97c6e0646";
+      };
+    }
+    {
+      name = "_babel_standalone___standalone_7.5.5.tgz";
+      path = fetchurl {
+        name = "_babel_standalone___standalone_7.5.5.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/standalone/-/standalone-7.5.5.tgz";
+        sha1 = "9d3143f6078ff408db694a4254bd6f03c5c33962";
+      };
+    }
+    {
+      name = "_babel_template___template_7.4.4.tgz";
+      path = fetchurl {
+        name = "_babel_template___template_7.4.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/template/-/template-7.4.4.tgz";
+        sha1 = "f4b88d1225689a08f5bc3a17483545be9e4ed237";
+      };
+    }
+    {
+      name = "_babel_traverse___traverse_7.5.5.tgz";
+      path = fetchurl {
+        name = "_babel_traverse___traverse_7.5.5.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.5.5.tgz";
+        sha1 = "f664f8f368ed32988cd648da9f72d5ca70f165bb";
+      };
+    }
+    {
+      name = "_babel_types___types_7.5.5.tgz";
+      path = fetchurl {
+        name = "_babel_types___types_7.5.5.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/types/-/types-7.5.5.tgz";
+        sha1 = "97b9f728e182785909aa4ab56264f090a028d18a";
+      };
+    }
+    {
+      name = "_braintree_sanitize_url___sanitize_url_3.1.0.tgz";
+      path = fetchurl {
+        name = "_braintree_sanitize_url___sanitize_url_3.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/@braintree/sanitize-url/-/sanitize-url-3.1.0.tgz";
+        sha1 = "8ff71d51053cd5ee4981e5a501d80a536244f7fd";
+      };
+    }
+    {
+      name = "_cnakazawa_watch___watch_1.0.3.tgz";
+      path = fetchurl {
+        name = "_cnakazawa_watch___watch_1.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.3.tgz";
+        sha1 = "099139eaec7ebf07a27c1786a3ff64f39464d2ef";
+      };
+    }
+    {
+      name = "_gitlab_eslint_config___eslint_config_1.6.0.tgz";
+      path = fetchurl {
+        name = "_gitlab_eslint_config___eslint_config_1.6.0.tgz";
+        url  = "https://registry.yarnpkg.com/@gitlab/eslint-config/-/eslint-config-1.6.0.tgz";
+        sha1 = "1fd247d6ab477d53d4c330e05f007e3afa303689";
+      };
+    }
+    {
+      name = "_gitlab_eslint_plugin_i18n___eslint_plugin_i18n_1.1.0.tgz";
+      path = fetchurl {
+        name = "_gitlab_eslint_plugin_i18n___eslint_plugin_i18n_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/@gitlab/eslint-plugin-i18n/-/eslint-plugin-i18n-1.1.0.tgz";
+        sha1 = "e494d599e644ce3a094ea85f87dbbda41a924c5e";
+      };
+    }
+    {
+      name = "_gitlab_eslint_plugin_vue_i18n___eslint_plugin_vue_i18n_1.2.0.tgz";
+      path = fetchurl {
+        name = "_gitlab_eslint_plugin_vue_i18n___eslint_plugin_vue_i18n_1.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@gitlab/eslint-plugin-vue-i18n/-/eslint-plugin-vue-i18n-1.2.0.tgz";
+        sha1 = "6dcd8bf6bdd7a31c1c4c2c4114762508af435836";
+      };
+    }
+    {
+      name = "_gitlab_svgs___svgs_1.73.0.tgz";
+      path = fetchurl {
+        name = "_gitlab_svgs___svgs_1.73.0.tgz";
+        url  = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.73.0.tgz";
+        sha1 = "e44b347e4be77b94474c80cf5c2ee26ca0325c2f";
+      };
+    }
+    {
+      name = "_gitlab_ui___ui_5.25.2.tgz";
+      path = fetchurl {
+        name = "_gitlab_ui___ui_5.25.2.tgz";
+        url  = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-5.25.2.tgz";
+        sha1 = "599954fefcc228d31a398dbe3c1e2287a0fcdb3e";
+      };
+    }
+    {
+      name = "_gitlab_visual_review_tools___visual_review_tools_1.0.1.tgz";
+      path = fetchurl {
+        name = "_gitlab_visual_review_tools___visual_review_tools_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/@gitlab/visual-review-tools/-/visual-review-tools-1.0.1.tgz";
+        sha1 = "7e588328ed018d91560633d56865d65b72c3a11b";
+      };
+    }
+    {
+      name = "_gitlab_vue_toasted___vue_toasted_1.2.1.tgz";
+      path = fetchurl {
+        name = "_gitlab_vue_toasted___vue_toasted_1.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/@gitlab/vue-toasted/-/vue-toasted-1.2.1.tgz";
+        sha1 = "f407b5aa710863e5b7f021f4a1f66160331ab263";
+      };
+    }
+    {
+      name = "_jest_console___console_24.7.1.tgz";
+      path = fetchurl {
+        name = "_jest_console___console_24.7.1.tgz";
+        url  = "https://registry.yarnpkg.com/@jest/console/-/console-24.7.1.tgz";
+        sha1 = "32a9e42535a97aedfe037e725bd67e954b459545";
+      };
+    }
+    {
+      name = "_jest_core___core_24.8.0.tgz";
+      path = fetchurl {
+        name = "_jest_core___core_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/@jest/core/-/core-24.8.0.tgz";
+        sha1 = "fbbdcd42a41d0d39cddbc9f520c8bab0c33eed5b";
+      };
+    }
+    {
+      name = "_jest_environment___environment_24.8.0.tgz";
+      path = fetchurl {
+        name = "_jest_environment___environment_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/@jest/environment/-/environment-24.8.0.tgz";
+        sha1 = "0342261383c776bdd652168f68065ef144af0eac";
+      };
+    }
+    {
+      name = "_jest_fake_timers___fake_timers_24.8.0.tgz";
+      path = fetchurl {
+        name = "_jest_fake_timers___fake_timers_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-24.8.0.tgz";
+        sha1 = "2e5b80a4f78f284bcb4bd5714b8e10dd36a8d3d1";
+      };
+    }
+    {
+      name = "_jest_reporters___reporters_24.8.0.tgz";
+      path = fetchurl {
+        name = "_jest_reporters___reporters_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/@jest/reporters/-/reporters-24.8.0.tgz";
+        sha1 = "075169cd029bddec54b8f2c0fc489fd0b9e05729";
+      };
+    }
+    {
+      name = "_jest_source_map___source_map_24.3.0.tgz";
+      path = fetchurl {
+        name = "_jest_source_map___source_map_24.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/@jest/source-map/-/source-map-24.3.0.tgz";
+        sha1 = "563be3aa4d224caf65ff77edc95cd1ca4da67f28";
+      };
+    }
+    {
+      name = "_jest_test_result___test_result_24.8.0.tgz";
+      path = fetchurl {
+        name = "_jest_test_result___test_result_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/@jest/test-result/-/test-result-24.8.0.tgz";
+        sha1 = "7675d0aaf9d2484caa65e048d9b467d160f8e9d3";
+      };
+    }
+    {
+      name = "_jest_test_sequencer___test_sequencer_24.8.0.tgz";
+      path = fetchurl {
+        name = "_jest_test_sequencer___test_sequencer_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-24.8.0.tgz";
+        sha1 = "2f993bcf6ef5eb4e65e8233a95a3320248cf994b";
+      };
+    }
+    {
+      name = "_jest_transform___transform_24.8.0.tgz";
+      path = fetchurl {
+        name = "_jest_transform___transform_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/@jest/transform/-/transform-24.8.0.tgz";
+        sha1 = "628fb99dce4f9d254c6fd9341e3eea262e06fef5";
+      };
+    }
+    {
+      name = "_jest_types___types_24.8.0.tgz";
+      path = fetchurl {
+        name = "_jest_types___types_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/@jest/types/-/types-24.8.0.tgz";
+        sha1 = "f31e25948c58f0abd8c845ae26fcea1491dea7ad";
+      };
+    }
+    {
+      name = "_mrmlnc_readdir_enhanced___readdir_enhanced_2.2.1.tgz";
+      path = fetchurl {
+        name = "_mrmlnc_readdir_enhanced___readdir_enhanced_2.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz";
+        sha1 = "524af240d1a360527b730475ecfa1344aa540dde";
+      };
+    }
+    {
+      name = "_nodelib_fs.stat___fs.stat_1.1.3.tgz";
+      path = fetchurl {
+        name = "_nodelib_fs.stat___fs.stat_1.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz";
+        sha1 = "2b5a3ab3f918cca48a8c754c08168e3f03eba61b";
+      };
+    }
+    {
+      name = "_nuxt_opencollective___opencollective_0.2.2.tgz";
+      path = fetchurl {
+        name = "_nuxt_opencollective___opencollective_0.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/@nuxt/opencollective/-/opencollective-0.2.2.tgz";
+        sha1 = "17adc7d380457379cd14cbb64a435ea196cc4a6e";
+      };
+    }
+    {
+      name = "_sindresorhus_is___is_0.7.0.tgz";
+      path = fetchurl {
+        name = "_sindresorhus_is___is_0.7.0.tgz";
+        url  = "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz";
+        sha1 = "9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd";
+      };
+    }
+    {
+      name = "_types_anymatch___anymatch_1.3.0.tgz";
+      path = fetchurl {
+        name = "_types_anymatch___anymatch_1.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/@types/anymatch/-/anymatch-1.3.0.tgz";
+        sha1 = "d1d55958d1fccc5527d4aba29fc9c4b942f563ff";
+      };
+    }
+    {
+      name = "_types_babel__core___babel__core_7.1.2.tgz";
+      path = fetchurl {
+        name = "_types_babel__core___babel__core_7.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.2.tgz";
+        sha1 = "608c74f55928033fce18b99b213c16be4b3d114f";
+      };
+    }
+    {
+      name = "_types_babel__generator___babel__generator_7.0.2.tgz";
+      path = fetchurl {
+        name = "_types_babel__generator___babel__generator_7.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.0.2.tgz";
+        sha1 = "d2112a6b21fad600d7674274293c85dce0cb47fc";
+      };
+    }
+    {
+      name = "_types_babel__template___babel__template_7.0.2.tgz";
+      path = fetchurl {
+        name = "_types_babel__template___babel__template_7.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.0.2.tgz";
+        sha1 = "4ff63d6b52eddac1de7b975a5223ed32ecea9307";
+      };
+    }
+    {
+      name = "_types_babel__traverse___babel__traverse_7.0.6.tgz";
+      path = fetchurl {
+        name = "_types_babel__traverse___babel__traverse_7.0.6.tgz";
+        url  = "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.6.tgz";
+        sha1 = "328dd1a8fc4cfe3c8458be9477b219ea158fd7b2";
+      };
+    }
+    {
+      name = "_types_events___events_1.2.0.tgz";
+      path = fetchurl {
+        name = "_types_events___events_1.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@types/events/-/events-1.2.0.tgz";
+        sha1 = "81a6731ce4df43619e5c8c945383b3e62a89ea86";
+      };
+    }
+    {
+      name = "_types_glob___glob_7.1.1.tgz";
+      path = fetchurl {
+        name = "_types_glob___glob_7.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz";
+        sha1 = "aa59a1c6e3fbc421e07ccd31a944c30eba521575";
+      };
+    }
+    {
+      name = "_types_istanbul_lib_coverage___istanbul_lib_coverage_2.0.1.tgz";
+      path = fetchurl {
+        name = "_types_istanbul_lib_coverage___istanbul_lib_coverage_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz";
+        sha1 = "42995b446db9a48a11a07ec083499a860e9138ff";
+      };
+    }
+    {
+      name = "_types_istanbul_lib_report___istanbul_lib_report_1.1.1.tgz";
+      path = fetchurl {
+        name = "_types_istanbul_lib_report___istanbul_lib_report_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-1.1.1.tgz";
+        sha1 = "e5471e7fa33c61358dd38426189c037a58433b8c";
+      };
+    }
+    {
+      name = "_types_istanbul_reports___istanbul_reports_1.1.1.tgz";
+      path = fetchurl {
+        name = "_types_istanbul_reports___istanbul_reports_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-1.1.1.tgz";
+        sha1 = "7a8cbf6a406f36c8add871625b278eaf0b0d255a";
+      };
+    }
+    {
+      name = "_types_jquery___jquery_2.0.48.tgz";
+      path = fetchurl {
+        name = "_types_jquery___jquery_2.0.48.tgz";
+        url  = "https://registry.yarnpkg.com/@types/jquery/-/jquery-2.0.48.tgz";
+        sha1 = "3e90d8cde2d29015e5583017f7830cb3975b2eef";
+      };
+    }
+    {
+      name = "_types_minimatch___minimatch_3.0.3.tgz";
+      path = fetchurl {
+        name = "_types_minimatch___minimatch_3.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz";
+        sha1 = "3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d";
+      };
+    }
+    {
+      name = "_types_node___node_10.12.9.tgz";
+      path = fetchurl {
+        name = "_types_node___node_10.12.9.tgz";
+        url  = "https://registry.yarnpkg.com/@types/node/-/node-10.12.9.tgz";
+        sha1 = "a07bfa74331471e1dc22a47eb72026843f7b95c8";
+      };
+    }
+    {
+      name = "_types_parse5___parse5_5.0.0.tgz";
+      path = fetchurl {
+        name = "_types_parse5___parse5_5.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/@types/parse5/-/parse5-5.0.0.tgz";
+        sha1 = "9ae2106efc443d7c1e26570aa8247828c9c80f11";
+      };
+    }
+    {
+      name = "_types_semver___semver_5.5.0.tgz";
+      path = fetchurl {
+        name = "_types_semver___semver_5.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/@types/semver/-/semver-5.5.0.tgz";
+        sha1 = "146c2a29ee7d3bae4bf2fcb274636e264c813c45";
+      };
+    }
+    {
+      name = "_types_stack_utils___stack_utils_1.0.1.tgz";
+      path = fetchurl {
+        name = "_types_stack_utils___stack_utils_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz";
+        sha1 = "0a851d3bd96498fa25c33ab7278ed3bd65f06c3e";
+      };
+    }
+    {
+      name = "_types_tapable___tapable_1.0.4.tgz";
+      path = fetchurl {
+        name = "_types_tapable___tapable_1.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.4.tgz";
+        sha1 = "b4ffc7dc97b498c969b360a41eee247f82616370";
+      };
+    }
+    {
+      name = "_types_uglify_js___uglify_js_3.0.4.tgz";
+      path = fetchurl {
+        name = "_types_uglify_js___uglify_js_3.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.0.4.tgz";
+        sha1 = "96beae23df6f561862a830b4288a49e86baac082";
+      };
+    }
+    {
+      name = "_types_unist___unist_2.0.3.tgz";
+      path = fetchurl {
+        name = "_types_unist___unist_2.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.3.tgz";
+        sha1 = "9c088679876f374eb5983f150d4787aa6fb32d7e";
+      };
+    }
+    {
+      name = "_types_vfile_message___vfile_message_1.0.1.tgz";
+      path = fetchurl {
+        name = "_types_vfile_message___vfile_message_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/@types/vfile-message/-/vfile-message-1.0.1.tgz";
+        sha1 = "e1e9895cc6b36c462d4244e64e6d0b6eaf65355a";
+      };
+    }
+    {
+      name = "_types_vfile___vfile_3.0.2.tgz";
+      path = fetchurl {
+        name = "_types_vfile___vfile_3.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/@types/vfile/-/vfile-3.0.2.tgz";
+        sha1 = "19c18cd232df11ce6fa6ad80259bc86c366b09b9";
+      };
+    }
+    {
+      name = "_types_webpack___webpack_4.4.23.tgz";
+      path = fetchurl {
+        name = "_types_webpack___webpack_4.4.23.tgz";
+        url  = "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.4.23.tgz";
+        sha1 = "059d6f4598cfd65ddee0e2db38317ef989696712";
+      };
+    }
+    {
+      name = "_types_yargs___yargs_12.0.12.tgz";
+      path = fetchurl {
+        name = "_types_yargs___yargs_12.0.12.tgz";
+        url  = "https://registry.yarnpkg.com/@types/yargs/-/yargs-12.0.12.tgz";
+        sha1 = "45dd1d0638e8c8f153e87d296907659296873916";
+      };
+    }
+    {
+      name = "_types_zen_observable___zen_observable_0.8.0.tgz";
+      path = fetchurl {
+        name = "_types_zen_observable___zen_observable_0.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/@types/zen-observable/-/zen-observable-0.8.0.tgz";
+        sha1 = "8b63ab7f1aa5321248aad5ac890a485656dcea4d";
+      };
+    }
+    {
+      name = "_vue_component_compiler_utils___component_compiler_utils_2.6.0.tgz";
+      path = fetchurl {
+        name = "_vue_component_compiler_utils___component_compiler_utils_2.6.0.tgz";
+        url  = "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-2.6.0.tgz";
+        sha1 = "aa46d2a6f7647440b0b8932434d22f12371e543b";
+      };
+    }
+    {
+      name = "_vue_test_utils___test_utils_1.0.0_beta.25.tgz";
+      path = fetchurl {
+        name = "_vue_test_utils___test_utils_1.0.0_beta.25.tgz";
+        url  = "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-1.0.0-beta.25.tgz";
+        sha1 = "4703076de3076bac42cdd242cd53e6fb8752ed8c";
+      };
+    }
+    {
+      name = "_webassemblyjs_ast___ast_1.7.11.tgz";
+      path = fetchurl {
+        name = "_webassemblyjs_ast___ast_1.7.11.tgz";
+        url  = "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.7.11.tgz";
+        sha1 = "b988582cafbb2b095e8b556526f30c90d057cace";
+      };
+    }
+    {
+      name = "_webassemblyjs_floating_point_hex_parser___floating_point_hex_parser_1.7.11.tgz";
+      path = fetchurl {
+        name = "_webassemblyjs_floating_point_hex_parser___floating_point_hex_parser_1.7.11.tgz";
+        url  = "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.11.tgz";
+        sha1 = "a69f0af6502eb9a3c045555b1a6129d3d3f2e313";
+      };
+    }
+    {
+      name = "_webassemblyjs_helper_api_error___helper_api_error_1.7.11.tgz";
+      path = fetchurl {
+        name = "_webassemblyjs_helper_api_error___helper_api_error_1.7.11.tgz";
+        url  = "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.11.tgz";
+        sha1 = "c7b6bb8105f84039511a2b39ce494f193818a32a";
+      };
+    }
+    {
+      name = "_webassemblyjs_helper_buffer___helper_buffer_1.7.11.tgz";
+      path = fetchurl {
+        name = "_webassemblyjs_helper_buffer___helper_buffer_1.7.11.tgz";
+        url  = "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.11.tgz";
+        sha1 = "3122d48dcc6c9456ed982debe16c8f37101df39b";
+      };
+    }
+    {
+      name = "_webassemblyjs_helper_code_frame___helper_code_frame_1.7.11.tgz";
+      path = fetchurl {
+        name = "_webassemblyjs_helper_code_frame___helper_code_frame_1.7.11.tgz";
+        url  = "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.11.tgz";
+        sha1 = "cf8f106e746662a0da29bdef635fcd3d1248364b";
+      };
+    }
+    {
+      name = "_webassemblyjs_helper_fsm___helper_fsm_1.7.11.tgz";
+      path = fetchurl {
+        name = "_webassemblyjs_helper_fsm___helper_fsm_1.7.11.tgz";
+        url  = "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.11.tgz";
+        sha1 = "df38882a624080d03f7503f93e3f17ac5ac01181";
+      };
+    }
+    {
+      name = "_webassemblyjs_helper_module_context___helper_module_context_1.7.11.tgz";
+      path = fetchurl {
+        name = "_webassemblyjs_helper_module_context___helper_module_context_1.7.11.tgz";
+        url  = "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.11.tgz";
+        sha1 = "d874d722e51e62ac202476935d649c802fa0e209";
+      };
+    }
+    {
+      name = "_webassemblyjs_helper_wasm_bytecode___helper_wasm_bytecode_1.7.11.tgz";
+      path = fetchurl {
+        name = "_webassemblyjs_helper_wasm_bytecode___helper_wasm_bytecode_1.7.11.tgz";
+        url  = "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.11.tgz";
+        sha1 = "dd9a1e817f1c2eb105b4cf1013093cb9f3c9cb06";
+      };
+    }
+    {
+      name = "_webassemblyjs_helper_wasm_section___helper_wasm_section_1.7.11.tgz";
+      path = fetchurl {
+        name = "_webassemblyjs_helper_wasm_section___helper_wasm_section_1.7.11.tgz";
+        url  = "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.11.tgz";
+        sha1 = "9c9ac41ecf9fbcfffc96f6d2675e2de33811e68a";
+      };
+    }
+    {
+      name = "_webassemblyjs_ieee754___ieee754_1.7.11.tgz";
+      path = fetchurl {
+        name = "_webassemblyjs_ieee754___ieee754_1.7.11.tgz";
+        url  = "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.7.11.tgz";
+        sha1 = "c95839eb63757a31880aaec7b6512d4191ac640b";
+      };
+    }
+    {
+      name = "_webassemblyjs_leb128___leb128_1.7.11.tgz";
+      path = fetchurl {
+        name = "_webassemblyjs_leb128___leb128_1.7.11.tgz";
+        url  = "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.7.11.tgz";
+        sha1 = "d7267a1ee9c4594fd3f7e37298818ec65687db63";
+      };
+    }
+    {
+      name = "_webassemblyjs_utf8___utf8_1.7.11.tgz";
+      path = fetchurl {
+        name = "_webassemblyjs_utf8___utf8_1.7.11.tgz";
+        url  = "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.7.11.tgz";
+        sha1 = "06d7218ea9fdc94a6793aa92208160db3d26ee82";
+      };
+    }
+    {
+      name = "_webassemblyjs_wasm_edit___wasm_edit_1.7.11.tgz";
+      path = fetchurl {
+        name = "_webassemblyjs_wasm_edit___wasm_edit_1.7.11.tgz";
+        url  = "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.11.tgz";
+        sha1 = "8c74ca474d4f951d01dbae9bd70814ee22a82005";
+      };
+    }
+    {
+      name = "_webassemblyjs_wasm_gen___wasm_gen_1.7.11.tgz";
+      path = fetchurl {
+        name = "_webassemblyjs_wasm_gen___wasm_gen_1.7.11.tgz";
+        url  = "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.11.tgz";
+        sha1 = "9bbba942f22375686a6fb759afcd7ac9c45da1a8";
+      };
+    }
+    {
+      name = "_webassemblyjs_wasm_opt___wasm_opt_1.7.11.tgz";
+      path = fetchurl {
+        name = "_webassemblyjs_wasm_opt___wasm_opt_1.7.11.tgz";
+        url  = "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.11.tgz";
+        sha1 = "b331e8e7cef8f8e2f007d42c3a36a0580a7d6ca7";
+      };
+    }
+    {
+      name = "_webassemblyjs_wasm_parser___wasm_parser_1.7.11.tgz";
+      path = fetchurl {
+        name = "_webassemblyjs_wasm_parser___wasm_parser_1.7.11.tgz";
+        url  = "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.11.tgz";
+        sha1 = "6e3d20fa6a3519f6b084ef9391ad58211efb0a1a";
+      };
+    }
+    {
+      name = "_webassemblyjs_wast_parser___wast_parser_1.7.11.tgz";
+      path = fetchurl {
+        name = "_webassemblyjs_wast_parser___wast_parser_1.7.11.tgz";
+        url  = "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.7.11.tgz";
+        sha1 = "25bd117562ca8c002720ff8116ef9072d9ca869c";
+      };
+    }
+    {
+      name = "_webassemblyjs_wast_printer___wast_printer_1.7.11.tgz";
+      path = fetchurl {
+        name = "_webassemblyjs_wast_printer___wast_printer_1.7.11.tgz";
+        url  = "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.7.11.tgz";
+        sha1 = "c4245b6de242cb50a2cc950174fdbf65c78d7813";
+      };
+    }
+    {
+      name = "_xtuc_ieee754___ieee754_1.2.0.tgz";
+      path = fetchurl {
+        name = "_xtuc_ieee754___ieee754_1.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz";
+        sha1 = "eef014a3145ae477a1cbc00cd1e552336dceb790";
+      };
+    }
+    {
+      name = "_xtuc_long___long_4.2.1.tgz";
+      path = fetchurl {
+        name = "_xtuc_long___long_4.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.1.tgz";
+        sha1 = "5c85d662f76fa1d34575766c5dcd6615abcd30d8";
+      };
+    }
+    {
+      name = "_yarnpkg_lockfile___lockfile_1.1.0.tgz";
+      path = fetchurl {
+        name = "_yarnpkg_lockfile___lockfile_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz";
+        sha1 = "e77a97fbd345b76d83245edcd17d393b1b41fb31";
+      };
+    }
+    {
+      name = "JSONStream___JSONStream_1.3.5.tgz";
+      path = fetchurl {
+        name = "JSONStream___JSONStream_1.3.5.tgz";
+        url  = "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz";
+        sha1 = "3208c1f08d3a4d99261ab64f92302bc15e111ca0";
+      };
+    }
+    {
+      name = "abab___abab_2.0.0.tgz";
+      path = fetchurl {
+        name = "abab___abab_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/abab/-/abab-2.0.0.tgz";
+        sha1 = "aba0ab4c5eee2d4c79d3487d85450fb2376ebb0f";
+      };
+    }
+    {
+      name = "abbrev___abbrev_1.0.9.tgz";
+      path = fetchurl {
+        name = "abbrev___abbrev_1.0.9.tgz";
+        url  = "https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz";
+        sha1 = "91b4792588a7738c25f35dd6f63752a2f8776135";
+      };
+    }
+    {
+      name = "accepts___accepts_1.3.5.tgz";
+      path = fetchurl {
+        name = "accepts___accepts_1.3.5.tgz";
+        url  = "https://registry.yarnpkg.com/accepts/-/accepts-1.3.5.tgz";
+        sha1 = "eb777df6011723a3b14e8a72c0805c8e86746bd2";
+      };
+    }
+    {
+      name = "acorn_dynamic_import___acorn_dynamic_import_4.0.0.tgz";
+      path = fetchurl {
+        name = "acorn_dynamic_import___acorn_dynamic_import_4.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz";
+        sha1 = "482210140582a36b83c3e342e1cfebcaa9240948";
+      };
+    }
+    {
+      name = "acorn_globals___acorn_globals_4.3.0.tgz";
+      path = fetchurl {
+        name = "acorn_globals___acorn_globals_4.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.0.tgz";
+        sha1 = "e3b6f8da3c1552a95ae627571f7dd6923bb54103";
+      };
+    }
+    {
+      name = "acorn_jsx___acorn_jsx_5.0.1.tgz";
+      path = fetchurl {
+        name = "acorn_jsx___acorn_jsx_5.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.0.1.tgz";
+        sha1 = "32a064fd925429216a09b141102bfdd185fae40e";
+      };
+    }
+    {
+      name = "acorn_walk___acorn_walk_6.2.0.tgz";
+      path = fetchurl {
+        name = "acorn_walk___acorn_walk_6.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.2.0.tgz";
+        sha1 = "123cb8f3b84c2171f1f7fb252615b1c78a6b1a8c";
+      };
+    }
+    {
+      name = "acorn___acorn_5.7.3.tgz";
+      path = fetchurl {
+        name = "acorn___acorn_5.7.3.tgz";
+        url  = "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz";
+        sha1 = "67aa231bf8812974b85235a96771eb6bd07ea279";
+      };
+    }
+    {
+      name = "acorn___acorn_6.2.1.tgz";
+      path = fetchurl {
+        name = "acorn___acorn_6.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/acorn/-/acorn-6.2.1.tgz";
+        sha1 = "3ed8422d6dec09e6121cc7a843ca86a330a86b51";
+      };
+    }
+    {
+      name = "after___after_0.8.2.tgz";
+      path = fetchurl {
+        name = "after___after_0.8.2.tgz";
+        url  = "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz";
+        sha1 = "fedb394f9f0e02aa9768e702bda23b505fae7e1f";
+      };
+    }
+    {
+      name = "ajv_errors___ajv_errors_1.0.0.tgz";
+      path = fetchurl {
+        name = "ajv_errors___ajv_errors_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.0.tgz";
+        sha1 = "ecf021fa108fd17dfb5e6b383f2dd233e31ffc59";
+      };
+    }
+    {
+      name = "ajv_keywords___ajv_keywords_3.2.0.tgz";
+      path = fetchurl {
+        name = "ajv_keywords___ajv_keywords_3.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz";
+        sha1 = "e86b819c602cf8821ad637413698f1dec021847a";
+      };
+    }
+    {
+      name = "ajv___ajv_6.10.2.tgz";
+      path = fetchurl {
+        name = "ajv___ajv_6.10.2.tgz";
+        url  = "https://registry.yarnpkg.com/ajv/-/ajv-6.10.2.tgz";
+        sha1 = "d3cea04d6b017b2894ad69040fec8b623eb4bd52";
+      };
+    }
+    {
+      name = "amdefine___amdefine_1.0.1.tgz";
+      path = fetchurl {
+        name = "amdefine___amdefine_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz";
+        sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5";
+      };
+    }
+    {
+      name = "ansi_align___ansi_align_2.0.0.tgz";
+      path = fetchurl {
+        name = "ansi_align___ansi_align_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/ansi-align/-/ansi-align-2.0.0.tgz";
+        sha1 = "c36aeccba563b89ceb556f3690f0b1d9e3547f7f";
+      };
+    }
+    {
+      name = "ansi_colors___ansi_colors_3.2.4.tgz";
+      path = fetchurl {
+        name = "ansi_colors___ansi_colors_3.2.4.tgz";
+        url  = "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz";
+        sha1 = "e3a3da4bfbae6c86a9c285625de124a234026fbf";
+      };
+    }
+    {
+      name = "ansi_escapes___ansi_escapes_3.2.0.tgz";
+      path = fetchurl {
+        name = "ansi_escapes___ansi_escapes_3.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz";
+        sha1 = "8780b98ff9dbf5638152d1f1fe5c1d7b4442976b";
+      };
+    }
+    {
+      name = "ansi_html___ansi_html_0.0.7.tgz";
+      path = fetchurl {
+        name = "ansi_html___ansi_html_0.0.7.tgz";
+        url  = "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz";
+        sha1 = "813584021962a9e9e6fd039f940d12f56ca7859e";
+      };
+    }
+    {
+      name = "ansi_regex___ansi_regex_2.1.1.tgz";
+      path = fetchurl {
+        name = "ansi_regex___ansi_regex_2.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz";
+        sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df";
+      };
+    }
+    {
+      name = "ansi_regex___ansi_regex_3.0.0.tgz";
+      path = fetchurl {
+        name = "ansi_regex___ansi_regex_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz";
+        sha1 = "ed0317c322064f79466c02966bddb605ab37d998";
+      };
+    }
+    {
+      name = "ansi_regex___ansi_regex_4.1.0.tgz";
+      path = fetchurl {
+        name = "ansi_regex___ansi_regex_4.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz";
+        sha1 = "8b9f8f08cf1acb843756a839ca8c7e3168c51997";
+      };
+    }
+    {
+      name = "ansi_styles___ansi_styles_2.2.1.tgz";
+      path = fetchurl {
+        name = "ansi_styles___ansi_styles_2.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz";
+        sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe";
+      };
+    }
+    {
+      name = "ansi_styles___ansi_styles_3.2.1.tgz";
+      path = fetchurl {
+        name = "ansi_styles___ansi_styles_3.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz";
+        sha1 = "41fbb20243e50b12be0f04b8dedbf07520ce841d";
+      };
+    }
+    {
+      name = "anymatch___anymatch_2.0.0.tgz";
+      path = fetchurl {
+        name = "anymatch___anymatch_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz";
+        sha1 = "bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb";
+      };
+    }
+    {
+      name = "anymatch___anymatch_3.0.3.tgz";
+      path = fetchurl {
+        name = "anymatch___anymatch_3.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/anymatch/-/anymatch-3.0.3.tgz";
+        sha1 = "2fb624fe0e84bccab00afee3d0006ed310f22f09";
+      };
+    }
+    {
+      name = "apollo_cache_inmemory___apollo_cache_inmemory_1.5.1.tgz";
+      path = fetchurl {
+        name = "apollo_cache_inmemory___apollo_cache_inmemory_1.5.1.tgz";
+        url  = "https://registry.yarnpkg.com/apollo-cache-inmemory/-/apollo-cache-inmemory-1.5.1.tgz";
+        sha1 = "265d1ee67b0bf0aca9c37629d410bfae44e62953";
+      };
+    }
+    {
+      name = "apollo_cache___apollo_cache_1.2.1.tgz";
+      path = fetchurl {
+        name = "apollo_cache___apollo_cache_1.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/apollo-cache/-/apollo-cache-1.2.1.tgz";
+        sha1 = "aae71eb4a11f1f7322adc343f84b1a39b0693644";
+      };
+    }
+    {
+      name = "apollo_client___apollo_client_2.5.1.tgz";
+      path = fetchurl {
+        name = "apollo_client___apollo_client_2.5.1.tgz";
+        url  = "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.5.1.tgz";
+        sha1 = "36126ed1d32edd79c3713c6684546a3bea80e6d1";
+      };
+    }
+    {
+      name = "apollo_link_batch_http___apollo_link_batch_http_1.2.11.tgz";
+      path = fetchurl {
+        name = "apollo_link_batch_http___apollo_link_batch_http_1.2.11.tgz";
+        url  = "https://registry.yarnpkg.com/apollo-link-batch-http/-/apollo-link-batch-http-1.2.11.tgz";
+        sha1 = "ae42dbcc02820658e1e267d05bf2aae7ac208088";
+      };
+    }
+    {
+      name = "apollo_link_batch___apollo_link_batch_1.1.12.tgz";
+      path = fetchurl {
+        name = "apollo_link_batch___apollo_link_batch_1.1.12.tgz";
+        url  = "https://registry.yarnpkg.com/apollo-link-batch/-/apollo-link-batch-1.1.12.tgz";
+        sha1 = "64eb231082f182b0395ef7ab903600627f6c7fe8";
+      };
+    }
+    {
+      name = "apollo_link_dedup___apollo_link_dedup_1.0.10.tgz";
+      path = fetchurl {
+        name = "apollo_link_dedup___apollo_link_dedup_1.0.10.tgz";
+        url  = "https://registry.yarnpkg.com/apollo-link-dedup/-/apollo-link-dedup-1.0.10.tgz";
+        sha1 = "7b94589fe7f969777efd18a129043c78430800ae";
+      };
+    }
+    {
+      name = "apollo_link_http_common___apollo_link_http_common_0.2.13.tgz";
+      path = fetchurl {
+        name = "apollo_link_http_common___apollo_link_http_common_0.2.13.tgz";
+        url  = "https://registry.yarnpkg.com/apollo-link-http-common/-/apollo-link-http-common-0.2.13.tgz";
+        sha1 = "c688f6baaffdc7b269b2db7ae89dae7c58b5b350";
+      };
+    }
+    {
+      name = "apollo_link___apollo_link_1.2.11.tgz";
+      path = fetchurl {
+        name = "apollo_link___apollo_link_1.2.11.tgz";
+        url  = "https://registry.yarnpkg.com/apollo-link/-/apollo-link-1.2.11.tgz";
+        sha1 = "493293b747ad3237114ccd22e9f559e5e24a194d";
+      };
+    }
+    {
+      name = "apollo_upload_client___apollo_upload_client_10.0.0.tgz";
+      path = fetchurl {
+        name = "apollo_upload_client___apollo_upload_client_10.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/apollo-upload-client/-/apollo-upload-client-10.0.0.tgz";
+        sha1 = "6cc3d0ea2aef40bc237b655f5042809cacee1859";
+      };
+    }
+    {
+      name = "apollo_utilities___apollo_utilities_1.2.1.tgz";
+      path = fetchurl {
+        name = "apollo_utilities___apollo_utilities_1.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.2.1.tgz";
+        sha1 = "1c3a1ebf5607d7c8efe7636daaf58e7463b41b3c";
+      };
+    }
+    {
+      name = "append_buffer___append_buffer_1.0.2.tgz";
+      path = fetchurl {
+        name = "append_buffer___append_buffer_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/append-buffer/-/append-buffer-1.0.2.tgz";
+        sha1 = "d8220cf466081525efea50614f3de6514dfa58f1";
+      };
+    }
+    {
+      name = "append_transform___append_transform_1.0.0.tgz";
+      path = fetchurl {
+        name = "append_transform___append_transform_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/append-transform/-/append-transform-1.0.0.tgz";
+        sha1 = "046a52ae582a228bd72f58acfbe2967c678759ab";
+      };
+    }
+    {
+      name = "aproba___aproba_1.2.0.tgz";
+      path = fetchurl {
+        name = "aproba___aproba_1.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz";
+        sha1 = "6802e6264efd18c790a1b0d517f0f2627bf2c94a";
+      };
+    }
+    {
+      name = "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";
+        url  = "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz";
+        sha1 = "4b35c2944f062a8bfcda66410760350fe9ddfc21";
+      };
+    }
+    {
+      name = "argparse___argparse_1.0.10.tgz";
+      path = fetchurl {
+        name = "argparse___argparse_1.0.10.tgz";
+        url  = "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz";
+        sha1 = "bcd6791ea5ae09725e17e5ad988134cd40b3d911";
+      };
+    }
+    {
+      name = "arr_diff___arr_diff_4.0.0.tgz";
+      path = fetchurl {
+        name = "arr_diff___arr_diff_4.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz";
+        sha1 = "d6461074febfec71e7e15235761a329a5dc7c520";
+      };
+    }
+    {
+      name = "arr_flatten___arr_flatten_1.1.0.tgz";
+      path = fetchurl {
+        name = "arr_flatten___arr_flatten_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz";
+        sha1 = "36048bbff4e7b47e136644316c99669ea5ae91f1";
+      };
+    }
+    {
+      name = "arr_union___arr_union_3.1.0.tgz";
+      path = fetchurl {
+        name = "arr_union___arr_union_3.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz";
+        sha1 = "e39b09aea9def866a8f206e288af63919bae39c4";
+      };
+    }
+    {
+      name = "array_equal___array_equal_1.0.0.tgz";
+      path = fetchurl {
+        name = "array_equal___array_equal_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz";
+        sha1 = "8c2a5ef2472fd9ea742b04c77a75093ba2757c93";
+      };
+    }
+    {
+      name = "array_find_index___array_find_index_1.0.2.tgz";
+      path = fetchurl {
+        name = "array_find_index___array_find_index_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz";
+        sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1";
+      };
+    }
+    {
+      name = "array_find___array_find_1.0.0.tgz";
+      path = fetchurl {
+        name = "array_find___array_find_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/array-find/-/array-find-1.0.0.tgz";
+        sha1 = "6c8e286d11ed768327f8e62ecee87353ca3e78b8";
+      };
+    }
+    {
+      name = "array_flatten___array_flatten_1.1.1.tgz";
+      path = fetchurl {
+        name = "array_flatten___array_flatten_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz";
+        sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2";
+      };
+    }
+    {
+      name = "array_flatten___array_flatten_2.1.1.tgz";
+      path = fetchurl {
+        name = "array_flatten___array_flatten_2.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.1.tgz";
+        sha1 = "426bb9da84090c1838d812c8150af20a8331e296";
+      };
+    }
+    {
+      name = "array_union___array_union_1.0.2.tgz";
+      path = fetchurl {
+        name = "array_union___array_union_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz";
+        sha1 = "9a34410e4f4e3da23dea375be5be70f24778ec39";
+      };
+    }
+    {
+      name = "array_uniq___array_uniq_1.0.3.tgz";
+      path = fetchurl {
+        name = "array_uniq___array_uniq_1.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz";
+        sha1 = "af6ac877a25cc7f74e058894753858dfdb24fdb6";
+      };
+    }
+    {
+      name = "array_unique___array_unique_0.3.2.tgz";
+      path = fetchurl {
+        name = "array_unique___array_unique_0.3.2.tgz";
+        url  = "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz";
+        sha1 = "a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428";
+      };
+    }
+    {
+      name = "arraybuffer.slice___arraybuffer.slice_0.0.7.tgz";
+      path = fetchurl {
+        name = "arraybuffer.slice___arraybuffer.slice_0.0.7.tgz";
+        url  = "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz";
+        sha1 = "3bbc4275dd584cc1b10809b89d4e8b63a69e7675";
+      };
+    }
+    {
+      name = "arrify___arrify_1.0.1.tgz";
+      path = fetchurl {
+        name = "arrify___arrify_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz";
+        sha1 = "898508da2226f380df904728456849c1501a4b0d";
+      };
+    }
+    {
+      name = "asn1.js___asn1.js_4.10.1.tgz";
+      path = fetchurl {
+        name = "asn1.js___asn1.js_4.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz";
+        sha1 = "b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0";
+      };
+    }
+    {
+      name = "asn1___asn1_0.2.4.tgz";
+      path = fetchurl {
+        name = "asn1___asn1_0.2.4.tgz";
+        url  = "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz";
+        sha1 = "8d2475dfab553bb33e77b54e59e880bb8ce23136";
+      };
+    }
+    {
+      name = "assert_plus___assert_plus_1.0.0.tgz";
+      path = fetchurl {
+        name = "assert_plus___assert_plus_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz";
+        sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525";
+      };
+    }
+    {
+      name = "assert___assert_1.4.1.tgz";
+      path = fetchurl {
+        name = "assert___assert_1.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz";
+        sha1 = "99912d591836b5a6f5b345c0f07eefc08fc65d91";
+      };
+    }
+    {
+      name = "assign_symbols___assign_symbols_1.0.0.tgz";
+      path = fetchurl {
+        name = "assign_symbols___assign_symbols_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz";
+        sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367";
+      };
+    }
+    {
+      name = "astral_regex___astral_regex_1.0.0.tgz";
+      path = fetchurl {
+        name = "astral_regex___astral_regex_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz";
+        sha1 = "6c8c3fb827dd43ee3918f27b82782ab7658a6fd9";
+      };
+    }
+    {
+      name = "async_each___async_each_1.0.1.tgz";
+      path = fetchurl {
+        name = "async_each___async_each_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz";
+        sha1 = "19d386a1d9edc6e7c1c85d388aedbcc56d33602d";
+      };
+    }
+    {
+      name = "async_foreach___async_foreach_0.1.3.tgz";
+      path = fetchurl {
+        name = "async_foreach___async_foreach_0.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz";
+        sha1 = "36121f845c0578172de419a97dbeb1d16ec34542";
+      };
+    }
+    {
+      name = "async_limiter___async_limiter_1.0.0.tgz";
+      path = fetchurl {
+        name = "async_limiter___async_limiter_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz";
+        sha1 = "78faed8c3d074ab81f22b4e985d79e8738f720f8";
+      };
+    }
+    {
+      name = "async___async_1.5.2.tgz";
+      path = fetchurl {
+        name = "async___async_1.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz";
+        sha1 = "ec6a61ae56480c0c3cb241c95618e20892f9672a";
+      };
+    }
+    {
+      name = "async___async_2.6.3.tgz";
+      path = fetchurl {
+        name = "async___async_2.6.3.tgz";
+        url  = "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz";
+        sha1 = "d72625e2344a3656e3a3ad4fa749fa83299d82ff";
+      };
+    }
+    {
+      name = "asynckit___asynckit_0.4.0.tgz";
+      path = fetchurl {
+        name = "asynckit___asynckit_0.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz";
+        sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79";
+      };
+    }
+    {
+      name = "at.js___at.js_1.5.4.tgz";
+      path = fetchurl {
+        name = "at.js___at.js_1.5.4.tgz";
+        url  = "https://registry.yarnpkg.com/at.js/-/at.js-1.5.4.tgz";
+        sha1 = "8fc60cc80eadbe4874449b166a818e7ae1d784c1";
+      };
+    }
+    {
+      name = "atob___atob_2.1.2.tgz";
+      path = fetchurl {
+        name = "atob___atob_2.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz";
+        sha1 = "6d9517eb9e030d2436666651e86bd9f6f13533c9";
+      };
+    }
+    {
+      name = "autoprefixer___autoprefixer_9.6.1.tgz";
+      path = fetchurl {
+        name = "autoprefixer___autoprefixer_9.6.1.tgz";
+        url  = "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.6.1.tgz";
+        sha1 = "51967a02d2d2300bb01866c1611ec8348d355a47";
+      };
+    }
+    {
+      name = "autosize___autosize_4.0.0.tgz";
+      path = fetchurl {
+        name = "autosize___autosize_4.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/autosize/-/autosize-4.0.0.tgz";
+        sha1 = "7a0599b1ba84d73bd7589b0d9da3870152c69237";
+      };
+    }
+    {
+      name = "aws_sdk___aws_sdk_2.526.0.tgz";
+      path = fetchurl {
+        name = "aws_sdk___aws_sdk_2.526.0.tgz";
+        url  = "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.526.0.tgz";
+        sha1 = "e0f899be59edb7d50eb8cca7978bcd401a5d48c2";
+      };
+    }
+    {
+      name = "aws_sign2___aws_sign2_0.7.0.tgz";
+      path = fetchurl {
+        name = "aws_sign2___aws_sign2_0.7.0.tgz";
+        url  = "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz";
+        sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8";
+      };
+    }
+    {
+      name = "aws4___aws4_1.8.0.tgz";
+      path = fetchurl {
+        name = "aws4___aws4_1.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz";
+        sha1 = "f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f";
+      };
+    }
+    {
+      name = "axios_mock_adapter___axios_mock_adapter_1.15.0.tgz";
+      path = fetchurl {
+        name = "axios_mock_adapter___axios_mock_adapter_1.15.0.tgz";
+        url  = "https://registry.yarnpkg.com/axios-mock-adapter/-/axios-mock-adapter-1.15.0.tgz";
+        sha1 = "fbc06825d8302c95c3334d21023bba996255d45d";
+      };
+    }
+    {
+      name = "axios___axios_0.19.0.tgz";
+      path = fetchurl {
+        name = "axios___axios_0.19.0.tgz";
+        url  = "https://registry.yarnpkg.com/axios/-/axios-0.19.0.tgz";
+        sha1 = "8e09bff3d9122e133f7b8101c8fbdd00ed3d2ab8";
+      };
+    }
+    {
+      name = "babel_code_frame___babel_code_frame_6.26.0.tgz";
+      path = fetchurl {
+        name = "babel_code_frame___babel_code_frame_6.26.0.tgz";
+        url  = "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz";
+        sha1 = "63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b";
+      };
+    }
+    {
+      name = "babel_eslint___babel_eslint_10.0.1.tgz";
+      path = fetchurl {
+        name = "babel_eslint___babel_eslint_10.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.0.1.tgz";
+        sha1 = "919681dc099614cd7d31d45c8908695092a1faed";
+      };
+    }
+    {
+      name = "babel_jest___babel_jest_24.8.0.tgz";
+      path = fetchurl {
+        name = "babel_jest___babel_jest_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/babel-jest/-/babel-jest-24.8.0.tgz";
+        sha1 = "5c15ff2b28e20b0f45df43fe6b7f2aae93dba589";
+      };
+    }
+    {
+      name = "babel_loader___babel_loader_8.0.5.tgz";
+      path = fetchurl {
+        name = "babel_loader___babel_loader_8.0.5.tgz";
+        url  = "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.0.5.tgz";
+        sha1 = "225322d7509c2157655840bba52e46b6c2f2fe33";
+      };
+    }
+    {
+      name = "babel_plugin_dynamic_import_node___babel_plugin_dynamic_import_node_2.3.0.tgz";
+      path = fetchurl {
+        name = "babel_plugin_dynamic_import_node___babel_plugin_dynamic_import_node_2.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz";
+        sha1 = "f00f507bdaa3c3e3ff6e7e5e98d90a7acab96f7f";
+      };
+    }
+    {
+      name = "babel_plugin_istanbul___babel_plugin_istanbul_5.1.0.tgz";
+      path = fetchurl {
+        name = "babel_plugin_istanbul___babel_plugin_istanbul_5.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-5.1.0.tgz";
+        sha1 = "6892f529eff65a3e2d33d87dc5888ffa2ecd4a30";
+      };
+    }
+    {
+      name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_24.6.0.tgz";
+      path = fetchurl {
+        name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_24.6.0.tgz";
+        url  = "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.6.0.tgz";
+        sha1 = "f7f7f7ad150ee96d7a5e8e2c5da8319579e78019";
+      };
+    }
+    {
+      name = "babel_plugin_rewire___babel_plugin_rewire_1.2.0.tgz";
+      path = fetchurl {
+        name = "babel_plugin_rewire___babel_plugin_rewire_1.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/babel-plugin-rewire/-/babel-plugin-rewire-1.2.0.tgz";
+        sha1 = "822562d72ed2c84e47c0f95ee232c920853e9d89";
+      };
+    }
+    {
+      name = "babel_preset_jest___babel_preset_jest_24.6.0.tgz";
+      path = fetchurl {
+        name = "babel_preset_jest___babel_preset_jest_24.6.0.tgz";
+        url  = "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-24.6.0.tgz";
+        sha1 = "66f06136eefce87797539c0d63f1769cc3915984";
+      };
+    }
+    {
+      name = "babelify___babelify_10.0.0.tgz";
+      path = fetchurl {
+        name = "babelify___babelify_10.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/babelify/-/babelify-10.0.0.tgz";
+        sha1 = "fe73b1a22583f06680d8d072e25a1e0d1d1d7fb5";
+      };
+    }
+    {
+      name = "babylon___babylon_7.0.0_beta.19.tgz";
+      path = fetchurl {
+        name = "babylon___babylon_7.0.0_beta.19.tgz";
+        url  = "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.19.tgz";
+        sha1 = "e928c7e807e970e0536b078ab3e0c48f9e052503";
+      };
+    }
+    {
+      name = "backo2___backo2_1.0.2.tgz";
+      path = fetchurl {
+        name = "backo2___backo2_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz";
+        sha1 = "31ab1ac8b129363463e35b3ebb69f4dfcfba7947";
+      };
+    }
+    {
+      name = "bail___bail_1.0.3.tgz";
+      path = fetchurl {
+        name = "bail___bail_1.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/bail/-/bail-1.0.3.tgz";
+        sha1 = "63cfb9ddbac829b02a3128cd53224be78e6c21a3";
+      };
+    }
+    {
+      name = "balanced_match___balanced_match_1.0.0.tgz";
+      path = fetchurl {
+        name = "balanced_match___balanced_match_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz";
+        sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767";
+      };
+    }
+    {
+      name = "base64_arraybuffer___base64_arraybuffer_0.1.5.tgz";
+      path = fetchurl {
+        name = "base64_arraybuffer___base64_arraybuffer_0.1.5.tgz";
+        url  = "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz";
+        sha1 = "73926771923b5a19747ad666aa5cd4bf9c6e9ce8";
+      };
+    }
+    {
+      name = "base64_js___base64_js_1.2.3.tgz";
+      path = fetchurl {
+        name = "base64_js___base64_js_1.2.3.tgz";
+        url  = "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.3.tgz";
+        sha1 = "fb13668233d9614cf5fb4bce95a9ba4096cdf801";
+      };
+    }
+    {
+      name = "base64id___base64id_1.0.0.tgz";
+      path = fetchurl {
+        name = "base64id___base64id_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/base64id/-/base64id-1.0.0.tgz";
+        sha1 = "47688cb99bb6804f0e06d3e763b1c32e57d8e6b6";
+      };
+    }
+    {
+      name = "base___base_0.11.2.tgz";
+      path = fetchurl {
+        name = "base___base_0.11.2.tgz";
+        url  = "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz";
+        sha1 = "7bde5ced145b6d551a90db87f83c558b4eb48a8f";
+      };
+    }
+    {
+      name = "batch___batch_0.6.1.tgz";
+      path = fetchurl {
+        name = "batch___batch_0.6.1.tgz";
+        url  = "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz";
+        sha1 = "dc34314f4e679318093fc760272525f94bf25c16";
+      };
+    }
+    {
+      name = "bcrypt_pbkdf___bcrypt_pbkdf_1.0.2.tgz";
+      path = fetchurl {
+        name = "bcrypt_pbkdf___bcrypt_pbkdf_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz";
+        sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e";
+      };
+    }
+    {
+      name = "better_assert___better_assert_1.0.2.tgz";
+      path = fetchurl {
+        name = "better_assert___better_assert_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/better-assert/-/better-assert-1.0.2.tgz";
+        sha1 = "40866b9e1b9e0b55b481894311e68faffaebc522";
+      };
+    }
+    {
+      name = "bfj___bfj_6.1.1.tgz";
+      path = fetchurl {
+        name = "bfj___bfj_6.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/bfj/-/bfj-6.1.1.tgz";
+        sha1 = "05a3b7784fbd72cfa3c22e56002ef99336516c48";
+      };
+    }
+    {
+      name = "big.js___big.js_5.2.2.tgz";
+      path = fetchurl {
+        name = "big.js___big.js_5.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz";
+        sha1 = "65f0af382f578bcdc742bd9c281e9cb2d7768328";
+      };
+    }
+    {
+      name = "binary_extensions___binary_extensions_1.11.0.tgz";
+      path = fetchurl {
+        name = "binary_extensions___binary_extensions_1.11.0.tgz";
+        url  = "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz";
+        sha1 = "46aa1751fb6a2f93ee5e689bb1087d4b14c6c205";
+      };
+    }
+    {
+      name = "binary_extensions___binary_extensions_2.0.0.tgz";
+      path = fetchurl {
+        name = "binary_extensions___binary_extensions_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.0.0.tgz";
+        sha1 = "23c0df14f6a88077f5f986c0d167ec03c3d5537c";
+      };
+    }
+    {
+      name = "binaryextensions___binaryextensions_2.1.1.tgz";
+      path = fetchurl {
+        name = "binaryextensions___binaryextensions_2.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/binaryextensions/-/binaryextensions-2.1.1.tgz";
+        sha1 = "3209a51ca4a4ad541a3b8d3d6a6d5b83a2485935";
+      };
+    }
+    {
+      name = "blob___blob_0.0.4.tgz";
+      path = fetchurl {
+        name = "blob___blob_0.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/blob/-/blob-0.0.4.tgz";
+        sha1 = "bcf13052ca54463f30f9fc7e95b9a47630a94921";
+      };
+    }
+    {
+      name = "block_stream___block_stream_0.0.9.tgz";
+      path = fetchurl {
+        name = "block_stream___block_stream_0.0.9.tgz";
+        url  = "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz";
+        sha1 = "13ebfe778a03205cfe03751481ebb4b3300c126a";
+      };
+    }
+    {
+      name = "bluebird___bluebird_3.5.5.tgz";
+      path = fetchurl {
+        name = "bluebird___bluebird_3.5.5.tgz";
+        url  = "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.5.tgz";
+        sha1 = "a8d0afd73251effbbd5fe384a77d73003c17a71f";
+      };
+    }
+    {
+      name = "bn.js___bn.js_4.11.8.tgz";
+      path = fetchurl {
+        name = "bn.js___bn.js_4.11.8.tgz";
+        url  = "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz";
+        sha1 = "2cde09eb5ee341f484746bb0309b3253b1b1442f";
+      };
+    }
+    {
+      name = "body_parser___body_parser_1.18.2.tgz";
+      path = fetchurl {
+        name = "body_parser___body_parser_1.18.2.tgz";
+        url  = "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.2.tgz";
+        sha1 = "87678a19d84b47d859b83199bd59bce222b10454";
+      };
+    }
+    {
+      name = "body___body_5.1.0.tgz";
+      path = fetchurl {
+        name = "body___body_5.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/body/-/body-5.1.0.tgz";
+        sha1 = "e4ba0ce410a46936323367609ecb4e6553125069";
+      };
+    }
+    {
+      name = "bonjour___bonjour_3.5.0.tgz";
+      path = fetchurl {
+        name = "bonjour___bonjour_3.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz";
+        sha1 = "8e890a183d8ee9a2393b3844c691a42bcf7bc9f5";
+      };
+    }
+    {
+      name = "bootstrap_vue___bootstrap_vue_2.0.0_rc.27.tgz";
+      path = fetchurl {
+        name = "bootstrap_vue___bootstrap_vue_2.0.0_rc.27.tgz";
+        url  = "https://registry.yarnpkg.com/bootstrap-vue/-/bootstrap-vue-2.0.0-rc.27.tgz";
+        sha1 = "884a46a71948d13c9729134cb564467f79a7b2b9";
+      };
+    }
+    {
+      name = "bootstrap___bootstrap_4.3.1.tgz";
+      path = fetchurl {
+        name = "bootstrap___bootstrap_4.3.1.tgz";
+        url  = "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.3.1.tgz";
+        sha1 = "280ca8f610504d99d7b6b4bfc4b68cec601704ac";
+      };
+    }
+    {
+      name = "boxen___boxen_1.3.0.tgz";
+      path = fetchurl {
+        name = "boxen___boxen_1.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/boxen/-/boxen-1.3.0.tgz";
+        sha1 = "55c6c39a8ba58d9c61ad22cd877532deb665a20b";
+      };
+    }
+    {
+      name = "brace_expansion___brace_expansion_1.1.11.tgz";
+      path = fetchurl {
+        name = "brace_expansion___brace_expansion_1.1.11.tgz";
+        url  = "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz";
+        sha1 = "3c7fcbf529d87226f3d2f52b966ff5271eb441dd";
+      };
+    }
+    {
+      name = "braces___braces_2.3.2.tgz";
+      path = fetchurl {
+        name = "braces___braces_2.3.2.tgz";
+        url  = "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz";
+        sha1 = "5979fd3f14cd531565e5fa2df1abfff1dfaee729";
+      };
+    }
+    {
+      name = "braces___braces_3.0.2.tgz";
+      path = fetchurl {
+        name = "braces___braces_3.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz";
+        sha1 = "3454e1a462ee8d599e236df336cd9ea4f8afe107";
+      };
+    }
+    {
+      name = "brorand___brorand_1.1.0.tgz";
+      path = fetchurl {
+        name = "brorand___brorand_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz";
+        sha1 = "12c25efe40a45e3c323eb8675a0a0ce57b22371f";
+      };
+    }
+    {
+      name = "browser_process_hrtime___browser_process_hrtime_0.1.3.tgz";
+      path = fetchurl {
+        name = "browser_process_hrtime___browser_process_hrtime_0.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz";
+        sha1 = "616f00faef1df7ec1b5bf9cfe2bdc3170f26c7b4";
+      };
+    }
+    {
+      name = "browser_resolve___browser_resolve_1.11.3.tgz";
+      path = fetchurl {
+        name = "browser_resolve___browser_resolve_1.11.3.tgz";
+        url  = "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.3.tgz";
+        sha1 = "9b7cbb3d0f510e4cb86bdbd796124d28b5890af6";
+      };
+    }
+    {
+      name = "browserify_aes___browserify_aes_1.1.1.tgz";
+      path = fetchurl {
+        name = "browserify_aes___browserify_aes_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.1.1.tgz";
+        sha1 = "38b7ab55edb806ff2dcda1a7f1620773a477c49f";
+      };
+    }
+    {
+      name = "browserify_cipher___browserify_cipher_1.0.0.tgz";
+      path = fetchurl {
+        name = "browserify_cipher___browserify_cipher_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.0.tgz";
+        sha1 = "9988244874bf5ed4e28da95666dcd66ac8fc363a";
+      };
+    }
+    {
+      name = "browserify_des___browserify_des_1.0.0.tgz";
+      path = fetchurl {
+        name = "browserify_des___browserify_des_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.0.tgz";
+        sha1 = "daa277717470922ed2fe18594118a175439721dd";
+      };
+    }
+    {
+      name = "browserify_rsa___browserify_rsa_4.0.1.tgz";
+      path = fetchurl {
+        name = "browserify_rsa___browserify_rsa_4.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz";
+        sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524";
+      };
+    }
+    {
+      name = "browserify_sign___browserify_sign_4.0.4.tgz";
+      path = fetchurl {
+        name = "browserify_sign___browserify_sign_4.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.4.tgz";
+        sha1 = "aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298";
+      };
+    }
+    {
+      name = "browserify_zlib___browserify_zlib_0.2.0.tgz";
+      path = fetchurl {
+        name = "browserify_zlib___browserify_zlib_0.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz";
+        sha1 = "2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f";
+      };
+    }
+    {
+      name = "browserslist___browserslist_4.6.6.tgz";
+      path = fetchurl {
+        name = "browserslist___browserslist_4.6.6.tgz";
+        url  = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.6.6.tgz";
+        sha1 = "6e4bf467cde520bc9dbdf3747dafa03531cec453";
+      };
+    }
+    {
+      name = "bs_logger___bs_logger_0.2.6.tgz";
+      path = fetchurl {
+        name = "bs_logger___bs_logger_0.2.6.tgz";
+        url  = "https://registry.yarnpkg.com/bs-logger/-/bs-logger-0.2.6.tgz";
+        sha1 = "eb7d365307a72cf974cc6cda76b68354ad336bd8";
+      };
+    }
+    {
+      name = "bser___bser_2.0.0.tgz";
+      path = fetchurl {
+        name = "bser___bser_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/bser/-/bser-2.0.0.tgz";
+        sha1 = "9ac78d3ed5d915804fd87acb158bc797147a1719";
+      };
+    }
+    {
+      name = "buffer_equal___buffer_equal_1.0.0.tgz";
+      path = fetchurl {
+        name = "buffer_equal___buffer_equal_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz";
+        sha1 = "59616b498304d556abd466966b22eeda3eca5fbe";
+      };
+    }
+    {
+      name = "buffer_from___buffer_from_1.1.1.tgz";
+      path = fetchurl {
+        name = "buffer_from___buffer_from_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz";
+        sha1 = "32713bc028f75c02fdb710d7c7bcec1f2c6070ef";
+      };
+    }
+    {
+      name = "buffer_indexof___buffer_indexof_1.1.0.tgz";
+      path = fetchurl {
+        name = "buffer_indexof___buffer_indexof_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.0.tgz";
+        sha1 = "f54f647c4f4e25228baa656a2e57e43d5f270982";
+      };
+    }
+    {
+      name = "buffer_shims___buffer_shims_1.0.0.tgz";
+      path = fetchurl {
+        name = "buffer_shims___buffer_shims_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/buffer-shims/-/buffer-shims-1.0.0.tgz";
+        sha1 = "9978ce317388c649ad8793028c3477ef044a8b51";
+      };
+    }
+    {
+      name = "buffer_xor___buffer_xor_1.0.3.tgz";
+      path = fetchurl {
+        name = "buffer_xor___buffer_xor_1.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz";
+        sha1 = "26e61ed1422fb70dd42e6e36729ed51d855fe8d9";
+      };
+    }
+    {
+      name = "buffer___buffer_4.9.1.tgz";
+      path = fetchurl {
+        name = "buffer___buffer_4.9.1.tgz";
+        url  = "https://registry.yarnpkg.com/buffer/-/buffer-4.9.1.tgz";
+        sha1 = "6d1bb601b07a4efced97094132093027c95bc298";
+      };
+    }
+    {
+      name = "builtin_status_codes___builtin_status_codes_3.0.0.tgz";
+      path = fetchurl {
+        name = "builtin_status_codes___builtin_status_codes_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz";
+        sha1 = "85982878e21b98e1c66425e03d0174788f569ee8";
+      };
+    }
+    {
+      name = "bytes___bytes_1.0.0.tgz";
+      path = fetchurl {
+        name = "bytes___bytes_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/bytes/-/bytes-1.0.0.tgz";
+        sha1 = "3569ede8ba34315fab99c3e92cb04c7220de1fa8";
+      };
+    }
+    {
+      name = "bytes___bytes_3.0.0.tgz";
+      path = fetchurl {
+        name = "bytes___bytes_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz";
+        sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048";
+      };
+    }
+    {
+      name = "cacache___cacache_11.3.3.tgz";
+      path = fetchurl {
+        name = "cacache___cacache_11.3.3.tgz";
+        url  = "https://registry.yarnpkg.com/cacache/-/cacache-11.3.3.tgz";
+        sha1 = "8bd29df8c6a718a6ebd2d010da4d7972ae3bbadc";
+      };
+    }
+    {
+      name = "cache_base___cache_base_1.0.1.tgz";
+      path = fetchurl {
+        name = "cache_base___cache_base_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz";
+        sha1 = "0a7f46416831c8b662ee36fe4e7c59d76f666ab2";
+      };
+    }
+    {
+      name = "cache_loader___cache_loader_2.0.1.tgz";
+      path = fetchurl {
+        name = "cache_loader___cache_loader_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/cache-loader/-/cache-loader-2.0.1.tgz";
+        sha1 = "5758f41a62d7c23941e3c3c7016e6faeb03acb07";
+      };
+    }
+    {
+      name = "cacheable_request___cacheable_request_2.1.4.tgz";
+      path = fetchurl {
+        name = "cacheable_request___cacheable_request_2.1.4.tgz";
+        url  = "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-2.1.4.tgz";
+        sha1 = "0d808801b6342ad33c91df9d0b44dc09b91e5c3d";
+      };
+    }
+    {
+      name = "cached_path_relative___cached_path_relative_1.0.2.tgz";
+      path = fetchurl {
+        name = "cached_path_relative___cached_path_relative_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/cached-path-relative/-/cached-path-relative-1.0.2.tgz";
+        sha1 = "a13df4196d26776220cc3356eb147a52dba2c6db";
+      };
+    }
+    {
+      name = "call_me_maybe___call_me_maybe_1.0.1.tgz";
+      path = fetchurl {
+        name = "call_me_maybe___call_me_maybe_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz";
+        sha1 = "26d208ea89e37b5cbde60250a15f031c16a4d66b";
+      };
+    }
+    {
+      name = "caller_callsite___caller_callsite_2.0.0.tgz";
+      path = fetchurl {
+        name = "caller_callsite___caller_callsite_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz";
+        sha1 = "847e0fce0a223750a9a027c54b33731ad3154134";
+      };
+    }
+    {
+      name = "caller_path___caller_path_0.1.0.tgz";
+      path = fetchurl {
+        name = "caller_path___caller_path_0.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz";
+        sha1 = "94085ef63581ecd3daa92444a8fe94e82577751f";
+      };
+    }
+    {
+      name = "caller_path___caller_path_2.0.0.tgz";
+      path = fetchurl {
+        name = "caller_path___caller_path_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz";
+        sha1 = "468f83044e369ab2010fac5f06ceee15bb2cb1f4";
+      };
+    }
+    {
+      name = "callsite___callsite_1.0.0.tgz";
+      path = fetchurl {
+        name = "callsite___callsite_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/callsite/-/callsite-1.0.0.tgz";
+        sha1 = "280398e5d664bd74038b6f0905153e6e8af1bc20";
+      };
+    }
+    {
+      name = "callsites___callsites_0.2.0.tgz";
+      path = fetchurl {
+        name = "callsites___callsites_0.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz";
+        sha1 = "afab96262910a7f33c19a5775825c69f34e350ca";
+      };
+    }
+    {
+      name = "callsites___callsites_2.0.0.tgz";
+      path = fetchurl {
+        name = "callsites___callsites_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz";
+        sha1 = "06eb84f00eea413da86affefacbffb36093b3c50";
+      };
+    }
+    {
+      name = "callsites___callsites_3.0.0.tgz";
+      path = fetchurl {
+        name = "callsites___callsites_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/callsites/-/callsites-3.0.0.tgz";
+        sha1 = "fb7eb569b72ad7a45812f93fd9430a3e410b3dd3";
+      };
+    }
+    {
+      name = "camel_case___camel_case_3.0.0.tgz";
+      path = fetchurl {
+        name = "camel_case___camel_case_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz";
+        sha1 = "ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73";
+      };
+    }
+    {
+      name = "camelcase_keys___camelcase_keys_2.1.0.tgz";
+      path = fetchurl {
+        name = "camelcase_keys___camelcase_keys_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz";
+        sha1 = "308beeaffdf28119051efa1d932213c91b8f92e7";
+      };
+    }
+    {
+      name = "camelcase_keys___camelcase_keys_4.2.0.tgz";
+      path = fetchurl {
+        name = "camelcase_keys___camelcase_keys_4.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-4.2.0.tgz";
+        sha1 = "a2aa5fb1af688758259c32c141426d78923b9b77";
+      };
+    }
+    {
+      name = "camelcase___camelcase_2.1.1.tgz";
+      path = fetchurl {
+        name = "camelcase___camelcase_2.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz";
+        sha1 = "7c1d16d679a1bbe59ca02cacecfb011e201f5a1f";
+      };
+    }
+    {
+      name = "camelcase___camelcase_3.0.0.tgz";
+      path = fetchurl {
+        name = "camelcase___camelcase_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz";
+        sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a";
+      };
+    }
+    {
+      name = "camelcase___camelcase_4.1.0.tgz";
+      path = fetchurl {
+        name = "camelcase___camelcase_4.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz";
+        sha1 = "d545635be1e33c542649c69173e5de6acfae34dd";
+      };
+    }
+    {
+      name = "camelcase___camelcase_5.3.1.tgz";
+      path = fetchurl {
+        name = "camelcase___camelcase_5.3.1.tgz";
+        url  = "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz";
+        sha1 = "e3c9b31569e106811df242f715725a1f4c494320";
+      };
+    }
+    {
+      name = "caniuse_lite___caniuse_lite_1.0.30000985.tgz";
+      path = fetchurl {
+        name = "caniuse_lite___caniuse_lite_1.0.30000985.tgz";
+        url  = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000985.tgz";
+        sha1 = "0eb40f6c8a8c219155cbe43c4975c0efb4a0f77f";
+      };
+    }
+    {
+      name = "capture_exit___capture_exit_2.0.0.tgz";
+      path = fetchurl {
+        name = "capture_exit___capture_exit_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz";
+        sha1 = "fb953bfaebeb781f62898239dabb426d08a509a4";
+      };
+    }
+    {
+      name = "capture_stack_trace___capture_stack_trace_1.0.0.tgz";
+      path = fetchurl {
+        name = "capture_stack_trace___capture_stack_trace_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz";
+        sha1 = "4a6fa07399c26bba47f0b2496b4d0fb408c5550d";
+      };
+    }
+    {
+      name = "caseless___caseless_0.12.0.tgz";
+      path = fetchurl {
+        name = "caseless___caseless_0.12.0.tgz";
+        url  = "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz";
+        sha1 = "1b681c21ff84033c826543090689420d187151dc";
+      };
+    }
+    {
+      name = "catharsis___catharsis_0.8.9.tgz";
+      path = fetchurl {
+        name = "catharsis___catharsis_0.8.9.tgz";
+        url  = "https://registry.yarnpkg.com/catharsis/-/catharsis-0.8.9.tgz";
+        sha1 = "98cc890ca652dd2ef0e70b37925310ff9e90fc8b";
+      };
+    }
+    {
+      name = "ccount___ccount_1.0.3.tgz";
+      path = fetchurl {
+        name = "ccount___ccount_1.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/ccount/-/ccount-1.0.3.tgz";
+        sha1 = "f1cec43f332e2ea5a569fd46f9f5bde4e6102aff";
+      };
+    }
+    {
+      name = "chalk___chalk_1.1.3.tgz";
+      path = fetchurl {
+        name = "chalk___chalk_1.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz";
+        sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98";
+      };
+    }
+    {
+      name = "chalk___chalk_2.4.2.tgz";
+      path = fetchurl {
+        name = "chalk___chalk_2.4.2.tgz";
+        url  = "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz";
+        sha1 = "cd42541677a54333cf541a49108c1432b44c9424";
+      };
+    }
+    {
+      name = "character_entities_html4___character_entities_html4_1.1.2.tgz";
+      path = fetchurl {
+        name = "character_entities_html4___character_entities_html4_1.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/character-entities-html4/-/character-entities-html4-1.1.2.tgz";
+        sha1 = "c44fdde3ce66b52e8d321d6c1bf46101f0150610";
+      };
+    }
+    {
+      name = "character_entities_legacy___character_entities_legacy_1.1.2.tgz";
+      path = fetchurl {
+        name = "character_entities_legacy___character_entities_legacy_1.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-1.1.2.tgz";
+        sha1 = "7c6defb81648498222c9855309953d05f4d63a9c";
+      };
+    }
+    {
+      name = "character_entities___character_entities_1.2.2.tgz";
+      path = fetchurl {
+        name = "character_entities___character_entities_1.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/character-entities/-/character-entities-1.2.2.tgz";
+        sha1 = "58c8f371c0774ef0ba9b2aca5f00d8f100e6e363";
+      };
+    }
+    {
+      name = "character_reference_invalid___character_reference_invalid_1.1.2.tgz";
+      path = fetchurl {
+        name = "character_reference_invalid___character_reference_invalid_1.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.2.tgz";
+        sha1 = "21e421ad3d84055952dab4a43a04e73cd425d3ed";
+      };
+    }
+    {
+      name = "chardet___chardet_0.5.0.tgz";
+      path = fetchurl {
+        name = "chardet___chardet_0.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/chardet/-/chardet-0.5.0.tgz";
+        sha1 = "fe3ac73c00c3d865ffcc02a0682e2c20b6a06029";
+      };
+    }
+    {
+      name = "charenc___charenc_0.0.2.tgz";
+      path = fetchurl {
+        name = "charenc___charenc_0.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz";
+        sha1 = "c0a1d2f3a7092e03774bfa83f14c0fc5790a8667";
+      };
+    }
+    {
+      name = "chart.js___chart.js_2.7.2.tgz";
+      path = fetchurl {
+        name = "chart.js___chart.js_2.7.2.tgz";
+        url  = "https://registry.yarnpkg.com/chart.js/-/chart.js-2.7.2.tgz";
+        sha1 = "3c9fde4dc5b95608211bdefeda7e5d33dffa5714";
+      };
+    }
+    {
+      name = "chartjs_color_string___chartjs_color_string_0.5.0.tgz";
+      path = fetchurl {
+        name = "chartjs_color_string___chartjs_color_string_0.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/chartjs-color-string/-/chartjs-color-string-0.5.0.tgz";
+        sha1 = "8d3752d8581d86687c35bfe2cb80ac5213ceb8c1";
+      };
+    }
+    {
+      name = "chartjs_color___chartjs_color_2.2.0.tgz";
+      path = fetchurl {
+        name = "chartjs_color___chartjs_color_2.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/chartjs-color/-/chartjs-color-2.2.0.tgz";
+        sha1 = "84a2fb755787ed85c39dd6dd8c7b1d88429baeae";
+      };
+    }
+    {
+      name = "check_types___check_types_7.3.0.tgz";
+      path = fetchurl {
+        name = "check_types___check_types_7.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/check-types/-/check-types-7.3.0.tgz";
+        sha1 = "468f571a4435c24248f5fd0cb0e8d87c3c341e7d";
+      };
+    }
+    {
+      name = "chokidar___chokidar_2.0.4.tgz";
+      path = fetchurl {
+        name = "chokidar___chokidar_2.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.4.tgz";
+        sha1 = "356ff4e2b0e8e43e322d18a372460bbcf3accd26";
+      };
+    }
+    {
+      name = "chokidar___chokidar_3.0.2.tgz";
+      path = fetchurl {
+        name = "chokidar___chokidar_3.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.0.2.tgz";
+        sha1 = "0d1cd6d04eb2df0327446188cd13736a3367d681";
+      };
+    }
+    {
+      name = "chownr___chownr_1.1.1.tgz";
+      path = fetchurl {
+        name = "chownr___chownr_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz";
+        sha1 = "54726b8b8fff4df053c42187e801fb4412df1494";
+      };
+    }
+    {
+      name = "chrome_trace_event___chrome_trace_event_1.0.0.tgz";
+      path = fetchurl {
+        name = "chrome_trace_event___chrome_trace_event_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.0.tgz";
+        sha1 = "45a91bd2c20c9411f0963b5aaeb9a1b95e09cc48";
+      };
+    }
+    {
+      name = "ci_info___ci_info_1.6.0.tgz";
+      path = fetchurl {
+        name = "ci_info___ci_info_1.6.0.tgz";
+        url  = "https://registry.yarnpkg.com/ci-info/-/ci-info-1.6.0.tgz";
+        sha1 = "2ca20dbb9ceb32d4524a683303313f0304b1e497";
+      };
+    }
+    {
+      name = "ci_info___ci_info_2.0.0.tgz";
+      path = fetchurl {
+        name = "ci_info___ci_info_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz";
+        sha1 = "67a9e964be31a51e15e5010d58e6f12834002f46";
+      };
+    }
+    {
+      name = "cipher_base___cipher_base_1.0.4.tgz";
+      path = fetchurl {
+        name = "cipher_base___cipher_base_1.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz";
+        sha1 = "8760e4ecc272f4c363532f926d874aae2c1397de";
+      };
+    }
+    {
+      name = "circular_json___circular_json_0.3.3.tgz";
+      path = fetchurl {
+        name = "circular_json___circular_json_0.3.3.tgz";
+        url  = "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.3.tgz";
+        sha1 = "815c99ea84f6809529d2f45791bdf82711352d66";
+      };
+    }
+    {
+      name = "class_utils___class_utils_0.3.6.tgz";
+      path = fetchurl {
+        name = "class_utils___class_utils_0.3.6.tgz";
+        url  = "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz";
+        sha1 = "f93369ae8b9a7ce02fd41faad0ca83033190c463";
+      };
+    }
+    {
+      name = "classlist_polyfill___classlist_polyfill_1.2.0.tgz";
+      path = fetchurl {
+        name = "classlist_polyfill___classlist_polyfill_1.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/classlist-polyfill/-/classlist-polyfill-1.2.0.tgz";
+        sha1 = "935bc2dfd9458a876b279617514638bcaa964a2e";
+      };
+    }
+    {
+      name = "clean_css___clean_css_4.2.1.tgz";
+      path = fetchurl {
+        name = "clean_css___clean_css_4.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.1.tgz";
+        sha1 = "2d411ef76b8569b6d0c84068dabe85b0aa5e5c17";
+      };
+    }
+    {
+      name = "cli_boxes___cli_boxes_1.0.0.tgz";
+      path = fetchurl {
+        name = "cli_boxes___cli_boxes_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz";
+        sha1 = "4fa917c3e59c94a004cd61f8ee509da651687143";
+      };
+    }
+    {
+      name = "cli_cursor___cli_cursor_2.1.0.tgz";
+      path = fetchurl {
+        name = "cli_cursor___cli_cursor_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz";
+        sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5";
+      };
+    }
+    {
+      name = "cli_width___cli_width_2.1.0.tgz";
+      path = fetchurl {
+        name = "cli_width___cli_width_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/cli-width/-/cli-width-2.1.0.tgz";
+        sha1 = "b234ca209b29ef66fc518d9b98d5847b00edf00a";
+      };
+    }
+    {
+      name = "clipboard___clipboard_1.7.1.tgz";
+      path = fetchurl {
+        name = "clipboard___clipboard_1.7.1.tgz";
+        url  = "https://registry.yarnpkg.com/clipboard/-/clipboard-1.7.1.tgz";
+        sha1 = "360d6d6946e99a7a1fef395e42ba92b5e9b5a16b";
+      };
+    }
+    {
+      name = "cliui___cliui_3.2.0.tgz";
+      path = fetchurl {
+        name = "cliui___cliui_3.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz";
+        sha1 = "120601537a916d29940f934da3b48d585a39213d";
+      };
+    }
+    {
+      name = "cliui___cliui_4.1.0.tgz";
+      path = fetchurl {
+        name = "cliui___cliui_4.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz";
+        sha1 = "348422dbe82d800b3022eef4f6ac10bf2e4d1b49";
+      };
+    }
+    {
+      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_deep___clone_deep_4.0.1.tgz";
+      path = fetchurl {
+        name = "clone_deep___clone_deep_4.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz";
+        sha1 = "c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387";
+      };
+    }
+    {
+      name = "clone_regexp___clone_regexp_2.2.0.tgz";
+      path = fetchurl {
+        name = "clone_regexp___clone_regexp_2.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/clone-regexp/-/clone-regexp-2.2.0.tgz";
+        sha1 = "7d65e00885cd8796405c35a737e7a86b7429e36f";
+      };
+    }
+    {
+      name = "clone_response___clone_response_1.0.2.tgz";
+      path = fetchurl {
+        name = "clone_response___clone_response_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz";
+        sha1 = "d1dc973920314df67fbeb94223b4ee350239e96b";
+      };
+    }
+    {
+      name = "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_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 = "co___co_4.6.0.tgz";
+      path = fetchurl {
+        name = "co___co_4.6.0.tgz";
+        url  = "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz";
+        sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184";
+      };
+    }
+    {
+      name = "code_point_at___code_point_at_1.1.0.tgz";
+      path = fetchurl {
+        name = "code_point_at___code_point_at_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz";
+        sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77";
+      };
+    }
+    {
+      name = "codesandbox_api___codesandbox_api_0.0.20.tgz";
+      path = fetchurl {
+        name = "codesandbox_api___codesandbox_api_0.0.20.tgz";
+        url  = "https://registry.yarnpkg.com/codesandbox-api/-/codesandbox-api-0.0.20.tgz";
+        sha1 = "174bcd76c9f31521175c6bceabc37da6b1fbc30b";
+      };
+    }
+    {
+      name = "codesandbox_import_util_types___codesandbox_import_util_types_1.2.11.tgz";
+      path = fetchurl {
+        name = "codesandbox_import_util_types___codesandbox_import_util_types_1.2.11.tgz";
+        url  = "https://registry.yarnpkg.com/codesandbox-import-util-types/-/codesandbox-import-util-types-1.2.11.tgz";
+        sha1 = "68e812f21d6b309e9a52eec5cf027c3e63b4c703";
+      };
+    }
+    {
+      name = "codesandbox_import_utils___codesandbox_import_utils_1.2.11.tgz";
+      path = fetchurl {
+        name = "codesandbox_import_utils___codesandbox_import_utils_1.2.11.tgz";
+        url  = "https://registry.yarnpkg.com/codesandbox-import-utils/-/codesandbox-import-utils-1.2.11.tgz";
+        sha1 = "b88423a4a7c785175c784c84e87f5950820280e1";
+      };
+    }
+    {
+      name = "collapse_white_space___collapse_white_space_1.0.5.tgz";
+      path = fetchurl {
+        name = "collapse_white_space___collapse_white_space_1.0.5.tgz";
+        url  = "https://registry.yarnpkg.com/collapse-white-space/-/collapse-white-space-1.0.5.tgz";
+        sha1 = "c2495b699ab1ed380d29a1091e01063e75dbbe3a";
+      };
+    }
+    {
+      name = "collection_visit___collection_visit_1.0.0.tgz";
+      path = fetchurl {
+        name = "collection_visit___collection_visit_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz";
+        sha1 = "4bc0373c164bc3291b4d368c829cf1a80a59dca0";
+      };
+    }
+    {
+      name = "color_convert___color_convert_0.5.3.tgz";
+      path = fetchurl {
+        name = "color_convert___color_convert_0.5.3.tgz";
+        url  = "https://registry.yarnpkg.com/color-convert/-/color-convert-0.5.3.tgz";
+        sha1 = "bdb6c69ce660fadffe0b0007cc447e1b9f7282bd";
+      };
+    }
+    {
+      name = "color_convert___color_convert_1.9.3.tgz";
+      path = fetchurl {
+        name = "color_convert___color_convert_1.9.3.tgz";
+        url  = "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz";
+        sha1 = "bb71850690e1f136567de629d2d5471deda4c1e8";
+      };
+    }
+    {
+      name = "color_name___color_name_1.1.3.tgz";
+      path = fetchurl {
+        name = "color_name___color_name_1.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz";
+        sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25";
+      };
+    }
+    {
+      name = "colors___colors_1.3.3.tgz";
+      path = fetchurl {
+        name = "colors___colors_1.3.3.tgz";
+        url  = "https://registry.yarnpkg.com/colors/-/colors-1.3.3.tgz";
+        sha1 = "39e005d546afe01e01f9c4ca8fa50f686a01205d";
+      };
+    }
+    {
+      name = "combined_stream___combined_stream_1.0.7.tgz";
+      path = fetchurl {
+        name = "combined_stream___combined_stream_1.0.7.tgz";
+        url  = "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz";
+        sha1 = "2d1d24317afb8abe95d6d2c0b07b57813539d828";
+      };
+    }
+    {
+      name = "comma_separated_tokens___comma_separated_tokens_1.0.7.tgz";
+      path = fetchurl {
+        name = "comma_separated_tokens___comma_separated_tokens_1.0.7.tgz";
+        url  = "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-1.0.7.tgz";
+        sha1 = "419cd7fb3258b1ed838dc0953167a25e152f5b59";
+      };
+    }
+    {
+      name = "commander___commander_2.20.0.tgz";
+      path = fetchurl {
+        name = "commander___commander_2.20.0.tgz";
+        url  = "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz";
+        sha1 = "d58bb2b5c1ee8f87b0d340027e9e94e222c5a422";
+      };
+    }
+    {
+      name = "commander___commander_2.17.1.tgz";
+      path = fetchurl {
+        name = "commander___commander_2.17.1.tgz";
+        url  = "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz";
+        sha1 = "bd77ab7de6de94205ceacc72f1716d29f20a77bf";
+      };
+    }
+    {
+      name = "commander___commander_2.9.0.tgz";
+      path = fetchurl {
+        name = "commander___commander_2.9.0.tgz";
+        url  = "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz";
+        sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4";
+      };
+    }
+    {
+      name = "commondir___commondir_1.0.1.tgz";
+      path = fetchurl {
+        name = "commondir___commondir_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz";
+        sha1 = "ddd800da0c66127393cca5950ea968a3aaf1253b";
+      };
+    }
+    {
+      name = "compare_versions___compare_versions_3.5.1.tgz";
+      path = fetchurl {
+        name = "compare_versions___compare_versions_3.5.1.tgz";
+        url  = "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.5.1.tgz";
+        sha1 = "26e1f5cf0d48a77eced5046b9f67b6b61075a393";
+      };
+    }
+    {
+      name = "component_bind___component_bind_1.0.0.tgz";
+      path = fetchurl {
+        name = "component_bind___component_bind_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz";
+        sha1 = "00c608ab7dcd93897c0009651b1d3a8e1e73bbd1";
+      };
+    }
+    {
+      name = "component_emitter___component_emitter_1.2.1.tgz";
+      path = fetchurl {
+        name = "component_emitter___component_emitter_1.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz";
+        sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6";
+      };
+    }
+    {
+      name = "component_inherit___component_inherit_0.0.3.tgz";
+      path = fetchurl {
+        name = "component_inherit___component_inherit_0.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz";
+        sha1 = "645fc4adf58b72b649d5cae65135619db26ff143";
+      };
+    }
+    {
+      name = "compressible___compressible_2.0.15.tgz";
+      path = fetchurl {
+        name = "compressible___compressible_2.0.15.tgz";
+        url  = "https://registry.yarnpkg.com/compressible/-/compressible-2.0.15.tgz";
+        sha1 = "857a9ab0a7e5a07d8d837ed43fe2defff64fe212";
+      };
+    }
+    {
+      name = "compression_webpack_plugin___compression_webpack_plugin_2.0.0.tgz";
+      path = fetchurl {
+        name = "compression_webpack_plugin___compression_webpack_plugin_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/compression-webpack-plugin/-/compression-webpack-plugin-2.0.0.tgz";
+        sha1 = "46476350c1eb27f783dccc79ac2f709baa2cffbc";
+      };
+    }
+    {
+      name = "compression___compression_1.7.3.tgz";
+      path = fetchurl {
+        name = "compression___compression_1.7.3.tgz";
+        url  = "https://registry.yarnpkg.com/compression/-/compression-1.7.3.tgz";
+        sha1 = "27e0e176aaf260f7f2c2813c3e440adb9f1993db";
+      };
+    }
+    {
+      name = "concat_map___concat_map_0.0.1.tgz";
+      path = fetchurl {
+        name = "concat_map___concat_map_0.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz";
+        sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b";
+      };
+    }
+    {
+      name = "concat_stream___concat_stream_1.6.2.tgz";
+      path = fetchurl {
+        name = "concat_stream___concat_stream_1.6.2.tgz";
+        url  = "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz";
+        sha1 = "904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34";
+      };
+    }
+    {
+      name = "concat_stream___concat_stream_1.5.2.tgz";
+      path = fetchurl {
+        name = "concat_stream___concat_stream_1.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.5.2.tgz";
+        sha1 = "708978624d856af41a5a741defdd261da752c266";
+      };
+    }
+    {
+      name = "config_chain___config_chain_1.1.12.tgz";
+      path = fetchurl {
+        name = "config_chain___config_chain_1.1.12.tgz";
+        url  = "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.12.tgz";
+        sha1 = "0fde8d091200eb5e808caf25fe618c02f48e4efa";
+      };
+    }
+    {
+      name = "configstore___configstore_3.1.1.tgz";
+      path = fetchurl {
+        name = "configstore___configstore_3.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/configstore/-/configstore-3.1.1.tgz";
+        sha1 = "094ee662ab83fad9917678de114faaea8fcdca90";
+      };
+    }
+    {
+      name = "connect_history_api_fallback___connect_history_api_fallback_1.3.0.tgz";
+      path = fetchurl {
+        name = "connect_history_api_fallback___connect_history_api_fallback_1.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.3.0.tgz";
+        sha1 = "e51d17f8f0ef0db90a64fdb47de3051556e9f169";
+      };
+    }
+    {
+      name = "connect___connect_3.6.6.tgz";
+      path = fetchurl {
+        name = "connect___connect_3.6.6.tgz";
+        url  = "https://registry.yarnpkg.com/connect/-/connect-3.6.6.tgz";
+        sha1 = "09eff6c55af7236e137135a72574858b6786f524";
+      };
+    }
+    {
+      name = "consola___consola_2.9.0.tgz";
+      path = fetchurl {
+        name = "consola___consola_2.9.0.tgz";
+        url  = "https://registry.yarnpkg.com/consola/-/consola-2.9.0.tgz";
+        sha1 = "57760e3a65a53ec27337f4add31505802d902278";
+      };
+    }
+    {
+      name = "console_browserify___console_browserify_1.1.0.tgz";
+      path = fetchurl {
+        name = "console_browserify___console_browserify_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz";
+        sha1 = "f0241c45730a9fc6323b206dbf38edc741d0bb10";
+      };
+    }
+    {
+      name = "console_control_strings___console_control_strings_1.1.0.tgz";
+      path = fetchurl {
+        name = "console_control_strings___console_control_strings_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz";
+        sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e";
+      };
+    }
+    {
+      name = "consolidate___consolidate_0.15.1.tgz";
+      path = fetchurl {
+        name = "consolidate___consolidate_0.15.1.tgz";
+        url  = "https://registry.yarnpkg.com/consolidate/-/consolidate-0.15.1.tgz";
+        sha1 = "21ab043235c71a07d45d9aad98593b0dba56bab7";
+      };
+    }
+    {
+      name = "constants_browserify___constants_browserify_1.0.0.tgz";
+      path = fetchurl {
+        name = "constants_browserify___constants_browserify_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz";
+        sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75";
+      };
+    }
+    {
+      name = "contains_path___contains_path_0.1.0.tgz";
+      path = fetchurl {
+        name = "contains_path___contains_path_0.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz";
+        sha1 = "fe8cf184ff6670b6baef01a9d4861a5cbec4120a";
+      };
+    }
+    {
+      name = "content_disposition___content_disposition_0.5.2.tgz";
+      path = fetchurl {
+        name = "content_disposition___content_disposition_0.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz";
+        sha1 = "0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4";
+      };
+    }
+    {
+      name = "content_type___content_type_1.0.4.tgz";
+      path = fetchurl {
+        name = "content_type___content_type_1.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz";
+        sha1 = "e138cc75e040c727b1966fe5e5f8c9aee256fe3b";
+      };
+    }
+    {
+      name = "continuable_cache___continuable_cache_0.3.1.tgz";
+      path = fetchurl {
+        name = "continuable_cache___continuable_cache_0.3.1.tgz";
+        url  = "https://registry.yarnpkg.com/continuable-cache/-/continuable-cache-0.3.1.tgz";
+        sha1 = "bd727a7faed77e71ff3985ac93351a912733ad0f";
+      };
+    }
+    {
+      name = "convert_source_map___convert_source_map_1.6.0.tgz";
+      path = fetchurl {
+        name = "convert_source_map___convert_source_map_1.6.0.tgz";
+        url  = "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz";
+        sha1 = "51b537a8c43e0f04dec1993bffcdd504e758ac20";
+      };
+    }
+    {
+      name = "cookie_signature___cookie_signature_1.0.6.tgz";
+      path = fetchurl {
+        name = "cookie_signature___cookie_signature_1.0.6.tgz";
+        url  = "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz";
+        sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c";
+      };
+    }
+    {
+      name = "cookie___cookie_0.3.1.tgz";
+      path = fetchurl {
+        name = "cookie___cookie_0.3.1.tgz";
+        url  = "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz";
+        sha1 = "e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb";
+      };
+    }
+    {
+      name = "copy_concurrently___copy_concurrently_1.0.5.tgz";
+      path = fetchurl {
+        name = "copy_concurrently___copy_concurrently_1.0.5.tgz";
+        url  = "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz";
+        sha1 = "92297398cae34937fcafd6ec8139c18051f0b5e0";
+      };
+    }
+    {
+      name = "copy_descriptor___copy_descriptor_0.1.1.tgz";
+      path = fetchurl {
+        name = "copy_descriptor___copy_descriptor_0.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz";
+        sha1 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d";
+      };
+    }
+    {
+      name = "copy_to_clipboard___copy_to_clipboard_3.0.8.tgz";
+      path = fetchurl {
+        name = "copy_to_clipboard___copy_to_clipboard_3.0.8.tgz";
+        url  = "https://registry.yarnpkg.com/copy-to-clipboard/-/copy-to-clipboard-3.0.8.tgz";
+        sha1 = "f4e82f4a8830dce4666b7eb8ded0c9bcc313aba9";
+      };
+    }
+    {
+      name = "copy_webpack_plugin___copy_webpack_plugin_5.0.4.tgz";
+      path = fetchurl {
+        name = "copy_webpack_plugin___copy_webpack_plugin_5.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-5.0.4.tgz";
+        sha1 = "c78126f604e24f194c6ec2f43a64e232b5d43655";
+      };
+    }
+    {
+      name = "core_js_compat___core_js_compat_3.1.4.tgz";
+      path = fetchurl {
+        name = "core_js_compat___core_js_compat_3.1.4.tgz";
+        url  = "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.1.4.tgz";
+        sha1 = "e4d0c40fbd01e65b1d457980fe4112d4358a7408";
+      };
+    }
+    {
+      name = "core_js_pure___core_js_pure_3.1.4.tgz";
+      path = fetchurl {
+        name = "core_js_pure___core_js_pure_3.1.4.tgz";
+        url  = "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.1.4.tgz";
+        sha1 = "5fa17dc77002a169a3566cc48dc774d2e13e3769";
+      };
+    }
+    {
+      name = "core_js___core_js_3.1.3.tgz";
+      path = fetchurl {
+        name = "core_js___core_js_3.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/core-js/-/core-js-3.1.3.tgz";
+        sha1 = "95700bca5f248f5f78c0ec63e784eca663ec4138";
+      };
+    }
+    {
+      name = "core_js___core_js_2.3.0.tgz";
+      path = fetchurl {
+        name = "core_js___core_js_2.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/core-js/-/core-js-2.3.0.tgz";
+        sha1 = "fab83fbb0b2d8dc85fa636c4b9d34c75420c6d65";
+      };
+    }
+    {
+      name = "core_util_is___core_util_is_1.0.2.tgz";
+      path = fetchurl {
+        name = "core_util_is___core_util_is_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz";
+        sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
+      };
+    }
+    {
+      name = "cosmiconfig___cosmiconfig_5.2.1.tgz";
+      path = fetchurl {
+        name = "cosmiconfig___cosmiconfig_5.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz";
+        sha1 = "040f726809c591e77a17c0a3626ca45b4f168b1a";
+      };
+    }
+    {
+      name = "create_ecdh___create_ecdh_4.0.0.tgz";
+      path = fetchurl {
+        name = "create_ecdh___create_ecdh_4.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.0.tgz";
+        sha1 = "888c723596cdf7612f6498233eebd7a35301737d";
+      };
+    }
+    {
+      name = "create_error_class___create_error_class_3.0.2.tgz";
+      path = fetchurl {
+        name = "create_error_class___create_error_class_3.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/create-error-class/-/create-error-class-3.0.2.tgz";
+        sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6";
+      };
+    }
+    {
+      name = "create_hash___create_hash_1.1.3.tgz";
+      path = fetchurl {
+        name = "create_hash___create_hash_1.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/create-hash/-/create-hash-1.1.3.tgz";
+        sha1 = "606042ac8b9262750f483caddab0f5819172d8fd";
+      };
+    }
+    {
+      name = "create_hmac___create_hmac_1.1.6.tgz";
+      path = fetchurl {
+        name = "create_hmac___create_hmac_1.1.6.tgz";
+        url  = "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.6.tgz";
+        sha1 = "acb9e221a4e17bdb076e90657c42b93e3726cf06";
+      };
+    }
+    {
+      name = "cropper___cropper_2.3.0.tgz";
+      path = fetchurl {
+        name = "cropper___cropper_2.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/cropper/-/cropper-2.3.0.tgz";
+        sha1 = "607461d4e7aa7a7fe15a26834b14b7f0c2801562";
+      };
+    }
+    {
+      name = "cross_spawn___cross_spawn_3.0.1.tgz";
+      path = fetchurl {
+        name = "cross_spawn___cross_spawn_3.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz";
+        sha1 = "1256037ecb9f0c5f79e3d6ef135e30770184b982";
+      };
+    }
+    {
+      name = "cross_spawn___cross_spawn_5.1.0.tgz";
+      path = fetchurl {
+        name = "cross_spawn___cross_spawn_5.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz";
+        sha1 = "e8bd0efee58fcff6f8f94510a0a554bbfa235449";
+      };
+    }
+    {
+      name = "cross_spawn___cross_spawn_6.0.5.tgz";
+      path = fetchurl {
+        name = "cross_spawn___cross_spawn_6.0.5.tgz";
+        url  = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz";
+        sha1 = "4a5ec7c64dfae22c3a14124dbacdee846d80cbc4";
+      };
+    }
+    {
+      name = "crypt___crypt_0.0.2.tgz";
+      path = fetchurl {
+        name = "crypt___crypt_0.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz";
+        sha1 = "88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b";
+      };
+    }
+    {
+      name = "crypto_browserify___crypto_browserify_3.12.0.tgz";
+      path = fetchurl {
+        name = "crypto_browserify___crypto_browserify_3.12.0.tgz";
+        url  = "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz";
+        sha1 = "396cf9f3137f03e4b8e532c58f698254e00f80ec";
+      };
+    }
+    {
+      name = "crypto_random_string___crypto_random_string_1.0.0.tgz";
+      path = fetchurl {
+        name = "crypto_random_string___crypto_random_string_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz";
+        sha1 = "a230f64f568310e1498009940790ec99545bca7e";
+      };
+    }
+    {
+      name = "css_b64_images___css_b64_images_0.2.5.tgz";
+      path = fetchurl {
+        name = "css_b64_images___css_b64_images_0.2.5.tgz";
+        url  = "https://registry.yarnpkg.com/css-b64-images/-/css-b64-images-0.2.5.tgz";
+        sha1 = "42005d83204b2b4a5d93b6b1a5644133b5927a02";
+      };
+    }
+    {
+      name = "css_loader___css_loader_1.0.1.tgz";
+      path = fetchurl {
+        name = "css_loader___css_loader_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/css-loader/-/css-loader-1.0.1.tgz";
+        sha1 = "6885bb5233b35ec47b006057da01cc640b6b79fe";
+      };
+    }
+    {
+      name = "css_selector_parser___css_selector_parser_1.3.0.tgz";
+      path = fetchurl {
+        name = "css_selector_parser___css_selector_parser_1.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/css-selector-parser/-/css-selector-parser-1.3.0.tgz";
+        sha1 = "5f1ad43e2d8eefbfdc304fcd39a521664943e3eb";
+      };
+    }
+    {
+      name = "css_selector_tokenizer___css_selector_tokenizer_0.7.0.tgz";
+      path = fetchurl {
+        name = "css_selector_tokenizer___css_selector_tokenizer_0.7.0.tgz";
+        url  = "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz";
+        sha1 = "e6988474ae8c953477bf5e7efecfceccd9cf4c86";
+      };
+    }
+    {
+      name = "css___css_2.2.4.tgz";
+      path = fetchurl {
+        name = "css___css_2.2.4.tgz";
+        url  = "https://registry.yarnpkg.com/css/-/css-2.2.4.tgz";
+        sha1 = "c646755c73971f2bba6a601e2cf2fd71b1298929";
+      };
+    }
+    {
+      name = "cssesc___cssesc_0.1.0.tgz";
+      path = fetchurl {
+        name = "cssesc___cssesc_0.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/cssesc/-/cssesc-0.1.0.tgz";
+        sha1 = "c814903e45623371a0477b40109aaafbeeaddbb4";
+      };
+    }
+    {
+      name = "cssesc___cssesc_2.0.0.tgz";
+      path = fetchurl {
+        name = "cssesc___cssesc_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/cssesc/-/cssesc-2.0.0.tgz";
+        sha1 = "3b13bd1bb1cb36e1bcb5a4dcd27f54c5dcb35703";
+      };
+    }
+    {
+      name = "cssesc___cssesc_3.0.0.tgz";
+      path = fetchurl {
+        name = "cssesc___cssesc_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz";
+        sha1 = "37741919903b868565e1c09ea747445cd18983ee";
+      };
+    }
+    {
+      name = "cssom___cssom_0.3.4.tgz";
+      path = fetchurl {
+        name = "cssom___cssom_0.3.4.tgz";
+        url  = "https://registry.yarnpkg.com/cssom/-/cssom-0.3.4.tgz";
+        sha1 = "8cd52e8a3acfd68d3aed38ee0a640177d2f9d797";
+      };
+    }
+    {
+      name = "cssstyle___cssstyle_1.1.1.tgz";
+      path = fetchurl {
+        name = "cssstyle___cssstyle_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/cssstyle/-/cssstyle-1.1.1.tgz";
+        sha1 = "18b038a9c44d65f7a8e428a653b9f6fe42faf5fb";
+      };
+    }
+    {
+      name = "currently_unhandled___currently_unhandled_0.4.1.tgz";
+      path = fetchurl {
+        name = "currently_unhandled___currently_unhandled_0.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz";
+        sha1 = "988df33feab191ef799a61369dd76c17adf957ea";
+      };
+    }
+    {
+      name = "custom_event___custom_event_1.0.1.tgz";
+      path = fetchurl {
+        name = "custom_event___custom_event_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/custom-event/-/custom-event-1.0.1.tgz";
+        sha1 = "5d02a46850adf1b4a317946a3928fccb5bfd0425";
+      };
+    }
+    {
+      name = "custom_jquery_matchers___custom_jquery_matchers_2.1.0.tgz";
+      path = fetchurl {
+        name = "custom_jquery_matchers___custom_jquery_matchers_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/custom-jquery-matchers/-/custom-jquery-matchers-2.1.0.tgz";
+        sha1 = "e5988fa9715c416b0986b372563f872d9e91e024";
+      };
+    }
+    {
+      name = "cyclist___cyclist_0.2.2.tgz";
+      path = fetchurl {
+        name = "cyclist___cyclist_0.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz";
+        sha1 = "1b33792e11e914a2fd6d6ed6447464444e5fa640";
+      };
+    }
+    {
+      name = "d3_array___d3_array_1.2.1.tgz";
+      path = fetchurl {
+        name = "d3_array___d3_array_1.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/d3-array/-/d3-array-1.2.1.tgz";
+        sha1 = "d1ca33de2f6ac31efadb8e050a021d7e2396d5dc";
+      };
+    }
+    {
+      name = "d3_axis___d3_axis_1.0.8.tgz";
+      path = fetchurl {
+        name = "d3_axis___d3_axis_1.0.8.tgz";
+        url  = "https://registry.yarnpkg.com/d3-axis/-/d3-axis-1.0.8.tgz";
+        sha1 = "31a705a0b535e65759de14173a31933137f18efa";
+      };
+    }
+    {
+      name = "d3_brush___d3_brush_1.0.4.tgz";
+      path = fetchurl {
+        name = "d3_brush___d3_brush_1.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/d3-brush/-/d3-brush-1.0.4.tgz";
+        sha1 = "00c2f238019f24f6c0a194a26d41a1530ffe7bc4";
+      };
+    }
+    {
+      name = "d3_chord___d3_chord_1.0.4.tgz";
+      path = fetchurl {
+        name = "d3_chord___d3_chord_1.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/d3-chord/-/d3-chord-1.0.4.tgz";
+        sha1 = "7dec4f0ba886f713fe111c45f763414f6f74ca2c";
+      };
+    }
+    {
+      name = "d3_collection___d3_collection_1.0.4.tgz";
+      path = fetchurl {
+        name = "d3_collection___d3_collection_1.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/d3-collection/-/d3-collection-1.0.4.tgz";
+        sha1 = "342dfd12837c90974f33f1cc0a785aea570dcdc2";
+      };
+    }
+    {
+      name = "d3_color___d3_color_1.0.3.tgz";
+      path = fetchurl {
+        name = "d3_color___d3_color_1.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/d3-color/-/d3-color-1.0.3.tgz";
+        sha1 = "bc7643fca8e53a8347e2fbdaffa236796b58509b";
+      };
+    }
+    {
+      name = "d3_contour___d3_contour_1.3.2.tgz";
+      path = fetchurl {
+        name = "d3_contour___d3_contour_1.3.2.tgz";
+        url  = "https://registry.yarnpkg.com/d3-contour/-/d3-contour-1.3.2.tgz";
+        sha1 = "652aacd500d2264cb3423cee10db69f6f59bead3";
+      };
+    }
+    {
+      name = "d3_dispatch___d3_dispatch_1.0.3.tgz";
+      path = fetchurl {
+        name = "d3_dispatch___d3_dispatch_1.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/d3-dispatch/-/d3-dispatch-1.0.3.tgz";
+        sha1 = "46e1491eaa9b58c358fce5be4e8bed626e7871f8";
+      };
+    }
+    {
+      name = "d3_drag___d3_drag_1.2.1.tgz";
+      path = fetchurl {
+        name = "d3_drag___d3_drag_1.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/d3-drag/-/d3-drag-1.2.1.tgz";
+        sha1 = "df8dd4c502fb490fc7462046a8ad98a5c479282d";
+      };
+    }
+    {
+      name = "d3_dsv___d3_dsv_1.0.8.tgz";
+      path = fetchurl {
+        name = "d3_dsv___d3_dsv_1.0.8.tgz";
+        url  = "https://registry.yarnpkg.com/d3-dsv/-/d3-dsv-1.0.8.tgz";
+        sha1 = "907e240d57b386618dc56468bacfe76bf19764ae";
+      };
+    }
+    {
+      name = "d3_ease___d3_ease_1.0.3.tgz";
+      path = fetchurl {
+        name = "d3_ease___d3_ease_1.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/d3-ease/-/d3-ease-1.0.3.tgz";
+        sha1 = "68bfbc349338a380c44d8acc4fbc3304aa2d8c0e";
+      };
+    }
+    {
+      name = "d3_fetch___d3_fetch_1.1.2.tgz";
+      path = fetchurl {
+        name = "d3_fetch___d3_fetch_1.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/d3-fetch/-/d3-fetch-1.1.2.tgz";
+        sha1 = "957c8fbc6d4480599ba191b1b2518bf86b3e1be2";
+      };
+    }
+    {
+      name = "d3_force___d3_force_1.1.0.tgz";
+      path = fetchurl {
+        name = "d3_force___d3_force_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/d3-force/-/d3-force-1.1.0.tgz";
+        sha1 = "cebf3c694f1078fcc3d4daf8e567b2fbd70d4ea3";
+      };
+    }
+    {
+      name = "d3_format___d3_format_1.2.2.tgz";
+      path = fetchurl {
+        name = "d3_format___d3_format_1.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/d3-format/-/d3-format-1.2.2.tgz";
+        sha1 = "1a39c479c8a57fe5051b2e67a3bee27061a74e7a";
+      };
+    }
+    {
+      name = "d3_geo___d3_geo_1.9.1.tgz";
+      path = fetchurl {
+        name = "d3_geo___d3_geo_1.9.1.tgz";
+        url  = "https://registry.yarnpkg.com/d3-geo/-/d3-geo-1.9.1.tgz";
+        sha1 = "157e3b0f917379d0f73bebfff3be537f49fa7356";
+      };
+    }
+    {
+      name = "d3_hierarchy___d3_hierarchy_1.1.5.tgz";
+      path = fetchurl {
+        name = "d3_hierarchy___d3_hierarchy_1.1.5.tgz";
+        url  = "https://registry.yarnpkg.com/d3-hierarchy/-/d3-hierarchy-1.1.5.tgz";
+        sha1 = "a1c845c42f84a206bcf1c01c01098ea4ddaa7a26";
+      };
+    }
+    {
+      name = "d3_interpolate___d3_interpolate_1.1.6.tgz";
+      path = fetchurl {
+        name = "d3_interpolate___d3_interpolate_1.1.6.tgz";
+        url  = "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-1.1.6.tgz";
+        sha1 = "2cf395ae2381804df08aa1bf766b7f97b5f68fb6";
+      };
+    }
+    {
+      name = "d3_path___d3_path_1.0.5.tgz";
+      path = fetchurl {
+        name = "d3_path___d3_path_1.0.5.tgz";
+        url  = "https://registry.yarnpkg.com/d3-path/-/d3-path-1.0.5.tgz";
+        sha1 = "241eb1849bd9e9e8021c0d0a799f8a0e8e441764";
+      };
+    }
+    {
+      name = "d3_polygon___d3_polygon_1.0.3.tgz";
+      path = fetchurl {
+        name = "d3_polygon___d3_polygon_1.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/d3-polygon/-/d3-polygon-1.0.3.tgz";
+        sha1 = "16888e9026460933f2b179652ad378224d382c62";
+      };
+    }
+    {
+      name = "d3_quadtree___d3_quadtree_1.0.3.tgz";
+      path = fetchurl {
+        name = "d3_quadtree___d3_quadtree_1.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/d3-quadtree/-/d3-quadtree-1.0.3.tgz";
+        sha1 = "ac7987e3e23fe805a990f28e1b50d38fcb822438";
+      };
+    }
+    {
+      name = "d3_queue___d3_queue_3.0.7.tgz";
+      path = fetchurl {
+        name = "d3_queue___d3_queue_3.0.7.tgz";
+        url  = "https://registry.yarnpkg.com/d3-queue/-/d3-queue-3.0.7.tgz";
+        sha1 = "c93a2e54b417c0959129d7d73f6cf7d4292e7618";
+      };
+    }
+    {
+      name = "d3_random___d3_random_1.1.0.tgz";
+      path = fetchurl {
+        name = "d3_random___d3_random_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/d3-random/-/d3-random-1.1.0.tgz";
+        sha1 = "6642e506c6fa3a648595d2b2469788a8d12529d3";
+      };
+    }
+    {
+      name = "d3_request___d3_request_1.0.6.tgz";
+      path = fetchurl {
+        name = "d3_request___d3_request_1.0.6.tgz";
+        url  = "https://registry.yarnpkg.com/d3-request/-/d3-request-1.0.6.tgz";
+        sha1 = "a1044a9ef4ec28c824171c9379fae6d79474b19f";
+      };
+    }
+    {
+      name = "d3_scale_chromatic___d3_scale_chromatic_1.3.3.tgz";
+      path = fetchurl {
+        name = "d3_scale_chromatic___d3_scale_chromatic_1.3.3.tgz";
+        url  = "https://registry.yarnpkg.com/d3-scale-chromatic/-/d3-scale-chromatic-1.3.3.tgz";
+        sha1 = "dad4366f0edcb288f490128979c3c793583ed3c0";
+      };
+    }
+    {
+      name = "d3_scale___d3_scale_1.0.7.tgz";
+      path = fetchurl {
+        name = "d3_scale___d3_scale_1.0.7.tgz";
+        url  = "https://registry.yarnpkg.com/d3-scale/-/d3-scale-1.0.7.tgz";
+        sha1 = "fa90324b3ea8a776422bd0472afab0b252a0945d";
+      };
+    }
+    {
+      name = "d3_scale___d3_scale_2.2.2.tgz";
+      path = fetchurl {
+        name = "d3_scale___d3_scale_2.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/d3-scale/-/d3-scale-2.2.2.tgz";
+        sha1 = "4e880e0b2745acaaddd3ede26a9e908a9e17b81f";
+      };
+    }
+    {
+      name = "d3_selection___d3_selection_1.3.0.tgz";
+      path = fetchurl {
+        name = "d3_selection___d3_selection_1.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.3.0.tgz";
+        sha1 = "d53772382d3dc4f7507bfb28bcd2d6aed2a0ad6d";
+      };
+    }
+    {
+      name = "d3_shape___d3_shape_1.2.0.tgz";
+      path = fetchurl {
+        name = "d3_shape___d3_shape_1.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/d3-shape/-/d3-shape-1.2.0.tgz";
+        sha1 = "45d01538f064bafd05ea3d6d2cb748fd8c41f777";
+      };
+    }
+    {
+      name = "d3_time_format___d3_time_format_2.1.1.tgz";
+      path = fetchurl {
+        name = "d3_time_format___d3_time_format_2.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-2.1.1.tgz";
+        sha1 = "85b7cdfbc9ffca187f14d3c456ffda268081bb31";
+      };
+    }
+    {
+      name = "d3_time___d3_time_1.0.8.tgz";
+      path = fetchurl {
+        name = "d3_time___d3_time_1.0.8.tgz";
+        url  = "https://registry.yarnpkg.com/d3-time/-/d3-time-1.0.8.tgz";
+        sha1 = "dbd2d6007bf416fe67a76d17947b784bffea1e84";
+      };
+    }
+    {
+      name = "d3_timer___d3_timer_1.0.7.tgz";
+      path = fetchurl {
+        name = "d3_timer___d3_timer_1.0.7.tgz";
+        url  = "https://registry.yarnpkg.com/d3-timer/-/d3-timer-1.0.7.tgz";
+        sha1 = "df9650ca587f6c96607ff4e60cc38229e8dd8531";
+      };
+    }
+    {
+      name = "d3_transition___d3_transition_1.1.1.tgz";
+      path = fetchurl {
+        name = "d3_transition___d3_transition_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/d3-transition/-/d3-transition-1.1.1.tgz";
+        sha1 = "d8ef89c3b848735b060e54a39b32aaebaa421039";
+      };
+    }
+    {
+      name = "d3_voronoi___d3_voronoi_1.1.2.tgz";
+      path = fetchurl {
+        name = "d3_voronoi___d3_voronoi_1.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/d3-voronoi/-/d3-voronoi-1.1.2.tgz";
+        sha1 = "1687667e8f13a2d158c80c1480c5a29cb0d8973c";
+      };
+    }
+    {
+      name = "d3_zoom___d3_zoom_1.7.1.tgz";
+      path = fetchurl {
+        name = "d3_zoom___d3_zoom_1.7.1.tgz";
+        url  = "https://registry.yarnpkg.com/d3-zoom/-/d3-zoom-1.7.1.tgz";
+        sha1 = "02f43b3c3e2db54f364582d7e4a236ccc5506b63";
+      };
+    }
+    {
+      name = "d3___d3_4.13.0.tgz";
+      path = fetchurl {
+        name = "d3___d3_4.13.0.tgz";
+        url  = "https://registry.yarnpkg.com/d3/-/d3-4.13.0.tgz";
+        sha1 = "ab236ff8cf0cfc27a81e69bf2fb7518bc9b4f33d";
+      };
+    }
+    {
+      name = "d3___d3_5.9.2.tgz";
+      path = fetchurl {
+        name = "d3___d3_5.9.2.tgz";
+        url  = "https://registry.yarnpkg.com/d3/-/d3-5.9.2.tgz";
+        sha1 = "64e8a7e9c3d96d9e6e4999d2c8a2c829767e67f5";
+      };
+    }
+    {
+      name = "dagre_d3_renderer___dagre_d3_renderer_0.5.8.tgz";
+      path = fetchurl {
+        name = "dagre_d3_renderer___dagre_d3_renderer_0.5.8.tgz";
+        url  = "https://registry.yarnpkg.com/dagre-d3-renderer/-/dagre-d3-renderer-0.5.8.tgz";
+        sha1 = "aa071bb71d3c4d67426925906f3f6ddead49c1a3";
+      };
+    }
+    {
+      name = "dagre_layout___dagre_layout_0.8.8.tgz";
+      path = fetchurl {
+        name = "dagre_layout___dagre_layout_0.8.8.tgz";
+        url  = "https://registry.yarnpkg.com/dagre-layout/-/dagre-layout-0.8.8.tgz";
+        sha1 = "9b6792f24229f402441c14162c1049e3f261f6d9";
+      };
+    }
+    {
+      name = "dashdash___dashdash_1.14.1.tgz";
+      path = fetchurl {
+        name = "dashdash___dashdash_1.14.1.tgz";
+        url  = "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz";
+        sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0";
+      };
+    }
+    {
+      name = "data_urls___data_urls_1.1.0.tgz";
+      path = fetchurl {
+        name = "data_urls___data_urls_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/data-urls/-/data-urls-1.1.0.tgz";
+        sha1 = "15ee0582baa5e22bb59c77140da8f9c76963bbfe";
+      };
+    }
+    {
+      name = "date_format___date_format_2.1.0.tgz";
+      path = fetchurl {
+        name = "date_format___date_format_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/date-format/-/date-format-2.1.0.tgz";
+        sha1 = "31d5b5ea211cf5fd764cd38baf9d033df7e125cf";
+      };
+    }
+    {
+      name = "date_now___date_now_0.1.4.tgz";
+      path = fetchurl {
+        name = "date_now___date_now_0.1.4.tgz";
+        url  = "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz";
+        sha1 = "eaf439fd4d4848ad74e5cc7dbef200672b9e345b";
+      };
+    }
+    {
+      name = "dateformat___dateformat_3.0.3.tgz";
+      path = fetchurl {
+        name = "dateformat___dateformat_3.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz";
+        sha1 = "a6e37499a4d9a9cf85ef5872044d62901c9889ae";
+      };
+    }
+    {
+      name = "de_indent___de_indent_1.0.2.tgz";
+      path = fetchurl {
+        name = "de_indent___de_indent_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz";
+        sha1 = "b2038e846dc33baa5796128d0804b455b8c1e21d";
+      };
+    }
+    {
+      name = "debug___debug_2.6.9.tgz";
+      path = fetchurl {
+        name = "debug___debug_2.6.9.tgz";
+        url  = "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz";
+        sha1 = "5d128515df134ff327e90a4c93f4e077a536341f";
+      };
+    }
+    {
+      name = "debug___debug_3.1.0.tgz";
+      path = fetchurl {
+        name = "debug___debug_3.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz";
+        sha1 = "5bb5a0672628b64149566ba16819e61518c67261";
+      };
+    }
+    {
+      name = "debug___debug_3.2.6.tgz";
+      path = fetchurl {
+        name = "debug___debug_3.2.6.tgz";
+        url  = "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz";
+        sha1 = "e83d17de16d8a7efb7717edbe5fb10135eee629b";
+      };
+    }
+    {
+      name = "debug___debug_4.1.1.tgz";
+      path = fetchurl {
+        name = "debug___debug_4.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz";
+        sha1 = "3b72260255109c6b589cee050f1d516139664791";
+      };
+    }
+    {
+      name = "decamelize_keys___decamelize_keys_1.1.0.tgz";
+      path = fetchurl {
+        name = "decamelize_keys___decamelize_keys_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz";
+        sha1 = "d171a87933252807eb3cb61dc1c1445d078df2d9";
+      };
+    }
+    {
+      name = "decamelize___decamelize_1.2.0.tgz";
+      path = fetchurl {
+        name = "decamelize___decamelize_1.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz";
+        sha1 = "f6534d15148269b20352e7bee26f501f9a191290";
+      };
+    }
+    {
+      name = "decamelize___decamelize_2.0.0.tgz";
+      path = fetchurl {
+        name = "decamelize___decamelize_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/decamelize/-/decamelize-2.0.0.tgz";
+        sha1 = "656d7bbc8094c4c788ea53c5840908c9c7d063c7";
+      };
+    }
+    {
+      name = "deckar01_task_list___deckar01_task_list_2.2.0.tgz";
+      path = fetchurl {
+        name = "deckar01_task_list___deckar01_task_list_2.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/deckar01-task_list/-/deckar01-task_list-2.2.0.tgz";
+        sha1 = "5cc3ea06f01d3d786b1a667064a462eb5d069bd3";
+      };
+    }
+    {
+      name = "decode_uri_component___decode_uri_component_0.2.0.tgz";
+      path = fetchurl {
+        name = "decode_uri_component___decode_uri_component_0.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz";
+        sha1 = "eb3913333458775cb84cd1a1fae062106bb87545";
+      };
+    }
+    {
+      name = "decompress_response___decompress_response_3.3.0.tgz";
+      path = fetchurl {
+        name = "decompress_response___decompress_response_3.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz";
+        sha1 = "80a4dd323748384bfa248083622aedec982adff3";
+      };
+    }
+    {
+      name = "deep_equal___deep_equal_1.0.1.tgz";
+      path = fetchurl {
+        name = "deep_equal___deep_equal_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz";
+        sha1 = "f5d260292b660e084eff4cdbc9f08ad3247448b5";
+      };
+    }
+    {
+      name = "deep_extend___deep_extend_0.6.0.tgz";
+      path = fetchurl {
+        name = "deep_extend___deep_extend_0.6.0.tgz";
+        url  = "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz";
+        sha1 = "c4fa7c95404a17a9c3e8ca7e1537312b736330ac";
+      };
+    }
+    {
+      name = "deep_extend___deep_extend_0.5.1.tgz";
+      path = fetchurl {
+        name = "deep_extend___deep_extend_0.5.1.tgz";
+        url  = "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.5.1.tgz";
+        sha1 = "b894a9dd90d3023fbf1c55a394fb858eb2066f1f";
+      };
+    }
+    {
+      name = "deep_is___deep_is_0.1.3.tgz";
+      path = fetchurl {
+        name = "deep_is___deep_is_0.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz";
+        sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34";
+      };
+    }
+    {
+      name = "default_gateway___default_gateway_2.7.2.tgz";
+      path = fetchurl {
+        name = "default_gateway___default_gateway_2.7.2.tgz";
+        url  = "https://registry.yarnpkg.com/default-gateway/-/default-gateway-2.7.2.tgz";
+        sha1 = "b7ef339e5e024b045467af403d50348db4642d0f";
+      };
+    }
+    {
+      name = "default_require_extensions___default_require_extensions_2.0.0.tgz";
+      path = fetchurl {
+        name = "default_require_extensions___default_require_extensions_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-2.0.0.tgz";
+        sha1 = "f5f8fbb18a7d6d50b21f641f649ebb522cfe24f7";
+      };
+    }
+    {
+      name = "define_properties___define_properties_1.1.3.tgz";
+      path = fetchurl {
+        name = "define_properties___define_properties_1.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz";
+        sha1 = "cf88da6cbee26fe6db7094f61d870cbd84cee9f1";
+      };
+    }
+    {
+      name = "define_property___define_property_0.2.5.tgz";
+      path = fetchurl {
+        name = "define_property___define_property_0.2.5.tgz";
+        url  = "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz";
+        sha1 = "c35b1ef918ec3c990f9a5bc57be04aacec5c8116";
+      };
+    }
+    {
+      name = "define_property___define_property_1.0.0.tgz";
+      path = fetchurl {
+        name = "define_property___define_property_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz";
+        sha1 = "769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6";
+      };
+    }
+    {
+      name = "define_property___define_property_2.0.2.tgz";
+      path = fetchurl {
+        name = "define_property___define_property_2.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz";
+        sha1 = "d459689e8d654ba77e02a817f8710d702cb16e9d";
+      };
+    }
+    {
+      name = "defined___defined_1.0.0.tgz";
+      path = fetchurl {
+        name = "defined___defined_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz";
+        sha1 = "c98d9bcef75674188e110969151199e39b1fa693";
+      };
+    }
+    {
+      name = "del___del_2.2.2.tgz";
+      path = fetchurl {
+        name = "del___del_2.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz";
+        sha1 = "c12c981d067846c84bcaf862cff930d907ffd1a8";
+      };
+    }
+    {
+      name = "del___del_3.0.0.tgz";
+      path = fetchurl {
+        name = "del___del_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz";
+        sha1 = "53ecf699ffcbcb39637691ab13baf160819766e5";
+      };
+    }
+    {
+      name = "delayed_stream___delayed_stream_1.0.0.tgz";
+      path = fetchurl {
+        name = "delayed_stream___delayed_stream_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz";
+        sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619";
+      };
+    }
+    {
+      name = "delegate___delegate_3.1.2.tgz";
+      path = fetchurl {
+        name = "delegate___delegate_3.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/delegate/-/delegate-3.1.2.tgz";
+        sha1 = "1e1bc6f5cadda6cb6cbf7e6d05d0bcdd5712aebe";
+      };
+    }
+    {
+      name = "delegates___delegates_1.0.0.tgz";
+      path = fetchurl {
+        name = "delegates___delegates_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz";
+        sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a";
+      };
+    }
+    {
+      name = "depd___depd_1.1.1.tgz";
+      path = fetchurl {
+        name = "depd___depd_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/depd/-/depd-1.1.1.tgz";
+        sha1 = "5783b4e1c459f06fa5ca27f991f3d06e7a310359";
+      };
+    }
+    {
+      name = "depd___depd_1.1.2.tgz";
+      path = fetchurl {
+        name = "depd___depd_1.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz";
+        sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9";
+      };
+    }
+    {
+      name = "des.js___des.js_1.0.0.tgz";
+      path = fetchurl {
+        name = "des.js___des.js_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz";
+        sha1 = "c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc";
+      };
+    }
+    {
+      name = "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 = "detab___detab_2.0.2.tgz";
+      path = fetchurl {
+        name = "detab___detab_2.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/detab/-/detab-2.0.2.tgz";
+        sha1 = "074970d1a807b045d0258a4235df5928dd683561";
+      };
+    }
+    {
+      name = "detect_file___detect_file_1.0.0.tgz";
+      path = fetchurl {
+        name = "detect_file___detect_file_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz";
+        sha1 = "f0d66d03672a825cb1b73bdb3fe62310c8e552b7";
+      };
+    }
+    {
+      name = "detect_libc___detect_libc_1.0.3.tgz";
+      path = fetchurl {
+        name = "detect_libc___detect_libc_1.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz";
+        sha1 = "fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b";
+      };
+    }
+    {
+      name = "detect_newline___detect_newline_2.1.0.tgz";
+      path = fetchurl {
+        name = "detect_newline___detect_newline_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz";
+        sha1 = "f41f1c10be4b00e87b5f13da680759f2c5bfd3e2";
+      };
+    }
+    {
+      name = "detect_node___detect_node_2.0.4.tgz";
+      path = fetchurl {
+        name = "detect_node___detect_node_2.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz";
+        sha1 = "014ee8f8f669c5c58023da64b8179c083a28c46c";
+      };
+    }
+    {
+      name = "detective___detective_4.7.1.tgz";
+      path = fetchurl {
+        name = "detective___detective_4.7.1.tgz";
+        url  = "https://registry.yarnpkg.com/detective/-/detective-4.7.1.tgz";
+        sha1 = "0eca7314338442febb6d65da54c10bb1c82b246e";
+      };
+    }
+    {
+      name = "di___di_0.0.1.tgz";
+      path = fetchurl {
+        name = "di___di_0.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz";
+        sha1 = "806649326ceaa7caa3306d75d985ea2748ba913c";
+      };
+    }
+    {
+      name = "diff_sequences___diff_sequences_24.3.0.tgz";
+      path = fetchurl {
+        name = "diff_sequences___diff_sequences_24.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-24.3.0.tgz";
+        sha1 = "0f20e8a1df1abddaf4d9c226680952e64118b975";
+      };
+    }
+    {
+      name = "diff___diff_3.5.0.tgz";
+      path = fetchurl {
+        name = "diff___diff_3.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz";
+        sha1 = "800c0dd1e0a8bfbc95835c202ad220fe317e5a12";
+      };
+    }
+    {
+      name = "diff___diff_4.0.1.tgz";
+      path = fetchurl {
+        name = "diff___diff_4.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/diff/-/diff-4.0.1.tgz";
+        sha1 = "0c667cb467ebbb5cea7f14f135cc2dba7780a8ff";
+      };
+    }
+    {
+      name = "diffie_hellman___diffie_hellman_5.0.2.tgz";
+      path = fetchurl {
+        name = "diffie_hellman___diffie_hellman_5.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.2.tgz";
+        sha1 = "b5835739270cfe26acf632099fded2a07f209e5e";
+      };
+    }
+    {
+      name = "dir_glob___dir_glob_2.2.2.tgz";
+      path = fetchurl {
+        name = "dir_glob___dir_glob_2.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.2.2.tgz";
+        sha1 = "fa09f0694153c8918b18ba0deafae94769fc50c4";
+      };
+    }
+    {
+      name = "dns_equal___dns_equal_1.0.0.tgz";
+      path = fetchurl {
+        name = "dns_equal___dns_equal_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz";
+        sha1 = "b39e7f1da6eb0a75ba9c17324b34753c47e0654d";
+      };
+    }
+    {
+      name = "dns_packet___dns_packet_1.2.2.tgz";
+      path = fetchurl {
+        name = "dns_packet___dns_packet_1.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.2.2.tgz";
+        sha1 = "a8a26bec7646438963fc86e06f8f8b16d6c8bf7a";
+      };
+    }
+    {
+      name = "dns_txt___dns_txt_2.0.2.tgz";
+      path = fetchurl {
+        name = "dns_txt___dns_txt_2.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/dns-txt/-/dns-txt-2.0.2.tgz";
+        sha1 = "b91d806f5d27188e4ab3e7d107d881a1cc4642b6";
+      };
+    }
+    {
+      name = "docdash___docdash_1.0.2.tgz";
+      path = fetchurl {
+        name = "docdash___docdash_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/docdash/-/docdash-1.0.2.tgz";
+        sha1 = "0449a8f6bb247f563020b78a5485dea95ae2e094";
+      };
+    }
+    {
+      name = "doctrine_temporary_fork___doctrine_temporary_fork_2.1.0.tgz";
+      path = fetchurl {
+        name = "doctrine_temporary_fork___doctrine_temporary_fork_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/doctrine-temporary-fork/-/doctrine-temporary-fork-2.1.0.tgz";
+        sha1 = "36f2154f556ee4f1e60311d391cd23de5187ed57";
+      };
+    }
+    {
+      name = "doctrine___doctrine_1.5.0.tgz";
+      path = fetchurl {
+        name = "doctrine___doctrine_1.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz";
+        sha1 = "379dce730f6166f76cefa4e6707a159b02c5a6fa";
+      };
+    }
+    {
+      name = "doctrine___doctrine_2.1.0.tgz";
+      path = fetchurl {
+        name = "doctrine___doctrine_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz";
+        sha1 = "5cd01fc101621b42c4cd7f5d1a66243716d3f39d";
+      };
+    }
+    {
+      name = "document_register_element___document_register_element_1.13.1.tgz";
+      path = fetchurl {
+        name = "document_register_element___document_register_element_1.13.1.tgz";
+        url  = "https://registry.yarnpkg.com/document-register-element/-/document-register-element-1.13.1.tgz";
+        sha1 = "dad8cb7be38e04ee3f56842e6cf81af46c1249ba";
+      };
+    }
+    {
+      name = "documentation___documentation_12.0.3.tgz";
+      path = fetchurl {
+        name = "documentation___documentation_12.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/documentation/-/documentation-12.0.3.tgz";
+        sha1 = "32f91da8e5cb4104f69db9fd32c87773a1ad6240";
+      };
+    }
+    {
+      name = "dom_serialize___dom_serialize_2.2.1.tgz";
+      path = fetchurl {
+        name = "dom_serialize___dom_serialize_2.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/dom-serialize/-/dom-serialize-2.2.1.tgz";
+        sha1 = "562ae8999f44be5ea3076f5419dcd59eb43ac95b";
+      };
+    }
+    {
+      name = "dom_serializer___dom_serializer_0.1.0.tgz";
+      path = fetchurl {
+        name = "dom_serializer___dom_serializer_0.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.0.tgz";
+        sha1 = "073c697546ce0780ce23be4a28e293e40bc30c82";
+      };
+    }
+    {
+      name = "domain_browser___domain_browser_1.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 = "domelementtype___domelementtype_1.3.0.tgz";
+      path = fetchurl {
+        name = "domelementtype___domelementtype_1.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz";
+        sha1 = "b17aed82e8ab59e52dd9c19b1756e0fc187204c2";
+      };
+    }
+    {
+      name = "domelementtype___domelementtype_1.1.3.tgz";
+      path = fetchurl {
+        name = "domelementtype___domelementtype_1.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.1.3.tgz";
+        sha1 = "bd28773e2642881aec51544924299c5cd822185b";
+      };
+    }
+    {
+      name = "domexception___domexception_1.0.1.tgz";
+      path = fetchurl {
+        name = "domexception___domexception_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/domexception/-/domexception-1.0.1.tgz";
+        sha1 = "937442644ca6a31261ef36e3ec677fe805582c90";
+      };
+    }
+    {
+      name = "domhandler___domhandler_2.4.1.tgz";
+      path = fetchurl {
+        name = "domhandler___domhandler_2.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.1.tgz";
+        sha1 = "892e47000a99be55bbf3774ffea0561d8879c259";
+      };
+    }
+    {
+      name = "domutils___domutils_1.6.2.tgz";
+      path = fetchurl {
+        name = "domutils___domutils_1.6.2.tgz";
+        url  = "https://registry.yarnpkg.com/domutils/-/domutils-1.6.2.tgz";
+        sha1 = "1958cc0b4c9426e9ed367fb1c8e854891b0fa3ff";
+      };
+    }
+    {
+      name = "dot_prop___dot_prop_4.2.0.tgz";
+      path = fetchurl {
+        name = "dot_prop___dot_prop_4.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz";
+        sha1 = "1f19e0c2e1aa0e32797c49799f2837ac6af69c57";
+      };
+    }
+    {
+      name = "dropzone___dropzone_4.2.0.tgz";
+      path = fetchurl {
+        name = "dropzone___dropzone_4.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/dropzone/-/dropzone-4.2.0.tgz";
+        sha1 = "fbe7acbb9918e0706489072ef663effeef8a79f3";
+      };
+    }
+    {
+      name = "duplexer2___duplexer2_0.1.4.tgz";
+      path = fetchurl {
+        name = "duplexer2___duplexer2_0.1.4.tgz";
+        url  = "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz";
+        sha1 = "8b12dab878c0d69e3e7891051662a32fc6bddcc1";
+      };
+    }
+    {
+      name = "duplexer3___duplexer3_0.1.4.tgz";
+      path = fetchurl {
+        name = "duplexer3___duplexer3_0.1.4.tgz";
+        url  = "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz";
+        sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2";
+      };
+    }
+    {
+      name = "duplexer___duplexer_0.1.1.tgz";
+      path = fetchurl {
+        name = "duplexer___duplexer_0.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz";
+        sha1 = "ace6ff808c1ce66b57d1ebf97977acb02334cfc1";
+      };
+    }
+    {
+      name = "duplexify___duplexify_3.7.1.tgz";
+      path = fetchurl {
+        name = "duplexify___duplexify_3.7.1.tgz";
+        url  = "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz";
+        sha1 = "2a4df5317f6ccfd91f86d6fd25d8d8a103b88309";
+      };
+    }
+    {
+      name = "ecc_jsbn___ecc_jsbn_0.1.2.tgz";
+      path = fetchurl {
+        name = "ecc_jsbn___ecc_jsbn_0.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz";
+        sha1 = "3a83a904e54353287874c564b7549386849a98c9";
+      };
+    }
+    {
+      name = "echarts___echarts_4.2.1.tgz";
+      path = fetchurl {
+        name = "echarts___echarts_4.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/echarts/-/echarts-4.2.1.tgz";
+        sha1 = "9a8ea3b03354f86f824d97625c334cf16965ef03";
+      };
+    }
+    {
+      name = "editions___editions_1.3.4.tgz";
+      path = fetchurl {
+        name = "editions___editions_1.3.4.tgz";
+        url  = "https://registry.yarnpkg.com/editions/-/editions-1.3.4.tgz";
+        sha1 = "3662cb592347c3168eb8e498a0ff73271d67f50b";
+      };
+    }
+    {
+      name = "editorconfig___editorconfig_0.15.2.tgz";
+      path = fetchurl {
+        name = "editorconfig___editorconfig_0.15.2.tgz";
+        url  = "https://registry.yarnpkg.com/editorconfig/-/editorconfig-0.15.2.tgz";
+        sha1 = "047be983abb9ab3c2eefe5199cb2b7c5689f0702";
+      };
+    }
+    {
+      name = "ee_first___ee_first_1.1.1.tgz";
+      path = fetchurl {
+        name = "ee_first___ee_first_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz";
+        sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d";
+      };
+    }
+    {
+      name = "ejs___ejs_2.6.1.tgz";
+      path = fetchurl {
+        name = "ejs___ejs_2.6.1.tgz";
+        url  = "https://registry.yarnpkg.com/ejs/-/ejs-2.6.1.tgz";
+        sha1 = "498ec0d495655abc6f23cd61868d926464071aa0";
+      };
+    }
+    {
+      name = "electron_to_chromium___electron_to_chromium_1.3.199.tgz";
+      path = fetchurl {
+        name = "electron_to_chromium___electron_to_chromium_1.3.199.tgz";
+        url  = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.199.tgz";
+        sha1 = "f9a62a74cda77854310a2abffde8b75591ea09a1";
+      };
+    }
+    {
+      name = "elliptic___elliptic_6.4.0.tgz";
+      path = fetchurl {
+        name = "elliptic___elliptic_6.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.0.tgz";
+        sha1 = "cac9af8762c85836187003c8dfe193e5e2eae5df";
+      };
+    }
+    {
+      name = "emoji_regex___emoji_regex_6.1.1.tgz";
+      path = fetchurl {
+        name = "emoji_regex___emoji_regex_6.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-6.1.1.tgz";
+        sha1 = "c6cd0ec1b0642e2a3c67a1137efc5e796da4f88e";
+      };
+    }
+    {
+      name = "emoji_regex___emoji_regex_7.0.3.tgz";
+      path = fetchurl {
+        name = "emoji_regex___emoji_regex_7.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz";
+        sha1 = "933a04052860c85e83c122479c4748a8e4c72156";
+      };
+    }
+    {
+      name = "emoji_regex___emoji_regex_8.0.0.tgz";
+      path = fetchurl {
+        name = "emoji_regex___emoji_regex_8.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz";
+        sha1 = "e818fd69ce5ccfcb404594f842963bf53164cc37";
+      };
+    }
+    {
+      name = "emoji_unicode_version___emoji_unicode_version_0.2.1.tgz";
+      path = fetchurl {
+        name = "emoji_unicode_version___emoji_unicode_version_0.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/emoji-unicode-version/-/emoji-unicode-version-0.2.1.tgz";
+        sha1 = "0ebf3666b5414097971d34994e299fce75cdbafc";
+      };
+    }
+    {
+      name = "emojis_list___emojis_list_2.1.0.tgz";
+      path = fetchurl {
+        name = "emojis_list___emojis_list_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz";
+        sha1 = "4daa4d9db00f9819880c79fa457ae5b09a1fd389";
+      };
+    }
+    {
+      name = "encodeurl___encodeurl_1.0.2.tgz";
+      path = fetchurl {
+        name = "encodeurl___encodeurl_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz";
+        sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59";
+      };
+    }
+    {
+      name = "end_of_stream___end_of_stream_1.4.1.tgz";
+      path = fetchurl {
+        name = "end_of_stream___end_of_stream_1.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz";
+        sha1 = "ed29634d19baba463b6ce6b80a37213eab71ec43";
+      };
+    }
+    {
+      name = "engine.io_client___engine.io_client_3.2.1.tgz";
+      path = fetchurl {
+        name = "engine.io_client___engine.io_client_3.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.2.1.tgz";
+        sha1 = "6f54c0475de487158a1a7c77d10178708b6add36";
+      };
+    }
+    {
+      name = "engine.io_parser___engine.io_parser_2.1.2.tgz";
+      path = fetchurl {
+        name = "engine.io_parser___engine.io_parser_2.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.1.2.tgz";
+        sha1 = "4c0f4cff79aaeecbbdcfdea66a823c6085409196";
+      };
+    }
+    {
+      name = "engine.io___engine.io_3.2.0.tgz";
+      path = fetchurl {
+        name = "engine.io___engine.io_3.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/engine.io/-/engine.io-3.2.0.tgz";
+        sha1 = "54332506f42f2edc71690d2f2a42349359f3bf7d";
+      };
+    }
+    {
+      name = "enhanced_resolve___enhanced_resolve_4.1.0.tgz";
+      path = fetchurl {
+        name = "enhanced_resolve___enhanced_resolve_4.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz";
+        sha1 = "41c7e0bfdfe74ac1ffe1e57ad6a5c6c9f3742a7f";
+      };
+    }
+    {
+      name = "enhanced_resolve___enhanced_resolve_0.9.1.tgz";
+      path = fetchurl {
+        name = "enhanced_resolve___enhanced_resolve_0.9.1.tgz";
+        url  = "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz";
+        sha1 = "4d6e689b3725f86090927ccc86cd9f1635b89e2e";
+      };
+    }
+    {
+      name = "ent___ent_2.2.0.tgz";
+      path = fetchurl {
+        name = "ent___ent_2.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz";
+        sha1 = "e964219325a21d05f44466a2f686ed6ce5f5dd1d";
+      };
+    }
+    {
+      name = "entities___entities_1.1.1.tgz";
+      path = fetchurl {
+        name = "entities___entities_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz";
+        sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0";
+      };
+    }
+    {
+      name = "errno___errno_0.1.7.tgz";
+      path = fetchurl {
+        name = "errno___errno_0.1.7.tgz";
+        url  = "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz";
+        sha1 = "4684d71779ad39af177e3f007996f7c67c852618";
+      };
+    }
+    {
+      name = "error_ex___error_ex_1.3.2.tgz";
+      path = fetchurl {
+        name = "error_ex___error_ex_1.3.2.tgz";
+        url  = "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz";
+        sha1 = "b4ac40648107fdcdcfae242f428bea8a14d4f1bf";
+      };
+    }
+    {
+      name = "error___error_7.0.2.tgz";
+      path = fetchurl {
+        name = "error___error_7.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/error/-/error-7.0.2.tgz";
+        sha1 = "a5f75fff4d9926126ddac0ea5dc38e689153cb02";
+      };
+    }
+    {
+      name = "es_abstract___es_abstract_1.13.0.tgz";
+      path = fetchurl {
+        name = "es_abstract___es_abstract_1.13.0.tgz";
+        url  = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz";
+        sha1 = "ac86145fdd5099d8dd49558ccba2eaf9b88e24e9";
+      };
+    }
+    {
+      name = "es_to_primitive___es_to_primitive_1.2.0.tgz";
+      path = fetchurl {
+        name = "es_to_primitive___es_to_primitive_1.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz";
+        sha1 = "edf72478033456e8dda8ef09e00ad9650707f377";
+      };
+    }
+    {
+      name = "es6_promise___es6_promise_3.0.2.tgz";
+      path = fetchurl {
+        name = "es6_promise___es6_promise_3.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/es6-promise/-/es6-promise-3.0.2.tgz";
+        sha1 = "010d5858423a5f118979665f46486a95c6ee2bb6";
+      };
+    }
+    {
+      name = "escape_html___escape_html_1.0.3.tgz";
+      path = fetchurl {
+        name = "escape_html___escape_html_1.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz";
+        sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988";
+      };
+    }
+    {
+      name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz";
+      path = fetchurl {
+        name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz";
+        url  = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz";
+        sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4";
+      };
+    }
+    {
+      name = "escaper___escaper_2.5.3.tgz";
+      path = fetchurl {
+        name = "escaper___escaper_2.5.3.tgz";
+        url  = "https://registry.yarnpkg.com/escaper/-/escaper-2.5.3.tgz";
+        sha1 = "8b8fe90ba364054151ab7eff18b4ce43b1e13ab5";
+      };
+    }
+    {
+      name = "escodegen___escodegen_1.11.0.tgz";
+      path = fetchurl {
+        name = "escodegen___escodegen_1.11.0.tgz";
+        url  = "https://registry.yarnpkg.com/escodegen/-/escodegen-1.11.0.tgz";
+        sha1 = "b27a9389481d5bfd5bec76f7bb1eb3f8f4556589";
+      };
+    }
+    {
+      name = "eslint_config_airbnb_base___eslint_config_airbnb_base_13.1.0.tgz";
+      path = fetchurl {
+        name = "eslint_config_airbnb_base___eslint_config_airbnb_base_13.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-13.1.0.tgz";
+        sha1 = "b5a1b480b80dfad16433d6c4ad84e6605052c05c";
+      };
+    }
+    {
+      name = "eslint_config_prettier___eslint_config_prettier_3.3.0.tgz";
+      path = fetchurl {
+        name = "eslint_config_prettier___eslint_config_prettier_3.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-3.3.0.tgz";
+        sha1 = "41afc8d3b852e757f06274ed6c44ca16f939a57d";
+      };
+    }
+    {
+      name = "eslint_import_resolver_jest___eslint_import_resolver_jest_2.1.1.tgz";
+      path = fetchurl {
+        name = "eslint_import_resolver_jest___eslint_import_resolver_jest_2.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-import-resolver-jest/-/eslint-import-resolver-jest-2.1.1.tgz";
+        sha1 = "78c1934e3b5b77283326f036e089cc3b9fae6346";
+      };
+    }
+    {
+      name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.2.tgz";
+      path = fetchurl {
+        name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.2.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz";
+        sha1 = "58f15fb839b8d0576ca980413476aab2472db66a";
+      };
+    }
+    {
+      name = "eslint_import_resolver_webpack___eslint_import_resolver_webpack_0.10.1.tgz";
+      path = fetchurl {
+        name = "eslint_import_resolver_webpack___eslint_import_resolver_webpack_0.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-import-resolver-webpack/-/eslint-import-resolver-webpack-0.10.1.tgz";
+        sha1 = "4cbceed2c0c43e488a74775c30861e58e00fb290";
+      };
+    }
+    {
+      name = "eslint_module_utils___eslint_module_utils_2.3.0.tgz";
+      path = fetchurl {
+        name = "eslint_module_utils___eslint_module_utils_2.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.3.0.tgz";
+        sha1 = "546178dab5e046c8b562bbb50705e2456d7bda49";
+      };
+    }
+    {
+      name = "eslint_plugin_filenames___eslint_plugin_filenames_1.3.2.tgz";
+      path = fetchurl {
+        name = "eslint_plugin_filenames___eslint_plugin_filenames_1.3.2.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-plugin-filenames/-/eslint-plugin-filenames-1.3.2.tgz";
+        sha1 = "7094f00d7aefdd6999e3ac19f72cea058e590cf7";
+      };
+    }
+    {
+      name = "eslint_plugin_import___eslint_plugin_import_2.16.0.tgz";
+      path = fetchurl {
+        name = "eslint_plugin_import___eslint_plugin_import_2.16.0.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.16.0.tgz";
+        sha1 = "97ac3e75d0791c4fac0e15ef388510217be7f66f";
+      };
+    }
+    {
+      name = "eslint_plugin_jasmine___eslint_plugin_jasmine_2.10.1.tgz";
+      path = fetchurl {
+        name = "eslint_plugin_jasmine___eslint_plugin_jasmine_2.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-plugin-jasmine/-/eslint-plugin-jasmine-2.10.1.tgz";
+        sha1 = "5733b709e751f4bc40e31e1c16989bd2cdfbec97";
+      };
+    }
+    {
+      name = "eslint_plugin_jest___eslint_plugin_jest_22.3.0.tgz";
+      path = fetchurl {
+        name = "eslint_plugin_jest___eslint_plugin_jest_22.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-22.3.0.tgz";
+        sha1 = "a10f10dedfc92def774ec9bb5bfbd2fb8e1c96d2";
+      };
+    }
+    {
+      name = "eslint_plugin_promise___eslint_plugin_promise_4.1.1.tgz";
+      path = fetchurl {
+        name = "eslint_plugin_promise___eslint_plugin_promise_4.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-4.1.1.tgz";
+        sha1 = "1e08cb68b5b2cd8839f8d5864c796f56d82746db";
+      };
+    }
+    {
+      name = "eslint_plugin_vue___eslint_plugin_vue_5.0.0.tgz";
+      path = fetchurl {
+        name = "eslint_plugin_vue___eslint_plugin_vue_5.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-5.0.0.tgz";
+        sha1 = "4a2cc1c0e71ea45e1bd9c1a60f925bfe68bb5710";
+      };
+    }
+    {
+      name = "eslint_restricted_globals___eslint_restricted_globals_0.1.1.tgz";
+      path = fetchurl {
+        name = "eslint_restricted_globals___eslint_restricted_globals_0.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-restricted-globals/-/eslint-restricted-globals-0.1.1.tgz";
+        sha1 = "35f0d5cbc64c2e3ed62e93b4b1a7af05ba7ed4d7";
+      };
+    }
+    {
+      name = "eslint_scope___eslint_scope_3.7.1.tgz";
+      path = fetchurl {
+        name = "eslint_scope___eslint_scope_3.7.1.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.1.tgz";
+        sha1 = "3d63c3edfda02e06e01a452ad88caacc7cdcb6e8";
+      };
+    }
+    {
+      name = "eslint_scope___eslint_scope_4.0.0.tgz";
+      path = fetchurl {
+        name = "eslint_scope___eslint_scope_4.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.0.tgz";
+        sha1 = "50bf3071e9338bcdc43331794a0cb533f0136172";
+      };
+    }
+    {
+      name = "eslint_utils___eslint_utils_1.4.2.tgz";
+      path = fetchurl {
+        name = "eslint_utils___eslint_utils_1.4.2.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.2.tgz";
+        sha1 = "166a5180ef6ab7eb462f162fd0e6f2463d7309ab";
+      };
+    }
+    {
+      name = "eslint_visitor_keys___eslint_visitor_keys_1.0.0.tgz";
+      path = fetchurl {
+        name = "eslint_visitor_keys___eslint_visitor_keys_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz";
+        sha1 = "3f3180fb2e291017716acb4c9d6d5b5c34a6a81d";
+      };
+    }
+    {
+      name = "eslint___eslint_5.9.0.tgz";
+      path = fetchurl {
+        name = "eslint___eslint_5.9.0.tgz";
+        url  = "https://registry.yarnpkg.com/eslint/-/eslint-5.9.0.tgz";
+        sha1 = "b234b6d15ef84b5849c6de2af43195a2d59d408e";
+      };
+    }
+    {
+      name = "espree___espree_4.1.0.tgz";
+      path = fetchurl {
+        name = "espree___espree_4.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/espree/-/espree-4.1.0.tgz";
+        sha1 = "728d5451e0fd156c04384a7ad89ed51ff54eb25f";
+      };
+    }
+    {
+      name = "espree___espree_5.0.1.tgz";
+      path = fetchurl {
+        name = "espree___espree_5.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/espree/-/espree-5.0.1.tgz";
+        sha1 = "5d6526fa4fc7f0788a5cf75b15f30323e2f81f7a";
+      };
+    }
+    {
+      name = "esprima___esprima_3.1.3.tgz";
+      path = fetchurl {
+        name = "esprima___esprima_3.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz";
+        sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633";
+      };
+    }
+    {
+      name = "esprima___esprima_4.0.1.tgz";
+      path = fetchurl {
+        name = "esprima___esprima_4.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz";
+        sha1 = "13b04cdb3e6c5d19df91ab6987a8695619b0aa71";
+      };
+    }
+    {
+      name = "esquery___esquery_1.0.1.tgz";
+      path = fetchurl {
+        name = "esquery___esquery_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz";
+        sha1 = "406c51658b1f5991a5f9b62b1dc25b00e3e5c708";
+      };
+    }
+    {
+      name = "esrecurse___esrecurse_4.2.1.tgz";
+      path = fetchurl {
+        name = "esrecurse___esrecurse_4.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz";
+        sha1 = "007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf";
+      };
+    }
+    {
+      name = "estraverse___estraverse_4.2.0.tgz";
+      path = fetchurl {
+        name = "estraverse___estraverse_4.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz";
+        sha1 = "0dee3fed31fcd469618ce7342099fc1afa0bdb13";
+      };
+    }
+    {
+      name = "esutils___esutils_2.0.2.tgz";
+      path = fetchurl {
+        name = "esutils___esutils_2.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz";
+        sha1 = "0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b";
+      };
+    }
+    {
+      name = "etag___etag_1.8.1.tgz";
+      path = fetchurl {
+        name = "etag___etag_1.8.1.tgz";
+        url  = "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz";
+        sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887";
+      };
+    }
+    {
+      name = "eve_raphael___eve_raphael_0.5.0.tgz";
+      path = fetchurl {
+        name = "eve_raphael___eve_raphael_0.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/eve-raphael/-/eve-raphael-0.5.0.tgz";
+        sha1 = "17c754b792beef3fa6684d79cf5a47c63c4cda30";
+      };
+    }
+    {
+      name = "eventemitter3___eventemitter3_1.2.0.tgz";
+      path = fetchurl {
+        name = "eventemitter3___eventemitter3_1.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-1.2.0.tgz";
+        sha1 = "1c86991d816ad1e504750e73874224ecf3bec508";
+      };
+    }
+    {
+      name = "events___events_1.1.1.tgz";
+      path = fetchurl {
+        name = "events___events_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz";
+        sha1 = "9ebdb7635ad099c70dcc4c2a1f5004288e8bd924";
+      };
+    }
+    {
+      name = "eventsource___eventsource_1.0.7.tgz";
+      path = fetchurl {
+        name = "eventsource___eventsource_1.0.7.tgz";
+        url  = "https://registry.yarnpkg.com/eventsource/-/eventsource-1.0.7.tgz";
+        sha1 = "8fbc72c93fcd34088090bc0a4e64f4b5cee6d8d0";
+      };
+    }
+    {
+      name = "evp_bytestokey___evp_bytestokey_1.0.3.tgz";
+      path = fetchurl {
+        name = "evp_bytestokey___evp_bytestokey_1.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz";
+        sha1 = "7fcbdb198dc71959432efe13842684e0525acb02";
+      };
+    }
+    {
+      name = "exec_sh___exec_sh_0.3.2.tgz";
+      path = fetchurl {
+        name = "exec_sh___exec_sh_0.3.2.tgz";
+        url  = "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.2.tgz";
+        sha1 = "6738de2eb7c8e671d0366aea0b0db8c6f7d7391b";
+      };
+    }
+    {
+      name = "execa___execa_0.10.0.tgz";
+      path = fetchurl {
+        name = "execa___execa_0.10.0.tgz";
+        url  = "https://registry.yarnpkg.com/execa/-/execa-0.10.0.tgz";
+        sha1 = "ff456a8f53f90f8eccc71a96d11bdfc7f082cb50";
+      };
+    }
+    {
+      name = "execa___execa_0.7.0.tgz";
+      path = fetchurl {
+        name = "execa___execa_0.7.0.tgz";
+        url  = "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz";
+        sha1 = "944becd34cc41ee32a63a9faf27ad5a65fc59777";
+      };
+    }
+    {
+      name = "execa___execa_1.0.0.tgz";
+      path = fetchurl {
+        name = "execa___execa_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz";
+        sha1 = "c6236a5bb4df6d6f15e88e7f017798216749ddd8";
+      };
+    }
+    {
+      name = "execall___execall_2.0.0.tgz";
+      path = fetchurl {
+        name = "execall___execall_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/execall/-/execall-2.0.0.tgz";
+        sha1 = "16a06b5fe5099df7d00be5d9c06eecded1663b45";
+      };
+    }
+    {
+      name = "exit___exit_0.1.2.tgz";
+      path = fetchurl {
+        name = "exit___exit_0.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz";
+        sha1 = "0632638f8d877cc82107d30a0fff1a17cba1cd0c";
+      };
+    }
+    {
+      name = "expand_brackets___expand_brackets_2.1.4.tgz";
+      path = fetchurl {
+        name = "expand_brackets___expand_brackets_2.1.4.tgz";
+        url  = "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz";
+        sha1 = "b77735e315ce30f6b6eff0f83b04151a22449622";
+      };
+    }
+    {
+      name = "expand_tilde___expand_tilde_2.0.2.tgz";
+      path = fetchurl {
+        name = "expand_tilde___expand_tilde_2.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz";
+        sha1 = "97e801aa052df02454de46b02bf621642cdc8502";
+      };
+    }
+    {
+      name = "expect___expect_24.8.0.tgz";
+      path = fetchurl {
+        name = "expect___expect_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/expect/-/expect-24.8.0.tgz";
+        sha1 = "471f8ec256b7b6129ca2524b2a62f030df38718d";
+      };
+    }
+    {
+      name = "exports_loader___exports_loader_0.7.0.tgz";
+      path = fetchurl {
+        name = "exports_loader___exports_loader_0.7.0.tgz";
+        url  = "https://registry.yarnpkg.com/exports-loader/-/exports-loader-0.7.0.tgz";
+        sha1 = "84881c784dea6036b8e1cd1dac3da9b6409e21a5";
+      };
+    }
+    {
+      name = "https___registry.npmjs.org_express___express_4.16.3.tgz";
+      path = fetchurl {
+        name = "https___registry.npmjs.org_express___express_4.16.3.tgz";
+        url  = "https://registry.npmjs.org/express/-/express-4.16.3.tgz";
+        sha1 = "6af8a502350db3246ecc4becf6b5a34d22f7ed53";
+      };
+    }
+    {
+      name = "extend_shallow___extend_shallow_2.0.1.tgz";
+      path = fetchurl {
+        name = "extend_shallow___extend_shallow_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz";
+        sha1 = "51af7d614ad9a9f610ea1bafbb989d6b1c56890f";
+      };
+    }
+    {
+      name = "extend_shallow___extend_shallow_3.0.2.tgz";
+      path = fetchurl {
+        name = "extend_shallow___extend_shallow_3.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz";
+        sha1 = "26a71aaf073b39fb2127172746131c2704028db8";
+      };
+    }
+    {
+      name = "extend___extend_3.0.2.tgz";
+      path = fetchurl {
+        name = "extend___extend_3.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz";
+        sha1 = "f8b1136b4071fbd8eb140aff858b1019ec2915fa";
+      };
+    }
+    {
+      name = "external_editor___external_editor_3.0.0.tgz";
+      path = fetchurl {
+        name = "external_editor___external_editor_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/external-editor/-/external-editor-3.0.0.tgz";
+        sha1 = "dc35c48c6f98a30ca27a20e9687d7f3c77704bb6";
+      };
+    }
+    {
+      name = "extglob___extglob_2.0.4.tgz";
+      path = fetchurl {
+        name = "extglob___extglob_2.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz";
+        sha1 = "ad00fe4dc612a9232e8718711dc5cb5ab0285543";
+      };
+    }
+    {
+      name = "extract_files___extract_files_5.0.1.tgz";
+      path = fetchurl {
+        name = "extract_files___extract_files_5.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/extract-files/-/extract-files-5.0.1.tgz";
+        sha1 = "c9492a8410be643e260a376f0151361993d5f659";
+      };
+    }
+    {
+      name = "extract_from_css___extract_from_css_0.4.4.tgz";
+      path = fetchurl {
+        name = "extract_from_css___extract_from_css_0.4.4.tgz";
+        url  = "https://registry.yarnpkg.com/extract-from-css/-/extract-from-css-0.4.4.tgz";
+        sha1 = "1ea7df2e7c7c6eb9922fa08e8adaea486f6f8f92";
+      };
+    }
+    {
+      name = "extsprintf___extsprintf_1.3.0.tgz";
+      path = fetchurl {
+        name = "extsprintf___extsprintf_1.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz";
+        sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05";
+      };
+    }
+    {
+      name = "fast_deep_equal___fast_deep_equal_2.0.1.tgz";
+      path = fetchurl {
+        name = "fast_deep_equal___fast_deep_equal_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz";
+        sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49";
+      };
+    }
+    {
+      name = "fast_glob___fast_glob_2.2.6.tgz";
+      path = fetchurl {
+        name = "fast_glob___fast_glob_2.2.6.tgz";
+        url  = "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.6.tgz";
+        sha1 = "a5d5b697ec8deda468d85a74035290a025a95295";
+      };
+    }
+    {
+      name = "fast_json_stable_stringify___fast_json_stable_stringify_2.0.0.tgz";
+      path = fetchurl {
+        name = "fast_json_stable_stringify___fast_json_stable_stringify_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz";
+        sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2";
+      };
+    }
+    {
+      name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz";
+      path = fetchurl {
+        name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz";
+        url  = "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz";
+        sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917";
+      };
+    }
+    {
+      name = "fastparse___fastparse_1.1.1.tgz";
+      path = fetchurl {
+        name = "fastparse___fastparse_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.1.tgz";
+        sha1 = "d1e2643b38a94d7583b479060e6c4affc94071f8";
+      };
+    }
+    {
+      name = "fault___fault_1.0.2.tgz";
+      path = fetchurl {
+        name = "fault___fault_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/fault/-/fault-1.0.2.tgz";
+        sha1 = "c3d0fec202f172a3a4d414042ad2bb5e2a3ffbaa";
+      };
+    }
+    {
+      name = "faye_websocket___faye_websocket_0.10.0.tgz";
+      path = fetchurl {
+        name = "faye_websocket___faye_websocket_0.10.0.tgz";
+        url  = "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz";
+        sha1 = "4e492f8d04dfb6f89003507f6edbf2d501e7c6f4";
+      };
+    }
+    {
+      name = "faye_websocket___faye_websocket_0.11.1.tgz";
+      path = fetchurl {
+        name = "faye_websocket___faye_websocket_0.11.1.tgz";
+        url  = "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.1.tgz";
+        sha1 = "f0efe18c4f56e4f40afc7e06c719fd5ee6188f38";
+      };
+    }
+    {
+      name = "fb_watchman___fb_watchman_2.0.0.tgz";
+      path = fetchurl {
+        name = "fb_watchman___fb_watchman_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.0.tgz";
+        sha1 = "54e9abf7dfa2f26cd9b1636c588c1afc05de5d58";
+      };
+    }
+    {
+      name = "figgy_pudding___figgy_pudding_3.5.1.tgz";
+      path = fetchurl {
+        name = "figgy_pudding___figgy_pudding_3.5.1.tgz";
+        url  = "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz";
+        sha1 = "862470112901c727a0e495a80744bd5baa1d6790";
+      };
+    }
+    {
+      name = "figures___figures_2.0.0.tgz";
+      path = fetchurl {
+        name = "figures___figures_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz";
+        sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962";
+      };
+    }
+    {
+      name = "file_entry_cache___file_entry_cache_2.0.0.tgz";
+      path = fetchurl {
+        name = "file_entry_cache___file_entry_cache_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-2.0.0.tgz";
+        sha1 = "c392990c3e684783d838b8c84a45d8a048458361";
+      };
+    }
+    {
+      name = "file_entry_cache___file_entry_cache_5.0.1.tgz";
+      path = fetchurl {
+        name = "file_entry_cache___file_entry_cache_5.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz";
+        sha1 = "ca0f6efa6dd3d561333fb14515065c2fafdf439c";
+      };
+    }
+    {
+      name = "file_loader___file_loader_3.0.1.tgz";
+      path = fetchurl {
+        name = "file_loader___file_loader_3.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/file-loader/-/file-loader-3.0.1.tgz";
+        sha1 = "f8e0ba0b599918b51adfe45d66d1e771ad560faa";
+      };
+    }
+    {
+      name = "fileset___fileset_2.0.3.tgz";
+      path = fetchurl {
+        name = "fileset___fileset_2.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/fileset/-/fileset-2.0.3.tgz";
+        sha1 = "8e7548a96d3cc2327ee5e674168723a333bba2a0";
+      };
+    }
+    {
+      name = "filesize___filesize_3.6.1.tgz";
+      path = fetchurl {
+        name = "filesize___filesize_3.6.1.tgz";
+        url  = "https://registry.yarnpkg.com/filesize/-/filesize-3.6.1.tgz";
+        sha1 = "090bb3ee01b6f801a8a8be99d31710b3422bb317";
+      };
+    }
+    {
+      name = "fill_range___fill_range_4.0.0.tgz";
+      path = fetchurl {
+        name = "fill_range___fill_range_4.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz";
+        sha1 = "d544811d428f98eb06a63dc402d2403c328c38f7";
+      };
+    }
+    {
+      name = "fill_range___fill_range_7.0.1.tgz";
+      path = fetchurl {
+        name = "fill_range___fill_range_7.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz";
+        sha1 = "1919a6a7c75fe38b2c7c77e5198535da9acdda40";
+      };
+    }
+    {
+      name = "finalhandler___finalhandler_1.1.0.tgz";
+      path = fetchurl {
+        name = "finalhandler___finalhandler_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.0.tgz";
+        sha1 = "ce0b6855b45853e791b2fcc680046d88253dd7f5";
+      };
+    }
+    {
+      name = "finalhandler___finalhandler_1.1.1.tgz";
+      path = fetchurl {
+        name = "finalhandler___finalhandler_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.1.tgz";
+        sha1 = "eebf4ed840079c83f4249038c9d703008301b105";
+      };
+    }
+    {
+      name = "find_cache_dir___find_cache_dir_2.1.0.tgz";
+      path = fetchurl {
+        name = "find_cache_dir___find_cache_dir_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz";
+        sha1 = "8d0f94cd13fe43c6c7c261a0d86115ca918c05f7";
+      };
+    }
+    {
+      name = "find_root___find_root_1.1.0.tgz";
+      path = fetchurl {
+        name = "find_root___find_root_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz";
+        sha1 = "abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4";
+      };
+    }
+    {
+      name = "find_up___find_up_1.1.2.tgz";
+      path = fetchurl {
+        name = "find_up___find_up_1.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz";
+        sha1 = "6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f";
+      };
+    }
+    {
+      name = "find_up___find_up_2.1.0.tgz";
+      path = fetchurl {
+        name = "find_up___find_up_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz";
+        sha1 = "45d1b7e506c717ddd482775a2b77920a3c0c57a7";
+      };
+    }
+    {
+      name = "find_up___find_up_3.0.0.tgz";
+      path = fetchurl {
+        name = "find_up___find_up_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz";
+        sha1 = "49169f1d7993430646da61ecc5ae355c21c97b73";
+      };
+    }
+    {
+      name = "findup_sync___findup_sync_2.0.0.tgz";
+      path = fetchurl {
+        name = "findup_sync___findup_sync_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz";
+        sha1 = "9326b1488c22d1a6088650a86901b2d9a90a2cbc";
+      };
+    }
+    {
+      name = "flat_cache___flat_cache_1.2.2.tgz";
+      path = fetchurl {
+        name = "flat_cache___flat_cache_1.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.2.2.tgz";
+        sha1 = "fa86714e72c21db88601761ecf2f555d1abc6b96";
+      };
+    }
+    {
+      name = "flat_cache___flat_cache_2.0.1.tgz";
+      path = fetchurl {
+        name = "flat_cache___flat_cache_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz";
+        sha1 = "5d296d6f04bda44a4630a301413bdbc2ec085ec0";
+      };
+    }
+    {
+      name = "flatted___flatted_2.0.0.tgz";
+      path = fetchurl {
+        name = "flatted___flatted_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/flatted/-/flatted-2.0.0.tgz";
+        sha1 = "55122b6536ea496b4b44893ee2608141d10d9916";
+      };
+    }
+    {
+      name = "flush_write_stream___flush_write_stream_1.1.1.tgz";
+      path = fetchurl {
+        name = "flush_write_stream___flush_write_stream_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz";
+        sha1 = "8dd7d873a1babc207d94ead0c2e0e44276ebf2e8";
+      };
+    }
+    {
+      name = "follow_redirects___follow_redirects_1.5.10.tgz";
+      path = fetchurl {
+        name = "follow_redirects___follow_redirects_1.5.10.tgz";
+        url  = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz";
+        sha1 = "7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a";
+      };
+    }
+    {
+      name = "for_in___for_in_1.0.2.tgz";
+      path = fetchurl {
+        name = "for_in___for_in_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz";
+        sha1 = "81068d295a8142ec0ac726c6e2200c30fb6d5e80";
+      };
+    }
+    {
+      name = "forever_agent___forever_agent_0.6.1.tgz";
+      path = fetchurl {
+        name = "forever_agent___forever_agent_0.6.1.tgz";
+        url  = "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz";
+        sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91";
+      };
+    }
+    {
+      name = "form_data___form_data_2.3.3.tgz";
+      path = fetchurl {
+        name = "form_data___form_data_2.3.3.tgz";
+        url  = "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz";
+        sha1 = "dcce52c05f644f298c6a7ab936bd724ceffbf3a6";
+      };
+    }
+    {
+      name = "format___format_0.2.2.tgz";
+      path = fetchurl {
+        name = "format___format_0.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/format/-/format-0.2.2.tgz";
+        sha1 = "d6170107e9efdc4ed30c9dc39016df942b5cb58b";
+      };
+    }
+    {
+      name = "formdata_polyfill___formdata_polyfill_3.0.11.tgz";
+      path = fetchurl {
+        name = "formdata_polyfill___formdata_polyfill_3.0.11.tgz";
+        url  = "https://registry.yarnpkg.com/formdata-polyfill/-/formdata-polyfill-3.0.11.tgz";
+        sha1 = "c82b4b4bea3356c0a6752219e54ce1edb2a7fb5b";
+      };
+    }
+    {
+      name = "forwarded___forwarded_0.1.2.tgz";
+      path = fetchurl {
+        name = "forwarded___forwarded_0.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz";
+        sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84";
+      };
+    }
+    {
+      name = "fragment_cache___fragment_cache_0.2.1.tgz";
+      path = fetchurl {
+        name = "fragment_cache___fragment_cache_0.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz";
+        sha1 = "4290fad27f13e89be7f33799c6bc5a0abfff0d19";
+      };
+    }
+    {
+      name = "fresh___fresh_0.5.2.tgz";
+      path = fetchurl {
+        name = "fresh___fresh_0.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz";
+        sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7";
+      };
+    }
+    {
+      name = "from2___from2_2.3.0.tgz";
+      path = fetchurl {
+        name = "from2___from2_2.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz";
+        sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af";
+      };
+    }
+    {
+      name = "fs_extra___fs_extra_7.0.1.tgz";
+      path = fetchurl {
+        name = "fs_extra___fs_extra_7.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz";
+        sha1 = "4f189c44aa123b895f722804f55ea23eadc348e9";
+      };
+    }
+    {
+      name = "fs_minipass___fs_minipass_1.2.6.tgz";
+      path = fetchurl {
+        name = "fs_minipass___fs_minipass_1.2.6.tgz";
+        url  = "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.6.tgz";
+        sha1 = "2c5cc30ded81282bfe8a0d7c7c1853ddeb102c07";
+      };
+    }
+    {
+      name = "fs_mkdirp_stream___fs_mkdirp_stream_1.0.0.tgz";
+      path = fetchurl {
+        name = "fs_mkdirp_stream___fs_mkdirp_stream_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz";
+        sha1 = "0b7815fc3201c6a69e14db98ce098c16935259eb";
+      };
+    }
+    {
+      name = "fs_write_stream_atomic___fs_write_stream_atomic_1.0.10.tgz";
+      path = fetchurl {
+        name = "fs_write_stream_atomic___fs_write_stream_atomic_1.0.10.tgz";
+        url  = "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz";
+        sha1 = "b47df53493ef911df75731e70a9ded0189db40c9";
+      };
+    }
+    {
+      name = "fs.realpath___fs.realpath_1.0.0.tgz";
+      path = fetchurl {
+        name = "fs.realpath___fs.realpath_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz";
+        sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
+      };
+    }
+    {
+      name = "fsevents___fsevents_1.2.9.tgz";
+      path = fetchurl {
+        name = "fsevents___fsevents_1.2.9.tgz";
+        url  = "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.9.tgz";
+        sha1 = "3f5ed66583ccd6f400b5a00db6f7e861363e388f";
+      };
+    }
+    {
+      name = "fsevents___fsevents_2.0.7.tgz";
+      path = fetchurl {
+        name = "fsevents___fsevents_2.0.7.tgz";
+        url  = "https://registry.yarnpkg.com/fsevents/-/fsevents-2.0.7.tgz";
+        sha1 = "382c9b443c6cbac4c57187cdda23aa3bf1ccfc2a";
+      };
+    }
+    {
+      name = "fstream___fstream_1.0.12.tgz";
+      path = fetchurl {
+        name = "fstream___fstream_1.0.12.tgz";
+        url  = "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz";
+        sha1 = "4e8ba8ee2d48be4f7d0de505455548eae5932045";
+      };
+    }
+    {
+      name = "function_bind___function_bind_1.1.1.tgz";
+      path = fetchurl {
+        name = "function_bind___function_bind_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz";
+        sha1 = "a56899d3ea3c9bab874bb9773b7c5ede92f4895d";
+      };
+    }
+    {
+      name = "functional_red_black_tree___functional_red_black_tree_1.0.1.tgz";
+      path = fetchurl {
+        name = "functional_red_black_tree___functional_red_black_tree_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz";
+        sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327";
+      };
+    }
+    {
+      name = "fuzzaldrin_plus___fuzzaldrin_plus_0.5.0.tgz";
+      path = fetchurl {
+        name = "fuzzaldrin_plus___fuzzaldrin_plus_0.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/fuzzaldrin-plus/-/fuzzaldrin-plus-0.5.0.tgz";
+        sha1 = "ef5f26f0c2fc7e9e9a16ea149a802d6cb4804b1e";
+      };
+    }
+    {
+      name = "gauge___gauge_2.7.4.tgz";
+      path = fetchurl {
+        name = "gauge___gauge_2.7.4.tgz";
+        url  = "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz";
+        sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7";
+      };
+    }
+    {
+      name = "gaze___gaze_1.1.3.tgz";
+      path = fetchurl {
+        name = "gaze___gaze_1.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/gaze/-/gaze-1.1.3.tgz";
+        sha1 = "c441733e13b927ac8c0ff0b4c3b033f28812924a";
+      };
+    }
+    {
+      name = "get_caller_file___get_caller_file_1.0.3.tgz";
+      path = fetchurl {
+        name = "get_caller_file___get_caller_file_1.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz";
+        sha1 = "f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a";
+      };
+    }
+    {
+      name = "get_port___get_port_4.2.0.tgz";
+      path = fetchurl {
+        name = "get_port___get_port_4.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/get-port/-/get-port-4.2.0.tgz";
+        sha1 = "e37368b1e863b7629c43c5a323625f95cf24b119";
+      };
+    }
+    {
+      name = "get_stdin___get_stdin_4.0.1.tgz";
+      path = fetchurl {
+        name = "get_stdin___get_stdin_4.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz";
+        sha1 = "b968c6b0a04384324902e8bf1a5df32579a450fe";
+      };
+    }
+    {
+      name = "get_stdin___get_stdin_6.0.0.tgz";
+      path = fetchurl {
+        name = "get_stdin___get_stdin_6.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz";
+        sha1 = "9e09bf712b360ab9225e812048f71fde9c89657b";
+      };
+    }
+    {
+      name = "get_stdin___get_stdin_7.0.0.tgz";
+      path = fetchurl {
+        name = "get_stdin___get_stdin_7.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/get-stdin/-/get-stdin-7.0.0.tgz";
+        sha1 = "8d5de98f15171a125c5e516643c7a6d0ea8a96f6";
+      };
+    }
+    {
+      name = "get_stdin___get_stdin_5.0.1.tgz";
+      path = fetchurl {
+        name = "get_stdin___get_stdin_5.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/get-stdin/-/get-stdin-5.0.1.tgz";
+        sha1 = "122e161591e21ff4c52530305693f20e6393a398";
+      };
+    }
+    {
+      name = "get_stream___get_stream_3.0.0.tgz";
+      path = fetchurl {
+        name = "get_stream___get_stream_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz";
+        sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14";
+      };
+    }
+    {
+      name = "get_stream___get_stream_4.1.0.tgz";
+      path = fetchurl {
+        name = "get_stream___get_stream_4.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz";
+        sha1 = "c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5";
+      };
+    }
+    {
+      name = "get_value___get_value_2.0.6.tgz";
+      path = fetchurl {
+        name = "get_value___get_value_2.0.6.tgz";
+        url  = "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz";
+        sha1 = "dc15ca1c672387ca76bd37ac0a395ba2042a2c28";
+      };
+    }
+    {
+      name = "getpass___getpass_0.1.7.tgz";
+      path = fetchurl {
+        name = "getpass___getpass_0.1.7.tgz";
+        url  = "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz";
+        sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa";
+      };
+    }
+    {
+      name = "gettext_extractor_vue___gettext_extractor_vue_4.0.2.tgz";
+      path = fetchurl {
+        name = "gettext_extractor_vue___gettext_extractor_vue_4.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/gettext-extractor-vue/-/gettext-extractor-vue-4.0.2.tgz";
+        sha1 = "16e1cdbdaf37e5bdf3cb0aff63685bdc5e74e906";
+      };
+    }
+    {
+      name = "gettext_extractor___gettext_extractor_3.4.3.tgz";
+      path = fetchurl {
+        name = "gettext_extractor___gettext_extractor_3.4.3.tgz";
+        url  = "https://registry.yarnpkg.com/gettext-extractor/-/gettext-extractor-3.4.3.tgz";
+        sha1 = "882679cefc71888eb6e69297e6b2dc14c0384fef";
+      };
+    }
+    {
+      name = "git_up___git_up_2.1.0.tgz";
+      path = fetchurl {
+        name = "git_up___git_up_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/git-up/-/git-up-2.1.0.tgz";
+        sha1 = "2f14cfe78327e7c4a2b92fcac7bfc674fdfad40c";
+      };
+    }
+    {
+      name = "git_url_parse___git_url_parse_10.1.0.tgz";
+      path = fetchurl {
+        name = "git_url_parse___git_url_parse_10.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/git-url-parse/-/git-url-parse-10.1.0.tgz";
+        sha1 = "a27813218f8777e91d15f1c121b83bf14721b67e";
+      };
+    }
+    {
+      name = "github_slugger___github_slugger_1.2.0.tgz";
+      path = fetchurl {
+        name = "github_slugger___github_slugger_1.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/github-slugger/-/github-slugger-1.2.0.tgz";
+        sha1 = "8ada3286fd046d8951c3c952a8d7854cfd90fd9a";
+      };
+    }
+    {
+      name = "github_slugger___github_slugger_1.2.1.tgz";
+      path = fetchurl {
+        name = "github_slugger___github_slugger_1.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/github-slugger/-/github-slugger-1.2.1.tgz";
+        sha1 = "47e904e70bf2dccd0014748142d31126cfd49508";
+      };
+    }
+    {
+      name = "glob_parent___glob_parent_3.1.0.tgz";
+      path = fetchurl {
+        name = "glob_parent___glob_parent_3.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz";
+        sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae";
+      };
+    }
+    {
+      name = "glob_parent___glob_parent_5.0.0.tgz";
+      path = fetchurl {
+        name = "glob_parent___glob_parent_5.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.0.0.tgz";
+        sha1 = "1dc99f0f39b006d3e92c2c284068382f0c20e954";
+      };
+    }
+    {
+      name = "glob_stream___glob_stream_6.1.0.tgz";
+      path = fetchurl {
+        name = "glob_stream___glob_stream_6.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/glob-stream/-/glob-stream-6.1.0.tgz";
+        sha1 = "7045c99413b3eb94888d83ab46d0b404cc7bdde4";
+      };
+    }
+    {
+      name = "glob_to_regexp___glob_to_regexp_0.3.0.tgz";
+      path = fetchurl {
+        name = "glob_to_regexp___glob_to_regexp_0.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz";
+        sha1 = "8c5a1494d2066c570cc3bfe4496175acc4d502ab";
+      };
+    }
+    {
+      name = "glob_to_regexp___glob_to_regexp_0.4.1.tgz";
+      path = fetchurl {
+        name = "glob_to_regexp___glob_to_regexp_0.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz";
+        sha1 = "c75297087c851b9a578bd217dd59a92f59fe546e";
+      };
+    }
+    {
+      name = "glob___glob_7.1.4.tgz";
+      path = fetchurl {
+        name = "glob___glob_7.1.4.tgz";
+        url  = "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz";
+        sha1 = "aa608a2f6c577ad357e1ae5a5c26d9a8d1969255";
+      };
+    }
+    {
+      name = "global_dirs___global_dirs_0.1.1.tgz";
+      path = fetchurl {
+        name = "global_dirs___global_dirs_0.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz";
+        sha1 = "b319c0dd4607f353f3be9cca4c72fc148c49f445";
+      };
+    }
+    {
+      name = "global_modules_path___global_modules_path_2.3.1.tgz";
+      path = fetchurl {
+        name = "global_modules_path___global_modules_path_2.3.1.tgz";
+        url  = "https://registry.yarnpkg.com/global-modules-path/-/global-modules-path-2.3.1.tgz";
+        sha1 = "e541f4c800a1a8514a990477b267ac67525b9931";
+      };
+    }
+    {
+      name = "global_modules___global_modules_1.0.0.tgz";
+      path = fetchurl {
+        name = "global_modules___global_modules_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz";
+        sha1 = "6d770f0eb523ac78164d72b5e71a8877265cc3ea";
+      };
+    }
+    {
+      name = "global_modules___global_modules_2.0.0.tgz";
+      path = fetchurl {
+        name = "global_modules___global_modules_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz";
+        sha1 = "997605ad2345f27f51539bea26574421215c7780";
+      };
+    }
+    {
+      name = "global_prefix___global_prefix_1.0.2.tgz";
+      path = fetchurl {
+        name = "global_prefix___global_prefix_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz";
+        sha1 = "dbf743c6c14992593c655568cb66ed32c0122ebe";
+      };
+    }
+    {
+      name = "global_prefix___global_prefix_3.0.0.tgz";
+      path = fetchurl {
+        name = "global_prefix___global_prefix_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/global-prefix/-/global-prefix-3.0.0.tgz";
+        sha1 = "fc85f73064df69f50421f47f883fe5b913ba9b97";
+      };
+    }
+    {
+      name = "globals_docs___globals_docs_2.4.0.tgz";
+      path = fetchurl {
+        name = "globals_docs___globals_docs_2.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/globals-docs/-/globals-docs-2.4.0.tgz";
+        sha1 = "f2c647544eb6161c7c38452808e16e693c2dafbb";
+      };
+    }
+    {
+      name = "globals___globals_11.12.0.tgz";
+      path = fetchurl {
+        name = "globals___globals_11.12.0.tgz";
+        url  = "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz";
+        sha1 = "ab8795338868a0babd8525758018c2a7eb95c42e";
+      };
+    }
+    {
+      name = "globby___globby_5.0.0.tgz";
+      path = fetchurl {
+        name = "globby___globby_5.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz";
+        sha1 = "ebd84667ca0dbb330b99bcfc68eac2bc54370e0d";
+      };
+    }
+    {
+      name = "globby___globby_6.1.0.tgz";
+      path = fetchurl {
+        name = "globby___globby_6.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz";
+        sha1 = "f5a6d70e8395e21c858fb0489d64df02424d506c";
+      };
+    }
+    {
+      name = "globby___globby_7.1.1.tgz";
+      path = fetchurl {
+        name = "globby___globby_7.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/globby/-/globby-7.1.1.tgz";
+        sha1 = "fb2ccff9401f8600945dfada97440cca972b8680";
+      };
+    }
+    {
+      name = "globby___globby_9.2.0.tgz";
+      path = fetchurl {
+        name = "globby___globby_9.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/globby/-/globby-9.2.0.tgz";
+        sha1 = "fd029a706c703d29bdd170f4b6db3a3f7a7cb63d";
+      };
+    }
+    {
+      name = "globjoin___globjoin_0.1.4.tgz";
+      path = fetchurl {
+        name = "globjoin___globjoin_0.1.4.tgz";
+        url  = "https://registry.yarnpkg.com/globjoin/-/globjoin-0.1.4.tgz";
+        sha1 = "2f4494ac8919e3767c5cbb691e9f463324285d43";
+      };
+    }
+    {
+      name = "globule___globule_1.2.1.tgz";
+      path = fetchurl {
+        name = "globule___globule_1.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/globule/-/globule-1.2.1.tgz";
+        sha1 = "5dffb1b191f22d20797a9369b49eab4e9839696d";
+      };
+    }
+    {
+      name = "gonzales_pe___gonzales_pe_4.2.3.tgz";
+      path = fetchurl {
+        name = "gonzales_pe___gonzales_pe_4.2.3.tgz";
+        url  = "https://registry.yarnpkg.com/gonzales-pe/-/gonzales-pe-4.2.3.tgz";
+        sha1 = "41091703625433285e0aee3aa47829fc1fbeb6f2";
+      };
+    }
+    {
+      name = "good_listener___good_listener_1.2.2.tgz";
+      path = fetchurl {
+        name = "good_listener___good_listener_1.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/good-listener/-/good-listener-1.2.2.tgz";
+        sha1 = "d53b30cdf9313dffb7dc9a0d477096aa6d145c50";
+      };
+    }
+    {
+      name = "got___got_6.7.1.tgz";
+      path = fetchurl {
+        name = "got___got_6.7.1.tgz";
+        url  = "https://registry.yarnpkg.com/got/-/got-6.7.1.tgz";
+        sha1 = "240cd05785a9a18e561dc1b44b41c763ef1e8db0";
+      };
+    }
+    {
+      name = "got___got_8.3.0.tgz";
+      path = fetchurl {
+        name = "got___got_8.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/got/-/got-8.3.0.tgz";
+        sha1 = "6ba26e75f8a6cc4c6b3eb1fe7ce4fec7abac8533";
+      };
+    }
+    {
+      name = "graceful_fs___graceful_fs_4.2.0.tgz";
+      path = fetchurl {
+        name = "graceful_fs___graceful_fs_4.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.0.tgz";
+        sha1 = "8d8fdc73977cb04104721cb53666c1ca64cd328b";
+      };
+    }
+    {
+      name = "graceful_readlink___graceful_readlink_1.0.1.tgz";
+      path = fetchurl {
+        name = "graceful_readlink___graceful_readlink_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz";
+        sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725";
+      };
+    }
+    {
+      name = "graphlibrary___graphlibrary_2.2.0.tgz";
+      path = fetchurl {
+        name = "graphlibrary___graphlibrary_2.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/graphlibrary/-/graphlibrary-2.2.0.tgz";
+        sha1 = "017a14899775228dec4497a39babfdd6bf56eac6";
+      };
+    }
+    {
+      name = "graphql_tag___graphql_tag_2.10.0.tgz";
+      path = fetchurl {
+        name = "graphql_tag___graphql_tag_2.10.0.tgz";
+        url  = "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.10.0.tgz";
+        sha1 = "87da024be863e357551b2b8700e496ee2d4353ae";
+      };
+    }
+    {
+      name = "graphql___graphql_14.0.2.tgz";
+      path = fetchurl {
+        name = "graphql___graphql_14.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/graphql/-/graphql-14.0.2.tgz";
+        sha1 = "7dded337a4c3fd2d075692323384034b357f5650";
+      };
+    }
+    {
+      name = "growly___growly_1.3.0.tgz";
+      path = fetchurl {
+        name = "growly___growly_1.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz";
+        sha1 = "f10748cbe76af964b7c96c93c6bcc28af120c081";
+      };
+    }
+    {
+      name = "gzip_size___gzip_size_5.0.0.tgz";
+      path = fetchurl {
+        name = "gzip_size___gzip_size_5.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/gzip-size/-/gzip-size-5.0.0.tgz";
+        sha1 = "a55ecd99222f4c48fd8c01c625ce3b349d0a0e80";
+      };
+    }
+    {
+      name = "handle_thing___handle_thing_2.0.0.tgz";
+      path = fetchurl {
+        name = "handle_thing___handle_thing_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.0.tgz";
+        sha1 = "0e039695ff50c93fc288557d696f3c1dc6776754";
+      };
+    }
+    {
+      name = "handlebars___handlebars_4.1.2.tgz";
+      path = fetchurl {
+        name = "handlebars___handlebars_4.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.2.tgz";
+        sha1 = "b6b37c1ced0306b221e094fc7aca3ec23b131b67";
+      };
+    }
+    {
+      name = "har_schema___har_schema_2.0.0.tgz";
+      path = fetchurl {
+        name = "har_schema___har_schema_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz";
+        sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92";
+      };
+    }
+    {
+      name = "har_validator___har_validator_5.1.3.tgz";
+      path = fetchurl {
+        name = "har_validator___har_validator_5.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz";
+        sha1 = "1ef89ebd3e4996557675eed9893110dc350fa080";
+      };
+    }
+    {
+      name = "has_ansi___has_ansi_2.0.0.tgz";
+      path = fetchurl {
+        name = "has_ansi___has_ansi_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz";
+        sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91";
+      };
+    }
+    {
+      name = "has_binary2___has_binary2_1.0.2.tgz";
+      path = fetchurl {
+        name = "has_binary2___has_binary2_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/has-binary2/-/has-binary2-1.0.2.tgz";
+        sha1 = "e83dba49f0b9be4d026d27365350d9f03f54be98";
+      };
+    }
+    {
+      name = "has_cors___has_cors_1.1.0.tgz";
+      path = fetchurl {
+        name = "has_cors___has_cors_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz";
+        sha1 = "5e474793f7ea9843d1bb99c23eef49ff126fff39";
+      };
+    }
+    {
+      name = "has_flag___has_flag_3.0.0.tgz";
+      path = fetchurl {
+        name = "has_flag___has_flag_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz";
+        sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd";
+      };
+    }
+    {
+      name = "has_symbol_support_x___has_symbol_support_x_1.3.0.tgz";
+      path = fetchurl {
+        name = "has_symbol_support_x___has_symbol_support_x_1.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/has-symbol-support-x/-/has-symbol-support-x-1.3.0.tgz";
+        sha1 = "588bd6927eaa0e296afae24160659167fc2be4f8";
+      };
+    }
+    {
+      name = "has_symbols___has_symbols_1.0.0.tgz";
+      path = fetchurl {
+        name = "has_symbols___has_symbols_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz";
+        sha1 = "ba1a8f1af2a0fc39650f5c850367704122063b44";
+      };
+    }
+    {
+      name = "has_to_string_tag_x___has_to_string_tag_x_1.3.0.tgz";
+      path = fetchurl {
+        name = "has_to_string_tag_x___has_to_string_tag_x_1.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/has-to-string-tag-x/-/has-to-string-tag-x-1.3.0.tgz";
+        sha1 = "78e3d98c3c0ec9413e970eb8d766249a1e13058f";
+      };
+    }
+    {
+      name = "has_unicode___has_unicode_2.0.1.tgz";
+      path = fetchurl {
+        name = "has_unicode___has_unicode_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz";
+        sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9";
+      };
+    }
+    {
+      name = "has_value___has_value_0.3.1.tgz";
+      path = fetchurl {
+        name = "has_value___has_value_0.3.1.tgz";
+        url  = "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz";
+        sha1 = "7b1f58bada62ca827ec0a2078025654845995e1f";
+      };
+    }
+    {
+      name = "has_value___has_value_1.0.0.tgz";
+      path = fetchurl {
+        name = "has_value___has_value_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz";
+        sha1 = "18b281da585b1c5c51def24c930ed29a0be6b177";
+      };
+    }
+    {
+      name = "has_values___has_values_0.1.4.tgz";
+      path = fetchurl {
+        name = "has_values___has_values_0.1.4.tgz";
+        url  = "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz";
+        sha1 = "6d61de95d91dfca9b9a02089ad384bff8f62b771";
+      };
+    }
+    {
+      name = "has_values___has_values_1.0.0.tgz";
+      path = fetchurl {
+        name = "has_values___has_values_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz";
+        sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f";
+      };
+    }
+    {
+      name = "has___has_1.0.3.tgz";
+      path = fetchurl {
+        name = "has___has_1.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz";
+        sha1 = "722d7cbfc1f6aa8241f16dd814e011e1f41e8796";
+      };
+    }
+    {
+      name = "hash_base___hash_base_2.0.2.tgz";
+      path = fetchurl {
+        name = "hash_base___hash_base_2.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/hash-base/-/hash-base-2.0.2.tgz";
+        sha1 = "66ea1d856db4e8a5470cadf6fce23ae5244ef2e1";
+      };
+    }
+    {
+      name = "hash_base___hash_base_3.0.4.tgz";
+      path = fetchurl {
+        name = "hash_base___hash_base_3.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz";
+        sha1 = "5fc8686847ecd73499403319a6b0a3f3f6ae4918";
+      };
+    }
+    {
+      name = "hash_sum___hash_sum_1.0.2.tgz";
+      path = fetchurl {
+        name = "hash_sum___hash_sum_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/hash-sum/-/hash-sum-1.0.2.tgz";
+        sha1 = "33b40777754c6432573c120cc3808bbd10d47f04";
+      };
+    }
+    {
+      name = "hash.js___hash.js_1.1.3.tgz";
+      path = fetchurl {
+        name = "hash.js___hash.js_1.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.3.tgz";
+        sha1 = "340dedbe6290187151c1ea1d777a3448935df846";
+      };
+    }
+    {
+      name = "hast_util_is_element___hast_util_is_element_1.0.3.tgz";
+      path = fetchurl {
+        name = "hast_util_is_element___hast_util_is_element_1.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/hast-util-is-element/-/hast-util-is-element-1.0.3.tgz";
+        sha1 = "423b4b26fe8bf1f25950fe052e9ce8f83fd5f6a4";
+      };
+    }
+    {
+      name = "hast_util_sanitize___hast_util_sanitize_1.3.1.tgz";
+      path = fetchurl {
+        name = "hast_util_sanitize___hast_util_sanitize_1.3.1.tgz";
+        url  = "https://registry.yarnpkg.com/hast-util-sanitize/-/hast-util-sanitize-1.3.1.tgz";
+        sha1 = "4e60d66336bd67e52354d581967467029a933f2e";
+      };
+    }
+    {
+      name = "hast_util_to_html___hast_util_to_html_4.0.1.tgz";
+      path = fetchurl {
+        name = "hast_util_to_html___hast_util_to_html_4.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/hast-util-to-html/-/hast-util-to-html-4.0.1.tgz";
+        sha1 = "3666b05afb62bd69f8f5e6c94db04dea19438e2a";
+      };
+    }
+    {
+      name = "hast_util_whitespace___hast_util_whitespace_1.0.3.tgz";
+      path = fetchurl {
+        name = "hast_util_whitespace___hast_util_whitespace_1.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/hast-util-whitespace/-/hast-util-whitespace-1.0.3.tgz";
+        sha1 = "6d161b307bd0693b5ec000c7c7e8b5445109ee34";
+      };
+    }
+    {
+      name = "he___he_1.2.0.tgz";
+      path = fetchurl {
+        name = "he___he_1.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz";
+        sha1 = "84ae65fa7eafb165fddb61566ae14baf05664f0f";
+      };
+    }
+    {
+      name = "highlight.js___highlight.js_9.15.8.tgz";
+      path = fetchurl {
+        name = "highlight.js___highlight.js_9.15.8.tgz";
+        url  = "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.15.8.tgz";
+        sha1 = "f344fda123f36f1a65490e932cf90569e4999971";
+      };
+    }
+    {
+      name = "highlight.js___highlight.js_9.13.1.tgz";
+      path = fetchurl {
+        name = "highlight.js___highlight.js_9.13.1.tgz";
+        url  = "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.13.1.tgz";
+        sha1 = "054586d53a6863311168488a0f58d6c505ce641e";
+      };
+    }
+    {
+      name = "hmac_drbg___hmac_drbg_1.0.1.tgz";
+      path = fetchurl {
+        name = "hmac_drbg___hmac_drbg_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz";
+        sha1 = "d2745701025a6c775a6c545793ed502fc0c649a1";
+      };
+    }
+    {
+      name = "homedir_polyfill___homedir_polyfill_1.0.1.tgz";
+      path = fetchurl {
+        name = "homedir_polyfill___homedir_polyfill_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz";
+        sha1 = "4c2bbc8a758998feebf5ed68580f76d46768b4bc";
+      };
+    }
+    {
+      name = "hoopy___hoopy_0.1.4.tgz";
+      path = fetchurl {
+        name = "hoopy___hoopy_0.1.4.tgz";
+        url  = "https://registry.yarnpkg.com/hoopy/-/hoopy-0.1.4.tgz";
+        sha1 = "609207d661100033a9a9402ad3dea677381c1b1d";
+      };
+    }
+    {
+      name = "hosted_git_info___hosted_git_info_2.2.0.tgz";
+      path = fetchurl {
+        name = "hosted_git_info___hosted_git_info_2.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.2.0.tgz";
+        sha1 = "7a0d097863d886c0fabbdcd37bf1758d8becf8a5";
+      };
+    }
+    {
+      name = "hpack.js___hpack.js_2.1.6.tgz";
+      path = fetchurl {
+        name = "hpack.js___hpack.js_2.1.6.tgz";
+        url  = "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz";
+        sha1 = "87774c0949e513f42e84575b3c45681fade2a0b2";
+      };
+    }
+    {
+      name = "html_encoding_sniffer___html_encoding_sniffer_1.0.2.tgz";
+      path = fetchurl {
+        name = "html_encoding_sniffer___html_encoding_sniffer_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz";
+        sha1 = "e70d84b94da53aa375e11fe3a351be6642ca46f8";
+      };
+    }
+    {
+      name = "html_entities___html_entities_1.2.0.tgz";
+      path = fetchurl {
+        name = "html_entities___html_entities_1.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.0.tgz";
+        sha1 = "41948caf85ce82fed36e4e6a0ed371a6664379e2";
+      };
+    }
+    {
+      name = "html_minifier___html_minifier_4.0.0.tgz";
+      path = fetchurl {
+        name = "html_minifier___html_minifier_4.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/html-minifier/-/html-minifier-4.0.0.tgz";
+        sha1 = "cca9aad8bce1175e02e17a8c33e46d8988889f56";
+      };
+    }
+    {
+      name = "html_tags___html_tags_3.0.0.tgz";
+      path = fetchurl {
+        name = "html_tags___html_tags_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/html-tags/-/html-tags-3.0.0.tgz";
+        sha1 = "41f57708c9e6b7b46a00a22317d614c4a2bab166";
+      };
+    }
+    {
+      name = "html_void_elements___html_void_elements_1.0.4.tgz";
+      path = fetchurl {
+        name = "html_void_elements___html_void_elements_1.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/html-void-elements/-/html-void-elements-1.0.4.tgz";
+        sha1 = "95e8bb5ecd6b88766569c2645f2b5f1591db9ba5";
+      };
+    }
+    {
+      name = "htmlparser2___htmlparser2_3.10.0.tgz";
+      path = fetchurl {
+        name = "htmlparser2___htmlparser2_3.10.0.tgz";
+        url  = "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.0.tgz";
+        sha1 = "5f5e422dcf6119c0d983ed36260ce9ded0bee464";
+      };
+    }
+    {
+      name = "http_cache_semantics___http_cache_semantics_3.8.1.tgz";
+      path = fetchurl {
+        name = "http_cache_semantics___http_cache_semantics_3.8.1.tgz";
+        url  = "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz";
+        sha1 = "39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2";
+      };
+    }
+    {
+      name = "http_deceiver___http_deceiver_1.2.7.tgz";
+      path = fetchurl {
+        name = "http_deceiver___http_deceiver_1.2.7.tgz";
+        url  = "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz";
+        sha1 = "fa7168944ab9a519d337cb0bec7284dc3e723d87";
+      };
+    }
+    {
+      name = "http_errors___http_errors_1.6.2.tgz";
+      path = fetchurl {
+        name = "http_errors___http_errors_1.6.2.tgz";
+        url  = "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.2.tgz";
+        sha1 = "0a002cc85707192a7e7946ceedc11155f60ec736";
+      };
+    }
+    {
+      name = "http_proxy_middleware___http_proxy_middleware_0.18.0.tgz";
+      path = fetchurl {
+        name = "http_proxy_middleware___http_proxy_middleware_0.18.0.tgz";
+        url  = "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz";
+        sha1 = "0987e6bb5a5606e5a69168d8f967a87f15dd8aab";
+      };
+    }
+    {
+      name = "http_proxy___http_proxy_1.16.2.tgz";
+      path = fetchurl {
+        name = "http_proxy___http_proxy_1.16.2.tgz";
+        url  = "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.16.2.tgz";
+        sha1 = "06dff292952bf64dbe8471fa9df73066d4f37742";
+      };
+    }
+    {
+      name = "http_signature___http_signature_1.2.0.tgz";
+      path = fetchurl {
+        name = "http_signature___http_signature_1.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz";
+        sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1";
+      };
+    }
+    {
+      name = "https_browserify___https_browserify_1.0.0.tgz";
+      path = fetchurl {
+        name = "https_browserify___https_browserify_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz";
+        sha1 = "ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73";
+      };
+    }
+    {
+      name = "iconv_lite___iconv_lite_0.4.24.tgz";
+      path = fetchurl {
+        name = "iconv_lite___iconv_lite_0.4.24.tgz";
+        url  = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz";
+        sha1 = "2022b4b25fbddc21d2f524974a474aafe733908b";
+      };
+    }
+    {
+      name = "iconv_lite___iconv_lite_0.4.19.tgz";
+      path = fetchurl {
+        name = "iconv_lite___iconv_lite_0.4.19.tgz";
+        url  = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz";
+        sha1 = "f7468f60135f5e5dad3399c0a81be9a1603a082b";
+      };
+    }
+    {
+      name = "icss_replace_symbols___icss_replace_symbols_1.1.0.tgz";
+      path = fetchurl {
+        name = "icss_replace_symbols___icss_replace_symbols_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz";
+        sha1 = "06ea6f83679a7749e386cfe1fe812ae5db223ded";
+      };
+    }
+    {
+      name = "icss_utils___icss_utils_2.1.0.tgz";
+      path = fetchurl {
+        name = "icss_utils___icss_utils_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/icss-utils/-/icss-utils-2.1.0.tgz";
+        sha1 = "83f0a0ec378bf3246178b6c2ad9136f135b1c962";
+      };
+    }
+    {
+      name = "ieee754___ieee754_1.1.8.tgz";
+      path = fetchurl {
+        name = "ieee754___ieee754_1.1.8.tgz";
+        url  = "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz";
+        sha1 = "be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4";
+      };
+    }
+    {
+      name = "iferr___iferr_0.1.5.tgz";
+      path = fetchurl {
+        name = "iferr___iferr_0.1.5.tgz";
+        url  = "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz";
+        sha1 = "c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501";
+      };
+    }
+    {
+      name = "ignore_by_default___ignore_by_default_1.0.1.tgz";
+      path = fetchurl {
+        name = "ignore_by_default___ignore_by_default_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz";
+        sha1 = "48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09";
+      };
+    }
+    {
+      name = "ignore_walk___ignore_walk_3.0.1.tgz";
+      path = fetchurl {
+        name = "ignore_walk___ignore_walk_3.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz";
+        sha1 = "a83e62e7d272ac0e3b551aaa82831a19b69f82f8";
+      };
+    }
+    {
+      name = "ignore___ignore_3.3.10.tgz";
+      path = fetchurl {
+        name = "ignore___ignore_3.3.10.tgz";
+        url  = "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz";
+        sha1 = "0a97fb876986e8081c631160f8f9f389157f0043";
+      };
+    }
+    {
+      name = "ignore___ignore_4.0.6.tgz";
+      path = fetchurl {
+        name = "ignore___ignore_4.0.6.tgz";
+        url  = "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz";
+        sha1 = "750e3db5862087b4737ebac8207ffd1ef27b25fc";
+      };
+    }
+    {
+      name = "ignore___ignore_5.1.2.tgz";
+      path = fetchurl {
+        name = "ignore___ignore_5.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/ignore/-/ignore-5.1.2.tgz";
+        sha1 = "e28e584d43ad7e92f96995019cc43b9e1ac49558";
+      };
+    }
+    {
+      name = "immediate___immediate_3.0.6.tgz";
+      path = fetchurl {
+        name = "immediate___immediate_3.0.6.tgz";
+        url  = "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz";
+        sha1 = "9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b";
+      };
+    }
+    {
+      name = "immutable_tuple___immutable_tuple_0.4.9.tgz";
+      path = fetchurl {
+        name = "immutable_tuple___immutable_tuple_0.4.9.tgz";
+        url  = "https://registry.yarnpkg.com/immutable-tuple/-/immutable-tuple-0.4.9.tgz";
+        sha1 = "473ebdd6c169c461913a454bf87ef8f601a20ff0";
+      };
+    }
+    {
+      name = "import_fresh___import_fresh_2.0.0.tgz";
+      path = fetchurl {
+        name = "import_fresh___import_fresh_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz";
+        sha1 = "d81355c15612d386c61f9ddd3922d4304822a546";
+      };
+    }
+    {
+      name = "import_lazy___import_lazy_2.1.0.tgz";
+      path = fetchurl {
+        name = "import_lazy___import_lazy_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz";
+        sha1 = "05698e3d45c88e8d7e9d92cb0584e77f096f3e43";
+      };
+    }
+    {
+      name = "import_lazy___import_lazy_4.0.0.tgz";
+      path = fetchurl {
+        name = "import_lazy___import_lazy_4.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/import-lazy/-/import-lazy-4.0.0.tgz";
+        sha1 = "e8eb627483a0a43da3c03f3e35548be5cb0cc153";
+      };
+    }
+    {
+      name = "import_local___import_local_2.0.0.tgz";
+      path = fetchurl {
+        name = "import_local___import_local_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz";
+        sha1 = "55070be38a5993cf18ef6db7e961f5bee5c5a09d";
+      };
+    }
+    {
+      name = "imports_loader___imports_loader_0.8.0.tgz";
+      path = fetchurl {
+        name = "imports_loader___imports_loader_0.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/imports-loader/-/imports-loader-0.8.0.tgz";
+        sha1 = "030ea51b8ca05977c40a3abfd9b4088fe0be9a69";
+      };
+    }
+    {
+      name = "imurmurhash___imurmurhash_0.1.4.tgz";
+      path = fetchurl {
+        name = "imurmurhash___imurmurhash_0.1.4.tgz";
+        url  = "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz";
+        sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea";
+      };
+    }
+    {
+      name = "in_publish___in_publish_2.0.0.tgz";
+      path = fetchurl {
+        name = "in_publish___in_publish_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.0.tgz";
+        sha1 = "e20ff5e3a2afc2690320b6dc552682a9c7fadf51";
+      };
+    }
+    {
+      name = "indent_string___indent_string_2.1.0.tgz";
+      path = fetchurl {
+        name = "indent_string___indent_string_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz";
+        sha1 = "8e2d48348742121b4a8218b7a137e9a52049dc80";
+      };
+    }
+    {
+      name = "indent_string___indent_string_3.2.0.tgz";
+      path = fetchurl {
+        name = "indent_string___indent_string_3.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz";
+        sha1 = "4a5fd6d27cc332f37e5419a504dbb837105c9289";
+      };
+    }
+    {
+      name = "indexes_of___indexes_of_1.0.1.tgz";
+      path = fetchurl {
+        name = "indexes_of___indexes_of_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz";
+        sha1 = "f30f716c8e2bd346c7b67d3df3915566a7c05607";
+      };
+    }
+    {
+      name = "indexof___indexof_0.0.1.tgz";
+      path = fetchurl {
+        name = "indexof___indexof_0.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz";
+        sha1 = "82dc336d232b9062179d05ab3293a66059fd435d";
+      };
+    }
+    {
+      name = "inflight___inflight_1.0.6.tgz";
+      path = fetchurl {
+        name = "inflight___inflight_1.0.6.tgz";
+        url  = "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz";
+        sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9";
+      };
+    }
+    {
+      name = "inherits___inherits_2.0.3.tgz";
+      path = fetchurl {
+        name = "inherits___inherits_2.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz";
+        sha1 = "633c2c83e3da42a502f52466022480f4208261de";
+      };
+    }
+    {
+      name = "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 = "ini___ini_1.3.5.tgz";
+      path = fetchurl {
+        name = "ini___ini_1.3.5.tgz";
+        url  = "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz";
+        sha1 = "eee25f56db1c9ec6085e0c22778083f596abf927";
+      };
+    }
+    {
+      name = "inquirer___inquirer_6.2.0.tgz";
+      path = fetchurl {
+        name = "inquirer___inquirer_6.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.0.tgz";
+        sha1 = "51adcd776f661369dc1e894859c2560a224abdd8";
+      };
+    }
+    {
+      name = "internal_ip___internal_ip_3.0.1.tgz";
+      path = fetchurl {
+        name = "internal_ip___internal_ip_3.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/internal-ip/-/internal-ip-3.0.1.tgz";
+        sha1 = "df5c99876e1d2eb2ea2d74f520e3f669a00ece27";
+      };
+    }
+    {
+      name = "interpret___interpret_1.1.0.tgz";
+      path = fetchurl {
+        name = "interpret___interpret_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz";
+        sha1 = "7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614";
+      };
+    }
+    {
+      name = "into_stream___into_stream_3.1.0.tgz";
+      path = fetchurl {
+        name = "into_stream___into_stream_3.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/into-stream/-/into-stream-3.1.0.tgz";
+        sha1 = "96fb0a936c12babd6ff1752a17d05616abd094c6";
+      };
+    }
+    {
+      name = "invariant___invariant_2.2.4.tgz";
+      path = fetchurl {
+        name = "invariant___invariant_2.2.4.tgz";
+        url  = "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz";
+        sha1 = "610f3c92c9359ce1db616e538008d23ff35158e6";
+      };
+    }
+    {
+      name = "invert_kv___invert_kv_1.0.0.tgz";
+      path = fetchurl {
+        name = "invert_kv___invert_kv_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz";
+        sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6";
+      };
+    }
+    {
+      name = "invert_kv___invert_kv_2.0.0.tgz";
+      path = fetchurl {
+        name = "invert_kv___invert_kv_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz";
+        sha1 = "7393f5afa59ec9ff5f67a27620d11c226e3eec02";
+      };
+    }
+    {
+      name = "ip_regex___ip_regex_2.1.0.tgz";
+      path = fetchurl {
+        name = "ip_regex___ip_regex_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz";
+        sha1 = "fa78bf5d2e6913c911ce9f819ee5146bb6d844e9";
+      };
+    }
+    {
+      name = "ip___ip_1.1.5.tgz";
+      path = fetchurl {
+        name = "ip___ip_1.1.5.tgz";
+        url  = "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz";
+        sha1 = "bdded70114290828c0a039e72ef25f5aaec4354a";
+      };
+    }
+    {
+      name = "ipaddr.js___ipaddr.js_1.8.0.tgz";
+      path = fetchurl {
+        name = "ipaddr.js___ipaddr.js_1.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.0.tgz";
+        sha1 = "eaa33d6ddd7ace8f7f6fe0c9ca0440e706738b1e";
+      };
+    }
+    {
+      name = "is_absolute___is_absolute_1.0.0.tgz";
+      path = fetchurl {
+        name = "is_absolute___is_absolute_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz";
+        sha1 = "395e1ae84b11f26ad1795e73c17378e48a301576";
+      };
+    }
+    {
+      name = "is_accessor_descriptor___is_accessor_descriptor_0.1.6.tgz";
+      path = fetchurl {
+        name = "is_accessor_descriptor___is_accessor_descriptor_0.1.6.tgz";
+        url  = "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz";
+        sha1 = "a9e12cb3ae8d876727eeef3843f8a0897b5c98d6";
+      };
+    }
+    {
+      name = "is_accessor_descriptor___is_accessor_descriptor_1.0.0.tgz";
+      path = fetchurl {
+        name = "is_accessor_descriptor___is_accessor_descriptor_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz";
+        sha1 = "169c2f6d3df1f992618072365c9b0ea1f6878656";
+      };
+    }
+    {
+      name = "is_alphabetical___is_alphabetical_1.0.2.tgz";
+      path = fetchurl {
+        name = "is_alphabetical___is_alphabetical_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-1.0.2.tgz";
+        sha1 = "1fa6e49213cb7885b75d15862fb3f3d96c884f41";
+      };
+    }
+    {
+      name = "is_alphanumeric___is_alphanumeric_1.0.0.tgz";
+      path = fetchurl {
+        name = "is_alphanumeric___is_alphanumeric_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-alphanumeric/-/is-alphanumeric-1.0.0.tgz";
+        sha1 = "4a9cef71daf4c001c1d81d63d140cf53fd6889f4";
+      };
+    }
+    {
+      name = "is_alphanumerical___is_alphanumerical_1.0.2.tgz";
+      path = fetchurl {
+        name = "is_alphanumerical___is_alphanumerical_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/is-alphanumerical/-/is-alphanumerical-1.0.2.tgz";
+        sha1 = "1138e9ae5040158dc6ff76b820acd6b7a181fd40";
+      };
+    }
+    {
+      name = "is_arrayish___is_arrayish_0.2.1.tgz";
+      path = fetchurl {
+        name = "is_arrayish___is_arrayish_0.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz";
+        sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d";
+      };
+    }
+    {
+      name = "is_binary_path___is_binary_path_1.0.1.tgz";
+      path = fetchurl {
+        name = "is_binary_path___is_binary_path_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz";
+        sha1 = "75f16642b480f187a711c814161fd3a4a7655898";
+      };
+    }
+    {
+      name = "is_binary_path___is_binary_path_2.1.0.tgz";
+      path = fetchurl {
+        name = "is_binary_path___is_binary_path_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz";
+        sha1 = "ea1f7f3b80f064236e83470f86c09c254fb45b09";
+      };
+    }
+    {
+      name = "is_buffer___is_buffer_1.1.6.tgz";
+      path = fetchurl {
+        name = "is_buffer___is_buffer_1.1.6.tgz";
+        url  = "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz";
+        sha1 = "efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be";
+      };
+    }
+    {
+      name = "is_buffer___is_buffer_2.0.3.tgz";
+      path = fetchurl {
+        name = "is_buffer___is_buffer_2.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.3.tgz";
+        sha1 = "4ecf3fcf749cbd1e472689e109ac66261a25e725";
+      };
+    }
+    {
+      name = "is_callable___is_callable_1.1.4.tgz";
+      path = fetchurl {
+        name = "is_callable___is_callable_1.1.4.tgz";
+        url  = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz";
+        sha1 = "1e1adf219e1eeb684d691f9d6a05ff0d30a24d75";
+      };
+    }
+    {
+      name = "is_ci___is_ci_1.2.1.tgz";
+      path = fetchurl {
+        name = "is_ci___is_ci_1.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.1.tgz";
+        sha1 = "e3779c8ee17fccf428488f6e281187f2e632841c";
+      };
+    }
+    {
+      name = "is_ci___is_ci_2.0.0.tgz";
+      path = fetchurl {
+        name = "is_ci___is_ci_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz";
+        sha1 = "6bc6334181810e04b5c22b3d589fdca55026404c";
+      };
+    }
+    {
+      name = "is_data_descriptor___is_data_descriptor_0.1.4.tgz";
+      path = fetchurl {
+        name = "is_data_descriptor___is_data_descriptor_0.1.4.tgz";
+        url  = "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz";
+        sha1 = "0b5ee648388e2c860282e793f1856fec3f301b56";
+      };
+    }
+    {
+      name = "is_data_descriptor___is_data_descriptor_1.0.0.tgz";
+      path = fetchurl {
+        name = "is_data_descriptor___is_data_descriptor_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz";
+        sha1 = "d84876321d0e7add03990406abbbbd36ba9268c7";
+      };
+    }
+    {
+      name = "is_date_object___is_date_object_1.0.1.tgz";
+      path = fetchurl {
+        name = "is_date_object___is_date_object_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz";
+        sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16";
+      };
+    }
+    {
+      name = "is_decimal___is_decimal_1.0.2.tgz";
+      path = fetchurl {
+        name = "is_decimal___is_decimal_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.2.tgz";
+        sha1 = "894662d6a8709d307f3a276ca4339c8fa5dff0ff";
+      };
+    }
+    {
+      name = "is_descriptor___is_descriptor_0.1.6.tgz";
+      path = fetchurl {
+        name = "is_descriptor___is_descriptor_0.1.6.tgz";
+        url  = "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz";
+        sha1 = "366d8240dde487ca51823b1ab9f07a10a78251ca";
+      };
+    }
+    {
+      name = "is_descriptor___is_descriptor_1.0.2.tgz";
+      path = fetchurl {
+        name = "is_descriptor___is_descriptor_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz";
+        sha1 = "3b159746a66604b04f8c81524ba365c5f14d86ec";
+      };
+    }
+    {
+      name = "is_directory___is_directory_0.3.1.tgz";
+      path = fetchurl {
+        name = "is_directory___is_directory_0.3.1.tgz";
+        url  = "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz";
+        sha1 = "61339b6f2475fc772fd9c9d83f5c8575dc154ae1";
+      };
+    }
+    {
+      name = "is_extendable___is_extendable_0.1.1.tgz";
+      path = fetchurl {
+        name = "is_extendable___is_extendable_0.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz";
+        sha1 = "62b110e289a471418e3ec36a617d472e301dfc89";
+      };
+    }
+    {
+      name = "is_extendable___is_extendable_1.0.1.tgz";
+      path = fetchurl {
+        name = "is_extendable___is_extendable_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz";
+        sha1 = "a7470f9e426733d81bd81e1155264e3a3507cab4";
+      };
+    }
+    {
+      name = "is_extglob___is_extglob_2.1.1.tgz";
+      path = fetchurl {
+        name = "is_extglob___is_extglob_2.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz";
+        sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2";
+      };
+    }
+    {
+      name = "is_finite___is_finite_1.0.2.tgz";
+      path = fetchurl {
+        name = "is_finite___is_finite_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz";
+        sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa";
+      };
+    }
+    {
+      name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz";
+      path = fetchurl {
+        name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz";
+        sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb";
+      };
+    }
+    {
+      name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz";
+      path = fetchurl {
+        name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz";
+        sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f";
+      };
+    }
+    {
+      name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz";
+      path = fetchurl {
+        name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz";
+        sha1 = "f116f8064fe90b3f7844a38997c0b75051269f1d";
+      };
+    }
+    {
+      name = "is_generator_fn___is_generator_fn_2.1.0.tgz";
+      path = fetchurl {
+        name = "is_generator_fn___is_generator_fn_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz";
+        sha1 = "7d140adc389aaf3011a8f2a2a4cfa6faadffb118";
+      };
+    }
+    {
+      name = "is_glob___is_glob_3.1.0.tgz";
+      path = fetchurl {
+        name = "is_glob___is_glob_3.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz";
+        sha1 = "7ba5ae24217804ac70707b96922567486cc3e84a";
+      };
+    }
+    {
+      name = "is_glob___is_glob_4.0.1.tgz";
+      path = fetchurl {
+        name = "is_glob___is_glob_4.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz";
+        sha1 = "7567dbe9f2f5e2467bc77ab83c4a29482407a5dc";
+      };
+    }
+    {
+      name = "is_hexadecimal___is_hexadecimal_1.0.2.tgz";
+      path = fetchurl {
+        name = "is_hexadecimal___is_hexadecimal_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.2.tgz";
+        sha1 = "b6e710d7d07bb66b98cb8cece5c9b4921deeb835";
+      };
+    }
+    {
+      name = "is_installed_globally___is_installed_globally_0.1.0.tgz";
+      path = fetchurl {
+        name = "is_installed_globally___is_installed_globally_0.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.1.0.tgz";
+        sha1 = "0dfd98f5a9111716dd535dda6492f67bf3d25a80";
+      };
+    }
+    {
+      name = "is_negated_glob___is_negated_glob_1.0.0.tgz";
+      path = fetchurl {
+        name = "is_negated_glob___is_negated_glob_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-negated-glob/-/is-negated-glob-1.0.0.tgz";
+        sha1 = "6910bca5da8c95e784b5751b976cf5a10fee36d2";
+      };
+    }
+    {
+      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_3.0.0.tgz";
+      path = fetchurl {
+        name = "is_number___is_number_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz";
+        sha1 = "24fd6201a4782cf50561c810276afc7d12d71195";
+      };
+    }
+    {
+      name = "is_number___is_number_7.0.0.tgz";
+      path = fetchurl {
+        name = "is_number___is_number_7.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz";
+        sha1 = "7535345b896734d5f80c4d06c50955527a14f12b";
+      };
+    }
+    {
+      name = "is_obj___is_obj_1.0.1.tgz";
+      path = fetchurl {
+        name = "is_obj___is_obj_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz";
+        sha1 = "3e4729ac1f5fde025cd7d83a896dab9f4f67db0f";
+      };
+    }
+    {
+      name = "is_object___is_object_1.0.1.tgz";
+      path = fetchurl {
+        name = "is_object___is_object_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/is-object/-/is-object-1.0.1.tgz";
+        sha1 = "8952688c5ec2ffd6b03ecc85e769e02903083470";
+      };
+    }
+    {
+      name = "is_path_cwd___is_path_cwd_1.0.0.tgz";
+      path = fetchurl {
+        name = "is_path_cwd___is_path_cwd_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz";
+        sha1 = "d225ec23132e89edd38fda767472e62e65f1106d";
+      };
+    }
+    {
+      name = "is_path_in_cwd___is_path_in_cwd_1.0.0.tgz";
+      path = fetchurl {
+        name = "is_path_in_cwd___is_path_in_cwd_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz";
+        sha1 = "6477582b8214d602346094567003be8a9eac04dc";
+      };
+    }
+    {
+      name = "is_path_inside___is_path_inside_1.0.0.tgz";
+      path = fetchurl {
+        name = "is_path_inside___is_path_inside_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.0.tgz";
+        sha1 = "fc06e5a1683fbda13de667aff717bbc10a48f37f";
+      };
+    }
+    {
+      name = "is_plain_obj___is_plain_obj_1.1.0.tgz";
+      path = fetchurl {
+        name = "is_plain_obj___is_plain_obj_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz";
+        sha1 = "71a50c8429dfca773c92a390a4a03b39fcd51d3e";
+      };
+    }
+    {
+      name = "is_plain_object___is_plain_object_2.0.4.tgz";
+      path = fetchurl {
+        name = "is_plain_object___is_plain_object_2.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz";
+        sha1 = "2c163b3fafb1b606d9d17928f05c2a1c38e07677";
+      };
+    }
+    {
+      name = "is_promise___is_promise_2.1.0.tgz";
+      path = fetchurl {
+        name = "is_promise___is_promise_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz";
+        sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa";
+      };
+    }
+    {
+      name = "is_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.4.tgz";
+      path = fetchurl {
+        name = "is_regex___is_regex_1.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz";
+        sha1 = "5517489b547091b0930e095654ced25ee97e9491";
+      };
+    }
+    {
+      name = "is_regexp___is_regexp_1.0.0.tgz";
+      path = fetchurl {
+        name = "is_regexp___is_regexp_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz";
+        sha1 = "fd2d883545c46bac5a633e7b9a09e87fa2cb5069";
+      };
+    }
+    {
+      name = "is_regexp___is_regexp_2.1.0.tgz";
+      path = fetchurl {
+        name = "is_regexp___is_regexp_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-regexp/-/is-regexp-2.1.0.tgz";
+        sha1 = "cd734a56864e23b956bf4e7c66c396a4c0b22c2d";
+      };
+    }
+    {
+      name = "is_relative___is_relative_1.0.0.tgz";
+      path = fetchurl {
+        name = "is_relative___is_relative_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz";
+        sha1 = "a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d";
+      };
+    }
+    {
+      name = "is_resolvable___is_resolvable_1.1.0.tgz";
+      path = fetchurl {
+        name = "is_resolvable___is_resolvable_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz";
+        sha1 = "fb18f87ce1feb925169c9a407c19318a3206ed88";
+      };
+    }
+    {
+      name = "is_retry_allowed___is_retry_allowed_1.1.0.tgz";
+      path = fetchurl {
+        name = "is_retry_allowed___is_retry_allowed_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz";
+        sha1 = "11a060568b67339444033d0125a61a20d564fb34";
+      };
+    }
+    {
+      name = "is_ssh___is_ssh_1.3.1.tgz";
+      path = fetchurl {
+        name = "is_ssh___is_ssh_1.3.1.tgz";
+        url  = "https://registry.yarnpkg.com/is-ssh/-/is-ssh-1.3.1.tgz";
+        sha1 = "f349a8cadd24e65298037a522cf7520f2e81a0f3";
+      };
+    }
+    {
+      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_symbol___is_symbol_1.0.2.tgz";
+      path = fetchurl {
+        name = "is_symbol___is_symbol_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.2.tgz";
+        sha1 = "a055f6ae57192caee329e7a860118b497a950f38";
+      };
+    }
+    {
+      name = "is_typedarray___is_typedarray_1.0.0.tgz";
+      path = fetchurl {
+        name = "is_typedarray___is_typedarray_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz";
+        sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a";
+      };
+    }
+    {
+      name = "is_unc_path___is_unc_path_1.0.0.tgz";
+      path = fetchurl {
+        name = "is_unc_path___is_unc_path_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz";
+        sha1 = "d731e8898ed090a12c352ad2eaed5095ad322c9d";
+      };
+    }
+    {
+      name = "is_utf8___is_utf8_0.2.1.tgz";
+      path = fetchurl {
+        name = "is_utf8___is_utf8_0.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz";
+        sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72";
+      };
+    }
+    {
+      name = "is_valid_glob___is_valid_glob_1.0.0.tgz";
+      path = fetchurl {
+        name = "is_valid_glob___is_valid_glob_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-valid-glob/-/is-valid-glob-1.0.0.tgz";
+        sha1 = "29bf3eff701be2d4d315dbacc39bc39fe8f601aa";
+      };
+    }
+    {
+      name = "is_whitespace_character___is_whitespace_character_1.0.2.tgz";
+      path = fetchurl {
+        name = "is_whitespace_character___is_whitespace_character_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/is-whitespace-character/-/is-whitespace-character-1.0.2.tgz";
+        sha1 = "ede53b4c6f6fb3874533751ec9280d01928d03ed";
+      };
+    }
+    {
+      name = "is_windows___is_windows_1.0.2.tgz";
+      path = fetchurl {
+        name = "is_windows___is_windows_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz";
+        sha1 = "d1850eb9791ecd18e6182ce12a30f396634bb19d";
+      };
+    }
+    {
+      name = "is_word_character___is_word_character_1.0.2.tgz";
+      path = fetchurl {
+        name = "is_word_character___is_word_character_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/is-word-character/-/is-word-character-1.0.2.tgz";
+        sha1 = "46a5dac3f2a1840898b91e576cd40d493f3ae553";
+      };
+    }
+    {
+      name = "is_wsl___is_wsl_1.1.0.tgz";
+      path = fetchurl {
+        name = "is_wsl___is_wsl_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz";
+        sha1 = "1f16e4aa22b04d1336b66188a66af3c600c3a66d";
+      };
+    }
+    {
+      name = "isarray___isarray_1.0.0.tgz";
+      path = fetchurl {
+        name = "isarray___isarray_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz";
+        sha1 = "bb935d48582cba168c06834957a54a3e07124f11";
+      };
+    }
+    {
+      name = "isarray___isarray_2.0.1.tgz";
+      path = fetchurl {
+        name = "isarray___isarray_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/isarray/-/isarray-2.0.1.tgz";
+        sha1 = "a37d94ed9cda2d59865c9f76fe596ee1f338741e";
+      };
+    }
+    {
+      name = "isbinaryfile___isbinaryfile_3.0.2.tgz";
+      path = fetchurl {
+        name = "isbinaryfile___isbinaryfile_3.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.2.tgz";
+        sha1 = "4a3e974ec0cba9004d3fc6cde7209ea69368a621";
+      };
+    }
+    {
+      name = "isexe___isexe_2.0.0.tgz";
+      path = fetchurl {
+        name = "isexe___isexe_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz";
+        sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10";
+      };
+    }
+    {
+      name = "isobject___isobject_2.1.0.tgz";
+      path = fetchurl {
+        name = "isobject___isobject_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz";
+        sha1 = "f065561096a3f1da2ef46272f815c840d87e0c89";
+      };
+    }
+    {
+      name = "isobject___isobject_3.0.1.tgz";
+      path = fetchurl {
+        name = "isobject___isobject_3.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz";
+        sha1 = "4e431e92b11a9731636aa1f9c8d1ccbcfdab78df";
+      };
+    }
+    {
+      name = "isstream___isstream_0.1.2.tgz";
+      path = fetchurl {
+        name = "isstream___isstream_0.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz";
+        sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a";
+      };
+    }
+    {
+      name = "istanbul_api___istanbul_api_2.1.6.tgz";
+      path = fetchurl {
+        name = "istanbul_api___istanbul_api_2.1.6.tgz";
+        url  = "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-2.1.6.tgz";
+        sha1 = "d61702a9d1c66ad89d92e66d401e16b0bda4a35f";
+      };
+    }
+    {
+      name = "istanbul_lib_coverage___istanbul_lib_coverage_2.0.5.tgz";
+      path = fetchurl {
+        name = "istanbul_lib_coverage___istanbul_lib_coverage_2.0.5.tgz";
+        url  = "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz";
+        sha1 = "675f0ab69503fad4b1d849f736baaca803344f49";
+      };
+    }
+    {
+      name = "istanbul_lib_hook___istanbul_lib_hook_2.0.7.tgz";
+      path = fetchurl {
+        name = "istanbul_lib_hook___istanbul_lib_hook_2.0.7.tgz";
+        url  = "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-2.0.7.tgz";
+        sha1 = "c95695f383d4f8f60df1f04252a9550e15b5b133";
+      };
+    }
+    {
+      name = "istanbul_lib_instrument___istanbul_lib_instrument_3.3.0.tgz";
+      path = fetchurl {
+        name = "istanbul_lib_instrument___istanbul_lib_instrument_3.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz";
+        sha1 = "a5f63d91f0bbc0c3e479ef4c5de027335ec6d630";
+      };
+    }
+    {
+      name = "istanbul_lib_report___istanbul_lib_report_2.0.8.tgz";
+      path = fetchurl {
+        name = "istanbul_lib_report___istanbul_lib_report_2.0.8.tgz";
+        url  = "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-2.0.8.tgz";
+        sha1 = "5a8113cd746d43c4889eba36ab10e7d50c9b4f33";
+      };
+    }
+    {
+      name = "istanbul_lib_source_maps___istanbul_lib_source_maps_3.0.6.tgz";
+      path = fetchurl {
+        name = "istanbul_lib_source_maps___istanbul_lib_source_maps_3.0.6.tgz";
+        url  = "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz";
+        sha1 = "284997c48211752ec486253da97e3879defba8c8";
+      };
+    }
+    {
+      name = "istanbul_reports___istanbul_reports_2.2.6.tgz";
+      path = fetchurl {
+        name = "istanbul_reports___istanbul_reports_2.2.6.tgz";
+        url  = "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-2.2.6.tgz";
+        sha1 = "7b4f2660d82b29303a8fe6091f8ca4bf058da1af";
+      };
+    }
+    {
+      name = "istextorbinary___istextorbinary_2.2.1.tgz";
+      path = fetchurl {
+        name = "istextorbinary___istextorbinary_2.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/istextorbinary/-/istextorbinary-2.2.1.tgz";
+        sha1 = "a5231a08ef6dd22b268d0895084cf8d58b5bec53";
+      };
+    }
+    {
+      name = "isurl___isurl_1.0.0.tgz";
+      path = fetchurl {
+        name = "isurl___isurl_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/isurl/-/isurl-1.0.0.tgz";
+        sha1 = "b27f4f49f3cdaa3ea44a0a5b7f3462e6edc39d67";
+      };
+    }
+    {
+      name = "iterall___iterall_1.2.2.tgz";
+      path = fetchurl {
+        name = "iterall___iterall_1.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/iterall/-/iterall-1.2.2.tgz";
+        sha1 = "92d70deb8028e0c39ff3164fdbf4d8b088130cd7";
+      };
+    }
+    {
+      name = "jasmine_core___jasmine_core_2.9.0.tgz";
+      path = fetchurl {
+        name = "jasmine_core___jasmine_core_2.9.0.tgz";
+        url  = "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.9.0.tgz";
+        sha1 = "bfbb56defcd30789adec5a3fbba8504233289c72";
+      };
+    }
+    {
+      name = "jasmine_diff___jasmine_diff_0.1.3.tgz";
+      path = fetchurl {
+        name = "jasmine_diff___jasmine_diff_0.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/jasmine-diff/-/jasmine-diff-0.1.3.tgz";
+        sha1 = "93ccc2dcc41028c5ddd4606558074839f2deeaa8";
+      };
+    }
+    {
+      name = "jasmine_jquery___jasmine_jquery_2.1.1.tgz";
+      path = fetchurl {
+        name = "jasmine_jquery___jasmine_jquery_2.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/jasmine-jquery/-/jasmine-jquery-2.1.1.tgz";
+        sha1 = "d4095e646944a26763235769ab018d9f30f0d47b";
+      };
+    }
+    {
+      name = "jed___jed_1.1.1.tgz";
+      path = fetchurl {
+        name = "jed___jed_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/jed/-/jed-1.1.1.tgz";
+        sha1 = "7a549bbd9ffe1585b0cd0a191e203055bee574b4";
+      };
+    }
+    {
+      name = "jest_changed_files___jest_changed_files_24.8.0.tgz";
+      path = fetchurl {
+        name = "jest_changed_files___jest_changed_files_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-24.8.0.tgz";
+        sha1 = "7e7eb21cf687587a85e50f3d249d1327e15b157b";
+      };
+    }
+    {
+      name = "jest_cli___jest_cli_24.8.0.tgz";
+      path = fetchurl {
+        name = "jest_cli___jest_cli_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-cli/-/jest-cli-24.8.0.tgz";
+        sha1 = "b075ac914492ed114fa338ade7362a301693e989";
+      };
+    }
+    {
+      name = "jest_config___jest_config_24.8.0.tgz";
+      path = fetchurl {
+        name = "jest_config___jest_config_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-config/-/jest-config-24.8.0.tgz";
+        sha1 = "77db3d265a6f726294687cbbccc36f8a76ee0f4f";
+      };
+    }
+    {
+      name = "jest_diff___jest_diff_24.8.0.tgz";
+      path = fetchurl {
+        name = "jest_diff___jest_diff_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-diff/-/jest-diff-24.8.0.tgz";
+        sha1 = "146435e7d1e3ffdf293d53ff97e193f1d1546172";
+      };
+    }
+    {
+      name = "jest_docblock___jest_docblock_24.3.0.tgz";
+      path = fetchurl {
+        name = "jest_docblock___jest_docblock_24.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-24.3.0.tgz";
+        sha1 = "b9c32dac70f72e4464520d2ba4aec02ab14db5dd";
+      };
+    }
+    {
+      name = "jest_each___jest_each_24.8.0.tgz";
+      path = fetchurl {
+        name = "jest_each___jest_each_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-each/-/jest-each-24.8.0.tgz";
+        sha1 = "a05fd2bf94ddc0b1da66c6d13ec2457f35e52775";
+      };
+    }
+    {
+      name = "jest_environment_jsdom___jest_environment_jsdom_24.8.0.tgz";
+      path = fetchurl {
+        name = "jest_environment_jsdom___jest_environment_jsdom_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-24.8.0.tgz";
+        sha1 = "300f6949a146cabe1c9357ad9e9ecf9f43f38857";
+      };
+    }
+    {
+      name = "jest_environment_node___jest_environment_node_24.8.0.tgz";
+      path = fetchurl {
+        name = "jest_environment_node___jest_environment_node_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-24.8.0.tgz";
+        sha1 = "d3f726ba8bc53087a60e7a84ca08883a4c892231";
+      };
+    }
+    {
+      name = "jest_get_type___jest_get_type_24.8.0.tgz";
+      path = fetchurl {
+        name = "jest_get_type___jest_get_type_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-24.8.0.tgz";
+        sha1 = "a7440de30b651f5a70ea3ed7ff073a32dfe646fc";
+      };
+    }
+    {
+      name = "jest_haste_map___jest_haste_map_24.8.0.tgz";
+      path = fetchurl {
+        name = "jest_haste_map___jest_haste_map_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-24.8.0.tgz";
+        sha1 = "51794182d877b3ddfd6e6d23920e3fe72f305800";
+      };
+    }
+    {
+      name = "jest_jasmine2___jest_jasmine2_24.8.0.tgz";
+      path = fetchurl {
+        name = "jest_jasmine2___jest_jasmine2_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-24.8.0.tgz";
+        sha1 = "a9c7e14c83dd77d8b15e820549ce8987cc8cd898";
+      };
+    }
+    {
+      name = "jest_junit___jest_junit_6.3.0.tgz";
+      path = fetchurl {
+        name = "jest_junit___jest_junit_6.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-junit/-/jest-junit-6.3.0.tgz";
+        sha1 = "99e64ebc54eddcb21238f0cc49f5820c89a8c785";
+      };
+    }
+    {
+      name = "jest_leak_detector___jest_leak_detector_24.8.0.tgz";
+      path = fetchurl {
+        name = "jest_leak_detector___jest_leak_detector_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-24.8.0.tgz";
+        sha1 = "c0086384e1f650c2d8348095df769f29b48e6980";
+      };
+    }
+    {
+      name = "jest_matcher_utils___jest_matcher_utils_24.8.0.tgz";
+      path = fetchurl {
+        name = "jest_matcher_utils___jest_matcher_utils_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-24.8.0.tgz";
+        sha1 = "2bce42204c9af12bde46f83dc839efe8be832495";
+      };
+    }
+    {
+      name = "jest_message_util___jest_message_util_24.8.0.tgz";
+      path = fetchurl {
+        name = "jest_message_util___jest_message_util_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-24.8.0.tgz";
+        sha1 = "0d6891e72a4beacc0292b638685df42e28d6218b";
+      };
+    }
+    {
+      name = "jest_mock___jest_mock_24.8.0.tgz";
+      path = fetchurl {
+        name = "jest_mock___jest_mock_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-mock/-/jest-mock-24.8.0.tgz";
+        sha1 = "2f9d14d37699e863f1febf4e4d5a33b7fdbbde56";
+      };
+    }
+    {
+      name = "jest_pnp_resolver___jest_pnp_resolver_1.2.1.tgz";
+      path = fetchurl {
+        name = "jest_pnp_resolver___jest_pnp_resolver_1.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.1.tgz";
+        sha1 = "ecdae604c077a7fbc70defb6d517c3c1c898923a";
+      };
+    }
+    {
+      name = "jest_regex_util___jest_regex_util_24.3.0.tgz";
+      path = fetchurl {
+        name = "jest_regex_util___jest_regex_util_24.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-24.3.0.tgz";
+        sha1 = "d5a65f60be1ae3e310d5214a0307581995227b36";
+      };
+    }
+    {
+      name = "jest_resolve_dependencies___jest_resolve_dependencies_24.8.0.tgz";
+      path = fetchurl {
+        name = "jest_resolve_dependencies___jest_resolve_dependencies_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-24.8.0.tgz";
+        sha1 = "19eec3241f2045d3f990dba331d0d7526acff8e0";
+      };
+    }
+    {
+      name = "jest_resolve___jest_resolve_24.8.0.tgz";
+      path = fetchurl {
+        name = "jest_resolve___jest_resolve_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-24.8.0.tgz";
+        sha1 = "84b8e5408c1f6a11539793e2b5feb1b6e722439f";
+      };
+    }
+    {
+      name = "jest_runner___jest_runner_24.8.0.tgz";
+      path = fetchurl {
+        name = "jest_runner___jest_runner_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-runner/-/jest-runner-24.8.0.tgz";
+        sha1 = "4f9ae07b767db27b740d7deffad0cf67ccb4c5bb";
+      };
+    }
+    {
+      name = "jest_runtime___jest_runtime_24.8.0.tgz";
+      path = fetchurl {
+        name = "jest_runtime___jest_runtime_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-24.8.0.tgz";
+        sha1 = "05f94d5b05c21f6dc54e427cd2e4980923350620";
+      };
+    }
+    {
+      name = "jest_serializer___jest_serializer_24.4.0.tgz";
+      path = fetchurl {
+        name = "jest_serializer___jest_serializer_24.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-24.4.0.tgz";
+        sha1 = "f70c5918c8ea9235ccb1276d232e459080588db3";
+      };
+    }
+    {
+      name = "jest_snapshot___jest_snapshot_24.8.0.tgz";
+      path = fetchurl {
+        name = "jest_snapshot___jest_snapshot_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-24.8.0.tgz";
+        sha1 = "3bec6a59da2ff7bc7d097a853fb67f9d415cb7c6";
+      };
+    }
+    {
+      name = "jest_transform_graphql___jest_transform_graphql_2.1.0.tgz";
+      path = fetchurl {
+        name = "jest_transform_graphql___jest_transform_graphql_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-transform-graphql/-/jest-transform-graphql-2.1.0.tgz";
+        sha1 = "903cb66bb27bc2772fd3e5dd4f7e9b57230f5829";
+      };
+    }
+    {
+      name = "jest_util___jest_util_24.8.0.tgz";
+      path = fetchurl {
+        name = "jest_util___jest_util_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-util/-/jest-util-24.8.0.tgz";
+        sha1 = "41f0e945da11df44cc76d64ffb915d0716f46cd1";
+      };
+    }
+    {
+      name = "jest_validate___jest_validate_24.8.0.tgz";
+      path = fetchurl {
+        name = "jest_validate___jest_validate_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-validate/-/jest-validate-24.8.0.tgz";
+        sha1 = "624c41533e6dfe356ffadc6e2423a35c2d3b4849";
+      };
+    }
+    {
+      name = "jest_watcher___jest_watcher_24.8.0.tgz";
+      path = fetchurl {
+        name = "jest_watcher___jest_watcher_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-24.8.0.tgz";
+        sha1 = "58d49915ceddd2de85e238f6213cef1c93715de4";
+      };
+    }
+    {
+      name = "jest_worker___jest_worker_24.6.0.tgz";
+      path = fetchurl {
+        name = "jest_worker___jest_worker_24.6.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.6.0.tgz";
+        sha1 = "7f81ceae34b7cde0c9827a6980c35b7cdc0161b3";
+      };
+    }
+    {
+      name = "jest___jest_24.8.0.tgz";
+      path = fetchurl {
+        name = "jest___jest_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest/-/jest-24.8.0.tgz";
+        sha1 = "d5dff1984d0d1002196e9b7f12f75af1b2809081";
+      };
+    }
+    {
+      name = "jmespath___jmespath_0.15.0.tgz";
+      path = fetchurl {
+        name = "jmespath___jmespath_0.15.0.tgz";
+        url  = "https://registry.yarnpkg.com/jmespath/-/jmespath-0.15.0.tgz";
+        sha1 = "a3f222a9aae9f966f5d27c796510e28091764217";
+      };
+    }
+    {
+      name = "jquery_ujs___jquery_ujs_1.2.2.tgz";
+      path = fetchurl {
+        name = "jquery_ujs___jquery_ujs_1.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/jquery-ujs/-/jquery-ujs-1.2.2.tgz";
+        sha1 = "6a8ef1020e6b6dda385b90a4bddc128c21c56397";
+      };
+    }
+    {
+      name = "jquery.caret___jquery.caret_0.3.1.tgz";
+      path = fetchurl {
+        name = "jquery.caret___jquery.caret_0.3.1.tgz";
+        url  = "https://registry.yarnpkg.com/jquery.caret/-/jquery.caret-0.3.1.tgz";
+        sha1 = "9c093318faf327eff322e826ca9f3241368bc7b8";
+      };
+    }
+    {
+      name = "jquery.waitforimages___jquery.waitforimages_2.2.0.tgz";
+      path = fetchurl {
+        name = "jquery.waitforimages___jquery.waitforimages_2.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/jquery.waitforimages/-/jquery.waitforimages-2.2.0.tgz";
+        sha1 = "63f23131055a1b060dc913e6d874bcc9b9e6b16b";
+      };
+    }
+    {
+      name = "jquery___jquery_3.4.1.tgz";
+      path = fetchurl {
+        name = "jquery___jquery_3.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz";
+        sha1 = "714f1f8d9dde4bdfa55764ba37ef214630d80ef2";
+      };
+    }
+    {
+      name = "js_base64___js_base64_2.5.1.tgz";
+      path = fetchurl {
+        name = "js_base64___js_base64_2.5.1.tgz";
+        url  = "https://registry.yarnpkg.com/js-base64/-/js-base64-2.5.1.tgz";
+        sha1 = "1efa39ef2c5f7980bb1784ade4a8af2de3291121";
+      };
+    }
+    {
+      name = "js_beautify___js_beautify_1.8.9.tgz";
+      path = fetchurl {
+        name = "js_beautify___js_beautify_1.8.9.tgz";
+        url  = "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.8.9.tgz";
+        sha1 = "08e3c05ead3ecfbd4f512c3895b1cda76c87d523";
+      };
+    }
+    {
+      name = "js_cookie___js_cookie_2.1.3.tgz";
+      path = fetchurl {
+        name = "js_cookie___js_cookie_2.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.1.3.tgz";
+        sha1 = "48071625217ac9ecfab8c343a13d42ec09ff0526";
+      };
+    }
+    {
+      name = "js_levenshtein___js_levenshtein_1.1.4.tgz";
+      path = fetchurl {
+        name = "js_levenshtein___js_levenshtein_1.1.4.tgz";
+        url  = "https://registry.yarnpkg.com/js-levenshtein/-/js-levenshtein-1.1.4.tgz";
+        sha1 = "3a56e3cbf589ca0081eb22cd9ba0b1290a16d26e";
+      };
+    }
+    {
+      name = "js_tokens___js_tokens_4.0.0.tgz";
+      path = fetchurl {
+        name = "js_tokens___js_tokens_4.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz";
+        sha1 = "19203fb59991df98e3a287050d4647cdeaf32499";
+      };
+    }
+    {
+      name = "js_tokens___js_tokens_3.0.2.tgz";
+      path = fetchurl {
+        name = "js_tokens___js_tokens_3.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz";
+        sha1 = "9866df395102130e38f7f996bceb65443209c25b";
+      };
+    }
+    {
+      name = "js_yaml___js_yaml_3.13.1.tgz";
+      path = fetchurl {
+        name = "js_yaml___js_yaml_3.13.1.tgz";
+        url  = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz";
+        sha1 = "aff151b30bfdfa8e49e05da22e7415e9dfa37847";
+      };
+    }
+    {
+      name = "js2xmlparser___js2xmlparser_3.0.0.tgz";
+      path = fetchurl {
+        name = "js2xmlparser___js2xmlparser_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/js2xmlparser/-/js2xmlparser-3.0.0.tgz";
+        sha1 = "3fb60eaa089c5440f9319f51760ccd07e2499733";
+      };
+    }
+    {
+      name = "jsbn___jsbn_0.1.1.tgz";
+      path = fetchurl {
+        name = "jsbn___jsbn_0.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz";
+        sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513";
+      };
+    }
+    {
+      name = "jsdoc_vue___jsdoc_vue_1.0.0.tgz";
+      path = fetchurl {
+        name = "jsdoc_vue___jsdoc_vue_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/jsdoc-vue/-/jsdoc-vue-1.0.0.tgz";
+        sha1 = "ff3ac1ba6bc4a74079bb79058a7bf0066e346235";
+      };
+    }
+    {
+      name = "jsdoc___jsdoc_3.5.5.tgz";
+      path = fetchurl {
+        name = "jsdoc___jsdoc_3.5.5.tgz";
+        url  = "https://registry.yarnpkg.com/jsdoc/-/jsdoc-3.5.5.tgz";
+        sha1 = "484521b126e81904d632ff83ec9aaa096708fa4d";
+      };
+    }
+    {
+      name = "jsdom___jsdom_11.12.0.tgz";
+      path = fetchurl {
+        name = "jsdom___jsdom_11.12.0.tgz";
+        url  = "https://registry.yarnpkg.com/jsdom/-/jsdom-11.12.0.tgz";
+        sha1 = "1a80d40ddd378a1de59656e9e6dc5a3ba8657bc8";
+      };
+    }
+    {
+      name = "jsesc___jsesc_2.5.2.tgz";
+      path = fetchurl {
+        name = "jsesc___jsesc_2.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz";
+        sha1 = "80564d2e483dacf6e8ef209650a67df3f0c283a4";
+      };
+    }
+    {
+      name = "jsesc___jsesc_0.5.0.tgz";
+      path = fetchurl {
+        name = "jsesc___jsesc_0.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz";
+        sha1 = "e7dee66e35d6fc16f710fe91d5cf69f70f08911d";
+      };
+    }
+    {
+      name = "json_buffer___json_buffer_3.0.0.tgz";
+      path = fetchurl {
+        name = "json_buffer___json_buffer_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz";
+        sha1 = "5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898";
+      };
+    }
+    {
+      name = "json_parse_better_errors___json_parse_better_errors_1.0.2.tgz";
+      path = fetchurl {
+        name = "json_parse_better_errors___json_parse_better_errors_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz";
+        sha1 = "bb867cfb3450e69107c131d1c514bab3dc8bcaa9";
+      };
+    }
+    {
+      name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz";
+      path = fetchurl {
+        name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz";
+        sha1 = "69f6a87d9513ab8bb8fe63bdb0979c448e684660";
+      };
+    }
+    {
+      name = "json_schema___json_schema_0.2.3.tgz";
+      path = fetchurl {
+        name = "json_schema___json_schema_0.2.3.tgz";
+        url  = "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz";
+        sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13";
+      };
+    }
+    {
+      name = "json_stable_stringify_without_jsonify___json_stable_stringify_without_jsonify_1.0.1.tgz";
+      path = fetchurl {
+        name = "json_stable_stringify_without_jsonify___json_stable_stringify_without_jsonify_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz";
+        sha1 = "9db7b59496ad3f3cfef30a75142d2d930ad72651";
+      };
+    }
+    {
+      name = "json_stringify_safe___json_stringify_safe_5.0.1.tgz";
+      path = fetchurl {
+        name = "json_stringify_safe___json_stringify_safe_5.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz";
+        sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
+      };
+    }
+    {
+      name = "json3___json3_3.3.2.tgz";
+      path = fetchurl {
+        name = "json3___json3_3.3.2.tgz";
+        url  = "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz";
+        sha1 = "3c0434743df93e2f5c42aee7b19bcb483575f4e1";
+      };
+    }
+    {
+      name = "json5___json5_2.1.0.tgz";
+      path = fetchurl {
+        name = "json5___json5_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/json5/-/json5-2.1.0.tgz";
+        sha1 = "e7a0c62c48285c628d20a10b85c89bb807c32850";
+      };
+    }
+    {
+      name = "json5___json5_1.0.1.tgz";
+      path = fetchurl {
+        name = "json5___json5_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz";
+        sha1 = "779fb0018604fa854eacbf6252180d83543e3dbe";
+      };
+    }
+    {
+      name = "jsonfile___jsonfile_4.0.0.tgz";
+      path = fetchurl {
+        name = "jsonfile___jsonfile_4.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz";
+        sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb";
+      };
+    }
+    {
+      name = "jsonparse___jsonparse_1.3.1.tgz";
+      path = fetchurl {
+        name = "jsonparse___jsonparse_1.3.1.tgz";
+        url  = "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz";
+        sha1 = "3f4dae4a91fac315f71062f8521cc239f1366280";
+      };
+    }
+    {
+      name = "jsprim___jsprim_1.4.1.tgz";
+      path = fetchurl {
+        name = "jsprim___jsprim_1.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz";
+        sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2";
+      };
+    }
+    {
+      name = "jszip_utils___jszip_utils_0.0.2.tgz";
+      path = fetchurl {
+        name = "jszip_utils___jszip_utils_0.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/jszip-utils/-/jszip-utils-0.0.2.tgz";
+        sha1 = "457d5cbca60a1c2e0706e9da2b544e8e7bc50bf8";
+      };
+    }
+    {
+      name = "jszip___jszip_3.1.3.tgz";
+      path = fetchurl {
+        name = "jszip___jszip_3.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/jszip/-/jszip-3.1.3.tgz";
+        sha1 = "8a920403b2b1651c0fc126be90192d9080957c37";
+      };
+    }
+    {
+      name = "karma_chrome_launcher___karma_chrome_launcher_3.0.0.tgz";
+      path = fetchurl {
+        name = "karma_chrome_launcher___karma_chrome_launcher_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/karma-chrome-launcher/-/karma-chrome-launcher-3.0.0.tgz";
+        sha1 = "5c3a7f877a304e90781c28fcd9a49e334a890f42";
+      };
+    }
+    {
+      name = "karma_coverage_istanbul_reporter___karma_coverage_istanbul_reporter_2.1.0.tgz";
+      path = fetchurl {
+        name = "karma_coverage_istanbul_reporter___karma_coverage_istanbul_reporter_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-2.1.0.tgz";
+        sha1 = "5f1bcc13c5e14ee1d91821ee8946861674f54c75";
+      };
+    }
+    {
+      name = "karma_jasmine___karma_jasmine_1.1.2.tgz";
+      path = fetchurl {
+        name = "karma_jasmine___karma_jasmine_1.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-1.1.2.tgz";
+        sha1 = "394f2b25ffb4a644b9ada6f22d443e2fd08886c3";
+      };
+    }
+    {
+      name = "karma_junit_reporter___karma_junit_reporter_1.2.0.tgz";
+      path = fetchurl {
+        name = "karma_junit_reporter___karma_junit_reporter_1.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/karma-junit-reporter/-/karma-junit-reporter-1.2.0.tgz";
+        sha1 = "4f9c40cedfb1a395f8aef876abf96189917c6396";
+      };
+    }
+    {
+      name = "karma_mocha_reporter___karma_mocha_reporter_2.2.5.tgz";
+      path = fetchurl {
+        name = "karma_mocha_reporter___karma_mocha_reporter_2.2.5.tgz";
+        url  = "https://registry.yarnpkg.com/karma-mocha-reporter/-/karma-mocha-reporter-2.2.5.tgz";
+        sha1 = "15120095e8ed819186e47a0b012f3cd741895560";
+      };
+    }
+    {
+      name = "karma_sourcemap_loader___karma_sourcemap_loader_0.3.7.tgz";
+      path = fetchurl {
+        name = "karma_sourcemap_loader___karma_sourcemap_loader_0.3.7.tgz";
+        url  = "https://registry.yarnpkg.com/karma-sourcemap-loader/-/karma-sourcemap-loader-0.3.7.tgz";
+        sha1 = "91322c77f8f13d46fed062b042e1009d4c4505d8";
+      };
+    }
+    {
+      name = "karma_webpack___karma_webpack_4.0.2.tgz";
+      path = fetchurl {
+        name = "karma_webpack___karma_webpack_4.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/karma-webpack/-/karma-webpack-4.0.2.tgz";
+        sha1 = "23219bd95bdda853e3073d3874d34447c77bced0";
+      };
+    }
+    {
+      name = "karma___karma_4.2.0.tgz";
+      path = fetchurl {
+        name = "karma___karma_4.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/karma/-/karma-4.2.0.tgz";
+        sha1 = "27e88b310cde090d016980ff5444e3a239196fca";
+      };
+    }
+    {
+      name = "katex___katex_0.10.0.tgz";
+      path = fetchurl {
+        name = "katex___katex_0.10.0.tgz";
+        url  = "https://registry.yarnpkg.com/katex/-/katex-0.10.0.tgz";
+        sha1 = "da562e5d0d5cc3aa602e27af8a9b8710bfbce765";
+      };
+    }
+    {
+      name = "keyv___keyv_3.0.0.tgz";
+      path = fetchurl {
+        name = "keyv___keyv_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/keyv/-/keyv-3.0.0.tgz";
+        sha1 = "44923ba39e68b12a7cec7df6c3268c031f2ef373";
+      };
+    }
+    {
+      name = "killable___killable_1.0.0.tgz";
+      path = fetchurl {
+        name = "killable___killable_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/killable/-/killable-1.0.0.tgz";
+        sha1 = "da8b84bd47de5395878f95d64d02f2449fe05e6b";
+      };
+    }
+    {
+      name = "kind_of___kind_of_3.2.2.tgz";
+      path = fetchurl {
+        name = "kind_of___kind_of_3.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz";
+        sha1 = "31ea21a734bab9bbb0f32466d893aea51e4a3c64";
+      };
+    }
+    {
+      name = "kind_of___kind_of_4.0.0.tgz";
+      path = fetchurl {
+        name = "kind_of___kind_of_4.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz";
+        sha1 = "20813df3d712928b207378691a45066fae72dd57";
+      };
+    }
+    {
+      name = "kind_of___kind_of_5.1.0.tgz";
+      path = fetchurl {
+        name = "kind_of___kind_of_5.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz";
+        sha1 = "729c91e2d857b7a419a1f9aa65685c4c33f5845d";
+      };
+    }
+    {
+      name = "kind_of___kind_of_6.0.2.tgz";
+      path = fetchurl {
+        name = "kind_of___kind_of_6.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz";
+        sha1 = "01146b36a6218e64e58f3a8d66de5d7fc6f6d051";
+      };
+    }
+    {
+      name = "klaw___klaw_2.0.0.tgz";
+      path = fetchurl {
+        name = "klaw___klaw_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/klaw/-/klaw-2.0.0.tgz";
+        sha1 = "59c128e0dc5ce410201151194eeb9cbf858650f6";
+      };
+    }
+    {
+      name = "kleur___kleur_3.0.3.tgz";
+      path = fetchurl {
+        name = "kleur___kleur_3.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz";
+        sha1 = "a79c9ecc86ee1ce3fa6206d1216c501f147fc07e";
+      };
+    }
+    {
+      name = "known_css_properties___known_css_properties_0.14.0.tgz";
+      path = fetchurl {
+        name = "known_css_properties___known_css_properties_0.14.0.tgz";
+        url  = "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.14.0.tgz";
+        sha1 = "d7032b4334a32dc22e6e46b081ec789daf18756c";
+      };
+    }
+    {
+      name = "latest_version___latest_version_3.1.0.tgz";
+      path = fetchurl {
+        name = "latest_version___latest_version_3.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/latest-version/-/latest-version-3.1.0.tgz";
+        sha1 = "a205383fea322b33b5ae3b18abee0dc2f356ee15";
+      };
+    }
+    {
+      name = "lazystream___lazystream_1.0.0.tgz";
+      path = fetchurl {
+        name = "lazystream___lazystream_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.0.tgz";
+        sha1 = "f6995fe0f820392f61396be89462407bb77168e4";
+      };
+    }
+    {
+      name = "lcid___lcid_1.0.0.tgz";
+      path = fetchurl {
+        name = "lcid___lcid_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz";
+        sha1 = "308accafa0bc483a3867b4b6f2b9506251d1b835";
+      };
+    }
+    {
+      name = "lcid___lcid_2.0.0.tgz";
+      path = fetchurl {
+        name = "lcid___lcid_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz";
+        sha1 = "6ef5d2df60e52f82eb228a4c373e8d1f397253cf";
+      };
+    }
+    {
+      name = "lead___lead_1.0.0.tgz";
+      path = fetchurl {
+        name = "lead___lead_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/lead/-/lead-1.0.0.tgz";
+        sha1 = "6f14f99a37be3a9dd784f5495690e5903466ee42";
+      };
+    }
+    {
+      name = "left_pad___left_pad_1.3.0.tgz";
+      path = fetchurl {
+        name = "left_pad___left_pad_1.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/left-pad/-/left-pad-1.3.0.tgz";
+        sha1 = "5b8a3a7765dfe001261dde915589e782f8c94d1e";
+      };
+    }
+    {
+      name = "leven___leven_2.1.0.tgz";
+      path = fetchurl {
+        name = "leven___leven_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/leven/-/leven-2.1.0.tgz";
+        sha1 = "c2e7a9f772094dee9d34202ae8acce4687875580";
+      };
+    }
+    {
+      name = "leven___leven_3.1.0.tgz";
+      path = fetchurl {
+        name = "leven___leven_3.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz";
+        sha1 = "77891de834064cccba82ae7842bb6b14a13ed7f2";
+      };
+    }
+    {
+      name = "levn___levn_0.3.0.tgz";
+      path = fetchurl {
+        name = "levn___levn_0.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz";
+        sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee";
+      };
+    }
+    {
+      name = "lie___lie_3.1.1.tgz";
+      path = fetchurl {
+        name = "lie___lie_3.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/lie/-/lie-3.1.1.tgz";
+        sha1 = "9a436b2cc7746ca59de7a41fa469b3efb76bd87e";
+      };
+    }
+    {
+      name = "lightercollective___lightercollective_0.1.0.tgz";
+      path = fetchurl {
+        name = "lightercollective___lightercollective_0.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/lightercollective/-/lightercollective-0.1.0.tgz";
+        sha1 = "70df102c530dcb8d0ccabfe6175a8d00d5f61300";
+      };
+    }
+    {
+      name = "linkify_it___linkify_it_2.1.0.tgz";
+      path = fetchurl {
+        name = "linkify_it___linkify_it_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/linkify-it/-/linkify-it-2.1.0.tgz";
+        sha1 = "c4caf38a6cd7ac2212ef3c7d2bde30a91561f9db";
+      };
+    }
+    {
+      name = "livereload_js___livereload_js_2.4.0.tgz";
+      path = fetchurl {
+        name = "livereload_js___livereload_js_2.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/livereload-js/-/livereload-js-2.4.0.tgz";
+        sha1 = "447c31cf1ea9ab52fc20db615c5ddf678f78009c";
+      };
+    }
+    {
+      name = "load_json_file___load_json_file_1.1.0.tgz";
+      path = fetchurl {
+        name = "load_json_file___load_json_file_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz";
+        sha1 = "956905708d58b4bab4c2261b04f59f31c99374c0";
+      };
+    }
+    {
+      name = "load_json_file___load_json_file_2.0.0.tgz";
+      path = fetchurl {
+        name = "load_json_file___load_json_file_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz";
+        sha1 = "7947e42149af80d696cbf797bcaabcfe1fe29ca8";
+      };
+    }
+    {
+      name = "load_json_file___load_json_file_4.0.0.tgz";
+      path = fetchurl {
+        name = "load_json_file___load_json_file_4.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz";
+        sha1 = "2f5f45ab91e33216234fd53adab668eb4ec0993b";
+      };
+    }
+    {
+      name = "loader_runner___loader_runner_2.3.0.tgz";
+      path = fetchurl {
+        name = "loader_runner___loader_runner_2.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz";
+        sha1 = "f482aea82d543e07921700d5a46ef26fdac6b8a2";
+      };
+    }
+    {
+      name = "loader_utils___loader_utils_1.2.3.tgz";
+      path = fetchurl {
+        name = "loader_utils___loader_utils_1.2.3.tgz";
+        url  = "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz";
+        sha1 = "1ff5dc6911c9f0a062531a4c04b609406108c2c7";
+      };
+    }
+    {
+      name = "locate_path___locate_path_2.0.0.tgz";
+      path = fetchurl {
+        name = "locate_path___locate_path_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz";
+        sha1 = "2b568b265eec944c6d9c0de9c3dbbbca0354cd8e";
+      };
+    }
+    {
+      name = "locate_path___locate_path_3.0.0.tgz";
+      path = fetchurl {
+        name = "locate_path___locate_path_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz";
+        sha1 = "dbec3b3ab759758071b58fe59fc41871af21400e";
+      };
+    }
+    {
+      name = "lodash.camelcase___lodash.camelcase_4.3.0.tgz";
+      path = fetchurl {
+        name = "lodash.camelcase___lodash.camelcase_4.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz";
+        sha1 = "b28aa6288a2b9fc651035c7711f65ab6190331a6";
+      };
+    }
+    {
+      name = "lodash.clonedeep___lodash.clonedeep_4.5.0.tgz";
+      path = fetchurl {
+        name = "lodash.clonedeep___lodash.clonedeep_4.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz";
+        sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef";
+      };
+    }
+    {
+      name = "lodash.debounce___lodash.debounce_4.0.8.tgz";
+      path = fetchurl {
+        name = "lodash.debounce___lodash.debounce_4.0.8.tgz";
+        url  = "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz";
+        sha1 = "82d79bff30a67c4005ffd5e2515300ad9ca4d7af";
+      };
+    }
+    {
+      name = "lodash.differencewith___lodash.differencewith_4.5.0.tgz";
+      path = fetchurl {
+        name = "lodash.differencewith___lodash.differencewith_4.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/lodash.differencewith/-/lodash.differencewith-4.5.0.tgz";
+        sha1 = "bafafbc918b55154e179176a00bb0aefaac854b7";
+      };
+    }
+    {
+      name = "lodash.escaperegexp___lodash.escaperegexp_4.1.2.tgz";
+      path = fetchurl {
+        name = "lodash.escaperegexp___lodash.escaperegexp_4.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz";
+        sha1 = "64762c48618082518ac3df4ccf5d5886dae20347";
+      };
+    }
+    {
+      name = "lodash.flatten___lodash.flatten_4.4.0.tgz";
+      path = fetchurl {
+        name = "lodash.flatten___lodash.flatten_4.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz";
+        sha1 = "f31c22225a9632d2bbf8e4addbef240aa765a61f";
+      };
+    }
+    {
+      name = "lodash.isequal___lodash.isequal_4.5.0.tgz";
+      path = fetchurl {
+        name = "lodash.isequal___lodash.isequal_4.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz";
+        sha1 = "415c4478f2bcc30120c22ce10ed3226f7d3e18e0";
+      };
+    }
+    {
+      name = "lodash.kebabcase___lodash.kebabcase_4.1.1.tgz";
+      path = fetchurl {
+        name = "lodash.kebabcase___lodash.kebabcase_4.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz";
+        sha1 = "8489b1cb0d29ff88195cceca448ff6d6cc295c36";
+      };
+    }
+    {
+      name = "lodash.mergewith___lodash.mergewith_4.6.2.tgz";
+      path = fetchurl {
+        name = "lodash.mergewith___lodash.mergewith_4.6.2.tgz";
+        url  = "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz";
+        sha1 = "617121f89ac55f59047c7aec1ccd6654c6590f55";
+      };
+    }
+    {
+      name = "lodash.snakecase___lodash.snakecase_4.1.1.tgz";
+      path = fetchurl {
+        name = "lodash.snakecase___lodash.snakecase_4.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz";
+        sha1 = "39d714a35357147837aefd64b5dcbb16becd8f8d";
+      };
+    }
+    {
+      name = "lodash.sortby___lodash.sortby_4.7.0.tgz";
+      path = fetchurl {
+        name = "lodash.sortby___lodash.sortby_4.7.0.tgz";
+        url  = "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz";
+        sha1 = "edd14c824e2cc9c1e0b0a1b42bb5210516a42438";
+      };
+    }
+    {
+      name = "lodash.upperfirst___lodash.upperfirst_4.3.1.tgz";
+      path = fetchurl {
+        name = "lodash.upperfirst___lodash.upperfirst_4.3.1.tgz";
+        url  = "https://registry.yarnpkg.com/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz";
+        sha1 = "1365edf431480481ef0d1c68957a5ed99d49f7ce";
+      };
+    }
+    {
+      name = "lodash___lodash_4.17.15.tgz";
+      path = fetchurl {
+        name = "lodash___lodash_4.17.15.tgz";
+        url  = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz";
+        sha1 = "b447f6670a0455bbfeedd11392eff330ea097548";
+      };
+    }
+    {
+      name = "log_symbols___log_symbols_2.2.0.tgz";
+      path = fetchurl {
+        name = "log_symbols___log_symbols_2.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz";
+        sha1 = "5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a";
+      };
+    }
+    {
+      name = "log_symbols___log_symbols_3.0.0.tgz";
+      path = fetchurl {
+        name = "log_symbols___log_symbols_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/log-symbols/-/log-symbols-3.0.0.tgz";
+        sha1 = "f3a08516a5dea893336a7dee14d18a1cfdab77c4";
+      };
+    }
+    {
+      name = "log4js___log4js_4.5.1.tgz";
+      path = fetchurl {
+        name = "log4js___log4js_4.5.1.tgz";
+        url  = "https://registry.yarnpkg.com/log4js/-/log4js-4.5.1.tgz";
+        sha1 = "e543625e97d9e6f3e6e7c9fc196dd6ab2cae30b5";
+      };
+    }
+    {
+      name = "loglevel___loglevel_1.4.1.tgz";
+      path = fetchurl {
+        name = "loglevel___loglevel_1.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/loglevel/-/loglevel-1.4.1.tgz";
+        sha1 = "95b383f91a3c2756fd4ab093667e4309161f2bcd";
+      };
+    }
+    {
+      name = "longest_streak___longest_streak_2.0.2.tgz";
+      path = fetchurl {
+        name = "longest_streak___longest_streak_2.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/longest-streak/-/longest-streak-2.0.2.tgz";
+        sha1 = "2421b6ba939a443bb9ffebf596585a50b4c38e2e";
+      };
+    }
+    {
+      name = "loose_envify___loose_envify_1.4.0.tgz";
+      path = fetchurl {
+        name = "loose_envify___loose_envify_1.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz";
+        sha1 = "71ee51fa7be4caec1a63839f7e682d8132d30caf";
+      };
+    }
+    {
+      name = "loud_rejection___loud_rejection_1.6.0.tgz";
+      path = fetchurl {
+        name = "loud_rejection___loud_rejection_1.6.0.tgz";
+        url  = "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz";
+        sha1 = "5b46f80147edee578870f086d04821cf998e551f";
+      };
+    }
+    {
+      name = "lower_case___lower_case_1.1.4.tgz";
+      path = fetchurl {
+        name = "lower_case___lower_case_1.1.4.tgz";
+        url  = "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz";
+        sha1 = "9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac";
+      };
+    }
+    {
+      name = "lowercase_keys___lowercase_keys_1.0.0.tgz";
+      path = fetchurl {
+        name = "lowercase_keys___lowercase_keys_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz";
+        sha1 = "4e3366b39e7f5457e35f1324bdf6f88d0bfc7306";
+      };
+    }
+    {
+      name = "lowlight___lowlight_1.11.0.tgz";
+      path = fetchurl {
+        name = "lowlight___lowlight_1.11.0.tgz";
+        url  = "https://registry.yarnpkg.com/lowlight/-/lowlight-1.11.0.tgz";
+        sha1 = "1304d83005126d4e8b1dc0f07981e9b689ec2efc";
+      };
+    }
+    {
+      name = "lru_cache___lru_cache_4.1.5.tgz";
+      path = fetchurl {
+        name = "lru_cache___lru_cache_4.1.5.tgz";
+        url  = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz";
+        sha1 = "8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd";
+      };
+    }
+    {
+      name = "lru_cache___lru_cache_5.1.1.tgz";
+      path = fetchurl {
+        name = "lru_cache___lru_cache_5.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz";
+        sha1 = "1da27e6710271947695daf6848e847f01d84b920";
+      };
+    }
+    {
+      name = "lz_string___lz_string_1.4.4.tgz";
+      path = fetchurl {
+        name = "lz_string___lz_string_1.4.4.tgz";
+        url  = "https://registry.yarnpkg.com/lz-string/-/lz-string-1.4.4.tgz";
+        sha1 = "c0d8eaf36059f705796e1e344811cf4c498d3a26";
+      };
+    }
+    {
+      name = "make_dir___make_dir_1.3.0.tgz";
+      path = fetchurl {
+        name = "make_dir___make_dir_1.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz";
+        sha1 = "79c1033b80515bd6d24ec9933e860ca75ee27f0c";
+      };
+    }
+    {
+      name = "make_dir___make_dir_2.1.0.tgz";
+      path = fetchurl {
+        name = "make_dir___make_dir_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz";
+        sha1 = "5f0310e18b8be898cc07009295a30ae41e91e6f5";
+      };
+    }
+    {
+      name = "make_error___make_error_1.3.5.tgz";
+      path = fetchurl {
+        name = "make_error___make_error_1.3.5.tgz";
+        url  = "https://registry.yarnpkg.com/make-error/-/make-error-1.3.5.tgz";
+        sha1 = "efe4e81f6db28cadd605c70f29c831b58ef776c8";
+      };
+    }
+    {
+      name = "makeerror___makeerror_1.0.11.tgz";
+      path = fetchurl {
+        name = "makeerror___makeerror_1.0.11.tgz";
+        url  = "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz";
+        sha1 = "e01a5c9109f2af79660e4e8b9587790184f5a96c";
+      };
+    }
+    {
+      name = "map_age_cleaner___map_age_cleaner_0.1.3.tgz";
+      path = fetchurl {
+        name = "map_age_cleaner___map_age_cleaner_0.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz";
+        sha1 = "7d583a7306434c055fe474b0f45078e6e1b4b92a";
+      };
+    }
+    {
+      name = "map_cache___map_cache_0.2.2.tgz";
+      path = fetchurl {
+        name = "map_cache___map_cache_0.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz";
+        sha1 = "c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf";
+      };
+    }
+    {
+      name = "map_obj___map_obj_1.0.1.tgz";
+      path = fetchurl {
+        name = "map_obj___map_obj_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz";
+        sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d";
+      };
+    }
+    {
+      name = "map_obj___map_obj_2.0.0.tgz";
+      path = fetchurl {
+        name = "map_obj___map_obj_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/map-obj/-/map-obj-2.0.0.tgz";
+        sha1 = "a65cd29087a92598b8791257a523e021222ac1f9";
+      };
+    }
+    {
+      name = "map_visit___map_visit_1.0.0.tgz";
+      path = fetchurl {
+        name = "map_visit___map_visit_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz";
+        sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f";
+      };
+    }
+    {
+      name = "markdown_escapes___markdown_escapes_1.0.2.tgz";
+      path = fetchurl {
+        name = "markdown_escapes___markdown_escapes_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.2.tgz";
+        sha1 = "e639cbde7b99c841c0bacc8a07982873b46d2122";
+      };
+    }
+    {
+      name = "markdown_it___markdown_it_9.0.1.tgz";
+      path = fetchurl {
+        name = "markdown_it___markdown_it_9.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/markdown-it/-/markdown-it-9.0.1.tgz";
+        sha1 = "aafe363c43718720b6575fd10625cde6e4ff2d47";
+      };
+    }
+    {
+      name = "markdown_it___markdown_it_8.4.2.tgz";
+      path = fetchurl {
+        name = "markdown_it___markdown_it_8.4.2.tgz";
+        url  = "https://registry.yarnpkg.com/markdown-it/-/markdown-it-8.4.2.tgz";
+        sha1 = "386f98998dc15a37722aa7722084f4020bdd9b54";
+      };
+    }
+    {
+      name = "markdown_table___markdown_table_1.1.2.tgz";
+      path = fetchurl {
+        name = "markdown_table___markdown_table_1.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/markdown-table/-/markdown-table-1.1.2.tgz";
+        sha1 = "c78db948fa879903a41bce522e3b96f801c63786";
+      };
+    }
+    {
+      name = "markdownlint_cli___markdownlint_cli_0.18.0.tgz";
+      path = fetchurl {
+        name = "markdownlint_cli___markdownlint_cli_0.18.0.tgz";
+        url  = "https://registry.yarnpkg.com/markdownlint-cli/-/markdownlint-cli-0.18.0.tgz";
+        sha1 = "bd1cee72739049d42dcea5f6db0c0f57c6eb8096";
+      };
+    }
+    {
+      name = "markdownlint___markdownlint_0.16.0.tgz";
+      path = fetchurl {
+        name = "markdownlint___markdownlint_0.16.0.tgz";
+        url  = "https://registry.yarnpkg.com/markdownlint/-/markdownlint-0.16.0.tgz";
+        sha1 = "69f73cc755a44231fbe5dc7c37a5909cedc0ac6e";
+      };
+    }
+    {
+      name = "marked___marked_0.3.19.tgz";
+      path = fetchurl {
+        name = "marked___marked_0.3.19.tgz";
+        url  = "https://registry.yarnpkg.com/marked/-/marked-0.3.19.tgz";
+        sha1 = "5d47f709c4c9fc3c216b6d46127280f40b39d790";
+      };
+    }
+    {
+      name = "mathml_tag_names___mathml_tag_names_2.1.1.tgz";
+      path = fetchurl {
+        name = "mathml_tag_names___mathml_tag_names_2.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.1.tgz";
+        sha1 = "6dff66c99d55ecf739ca53c492e626f1d12a33cc";
+      };
+    }
+    {
+      name = "md5.js___md5.js_1.3.4.tgz";
+      path = fetchurl {
+        name = "md5.js___md5.js_1.3.4.tgz";
+        url  = "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.4.tgz";
+        sha1 = "e9bdbde94a20a5ac18b04340fc5764d5b09d901d";
+      };
+    }
+    {
+      name = "md5___md5_2.2.1.tgz";
+      path = fetchurl {
+        name = "md5___md5_2.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/md5/-/md5-2.2.1.tgz";
+        sha1 = "53ab38d5fe3c8891ba465329ea23fac0540126f9";
+      };
+    }
+    {
+      name = "mdast_util_compact___mdast_util_compact_1.0.2.tgz";
+      path = fetchurl {
+        name = "mdast_util_compact___mdast_util_compact_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/mdast-util-compact/-/mdast-util-compact-1.0.2.tgz";
+        sha1 = "c12ebe16fffc84573d3e19767726de226e95f649";
+      };
+    }
+    {
+      name = "mdast_util_definitions___mdast_util_definitions_1.2.4.tgz";
+      path = fetchurl {
+        name = "mdast_util_definitions___mdast_util_definitions_1.2.4.tgz";
+        url  = "https://registry.yarnpkg.com/mdast-util-definitions/-/mdast-util-definitions-1.2.4.tgz";
+        sha1 = "2b54ad4eecaff9d9fcb6bf6f9f6b68b232d77ca7";
+      };
+    }
+    {
+      name = "mdast_util_inject___mdast_util_inject_1.1.0.tgz";
+      path = fetchurl {
+        name = "mdast_util_inject___mdast_util_inject_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/mdast-util-inject/-/mdast-util-inject-1.1.0.tgz";
+        sha1 = "db06b8b585be959a2dcd2f87f472ba9b756f3675";
+      };
+    }
+    {
+      name = "mdast_util_to_hast___mdast_util_to_hast_3.0.4.tgz";
+      path = fetchurl {
+        name = "mdast_util_to_hast___mdast_util_to_hast_3.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-3.0.4.tgz";
+        sha1 = "132001b266031192348d3366a6b011f28e54dc40";
+      };
+    }
+    {
+      name = "mdast_util_to_string___mdast_util_to_string_1.0.6.tgz";
+      path = fetchurl {
+        name = "mdast_util_to_string___mdast_util_to_string_1.0.6.tgz";
+        url  = "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-1.0.6.tgz";
+        sha1 = "7d85421021343b33de1552fc71cb8e5b4ae7536d";
+      };
+    }
+    {
+      name = "mdast_util_toc___mdast_util_toc_3.1.0.tgz";
+      path = fetchurl {
+        name = "mdast_util_toc___mdast_util_toc_3.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/mdast-util-toc/-/mdast-util-toc-3.1.0.tgz";
+        sha1 = "395eeb877f067f9d2165d990d77c7eea6f740934";
+      };
+    }
+    {
+      name = "mdurl___mdurl_1.0.1.tgz";
+      path = fetchurl {
+        name = "mdurl___mdurl_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz";
+        sha1 = "fe85b2ec75a59037f2adfec100fd6c601761152e";
+      };
+    }
+    {
+      name = "media_typer___media_typer_0.3.0.tgz";
+      path = fetchurl {
+        name = "media_typer___media_typer_0.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz";
+        sha1 = "8710d7af0aa626f8fffa1ce00168545263255748";
+      };
+    }
+    {
+      name = "mem___mem_4.3.0.tgz";
+      path = fetchurl {
+        name = "mem___mem_4.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz";
+        sha1 = "461af497bc4ae09608cdb2e60eefb69bff744178";
+      };
+    }
+    {
+      name = "memory_fs___memory_fs_0.2.0.tgz";
+      path = fetchurl {
+        name = "memory_fs___memory_fs_0.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.2.0.tgz";
+        sha1 = "f2bb25368bc121e391c2520de92969caee0a0290";
+      };
+    }
+    {
+      name = "memory_fs___memory_fs_0.4.1.tgz";
+      path = fetchurl {
+        name = "memory_fs___memory_fs_0.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz";
+        sha1 = "3a9a20b8462523e447cfbc7e8bb80ed667bfc552";
+      };
+    }
+    {
+      name = "meow___meow_3.7.0.tgz";
+      path = fetchurl {
+        name = "meow___meow_3.7.0.tgz";
+        url  = "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz";
+        sha1 = "72cb668b425228290abbfa856892587308a801fb";
+      };
+    }
+    {
+      name = "meow___meow_5.0.0.tgz";
+      path = fetchurl {
+        name = "meow___meow_5.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/meow/-/meow-5.0.0.tgz";
+        sha1 = "dfc73d63a9afc714a5e371760eb5c88b91078aa4";
+      };
+    }
+    {
+      name = "merge_descriptors___merge_descriptors_1.0.1.tgz";
+      path = fetchurl {
+        name = "merge_descriptors___merge_descriptors_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz";
+        sha1 = "b00aaa556dd8b44568150ec9d1b953f3f90cbb61";
+      };
+    }
+    {
+      name = "merge_source_map___merge_source_map_1.1.0.tgz";
+      path = fetchurl {
+        name = "merge_source_map___merge_source_map_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.1.0.tgz";
+        sha1 = "2fdde7e6020939f70906a68f2d7ae685e4c8c646";
+      };
+    }
+    {
+      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 = "merge2___merge2_1.2.3.tgz";
+      path = fetchurl {
+        name = "merge2___merge2_1.2.3.tgz";
+        url  = "https://registry.yarnpkg.com/merge2/-/merge2-1.2.3.tgz";
+        sha1 = "7ee99dbd69bb6481689253f018488a1b902b0ed5";
+      };
+    }
+    {
+      name = "mermaid___mermaid_8.2.6.tgz";
+      path = fetchurl {
+        name = "mermaid___mermaid_8.2.6.tgz";
+        url  = "https://registry.yarnpkg.com/mermaid/-/mermaid-8.2.6.tgz";
+        sha1 = "e73f396461a435c39a998819171c2114f59e46e1";
+      };
+    }
+    {
+      name = "methods___methods_1.1.2.tgz";
+      path = fetchurl {
+        name = "methods___methods_1.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz";
+        sha1 = "5529a4d67654134edcc5266656835b0f851afcee";
+      };
+    }
+    {
+      name = "micromatch___micromatch_3.1.10.tgz";
+      path = fetchurl {
+        name = "micromatch___micromatch_3.1.10.tgz";
+        url  = "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz";
+        sha1 = "70859bc95c9840952f359a068a3fc49f9ecfac23";
+      };
+    }
+    {
+      name = "micromatch___micromatch_4.0.2.tgz";
+      path = fetchurl {
+        name = "micromatch___micromatch_4.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz";
+        sha1 = "4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259";
+      };
+    }
+    {
+      name = "miller_rabin___miller_rabin_4.0.1.tgz";
+      path = fetchurl {
+        name = "miller_rabin___miller_rabin_4.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz";
+        sha1 = "f080351c865b0dc562a8462966daa53543c78a4d";
+      };
+    }
+    {
+      name = "mime_db___mime_db_1.37.0.tgz";
+      path = fetchurl {
+        name = "mime_db___mime_db_1.37.0.tgz";
+        url  = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.37.0.tgz";
+        sha1 = "0b6a0ce6fdbe9576e25f1f2d2fde8830dc0ad0d8";
+      };
+    }
+    {
+      name = "mime_types___mime_types_2.1.21.tgz";
+      path = fetchurl {
+        name = "mime_types___mime_types_2.1.21.tgz";
+        url  = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.21.tgz";
+        sha1 = "28995aa1ecb770742fe6ae7e58f9181c744b3f96";
+      };
+    }
+    {
+      name = "mime___mime_1.4.1.tgz";
+      path = fetchurl {
+        name = "mime___mime_1.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz";
+        sha1 = "121f9ebc49e3766f311a76e1fa1c8003c4b03aa6";
+      };
+    }
+    {
+      name = "mime___mime_2.4.4.tgz";
+      path = fetchurl {
+        name = "mime___mime_2.4.4.tgz";
+        url  = "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz";
+        sha1 = "bd7b91135fc6b01cde3e9bae33d659b63d8857e5";
+      };
+    }
+    {
+      name = "mimic_fn___mimic_fn_1.2.0.tgz";
+      path = fetchurl {
+        name = "mimic_fn___mimic_fn_1.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz";
+        sha1 = "820c86a39334640e99516928bd03fca88057d022";
+      };
+    }
+    {
+      name = "mimic_fn___mimic_fn_2.1.0.tgz";
+      path = fetchurl {
+        name = "mimic_fn___mimic_fn_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz";
+        sha1 = "7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b";
+      };
+    }
+    {
+      name = "mimic_response___mimic_response_1.0.0.tgz";
+      path = fetchurl {
+        name = "mimic_response___mimic_response_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.0.tgz";
+        sha1 = "df3d3652a73fded6b9b0b24146e6fd052353458e";
+      };
+    }
+    {
+      name = "minify___minify_4.1.2.tgz";
+      path = fetchurl {
+        name = "minify___minify_4.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/minify/-/minify-4.1.2.tgz";
+        sha1 = "88755f4faa5f7ab6d0c64fdd659aa34ea658f180";
+      };
+    }
+    {
+      name = "minimalistic_assert___minimalistic_assert_1.0.0.tgz";
+      path = fetchurl {
+        name = "minimalistic_assert___minimalistic_assert_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz";
+        sha1 = "702be2dda6b37f4836bcb3f5db56641b64a1d3d3";
+      };
+    }
+    {
+      name = "minimalistic_crypto_utils___minimalistic_crypto_utils_1.0.1.tgz";
+      path = fetchurl {
+        name = "minimalistic_crypto_utils___minimalistic_crypto_utils_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz";
+        sha1 = "f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a";
+      };
+    }
+    {
+      name = "minimatch___minimatch_3.0.4.tgz";
+      path = fetchurl {
+        name = "minimatch___minimatch_3.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz";
+        sha1 = "5166e286457f03306064be5497e8dbb0c3d32083";
+      };
+    }
+    {
+      name = "minimist_options___minimist_options_3.0.2.tgz";
+      path = fetchurl {
+        name = "minimist_options___minimist_options_3.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/minimist-options/-/minimist-options-3.0.2.tgz";
+        sha1 = "fba4c8191339e13ecf4d61beb03f070103f3d954";
+      };
+    }
+    {
+      name = "minimist___minimist_0.0.8.tgz";
+      path = fetchurl {
+        name = "minimist___minimist_0.0.8.tgz";
+        url  = "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz";
+        sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
+      };
+    }
+    {
+      name = "minimist___minimist_1.1.3.tgz";
+      path = fetchurl {
+        name = "minimist___minimist_1.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/minimist/-/minimist-1.1.3.tgz";
+        sha1 = "3bedfd91a92d39016fcfaa1c681e8faa1a1efda8";
+      };
+    }
+    {
+      name = "minimist___minimist_1.2.0.tgz";
+      path = fetchurl {
+        name = "minimist___minimist_1.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz";
+        sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284";
+      };
+    }
+    {
+      name = "minipass___minipass_2.3.5.tgz";
+      path = fetchurl {
+        name = "minipass___minipass_2.3.5.tgz";
+        url  = "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz";
+        sha1 = "cacebe492022497f656b0f0f51e2682a9ed2d848";
+      };
+    }
+    {
+      name = "minizlib___minizlib_1.2.1.tgz";
+      path = fetchurl {
+        name = "minizlib___minizlib_1.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/minizlib/-/minizlib-1.2.1.tgz";
+        sha1 = "dd27ea6136243c7c880684e8672bb3a45fd9b614";
+      };
+    }
+    {
+      name = "mississippi___mississippi_3.0.0.tgz";
+      path = fetchurl {
+        name = "mississippi___mississippi_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz";
+        sha1 = "ea0a3291f97e0b5e8776b363d5f0a12d94c67022";
+      };
+    }
+    {
+      name = "mixin_deep___mixin_deep_1.3.2.tgz";
+      path = fetchurl {
+        name = "mixin_deep___mixin_deep_1.3.2.tgz";
+        url  = "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz";
+        sha1 = "1120b43dc359a785dce65b55b82e257ccf479566";
+      };
+    }
+    {
+      name = "https___registry.npmjs.org_mkdirp___mkdirp_0.5.1.tgz";
+      path = fetchurl {
+        name = "https___registry.npmjs.org_mkdirp___mkdirp_0.5.1.tgz";
+        url  = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
+        sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
+      };
+    }
+    {
+      name = "module_deps_sortable___module_deps_sortable_5.0.0.tgz";
+      path = fetchurl {
+        name = "module_deps_sortable___module_deps_sortable_5.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/module-deps-sortable/-/module-deps-sortable-5.0.0.tgz";
+        sha1 = "99db5bb08f7eab55e4c31f6b7c722c6a2144ba74";
+      };
+    }
+    {
+      name = "moment_mini___moment_mini_2.22.1.tgz";
+      path = fetchurl {
+        name = "moment_mini___moment_mini_2.22.1.tgz";
+        url  = "https://registry.yarnpkg.com/moment-mini/-/moment-mini-2.22.1.tgz";
+        sha1 = "bc32d73e43a4505070be6b53494b17623183420d";
+      };
+    }
+    {
+      name = "moment___moment_2.24.0.tgz";
+      path = fetchurl {
+        name = "moment___moment_2.24.0.tgz";
+        url  = "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz";
+        sha1 = "0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b";
+      };
+    }
+    {
+      name = "monaco_editor_webpack_plugin___monaco_editor_webpack_plugin_1.7.0.tgz";
+      path = fetchurl {
+        name = "monaco_editor_webpack_plugin___monaco_editor_webpack_plugin_1.7.0.tgz";
+        url  = "https://registry.yarnpkg.com/monaco-editor-webpack-plugin/-/monaco-editor-webpack-plugin-1.7.0.tgz";
+        sha1 = "920cbeecca25f15d70d568a7e11b0ba4daf1ae83";
+      };
+    }
+    {
+      name = "monaco_editor___monaco_editor_0.15.6.tgz";
+      path = fetchurl {
+        name = "monaco_editor___monaco_editor_0.15.6.tgz";
+        url  = "https://registry.yarnpkg.com/monaco-editor/-/monaco-editor-0.15.6.tgz";
+        sha1 = "d63b3b06f86f803464f003b252627c3eb4a09483";
+      };
+    }
+    {
+      name = "mousetrap___mousetrap_1.4.6.tgz";
+      path = fetchurl {
+        name = "mousetrap___mousetrap_1.4.6.tgz";
+        url  = "https://registry.yarnpkg.com/mousetrap/-/mousetrap-1.4.6.tgz";
+        sha1 = "eaca72e22e56d5b769b7555873b688c3332e390a";
+      };
+    }
+    {
+      name = "move_concurrently___move_concurrently_1.0.1.tgz";
+      path = fetchurl {
+        name = "move_concurrently___move_concurrently_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz";
+        sha1 = "be2c005fda32e0b29af1f05d7c4b33214c701f92";
+      };
+    }
+    {
+      name = "ms___ms_2.0.0.tgz";
+      path = fetchurl {
+        name = "ms___ms_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz";
+        sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8";
+      };
+    }
+    {
+      name = "ms___ms_2.1.1.tgz";
+      path = fetchurl {
+        name = "ms___ms_2.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz";
+        sha1 = "30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a";
+      };
+    }
+    {
+      name = "multicast_dns_service_types___multicast_dns_service_types_1.1.0.tgz";
+      path = fetchurl {
+        name = "multicast_dns_service_types___multicast_dns_service_types_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz";
+        sha1 = "899f11d9686e5e05cb91b35d5f0e63b773cfc901";
+      };
+    }
+    {
+      name = "multicast_dns___multicast_dns_6.1.1.tgz";
+      path = fetchurl {
+        name = "multicast_dns___multicast_dns_6.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-6.1.1.tgz";
+        sha1 = "6e7de86a570872ab17058adea7160bbeca814dde";
+      };
+    }
+    {
+      name = "mute_stream___mute_stream_0.0.7.tgz";
+      path = fetchurl {
+        name = "mute_stream___mute_stream_0.0.7.tgz";
+        url  = "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz";
+        sha1 = "3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab";
+      };
+    }
+    {
+      name = "nan___nan_2.14.0.tgz";
+      path = fetchurl {
+        name = "nan___nan_2.14.0.tgz";
+        url  = "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz";
+        sha1 = "7818f722027b2459a86f0295d434d1fc2336c52c";
+      };
+    }
+    {
+      name = "nanomatch___nanomatch_1.2.13.tgz";
+      path = fetchurl {
+        name = "nanomatch___nanomatch_1.2.13.tgz";
+        url  = "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz";
+        sha1 = "b87a8aa4fc0de8fe6be88895b38983ff265bd119";
+      };
+    }
+    {
+      name = "natural_compare___natural_compare_1.4.0.tgz";
+      path = fetchurl {
+        name = "natural_compare___natural_compare_1.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz";
+        sha1 = "4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7";
+      };
+    }
+    {
+      name = "needle___needle_2.4.0.tgz";
+      path = fetchurl {
+        name = "needle___needle_2.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/needle/-/needle-2.4.0.tgz";
+        sha1 = "6833e74975c444642590e15a750288c5f939b57c";
+      };
+    }
+    {
+      name = "negotiator___negotiator_0.6.1.tgz";
+      path = fetchurl {
+        name = "negotiator___negotiator_0.6.1.tgz";
+        url  = "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz";
+        sha1 = "2b327184e8992101177b28563fb5e7102acd0ca9";
+      };
+    }
+    {
+      name = "neo_async___neo_async_2.6.1.tgz";
+      path = fetchurl {
+        name = "neo_async___neo_async_2.6.1.tgz";
+        url  = "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz";
+        sha1 = "ac27ada66167fa8849a6addd837f6b189ad2081c";
+      };
+    }
+    {
+      name = "nice_try___nice_try_1.0.5.tgz";
+      path = fetchurl {
+        name = "nice_try___nice_try_1.0.5.tgz";
+        url  = "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz";
+        sha1 = "a3378a7696ce7d223e88fc9b764bd7ef1089e366";
+      };
+    }
+    {
+      name = "no_case___no_case_2.3.2.tgz";
+      path = fetchurl {
+        name = "no_case___no_case_2.3.2.tgz";
+        url  = "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz";
+        sha1 = "60b813396be39b3f1288a4c1ed5d1e7d28b464ac";
+      };
+    }
+    {
+      name = "node_ensure___node_ensure_0.0.0.tgz";
+      path = fetchurl {
+        name = "node_ensure___node_ensure_0.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/node-ensure/-/node-ensure-0.0.0.tgz";
+        sha1 = "ecae764150de99861ec5c810fd5d096b183932a7";
+      };
+    }
+    {
+      name = "node_fetch___node_fetch_2.6.0.tgz";
+      path = fetchurl {
+        name = "node_fetch___node_fetch_2.6.0.tgz";
+        url  = "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz";
+        sha1 = "e633456386d4aa55863f676a7ab0daa8fdecb0fd";
+      };
+    }
+    {
+      name = "node_forge___node_forge_0.6.33.tgz";
+      path = fetchurl {
+        name = "node_forge___node_forge_0.6.33.tgz";
+        url  = "https://registry.yarnpkg.com/node-forge/-/node-forge-0.6.33.tgz";
+        sha1 = "463811879f573d45155ad6a9f43dc296e8e85ebc";
+      };
+    }
+    {
+      name = "node_gyp___node_gyp_3.8.0.tgz";
+      path = fetchurl {
+        name = "node_gyp___node_gyp_3.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz";
+        sha1 = "540304261c330e80d0d5edce253a68cb3964218c";
+      };
+    }
+    {
+      name = "node_int64___node_int64_0.4.0.tgz";
+      path = fetchurl {
+        name = "node_int64___node_int64_0.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz";
+        sha1 = "87a9065cdb355d3182d8f94ce11188b825c68a3b";
+      };
+    }
+    {
+      name = "node_libs_browser___node_libs_browser_2.1.0.tgz";
+      path = fetchurl {
+        name = "node_libs_browser___node_libs_browser_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.1.0.tgz";
+        sha1 = "5f94263d404f6e44767d726901fff05478d600df";
+      };
+    }
+    {
+      name = "node_modules_regexp___node_modules_regexp_1.0.0.tgz";
+      path = fetchurl {
+        name = "node_modules_regexp___node_modules_regexp_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz";
+        sha1 = "8d9dbe28964a4ac5712e9131642107c71e90ec40";
+      };
+    }
+    {
+      name = "node_notifier___node_notifier_5.4.0.tgz";
+      path = fetchurl {
+        name = "node_notifier___node_notifier_5.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/node-notifier/-/node-notifier-5.4.0.tgz";
+        sha1 = "7b455fdce9f7de0c63538297354f3db468426e6a";
+      };
+    }
+    {
+      name = "node_pre_gyp___node_pre_gyp_0.12.0.tgz";
+      path = fetchurl {
+        name = "node_pre_gyp___node_pre_gyp_0.12.0.tgz";
+        url  = "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz";
+        sha1 = "39ba4bb1439da030295f899e3b520b7785766149";
+      };
+    }
+    {
+      name = "node_releases___node_releases_1.1.25.tgz";
+      path = fetchurl {
+        name = "node_releases___node_releases_1.1.25.tgz";
+        url  = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.25.tgz";
+        sha1 = "0c2d7dbc7fed30fbe02a9ee3007b8c90bf0133d3";
+      };
+    }
+    {
+      name = "node_sass___node_sass_4.12.0.tgz";
+      path = fetchurl {
+        name = "node_sass___node_sass_4.12.0.tgz";
+        url  = "https://registry.yarnpkg.com/node-sass/-/node-sass-4.12.0.tgz";
+        sha1 = "0914f531932380114a30cc5fa4fa63233a25f017";
+      };
+    }
+    {
+      name = "nodemon___nodemon_1.18.9.tgz";
+      path = fetchurl {
+        name = "nodemon___nodemon_1.18.9.tgz";
+        url  = "https://registry.yarnpkg.com/nodemon/-/nodemon-1.18.9.tgz";
+        sha1 = "90b467efd3b3c81b9453380aeb2a2cba535d0ead";
+      };
+    }
+    {
+      name = "nopt___nopt_3.0.6.tgz";
+      path = fetchurl {
+        name = "nopt___nopt_3.0.6.tgz";
+        url  = "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz";
+        sha1 = "c6465dbf08abcd4db359317f79ac68a646b28ff9";
+      };
+    }
+    {
+      name = "nopt___nopt_4.0.1.tgz";
+      path = fetchurl {
+        name = "nopt___nopt_4.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz";
+        sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d";
+      };
+    }
+    {
+      name = "nopt___nopt_1.0.10.tgz";
+      path = fetchurl {
+        name = "nopt___nopt_1.0.10.tgz";
+        url  = "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz";
+        sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee";
+      };
+    }
+    {
+      name = "normalize_package_data___normalize_package_data_2.5.0.tgz";
+      path = fetchurl {
+        name = "normalize_package_data___normalize_package_data_2.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz";
+        sha1 = "e66db1838b200c1dfc233225d12cb36520e234a8";
+      };
+    }
+    {
+      name = "normalize_path___normalize_path_2.1.1.tgz";
+      path = fetchurl {
+        name = "normalize_path___normalize_path_2.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz";
+        sha1 = "1ab28b556e198363a8c1a6f7e6fa20137fe6aed9";
+      };
+    }
+    {
+      name = "normalize_path___normalize_path_3.0.0.tgz";
+      path = fetchurl {
+        name = "normalize_path___normalize_path_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz";
+        sha1 = "0dcd69ff23a1c9b11fd0978316644a0388216a65";
+      };
+    }
+    {
+      name = "normalize_range___normalize_range_0.1.2.tgz";
+      path = fetchurl {
+        name = "normalize_range___normalize_range_0.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz";
+        sha1 = "2d10c06bdfd312ea9777695a4d28439456b75942";
+      };
+    }
+    {
+      name = "normalize_selector___normalize_selector_0.2.0.tgz";
+      path = fetchurl {
+        name = "normalize_selector___normalize_selector_0.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/normalize-selector/-/normalize-selector-0.2.0.tgz";
+        sha1 = "d0b145eb691189c63a78d201dc4fdb1293ef0c03";
+      };
+    }
+    {
+      name = "normalize_url___normalize_url_2.0.1.tgz";
+      path = fetchurl {
+        name = "normalize_url___normalize_url_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/normalize-url/-/normalize-url-2.0.1.tgz";
+        sha1 = "835a9da1551fa26f70e92329069a23aa6574d7e6";
+      };
+    }
+    {
+      name = "normalize_url___normalize_url_1.9.1.tgz";
+      path = fetchurl {
+        name = "normalize_url___normalize_url_1.9.1.tgz";
+        url  = "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz";
+        sha1 = "2cc0d66b31ea23036458436e3620d85954c66c3c";
+      };
+    }
+    {
+      name = "now_and_later___now_and_later_2.0.1.tgz";
+      path = fetchurl {
+        name = "now_and_later___now_and_later_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/now-and-later/-/now-and-later-2.0.1.tgz";
+        sha1 = "8e579c8685764a7cc02cb680380e94f43ccb1f7c";
+      };
+    }
+    {
+      name = "npm_bundled___npm_bundled_1.0.6.tgz";
+      path = fetchurl {
+        name = "npm_bundled___npm_bundled_1.0.6.tgz";
+        url  = "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.6.tgz";
+        sha1 = "e7ba9aadcef962bb61248f91721cd932b3fe6bdd";
+      };
+    }
+    {
+      name = "npm_packlist___npm_packlist_1.4.1.tgz";
+      path = fetchurl {
+        name = "npm_packlist___npm_packlist_1.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.1.tgz";
+        sha1 = "19064cdf988da80ea3cee45533879d90192bbfbc";
+      };
+    }
+    {
+      name = "npm_run_path___npm_run_path_2.0.2.tgz";
+      path = fetchurl {
+        name = "npm_run_path___npm_run_path_2.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz";
+        sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f";
+      };
+    }
+    {
+      name = "npmlog___npmlog_4.1.2.tgz";
+      path = fetchurl {
+        name = "npmlog___npmlog_4.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz";
+        sha1 = "08a7f2a8bf734604779a9efa4ad5cc717abb954b";
+      };
+    }
+    {
+      name = "num2fraction___num2fraction_1.2.2.tgz";
+      path = fetchurl {
+        name = "num2fraction___num2fraction_1.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz";
+        sha1 = "6f682b6a027a4e9ddfa4564cd2589d1d4e669ede";
+      };
+    }
+    {
+      name = "number_is_nan___number_is_nan_1.0.1.tgz";
+      path = fetchurl {
+        name = "number_is_nan___number_is_nan_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz";
+        sha1 = "097b602b53422a522c1afb8790318336941a011d";
+      };
+    }
+    {
+      name = "nwsapi___nwsapi_2.0.9.tgz";
+      path = fetchurl {
+        name = "nwsapi___nwsapi_2.0.9.tgz";
+        url  = "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.0.9.tgz";
+        sha1 = "77ac0cdfdcad52b6a1151a84e73254edc33ed016";
+      };
+    }
+    {
+      name = "oauth_sign___oauth_sign_0.9.0.tgz";
+      path = fetchurl {
+        name = "oauth_sign___oauth_sign_0.9.0.tgz";
+        url  = "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz";
+        sha1 = "47a7b016baa68b5fa0ecf3dee08a85c679ac6455";
+      };
+    }
+    {
+      name = "object_assign___object_assign_4.1.1.tgz";
+      path = fetchurl {
+        name = "object_assign___object_assign_4.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz";
+        sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863";
+      };
+    }
+    {
+      name = "object_component___object_component_0.0.3.tgz";
+      path = fetchurl {
+        name = "object_component___object_component_0.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/object-component/-/object-component-0.0.3.tgz";
+        sha1 = "f0c69aa50efc95b866c186f400a33769cb2f1291";
+      };
+    }
+    {
+      name = "object_copy___object_copy_0.1.0.tgz";
+      path = fetchurl {
+        name = "object_copy___object_copy_0.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz";
+        sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c";
+      };
+    }
+    {
+      name = "object_keys___object_keys_1.1.1.tgz";
+      path = fetchurl {
+        name = "object_keys___object_keys_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz";
+        sha1 = "1c47f272df277f3b1daf061677d9c82e2322c60e";
+      };
+    }
+    {
+      name = "object_visit___object_visit_1.0.1.tgz";
+      path = fetchurl {
+        name = "object_visit___object_visit_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz";
+        sha1 = "f79c4493af0c5377b59fe39d395e41042dd045bb";
+      };
+    }
+    {
+      name = "object.assign___object.assign_4.1.0.tgz";
+      path = fetchurl {
+        name = "object.assign___object.assign_4.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz";
+        sha1 = "968bf1100d7956bb3ca086f006f846b3bc4008da";
+      };
+    }
+    {
+      name = "object.entries___object.entries_1.0.4.tgz";
+      path = fetchurl {
+        name = "object.entries___object.entries_1.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/object.entries/-/object.entries-1.0.4.tgz";
+        sha1 = "1bf9a4dd2288f5b33f3a993d257661f05d161a5f";
+      };
+    }
+    {
+      name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.0.3.tgz";
+      path = fetchurl {
+        name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz";
+        sha1 = "8758c846f5b407adab0f236e0986f14b051caa16";
+      };
+    }
+    {
+      name = "object.pick___object.pick_1.3.0.tgz";
+      path = fetchurl {
+        name = "object.pick___object.pick_1.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz";
+        sha1 = "87a10ac4c1694bd2e1cbf53591a66141fb5dd747";
+      };
+    }
+    {
+      name = "obuf___obuf_1.1.2.tgz";
+      path = fetchurl {
+        name = "obuf___obuf_1.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz";
+        sha1 = "09bea3343d41859ebd446292d11c9d4db619084e";
+      };
+    }
+    {
+      name = "on_finished___on_finished_2.3.0.tgz";
+      path = fetchurl {
+        name = "on_finished___on_finished_2.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz";
+        sha1 = "20f1336481b083cd75337992a16971aa2d906947";
+      };
+    }
+    {
+      name = "on_headers___on_headers_1.0.1.tgz";
+      path = fetchurl {
+        name = "on_headers___on_headers_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.1.tgz";
+        sha1 = "928f5d0f470d49342651ea6794b0857c100693f7";
+      };
+    }
+    {
+      name = "once___once_1.4.0.tgz";
+      path = fetchurl {
+        name = "once___once_1.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz";
+        sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1";
+      };
+    }
+    {
+      name = "onetime___onetime_2.0.1.tgz";
+      path = fetchurl {
+        name = "onetime___onetime_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz";
+        sha1 = "067428230fd67443b2794b22bba528b6867962d4";
+      };
+    }
+    {
+      name = "opener___opener_1.5.1.tgz";
+      path = fetchurl {
+        name = "opener___opener_1.5.1.tgz";
+        url  = "https://registry.yarnpkg.com/opener/-/opener-1.5.1.tgz";
+        sha1 = "6d2f0e77f1a0af0032aca716c2c1fbb8e7e8abed";
+      };
+    }
+    {
+      name = "opn___opn_5.2.0.tgz";
+      path = fetchurl {
+        name = "opn___opn_5.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/opn/-/opn-5.2.0.tgz";
+        sha1 = "71fdf934d6827d676cecbea1531f95d354641225";
+      };
+    }
+    {
+      name = "optimism___optimism_0.6.9.tgz";
+      path = fetchurl {
+        name = "optimism___optimism_0.6.9.tgz";
+        url  = "https://registry.yarnpkg.com/optimism/-/optimism-0.6.9.tgz";
+        sha1 = "19258ff8b3be0cea29ac35f06bff818e026e30bb";
+      };
+    }
+    {
+      name = "optimist___optimist_0.6.1.tgz";
+      path = fetchurl {
+        name = "optimist___optimist_0.6.1.tgz";
+        url  = "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz";
+        sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686";
+      };
+    }
+    {
+      name = "optionator___optionator_0.8.2.tgz";
+      path = fetchurl {
+        name = "optionator___optionator_0.8.2.tgz";
+        url  = "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz";
+        sha1 = "364c5e409d3f4d6301d6c0b4c05bba50180aeb64";
+      };
+    }
+    {
+      name = "ordered_read_streams___ordered_read_streams_1.0.1.tgz";
+      path = fetchurl {
+        name = "ordered_read_streams___ordered_read_streams_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz";
+        sha1 = "77c0cb37c41525d64166d990ffad7ec6a0e1363e";
+      };
+    }
+    {
+      name = "orderedmap___orderedmap_1.0.0.tgz";
+      path = fetchurl {
+        name = "orderedmap___orderedmap_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/orderedmap/-/orderedmap-1.0.0.tgz";
+        sha1 = "d90fc2ba1ed085190907d601dec6e6a53f8d41ba";
+      };
+    }
+    {
+      name = "original___original_1.0.2.tgz";
+      path = fetchurl {
+        name = "original___original_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/original/-/original-1.0.2.tgz";
+        sha1 = "e442a61cffe1c5fd20a65f3261c26663b303f25f";
+      };
+    }
+    {
+      name = "os_browserify___os_browserify_0.3.0.tgz";
+      path = fetchurl {
+        name = "os_browserify___os_browserify_0.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz";
+        sha1 = "854373c7f5c2315914fc9bfc6bd8238fdda1ec27";
+      };
+    }
+    {
+      name = "os_homedir___os_homedir_1.0.2.tgz";
+      path = fetchurl {
+        name = "os_homedir___os_homedir_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz";
+        sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3";
+      };
+    }
+    {
+      name = "os_locale___os_locale_1.4.0.tgz";
+      path = fetchurl {
+        name = "os_locale___os_locale_1.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz";
+        sha1 = "20f9f17ae29ed345e8bde583b13d2009803c14d9";
+      };
+    }
+    {
+      name = "os_locale___os_locale_3.1.0.tgz";
+      path = fetchurl {
+        name = "os_locale___os_locale_3.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz";
+        sha1 = "a802a6ee17f24c10483ab9935719cef4ed16bf1a";
+      };
+    }
+    {
+      name = "os_tmpdir___os_tmpdir_1.0.2.tgz";
+      path = fetchurl {
+        name = "os_tmpdir___os_tmpdir_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz";
+        sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274";
+      };
+    }
+    {
+      name = "osenv___osenv_0.1.5.tgz";
+      path = fetchurl {
+        name = "osenv___osenv_0.1.5.tgz";
+        url  = "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz";
+        sha1 = "85cdfafaeb28e8677f416e287592b5f3f49ea410";
+      };
+    }
+    {
+      name = "p_cancelable___p_cancelable_0.4.1.tgz";
+      path = fetchurl {
+        name = "p_cancelable___p_cancelable_0.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.4.1.tgz";
+        sha1 = "35f363d67d52081c8d9585e37bcceb7e0bbcb2a0";
+      };
+    }
+    {
+      name = "p_defer___p_defer_1.0.0.tgz";
+      path = fetchurl {
+        name = "p_defer___p_defer_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz";
+        sha1 = "9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c";
+      };
+    }
+    {
+      name = "p_each_series___p_each_series_1.0.0.tgz";
+      path = fetchurl {
+        name = "p_each_series___p_each_series_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/p-each-series/-/p-each-series-1.0.0.tgz";
+        sha1 = "930f3d12dd1f50e7434457a22cd6f04ac6ad7f71";
+      };
+    }
+    {
+      name = "p_finally___p_finally_1.0.0.tgz";
+      path = fetchurl {
+        name = "p_finally___p_finally_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz";
+        sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae";
+      };
+    }
+    {
+      name = "p_is_promise___p_is_promise_1.1.0.tgz";
+      path = fetchurl {
+        name = "p_is_promise___p_is_promise_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-1.1.0.tgz";
+        sha1 = "9c9456989e9f6588017b0434d56097675c3da05e";
+      };
+    }
+    {
+      name = "p_is_promise___p_is_promise_2.1.0.tgz";
+      path = fetchurl {
+        name = "p_is_promise___p_is_promise_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz";
+        sha1 = "918cebaea248a62cf7ffab8e3bca8c5f882fc42e";
+      };
+    }
+    {
+      name = "p_limit___p_limit_1.2.0.tgz";
+      path = fetchurl {
+        name = "p_limit___p_limit_1.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/p-limit/-/p-limit-1.2.0.tgz";
+        sha1 = "0e92b6bedcb59f022c13d0f1949dc82d15909f1c";
+      };
+    }
+    {
+      name = "p_limit___p_limit_2.2.0.tgz";
+      path = fetchurl {
+        name = "p_limit___p_limit_2.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.0.tgz";
+        sha1 = "417c9941e6027a9abcba5092dd2904e255b5fbc2";
+      };
+    }
+    {
+      name = "p_locate___p_locate_2.0.0.tgz";
+      path = fetchurl {
+        name = "p_locate___p_locate_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz";
+        sha1 = "20a0103b222a70c8fd39cc2e580680f3dde5ec43";
+      };
+    }
+    {
+      name = "p_locate___p_locate_3.0.0.tgz";
+      path = fetchurl {
+        name = "p_locate___p_locate_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz";
+        sha1 = "322d69a05c0264b25997d9f40cd8a891ab0064a4";
+      };
+    }
+    {
+      name = "p_map___p_map_1.1.1.tgz";
+      path = fetchurl {
+        name = "p_map___p_map_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/p-map/-/p-map-1.1.1.tgz";
+        sha1 = "05f5e4ae97a068371bc2a5cc86bfbdbc19c4ae7a";
+      };
+    }
+    {
+      name = "p_reduce___p_reduce_1.0.0.tgz";
+      path = fetchurl {
+        name = "p_reduce___p_reduce_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/p-reduce/-/p-reduce-1.0.0.tgz";
+        sha1 = "18c2b0dd936a4690a529f8231f58a0fdb6a47dfa";
+      };
+    }
+    {
+      name = "p_timeout___p_timeout_2.0.1.tgz";
+      path = fetchurl {
+        name = "p_timeout___p_timeout_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/p-timeout/-/p-timeout-2.0.1.tgz";
+        sha1 = "d8dd1979595d2dc0139e1fe46b8b646cb3cdf038";
+      };
+    }
+    {
+      name = "p_try___p_try_1.0.0.tgz";
+      path = fetchurl {
+        name = "p_try___p_try_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz";
+        sha1 = "cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3";
+      };
+    }
+    {
+      name = "p_try___p_try_2.2.0.tgz";
+      path = fetchurl {
+        name = "p_try___p_try_2.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz";
+        sha1 = "cb2868540e313d61de58fafbe35ce9004d5540e6";
+      };
+    }
+    {
+      name = "package_json___package_json_4.0.1.tgz";
+      path = fetchurl {
+        name = "package_json___package_json_4.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/package-json/-/package-json-4.0.1.tgz";
+        sha1 = "8869a0401253661c4c4ca3da6c2121ed555f5eed";
+      };
+    }
+    {
+      name = "pako___pako_1.0.6.tgz";
+      path = fetchurl {
+        name = "pako___pako_1.0.6.tgz";
+        url  = "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz";
+        sha1 = "0101211baa70c4bca4a0f63f2206e97b7dfaf258";
+      };
+    }
+    {
+      name = "parallel_transform___parallel_transform_1.1.0.tgz";
+      path = fetchurl {
+        name = "parallel_transform___parallel_transform_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.1.0.tgz";
+        sha1 = "d410f065b05da23081fcd10f28854c29bda33b06";
+      };
+    }
+    {
+      name = "param_case___param_case_2.1.1.tgz";
+      path = fetchurl {
+        name = "param_case___param_case_2.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz";
+        sha1 = "df94fd8cf6531ecf75e6bef9a0858fbc72be2247";
+      };
+    }
+    {
+      name = "parse_asn1___parse_asn1_5.1.0.tgz";
+      path = fetchurl {
+        name = "parse_asn1___parse_asn1_5.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.0.tgz";
+        sha1 = "37c4f9b7ed3ab65c74817b5f2480937fbf97c712";
+      };
+    }
+    {
+      name = "parse_entities___parse_entities_1.2.0.tgz";
+      path = fetchurl {
+        name = "parse_entities___parse_entities_1.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/parse-entities/-/parse-entities-1.2.0.tgz";
+        sha1 = "9deac087661b2e36814153cb78d7e54a4c5fd6f4";
+      };
+    }
+    {
+      name = "parse_filepath___parse_filepath_1.0.2.tgz";
+      path = fetchurl {
+        name = "parse_filepath___parse_filepath_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.2.tgz";
+        sha1 = "a632127f53aaf3d15876f5872f3ffac763d6c891";
+      };
+    }
+    {
+      name = "parse_git_config___parse_git_config_0.2.0.tgz";
+      path = fetchurl {
+        name = "parse_git_config___parse_git_config_0.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/parse-git-config/-/parse-git-config-0.2.0.tgz";
+        sha1 = "272833fdd15fea146fb75d336d236b963b6ff706";
+      };
+    }
+    {
+      name = "parse_json___parse_json_2.2.0.tgz";
+      path = fetchurl {
+        name = "parse_json___parse_json_2.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz";
+        sha1 = "f480f40434ef80741f8469099f8dea18f55a4dc9";
+      };
+    }
+    {
+      name = "parse_json___parse_json_4.0.0.tgz";
+      path = fetchurl {
+        name = "parse_json___parse_json_4.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz";
+        sha1 = "be35f5425be1f7f6c747184f98a788cb99477ee0";
+      };
+    }
+    {
+      name = "parse_passwd___parse_passwd_1.0.0.tgz";
+      path = fetchurl {
+        name = "parse_passwd___parse_passwd_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz";
+        sha1 = "6d5b934a456993b23d37f40a382d6f1666a8e5c6";
+      };
+    }
+    {
+      name = "parse_path___parse_path_3.0.4.tgz";
+      path = fetchurl {
+        name = "parse_path___parse_path_3.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/parse-path/-/parse-path-3.0.4.tgz";
+        sha1 = "a48b7b529da41f34d9d1428602a39b29fc7180e4";
+      };
+    }
+    {
+      name = "parse_url___parse_url_3.0.2.tgz";
+      path = fetchurl {
+        name = "parse_url___parse_url_3.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/parse-url/-/parse-url-3.0.2.tgz";
+        sha1 = "602787a7063a795d72b8673197505e72f60610be";
+      };
+    }
+    {
+      name = "parse5___parse5_4.0.0.tgz";
+      path = fetchurl {
+        name = "parse5___parse5_4.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz";
+        sha1 = "6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608";
+      };
+    }
+    {
+      name = "parse5___parse5_5.0.0.tgz";
+      path = fetchurl {
+        name = "parse5___parse5_5.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/parse5/-/parse5-5.0.0.tgz";
+        sha1 = "4d02710d44f3c3846197a11e205d4ef17842b81a";
+      };
+    }
+    {
+      name = "parseqs___parseqs_0.0.5.tgz";
+      path = fetchurl {
+        name = "parseqs___parseqs_0.0.5.tgz";
+        url  = "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.5.tgz";
+        sha1 = "d5208a3738e46766e291ba2ea173684921a8b89d";
+      };
+    }
+    {
+      name = "parseuri___parseuri_0.0.5.tgz";
+      path = fetchurl {
+        name = "parseuri___parseuri_0.0.5.tgz";
+        url  = "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.5.tgz";
+        sha1 = "80204a50d4dbb779bfdc6ebe2778d90e4bce320a";
+      };
+    }
+    {
+      name = "parseurl___parseurl_1.3.2.tgz";
+      path = fetchurl {
+        name = "parseurl___parseurl_1.3.2.tgz";
+        url  = "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz";
+        sha1 = "fc289d4ed8993119460c156253262cdc8de65bf3";
+      };
+    }
+    {
+      name = "pascalcase___pascalcase_0.1.1.tgz";
+      path = fetchurl {
+        name = "pascalcase___pascalcase_0.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz";
+        sha1 = "b363e55e8006ca6fe21784d2db22bd15d7917f14";
+      };
+    }
+    {
+      name = "path_browserify___path_browserify_0.0.0.tgz";
+      path = fetchurl {
+        name = "path_browserify___path_browserify_0.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz";
+        sha1 = "a0b870729aae214005b7d5032ec2cbbb0fb4451a";
+      };
+    }
+    {
+      name = "path_dirname___path_dirname_1.0.2.tgz";
+      path = fetchurl {
+        name = "path_dirname___path_dirname_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz";
+        sha1 = "cc33d24d525e099a5388c0336c6e32b9160609e0";
+      };
+    }
+    {
+      name = "path_exists___path_exists_2.1.0.tgz";
+      path = fetchurl {
+        name = "path_exists___path_exists_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz";
+        sha1 = "0feb6c64f0fc518d9a754dd5efb62c7022761f4b";
+      };
+    }
+    {
+      name = "path_exists___path_exists_3.0.0.tgz";
+      path = fetchurl {
+        name = "path_exists___path_exists_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz";
+        sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515";
+      };
+    }
+    {
+      name = "path_is_absolute___path_is_absolute_1.0.1.tgz";
+      path = fetchurl {
+        name = "path_is_absolute___path_is_absolute_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz";
+        sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f";
+      };
+    }
+    {
+      name = "path_is_inside___path_is_inside_1.0.2.tgz";
+      path = fetchurl {
+        name = "path_is_inside___path_is_inside_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz";
+        sha1 = "365417dede44430d1c11af61027facf074bdfc53";
+      };
+    }
+    {
+      name = "path_key___path_key_2.0.1.tgz";
+      path = fetchurl {
+        name = "path_key___path_key_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz";
+        sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40";
+      };
+    }
+    {
+      name = "path_parse___path_parse_1.0.6.tgz";
+      path = fetchurl {
+        name = "path_parse___path_parse_1.0.6.tgz";
+        url  = "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz";
+        sha1 = "d62dbb5679405d72c4737ec58600e9ddcf06d24c";
+      };
+    }
+    {
+      name = "path_root_regex___path_root_regex_0.1.2.tgz";
+      path = fetchurl {
+        name = "path_root_regex___path_root_regex_0.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz";
+        sha1 = "bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d";
+      };
+    }
+    {
+      name = "path_root___path_root_0.1.1.tgz";
+      path = fetchurl {
+        name = "path_root___path_root_0.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/path-root/-/path-root-0.1.1.tgz";
+        sha1 = "9a4a6814cac1c0cd73360a95f32083c8ea4745b7";
+      };
+    }
+    {
+      name = "path_to_regexp___path_to_regexp_0.1.7.tgz";
+      path = fetchurl {
+        name = "path_to_regexp___path_to_regexp_0.1.7.tgz";
+        url  = "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz";
+        sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c";
+      };
+    }
+    {
+      name = "path_type___path_type_1.1.0.tgz";
+      path = fetchurl {
+        name = "path_type___path_type_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz";
+        sha1 = "59c44f7ee491da704da415da5a4070ba4f8fe441";
+      };
+    }
+    {
+      name = "path_type___path_type_2.0.0.tgz";
+      path = fetchurl {
+        name = "path_type___path_type_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz";
+        sha1 = "f012ccb8415b7096fc2daa1054c3d72389594c73";
+      };
+    }
+    {
+      name = "path_type___path_type_3.0.0.tgz";
+      path = fetchurl {
+        name = "path_type___path_type_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz";
+        sha1 = "cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f";
+      };
+    }
+    {
+      name = "pbkdf2___pbkdf2_3.0.14.tgz";
+      path = fetchurl {
+        name = "pbkdf2___pbkdf2_3.0.14.tgz";
+        url  = "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.14.tgz";
+        sha1 = "a35e13c64799b06ce15320f459c230e68e73bade";
+      };
+    }
+    {
+      name = "pdfjs_dist___pdfjs_dist_2.1.266.tgz";
+      path = fetchurl {
+        name = "pdfjs_dist___pdfjs_dist_2.1.266.tgz";
+        url  = "https://registry.yarnpkg.com/pdfjs-dist/-/pdfjs-dist-2.1.266.tgz";
+        sha1 = "cded02268b389559e807f410d2a729db62160026";
+      };
+    }
+    {
+      name = "performance_now___performance_now_2.1.0.tgz";
+      path = fetchurl {
+        name = "performance_now___performance_now_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz";
+        sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b";
+      };
+    }
+    {
+      name = "picomatch___picomatch_2.0.7.tgz";
+      path = fetchurl {
+        name = "picomatch___picomatch_2.0.7.tgz";
+        url  = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.0.7.tgz";
+        sha1 = "514169d8c7cd0bdbeecc8a2609e34a7163de69f6";
+      };
+    }
+    {
+      name = "pify___pify_2.3.0.tgz";
+      path = fetchurl {
+        name = "pify___pify_2.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz";
+        sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c";
+      };
+    }
+    {
+      name = "pify___pify_3.0.0.tgz";
+      path = fetchurl {
+        name = "pify___pify_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz";
+        sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176";
+      };
+    }
+    {
+      name = "pify___pify_4.0.1.tgz";
+      path = fetchurl {
+        name = "pify___pify_4.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz";
+        sha1 = "4b2cd25c50d598735c50292224fd8c6df41e3231";
+      };
+    }
+    {
+      name = "pikaday___pikaday_1.8.0.tgz";
+      path = fetchurl {
+        name = "pikaday___pikaday_1.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/pikaday/-/pikaday-1.8.0.tgz";
+        sha1 = "ce930e257042e852e6aadee1115e01554b2d71c5";
+      };
+    }
+    {
+      name = "pinkie_promise___pinkie_promise_2.0.1.tgz";
+      path = fetchurl {
+        name = "pinkie_promise___pinkie_promise_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz";
+        sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa";
+      };
+    }
+    {
+      name = "pinkie___pinkie_2.0.4.tgz";
+      path = fetchurl {
+        name = "pinkie___pinkie_2.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz";
+        sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870";
+      };
+    }
+    {
+      name = "pirates___pirates_4.0.1.tgz";
+      path = fetchurl {
+        name = "pirates___pirates_4.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/pirates/-/pirates-4.0.1.tgz";
+        sha1 = "643a92caf894566f91b2b986d2c66950a8e2fb87";
+      };
+    }
+    {
+      name = "pixelmatch___pixelmatch_4.0.2.tgz";
+      path = fetchurl {
+        name = "pixelmatch___pixelmatch_4.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/pixelmatch/-/pixelmatch-4.0.2.tgz";
+        sha1 = "8f47dcec5011b477b67db03c243bc1f3085e8854";
+      };
+    }
+    {
+      name = "pkg_dir___pkg_dir_2.0.0.tgz";
+      path = fetchurl {
+        name = "pkg_dir___pkg_dir_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz";
+        sha1 = "f6d5d1109e19d63edf428e0bd57e12777615334b";
+      };
+    }
+    {
+      name = "pkg_dir___pkg_dir_3.0.0.tgz";
+      path = fetchurl {
+        name = "pkg_dir___pkg_dir_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz";
+        sha1 = "2749020f239ed990881b1f71210d51eb6523bea3";
+      };
+    }
+    {
+      name = "pluralize___pluralize_7.0.0.tgz";
+      path = fetchurl {
+        name = "pluralize___pluralize_7.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz";
+        sha1 = "298b89df8b93b0221dbf421ad2b1b1ea23fc6777";
+      };
+    }
+    {
+      name = "pn___pn_1.1.0.tgz";
+      path = fetchurl {
+        name = "pn___pn_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz";
+        sha1 = "e2f4cef0e219f463c179ab37463e4e1ecdccbafb";
+      };
+    }
+    {
+      name = "pngjs___pngjs_3.3.3.tgz";
+      path = fetchurl {
+        name = "pngjs___pngjs_3.3.3.tgz";
+        url  = "https://registry.yarnpkg.com/pngjs/-/pngjs-3.3.3.tgz";
+        sha1 = "85173703bde3edac8998757b96e5821d0966a21b";
+      };
+    }
+    {
+      name = "pofile___pofile_1.0.11.tgz";
+      path = fetchurl {
+        name = "pofile___pofile_1.0.11.tgz";
+        url  = "https://registry.yarnpkg.com/pofile/-/pofile-1.0.11.tgz";
+        sha1 = "35aff58c17491d127a07336d5522ebc9df57c954";
+      };
+    }
+    {
+      name = "popper.js___popper.js_1.15.0.tgz";
+      path = fetchurl {
+        name = "popper.js___popper.js_1.15.0.tgz";
+        url  = "https://registry.yarnpkg.com/popper.js/-/popper.js-1.15.0.tgz";
+        sha1 = "5560b99bbad7647e9faa475c6b8056621f5a4ff2";
+      };
+    }
+    {
+      name = "portal_vue___portal_vue_2.1.5.tgz";
+      path = fetchurl {
+        name = "portal_vue___portal_vue_2.1.5.tgz";
+        url  = "https://registry.yarnpkg.com/portal-vue/-/portal-vue-2.1.5.tgz";
+        sha1 = "ecd0997cb32958205151cb72f40fd4f38d175e5c";
+      };
+    }
+    {
+      name = "portfinder___portfinder_1.0.13.tgz";
+      path = fetchurl {
+        name = "portfinder___portfinder_1.0.13.tgz";
+        url  = "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.13.tgz";
+        sha1 = "bb32ecd87c27104ae6ee44b5a3ccbf0ebb1aede9";
+      };
+    }
+    {
+      name = "posix_character_classes___posix_character_classes_0.1.1.tgz";
+      path = fetchurl {
+        name = "posix_character_classes___posix_character_classes_0.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz";
+        sha1 = "01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab";
+      };
+    }
+    {
+      name = "postcss_html___postcss_html_0.36.0.tgz";
+      path = fetchurl {
+        name = "postcss_html___postcss_html_0.36.0.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-html/-/postcss-html-0.36.0.tgz";
+        sha1 = "b40913f94eaacc2453fd30a1327ad6ee1f88b204";
+      };
+    }
+    {
+      name = "postcss_jsx___postcss_jsx_0.36.2.tgz";
+      path = fetchurl {
+        name = "postcss_jsx___postcss_jsx_0.36.2.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-jsx/-/postcss-jsx-0.36.2.tgz";
+        sha1 = "34bcd6752426a60b8df73f069e7595383060a794";
+      };
+    }
+    {
+      name = "postcss_less___postcss_less_3.1.4.tgz";
+      path = fetchurl {
+        name = "postcss_less___postcss_less_3.1.4.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-less/-/postcss-less-3.1.4.tgz";
+        sha1 = "369f58642b5928ef898ffbc1a6e93c958304c5ad";
+      };
+    }
+    {
+      name = "postcss_markdown___postcss_markdown_0.36.0.tgz";
+      path = fetchurl {
+        name = "postcss_markdown___postcss_markdown_0.36.0.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-markdown/-/postcss-markdown-0.36.0.tgz";
+        sha1 = "7f22849ae0e3db18820b7b0d5e7833f13a447560";
+      };
+    }
+    {
+      name = "postcss_media_query_parser___postcss_media_query_parser_0.2.3.tgz";
+      path = fetchurl {
+        name = "postcss_media_query_parser___postcss_media_query_parser_0.2.3.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz";
+        sha1 = "27b39c6f4d94f81b1a73b8f76351c609e5cef244";
+      };
+    }
+    {
+      name = "postcss_modules_extract_imports___postcss_modules_extract_imports_1.2.1.tgz";
+      path = fetchurl {
+        name = "postcss_modules_extract_imports___postcss_modules_extract_imports_1.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.1.tgz";
+        sha1 = "dc87e34148ec7eab5f791f7cd5849833375b741a";
+      };
+    }
+    {
+      name = "postcss_modules_local_by_default___postcss_modules_local_by_default_1.2.0.tgz";
+      path = fetchurl {
+        name = "postcss_modules_local_by_default___postcss_modules_local_by_default_1.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz";
+        sha1 = "f7d80c398c5a393fa7964466bd19500a7d61c069";
+      };
+    }
+    {
+      name = "postcss_modules_scope___postcss_modules_scope_1.1.0.tgz";
+      path = fetchurl {
+        name = "postcss_modules_scope___postcss_modules_scope_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz";
+        sha1 = "d6ea64994c79f97b62a72b426fbe6056a194bb90";
+      };
+    }
+    {
+      name = "postcss_modules_values___postcss_modules_values_1.3.0.tgz";
+      path = fetchurl {
+        name = "postcss_modules_values___postcss_modules_values_1.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz";
+        sha1 = "ecffa9d7e192518389f42ad0e83f72aec456ea20";
+      };
+    }
+    {
+      name = "postcss_reporter___postcss_reporter_6.0.1.tgz";
+      path = fetchurl {
+        name = "postcss_reporter___postcss_reporter_6.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-reporter/-/postcss-reporter-6.0.1.tgz";
+        sha1 = "7c055120060a97c8837b4e48215661aafb74245f";
+      };
+    }
+    {
+      name = "postcss_resolve_nested_selector___postcss_resolve_nested_selector_0.1.1.tgz";
+      path = fetchurl {
+        name = "postcss_resolve_nested_selector___postcss_resolve_nested_selector_0.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz";
+        sha1 = "29ccbc7c37dedfac304e9fff0bf1596b3f6a0e4e";
+      };
+    }
+    {
+      name = "postcss_safe_parser___postcss_safe_parser_4.0.1.tgz";
+      path = fetchurl {
+        name = "postcss_safe_parser___postcss_safe_parser_4.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-safe-parser/-/postcss-safe-parser-4.0.1.tgz";
+        sha1 = "8756d9e4c36fdce2c72b091bbc8ca176ab1fcdea";
+      };
+    }
+    {
+      name = "postcss_sass___postcss_sass_0.3.5.tgz";
+      path = fetchurl {
+        name = "postcss_sass___postcss_sass_0.3.5.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-sass/-/postcss-sass-0.3.5.tgz";
+        sha1 = "6d3e39f101a53d2efa091f953493116d32beb68c";
+      };
+    }
+    {
+      name = "postcss_scss___postcss_scss_2.0.0.tgz";
+      path = fetchurl {
+        name = "postcss_scss___postcss_scss_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-2.0.0.tgz";
+        sha1 = "248b0a28af77ea7b32b1011aba0f738bda27dea1";
+      };
+    }
+    {
+      name = "postcss_selector_parser___postcss_selector_parser_3.1.1.tgz";
+      path = fetchurl {
+        name = "postcss_selector_parser___postcss_selector_parser_3.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz";
+        sha1 = "4f875f4afb0c96573d5cf4d74011aee250a7e865";
+      };
+    }
+    {
+      name = "postcss_selector_parser___postcss_selector_parser_5.0.0.tgz";
+      path = fetchurl {
+        name = "postcss_selector_parser___postcss_selector_parser_5.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz";
+        sha1 = "249044356697b33b64f1a8f7c80922dddee7195c";
+      };
+    }
+    {
+      name = "postcss_selector_parser___postcss_selector_parser_6.0.2.tgz";
+      path = fetchurl {
+        name = "postcss_selector_parser___postcss_selector_parser_6.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz";
+        sha1 = "934cf799d016c83411859e09dcecade01286ec5c";
+      };
+    }
+    {
+      name = "postcss_syntax___postcss_syntax_0.36.2.tgz";
+      path = fetchurl {
+        name = "postcss_syntax___postcss_syntax_0.36.2.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-syntax/-/postcss-syntax-0.36.2.tgz";
+        sha1 = "f08578c7d95834574e5593a82dfbfa8afae3b51c";
+      };
+    }
+    {
+      name = "postcss_value_parser___postcss_value_parser_3.3.1.tgz";
+      path = fetchurl {
+        name = "postcss_value_parser___postcss_value_parser_3.3.1.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz";
+        sha1 = "9ff822547e2893213cf1c30efa51ac5fd1ba8281";
+      };
+    }
+    {
+      name = "postcss_value_parser___postcss_value_parser_4.0.0.tgz";
+      path = fetchurl {
+        name = "postcss_value_parser___postcss_value_parser_4.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.0.tgz";
+        sha1 = "99a983d365f7b2ad8d0f9b8c3094926eab4b936d";
+      };
+    }
+    {
+      name = "postcss___postcss_6.0.23.tgz";
+      path = fetchurl {
+        name = "postcss___postcss_6.0.23.tgz";
+        url  = "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz";
+        sha1 = "61c82cc328ac60e677645f979054eb98bc0e3324";
+      };
+    }
+    {
+      name = "postcss___postcss_7.0.17.tgz";
+      path = fetchurl {
+        name = "postcss___postcss_7.0.17.tgz";
+        url  = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.17.tgz";
+        sha1 = "4da1bdff5322d4a0acaab4d87f3e782436bad31f";
+      };
+    }
+    {
+      name = "prelude_ls___prelude_ls_1.1.2.tgz";
+      path = fetchurl {
+        name = "prelude_ls___prelude_ls_1.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz";
+        sha1 = "21932a549f5e52ffd9a827f570e04be62a97da54";
+      };
+    }
+    {
+      name = "prepend_http___prepend_http_1.0.4.tgz";
+      path = fetchurl {
+        name = "prepend_http___prepend_http_1.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz";
+        sha1 = "d4f4562b0ce3696e41ac52d0e002e57a635dc6dc";
+      };
+    }
+    {
+      name = "prepend_http___prepend_http_2.0.0.tgz";
+      path = fetchurl {
+        name = "prepend_http___prepend_http_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz";
+        sha1 = "e92434bfa5ea8c19f41cdfd401d741a3c819d897";
+      };
+    }
+    {
+      name = "prettier___prettier_1.16.3.tgz";
+      path = fetchurl {
+        name = "prettier___prettier_1.16.3.tgz";
+        url  = "https://registry.yarnpkg.com/prettier/-/prettier-1.16.3.tgz";
+        sha1 = "8c62168453badef702f34b45b6ee899574a6a65d";
+      };
+    }
+    {
+      name = "prettier___prettier_1.18.2.tgz";
+      path = fetchurl {
+        name = "prettier___prettier_1.18.2.tgz";
+        url  = "https://registry.yarnpkg.com/prettier/-/prettier-1.18.2.tgz";
+        sha1 = "6823e7c5900017b4bd3acf46fe9ac4b4d7bda9ea";
+      };
+    }
+    {
+      name = "pretty_format___pretty_format_24.8.0.tgz";
+      path = fetchurl {
+        name = "pretty_format___pretty_format_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.8.0.tgz";
+        sha1 = "8dae7044f58db7cb8be245383b565a963e3c27f2";
+      };
+    }
+    {
+      name = "prismjs___prismjs_1.6.0.tgz";
+      path = fetchurl {
+        name = "prismjs___prismjs_1.6.0.tgz";
+        url  = "https://registry.yarnpkg.com/prismjs/-/prismjs-1.6.0.tgz";
+        sha1 = "118d95fb7a66dba2272e343b345f5236659db365";
+      };
+    }
+    {
+      name = "private___private_0.1.8.tgz";
+      path = fetchurl {
+        name = "private___private_0.1.8.tgz";
+        url  = "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz";
+        sha1 = "2381edb3689f7a53d653190060fcf822d2f368ff";
+      };
+    }
+    {
+      name = "process_nextick_args___process_nextick_args_2.0.1.tgz";
+      path = fetchurl {
+        name = "process_nextick_args___process_nextick_args_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz";
+        sha1 = "7820d9b16120cc55ca9ae7792680ae7dba6d7fe2";
+      };
+    }
+    {
+      name = "process_nextick_args___process_nextick_args_1.0.7.tgz";
+      path = fetchurl {
+        name = "process_nextick_args___process_nextick_args_1.0.7.tgz";
+        url  = "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz";
+        sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3";
+      };
+    }
+    {
+      name = "process___process_0.11.10.tgz";
+      path = fetchurl {
+        name = "process___process_0.11.10.tgz";
+        url  = "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz";
+        sha1 = "7332300e840161bda3e69a1d1d91a7d4bc16f182";
+      };
+    }
+    {
+      name = "progress___progress_2.0.0.tgz";
+      path = fetchurl {
+        name = "progress___progress_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/progress/-/progress-2.0.0.tgz";
+        sha1 = "8a1be366bf8fc23db2bd23f10c6fe920b4389d1f";
+      };
+    }
+    {
+      name = "promise_inflight___promise_inflight_1.0.1.tgz";
+      path = fetchurl {
+        name = "promise_inflight___promise_inflight_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz";
+        sha1 = "98472870bf228132fcbdd868129bad12c3c029e3";
+      };
+    }
+    {
+      name = "prompts___prompts_2.1.0.tgz";
+      path = fetchurl {
+        name = "prompts___prompts_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/prompts/-/prompts-2.1.0.tgz";
+        sha1 = "bf90bc71f6065d255ea2bdc0fe6520485c1b45db";
+      };
+    }
+    {
+      name = "property_information___property_information_4.2.0.tgz";
+      path = fetchurl {
+        name = "property_information___property_information_4.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/property-information/-/property-information-4.2.0.tgz";
+        sha1 = "f0e66e07cbd6fed31d96844d958d153ad3eb486e";
+      };
+    }
+    {
+      name = "prosemirror_commands___prosemirror_commands_1.0.7.tgz";
+      path = fetchurl {
+        name = "prosemirror_commands___prosemirror_commands_1.0.7.tgz";
+        url  = "https://registry.yarnpkg.com/prosemirror-commands/-/prosemirror-commands-1.0.7.tgz";
+        sha1 = "e5a2ba821e29ea7065c88277fe2c3d7f6b0b9d37";
+      };
+    }
+    {
+      name = "prosemirror_dropcursor___prosemirror_dropcursor_1.1.1.tgz";
+      path = fetchurl {
+        name = "prosemirror_dropcursor___prosemirror_dropcursor_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/prosemirror-dropcursor/-/prosemirror-dropcursor-1.1.1.tgz";
+        sha1 = "c60ed1ed6c58804a06a75db06a0d993b087b7622";
+      };
+    }
+    {
+      name = "prosemirror_gapcursor___prosemirror_gapcursor_1.0.3.tgz";
+      path = fetchurl {
+        name = "prosemirror_gapcursor___prosemirror_gapcursor_1.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/prosemirror-gapcursor/-/prosemirror-gapcursor-1.0.3.tgz";
+        sha1 = "acc6537fc5a35e9b38966f91a199a382dfc715c4";
+      };
+    }
+    {
+      name = "prosemirror_history___prosemirror_history_1.0.3.tgz";
+      path = fetchurl {
+        name = "prosemirror_history___prosemirror_history_1.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/prosemirror-history/-/prosemirror-history-1.0.3.tgz";
+        sha1 = "5fb8591adfc272afaaf0b41bec64ee7d9522a118";
+      };
+    }
+    {
+      name = "prosemirror_inputrules___prosemirror_inputrules_1.0.1.tgz";
+      path = fetchurl {
+        name = "prosemirror_inputrules___prosemirror_inputrules_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/prosemirror-inputrules/-/prosemirror-inputrules-1.0.1.tgz";
+        sha1 = "f63305fd966379f218e82ca76a2a9b328b66dc7b";
+      };
+    }
+    {
+      name = "prosemirror_keymap___prosemirror_keymap_1.0.1.tgz";
+      path = fetchurl {
+        name = "prosemirror_keymap___prosemirror_keymap_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/prosemirror-keymap/-/prosemirror-keymap-1.0.1.tgz";
+        sha1 = "03ef32b828e3a859dfb570eb84928bf2e5330bc2";
+      };
+    }
+    {
+      name = "prosemirror_markdown___prosemirror_markdown_1.3.0.tgz";
+      path = fetchurl {
+        name = "prosemirror_markdown___prosemirror_markdown_1.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/prosemirror-markdown/-/prosemirror-markdown-1.3.0.tgz";
+        sha1 = "a100d14c27da7d8fb70818230d786898eeadb7fa";
+      };
+    }
+    {
+      name = "prosemirror_model___prosemirror_model_1.6.4.tgz";
+      path = fetchurl {
+        name = "prosemirror_model___prosemirror_model_1.6.4.tgz";
+        url  = "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.6.4.tgz";
+        sha1 = "2ac37a629448a7dbfd1635450e2fdd63c3450d7d";
+      };
+    }
+    {
+      name = "prosemirror_schema_list___prosemirror_schema_list_1.0.1.tgz";
+      path = fetchurl {
+        name = "prosemirror_schema_list___prosemirror_schema_list_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/prosemirror-schema-list/-/prosemirror-schema-list-1.0.1.tgz";
+        sha1 = "f216e0cf4809b6074aa27912449ac89897f1ae94";
+      };
+    }
+    {
+      name = "prosemirror_state___prosemirror_state_1.2.2.tgz";
+      path = fetchurl {
+        name = "prosemirror_state___prosemirror_state_1.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/prosemirror-state/-/prosemirror-state-1.2.2.tgz";
+        sha1 = "8df26d95fd6fd327c0f9984a760e84d863204154";
+      };
+    }
+    {
+      name = "prosemirror_tables___prosemirror_tables_0.7.10.tgz";
+      path = fetchurl {
+        name = "prosemirror_tables___prosemirror_tables_0.7.10.tgz";
+        url  = "https://registry.yarnpkg.com/prosemirror-tables/-/prosemirror-tables-0.7.10.tgz";
+        sha1 = "4b0f623422b4b8f84cdc9c559f8a87579846b3ba";
+      };
+    }
+    {
+      name = "prosemirror_transform___prosemirror_transform_1.1.3.tgz";
+      path = fetchurl {
+        name = "prosemirror_transform___prosemirror_transform_1.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/prosemirror-transform/-/prosemirror-transform-1.1.3.tgz";
+        sha1 = "28cfdf1f9ee514edc40466be7b7db39eed545fdf";
+      };
+    }
+    {
+      name = "prosemirror_utils___prosemirror_utils_0.7.5.tgz";
+      path = fetchurl {
+        name = "prosemirror_utils___prosemirror_utils_0.7.5.tgz";
+        url  = "https://registry.yarnpkg.com/prosemirror-utils/-/prosemirror-utils-0.7.5.tgz";
+        sha1 = "11b477647b672ec8f10679ab298a5823dad6457a";
+      };
+    }
+    {
+      name = "prosemirror_view___prosemirror_view_1.6.8.tgz";
+      path = fetchurl {
+        name = "prosemirror_view___prosemirror_view_1.6.8.tgz";
+        url  = "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.6.8.tgz";
+        sha1 = "33fc1a6e2731633e5d6dc1af1967378f15810b74";
+      };
+    }
+    {
+      name = "proto_list___proto_list_1.2.4.tgz";
+      path = fetchurl {
+        name = "proto_list___proto_list_1.2.4.tgz";
+        url  = "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz";
+        sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849";
+      };
+    }
+    {
+      name = "protocols___protocols_1.4.7.tgz";
+      path = fetchurl {
+        name = "protocols___protocols_1.4.7.tgz";
+        url  = "https://registry.yarnpkg.com/protocols/-/protocols-1.4.7.tgz";
+        sha1 = "95f788a4f0e979b291ffefcf5636ad113d037d32";
+      };
+    }
+    {
+      name = "proxy_addr___proxy_addr_2.0.4.tgz";
+      path = fetchurl {
+        name = "proxy_addr___proxy_addr_2.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.4.tgz";
+        sha1 = "ecfc733bf22ff8c6f407fa275327b9ab67e48b93";
+      };
+    }
+    {
+      name = "prr___prr_1.0.1.tgz";
+      path = fetchurl {
+        name = "prr___prr_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz";
+        sha1 = "d3fc114ba06995a45ec6893f484ceb1d78f5f476";
+      };
+    }
+    {
+      name = "pseudomap___pseudomap_1.0.2.tgz";
+      path = fetchurl {
+        name = "pseudomap___pseudomap_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz";
+        sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3";
+      };
+    }
+    {
+      name = "psl___psl_1.1.29.tgz";
+      path = fetchurl {
+        name = "psl___psl_1.1.29.tgz";
+        url  = "https://registry.yarnpkg.com/psl/-/psl-1.1.29.tgz";
+        sha1 = "60f580d360170bb722a797cc704411e6da850c67";
+      };
+    }
+    {
+      name = "pstree.remy___pstree.remy_1.1.6.tgz";
+      path = fetchurl {
+        name = "pstree.remy___pstree.remy_1.1.6.tgz";
+        url  = "https://registry.yarnpkg.com/pstree.remy/-/pstree.remy-1.1.6.tgz";
+        sha1 = "73a55aad9e2d95814927131fbf4dc1b62d259f47";
+      };
+    }
+    {
+      name = "public_encrypt___public_encrypt_4.0.0.tgz";
+      path = fetchurl {
+        name = "public_encrypt___public_encrypt_4.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.0.tgz";
+        sha1 = "39f699f3a46560dd5ebacbca693caf7c65c18cc6";
+      };
+    }
+    {
+      name = "pump___pump_2.0.1.tgz";
+      path = fetchurl {
+        name = "pump___pump_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz";
+        sha1 = "12399add6e4cf7526d973cbc8b5ce2e2908b3909";
+      };
+    }
+    {
+      name = "pump___pump_3.0.0.tgz";
+      path = fetchurl {
+        name = "pump___pump_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz";
+        sha1 = "b4a2116815bde2f4e1ea602354e8c75565107a64";
+      };
+    }
+    {
+      name = "pumpify___pumpify_1.5.1.tgz";
+      path = fetchurl {
+        name = "pumpify___pumpify_1.5.1.tgz";
+        url  = "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz";
+        sha1 = "36513be246ab27570b1a374a5ce278bfd74370ce";
+      };
+    }
+    {
+      name = "punycode___punycode_1.3.2.tgz";
+      path = fetchurl {
+        name = "punycode___punycode_1.3.2.tgz";
+        url  = "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz";
+        sha1 = "9653a036fb7c1ee42342f2325cceefea3926c48d";
+      };
+    }
+    {
+      name = "punycode___punycode_1.4.1.tgz";
+      path = fetchurl {
+        name = "punycode___punycode_1.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz";
+        sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e";
+      };
+    }
+    {
+      name = "punycode___punycode_2.1.1.tgz";
+      path = fetchurl {
+        name = "punycode___punycode_2.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz";
+        sha1 = "b58b010ac40c22c5657616c8d2c2c02c7bf479ec";
+      };
+    }
+    {
+      name = "qjobs___qjobs_1.2.0.tgz";
+      path = fetchurl {
+        name = "qjobs___qjobs_1.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/qjobs/-/qjobs-1.2.0.tgz";
+        sha1 = "c45e9c61800bd087ef88d7e256423bdd49e5d071";
+      };
+    }
+    {
+      name = "qs___qs_6.5.1.tgz";
+      path = fetchurl {
+        name = "qs___qs_6.5.1.tgz";
+        url  = "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz";
+        sha1 = "349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8";
+      };
+    }
+    {
+      name = "qs___qs_6.5.2.tgz";
+      path = fetchurl {
+        name = "qs___qs_6.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz";
+        sha1 = "cb3ae806e8740444584ef154ce8ee98d403f3e36";
+      };
+    }
+    {
+      name = "query_string___query_string_4.3.4.tgz";
+      path = fetchurl {
+        name = "query_string___query_string_4.3.4.tgz";
+        url  = "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz";
+        sha1 = "bbb693b9ca915c232515b228b1a02b609043dbeb";
+      };
+    }
+    {
+      name = "query_string___query_string_5.1.1.tgz";
+      path = fetchurl {
+        name = "query_string___query_string_5.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/query-string/-/query-string-5.1.1.tgz";
+        sha1 = "a78c012b71c17e05f2e3fa2319dd330682efb3cb";
+      };
+    }
+    {
+      name = "querystring_es3___querystring_es3_0.2.1.tgz";
+      path = fetchurl {
+        name = "querystring_es3___querystring_es3_0.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz";
+        sha1 = "9ec61f79049875707d69414596fd907a4d711e73";
+      };
+    }
+    {
+      name = "querystring___querystring_0.2.0.tgz";
+      path = fetchurl {
+        name = "querystring___querystring_0.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz";
+        sha1 = "b209849203bb25df820da756e747005878521620";
+      };
+    }
+    {
+      name = "querystringify___querystringify_2.1.0.tgz";
+      path = fetchurl {
+        name = "querystringify___querystringify_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.0.tgz";
+        sha1 = "7ded8dfbf7879dcc60d0a644ac6754b283ad17ef";
+      };
+    }
+    {
+      name = "quick_lru___quick_lru_1.1.0.tgz";
+      path = fetchurl {
+        name = "quick_lru___quick_lru_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/quick-lru/-/quick-lru-1.1.0.tgz";
+        sha1 = "4360b17c61136ad38078397ff11416e186dcfbb8";
+      };
+    }
+    {
+      name = "randombytes___randombytes_2.0.6.tgz";
+      path = fetchurl {
+        name = "randombytes___randombytes_2.0.6.tgz";
+        url  = "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.6.tgz";
+        sha1 = "d302c522948588848a8d300c932b44c24231da80";
+      };
+    }
+    {
+      name = "randomfill___randomfill_1.0.4.tgz";
+      path = fetchurl {
+        name = "randomfill___randomfill_1.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz";
+        sha1 = "c92196fc86ab42be983f1bf31778224931d61458";
+      };
+    }
+    {
+      name = "range_parser___range_parser_1.2.1.tgz";
+      path = fetchurl {
+        name = "range_parser___range_parser_1.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz";
+        sha1 = "3cf37023d199e1c24d1a55b84800c2f3e6468031";
+      };
+    }
+    {
+      name = "raphael___raphael_2.2.7.tgz";
+      path = fetchurl {
+        name = "raphael___raphael_2.2.7.tgz";
+        url  = "https://registry.yarnpkg.com/raphael/-/raphael-2.2.7.tgz";
+        sha1 = "231b19141f8d086986d8faceb66f8b562ee2c810";
+      };
+    }
+    {
+      name = "raven_js___raven_js_3.22.1.tgz";
+      path = fetchurl {
+        name = "raven_js___raven_js_3.22.1.tgz";
+        url  = "https://registry.yarnpkg.com/raven-js/-/raven-js-3.22.1.tgz";
+        sha1 = "1117f00dfefaa427ef6e1a7d50bbb1fb998a24da";
+      };
+    }
+    {
+      name = "raw_body___raw_body_2.3.2.tgz";
+      path = fetchurl {
+        name = "raw_body___raw_body_2.3.2.tgz";
+        url  = "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.2.tgz";
+        sha1 = "bcd60c77d3eb93cde0050295c3f379389bc88f89";
+      };
+    }
+    {
+      name = "raw_body___raw_body_1.1.7.tgz";
+      path = fetchurl {
+        name = "raw_body___raw_body_1.1.7.tgz";
+        url  = "https://registry.yarnpkg.com/raw-body/-/raw-body-1.1.7.tgz";
+        sha1 = "1d027c2bfa116acc6623bca8f00016572a87d425";
+      };
+    }
+    {
+      name = "raw_loader___raw_loader_1.0.0.tgz";
+      path = fetchurl {
+        name = "raw_loader___raw_loader_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/raw-loader/-/raw-loader-1.0.0.tgz";
+        sha1 = "3f9889e73dadbda9a424bce79809b4133ad46405";
+      };
+    }
+    {
+      name = "rc___rc_1.2.8.tgz";
+      path = fetchurl {
+        name = "rc___rc_1.2.8.tgz";
+        url  = "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz";
+        sha1 = "cd924bf5200a075b83c188cd6b9e211b7fc0d3ed";
+      };
+    }
+    {
+      name = "react_is___react_is_16.8.6.tgz";
+      path = fetchurl {
+        name = "react_is___react_is_16.8.6.tgz";
+        url  = "https://registry.yarnpkg.com/react-is/-/react-is-16.8.6.tgz";
+        sha1 = "5bbc1e2d29141c9fbdfed456343fe2bc430a6a16";
+      };
+    }
+    {
+      name = "read_pkg_up___read_pkg_up_1.0.1.tgz";
+      path = fetchurl {
+        name = "read_pkg_up___read_pkg_up_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz";
+        sha1 = "9d63c13276c065918d57f002a57f40a1b643fb02";
+      };
+    }
+    {
+      name = "read_pkg_up___read_pkg_up_2.0.0.tgz";
+      path = fetchurl {
+        name = "read_pkg_up___read_pkg_up_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz";
+        sha1 = "6b72a8048984e0c41e79510fd5e9fa99b3b549be";
+      };
+    }
+    {
+      name = "read_pkg_up___read_pkg_up_3.0.0.tgz";
+      path = fetchurl {
+        name = "read_pkg_up___read_pkg_up_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz";
+        sha1 = "3ed496685dba0f8fe118d0691dc51f4a1ff96f07";
+      };
+    }
+    {
+      name = "read_pkg_up___read_pkg_up_4.0.0.tgz";
+      path = fetchurl {
+        name = "read_pkg_up___read_pkg_up_4.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-4.0.0.tgz";
+        sha1 = "1b221c6088ba7799601c808f91161c66e58f8978";
+      };
+    }
+    {
+      name = "read_pkg___read_pkg_1.1.0.tgz";
+      path = fetchurl {
+        name = "read_pkg___read_pkg_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz";
+        sha1 = "f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28";
+      };
+    }
+    {
+      name = "read_pkg___read_pkg_2.0.0.tgz";
+      path = fetchurl {
+        name = "read_pkg___read_pkg_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz";
+        sha1 = "8ef1c0623c6a6db0dc6713c4bfac46332b2368f8";
+      };
+    }
+    {
+      name = "read_pkg___read_pkg_3.0.0.tgz";
+      path = fetchurl {
+        name = "read_pkg___read_pkg_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz";
+        sha1 = "9cbc686978fee65d16c00e2b19c237fcf6e38389";
+      };
+    }
+    {
+      name = "readable_stream___readable_stream_2.3.6.tgz";
+      path = fetchurl {
+        name = "readable_stream___readable_stream_2.3.6.tgz";
+        url  = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz";
+        sha1 = "b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf";
+      };
+    }
+    {
+      name = "readable_stream___readable_stream_3.0.6.tgz";
+      path = fetchurl {
+        name = "readable_stream___readable_stream_3.0.6.tgz";
+        url  = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.0.6.tgz";
+        sha1 = "351302e4c68b5abd6a2ed55376a7f9a25be3057a";
+      };
+    }
+    {
+      name = "readable_stream___readable_stream_2.0.6.tgz";
+      path = fetchurl {
+        name = "readable_stream___readable_stream_2.0.6.tgz";
+        url  = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz";
+        sha1 = "8f90341e68a53ccc928788dacfcd11b36eb9b78e";
+      };
+    }
+    {
+      name = "readable_stream___readable_stream_2.1.5.tgz";
+      path = fetchurl {
+        name = "readable_stream___readable_stream_2.1.5.tgz";
+        url  = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.1.5.tgz";
+        sha1 = "66fa8b720e1438b364681f2ad1a63c618448c9d0";
+      };
+    }
+    {
+      name = "readdir_enhanced___readdir_enhanced_2.2.4.tgz";
+      path = fetchurl {
+        name = "readdir_enhanced___readdir_enhanced_2.2.4.tgz";
+        url  = "https://registry.yarnpkg.com/readdir-enhanced/-/readdir-enhanced-2.2.4.tgz";
+        sha1 = "773fb8a8de5f645fb13d9403746d490d4facb3e6";
+      };
+    }
+    {
+      name = "readdirp___readdirp_2.1.0.tgz";
+      path = fetchurl {
+        name = "readdirp___readdirp_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz";
+        sha1 = "4ed0ad060df3073300c48440373f72d1cc642d78";
+      };
+    }
+    {
+      name = "readdirp___readdirp_3.1.1.tgz";
+      path = fetchurl {
+        name = "readdirp___readdirp_3.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/readdirp/-/readdirp-3.1.1.tgz";
+        sha1 = "b158123ac343c8b0f31d65680269cc0fc1025db1";
+      };
+    }
+    {
+      name = "realpath_native___realpath_native_1.1.0.tgz";
+      path = fetchurl {
+        name = "realpath_native___realpath_native_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/realpath-native/-/realpath-native-1.1.0.tgz";
+        sha1 = "2003294fea23fb0672f2476ebe22fcf498a2d65c";
+      };
+    }
+    {
+      name = "redent___redent_1.0.0.tgz";
+      path = fetchurl {
+        name = "redent___redent_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz";
+        sha1 = "cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde";
+      };
+    }
+    {
+      name = "redent___redent_2.0.0.tgz";
+      path = fetchurl {
+        name = "redent___redent_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/redent/-/redent-2.0.0.tgz";
+        sha1 = "c1b2007b42d57eb1389079b3c8333639d5e1ccaa";
+      };
+    }
+    {
+      name = "regenerate_unicode_properties___regenerate_unicode_properties_8.1.0.tgz";
+      path = fetchurl {
+        name = "regenerate_unicode_properties___regenerate_unicode_properties_8.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz";
+        sha1 = "ef51e0f0ea4ad424b77bf7cb41f3e015c70a3f0e";
+      };
+    }
+    {
+      name = "regenerate___regenerate_1.4.0.tgz";
+      path = fetchurl {
+        name = "regenerate___regenerate_1.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz";
+        sha1 = "4a856ec4b56e4077c557589cae85e7a4c8869a11";
+      };
+    }
+    {
+      name = "regenerator_transform___regenerator_transform_0.14.1.tgz";
+      path = fetchurl {
+        name = "regenerator_transform___regenerator_transform_0.14.1.tgz";
+        url  = "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.1.tgz";
+        sha1 = "3b2fce4e1ab7732c08f665dfdb314749c7ddd2fb";
+      };
+    }
+    {
+      name = "regex_not___regex_not_1.0.2.tgz";
+      path = fetchurl {
+        name = "regex_not___regex_not_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz";
+        sha1 = "1f4ece27e00b0b65e0247a6810e6a85d83a5752c";
+      };
+    }
+    {
+      name = "regexp_tree___regexp_tree_0.1.11.tgz";
+      path = fetchurl {
+        name = "regexp_tree___regexp_tree_0.1.11.tgz";
+        url  = "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.11.tgz";
+        sha1 = "c9c7f00fcf722e0a56c7390983a7a63dd6c272f3";
+      };
+    }
+    {
+      name = "regexpp___regexpp_2.0.1.tgz";
+      path = fetchurl {
+        name = "regexpp___regexpp_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz";
+        sha1 = "8d19d31cf632482b589049f8281f93dbcba4d07f";
+      };
+    }
+    {
+      name = "regexpu_core___regexpu_core_1.0.0.tgz";
+      path = fetchurl {
+        name = "regexpu_core___regexpu_core_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-1.0.0.tgz";
+        sha1 = "86a763f58ee4d7c2f6b102e4764050de7ed90c6b";
+      };
+    }
+    {
+      name = "regexpu_core___regexpu_core_4.5.4.tgz";
+      path = fetchurl {
+        name = "regexpu_core___regexpu_core_4.5.4.tgz";
+        url  = "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.5.4.tgz";
+        sha1 = "080d9d02289aa87fe1667a4f5136bc98a6aebaae";
+      };
+    }
+    {
+      name = "registry_auth_token___registry_auth_token_3.3.2.tgz";
+      path = fetchurl {
+        name = "registry_auth_token___registry_auth_token_3.3.2.tgz";
+        url  = "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.3.2.tgz";
+        sha1 = "851fd49038eecb586911115af845260eec983f20";
+      };
+    }
+    {
+      name = "registry_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 = "regjsgen___regjsgen_0.2.0.tgz";
+      path = fetchurl {
+        name = "regjsgen___regjsgen_0.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz";
+        sha1 = "6c016adeac554f75823fe37ac05b92d5a4edb1f7";
+      };
+    }
+    {
+      name = "regjsgen___regjsgen_0.5.0.tgz";
+      path = fetchurl {
+        name = "regjsgen___regjsgen_0.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.0.tgz";
+        sha1 = "a7634dc08f89209c2049adda3525711fb97265dd";
+      };
+    }
+    {
+      name = "regjsparser___regjsparser_0.1.5.tgz";
+      path = fetchurl {
+        name = "regjsparser___regjsparser_0.1.5.tgz";
+        url  = "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz";
+        sha1 = "7ee8f84dc6fa792d3fd0ae228d24bd949ead205c";
+      };
+    }
+    {
+      name = "regjsparser___regjsparser_0.6.0.tgz";
+      path = fetchurl {
+        name = "regjsparser___regjsparser_0.6.0.tgz";
+        url  = "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.0.tgz";
+        sha1 = "f1e6ae8b7da2bae96c99399b868cd6c933a2ba9c";
+      };
+    }
+    {
+      name = "relateurl___relateurl_0.2.7.tgz";
+      path = fetchurl {
+        name = "relateurl___relateurl_0.2.7.tgz";
+        url  = "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz";
+        sha1 = "54dbf377e51440aca90a4cd274600d3ff2d888a9";
+      };
+    }
+    {
+      name = "remark_html___remark_html_8.0.0.tgz";
+      path = fetchurl {
+        name = "remark_html___remark_html_8.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/remark-html/-/remark-html-8.0.0.tgz";
+        sha1 = "9fcb859a6f3cb40f3ef15402950f1a62ec301b3a";
+      };
+    }
+    {
+      name = "remark_parse___remark_parse_5.0.0.tgz";
+      path = fetchurl {
+        name = "remark_parse___remark_parse_5.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/remark-parse/-/remark-parse-5.0.0.tgz";
+        sha1 = "4c077f9e499044d1d5c13f80d7a98cf7b9285d95";
+      };
+    }
+    {
+      name = "remark_parse___remark_parse_6.0.3.tgz";
+      path = fetchurl {
+        name = "remark_parse___remark_parse_6.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/remark-parse/-/remark-parse-6.0.3.tgz";
+        sha1 = "c99131052809da482108413f87b0ee7f52180a3a";
+      };
+    }
+    {
+      name = "remark_reference_links___remark_reference_links_4.0.4.tgz";
+      path = fetchurl {
+        name = "remark_reference_links___remark_reference_links_4.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/remark-reference-links/-/remark-reference-links-4.0.4.tgz";
+        sha1 = "190579a0d6b002859d6cdbdc5aeb8bbdae4e06ab";
+      };
+    }
+    {
+      name = "remark_slug___remark_slug_5.1.2.tgz";
+      path = fetchurl {
+        name = "remark_slug___remark_slug_5.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/remark-slug/-/remark-slug-5.1.2.tgz";
+        sha1 = "715ecdef8df1226786204b1887d31ab16aa24609";
+      };
+    }
+    {
+      name = "remark_stringify___remark_stringify_5.0.0.tgz";
+      path = fetchurl {
+        name = "remark_stringify___remark_stringify_5.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/remark-stringify/-/remark-stringify-5.0.0.tgz";
+        sha1 = "336d3a4d4a6a3390d933eeba62e8de4bd280afba";
+      };
+    }
+    {
+      name = "remark_stringify___remark_stringify_6.0.4.tgz";
+      path = fetchurl {
+        name = "remark_stringify___remark_stringify_6.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/remark-stringify/-/remark-stringify-6.0.4.tgz";
+        sha1 = "16ac229d4d1593249018663c7bddf28aafc4e088";
+      };
+    }
+    {
+      name = "remark_toc___remark_toc_5.1.1.tgz";
+      path = fetchurl {
+        name = "remark_toc___remark_toc_5.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/remark-toc/-/remark-toc-5.1.1.tgz";
+        sha1 = "8c229d6f834cdb43fde6685e2d43248d3fc82d78";
+      };
+    }
+    {
+      name = "remark___remark_10.0.1.tgz";
+      path = fetchurl {
+        name = "remark___remark_10.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/remark/-/remark-10.0.1.tgz";
+        sha1 = "3058076dc41781bf505d8978c291485fe47667df";
+      };
+    }
+    {
+      name = "remark___remark_9.0.0.tgz";
+      path = fetchurl {
+        name = "remark___remark_9.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/remark/-/remark-9.0.0.tgz";
+        sha1 = "c5cfa8ec535c73a67c4b0f12bfdbd3a67d8b2f60";
+      };
+    }
+    {
+      name = "remote_origin_url___remote_origin_url_0.4.0.tgz";
+      path = fetchurl {
+        name = "remote_origin_url___remote_origin_url_0.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/remote-origin-url/-/remote-origin-url-0.4.0.tgz";
+        sha1 = "4d3e2902f34e2d37d1c263d87710b77eb4086a30";
+      };
+    }
+    {
+      name = "remove_bom_buffer___remove_bom_buffer_3.0.0.tgz";
+      path = fetchurl {
+        name = "remove_bom_buffer___remove_bom_buffer_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz";
+        sha1 = "c2bf1e377520d324f623892e33c10cac2c252b53";
+      };
+    }
+    {
+      name = "remove_bom_stream___remove_bom_stream_1.2.0.tgz";
+      path = fetchurl {
+        name = "remove_bom_stream___remove_bom_stream_1.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz";
+        sha1 = "05f1a593f16e42e1fb90ebf59de8e569525f9523";
+      };
+    }
+    {
+      name = "remove_trailing_separator___remove_trailing_separator_1.1.0.tgz";
+      path = fetchurl {
+        name = "remove_trailing_separator___remove_trailing_separator_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz";
+        sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef";
+      };
+    }
+    {
+      name = "repeat_element___repeat_element_1.1.3.tgz";
+      path = fetchurl {
+        name = "repeat_element___repeat_element_1.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz";
+        sha1 = "782e0d825c0c5a3bb39731f84efee6b742e6b1ce";
+      };
+    }
+    {
+      name = "repeat_string___repeat_string_1.6.1.tgz";
+      path = fetchurl {
+        name = "repeat_string___repeat_string_1.6.1.tgz";
+        url  = "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz";
+        sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637";
+      };
+    }
+    {
+      name = "repeating___repeating_2.0.1.tgz";
+      path = fetchurl {
+        name = "repeating___repeating_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz";
+        sha1 = "5214c53a926d3552707527fbab415dbc08d06dda";
+      };
+    }
+    {
+      name = "replace_ext___replace_ext_1.0.0.tgz";
+      path = fetchurl {
+        name = "replace_ext___replace_ext_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz";
+        sha1 = "de63128373fcbf7c3ccfa4de5a480c45a67958eb";
+      };
+    }
+    {
+      name = "request_promise_core___request_promise_core_1.1.1.tgz";
+      path = fetchurl {
+        name = "request_promise_core___request_promise_core_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.1.tgz";
+        sha1 = "3eee00b2c5aa83239cfb04c5700da36f81cd08b6";
+      };
+    }
+    {
+      name = "request_promise_native___request_promise_native_1.0.5.tgz";
+      path = fetchurl {
+        name = "request_promise_native___request_promise_native_1.0.5.tgz";
+        url  = "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.5.tgz";
+        sha1 = "5281770f68e0c9719e5163fd3fab482215f4fda5";
+      };
+    }
+    {
+      name = "request___request_2.88.0.tgz";
+      path = fetchurl {
+        name = "request___request_2.88.0.tgz";
+        url  = "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz";
+        sha1 = "9c2fca4f7d35b592efe57c7f0a55e81052124fef";
+      };
+    }
+    {
+      name = "require_directory___require_directory_2.1.1.tgz";
+      path = fetchurl {
+        name = "require_directory___require_directory_2.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz";
+        sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42";
+      };
+    }
+    {
+      name = "require_main_filename___require_main_filename_1.0.1.tgz";
+      path = fetchurl {
+        name = "require_main_filename___require_main_filename_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz";
+        sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1";
+      };
+    }
+    {
+      name = "require_uncached___require_uncached_1.0.3.tgz";
+      path = fetchurl {
+        name = "require_uncached___require_uncached_1.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz";
+        sha1 = "4e0d56d6c9662fd31e43011c4b95aa49955421d3";
+      };
+    }
+    {
+      name = "requireindex___requireindex_1.1.0.tgz";
+      path = fetchurl {
+        name = "requireindex___requireindex_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/requireindex/-/requireindex-1.1.0.tgz";
+        sha1 = "e5404b81557ef75db6e49c5a72004893fe03e162";
+      };
+    }
+    {
+      name = "requires_port___requires_port_1.0.0.tgz";
+      path = fetchurl {
+        name = "requires_port___requires_port_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz";
+        sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff";
+      };
+    }
+    {
+      name = "requizzle___requizzle_0.2.1.tgz";
+      path = fetchurl {
+        name = "requizzle___requizzle_0.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/requizzle/-/requizzle-0.2.1.tgz";
+        sha1 = "6943c3530c4d9a7e46f1cddd51c158fc670cdbde";
+      };
+    }
+    {
+      name = "resolve_cwd___resolve_cwd_2.0.0.tgz";
+      path = fetchurl {
+        name = "resolve_cwd___resolve_cwd_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz";
+        sha1 = "00a9f7387556e27038eae232caa372a6a59b665a";
+      };
+    }
+    {
+      name = "resolve_dir___resolve_dir_1.0.1.tgz";
+      path = fetchurl {
+        name = "resolve_dir___resolve_dir_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz";
+        sha1 = "79a40644c362be82f26effe739c9bb5382046f43";
+      };
+    }
+    {
+      name = "resolve_from___resolve_from_1.0.1.tgz";
+      path = fetchurl {
+        name = "resolve_from___resolve_from_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz";
+        sha1 = "26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226";
+      };
+    }
+    {
+      name = "resolve_from___resolve_from_3.0.0.tgz";
+      path = fetchurl {
+        name = "resolve_from___resolve_from_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz";
+        sha1 = "b22c7af7d9d6881bc8b6e653335eebcb0a188748";
+      };
+    }
+    {
+      name = "resolve_from___resolve_from_5.0.0.tgz";
+      path = fetchurl {
+        name = "resolve_from___resolve_from_5.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz";
+        sha1 = "c35225843df8f776df21c57557bc087e9dfdfc69";
+      };
+    }
+    {
+      name = "resolve_options___resolve_options_1.1.0.tgz";
+      path = fetchurl {
+        name = "resolve_options___resolve_options_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/resolve-options/-/resolve-options-1.1.0.tgz";
+        sha1 = "32bb9e39c06d67338dc9378c0d6d6074566ad131";
+      };
+    }
+    {
+      name = "resolve_url___resolve_url_0.2.1.tgz";
+      path = fetchurl {
+        name = "resolve_url___resolve_url_0.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz";
+        sha1 = "2c637fe77c893afd2a663fe21aa9080068e2052a";
+      };
+    }
+    {
+      name = "resolve___resolve_1.1.7.tgz";
+      path = fetchurl {
+        name = "resolve___resolve_1.1.7.tgz";
+        url  = "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz";
+        sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b";
+      };
+    }
+    {
+      name = "resolve___resolve_1.11.1.tgz";
+      path = fetchurl {
+        name = "resolve___resolve_1.11.1.tgz";
+        url  = "https://registry.yarnpkg.com/resolve/-/resolve-1.11.1.tgz";
+        sha1 = "ea10d8110376982fef578df8fc30b9ac30a07a3e";
+      };
+    }
+    {
+      name = "responselike___responselike_1.0.2.tgz";
+      path = fetchurl {
+        name = "responselike___responselike_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz";
+        sha1 = "918720ef3b631c5642be068f15ade5a46f4ba1e7";
+      };
+    }
+    {
+      name = "restore_cursor___restore_cursor_2.0.0.tgz";
+      path = fetchurl {
+        name = "restore_cursor___restore_cursor_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz";
+        sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf";
+      };
+    }
+    {
+      name = "ret___ret_0.1.15.tgz";
+      path = fetchurl {
+        name = "ret___ret_0.1.15.tgz";
+        url  = "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz";
+        sha1 = "b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc";
+      };
+    }
+    {
+      name = "rfdc___rfdc_1.1.4.tgz";
+      path = fetchurl {
+        name = "rfdc___rfdc_1.1.4.tgz";
+        url  = "https://registry.yarnpkg.com/rfdc/-/rfdc-1.1.4.tgz";
+        sha1 = "ba72cc1367a0ccd9cf81a870b3b58bd3ad07f8c2";
+      };
+    }
+    {
+      name = "rimraf___rimraf_2.6.3.tgz";
+      path = fetchurl {
+        name = "rimraf___rimraf_2.6.3.tgz";
+        url  = "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz";
+        sha1 = "b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab";
+      };
+    }
+    {
+      name = "ripemd160___ripemd160_2.0.1.tgz";
+      path = fetchurl {
+        name = "ripemd160___ripemd160_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.1.tgz";
+        sha1 = "0f4584295c53a3628af7e6d79aca21ce57d1c6e7";
+      };
+    }
+    {
+      name = "rope_sequence___rope_sequence_1.2.2.tgz";
+      path = fetchurl {
+        name = "rope_sequence___rope_sequence_1.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/rope-sequence/-/rope-sequence-1.2.2.tgz";
+        sha1 = "49c4e5c2f54a48e990b050926771e2871bcb31ce";
+      };
+    }
+    {
+      name = "rsvp___rsvp_4.8.4.tgz";
+      path = fetchurl {
+        name = "rsvp___rsvp_4.8.4.tgz";
+        url  = "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.4.tgz";
+        sha1 = "b50e6b34583f3dd89329a2f23a8a2be072845911";
+      };
+    }
+    {
+      name = "run_async___run_async_2.3.0.tgz";
+      path = fetchurl {
+        name = "run_async___run_async_2.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz";
+        sha1 = "0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0";
+      };
+    }
+    {
+      name = "run_queue___run_queue_1.0.3.tgz";
+      path = fetchurl {
+        name = "run_queue___run_queue_1.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz";
+        sha1 = "e848396f057d223f24386924618e25694161ec47";
+      };
+    }
+    {
+      name = "rw___rw_1.3.3.tgz";
+      path = fetchurl {
+        name = "rw___rw_1.3.3.tgz";
+        url  = "https://registry.yarnpkg.com/rw/-/rw-1.3.3.tgz";
+        sha1 = "3f862dfa91ab766b14885ef4d01124bfda074fb4";
+      };
+    }
+    {
+      name = "rxjs___rxjs_6.2.1.tgz";
+      path = fetchurl {
+        name = "rxjs___rxjs_6.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.2.1.tgz";
+        sha1 = "246cebec189a6cbc143a3ef9f62d6f4c91813ca1";
+      };
+    }
+    {
+      name = "safe_buffer___safe_buffer_5.1.1.tgz";
+      path = fetchurl {
+        name = "safe_buffer___safe_buffer_5.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz";
+        sha1 = "893312af69b2123def71f57889001671eeb2c853";
+      };
+    }
+    {
+      name = "safe_buffer___safe_buffer_5.1.2.tgz";
+      path = fetchurl {
+        name = "safe_buffer___safe_buffer_5.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz";
+        sha1 = "991ec69d296e0313747d59bdfd2b745c35f8828d";
+      };
+    }
+    {
+      name = "safe_json_parse___safe_json_parse_1.0.1.tgz";
+      path = fetchurl {
+        name = "safe_json_parse___safe_json_parse_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/safe-json-parse/-/safe-json-parse-1.0.1.tgz";
+        sha1 = "3e76723e38dfdda13c9b1d29a1e07ffee4b30b57";
+      };
+    }
+    {
+      name = "safe_regex___safe_regex_1.1.0.tgz";
+      path = fetchurl {
+        name = "safe_regex___safe_regex_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz";
+        sha1 = "40a3669f3b077d1e943d44629e157dd48023bf2e";
+      };
+    }
+    {
+      name = "safer_buffer___safer_buffer_2.1.2.tgz";
+      path = fetchurl {
+        name = "safer_buffer___safer_buffer_2.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz";
+        sha1 = "44fa161b0187b9549dd84bb91802f9bd8385cd6a";
+      };
+    }
+    {
+      name = "sane___sane_4.1.0.tgz";
+      path = fetchurl {
+        name = "sane___sane_4.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/sane/-/sane-4.1.0.tgz";
+        sha1 = "ed881fd922733a6c461bc189dc2b6c006f3ffded";
+      };
+    }
+    {
+      name = "sanitize_html___sanitize_html_1.16.3.tgz";
+      path = fetchurl {
+        name = "sanitize_html___sanitize_html_1.16.3.tgz";
+        url  = "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-1.16.3.tgz";
+        sha1 = "96c1b44a36ff7312e1c22a14b05274370ac8bd56";
+      };
+    }
+    {
+      name = "sass_graph___sass_graph_2.2.4.tgz";
+      path = fetchurl {
+        name = "sass_graph___sass_graph_2.2.4.tgz";
+        url  = "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.4.tgz";
+        sha1 = "13fbd63cd1caf0908b9fd93476ad43a51d1e0b49";
+      };
+    }
+    {
+      name = "sax___sax_1.2.1.tgz";
+      path = fetchurl {
+        name = "sax___sax_1.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/sax/-/sax-1.2.1.tgz";
+        sha1 = "7b8e656190b228e81a66aea748480d828cd2d37a";
+      };
+    }
+    {
+      name = "sax___sax_1.2.4.tgz";
+      path = fetchurl {
+        name = "sax___sax_1.2.4.tgz";
+        url  = "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz";
+        sha1 = "2816234e2378bddc4e5354fab5caa895df7100d9";
+      };
+    }
+    {
+      name = "schema_utils___schema_utils_0.4.5.tgz";
+      path = fetchurl {
+        name = "schema_utils___schema_utils_0.4.5.tgz";
+        url  = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.5.tgz";
+        sha1 = "21836f0608aac17b78f9e3e24daff14a5ca13a3e";
+      };
+    }
+    {
+      name = "schema_utils___schema_utils_1.0.0.tgz";
+      path = fetchurl {
+        name = "schema_utils___schema_utils_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz";
+        sha1 = "0b79a93204d7b600d4b2850d1f66c2a34951c770";
+      };
+    }
+    {
+      name = "scope_css___scope_css_1.2.1.tgz";
+      path = fetchurl {
+        name = "scope_css___scope_css_1.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/scope-css/-/scope-css-1.2.1.tgz";
+        sha1 = "c35768bc900cad030a3e0d663a818c0f6a57f40e";
+      };
+    }
+    {
+      name = "scss_tokenizer___scss_tokenizer_0.2.3.tgz";
+      path = fetchurl {
+        name = "scss_tokenizer___scss_tokenizer_0.2.3.tgz";
+        url  = "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz";
+        sha1 = "8eb06db9a9723333824d3f5530641149847ce5d1";
+      };
+    }
+    {
+      name = "select_hose___select_hose_2.0.0.tgz";
+      path = fetchurl {
+        name = "select_hose___select_hose_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz";
+        sha1 = "625d8658f865af43ec962bfc376a37359a4994ca";
+      };
+    }
+    {
+      name = "select2___select2_3.5.2_browserify.tgz";
+      path = fetchurl {
+        name = "select2___select2_3.5.2_browserify.tgz";
+        url  = "https://registry.yarnpkg.com/select2/-/select2-3.5.2-browserify.tgz";
+        sha1 = "dc4dafda38d67a734e8a97a46f0d3529ae05391d";
+      };
+    }
+    {
+      name = "select___select_1.1.2.tgz";
+      path = fetchurl {
+        name = "select___select_1.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/select/-/select-1.1.2.tgz";
+        sha1 = "0e7350acdec80b1108528786ec1d4418d11b396d";
+      };
+    }
+    {
+      name = "selfsigned___selfsigned_1.10.1.tgz";
+      path = fetchurl {
+        name = "selfsigned___selfsigned_1.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.1.tgz";
+        sha1 = "bf8cb7b83256c4551e31347c6311778db99eec52";
+      };
+    }
+    {
+      name = "semver_diff___semver_diff_2.1.0.tgz";
+      path = fetchurl {
+        name = "semver_diff___semver_diff_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/semver-diff/-/semver-diff-2.1.0.tgz";
+        sha1 = "4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36";
+      };
+    }
+    {
+      name = "semver___semver_5.7.0.tgz";
+      path = fetchurl {
+        name = "semver___semver_5.7.0.tgz";
+        url  = "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz";
+        sha1 = "790a7cf6fea5459bac96110b29b60412dc8ff96b";
+      };
+    }
+    {
+      name = "semver___semver_6.2.0.tgz";
+      path = fetchurl {
+        name = "semver___semver_6.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/semver/-/semver-6.2.0.tgz";
+        sha1 = "4d813d9590aaf8a9192693d6c85b9344de5901db";
+      };
+    }
+    {
+      name = "semver___semver_5.3.0.tgz";
+      path = fetchurl {
+        name = "semver___semver_5.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz";
+        sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f";
+      };
+    }
+    {
+      name = "send___send_0.16.2.tgz";
+      path = fetchurl {
+        name = "send___send_0.16.2.tgz";
+        url  = "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz";
+        sha1 = "6ecca1e0f8c156d141597559848df64730a6bbc1";
+      };
+    }
+    {
+      name = "serialize_javascript___serialize_javascript_1.7.0.tgz";
+      path = fetchurl {
+        name = "serialize_javascript___serialize_javascript_1.7.0.tgz";
+        url  = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.7.0.tgz";
+        sha1 = "d6e0dfb2a3832a8c94468e6eb1db97e55a192a65";
+      };
+    }
+    {
+      name = "serve_index___serve_index_1.9.1.tgz";
+      path = fetchurl {
+        name = "serve_index___serve_index_1.9.1.tgz";
+        url  = "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz";
+        sha1 = "d3768d69b1e7d82e5ce050fff5b453bea12a9239";
+      };
+    }
+    {
+      name = "serve_static___serve_static_1.13.2.tgz";
+      path = fetchurl {
+        name = "serve_static___serve_static_1.13.2.tgz";
+        url  = "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.2.tgz";
+        sha1 = "095e8472fd5b46237db50ce486a43f4b86c6cec1";
+      };
+    }
+    {
+      name = "set_blocking___set_blocking_2.0.0.tgz";
+      path = fetchurl {
+        name = "set_blocking___set_blocking_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz";
+        sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7";
+      };
+    }
+    {
+      name = "set_immediate_shim___set_immediate_shim_1.0.1.tgz";
+      path = fetchurl {
+        name = "set_immediate_shim___set_immediate_shim_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz";
+        sha1 = "4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61";
+      };
+    }
+    {
+      name = "set_value___set_value_0.4.3.tgz";
+      path = fetchurl {
+        name = "set_value___set_value_0.4.3.tgz";
+        url  = "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz";
+        sha1 = "7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1";
+      };
+    }
+    {
+      name = "set_value___set_value_2.0.0.tgz";
+      path = fetchurl {
+        name = "set_value___set_value_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz";
+        sha1 = "71ae4a88f0feefbbf52d1ea604f3fb315ebb6274";
+      };
+    }
+    {
+      name = "setimmediate___setimmediate_1.0.5.tgz";
+      path = fetchurl {
+        name = "setimmediate___setimmediate_1.0.5.tgz";
+        url  = "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz";
+        sha1 = "290cbb232e306942d7d7ea9b83732ab7856f8285";
+      };
+    }
+    {
+      name = "setprototypeof___setprototypeof_1.0.3.tgz";
+      path = fetchurl {
+        name = "setprototypeof___setprototypeof_1.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.0.3.tgz";
+        sha1 = "66567e37043eeb4f04d91bd658c0cbefb55b8e04";
+      };
+    }
+    {
+      name = "setprototypeof___setprototypeof_1.1.0.tgz";
+      path = fetchurl {
+        name = "setprototypeof___setprototypeof_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz";
+        sha1 = "d0bd85536887b6fe7c0d818cb962d9d91c54e656";
+      };
+    }
+    {
+      name = "sha.js___sha.js_2.4.10.tgz";
+      path = fetchurl {
+        name = "sha.js___sha.js_2.4.10.tgz";
+        url  = "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.10.tgz";
+        sha1 = "b1fde5cd7d11a5626638a07c604ab909cfa31f9b";
+      };
+    }
+    {
+      name = "sha1___sha1_1.1.1.tgz";
+      path = fetchurl {
+        name = "sha1___sha1_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/sha1/-/sha1-1.1.1.tgz";
+        sha1 = "addaa7a93168f393f19eb2b15091618e2700f848";
+      };
+    }
+    {
+      name = "shallow_clone___shallow_clone_3.0.1.tgz";
+      path = fetchurl {
+        name = "shallow_clone___shallow_clone_3.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz";
+        sha1 = "8f2981ad92531f55035b01fb230769a40e02efa3";
+      };
+    }
+    {
+      name = "shebang_command___shebang_command_1.2.0.tgz";
+      path = fetchurl {
+        name = "shebang_command___shebang_command_1.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz";
+        sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea";
+      };
+    }
+    {
+      name = "shebang_regex___shebang_regex_1.0.0.tgz";
+      path = fetchurl {
+        name = "shebang_regex___shebang_regex_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz";
+        sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3";
+      };
+    }
+    {
+      name = "shellwords___shellwords_0.1.1.tgz";
+      path = fetchurl {
+        name = "shellwords___shellwords_0.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz";
+        sha1 = "d6b9181c1a48d397324c84871efbcfc73fc0654b";
+      };
+    }
+    {
+      name = "sigmund___sigmund_1.0.1.tgz";
+      path = fetchurl {
+        name = "sigmund___sigmund_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz";
+        sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590";
+      };
+    }
+    {
+      name = "signal_exit___signal_exit_3.0.2.tgz";
+      path = fetchurl {
+        name = "signal_exit___signal_exit_3.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz";
+        sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d";
+      };
+    }
+    {
+      name = "sisteransi___sisteransi_1.0.0.tgz";
+      path = fetchurl {
+        name = "sisteransi___sisteransi_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.0.tgz";
+        sha1 = "77d9622ff909080f1c19e5f4a1df0c1b0a27b88c";
+      };
+    }
+    {
+      name = "slash___slash_1.0.0.tgz";
+      path = fetchurl {
+        name = "slash___slash_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz";
+        sha1 = "c41f2f6c39fc16d1cd17ad4b5d896114ae470d55";
+      };
+    }
+    {
+      name = "slash___slash_2.0.0.tgz";
+      path = fetchurl {
+        name = "slash___slash_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz";
+        sha1 = "de552851a1759df3a8f206535442f5ec4ddeab44";
+      };
+    }
+    {
+      name = "slash___slash_3.0.0.tgz";
+      path = fetchurl {
+        name = "slash___slash_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz";
+        sha1 = "6539be870c165adbd5240220dbe361f1bc4d4634";
+      };
+    }
+    {
+      name = "slice_ansi___slice_ansi_2.1.0.tgz";
+      path = fetchurl {
+        name = "slice_ansi___slice_ansi_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz";
+        sha1 = "cacd7693461a637a5788d92a7dd4fba068e81636";
+      };
+    }
+    {
+      name = "slugify___slugify_1.3.1.tgz";
+      path = fetchurl {
+        name = "slugify___slugify_1.3.1.tgz";
+        url  = "https://registry.yarnpkg.com/slugify/-/slugify-1.3.1.tgz";
+        sha1 = "f572127e8535329fbc6c1edb74ab856b61ad7de2";
+      };
+    }
+    {
+      name = "smooshpack___smooshpack_0.0.54.tgz";
+      path = fetchurl {
+        name = "smooshpack___smooshpack_0.0.54.tgz";
+        url  = "https://registry.yarnpkg.com/smooshpack/-/smooshpack-0.0.54.tgz";
+        sha1 = "9044358b85052d348b801f385678c8a0c76f2bb6";
+      };
+    }
+    {
+      name = "snapdragon_node___snapdragon_node_2.1.1.tgz";
+      path = fetchurl {
+        name = "snapdragon_node___snapdragon_node_2.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz";
+        sha1 = "6c175f86ff14bdb0724563e8f3c1b021a286853b";
+      };
+    }
+    {
+      name = "snapdragon_util___snapdragon_util_3.0.1.tgz";
+      path = fetchurl {
+        name = "snapdragon_util___snapdragon_util_3.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz";
+        sha1 = "f956479486f2acd79700693f6f7b805e45ab56e2";
+      };
+    }
+    {
+      name = "snapdragon___snapdragon_0.8.2.tgz";
+      path = fetchurl {
+        name = "snapdragon___snapdragon_0.8.2.tgz";
+        url  = "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz";
+        sha1 = "64922e7c565b0e14204ba1aa7d6964278d25182d";
+      };
+    }
+    {
+      name = "socket.io_adapter___socket.io_adapter_1.1.1.tgz";
+      path = fetchurl {
+        name = "socket.io_adapter___socket.io_adapter_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz";
+        sha1 = "2a805e8a14d6372124dd9159ad4502f8cb07f06b";
+      };
+    }
+    {
+      name = "socket.io_client___socket.io_client_2.1.1.tgz";
+      path = fetchurl {
+        name = "socket.io_client___socket.io_client_2.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.1.1.tgz";
+        sha1 = "dcb38103436ab4578ddb026638ae2f21b623671f";
+      };
+    }
+    {
+      name = "socket.io_parser___socket.io_parser_3.2.0.tgz";
+      path = fetchurl {
+        name = "socket.io_parser___socket.io_parser_3.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.2.0.tgz";
+        sha1 = "e7c6228b6aa1f814e6148aea325b51aa9499e077";
+      };
+    }
+    {
+      name = "socket.io___socket.io_2.1.1.tgz";
+      path = fetchurl {
+        name = "socket.io___socket.io_2.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/socket.io/-/socket.io-2.1.1.tgz";
+        sha1 = "a069c5feabee3e6b214a75b40ce0652e1cfb9980";
+      };
+    }
+    {
+      name = "sockjs_client___sockjs_client_1.3.0.tgz";
+      path = fetchurl {
+        name = "sockjs_client___sockjs_client_1.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.3.0.tgz";
+        sha1 = "12fc9d6cb663da5739d3dc5fb6e8687da95cb177";
+      };
+    }
+    {
+      name = "sockjs___sockjs_0.3.19.tgz";
+      path = fetchurl {
+        name = "sockjs___sockjs_0.3.19.tgz";
+        url  = "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.19.tgz";
+        sha1 = "d976bbe800af7bd20ae08598d582393508993c0d";
+      };
+    }
+    {
+      name = "sort_keys___sort_keys_1.1.2.tgz";
+      path = fetchurl {
+        name = "sort_keys___sort_keys_1.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz";
+        sha1 = "441b6d4d346798f1b4e49e8920adfba0e543f9ad";
+      };
+    }
+    {
+      name = "sort_keys___sort_keys_2.0.0.tgz";
+      path = fetchurl {
+        name = "sort_keys___sort_keys_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz";
+        sha1 = "658535584861ec97d730d6cf41822e1f56684128";
+      };
+    }
+    {
+      name = "sortablejs___sortablejs_1.10.0.tgz";
+      path = fetchurl {
+        name = "sortablejs___sortablejs_1.10.0.tgz";
+        url  = "https://registry.yarnpkg.com/sortablejs/-/sortablejs-1.10.0.tgz";
+        sha1 = "0ebc054acff2486569194a2f975b2b145dd5e7d6";
+      };
+    }
+    {
+      name = "sortablejs___sortablejs_1.9.0.tgz";
+      path = fetchurl {
+        name = "sortablejs___sortablejs_1.9.0.tgz";
+        url  = "https://registry.yarnpkg.com/sortablejs/-/sortablejs-1.9.0.tgz";
+        sha1 = "2d1e74ae6bac2cb4ad0622908f340848969eb88d";
+      };
+    }
+    {
+      name = "source_list_map___source_list_map_2.0.0.tgz";
+      path = fetchurl {
+        name = "source_list_map___source_list_map_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz";
+        sha1 = "aaa47403f7b245a92fbc97ea08f250d6087ed085";
+      };
+    }
+    {
+      name = "source_map_resolve___source_map_resolve_0.5.2.tgz";
+      path = fetchurl {
+        name = "source_map_resolve___source_map_resolve_0.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz";
+        sha1 = "72e2cc34095543e43b2c62b2c4c10d4a9054f259";
+      };
+    }
+    {
+      name = "source_map_support___source_map_support_0.5.12.tgz";
+      path = fetchurl {
+        name = "source_map_support___source_map_support_0.5.12.tgz";
+        url  = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.12.tgz";
+        sha1 = "b4f3b10d51857a5af0138d3ce8003b201613d599";
+      };
+    }
+    {
+      name = "source_map_url___source_map_url_0.4.0.tgz";
+      path = fetchurl {
+        name = "source_map_url___source_map_url_0.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz";
+        sha1 = "3e935d7ddd73631b97659956d55128e87b5084a3";
+      };
+    }
+    {
+      name = "source_map___source_map_0.5.0.tgz";
+      path = fetchurl {
+        name = "source_map___source_map_0.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/source-map/-/source-map-0.5.0.tgz";
+        sha1 = "0fe96503ac86a5adb5de63f4e412ae4872cdbe86";
+      };
+    }
+    {
+      name = "source_map___source_map_0.4.4.tgz";
+      path = fetchurl {
+        name = "source_map___source_map_0.4.4.tgz";
+        url  = "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz";
+        sha1 = "eba4f5da9c0dc999de68032d8b4f76173652036b";
+      };
+    }
+    {
+      name = "source_map___source_map_0.5.7.tgz";
+      path = fetchurl {
+        name = "source_map___source_map_0.5.7.tgz";
+        url  = "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz";
+        sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc";
+      };
+    }
+    {
+      name = "source_map___source_map_0.6.1.tgz";
+      path = fetchurl {
+        name = "source_map___source_map_0.6.1.tgz";
+        url  = "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz";
+        sha1 = "74722af32e9614e9c287a8d0bbde48b5e2f1a263";
+      };
+    }
+    {
+      name = "source_map___source_map_0.7.3.tgz";
+      path = fetchurl {
+        name = "source_map___source_map_0.7.3.tgz";
+        url  = "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz";
+        sha1 = "5302f8169031735226544092e64981f751750383";
+      };
+    }
+    {
+      name = "space_separated_tokens___space_separated_tokens_1.1.4.tgz";
+      path = fetchurl {
+        name = "space_separated_tokens___space_separated_tokens_1.1.4.tgz";
+        url  = "https://registry.yarnpkg.com/space-separated-tokens/-/space-separated-tokens-1.1.4.tgz";
+        sha1 = "27910835ae00d0adfcdbd0ad7e611fb9544351fa";
+      };
+    }
+    {
+      name = "spdx_correct___spdx_correct_1.0.2.tgz";
+      path = fetchurl {
+        name = "spdx_correct___spdx_correct_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-1.0.2.tgz";
+        sha1 = "4b3073d933ff51f3912f03ac5519498a4150db40";
+      };
+    }
+    {
+      name = "spdx_expression_parse___spdx_expression_parse_1.0.4.tgz";
+      path = fetchurl {
+        name = "spdx_expression_parse___spdx_expression_parse_1.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz";
+        sha1 = "9bdf2f20e1f40ed447fbe273266191fced51626c";
+      };
+    }
+    {
+      name = "spdx_license_ids___spdx_license_ids_1.2.2.tgz";
+      path = fetchurl {
+        name = "spdx_license_ids___spdx_license_ids_1.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz";
+        sha1 = "c9df7a3424594ade6bd11900d596696dc06bac57";
+      };
+    }
+    {
+      name = "spdy_transport___spdy_transport_3.0.0.tgz";
+      path = fetchurl {
+        name = "spdy_transport___spdy_transport_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-3.0.0.tgz";
+        sha1 = "00d4863a6400ad75df93361a1608605e5dcdcf31";
+      };
+    }
+    {
+      name = "spdy___spdy_4.0.0.tgz";
+      path = fetchurl {
+        name = "spdy___spdy_4.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/spdy/-/spdy-4.0.0.tgz";
+        sha1 = "81f222b5a743a329aa12cea6a390e60e9b613c52";
+      };
+    }
+    {
+      name = "specificity___specificity_0.4.1.tgz";
+      path = fetchurl {
+        name = "specificity___specificity_0.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/specificity/-/specificity-0.4.1.tgz";
+        sha1 = "aab5e645012db08ba182e151165738d00887b019";
+      };
+    }
+    {
+      name = "split_string___split_string_3.1.0.tgz";
+      path = fetchurl {
+        name = "split_string___split_string_3.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz";
+        sha1 = "7cb09dda3a86585705c64b39a6466038682e8fe2";
+      };
+    }
+    {
+      name = "sprintf_js___sprintf_js_1.0.3.tgz";
+      path = fetchurl {
+        name = "sprintf_js___sprintf_js_1.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz";
+        sha1 = "04e6926f662895354f3dd015203633b857297e2c";
+      };
+    }
+    {
+      name = "sql.js___sql.js_0.4.0.tgz";
+      path = fetchurl {
+        name = "sql.js___sql.js_0.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/sql.js/-/sql.js-0.4.0.tgz";
+        sha1 = "23be9635520eb0ff43a741e7e830397266e88445";
+      };
+    }
+    {
+      name = "srcset___srcset_1.0.0.tgz";
+      path = fetchurl {
+        name = "srcset___srcset_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/srcset/-/srcset-1.0.0.tgz";
+        sha1 = "a5669de12b42f3b1d5e83ed03c71046fc48f41ef";
+      };
+    }
+    {
+      name = "sshpk___sshpk_1.15.2.tgz";
+      path = fetchurl {
+        name = "sshpk___sshpk_1.15.2.tgz";
+        url  = "https://registry.yarnpkg.com/sshpk/-/sshpk-1.15.2.tgz";
+        sha1 = "c946d6bd9b1a39d0e8635763f5242d6ed6dcb629";
+      };
+    }
+    {
+      name = "ssri___ssri_6.0.1.tgz";
+      path = fetchurl {
+        name = "ssri___ssri_6.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz";
+        sha1 = "2a3c41b28dd45b62b63676ecb74001265ae9edd8";
+      };
+    }
+    {
+      name = "stack_utils___stack_utils_1.0.2.tgz";
+      path = fetchurl {
+        name = "stack_utils___stack_utils_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.2.tgz";
+        sha1 = "33eba3897788558bebfc2db059dc158ec36cebb8";
+      };
+    }
+    {
+      name = "state_toggle___state_toggle_1.0.1.tgz";
+      path = fetchurl {
+        name = "state_toggle___state_toggle_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/state-toggle/-/state-toggle-1.0.1.tgz";
+        sha1 = "c3cb0974f40a6a0f8e905b96789eb41afa1cde3a";
+      };
+    }
+    {
+      name = "static_extend___static_extend_0.1.2.tgz";
+      path = fetchurl {
+        name = "static_extend___static_extend_0.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz";
+        sha1 = "60809c39cbff55337226fd5e0b520f341f1fb5c6";
+      };
+    }
+    {
+      name = "statuses___statuses_1.4.0.tgz";
+      path = fetchurl {
+        name = "statuses___statuses_1.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz";
+        sha1 = "bb73d446da2796106efcc1b601a253d6c46bd087";
+      };
+    }
+    {
+      name = "statuses___statuses_1.3.1.tgz";
+      path = fetchurl {
+        name = "statuses___statuses_1.3.1.tgz";
+        url  = "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz";
+        sha1 = "faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e";
+      };
+    }
+    {
+      name = "stdout_stream___stdout_stream_1.4.1.tgz";
+      path = fetchurl {
+        name = "stdout_stream___stdout_stream_1.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.1.tgz";
+        sha1 = "5ac174cdd5cd726104aa0c0b2bd83815d8d535de";
+      };
+    }
+    {
+      name = "stealthy_require___stealthy_require_1.1.1.tgz";
+      path = fetchurl {
+        name = "stealthy_require___stealthy_require_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz";
+        sha1 = "35b09875b4ff49f26a777e509b3090a3226bf24b";
+      };
+    }
+    {
+      name = "stickyfilljs___stickyfilljs_2.0.5.tgz";
+      path = fetchurl {
+        name = "stickyfilljs___stickyfilljs_2.0.5.tgz";
+        url  = "https://registry.yarnpkg.com/stickyfilljs/-/stickyfilljs-2.0.5.tgz";
+        sha1 = "d229e372d2199ddf5d283bbe34ac1f7d2529c2fc";
+      };
+    }
+    {
+      name = "stream_array___stream_array_1.1.2.tgz";
+      path = fetchurl {
+        name = "stream_array___stream_array_1.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/stream-array/-/stream-array-1.1.2.tgz";
+        sha1 = "9e5f7345f2137c30ee3b498b9114e80b52bb7eb5";
+      };
+    }
+    {
+      name = "stream_browserify___stream_browserify_2.0.1.tgz";
+      path = fetchurl {
+        name = "stream_browserify___stream_browserify_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz";
+        sha1 = "66266ee5f9bdb9940a4e4514cafb43bb71e5c9db";
+      };
+    }
+    {
+      name = "stream_combiner2___stream_combiner2_1.1.1.tgz";
+      path = fetchurl {
+        name = "stream_combiner2___stream_combiner2_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/stream-combiner2/-/stream-combiner2-1.1.1.tgz";
+        sha1 = "fb4d8a1420ea362764e21ad4780397bebcb41cbe";
+      };
+    }
+    {
+      name = "stream_each___stream_each_1.2.2.tgz";
+      path = fetchurl {
+        name = "stream_each___stream_each_1.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.2.tgz";
+        sha1 = "8e8c463f91da8991778765873fe4d960d8f616bd";
+      };
+    }
+    {
+      name = "stream_http___stream_http_2.8.2.tgz";
+      path = fetchurl {
+        name = "stream_http___stream_http_2.8.2.tgz";
+        url  = "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.2.tgz";
+        sha1 = "4126e8c6b107004465918aa2fc35549e77402c87";
+      };
+    }
+    {
+      name = "stream_shift___stream_shift_1.0.0.tgz";
+      path = fetchurl {
+        name = "stream_shift___stream_shift_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz";
+        sha1 = "d5c752825e5367e786f78e18e445ea223a155952";
+      };
+    }
+    {
+      name = "streamroller___streamroller_1.0.6.tgz";
+      path = fetchurl {
+        name = "streamroller___streamroller_1.0.6.tgz";
+        url  = "https://registry.yarnpkg.com/streamroller/-/streamroller-1.0.6.tgz";
+        sha1 = "8167d8496ed9f19f05ee4b158d9611321b8cacd9";
+      };
+    }
+    {
+      name = "strict_uri_encode___strict_uri_encode_1.1.0.tgz";
+      path = fetchurl {
+        name = "strict_uri_encode___strict_uri_encode_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz";
+        sha1 = "279b225df1d582b1f54e65addd4352e18faa0713";
+      };
+    }
+    {
+      name = "string_length___string_length_2.0.0.tgz";
+      path = fetchurl {
+        name = "string_length___string_length_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/string-length/-/string-length-2.0.0.tgz";
+        sha1 = "d40dbb686a3ace960c1cffca562bf2c45f8363ed";
+      };
+    }
+    {
+      name = "string_template___string_template_0.2.1.tgz";
+      path = fetchurl {
+        name = "string_template___string_template_0.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz";
+        sha1 = "42932e598a352d01fc22ec3367d9d84eec6c9add";
+      };
+    }
+    {
+      name = "string_width___string_width_1.0.2.tgz";
+      path = fetchurl {
+        name = "string_width___string_width_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz";
+        sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3";
+      };
+    }
+    {
+      name = "string_width___string_width_2.1.1.tgz";
+      path = fetchurl {
+        name = "string_width___string_width_2.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz";
+        sha1 = "ab93f27a8dc13d28cac815c462143a6d9012ae9e";
+      };
+    }
+    {
+      name = "string_width___string_width_3.0.0.tgz";
+      path = fetchurl {
+        name = "string_width___string_width_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/string-width/-/string-width-3.0.0.tgz";
+        sha1 = "5a1690a57cc78211fffd9bf24bbe24d090604eb1";
+      };
+    }
+    {
+      name = "string_width___string_width_4.1.0.tgz";
+      path = fetchurl {
+        name = "string_width___string_width_4.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/string-width/-/string-width-4.1.0.tgz";
+        sha1 = "ba846d1daa97c3c596155308063e075ed1c99aff";
+      };
+    }
+    {
+      name = "string_decoder___string_decoder_0.10.31.tgz";
+      path = fetchurl {
+        name = "string_decoder___string_decoder_0.10.31.tgz";
+        url  = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz";
+        sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94";
+      };
+    }
+    {
+      name = "string_decoder___string_decoder_1.1.1.tgz";
+      path = fetchurl {
+        name = "string_decoder___string_decoder_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz";
+        sha1 = "9cf1611ba62685d7030ae9e4ba34149c3af03fc8";
+      };
+    }
+    {
+      name = "stringify_entities___stringify_entities_1.3.2.tgz";
+      path = fetchurl {
+        name = "stringify_entities___stringify_entities_1.3.2.tgz";
+        url  = "https://registry.yarnpkg.com/stringify-entities/-/stringify-entities-1.3.2.tgz";
+        sha1 = "a98417e5471fd227b3e45d3db1861c11caf668f7";
+      };
+    }
+    {
+      name = "strip_ansi___strip_ansi_3.0.1.tgz";
+      path = fetchurl {
+        name = "strip_ansi___strip_ansi_3.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz";
+        sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf";
+      };
+    }
+    {
+      name = "strip_ansi___strip_ansi_4.0.0.tgz";
+      path = fetchurl {
+        name = "strip_ansi___strip_ansi_4.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz";
+        sha1 = "a8479022eb1ac368a871389b635262c505ee368f";
+      };
+    }
+    {
+      name = "strip_ansi___strip_ansi_5.2.0.tgz";
+      path = fetchurl {
+        name = "strip_ansi___strip_ansi_5.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz";
+        sha1 = "8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae";
+      };
+    }
+    {
+      name = "strip_bom___strip_bom_2.0.0.tgz";
+      path = fetchurl {
+        name = "strip_bom___strip_bom_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz";
+        sha1 = "6219a85616520491f35788bdbf1447a99c7e6b0e";
+      };
+    }
+    {
+      name = "strip_bom___strip_bom_3.0.0.tgz";
+      path = fetchurl {
+        name = "strip_bom___strip_bom_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz";
+        sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3";
+      };
+    }
+    {
+      name = "strip_css_comments___strip_css_comments_3.0.0.tgz";
+      path = fetchurl {
+        name = "strip_css_comments___strip_css_comments_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/strip-css-comments/-/strip-css-comments-3.0.0.tgz";
+        sha1 = "7a5625eff8a2b226cf8947a11254da96e13dae89";
+      };
+    }
+    {
+      name = "strip_eof___strip_eof_1.0.0.tgz";
+      path = fetchurl {
+        name = "strip_eof___strip_eof_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz";
+        sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf";
+      };
+    }
+    {
+      name = "strip_indent___strip_indent_1.0.1.tgz";
+      path = fetchurl {
+        name = "strip_indent___strip_indent_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz";
+        sha1 = "0c7962a6adefa7bbd4ac366460a638552ae1a0a2";
+      };
+    }
+    {
+      name = "strip_indent___strip_indent_2.0.0.tgz";
+      path = fetchurl {
+        name = "strip_indent___strip_indent_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz";
+        sha1 = "5ef8db295d01e6ed6cbf7aab96998d7822527b68";
+      };
+    }
+    {
+      name = "strip_json_comments___strip_json_comments_2.0.1.tgz";
+      path = fetchurl {
+        name = "strip_json_comments___strip_json_comments_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz";
+        sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a";
+      };
+    }
+    {
+      name = "style_loader___style_loader_0.23.1.tgz";
+      path = fetchurl {
+        name = "style_loader___style_loader_0.23.1.tgz";
+        url  = "https://registry.yarnpkg.com/style-loader/-/style-loader-0.23.1.tgz";
+        sha1 = "cb9154606f3e771ab6c4ab637026a1049174d925";
+      };
+    }
+    {
+      name = "style_search___style_search_0.1.0.tgz";
+      path = fetchurl {
+        name = "style_search___style_search_0.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/style-search/-/style-search-0.1.0.tgz";
+        sha1 = "7958c793e47e32e07d2b5cafe5c0bf8e12e77902";
+      };
+    }
+    {
+      name = "stylelint_config_recommended___stylelint_config_recommended_2.2.0.tgz";
+      path = fetchurl {
+        name = "stylelint_config_recommended___stylelint_config_recommended_2.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-2.2.0.tgz";
+        sha1 = "46ab139db4a0e7151fd5f94af155512886c96d3f";
+      };
+    }
+    {
+      name = "stylelint_scss___stylelint_scss_3.9.2.tgz";
+      path = fetchurl {
+        name = "stylelint_scss___stylelint_scss_3.9.2.tgz";
+        url  = "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-3.9.2.tgz";
+        sha1 = "5435174a57696ee52eae40146778a4e62f7ed3a3";
+      };
+    }
+    {
+      name = "stylelint___stylelint_10.1.0.tgz";
+      path = fetchurl {
+        name = "stylelint___stylelint_10.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/stylelint/-/stylelint-10.1.0.tgz";
+        sha1 = "1bc4c4ce878107e7c396b19226d91ba28268911a";
+      };
+    }
+    {
+      name = "subarg___subarg_1.0.0.tgz";
+      path = fetchurl {
+        name = "subarg___subarg_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/subarg/-/subarg-1.0.0.tgz";
+        sha1 = "f62cf17581e996b48fc965699f54c06ae268b8d2";
+      };
+    }
+    {
+      name = "sugarss___sugarss_2.0.0.tgz";
+      path = fetchurl {
+        name = "sugarss___sugarss_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/sugarss/-/sugarss-2.0.0.tgz";
+        sha1 = "ddd76e0124b297d40bf3cca31c8b22ecb43bc61d";
+      };
+    }
+    {
+      name = "supports_color___supports_color_2.0.0.tgz";
+      path = fetchurl {
+        name = "supports_color___supports_color_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz";
+        sha1 = "535d045ce6b6363fa40117084629995e9df324c7";
+      };
+    }
+    {
+      name = "supports_color___supports_color_5.5.0.tgz";
+      path = fetchurl {
+        name = "supports_color___supports_color_5.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz";
+        sha1 = "e2e69a44ac8772f78a1ec0b35b689df6530efc8f";
+      };
+    }
+    {
+      name = "supports_color___supports_color_6.1.0.tgz";
+      path = fetchurl {
+        name = "supports_color___supports_color_6.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz";
+        sha1 = "0764abc69c63d5ac842dd4867e8d025e880df8f3";
+      };
+    }
+    {
+      name = "svg_tags___svg_tags_1.0.0.tgz";
+      path = fetchurl {
+        name = "svg_tags___svg_tags_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz";
+        sha1 = "58f71cee3bd519b59d4b2a843b6c7de64ac04764";
+      };
+    }
+    {
+      name = "svg4everybody___svg4everybody_2.1.9.tgz";
+      path = fetchurl {
+        name = "svg4everybody___svg4everybody_2.1.9.tgz";
+        url  = "https://registry.yarnpkg.com/svg4everybody/-/svg4everybody-2.1.9.tgz";
+        sha1 = "5bd9f6defc133859a044646d4743fabc28db7e2d";
+      };
+    }
+    {
+      name = "symbol_observable___symbol_observable_1.2.0.tgz";
+      path = fetchurl {
+        name = "symbol_observable___symbol_observable_1.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz";
+        sha1 = "c22688aed4eab3cdc2dfeacbb561660560a00804";
+      };
+    }
+    {
+      name = "symbol_tree___symbol_tree_3.2.2.tgz";
+      path = fetchurl {
+        name = "symbol_tree___symbol_tree_3.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz";
+        sha1 = "ae27db38f660a7ae2e1c3b7d1bc290819b8519e6";
+      };
+    }
+    {
+      name = "table___table_5.4.4.tgz";
+      path = fetchurl {
+        name = "table___table_5.4.4.tgz";
+        url  = "https://registry.yarnpkg.com/table/-/table-5.4.4.tgz";
+        sha1 = "6e0f88fdae3692793d1077fd172a4667afe986a6";
+      };
+    }
+    {
+      name = "taffydb___taffydb_2.6.2.tgz";
+      path = fetchurl {
+        name = "taffydb___taffydb_2.6.2.tgz";
+        url  = "https://registry.yarnpkg.com/taffydb/-/taffydb-2.6.2.tgz";
+        sha1 = "7cbcb64b5a141b6a2efc2c5d2c67b4e150b2a268";
+      };
+    }
+    {
+      name = "tapable___tapable_0.1.10.tgz";
+      path = fetchurl {
+        name = "tapable___tapable_0.1.10.tgz";
+        url  = "https://registry.yarnpkg.com/tapable/-/tapable-0.1.10.tgz";
+        sha1 = "29c35707c2b70e50d07482b5d202e8ed446dafd4";
+      };
+    }
+    {
+      name = "tapable___tapable_1.1.0.tgz";
+      path = fetchurl {
+        name = "tapable___tapable_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/tapable/-/tapable-1.1.0.tgz";
+        sha1 = "0d076a172e3d9ba088fd2272b2668fb8d194b78c";
+      };
+    }
+    {
+      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.8.tgz";
+      path = fetchurl {
+        name = "tar___tar_4.4.8.tgz";
+        url  = "https://registry.yarnpkg.com/tar/-/tar-4.4.8.tgz";
+        sha1 = "b19eec3fde2a96e64666df9fdb40c5ca1bc3747d";
+      };
+    }
+    {
+      name = "term_size___term_size_1.2.0.tgz";
+      path = fetchurl {
+        name = "term_size___term_size_1.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/term-size/-/term-size-1.2.0.tgz";
+        sha1 = "458b83887f288fc56d6fffbfad262e26638efa69";
+      };
+    }
+    {
+      name = "terser_webpack_plugin___terser_webpack_plugin_1.2.1.tgz";
+      path = fetchurl {
+        name = "terser_webpack_plugin___terser_webpack_plugin_1.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.2.1.tgz";
+        sha1 = "7545da9ae5f4f9ae6a0ac961eb46f5e7c845cc26";
+      };
+    }
+    {
+      name = "terser___terser_3.14.1.tgz";
+      path = fetchurl {
+        name = "terser___terser_3.14.1.tgz";
+        url  = "https://registry.yarnpkg.com/terser/-/terser-3.14.1.tgz";
+        sha1 = "cc4764014af570bc79c79742358bd46926018a32";
+      };
+    }
+    {
+      name = "terser___terser_4.0.0.tgz";
+      path = fetchurl {
+        name = "terser___terser_4.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/terser/-/terser-4.0.0.tgz";
+        sha1 = "ef356f6f359a963e2cc675517f21c1c382877374";
+      };
+    }
+    {
+      name = "test_exclude___test_exclude_5.0.0.tgz";
+      path = fetchurl {
+        name = "test_exclude___test_exclude_5.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/test-exclude/-/test-exclude-5.0.0.tgz";
+        sha1 = "cdce7cece785e0e829cd5c2b27baf18bc583cfb7";
+      };
+    }
+    {
+      name = "text_table___text_table_0.2.0.tgz";
+      path = fetchurl {
+        name = "text_table___text_table_0.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz";
+        sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4";
+      };
+    }
+    {
+      name = "textextensions___textextensions_2.2.0.tgz";
+      path = fetchurl {
+        name = "textextensions___textextensions_2.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/textextensions/-/textextensions-2.2.0.tgz";
+        sha1 = "38ac676151285b658654581987a0ce1a4490d286";
+      };
+    }
+    {
+      name = "three_orbit_controls___three_orbit_controls_82.1.0.tgz";
+      path = fetchurl {
+        name = "three_orbit_controls___three_orbit_controls_82.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/three-orbit-controls/-/three-orbit-controls-82.1.0.tgz";
+        sha1 = "11a7f33d0a20ecec98f098b37780f6537374fab4";
+      };
+    }
+    {
+      name = "three_stl_loader___three_stl_loader_1.0.4.tgz";
+      path = fetchurl {
+        name = "three_stl_loader___three_stl_loader_1.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/three-stl-loader/-/three-stl-loader-1.0.4.tgz";
+        sha1 = "6b3319a31e3b910aab1883d19b00c81a663c3e03";
+      };
+    }
+    {
+      name = "three___three_0.84.0.tgz";
+      path = fetchurl {
+        name = "three___three_0.84.0.tgz";
+        url  = "https://registry.yarnpkg.com/three/-/three-0.84.0.tgz";
+        sha1 = "95be85a55a0fa002aa625ed559130957dcffd918";
+      };
+    }
+    {
+      name = "throat___throat_4.1.0.tgz";
+      path = fetchurl {
+        name = "throat___throat_4.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/throat/-/throat-4.1.0.tgz";
+        sha1 = "89037cbc92c56ab18926e6ba4cbb200e15672a6a";
+      };
+    }
+    {
+      name = "throttle_debounce___throttle_debounce_2.0.1.tgz";
+      path = fetchurl {
+        name = "throttle_debounce___throttle_debounce_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/throttle-debounce/-/throttle-debounce-2.0.1.tgz";
+        sha1 = "7307ddd6cd9acadb349132fbf6c18d78c88a5e62";
+      };
+    }
+    {
+      name = "through2_filter___through2_filter_3.0.0.tgz";
+      path = fetchurl {
+        name = "through2_filter___through2_filter_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/through2-filter/-/through2-filter-3.0.0.tgz";
+        sha1 = "700e786df2367c2c88cd8aa5be4cf9c1e7831254";
+      };
+    }
+    {
+      name = "through2___through2_2.0.5.tgz";
+      path = fetchurl {
+        name = "through2___through2_2.0.5.tgz";
+        url  = "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz";
+        sha1 = "01c1e39eb31d07cb7d03a96a70823260b23132cd";
+      };
+    }
+    {
+      name = "through___through_2.3.8.tgz";
+      path = fetchurl {
+        name = "through___through_2.3.8.tgz";
+        url  = "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz";
+        sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5";
+      };
+    }
+    {
+      name = "thunky___thunky_0.1.0.tgz";
+      path = fetchurl {
+        name = "thunky___thunky_0.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/thunky/-/thunky-0.1.0.tgz";
+        sha1 = "bf30146824e2b6e67b0f2d7a4ac8beb26908684e";
+      };
+    }
+    {
+      name = "timeago.js___timeago.js_3.0.2.tgz";
+      path = fetchurl {
+        name = "timeago.js___timeago.js_3.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/timeago.js/-/timeago.js-3.0.2.tgz";
+        sha1 = "32a67e7c0d887ea42ca588d3aae26f77de5e76cc";
+      };
+    }
+    {
+      name = "timed_out___timed_out_4.0.1.tgz";
+      path = fetchurl {
+        name = "timed_out___timed_out_4.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz";
+        sha1 = "f32eacac5a175bea25d7fab565ab3ed8741ef56f";
+      };
+    }
+    {
+      name = "timers_browserify___timers_browserify_2.0.10.tgz";
+      path = fetchurl {
+        name = "timers_browserify___timers_browserify_2.0.10.tgz";
+        url  = "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.10.tgz";
+        sha1 = "1d28e3d2aadf1d5a5996c4e9f95601cd053480ae";
+      };
+    }
+    {
+      name = "timezone_mock___timezone_mock_1.0.8.tgz";
+      path = fetchurl {
+        name = "timezone_mock___timezone_mock_1.0.8.tgz";
+        url  = "https://registry.yarnpkg.com/timezone-mock/-/timezone-mock-1.0.8.tgz";
+        sha1 = "1b9f7af13f2bf84b7aa3d3d6e24aa17255b6037d";
+      };
+    }
+    {
+      name = "tiny_emitter___tiny_emitter_2.0.2.tgz";
+      path = fetchurl {
+        name = "tiny_emitter___tiny_emitter_2.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.0.2.tgz";
+        sha1 = "82d27468aca5ade8e5fd1e6d22b57dd43ebdfb7c";
+      };
+    }
+    {
+      name = "tiny_lr___tiny_lr_1.1.1.tgz";
+      path = fetchurl {
+        name = "tiny_lr___tiny_lr_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/tiny-lr/-/tiny-lr-1.1.1.tgz";
+        sha1 = "9fa547412f238fedb068ee295af8b682c98b2aab";
+      };
+    }
+    {
+      name = "tiptap_commands___tiptap_commands_1.4.0.tgz";
+      path = fetchurl {
+        name = "tiptap_commands___tiptap_commands_1.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/tiptap-commands/-/tiptap-commands-1.4.0.tgz";
+        sha1 = "0cfb3ac138ee3099de56114cb119abd841fbcbe7";
+      };
+    }
+    {
+      name = "tiptap_extensions___tiptap_extensions_1.8.0.tgz";
+      path = fetchurl {
+        name = "tiptap_extensions___tiptap_extensions_1.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/tiptap-extensions/-/tiptap-extensions-1.8.0.tgz";
+        sha1 = "3067620a024f1a9e5fae4450790b143d7ebe4394";
+      };
+    }
+    {
+      name = "tiptap_utils___tiptap_utils_1.1.1.tgz";
+      path = fetchurl {
+        name = "tiptap_utils___tiptap_utils_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/tiptap-utils/-/tiptap-utils-1.1.1.tgz";
+        sha1 = "e7aad3e84eb35f7abed704d15da0420029789d0d";
+      };
+    }
+    {
+      name = "tiptap___tiptap_1.8.0.tgz";
+      path = fetchurl {
+        name = "tiptap___tiptap_1.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/tiptap/-/tiptap-1.8.0.tgz";
+        sha1 = "c671188075ffa5ee4f86470f95818fd9ce6f1040";
+      };
+    }
+    {
+      name = "tmp___tmp_0.0.33.tgz";
+      path = fetchurl {
+        name = "tmp___tmp_0.0.33.tgz";
+        url  = "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz";
+        sha1 = "6d34335889768d21b2bcda0aa277ced3b1bfadf9";
+      };
+    }
+    {
+      name = "tmpl___tmpl_1.0.4.tgz";
+      path = fetchurl {
+        name = "tmpl___tmpl_1.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz";
+        sha1 = "23640dd7b42d00433911140820e5cf440e521dd1";
+      };
+    }
+    {
+      name = "to_absolute_glob___to_absolute_glob_2.0.2.tgz";
+      path = fetchurl {
+        name = "to_absolute_glob___to_absolute_glob_2.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz";
+        sha1 = "1865f43d9e74b0822db9f145b78cff7d0f7c849b";
+      };
+    }
+    {
+      name = "to_array___to_array_0.1.4.tgz";
+      path = fetchurl {
+        name = "to_array___to_array_0.1.4.tgz";
+        url  = "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz";
+        sha1 = "17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890";
+      };
+    }
+    {
+      name = "to_arraybuffer___to_arraybuffer_1.0.1.tgz";
+      path = fetchurl {
+        name = "to_arraybuffer___to_arraybuffer_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz";
+        sha1 = "7d229b1fcc637e466ca081180836a7aabff83f43";
+      };
+    }
+    {
+      name = "to_fast_properties___to_fast_properties_2.0.0.tgz";
+      path = fetchurl {
+        name = "to_fast_properties___to_fast_properties_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz";
+        sha1 = "dc5e698cbd079265bc73e0377681a4e4e83f616e";
+      };
+    }
+    {
+      name = "to_object_path___to_object_path_0.3.0.tgz";
+      path = fetchurl {
+        name = "to_object_path___to_object_path_0.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz";
+        sha1 = "297588b7b0e7e0ac08e04e672f85c1f4999e17af";
+      };
+    }
+    {
+      name = "to_regex_range___to_regex_range_2.1.1.tgz";
+      path = fetchurl {
+        name = "to_regex_range___to_regex_range_2.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz";
+        sha1 = "7c80c17b9dfebe599e27367e0d4dd5590141db38";
+      };
+    }
+    {
+      name = "to_regex_range___to_regex_range_5.0.1.tgz";
+      path = fetchurl {
+        name = "to_regex_range___to_regex_range_5.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz";
+        sha1 = "1648c44aae7c8d988a326018ed72f5b4dd0392e4";
+      };
+    }
+    {
+      name = "to_regex___to_regex_3.0.2.tgz";
+      path = fetchurl {
+        name = "to_regex___to_regex_3.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz";
+        sha1 = "13cfdd9b336552f30b51f33a8ae1b42a7a7599ce";
+      };
+    }
+    {
+      name = "to_through___to_through_2.0.0.tgz";
+      path = fetchurl {
+        name = "to_through___to_through_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/to-through/-/to-through-2.0.0.tgz";
+        sha1 = "fc92adaba072647bc0b67d6b03664aa195093af6";
+      };
+    }
+    {
+      name = "toggle_selection___toggle_selection_1.0.6.tgz";
+      path = fetchurl {
+        name = "toggle_selection___toggle_selection_1.0.6.tgz";
+        url  = "https://registry.yarnpkg.com/toggle-selection/-/toggle-selection-1.0.6.tgz";
+        sha1 = "6e45b1263f2017fa0acc7d89d78b15b8bf77da32";
+      };
+    }
+    {
+      name = "touch___touch_3.1.0.tgz";
+      path = fetchurl {
+        name = "touch___touch_3.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/touch/-/touch-3.1.0.tgz";
+        sha1 = "fe365f5f75ec9ed4e56825e0bb76d24ab74af83b";
+      };
+    }
+    {
+      name = "tough_cookie___tough_cookie_2.4.3.tgz";
+      path = fetchurl {
+        name = "tough_cookie___tough_cookie_2.4.3.tgz";
+        url  = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz";
+        sha1 = "53f36da3f47783b0925afa06ff9f3b165280f781";
+      };
+    }
+    {
+      name = "tr46___tr46_1.0.1.tgz";
+      path = fetchurl {
+        name = "tr46___tr46_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz";
+        sha1 = "a8b13fd6bfd2489519674ccde55ba3693b706d09";
+      };
+    }
+    {
+      name = "trim_lines___trim_lines_1.1.2.tgz";
+      path = fetchurl {
+        name = "trim_lines___trim_lines_1.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/trim-lines/-/trim-lines-1.1.2.tgz";
+        sha1 = "c8adbdbdae21bb5c2766240a661f693afe23e59b";
+      };
+    }
+    {
+      name = "trim_newlines___trim_newlines_1.0.0.tgz";
+      path = fetchurl {
+        name = "trim_newlines___trim_newlines_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz";
+        sha1 = "5887966bb582a4503a41eb524f7d35011815a613";
+      };
+    }
+    {
+      name = "trim_newlines___trim_newlines_2.0.0.tgz";
+      path = fetchurl {
+        name = "trim_newlines___trim_newlines_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-2.0.0.tgz";
+        sha1 = "b403d0b91be50c331dfc4b82eeceb22c3de16d20";
+      };
+    }
+    {
+      name = "trim_right___trim_right_1.0.1.tgz";
+      path = fetchurl {
+        name = "trim_right___trim_right_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz";
+        sha1 = "cb2e1203067e0c8de1f614094b9fe45704ea6003";
+      };
+    }
+    {
+      name = "trim_trailing_lines___trim_trailing_lines_1.1.1.tgz";
+      path = fetchurl {
+        name = "trim_trailing_lines___trim_trailing_lines_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/trim-trailing-lines/-/trim-trailing-lines-1.1.1.tgz";
+        sha1 = "e0ec0810fd3c3f1730516b45f49083caaf2774d9";
+      };
+    }
+    {
+      name = "trim___trim_0.0.1.tgz";
+      path = fetchurl {
+        name = "trim___trim_0.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/trim/-/trim-0.0.1.tgz";
+        sha1 = "5858547f6b290757ee95cccc666fb50084c460dd";
+      };
+    }
+    {
+      name = "trough___trough_1.0.3.tgz";
+      path = fetchurl {
+        name = "trough___trough_1.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/trough/-/trough-1.0.3.tgz";
+        sha1 = "e29bd1614c6458d44869fc28b255ab7857ef7c24";
+      };
+    }
+    {
+      name = "true_case_path___true_case_path_1.0.3.tgz";
+      path = fetchurl {
+        name = "true_case_path___true_case_path_1.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/true-case-path/-/true-case-path-1.0.3.tgz";
+        sha1 = "f813b5a8c86b40da59606722b144e3225799f47d";
+      };
+    }
+    {
+      name = "try_catch___try_catch_2.0.0.tgz";
+      path = fetchurl {
+        name = "try_catch___try_catch_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/try-catch/-/try-catch-2.0.0.tgz";
+        sha1 = "a491141d597f8b72b46757fe1c47059341a16aed";
+      };
+    }
+    {
+      name = "try_to_catch___try_to_catch_1.1.1.tgz";
+      path = fetchurl {
+        name = "try_to_catch___try_to_catch_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/try-to-catch/-/try-to-catch-1.1.1.tgz";
+        sha1 = "770162dd13b9a0e55da04db5b7f888956072038a";
+      };
+    }
+    {
+      name = "tryer___tryer_1.0.0.tgz";
+      path = fetchurl {
+        name = "tryer___tryer_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/tryer/-/tryer-1.0.0.tgz";
+        sha1 = "027b69fa823225e551cace3ef03b11f6ab37c1d7";
+      };
+    }
+    {
+      name = "ts_invariant___ts_invariant_0.2.1.tgz";
+      path = fetchurl {
+        name = "ts_invariant___ts_invariant_0.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/ts-invariant/-/ts-invariant-0.2.1.tgz";
+        sha1 = "3d587f9d6e3bded97bf9ec17951dd9814d5a9d3f";
+      };
+    }
+    {
+      name = "ts_invariant___ts_invariant_0.3.2.tgz";
+      path = fetchurl {
+        name = "ts_invariant___ts_invariant_0.3.2.tgz";
+        url  = "https://registry.yarnpkg.com/ts-invariant/-/ts-invariant-0.3.2.tgz";
+        sha1 = "89a2ffeb70879b777258df1df1c59383c35209b0";
+      };
+    }
+    {
+      name = "ts_jest___ts_jest_24.0.0.tgz";
+      path = fetchurl {
+        name = "ts_jest___ts_jest_24.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/ts-jest/-/ts-jest-24.0.0.tgz";
+        sha1 = "3f26bf2ec1fa584863a5a9c29bd8717d549efbf6";
+      };
+    }
+    {
+      name = "tslib___tslib_1.9.3.tgz";
+      path = fetchurl {
+        name = "tslib___tslib_1.9.3.tgz";
+        url  = "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz";
+        sha1 = "d7e4dd79245d85428c4d7e4822a79917954ca286";
+      };
+    }
+    {
+      name = "tty_browserify___tty_browserify_0.0.0.tgz";
+      path = fetchurl {
+        name = "tty_browserify___tty_browserify_0.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz";
+        sha1 = "a157ba402da24e9bf957f9aa69d524eed42901a6";
+      };
+    }
+    {
+      name = "tunnel_agent___tunnel_agent_0.6.0.tgz";
+      path = fetchurl {
+        name = "tunnel_agent___tunnel_agent_0.6.0.tgz";
+        url  = "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz";
+        sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd";
+      };
+    }
+    {
+      name = "tweetnacl___tweetnacl_0.14.5.tgz";
+      path = fetchurl {
+        name = "tweetnacl___tweetnacl_0.14.5.tgz";
+        url  = "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz";
+        sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64";
+      };
+    }
+    {
+      name = "type_check___type_check_0.3.2.tgz";
+      path = fetchurl {
+        name = "type_check___type_check_0.3.2.tgz";
+        url  = "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz";
+        sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72";
+      };
+    }
+    {
+      name = "type_is___type_is_1.6.16.tgz";
+      path = fetchurl {
+        name = "type_is___type_is_1.6.16.tgz";
+        url  = "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz";
+        sha1 = "f89ce341541c672b25ee7ae3c73dee3b2be50194";
+      };
+    }
+    {
+      name = "typedarray___typedarray_0.0.6.tgz";
+      path = fetchurl {
+        name = "typedarray___typedarray_0.0.6.tgz";
+        url  = "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz";
+        sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777";
+      };
+    }
+    {
+      name = "typescript___typescript_3.3.4000.tgz";
+      path = fetchurl {
+        name = "typescript___typescript_3.3.4000.tgz";
+        url  = "https://registry.yarnpkg.com/typescript/-/typescript-3.3.4000.tgz";
+        sha1 = "76b0f89cfdbf97827e1112d64f283f1151d6adf0";
+      };
+    }
+    {
+      name = "uc.micro___uc.micro_1.0.5.tgz";
+      path = fetchurl {
+        name = "uc.micro___uc.micro_1.0.5.tgz";
+        url  = "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.5.tgz";
+        sha1 = "0c65f15f815aa08b560a61ce8b4db7ffc3f45376";
+      };
+    }
+    {
+      name = "uglify_js___uglify_js_3.6.0.tgz";
+      path = fetchurl {
+        name = "uglify_js___uglify_js_3.6.0.tgz";
+        url  = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.6.0.tgz";
+        sha1 = "704681345c53a8b2079fb6cec294b05ead242ff5";
+      };
+    }
+    {
+      name = "ultron___ultron_1.1.1.tgz";
+      path = fetchurl {
+        name = "ultron___ultron_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz";
+        sha1 = "9fe1536a10a664a65266a1e3ccf85fd36302bc9c";
+      };
+    }
+    {
+      name = "unc_path_regex___unc_path_regex_0.1.2.tgz";
+      path = fetchurl {
+        name = "unc_path_regex___unc_path_regex_0.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz";
+        sha1 = "e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa";
+      };
+    }
+    {
+      name = "undefsafe___undefsafe_2.0.2.tgz";
+      path = fetchurl {
+        name = "undefsafe___undefsafe_2.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/undefsafe/-/undefsafe-2.0.2.tgz";
+        sha1 = "225f6b9e0337663e0d8e7cfd686fc2836ccace76";
+      };
+    }
+    {
+      name = "underscore_contrib___underscore_contrib_0.3.0.tgz";
+      path = fetchurl {
+        name = "underscore_contrib___underscore_contrib_0.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/underscore-contrib/-/underscore-contrib-0.3.0.tgz";
+        sha1 = "665b66c24783f8fa2b18c9f8cbb0e2c7d48c26c7";
+      };
+    }
+    {
+      name = "underscore___underscore_1.6.0.tgz";
+      path = fetchurl {
+        name = "underscore___underscore_1.6.0.tgz";
+        url  = "https://registry.yarnpkg.com/underscore/-/underscore-1.6.0.tgz";
+        sha1 = "8b38b10cacdef63337b8b24e4ff86d45aea529a8";
+      };
+    }
+    {
+      name = "underscore___underscore_1.9.0.tgz";
+      path = fetchurl {
+        name = "underscore___underscore_1.9.0.tgz";
+        url  = "https://registry.yarnpkg.com/underscore/-/underscore-1.9.0.tgz";
+        sha1 = "31dbb314cfcc88f169cd3692d9149d81a00a73e4";
+      };
+    }
+    {
+      name = "underscore___underscore_1.8.3.tgz";
+      path = fetchurl {
+        name = "underscore___underscore_1.8.3.tgz";
+        url  = "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz";
+        sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022";
+      };
+    }
+    {
+      name = "unherit___unherit_1.1.1.tgz";
+      path = fetchurl {
+        name = "unherit___unherit_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/unherit/-/unherit-1.1.1.tgz";
+        sha1 = "132748da3e88eab767e08fabfbb89c5e9d28628c";
+      };
+    }
+    {
+      name = "unicode_canonical_property_names_ecmascript___unicode_canonical_property_names_ecmascript_1.0.4.tgz";
+      path = fetchurl {
+        name = "unicode_canonical_property_names_ecmascript___unicode_canonical_property_names_ecmascript_1.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz";
+        sha1 = "2619800c4c825800efdd8343af7dd9933cbe2818";
+      };
+    }
+    {
+      name = "unicode_match_property_ecmascript___unicode_match_property_ecmascript_1.0.4.tgz";
+      path = fetchurl {
+        name = "unicode_match_property_ecmascript___unicode_match_property_ecmascript_1.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz";
+        sha1 = "8ed2a32569961bce9227d09cd3ffbb8fed5f020c";
+      };
+    }
+    {
+      name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_1.1.0.tgz";
+      path = fetchurl {
+        name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz";
+        sha1 = "5b4b426e08d13a80365e0d657ac7a6c1ec46a277";
+      };
+    }
+    {
+      name = "unicode_property_aliases_ecmascript___unicode_property_aliases_ecmascript_1.0.4.tgz";
+      path = fetchurl {
+        name = "unicode_property_aliases_ecmascript___unicode_property_aliases_ecmascript_1.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.4.tgz";
+        sha1 = "5a533f31b4317ea76f17d807fa0d116546111dd0";
+      };
+    }
+    {
+      name = "unified___unified_6.2.0.tgz";
+      path = fetchurl {
+        name = "unified___unified_6.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/unified/-/unified-6.2.0.tgz";
+        sha1 = "7fbd630f719126d67d40c644b7e3f617035f6dba";
+      };
+    }
+    {
+      name = "unified___unified_7.1.0.tgz";
+      path = fetchurl {
+        name = "unified___unified_7.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/unified/-/unified-7.1.0.tgz";
+        sha1 = "5032f1c1ee3364bd09da12e27fdd4a7553c7be13";
+      };
+    }
+    {
+      name = "union_value___union_value_1.0.0.tgz";
+      path = fetchurl {
+        name = "union_value___union_value_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz";
+        sha1 = "5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4";
+      };
+    }
+    {
+      name = "uniq___uniq_1.0.1.tgz";
+      path = fetchurl {
+        name = "uniq___uniq_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz";
+        sha1 = "b31c5ae8254844a3a8281541ce2b04b865a734ff";
+      };
+    }
+    {
+      name = "unique_filename___unique_filename_1.1.1.tgz";
+      path = fetchurl {
+        name = "unique_filename___unique_filename_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz";
+        sha1 = "1d69769369ada0583103a1e6ae87681b56573230";
+      };
+    }
+    {
+      name = "unique_slug___unique_slug_2.0.0.tgz";
+      path = fetchurl {
+        name = "unique_slug___unique_slug_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.0.tgz";
+        sha1 = "db6676e7c7cc0629878ff196097c78855ae9f4ab";
+      };
+    }
+    {
+      name = "unique_stream___unique_stream_2.3.1.tgz";
+      path = fetchurl {
+        name = "unique_stream___unique_stream_2.3.1.tgz";
+        url  = "https://registry.yarnpkg.com/unique-stream/-/unique-stream-2.3.1.tgz";
+        sha1 = "c65d110e9a4adf9a6c5948b28053d9a8d04cbeac";
+      };
+    }
+    {
+      name = "unique_string___unique_string_1.0.0.tgz";
+      path = fetchurl {
+        name = "unique_string___unique_string_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/unique-string/-/unique-string-1.0.0.tgz";
+        sha1 = "9e1057cca851abb93398f8b33ae187b99caec11a";
+      };
+    }
+    {
+      name = "unist_builder___unist_builder_1.0.4.tgz";
+      path = fetchurl {
+        name = "unist_builder___unist_builder_1.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/unist-builder/-/unist-builder-1.0.4.tgz";
+        sha1 = "e1808aed30bd72adc3607f25afecebef4dd59e17";
+      };
+    }
+    {
+      name = "unist_util_find_all_after___unist_util_find_all_after_1.0.2.tgz";
+      path = fetchurl {
+        name = "unist_util_find_all_after___unist_util_find_all_after_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/unist-util-find-all-after/-/unist-util-find-all-after-1.0.2.tgz";
+        sha1 = "9be49cfbae5ca1566b27536670a92836bf2f8d6d";
+      };
+    }
+    {
+      name = "unist_util_generated___unist_util_generated_1.1.4.tgz";
+      path = fetchurl {
+        name = "unist_util_generated___unist_util_generated_1.1.4.tgz";
+        url  = "https://registry.yarnpkg.com/unist-util-generated/-/unist-util-generated-1.1.4.tgz";
+        sha1 = "2261c033d9fc23fae41872cdb7663746e972c1a7";
+      };
+    }
+    {
+      name = "unist_util_is___unist_util_is_2.1.2.tgz";
+      path = fetchurl {
+        name = "unist_util_is___unist_util_is_2.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-2.1.2.tgz";
+        sha1 = "1193fa8f2bfbbb82150633f3a8d2eb9a1c1d55db";
+      };
+    }
+    {
+      name = "unist_util_position___unist_util_position_3.0.3.tgz";
+      path = fetchurl {
+        name = "unist_util_position___unist_util_position_3.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/unist-util-position/-/unist-util-position-3.0.3.tgz";
+        sha1 = "fff942b879538b242096c148153826664b1ca373";
+      };
+    }
+    {
+      name = "unist_util_remove_position___unist_util_remove_position_1.1.2.tgz";
+      path = fetchurl {
+        name = "unist_util_remove_position___unist_util_remove_position_1.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/unist-util-remove-position/-/unist-util-remove-position-1.1.2.tgz";
+        sha1 = "86b5dad104d0bbfbeb1db5f5c92f3570575c12cb";
+      };
+    }
+    {
+      name = "unist_util_stringify_position___unist_util_stringify_position_1.1.2.tgz";
+      path = fetchurl {
+        name = "unist_util_stringify_position___unist_util_stringify_position_1.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-1.1.2.tgz";
+        sha1 = "3f37fcf351279dcbca7480ab5889bb8a832ee1c6";
+      };
+    }
+    {
+      name = "unist_util_stringify_position___unist_util_stringify_position_2.0.1.tgz";
+      path = fetchurl {
+        name = "unist_util_stringify_position___unist_util_stringify_position_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-2.0.1.tgz";
+        sha1 = "de2a2bc8d3febfa606652673a91455b6a36fb9f3";
+      };
+    }
+    {
+      name = "unist_util_visit_parents___unist_util_visit_parents_2.0.1.tgz";
+      path = fetchurl {
+        name = "unist_util_visit_parents___unist_util_visit_parents_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-2.0.1.tgz";
+        sha1 = "63fffc8929027bee04bfef7d2cce474f71cb6217";
+      };
+    }
+    {
+      name = "unist_util_visit___unist_util_visit_1.4.1.tgz";
+      path = fetchurl {
+        name = "unist_util_visit___unist_util_visit_1.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-1.4.1.tgz";
+        sha1 = "4724aaa8486e6ee6e26d7ff3c8685960d560b1e3";
+      };
+    }
+    {
+      name = "universalify___universalify_0.1.2.tgz";
+      path = fetchurl {
+        name = "universalify___universalify_0.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz";
+        sha1 = "b646f69be3942dabcecc9d6639c80dc105efaa66";
+      };
+    }
+    {
+      name = "unpipe___unpipe_1.0.0.tgz";
+      path = fetchurl {
+        name = "unpipe___unpipe_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz";
+        sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec";
+      };
+    }
+    {
+      name = "unset_value___unset_value_1.0.0.tgz";
+      path = fetchurl {
+        name = "unset_value___unset_value_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz";
+        sha1 = "8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559";
+      };
+    }
+    {
+      name = "unzip_response___unzip_response_2.0.1.tgz";
+      path = fetchurl {
+        name = "unzip_response___unzip_response_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz";
+        sha1 = "d2f0f737d16b0615e72a6935ed04214572d56f97";
+      };
+    }
+    {
+      name = "upath___upath_1.1.0.tgz";
+      path = fetchurl {
+        name = "upath___upath_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz";
+        sha1 = "35256597e46a581db4793d0ce47fa9aebfc9fabd";
+      };
+    }
+    {
+      name = "update_notifier___update_notifier_2.5.0.tgz";
+      path = fetchurl {
+        name = "update_notifier___update_notifier_2.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.5.0.tgz";
+        sha1 = "d0744593e13f161e406acb1d9408b72cad08aff6";
+      };
+    }
+    {
+      name = "upper_case___upper_case_1.1.3.tgz";
+      path = fetchurl {
+        name = "upper_case___upper_case_1.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz";
+        sha1 = "f6b4501c2ec4cdd26ba78be7222961de77621598";
+      };
+    }
+    {
+      name = "uri_js___uri_js_4.2.2.tgz";
+      path = fetchurl {
+        name = "uri_js___uri_js_4.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz";
+        sha1 = "94c540e1ff772956e2299507c010aea6c8838eb0";
+      };
+    }
+    {
+      name = "urix___urix_0.1.0.tgz";
+      path = fetchurl {
+        name = "urix___urix_0.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz";
+        sha1 = "da937f7a62e21fec1fd18d49b35c2935067a6c72";
+      };
+    }
+    {
+      name = "url_loader___url_loader_1.1.2.tgz";
+      path = fetchurl {
+        name = "url_loader___url_loader_1.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/url-loader/-/url-loader-1.1.2.tgz";
+        sha1 = "b971d191b83af693c5e3fea4064be9e1f2d7f8d8";
+      };
+    }
+    {
+      name = "url_parse_lax___url_parse_lax_1.0.0.tgz";
+      path = fetchurl {
+        name = "url_parse_lax___url_parse_lax_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz";
+        sha1 = "7af8f303645e9bd79a272e7a14ac68bc0609da73";
+      };
+    }
+    {
+      name = "url_parse_lax___url_parse_lax_3.0.0.tgz";
+      path = fetchurl {
+        name = "url_parse_lax___url_parse_lax_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz";
+        sha1 = "16b5cafc07dbe3676c1b1999177823d6503acb0c";
+      };
+    }
+    {
+      name = "url_parse___url_parse_1.4.4.tgz";
+      path = fetchurl {
+        name = "url_parse___url_parse_1.4.4.tgz";
+        url  = "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.4.tgz";
+        sha1 = "cac1556e95faa0303691fec5cf9d5a1bc34648f8";
+      };
+    }
+    {
+      name = "url_search_params_polyfill___url_search_params_polyfill_5.0.0.tgz";
+      path = fetchurl {
+        name = "url_search_params_polyfill___url_search_params_polyfill_5.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/url-search-params-polyfill/-/url-search-params-polyfill-5.0.0.tgz";
+        sha1 = "09b98337c89dcf6c6a6a0bfeb096f6ba83b7526b";
+      };
+    }
+    {
+      name = "url_to_options___url_to_options_1.0.1.tgz";
+      path = fetchurl {
+        name = "url_to_options___url_to_options_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/url-to-options/-/url-to-options-1.0.1.tgz";
+        sha1 = "1505a03a289a48cbd7a434efbaeec5055f5633a9";
+      };
+    }
+    {
+      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 = "url___url_0.11.0.tgz";
+      path = fetchurl {
+        name = "url___url_0.11.0.tgz";
+        url  = "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz";
+        sha1 = "3838e97cfc60521eb73c525a8e55bfdd9e2e28f1";
+      };
+    }
+    {
+      name = "use___use_3.1.1.tgz";
+      path = fetchurl {
+        name = "use___use_3.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz";
+        sha1 = "d50c8cac79a19fbc20f2911f56eb973f4e10070f";
+      };
+    }
+    {
+      name = "useragent___useragent_2.3.0.tgz";
+      path = fetchurl {
+        name = "useragent___useragent_2.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/useragent/-/useragent-2.3.0.tgz";
+        sha1 = "217f943ad540cb2128658ab23fc960f6a88c9972";
+      };
+    }
+    {
+      name = "util_deprecate___util_deprecate_1.0.2.tgz";
+      path = fetchurl {
+        name = "util_deprecate___util_deprecate_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz";
+        sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf";
+      };
+    }
+    {
+      name = "util.promisify___util.promisify_1.0.0.tgz";
+      path = fetchurl {
+        name = "util.promisify___util.promisify_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.0.tgz";
+        sha1 = "440f7165a459c9a16dc145eb8e72f35687097030";
+      };
+    }
+    {
+      name = "util___util_0.10.3.tgz";
+      path = fetchurl {
+        name = "util___util_0.10.3.tgz";
+        url  = "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz";
+        sha1 = "7afb1afe50805246489e3db7fe0ed379336ac0f9";
+      };
+    }
+    {
+      name = "utils_merge___utils_merge_1.0.1.tgz";
+      path = fetchurl {
+        name = "utils_merge___utils_merge_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz";
+        sha1 = "9f95710f50a267947b2ccc124741c1028427e713";
+      };
+    }
+    {
+      name = "uuid___uuid_3.3.2.tgz";
+      path = fetchurl {
+        name = "uuid___uuid_3.3.2.tgz";
+        url  = "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz";
+        sha1 = "1b4af4955eb3077c501c23872fc6513811587131";
+      };
+    }
+    {
+      name = "v8_compile_cache___v8_compile_cache_2.0.2.tgz";
+      path = fetchurl {
+        name = "v8_compile_cache___v8_compile_cache_2.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.2.tgz";
+        sha1 = "a428b28bb26790734c4fc8bc9fa106fccebf6a6c";
+      };
+    }
+    {
+      name = "validate_npm_package_license___validate_npm_package_license_3.0.1.tgz";
+      path = fetchurl {
+        name = "validate_npm_package_license___validate_npm_package_license_3.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz";
+        sha1 = "2804babe712ad3379459acfbe24746ab2c303fbc";
+      };
+    }
+    {
+      name = "value_or_function___value_or_function_3.0.0.tgz";
+      path = fetchurl {
+        name = "value_or_function___value_or_function_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/value-or-function/-/value-or-function-3.0.0.tgz";
+        sha1 = "1c243a50b595c1be54a754bfece8563b9ff8d813";
+      };
+    }
+    {
+      name = "vary___vary_1.1.2.tgz";
+      path = fetchurl {
+        name = "vary___vary_1.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz";
+        sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc";
+      };
+    }
+    {
+      name = "verror___verror_1.10.0.tgz";
+      path = fetchurl {
+        name = "verror___verror_1.10.0.tgz";
+        url  = "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz";
+        sha1 = "3a105ca17053af55d6e270c1f8288682e18da400";
+      };
+    }
+    {
+      name = "vfile_location___vfile_location_2.0.4.tgz";
+      path = fetchurl {
+        name = "vfile_location___vfile_location_2.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/vfile-location/-/vfile-location-2.0.4.tgz";
+        sha1 = "2a5e7297dd0d9e2da4381464d04acc6b834d3e55";
+      };
+    }
+    {
+      name = "vfile_message___vfile_message_1.1.1.tgz";
+      path = fetchurl {
+        name = "vfile_message___vfile_message_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/vfile-message/-/vfile-message-1.1.1.tgz";
+        sha1 = "5833ae078a1dfa2d96e9647886cd32993ab313e1";
+      };
+    }
+    {
+      name = "vfile_message___vfile_message_2.0.1.tgz";
+      path = fetchurl {
+        name = "vfile_message___vfile_message_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/vfile-message/-/vfile-message-2.0.1.tgz";
+        sha1 = "951881861c22fc1eb39f873c0b93e336a64e8f6d";
+      };
+    }
+    {
+      name = "vfile_reporter___vfile_reporter_6.0.0.tgz";
+      path = fetchurl {
+        name = "vfile_reporter___vfile_reporter_6.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/vfile-reporter/-/vfile-reporter-6.0.0.tgz";
+        sha1 = "753119f51dec9289b7508b457afc0cddf5e07f2e";
+      };
+    }
+    {
+      name = "vfile_sort___vfile_sort_2.2.1.tgz";
+      path = fetchurl {
+        name = "vfile_sort___vfile_sort_2.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/vfile-sort/-/vfile-sort-2.2.1.tgz";
+        sha1 = "74e714f9175618cdae96bcaedf1a3dc711d87567";
+      };
+    }
+    {
+      name = "vfile_statistics___vfile_statistics_1.1.3.tgz";
+      path = fetchurl {
+        name = "vfile_statistics___vfile_statistics_1.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/vfile-statistics/-/vfile-statistics-1.1.3.tgz";
+        sha1 = "e9c87071997fbcb4243764d2c3805e0bb0820c60";
+      };
+    }
+    {
+      name = "vfile___vfile_2.3.0.tgz";
+      path = fetchurl {
+        name = "vfile___vfile_2.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/vfile/-/vfile-2.3.0.tgz";
+        sha1 = "e62d8e72b20e83c324bc6c67278ee272488bf84a";
+      };
+    }
+    {
+      name = "vfile___vfile_3.0.1.tgz";
+      path = fetchurl {
+        name = "vfile___vfile_3.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/vfile/-/vfile-3.0.1.tgz";
+        sha1 = "47331d2abe3282424f4a4bb6acd20a44c4121803";
+      };
+    }
+    {
+      name = "vfile___vfile_4.0.1.tgz";
+      path = fetchurl {
+        name = "vfile___vfile_4.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/vfile/-/vfile-4.0.1.tgz";
+        sha1 = "fc3d43a1c71916034216bf65926d5ee3c64ed60c";
+      };
+    }
+    {
+      name = "vinyl_fs___vinyl_fs_3.0.3.tgz";
+      path = fetchurl {
+        name = "vinyl_fs___vinyl_fs_3.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-3.0.3.tgz";
+        sha1 = "c85849405f67428feabbbd5c5dbdd64f47d31bc7";
+      };
+    }
+    {
+      name = "vinyl_sourcemap___vinyl_sourcemap_1.1.0.tgz";
+      path = fetchurl {
+        name = "vinyl_sourcemap___vinyl_sourcemap_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz";
+        sha1 = "92a800593a38703a8cdb11d8b300ad4be63b3e16";
+      };
+    }
+    {
+      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 = "visibilityjs___visibilityjs_1.2.4.tgz";
+      path = fetchurl {
+        name = "visibilityjs___visibilityjs_1.2.4.tgz";
+        url  = "https://registry.yarnpkg.com/visibilityjs/-/visibilityjs-1.2.4.tgz";
+        sha1 = "bff8663da62c8c10ad4ee5ae6a1ae6fac4259d63";
+      };
+    }
+    {
+      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";
+        url  = "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz";
+        sha1 = "c066afb582bb1cb4128d60ea92392e94d5e9dbec";
+      };
+    }
+    {
+      name = "vue_apollo___vue_apollo_3.0.0_beta.28.tgz";
+      path = fetchurl {
+        name = "vue_apollo___vue_apollo_3.0.0_beta.28.tgz";
+        url  = "https://registry.yarnpkg.com/vue-apollo/-/vue-apollo-3.0.0-beta.28.tgz";
+        sha1 = "be6a3a1504be2096cbfb23996537e2fc95c8c239";
+      };
+    }
+    {
+      name = "vue_eslint_parser___vue_eslint_parser_4.0.3.tgz";
+      path = fetchurl {
+        name = "vue_eslint_parser___vue_eslint_parser_4.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-4.0.3.tgz";
+        sha1 = "80cf162e484387b2640371ad21ba1f86e0c10a61";
+      };
+    }
+    {
+      name = "vue_eslint_parser___vue_eslint_parser_6.0.4.tgz";
+      path = fetchurl {
+        name = "vue_eslint_parser___vue_eslint_parser_6.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-6.0.4.tgz";
+        sha1 = "56ff47e2c2644bff39951d5a284982c7ecd6f7fa";
+      };
+    }
+    {
+      name = "vue_functional_data_merge___vue_functional_data_merge_3.1.0.tgz";
+      path = fetchurl {
+        name = "vue_functional_data_merge___vue_functional_data_merge_3.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/vue-functional-data-merge/-/vue-functional-data-merge-3.1.0.tgz";
+        sha1 = "08a7797583b7f35680587f8a1d51d729aa1dc657";
+      };
+    }
+    {
+      name = "vue_hot_reload_api___vue_hot_reload_api_2.3.0.tgz";
+      path = fetchurl {
+        name = "vue_hot_reload_api___vue_hot_reload_api_2.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.0.tgz";
+        sha1 = "97976142405d13d8efae154749e88c4e358cf926";
+      };
+    }
+    {
+      name = "vue_jest___vue_jest_4.0.0_beta.2.tgz";
+      path = fetchurl {
+        name = "vue_jest___vue_jest_4.0.0_beta.2.tgz";
+        url  = "https://registry.yarnpkg.com/vue-jest/-/vue-jest-4.0.0-beta.2.tgz";
+        sha1 = "f2120ea9d24224aad3a100c2010b0760d47ee6fe";
+      };
+    }
+    {
+      name = "vue_loader___vue_loader_15.7.0.tgz";
+      path = fetchurl {
+        name = "vue_loader___vue_loader_15.7.0.tgz";
+        url  = "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.7.0.tgz";
+        sha1 = "27275aa5a3ef4958c5379c006dd1436ad04b25b3";
+      };
+    }
+    {
+      name = "vue_resource___vue_resource_1.5.1.tgz";
+      path = fetchurl {
+        name = "vue_resource___vue_resource_1.5.1.tgz";
+        url  = "https://registry.yarnpkg.com/vue-resource/-/vue-resource-1.5.1.tgz";
+        sha1 = "0f3d685e3254d21800bebd966edcf56c34b3b6e4";
+      };
+    }
+    {
+      name = "vue_router___vue_router_3.0.2.tgz";
+      path = fetchurl {
+        name = "vue_router___vue_router_3.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/vue-router/-/vue-router-3.0.2.tgz";
+        sha1 = "dedc67afe6c4e2bc25682c8b1c2a8c0d7c7e56be";
+      };
+    }
+    {
+      name = "vue_style_loader___vue_style_loader_4.1.0.tgz";
+      path = fetchurl {
+        name = "vue_style_loader___vue_style_loader_4.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-4.1.0.tgz";
+        sha1 = "7588bd778e2c9f8d87bfc3c5a4a039638da7a863";
+      };
+    }
+    {
+      name = "vue_template_compiler___vue_template_compiler_2.6.10.tgz";
+      path = fetchurl {
+        name = "vue_template_compiler___vue_template_compiler_2.6.10.tgz";
+        url  = "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.10.tgz";
+        sha1 = "323b4f3495f04faa3503337a82f5d6507799c9cc";
+      };
+    }
+    {
+      name = "vue_template_es2015_compiler___vue_template_es2015_compiler_1.9.1.tgz";
+      path = fetchurl {
+        name = "vue_template_es2015_compiler___vue_template_es2015_compiler_1.9.1.tgz";
+        url  = "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz";
+        sha1 = "1ee3bc9a16ecbf5118be334bb15f9c46f82f5825";
+      };
+    }
+    {
+      name = "vue_virtual_scroll_list___vue_virtual_scroll_list_1.3.1.tgz";
+      path = fetchurl {
+        name = "vue_virtual_scroll_list___vue_virtual_scroll_list_1.3.1.tgz";
+        url  = "https://registry.yarnpkg.com/vue-virtual-scroll-list/-/vue-virtual-scroll-list-1.3.1.tgz";
+        sha1 = "efcb83d3a3dcc69cd886fa4de1130a65493e8f76";
+      };
+    }
+    {
+      name = "vue___vue_2.6.10.tgz";
+      path = fetchurl {
+        name = "vue___vue_2.6.10.tgz";
+        url  = "https://registry.yarnpkg.com/vue/-/vue-2.6.10.tgz";
+        sha1 = "a72b1a42a4d82a721ea438d1b6bf55e66195c637";
+      };
+    }
+    {
+      name = "vuedraggable___vuedraggable_2.23.0.tgz";
+      path = fetchurl {
+        name = "vuedraggable___vuedraggable_2.23.0.tgz";
+        url  = "https://registry.yarnpkg.com/vuedraggable/-/vuedraggable-2.23.0.tgz";
+        sha1 = "1f4a5a601675a5dbf0d96ee61aebfffa43445262";
+      };
+    }
+    {
+      name = "vuex___vuex_3.1.0.tgz";
+      path = fetchurl {
+        name = "vuex___vuex_3.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/vuex/-/vuex-3.1.0.tgz";
+        sha1 = "634b81515cf0cfe976bd1ffe9601755e51f843b9";
+      };
+    }
+    {
+      name = "w3c_hr_time___w3c_hr_time_1.0.1.tgz";
+      path = fetchurl {
+        name = "w3c_hr_time___w3c_hr_time_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz";
+        sha1 = "82ac2bff63d950ea9e3189a58a65625fedf19045";
+      };
+    }
+    {
+      name = "w3c_keyname___w3c_keyname_1.1.8.tgz";
+      path = fetchurl {
+        name = "w3c_keyname___w3c_keyname_1.1.8.tgz";
+        url  = "https://registry.yarnpkg.com/w3c-keyname/-/w3c-keyname-1.1.8.tgz";
+        sha1 = "4e2219663760fd6535b7a1550f1552d71fc9372c";
+      };
+    }
+    {
+      name = "walker___walker_1.0.7.tgz";
+      path = fetchurl {
+        name = "walker___walker_1.0.7.tgz";
+        url  = "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz";
+        sha1 = "2f7f9b8fd10d677262b18a884e28d19618e028fb";
+      };
+    }
+    {
+      name = "watchpack___watchpack_1.5.0.tgz";
+      path = fetchurl {
+        name = "watchpack___watchpack_1.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/watchpack/-/watchpack-1.5.0.tgz";
+        sha1 = "231e783af830a22f8966f65c4c4bacc814072eed";
+      };
+    }
+    {
+      name = "wbuf___wbuf_1.7.3.tgz";
+      path = fetchurl {
+        name = "wbuf___wbuf_1.7.3.tgz";
+        url  = "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz";
+        sha1 = "c1d8d149316d3ea852848895cb6a0bfe887b87df";
+      };
+    }
+    {
+      name = "webidl_conversions___webidl_conversions_4.0.2.tgz";
+      path = fetchurl {
+        name = "webidl_conversions___webidl_conversions_4.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz";
+        sha1 = "a855980b1f0b6b359ba1d5d9fb39ae941faa63ad";
+      };
+    }
+    {
+      name = "webpack_bundle_analyzer___webpack_bundle_analyzer_3.3.2.tgz";
+      path = fetchurl {
+        name = "webpack_bundle_analyzer___webpack_bundle_analyzer_3.3.2.tgz";
+        url  = "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.3.2.tgz";
+        sha1 = "3da733a900f515914e729fcebcd4c40dde71fc6f";
+      };
+    }
+    {
+      name = "webpack_cli___webpack_cli_3.2.1.tgz";
+      path = fetchurl {
+        name = "webpack_cli___webpack_cli_3.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.2.1.tgz";
+        sha1 = "779c696c82482491f0803907508db2e276ed3b61";
+      };
+    }
+    {
+      name = "webpack_dev_middleware___webpack_dev_middleware_3.4.0.tgz";
+      path = fetchurl {
+        name = "webpack_dev_middleware___webpack_dev_middleware_3.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.4.0.tgz";
+        sha1 = "1132fecc9026fd90f0ecedac5cbff75d1fb45890";
+      };
+    }
+    {
+      name = "webpack_dev_middleware___webpack_dev_middleware_3.7.0.tgz";
+      path = fetchurl {
+        name = "webpack_dev_middleware___webpack_dev_middleware_3.7.0.tgz";
+        url  = "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.0.tgz";
+        sha1 = "ef751d25f4e9a5c8a35da600c5fda3582b5c6cff";
+      };
+    }
+    {
+      name = "webpack_dev_server___webpack_dev_server_3.1.14.tgz";
+      path = fetchurl {
+        name = "webpack_dev_server___webpack_dev_server_3.1.14.tgz";
+        url  = "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.1.14.tgz";
+        sha1 = "60fb229b997fc5a0a1fc6237421030180959d469";
+      };
+    }
+    {
+      name = "webpack_log___webpack_log_2.0.0.tgz";
+      path = fetchurl {
+        name = "webpack_log___webpack_log_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/webpack-log/-/webpack-log-2.0.0.tgz";
+        sha1 = "5b7928e0637593f119d32f6227c1e0ac31e1b47f";
+      };
+    }
+    {
+      name = "webpack_sources___webpack_sources_1.3.0.tgz";
+      path = fetchurl {
+        name = "webpack_sources___webpack_sources_1.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.3.0.tgz";
+        sha1 = "2a28dcb9f1f45fe960d8f1493252b5ee6530fa85";
+      };
+    }
+    {
+      name = "webpack_stats_plugin___webpack_stats_plugin_0.2.1.tgz";
+      path = fetchurl {
+        name = "webpack_stats_plugin___webpack_stats_plugin_0.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/webpack-stats-plugin/-/webpack-stats-plugin-0.2.1.tgz";
+        sha1 = "1f5bac13fc25d62cbb5fd0ff646757dc802b8595";
+      };
+    }
+    {
+      name = "webpack___webpack_4.29.0.tgz";
+      path = fetchurl {
+        name = "webpack___webpack_4.29.0.tgz";
+        url  = "https://registry.yarnpkg.com/webpack/-/webpack-4.29.0.tgz";
+        sha1 = "f2cfef83f7ae404ba889ff5d43efd285ca26e750";
+      };
+    }
+    {
+      name = "websocket_driver___websocket_driver_0.6.5.tgz";
+      path = fetchurl {
+        name = "websocket_driver___websocket_driver_0.6.5.tgz";
+        url  = "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.6.5.tgz";
+        sha1 = "5cb2556ceb85f4373c6d8238aa691c8454e13a36";
+      };
+    }
+    {
+      name = "websocket_extensions___websocket_extensions_0.1.1.tgz";
+      path = fetchurl {
+        name = "websocket_extensions___websocket_extensions_0.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.1.tgz";
+        sha1 = "76899499c184b6ef754377c2dbb0cd6cb55d29e7";
+      };
+    }
+    {
+      name = "whatwg_encoding___whatwg_encoding_1.0.5.tgz";
+      path = fetchurl {
+        name = "whatwg_encoding___whatwg_encoding_1.0.5.tgz";
+        url  = "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz";
+        sha1 = "5abacf777c32166a51d085d6b4f3e7d27113ddb0";
+      };
+    }
+    {
+      name = "whatwg_mimetype___whatwg_mimetype_2.3.0.tgz";
+      path = fetchurl {
+        name = "whatwg_mimetype___whatwg_mimetype_2.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz";
+        sha1 = "3d4b1e0312d2079879f826aff18dbeeca5960fbf";
+      };
+    }
+    {
+      name = "whatwg_url___whatwg_url_6.5.0.tgz";
+      path = fetchurl {
+        name = "whatwg_url___whatwg_url_6.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-6.5.0.tgz";
+        sha1 = "f2df02bff176fd65070df74ad5ccbb5a199965a8";
+      };
+    }
+    {
+      name = "whatwg_url___whatwg_url_7.0.0.tgz";
+      path = fetchurl {
+        name = "whatwg_url___whatwg_url_7.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.0.0.tgz";
+        sha1 = "fde926fa54a599f3adf82dff25a9f7be02dc6edd";
+      };
+    }
+    {
+      name = "which_module___which_module_1.0.0.tgz";
+      path = fetchurl {
+        name = "which_module___which_module_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz";
+        sha1 = "bba63ca861948994ff307736089e3b96026c2a4f";
+      };
+    }
+    {
+      name = "which_module___which_module_2.0.0.tgz";
+      path = fetchurl {
+        name = "which_module___which_module_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz";
+        sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a";
+      };
+    }
+    {
+      name = "which___which_1.3.1.tgz";
+      path = fetchurl {
+        name = "which___which_1.3.1.tgz";
+        url  = "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz";
+        sha1 = "a45043d54f5805316da8d62f9f50918d3da70b0a";
+      };
+    }
+    {
+      name = "wide_align___wide_align_1.1.3.tgz";
+      path = fetchurl {
+        name = "wide_align___wide_align_1.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz";
+        sha1 = "ae074e6bdc0c14a431e804e624549c633b000457";
+      };
+    }
+    {
+      name = "widest_line___widest_line_2.0.0.tgz";
+      path = fetchurl {
+        name = "widest_line___widest_line_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/widest-line/-/widest-line-2.0.0.tgz";
+        sha1 = "0142a4e8a243f8882c0233aa0e0281aa76152273";
+      };
+    }
+    {
+      name = "wordwrap___wordwrap_0.0.3.tgz";
+      path = fetchurl {
+        name = "wordwrap___wordwrap_0.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz";
+        sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107";
+      };
+    }
+    {
+      name = "wordwrap___wordwrap_1.0.0.tgz";
+      path = fetchurl {
+        name = "wordwrap___wordwrap_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz";
+        sha1 = "27584810891456a4171c8d0226441ade90cbcaeb";
+      };
+    }
+    {
+      name = "worker_farm___worker_farm_1.5.2.tgz";
+      path = fetchurl {
+        name = "worker_farm___worker_farm_1.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.5.2.tgz";
+        sha1 = "32b312e5dc3d5d45d79ef44acc2587491cd729ae";
+      };
+    }
+    {
+      name = "worker_loader___worker_loader_2.0.0.tgz";
+      path = fetchurl {
+        name = "worker_loader___worker_loader_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/worker-loader/-/worker-loader-2.0.0.tgz";
+        sha1 = "45fda3ef76aca815771a89107399ee4119b430ac";
+      };
+    }
+    {
+      name = "wrap_ansi___wrap_ansi_2.1.0.tgz";
+      path = fetchurl {
+        name = "wrap_ansi___wrap_ansi_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz";
+        sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85";
+      };
+    }
+    {
+      name = "wrappy___wrappy_1.0.2.tgz";
+      path = fetchurl {
+        name = "wrappy___wrappy_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz";
+        sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f";
+      };
+    }
+    {
+      name = "write_file_atomic___write_file_atomic_2.4.1.tgz";
+      path = fetchurl {
+        name = "write_file_atomic___write_file_atomic_2.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.1.tgz";
+        sha1 = "d0b05463c188ae804396fd5ab2a370062af87529";
+      };
+    }
+    {
+      name = "write___write_1.0.3.tgz";
+      path = fetchurl {
+        name = "write___write_1.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz";
+        sha1 = "0800e14523b923a387e415123c865616aae0f5c3";
+      };
+    }
+    {
+      name = "write___write_0.2.1.tgz";
+      path = fetchurl {
+        name = "write___write_0.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz";
+        sha1 = "5fc03828e264cea3fe91455476f7a3c566cb0757";
+      };
+    }
+    {
+      name = "ws___ws_5.2.2.tgz";
+      path = fetchurl {
+        name = "ws___ws_5.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/ws/-/ws-5.2.2.tgz";
+        sha1 = "dffef14866b8e8dc9133582514d1befaf96e980f";
+      };
+    }
+    {
+      name = "ws___ws_6.0.0.tgz";
+      path = fetchurl {
+        name = "ws___ws_6.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/ws/-/ws-6.0.0.tgz";
+        sha1 = "eaa494aded00ac4289d455bac8d84c7c651cef35";
+      };
+    }
+    {
+      name = "ws___ws_3.3.3.tgz";
+      path = fetchurl {
+        name = "ws___ws_3.3.3.tgz";
+        url  = "https://registry.yarnpkg.com/ws/-/ws-3.3.3.tgz";
+        sha1 = "f1cf84fe2d5e901ebce94efaece785f187a228f2";
+      };
+    }
+    {
+      name = "x_is_string___x_is_string_0.1.0.tgz";
+      path = fetchurl {
+        name = "x_is_string___x_is_string_0.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/x-is-string/-/x-is-string-0.1.0.tgz";
+        sha1 = "474b50865af3a49a9c4657f05acd145458f77d82";
+      };
+    }
+    {
+      name = "xdg_basedir___xdg_basedir_3.0.0.tgz";
+      path = fetchurl {
+        name = "xdg_basedir___xdg_basedir_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz";
+        sha1 = "496b2cc109eca8dbacfe2dc72b603c17c5870ad4";
+      };
+    }
+    {
+      name = "xml_name_validator___xml_name_validator_3.0.0.tgz";
+      path = fetchurl {
+        name = "xml_name_validator___xml_name_validator_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz";
+        sha1 = "6ae73e06de4d8c6e47f9fb181f78d648ad457c6a";
+      };
+    }
+    {
+      name = "xml2js___xml2js_0.4.19.tgz";
+      path = fetchurl {
+        name = "xml2js___xml2js_0.4.19.tgz";
+        url  = "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.19.tgz";
+        sha1 = "686c20f213209e94abf0d1bcf1efaa291c7827a7";
+      };
+    }
+    {
+      name = "xml___xml_1.0.1.tgz";
+      path = fetchurl {
+        name = "xml___xml_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/xml/-/xml-1.0.1.tgz";
+        sha1 = "78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5";
+      };
+    }
+    {
+      name = "xmlbuilder___xmlbuilder_8.2.2.tgz";
+      path = fetchurl {
+        name = "xmlbuilder___xmlbuilder_8.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-8.2.2.tgz";
+        sha1 = "69248673410b4ba42e1a6136551d2922335aa773";
+      };
+    }
+    {
+      name = "xmlbuilder___xmlbuilder_9.0.7.tgz";
+      path = fetchurl {
+        name = "xmlbuilder___xmlbuilder_9.0.7.tgz";
+        url  = "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz";
+        sha1 = "132ee63d2ec5565c557e20f4c22df9aca686b10d";
+      };
+    }
+    {
+      name = "xmlcreate___xmlcreate_1.0.2.tgz";
+      path = fetchurl {
+        name = "xmlcreate___xmlcreate_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/xmlcreate/-/xmlcreate-1.0.2.tgz";
+        sha1 = "fa6bf762a60a413fb3dd8f4b03c5b269238d308f";
+      };
+    }
+    {
+      name = "xmlhttprequest_ssl___xmlhttprequest_ssl_1.5.5.tgz";
+      path = fetchurl {
+        name = "xmlhttprequest_ssl___xmlhttprequest_ssl_1.5.5.tgz";
+        url  = "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz";
+        sha1 = "c2876b06168aadc40e57d97e81191ac8f4398b3e";
+      };
+    }
+    {
+      name = "xmlhttprequest___xmlhttprequest_1.8.0.tgz";
+      path = fetchurl {
+        name = "xmlhttprequest___xmlhttprequest_1.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz";
+        sha1 = "67fe075c5c24fef39f9d65f5f7b7fe75171968fc";
+      };
+    }
+    {
+      name = "xregexp___xregexp_4.0.0.tgz";
+      path = fetchurl {
+        name = "xregexp___xregexp_4.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz";
+        sha1 = "e698189de49dd2a18cc5687b05e17c8e43943020";
+      };
+    }
+    {
+      name = "xtend___xtend_4.0.2.tgz";
+      path = fetchurl {
+        name = "xtend___xtend_4.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz";
+        sha1 = "bb72779f5fa465186b1f438f674fa347fdb5db54";
+      };
+    }
+    {
+      name = "xterm___xterm_3.5.0.tgz";
+      path = fetchurl {
+        name = "xterm___xterm_3.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/xterm/-/xterm-3.5.0.tgz";
+        sha1 = "ba3f464bc5730c9d259ebe62131862224db9ddcc";
+      };
+    }
+    {
+      name = "y18n___y18n_3.2.1.tgz";
+      path = fetchurl {
+        name = "y18n___y18n_3.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz";
+        sha1 = "6d15fba884c08679c0d77e88e7759e811e07fa41";
+      };
+    }
+    {
+      name = "y18n___y18n_4.0.0.tgz";
+      path = fetchurl {
+        name = "y18n___y18n_4.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz";
+        sha1 = "95ef94f85ecc81d007c264e190a120f0a3c8566b";
+      };
+    }
+    {
+      name = "yallist___yallist_2.1.2.tgz";
+      path = fetchurl {
+        name = "yallist___yallist_2.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz";
+        sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52";
+      };
+    }
+    {
+      name = "yallist___yallist_3.0.3.tgz";
+      path = fetchurl {
+        name = "yallist___yallist_3.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz";
+        sha1 = "b4b049e314be545e3ce802236d6cd22cd91c3de9";
+      };
+    }
+    {
+      name = "yargs_parser___yargs_parser_10.1.0.tgz";
+      path = fetchurl {
+        name = "yargs_parser___yargs_parser_10.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz";
+        sha1 = "7202265b89f7e9e9f2e5765e0fe735a905edbaa8";
+      };
+    }
+    {
+      name = "yargs_parser___yargs_parser_11.1.1.tgz";
+      path = fetchurl {
+        name = "yargs_parser___yargs_parser_11.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz";
+        sha1 = "879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4";
+      };
+    }
+    {
+      name = "yargs_parser___yargs_parser_5.0.0.tgz";
+      path = fetchurl {
+        name = "yargs_parser___yargs_parser_5.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz";
+        sha1 = "275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a";
+      };
+    }
+    {
+      name = "yargs___yargs_12.0.2.tgz";
+      path = fetchurl {
+        name = "yargs___yargs_12.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/yargs/-/yargs-12.0.2.tgz";
+        sha1 = "fe58234369392af33ecbef53819171eff0f5aadc";
+      };
+    }
+    {
+      name = "yargs___yargs_12.0.5.tgz";
+      path = fetchurl {
+        name = "yargs___yargs_12.0.5.tgz";
+        url  = "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz";
+        sha1 = "05f5997b609647b64f66b81e3b4b10a368e7ad13";
+      };
+    }
+    {
+      name = "yargs___yargs_7.1.0.tgz";
+      path = fetchurl {
+        name = "yargs___yargs_7.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz";
+        sha1 = "6ba318eb16961727f5d284f8ea003e8d6154d0c8";
+      };
+    }
+    {
+      name = "yarn_deduplicate___yarn_deduplicate_1.1.1.tgz";
+      path = fetchurl {
+        name = "yarn_deduplicate___yarn_deduplicate_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/yarn-deduplicate/-/yarn-deduplicate-1.1.1.tgz";
+        sha1 = "19b4a87654b66f55bf3a4bd6b153b4e4ab1b6e6d";
+      };
+    }
+    {
+      name = "yeast___yeast_0.1.2.tgz";
+      path = fetchurl {
+        name = "yeast___yeast_0.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz";
+        sha1 = "008e06d8094320c372dbc2f8ed76a0ca6c8ac419";
+      };
+    }
+    {
+      name = "zen_observable_ts___zen_observable_ts_0.8.18.tgz";
+      path = fetchurl {
+        name = "zen_observable_ts___zen_observable_ts_0.8.18.tgz";
+        url  = "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-0.8.18.tgz";
+        sha1 = "ade44b1060cc4a800627856ec10b9c67f5f639c8";
+      };
+    }
+    {
+      name = "zen_observable___zen_observable_0.8.11.tgz";
+      path = fetchurl {
+        name = "zen_observable___zen_observable_0.8.11.tgz";
+        url  = "https://registry.yarnpkg.com/zen-observable/-/zen-observable-0.8.11.tgz";
+        sha1 = "d3415885eeeb42ee5abb9821c95bb518fcd6d199";
+      };
+    }
+    {
+      name = "zrender___zrender_4.0.7.tgz";
+      path = fetchurl {
+        name = "zrender___zrender_4.0.7.tgz";
+        url  = "https://registry.yarnpkg.com/zrender/-/zrender-4.0.7.tgz";
+        sha1 = "15ae960822f5efed410995d37e5107fe3de10e6d";
+      };
+    }
+  ];
+}
-- 
GitLab


From 59f44d7c696c165be9879418e3fbdc02f1513949 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 7 Oct 2019 05:51:51 +0000
Subject: [PATCH 2169/2254] =?UTF-8?q?gnome3.gnome-initial-setup:=203.34.0?=
 =?UTF-8?q?=20=E2=86=92=203.34.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gnome-3/core/gnome-initial-setup/default.nix       | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix b/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix
index 1ca3d696726..c6fd8658cde 100644
--- a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix
@@ -1,6 +1,5 @@
 { stdenv
 , fetchurl
-, fetchpatch
 , substituteAll
 , gettext
 , meson
@@ -37,11 +36,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-initial-setup";
-  version = "3.34.0";
+  version = "3.34.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "19ly8xrj7vvjlhhbh6y2cm5l02qgq9wqfczrjdn0llkga9f8b8sc";
+    sha256 = "18dzx9z9bcfqfn1jivzm9m5lkcij1c9y8x77zlpxj733dgpi07z7";
   };
 
   nativeBuildInputs = [
@@ -78,11 +77,6 @@ stdenv.mkDerivation rec {
   ];
 
   patches = [
-    # Disable g-i-s service in GDM
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/gnome-initial-setup/commit/b67b5cc48c418415eb3233f78ab089bc447b1952.patch";
-      sha256 = "050zc6cnil71bf7ijav6w6bkr33lqwglipcg7anw9jcn7mcakhlq";
-    })
     (substituteAll {
       src = ./fix-paths.patch;
       inherit tzdata libgnomekbd;
-- 
GitLab


From 5ff8945da98e89338998dd0c2ae76ec1dfe7e50b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 7 Oct 2019 05:52:25 +0000
Subject: [PATCH 2170/2254] =?UTF-8?q?libdazzle:=203.34.0=20=E2=86=92=203.3?=
 =?UTF-8?q?4.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/libraries/libdazzle/default.nix b/pkgs/development/libraries/libdazzle/default.nix
index 2c63a3c71db..173ad6d2e85 100644
--- a/pkgs/development/libraries/libdazzle/default.nix
+++ b/pkgs/development/libraries/libdazzle/default.nix
@@ -3,14 +3,14 @@
 
 stdenv.mkDerivation rec {
   pname = "libdazzle";
-  version = "3.34.0";
+  version = "3.34.1";
 
   outputs = [ "out" "dev" "devdoc" ];
   outputBin = "dev";
 
   src = fetchurl {
     url = "mirror://gnome/sources/libdazzle/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0z3395mpa9qwviazrlgf3356121ypzq9dziyzfhbvmmcnay291cd";
+    sha256 = "01cmcrd75b7ns7j2b4p6h7pv68vjhkcl9zbvzzx7pf4vknxir61x";
   };
 
   nativeBuildInputs = [ ninja meson pkgconfig vala gobject-introspection libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 dbus xvfb_run ];
-- 
GitLab


From 4c675e64c0541be774bb73a59fe0cb5b19994456 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 7 Oct 2019 05:52:52 +0000
Subject: [PATCH 2171/2254] =?UTF-8?q?simple-scan:=203.34.0=20=E2=86=92=203?=
 =?UTF-8?q?.34.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix
index 89d756c559e..21e198a867f 100644
--- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix
+++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "simple-scan";
-  version = "3.34.0";
+  version = "3.34.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/simple-scan/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1fxqrwhpvm7y83zrn85wg2avwlcmkfjvv1gb6br6v58zi6fvny3k";
+    sha256 = "0glzskxdc7p9z7nwcakqc7qzij4l79adlvvb2cj5fmis731zw9yq";
   };
 
   buildInputs = [
-- 
GitLab


From ee27c71d8da61d7457a3ef01cdaf65852f45caa4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 7 Oct 2019 05:52:54 +0000
Subject: [PATCH 2172/2254] =?UTF-8?q?gnome3.totem:=203.34.0=20=E2=86=92=20?=
 =?UTF-8?q?3.34.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix
index 379f154abec..50e30d2717e 100644
--- a/pkgs/desktops/gnome-3/core/totem/default.nix
+++ b/pkgs/desktops/gnome-3/core/totem/default.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   pname = "totem";
-  version = "3.34.0";
+  version = "3.34.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/totem/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "00fpm3609zckiqjrlg3r64vz2mqych44kdkljxbidb847vg6xm84";
+    sha256 = "028sc6xbyi7rs884862d8f3di6zhcm0lhvlpc3r69ifzjsq9my3b";
   };
 
   doCheck = true;
-- 
GitLab


From a22500d2dccda091707b06b7f58150a12734f3f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 7 Oct 2019 07:54:33 +0200
Subject: [PATCH 2173/2254] vino: disable broken updateScript

We're pulling in a custom src here, so gnome3.updateScript crashes.
---
 pkgs/desktops/gnome-3/core/vino/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/vino/default.nix b/pkgs/desktops/gnome-3/core/vino/default.nix
index e18f4de68d6..abfe8b2e039 100644
--- a/pkgs/desktops/gnome-3/core/vino/default.nix
+++ b/pkgs/desktops/gnome-3/core/vino/default.nix
@@ -82,10 +82,10 @@ stdenv.mkDerivation {
   '';
 
   passthru = {
-    updateScript = gnome3.updateScript {
-      packageName = "vino";
-      attrPath = "gnome3.vino";
-    };
+    # updateScript = gnome3.updateScript {
+    #   packageName = "vino";
+    #   attrPath = "gnome3.vino";
+    # };
   };
 
   meta = with stdenv.lib; {
-- 
GitLab


From dcd27465d657986475941d6e282df91469823122 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 7 Oct 2019 08:02:36 +0200
Subject: [PATCH 2174/2254] libsecret: use plain update policy

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

diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix
index 6c14269c2d5..0a3c110bbbd 100644
--- a/pkgs/development/libraries/libsecret/default.nix
+++ b/pkgs/development/libraries/libsecret/default.nix
@@ -41,6 +41,8 @@ stdenv.mkDerivation rec {
   passthru = {
     updateScript = gnome3.updateScript {
       packageName = pname;
+      # Does not seem to use the odd-unstable policy: https://gitlab.gnome.org/GNOME/libsecret/issues/30
+      versionPolicy = "none";
     };
   };
 
-- 
GitLab


From ae35a341fe8a26594ac07c734e9c1b6d0a01c793 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 7 Oct 2019 09:44:38 +0000
Subject: [PATCH 2175/2254] =?UTF-8?q?evolution-data-server:=203.34.0=20?=
 =?UTF-8?q?=E2=86=92=203.34.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
index 63e1ec9ae29..fa70ecea264 100644
--- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "evolution-data-server";
-  version = "3.34.0";
+  version = "3.34.1";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1kw6wkrr33bxv95z06dr31qvmp7c7x88xkw27k3fq0df4jlb17gv";
+    sha256 = "1gisymfjhkibqy73pmd0d3fwl43a23d0lvlxzqkycfdn9jh6pxbg";
   };
 
   patches = [
-- 
GitLab


From 51e612d4bbff3e0f9239a079e59f0b9d7c873721 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 7 Oct 2019 09:44:41 +0000
Subject: [PATCH 2176/2254] =?UTF-8?q?gnome3.evolution:=203.34.0=20?=
 =?UTF-8?q?=E2=86=92=203.34.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix
index 8085b2a824a..701f894939e 100644
--- a/pkgs/desktops/gnome-3/apps/evolution/default.nix
+++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix
@@ -43,11 +43,11 @@
 
 stdenv.mkDerivation rec {
   pname = "evolution";
-  version = "3.34.0";
+  version = "3.34.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/evolution/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "136jim297ac7ig0ax7ll6x4dc3vhd7l5prh3fvb4mmskv5klbl6r";
+    sha256 = "0hmxz3b9paqlpfjpqn379a8c01z3gb8lz0jgxxpgn6iygzfr4sk5";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From a1a83834a660fe50daaf60d86a535f4407e0e329 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 7 Oct 2019 09:44:44 +0000
Subject: [PATCH 2177/2254] =?UTF-8?q?gnome3.gdm:=203.34.0=20=E2=86=92=203.?=
 =?UTF-8?q?34.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix
index 8b9c3732454..b8a5d70e9d2 100644
--- a/pkgs/desktops/gnome-3/core/gdm/default.nix
+++ b/pkgs/desktops/gnome-3/core/gdm/default.nix
@@ -19,11 +19,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "gdm";
-  version = "3.34.0";
+  version = "3.34.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gdm/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0pnh0nj4kk8n48kgj77bb5r4z5jnb7kxnvpnddk6b9n96g0qwklv";
+    sha256 = "1lyqvcwxhwxklbxn4xjswjzr6fhjix6h28mi9ypn34wdm9bzcpg8";
   };
 
   # Only needed to make it build
@@ -51,18 +51,6 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   patches = [
-    # See: https://gitlab.gnome.org/GNOME/gdm/issues/515
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/gdm/commit/0e05e2fd3c2a3b28ed4db0e51e4646aa6af67a5f.patch";
-      sha256 = "10kbjn0kis0xf95dfzq4w6xazyfbcz8yj9lrixg5jb3srrnp0hhf";
-    })
-
-    # https://gitlab.gnome.org/GNOME/gdm/merge_requests/84
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/gdm/commit/2136c3baab81b6ec2115180f67ada91727e948f7.patch";
-      sha256 = "1ispxh4p6hdh3bx9x86497gzlwpgj32x2ymmv60wafg76vmrlcc2";
-    })
-
     # Change hardcoded paths to nix store paths.
     (substituteAll {
       src = ./fix-paths.patch;
-- 
GitLab


From 96e9af3fe48bccae32cfc3e737236a0dbe0fc533 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 7 Oct 2019 09:44:50 +0000
Subject: [PATCH 2178/2254] =?UTF-8?q?gnome3.gjs:=201.58.0=20=E2=86=92=201.?=
 =?UTF-8?q?58.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/core/gjs/default.nix b/pkgs/desktops/gnome-3/core/gjs/default.nix
index a7b8e18d73a..b0c1e2d3077 100644
--- a/pkgs/desktops/gnome-3/core/gjs/default.nix
+++ b/pkgs/desktops/gnome-3/core/gjs/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gjs";
-  version = "1.58.0";
+  version = "1.58.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gjs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1wvywpng27y0264pq9anxdi1xy280x6mcnbgiggn804pql4nml8y";
+    sha256 = "1xf68rbagkflb9yi3visfw8cbxqlzd717y8jakgw0y6whzm1dpxl";
   };
 
   passthru = {
-- 
GitLab


From c1ec32c8e6cf3930ad84c56b50fe1e3d304d3da5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 7 Oct 2019 09:45:23 +0000
Subject: [PATCH 2179/2254] =?UTF-8?q?gnome3.gnome-calculator:=203.34.0=20?=
 =?UTF-8?q?=E2=86=92=203.34.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
index f743e8fead6..cabe7c9ca74 100644
--- a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-calculator";
-  version = "3.34.0";
+  version = "3.34.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-calculator/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0gzjdddby3pi22srlcw6q2dv9dxwak75jbplpvflhq4w82qx543b";
+    sha256 = "0lbh87255zzggqzai6543qg920y52bl4vs5m5h5087ghzg14hlsd";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From 934a1ab1035283261a51b17c33cc5b9ac0e4b52f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 7 Oct 2019 09:45:31 +0000
Subject: [PATCH 2180/2254] =?UTF-8?q?gnome3.gnome-session:=203.34.0=20?=
 =?UTF-8?q?=E2=86=92=203.34.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gnome-3/core/gnome-session/default.nix      | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix
index 9e86297e1ec..8aaf68ea1e3 100644
--- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-session/default.nix
@@ -1,28 +1,17 @@
 { fetchurl, stdenv, substituteAll, meson, ninja, pkgconfig, gnome3, glib, gtk3, gsettings-desktop-schemas
 , gnome-desktop, dbus, json-glib, libICE, xmlto, docbook_xsl, docbook_xml_dtd_412, python3
-, libxslt, gettext, makeWrapper, systemd, xorg, epoxy, gnugrep, bash, fetchpatch }:
+, libxslt, gettext, makeWrapper, systemd, xorg, epoxy, gnugrep, bash }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-session";
-  version = "3.34.0";
+  version = "3.34.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-session/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0qkdwvj6w33h8csq9mhjbf10f0v5g0sgabyfg1bgp75z0br76si0";
+    sha256 = "0q366pns99f6wka5ikahqpasnsm72q9pg0c0nnfb2ld7spi1z06p";
   };
 
   patches = [
-    # Fix debug spam when using systemd session
-    # https://gitlab.gnome.org/GNOME/gnome-session/issues/31
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/gnome-session/commit/adfdf7f64f08fc07325f9332e9eba46974cc30ee.patch";
-      sha256 = "0vjg77gpj3k63a5ffhsvv5m30lbj6cab35lhl4gpqxg4j2j3yy7y";
-    })
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/gnome-session/commit/b7b24627485c520f873db4e918e217a76ededd8c.patch";
-      sha256 = "1d8pw8q423wvv0cd32p0yf52vlfj7w1if2gljqvarcm2n1m0pdxj";
-    })
-
     (substituteAll {
       src = ./fix-paths.patch;
       gsettings = "${glib.bin}/bin/gsettings";
-- 
GitLab


From 04d5ccc234a709b1147483f597fb9f7af63f44fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 7 Oct 2019 09:45:49 +0000
Subject: [PATCH 2181/2254] =?UTF-8?q?gvfs:=201.42.0=20=E2=86=92=201.42.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix
index 43305291db6..181d5e4c196 100644
--- a/pkgs/development/libraries/gvfs/default.nix
+++ b/pkgs/development/libraries/gvfs/default.nix
@@ -41,11 +41,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gvfs";
-  version = "1.42.0";
+  version = "1.42.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1wbc0qsa97ihpn24fqvl7zwxy0zy20ggakm7vn6vnm7vxsf8v5fh";
+    sha256 = "0c3pqc8qc2pn08by43rkkmk725k3cqmw7qyhfqgng0qx98dhf1lx";
   };
 
   postPatch = ''
-- 
GitLab


From fedc3638dae0e78c2dbe510686a8a3257e7406d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 7 Oct 2019 09:54:40 +0000
Subject: [PATCH 2182/2254] =?UTF-8?q?gnome-builder:=203.34.0=20=E2=86=92?=
 =?UTF-8?q?=203.34.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/applications/editors/gnome-builder/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix
index a1448764245..82ed8cc1974 100644
--- a/pkgs/applications/editors/gnome-builder/default.nix
+++ b/pkgs/applications/editors/gnome-builder/default.nix
@@ -39,11 +39,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-builder";
-  version = "3.34.0";
+  version = "3.34.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "19i2ipgw48fpd50wacwyhj35hajlg7qcyxpj8rsqk4g21ijfykrg";
+    sha256 = "19018pq94cxf6fywd7fsmy98x56by5zfmh140pl530gaaw84cvhb";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From bce4a8b5b4350e42b25a6b4c427061e22d2a6934 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 7 Oct 2019 13:13:52 +0000
Subject: [PATCH 2183/2254] =?UTF-8?q?gnome3.nautilus:=203.34.0=20=E2=86=92?=
 =?UTF-8?q?=203.34.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix
index b68415b32a2..48f47be04bc 100644
--- a/pkgs/desktops/gnome-3/core/nautilus/default.nix
+++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix
@@ -32,11 +32,11 @@
 
 stdenv.mkDerivation rec {
   pname = "nautilus";
-  version = "3.34.0";
+  version = "3.34.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1ncs5hmaxjb9p2yzj81m7dz2x27vzmvppir3058dk236jzn98r36";
+    sha256 = "1wvp0272wky2v1pcx6z27275crb48j9903v6qzf8ki8hlqb2rkip";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From 2a6bacd99264168e5bad0c3c26397a3ff56a3491 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 7 Oct 2019 13:13:54 +0000
Subject: [PATCH 2184/2254] =?UTF-8?q?gnome3.quadrapassel:=203.34.0=20?=
 =?UTF-8?q?=E2=86=92=203.34.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix
index 0f89d8c3a74..2ac4c4c96f7 100644
--- a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix
+++ b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   pname = "quadrapassel";
-  version = "3.34.0";
+  version = "3.34.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/quadrapassel/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1na5j1mf09rdj0kp7fwfdnc1p7mfclpv58is2cs2ldfik4y1p2if";
+    sha256 = "1qh6hx90lqag2hby94jc68xnz4i6b2a253x4yp6xz025fpacv6mk";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From ca64e5669d51497f7bdc70125974614c073de3f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 7 Oct 2019 14:19:50 +0000
Subject: [PATCH 2185/2254] =?UTF-8?q?gnome3.gnome-boxes:=203.34.0=20?=
 =?UTF-8?q?=E2=86=92=203.34.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
index ba0d0bd891b..c48e6a7446f 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
@@ -7,14 +7,14 @@
 }:
 
 let
-  version = "3.34.0";
+  version = "3.34.1";
 in stdenv.mkDerivation rec {
   pname = "gnome-boxes";
   inherit version;
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-boxes/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "07qjrb1qgfznvm0l2jm99d212dvw3iaw76czq5q1msnghpdw67qd";
+    sha256 = "1758k5b79kyywdg67b4byqhva9045i13lzg5r62my950c4c2p0pc";
   };
 
   doCheck = true;
-- 
GitLab


From 3e3575d1fc67015b15acd14b26a7bb817513247c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 7 Oct 2019 16:55:26 +0200
Subject: [PATCH 2186/2254] gnomeExtensions.dash-to-dock: 20190921 -> 67

Actual release for gnome 3.34
---
 pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix b/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix
index 1f09afc52c4..6ac82c539a2 100644
--- a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix
@@ -2,14 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-dash-to-dock";
-  version = "20190921";
+  version = "67";
 
   src = fetchFromGitHub {
     owner = "micheleg";
     repo = "dash-to-dock";
-    # rev = "extensions.gnome.org-v" + version;
-    rev = "d918d29a6afced8823dc954a4317988b79aad6b8";
-    sha256 = "1wlmbcn8zs8xiyxhgdcbnf2igjsjg0bkcsvjpy8fk13fxshxsqx6";
+    rev = "extensions.gnome.org-v" + version;
+    sha256 = "1746xm0iyvyzj6m3pvjx11smh9w1s7naz426ki0dlr5l7jh3mpy5";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From 502da337bc5b6522dac3e7a8112560ea55915f61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 7 Oct 2019 17:48:47 +0000
Subject: [PATCH 2187/2254] =?UTF-8?q?gnome3.gnome-software:=203.34.0=20?=
 =?UTF-8?q?=E2=86=92=203.34.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix
index 8c5e0fad41e..1b4abd492d6 100644
--- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix
@@ -11,11 +11,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "gnome-software";
-  version = "3.34.0";
+  version = "3.34.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-software/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1mr03s6f38pbgvgpb1p91csqms369f1lzqyk5nfam5jqyl273nzk";
+    sha256 = "1yd806dp1c51ym6sidbfafzcywkbxmzxbr4zz57i0yhfjmwr9mjx";
   };
 
   patches = [
-- 
GitLab


From 2d810864541b3aee23126007e2e08e5baa905f60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 7 Oct 2019 19:08:03 +0000
Subject: [PATCH 2188/2254] =?UTF-8?q?gnome3.four-in-a-row:=203.34.0=20?=
 =?UTF-8?q?=E2=86=92=203.34.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
index 356df76a061..5f6cb92cde2 100644
--- a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
+++ b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "four-in-a-row";
-  version = "3.34.0";
+  version = "3.34.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/four-in-a-row/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1wf0545lhmqf2hfi7wc8bqs7b9g43rm0df0ssza6517xzc4lx7jl";
+    sha256 = "112pyrh2yvwy5b2a0b5crjpwp2vqqg4zgx6csll1bic6ccayv713";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From a27218693707affce24ffa85e8f055dd5b2f27ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 7 Oct 2019 19:08:12 +0000
Subject: [PATCH 2189/2254] =?UTF-8?q?gnome3.gnome-panel:=203.34.0=20?=
 =?UTF-8?q?=E2=86=92=203.34.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix b/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix
index 6cb7249b64e..423a393eb77 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix
@@ -23,7 +23,7 @@
 
 let
   pname = "gnome-panel";
-  version = "3.34.0";
+  version = "3.34.1";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
@@ -31,7 +31,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "11qsmpv0nyrkqc5b9a1532i82jmbxww1nlzdzysid283l9zyy2dn";
+    sha256 = "03dr54njdh2szy6yrib2q0agjscbj3bmzrfb9fb4psrf4mah5g56";
   };
 
   # make .desktop Exec absolute
-- 
GitLab


From 1d62ae015c13367c6d45a9248d9be737c17e43a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 7 Oct 2019 19:08:20 +0000
Subject: [PATCH 2190/2254] =?UTF-8?q?gnome3.gnome-tetravex:=203.34.0=20?=
 =?UTF-8?q?=E2=86=92=203.34.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix
index 774f066d06b..1337a810807 100644
--- a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-tetravex";
-  version = "3.34.0";
+  version = "3.34.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-tetravex/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0wyhiiyi9zhvj250nwsc9h38dnhw3z8aml3yk6b7i1wfg7f54nwa";
+    sha256 = "05i9y6x9ai7fay0khr4zb4ji92qs49v88p3lqx9lac8hz04dnvg0";
   };
 
   passthru = {
-- 
GitLab


From 4427ec8b9f2287db840c82c7ecebf203e5fa363a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 7 Oct 2019 19:08:20 +0000
Subject: [PATCH 2191/2254] =?UTF-8?q?gnome3.gnome-taquin:=203.34.0=20?=
 =?UTF-8?q?=E2=86=92=203.34.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
index 889991d210f..dd7908ba726 100644
--- a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-taquin";
-  version = "3.34.0";
+  version = "3.34.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-taquin/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0jhfryqim98m9i84k18r4xb83q2g2198mn4igmr05sr974f0j578";
+    sha256 = "0vyrfhkfpx83n9p70jssykbndvb3sxwdihqvvvb94rbw7n6c4q4r";
   };
 
   passthru = {
-- 
GitLab


From e3e250e2059a49ce0dc880545ca800b9d3486872 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 7 Oct 2019 19:08:33 +0000
Subject: [PATCH 2192/2254] =?UTF-8?q?gnome3.iagno:=203.34.0=20=E2=86=92=20?=
 =?UTF-8?q?3.34.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/games/iagno/default.nix b/pkgs/desktops/gnome-3/games/iagno/default.nix
index bee939fd129..901ad46e961 100644
--- a/pkgs/desktops/gnome-3/games/iagno/default.nix
+++ b/pkgs/desktops/gnome-3/games/iagno/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "iagno";
-  version = "3.34.0";
+  version = "3.34.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/iagno/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "15zan1h63hm9z0bf3y5h7rqd935jjw672qh88waqzwp6mlv1y321";
+    sha256 = "1y9sknc5k2vfhbv8bhbid4zwwzqj8g5m1jz0k5bfkixaa1kxvp35";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From c32ab6262b31e6791e2ed19ec205d4510822b65a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 7 Oct 2019 19:08:46 +0000
Subject: [PATCH 2193/2254] =?UTF-8?q?gnome3.metacity:=203.34.0=20=E2=86=92?=
 =?UTF-8?q?=203.34.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/misc/metacity/default.nix b/pkgs/desktops/gnome-3/misc/metacity/default.nix
index 0c32b4448d7..8355051fa85 100644
--- a/pkgs/desktops/gnome-3/misc/metacity/default.nix
+++ b/pkgs/desktops/gnome-3/misc/metacity/default.nix
@@ -16,13 +16,13 @@
 
 let
   pname = "metacity";
-  version = "3.34.0";
+  version = "3.34.1";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0ih95lmw56z6pha7p035ahqpvpw9sxfam3cxm7fambib5qrky192";
+    sha256 = "0ga57b71i2gbd723gbs3pxy1jnf44q5mnwq5yhxzn2irbh2d3iri";
   };
 
   patches = [
-- 
GitLab


From 30b39034b09d5a8c9335229cd63e1bca7dd5c851 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Tue, 8 Oct 2019 02:39:00 +0000
Subject: [PATCH 2194/2254] =?UTF-8?q?gnome3.dconf-editor:=203.34.1=20?=
 =?UTF-8?q?=E2=86=92=203.34.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix
index 4f7b64ca065..99084b502c7 100644
--- a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix
+++ b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix
@@ -3,13 +3,13 @@
 
 let
   pname = "dconf-editor";
-  version = "3.34.1";
+  version = "3.34.2";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0dgkgzrk4q8753j3lvz4ykyfs7pv1fvdmi516ryv3q20k24kxb9j";
+    sha256 = "0pwxjada2vaf69ihpjgp9nky54iykvxq63lp1vl8pxjanif2mk6f";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From 853fb6a2a6735027a3c8a073d395782c7a070c9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Tue, 8 Oct 2019 02:39:03 +0000
Subject: [PATCH 2195/2254] =?UTF-8?q?gnome3.eog:=203.34.0=20=E2=86=92=203.?=
 =?UTF-8?q?34.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/core/eog/default.nix b/pkgs/desktops/gnome-3/core/eog/default.nix
index fa4de8583da..e8f4663ad30 100644
--- a/pkgs/desktops/gnome-3/core/eog/default.nix
+++ b/pkgs/desktops/gnome-3/core/eog/default.nix
@@ -4,13 +4,13 @@
 
 let
   pname = "eog";
-  version = "3.34.0";
+  version = "3.34.1";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1vjrlgc82ij8ijkgc1ssssig4bp23nd6a31wx44m7k1pwy64z594";
+    sha256 = "0b7ld4azs9xbdjsk9b91ywhdzvxgajhndiwiivxjzbr0hjgp7c7x";
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook libxml2 gobject-introspection python3 ];
-- 
GitLab


From ab6b4c7c7287f293e372621382ea7b4b43598814 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Tue, 8 Oct 2019 02:39:10 +0000
Subject: [PATCH 2196/2254] =?UTF-8?q?evince:=203.34.0=20=E2=86=92=203.34.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- meson files are now distributed
---
 pkgs/desktops/gnome-3/core/evince/default.nix | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix
index ee4e619332c..61f27f10ae1 100644
--- a/pkgs/desktops/gnome-3/core/evince/default.nix
+++ b/pkgs/desktops/gnome-3/core/evince/default.nix
@@ -1,5 +1,5 @@
 { stdenv
-, fetchFromGitLab
+, fetchurl
 , meson
 , ninja
 , pkgconfig
@@ -43,18 +43,13 @@
 
 stdenv.mkDerivation rec {
   pname = "evince";
-  version = "3.34.0";
+  version = "3.34.1";
 
   outputs = [ "out" "dev" "devdoc" ];
 
-  # meson.build not distributed
-  # See: https://gitlab.gnome.org/GNOME/evince/issues/1270
-  src = fetchFromGitLab {
-    domain = "gitlab.gnome.org";
-    owner = "GNOME";
-    repo = pname;
-    rev = version;
-    sha256 = "0kjylhlkadi89w3p9afzl69jpd9gryk21sm1g89a0y2pkwz181qr";
+  src = fetchurl {
+    url = "mirror://gnome/sources/evince/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    sha256 = "1pr6fvbaam1mzxjwyqd53hcxzdjzf73idn10j4j7n54nwg6hgr45";
   };
 
   postPatch = ''
-- 
GitLab


From b1f457001611da5b2b1566aea2eeebf40b4493ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Tue, 8 Oct 2019 02:39:24 +0000
Subject: [PATCH 2197/2254] =?UTF-8?q?gnome3.gnome-desktop:=203.34.0=20?=
 =?UTF-8?q?=E2=86=92=203.34.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
index cf76caf9f48..6770f3df850 100644
--- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-desktop";
-  version = "3.34.0";
+  version = "3.34.1";
 
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-desktop/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "09i4nv3fn8vlx7f1rzqid9qgd3srlz3hfajnjwmnpmf1apk1wcwd";
+    sha256 = "0nnwc837k244gjsmx8wff5sfvm8xnhm8xr39qxk73lnscrbfpny1";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From 810de2c76c1fbb37904bcc2a85d18ea8b6edac90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Tue, 8 Oct 2019 02:39:30 +0000
Subject: [PATCH 2198/2254] =?UTF-8?q?gnome3.gnome-maps:=203.34.0=20?=
 =?UTF-8?q?=E2=86=92=203.34.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
index fd659b3e405..49b44f5f283 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
@@ -5,13 +5,13 @@
 
 let
   pname = "gnome-maps";
-  version = "3.34.0";
+  version = "3.34.1";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0vsi21zzk5mvf6rv86r6ahzxd93ciyhjrdqsn3pncnk0yy67y2wr";
+    sha256 = "03nswj60lqznr2j3ld2lgjzr4j9x2gblqx2ip4l2yxnm9kgbm14s";
   };
 
   doCheck = true;
-- 
GitLab


From c0399466222ad128a651eadc58f4fc9c228fe49d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Tue, 8 Oct 2019 02:39:31 +0000
Subject: [PATCH 2199/2254] =?UTF-8?q?gnome3.gnome-nibbles:=203.34.0=20?=
 =?UTF-8?q?=E2=86=92=203.34.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix
index 803661b0153..59b92a8b61c 100644
--- a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-nibbles";
-  version = "3.34.0";
+  version = "3.34.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-nibbles/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0al0znl26y3xcdq6ilv78g54pz0fcw5lr9rhhf9g9rkyigd5056n";
+    sha256 = "0nfy1wvxsyrpdinfn5v86gvq3ma487njz607biwwhji9z050gw3p";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From c909680e6c03338622e9aa1faba130ba91c84cf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Tue, 8 Oct 2019 02:39:41 +0000
Subject: [PATCH 2200/2254] =?UTF-8?q?gnome3.gnome-terminal:=203.34.0=20?=
 =?UTF-8?q?=E2=86=92=203.34.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- fixes gio-unix include
---
 pkgs/desktops/gnome-3/core/gnome-terminal/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
index 1ca58c8f777..774d18143ed 100644
--- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-terminal";
-  version = "3.34.0";
+  version = "3.34.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-terminal/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0wcavripfsr691qkcjb71vccffz0wx2q5qh4clwnk1hi8j1hz9l5";
+    sha256 = "06fqgyfzjqj5k3cr9ig6xa85ml7ifgwfj4gi9z5f0pyc62lwvzlg";
   };
 
   buildInputs = [
@@ -23,8 +23,6 @@ stdenv.mkDerivation rec {
     hicolor-icon-theme # for setup-hook
   ];
 
-  NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
-
   # Silly ./configure, it looks for dbus file from gnome-shell in the
   # installation tree of the package it is configuring.
   postPatch = ''
-- 
GitLab


From 6b8241bb5247f7868bc2585a0f5f8aa5c16d0e3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Tue, 8 Oct 2019 02:40:18 +0000
Subject: [PATCH 2201/2254] =?UTF-8?q?vte:=200.58.0=20=E2=86=92=200.58.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix
index b3f1d9306f1..0738eaf7157 100644
--- a/pkgs/development/libraries/vte/default.nix
+++ b/pkgs/development/libraries/vte/default.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation rec {
   pname = "vte";
-  version = "0.58.0";
+  version = "0.58.1";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0ifvza9sdrkxxqq7m9i7ry23sv7widjz6nzbvgc60kpph4fmf187";
+    sha256 = "1njq88a8956xpmakkd1ph992jmpaimk8zjlh5ywh5psr33x8mi94";
   };
 
   passthru = {
-- 
GitLab


From de3f49275e6b939cb5d5061cdfba5faeaffb00fa Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 8 Oct 2019 07:06:38 -0400
Subject: [PATCH 2202/2254] ultrastar-creator: use qt5's mkDerivation

---
 pkgs/tools/misc/ultrastar-creator/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/ultrastar-creator/default.nix b/pkgs/tools/misc/ultrastar-creator/default.nix
index d70fded5e3e..dd9742293ac 100644
--- a/pkgs/tools/misc/ultrastar-creator/default.nix
+++ b/pkgs/tools/misc/ultrastar-creator/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub
+{ lib, mkDerivation, fetchFromGitHub
 , qmake, qtbase, pkgconfig, taglib, libbass, libbass_fx }:
 
 # TODO: get rid of (unfree) libbass
@@ -6,7 +6,7 @@
 # there’s a WIP branch here:
 # https://github.com/UltraStar-Deluxe/UltraStar-Creator/commits/BASS_removed
 
-stdenv.mkDerivation {
+mkDerivation {
   pname = "ultrastar-creator";
   version = "2019-04-23";
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
     sha256 = "1rzz04l7s7pxj74xam0cxlq569lfpgig35kpbsplq531d4007pc9";
   };
 
-  postPatch = with stdenv.lib; ''
+  postPatch = with lib; ''
     # we don’t want prebuild binaries checked into version control!
     rm -rf lib include
     sed -e "s|DESTDIR =.*$|DESTDIR = $out/bin|" \
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ qmake pkgconfig ];
   buildInputs = [ qtbase taglib libbass libbass_fx ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Ultrastar karaoke song creation tool";
     homepage = https://github.com/UltraStar-Deluxe/UltraStar-Creator;
     license = licenses.gpl2;
-- 
GitLab


From ee8032c3c3a50286e4fbaf2ac4115e78b8a0ac3b Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 8 Oct 2019 07:08:45 -0400
Subject: [PATCH 2203/2254] ultastar-manager: use qt5's mkDerivation

---
 pkgs/tools/misc/ultrastar-manager/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/misc/ultrastar-manager/default.nix b/pkgs/tools/misc/ultrastar-manager/default.nix
index 0a3bb19d14b..19d126d98f6 100644
--- a/pkgs/tools/misc/ultrastar-manager/default.nix
+++ b/pkgs/tools/misc/ultrastar-manager/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, symlinkJoin, qmake, diffPlugins
+{ lib, mkDerivation, fetchFromGitHub, pkgconfig, symlinkJoin, qmake, diffPlugins
 , qtbase, qtmultimedia, taglib, libmediainfo, libzen, libbass }:
 
 let
@@ -24,12 +24,12 @@ let
       repo = "UltraStar-Manager";
       inherit rev sha256;
     };
-    in stdenv.mkDerivation {
+    in mkDerivation {
       name = "${src.name}-patched";
       inherit src;
       phases = [ "unpackPhase" "patchPhase" ];
 
-      patchPhase = with stdenv.lib; ''
+      patchPhase = with lib; ''
         # we don’t want prebuild binaries checked into version control!
         rm -rf lib include
 
@@ -55,7 +55,7 @@ let
     sed -e "s|QCore.*applicationDirPath()|QString(\"${path}\")|" -i "${file}"
   '';
 
-  buildPlugin = name: stdenv.mkDerivation {
+  buildPlugin = name: mkDerivation {
     name = "ultrastar-manager-${name}-plugin-${version}";
     src = patchedSrc;
 
@@ -82,7 +82,7 @@ let
       paths = map buildPlugin plugins;
     };
 
-in stdenv.mkDerivation {
+in mkDerivation {
   pname = "ultrastar-manager";
   inherit version;
   src = patchedSrc;
@@ -112,7 +112,7 @@ in stdenv.mkDerivation {
   nativeBuildInputs = [ pkgconfig ];
   inherit buildInputs;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Ultrastar karaoke song manager";
     homepage = https://github.com/UltraStar-Deluxe/UltraStar-Manager;
     license = licenses.gpl2;
-- 
GitLab


From 90c89eac6e78fef62e86b88f8d8d4b4a70cccf49 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Tue, 8 Oct 2019 13:16:03 +0200
Subject: [PATCH 2204/2254] mdsh: 0.1.4 -> 0.2.0

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

diff --git a/pkgs/development/tools/documentation/mdsh/default.nix b/pkgs/development/tools/documentation/mdsh/default.nix
index e6c485b7ed7..3cc64602508 100644
--- a/pkgs/development/tools/documentation/mdsh/default.nix
+++ b/pkgs/development/tools/documentation/mdsh/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "mdsh";
-  version = "0.1.4";
+  version = "0.2.0";
 
   src = fetchFromGitHub {
     owner = "zimbatm";
     repo = "mdsh";
     rev = "v${version}";
-    sha256 = "0m3f5mrdmnmkfsy7mc6x3jf4ainmq0z42mv935ikcdbjwwjbd5gq";
+    sha256 = "1751lll93cimyj7bxxdwdxn5w0zb2mzjpbnk1c93jfsvzlz1wzbl";
   };
 
-  cargoSha256 = "0adc525hbs7j7zasvcdxy7k6pf145hs711hjbzgwf72k514ypyrl";
+  cargoSha256 = "0b8rg4pz4mpm60iwwmfw4l1p1g9sh1fwf693aqxi8g4vrjf0zniv";
   verifyCargoDeps = true;
 
   meta = with stdenv.lib; {
-- 
GitLab


From be015b471c1dd41cf792ff6ef33112fc6264067c Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Tue, 8 Oct 2019 14:24:14 +0200
Subject: [PATCH 2205/2254] entr: Add synthetica9 as maintainer (#70625)

---
 pkgs/tools/misc/entr/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/entr/default.nix b/pkgs/tools/misc/entr/default.nix
index 7233236216f..735580eee5d 100644
--- a/pkgs/tools/misc/entr/default.nix
+++ b/pkgs/tools/misc/entr/default.nix
@@ -26,6 +26,6 @@ stdenv.mkDerivation rec {
     description = "Run arbitrary commands when files change";
     license = licenses.isc;
     platforms = platforms.all;
-    maintainers = with maintainers; [ pSub ];
+    maintainers = with maintainers; [ pSub synthetica ];
   };
 }
-- 
GitLab


From 8468a6f90f2c7ab93a758376112680c272a17bce Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 8 Oct 2019 14:34:14 +0200
Subject: [PATCH 2206/2254] tdesktop: 1.8.13 -> 1.8.15

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

diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 0aec91c853a..e57ff881af3 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -1,14 +1,14 @@
 { mkDerivation, lib, fetchFromGitHub, fetchsvn, fetchpatch
 , pkgconfig, pythonPackages, cmake, wrapGAppsHook, wrapQtAppsHook, gcc9
 , qtbase, qtimageformats, gtk3, libappindicator-gtk3, libnotify, xdg_utils
-, dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3
+, dee, ffmpeg_4, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3
 }:
 
 with lib;
 
 mkDerivation rec {
   pname = "telegram-desktop";
-  version = "1.8.13";
+  version = "1.8.15";
   # Note: Due to our strong dependency on the Arch patches it's probably best
   # to also wait for the Arch update (especially if the patches don't apply).
 
@@ -17,7 +17,7 @@ mkDerivation rec {
     owner = "telegramdesktop";
     repo = "tdesktop";
     rev = "v${version}";
-    sha256 = "19p4cjzk7jyhrd4sd8dq1r1zksff23zyg5rh5vlr3kqd372bffzz";
+    sha256 = "03173y2nlkf757llgpia8p2dkkwsjra7b6qm5nhmkcwcm8kmsvyy";
     fetchSubmodules = true;
   };
 
@@ -59,7 +59,7 @@ mkDerivation rec {
 
   buildInputs = [
     qtbase qtimageformats gtk3 libappindicator-gtk3
-    dee ffmpeg openalSoft minizip libopus alsaLib libpulseaudio range-v3
+    dee ffmpeg_4 openalSoft minizip libopus alsaLib libpulseaudio range-v3
   ];
 
   enableParallelBuilding = true;
-- 
GitLab


From 3aa784b3e3ed12f624c8730b21d39f9c2b24c751 Mon Sep 17 00:00:00 2001
From: Christian Kampka <christian@kampka.net>
Date: Sun, 6 Oct 2019 21:31:23 +0200
Subject: [PATCH 2207/2254] drone-cli: 0.8.6 -> 1.2.0

---
 .../drone-cli/default.nix                     |  16 +-
 .../continuous-integration/drone-cli/deps.nix | 274 ------------------
 2 files changed, 10 insertions(+), 280 deletions(-)
 delete mode 100644 pkgs/development/tools/continuous-integration/drone-cli/deps.nix

diff --git a/pkgs/development/tools/continuous-integration/drone-cli/default.nix b/pkgs/development/tools/continuous-integration/drone-cli/default.nix
index b20d5cfbeee..1a3105a2269 100644
--- a/pkgs/development/tools/continuous-integration/drone-cli/default.nix
+++ b/pkgs/development/tools/continuous-integration/drone-cli/default.nix
@@ -1,19 +1,23 @@
-# with import <nixpkgs>{};
-{ stdenv, fetchFromGitHub, buildGoPackage }:
+{ stdenv, fetchFromGitHub, buildGoModule }:
 
-buildGoPackage rec {
+let version = "1.2.0";
+in buildGoModule rec {
+  inherit version;
   pname = "drone-cli";
-  version = "0.8.6";
   revision = "v${version}";
   goPackagePath = "github.com/drone/drone-cli";
 
-  goDeps= ./deps.nix;
+  modSha256 = "0jvhnrvqi1axypyzgjzbv44s7w1j53y6wak6xlkxdm64qw6pf1hc";
+
+  preBuild = ''
+    buildFlagsArray+=("-ldflags" "-X main.version=${version}")
+  '';
 
   src = fetchFromGitHub {
     owner = "drone";
     repo = "drone-cli";
     rev = revision;
-    sha256 = "1vvilpqyx9jl0lc9hr73qxngwhwbyk81fycal7ys1w59gv9hxrh9";
+    sha256 = "1b1c3mih760z3hx5xws9h4m1xhlx1pm4qhm3sm31cyim9p8rmi4s";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/continuous-integration/drone-cli/deps.nix b/pkgs/development/tools/continuous-integration/drone-cli/deps.nix
deleted file mode 100644
index d6486db1395..00000000000
--- a/pkgs/development/tools/continuous-integration/drone-cli/deps.nix
+++ /dev/null
@@ -1,274 +0,0 @@
-# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
-[
-  {
-    goPackagePath  = "github.com/Microsoft/go-winio";
-    fetch = {
-      type = "git";
-      url = "https://github.com/Microsoft/go-winio";
-      rev =  "7da180ee92d8bd8bb8c37fc560e673e6557c392f";
-      sha256 = "19gjjhmzswhm11wzj38r5alxypmflmy0z42flhc3czhmmwv7b1av";
-    };
-  }
-  {
-    goPackagePath  = "github.com/Sirupsen/logrus";
-    fetch = {
-      type = "git";
-      url = "https://github.com/Sirupsen/logrus";
-      rev =  "d682213848ed68c0a260ca37d6dd5ace8423f5ba";
-      sha256 = "0nzyqwzx3k7nqfq8q7yv32gaf3ymq3bpwhkmw1hj2zakq5a93d8x";
-    };
-  }
-  {
-    goPackagePath  = "github.com/cncd/pipeline";
-    fetch = {
-      type = "git";
-      url = "https://github.com/cncd/pipeline";
-      rev =  "3a09486affc9215ba52f55b1f6e10182458d1aba";
-      sha256 = "17v9bwmqhr9pqppsqpb2qg7klip5jmks5c5kq6lxw6iq75q3p5zm";
-    };
-  }
-  {
-    goPackagePath  = "github.com/docker/distribution";
-    fetch = {
-      type = "git";
-      url = "https://github.com/docker/distribution";
-      rev =  "7dba427612198a11b161a27f9d40bb2dca1ccd20";
-      sha256 = "0sv2044znv2cjcll0lc45wbjhsy0hpfkbczhl07m81i62r929l27";
-    };
-  }
-  {
-    goPackagePath  = "github.com/docker/docker";
-    fetch = {
-      type = "git";
-      url = "https://github.com/docker/docker";
-      rev =  "f645ffca04abf2dd6c89ac9057a1eb7d2b0ac338";
-      sha256 = "0ic848invzfyzj9psbd8d3wvqddxbxbpj8vy2dbdqcwl26qabaqf";
-    };
-  }
-  {
-    goPackagePath  = "github.com/docker/go-connections";
-    fetch = {
-      type = "git";
-      url = "https://github.com/docker/go-connections";
-      rev =  "eb315e36415380e7c2fdee175262560ff42359da";
-      sha256 = "0jsci3f0dc3bd0bab7byq24qvwpd6dw34hnd2kmvvgrg31xzb73f";
-    };
-  }
-  {
-    goPackagePath  = "github.com/docker/go-units";
-    fetch = {
-      type = "git";
-      url = "https://github.com/docker/go-units";
-      rev =  "f2145db703495b2e525c59662db69a7344b00bb8";
-      sha256 = "0ql76imazd27h1dnnala49qsaw2dl6hspcwzh20bgm9ajcv0fwd0";
-    };
-  }
-  {
-    goPackagePath  = "github.com/docker/libcompose";
-    fetch = {
-      type = "git";
-      url = "https://github.com/docker/libcompose";
-      rev =  "1c4bd4542afb20db0b51afd71d9ebceaf206e2dd";
-      sha256 = "1prm5w6d0zvc39jq7wxdgis3pzzra2wdqxqn68ip5dhf3m32c8vn";
-    };
-  }
-  {
-    goPackagePath  = "github.com/drone/drone-go";
-    fetch = {
-      type = "git";
-      url = "https://github.com/drone/drone-go";
-      rev =  "7f20e6c113d3ffa2af80401c4eba7d510c8fd875";
-      sha256 = "1qm5nmzqmvjl8c2nfhhbp5a4ij1zfw4dinx278ns9qb0w973614k";
-    };
-  }
-  {
-    goPackagePath  = "github.com/drone/envsubst";
-    fetch = {
-      type = "git";
-      url = "https://github.com/drone/envsubst";
-      rev =  "f4d1a8ef8670afc9eea1fb95ee09a979fd2763a3";
-      sha256 = "10rj5zskp6f0bw648c1fn76v18jlidjd7ri76kk3csz2bwjm3m9c";
-    };
-  }
-  {
-    goPackagePath  = "github.com/fatih/color";
-    fetch = {
-      type = "git";
-      url = "https://github.com/fatih/color";
-      rev =  "507f6050b8568533fb3f5504de8e5205fa62a114";
-      sha256 = "0k1v9dkhrxiqhg48yqkwzpd7x40xx38gv2pgknswbsy4r8w644i7";
-    };
-  }
-  {
-    goPackagePath  = "github.com/flynn/go-shlex";
-    fetch = {
-      type = "git";
-      url = "https://github.com/flynn/go-shlex";
-      rev =  "3f9db97f856818214da2e1057f8ad84803971cff";
-      sha256 = "1j743lysygkpa2s2gii2xr32j7bxgc15zv4113b0q9jhn676ysia";
-    };
-  }
-  {
-    goPackagePath  = "github.com/ghodss/yaml";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ghodss/yaml";
-      rev =  "0ca9ea5df5451ffdf184b4428c902747c2c11cd7";
-      sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g";
-    };
-  }
-  {
-    goPackagePath  = "github.com/golang/protobuf";
-    fetch = {
-      type = "git";
-      url = "https://github.com/golang/protobuf";
-      rev =  "925541529c1fa6821df4e44ce2723319eb2be768";
-      sha256 = "1d3zjvhl115l23xakj0014qpjchivlg098h10v5nfirkk1i9f9sa";
-    };
-  }
-  {
-    goPackagePath  = "github.com/google/go-jsonnet";
-    fetch = {
-      type = "git";
-      url = "https://github.com/drone/go-jsonnet.git";
-      rev =  "0274286eef945e5e24be6ebfc13a9deefdd312ee";
-      # sha256 = "105jqawa401z5kcsbpan3cg9lryxlnnrclg6s9xnzslwd9wxyfrl";
-      sha256 = "0crbsmwgy9iav7rnhkgkqv8cbyl6q60bjkbfcaqxb6m47q3d544a";
-    };
-  }
-  {
-    goPackagePath  = "github.com/jackspirou/syscerts";
-    fetch = {
-      type = "git";
-      url = "https://github.com/jackspirou/syscerts";
-      rev =  "b68f5469dff16e102bd6a2d5b3e79341c938d736";
-      sha256 = "0mjz64qnysmy9lh0hrjvwir5ndlh5li13m6zvfrl0s5gi7m9v0kd";
-    };
-  }
-  {
-    goPackagePath  = "github.com/joho/godotenv";
-    fetch = {
-      type = "git";
-      url = "https://github.com/joho/godotenv";
-      rev =  "a79fa1e548e2c689c241d10173efd51e5d689d5b";
-      sha256 = "09610yqswxa02905mp9cqgsm50r76saagzddc55sqav4ad04j6qm";
-    };
-  }
-  {
-    goPackagePath  = "github.com/mattn/go-colorable";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mattn/go-colorable";
-      rev =  "167de6bfdfba052fa6b2d3664c8f5272e23c9072";
-      sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx";
-    };
-  }
-  {
-    goPackagePath  = "github.com/mattn/go-isatty";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mattn/go-isatty";
-      rev =  "0360b2af4f38e8d38c7fce2a9f4e702702d73a39";
-      sha256 = "06w45aqz2a6yrk25axbly2k5wmsccv8cspb94bfmz4izvw8h927n";
-    };
-  }
-  {
-    goPackagePath  = "github.com/opencontainers/go-digest";
-    fetch = {
-      type = "git";
-      url = "https://github.com/opencontainers/go-digest";
-      rev =  "279bed98673dd5bef374d3b6e4b09e2af76183bf";
-      sha256 = "01gc7fpn8ax429024p2fcx3yb18axwz5bjf2hqxlii1jbsgw4bh9";
-    };
-  }
-  {
-    goPackagePath  = "github.com/pkg/browser";
-    fetch = {
-      type = "git";
-      url = "https://github.com/pkg/browser";
-      rev =  "c90ca0c84f15f81c982e32665bffd8d7aac8f097";
-      sha256 = "05xpqsns08blmwdh8aw5kpq2d9x4fl91535j6np1ylw1q2b67b8i";
-    };
-  }
-  {
-    goPackagePath  = "github.com/pkg/errors";
-    fetch = {
-      type = "git";
-      url = "https://github.com/pkg/errors";
-      rev =  "645ef00459ed84a119197bfb8d8205042c6df63d";
-      sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
-    };
-  }
-  {
-    goPackagePath  = "github.com/urfave/cli";
-    fetch = {
-      type = "git";
-      url = "https://github.com/urfave/cli";
-      rev =  "cfb38830724cc34fedffe9a2a29fb54fa9169cd1";
-      sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj";
-    };
-  }
-  {
-    goPackagePath  = "golang.org/x/crypto";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/crypto";
-      rev =  "650f4a345ab4e5b245a3034b110ebc7299e68186";
-      sha256 = "0r1ij3lq07d6kg3dlpj508vwkwmz0qpwcrbismisw6vkl7ls7w89";
-    };
-  }
-  {
-    goPackagePath  = "golang.org/x/net";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/net";
-      rev =  "f5dfe339be1d06f81b22525fe34671ee7d2c8904";
-      sha256 = "01y9j7pjnnld4ipmzjvs0hls0hh698f2sga8cxaw5y6r5j7igaah";
-    };
-  }
-  {
-    goPackagePath  = "golang.org/x/oauth2";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/oauth2";
-      rev =  "543e37812f10c46c622c9575afd7ad22f22a12ba";
-      sha256 = "0kc816fq1zj5wdw4mfa7w2q26rnh273157w8n0d30xpzl8ba2isr";
-    };
-  }
-  {
-    goPackagePath  = "golang.org/x/sync";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/sync";
-      rev =  "fd80eb99c8f653c847d294a001bdf2a3a6f768f5";
-      sha256 = "12lzldlj1cqc1babp1hkkn76fglzn5abkqvmbpr4f2j95mf9x836";
-    };
-  }
-  {
-    goPackagePath  = "golang.org/x/sys";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/sys";
-      rev =  "37707fdb30a5b38865cfb95e5aab41707daec7fd";
-      sha256 = "1abrr2507a737hdqv4q7pw7hv6ls9pdiq9crhdi52r3gcz6hvizg";
-    };
-  }
-  {
-    goPackagePath  = "google.golang.org/appengine";
-    fetch = {
-      type = "git";
-      url = "https://github.com/golang/appengine";
-      rev =  "150dc57a1b433e64154302bdc40b6bb8aefa313a";
-      sha256 = "0w3knznv39k8bm85ri62f83czcrxknql7dv6p9hk1a5jx3xljgxq";
-    };
-  }
-  {
-    goPackagePath  = "gopkg.in/yaml.v2";
-    fetch = {
-      type = "git";
-      url = "https://github.com/go-yaml/yaml";
-      rev =  "d670f9405373e636a5a2765eea47fac0c9bc91a4";
-      sha256 = "1w1xid51n8v1mydn2m3vgggw8qgpd5a5sr62snsc77d99fpjsrs0";
-    };
-  }
-]
-- 
GitLab


From afa3abf632a07a627a651ae7f8fdaad0c6e8919b Mon Sep 17 00:00:00 2001
From: talyz <kim.lindberger@gmail.com>
Date: Tue, 8 Oct 2019 15:52:11 +0200
Subject: [PATCH 2208/2254] gitlab: Refactor for new repo structure

GitLab recently restructured their repos; whereas previously they had
one gitlab-ce and one gitlab-ee repo, they're now one and the
same. All proprietary components are put into the ee subdirectory -
removing it gives us the foss / community version of GitLab. For more
info, see
https://about.gitlab.com/2019/02/21/merging-ce-and-ee-codebases/

This gives us the opportunity to simplify things quite a bit, since we
don't have to keep track of two separate versions of either the base
data or rubyEnv.
---
 .../version-management/gitlab/data.json       |   39 +-
 .../version-management/gitlab/default.nix     |   14 +-
 .../gitlab/rubyEnv-ee/Gemfile                 |  471 --
 .../gitlab/rubyEnv-ee/Gemfile.lock            | 1336 -----
 .../gitlab/rubyEnv-ee/gemset.nix              | 4285 -----------------
 .../gitlab/{rubyEnv-ce => rubyEnv}/Gemfile    |    0
 .../{rubyEnv-ce => rubyEnv}/Gemfile.lock      |    0
 .../gitlab/{rubyEnv-ce => rubyEnv}/gemset.nix |  658 ++-
 .../version-management/gitlab/update.py       |  101 +-
 9 files changed, 695 insertions(+), 6209 deletions(-)
 delete mode 100644 pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile
 delete mode 100644 pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock
 delete mode 100644 pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix
 rename pkgs/applications/version-management/gitlab/{rubyEnv-ce => rubyEnv}/Gemfile (100%)
 rename pkgs/applications/version-management/gitlab/{rubyEnv-ce => rubyEnv}/Gemfile.lock (100%)
 rename pkgs/applications/version-management/gitlab/{rubyEnv-ce => rubyEnv}/gemset.nix (87%)

diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json
index c4f0c5deb00..9de3a0e3d95 100644
--- a/pkgs/applications/version-management/gitlab/data.json
+++ b/pkgs/applications/version-management/gitlab/data.json
@@ -1,32 +1,13 @@
 {
-  "ce": {
-    "version": "12.3.4",
-    "repo_hash": "02nfgwvm8z8cn64qlkvjmj9mvxqy9aszzdsmfr0kjjq0zzg7l7hk",
-    "deb_hash": "09iwrqdx897i35hb0dvw13s0747wqcqk67h855a9abm5phbkv4bb",
-    "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_12.3.4-ce.0_amd64.deb/download.deb",
-    "owner": "gitlab-org",
-    "repo": "gitlab-foss",
-    "rev": "v12.3.4",
-    "passthru": {
-      "GITALY_SERVER_VERSION": "1.65.1",
-      "GITLAB_PAGES_VERSION": "1.9.0",
-      "GITLAB_SHELL_VERSION": "10.0.0",
-      "GITLAB_WORKHORSE_VERSION": "8.10.0"
-    }
-  },
-  "ee": {
-    "version": "12.3.4",
-    "repo_hash": "152gg7h0zwzih93ajn3ki5ij8c1fbanlgwl40i44nnsk79m8jbia",
-    "deb_hash": "1kyw3r0l5h79sfckfqwwfd7g2zxslywksbv58yhar6nwcidrjags",
-    "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_12.3.4-ee.0_amd64.deb/download.deb",
-    "owner": "gitlab-org",
-    "repo": "gitlab",
-    "rev": "v12.3.4-ee",
-    "passthru": {
-      "GITALY_SERVER_VERSION": "1.65.1",
-      "GITLAB_PAGES_VERSION": "1.9.0",
-      "GITLAB_SHELL_VERSION": "10.0.0",
-      "GITLAB_WORKHORSE_VERSION": "8.10.0"
-    }
+  "version": "12.3.4",
+  "repo_hash": "152gg7h0zwzih93ajn3ki5ij8c1fbanlgwl40i44nnsk79m8jbia",
+  "owner": "gitlab-org",
+  "repo": "gitlab",
+  "rev": "v12.3.4-ee",
+  "passthru": {
+    "GITALY_SERVER_VERSION": "1.65.1",
+    "GITLAB_PAGES_VERSION": "1.9.0",
+    "GITLAB_SHELL_VERSION": "10.0.0",
+    "GITLAB_WORKHORSE_VERSION": "8.10.0"
   }
 }
\ No newline at end of file
diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix
index 969d8e5b3b4..ad5e22430ba 100644
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@@ -5,8 +5,7 @@
 }:
 
 let
-  flavour = if gitlabEnterprise then "ee" else "ce";
-  data = (builtins.fromJSON (builtins.readFile ./data.json)).${flavour};
+  data = (builtins.fromJSON (builtins.readFile ./data.json));
 
   version = data.version;
   src = fetchFromGitLab {
@@ -19,7 +18,7 @@ let
   rubyEnv = bundlerEnv rec {
     name = "gitlab-env-${version}";
     inherit ruby;
-    gemdir = ./rubyEnv- + (if gitlabEnterprise then "ee" else "ce");
+    gemdir = ./rubyEnv;
     gemset =
       let x = import (gemdir + "/gemset.nix");
       in x // {
@@ -93,7 +92,7 @@ let
   };
 in
 stdenv.mkDerivation {
-  name = "gitlab${if gitlabEnterprise then "-ee" else ""}-${version}";
+  name = "gitlab${lib.optionalString gitlabEnterprise "-ee"}-${version}";
 
   inherit src;
 
@@ -104,6 +103,11 @@ stdenv.mkDerivation {
   patches = [ ./remove-hardcoded-locations.patch ];
 
   postPatch = ''
+    ${lib.optionalString (!gitlabEnterprise) ''
+      # Remove all proprietary components
+      rm -rf ee
+    ''}
+
     # For reasons I don't understand "bundle exec" ignores the
     # RAILS_ENV causing tests to be executed that fail because we're
     # not installing development and test gems above. Deleting the
@@ -138,7 +142,7 @@ stdenv.mkDerivation {
   '';
 
   passthru = {
-    inherit rubyEnv;
+    inherit rubyEnv assets;
     ruby = rubyEnv.wrappedRuby;
     GITALY_SERVER_VERSION = data.passthru.GITALY_SERVER_VERSION;
     GITLAB_PAGES_VERSION = data.passthru.GITLAB_PAGES_VERSION;
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile
deleted file mode 100644
index 864e514ae0d..00000000000
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile
+++ /dev/null
@@ -1,471 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'rails', '5.2.3'
-
-gem 'bootsnap', '~> 1.4'
-
-# Improves copy-on-write performance for MRI
-gem 'nakayoshi_fork', '~> 0.0.4'
-
-# Responders respond_to and respond_with
-gem 'responders', '~> 2.0'
-
-gem 'sprockets', '~> 3.7.0'
-
-# Default values for AR models
-gem 'default_value_for', '~> 3.2.0'
-
-# Supported DBs
-gem 'pg', '~> 1.1'
-
-gem 'rugged', '~> 0.28'
-gem 'grape-path-helpers', '~> 1.1'
-
-gem 'faraday', '~> 0.12'
-
-# Authentication libraries
-gem 'devise', '~> 4.6'
-gem 'doorkeeper', '~> 4.3'
-gem 'doorkeeper-openid_connect', '~> 1.5'
-gem 'omniauth', '~> 1.8'
-gem 'omniauth-auth0', '~> 2.0.0'
-gem 'omniauth-azure-oauth2', '~> 0.0.9'
-gem 'omniauth-cas3', '~> 1.1.4'
-gem 'omniauth-facebook', '~> 4.0.0'
-gem 'omniauth-github', '~> 1.3'
-gem 'omniauth-gitlab', '~> 1.0.2'
-gem 'omniauth-google-oauth2', '~> 0.6.0'
-gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos
-gem 'omniauth-oauth2-generic', '~> 0.2.2'
-gem 'omniauth-saml', '~> 1.10'
-gem 'omniauth-shibboleth', '~> 1.3.0'
-gem 'omniauth-twitter', '~> 1.4'
-gem 'omniauth_crowd', '~> 2.2.0'
-gem 'omniauth-authentiq', '~> 0.3.3'
-gem 'omniauth_openid_connect', '~> 0.3.1'
-gem "omniauth-ultraauth", '~> 0.0.2'
-gem 'omniauth-salesforce', '~> 1.0.5'
-gem 'rack-oauth2', '~> 1.9.3'
-gem 'jwt', '~> 2.1.0'
-
-# Kerberos authentication. EE-only
-gem 'gssapi', group: :kerberos
-
-# Spam and anti-bot protection
-gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails'
-gem 'akismet', '~> 2.0'
-gem 'invisible_captcha', '~> 0.12.1'
-
-# Two-factor authentication
-gem 'devise-two-factor', '~> 3.0.0'
-gem 'rqrcode-rails3', '~> 0.1.7'
-gem 'attr_encrypted', '~> 3.1.0'
-gem 'u2f', '~> 0.2.1'
-
-# GitLab Pages
-gem 'validates_hostname', '~> 1.0.6'
-gem 'rubyzip', '~> 1.2.2', require: 'zip'
-# GitLab Pages letsencrypt support
-gem 'acme-client', '~> 2.0.2'
-
-# Browser detection
-gem 'browser', '~> 2.5'
-
-# GPG
-gem 'gpgme', '~> 2.0.18'
-
-# LDAP Auth
-# GitLab fork with several improvements to original library. For full list of changes
-# see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master
-gem 'gitlab_omniauth-ldap', '~> 2.1.1', require: 'omniauth-ldap'
-gem 'net-ldap'
-
-# API
-gem 'grape', '~> 1.1.0'
-gem 'grape-entity', '~> 0.7.1'
-gem 'rack-cors', '~> 1.0.0', require: 'rack/cors'
-
-# GraphQL API
-gem 'graphql', '~> 1.9.11'
-# NOTE: graphiql-rails v1.5+ doesn't work: https://gitlab.com/gitlab-org/gitlab-ce/issues/67293
-# TODO: remove app/views/graphiql/rails/editors/show.html.erb when https://github.com/rmosolgo/graphiql-rails/pull/71 is released:
-# https://gitlab.com/gitlab-org/gitlab-ce/issues/67263
-gem 'graphiql-rails', '~> 1.4.10'
-gem 'apollo_upload_server', '~> 2.0.0.beta3'
-gem 'graphql-docs', '~> 1.6.0', group: [:development, :test]
-
-# Disable strong_params so that Mash does not respond to :permitted?
-gem 'hashie-forbidden_attributes'
-
-# Pagination
-gem 'kaminari', '~> 1.0'
-
-# HAML
-gem 'hamlit', '~> 2.8.8'
-
-# Files attachments
-gem 'carrierwave', '~> 1.3'
-gem 'mini_magick'
-
-# for backups
-gem 'fog-aws', '~> 3.5'
-# Locked until fog-google resolves https://github.com/fog/fog-google/issues/421.
-# Also see config/initializers/fog_core_patch.rb.
-gem 'fog-core', '= 2.1.0'
-gem 'fog-google', '~> 1.9'
-gem 'fog-local', '~> 0.6'
-gem 'fog-openstack', '~> 1.0'
-gem 'fog-rackspace', '~> 0.1.1'
-gem 'fog-aliyun', '~> 0.3'
-
-# for Google storage
-gem 'google-api-client', '~> 0.23'
-
-# for aws storage
-gem 'unf', '~> 0.1.4'
-
-# Seed data
-gem 'seed-fu', '~> 2.3.7'
-
-# Search
-gem 'elasticsearch-model', '~> 0.1.9'
-gem 'elasticsearch-rails', '~> 0.1.9', require: 'elasticsearch/rails/instrumentation'
-gem 'elasticsearch-api',   '5.0.3'
-gem 'aws-sdk'
-gem 'faraday_middleware-aws-signers-v4'
-
-# Markdown and HTML processing
-gem 'html-pipeline', '~> 2.8'
-gem 'deckar01-task_list', '2.2.0'
-gem 'gitlab-markup', '~> 1.7.0'
-gem 'github-markup', '~> 1.7.0', require: 'github/markup'
-gem 'commonmarker', '~> 0.17'
-gem 'RedCloth', '~> 4.3.2'
-gem 'rdoc', '~> 6.0'
-gem 'org-ruby', '~> 0.9.12'
-gem 'creole', '~> 0.5.0'
-gem 'wikicloth', '0.8.1'
-gem 'asciidoctor', '~> 2.0.10'
-gem 'asciidoctor-include-ext', '~> 0.3.1', require: false
-gem 'asciidoctor-plantuml', '0.0.9'
-gem 'rouge', '~> 3.7'
-gem 'truncato', '~> 0.7.11'
-gem 'bootstrap_form', '~> 4.2.0'
-gem 'nokogiri', '~> 1.10.4'
-gem 'escape_utils', '~> 1.1'
-
-# Calendar rendering
-gem 'icalendar'
-
-# Diffs
-gem 'diffy', '~> 3.1.0'
-
-# Application server
-gem 'rack', '~> 2.0.7'
-
-group :unicorn do
-  gem 'unicorn', '~> 5.4.1'
-  gem 'unicorn-worker-killer', '~> 0.4.4'
-end
-
-group :puma do
-  gem 'puma', '~> 3.12', require: false
-  gem 'puma_worker_killer', require: false
-  gem 'rack-timeout', require: false
-end
-
-# State machine
-gem 'state_machines-activerecord', '~> 0.5.1'
-
-# Issue tags
-gem 'acts-as-taggable-on', '~> 6.0'
-
-# Background jobs
-gem 'sidekiq', '~> 5.2.7'
-gem 'sidekiq-cron', '~> 1.0'
-gem 'redis-namespace', '~> 1.6.0'
-gem 'gitlab-sidekiq-fetcher', '0.5.2', require: 'sidekiq-reliable-fetch'
-
-# Cron Parser
-gem 'fugit', '~> 1.2.1'
-
-# HTTP requests
-gem 'httparty', '~> 0.16.4'
-
-# Colored output to console
-gem 'rainbow', '~> 3.0'
-
-# Progress bar
-gem 'ruby-progressbar'
-
-# GitLab settings
-gem 'settingslogic', '~> 2.0.9'
-
-# Linear-time regex library for untrusted regular expressions
-gem 're2', '~> 1.1.1'
-
-# Misc
-
-gem 'version_sorter', '~> 2.2.4'
-
-# Export Ruby Regex to Javascript
-gem 'js_regex', '~> 3.1'
-
-# User agent parsing
-gem 'device_detector'
-
-# Redis
-gem 'redis', '~> 4.0'
-gem 'connection_pool', '~> 2.0'
-
-# Redis session store
-gem 'redis-rails', '~> 5.0.2'
-
-# Discord integration
-gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false
-
-# HipChat integration
-gem 'hipchat', '~> 1.5.0'
-
-# Jira integration
-gem 'jira-ruby', '~> 1.7'
-gem 'atlassian-jwt', '~> 0.2.0'
-
-# Flowdock integration
-gem 'flowdock', '~> 0.7'
-
-# Slack integration
-gem 'slack-notifier', '~> 1.5.1'
-
-# Hangouts Chat integration
-gem 'hangouts-chat', '~> 0.0.5'
-
-# Asana integration
-gem 'asana', '~> 0.8.1'
-
-# FogBugz integration
-gem 'ruby-fogbugz', '~> 0.2.1'
-
-# Kubernetes integration
-gem 'kubeclient', '~> 4.4.0'
-
-# Sanitize user input
-gem 'sanitize', '~> 4.6'
-gem 'babosa', '~> 1.0.2'
-
-# Sanitizes SVG input
-gem 'loofah', '~> 2.2'
-
-# Working with license
-gem 'licensee', '~> 8.9'
-
-# Protect against bruteforcing
-gem 'rack-attack', '~> 4.4.1'
-
-# Ace editor
-gem 'ace-rails-ap', '~> 4.1.0'
-
-# Detect and convert string character encoding
-gem 'charlock_holmes', '~> 0.7.5'
-
-# Detect mime content type from content
-gem 'mimemagic', '~> 0.3.2'
-
-# Faster blank
-gem 'fast_blank'
-
-# Parse time & duration
-gem 'chronic', '~> 0.10.2'
-gem 'gitlab_chronic_duration', '~> 0.10.6.1'
-
-gem 'webpack-rails', '~> 0.9.10'
-gem 'rack-proxy', '~> 0.6.0'
-
-gem 'sassc-rails', '~> 2.1.0'
-gem 'uglifier', '~> 2.7.2'
-
-gem 'addressable', '~> 2.5.2'
-gem 'font-awesome-rails', '~> 4.7'
-gem 'gemojione', '~> 3.3'
-gem 'gon', '~> 6.2'
-gem 'request_store', '~> 1.3'
-gem 'base32', '~> 0.3.0'
-
-gem "gitlab-license", "~> 1.0"
-
-# Sentry integration
-gem 'sentry-raven', '~> 2.9'
-
-gem 'premailer-rails', '~> 1.9.7'
-
-# LabKit: Tracing and Correlation
-gem 'gitlab-labkit', '~> 0.5'
-
-# I18n
-gem 'ruby_parser', '~> 3.8', require: false
-gem 'rails-i18n', '~> 5.1'
-gem 'gettext_i18n_rails', '~> 1.8.0'
-gem 'gettext_i18n_rails_js', '~> 1.3'
-gem 'gettext', '~> 3.2.2', require: false, group: :development
-
-gem 'batch-loader', '~> 1.4.0'
-
-# Perf bar
-# https://gitlab.com/gitlab-org/gitlab-ee/issues/13996
-gem 'gitlab-peek', '~> 0.0.1', require: 'peek'
-
-# Snowplow events tracking
-gem 'snowplow-tracker', '~> 0.6.1'
-
-# Memory benchmarks
-gem 'derailed_benchmarks', require: false
-
-# Metrics
-group :metrics do
-  gem 'method_source', '~> 0.8', require: false
-  gem 'influxdb', '~> 0.2', require: false
-
-  # Prometheus
-  gem 'prometheus-client-mmap', '~> 0.9.10'
-  gem 'raindrops', '~> 0.18'
-end
-
-group :development do
-  gem 'foreman', '~> 0.84.0'
-  gem 'brakeman', '~> 4.2', require: false
-  gem 'danger', '~> 6.0', require: false
-
-  gem 'letter_opener_web', '~> 1.3.4'
-  gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
-
-  # Better errors handler
-  gem 'better_errors', '~> 2.5.0'
-  gem 'binding_of_caller', '~> 0.8.0'
-
-  # thin instead webrick
-  gem 'thin', '~> 1.7.0'
-end
-
-group :development, :test do
-  gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET']
-  gem 'pry-byebug', '~> 3.5.1', platform: :mri
-  gem 'pry-rails', '~> 0.3.4'
-
-  gem 'awesome_print', require: false
-  gem 'fuubar', '~> 2.2.0'
-
-  gem 'database_cleaner', '~> 1.7.0'
-  gem 'factory_bot_rails', '~> 4.8.2'
-  gem 'rspec-rails', '~> 3.8.0'
-  gem 'rspec-retry', '~> 0.6.1'
-  gem 'rspec_profiling', '~> 0.0.5'
-  gem 'rspec-set', '~> 0.1.3'
-  gem 'rspec-parameterized', require: false
-
-  # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
-  gem 'minitest', '~> 5.11.0'
-
-  # Generate Fake data
-  gem 'ffaker', '~> 2.10'
-
-  gem 'capybara', '~> 3.22.0'
-  gem 'capybara-screenshot', '~> 1.0.22'
-  gem 'selenium-webdriver', '~> 3.141'
-
-  gem 'spring', '~> 2.0.0'
-  gem 'spring-commands-rspec', '~> 1.0.4'
-
-  gem 'gitlab-styles', '~> 2.7', require: false
-  # Pin these dependencies, otherwise a new rule could break the CI pipelines
-  gem 'rubocop', '~> 0.69.0'
-  gem 'rubocop-performance', '~> 1.1.0'
-  gem 'rubocop-rspec', '~> 1.22.1'
-
-  gem 'scss_lint', '~> 0.56.0', require: false
-  gem 'haml_lint', '~> 0.31.0', require: false
-  gem 'simplecov', '~> 0.16.1', require: false
-  gem 'bundler-audit', '~> 0.5.0', require: false
-
-  gem 'benchmark-ips', '~> 2.3.0', require: false
-
-  gem 'license_finder', '~> 5.4', require: false
-  gem 'knapsack', '~> 1.17'
-
-  gem 'stackprof', '~> 0.2.10', require: false
-
-  gem 'simple_po_parser', '~> 1.1.2', require: false
-
-  gem 'timecop', '~> 0.8.0'
-end
-
-group :test do
-  gem 'shoulda-matchers', '~> 4.0.1', require: false
-  gem 'email_spec', '~> 2.2.0'
-  gem 'json-schema', '~> 2.8.0'
-  gem 'webmock', '~> 3.5.1'
-  gem 'rails-controller-testing'
-  gem 'concurrent-ruby', '~> 1.1'
-  gem 'test-prof', '~> 0.2.5'
-  gem 'rspec_junit_formatter'
-end
-
-gem 'octokit', '~> 4.9'
-
-gem 'mail_room', '~> 0.9.1'
-
-gem 'email_reply_trimmer', '~> 0.1'
-gem 'html2text'
-
-gem 'ruby-prof', '~> 1.0.0'
-gem 'rbtrace', '~> 0.4', require: false
-gem 'memory_profiler', '~> 0.9', require: false
-gem 'benchmark-memory', '~> 0.1', require: false
-gem 'activerecord-explain-analyze', '~> 0.1', require: false
-
-# OAuth
-gem 'oauth2', '~> 1.4'
-
-# Health check
-gem 'health_check', '~> 2.6.0'
-
-# System information
-gem 'vmstat', '~> 2.3.0'
-gem 'sys-filesystem', '~> 1.1.6'
-
-# NTP client
-gem 'net-ntp'
-
-# SSH host key support
-gem 'net-ssh', '~> 5.2'
-gem 'sshkey', '~> 2.0'
-
-# Required for ED25519 SSH host key support
-group :ed25519 do
-  gem 'ed25519', '~> 1.2'
-  gem 'bcrypt_pbkdf', '~> 1.0'
-end
-
-# Gitaly GRPC protocol definitions
-gem 'gitaly', '~> 1.58.0'
-
-gem 'grpc', '~> 1.19.0'
-
-gem 'google-protobuf', '~> 3.7.1'
-
-gem 'toml-rb', '~> 1.0.0', require: false
-
-# Feature toggles
-gem 'flipper', '~> 0.13.0'
-gem 'flipper-active_record', '~> 0.13.0'
-gem 'flipper-active_support_cache_store', '~> 0.13.0'
-gem 'unleash', '~> 0.1.5'
-
-# Structured logging
-gem 'lograge', '~> 0.5'
-gem 'grape_logging', '~> 1.7'
-
-# DNS Lookup
-gem 'net-dns', '~> 0.9.0'
-
-# Countries list
-gem 'countries', '~> 3.0'
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock
deleted file mode 100644
index fec34622be3..00000000000
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock
+++ /dev/null
@@ -1,1336 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    RedCloth (4.3.2)
-    abstract_type (0.0.7)
-    ace-rails-ap (4.1.2)
-    acme-client (2.0.2)
-      faraday (~> 0.9, >= 0.9.1)
-    actioncable (5.2.3)
-      actionpack (= 5.2.3)
-      nio4r (~> 2.0)
-      websocket-driver (>= 0.6.1)
-    actionmailer (5.2.3)
-      actionpack (= 5.2.3)
-      actionview (= 5.2.3)
-      activejob (= 5.2.3)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (5.2.3)
-      actionview (= 5.2.3)
-      activesupport (= 5.2.3)
-      rack (~> 2.0)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.3)
-      activesupport (= 5.2.3)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.3)
-      activesupport (= 5.2.3)
-      globalid (>= 0.3.6)
-    activemodel (5.2.3)
-      activesupport (= 5.2.3)
-    activerecord (5.2.3)
-      activemodel (= 5.2.3)
-      activesupport (= 5.2.3)
-      arel (>= 9.0)
-    activerecord-explain-analyze (0.1.0)
-      activerecord (>= 4)
-      pg
-    activestorage (5.2.3)
-      actionpack (= 5.2.3)
-      activerecord (= 5.2.3)
-      marcel (~> 0.3.1)
-    activesupport (5.2.3)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    acts-as-taggable-on (6.0.0)
-      activerecord (~> 5.0)
-    adamantium (0.2.0)
-      ice_nine (~> 0.11.0)
-      memoizable (~> 0.4.0)
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
-    aes_key_wrap (1.0.1)
-    akismet (2.0.0)
-    apollo_upload_server (2.0.0.beta.3)
-      graphql (>= 1.8)
-      rails (>= 4.2)
-    arel (9.0.0)
-    asana (0.8.1)
-      faraday (~> 0.9)
-      faraday_middleware (~> 0.9)
-      faraday_middleware-multi_json (~> 0.0)
-      oauth2 (~> 1.0)
-    asciidoctor (2.0.10)
-    asciidoctor-include-ext (0.3.1)
-      asciidoctor (>= 1.5.6, < 3.0.0)
-    asciidoctor-plantuml (0.0.9)
-      asciidoctor (>= 1.5.6, < 3.0.0)
-    ast (2.4.0)
-    atlassian-jwt (0.2.0)
-      jwt (~> 2.1.0)
-    attr_encrypted (3.1.0)
-      encryptor (~> 3.0.0)
-    attr_required (1.0.1)
-    awesome_print (1.8.0)
-    aws-sdk (2.9.32)
-      aws-sdk-resources (= 2.9.32)
-    aws-sdk-core (2.9.32)
-      aws-sigv4 (~> 1.0)
-      jmespath (~> 1.0)
-    aws-sdk-resources (2.9.32)
-      aws-sdk-core (= 2.9.32)
-    aws-sigv4 (1.0.0)
-    axiom-types (0.1.1)
-      descendants_tracker (~> 0.0.4)
-      ice_nine (~> 0.11.0)
-      thread_safe (~> 0.3, >= 0.3.1)
-    babosa (1.0.2)
-    base32 (0.3.2)
-    batch-loader (1.4.0)
-    bcrypt (3.1.12)
-    bcrypt_pbkdf (1.0.0)
-    benchmark-ips (2.3.0)
-    benchmark-memory (0.1.2)
-      memory_profiler (~> 0.9)
-    better_errors (2.5.0)
-      coderay (>= 1.0.0)
-      erubi (>= 1.0.0)
-      rack (>= 0.9.0)
-    bindata (2.4.3)
-    binding_ninja (0.2.3)
-    binding_of_caller (0.8.0)
-      debug_inspector (>= 0.0.1)
-    bootsnap (1.4.4)
-      msgpack (~> 1.0)
-    bootstrap_form (4.2.0)
-      actionpack (>= 5.0)
-      activemodel (>= 5.0)
-    brakeman (4.2.1)
-    browser (2.5.3)
-    builder (3.2.3)
-    bullet (5.5.1)
-      activesupport (>= 3.0.0)
-      uniform_notifier (~> 1.10.0)
-    bundler-audit (0.5.0)
-      bundler (~> 1.2)
-      thor (~> 0.18)
-    byebug (9.1.0)
-    capybara (3.22.0)
-      addressable
-      mini_mime (>= 0.1.3)
-      nokogiri (~> 1.8)
-      rack (>= 1.6.0)
-      rack-test (>= 0.6.3)
-      regexp_parser (~> 1.5)
-      xpath (~> 3.2)
-    capybara-screenshot (1.0.22)
-      capybara (>= 1.0, < 4)
-      launchy
-    carrierwave (1.3.1)
-      activemodel (>= 4.0.0)
-      activesupport (>= 4.0.0)
-      mime-types (>= 1.16)
-    cause (0.1)
-    character_set (1.1.2)
-    charlock_holmes (0.7.6)
-    childprocess (0.9.0)
-      ffi (~> 1.0, >= 1.0.11)
-    chronic (0.10.2)
-    chunky_png (1.3.5)
-    citrus (3.0.2)
-    claide (1.0.3)
-    claide-plugins (0.9.2)
-      cork
-      nap
-      open4 (~> 1.3)
-    coderay (1.1.2)
-    coercible (1.0.0)
-      descendants_tracker (~> 0.0.1)
-    colored2 (3.1.2)
-    commonmarker (0.17.13)
-      ruby-enum (~> 0.5)
-    concord (0.1.5)
-      adamantium (~> 0.2.0)
-      equalizer (~> 0.0.9)
-    concurrent-ruby (1.1.5)
-    connection_pool (2.2.2)
-    contracts (0.11.0)
-    cork (0.3.0)
-      colored2 (~> 3.1)
-    countries (3.0.0)
-      i18n_data (~> 0.8.0)
-      sixarm_ruby_unaccent (~> 1.1)
-      unicode_utils (~> 1.4)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
-    crass (1.0.4)
-    creole (0.5.0)
-    css_parser (1.5.0)
-      addressable
-    daemons (1.2.6)
-    danger (6.0.9)
-      claide (~> 1.0)
-      claide-plugins (>= 0.9.2)
-      colored2 (~> 3.1)
-      cork (~> 0.1)
-      faraday (~> 0.9)
-      faraday-http-cache (~> 2.0)
-      git (~> 1.5)
-      kramdown (~> 2.0)
-      kramdown-parser-gfm (~> 1.0)
-      no_proxy_fix
-      octokit (~> 4.7)
-      terminal-table (~> 1)
-    database_cleaner (1.7.0)
-    debug_inspector (0.0.3)
-    debugger-ruby_core_source (1.3.8)
-    deckar01-task_list (2.2.0)
-      html-pipeline
-    declarative (0.0.10)
-    declarative-option (0.1.0)
-    default_value_for (3.2.0)
-      activerecord (>= 3.2.0, < 6.0)
-    derailed_benchmarks (1.3.5)
-      benchmark-ips (~> 2)
-      get_process_mem (~> 0)
-      heapy (~> 0)
-      memory_profiler (~> 0)
-      rack (>= 1)
-      rake (> 10, < 13)
-      thor (~> 0.19)
-    descendants_tracker (0.0.4)
-      thread_safe (~> 0.3, >= 0.3.1)
-    device_detector (1.0.0)
-    devise (4.6.2)
-      bcrypt (~> 3.0)
-      orm_adapter (~> 0.1)
-      railties (>= 4.1.0, < 6.0)
-      responders
-      warden (~> 1.2.3)
-    devise-two-factor (3.0.0)
-      activesupport
-      attr_encrypted (>= 1.3, < 4, != 2)
-      devise (~> 4.0)
-      railties
-      rotp (~> 2.0)
-    diff-lcs (1.3)
-    diffy (3.1.0)
-    discordrb-webhooks-blackst0ne (3.3.0)
-      rest-client (~> 2.0)
-    docile (1.3.1)
-    domain_name (0.5.20180417)
-      unf (>= 0.0.5, < 1.0.0)
-    doorkeeper (4.3.2)
-      railties (>= 4.2)
-    doorkeeper-openid_connect (1.5.0)
-      doorkeeper (~> 4.3)
-      json-jwt (~> 1.6)
-    ed25519 (1.2.4)
-    elasticsearch (5.0.3)
-      elasticsearch-api (= 5.0.3)
-      elasticsearch-transport (= 5.0.3)
-    elasticsearch-api (5.0.3)
-      multi_json
-    elasticsearch-model (0.1.9)
-      activesupport (> 3)
-      elasticsearch (> 0.4)
-      hashie
-    elasticsearch-rails (0.1.9)
-    elasticsearch-transport (5.0.3)
-      faraday
-      multi_json
-    email_reply_trimmer (0.1.6)
-    email_spec (2.2.0)
-      htmlentities (~> 4.3.3)
-      launchy (~> 2.1)
-      mail (~> 2.7)
-    encryptor (3.0.0)
-    equalizer (0.0.11)
-    erubi (1.8.0)
-    escape_utils (1.2.1)
-    et-orbi (1.2.1)
-      tzinfo
-    eventmachine (1.2.7)
-    excon (0.62.0)
-    execjs (2.6.0)
-    expression_parser (0.9.0)
-    extended-markdown-filter (0.6.0)
-      html-pipeline (~> 2.0)
-    factory_bot (4.8.2)
-      activesupport (>= 3.0.0)
-    factory_bot_rails (4.8.2)
-      factory_bot (~> 4.8.2)
-      railties (>= 3.0.0)
-    faraday (0.12.2)
-      multipart-post (>= 1.2, < 3)
-    faraday-http-cache (2.0.0)
-      faraday (~> 0.8)
-    faraday_middleware (0.12.2)
-      faraday (>= 0.7.4, < 1.0)
-    faraday_middleware-aws-signers-v4 (0.1.7)
-      aws-sdk-resources (~> 2)
-      faraday (~> 0.9)
-    faraday_middleware-multi_json (0.0.6)
-      faraday_middleware
-      multi_json
-    fast_blank (1.0.0)
-    fast_gettext (1.6.0)
-    ffaker (2.10.0)
-    ffi (1.11.1)
-    flipper (0.13.0)
-    flipper-active_record (0.13.0)
-      activerecord (>= 3.2, < 6)
-      flipper (~> 0.13.0)
-    flipper-active_support_cache_store (0.13.0)
-      activesupport (>= 3.2, < 6)
-      flipper (~> 0.13.0)
-    flowdock (0.7.1)
-      httparty (~> 0.7)
-      multi_json
-    fog-aliyun (0.3.3)
-      fog-core
-      fog-json
-      ipaddress (~> 0.8)
-      xml-simple (~> 1.1)
-    fog-aws (3.5.2)
-      fog-core (~> 2.1)
-      fog-json (~> 1.1)
-      fog-xml (~> 0.1)
-      ipaddress (~> 0.8)
-    fog-core (2.1.0)
-      builder
-      excon (~> 0.58)
-      formatador (~> 0.2)
-      mime-types
-    fog-google (1.9.1)
-      fog-core (<= 2.1.0)
-      fog-json (~> 1.2)
-      fog-xml (~> 0.1.0)
-      google-api-client (~> 0.23.0)
-    fog-json (1.2.0)
-      fog-core
-      multi_json (~> 1.10)
-    fog-local (0.6.0)
-      fog-core (>= 1.27, < 3.0)
-    fog-openstack (1.0.8)
-      fog-core (~> 2.1)
-      fog-json (>= 1.0)
-      ipaddress (>= 0.8)
-    fog-rackspace (0.1.1)
-      fog-core (>= 1.35)
-      fog-json (>= 1.0)
-      fog-xml (>= 0.1)
-      ipaddress (>= 0.8)
-    fog-xml (0.1.3)
-      fog-core
-      nokogiri (>= 1.5.11, < 2.0.0)
-    font-awesome-rails (4.7.0.4)
-      railties (>= 3.2, < 6.0)
-    foreman (0.84.0)
-      thor (~> 0.19.1)
-    formatador (0.2.5)
-    fugit (1.2.1)
-      et-orbi (~> 1.1, >= 1.1.8)
-      raabro (~> 1.1)
-    fuubar (2.2.0)
-      rspec-core (~> 3.0)
-      ruby-progressbar (~> 1.4)
-    gemoji (3.0.1)
-    gemojione (3.3.0)
-      json
-    get_process_mem (0.2.3)
-    gettext (3.2.9)
-      locale (>= 2.0.5)
-      text (>= 1.3.0)
-    gettext_i18n_rails (1.8.0)
-      fast_gettext (>= 0.9.0)
-    gettext_i18n_rails_js (1.3.0)
-      gettext (>= 3.0.2)
-      gettext_i18n_rails (>= 0.7.1)
-      po_to_json (>= 1.0.0)
-      rails (>= 3.2.0)
-    git (1.5.0)
-    gitaly (1.58.0)
-      grpc (~> 1.0)
-    github-markup (1.7.0)
-    gitlab-labkit (0.5.2)
-      actionpack (~> 5)
-      activesupport (~> 5)
-      grpc (~> 1.19)
-      jaeger-client (~> 0.10)
-      opentracing (~> 0.4)
-      redis (> 3.0.0, < 5.0.0)
-    gitlab-license (1.0.0)
-    gitlab-markup (1.7.0)
-    gitlab-peek (0.0.1)
-      railties (>= 4.0.0)
-    gitlab-sidekiq-fetcher (0.5.2)
-      sidekiq (~> 5)
-    gitlab-styles (2.8.0)
-      rubocop (~> 0.69.0)
-      rubocop-gitlab-security (~> 0.1.0)
-      rubocop-performance (~> 1.1.0)
-      rubocop-rspec (~> 1.19)
-    gitlab_chronic_duration (0.10.6.1)
-      numerizer (~> 0.1.1)
-    gitlab_omniauth-ldap (2.1.1)
-      net-ldap (~> 0.16)
-      omniauth (~> 1.3)
-      pyu-ruby-sasl (>= 0.0.3.3, < 0.1)
-      rubyntlm (~> 0.5)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
-    gon (6.2.0)
-      actionpack (>= 3.0)
-      multi_json
-      request_store (>= 1.0)
-    google-api-client (0.23.4)
-      addressable (~> 2.5, >= 2.5.1)
-      googleauth (>= 0.5, < 0.7.0)
-      httpclient (>= 2.8.1, < 3.0)
-      mime-types (~> 3.0)
-      representable (~> 3.0)
-      retriable (>= 2.0, < 4.0)
-    google-protobuf (3.7.1)
-    googleapis-common-protos-types (1.0.4)
-      google-protobuf (~> 3.0)
-    googleauth (0.6.6)
-      faraday (~> 0.12)
-      jwt (>= 1.4, < 3.0)
-      memoist (~> 0.12)
-      multi_json (~> 1.11)
-      os (>= 0.9, < 2.0)
-      signet (~> 0.7)
-    gpgme (2.0.18)
-      mini_portile2 (~> 2.3)
-    grape (1.1.0)
-      activesupport
-      builder
-      mustermann-grape (~> 1.0.0)
-      rack (>= 1.3.0)
-      rack-accept
-      virtus (>= 1.0.0)
-    grape-entity (0.7.1)
-      activesupport (>= 4.0)
-      multi_json (>= 1.3.2)
-    grape-path-helpers (1.1.0)
-      activesupport
-      grape (~> 1.0)
-      rake (~> 12)
-    grape_logging (1.7.0)
-      grape
-    graphiql-rails (1.4.10)
-      railties
-      sprockets-rails
-    graphql (1.9.11)
-    graphql-docs (1.6.0)
-      commonmarker (~> 0.16)
-      escape_utils (~> 1.2)
-      extended-markdown-filter (~> 0.4)
-      gemoji (~> 3.0)
-      graphql (~> 1.6)
-      html-pipeline (~> 2.8)
-      sass (~> 3.4)
-    grpc (1.19.0)
-      google-protobuf (~> 3.1)
-      googleapis-common-protos-types (~> 1.0.0)
-    gssapi (1.2.0)
-      ffi (>= 1.0.1)
-    haml (5.0.4)
-      temple (>= 0.8.0)
-      tilt
-    haml_lint (0.31.0)
-      haml (>= 4.0, < 5.1)
-      rainbow
-      rake (>= 10, < 13)
-      rubocop (>= 0.50.0)
-      sysexits (~> 1.1)
-    hamlit (2.8.8)
-      temple (>= 0.8.0)
-      thor
-      tilt
-    hangouts-chat (0.0.5)
-    hashdiff (0.3.8)
-    hashie (3.5.7)
-    hashie-forbidden_attributes (0.1.1)
-      hashie (>= 3.0)
-    health_check (2.6.0)
-      rails (>= 4.0)
-    heapy (0.1.4)
-    hipchat (1.5.2)
-      httparty
-      mimemagic
-    html-pipeline (2.8.4)
-      activesupport (>= 2)
-      nokogiri (>= 1.4)
-    html2text (0.2.0)
-      nokogiri (~> 1.6)
-    htmlentities (4.3.4)
-    http (3.3.0)
-      addressable (~> 2.3)
-      http-cookie (~> 1.0)
-      http-form_data (~> 2.0)
-      http_parser.rb (~> 0.6.0)
-    http-cookie (1.0.3)
-      domain_name (~> 0.5)
-    http-form_data (2.1.1)
-    http_parser.rb (0.6.0)
-    httparty (0.16.4)
-      mime-types (~> 3.0)
-      multi_xml (>= 0.5.2)
-    httpclient (2.8.3)
-    i18n (1.6.0)
-      concurrent-ruby (~> 1.0)
-    i18n_data (0.8.0)
-    icalendar (2.4.1)
-    ice_nine (0.11.2)
-    influxdb (0.2.3)
-      cause
-      json
-    invisible_captcha (0.12.1)
-      rails (>= 3.2.0)
-    ipaddress (0.8.3)
-    jaeger-client (0.10.0)
-      opentracing (~> 0.3)
-      thrift
-    jaro_winkler (1.5.3)
-    jira-ruby (1.7.1)
-      activesupport
-      atlassian-jwt
-      multipart-post
-      oauth (~> 0.5, >= 0.5.0)
-    jmespath (1.3.1)
-    js_regex (3.1.1)
-      character_set (~> 1.1)
-      regexp_parser (~> 1.1)
-      regexp_property_values (~> 0.3)
-    json (1.8.6)
-    json-jwt (1.9.4)
-      activesupport
-      aes_key_wrap
-      bindata
-    json-schema (2.8.0)
-      addressable (>= 2.4)
-    jwt (2.1.0)
-    kaminari (1.0.1)
-      activesupport (>= 4.1.0)
-      kaminari-actionview (= 1.0.1)
-      kaminari-activerecord (= 1.0.1)
-      kaminari-core (= 1.0.1)
-    kaminari-actionview (1.0.1)
-      actionview
-      kaminari-core (= 1.0.1)
-    kaminari-activerecord (1.0.1)
-      activerecord
-      kaminari-core (= 1.0.1)
-    kaminari-core (1.0.1)
-    kgio (2.11.2)
-    knapsack (1.17.0)
-      rake
-    kramdown (2.1.0)
-    kramdown-parser-gfm (1.1.0)
-      kramdown (~> 2.0)
-    kubeclient (4.4.0)
-      http (~> 3.0)
-      recursive-open-struct (~> 1.0, >= 1.0.4)
-      rest-client (~> 2.0)
-    launchy (2.4.3)
-      addressable (~> 2.3)
-    letter_opener (1.7.0)
-      launchy (~> 2.2)
-    letter_opener_web (1.3.4)
-      actionmailer (>= 3.2)
-      letter_opener (~> 1.0)
-      railties (>= 3.2)
-    license_finder (5.4.0)
-      bundler
-      rubyzip
-      thor
-      toml (= 0.2.0)
-      with_env (= 1.1.0)
-      xml-simple
-    licensee (8.9.2)
-      rugged (~> 0.24)
-    locale (2.1.2)
-    lograge (0.10.0)
-      actionpack (>= 4)
-      activesupport (>= 4)
-      railties (>= 4)
-      request_store (~> 1.0)
-    loofah (2.2.3)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mail (2.7.1)
-      mini_mime (>= 0.1.1)
-    mail_room (0.9.1)
-    marcel (0.3.3)
-      mimemagic (~> 0.3.2)
-    memoist (0.16.0)
-    memoizable (0.4.2)
-      thread_safe (~> 0.3, >= 0.3.1)
-    memory_profiler (0.9.13)
-    method_source (0.9.2)
-    mime-types (3.2.2)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.0331)
-    mimemagic (0.3.2)
-    mini_magick (4.9.5)
-    mini_mime (1.0.1)
-    mini_portile2 (2.4.0)
-    minitest (5.11.3)
-    msgpack (1.3.0)
-    multi_json (1.13.1)
-    multi_xml (0.6.0)
-    multipart-post (2.0.0)
-    murmurhash3 (0.1.6)
-    mustermann (1.0.3)
-    mustermann-grape (1.0.0)
-      mustermann (~> 1.0.0)
-    nakayoshi_fork (0.0.4)
-    nap (1.1.0)
-    net-dns (0.9.0)
-    net-ldap (0.16.0)
-    net-ntp (2.1.3)
-    net-ssh (5.2.0)
-    netrc (0.11.0)
-    nio4r (2.3.1)
-    no_proxy_fix (0.1.2)
-    nokogiri (1.10.4)
-      mini_portile2 (~> 2.4.0)
-    nokogumbo (1.5.0)
-      nokogiri
-    numerizer (0.1.1)
-    oauth (0.5.4)
-    oauth2 (1.4.1)
-      faraday (>= 0.8, < 0.16.0)
-      jwt (>= 1.0, < 3.0)
-      multi_json (~> 1.3)
-      multi_xml (~> 0.5)
-      rack (>= 1.2, < 3)
-    octokit (4.9.0)
-      sawyer (~> 0.8.0, >= 0.5.3)
-    omniauth (1.9.0)
-      hashie (>= 3.4.6, < 3.7.0)
-      rack (>= 1.6.2, < 3)
-    omniauth-auth0 (2.0.0)
-      omniauth-oauth2 (~> 1.4)
-    omniauth-authentiq (0.3.3)
-      jwt (>= 1.5)
-      omniauth-oauth2 (>= 1.5)
-    omniauth-azure-oauth2 (0.0.10)
-      jwt (>= 1.0, < 3.0)
-      omniauth (~> 1.0)
-      omniauth-oauth2 (~> 1.4)
-    omniauth-cas3 (1.1.4)
-      addressable (~> 2.3)
-      nokogiri (~> 1.7, >= 1.7.1)
-      omniauth (~> 1.2)
-    omniauth-facebook (4.0.0)
-      omniauth-oauth2 (~> 1.2)
-    omniauth-github (1.3.0)
-      omniauth (~> 1.5)
-      omniauth-oauth2 (>= 1.4.0, < 2.0)
-    omniauth-gitlab (1.0.3)
-      omniauth (~> 1.0)
-      omniauth-oauth2 (~> 1.0)
-    omniauth-google-oauth2 (0.6.0)
-      jwt (>= 2.0)
-      omniauth (>= 1.1.1)
-      omniauth-oauth2 (>= 1.5)
-    omniauth-kerberos (0.3.0)
-      omniauth-multipassword
-      timfel-krb5-auth (~> 0.8)
-    omniauth-multipassword (0.4.2)
-      omniauth (~> 1.0)
-    omniauth-oauth (1.1.0)
-      oauth
-      omniauth (~> 1.0)
-    omniauth-oauth2 (1.6.0)
-      oauth2 (~> 1.1)
-      omniauth (~> 1.9)
-    omniauth-oauth2-generic (0.2.2)
-      omniauth-oauth2 (~> 1.0)
-    omniauth-salesforce (1.0.5)
-      omniauth (~> 1.0)
-      omniauth-oauth2 (~> 1.0)
-    omniauth-saml (1.10.0)
-      omniauth (~> 1.3, >= 1.3.2)
-      ruby-saml (~> 1.7)
-    omniauth-shibboleth (1.3.0)
-      omniauth (>= 1.0.0)
-    omniauth-twitter (1.4.0)
-      omniauth-oauth (~> 1.1)
-      rack
-    omniauth-ultraauth (0.0.2)
-      omniauth_openid_connect (~> 0.3.0)
-    omniauth_crowd (2.2.3)
-      activesupport
-      nokogiri (>= 1.4.4)
-      omniauth (~> 1.0)
-    omniauth_openid_connect (0.3.1)
-      addressable (~> 2.5)
-      omniauth (~> 1.3)
-      openid_connect (~> 1.1)
-    open4 (1.3.4)
-    openid_connect (1.1.6)
-      activemodel
-      attr_required (>= 1.0.0)
-      json-jwt (>= 1.5.0)
-      rack-oauth2 (>= 1.6.1)
-      swd (>= 1.0.0)
-      tzinfo
-      validate_email
-      validate_url
-      webfinger (>= 1.0.1)
-    opentracing (0.5.0)
-    optimist (3.0.0)
-    org-ruby (0.9.12)
-      rubypants (~> 0.2)
-    orm_adapter (0.5.0)
-    os (1.0.0)
-    parallel (1.17.0)
-    parser (2.6.3.0)
-      ast (~> 2.4.0)
-    parslet (1.8.2)
-    pg (1.1.4)
-    po_to_json (1.0.1)
-      json (>= 1.6.0)
-    premailer (1.10.4)
-      addressable
-      css_parser (>= 1.4.10)
-      htmlentities (>= 4.0.0)
-    premailer-rails (1.9.7)
-      actionmailer (>= 3, < 6)
-      premailer (~> 1.7, >= 1.7.9)
-    proc_to_ast (0.1.0)
-      coderay
-      parser
-      unparser
-    procto (0.0.3)
-    prometheus-client-mmap (0.9.10)
-    pry (0.11.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry-byebug (3.5.1)
-      byebug (~> 9.1)
-      pry (~> 0.10)
-    pry-rails (0.3.6)
-      pry (>= 0.10.4)
-    public_suffix (3.1.0)
-    puma (3.12.0)
-    puma_worker_killer (0.1.0)
-      get_process_mem (~> 0.2)
-      puma (>= 2.7, < 4)
-    pyu-ruby-sasl (0.0.3.3)
-    raabro (1.1.6)
-    rack (2.0.7)
-    rack-accept (0.4.5)
-      rack (>= 0.4)
-    rack-attack (4.4.1)
-      rack
-    rack-cors (1.0.2)
-    rack-oauth2 (1.9.3)
-      activesupport
-      attr_required
-      httpclient
-      json-jwt (>= 1.9.0)
-      rack
-    rack-protection (2.0.5)
-      rack
-    rack-proxy (0.6.0)
-      rack
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rack-timeout (0.5.1)
-    rails (5.2.3)
-      actioncable (= 5.2.3)
-      actionmailer (= 5.2.3)
-      actionpack (= 5.2.3)
-      actionview (= 5.2.3)
-      activejob (= 5.2.3)
-      activemodel (= 5.2.3)
-      activerecord (= 5.2.3)
-      activestorage (= 5.2.3)
-      activesupport (= 5.2.3)
-      bundler (>= 1.3.0)
-      railties (= 5.2.3)
-      sprockets-rails (>= 2.0.0)
-    rails-controller-testing (1.0.2)
-      actionpack (~> 5.x, >= 5.0.1)
-      actionview (~> 5.x, >= 5.0.1)
-      activesupport (~> 5.x)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.2.0)
-      loofah (~> 2.2, >= 2.2.2)
-    rails-i18n (5.1.1)
-      i18n (>= 0.7, < 2)
-      railties (>= 5.0, < 6)
-    railties (5.2.3)
-      actionpack (= 5.2.3)
-      activesupport (= 5.2.3)
-      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.19.0, < 2.0)
-    rainbow (3.0.0)
-    raindrops (0.19.0)
-    rake (12.3.2)
-    rb-fsevent (0.10.2)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
-    rblineprof (0.3.6)
-      debugger-ruby_core_source (~> 1.3)
-    rbtrace (0.4.11)
-      ffi (>= 1.0.6)
-      msgpack (>= 0.4.3)
-      optimist (>= 3.0.0)
-    rdoc (6.0.4)
-    re2 (1.1.1)
-    recaptcha (4.13.1)
-      json
-    recursive-open-struct (1.1.0)
-    redis (4.1.2)
-    redis-actionpack (5.0.2)
-      actionpack (>= 4.0, < 6)
-      redis-rack (>= 1, < 3)
-      redis-store (>= 1.1.0, < 2)
-    redis-activesupport (5.0.7)
-      activesupport (>= 3, < 6)
-      redis-store (>= 1.3, < 2)
-    redis-namespace (1.6.0)
-      redis (>= 3.0.4)
-    redis-rack (2.0.5)
-      rack (>= 1.5, < 3)
-      redis-store (>= 1.2, < 2)
-    redis-rails (5.0.2)
-      redis-actionpack (>= 5.0, < 6)
-      redis-activesupport (>= 5.0, < 6)
-      redis-store (>= 1.2, < 2)
-    redis-store (1.6.0)
-      redis (>= 2.2, < 5)
-    regexp_parser (1.5.1)
-    regexp_property_values (0.3.4)
-    representable (3.0.4)
-      declarative (< 0.1.0)
-      declarative-option (< 0.2.0)
-      uber (< 0.2.0)
-    request_store (1.3.1)
-    responders (2.4.0)
-      actionpack (>= 4.2.0, < 5.3)
-      railties (>= 4.2.0, < 5.3)
-    rest-client (2.0.2)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 4.0)
-      netrc (~> 0.8)
-    retriable (3.1.2)
-    rinku (2.0.0)
-    rotp (2.1.2)
-    rouge (3.7.0)
-    rqrcode (0.7.0)
-      chunky_png
-    rqrcode-rails3 (0.1.7)
-      rqrcode (>= 0.4.2)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.2)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-parameterized (0.4.2)
-      binding_ninja (>= 0.2.3)
-      parser
-      proc_to_ast
-      rspec (>= 2.13, < 4)
-      unparser
-    rspec-rails (3.8.2)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-retry (0.6.1)
-      rspec-core (> 3.3)
-    rspec-set (0.1.3)
-    rspec-support (3.8.2)
-    rspec_junit_formatter (0.4.1)
-      rspec-core (>= 2, < 4, != 2.12.0)
-    rspec_profiling (0.0.5)
-      activerecord
-      pg
-      rails
-      sqlite3
-    rubocop (0.69.0)
-      jaro_winkler (~> 1.5.1)
-      parallel (~> 1.10)
-      parser (>= 2.6)
-      rainbow (>= 2.2.2, < 4.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
-    rubocop-gitlab-security (0.1.1)
-      rubocop (>= 0.51)
-    rubocop-performance (1.1.0)
-      rubocop (>= 0.67.0)
-    rubocop-rspec (1.22.2)
-      rubocop (>= 0.52.1)
-    ruby-enum (0.7.2)
-      i18n
-    ruby-fogbugz (0.2.1)
-      crack (~> 0.4)
-    ruby-prof (1.0.0)
-    ruby-progressbar (1.10.1)
-    ruby-saml (1.7.2)
-      nokogiri (>= 1.5.10)
-    ruby_parser (3.13.1)
-      sexp_processor (~> 4.9)
-    rubyntlm (0.6.2)
-    rubypants (0.2.0)
-    rubyzip (1.2.2)
-    rugged (0.28.3.1)
-    safe_yaml (1.0.4)
-    sanitize (4.6.6)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.4.4)
-      nokogumbo (~> 1.4)
-    sass (3.5.5)
-      sass-listen (~> 4.0.0)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-    sassc (2.0.1)
-      ffi (~> 1.9)
-      rake
-    sassc-rails (2.1.0)
-      railties (>= 4.0.0)
-      sassc (>= 2.0)
-      sprockets (> 3.0)
-      sprockets-rails
-      tilt
-    sawyer (0.8.1)
-      addressable (>= 2.3.5, < 2.6)
-      faraday (~> 0.8, < 1.0)
-    scss_lint (0.56.0)
-      rake (>= 0.9, < 13)
-      sass (~> 3.5.3)
-    seed-fu (2.3.7)
-      activerecord (>= 3.1)
-      activesupport (>= 3.1)
-    selenium-webdriver (3.141.0)
-      childprocess (~> 0.5)
-      rubyzip (~> 1.2, >= 1.2.2)
-    sentry-raven (2.9.0)
-      faraday (>= 0.7.6, < 1.0)
-    settingslogic (2.0.9)
-    sexp_processor (4.12.0)
-    shoulda-matchers (4.0.1)
-      activesupport (>= 4.2.0)
-    sidekiq (5.2.7)
-      connection_pool (~> 2.2, >= 2.2.2)
-      rack (>= 1.5.0)
-      rack-protection (>= 1.5.0)
-      redis (>= 3.3.5, < 5)
-    sidekiq-cron (1.0.4)
-      fugit (~> 1.1)
-      sidekiq (>= 4.2.1)
-    signet (0.11.0)
-      addressable (~> 2.3)
-      faraday (~> 0.9)
-      jwt (>= 1.5, < 3.0)
-      multi_json (~> 1.10)
-    simple_po_parser (1.1.2)
-    simplecov (0.16.1)
-      docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    sixarm_ruby_unaccent (1.2.0)
-    slack-notifier (1.5.1)
-    snowplow-tracker (0.6.1)
-      contracts (~> 0.7, <= 0.11)
-    spring (2.0.2)
-      activesupport (>= 4.2)
-    spring-commands-rspec (1.0.4)
-      spring (>= 0.9.1)
-    sprockets (3.7.2)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.1)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
-    sqlite3 (1.3.13)
-    sshkey (2.0.0)
-    stackprof (0.2.10)
-    state_machines (0.5.0)
-    state_machines-activemodel (0.5.1)
-      activemodel (>= 4.1, < 6.0)
-      state_machines (>= 0.5.0)
-    state_machines-activerecord (0.5.1)
-      activerecord (>= 4.1, < 6.0)
-      state_machines-activemodel (>= 0.5.0)
-    swd (1.1.2)
-      activesupport (>= 3)
-      attr_required (>= 0.0.5)
-      httpclient (>= 2.4)
-    sys-filesystem (1.1.6)
-      ffi
-    sysexits (1.2.0)
-    temple (0.8.1)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
-    test-prof (0.2.5)
-    text (1.3.1)
-    thin (1.7.2)
-      daemons (~> 1.0, >= 1.0.9)
-      eventmachine (~> 1.0, >= 1.0.4)
-      rack (>= 1, < 3)
-    thor (0.19.4)
-    thread_safe (0.3.6)
-    thrift (0.11.0.0)
-    tilt (2.0.9)
-    timecop (0.8.1)
-    timfel-krb5-auth (0.8.3)
-    toml (0.2.0)
-      parslet (~> 1.8.0)
-    toml-rb (1.0.0)
-      citrus (~> 3.0, > 3.0)
-    truncato (0.7.11)
-      htmlentities (~> 4.3.1)
-      nokogiri (>= 1.7.0, <= 2.0)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    u2f (0.2.1)
-    uber (0.1.0)
-    uglifier (2.7.2)
-      execjs (>= 0.3.0)
-      json (>= 1.8.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.5)
-    unicode-display_width (1.6.0)
-    unicode_utils (1.4.0)
-    unicorn (5.4.1)
-      kgio (~> 2.6)
-      raindrops (~> 0.7)
-    unicorn-worker-killer (0.4.4)
-      get_process_mem (~> 0)
-      unicorn (>= 4, < 6)
-    uniform_notifier (1.10.0)
-    unleash (0.1.5)
-      murmurhash3 (~> 0.1.6)
-    unparser (0.4.5)
-      abstract_type (~> 0.0.7)
-      adamantium (~> 0.2.0)
-      concord (~> 0.1.5)
-      diff-lcs (~> 1.3)
-      equalizer (~> 0.0.9)
-      parser (~> 2.6.3)
-      procto (~> 0.0.2)
-    validate_email (0.1.6)
-      activemodel (>= 3.0)
-      mail (>= 2.2.5)
-    validate_url (1.0.8)
-      activemodel (>= 3.0.0)
-      public_suffix
-    validates_hostname (1.0.6)
-      activerecord (>= 3.0)
-      activesupport (>= 3.0)
-    version_sorter (2.2.4)
-    virtus (1.0.5)
-      axiom-types (~> 0.1)
-      coercible (~> 1.0)
-      descendants_tracker (~> 0.0, >= 0.0.3)
-      equalizer (~> 0.0, >= 0.0.9)
-    vmstat (2.3.0)
-    warden (1.2.7)
-      rack (>= 1.0)
-    webfinger (1.1.0)
-      activesupport
-      httpclient (>= 2.4)
-    webmock (3.5.1)
-      addressable (>= 2.3.6)
-      crack (>= 0.3.2)
-      hashdiff
-    webpack-rails (0.9.11)
-      railties (>= 3.2.0)
-    websocket-driver (0.7.0)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.3)
-    wikicloth (0.8.1)
-      builder
-      expression_parser
-      rinku
-    with_env (1.1.0)
-    xml-simple (1.1.5)
-    xpath (3.2.0)
-      nokogiri (~> 1.8)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  RedCloth (~> 4.3.2)
-  ace-rails-ap (~> 4.1.0)
-  acme-client (~> 2.0.2)
-  activerecord-explain-analyze (~> 0.1)
-  acts-as-taggable-on (~> 6.0)
-  addressable (~> 2.5.2)
-  akismet (~> 2.0)
-  apollo_upload_server (~> 2.0.0.beta3)
-  asana (~> 0.8.1)
-  asciidoctor (~> 2.0.10)
-  asciidoctor-include-ext (~> 0.3.1)
-  asciidoctor-plantuml (= 0.0.9)
-  atlassian-jwt (~> 0.2.0)
-  attr_encrypted (~> 3.1.0)
-  awesome_print
-  aws-sdk
-  babosa (~> 1.0.2)
-  base32 (~> 0.3.0)
-  batch-loader (~> 1.4.0)
-  bcrypt_pbkdf (~> 1.0)
-  benchmark-ips (~> 2.3.0)
-  benchmark-memory (~> 0.1)
-  better_errors (~> 2.5.0)
-  binding_of_caller (~> 0.8.0)
-  bootsnap (~> 1.4)
-  bootstrap_form (~> 4.2.0)
-  brakeman (~> 4.2)
-  browser (~> 2.5)
-  bullet (~> 5.5.0)
-  bundler-audit (~> 0.5.0)
-  capybara (~> 3.22.0)
-  capybara-screenshot (~> 1.0.22)
-  carrierwave (~> 1.3)
-  charlock_holmes (~> 0.7.5)
-  chronic (~> 0.10.2)
-  commonmarker (~> 0.17)
-  concurrent-ruby (~> 1.1)
-  connection_pool (~> 2.0)
-  countries (~> 3.0)
-  creole (~> 0.5.0)
-  danger (~> 6.0)
-  database_cleaner (~> 1.7.0)
-  deckar01-task_list (= 2.2.0)
-  default_value_for (~> 3.2.0)
-  derailed_benchmarks
-  device_detector
-  devise (~> 4.6)
-  devise-two-factor (~> 3.0.0)
-  diffy (~> 3.1.0)
-  discordrb-webhooks-blackst0ne (~> 3.3)
-  doorkeeper (~> 4.3)
-  doorkeeper-openid_connect (~> 1.5)
-  ed25519 (~> 1.2)
-  elasticsearch-api (= 5.0.3)
-  elasticsearch-model (~> 0.1.9)
-  elasticsearch-rails (~> 0.1.9)
-  email_reply_trimmer (~> 0.1)
-  email_spec (~> 2.2.0)
-  escape_utils (~> 1.1)
-  factory_bot_rails (~> 4.8.2)
-  faraday (~> 0.12)
-  faraday_middleware-aws-signers-v4
-  fast_blank
-  ffaker (~> 2.10)
-  flipper (~> 0.13.0)
-  flipper-active_record (~> 0.13.0)
-  flipper-active_support_cache_store (~> 0.13.0)
-  flowdock (~> 0.7)
-  fog-aliyun (~> 0.3)
-  fog-aws (~> 3.5)
-  fog-core (= 2.1.0)
-  fog-google (~> 1.9)
-  fog-local (~> 0.6)
-  fog-openstack (~> 1.0)
-  fog-rackspace (~> 0.1.1)
-  font-awesome-rails (~> 4.7)
-  foreman (~> 0.84.0)
-  fugit (~> 1.2.1)
-  fuubar (~> 2.2.0)
-  gemojione (~> 3.3)
-  gettext (~> 3.2.2)
-  gettext_i18n_rails (~> 1.8.0)
-  gettext_i18n_rails_js (~> 1.3)
-  gitaly (~> 1.58.0)
-  github-markup (~> 1.7.0)
-  gitlab-labkit (~> 0.5)
-  gitlab-license (~> 1.0)
-  gitlab-markup (~> 1.7.0)
-  gitlab-peek (~> 0.0.1)
-  gitlab-sidekiq-fetcher (= 0.5.2)
-  gitlab-styles (~> 2.7)
-  gitlab_chronic_duration (~> 0.10.6.1)
-  gitlab_omniauth-ldap (~> 2.1.1)
-  gon (~> 6.2)
-  google-api-client (~> 0.23)
-  google-protobuf (~> 3.7.1)
-  gpgme (~> 2.0.18)
-  grape (~> 1.1.0)
-  grape-entity (~> 0.7.1)
-  grape-path-helpers (~> 1.1)
-  grape_logging (~> 1.7)
-  graphiql-rails (~> 1.4.10)
-  graphql (~> 1.9.11)
-  graphql-docs (~> 1.6.0)
-  grpc (~> 1.19.0)
-  gssapi
-  haml_lint (~> 0.31.0)
-  hamlit (~> 2.8.8)
-  hangouts-chat (~> 0.0.5)
-  hashie-forbidden_attributes
-  health_check (~> 2.6.0)
-  hipchat (~> 1.5.0)
-  html-pipeline (~> 2.8)
-  html2text
-  httparty (~> 0.16.4)
-  icalendar
-  influxdb (~> 0.2)
-  invisible_captcha (~> 0.12.1)
-  jira-ruby (~> 1.7)
-  js_regex (~> 3.1)
-  json-schema (~> 2.8.0)
-  jwt (~> 2.1.0)
-  kaminari (~> 1.0)
-  knapsack (~> 1.17)
-  kubeclient (~> 4.4.0)
-  letter_opener_web (~> 1.3.4)
-  license_finder (~> 5.4)
-  licensee (~> 8.9)
-  lograge (~> 0.5)
-  loofah (~> 2.2)
-  mail_room (~> 0.9.1)
-  memory_profiler (~> 0.9)
-  method_source (~> 0.8)
-  mimemagic (~> 0.3.2)
-  mini_magick
-  minitest (~> 5.11.0)
-  nakayoshi_fork (~> 0.0.4)
-  net-dns (~> 0.9.0)
-  net-ldap
-  net-ntp
-  net-ssh (~> 5.2)
-  nokogiri (~> 1.10.4)
-  oauth2 (~> 1.4)
-  octokit (~> 4.9)
-  omniauth (~> 1.8)
-  omniauth-auth0 (~> 2.0.0)
-  omniauth-authentiq (~> 0.3.3)
-  omniauth-azure-oauth2 (~> 0.0.9)
-  omniauth-cas3 (~> 1.1.4)
-  omniauth-facebook (~> 4.0.0)
-  omniauth-github (~> 1.3)
-  omniauth-gitlab (~> 1.0.2)
-  omniauth-google-oauth2 (~> 0.6.0)
-  omniauth-kerberos (~> 0.3.0)
-  omniauth-oauth2-generic (~> 0.2.2)
-  omniauth-salesforce (~> 1.0.5)
-  omniauth-saml (~> 1.10)
-  omniauth-shibboleth (~> 1.3.0)
-  omniauth-twitter (~> 1.4)
-  omniauth-ultraauth (~> 0.0.2)
-  omniauth_crowd (~> 2.2.0)
-  omniauth_openid_connect (~> 0.3.1)
-  org-ruby (~> 0.9.12)
-  pg (~> 1.1)
-  premailer-rails (~> 1.9.7)
-  prometheus-client-mmap (~> 0.9.10)
-  pry-byebug (~> 3.5.1)
-  pry-rails (~> 0.3.4)
-  puma (~> 3.12)
-  puma_worker_killer
-  rack (~> 2.0.7)
-  rack-attack (~> 4.4.1)
-  rack-cors (~> 1.0.0)
-  rack-oauth2 (~> 1.9.3)
-  rack-proxy (~> 0.6.0)
-  rack-timeout
-  rails (= 5.2.3)
-  rails-controller-testing
-  rails-i18n (~> 5.1)
-  rainbow (~> 3.0)
-  raindrops (~> 0.18)
-  rblineprof (~> 0.3.6)
-  rbtrace (~> 0.4)
-  rdoc (~> 6.0)
-  re2 (~> 1.1.1)
-  recaptcha (~> 4.11)
-  redis (~> 4.0)
-  redis-namespace (~> 1.6.0)
-  redis-rails (~> 5.0.2)
-  request_store (~> 1.3)
-  responders (~> 2.0)
-  rouge (~> 3.7)
-  rqrcode-rails3 (~> 0.1.7)
-  rspec-parameterized
-  rspec-rails (~> 3.8.0)
-  rspec-retry (~> 0.6.1)
-  rspec-set (~> 0.1.3)
-  rspec_junit_formatter
-  rspec_profiling (~> 0.0.5)
-  rubocop (~> 0.69.0)
-  rubocop-performance (~> 1.1.0)
-  rubocop-rspec (~> 1.22.1)
-  ruby-fogbugz (~> 0.2.1)
-  ruby-prof (~> 1.0.0)
-  ruby-progressbar
-  ruby_parser (~> 3.8)
-  rubyzip (~> 1.2.2)
-  rugged (~> 0.28)
-  sanitize (~> 4.6)
-  sassc-rails (~> 2.1.0)
-  scss_lint (~> 0.56.0)
-  seed-fu (~> 2.3.7)
-  selenium-webdriver (~> 3.141)
-  sentry-raven (~> 2.9)
-  settingslogic (~> 2.0.9)
-  shoulda-matchers (~> 4.0.1)
-  sidekiq (~> 5.2.7)
-  sidekiq-cron (~> 1.0)
-  simple_po_parser (~> 1.1.2)
-  simplecov (~> 0.16.1)
-  slack-notifier (~> 1.5.1)
-  snowplow-tracker (~> 0.6.1)
-  spring (~> 2.0.0)
-  spring-commands-rspec (~> 1.0.4)
-  sprockets (~> 3.7.0)
-  sshkey (~> 2.0)
-  stackprof (~> 0.2.10)
-  state_machines-activerecord (~> 0.5.1)
-  sys-filesystem (~> 1.1.6)
-  test-prof (~> 0.2.5)
-  thin (~> 1.7.0)
-  timecop (~> 0.8.0)
-  toml-rb (~> 1.0.0)
-  truncato (~> 0.7.11)
-  u2f (~> 0.2.1)
-  uglifier (~> 2.7.2)
-  unf (~> 0.1.4)
-  unicorn (~> 5.4.1)
-  unicorn-worker-killer (~> 0.4.4)
-  unleash (~> 0.1.5)
-  validates_hostname (~> 1.0.6)
-  version_sorter (~> 2.2.4)
-  vmstat (~> 2.3.0)
-  webmock (~> 3.5.1)
-  webpack-rails (~> 0.9.10)
-  wikicloth (= 0.8.1)
-
-BUNDLED WITH
-   1.17.3
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix
deleted file mode 100644
index 37bea0bd708..00000000000
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix
+++ /dev/null
@@ -1,4285 +0,0 @@
-{
-  abstract_type = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "09330cmhrc2wmfhdj9zzg82sv6cdhm3qgdkva5ni5xfjril2pf14";
-      type = "gem";
-    };
-    version = "0.0.7";
-  };
-  ace-rails-ap = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "14wj9gsiy7rm0lvs27ffsrh92wndjksj6rlfj3n7jhv1v77w9v2h";
-      type = "gem";
-    };
-    version = "4.1.2";
-  };
-  acme-client = {
-    dependencies = ["faraday"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1552fkgaj6qfylwsckgmhck34shjqnfrzymj1ji1kq3r310qqrnp";
-      type = "gem";
-    };
-    version = "2.0.2";
-  };
-  actioncable = {
-    dependencies = ["actionpack" "nio4r" "websocket-driver"];
-    groups = ["default" "development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "04wd9rf8sglrqc8jz49apqcxbi51gdj7l1apf5qr4i86iddk6pkm";
-      type = "gem";
-    };
-    version = "5.2.3";
-  };
-  actionmailer = {
-    dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"];
-    groups = ["default" "development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "15laym06zcm2021qdhlyr6y9jn1marw436i89hcxqg14a8zvyvwa";
-      type = "gem";
-    };
-    version = "5.2.3";
-  };
-  actionpack = {
-    dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
-    groups = ["default" "development" "mysql" "postgres" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1s2iay17i2k0xx36cmnpbrmr5w6x70jk7fq1d8w70xcdw5chm0w1";
-      type = "gem";
-    };
-    version = "5.2.3";
-  };
-  actionview = {
-    dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"];
-    groups = ["default" "development" "mysql" "postgres" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1v49rgf8305grqf6gq7qa47qhamr369igyy0giycz60x86afyr4h";
-      type = "gem";
-    };
-    version = "5.2.3";
-  };
-  activejob = {
-    dependencies = ["activesupport" "globalid"];
-    groups = ["default" "development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "17vizibxbsli5yppgrvmw13wj7a9xy19s5nqxf1k23bbk2s5b87s";
-      type = "gem";
-    };
-    version = "5.2.3";
-  };
-  activemodel = {
-    dependencies = ["activesupport"];
-    groups = ["default" "development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0mghh9di8011ara9h1r5a216yzk1vjm9r3p0gdvdi8j1zmkl6k6h";
-      type = "gem";
-    };
-    version = "5.2.3";
-  };
-  activerecord = {
-    dependencies = ["activemodel" "activesupport" "arel"];
-    groups = ["default" "development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0d6036f592803iyvp6bw98p3sg638mia5dbw19lvachx6jgzfvpw";
-      type = "gem";
-    };
-    version = "5.2.3";
-  };
-  activerecord-explain-analyze = {
-    dependencies = ["activerecord" "pg"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0yvz452ww0vn3n6197gx6zklwa591gc7f1m8accvjd9zw8gv3ssx";
-      type = "gem";
-    };
-    version = "0.1.0";
-  };
-  activestorage = {
-    dependencies = ["actionpack" "activerecord" "marcel"];
-    groups = ["default" "development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "04is6ipjqw1f337i8pm8w5bd99rpygqfd0fzzxkr7jd308ggmsjk";
-      type = "gem";
-    };
-    version = "5.2.3";
-  };
-  activesupport = {
-    dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
-    groups = ["default" "development" "mysql" "postgres" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "110vp4frgkw3mpzlmshg2f2ig09cknls2w68ym1r1s39d01v0mi8";
-      type = "gem";
-    };
-    version = "5.2.3";
-  };
-  acts-as-taggable-on = {
-    dependencies = ["activerecord"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0hl52pjgfzy3acdwnbxfqy08m808vlv9dmsyp03d5x7x0y499kvl";
-      type = "gem";
-    };
-    version = "6.0.0";
-  };
-  adamantium = {
-    dependencies = ["ice_nine" "memoizable"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0165r2ikgfwv2rm8dzyijkp74fvg0ni72hpdx8ay2v7cj08dqyak";
-      type = "gem";
-    };
-    version = "0.2.0";
-  };
-  addressable = {
-    dependencies = ["public_suffix"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk";
-      type = "gem";
-    };
-    version = "2.5.2";
-  };
-  aes_key_wrap = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0li86k0g812jkzrppb2fvqngvzp09nygywjpn81nx90s01wxqw07";
-      type = "gem";
-    };
-    version = "1.0.1";
-  };
-  akismet = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0hqpn25iyypkwkrqaibjm5nss5jmlkrddhia7frmz94prvyjr02w";
-      type = "gem";
-    };
-    version = "2.0.0";
-  };
-  apollo_upload_server = {
-    dependencies = ["graphql" "rails"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0riijpyicbkqsr46w4mfhh3pq2yrmakkz8mmgbrfjhzbyzac25na";
-      type = "gem";
-    };
-    version = "2.0.0.beta.3";
-  };
-  arel = {
-    groups = ["default" "development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1jk7wlmkr61f6g36w9s2sn46nmdg6wn2jfssrhbhirv5x9n95nk0";
-      type = "gem";
-    };
-    version = "9.0.0";
-  };
-  asana = {
-    dependencies = ["faraday" "faraday_middleware" "faraday_middleware-multi_json" "oauth2"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1h0qiywvjjc9iyzq9nz5iaqyh6qsrix4ip0w86j5c4v5g940z6qx";
-      type = "gem";
-    };
-    version = "0.8.1";
-  };
-  asciidoctor = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1b2ajs3sabl0s27r7lhwkacw0yn0zfk4jpmidg9l8lzp2qlgjgbz";
-      type = "gem";
-    };
-    version = "2.0.10";
-  };
-  asciidoctor-include-ext = {
-    dependencies = ["asciidoctor"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1alaqfh31hd98yhqq8fsc50zzqw04p3d83pc35gdx3x9p3j1ds7d";
-      type = "gem";
-    };
-    version = "0.3.1";
-  };
-  asciidoctor-plantuml = {
-    dependencies = ["asciidoctor"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0lzxj16w7s3w0wnlpg8lfs9v2xxk3x3c1skynqm1sms7rjhnhlnb";
-      type = "gem";
-    };
-    version = "0.0.9";
-  };
-  ast = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "184ssy3w93nkajlz2c70ifm79jp3j737294kbc5fjw69v1w0n9x7";
-      type = "gem";
-    };
-    version = "2.4.0";
-  };
-  atlassian-jwt = {
-    dependencies = ["jwt"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1ckfiiwv7dnifra7zhbggj96g0x0kzkv0x9n1is7lb86svlm7rjj";
-      type = "gem";
-    };
-    version = "0.2.0";
-  };
-  attr_encrypted = {
-    dependencies = ["encryptor"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0ncv2az1zlj33bsllr6q1qdvbw42gv91lxq0ryclbv8l8xh841jg";
-      type = "gem";
-    };
-    version = "3.1.0";
-  };
-  attr_required = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1g22axmi2rhhy7w8c3x6gppsawxqavbrnxpnmphh22fk7cwi0kh2";
-      type = "gem";
-    };
-    version = "1.0.1";
-  };
-  awesome_print = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "14arh1ixfsd6j5md0agyzvksm5svfkvchb90fp32nn7y3avcmc2h";
-      type = "gem";
-    };
-    version = "1.8.0";
-  };
-  aws-sdk = {
-    dependencies = ["aws-sdk-resources"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "03r754cqa0jayf1nxpcmp1anaypxwpcjyjaq5cz7i04l9jdxvsnn";
-      type = "gem";
-    };
-    version = "2.9.32";
-  };
-  aws-sdk-core = {
-    dependencies = ["aws-sigv4" "jmespath"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1pq09wwb74y4m5adk4hi4zlz05q6sxjxij6g71v6nkd0z83hi34x";
-      type = "gem";
-    };
-    version = "2.9.32";
-  };
-  aws-sdk-resources = {
-    dependencies = ["aws-sdk-core"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "15m56k12x9gzkcyhwrab1qhi3wqla0qmv84dkqcjwp44d7c2xjyi";
-      type = "gem";
-    };
-    version = "2.9.32";
-  };
-  aws-sigv4 = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0cnrfxbaxn86qrxhfidg10f89ka1hddihakdhcvnri0dljaw7dsz";
-      type = "gem";
-    };
-    version = "1.0.0";
-  };
-  axiom-types = {
-    dependencies = ["descendants_tracker" "ice_nine" "thread_safe"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "10q3k04pll041mkgy0m5fn2b1lazm6ly1drdbcczl5p57lzi3zy1";
-      type = "gem";
-    };
-    version = "0.1.1";
-  };
-  babosa = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "05rgxg4pz4bc4xk34w5grv0yp1j94wf571w84lf3xgqcbs42ip2f";
-      type = "gem";
-    };
-    version = "1.0.2";
-  };
-  base32 = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0b7y8sy6j9v1lvfzd4va88k5vg9yh0xcjzzn3llcw7yxqlcrnbjk";
-      type = "gem";
-    };
-    version = "0.3.2";
-  };
-  batch-loader = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "09jaxxddqpgq8ynwd2gpjq5rkhw00zdjnqisk9qbpjgxzk6f8gwi";
-      type = "gem";
-    };
-    version = "1.4.0";
-  };
-  bcrypt = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0ysblqxkclmnhrd0kmb5mr8p38mbar633gdsb14b7dhkhgawgzfy";
-      type = "gem";
-    };
-    version = "3.1.12";
-  };
-  bcrypt_pbkdf = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0cj4k13c7qvvck7y25i3xarvyqq8d27vl61jddifkc7llnnap1hv";
-      type = "gem";
-    };
-    version = "1.0.0";
-  };
-  benchmark-ips = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0bh681m54qdsdyvpvflj1wpnj3ybspbpjkr4cnlrl4nk4yikli0j";
-      type = "gem";
-    };
-    version = "2.3.0";
-  };
-  benchmark-memory = {
-    dependencies = ["memory_profiler"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "11qw8k6rl79ri00njrf1x9v6vzwgv12rkcvgzvg0sk8pfrkzwyxa";
-      type = "gem";
-    };
-    version = "0.1.2";
-  };
-  better_errors = {
-    dependencies = ["coderay" "erubi" "rack"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1pqnxxsqqs7vnqvamk5bzs84dv584g9s0qaf2vqb1v2aj5dabcg7";
-      type = "gem";
-    };
-    version = "2.5.0";
-  };
-  bindata = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0kxy917xyxckifmnawff65j7g6yb3wh2s45npjq9lqjbi1p86lsr";
-      type = "gem";
-    };
-    version = "2.4.3";
-  };
-  binding_ninja = {
-    groups = ["default" "development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "17fa3sv6p2fw9g8fxpwx1kjhhs28aw41akkba0hlgvk60055b1aa";
-      type = "gem";
-    };
-    version = "0.2.3";
-  };
-  binding_of_caller = {
-    dependencies = ["debug_inspector"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "05syqlks7463zsy1jdfbbdravdhj9hpj5pv2m74blqpv8bq4vv5g";
-      type = "gem";
-    };
-    version = "0.8.0";
-  };
-  bootsnap = {
-    dependencies = ["msgpack"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1jcc0x0l3jqap8r8l1j994ljh93c8hcppm59mjzpa0hdvprh23av";
-      type = "gem";
-    };
-    version = "1.4.4";
-  };
-  bootstrap_form = {
-    dependencies = ["actionpack" "activemodel"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "044pi097jwh3z68g1zfmbcl9xchqfcsls1j1nvx1bkyj034v6y7m";
-      type = "gem";
-    };
-    version = "4.2.0";
-  };
-  brakeman = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "161l4ln7x1vnqrcvbvglznf46f0lvq305vq211xaxp4fv4wwv89v";
-      type = "gem";
-    };
-    version = "4.2.1";
-  };
-  browser = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0sdx0ny34i6vqxdsc7sy9g0nafdbrw8kvvb5xh9m18x1bzpqk92f";
-      type = "gem";
-    };
-    version = "2.5.3";
-  };
-  builder = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0qibi5s67lpdv1wgcj66wcymcr04q6j4mzws6a479n0mlrmh5wr1";
-      type = "gem";
-    };
-    version = "3.2.3";
-  };
-  bullet = {
-    dependencies = ["activesupport" "uniform_notifier"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1pdq3ckmwxnwrdm2x89zfj68h0yhiln35y8wps2nkvam4kpivyr5";
-      type = "gem";
-    };
-    version = "5.5.1";
-  };
-  bundler-audit = {
-    dependencies = ["thor"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1gr7k6m9fda7m66irxzydm8v9xbmlryjj65cagwm1zyi5f317srb";
-      type = "gem";
-    };
-    version = "0.5.0";
-  };
-  byebug = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1vv7s88w8jb1qg4qz3jrs3x3y5d9jfyyl7wfiz78b5x95ydvx41q";
-      type = "gem";
-    };
-    version = "9.1.0";
-  };
-  capybara = {
-    dependencies = ["addressable" "mini_mime" "nokogiri" "rack" "rack-test" "regexp_parser" "xpath"];
-    groups = ["development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1y7ncfji4s3h3wdr2hwsrd32k0va92a6lyx2x8w6a3vkbc94kpch";
-      type = "gem";
-    };
-    version = "3.22.0";
-  };
-  capybara-screenshot = {
-    dependencies = ["capybara" "launchy"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1x90lh7nf3zi54arjf430s9xdxr3c12xjq1l28izgxqdk8s40q7q";
-      type = "gem";
-    };
-    version = "1.0.22";
-  };
-  carrierwave = {
-    dependencies = ["activemodel" "activesupport" "mime-types"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "10rz94kajilffp83sb767lr62b5f8l4jzqq80cr92wqxdgbszdks";
-      type = "gem";
-    };
-    version = "1.3.1";
-  };
-  cause = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0digirxqlwdg79mkbn70yc7i9i1qnclm2wjbrc47kqv6236bpj00";
-      type = "gem";
-    };
-    version = "0.1";
-  };
-  character_set = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "114npdbw1ivyx4vnid8ncnjw4wnjcipf2lvihlg3ibbh7an0m9s9";
-      type = "gem";
-    };
-    version = "1.1.2";
-  };
-  charlock_holmes = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1nf1l31n10yaark2rrg5qzyzcx9w80681449s3j09qmnipsl8rl5";
-      type = "gem";
-    };
-    version = "0.7.6";
-  };
-  childprocess = {
-    dependencies = ["ffi"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0a61922kmvcxyj5l70fycapr87gz1dzzlkfpq85rfqk5vdh3d28p";
-      type = "gem";
-    };
-    version = "0.9.0";
-  };
-  chronic = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1hrdkn4g8x7dlzxwb1rfgr8kw3bp4ywg5l4y4i9c2g5cwv62yvvn";
-      type = "gem";
-    };
-    version = "0.10.2";
-  };
-  chunky_png = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0vf0axgrm95bs3y0x5gdb76xawfh210yxplj7jbwr6z7n88i1axn";
-      type = "gem";
-    };
-    version = "1.3.5";
-  };
-  citrus = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0l7nhk3gkm1hdchkzzhg2f70m47pc0afxfpl6mkiibc9qcpl3hjf";
-      type = "gem";
-    };
-    version = "3.0.2";
-  };
-  claide = {
-    groups = ["default" "development"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0kasxsms24fgcdsq680nz99d5lazl9rmz1qkil2y5gbbssx89g0z";
-      type = "gem";
-    };
-    version = "1.0.3";
-  };
-  claide-plugins = {
-    dependencies = ["cork" "nap" "open4"];
-    groups = ["default" "development"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0bhw5j985qs48v217gnzva31rw5qvkf7qj8mhp73pcks0sy7isn7";
-      type = "gem";
-    };
-    version = "0.9.2";
-  };
-  coderay = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "15vav4bhcc2x3jmi3izb11l4d9f3xv8hp2fszb7iqmpsccv1pz4y";
-      type = "gem";
-    };
-    version = "1.1.2";
-  };
-  coercible = {
-    dependencies = ["descendants_tracker"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1p5azydlsz0nkxmcq0i1gzmcfq02lgxc4as7wmf47j1c6ljav0ah";
-      type = "gem";
-    };
-    version = "1.0.0";
-  };
-  colored2 = {
-    groups = ["default" "development"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0jlbqa9q4mvrm73aw9mxh23ygzbjiqwisl32d8szfb5fxvbjng5i";
-      type = "gem";
-    };
-    version = "3.1.2";
-  };
-  commonmarker = {
-    dependencies = ["ruby-enum"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1pmjm87p0hxnknp33cxyvkgbr1swfp9gcznssmalm9z8kwyancb9";
-      type = "gem";
-    };
-    version = "0.17.13";
-  };
-  concord = {
-    dependencies = ["adamantium" "equalizer"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1b6cdn0fg4n9gzbdr7zyf4jq40y6h0c0g9cra7wk9hhmsylk91bg";
-      type = "gem";
-    };
-    version = "0.1.5";
-  };
-  concurrent-ruby = {
-    groups = ["default" "development" "mysql" "postgres" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an";
-      type = "gem";
-    };
-    version = "1.1.5";
-  };
-  connection_pool = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0lflx29mlznf1hn0nihkgllzbj8xp5qasn8j7h838465pi399k68";
-      type = "gem";
-    };
-    version = "2.2.2";
-  };
-  contracts = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "11kj7hdr94hxgxad9wazncvaxzaxlbvw6laq179ivhw9za746vnz";
-      type = "gem";
-    };
-    version = "0.11.0";
-  };
-  cork = {
-    dependencies = ["colored2"];
-    groups = ["default" "development"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1g6l780z1nj4s3jr11ipwcj8pjbibvli82my396m3y32w98ar850";
-      type = "gem";
-    };
-    version = "0.3.0";
-  };
-  countries = {
-    dependencies = ["i18n_data" "sixarm_ruby_unaccent" "unicode_utils"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0w278pjhwkbin7jpr7m47wac7gj5n4l2him9k2q4ngzq6rs2id7c";
-      type = "gem";
-    };
-    version = "3.0.0";
-  };
-  crack = {
-    dependencies = ["safe_yaml"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0abb0fvgw00akyik1zxnq7yv391va148151qxdghnzngv66bl62k";
-      type = "gem";
-    };
-    version = "0.4.3";
-  };
-  crass = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0bpxzy6gjw9ggjynlxschbfsgmx8lv3zw1azkjvnb8b9i895dqfi";
-      type = "gem";
-    };
-    version = "1.0.4";
-  };
-  creole = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "00rcscz16idp6dx0dk5yi5i0fz593i3r6anbn5bg2q07v3i025wm";
-      type = "gem";
-    };
-    version = "0.5.0";
-  };
-  css_parser = {
-    dependencies = ["addressable"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0jlr17cn044yaq4l3d9p42g3bghnamwsprq9c39xn6pxjrn5k1hy";
-      type = "gem";
-    };
-    version = "1.5.0";
-  };
-  daemons = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0lxqq6dgb8xhliywar2lvkwqy2ssraf9dk4b501pb4ixc2mvxbp2";
-      type = "gem";
-    };
-    version = "1.2.6";
-  };
-  danger = {
-    dependencies = ["claide" "claide-plugins" "colored2" "cork" "faraday" "faraday-http-cache" "git" "kramdown" "kramdown-parser-gfm" "no_proxy_fix" "octokit" "terminal-table"];
-    groups = ["development"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0gyxfs7pkcg90llhpl2nwfqqcqi0qngqhk8gpyrffj6m0lm1m6wl";
-      type = "gem";
-    };
-    version = "6.0.9";
-  };
-  database_cleaner = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "05i0nf2aj70m61y3fspypdkc6d1qgibf5kav05a71b5gjz0k7y5x";
-      type = "gem";
-    };
-    version = "1.7.0";
-  };
-  debug_inspector = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0vxr0xa1mfbkfcrn71n7c4f2dj7la5hvphn904vh20j3x4j5lrx0";
-      type = "gem";
-    };
-    version = "0.0.3";
-  };
-  debugger-ruby_core_source = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1lp5dmm8a8dpwymv6r1y6yr24wxsj0gvgb2b8i7qq9rcv414snwd";
-      type = "gem";
-    };
-    version = "1.3.8";
-  };
-  deckar01-task_list = {
-    dependencies = ["html-pipeline"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0s637v5pi5ipmv0gn9g2wwjpxdm27dvppfjd8ml0dc1m0jsm7964";
-      type = "gem";
-    };
-    version = "2.2.0";
-  };
-  declarative = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0642xvwzzbgi3kp1bg467wma4g3xqrrn0sk369hjam7w579gnv5j";
-      type = "gem";
-    };
-    version = "0.0.10";
-  };
-  declarative-option = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1g4ibxq566f1frnhdymzi9hxxcm4g2gw4n21mpjk2mhwym4q6l0p";
-      type = "gem";
-    };
-    version = "0.1.0";
-  };
-  default_value_for = {
-    dependencies = ["activerecord"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1xj9d1y2fk3kxfm1kyiwasjpw6r1w7c1xjx26sm3c33xhmz57fla";
-      type = "gem";
-    };
-    version = "3.2.0";
-  };
-  derailed_benchmarks = {
-    dependencies = ["benchmark-ips" "get_process_mem" "heapy" "memory_profiler" "rack" "rake" "thor"];
-    groups = ["development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1c9djg1r2w461h97zmmdsdgnsrxqm4qfyp7gry9qxbav9skrplb8";
-      type = "gem";
-    };
-    version = "1.3.5";
-  };
-  descendants_tracker = {
-    dependencies = ["thread_safe"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "15q8g3fcqyb41qixn6cky0k3p86291y7xsh1jfd851dvrza1vi79";
-      type = "gem";
-    };
-    version = "0.0.4";
-  };
-  device_detector = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0zbsjj1bgwmsiqiw6x5fzbzp25xc10c02s37ggl2635ha0qzn05q";
-      type = "gem";
-    };
-    version = "1.0.0";
-  };
-  devise = {
-    dependencies = ["bcrypt" "orm_adapter" "railties" "responders" "warden"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "04b2p61mqfb6ln8s2lhmvnkd45wjjinykbn9svmhs54kacrrjkcf";
-      type = "gem";
-    };
-    version = "4.6.2";
-  };
-  devise-two-factor = {
-    dependencies = ["activesupport" "attr_encrypted" "devise" "railties" "rotp"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1pkldws5lga4mlv4xmcrfb0yivl6qad0l8qyb2hdb50adv6ny4gs";
-      type = "gem";
-    };
-    version = "3.0.0";
-  };
-  diff-lcs = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "18w22bjz424gzafv6nzv98h0aqkwz3d9xhm7cbr1wfbyas8zayza";
-      type = "gem";
-    };
-    version = "1.3";
-  };
-  diffy = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1azibizfv91sjbzhjqj1pg2xcv8z9b8a7z6kb3wpl4hpj5hil5kj";
-      type = "gem";
-    };
-    version = "3.1.0";
-  };
-  discordrb-webhooks-blackst0ne = {
-    dependencies = ["rest-client"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1f0dw6ci5cbrxrvvqw2kqabpzyjisd4hflbi370rpb4cakkzgw39";
-      type = "gem";
-    };
-    version = "3.3.0";
-  };
-  docile = {
-    groups = ["default" "development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "04d2izkna3ahfn6fwq4xrcafa715d3bbqczxm16fq40fqy87xn17";
-      type = "gem";
-    };
-    version = "1.3.1";
-  };
-  domain_name = {
-    dependencies = ["unf"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0abdlwb64ns7ssmiqhdwgl27ly40x2l27l8hs8hn0z4kb3zd2x3v";
-      type = "gem";
-    };
-    version = "0.5.20180417";
-  };
-  doorkeeper = {
-    dependencies = ["railties"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "022r03i830b2lvmr0xzlj6ivlvc1zr64hy4a4bsy3flv94da77rz";
-      type = "gem";
-    };
-    version = "4.3.2";
-  };
-  doorkeeper-openid_connect = {
-    dependencies = ["doorkeeper" "json-jwt"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1wgrz0xcply5vl6d1m62blqwcbn4v0b27bswyws2y9wbyglz6f95";
-      type = "gem";
-    };
-    version = "1.5.0";
-  };
-  ed25519 = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1f5kr8za7hvla38fc0n9jiv55iq62k5bzclsa5kdb14l3r4w6qnw";
-      type = "gem";
-    };
-    version = "1.2.4";
-  };
-  elasticsearch = {
-    dependencies = ["elasticsearch-api" "elasticsearch-transport"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0fik4nrxyi28zy1xwi4rygn0pf1sm1gskcrvbsnmqfrsdd6l4ga4";
-      type = "gem";
-    };
-    version = "5.0.3";
-  };
-  elasticsearch-api = {
-    dependencies = ["multi_json"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0aal128hq59l5kscl2ag2cv24g1sp5ysdb4jxkqmj0b1l9rv16mw";
-      type = "gem";
-    };
-    version = "5.0.3";
-  };
-  elasticsearch-model = {
-    dependencies = ["activesupport" "elasticsearch" "hashie"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "10kbsdxd192g8x60fhaxs4gqpgwag68d53flcw8rwvdm0i8smyzf";
-      type = "gem";
-    };
-    version = "0.1.9";
-  };
-  elasticsearch-rails = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "081hm2dc3l6kky027wm3s8k6lmiygg0hnrggnidchbl94nlalw2z";
-      type = "gem";
-    };
-    version = "0.1.9";
-  };
-  elasticsearch-transport = {
-    dependencies = ["faraday" "multi_json"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1a7fak70ajdqw1ahd2gmgijka52pjjfr3chaakkxa5fk3rwwna26";
-      type = "gem";
-    };
-    version = "5.0.3";
-  };
-  email_reply_trimmer = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0vijywhy1acsq4187ss6w8a7ksswaf1d5np3wbj962b6rqif5vcz";
-      type = "gem";
-    };
-    version = "0.1.6";
-  };
-  email_spec = {
-    dependencies = ["htmlentities" "launchy" "mail"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0yadaif80cf2ry0nvhir1s70xmm22xzncq6vfvvffdd8h02ridv0";
-      type = "gem";
-    };
-    version = "2.2.0";
-  };
-  encryptor = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0s8rvfl0vn8w7k1sgkc234060jh468s3zd45xa64p1jdmfa3zwmb";
-      type = "gem";
-    };
-    version = "3.0.0";
-  };
-  equalizer = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1kjmx3fygx8njxfrwcmn7clfhjhb6bvv3scy2lyyi0wqyi3brra4";
-      type = "gem";
-    };
-    version = "0.0.11";
-  };
-  erubi = {
-    groups = ["default" "development" "mysql" "postgres" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1kagnf6ziahj0d781s6ryy6fwqwa3ad4xbzzj84p9m4nv4c2jir1";
-      type = "gem";
-    };
-    version = "1.8.0";
-  };
-  escape_utils = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0qminivnyzwmqjhrh3b92halwbk0zcl9xn828p5rnap1szl2yag5";
-      type = "gem";
-    };
-    version = "1.2.1";
-  };
-  et-orbi = {
-    dependencies = ["tzinfo"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1swgjb3h2hs5xflb68837l0vd32masbz9c66b1963mxlnnxf5gsg";
-      type = "gem";
-    };
-    version = "1.2.1";
-  };
-  eventmachine = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r";
-      type = "gem";
-    };
-    version = "1.2.7";
-  };
-  excon = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "15l9w0938c19nxmrp09n75qpmm64k12xj69h47yvxzcxcpbgnkb2";
-      type = "gem";
-    };
-    version = "0.62.0";
-  };
-  execjs = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0grlxwiccbnflxs30r3h7g23xnps5knav1jyqkk3anvm8363ifjw";
-      type = "gem";
-    };
-    version = "2.6.0";
-  };
-  expression_parser = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1938z3wmmdabqxlh5d5c56xfg1jc6z15p7zjyhvk7364zwydnmib";
-      type = "gem";
-    };
-    version = "0.9.0";
-  };
-  extended-markdown-filter = {
-    dependencies = ["html-pipeline"];
-    groups = ["default" "development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "17mi5qayplfaa6p3mfwa36il84ixr0bimqvl0q73lw5i81blp126";
-      type = "gem";
-    };
-    version = "0.6.0";
-  };
-  factory_bot = {
-    dependencies = ["activesupport"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0r975ba6y0mcy3aya099gpnjn5gf1h6fbw8f3smmjay5zvin3nwx";
-      type = "gem";
-    };
-    version = "4.8.2";
-  };
-  factory_bot_rails = {
-    dependencies = ["factory_bot" "railties"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0cdbp12ih2w77l331frv8gv6bv9dinn1663dy1jn0gb9ss1hwvs2";
-      type = "gem";
-    };
-    version = "4.8.2";
-  };
-  faraday = {
-    dependencies = ["multipart-post"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "157c4cmb5g1b3ny6k9qf9z57rfijl54fcq3hnqqf6g31g1m096b2";
-      type = "gem";
-    };
-    version = "0.12.2";
-  };
-  faraday-http-cache = {
-    dependencies = ["faraday"];
-    groups = ["default" "development"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "08j86fgcwl7z792qyijdsq680arzpfiydqd24ja405z2rbm7r2i0";
-      type = "gem";
-    };
-    version = "2.0.0";
-  };
-  faraday_middleware = {
-    dependencies = ["faraday"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1p7icfl28nvl8qqdsngryz1snqic9l8x6bk0dxd7ygn230y0k41d";
-      type = "gem";
-    };
-    version = "0.12.2";
-  };
-  faraday_middleware-aws-signers-v4 = {
-    dependencies = ["aws-sdk-resources" "faraday"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0y88xcbq8k2ijhsqdava5493p26k49agvnzca6vkl3qwfv3ambhp";
-      type = "gem";
-    };
-    version = "0.1.7";
-  };
-  faraday_middleware-multi_json = {
-    dependencies = ["faraday_middleware" "multi_json"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0651sxhzbq9xfq3hbpmrp0nbybxnm9ja3m97k386m4bqgamlvz1q";
-      type = "gem";
-    };
-    version = "0.0.6";
-  };
-  fast_blank = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "16s1ilyvwzmkcgmklbrn0c2pch5n02vf921njx0bld4crgdr6z56";
-      type = "gem";
-    };
-    version = "1.0.0";
-  };
-  fast_gettext = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1s42dsy3rh9h37d16pwhswf2q9cx25v5fn3q881b5iz6fvdjixv3";
-      type = "gem";
-    };
-    version = "1.6.0";
-  };
-  ffaker = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "01z5lpssjc0n8lm4xrlja0hh8lv4ngzbybjvd4rdkc5x9ddvh8s3";
-      type = "gem";
-    };
-    version = "2.10.0";
-  };
-  ffi = {
-    groups = ["default" "development" "kerberos" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "06mvxpjply8qh4j3fj9wh08kdzwkbnvsiysh0vrhlk5cwxzjmblh";
-      type = "gem";
-    };
-    version = "1.11.1";
-  };
-  flipper = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1pdj9y3k6padiicfraxw9ibx9fm8yi2ihh608736lq5nnbf3k6gw";
-      type = "gem";
-    };
-    version = "0.13.0";
-  };
-  flipper-active_record = {
-    dependencies = ["activerecord" "flipper"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0rgm4h5h6xcbf17z47sw8ancaxva8x4hwlxmyqpm0vzj1pnc47c1";
-      type = "gem";
-    };
-    version = "0.13.0";
-  };
-  flipper-active_support_cache_store = {
-    dependencies = ["activesupport" "flipper"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0zpikmfhadb7l1ny6xbhk5d4840im6yq0wvfsnlw718spxi4ccgk";
-      type = "gem";
-    };
-    version = "0.13.0";
-  };
-  flowdock = {
-    dependencies = ["httparty" "multi_json"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "04nrvg4gzgabf5mnnhccl8bwrkvn3y4pm7a1dqzqhpvfr4m5pafg";
-      type = "gem";
-    };
-    version = "0.7.1";
-  };
-  fog-aliyun = {
-    dependencies = ["fog-core" "fog-json" "ipaddress" "xml-simple"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1vl5zf9wr6qwm1awxscyifvrrfqnyacidxgzhkba2wqlgizk3anh";
-      type = "gem";
-    };
-    version = "0.3.3";
-  };
-  fog-aws = {
-    dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "086kyvdhf1k8nk7f4gmybjc3k0m88f9pw99frddcy1w96pj5kyg4";
-      type = "gem";
-    };
-    version = "3.5.2";
-  };
-  fog-core = {
-    dependencies = ["builder" "excon" "formatador" "mime-types"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1agd6xgzk0rxrsjdpn94v4hy89s0nm2cs4zg2p880w2dan9xgrak";
-      type = "gem";
-    };
-    version = "2.1.0";
-  };
-  fog-google = {
-    dependencies = ["fog-core" "fog-json" "fog-xml" "google-api-client"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1784xynmgvj1x9phy42nbd3fcgj040zps6wn7msi6vnj1sg4wpfy";
-      type = "gem";
-    };
-    version = "1.9.1";
-  };
-  fog-json = {
-    dependencies = ["fog-core" "multi_json"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1zj8llzc119zafbmfa4ai3z5s7c4vp9akfs0f9l2piyvcarmlkyx";
-      type = "gem";
-    };
-    version = "1.2.0";
-  };
-  fog-local = {
-    dependencies = ["fog-core"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0ba4lln35nryi6dcbz68vxg9ml6v8cc8s8c82f7syfd84bz76x21";
-      type = "gem";
-    };
-    version = "0.6.0";
-  };
-  fog-openstack = {
-    dependencies = ["fog-core" "fog-json" "ipaddress"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "171xnsl6w0j7yi6sp26dcqahx4r4gb2cf359gmy11g5iwnsll5wg";
-      type = "gem";
-    };
-    version = "1.0.8";
-  };
-  fog-rackspace = {
-    dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0y2bli061g37l9p4w0ljqbmg830rp2qz6sf8b0ck4cnx68j7m32a";
-      type = "gem";
-    };
-    version = "0.1.1";
-  };
-  fog-xml = {
-    dependencies = ["fog-core" "nokogiri"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "043lwdw2wsi6d55ifk0w3izi5l1d1h0alwyr3fixic7b94kc812n";
-      type = "gem";
-    };
-    version = "0.1.3";
-  };
-  font-awesome-rails = {
-    dependencies = ["railties"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "11mf7bk2737pyxjwba3a9lpgcxzbp0vgq01n2dn30774zysc90hj";
-      type = "gem";
-    };
-    version = "4.7.0.4";
-  };
-  foreman = {
-    dependencies = ["thor"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "06mq39lpmc17bxzlwhad9d8i0lcnbb08xr18smh2x79mm631wsw0";
-      type = "gem";
-    };
-    version = "0.84.0";
-  };
-  formatador = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1gc26phrwlmlqrmz4bagq1wd5b7g64avpx0ghxr9xdxcvmlii0l0";
-      type = "gem";
-    };
-    version = "0.2.5";
-  };
-  fugit = {
-    dependencies = ["et-orbi" "raabro"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1x5h31hl75x0p5s36hinywg18ijlxjhnlb5p02aqcjjkx777rcav";
-      type = "gem";
-    };
-    version = "1.2.1";
-  };
-  fuubar = {
-    dependencies = ["rspec-core" "ruby-progressbar"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0jlv2wisgnim29h47shvqhipbz1wgndfdr7i6y5wcfag0z2660lv";
-      type = "gem";
-    };
-    version = "2.2.0";
-  };
-  gemoji = {
-    groups = ["default" "development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0vgklpmhdz98xayln5hhqv4ffdyrglzwdixkn5gsk9rj94pkymc0";
-      type = "gem";
-    };
-    version = "3.0.1";
-  };
-  gemojione = {
-    dependencies = ["json"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0ayk8r147k1s38nj18pwk76npx1p7jhi86silk800nj913pjvrhj";
-      type = "gem";
-    };
-    version = "3.3.0";
-  };
-  get_process_mem = {
-    groups = ["default" "development" "puma" "test" "unicorn"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1bvfjdign16r0zwm2rlfrq0sk1licvmlgbnlpnyckniv5r7i080g";
-      type = "gem";
-    };
-    version = "0.2.3";
-  };
-  gettext = {
-    dependencies = ["locale" "text"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0764vj7gacn0aypm2bf6m46dzjzwzrjlmbyx6qwwwzbmi94r40wr";
-      type = "gem";
-    };
-    version = "3.2.9";
-  };
-  gettext_i18n_rails = {
-    dependencies = ["fast_gettext"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0vs918a03mqvx9aczaqdg9d2q9s3c6swqavzn82qgq5i822czrcm";
-      type = "gem";
-    };
-    version = "1.8.0";
-  };
-  gettext_i18n_rails_js = {
-    dependencies = ["gettext" "gettext_i18n_rails" "po_to_json" "rails"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "11yn5cf92wsmlj5c1065mg6swf8gq9l6g9ahikvvyf9npvjay42x";
-      type = "gem";
-    };
-    version = "1.3.0";
-  };
-  git = {
-    groups = ["default" "development"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0bf83icwypi3p3pd97vlqbnp3hvf31ncd440m9kh9y7x6yk74wyh";
-      type = "gem";
-    };
-    version = "1.5.0";
-  };
-  gitaly = {
-    dependencies = ["grpc"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "00di7rl1171rvpncxnfdpnmqc32kx9xmi6nwrn52k8cyrxzz2ixf";
-      type = "gem";
-    };
-    version = "1.58.0";
-  };
-  github-markup = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "17g6g18gdjg63k75sfwiskjzl9i0hfcnrkcpb4fwrnb20v3jgswp";
-      type = "gem";
-    };
-    version = "1.7.0";
-  };
-  gitlab-labkit = {
-    dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing" "redis"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1j06gl4ksd83rycg3fb46bb77iw74i1ivs5li6pyf5klrxjq8k3h";
-      type = "gem";
-    };
-    version = "0.5.2";
-  };
-  gitlab-license = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1q26cgp3ln3b36n3sc69r6hxafkxjwdr3m0d7jlch5j7vyib9bih";
-      type = "gem";
-    };
-    version = "1.0.0";
-  };
-  gitlab-markup = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0rqf3jmyn78r3ysy3bjyx7s4yv3xipxlmqlmbyrbksna19rrx08d";
-      type = "gem";
-    };
-    version = "1.7.0";
-  };
-  gitlab-peek = {
-    dependencies = ["railties"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0r5a1cjhw8dyz1az9rhqh252rvsjhvbs28wnmk0lnqkvyydip4ql";
-      type = "gem";
-    };
-    version = "0.0.1";
-  };
-  gitlab-sidekiq-fetcher = {
-    dependencies = ["sidekiq"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0dvx2klf1a1xyf15q34fn59291v6jwx3z315rxb2dmkvcr9873m1";
-      type = "gem";
-    };
-    version = "0.5.2";
-  };
-  gitlab-styles = {
-    dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-performance" "rubocop-rspec"];
-    groups = ["development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0kxn5j4gk2bidxfi3lnx8sl58kwh0fp89p75pbwwz3cd88d4vgsq";
-      type = "gem";
-    };
-    version = "2.8.0";
-  };
-  gitlab_chronic_duration = {
-    dependencies = ["numerizer"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0rajna3aijqj8ap55xggawyh2xzh1vkrmzkjh3ja5x05qsf9csgs";
-      type = "gem";
-    };
-    version = "0.10.6.1";
-  };
-  gitlab_omniauth-ldap = {
-    dependencies = ["net-ldap" "omniauth" "pyu-ruby-sasl" "rubyntlm"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1f8cjbzlhckarmm59l380jjy33a3hlljg69b3zkh8rhy1xd3xr90";
-      type = "gem";
-    };
-    version = "2.1.1";
-  };
-  globalid = {
-    dependencies = ["activesupport"];
-    groups = ["default" "development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1zkxndvck72bfw235bd9nl2ii0lvs5z88q14706cmn702ww2mxv1";
-      type = "gem";
-    };
-    version = "0.4.2";
-  };
-  gon = {
-    dependencies = ["actionpack" "multi_json" "request_store"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0q9nvnw98mbb40h7mlzn1zk40r2l29yybhinmiqhrq8a6adsv806";
-      type = "gem";
-    };
-    version = "6.2.0";
-  };
-  google-api-client = {
-    dependencies = ["addressable" "googleauth" "httpclient" "mime-types" "representable" "retriable"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "05h2lca9b334ayabgs3h0mzc2wg3csvkqv1lv3iirpgf90ypbk1k";
-      type = "gem";
-    };
-    version = "0.23.4";
-  };
-  google-protobuf = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "04988m3hmllg4sl4syjb35x0wzsg7rj1nmvhx3d9ihml22w76gb2";
-      type = "gem";
-    };
-    version = "3.7.1";
-  };
-  googleapis-common-protos-types = {
-    dependencies = ["google-protobuf"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0hyr94cafiqj0k8q19hnl658pmbz2b404akikzfv4hdb1j1bwsg1";
-      type = "gem";
-    };
-    version = "1.0.4";
-  };
-  googleauth = {
-    dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1747p1dhpvz76i98xnjrvaj785y1232svm0nc8g9by6pz835gp2l";
-      type = "gem";
-    };
-    version = "0.6.6";
-  };
-  gpgme = {
-    dependencies = ["mini_portile2"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "12fqirxr964mc8jwsfl5nif6q4wcckrmj7w4c9ci4xg9xy2b9v6m";
-      type = "gem";
-    };
-    version = "2.0.18";
-  };
-  grape = {
-    dependencies = ["activesupport" "builder" "mustermann-grape" "rack" "rack-accept" "virtus"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "04bam0iq9sad1df361317zz4knwci905yig502khl8gm1lp1168c";
-      type = "gem";
-    };
-    version = "1.1.0";
-  };
-  grape-entity = {
-    dependencies = ["activesupport" "multi_json"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1w78wylkhdkc0s6n6d20hggbb3pl3ladzzd5lx6ack2iswybx7b9";
-      type = "gem";
-    };
-    version = "0.7.1";
-  };
-  grape-path-helpers = {
-    dependencies = ["activesupport" "grape" "rake"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "16l6lrv4h4ls0lrpj35pc00431q2rx6r9n47337qyvprxs3v0a01";
-      type = "gem";
-    };
-    version = "1.1.0";
-  };
-  grape_logging = {
-    dependencies = ["grape"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0lg2vhk0dlnyqs2rz8wilfm039q5mbsp5nvf51asir48a1rf9yza";
-      type = "gem";
-    };
-    version = "1.7.0";
-  };
-  graphiql-rails = {
-    dependencies = ["railties" "sprockets-rails"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "10q5zipwgjgaan9lfqakdkm5ry8afgkq79bkimgksn6jyyvpz6w8";
-      type = "gem";
-    };
-    version = "1.4.10";
-  };
-  graphql = {
-    groups = ["default" "development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "17gpvpv3zpmcbzgdx9skaaj5frxw12ja5hssk7xwzckna0v782vh";
-      type = "gem";
-    };
-    version = "1.9.11";
-  };
-  graphql-docs = {
-    dependencies = ["commonmarker" "escape_utils" "extended-markdown-filter" "gemoji" "graphql" "html-pipeline" "sass"];
-    groups = ["development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "12wzsikbn54b2hcv100hz7isq5gdjm5w5b8xya64ra5sw6sabq8d";
-      type = "gem";
-    };
-    version = "1.6.0";
-  };
-  grpc = {
-    dependencies = ["google-protobuf" "googleapis-common-protos-types"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1rdywzism5vxz8pnml6xjb9f19diclyy74014z69q01jzqwi1wgs";
-      type = "gem";
-    };
-    version = "1.19.0";
-  };
-  gssapi = {
-    dependencies = ["ffi"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0j93nsf9j57p7x4aafalvjg8hia2mmqv3aky7fmw2ck5yci343ix";
-      type = "gem";
-    };
-    version = "1.2.0";
-  };
-  haml = {
-    dependencies = ["temple" "tilt"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1q0a9fvqh8kn6wm97fcks6qzbjd400bv8bx748w8v87m7p4klhac";
-      type = "gem";
-    };
-    version = "5.0.4";
-  };
-  haml_lint = {
-    dependencies = ["haml" "rainbow" "rake" "rubocop" "sysexits"];
-    groups = ["development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1k6pvb2lc6d72nq01jqmi3mxpp80m9mmbc265kgaxmcnjxqhacb1";
-      type = "gem";
-    };
-    version = "0.31.0";
-  };
-  hamlit = {
-    dependencies = ["temple" "thor" "tilt"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0hk338vkzmwszxdh0q02iw88rbr3bj3fd7fzn4psm8wy80zcgl9i";
-      type = "gem";
-    };
-    version = "2.8.8";
-  };
-  hangouts-chat = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1dmnv3723c22683bzys8walkl6wi74xzawxjbhwqzjdbwk3bdgmx";
-      type = "gem";
-    };
-    version = "0.0.5";
-  };
-  hashdiff = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "19ykg5pax8798nh1yv71adkx0zzs7gn2rxjj86v7nsw0jba5lask";
-      type = "gem";
-    };
-    version = "0.3.8";
-  };
-  hashie = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1hh5lybf8hm7d7xs4xm8hxvm8xqrs2flc8fnwkrclaj746izw6xb";
-      type = "gem";
-    };
-    version = "3.5.7";
-  };
-  hashie-forbidden_attributes = {
-    dependencies = ["hashie"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1chgg5d2iddja6ww02x34g8avg11fzmzcb8yvnqlykii79zx6vis";
-      type = "gem";
-    };
-    version = "0.1.1";
-  };
-  health_check = {
-    dependencies = ["rails"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1mfa180nyzz1j0abfihm5nm3lmzq99362ibcphky6rh5vwhckvm8";
-      type = "gem";
-    };
-    version = "2.6.0";
-  };
-  heapy = {
-    groups = ["default" "development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1r9f38fpgjgaxskkwvsliijj6vfmgsff9pnranvvvzkdl67hk1hw";
-      type = "gem";
-    };
-    version = "0.1.4";
-  };
-  hipchat = {
-    dependencies = ["httparty" "mimemagic"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0hgy5jav479vbzzk53lazhpjj094dcsqw6w1d6zjn52p72bwq60k";
-      type = "gem";
-    };
-    version = "1.5.2";
-  };
-  html-pipeline = {
-    dependencies = ["activesupport" "nokogiri"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1mpj5y13jk1arqkhdk66n49kyglmci980c1l6np7pqgyjllb68ad";
-      type = "gem";
-    };
-    version = "2.8.4";
-  };
-  html2text = {
-    dependencies = ["nokogiri"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0kxdj8pf9pss9xgs8aac0alj5g1fi225yzdhh33lzampkazg1hii";
-      type = "gem";
-    };
-    version = "0.2.0";
-  };
-  htmlentities = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj";
-      type = "gem";
-    };
-    version = "4.3.4";
-  };
-  http = {
-    dependencies = ["addressable" "http-cookie" "http-form_data" "http_parser.rb"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1jlm5prw437wqpfxcigh88lfap3m7g8mnmj5as7qw6dzqnvrxwmc";
-      type = "gem";
-    };
-    version = "3.3.0";
-  };
-  http-cookie = {
-    dependencies = ["domain_name"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g";
-      type = "gem";
-    };
-    version = "1.0.3";
-  };
-  http-form_data = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "15lpn604byf7cyxnw949xz4rvpcknqp7a48q73nm630gqxsa76f3";
-      type = "gem";
-    };
-    version = "2.1.1";
-  };
-  "http_parser.rb" = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi";
-      type = "gem";
-    };
-    version = "0.6.0";
-  };
-  httparty = {
-    dependencies = ["mime-types" "multi_xml"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "109xvhl35dsk9zp65n5pdkhiijhqxdyvajbs74nkp4z8yl09vj32";
-      type = "gem";
-    };
-    version = "0.16.4";
-  };
-  httpclient = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99";
-      type = "gem";
-    };
-    version = "2.8.3";
-  };
-  i18n = {
-    dependencies = ["concurrent-ruby"];
-    groups = ["default" "development" "mysql" "postgres" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1hfxnlyr618s25xpafw9mypa82qppjccbh292c4l3bj36az7f6wl";
-      type = "gem";
-    };
-    version = "1.6.0";
-  };
-  i18n_data = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0v0cdwxiaqdwhaljd7z0fbx29q3r5kjl93xnjm5abi1x37645ncj";
-      type = "gem";
-    };
-    version = "0.8.0";
-  };
-  icalendar = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1xsydpp2xph00awi25axv2mwjd5p2rlgd4qb3kh05lvq795kirxd";
-      type = "gem";
-    };
-    version = "2.4.1";
-  };
-  ice_nine = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1nv35qg1rps9fsis28hz2cq2fx1i96795f91q4nmkm934xynll2x";
-      type = "gem";
-    };
-    version = "0.11.2";
-  };
-  influxdb = {
-    dependencies = ["cause" "json"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1vhg5nd88nwvfa76lqcczld916nljswwq6clsixrzi3js8ym9y1w";
-      type = "gem";
-    };
-    version = "0.2.3";
-  };
-  invisible_captcha = {
-    dependencies = ["rails"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "15510dh1vh7l2xs2a4956nhxpnf10168r62i497nmcbyqpp1df88";
-      type = "gem";
-    };
-    version = "0.12.1";
-  };
-  ipaddress = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1x86s0s11w202j6ka40jbmywkrx8fhq8xiy8mwvnkhllj57hqr45";
-      type = "gem";
-    };
-    version = "0.8.3";
-  };
-  jaeger-client = {
-    dependencies = ["opentracing" "thrift"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "198m72c9w3wfwr1mq22dcjjm7d4jd0bci4lrq6zq2zvlzhi04n8l";
-      type = "gem";
-    };
-    version = "0.10.0";
-  };
-  jaro_winkler = {
-    groups = ["default" "development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1930v0chc1q4fr7hn0y1j34mw0v032a8kh0by4d4sbz8ksy056kf";
-      type = "gem";
-    };
-    version = "1.5.3";
-  };
-  jira-ruby = {
-    dependencies = ["activesupport" "atlassian-jwt" "multipart-post" "oauth"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0hb3645x0p3bkmqcgc9b2q4b5kn02wgmb03brx7ag1h5y79an4q5";
-      type = "gem";
-    };
-    version = "1.7.1";
-  };
-  jmespath = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "07w8ipjg59qavijq59hl82zs74jf3jsp7vxl9q3a2d0wpv5akz3y";
-      type = "gem";
-    };
-    version = "1.3.1";
-  };
-  js_regex = {
-    dependencies = ["character_set" "regexp_parser" "regexp_property_values"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0wi4h4f3knb0yp4zq2spks3dpmdzz9wa54d6xk88md0h4v2x33cq";
-      type = "gem";
-    };
-    version = "3.1.1";
-  };
-  json = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0qmj7fypgb9vag723w1a49qihxrcf5shzars106ynw2zk352gbv5";
-      type = "gem";
-    };
-    version = "1.8.6";
-  };
-  json-jwt = {
-    dependencies = ["activesupport" "aes_key_wrap" "bindata"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "065k7vffdki73f4nz89lxi6wxmcw5dlf593831pgvlbralll6x3r";
-      type = "gem";
-    };
-    version = "1.9.4";
-  };
-  json-schema = {
-    dependencies = ["addressable"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "11di8qyam6bmqn0fvvvf3crgaqy4sil0d406ymx0jacn3ff98ymz";
-      type = "gem";
-    };
-    version = "2.8.0";
-  };
-  jwt = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1w0kaqrbl71cq9sbnixc20x5lqah3hs2i93xmhlfdg2y3by7yzky";
-      type = "gem";
-    };
-    version = "2.1.0";
-  };
-  kaminari = {
-    dependencies = ["activesupport" "kaminari-actionview" "kaminari-activerecord" "kaminari-core"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0invfvfb252ihsdr65rylkvd1x2wy004jval52v3i8ybb0jhc5hi";
-      type = "gem";
-    };
-    version = "1.0.1";
-  };
-  kaminari-actionview = {
-    dependencies = ["actionview" "kaminari-core"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0mhhsm6xhmwqc7hfw7xnk1kdbfg468bqs5awcqm5j6j8b9zyjvdi";
-      type = "gem";
-    };
-    version = "1.0.1";
-  };
-  kaminari-activerecord = {
-    dependencies = ["activerecord" "kaminari-core"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1kb5aj6iy1cwcq5548jd3w1ipxicnzmnx2ay1s4hvad2gvrd4g93";
-      type = "gem";
-    };
-    version = "1.0.1";
-  };
-  kaminari-core = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0r2n293ad1xr9wgn8cr53nfzwls4w3p1xi4kjfjgl1z0yf05mpwr";
-      type = "gem";
-    };
-    version = "1.0.1";
-  };
-  kgio = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1528pyj1szzzp3pgj05fzjd36qjrxm9yj2x5radc9p1z7vl67y50";
-      type = "gem";
-    };
-    version = "2.11.2";
-  };
-  knapsack = {
-    dependencies = ["rake"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1c69rcwfrdrnx8ddl6k1qxhw9f2dj5x5bbddz435isl2hfr5zh92";
-      type = "gem";
-    };
-    version = "1.17.0";
-  };
-  kramdown = {
-    groups = ["default" "development"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1dl840bvx8d9nq6lg3mxqyvbiqnr6lk3jfsm6r8zhz7p5srmd688";
-      type = "gem";
-    };
-    version = "2.1.0";
-  };
-  kramdown-parser-gfm = {
-    dependencies = ["kramdown"];
-    groups = ["default" "development"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0a8pb3v951f4x7h968rqfsa19c8arz21zw1vaj42jza22rap8fgv";
-      type = "gem";
-    };
-    version = "1.1.0";
-  };
-  kubeclient = {
-    dependencies = ["http" "recursive-open-struct" "rest-client"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0gj6z90p3nm43bafbp97b78zi764gy88590g2y4lm8zcgk8k586r";
-      type = "gem";
-    };
-    version = "4.4.0";
-  };
-  launchy = {
-    dependencies = ["addressable"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "190lfbiy1vwxhbgn4nl4dcbzxvm049jwc158r2x7kq3g5khjrxa2";
-      type = "gem";
-    };
-    version = "2.4.3";
-  };
-  letter_opener = {
-    dependencies = ["launchy"];
-    groups = ["default" "development"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "09a7kgsmr10a0hrc9bwxglgqvppjxij9w8bxx91mnvh0ivaw0nq9";
-      type = "gem";
-    };
-    version = "1.7.0";
-  };
-  letter_opener_web = {
-    dependencies = ["actionmailer" "letter_opener" "railties"];
-    groups = ["development"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "17qhwrkncrrp1bi2f7fbkm5lpnkdsiwy8jcvgr2wa97ck8y4x2bb";
-      type = "gem";
-    };
-    version = "1.3.4";
-  };
-  license_finder = {
-    dependencies = ["rubyzip" "thor" "toml" "with_env" "xml-simple"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "01rhqm5m3m22gq6q9f1x9fh3x3wrf9khnnsycblj0xg5frdjv77v";
-      type = "gem";
-    };
-    version = "5.4.0";
-  };
-  licensee = {
-    dependencies = ["rugged"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0w6d2smhg3kzcx4m2ii06akakypwhiglansk51bpx290hhc8h3pc";
-      type = "gem";
-    };
-    version = "8.9.2";
-  };
-  locale = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1sls9bq4krx0fmnzmlbn64dw23c4d6pz46ynjzrn9k8zyassdd0x";
-      type = "gem";
-    };
-    version = "2.1.2";
-  };
-  lograge = {
-    dependencies = ["actionpack" "activesupport" "railties" "request_store"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "00lcn7s3slfn32di4qwlx2yj5f9r2pcnd0naxrvqqwypcg1z2sdd";
-      type = "gem";
-    };
-    version = "0.10.0";
-  };
-  loofah = {
-    dependencies = ["crass" "nokogiri"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1ccsid33xjajd0im2xv941aywi58z7ihwkvaf1w2bv89vn5bhsjg";
-      type = "gem";
-    };
-    version = "2.2.3";
-  };
-  mail = {
-    dependencies = ["mini_mime"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "00wwz6ys0502dpk8xprwcqfwyf3hmnx6lgxaiq6vj43mkx43sapc";
-      type = "gem";
-    };
-    version = "2.7.1";
-  };
-  mail_room = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "16b8yjd1if665mwaindwys06nkkcs0jw3dcsqvn6qbp6alfigqaa";
-      type = "gem";
-    };
-    version = "0.9.1";
-  };
-  marcel = {
-    dependencies = ["mimemagic"];
-    groups = ["default" "development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1nxbjmcyg8vlw6zwagf17l9y2mwkagmmkg95xybpn4bmf3rfnksx";
-      type = "gem";
-    };
-    version = "0.3.3";
-  };
-  memoist = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0pq8fhqh8w25qcw9v3vzfb0i6jp0k3949ahxc3wrwz2791dpbgbh";
-      type = "gem";
-    };
-    version = "0.16.0";
-  };
-  memoizable = {
-    dependencies = ["thread_safe"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0v42bvghsvfpzybfazl14qhkrjvx0xlmxz0wwqc960ga1wld5x5c";
-      type = "gem";
-    };
-    version = "0.4.2";
-  };
-  memory_profiler = {
-    groups = ["default" "development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1xki7jrbzylsmk1brjibmhifb0x70skr55pdq4rvxcyrlnrrvyxz";
-      type = "gem";
-    };
-    version = "0.9.13";
-  };
-  method_source = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1pviwzvdqd90gn6y7illcdd9adapw8fczml933p5vl739dkvl3lq";
-      type = "gem";
-    };
-    version = "0.9.2";
-  };
-  mime-types = {
-    dependencies = ["mime-types-data"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0fjxy1jm52ixpnv3vg9ld9pr9f35gy0jp66i1njhqjvmnvq0iwwk";
-      type = "gem";
-    };
-    version = "3.2.2";
-  };
-  mime-types-data = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1m00pg19cm47n1qlcxgl91ajh2yq0fszvn1vy8fy0s1jkrp9fw4a";
-      type = "gem";
-    };
-    version = "3.2019.0331";
-  };
-  mimemagic = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "00ibc1mhvdfyfyl103xwb45621nwyqxf124cni5hyfhag0fn1c3q";
-      type = "gem";
-    };
-    version = "0.3.2";
-  };
-  mini_magick = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0qy09qrd5bwh8mkbj514n5vcw9ni73218h9s3zmvbpmdwrnzi8j4";
-      type = "gem";
-    };
-    version = "4.9.5";
-  };
-  mini_mime = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1q4pshq387lzv9m39jv32vwb8wrq3wc4jwgl4jk209r4l33v09d3";
-      type = "gem";
-    };
-    version = "1.0.1";
-  };
-  mini_portile2 = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy";
-      type = "gem";
-    };
-    version = "2.4.0";
-  };
-  minitest = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq";
-      type = "gem";
-    };
-    version = "5.11.3";
-  };
-  msgpack = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1186lhwnxiw5ryv6dbxrsfy0fajfll2l95kf9pmca50iyiqi86zn";
-      type = "gem";
-    };
-    version = "1.3.0";
-  };
-  multi_json = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv";
-      type = "gem";
-    };
-    version = "1.13.1";
-  };
-  multi_xml = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0lmd4f401mvravi1i1yq7b2qjjli0yq7dfc4p1nj5nwajp7r6hyj";
-      type = "gem";
-    };
-    version = "0.6.0";
-  };
-  multipart-post = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x";
-      type = "gem";
-    };
-    version = "2.0.0";
-  };
-  murmurhash3 = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1szwcm44z5jg1l4dq73zyjw4rjin23ihkhrw5cpcjrb6cg8hd3y7";
-      type = "gem";
-    };
-    version = "0.1.6";
-  };
-  mustermann = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0lycgkmnyy0bf29nnd2zql5a6pcf8sp69g9v4xw0gcfcxgpwp7i1";
-      type = "gem";
-    };
-    version = "1.0.3";
-  };
-  mustermann-grape = {
-    dependencies = ["mustermann"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "10xdggddjl8nraq7pbli31lwgrzxzz8gp558i811lsv71fqbmhzr";
-      type = "gem";
-    };
-    version = "1.0.0";
-  };
-  nakayoshi_fork = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1mj5czi7rxxmfq4v9qjz74lcqypvnjxhxqfs71zhb2rsfa97a6jg";
-      type = "gem";
-    };
-    version = "0.0.4";
-  };
-  nap = {
-    groups = ["default" "development"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0xm5xssxk5s03wjarpipfm39qmgxsalb46v1prsis14x1xk935ll";
-      type = "gem";
-    };
-    version = "1.1.0";
-  };
-  net-dns = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "18d97xjphw21naaqfhgxp95ikr1d79rx708b2df3xm01j6isqy1d";
-      type = "gem";
-    };
-    version = "0.9.0";
-  };
-  net-ldap = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1fh4l8zfsrvghanpnjxk944k7yl093qpw4759xs6f1v9kb73ihfq";
-      type = "gem";
-    };
-    version = "0.16.0";
-  };
-  net-ntp = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0z96m7nnb9f634cz4i6p0x89z7g9i9h97cnk5f3x3q5x090kzisv";
-      type = "gem";
-    };
-    version = "2.1.3";
-  };
-  net-ssh = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "101wd2px9lady54aqmkibvy4j62zk32w0rjz4vnigyg974fsga40";
-      type = "gem";
-    };
-    version = "5.2.0";
-  };
-  netrc = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0gzfmcywp1da8nzfqsql2zqi648mfnx6qwkig3cv36n9m0yy676y";
-      type = "gem";
-    };
-    version = "0.11.0";
-  };
-  nio4r = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1a41ca1kpdmrypjp9xbgvckpy8g26zxphkja9vk7j5wl4n8yvlyr";
-      type = "gem";
-    };
-    version = "2.3.1";
-  };
-  no_proxy_fix = {
-    groups = ["default" "development"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "006dmdb640v1kq0sll3dnlwj1b0kpf3i1p27ygyffv8lpcqlr6sf";
-      type = "gem";
-    };
-    version = "0.1.2";
-  };
-  nokogiri = {
-    dependencies = ["mini_portile2"];
-    groups = ["default" "development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0nmdrqqz1gs0fwkgzxjl4wr554gr8dc1fkrqjc2jpsvwgm41rygv";
-      type = "gem";
-    };
-    version = "1.10.4";
-  };
-  nokogumbo = {
-    dependencies = ["nokogiri"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "09qc1c7acv9qm48vk2kzvnrq4ij8jrql1cv33nmv2nwmlggy0jyj";
-      type = "gem";
-    };
-    version = "1.5.0";
-  };
-  numerizer = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0vrk9jbv4p4dcz0wzr72wrf5kajblhc5l9qf7adbcwi4qvz9xv0h";
-      type = "gem";
-    };
-    version = "0.1.1";
-  };
-  oauth = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1zszdg8q1b135z7l7crjj234k4j0m347hywp5kj6zsq7q78pw09y";
-      type = "gem";
-    };
-    version = "0.5.4";
-  };
-  oauth2 = {
-    dependencies = ["faraday" "jwt" "multi_json" "multi_xml" "rack"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0av6nlb5y2sm6m8fx669ywrqa9858yqaqfqzny75nqp3anag89qh";
-      type = "gem";
-    };
-    version = "1.4.1";
-  };
-  octokit = {
-    dependencies = ["sawyer"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1ssn5iyax07a22mvmj0y45bfy8ali129bl1qmasp6bcg03bvk298";
-      type = "gem";
-    };
-    version = "4.9.0";
-  };
-  omniauth = {
-    dependencies = ["hashie" "rack"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1p16h1rp8by05k8gfw17xjhgwp60dk8qmj1xalv1n23kmxfsxb1x";
-      type = "gem";
-    };
-    version = "1.9.0";
-  };
-  omniauth-auth0 = {
-    dependencies = ["omniauth-oauth2"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0id5gn14av81kh41cq4q6c9knyvzl7vc4rs3m4pmpd43g2z6jdw2";
-      type = "gem";
-    };
-    version = "2.0.0";
-  };
-  omniauth-authentiq = {
-    dependencies = ["jwt" "omniauth-oauth2"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0k7vajxwplsp188xfj4mi9iqbc7f7djqh02by4mphc51hl87kcqi";
-      type = "gem";
-    };
-    version = "0.3.3";
-  };
-  omniauth-azure-oauth2 = {
-    dependencies = ["jwt" "omniauth" "omniauth-oauth2"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1a3iqy63l1jd6na4y0bj4a8mlp7gcn3a0awnz9g79fa8n4v2g8n4";
-      type = "gem";
-    };
-    version = "0.0.10";
-  };
-  omniauth-cas3 = {
-    dependencies = ["addressable" "nokogiri" "omniauth"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "191b4jm4djmmy54yxfxj3c889r2wn3g6sfsdj6l1rjy0kw1m2qgx";
-      type = "gem";
-    };
-    version = "1.1.4";
-  };
-  omniauth-facebook = {
-    dependencies = ["omniauth-oauth2"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "03zjla9i446fk1jkw7arh67c39jfhp5bhkmhvbw8vczxr1jkbbh5";
-      type = "gem";
-    };
-    version = "4.0.0";
-  };
-  omniauth-github = {
-    dependencies = ["omniauth" "omniauth-oauth2"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0yg7k4p95ybcsii17spqarl8rpfzkq0kb19ab6wl4lc922zgfbqc";
-      type = "gem";
-    };
-    version = "1.3.0";
-  };
-  omniauth-gitlab = {
-    dependencies = ["omniauth" "omniauth-oauth2"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "19ydk2zd2mz8zi80z3l03pajpm9357sg3lrankrcb3pirkkdb9fp";
-      type = "gem";
-    };
-    version = "1.0.3";
-  };
-  omniauth-google-oauth2 = {
-    dependencies = ["jwt" "omniauth" "omniauth-oauth2"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "03v2gqpsbdhkqaxhvzr83za885awm6pgskv3mkyfvang7mr321df";
-      type = "gem";
-    };
-    version = "0.6.0";
-  };
-  omniauth-kerberos = {
-    dependencies = ["omniauth-multipassword" "timfel-krb5-auth"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "05xsv76qjxcxzrvabaar2bchv7435y8l2j0wk4zgchh3yv85kiq7";
-      type = "gem";
-    };
-    version = "0.3.0";
-  };
-  omniauth-multipassword = {
-    dependencies = ["omniauth"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0qykp76hw80lkgb39hyzrv68hkbivc8cv0vbvrnycjh9fwfp1lv8";
-      type = "gem";
-    };
-    version = "0.4.2";
-  };
-  omniauth-oauth = {
-    dependencies = ["oauth" "omniauth"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1n5vk4by7hkyc09d9blrw2argry5awpw4gbw1l4n2s9b3j4qz037";
-      type = "gem";
-    };
-    version = "1.1.0";
-  };
-  omniauth-oauth2 = {
-    dependencies = ["oauth2" "omniauth"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "11mi36l9d97r77q99jnafdc1yaa0a9wahhpp7dj7ank8q52g7g79";
-      type = "gem";
-    };
-    version = "1.6.0";
-  };
-  omniauth-oauth2-generic = {
-    dependencies = ["omniauth-oauth2"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1m6vpip3rm1spx1x9y1kjczzailsph1xqgaakqylzq3jqkv18273";
-      type = "gem";
-    };
-    version = "0.2.2";
-  };
-  omniauth-salesforce = {
-    dependencies = ["omniauth" "omniauth-oauth2"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0sr7xmffx6dbsrvnh6spka5ljyzf69iac754xw5r1736py41qhpj";
-      type = "gem";
-    };
-    version = "1.0.5";
-  };
-  omniauth-saml = {
-    dependencies = ["omniauth" "ruby-saml"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "17lji8i4q9k3yi8lmjwlw8rfpp2sc74jv8d6flgq85lg5brfqq1p";
-      type = "gem";
-    };
-    version = "1.10.0";
-  };
-  omniauth-shibboleth = {
-    dependencies = ["omniauth"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "04yin7j8xpr8llvank3ivzahqkc6ss5bppc7q6znzdswxmf75fxh";
-      type = "gem";
-    };
-    version = "1.3.0";
-  };
-  omniauth-twitter = {
-    dependencies = ["omniauth-oauth" "rack"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0r5j65hkpgzhvvbs90id3nfsjgsad6ymzggbm7zlaxvnrmvnrk65";
-      type = "gem";
-    };
-    version = "1.4.0";
-  };
-  omniauth-ultraauth = {
-    dependencies = ["omniauth_openid_connect"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1z8gz8ql4vb8y5n4lr67afnjmp23bpqi18dmda5psigvd2jddyn8";
-      type = "gem";
-    };
-    version = "0.0.2";
-  };
-  omniauth_crowd = {
-    dependencies = ["activesupport" "nokogiri" "omniauth"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "12g5ck05h6kr9mnp870x8pkxsadg81ca70hg8n3k8xx007lfw2q7";
-      type = "gem";
-    };
-    version = "2.2.3";
-  };
-  omniauth_openid_connect = {
-    dependencies = ["addressable" "omniauth" "openid_connect"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0ja7cjlm4z0k0pwwy64djl58pay3lzkw7im565fybs4a8q4wmacb";
-      type = "gem";
-    };
-    version = "0.3.1";
-  };
-  open4 = {
-    groups = ["default" "development"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1cgls3f9dlrpil846q0w7h66vsc33jqn84nql4gcqkk221rh7px1";
-      type = "gem";
-    };
-    version = "1.3.4";
-  };
-  openid_connect = {
-    dependencies = ["activemodel" "attr_required" "json-jwt" "rack-oauth2" "swd" "tzinfo" "validate_email" "validate_url" "webfinger"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1r13bv18nyvw0g1nw3fzffvv2si99zj24w0k5zgawf4q6nn5f7vd";
-      type = "gem";
-    };
-    version = "1.1.6";
-  };
-  opentracing = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "11lj1d8vq0hkb5hjz8q4lm82cddrggpbb33dhqfn7rxhwsmxgdfy";
-      type = "gem";
-    };
-    version = "0.5.0";
-  };
-  optimist = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "05jxrp3nbn5iilc1k7ir90mfnwc5abc9h78s5rpm3qafwqxvcj4j";
-      type = "gem";
-    };
-    version = "3.0.0";
-  };
-  org-ruby = {
-    dependencies = ["rubypants"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0x69s7aysfiwlcpd9hkvksfyld34d8kxr62adb59vjvh8hxfrjwk";
-      type = "gem";
-    };
-    version = "0.9.12";
-  };
-  orm_adapter = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1fg9jpjlzf5y49qs9mlpdrgs5rpcyihq1s4k79nv9js0spjhnpda";
-      type = "gem";
-    };
-    version = "0.5.0";
-  };
-  os = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1s401gvhqgs2r8hh43ia205mxsy1wc0ib4k76wzkdpspfcnfr1rk";
-      type = "gem";
-    };
-    version = "1.0.0";
-  };
-  parallel = {
-    groups = ["default" "development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1x1gzgjrdlkm1aw0hfpyphsxcx90qgs3y4gmp9km3dvf4hc4qm8r";
-      type = "gem";
-    };
-    version = "1.17.0";
-  };
-  parser = {
-    dependencies = ["ast"];
-    groups = ["default" "development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1pnks149x0fzgqiw53qlmvcd8bi746cxdw03sjljby5s97p1fskn";
-      type = "gem";
-    };
-    version = "2.6.3.0";
-  };
-  parslet = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "12nrzfwjphjlakb9pmpj70hgjwgzvnr8i1zfzddifgyd44vspl88";
-      type = "gem";
-    };
-    version = "1.8.2";
-  };
-  pg = {
-    groups = ["development" "postgres" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0fmnyxcyrvgdbgq7m09whgn9i8rwfybk0w8aii1nc4g5kqw0k2jy";
-      type = "gem";
-    };
-    version = "1.1.4";
-  };
-  po_to_json = {
-    dependencies = ["json"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1xvanl437305mry1gd57yvcg7xrfhri91czr32bjr8j2djm8hwba";
-      type = "gem";
-    };
-    version = "1.0.1";
-  };
-  premailer = {
-    dependencies = ["addressable" "css_parser" "htmlentities"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "10w6f7r6snpkcnv3byxma9b08lyqzcfxkm083scb2dr2ly4xkzyf";
-      type = "gem";
-    };
-    version = "1.10.4";
-  };
-  premailer-rails = {
-    dependencies = ["actionmailer" "premailer"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "05czxmx6hnykg6g23hy2ww2bf86a69njbi02sv7lrds4w776jhim";
-      type = "gem";
-    };
-    version = "1.9.7";
-  };
-  proc_to_ast = {
-    dependencies = ["coderay" "parser" "unparser"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "14c65w48bbzp5lh1cngqd1y25kqvfnq1iy49hlzshl12dsk3z9wj";
-      type = "gem";
-    };
-    version = "0.1.0";
-  };
-  procto = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "13imvg1x50rz3r0yyfbhxwv72lbf7q28qx9l9nfbb91h2n9ch58c";
-      type = "gem";
-    };
-    version = "0.0.3";
-  };
-  prometheus-client-mmap = {
-    groups = ["metrics"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0immyg4as0isyj2dcjf44n0avg1jv5kx1qk0asrgb5ayzwmjqg1k";
-      type = "gem";
-    };
-    version = "0.9.10";
-  };
-  pry = {
-    dependencies = ["coderay" "method_source"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1mh312k3y94sj0pi160wpia0ps8f4kmzvm505i6bvwynfdh7v30g";
-      type = "gem";
-    };
-    version = "0.11.3";
-  };
-  pry-byebug = {
-    dependencies = ["byebug" "pry"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1f9kj1qp14qb8crg2rdzf22pr6ngxvy4n6ipymla8q1yjr842625";
-      type = "gem";
-    };
-    version = "3.5.1";
-  };
-  pry-rails = {
-    dependencies = ["pry"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0k2d43bwmqbswfra4fkadjjbszwb11pr7qdkma91qrcrk62wqxvy";
-      type = "gem";
-    };
-    version = "0.3.6";
-  };
-  public_suffix = {
-    groups = ["default" "development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1c7c5xxkx91hwj4572hbnyvxmydb90q69wlpr2l0dxrmwx2p365l";
-      type = "gem";
-    };
-    version = "3.1.0";
-  };
-  puma = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1k7dqxnq0dnf5rxkgs9rknclkn3ah7lsdrk6nrqxla8qzy31wliq";
-      type = "gem";
-    };
-    version = "3.12.0";
-  };
-  puma_worker_killer = {
-    dependencies = ["get_process_mem" "puma"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1m08qi8mxpp20zqqjj9yzcrx0sn29n5fn5avlf1lnl0n7qa9c03i";
-      type = "gem";
-    };
-    version = "0.1.0";
-  };
-  pyu-ruby-sasl = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1rcpjiz9lrvyb3rd8k8qni0v4ps08psympffyldmmnrqayyad0sn";
-      type = "gem";
-    };
-    version = "0.0.3.3";
-  };
-  raabro = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0xzdmbn48753f6k0ckirp8ja5p0xn1a92wbwxfyggyhj0hza9ylq";
-      type = "gem";
-    };
-    version = "1.1.6";
-  };
-  rack = {
-    groups = ["default" "development" "kerberos" "mysql" "postgres" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0z90vflxbgjy2n84r7mbyax3i2vyvvrxxrf86ljzn5rw65jgnn2i";
-      type = "gem";
-    };
-    version = "2.0.7";
-  };
-  rack-accept = {
-    dependencies = ["rack"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "18jdipx17b4ki33cfqvliapd31sbfvs4mv727awynr6v95a7n936";
-      type = "gem";
-    };
-    version = "0.4.5";
-  };
-  rack-attack = {
-    dependencies = ["rack"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1czx68p70x98y21dkdndsb64lrxf9qrv09wl1dbcxrypcjnpsdl1";
-      type = "gem";
-    };
-    version = "4.4.1";
-  };
-  rack-cors = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1j27vy1bmhbqcyzhxg8d07qassmax769xjalfwcwz6qfiq8cf013";
-      type = "gem";
-    };
-    version = "1.0.2";
-  };
-  rack-oauth2 = {
-    dependencies = ["activesupport" "attr_required" "httpclient" "json-jwt" "rack"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0kmxj9hbjhhcs3yyb433s82hkpmzb536m0mwfadjiaisganx1cii";
-      type = "gem";
-    };
-    version = "1.9.3";
-  };
-  rack-protection = {
-    dependencies = ["rack"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "15167q25rmxipqwi6hjqj3i1byi9iwl3xq9b7mdar7qiz39pmjsk";
-      type = "gem";
-    };
-    version = "2.0.5";
-  };
-  rack-proxy = {
-    dependencies = ["rack"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1bpbcb9ch94ha2q7gdri88ry7ch0z6ian289kah9ayxyqg19j6f4";
-      type = "gem";
-    };
-    version = "0.6.0";
-  };
-  rack-test = {
-    dependencies = ["rack"];
-    groups = ["default" "development" "mysql" "postgres" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0rh8h376mx71ci5yklnpqqn118z3bl67nnv5k801qaqn1zs62h8m";
-      type = "gem";
-    };
-    version = "1.1.0";
-  };
-  rack-timeout = {
-    groups = ["puma"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "15xph8h6v0lvq9pxm3bc9i9pnk2k68rgdr1mp0dw4l7v1xvhs78a";
-      type = "gem";
-    };
-    version = "0.5.1";
-  };
-  rails = {
-    dependencies = ["actioncable" "actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties" "sprockets-rails"];
-    groups = ["default" "development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1p7cszi3n9ksxchxnccmz61pd1i3rjg4813dsdinsm8xm5k1pdgr";
-      type = "gem";
-    };
-    version = "5.2.3";
-  };
-  rails-controller-testing = {
-    dependencies = ["actionpack" "actionview" "activesupport"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "16kdkk73mhhs73iz3i1i0ryjm84dadiyh817b3nh8acdi490jyhy";
-      type = "gem";
-    };
-    version = "1.0.2";
-  };
-  rails-dom-testing = {
-    dependencies = ["activesupport" "nokogiri"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1lfq2a7kp2x64dzzi5p4cjcbiv62vxh9lyqk2f0rqq3fkzrw8h5i";
-      type = "gem";
-    };
-    version = "2.0.3";
-  };
-  rails-html-sanitizer = {
-    dependencies = ["loofah"];
-    groups = ["default" "development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0ilwxzm3a7bql5c9q2n9g9nb1hax7vd8d65a5yp3d967ld97nvrq";
-      type = "gem";
-    };
-    version = "1.2.0";
-  };
-  rails-i18n = {
-    dependencies = ["i18n" "railties"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1rqij2ggqz5iq36lbibhnd7pl4qxrvv9kgw9s0c6594vzbbxmhs0";
-      type = "gem";
-    };
-    version = "5.1.1";
-  };
-  railties = {
-    dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"];
-    groups = ["default" "development" "mysql" "postgres" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1gn9fwb5wm08fbj7zpilqgblfl315l5b7pg4jsvxlizvrzg8h8q4";
-      type = "gem";
-    };
-    version = "5.2.3";
-  };
-  rainbow = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk";
-      type = "gem";
-    };
-    version = "3.0.0";
-  };
-  raindrops = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1qpbd9jif40c53fz2r0l8khfl016y8s8bkx37ibcaafclbl3xygp";
-      type = "gem";
-    };
-    version = "0.19.0";
-  };
-  rake = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1sy5a7nh6xjdc9yhcw31jji7ssrf9v5806hn95gbrzr998a2ydjn";
-      type = "gem";
-    };
-    version = "12.3.2";
-  };
-  rb-fsevent = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1fbpmjypwxkb8r7y1kmhmyp6gawa4byw0yb3jc3dn9ly4ld9lizf";
-      type = "gem";
-    };
-    version = "0.10.2";
-  };
-  rb-inotify = {
-    dependencies = ["ffi"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0yfsgw5n7pkpyky6a9wkf1g9jafxb0ja7gz0qw0y14fd2jnzfh71";
-      type = "gem";
-    };
-    version = "0.9.10";
-  };
-  rblineprof = {
-    dependencies = ["debugger-ruby_core_source"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0m58kdjgncwf0h1qry3qk5h4bg8sj0idykqqijqcrr09mxfd9yc6";
-      type = "gem";
-    };
-    version = "0.3.6";
-  };
-  rbtrace = {
-    dependencies = ["ffi" "msgpack" "optimist"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1lwsq08i0aj8na5q5ba3gg02sx3wl58fi6m52svl5p7cy56ycdwi";
-      type = "gem";
-    };
-    version = "0.4.11";
-  };
-  rdoc = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0anv42cqcdc6g4n386mrva7mgav5i0c2ry3yzvzzc6z6hymkmcr7";
-      type = "gem";
-    };
-    version = "6.0.4";
-  };
-  re2 = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "00wf9k1hkv3z3nfkrnfyyfq9ah0l7k14awqys3h2hqz4c21pqd2i";
-      type = "gem";
-    };
-    version = "1.1.1";
-  };
-  recaptcha = {
-    dependencies = ["json"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "121pkq8kwqjh4l751xzx15bjp5vmf5pirfmpb11h71zsiavjqv6w";
-      type = "gem";
-    };
-    version = "4.13.1";
-  };
-  recursive-open-struct = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0wfcyigmf5mwrxy76p0bi4sdb4h9afs8jc73pjav5cnqszljjl3c";
-      type = "gem";
-    };
-    version = "1.1.0";
-  };
-  RedCloth = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0m9dv7ya9q93r8x1pg2gi15rxlbck8m178j1fz7r5v6wr1avrrqy";
-      type = "gem";
-    };
-    version = "4.3.2";
-  };
-  redis = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1mymdx7s5sr4mablklaipz679ckczsiigswm1g2v5mc93yj5amw3";
-      type = "gem";
-    };
-    version = "4.1.2";
-  };
-  redis-actionpack = {
-    dependencies = ["actionpack" "redis-rack" "redis-store"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "15k41gz7nygd4yydk2yd25gghya1j7q6zifk4mdrra6bwnwjbm63";
-      type = "gem";
-    };
-    version = "5.0.2";
-  };
-  redis-activesupport = {
-    dependencies = ["activesupport" "redis-store"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0y1df62gpqgy0yrlmgl05rp4kb0xvn0kylprhv1k32bs33dgpv62";
-      type = "gem";
-    };
-    version = "5.0.7";
-  };
-  redis-namespace = {
-    dependencies = ["redis"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0r7daagrjjribn098dxwbv9zivrbq2rsffbkj2ccxyn9lmjjbgah";
-      type = "gem";
-    };
-    version = "1.6.0";
-  };
-  redis-rack = {
-    dependencies = ["rack" "redis-store"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "03xgdmq4fh187aqlh8z05idbxrmgddcarlb8x1kw4wjfcsf5afqi";
-      type = "gem";
-    };
-    version = "2.0.5";
-  };
-  redis-rails = {
-    dependencies = ["redis-actionpack" "redis-activesupport" "redis-store"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0hjvkyaw5hgz7v6fgwdk8pb966z44h1gv8jarmb0gwhkqmjnsh40";
-      type = "gem";
-    };
-    version = "5.0.2";
-  };
-  redis-store = {
-    dependencies = ["redis"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1mrcnjgkbmx1zf569mly82agdizqayjvnp2k6055k1iy07in3j8b";
-      type = "gem";
-    };
-    version = "1.6.0";
-  };
-  regexp_parser = {
-    groups = ["default" "development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0dsgjb3kszk6a82s6gl0h6a8vncjrxmcbk0r4mcxcdcad2b7vb2d";
-      type = "gem";
-    };
-    version = "1.5.1";
-  };
-  regexp_property_values = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "05ka0bkhghs9b9pv6q443k8y1c5xalmm0vylj9zd450ksncxj1yr";
-      type = "gem";
-    };
-    version = "0.3.4";
-  };
-  representable = {
-    dependencies = ["declarative" "declarative-option" "uber"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0qm9rgi1j5a6nv726ka4mmixivlxfsg91h8rpp72wwd4vqbkkm07";
-      type = "gem";
-    };
-    version = "3.0.4";
-  };
-  request_store = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1va9x0b3ww4chcfqlmi8b14db39di1mwa7qrjbh7ma0lhndvs2zv";
-      type = "gem";
-    };
-    version = "1.3.1";
-  };
-  responders = {
-    dependencies = ["actionpack" "railties"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1rhdyyvvm26f2l3fgwdp6xasfl2y0whwgy766bhdwz697mf78zfn";
-      type = "gem";
-    };
-    version = "2.4.0";
-  };
-  rest-client = {
-    dependencies = ["http-cookie" "mime-types" "netrc"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1hzcs2r7b5bjkf2x2z3n8z6082maz0j8vqjiciwgg3hzb63f958j";
-      type = "gem";
-    };
-    version = "2.0.2";
-  };
-  retriable = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1q48hqws2dy1vws9schc0kmina40gy7sn5qsndpsfqdslh65snha";
-      type = "gem";
-    };
-    version = "3.1.2";
-  };
-  rinku = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "11cakxzp7qi04d41hbqkh92n52mm4z2ba8sqyhxbmfi4kypmls9y";
-      type = "gem";
-    };
-    version = "2.0.0";
-  };
-  rotp = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1w8d6svhq3y9y952r8cqirxvdx12zlkb7zxjb44bcbidb2sisy4d";
-      type = "gem";
-    };
-    version = "2.1.2";
-  };
-  rouge = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0pv628bqalippv8vjs3003qpl3zab9g44vqzydgcwxd628r5k9sv";
-      type = "gem";
-    };
-    version = "3.7.0";
-  };
-  rqrcode = {
-    dependencies = ["chunky_png"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "188n1mvc7klrlw30bai16sdg4yannmy7cz0sg0nvm6f1kjx5qflb";
-      type = "gem";
-    };
-    version = "0.7.0";
-  };
-  rqrcode-rails3 = {
-    dependencies = ["rqrcode"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1i28rwmj24ssk91chn0g7qsnvn003y3s5a7jsrg3w4l5ckr841bg";
-      type = "gem";
-    };
-    version = "0.1.7";
-  };
-  rspec = {
-    dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"];
-    groups = ["default" "development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "15ppasvb9qrscwlyjz67ppw1lnxiqnkzx5vkx1bd8x5n3dhikxc3";
-      type = "gem";
-    };
-    version = "3.8.0";
-  };
-  rspec-core = {
-    dependencies = ["rspec-support"];
-    groups = ["default" "development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0spjgmd3yx6q28q950r32bi0cs8h2si53zn6rq8s7n1i4zp4zwbf";
-      type = "gem";
-    };
-    version = "3.8.2";
-  };
-  rspec-expectations = {
-    dependencies = ["diff-lcs" "rspec-support"];
-    groups = ["default" "development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0x3iddjjaramqb0yb51c79p2qajgi9wb5b59bzv25czddigyk49r";
-      type = "gem";
-    };
-    version = "3.8.4";
-  };
-  rspec-mocks = {
-    dependencies = ["diff-lcs" "rspec-support"];
-    groups = ["default" "development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "12zplnsv4p6wvvxsk8xn6nm87a5qadxlkk497zlxfczd0jfawrni";
-      type = "gem";
-    };
-    version = "3.8.1";
-  };
-  rspec-parameterized = {
-    dependencies = ["binding_ninja" "parser" "proc_to_ast" "rspec" "unparser"];
-    groups = ["development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1c0892jbaznnldk1wi24qxm70g4zhw2idqx516rhgdzgd7yh5j31";
-      type = "gem";
-    };
-    version = "0.4.2";
-  };
-  rspec-rails = {
-    dependencies = ["actionpack" "activesupport" "railties" "rspec-core" "rspec-expectations" "rspec-mocks" "rspec-support"];
-    groups = ["development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1pf6n9l4sw1arlax1bdbm1znsvl8cgna2n6k6yk1bi8vz2n73ls1";
-      type = "gem";
-    };
-    version = "3.8.2";
-  };
-  rspec-retry = {
-    dependencies = ["rspec-core"];
-    groups = ["development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1nnqcg2yd3nn187zbvh4cgx8xsvdk56lz1985qy7232v7i8yidw6";
-      type = "gem";
-    };
-    version = "0.6.1";
-  };
-  rspec-set = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "06vw8b5w1a58838cw9ssmy3r6f8vrjh54h7dp97rwv831gn5zlyk";
-      type = "gem";
-    };
-    version = "0.1.3";
-  };
-  rspec-support = {
-    groups = ["default" "development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "139mbhfdr10flm2ffryvxkyqgqs1gjdclc1xhyh7i7njfqayxk7g";
-      type = "gem";
-    };
-    version = "3.8.2";
-  };
-  rspec_junit_formatter = {
-    dependencies = ["rspec-core"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1aynmrgnv26pkprrajvp7advb8nbh0x4pkwk6jwq8qmwzarzk21p";
-      type = "gem";
-    };
-    version = "0.4.1";
-  };
-  rspec_profiling = {
-    dependencies = ["activerecord" "pg" "rails" "sqlite3"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1g7q7gav26bpiprx4dhlvdh4zdrhwiky9jbmsp14gyfiabqdz4sz";
-      type = "gem";
-    };
-    version = "0.0.5";
-  };
-  rubocop = {
-    dependencies = ["jaro_winkler" "parallel" "parser" "rainbow" "ruby-progressbar" "unicode-display_width"];
-    groups = ["development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1cmw8ajaiidvrzjcsljh47f4l3lmcazqrzljgalj3szkr8ibkk5i";
-      type = "gem";
-    };
-    version = "0.69.0";
-  };
-  rubocop-gitlab-security = {
-    dependencies = ["rubocop"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0v0040kpx46fxz3p7dsdjgvsx89qjhwy17n8vxnqg9a7g1rfvxln";
-      type = "gem";
-    };
-    version = "0.1.1";
-  };
-  rubocop-performance = {
-    dependencies = ["rubocop"];
-    groups = ["development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0azzgj62w24wa4hza1qn7i9b9crxdh907kydlzcvhismx41h3lzk";
-      type = "gem";
-    };
-    version = "1.1.0";
-  };
-  rubocop-rspec = {
-    dependencies = ["rubocop"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0vk51h9swvgshan8vp8yjz03qv9vn5vs29i9iddhjwcwgzsganla";
-      type = "gem";
-    };
-    version = "1.22.2";
-  };
-  ruby-enum = {
-    dependencies = ["i18n"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0h62avini866kxpjzqxlqnajma3yvj0y25l6hn9h2mv5pp6fcrhx";
-      type = "gem";
-    };
-    version = "0.7.2";
-  };
-  ruby-fogbugz = {
-    dependencies = ["crack"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1jj0gpkycbrivkh2q3429vj6mbgx6axxisg69slj3c4mgvzfgchm";
-      type = "gem";
-    };
-    version = "0.2.1";
-  };
-  ruby-prof = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0ac3mv3x468s820f6wnp5whzl59y5844wmdjg47a8mbp0kkmnn58";
-      type = "gem";
-    };
-    version = "1.0.0";
-  };
-  ruby-progressbar = {
-    groups = ["default" "development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1k77i0d4wsn23ggdd2msrcwfy0i376cglfqypkk2q77r2l3408zf";
-      type = "gem";
-    };
-    version = "1.10.1";
-  };
-  ruby-saml = {
-    dependencies = ["nokogiri"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0k9d88fa8bp5szivbwq0qi960y3r2kp6jhnkmsp3n2rvwpn936i3";
-      type = "gem";
-    };
-    version = "1.7.2";
-  };
-  ruby_parser = {
-    dependencies = ["sexp_processor"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0s3hsccsmrirc2hy3r51kl8g9cfmcn7jxaa0asadg1kn78h1sgr7";
-      type = "gem";
-    };
-    version = "3.13.1";
-  };
-  rubyntlm = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1p6bxsklkbcqni4bcq6jajc2n57g0w5rzn4r49c3lb04wz5xg0dy";
-      type = "gem";
-    };
-    version = "0.6.2";
-  };
-  rubypants = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1vpdkrc4c8qhrxph41wqwswl28q5h5h994gy4c1mlrckqzm3hzph";
-      type = "gem";
-    };
-    version = "0.2.0";
-  };
-  rubyzip = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1n1lb2sdwh9h27y244hxzg1lrxxg2m53pk1vq7p33bna003qkyrj";
-      type = "gem";
-    };
-    version = "1.2.2";
-  };
-  rugged = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "03w3k7j27kgzpcc3halkd3w0b677sny2lfwm2lwn2n1ac20dzjc6";
-      type = "gem";
-    };
-    version = "0.28.3.1";
-  };
-  safe_yaml = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094";
-      type = "gem";
-    };
-    version = "1.0.4";
-  };
-  sanitize = {
-    dependencies = ["crass" "nokogiri" "nokogumbo"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0j4j2a2mkk1a70vbx959pvx0gvr1zb9snjwvsppwj28bp0p0b2bv";
-      type = "gem";
-    };
-    version = "4.6.6";
-  };
-  sass = {
-    dependencies = ["sass-listen"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "10401m2xlv6vaxfwzy4xxmk51ddcnkvwi918cw3jkki0qqdl7d8v";
-      type = "gem";
-    };
-    version = "3.5.5";
-  };
-  sass-listen = {
-    dependencies = ["rb-fsevent" "rb-inotify"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0xw3q46cmahkgyldid5hwyiwacp590zj2vmswlll68ryvmvcp7df";
-      type = "gem";
-    };
-    version = "4.0.0";
-  };
-  sassc = {
-    dependencies = ["ffi" "rake"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1sr4825rlwsrl7xrsm0sgalcpf5zgp4i56dbi3qxfa9lhs8r6zh4";
-      type = "gem";
-    };
-    version = "2.0.1";
-  };
-  sassc-rails = {
-    dependencies = ["railties" "sassc" "sprockets" "sprockets-rails" "tilt"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "18mgdjxdzpbw92zrllynxw7jn7yihi85j3dg7i4f6c39w1scqkbn";
-      type = "gem";
-    };
-    version = "2.1.0";
-  };
-  sawyer = {
-    dependencies = ["addressable" "faraday"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0sv1463r7bqzvx4drqdmd36m7rrv6sf1v3c6vswpnq3k6vdw2dvd";
-      type = "gem";
-    };
-    version = "0.8.1";
-  };
-  scss_lint = {
-    dependencies = ["rake" "sass"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "01bfkrjn1i0hfg1ifwn1rs7vqwdbdw158krwr5fm6iasd9zgl10g";
-      type = "gem";
-    };
-    version = "0.56.0";
-  };
-  seed-fu = {
-    dependencies = ["activerecord" "activesupport"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0x6gclryl0hds3zms095d2iyafcvm2kfrm7362vrkxws7r2775pi";
-      type = "gem";
-    };
-    version = "2.3.7";
-  };
-  selenium-webdriver = {
-    dependencies = ["childprocess" "rubyzip"];
-    groups = ["development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "114hv2ajmh6d186v2w887yqakqcxyxq367l0iakrrpvwviknrhfs";
-      type = "gem";
-    };
-    version = "3.141.0";
-  };
-  sentry-raven = {
-    dependencies = ["faraday"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1j9rwbig24ry0smgvmkzdjrzyszniaswipinvflzxzzaz52v7483";
-      type = "gem";
-    };
-    version = "2.9.0";
-  };
-  settingslogic = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1ria5zcrk1nf0b9yia15mdpzw0dqr6wjpbj8dsdbbps81lfsj9ar";
-      type = "gem";
-    };
-    version = "2.0.9";
-  };
-  sexp_processor = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0w24rgmyjf7yz0xr2qhbr8z48h4m6gvbggr8nc1pldwn9rbi04b7";
-      type = "gem";
-    };
-    version = "4.12.0";
-  };
-  shoulda-matchers = {
-    dependencies = ["activesupport"];
-    groups = ["test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1s6a2i39lsqq8rrkk2pddqcb10bsihxy3v5gpnc2gk8xakj1brdq";
-      type = "gem";
-    };
-    version = "4.0.1";
-  };
-  sidekiq = {
-    dependencies = ["connection_pool" "rack" "rack-protection" "redis"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "131zv8i341bkacxx7n1id2cmblkbs379farnibqg8c7bycd1iajq";
-      type = "gem";
-    };
-    version = "5.2.7";
-  };
-  sidekiq-cron = {
-    dependencies = ["fugit" "sidekiq"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1aliswahmpxn1ib2brn4126gk97ac3zdnwr71mn8vzbr3vdd7fl0";
-      type = "gem";
-    };
-    version = "1.0.4";
-  };
-  signet = {
-    dependencies = ["addressable" "faraday" "jwt" "multi_json"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1f5d3bz5bjc4b0r2jmqd15qf07lgsqkgd25f0h46jihrf9l5fsi4";
-      type = "gem";
-    };
-    version = "0.11.0";
-  };
-  simple_po_parser = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "08wkp4gcrd89k5yari9j94if9ffkj3rka4llcwrhdgsi3l15p5f3";
-      type = "gem";
-    };
-    version = "1.1.2";
-  };
-  simplecov = {
-    dependencies = ["docile" "json" "simplecov-html"];
-    groups = ["development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1sfyfgf7zrp2n42v7rswkqgk3bbwk1bnsphm24y7laxv3f8z0947";
-      type = "gem";
-    };
-    version = "0.16.1";
-  };
-  simplecov-html = {
-    groups = ["default" "development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1lihraa4rgxk8wbfl77fy9sf0ypk31iivly8vl3w04srd7i0clzn";
-      type = "gem";
-    };
-    version = "0.10.2";
-  };
-  sixarm_ruby_unaccent = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "11237b8r8p7fc0cpn04v9wa7ggzq0xm6flh10h1lnb6zgc3schq0";
-      type = "gem";
-    };
-    version = "1.2.0";
-  };
-  slack-notifier = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0xavibxh00gy62mm79l6id9l2fldjmdqifk8alqfqy5z38ffwah6";
-      type = "gem";
-    };
-    version = "1.5.1";
-  };
-  snowplow-tracker = {
-    dependencies = ["contracts"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "05136477ifa567aym9k8nqqmwv3plbczgh9x9fbz86860vym5v4w";
-      type = "gem";
-    };
-    version = "0.6.1";
-  };
-  spring = {
-    dependencies = ["activesupport"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "168yz9c1fv21wc5i8q7n43b9nk33ivg3ws1fn6x0afgryz3ssx75";
-      type = "gem";
-    };
-    version = "2.0.2";
-  };
-  spring-commands-rspec = {
-    dependencies = ["spring"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0b0svpq3md1pjz5drpa5pxwg8nk48wrshq8lckim4x3nli7ya0k2";
-      type = "gem";
-    };
-    version = "1.0.4";
-  };
-  sprockets = {
-    dependencies = ["concurrent-ruby" "rack"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "182jw5a0fbqah5w9jancvfmjbk88h8bxdbwnl4d3q809rpxdg8ay";
-      type = "gem";
-    };
-    version = "3.7.2";
-  };
-  sprockets-rails = {
-    dependencies = ["actionpack" "activesupport" "sprockets"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0ab42pm8p5zxpv3sfraq45b9lj39cz9mrpdirm30vywzrwwkm5p1";
-      type = "gem";
-    };
-    version = "3.2.1";
-  };
-  sqlite3 = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "01ifzp8nwzqppda419c9wcvr8n82ysmisrs0hph9pdmv1lpa4f5i";
-      type = "gem";
-    };
-    version = "1.3.13";
-  };
-  sshkey = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "03bkn55qsng484iqwz2lmm6rkimj01vsvhwk661s3lnmpkl65lbp";
-      type = "gem";
-    };
-    version = "2.0.0";
-  };
-  stackprof = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1c88j2d6ipjw5s3hgdgfww37gysgrkicawagj33hv3knijjc9ski";
-      type = "gem";
-    };
-    version = "0.2.10";
-  };
-  state_machines = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "00mi16hg3rhkxz4y58s173cbnjlba41y9bfcim90p4ja6yfj9ri3";
-      type = "gem";
-    };
-    version = "0.5.0";
-  };
-  state_machines-activemodel = {
-    dependencies = ["activemodel" "state_machines"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0chhm5hs1y83dq8haff10m66r3yrm7jab35r9xg6adn6qd8ynv2l";
-      type = "gem";
-    };
-    version = "0.5.1";
-  };
-  state_machines-activerecord = {
-    dependencies = ["activerecord" "state_machines-activemodel"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "00h07gd4kb22ahgv61r8zca9hqxaw44fnk2sc28j00c1nmwsw6r3";
-      type = "gem";
-    };
-    version = "0.5.1";
-  };
-  swd = {
-    dependencies = ["activesupport" "attr_required" "httpclient"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1s2vjb6f13za7p1iycl2p73d3p202xa6xny9fjrp8ynwsqix7lyd";
-      type = "gem";
-    };
-    version = "1.1.2";
-  };
-  sys-filesystem = {
-    dependencies = ["ffi"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "092wj7936i5inzafi09wqh5c8dbak588q21k652dsrdjf5qi10zq";
-      type = "gem";
-    };
-    version = "1.1.6";
-  };
-  sysexits = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0qjng6pllznmprzx8vb0zg0c86hdrkyjs615q41s9fjpmv2430jr";
-      type = "gem";
-    };
-    version = "1.2.0";
-  };
-  temple = {
-    groups = ["default" "development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "158d7ygbwcifqnvrph219p7m78yjdjazhykv5darbkms7bxm5y09";
-      type = "gem";
-    };
-    version = "0.8.1";
-  };
-  terminal-table = {
-    dependencies = ["unicode-display_width"];
-    groups = ["default" "development"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1512cngw35hsmhvw4c05rscihc59mnj09m249sm9p3pik831ydqk";
-      type = "gem";
-    };
-    version = "1.8.0";
-  };
-  test-prof = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "08nvn3c1mzgcjgk9lr3py0zjd8fjjrm3ncn9rpqkfbx429mgw2l3";
-      type = "gem";
-    };
-    version = "0.2.5";
-  };
-  text = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1x6kkmsr49y3rnrin91rv8mpc3dhrf3ql08kbccw8yffq61brfrg";
-      type = "gem";
-    };
-    version = "1.3.1";
-  };
-  thin = {
-    dependencies = ["daemons" "eventmachine" "rack"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0nagbf9pwy1vg09k6j4xqhbjjzrg5dwzvkn4ffvlj76fsn6vv61f";
-      type = "gem";
-    };
-    version = "1.7.2";
-  };
-  thor = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "01n5dv9kql60m6a00zc0r66jvaxx98qhdny3klyj0p3w34pad2ns";
-      type = "gem";
-    };
-    version = "0.19.4";
-  };
-  thread_safe = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy";
-      type = "gem";
-    };
-    version = "0.3.6";
-  };
-  thrift = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "02p107kwx7jnkh6fpdgvaji0xdg6xkaarngkqjml6s4zny4m8slv";
-      type = "gem";
-    };
-    version = "0.11.0.0";
-  };
-  tilt = {
-    groups = ["default" "development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0ca4k0clwf0rkvy7726x4nxpjxkpv67w043i39saxgldxd97zmwz";
-      type = "gem";
-    };
-    version = "2.0.9";
-  };
-  timecop = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0vwbkwqyxhavzvr1820hqwz43ylnfcf6w4x6sag0nghi44sr9kmx";
-      type = "gem";
-    };
-    version = "0.8.1";
-  };
-  timfel-krb5-auth = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "105vajc0jkqgcx1wbp0ad262sdry4l1irk7jpaawv8vzfjfqqf5b";
-      type = "gem";
-    };
-    version = "0.8.3";
-  };
-  toml = {
-    dependencies = ["parslet"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0xj460rkyqvg74xc8kivmbvgc46c6mm7r8mbjs5m2gq8khf8sbki";
-      type = "gem";
-    };
-    version = "0.2.0";
-  };
-  toml-rb = {
-    dependencies = ["citrus"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0pz6z1mc7rnv4chkbx3mdn4q1lpp0j596dq57kbq39jv0wn0wi4d";
-      type = "gem";
-    };
-    version = "1.0.0";
-  };
-  truncato = {
-    dependencies = ["htmlentities" "nokogiri"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0z36dprfj9l4jwgwb2wv4v3cilm53v7i1ywfmm5f1dl352id3ak4";
-      type = "gem";
-    };
-    version = "0.7.11";
-  };
-  tzinfo = {
-    dependencies = ["thread_safe"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z";
-      type = "gem";
-    };
-    version = "1.2.5";
-  };
-  u2f = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0lsm1hvwcaa9sq13ab1l1zjk0fgcy951ay11v2acx0h6q1iv21vr";
-      type = "gem";
-    };
-    version = "0.2.1";
-  };
-  uber = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1p1mm7mngg40x05z52md3mbamkng0zpajbzqjjwmsyw0zw3v9vjv";
-      type = "gem";
-    };
-    version = "0.1.0";
-  };
-  uglifier = {
-    dependencies = ["execjs" "json"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0mzs64z3m1b98rh6ssxpqfz9sc87f6ml6906b0m57vydzfgrh1cz";
-      type = "gem";
-    };
-    version = "2.7.2";
-  };
-  unf = {
-    dependencies = ["unf_ext"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9";
-      type = "gem";
-    };
-    version = "0.1.4";
-  };
-  unf_ext = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "06p1i6qhy34bpb8q8ms88y6f2kz86azwm098yvcc0nyqk9y729j1";
-      type = "gem";
-    };
-    version = "0.0.7.5";
-  };
-  unicode-display_width = {
-    groups = ["default" "development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "08kfiniak1pvg3gn5k6snpigzvhvhyg7slmm0s2qx5zkj62c1z2w";
-      type = "gem";
-    };
-    version = "1.6.0";
-  };
-  unicode_utils = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0h1a5yvrxzlf0lxxa1ya31jcizslf774arnsd89vgdhk4g7x08mr";
-      type = "gem";
-    };
-    version = "1.4.0";
-  };
-  unicorn = {
-    dependencies = ["kgio" "raindrops"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1qfhvzs4i6ja1s43j8p1kfbzm10n7a02ngki30a38y5m46a2qrak";
-      type = "gem";
-    };
-    version = "5.4.1";
-  };
-  unicorn-worker-killer = {
-    dependencies = ["get_process_mem" "unicorn"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0rrdxpwdsapx47axjin8ymxb4f685qlpx8a26bql4ay1559c3gva";
-      type = "gem";
-    };
-    version = "0.4.4";
-  };
-  uniform_notifier = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1jha0l7x602g5rvah960xl9r0f3q25gslj39i0x1vai8i5z6zr1l";
-      type = "gem";
-    };
-    version = "1.10.0";
-  };
-  unleash = {
-    dependencies = ["murmurhash3"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0xs2ml9cwskddsxick3a9wnasy7q6wmc0dbydfcaspfl2cjmp1rk";
-      type = "gem";
-    };
-    version = "0.1.5";
-  };
-  unparser = {
-    dependencies = ["abstract_type" "adamantium" "concord" "diff-lcs" "equalizer" "parser" "procto"];
-    groups = ["default" "development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "03vjj74kj86vlazhiclf63kf6gajs66k8ni34q70fdhf97d7b60c";
-      type = "gem";
-    };
-    version = "0.4.5";
-  };
-  validate_email = {
-    dependencies = ["activemodel" "mail"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1r1fz29l699arka177c9xw7409d1a3ff95bf7a6pmc97slb91zlx";
-      type = "gem";
-    };
-    version = "0.1.6";
-  };
-  validate_url = {
-    dependencies = ["activemodel" "public_suffix"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1k0bfxzvdcf1nrqhvnyhijc4mwab9wn4qvqb0ynq6p8dj0f866zi";
-      type = "gem";
-    };
-    version = "1.0.8";
-  };
-  validates_hostname = {
-    dependencies = ["activerecord" "activesupport"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "04p1l0v98j4ffvaks1ig9mygx5grpbpdgz7haq3mygva9iy8ykja";
-      type = "gem";
-    };
-    version = "1.0.6";
-  };
-  version_sorter = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0hbdw3vh856f5yg5mbj4498l6vh90cd3pn22ikr3ranzkrh73l3s";
-      type = "gem";
-    };
-    version = "2.2.4";
-  };
-  virtus = {
-    dependencies = ["axiom-types" "coercible" "descendants_tracker" "equalizer"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "06iphwi3c4f7y9i2rvhvaizfswqbaflilziz4dxqngrdysgkn1fk";
-      type = "gem";
-    };
-    version = "1.0.5";
-  };
-  vmstat = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0vb5mwc71p8rlm30hnll3lb4z70ipl5rmilskpdrq2mxwfilcm5b";
-      type = "gem";
-    };
-    version = "2.3.0";
-  };
-  warden = {
-    dependencies = ["rack"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0va966lhpylcwbqb9n151kkihx30agh0a57mwjwdxyanll4s1q12";
-      type = "gem";
-    };
-    version = "1.2.7";
-  };
-  webfinger = {
-    dependencies = ["activesupport" "httpclient"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0m0jh8k7c0ifh2jhbn7ihqrmn5fi754wflva97zgy70hpdvxyjar";
-      type = "gem";
-    };
-    version = "1.1.0";
-  };
-  webmock = {
-    dependencies = ["addressable" "crack" "hashdiff"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0gg0c2sxq7rni0b93w47h7p7cn590xdhf5va7ska48inpipwlgxp";
-      type = "gem";
-    };
-    version = "3.5.1";
-  };
-  webpack-rails = {
-    dependencies = ["railties"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0fsjxw730bh4k1dfnbjm645fgjyqrh830l1z7brqbsm6306ig1rr";
-      type = "gem";
-    };
-    version = "0.9.11";
-  };
-  websocket-driver = {
-    dependencies = ["websocket-extensions"];
-    groups = ["default" "development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1551k3fs3kkb3ghqfj3n5lps0ikb9pyrdnzmvgfdxy8574n4g1dn";
-      type = "gem";
-    };
-    version = "0.7.0";
-  };
-  websocket-extensions = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "034sdr7fd34yag5l6y156rkbhiqgmy395m231dwhlpcswhs6d270";
-      type = "gem";
-    };
-    version = "0.1.3";
-  };
-  wikicloth = {
-    dependencies = ["builder" "expression_parser" "rinku"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1jp6c2yzyqbap8jdiw8yz6l08sradky1llhyhmrg934l1b5akj3s";
-      type = "gem";
-    };
-    version = "0.8.1";
-  };
-  with_env = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1r5ns064mbb99hf1dyxsk9183hznc5i7mn3bi86zka6dlvqf9csh";
-      type = "gem";
-    };
-    version = "1.1.0";
-  };
-  xml-simple = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0xlqplda3fix5pcykzsyzwgnbamb3qrqkgbrhhfz2a2fxhrkvhw8";
-      type = "gem";
-    };
-    version = "1.1.5";
-  };
-  xpath = {
-    dependencies = ["nokogiri"];
-    groups = ["default" "development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0bh8lk9hvlpn7vmi6h4hkcwjzvs2y0cmkk3yjjdr8fxvj6fsgzbd";
-      type = "gem";
-    };
-    version = "3.2.0";
-  };
-}
\ No newline at end of file
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
similarity index 100%
rename from pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile
rename to pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
similarity index 100%
rename from pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock
rename to pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
similarity index 87%
rename from pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix
rename to pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
index 147ce5bb4ea..4e71ea72ed9 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
@@ -1,5 +1,7 @@
 {
   abstract_type = {
+    groups = ["default" "development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "09330cmhrc2wmfhdj9zzg82sv6cdhm3qgdkva5ni5xfjril2pf14";
@@ -8,6 +10,8 @@
     version = "0.0.7";
   };
   ace-rails-ap = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "14wj9gsiy7rm0lvs27ffsrh92wndjksj6rlfj3n7jhv1v77w9v2h";
@@ -50,7 +54,7 @@
   };
   actionpack = {
     dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
-    groups = ["default" "development" "mysql" "postgres" "test"];
+    groups = ["default" "development" "test"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
@@ -61,7 +65,7 @@
   };
   actionview = {
     dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"];
-    groups = ["default" "development" "mysql" "postgres" "test"];
+    groups = ["default" "development" "test"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
@@ -127,7 +131,7 @@
   };
   activesupport = {
     dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
-    groups = ["default" "development" "mysql" "postgres" "test"];
+    groups = ["default" "development" "test"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
@@ -149,6 +153,8 @@
   };
   adamantium = {
     dependencies = ["ice_nine" "memoizable"];
+    groups = ["default" "development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0165r2ikgfwv2rm8dzyijkp74fvg0ni72hpdx8ay2v7cj08dqyak";
@@ -158,6 +164,8 @@
   };
   addressable = {
     dependencies = ["public_suffix"];
+    groups = ["default" "development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk";
@@ -166,6 +174,8 @@
     version = "2.5.2";
   };
   aes_key_wrap = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0li86k0g812jkzrppb2fvqngvzp09nygywjpn81nx90s01wxqw07";
@@ -174,6 +184,8 @@
     version = "1.0.1";
   };
   akismet = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0hqpn25iyypkwkrqaibjm5nss5jmlkrddhia7frmz94prvyjr02w";
@@ -204,6 +216,8 @@
   };
   asana = {
     dependencies = ["faraday" "faraday_middleware" "faraday_middleware-multi_json" "oauth2"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1h0qiywvjjc9iyzq9nz5iaqyh6qsrix4ip0w86j5c4v5g940z6qx";
@@ -244,6 +258,8 @@
     version = "0.0.9";
   };
   ast = {
+    groups = ["default" "development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "184ssy3w93nkajlz2c70ifm79jp3j737294kbc5fjw69v1w0n9x7";
@@ -264,6 +280,8 @@
   };
   attr_encrypted = {
     dependencies = ["encryptor"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0ncv2az1zlj33bsllr6q1qdvbw42gv91lxq0ryclbv8l8xh841jg";
@@ -282,6 +300,8 @@
     version = "1.0.1";
   };
   awesome_print = {
+    groups = ["development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "14arh1ixfsd6j5md0agyzvksm5svfkvchb90fp32nn7y3avcmc2h";
@@ -334,6 +354,8 @@
   };
   axiom-types = {
     dependencies = ["descendants_tracker" "ice_nine" "thread_safe"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "10q3k04pll041mkgy0m5fn2b1lazm6ly1drdbcczl5p57lzi3zy1";
@@ -342,6 +364,8 @@
     version = "0.1.1";
   };
   babosa = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "05rgxg4pz4bc4xk34w5grv0yp1j94wf571w84lf3xgqcbs42ip2f";
@@ -350,6 +374,8 @@
     version = "1.0.2";
   };
   base32 = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0b7y8sy6j9v1lvfzd4va88k5vg9yh0xcjzzn3llcw7yxqlcrnbjk";
@@ -368,6 +394,8 @@
     version = "1.4.0";
   };
   bcrypt = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0ysblqxkclmnhrd0kmb5mr8p38mbar633gdsb14b7dhkhgawgzfy";
@@ -376,6 +404,8 @@
     version = "3.1.12";
   };
   bcrypt_pbkdf = {
+    groups = ["ed25519"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0cj4k13c7qvvck7y25i3xarvyqq8d27vl61jddifkc7llnnap1hv";
@@ -384,6 +414,8 @@
     version = "1.0.0";
   };
   benchmark-ips = {
+    groups = ["development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0bh681m54qdsdyvpvflj1wpnj3ybspbpjkr4cnlrl4nk4yikli0j";
@@ -404,6 +436,8 @@
   };
   better_errors = {
     dependencies = ["coderay" "erubi" "rack"];
+    groups = ["development"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1pqnxxsqqs7vnqvamk5bzs84dv584g9s0qaf2vqb1v2aj5dabcg7";
@@ -412,6 +446,8 @@
     version = "2.5.0";
   };
   bindata = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0kxy917xyxckifmnawff65j7g6yb3wh2s45npjq9lqjbi1p86lsr";
@@ -431,6 +467,8 @@
   };
   binding_of_caller = {
     dependencies = ["debug_inspector"];
+    groups = ["development"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "05syqlks7463zsy1jdfbbdravdhj9hpj5pv2m74blqpv8bq4vv5g";
@@ -461,6 +499,8 @@
     version = "4.2.0";
   };
   brakeman = {
+    groups = ["development"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "161l4ln7x1vnqrcvbvglznf46f0lvq305vq211xaxp4fv4wwv89v";
@@ -469,6 +509,8 @@
     version = "4.2.1";
   };
   browser = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0sdx0ny34i6vqxdsc7sy9g0nafdbrw8kvvb5xh9m18x1bzpqk92f";
@@ -477,6 +519,8 @@
     version = "2.5.3";
   };
   builder = {
+    groups = ["default" "development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0qibi5s67lpdv1wgcj66wcymcr04q6j4mzws6a479n0mlrmh5wr1";
@@ -486,6 +530,8 @@
   };
   bullet = {
     dependencies = ["activesupport" "uniform_notifier"];
+    groups = ["development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1pdq3ckmwxnwrdm2x89zfj68h0yhiln35y8wps2nkvam4kpivyr5";
@@ -495,6 +541,8 @@
   };
   bundler-audit = {
     dependencies = ["thor"];
+    groups = ["development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1gr7k6m9fda7m66irxzydm8v9xbmlryjj65cagwm1zyi5f317srb";
@@ -503,6 +551,12 @@
     version = "0.5.0";
   };
   byebug = {
+    groups = ["default" "development" "test"];
+    platforms = [{
+      engine = "maglev";
+    } {
+      engine = "ruby";
+    }];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1vv7s88w8jb1qg4qz3jrs3x3y5d9jfyyl7wfiz78b5x95ydvx41q";
@@ -523,6 +577,8 @@
   };
   capybara-screenshot = {
     dependencies = ["capybara" "launchy"];
+    groups = ["development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1x90lh7nf3zi54arjf430s9xdxr3c12xjq1l28izgxqdk8s40q7q";
@@ -532,6 +588,8 @@
   };
   carrierwave = {
     dependencies = ["activemodel" "activesupport" "mime-types"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "10rz94kajilffp83sb767lr62b5f8l4jzqq80cr92wqxdgbszdks";
@@ -540,6 +598,8 @@
     version = "1.3.1";
   };
   cause = {
+    groups = ["default" "metrics"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0digirxqlwdg79mkbn70yc7i9i1qnclm2wjbrc47kqv6236bpj00";
@@ -548,6 +608,8 @@
     version = "0.1";
   };
   character_set = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "114npdbw1ivyx4vnid8ncnjw4wnjcipf2lvihlg3ibbh7an0m9s9";
@@ -556,6 +618,8 @@
     version = "1.1.2";
   };
   charlock_holmes = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1nf1l31n10yaark2rrg5qzyzcx9w80681449s3j09qmnipsl8rl5";
@@ -565,6 +629,8 @@
   };
   childprocess = {
     dependencies = ["ffi"];
+    groups = ["default" "development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0a61922kmvcxyj5l70fycapr87gz1dzzlkfpq85rfqk5vdh3d28p";
@@ -573,6 +639,8 @@
     version = "0.9.0";
   };
   chronic = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1hrdkn4g8x7dlzxwb1rfgr8kw3bp4ywg5l4y4i9c2g5cwv62yvvn";
@@ -581,6 +649,8 @@
     version = "0.10.2";
   };
   chunky_png = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0vf0axgrm95bs3y0x5gdb76xawfh210yxplj7jbwr6z7n88i1axn";
@@ -589,6 +659,8 @@
     version = "1.3.5";
   };
   citrus = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0l7nhk3gkm1hdchkzzhg2f70m47pc0afxfpl6mkiibc9qcpl3hjf";
@@ -618,6 +690,12 @@
     version = "0.9.2";
   };
   coderay = {
+    groups = ["default" "development" "test"];
+    platforms = [{
+      engine = "maglev";
+    } {
+      engine = "ruby";
+    }];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "15vav4bhcc2x3jmi3izb11l4d9f3xv8hp2fszb7iqmpsccv1pz4y";
@@ -627,6 +705,8 @@
   };
   coercible = {
     dependencies = ["descendants_tracker"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1p5azydlsz0nkxmcq0i1gzmcfq02lgxc4as7wmf47j1c6ljav0ah";
@@ -646,6 +726,8 @@
   };
   commonmarker = {
     dependencies = ["ruby-enum"];
+    groups = ["default" "development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1pmjm87p0hxnknp33cxyvkgbr1swfp9gcznssmalm9z8kwyancb9";
@@ -655,6 +737,8 @@
   };
   concord = {
     dependencies = ["adamantium" "equalizer"];
+    groups = ["default" "development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1b6cdn0fg4n9gzbdr7zyf4jq40y6h0c0g9cra7wk9hhmsylk91bg";
@@ -663,7 +747,7 @@
     version = "0.1.5";
   };
   concurrent-ruby = {
-    groups = ["default" "development" "mysql" "postgres" "test"];
+    groups = ["default" "development" "test"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
@@ -673,6 +757,8 @@
     version = "1.1.5";
   };
   connection_pool = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0lflx29mlznf1hn0nihkgllzbj8xp5qasn8j7h838465pi399k68";
@@ -714,6 +800,8 @@
   };
   crack = {
     dependencies = ["safe_yaml"];
+    groups = ["default" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0abb0fvgw00akyik1zxnq7yv391va148151qxdghnzngv66bl62k";
@@ -722,6 +810,8 @@
     version = "0.4.3";
   };
   crass = {
+    groups = ["default" "development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0bpxzy6gjw9ggjynlxschbfsgmx8lv3zw1azkjvnb8b9i895dqfi";
@@ -730,6 +820,8 @@
     version = "1.0.4";
   };
   creole = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "00rcscz16idp6dx0dk5yi5i0fz593i3r6anbn5bg2q07v3i025wm";
@@ -739,6 +831,8 @@
   };
   css_parser = {
     dependencies = ["addressable"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0jlr17cn044yaq4l3d9p42g3bghnamwsprq9c39xn6pxjrn5k1hy";
@@ -747,6 +841,8 @@
     version = "1.5.0";
   };
   daemons = {
+    groups = ["default" "development"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0lxqq6dgb8xhliywar2lvkwqy2ssraf9dk4b501pb4ixc2mvxbp2";
@@ -766,6 +862,8 @@
     version = "6.0.9";
   };
   database_cleaner = {
+    groups = ["development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "05i0nf2aj70m61y3fspypdkc6d1qgibf5kav05a71b5gjz0k7y5x";
@@ -774,6 +872,8 @@
     version = "1.7.0";
   };
   debug_inspector = {
+    groups = ["default" "development"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0vxr0xa1mfbkfcrn71n7c4f2dj7la5hvphn904vh20j3x4j5lrx0";
@@ -782,6 +882,12 @@
     version = "0.0.3";
   };
   debugger-ruby_core_source = {
+    groups = ["default" "development"];
+    platforms = [{
+      engine = "maglev";
+    } {
+      engine = "ruby";
+    }];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1lp5dmm8a8dpwymv6r1y6yr24wxsj0gvgb2b8i7qq9rcv414snwd";
@@ -791,6 +897,8 @@
   };
   deckar01-task_list = {
     dependencies = ["html-pipeline"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0s637v5pi5ipmv0gn9g2wwjpxdm27dvppfjd8ml0dc1m0jsm7964";
@@ -799,6 +907,8 @@
     version = "2.2.0";
   };
   declarative = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0642xvwzzbgi3kp1bg467wma4g3xqrrn0sk369hjam7w579gnv5j";
@@ -807,6 +917,8 @@
     version = "0.0.10";
   };
   declarative-option = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1g4ibxq566f1frnhdymzi9hxxcm4g2gw4n21mpjk2mhwym4q6l0p";
@@ -827,7 +939,7 @@
   };
   derailed_benchmarks = {
     dependencies = ["benchmark-ips" "get_process_mem" "heapy" "memory_profiler" "rack" "rake" "thor"];
-    groups = ["development" "test"];
+    groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
@@ -838,6 +950,8 @@
   };
   descendants_tracker = {
     dependencies = ["thread_safe"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "15q8g3fcqyb41qixn6cky0k3p86291y7xsh1jfd851dvrza1vi79";
@@ -846,6 +960,8 @@
     version = "0.0.4";
   };
   device_detector = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0zbsjj1bgwmsiqiw6x5fzbzp25xc10c02s37ggl2635ha0qzn05q";
@@ -866,6 +982,8 @@
   };
   devise-two-factor = {
     dependencies = ["activesupport" "attr_encrypted" "devise" "railties" "rotp"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1pkldws5lga4mlv4xmcrfb0yivl6qad0l8qyb2hdb50adv6ny4gs";
@@ -874,6 +992,8 @@
     version = "3.0.0";
   };
   diff-lcs = {
+    groups = ["default" "development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "18w22bjz424gzafv6nzv98h0aqkwz3d9xhm7cbr1wfbyas8zayza";
@@ -882,6 +1002,8 @@
     version = "1.3";
   };
   diffy = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1azibizfv91sjbzhjqj1pg2xcv8z9b8a7z6kb3wpl4hpj5hil5kj";
@@ -891,6 +1013,8 @@
   };
   discordrb-webhooks-blackst0ne = {
     dependencies = ["rest-client"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1f0dw6ci5cbrxrvvqw2kqabpzyjisd4hflbi370rpb4cakkzgw39";
@@ -910,6 +1034,8 @@
   };
   domain_name = {
     dependencies = ["unf"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0abdlwb64ns7ssmiqhdwgl27ly40x2l27l8hs8hn0z4kb3zd2x3v";
@@ -919,6 +1045,8 @@
   };
   doorkeeper = {
     dependencies = ["railties"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "022r03i830b2lvmr0xzlj6ivlvc1zr64hy4a4bsy3flv94da77rz";
@@ -928,6 +1056,8 @@
   };
   doorkeeper-openid_connect = {
     dependencies = ["doorkeeper" "json-jwt"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1wgrz0xcply5vl6d1m62blqwcbn4v0b27bswyws2y9wbyglz6f95";
@@ -936,6 +1066,8 @@
     version = "1.5.0";
   };
   ed25519 = {
+    groups = ["ed25519"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1f5kr8za7hvla38fc0n9jiv55iq62k5bzclsa5kdb14l3r4w6qnw";
@@ -998,6 +1130,8 @@
     version = "5.0.3";
   };
   email_reply_trimmer = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0vijywhy1acsq4187ss6w8a7ksswaf1d5np3wbj962b6rqif5vcz";
@@ -1007,6 +1141,8 @@
   };
   email_spec = {
     dependencies = ["htmlentities" "launchy" "mail"];
+    groups = ["test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0yadaif80cf2ry0nvhir1s70xmm22xzncq6vfvvffdd8h02ridv0";
@@ -1015,6 +1151,8 @@
     version = "2.2.0";
   };
   encryptor = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0s8rvfl0vn8w7k1sgkc234060jh468s3zd45xa64p1jdmfa3zwmb";
@@ -1023,6 +1161,8 @@
     version = "3.0.0";
   };
   equalizer = {
+    groups = ["default" "development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1kjmx3fygx8njxfrwcmn7clfhjhb6bvv3scy2lyyi0wqyi3brra4";
@@ -1031,7 +1171,7 @@
     version = "0.0.11";
   };
   erubi = {
-    groups = ["default" "development" "mysql" "postgres" "test"];
+    groups = ["default" "development" "test"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
@@ -1041,6 +1181,8 @@
     version = "1.8.0";
   };
   escape_utils = {
+    groups = ["default" "development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0qminivnyzwmqjhrh3b92halwbk0zcl9xn828p5rnap1szl2yag5";
@@ -1060,6 +1202,8 @@
     version = "1.2.1";
   };
   eventmachine = {
+    groups = ["default" "development"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r";
@@ -1068,6 +1212,8 @@
     version = "1.2.7";
   };
   excon = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "15l9w0938c19nxmrp09n75qpmm64k12xj69h47yvxzcxcpbgnkb2";
@@ -1076,6 +1222,8 @@
     version = "0.62.0";
   };
   execjs = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0grlxwiccbnflxs30r3h7g23xnps5knav1jyqkk3anvm8363ifjw";
@@ -1084,6 +1232,8 @@
     version = "2.6.0";
   };
   expression_parser = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1938z3wmmdabqxlh5d5c56xfg1jc6z15p7zjyhvk7364zwydnmib";
@@ -1104,6 +1254,8 @@
   };
   factory_bot = {
     dependencies = ["activesupport"];
+    groups = ["default" "development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0r975ba6y0mcy3aya099gpnjn5gf1h6fbw8f3smmjay5zvin3nwx";
@@ -1113,6 +1265,8 @@
   };
   factory_bot_rails = {
     dependencies = ["factory_bot" "railties"];
+    groups = ["development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0cdbp12ih2w77l331frv8gv6bv9dinn1663dy1jn0gb9ss1hwvs2";
@@ -1122,6 +1276,8 @@
   };
   faraday = {
     dependencies = ["multipart-post"];
+    groups = ["default" "development"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "157c4cmb5g1b3ny6k9qf9z57rfijl54fcq3hnqqf6g31g1m096b2";
@@ -1142,6 +1298,8 @@
   };
   faraday_middleware = {
     dependencies = ["faraday"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1p7icfl28nvl8qqdsngryz1snqic9l8x6bk0dxd7ygn230y0k41d";
@@ -1162,6 +1320,8 @@
   };
   faraday_middleware-multi_json = {
     dependencies = ["faraday_middleware" "multi_json"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0651sxhzbq9xfq3hbpmrp0nbybxnm9ja3m97k386m4bqgamlvz1q";
@@ -1170,6 +1330,8 @@
     version = "0.0.6";
   };
   fast_blank = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "16s1ilyvwzmkcgmklbrn0c2pch5n02vf921njx0bld4crgdr6z56";
@@ -1178,6 +1340,8 @@
     version = "1.0.0";
   };
   fast_gettext = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1s42dsy3rh9h37d16pwhswf2q9cx25v5fn3q881b5iz6fvdjixv3";
@@ -1186,6 +1350,8 @@
     version = "1.6.0";
   };
   ffaker = {
+    groups = ["development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "01z5lpssjc0n8lm4xrlja0hh8lv4ngzbybjvd4rdkc5x9ddvh8s3";
@@ -1204,6 +1370,8 @@
     version = "1.11.1";
   };
   flipper = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1pdj9y3k6padiicfraxw9ibx9fm8yi2ihh608736lq5nnbf3k6gw";
@@ -1213,6 +1381,8 @@
   };
   flipper-active_record = {
     dependencies = ["activerecord" "flipper"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0rgm4h5h6xcbf17z47sw8ancaxva8x4hwlxmyqpm0vzj1pnc47c1";
@@ -1222,6 +1392,8 @@
   };
   flipper-active_support_cache_store = {
     dependencies = ["activesupport" "flipper"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0zpikmfhadb7l1ny6xbhk5d4840im6yq0wvfsnlw718spxi4ccgk";
@@ -1231,6 +1403,8 @@
   };
   flowdock = {
     dependencies = ["httparty" "multi_json"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "04nrvg4gzgabf5mnnhccl8bwrkvn3y4pm7a1dqzqhpvfr4m5pafg";
@@ -1240,6 +1414,8 @@
   };
   fog-aliyun = {
     dependencies = ["fog-core" "fog-json" "ipaddress" "xml-simple"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1vl5zf9wr6qwm1awxscyifvrrfqnyacidxgzhkba2wqlgizk3anh";
@@ -1260,6 +1436,8 @@
   };
   fog-core = {
     dependencies = ["builder" "excon" "formatador" "mime-types"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1agd6xgzk0rxrsjdpn94v4hy89s0nm2cs4zg2p880w2dan9xgrak";
@@ -1280,6 +1458,8 @@
   };
   fog-json = {
     dependencies = ["fog-core" "multi_json"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1zj8llzc119zafbmfa4ai3z5s7c4vp9akfs0f9l2piyvcarmlkyx";
@@ -1289,6 +1469,8 @@
   };
   fog-local = {
     dependencies = ["fog-core"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0ba4lln35nryi6dcbz68vxg9ml6v8cc8s8c82f7syfd84bz76x21";
@@ -1298,6 +1480,8 @@
   };
   fog-openstack = {
     dependencies = ["fog-core" "fog-json" "ipaddress"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "171xnsl6w0j7yi6sp26dcqahx4r4gb2cf359gmy11g5iwnsll5wg";
@@ -1307,6 +1491,8 @@
   };
   fog-rackspace = {
     dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0y2bli061g37l9p4w0ljqbmg830rp2qz6sf8b0ck4cnx68j7m32a";
@@ -1316,6 +1502,8 @@
   };
   fog-xml = {
     dependencies = ["fog-core" "nokogiri"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "043lwdw2wsi6d55ifk0w3izi5l1d1h0alwyr3fixic7b94kc812n";
@@ -1336,6 +1524,8 @@
   };
   foreman = {
     dependencies = ["thor"];
+    groups = ["development"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "06mq39lpmc17bxzlwhad9d8i0lcnbb08xr18smh2x79mm631wsw0";
@@ -1344,6 +1534,8 @@
     version = "0.84.0";
   };
   formatador = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1gc26phrwlmlqrmz4bagq1wd5b7g64avpx0ghxr9xdxcvmlii0l0";
@@ -1364,6 +1556,8 @@
   };
   fuubar = {
     dependencies = ["rspec-core" "ruby-progressbar"];
+    groups = ["development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0jlv2wisgnim29h47shvqhipbz1wgndfdr7i6y5wcfag0z2660lv";
@@ -1383,6 +1577,8 @@
   };
   gemojione = {
     dependencies = ["json"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0ayk8r147k1s38nj18pwk76npx1p7jhi86silk800nj913pjvrhj";
@@ -1391,7 +1587,7 @@
     version = "3.3.0";
   };
   get_process_mem = {
-    groups = ["default" "development" "puma" "test" "unicorn"];
+    groups = ["default" "puma" "unicorn"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
@@ -1402,6 +1598,8 @@
   };
   gettext = {
     dependencies = ["locale" "text"];
+    groups = ["development"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0764vj7gacn0aypm2bf6m46dzjzwzrjlmbyx6qwwwzbmi94r40wr";
@@ -1411,6 +1609,8 @@
   };
   gettext_i18n_rails = {
     dependencies = ["fast_gettext"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0vs918a03mqvx9aczaqdg9d2q9s3c6swqavzn82qgq5i822czrcm";
@@ -1420,6 +1620,8 @@
   };
   gettext_i18n_rails_js = {
     dependencies = ["gettext" "gettext_i18n_rails" "po_to_json" "rails"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "11yn5cf92wsmlj5c1065mg6swf8gq9l6g9ahikvvyf9npvjay42x";
@@ -1449,6 +1651,8 @@
     version = "1.58.0";
   };
   github-markup = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "17g6g18gdjg63k75sfwiskjzl9i0hfcnrkcpb4fwrnb20v3jgswp";
@@ -1533,6 +1737,8 @@
   };
   gitlab_omniauth-ldap = {
     dependencies = ["net-ldap" "omniauth" "pyu-ruby-sasl" "rubyntlm"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1f8cjbzlhckarmm59l380jjy33a3hlljg69b3zkh8rhy1xd3xr90";
@@ -1553,6 +1759,8 @@
   };
   gon = {
     dependencies = ["actionpack" "multi_json" "request_store"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0q9nvnw98mbb40h7mlzn1zk40r2l29yybhinmiqhrq8a6adsv806";
@@ -1562,6 +1770,8 @@
   };
   google-api-client = {
     dependencies = ["addressable" "googleauth" "httpclient" "mime-types" "representable" "retriable"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "05h2lca9b334ayabgs3h0mzc2wg3csvkqv1lv3iirpgf90ypbk1k";
@@ -1592,6 +1802,8 @@
   };
   googleauth = {
     dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1747p1dhpvz76i98xnjrvaj785y1232svm0nc8g9by6pz835gp2l";
@@ -1601,6 +1813,8 @@
   };
   gpgme = {
     dependencies = ["mini_portile2"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "12fqirxr964mc8jwsfl5nif6q4wcckrmj7w4c9ci4xg9xy2b9v6m";
@@ -1610,6 +1824,8 @@
   };
   grape = {
     dependencies = ["activesupport" "builder" "mustermann-grape" "rack" "rack-accept" "virtus"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "04bam0iq9sad1df361317zz4knwci905yig502khl8gm1lp1168c";
@@ -1619,6 +1835,8 @@
   };
   grape-entity = {
     dependencies = ["activesupport" "multi_json"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1w78wylkhdkc0s6n6d20hggbb3pl3ladzzd5lx6ack2iswybx7b9";
@@ -1639,6 +1857,8 @@
   };
   grape_logging = {
     dependencies = ["grape"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0lg2vhk0dlnyqs2rz8wilfm039q5mbsp5nvf51asir48a1rf9yza";
@@ -1648,6 +1868,8 @@
   };
   graphiql-rails = {
     dependencies = ["railties" "sprockets-rails"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "10q5zipwgjgaan9lfqakdkm5ry8afgkq79bkimgksn6jyyvpz6w8";
@@ -1700,6 +1922,8 @@
   };
   haml = {
     dependencies = ["temple" "tilt"];
+    groups = ["default" "development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1q0a9fvqh8kn6wm97fcks6qzbjd400bv8bx748w8v87m7p4klhac";
@@ -1720,6 +1944,8 @@
   };
   hamlit = {
     dependencies = ["temple" "thor" "tilt"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0hk338vkzmwszxdh0q02iw88rbr3bj3fd7fzn4psm8wy80zcgl9i";
@@ -1728,6 +1954,8 @@
     version = "2.8.8";
   };
   hangouts-chat = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1dmnv3723c22683bzys8walkl6wi74xzawxjbhwqzjdbwk3bdgmx";
@@ -1736,6 +1964,8 @@
     version = "0.0.5";
   };
   hashdiff = {
+    groups = ["default" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "19ykg5pax8798nh1yv71adkx0zzs7gn2rxjj86v7nsw0jba5lask";
@@ -1744,6 +1974,8 @@
     version = "0.3.8";
   };
   hashie = {
+    groups = ["default" "kerberos"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1hh5lybf8hm7d7xs4xm8hxvm8xqrs2flc8fnwkrclaj746izw6xb";
@@ -1753,6 +1985,8 @@
   };
   hashie-forbidden_attributes = {
     dependencies = ["hashie"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1chgg5d2iddja6ww02x34g8avg11fzmzcb8yvnqlykii79zx6vis";
@@ -1762,6 +1996,8 @@
   };
   health_check = {
     dependencies = ["rails"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1mfa180nyzz1j0abfihm5nm3lmzq99362ibcphky6rh5vwhckvm8";
@@ -1770,7 +2006,7 @@
     version = "2.6.0";
   };
   heapy = {
-    groups = ["default" "development" "test"];
+    groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
@@ -1792,6 +2028,8 @@
   };
   html-pipeline = {
     dependencies = ["activesupport" "nokogiri"];
+    groups = ["default" "development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1mpj5y13jk1arqkhdk66n49kyglmci980c1l6np7pqgyjllb68ad";
@@ -1801,6 +2039,8 @@
   };
   html2text = {
     dependencies = ["nokogiri"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0kxdj8pf9pss9xgs8aac0alj5g1fi225yzdhh33lzampkazg1hii";
@@ -1809,6 +2049,8 @@
     version = "0.2.0";
   };
   htmlentities = {
+    groups = ["default" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj";
@@ -1818,6 +2060,8 @@
   };
   http = {
     dependencies = ["addressable" "http-cookie" "http-form_data" "http_parser.rb"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1jlm5prw437wqpfxcigh88lfap3m7g8mnmj5as7qw6dzqnvrxwmc";
@@ -1827,6 +2071,8 @@
   };
   http-cookie = {
     dependencies = ["domain_name"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g";
@@ -1835,6 +2081,8 @@
     version = "1.0.3";
   };
   http-form_data = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "15lpn604byf7cyxnw949xz4rvpcknqp7a48q73nm630gqxsa76f3";
@@ -1843,6 +2091,8 @@
     version = "2.1.1";
   };
   "http_parser.rb" = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi";
@@ -1862,6 +2112,8 @@
     version = "0.16.4";
   };
   httpclient = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99";
@@ -1871,7 +2123,7 @@
   };
   i18n = {
     dependencies = ["concurrent-ruby"];
-    groups = ["default" "development" "mysql" "postgres" "test"];
+    groups = ["default" "development" "test"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
@@ -1891,6 +2143,8 @@
     version = "0.8.0";
   };
   icalendar = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1xsydpp2xph00awi25axv2mwjd5p2rlgd4qb3kh05lvq795kirxd";
@@ -1899,6 +2153,8 @@
     version = "2.4.1";
   };
   ice_nine = {
+    groups = ["default" "development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1nv35qg1rps9fsis28hz2cq2fx1i96795f91q4nmkm934xynll2x";
@@ -1908,6 +2164,8 @@
   };
   influxdb = {
     dependencies = ["cause" "json"];
+    groups = ["metrics"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1vhg5nd88nwvfa76lqcczld916nljswwq6clsixrzi3js8ym9y1w";
@@ -1927,6 +2185,8 @@
     version = "0.12.1";
   };
   ipaddress = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1x86s0s11w202j6ka40jbmywkrx8fhq8xiy8mwvnkhllj57hqr45";
@@ -1936,6 +2196,8 @@
   };
   jaeger-client = {
     dependencies = ["opentracing" "thrift"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "198m72c9w3wfwr1mq22dcjjm7d4jd0bci4lrq6zq2zvlzhi04n8l";
@@ -1976,6 +2238,8 @@
   };
   js_regex = {
     dependencies = ["character_set" "regexp_parser" "regexp_property_values"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0wi4h4f3knb0yp4zq2spks3dpmdzz9wa54d6xk88md0h4v2x33cq";
@@ -1984,6 +2248,8 @@
     version = "3.1.1";
   };
   json = {
+    groups = ["default" "development" "metrics" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0qmj7fypgb9vag723w1a49qihxrcf5shzars106ynw2zk352gbv5";
@@ -1993,6 +2259,8 @@
   };
   json-jwt = {
     dependencies = ["activesupport" "aes_key_wrap" "bindata"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "065k7vffdki73f4nz89lxi6wxmcw5dlf593831pgvlbralll6x3r";
@@ -2002,7 +2270,9 @@
   };
   json-schema = {
     dependencies = ["addressable"];
-    source = {
+    groups = ["test"];
+    platforms = [];
+    source = {
       remotes = ["https://rubygems.org"];
       sha256 = "11di8qyam6bmqn0fvvvf3crgaqy4sil0d406ymx0jacn3ff98ymz";
       type = "gem";
@@ -2010,6 +2280,8 @@
     version = "2.8.0";
   };
   jwt = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1w0kaqrbl71cq9sbnixc20x5lqah3hs2i93xmhlfdg2y3by7yzky";
@@ -2019,6 +2291,8 @@
   };
   kaminari = {
     dependencies = ["activesupport" "kaminari-actionview" "kaminari-activerecord" "kaminari-core"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0invfvfb252ihsdr65rylkvd1x2wy004jval52v3i8ybb0jhc5hi";
@@ -2028,6 +2302,8 @@
   };
   kaminari-actionview = {
     dependencies = ["actionview" "kaminari-core"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0mhhsm6xhmwqc7hfw7xnk1kdbfg468bqs5awcqm5j6j8b9zyjvdi";
@@ -2037,6 +2313,8 @@
   };
   kaminari-activerecord = {
     dependencies = ["activerecord" "kaminari-core"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1kb5aj6iy1cwcq5548jd3w1ipxicnzmnx2ay1s4hvad2gvrd4g93";
@@ -2045,6 +2323,8 @@
     version = "1.0.1";
   };
   kaminari-core = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0r2n293ad1xr9wgn8cr53nfzwls4w3p1xi4kjfjgl1z0yf05mpwr";
@@ -2053,6 +2333,8 @@
     version = "1.0.1";
   };
   kgio = {
+    groups = ["default" "unicorn"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1528pyj1szzzp3pgj05fzjd36qjrxm9yj2x5radc9p1z7vl67y50";
@@ -2062,6 +2344,8 @@
   };
   knapsack = {
     dependencies = ["rake"];
+    groups = ["development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1c69rcwfrdrnx8ddl6k1qxhw9f2dj5x5bbddz435isl2hfr5zh92";
@@ -2103,6 +2387,8 @@
   };
   launchy = {
     dependencies = ["addressable"];
+    groups = ["default" "development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "190lfbiy1vwxhbgn4nl4dcbzxvm049jwc158r2x7kq3g5khjrxa2";
@@ -2134,6 +2420,8 @@
   };
   license_finder = {
     dependencies = ["rubyzip" "thor" "toml" "with_env" "xml-simple"];
+    groups = ["development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "01rhqm5m3m22gq6q9f1x9fh3x3wrf9khnnsycblj0xg5frdjv77v";
@@ -2143,6 +2431,8 @@
   };
   licensee = {
     dependencies = ["rugged"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0w6d2smhg3kzcx4m2ii06akakypwhiglansk51bpx290hhc8h3pc";
@@ -2151,6 +2441,8 @@
     version = "8.9.2";
   };
   locale = {
+    groups = ["default" "development"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1sls9bq4krx0fmnzmlbn64dw23c4d6pz46ynjzrn9k8zyassdd0x";
@@ -2160,6 +2452,8 @@
   };
   lograge = {
     dependencies = ["actionpack" "activesupport" "railties" "request_store"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "00lcn7s3slfn32di4qwlx2yj5f9r2pcnd0naxrvqqwypcg1z2sdd";
@@ -2169,6 +2463,8 @@
   };
   loofah = {
     dependencies = ["crass" "nokogiri"];
+    groups = ["default" "development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1ccsid33xjajd0im2xv941aywi58z7ihwkvaf1w2bv89vn5bhsjg";
@@ -2178,6 +2474,8 @@
   };
   mail = {
     dependencies = ["mini_mime"];
+    groups = ["default" "development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "00wwz6ys0502dpk8xprwcqfwyf3hmnx6lgxaiq6vj43mkx43sapc";
@@ -2186,6 +2484,8 @@
     version = "2.7.1";
   };
   mail_room = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "16b8yjd1if665mwaindwys06nkkcs0jw3dcsqvn6qbp6alfigqaa";
@@ -2205,6 +2505,8 @@
     version = "0.3.3";
   };
   memoist = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0pq8fhqh8w25qcw9v3vzfb0i6jp0k3949ahxc3wrwz2791dpbgbh";
@@ -2214,6 +2516,8 @@
   };
   memoizable = {
     dependencies = ["thread_safe"];
+    groups = ["default" "development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0v42bvghsvfpzybfazl14qhkrjvx0xlmxz0wwqc960ga1wld5x5c";
@@ -2222,7 +2526,7 @@
     version = "0.4.2";
   };
   memory_profiler = {
-    groups = ["default" "development" "test"];
+    groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
@@ -2232,6 +2536,12 @@
     version = "0.9.13";
   };
   method_source = {
+    groups = ["default" "development" "metrics" "test"];
+    platforms = [{
+      engine = "maglev";
+    } {
+      engine = "ruby";
+    }];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1pviwzvdqd90gn6y7illcdd9adapw8fczml933p5vl739dkvl3lq";
@@ -2241,6 +2551,8 @@
   };
   mime-types = {
     dependencies = ["mime-types-data"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0fjxy1jm52ixpnv3vg9ld9pr9f35gy0jp66i1njhqjvmnvq0iwwk";
@@ -2259,6 +2571,8 @@
     version = "3.2019.0331";
   };
   mimemagic = {
+    groups = ["default" "development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "00ibc1mhvdfyfyl103xwb45621nwyqxf124cni5hyfhag0fn1c3q";
@@ -2277,6 +2591,8 @@
     version = "4.9.5";
   };
   mini_mime = {
+    groups = ["default" "development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1q4pshq387lzv9m39jv32vwb8wrq3wc4jwgl4jk209r4l33v09d3";
@@ -2285,6 +2601,8 @@
     version = "1.0.1";
   };
   mini_portile2 = {
+    groups = ["default" "development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy";
@@ -2293,6 +2611,8 @@
     version = "2.4.0";
   };
   minitest = {
+    groups = ["development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq";
@@ -2311,6 +2631,8 @@
     version = "1.3.0";
   };
   multi_json = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv";
@@ -2319,6 +2641,8 @@
     version = "1.13.1";
   };
   multi_xml = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0lmd4f401mvravi1i1yq7b2qjjli0yq7dfc4p1nj5nwajp7r6hyj";
@@ -2327,6 +2651,8 @@
     version = "0.6.0";
   };
   multipart-post = {
+    groups = ["default" "development"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x";
@@ -2345,6 +2671,8 @@
     version = "0.1.6";
   };
   mustermann = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0lycgkmnyy0bf29nnd2zql5a6pcf8sp69g9v4xw0gcfcxgpwp7i1";
@@ -2354,6 +2682,8 @@
   };
   mustermann-grape = {
     dependencies = ["mustermann"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "10xdggddjl8nraq7pbli31lwgrzxzz8gp558i811lsv71fqbmhzr";
@@ -2362,6 +2692,8 @@
     version = "1.0.0";
   };
   nakayoshi_fork = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1mj5czi7rxxmfq4v9qjz74lcqypvnjxhxqfs71zhb2rsfa97a6jg";
@@ -2390,6 +2722,8 @@
     version = "0.9.0";
   };
   net-ldap = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1fh4l8zfsrvghanpnjxk944k7yl093qpw4759xs6f1v9kb73ihfq";
@@ -2418,6 +2752,8 @@
     version = "5.2.0";
   };
   netrc = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0gzfmcywp1da8nzfqsql2zqi648mfnx6qwkig3cv36n9m0yy676y";
@@ -2426,6 +2762,8 @@
     version = "0.11.0";
   };
   nio4r = {
+    groups = ["default" "development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1a41ca1kpdmrypjp9xbgvckpy8g26zxphkja9vk7j5wl4n8yvlyr";
@@ -2456,6 +2794,8 @@
   };
   nokogumbo = {
     dependencies = ["nokogiri"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "09qc1c7acv9qm48vk2kzvnrq4ij8jrql1cv33nmv2nwmlggy0jyj";
@@ -2464,6 +2804,8 @@
     version = "1.5.0";
   };
   numerizer = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0vrk9jbv4p4dcz0wzr72wrf5kajblhc5l9qf7adbcwi4qvz9xv0h";
@@ -2472,6 +2814,8 @@
     version = "0.1.1";
   };
   oauth = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1zszdg8q1b135z7l7crjj234k4j0m347hywp5kj6zsq7q78pw09y";
@@ -2481,6 +2825,8 @@
   };
   oauth2 = {
     dependencies = ["faraday" "jwt" "multi_json" "multi_xml" "rack"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0av6nlb5y2sm6m8fx669ywrqa9858yqaqfqzny75nqp3anag89qh";
@@ -2490,6 +2836,8 @@
   };
   octokit = {
     dependencies = ["sawyer"];
+    groups = ["default" "development"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1ssn5iyax07a22mvmj0y45bfy8ali129bl1qmasp6bcg03bvk298";
@@ -2499,6 +2847,8 @@
   };
   omniauth = {
     dependencies = ["hashie" "rack"];
+    groups = ["default" "kerberos"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1p16h1rp8by05k8gfw17xjhgwp60dk8qmj1xalv1n23kmxfsxb1x";
@@ -2508,6 +2858,8 @@
   };
   omniauth-auth0 = {
     dependencies = ["omniauth-oauth2"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0id5gn14av81kh41cq4q6c9knyvzl7vc4rs3m4pmpd43g2z6jdw2";
@@ -2517,6 +2869,8 @@
   };
   omniauth-authentiq = {
     dependencies = ["jwt" "omniauth-oauth2"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0k7vajxwplsp188xfj4mi9iqbc7f7djqh02by4mphc51hl87kcqi";
@@ -2526,6 +2880,8 @@
   };
   omniauth-azure-oauth2 = {
     dependencies = ["jwt" "omniauth" "omniauth-oauth2"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1a3iqy63l1jd6na4y0bj4a8mlp7gcn3a0awnz9g79fa8n4v2g8n4";
@@ -2535,6 +2891,8 @@
   };
   omniauth-cas3 = {
     dependencies = ["addressable" "nokogiri" "omniauth"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "191b4jm4djmmy54yxfxj3c889r2wn3g6sfsdj6l1rjy0kw1m2qgx";
@@ -2544,6 +2902,8 @@
   };
   omniauth-facebook = {
     dependencies = ["omniauth-oauth2"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "03zjla9i446fk1jkw7arh67c39jfhp5bhkmhvbw8vczxr1jkbbh5";
@@ -2553,6 +2913,8 @@
   };
   omniauth-github = {
     dependencies = ["omniauth" "omniauth-oauth2"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0yg7k4p95ybcsii17spqarl8rpfzkq0kb19ab6wl4lc922zgfbqc";
@@ -2562,6 +2924,8 @@
   };
   omniauth-gitlab = {
     dependencies = ["omniauth" "omniauth-oauth2"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "19ydk2zd2mz8zi80z3l03pajpm9357sg3lrankrcb3pirkkdb9fp";
@@ -2571,6 +2935,8 @@
   };
   omniauth-google-oauth2 = {
     dependencies = ["jwt" "omniauth" "omniauth-oauth2"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "03v2gqpsbdhkqaxhvzr83za885awm6pgskv3mkyfvang7mr321df";
@@ -2580,6 +2946,8 @@
   };
   omniauth-kerberos = {
     dependencies = ["omniauth-multipassword" "timfel-krb5-auth"];
+    groups = ["kerberos"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "05xsv76qjxcxzrvabaar2bchv7435y8l2j0wk4zgchh3yv85kiq7";
@@ -2589,6 +2957,8 @@
   };
   omniauth-multipassword = {
     dependencies = ["omniauth"];
+    groups = ["default" "kerberos"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0qykp76hw80lkgb39hyzrv68hkbivc8cv0vbvrnycjh9fwfp1lv8";
@@ -2598,6 +2968,8 @@
   };
   omniauth-oauth = {
     dependencies = ["oauth" "omniauth"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1n5vk4by7hkyc09d9blrw2argry5awpw4gbw1l4n2s9b3j4qz037";
@@ -2607,6 +2979,8 @@
   };
   omniauth-oauth2 = {
     dependencies = ["oauth2" "omniauth"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "11mi36l9d97r77q99jnafdc1yaa0a9wahhpp7dj7ank8q52g7g79";
@@ -2616,6 +2990,8 @@
   };
   omniauth-oauth2-generic = {
     dependencies = ["omniauth-oauth2"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1m6vpip3rm1spx1x9y1kjczzailsph1xqgaakqylzq3jqkv18273";
@@ -2636,6 +3012,8 @@
   };
   omniauth-saml = {
     dependencies = ["omniauth" "ruby-saml"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "17lji8i4q9k3yi8lmjwlw8rfpp2sc74jv8d6flgq85lg5brfqq1p";
@@ -2645,6 +3023,8 @@
   };
   omniauth-shibboleth = {
     dependencies = ["omniauth"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "04yin7j8xpr8llvank3ivzahqkc6ss5bppc7q6znzdswxmf75fxh";
@@ -2654,6 +3034,8 @@
   };
   omniauth-twitter = {
     dependencies = ["omniauth-oauth" "rack"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0r5j65hkpgzhvvbs90id3nfsjgsad6ymzggbm7zlaxvnrmvnrk65";
@@ -2674,6 +3056,8 @@
   };
   omniauth_crowd = {
     dependencies = ["activesupport" "nokogiri" "omniauth"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "12g5ck05h6kr9mnp870x8pkxsadg81ca70hg8n3k8xx007lfw2q7";
@@ -2724,6 +3108,8 @@
     version = "0.5.0";
   };
   optimist = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "05jxrp3nbn5iilc1k7ir90mfnwc5abc9h78s5rpm3qafwqxvcj4j";
@@ -2733,6 +3119,8 @@
   };
   org-ruby = {
     dependencies = ["rubypants"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0x69s7aysfiwlcpd9hkvksfyld34d8kxr62adb59vjvh8hxfrjwk";
@@ -2741,6 +3129,8 @@
     version = "0.9.12";
   };
   orm_adapter = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1fg9jpjlzf5y49qs9mlpdrgs5rpcyihq1s4k79nv9js0spjhnpda";
@@ -2749,6 +3139,8 @@
     version = "0.5.0";
   };
   os = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1s401gvhqgs2r8hh43ia205mxsy1wc0ib4k76wzkdpspfcnfr1rk";
@@ -2778,6 +3170,8 @@
     version = "2.6.3.0";
   };
   parslet = {
+    groups = ["default" "development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "12nrzfwjphjlakb9pmpj70hgjwgzvnr8i1zfzddifgyd44vspl88";
@@ -2786,7 +3180,7 @@
     version = "1.8.2";
   };
   pg = {
-    groups = ["development" "postgres" "test"];
+    groups = ["default" "development" "test"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
@@ -2797,6 +3191,8 @@
   };
   po_to_json = {
     dependencies = ["json"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1xvanl437305mry1gd57yvcg7xrfhri91czr32bjr8j2djm8hwba";
@@ -2806,6 +3202,8 @@
   };
   premailer = {
     dependencies = ["addressable" "css_parser" "htmlentities"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "10w6f7r6snpkcnv3byxma9b08lyqzcfxkm083scb2dr2ly4xkzyf";
@@ -2815,6 +3213,8 @@
   };
   premailer-rails = {
     dependencies = ["actionmailer" "premailer"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "05czxmx6hnykg6g23hy2ww2bf86a69njbi02sv7lrds4w776jhim";
@@ -2824,6 +3224,8 @@
   };
   proc_to_ast = {
     dependencies = ["coderay" "parser" "unparser"];
+    groups = ["default" "development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "14c65w48bbzp5lh1cngqd1y25kqvfnq1iy49hlzshl12dsk3z9wj";
@@ -2832,6 +3234,8 @@
     version = "0.1.0";
   };
   procto = {
+    groups = ["default" "development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "13imvg1x50rz3r0yyfbhxwv72lbf7q28qx9l9nfbb91h2n9ch58c";
@@ -2851,6 +3255,12 @@
   };
   pry = {
     dependencies = ["coderay" "method_source"];
+    groups = ["default" "development" "test"];
+    platforms = [{
+      engine = "maglev";
+    } {
+      engine = "ruby";
+    }];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1mh312k3y94sj0pi160wpia0ps8f4kmzvm505i6bvwynfdh7v30g";
@@ -2860,6 +3270,12 @@
   };
   pry-byebug = {
     dependencies = ["byebug" "pry"];
+    groups = ["development" "test"];
+    platforms = [{
+      engine = "maglev";
+    } {
+      engine = "ruby";
+    }];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1f9kj1qp14qb8crg2rdzf22pr6ngxvy4n6ipymla8q1yjr842625";
@@ -2869,6 +3285,8 @@
   };
   pry-rails = {
     dependencies = ["pry"];
+    groups = ["development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0k2d43bwmqbswfra4fkadjjbszwb11pr7qdkma91qrcrk62wqxvy";
@@ -2887,6 +3305,8 @@
     version = "3.1.0";
   };
   puma = {
+    groups = ["puma"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1k7dqxnq0dnf5rxkgs9rknclkn3ah7lsdrk6nrqxla8qzy31wliq";
@@ -2896,6 +3316,8 @@
   };
   puma_worker_killer = {
     dependencies = ["get_process_mem" "puma"];
+    groups = ["puma"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1m08qi8mxpp20zqqjj9yzcrx0sn29n5fn5avlf1lnl0n7qa9c03i";
@@ -2904,6 +3326,8 @@
     version = "0.1.0";
   };
   pyu-ruby-sasl = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1rcpjiz9lrvyb3rd8k8qni0v4ps08psympffyldmmnrqayyad0sn";
@@ -2912,6 +3336,8 @@
     version = "0.0.3.3";
   };
   raabro = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0xzdmbn48753f6k0ckirp8ja5p0xn1a92wbwxfyggyhj0hza9ylq";
@@ -2920,7 +3346,7 @@
     version = "1.1.6";
   };
   rack = {
-    groups = ["default" "development" "kerberos" "mysql" "postgres" "test"];
+    groups = ["default" "development" "kerberos" "test"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
@@ -2931,6 +3357,8 @@
   };
   rack-accept = {
     dependencies = ["rack"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "18jdipx17b4ki33cfqvliapd31sbfvs4mv727awynr6v95a7n936";
@@ -2940,6 +3368,8 @@
   };
   rack-attack = {
     dependencies = ["rack"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1czx68p70x98y21dkdndsb64lrxf9qrv09wl1dbcxrypcjnpsdl1";
@@ -2948,6 +3378,8 @@
     version = "4.4.1";
   };
   rack-cors = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1j27vy1bmhbqcyzhxg8d07qassmax769xjalfwcwz6qfiq8cf013";
@@ -2968,6 +3400,8 @@
   };
   rack-protection = {
     dependencies = ["rack"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "15167q25rmxipqwi6hjqj3i1byi9iwl3xq9b7mdar7qiz39pmjsk";
@@ -2977,6 +3411,8 @@
   };
   rack-proxy = {
     dependencies = ["rack"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1bpbcb9ch94ha2q7gdri88ry7ch0z6ian289kah9ayxyqg19j6f4";
@@ -2986,7 +3422,7 @@
   };
   rack-test = {
     dependencies = ["rack"];
-    groups = ["default" "development" "mysql" "postgres" "test"];
+    groups = ["default" "development" "test"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
@@ -3018,6 +3454,8 @@
   };
   rails-controller-testing = {
     dependencies = ["actionpack" "actionview" "activesupport"];
+    groups = ["test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "16kdkk73mhhs73iz3i1i0ryjm84dadiyh817b3nh8acdi490jyhy";
@@ -3027,6 +3465,8 @@
   };
   rails-dom-testing = {
     dependencies = ["activesupport" "nokogiri"];
+    groups = ["default" "development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1lfq2a7kp2x64dzzi5p4cjcbiv62vxh9lyqk2f0rqq3fkzrw8h5i";
@@ -3047,6 +3487,8 @@
   };
   rails-i18n = {
     dependencies = ["i18n" "railties"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1rqij2ggqz5iq36lbibhnd7pl4qxrvv9kgw9s0c6594vzbbxmhs0";
@@ -3056,7 +3498,7 @@
   };
   railties = {
     dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"];
-    groups = ["default" "development" "mysql" "postgres" "test"];
+    groups = ["default" "development" "test"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
@@ -3066,6 +3508,8 @@
     version = "5.2.3";
   };
   rainbow = {
+    groups = ["default" "development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk";
@@ -3074,6 +3518,8 @@
     version = "3.0.0";
   };
   raindrops = {
+    groups = ["metrics" "unicorn"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1qpbd9jif40c53fz2r0l8khfl016y8s8bkx37ibcaafclbl3xygp";
@@ -3082,6 +3528,8 @@
     version = "0.19.0";
   };
   rake = {
+    groups = ["default" "development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1sy5a7nh6xjdc9yhcw31jji7ssrf9v5806hn95gbrzr998a2ydjn";
@@ -3090,6 +3538,8 @@
     version = "12.3.2";
   };
   rb-fsevent = {
+    groups = ["default" "development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1fbpmjypwxkb8r7y1kmhmyp6gawa4byw0yb3jc3dn9ly4ld9lizf";
@@ -3099,6 +3549,8 @@
   };
   rb-inotify = {
     dependencies = ["ffi"];
+    groups = ["default" "development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0yfsgw5n7pkpyky6a9wkf1g9jafxb0ja7gz0qw0y14fd2jnzfh71";
@@ -3108,6 +3560,12 @@
   };
   rblineprof = {
     dependencies = ["debugger-ruby_core_source"];
+    groups = ["development"];
+    platforms = [{
+      engine = "maglev";
+    } {
+      engine = "ruby";
+    }];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0m58kdjgncwf0h1qry3qk5h4bg8sj0idykqqijqcrr09mxfd9yc6";
@@ -3117,6 +3575,8 @@
   };
   rbtrace = {
     dependencies = ["ffi" "msgpack" "optimist"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1lwsq08i0aj8na5q5ba3gg02sx3wl58fi6m52svl5p7cy56ycdwi";
@@ -3125,6 +3585,8 @@
     version = "0.4.11";
   };
   rdoc = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0anv42cqcdc6g4n386mrva7mgav5i0c2ry3yzvzzc6z6hymkmcr7";
@@ -3133,6 +3595,8 @@
     version = "6.0.4";
   };
   re2 = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "00wf9k1hkv3z3nfkrnfyyfq9ah0l7k14awqys3h2hqz4c21pqd2i";
@@ -3152,6 +3616,8 @@
     version = "4.13.1";
   };
   recursive-open-struct = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0wfcyigmf5mwrxy76p0bi4sdb4h9afs8jc73pjav5cnqszljjl3c";
@@ -3160,6 +3626,8 @@
     version = "1.1.0";
   };
   RedCloth = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0m9dv7ya9q93r8x1pg2gi15rxlbck8m178j1fz7r5v6wr1avrrqy";
@@ -3179,6 +3647,8 @@
   };
   redis-actionpack = {
     dependencies = ["actionpack" "redis-rack" "redis-store"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "15k41gz7nygd4yydk2yd25gghya1j7q6zifk4mdrra6bwnwjbm63";
@@ -3199,6 +3669,8 @@
   };
   redis-namespace = {
     dependencies = ["redis"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0r7daagrjjribn098dxwbv9zivrbq2rsffbkj2ccxyn9lmjjbgah";
@@ -3219,6 +3691,8 @@
   };
   redis-rails = {
     dependencies = ["redis-actionpack" "redis-activesupport" "redis-store"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0hjvkyaw5hgz7v6fgwdk8pb966z44h1gv8jarmb0gwhkqmjnsh40";
@@ -3228,6 +3702,8 @@
   };
   redis-store = {
     dependencies = ["redis"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1mrcnjgkbmx1zf569mly82agdizqayjvnp2k6055k1iy07in3j8b";
@@ -3246,6 +3722,8 @@
     version = "1.5.1";
   };
   regexp_property_values = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "05ka0bkhghs9b9pv6q443k8y1c5xalmm0vylj9zd450ksncxj1yr";
@@ -3255,6 +3733,8 @@
   };
   representable = {
     dependencies = ["declarative" "declarative-option" "uber"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0qm9rgi1j5a6nv726ka4mmixivlxfsg91h8rpp72wwd4vqbkkm07";
@@ -3263,6 +3743,8 @@
     version = "3.0.4";
   };
   request_store = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1va9x0b3ww4chcfqlmi8b14db39di1mwa7qrjbh7ma0lhndvs2zv";
@@ -3272,6 +3754,8 @@
   };
   responders = {
     dependencies = ["actionpack" "railties"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1rhdyyvvm26f2l3fgwdp6xasfl2y0whwgy766bhdwz697mf78zfn";
@@ -3281,6 +3765,8 @@
   };
   rest-client = {
     dependencies = ["http-cookie" "mime-types" "netrc"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1hzcs2r7b5bjkf2x2z3n8z6082maz0j8vqjiciwgg3hzb63f958j";
@@ -3289,6 +3775,8 @@
     version = "2.0.2";
   };
   retriable = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1q48hqws2dy1vws9schc0kmina40gy7sn5qsndpsfqdslh65snha";
@@ -3297,6 +3785,8 @@
     version = "3.1.2";
   };
   rinku = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "11cakxzp7qi04d41hbqkh92n52mm4z2ba8sqyhxbmfi4kypmls9y";
@@ -3305,6 +3795,8 @@
     version = "2.0.0";
   };
   rotp = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1w8d6svhq3y9y952r8cqirxvdx12zlkb7zxjb44bcbidb2sisy4d";
@@ -3324,6 +3816,8 @@
   };
   rqrcode = {
     dependencies = ["chunky_png"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "188n1mvc7klrlw30bai16sdg4yannmy7cz0sg0nvm6f1kjx5qflb";
@@ -3333,6 +3827,8 @@
   };
   rqrcode-rails3 = {
     dependencies = ["rqrcode"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1i28rwmj24ssk91chn0g7qsnvn003y3s5a7jsrg3w4l5ckr841bg";
@@ -3418,6 +3914,8 @@
     version = "0.6.1";
   };
   rspec-set = {
+    groups = ["development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "06vw8b5w1a58838cw9ssmy3r6f8vrjh54h7dp97rwv831gn5zlyk";
@@ -3437,6 +3935,8 @@
   };
   rspec_junit_formatter = {
     dependencies = ["rspec-core"];
+    groups = ["test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1aynmrgnv26pkprrajvp7advb8nbh0x4pkwk6jwq8qmwzarzk21p";
@@ -3446,6 +3946,8 @@
   };
   rspec_profiling = {
     dependencies = ["activerecord" "pg" "rails" "sqlite3"];
+    groups = ["development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1g7q7gav26bpiprx4dhlvdh4zdrhwiky9jbmsp14gyfiabqdz4sz";
@@ -3466,6 +3968,8 @@
   };
   rubocop-gitlab-security = {
     dependencies = ["rubocop"];
+    groups = ["default" "development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0v0040kpx46fxz3p7dsdjgvsx89qjhwy17n8vxnqg9a7g1rfvxln";
@@ -3486,6 +3990,8 @@
   };
   rubocop-rspec = {
     dependencies = ["rubocop"];
+    groups = ["development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0vk51h9swvgshan8vp8yjz03qv9vn5vs29i9iddhjwcwgzsganla";
@@ -3495,6 +4001,8 @@
   };
   ruby-enum = {
     dependencies = ["i18n"];
+    groups = ["default" "development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0h62avini866kxpjzqxlqnajma3yvj0y25l6hn9h2mv5pp6fcrhx";
@@ -3504,6 +4012,8 @@
   };
   ruby-fogbugz = {
     dependencies = ["crack"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1jj0gpkycbrivkh2q3429vj6mbgx6axxisg69slj3c4mgvzfgchm";
@@ -3533,6 +4043,8 @@
   };
   ruby-saml = {
     dependencies = ["nokogiri"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0k9d88fa8bp5szivbwq0qi960y3r2kp6jhnkmsp3n2rvwpn936i3";
@@ -3552,6 +4064,8 @@
     version = "3.13.1";
   };
   rubyntlm = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1p6bxsklkbcqni4bcq6jajc2n57g0w5rzn4r49c3lb04wz5xg0dy";
@@ -3560,6 +4074,8 @@
     version = "0.6.2";
   };
   rubypants = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1vpdkrc4c8qhrxph41wqwswl28q5h5h994gy4c1mlrckqzm3hzph";
@@ -3568,6 +4084,8 @@
     version = "0.2.0";
   };
   rubyzip = {
+    groups = ["default" "development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1n1lb2sdwh9h27y244hxzg1lrxxg2m53pk1vq7p33bna003qkyrj";
@@ -3586,6 +4104,8 @@
     version = "0.28.3.1";
   };
   safe_yaml = {
+    groups = ["default" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094";
@@ -3595,6 +4115,8 @@
   };
   sanitize = {
     dependencies = ["crass" "nokogiri" "nokogumbo"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0j4j2a2mkk1a70vbx959pvx0gvr1zb9snjwvsppwj28bp0p0b2bv";
@@ -3604,6 +4126,8 @@
   };
   sass = {
     dependencies = ["sass-listen"];
+    groups = ["default" "development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "10401m2xlv6vaxfwzy4xxmk51ddcnkvwi918cw3jkki0qqdl7d8v";
@@ -3613,6 +4137,8 @@
   };
   sass-listen = {
     dependencies = ["rb-fsevent" "rb-inotify"];
+    groups = ["default" "development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0xw3q46cmahkgyldid5hwyiwacp590zj2vmswlll68ryvmvcp7df";
@@ -3644,6 +4170,8 @@
   };
   sawyer = {
     dependencies = ["addressable" "faraday"];
+    groups = ["default" "development"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0sv1463r7bqzvx4drqdmd36m7rrv6sf1v3c6vswpnq3k6vdw2dvd";
@@ -3653,6 +4181,8 @@
   };
   scss_lint = {
     dependencies = ["rake" "sass"];
+    groups = ["development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "01bfkrjn1i0hfg1ifwn1rs7vqwdbdw158krwr5fm6iasd9zgl10g";
@@ -3662,6 +4192,8 @@
   };
   seed-fu = {
     dependencies = ["activerecord" "activesupport"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0x6gclryl0hds3zms095d2iyafcvm2kfrm7362vrkxws7r2775pi";
@@ -3692,6 +4224,8 @@
     version = "2.9.0";
   };
   settingslogic = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1ria5zcrk1nf0b9yia15mdpzw0dqr6wjpbj8dsdbbps81lfsj9ar";
@@ -3733,6 +4267,8 @@
   };
   sidekiq-cron = {
     dependencies = ["fugit" "sidekiq"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1aliswahmpxn1ib2brn4126gk97ac3zdnwr71mn8vzbr3vdd7fl0";
@@ -3742,6 +4278,8 @@
   };
   signet = {
     dependencies = ["addressable" "faraday" "jwt" "multi_json"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1f5d3bz5bjc4b0r2jmqd15qf07lgsqkgd25f0h46jihrf9l5fsi4";
@@ -3750,6 +4288,8 @@
     version = "0.11.0";
   };
   simple_po_parser = {
+    groups = ["development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "08wkp4gcrd89k5yari9j94if9ffkj3rka4llcwrhdgsi3l15p5f3";
@@ -3789,6 +4329,8 @@
     version = "1.2.0";
   };
   slack-notifier = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0xavibxh00gy62mm79l6id9l2fldjmdqifk8alqfqy5z38ffwah6";
@@ -3809,6 +4351,8 @@
   };
   spring = {
     dependencies = ["activesupport"];
+    groups = ["development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "168yz9c1fv21wc5i8q7n43b9nk33ivg3ws1fn6x0afgryz3ssx75";
@@ -3818,6 +4362,8 @@
   };
   spring-commands-rspec = {
     dependencies = ["spring"];
+    groups = ["development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0b0svpq3md1pjz5drpa5pxwg8nk48wrshq8lckim4x3nli7ya0k2";
@@ -3827,6 +4373,8 @@
   };
   sprockets = {
     dependencies = ["concurrent-ruby" "rack"];
+    groups = ["default" "development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "182jw5a0fbqah5w9jancvfmjbk88h8bxdbwnl4d3q809rpxdg8ay";
@@ -3836,6 +4384,8 @@
   };
   sprockets-rails = {
     dependencies = ["actionpack" "activesupport" "sprockets"];
+    groups = ["default" "development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0ab42pm8p5zxpv3sfraq45b9lj39cz9mrpdirm30vywzrwwkm5p1";
@@ -3844,6 +4394,8 @@
     version = "3.2.1";
   };
   sqlite3 = {
+    groups = ["default" "development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "01ifzp8nwzqppda419c9wcvr8n82ysmisrs0hph9pdmv1lpa4f5i";
@@ -3852,6 +4404,8 @@
     version = "1.3.13";
   };
   sshkey = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "03bkn55qsng484iqwz2lmm6rkimj01vsvhwk661s3lnmpkl65lbp";
@@ -3860,6 +4414,8 @@
     version = "2.0.0";
   };
   stackprof = {
+    groups = ["development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1c88j2d6ipjw5s3hgdgfww37gysgrkicawagj33hv3knijjc9ski";
@@ -3868,6 +4424,8 @@
     version = "0.2.10";
   };
   state_machines = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "00mi16hg3rhkxz4y58s173cbnjlba41y9bfcim90p4ja6yfj9ri3";
@@ -3877,6 +4435,8 @@
   };
   state_machines-activemodel = {
     dependencies = ["activemodel" "state_machines"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0chhm5hs1y83dq8haff10m66r3yrm7jab35r9xg6adn6qd8ynv2l";
@@ -3886,6 +4446,8 @@
   };
   state_machines-activerecord = {
     dependencies = ["activerecord" "state_machines-activemodel"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "00h07gd4kb22ahgv61r8zca9hqxaw44fnk2sc28j00c1nmwsw6r3";
@@ -3906,6 +4468,8 @@
   };
   sys-filesystem = {
     dependencies = ["ffi"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "092wj7936i5inzafi09wqh5c8dbak588q21k652dsrdjf5qi10zq";
@@ -3914,6 +4478,8 @@
     version = "1.1.6";
   };
   sysexits = {
+    groups = ["default" "development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0qjng6pllznmprzx8vb0zg0c86hdrkyjs615q41s9fjpmv2430jr";
@@ -3943,6 +4509,8 @@
     version = "1.8.0";
   };
   test-prof = {
+    groups = ["test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "08nvn3c1mzgcjgk9lr3py0zjd8fjjrm3ncn9rpqkfbx429mgw2l3";
@@ -3951,6 +4519,8 @@
     version = "0.2.5";
   };
   text = {
+    groups = ["default" "development"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1x6kkmsr49y3rnrin91rv8mpc3dhrf3ql08kbccw8yffq61brfrg";
@@ -3960,6 +4530,8 @@
   };
   thin = {
     dependencies = ["daemons" "eventmachine" "rack"];
+    groups = ["development"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0nagbf9pwy1vg09k6j4xqhbjjzrg5dwzvkn4ffvlj76fsn6vv61f";
@@ -3968,6 +4540,8 @@
     version = "1.7.2";
   };
   thor = {
+    groups = ["default" "development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "01n5dv9kql60m6a00zc0r66jvaxx98qhdny3klyj0p3w34pad2ns";
@@ -3976,6 +4550,8 @@
     version = "0.19.4";
   };
   thread_safe = {
+    groups = ["default" "development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy";
@@ -3984,6 +4560,8 @@
     version = "0.3.6";
   };
   thrift = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "02p107kwx7jnkh6fpdgvaji0xdg6xkaarngkqjml6s4zny4m8slv";
@@ -4002,6 +4580,8 @@
     version = "2.0.9";
   };
   timecop = {
+    groups = ["development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0vwbkwqyxhavzvr1820hqwz43ylnfcf6w4x6sag0nghi44sr9kmx";
@@ -4010,6 +4590,8 @@
     version = "0.8.1";
   };
   timfel-krb5-auth = {
+    groups = ["default" "kerberos"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "105vajc0jkqgcx1wbp0ad262sdry4l1irk7jpaawv8vzfjfqqf5b";
@@ -4019,6 +4601,8 @@
   };
   toml = {
     dependencies = ["parslet"];
+    groups = ["default" "development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0xj460rkyqvg74xc8kivmbvgc46c6mm7r8mbjs5m2gq8khf8sbki";
@@ -4028,6 +4612,8 @@
   };
   toml-rb = {
     dependencies = ["citrus"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0pz6z1mc7rnv4chkbx3mdn4q1lpp0j596dq57kbq39jv0wn0wi4d";
@@ -4037,6 +4623,8 @@
   };
   truncato = {
     dependencies = ["htmlentities" "nokogiri"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0z36dprfj9l4jwgwb2wv4v3cilm53v7i1ywfmm5f1dl352id3ak4";
@@ -4046,6 +4634,8 @@
   };
   tzinfo = {
     dependencies = ["thread_safe"];
+    groups = ["default" "development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z";
@@ -4054,6 +4644,8 @@
     version = "1.2.5";
   };
   u2f = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0lsm1hvwcaa9sq13ab1l1zjk0fgcy951ay11v2acx0h6q1iv21vr";
@@ -4062,6 +4654,8 @@
     version = "0.2.1";
   };
   uber = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1p1mm7mngg40x05z52md3mbamkng0zpajbzqjjwmsyw0zw3v9vjv";
@@ -4071,6 +4665,8 @@
   };
   uglifier = {
     dependencies = ["execjs" "json"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0mzs64z3m1b98rh6ssxpqfz9sc87f6ml6906b0m57vydzfgrh1cz";
@@ -4080,6 +4676,8 @@
   };
   unf = {
     dependencies = ["unf_ext"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9";
@@ -4088,6 +4686,8 @@
     version = "0.1.4";
   };
   unf_ext = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "06p1i6qhy34bpb8q8ms88y6f2kz86azwm098yvcc0nyqk9y729j1";
@@ -4117,6 +4717,8 @@
   };
   unicorn = {
     dependencies = ["kgio" "raindrops"];
+    groups = ["unicorn"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1qfhvzs4i6ja1s43j8p1kfbzm10n7a02ngki30a38y5m46a2qrak";
@@ -4126,6 +4728,8 @@
   };
   unicorn-worker-killer = {
     dependencies = ["get_process_mem" "unicorn"];
+    groups = ["unicorn"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0rrdxpwdsapx47axjin8ymxb4f685qlpx8a26bql4ay1559c3gva";
@@ -4134,6 +4738,8 @@
     version = "0.4.4";
   };
   uniform_notifier = {
+    groups = ["default" "development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1jha0l7x602g5rvah960xl9r0f3q25gslj39i0x1vai8i5z6zr1l";
@@ -4187,6 +4793,8 @@
   };
   validates_hostname = {
     dependencies = ["activerecord" "activesupport"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "04p1l0v98j4ffvaks1ig9mygx5grpbpdgz7haq3mygva9iy8ykja";
@@ -4195,6 +4803,8 @@
     version = "1.0.6";
   };
   version_sorter = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0hbdw3vh856f5yg5mbj4498l6vh90cd3pn22ikr3ranzkrh73l3s";
@@ -4204,6 +4814,8 @@
   };
   virtus = {
     dependencies = ["axiom-types" "coercible" "descendants_tracker" "equalizer"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "06iphwi3c4f7y9i2rvhvaizfswqbaflilziz4dxqngrdysgkn1fk";
@@ -4212,6 +4824,8 @@
     version = "1.0.5";
   };
   vmstat = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0vb5mwc71p8rlm30hnll3lb4z70ipl5rmilskpdrq2mxwfilcm5b";
@@ -4221,6 +4835,8 @@
   };
   warden = {
     dependencies = ["rack"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0va966lhpylcwbqb9n151kkihx30agh0a57mwjwdxyanll4s1q12";
@@ -4241,6 +4857,8 @@
   };
   webmock = {
     dependencies = ["addressable" "crack" "hashdiff"];
+    groups = ["test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0gg0c2sxq7rni0b93w47h7p7cn590xdhf5va7ska48inpipwlgxp";
@@ -4250,6 +4868,8 @@
   };
   webpack-rails = {
     dependencies = ["railties"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0fsjxw730bh4k1dfnbjm645fgjyqrh830l1z7brqbsm6306ig1rr";
@@ -4269,6 +4889,8 @@
     version = "0.7.0";
   };
   websocket-extensions = {
+    groups = ["default" "development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "034sdr7fd34yag5l6y156rkbhiqgmy395m231dwhlpcswhs6d270";
@@ -4278,6 +4900,8 @@
   };
   wikicloth = {
     dependencies = ["builder" "expression_parser" "rinku"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1jp6c2yzyqbap8jdiw8yz6l08sradky1llhyhmrg934l1b5akj3s";
@@ -4286,6 +4910,8 @@
     version = "0.8.1";
   };
   with_env = {
+    groups = ["default" "development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1r5ns064mbb99hf1dyxsk9183hznc5i7mn3bi86zka6dlvqf9csh";
@@ -4294,6 +4920,8 @@
     version = "1.1.0";
   };
   xml-simple = {
+    groups = ["default" "development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0xlqplda3fix5pcykzsyzwgnbamb3qrqkgbrhhfz2a2fxhrkvhw8";
diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py
index 7b6afebcd97..38acf41c6f2 100755
--- a/pkgs/applications/version-management/gitlab/update.py
+++ b/pkgs/applications/version-management/gitlab/update.py
@@ -20,7 +20,7 @@ logger = logging.getLogger(__name__)
 
 class GitLabRepo:
     version_regex = re.compile(r"^v\d+\.\d+\.\d+(\-rc\d+)?(\-ee)?")
-    def __init__(self, owner: str, repo: str):
+    def __init__(self, owner: str = 'gitlab-org', repo: str = 'gitlab'):
         self.owner = owner
         self.repo = repo
 
@@ -68,7 +68,7 @@ class GitLabRepo:
         """
         return requests.get(self.url + f"/raw/{rev}/{filepath}").text
 
-    def get_data(self, rev, flavour):
+    def get_data(self, rev):
         version = self.rev2version(rev)
 
         passthru = {v: self.get_file(v, rev).strip() for v in ['GITALY_SERVER_VERSION', 'GITLAB_PAGES_VERSION',
@@ -81,34 +81,6 @@ class GitLabRepo:
                     passthru=passthru)
 
 
-def _flavour2gitlabrepo(flavour: str):
-    if flavour not in ['ce', 'ee']:
-        raise Exception(f"unknown gitlab flavour: {flavour}, needs to be ce or ee")
-
-    owner = 'gitlab-org'
-    if flavour == 'ce':
-        repo = 'gitlab-foss'
-    else:
-        repo = 'gitlab'
-
-    return GitLabRepo(owner, repo)
-
-
-def _update_data_json(filename: str, repo: GitLabRepo, rev: str, flavour: str):
-    flavour_data = repo.get_data(rev, flavour)
-
-    if not os.path.exists(filename):
-        with open(filename, 'w') as f:
-            json.dump({flavour: flavour_data}, f, indent=2)
-    else:
-        with open(filename, 'r+') as f:
-            data = json.load(f)
-            data[flavour] = flavour_data
-            f.seek(0)
-            f.truncate()
-            json.dump(data, f, indent=2)
-
-
 def _get_data_json():
     data_file_path = pathlib.Path(__file__).parent / 'data.json'
     with open(data_file_path, 'r') as f:
@@ -129,44 +101,39 @@ def cli():
 
 @cli.command('update-data')
 @click.option('--rev', default='latest', help='The rev to use, \'latest\' points to the latest (stable) tag')
-@click.argument('flavour')
-def update_data(rev: str, flavour: str):
-    """Update data.nix for a selected flavour"""
-    r = _flavour2gitlabrepo(flavour)
+def update_data(rev: str):
+    """Update data.nix"""
+    repo = GitLabRepo()
 
     if rev == 'latest':
         # filter out pre and re releases
-        rev = next(filter(lambda x: not ('rc' in x or x.endswith('pre')), r.tags))
+        rev = next(filter(lambda x: not ('rc' in x or x.endswith('pre')), repo.tags))
     logger.debug(f"Using rev {rev}")
 
-    version = r.rev2version(rev)
+    version = repo.rev2version(rev)
     logger.debug(f"Using version {version}")
 
     data_file_path = pathlib.Path(__file__).parent / 'data.json'
 
-    _update_data_json(filename=data_file_path.as_posix(),
-                      repo=r,
-                      rev=rev,
-                      flavour=flavour)
+    data = repo.get_data(rev)
 
+    with open(data_file_path.as_posix(), 'w') as f:
+        json.dump(data, f, indent=2)
 
-@cli.command('update-rubyenv')
-@click.argument('flavour')
-def update_rubyenv(flavour):
-    """Update rubyEnv-${flavour}"""
-    if flavour not in ['ce', 'ee']:
-        raise Exception(f"unknown gitlab flavour: {flavour}, needs to be ce or ee")
 
-    r = _flavour2gitlabrepo(flavour)
-    rubyenv_dir = pathlib.Path(__file__).parent / f"rubyEnv-{flavour}"
+@cli.command('update-rubyenv')
+def update_rubyenv():
+    """Update rubyEnv"""
+    repo = GitLabRepo()
+    rubyenv_dir = pathlib.Path(__file__).parent / f"rubyEnv"
 
     # load rev from data.json
     data = _get_data_json()
-    rev = data[flavour]['rev']
+    rev = data['rev']
 
     for fn in ['Gemfile.lock', 'Gemfile']:
         with open(rubyenv_dir / fn, 'w') as f:
-            f.write(r.get_file(fn, rev))
+            f.write(repo.get_file(fn, rev))
 
     subprocess.check_output(['bundix'], cwd=rubyenv_dir)
 
@@ -175,13 +142,12 @@ def update_rubyenv(flavour):
 def update_yarnpkgs():
     """Update yarnPkgs"""
 
-    # yarn.lock is identical between the repos
-    repo = _flavour2gitlabrepo('ee')
+    repo = GitLabRepo()
     yarnpkgs_dir = pathlib.Path(__file__).parent
 
     # load rev from data.json
     data = _get_data_json()
-    rev = data['ee']['rev']
+    rev = data['rev']
 
     with open(yarnpkgs_dir / 'yarn.lock', 'w') as f:
         f.write(repo.get_file('yarn.lock', rev))
@@ -196,17 +162,17 @@ def update_yarnpkgs():
 def update_gitaly():
     """Update gitaly"""
     data = _get_data_json()
-    gitaly_server_version = data['ce']['passthru']['GITALY_SERVER_VERSION']
-    r = GitLabRepo('gitlab-org', 'gitaly')
+    gitaly_server_version = data['passthru']['GITALY_SERVER_VERSION']
+    repo = GitLabRepo(repo='gitaly')
     gitaly_dir = pathlib.Path(__file__).parent / 'gitaly'
 
     for fn in ['Gemfile.lock', 'Gemfile']:
         with open(gitaly_dir / fn, 'w') as f:
-            f.write(r.get_file(f"ruby/{fn}", f"v{gitaly_server_version}"))
+            f.write(repo.get_file(f"ruby/{fn}", f"v{gitaly_server_version}"))
 
     for fn in ['go.mod', 'go.sum']:
         with open(gitaly_dir / fn, 'w') as f:
-            f.write(r.get_file(fn, f"v{gitaly_server_version}"))
+            f.write(repo.get_file(fn, f"v{gitaly_server_version}"))
 
     subprocess.check_output(['bundix'], cwd=gitaly_dir)
     subprocess.check_output(['vgo2nix'], cwd=gitaly_dir)
@@ -221,19 +187,19 @@ def update_gitaly():
 def update_gitlab_shell():
     """Update gitlab-shell"""
     data = _get_data_json()
-    gitlab_shell_version = data['ce']['passthru']['GITLAB_SHELL_VERSION']
+    gitlab_shell_version = data['passthru']['GITLAB_SHELL_VERSION']
     _call_update_source_version('gitlab-shell', gitlab_shell_version)
 
-    r = GitLabRepo('gitlab-org', 'gitlab-shell')
+    repo = GitLabRepo(repo='gitlab-shell')
     gitlab_shell_dir = pathlib.Path(__file__).parent / 'gitlab-shell'
 
     for fn in ['Gemfile.lock', 'Gemfile']:
         with open(gitlab_shell_dir / fn, 'w') as f:
-            f.write(r.get_file(fn, f"v{gitlab_shell_version}"))
+            f.write(repo.get_file(fn, f"v{gitlab_shell_version}"))
 
     for fn in ['go.mod', 'go.sum']:
         with open(gitlab_shell_dir / fn, 'w') as f:
-            f.write(r.get_file(f"go/{fn}", f"v{gitlab_shell_version}"))
+            f.write(repo.get_file(f"go/{fn}", f"v{gitlab_shell_version}"))
 
     subprocess.check_output(['bundix'], cwd=gitlab_shell_dir)
     subprocess.check_output(['vgo2nix'], cwd=gitlab_shell_dir)
@@ -246,15 +212,15 @@ def update_gitlab_shell():
 def update_gitlab_workhorse():
     """Update gitlab-workhorse"""
     data = _get_data_json()
-    gitlab_workhorse_version = data['ce']['passthru']['GITLAB_WORKHORSE_VERSION']
+    gitlab_workhorse_version = data['passthru']['GITLAB_WORKHORSE_VERSION']
     _call_update_source_version('gitlab-workhorse', gitlab_workhorse_version)
 
-    r = GitLabRepo('gitlab-org', 'gitlab-workhorse')
+    repo = GitLabRepo('gitlab-org', 'gitlab-workhorse')
     gitlab_workhorse_dir = pathlib.Path(__file__).parent / 'gitlab-workhorse'
 
     for fn in ['go.mod', 'go.sum']:
         with open(gitlab_workhorse_dir / fn, 'w') as f:
-            f.write(r.get_file(fn, f"v{gitlab_workhorse_version}"))
+            f.write(repo.get_file(fn, f"v{gitlab_workhorse_version}"))
 
     subprocess.check_output(['vgo2nix'], cwd=gitlab_workhorse_dir)
 
@@ -264,10 +230,9 @@ def update_gitlab_workhorse():
 @cli.command('update-all')
 @click.pass_context
 def update_all(ctx):
-    """Update gitlab ce and ee data.nix and rubyenvs to the latest stable release"""
-    for flavour in ['ce', 'ee']:
-        ctx.invoke(update_data, rev='latest', flavour=flavour)
-        ctx.invoke(update_rubyenv, flavour=flavour)
+    """Update all gitlab components to the latest stable release"""
+    ctx.invoke(update_data, rev='latest')
+    ctx.invoke(update_rubyenv)
     ctx.invoke(update_yarnpkgs)
     ctx.invoke(update_gitaly)
     ctx.invoke(update_gitlab_shell)
-- 
GitLab


From 68deec3a81bbd85e4d9cb2b9dccbd005d468b246 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 8 Oct 2019 07:00:48 -0700
Subject: [PATCH 2209/2254] python37Packages.sqlobject: 3.7.2 -> 3.7.3

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-sqlobject/versions
---
 pkgs/development/python-modules/sqlobject/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sqlobject/default.nix b/pkgs/development/python-modules/sqlobject/default.nix
index 187f06c6ad9..52b2fad62a2 100644
--- a/pkgs/development/python-modules/sqlobject/default.nix
+++ b/pkgs/development/python-modules/sqlobject/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "SQLObject";
-  version = "3.7.2";
+  version = "3.7.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8aee27279231bae59e95b299e253b27ac2d78934989f4ccbe317c7b25faab6de";
+    sha256 = "0dgzmzdv3alfdqcrl4x0xf9161ls80h33rnqbz0yhmfpkjg99b9n";
   };
 
   checkInputs = [ pytest ];
-- 
GitLab


From 6879b2d6b9c11d1aa15a605e7f0820c1dc443768 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 8 Oct 2019 10:01:51 -0400
Subject: [PATCH 2210/2254] oh-my-zsh: 2019-10-07 -> 2019-10-08

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

diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix
index 927964a13f0..7b506078f84 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -4,13 +4,13 @@
 { stdenv, fetchgit }:
 
 stdenv.mkDerivation rec {
-  version = "2019-10-07";
+  version = "2019-10-08";
   pname = "oh-my-zsh";
-  rev = "7e842cddc45b8bdebe1b198e83eb96fd07b37787";
+  rev = "c714d3fcedd2e729350b5f69f4a9312b9fc68a43";
 
   src = fetchgit { inherit rev;
     url = "https://github.com/robbyrussell/oh-my-zsh";
-    sha256 = "0caz1yq2rcj08414lcn2k3dgi2v4g8hvchnsxddcbsa8fbl5iis3";
+    sha256 = "0j4ih7x04q45nivakqkpp130qzkqj944b7bjfy4z2wkkn4wqk15s";
   };
 
   pathsToLink = [ "/share/oh-my-zsh" ];
-- 
GitLab


From 9be76d0b6a08dd0158a6beeeb0cc0796c527f67a Mon Sep 17 00:00:00 2001
From: talyz <kim.lindberger@gmail.com>
Date: Tue, 8 Oct 2019 16:35:50 +0200
Subject: [PATCH 2211/2254] gitlab: 12.3.4 -> 12.3.5

---
 pkgs/applications/version-management/gitlab/data.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json
index 9de3a0e3d95..94d5be62db5 100644
--- a/pkgs/applications/version-management/gitlab/data.json
+++ b/pkgs/applications/version-management/gitlab/data.json
@@ -1,9 +1,9 @@
 {
-  "version": "12.3.4",
-  "repo_hash": "152gg7h0zwzih93ajn3ki5ij8c1fbanlgwl40i44nnsk79m8jbia",
+  "version": "12.3.5",
+  "repo_hash": "12ywspgnbwm232vmzbqhkqmwmcrb9pvihsayzmw0cxvhlfwq6995",
   "owner": "gitlab-org",
   "repo": "gitlab",
-  "rev": "v12.3.4-ee",
+  "rev": "v12.3.5-ee",
   "passthru": {
     "GITALY_SERVER_VERSION": "1.65.1",
     "GITLAB_PAGES_VERSION": "1.9.0",
-- 
GitLab


From c115d4df885782692de3b24a29d6df95588b239b Mon Sep 17 00:00:00 2001
From: talyz <kim.lindberger@gmail.com>
Date: Tue, 8 Oct 2019 16:37:01 +0200
Subject: [PATCH 2212/2254] gitlab: Add myself to list of maintainers

---
 pkgs/applications/version-management/gitlab/default.nix         | 2 +-
 .../version-management/gitlab/gitlab-shell/default.nix          | 2 +-
 .../version-management/gitlab/gitlab-workhorse/default.nix      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix
index ad5e22430ba..99b408bcef3 100644
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@@ -156,7 +156,7 @@ stdenv.mkDerivation {
   meta = with lib; {
     homepage = http://www.gitlab.com/;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ fpletz globin krav ];
+    maintainers = with maintainers; [ fpletz globin krav talyz ];
   } // (if gitlabEnterprise then
     {
       license = licenses.unfreeRedistributable; # https://gitlab.com/gitlab-org/gitlab-ee/raw/master/LICENSE
diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
index bb406d66449..cdc77024a60 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
@@ -66,7 +66,7 @@ stdenv.mkDerivation {
     description = "SSH access and repository management app for GitLab";
     homepage = http://www.gitlab.com/;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ fpletz globin ];
+    maintainers = with maintainers; [ fpletz globin talyz ];
     license = licenses.mit;
   };
 }
diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
index 107eca7cd1d..09a3cee195d 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
@@ -31,7 +31,7 @@ buildGoPackage rec {
   meta = with stdenv.lib; {
     homepage = http://www.gitlab.com/;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ fpletz globin ];
+    maintainers = with maintainers; [ fpletz globin talyz ];
     license = licenses.mit;
   };
 }
-- 
GitLab


From 5aa4b1994629ed0701b8b6d6e094da9d7d912721 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Mon, 7 Oct 2019 17:20:23 +0200
Subject: [PATCH 2213/2254] treewide: mark some broken packages as broken

Refs:
e6754980264fe927320d5ff2dbd24ca4fac9a160
1e9cc5b9844ef603fe160e9f671178f96200774f
793a2fe1e8bb886ca2096c5904e1193dc3268b6d
c19cf65261639f749012454932a532aa7c681e4b
f6544d618f30fae0bc4798c4387a8c7c9c047a7c
---
 pkgs/applications/audio/quodlibet/default.nix                 | 1 +
 pkgs/applications/audio/sonic-pi/default.nix                  | 1 +
 pkgs/applications/blockchains/polkadot/default.nix            | 1 +
 pkgs/applications/graphics/photoflow/default.nix              | 2 +-
 pkgs/applications/misc/digitalbitbox/default.nix              | 1 +
 pkgs/applications/misc/opencpn/default.nix                    | 1 +
 pkgs/applications/misc/opentx/default.nix                     | 1 +
 pkgs/applications/misc/pbpst/default.nix                      | 1 +
 pkgs/applications/misc/sleepyhead/default.nix                 | 1 +
 pkgs/applications/networking/feedreaders/newsboat/default.nix | 1 +
 .../networking/instant-messengers/psi-plus/default.nix        | 1 +
 .../networking/instant-messengers/telepathy/salut/default.nix | 1 +
 pkgs/applications/networking/mailreaders/notbit/default.nix   | 1 +
 pkgs/applications/office/kmymoney/default.nix                 | 1 +
 pkgs/applications/office/skrooge/default.nix                  | 1 +
 pkgs/applications/science/biology/EZminc/default.nix          | 1 +
 pkgs/applications/science/biology/paml/default.nix            | 1 +
 pkgs/applications/science/biology/strelka/default.nix         | 1 +
 pkgs/applications/science/chemistry/pymol/default.nix         | 1 +
 pkgs/applications/science/electronics/kicad/unstable.nix      | 1 +
 pkgs/applications/science/logic/jonprl/default.nix            | 1 +
 pkgs/applications/science/logic/lean2/default.nix             | 1 +
 pkgs/applications/science/logic/monosat/default.nix           | 3 ++-
 pkgs/applications/science/robotics/qgroundcontrol/default.nix | 1 +
 pkgs/applications/video/obs-studio/linuxbrowser.nix           | 1 +
 pkgs/desktops/plasma-5/kdecoration.nix                        | 1 +
 .../panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix | 1 +
 pkgs/desktops/xfce4-14/xfburn/default.nix                     | 1 +
 pkgs/development/interpreters/love/0.9.nix                    | 1 +
 pkgs/development/interpreters/proglodyte-wasm/default.nix     | 1 +
 pkgs/development/libraries/gdata-sharp/default.nix            | 1 +
 pkgs/development/libraries/libcef/default.nix                 | 1 +
 pkgs/development/libraries/libclc/default.nix                 | 1 +
 .../development/libraries/science/biology/elastix/default.nix | 1 +
 pkgs/development/libraries/torch/default.nix                  | 1 +
 pkgs/development/misc/stm32/betaflight/default.nix            | 1 +
 pkgs/development/misc/stm32/inav/default.nix                  | 1 +
 pkgs/development/python-modules/bidict/default.nix            | 2 ++
 pkgs/development/python-modules/django-pipeline/default.nix   | 1 +
 pkgs/development/python-modules/django_evolution/default.nix  | 1 +
 pkgs/development/python-modules/django_taggit/default.nix     | 3 ++-
 pkgs/development/python-modules/exchangelib/default.nix       | 1 +
 pkgs/development/python-modules/filterpy/default.nix          | 2 ++
 pkgs/development/python-modules/gensim/default.nix            | 2 ++
 pkgs/development/python-modules/geopy/default.nix             | 1 +
 pkgs/development/python-modules/jenkinsapi/default.nix        | 1 +
 .../python-modules/maildir-deduplicate/default.nix            | 1 +
 pkgs/development/python-modules/minidb/default.nix            | 1 +
 pkgs/development/python-modules/openrazer/daemon.nix          | 4 ++--
 pkgs/development/python-modules/paperspace/default.nix        | 1 +
 pkgs/development/python-modules/pgsanity/default.nix          | 1 +
 pkgs/development/python-modules/piccata/default.nix           | 3 ++-
 pkgs/development/python-modules/pip-tools/default.nix         | 1 +
 pkgs/development/python-modules/poetry/default.nix            | 1 +
 pkgs/development/python-modules/ptpython/default.nix          | 3 ++-
 pkgs/development/python-modules/py3exiv2/default.nix          | 1 +
 pkgs/development/python-modules/pybfd/default.nix             | 1 +
 pkgs/development/python-modules/pyezminc/default.nix          | 1 +
 pkgs/development/python-modules/pygbm/default.nix             | 1 +
 pkgs/development/python-modules/pykickstart/default.nix       | 2 ++
 pkgs/development/python-modules/pyro-ppl/default.nix          | 1 +
 pkgs/development/python-modules/pysvn/default.nix             | 1 +
 pkgs/development/python-modules/pythonnet/default.nix         | 1 +
 pkgs/development/python-modules/pytorch/default.nix           | 3 ++-
 pkgs/development/python-modules/qscintilla-qt5/default.nix    | 1 +
 pkgs/development/python-modules/qutip/default.nix             | 1 +
 pkgs/development/python-modules/rubymarshal/default.nix       | 3 ++-
 pkgs/development/python-modules/snug/default.nix              | 2 ++
 pkgs/development/python-modules/sparse/default.nix            | 1 +
 pkgs/development/python-modules/spectral-cube/default.nix     | 1 +
 pkgs/development/python-modules/ssdp/default.nix              | 2 ++
 .../python-modules/swagger-spec-validator/default.nix         | 2 +-
 pkgs/development/python-modules/symengine/default.nix         | 1 +
 pkgs/development/python-modules/vmprof/default.nix            | 1 +
 pkgs/development/python-modules/word2vec/default.nix          | 1 +
 pkgs/development/python-modules/yt/default.nix                | 2 ++
 pkgs/development/python-modules/zake/default.nix              | 1 +
 pkgs/development/python-modules/zope_contenttype/default.nix  | 1 +
 pkgs/development/python-modules/zope_i18n/default.nix         | 1 +
 pkgs/development/tools/fedpkg/default.nix                     | 1 +
 pkgs/development/tools/vogl/default.nix                       | 1 +
 pkgs/games/liquidwar/5.nix                                    | 1 +
 pkgs/games/simutrans/default.nix                              | 1 +
 pkgs/games/spring/default.nix                                 | 1 +
 pkgs/misc/drivers/utsushi/default.nix                         | 1 +
 pkgs/misc/emulators/qmc2/default.nix                          | 1 +
 pkgs/misc/emulators/retroarch/cores.nix                       | 4 +++-
 pkgs/misc/logging/beats/6.x.nix                               | 1 +
 pkgs/servers/http/tengine/default.nix                         | 1 +
 pkgs/servers/scylladb/default.nix                             | 1 +
 pkgs/servers/x11/xorg/overrides.nix                           | 2 ++
 pkgs/tools/X11/winswitch/default.nix                          | 1 +
 pkgs/tools/backup/wal-g/default.nix                           | 1 +
 pkgs/tools/filesystems/irods/default.nix                      | 1 +
 pkgs/tools/filesystems/nixpart/0.4/default.nix                | 1 +
 pkgs/tools/misc/svtplay-dl/default.nix                        | 1 +
 pkgs/tools/networking/http-prompt/default.nix                 | 1 +
 pkgs/tools/networking/p2p/tahoe-lafs/default.nix              | 1 +
 pkgs/tools/networking/unbound/python.nix                      | 1 +
 pkgs/tools/security/mbox/default.nix                          | 1 +
 pkgs/tools/security/meo/default.nix                           | 1 +
 pkgs/tools/security/sequoia/default.nix                       | 1 +
 pkgs/top-level/dotnet-packages.nix                            | 1 +
 103 files changed, 120 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix
index c874bdd40d2..573dca518e3 100644
--- a/pkgs/applications/audio/quodlibet/default.nix
+++ b/pkgs/applications/audio/quodlibet/default.nix
@@ -65,5 +65,6 @@ python3.pkgs.buildPythonApplication rec {
 
     maintainers = with maintainers; [ coroa sauyon ];
     homepage = https://quodlibet.readthedocs.io/en/latest/;
+    broken = true;
   };
 }
diff --git a/pkgs/applications/audio/sonic-pi/default.nix b/pkgs/applications/audio/sonic-pi/default.nix
index 2a39caa0865..055678b0e35 100644
--- a/pkgs/applications/audio/sonic-pi/default.nix
+++ b/pkgs/applications/audio/sonic-pi/default.nix
@@ -100,5 +100,6 @@ mkDerivation rec {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ Phlogistique kamilchm ];
     platforms = lib.platforms.linux;
+    broken = true;
   };
 }
diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix
index 100c0f8ba41..681268b4f32 100644
--- a/pkgs/applications/blockchains/polkadot/default.nix
+++ b/pkgs/applications/blockchains/polkadot/default.nix
@@ -26,5 +26,6 @@ rustPlatform.buildRustPackage rec {
     license = licenses.gpl3;
     maintainers = [ maintainers.akru ];
     platforms = platforms.linux;
+    broken = true;
   };
 }
diff --git a/pkgs/applications/graphics/photoflow/default.nix b/pkgs/applications/graphics/photoflow/default.nix
index db41ee0566f..78d16e69226 100644
--- a/pkgs/applications/graphics/photoflow/default.nix
+++ b/pkgs/applications/graphics/photoflow/default.nix
@@ -51,6 +51,6 @@ stdenv.mkDerivation {
     license = licenses.gpl3Plus;
     maintainers = [ maintainers.MtP ];
     platforms = platforms.linux;
-    broken = stdenv.isAarch64;
+    broken = true;
   };
 }
diff --git a/pkgs/applications/misc/digitalbitbox/default.nix b/pkgs/applications/misc/digitalbitbox/default.nix
index a4f6b1ce988..a6ae4530655 100644
--- a/pkgs/applications/misc/digitalbitbox/default.nix
+++ b/pkgs/applications/misc/digitalbitbox/default.nix
@@ -138,5 +138,6 @@ in stdenv.mkDerivation rec {
       vidbina
     ];
     platforms = platforms.linux;
+    broken = true;
   };
 }
diff --git a/pkgs/applications/misc/opencpn/default.nix b/pkgs/applications/misc/opencpn/default.nix
index 5c7e7355c66..041ba7811db 100644
--- a/pkgs/applications/misc/opencpn/default.nix
+++ b/pkgs/applications/misc/opencpn/default.nix
@@ -29,5 +29,6 @@ stdenv.mkDerivation rec {
     platforms = [ "x86_64-linux" ];
     license = stdenv.lib.licenses.gpl2;
     homepage = https://opencpn.org/;
+    broken = true;
   };
 }
diff --git a/pkgs/applications/misc/opentx/default.nix b/pkgs/applications/misc/opentx/default.nix
index 585c85cbd2c..370f88d7b47 100644
--- a/pkgs/applications/misc/opentx/default.nix
+++ b/pkgs/applications/misc/opentx/default.nix
@@ -58,6 +58,7 @@ in stdenv.mkDerivation {
     license = stdenv.lib.licenses.gpl2;
     platforms = [ "i686-linux" "x86_64-linux" ];
     maintainers = with maintainers; [ elitak ];
+    broken = true;
   };
 
 }
diff --git a/pkgs/applications/misc/pbpst/default.nix b/pkgs/applications/misc/pbpst/default.nix
index fcf88200133..c1fd6c5d7cb 100644
--- a/pkgs/applications/misc/pbpst/default.nix
+++ b/pkgs/applications/misc/pbpst/default.nix
@@ -45,5 +45,6 @@ llvmPackages.stdenv.mkDerivation rec {
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ tmplt ];
+    broken = true;
   };
 }
diff --git a/pkgs/applications/misc/sleepyhead/default.nix b/pkgs/applications/misc/sleepyhead/default.nix
index cf5c4625c95..a3270929417 100644
--- a/pkgs/applications/misc/sleepyhead/default.nix
+++ b/pkgs/applications/misc/sleepyhead/default.nix
@@ -37,6 +37,7 @@ in stdenv.mkDerivation {
     license = licenses.gpl3;
     platforms = platforms.all;
     maintainers = [ maintainers.krav ];
+    broken = true;
   };
 
 }
diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix
index f7a9521c993..4273545a8e5 100644
--- a/pkgs/applications/networking/feedreaders/newsboat/default.nix
+++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix
@@ -53,5 +53,6 @@ rustPlatform.buildRustPackage rec {
     maintainers = with maintainers; [ dotlambda nicknovitski ];
     license     = licenses.mit;
     platforms   = platforms.unix;
+    broken = true;
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
index 16fb1bbab1e..5ca28fca7a7 100644
--- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
+++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
@@ -44,5 +44,6 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ orivej ];
     license = licenses.gpl2;
     platforms = platforms.linux;
+    broken = true;
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix
index 0bc9b3124ee..6513c6324a6 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix
@@ -22,5 +22,6 @@ stdenv.mkDerivation rec {
     description = "Link-local XMPP connection manager for Telepathy";
     platforms = platforms.gnu ++ platforms.linux; # Random choice
     maintainers = [ maintainers.lethalman ];
+    broken = true;
   };
 }
diff --git a/pkgs/applications/networking/mailreaders/notbit/default.nix b/pkgs/applications/networking/mailreaders/notbit/default.nix
index fcf1464ba23..370c4f83887 100644
--- a/pkgs/applications/networking/mailreaders/notbit/default.nix
+++ b/pkgs/applications/networking/mailreaders/notbit/default.nix
@@ -25,5 +25,6 @@ stdenv.mkDerivation {
     license = licenses.mit;
     platforms = platforms.unix;
     maintainers = with maintainers; [ mog ];
+    broken = true;
   };
 }
diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix
index 0cb23abea66..20ba1abd36a 100644
--- a/pkgs/applications/office/kmymoney/default.nix
+++ b/pkgs/applications/office/kmymoney/default.nix
@@ -70,5 +70,6 @@ stdenv.mkDerivation rec {
     homepage = https://kmymoney.org/;
     platforms = lib.platforms.linux;
     license = lib.licenses.gpl2Plus;
+    broken = true;
   };
 }
diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix
index 42fddb972c9..dfa08b1924e 100644
--- a/pkgs/applications/office/skrooge/default.nix
+++ b/pkgs/applications/office/skrooge/default.nix
@@ -37,5 +37,6 @@ mkDerivation rec {
     license = with licenses; [ gpl3 ];
     maintainers = with maintainers; [ joko ];
     homepage = https://skrooge.org/;
+    broken = true;
   };
 }
diff --git a/pkgs/applications/science/biology/EZminc/default.nix b/pkgs/applications/science/biology/EZminc/default.nix
index dbcfead6b1e..696162d2dc5 100644
--- a/pkgs/applications/science/biology/EZminc/default.nix
+++ b/pkgs/applications/science/biology/EZminc/default.nix
@@ -26,5 +26,6 @@ stdenv.mkDerivation rec { pname = "EZminc";
     maintainers = with maintainers; [ bcdarwin ];
     platforms = platforms.unix;
     license = licenses.free;
+    broken = true;
   };
 }
diff --git a/pkgs/applications/science/biology/paml/default.nix b/pkgs/applications/science/biology/paml/default.nix
index 161188f7ef1..fe6919656d9 100644
--- a/pkgs/applications/science/biology/paml/default.nix
+++ b/pkgs/applications/science/biology/paml/default.nix
@@ -29,5 +29,6 @@ stdenv.mkDerivation rec {
     longDescription = ''PAML is a package of programs for phylogenetic analyses of DNA or protein sequences using maximum likelihood. It is maintained and distributed for academic use free of charge by Ziheng Yang. ANSI C source codes are distributed for UNIX/Linux/Mac OSX, and executables are provided for MS Windows. PAML is not good for tree making. It may be used to estimate parameters and test hypotheses to study the evolutionary process, when you have reconstructed trees using other programs such as PAUP*, PHYLIP, MOLPHY, PhyML, RaxML, etc.'';
     license     = "non-commercial";
     homepage    = http://abacus.gene.ucl.ac.uk/software/paml.html;
+    broken = true;
   };
 }
diff --git a/pkgs/applications/science/biology/strelka/default.nix b/pkgs/applications/science/biology/strelka/default.nix
index 84c90d89556..c791e8ef89b 100644
--- a/pkgs/applications/science/biology/strelka/default.nix
+++ b/pkgs/applications/science/biology/strelka/default.nix
@@ -33,6 +33,7 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/Illumina/strelka;
     maintainers = with maintainers; [ jbedo ];
     platforms = [ "x86_64-linux" ];
+    broken = true;
   };
 
 }
diff --git a/pkgs/applications/science/chemistry/pymol/default.nix b/pkgs/applications/science/chemistry/pymol/default.nix
index 1fc387fcc66..b1bd01fb2f7 100644
--- a/pkgs/applications/science/chemistry/pymol/default.nix
+++ b/pkgs/applications/science/chemistry/pymol/default.nix
@@ -47,5 +47,6 @@ python3Packages.buildPythonApplication {
     description = description;
     homepage = https://www.pymol.org/;
     license = licenses.psfl;
+    broken = true;
   };
 }
diff --git a/pkgs/applications/science/electronics/kicad/unstable.nix b/pkgs/applications/science/electronics/kicad/unstable.nix
index 7475170d6a7..5310da0699e 100644
--- a/pkgs/applications/science/electronics/kicad/unstable.nix
+++ b/pkgs/applications/science/electronics/kicad/unstable.nix
@@ -52,5 +52,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2;
     maintainers = with maintainers; [ berce ];
     platforms = with platforms; linux;
+    broken = true;
   };
 }
diff --git a/pkgs/applications/science/logic/jonprl/default.nix b/pkgs/applications/science/logic/jonprl/default.nix
index 61ca78d85ed..e503836098f 100644
--- a/pkgs/applications/science/logic/jonprl/default.nix
+++ b/pkgs/applications/science/logic/jonprl/default.nix
@@ -30,5 +30,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.mit;
     maintainers = with stdenv.lib.maintainers; [ puffnfresh ];
     platforms = stdenv.lib.platforms.linux;
+    broken = true;
   };
 }
diff --git a/pkgs/applications/science/logic/lean2/default.nix b/pkgs/applications/science/logic/lean2/default.nix
index 8cc50bb5e29..612c9d6f92a 100644
--- a/pkgs/applications/science/logic/lean2/default.nix
+++ b/pkgs/applications/science/logic/lean2/default.nix
@@ -32,5 +32,6 @@ stdenv.mkDerivation {
     license     = licenses.asl20;
     platforms   = platforms.unix;
     maintainers = with maintainers; [ thoughtpolice gebner ];
+    broken = true;
   };
 }
diff --git a/pkgs/applications/science/logic/monosat/default.nix b/pkgs/applications/science/logic/monosat/default.nix
index 30d47687a3e..fba3bc47906 100644
--- a/pkgs/applications/science/logic/monosat/default.nix
+++ b/pkgs/applications/science/logic/monosat/default.nix
@@ -39,6 +39,7 @@ let
       platforms   = platforms.unix;
       license     = if includeGplCode then licenses.gpl2 else licenses.mit;
       homepage    = https://github.com/sambayless/monosat;
+      broken = true;
     };
   };
 
@@ -64,4 +65,4 @@ let
         --replace '../../../../libmonosat.so'  '${core}/lib/libmonosat.so'
     '';
   };
-in core
\ No newline at end of file
+in core
diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix
index 1863757adbc..f9fea3f3146 100644
--- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix
+++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix
@@ -69,5 +69,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ pxc ];
+    broken = true;
   };
 }
diff --git a/pkgs/applications/video/obs-studio/linuxbrowser.nix b/pkgs/applications/video/obs-studio/linuxbrowser.nix
index 52aa57bf198..4761cd0e50a 100644
--- a/pkgs/applications/video/obs-studio/linuxbrowser.nix
+++ b/pkgs/applications/video/obs-studio/linuxbrowser.nix
@@ -44,5 +44,6 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ puffnfresh ];
     license = licenses.gpl2;
     platforms = with platforms; linux;
+    broken = true;
   };
 }
diff --git a/pkgs/desktops/plasma-5/kdecoration.nix b/pkgs/desktops/plasma-5/kdecoration.nix
index 72bfd1b4bca..3f2e9be462d 100644
--- a/pkgs/desktops/plasma-5/kdecoration.nix
+++ b/pkgs/desktops/plasma-5/kdecoration.nix
@@ -8,4 +8,5 @@ mkDerivation {
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ qtbase ki18n ];
   outputs = [ "out" "dev" ];
+  broken = true;
 }
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix
index 144291da86d..2e8de0f7f6e 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix
@@ -45,5 +45,6 @@ stdenv.mkDerivation rec {
     description = "Global Menu applet for XFCE4";
     license = licenses.lgpl3;
     maintainers = with maintainers; [ jD91mZM2 ];
+    meta.broken = true;
   };
 }
diff --git a/pkgs/desktops/xfce4-14/xfburn/default.nix b/pkgs/desktops/xfce4-14/xfburn/default.nix
index 27fae12981c..dd3a9af1680 100644
--- a/pkgs/desktops/xfce4-14/xfburn/default.nix
+++ b/pkgs/desktops/xfce4-14/xfburn/default.nix
@@ -9,4 +9,5 @@ mkXfceDerivation {
 
   nativeBuildInputs = [ libxslt docbook_xsl ];
   buildInputs = [ exo gtk2 libburn libisofs libxfce4ui ];
+  meta.broken = true;
 }
diff --git a/pkgs/development/interpreters/love/0.9.nix b/pkgs/development/interpreters/love/0.9.nix
index 425239af224..f1571dc726c 100644
--- a/pkgs/development/interpreters/love/0.9.nix
+++ b/pkgs/development/interpreters/love/0.9.nix
@@ -30,5 +30,6 @@ stdenv.mkDerivation rec {
 
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.raskin ];
+    broken = true;
   };
 }
diff --git a/pkgs/development/interpreters/proglodyte-wasm/default.nix b/pkgs/development/interpreters/proglodyte-wasm/default.nix
index 5710f106675..8ebbf6cf501 100644
--- a/pkgs/development/interpreters/proglodyte-wasm/default.nix
+++ b/pkgs/development/interpreters/proglodyte-wasm/default.nix
@@ -55,5 +55,6 @@ stdenv.mkDerivation {
     maintainers = with maintainers; [ proglodyte ];
     platforms = platforms.linux;
     license = licenses.asl20;
+    broken = true;
   };
 }
diff --git a/pkgs/development/libraries/gdata-sharp/default.nix b/pkgs/development/libraries/gdata-sharp/default.nix
index 1a3447f6674..58036351a09 100644
--- a/pkgs/development/libraries/gdata-sharp/default.nix
+++ b/pkgs/development/libraries/gdata-sharp/default.nix
@@ -37,5 +37,6 @@ in stdenv.mkDerivation {
 
     license = licenses.asl20;
     platforms = platforms.linux;
+    broken = true;
   };
 }
diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix
index e161948db40..e01142c12ef 100644
--- a/pkgs/development/libraries/libcef/default.nix
+++ b/pkgs/development/libraries/libcef/default.nix
@@ -39,5 +39,6 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ puffnfresh ];
     license = licenses.bsd3;
     platforms = with platforms; linux;
+    broken = true;
   };
 }
diff --git a/pkgs/development/libraries/libclc/default.nix b/pkgs/development/libraries/libclc/default.nix
index 78f5e9d233c..119adcb4ef2 100644
--- a/pkgs/development/libraries/libclc/default.nix
+++ b/pkgs/development/libraries/libclc/default.nix
@@ -32,5 +32,6 @@ stdenv.mkDerivation {
     description = "Implementation of the library requirements of the OpenCL C programming language";
     license = licenses.mit;
     platforms = platforms.all;
+    broken = true;
   };
 }
diff --git a/pkgs/development/libraries/science/biology/elastix/default.nix b/pkgs/development/libraries/science/biology/elastix/default.nix
index 5f4cbbaa567..9105b1c52ac 100644
--- a/pkgs/development/libraries/science/biology/elastix/default.nix
+++ b/pkgs/development/libraries/science/biology/elastix/default.nix
@@ -19,5 +19,6 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ bcdarwin ];
     platforms = platforms.linux;
     license = licenses.asl20;
+    broken = true;
   };
 }
diff --git a/pkgs/development/libraries/torch/default.nix b/pkgs/development/libraries/torch/default.nix
index ff8c26062d3..b5cb0f76e9f 100644
--- a/pkgs/development/libraries/torch/default.nix
+++ b/pkgs/development/libraries/torch/default.nix
@@ -33,5 +33,6 @@ stdenv.mkDerivation rec{
     license = stdenv.lib.licenses.bsd3 ;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
+    broken = true;
   };
 }
diff --git a/pkgs/development/misc/stm32/betaflight/default.nix b/pkgs/development/misc/stm32/betaflight/default.nix
index bc806410b1e..ee424d18f15 100644
--- a/pkgs/development/misc/stm32/betaflight/default.nix
+++ b/pkgs/development/misc/stm32/betaflight/default.nix
@@ -62,6 +62,7 @@ in stdenv.mkDerivation rec {
     homepage = https://github.com/betaflight/betaflight;
     license = licenses.gpl3;
     maintainers = with maintainers; [ elitak ];
+    broken = true;
   };
 
 }
diff --git a/pkgs/development/misc/stm32/inav/default.nix b/pkgs/development/misc/stm32/inav/default.nix
index 5014cdce8f3..27e96b067b4 100644
--- a/pkgs/development/misc/stm32/inav/default.nix
+++ b/pkgs/development/misc/stm32/inav/default.nix
@@ -54,6 +54,7 @@ in stdenv.mkDerivation rec {
     homepage = https://inavflight.github.io;
     license = licenses.gpl3;
     maintainers = with maintainers; [ elitak ];
+    broken = true;
   };
 
 }
diff --git a/pkgs/development/python-modules/bidict/default.nix b/pkgs/development/python-modules/bidict/default.nix
index a3fd59eea43..e3ceaa0dc9a 100644
--- a/pkgs/development/python-modules/bidict/default.nix
+++ b/pkgs/development/python-modules/bidict/default.nix
@@ -7,11 +7,13 @@
 , pytest-benchmark
 , sortedcollections
 , sortedcontainers
+, isPy3k
 }:
 
 buildPythonPackage rec {
   pname = "bidict";
   version = "0.18.2";
+  disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/django-pipeline/default.nix b/pkgs/development/python-modules/django-pipeline/default.nix
index 58e9d746b97..acb5587186d 100644
--- a/pkgs/development/python-modules/django-pipeline/default.nix
+++ b/pkgs/development/python-modules/django-pipeline/default.nix
@@ -32,5 +32,6 @@ buildPythonPackage rec {
     description = "Pipeline is an asset packaging library for Django";
     homepage = https://github.com/cyberdelia/django-pipeline;
     license = licenses.mit;
+    broken = true;
   };
 }
diff --git a/pkgs/development/python-modules/django_evolution/default.nix b/pkgs/development/python-modules/django_evolution/default.nix
index 45447b70ae6..ea02467764d 100644
--- a/pkgs/development/python-modules/django_evolution/default.nix
+++ b/pkgs/development/python-modules/django_evolution/default.nix
@@ -21,6 +21,7 @@ buildPythonPackage rec {
     description = "A database schema evolution tool for the Django web framework";
     homepage = http://code.google.com/p/django-evolution/;
     license = licenses.bsd0;
+    broken = true;
   };
 
 }
diff --git a/pkgs/development/python-modules/django_taggit/default.nix b/pkgs/development/python-modules/django_taggit/default.nix
index b454fc32108..6ca498ce5e9 100644
--- a/pkgs/development/python-modules/django_taggit/default.nix
+++ b/pkgs/development/python-modules/django_taggit/default.nix
@@ -6,12 +6,13 @@
 , django
 , mock
 , isort
+, isPy3k
 }:
 
 buildPythonPackage rec {
   pname = "django-taggit";
   version = "1.1.0";
-  disabled = pythonOlder "2.7";
+  disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/exchangelib/default.nix b/pkgs/development/python-modules/exchangelib/default.nix
index d6f533a58bf..ed2a7d69da8 100644
--- a/pkgs/development/python-modules/exchangelib/default.nix
+++ b/pkgs/development/python-modules/exchangelib/default.nix
@@ -28,5 +28,6 @@ buildPythonPackage rec {
     homepage    = "https://github.com/ecederstrand/exchangelib";
     license     = licenses.bsd2;
     maintainers = with maintainers; [ catern ];
+    broken = true;
   };
 }
diff --git a/pkgs/development/python-modules/filterpy/default.nix b/pkgs/development/python-modules/filterpy/default.nix
index 47f2c083d8a..076a3a72b89 100644
--- a/pkgs/development/python-modules/filterpy/default.nix
+++ b/pkgs/development/python-modules/filterpy/default.nix
@@ -5,11 +5,13 @@
 , scipy
 , matplotlib
 , pytest
+, isPy3k
 }:
 
 buildPythonPackage rec {
   version = "1.4.5";
   pname = "filterpy";
+  disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix
index a717a0ef6e8..18815cfe64b 100644
--- a/pkgs/development/python-modules/gensim/default.nix
+++ b/pkgs/development/python-modules/gensim/default.nix
@@ -6,11 +6,13 @@
 , scipy
 , smart_open
 , scikitlearn, testfixtures, unittest2
+, isPy3k
 }:
 
 buildPythonPackage rec {
   pname = "gensim";
   version = "3.8.0";
+  disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/geopy/default.nix b/pkgs/development/python-modules/geopy/default.nix
index 9dbfeb7472c..3a9e8b86c91 100644
--- a/pkgs/development/python-modules/geopy/default.nix
+++ b/pkgs/development/python-modules/geopy/default.nix
@@ -25,6 +25,7 @@ buildPythonPackage rec {
     homepage = "https://github.com/geopy/geopy";
     description = "Python Geocoding Toolbox";
     license = licenses.mit;
+    broken = true;
   };
 
 }
diff --git a/pkgs/development/python-modules/jenkinsapi/default.nix b/pkgs/development/python-modules/jenkinsapi/default.nix
index edfeb0a5971..1222b07fc99 100644
--- a/pkgs/development/python-modules/jenkinsapi/default.nix
+++ b/pkgs/development/python-modules/jenkinsapi/default.nix
@@ -26,6 +26,7 @@ buildPythonPackage rec {
     homepage = https://github.com/salimfadhley/jenkinsapi;
     maintainers = with maintainers; [ drets ];
     license = licenses.mit;
+    broken = true;
   };
 
 }
diff --git a/pkgs/development/python-modules/maildir-deduplicate/default.nix b/pkgs/development/python-modules/maildir-deduplicate/default.nix
index 1a16e253f29..33728ef4113 100644
--- a/pkgs/development/python-modules/maildir-deduplicate/default.nix
+++ b/pkgs/development/python-modules/maildir-deduplicate/default.nix
@@ -21,6 +21,7 @@ buildPythonPackage rec {
     description = "Command-line tool to deduplicate mails from a set of maildir folders";
     homepage = "https://github.com/kdeldycke/maildir-deduplicate";
     license = licenses.gpl2;
+    broken = true;
   };
 
 }
diff --git a/pkgs/development/python-modules/minidb/default.nix b/pkgs/development/python-modules/minidb/default.nix
index bf66a886f76..3a65ef1028a 100644
--- a/pkgs/development/python-modules/minidb/default.nix
+++ b/pkgs/development/python-modules/minidb/default.nix
@@ -6,6 +6,7 @@
 buildPythonPackage rec {
   pname = "minidb";
   version = "2.0.2";
+  disabled = !isPy3k;
 
   src = fetchFromGitHub {
     owner = "thp";
diff --git a/pkgs/development/python-modules/openrazer/daemon.nix b/pkgs/development/python-modules/openrazer/daemon.nix
index dd54851ea81..fb7b48e2266 100644
--- a/pkgs/development/python-modules/openrazer/daemon.nix
+++ b/pkgs/development/python-modules/openrazer/daemon.nix
@@ -20,10 +20,10 @@ in
 buildPythonApplication (common // rec {
   pname = "openrazer_daemon";
 
-  sourceRoot = "source/daemon";
-
   disabled = !isPy3k;
 
+  sourceRoot = "source/daemon";
+
   outputs = [ "out" "man" ];
 
   nativeBuildInputs = [ makeWrapper wrapGAppsHook ];
diff --git a/pkgs/development/python-modules/paperspace/default.nix b/pkgs/development/python-modules/paperspace/default.nix
index 6f73004deeb..e3427add427 100644
--- a/pkgs/development/python-modules/paperspace/default.nix
+++ b/pkgs/development/python-modules/paperspace/default.nix
@@ -22,5 +22,6 @@ buildPythonPackage rec {
     license     = licenses.isc;
     platforms   = platforms.unix;
     maintainers = with maintainers; [ thoughtpolice ];
+    broken = true;
   };
 }
diff --git a/pkgs/development/python-modules/pgsanity/default.nix b/pkgs/development/python-modules/pgsanity/default.nix
index 85db917cef8..c6fa96bccf7 100644
--- a/pkgs/development/python-modules/pgsanity/default.nix
+++ b/pkgs/development/python-modules/pgsanity/default.nix
@@ -31,5 +31,6 @@ buildPythonPackage rec {
     '';
     license = stdenv.lib.licenses.mit;
     maintainers = with maintainers; [ nalbyuites ];
+    broken = true;
   };
 }
diff --git a/pkgs/development/python-modules/piccata/default.nix b/pkgs/development/python-modules/piccata/default.nix
index bd00b2f6d55..f1cfb362a80 100644
--- a/pkgs/development/python-modules/piccata/default.nix
+++ b/pkgs/development/python-modules/piccata/default.nix
@@ -1,8 +1,9 @@
-{ buildPythonPackage, fetchPypi, lib, ipaddress }:
+{ buildPythonPackage, fetchPypi, lib, ipaddress, isPy3k }:
 
 buildPythonPackage rec {
   pname = "piccata";
   version = "1.0.1";
+  disabled = isPy3k;
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix
index a9054b2ed85..3358c27a29a 100644
--- a/pkgs/development/python-modules/pip-tools/default.nix
+++ b/pkgs/development/python-modules/pip-tools/default.nix
@@ -50,5 +50,6 @@ buildPythonPackage rec {
     homepage = https://github.com/jazzband/pip-tools/;
     license = licenses.bsd3;
     maintainers = with maintainers; [ zimbatm ];
+    broken = true;
   };
 }
diff --git a/pkgs/development/python-modules/poetry/default.nix b/pkgs/development/python-modules/poetry/default.nix
index 52be2c3bafc..62b7f97695e 100644
--- a/pkgs/development/python-modules/poetry/default.nix
+++ b/pkgs/development/python-modules/poetry/default.nix
@@ -87,5 +87,6 @@ in buildPythonPackage rec {
     description = "Python dependency management and packaging made easy";
     license = licenses.mit;
     maintainers = with maintainers; [ jakewaksbaum ];
+    broken = true;
   };
 }
diff --git a/pkgs/development/python-modules/ptpython/default.nix b/pkgs/development/python-modules/ptpython/default.nix
index d48e42ef264..cf722e90ab3 100644
--- a/pkgs/development/python-modules/ptpython/default.nix
+++ b/pkgs/development/python-modules/ptpython/default.nix
@@ -1,8 +1,9 @@
-{ stdenv, buildPythonPackage, fetchPypi, prompt_toolkit, docopt , jedi, pygments }:
+{ stdenv, buildPythonPackage, fetchPypi, prompt_toolkit, docopt , jedi, pygments, isPy3k }:
 
 buildPythonPackage rec {
   pname = "ptpython";
   version = "2.0.4";
+  disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/py3exiv2/default.nix b/pkgs/development/python-modules/py3exiv2/default.nix
index d3ed2659f6a..fe0827c4f8f 100644
--- a/pkgs/development/python-modules/py3exiv2/default.nix
+++ b/pkgs/development/python-modules/py3exiv2/default.nix
@@ -29,5 +29,6 @@ buildPythonPackage rec {
     license = with stdenv.lib.licenses; [ gpl3 ];
     maintainers = with stdenv.lib.maintainers; [ vinymeuh ];
     platforms = with stdenv.lib.platforms; linux ++ darwin;
+    broken = true;
   };
 }
diff --git a/pkgs/development/python-modules/pybfd/default.nix b/pkgs/development/python-modules/pybfd/default.nix
index f9737b93583..29ae5ed3c5c 100644
--- a/pkgs/development/python-modules/pybfd/default.nix
+++ b/pkgs/development/python-modules/pybfd/default.nix
@@ -24,5 +24,6 @@ buildPythonPackage {
     license = lib.licenses.gpl2;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ orivej ];
+    broken = true;
   };
 }
diff --git a/pkgs/development/python-modules/pyezminc/default.nix b/pkgs/development/python-modules/pyezminc/default.nix
index 614a1555cbe..2aad1906be2 100644
--- a/pkgs/development/python-modules/pyezminc/default.nix
+++ b/pkgs/development/python-modules/pyezminc/default.nix
@@ -29,5 +29,6 @@ buildPythonPackage rec {
     description = "Python API for libminc using EZMINC";
     license = stdenv.lib.licenses.gpl2;
     maintainers = with stdenv.lib.maintainers; [ bcdarwin ];
+    broken = true;
   };
 }
diff --git a/pkgs/development/python-modules/pygbm/default.nix b/pkgs/development/python-modules/pygbm/default.nix
index 6e4c70aaaf1..702dbf70ee9 100644
--- a/pkgs/development/python-modules/pygbm/default.nix
+++ b/pkgs/development/python-modules/pygbm/default.nix
@@ -42,5 +42,6 @@ buildPythonPackage rec {
     homepage = https://github.com/ogrisel/pygbm;
     license = licenses.mit;
     maintainers = [ maintainers.costrouc ];
+    broken = true;
   };
 }
diff --git a/pkgs/development/python-modules/pykickstart/default.nix b/pkgs/development/python-modules/pykickstart/default.nix
index 27827270fa1..6461f0391ca 100644
--- a/pkgs/development/python-modules/pykickstart/default.nix
+++ b/pkgs/development/python-modules/pykickstart/default.nix
@@ -3,12 +3,14 @@
 , fetchurl
 , urlgrabber
 , python
+, isPy3k
 }:
 
 buildPythonPackage rec {
   pname = "pykickstart";
   version = "1.99.39";
   md5_path = "d249f60aa89b1b4facd63f776925116d";
+  disabled = isPy3k;
 
   src = fetchurl {
     url = "https://src.fedoraproject.org/repo/pkgs/pykickstart/"
diff --git a/pkgs/development/python-modules/pyro-ppl/default.nix b/pkgs/development/python-modules/pyro-ppl/default.nix
index f70f10da41a..5211b1377ac 100644
--- a/pkgs/development/python-modules/pyro-ppl/default.nix
+++ b/pkgs/development/python-modules/pyro-ppl/default.nix
@@ -34,5 +34,6 @@ buildPythonPackage rec {
     homepage = http://pyro.ai;
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ teh ];
+    broken = true;
   };
 }
diff --git a/pkgs/development/python-modules/pysvn/default.nix b/pkgs/development/python-modules/pysvn/default.nix
index 2dcb7908522..c1c765f1adc 100644
--- a/pkgs/development/python-modules/pysvn/default.nix
+++ b/pkgs/development/python-modules/pysvn/default.nix
@@ -53,6 +53,7 @@ buildPythonPackage rec {
     description = "Python bindings for Subversion";
     homepage = http://pysvn.tigris.org/;
     license = licenses.asl20;
+    broken = true;
   };
 
 }
diff --git a/pkgs/development/python-modules/pythonnet/default.nix b/pkgs/development/python-modules/pythonnet/default.nix
index 98f714c8d53..9bcbaf3e6f7 100644
--- a/pkgs/development/python-modules/pythonnet/default.nix
+++ b/pkgs/development/python-modules/pythonnet/default.nix
@@ -80,5 +80,6 @@ buildPythonPackage rec {
     homepage = https://pythonnet.github.io;
     license = licenses.mit;
     maintainers = with maintainers; [ jraygauthier ];
+    broken = true;
   };
 }
diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix
index 17bf6f5cdab..92afa80852a 100644
--- a/pkgs/development/python-modules/pytorch/default.nix
+++ b/pkgs/development/python-modules/pytorch/default.nix
@@ -2,7 +2,7 @@
   cudaSupport ? false, cudatoolkit ? null, cudnn ? null,
   fetchFromGitHub, lib, numpy, pyyaml, cffi, typing, cmake, hypothesis, numactl,
   linkFarm, symlinkJoin,
-  utillinux, which }:
+  utillinux, which, isPy3k }:
 
 assert cudnn == null || cudatoolkit != null;
 assert !cudaSupport || cudatoolkit != null;
@@ -27,6 +27,7 @@ let
 in buildPythonPackage rec {
   version = "1.0.0";
   pname = "pytorch";
+  disabled = !isPy3k;
 
   src = fetchFromGitHub {
     owner  = "pytorch";
diff --git a/pkgs/development/python-modules/qscintilla-qt5/default.nix b/pkgs/development/python-modules/qscintilla-qt5/default.nix
index 06475c09ca8..963ee82feda 100644
--- a/pkgs/development/python-modules/qscintilla-qt5/default.nix
+++ b/pkgs/development/python-modules/qscintilla-qt5/default.nix
@@ -45,5 +45,6 @@ buildPythonPackage {
     license = licenses.lgpl21Plus;
     maintainers = with maintainers; [ lsix ];
     homepage = https://www.riverbankcomputing.com/software/qscintilla/;
+    broken = true;
   };
 }
diff --git a/pkgs/development/python-modules/qutip/default.nix b/pkgs/development/python-modules/qutip/default.nix
index 13c24312ed0..2f609651c8e 100644
--- a/pkgs/development/python-modules/qutip/default.nix
+++ b/pkgs/development/python-modules/qutip/default.nix
@@ -39,6 +39,7 @@ buildPythonPackage rec {
     '';
     homepage = http://qutip.org/;
     license = licenses.bsd0;
+    broken = true;
   };
 
 }
diff --git a/pkgs/development/python-modules/rubymarshal/default.nix b/pkgs/development/python-modules/rubymarshal/default.nix
index ac7ba00c586..f3784342281 100644
--- a/pkgs/development/python-modules/rubymarshal/default.nix
+++ b/pkgs/development/python-modules/rubymarshal/default.nix
@@ -1,8 +1,9 @@
-{ stdenv, buildPythonPackage, fetchPypi, hypothesis }:
+{ stdenv, buildPythonPackage, fetchPypi, hypothesis, isPy3k }:
 
 buildPythonPackage rec {
   pname = "rubymarshal";
   version = "1.2.6";
+  disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/snug/default.nix b/pkgs/development/python-modules/snug/default.nix
index 0b3adbe15d9..a697ed0161a 100644
--- a/pkgs/development/python-modules/snug/default.nix
+++ b/pkgs/development/python-modules/snug/default.nix
@@ -1,11 +1,13 @@
 { buildPythonPackage, lib, fetchFromGitHub, glibcLocales
 , pytest, pytest-mock, gentools
 , typing, singledispatch, pythonOlder
+, isPy3k
 }:
 
 buildPythonPackage rec {
   pname = "snug";
   version = "1.3.4";
+  disabled = isPy3k;
 
   # Pypi doesn't ship the tests, so we fetch directly from GitHub
   src = fetchFromGitHub {
diff --git a/pkgs/development/python-modules/sparse/default.nix b/pkgs/development/python-modules/sparse/default.nix
index 168c491f7ef..bbbcb2e0690 100644
--- a/pkgs/development/python-modules/sparse/default.nix
+++ b/pkgs/development/python-modules/sparse/default.nix
@@ -35,5 +35,6 @@ buildPythonPackage rec {
     homepage = https://github.com/pydata/sparse/;
     license = licenses.bsd3;
     maintainers = [ maintainers.costrouc ];
+    broken = true;
   };
 }
diff --git a/pkgs/development/python-modules/spectral-cube/default.nix b/pkgs/development/python-modules/spectral-cube/default.nix
index c28b249d192..e12f00cf7a7 100644
--- a/pkgs/development/python-modules/spectral-cube/default.nix
+++ b/pkgs/development/python-modules/spectral-cube/default.nix
@@ -40,6 +40,7 @@ buildPythonPackage rec {
     license = lib.licenses.bsd3;
     platforms = lib.platforms.all;
     maintainers = with lib.maintainers; [ smaret ];
+    broken = true;
   };
 }
 
diff --git a/pkgs/development/python-modules/ssdp/default.nix b/pkgs/development/python-modules/ssdp/default.nix
index 5ade47587d1..547bddbd84d 100644
--- a/pkgs/development/python-modules/ssdp/default.nix
+++ b/pkgs/development/python-modules/ssdp/default.nix
@@ -4,11 +4,13 @@
 , isPy27
 , pbr
 , pytest
+, isPy3k
 }:
 
 buildPythonPackage rec {
   pname = "ssdp";
   version = "1.0.1";
+  disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/swagger-spec-validator/default.nix b/pkgs/development/python-modules/swagger-spec-validator/default.nix
index dc4b99c40a7..3c83aa643f5 100644
--- a/pkgs/development/python-modules/swagger-spec-validator/default.nix
+++ b/pkgs/development/python-modules/swagger-spec-validator/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchFromGitHub, pyyaml, jsonschema, six, pytest, mock }:
+{ lib, buildPythonPackage, fetchFromGitHub, pyyaml, jsonschema, six, pytest, mock, isPy3k }:
 
 buildPythonPackage rec {
   pname = "swagger-spec-validator";
diff --git a/pkgs/development/python-modules/symengine/default.nix b/pkgs/development/python-modules/symengine/default.nix
index a2c0578f0c7..68664d0d0fd 100644
--- a/pkgs/development/python-modules/symengine/default.nix
+++ b/pkgs/development/python-modules/symengine/default.nix
@@ -48,5 +48,6 @@ buildPythonPackage rec {
     homepage = https://github.com/symengine/symengine.py;
     license = licenses.mit;
     maintainers = [ maintainers.costrouc ];
+    broken = true;
   };
 }
diff --git a/pkgs/development/python-modules/vmprof/default.nix b/pkgs/development/python-modules/vmprof/default.nix
index 25cd5b9a90d..4d80bb3da68 100644
--- a/pkgs/development/python-modules/vmprof/default.nix
+++ b/pkgs/development/python-modules/vmprof/default.nix
@@ -23,6 +23,7 @@ buildPythonPackage rec {
     description = "A vmprof client";
     license = licenses.mit;
     homepage = https://vmprof.readthedocs.org/;
+    broken = true;
   };
 
 }
diff --git a/pkgs/development/python-modules/word2vec/default.nix b/pkgs/development/python-modules/word2vec/default.nix
index d61567f9224..36b4b71e052 100644
--- a/pkgs/development/python-modules/word2vec/default.nix
+++ b/pkgs/development/python-modules/word2vec/default.nix
@@ -27,6 +27,7 @@ buildPythonPackage rec {
     homepage = "https://github.com/danielfrg/word2vec";
     license     = licenses.asl20;
     maintainers = with maintainers; [ NikolaMandic ];
+    broken = true;
   };
 
 }
diff --git a/pkgs/development/python-modules/yt/default.nix b/pkgs/development/python-modules/yt/default.nix
index 845fba749d6..f2d7e62eca3 100644
--- a/pkgs/development/python-modules/yt/default.nix
+++ b/pkgs/development/python-modules/yt/default.nix
@@ -10,11 +10,13 @@
 , nose
 , cython
 , python
+, isPy3k
 }:
 
 buildPythonPackage rec {
   pname = "yt";
   version = "3.5.1";
+  disabled = isPy3k;
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/zake/default.nix b/pkgs/development/python-modules/zake/default.nix
index 56fdbe45553..8eafaafadf5 100644
--- a/pkgs/development/python-modules/zake/default.nix
+++ b/pkgs/development/python-modules/zake/default.nix
@@ -30,6 +30,7 @@ buildPythonPackage rec {
     homepage = "https://github.com/yahoo/Zake";
     description = "A python package that works to provide a nice set of testing utilities for the kazoo library";
     license = licenses.asl20;
+    broken = true;
   };
 
 }
diff --git a/pkgs/development/python-modules/zope_contenttype/default.nix b/pkgs/development/python-modules/zope_contenttype/default.nix
index 9dac64907be..fc28a740d62 100644
--- a/pkgs/development/python-modules/zope_contenttype/default.nix
+++ b/pkgs/development/python-modules/zope_contenttype/default.nix
@@ -17,6 +17,7 @@ buildPythonPackage rec {
     description = "A utility module for content-type (MIME type) handling";
     license = licenses.zpl20;
     maintainers = with maintainers; [ goibhniu ];
+    broken = true;
   };
 
 }
diff --git a/pkgs/development/python-modules/zope_i18n/default.nix b/pkgs/development/python-modules/zope_i18n/default.nix
index aad822bca59..3fb967099c2 100644
--- a/pkgs/development/python-modules/zope_i18n/default.nix
+++ b/pkgs/development/python-modules/zope_i18n/default.nix
@@ -21,6 +21,7 @@ buildPythonPackage rec {
     description = "Zope Internationalization Support";
     license = licenses.zpl20;
     maintainers = with maintainers; [ goibhniu ];
+    broken = true;
   };
 
 }
diff --git a/pkgs/development/tools/fedpkg/default.nix b/pkgs/development/tools/fedpkg/default.nix
index 5548b20de83..f257ae8adbf 100644
--- a/pkgs/development/tools/fedpkg/default.nix
+++ b/pkgs/development/tools/fedpkg/default.nix
@@ -31,5 +31,6 @@ in buildPythonApplication rec {
     homepage = https://pagure.io/fedpkg;
     license = licenses.gpl2;
     maintainers = with maintainers; [ ];
+    broken = true;
   };
 }
diff --git a/pkgs/development/tools/vogl/default.nix b/pkgs/development/tools/vogl/default.nix
index e6dccbd332e..266024d323d 100644
--- a/pkgs/development/tools/vogl/default.nix
+++ b/pkgs/development/tools/vogl/default.nix
@@ -52,5 +52,6 @@ mkDerivation {
     license = licenses.mit;
     maintainers = [ maintainers.deepfire ];
     platforms = [ "x86_64-linux" "i686-linux" ];
+    broken = true;
   };
 }
diff --git a/pkgs/games/liquidwar/5.nix b/pkgs/games/liquidwar/5.nix
index a4bd39f9998..5c42b8ecaab 100644
--- a/pkgs/games/liquidwar/5.nix
+++ b/pkgs/games/liquidwar/5.nix
@@ -20,5 +20,6 @@ stdenv.mkDerivation rec {
     maintainers = [ maintainers.raskin ];
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
+    broken = true;
   };
 }
diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix
index d8ab792bb62..1004a6ad26f 100644
--- a/pkgs/games/simutrans/default.nix
+++ b/pkgs/games/simutrans/default.nix
@@ -164,6 +164,7 @@ let
       license = with licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ kkallio vcunat phile314 ];
       platforms = with platforms; linux; # TODO: ++ darwin;
+      broken = true;
     };
   };
 
diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix
index 9bfd917d1aa..e98148cbc83 100644
--- a/pkgs/games/spring/default.nix
+++ b/pkgs/games/spring/default.nix
@@ -50,5 +50,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2;
     maintainers = [ maintainers.phreedom maintainers.qknight maintainers.domenkozar ];
     platforms = platforms.linux;
+    broken = true;
   };
 }
diff --git a/pkgs/misc/drivers/utsushi/default.nix b/pkgs/misc/drivers/utsushi/default.nix
index 328e8ce4562..5972773d1ad 100644
--- a/pkgs/misc/drivers/utsushi/default.nix
+++ b/pkgs/misc/drivers/utsushi/default.nix
@@ -150,5 +150,6 @@ stdenv.mkDerivation rec {
         - XP-960 Series
       '';
       license = stdenv.lib.licenses.gpl3Plus;
+      broken = true;
   };
 }
diff --git a/pkgs/misc/emulators/qmc2/default.nix b/pkgs/misc/emulators/qmc2/default.nix
index ca8d87b3800..660eba5fd03 100644
--- a/pkgs/misc/emulators/qmc2/default.nix
+++ b/pkgs/misc/emulators/qmc2/default.nix
@@ -36,5 +36,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2;
     maintainers = [ maintainers.genesis ];
     platforms = platforms.linux;
+    broken = true;
   };
 }
diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix
index fbde2ff54c9..e55cefdd320 100644
--- a/pkgs/misc/emulators/retroarch/cores.nix
+++ b/pkgs/misc/emulators/retroarch/cores.nix
@@ -7,7 +7,7 @@ let
 
   d2u = stdenv.lib.replaceChars ["-"] ["_"];
 
-  mkLibRetroCore = ({ core, src, description, license, ... }@a:
+  mkLibRetroCore = ({ core, src, description, license, broken ? false, ... }@a:
   stdenv.lib.makeOverridable stdenv.mkDerivation rec {
 
     name = "libretro-${core}-${version}";
@@ -38,6 +38,7 @@ let
       inherit description;
       homepage = https://www.libretro.com/;
       inherit license;
+      inherit broken;
       maintainers = with maintainers; [ edwtjo hrdinka MP2E ];
       platforms = platforms.unix;
     };
@@ -145,6 +146,7 @@ in with stdenv.lib.licenses;
     };
     description = "Port of Dolphin to libretro";
     license = gpl2Plus;
+    broken = true;
 
     extraBuildInputs = [
       cmake curl libGLU_combined pcre pkgconfig sfml miniupnpc
diff --git a/pkgs/misc/logging/beats/6.x.nix b/pkgs/misc/logging/beats/6.x.nix
index fe1f655246e..a0a29f95aba 100644
--- a/pkgs/misc/logging/beats/6.x.nix
+++ b/pkgs/misc/logging/beats/6.x.nix
@@ -28,6 +28,7 @@ in {
   metricbeat6 = beat "metricbeat" {meta.description = "Lightweight shipper for metrics";};
   packetbeat6 = beat "packetbeat" {
     buildInputs = [ libpcap ];
+    meta.broken = true;
     meta.description = "Network packet analyzer that ships data to Elasticsearch";
     meta.longDescription = ''
       Packetbeat is an open source network packet analyzer that ships the
diff --git a/pkgs/servers/http/tengine/default.nix b/pkgs/servers/http/tengine/default.nix
index a7ea61de042..fac90fd0df6 100644
--- a/pkgs/servers/http/tengine/default.nix
+++ b/pkgs/servers/http/tengine/default.nix
@@ -102,5 +102,6 @@ stdenv.mkDerivation rec {
     license     = licenses.bsd2;
     platforms   = platforms.all;
     maintainers = with maintainers; [ izorkin ];
+    broken = true;
   };
 }
diff --git a/pkgs/servers/scylladb/default.nix b/pkgs/servers/scylladb/default.nix
index f48ace22f8f..dfbb8fd4b88 100644
--- a/pkgs/servers/scylladb/default.nix
+++ b/pkgs/servers/scylladb/default.nix
@@ -92,5 +92,6 @@ gcc8Stdenv.mkDerivation {
     license = licenses.agpl3;
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.farlion ];
+    broken = true;
   };
 }
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 7e081b664b3..10cbca832b4 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -368,6 +368,8 @@ self: super:
   xf86videoglide   = super.xf86videoglide.overrideAttrs   (attrs: { meta = attrs.meta // { broken = true; }; });
   xf86videoi128    = super.xf86videoi128.overrideAttrs    (attrs: { meta = attrs.meta // { broken = true; }; });
   xf86videonewport = super.xf86videonewport.overrideAttrs (attrs: { meta = attrs.meta // { broken = true; }; });
+  xf86videos3virge = super.xf86videos3virge.overrideAttrs (attrs: { meta = attrs.meta // { broken = true; }; });
+  xf86videosavage  = super.xf86videosavage.overrideAttrs  (attrs: { meta = attrs.meta // { broken = true; }; });
   xf86videotga     = super.xf86videotga.overrideAttrs     (attrs: { meta = attrs.meta // { broken = true; }; });
   xf86videov4l     = super.xf86videov4l.overrideAttrs     (attrs: { meta = attrs.meta // { broken = true; }; });
   xf86videovoodoo  = super.xf86videovoodoo.overrideAttrs  (attrs: { meta = attrs.meta // { broken = true; }; });
diff --git a/pkgs/tools/X11/winswitch/default.nix b/pkgs/tools/X11/winswitch/default.nix
index e8b2be4b783..404cef72a3e 100644
--- a/pkgs/tools/X11/winswitch/default.nix
+++ b/pkgs/tools/X11/winswitch/default.nix
@@ -38,6 +38,7 @@ let
     doCheck = false;
 
     meta.platforms = stdenv.lib.platforms.linux;
+    meta.broken = true;
   };
 in stdenv.lib.overrideDerivation base (b: {
   postFixup = b.postFixup + ''
diff --git a/pkgs/tools/backup/wal-g/default.nix b/pkgs/tools/backup/wal-g/default.nix
index 70cc8a425c1..c6c47ce4f16 100644
--- a/pkgs/tools/backup/wal-g/default.nix
+++ b/pkgs/tools/backup/wal-g/default.nix
@@ -21,5 +21,6 @@ buildGoPackage rec {
     license = stdenv.lib.licenses.asl20;
     description = "An archival restoration tool for Postgres";
     maintainers = [ stdenv.lib.maintainers.ocharles ];
+    broken = true;
   };
 }
diff --git a/pkgs/tools/filesystems/irods/default.nix b/pkgs/tools/filesystems/irods/default.nix
index 14790ae7087..56fc2e40ba2 100644
--- a/pkgs/tools/filesystems/irods/default.nix
+++ b/pkgs/tools/filesystems/irods/default.nix
@@ -87,6 +87,7 @@ in rec {
        description = common.meta.description + " CLI clients";
        longDescription = common.meta.longDescription + ''
          This package provides the CLI clients, called 'icommands'.'';
+       broken = true;
      };
   });
 }
diff --git a/pkgs/tools/filesystems/nixpart/0.4/default.nix b/pkgs/tools/filesystems/nixpart/0.4/default.nix
index 129283e83eb..b293b6d8146 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/default.nix
+++ b/pkgs/tools/filesystems/nixpart/0.4/default.nix
@@ -73,5 +73,6 @@ in buildPythonApplication rec {
     license = licenses.gpl2Plus;
     maintainers = [ maintainers.aszlig ];
     platforms = platforms.linux;
+    broken = true;
   };
 }
diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix
index b530193258c..b516a6c268d 100644
--- a/pkgs/tools/misc/svtplay-dl/default.nix
+++ b/pkgs/tools/misc/svtplay-dl/default.nix
@@ -44,5 +44,6 @@ in stdenv.mkDerivation rec {
     license = licenses.mit;
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ maintainers.rycee ];
+    broken = true;
   };
 }
diff --git a/pkgs/tools/networking/http-prompt/default.nix b/pkgs/tools/networking/http-prompt/default.nix
index bcaca9ef0ce..049fb7a1a6e 100644
--- a/pkgs/tools/networking/http-prompt/default.nix
+++ b/pkgs/tools/networking/http-prompt/default.nix
@@ -30,5 +30,6 @@ pythonPackages.buildPythonApplication rec {
     license = licenses.mit;
     maintainers = with maintainers; [ matthiasbeyer ];
     platforms = platforms.linux ++ platforms.darwin;
+    broken = true;
   };
 }
diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
index a5305acdf59..e8a4261ed12 100644
--- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
+++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
@@ -90,5 +90,6 @@ pythonPackages.buildPythonApplication rec {
     license = [ lib.licenses.gpl2Plus /* or */ "TGPPLv1+" ];
     maintainers = with lib.maintainers; [ MostAwesomeDude ];
     platforms = lib.platforms.gnu ++ lib.platforms.linux;
+    broken = true;
   };
 }
diff --git a/pkgs/tools/networking/unbound/python.nix b/pkgs/tools/networking/unbound/python.nix
index fdd110e14b3..c1186204104 100644
--- a/pkgs/tools/networking/unbound/python.nix
+++ b/pkgs/tools/networking/unbound/python.nix
@@ -60,5 +60,6 @@ in stdenv.mkDerivation rec {
     homepage = http://www.unbound.net;
     maintainers = with maintainers; [ leenaars ];
     platforms = stdenv.lib.platforms.unix;
+    broken = true;
   };
 }
diff --git a/pkgs/tools/security/mbox/default.nix b/pkgs/tools/security/mbox/default.nix
index 24a7ea51a82..1ef282b8b6e 100644
--- a/pkgs/tools/security/mbox/default.nix
+++ b/pkgs/tools/security/mbox/default.nix
@@ -33,6 +33,7 @@ stdenv.mkDerivation {
       maintainers = with maintainers; [ ehmry ];
       license = licenses.bsd3;
       platforms = [ "x86_64-linux" ];
+      broken = true;
     };
 
 }
diff --git a/pkgs/tools/security/meo/default.nix b/pkgs/tools/security/meo/default.nix
index 308b94231e7..19f51775ff2 100644
--- a/pkgs/tools/security/meo/default.nix
+++ b/pkgs/tools/security/meo/default.nix
@@ -30,5 +30,6 @@ stdenv.mkDerivation {
     license = stdenv.lib.licenses.agpl3Plus;
     maintainers = with stdenv.lib.maintainers; [viric];
     platforms = with stdenv.lib.platforms; linux;
+    broken = true;
   };
 }
diff --git a/pkgs/tools/security/sequoia/default.nix b/pkgs/tools/security/sequoia/default.nix
index 9d6928abf86..554ed93f093 100644
--- a/pkgs/tools/security/sequoia/default.nix
+++ b/pkgs/tools/security/sequoia/default.nix
@@ -87,5 +87,6 @@ rustPlatform.buildRustPackage rec {
     license = licenses.gpl3;
     maintainers = with maintainers; [ minijackson doronbehar ];
     platforms = platforms.all;
+    broken = true;
   };
 }
diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index f06b4f1c286..35cbcebb242 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -527,6 +527,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
       license = stdenv.lib.licenses.asl20;
       maintainers = with stdenv.lib.maintainers; [ obadz ];
       platforms = with stdenv.lib.platforms; linux;
+      broken = true;
     };
   };
 
-- 
GitLab


From a3a441cd870e29ec63b41b3fbedb9ccd9c81a69a Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Tue, 8 Oct 2019 17:09:05 +0200
Subject: [PATCH 2214/2254] nixos/tests/{ferm,networking}: fix eval with
 networkd

The networking.virtual test does not work with networkd yet, for
multiple reasons:

- network-online.target is not reached, because tun0 and tap0 are
  considered as required for online but _not_ brought up or assigned
  the configured addresses
- the commands later in the test rely on some units from the scripted
  network setup

cc @fpletz networkd exper
cc @globin we looked at this together
---
 nixos/tests/ferm.nix       | 1 +
 nixos/tests/networking.nix | 1 +
 2 files changed, 2 insertions(+)

diff --git a/nixos/tests/ferm.nix b/nixos/tests/ferm.nix
index 14c1cd44f5c..edf9c8036ac 100644
--- a/nixos/tests/ferm.nix
+++ b/nixos/tests/ferm.nix
@@ -23,6 +23,7 @@ import ./make-test.nix ({ pkgs, ...} : {
           networking = {
             dhcpcd.enable = false;
             useNetworkd = true;
+            useDHCP = false;
             interfaces.eth1.ipv6.addresses = mkOverride 0 [ { address = "fd00::1"; prefixLength = 64; } ];
             interfaces.eth1.ipv4.addresses = mkOverride 0 [ { address = "192.168.1.1"; prefixLength = 24; } ];
           };
diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix
index f12a5fc9ae5..e0585d8f1bb 100644
--- a/nixos/tests/networking.nix
+++ b/nixos/tests/networking.nix
@@ -450,6 +450,7 @@ let
       name = "Virtual";
       machine = {
         networking.useNetworkd = networkd;
+        networking.useDHCP = false;
         networking.interfaces.tap0 = {
           ipv4.addresses = [ { address = "192.168.1.1"; prefixLength = 24; } ];
           ipv6.addresses = [ { address = "2001:1470:fffd:2096::"; prefixLength = 64; } ];
-- 
GitLab


From 54e4b13887a9747ec1e1965543a901ee0cf23bee Mon Sep 17 00:00:00 2001
From: Christine Koppelt <cko@users.noreply.github.com>
Date: Tue, 8 Oct 2019 13:54:35 +0200
Subject: [PATCH 2215/2254] jikes: removing

---
 pkgs/development/compilers/jikes/default.nix | 14 --------------
 pkgs/top-level/aliases.nix                   |  1 +
 pkgs/top-level/all-packages.nix              |  2 --
 3 files changed, 1 insertion(+), 16 deletions(-)
 delete mode 100644 pkgs/development/compilers/jikes/default.nix

diff --git a/pkgs/development/compilers/jikes/default.nix b/pkgs/development/compilers/jikes/default.nix
deleted file mode 100644
index 1247f369c5c..00000000000
--- a/pkgs/development/compilers/jikes/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
-  name = "jikes-1.22";
-  src = fetchurl {
-    url = mirror://sourceforge/jikes/jikes-1.22.tar.bz2;
-    sha256 = "1qqldrp74pzpy5ly421srqn30qppmm9cvjiqdngk8hf47dv2rc0c";
-  };
-
-  meta = {
-    platforms = stdenv.lib.platforms.unix;
-    license = stdenv.lib.licenses.epl10;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 65bbe42ef6e..97c3f1df458 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -162,6 +162,7 @@ mapAliases ({
   infiniband-diags = rdma-core; # added 2019-08-09
   inotifyTools = inotify-tools;
   jbuilder = dune; # added 2018-09-09
+  jikes = throw "deprecated in 2019-10-07: abandoned by upstream";
   joseki = apache-jena-fuseki; # added 2016-02-28
   json_glib = json-glib; # added 2018-02-25
   kdiff3-qt5 = kdiff3; # added 2017-02-18
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4f2f5edee10..b0f0b832a6e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8099,8 +8099,6 @@ in
 
   javacard-devkit = pkgsi686Linux.callPackage ../development/compilers/javacard-devkit { };
 
-  jikes = callPackage ../development/compilers/jikes { };
-
   julia_07 = callPackage ../development/compilers/julia/0.7.nix {
     gmp = gmp6;
     openblas = openblasCompat;
-- 
GitLab


From bffcb980e3a4329b18ee158484a9304062468567 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 8 Oct 2019 08:33:20 -0700
Subject: [PATCH 2216/2254] dos2unix: 7.4.0 -> 7.4.1 (#70566)

* dos2unix: 7.4.0 -> 7.4.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/dos2unix/versions

* dos2unix: cleanup
---
 pkgs/tools/text/dos2unix/default.nix | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/text/dos2unix/default.nix b/pkgs/tools/text/dos2unix/default.nix
index bd72ec94714..146338df916 100644
--- a/pkgs/tools/text/dos2unix/default.nix
+++ b/pkgs/tools/text/dos2unix/default.nix
@@ -2,25 +2,21 @@
 
 stdenv.mkDerivation rec {
   pname = "dos2unix";
-  version = "7.4.0";
+  version = "7.4.1";
 
   src = fetchurl {
     url = "https://waterlan.home.xs4all.nl/dos2unix/${pname}-${version}.tar.gz";
-    sha256 = "12h4c61g376bhq03y5g2xszkrkrj5hwd928rly3xsp6rvfmnbixs";
+    sha256 = "08w6yywzirsxq8bh87jycvvw922ybhc2l426j2iqzliyn1h8mm8w";
   };
 
-  configurePhase = ''
-    substituteInPlace Makefile \
-    --replace /usr $out
-    '';
-
   nativeBuildInputs = [ perl gettext ];
+  makeFlags = [ "prefix=${placeholder "out"}" ];
 
   meta = with stdenv.lib; {
-    homepage = http://waterlan.home.xs4all.nl/dos2unix.html;
-    description = "Tools to transform text files from dos to unix formats and vicervesa";
+    description = "Convert text files with DOS or Mac line breaks to Unix line breaks and vice versa";
+    homepage = "https://waterlan.home.xs4all.nl/dos2unix.html";
+    changelog = "https://sourceforge.net/p/dos2unix/dos2unix/ci/dos2unix-${version}/tree/dos2unix/NEWS.txt?format=raw";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ndowens ];
-
+    maintainers = with maintainers; [ c0bw3b ndowens ];
   };
 }
-- 
GitLab


From 6886db123c2f947db1e431d8c06e61b529e2983e Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Tue, 8 Oct 2019 17:34:36 +0200
Subject: [PATCH 2217/2254] keycard-cli: init at 0.0.12

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

diff --git a/pkgs/tools/security/keycard-cli/default.nix b/pkgs/tools/security/keycard-cli/default.nix
new file mode 100644
index 00000000000..e87bb060cc6
--- /dev/null
+++ b/pkgs/tools/security/keycard-cli/default.nix
@@ -0,0 +1,26 @@
+{ lib, buildGoPackage, fetchFromGitHub, pkgconfig, pcsclite }:
+
+buildGoPackage rec {
+  pname = "keycard-cli";
+  version = "0.0.12";
+
+  goPackagePath = "github.com/status-im/keycard-cli";
+  subPackages = [ "." ];
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ pcsclite ];
+
+  src = fetchFromGitHub {
+    owner = "status-im";
+    repo = pname;
+    rev = version;
+    sha256 = "1jnbaq57i6i9bad1hcvd28mxfqq6v8rv806c6l74vlb79ff4v1wb";
+  };
+
+  meta = with lib; {
+    description = "A command line tool and shell to manage keycards";
+    homepage = "https://keycard.status.im";
+    license = licenses.mpl20;
+    maintainers = [ maintainers.zimbatm ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b0f0b832a6e..1fa74479239 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25037,4 +25037,6 @@ in
 
   coz = callPackage ../development/tools/analysis/coz {};
 
+  keycard-cli = callPackage ../tools/security/keycard-cli {};
+
 }
-- 
GitLab


From d7340fe2324e8a9f0862b2bc4701978f6954a924 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 8 Oct 2019 07:44:21 -0700
Subject: [PATCH 2218/2254] python37Packages.strictyaml: 1.0.1 -> 1.0.3

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-strictyaml/versions
---
 pkgs/development/python-modules/strictyaml/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/strictyaml/default.nix b/pkgs/development/python-modules/strictyaml/default.nix
index 50c1cc50a2c..1f580de0b82 100644
--- a/pkgs/development/python-modules/strictyaml/default.nix
+++ b/pkgs/development/python-modules/strictyaml/default.nix
@@ -6,12 +6,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "1.0.1";
+  version = "1.0.3";
   pname = "strictyaml";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1baz5zjl1z9dwaczaga1ik1iy1v9zg3acwnpmgghwnk9hw2i1mq6";
+    sha256 = "05masza4jvvnh2msswpx4l29w1pv92zpy473yd2ndwcclcrk3rli";
   };
 
   propagatedBuildInputs = [ ruamel_yaml python-dateutil ];
-- 
GitLab


From 4738a5772b8c0a96164dbe8fa6adfaeb0ea9772b Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Tue, 8 Oct 2019 17:47:23 +0200
Subject: [PATCH 2219/2254] keycard-cli: embed version

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

diff --git a/pkgs/tools/security/keycard-cli/default.nix b/pkgs/tools/security/keycard-cli/default.nix
index e87bb060cc6..a76c102b2bb 100644
--- a/pkgs/tools/security/keycard-cli/default.nix
+++ b/pkgs/tools/security/keycard-cli/default.nix
@@ -17,6 +17,11 @@ buildGoPackage rec {
     sha256 = "1jnbaq57i6i9bad1hcvd28mxfqq6v8rv806c6l74vlb79ff4v1wb";
   };
 
+  buildFlagsArray = [
+    "-ldflags="
+    "-X main.version=${version}"
+  ];
+
   meta = with lib; {
     description = "A command line tool and shell to manage keycards";
     homepage = "https://keycard.status.im";
-- 
GitLab


From fd35dad46b483f6333be04a73357cdc0dae2a5fd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 8 Oct 2019 08:50:53 -0700
Subject: [PATCH 2220/2254] python37Packages.voluptuous-serialize: 2.2.0 ->
 2.3.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-voluptuous-serialize/versions
---
 .../python-modules/voluptuous-serialize/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/voluptuous-serialize/default.nix b/pkgs/development/python-modules/voluptuous-serialize/default.nix
index 4c550e073c3..4a27252e060 100644
--- a/pkgs/development/python-modules/voluptuous-serialize/default.nix
+++ b/pkgs/development/python-modules/voluptuous-serialize/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec  {
   pname = "voluptuous-serialize";
-  version = "2.2.0";
+  version = "2.3.0";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0ggiisrq7cbk307d09fdwfdcjb667jv90lx6gfwhxfpxgq66cccb";
+    sha256 = "1xcjyp1190z6a226fg0clvhf43gjsbyn60amblsg7w7cw86d033l";
   };
 
   propagatedBuildInputs = [
-- 
GitLab


From 4a95dd41a843269f28603790edf005fb8ff6ea27 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 8 Oct 2019 07:15:54 -0700
Subject: [PATCH 2221/2254] qbittorrent: 4.1.7 -> 4.1.8

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/qbittorrent/versions
---
 pkgs/applications/networking/p2p/qbittorrent/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix
index a579ae15181..c5142c2f9e2 100644
--- a/pkgs/applications/networking/p2p/qbittorrent/default.nix
+++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix
@@ -10,13 +10,13 @@ with lib;
 
 mkDerivation rec {
   pname = "qbittorrent";
-  version = "4.1.7";
+  version = "4.1.8";
 
   src = fetchFromGitHub {
     owner = "qbittorrent";
     repo = "qbittorrent";
     rev = "release-${version}";
-    sha256 = "1z4k64h3ik1a7ir4v9g3ar1wq8zfh4r2pq43hr2wvlamm2111gdv";
+    sha256 = "1mx59mazfmd5yaqdgb6cm8hr5sbp2xgzz3y3yipq1fwq85dj3r5w";
   };
 
   # NOTE: 2018-05-31: CMake is working but it is not officially supported
-- 
GitLab


From b574693e97cbe66f765690fa5c03f94fe8c97b85 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Thu, 3 Oct 2019 18:25:35 +0200
Subject: [PATCH 2222/2254] wstunnel: init at unstable-2019-01-28

---
 pkgs/tools/networking/wstunnel/default.nix | 47 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  3 ++
 2 files changed, 50 insertions(+)
 create mode 100644 pkgs/tools/networking/wstunnel/default.nix

diff --git a/pkgs/tools/networking/wstunnel/default.nix b/pkgs/tools/networking/wstunnel/default.nix
new file mode 100644
index 00000000000..2488d874e6d
--- /dev/null
+++ b/pkgs/tools/networking/wstunnel/default.nix
@@ -0,0 +1,47 @@
+{ mkDerivation, async, base, base64-bytestring, binary, bytestring
+, classy-prelude, cmdargs, connection, hslogger, mtl, network
+, network-conduit-tls, stdenv, streaming-commons, text
+, unordered-containers, websockets
+, lib, fetchFromGitHub, fetchpatch
+}:
+
+mkDerivation rec {
+  pname = "wstunnel";
+  version = "unstable-2019-01-28";
+
+  src = fetchFromGitHub {
+    owner = "erebe";
+    repo = pname;
+    rev = "78cc5a5f1aa4dbcb25fa9b0efc9cfef3640672e4";
+    sha256 = "17y3yn7qg1h7jx9xs041sw63g51vyns236f60d2m2mghi49lm9i2";
+  };
+
+  patches = [
+    # Support GHC 8.6   https://github.com/erebe/wstunnel/pull/18
+    (fetchpatch {
+      url = "https://github.com/erebe/wstunnel/commit/8f348fea4dbf75874d5d930334377843763335ab.patch";
+      sha256 = "0a66jx7k97j3iyr7j5npbyq1lkhzz74r81mkas4nig7z3hny1gn9";
+    })
+  ];
+
+  isLibrary = false;
+  isExecutable = true;
+
+  libraryHaskellDepends = [
+    async base base64-bytestring binary bytestring classy-prelude
+    connection hslogger mtl network network-conduit-tls
+    streaming-commons text unordered-containers websockets
+  ];
+
+  executableHaskellDepends = [
+    base bytestring classy-prelude cmdargs hslogger text
+  ];
+
+  testHaskellDepends = [ base text ];
+
+  homepage = "https://github.com/erebe/wstunnel";
+  description = "UDP and TCP tunnelling over WebSocket";
+  maintainers = with lib.maintainers; [ gebner ];
+  license = lib.licenses.bsd3;
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 15ab0bf257c..0725234bb1e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6865,6 +6865,9 @@ in
 
   wsmancli = callPackage ../tools/system/wsmancli {};
 
+  wstunnel = haskell.lib.justStaticExecutables
+    (haskellPackages.callPackage ../tools/networking/wstunnel {});
+
   wolfebin = callPackage ../tools/networking/wolfebin {
     python = python2;
   };
-- 
GitLab


From 9acb145da327d76897fe36d26ea9cb8655c13bcc Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 8 Oct 2019 12:30:46 -0400
Subject: [PATCH 2223/2254] xfce4-12.xfce4-vala-panel-appmenu-plugin: fix eval

---
 .../panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix
index 2e8de0f7f6e..43e943f194a 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix
@@ -45,6 +45,6 @@ stdenv.mkDerivation rec {
     description = "Global Menu applet for XFCE4";
     license = licenses.lgpl3;
     maintainers = with maintainers; [ jD91mZM2 ];
-    meta.broken = true;
+    broken = true;
   };
 }
-- 
GitLab


From a763975ad1b7e6efb67b4d092a17e86ba2d01748 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Tue, 8 Oct 2019 10:05:57 -0400
Subject: [PATCH 2224/2254] obs-wlrobs: init at 20191008

---
 pkgs/applications/video/obs-studio/wlrobs.nix | 37 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/applications/video/obs-studio/wlrobs.nix

diff --git a/pkgs/applications/video/obs-studio/wlrobs.nix b/pkgs/applications/video/obs-studio/wlrobs.nix
new file mode 100644
index 00000000000..13a53f94590
--- /dev/null
+++ b/pkgs/applications/video/obs-studio/wlrobs.nix
@@ -0,0 +1,37 @@
+# (the following is somewhat lifted from ./linuxbrowser.nix)
+# We don't have a wrapper which can supply obs-studio plugins so you have to
+# somewhat manually install this:
+
+# nix-env -f . -iA obs-wlrobs
+# mkdir -p ~/.config/obs-studio/plugins/wlrobs/bin/64bit
+# ln -s ~/.nix-profile/share/obs/obs-plugins/wlrobs/bin/64bit/libwlrobs.so ~/.config/obs-studio/plugins/wlrobs/bin/64bit
+{ stdenv, fetchhg, wayland, obs-studio }:
+stdenv.mkDerivation {
+  pname = "obs-wlrobs";
+  version = "20191008";
+
+  src = fetchhg {
+    url = "https://hg.sr.ht/~scoopta/wlrobs";
+    rev = "82e2b93c6f662dfd9d69f7826c0096bef585c3ae";
+    sha256 = "1d2mlybkwyr0jw6paamazla2a1cyj60bs10i0lk9jclxnp780fy6";
+  };
+
+  buildInputs = [ wayland obs-studio ];
+
+  preBuild = ''
+    cd Release
+  '';
+
+  installPhase = ''
+    mkdir -p $out/share/obs/obs-plugins/wlrobs/bin/64bit
+    cp ./libwlrobs.so $out/share/obs/obs-plugins/wlrobs/bin/64bit/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "An obs-studio plugin that allows you to screen capture on wlroots based wayland compositors";
+    homepage = https://hg.sr.ht/~scoopta/wlrobs;
+    maintainers = with maintainers; [ grahamc ];
+    license = licenses.gpl3;
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4f2f5edee10..4b12305d627 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19931,6 +19931,8 @@ in
 
   obs-studio = libsForQt5.callPackage ../applications/video/obs-studio { };
 
+  obs-wlrobs = callPackage ../applications/video/obs-studio/wlrobs.nix { };
+
   octoprint = callPackage ../applications/misc/octoprint { };
 
   octoprint-plugins = callPackage ../applications/misc/octoprint/plugins.nix { };
-- 
GitLab


From 137e5975a02ed031874bdb82b495b85cba89cd29 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 8 Oct 2019 10:02:31 -0700
Subject: [PATCH 2225/2254] redis: 5.0.5 -> 5.0.6

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/redis/versions
---
 pkgs/servers/nosql/redis/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix
index 9b785917bfb..f7a67ce398d 100644
--- a/pkgs/servers/nosql/redis/default.nix
+++ b/pkgs/servers/nosql/redis/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, lua, jemalloc }:
 
 stdenv.mkDerivation rec {
-  version = "5.0.5";
+  version = "5.0.6";
   pname = "redis";
 
   src = fetchurl {
     url = "http://download.redis.io/releases/${pname}-${version}.tar.gz";
-    sha256 = "0xd3ak527cnkz2cn422l2ag9nsa6mhv7y2y49zwqy7fjk6bh0f91";
+    sha256 = "1cr2dn9ilhj52snmlz38fw30gdlgbxq2sadyspawahp1cw988936";
   };
 
   # Cross-compiling fixes
-- 
GitLab


From 5d95d05283dff23e8b7d813313422acc3587e700 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 8 Oct 2019 10:05:32 -0700
Subject: [PATCH 2226/2254] radsecproxy: 1.8.0 -> 1.8.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/radsecproxy/versions
---
 pkgs/tools/networking/radsecproxy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/radsecproxy/default.nix b/pkgs/tools/networking/radsecproxy/default.nix
index 9901194f3c6..5460bf80a07 100644
--- a/pkgs/tools/networking/radsecproxy/default.nix
+++ b/pkgs/tools/networking/radsecproxy/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "radsecproxy";
-  version = "1.8.0";
+  version = "1.8.1";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = version;
-    sha256 = "1268lbysa82b6h0101jzs0v6ixvmy3x0d0a8hw37sy95filsjmia";
+    sha256 = "12pvwd7v3iswki3riycxaiiqxingg4bqnkwc5ay3j4n2kzynr1qg";
   };
 
   nativeBuildInputs = [ autoreconfHook ];
-- 
GitLab


From e14ccd72856ed4e1abad2b9b3a8d655f67313d51 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 1 Oct 2019 16:43:33 -0400
Subject: [PATCH 2227/2254] linux-testing: 5.3-rc8 -> 5.4-rc1

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

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index e653a6459df..4235c26aea1 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -3,15 +3,15 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.3-rc8";
-  extraMeta.branch = "5.3";
+  version = "5.4-rc1";
+  extraMeta.branch = "5.4";
 
   # modDirVersion needs to be x.y.z, will always add .0
   modDirVersion = if (modDirVersionArg == null) then builtins.replaceStrings ["-"] [".0-"] version else modDirVersionArg;
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "01pr8xb9akjzafl8zkpwwkmlsjxghv5bx0larkjqdakjfspqnhzj";
+    sha256 = "1a9h0g249b3aznn6jz92y5vpr02v921mgf72rj0nbblcfhrimzk9";
   };
 
   # Should the testing kernels ever be built on Hydra?
-- 
GitLab


From ecb95c8bcb3751e04e7a384b4d3398f5e31ede2e Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 8 Oct 2019 13:18:51 -0400
Subject: [PATCH 2228/2254] linux: 5.4-rc1 -> 5.4-rc2

---
 pkgs/os-specific/linux/kernel/linux-testing.nix | 4 ++--
 pkgs/os-specific/linux/kernel/manual-config.nix | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 4235c26aea1..731d44d69a3 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.4-rc1";
+  version = "5.4-rc2";
   extraMeta.branch = "5.4";
 
   # modDirVersion needs to be x.y.z, will always add .0
@@ -11,7 +11,7 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "1a9h0g249b3aznn6jz92y5vpr02v921mgf72rj0nbblcfhrimzk9";
+    sha256 = "0dnn771wydwc4sngy9a3szvflbw9g97ann4iix4k4bq4gr18jw2c";
   };
 
   # Should the testing kernels ever be built on Hydra?
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index 9764fddf019..87fa9c8f08e 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -96,7 +96,7 @@ let
         # Required for deterministic builds along with some postPatch magic.
         ++ optional (stdenv.lib.versionAtLeast version "4.13") ./randstruct-provide-seed.patch
         # Fixes determinism by normalizing metadata for the archive of kheaders
-        ++ optional (stdenv.lib.versionAtLeast version "5.2") ./gen-kheaders-metadata.patch;
+        ++ optional (stdenv.lib.versionAtLeast version "5.2" && stdenv.lib.versionOlder version "5.4") ./gen-kheaders-metadata.patch;
 
       prePatch = ''
         for mf in $(find -name Makefile -o -name Makefile.include -o -name install.sh); do
-- 
GitLab


From 00633a3e1399674083e1cf6d96ed52340dd462d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Krzysztof=20Feiler?= <m@mikf.pl>
Date: Tue, 8 Oct 2019 17:48:09 +0000
Subject: [PATCH 2229/2254] nixos/window-managers: add cwm to imports

as per request from @romildo under #70035 https://github.com/NixOS/nixpkgs/pull/70035#pullrequestreview-298166798
---
 nixos/modules/services/x11/window-managers/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix
index 2a1f22fa9a4..c17f3830d0e 100644
--- a/nixos/modules/services/x11/window-managers/default.nix
+++ b/nixos/modules/services/x11/window-managers/default.nix
@@ -11,6 +11,7 @@ in
     ./2bwm.nix
     ./afterstep.nix
     ./bspwm.nix
+    ./cwm.nix
     ./dwm.nix
     ./evilwm.nix
     ./exwm.nix
-- 
GitLab


From e39cfe230980d37e116509f8ae8d7ef59177cbca Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 8 Oct 2019 19:51:52 +0200
Subject: [PATCH 2230/2254] adoptopenjdk-icedtea-web: remove myself from
 maintainers

---
 pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix b/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix
index 305e0f202bf..dd03ce0171f 100644
--- a/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix
+++ b/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix
@@ -58,7 +58,6 @@ stdenv.mkDerivation rec {
       based on the NetX project.
     '';
     homepage = https://github.com/adoptopenjdk/icedtea-web;
-    maintainers = with stdenv.lib.maintainers; [ wizeman ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
-- 
GitLab


From 7ec975fa84ad79ef2509f6c399400630be988625 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 8 Oct 2019 19:52:47 +0200
Subject: [PATCH 2231/2254] rustc, cargo: remove myself from maintainers

---
 pkgs/development/compilers/rust/cargo.nix | 2 +-
 pkgs/development/compilers/rust/rustc.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix
index 2bf2722818b..91a31be9f8d 100644
--- a/pkgs/development/compilers/rust/cargo.nix
+++ b/pkgs/development/compilers/rust/cargo.nix
@@ -49,7 +49,7 @@ rustPlatform.buildRustPackage {
   meta = with stdenv.lib; {
     homepage = https://crates.io;
     description = "Downloads your Rust project's dependencies and builds your project";
-    maintainers = with maintainers; [ wizeman retrry ];
+    maintainers = with maintainers; [ retrry ];
     license = [ licenses.mit licenses.asl20 ];
     platforms = platforms.unix;
   };
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index 27336aa501b..430d22f7653 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -149,7 +149,7 @@ in stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://www.rust-lang.org/;
     description = "A safe, concurrent, practical language";
-    maintainers = with maintainers; [ madjar cstrahan wizeman globin havvy ];
+    maintainers = with maintainers; [ madjar cstrahan globin havvy ];
     license = [ licenses.mit licenses.asl20 ];
     platforms = platforms.linux ++ platforms.darwin;
   };
-- 
GitLab


From 3687cd58b427b87b0b8d466f42f7f3c8583d260b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 8 Oct 2019 11:10:17 -0700
Subject: [PATCH 2232/2254] rdma-core: 25.0 -> 26.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/rdma-core/versions
---
 pkgs/os-specific/linux/rdma-core/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix
index ce0e8707ff5..da40321d6bc 100644
--- a/pkgs/os-specific/linux/rdma-core/default.nix
+++ b/pkgs/os-specific/linux/rdma-core/default.nix
@@ -4,7 +4,7 @@
 } :
 
 let
-  version = "25.0";
+  version = "26.0";
 
 in stdenv.mkDerivation {
   pname = "rdma-core";
@@ -14,7 +14,7 @@ in stdenv.mkDerivation {
     owner = "linux-rdma";
     repo = "rdma-core";
     rev = "v${version}";
-    sha256 = "1r1gfps1xckky06ib1rbf6lp58v2jqpy1ipkr45rf55gpaxf93cj";
+    sha256 = "0yvhc7xc3mxzjd7v2y408w333qi7hkf1f99gbsd3fv2qydp9gps3";
   };
 
   nativeBuildInputs = [ cmake pkgconfig pandoc docutils makeWrapper ];
-- 
GitLab


From 854c969b57f8d831e40dc91a6448eed17e1b48e1 Mon Sep 17 00:00:00 2001
From: Christine Koppelt <cko@users.noreply.github.com>
Date: Tue, 8 Oct 2019 20:54:38 +0200
Subject: [PATCH 2233/2254] add missing meta data

---
 pkgs/applications/editors/nedit/default.nix    | 3 ++-
 pkgs/applications/editors/okteta/default.nix   | 1 +
 pkgs/applications/misc/wego/default.nix        | 2 ++
 pkgs/development/tools/parsing/peg/default.nix | 3 ++-
 pkgs/tools/misc/gawp/default.nix               | 6 ++++++
 5 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/nedit/default.nix b/pkgs/applications/editors/nedit/default.nix
index b1b3a416178..4ff8c759a26 100644
--- a/pkgs/applications/editors/nedit/default.nix
+++ b/pkgs/applications/editors/nedit/default.nix
@@ -26,7 +26,8 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = https://sourceforge.net/projects/nedit;
+    homepage = "https://sourceforge.net/projects/nedit";
+    description = "A fast, compact Motif/X11 plain text editor";
     platforms = with platforms; linux ++ darwin;
     license = licenses.gpl2;
   };
diff --git a/pkgs/applications/editors/okteta/default.nix b/pkgs/applications/editors/okteta/default.nix
index 287758e0fd8..5c7ddfb34d4 100644
--- a/pkgs/applications/editors/okteta/default.nix
+++ b/pkgs/applications/editors/okteta/default.nix
@@ -28,6 +28,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     license = licenses.gpl2;
+    description = "A hex editor";
     maintainers = with maintainers; [ peterhoeg bkchr ];
     platforms = platforms.linux;
   };
diff --git a/pkgs/applications/misc/wego/default.nix b/pkgs/applications/misc/wego/default.nix
index 03f3caa4c15..93f50fb5370 100644
--- a/pkgs/applications/misc/wego/default.nix
+++ b/pkgs/applications/misc/wego/default.nix
@@ -17,5 +17,7 @@ buildGoPackage rec {
 
   meta = {
     license = stdenv.lib.licenses.isc;
+    homepage = "https://github.com/schachmat/wego";
+    description = "Weather app for the terminal";
   };
 }
diff --git a/pkgs/development/tools/parsing/peg/default.nix b/pkgs/development/tools/parsing/peg/default.nix
index 5b8b16ef192..458ddc007f5 100644
--- a/pkgs/development/tools/parsing/peg/default.nix
+++ b/pkgs/development/tools/parsing/peg/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
   preBuild="makeFlagsArray+=( PREFIX=$out )";
 
   meta = with stdenv.lib; {
-    homepage = http://piumarta.com/software/peg/;
+    homepage = "http://piumarta.com/software/peg/";
+    description = "Tools for generating recursive-descent parsers: programs that perform pattern matching on text";
     platforms = platforms.all;
     license = licenses.mit;
   };
diff --git a/pkgs/tools/misc/gawp/default.nix b/pkgs/tools/misc/gawp/default.nix
index 002853abc1d..865ce3c440d 100644
--- a/pkgs/tools/misc/gawp/default.nix
+++ b/pkgs/tools/misc/gawp/default.nix
@@ -16,4 +16,10 @@ buildGoPackage rec {
   };
 
   goDeps = ./deps.nix;
+
+  meta = {
+    homepage = "https://github.com/martingallagher/gawp";
+    description = "A simple, configurable, file watching, job execution tool";
+    license = stdenv.lib.licenses.asl20;
+  };
 }
-- 
GitLab


From 7c087faeb87ff1129197347b1f98a6e8a5c0558b Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Tue, 8 Oct 2019 21:11:07 +0200
Subject: [PATCH 2234/2254] gitea: 1.9.3 -> 1.9.4

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

diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix
index 9c7d83a05fd..0526743cc38 100644
--- a/pkgs/applications/version-management/gitea/default.nix
+++ b/pkgs/applications/version-management/gitea/default.nix
@@ -8,13 +8,13 @@ with stdenv.lib;
 
 buildGoPackage rec {
   pname = "gitea";
-  version = "1.9.3";
+  version = "1.9.4";
 
   src = fetchFromGitHub {
     owner = "go-gitea";
     repo = "gitea";
     rev = "v${version}";
-    sha256 = "0g6ch85dq4vazxnr6g78wgqrnfa955395y1zws0a50h0wfxpdjis";
+    sha256 = "1f4bdn04pbbmnf03c58jqjl2m629137py6l06mkh63jip32a6l1z";
     # Required to generate the same checksum on MacOS due to unicode encoding differences
     # More information: https://github.com/NixOS/nixpkgs/pull/48128
     extraPostFetch = ''
-- 
GitLab


From b407822b8563186fed3b7527d9c8ae06e29af030 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 8 Oct 2019 21:45:42 +0200
Subject: [PATCH 2235/2254] locate.nix: Don't create /var/cache

Fixes

  setting up tmpfiles
  [/etc/tmpfiles.d/var.conf:19] Duplicate line for path "/var/cache", ignoring.
---
 nixos/modules/misc/locate.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix
index 449149e4bb6..737ed5c0a3f 100644
--- a/nixos/modules/misc/locate.nix
+++ b/nixos/modules/misc/locate.nix
@@ -128,7 +128,10 @@ in {
 
     # directory creation needs to be separated from main service
     # because ReadWritePaths fails when the directory doesn't already exist
-    systemd.tmpfiles.rules = [ "d ${dirOf cfg.output} 0755 root root -" ];
+    systemd.tmpfiles.rules =
+      let dir = dirOf cfg.output; in
+      mkIf (dir != "/var/cache")
+        [ "d ${dir} 0755 root root -" ];
 
     systemd.services.update-locatedb =
       { description = "Update Locate Database";
-- 
GitLab


From 366476defd4be84e1399d76873e3e234574ff5f5 Mon Sep 17 00:00:00 2001
From: Tobias Mayer <tobim@fastmail.fm>
Date: Thu, 26 Sep 2019 22:51:28 +0200
Subject: [PATCH 2236/2254] arrow-cpp: 0.14.1 -> 0.15.0

This also enables building the plasma module.
---
 pkgs/development/libraries/arrow-cpp/default.nix | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix
index f763f98799d..0542eebf2f3 100644
--- a/pkgs/development/libraries/arrow-cpp/default.nix
+++ b/pkgs/development/libraries/arrow-cpp/default.nix
@@ -11,11 +11,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "arrow-cpp";
-  version = "0.14.1";
+  version = "0.15.0";
 
   src = fetchurl {
     url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz";
-    sha256 = "0a0xrsbr7dd1yp34yw82jw7psfkfvm935jhd5mam32vrsjvdsj4r";
+    sha256 = "0n7xrn5490r2snjl45pm2a4pr2x8a29sh8mpyi4nj5pr9f62s1yi";
   };
 
   sourceRoot = "apache-arrow-${version}/cpp";
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     ./darwin.patch
     ];
 
-  nativeBuildInputs = [ cmake autoconf /* for vendored jemalloc */ ]
+  nativeBuildInputs = [ cmake autoconf /* for vendored jemalloc */ flatbuffers ]
     ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
   buildInputs = [
     boost brotli double-conversion flatbuffers gflags glog gtest lz4 rapidjson
@@ -44,17 +44,13 @@ stdenv.mkDerivation rec {
     substituteInPlace cmake_modules/FindLz4.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY
 
     patchShebangs build-support/
-
-    # Fix build for ARROW_USE_SIMD=OFF
-    # https://jira.apache.org/jira/browse/ARROW-5007
-    sed -i src/arrow/util/sse-util.h -e '1i#include "arrow/util/logging.h"'
-    sed -i src/arrow/util/neon-util.h -e '1i#include "arrow/util/logging.h"'
   '';
 
   cmakeFlags = [
     "-DARROW_BUILD_TESTS=ON"
     "-DARROW_DEPENDENCY_SOURCE=SYSTEM"
     "-DARROW_PARQUET=ON"
+    "-DARROW_PLASMA=ON"
     "-DARROW_PYTHON=ON"
     "-Duriparser_SOURCE=SYSTEM"
   ] ++ stdenv.lib.optional (!stdenv.isx86_64) "-DARROW_USE_SIMD=OFF";
@@ -75,6 +71,6 @@ stdenv.mkDerivation rec {
     homepage = https://arrow.apache.org/;
     license = stdenv.lib.licenses.asl20;
     platforms = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ veprbl ];
+    maintainers = with stdenv.lib.maintainers; [ tobim veprbl ];
   };
 }
-- 
GitLab


From bf09368bf5aea04bdff0968c3a65f020fa65f932 Mon Sep 17 00:00:00 2001
From: Tobias Mayer <tobim@fastmail.fm>
Date: Mon, 7 Oct 2019 08:48:25 +0200
Subject: [PATCH 2237/2254] arrow-cpp: run nixfmt

---
 .../libraries/arrow-cpp/default.nix           | 45 ++++++++++++++-----
 1 file changed, 33 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix
index 0542eebf2f3..3f312ffdc0b 100644
--- a/pkgs/development/libraries/arrow-cpp/default.nix
+++ b/pkgs/development/libraries/arrow-cpp/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, fetchFromGitHub, fixDarwinDylibNames, autoconf, boost, brotli, cmake, double-conversion, flatbuffers, gflags, glog, gtest, lz4, perl, python, rapidjson, snappy, thrift, uriparser, which, zlib, zstd }:
+{ stdenv, fetchurl, fetchFromGitHub, fixDarwinDylibNames, autoconf, boost
+, brotli, cmake, double-conversion, flatbuffers, gflags, glog, gtest, lz4, perl
+, python, rapidjson, snappy, thrift, uriparser, which, zlib, zstd }:
 
 let
   parquet-testing = fetchFromGitHub {
@@ -7,14 +9,14 @@ let
     rev = "a277dc4e55ded3e3ea27dab1e4faf98c112442df";
     sha256 = "1yh5a8l4ship36hwmgmp2kl72s5ac9r8ly1qcs650xv2g9q7yhnq";
   };
-in
 
-stdenv.mkDerivation rec {
+in stdenv.mkDerivation rec {
   pname = "arrow-cpp";
   version = "0.15.0";
 
   src = fetchurl {
-    url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz";
+    url =
+      "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz";
     sha256 = "0n7xrn5490r2snjl45pm2a4pr2x8a29sh8mpyi4nj5pr9f62s1yi";
   };
 
@@ -24,20 +26,38 @@ stdenv.mkDerivation rec {
     # From
     # ./cpp/cmake_modules/ThirdpartyToolchain.cmake
     # ./cpp/thirdparty/versions.txt
-    url = "https://github.com/jemalloc/jemalloc/releases/download/5.2.0/jemalloc-5.2.0.tar.bz2";
+    url =
+      "https://github.com/jemalloc/jemalloc/releases/download/5.2.0/jemalloc-5.2.0.tar.bz2";
     sha256 = "1d73a5c5qdrwck0fa5pxz0myizaf3s9alsvhiqwrjahdlr29zgkl";
   };
 
   patches = [
     # patch to fix python-test
     ./darwin.patch
-    ];
+  ];
 
-  nativeBuildInputs = [ cmake autoconf /* for vendored jemalloc */ flatbuffers ]
-    ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
+  nativeBuildInputs = [
+    cmake
+    autoconf # for vendored jemalloc
+    flatbuffers
+  ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
   buildInputs = [
-    boost brotli double-conversion flatbuffers gflags glog gtest lz4 rapidjson
-    snappy thrift uriparser zlib zstd python.pkgs.python python.pkgs.numpy
+    boost
+    brotli
+    double-conversion
+    flatbuffers
+    gflags
+    glog
+    gtest
+    lz4
+    rapidjson
+    snappy
+    thrift
+    uriparser
+    zlib
+    zstd
+    python.pkgs.python
+    python.pkgs.numpy
   ];
 
   preConfigure = ''
@@ -56,7 +76,8 @@ stdenv.mkDerivation rec {
   ] ++ stdenv.lib.optional (!stdenv.isx86_64) "-DARROW_USE_SIMD=OFF";
 
   doInstallCheck = true;
-  PARQUET_TEST_DATA = if doInstallCheck then "${parquet-testing}/data" else null;
+  PARQUET_TEST_DATA =
+    if doInstallCheck then "${parquet-testing}/data" else null;
   installCheckInputs = [ perl which ];
   installCheckPhase = (stdenv.lib.optionalString stdenv.isDarwin ''
     for f in release/*test; do
@@ -68,7 +89,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A  cross-language development platform for in-memory data";
-    homepage = https://arrow.apache.org/;
+    homepage = "https://arrow.apache.org/";
     license = stdenv.lib.licenses.asl20;
     platforms = stdenv.lib.platforms.unix;
     maintainers = with stdenv.lib.maintainers; [ tobim veprbl ];
-- 
GitLab


From 8c86e54a25b8d1fbc3097d905702d454768d2550 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Tue, 8 Oct 2019 03:23:07 -0400
Subject: [PATCH 2238/2254] arrow-cpp: fix/disable some plasma tests on darwin

---
 .../development/libraries/arrow-cpp/default.nix | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix
index 3f312ffdc0b..aaf228e73a6 100644
--- a/pkgs/development/libraries/arrow-cpp/default.nix
+++ b/pkgs/development/libraries/arrow-cpp/default.nix
@@ -80,12 +80,21 @@ in stdenv.mkDerivation rec {
     if doInstallCheck then "${parquet-testing}/data" else null;
   installCheckInputs = [ perl which ];
   installCheckPhase = (stdenv.lib.optionalString stdenv.isDarwin ''
-    for f in release/*test; do
+    for f in release/*test{,s}; do
       install_name_tool -add_rpath "$out"/lib  "$f"
     done
-  '') + ''
-    ctest -L unittest -V
-  '';
+  '')
+  + (let
+    excludedTests = stdenv.lib.optionals stdenv.isDarwin [
+      # Some plasma tests need to be patched to use a shorter AF_UNIX socket
+      # path on Darwin. See https://github.com/NixOS/nix/pull/1085
+      "plasma-external-store-tests"
+      "plasma-client-tests"
+    ];
+  in ''
+    ctest -L unittest -V \
+      --exclude-regex '(${builtins.concatStringsSep "|" excludedTests})'
+  '');
 
   meta = {
     description = "A  cross-language development platform for in-memory data";
-- 
GitLab


From f39ea02e247e65c102e3486558ac1ced2bb24c4c Mon Sep 17 00:00:00 2001
From: Tobias Mayer <tobim@fastmail.fm>
Date: Tue, 8 Oct 2019 21:55:45 +0200
Subject: [PATCH 2239/2254] pythonPackages.awkward: 0.12.12 -> 0.12.13

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

diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix
index b515892cfb0..a4d8acec540 100644
--- a/pkgs/development/python-modules/awkward/default.nix
+++ b/pkgs/development/python-modules/awkward/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "awkward";
-  version = "0.12.12";
+  version = "0.12.13";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "316abd04dd049d56567082670ae8800c265dc3f06b699cf2a953ea6aea7696ce";
+    sha256 = "0jciasfmayk3xs8lprrdjd6brvy614yd2ngpgyzlszis5sa6nr18";
   };
 
   nativeBuildInputs = [ pytestrunner ];
-- 
GitLab


From 23f8c25416985aea104ae950fd83d92b6a2ad4cb Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 8 Oct 2019 12:00:00 -0500
Subject: [PATCH 2240/2254] starship: 0.20.2 -> 0.21.0

Changelog: https://github.com/starship/starship/releases/tag/v0.21.0
---
 pkgs/tools/misc/starship/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix
index b2a5ded346a..8335c04c3d2 100644
--- a/pkgs/tools/misc/starship/default.nix
+++ b/pkgs/tools/misc/starship/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, libiconv, darwin }:
+{ stdenv, fetchFromGitHub, rustPlatform, libiconv, darwin }:
 
 rustPlatform.buildRustPackage rec {
   pname = "starship";
-  version = "0.20.2";
+  version = "0.21.0";
 
   src = fetchFromGitHub {
     owner = "starship";
     repo = "starship";
     rev = "v${version}";
-    sha256 = "0nyka4w7vzx3n93y44vblc9pjqaymd867fmp0yd8kk2v56cyf4vd";
+    sha256 = "07f502xrh8pkh02xkb79g64qcwxdlipypwn6x35zq8hdrw07xhw3";
   };
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ];
-- 
GitLab


From 3e67b3c2694e24d1b4456687f5397e0c66c0a2d0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 8 Oct 2019 10:30:56 -0700
Subject: [PATCH 2241/2254] python27Packages.ropper: 1.12.1 -> 1.12.5

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/ropper/versions
---
 pkgs/development/python-modules/ropper/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ropper/default.nix b/pkgs/development/python-modules/ropper/default.nix
index 7b07bf3ff05..a6a2c33fefe 100644
--- a/pkgs/development/python-modules/ropper/default.nix
+++ b/pkgs/development/python-modules/ropper/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonApplication rec {
   pname = "ropper";
-  version = "1.12.1";
+  version = "1.12.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1aignpxz6rcbf6yxy1gjr708p56i6nqrbgblq24nanssz9rhkyzg";
+    sha256 = "063lki438nsaylgqr5s785j6rbfqnyzb5bxnr8ixhmpk5irf3sqd";
   };
   # XXX tests rely on user-writeable /dev/shm to obtain process locks and return PermissionError otherwise
   # workaround: sudo chmod 777 /dev/shm
-- 
GitLab


From cc510cb7b5414db325dbc0ee7b40e332cba5b719 Mon Sep 17 00:00:00 2001
From: Lily Ballard <lily@sb.org>
Date: Tue, 8 Oct 2019 15:18:06 -0700
Subject: [PATCH 2242/2254] hexyl: 0.5.1 -> 0.6.0

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

diff --git a/pkgs/tools/misc/hexyl/default.nix b/pkgs/tools/misc/hexyl/default.nix
index f6b0649e404..c00e47433c1 100644
--- a/pkgs/tools/misc/hexyl/default.nix
+++ b/pkgs/tools/misc/hexyl/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname   = "hexyl";
-  version = "0.5.1";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner  = "sharkdp";
     repo   = pname;
     rev    = "v${version}";
-    sha256 = "0511ikhfc0fa6cfp02n49zlzyqgwf7ymgn911y8fnjlaf6grsh67";
+    sha256 = "1n2q5a6697bxvl0askywhad2x560cajv456gxihdqqmmyq2vf63h";
   };
 
-  cargoSha256 = "126hq802hncji4yvkf7jvaq2njzw8kwzvc7fqw99nrdn4k56xig7";
+  cargoSha256 = "1wcpbqlglf9r0xhfjmyym8bnd4pgrsf9lrmb14hn1ml5zlshpd7p";
 
   meta = with stdenv.lib; {
     description = "A command-line hex viewer";
-- 
GitLab


From a795e561f7623dada24e03a6e4d77c0a5b87dfca Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 8 Oct 2019 12:30:48 -0700
Subject: [PATCH 2243/2254] solc: 0.5.11 -> 0.5.12

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/solc/versions
---
 pkgs/development/compilers/solc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix
index b0fdc886378..285f2cd2ebe 100644
--- a/pkgs/development/compilers/solc/default.nix
+++ b/pkgs/development/compilers/solc/default.nix
@@ -17,12 +17,12 @@ in
 stdenv.mkDerivation rec {
 
   pname = "solc";
-  version = "0.5.11";
+  version = "0.5.12";
 
   # upstream suggests avoid using archive generated by github
   src = fetchzip {
     url = "https://github.com/ethereum/solidity/releases/download/v${version}/solidity_${version}.tar.gz";
-    sha256 = "0679s5pqbfy7fgpb4f3ppgj8iafxb64g046v8vhp29mf3dsdcnyl";
+    sha256 = "0b9m9jhdz5lgrhrkngj1xnggxp1f6z8pzh29acsz3298l77kfk3z";
   };
 
   patches = stdenv.lib.optionals buildSharedLibs [ ./patches/shared-libs-install.patch ];
-- 
GitLab


From 8e908728dbf6d1f8079893177dc0a4677790bd58 Mon Sep 17 00:00:00 2001
From: Dylan Simon <dylan@dylex.net>
Date: Tue, 8 Oct 2019 20:56:28 -0400
Subject: [PATCH 2244/2254] xscreensaver: update hash to match source

---
 pkgs/misc/screensavers/xscreensaver/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix
index 3edfa9553d6..39706bb96ed 100644
--- a/pkgs/misc/screensavers/xscreensaver/default.nix
+++ b/pkgs/misc/screensavers/xscreensaver/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://www.jwz.org/${pname}/${pname}-${version}.tar.gz";
-    sha256 = "1m43nfcpagv03zwlivpzp82qdv590s5c8vjjn4iirqjl6mzvdshp";
+    sha256 = "1571pj1a9998sq14y9366s2rw9wd2kq3l3dvvsk610vyd0fki3qm";
   };
 
   buildInputs =
-- 
GitLab


From deaa2173f0b7fd4285e9be38e4bdd1d6092df159 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 8 Oct 2019 18:18:28 -0700
Subject: [PATCH 2245/2254] libyamlcpp: 0.6.2 -> 0.6.3

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libyaml-cpp/versions
---
 pkgs/development/libraries/libyaml-cpp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libyaml-cpp/default.nix b/pkgs/development/libraries/libyaml-cpp/default.nix
index fbc4b4bcec5..6d782543099 100644
--- a/pkgs/development/libraries/libyaml-cpp/default.nix
+++ b/pkgs/development/libraries/libyaml-cpp/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libyaml-cpp";
-  version = "0.6.2";
+  version = "0.6.3";
 
   src = fetchFromGitHub {
     owner = "jbeder";
     repo = "yaml-cpp";
     rev = "yaml-cpp-${version}";
-    sha256 = "16lclpa487yghf9019wymj419wkyx4795wv9q7539hhimajw9kpb";
+    sha256 = "0ykkxzxcwwiv8l8r697gyqh1nl582krpvi7m7l6b40ijnk4pw30s";
   };
 
   outputs = [ "out" "dev" ];
-- 
GitLab


From e83d1ea5eed7b6ca9cca961bd80055f131d4f30f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 8 Oct 2019 18:37:34 -0700
Subject: [PATCH 2246/2254] yarn: 1.17.3 -> 1.19.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/yarn/versions
---
 pkgs/development/tools/yarn/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/development/tools/yarn/default.nix
index 5dc0a63c26e..22f4365773e 100644
--- a/pkgs/development/tools/yarn/default.nix
+++ b/pkgs/development/tools/yarn/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "yarn";
-  version = "1.17.3";
+  version = "1.19.0";
 
   src = fetchzip {
     url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz";
-    sha256 = "050bd7bzn1kkva03q3ay2jlq574yp4k5g1pyrrdvk2cr60c4j1vj";
+    sha256 = "14h293kixxiww41daj0xyjii8d9mgr2ah5sxadass60p61ynxsq4";
   };
 
   buildInputs = [ nodejs ];
-- 
GitLab


From 47f4abc49bfb98b060a7866774508edca62dea3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Wed, 9 Oct 2019 04:56:04 +0200
Subject: [PATCH 2247/2254] gnome3.mutter: 3.34.0 -> 3.34.1

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

diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix
index ce129f7537f..c8b1ac7e466 100644
--- a/pkgs/desktops/gnome-3/core/mutter/default.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/default.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "mutter";
-  version = "3.34.0";
+  version = "3.34.1";
 
   outputs = [ "out" "dev" "man" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/mutter/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0qdpw0fya8kr5737jf635455qb714wvhszkk82rlw48fqj8nk8ss";
+    sha256 = "13kmmgg2zizr0522clwc2zn3bkwbir503b1wjiiixf5xi37jc65s";
   };
 
   mesonFlags = [
@@ -54,38 +54,6 @@ stdenv.mkDerivation rec {
   ];
 
   patches = [
-    (fetchpatch {
-      name = "ensure-emit-x11-display-opened.patch";
-      url = "https://gitlab.gnome.org/GNOME/mutter/commit/850ef518795dcc20d3b9a4f661f70ff8d0ddacb2.patch";
-      sha256 = "0cxdbrbcc8kfkvw7ryxjm2v1vk15jki7bawn128385r5hasabhxf";
-    })
-    # fix animation related crashes: https://gitlab.gnome.org/GNOME/mutter/merge_requests/805
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/mutter/commit/63a0b702c94af013b94ad3f32a8c5ba86bf6dfba.patch";
-      sha256 = "13hvz3n275crvpankj1b47nds71c42nnbq1yx2xhhvk60qc72vh4";
-    })
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/mutter/commit/1e637bd7e1b2a4316d1cf6da80966d43819a10df.patch";
-      sha256 = "0jcx33j2sw7hva0gs0svqg69habxxmgdi0kcb07nqq2df6pb62qf";
-    })
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/mutter/commit/c9c53cb55fd6e782c50f36da1e2adbf28111a660.patch";
-      sha256 = "0iwjlbr8j0icigmilpghlkcyg4hll9dm0mcaj8lvi7qxrgjrmczr";
-    })
-    # Fix crash when pressing ctrl-super: https://gitlab.gnome.org/GNOME/mutter/issues/823
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/mutter/commit/0706e021f5bd82cf4c9b2c0d2916d272f3cba406.patch";
-      sha256 = "0i4ixr419jggrd17gxxs45jnx131lnp8wkkhhygqsrpq8941sdw6";
-    })
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/mutter/commit/76f2579e442d8ad0a3b8b644daab7c72a585506b.patch";
-      sha256 = "0c3ls624k9f4mqrrbv8ng0slvm31l0li6ciqn04qd4yi18plnldy";
-    })
-    # Avoid crashing any apps on X11 when restarting: https://gitlab.gnome.org/GNOME/mutter/merge_requests/808
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/mutter/commit/f352c3d79da99e961341c1d2b5dd334dcade0271.patch";
-      sha256 = "1drn8wjbkj903jxay5wxq163i9ahp558sjl2bc3fi1qs90xj6cn2";
-    })
    # TODO: submit upstream
    ./0001-build-use-get_pkgconfig_variable-for-sysprof-dbusdir.patch
     (substituteAll {
-- 
GitLab


From a66adfcc5bf6d12af8ca6d74621dae4dc95e8027 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Wed, 9 Oct 2019 04:56:48 +0200
Subject: [PATCH 2248/2254] gnome3.gnome-shell: 3.34.0 -> 3.34.1

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

diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
index 57fa9c967ca..e8d5b7dbffd 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
@@ -15,11 +15,11 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "gnome-shell";
-  version = "3.34.0";
+  version = "3.34.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-shell/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0vdx4mfj46cpvzn6mhxc1ivg138437f5m4n3k4vb54pk45w4s00x";
+    sha256 = "07kd7wdk12nba33jfr44xqdlryiy86wgvsyjs8cw55y8p5cnbn6c";
   };
 
   LANG = "en_US.UTF-8";
-- 
GitLab


From bf56c1569572a0c2ab50496daf6d188e4bfade43 Mon Sep 17 00:00:00 2001
From: Marco Maggesi <1809783+maggesi@users.noreply.github.com>
Date: Tue, 8 Oct 2019 22:59:49 +0200
Subject: [PATCH 2249/2254] hol_light: 2019-03-27 -> 2019-10-06

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

diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix
index 40b0115dc1b..cda3656dc59 100644
--- a/pkgs/applications/science/logic/hol_light/default.nix
+++ b/pkgs/applications/science/logic/hol_light/default.nix
@@ -21,13 +21,13 @@ let
 in
 
 stdenv.mkDerivation {
-  name     = "hol_light-2019-03-27";
+  name     = "hol_light-2019-10-06";
 
   src = fetchFromGitHub {
     owner  = "jrh13";
     repo   = "hol-light";
-    rev    = "a2b487b38d9da47350f1b4316e34a8fa4cf7a40a";
-    sha256 = "1qlidl15qi8w4si8wxcmj8yg2srsb0q4k1ad9yd91sgx9h9aq8fk";
+    rev    = "5c91b2ded8a66db571824ecfc18b4536c103b23e";
+    sha256 = "0sxsk8z08ba0q5aixdyczcx5l29lb51ba4ip3d2fry7y604kjsx6";
   };
 
   buildInputs = [ ocaml camlp5 ];
-- 
GitLab


From d8218de5c53c5b1984d27f37182ced01a88808b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Wed, 9 Oct 2019 08:41:19 +0200
Subject: [PATCH 2250/2254] go: apply upstream patch

This should fix the tests almost always failing on Hydra for i686.
---
 pkgs/development/compilers/go/1.12.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/go/1.12.nix b/pkgs/development/compilers/go/1.12.nix
index 817f3ab324d..7a6c0b041fc 100644
--- a/pkgs/development/compilers/go/1.12.nix
+++ b/pkgs/development/compilers/go/1.12.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, tzdata, iana-etc, runCommand
+{ stdenv, fetchurl, fetchpatch, tzdata, iana-etc, runCommand
 , perl, which, pkgconfig, patch, procps, pcre, cacert, Security, Foundation
 , mailcap, runtimeShell
 , buildPackages, pkgsTargetTarget
@@ -137,6 +137,11 @@ stdenv.mkDerivation rec {
     ./skip-nohup-tests.patch
     # breaks under load: https://github.com/golang/go/issues/25628
     ./skip-test-extra-files-on-386.patch
+    (fetchpatch { # probably included in >= 1.12.10
+      url = "https://github.com/golang/go/commit/aae0b5b0b.diff";
+      name = "TestGcSys-too-much-memory.diff";
+      sha256 = "1bl9d2pl6n99n9g65cq91sygmp1iva5rmrxbprwn4xd0ql36psa8";
+    })
   ];
 
   postPatch = ''
-- 
GitLab


From 996d846726f9d685970b37bad53df25fc33aa094 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20M=C3=B6ller?= <fabianm88@gmail.com>
Date: Wed, 9 Oct 2019 10:53:01 +0200
Subject: [PATCH 2251/2254] nixos/systemd: fix broken tmpfiles.d symlinks

---
 nixos/modules/system/boot/systemd.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 669eb6a7056..33b350902a1 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -871,8 +871,8 @@ in
       "tmpfiles.d/journal-nocow.conf".source = "${systemd}/example/tmpfiles.d/journal-nocow.conf";
       "tmpfiles.d/static-nodes-permissions.conf".source = "${systemd}/example/tmpfiles.d/static-nodes-permissions.conf";
       "tmpfiles.d/systemd.conf".source = "${systemd}/example/tmpfiles.d/systemd.conf";
-      "tmpfiles.d/systemd-nspawn.conf".source = "${systemd}/example/tmpfiles.d/system-nspawn.conf";
-      "tmpfiles.d/systemd-tmp.conf".source = "${systemd}/example/tmpfiles.d/system-tmp.conf";
+      "tmpfiles.d/systemd-nspawn.conf".source = "${systemd}/example/tmpfiles.d/systemd-nspawn.conf";
+      "tmpfiles.d/systemd-tmp.conf".source = "${systemd}/example/tmpfiles.d/systemd-tmp.conf";
       "tmpfiles.d/var.conf".source = "${systemd}/example/tmpfiles.d/var.conf";
       "tmpfiles.d/x11.conf".source = "${systemd}/example/tmpfiles.d/x11.conf";
 
-- 
GitLab


From 9b04b8cf2b55609f44fe8e1d55d208ddac4a6ed8 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@fysik.su.se>
Date: Wed, 9 Oct 2019 12:32:51 +0200
Subject: [PATCH 2252/2254] openmpi: 4.0.1 -> 4.0.2

removed upstream patch
---
 pkgs/development/libraries/openmpi/default.nix | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix
index 4ab2dd41855..2a293e0b856 100644
--- a/pkgs/development/libraries/openmpi/default.nix
+++ b/pkgs/development/libraries/openmpi/default.nix
@@ -9,7 +9,7 @@
 }:
 
 let
-  version = "4.0.1";
+  version = "4.0.2";
 
 in stdenv.mkDerivation rec {
   pname = "openmpi";
@@ -17,17 +17,9 @@ in stdenv.mkDerivation rec {
 
   src = with stdenv.lib.versions; fetchurl {
     url = "https://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${pname}-${version}.tar.bz2";
-    sha256 = "02cpzcp113gj5hb0j2xc0cqma2fn04i2i0bzf80r71120p9bdryc";
+    sha256 = "0ms0zvyxyy3pnx9qwib6zaljyp2b3ixny64xvq3czv3jpr8zf2wh";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "openmpi-mca_btl_vader_component_close-segfault.patch";
-      url = "https://github.com/open-mpi/ompi/pull/6526.patch";
-      sha256 = "0s7ac9rkcj3fi6ampkvy76njlj478yyr4zvypjc7licy6dgr595x";
-    })
-  ];
-
   postPatch = ''
     patchShebangs ./
 
-- 
GitLab


From 7e1e1386066c25986402c19c849b7c6f91ff657d Mon Sep 17 00:00:00 2001
From: Konrad Borowski <konrad@borowski.pw>
Date: Wed, 9 Oct 2019 13:32:03 +0200
Subject: [PATCH 2253/2254] nixos/caddy: add tests (#70778)

---
 maintainers/maintainer-list.nix |  6 +++
 nixos/tests/all-tests.nix       |  1 +
 nixos/tests/caddy.nix           | 82 +++++++++++++++++++++++++++++++++
 3 files changed, 89 insertions(+)
 create mode 100644 nixos/tests/caddy.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 7be726592f0..7a27263275a 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -7065,6 +7065,12 @@
     githubId = 36407913;
     name = "Uli Baum";
   };
+  xfix = {
+    email = "konrad@borowski.pw";
+    github = "xfix";
+    githubId = 1297598;
+    name = "Konrad Borowski";
+  };
   xnaveira = {
     email = "xnaveira@gmail.com";
     github = "xnaveira";
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 5643da99e55..04323317a99 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -35,6 +35,7 @@ in
   boot-stage1 = handleTest ./boot-stage1.nix {};
   borgbackup = handleTest ./borgbackup.nix {};
   buildbot = handleTest ./buildbot.nix {};
+  caddy = handleTest ./caddy.nix {};
   cadvisor = handleTestOn ["x86_64-linux"] ./cadvisor.nix {};
   cassandra = handleTest ./cassandra.nix {};
   ceph = handleTestOn ["x86_64-linux"] ./ceph.nix {};
diff --git a/nixos/tests/caddy.nix b/nixos/tests/caddy.nix
new file mode 100644
index 00000000000..ab9d2fbf4d1
--- /dev/null
+++ b/nixos/tests/caddy.nix
@@ -0,0 +1,82 @@
+import ./make-test.nix ({ pkgs, ... }: {
+  name = "caddy";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ xfix ];
+  };
+
+  nodes = {
+    webserver = { pkgs, lib, ... }: {
+      services.caddy.enable = true;
+      services.caddy.config = ''
+        http://localhost {
+          gzip
+
+          root ${
+            pkgs.runCommand "testdir" {} ''
+              mkdir "$out"
+              echo hello world > "$out/example.html"
+            ''
+          }
+        }
+      '';
+
+      nesting.clone = [
+        {
+          services.caddy.config = lib.mkForce ''
+            http://localhost {
+              gzip
+
+              root ${
+                pkgs.runCommand "testdir2" {} ''
+                  mkdir "$out"
+                  echo changed > "$out/example.html"
+                ''
+              }
+            }
+          '';
+        }
+
+        {
+          services.caddy.config = ''
+            http://localhost:8080 {
+            }
+          '';
+        }
+      ];
+    };
+  };
+
+  testScript = { nodes, ... }: let
+    etagSystem = "${nodes.webserver.config.system.build.toplevel}/fine-tune/child-1";
+    justReloadSystem = "${nodes.webserver.config.system.build.toplevel}/fine-tune/child-2";
+  in ''
+    my $url = 'http://localhost/example.html';
+    $webserver->waitForUnit("caddy");
+    $webserver->waitForOpenPort("80");
+
+    sub checkEtag {
+      my $etag = $webserver->succeed(
+        'curl -v '.$url.' 2>&1 | sed -n -e "s/^< [Ee][Tt][Aa][Gg]: *//p"'
+      );
+      $etag =~ s/\r?\n$//;
+      my $httpCode = $webserver->succeed(
+        'curl -w "%{http_code}" -X HEAD -H \'If-None-Match: '.$etag.'\' '.$url
+      );
+      die "HTTP code is not 304" unless $httpCode == 304;
+      return $etag;
+    }
+
+    subtest "check ETag if serving Nix store paths", sub {
+      my $oldEtag = checkEtag;
+      $webserver->succeed("${etagSystem}/bin/switch-to-configuration test >&2");
+      $webserver->sleep(1); # race condition
+      my $newEtag = checkEtag;
+      die "Old ETag $oldEtag is the same as $newEtag" if $oldEtag eq $newEtag;
+    };
+
+    subtest "config is reloaded on nixos-rebuild switch", sub {
+      $webserver->succeed("${justReloadSystem}/bin/switch-to-configuration test >&2");
+      $webserver->waitForOpenPort("8080");
+    };
+  '';
+})
-- 
GitLab


From 8a7f358c746022893960928d48eaee9af64c0991 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 9 Oct 2019 04:42:10 -0700
Subject: [PATCH 2254/2254] aespipe: 2.4e -> 2.4f (#70547)

* aespipe: 2.4e -> 2.4f

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/aespipe/versions

* aespipe: enable Padlock and AES-NI
---
 pkgs/tools/security/aespipe/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/security/aespipe/default.nix b/pkgs/tools/security/aespipe/default.nix
index 22fb8848eb9..69bef27258e 100644
--- a/pkgs/tools/security/aespipe/default.nix
+++ b/pkgs/tools/security/aespipe/default.nix
@@ -2,18 +2,20 @@
 
 stdenv.mkDerivation rec {
   pname = "aespipe";
-  version = "2.4e";
+  version = "2.4f";
 
   src = fetchurl {
     url = "mirror://sourceforge/loop-aes/aespipe/aespipe-v${version}.tar.bz2";
-    sha256 = "0fmr0vk408bf13jydhdmcdhqw31yc9qk329bs9i60alccywapmds";
+    sha256 = "15pg9j27mjzl78mpzkdqd84kdafj0g6j72f8wgjrpp2qkxjy2ddi";
   };
 
-  meta = {
+  configureFlags = [ "--enable-padlock" "--enable-intelaes" ];
+
+  meta = with stdenv.lib; {
     description = "AES encrypting or decrypting pipe";
     homepage = http://loop-aes.sourceforge.net/aespipe.README;
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.goibhniu ];
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.goibhniu ];
+    platforms = platforms.linux;
   };
 }
-- 
GitLab